Packman Build Service PMBS

gpac.changes Changed

gpac.spec Changed

@@ -18,18 +18,16 @@
 %define soname		3
 
 Name:           gpac
-Version:        0.5.0.svn5178
+Version:        0.5.1.svn5491
 Release:        1.pm.1
 License:        LGPL-2.1+
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://gpac.sourceforge.net
-Source:		%{name}-%{version}.tar.bz2
+Source:		%{name}-%{version}.tar.xz
 Source90:       %{name}-rpmlintrc
-#PATCH-FIX-openSUSE i@marguerite.su - openSUSE only fix for sf#3574796
-Patch0:         gpac-0.5.0-smjs_call_prop_stub.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
-Patch1:		gpac-0.5.0-enable_V4Studio.patch
+Patch1:		gpac-0.5.1-enable_V4Studio.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
 Patch2:		gpac-0.5.0-SVGGen_abuild.patch
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
@@ -40,13 +38,13 @@
 Patch5:		gpac-0.5.0-system-amr.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - no gpac.pc in devel package
 Patch6:		gpac-0.5.0-no-pc.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - too many arguments for JS_GetParent
-Patch7:		gpac-0.5.0-js_getparent.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - I:Statement is overflowing a buffer
-Patch8:		gpac-0.5.0-bufferoverflow.patch
+Patch8:		gpac-0.5.1-bufferoverflow.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix gf_isom_set_pixel_aspect_ratio
 # not available to the public
 Patch9:		gpac-0.5.0-x264-export.patch
+#PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
+Patch10:	gpac-0.5.1-u32-count-redeclaration.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
@@ -85,13 +83,6 @@
 %if 0%{?suse_version} > 1140
 BuildRequires:  js-devel
 %endif
-%if 0%{?suse_version} <= 1140
-%if ! 0%{?sles_version}
-BuildRequires:  mozilla-xulrunner192-devel
-%endif
-%else
-BuildRequires:  xulrunner-devel
-%endif
 BuildRequires:  libopenssl-devel
 %if 0%{?suse_version} > 1140
 BuildRequires:  pkgconfig(libopenjpeg)
@@ -105,6 +96,7 @@
 BuildRequires:  wxGTK-devel
 %endif
 BuildRequires:  zlib-devel
+BuildRequires:	xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -180,32 +172,17 @@
 * applications benefiting from MPEG-7 and MPEG-21 advances: meta-data,
   encryption, watermarking, rights management
 
-%if ! 0%{?sles_version}
-%package browser-plugin
-Summary:        Osmozilla is a GPAC plugin for Mozilla-based browsers
-Group:          Productivity/Networking/Web/Utilities
-Requires:       %{name} = %{version}
-
-%description browser-plugin
-Osmozilla is a GPAC plugin for Mozilla-based browsers.
-%endif
-
 %prep
 %setup -q
-%if 0%{?suse_version} >= 1210
-%patch0 -p1
-%endif
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%if 0%{?suse_version} > 1140
-%patch7 -p1
-%endif
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # Fix encoding warnings
 cp -p Changelog Changelog.origine
@@ -219,60 +196,10 @@
 rm -rf doc/ipmpx_syntax.bt.origine
 
 # Generate revision.h
-echo '#define GPAC_SVN_REVISION "5178"' > ./include/gpac/revision.h
+echo '#define GPAC_SVN_REVISION "5491"' > ./include/gpac/revision.h
 
 sed -i~ '1 {s@^.*$@/*@}' src/utils/xml_parser.c
 %build
-# regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
-%if 0%{?suse_version} > 1140
-pushd applications/osmozilla
-    chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
-    chmod 666 nsIOsmozilla.h
-    chmod 666 nsIOsmozilla.idl
-
-    %define _IDL_DIR `pkg-config --variable=idldir libxul`
-    %define _SDK_DIR `pkg-config --variable=sdkdir libxul`
-
-    %{_SDK_DIR}/sdk/bin/header.py \
-   	-I%{_IDL_DIR} \
-        -o nsIOsmozilla.h \
-   	nsIOsmozilla.idl
-        %{_SDK_DIR}/sdk/bin/typelib.py \
-   	-I%{_IDL_DIR} \
-       -o nsIOsmozilla.xpt \
-   	nsIOsmozilla.idl
-
-    cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
-popd
-%else
-%if ! 0%{?sles_version}
-pushd applications/osmozilla
-    chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
-    chmod 666 nsIOsmozilla.h
-    chmod 666 nsIOsmozilla.idl
-
-    %define _IDL_DIR `pkg-config --variable=idldir libxul`
-    %define _INC_DIR `pkg-config --variable=includedir libxul`
-    %define _LIB_DIR `pkg-config --variable=libdir libxul`
-
-    %{_LIB_DIR}/xpidl \
-        -m header \
-        -I%{_IDL_DIR} \
-        -I%{_INC_DIR}/xpcom/idl \
-        nsIOsmozilla.idl
-    %{_LIB_DIR}/xpidl \
-        -m typelib \
-        -I%{_IDL_DIR} \
-        -I%{_INC_DIR}/xpcom/idl \
-        nsIOsmozilla.idl
-    %{_LIB_DIR}/xpt_link \
-        nposmozilla.xpt nsIOsmozilla.xpt
-
-    cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
-popd
-%endif
-%endif
-
 # configure the beast
 ./configure \
     --prefix=%{_prefix} \
@@ -280,9 +207,6 @@
     --libdir=lib64 \
 %endif
     --mandir=%{_mandir} \
-%if ! 0%{?sles_version}
-    --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
-%endif
     --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 ...)
@@ -305,15 +229,6 @@
 make install-lib \
     DESTDIR=%{buildroot}
 
-# browser-plugin
-%if ! 0%{?sles_version}
-install -dm 755 %{buildroot}%{_libdir}/browser-plugins
-install -m 755 bin/gcc/nposmozilla.so \
-    %{buildroot}%{_libdir}/browser-plugins
-install -m 755 bin/gcc/nposmozilla.xpt \
-    %{buildroot}%{_libdir}/browser-plugins
-%endif
-
 # generated sggen binaries
 for i in MPEG4 SVG X3D; do
     install -m 755 applications/generators/$i/${i}Gen \
@@ -394,10 +309,4 @@
 %{_datadir}/pixmaps/Osmo4.png
 %{_datadir}/applications/Osmo4.desktop
 
-%if ! 0%{?sles_version}
-%files browser-plugin
-%defattr(-,root,root)
-%{_libdir}/browser-plugins/nposmozilla.*
-%endif
-
 %changelog

gpac-0.5.0-bufferoverflow.patch Deleted

gpac-0.5.0-enable_V4Studio.patch Deleted

@@ -1,55 +0,0 @@
-Index: gpac-0.5.0.svn5178/applications/Makefile
-===================================================================
---- gpac-0.5.0.svn5178.orig/applications/Makefile
-+++ gpac-0.5.0.svn5178/applications/Makefile
-@@ -25,15 +25,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
- 
- ALLDIRS=$(APPDIRS)
-Index: gpac-0.5.0.svn5178/applications/osmo4_wx/Makefile
-===================================================================
---- gpac-0.5.0.svn5178.orig/applications/osmo4_wx/Makefile
-+++ gpac-0.5.0.svn5178/applications/osmo4_wx/Makefile
-@@ -46,7 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
- all: $(PROG)
- 
- Osmo4$(EXE): $(OBJS)
--	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
-+	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS)
- 
- clean: 
- 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-Index: gpac-0.5.0.svn5178/applications/osmozilla/osmo_npapi.cpp
-===================================================================
---- gpac-0.5.0.svn5178.orig/applications/osmozilla/osmo_npapi.cpp
-+++ gpac-0.5.0.svn5178/applications/osmozilla/osmo_npapi.cpp
-@@ -372,10 +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.5.0-js_getparent.patch Deleted

gpac-0.5.0-smjs_call_prop_stub.patch Deleted

gpac-0.5.1-bufferoverflow.patch Added

gpac-0.5.1-enable_V4Studio.patch Added

@@ -0,0 +1,55 @@
+Index: gpac-0.5.1.svn5491/applications/Makefile
+===================================================================
+--- gpac-0.5.1.svn5491.orig/applications/Makefile
++++ gpac-0.5.1.svn5491/applications/Makefile
+@@ -27,15 +27,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
+ 
+ ALLDIRS=$(APPDIRS)
+Index: gpac-0.5.1.svn5491/applications/osmo4_wx/Makefile
+===================================================================
+--- gpac-0.5.1.svn5491.orig/applications/osmo4_wx/Makefile
++++ gpac-0.5.1.svn5491/applications/osmo4_wx/Makefile
+@@ -46,7 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
+ all: $(PROG)
+ 
+ Osmo4$(EXE): $(OBJS)
+-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
++	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS)
+ 
+ clean: 
+ 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+Index: gpac-0.5.1.svn5491/applications/osmozilla/osmo_npapi.cpp
+===================================================================
+--- gpac-0.5.1.svn5491.orig/applications/osmozilla/osmo_npapi.cpp
++++ gpac-0.5.1.svn5491/applications/osmozilla/osmo_npapi.cpp
+@@ -372,10 +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.5.1-u32-count-redeclaration.patch Added

gpac-0.5.0.svn5178.tar.bz2/gui/icons/applications-internet.svg Deleted

@@ -1,622 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3440"
-    viewbox = "0 0 48 48"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/categories"
-   sodipodi:docname="applications-internet.svg">
-  <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6001">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6003" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6005" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4825">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4827" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4829" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4128" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.16494845;"
-         offset="1.0000000"
-         id="stop4130" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4114">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4116" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4118" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3962">
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3964" />
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.15517241"
-         id="stop4134" />
-      <stop
-         style="stop-color:#4074ae;stop-opacity:1.0000000;"
-         offset="0.75000000"
-         id="stop4346" />
-      <stop
-         style="stop-color:#36486c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3966" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3962"
-       id="radialGradient3968"
-       gradientTransform="scale(0.999989,1.000011)"
-       cx="18.247644"
-       cy="15.716079"
-       fx="18.247644"
-       fy="15.716079"
-       r="29.993349"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4114"
-       id="radialGradient4120"
-       gradientTransform="scale(1.643990,0.608276)"
-       cx="15.115514"
-       cy="63.965388"
-       fx="15.115514"
-       fy="63.965388"
-       r="12.289036"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient4132"
-       gradientTransform="scale(0.999989,1.000011)"
-       cx="15.601279"
-       cy="12.142302"
-       fx="15.601279"
-       fy="12.142302"
-       r="43.526714"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4825"
-       id="radialGradient5983"
-       gradientUnits="userSpaceOnUse"
-       cx="12.071323"
-       cy="12.493138"
-       fx="12.071323"
-       fy="12.493138"
-       r="6.7175145" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4825"
-       id="radialGradient5985"
-       gradientUnits="userSpaceOnUse"
-       cx="12.071323"
-       cy="12.493138"
-       fx="12.071323"
-       fy="12.493138"
-       r="6.7175145" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4825"
-       id="radialGradient5987"
-       gradientUnits="userSpaceOnUse"
-       cx="12.071323"
-       cy="12.493138"
-       fx="12.071323"
-       fy="12.493138"
-       r="6.7175145" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4825"
-       id="radialGradient5989"
-       gradientUnits="userSpaceOnUse"
-       cx="12.071323"
-       cy="12.493138"
-       fx="12.071323"
-       fy="12.493138"
-       r="6.7175145" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6001"
-       id="linearGradient6007"
-       x1="-25.176178"
-       y1="30.057165"
-       x2="-22.252472"
-       y2="21.041553"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6001"
-       id="linearGradient6011"
-       gradientUnits="userSpaceOnUse"
-       x1="-25.176178"
-       y1="30.057165"
-       x2="-22.113543"
-       y2="22.661524" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6001"
-       id="linearGradient6015"
-       gradientUnits="userSpaceOnUse"
-       x1="-22.822565"
-       y1="28.337734"
-       x2="-22.113543"
-       y2="22.661524" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6001"
-       id="linearGradient6019"
-       gradientUnits="userSpaceOnUse"
-       x1="-21.658581"
-       y1="15.649428"
-       x2="-21.962101"
-       y2="21.336346" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.17254902"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="49.190006"
-     inkscape:cy="25.586897"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1254"
-     inkscape:window-height="1039"
-     inkscape:window-x="2228"
-     inkscape:window-y="102"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Internet Category</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Tuomas Kuosmanen</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>internet</rdf:li>
-            <rdf:li>tools</rdf:li>
-            <rdf:li>applications</rdf:li>
-            <rdf:li>category</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4120);fill-opacity:1.0000000;stroke:none;stroke-opacity:1.0000000"
-       id="path4112"
-       sodipodi:cx="24.849752"
-       sodipodi:cy="38.908627"
-       sodipodi:rx="20.203051"
-       sodipodi:ry="7.4751287"
-       d="M 45.052803 38.908627 A 20.203051 7.4751287 0 1 1  4.6467018,38.908627 A 20.203051 7.4751287 0 1 1  45.052803 38.908627 z"
-       transform="matrix(1.000000,0.000000,0.000000,1.243244,0.000000,-10.27241)" />
-    <path
-       style="fill:url(#radialGradient3968);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#39396c;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M 43.959853,23.485499 C 43.959853,34.195217 35.277750,42.877222 24.569505,42.877222 C 13.860279,42.877222 5.1786663,34.195119 5.1786663,23.485499 C 5.1786663,12.776272 13.860279,4.0951517 24.569505,4.0951517 C 35.277750,4.0951517 43.959853,12.776272 43.959853,23.485499 L 43.959853,23.485499 z "
-       id="path3214" />
-    <g
-       id="g4136"
-       style="fill:#204a87;fill-opacity:0.71345031;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000;opacity:1"
-       transform="matrix(0.982371,0.000000,0.000000,0.982371,0.121079,0.232914)">
-      <g
-         id="g4138"
-         style="fill:#204a87">
-        <g
-           id="g4142"
-           style="fill:#204a87">
-          <path
-             d="M 44.071300,20.714400 C 44.071300,20.977100 44.071300,20.714400 44.071300,20.714400 L 43.526400,21.331600 C 43.192400,20.938000 42.817400,20.607000 42.436600,20.261300 L 41.600700,20.384300 L 40.837000,19.521000 L 40.837000,20.589400 L 41.491300,21.084500 L 41.926800,21.577700 L 42.508800,20.919500 C 42.655300,21.193900 42.799800,21.468300 42.945300,21.742700 L 42.945300,22.565000 L 42.290000,23.305200 L 41.090800,24.128400 L 40.182600,25.034700 L 39.600600,24.374500 L 39.891600,23.634300 L 39.310500,22.976100 L 38.329100,20.878400 L 37.493200,19.933100 L 37.274400,20.179200 L 37.602500,21.372600 L 38.219700,22.071800 C 38.572200,23.089400 38.920900,24.062000 39.383800,25.034700 C 40.101600,25.034700 40.778300,24.958500 41.491200,24.868700 L 41.491200,25.444900 L 40.619100,27.584100 L 39.819300,28.488400 L 39.165000,29.888800 C 39.165000,30.656400 39.165000,31.424000 39.165000,32.191500 L 39.383800,33.097800 L 39.020500,33.508000 L 38.219700,34.002100 L 37.383800,34.701300 L 38.075200,35.482600 L 37.129900,36.306800 L 37.311500,36.840000 L 35.893500,38.445500 L 34.949200,38.445500 L 34.149400,38.939600 L 33.639600,38.939600 L 33.639600,38.281400 L 33.422800,36.963000 C 33.141500,36.136800 32.848600,35.316500 32.550700,34.496200 C 32.550700,33.890700 32.586800,33.291100 32.623000,32.685700 L 32.987300,31.863400 L 32.477500,30.875100 L 32.514600,29.517700 L 31.823200,28.736400 L 32.168900,27.605500 L 31.606400,26.967300 L 30.624000,26.967300 L 30.296900,26.597200 L 29.315500,27.214900 L 28.916100,26.761300 L 28.006900,27.543000 C 27.389700,26.843300 26.771500,26.144100 26.153400,25.444900 L 25.426800,23.716400 L 26.081100,22.730100 L 25.717800,22.319000 L 26.516600,20.425400 C 27.172900,19.609000 27.858400,18.825800 28.551800,18.039700 L 29.788100,17.710600 L 31.169000,17.546500 L 32.114300,17.793600 L 33.459000,19.150000 L 33.931700,18.615800 L 34.585000,18.533800 L 35.821300,18.944900 L 36.766600,18.944900 L 37.420900,18.368700 L 37.711900,17.957600 L 37.056600,17.546500 L 35.965800,17.464500 C 35.663100,17.044600 35.381800,16.603200 35.022400,16.230100 L 34.658100,16.394200 L 34.512600,17.464500 L 33.858300,16.724300 L 33.713800,15.900100 L 32.987200,15.325900 L 32.695200,15.325900 L 33.422700,16.148200 L 33.131700,16.888400 L 32.550600,17.052500 L 32.913900,16.312300 L 32.258600,15.984200 L 31.678500,15.326000 L 30.586700,15.572100 L 30.442200,15.900200 L 29.787900,16.312300 L 29.424600,17.217600 L 28.516400,17.669700 L 28.116000,17.217600 L 27.680500,17.217600 L 27.680500,15.736200 L 28.625800,15.242100 L 29.352400,15.242100 L 29.205900,14.666900 L 28.625800,14.090700 L 29.606300,13.884600 L 30.151200,13.268400 L 30.586700,12.527200 L 31.387500,12.527200 L 31.168700,11.952000 L 31.678500,11.622900 L 31.678500,12.281100 L 32.768300,12.527200 L 33.858100,11.622900 L 33.931300,11.210800 L 34.875600,10.553100 C 34.533800,10.595600 34.192000,10.626800 33.858000,10.717700 L 33.858000,9.9766000 L 34.221300,9.1538000 L 33.858000,9.1538000 L 33.059600,9.8940000 L 32.840800,10.305600 L 33.059600,10.882300 L 32.695300,11.868600 L 32.114200,11.539500 L 31.606400,10.964300 L 30.805600,11.539500 L 30.514600,10.223600 L 31.895500,9.3188000 L 31.895500,8.8247000 L 32.768500,8.2490000 L 34.149400,7.9194000 L 35.094700,8.2490000 L 36.838800,8.5781000 L 36.403300,9.0713000 L 35.458000,9.0713000 L 36.403300,10.058600 L 37.129900,9.2363000 L 37.350600,8.8745000 C 37.350600,8.8745000 40.137700,11.372500 41.730500,14.105000 C 43.323300,16.838400 44.071300,20.060100 44.071300,20.714400 z "
-             id="path4144"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4146"
-         style="fill:#204a87">
-        <g
-           id="g4150"
-           style="fill:#204a87">
-          <path
-             d="M 26.070300,9.2363000 L 25.997100,9.7295000 L 26.506900,10.058600 L 27.378000,9.4829000 L 26.942500,8.9892000 L 26.360500,9.3188000 L 26.070500,9.2363000"
-             id="path4152"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4154"
-         style="fill:#204a87">
-        <g
-           id="g4158"
-           style="fill:#204a87">
-          <path
-             d="M 26.870100,5.8633000 L 24.979500,5.1226000 L 22.799800,5.3692000 L 20.109400,6.1094000 L 19.600600,6.6035000 L 21.272500,7.7549000 L 21.272500,8.4131000 L 20.618200,9.0713000 L 21.491200,10.800300 L 22.071300,10.470200 L 22.799800,9.3188000 C 23.922800,8.9716000 24.929700,8.5781000 25.997100,8.0844000 L 26.870100,5.8632000"
-             id="path4160"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4162"
-         style="fill:#204a87">
-        <g
-           id="g4166"
-           style="fill:#204a87">
-          <path
-             d="M 28.833000,12.774900 L 28.542000,12.033700 L 28.032200,12.198700 L 28.178700,13.103000 L 28.833000,12.774900"
-             id="path4168"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4170"
-         style="fill:#204a87">
-        <g
-           id="g4174"
-           style="fill:#204a87">
-          <path
-             d="M 29.123000,12.608900 L 28.977500,13.597200 L 29.777300,13.432200 L 30.358400,12.857000 L 29.849600,12.362900 C 29.678700,11.907800 29.482400,11.483000 29.268500,11.046500 L 28.833000,11.046500 L 28.833000,11.539700 L 29.123000,11.868800 L 29.123000,12.609000"
-             id="path4176"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4178"
-         style="fill:#204a87">
-        <g
-           id="g4182"
-           style="fill:#204a87">
-          <path
-             d="M 18.365200,28.242200 L 17.783200,27.089900 L 16.692900,26.843300 L 16.111400,25.280800 L 14.657800,25.444900 L 13.422400,24.540600 L 12.113300,25.692000 L 12.113300,25.873600 C 11.717300,25.759300 11.230500,25.743700 10.877900,25.526900 L 10.586900,24.704600 L 10.586900,23.799300 L 9.7148000,23.881300 C 9.7876000,23.305100 9.8598000,22.729900 9.9331000,22.153800 L 9.4238000,22.153800 L 8.9155000,22.812000 L 8.4062000,23.058100 L 7.6791000,22.647900 L 7.6063000,21.742600 L 7.7518000,20.755300 L 8.8426000,19.933000 L 9.7147000,19.933000 L 9.8597000,19.438900 L 10.950000,19.685000 L 11.749800,20.673300 L 11.895300,19.026800 L 13.276600,17.875400 L 13.785400,16.641000 L 14.803000,16.229900 L 15.384500,15.407600 L 16.692600,15.159600 L 17.347400,14.173300 C 16.693100,14.173300 16.038800,14.173300 15.384500,14.173300 L 16.620300,13.597100 L 17.491900,13.597100 L 18.728200,13.185000 L 18.873700,12.692800 L 18.437200,12.280700 L 17.928400,12.115700 L 18.073900,11.622500 L 17.710600,10.882300 L 16.838000,11.210400 L 16.983500,10.552700 L 15.965900,9.9765000 L 15.166600,11.374400 L 15.238900,11.868500 L 14.439600,12.198600 L 13.930300,13.267900 L 13.712500,12.280600 L 12.331200,11.704400 L 12.112900,10.964200 L 13.930300,9.8939000 L 14.730100,9.1537000 L 14.802900,8.2489000 L 14.366900,8.0018000 L 13.785400,7.9193000 L 13.422100,8.8246000 C 13.422100,8.8246000 12.814200,8.9437000 12.657900,8.9823000 C 10.661800,10.821700 6.6286000,14.792400 5.6916000,22.288500 C 5.7287000,22.462300 6.3708000,23.470100 6.3708000,23.470100 L 7.8972000,24.374400 L 9.4236000,24.786500 L 10.078400,25.609700 L 11.095500,26.349900 L 11.677000,26.267900 L 12.113000,26.464200 L 12.113000,26.597000 L 11.531900,28.160000 L 11.095400,28.818200 L 11.240900,29.148300 L 10.877600,30.380700 L 12.186200,32.767400 L 13.494300,33.919700 L 14.076300,34.742000 L 14.003100,36.470500 L 14.439600,37.456800 L 14.003100,39.349400 C 14.003100,39.349400 13.968900,39.337700 14.024600,39.527100 C 14.080800,39.716600 16.353700,40.978300 16.498200,40.870900 C 16.642200,40.761500 16.765300,40.665800 16.765300,40.665800 L 16.620300,40.255600 L 17.201400,39.679400 L 17.419700,39.103200 L 18.365000,38.773100 L 19.091600,36.962600 L 18.873800,36.470400 L 19.381600,35.730200 L 20.472400,35.482200 L 21.054400,34.165800 L 20.908900,32.521300 L 21.781000,31.286900 L 21.926500,30.052500 C 20.733100,29.460700 19.549500,28.851300 18.365000,28.242000"
-             id="path4184"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4186"
-         style="fill:#204a87">
-        <g
-           id="g4190"
-           style="fill:#204a87">
-          <path
-             d="M 16.765600,9.5649000 L 17.492200,10.058600 L 18.074200,10.058600 L 18.074200,9.4829000 L 17.347600,9.1538000 L 16.765600,9.5649000"
-             id="path4192"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4194"
-         style="fill:#204a87">
-        <g
-           id="g4198"
-           style="fill:#204a87">
-          <path
-             d="M 14.876000,8.9072000 L 14.512200,9.8120000 L 15.239300,9.8120000 L 15.603100,8.9892000 C 15.916600,8.7675000 16.228600,8.5444000 16.547900,8.3310000 L 17.275000,8.5781000 C 17.759400,8.9072000 18.243800,9.2363000 18.728600,9.5649000 L 19.456100,8.9072000 L 18.655800,8.5781000 L 18.292000,7.8374000 L 16.911100,7.6728000 L 16.838300,7.2612000 L 16.184000,7.4262000 L 15.893600,8.0020000 L 15.529800,7.2613000 L 15.384800,7.5904000 L 15.457600,8.4132000 L 14.876000,8.9072000"
-             id="path4200"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4202"
-         style="fill:#204a87">
-        <g
-           style="opacity:0.75000000;fill:#204a87"
-           id="g4204">
-          <path
-             id="path4206"
-             d=""
-             style="fill:#204a87" />
-        </g>
-        <g
-           id="g4208"
-           style="fill:#204a87">
-          <path
-             id="path4210"
-             d=""
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4212"
-         style="fill:#204a87">
-        <g
-           style="opacity:0.75000000;fill:#204a87"
-           id="g4214">
-          <path
-             id="path4216"
-             d=""
-             style="fill:#204a87" />
-        </g>
-        <g
-           id="g4218"
-           style="fill:#204a87">
-          <path
-             id="path4220"
-             d=""
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4222"
-         style="fill:#204a87">
-        <g
-           id="g4226"
-           style="fill:#204a87">
-          <path
-             d="M 17.492200,6.8496000 L 17.856000,6.5210000 L 18.583100,6.3564000 C 19.081100,6.1142000 19.581100,5.9511000 20.109500,5.7802000 L 19.819500,5.2865000 L 18.881000,5.4213000 L 18.437600,5.8632000 L 17.706600,5.9692000 L 17.056700,6.2744000 L 16.740800,6.4272000 L 16.547900,6.6855000 L 17.492200,6.8496000"
-             id="path4228"
-             style="fill:#204a87" />
-        </g>
-      </g>
-      <g
-         id="g4230"
-         style="fill:#204a87">
-        <g
-           id="g4234"
-           style="fill:#204a87">
-          <path
-             d="M 18.728500,14.666500 L 19.165000,14.008300 L 18.510200,13.515100 L 18.728500,14.666500"
-             id="path4236"
-             style="fill:#204a87" />
-        </g>
-      </g>
-    </g>
-    <path
-       style="fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient4132);stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;opacity:0.3956044"
-       d="M 42.975093,23.485534 C 42.975093,33.651354 34.733915,41.892440 24.569493,41.892440 C 14.404139,41.892440 6.1634261,33.651261 6.1634261,23.485534 C 6.1634261,13.320180 14.404139,5.0799340 24.569493,5.0799340 C 34.733915,5.0799340 42.975093,13.320180 42.975093,23.485534 L 42.975093,23.485534 z "
-       id="path4122" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6007);stroke-width:0.88164198;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path5991"
-       sodipodi:cx="-18.561554"
-       sodipodi:cy="21.041553"
-       sodipodi:rx="15.733126"
-       sodipodi:ry="9.4575529"
-       d="M -2.8284283 21.041553 A 15.733126 9.4575529 0 1 1  -34.29468,21.041553 A 15.733126 9.4575529 0 1 1  -2.8284283 21.041553 z"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(1.131034,0.613097,-0.476556,0.879144,54.09058,16.04435)" />
-    <path
-       transform="matrix(0.939326,-0.879086,0.683307,0.730131,32.31406,-4.451561)"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       d="M -2.8284283 21.041553 A 15.733126 9.4575529 0 1 1  -34.29468,21.041553 A 15.733126 9.4575529 0 1 1  -2.8284283 21.041553 z"
-       sodipodi:ry="9.4575529"
-       sodipodi:rx="15.733126"
-       sodipodi:cy="21.041553"
-       sodipodi:cx="-18.561554"
-       id="path6009"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6011);stroke-width:0.88164198;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <g
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       transform="matrix(-1.045772,0.767251,0.767251,1.045772,35.61651,-22.14396)"
-       id="g4933">
-      <path
-         transform="translate(14.95026,22.93047)"
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1  5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1  18.788838 12.493138 z"
-         sodipodi:ry="6.7175145"
-         sodipodi:rx="6.7175145"
-         sodipodi:cy="12.493138"
-         sodipodi:cx="12.071323"
-         id="path4935"
-         style="opacity:1;color:#000000;fill:url(#radialGradient5987);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path4937"
-         sodipodi:cx="12.071323"
-         sodipodi:cy="12.493138"
-         sodipodi:rx="6.7175145"
-         sodipodi:ry="6.7175145"
-         d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1  5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1  18.788838 12.493138 z"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true"
-         transform="matrix(0.308271,0,0,0.308271,23.30035,31.57234)" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6015);stroke-width:0.88164198;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path6013"
-       sodipodi:cx="-18.561554"
-       sodipodi:cy="21.041553"
-       sodipodi:rx="15.733126"
-       sodipodi:ry="9.4575529"
-       d="M -2.8284283 21.041553 A 15.733126 9.4575529 0 1 1  -34.29468,21.041553 A 15.733126 9.4575529 0 1 1  -2.8284283 21.041553 z"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(-1.280316,-0.126159,9.806226e-2,-0.99518,-2.405125,40.52387)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6019);stroke-width:0.90226138;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path6017"
-       sodipodi:cx="-18.561554"
-       sodipodi:cy="21.041553"
-       sodipodi:rx="15.733126"
-       sodipodi:ry="9.4575529"
-       d="M -2.8284283 21.041553 A 15.733126 9.4575529 0 1 1  -34.29468,21.041553 A 15.733126 9.4575529 0 1 1  -2.8284283 21.041553 z"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(0.917874,-0.858983,0.667701,0.713433,27.63317,-6.909069)" />
-    <g
-       id="g5075"
-       transform="matrix(-0.806276,0.59154,0.59154,0.806276,12.38564,-18.02921)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true">
-      <path
-         transform="translate(14.95026,22.93047)"
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1  5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1  18.788838 12.493138 z"
-         sodipodi:ry="6.7175145"
-         sodipodi:rx="6.7175145"
-         sodipodi:cy="12.493138"
-         sodipodi:cx="12.071323"
-         id="path5077"
-         style="opacity:1;color:#000000;fill:url(#radialGradient5983);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path5079"
-         sodipodi:cx="12.071323"
-         sodipodi:cy="12.493138"
-         sodipodi:rx="6.7175145"
-         sodipodi:ry="6.7175145"
-         d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1  5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1  18.788838 12.493138 z"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true"
-         transform="matrix(0.308271,0,0,0.308271,23.30035,31.57234)" />
-    </g>
-    <g
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       transform="matrix(-0.806276,0.59154,0.59154,0.806276,13.4991,-31.50022)"
-       id="g4945">
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:url(#radialGradient5985);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path4947"
-         sodipodi:cx="12.071323"
-         sodipodi:cy="12.493138"
-         sodipodi:rx="6.7175145"
-         sodipodi:ry="6.7175145"
-         d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1  5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1  18.788838 12.493138 z"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true"
-         transform="translate(14.95026,22.93047)" />
-      <path
-         transform="matrix(0.308271,0,0,0.308271,23.30035,31.57234)"
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1  5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1  18.788838 12.493138 z"
-         sodipodi:ry="6.7175145"
-         sodipodi:rx="6.7175145"
-         sodipodi:cy="12.493138"
-         sodipodi:cx="12.071323"
-         id="path4949"
-         style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-    <g
-       style="opacity:1"
-       id="g4939"
-       transform="matrix(-0.870227,0.638572,0.638458,0.870381,25.20503,-35.31278)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true">
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:url(#radialGradient5989);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path4941"
-         sodipodi:cx="12.071323"
-         sodipodi:cy="12.493138"
-         sodipodi:rx="6.7175145"
-         sodipodi:ry="6.7175145"
-         d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1  5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1  18.788838 12.493138 z"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true"
-         transform="translate(14.95026,22.93047)" />
-      <path
-         transform="matrix(0.308271,0,0,0.308271,23.30035,31.57234)"
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1  5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1  18.788838 12.493138 z"
-         sodipodi:ry="6.7175145"
-         sodipodi:rx="6.7175145"
-         sodipodi:cy="12.493138"
-         sodipodi:cx="12.071323"
-         id="path4943"
-         style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/applications-system.svg Deleted

@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48.000000px"
-   height="48.000000px"
-   id="svg53383"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/categories"
-   sodipodi:docname="applications-system.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective31" />
-    <linearGradient
-       id="linearGradient3264">
-      <stop
-         style="stop-color:#c9c9c9;stop-opacity:1;"
-         offset="0"
-         id="stop3266" />
-      <stop
-         id="stop3276"
-         offset="0.25"
-         style="stop-color:#f8f8f8;stop-opacity:1;" />
-      <stop
-         id="stop3272"
-         offset="0.5"
-         style="stop-color:#e2e2e2;stop-opacity:1;" />
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="0.75"
-         id="stop3274" />
-      <stop
-         style="stop-color:#c9c9c9;stop-opacity:1;"
-         offset="1"
-         id="stop3268" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3264"
-       id="linearGradient3281"
-       gradientUnits="userSpaceOnUse"
-       x1="14.462892"
-       y1="12.284524"
-       x2="34.534348"
-       y2="39.684914"
-       gradientTransform="matrix(1.241935,0,0,1.241935,-5.027508,-7.208988)" />
-    <linearGradient
-       id="linearGradient2300">
-      <stop
-         id="stop2302"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.32673267;" />
-      <stop
-         id="stop2304"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="aigrd1"
-       gradientUnits="userSpaceOnUse"
-       x1="99.7773"
-       y1="15.4238"
-       x2="153.0005"
-       y2="248.6311">
-      <stop
-         offset="0"
-         style="stop-color:#184375"
-         id="stop53300" />
-      <stop
-         offset="1"
-         style="stop-color:#C8BDDC"
-         id="stop53302" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd1"
-       id="linearGradient53551"
-       gradientUnits="userSpaceOnUse"
-       x1="99.7773"
-       y1="15.4238"
-       x2="153.0005"
-       y2="248.6311"
-       gradientTransform="matrix(0.200685,0.000000,0.000000,0.200685,-0.585758,-1.050787)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="11.689870"
-       fy="72.568001"
-       fx="14.287618"
-       cy="68.872971"
-       cx="14.287618"
-       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
-       id="radialGradient2308"
-       xlink:href="#linearGradient2300"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3264"
-       id="linearGradient3760"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241935,0,0,1.241935,-5.027508,-7.208988)"
-       x1="14.462892"
-       y1="12.284524"
-       x2="34.534348"
-       y2="39.684914" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd1"
-       id="linearGradient3773"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.200685,0,0,0.200685,-54.33576,-1.050787)"
-       x1="99.7773"
-       y1="15.4238"
-       x2="153.0005"
-       y2="248.6311" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:showpageshadow="false"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.11764706"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="43.652227"
-     inkscape:cy="21.164787"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="872"
-     inkscape:window-height="697"
-     inkscape:window-x="562"
-     inkscape:window-y="151" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>System Applications</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz/</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>system</rdf:li>
-            <rdf:li>applications</rdf:li>
-            <rdf:li>group</rdf:li>
-            <rdf:li>category</rdf:li>
-            <rdf:li>admin</rdf:li>
-            <rdf:li>root</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="shadow"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <path
-       transform="matrix(1.186380,0.000000,0.000000,1.186380,-4.539687,-7.794678)"
-       d="M 44.285715 38.714287 A 19.928572 9.8372450 0 1 1  4.4285717,38.714287 A 19.928572 9.8372450 0 1 1  44.285715 38.714287 z"
-       sodipodi:ry="9.8372450"
-       sodipodi:rx="19.928572"
-       sodipodi:cy="38.714287"
-       sodipodi:cx="24.357143"
-       id="path1538"
-       style="color:#000000;fill:url(#radialGradient2308);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="opacity:1;color:#000000;fill:url(#linearGradient3773);fill-opacity:1;fill-rule:nonzero;stroke:#3f4561;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 22.699525,0.94746963 C 22.22635,0.97984519 21.766437,1.0531317 21.301673,1.1063165 L 21.269903,1.1063165 L 20.157975,7.1742671 C 18.345621,7.5870046 16.640562,8.2874574 15.106644,9.2392765 L 10.118853,5.6493371 C 8.770521,6.6961412 7.543552,7.9170049 6.465374,9.2392765 L 9.928236,14.290607 C 8.876814,15.89739 8.086153,17.732094 7.640841,19.659632 C 7.640765,19.668743 7.640779,19.689813 7.640841,19.691401 L 1.60466,20.644482 C 1.494303,21.545851 1.445813,22.477386 1.445813,23.408418 C 1.445813,24.170171 1.466846,24.921747 1.541121,25.664043 L 7.577303,26.744202 C 8.0066,28.840363 8.822112,30.797987 9.960006,32.526228 L 6.370066,37.450482 C 7.398201,38.726866 8.585171,39.888962 9.864698,40.913343 L 14.947798,37.418712 C 16.724273,38.551956 18.707343,39.346604 20.856901,39.737877 L 21.809983,45.742288 C 22.487237,45.803935 23.181758,45.805827 23.874992,45.805827 C 24.853677,45.805826 25.788512,45.768738 26.734236,45.64698 L 27.877933,39.515491 C 29.91886,39.007587 31.836112,38.126493 33.501113,36.942172 L 38.393596,40.500342 C 39.662366,39.420897 40.822583,38.180154 41.824689,36.846863 L 38.266519,31.700225 C 39.230125,30.036028 39.897817,28.199859 40.23622,26.235892 L 46.240632,25.282811 C 46.29329,24.656221 46.30417,24.048546 46.30417,23.408418 C 46.30417,22.296018 46.174875,21.205317 46.018246,20.136172 L 39.918526,19.024244 C 39.440518,17.259164 38.656214,15.612364 37.662901,14.13176 L 41.25284,9.2075071 C 40.140075,7.8466524 38.870718,6.5895264 37.472284,5.5222596 L 32.293876,9.0804296 C 30.805549,8.200202 29.203897,7.5248159 27.464931,7.1424978 L 26.51185,1.1063165 C 25.644369,1.0042729 24.769749,0.94746963 23.874992,0.94746963 C 23.633166,0.94746964 23.384286,0.93986063 23.144296,0.94746963 C 23.027301,0.95117908 22.911525,0.94066346 22.794833,0.94746963 C 22.763228,0.94931296 22.73107,0.94531125 22.699525,0.94746963 z M 23.525529,16.387386 C 23.641592,16.381497 23.757473,16.387386 23.874992,16.387386 C 27.635598,16.387386 30.705408,19.457196 30.705408,23.217802 C 30.705409,26.978407 27.635597,30.016448 23.874992,30.016448 C 20.114387,30.016449 17.076346,26.978407 17.076346,23.217802 C 17.076347,19.574716 19.927558,16.569963 23.525529,16.387386 z "
-       id="path3243" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:type="arc"
-       style="opacity:0.64772728;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.62180054;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3283"
-       sodipodi:cx="23.511301"
-       sodipodi:cy="23.781593"
-       sodipodi:rx="12.727922"
-       sodipodi:ry="12.727922"
-       d="M 36.239223 23.781593 A 12.727922 12.727922 0 1 1  10.783379,23.781593 A 12.727922 12.727922 0 1 1  36.239223 23.781593 z"
-       transform="matrix(0.616598,0,0,0.616598,9.38202,8.539674)" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path3285"
-       d="M 21.995808,2.1484671 L 21.103024,8.0235243 C 19.404254,8.4103946 16.279442,9.5936035 14.841657,10.485771 L 10.091975,6.9406268 C 8.828145,7.9218257 8.741474,7.9883656 7.730867,9.2277688 L 11.165063,14.320988 C 10.179537,15.827071 8.995796,18.510982 8.570778,20.42893 C 8.570778,20.42893 2.552988,21.443355 2.552988,21.443355 C 2.449547,22.288234 2.49926,24.096528 2.56888,24.792303 L 8.317097,25.82782 C 8.71949,27.79261 10.225324,30.955232 11.291904,32.575161 L 7.656902,37.377719 C 8.620601,38.57411 8.813474,38.683589 10.01281,39.64377 L 14.873441,36.082733 C 16.538581,37.144954 19.84373,38.437109 21.858571,38.80386 L 22.656299,44.604952 C 23.291109,44.662736 25.044829,44.824827 25.931283,44.710701 L 26.824066,38.671821 C 28.737084,38.195749 32.042539,36.838896 33.603191,35.728798 L 38.458624,39.236958 C 39.647878,38.225166 39.658533,38.072709 40.597835,36.822978 L 36.999815,31.708667 C 37.90303,30.148767 39.070902,27.098068 39.388097,25.257187 L 45.279046,24.279744 C 45.328399,23.692424 45.330802,22.054578 45.18399,21.052439 L 39.182092,20.016922 C 38.73404,18.362463 37.196418,15.381153 36.265359,13.993342 L 40.080075,9.1907857 C 39.037052,7.915218 38.64924,7.7402002 37.338448,6.7398212 L 32.313994,10.337839 C 30.918941,9.5127782 28.137095,8.2550417 26.507114,7.8966842 L 25.619528,2.1484671 C 24.806414,2.0528187 22.460488,2.0952921 21.995808,2.1484671 z "
-       style="opacity:0.34659089;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999923;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" />
-    <path
-       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 10.102903,6.2970655 C 8.7545689,7.3438694 8.1656464,7.9719226 7.0874684,9.2941942 L 10.489927,14.259153 C 9.4385072,15.857755 8.3316275,18.426114 8.1423859,19.987706 C 8.1423859,19.987706 2.0798859,21.0319 2.0798859,21.0319 C 2.0109129,21.595256 1.90625,22.884803 1.90625,22.884803 L 2.0830267,24.447303 C 2.5107567,24.535638 2.9231817,24.617818 3.3642767,24.666053 L 3.8642767,23.134803 C 4.2083177,23.163279 4.5439297,23.197303 4.8955267,23.197303 C 5.2467347,23.197303 5.6139847,23.163473 5.9580267,23.134803 L 6.4267767,24.666053 C 6.8680647,24.617818 7.3115487,24.535638 7.7392767,24.447303 L 7.7392767,22.884803 C 8.4250337,22.72518 9.0712777,22.497045 9.7080267,22.228553 L 10.645527,23.509803 C 11.047878,23.327709 11.421123,23.133984 11.801777,22.916053 L 11.301777,21.416053 C 11.89901,21.053803 12.463529,20.620706 12.989277,20.166053 L 14.270527,21.103553 C 14.596162,20.806973 14.91164,20.491691 15.208027,20.166053 L 14.270527,18.916053 C 14.725373,18.390305 15.127027,17.826171 15.489277,17.228553 L 16.989277,17.697303 C 17.207208,17.316456 17.432571,16.943209 17.614277,16.541053 L 16.333027,15.603553 C 16.601517,14.966804 16.798016,14.320561 16.958027,13.634803 L 18.551777,13.634803 C 18.640112,13.207076 18.691236,12.763591 18.739277,12.322303 L 17.239277,11.853553 C 17.268139,11.509705 17.301777,11.142456 17.301777,10.791053 C 17.301776,10.43965 17.267753,10.104039 17.239277,9.7598034 L 18.739277,9.2910534 C 18.69373,8.8711662 18.633686,8.4490548 18.551777,8.0410534 C 17.404349,8.4403544 15.999117,9.1941729 14.983265,9.8245243 L 10.102903,6.2970655 z "
-       id="path3767"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccccccccsccccccccccccccccccccsccccc" />
-    <path
-       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 37.236641,17.217754 C 36.85286,17.39913 36.490003,17.603509 36.123236,17.813295 L 36.692886,19.548136 C 35.995792,19.970436 35.338156,20.467825 34.725008,20.998151 L 33.249099,19.910639 C 32.869013,20.256538 32.507327,20.618223 32.161588,20.998151 L 33.249099,22.474059 C 32.718773,23.087371 32.221547,23.745002 31.799084,24.441937 L 31.255328,24.260685 C 31.207646,24.960968 31.018949,25.62217 30.737466,26.228563 L 30.841038,26.306242 C 30.527881,27.048922 30.27649,27.83664 30.090137,28.636624 L 28.614229,28.636624 C 28.477946,28.722076 28.343676,28.821684 28.199938,28.895555 C 28.121568,29.310822 28.065026,29.712881 28.018687,30.138426 L 29.77942,30.708074 C 29.746033,31.10935 29.727633,31.515269 29.727633,31.925052 C 29.727631,32.334993 29.746034,32.740753 29.77942,33.142029 L 28.018687,33.711677 C 28.074705,34.226432 28.148678,34.740347 28.251725,35.239372 L 30.090137,35.213479 C 30.218255,35.763466 30.393202,36.320918 30.582107,36.844746 C 31.327023,36.557466 32.05594,36.214561 32.731236,35.809021 C 32.319649,34.59298 32.083908,33.279913 32.083908,31.925052 C 32.083909,26.727119 35.376289,22.288397 39.981313,20.583861 L 38.893802,20.402608 C 38.671014,19.579946 38.382478,18.774017 38.013435,18.020441 C 38.002581,17.998277 37.99851,17.96486 37.987542,17.942761 L 37.935756,17.890975 L 37.236641,17.217754 z "
-       id="path3770"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/audio-volume-high.svg Deleted

@@ -1,643 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2566"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   version="1.0"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/status"
-   sodipodi:docname="audio-volume-high.svg">
-  <defs
-     id="defs2568">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3510">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3512" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3514" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3498">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop3500" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop3502" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3281">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3283" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3285" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4099">
-      <stop
-         style="stop-color:#6f726f;stop-opacity:1;"
-         offset="0"
-         id="stop4101" />
-      <stop
-         style="stop-color:#6f726f;stop-opacity:0;"
-         offset="1"
-         id="stop4103" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4068">
-      <stop
-         style="stop-color:#eaeae9;stop-opacity:1;"
-         offset="0"
-         id="stop4070" />
-      <stop
-         style="stop-color:#a5a7a2;stop-opacity:1;"
-         offset="1"
-         id="stop4072" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3670"
-       inkscape:collect="always">
-      <stop
-         id="stop3672"
-         offset="0"
-         style="stop-color:#d3d7cf" />
-      <stop
-         id="stop3674"
-         offset="1"
-         style="stop-color:#555753" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3670"
-       id="radialGradient3634"
-       cx="6.8797626"
-       cy="7.1986876"
-       fx="6.8797626"
-       fy="7.1986876"
-       r="9.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.240749,9.690094e-9,-9.043116e-9,1.157631,-1.713645,-1.134736)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3692">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop3694" />
-      <stop
-         style="stop-color:#babdb6"
-         offset="1"
-         id="stop3696" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3692"
-       id="linearGradient3698"
-       x1="-0.51990569"
-       y1="-0.51990569"
-       x2="-0.51990569"
-       y2="19.269905"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3628">
-      <stop
-         style="stop-color:#d3d7cf"
-         offset="0"
-         id="stop3630" />
-      <stop
-         style="stop-color:#555753"
-         offset="1"
-         id="stop3632" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3628"
-       id="radialGradient3644"
-       cx="12.704856"
-       cy="13.847466"
-       fx="12.704856"
-       fy="13.847466"
-       r="9.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(6.370852e-2,-1.424475,1.547293,6.92112e-2,-9.530629,30.98681)" />
-    <linearGradient
-       id="linearGradient3730"
-       inkscape:collect="always">
-      <stop
-         id="stop3732"
-         offset="0"
-         style="stop-color:#eeeeec" />
-      <stop
-         id="stop3734"
-         offset="1"
-         style="stop-color:#888a85" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3730"
-       id="radialGradient3728"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.310032,2.110862,-2.082775,-0.305867,17.75288,16.41459)"
-       cx="-1.0016617"
-       cy="0.99004257"
-       fx="-1.0016617"
-       fy="0.99004257"
-       r="9.9205227" />
-    <linearGradient
-       id="linearGradient1557"
-       inkscape:collect="always">
-      <stop
-         id="stop1559"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         id="stop1561"
-         offset="1"
-         style="stop-color:#888a85" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1557"
-       id="linearGradient1549"
-       x1="17.0625"
-       y1="34.950001"
-       x2="20.3125"
-       y2="5.375"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3676">
-      <stop
-         style="stop-color:#eeeeec"
-         offset="0"
-         id="stop4022" />
-      <stop
-         style="stop-color:#555753"
-         offset="1"
-         id="stop3680" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3676"
-       id="radialGradient3702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.127582,1.416065,-1.630141,-0.146854,17.48751,15.56121)"
-       cx="-1.0016617"
-       cy="0.99004257"
-       fx="-1.0016617"
-       fy="0.99004257"
-       r="9.9205227" />
-    <linearGradient
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#cccdcb;stop-opacity:1;"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3674">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3676" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3678" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3657">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3659" />
-      <stop
-         style="stop-color:#bfbfbf;stop-opacity:1;"
-         offset="1"
-         id="stop3661" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4608"
-       id="linearGradient4585"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.769913,0,0,1.769913,-88.34438,10.67235)"
-       x1="56.302975"
-       y1="4.9369388"
-       x2="56.609135"
-       y2="8.6796741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4608"
-       id="linearGradient4641"
-       x1="58.015995"
-       y1="35.01503"
-       x2="57.954308"
-       y2="40.9986"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.997993,0,0,1,-97.71685,-9.352993)" />
-    <linearGradient
-       id="linearGradient4608">
-      <stop
-         style="stop-color:#eeeeec"
-         offset="0"
-         id="stop4610" />
-      <stop
-         style="stop-color:#8a8c87;stop-opacity:1;"
-         offset="1"
-         id="stop4612" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="radialGradient3615"
-       cx="6.4081554"
-       cy="17.403807"
-       fx="6.4081554"
-       fy="17.403807"
-       r="5.524272"
-       gradientTransform="matrix(1,0,0,0.416,2.706926e-15,10.16382)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3657"
-       id="linearGradient3668"
-       gradientUnits="userSpaceOnUse"
-       x1="10.4375"
-       y1="8.2899637"
-       x2="10.4375"
-       y2="18.984955"
-       gradientTransform="translate(-64.70027,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3674"
-       id="radialGradient3680"
-       cx="5.0822492"
-       cy="12.516305"
-       fx="5.0822492"
-       fy="12.516305"
-       r="2.9831069"
-       gradientTransform="matrix(1.525791,4.898427e-16,-1.480441e-8,1.768964,-8.162983e-2,6.066255)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="8.0536165"
-       y1="11.030003"
-       x2="10.4375"
-       y2="11.030003"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-64.70027,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4068"
-       id="linearGradient4095"
-       gradientUnits="userSpaceOnUse"
-       x1="7.5763841"
-       y1="20.301662"
-       x2="7.3215322"
-       y2="27.345011" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4068"
-       id="linearGradient4097"
-       gradientUnits="userSpaceOnUse"
-       x1="7.5763841"
-       y1="20.301662"
-       x2="7.3215322"
-       y2="27.345011" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4099"
-       id="linearGradient4105"
-       x1="11.125889"
-       y1="25.559732"
-       x2="9.346509"
-       y2="25.736509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.296181,0,0,1.296181,-4.978245,-7.324566)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3281"
-       id="linearGradient3287"
-       x1="4.6831215"
-       y1="24.665476"
-       x2="8.3712559"
-       y2="24.317278"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3504"
-       cx="36.82843"
-       cy="24.427677"
-       fx="36.82843"
-       fy="24.427671"
-       r="1.2404949"
-       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3506"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(21.09444,2.34445e-15,1.470518e-12,22.22672,-740.0468,-518.5196)"
-       cx="36.82843"
-       cy="24.427683"
-       fx="36.82843"
-       fy="24.427683"
-       r="1.2404949" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
-       cx="36.82843"
-       cy="24.427677"
-       fx="36.82843"
-       fy="24.427671"
-       r="1.2404949" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3510"
-       id="linearGradient3516"
-       x1="9.485774"
-       y1="22.107626"
-       x2="7.378232"
-       y2="22.637957"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.13333333"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="59.859681"
-     inkscape:cy="26.342874"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="826"
-     inkscape:window-height="578"
-     inkscape:window-x="688"
-     inkscape:window-y="529"
-     stroke="#3465a4"
-     fill="#ef2929" />
-  <metadata
-     id="metadata2571">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Volume - High</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>http://www.tango-project.org</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.42857145;color:#000000;fill:url(#radialGradient3615);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3607"
-       sodipodi:cx="6.4081554"
-       sodipodi:cy="17.403807"
-       sodipodi:rx="5.524272"
-       sodipodi:ry="2.2980971"
-       d="M 11.932427 17.403807 A 5.524272 2.2980971 0 1 1  0.88388348,17.403807 A 5.524272 2.2980971 0 1 1  11.932427 17.403807 z"
-       transform="matrix(2.901907,0,0,3.804948,-4.8525,-32.31157)" />
-    <g
-       id="g4090"
-       transform="matrix(1.296182,0,0,1.296182,-4.176277,-7.324567)">
-      <path
-         transform="matrix(1.415965,0,0,1.258558,-2.667614,-6.200669)"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         sodipodi:ry="6.3639612"
-         sodipodi:rx="3.6239223"
-         sodipodi:cy="24.665476"
-         sodipodi:cx="8.7504463"
-         id="path4076"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4095);fill-opacity:1;fill-rule:nonzero;stroke:#5d615f;stroke-width:0.57792485;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4097);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path4060"
-         sodipodi:cx="8.7504463"
-         sodipodi:cy="24.665476"
-         sodipodi:rx="3.6239223"
-         sodipodi:ry="6.3639612"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         transform="matrix(1.154526,0,0,1.154526,-0.379902,-3.63468)" />
-      <path
-         transform="matrix(1.081355,0,0,1.081355,1.232653,-1.829889)"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         sodipodi:ry="6.3639612"
-         sodipodi:rx="3.6239223"
-         sodipodi:cy="24.665476"
-         sodipodi:cx="8.7504463"
-         id="path4058"
-         style="opacity:1;color:#000000;fill:#93958f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.39560439;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3287);stroke-width:0.68416733;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path3279"
-         sodipodi:cx="8.7504463"
-         sodipodi:cy="24.665476"
-         sodipodi:rx="3.6239223"
-         sodipodi:ry="6.3639612"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         transform="matrix(1.1807,0,0,1.076971,-0.608944,-1.721744)" />
-    </g>
-    <path
-       style="color:#000000;fill:url(#linearGradient4585);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4105);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 9.4806798,18.24261 L 16.570367,12.118401 L 16.341232,37.201244 L 9.1369775,31.676187 C 6.6164956,29.613972 6.1582259,20.41939 9.4806798,18.24261 z "
-       id="path4542"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="color:#000000;fill:url(#linearGradient3516);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.5383505,21.987453 L 11.593316,18.948432 L 11.341702,22.484506 L 7.3782322,23.145502 L 7.5383505,21.987453 z "
-       id="path4544"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:0.7692308;color:#000000;fill:url(#radialGradient3680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 8.203516,30.371178 L 12.644321,33.939519 L 12.087496,31.511626 L 7.6110912,29.008887 L 8.203516,30.371178 z "
-       id="path3672"
-       sodipodi:nodetypes="ccccc" />
-    <g
-       style="display:inline"
-       id="g4006"
-       transform="matrix(1.096894,0,0,1.509271,-4.216951,-12.11812)">
-      <path
-         sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
-         id="path3726"
-         d="M 23.75,14 C 21.81001,14.049168 20.013366,14.683436 18.5,15.6875 C 18.13319,15.264088 17.60375,15 17,15 C 16.9655,15 16.912662,15.000854 16.875,15 C 16.847007,14.9998 16.806453,14.997438 16.78125,15 C 15.773145,15.102481 15,15.965001 15,17 C 15,17.60375 15.264088,18.13319 15.6875,18.5 C 14.639107,20.080181 14,21.962011 14,24 C 14,26.033681 14.611921,27.921829 15.65625,29.5 C 15.243427,29.869532 15,30.401641 15,31 C 15,32.104 15.896,33.000001 17,33 C 17.60375,33 18.13319,32.735911 18.5,32.3125 C 20.080181,33.360893 21.962011,34 24,34 C 26.03799,34 27.919819,33.360893 29.5,32.3125 C 29.86681,32.735912 30.396251,33.000001 31,33 C 32.103999,33 33,32.104001 33,31 C 33,30.39625 32.735912,29.86681 32.3125,29.5 C 33.360893,27.919819 34,26.03799 34,24 C 34,21.962011 33.360893,20.080181 32.3125,18.5 C 32.735912,18.13319 33,17.60375 33,17 C 33,15.896 32.103999,15 31,15 C 30.9655,15 30.912662,15.000854 30.875,15 C 30.847007,14.9998 30.806453,14.997438 30.78125,15 C 30.277198,15.05124 29.819299,15.298435 29.5,15.65625 C 29.493313,15.651825 29.475448,15.660659 29.46875,15.65625 C 27.894622,14.620029 26.025064,14 24,14 C 23.913827,14 23.835651,13.997829 23.75,14 z "
-         style="opacity:1;color:#000000;fill:url(#radialGradient3702);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1549);stroke-width:1.47668338;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
-         id="path3507"
-         d="M 23.75,14 C 21.81001,14.049168 20.013366,14.683436 18.5,15.6875 C 18.13319,15.264088 17.60375,15 17,15 C 16.9655,15 16.912662,15.000854 16.875,15 C 16.847007,14.9998 16.806453,14.997438 16.78125,15 C 15.773145,15.102481 15,15.965001 15,17 C 15,17.60375 15.264088,18.13319 15.6875,18.5 C 14.639107,20.080181 14,21.962011 14,24 C 14,26.033681 14.611921,27.921829 15.65625,29.5 C 15.243427,29.869532 15,30.401641 15,31 C 15,32.104 15.896,33.000001 17,33 C 17.60375,33 18.13319,32.735911 18.5,32.3125 C 20.080181,33.360893 21.962011,34 24,34 C 26.03799,34 27.919819,33.360893 29.5,32.3125 C 29.86681,32.735912 30.396251,33.000001 31,33 C 32.103999,33 33,32.104001 33,31 C 33,30.39625 32.735912,29.86681 32.3125,29.5 C 33.360893,27.919819 34,26.03799 34,24 C 34,21.962011 33.360893,20.080181 32.3125,18.5 C 32.735912,18.13319 33,17.60375 33,17 C 33,15.896 32.103999,15 31,15 C 30.9655,15 30.912662,15.000854 30.875,15 C 30.847007,14.9998 30.806453,14.997438 30.78125,15 C 30.277198,15.05124 29.819299,15.298435 29.5,15.65625 C 29.493313,15.651825 29.475448,15.660659 29.46875,15.65625 C 27.894622,14.620029 26.025064,14 24,14 C 23.913827,14 23.835651,13.997829 23.75,14 z "
-         style="opacity:1;color:#000000;fill:url(#radialGradient3728);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09104455;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         transform="matrix(0.846982,0,0,0.911415,16.71027,15.44956)"
-         d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
-         sodipodi:ry="9.375"
-         sodipodi:rx="9.375"
-         sodipodi:cy="9.375"
-         sodipodi:cx="9.375"
-         id="path3636"
-         style="opacity:1;color:#000000;fill:url(#radialGradient3644);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3698);stroke-width:0.8383193;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.367272,0,0,0.32,18.56254,21.125)"
-         d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
-         sodipodi:ry="9.375"
-         sodipodi:rx="9.375"
-         sodipodi:cy="9.375"
-         sodipodi:cx="9.375"
-         id="path3519"
-         style="opacity:1;color:#000000;fill:url(#radialGradient3634);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.57905483;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3718"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc"
-         transform="matrix(1.3125,0,0,1.3125,-4.657679,-5.09375)" />
-      <path
-         transform="translate(15.22159,0.25)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3720"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="translate(15.22159,14.96875)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3722"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.375,0,0,1.375,-5.688929,8.8125)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3724"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-    <path
-       sodipodi:nodetypes="csc"
-       id="path3488"
-       d="M 36.087935,32.865672 C 37.005198,30.700908 37.568925,27.707589 37.568925,24.427683 C 37.568925,21.147777 37.005198,18.154458 36.087935,15.989694"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3504);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3508);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 39.838951,35.702755 C 41.064624,32.810137 41.817892,28.81038 41.817892,24.427678 C 41.817892,20.044976 41.064624,16.045219 39.838951,13.152601"
-       id="path3494"
-       sodipodi:nodetypes="csc" />
-    <path
-       sodipodi:nodetypes="csc"
-       id="path3496"
-       d="M 43.487454,39.708054 C 45.148528,35.787876 46.169383,30.367266 46.169383,24.427674 C 46.169383,18.488083 45.148528,13.067472 43.487454,9.1472948"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3506);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/audio-volume-low.svg Deleted

@@ -1,641 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2566"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   version="1.0"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/status"
-   sodipodi:docname="audio-volume-low.svg">
-  <defs
-     id="defs2568">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3510">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3512" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3514" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3498">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop3500" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop3502" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3281">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3283" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3285" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4099">
-      <stop
-         style="stop-color:#6f726f;stop-opacity:1;"
-         offset="0"
-         id="stop4101" />
-      <stop
-         style="stop-color:#6f726f;stop-opacity:0;"
-         offset="1"
-         id="stop4103" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4068">
-      <stop
-         style="stop-color:#eaeae9;stop-opacity:1;"
-         offset="0"
-         id="stop4070" />
-      <stop
-         style="stop-color:#a5a7a2;stop-opacity:1;"
-         offset="1"
-         id="stop4072" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3670"
-       inkscape:collect="always">
-      <stop
-         id="stop3672"
-         offset="0"
-         style="stop-color:#d3d7cf" />
-      <stop
-         id="stop3674"
-         offset="1"
-         style="stop-color:#555753" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3670"
-       id="radialGradient3634"
-       cx="6.8797626"
-       cy="7.1986876"
-       fx="6.8797626"
-       fy="7.1986876"
-       r="9.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.240749,9.690094e-9,-9.043116e-9,1.157631,-1.713645,-1.134736)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3692">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop3694" />
-      <stop
-         style="stop-color:#babdb6"
-         offset="1"
-         id="stop3696" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3692"
-       id="linearGradient3698"
-       x1="-0.51990569"
-       y1="-0.51990569"
-       x2="-0.51990569"
-       y2="19.269905"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3628">
-      <stop
-         style="stop-color:#d3d7cf"
-         offset="0"
-         id="stop3630" />
-      <stop
-         style="stop-color:#555753"
-         offset="1"
-         id="stop3632" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3628"
-       id="radialGradient3644"
-       cx="12.704856"
-       cy="13.847466"
-       fx="12.704856"
-       fy="13.847466"
-       r="9.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(6.370852e-2,-1.424475,1.547293,6.92112e-2,-9.530629,30.98681)" />
-    <linearGradient
-       id="linearGradient3730"
-       inkscape:collect="always">
-      <stop
-         id="stop3732"
-         offset="0"
-         style="stop-color:#eeeeec" />
-      <stop
-         id="stop3734"
-         offset="1"
-         style="stop-color:#888a85" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3730"
-       id="radialGradient3728"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.310032,2.110862,-2.082775,-0.305867,17.75288,16.41459)"
-       cx="-1.0016617"
-       cy="0.99004257"
-       fx="-1.0016617"
-       fy="0.99004257"
-       r="9.9205227" />
-    <linearGradient
-       id="linearGradient1557"
-       inkscape:collect="always">
-      <stop
-         id="stop1559"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         id="stop1561"
-         offset="1"
-         style="stop-color:#888a85" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1557"
-       id="linearGradient1549"
-       x1="17.0625"
-       y1="34.950001"
-       x2="20.3125"
-       y2="5.375"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3676">
-      <stop
-         style="stop-color:#eeeeec"
-         offset="0"
-         id="stop4022" />
-      <stop
-         style="stop-color:#555753"
-         offset="1"
-         id="stop3680" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3676"
-       id="radialGradient3702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.127582,1.416065,-1.630141,-0.146854,17.48751,15.56121)"
-       cx="-1.0016617"
-       cy="0.99004257"
-       fx="-1.0016617"
-       fy="0.99004257"
-       r="9.9205227" />
-    <linearGradient
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#cccdcb;stop-opacity:1;"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3674">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3676" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3678" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3657">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3659" />
-      <stop
-         style="stop-color:#bfbfbf;stop-opacity:1;"
-         offset="1"
-         id="stop3661" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4608"
-       id="linearGradient4585"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.769913,0,0,1.769913,-88.34438,10.67235)"
-       x1="56.302975"
-       y1="4.9369388"
-       x2="56.609135"
-       y2="8.6796741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4608"
-       id="linearGradient4641"
-       x1="58.015995"
-       y1="35.01503"
-       x2="57.954308"
-       y2="40.9986"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.997993,0,0,1,-97.71685,-9.352993)" />
-    <linearGradient
-       id="linearGradient4608">
-      <stop
-         style="stop-color:#eeeeec"
-         offset="0"
-         id="stop4610" />
-      <stop
-         style="stop-color:#8a8c87;stop-opacity:1;"
-         offset="1"
-         id="stop4612" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="radialGradient3615"
-       cx="6.4081554"
-       cy="17.403807"
-       fx="6.4081554"
-       fy="17.403807"
-       r="5.524272"
-       gradientTransform="matrix(1,0,0,0.416,2.706926e-15,10.16382)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3657"
-       id="linearGradient3668"
-       gradientUnits="userSpaceOnUse"
-       x1="10.4375"
-       y1="8.2899637"
-       x2="10.4375"
-       y2="18.984955"
-       gradientTransform="translate(-64.70027,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3674"
-       id="radialGradient3680"
-       cx="5.0822492"
-       cy="12.516305"
-       fx="5.0822492"
-       fy="12.516305"
-       r="2.9831069"
-       gradientTransform="matrix(1.525791,4.898427e-16,-1.480441e-8,1.768964,-8.162983e-2,6.066255)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="8.0536165"
-       y1="11.030003"
-       x2="10.4375"
-       y2="11.030003"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-64.70027,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4068"
-       id="linearGradient4095"
-       gradientUnits="userSpaceOnUse"
-       x1="7.5763841"
-       y1="20.301662"
-       x2="7.3215322"
-       y2="27.345011" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4068"
-       id="linearGradient4097"
-       gradientUnits="userSpaceOnUse"
-       x1="7.5763841"
-       y1="20.301662"
-       x2="7.3215322"
-       y2="27.345011" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4099"
-       id="linearGradient4105"
-       x1="11.125889"
-       y1="25.559732"
-       x2="9.346509"
-       y2="25.736509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.296181,0,0,1.296181,-4.978245,-7.324566)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3281"
-       id="linearGradient3287"
-       x1="4.6831215"
-       y1="24.665476"
-       x2="8.3712559"
-       y2="24.317278"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3504"
-       cx="36.82843"
-       cy="24.427677"
-       fx="36.82843"
-       fy="24.427671"
-       r="1.2404949"
-       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3506"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(21.09444,2.34445e-15,1.470518e-12,22.22672,-740.0468,-518.5196)"
-       cx="36.82843"
-       cy="24.427683"
-       fx="36.82843"
-       fy="24.427683"
-       r="1.2404949" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
-       cx="36.82843"
-       cy="24.427677"
-       fx="36.82843"
-       fy="24.427671"
-       r="1.2404949" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3510"
-       id="linearGradient3516"
-       x1="9.485774"
-       y1="22.107626"
-       x2="7.378232"
-       y2="22.637957"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.13333333"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="59.859681"
-     inkscape:cy="26.342874"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="826"
-     inkscape:window-height="578"
-     inkscape:window-x="688"
-     inkscape:window-y="529"
-     stroke="#3465a4"
-     fill="#ef2929" />
-  <metadata
-     id="metadata2571">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Volume - Low</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>http://www.tango-project.org</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>volume</rdf:li>
-            <rdf:li>sound</rdf:li>
-            <rdf:li>level</rdf:li>
-            <rdf:li>low</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.42857145;color:#000000;fill:url(#radialGradient3615);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3607"
-       sodipodi:cx="6.4081554"
-       sodipodi:cy="17.403807"
-       sodipodi:rx="5.524272"
-       sodipodi:ry="2.2980971"
-       d="M 11.932427 17.403807 A 5.524272 2.2980971 0 1 1  0.88388348,17.403807 A 5.524272 2.2980971 0 1 1  11.932427 17.403807 z"
-       transform="matrix(2.901907,0,0,3.804948,-4.8525,-32.31157)" />
-    <g
-       id="g4090"
-       transform="matrix(1.296182,0,0,1.296182,-4.176277,-7.324567)">
-      <path
-         transform="matrix(1.415965,0,0,1.258558,-2.667614,-6.200669)"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         sodipodi:ry="6.3639612"
-         sodipodi:rx="3.6239223"
-         sodipodi:cy="24.665476"
-         sodipodi:cx="8.7504463"
-         id="path4076"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4095);fill-opacity:1;fill-rule:nonzero;stroke:#5d615f;stroke-width:0.57792485;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4097);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path4060"
-         sodipodi:cx="8.7504463"
-         sodipodi:cy="24.665476"
-         sodipodi:rx="3.6239223"
-         sodipodi:ry="6.3639612"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         transform="matrix(1.154526,0,0,1.154526,-0.379902,-3.63468)" />
-      <path
-         transform="matrix(1.081355,0,0,1.081355,1.232653,-1.829889)"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         sodipodi:ry="6.3639612"
-         sodipodi:rx="3.6239223"
-         sodipodi:cy="24.665476"
-         sodipodi:cx="8.7504463"
-         id="path4058"
-         style="opacity:1;color:#000000;fill:#93958f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.39560439;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3287);stroke-width:0.68416733;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path3279"
-         sodipodi:cx="8.7504463"
-         sodipodi:cy="24.665476"
-         sodipodi:rx="3.6239223"
-         sodipodi:ry="6.3639612"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         transform="matrix(1.1807,0,0,1.076971,-0.608944,-1.721744)" />
-    </g>
-    <path
-       style="color:#000000;fill:url(#linearGradient4585);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4105);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 9.4806798,18.24261 L 16.570367,12.118401 L 16.341232,37.201244 L 9.1369775,31.676187 C 6.6164956,29.613972 6.1582259,20.41939 9.4806798,18.24261 z "
-       id="path4542"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="color:#000000;fill:url(#linearGradient3516);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.5383505,21.987453 L 11.593316,18.948432 L 11.341702,22.484506 L 7.3782322,23.145502 L 7.5383505,21.987453 z "
-       id="path4544"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:0.7692308;color:#000000;fill:url(#radialGradient3680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 8.203516,30.371178 L 12.644321,33.939519 L 12.087496,31.511626 L 7.6110912,29.008887 L 8.203516,30.371178 z "
-       id="path3672"
-       sodipodi:nodetypes="ccccc" />
-    <g
-       style="display:inline"
-       id="g4006"
-       transform="matrix(1.096894,0,0,1.509271,-4.216951,-12.11812)">
-      <path
-         sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
-         id="path3726"
-         d="M 23.75,14 C 21.81001,14.049168 20.013366,14.683436 18.5,15.6875 C 18.13319,15.264088 17.60375,15 17,15 C 16.9655,15 16.912662,15.000854 16.875,15 C 16.847007,14.9998 16.806453,14.997438 16.78125,15 C 15.773145,15.102481 15,15.965001 15,17 C 15,17.60375 15.264088,18.13319 15.6875,18.5 C 14.639107,20.080181 14,21.962011 14,24 C 14,26.033681 14.611921,27.921829 15.65625,29.5 C 15.243427,29.869532 15,30.401641 15,31 C 15,32.104 15.896,33.000001 17,33 C 17.60375,33 18.13319,32.735911 18.5,32.3125 C 20.080181,33.360893 21.962011,34 24,34 C 26.03799,34 27.919819,33.360893 29.5,32.3125 C 29.86681,32.735912 30.396251,33.000001 31,33 C 32.103999,33 33,32.104001 33,31 C 33,30.39625 32.735912,29.86681 32.3125,29.5 C 33.360893,27.919819 34,26.03799 34,24 C 34,21.962011 33.360893,20.080181 32.3125,18.5 C 32.735912,18.13319 33,17.60375 33,17 C 33,15.896 32.103999,15 31,15 C 30.9655,15 30.912662,15.000854 30.875,15 C 30.847007,14.9998 30.806453,14.997438 30.78125,15 C 30.277198,15.05124 29.819299,15.298435 29.5,15.65625 C 29.493313,15.651825 29.475448,15.660659 29.46875,15.65625 C 27.894622,14.620029 26.025064,14 24,14 C 23.913827,14 23.835651,13.997829 23.75,14 z "
-         style="opacity:1;color:#000000;fill:url(#radialGradient3702);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1549);stroke-width:1.47668338;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
-         id="path3507"
-         d="M 23.75,14 C 21.81001,14.049168 20.013366,14.683436 18.5,15.6875 C 18.13319,15.264088 17.60375,15 17,15 C 16.9655,15 16.912662,15.000854 16.875,15 C 16.847007,14.9998 16.806453,14.997438 16.78125,15 C 15.773145,15.102481 15,15.965001 15,17 C 15,17.60375 15.264088,18.13319 15.6875,18.5 C 14.639107,20.080181 14,21.962011 14,24 C 14,26.033681 14.611921,27.921829 15.65625,29.5 C 15.243427,29.869532 15,30.401641 15,31 C 15,32.104 15.896,33.000001 17,33 C 17.60375,33 18.13319,32.735911 18.5,32.3125 C 20.080181,33.360893 21.962011,34 24,34 C 26.03799,34 27.919819,33.360893 29.5,32.3125 C 29.86681,32.735912 30.396251,33.000001 31,33 C 32.103999,33 33,32.104001 33,31 C 33,30.39625 32.735912,29.86681 32.3125,29.5 C 33.360893,27.919819 34,26.03799 34,24 C 34,21.962011 33.360893,20.080181 32.3125,18.5 C 32.735912,18.13319 33,17.60375 33,17 C 33,15.896 32.103999,15 31,15 C 30.9655,15 30.912662,15.000854 30.875,15 C 30.847007,14.9998 30.806453,14.997438 30.78125,15 C 30.277198,15.05124 29.819299,15.298435 29.5,15.65625 C 29.493313,15.651825 29.475448,15.660659 29.46875,15.65625 C 27.894622,14.620029 26.025064,14 24,14 C 23.913827,14 23.835651,13.997829 23.75,14 z "
-         style="opacity:1;color:#000000;fill:url(#radialGradient3728);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09104455;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         transform="matrix(0.846982,0,0,0.911415,16.71027,15.44956)"
-         d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
-         sodipodi:ry="9.375"
-         sodipodi:rx="9.375"
-         sodipodi:cy="9.375"
-         sodipodi:cx="9.375"
-         id="path3636"
-         style="opacity:1;color:#000000;fill:url(#radialGradient3644);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3698);stroke-width:0.8383193;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.367272,0,0,0.32,18.56254,21.125)"
-         d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
-         sodipodi:ry="9.375"
-         sodipodi:rx="9.375"
-         sodipodi:cy="9.375"
-         sodipodi:cx="9.375"
-         id="path3519"
-         style="opacity:1;color:#000000;fill:url(#radialGradient3634);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.57905483;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3718"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc"
-         transform="matrix(1.3125,0,0,1.3125,-4.657679,-5.09375)" />
-      <path
-         transform="translate(15.22159,0.25)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3720"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="translate(15.22159,14.96875)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3722"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.375,0,0,1.375,-5.688929,8.8125)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3724"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-    <path
-       sodipodi:nodetypes="csc"
-       id="path3488"
-       d="M 36.087935,32.865672 C 37.005198,30.700908 37.568925,27.707589 37.568925,24.427683 C 37.568925,21.147777 37.005198,18.154458 36.087935,15.989694"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3504);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/audio-volume-medium.svg Deleted

@@ -1,646 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2566"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   version="1.0"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/status"
-   sodipodi:docname="audio-volume-medium.svg">
-  <defs
-     id="defs2568">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3510">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3512" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3514" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3498">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop3500" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop3502" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3281">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3283" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3285" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4099">
-      <stop
-         style="stop-color:#6f726f;stop-opacity:1;"
-         offset="0"
-         id="stop4101" />
-      <stop
-         style="stop-color:#6f726f;stop-opacity:0;"
-         offset="1"
-         id="stop4103" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4068">
-      <stop
-         style="stop-color:#eaeae9;stop-opacity:1;"
-         offset="0"
-         id="stop4070" />
-      <stop
-         style="stop-color:#a5a7a2;stop-opacity:1;"
-         offset="1"
-         id="stop4072" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3670"
-       inkscape:collect="always">
-      <stop
-         id="stop3672"
-         offset="0"
-         style="stop-color:#d3d7cf" />
-      <stop
-         id="stop3674"
-         offset="1"
-         style="stop-color:#555753" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3670"
-       id="radialGradient3634"
-       cx="6.8797626"
-       cy="7.1986876"
-       fx="6.8797626"
-       fy="7.1986876"
-       r="9.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.240749,9.690094e-9,-9.043116e-9,1.157631,-1.713645,-1.134736)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3692">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop3694" />
-      <stop
-         style="stop-color:#babdb6"
-         offset="1"
-         id="stop3696" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3692"
-       id="linearGradient3698"
-       x1="-0.51990569"
-       y1="-0.51990569"
-       x2="-0.51990569"
-       y2="19.269905"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3628">
-      <stop
-         style="stop-color:#d3d7cf"
-         offset="0"
-         id="stop3630" />
-      <stop
-         style="stop-color:#555753"
-         offset="1"
-         id="stop3632" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3628"
-       id="radialGradient3644"
-       cx="12.704856"
-       cy="13.847466"
-       fx="12.704856"
-       fy="13.847466"
-       r="9.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(6.370852e-2,-1.424475,1.547293,6.92112e-2,-9.530629,30.98681)" />
-    <linearGradient
-       id="linearGradient3730"
-       inkscape:collect="always">
-      <stop
-         id="stop3732"
-         offset="0"
-         style="stop-color:#eeeeec" />
-      <stop
-         id="stop3734"
-         offset="1"
-         style="stop-color:#888a85" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3730"
-       id="radialGradient3728"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.310032,2.110862,-2.082775,-0.305867,17.75288,16.41459)"
-       cx="-1.0016617"
-       cy="0.99004257"
-       fx="-1.0016617"
-       fy="0.99004257"
-       r="9.9205227" />
-    <linearGradient
-       id="linearGradient1557"
-       inkscape:collect="always">
-      <stop
-         id="stop1559"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         id="stop1561"
-         offset="1"
-         style="stop-color:#888a85" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1557"
-       id="linearGradient1549"
-       x1="17.0625"
-       y1="34.950001"
-       x2="20.3125"
-       y2="5.375"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3676">
-      <stop
-         style="stop-color:#eeeeec"
-         offset="0"
-         id="stop4022" />
-      <stop
-         style="stop-color:#555753"
-         offset="1"
-         id="stop3680" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3676"
-       id="radialGradient3702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.127582,1.416065,-1.630141,-0.146854,17.48751,15.56121)"
-       cx="-1.0016617"
-       cy="0.99004257"
-       fx="-1.0016617"
-       fy="0.99004257"
-       r="9.9205227" />
-    <linearGradient
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#cccdcb;stop-opacity:1;"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3674">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3676" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3678" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3657">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3659" />
-      <stop
-         style="stop-color:#bfbfbf;stop-opacity:1;"
-         offset="1"
-         id="stop3661" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4608"
-       id="linearGradient4585"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.769913,0,0,1.769913,-88.34438,10.67235)"
-       x1="56.302975"
-       y1="4.9369388"
-       x2="56.609135"
-       y2="8.6796741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4608"
-       id="linearGradient4641"
-       x1="58.015995"
-       y1="35.01503"
-       x2="57.954308"
-       y2="40.9986"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.997993,0,0,1,-97.71685,-9.352993)" />
-    <linearGradient
-       id="linearGradient4608">
-      <stop
-         style="stop-color:#eeeeec"
-         offset="0"
-         id="stop4610" />
-      <stop
-         style="stop-color:#8a8c87;stop-opacity:1;"
-         offset="1"
-         id="stop4612" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="radialGradient3615"
-       cx="6.4081554"
-       cy="17.403807"
-       fx="6.4081554"
-       fy="17.403807"
-       r="5.524272"
-       gradientTransform="matrix(1,0,0,0.416,2.706926e-15,10.16382)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3657"
-       id="linearGradient3668"
-       gradientUnits="userSpaceOnUse"
-       x1="10.4375"
-       y1="8.2899637"
-       x2="10.4375"
-       y2="18.984955"
-       gradientTransform="translate(-64.70027,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3674"
-       id="radialGradient3680"
-       cx="5.0822492"
-       cy="12.516305"
-       fx="5.0822492"
-       fy="12.516305"
-       r="2.9831069"
-       gradientTransform="matrix(1.525791,4.898427e-16,-1.480441e-8,1.768964,-8.162983e-2,6.066255)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="8.0536165"
-       y1="11.030003"
-       x2="10.4375"
-       y2="11.030003"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-64.70027,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4068"
-       id="linearGradient4095"
-       gradientUnits="userSpaceOnUse"
-       x1="7.5763841"
-       y1="20.301662"
-       x2="7.3215322"
-       y2="27.345011" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4068"
-       id="linearGradient4097"
-       gradientUnits="userSpaceOnUse"
-       x1="7.5763841"
-       y1="20.301662"
-       x2="7.3215322"
-       y2="27.345011" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4099"
-       id="linearGradient4105"
-       x1="11.125889"
-       y1="25.559732"
-       x2="9.346509"
-       y2="25.736509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.296181,0,0,1.296181,-4.978245,-7.324566)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3281"
-       id="linearGradient3287"
-       x1="4.6831215"
-       y1="24.665476"
-       x2="8.3712559"
-       y2="24.317278"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3504"
-       cx="36.82843"
-       cy="24.427677"
-       fx="36.82843"
-       fy="24.427671"
-       r="1.2404949"
-       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3506"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(21.09444,2.34445e-15,1.470518e-12,22.22672,-740.0468,-518.5196)"
-       cx="36.82843"
-       cy="24.427683"
-       fx="36.82843"
-       fy="24.427683"
-       r="1.2404949" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
-       cx="36.82843"
-       cy="24.427677"
-       fx="36.82843"
-       fy="24.427671"
-       r="1.2404949" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3510"
-       id="linearGradient3516"
-       x1="9.485774"
-       y1="22.107626"
-       x2="7.378232"
-       y2="22.637957"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.13333333"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="59.859681"
-     inkscape:cy="26.342874"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="826"
-     inkscape:window-height="578"
-     inkscape:window-x="688"
-     inkscape:window-y="529"
-     stroke="#3465a4"
-     fill="#ef2929" />
-  <metadata
-     id="metadata2571">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Volume - Medium</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>http://www.tango-project.org</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>volume</rdf:li>
-            <rdf:li>sound</rdf:li>
-            <rdf:li>level</rdf:li>
-            <rdf:li>medium</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.42857145;color:#000000;fill:url(#radialGradient3615);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3607"
-       sodipodi:cx="6.4081554"
-       sodipodi:cy="17.403807"
-       sodipodi:rx="5.524272"
-       sodipodi:ry="2.2980971"
-       d="M 11.932427 17.403807 A 5.524272 2.2980971 0 1 1  0.88388348,17.403807 A 5.524272 2.2980971 0 1 1  11.932427 17.403807 z"
-       transform="matrix(2.901907,0,0,3.804948,-4.8525,-32.31157)" />
-    <g
-       id="g4090"
-       transform="matrix(1.296182,0,0,1.296182,-4.176277,-7.324567)">
-      <path
-         transform="matrix(1.415965,0,0,1.258558,-2.667614,-6.200669)"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         sodipodi:ry="6.3639612"
-         sodipodi:rx="3.6239223"
-         sodipodi:cy="24.665476"
-         sodipodi:cx="8.7504463"
-         id="path4076"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4095);fill-opacity:1;fill-rule:nonzero;stroke:#5d615f;stroke-width:0.57792485;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4097);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path4060"
-         sodipodi:cx="8.7504463"
-         sodipodi:cy="24.665476"
-         sodipodi:rx="3.6239223"
-         sodipodi:ry="6.3639612"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         transform="matrix(1.154526,0,0,1.154526,-0.379902,-3.63468)" />
-      <path
-         transform="matrix(1.081355,0,0,1.081355,1.232653,-1.829889)"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         sodipodi:ry="6.3639612"
-         sodipodi:rx="3.6239223"
-         sodipodi:cy="24.665476"
-         sodipodi:cx="8.7504463"
-         id="path4058"
-         style="opacity:1;color:#000000;fill:#93958f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.39560439;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3287);stroke-width:0.68416733;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path3279"
-         sodipodi:cx="8.7504463"
-         sodipodi:cy="24.665476"
-         sodipodi:rx="3.6239223"
-         sodipodi:ry="6.3639612"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         transform="matrix(1.1807,0,0,1.076971,-0.608944,-1.721744)" />
-    </g>
-    <path
-       style="color:#000000;fill:url(#linearGradient4585);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4105);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 9.4806798,18.24261 L 16.570367,12.118401 L 16.341232,37.201244 L 9.1369775,31.676187 C 6.6164956,29.613972 6.1582259,20.41939 9.4806798,18.24261 z "
-       id="path4542"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="color:#000000;fill:url(#linearGradient3516);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.5383505,21.987453 L 11.593316,18.948432 L 11.341702,22.484506 L 7.3782322,23.145502 L 7.5383505,21.987453 z "
-       id="path4544"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:0.7692308;color:#000000;fill:url(#radialGradient3680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 8.203516,30.371178 L 12.644321,33.939519 L 12.087496,31.511626 L 7.6110912,29.008887 L 8.203516,30.371178 z "
-       id="path3672"
-       sodipodi:nodetypes="ccccc" />
-    <g
-       style="display:inline"
-       id="g4006"
-       transform="matrix(1.096894,0,0,1.509271,-4.216951,-12.11812)">
-      <path
-         sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
-         id="path3726"
-         d="M 23.75,14 C 21.81001,14.049168 20.013366,14.683436 18.5,15.6875 C 18.13319,15.264088 17.60375,15 17,15 C 16.9655,15 16.912662,15.000854 16.875,15 C 16.847007,14.9998 16.806453,14.997438 16.78125,15 C 15.773145,15.102481 15,15.965001 15,17 C 15,17.60375 15.264088,18.13319 15.6875,18.5 C 14.639107,20.080181 14,21.962011 14,24 C 14,26.033681 14.611921,27.921829 15.65625,29.5 C 15.243427,29.869532 15,30.401641 15,31 C 15,32.104 15.896,33.000001 17,33 C 17.60375,33 18.13319,32.735911 18.5,32.3125 C 20.080181,33.360893 21.962011,34 24,34 C 26.03799,34 27.919819,33.360893 29.5,32.3125 C 29.86681,32.735912 30.396251,33.000001 31,33 C 32.103999,33 33,32.104001 33,31 C 33,30.39625 32.735912,29.86681 32.3125,29.5 C 33.360893,27.919819 34,26.03799 34,24 C 34,21.962011 33.360893,20.080181 32.3125,18.5 C 32.735912,18.13319 33,17.60375 33,17 C 33,15.896 32.103999,15 31,15 C 30.9655,15 30.912662,15.000854 30.875,15 C 30.847007,14.9998 30.806453,14.997438 30.78125,15 C 30.277198,15.05124 29.819299,15.298435 29.5,15.65625 C 29.493313,15.651825 29.475448,15.660659 29.46875,15.65625 C 27.894622,14.620029 26.025064,14 24,14 C 23.913827,14 23.835651,13.997829 23.75,14 z "
-         style="opacity:1;color:#000000;fill:url(#radialGradient3702);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1549);stroke-width:1.47668338;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
-         id="path3507"
-         d="M 23.75,14 C 21.81001,14.049168 20.013366,14.683436 18.5,15.6875 C 18.13319,15.264088 17.60375,15 17,15 C 16.9655,15 16.912662,15.000854 16.875,15 C 16.847007,14.9998 16.806453,14.997438 16.78125,15 C 15.773145,15.102481 15,15.965001 15,17 C 15,17.60375 15.264088,18.13319 15.6875,18.5 C 14.639107,20.080181 14,21.962011 14,24 C 14,26.033681 14.611921,27.921829 15.65625,29.5 C 15.243427,29.869532 15,30.401641 15,31 C 15,32.104 15.896,33.000001 17,33 C 17.60375,33 18.13319,32.735911 18.5,32.3125 C 20.080181,33.360893 21.962011,34 24,34 C 26.03799,34 27.919819,33.360893 29.5,32.3125 C 29.86681,32.735912 30.396251,33.000001 31,33 C 32.103999,33 33,32.104001 33,31 C 33,30.39625 32.735912,29.86681 32.3125,29.5 C 33.360893,27.919819 34,26.03799 34,24 C 34,21.962011 33.360893,20.080181 32.3125,18.5 C 32.735912,18.13319 33,17.60375 33,17 C 33,15.896 32.103999,15 31,15 C 30.9655,15 30.912662,15.000854 30.875,15 C 30.847007,14.9998 30.806453,14.997438 30.78125,15 C 30.277198,15.05124 29.819299,15.298435 29.5,15.65625 C 29.493313,15.651825 29.475448,15.660659 29.46875,15.65625 C 27.894622,14.620029 26.025064,14 24,14 C 23.913827,14 23.835651,13.997829 23.75,14 z "
-         style="opacity:1;color:#000000;fill:url(#radialGradient3728);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09104455;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         transform="matrix(0.846982,0,0,0.911415,16.71027,15.44956)"
-         d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
-         sodipodi:ry="9.375"
-         sodipodi:rx="9.375"
-         sodipodi:cy="9.375"
-         sodipodi:cx="9.375"
-         id="path3636"
-         style="opacity:1;color:#000000;fill:url(#radialGradient3644);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3698);stroke-width:0.8383193;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.367272,0,0,0.32,18.56254,21.125)"
-         d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
-         sodipodi:ry="9.375"
-         sodipodi:rx="9.375"
-         sodipodi:cy="9.375"
-         sodipodi:cx="9.375"
-         id="path3519"
-         style="opacity:1;color:#000000;fill:url(#radialGradient3634);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.57905483;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3718"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc"
-         transform="matrix(1.3125,0,0,1.3125,-4.657679,-5.09375)" />
-      <path
-         transform="translate(15.22159,0.25)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3720"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="translate(15.22159,14.96875)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3722"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.375,0,0,1.375,-5.688929,8.8125)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3724"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-    <path
-       sodipodi:nodetypes="csc"
-       id="path3488"
-       d="M 36.087935,32.865672 C 37.005198,30.700908 37.568925,27.707589 37.568925,24.427683 C 37.568925,21.147777 37.005198,18.154458 36.087935,15.989694"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3504);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3508);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 39.838951,35.702755 C 41.064624,32.810137 41.817892,28.81038 41.817892,24.427678 C 41.817892,20.044976 41.064624,16.045219 39.838951,13.152601"
-       id="path3494"
-       sodipodi:nodetypes="csc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/audio-volume-muted.svg Deleted

@@ -1,991 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2566"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   version="1.0"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/status"
-   sodipodi:docname="audio-volume-muted.svg">
-  <defs
-     id="defs2568">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3510">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3512" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3514" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3498">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop3500" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop3502" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3281">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3283" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3285" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4099">
-      <stop
-         style="stop-color:#6f726f;stop-opacity:1;"
-         offset="0"
-         id="stop4101" />
-      <stop
-         style="stop-color:#6f726f;stop-opacity:0;"
-         offset="1"
-         id="stop4103" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4068">
-      <stop
-         style="stop-color:#eaeae9;stop-opacity:1;"
-         offset="0"
-         id="stop4070" />
-      <stop
-         style="stop-color:#a5a7a2;stop-opacity:1;"
-         offset="1"
-         id="stop4072" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3670"
-       inkscape:collect="always">
-      <stop
-         id="stop3672"
-         offset="0"
-         style="stop-color:#d3d7cf" />
-      <stop
-         id="stop3674"
-         offset="1"
-         style="stop-color:#555753" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3670"
-       id="radialGradient3634"
-       cx="6.8797626"
-       cy="7.1986876"
-       fx="6.8797626"
-       fy="7.1986876"
-       r="9.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.240749,9.690094e-9,-9.043116e-9,1.157631,-1.713645,-1.134736)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3692">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop3694" />
-      <stop
-         style="stop-color:#babdb6"
-         offset="1"
-         id="stop3696" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3692"
-       id="linearGradient3698"
-       x1="-0.51990569"
-       y1="-0.51990569"
-       x2="-0.51990569"
-       y2="19.269905"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3628">
-      <stop
-         style="stop-color:#d3d7cf"
-         offset="0"
-         id="stop3630" />
-      <stop
-         style="stop-color:#555753"
-         offset="1"
-         id="stop3632" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3628"
-       id="radialGradient3644"
-       cx="12.704856"
-       cy="13.847466"
-       fx="12.704856"
-       fy="13.847466"
-       r="9.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(6.370852e-2,-1.424475,1.547293,6.92112e-2,-9.530629,30.98681)" />
-    <linearGradient
-       id="linearGradient3730"
-       inkscape:collect="always">
-      <stop
-         id="stop3732"
-         offset="0"
-         style="stop-color:#eeeeec" />
-      <stop
-         id="stop3734"
-         offset="1"
-         style="stop-color:#888a85" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3730"
-       id="radialGradient3728"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.310032,2.110862,-2.082775,-0.305867,17.75288,16.41459)"
-       cx="-1.0016617"
-       cy="0.99004257"
-       fx="-1.0016617"
-       fy="0.99004257"
-       r="9.9205227" />
-    <linearGradient
-       id="linearGradient1557"
-       inkscape:collect="always">
-      <stop
-         id="stop1559"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         id="stop1561"
-         offset="1"
-         style="stop-color:#888a85" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1557"
-       id="linearGradient1549"
-       x1="17.0625"
-       y1="34.950001"
-       x2="20.3125"
-       y2="5.375"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3676">
-      <stop
-         style="stop-color:#eeeeec"
-         offset="0"
-         id="stop4022" />
-      <stop
-         style="stop-color:#555753"
-         offset="1"
-         id="stop3680" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3676"
-       id="radialGradient3702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.127582,1.416065,-1.630141,-0.146854,17.48751,15.56121)"
-       cx="-1.0016617"
-       cy="0.99004257"
-       fx="-1.0016617"
-       fy="0.99004257"
-       r="9.9205227" />
-    <linearGradient
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#cccdcb;stop-opacity:1;"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3674">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3676" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3678" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3657">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3659" />
-      <stop
-         style="stop-color:#bfbfbf;stop-opacity:1;"
-         offset="1"
-         id="stop3661" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4608"
-       id="linearGradient4585"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.769913,0,0,1.769913,-88.34438,10.67235)"
-       x1="56.302975"
-       y1="4.9369388"
-       x2="56.609135"
-       y2="8.6796741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4608"
-       id="linearGradient4641"
-       x1="58.015995"
-       y1="35.01503"
-       x2="57.954308"
-       y2="40.9986"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.997993,0,0,1,-97.71685,-9.352993)" />
-    <linearGradient
-       id="linearGradient4608">
-      <stop
-         style="stop-color:#eeeeec"
-         offset="0"
-         id="stop4610" />
-      <stop
-         style="stop-color:#8a8c87;stop-opacity:1;"
-         offset="1"
-         id="stop4612" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="radialGradient3615"
-       cx="6.4081554"
-       cy="17.403807"
-       fx="6.4081554"
-       fy="17.403807"
-       r="5.524272"
-       gradientTransform="matrix(1,0,0,0.416,2.706926e-15,10.16382)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3657"
-       id="linearGradient3668"
-       gradientUnits="userSpaceOnUse"
-       x1="10.4375"
-       y1="8.2899637"
-       x2="10.4375"
-       y2="18.984955"
-       gradientTransform="translate(-64.70027,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3674"
-       id="radialGradient3680"
-       cx="5.0822492"
-       cy="12.516305"
-       fx="5.0822492"
-       fy="12.516305"
-       r="2.9831069"
-       gradientTransform="matrix(1.525791,4.898427e-16,-1.480441e-8,1.768964,-8.162983e-2,6.066255)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="8.0536165"
-       y1="11.030003"
-       x2="10.4375"
-       y2="11.030003"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-64.70027,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4068"
-       id="linearGradient4095"
-       gradientUnits="userSpaceOnUse"
-       x1="7.5763841"
-       y1="20.301662"
-       x2="7.3215322"
-       y2="27.345011" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4068"
-       id="linearGradient4097"
-       gradientUnits="userSpaceOnUse"
-       x1="7.5763841"
-       y1="20.301662"
-       x2="7.3215322"
-       y2="27.345011" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4099"
-       id="linearGradient4105"
-       x1="11.125889"
-       y1="25.559732"
-       x2="9.346509"
-       y2="25.736509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.296181,0,0,1.296181,-4.978245,-7.324566)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3281"
-       id="linearGradient3287"
-       x1="4.6831215"
-       y1="24.665476"
-       x2="8.3712559"
-       y2="24.317278"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3504"
-       cx="36.82843"
-       cy="24.427677"
-       fx="36.82843"
-       fy="24.427671"
-       r="1.2404949"
-       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3506"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(21.09444,2.34445e-15,1.470518e-12,22.22672,-740.0468,-518.5196)"
-       cx="36.82843"
-       cy="24.427683"
-       fx="36.82843"
-       fy="24.427683"
-       r="1.2404949" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3498"
-       id="radialGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
-       cx="36.82843"
-       cy="24.427677"
-       fx="36.82843"
-       fy="24.427671"
-       r="1.2404949" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3510"
-       id="linearGradient3516"
-       x1="9.485774"
-       y1="22.107626"
-       x2="7.378232"
-       y2="22.637957"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient12962"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,1.166195e-16,-4.328308e-17,0.338462,-4.615251e-14,29.48178)"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12941"
-       gradientUnits="userSpaceOnUse"
-       x1="65.623963"
-       y1="21.459777"
-       x2="87.528968"
-       y2="21.459777"
-       gradientTransform="matrix(0.755725,0,0,0.755725,-25.19847,17.09924)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12836"
-       id="linearGradient12934"
-       gradientUnits="userSpaceOnUse"
-       x1="88.750000"
-       y1="31.656250"
-       x2="92.062500"
-       y2="36.656250"
-       gradientTransform="matrix(0.755725,0,0,0.755725,-24.84491,17.27602)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12828"
-       id="radialGradient12931"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.732463,0.172296,-0.147115,0.625415,-17.70794,5.185566)"
-       cx="88.593018"
-       cy="33.398670"
-       fx="88.593018"
-       fy="33.398670"
-       r="7.0056136" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12927"
-       gradientUnits="userSpaceOnUse"
-       x1="84.998962"
-       y1="25.209778"
-       x2="62.591469"
-       y2="12.022278"
-       gradientTransform="matrix(0.755725,0,0,0.755725,-25.19847,17.09924)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.985,0,0,1.022813,-1.675625,-6.638771)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12921"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.985,0,0,1,0.315001,-6.000012)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12918"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.01625,0,0,1,1.65875,-6.000012)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11615"
-       id="radialGradient12909"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.070491,2.727143e-15,-3.444813e-15,3.878514,-55.26225,-82.65742)"
-       cx="25.000000"
-       cy="27.749998"
-       fx="25.000000"
-       fy="27.749998"
-       r="4.7500000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11602"
-       id="linearGradient11608"
-       x1="24.445671"
-       y1="12.947163"
-       x2="24.445671"
-       y2="39.447163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.837825,-2.875,0.164729)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11594"
-       id="linearGradient11600"
-       x1="20.092352"
-       y1="8.9471626"
-       x2="31.799011"
-       y2="38.947163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061966,0,0,0.837825,-4.389811,0.164729)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient11532"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.338462,-5.637071e-14,29.48178)"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient11526"
-       cx="24.445690"
-       cy="35.878170"
-       fx="24.445690"
-       fy="35.878170"
-       r="20.530962"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.995058,-1.383691e-32,0,1.67151,-27.19988,-29.02822)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11508">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11510" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11512" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11520">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11522" />
-      <stop
-         style="stop-color:#dcdcdc;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11524" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11594">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop11596" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11598" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11602">
-      <stop
-         style="stop-color:#f6f6f6;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11604" />
-      <stop
-         style="stop-color:#e0e0e0;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11606" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11615">
-      <stop
-         style="stop-color:#636363;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11617" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11619" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11625">
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
-         offset="0"
-         id="stop11627" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:0;"
-         offset="1"
-         id="stop11629" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12810">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop12812" />
-      <stop
-         style="stop-color:#e5e5e5;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop12814" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12828">
-      <stop
-         style="stop-color:#cccccd;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop12830" />
-      <stop
-         id="stop12862"
-         offset="0.0000000"
-         style="stop-color:#adadae;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#8f8f90;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop12832" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12836">
-      <stop
-         style="stop-color:#515152;stop-opacity:1;"
-         offset="0"
-         id="stop12838" />
-      <stop
-         style="stop-color:#515152;stop-opacity:0;"
-         offset="1"
-         id="stop12840" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient2582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.01625,0,0,1,57.23713,-30.52133)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient2585"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.985,0,0,1,55.89338,-30.52133)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient2588"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.985,0,0,1.022813,53.90276,-31.16009)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11615"
-       id="radialGradient2591"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.070491,2.727143e-15,-3.444813e-15,3.878514,0.31613,-107.1787)"
-       cx="25.000000"
-       cy="27.749998"
-       fx="25.000000"
-       fy="27.749998"
-       r="4.7500000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11602"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.837825,52.70338,-24.35659)"
-       x1="24.445671"
-       y1="12.947163"
-       x2="24.445671"
-       y2="39.447163" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11594"
-       id="linearGradient2596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061966,0,0,0.837825,51.18857,-24.35659)"
-       x1="20.092352"
-       y1="8.9471626"
-       x2="31.799011"
-       y2="38.947163" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient2601"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.995058,-1.383691e-32,0,1.67151,28.3785,-53.54954)"
-       cx="24.445690"
-       cy="35.878170"
-       fx="24.445690"
-       fy="35.878170"
-       r="20.530962" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.13333333"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="63.453068"
-     inkscape:cy="25.886691"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="826"
-     inkscape:window-height="578"
-     inkscape:window-x="688"
-     inkscape:window-y="529"
-     stroke="#3465a4"
-     fill="#ef2929" />
-  <metadata
-     id="metadata2571">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Volume - Muted</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>http://www.tango-project.org</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>volume</rdf:li>
-            <rdf:li>sound</rdf:li>
-            <rdf:li>level</rdf:li>
-            <rdf:li>none</rdf:li>
-            <rdf:li>mute</rdf:li>
-            <rdf:li>muted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.42857145;color:#000000;fill:url(#radialGradient3615);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3607"
-       sodipodi:cx="6.4081554"
-       sodipodi:cy="17.403807"
-       sodipodi:rx="5.524272"
-       sodipodi:ry="2.2980971"
-       d="M 11.932427 17.403807 A 5.524272 2.2980971 0 1 1  0.88388348,17.403807 A 5.524272 2.2980971 0 1 1  11.932427 17.403807 z"
-       transform="matrix(2.901907,0,0,3.804948,-4.8525,-32.31157)" />
-    <g
-       id="g4090"
-       transform="matrix(1.296182,0,0,1.296182,-4.176277,-7.324567)">
-      <path
-         transform="matrix(1.415965,0,0,1.258558,-2.667614,-6.200669)"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         sodipodi:ry="6.3639612"
-         sodipodi:rx="3.6239223"
-         sodipodi:cy="24.665476"
-         sodipodi:cx="8.7504463"
-         id="path4076"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4095);fill-opacity:1;fill-rule:nonzero;stroke:#5d615f;stroke-width:0.57792485;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4097);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path4060"
-         sodipodi:cx="8.7504463"
-         sodipodi:cy="24.665476"
-         sodipodi:rx="3.6239223"
-         sodipodi:ry="6.3639612"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         transform="matrix(1.154526,0,0,1.154526,-0.379902,-3.63468)" />
-      <path
-         transform="matrix(1.081355,0,0,1.081355,1.232653,-1.829889)"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         sodipodi:ry="6.3639612"
-         sodipodi:rx="3.6239223"
-         sodipodi:cy="24.665476"
-         sodipodi:cx="8.7504463"
-         id="path4058"
-         style="opacity:1;color:#000000;fill:#93958f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.39560439;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3287);stroke-width:0.68416733;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path3279"
-         sodipodi:cx="8.7504463"
-         sodipodi:cy="24.665476"
-         sodipodi:rx="3.6239223"
-         sodipodi:ry="6.3639612"
-         d="M 12.374369 24.665476 A 3.6239223 6.3639612 0 1 1  5.126524,24.665476 A 3.6239223 6.3639612 0 1 1  12.374369 24.665476 z"
-         transform="matrix(1.1807,0,0,1.076971,-0.608944,-1.721744)" />
-    </g>
-    <path
-       style="color:#000000;fill:url(#linearGradient4585);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4105);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 9.4806798,18.24261 L 16.570367,12.118401 L 16.341232,37.201244 L 9.1369775,31.676187 C 6.6164956,29.613972 6.1582259,20.41939 9.4806798,18.24261 z "
-       id="path4542"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="color:#000000;fill:url(#linearGradient3516);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.5383505,21.987453 L 11.593316,18.948432 L 11.341702,22.484506 L 7.3782322,23.145502 L 7.5383505,21.987453 z "
-       id="path4544"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:0.7692308;color:#000000;fill:url(#radialGradient3680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 8.203516,30.371178 L 12.644321,33.939519 L 12.087496,31.511626 L 7.6110912,29.008887 L 8.203516,30.371178 z "
-       id="path3672"
-       sodipodi:nodetypes="ccccc" />
-    <g
-       style="display:inline"
-       id="g4006"
-       transform="matrix(1.096894,0,0,1.509271,-4.216951,-12.11812)">
-      <path
-         sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
-         id="path3726"
-         d="M 23.75,14 C 21.81001,14.049168 20.013366,14.683436 18.5,15.6875 C 18.13319,15.264088 17.60375,15 17,15 C 16.9655,15 16.912662,15.000854 16.875,15 C 16.847007,14.9998 16.806453,14.997438 16.78125,15 C 15.773145,15.102481 15,15.965001 15,17 C 15,17.60375 15.264088,18.13319 15.6875,18.5 C 14.639107,20.080181 14,21.962011 14,24 C 14,26.033681 14.611921,27.921829 15.65625,29.5 C 15.243427,29.869532 15,30.401641 15,31 C 15,32.104 15.896,33.000001 17,33 C 17.60375,33 18.13319,32.735911 18.5,32.3125 C 20.080181,33.360893 21.962011,34 24,34 C 26.03799,34 27.919819,33.360893 29.5,32.3125 C 29.86681,32.735912 30.396251,33.000001 31,33 C 32.103999,33 33,32.104001 33,31 C 33,30.39625 32.735912,29.86681 32.3125,29.5 C 33.360893,27.919819 34,26.03799 34,24 C 34,21.962011 33.360893,20.080181 32.3125,18.5 C 32.735912,18.13319 33,17.60375 33,17 C 33,15.896 32.103999,15 31,15 C 30.9655,15 30.912662,15.000854 30.875,15 C 30.847007,14.9998 30.806453,14.997438 30.78125,15 C 30.277198,15.05124 29.819299,15.298435 29.5,15.65625 C 29.493313,15.651825 29.475448,15.660659 29.46875,15.65625 C 27.894622,14.620029 26.025064,14 24,14 C 23.913827,14 23.835651,13.997829 23.75,14 z "
-         style="opacity:1;color:#000000;fill:url(#radialGradient3702);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1549);stroke-width:1.47668338;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
-         id="path3507"
-         d="M 23.75,14 C 21.81001,14.049168 20.013366,14.683436 18.5,15.6875 C 18.13319,15.264088 17.60375,15 17,15 C 16.9655,15 16.912662,15.000854 16.875,15 C 16.847007,14.9998 16.806453,14.997438 16.78125,15 C 15.773145,15.102481 15,15.965001 15,17 C 15,17.60375 15.264088,18.13319 15.6875,18.5 C 14.639107,20.080181 14,21.962011 14,24 C 14,26.033681 14.611921,27.921829 15.65625,29.5 C 15.243427,29.869532 15,30.401641 15,31 C 15,32.104 15.896,33.000001 17,33 C 17.60375,33 18.13319,32.735911 18.5,32.3125 C 20.080181,33.360893 21.962011,34 24,34 C 26.03799,34 27.919819,33.360893 29.5,32.3125 C 29.86681,32.735912 30.396251,33.000001 31,33 C 32.103999,33 33,32.104001 33,31 C 33,30.39625 32.735912,29.86681 32.3125,29.5 C 33.360893,27.919819 34,26.03799 34,24 C 34,21.962011 33.360893,20.080181 32.3125,18.5 C 32.735912,18.13319 33,17.60375 33,17 C 33,15.896 32.103999,15 31,15 C 30.9655,15 30.912662,15.000854 30.875,15 C 30.847007,14.9998 30.806453,14.997438 30.78125,15 C 30.277198,15.05124 29.819299,15.298435 29.5,15.65625 C 29.493313,15.651825 29.475448,15.660659 29.46875,15.65625 C 27.894622,14.620029 26.025064,14 24,14 C 23.913827,14 23.835651,13.997829 23.75,14 z "
-         style="opacity:1;color:#000000;fill:url(#radialGradient3728);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09104455;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         transform="matrix(0.846982,0,0,0.911415,16.71027,15.44956)"
-         d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
-         sodipodi:ry="9.375"
-         sodipodi:rx="9.375"
-         sodipodi:cy="9.375"
-         sodipodi:cx="9.375"
-         id="path3636"
-         style="opacity:1;color:#000000;fill:url(#radialGradient3644);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3698);stroke-width:0.8383193;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.367272,0,0,0.32,18.56254,21.125)"
-         d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
-         sodipodi:ry="9.375"
-         sodipodi:rx="9.375"
-         sodipodi:cy="9.375"
-         sodipodi:cx="9.375"
-         id="path3519"
-         style="opacity:1;color:#000000;fill:url(#radialGradient3634);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.57905483;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3718"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc"
-         transform="matrix(1.3125,0,0,1.3125,-4.657679,-5.09375)" />
-      <path
-         transform="translate(15.22159,0.25)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3720"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="translate(15.22159,14.96875)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3722"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.375,0,0,1.375,-5.688929,8.8125)"
-         d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
-         sodipodi:ry="0.5"
-         sodipodi:rx="0.5"
-         sodipodi:cy="16.5"
-         sodipodi:cx="16.5"
-         id="path3724"
-         style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-    <rect
-       style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1686"
-       width="20"
-       height="19"
-       x="26.612129"
-       y="27.550642"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       rx="2.2097087"
-       ry="2.2097087" />
-    <g
-       id="g2254"
-       transform="matrix(0.779029,0,0,0.779029,26.80797,8.226563)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="path1377"
-         d="M 8,32 L 18,42"
-         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.56729817;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.56729817;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 18,32 L 8,42"
-         id="path2252"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-    </g>
-    <rect
-       ry="1.5847089"
-       rx="1.5847089"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       y="28.455404"
-       x="27.56451"
-       height="17.190477"
-       width="18.09524"
-       id="rect2258"
-       style="opacity:0.4;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/audio-x-generic.svg Deleted

@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="audio-x-generic.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/mimetypes"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg7032"
-   height="48.000000px"
-   width="48.000000px"
-    viewbox = "0 0 48 48"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2072">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2074" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2076" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2315">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2317" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2319" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2315"
-       id="radialGradient1358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,-2.843321e-17,5.340760e-18,0.509804,5.770894e-16,16.05392)"
-       cx="4.3920336"
-       cy="32.307854"
-       fx="4.3920336"
-       fy="32.307854"
-       r="6.3750000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2315"
-       id="radialGradient1360"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,-1.083254e-16,1.454372e-17,0.509804,1.185203e-14,16.05392)"
-       cx="4.3920336"
-       cy="32.307854"
-       fx="4.3920336"
-       fy="32.307854"
-       r="6.3750000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2072"
-       id="radialGradient2078"
-       cx="23.250000"
-       cy="35.375000"
-       fx="23.250000"
-       fy="35.375000"
-       r="18.500000"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.398649,0.000000,21.27280)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     fill="#9db029"
-     inkscape:window-y="258"
-     inkscape:window-x="219"
-     inkscape:window-height="666"
-     inkscape:window-width="810"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="27.236229"
-     inkscape:cx="73.976692"
-     inkscape:zoom="4"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.22745098"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Generic Audio</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.30000000;color:#000000;fill:url(#radialGradient2078);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:2.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="path1344"
-       sodipodi:cx="23.250000"
-       sodipodi:cy="35.375000"
-       sodipodi:rx="18.500000"
-       sodipodi:ry="7.3750000"
-       d="M 41.750000 35.375000 A 18.500000 7.3750000 0 1 1  4.7500000,35.375000 A 18.500000 7.3750000 0 1 1  41.750000 35.375000 z"
-       transform="translate(0.000000,2.834646)" />
-    <path
-       sodipodi:nodetypes="cccccccccccccc"
-       id="path7042"
-       d="M 41.625000,7.7951523 C 41.625000,7.7951523 18.562500,10.629798 18.562500,10.629798 L 18.562500,32.411048 C 16.916545,31.853397 14.630715,31.707619 12.125000,32.223548 C 7.7686860,33.120517 4.6471398,35.523035 5.1250000,37.567298 C 5.6028601,39.611561 9.5186850,40.558018 13.875000,39.661048 C 17.991641,38.813428 21.559123,36.623246 21.477633,34.661048 L 21.633883,15.629798 C 21.633883,15.629798 38.564340,12.734492 38.564340,12.734492 L 38.564340,30.019106 C 28.314340,28.519106 25.272139,32.912342 25.750000,34.956606 C 26.227860,37.000869 30.143686,37.947325 34.500000,37.050356 C 38.365376,36.254471 41.132410,34.287145 41.406250,32.425356 L 41.625000,7.7951523 z "
-       style="color:#000000;fill:#9db029;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#596616;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block" />
-    <path
-       style="opacity:0.51176471;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block"
-       d="M 40.729036,8.8956383 C 40.729036,8.8956383 19.547267,11.730284 19.547267,11.730284 L 19.547267,33.568621 C 11.982012,31.663311 5.8141632,35.403030 6.2685944,37.347065 C 6.9730255,40.666100 20.646969,38.449299 20.569474,34.208305 L 20.718063,14.735139 C 20.718063,14.735139 39.568437,11.842807 39.568437,11.842807 L 39.568437,31.279973 C 32.002153,29.353326 26.302939,32.656357 26.757371,34.600393 C 27.336802,37.794428 39.135597,36.713755 40.521011,31.943247 L 40.729036,8.8956383 z "
-       id="path2311"
-       sodipodi:nodetypes="ccccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.51176471;color:#000000;fill:url(#radialGradient1358);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="path2313"
-       sodipodi:cx="5.8750000"
-       sodipodi:cy="32.750000"
-       sodipodi:rx="6.3750000"
-       sodipodi:ry="3.2500000"
-       d="M 12.250000 32.750000 A 6.3750000 3.2500000 0 1 1  -0.50000000,32.750000 A 6.3750000 3.2500000 0 1 1  12.250000 32.750000 z"
-       transform="matrix(0.734516,-0.111645,0.111645,0.734516,3.903362,12.22551)" />
-    <path
-       transform="matrix(0.734516,-0.111645,0.111645,0.734516,23.74587,9.390864)"
-       d="M 12.250000 32.750000 A 6.3750000 3.2500000 0 1 1  -0.50000000,32.750000 A 6.3750000 3.2500000 0 1 1  12.250000 32.750000 z"
-       sodipodi:ry="3.2500000"
-       sodipodi:rx="6.3750000"
-       sodipodi:cy="32.750000"
-       sodipodi:cx="5.8750000"
-       id="path2323"
-       style="opacity:0.51176471;color:#000000;fill:url(#radialGradient1360);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       sodipodi:type="arc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/battery-caution.svg Deleted

@@ -1,625 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="battery-caution.svg"
-   sodipodi:docbase="/home/garrett/Source/tango-icon-theme/scalable/status"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg1328"
-   height="48px"
-   width="48px">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient6932">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop6934" />
-      <stop
-         style="stop-color:#e7e6ae;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop6936" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6924"
-       inkscape:collect="always">
-      <stop
-         id="stop6926"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop6928"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       y2="56.0523"
-       x2="47.3197"
-       y1="11.1133"
-       x1="4.1914"
-       gradientUnits="userSpaceOnUse"
-       id="aigrd1">
-      <stop
-         id="stop6490"
-         style="stop-color:#D4D4D4"
-         offset="0" />
-      <stop
-         id="stop6492"
-         style="stop-color:#E2E2E2"
-         offset="0.3982" />
-      <stop
-         id="stop6494"
-         style="stop-color:#FFFFFF"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4206">
-      <stop
-         id="stop4208"
-         offset="0.0000000"
-         style="stop-color:#7d4b01;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4210"
-         offset="1.0000000"
-         style="stop-color:#535353;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4176"
-       inkscape:collect="always">
-      <stop
-         id="stop4178"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4180"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4162">
-      <stop
-         id="stop4164"
-         offset="0.0000000"
-         style="stop-color:#f79403;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#fdb343;stop-opacity:1.0000000;"
-         offset="0.18691589"
-         id="stop4170" />
-      <stop
-         id="stop4172"
-         offset="0.43008122"
-         style="stop-color:#fdb74f;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4166"
-         offset="1.0000000"
-         style="stop-color:#8f5601;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4134">
-      <stop
-         id="stop4136"
-         offset="0.0000000"
-         style="stop-color:#7e807a;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#babbb8;stop-opacity:1.0000000;"
-         offset="0.25000000"
-         id="stop4148" />
-      <stop
-         style="stop-color:#a5a6a3;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop4142" />
-      <stop
-         id="stop4138"
-         offset="1.0000000"
-         style="stop-color:#333432;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126"
-       inkscape:collect="always">
-      <stop
-         id="stop4128"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4130"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,-8.959602e-15,20)"
-       r="17.142857"
-       fy="40.000000"
-       fx="23.857143"
-       cy="40.000000"
-       cx="23.857143"
-       id="radialGradient4132"
-       xlink:href="#linearGradient4126"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-5.050764,-5.956924)"
-       gradientUnits="userSpaceOnUse"
-       y2="26.718750"
-       x2="38.826412"
-       y1="26.718750"
-       x1="9.3030529"
-       id="linearGradient4140"
-       xlink:href="#linearGradient4134"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="13.284962"
-       x2="24.000000"
-       y1="16.525082"
-       x1="24.000000"
-       id="linearGradient4160"
-       xlink:href="#linearGradient6932"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-5.050764,-5.956924)"
-       gradientUnits="userSpaceOnUse"
-       y2="17.511776"
-       x2="38.013393"
-       y1="17.511776"
-       x1="10.116071"
-       id="linearGradient4168"
-       xlink:href="#linearGradient4162"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-5.050764,-5.956924)"
-       gradientUnits="userSpaceOnUse"
-       y2="56.575912"
-       x2="37.969398"
-       y1="14.004482"
-       x1="17.160095"
-       id="linearGradient4182"
-       xlink:href="#linearGradient4176"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-5.050764,-5.956924)"
-       gradientUnits="userSpaceOnUse"
-       y2="25.428572"
-       x2="25.207588"
-       y1="21.857143"
-       x1="25.064732"
-       id="linearGradient4198"
-       xlink:href="#linearGradient4206"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-5.193620,-3.314069)"
-       gradientUnits="userSpaceOnUse"
-       y2="30.000000"
-       x2="15.785715"
-       y1="19.500000"
-       x1="16.071430"
-       id="linearGradient6930"
-       xlink:href="#linearGradient6924"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="13.284962"
-       x2="24.000000"
-       y1="16.525082"
-       x1="24.000000"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6942"
-       xlink:href="#linearGradient6932"
-       inkscape:collect="always" />
-    <radialGradient
-       r="17.142857"
-       fy="40.000000"
-       fx="23.857143"
-       cy="40.000000"
-       cx="23.857143"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.500000,5.299057e-16,20.00000)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6946"
-       xlink:href="#linearGradient4126"
-       inkscape:collect="always" />
-    <radialGradient
-       r="17.142857"
-       fy="40.000000"
-       fx="23.857143"
-       cy="40.000000"
-       cx="23.857143"
-       gradientTransform="matrix(1,0,0,0.5,2.000293e-14,20)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient7449"
-       xlink:href="#linearGradient4126"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="56.0523"
-       x2="47.3197"
-       y1="11.1133"
-       x1="4.1914"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7451"
-       xlink:href="#aigrd1"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient3105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,1.616227e-14,20)"
-       cx="23.857143"
-       cy="40.000000"
-       fx="23.857143"
-       fy="40.000000"
-       r="17.142857" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd1"
-       id="linearGradient3980"
-       gradientUnits="userSpaceOnUse"
-       x1="4.1914"
-       y1="11.1133"
-       x2="47.3197"
-       y2="56.0523" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient4022"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,-7.086869e-16,20)"
-       cx="23.857143"
-       cy="40.000000"
-       fx="23.857143"
-       fy="40.000000"
-       r="17.142857" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6932"
-       id="linearGradient4024"
-       gradientUnits="userSpaceOnUse"
-       x1="24.000000"
-       y1="16.525082"
-       x2="24.000000"
-       y2="13.284962" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6932"
-       id="linearGradient4030"
-       gradientUnits="userSpaceOnUse"
-       x1="24.000000"
-       y1="16.525082"
-       x2="24.000000"
-       y2="13.284962" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4134"
-       id="linearGradient4032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.050764,-5.956924)"
-       x1="9.3030529"
-       y1="26.718750"
-       x2="38.826412"
-       y2="26.718750" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4206"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.050764,-5.956924)"
-       x1="25.064732"
-       y1="21.857143"
-       x2="25.207588"
-       y2="25.428572" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4162"
-       id="linearGradient4036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.050764,-5.956924)"
-       x1="10.116071"
-       y1="17.511776"
-       x2="38.013393"
-       y2="17.511776" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4176"
-       id="linearGradient4038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.050764,-5.956924)"
-       x1="17.160095"
-       y1="14.004482"
-       x2="37.969398"
-       y2="56.575912" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6932"
-       id="linearGradient4040"
-       gradientUnits="userSpaceOnUse"
-       x1="24.000000"
-       y1="16.525082"
-       x2="24.000000"
-       y2="13.284962" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6924"
-       id="linearGradient4042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.19362,-3.314069)"
-       x1="16.071430"
-       y1="19.500000"
-       x2="15.785715"
-       y2="30.000000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient4044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,-1.327983e-15,20)"
-       cx="23.857143"
-       cy="40.000000"
-       fx="23.857143"
-       fy="40.000000"
-       r="17.142857" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#a40000"
-     inkscape:window-y="0"
-     inkscape:window-x="150"
-     inkscape:window-height="1032"
-     inkscape:window-width="1121"
-     fill="#cc0000"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:cy="24"
-     inkscape:cx="24"
-     inkscape:zoom="13.452381"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     gridempspacing="4" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Battery - Caution</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>battery</rdf:li>
-            <rdf:li>apm</rdf:li>
-            <rdf:li>acpi</rdf:li>
-            <rdf:li>power management</rdf:li>
-            <rdf:li>caution</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Garrett LeSage</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Battery"
-     id="layer1">
-    <path
-       transform="matrix(1.027895,0,0,1.151259,-4.901584,-14.51956)"
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       sodipodi:ry="8.5714283"
-       sodipodi:rx="17.142857"
-       sodipodi:cy="40"
-       sodipodi:cx="23.857143"
-       id="path3366"
-       style="opacity:1;color:#000000;fill:url(#radialGradient4132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       sodipodi:type="arc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <g
-       id="g4015"
-       transform="matrix(1.008529,0,0,0.982935,-0.172022,0.592473)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true">
-      <path
-         style="opacity:1;color:#000000;fill:url(#linearGradient4032);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4034);stroke-width:1.0043689;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         d="M 18.886736,2.9493242 C 11.027309,2.9493242 4.6367371,5.7518251 4.6367361,9.1993252 C 4.6367361,9.4467102 4.6367361,32.066686 4.6367361,32.324326 C 4.6367361,35.771827 11.027308,38.574326 18.886736,38.574326 C 26.746164,38.574326 33.391202,35.771826 33.3912,32.324326 C 33.3912,32.120265 33.3912,9.4033862 33.3912,9.1993252 C 33.3912,5.7518241 26.746163,2.9493242 18.886736,2.9493242 z "
-         id="path3068"
-         sodipodi:nodetypes="csszssz"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         sodipodi:nodetypes="csszssz"
-         id="path4152"
-         d="M 18.890529,3.2058466 C 11.265384,3.2058466 5.0653084,5.9248092 5.0653074,9.2695412 C 5.0653074,9.5095522 5.0653074,15.577426 5.0653074,15.827386 C 5.0653074,19.17212 11.265383,21.475284 18.890529,21.475284 C 26.515675,21.475284 32.962631,19.17212 32.962629,15.827386 C 32.962629,15.629408 32.962629,9.4675192 32.962629,9.2695412 C 32.962629,5.9248082 26.515674,3.2058466 18.890529,3.2058466 z "
-         style="opacity:1;color:#000000;fill:url(#linearGradient4036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.76899999;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         sodipodi:nodetypes="csszssz"
-         id="path4174"
-         d="M 18.895359,3.7286451 C 11.567601,3.7286451 5.6093334,6.3415652 5.6093324,9.5558502 C 5.6093324,9.7865011 5.6093324,31.441911 5.6093324,31.682122 C 5.6093324,34.896409 11.5676,37.509327 18.895359,37.509327 C 26.223117,37.509327 32.418636,34.896408 32.418634,31.682122 C 32.418634,31.491866 32.418634,9.7461081 32.418634,9.5558502 C 32.418634,6.3415642 26.223116,3.7286451 18.895359,3.7286451 z "
-         style="opacity:0.5443038;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4038);stroke-width:1.0043689;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:#fed496;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4040);stroke-width:1.00931752;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="path3364"
-         sodipodi:cx="24"
-         sodipodi:cy="14.071428"
-         sodipodi:rx="12.857142"
-         sodipodi:ry="5.5"
-         d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-         transform="matrix(1.037291,0,0,0.954619,-5.945742,-4.31836)"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         style="opacity:0.49367083;color:#000000;fill:url(#linearGradient4042);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         d="M 8.5920954,13.757359 L 8.9492374,30.543074 L 13.520666,31.828788 L 13.377809,15.114502 C 13.377809,15.114502 15.449237,15.114502 18.80638,14.900216 C 13.590637,14.667143 7.6230074,12.425536 5.5920954,10.971645 C 7.0089944,13.063821 8.5920954,13.757359 8.5920954,13.757359 z "
-         id="path6922"
-         sodipodi:nodetypes="ccccccc"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-    </g>
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:type="arc"
-       style="opacity:0.65822784;color:#000000;fill:url(#radialGradient4044);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6944"
-       sodipodi:cx="23.857143"
-       sodipodi:cy="40"
-       sodipodi:rx="17.142857"
-       sodipodi:ry="8.5714283"
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(0.36343,0,0,0.36343,10.42172,-7.361217)" />
-    <g
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="g4005"
-       transform="translate(0.306575,1)">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="matrix(0.995388,0,0,1.031815,6.552243e-2,-0.293424)"
-         sodipodi:nodetypes="csszssz"
-         id="path3362"
-         d="M 18.83868,2.2227072 C 16.835886,2.2227072 14.207396,2.9368602 14.207396,3.8153762 C 14.207396,3.8784162 14.207396,6.3793812 14.207396,6.4450352 C 14.207396,7.3235512 16.835886,8.0377042 18.83868,8.0377042 C 20.841475,8.0377042 23.249096,7.3235512 23.249095,6.4450352 C 23.249095,6.3930352 23.249095,3.8673762 23.249095,3.8153762 C 23.249095,2.9368592 20.841475,2.2227072 18.83868,2.2227072 z "
-         style="opacity:1;color:#000000;fill:#fcaf3e;fill-opacity:1;fill-rule:nonzero;stroke:#b46c02;stroke-width:0.98674041;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="matrix(0.270725,0,0,0.223511,12.2289,0.910809)"
-         d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="12.857142"
-         sodipodi:cy="14.071428"
-         sodipodi:cx="24"
-         id="path6940"
-         style="opacity:1;color:#000000;fill:#fed496;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4030);stroke-width:4.065238;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-  <g
-     inkscape:label="Emblem"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:type="arc"
-       style="opacity:0.5;color:#000000;fill:url(#radialGradient3105);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6548"
-       sodipodi:cx="23.857143"
-       sodipodi:cy="40"
-       sodipodi:rx="17.142857"
-       sodipodi:ry="8.5714283"
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(0.683333,0,0,0.323981,17.57956,30.81773)" />
-    <g
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       transform="matrix(0.625,0,0,0.625,18.73909,17.94873)"
-       id="Layer_x0020_2"
-       style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         style="fill:none;stroke:none"
-         d="M 48,48 L 0,48 L 0,0 L 48,0 L 48,48 z "
-         id="path6480" />
-    </g>
-    <g
-       id="g3982">
-      <path
-         transform="matrix(1.005605,0,0,0.973549,12.74538,5.001568)"
-         style="fill:#cc0000;fill-rule:nonzero;stroke:#510000;stroke-width:1.0106653;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 33.386137,38.071593 L 22.511147,17.821614 C 22.198648,17.259115 21.636148,16.946616 21.011149,16.946616 C 20.386149,16.946616 19.82365,17.321614 19.511151,17.884114 L 8.8861609,38.134094 C 8.6361609,38.634093 8.6361609,39.321593 8.9486609,39.821592 C 9.2611599,40.321592 9.7611599,40.571591 10.38616,40.571591 L 31.886138,40.571591 C 32.511137,40.571591 33.073636,40.259092 33.323637,39.759092 C 33.636136,39.259092 33.636136,38.634093 33.386137,38.071593 z "
-         id="path6485"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <g
-         style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
-         transform="matrix(0.628502,0,0,0.608468,18.78643,18.65104)"
-         id="g6487"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true">
-        <linearGradient
-           id="linearGradient6525"
-           gradientUnits="userSpaceOnUse"
-           x1="4.1914001"
-           y1="11.1133"
-           x2="47.319698"
-           y2="56.052299">
-          <stop
-             offset="0"
-             style="stop-color:#D4D4D4"
-             id="stop6527" />
-          <stop
-             offset="0.3982"
-             style="stop-color:#E2E2E2"
-             id="stop6529" />
-          <stop
-             offset="1"
-             style="stop-color:#FFFFFF"
-             id="stop6531" />
-        </linearGradient>
-        <path
-           style="fill:url(#linearGradient3980);stroke:none"
-           d="M 9.5,37.6 C 9.2,38.1 9.5,38.5 10,38.5 L 38.2,38.5 C 38.7,38.5 39,38.1 38.7,37.6 L 24.4,11 C 24.1,10.5 23.7,10.5 23.5,11 L 9.5,37.6 z "
-           id="path6496"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true" />
-      </g>
-    </g>
-    <g
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="g6498"
-       transform="matrix(0.543542,0,0,0.549893,21.00934,19.92504)"
-       style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="path6500"
-         d="M 23.9,36.5 C 22.6,36.5 21.6,35.5 21.6,34.2 C 21.6,32.8 22.5,31.9 23.9,31.9 C 25.3,31.9 26.1,32.8 26.2,34.2 C 26.2,35.5 25.3,36.5 23.9,36.5 L 23.9,36.5 z M 22.5,30.6 L 21.9,19.1 L 25.9,19.1 L 25.3,30.6 L 22.4,30.6 L 22.5,30.6 z "
-         style="stroke:none" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/camera-photo.svg Deleted

@@ -1,681 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="camera-photo.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/devices"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg7631"
-   height="48px"
-   width="48px"
-    viewbox = "0 0 48 48"
-   >
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2818">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2820" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2822" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2690"
-       inkscape:collect="always">
-      <stop
-         id="stop2692"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2694"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2673">
-      <stop
-         id="stop2675"
-         offset="0.0000000"
-         style="stop-color:#8b8b8b;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#d3d9da;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop2681" />
-      <stop
-         id="stop2677"
-         offset="1.0000000"
-         style="stop-color:#828282;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2656"
-       inkscape:collect="always">
-      <stop
-         id="stop2658"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop2660"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2631">
-      <stop
-         id="stop2633"
-         offset="0.0000000"
-         style="stop-color:#010101;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2635"
-         offset="1.0000000"
-         style="stop-color:#959595;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2615">
-      <stop
-         id="stop2617"
-         offset="0.0000000"
-         style="stop-color:#363d40;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#818f95;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop2623" />
-      <stop
-         id="stop2619"
-         offset="1.0000000"
-         style="stop-color:#31383b;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2304">
-      <stop
-         id="stop2306"
-         offset="0.0000000"
-         style="stop-color:#353633;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2308"
-         offset="1.0000000"
-         style="stop-color:#676964;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2290">
-      <stop
-         id="stop2292"
-         offset="0"
-         style="stop-color:#555753;stop-opacity:1;" />
-      <stop
-         id="stop2294"
-         offset="1.0000000"
-         style="stop-color:#313330;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2268">
-      <stop
-         id="stop2270"
-         offset="0"
-         style="stop-color:#555753;stop-opacity:1;" />
-      <stop
-         id="stop2272"
-         offset="1.0000000"
-         style="stop-opacity:1.0000000;stop-color:#141514" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2230">
-      <stop
-         style="stop-color:#eeeeee;stop-opacity:1;"
-         offset="0"
-         id="stop2232" />
-      <stop
-         style="stop-color:#a2a2a2;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2234" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3301">
-      <stop
-         id="stop3303"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop3305"
-         offset="1.0000000"
-         style="stop-color:#cbcbcb;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         style="stop-color:#7a7a7a;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2593" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2595" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2656"
-       id="radialGradient1415"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.453571,-8.417747e-16,20.11540)"
-       cx="25.375000"
-       cy="36.812500"
-       fx="25.375000"
-       fy="36.812500"
-       r="17.500000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2656"
-       id="radialGradient1417"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.453571,-1.856804e-15,20.11540)"
-       cx="25.375000"
-       cy="36.812500"
-       fx="25.375000"
-       fy="36.812500"
-       r="17.500000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2615"
-       id="linearGradient1423"
-       gradientUnits="userSpaceOnUse"
-       x1="22.549892"
-       y1="39.051506"
-       x2="38.416191"
-       y2="30.566227" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2673"
-       id="linearGradient1425"
-       gradientUnits="userSpaceOnUse"
-       x1="23.660564"
-       y1="35.302856"
-       x2="33.904015"
-       y2="30.916578" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="radialGradient1431"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.013514,-4.816024e-16,-0.304899)"
-       cx="16.875000"
-       cy="23.672499"
-       fx="16.875000"
-       fy="23.672499"
-       r="4.6250000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2631"
-       id="linearGradient1433"
-       gradientUnits="userSpaceOnUse"
-       x1="12.835793"
-       y1="18.849401"
-       x2="18.422049"
-       y2="27.072878" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3301"
-       id="linearGradient1451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.655244,0.000000,0.000000,1.898477,14.94194,-35.55180)"
-       x1="6.5595827"
-       y1="29.373810"
-       x2="6.5595827"
-       y2="30.191154" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3301"
-       id="linearGradient1456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.477785,0.000000,0.000000,1.982181,18.56747,-51.60768)"
-       x1="6.5595827"
-       y1="29.373810"
-       x2="6.5595827"
-       y2="30.191154" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2230"
-       id="linearGradient1458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.318423,0.000000,0.000000,0.773191,18.70736,-14.22023)"
-       x1="7.9151335"
-       y1="30.816841"
-       x2="7.9151335"
-       y2="24.700985" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2268"
-       id="linearGradient1461"
-       gradientUnits="userSpaceOnUse"
-       x1="29.395439"
-       y1="9.4121714"
-       x2="29.395439"
-       y2="12.846690" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient1469"
-       gradientUnits="userSpaceOnUse"
-       x1="16.666620"
-       y1="16.124990"
-       x2="35.888493"
-       y2="57.124992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2290"
-       id="linearGradient1475"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.024993,0.000000,0.000000,1.000000,-6.795098e-2,0.000000)"
-       x1="7.8705277"
-       y1="29.718750"
-       x2="14.843750"
-       y2="29.718750" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2304"
-       id="linearGradient1482"
-       gradientUnits="userSpaceOnUse"
-       x1="16.353432"
-       y1="26.093410"
-       x2="30.130077"
-       y2="26.093410" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2290"
-       id="linearGradient1485"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.035758,0.000000,0.000000,1.000000,-0.162473,0.202030)"
-       x1="7.8705277"
-       y1="29.718750"
-       x2="14.843750"
-       y2="29.718750" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2818"
-       id="radialGradient2824"
-       cx="14.75"
-       cy="22.6875"
-       fx="14.75"
-       fy="22.6875"
-       r="1.75"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.035714,0.000000,-0.810268)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:guide-bbox="true"
-     showguides="true"
-     fill="#555753"
-     inkscape:window-y="185"
-     inkscape:window-x="326"
-     inkscape:window-height="731"
-     inkscape:window-width="872"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="16.629155"
-     inkscape:cx="10.439293"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.20392157"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:title>Photo Camera</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>camera</rdf:li>
-            <rdf:li>photo</rdf:li>
-            <rdf:li>SLR</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <g
-       transform="matrix(2.45274e-2,0,0,2.086758e-2,45.15006,37.31476)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.39873418;color:#000000;fill:url(#radialGradient1415);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="path2664"
-       sodipodi:cx="25.375000"
-       sodipodi:cy="36.812500"
-       sodipodi:rx="17.500000"
-       sodipodi:ry="7.9375000"
-       d="M 42.875000 36.812500 A 17.500000 7.9375000 0 1 1  7.8750000,36.812500 A 17.500000 7.9375000 0 1 1  42.875000 36.812500 z"
-       transform="matrix(0.693194,0.000000,0.000000,0.811023,13.91019,9.956690)" />
-    <path
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1485);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#282828;stroke-width:2.0000002;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       d="M 8.9327762,18.920780 C 5.4615071,18.920780 2.6534933,20.040780 2.6534933,21.420780 C 2.6534933,21.577572 2.8105028,21.709462 2.8800654,21.858280 C 2.8698789,21.907712 2.7829631,21.899460 2.7829631,21.952030 C 2.7829631,21.952030 2.6534933,38.263988 2.6534933,38.420780 C 2.6534933,39.800780 5.4615071,40.920780 8.9327762,40.920780 C 12.404046,40.920780 15.212059,39.800780 15.212059,38.420780 L 15.082590,21.952030 C 15.082590,21.899460 14.995674,21.907712 14.985487,21.858280 C 15.055050,21.709462 15.212059,21.577572 15.212059,21.420780 C 15.212059,20.040780 12.404046,18.920780 8.9327762,18.920780 z "
-       id="path2608"
-       sodipodi:nodetypes="csscssscssc" />
-    <path
-       sodipodi:nodetypes="ccccccccczcc"
-       id="path8417"
-       d="M 2.1428571,38.647933 L 42.285714,38.647933 C 43.396882,38.748948 44.505076,37.497897 44.505076,36.790790 L 44.505076,19.142857 C 44.404061,18.031689 40.536106,16.719102 39.626969,16.618087 L 37.194851,16.618087 L 34.271326,13.533125 L 23.714286,13.533125 L 20.278818,16.564532 C 20.278818,16.564532 13.552003,16.776186 8.3377087,17.731617 C 3.1234141,18.687048 2.0000000,20.318891 2.0000000,21.531074 L 2.1428571,38.647933 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1482);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#282828;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cccc"
-       id="path2300"
-       d="M 33.890618,13.907352 L 35.254324,17.695424 L 37.123106,17.240855 L 33.890618,13.907352 z "
-       style="opacity:1.0000000;color:#000000;fill:#3f413e;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <path
-       transform="matrix(1.256914,0.000000,0.000000,1.256914,-11.68675,-10.02479)"
-       d="M 43.133513 33.908371 A 1.9697975 1.9697975 0 1 1  39.193918,33.908371 A 1.9697975 1.9697975 0 1 1  43.133513 33.908371 z"
-       sodipodi:ry="1.9697975"
-       sodipodi:rx="1.9697975"
-       sodipodi:cy="33.908371"
-       sodipodi:cx="41.163715"
-       id="path2302"
-       style="opacity:1.0000000;color:#000000;fill:#585b57;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a7a7a7;stroke-width:0.79559946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(1.082923,0.000000,0.000000,1.082923,-3.320501,-4.385684)"
-       d="M 40.714286 33.571430 A 10.142858 10.142858 0 1 1  20.428571,33.571430 A 10.142858 10.142858 0 1 1  40.714286 33.571430 z"
-       sodipodi:ry="10.142858"
-       sodipodi:rx="10.142858"
-       sodipodi:cy="33.571430"
-       sodipodi:cx="30.571428"
-       id="path2280"
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1423);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1425);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="path2278"
-       sodipodi:cx="30.571428"
-       sodipodi:cy="33.571430"
-       sodipodi:rx="10.142858"
-       sodipodi:ry="10.142858"
-       d="M 40.714286 33.571430 A 10.142858 10.142858 0 1 1  20.428571,33.571430 A 10.142858 10.142858 0 1 1  40.714286 33.571430 z"
-       transform="matrix(1.082923,0.000000,0.000000,1.082923,-3.155039,-2.495930)" />
-    <path
-       sodipodi:nodetypes="csscssscssc"
-       id="path7949"
-       d="M 8.9327729,18.718750 C 5.4975804,18.718750 2.7187500,19.838750 2.7187500,21.218750 C 2.7187500,21.375542 2.8741277,21.507432 2.9429673,21.656250 C 2.9328867,21.705682 2.8468742,21.697430 2.8468742,21.750000 C 2.8468742,21.750000 2.7187500,38.061958 2.7187500,38.218750 C 2.7187500,39.598750 5.4975804,40.718750 8.9327729,40.718750 C 12.367966,40.718750 15.146796,39.598750 15.146796,38.218750 L 15.018672,21.750000 C 15.018672,21.697430 14.932659,21.705682 14.922578,21.656250 C 14.991418,21.507432 15.146796,21.375542 15.146796,21.218750 C 15.146796,19.838750 12.367966,18.718750 8.9327729,18.718750 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1475);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path2298"
-       d="M 24.243661,14.159890 L 23.486047,17.796439 L 23.132493,19.008622 L 20.354573,16.937809 L 24.243661,14.159890 z "
-       style="opacity:1.0000000;color:#000000;fill:#7b7e79;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2276"
-       d="M 19.030081,27.995300 L 23.940615,19.412683 L 35.153309,19.412683 L 39.991888,26.528041 L 35.254324,17.796439 L 23.435539,17.796439 L 19.030081,27.995300 z "
-       style="opacity:1.0000000;color:#000000;fill:#a7aba7;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cssssccc"
-       id="path7953"
-       d="M 20.312500,16.875000 C 20.312500,16.875000 8.1666040,17.513063 4.1562500,19.625000 C 3.3042101,20.073702 2.6682424,20.465607 2.6682424,21.067227 C 2.6682424,22.447227 5.4923214,24.093750 8.8437500,24.093750 C 12.195179,24.093750 14.843750,22.598750 14.843750,21.218750 C 14.843750,20.904411 14.663819,20.589696 14.406250,20.312500 L 23.031250,18.500000 L 20.312500,16.875000 z "
-       style="color:#000000;fill:#888a85;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <path
-       sodipodi:nodetypes="ccsccscccccccc"
-       id="path2683"
-       d="M 24.553211,14.482118 L 20.635909,17.275103 C 20.635909,17.275104 14.191167,17.710137 9.3867322,18.590468 C 4.5822970,19.470800 3.1666200,20.423893 3.0416200,21.603294 L 3.2677390,38.194718 C 3.5637007,39.355800 6.4977958,40.267861 9.4963120,40.267861 C 12.494828,40.267861 14.997700,38.668300 15.293662,37.507218 L 41.781643,37.632218 C 43.242971,37.662792 43.513492,36.931125 43.513492,36.279599 L 43.513492,19.602477 C 43.513492,18.890493 40.671858,17.738265 39.834182,17.645190 L 36.900777,17.707690 L 33.660467,14.482118 L 24.553211,14.482118 z "
-       style="opacity:0.41772148;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient1469);stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <path
-       transform="matrix(1.082923,0.000000,0.000000,1.082923,-3.050891,-1.568850)"
-       d="M 40.714286 33.571430 A 10.142858 10.142858 0 1 1  20.428571,33.571430 A 10.142858 10.142858 0 1 1  40.714286 33.571430 z"
-       sodipodi:ry="10.142858"
-       sodipodi:rx="10.142858"
-       sodipodi:cy="33.571430"
-       sodipodi:cx="30.571428"
-       id="path8415"
-       style="opacity:1.0000000;color:#000000;fill:#2e3436;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#radialGradient1431);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient1433);stroke-width:0.59630877;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       id="path2589"
-       sodipodi:cx="15.750000"
-       sodipodi:cy="22.562500"
-       sodipodi:rx="4.1250000"
-       sodipodi:ry="4.1875000"
-       d="M 19.875000 22.562500 A 4.1250000 4.1875000 0 1 1  11.625000,22.562500 A 4.1250000 4.1875000 0 1 1  19.875000 22.562500 z"
-       transform="matrix(1.676984,0.000000,0.000000,1.676984,3.488419,-3.050526)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.60759497;color:#000000;fill:#ffffff;fill-opacity:0.52866244;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       id="path2599"
-       sodipodi:cx="14.750000"
-       sodipodi:cy="22.687500"
-       sodipodi:rx="1.7500000"
-       sodipodi:ry="1.8125000"
-       d="M 16.500000 22.687500 A 1.7500000 1.8125000 0 1 1  13.000000,22.687500 A 1.7500000 1.8125000 0 1 1  16.500000 22.687500 z"
-       transform="matrix(1.676984,0.000000,0.000000,1.676984,5.499948,-3.195174)" />
-    <path
-       transform="matrix(1.673245,0.000000,0.000000,1.673245,3.333940,-5.000547)"
-       d="M 16.500000 22.687500 A 1.7500000 1.8125000 0 1 1  13.000000,22.687500 A 1.7500000 1.8125000 0 1 1  16.500000 22.687500 z"
-       sodipodi:ry="1.8125000"
-       sodipodi:rx="1.7500000"
-       sodipodi:cy="22.687500"
-       sodipodi:cx="14.750000"
-       id="path2601"
-       style="opacity:0.37341771;color:#000000;fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2824);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       id="path8405"
-       sodipodi:cx="14.750000"
-       sodipodi:cy="22.687500"
-       sodipodi:rx="1.7500000"
-       sodipodi:ry="1.8125000"
-       d="M 16.500000 22.687500 A 1.7500000 1.8125000 0 1 1  13.000000,22.687500 A 1.7500000 1.8125000 0 1 1  16.500000 22.687500 z"
-       transform="matrix(0.412730,0.000000,0.000000,0.412730,27.45136,28.98197)" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path1507"
-       d="M 22.223356,15.574103 L 25.152798,13.452783 L 26.061935,11.028417 L 32.425896,11.028417 L 33.739095,13.957860 L 36.567522,16.382225 L 34.042141,5.4725778 L 24.142646,5.4725778 L 22.223356,15.574103 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1461);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <rect
-       ry="1.5035454"
-       rx="1.5035444"
-       y="4.6366777"
-       x="24.478594"
-       height="4.5837932"
-       width="9.3285160"
-       id="rect3297"
-       style="color:#000000;fill:url(#linearGradient1456);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient1458);stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
-    <path
-       transform="matrix(0.359444,0.000000,0.000000,0.554344,7.698551,7.305544e-2)"
-       sodipodi:type="arc"
-       style="opacity:1.0000000;color:#000000;fill:#2f302e;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="path2288"
-       sodipodi:cx="8.7857141"
-       sodipodi:cy="38.214287"
-       sodipodi:rx="6.0714288"
-       sodipodi:ry="2.5000000"
-       d="M 14.857143 38.214287 A 6.0714288 2.5000000 0 1 1  2.7142854,38.214287 A 6.0714288 2.5000000 0 1 1  14.857143 38.214287 z" />
-    <path
-       sodipodi:nodetypes="czcccsc"
-       id="path2312"
-       d="M 2.7034271,21.250564 C 2.5678753,23.036228 5.1472726,25.130768 8.8987966,25.132037 C 12.712821,25.133306 14.748227,22.948217 14.950257,21.028927 L 19.495944,19.311668 L 14.344166,20.321820 C 14.445182,22.241110 12.642329,24.152278 8.9038729,24.092824 C 4.8175065,24.026843 3.3284271,22.438064 2.7034271,21.250564 z "
-       style="opacity:1.0000000;color:#000000;fill:#c4c6c3;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient1451);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#464646;stroke-width:0.99999970;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       id="rect2282"
-       width="4.1362314"
-       height="4.3902278"
-       x="17.562916"
-       y="18.317474"
-       rx="0.69542336"
-       ry="0.69542354" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.43037972;color:#000000;fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       id="path2612"
-       sodipodi:cx="14.750000"
-       sodipodi:cy="22.687500"
-       sodipodi:rx="1.7500000"
-       sodipodi:ry="1.8125000"
-       d="M 16.500000 22.687500 A 1.7500000 1.8125000 0 1 1  13.000000,22.687500 A 1.7500000 1.8125000 0 1 1  16.500000 22.687500 z"
-       transform="matrix(0.389835,0.000000,0.000000,0.389835,4.452477,12.38659)" />
-    <path
-       transform="matrix(0.456110,0.000000,0.000000,0.456110,20.30269,21.39326)"
-       d="M 16.500000 22.687500 A 1.7500000 1.8125000 0 1 1  13.000000,22.687500 A 1.7500000 1.8125000 0 1 1  16.500000 22.687500 z"
-       sodipodi:ry="1.8125000"
-       sodipodi:rx="1.7500000"
-       sodipodi:cy="22.687500"
-       sodipodi:cx="14.750000"
-       id="path2629"
-       style="opacity:1.0000000;color:#000000;fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1.0000000;color:#000000;fill:#c5c5c5;fill-opacity:0.52866244;fill-rule:nonzero;stroke:none;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="path2641"
-       sodipodi:cx="40.625000"
-       sodipodi:cy="20.562500"
-       sodipodi:rx="1.6250000"
-       sodipodi:ry="0.68750000"
-       d="M 42.250000 20.562500 A 1.6250000 0.68750000 0 1 1  39.000000,20.562500 A 1.6250000 0.68750000 0 1 1  42.250000 20.562500 z"
-       transform="matrix(1.038462,0.000000,0.000000,1.636364,-1.187500,-12.71023)" />
-    <path
-       transform="matrix(1.038462,0.000000,0.000000,1.636364,-1.125000,-12.33523)"
-       d="M 42.250000 20.562500 A 1.6250000 0.68750000 0 1 1  39.000000,20.562500 A 1.6250000 0.68750000 0 1 1  42.250000 20.562500 z"
-       sodipodi:ry="0.68750000"
-       sodipodi:rx="1.6250000"
-       sodipodi:cy="20.562500"
-       sodipodi:cx="40.625000"
-       id="path2639"
-       style="opacity:1.0000000;color:#000000;fill:#565656;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="cs"
-       id="path2650"
-       d="M 23.271357,28.422173 C 25.874096,25.054531 32.027018,24.229460 35.546276,27.380934"
-       style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#777777;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-    <path
-       id="path2668"
-       d="M 30.219981,31.818049 C 28.600014,31.818049 27.309626,33.185948 27.309626,34.863771 C 27.309626,35.247616 27.556343,35.506933 27.681881,35.845170 C 27.808561,35.862524 27.889059,35.980535 28.020294,35.980535 C 29.636648,35.980535 30.930649,34.642736 30.930649,32.968655 C 30.930649,32.575045 30.656499,32.298592 30.524554,31.953415 C 30.409594,31.939221 30.338611,31.818049 30.219981,31.818049 z "
-       style="opacity:0.67088610;color:#000000;fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/camera-video.svg Deleted

@@ -1,1257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="camera-video.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/devices"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg1260"
-   height="48px"
-   width="48px"
-    viewbox = "0 0 48 48"
-   >
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       id="linearGradient2244"
-       inkscape:collect="always">
-      <stop
-         id="stop2246"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2248"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2230">
-      <stop
-         id="stop2232"
-         offset="0"
-         style="stop-color:#eeeeee;stop-opacity:1;" />
-      <stop
-         id="stop2234"
-         offset="1.0000000"
-         style="stop-color:#a2a2a2;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3301">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3303" />
-      <stop
-         style="stop-color:#cbcbcb;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3305" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3287"
-       inkscape:collect="always">
-      <stop
-         id="stop3289"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3291"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3279">
-      <stop
-         id="stop3281"
-         offset="0.0000000"
-         style="stop-color:#bebebe;stop-opacity:0.0000000;" />
-      <stop
-         id="stop3283"
-         offset="1.0000000"
-         style="stop-color:#717171;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3265"
-       inkscape:collect="always">
-      <stop
-         id="stop3267"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3269"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3250">
-      <stop
-         id="stop3252"
-         offset="0"
-         style="stop-color:#174992;stop-opacity:1;" />
-      <stop
-         id="stop3254"
-         offset="1.0000000"
-         style="stop-color:#233247;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3238">
-      <stop
-         id="stop3240"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.27835050;" />
-      <stop
-         id="stop3242"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3180">
-      <stop
-         id="stop3182"
-         offset="0.0000000"
-         style="stop-color:#c8c8c8;stop-opacity:1.0000000;" />
-      <stop
-         id="stop3184"
-         offset="1.0000000"
-         style="stop-color:#545454;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3170">
-      <stop
-         style="stop-color:#919191;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3172" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3174" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3116"
-       inkscape:collect="always">
-      <stop
-         id="stop3118"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3120"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3016">
-      <stop
-         id="stop3018"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3020"
-         offset="1.0000000"
-         style="stop-color:#747474;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2854">
-      <stop
-         id="stop2856"
-         offset="0.0000000"
-         style="stop-color:#dddddd;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2858"
-         offset="1.0000000"
-         style="stop-color:#a0a0a0;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2801">
-      <stop
-         style="stop-color:#d7d7d7;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2803" />
-      <stop
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2805" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2659">
-      <stop
-         id="stop2661"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop2663"
-         offset="1.0000000"
-         style="stop-color:#b6b6b6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         id="stop2593"
-         offset="0.0000000"
-         style="stop-color:#d3d3d3;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2595"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2261">
-      <stop
-         id="stop2263"
-         offset="0.0000000"
-         style="stop-color:#b6b6b6;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2265"
-         offset="1.0000000"
-         style="stop-color:#a0a0a0;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.192333,0.000000,0.000000,1.000000,-11.96891,-0.625000)"
-       y2="26.625000"
-       x2="39.532253"
-       y1="3.2500000"
-       x1="39.814648"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3186"
-       xlink:href="#linearGradient3180"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="35.537243"
-       x2="31.554640"
-       y1="23.074486"
-       x1="31.289474"
-       gradientTransform="matrix(0.920341,0.000000,0.000000,1.000000,5.113065,-0.618717)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1605"
-       xlink:href="#linearGradient2261"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="36.686241"
-       x2="34.443943"
-       y1="24.311874"
-       x1="32.372795"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1607"
-       xlink:href="#linearGradient3250"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="23.500000"
-       x2="21.375000"
-       y1="33.218750"
-       x1="40.593750"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1609"
-       xlink:href="#linearGradient3116"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="35.071529"
-       x2="33.984650"
-       y1="20.222286"
-       x1="28.798098"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1611"
-       xlink:href="#linearGradient3265"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="28.125509"
-       x2="13.114621"
-       y1="26.012749"
-       x1="16.489622"
-       gradientTransform="matrix(1.030948,0.000000,0.000000,1.030948,-0.405869,-2.837538)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1618"
-       xlink:href="#linearGradient3238"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="27.727798"
-       x2="16.638567"
-       y1="23.396770"
-       x1="30.661369"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1629"
-       xlink:href="#linearGradient2244"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="27.409931"
-       x2="7.1562500"
-       y1="32.006123"
-       x1="8.6845827"
-       gradientTransform="matrix(0.633663,0.000000,0.000000,1.297297,10.46536,-8.810810)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1633"
-       xlink:href="#linearGradient3016"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="27.891649"
-       x2="26.604893"
-       y1="15.296312"
-       x1="26.980543"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1676"
-       xlink:href="#linearGradient3279"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="32.090096"
-       x2="23.864855"
-       y1="24.665476"
-       x1="18.694136"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1679"
-       xlink:href="#linearGradient2801"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="30.191154"
-       x2="6.5595827"
-       y1="29.373810"
-       x1="6.5595827"
-       gradientTransform="matrix(1.120873,0.000000,0.000000,2.563637,-0.106115,-48.35474)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1682"
-       xlink:href="#linearGradient3301"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="24.700985"
-       x2="7.9151335"
-       y1="30.816841"
-       x1="7.9151335"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1684"
-       xlink:href="#linearGradient2230"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="35.138027"
-       x2="11.343681"
-       y1="16.013027"
-       x1="9.5126343"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1687"
-       xlink:href="#linearGradient3287"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="36.841251"
-       x2="12.523165"
-       y1="29.706160"
-       x1="12.586802"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1690"
-       xlink:href="#linearGradient2854"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="36.841251"
-       x2="12.523165"
-       y1="24.643660"
-       x1="12.649302"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1693"
-       xlink:href="#linearGradient2854"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="36.841251"
-       x2="12.523165"
-       y1="24.643660"
-       x1="12.649302"
-       gradientTransform="translate(-1.125000,-0.125000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1696"
-       xlink:href="#linearGradient3170"
-       inkscape:collect="always" />
-    <radialGradient
-       r="4.6250000"
-       fy="23.672499"
-       fx="16.875000"
-       cy="23.672499"
-       cx="16.875000"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.013514,0.000000,-0.304899)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1699"
-       xlink:href="#linearGradient2591"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="30.812494"
-       x2="12.257777"
-       y1="42.484329"
-       x1="12.187341"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1701"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="30.812517"
-       x2="7.7578020"
-       y1="42.484352"
-       x1="7.6873660"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1703"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="30.812494"
-       x2="3.2578177"
-       y1="42.484329"
-       x1="3.1873815"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1705"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="30.812494"
-       x2="-1.2421666"
-       y1="42.484329"
-       x1="-1.3126028"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1707"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="28.562525"
-       x2="1.0078188"
-       y1="40.234360"
-       x1="0.93738264"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1709"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="28.562502"
-       x2="5.5078030"
-       y1="40.234337"
-       x1="5.4373670"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1711"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="28.562502"
-       x2="10.007788"
-       y1="40.234337"
-       x1="9.9373512"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1713"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="26.312532"
-       x2="12.257786"
-       y1="37.984367"
-       x1="12.187350"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1715"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="26.312510"
-       x2="7.7578020"
-       y1="37.984344"
-       x1="7.6873660"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1717"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="26.312510"
-       x2="3.2578177"
-       y1="37.984344"
-       x1="3.1873815"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1719"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="26.312510"
-       x2="-1.2421666"
-       y1="37.984344"
-       x1="-1.3126028"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1721"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="24.062519"
-       x2="1.0078188"
-       y1="35.734352"
-       x1="0.93738264"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1723"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="21.812548"
-       x2="-1.2421666"
-       y1="33.484383"
-       x1="-1.3126028"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1725"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="21.812548"
-       x2="3.2578108"
-       y1="33.484383"
-       x1="3.1873748"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1727"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="24.062519"
-       x2="5.5078030"
-       y1="35.734352"
-       x1="5.4373670"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1729"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="21.812548"
-       x2="7.7578020"
-       y1="33.484383"
-       x1="7.6873660"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1731"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="24.062519"
-       x2="10.007794"
-       y1="35.734352"
-       x1="9.9373579"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1733"
-       xlink:href="#linearGradient2659"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient12782"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient12784"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient12786"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="324"
-     inkscape:window-x="429"
-     inkscape:window-height="778"
-     inkscape:window-width="977"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="7.4612846"
-     inkscape:cx="18.089653"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.26666667"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Camera / Video</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz/</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>camera</rdf:li>
-            <rdf:li>camcorder</rdf:li>
-            <rdf:li>video</rdf:li>
-            <rdf:li>cam</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       sodipodi:nodetypes="czssssccc"
-       id="path3178"
-       d="M 30.806057,10.750000 C 30.806057,10.750000 30.973729,9.5937500 32.370995,9.6250000 C 32.370995,9.6250000 40.568288,9.6250000 40.568288,9.6250000 C 42.095965,9.6250000 42.636240,10.578125 42.580350,11.687500 C 42.580350,11.687500 42.580350,16.812500 42.580350,16.812500 C 42.561720,17.843750 41.741991,18.484375 40.717329,18.562500 C 40.717329,18.562500 31.178661,18.625000 31.178661,18.625000 L 30.731536,16.000000 L 30.806057,10.750000 z "
-       style="color:#000000;fill:url(#linearGradient3186);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#6c6c6c;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
-    <g
-       transform="matrix(1.98486e-2,0,0,2.086758e-2,38.77905,35.9036)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <g
-       transform="matrix(1.194071e-2,0,0,1.272548e-2,44.30799,39.99902)"
-       id="g12774"
-       style="opacity:0.32989691">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient12782);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect12776"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient12784);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path12778"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path12780"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient12786);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-  <g
-     inkscape:label="vectors"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path3188"
-       d="M 39.875000,12.375000 L 31.687500,14.875000 L 26.062500,14.625000 L 34.187500,12.375000 L 39.875000,12.375000 z "
-       style="color:#000000;fill:#c6c6c6;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#c4c4c4;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
-    <path
-       id="path3168"
-       d="M 39.875000,12.437500 L 31.500000,14.875000 L 31.500000,19.375000 L 39.875000,16.500000 L 39.875000,12.437500 z "
-       style="color:#000000;fill:url(#linearGradient1696);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#7a7a7a;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
-    <path
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1693);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#6c6c6c;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       d="M 30.946541,13.125000 L 16.187500,13.045653 C 10.985425,13.045653 8.6250000,16.568903 8.6250000,19.639403 C 8.6250000,22.527377 10.778028,24.585851 12.250000,25.108153 L 12.250000,32.250000 C 12.250000,35.720857 14.502357,38.705357 17.687500,38.562500 L 32.531250,38.718750 C 34.430679,38.718750 37.437500,36.805677 37.437500,34.906250 L 37.437500,18.712849 C 37.437500,15.232909 35.210688,13.125000 30.946541,13.125000 z "
-       id="path3024"
-       sodipodi:nodetypes="cccccccccc" />
-    <path
-       sodipodi:nodetypes="cccccccss"
-       id="rect2100"
-       d="M 7.0590545,14.475766 C 7.0590545,14.475766 22.648340,14.118623 22.648340,14.118623 C 24.547769,14.118623 26.076912,15.647766 26.076912,17.547195 L 26.076912,34.404338 C 26.076912,36.303766 24.547769,39.113239 22.648340,39.113239 L 7.8090545,38.970382 C 4.6239115,39.113239 2.3804825,35.732338 2.3804825,32.261481 C 2.3804825,32.261481 2.3804825,20.029338 2.3804825,20.029338 C 2.2224267,17.549131 3.3232635,14.778342 7.0590545,14.475766 z "
-       style="fill:url(#linearGradient1690);fill-opacity:1.0000000;stroke:#6c6c6c;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       style="fill:none;fill-opacity:1.0000000;stroke:url(#linearGradient1687);stroke-width:0.93053865;stroke-miterlimit:4.0000000;stroke-opacity:0.75141245"
-       d="M 7.5565619,15.382160 C 7.5565619,15.382160 22.460743,15.100358 22.460743,15.100358 C 24.228235,15.100358 25.253413,14.479091 25.253413,16.246583 L 25.253413,33.793883 C 25.253413,35.561375 23.830487,38.175698 22.062995,38.175698 L 8.2544659,38.042764 C 5.2905672,38.175698 3.2913581,35.029639 3.2913581,31.799872 C 3.2913581,31.799872 3.2913581,20.417390 3.2913581,20.417390 C 3.2768635,18.551404 3.3731571,15.752106 7.5565619,15.382160 z "
-       id="path3026"
-       sodipodi:nodetypes="cccccccss" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient1682);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient1684);stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       id="rect3297"
-       width="7.0755110"
-       height="5.9284096"
-       x="4.3773780"
-       y="24.388432"
-       rx="1.5035444"
-       ry="1.5035446" />
-    <path
-       sodipodi:nodetypes="cccccssccc"
-       id="path2295"
-       d="M 30.183978,13.125000 L 16.187500,13.023129 C 11.329175,13.054379 8.6250000,16.546379 8.6250000,19.616879 C 8.6250000,22.504853 10.778028,24.563327 12.250000,25.085629 L 12.250000,32.250000 C 12.250000,35.720857 11.688952,38.429890 17.687500,38.562500 C 17.687500,38.562500 32.531250,38.718750 32.531250,38.718750 C 34.532654,38.780384 37.437500,36.805677 37.437500,34.906250 L 37.437500,19.066403 C 37.437500,15.101007 35.022034,13.020526 30.183978,13.125000 z "
-       style="fill:url(#linearGradient1679);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cscsccss"
-       id="path3277"
-       d="M 17.633475,37.570175 C 18.163805,37.487311 18.858379,37.179533 18.854339,36.475415 L 18.782524,23.958369 C 20.123514,22.351295 21.088204,20.192061 20.167708,17.633240 C 20.167708,17.633240 36.327611,17.594408 36.327611,17.594408 L 36.106640,33.946253 C 36.106640,33.946253 34.950120,37.671777 32.394329,37.702757 C 32.394329,37.702757 17.633475,37.570175 17.633475,37.570175 z "
-       style="opacity:0.65573770;color:#000000;fill:url(#linearGradient1676);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
-    <path
-       transform="translate(-1.375000,-2.890164)"
-       d="M 19.875000 22.562500 A 4.1250000 4.1875000 0 1 1  11.625000,22.562500 A 4.1250000 4.1875000 0 1 1  19.875000 22.562500 z"
-       sodipodi:ry="4.1875000"
-       sodipodi:rx="4.1250000"
-       sodipodi:cy="22.562500"
-       sodipodi:cx="15.750000"
-       id="path2589"
-       style="color:#000000;fill:url(#radialGradient1699);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#6c6c6c;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       sodipodi:type="arc" />
-    <path
-       transform="translate(0.562500,-2.515164)"
-       d="M 16.500000 22.687500 A 1.7500000 1.8125000 0 1 1  13.000000,22.687500 A 1.7500000 1.8125000 0 1 1  16.500000 22.687500 z"
-       sodipodi:ry="1.8125000"
-       sodipodi:rx="1.7500000"
-       sodipodi:cy="22.687500"
-       sodipodi:cx="14.750000"
-       id="path2599"
-       style="color:#000000;fill:#ffffff;fill-opacity:0.45762709;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       id="path2601"
-       sodipodi:cx="14.750000"
-       sodipodi:cy="22.687500"
-       sodipodi:rx="1.7500000"
-       sodipodi:ry="1.8125000"
-       d="M 16.500000 22.687500 A 1.7500000 1.8125000 0 1 1  13.000000,22.687500 A 1.7500000 1.8125000 0 1 1  16.500000 22.687500 z"
-       transform="matrix(0.840316,0.000000,0.000000,0.840316,0.855340,-0.480722)" />
-    <g
-       transform="translate(1.000003,7.000000e-6)"
-       id="g3032">
-      <g
-         id="g2874"
-         transform="translate(0.176777,0.176777)"
-         style="fill:#ffffff;fill-opacity:1.0000000">
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2876"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,2.833330,18.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,4.833326,18.05550)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2878"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2880"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,6.833326,18.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,8.833326,18.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2882"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2884"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,7.833329,19.05550)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,5.833329,19.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2886"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2888"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,3.833329,19.05551)" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2890"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,2.833326,20.05550)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,4.833326,20.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2892"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2894"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,6.833326,20.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,8.833326,20.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2896"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2898"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,7.833329,21.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,8.833326,22.05550)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2900"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2902"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,6.833329,22.05550)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,5.833329,21.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2904"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2906"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,4.833326,22.05550)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,3.833326,21.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2908"
-           style="color:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-      </g>
-      <g
-         id="g2995">
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,2.833330,18.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2603"
-           style="color:#000000;fill:url(#linearGradient1701);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient1703);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2605"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,4.833326,18.05550)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,6.833326,18.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2607"
-           style="color:#000000;fill:url(#linearGradient1705);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient1707);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2609"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,8.833326,18.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,7.833329,19.05550)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2611"
-           style="color:#000000;fill:url(#linearGradient1709);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient1711);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2613"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,5.833329,19.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,3.833329,19.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2615"
-           style="color:#000000;fill:url(#linearGradient1713);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,2.833326,20.05550)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2619"
-           style="color:#000000;fill:url(#linearGradient1715);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient1717);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2621"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,4.833326,20.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,6.833326,20.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2623"
-           style="color:#000000;fill:url(#linearGradient1719);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient1721);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2625"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,8.833326,20.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,7.833329,21.05551)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2627"
-           style="color:#000000;fill:url(#linearGradient1723);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient1725);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2629"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,8.833326,22.05550)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,6.833329,22.05550)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2631"
-           style="color:#000000;fill:url(#linearGradient1727);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient1729);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2633"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,5.833329,21.05551)" />
-        <path
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,4.833326,22.05550)"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           sodipodi:ry="1.1250000"
-           sodipodi:rx="1.1250000"
-           sodipodi:cy="32.500000"
-           sodipodi:cx="3.7500000"
-           id="path2635"
-           style="color:#000000;fill:url(#linearGradient1731);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient1733);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-           id="path2637"
-           sodipodi:cx="3.7500000"
-           sodipodi:cy="32.500000"
-           sodipodi:rx="1.1250000"
-           sodipodi:ry="1.1250000"
-           d="M 4.8750000 32.500000 A 1.1250000 1.1250000 0 1 1  2.6250000,32.500000 A 1.1250000 1.1250000 0 1 1  4.8750000 32.500000 z"
-           transform="matrix(0.444446,0.000000,0.000000,0.444446,3.833326,21.05551)" />
-      </g>
-    </g>
-    <rect
-       ry="0.50354433"
-       rx="0.50354433"
-       y="28.000000"
-       x="13.000000"
-       height="3.0000000"
-       width="4.0000000"
-       id="rect3014"
-       style="color:#000000;fill:url(#linearGradient1633);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
-    <path
-       style="fill:#000000;fill-opacity:0.10734458;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 19.234835,37.206242 C 19.234835,37.206242 19.234835,24.346407 19.234835,24.346407 C 20.002531,23.540621 20.421274,22.863407 20.827064,21.623261 C 20.827064,21.623261 34.327665,21.623261 34.327665,21.623261 C 34.327665,21.623261 21.452665,22.337524 21.452665,22.337524 C 21.114277,23.122324 20.552237,24.008019 20.003141,24.622296 C 20.003141,24.622296 19.234835,37.206242 19.234835,37.206242 z "
-       id="path1466"
-       sodipodi:nodetypes="csscssc" />
-    <path
-       style="opacity:0.63387978;fill:none;fill-opacity:1.0000000;stroke:url(#linearGradient1629);stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M 30.852943,13.627626 L 16.564140,13.509265 C 11.973189,13.538795 9.4178354,17.059587 9.4178354,19.961104 C 9.4178354,22.690141 11.452373,24.635329 12.843337,25.128887 L 12.843337,31.898973 C 12.843337,35.178814 12.313166,37.915535 17.981589,38.040847 C 17.981589,38.040847 32.008426,38.188498 32.008426,38.188498 C 34.253237,38.202546 36.954024,36.778456 36.909830,34.409038 L 36.909830,18.857858 C 36.909830,15.791277 34.919019,13.627626 30.852943,13.627626 z "
-       id="path2240"
-       sodipodi:nodetypes="cccccssccc" />
-    <g
-       transform="matrix(1.000000,0.000000,-6.156892e-2,1.000000,1.776540,0.000000)"
-       id="g3216">
-      <rect
-         style="color:#000000;fill:#e0e0e0;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#6c6c6c;stroke-width:0.88373333;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         id="rect2108"
-         width="5.0357141"
-         height="7.0985928"
-         x="20.828430"
-         y="25.444061"
-         rx="0.28571433"
-         ry="0.28517434" />
-      <rect
-         style="color:#000000;fill:url(#linearGradient1605);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#6c6c6c;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         id="rect2096"
-         width="21.545832"
-         height="16.267857"
-         x="23.799280"
-         y="20.720566"
-         rx="1.2857143"
-         ry="1.2832843" />
-      <rect
-         style="fill:url(#linearGradient1607);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-         id="rect2098"
-         width="16.053572"
-         height="12.053572"
-         x="25.938265"
-         y="22.881281"
-         rx="0.27234393"
-         ry="0.27182922" />
-      <rect
-         style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient1609);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         id="rect3030"
-         width="18.296387"
-         height="14.230534"
-         x="24.837126"
-         y="21.748661"
-         rx="0.0071788891"
-         ry="0.0071653211" />
-      <g
-         id="g3201"
-         transform="translate(-0.707105,0.000000)" />
-      <path
-         id="rect3258"
-         transform="matrix(1.000000,0.000000,6.156892e-2,1.000000,-1.776540,0.000000)"
-         d="M 27.375000,23.500000 C 27.224121,23.500000 27.071771,23.630656 27.062500,23.781250 L 26.500000,33.031250 C 33.815243,31.681306 33.857480,27.120605 41.343750,26.000000 L 41.468750,23.781250 C 41.478022,23.630657 41.369630,23.500000 41.218750,23.500000 L 27.375000,23.500000 z "
-         style="opacity:0.15300544;fill:url(#linearGradient1611);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    </g>
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path3234"
-       d="M 20.948038,32.973981 L 22.936776,35.183690 L 23.113552,32.929787 L 20.948038,32.973981 z M 24.571961,37.481787 L 25.102290,38.630835 C 25.102290,38.630835 32.438523,38.719223 32.438523,38.719223 C 34.252705,38.802710 35.818267,37.481787 35.818267,37.481787 L 24.571961,37.481787 z "
-       style="fill:#000000;fill-opacity:0.25988701;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cccc"
-       id="path3236"
-       d="M 13.114621,25.495849 C 16.303953,25.586974 18.149209,24.983280 19.003494,23.593641 C 17.773323,26.190668 13.114621,26.532383 13.114621,26.532383 L 13.114621,25.495849 z "
-       style="fill:url(#linearGradient1618);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path3246"
-       d="M 21.214039,15.323636 L 32.784719,15.323636"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000005px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.62711865" />
-    <path
-       transform="matrix(1.321444,0.000000,0.000000,1.321444,-6.515399,-9.039650)"
-       d="M 20.064156 18.345709 A 0.83968931 0.83968931 0 1 1  18.384777,18.345709 A 0.83968931 0.83968931 0 1 1  20.064156 18.345709 z"
-       sodipodi:ry="0.83968931"
-       sodipodi:rx="0.83968931"
-       sodipodi:cy="18.345709"
-       sodipodi:cx="19.224466"
-       id="path3248"
-       style="color:#000000;fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.62711865;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       sodipodi:type="arc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/dialog-error.svg Deleted

@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1306"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/garrett/Source/tango-icon-theme/scalable/status"
-   sodipodi:docname="dialog-error.svg">
-  <defs
-     id="defs1308">
-    <linearGradient
-       id="linearGradient3957">
-      <stop
-         style="stop-color:#fffeff;stop-opacity:0.33333334;"
-         offset="0"
-         id="stop3959" />
-      <stop
-         style="stop-color:#fffeff;stop-opacity:0.21568628;"
-         offset="1"
-         id="stop3961" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2536">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1;"
-         offset="0"
-         id="stop2538" />
-      <stop
-         style="stop-color:#ff1717;stop-opacity:1;"
-         offset="1"
-         id="stop2540" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2479">
-      <stop
-         style="stop-color:#ffe69b;stop-opacity:1;"
-         offset="0"
-         id="stop2481" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop2483" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126"
-       inkscape:collect="always">
-      <stop
-         id="stop4128"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4130"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient2169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.500000,1.899196e-14,20.00000)"
-       cx="23.857143"
-       cy="40.000000"
-       fx="23.857143"
-       fy="40.000000"
-       r="17.142857" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2479"
-       id="linearGradient2485"
-       x1="43.93581"
-       y1="53.835983"
-       x2="20.064686"
-       y2="-8.5626707"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient2542"
-       x1="36.917976"
-       y1="66.288063"
-       x2="19.071495"
-       y2="5.5410109"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient3046"
-       gradientUnits="userSpaceOnUse"
-       x1="36.917976"
-       y1="66.288063"
-       x2="19.071495"
-       y2="5.5410109" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2479"
-       id="linearGradient3048"
-       gradientUnits="userSpaceOnUse"
-       x1="43.93581"
-       y1="53.835983"
-       x2="20.064686"
-       y2="-8.5626707" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient3064"
-       gradientUnits="userSpaceOnUse"
-       x1="36.917976"
-       y1="66.288063"
-       x2="19.071495"
-       y2="5.5410109" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2479"
-       id="linearGradient3066"
-       gradientUnits="userSpaceOnUse"
-       x1="43.93581"
-       y1="53.835983"
-       x2="20.064686"
-       y2="-8.5626707" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3957"
-       id="linearGradient3963"
-       x1="21.993773"
-       y1="33.955299"
-       x2="20.917078"
-       y2="15.814602"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient3976"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,1.893048e-14,20)"
-       cx="23.857143"
-       cy="40.000000"
-       fx="23.857143"
-       fy="40.000000"
-       r="17.142857" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       x1="36.917976"
-       y1="66.288063"
-       x2="19.071495"
-       y2="5.5410109" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2479"
-       id="linearGradient3980"
-       gradientUnits="userSpaceOnUse"
-       x1="43.93581"
-       y1="53.835983"
-       x2="20.064686"
-       y2="-8.5626707" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3957"
-       id="linearGradient3982"
-       gradientUnits="userSpaceOnUse"
-       x1="21.993773"
-       y1="33.955299"
-       x2="20.917078"
-       y2="15.814602" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.21568627"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="27.043297"
-     inkscape:cy="20.463852"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="925"
-     inkscape:window-height="846"
-     inkscape:window-x="234"
-     inkscape:window-y="52"
-     inkscape:showpageshadow="false"
-     fill="#ef2929"
-     gridempspacing="4" />
-  <metadata
-     id="metadata1311">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Rodney Dawes</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner, Garrett LeSage</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Dialog Error</dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Shadow">
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       transform="matrix(1.070555,0,0,0.525,-0.892755,22.5)"
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       sodipodi:ry="8.5714283"
-       sodipodi:rx="17.142857"
-       sodipodi:cy="40"
-       sodipodi:cx="23.857143"
-       id="path6548"
-       style="opacity:0.6;color:#000000;fill:url(#radialGradient3976);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g4006">
-      <path
-         transform="matrix(0.920488,0,0,0.920488,2.368532,0.97408)"
-         d="M 46.857143 23.928572 A 23.357143 23.357143 0 1 1  0.1428566,23.928572 A 23.357143 23.357143 0 1 1  46.857143 23.928572 z"
-         sodipodi:ry="23.357143"
-         sodipodi:rx="23.357143"
-         sodipodi:cy="23.928572"
-         sodipodi:cx="23.5"
-         id="path1314"
-         style="fill:url(#linearGradient3978);fill-opacity:1;fill-rule:nonzero;stroke:#b20000;stroke-width:1.08638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         transform="matrix(0.856093,0,0,0.856093,1.818275,0.197769)"
-         d="M 49.901535 26.635273 A 23.991123 23.991123 0 1 1  1.9192886,26.635273 A 23.991123 23.991123 0 1 1  49.901535 26.635273 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="23.991123"
-         sodipodi:cy="26.635273"
-         sodipodi:cx="25.910412"
-         id="path3560"
-         style="opacity:0.34659089;fill:#cc0000;fill-opacity:0;stroke:url(#linearGradient3980);stroke-width:1.16809607;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Error Box">
-    <rect
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="fill:#efefef;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73876643;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.8627451"
-       id="rect2070"
-       width="27.836435"
-       height="7.1735945"
-       x="10.078821"
-       y="19.164932"
-       transform="matrix(1.005876,0,0,1.115201,-0.138045,-2.372708)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Glossy Shine">
-    <path
-       transform="matrix(1.002994,0,0,1.002994,-7.185874e-2,1.968356e-2)"
-       sodipodi:nodetypes="czssc"
-       id="path3955"
-       d="M 43.370686,21.715486 C 43.370686,32.546102 33.016357,15.449178 24.695948,22.101874 C 16.569626,28.599385 4.0989837,34.292422 4.0989837,23.461806 C 4.0989837,12.377753 12.79438,2.0948032 23.625,2.0948032 C 34.455619,2.0948032 43.370686,10.884868 43.370686,21.715486 z "
-       style="fill:url(#linearGradient3982);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/dialog-information.svg Deleted

@@ -1,1145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="dialog-information.svg"
-   sodipodi:docbase="/home/garrett/Source/tango-icon-theme/scalable/status"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg19655"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/poing.png"
-   inkscape:export-xdpi="392.72742"
-   inkscape:export-ydpi="392.72742">
-  <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3300">
-      <stop
-         style="stop-color:#4c4c28;stop-opacity:1;"
-         offset="0"
-         id="stop3302" />
-      <stop
-         style="stop-color:#4c4c28;stop-opacity:0;"
-         offset="1"
-         id="stop3304" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3311">
-      <stop
-         id="stop3313"
-         offset="0"
-         style="stop-color:#d6d7a5;stop-opacity:1;" />
-      <stop
-         id="stop3315"
-         offset="1.0000000"
-         style="stop-color:#8e8f6d;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3265">
-      <stop
-         id="stop3267"
-         offset="0"
-         style="stop-color:#929470;stop-opacity:1;" />
-      <stop
-         style="stop-color:#60614a;stop-opacity:1.0000000;"
-         offset="0.26470590"
-         id="stop3269" />
-      <stop
-         id="stop3271"
-         offset="0.63235295"
-         style="stop-color:#f3f5ba;stop-opacity:1.0000000;" />
-      <stop
-         id="stop3273"
-         offset="1.0000000"
-         style="stop-color:#929470;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3175"
-       inkscape:collect="always">
-      <stop
-         id="stop3177"
-         offset="0"
-         style="stop-color:#f1f3ff;stop-opacity:1;" />
-      <stop
-         id="stop3179"
-         offset="1"
-         style="stop-color:#f1f3ff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2399">
-      <stop
-         style="stop-color:#929470;stop-opacity:1;"
-         offset="0"
-         id="stop2401" />
-      <stop
-         id="stop2407"
-         offset="0.26470590"
-         style="stop-color:#fcffc1;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#f3f5ba;stop-opacity:1.0000000;"
-         offset="0.63235295"
-         id="stop2409" />
-      <stop
-         style="stop-color:#929470;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2403" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6339">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6341" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6343" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20428">
-      <stop
-         id="stop20430"
-         offset="0.0000000"
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
-      <stop
-         id="stop20432"
-         offset="1"
-         style="stop-color:#b5b5b5;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20393">
-      <stop
-         id="stop20395"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.44117647;"
-         offset="0.41176471"
-         id="stop2427" />
-      <stop
-         id="stop20397"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:0.48039216;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20210">
-      <stop
-         id="stop20212"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.51546389;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.14432989;"
-         offset="0.55172414"
-         id="stop20218" />
-      <stop
-         id="stop20214"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="11.4873"
-       fx="17.8335"
-       r="22.7093"
-       cy="11.4873"
-       cx="17.8335"
-       id="aigrd7">
-      <stop
-         id="stop19512"
-         style="stop-color:#ffffff;stop-opacity:0.17525773;"
-         offset="0.0000000" />
-      <stop
-         id="stop19514"
-         style="stop-color:#709ac8;stop-opacity:1.0000000;"
-         offset="0.88200003" />
-      <stop
-         id="stop19516"
-         style="stop-color:#6f96dd;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <linearGradient
-       y2="43.165"
-       x2="26.4785"
-       y1="43.165"
-       x1="23.124"
-       gradientUnits="userSpaceOnUse"
-       id="aigrd1">
-      <stop
-         id="stop19415"
-         style="stop-color:#686868"
-         offset="5.618000e-003" />
-      <stop
-         id="stop19417"
-         style="stop-color:#777777"
-         offset="3.012137e-002" />
-      <stop
-         id="stop19419"
-         style="stop-color:#929292"
-         offset="8.366583e-002" />
-      <stop
-         id="stop19421"
-         style="stop-color:#A7A7A7"
-         offset="0.1422" />
-      <stop
-         id="stop19423"
-         style="stop-color:#B6B6B6"
-         offset="0.2074" />
-      <stop
-         id="stop19425"
-         style="stop-color:#BEBEBE"
-         offset="0.2846" />
-      <stop
-         id="stop19427"
-         style="stop-color:#C1C1C1"
-         offset="0.4045" />
-      <stop
-         id="stop19429"
-         style="stop-color:#BCBCBC"
-         offset="0.4962" />
-      <stop
-         id="stop19431"
-         style="stop-color:#ADADAD"
-         offset="0.6057" />
-      <stop
-         id="stop19433"
-         style="stop-color:#959595"
-         offset="0.7245" />
-      <stop
-         id="stop19435"
-         style="stop-color:#747474"
-         offset="0.8497" />
-      <stop
-         id="stop19437"
-         style="stop-color:#494949"
-         offset="0.9789" />
-      <stop
-         id="stop19439"
-         style="stop-color:#414141"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19894"
-       gradientUnits="userSpaceOnUse"
-       x1="18.995100"
-       y1="37.226601"
-       x2="30.169901"
-       y2="37.226601">
-      <stop
-         offset="5.618000e-003"
-         style="stop-color:#A3A349"
-         id="stop19896" />
-      <stop
-         offset="2.078677e-002"
-         style="stop-color:#ACAC54"
-         id="stop19898" />
-      <stop
-         offset="6.600059e-002"
-         style="stop-color:#C1C172"
-         id="stop19900" />
-      <stop
-         offset="0.1148"
-         style="stop-color:#D4D68E"
-         id="stop19902" />
-      <stop
-         offset="0.1677"
-         style="stop-color:#E2E4A6"
-         id="stop19904" />
-      <stop
-         offset="0.2265"
-         style="stop-color:#EDF0B8"
-         id="stop19906" />
-      <stop
-         offset="0.2963"
-         style="stop-color:#F3F6C3"
-         id="stop19908" />
-      <stop
-         offset="0.4045"
-         style="stop-color:#F5F8C7"
-         id="stop19910" />
-      <stop
-         offset="0.5239"
-         style="stop-color:#EEF0BE"
-         id="stop19912" />
-      <stop
-         offset="0.6666"
-         style="stop-color:#DBDDA9"
-         id="stop19914" />
-      <stop
-         offset="0.8211"
-         style="stop-color:#BEBD88"
-         id="stop19916" />
-      <stop
-         offset="0.9832"
-         style="stop-color:#989564"
-         id="stop19918" />
-      <stop
-         offset="1"
-         style="stop-color:#949160"
-         id="stop19920" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.639127,0,0,1.639127,-15.97035,-29.79355)"
-       y2="43.165"
-       x2="26.4785"
-       y1="43.165"
-       x1="23.124"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient20109"
-       xlink:href="#aigrd1"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="7.8289826"
-       fy="74.209934"
-       fx="14.772334"
-       cy="74.209934"
-       cx="14.772334"
-       gradientTransform="scale(1.764278,0.566804)"
-       id="radialGradient20216"
-       xlink:href="#linearGradient20210"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="36.726292"
-       x2="32.096882"
-       y1="10.061084"
-       x1="16.998856"
-       gradientTransform="matrix(1.140494,0.000000,0.000000,0.926002,0.272330,-3.247170)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7708"
-       xlink:href="#linearGradient6339"
-       inkscape:collect="always" />
-    <radialGradient
-       r="33.934090"
-       fy="29.869318"
-       fx="68.137589"
-       cy="29.869318"
-       cx="68.137589"
-       gradientTransform="matrix(0.551290,1.265592e-16,-1.355720e-16,0.766034,-10.48701,3.514312)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient7720"
-       xlink:href="#aigrd7"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="3.8557322"
-       x2="-5.2517161"
-       y1="16.651863"
-       x1="37.940434"
-       gradientTransform="matrix(0.894129,0.000000,0.000000,0.985230,1.515981,2.449800e-2)"
-       id="linearGradient3181"
-       xlink:href="#linearGradient3175"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20393"
-       id="linearGradient1700"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6293,0,0,1.589068,50.68808,3.804378)"
-       x1="30.620375"
-       y1="10.313651"
-       x2="32.166080"
-       y2="18.162935" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20393"
-       id="linearGradient1702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6293,0,0,1.589068,1.411612,3.929378)"
-       x1="30.620375"
-       y1="10.313651"
-       x2="32.166080"
-       y2="18.162935" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20428"
-       id="linearGradient1704"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.985083,0,0,0.503757,1.786612,4.554378)"
-       x1="14.637301"
-       y1="31.504122"
-       x2="9.3648205"
-       y2="32.250980" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient1725"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.026450,0.974232)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient1727"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.026450,0.974232)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient1729"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.026450,0.974232)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient1731"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.026450,0.974232)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3311"
-       id="linearGradient2516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.603440,0.000000,0.000000,0.549396,0.614167,2.449800e-2)"
-       x1="17.879995"
-       y1="55.362793"
-       x2="11.906206"
-       y2="54.863026" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3265"
-       id="linearGradient2518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.905728,-4.386156e-2,0.189510,-0.963437,0.614167,2.449800e-2)"
-       x1="-29.007195"
-       y1="-29.799353"
-       x2="-37.641232"
-       y2="-29.598314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient2522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.618682,-0.132027,6.262726e-2,0.741184,31.12021,8.300410)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient2524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.618682,-0.132027,6.262726e-2,0.741184,31.12021,8.300410)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.566621,2.988977e-2,-0.118557,0.656541,36.18544,20.08311)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient2531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.566621,2.988977e-2,-0.118557,0.656541,36.18544,20.08311)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3300"
-       id="linearGradient3306"
-       gradientTransform="scale(1.002656,0.997352)"
-       x1="24.613028"
-       y1="31.146202"
-       x2="24.613028"
-       y2="26.739624"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3311"
-       id="linearGradient3127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.60344,0,0,0.549396,0.614167,2.4498e-2)"
-       x1="17.879995"
-       y1="55.362793"
-       x2="11.906206"
-       y2="54.863026" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3265"
-       id="linearGradient3129"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.905728,-4.386156e-2,0.18951,-0.963437,0.614167,2.4498e-2)"
-       x1="-29.007195"
-       y1="-29.799353"
-       x2="-37.641232"
-       y2="-29.598314" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd7"
-       id="radialGradient3131"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55129,1.265592e-16,-1.35572e-16,0.766034,-10.48701,3.514312)"
-       cx="68.137589"
-       cy="29.869318"
-       fx="68.137589"
-       fy="29.869318"
-       r="33.934090" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6339"
-       id="linearGradient3133"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.140494,0,0,0.926002,0.27233,-3.24717)"
-       x1="16.998856"
-       y1="10.061084"
-       x2="32.096882"
-       y2="36.726292" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3175"
-       id="linearGradient3135"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.894129,0,0,0.98523,1.515981,2.4498e-2)"
-       x1="37.940434"
-       y1="16.651863"
-       x2="-5.2517161"
-       y2="3.8557322" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3311"
-       id="linearGradient3157"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.60344,0,0,0.549396,0.614167,2.4498e-2)"
-       x1="17.879995"
-       y1="55.362793"
-       x2="11.906206"
-       y2="54.863026" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3265"
-       id="linearGradient3159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.905728,-4.386156e-2,0.18951,-0.963437,0.614167,2.4498e-2)"
-       x1="-29.007195"
-       y1="-29.799353"
-       x2="-37.641232"
-       y2="-29.598314" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd7"
-       id="radialGradient3161"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55129,1.265592e-16,-1.35572e-16,0.766034,-10.48701,3.514312)"
-       cx="68.137589"
-       cy="29.869318"
-       fx="68.137589"
-       fy="29.869318"
-       r="33.934090" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3175"
-       id="linearGradient3163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.894129,0,0,0.98523,1.515981,2.4498e-2)"
-       x1="37.940434"
-       y1="16.651863"
-       x2="-5.2517161"
-       y2="3.8557322" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20393"
-       id="linearGradient3165"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6293,0,0,1.589068,50.68808,3.804378)"
-       x1="30.620375"
-       y1="10.313651"
-       x2="32.166080"
-       y2="18.162935" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20393"
-       id="linearGradient3167"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6293,0,0,1.589068,1.411612,3.929378)"
-       x1="30.620375"
-       y1="10.313651"
-       x2="32.166080"
-       y2="18.162935" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20428"
-       id="linearGradient3169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.985083,0,0,0.503757,1.786612,4.554378)"
-       x1="14.637301"
-       y1="31.504122"
-       x2="9.3648205"
-       y2="32.250980" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6339"
-       id="linearGradient3171"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.140494,0,0,0.926002,0.27233,-3.24717)"
-       x1="16.998856"
-       y1="10.061084"
-       x2="32.096882"
-       y2="36.726292" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3300"
-       id="linearGradient3185"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.002656,0.997352)"
-       x1="24.613028"
-       y1="31.146202"
-       x2="24.613028"
-       y2="26.739624" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient3187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.566621,2.988977e-2,-0.118557,0.656541,36.18544,20.08311)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient3189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.566621,2.988977e-2,-0.118557,0.656541,36.18544,20.08311)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient3191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.02645,0.974232)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient3193"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.02645,0.974232)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient3195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.02645,0.974232)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient3197"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.02645,0.974232)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient3199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.618682,-0.132027,6.262726e-2,0.741184,31.12021,8.30041)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient3201"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.618682,-0.132027,6.262726e-2,0.741184,31.12021,8.30041)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd1"
-       id="linearGradient4100"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.639127,0,0,1.639127,-15.97035,-29.79355)"
-       x1="23.124"
-       y1="43.165"
-       x2="26.4785"
-       y2="43.165" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3300"
-       id="linearGradient4102"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.002656,0.997352)"
-       x1="24.613028"
-       y1="31.146202"
-       x2="24.613028"
-       y2="26.739624" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient4104"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.566621,2.988977e-2,-0.118557,0.656541,36.18544,20.08311)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient4106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.566621,2.988977e-2,-0.118557,0.656541,36.18544,20.08311)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient4108"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.02645,0.974232)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient4110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.02645,0.974232)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient4112"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.02645,0.974232)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient4114"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.02645,0.974232)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19894"
-       id="linearGradient4116"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.618682,-0.132027,6.262726e-2,0.741184,31.12021,8.30041)"
-       x1="-22.874170"
-       y1="38.675991"
-       x2="-4.3908315"
-       y2="38.675991" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2399"
-       id="linearGradient4118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.618682,-0.132027,6.262726e-2,0.741184,31.12021,8.30041)"
-       x1="-10.480865"
-       y1="39.033951"
-       x2="-23.851389"
-       y2="39.142845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3311"
-       id="linearGradient4120"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.60344,0,0,0.549396,0.614167,2.4498e-2)"
-       x1="17.879995"
-       y1="55.362793"
-       x2="11.906206"
-       y2="54.863026" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3265"
-       id="linearGradient4122"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.905728,-4.386156e-2,0.18951,-0.963437,0.614167,2.4498e-2)"
-       x1="-29.007195"
-       y1="-29.799353"
-       x2="-37.641232"
-       y2="-29.598314" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd7"
-       id="radialGradient4124"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55129,1.265592e-16,-1.35572e-16,0.766034,-10.48701,3.514312)"
-       cx="68.137589"
-       cy="29.869318"
-       fx="68.137589"
-       fy="29.869318"
-       r="33.934090" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3175"
-       id="linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.894129,0,0,0.98523,1.515981,2.4498e-2)"
-       x1="37.940434"
-       y1="16.651863"
-       x2="-5.2517161"
-       y2="3.8557322" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20393"
-       id="linearGradient4128"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6293,0,0,1.589068,50.68808,3.804378)"
-       x1="30.620375"
-       y1="10.313651"
-       x2="32.166080"
-       y2="18.162935" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20393"
-       id="linearGradient4130"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6293,0,0,1.589068,1.411612,3.929378)"
-       x1="30.620375"
-       y1="10.313651"
-       x2="32.166080"
-       y2="18.162935" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20428"
-       id="linearGradient4132"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.985083,0,0,0.503757,1.786612,4.554378)"
-       x1="14.637301"
-       y1="31.504122"
-       x2="9.3648205"
-       y2="32.250980" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6339"
-       id="linearGradient4134"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.140494,0,0,0.926002,0.27233,-3.24717)"
-       x1="16.998856"
-       y1="10.061084"
-       x2="32.096882"
-       y2="36.726292" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="91"
-     inkscape:window-x="146"
-     inkscape:window-height="922"
-     inkscape:window-width="1060"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:cy="19.729332"
-     inkscape:cx="29.03294"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.55294118"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     gridempspacing="4" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Info</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>dialog</rdf:li>
-            <rdf:li>info</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Garrett LeSage</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.197183,0,0,1.098591,-6.201582,-3.209507)"
-       d="M 39.875 42.0625 A 13.8125 4.4375 0 1 1  12.25,42.0625 A 13.8125 4.4375 0 1 1  39.875 42.0625 z"
-       sodipodi:ry="4.4375"
-       sodipodi:rx="13.8125"
-       sodipodi:cy="42.0625"
-       sodipodi:cx="26.0625"
-       id="path20208"
-       style="color:#000000;fill:url(#radialGradient20216);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;opacity:0.8"
-       sodipodi:type="arc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <g
-       id="g4076"
-       transform="translate(0,1)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="matrix(1.075823,0,0,0.937493,-2.551335,3.047213)"
-         id="path19509"
-         d="M 21.893504,38.885945 L 21.893504,40.36116 C 21.893504,41.836375 23.204807,43.147679 24.680022,43.147679 C 26.155237,43.147679 27.466539,41.836375 27.466539,40.36116 L 27.466539,38.885945 L 21.893504,38.885945 z "
-         style="fill:url(#linearGradient4100);fill-rule:nonzero;stroke:#565656;stroke-miterlimit:4;stroke-opacity:1" />
-      <g
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="matrix(0.989073,0,0,0.993556,-0.408739,7.920479e-3)"
-         id="g3173">
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           sodipodi:nodetypes="cccccccscccccccs"
-           id="path3209"
-           d="M 24.511725,27.668867 C 21.208844,27.660897 17.463275,28.632054 19.492913,30.467931 C 18.98969,30.670934 18.270371,31.124313 18.355167,32.185222 C 18.401983,32.739286 18.989243,33.079394 19.79236,33.32911 C 18.881908,33.967722 18.302581,34.642557 18.355167,35.264921 C 18.401438,35.812525 18.976334,36.187531 19.76303,36.43814 C 18.875519,37.069403 18.303301,37.760121 18.355167,38.373951 C 18.434436,39.312088 20.457743,40.362928 24.838928,40.2419 C 27.993329,40.155914 30.776913,39.590514 30.996599,38.373951 C 31.082862,37.896248 30.691907,37.450531 30.087355,37.05408 C 30.539926,36.597918 30.85698,36.135242 30.820616,35.704878 C 30.774128,35.154694 30.205993,34.781923 29.412754,34.53166 C 30.300265,33.900397 30.872482,33.209679 30.820616,32.595849 C 30.774128,32.045664 30.205993,31.702225 29.412754,31.45196 C 30.310848,30.817288 30.872816,30.133928 30.820616,29.516149 C 30.762593,28.829446 27.61599,27.676358 24.511725,27.668867 z "
-           style="color:#000000;fill:#aeae57;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4102);stroke-width:2.01752925;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           sodipodi:nodetypes="csccc"
-           id="path3183"
-           d="M 30.920208,38.329767 C 30.700522,39.546331 27.591422,40.232861 22.615132,39.983673 C 19.463507,39.825856 19.283163,38.944055 19.502848,37.727491 C 19.722534,36.510926 22.458318,35.65848 25.609509,35.824708 C 28.7607,35.990936 31.139893,37.113203 30.920208,38.329767 z "
-           style="color:#000000;fill:url(#linearGradient4104);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4106);stroke-width:0.08906282;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           sodipodi:type="arc"
-           style="color:#000000;fill:url(#linearGradient4108);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4110);stroke-width:0.13035245;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="path1603"
-           sodipodi:cx="-13.87697"
-           sodipodi:cy="27.228739"
-           sodipodi:rx="10.341436"
-           sodipodi:ry="3.2703688"
-           d="M -3.5355339 27.228739 A 10.341436 3.2703688 0 1 1  -24.218407,27.228739 A 10.341436 3.2703688 0 1 1  -3.5355339 27.228739 z"
-           transform="matrix(0.60274,-0.128625,6.428372e-2,0.760788,31.12021,14.49141)" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           transform="matrix(0.60274,-0.128625,6.428372e-2,0.760788,31.12021,11.39591)"
-           d="M -3.5355339 27.228739 A 10.341436 3.2703688 0 1 1  -24.218407,27.228739 A 10.341436 3.2703688 0 1 1  -3.5355339 27.228739 z"
-           sodipodi:ry="3.2703688"
-           sodipodi:rx="10.341436"
-           sodipodi:cy="27.228739"
-           sodipodi:cx="-13.87697"
-           id="path2364"
-           style="color:#000000;fill:url(#linearGradient4112);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4114);stroke-width:0.13035245;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           sodipodi:type="arc" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           sodipodi:nodetypes="cccss"
-           id="path2366"
-           d="M 30.698087,29.636386 C 30.698087,31.014688 28.157326,32.55444 24.716601,33.288693 C 21.275876,34.022945 18.38922,33.50421 18.273172,32.130802 C 18.157124,30.757395 20.509679,29.155466 23.952388,28.968827 C 27.422379,28.780711 30.698087,28.924901 30.698087,29.636386 z "
-           style="color:#000000;fill:url(#linearGradient4116);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4118);stroke-width:0.08906286;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           transform="matrix(0.335464,0,0,0.335464,11.74678,27.2261)"
-           d="M 31 22.375 A 3.25 3.25 0 1 1  24.5,22.375 A 3.25 3.25 0 1 1  31 22.375 z"
-           sodipodi:ry="3.25"
-           sodipodi:rx="3.25"
-           sodipodi:cy="22.375"
-           sodipodi:cx="27.75"
-           id="path20372"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           sodipodi:type="arc" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           sodipodi:nodetypes="cscc"
-           id="path3241"
-           d="M 19.342183,33.378865 C 22.736592,33.883533 26.320992,33.346192 29.214315,31.470807 C 30.025582,30.944962 30.147604,30.343945 30.520921,29.873844 C 29.09679,31.000705 25.494982,34.035625 19.342183,33.378865 z "
-           style="fill:#000000;fill-opacity:0.23391807;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           sodipodi:type="arc"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="path2435"
-           sodipodi:cx="27.75"
-           sodipodi:cy="22.375"
-           sodipodi:rx="3.25"
-           sodipodi:ry="3.25"
-           d="M 31 22.375 A 3.25 3.25 0 1 1  24.5,22.375 A 3.25 3.25 0 1 1  31 22.375 z"
-           transform="matrix(0.335464,0,0,0.335464,11.74678,30.23376)" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           sodipodi:nodetypes="cscc"
-           id="path3237"
-           d="M 19.466621,39.517838 C 22.86103,40.022506 26.44543,39.485165 29.338753,37.60978 C 30.15002,37.083935 30.272043,36.482919 30.645359,36.012817 C 29.221228,37.139678 25.61942,40.174598 19.466621,39.517838 z "
-           style="fill:#000000;fill-opacity:0.23391807;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           style="fill:#000000;fill-opacity:0.23391807;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 19.487361,36.406872 C 22.88177,36.91154 26.46617,36.374199 29.359492,34.498814 C 30.17076,33.972969 30.292782,33.371953 30.666099,32.901851 C 29.241968,34.028712 25.64016,37.063632 19.487361,36.406872 z "
-           id="path3239"
-           sodipodi:nodetypes="cscc" />
-      </g>
-      <g
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="translate(-0.988797,0)"
-         id="g3146">
-        <g
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           id="g3141">
-          <path
-             transform="matrix(0.954439,0,0,0.989869,1.433222,0.639881)"
-             sodipodi:nodetypes="csscs"
-             id="path3243"
-             d="M 18.87103,29.628128 C 18.87103,28.836695 20.445135,27.889988 24.419234,27.942972 C 28.101154,27.992059 30.526608,28.83866 30.526608,30.105404 C 30.526608,31.345281 27.307242,32.174416 23.874677,32.008188 C 20.442113,31.84196 18.87103,30.868005 18.87103,29.628128 z "
-             style="color:#000000;fill:url(#linearGradient4120);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4122);stroke-width:0.09083303;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
-          <path
-             transform="matrix(0.954439,0,0,0.989869,1.433222,0.639881)"
-             sodipodi:nodetypes="csssssc"
-             id="path6305"
-             d="M 24.680021,0.8622936 C 16.858005,0.8622936 10.506261,6.8372628 10.506261,14.195288 C 10.506261,21.737851 16.247826,22.573217 16.247826,25.352995 C 16.247826,28.619061 19.614103,32.322687 25.149309,32.188995 C 31.035159,32.046835 33.464182,28.825655 33.464182,25.352995 C 33.464182,22.384064 38.853781,22.304889 38.853781,14.195288 C 38.853781,6.8372628 32.502038,0.8622936 24.680021,0.8622936 z "
-             style="color:#000000;fill:url(#radialGradient4124);fill-opacity:1;fill-rule:nonzero;stroke:#616471;stroke-width:1.01595449;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
-          <path
-             transform="matrix(0.954439,0,0,0.989869,1.433222,0.639881)"
-             style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4126);stroke-width:0.94685698;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-             d="M 24.680021,1.9277146 C 17.389999,1.9277146 11.470252,7.4963123 11.470252,14.353901 C 11.470252,21.383476 16.82132,22.162027 16.82132,24.752746 C 16.82132,27.79668 19.958648,31.248413 25.117392,31.123813 C 30.602931,30.991321 32.866751,27.989222 32.866751,24.752746 C 32.866751,21.98574 37.889791,21.911948 37.889791,14.353901 C 37.889791,7.4963123 31.970044,1.9277146 24.680021,1.9277146 z "
-             id="path2429"
-             sodipodi:nodetypes="csssssc"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
-        </g>
-        <g
-           id="g1695"
-           transform="matrix(0.9375,0,0,0.926938,0.569221,0.25176)"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true">
-          <path
-             style="fill:url(#linearGradient4128);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
-             d="M 31.947292,19.22274 C 32.260034,19.326988 32.468529,19.63973 32.364281,19.952471 L 28.507134,31.523913 C 28.402887,31.836655 28.090145,32.045149 27.777403,31.940902 C 27.464662,31.836655 27.256168,31.523913 27.360415,31.211172 L 31.217562,19.63973 C 31.321809,19.326988 31.634551,19.118493 31.947292,19.22274 z "
-             id="path1691"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
-          <path
-             id="path19612"
-             d="M 20.152404,19.34774 C 19.839662,19.451988 19.631167,19.76473 19.735415,20.077471 L 23.592562,31.648913 C 23.696809,31.961655 24.009551,32.170149 24.322293,32.065902 C 24.635034,31.961655 24.843528,31.648913 24.739281,31.336172 L 20.882134,19.76473 C 20.777887,19.451988 20.465145,19.243493 20.152404,19.34774 z "
-             style="fill:url(#linearGradient4130);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
-          <path
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4132);stroke-width:0.21454535;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-             d="M 20.255362,19.273128 C 20.009452,19.315194 19.816806,19.507772 19.774653,19.753667 C 19.732499,19.999562 19.850004,20.245309 20.067862,20.366878 C 20.067862,20.366878 21.910084,21.447747 24.317862,21.991878 C 26.72564,22.536009 29.806763,22.571305 32.130362,20.304378 C 32.305608,20.165345 32.386854,19.938963 32.340007,19.720224 C 32.29316,19.501485 32.126325,19.328233 31.909509,19.273168 C 31.692693,19.218103 31.463406,19.290751 31.317862,19.460628 C 29.367326,21.36359 26.773024,21.36522 24.567862,20.866878 C 22.3627,20.368536 20.661612,19.366878 20.661612,19.366878 C 20.542178,19.287089 20.397682,19.253744 20.255362,19.273128 z "
-             id="path19614"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
-        </g>
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           style="opacity:0.5977654;color:#000000;fill:url(#linearGradient4134);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.98750001;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M 25.001158,3.5644322 C 18.737608,3.5644322 13.655359,7.5900329 13.655359,12.547843 C 13.655359,14.527956 14.632918,16.261758 16.006008,17.747035 C 17.558672,18.378895 19.249827,18.832941 21.114752,18.832941 C 27.378302,18.832941 32.460549,14.807341 32.460551,9.849528 C 32.460551,7.857476 31.466744,6.1074629 30.07856,4.6174331 C 28.533139,3.9930601 26.854241,3.5644321 25.001158,3.5644322 z "
-           id="path6334"
-           transform="matrix(0.954439,0,0,0.989869,1.433222,0.639881)" />
-      </g>
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/dialog-warning.svg Deleted

@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1377"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/status"
-   sodipodi:docname="dialog-warning.svg">
-  <defs
-     id="defs1379">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       y2="56.0523"
-       x2="47.3197"
-       y1="11.1133"
-       x1="4.1914"
-       gradientUnits="userSpaceOnUse"
-       id="aigrd1">
-      <stop
-         id="stop6490"
-         style="stop-color:#D4D4D4"
-         offset="0" />
-      <stop
-         id="stop6492"
-         style="stop-color:#E2E2E2"
-         offset="0.3982" />
-      <stop
-         id="stop6494"
-         style="stop-color:#FFFFFF"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="56.0523"
-       x2="47.3197"
-       y1="11.1133"
-       x1="4.1914"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7451"
-       xlink:href="#aigrd1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4126"
-       inkscape:collect="always">
-      <stop
-         id="stop4128"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4130"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       r="17.142857"
-       fy="40.000000"
-       fx="23.857143"
-       cy="40.000000"
-       cx="23.857143"
-       gradientTransform="matrix(1,0,0,0.5,2.139286e-14,20)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient7449"
-       xlink:href="#linearGradient4126"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6525"
-       id="linearGradient5250"
-       x1="8.5469341"
-       y1="30.281681"
-       x2="30.85088"
-       y2="48.301884"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.899009,0,0,0.934235,1.875108,1.193645)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd1"
-       id="linearGradient3922"
-       gradientUnits="userSpaceOnUse"
-       x1="4.1914"
-       y1="11.1133"
-       x2="47.3197"
-       y2="56.0523" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6525"
-       id="linearGradient3924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.899009,0,0,0.934235,1.875108,1.193645)"
-       x1="8.5469341"
-       y1="30.281681"
-       x2="30.85088"
-       y2="48.301884" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6525"
-       id="linearGradient3933"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.899009,0,0,0.934235,1.875108,1.193645)"
-       x1="8.5469341"
-       y1="30.281681"
-       x2="30.85088"
-       y2="48.301884" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd1"
-       id="linearGradient3935"
-       gradientUnits="userSpaceOnUse"
-       x1="4.1914"
-       y1="11.1133"
-       x2="47.3197"
-       y2="56.0523" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd1"
-       id="linearGradient3946"
-       gradientUnits="userSpaceOnUse"
-       x1="4.1914"
-       y1="11.1133"
-       x2="47.3197"
-       y2="56.0523" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6525"
-       id="linearGradient3948"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.899009,0,0,0.934235,1.875108,1.193645)"
-       x1="8.5469341"
-       y1="30.281681"
-       x2="30.85088"
-       y2="48.301884" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="14.757891"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:current-layer="g7435"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1105"
-     inkscape:window-height="1084"
-     inkscape:window-x="157"
-     inkscape:window-y="16"
-     gridempspacing="4" />
-  <metadata
-     id="metadata1382">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Dialog Warning</dc:title>
-        <dc:date>2005-10-14</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner, Garrett LeSage</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>dialog</rdf:li>
-            <rdf:li>warning</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       transform="matrix(1.566667,0.000000,0.000000,1.566667,-8.925566,-23.94764)"
-       id="g7435">
-      <g
-         style="display:inline"
-         transform="matrix(1.444074e-2,0,0,1.331973e-2,33.38871,40.40337)"
-         id="g6707">
-        <rect
-           style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect6709"
-           width="1339.6335"
-           height="478.35718"
-           x="-1559.2523"
-           y="-150.69685" />
-        <path
-           style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-           id="path6711"
-           sodipodi:nodetypes="cccc" />
-        <path
-           sodipodi:nodetypes="cccc"
-           id="path6713"
-           d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-           style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      </g>
-      <g
-         id="g3937"
-         transform="matrix(1,0,4.537846e-3,1,-0.138907,-1.394718e-15)"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true">
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           transform="matrix(1,0,-8.726683e-3,1,0.328074,1.276596)"
-           id="path6485"
-           d="M 33.282781,38.644744 L 22.407791,18.394765 C 22.095292,17.832266 21.532792,17.519767 20.907793,17.519767 C 20.282793,17.519767 19.720294,17.894765 19.407795,18.457265 L 8.7828048,38.707245 C 8.5328048,39.207244 8.5328048,39.894744 8.8453048,40.394743 C 9.1578038,40.894743 9.6578038,41.144742 10.282804,41.144742 L 31.782782,41.144742 C 32.407781,41.144742 32.97028,40.832243 33.220281,40.332243 C 33.53278,39.832243 33.53278,39.207244 33.282781,38.644744 z "
-           style="fill:#cc0000;fill-rule:nonzero;stroke:#9f0000;stroke-width:0.6382978;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <g
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           id="g6487"
-           transform="matrix(0.625,0,-5.534934e-3,0.634254,6.164053,15.76055)"
-           style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4">
-          <linearGradient
-             y2="56.052299"
-             x2="47.319698"
-             y1="11.1133"
-             x1="4.1914001"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient6525">
-            <stop
-               id="stop6529"
-               style="stop-color:#ffffff;stop-opacity:1;"
-               offset="0" />
-            <stop
-               id="stop6531"
-               style="stop-color:#ffffff;stop-opacity:0.34020618;"
-               offset="1" />
-          </linearGradient>
-          <path
-             inkscape:r_cy="true"
-             inkscape:r_cx="true"
-             id="path6496"
-             d="M 9.5,37.6 C 9.2,38.1 9.5,38.5 10,38.5 L 38.2,38.5 C 38.7,38.5 39,38.1 38.7,37.6 L 24.4,11 C 24.1,10.5 23.7,10.5 23.5,11 L 9.5,37.6 z "
-             style="fill:url(#linearGradient3946);stroke:none" />
-        </g>
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           transform="matrix(1,0,-8.726683e-3,1,0.318277,1.276596)"
-           sodipodi:nodetypes="ccsccscccc"
-           id="path1325"
-           d="M 32.323106,38.183905 L 22.150271,19.265666 C 21.71698,18.45069 21.561698,18.189213 20.908406,18.189213 C 20.346525,18.189213 20.054127,18.57002 19.651305,19.339291 L 9.7489285,38.242296 C 9.1737649,39.303588 9.1128238,39.580228 9.3937644,40.047345 C 9.6747034,40.514462 10.032797,40.48902 11.356441,40.519491 L 30.974593,40.519491 C 32.206825,40.534726 32.483988,40.440837 32.70874,39.97372 C 32.989681,39.506602 32.867799,39.136 32.323106,38.183905 z "
-           style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3948);stroke-width:0.63829792;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-      <g
-         style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
-         transform="matrix(0.555088,0,0,0.555052,7.749711,17.80196)"
-         id="g6498"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true">
-        <path
-           style="stroke:none"
-           d="M 23.9,36.5 C 22.6,36.5 21.6,35.5 21.6,34.2 C 21.6,32.8 22.5,31.9 23.9,31.9 C 25.3,31.9 26.1,32.8 26.2,34.2 C 26.2,35.5 25.3,36.5 23.9,36.5 L 23.9,36.5 z M 22.5,30.6 L 21.9,19.1 L 25.9,19.1 L 25.3,30.6 L 22.4,30.6 L 22.5,30.6 z "
-           id="path6500"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true" />
-      </g>
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/document-new.svg Deleted

@@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48.000000px"
-   height="48.000000px"
-   id="svg249"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="document-new.svg"
-   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
-   inkscape:export-xdpi="240.00000"
-   inkscape:export-ydpi="240.00000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective69" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4542">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4544" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4546" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4542"
-       id="radialGradient4548"
-       cx="24.306795"
-       cy="42.07798"
-       fx="24.306795"
-       fy="42.07798"
-       r="15.821514"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,-6.310056e-16,30.08928)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop15664" />
-      <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop15666" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.5679"
-       fx="20.8921"
-       r="5.257"
-       cy="64.5679"
-       cx="20.8921"
-       id="aigrd3">
-      <stop
-         id="stop15573"
-         style="stop-color:#F0F0F0"
-         offset="0" />
-      <stop
-         id="stop15575"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.8921"
-       r="5.256"
-       cy="114.5684"
-       cx="20.8921"
-       id="aigrd2">
-      <stop
-         id="stop15566"
-         style="stop-color:#F0F0F0"
-         offset="0" />
-      <stop
-         id="stop15568"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <linearGradient
-       id="linearGradient269">
-      <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop270" />
-      <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop271" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop260" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop261" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12512">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop12513" />
-      <stop
-         style="stop-color:#fff520;stop-opacity:0.89108908;"
-         offset="0.50000000"
-         id="stop12517" />
-      <stop
-         style="stop-color:#fff300;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop12514" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12512"
-       id="radialGradient278"
-       gradientUnits="userSpaceOnUse"
-       cx="55.000000"
-       cy="125.00000"
-       fx="55.000000"
-       fy="125.00000"
-       r="14.375000" />
-    <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.8244190"
-       cy="3.7561285"
-       cx="8.8244190"
-       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15656"
-       xlink:href="#linearGradient269"
-       inkscape:collect="always" />
-    <radialGradient
-       r="86.708450"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="scale(0.960493,1.041132)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15658"
-       xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <radialGradient
-       r="38.158695"
-       fy="7.2678967"
-       fx="8.1435566"
-       cy="7.2678967"
-       cx="8.1435566"
-       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15668"
-       xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd2"
-       id="radialGradient2283"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0.000000,0.000000,0.229703,4.613529,3.979808)"
-       cx="20.8921"
-       cy="114.5684"
-       fx="20.8921"
-       fy="114.5684"
-       r="5.256" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd3"
-       id="radialGradient2285"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0.000000,0.000000,0.229703,4.613529,3.979808)"
-       cx="20.8921"
-       cy="64.5679"
-       fx="20.8921"
-       fy="64.5679"
-       r="5.257" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.32941176"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-130.2425"
-     inkscape:cy="-6.4480487"
-     inkscape:current-layer="layer6"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="872"
-     inkscape:window-height="688"
-     inkscape:window-x="166"
-     inkscape:window-y="151"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>New Document</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Shadow"
-     id="layer6"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-  </g>
-  <g
-     id="layer1"
-     inkscape:label="Base"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <rect
-       ry="1.1490486"
-       y="3.6464462"
-       x="6.6035528"
-       height="40.920494"
-       width="34.875000"
-       id="rect15391"
-       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible" />
-    <rect
-       rx="0.14904857"
-       ry="0.14904857"
-       y="4.5839462"
-       x="7.6660538"
-       height="38.946384"
-       width="32.775887"
-       id="rect15660"
-       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible" />
-    <g
-       id="g2270"
-       transform="translate(0.646447,-3.798933e-2)">
-      <g
-         transform="matrix(0.229703,0.000000,0.000000,0.229703,4.967081,4.244972)"
-         style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4.0000000"
-         id="g1440">
-        <radialGradient
-           gradientUnits="userSpaceOnUse"
-           fy="114.56840"
-           fx="20.892099"
-           r="5.2560000"
-           cy="114.56840"
-           cx="20.892099"
-           id="radialGradient1442">
-          <stop
-             id="stop1444"
-             style="stop-color:#F0F0F0"
-             offset="0" />
-          <stop
-             id="stop1446"
-             style="stop-color:#474747"
-             offset="1" />
-        </radialGradient>
-        <path
-           id="path1448"
-           d="M 23.428000,113.07000 C 23.428000,115.04300 21.828000,116.64200 19.855000,116.64200 C 17.881000,116.64200 16.282000,115.04200 16.282000,113.07000 C 16.282000,111.09600 17.882000,109.49700 19.855000,109.49700 C 21.828000,109.49700 23.428000,111.09700 23.428000,113.07000 z "
-           style="stroke:none" />
-        <radialGradient
-           gradientUnits="userSpaceOnUse"
-           fy="64.567902"
-           fx="20.892099"
-           r="5.2570000"
-           cy="64.567902"
-           cx="20.892099"
-           id="radialGradient1450">
-          <stop
-             id="stop1452"
-             style="stop-color:#F0F0F0"
-             offset="0" />
-          <stop
-             id="stop1454"
-             style="stop-color:#474747"
-             offset="1" />
-        </radialGradient>
-        <path
-           id="path1456"
-           d="M 23.428000,63.070000 C 23.428000,65.043000 21.828000,66.643000 19.855000,66.643000 C 17.881000,66.643000 16.282000,65.043000 16.282000,63.070000 C 16.282000,61.096000 17.882000,59.497000 19.855000,59.497000 C 21.828000,59.497000 23.428000,61.097000 23.428000,63.070000 z "
-           style="stroke:none" />
-      </g>
-      <path
-         id="path15570"
-         d="M 9.9950109,29.952326 C 9.9950109,30.405530 9.6274861,30.772825 9.1742821,30.772825 C 8.7208483,30.772825 8.3535532,30.405301 8.3535532,29.952326 C 8.3535532,29.498892 8.7210780,29.131597 9.1742821,29.131597 C 9.6274861,29.131597 9.9950109,29.499122 9.9950109,29.952326 z "
-         style="fill:url(#radialGradient2283);fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000" />
-      <path
-         id="path15577"
-         d="M 9.9950109,18.467176 C 9.9950109,18.920380 9.6274861,19.287905 9.1742821,19.287905 C 8.7208483,19.287905 8.3535532,18.920380 8.3535532,18.467176 C 8.3535532,18.013742 8.7210780,17.646447 9.1742821,17.646447 C 9.6274861,17.646447 9.9950109,18.013972 9.9950109,18.467176 z "
-         style="fill:url(#radialGradient2285);fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000" />
-    </g>
-    <path
-       sodipodi:nodetypes="cc"
-       id="path15672"
-       d="M 11.505723,5.4942766 L 11.505723,43.400869"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path15674"
-       d="M 12.500000,5.0205154 L 12.500000,43.038228"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="new"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#radialGradient278);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.2500002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block"
-       id="path12511"
-       sodipodi:cx="55.000000"
-       sodipodi:cy="125.00000"
-       sodipodi:rx="14.375000"
-       sodipodi:ry="14.375000"
-       d="M 69.375000 125.00000 A 14.375000 14.375000 0 1 1  40.625000,125.00000 A 14.375000 14.375000 0 1 1  69.375000 125.00000 z"
-       transform="matrix(0.783292,0.000000,0.000000,0.783292,-6.340883,-86.65168)"
-       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/stock_new-16.png"
-       inkscape:export-xdpi="33.852203"
-       inkscape:export-ydpi="33.852203" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/document-print-preview.svg Deleted

@@ -1,701 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="document-print-preview.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg2994"
-   height="48px"
-   width="48px">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       id="linearGradient4467">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4469" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.24761905;"
-         offset="1.0000000"
-         id="stop4471" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4467"
-       id="radialGradient1876"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.592963,-7.746900e-24,-5.714443e-24,2.252104,-25.05975,-18.94100)"
-       cx="15.414371"
-       cy="13.078408"
-       fx="15.414371"
-       fy="13.078408"
-       r="6.6562500" />
-    <linearGradient
-       id="linearGradient4454">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:0.20784314;"
-         offset="0.0000000"
-         id="stop4456" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:0.67619050;"
-         offset="1.0000000"
-         id="stop4458" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4454"
-       id="radialGradient4460"
-       cx="18.240929"
-       cy="21.817987"
-       fx="18.240929"
-       fy="21.817987"
-       r="8.3085051"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2366">
-      <stop
-         id="stop2368"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.21904762;"
-         offset="0.50000000"
-         id="stop2374" />
-      <stop
-         id="stop2370"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="25.743469"
-       x2="17.500893"
-       y1="13.602121"
-       x1="18.292673"
-       id="linearGradient2372"
-       xlink:href="#linearGradient2366"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4440">
-      <stop
-         style="stop-color:#7d7d7d;stop-opacity:1;"
-         offset="0"
-         id="stop4442" />
-      <stop
-         id="stop4448"
-         offset="0.50000000"
-         style="stop-color:#b1b1b1;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#686868;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4444" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4440"
-       id="linearGradient1883"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.334593,0.000000,0.000000,1.291292,-6.973842,-7.460658)"
-       x1="30.656250"
-       y1="34.000000"
-       x2="33.218750"
-       y2="31.062500" />
-    <linearGradient
-       id="linearGradient2846">
-      <stop
-         id="stop2848"
-         offset="0.0000000"
-         style="stop-color:#8a8a8a;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2850"
-         offset="1.0000000"
-         style="stop-color:#484848;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2846"
-       id="linearGradient1887"
-       gradientUnits="userSpaceOnUse"
-       x1="27.366341"
-       y1="26.580296"
-       x2="31.335964"
-       y2="30.557772" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7612">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7614" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7616" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7612"
-       id="radialGradient7618"
-       cx="24.000000"
-       cy="41.875000"
-       fx="24.000000"
-       fy="41.875000"
-       r="19.125000"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,27.91667)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.12371134;"
-         offset="0.0000000"
-         id="stop4764" />
-      <stop
-         id="stop4768"
-         offset="0.10344828"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4766" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4741">
-      <stop
-         id="stop4743"
-         offset="0.0000000"
-         style="stop-color:#dcdcda;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4745"
-         offset="1.0000000"
-         style="stop-color:#bab9b7;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4733">
-      <stop
-         id="stop4735"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.23711340;" />
-      <stop
-         id="stop4737"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4698">
-      <stop
-         id="stop4700"
-         offset="0.0000000"
-         style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#bbbbb9;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop4706" />
-      <stop
-         id="stop4702"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4688">
-      <stop
-         id="stop4690"
-         offset="0.0000000"
-         style="stop-color:#666666;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4692"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4680"
-       inkscape:collect="always">
-      <stop
-         id="stop4682"
-         offset="0"
-         style="stop-color:#f7f6f5;stop-opacity:1;" />
-      <stop
-         id="stop4684"
-         offset="1"
-         style="stop-color:#f7f6f5;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4668">
-      <stop
-         id="stop4670"
-         offset="0"
-         style="stop-color:#8e8d87;stop-opacity:1;" />
-      <stop
-         style="stop-color:#cbc9c1;stop-opacity:1.0000000;"
-         offset="0.27586207"
-         id="stop4676" />
-      <stop
-         id="stop4672"
-         offset="1.0000000"
-         style="stop-color:#8e8d87;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.40546969"
-         id="stop4886" />
-      <stop
-         style="stop-color:#cdcdcd;stop-opacity:1.0000000;"
-         offset="0.53448278"
-         id="stop4884" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#494949;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="2.1227016"
-       fy="26.925594"
-       fx="9.1295490"
-       cy="26.925594"
-       cx="9.1295490"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1433"
-       xlink:href="#linearGradient4698"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="72.064316"
-       x2="9.9128132"
-       y1="57.227650"
-       x1="9.8698082"
-       gradientTransform="matrix(2.772086,0.000000,0.000000,0.360739,0.618718,2.883883)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1447"
-       xlink:href="#linearGradient4733"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="54.136139"
-       x2="10.338233"
-       y1="64.652260"
-       x1="10.338233"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1451"
-       xlink:href="#linearGradient4680"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="62.282467"
-       x2="9.7052784"
-       y1="70.724976"
-       x1="9.7316532"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1453"
-       xlink:href="#linearGradient4688"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="19.337463"
-       x2="20.717800"
-       y1="25.140253"
-       x1="20.771229"
-       gradientTransform="matrix(1.196549,0,0,0.853565,-0.122464,2.034513)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1456"
-       xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="25.247311"
-       x2="24.789707"
-       y1="3.6785457"
-       x1="25.056711"
-       gradientTransform="matrix(0.945288,0,0,1.075484,5.460076e-2,4.105725)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1459"
-       xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="58.831264"
-       x2="15.487823"
-       y1="32.539238"
-       x1="15.387969"
-       gradientTransform="matrix(1.490161,0,0,0.667712,8.895128e-2,2.058442)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1464"
-       xlink:href="#linearGradient4762"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294930"
-       x2="18.972126"
-       y1="88.294930"
-       x1="1.8456430"
-       gradientTransform="matrix(2.291824,0,0,0.434269,8.855179e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1468"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294933"
-       x2="18.972126"
-       y1="88.294933"
-       x1="1.8456431"
-       gradientTransform="matrix(2.302720,0.000000,0.000000,0.434269,0.000000,0.875000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1471"
-       xlink:href="#linearGradient4668"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="279"
-     inkscape:window-x="469"
-     inkscape:window-height="659"
-     inkscape:window-width="872"
-     inkscape:guide-bbox="true"
-     showguides="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="-18.911703"
-     inkscape:cx="94.148384"
-     inkscape:zoom="5.6568542"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.090196078"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Print Preview</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>printer</rdf:li>
-            <rdf:li>local</rdf:li>
-            <rdf:li>laser</rdf:li>
-            <rdf:li>bubblejet</rdf:li>
-            <rdf:li>inkjet</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>cups</rdf:li>
-            <rdf:li>lpd</rdf:li>
-            <rdf:li>preview</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Corey Woodworth</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,39.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <rect
-       ry="1.7115483"
-       rx="1.7115483"
-       y="36.000000"
-       x="4.7500000"
-       height="6.4375000"
-       width="38.437500"
-       id="rect4652"
-       style="fill:url(#linearGradient1471);fill-opacity:1.0000000;stroke:#595959;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cssssssssssss"
-       id="rect4609"
-       d="M 7.1308961,21.5 L 40.870615,21.5 C 41.255661,21.5 41.747648,21.788155 42.051049,22.223919 C 42.354451,22.659684 43.787518,24.83394 44.109448,25.297964 C 44.431378,25.761987 44.502397,26.201852 44.502397,26.774049 L 44.502397,38.850951 C 44.502397,39.764524 43.770402,40.5 42.861152,40.5 L 5.1403596,40.5 C 4.2311094,40.5 3.4991138,39.764524 3.4991138,38.850951 L 3.4991138,26.774049 C 3.4991138,26.280031 3.6002798,25.571641 3.9455202,25.120718 C 4.3811666,24.551713 5.5498664,22.57277 5.8581276,22.153118 C 6.1663887,21.733467 6.7324461,21.5 7.1308961,21.5 z "
-       style="color:#000000;fill:url(#linearGradient1468);fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cssssssss"
-       id="path4718"
-       d="M 7.7468087,22 C 7.2538918,22 6.6200916,22.131117 6.360195,22.533013 L 4.5402642,25.347295 C 4.247295,25.800333 4.573548,26.868141 5.455113,26.868141 L 42.36394,26.868141 C 43.5564,26.868141 43.559882,25.863124 43.278788,25.435241 L 41.545521,22.796852 C 41.231243,22.318456 41.117169,22 40.332233,22 L 7.7468087,22 z "
-       style="fill:#fbfbfb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1464);stroke-width:0.94696695;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.6002951,22.472753 L 40.374658,22.472753 C 40.739745,22.472753 41.206233,22.745206 41.493909,23.157226 C 41.781585,23.569246 42.788049,25.183766 43.093293,25.622505 C 43.398536,26.061244 43.528159,26.477141 43.528159,27.018159 L 43.528159,38.281906 C 43.528159,39.145699 43.394653,39.52908 42.532529,39.52908 L 5.5305059,39.52908 C 4.6683828,39.52908 4.472593,39.145699 4.472593,38.281906 L 4.472593,27.018159 C 4.472593,26.55106 4.6930819,25.88127 5.0204282,25.454917 C 5.4334949,24.916917 6.1012112,23.487067 6.393495,23.090283 C 6.6857788,22.693498 7.222497,22.472753 7.6002951,22.472753 z "
-       id="path4750"
-       sodipodi:nodetypes="cssssssssssss" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="rect15391"
-       d="M 11.672214,4.5100628 L 36.313379,4.5100628 C 36.963853,4.5100628 37.487519,5.0199333 37.487519,5.6532701 L 37.487519,24.348185 L 10.498074,24.348185 L 10.498074,5.6532701 C 10.498074,5.0199333 11.02174,4.5100628 11.672214,4.5100628 z "
-       style="color:#000000;fill:url(#linearGradient1459);fill-opacity:1;fill-rule:nonzero;stroke:#898989;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1456);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="24.954287"
-       height="18.836374"
-       x="11.497581"
-       y="5.4992466"
-       ry="0.17677675"
-       rx="0.17677663" />
-    <rect
-       ry="1.7115483"
-       rx="1.7115483"
-       y="27.375000"
-       x="6.8750000"
-       height="5.1875000"
-       width="33.750000"
-       id="rect4678"
-       style="fill:url(#linearGradient1451);fill-opacity:1.0000000;stroke:url(#linearGradient1453);stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       transform="translate(0.000000,2.000000)"
-       d="M 10.871767 27.626486 A 1.2816310 1.2816310 0 1 1  8.3085046,27.626486 A 1.2816310 1.2816310 0 1 1  10.871767 27.626486 z"
-       sodipodi:ry="1.2816310"
-       sodipodi:rx="1.2816310"
-       sodipodi:cy="27.626486"
-       sodipodi:cx="9.5901356"
-       id="path4696"
-       style="fill:url(#radialGradient1433);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="csscssssc"
-       id="path4731"
-       d="M 11.743718,25.416053 L 37.306218,25.478553 C 37.993716,25.480234 38.294038,25.107558 38.243718,24.478553 L 38.118718,22.916053 L 39.984835,22.916053 C 40.797335,22.916053 40.975035,23.108616 41.172335,23.478553 L 41.672335,24.416053 C 42.199130,25.403793 43.483508,26.390165 42.170495,26.390165 C 37.667784,26.390165 13.993718,26.041053 11.743718,25.416053 z "
-       style="fill:url(#linearGradient1447);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.36571429" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0000000"
-       d="M 42.937500,26.750000 L 4.8125000,26.750000"
-       id="path4760"
-       sodipodi:nodetypes="cc" />
-    <g
-       transform="translate(0.000000,2.000000)"
-       style="opacity:0.43575415"
-       id="g4849">
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4831"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="5.0000000" />
-      <rect
-         y="7.0000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4833"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4835"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="9.0000000" />
-      <rect
-         y="11.000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4837"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4839"
-         width="11.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="13.000000" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4843"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="17.000000" />
-      <rect
-         y="19.000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4845"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <g
-       id="g1890"
-       transform="matrix(0.715678,0.000000,0.000000,0.715678,4.077534,4.713886)">
-      <path
-         sodipodi:nodetypes="csscccscccscczzzz"
-         id="path2844"
-         d="M 18.627569,3.1435548 C 10.488439,3.1435548 3.8827682,9.7492259 3.8827682,17.888356 C 3.8827682,26.027486 10.488439,32.633158 18.627569,32.633158 C 22.107124,32.633158 25.178570,31.248765 27.701292,29.230511 C 27.495915,30.237392 27.623257,31.265879 28.457436,31.990436 L 39.421520,41.517846 C 40.654936,42.589175 42.508982,42.448806 43.580310,41.215389 C 44.651638,39.981971 44.511269,38.127927 43.277853,37.056599 L 32.313769,27.529188 C 31.642242,26.945909 30.820891,26.773219 30.007531,26.886466 C 31.994231,24.374044 33.372370,21.337663 33.372370,17.888356 C 33.372370,9.7492259 26.766699,3.1435548 18.627569,3.1435548 z M 18.551954,4.3697381 C 26.191413,4.3697381 31.843729,9.1586886 31.843729,17.661513 C 31.843729,26.336626 26.027039,30.953288 18.551954,30.953288 C 11.249005,30.953288 5.2601806,25.475196 5.2601806,17.661513 C 5.2601806,9.6774061 11.084819,4.3697380 18.551954,4.3697381 z "
-         style="opacity:1.0000000;color:#000000;fill:#dcdcdc;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient1887);stroke-width:2.7945554;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:1.0000000;color:#000000;fill:#dcdcdc;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 18.602905,3.0803551 C 10.437465,3.0803551 3.8104408,9.7073791 3.8104408,17.872819 C 3.8104408,26.038259 10.437465,32.665283 18.602905,32.665283 C 22.093708,32.665283 25.175082,31.276416 27.705960,29.251638 C 27.499919,30.261774 27.627672,31.293585 28.464547,32.020484 L 39.464073,41.578691 C 40.701476,42.653483 42.561515,42.512661 43.636306,41.275256 C 44.711097,40.037852 44.570274,38.177814 43.332871,37.103023 L 32.333346,27.544815 C 31.659648,26.959651 30.835642,26.786402 30.019653,26.900016 C 32.012775,24.379472 33.395369,21.333276 33.395369,17.872819 C 33.395369,9.7073791 26.768345,3.0803551 18.602905,3.0803551 z M 18.527046,6.2664243 C 24.808154,6.2664245 29.905864,11.364135 29.905864,17.645243 C 29.905864,23.926351 24.808154,29.024061 18.527046,29.024061 C 12.245938,29.024061 7.1482276,23.926351 7.1482276,17.645243 C 7.1482278,11.364135 12.245938,6.2664243 18.527046,6.2664243 z "
-         id="path4430" />
-      <path
-         style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1883);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 39.507004,41.577690 C 39.028332,39.304503 40.904334,36.766268 43.091057,36.789315 C 43.091057,36.789315 32.330690,27.531204 32.330690,27.531204 C 29.385899,27.474498 28.061188,29.803820 28.553876,32.131126 L 39.507004,41.577690 z "
-         id="path4438"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2372);stroke-width:1.1216413;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="path4450"
-         sodipodi:cx="17.500893"
-         sodipodi:cy="18.920233"
-         sodipodi:rx="11.048544"
-         sodipodi:ry="11.048544"
-         d="M 28.549437 18.920233 A 11.048544 11.048544 0 1 1  6.4523487,18.920233 A 11.048544 11.048544 0 1 1  28.549437 18.920233 z"
-         transform="matrix(1.245743,0.000000,0.000000,1.245743,-3.425346,-6.177033)" />
-      <rect
-         style="opacity:0.43315509;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.3973206;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4495"
-         width="19.048445"
-         height="4.4404783"
-         x="40.373348"
-         y="0.14086054"
-         rx="2.9855080"
-         ry="2.6379704"
-         transform="matrix(0.752986,0.658037,-0.648902,0.760872,0.000000,0.000000)" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#radialGradient4460);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3063a3;stroke-width:0.99904466;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible"
-         id="path4452"
-         sodipodi:cx="17.589281"
-         sodipodi:cy="18.478292"
-         sodipodi:rx="8.3085051"
-         sodipodi:ry="8.3085051"
-         d="M 25.897786 18.478292 A 8.3085051 8.3085051 0 1 1  9.2807760,18.478292 A 8.3085051 8.3085051 0 1 1  25.897786 18.478292 z"
-         transform="matrix(1.398614,0.000000,0.000000,1.398614,-6.224338,-8.298958)" />
-      <path
-         style="opacity:0.83422458;color:#000000;fill:url(#radialGradient1876);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 18.156915,7.3966938 C 12.949325,7.3966938 8.7323681,11.613651 8.7323681,16.821241 C 8.7323681,18.325216 9.1526753,19.709014 9.7795400,20.971144 C 11.031920,21.432757 12.362297,21.746827 13.774307,21.746827 C 19.945262,21.746827 24.873589,16.885190 25.254413,10.809698 C 23.523449,8.7641668 21.044374,7.3966938 18.156915,7.3966938 z "
-         id="path4462" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/document-print.svg Deleted

@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="document-print.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg2994"
-   height="48px"
-   width="48px">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7612">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7614" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7616" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7612"
-       id="radialGradient7618"
-       cx="24.000000"
-       cy="41.875000"
-       fx="24.000000"
-       fy="41.875000"
-       r="19.125000"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,27.91667)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.12371134;"
-         offset="0.0000000"
-         id="stop4764" />
-      <stop
-         id="stop4768"
-         offset="0.10344828"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4766" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4741">
-      <stop
-         id="stop4743"
-         offset="0.0000000"
-         style="stop-color:#dcdcda;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4745"
-         offset="1.0000000"
-         style="stop-color:#bab9b7;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4733">
-      <stop
-         id="stop4735"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.23711340;" />
-      <stop
-         id="stop4737"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4698">
-      <stop
-         id="stop4700"
-         offset="0.0000000"
-         style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#bbbbb9;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop4706" />
-      <stop
-         id="stop4702"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4688">
-      <stop
-         id="stop4690"
-         offset="0.0000000"
-         style="stop-color:#666666;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4692"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4680"
-       inkscape:collect="always">
-      <stop
-         id="stop4682"
-         offset="0"
-         style="stop-color:#f7f6f5;stop-opacity:1;" />
-      <stop
-         id="stop4684"
-         offset="1"
-         style="stop-color:#f7f6f5;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4668">
-      <stop
-         id="stop4670"
-         offset="0"
-         style="stop-color:#8e8d87;stop-opacity:1;" />
-      <stop
-         style="stop-color:#cbc9c1;stop-opacity:1.0000000;"
-         offset="0.27586207"
-         id="stop4676" />
-      <stop
-         id="stop4672"
-         offset="1.0000000"
-         style="stop-color:#8e8d87;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.40546969"
-         id="stop4886" />
-      <stop
-         style="stop-color:#cdcdcd;stop-opacity:1.0000000;"
-         offset="0.53448278"
-         id="stop4884" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#494949;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="2.1227016"
-       fy="26.925594"
-       fx="9.1295490"
-       cy="26.925594"
-       cx="9.1295490"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1433"
-       xlink:href="#linearGradient4698"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="72.064316"
-       x2="9.9128132"
-       y1="57.227650"
-       x1="9.8698082"
-       gradientTransform="matrix(2.772086,0.000000,0.000000,0.360739,0.618718,2.883883)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1447"
-       xlink:href="#linearGradient4733"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="54.136139"
-       x2="10.338233"
-       y1="64.652260"
-       x1="10.338233"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1451"
-       xlink:href="#linearGradient4680"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="62.282467"
-       x2="9.7052784"
-       y1="70.724976"
-       x1="9.7316532"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1453"
-       xlink:href="#linearGradient4688"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="19.337463"
-       x2="20.717800"
-       y1="25.140253"
-       x1="20.771229"
-       gradientTransform="matrix(1.198769,0,0,0.853565,-0.143086,2.034513)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1456"
-       xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="25.247311"
-       x2="24.789707"
-       y1="3.6785457"
-       x1="25.056711"
-       gradientTransform="matrix(0.944939,0,0,1.076147,6.844577e-2,4.093177)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1459"
-       xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="58.831264"
-       x2="15.487823"
-       y1="32.539238"
-       x1="15.387969"
-       gradientTransform="matrix(1.490161,0,0,0.668741,8.895132e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1464"
-       xlink:href="#linearGradient4762"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294930"
-       x2="18.972126"
-       y1="88.294930"
-       x1="1.8456430"
-       gradientTransform="matrix(2.291824,0,0,0.434269,8.855179e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1468"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294933"
-       x2="18.972126"
-       y1="88.294933"
-       x1="1.8456431"
-       gradientTransform="matrix(2.30272,0,0,0.437918,0,0.584034)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1471"
-       xlink:href="#linearGradient4668"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="349"
-     inkscape:window-x="331"
-     inkscape:window-height="659"
-     inkscape:window-width="872"
-     inkscape:guide-bbox="true"
-     showguides="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="-18.264187"
-     inkscape:cx="89.408089"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.090196078"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#729fcf" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Print Document</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>document</rdf:li>
-            <rdf:li>lpr</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>local</rdf:li>
-            <rdf:li>laser</rdf:li>
-            <rdf:li>bubblejet</rdf:li>
-            <rdf:li>inkjet</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>cups</rdf:li>
-            <rdf:li>lpd</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,39.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <rect
-       ry="1.7115477"
-       rx="1.7115483"
-       y="36.004189"
-       x="4.75"
-       height="6.4915943"
-       width="38.4375"
-       id="rect4652"
-       style="fill:url(#linearGradient1471);fill-opacity:1;stroke:#595959;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cssssssssssss"
-       id="rect4609"
-       d="M 7.1308961,21.5 L 40.870615,21.5 C 41.255661,21.5 41.747648,21.788155 42.051049,22.223919 C 42.354451,22.659684 43.787518,24.83394 44.109448,25.297964 C 44.431378,25.761987 44.502397,26.201852 44.502397,26.774049 L 44.502397,38.850951 C 44.502397,39.764524 43.770402,40.5 42.861152,40.5 L 5.1403596,40.5 C 4.2311094,40.5 3.4991138,39.764524 3.4991138,38.850951 L 3.4991138,26.774049 C 3.4991138,26.280031 3.6002798,25.571641 3.9455202,25.120718 C 4.3811666,24.551713 5.5498664,22.57277 5.8581276,22.153118 C 6.1663887,21.733467 6.7324461,21.5 7.1308961,21.5 z "
-       style="color:#000000;fill:url(#linearGradient1468);fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cssssssss"
-       id="path4718"
-       d="M 7.705278,21.975532 C 7.20729,21.975532 6.5669691,22.107308 6.3043987,22.511224 L 4.4657443,25.339651 C 4.169761,25.794966 4.4993705,26.868141 5.3900051,26.868141 L 42.678553,26.868141 C 43.883282,26.868141 43.8868,25.858073 43.602814,25.428039 L 41.851714,22.776389 C 41.534204,22.295589 41.418956,21.975532 40.625945,21.975532 L 7.705278,21.975532 z "
-       style="fill:#fbfbfb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1464);stroke-width:0.94696701;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.6002951,22.445756 L 40.374658,22.445756 C 40.739745,22.445756 41.206233,22.718629 41.493909,23.131283 C 41.781585,23.543938 42.788049,25.160945 43.093293,25.60036 C 43.398536,26.039775 43.528159,26.456312 43.528159,26.998164 L 43.528159,38.279261 C 43.528159,39.144385 43.394653,39.528356 42.532529,39.528356 L 5.530506,39.528356 C 4.6683828,39.528356 4.472593,39.144385 4.472593,38.279261 L 4.472593,26.998164 C 4.472593,26.530345 4.6930819,25.859523 5.0204282,25.432514 C 5.4334949,24.893685 6.1012112,23.461633 6.393495,23.064237 C 6.6857789,22.666841 7.222497,22.445756 7.6002951,22.445756 z "
-       id="path4750"
-       sodipodi:nodetypes="cssssssssssss" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="rect15391"
-       d="M 11.68177,4.4977642 L 36.313839,4.4977642 C 36.964072,4.4977642 37.487546,5.007949 37.487546,5.6416762 L 37.487546,24.348117 L 10.508063,24.348117 L 10.508063,5.6416762 C 10.508063,5.007949 11.031536,4.4977642 11.68177,4.4977642 z "
-       style="color:#000000;fill:url(#linearGradient1459);fill-opacity:1;fill-rule:nonzero;stroke:#898989;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1456);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="25.000576"
-       height="18.836374"
-       x="11.498513"
-       y="5.4992466"
-       ry="0.17677675"
-       rx="0.17677672" />
-    <rect
-       ry="1.7115483"
-       rx="1.7115483"
-       y="27.375000"
-       x="6.8750000"
-       height="5.1875000"
-       width="33.750000"
-       id="rect4678"
-       style="fill:url(#linearGradient1451);fill-opacity:1.0000000;stroke:url(#linearGradient1453);stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       transform="translate(0.000000,2.000000)"
-       d="M 10.871767 27.626486 A 1.2816310 1.2816310 0 1 1  8.3085046,27.626486 A 1.2816310 1.2816310 0 1 1  10.871767 27.626486 z"
-       sodipodi:ry="1.2816310"
-       sodipodi:rx="1.2816310"
-       sodipodi:cy="27.626486"
-       sodipodi:cx="9.5901356"
-       id="path4696"
-       style="fill:url(#radialGradient1433);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="csscssssc"
-       id="path4731"
-       d="M 11.743718,25.416053 L 37.306218,25.478553 C 37.993716,25.480234 38.294038,25.107558 38.243718,24.478553 L 38.118718,22.916053 L 39.984835,22.916053 C 40.797335,22.916053 40.975035,23.108616 41.172335,23.478553 L 41.672335,24.416053 C 42.199130,25.403793 43.483508,26.390165 42.170495,26.390165 C 37.667784,26.390165 13.993718,26.041053 11.743718,25.416053 z "
-       style="fill:url(#linearGradient1447);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.36571429" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 42.9375,26.5 L 4.8125,26.5"
-       id="path4760"
-       sodipodi:nodetypes="cc" />
-    <g
-       transform="translate(0.000000,2.000000)"
-       style="opacity:0.43575415"
-       id="g4849">
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4831"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="5.0000000" />
-      <rect
-         y="7.0000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4833"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4835"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="9.0000000" />
-      <rect
-         y="11.000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4837"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4839"
-         width="11.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="13.000000" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="arrow">
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 21.02159,20.989431 L 27.989391,20.989431 L 27.989391,16.064984 L 31,16.064984 L 24.553756,8 L 17.435622,15.986875 L 21.023684,15.986875 L 21.02159,20.989431 z "
-       style="opacity:1;color:#000000;fill:#a7a7a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/document-save-as.svg Deleted

@@ -1,661 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="document-save-as.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg2913"
-   height="48px"
-   width="48px">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       id="linearGradient6965">
-      <stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0"
-         id="stop6967" />
-      <stop
-         style="stop-color:#fdfdfd;stop-opacity:1;"
-         offset="1"
-         id="stop6969" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6925">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="0"
-         id="stop6927" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop6929" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6901">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop6903" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop6905" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4991">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4993" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4995" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4991"
-       id="radialGradient4997"
-       cx="23.447077"
-       cy="6.4576745"
-       fx="23.447077"
-       fy="6.4576745"
-       r="19.0625"
-       gradientTransform="matrix(-1.314471,-1.006312e-2,-1.022964e-2,1.336221,46.22108,-4.909887)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2187"
-       inkscape:collect="always">
-      <stop
-         id="stop2189"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2191"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2187"
-       id="linearGradient1764"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.914114,1.412791e-16,-1.412791e-16,0.914114,-3.868698,-2.706902)"
-       x1="33.059906"
-       y1="27.394117"
-       x2="12.624337"
-       y2="12.583769" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient8668"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737"
-       gradientTransform="matrix(1.000000,-7.816467e-32,-1.132409e-32,0.536723,-5.897962e-14,16.87306)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2555">
-      <stop
-         id="stop2557"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop2561" />
-      <stop
-         id="stop2563"
-         offset="0.75000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#e1e1e1;stop-opacity:1.0000000;"
-         offset="0.84166664"
-         id="stop2565" />
-      <stop
-         id="stop2559"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4274">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25490198;"
-         offset="0.0000000"
-         id="stop4276" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4278" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4264"
-       inkscape:collect="always">
-      <stop
-         id="stop4266"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4268"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4254"
-       inkscape:collect="always">
-      <stop
-         id="stop4256"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4258"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4244">
-      <stop
-         id="stop4246"
-         offset="0.0000000"
-         style="stop-color:#e4e4e4;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4248"
-         offset="1.0000000"
-         style="stop-color:#d3d3d3;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4236"
-       inkscape:collect="always">
-      <stop
-         id="stop4238"
-         offset="0"
-         style="stop-color:#eeeeee;stop-opacity:1;" />
-      <stop
-         id="stop4240"
-         offset="1"
-         style="stop-color:#eeeeee;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4228">
-      <stop
-         id="stop4230"
-         offset="0.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4232"
-         offset="1.0000000"
-         style="stop-color:#9f9f9f;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4184">
-      <stop
-         id="stop4186"
-         offset="0.0000000"
-         style="stop-color:#838383;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4188"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0.795493,3.799180)"
-       y2="35.281250"
-       x2="24.687500"
-       y1="35.281250"
-       x1="7.0625000"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4209"
-       xlink:href="#linearGradient4184"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="40.943935"
-       x2="36.183067"
-       y1="28.481176"
-       x1="7.6046205"
-       id="linearGradient4234"
-       xlink:href="#linearGradient4228"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="33.758667"
-       x2="12.221823"
-       y1="37.205811"
-       x1="12.277412"
-       id="linearGradient4242"
-       xlink:href="#linearGradient4236"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.286242,0.781698,-0.710782,1.169552,-2.354348,0.248140)"
-       r="20.935817"
-       fy="2.9585190"
-       fx="15.571491"
-       cy="2.9585190"
-       cx="15.571491"
-       id="radialGradient4250"
-       xlink:href="#linearGradient4244"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="47.620636"
-       x2="44.096100"
-       y1="4.4331360"
-       x1="12.378357"
-       id="linearGradient4260"
-       xlink:href="#linearGradient4254"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651032,-2.885063e-16,9.455693)"
-       r="23.555494"
-       fy="27.096155"
-       fx="23.201941"
-       cy="27.096155"
-       cx="23.201941"
-       id="radialGradient4270"
-       xlink:href="#linearGradient4264"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="26.357183"
-       x2="23.688078"
-       y1="11.318835"
-       x1="23.688078"
-       id="linearGradient4272"
-       xlink:href="#linearGradient4274"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2555"
-       id="linearGradient2553"
-       x1="33.431175"
-       y1="31.964777"
-       x2="21.747974"
-       y2="11.780679"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6901"
-       id="linearGradient6907"
-       x1="14.751649"
-       y1="15.868432"
-       x2="8.8953285"
-       y2="16.743431"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6925"
-       id="linearGradient6931"
-       x1="12.25"
-       y1="18.25"
-       x2="7"
-       y2="21.118431"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6965"
-       id="linearGradient6971"
-       x1="28.061466"
-       y1="31.431349"
-       x2="28.061466"
-       y2="36.437492"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="178"
-     inkscape:window-x="462"
-     inkscape:window-height="907"
-     inkscape:window-width="999"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer2"
-     inkscape:cy="15.12998"
-     inkscape:cx="36.05811"
-     inkscape:zoom="2.8284271"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.22745098"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#3465a4"
-     stroke="#204a87" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Save As</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>hdd</rdf:li>
-            <rdf:li>hard drive</rdf:li>
-            <rdf:li>save as</rdf:li>
-            <rdf:li>io</rdf:li>
-            <rdf:li>store</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:identifier />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="pix"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,41.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <path
-       sodipodi:nodetypes="cccsccccccccc"
-       id="path4196"
-       d="M 11.28569,13.087628 C 10.66069,13.087628 10.254441,13.377808 10.004442,13.931381 C 10.004441,13.931381 3.5356915,31.034938 3.5356915,31.034938 C 3.5356915,31.034938 3.2856915,31.706497 3.2856915,32.816188 C 3.2856915,32.816188 3.2856915,42.466156 3.2856915,42.466156 C 3.2856915,43.548769 3.943477,44.091158 4.9419415,44.091156 L 43.50444,44.091156 C 44.489293,44.091156 45.09819,43.372976 45.09819,42.247406 L 45.09819,32.597438 C 45.09819,32.597438 45.204153,31.827015 45.00444,31.284938 L 38.28569,14.087631 C 38.101165,13.575725 37.648785,13.099533 37.16069,13.087628 L 11.28569,13.087628 z "
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path4170"
-       d="M 3.2735915,32.121812 L 4.0381936,31.429597 L 41.647883,31.492097 L 45.11029,31.809395 L 45.11029,42.247927 C 45.11029,43.373496 44.503272,44.091258 43.518419,44.091258 L 4.9354314,44.091258 C 3.9369667,44.091258 3.2735915,43.549207 3.2735915,42.466594 L 3.2735915,32.121812 z "
-       style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.02044296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="csccccccs"
-       id="path3093"
-       d="M 3.5490842,31.039404 C 2.8347985,32.50369 3.5484686,33.432261 4.5847985,33.432261 C 4.5847985,33.432261 43.584797,33.432261 43.584797,33.432261 C 44.703844,33.408451 45.430035,32.420356 45.013368,31.289403 L 38.299082,14.078704 C 38.114558,13.566798 37.64432,13.090606 37.156225,13.078701 L 11.299083,13.078701 C 10.674083,13.078701 10.263369,13.382274 10.01337,13.935847 C 10.01337,13.935847 3.5490842,31.039404 3.5490842,31.039404 z "
-       style="fill:url(#radialGradient4250);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <rect
-       y="36.299183"
-       x="7.857996"
-       height="5.5625"
-       width="17.625"
-       id="rect4174"
-       style="opacity:1;color:#000000;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.40899992;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cscc"
-       id="path4194"
-       d="M 7.8579947,41.86168 C 7.8579947,41.86168 7.8579947,37.850195 7.8579947,37.850195 C 9.6935221,41.029421 16.154485,41.86168 20.795492,41.86168 C 20.795492,41.86168 7.8579947,41.86168 7.8579947,41.86168 z "
-       style="opacity:0.81142853;fill:url(#linearGradient4242);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path4201"
-       d="M 44.796162,30.753688 C 44.859684,32.003662 44.382159,33.069528 43.474046,33.097438 C 43.474046,33.097438 5.3553296,33.097437 5.3553297,33.097438 C 4.0660978,33.097438 3.4875937,32.772491 3.271279,32.229382 C 3.3630404,33.173714 4.0970964,33.878688 5.3553297,33.878688 C 5.3553296,33.878687 43.474046,33.878688 43.474046,33.878688 C 44.550053,33.845617 45.226851,32.454664 44.82621,30.883897 L 44.796162,30.753688 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4211"
-       d="M 10.96875,15.28125 C 10.922675,15.481571 10.78125,15.668047 10.78125,15.875 C 10.78125,16.823605 11.37223,17.664474 12.125,18.46875 C 12.365268,18.314675 12.490117,18.114342 12.75,17.96875 C 11.809691,17.152746 11.196604,16.252168 10.96875,15.28125 z M 37.625,15.28125 C 37.396273,16.250866 36.782988,17.153676 35.84375,17.96875 C 36.117894,18.122332 36.247738,18.33699 36.5,18.5 C 37.257262,17.693344 37.8125,16.826956 37.8125,15.875 C 37.8125,15.668047 37.670906,15.481571 37.625,15.28125 z M 39.8125,23.71875 C 39.198709,27.758861 32.513887,30.96875 24.28125,30.96875 C 16.068996,30.968751 9.4211001,27.775964 8.78125,23.75 C 8.7488928,23.947132 8.65625,24.141882 8.65625,24.34375 C 8.6562503,28.661697 15.645354,32.187501 24.28125,32.1875 C 32.917146,32.1875 39.937499,28.661698 39.9375,24.34375 C 39.9375,24.130826 39.848449,23.926394 39.8125,23.71875 z "
-       style="opacity:0.69142857;color:#000000;fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       transform="translate(8.838843e-2,5.301780)"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       sodipodi:ry="1.016466"
-       sodipodi:rx="1.3700194"
-       sodipodi:cy="25.593554"
-       sodipodi:cx="7.2036505"
-       id="path4224"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path4226"
-       sodipodi:cx="7.2036505"
-       sodipodi:cy="25.593554"
-       sodipodi:rx="1.3700194"
-       sodipodi:ry="1.016466"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       transform="translate(33.96705,5.213390)" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 11.642515,13.540723 C 11.040823,13.540723 10.649724,13.820081 10.409049,14.35301 C 10.409048,14.35301 3.9940341,30.943732 3.9940341,30.943732 C 3.9940341,30.943732 3.7533573,31.590247 3.7533573,32.658555 C 3.7533573,32.658555 3.7533573,41.948651 3.7533573,41.948651 C 3.7533573,43.303391 4.1974134,43.57555 5.3478414,43.57555 L 43.034746,43.57555 C 44.357872,43.57555 44.569062,43.259153 44.569062,41.738058 L 44.569062,32.447962 C 44.569062,32.447962 44.671072,31.706271 44.478807,31.184409 L 37.885616,14.378434 C 37.707973,13.885617 37.334964,13.552184 36.865071,13.540723 L 11.642515,13.540723 z "
-       id="path4252"
-       sodipodi:nodetypes="cccsccccccccc" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 40.5,36.554166 L 40.5,41.575101"
-       id="path4282" />
-    <path
-       id="path4284"
-       d="M 38.5,36.613943 L 38.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 36.5,36.613943 L 36.5,41.634878"
-       id="path4286" />
-    <path
-       id="path4288"
-       d="M 34.5,36.613943 L 34.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 32.5,36.613943 L 32.5,41.634878"
-       id="path4290" />
-    <path
-       id="path4292"
-       d="M 30.5,36.613943 L 30.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       id="path4294"
-       d="M 39.5,36.604065 L 39.5,41.625"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 37.5,36.663842 L 37.5,41.684777"
-       id="path4296" />
-    <path
-       id="path4298"
-       d="M 35.5,36.663842 L 35.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33.5,36.663842 L 33.5,41.684777"
-       id="path4300" />
-    <path
-       id="path4302"
-       d="M 31.5,36.663842 L 31.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4572"
-       d="M 7.875,36.3125 L 7.875,41.84375 L 20.4375,41.84375 L 8.21875,41.5 L 7.875,36.3125 z "
-       style="opacity:0.43999999;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.20571427;color:#000000;fill:url(#linearGradient2553);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93365198;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42372879;visibility:visible;display:inline;overflow:visible"
-       id="path2545"
-       sodipodi:cx="25"
-       sodipodi:cy="19.5625"
-       sodipodi:rx="14.875"
-       sodipodi:ry="6.6875"
-       d="M 39.875 19.5625 A 14.875 6.6875 0 1 1  10.125,19.5625 A 14.875 6.6875 0 1 1  39.875 19.5625 z"
-       transform="matrix(1.037815,0.000000,0.000000,1.060747,-1.632878,3.030370)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="down">
-    <path
-       transform="matrix(1.130190,1.178179e-16,7.918544e-17,-0.759601,-3.909725,53.66554)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.14117647;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient6907);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient6931);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 3.2034501,25.835194 C 2.1729477,-5.3853369 28.741616,-0.4511153 28.582416,15.788689 L 35.89533,15.788689 L 24.517652,28.774671 L 12.585426,15.788689 C 12.585426,15.788689 20.126859,15.788689 20.126859,15.788689 C 20.583921,4.8193225 3.4092324,1.6100346 3.2034501,25.835194 z "
-       id="path1432"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2177"
-       d="M 7.6642103,9.1041047 C 12.40638,-0.0400306 28.122336,2.7175443 27.761604,16.579393 L 34.078976,16.579393 C 34.078976,16.579393 24.513151,27.536769 24.513151,27.536769 L 14.41668,16.579393 C 14.41668,16.579393 20.87332,16.579393 20.87332,16.579393 C 21.144975,5.0041615 10.922265,5.5345215 7.6642103,9.1041047 z "
-       style="opacity:0.47159091;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1764);stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <path
-       style="opacity:0.49431817;color:#000000;fill:url(#radialGradient4997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 34.767155,16.211613 L 32.782979,18.757322 C 27.372947,17.241029 24.896829,21.486664 17.109284,20.489112 L 13.247998,16.080077 L 20.434468,16.162862 C 20.483219,4.3164571 8.3443098,4.998966 5.0292663,13.627829 C 8.8372201,-1.2611216 27.893316,0.8064118 28.28332,16.114112 L 34.767155,16.211613 z "
-       id="path4989"
-       sodipodi:nodetypes="cccccccc" />
-    <rect
-       style="opacity:1;color:#000000;fill:url(#linearGradient6971);fill-opacity:1.0;fill-rule:nonzero;stroke:#7d7d7d;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="rect6951"
-       width="39.247944"
-       height="12.278223"
-       x="4.5635238"
-       y="30.298382"
-       rx="1.6249996"
-       ry="1.6249996" />
-    <rect
-       style="opacity:0.59659091;color:#000000;fill:#7d7d7d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="rect6953"
-       width="16"
-       height="7"
-       x="7"
-       y="33"
-       ry="0" />
-    <rect
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="rect6957"
-       width="1"
-       height="9"
-       x="24"
-       y="32" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/document-save.svg Deleted

@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="document-save.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg2913"
-   height="48px"
-   width="48px">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6925">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="0"
-         id="stop6927" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop6929" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6901">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop6903" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop6905" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4991">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4993" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4995" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4991"
-       id="radialGradient4997"
-       cx="23.447077"
-       cy="6.4576745"
-       fx="23.447077"
-       fy="6.4576745"
-       r="19.0625"
-       gradientTransform="matrix(-1.314471,-1.006312e-2,-1.022964e-2,1.336221,46.22108,-4.909887)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2187"
-       inkscape:collect="always">
-      <stop
-         id="stop2189"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2191"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2187"
-       id="linearGradient1764"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.914114,1.412791e-16,-1.412791e-16,0.914114,-3.868698,-2.706902)"
-       x1="33.059906"
-       y1="27.394117"
-       x2="12.624337"
-       y2="12.583769" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient8668"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737"
-       gradientTransform="matrix(1.000000,-7.816467e-32,-1.132409e-32,0.536723,-5.897962e-14,16.87306)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2555">
-      <stop
-         id="stop2557"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop2561" />
-      <stop
-         id="stop2563"
-         offset="0.75000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#e1e1e1;stop-opacity:1.0000000;"
-         offset="0.84166664"
-         id="stop2565" />
-      <stop
-         id="stop2559"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4274">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25490198;"
-         offset="0.0000000"
-         id="stop4276" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4278" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4264"
-       inkscape:collect="always">
-      <stop
-         id="stop4266"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4268"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4254"
-       inkscape:collect="always">
-      <stop
-         id="stop4256"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4258"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4244">
-      <stop
-         id="stop4246"
-         offset="0.0000000"
-         style="stop-color:#e4e4e4;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4248"
-         offset="1.0000000"
-         style="stop-color:#d3d3d3;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4236"
-       inkscape:collect="always">
-      <stop
-         id="stop4238"
-         offset="0"
-         style="stop-color:#eeeeee;stop-opacity:1;" />
-      <stop
-         id="stop4240"
-         offset="1"
-         style="stop-color:#eeeeee;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4228">
-      <stop
-         id="stop4230"
-         offset="0.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4232"
-         offset="1.0000000"
-         style="stop-color:#9f9f9f;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4184">
-      <stop
-         id="stop4186"
-         offset="0.0000000"
-         style="stop-color:#838383;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4188"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0.795493,3.799180)"
-       y2="35.281250"
-       x2="24.687500"
-       y1="35.281250"
-       x1="7.0625000"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4209"
-       xlink:href="#linearGradient4184"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="40.943935"
-       x2="36.183067"
-       y1="28.481176"
-       x1="7.6046205"
-       id="linearGradient4234"
-       xlink:href="#linearGradient4228"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="33.758667"
-       x2="12.221823"
-       y1="37.205811"
-       x1="12.277412"
-       id="linearGradient4242"
-       xlink:href="#linearGradient4236"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.286242,0.781698,-0.710782,1.169552,-2.354348,0.248140)"
-       r="20.935817"
-       fy="2.9585190"
-       fx="15.571491"
-       cy="2.9585190"
-       cx="15.571491"
-       id="radialGradient4250"
-       xlink:href="#linearGradient4244"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="47.620636"
-       x2="44.096100"
-       y1="4.4331360"
-       x1="12.378357"
-       id="linearGradient4260"
-       xlink:href="#linearGradient4254"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651032,-2.885063e-16,9.455693)"
-       r="23.555494"
-       fy="27.096155"
-       fx="23.201941"
-       cy="27.096155"
-       cx="23.201941"
-       id="radialGradient4270"
-       xlink:href="#linearGradient4264"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="26.357183"
-       x2="23.688078"
-       y1="11.318835"
-       x1="23.688078"
-       id="linearGradient4272"
-       xlink:href="#linearGradient4274"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2555"
-       id="linearGradient2553"
-       x1="33.431175"
-       y1="31.964777"
-       x2="21.747974"
-       y2="11.780679"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6901"
-       id="linearGradient6907"
-       x1="14.751649"
-       y1="15.868432"
-       x2="8.8953285"
-       y2="16.743431"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6925"
-       id="linearGradient6931"
-       x1="12.25"
-       y1="18.25"
-       x2="7"
-       y2="21.118431"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="101"
-     inkscape:window-x="941"
-     inkscape:window-height="907"
-     inkscape:window-width="999"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer2"
-     inkscape:cy="11.891468"
-     inkscape:cx="28.318495"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.22745098"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#3465a4"
-     stroke="#204a87" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Save</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>hdd</rdf:li>
-            <rdf:li>hard drive</rdf:li>
-            <rdf:li>save</rdf:li>
-            <rdf:li>io</rdf:li>
-            <rdf:li>store</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:identifier />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="pix"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,41.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <path
-       sodipodi:nodetypes="cccsccccccccc"
-       id="path4196"
-       d="M 11.28569,13.087628 C 10.66069,13.087628 10.254441,13.377808 10.004442,13.931381 C 10.004441,13.931381 3.5356915,31.034938 3.5356915,31.034938 C 3.5356915,31.034938 3.2856915,31.706497 3.2856915,32.816188 C 3.2856915,32.816188 3.2856915,42.466156 3.2856915,42.466156 C 3.2856915,43.548769 3.943477,44.091158 4.9419415,44.091156 L 43.50444,44.091156 C 44.489293,44.091156 45.09819,43.372976 45.09819,42.247406 L 45.09819,32.597438 C 45.09819,32.597438 45.204153,31.827015 45.00444,31.284938 L 38.28569,14.087631 C 38.101165,13.575725 37.648785,13.099533 37.16069,13.087628 L 11.28569,13.087628 z "
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path4170"
-       d="M 3.2735915,32.121812 L 4.0381936,31.429597 L 41.647883,31.492097 L 45.11029,31.809395 L 45.11029,42.247927 C 45.11029,43.373496 44.503272,44.091258 43.518419,44.091258 L 4.9354314,44.091258 C 3.9369667,44.091258 3.2735915,43.549207 3.2735915,42.466594 L 3.2735915,32.121812 z "
-       style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.02044296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="csccccccs"
-       id="path3093"
-       d="M 3.5490842,31.039404 C 2.8347985,32.50369 3.5484686,33.432261 4.5847985,33.432261 C 4.5847985,33.432261 43.584797,33.432261 43.584797,33.432261 C 44.703844,33.408451 45.430035,32.420356 45.013368,31.289403 L 38.299082,14.078704 C 38.114558,13.566798 37.64432,13.090606 37.156225,13.078701 L 11.299083,13.078701 C 10.674083,13.078701 10.263369,13.382274 10.01337,13.935847 C 10.01337,13.935847 3.5490842,31.039404 3.5490842,31.039404 z "
-       style="fill:url(#radialGradient4250);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <rect
-       y="36.299183"
-       x="7.857996"
-       height="5.5625"
-       width="17.625"
-       id="rect4174"
-       style="opacity:1;color:#000000;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.40899992;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cscc"
-       id="path4194"
-       d="M 7.8579947,41.86168 C 7.8579947,41.86168 7.8579947,37.850195 7.8579947,37.850195 C 9.6935221,41.029421 16.154485,41.86168 20.795492,41.86168 C 20.795492,41.86168 7.8579947,41.86168 7.8579947,41.86168 z "
-       style="opacity:0.81142853;fill:url(#linearGradient4242);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path4201"
-       d="M 44.796162,30.753688 C 44.859684,32.003662 44.382159,33.069528 43.474046,33.097438 C 43.474046,33.097438 5.3553296,33.097437 5.3553297,33.097438 C 4.0660978,33.097438 3.4875937,32.772491 3.271279,32.229382 C 3.3630404,33.173714 4.0970964,33.878688 5.3553297,33.878688 C 5.3553296,33.878687 43.474046,33.878688 43.474046,33.878688 C 44.550053,33.845617 45.226851,32.454664 44.82621,30.883897 L 44.796162,30.753688 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4211"
-       d="M 10.96875,15.28125 C 10.922675,15.481571 10.78125,15.668047 10.78125,15.875 C 10.78125,16.823605 11.37223,17.664474 12.125,18.46875 C 12.365268,18.314675 12.490117,18.114342 12.75,17.96875 C 11.809691,17.152746 11.196604,16.252168 10.96875,15.28125 z M 37.625,15.28125 C 37.396273,16.250866 36.782988,17.153676 35.84375,17.96875 C 36.117894,18.122332 36.247738,18.33699 36.5,18.5 C 37.257262,17.693344 37.8125,16.826956 37.8125,15.875 C 37.8125,15.668047 37.670906,15.481571 37.625,15.28125 z M 39.8125,23.71875 C 39.198709,27.758861 32.513887,30.96875 24.28125,30.96875 C 16.068996,30.968751 9.4211001,27.775964 8.78125,23.75 C 8.7488928,23.947132 8.65625,24.141882 8.65625,24.34375 C 8.6562503,28.661697 15.645354,32.187501 24.28125,32.1875 C 32.917146,32.1875 39.937499,28.661698 39.9375,24.34375 C 39.9375,24.130826 39.848449,23.926394 39.8125,23.71875 z "
-       style="opacity:0.69142857;color:#000000;fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       transform="translate(8.838843e-2,5.301780)"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       sodipodi:ry="1.016466"
-       sodipodi:rx="1.3700194"
-       sodipodi:cy="25.593554"
-       sodipodi:cx="7.2036505"
-       id="path4224"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path4226"
-       sodipodi:cx="7.2036505"
-       sodipodi:cy="25.593554"
-       sodipodi:rx="1.3700194"
-       sodipodi:ry="1.016466"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       transform="translate(33.96705,5.213390)" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 11.642515,13.540723 C 11.040823,13.540723 10.649724,13.820081 10.409049,14.35301 C 10.409048,14.35301 3.9940341,30.943732 3.9940341,30.943732 C 3.9940341,30.943732 3.7533573,31.590247 3.7533573,32.658555 C 3.7533573,32.658555 3.7533573,41.948651 3.7533573,41.948651 C 3.7533573,43.303391 4.1974134,43.57555 5.3478414,43.57555 L 43.034746,43.57555 C 44.357872,43.57555 44.569062,43.259153 44.569062,41.738058 L 44.569062,32.447962 C 44.569062,32.447962 44.671072,31.706271 44.478807,31.184409 L 37.885616,14.378434 C 37.707973,13.885617 37.334964,13.552184 36.865071,13.540723 L 11.642515,13.540723 z "
-       id="path4252"
-       sodipodi:nodetypes="cccsccccccccc" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 40.5,36.554166 L 40.5,41.575101"
-       id="path4282" />
-    <path
-       id="path4284"
-       d="M 38.5,36.613943 L 38.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 36.5,36.613943 L 36.5,41.634878"
-       id="path4286" />
-    <path
-       id="path4288"
-       d="M 34.5,36.613943 L 34.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 32.5,36.613943 L 32.5,41.634878"
-       id="path4290" />
-    <path
-       id="path4292"
-       d="M 30.5,36.613943 L 30.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       id="path4294"
-       d="M 39.5,36.604065 L 39.5,41.625"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 37.5,36.663842 L 37.5,41.684777"
-       id="path4296" />
-    <path
-       id="path4298"
-       d="M 35.5,36.663842 L 35.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33.5,36.663842 L 33.5,41.684777"
-       id="path4300" />
-    <path
-       id="path4302"
-       d="M 31.5,36.663842 L 31.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4572"
-       d="M 7.875,36.3125 L 7.875,41.84375 L 20.4375,41.84375 L 8.21875,41.5 L 7.875,36.3125 z "
-       style="opacity:0.43999999;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.20571427;color:#000000;fill:url(#linearGradient2553);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93365198;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42372879;visibility:visible;display:inline;overflow:visible"
-       id="path2545"
-       sodipodi:cx="25"
-       sodipodi:cy="19.5625"
-       sodipodi:rx="14.875"
-       sodipodi:ry="6.6875"
-       d="M 39.875 19.5625 A 14.875 6.6875 0 1 1  10.125,19.5625 A 14.875 6.6875 0 1 1  39.875 19.5625 z"
-       transform="matrix(1.037815,0.000000,0.000000,1.060747,-1.632878,3.030370)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="down">
-    <path
-       transform="matrix(1.130190,1.178179e-16,7.918544e-17,-0.759601,-3.909725,53.66554)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.14117647;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient6907);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient6931);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 3.2034501,25.835194 C 2.1729477,-5.3853369 28.741616,-0.4511153 28.582416,15.788689 L 35.89533,15.788689 L 24.517652,28.774671 L 12.585426,15.788689 C 12.585426,15.788689 20.126859,15.788689 20.126859,15.788689 C 20.583921,4.8193225 3.4092324,1.6100346 3.2034501,25.835194 z "
-       id="path1432"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2177"
-       d="M 7.6642103,9.1041047 C 12.40638,-0.0400306 28.122336,2.7175443 27.761604,16.579393 L 34.078976,16.579393 C 34.078976,16.579393 24.513151,27.536769 24.513151,27.536769 L 14.41668,16.579393 C 14.41668,16.579393 20.87332,16.579393 20.87332,16.579393 C 21.144975,5.0041615 10.922265,5.5345215 7.6642103,9.1041047 z "
-       style="opacity:0.47159091;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1764);stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <path
-       style="opacity:0.49431817;color:#000000;fill:url(#radialGradient4997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 34.767155,16.211613 L 32.782979,18.757322 C 27.372947,17.241029 24.896829,21.486664 17.109284,20.489112 L 13.247998,16.080077 L 20.434468,16.162862 C 20.483219,4.3164571 8.3443098,4.998966 5.0292663,13.627829 C 8.8372201,-1.2611216 27.893316,0.8064118 28.28332,16.114112 L 34.767155,16.211613 z "
-       id="path4989"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/edit-find.svg Deleted

@@ -1,750 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/steven/edit-find-48.png"
-   sodipodi:docname="edit-find.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg249"
-   height="48.000000px"
-   width="48.000000px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective113" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4542">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4544" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4546" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       id="aigrd3"
-       cx="20.8921"
-       cy="64.5679"
-       r="5.257"
-       fx="20.8921"
-       fy="64.5679"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0"
-         style="stop-color:#F0F0F0"
-         id="stop15573" />
-      <stop
-         offset="1.0000000"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         id="stop15575" />
-    </radialGradient>
-    <radialGradient
-       id="aigrd2"
-       cx="20.8921"
-       cy="114.5684"
-       r="5.256"
-       fx="20.8921"
-       fy="114.5684"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0"
-         style="stop-color:#F0F0F0"
-         id="stop15566" />
-      <stop
-         offset="1.0000000"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         id="stop15568" />
-    </radialGradient>
-    <linearGradient
-       id="linearGradient269">
-      <stop
-         id="stop270"
-         offset="0.0000000"
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
-      <stop
-         id="stop271"
-         offset="1.0000000"
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient269"
-       id="radialGradient15656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
-       cx="8.8244190"
-       cy="3.7561285"
-       fx="8.8244190"
-       fy="3.7561285"
-       r="37.751713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient15658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.960493,1.041132)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
-       fy="35.736916"
-       r="86.708450" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15662"
-       id="radialGradient15668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
-       cx="8.1435566"
-       cy="7.2678967"
-       fx="8.1435566"
-       fy="7.2678967"
-       r="38.158695" />
-    <radialGradient
-       r="5.256"
-       fy="114.5684"
-       fx="20.8921"
-       cy="114.5684"
-       cx="20.8921"
-       gradientTransform="matrix(0.229703,0.000000,0.000000,0.229703,4.613529,3.979808)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2283"
-       xlink:href="#aigrd2"
-       inkscape:collect="always" />
-    <radialGradient
-       r="5.257"
-       fy="64.5679"
-       fx="20.8921"
-       cy="64.5679"
-       cx="20.8921"
-       gradientTransform="matrix(0.229703,0.000000,0.000000,0.229703,4.613529,3.979808)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2285"
-       xlink:href="#aigrd3"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4542"
-       id="radialGradient4548"
-       cx="24.306795"
-       cy="42.07798"
-       fx="24.306795"
-       fy="42.07798"
-       r="15.821514"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4440">
-      <stop
-         id="stop4442"
-         offset="0"
-         style="stop-color:#7d7d7d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#b1b1b1;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop4448" />
-      <stop
-         id="stop4444"
-         offset="1.0000000"
-         style="stop-color:#686868;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4454">
-      <stop
-         id="stop4456"
-         offset="0.0000000"
-         style="stop-color:#729fcf;stop-opacity:0.20784314;" />
-      <stop
-         id="stop4458"
-         offset="1.0000000"
-         style="stop-color:#729fcf;stop-opacity:0.67619050;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4467">
-      <stop
-         id="stop4469"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4471"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.24761905;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4477"
-       inkscape:collect="always">
-      <stop
-         id="stop4479"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4481"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2366">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2368" />
-      <stop
-         id="stop2374"
-         offset="0.50000000"
-         style="stop-color:#ffffff;stop-opacity:0.21904762;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2370" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2846">
-      <stop
-         style="stop-color:#8a8a8a;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2848" />
-      <stop
-         style="stop-color:#484848;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2850" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4477"
-       id="radialGradient1527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.237968,-8.821068e-16,28.93278)"
-       cx="24.130018"
-       cy="37.967922"
-       fx="24.130018"
-       fy="37.967922"
-       r="16.528622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2846"
-       id="linearGradient1529"
-       gradientUnits="userSpaceOnUse"
-       x1="27.366341"
-       y1="26.580296"
-       x2="31.335964"
-       y2="30.557772" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4440"
-       id="linearGradient1531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.334593,0.000000,0.000000,1.291292,-6.973842,-7.460658)"
-       x1="30.656250"
-       y1="34.000000"
-       x2="33.218750"
-       y2="31.062500" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2366"
-       id="linearGradient1533"
-       gradientUnits="userSpaceOnUse"
-       x1="18.292673"
-       y1="13.602121"
-       x2="17.500893"
-       y2="25.743469" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4454"
-       id="radialGradient1537"
-       gradientUnits="userSpaceOnUse"
-       cx="18.240929"
-       cy="21.817987"
-       fx="18.240929"
-       fy="21.817987"
-       r="8.3085051" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4467"
-       id="radialGradient1539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.592963,-7.746900e-24,-5.714443e-24,2.252104,-25.05975,-18.94100)"
-       cx="15.414371"
-       cy="13.078408"
-       fx="15.414371"
-       fy="13.078408"
-       r="6.6562500" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="418"
-     inkscape:window-height="818"
-     inkscape:window-width="1016"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="true"
-     inkscape:current-layer="layer6"
-     inkscape:cy="14.980943"
-     inkscape:cx="25.938708"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Edit Find</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>edit</rdf:li>
-            <rdf:li>find</rdf:li>
-            <rdf:li>locate</rdf:li>
-            <rdf:li>search</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Steven Garrity</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Shadow">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1">
-    <rect
-       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-       id="rect15391"
-       width="34.875000"
-       height="40.920494"
-       x="6.6035528"
-       y="3.6464462"
-       ry="1.1490486" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="32.775887"
-       height="38.946384"
-       x="7.6660538"
-       y="4.5839462"
-       ry="0.14904857"
-       rx="0.14904857" />
-    <g
-       transform="translate(0.646447,-3.798933e-2)"
-       id="g2270">
-      <g
-         id="g1440"
-         style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4.0000000"
-         transform="matrix(0.229703,0.000000,0.000000,0.229703,4.967081,4.244972)">
-        <radialGradient
-           id="radialGradient1442"
-           cx="20.892099"
-           cy="114.56840"
-           r="5.2560000"
-           fx="20.892099"
-           fy="114.56840"
-           gradientUnits="userSpaceOnUse">
-          <stop
-             offset="0"
-             style="stop-color:#F0F0F0"
-             id="stop1444" />
-          <stop
-             offset="1"
-             style="stop-color:#474747"
-             id="stop1446" />
-        </radialGradient>
-        <path
-           style="stroke:none"
-           d="M 23.428000,113.07000 C 23.428000,115.04300 21.828000,116.64200 19.855000,116.64200 C 17.881000,116.64200 16.282000,115.04200 16.282000,113.07000 C 16.282000,111.09600 17.882000,109.49700 19.855000,109.49700 C 21.828000,109.49700 23.428000,111.09700 23.428000,113.07000 z "
-           id="path1448" />
-        <radialGradient
-           id="radialGradient1450"
-           cx="20.892099"
-           cy="64.567902"
-           r="5.2570000"
-           fx="20.892099"
-           fy="64.567902"
-           gradientUnits="userSpaceOnUse">
-          <stop
-             offset="0"
-             style="stop-color:#F0F0F0"
-             id="stop1452" />
-          <stop
-             offset="1"
-             style="stop-color:#474747"
-             id="stop1454" />
-        </radialGradient>
-        <path
-           style="stroke:none"
-           d="M 23.428000,63.070000 C 23.428000,65.043000 21.828000,66.643000 19.855000,66.643000 C 17.881000,66.643000 16.282000,65.043000 16.282000,63.070000 C 16.282000,61.096000 17.882000,59.497000 19.855000,59.497000 C 21.828000,59.497000 23.428000,61.097000 23.428000,63.070000 z "
-           id="path1456" />
-      </g>
-      <path
-         style="fill:url(#radialGradient2283);fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000"
-         d="M 9.9950109,29.952326 C 9.9950109,30.405530 9.6274861,30.772825 9.1742821,30.772825 C 8.7208483,30.772825 8.3535532,30.405301 8.3535532,29.952326 C 8.3535532,29.498892 8.7210780,29.131597 9.1742821,29.131597 C 9.6274861,29.131597 9.9950109,29.499122 9.9950109,29.952326 z "
-         id="path15570" />
-      <path
-         style="fill:url(#radialGradient2285);fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000"
-         d="M 9.9950109,18.467176 C 9.9950109,18.920380 9.6274861,19.287905 9.1742821,19.287905 C 8.7208483,19.287905 8.3535532,18.920380 8.3535532,18.467176 C 8.3535532,18.013742 8.7210780,17.646447 9.1742821,17.646447 C 9.6274861,17.646447 9.9950109,18.013972 9.9950109,18.467176 z "
-         id="path15577" />
-    </g>
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
-       d="M 11.505723,5.4942766 L 11.505723,43.400869"
-       id="path15672"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
-       d="M 12.500000,5.0205154 L 12.500000,43.038228"
-       id="path15674"
-       sodipodi:nodetypes="cc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Magnifying Glass"
-     style="display:inline">
-    <g
-       transform="matrix(0.909091,0.000000,0.000000,1.000000,2.363628,0.000000)"
-       id="g2253">
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15686"
-         width="22.000004"
-         height="1.0000000"
-         x="15.000002"
-         y="9.0000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15688"
-         width="22.000004"
-         height="1.0000000"
-         x="15.000002"
-         y="11.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15690"
-         width="22.000004"
-         height="1.0000000"
-         x="15.000002"
-         y="13.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15692"
-         width="22.000004"
-         height="1.0000000"
-         x="15.000002"
-         y="15.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15694"
-         width="22.000004"
-         height="1.0000000"
-         x="15.000002"
-         y="17.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15696"
-         width="22.000004"
-         height="1.0000000"
-         x="15.000002"
-         y="19.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15698"
-         width="22.000004"
-         height="1.0000000"
-         x="15.000002"
-         y="21.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15700"
-         width="22.000004"
-         height="1.0000000"
-         x="15.000002"
-         y="23.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15732"
-         width="9.9000053"
-         height="1.0000000"
-         x="14.999992"
-         y="25.000000"
-         rx="0.068204239"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15736"
-         width="22.000004"
-         height="1.0000000"
-         x="14.999992"
-         y="29.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15738"
-         width="22.000004"
-         height="1.0000000"
-         x="14.999992"
-         y="31.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15740"
-         width="22.000004"
-         height="1.0000000"
-         x="14.999992"
-         y="33.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15742"
-         width="22.000004"
-         height="1.0000000"
-         x="14.999992"
-         y="35.000000"
-         rx="0.15156493"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
-         id="rect15744"
-         width="15.400014"
-         height="1.0000000"
-         x="14.999992"
-         y="37.000000"
-         rx="0.10609552"
-         ry="0.065390877" />
-    </g>
-    <g
-       id="g1772"
-       transform="matrix(0.665377,0.000000,0.000000,0.665377,15.98645,17.90835)">
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.17112298;color:#000000;fill:url(#radialGradient1527);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="path4475"
-         sodipodi:cx="24.130018"
-         sodipodi:cy="37.967922"
-         sodipodi:rx="16.528622"
-         sodipodi:ry="3.9332814"
-         d="M 40.658640 37.967922 A 16.528622 3.9332814 0 1 1  7.6013966,37.967922 A 16.528622 3.9332814 0 1 1  40.658640 37.967922 z"
-         transform="matrix(1.446431,0.000000,0.000000,1.519990,-10.97453,-17.75168)" />
-      <path
-         sodipodi:nodetypes="csscccscccscczzzz"
-         id="path2844"
-         d="M 18.627569,3.1435548 C 10.488439,3.1435548 3.8827682,9.7492259 3.8827682,17.888356 C 3.8827682,26.027486 10.488439,32.633158 18.627569,32.633158 C 22.107124,32.633158 25.178570,31.248765 27.701292,29.230511 C 27.495915,30.237392 27.623257,31.265879 28.457436,31.990436 L 39.421520,41.517846 C 40.654936,42.589175 42.508982,42.448806 43.580310,41.215389 C 44.651638,39.981971 44.511269,38.127927 43.277853,37.056599 L 32.313769,27.529188 C 31.642242,26.945909 30.820891,26.773219 30.007531,26.886466 C 31.994231,24.374044 33.372370,21.337663 33.372370,17.888356 C 33.372370,9.7492259 26.766699,3.1435548 18.627569,3.1435548 z M 18.551954,4.3697381 C 26.191413,4.3697381 31.843729,9.1586886 31.843729,17.661513 C 31.843729,26.336626 26.027039,30.953288 18.551954,30.953288 C 11.249005,30.953288 5.2601806,25.475196 5.2601806,17.661513 C 5.2601806,9.6774061 11.084819,4.3697380 18.551954,4.3697381 z "
-         style="opacity:1.0000000;color:#000000;fill:#dcdcdc;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient1529);stroke-width:3.0058157;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:1.0000000;color:#000000;fill:#dcdcdc;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 18.602905,3.0803551 C 10.437465,3.0803551 3.8104408,9.7073791 3.8104408,17.872819 C 3.8104408,26.038259 10.437465,32.665283 18.602905,32.665283 C 22.093708,32.665283 25.175082,31.276416 27.705960,29.251638 C 27.499919,30.261774 27.627672,31.293585 28.464547,32.020484 L 39.464073,41.578691 C 40.701476,42.653483 42.561515,42.512661 43.636306,41.275256 C 44.711097,40.037852 44.570274,38.177814 43.332871,37.103023 L 32.333346,27.544815 C 31.659648,26.959651 30.835642,26.786402 30.019653,26.900016 C 32.012775,24.379472 33.395369,21.333276 33.395369,17.872819 C 33.395369,9.7073791 26.768345,3.0803551 18.602905,3.0803551 z M 18.527046,6.2664243 C 24.808154,6.2664245 29.905864,11.364135 29.905864,17.645243 C 29.905864,23.926351 24.808154,29.024061 18.527046,29.024061 C 12.245938,29.024061 7.1482276,23.926351 7.1482276,17.645243 C 7.1482278,11.364135 12.245938,6.2664243 18.527046,6.2664243 z "
-         id="path4430" />
-      <path
-         style="opacity:1.0000000;color:#000000;fill:url(#linearGradient1531);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 39.507004,41.577690 C 39.028332,39.304503 40.904334,36.766268 43.091057,36.789315 C 43.091057,36.789315 32.330690,27.531204 32.330690,27.531204 C 29.385899,27.474498 28.061188,29.803820 28.553876,32.131126 L 39.507004,41.577690 z "
-         id="path4438"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient1533);stroke-width:1.2064340;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="path4450"
-         sodipodi:cx="17.500893"
-         sodipodi:cy="18.920233"
-         sodipodi:rx="11.048544"
-         sodipodi:ry="11.048544"
-         d="M 28.549437 18.920233 A 11.048544 11.048544 0 1 1  6.4523487,18.920233 A 11.048544 11.048544 0 1 1  28.549437 18.920233 z"
-         transform="matrix(1.245743,0.000000,0.000000,1.245743,-3.425346,-6.177033)" />
-      <rect
-         style="opacity:0.43315509;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.5029539;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4495"
-         width="19.048439"
-         height="4.4404783"
-         x="40.373337"
-         y="0.14086054"
-         rx="3.2112026"
-         ry="2.8373930"
-         transform="matrix(0.752986,0.658037,-0.648902,0.760872,0.000000,0.000000)" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#radialGradient1537);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3063a3;stroke-width:1.0745695;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible"
-         id="path4452"
-         sodipodi:cx="17.589281"
-         sodipodi:cy="18.478292"
-         sodipodi:rx="8.3085051"
-         sodipodi:ry="8.3085051"
-         d="M 25.897786 18.478292 A 8.3085051 8.3085051 0 1 1  9.2807760,18.478292 A 8.3085051 8.3085051 0 1 1  25.897786 18.478292 z"
-         transform="matrix(1.398614,0.000000,0.000000,1.398614,-6.224338,-8.298958)" />
-      <path
-         style="opacity:0.83422458;color:#000000;fill:url(#radialGradient1539);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 18.156915,7.3966938 C 12.949325,7.3966938 8.7323681,11.613651 8.7323681,16.821241 C 8.7323681,18.325216 9.1526753,19.709014 9.7795400,20.971144 C 11.031920,21.432757 12.362297,21.746827 13.774307,21.746827 C 19.945262,21.746827 24.873589,16.885190 25.254413,10.809698 C 23.523449,8.7641668 21.044374,7.3966938 18.156915,7.3966938 z "
-         id="path4462" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/emblem-symbolic-link.svg Deleted

@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   width="48px"
-   height="48px"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/emblems"
-   sodipodi:docname="emblem-symbolic-link.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective32" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       id="linearGradient11520">
-      <stop
-         id="stop11522"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11524"
-         offset="1.0000000"
-         style="stop-color:#dcdcdc;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11508"
-       inkscape:collect="always">
-      <stop
-         id="stop11510"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop11512"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient1348"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,-1.435476e-15,29.48178)"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient1366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.995058,-1.651527e-32,0.000000,1.995058,-24.32488,-35.70087)"
-       cx="24.445690"
-       cy="35.878170"
-       fx="24.445690"
-       fy="35.878170"
-       r="20.530962" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#888a85"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.25490196"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="1.1112243"
-     inkscape:cy="6.743533"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="872"
-     inkscape:window-height="707"
-     inkscape:window-x="271"
-     inkscape:window-y="141" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>Symbolic Link</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>emblem</rdf:li>
-            <rdf:li>symbolic</rdf:li>
-            <rdf:li>link</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>io</rdf:li>
-            <rdf:li>file</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       transform="matrix(2.243788e-2,0,0,2.086758e-2,44.06795,40.547)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <rect
-       ry="5.4548240"
-       rx="5.4548240"
-       y="3.5233452"
-       x="4.4147282"
-       height="40.061924"
-       width="40.061924"
-       id="rect11518"
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1366);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#9b9b9b;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="rect11528"
-       width="37.696587"
-       height="37.696587"
-       x="5.5973887"
-       y="4.7060070"
-       rx="4.2426391"
-       ry="4.2426391" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2177"
-       d="M 11.500037,31.436501 C 11.940474,20.09759 22.043105,11.32322 32.158766,21.979434 L 37.068811,17.246167 C 37.068811,17.246167 37.088388,32 37.088388,32 L 22.160133,31.978069 C 22.160133,31.978069 26.997745,27.140456 26.997745,27.140456 C 18.528582,18.264221 13.291696,25.230495 11.500037,31.436501 z "
-       style="opacity:0.69886361;color:#000000;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/emblem-unreadable.svg Deleted

@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   width="48px"
-   height="48px"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/emblems"
-   sodipodi:docname="emblem-unreadable.svg">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2719">
-      <stop
-         style="stop-color:#cc0000;stop-opacity:1;"
-         offset="0"
-         id="stop2721" />
-      <stop
-         style="stop-color:#cc0000;stop-opacity:0;"
-         offset="1"
-         id="stop2723" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2711">
-      <stop
-         style="stop-color:#f34e4e;stop-opacity:1;"
-         offset="0"
-         id="stop2713" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:0;"
-         offset="1"
-         id="stop2715" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11327">
-      <stop
-         style="stop-color:#7d6400;stop-opacity:1;"
-         offset="0"
-         id="stop11329" />
-      <stop
-         style="stop-color:#be9700;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11331" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2092">
-      <stop
-         id="stop2094"
-         offset="0"
-         style="stop-color:#fff7b0;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffec41;stop-opacity:1.0000000;"
-         offset="0.20999999"
-         id="stop2098" />
-      <stop
-         id="stop2293"
-         offset="0.83999997"
-         style="stop-color:#e2cc00;stop-opacity:1;" />
-      <stop
-         id="stop2100"
-         offset="1"
-         style="stop-color:#c3af00;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11335">
-      <stop
-         style="stop-color:#6f716d;stop-opacity:1;"
-         offset="0"
-         id="stop11337" />
-      <stop
-         style="stop-color:#9ea09c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11339" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10591">
-      <stop
-         style="stop-color:#cad0c6;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop10593" />
-      <stop
-         id="stop10599"
-         offset="0.50000000"
-         style="stop-color:#eaece9;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#c5cbc0;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop10595" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11520">
-      <stop
-         id="stop11522"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11524"
-         offset="1.0000000"
-         style="stop-color:#dcdcdc;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11508"
-       inkscape:collect="always">
-      <stop
-         id="stop11510"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop11512"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient1348"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,-1.435476e-15,29.48178)"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient1366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.995058,-1.651527e-32,0.000000,1.995058,-24.32488,-35.70087)"
-       cx="24.445690"
-       cy="35.878170"
-       fx="24.445690"
-       fy="35.878170"
-       r="20.530962" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2719"
-       id="radialGradient2725"
-       cx="24.445681"
-       cy="46.957848"
-       fx="24.445681"
-       fy="46.957848"
-       r="16.554319"
-       gradientTransform="matrix(2.670835,-1.66183e-17,1.650931e-17,2.653312,-40.84471,-77.78951)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#eeeeec"
-     fill="#cc0000"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.25490196"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="49.436623"
-     inkscape:cy="35.750047"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1002"
-     inkscape:window-height="955"
-     inkscape:window-x="436"
-     inkscape:window-y="77" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Unreadable</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>emblem</rdf:li>
-            <rdf:li>access</rdf:li>
-            <rdf:li>denied</rdf:li>
-            <rdf:li>unreadable</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       transform="matrix(2.304988e-2,0,0,2.086758e-2,45.00013,40.24675)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <rect
-       ry="5.4548240"
-       rx="5.4548240"
-       y="3.5233452"
-       x="4.4147282"
-       height="40.061924"
-       width="40.061924"
-       id="rect11518"
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1366);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#9b9b9b;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="rect11528"
-       width="37.696587"
-       height="37.696587"
-       x="5.5973887"
-       y="4.7060070"
-       rx="4.2426391"
-       ry="4.2426391" />
-    <rect
-       style="opacity:1;color:#000000;fill:url(#radialGradient2725);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2707"
-       width="33.108639"
-       height="32.891403"
-       x="7.8913612"
-       y="7.1085968"
-       rx="2.7440348"
-       ry="2.7440348"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <g
-       id="g2703"
-       transform="matrix(0.717647,0,0,0.717647,6.882353,6.6)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       style="stroke:#eeeeec">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="path2698"
-         d="M 16.25,15.25 L 32.5,31.5"
-         style="opacity:1;color:#000000;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:6.96721315;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-      <path
-         style="opacity:1;color:#000000;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:6.96721315;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         d="M 32.5,15.25 L 16.25,31.5"
-         id="path2700"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/face-surprise.svg Deleted

@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg4376"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/gfx/ximian/tango-icon-theme/scalable/emotes"
-   sodipodi:docname="face-surprise.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective39" />
-    <linearGradient
-       id="linearGradient3290">
-      <stop
-         id="stop3292"
-         offset="0.0000000"
-         style="stop-color:#fffcde;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#f6e76a;stop-opacity:1.0000000;"
-         offset="0.64485979"
-         id="stop3294" />
-      <stop
-         id="stop3296"
-         offset="1.0000000"
-         style="stop-color:#ffb738;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="8.9020796"
-       fy="15.755712"
-       fx="29.158466"
-       cy="15.720984"
-       cx="29.288071"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2714"
-       xlink:href="#linearGradient3290"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2509">
-      <stop
-         id="stop2511"
-         offset="0.0000000"
-         style="stop-color:#fffbd5;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2513"
-         offset="1.0000000"
-         style="stop-color:#edd400;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="39.5928"
-       fx="25.0527"
-       r="15.7572"
-       cy="39.5928"
-       cx="25.0527"
-       id="aigrd2"
-       gradientTransform="matrix(1.250000,0.000000,0.000000,1.250000,-6.214281,-8.428572)">
-      <stop
-         id="stop8602"
-         style="stop-color:#777777;stop-opacity:1.0000000;"
-         offset="0.0000000" />
-      <stop
-         id="stop8604"
-         style="stop-color:#000000"
-         offset="1" />
-    </radialGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4565">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4567" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4569" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3824">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3826" />
-      <stop
-         style="stop-color:#c9c9c9;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3828" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3800">
-      <stop
-         style="stop-color:#ffeed6;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3802" />
-      <stop
-         id="stop8664"
-         offset="0.50000000"
-         style="stop-color:#e49c2f;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffc66c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3804" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4565"
-       id="radialGradient4571"
-       cx="24.714285"
-       cy="38.571430"
-       fx="24.714285"
-       fy="38.571430"
-       r="19.714285"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,25.71429)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     fill="#edd400"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.19607843"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="25.411306"
-     inkscape:cy="24.058534"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="770"
-     inkscape:window-height="739"
-     inkscape:window-x="223"
-     inkscape:window-y="109" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Face - Shocked</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>emoticon</rdf:li>
-            <rdf:li>emote</rdf:li>
-            <rdf:li>smiley</rdf:li>
-            <rdf:li>stare</rdf:li>
-            <rdf:li>shocked</rdf:li>
-            <rdf:li>:O</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.53164557;color:#000000;fill:url(#radialGradient4571);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.40487173;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="path4563"
-       sodipodi:cx="24.714285"
-       sodipodi:cy="38.571430"
-       sodipodi:rx="19.714285"
-       sodipodi:ry="6.5714288"
-       d="M 44.428570 38.571430 A 19.714285 6.5714288 0 1 1  5.0000000,38.571430 A 19.714285 6.5714288 0 1 1  44.428570 38.571430 z" />
-    <path
-       sodipodi:type="arc"
-       style="overflow:visible;display:inline;visibility:visible;stroke-opacity:1.0000000;stroke-dashoffset:0.0000000;stroke-dasharray:none;stroke-miterlimit:4.0000000;marker-end:none;marker-mid:none;marker-start:none;marker:none;stroke-linejoin:round;stroke-linecap:round;stroke-width:0.48004404;stroke:#9c8c0a;fill-rule:evenodd;fill-opacity:1.0000000;fill:url(#radialGradient2714);color:#000000;opacity:1.0000000"
-       id="path4320"
-       sodipodi:cx="31.112698"
-       sodipodi:cy="19.008621"
-       sodipodi:rx="8.6620579"
-       sodipodi:ry="8.6620579"
-       d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.450640,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z"
-       transform="matrix(2.083142,0.000000,0.000000,2.083142,-40.54715,-16.49224)" />
-    <path
-       d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.450640,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z"
-       sodipodi:ry="8.6620579"
-       sodipodi:rx="8.6620579"
-       sodipodi:cy="19.008621"
-       sodipodi:cx="31.112698"
-       id="path4322"
-       style="opacity:0.67721519;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50510627;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc"
-       transform="matrix(1.979782,0.000000,0.000000,1.979782,-37.33128,-14.52746)" />
-    <path
-       id="path8599"
-       d="M 33.660715,32.696428 C 33.660715,36.196428 29.410715,38.946428 24.285715,38.946428 C 19.160715,38.946428 14.910715,36.196428 14.910715,32.696428 C 14.910715,29.196428 19.160715,26.446428 24.285715,26.446428 C 29.410715,26.446428 33.660715,29.196428 33.660715,32.696428 z "
-       style="opacity:0.35999998;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000" />
-    <path
-       id="path8606"
-       d="M 33.660715,31.696428 C 33.660715,35.196428 29.410715,37.946428 24.285715,37.946428 C 19.160715,37.946428 14.910715,35.196428 14.910715,31.696428 C 14.910715,28.196428 19.160715,25.446428 24.285715,25.446428 C 29.410715,25.446428 33.660715,28.196428 33.660715,31.696428 z "
-       style="fill:url(#aigrd2);fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000" />
-    <g
-       id="g8666"
-       transform="translate(0.265165,0.000000)">
-      <path
-         id="path8610"
-         d="M 21.398158,15.321428 C 21.398158,17.821428 20.273158,19.821428 18.898158,19.821428 C 17.523158,19.821428 16.273158,17.821428 16.273158,15.321428 C 16.273158,12.821428 17.398158,10.821428 18.773158,10.821428 C 20.148158,10.821428 21.273158,12.821428 21.273158,15.321428 L 21.398158,15.321428 z "
-         style="opacity:0.35999998;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000" />
-      <path
-         id="path8612"
-         d="M 30.688512,15.321428 C 30.688512,17.821428 29.563512,19.821428 28.188512,19.821428 C 26.813512,19.821428 25.688512,17.821428 25.688512,15.321428 C 25.688512,12.821428 26.813512,10.821428 28.188512,10.821428 C 29.563512,10.821428 30.688512,12.821428 30.688512,15.321428 z "
-         style="opacity:0.35999998;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000" />
-      <path
-         id="path8614"
-         d="M 21.398158,14.696428 C 21.398158,17.196428 20.273158,19.196428 18.898158,19.196428 C 17.523158,19.196428 16.398158,17.196428 16.398158,14.696428 C 16.398158,12.196428 17.523158,10.196428 18.898158,10.196428 C 20.273158,10.196428 21.398158,12.196428 21.398158,14.696428 z "
-         style="fill:#000000;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000" />
-      <path
-         id="path8616"
-         d="M 30.688512,14.696428 C 30.688512,17.196428 29.563512,19.196428 28.188512,19.196428 C 26.813512,19.196428 25.688512,17.196428 25.688512,14.696428 C 25.688512,12.196428 26.813512,10.196428 28.188512,10.196428 C 29.563512,10.196428 30.688512,12.196428 30.688512,14.696428 z "
-         style="fill:#000000;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/folder-open.svg Deleted

@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48.000000px"
-   height="48.000000px"
-   id="svg97"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/status"
-   sodipodi:docname="folder-open.svg"
-   inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/snowdunes/gnome-fs-directory-accept.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient13842">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop13844" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop13846" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9766">
-      <stop
-         style="stop-color:#6194cb;stop-opacity:1;"
-         offset="0"
-         id="stop9768" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="1"
-         id="stop9770" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9806">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop9808" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop9810" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9806"
-       id="radialGradient9812"
-       cx="24.35099"
-       cy="41.591846"
-       fx="24.35099"
-       fy="41.591846"
-       r="19.136078"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.242494,1.565588e-16,31.50606)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient148">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.13402061;"
-         offset="0.0000000"
-         id="stop149" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.051546391;"
-         offset="1.0000000"
-         id="stop150" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient335">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop336" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop337" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1789">
-      <stop
-         style="stop-color:#a0a0a0;stop-opacity:1;"
-         offset="0"
-         id="stop1790" />
-      <stop
-         style="stop-color:#a8a8a8;stop-opacity:1;"
-         offset="1"
-         id="stop1791" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient137">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.70059878;"
-         offset="0.0000000"
-         id="stop138" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop139" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient335"
-       id="linearGradient155"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.421537,0.703464)"
-       x1="19.116116"
-       y1="28.946041"
-       x2="19.426924"
-       y2="51.912693" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient148"
-       id="linearGradient156"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.535299,0,0,0.651339,3.451418,2.448)"
-       x1="14.899379"
-       y1="27.059643"
-       x2="22.715446"
-       y2="41.836895" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient137"
-       id="linearGradient158"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.462696,0,6.907908e-2,0.683669,-8.7075e-19,0)"
-       x1="5.2657914"
-       y1="18.725863"
-       x2="8.2122240"
-       y2="52.625851" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1789"
-       id="radialGradient159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.015635,0,0.103105,1.000512,-6.73857e-18,-8.369458e-2)"
-       cx="26.106777"
-       cy="38.195114"
-       fx="26.106777"
-       fy="38.195114"
-       r="32.259769" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9766"
-       id="linearGradient13162"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.022118,52.05694,-1.323026)"
-       x1="22.175976"
-       y1="36.987999"
-       x2="22.065331"
-       y2="32.050499" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13842"
-       id="linearGradient13848"
-       x1="22.25"
-       y1="37.625"
-       x2="19.75"
-       y2="14.875"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.54135"
-     inkscape:cx="8.8898314"
-     inkscape:cy="26.16018"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1027"
-     inkscape:window-height="818"
-     inkscape:window-x="271"
-     inkscape:window-y="30"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Folder Icon Accept</dc:title>
-        <dc:date>2005-01-31</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:description>Active state - when files are being dragged to.</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>Novell, Inc.</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Garrett LeSage</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Folder"
-     inkscape:groupmode="layer" />
-  <g
-     inkscape:label="Open"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       transform="matrix(2.262383e-2,0,0,2.086758e-2,43.38343,36.36962)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <path
-       sodipodi:nodetypes="ccccccssssccc"
-       style="color:#000000;fill:url(#radialGradient159);fill-opacity:1;fill-rule:nonzero;stroke:#5a5a5a;stroke-width:0.99487108;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2375"
-       d="M 4.6200285,38.651015 C 4.6618365,39.07147 5.1174141,39.491924 5.5311838,39.491924 L 36.667346,39.491924 C 37.081116,39.491924 37.453078,39.07147 37.41127,38.651015 L 34.714653,11.531728 C 34.672845,11.111274 34.217267,10.69082 33.803498,10.69082 L 21.080082,10.69082 C 20.489536,10.69082 19.870999,10.311268 19.677221,9.7304849 L 18.574219,6.4246085 C 18.404967,5.9173308 18.027069,5.6888138 17.259746,5.6888138 L 2.3224188,5.6888138 C 1.9086492,5.6888138 1.5366876,6.109268 1.5784956,6.529722 L 4.6200285,38.651015 z "
-       transform="matrix(1.004486,0,0,1.005825,-8.234449e-2,-0.221964)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.3301525,37.533487 L 35.317907,37.533487"
-       id="path13160"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path13139"
-       d="M 5.3301525,35.533487 L 35.317907,35.533487"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="ccccccsscsscccc"
-       id="path2380"
-       d="M 6.1717518,38.418674 C 6.2031078,38.729001 6.017127,38.935886 5.6963478,38.832443 L 5.6963478,38.832443 C 5.3755686,38.729001 5.1477798,38.522116 5.1164238,38.211789 L 2.0868572,6.8445942 C 2.0555012,6.534267 2.2434512,6.3468711 2.5537784,6.3468711 L 17.303531,6.2554251 C 17.834815,6.2521313 18.04296,6.308731 18.18333,6.7726371 C 18.18333,6.7726371 19.268704,9.885435 19.429564,10.470742 L 17.873968,7.5537061 C 17.608788,7.0564434 17.275224,7.1399365 16.901178,7.1399365 L 3.7717775,7.1399365 C 3.4614503,7.1399365 3.2754695,7.3468213 3.3068255,7.6571485 L 6.2856462,38.522116 L 6.1717518,38.418674 z "
-       style="color:#000000;fill:url(#linearGradient158);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.17341149;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       transform="matrix(1.008872,0,0,1.012144,-0.101943,-0.33126)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 3.3386019,17.533487 L 34.488461,17.533487"
-       id="path13113"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path13115"
-       d="M 2.7573333,11.533487 L 33.496214,11.533487"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <g
-       inkscape:export-ydpi="74.800003"
-       inkscape:export-xdpi="74.800003"
-       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
-       transform="matrix(1.034503,0,0.104528,1.035221,-9.922058,2.395183)"
-       id="g2381"
-       style="fill:#ffffff;fill-opacity:0.5803109;fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4;display:block"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true">
-      <path
-         sodipodi:nodetypes="cscscs"
-         id="path2382"
-         d="M 41.785743,9.0363862 C 41.795369,8.5618034 41.800932,8.3118806 41.36235,8.312183 L 28.80653,8.3208402 C 28.50653,8.3208402 28.481916,8.1776341 28.80653,8.3208402 C 29.131144,8.4640463 30.053628,8.9791114 30.989227,9.0218349 C 30.989227,9.0218349 41.785704,9.0382983 41.785743,9.0363862 z "
-         style="stroke:none"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-    </g>
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.1594716,33.533487 L 35.147226,33.533487"
-       id="path13121"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path13119"
-       d="M 4.8658086,31.533487 L 34.974533,31.533487"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 4.6336367,29.533487 L 34.802847,29.533487"
-       id="path13135"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path13137"
-       d="M 4.4629557,27.533487 L 34.632166,27.533487"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 4.2556718,25.533487 L 34.460793,25.533487"
-       id="path13143"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path13133"
-       d="M 4.0235198,23.533487 L 34.289101,23.533487"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 3.8528389,21.533487 L 34.11842,21.533487"
-       id="path13117"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path13125"
-       d="M 3.6514189,19.533487 L 33.947215,19.533487"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.39204545;color:#000000;fill:url(#linearGradient13848);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 34.375,14.125 L 37,38.75 L 6,38.875 C 6,38.875 4.125,14.125 4.125,14.125 C 4.125,14.125 34.5,14.125 34.375,14.125 z "
-       id="path13840"
-       sodipodi:nodetypes="cccsc" />
-    <path
-       inkscape:export-ydpi="74.800003"
-       inkscape:export-xdpi="74.800003"
-       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
-       sodipodi:nodetypes="cccsscccscc"
-       id="path2401"
-       d="M 5.7785654,39.065997 C 5.8820074,39.277466 6.0888914,39.488925 6.3992173,39.488925 L 39.70767,39.488925 C 39.914562,39.488925 40.228834,39.36262 40.415844,39.224574 C 40.946246,38.833039 41.070704,38.612189 41.308626,38.251107 C 43.756752,34.535647 47.113767,18.974214 47.113767,18.974214 C 47.217209,18.762754 47.010326,18.551294 46.7,18.551294 L 11.776358,18.551294 C 11.466032,18.551294 10.120393,34.658624 6.9133592,37.838317 L 5.6751235,39.065997 L 5.7785654,39.065997 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient13162);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.00416672;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       transform="matrix(0.988773,0,0,1.002979,-0.111407,-0.106563)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       id="path323"
-       d="M 13.134476,20.138641 C 12.361729,25.129398 11.633175,29.147884 10.418486,33.652505 C 12.804971,32.945398 17.534602,30.448 27.534602,30.448 C 37.534602,30.448 44.258175,21.199301 45.186253,20.094447 L 13.134476,20.138641 z "
-       style="fill:url(#linearGradient156);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       sodipodi:nodetypes="ccccc"
-       transform="matrix(0.988773,0,0,1.002979,-0.111407,-0.106563)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.52272728;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient155);stroke-width:1.00416696px;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 45.820083,19.6875 L 12.661612,19.6875 C 12.661612,19.6875 10.513864,35.707107 7.9393398,37.928078 C 16.060417,37.928078 39.510511,37.879442 39.53033,37.879442 C 41.281989,37.879442 44.437971,25.243248 45.820083,19.6875 z "
-       id="path324"
-       sodipodi:nodetypes="cccsc"
-       transform="matrix(0.988773,0,0,1.002979,-0.111407,-0.106563)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path13123"
-       d="M 3.1628954,15.533487 L 33.993452,15.533487"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 2.9642313,13.533487 L 33.990735,13.533487"
-       id="path13127"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path13145"
-       d="M 2.3052333,7.533487 L 17.088967,7.533487"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 2.5242572,9.5334871 L 17.805073,9.5334871"
-       id="path13147"
-       sodipodi:nodetypes="cc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="pattern" />
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-bottom.svg Deleted

@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-bottom.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2309">
-      <stop
-         id="stop2311"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop2313"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient7994"
-       cx="16.620785"
-       cy="-29.734715"
-       fx="16.620785"
-       fy="-29.734715"
-       r="16.500000"
-       gradientTransform="matrix(-2.193185,-5.372224e-4,-2.626836e-4,0.916667,44.50040,59.29963)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2309"
-       id="radialGradient1441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.871885e-16,0.843022,-1.020168,-2.265228e-16,46.39357,1.413854)"
-       cx="34.663586"
-       cy="20.321211"
-       fx="34.663586"
-       fy="20.321211"
-       r="16.9562" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.517764e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient10491"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-3.749427e-16,2.046729,1.557610,2.853404e-16,2.912970,-22.93354)"
-       cx="15.987216"
-       cy="1.5350308"
-       fx="15.987216"
-       fy="1.5350308"
-       r="17.171415" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2309"
-       id="radialGradient11961"
-       cx="13.904816"
-       cy="36.435665"
-       fx="13.904816"
-       fy="36.435665"
-       r="16.505941"
-       gradientTransform="matrix(0.999669,-4.782903e-3,3.785304e-3,0.791668,-0.221863,10.41377)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="48"
-     inkscape:window-x="293"
-     inkscape:window-height="664"
-     inkscape:window-width="872"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="22.011268"
-     inkscape:cx="76.899747"
-     inkscape:zoom="2.8284271"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go to Bottom</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>bottom</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,20.18775)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.20454544;color:#000000;fill:url(#radialGradient1444);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0;fill-rule:evenodd;stroke:#3b7502;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 40.500000,42.500000 L 40.500000,36.503792 L 25.375000,36.503792 L 40.468750,18.500000 L 32.500000,18.437500 L 32.500000,5.4999998 L 14.531250,5.4999998 L 14.531250,18.437500 L 6.5000002,18.437500 L 21.875000,36.503792 L 6.5018962,36.503792 L 6.5018962,42.500000 L 40.500000,42.500000 z "
-       id="path10479"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path8645"
-       d="M 7.5986710,19.005743 L 15.005062,18.994024 L 15.002381,6.0011870 L 30.380937,6.0103400 C 29.611015,24.351330 19.658288,17.003413 14.999278,27.657219 L 7.5986710,19.005743 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient10491);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 31.529849,6.5000002 L 15.519518,6.5000002 L 15.519518,19.492950 L 8.6884242,19.492950 L 23.146289,36.497838 L 24.058638,36.510066 L 38.279030,19.537918 L 31.480757,19.471627 L 31.529849,6.5000002 z "
-       id="path10496"
-       sodipodi:nodetypes="ccccccccc" />
-    <rect
-       style="opacity:0.481;fill:url(#radialGradient11961);fill-opacity:1.0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2163"
-       width="32.001644"
-       height="4.0094671"
-       x="7.4998465"
-       y="37.5" />
-    <path
-       style="opacity:0.17613636;fill:url(#radialGradient7994);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 40.000000,40.785821 C 27.939340,36.732669 10.597476,42.084912 7.0220967,39.534362 L 7.0376697,37.027779 L 40.000000,37.004571 L 40.000000,40.785821 z "
-       id="path5072"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-down.svg Deleted

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-down.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient1442">
-      <stop
-         id="stop1444"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop1446"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1442"
-       id="radialGradient1469"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="35.292667"
-       cy="20.494493"
-       fx="35.292667"
-       fy="20.494493"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1471"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.749427e-16,-2.046729,-1.557610,-2.853404e-16,44.11559,66.93275)"
-       cx="15.987216"
-       cy="1.5350308"
-       fx="15.987216"
-       fy="1.5350308"
-       r="17.171415" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="25"
-     inkscape:window-x="0"
-     inkscape:window-height="885"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="23.239067"
-     inkscape:cx="30.291728"
-     inkscape:zoom="11.313708"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go Down</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>lower</rdf:li>
-            <rdf:li>down</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.20454545;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <g
-       id="g1464"
-       transform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.02856,43.99921)">
-      <path
-         style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1469);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 14.519136,38.500000 L 32.524165,38.496094 L 32.524165,25.504468 L 40.519531,25.496656 L 23.374809,5.4992135 L 6.5285585,25.497284 L 14.524440,25.501074 L 14.519136,38.500000 z "
-         id="path8643"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1471);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 39.429889,24.993467 L 32.023498,25.005186 L 32.026179,37.998023 L 16.647623,37.98887 C 17.417545,19.64788 27.370272,26.995797 32.029282,16.341991 L 39.429889,24.993467 z "
-         id="path8645"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         id="path8658"
-         d="M 15.520704,37.496094 L 31.522109,37.500000 L 31.522109,24.507050 L 38.338920,24.491425 L 23.384644,7.0388396 L 8.6781173,24.495782 L 15.518018,24.501029 L 15.520704,37.496094 z "
-         style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-first.svg Deleted

@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-first.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2301">
-      <stop
-         id="stop2303"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop2305"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2301"
-       id="radialGradient1441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.150574,1.757515e-16,3.460315e-16,1.223465,54.74191,-2.461415)"
-       cx="22.752287"
-       cy="29.900566"
-       fx="22.752287"
-       fy="29.900566"
-       r="16.956199" />
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,4.441327e-15,16.87306)"
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       id="radialGradient8668"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient6058"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.046729,-3.749427e-16,2.853404e-16,1.557610,-19.71021,3.166594)"
-       cx="17.474981"
-       cy="1.4732735"
-       fx="17.474981"
-       fy="1.4732735"
-       r="17.171415" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="25"
-     inkscape:window-x="0"
-     inkscape:window-height="885"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="25.355927"
-     inkscape:cx="27.23632"
-     inkscape:zoom="11.313708"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go Previous</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>previous</rdf:li>
-            <rdf:li>left</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&lt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(-1.271186,0.000000,0.000000,1.271186,56.54869,-13.15725)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946522;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 2.5000002,6.4999998 L 8.4962092,6.4999998 L 8.4962092,21.625000 L 26.500000,6.5312498 L 26.562500,14.500000 L 39.500000,14.500000 L 39.500000,32.531250 L 26.562500,32.531250 L 26.562500,40.500000 L 8.4962092,25.125000 L 8.4962092,40.498104 L 2.5000002,40.498104 L 2.5000002,6.4999998 z "
-       id="path18242"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <rect
-       style="opacity:0.48099998;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
-       id="rect2163"
-       width="32.011883"
-       height="4.0094671"
-       x="7.4881172"
-       y="3.4905324"
-       transform="matrix(0.000000,1.000000,1.000000,0.000000,0.000000,0.000000)" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 38.519933,15.448055 L 38.519933,31.504148 L 25.526984,31.504148 L 25.526984,38.156896 L 8.5312502,23.936088 L 8.5319662,22.764585 L 25.570404,8.5000002 L 25.548307,15.507869 L 38.519933,15.448055 z "
-       id="path8658"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path8645"
-       d="M 26.066367,7.5151738 L 26.035117,15.040398 L 38.946037,14.946648 L 39.008537,23.924861 C 22.258537,17.674861 18.250000,29.344573 3.0000000,23.094573 L 3.0165920,6.9965978 L 7.8456840,6.9611228 L 7.8622750,22.613148 L 26.066367,7.5151738 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient6058);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-home.svg Deleted

@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   overflow="visible"
-   enable-background="new 0 0 128 129.396"
-   xml:space="preserve"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docname="go-home.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   version="1.0"
-   inkscape:export-filename="/home/tigert/My Downloads/go-home.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"><metadata
-   id="metadata367"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
-         rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" /><dc:title>Go Home</dc:title><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz</dc:source><dc:subject><rdf:Bag><rdf:li>home</rdf:li><rdf:li>return</rdf:li><rdf:li>go</rdf:li><rdf:li>default</rdf:li><rdf:li>user</rdf:li><rdf:li>directory</rdf:li></rdf:Bag></dc:subject><dc:contributor><cc:Agent><dc:title>Tuomas Kuosmanen</dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
-       rdf:about="http://creativecommons.org/licenses/by-sa/2.0/"><cc:permits
-         rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
-         rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
-         rdf:resource="http://web.resource.org/cc/Notice" /><cc:requires
-         rdf:resource="http://web.resource.org/cc/Attribution" /><cc:permits
-         rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
-         rdf:resource="http://web.resource.org/cc/ShareAlike" /></cc:License></rdf:RDF></metadata><defs
-   id="defs365"><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient5060"
-     id="radialGradient5031"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-     cx="605.71429"
-     cy="486.64789"
-     fx="605.71429"
-     fy="486.64789"
-     r="117.14286" /><linearGradient
-     inkscape:collect="always"
-     id="linearGradient5060"><stop
-       style="stop-color:black;stop-opacity:1;"
-       offset="0"
-       id="stop5062" /><stop
-       style="stop-color:black;stop-opacity:0;"
-       offset="1"
-       id="stop5064" /></linearGradient><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient5060"
-     id="radialGradient5029"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-     cx="605.71429"
-     cy="486.64789"
-     fx="605.71429"
-     fy="486.64789"
-     r="117.14286" /><linearGradient
-     id="linearGradient5048"><stop
-       style="stop-color:black;stop-opacity:0;"
-       offset="0"
-       id="stop5050" /><stop
-       id="stop5056"
-       offset="0.5"
-       style="stop-color:black;stop-opacity:1;" /><stop
-       style="stop-color:black;stop-opacity:0;"
-       offset="1"
-       id="stop5052" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient5048"
-     id="linearGradient5027"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-     x1="302.85715"
-     y1="366.64789"
-     x2="302.85715"
-     y2="609.50507" /><linearGradient
-     id="linearGradient2406"><stop
-       style="stop-color:#7c7e79;stop-opacity:1;"
-       offset="0"
-       id="stop2408" /><stop
-       id="stop2414"
-       offset="0.1724138"
-       style="stop-color:#848681;stop-opacity:1;" /><stop
-       style="stop-color:#898c86;stop-opacity:1;"
-       offset="1"
-       id="stop2410" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     id="linearGradient2390"><stop
-       style="stop-color:#919191;stop-opacity:1;"
-       offset="0"
-       id="stop2392" /><stop
-       style="stop-color:#919191;stop-opacity:0;"
-       offset="1"
-       id="stop2394" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     id="linearGradient2378"><stop
-       style="stop-color:#575757;stop-opacity:1;"
-       offset="0"
-       id="stop2380" /><stop
-       style="stop-color:#575757;stop-opacity:0;"
-       offset="1"
-       id="stop2382" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     id="linearGradient2368"><stop
-       style="stop-color:#ffffff;stop-opacity:1;"
-       offset="0"
-       id="stop2370" /><stop
-       style="stop-color:#ffffff;stop-opacity:0;"
-       offset="1"
-       id="stop2372" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     id="linearGradient2349"><stop
-       style="stop-color:#000000;stop-opacity:1;"
-       offset="0"
-       id="stop2351" /><stop
-       style="stop-color:#000000;stop-opacity:0;"
-       offset="1"
-       id="stop2353" /></linearGradient><linearGradient
-     id="linearGradient2341"><stop
-       id="stop2343"
-       offset="0"
-       style="stop-color:#000000;stop-opacity:1;" /><stop
-       id="stop2345"
-       offset="1"
-       style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-     id="linearGradient2329"><stop
-       style="stop-color:#000000;stop-opacity:0.18556701;"
-       offset="0"
-       id="stop2331" /><stop
-       style="stop-color:#ffffff;stop-opacity:1;"
-       offset="1"
-       id="stop2333" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     id="linearGradient2319"><stop
-       style="stop-color:#000000;stop-opacity:1;"
-       offset="0"
-       id="stop2321" /><stop
-       style="stop-color:#000000;stop-opacity:0;"
-       offset="1"
-       id="stop2323" /></linearGradient><linearGradient
-     id="linearGradient2307"><stop
-       style="stop-color:#edd400;stop-opacity:1;"
-       offset="0"
-       id="stop2309" /><stop
-       style="stop-color:#998800;stop-opacity:1;"
-       offset="1"
-       id="stop2311" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     id="linearGradient2299"><stop
-       style="stop-color:#ffffff;stop-opacity:1;"
-       offset="0"
-       id="stop2301" /><stop
-       style="stop-color:#ffffff;stop-opacity:0;"
-       offset="1"
-       id="stop2303" /></linearGradient><linearGradient
-     id="XMLID_2_"
-     gradientUnits="userSpaceOnUse"
-     x1="80.223602"
-     y1="117.5205"
-     x2="48.046001"
-     y2="59.7995"
-     gradientTransform="matrix(0.314683,0.000000,0.000000,0.314683,4.128264,3.742874)">
-				<stop
-   offset="0"
-   style="stop-color:#CCCCCC"
-   id="stop17" />
-				<stop
-   offset="0.9831"
-   style="stop-color:#FFFFFF"
-   id="stop19" />
-				<midPointStop
-   offset="0"
-   style="stop-color:#CCCCCC"
-   id="midPointStop48" />
-				<midPointStop
-   offset="0.5"
-   style="stop-color:#CCCCCC"
-   id="midPointStop50" />
-				<midPointStop
-   offset="0.9831"
-   style="stop-color:#FFFFFF"
-   id="midPointStop52" />
-			</linearGradient><linearGradient
-     inkscape:collect="always"
-     xlink:href="#XMLID_2_"
-     id="linearGradient1514"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.336922,0.000000,0.000000,0.166888,17.98288,15.46151)"
-     x1="52.006104"
-     y1="166.1331"
-     x2="14.049017"
-     y2="-42.218513" /><linearGradient
-     id="XMLID_39_"
-     gradientUnits="userSpaceOnUse"
-     x1="64.387703"
-     y1="65.124001"
-     x2="64.387703"
-     y2="35.569"
-     gradientTransform="matrix(0.354101,0.000000,0.000000,0.354101,1.638679,-8.364921e-2)">
-						<stop
-   offset="0"
-   style="stop-color:#FFFFFF"
-   id="stop336" />
-						<stop
-   offset="0.8539"
-   style="stop-color:#FF6200"
-   id="stop338" />
-						<stop
-   offset="1"
-   style="stop-color:#F25D00"
-   id="stop340" />
-						<midPointStop
-   offset="0"
-   style="stop-color:#FFFFFF"
-   id="midPointStop335" />
-						<midPointStop
-   offset="0.5"
-   style="stop-color:#FFFFFF"
-   id="midPointStop337" />
-						<midPointStop
-   offset="0.8539"
-   style="stop-color:#FF6200"
-   id="midPointStop339" />
-						<midPointStop
-   offset="0.5"
-   style="stop-color:#FF6200"
-   id="midPointStop341" />
-						<midPointStop
-   offset="1"
-   style="stop-color:#F25D00"
-   id="midPointStop343" />
-					</linearGradient><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2299"
-     id="radialGradient2305"
-     cx="7.5326638"
-     cy="24.202574"
-     fx="7.5326638"
-     fy="24.202574"
-     r="8.2452128"
-     gradientTransform="matrix(4.100086,-1.627292e-17,2.125447e-14,4.201322,-25.41506,-78.53967)"
-     gradientUnits="userSpaceOnUse" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2307"
-     id="radialGradient2313"
-     cx="19.985598"
-     cy="36.77816"
-     fx="19.985598"
-     fy="36.77816"
-     r="1.0821035"
-     gradientTransform="matrix(1.125263,0.000000,0.000000,0.982744,-3.428678,0.565787)"
-     gradientUnits="userSpaceOnUse" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2319"
-     id="radialGradient2325"
-     cx="20.443665"
-     cy="37.425829"
-     fx="20.443665"
-     fy="37.425829"
-     r="1.0821035"
-     gradientTransform="matrix(1.125263,0.000000,0.000000,0.982744,-3.428678,0.731106)"
-     gradientUnits="userSpaceOnUse" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2329"
-     id="linearGradient2335"
-     x1="17.602522"
-     y1="26.057423"
-     x2="17.682528"
-     y2="32.654099"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.898789,0,0,1.071914,0.478025,-2.080838)" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2341"
-     id="radialGradient2339"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(4.100086,1.627292e-17,2.125447e-14,-4.201322,-5.198109,105.3535)"
-     cx="11.68129"
-     cy="19.554111"
-     fx="11.68129"
-     fy="19.554111"
-     r="8.2452126" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2349"
-     id="radialGradient2355"
-     cx="24.023088"
-     cy="40.56913"
-     fx="24.023088"
-     fy="40.56913"
-     r="16.28684"
-     gradientTransform="matrix(1.000000,0.000000,0.000000,0.431250,1.157278e-15,23.07369)"
-     gradientUnits="userSpaceOnUse" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2368"
-     id="radialGradient2374"
-     cx="29.913452"
-     cy="30.442923"
-     fx="29.913452"
-     fy="30.442923"
-     r="4.0018832"
-     gradientTransform="matrix(3.751495,-2.191984e-22,1.723265e-22,3.147818,-82.00907,-65.70704)"
-     gradientUnits="userSpaceOnUse" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2378"
-     id="radialGradient2384"
-     cx="24.195112"
-     cy="10.577631"
-     fx="24.195112"
-     fy="10.577631"
-     r="15.242914"
-     gradientTransform="matrix(1.125263,-3.585417e-8,4.269819e-8,1.340059,-3.006704,1.355395)"
-     gradientUnits="userSpaceOnUse" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2390"
-     id="linearGradient2396"
-     x1="30.603519"
-     y1="37.337803"
-     x2="30.603519"
-     y2="36.112415"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(1.263867,0,0,0.859794,-6.499556,8.390924)" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient2406"
-     id="linearGradient2412"
-     x1="17.850183"
-     y1="28.939463"
-     x2="19.040216"
-     y2="41.03223"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.888785,0,0,1.08932,2.41099,-1.524336)" /></defs><sodipodi:namedview
-   inkscape:cy="-2.3755359"
-   inkscape:cx="25.234802"
-   inkscape:zoom="1"
-   inkscape:window-height="691"
-   inkscape:window-width="872"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   borderopacity="0.21568627"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   inkscape:showpageshadow="false"
-   inkscape:window-x="466"
-   inkscape:window-y="224"
-   inkscape:current-layer="svg2"
-   fill="#555753"
-   showgrid="false"
-   stroke="#a40000"
-   showguides="true"
-   inkscape:guide-bbox="true" />
-	<g
-   style="display:inline"
-   id="g5022"
-   transform="matrix(2.158196e-2,0,0,1.859457e-2,43.12251,41.63767)"><rect
-     y="-150.69685"
-     x="-1559.2523"
-     height="478.35718"
-     width="1339.6335"
-     id="rect4173"
-     style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
-     sodipodi:nodetypes="cccc"
-     id="path5058"
-     d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-     style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
-     style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-     d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-     id="path5018"
-     sodipodi:nodetypes="cccc" /></g><path
-   style="color:#000000;fill:url(#linearGradient1514);fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:1.0000006;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-   d="M 21.619576,8.1833733 L 27.577035,8.1833733 C 28.416767,8.1833733 41.46351,23.618701 41.46351,24.524032 L 41.019989,43.020777 C 41.019989,43.92611 40.343959,44.654954 39.504227,44.654954 L 8.0469496,44.654954 C 7.2072167,44.654954 6.5311871,43.92611 6.5311871,43.020777 L 6.5876651,24.524032 C 6.5876651,23.618701 20.779844,8.1833733 21.619576,8.1833733 z "
-   id="rect1512"
-   sodipodi:nodetypes="ccccccccc" /><path
-   style="fill:none"
-   id="path5"
-   d="M 46.963575,45.735573 L 1.6386762,45.735573 L 1.6386762,0.41067554 L 46.963575,0.41067554 L 46.963575,45.735573 z " /><path
-   style="fill:url(#linearGradient2335);fill-opacity:1;fill-rule:evenodd"
-   id="path2327"
-   d="M 23,29 L 22.954256,44.090942 L 11.111465,44.090942 L 11,29 L 23,29 z "
-   clip-rule="evenodd"
-   sodipodi:nodetypes="ccccc" /><path
-   sodipodi:nodetypes="ccccccccc"
-   id="path2357"
-   d="M 21.780459,9.405584 L 27.339556,9.405584 C 28.123138,9.405584 40.340425,23.805172 40.340425,24.649756 L 39.993267,42.862067 C 39.993267,43.321326 39.84953,43.515532 39.480892,43.515532 L 8.0936894,43.529812 C 7.7250517,43.529812 7.5097258,43.449894 7.5097258,43.076262 L 7.7250676,24.649756 C 7.7250676,23.805172 20.99688,9.405584 21.780459,9.405584 z "
-   style="opacity:0.3125;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
-   clip-rule="evenodd"
-   d="M 7.2075295,27.943053 L 7.1532728,30.538247 L 25.521437,17.358993 L 40.807832,28.513421 L 40.879142,28.201707 L 24.508686,12.297576 L 7.2075295,27.943053 z "
-   id="path23"
-   style="opacity:0.2;fill:url(#radialGradient2384);fill-opacity:1;fill-rule:evenodd"
-   sodipodi:nodetypes="ccccccc" /><path
-   clip-rule="evenodd"
-   d="M 22,30 L 22,44.090942 L 12.188971,44.090942 L 12,30 L 22,30 z "
-   id="path188"
-   style="fill:url(#linearGradient2412);fill-opacity:1;fill-rule:evenodd"
-   sodipodi:nodetypes="ccccc" /><path
-   style="opacity:0.40909089;fill:url(#radialGradient2325);fill-opacity:1;fill-rule:evenodd"
-   id="path2315"
-   d="M 19.576856,36.44767 C 20.249646,36.44767 20.793472,36.922275 20.793472,37.506177 C 20.793472,38.095988 20.249646,38.574532 19.576856,38.574532 C 18.904584,38.574532 18.35817,38.095988 18.35817,37.506177 C 18.358685,36.922275 18.904584,36.44767 19.576856,36.44767 z "
-   clip-rule="evenodd" /><path
-   clip-rule="evenodd"
-   d="M 19.462314,35.932229 C 20.135103,35.932229 20.678929,36.406834 20.678929,36.990736 C 20.678929,37.580545 20.135103,38.059089 19.462314,38.059089 C 18.790041,38.059089 18.243627,37.580545 18.243627,36.990736 C 18.244142,36.406834 18.790041,35.932229 19.462314,35.932229 z "
-   id="path217"
-   style="fill:url(#radialGradient2313);fill-opacity:1;fill-rule:evenodd" /><path
-   d="M 24.447748,11.559337 L 43.374808,28.729205 L 43.869487,29.121196 L 44.273163,28.949811 L 43.900293,28.188138 L 43.622679,27.964702 L 24.447748,12.392396 L 5.0582327,28.135731 L 4.8206309,28.279851 L 4.603921,28.986637 L 5.0373408,29.115885 L 5.4218948,28.807462 L 24.447748,11.559337 z "
-   id="path342"
-   style="fill:url(#XMLID_39_)"
-   sodipodi:nodetypes="ccccccccccccc" /><path
-   style="fill:#ef2929;stroke:#a40000"
-   id="path362"
-   d="M 24.330168,2.2713382 L 2.4484294,20.372675 L 1.8237005,27.538603 L 3.8236367,29.602926 C 3.8236367,29.602926 24.231018,12.445641 24.44773,12.274963 L 44.08027,29.818223 L 45.978694,27.494226 L 44.362903,20.382852 L 24.44773,2.1668788 L 24.330168,2.2713382 z "
-   sodipodi:nodetypes="cccccccccc" />
-<path
-   style="opacity:0.40909089;color:#000000;fill:url(#radialGradient2305);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-   d="M 2.8413446,20.613129 L 2.5497894,27.236494 L 24.369219,8.980075 L 24.298891,3.0867443 L 2.8413446,20.613129 z "
-   id="path1536"
-   sodipodi:nodetypes="ccccc" /><path
-   sodipodi:nodetypes="ccccc"
-   id="path2337"
-   d="M 24.483763,8.7509884 L 24.583223,2.9098867 L 43.912186,20.56184 L 45.403998,27.062652 L 24.483763,8.7509884 z "
-   style="opacity:0.13636367;color:#000000;fill:url(#radialGradient2339);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
-   style="opacity:0.31818183;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-   d="M 27.102228,27.719824 L 36.142223,27.719824 C 36.912818,27.719824 37.53319,28.340194 37.53319,29.110791 L 37.525229,38.190012 C 37.525229,38.960608 36.928907,39.455981 36.158311,39.455981 L 27.102228,39.455981 C 26.331631,39.455981 25.711261,38.835608 25.711261,38.065012 L 25.711261,29.110791 C 25.711261,28.340194 26.331631,27.719824 27.102228,27.719824 z "
-   id="rect2361"
-   sodipodi:nodetypes="ccccccccc" /><rect
-   style="opacity:1;color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-   id="rect3263"
-   width="10.001333"
-   height="9.9624557"
-   x="26.507767"
-   y="28.514256"
-   rx="0.38128215"
-   ry="0.38128215" /><path
-   style="opacity:0.39772728;color:#000000;fill:url(#radialGradient2374);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-   d="M 27.107118,34.408261 C 30.725101,34.739438 32.634842,32.962557 35.97527,32.855521 L 36,29.00603 L 27.088388,29 L 27.107118,34.408261 z "
-   id="rect2363"
-   sodipodi:nodetypes="ccccc" /></svg>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-jump.svg Deleted

@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-jump.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2702">
-      <stop
-         style="stop-color:#3a7304;stop-opacity:1;"
-         offset="0"
-         id="stop2704" />
-      <stop
-         style="stop-color:#3a7304;stop-opacity:0;"
-         offset="1"
-         id="stop2706" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2187">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2189" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2191" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2161">
-      <stop
-         style="stop-color:#519e07;stop-opacity:1"
-         offset="0"
-         id="stop2163" />
-      <stop
-         style="stop-color:#6cc813;stop-opacity:1"
-         offset="1.0000000"
-         id="stop2165" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.160225e-14,16.87306)"
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       id="radialGradient8668"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2161"
-       id="linearGradient2167"
-       x1="22.000000"
-       y1="16.642263"
-       x2="19.377108"
-       y2="12.448164"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.171926,0.000000,0.000000,1.171926,-4.674553,-1.427903)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2187"
-       id="linearGradient2193"
-       x1="14.296179"
-       y1="15.230618"
-       x2="10.022297"
-       y2="23.105061"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.171926,0.000000,0.000000,1.171926,-4.674553,-1.427903)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2702"
-       id="linearGradient2708"
-       x1="12.105637"
-       y1="24.589863"
-       x2="6.1056361"
-       y2="29.839863"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="0"
-     inkscape:window-x="173"
-     inkscape:window-height="586"
-     inkscape:window-width="872"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="46.696516"
-     inkscape:cx="70.609761"
-     inkscape:zoom="4"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#8ae234"
-     stroke="#8ae234" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go Jump</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>jump</rdf:li>
-            <rdf:li>seek</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.489736,0.000000,0.000000,-1.001252,-12.26794,72.07115)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.14117648;color:#000000;fill:url(#radialGradient8668);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2167);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2708);stroke-width:1.0000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 4.3920955,35.164045 C 3.0709563,-4.8617622 38.100746,1.7948935 36.928820,22.596580 L 46.304228,22.596580 L 31.655153,34.315840 L 16.420115,22.596580 C 16.420115,22.596580 26.088504,22.596580 26.088504,22.596580 C 26.674467,8.5334680 4.6559242,4.1065510 4.3920955,35.164045 z "
-       id="path1432"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2177"
-       d="M 4.3609454,33.776714 C 4.4557415,-2.2986419 38.008172,2.0411991 35.829171,23.579043 L 43.433623,23.579043 L 31.618133,32.977887 L 19.387494,23.579043 C 19.387494,23.579043 27.066938,23.579043 27.066938,23.579043 C 28.105744,5.5081081 3.1989499,4.7058695 4.3609454,33.776714 z "
-       style="opacity:0.41764703;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2193);stroke-width:0.99999970;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-last.svg Deleted

@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-last.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient1428">
-      <stop
-         id="stop1430"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop1432"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1428"
-       id="radialGradient1441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.843022,1.871885e-16,-2.265228e-16,1.020168,4.413860,0.606440)"
-       cx="22.588188"
-       cy="34.462799"
-       fx="22.588188"
-       fy="34.462799"
-       r="16.956199" />
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.046729,-3.749427e-16,2.853404e-16,1.557610,-19.66321,2.389970)"
-       r="17.171415"
-       fy="3.0045178"
-       fx="18.968266"
-       cy="3.0045178"
-       cx="18.968266"
-       id="radialGradient8656"
-       xlink:href="#linearGradient8650"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.246400e-15,16.87306)"
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       id="radialGradient8668"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="25"
-     inkscape:window-x="0"
-     inkscape:window-height="885"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="21.636957"
-     inkscape:cx="52.185548"
-     inkscape:zoom="11.313708"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go Next</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>next</rdf:li>
-            <rdf:li>right</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.271186,0.000000,0.000000,1.271186,-9.619376,-12.27857)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946522;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 45.500000,6.5000002 L 39.503791,6.5000002 L 39.503791,21.625000 L 21.500000,6.5312502 L 21.437500,14.500000 L 8.4999996,14.500000 L 8.4999996,32.468750 L 21.437500,32.468750 L 21.437500,40.500000 L 39.503791,25.125000 L 39.503791,40.498104 L 45.500000,40.498104 L 45.500000,6.5000002 z "
-       id="path18242"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path8645"
-       d="M 21.81717,7.1863873 L 21.81717,15.149112 L 9,15.149112 L 9,24.033575 C 23.75,28.283575 28.133537,18.203287 44.883537,23.203287 L 44.866945,7.105312 L 40.037853,7.069837 L 40.021262,22.721862 L 21.81717,7.1863873 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient8656);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 9.5000002,15.448055 L 9.5000002,31.347898 L 22.492950,31.347898 L 22.492950,38.156896 L 39.519934,23.654838 L 39.487968,22.764585 L 22.449530,8.5000002 L 22.471627,15.320369 L 9.5000002,15.448055 z "
-       id="path8658"
-       sodipodi:nodetypes="ccccccccc" />
-    <rect
-       style="opacity:0.48099998;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
-       id="rect2163"
-       width="32.011883"
-       height="4.0094671"
-       x="7.5000000"
-       y="-44.509468"
-       transform="matrix(0.000000,1.000000,-1.000000,0.000000,0.000000,0.000000)" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-next.svg Deleted

@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-next.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48"
-   width="48"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         style="stop-color:#73d216"
-         offset="0"
-         id="stop2593" />
-      <stop
-         style="stop-color:#4e9a06"
-         offset="1.0000000"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.046729,-3.749427e-16,2.853404e-16,1.557610,-19.51799,3.452086)"
-       r="17.171415"
-       fy="2.8969381"
-       fx="19.701141"
-       cy="2.8969381"
-       cx="19.701141"
-       id="radialGradient8656"
-       xlink:href="#linearGradient8650"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,2.511012e-15,16.87306)"
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       id="radialGradient8668"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="radialGradient2597"
-       cx="22.291636"
-       cy="32.797512"
-       fx="22.291636"
-       fy="32.797512"
-       r="16.9562"
-       gradientTransform="matrix(0.843022,1.871885e-16,-2.265228e-16,1.020168,4.499298,1.381992)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="25"
-     inkscape:window-x="0"
-     inkscape:window-height="885"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="27.398876"
-     inkscape:cx="34.827552"
-     inkscape:zoom="11.313708"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go Next</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>next</rdf:li>
-            <rdf:li>right</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.271186,0.000000,0.000000,1.271186,-8.119376,-15.10179)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946522;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 8.5541875,15.517348 L 8.5541875,32.511768 L 21.538,32.511768 L 21.538,41.056806 L 41.497835,24.150365 L 21.41919,7.1251168 L 21.41919,15.522652 L 8.5541875,15.517348 z "
-       style="opacity:1;color:#000000;fill:url(#radialGradient2597);fill-opacity:1;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path8645"
-       d="M 21.962385,8.2485033 L 21.962385,16.054978 L 9.1452151,16.054978 L 9.1452151,25.095691 C 26.895215,27.095691 25.778752,17.640403 40.528752,24.140403 L 21.962385,8.2485033 z "
-       style="opacity:0.5080214;color:#000000;fill:url(#radialGradient8656);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128339;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 9.537702,16.561892 L 9.537702,31.546332 L 22.523069,31.546332 L 22.523069,38.941498 L 40.001083,24.145807 L 22.507108,9.3654066 L 22.507108,16.566789 L 9.537702,16.561892 z "
-       id="path8658"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-previous.svg Deleted

@@ -1,852 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-previous.svg"
-   sodipodi:docbase="/home/andreas/projekt/tango/scalable"
-   inkscape:version="0.42+0.43pre2"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         style="stop-color:#73d216"
-         offset="0"
-         id="stop2593" />
-      <stop
-         style="stop-color:#4e9a06"
-         offset="1.0000000"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10314">
-      <stop
-         style="stop-color:#7ea5d6;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop10316" />
-      <stop
-         style="stop-color:#467ec5;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop10318" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8938">
-      <stop
-         id="stop8940"
-         offset="0.0000000"
-         style="stop-color:#fdc674;stop-opacity:1.0000000;" />
-      <stop
-         id="stop8942"
-         offset="1.0000000"
-         style="stop-color:#d88103;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7636"
-       inkscape:collect="always">
-      <stop
-         id="stop7638"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop7640"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7614">
-      <stop
-         id="stop7616"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.21590909"
-         id="stop7649" />
-      <stop
-         style="stop-color:#838383;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop7632" />
-      <stop
-         id="stop7618"
-         offset="1"
-         style="stop-color:#838383;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7608">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop7610" />
-      <stop
-         id="stop7622"
-         offset="0.46022728"
-         style="stop-color:#e3e3e3;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#dadada;stop-opacity:0.67058824;"
-         offset="0.61970556"
-         id="stop7624" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:0.34285715;"
-         offset="1.0000000"
-         id="stop7612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7602">
-      <stop
-         id="stop7604"
-         offset="0.0000000"
-         style="stop-color:#f6f6f6;stop-opacity:1.0000000;" />
-      <stop
-         id="stop7606"
-         offset="1.0000000"
-         style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7586">
-      <stop
-         id="stop7588"
-         offset="0.0000000"
-         style="stop-color:#525252;stop-opacity:1.0000000;" />
-      <stop
-         id="stop7590"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12836">
-      <stop
-         style="stop-color:#515152;stop-opacity:1;"
-         offset="0"
-         id="stop12838" />
-      <stop
-         style="stop-color:#515152;stop-opacity:0;"
-         offset="1"
-         id="stop12840" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12828">
-      <stop
-         style="stop-color:#cccccd;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop12830" />
-      <stop
-         id="stop12862"
-         offset="0.0000000"
-         style="stop-color:#adadae;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#8f8f90;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop12832" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12810">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop12812" />
-      <stop
-         style="stop-color:#e5e5e5;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop12814" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11625">
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
-         offset="0"
-         id="stop11627" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:0;"
-         offset="1"
-         id="stop11629" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11615">
-      <stop
-         style="stop-color:#636363;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11617" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11619" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11602">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11604" />
-      <stop
-         style="stop-color:#c5c5c5;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11606" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11594">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop11596" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11598" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11520">
-      <stop
-         style="stop-color:#fbfbfb;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11522" />
-      <stop
-         style="stop-color:#dcdcdc;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11524" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11508">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11510" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11512" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11494">
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1;"
-         offset="0"
-         id="stop11496" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:0;"
-         offset="1"
-         id="stop11498" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11415">
-      <stop
-         style="stop-color:#204a87;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop11417" />
-      <stop
-         id="stop11423"
-         offset="0.50000000"
-         style="stop-color:#204a87;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop11419" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11399">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11401" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11403" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11415"
-       id="linearGradient11425"
-       gradientUnits="userSpaceOnUse"
-       x1="15.828360"
-       y1="3.7744560"
-       x2="43.615788"
-       y2="34.462429"
-       gradientTransform="translate(-60.28571,-0.285714)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11415"
-       id="linearGradient11427"
-       gradientUnits="userSpaceOnUse"
-       x1="9.6957054"
-       y1="9.3458843"
-       x2="35.679932"
-       y2="39.033859"
-       gradientTransform="translate(-60.57143,0.000000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11415"
-       id="linearGradient11439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-60.85714,0.428571)"
-       x1="13.267134"
-       y1="19.774456"
-       x2="26.758644"
-       y2="33.462429" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11399"
-       id="radialGradient11441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.487395,0.000000,20.06483)"
-       cx="12.071428"
-       cy="39.142857"
-       fx="12.071428"
-       fy="39.142857"
-       r="8.5000000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11494"
-       id="radialGradient11500"
-       cx="27.577173"
-       cy="15.048258"
-       fx="27.577173"
-       fy="15.048258"
-       r="3.8335034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11494"
-       id="radialGradient11504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
-       cx="27.577173"
-       cy="16.049133"
-       fx="27.577173"
-       fy="16.049133"
-       r="3.8335034" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient11514"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,2.166583e-14,29.48178)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient11526"
-       cx="24.445690"
-       cy="35.878170"
-       fx="24.445690"
-       fy="35.878170"
-       r="20.530962"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.995058,-1.535926e-32,0.000000,1.855412,24.94925,-30.20430)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient11532"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,-5.348412e-14,29.48178)"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11594"
-       id="linearGradient11600"
-       x1="20.092352"
-       y1="8.9471626"
-       x2="31.799011"
-       y2="38.947163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.045319,0.000000,0.000000,0.957884,48.16627,1.415543)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="linearGradient11608"
-       x1="24.445671"
-       y1="0.49847093"
-       x2="24.445671"
-       y2="39.447163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.984324,0.000000,0.000000,0.957884,49.65734,1.415543)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11615"
-       id="radialGradient11621"
-       cx="25.000000"
-       cy="27.749998"
-       fx="25.000000"
-       fy="27.749998"
-       r="4.7500000"
-       gradientTransform="matrix(3.570338,3.171097e-15,-4.005596e-15,4.509900,-64.25843,-94.25499)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11631"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11635"
-       gradientUnits="userSpaceOnUse"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000"
-       gradientTransform="translate(2.000000,0.000000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(8.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11655"
-       gradientUnits="userSpaceOnUse"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11657"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11659"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11661"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12816"
-       x1="65.623963"
-       y1="21.459777"
-       x2="87.528968"
-       y2="21.459777"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12818"
-       gradientUnits="userSpaceOnUse"
-       x1="84.998962"
-       y1="25.209778"
-       x2="62.591469"
-       y2="12.022278" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12828"
-       id="radialGradient12834"
-       cx="88.593018"
-       cy="33.398670"
-       fx="88.593018"
-       fy="33.398670"
-       r="7.0056136"
-       gradientTransform="matrix(0.969219,0.227988,-0.194668,0.827570,9.443870,-15.99848)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12836"
-       id="linearGradient12842"
-       x1="88.750000"
-       y1="31.656250"
-       x2="92.062500"
-       y2="36.656250"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12878"
-       gradientUnits="userSpaceOnUse"
-       x1="65.623963"
-       y1="21.459777"
-       x2="87.528968"
-       y2="21.459777" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12836"
-       id="linearGradient12880"
-       gradientUnits="userSpaceOnUse"
-       x1="88.750000"
-       y1="31.656250"
-       x2="92.062500"
-       y2="36.656250" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12828"
-       id="radialGradient12882"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.969219,0.227988,-0.194668,0.827570,9.443870,-15.99848)"
-       cx="88.593018"
-       cy="33.398670"
-       fx="88.593018"
-       fy="33.398670"
-       r="7.0056136" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12884"
-       gradientUnits="userSpaceOnUse"
-       x1="84.998962"
-       y1="25.209778"
-       x2="62.591469"
-       y2="12.022278" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11615"
-       id="radialGradient12894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.570338,3.171097e-15,-4.005596e-15,4.509900,-64.25843,-94.25499)"
-       cx="25.000000"
-       cy="27.749998"
-       fx="25.000000"
-       fy="27.749998"
-       r="4.7500000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12896"
-       gradientUnits="userSpaceOnUse"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000"
-       gradientTransform="translate(7.267442e-2,-0.181686)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12898"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2.072674,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.072674,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12902"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12911"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(7.267442e-2,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12913"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2.072674,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12915"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.072674,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       y2="21.067410"
-       x2="24.445690"
-       y1="33.447811"
-       x1="31.597168"
-       gradientTransform="matrix(0.476329,0.000000,0.000000,0.627721,62.07560,9.156933)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7584"
-       xlink:href="#linearGradient11594"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.407878,2.776254e-16,-5.900875e-16,1.861050,14.96976,-20.55775)"
-       r="6.0270013"
-       fy="29.099535"
-       fx="24.399090"
-       cy="29.099535"
-       cx="24.399090"
-       id="radialGradient7592"
-       xlink:href="#linearGradient7586"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="11.042997"
-       x2="22.585604"
-       y1="34.149513"
-       x1="22.585604"
-       gradientTransform="matrix(1.059222,0.000000,0.000000,0.808101,48.08657,4.001391)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7596"
-       xlink:href="#linearGradient7608"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(49.32070,0.000000)"
-       gradientUnits="userSpaceOnUse"
-       y2="38.454056"
-       x2="28.284273"
-       y1="28.554562"
-       x1="25.279068"
-       id="linearGradient7642"
-       xlink:href="#linearGradient7636"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.777122,-8.126449e-2,6.891211e-2,2.223012,4.035118,-33.24798)"
-       r="4.4774761"
-       fy="29.609560"
-       fx="24.483574"
-       cy="29.609560"
-       cx="24.483574"
-       id="radialGradient7647"
-       xlink:href="#linearGradient7614"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.046729,-3.749427e-16,-2.853404e-16,1.557610,67.59375,3.275309)"
-       r="17.171415"
-       fy="5.7859797"
-       fx="25.075571"
-       cy="5.7859797"
-       cx="25.075571"
-       id="radialGradient8656"
-       xlink:href="#linearGradient8650"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,6.772795e-15,16.87306)"
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       id="radialGradient8668"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="radialGradient2597"
-       cx="22.291636"
-       cy="32.797512"
-       fx="22.291636"
-       fy="32.797512"
-       r="16.956199"
-       gradientTransform="matrix(-0.843022,1.871885e-16,2.265228e-16,1.020168,43.57646,1.205215)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="25"
-     inkscape:window-x="0"
-     inkscape:window-height="885"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="25.461494"
-     inkscape:cx="25.558072"
-     inkscape:zoom="16"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go Previous</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>previous</rdf:li>
-            <rdf:li>left</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&lt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(-1.271186,0.000000,0.000000,1.271186,56.19514,-15.27857)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946521;color:#000000;fill:url(#radialGradient8668);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 39.490316,15.496821 L 39.490316,32.491241 L 26.537753,32.491241 L 26.537753,40.973779 L 6.577917,23.973588 L 26.531563,6.7295901 L 26.531563,15.502125 L 39.490316,15.496821 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient2597);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path8645"
-       d="M 25.988368,7.9779766 L 25.988368,16.034451 L 38.930538,16.034451 L 38.930538,24.918914 C 22.180538,18.668914 22.797001,30.213626 7.547,23.963626 L 25.988368,7.9779766 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient8656);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 38.475551,16.541365 L 38.475551,31.463305 L 25.490184,31.463305 L 25.490184,38.764721 L 8.168419,23.96903 L 25.506145,9.0636299 L 25.506145,16.546262 L 38.475551,16.541365 z "
-       id="path8658"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-top.svg Deleted

@@ -1,972 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-top.svg"
-   sodipodi:docbase="/home/andreas/projekt/tango/scalable"
-   inkscape:version="0.42+0.43pre2"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2308">
-      <stop
-         id="stop2310"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop2312"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         style="stop-color:#9db029;stop-opacity:1;"
-         offset="0"
-         id="stop2593" />
-      <stop
-         style="stop-color:#869623;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10314">
-      <stop
-         style="stop-color:#7ea5d6;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop10316" />
-      <stop
-         style="stop-color:#467ec5;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop10318" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8938">
-      <stop
-         id="stop8940"
-         offset="0.0000000"
-         style="stop-color:#fdc674;stop-opacity:1.0000000;" />
-      <stop
-         id="stop8942"
-         offset="1.0000000"
-         style="stop-color:#d88103;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7636"
-       inkscape:collect="always">
-      <stop
-         id="stop7638"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop7640"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7614">
-      <stop
-         id="stop7616"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.21590909"
-         id="stop7649" />
-      <stop
-         style="stop-color:#838383;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop7632" />
-      <stop
-         id="stop7618"
-         offset="1"
-         style="stop-color:#838383;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7608">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop7610" />
-      <stop
-         id="stop7622"
-         offset="0.46022728"
-         style="stop-color:#e3e3e3;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#dadada;stop-opacity:0.67058824;"
-         offset="0.61970556"
-         id="stop7624" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:0.34285715;"
-         offset="1.0000000"
-         id="stop7612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7602">
-      <stop
-         id="stop7604"
-         offset="0.0000000"
-         style="stop-color:#f6f6f6;stop-opacity:1.0000000;" />
-      <stop
-         id="stop7606"
-         offset="1.0000000"
-         style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7586">
-      <stop
-         id="stop7588"
-         offset="0.0000000"
-         style="stop-color:#525252;stop-opacity:1.0000000;" />
-      <stop
-         id="stop7590"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12836">
-      <stop
-         style="stop-color:#515152;stop-opacity:1;"
-         offset="0"
-         id="stop12838" />
-      <stop
-         style="stop-color:#515152;stop-opacity:0;"
-         offset="1"
-         id="stop12840" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12828">
-      <stop
-         style="stop-color:#cccccd;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop12830" />
-      <stop
-         id="stop12862"
-         offset="0.0000000"
-         style="stop-color:#adadae;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#8f8f90;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop12832" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12810">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop12812" />
-      <stop
-         style="stop-color:#e5e5e5;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop12814" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11625">
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
-         offset="0"
-         id="stop11627" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:0;"
-         offset="1"
-         id="stop11629" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11615">
-      <stop
-         style="stop-color:#636363;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11617" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11619" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11602">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11604" />
-      <stop
-         style="stop-color:#c5c5c5;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11606" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11594">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop11596" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11598" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11520">
-      <stop
-         style="stop-color:#fbfbfb;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11522" />
-      <stop
-         style="stop-color:#dcdcdc;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11524" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11508">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11510" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11512" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11494">
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1;"
-         offset="0"
-         id="stop11496" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:0;"
-         offset="1"
-         id="stop11498" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11415">
-      <stop
-         style="stop-color:#204a87;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop11417" />
-      <stop
-         id="stop11423"
-         offset="0.50000000"
-         style="stop-color:#204a87;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop11419" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11399">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11401" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11403" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11415"
-       id="linearGradient11425"
-       gradientUnits="userSpaceOnUse"
-       x1="15.828360"
-       y1="3.7744560"
-       x2="43.615788"
-       y2="34.462429"
-       gradientTransform="translate(-60.28571,-0.285714)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11415"
-       id="linearGradient11427"
-       gradientUnits="userSpaceOnUse"
-       x1="9.6957054"
-       y1="9.3458843"
-       x2="35.679932"
-       y2="39.033859"
-       gradientTransform="translate(-60.57143,0.000000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11415"
-       id="linearGradient11439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-60.85714,0.428571)"
-       x1="13.267134"
-       y1="19.774456"
-       x2="26.758644"
-       y2="33.462429" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11399"
-       id="radialGradient11441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.487395,0.000000,20.06483)"
-       cx="12.071428"
-       cy="39.142857"
-       fx="12.071428"
-       fy="39.142857"
-       r="8.5000000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11494"
-       id="radialGradient11500"
-       cx="27.577173"
-       cy="15.048258"
-       fx="27.577173"
-       fy="15.048258"
-       r="3.8335034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11494"
-       id="radialGradient11504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
-       cx="27.577173"
-       cy="16.049133"
-       fx="27.577173"
-       fy="16.049133"
-       r="3.8335034" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient11514"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,2.166583e-14,29.48178)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient11526"
-       cx="24.445690"
-       cy="35.878170"
-       fx="24.445690"
-       fy="35.878170"
-       r="20.530962"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.995058,-1.535926e-32,0.000000,1.855412,24.94925,-30.20430)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient11532"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,-5.348412e-14,29.48178)"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11594"
-       id="linearGradient11600"
-       x1="20.092352"
-       y1="8.9471626"
-       x2="31.799011"
-       y2="38.947163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.045319,0.000000,0.000000,0.957884,48.16627,1.415543)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="linearGradient11608"
-       x1="24.445671"
-       y1="0.49847093"
-       x2="24.445671"
-       y2="39.447163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.984324,0.000000,0.000000,0.957884,49.65734,1.415543)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11615"
-       id="radialGradient11621"
-       cx="25.000000"
-       cy="27.749998"
-       fx="25.000000"
-       fy="27.749998"
-       r="4.7500000"
-       gradientTransform="matrix(3.570338,3.171097e-15,-4.005596e-15,4.509900,-64.25843,-94.25499)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11631"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11635"
-       gradientUnits="userSpaceOnUse"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000"
-       gradientTransform="translate(2.000000,0.000000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(8.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11655"
-       gradientUnits="userSpaceOnUse"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11657"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11659"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient11661"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12816"
-       x1="65.623963"
-       y1="21.459777"
-       x2="87.528968"
-       y2="21.459777"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12818"
-       gradientUnits="userSpaceOnUse"
-       x1="84.998962"
-       y1="25.209778"
-       x2="62.591469"
-       y2="12.022278" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12828"
-       id="radialGradient12834"
-       cx="88.593018"
-       cy="33.398670"
-       fx="88.593018"
-       fy="33.398670"
-       r="7.0056136"
-       gradientTransform="matrix(0.969219,0.227988,-0.194668,0.827570,9.443870,-15.99848)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12836"
-       id="linearGradient12842"
-       x1="88.750000"
-       y1="31.656250"
-       x2="92.062500"
-       y2="36.656250"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12878"
-       gradientUnits="userSpaceOnUse"
-       x1="65.623963"
-       y1="21.459777"
-       x2="87.528968"
-       y2="21.459777" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12836"
-       id="linearGradient12880"
-       gradientUnits="userSpaceOnUse"
-       x1="88.750000"
-       y1="31.656250"
-       x2="92.062500"
-       y2="36.656250" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12828"
-       id="radialGradient12882"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.969219,0.227988,-0.194668,0.827570,9.443870,-15.99848)"
-       cx="88.593018"
-       cy="33.398670"
-       fx="88.593018"
-       fy="33.398670"
-       r="7.0056136" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12810"
-       id="linearGradient12884"
-       gradientUnits="userSpaceOnUse"
-       x1="84.998962"
-       y1="25.209778"
-       x2="62.591469"
-       y2="12.022278" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11615"
-       id="radialGradient12894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.570338,3.171097e-15,-4.005596e-15,4.509900,-64.25843,-94.25499)"
-       cx="25.000000"
-       cy="27.749998"
-       fx="25.000000"
-       fy="27.749998"
-       r="4.7500000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12896"
-       gradientUnits="userSpaceOnUse"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000"
-       gradientTransform="translate(7.267442e-2,-0.181686)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12898"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2.072674,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.072674,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12902"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.000000,0.000000)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12911"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(7.267442e-2,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12913"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2.072674,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11625"
-       id="linearGradient12915"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.072674,-0.181686)"
-       x1="21.500000"
-       y1="30.000000"
-       x2="21.500000"
-       y2="27.375000" />
-    <linearGradient
-       y2="21.067410"
-       x2="24.445690"
-       y1="33.447811"
-       x1="31.597168"
-       gradientTransform="matrix(0.476329,0.000000,0.000000,0.627721,62.07560,9.156933)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7584"
-       xlink:href="#linearGradient11594"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.407878,2.776254e-16,-5.900875e-16,1.861050,14.96976,-20.55775)"
-       r="6.0270013"
-       fy="29.099535"
-       fx="24.399090"
-       cy="29.099535"
-       cx="24.399090"
-       id="radialGradient7592"
-       xlink:href="#linearGradient7586"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="11.042997"
-       x2="22.585604"
-       y1="34.149513"
-       x1="22.585604"
-       gradientTransform="matrix(1.059222,0.000000,0.000000,0.808101,48.08657,4.001391)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7596"
-       xlink:href="#linearGradient7608"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(49.32070,0.000000)"
-       gradientUnits="userSpaceOnUse"
-       y2="38.454056"
-       x2="28.284273"
-       y1="28.554562"
-       x1="25.279068"
-       id="linearGradient7642"
-       xlink:href="#linearGradient7636"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.777122,-8.126449e-2,6.891211e-2,2.223012,4.035118,-33.24798)"
-       r="4.4774761"
-       fy="29.609560"
-       fx="24.483574"
-       cy="29.609560"
-       cx="24.483574"
-       id="radialGradient7647"
-       xlink:href="#linearGradient7614"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.046729,-3.749427e-16,2.853404e-16,1.557610,-19.51799,3.275309)"
-       r="17.171415"
-       fy="2.8969381"
-       fx="19.701141"
-       cy="2.8969381"
-       cx="19.701141"
-       id="radialGradient8656"
-       xlink:href="#linearGradient8650"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,9.302465e-16,16.87306)"
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       id="radialGradient8668"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="radialGradient2597"
-       cx="22.291636"
-       cy="32.797512"
-       fx="22.291636"
-       fy="32.797512"
-       r="16.956199"
-       gradientTransform="matrix(0.843022,1.871885e-16,-2.265228e-16,1.020168,4.499298,1.205215)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,4.809533e-16,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="radialGradient1432"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.843022,1.871885e-16,-2.265228e-16,1.020168,4.499298,1.205215)"
-       cx="22.291636"
-       cy="32.797512"
-       fx="22.291636"
-       fy="32.797512"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1434"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.046729,-3.749427e-16,2.853404e-16,1.557610,-19.51799,3.275309)"
-       cx="19.701141"
-       cy="2.8969381"
-       fx="19.701141"
-       fy="2.8969381"
-       r="17.171415" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-3.749427e-16,-2.046729,1.557610,-2.853404e-16,2.767009,66.93275)"
-       cx="33.261288"
-       cy="8.7985363"
-       fx="33.261288"
-       fy="8.7985363"
-       r="17.171415" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2308"
-       id="radialGradient1441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="11.319205"
-       cy="22.454971"
-       fx="11.319205"
-       fy="22.454971"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.513668e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient7994"
-       cx="-2.1802037"
-       cy="-26.370907"
-       fx="-2.1802037"
-       fy="-26.370907"
-       r="16.500000"
-       gradientTransform="matrix(2.193185,-5.372224e-4,2.626836e-4,0.916667,2.433306,24.29506)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient2310"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-3.749427e-16,-2.046729,1.557610,-2.853404e-16,2.767009,66.93275)"
-       cx="26.438028"
-       cy="7.6636133"
-       fx="26.438028"
-       fy="7.6636133"
-       r="17.171415" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="25"
-     inkscape:window-x="0"
-     inkscape:window-height="885"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="31.209936"
-     inkscape:cx="23.588863"
-     inkscape:zoom="10.326705"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go Top</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>highest</rdf:li>
-            <rdf:li>top</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.694176,16.66630)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946522;color:#000000;fill:url(#radialGradient1444);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 6.5000000,1.5000000 L 6.5000000,7.4962087 L 21.625000,7.4962087 L 6.5312500,25.500000 L 14.500000,25.562500 L 14.500000,38.500000 L 32.468750,38.500000 L 32.468750,25.562500 L 40.500000,25.562500 L 25.125000,7.4962087 L 40.498104,7.4962087 L 40.498104,1.5000000 L 6.5000000,1.5000000 z "
-       id="path8643"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path8645"
-       d="M 7.5855237,25.03253 L 14.995821,25.03253 L 15.062422,31.594339 C 20.718034,20.593878 23.984449,26.108685 32.894205,18.087994 C 32.894205,18.087994 25.110423,7.9689125 24.086804,7.0621667 L 22.681928,7.0185906 L 7.5855237,25.03253 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1438);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 15.602735,37.500000 L 31.502578,37.500000 L 31.502578,24.507050 L 38.311576,24.507050 L 23.809518,7.4800652 L 22.919265,7.5120313 L 8.6546798,24.550470 L 15.475049,24.528373 L 15.602735,37.500000 z "
-       id="path8658"
-       sodipodi:nodetypes="ccccccccc" />
-    <rect
-       style="opacity:0.48100000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
-       id="rect2163"
-       width="32.011883"
-       height="4.0094671"
-       x="7.4988632"
-       y="2.4954286" />
-    <rect
-       style="opacity:0.52272727;color:#000000;fill:url(#radialGradient2310);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1435"
-       width="33.23402"
-       height="5.3033009"
-       x="6.8942914"
-       y="1.8612821" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/go-up.svg Deleted

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-up.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.43+devel"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2304">
-      <stop
-         id="stop2306"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop2308"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-3.749427e-16,-2.046729,1.557610,-2.853404e-16,2.767009,66.93275)"
-       cx="24.53788"
-       cy="0.40010813"
-       fx="24.53788"
-       fy="0.40010813"
-       r="17.171415" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2304"
-       id="radialGradient1441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="11.319205"
-       cy="22.454971"
-       fx="11.319205"
-       fy="22.454971"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="25"
-     inkscape:window-x="0"
-     inkscape:window-height="885"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="25.620377"
-     inkscape:cx="22.042915"
-     inkscape:zoom="13.059378"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#73d216"
-     stroke="#73d216" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Go Up</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>higher</rdf:li>
-            <rdf:li>up</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946521;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 14.491792,38.500000 L 32.469477,38.500000 L 32.469477,25.547437 L 40.500000,25.547437 L 23.374809,5.4992135 L 6.5285585,25.489471 L 14.497096,25.555762 L 14.491792,38.500000 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cccscc"
-       id="path8645"
-       d="M 7.5855237,25.03253 L 14.995821,25.03253 L 15.062422,31.594339 C 20.718034,20.593878 31.055517,22.749928 31.656768,15.966674 C 31.656768,15.966674 23.366938,6.4219692 23.366938,6.4219692 L 7.5855237,25.03253 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1438);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 15.602735,37.500000 L 31.502578,37.500000 L 31.502578,24.507050 L 38.311576,24.507050 L 23.361206,7.0700896 L 8.6546798,24.550470 L 15.475049,24.528373 L 15.602735,37.500000 z "
-       id="path8658"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/image-missing.svg Deleted

@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   width="48px"
-   height="48px"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/status"
-   sodipodi:docname="image-missing.svg">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       id="linearGradient3563">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3565" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="1"
-         id="stop3567" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3555">
-      <stop
-         style="stop-color:#f2f2f2;stop-opacity:1;"
-         offset="0"
-         id="stop3557" />
-      <stop
-         style="stop-color:#d0d0d0;stop-opacity:1;"
-         offset="1"
-         id="stop3559" />
-    </linearGradient>
-    <linearGradient
-       style="stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667"
-       y2="36.0328"
-       x2="31.0813"
-       y1="3.7319"
-       x1="12.4873"
-       gradientUnits="userSpaceOnUse"
-       id="aigrd1">
-      <stop
-         id="stop16177"
-         style="stop-color:#D2D2D2;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667"
-         offset="0" />
-      <stop
-         id="stop16179"
-         style="stop-color:#EDEDED;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd1"
-       id="linearGradient16280"
-       gradientUnits="userSpaceOnUse"
-       x1="12.4873"
-       y1="3.7319"
-       x2="31.0813"
-       y2="36.0328"
-       gradientTransform="matrix(1.211383,0,0,1.211383,-2.021433,0.189894)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12129">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop12131" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop12133" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12129"
-       id="radialGradient12135"
-       cx="24.218407"
-       cy="41.636040"
-       fx="24.218407"
-       fy="41.636040"
-       r="22.097088"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.184000,0.000000,33.97501)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3555"
-       id="radialGradient3561"
-       cx="26.728037"
-       cy="38.34853"
-       fx="26.728037"
-       fy="38.34853"
-       r="17.926361"
-       gradientTransform="matrix(1.848501,-1.547102e-23,1.227926e-24,1.289078,-21.29931,-13.68176)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3563"
-       id="linearGradient3569"
-       x1="28.107494"
-       y1="34.868584"
-       x2="22.169001"
-       y2="9.8661737"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.056826e-16,0.883885)" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#cc0000"
-     fill="#cc0000"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.25490196"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="13.713462"
-     inkscape:cy="31.493755"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1107"
-     inkscape:window-height="1072"
-     inkscape:window-x="180"
-     inkscape:window-y="85"
-     gridempspacing="4" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Broken Image</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>image</rdf:li>
-            <rdf:li>picture</rdf:li>
-            <rdf:li>photo</rdf:li>
-            <rdf:li>missing</rdf:li>
-            <rdf:li>broken</rdf:li>
-            <rdf:li>404</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Garrett LeSage</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       transform="matrix(2.367169e-2,0,0,2.086758e-2,45.08634,40.14468)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <path
-       id="path16181"
-       d="M 45.343675,39.903974 C 45.343675,41.842189 43.768877,43.416987 41.830663,43.416987 L 6.3371177,43.416987 C 4.3989037,43.416987 2.8241047,41.842189 2.8241047,39.903974 L 2.8241047,7.0947821 C 2.8241047,5.1565681 4.3989037,3.581769 6.3371177,3.581769 L 41.830663,3.581769 C 43.768877,3.581769 45.343675,5.1565681 45.343675,7.0947821 L 45.343675,39.903974 L 45.343675,39.903974 z "
-       style="fill:url(#linearGradient16280);fill-rule:nonzero;stroke:#646464;stroke-width:0.99234736;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="cccccccccc"
-       transform="matrix(1.011299,0,0,1.004137,-0.356015,-9.658587e-2)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="fill:url(#radialGradient3561);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3569);stroke-width:0.99794304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.61658032"
-       d="M 41.467991,35.25247 L 6.6152692,35.25247 L 6.6152692,11.250058 L 41.467991,11.250058 L 41.467991,35.25247 L 41.467991,35.25247 z "
-       id="path12125"
-       sodipodi:nodetypes="cccccc"
-       transform="matrix(1.004226,0,0,0.9999,-0.143226,0.251056)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="fill:none;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99670035;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.86010359"
-       d="M 44.480104,39.32848 C 44.480104,41.187964 43.499604,42.345241 41.640121,42.345241 L 6.6160507,42.345241 C 4.7565677,42.345241 3.6876787,41.276353 3.6876787,39.416869 L 3.6876787,7.5970548 C 3.6876787,5.737571 5.1985087,4.403517 7.0579927,4.403517 L 41.198179,4.403517 C 43.057662,4.403517 44.480104,5.737571 44.480104,7.5970548 L 44.480104,38.974927 L 44.480104,39.32848 z "
-       id="path11975"
-       sodipodi:nodetypes="cccccccccc"
-       transform="matrix(1.005089,0,0,1.001536,-0.206445,8.971654e-2)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <g
-       id="g3551"
-       transform="matrix(0.751031,0,0,0.764054,10.06196,10.18347)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true">
-      <path
-         d="M 11.318692,9.2240568 C 16.641997,14.693047 22.769247,19.123651 29.210664,22.931105 L 27.441568,24.159843 C 21.101863,20.04489 15.052508,15.498993 9.1840818,10.652117 L 11.318692,9.2240568 z "
-         id="path2565"
-         style="opacity:1;color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:2.64021659;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         d="M 26.73892,8.9210568 C 21.867631,15.95255 15.247359,21.081199 7.9065151,25.28163 L 10.087564,23.520856 C 8.7241111,24.379297 25.574485,11.804168 23.852075,10.207903 L 26.73892,8.9210568 z "
-         id="path2575"
-         style="opacity:1;color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:2.64021564;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/left_arrow.svg Deleted

@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-seek-backward.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs1309">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective58" />
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         style="stop-color:#adb0a8;stop-opacity:1;"
-         offset="0"
-         id="stop5077" />
-      <stop
-         style="stop-color:#464744;stop-opacity:1"
-         offset="1"
-         id="stop5079" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2679"
-       inkscape:collect="always">
-      <stop
-         id="stop2681"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop2683"
-         offset="1"
-         style="stop-color:#d3d7cf" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         id="stop2593"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2595"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.095103e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient1401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-47.9996,-121)"
-       x1="54.988514"
-       y1="156"
-       x2="54.896976"
-       y2="142.18799" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient1426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-44.99051,-97.26213)"
-       x1="49.430401"
-       y1="112.94963"
-       x2="49.667324"
-       y2="115.13713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-290.946,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-308.946,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2316"
-       id="linearGradient2322"
-       x1="24.476166"
-       y1="13.658564"
-       x2="23.750401"
-       y2="36"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15294118"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="44.949418"
-     inkscape:cy="17.655272"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:grid-points="true"
-     fill="#fcaf3e"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#729fcf"
-     inkscape:window-width="1144"
-     inkscape:window-height="808"
-     inkscape:window-x="290"
-     inkscape:window-y="34"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     borderlayer="top">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-87.043372"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-102.03286"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.04058"
-       id="guide3111" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-92.545841"
-       id="guide1879" />
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="2" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Seek Backward</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="cccccccc"
-       id="path1441"
-       d="M 23.5004,13.5 L 6.0004,24 L 23.5004,34.5 L 23.5004,13.5 z M 41.5004,13.5 L 24.0004,24 L 41.5004,34.5 L 41.5004,13.5 z "
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2322);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;opacity:0.15" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       sodipodi:nodetypes="cccc"
-       id="path5515"
-       d="M 23.5004,13.5 L 6.0004,24 L 23.5004,34.5 L 23.5004,13.5 z "
-       style="color:#000000;fill:url(#radialGradient1439);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:url(#radialGradient1436);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 41.5004,13.5 L 24.0004,24 L 41.5004,34.5 L 41.5004,13.5 z "
-       id="use5517"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="ccccccccc"
-       style="opacity:0.07027025;color:#000000;fill:url(#linearGradient1426);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 41.5004,13.5 L 40.3129,14.21875 L 41.5004,14.09375 L 41.5004,13.5 z M 23.5004,13.75 L 23.03165,13.78125 L 19.0629,16.15625 L 23.5004,15.75 L 23.5004,13.75 z "
-       id="path2915" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1401);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 23.5004,13.5 L 6.0004,24 L 23.5004,34.5 L 23.5004,13.5 z M 41.5004,13.5 L 24.0004,24 L 41.5004,34.5 L 41.5004,13.5 z "
-       id="path5521"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 23.0004,14.375 L 6.96915,24 L 23.0004,33.625 L 23.0004,14.375 z M 41.0004,14.375 L 24.96915,24 L 41.0004,33.625 L 41.0004,14.375 z M 22.0004,16.15625 L 22.0004,31.84375 L 8.90665,24 L 22.0004,16.15625 z M 40.0004,16.15625 L 40.0004,31.84375 L 26.90665,24 L 40.0004,16.15625 z "
-       id="path5525"
-       sodipodi:nodetypes="cccccccccccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.56111111;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 9.9375,23.375 L 21.9375,16.1875 L 21.9375,22.9375 L 9.9375,23.375 z "
-       id="path3197"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path4072"
-       d="M 29.3125,22.5 L 40,16.1875 L 40,21.9375 L 29.3125,22.5 z "
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/list-add.svg Deleted

@@ -1,434 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg6431"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="list-add.svg">
-  <defs
-     id="defs6433">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2091">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2093" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2095" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.34020618;"
-         offset="1.0000000"
-         id="stop7920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.30498,-6.043298)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2871">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2797">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7179">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1322">
-      <stop
-         id="stop1324"
-         offset="0.0000000"
-         style="stop-color:#729fcf" />
-      <stop
-         id="stop1326"
-         offset="1.0000000"
-         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1322"
-       id="linearGradient4975"
-       x1="34.892849"
-       y1="36.422989"
-       x2="45.918697"
-       y2="48.547989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18.01785,-13.57119)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7185"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7189"
-       gradientUnits="userSpaceOnUse"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient7180"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7182"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient7184"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588622"
-       y2="26.649362" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7186"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7916"
-       id="linearGradient7922"
-       x1="16.874998"
-       y1="22.851799"
-       x2="27.900846"
-       y2="34.976799"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient2097"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.319340"
-       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15686275"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="38.430663"
-     inkscape:cy="0.031886897"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="949"
-     inkscape:window-x="553"
-     inkscape:window-y="117"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata6436">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Add</dc:title>
-        <dc:date>2006-01-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://tango-project.org</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>add</rdf:li>
-            <rdf:li>plus</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.10824742;fill:url(#radialGradient2097);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1361"
-       sodipodi:cx="22.958872"
-       sodipodi:cy="34.94062"
-       sodipodi:rx="10.31934"
-       sodipodi:ry="2.320194"
-       d="M 33.278212 34.94062 A 10.31934 2.320194 0 1 1  12.639532,34.94062 A 10.31934 2.320194 0 1 1  33.278212 34.94062 z"
-       transform="matrix(1.550487,0,0,1.978714,-12.4813,-32.49103)" />
-    <path
-       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
-       d="M 27.514356,37.542682 L 27.514356,28.515722 L 37.492820,28.475543 L 37.492820,21.480219 L 27.523285,21.480219 L 27.514356,11.520049 L 20.498082,11.531210 L 20.502546,21.462362 L 10.512920,21.536022 L 10.477206,28.504561 L 20.511475,28.475543 L 20.518171,37.515896 L 27.514356,37.542682 z "
-       id="text1314"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
-       d="M 26.498702,36.533920 L 26.498702,27.499738 L 36.501304,27.499738 L 36.494607,22.475309 L 26.507630,22.475309 L 26.507630,12.480335 L 21.512796,12.498193 L 21.521725,22.475309 L 11.495536,22.493166 L 11.468750,27.466256 L 21.533143,27.475185 L 21.519750,36.502670 L 26.498702,36.533920 z "
-       id="path7076"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
-       d="M 11.000000,25.000000 C 11.000000,26.937500 36.984375,24.031250 36.984375,24.968750 L 36.984375,21.968750 L 27.000000,22.000000 L 27.000000,12.034772 L 21.000000,12.034772 L 21.000000,22.000000 L 11.000000,22.000000 L 11.000000,25.000000 z "
-       id="path7914"
-       sodipodi:nodetypes="ccccccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/list-remove.svg Deleted

@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg6431"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="list-remove.svg">
-  <defs
-     id="defs6433">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2091">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2093" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2095" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient2097"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.319340"
-       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient7916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.34020618;"
-         offset="1.0000000"
-         id="stop7920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.30498,-6.043298)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2871">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2797">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7179">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1322">
-      <stop
-         id="stop1324"
-         offset="0.0000000"
-         style="stop-color:#729fcf" />
-      <stop
-         id="stop1326"
-         offset="1.0000000"
-         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1322"
-       id="linearGradient4975"
-       x1="34.892849"
-       y1="36.422989"
-       x2="45.918697"
-       y2="48.547989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18.01785,-13.57119)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7185"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7189"
-       gradientUnits="userSpaceOnUse"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient7180"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7182"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient7184"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588622"
-       y2="26.649362" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7186"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7916"
-       id="linearGradient7922"
-       x1="16.874998"
-       y1="22.851799"
-       x2="27.900846"
-       y2="34.976799"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.10980392"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="38.727739"
-     inkscape:cy="26.474252"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="949"
-     inkscape:window-x="380"
-     inkscape:window-y="79"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata6436">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Remove</dc:title>
-        <dc:date>2006-01-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://tango-project.org</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>remove</rdf:li>
-            <rdf:li>delete</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
-       d="M 27.514356,28.359472 L 39.633445,28.475543 L 39.633445,21.480219 L 27.523285,21.480219 L 20.502546,21.462362 L 8.5441705,21.489147 L 8.5084565,28.457686 L 20.511475,28.475543 L 27.514356,28.359472 z "
-       id="text1314"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
-       d="M 38.579429,27.484113 L 38.588357,22.475309 L 9.5267863,22.493166 L 9.5000003,27.466256 L 38.579429,27.484113 z "
-       id="path7076"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
-       d="M 9.0000000,25.000000 C 9.0000000,26.937500 39.125000,24.062500 39.125000,25.000000 L 39.125000,22.000000 L 9.0000000,22.000000 L 9.0000000,25.000000 z "
-       id="path7914"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-eject.svg Deleted

@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-eject.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient4061">
-      <stop
-         id="stop4063"
-         offset="0"
-         style="stop-color:#474845;stop-opacity:1;" />
-      <stop
-         id="stop4065"
-         offset="1"
-         style="stop-color:#838681;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3881">
-      <stop
-         style="stop-color:#474845;stop-opacity:1;"
-         offset="0"
-         id="stop3883" />
-      <stop
-         style="stop-color:#838681;stop-opacity:1"
-         offset="1"
-         id="stop3885" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2684">
-      <stop
-         id="stop2686"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2688"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         style="stop-color:#adb0a8;stop-opacity:1;"
-         offset="0"
-         id="stop5077" />
-      <stop
-         style="stop-color:#464744;stop-opacity:1"
-         offset="1"
-         id="stop5079" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2691"
-       inkscape:collect="always">
-      <stop
-         id="stop2693"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop2695"
-         offset="1"
-         style="stop-color:#d3d7cf" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2691"
-       id="radialGradient2820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.417671e-4,-0.841008,2.061725,1.819131e-3,-85.84076,115.7349)"
-       cx="107.69903"
-       cy="53.086113"
-       fx="107.69903"
-       fy="53.086113"
-       r="12.551644" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2691"
-       id="radialGradient3705"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.541952e-4,-0.786068,2.096269,1.700295e-3,-88.16796,111.9199)"
-       cx="101.15939"
-       cy="53.259945"
-       fx="101.15939"
-       fy="53.259945"
-       r="12.551644" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2684"
-       id="linearGradient3721"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.128181,0,0,1.128181,8.232257,-83.36009)"
-       x1="14.628661"
-       y1="107.05981"
-       x2="14.334254"
-       y2="88.591339" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2684"
-       id="linearGradient3725"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.128181,0,0,1.128181,8.232257,-83.36009)"
-       x1="14.296268"
-       y1="107.7246"
-       x2="14.888244"
-       y2="90.142509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3881"
-       id="linearGradient3887"
-       x1="21.597084"
-       y1="14.977048"
-       x2="21.522573"
-       y2="34.510876"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4061"
-       id="linearGradient3889"
-       x1="21.597084"
-       y1="14.977048"
-       x2="21.522573"
-       y2="34.510876"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="36"
-       x2="23.750401"
-       y1="13.658564"
-       x1="24.476166"
-       id="linearGradient2322"
-       xlink:href="#linearGradient2316"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.75"
-       fy="147.99352"
-       fx="64.227074"
-       cy="147.99352"
-       cx="64.227074"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-308.946,20.8517)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1439"
-       xlink:href="#linearGradient2679"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.75"
-       fy="147.99352"
-       fx="64.227074"
-       cy="147.99352"
-       cx="64.227074"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-290.946,20.8517)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1436"
-       xlink:href="#linearGradient2679"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="115.13713"
-       x2="49.667324"
-       y1="112.94963"
-       x1="49.430401"
-       gradientTransform="translate(-44.99051,-97.26213)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1426"
-       xlink:href="#linearGradient2584"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="142.18799"
-       x2="54.896976"
-       y1="156"
-       x1="54.988514"
-       gradientTransform="translate(-47.9996,-121)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1401"
-       xlink:href="#linearGradient5075"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2679">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop2681" />
-      <stop
-         style="stop-color:#d3d7cf"
-         offset="1"
-         id="stop2683" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         id="stop2318"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop2320"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.65979379;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#969696"
-     borderopacity="0.13333333"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="35.966165"
-     inkscape:cy="17.061223"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#555753"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#555753"
-     inkscape:window-width="1090"
-     inkscape:window-height="846"
-     inkscape:window-x="432"
-     inkscape:window-y="252"
-     showborder="true"
-     inkscape:showpageshadow="false">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-86.007168"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-108.09009"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.15429"
-       id="guide3111" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Playback Start</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>media</rdf:li>
-            <rdf:li>eject</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="contorno"
-     style="display:inline" />
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:nodetypes="cccc"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path3711"
-       d="M 23.688076,8.7574062 L 10.871765,26.499989 L 36.504387,26.499989 L 23.688076,8.7574062 z "
-       style="opacity:0.15;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3721);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#radialGradient2820);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3887);stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 23.688076,8.7574062 L 10.871765,26.499989 L 36.504387,26.499989 L 23.688076,8.7574062 z "
-       id="path2818"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-    <path
-       sodipodi:nodetypes="cccc"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path2828"
-       d="M 23.688071,10.492044 L 12.811768,25.591373 L 34.564374,25.502984 L 23.688071,10.492044 z "
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       y="30.504408"
-       x="10.614329"
-       height="4.9750595"
-       width="25.882353"
-       id="rect3723"
-       style="opacity:0.15;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3725);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="opacity:1;color:#000000;fill:url(#radialGradient3705);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3889);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect3703"
-       width="25.882353"
-       height="4.9750595"
-       x="10.614329"
-       y="30.504408"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       y="31.553034"
-       x="11.616447"
-       height="2.9302683"
-       width="23.87805"
-       id="rect3707"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.56111111;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 23.6875,11.3125 L 17.6875,19.625 C 22.683077,19.81186 24.399544,19.457194 29.0625,18.8125 L 23.6875,11.3125 z "
-       id="path3709"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-playback-pause.svg Deleted

@@ -1,630 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-playback-pause.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient2817">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2819" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48453608;"
-         offset="1"
-         id="stop2821" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2697">
-      <stop
-         id="stop2699"
-         offset="0"
-         style="stop-color:#babdb6" />
-      <stop
-         id="stop2701"
-         offset="1"
-         style="stop-color:#555753" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2679"
-       inkscape:collect="always">
-      <stop
-         id="stop2681"
-         offset="0"
-         style="stop-color:#f7f7f7;stop-opacity:1" />
-      <stop
-         id="stop2683"
-         offset="1"
-         style="stop-color:#ccd0c7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3081">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3083" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3085" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2112"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-42.61165,283.7891)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2122"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12.00000,0.000000)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2124"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(133.0000,70.99999)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2137"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,4.473733e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2139"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.416456e-12,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2725"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.526469e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2727"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,-1.432388e-12,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2729"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-42.61165,283.7891)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2731"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2733"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(133,70.99999)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2745"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.579205e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2747"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,-1.44832e-12,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2749"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-42.61165,283.7891)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2751"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2753"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(133,70.99999)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2791"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-42.61165,283.7891)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2797"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(133,70.99999)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2800"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4e-4,-9.426e-2)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.004384,-145.0004,-71.4625)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2806"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-145.0004,-97.0943)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2809"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-175.6121,212.6949)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2817"
-       id="linearGradient2823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.103262,0,0,1.054917,-163.1228,-76.31138)"
-       x1="174.83363"
-       y1="84.263489"
-       x2="174.74524"
-       y2="105.49083" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4e-4,-26.09426)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2831"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-175.6121,186.6949)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2817"
-       id="linearGradient2858"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.103262,0,0,1.054917,-163.1228,-76.31138)"
-       x1="174.83363"
-       y1="84.263489"
-       x2="174.74524"
-       y2="105.49083" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2860"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-175.6121,212.6949)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2862"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.004384,-145.0004,-71.4625)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2864"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4e-4,-9.426e-2)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.19607843"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="102.58257"
-     inkscape:cy="19.968635"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#fcaf3e"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#729fcf"
-     inkscape:window-width="872"
-     inkscape:window-height="588"
-     inkscape:window-x="921"
-     inkscape:window-y="0"
-     showborder="true"
-     inkscape:showpageshadow="false">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-86.007168"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-108.09009"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.15429"
-       id="guide3111" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Playback Pause</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>media</rdf:li>
-            <rdf:li>pause</rdf:li>
-            <rdf:li>playback</rdf:li>
-            <rdf:li>video</rdf:li>
-            <rdf:li>music</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <g
-       id="g2837">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="path2815"
-         d="M 26.086565,12.829103 L 26.086565,34.982359 L 34.912658,34.982359 L 34.912658,12.829103 L 26.086565,12.829103 z "
-         style="opacity:0.15;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2823);stroke-width:1.99999952;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         id="path2827"
-         d="M 26.4996,13.40575 L 26.4996,34.40575 L 34.4996,34.40575 L 34.4996,13.40575 L 26.4996,13.40575 z "
-         style="color:#000000;fill:url(#radialGradient2809);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2803);stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 26.4996,13.407946 L 26.4996,34.50001 L 34.4996,34.50001 L 34.4996,13.407946 L 26.4996,13.407946 z "
-         id="path2762"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         id="path2811"
-         d="M 27.4996,14.40575 L 27.4996,33.40575 L 33.4996,33.40575 L 33.4996,14.40575 L 27.4996,14.40575 z "
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2800);stroke-width:0.9999997;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="path2479"
-         d="M 28.019106,14.942758 L 28.019106,23.328389 L 33.013048,22.70967 L 33.013048,14.85437 L 28.019106,14.942758 z "
-         style="opacity:0.5;color:#000000;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    </g>
-    <g
-       id="use2844"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="translate(-12.97229,0)">
-      <path
-         style="opacity:0.15;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2858);stroke-width:1.99999952;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 26.086565,12.829103 L 26.086565,34.982359 L 34.912658,34.982359 L 34.912658,12.829103 L 26.086565,12.829103 z "
-         id="path2848"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         style="color:#000000;fill:url(#radialGradient2860);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 26.4996,13.40575 L 26.4996,34.40575 L 34.4996,34.40575 L 34.4996,13.40575 L 26.4996,13.40575 z "
-         id="path2850"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="path2852"
-         d="M 26.4996,13.407946 L 26.4996,34.50001 L 34.4996,34.50001 L 34.4996,13.407946 L 26.4996,13.407946 z "
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2862);stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2864);stroke-width:0.9999997;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 27.4996,14.40575 L 27.4996,33.40575 L 33.4996,33.40575 L 33.4996,14.40575 L 27.4996,14.40575 z "
-         id="path2854"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         style="opacity:0.5;color:#000000;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         d="M 28.019106,14.942758 L 28.019106,25.007768 L 33.013048,24.389049 L 33.013048,14.85437 L 28.019106,14.942758 z "
-         id="path2856"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-playback-start.svg Deleted

@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-playback-start.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient2684">
-      <stop
-         id="stop2686"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2688"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         style="stop-color:#adb0a8;stop-opacity:1;"
-         offset="0"
-         id="stop5077" />
-      <stop
-         style="stop-color:#464744;stop-opacity:1"
-         offset="1"
-         id="stop5079" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2691"
-       inkscape:collect="always">
-      <stop
-         id="stop2693"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop2695"
-         offset="1"
-         style="stop-color:#d3d7cf" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3340">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3342" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.62886596;"
-         offset="1"
-         id="stop3344" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient2306"
-       gradientUnits="userSpaceOnUse"
-       x1="71.288956"
-       y1="124.11652"
-       x2="70.826942"
-       y2="95"
-       gradientTransform="translate(-45.00042,-71.09425)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2691"
-       id="radialGradient2314"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.324342e-2,-0.836238,2.019473,0.128568,-151.9195,108.0768)"
-       cx="107.5884"
-       cy="83.990814"
-       fx="107.5884"
-       fy="83.990814"
-       r="12.551644" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2684"
-       id="linearGradient2690"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.128181,0,0,1.128181,-53.99314,-83.36009)"
-       x1="70.913956"
-       y1="101.74152"
-       x2="70.951942"
-       y2="88.923729" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.19607843"
-     inkscape:pageopacity="0.0000000"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="44.575512"
-     inkscape:cy="12.980288"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#555753"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#555753"
-     inkscape:window-width="872"
-     inkscape:window-height="586"
-     inkscape:window-x="326"
-     inkscape:window-y="561"
-     showborder="true"
-     inkscape:showpageshadow="false">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-86.007168"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-108.09009"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.15429"
-       id="guide3111" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Playback Start</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>play</rdf:li>
-            <rdf:li>media</rdf:li>
-            <rdf:li>music</rdf:li>
-            <rdf:li>video</rdf:li>
-            <rdf:li>player</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="contorno"
-     style="display:inline" />
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:nodetypes="cccc"
-       id="path2682"
-       d="M 12,39.5 L 12,9 L 38.06998,23.817079 L 12,39.5 z "
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2690);stroke-width:1.99999833;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;opacity:0.15"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:url(#radialGradient2314);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 12.49946,37.81149 L 12.49946,10.000005 L 36.602747,23.905748 L 12.49946,37.81149 z "
-       id="path3375"
-       sodipodi:nodetypes="cccc" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2306);stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 12.49946,37.81149 L 12.49946,10.000005 L 36.602747,23.905748 L 12.49946,37.81149 z "
-       id="path2479"
-       sodipodi:nodetypes="cccc" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 12.99946,10.87449 L 12.99946,36.93699 L 35.59321,23.90574 L 12.99946,10.87449 z M 13.99946,12.62449 L 33.56196,23.90574 L 13.99946,35.18699 L 13.99946,12.62449 z "
-       id="path2481"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 13.9375,12.5625 L 13.9375,24.25 C 18.206698,24.205215 23.101656,23.904436 31,22.375 L 13.9375,12.5625 z "
-       id="path2339"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-playback-stop.svg Deleted

@@ -1,640 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-playback-stop.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   version="1.0"
-   inkscape:r_cx="true"
-   inkscape:r_cy="true">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient2817">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2819" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48453608;"
-         offset="1"
-         id="stop2821" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2697">
-      <stop
-         id="stop2699"
-         offset="0"
-         style="stop-color:#babdb6" />
-      <stop
-         id="stop2701"
-         offset="1"
-         style="stop-color:#555753" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2679"
-       inkscape:collect="always">
-      <stop
-         id="stop2681"
-         offset="0"
-         style="stop-color:#f7f7f7;stop-opacity:1" />
-      <stop
-         id="stop2683"
-         offset="1"
-         style="stop-color:#ccd0c7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3081">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3083" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3085" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2112"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-42.61165,283.7891)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2122"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2124"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(133,70.99999)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2137"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.473733e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2139"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,-1.416456e-12,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2725"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.526469e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2727"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,-1.432388e-12,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2729"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-42.61165,283.7891)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2731"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2733"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(133,70.99999)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2745"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.579205e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2747"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,-1.44832e-12,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2749"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-42.61165,283.7891)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2751"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2753"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(133,70.99999)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2791"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-42.61165,283.7891)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,0)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2797"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(133,70.99999)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2800"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4e-4,-9.426e-2)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.004384,-145.0004,-71.4625)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2806"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-145.0004,-97.0943)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2809"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-175.6121,212.6949)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2817"
-       id="linearGradient2823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.103262,0,0,1.054917,-163.1228,-76.31138)"
-       x1="174.83363"
-       y1="84.263489"
-       x2="174.74524"
-       y2="105.49083" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4e-4,-26.09426)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2831"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-175.6121,186.6949)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2817"
-       id="linearGradient2858"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.103262,0,0,1.054917,-163.1228,-76.31138)"
-       x1="174.83363"
-       y1="84.263489"
-       x2="174.74524"
-       y2="105.49083" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient2860"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.562309e-6,-1.07205,1.992104,-1.250658e-6,-175.6121,212.6949)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient2862"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.004384,-145.0004,-71.4625)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient2864"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4e-4,-9.426e-2)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3081"
-       id="linearGradient3421"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.000198,0,0,1,-67.006,-9.426e-2)"
-       x1="15.089521"
-       y1="15.291994"
-       x2="14"
-       y2="52.510574" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2697"
-       id="linearGradient3424"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.498884,0,0,1.004384,-414.0618,-71.4625)"
-       x1="169"
-       y1="110.33805"
-       x2="169"
-       y2="93.204849" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient3427"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.905772e-6,-1.07205,4.98026,-1.250658e-6,-490.7792,212.6949)"
-       cx="169.77171"
-       cy="100.20107"
-       fx="169.77171"
-       fy="100.20107"
-       r="11" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2817"
-       id="linearGradient3430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.624525,0,0,1.054917,-436.1019,-76.31138)"
-       x1="174.83363"
-       y1="84.263489"
-       x2="174.74524"
-       y2="105.49083" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.19607843"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="40.346982"
-     inkscape:cy="25.719637"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#fcaf3e"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#729fcf"
-     inkscape:window-width="872"
-     inkscape:window-height="588"
-     inkscape:window-x="921"
-     inkscape:window-y="0"
-     showborder="true"
-     inkscape:showpageshadow="false">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-86.007168"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-108.09009"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.15429"
-       id="guide3111" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Playback Pause</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>media</rdf:li>
-            <rdf:li>stop</rdf:li>
-            <rdf:li>playback</rdf:li>
-            <rdf:li>video</rdf:li>
-            <rdf:li>music</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline"
-     inkscape:r_cx="true"
-     inkscape:r_cy="true">
-    <path
-       style="opacity:0.15;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3430);stroke-width:1.99999952;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 14.00382,12.829103 L 14.00382,34.982359 L 35.000004,34.982359 L 35.000004,12.829103 L 14.00382,12.829103 z "
-       id="path2815"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:url(#radialGradient3427);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 14.5,13.40575 L 14.5,34.40575 L 34.5,34.40575 L 34.5,13.40575 L 14.5,13.40575 z "
-       id="path2827" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path2762"
-       d="M 14.496737,13.407946 L 14.496737,34.50001 L 34.487808,34.50001 L 34.487808,13.407946 L 14.496737,13.407946 z "
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3424);stroke-width:0.99999952;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3421);stroke-width:0.99999976;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 15.499412,14.40575 L 15.499412,33.40575 L 33.500595,33.40575 L 33.500595,14.40575 L 15.499412,14.40575 z "
-       id="path2811" />
-    <path
-       style="opacity:0.5;color:#000000;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 16,14.942758 L 16,25.5 L 33,22.70967 L 33,14.85437 L 16,14.942758 z "
-       id="path2479"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-record.svg Deleted

@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-record.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient3837">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3839" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.78350514;"
-         offset="1"
-         id="stop3841" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2257">
-      <stop
-         style="stop-color:#ef2929"
-         offset="0"
-         id="stop2259" />
-      <stop
-         style="stop-color:#cc0000"
-         offset="1"
-         id="stop2261" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3340">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3342" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3344" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2228"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,-3.241652e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3340"
-       id="radialGradient1368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.658819,-3.13388e-16,1.719536e-16,2.080782,-62.4164,12.76204)"
-       cx="21.929186"
-       cy="-3.2182934"
-       fx="21.929186"
-       fy="-3.2182934"
-       r="13" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2257"
-       id="radialGradient2263"
-       cx="22.5"
-       cy="28.116049"
-       fx="22.5"
-       fy="28.116049"
-       r="14.537862"
-       gradientTransform="matrix(2.365562,-4.942242e-16,5.359766e-16,2.202845,-30.72517,-34.23996)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3837"
-       id="linearGradient3843"
-       x1="21.702389"
-       y1="8.9115314"
-       x2="21.816015"
-       y2="35.546108"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2257"
-       id="radialGradient3845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.365562,-4.942242e-16,5.359766e-16,2.202845,-30.72517,-34.23996)"
-       cx="22.5"
-       cy="28.116049"
-       fx="22.5"
-       fy="28.116049"
-       r="14.537862" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.11372549"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="36.499233"
-     inkscape:cy="34.59508"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#ef2929"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#ef2929"
-     inkscape:window-width="872"
-     inkscape:window-height="672"
-     inkscape:window-x="494"
-     inkscape:window-y="344"
-     showborder="true"
-     inkscape:showpageshadow="false">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-86.007168"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-108.09009"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.15429"
-       id="guide3111" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Record</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>media</rdf:li>
-            <rdf:li>player</rdf:li>
-            <rdf:li>record</rdf:li>
-            <rdf:li>music</rdf:li>
-            <rdf:li>sound</rdf:li>
-            <rdf:li>video</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       transform="matrix(0.920697,0,0,0.99358,3.679484,1.641236)"
-       d="M 36.5 22 A 14 13 0 1 1  8.5,22 A 14 13 0 1 1  36.5 22 z"
-       sodipodi:ry="13"
-       sodipodi:rx="14"
-       sodipodi:cy="22"
-       sodipodi:cx="22.5"
-       id="path3835"
-       style="opacity:0.15;color:#000000;fill:url(#radialGradient3845);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3843);stroke-width:3.13661647;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       sodipodi:type="arc"
-       style="opacity:0.03999999;color:#000000;fill:url(#radialGradient2228);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2226"
-       sodipodi:cx="24.837126"
-       sodipodi:cy="36.421127"
-       sodipodi:rx="15.644737"
-       sodipodi:ry="8.3968935"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       transform="matrix(1.150533,0,0,0.565685,-4.5765,16.55285)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#radialGradient2263);fill-opacity:1.0;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.0757246;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2525"
-       sodipodi:cx="22.5"
-       sodipodi:cy="22"
-       sodipodi:rx="14"
-       sodipodi:ry="13"
-       d="M 36.5 22 A 14 13 0 1 1  8.5,22 A 14 13 0 1 1  36.5 22 z"
-       transform="matrix(0.894862,0,0,0.9657,3.855776,2.660348)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f77d7d;stroke-width:1.21739173;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2527"
-       sodipodi:cx="24"
-       sodipodi:cy="24"
-       sodipodi:rx="14"
-       sodipodi:ry="14"
-       d="M 38 24 A 14 14 0 1 1  10,24 A 14 14 0 1 1  38 24 z"
-       transform="matrix(0.821429,0,0,0.821429,4.285117,4.191455)" />
-    <path
-       style="opacity:0.6;fill:url(#radialGradient1368);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       d="M 23.84315,11.90574 C 17.563618,11.985335 12.438727,16.897799 12.03065,23.09324 C 18.148473,25.61002 25.90107,21.642017 35.172655,19.711354 C 34.484245,16.962785 30.617935,11.90574 23.9994,11.90574 C 23.947693,11.90574 23.894703,11.905087 23.84315,11.90574 z "
-       id="path2529"
-       sodipodi:nodetypes="cccsc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-seek-backward.svg Deleted

@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-seek-backward.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         style="stop-color:#adb0a8;stop-opacity:1;"
-         offset="0"
-         id="stop5077" />
-      <stop
-         style="stop-color:#464744;stop-opacity:1"
-         offset="1"
-         id="stop5079" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2679"
-       inkscape:collect="always">
-      <stop
-         id="stop2681"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop2683"
-         offset="1"
-         style="stop-color:#d3d7cf" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         id="stop2593"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2595"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.095103e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient1401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-47.9996,-121)"
-       x1="54.988514"
-       y1="156"
-       x2="54.896976"
-       y2="142.18799" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient1426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-44.99051,-97.26213)"
-       x1="49.430401"
-       y1="112.94963"
-       x2="49.667324"
-       y2="115.13713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-290.946,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-308.946,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2316"
-       id="linearGradient2322"
-       x1="24.476166"
-       y1="13.658564"
-       x2="23.750401"
-       y2="36"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15294118"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="65.199418"
-     inkscape:cy="17.655272"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#fcaf3e"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#729fcf"
-     inkscape:window-width="1144"
-     inkscape:window-height="808"
-     inkscape:window-x="471"
-     inkscape:window-y="34"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     borderlayer="top">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-87.043372"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-102.03286"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.04058"
-       id="guide3111" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-92.545841"
-       id="guide1879" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Seek Backward</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="cccccccc"
-       id="path1441"
-       d="M 23.5004,13.5 L 6.0004,24 L 23.5004,34.5 L 23.5004,13.5 z M 41.5004,13.5 L 24.0004,24 L 41.5004,34.5 L 41.5004,13.5 z "
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2322);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;opacity:0.15" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       sodipodi:nodetypes="cccc"
-       id="path5515"
-       d="M 23.5004,13.5 L 6.0004,24 L 23.5004,34.5 L 23.5004,13.5 z "
-       style="color:#000000;fill:url(#radialGradient1439);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:url(#radialGradient1436);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 41.5004,13.5 L 24.0004,24 L 41.5004,34.5 L 41.5004,13.5 z "
-       id="use5517"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="ccccccccc"
-       style="opacity:0.07027025;color:#000000;fill:url(#linearGradient1426);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 41.5004,13.5 L 40.3129,14.21875 L 41.5004,14.09375 L 41.5004,13.5 z M 23.5004,13.75 L 23.03165,13.78125 L 19.0629,16.15625 L 23.5004,15.75 L 23.5004,13.75 z "
-       id="path2915" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1401);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 23.5004,13.5 L 6.0004,24 L 23.5004,34.5 L 23.5004,13.5 z M 41.5004,13.5 L 24.0004,24 L 41.5004,34.5 L 41.5004,13.5 z "
-       id="path5521"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 23.0004,14.375 L 6.96915,24 L 23.0004,33.625 L 23.0004,14.375 z M 41.0004,14.375 L 24.96915,24 L 41.0004,33.625 L 41.0004,14.375 z M 22.0004,16.15625 L 22.0004,31.84375 L 8.90665,24 L 22.0004,16.15625 z M 40.0004,16.15625 L 40.0004,31.84375 L 26.90665,24 L 40.0004,16.15625 z "
-       id="path5525"
-       sodipodi:nodetypes="cccccccccccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.56111111;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 9.9375,23.375 L 21.9375,16.1875 L 21.9375,22.9375 L 9.9375,23.375 z "
-       id="path3197"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path4072"
-       d="M 29.3125,22.5 L 40,16.1875 L 40,21.9375 L 29.3125,22.5 z "
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-seek-forward.svg Deleted

@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-seek-forward.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         style="stop-color:#adb0a8;stop-opacity:1;"
-         offset="0"
-         id="stop5077" />
-      <stop
-         style="stop-color:#464744;stop-opacity:1"
-         offset="1"
-         id="stop5079" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2679"
-       inkscape:collect="always">
-      <stop
-         id="stop2681"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop2683"
-         offset="1"
-         style="stop-color:#d3d7cf" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         id="stop2593"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2595"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.094188e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient1401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,95.99994,-121)"
-       x1="53.499996"
-       y1="158.41438"
-       x2="53.499996"
-       y2="142.05258" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient1426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,92.99085,-97.26213)"
-       x1="49.430401"
-       y1="112.94963"
-       x2="49.667324"
-       y2="115.13713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,338.9463,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,356.9463,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2316"
-       id="linearGradient2322"
-       x1="24.476166"
-       y1="13.658564"
-       x2="23.750401"
-       y2="36"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,48.00034,0)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15294118"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="75.20527"
-     inkscape:cy="3.7129274"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#fcaf3e"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#729fcf"
-     inkscape:window-width="1144"
-     inkscape:window-height="808"
-     inkscape:window-x="499"
-     inkscape:window-y="62"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     borderlayer="top">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-87.043372"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-102.03286"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.04058"
-       id="guide3111" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-92.545841"
-       id="guide1879" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Seek Forward</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="cccccccc"
-       id="path1441"
-       d="M 24.499943,13.5 L 41.999943,24 L 24.499943,34.5 L 24.499943,13.5 z M 6.4999427,13.5 L 23.999943,24 L 6.4999427,34.5 L 6.4999427,13.5 z "
-       style="opacity:0.15;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2322);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       sodipodi:nodetypes="cccc"
-       id="path5515"
-       d="M 24.499943,13.5 L 41.999943,24 L 24.499943,34.5 L 24.499943,13.5 z "
-       style="color:#000000;fill:url(#radialGradient1439);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:url(#radialGradient1436);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 6.4999427,13.5 L 23.999943,24 L 6.4999427,34.5 L 6.4999427,13.5 z "
-       id="use5517"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="ccccccccc"
-       style="opacity:0.07027025;color:#000000;fill:url(#linearGradient1426);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 6.4999427,13.5 L 7.6874427,14.21875 L 6.4999427,14.09375 L 6.4999427,13.5 z M 24.499943,13.75 L 24.968693,13.78125 L 28.937443,16.15625 L 24.499943,15.75 L 24.499943,13.75 z "
-       id="path2915" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1401);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 24.499943,13.5 L 41.999943,24 L 24.499943,34.5 L 24.499943,13.5 z M 6.4999427,13.5 L 23.999943,24 L 6.4999427,34.5 L 6.4999427,13.5 z "
-       id="path5521"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 24.999943,14.375 L 41.031193,24 L 24.999943,33.625 L 24.999943,14.375 z M 6.9999427,14.375 L 23.031193,24 L 6.9999427,33.625 L 6.9999427,14.375 z M 25.999943,16.15625 L 25.999943,31.84375 L 39.093693,24 L 25.999943,16.15625 z M 7.9999427,16.15625 L 7.9999427,31.84375 L 21.093693,24 L 7.9999427,16.15625 z "
-       id="path5525"
-       sodipodi:nodetypes="cccccccccccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 35.587969,21.78401 L 26.062843,16.1875 L 26.062843,22.230393 L 35.587969,21.78401 z "
-       id="path3197"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path4072"
-       d="M 20.278833,23.207107 L 8.0003427,16.1875 L 8.0003427,24.05882 L 20.278833,23.207107 z "
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-skip-backward.svg Deleted

@@ -1,1014 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-skip-backward.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         style="stop-color:#adb0a8;stop-opacity:1;"
-         offset="0"
-         id="stop5077" />
-      <stop
-         style="stop-color:#464744;stop-opacity:1"
-         offset="1"
-         id="stop5079" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2679"
-       inkscape:collect="always">
-      <stop
-         id="stop2681"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop2683"
-         offset="1"
-         style="stop-color:#d3d7cf" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         id="stop2593"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2595"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,3.953052e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient1401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-45.99994,-121)"
-       x1="55.886486"
-       y1="157.70728"
-       x2="55.936192"
-       y2="142.93646" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient1426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-42.99085,-97.26213)"
-       x1="49.430401"
-       y1="112.94963"
-       x2="49.667324"
-       y2="115.13713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-288.9463,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-306.9463,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2316"
-       id="linearGradient2322"
-       x1="24.476166"
-       y1="13.658564"
-       x2="23.750401"
-       y2="36"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,46.00034,0)" />
-    <radialGradient
-       r="8.75"
-       fy="146.18817"
-       fx="64.214218"
-       cy="146.18817"
-       cx="64.214218"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1535"
-       xlink:href="#linearGradient2679"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="142.03874"
-       x2="89.066872"
-       y1="155.00908"
-       x1="90"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,326,290)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2331"
-       xlink:href="#linearGradient5075"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="140.03592"
-       x2="89"
-       y1="149.4554"
-       x1="89"
-       gradientTransform="matrix(-1,0,0,-1,326,290)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2329"
-       xlink:href="#linearGradient2591"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="142.00146"
-       x2="49"
-       y1="155"
-       x1="52.048431"
-       gradientTransform="translate(-326,-290)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2327"
-       xlink:href="#linearGradient2591"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="113.80963"
-       x2="56.941994"
-       y1="107.94752"
-       x1="55.934441"
-       gradientTransform="translate(146.4002,36.96061)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2325"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="106.38314"
-       x2="54.712406"
-       y1="102.97689"
-       x1="54.346024"
-       gradientTransform="translate(146.4002,36.96061)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2323"
-       xlink:href="#linearGradient2584"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="101.35189"
-       x2="53.201031"
-       y1="99.445641"
-       x1="53.017841"
-       gradientTransform="translate(146.4002,36.96061)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2321"
-       xlink:href="#linearGradient2584"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="122.29481"
-       x2="54.390476"
-       y1="116.38297"
-       x1="53.931114"
-       gradientTransform="translate(146.4002,36.96061)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2319"
-       xlink:href="#linearGradient2584"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.75"
-       fy="146.18817"
-       fx="64.214218"
-       cy="146.18817"
-       cx="64.214218"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2317"
-       xlink:href="#linearGradient2679"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.75"
-       fy="147.99352"
-       fx="64.227074"
-       cy="147.99352"
-       cx="64.227074"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,604.946,141.8517)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2315"
-       xlink:href="#linearGradient2679"
-       inkscape:collect="always" />
-    <radialGradient
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       gradientTransform="matrix(1,0,0,0.536723,-1.836182e-12,16.87306)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2313"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4219">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4221" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0"
-         offset="1"
-         id="stop4223" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4207">
-      <stop
-         id="stop4209"
-         offset="0"
-         style="stop-color:#adb0a8;stop-opacity:1;" />
-      <stop
-         id="stop4211"
-         offset="1"
-         style="stop-color:#464744;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4201">
-      <stop
-         id="stop4203"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4205"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient4276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,-1.893136e-12,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4278"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,604.946,141.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4280"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4282"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4284"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4288"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4290"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4292"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-326,-290)"
-       x1="52.048431"
-       y1="155"
-       x2="49"
-       y2="142.00146" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4294"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,326,290)"
-       x1="89"
-       y1="149.4554"
-       x2="89"
-       y2="140.03592" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient4296"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,326,290)"
-       x1="90"
-       y1="155.00908"
-       x2="89.066872"
-       y2="142.03874" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4313"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,604.946,141.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4317"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4319"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4321"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4323"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4325"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4327"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-326,-290)"
-       x1="52.048431"
-       y1="155"
-       x2="49"
-       y2="142.00146" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4329"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,326,290)"
-       x1="89"
-       y1="149.4554"
-       x2="89"
-       y2="140.03592" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient4331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,326,290)"
-       x1="90"
-       y1="155.00908"
-       x2="89.066872"
-       y2="142.03874" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient4334"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,203.7502,196.75)"
-       x1="90"
-       y1="155.00908"
-       x2="89.066872"
-       y2="142.03874" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,203.7502,196.75)"
-       x1="89"
-       y1="149.4554"
-       x2="89"
-       y2="140.03592" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,604.946,141.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4360"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4362"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4364"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.222659,-0.996273,2.129992,0.476041,-323.9464,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4379"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4381"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4383"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4386"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(62.1504,-56.28938)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4389"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(62.1504,-56.28938)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4392"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(62.1504,-56.28938)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4395"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(62.1504,-56.28938)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4397"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4402"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,431.3526,205.2376)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4405"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,449.3526,205.2376)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient4413"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,4.681043e-17,4.681043e-17,-1,-45.0004,169)"
-       x1="54"
-       y1="131.27296"
-       x2="54"
-       y2="145" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2316"
-       id="linearGradient5293"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.99966,0)"
-       x1="24.476166"
-       y1="13.658564"
-       x2="23.750401"
-       y2="36" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15294118"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="39.545537"
-     inkscape:cy="17.377251"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#fcaf3e"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#729fcf"
-     inkscape:window-width="1144"
-     inkscape:window-height="808"
-     inkscape:window-x="654"
-     inkscape:window-y="97"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     borderlayer="top">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-87.043372"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-102.03286"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.04058"
-       id="guide3111" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-92.545841"
-       id="guide1879" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Skip Backward</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:0.15;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5293);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 43.5,13.5 L 43.5,34.5 L 26,24 L 43.5,13.5 z M 25.5,13.5 L 25.5,34.5 L 8.5,24.3125 L 8.5,34.5 L 3.5,34.5 L 3.5,13.5 L 8.5,13.5 L 8.5,23.6875 L 25.5,13.5 z "
-       id="path5288"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       sodipodi:nodetypes="cccc"
-       id="path5515"
-       d="M 25.500057,13.5 L 8.000057,24 L 25.500057,34.5 L 25.500057,13.5 z "
-       style="color:#000000;fill:url(#radialGradient1439);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:url(#radialGradient1436);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 43.500057,13.5 L 26.000057,24 L 43.500057,34.5 L 43.500057,13.5 z "
-       id="use5517"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="ccccccccc"
-       style="opacity:0.07027025;color:#000000;fill:url(#linearGradient1426);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 43.500057,13.5 L 42.312557,14.21875 L 43.500057,14.09375 L 43.500057,13.5 z M 25.500057,13.75 L 25.031307,13.78125 L 21.062557,16.15625 L 25.500057,15.75 L 25.500057,13.75 z "
-       id="path2915" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1401);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 25.500057,13.5 L 8.000057,24 L 25.500057,34.5 L 25.500057,13.5 z M 43.500057,13.5 L 26.000057,24 L 43.500057,34.5 L 43.500057,13.5 z "
-       id="path5521"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 25.000057,14.375 L 8.968807,24 L 25.000057,33.625 L 25.000057,14.375 z M 43.000057,14.375 L 26.968807,24 L 43.000057,33.625 L 43.000057,14.375 z M 24.000057,16.15625 L 24.000057,31.84375 L 10.906307,24 L 24.000057,16.15625 z M 42.000057,16.15625 L 42.000057,31.84375 L 28.906307,24 L 42.000057,16.15625 z "
-       id="path5525"
-       sodipodi:nodetypes="cccccccccccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 12.412031,23.15901 L 23.999657,16.1875 L 23.999657,22.230393 L 12.412031,23.15901 z "
-       id="path3197"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path4072"
-       d="M 31.971167,22.144607 L 41.999657,16.1875 L 41.999657,21.74632 L 31.971167,22.144607 z "
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="color:#000000;fill:url(#radialGradient4375);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 8.5,13.499999 L 3.5,13.499999 L 3.5,34.499999 L 8.5,34.499999 L 8.5,13.499999 z "
-       id="path3110"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       transform="scale(1,-1)"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1923"
-       width="3"
-       height="19"
-       x="4.4996033"
-       y="-33.5" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4413);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 3.4996,34.499999 L 3.4996,13.499999 L 8.4996,13.499999 L 8.4996,34.499999 L 3.4996,34.499999 z "
-       id="path1935"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7,24.3125 L 5.043263,24.649549 L 5.043263,15.031146 L 7.076195,15.031146 L 7,24.3125 z "
-       id="path5291"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/media-skip-forward.svg Deleted

@@ -1,1002 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-skip-forward.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309">
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         style="stop-color:#adb0a8;stop-opacity:1;"
-         offset="0"
-         id="stop5077" />
-      <stop
-         style="stop-color:#464744;stop-opacity:1"
-         offset="1"
-         id="stop5079" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2679"
-       inkscape:collect="always">
-      <stop
-         id="stop2681"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop2683"
-         offset="1"
-         style="stop-color:#d3d7cf" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         id="stop2593"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2595"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,3.953052e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient1401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,93.99994,-121)"
-       x1="55.613514"
-       y1="157.56604"
-       x2="55.771976"
-       y2="140.31299" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient1426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,90.99085,-97.26213)"
-       x1="49.430401"
-       y1="112.94963"
-       x2="49.667324"
-       y2="115.13713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,336.9463,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,354.9463,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2316"
-       id="linearGradient2322"
-       x1="24.476166"
-       y1="13.658564"
-       x2="23.750401"
-       y2="36"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,46.00034,0)" />
-    <radialGradient
-       r="8.75"
-       fy="146.18817"
-       fx="64.214218"
-       cy="146.18817"
-       cx="64.214218"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1535"
-       xlink:href="#linearGradient2679"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="142.03874"
-       x2="89.066872"
-       y1="155.00908"
-       x1="90"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,326,290)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2331"
-       xlink:href="#linearGradient5075"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="140.03592"
-       x2="89"
-       y1="149.4554"
-       x1="89"
-       gradientTransform="matrix(-1,0,0,-1,326,290)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2329"
-       xlink:href="#linearGradient2591"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="142.00146"
-       x2="49"
-       y1="155"
-       x1="52.048431"
-       gradientTransform="translate(-326,-290)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2327"
-       xlink:href="#linearGradient2591"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="113.80963"
-       x2="56.941994"
-       y1="107.94752"
-       x1="55.934441"
-       gradientTransform="translate(146.4002,36.96061)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2325"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="106.38314"
-       x2="54.712406"
-       y1="102.97689"
-       x1="54.346024"
-       gradientTransform="translate(146.4002,36.96061)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2323"
-       xlink:href="#linearGradient2584"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="101.35189"
-       x2="53.201031"
-       y1="99.445641"
-       x1="53.017841"
-       gradientTransform="translate(146.4002,36.96061)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2321"
-       xlink:href="#linearGradient2584"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="122.29481"
-       x2="54.390476"
-       y1="116.38297"
-       x1="53.931114"
-       gradientTransform="translate(146.4002,36.96061)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2319"
-       xlink:href="#linearGradient2584"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.75"
-       fy="146.18817"
-       fx="64.214218"
-       cy="146.18817"
-       cx="64.214218"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2317"
-       xlink:href="#linearGradient2679"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.75"
-       fy="147.99352"
-       fx="64.227074"
-       cy="147.99352"
-       cx="64.227074"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,604.946,141.8517)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2315"
-       xlink:href="#linearGradient2679"
-       inkscape:collect="always" />
-    <radialGradient
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       gradientTransform="matrix(1,0,0,0.536723,-1.836182e-12,16.87306)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2313"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4219">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4221" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0"
-         offset="1"
-         id="stop4223" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4207">
-      <stop
-         id="stop4209"
-         offset="0"
-         style="stop-color:#adb0a8;stop-opacity:1;" />
-      <stop
-         id="stop4211"
-         offset="1"
-         style="stop-color:#464744;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4201">
-      <stop
-         id="stop4203"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4205"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient4276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,-1.893136e-12,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4278"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,604.946,141.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4280"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4282"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4284"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4288"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4290"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4292"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-326,-290)"
-       x1="52.048431"
-       y1="155"
-       x2="49"
-       y2="142.00146" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4294"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,326,290)"
-       x1="89"
-       y1="149.4554"
-       x2="89"
-       y2="140.03592" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient4296"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,326,290)"
-       x1="90"
-       y1="155.00908"
-       x2="89.066872"
-       y2="142.03874" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4313"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,604.946,141.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4317"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4319"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4321"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4323"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4325"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4327"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-326,-290)"
-       x1="52.048431"
-       y1="155"
-       x2="49"
-       y2="142.00146" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4329"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,326,290)"
-       x1="89"
-       y1="149.4554"
-       x2="89"
-       y2="140.03592" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient4331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,326,290)"
-       x1="90"
-       y1="155.00908"
-       x2="89.066872"
-       y2="142.03874" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient4334"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,203.7502,196.75)"
-       x1="90"
-       y1="155.00908"
-       x2="89.066872"
-       y2="142.03874" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2591"
-       id="linearGradient4337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,203.7502,196.75)"
-       x1="89"
-       y1="149.4554"
-       x2="89"
-       y2="140.03592" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,604.946,141.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4360"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4362"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4364"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,371.9464,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4379"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4381"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4383"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.4002,36.96061)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="linearGradient4386"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(62.1504,-56.28938)"
-       x1="55.934441"
-       y1="107.94752"
-       x2="56.941994"
-       y2="113.80963" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4389"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(62.1504,-56.28938)"
-       x1="54.346024"
-       y1="102.97689"
-       x2="54.712406"
-       y2="106.38314" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4392"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(62.1504,-56.28938)"
-       x1="53.017841"
-       y1="99.445641"
-       x2="53.201031"
-       y2="101.35189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient4395"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(62.1504,-56.28938)"
-       x1="53.931114"
-       y1="116.38297"
-       x2="54.390476"
-       y2="122.29481" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4397"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,486.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,468.602,298.4876)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4402"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,431.3526,205.2376)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient4405"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.264218,-0.986066,-2.238896,-0.59991,449.3526,205.2376)"
-       cx="64.214218"
-       cy="146.18817"
-       fx="64.214218"
-       fy="146.18817"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient4413"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,4.681043e-17,-4.681043e-17,-1,93.0004,169)"
-       x1="54"
-       y1="132.5"
-       x2="54"
-       y2="145" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15294118"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="56.124329"
-     inkscape:cy="31.787027"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true"
-     fill="#fcaf3e"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#729fcf"
-     inkscape:window-width="1144"
-     inkscape:window-height="808"
-     inkscape:window-x="599"
-     inkscape:window-y="41"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     borderlayer="top">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-87.043372"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-102.03286"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.04058"
-       id="guide3111" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-92.545841"
-       id="guide1879" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Skip Forward</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2322);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;opacity:0.15"
-       d="M 4.5 13.5 L 4.5 34.5 L 22 24 L 4.5 13.5 z M 22.5 13.5 L 22.5 34.5 L 39.5 24.3125 L 39.5 34.5 L 44.5 34.5 L 44.5 13.5 L 39.5 13.5 L 39.5 23.6875 L 22.5 13.5 z "
-       id="path5288" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       sodipodi:nodetypes="cccc"
-       id="path5515"
-       d="M 22.499943,13.5 L 39.999943,24 L 22.499943,34.5 L 22.499943,13.5 z "
-       style="color:#000000;fill:url(#radialGradient1439);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:url(#radialGradient1436);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 4.4999427,13.5 L 21.999943,24 L 4.4999427,34.5 L 4.4999427,13.5 z "
-       id="use5517"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="ccccccccc"
-       style="opacity:0.07027025;color:#000000;fill:url(#linearGradient1426);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 4.4999427,13.5 L 5.6874427,14.21875 L 4.4999427,14.09375 L 4.4999427,13.5 z M 22.499943,13.75 L 22.968693,13.78125 L 26.937443,16.15625 L 22.499943,15.75 L 22.499943,13.75 z "
-       id="path2915" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1401);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 22.499943,13.5 L 39.999943,24 L 22.499943,34.5 L 22.499943,13.5 z M 4.4999427,13.5 L 21.999943,24 L 4.4999427,34.5 L 4.4999427,13.5 z "
-       id="path5521"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 22.999943,14.375 L 39.031193,24 L 22.999943,33.625 L 22.999943,14.375 z M 4.9999427,14.375 L 21.031193,24 L 4.9999427,33.625 L 4.9999427,14.375 z M 23.999943,16.15625 L 23.999943,31.84375 L 37.093693,24 L 23.999943,16.15625 z M 5.9999427,16.15625 L 5.9999427,31.84375 L 19.093693,24 L 5.9999427,16.15625 z "
-       id="path5525"
-       sodipodi:nodetypes="cccccccccccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 33.587969,21.78401 L 24.062843,16.1875 L 24.062843,22.230393 L 33.587969,21.78401 z "
-       id="path3197"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path4072"
-       d="M 18.278833,23.207107 L 6.0003427,16.1875 L 6.0003427,24.05882 L 18.278833,23.207107 z "
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="color:#000000;fill:url(#radialGradient4375);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 39.5,13.499999 L 44.5,13.499999 L 44.5,34.499999 L 39.5,34.499999 L 39.5,13.499999 z "
-       id="path3110"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       transform="scale(-1,-1)"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1923"
-       width="3"
-       height="19"
-       x="-43.500397"
-       y="-33.5" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4413);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 44.5004,34.499999 L 44.5004,13.499999 L 39.5004,13.499999 L 39.5004,34.499999 L 44.5004,34.499999 z "
-       id="path1935"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 41,22 L 42.956737,21.837049 L 42.956737,15.031146 L 40.923805,15.031146 L 41,22 z "
-       id="path5291"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/preferences-desktop-remote-desktop.svg Deleted

@@ -1,1479 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3440"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps"
-   sodipodi:docname="preferences-desktop-remote-desktop.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective227" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2733"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2729"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2725"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2721"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2711">
-      <stop
-         id="stop2713"
-         offset="0.0000000"
-         style="stop-color:#909090;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2715"
-         offset="1.0000000"
-         style="stop-color:#bebebe;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       id="linearGradient2717"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2667">
-      <stop
-         id="stop2669"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2671"
-         offset="1.0000000"
-         style="stop-color:#fcfcff;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="26.729263"
-       x2="17.199417"
-       y1="1.6537577"
-       x1="11.492236"
-       gradientTransform="matrix(1.187725,0,0,0.845165,5.790998,2.901059)"
-       id="linearGradient2673"
-       xlink:href="#linearGradient2667"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2415">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2417" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2419" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2415"
-       id="linearGradient2421"
-       gradientTransform="matrix(1.111794,0,0,0.88712,5.762539,4.104218)"
-       x1="17.698339"
-       y1="13.004725"
-       x2="34.974548"
-       y2="55.200756"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2683"
-       inkscape:collect="always">
-      <stop
-         id="stop2685"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop2687"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="162.45061"
-       x2="3.7069974"
-       y1="171.29134"
-       x1="3.7069976"
-       gradientTransform="matrix(5.705159,0,0,0.330801,5.5,-24.10971)"
-       id="linearGradient2689"
-       xlink:href="#linearGradient2683"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2675">
-      <stop
-         id="stop2677"
-         offset="0.0000000"
-         style="stop-color:#5b5b97;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2679"
-         offset="1.0000000"
-         style="stop-color:#1b1b43;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2253">
-      <stop
-         style="stop-color:#8f8f8f;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2255" />
-      <stop
-         style="stop-color:#494949;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2257" />
-    </linearGradient>
-    <linearGradient
-       y2="31.246054"
-       x2="32.536823"
-       y1="5.3817744"
-       x1="10.390738"
-       gradientTransform="matrix(1.112679,0,0,0.909474,4.563508,2.854651)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1561"
-       xlink:href="#linearGradient2253"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2245">
-      <stop
-         style="stop-color:#dde1d9;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2247" />
-      <stop
-         style="stop-color:#cacdc6;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2249" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2245"
-       id="linearGradient2251"
-       gradientTransform="matrix(1.138336,0,0,0.888975,2.926322,1.544513)"
-       x1="8.6116238"
-       y1="7.2293582"
-       x2="34.784473"
-       y2="33.339787"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4750">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4752" />
-      <stop
-         style="stop-color:#fefefe;stop-opacity:1.0000000;"
-         offset="0.37931034"
-         id="stop4758" />
-      <stop
-         style="stop-color:#1d1d1d;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4754" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4350">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4352" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4354" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop4128" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.16494845;"
-         offset="1.0000000"
-         id="stop4130" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4114">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4116" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4118" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3962">
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3964" />
-      <stop
-         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
-         offset="0.15517241"
-         id="stop4134" />
-      <stop
-         style="stop-color:#4074ae;stop-opacity:1.0000000;"
-         offset="0.75000000"
-         id="stop4346" />
-      <stop
-         style="stop-color:#36486c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3966" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3962"
-       id="radialGradient3968"
-       gradientTransform="matrix(1.008876,0,0,1.008898,-0.218353,-0.208728)"
-       cx="18.247644"
-       cy="15.716079"
-       fx="18.247644"
-       fy="15.716079"
-       r="29.993349"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4114"
-       id="radialGradient4120"
-       gradientTransform="scale(1.643990,0.608276)"
-       cx="15.115514"
-       cy="63.965388"
-       fx="15.115514"
-       fy="63.965388"
-       r="12.289036"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient4132"
-       gradientTransform="scale(0.999989,1.000011)"
-       cx="15.601279"
-       cy="12.142302"
-       fx="15.601279"
-       fy="12.142302"
-       r="43.526714"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4350"
-       id="radialGradient4356"
-       gradientTransform="scale(1.179536,0.847791)"
-       cx="11.826907"
-       cy="10.476453"
-       fx="11.826907"
-       fy="10.476453"
-       r="32.664848"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4750"
-       id="radialGradient4756"
-       gradientTransform="scale(1.036822,0.964486)"
-       cx="18.633780"
-       cy="17.486208"
-       fx="18.934305"
-       fy="17.810213"
-       r="40.692665"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1460"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1462"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1466"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1468"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1470"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1474"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1476"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1478"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1482"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1484"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1486"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1490"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1492"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1494"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1498"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1500"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1502"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1506"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1508"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1510"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1514"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1516"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1518"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1522"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1524"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1526"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1528"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1530"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1532"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1534"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1536"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1538"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1540"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1542"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1544"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1546"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1550"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1552"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1554"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       r="40.692665"
-       fy="17.810213"
-       fx="18.934305"
-       cy="17.486208"
-       cx="18.633780"
-       gradientTransform="scale(1.036822,0.964486)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1558"
-       xlink:href="#linearGradient4750"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4114"
-       id="radialGradient2808"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.64399,0.608276)"
-       cx="15.115514"
-       cy="63.965388"
-       fx="15.115514"
-       fy="63.965388"
-       r="12.289036" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4114"
-       id="radialGradient5562"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.64399,0.608276)"
-       cx="15.115514"
-       cy="63.965388"
-       fx="15.115514"
-       fy="63.965388"
-       r="12.289036" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.17254902"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="50.517774"
-     inkscape:cy="-4.02376"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="899"
-     inkscape:window-height="794"
-     inkscape:window-x="535"
-     inkscape:window-y="54"
-     inkscape:showpageshadow="false"
-     stroke="#888a85"
-     fill="#eeeeec" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Remote Desktop</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Tuomas Kuosmanen</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>vnc</rdf:li>
-            <rdf:li>remote</rdf:li>
-            <rdf:li>desktop</rdf:li>
-            <rdf:li>control</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4120);fill-opacity:1.0000000;stroke:none;stroke-opacity:1.0000000;opacity:0.47777778"
-       id="path4112"
-       sodipodi:cx="24.849752"
-       sodipodi:cy="38.908627"
-       sodipodi:rx="20.203051"
-       sodipodi:ry="7.4751287"
-       d="M 45.052803 38.908627 A 20.203051 7.4751287 0 1 1  4.6467018,38.908627 A 20.203051 7.4751287 0 1 1  45.052803 38.908627 z"
-       transform="matrix(1.000000,0.000000,0.000000,1.243244,0.000000,-10.27241)" />
-    <g
-       transform="matrix(2.015e-2,0,0,2.086758e-2,36.74885,41.38063)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <path
-       style="fill:url(#radialGradient3968);fill-opacity:1;fill-rule:nonzero;stroke:#39396c;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 44.132171,23.485487 C 44.132171,34.290382 35.37291,43.049544 24.569501,43.049544 C 13.765102,43.049544 5.0063361,34.290283 5.0063361,23.485487 C 5.0063361,12.681087 13.765102,3.9228173 24.569501,3.9228173 C 35.37291,3.9228173 44.132171,12.681087 44.132171,23.485487 L 44.132171,23.485487 z "
-       id="path3214"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.42159382;fill:url(#radialGradient4356);fill-opacity:1.0000000;stroke:none;stroke-opacity:1.0000000"
-       id="path4348"
-       sodipodi:cx="17.778685"
-       sodipodi:cy="15.271057"
-       sodipodi:rx="12.929953"
-       sodipodi:ry="9.2934036"
-       d="M 30.708637 15.271057 A 12.929953 9.2934036 0 1 1  4.8487320,15.271057 A 12.929953 9.2934036 0 1 1  30.708637 15.271057 z"
-       transform="matrix(0.835938,0.000000,0.000000,1.000000,9.886868,0.000000)" />
-    <g
-       id="g4136"
-       style="fill:#000000;fill-opacity:0.71345031;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000"
-       transform="matrix(0.982371,0.000000,0.000000,0.982371,0.121079,0.232914)">
-      <g
-         id="g4138">
-        <g
-           id="g4142">
-          <path
-             d="M 44.071300,20.714400 C 44.071300,20.977100 44.071300,20.714400 44.071300,20.714400 L 43.526400,21.331600 C 43.192400,20.938000 42.817400,20.607000 42.436600,20.261300 L 41.600700,20.384300 L 40.837000,19.521000 L 40.837000,20.589400 L 41.491300,21.084500 L 41.926800,21.577700 L 42.508800,20.919500 C 42.655300,21.193900 42.799800,21.468300 42.945300,21.742700 L 42.945300,22.565000 L 42.290000,23.305200 L 41.090800,24.128400 L 40.182600,25.034700 L 39.600600,24.374500 L 39.891600,23.634300 L 39.310500,22.976100 L 38.329100,20.878400 L 37.493200,19.933100 L 37.274400,20.179200 L 37.602500,21.372600 L 38.219700,22.071800 C 38.572200,23.089400 38.920900,24.062000 39.383800,25.034700 C 40.101600,25.034700 40.778300,24.958500 41.491200,24.868700 L 41.491200,25.444900 L 40.619100,27.584100 L 39.819300,28.488400 L 39.165000,29.888800 C 39.165000,30.656400 39.165000,31.424000 39.165000,32.191500 L 39.383800,33.097800 L 39.020500,33.508000 L 38.219700,34.002100 L 37.383800,34.701300 L 38.075200,35.482600 L 37.129900,36.306800 L 37.311500,36.840000 L 35.893500,38.445500 L 34.949200,38.445500 L 34.149400,38.939600 L 33.639600,38.939600 L 33.639600,38.281400 L 33.422800,36.963000 C 33.141500,36.136800 32.848600,35.316500 32.550700,34.496200 C 32.550700,33.890700 32.586800,33.291100 32.623000,32.685700 L 32.987300,31.863400 L 32.477500,30.875100 L 32.514600,29.517700 L 31.823200,28.736400 L 32.168900,27.605500 L 31.606400,26.967300 L 30.624000,26.967300 L 30.296900,26.597200 L 29.315500,27.214900 L 28.916100,26.761300 L 28.006900,27.543000 C 27.389700,26.843300 26.771500,26.144100 26.153400,25.444900 L 25.426800,23.716400 L 26.081100,22.730100 L 25.717800,22.319000 L 26.516600,20.425400 C 27.172900,19.609000 27.858400,18.825800 28.551800,18.039700 L 29.788100,17.710600 L 31.169000,17.546500 L 32.114300,17.793600 L 33.459000,19.150000 L 33.931700,18.615800 L 34.585000,18.533800 L 35.821300,18.944900 L 36.766600,18.944900 L 37.420900,18.368700 L 37.711900,17.957600 L 37.056600,17.546500 L 35.965800,17.464500 C 35.663100,17.044600 35.381800,16.603200 35.022400,16.230100 L 34.658100,16.394200 L 34.512600,17.464500 L 33.858300,16.724300 L 33.713800,15.900100 L 32.987200,15.325900 L 32.695200,15.325900 L 33.422700,16.148200 L 33.131700,16.888400 L 32.550600,17.052500 L 32.913900,16.312300 L 32.258600,15.984200 L 31.678500,15.326000 L 30.586700,15.572100 L 30.442200,15.900200 L 29.787900,16.312300 L 29.424600,17.217600 L 28.516400,17.669700 L 28.116000,17.217600 L 27.680500,17.217600 L 27.680500,15.736200 L 28.625800,15.242100 L 29.352400,15.242100 L 29.205900,14.666900 L 28.625800,14.090700 L 29.606300,13.884600 L 30.151200,13.268400 L 30.586700,12.527200 L 31.387500,12.527200 L 31.168700,11.952000 L 31.678500,11.622900 L 31.678500,12.281100 L 32.768300,12.527200 L 33.858100,11.622900 L 33.931300,11.210800 L 34.875600,10.553100 C 34.533800,10.595600 34.192000,10.626800 33.858000,10.717700 L 33.858000,9.9766000 L 34.221300,9.1538000 L 33.858000,9.1538000 L 33.059600,9.8940000 L 32.840800,10.305600 L 33.059600,10.882300 L 32.695300,11.868600 L 32.114200,11.539500 L 31.606400,10.964300 L 30.805600,11.539500 L 30.514600,10.223600 L 31.895500,9.3188000 L 31.895500,8.8247000 L 32.768500,8.2490000 L 34.149400,7.9194000 L 35.094700,8.2490000 L 36.838800,8.5781000 L 36.403300,9.0713000 L 35.458000,9.0713000 L 36.403300,10.058600 L 37.129900,9.2363000 L 37.350600,8.8745000 C 37.350600,8.8745000 40.137700,11.372500 41.730500,14.105000 C 43.323300,16.838400 44.071300,20.060100 44.071300,20.714400 z "
-             id="path4144" />
-        </g>
-      </g>
-      <g
-         id="g4146">
-        <g
-           id="g4150">
-          <path
-             d="M 26.070300,9.2363000 L 25.997100,9.7295000 L 26.506900,10.058600 L 27.378000,9.4829000 L 26.942500,8.9892000 L 26.360500,9.3188000 L 26.070500,9.2363000"
-             id="path4152" />
-        </g>
-      </g>
-      <g
-         id="g4154">
-        <g
-           id="g4158">
-          <path
-             d="M 26.870100,5.8633000 L 24.979500,5.1226000 L 22.799800,5.3692000 L 20.109400,6.1094000 L 19.600600,6.6035000 L 21.272500,7.7549000 L 21.272500,8.4131000 L 20.618200,9.0713000 L 21.491200,10.800300 L 22.071300,10.470200 L 22.799800,9.3188000 C 23.922800,8.9716000 24.929700,8.5781000 25.997100,8.0844000 L 26.870100,5.8632000"
-             id="path4160" />
-        </g>
-      </g>
-      <g
-         id="g4162">
-        <g
-           id="g4166">
-          <path
-             d="M 28.833000,12.774900 L 28.542000,12.033700 L 28.032200,12.198700 L 28.178700,13.103000 L 28.833000,12.774900"
-             id="path4168" />
-        </g>
-      </g>
-      <g
-         id="g4170">
-        <g
-           id="g4174">
-          <path
-             d="M 29.123000,12.608900 L 28.977500,13.597200 L 29.777300,13.432200 L 30.358400,12.857000 L 29.849600,12.362900 C 29.678700,11.907800 29.482400,11.483000 29.268500,11.046500 L 28.833000,11.046500 L 28.833000,11.539700 L 29.123000,11.868800 L 29.123000,12.609000"
-             id="path4176" />
-        </g>
-      </g>
-      <g
-         id="g4178">
-        <g
-           id="g4182">
-          <path
-             d="M 18.365200,28.242200 L 17.783200,27.089900 L 16.692900,26.843300 L 16.111400,25.280800 L 14.657800,25.444900 L 13.422400,24.540600 L 12.113300,25.692000 L 12.113300,25.873600 C 11.717300,25.759300 11.230500,25.743700 10.877900,25.526900 L 10.586900,24.704600 L 10.586900,23.799300 L 9.7148000,23.881300 C 9.7876000,23.305100 9.8598000,22.729900 9.9331000,22.153800 L 9.4238000,22.153800 L 8.9155000,22.812000 L 8.4062000,23.058100 L 7.6791000,22.647900 L 7.6063000,21.742600 L 7.7518000,20.755300 L 8.8426000,19.933000 L 9.7147000,19.933000 L 9.8597000,19.438900 L 10.950000,19.685000 L 11.749800,20.673300 L 11.895300,19.026800 L 13.276600,17.875400 L 13.785400,16.641000 L 14.803000,16.229900 L 15.384500,15.407600 L 16.692600,15.159600 L 17.347400,14.173300 C 16.693100,14.173300 16.038800,14.173300 15.384500,14.173300 L 16.620300,13.597100 L 17.491900,13.597100 L 18.728200,13.185000 L 18.873700,12.692800 L 18.437200,12.280700 L 17.928400,12.115700 L 18.073900,11.622500 L 17.710600,10.882300 L 16.838000,11.210400 L 16.983500,10.552700 L 15.965900,9.9765000 L 15.166600,11.374400 L 15.238900,11.868500 L 14.439600,12.198600 L 13.930300,13.267900 L 13.712500,12.280600 L 12.331200,11.704400 L 12.112900,10.964200 L 13.930300,9.8939000 L 14.730100,9.1537000 L 14.802900,8.2489000 L 14.366900,8.0018000 L 13.785400,7.9193000 L 13.422100,8.8246000 C 13.422100,8.8246000 12.814200,8.9437000 12.657900,8.9823000 C 10.661800,10.821700 6.6286000,14.792400 5.6916000,22.288500 C 5.7287000,22.462300 6.3708000,23.470100 6.3708000,23.470100 L 7.8972000,24.374400 L 9.4236000,24.786500 L 10.078400,25.609700 L 11.095500,26.349900 L 11.677000,26.267900 L 12.113000,26.464200 L 12.113000,26.597000 L 11.531900,28.160000 L 11.095400,28.818200 L 11.240900,29.148300 L 10.877600,30.380700 L 12.186200,32.767400 L 13.494300,33.919700 L 14.076300,34.742000 L 14.003100,36.470500 L 14.439600,37.456800 L 14.003100,39.349400 C 14.003100,39.349400 13.968900,39.337700 14.024600,39.527100 C 14.080800,39.716600 16.353700,40.978300 16.498200,40.870900 C 16.642200,40.761500 16.765300,40.665800 16.765300,40.665800 L 16.620300,40.255600 L 17.201400,39.679400 L 17.419700,39.103200 L 18.365000,38.773100 L 19.091600,36.962600 L 18.873800,36.470400 L 19.381600,35.730200 L 20.472400,35.482200 L 21.054400,34.165800 L 20.908900,32.521300 L 21.781000,31.286900 L 21.926500,30.052500 C 20.733100,29.460700 19.549500,28.851300 18.365000,28.242000"
-             id="path4184" />
-        </g>
-      </g>
-      <g
-         id="g4186">
-        <g
-           id="g4190">
-          <path
-             d="M 16.765600,9.5649000 L 17.492200,10.058600 L 18.074200,10.058600 L 18.074200,9.4829000 L 17.347600,9.1538000 L 16.765600,9.5649000"
-             id="path4192" />
-        </g>
-      </g>
-      <g
-         id="g4194">
-        <g
-           id="g4198">
-          <path
-             d="M 14.876000,8.9072000 L 14.512200,9.8120000 L 15.239300,9.8120000 L 15.603100,8.9892000 C 15.916600,8.7675000 16.228600,8.5444000 16.547900,8.3310000 L 17.275000,8.5781000 C 17.759400,8.9072000 18.243800,9.2363000 18.728600,9.5649000 L 19.456100,8.9072000 L 18.655800,8.5781000 L 18.292000,7.8374000 L 16.911100,7.6728000 L 16.838300,7.2612000 L 16.184000,7.4262000 L 15.893600,8.0020000 L 15.529800,7.2613000 L 15.384800,7.5904000 L 15.457600,8.4132000 L 14.876000,8.9072000"
-             id="path4200" />
-        </g>
-      </g>
-      <g
-         id="g4202">
-        <g
-           style="opacity:0.75000000"
-           id="g4204">
-          <path
-             id="path4206"
-             d="" />
-        </g>
-        <g
-           id="g4208">
-          <path
-             id="path4210"
-             d="" />
-        </g>
-      </g>
-      <g
-         id="g4212">
-        <g
-           style="opacity:0.75000000"
-           id="g4214">
-          <path
-             id="path4216"
-             d="" />
-        </g>
-        <g
-           id="g4218">
-          <path
-             id="path4220"
-             d="" />
-        </g>
-      </g>
-      <g
-         id="g4222">
-        <g
-           id="g4226">
-          <path
-             d="M 17.492200,6.8496000 L 17.856000,6.5210000 L 18.583100,6.3564000 C 19.081100,6.1142000 19.581100,5.9511000 20.109500,5.7802000 L 19.819500,5.2865000 L 18.881000,5.4213000 L 18.437600,5.8632000 L 17.706600,5.9692000 L 17.056700,6.2744000 L 16.740800,6.4272000 L 16.547900,6.6855000 L 17.492200,6.8496000"
-             id="path4228" />
-        </g>
-      </g>
-      <g
-         id="g4230">
-        <g
-           id="g4234">
-          <path
-             d="M 18.728500,14.666500 L 19.165000,14.008300 L 18.510200,13.515100 L 18.728500,14.666500"
-             id="path4236" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="g3216"
-       style="color:#000000;fill:url(#radialGradient1460);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0179454;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.982371,0.000000,0.000000,0.982371,-8.095179e-2,3.088300e-2)">
-      <g
-         id="g3218"
-         style="color:#000000;fill:url(#radialGradient1462);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3222"
-           style="color:#000000;fill:url(#radialGradient1466);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 44.071300,20.714400 C 44.071300,20.977100 44.071300,20.714400 44.071300,20.714400 L 43.526400,21.331600 C 43.192400,20.938000 42.817400,20.607000 42.436600,20.261300 L 41.600700,20.384300 L 40.837000,19.521000 L 40.837000,20.589400 L 41.491300,21.084500 L 41.926800,21.577700 L 42.508800,20.919500 C 42.655300,21.193900 42.799800,21.468300 42.945300,21.742700 L 42.945300,22.565000 L 42.290000,23.305200 L 41.090800,24.128400 L 40.182600,25.034700 L 39.600600,24.374500 L 39.891600,23.634300 L 39.310500,22.976100 L 38.329100,20.878400 L 37.493200,19.933100 L 37.274400,20.179200 L 37.602500,21.372600 L 38.219700,22.071800 C 38.572200,23.089400 38.920900,24.062000 39.383800,25.034700 C 40.101600,25.034700 40.778300,24.958500 41.491200,24.868700 L 41.491200,25.444900 L 40.619100,27.584100 L 39.819300,28.488400 L 39.165000,29.888800 C 39.165000,30.656400 39.165000,31.424000 39.165000,32.191500 L 39.383800,33.097800 L 39.020500,33.508000 L 38.219700,34.002100 L 37.383800,34.701300 L 38.075200,35.482600 L 37.129900,36.306800 L 37.311500,36.840000 L 35.893500,38.445500 L 34.949200,38.445500 L 34.149400,38.939600 L 33.639600,38.939600 L 33.639600,38.281400 L 33.422800,36.963000 C 33.141500,36.136800 32.848600,35.316500 32.550700,34.496200 C 32.550700,33.890700 32.586800,33.291100 32.623000,32.685700 L 32.987300,31.863400 L 32.477500,30.875100 L 32.514600,29.517700 L 31.823200,28.736400 L 32.168900,27.605500 L 31.606400,26.967300 L 30.624000,26.967300 L 30.296900,26.597200 L 29.315500,27.214900 L 28.916100,26.761300 L 28.006900,27.543000 C 27.389700,26.843300 26.771500,26.144100 26.153400,25.444900 L 25.426800,23.716400 L 26.081100,22.730100 L 25.717800,22.319000 L 26.516600,20.425400 C 27.172900,19.609000 27.858400,18.825800 28.551800,18.039700 L 29.788100,17.710600 L 31.169000,17.546500 L 32.114300,17.793600 L 33.459000,19.150000 L 33.931700,18.615800 L 34.585000,18.533800 L 35.821300,18.944900 L 36.766600,18.944900 L 37.420900,18.368700 L 37.711900,17.957600 L 37.056600,17.546500 L 35.965800,17.464500 C 35.663100,17.044600 35.381800,16.603200 35.022400,16.230100 L 34.658100,16.394200 L 34.512600,17.464500 L 33.858300,16.724300 L 33.713800,15.900100 L 32.987200,15.325900 L 32.695200,15.325900 L 33.422700,16.148200 L 33.131700,16.888400 L 32.550600,17.052500 L 32.913900,16.312300 L 32.258600,15.984200 L 31.678500,15.326000 L 30.586700,15.572100 L 30.442200,15.900200 L 29.787900,16.312300 L 29.424600,17.217600 L 28.516400,17.669700 L 28.116000,17.217600 L 27.680500,17.217600 L 27.680500,15.736200 L 28.625800,15.242100 L 29.352400,15.242100 L 29.205900,14.666900 L 28.625800,14.090700 L 29.606300,13.884600 L 30.151200,13.268400 L 30.586700,12.527200 L 31.387500,12.527200 L 31.168700,11.952000 L 31.678500,11.622900 L 31.678500,12.281100 L 32.768300,12.527200 L 33.858100,11.622900 L 33.931300,11.210800 L 34.875600,10.553100 C 34.533800,10.595600 34.192000,10.626800 33.858000,10.717700 L 33.858000,9.9766000 L 34.221300,9.1538000 L 33.858000,9.1538000 L 33.059600,9.8940000 L 32.840800,10.305600 L 33.059600,10.882300 L 32.695300,11.868600 L 32.114200,11.539500 L 31.606400,10.964300 L 30.805600,11.539500 L 30.514600,10.223600 L 31.895500,9.3188000 L 31.895500,8.8247000 L 32.768500,8.2490000 L 34.149400,7.9194000 L 35.094700,8.2490000 L 36.838800,8.5781000 L 36.403300,9.0713000 L 35.458000,9.0713000 L 36.403300,10.058600 L 37.129900,9.2363000 L 37.350600,8.8745000 C 37.350600,8.8745000 40.137700,11.372500 41.730500,14.105000 C 43.323300,16.838400 44.071300,20.060100 44.071300,20.714400 z "
-             id="path3224"
-             style="color:#000000;fill:url(#radialGradient1468);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3226"
-         style="color:#000000;fill:url(#radialGradient1470);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3230"
-           style="color:#000000;fill:url(#radialGradient1474);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 26.070300,9.2363000 L 25.997100,9.7295000 L 26.506900,10.058600 L 27.378000,9.4829000 L 26.942500,8.9892000 L 26.360500,9.3188000 L 26.070500,9.2363000"
-             id="path3232"
-             style="color:#000000;fill:url(#radialGradient1476);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3234"
-         style="color:#000000;fill:url(#radialGradient1478);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3238"
-           style="color:#000000;fill:url(#radialGradient1482);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 26.870100,5.8633000 L 24.979500,5.1226000 L 22.799800,5.3692000 L 20.109400,6.1094000 L 19.600600,6.6035000 L 21.272500,7.7549000 L 21.272500,8.4131000 L 20.618200,9.0713000 L 21.491200,10.800300 L 22.071300,10.470200 L 22.799800,9.3188000 C 23.922800,8.9716000 24.929700,8.5781000 25.997100,8.0844000 L 26.870100,5.8632000"
-             id="path3240"
-             style="color:#000000;fill:url(#radialGradient1484);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3242"
-         style="color:#000000;fill:url(#radialGradient1486);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3246"
-           style="color:#000000;fill:url(#radialGradient1490);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 28.833000,12.774900 L 28.542000,12.033700 L 28.032200,12.198700 L 28.178700,13.103000 L 28.833000,12.774900"
-             id="path3248"
-             style="color:#000000;fill:url(#radialGradient1492);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3250"
-         style="color:#000000;fill:url(#radialGradient1494);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3254"
-           style="color:#000000;fill:url(#radialGradient1498);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 29.123000,12.608900 L 28.977500,13.597200 L 29.777300,13.432200 L 30.358400,12.857000 L 29.849600,12.362900 C 29.678700,11.907800 29.482400,11.483000 29.268500,11.046500 L 28.833000,11.046500 L 28.833000,11.539700 L 29.123000,11.868800 L 29.123000,12.609000"
-             id="path3256"
-             style="color:#000000;fill:url(#radialGradient1500);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3258"
-         style="color:#000000;fill:url(#radialGradient1502);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3262"
-           style="color:#000000;fill:url(#radialGradient1506);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 18.365200,28.242200 L 17.783200,27.089900 L 16.692900,26.843300 L 16.111400,25.280800 L 14.657800,25.444900 L 13.422400,24.540600 L 12.113300,25.692000 L 12.113300,25.873600 C 11.717300,25.759300 11.230500,25.743700 10.877900,25.526900 L 10.586900,24.704600 L 10.586900,23.799300 L 9.7148000,23.881300 C 9.7876000,23.305100 9.8598000,22.729900 9.9331000,22.153800 L 9.4238000,22.153800 L 8.9155000,22.812000 L 8.4062000,23.058100 L 7.6791000,22.647900 L 7.6063000,21.742600 L 7.7518000,20.755300 L 8.8426000,19.933000 L 9.7147000,19.933000 L 9.8597000,19.438900 L 10.950000,19.685000 L 11.749800,20.673300 L 11.895300,19.026800 L 13.276600,17.875400 L 13.785400,16.641000 L 14.803000,16.229900 L 15.384500,15.407600 L 16.692600,15.159600 L 17.347400,14.173300 C 16.693100,14.173300 16.038800,14.173300 15.384500,14.173300 L 16.620300,13.597100 L 17.491900,13.597100 L 18.728200,13.185000 L 18.873700,12.692800 L 18.437200,12.280700 L 17.928400,12.115700 L 18.073900,11.622500 L 17.710600,10.882300 L 16.838000,11.210400 L 16.983500,10.552700 L 15.965900,9.9765000 L 15.166600,11.374400 L 15.238900,11.868500 L 14.439600,12.198600 L 13.930300,13.267900 L 13.712500,12.280600 L 12.331200,11.704400 L 12.112900,10.964200 L 13.930300,9.8939000 L 14.730100,9.1537000 L 14.802900,8.2489000 L 14.366900,8.0018000 L 13.785400,7.9193000 L 13.422100,8.8246000 C 13.422100,8.8246000 12.814200,8.9437000 12.657900,8.9823000 C 10.661800,10.821700 6.6286000,14.792400 5.6916000,22.288500 C 5.7287000,22.462300 6.3708000,23.470100 6.3708000,23.470100 L 7.8972000,24.374400 L 9.4236000,24.786500 L 10.078400,25.609700 L 11.095500,26.349900 L 11.677000,26.267900 L 12.113000,26.464200 L 12.113000,26.597000 L 11.531900,28.160000 L 11.095400,28.818200 L 11.240900,29.148300 L 10.877600,30.380700 L 12.186200,32.767400 L 13.494300,33.919700 L 14.076300,34.742000 L 14.003100,36.470500 L 14.439600,37.456800 L 14.003100,39.349400 C 14.003100,39.349400 13.968900,39.337700 14.024600,39.527100 C 14.080800,39.716600 16.353700,40.978300 16.498200,40.870900 C 16.642200,40.761500 16.765300,40.665800 16.765300,40.665800 L 16.620300,40.255600 L 17.201400,39.679400 L 17.419700,39.103200 L 18.365000,38.773100 L 19.091600,36.962600 L 18.873800,36.470400 L 19.381600,35.730200 L 20.472400,35.482200 L 21.054400,34.165800 L 20.908900,32.521300 L 21.781000,31.286900 L 21.926500,30.052500 C 20.733100,29.460700 19.549500,28.851300 18.365000,28.242000"
-             id="path3264"
-             style="color:#000000;fill:url(#radialGradient1508);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3266"
-         style="color:#000000;fill:url(#radialGradient1510);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3270"
-           style="color:#000000;fill:url(#radialGradient1514);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 16.765600,9.5649000 L 17.492200,10.058600 L 18.074200,10.058600 L 18.074200,9.4829000 L 17.347600,9.1538000 L 16.765600,9.5649000"
-             id="path3272"
-             style="color:#000000;fill:url(#radialGradient1516);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3274"
-         style="color:#000000;fill:url(#radialGradient1518);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3278"
-           style="color:#000000;fill:url(#radialGradient1522);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 14.876000,8.9072000 L 14.512200,9.8120000 L 15.239300,9.8120000 L 15.603100,8.9892000 C 15.916600,8.7675000 16.228600,8.5444000 16.547900,8.3310000 L 17.275000,8.5781000 C 17.759400,8.9072000 18.243800,9.2363000 18.728600,9.5649000 L 19.456100,8.9072000 L 18.655800,8.5781000 L 18.292000,7.8374000 L 16.911100,7.6728000 L 16.838300,7.2612000 L 16.184000,7.4262000 L 15.893600,8.0020000 L 15.529800,7.2613000 L 15.384800,7.5904000 L 15.457600,8.4132000 L 14.876000,8.9072000"
-             id="path3280"
-             style="color:#000000;fill:url(#radialGradient1524);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3282"
-         style="color:#000000;fill:url(#radialGradient1526);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           style="opacity:0.75000000;color:#000000;fill:url(#radialGradient1528);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-           id="g3284">
-          <path
-             d=""
-             style="color:#000000;fill:url(#radialGradient1530);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-             id="path3286" />
-        </g>
-        <g
-           id="g3288"
-           style="color:#000000;fill:url(#radialGradient1532);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d=""
-             id="path3290"
-             style="color:#000000;fill:url(#radialGradient1534);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3292"
-         style="color:#000000;fill:url(#radialGradient1536);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           style="opacity:0.75000000;color:#000000;fill:url(#radialGradient1538);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-           id="g3294">
-          <path
-             d=""
-             style="color:#000000;fill:url(#radialGradient1540);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-             id="path3296" />
-        </g>
-        <g
-           id="g3298"
-           style="color:#000000;fill:url(#radialGradient1542);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d=""
-             id="path3300"
-             style="color:#000000;fill:url(#radialGradient1544);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3302"
-         style="color:#000000;fill:url(#radialGradient1546);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3306"
-           style="color:#000000;fill:url(#radialGradient1550);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 17.492200,6.8496000 L 17.856000,6.5210000 L 18.583100,6.3564000 C 19.081100,6.1142000 19.581100,5.9511000 20.109500,5.7802000 L 19.819500,5.2865000 L 18.881000,5.4213000 L 18.437600,5.8632000 L 17.706600,5.9692000 L 17.056700,6.2744000 L 16.740800,6.4272000 L 16.547900,6.6855000 L 17.492200,6.8496000"
-             id="path3308"
-             style="color:#000000;fill:url(#radialGradient1552);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-      <g
-         id="g3310"
-         style="color:#000000;fill:url(#radialGradient1554);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-        <g
-           id="g3314"
-           style="color:#000000;fill:url(#radialGradient1558);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible">
-          <path
-             d="M 18.728500,14.666500 L 19.165000,14.008300 L 18.510200,13.515100 L 18.728500,14.666500"
-             id="path3316"
-             style="color:#000000;fill:url(#radialGradient4756);stroke-dashoffset:0.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
-        </g>
-      </g>
-    </g>
-    <path
-       style="fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient4132);stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M 42.975093,23.485534 C 42.975093,33.651354 34.733915,41.892440 24.569493,41.892440 C 14.404139,41.892440 6.1634261,33.651261 6.1634261,23.485534 C 6.1634261,13.320180 14.404139,5.0799340 24.569493,5.0799340 C 34.733915,5.0799340 42.975093,13.320180 42.975093,23.485534 L 42.975093,23.485534 z "
-       id="path4122" />
-    <path
-       sodipodi:nodetypes="czzzcc"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path2794"
-       d="M 38.06066,5.8716896 C 43.124186,-0.0855393 47.193564,5.0853443 43.23231,12.47138 C 39.290627,19.82092 46.524776,23.714466 44.646524,30.088388 C 42.705717,36.674588 40.138717,35.37868 37.133513,37.87868 C 34.12831,40.37868 21.400388,40 21.400388,40 L 21,38"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#babdb6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 38.06066,5.8716896 C 43.124186,-0.0855393 47.193564,5.0853443 43.23231,12.47138 C 39.290627,19.82092 46.524776,23.714466 44.646524,30.088388 C 42.705717,36.674588 40.138717,35.37868 37.133513,37.87868 C 34.12831,40.37868 21.400388,40 21.400388,40 L 21,38"
-       id="path2784"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="czzzcc" />
-    <g
-       id="g1852"
-       transform="matrix(0.857741,0,0,0.857741,-3.490242,15.59392)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true">
-      <path
-         sodipodi:nodetypes="cssssssss"
-         id="rect2404"
-         d="M 6.6600157,4.5577672 L 42.641027,4.5577672 C 43.559204,4.5577672 44.313598,5.1427413 44.320279,5.9655492 L 44.528875,31.65672 C 44.538003,32.780881 43.621062,33.685956 42.493419,33.685956 L 6.6816866,33.685956 C 5.5540441,33.685956 4.6315936,32.780823 4.646231,31.65672 L 4.9807648,5.9655492 C 4.9908945,5.1876083 5.5323732,4.5577672 6.6600157,4.5577672 z "
-         style="color:#000000;fill:url(#linearGradient2251);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1561);stroke-width:1.16585314;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:1.16585279;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 8.3577101,7.9937458 L 8.1254512,27.906829 L 38.477362,27.906829 L 38.156089,8.0781383 L 8.3577101,7.9937458 z "
-         id="path2377"
-         sodipodi:nodetypes="ccccc"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         id="path2393"
-         d="M 6.6774331,31.404697 L 42.10591,31.404697"
-         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient2689);stroke-width:1.16140115;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.24840764"
-         sodipodi:nodetypes="cc"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2421);stroke-width:1.16585267;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.70063692;visibility:visible;display:inline;overflow:visible"
-         d="M 6.6802114,5.7815313 L 42.646222,5.7443731 C 42.930873,5.744079 43.224195,5.9770157 43.230283,6.3858167 L 43.593392,30.767145 C 43.608888,31.80765 43.051829,32.522637 41.989647,32.522637 L 7.3496141,32.522637 C 6.2874323,32.522637 5.7945264,31.807669 5.8085792,30.767145 L 6.1337592,6.68964 C 6.1432754,5.9850207 6.3007039,5.7819236 6.6802114,5.7815313 z "
-         id="path2397"
-         sodipodi:nodetypes="cssssssss"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         id="path2443"
-         d="M 8.7828779,8.6344013 L 8.7325218,25.491693 C 19.320284,23.227151 24.714347,15.594279 37.878849,13.09021 L 37.843886,8.6967202 L 8.7828779,8.6344013 z "
-         style="opacity:0.53142856;fill:url(#linearGradient2673);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="ccccc"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient2717);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path2709"
-         sodipodi:cx="34.780815"
-         sodipodi:cy="3.9384086"
-         sodipodi:rx="0.83968931"
-         sodipodi:ry="0.83968931"
-         d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-         transform="matrix(1.331237,0,0,0.658449,-5.212226,6.082418)"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         transform="matrix(1.331237,0,0,0.658449,-5.098626,8.188202)"
-         d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-         sodipodi:ry="0.83968931"
-         sodipodi:rx="0.83968931"
-         sodipodi:cy="3.9384086"
-         sodipodi:cx="34.780815"
-         id="path2719"
-         style="color:#000000;fill:url(#linearGradient2721);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient2725);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path2723"
-         sodipodi:cx="34.780815"
-         sodipodi:cy="3.9384086"
-         sodipodi:rx="0.83968931"
-         sodipodi:ry="0.83968931"
-         d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-         transform="matrix(1.331237,0,0,0.658449,-4.985026,10.18821)"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         transform="matrix(1.331237,0,0,0.658449,-4.871426,12.18821)"
-         d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-         sodipodi:ry="0.83968931"
-         sodipodi:rx="0.83968931"
-         sodipodi:cy="3.9384086"
-         sodipodi:cx="34.780815"
-         id="path2727"
-         style="color:#000000;fill:url(#linearGradient2729);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient2733);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path2731"
-         sodipodi:cx="34.780815"
-         sodipodi:cy="3.9384086"
-         sodipodi:rx="0.83968931"
-         sodipodi:ry="0.83968931"
-         d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-         transform="matrix(1.331237,0,0,0.658449,-4.757826,14.18821)"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-    </g>
-    <path
-       transform="matrix(0.287993,0.273427,-0.350839,0.346922,40.62266,-11.07903)"
-       d="M 45.052803 38.908627 A 20.203051 7.4751287 0 1 1  4.6467018,38.908627 A 20.203051 7.4751287 0 1 1  45.052803 38.908627 z"
-       sodipodi:ry="7.4751287"
-       sodipodi:rx="20.203051"
-       sodipodi:cy="38.908627"
-       sodipodi:cx="24.849752"
-       id="path5560"
-       style="opacity:0.47777776;fill:url(#radialGradient5562);fill-opacity:1;stroke:none;stroke-opacity:1"
-       sodipodi:type="arc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       inkscape:c_rx="51.349732"
-       inkscape:c_ry="50.01685" />
-    <g
-       id="g2790"
-       transform="matrix(0.750525,-0.660841,0.660841,0.750525,-7.964352,18.96992)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       inkscape:c_rx="38.671572"
-       inkscape:c_ry="38.578873">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="path2782"
-         d="M 37.558058,15.646447 L 37.558058,25.585787 L 40.259961,25.646447 C 42.378017,25.646447 44.558058,23.664998 44.558058,22.320622 L 44.558058,19.149049 C 44.558058,17.91525 42.838844,15.646447 40.348349,15.646447 L 37.558058,15.646447 z "
-         style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#cc0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="path2788"
-         d="M 38,25 C 38,25 38,16 38,16 C 40.915148,15.751519 42.730387,16.602947 44,18 C 42.496591,17.258523 40.966016,16.58496 39,17 L 38,25 z "
-         style="opacity:0.46666667;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <rect
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2796"
-       width="25"
-       height="2"
-       x="4"
-       y="23"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2798"
-       width="9"
-       height="9"
-       x="15"
-       y="28"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       style="opacity:1;color:#000000;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2800"
-       width="9"
-       height="2"
-       x="15"
-       y="26"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       style="opacity:1;color:#000000;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2802"
-       width="4"
-       height="2"
-       x="7"
-       y="29"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2804"
-       width="4"
-       height="3"
-       x="7"
-       y="31"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2810"
-       sodipodi:cx="42.426407"
-       sodipodi:cy="3.0103309"
-       sodipodi:rx="0.61871845"
-       sodipodi:ry="0.61871845"
-       d="M 43.045125 3.0103309 A 0.61871845 0.61871845 0 1 1  41.807688,3.0103309 A 0.61871845 0.61871845 0 1 1  43.045125 3.0103309 z"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       d="M 43.045125 3.0103309 A 0.61871845 0.61871845 0 1 1  41.807688,3.0103309 A 0.61871845 0.61871845 0 1 1  43.045125 3.0103309 z"
-       sodipodi:ry="0.61871845"
-       sodipodi:rx="0.61871845"
-       sodipodi:cy="3.0103309"
-       sodipodi:cx="42.426407"
-       id="path2812"
-       style="opacity:0.52222224;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc"
-       transform="matrix(1.857143,0,0,1.857143,-42.90623,-0.547352)" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/preferences-system-windows.svg Deleted

@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   width="48px"
-   height="48px"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps"
-   sodipodi:docname="preferences-system-windows.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective51" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4816">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="0"
-         id="stop4818" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop4820" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4808">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4810" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4812" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3832">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3834" />
-      <stop
-         style="stop-color:#e0e0e0;stop-opacity:1;"
-         offset="1"
-         id="stop3836" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3832"
-       id="linearGradient3838"
-       x1="17.88068"
-       y1="11.072588"
-       x2="17.88068"
-       y2="21.767578"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.993847,0.000000,0.000000,0.984817,-0.192265,-0.512678)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4808"
-       id="radialGradient4814"
-       cx="17.368311"
-       cy="25.681942"
-       fx="17.368311"
-       fy="25.681942"
-       r="11.799845"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.385768,8.417746e-16,15.77468)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4816"
-       id="linearGradient4822"
-       x1="13.267747"
-       y1="7.7190704"
-       x2="13.267747"
-       y2="12.480761"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4808"
-       id="radialGradient4832"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.385768,9.076565e-15,15.77468)"
-       cx="17.368311"
-       cy="25.681942"
-       fx="17.368311"
-       fy="25.681942"
-       r="11.799845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3832"
-       id="linearGradient4834"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.993847,0.000000,0.000000,0.984817,-0.192265,-0.512678)"
-       x1="17.88068"
-       y1="11.072588"
-       x2="17.88068"
-       y2="21.767578" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4816"
-       id="linearGradient4836"
-       gradientUnits="userSpaceOnUse"
-       x1="13.267747"
-       y1="7.7190704"
-       x2="13.267747"
-       y2="12.480761" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6673"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6675"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6677"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#eeeeec"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.25490196"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-98.183664"
-     inkscape:cy="-10.197409"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="872"
-     inkscape:window-height="688"
-     inkscape:window-x="234"
-     inkscape:window-y="160" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>Windows</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>window</rdf:li>
-            <rdf:li>manager</rdf:li>
-            <rdf:li>decoration</rdf:li>
-            <rdf:li>behavior</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       transform="matrix(1.789616e-2,0,0,2.086758e-2,33.54249,24.0286)"
-       id="g6665">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6673);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6667"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6675);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6669"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6671"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6677);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <g
-       id="g3822"
-       transform="matrix(1.814279,0.000000,0.000000,1.599146,-7.071394,-9.273977)">
-      <rect
-         ry="0.69171613"
-         rx="0.60969371"
-         y="7.3579211"
-         x="5.2738938"
-         height="15.642846"
-         width="15.987699"
-         id="rect3818"
-         style="opacity:1;color:#000000;fill:url(#linearGradient3838);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:0.58708906;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         ry="0.13899347"
-         rx="0.12251196"
-         y="8.3006659"
-         x="6.102366"
-         height="2.5013354"
-         width="14.330762"
-         id="rect3820"
-         style="opacity:1;color:#000000;fill:url(#linearGradient4822);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.58708918;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47878789;visibility:visible;display:inline;overflow:visible"
-         id="rect4962"
-         width="14.758596"
-         height="14.440255"
-         x="5.8884473"
-         y="7.959219"
-         rx="0.22271593"
-         ry="0.22271593" />
-    </g>
-    <g
-       id="g5022"
-       transform="matrix(1.789616e-2,0,0,2.086758e-2,46.04249,38.0286)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <g
-       transform="matrix(1.814279,0.000000,0.000000,1.599146,5.952841,4.810926)"
-       id="g4826">
-      <rect
-         style="opacity:1;color:#000000;fill:url(#linearGradient4834);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:0.58708906;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect4828"
-         width="15.987699"
-         height="15.642846"
-         x="5.2738938"
-         y="7.3579211"
-         rx="0.60969371"
-         ry="0.69171613" />
-      <rect
-         style="opacity:1;color:#000000;fill:url(#linearGradient4836);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect4830"
-         width="14.330762"
-         height="2.5013354"
-         x="6.102366"
-         y="8.3006659"
-         rx="0.12251196"
-         ry="0.13899347" />
-      <rect
-         ry="0.14454938"
-         rx="0.14454938"
-         y="7.8840585"
-         x="5.8116298"
-         height="14.590583"
-         width="14.912238"
-         id="rect4958"
-         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.5870893;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.54545456;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/process-stop.svg Deleted

@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48.000000px"
-   height="48.000000px"
-   id="svg6361"
-   sodipodi:version="0.32"
-   inkscape:version="0.42+devel"
-   sodipodi:docbase="/home/jimmac/gfx/ximian/tango-icon-theme/scalable/actions"
-   sodipodi:docname="process-stop.svg">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2256">
-      <stop
-         style="stop-color:#ff0202;stop-opacity:1;"
-         offset="0"
-         id="stop2258" />
-      <stop
-         style="stop-color:#ff9b9b;stop-opacity:1;"
-         offset="1"
-         id="stop2260" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2248">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2250" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2252" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9647">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9649" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="1"
-         id="stop9651" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient21644">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop21646" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop21648" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21644"
-       id="radialGradient21650"
-       cx="25.125"
-       cy="36.75"
-       fx="25.125"
-       fy="36.75"
-       r="15.75"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.595238,-2.300678e-15,14.87500)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7895">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7897" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7899" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4981">
-      <stop
-         style="stop-color:#cc0000;stop-opacity:1;"
-         offset="0"
-         id="stop4983" />
-      <stop
-         style="stop-color:#b30000;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4985" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15762"
-       inkscape:collect="always">
-      <stop
-         id="stop15764"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop15766"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14236">
-      <stop
-         id="stop14238"
-         offset="0.0000000"
-         style="stop-color:#ed4040;stop-opacity:1.0000000;" />
-      <stop
-         id="stop14240"
-         offset="1.0000000"
-         style="stop-color:#a40000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11780">
-      <stop
-         style="stop-color:#ff8b8b;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11782" />
-      <stop
-         style="stop-color:#ec1b1b;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11784" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11014">
-      <stop
-         style="stop-color:#a80000;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11016" />
-      <stop
-         style="stop-color:#c60000;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop13245" />
-      <stop
-         style="stop-color:#e50000;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11018" />
-    </linearGradient>
-    <linearGradient
-       y2="9.6507530"
-       x2="9.8940229"
-       y1="5.3855424"
-       x1="5.7365270"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,31.72170,31.29079)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15772"
-       xlink:href="#linearGradient15762"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11780"
-       id="linearGradient2057"
-       x1="15.737001"
-       y1="12.503600"
-       x2="53.570126"
-       y2="47.374317"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.000000,-2.000000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4981"
-       id="linearGradient4987"
-       x1="23.995985"
-       y1="20.105337"
-       x2="41.047836"
-       y2="37.959785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.000000,-2.000000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7895"
-       id="linearGradient7901"
-       x1="15.578875"
-       y1="16.285088"
-       x2="32.166405"
-       y2="28.394291"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9647"
-       id="radialGradient2239"
-       cx="24.30225"
-       cy="33.30225"
-       fx="24.30225"
-       fy="33.30225"
-       r="12.30225"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.693981,-5.775714e-16,5.775714e-16,1.693981,-16.86529,-25.11111)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4981"
-       id="linearGradient2243"
-       gradientUnits="userSpaceOnUse"
-       x1="23.995985"
-       y1="20.105337"
-       x2="41.047836"
-       y2="37.959785"
-       gradientTransform="matrix(0.988373,0.000000,0.000000,0.988373,0.279002,0.278984)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2248"
-       id="radialGradient2254"
-       cx="16.75"
-       cy="10.666344"
-       fx="16.75"
-       fy="10.666344"
-       r="21.25"
-       gradientTransform="matrix(4.154957,-2.979206e-24,3.255657e-24,3.198723,-52.84553,-23.50921)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2256"
-       id="linearGradient2262"
-       x1="21.75"
-       y1="15.80225"
-       x2="24.30225"
-       y2="35.05225"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.000000,-2.000000)" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:guide-bbox="true"
-     showguides="true"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15294118"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="40.507276"
-     inkscape:cy="7.0544576"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="786"
-     inkscape:window-height="664"
-     inkscape:window-x="488"
-     inkscape:window-y="288"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Stop</dc:title>
-        <dc:date>2005-10-16</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>stop</rdf:li>
-            <rdf:li>halt</rdf:li>
-            <rdf:li>error</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.63068183;color:#000000;fill:url(#radialGradient21650);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path21642"
-       sodipodi:cx="25.125"
-       sodipodi:cy="36.75"
-       sodipodi:rx="15.75"
-       sodipodi:ry="9.375"
-       d="M 40.875 36.75 A 15.75 9.375 0 1 1  9.375,36.75 A 15.75 9.375 0 1 1  40.875 36.75 z"
-       transform="matrix(1.173803,0.000000,0.000000,0.600000,-5.265866,19.57500)" />
-    <path
-       style="fill:url(#linearGradient4987);fill-opacity:1;fill-rule:evenodd;stroke:#860000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15.591006,0.4919213 L 32.676311,0.4919213 L 45.497585,13.586385 L 45.497585,31.48003 L 32.848986,43.496929 L 15.418649,43.496929 L 2.4943857,30.658264 L 2.4943857,13.464078 L 15.591006,0.4919213 z "
-       id="path9480"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="opacity:0.81318683;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2057);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 16.020655,1.5003424 L 32.248563,1.5003424 L 44.496456,13.922717 L 44.496456,31.037001 L 32.638472,42.48783 L 15.870253,42.48783 L 3.5090792,30.208718 L 3.5090792,13.84561 L 16.020655,1.5003424 z "
-       id="path9482"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="opacity:0.28977272;fill:url(#radialGradient2254);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15.6875,0.75 L 2.75,13.5625 L 2.75,30.5625 L 5.6875,33.46875 C 22.450041,33.526299 22.164665,20.450067 45.25,21.59375 L 45.25,13.6875 L 32.5625,0.75 L 15.6875,0.75 z "
-       id="path2241"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:url(#radialGradient2239);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2262);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.767175,10.5 L 12.5,14.767175 L 20.035075,22.30225 L 12.5,29.837325 L 16.767175,34.104501 L 24.30225,26.569425 L 31.837325,34.104501 L 36.104501,29.837325 L 28.569425,22.30225 L 36.104501,14.767175 L 31.837325,10.5 L 24.30225,18.035075 L 16.767175,10.5 z "
-       id="path2787" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/right_arrow.svg Deleted

@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="media-seek-forward.svg"
-   inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions-outlines.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs1309">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective58" />
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2584">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2586" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2588" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         style="stop-color:#adb0a8;stop-opacity:1;"
-         offset="0"
-         id="stop5077" />
-      <stop
-         style="stop-color:#464744;stop-opacity:1"
-         offset="1"
-         id="stop5079" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2679"
-       inkscape:collect="always">
-      <stop
-         id="stop2681"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop2683"
-         offset="1"
-         style="stop-color:#d3d7cf" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2591">
-      <stop
-         id="stop2593"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2595"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.094188e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5075"
-       id="linearGradient1401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,95.99994,-121)"
-       x1="53.499996"
-       y1="158.41438"
-       x2="53.499996"
-       y2="142.05258" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2584"
-       id="linearGradient1426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,92.99085,-97.26213)"
-       x1="49.430401"
-       y1="112.94963"
-       x2="49.667324"
-       y2="115.13713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,338.9463,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2679"
-       id="radialGradient1439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.222659,-0.996273,-2.129992,0.476041,356.9463,20.8517)"
-       cx="64.227074"
-       cy="147.99352"
-       fx="64.227074"
-       fy="147.99352"
-       r="8.75" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2316"
-       id="linearGradient2322"
-       x1="24.476166"
-       y1="13.658564"
-       x2="23.750401"
-       y2="36"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,48.00034,0)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15294118"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="46.567445"
-     inkscape:cy="3.7129274"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:grid-points="true"
-     fill="#fcaf3e"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     guidetolerance="1px"
-     stroke="#729fcf"
-     inkscape:window-width="1144"
-     inkscape:window-height="808"
-     inkscape:window-x="290"
-     inkscape:window-y="40"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     borderlayer="top">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="38.996647"
-       id="guide2194" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="9.0140845"
-       id="guide2196" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="9.0140845"
-       id="guide2198" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="38.975184"
-       id="guide2200" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="22.988281"
-       id="guide2202" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="23.908786"
-       id="guide2204" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="157.99417"
-       id="guide4332" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-36.062446"
-       id="guide4334" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-58.02695"
-       id="guide4336" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="180.00287"
-       id="guide4338" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="107.92217"
-       id="guide4417" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="129.93087"
-       id="guide4419" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="19.996875"
-       id="guide5106" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="63.039674"
-       id="guide5119" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="49.066305"
-       id="guide5121" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-87.043372"
-       id="guide5307" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-102.03286"
-       id="guide5309" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-100.04058"
-       id="guide3111" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="-92.545841"
-       id="guide1879" />
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="2"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Media Seek Forward</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="cccccccc"
-       id="path1441"
-       d="M 24.499943,13.5 L 41.999943,24 L 24.499943,34.5 L 24.499943,13.5 z M 6.4999427,13.5 L 23.999943,24 L 6.4999427,34.5 L 6.4999427,13.5 z "
-       style="opacity:0.15;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2322);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       sodipodi:nodetypes="cccc"
-       id="path5515"
-       d="M 24.499943,13.5 L 41.999943,24 L 24.499943,34.5 L 24.499943,13.5 z "
-       style="color:#000000;fill:url(#radialGradient1439);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       style="color:#000000;fill:url(#radialGradient1436);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 6.4999427,13.5 L 23.999943,24 L 6.4999427,34.5 L 6.4999427,13.5 z "
-       id="use5517"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/lapo/Desktop/Grafica/Icone/media-actions.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       sodipodi:nodetypes="ccccccccc"
-       style="opacity:0.07027025;color:#000000;fill:url(#linearGradient1426);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 6.4999427,13.5 L 7.6874427,14.21875 L 6.4999427,14.09375 L 6.4999427,13.5 z M 24.499943,13.75 L 24.968693,13.78125 L 28.937443,16.15625 L 24.499943,15.75 L 24.499943,13.75 z "
-       id="path2915" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1401);stroke-width:1.0000006;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 24.499943,13.5 L 41.999943,24 L 24.499943,34.5 L 24.499943,13.5 z M 6.4999427,13.5 L 23.999943,24 L 6.4999427,34.5 L 6.4999427,13.5 z "
-       id="path5521"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 24.999943,14.375 L 41.031193,24 L 24.999943,33.625 L 24.999943,14.375 z M 6.9999427,14.375 L 23.031193,24 L 6.9999427,33.625 L 6.9999427,14.375 z M 25.999943,16.15625 L 25.999943,31.84375 L 39.093693,24 L 25.999943,16.15625 z M 7.9999427,16.15625 L 7.9999427,31.84375 L 21.093693,24 L 7.9999427,16.15625 z "
-       id="path5525"
-       sodipodi:nodetypes="cccccccccccccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 35.587969,21.78401 L 26.062843,16.1875 L 26.062843,22.230393 L 35.587969,21.78401 z "
-       id="path3197"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-    <path
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path4072"
-       d="M 20.278833,23.207107 L 8.0003427,16.1875 L 8.0003427,24.05882 L 20.278833,23.207107 z "
-       style="opacity:0.56111109;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/tennis_ball.svg Deleted

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0" width="100%" height="100%"
-   viewBox="0 -90 425 425"
-   id="svg2">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4950">
-      <stop
-         id="stop4952"
-         style="stop-color:#e2fa5b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4954"
-         style="stop-color:#d4f70c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="253.74461"
-       cy="600.07898"
-       r="205.71875"
-       fx="253.74461"
-       fy="600.07898"
-       id="radialGradient4956"
-       xlink:href="#linearGradient4950"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1.82004e-3)" />
-    <radialGradient
-       cx="253.74461"
-       cy="600.07898"
-       r="205.71875"
-       fx="253.74461"
-       fy="600.07898"
-       id="radialGradient4967"
-       xlink:href="#linearGradient4950"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1.82004e-3)" />
-  </defs>
-  <g
-     id="layer1">
-    <g
-       transform="translate(-43,-477.09551)"
-       id="g4960">
-      <path
-         d="M 252.36853,389.41117 C 136.70783,390.14455 43.076139,484.24738 43.076139,600.07964 C 43.076139,601.31603 43.150889,602.52851 43.172149,603.75986 C 45.149579,718.34096 138.6945,810.74811 253.74462,810.74812 C 338.13215,810.74812 410.70113,760.90308 444.2398,689.15415 C 445.35106,686.77684 445.34625,683.89478 446.37083,681.4704 C 450.43677,671.84942 453.98034,662.48224 457.41826,652.24466 C 457.84742,650.56239 458.73087,648.88305 459.11923,647.18493 C 462.58327,632.03828 464.4131,616.27131 464.4131,600.07964 C 464.4131,567.40711 456.74514,536.57635 443.45187,508.97025 C 429.09714,479.15991 407.96709,453.21984 382.05357,433.19146 C 377.73996,430.12555 374.83668,431.84373 373.02888,430.54154 C 370.39265,428.6426 368.46005,427.51868 366.11328,425.98336 C 364.35863,424.83546 365.712,422.24674 361.46364,419.13705 C 329.96695,400.26691 293.13647,389.41117 253.74462,389.41117 C 253.29038,389.41117 252.82211,389.40829 252.36853,389.41117 z"
-         id="path4943"
-         style="opacity:1;fill:#d7f721;fill-opacity:0.30357098;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.254464" />
-      <path
-         d="M 252.38701,392.23957 C 138.27915,392.96311 45.904559,485.80252 45.904559,600.07964 C 45.904559,601.29943 45.978309,602.49563 45.999269,603.71044 C 47.950159,716.75318 140.23916,807.91969 253.74462,807.9197 C 336.99917,807.9197 408.59385,758.74386 441.68222,687.95823 C 442.77856,685.61284 442.77383,682.76948 443.78465,680.37764 C 447.79599,670.88584 451.292,661.64442 454.68376,651.54428 C 455.10716,649.88461 455.97875,648.22781 456.36189,646.55249 C 459.77941,631.6092 461.58468,616.05391 461.58468,600.07964 C 461.58468,567.84577 454.01968,537.42893 440.90487,510.19347 C 426.74288,480.78337 405.89651,455.19156 380.33091,435.43208 C 376.0752,432.40733 373.2109,434.10245 371.42738,432.81774 C 368.82655,430.9443 366.91989,429.83546 364.60462,428.32076 C 362.87353,427.18826 364.20874,424.6343 360.01742,421.56637 C 328.94359,402.94957 292.60759,392.23957 253.74462,392.23957 C 253.29648,392.23957 252.83449,392.23673 252.38701,392.23957 z"
-         id="path4941"
-         style="opacity:1;fill:#d7f721;fill-opacity:0.54017902;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.254464" />
-      <path
-         d="M 252.40087,394.36088 C 139.45765,395.07703 48.025869,486.96888 48.025869,600.07963 C 48.025869,601.28697 48.098869,602.47096 48.119619,603.67338 C 50.050599,715.56235 141.39765,805.79837 253.74462,805.79838 C 336.14943,805.79838 407.01339,757.12445 439.76404,687.06129 C 440.84919,684.73984 440.84451,681.9255 441.84501,679.55807 C 445.81541,670.16315 449.27574,661.01605 452.63288,651.019 C 453.05196,649.37627 453.91465,647.73638 454.29388,646.07816 C 457.67652,631.28739 459.46337,615.89086 459.46337,600.07963 C 459.46337,568.17476 451.97558,538.06837 438.99462,511.11088 C 424.97718,482.00096 404.34358,456.67035 379.03891,437.11254 C 374.82664,434.11867 371.99157,435.79649 370.22625,434.52489 C 367.65197,432.67057 365.76477,431.57305 363.47313,430.07381 C 361.75971,428.95286 363.08129,426.42497 358.93275,423.38835 C 328.17607,404.96157 292.21094,394.36088 253.74462,394.36088 C 253.30105,394.36088 252.84378,394.35807 252.40087,394.36088 z"
-         id="path3060"
-         style="opacity:1;fill:url(#radialGradient4967);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.254464" />
-      <path
-         d="M 363.125,428 C 328.02515,458.44301 283.77592,475.55137 241.2676,493.34223 C 214.33038,504.46474 186.10509,514.99668 165.84697,536.70655 C 126.12648,577.33106 111.37235,640.70802 128.8125,694.8125 C 145.21839,745.78496 192.95627,784.06916 245.95946,790.66723 C 287.73327,796.14919 331.49763,786.53551 365.8125,761.84375 C 391.01509,743.90933 413.65729,722.31619 433,698.21875 C 438.94003,690.69649 444.74985,682.98684 447,673.46875 C 449.42806,664.55121 454.93911,656.00739 454.40625,646.59375 C 446.34975,654.47119 443.24192,666.11682 436.18569,674.91931 C 416.76626,701.94253 393.04671,725.51157 367.075,746.0375 C 340.91386,766.84013 308.29869,779.41227 274.78161,779.90166 C 234.342,782.2678 193.19344,766.30037 166.375,736 C 141.93474,709.24028 130.57612,671.78758 134.2067,635.75521 C 137.93013,588.35614 164.95113,541.246 208.80623,520.62657 C 261.43646,496.15745 319.06928,479.59167 364.53822,442.37801 C 366.73576,439.40545 373.78772,437.18476 371.875,432.875 C 369.64163,430.63193 366.48704,427.90302 363.125,428 z"
-         id="path4946"
-         style="fill:#f5f8ae;fill-opacity:0.47767902;fill-rule:evenodd;stroke:none;stroke-width:8.05599976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 363.41402,430.02469 C 321.51533,468.28421 246.68568,490.92574 203.49462,511.98588 C 147.33339,539.37033 119.1698,602.93537 124.15087,662.07963 C 130.18583,733.73783 189.209,786.25437 258.02587,789.79838 C 315.87234,792.77745 350.72943,771.04137 373.96337,753.45463 C 387.27577,743.37792 404.57603,727.39847 420.05712,710.61088 C 426.9613,703.12403 433.18592,694.85346 440.60954,684.4206 C 441.81795,682.51328 447.44145,666.54928 452.68935,650.85137 C 452.07046,652.18584 450.99882,653.88891 446.20017,662.52594 C 438.57329,676.25349 429.29571,688.68529 414.11962,705.14213 C 398.94353,721.59897 381.8057,737.39085 369.08837,747.01713 C 346.36745,764.21553 314.13129,784.60436 258.43212,781.73588 C 193.45267,778.38949 137.87644,729.0369 132.18212,661.42338 C 127.45533,605.2984 154.34406,544.92375 207.02587,519.23588 C 249.3944,498.57681 326.3518,475.94349 370.34465,434.57163 C 371.12133,433.84123 364.24345,429.26731 363.41402,430.02469 z"
-         id="path3125"
-         style="fill:#f5f8ae;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8.05599976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/tennis_black.svg Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg12385" sodipodi:version="0.32" inkscape:version="0.46+pre4" sodipodi:docname="tennis black.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs id="defs12387">
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective12393"/>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" inkscape:cx="282.59269" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1280" inkscape:window-height="938" inkscape:window-x="-4" inkscape:window-y="-4"/>
-  <metadata id="metadata12390">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title>Other map symbols</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Mohamed Ibrahim</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>Public Domain</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>clker.com</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>other map symbols</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
-      </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
-        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
-        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">
-    <path d="M 133.16548,78.635179 C 101.79743,78.635179 76.272996,104.15962 76.272996,135.52766 L 76.272996,544.91099 C 76.272996,576.27903 101.79743,601.80347 133.16548,601.80347 L 542.49368,601.80347 C 573.91685,601.80347 599.38616,576.27903 599.38616,544.91099 L 599.38616,135.52766 C 599.38616,104.15962 573.91685,78.635179 542.49368,78.635179 L 133.16548,78.635179 z" style="fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path4510"/>
-    <path d="M 133.16548,67.609504 C 95.733313,67.609504 65.247321,98.040368 65.247321,135.52766 L 65.247321,544.91099 C 65.247321,582.34315 95.733313,612.82915 133.16548,612.82915 L 542.49368,612.82915 C 579.98097,612.82915 610.46696,582.34315 610.46696,544.91099 L 610.46696,135.52766 C 610.46696,98.040368 579.98097,67.609504 542.49368,67.609504 L 133.16548,67.609504 z" style="fill: rgb(35, 31, 32); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path4512"/>
-    <path d="M 160.23351,327.9257 C 151.30272,327.9257 143.97064,335.25777 143.97064,344.18857 C 143.97064,353.11937 151.30272,360.34118 160.23351,360.34118 C 169.16431,360.34118 176.38613,353.11937 176.38613,344.18857 C 176.38613,335.25777 169.16431,327.9257 160.23351,327.9257" style="fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path4514"/>
-    <path d="M 385.65344,192.58553 C 405.0035,192.58553 420.82535,176.87395 420.82535,157.41363 C 420.82535,137.89818 405.0035,122.07634 385.65344,122.07634 C 366.138,122.07634 350.31616,137.89818 350.31616,157.41363 C 350.31616,176.87395 366.138,192.58553 385.65344,192.58553" style="fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path4516"/>
-    <path d="M 197.44517,264.41781 C 193.69644,269.71013 187.90796,273.12809 180.68614,274.45117 C 170.54252,276.16015 159.2412,273.23835 149.75912,266.3473 C 140.16678,259.56651 133.71676,249.86392 132.00778,239.77542 L 131.56676,234.70361 C 131.56676,229.41129 133.0001,224.67025 135.86677,220.59075 C 145.2386,207.47019 166.68353,206.58814 183.66307,218.66126 C 200.58749,230.73437 206.81699,251.29725 197.44517,264.41781 M 537.14622,506.65189 L 479.86784,439.0645 C 479.86784,439.0645 461.95112,334.59623 461.95112,334.37572 C 461.95112,334.26546 459.24983,322.57824 459.24983,322.57824 C 459.36008,322.6885 452.08314,289.61148 446.46004,263.75627 C 455.39084,268.93833 463.49471,273.56912 463.88061,273.78963 C 464.32164,274.72681 494.25635,331.72956 494.25635,331.72956 C 496.51661,335.91931 500.32047,339.0065 504.84099,340.43984 C 509.47178,341.81805 514.32308,341.37702 518.51283,339.11676 C 522.70259,336.96675 525.84491,333.21802 527.22312,328.58724 C 528.71158,324.06671 528.27055,319.21541 526.01029,315.02566 L 493.20891,252.45495 C 493.20891,252.45495 491.88583,250.19469 490.17685,248.48571 C 487.80633,246.11519 482.62426,243.19338 482.62426,243.19338 L 418.89586,206.91891 C 410.84711,202.83941 401.86119,201.40607 392.93039,203.33557 C 389.29192,204.10736 385.81883,205.5407 381.95984,207.69071 C 381.51882,207.80097 367.40595,214.03047 359.24695,233.21515 L 326.5007,299.09356 C 326.5007,299.09356 276.66464,308.79615 274.95566,309.07179 C 274.51464,309.18205 274.07361,309.29231 273.74284,309.51282 L 227.21449,276.60118 C 216.7401,269.2691 215.47215,247.27288 215.36189,246.44596 C 214.03881,231.34078 205.43878,217.11766 191.65669,207.35994 C 179.14255,198.5394 164.0925,194.73554 150.31041,196.9958 C 139.56037,198.81504 130.40906,204.43813 124.56545,212.59713 C 120.04493,218.99203 117.67441,226.59974 117.67441,234.81387 C 117.67441,234.92413 118.33595,241.92543 118.33595,241.92543 C 120.70647,255.81778 129.19624,268.71782 141.71038,277.64862 C 154.27965,286.57942 169.27457,290.38327 183.05666,288.01275 L 186.25411,287.35121 C 186.58488,287.1307 207.25802,280.79094 217.40164,287.68198 C 217.40164,287.79224 252.24277,312.32437 261.50434,318.88464 C 260.51203,320.42824 258.80305,323.73594 258.91331,327.20903 C 258.91331,328.25647 259.02356,329.35904 259.24408,330.40647 C 261.06331,340.10907 270.54539,346.55909 280.19286,344.6296 L 342.0469,332.55648 C 342.0469,332.55648 347.28409,330.95776 349.54436,329.35904 C 352.46616,327.31929 354.61617,322.96414 354.61617,322.96414 L 370.87904,290.27302 C 370.87904,290.27302 382.0701,343.14113 382.29061,344.07831 C 381.02266,345.40139 331.57251,397.82848 331.57251,397.82848 L 330.69045,398.87592 C 325.89428,403.28619 323.19299,409.1298 323.19299,415.24905 L 323.19299,526.38785 C 323.19299,538.24045 332.89559,547.83279 344.69306,547.83279 C 356.43541,547.83279 366.138,538.24045 366.138,526.38785 L 366.138,433.55167 C 370.65853,428.81063 408.58685,388.89768 418.67534,378.31303 C 419.77791,384.59767 429.53563,440.88374 429.53563,440.88374 C 430.41769,445.84529 432.78821,450.36582 436.31642,454.00429 C 436.31642,454.11455 504.39997,534.4366 504.39997,534.4366 C 508.1487,538.73661 513.33076,541.4379 519.00899,541.98918 C 524.74234,542.43021 530.25518,540.61097 534.66545,536.91737 C 539.627,532.72762 542.16291,526.60837 542.16291,520.54424 C 542.16291,515.63782 540.56418,510.78652 537.14622,506.65189" style="fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path4518"/>
-  </g>
-</svg>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/gui/icons/tennis_racket.svg Deleted

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="106.527px" height="286.222px" viewBox="0 0 106.527 286.222" enable-background="new 0 0 106.527 286.222" xml:space="preserve">
-<g>
-	<rect x="46.238" y="86.385" fill="none" width="12.52" height="12.516"/>
-	<rect x="30.755" y="39.927" fill="none" width="12.506" height="12.513"/>
-	<rect x="46.238" y="70.899" fill="none" width="12.52" height="12.509"/>
-	<rect x="46.238" y="24.224" fill="none" width="12.52" height="12.726"/>
-	<rect x="46.238" y="117.357" fill="none" width="12.52" height="12.334"/>
-	<rect x="46.238" y="101.875" fill="none" width="12.52" height="12.517"/>
-	<rect x="30.755" y="55.417" fill="none" width="12.506" height="12.509"/>
-	<rect x="30.755" y="24.224" fill="none" width="12.506" height="12.726"/>
-	<path fill="none" d="M43.26,144.816v-12.148H30.755v4.69C34.617,140.742,38.815,143.274,43.26,144.816z"/>
-	<path fill="none" d="M58.758,146.007v-13.339h-12.52v12.974c2.299,0.55,4.632,0.926,7.027,0.926   C55.127,146.568,56.955,146.343,58.758,146.007z"/>
-	<rect x="30.755" y="70.899" fill="none" width="12.506" height="12.509"/>
-	<rect x="30.755" y="117.357" fill="none" width="12.506" height="12.334"/>
-	<rect x="30.755" y="101.875" fill="none" width="12.506" height="12.517"/>
-	<rect x="30.755" y="86.385" fill="none" width="12.506" height="12.516"/>
-	<path fill="none" d="M12.296,98.901V86.385H7.901C8.345,90.7,9.03,94.878,9.949,98.901H12.296z"/>
-	<rect x="46.238" y="39.927" fill="none" width="12.52" height="12.513"/>
-	<rect x="15.27" y="55.417" fill="none" width="12.506" height="12.509"/>
-	<rect x="15.27" y="39.927" fill="none" width="12.506" height="12.513"/>
-	<rect x="15.27" y="70.899" fill="none" width="12.506" height="12.509"/>
-	<path fill="none" d="M27.775,24.224H22.43c-2.685,3.505-5.11,7.44-7.161,11.842v0.884h12.506V24.224z"/>
-	<path fill="none" d="M12.296,70.899H7.409c-0.052,1.397-0.138,2.777-0.138,4.206c0,2.812,0.131,5.575,0.337,8.304h4.687   L12.296,70.899L12.296,70.899z"/>
-	<rect x="15.27" y="86.385" fill="none" width="12.506" height="12.516"/>
-	<rect x="15.27" y="101.875" fill="none" width="12.506" height="12.517"/>
-	<path fill="none" d="M12.296,101.875h-1.645c0.496,1.893,1.053,3.734,1.645,5.541V101.875z"/>
-	<rect x="46.238" y="55.417" fill="none" width="12.52" height="12.509"/>
-	<path fill="none" d="M12.296,67.926V55.417H9.137c-0.774,4.002-1.347,8.166-1.632,12.509H12.296z"/>
-	<path fill="none" d="M12.296,43.557c-0.974,2.834-1.816,5.795-2.519,8.882h2.519V43.557z"/>
-	<rect x="61.728" y="101.875" fill="none" width="12.517" height="12.517"/>
-	<path fill="none" d="M30.755,15.593v5.658H43.26V8.844C38.815,10.224,34.617,12.508,30.755,15.593z"/>
-	<path fill="none" d="M77.221,21.25h4.452c-1.418-1.602-2.907-3.06-4.452-4.407V21.25z"/>
-	<path fill="none" d="M46.238,21.25h12.52V7.777c-1.803-0.299-3.631-0.499-5.491-0.499c-2.396,0-4.729,0.332-7.027,0.824   L46.238,21.25L46.238,21.25z"/>
-	<path fill="none" d="M27.775,21.25v-3.083c-1.009,0.96-1.972,2.01-2.922,3.083H27.775z"/>
-	<path fill="none" d="M89.727,118.483v-1.125H77.221v12.334h5.66C85.421,126.36,87.703,122.585,89.727,118.483z"/>
-	<path fill="none" d="M92.707,86.385v12.516h3.868c0.918-4.023,1.604-8.201,2.047-12.516H92.707z"/>
-	<path fill="none" d="M92.707,111.662c1.204-3.125,2.278-6.377,3.166-9.788h-3.166V111.662z"/>
-	<path fill="none" d="M92.707,55.417v12.509h6.312c-0.286-4.343-0.857-8.507-1.631-12.509H92.707z"/>
-	<path fill="none" d="M27.775,129.691v-12.334H16.257c2.154,4.542,4.618,8.7,7.39,12.334H27.775z"/>
-	<rect x="77.221" y="101.875" fill="none" width="12.506" height="12.517"/>
-	<rect x="61.728" y="117.357" fill="none" width="12.517" height="12.334"/>
-	<path fill="none" d="M77.221,132.668v3.324c1.091-1.042,2.153-2.147,3.183-3.324H77.221z"/>
-	<path fill="none" d="M35.532,149.333c3.964,6.64,7.874,13.666,9.942,18.853c4.498,11.231,7.014,25.036,7.678,28.956h0.354   c0.657-3.92,3.181-17.723,7.679-28.956c2.079-5.21,6.001-12.282,9.994-18.938c-5.604,2.971-11.625,4.598-17.912,4.598   C47.047,153.845,41.073,152.253,35.532,149.333z"/>
-	<path fill="none" d="M27.775,132.668h-1.652c0.551,0.626,1.084,1.284,1.652,1.875V132.668z"/>
-	<rect x="77.221" y="39.927" fill="none" width="12.506" height="12.513"/>
-	<rect x="61.728" y="39.927" fill="none" width="12.517" height="12.513"/>
-	<rect x="61.728" y="24.224" fill="none" width="12.517" height="12.726"/>
-	<path fill="none" d="M61.728,8.407V21.25h12.517v-6.809C70.355,11.609,66.157,9.56,61.728,8.407z"/>
-	<path fill="none" d="M74.244,138.622v-5.954H61.728V145.3C66.157,144.014,70.355,141.736,74.244,138.622z"/>
-	<rect x="61.728" y="55.417" fill="none" width="12.517" height="12.509"/>
-	<rect x="77.221" y="86.385" fill="none" width="12.506" height="12.516"/>
-	<rect x="61.728" y="70.899" fill="none" width="12.517" height="12.509"/>
-	<rect x="61.728" y="86.385" fill="none" width="12.517" height="12.516"/>
-	<rect x="77.221" y="70.899" fill="none" width="12.506" height="12.509"/>
-	<rect x="77.221" y="55.417" fill="none" width="12.506" height="12.509"/>
-	<path fill="none" d="M77.221,36.95h12.506v-3.871c-1.693-3.218-3.576-6.17-5.63-8.855h-6.876V36.95z"/>
-	<path fill="none" d="M92.707,83.408h6.208c0.203-2.729,0.337-5.492,0.337-8.304c0-1.428-0.086-2.808-0.138-4.206h-6.408   L92.707,83.408L92.707,83.408z"/>
-	<path fill="none" d="M92.707,52.439h4.04c-1.008-4.433-2.312-8.608-3.872-12.513h-0.168V52.439z"/>
-	<path d="M106.527,75.104C106.527,31.691,82.638,0,53.266,0S0,31.691,0,75.104c0,23.14,6.786,43.977,17.575,58.403l-0.534,0.351   c0.168,0.248,16.797,24.829,21.677,37.028c3.82,9.527,6.175,21.447,7.034,26.255H43.87v1.827v76.742l-3.176,3.799v0.65v6.061H66.38   v-7.234l-3.95-3.939v-77.905h-1.528c0.856-4.808,3.228-16.729,7.031-26.255c4.876-12.199,21.508-36.78,21.684-37.028l-0.619-0.42   C99.762,119.03,106.527,98.213,106.527,75.104z M7.271,75.104c0-1.428,0.086-2.808,0.138-4.206h4.887v12.509H7.609   C7.402,80.679,7.271,77.916,7.271,75.104z M15.27,83.408V70.899h12.506v12.509H15.27z M27.775,86.385v12.516H15.27V86.385H27.775z    M15.27,67.926V55.417h12.506v12.509H15.27z M15.27,52.439V39.927h12.506V52.44L15.27,52.439L15.27,52.439z M15.27,36.95v-0.884   c2.051-4.401,4.477-8.336,7.161-11.842h5.345V36.95H15.27z M12.296,55.417v12.509h-4.79c0.285-4.343,0.856-8.507,1.632-12.509   H12.296z M9.777,52.439c0.702-3.087,1.545-6.048,2.519-8.882v8.882H9.777z M12.296,86.385v12.516H9.949   C9.03,94.878,8.345,90.7,7.901,86.385H12.296z M12.296,101.875v5.541c-0.592-1.807-1.148-3.648-1.645-5.541H12.296z M15.27,101.875   h12.506v12.517H15.27V101.875z M58.758,55.417v12.509h-12.52V55.417H58.758z M46.238,52.439V39.927h12.52V52.44L46.238,52.439   L46.238,52.439z M58.758,70.899v12.509h-12.52V70.899H58.758z M58.758,86.385v12.516h-12.52V86.385H58.758z M58.758,101.875v12.517   h-12.52v-12.517H58.758z M58.758,117.357v12.334h-12.52v-12.334H58.758z M58.758,36.95h-12.52V24.224h12.52V36.95z M43.26,39.927   V52.44H30.755V39.927H43.26z M30.755,36.95V24.224H43.26V36.95H30.755z M43.26,55.417v12.509H30.755V55.417H43.26z M43.26,70.899   v12.509H30.755V70.899H43.26z M43.26,86.385v12.516H30.755V86.385H43.26z M43.26,101.875v12.517H30.755v-12.517H43.26z    M43.26,117.357v12.334H30.755v-12.334H43.26z M30.755,21.25v-5.658c3.861-3.085,8.061-5.369,12.506-6.749V21.25H30.755z    M43.26,132.668v12.148c-4.445-1.542-8.645-4.074-12.506-7.458v-4.69H43.26z M46.238,132.668h12.52v13.339   c-1.803,0.336-3.631,0.561-5.491,0.561c-2.396,0-4.729-0.375-7.027-0.926L46.238,132.668L46.238,132.668z M61.728,114.391v-12.517   h12.517v12.517H61.728z M74.244,117.357v12.334H61.728v-12.334H74.244z M61.728,98.901V86.385h12.517v12.516H61.728z    M61.728,83.408V70.899h12.517v12.509H61.728z M61.728,67.926V55.417h12.517v12.509H61.728z M61.728,52.439V39.927h12.517V52.44   L61.728,52.439L61.728,52.439z M61.728,36.95V24.224h12.517V36.95H61.728z M74.244,132.668v5.954   c-3.889,3.114-8.087,5.393-12.517,6.68v-12.633L74.244,132.668L74.244,132.668z M61.728,21.25V8.407   c4.429,1.153,8.628,3.202,12.517,6.035v6.809L61.728,21.25L61.728,21.25z M89.727,33.079v3.871H77.221V24.224h6.876   C86.151,26.908,88.033,29.861,89.727,33.079z M96.747,52.439h-4.04V39.927h0.168C94.435,43.831,95.739,48.007,96.747,52.439z    M99.252,75.104c0,2.812-0.134,5.575-0.337,8.304h-6.208V70.899h6.408C99.166,72.296,99.252,73.676,99.252,75.104z M89.727,55.417   v12.509H77.221V55.417H89.727z M77.221,52.439V39.927h12.506V52.44L77.221,52.439L77.221,52.439z M89.727,70.899v12.509H77.221   V70.899H89.727z M89.727,86.385v12.516H77.221V86.385H89.727z M89.727,101.875v12.517H77.221v-12.517H89.727z M92.707,98.901   V86.385h5.916c-0.443,4.315-1.129,8.493-2.047,12.516H92.707z M95.873,101.875c-0.888,3.411-1.962,6.663-3.166,9.788v-9.788H95.873   z M92.707,67.926V55.417h4.681c0.773,4.002,1.345,8.166,1.631,12.509H92.707z M77.221,117.357h12.506v1.125   c-2.023,4.102-4.306,7.877-6.846,11.208h-5.66V117.357z M81.674,21.25h-4.452v-4.407C78.766,18.191,80.256,19.648,81.674,21.25z    M58.758,7.777V21.25h-12.52V8.103c2.299-0.492,4.632-0.824,7.027-0.824C55.127,7.278,56.955,7.478,58.758,7.777z M27.775,18.167   v3.083h-2.922C25.803,20.177,26.767,19.127,27.775,18.167z M16.257,117.357h11.52v12.334h-4.13   C20.875,126.057,18.411,121.9,16.257,117.357z M26.123,132.668h1.652v1.875C27.208,133.952,26.674,133.294,26.123,132.668z    M61.184,168.187c-4.498,11.232-7.021,25.036-7.679,28.956h-0.354c-0.664-3.92-3.18-17.724-7.678-28.956   c-2.068-5.188-5.979-12.213-9.942-18.852c5.541,2.918,11.515,4.512,17.733,4.512c6.286,0,12.31-1.629,17.911-4.598   C67.186,155.904,63.263,162.976,61.184,168.187z M77.221,135.992v-3.324h3.183C79.375,133.845,78.312,134.95,77.221,135.992z"/>
-</g>
-</svg>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/gui/icons/tennis_racket_color.svg Deleted

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg height="297mm" id="svg1065" space="preserve" width="210mm" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-     viewBox="0 400 700 600">
-  <defs id="defs1067">
-    <linearGradient id="linearGradient613" x1="-0.44805193" x2="1.12337661" y1="3.90644707e-2" y2="0.55468756">
-      <stop offset="0" stop-color="rgb(102, 103, 103)"/>
-      <stop offset="1" stop-color="rgb(243, 242, 242)"/>
-    </linearGradient>
-    <linearGradient id="linearGradient617" x1="3.40267583e-8" x2="1" y1="2.88393437e-7" y2="2.88393437e-7">
-      <stop offset="0" stop-color="rgb(0, 47, 255)"/>
-      <stop offset="1" stop-color="rgb(0, 210, 255)"/>
-    </linearGradient>
-    <radialGradient cx="0.14787759" cy="0.44104704" fx="0.14787759" fy="0.44104704" id="radialGradient621" r="1.21914566">
-      <stop offset="0" stop-color="rgb(0, 47, 255)"/>
-      <stop offset="1" stop-color="rgb(0, 210, 255)"/>
-    </radialGradient>
-    <linearGradient id="linearGradient659" x1="3.64689186e-8" x2="1" y1="-7.87910835e-7" y2="-7.87910835e-7">
-      <stop id="stop661" offset="0" stop-color="rgb(90, 58, 0)"/>
-      <stop id="stop662" offset="1" stop-color="rgb(181, 87, 0)"/>
-    </linearGradient>
-  </defs>
-  <path d="M 416.1915 420.4722 C 416.1914 515.0332 484.081 573.3936 532.3719 580.9572 C 462.0018 589.5654 401.6856 505.5948 400.7644 404.172 C 400.7644 309.6111 474.5365 196.3582 568.3828 250.0296 C 469.3849 226.1883 416.1914 325.9113 416.1915 420.4722 z " id="path609" style="fill: rgb(128, 128, 128); fill-rule: evenodd; stroke-width: 1;" transform="matrix(0.526812, 0.863047, -0.922754, 0.492726, 555.323, -259.616)"/>
-  <path d="M 612.3266 306.7496 C 646.3233 364.5647 602.5204 449.6466 514.4899 496.7852 C 426.4594 543.9238 327.5367 535.2688 293.5401 477.4537 C 259.5433 419.6386 303.3465 334.5568 391.3769 287.4182 C 479.4074 240.2796 578.3299 248.9346 612.3266 306.7496 z M 624.408 321.5502 C 649.3072 392.8789 616.2241 465.508 521.2186 518.8185 C 426.2133 572.1289 354.9153 566.3118 299.0591 513.5194 C 245.71 463.0507 282.6412 342.2988 385.9147 286.626 C 480.9201 233.3156 598.6464 251.0933 624.408 321.5502 z " id="path1074" style="fill: url(#linearGradient613) rgb(0, 0, 0); fill-rule: evenodd; stroke-width: 1;"/>
-  <path d="M 498.0093 31.88945 C 545.1006 99.24717 553.6677 165.9302 568.5827 279.4048 C 559.7012 248.9398 599.4503 250.2098 602.3406 266.2422 C 621.1034 159.4538 668.8506 56.331 708.663 -17.94747 C 694.7423 -18.52522 686.7485 -24.01908 688.0483 -36.04575 C 677.3559 -11.09988 649.4699 30.0514 617.3574 47.6058 C 615.0333 54.34914 619.7576 62.80021 626.09 66.86723 C 632.806 65.16612 636.7314 67.89312 625.9106 91.93546 C 610.3433 133.3262 597.7629 166.4365 587.4074 207.586 C 586.0513 211.0011 582.6169 213.2484 582.1523 210.4914 C 574.0234 167.0258 565.9648 128.143 560.1321 108.0357 C 557.2159 97.98196 558.6324 86.37468 573.9348 78.61247 C 564.1315 78.42651 556.4266 73.32398 561.6135 60.15566 C 532.6949 44.70081 528.1865 38.26439 519.5271 29.18067 C 509.5301 20.59781 501.0435 22.7095 498.0093 31.88945 z " id="path1070" style="fill: url(#radialGradient621) rgb(0, 0, 0); fill-rule: evenodd; fill-opacity: 1;" transform="matrix(0.612826, 0.790218, -0.790218, 0.612826, 0, 0)"/>
-  <path d="M 591.3309 231.1894 C 583.2095 230.1047 566.9222 240.431 567.145 244.5724 L 562.0318 367.427 C 562.0318 370.6988 564.7338 378.1627 565.9919 372.394 C 568.421 367.7352 577.9586 359.1783 584.0361 359.6408 C 592.258 360.6241 604.3881 369.5119 605.8839 374.8032 L 608.7303 247.976 C 608.5954 246.9915 608.7469 245.3542 607.9775 244.5065 C 605.8468 237.8268 594.3947 231.3884 591.3309 231.1894 z " id="path614" style="fill: rgb(128, 128, 128); fill-rule: evenodd;" transform="matrix(0.602742, 0.797936, -0.797936, 0.602742, 0, 0)"/>
-  <path d="M 63.99471 668.528 C 58.08884 665.6456 52.16021 673.8187 52.13235 680.3903 L 52.08504 691.5512 C 52.05718 698.1229 58.04152 700.5311 63.9474 703.4136 L 75.06899 708.8417 C 80.97487 711.7242 86.90349 703.5509 86.93135 696.9792 L 86.97867 685.8183 C 87.00652 679.2468 81.02219 676.8384 75.11629 673.956 L 63.99471 668.528 z " id="path616" style="fill: url(#linearGradient617) rgb(0, 0, 0); fill-rule: evenodd; fill-opacity: 1;" transform="matrix(0.999805, 0.019742, -0.019742, 0.999805, 0, 0)"/>
-  <path d="M 291.9722 429.7143 L 521.346 269.4444 " id="path622" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 289.5757 446.7634 L 541.2881 271.139 " id="path623"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 291.8695 462.1179 L 554.1431 276.2229 " id="path624"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 295.2586 475.8805 L 569.4976 282.5049 " id="path625"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 302.0372 488.3421 L 582.4555 289.2837 " id="path626"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 311.5031 497.4143 L 594.2151 297.7567 " id="path627"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 322.6635 505.8875 L 601.5927 308.4208 " id="path628"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 335.8092 512.4603 L 609.5695 319.1876 " id="path629"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 349.0579 519.4445 L 616.4508 331.5465 " id="path630"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 365.4903 524.1348 L 620.2336 345.7026 " id="path631"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 385.9286 525.9323 L 622.5273 359.4475 " id="path632"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 294.2661 412.4773 L 498.614 269.5473 " id="path633"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 408.0153 526.9152 L 619.5122 377.729 " id="path635"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 349.9407 324.5193 L 544.823 476.6122 " id="path636" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 341.0439 333.4161 L 534.2316 484.6617 " id="path637" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 331.7235 341.8893 L 522.7928 491.4402 " id="path638"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 324.0977 351.2098 L 511.7777 498.6424 " id="path639" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 316.8955 360.9539 L 499.4917 504.5736 " id="path640"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 311.3879 371.5453 L 484.6637 509.6575 " id="path641" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 305.0331 382.1367 L 471.5303 516.0124 " id="path642" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 299.1019 395.2701 L 455.0077 519.8253 " id="path643" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 360.9558 316.0461 L 554.5671 468.5627 " id="path644"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 371.9709 308.4204 L 565.1585 460.0896 " id="path645"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 384.257 301.2183 L 574.9026 450.7692 " id="path646"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 396.9666 294.4396 L 582.9521 441.0251 " id="path647"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 410.5237 288.5085 L 591.4252 431.2809 " id="path648"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 424.0807 282.5773 L 599.0511 420.6895 " id="path649" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 437.6377 277.4934 L 605.8296 409.6744 " id="path650" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 455.0077 274.1041 L 611.7608 397.3884 " id="path651" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 472.3776 270.7149 L 617.2683 385.1023 " id="path652"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 497.3735 270.291 L 621.0814 366.8849 " id="path653" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 298.2547 394.8462 L 471.9541 271.1384 " id="path654" style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 438.6181 523.638 L 610.8348 400.5655 " id="path655"  style="fill: none; fill-rule: evenodd; stroke: black; stroke-opacity: 1; stroke-width: 1pt; stroke-linejoin: miter; stroke-linecap: butt; fill-opacity: 1;"/>
-  <path d="M 103.2483 630.0995 L 81.34227 645.2273 C 84.13137 643.6738 92.87841 661.7924 94.36981 665.1392 C 95.38231 668.3136 97.28188 687.2379 94.98708 688.3677 L 117.8026 671.845 C 119.0736 670.0091 118.2878 653.6363 116.9295 650.3111 C 115.2794 647.2319 106.0727 627.84 103.2483 630.0995 z " id="path663" style="fill: url(#linearGradient659) rgb(0, 0, 0); fill-rule: evenodd;"/>
-  <path d="M 146.7096 599.6222 C 149.4987 599.3397 158.969 615.1902 160.4604 618.537 C 161.4729 621.7114 163.0729 639.7369 160.7781 640.8668 L 169.4844 634.7644 C 175.5441 631.1826 174.529 613.6218 172.4286 610.4874 C 170.8175 607.4757 153.715 597.628 146.7096 599.6222 z " id="path669" style="fill: url(#linearGradient659) rgb(0, 0, 0); fill-rule: evenodd;"/>
-  <path d="M 146.1618 599.8959 L 124.979 615.1477 C 127.7681 613.5942 136.9388 630.8655 138.4302 634.2123 C 139.4427 637.3867 141.0427 655.7119 138.7479 656.8417 L 161.5634 640.3189 C 162.8344 638.483 162.3482 622.7094 160.9899 619.3842 C 159.3398 616.305 148.9862 597.6364 146.1618 599.8959 z " id="path670" style="fill: url(#linearGradient659) rgb(0, 0, 0); fill-rule: evenodd;"/>
-  <path d="M 81.76585 645.6509 L 58.88842 660.9027 C 61.67752 659.3492 71.29758 679.3893 72.78898 682.7361 C 73.80148 685.9106 73.45426 704.3855 71.15947 705.5153 L 95.32302 688.0939 C 96.59402 686.2579 96.5572 669.7354 95.1989 666.4102 C 93.54881 663.331 84.59026 643.3914 81.76585 645.6509 z " id="path671" style="fill: url(#linearGradient659) rgb(0, 0, 0); fill-rule: evenodd;"/>
-  <path d="M 124.9789 615.0234 L 103.0729 630.0998 C 105.862 628.5463 114.9086 646.1172 116.4 649.464 C 117.4125 652.6384 119.3121 671.4129 117.0173 672.5427 L 139.3834 656.1697 C 140.6544 654.3339 140.318 637.9611 138.9597 634.6359 C 137.3096 631.5567 127.8033 612.764 124.9789 615.0234 z " id="path672" style="fill: url(#linearGradient659) rgb(0, 0, 0); fill-rule: evenodd;"/>
-  <path d="M 59.31219 660.6906 L 46.39069 669.1638 C 49.17979 667.6104 63.70714 676.0504 67.25587 678.0607 C 69.83807 679.6164 71.563 682.0149 73.50476 685.0511 C 73.71658 683.1447 63.40755 660.3375 59.31219 660.6906 z " id="path673" style="fill: url(#linearGradient659) rgb(0, 0, 0); fill-rule: evenodd;"/>
-  <path d="M 477.1939 353.1388 L 465.2348 343.3206 C 461.7762 340.4812 457.077 340.0433 451.1371 342.0071 C 445.2702 344.0308 437.9078 348.0025 429.0503 353.9225 C 418.8805 360.7196 412.6097 366.4832 410.2378 371.2134 C 409.2524 373.1731 408.8687 374.8124 409.0861 376.1309 C 409.4494 377.4064 410.5411 378.7912 412.3614 380.2857 L 419.1874 385.8897 C 419.5516 386.1887 421.6995 387.9521 425.6313 391.18 C 429.563 394.4078 433.2401 397.4267 436.6622 400.2361 C 440.0844 403.0457 442.2321 404.8089 443.106 405.5263 C 443.9796 406.2436 441.5587 404.2561 435.8429 399.5635 L 448.9491 410.3234 L 451.2973 412.2512 C 451.3699 412.3109 451.4429 412.3707 451.5158 412.4306 C 451.5885 412.4903 451.6794 412.565 451.7887 412.6547 C 451.8616 412.7145 451.9343 412.7742 452.0072 412.8341 C 452.0799 412.8937 452.1709 412.9684 452.2801 413.0581 L 467.0791 425.2078 C 468.9723 426.5992 472.6526 425.5491 478.1202 422.0575 C 483.5877 418.566 485.6664 415.7938 484.3568 413.7414 L 452.3016 387.4248 C 449.5345 385.4788 451.5954 382.2034 458.4846 377.5989 C 464.9364 373.2868 469.3458 371.9394 471.7124 373.5567 L 471.8217 373.6464 L 502.6204 399.1758 C 506.334 402.0617 506.2211 406.285 502.2821 411.8457 C 498.343 417.4064 492.8011 422.6284 485.6568 427.512 C 478.5488 432.4255 471.041 436.115 463.1334 438.5805 C 455.2259 441.0461 449.2518 440.6202 445.2107 437.3026 L 431.777 426.2738 L 431.6132 426.1392 L 415.6674 413.0481 L 399.9402 400.1364 L 391.2028 392.9632 C 388.0356 390.363 386.5078 387.6429 386.6194 384.803 C 386.6218 382.0363 388.3733 378.4255 391.8745 373.971 C 398.2568 365.6931 408.3371 356.9496 422.1155 347.7406 C 438.9558 336.4852 453.1513 329.4101 464.7021 326.5156 C 469.3664 325.296 473.2647 324.9949 476.3971 325.6122 C 479.5298 326.0669 482.5707 327.5048 485.5193 329.9255 L 495.622 338.2196 L 497.3694 339.6542 L 510.421 350.3693 L 546.8447 380.2724 C 547.9005 381.1392 548.1726 382.4212 547.6612 384.1186 C 547.2955 385.7727 545.0898 387.952 541.0437 390.6562 C 534.1545 395.2607 529.5269 396.4288 527.1606 394.1604 C 525.8502 393.0846 522.155 390.0509 516.0751 385.0595 C 510.0317 380.098 504.1706 375.2861 498.4913 370.6236 C 492.8485 365.9909 488.6799 362.5686 485.9859 360.3568 C 483.3282 358.175 484.7482 359.3407 490.2454 363.8538 L 477.1939 353.1388 z M 612.8214 320.1133 C 641.4334 364.0478 606.9938 457.8091 486.3605 509.5427 C 398.601 547.4225 314.9539 518.6949 299.0369 480.6078 C 271.6583 416.4585 313.6688 331.6128 406.0085 290.5879 C 498.1469 250.2418 574.2889 262.1422 612.8214 320.1133 z " id="path770" style="font-weight: normal; fill: rgb(255, 255, 255); font-family: Captain Podd; opacity: 0.0316;"/>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/user-trash.svg Deleted

@@ -1,487 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg57"
-   sodipodi:version="0.32"
-   inkscape:version="0.45+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/places"
-   sodipodi:docname="user-trash.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       id="linearGradient381"
-       inkscape:collect="always">
-      <stop
-         id="stop382"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop383"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient368">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.10309278;"
-         offset="0.0000000"
-         id="stop369" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop372" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1065">
-      <stop
-         style="stop-color:#b5c051;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop1066" />
-      <stop
-         style="stop-color:#858e3f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop1067" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient172">
-      <stop
-         id="stop173"
-         offset="0.0000000"
-         style="stop-color:#616c08;stop-opacity:1.0000000;" />
-      <stop
-         id="stop174"
-         offset="1.0000000"
-         style="stop-color:#495106;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient161">
-      <stop
-         id="stop162"
-         offset="0.0000000"
-         style="stop-color:#575955;stop-opacity:1.0000000;" />
-      <stop
-         id="stop163"
-         offset="1.0000000"
-         style="stop-color:#7c7e79;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient157">
-      <stop
-         id="stop158"
-         offset="0.0000000"
-         style="stop-color:#babdb6;stop-opacity:1.0000000;" />
-      <stop
-         id="stop159"
-         offset="1.0000000"
-         style="stop-color:#f1f5ec;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient149"
-       inkscape:collect="always">
-      <stop
-         id="stop150"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop151"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1869">
-      <stop
-         style="stop-color:#eff3f4;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop1870" />
-      <stop
-         style="stop-color:#939596;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop1871" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1869"
-       id="linearGradient1872"
-       gradientTransform="matrix(1.464893,0,0,0.475906,30.56501,-34.34268)"
-       x1="-4.6375198"
-       y1="104.38752"
-       x2="-4.5239210"
-       y2="110.61378"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="69.460503"
-       x2="7.5291119"
-       y1="27.376621"
-       x1="7.3738608"
-       gradientTransform="matrix(3.495016,0,0,0.344323,-2.972087,-3.408148e-2)"
-       id="linearGradient152"
-       xlink:href="#linearGradient149"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="6.8897981"
-       x2="60.685901"
-       y1="6.8897981"
-       x1="55.208272"
-       gradientTransform="matrix(0.772488,0,0,1.55784,-2.79531,-0.166664)"
-       id="linearGradient160"
-       xlink:href="#linearGradient157"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="21.169637"
-       x2="19.737664"
-       y1="21.169637"
-       x1="2.9325605"
-       gradientTransform="matrix(2.374946,0,0,0.506711,-2.79531,-0.166664)"
-       id="linearGradient164"
-       xlink:href="#linearGradient161"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1065"
-       id="linearGradient1068"
-       gradientTransform="scale(1.175635,0.850604)"
-       x1="10.861447"
-       y1="33.139202"
-       x2="30.587307"
-       y2="37.720802"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="52.625473"
-       x2="19.672924"
-       y1="23.114082"
-       x1="19.347122"
-       gradientTransform="scale(1.175635,0.850604)"
-       id="linearGradient101"
-       xlink:href="#linearGradient172"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="48.805084"
-       x2="25.312450"
-       y1="25.335417"
-       x1="17.573946"
-       gradientTransform="scale(1.175636,0.850604)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient374"
-       xlink:href="#linearGradient368"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="23.600779"
-       x2="19.857769"
-       y1="38.962704"
-       x1="19.977491"
-       gradientTransform="scale(1.215669,0.822592)"
-       id="linearGradient384"
-       xlink:href="#linearGradient381"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient149"
-       id="linearGradient3977"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.495016,0,0,0.344323,-2.972087,-3.408148e-2)"
-       x1="7.3738608"
-       y1="27.376621"
-       x2="7.5291119"
-       y2="69.460503" />
-  </defs>
-  <sodipodi:namedview
-     showborder="true"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="26.709461"
-     inkscape:cy="38.558683"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="919"
-     inkscape:window-height="944"
-     inkscape:window-x="254"
-     inkscape:window-y="96"
-     inkscape:showpageshadow="false"
-     gridempspacing="4"
-     inkscape:object-nodes="true"
-     inkscape:object-points="true"
-     inkscape:object-bbox="true"
-     inkscape:guide-bbox="false"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Trash Empty</dc:title>
-        <dc:date>2003-02-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>trash</rdf:li>
-            <rdf:li>delete</rdf:li>
-            <rdf:li>deleted files</rdf:li>
-            <rdf:li>waste</rdf:li>
-            <rdf:li>recycle</rdf:li>
-            <rdf:li>bin</rdf:li>
-            <rdf:li>empty</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>Novell, Inc.</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Garrett LeSage</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       transform="matrix(2.262383e-2,0,0,1.966248e-2,44.39519,41.98146)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <g
-       id="g3964">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="matrix(0.997091,0,0,1.011161,0.175269,-0.497829)"
-         sodipodi:nodetypes="ccccccc"
-         id="path1751"
-         d="M 3.836697,16.810238 C 3.792608,16.775175 5.56866,42.034206 5.569166,42.041863 C 5.73578,44.564407 7.134433,45.486354 8.699929,45.49011 C 8.75587,45.490239 38.069409,45.486863 38.693936,45.484234 C 41.330302,45.473139 41.976184,43.867694 42.149611,42.113575 C 42.163521,42.07899 43.938664,16.844824 43.952571,16.810238 C 30.580614,16.810238 17.208657,16.810238 3.836697,16.810238 z "
-         style="fill:url(#linearGradient1068);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient101);stroke-width:0.99591541;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="matrix(1.007266,0,0,1.010724,-0.252168,-0.110549)"
-         sodipodi:nodetypes="cccc"
-         id="path1893"
-         d="M 43.188383,18.930946 L 7.1998593,18.907789 C 34.314156,19.538355 39.641346,22.517229 42.946375,22.365024 L 43.188383,18.930946 z "
-         style="color:#000000;fill:url(#linearGradient3977);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" />
-      <g
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         id="g144"
-         transform="matrix(1.402179,0,0,1.438944,-66.03801,-8.126386)"
-         style="fill:#ffffff;fill-opacity:0.48809521">
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           style="fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 64.131147,25.325447 L 67.928133,25.615144 L 69.396397,22.040585 L 67.659134,23.261574 C 67.659134,23.261574 66.914226,21.524169 66.378823,21.384498 C 65.843421,21.244828 63.559132,21.291385 63.559132,21.291385 C 64.285695,21.471073 64.850367,22.719512 64.859047,22.733674 C 65.085717,23.10353 65.72022,24.348057 65.72022,24.348057 L 64.131147,25.325447 z "
-           id="path41"
-           sodipodi:nodetypes="ccccccscc" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           style="color:#000000;fill-opacity:0.30952382;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M 64.600893,22.852762 L 63.344021,25.250434 L 60.760121,23.620948 C 60.760121,23.620948 61.931819,21.409503 62.855175,21.409503 C 63.786342,21.409503 64.202456,22.212137 64.600893,22.852762 z "
-           id="path130"
-           sodipodi:nodetypes="ccczc" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           style="fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 66.450976,28.545542 L 64.002948,31.471279 L 66.339076,34.488059 L 66.382284,32.587938 C 66.382284,32.587938 68.103047,32.750329 68.497986,32.362789 C 68.892923,31.975249 70.535933,30.02127 70.535933,30.02127 C 70.008436,30.552239 68.647269,30.395144 68.630659,30.395314 C 68.196893,30.399717 66.480102,30.359654 66.480102,30.359654 L 66.450976,28.545542 z "
-           id="path139"
-           sodipodi:nodetypes="ccccccscc" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           style="color:#000000;fill-opacity:0.30952382;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M 68.748409,30.061355 L 67.337346,27.751062 L 70.062991,26.371707 C 70.062991,26.371707 71.358061,28.513238 70.883591,29.305365 C 70.405109,30.104193 69.502725,30.048732 68.748409,30.061355 z "
-           id="path140"
-           sodipodi:nodetypes="ccczc" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           style="fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 62.170193,28.37565 L 60.961696,25.192931 L 57.437755,25.441971 L 58.884372,26.495777 C 58.884372,26.495777 57.885335,27.90621 58.024237,28.441813 C 58.163139,28.977415 58.94678,31.196407 58.94678,31.196407 C 58.749682,30.474372 59.564769,29.372969 59.572907,29.358488 C 59.785446,28.980335 60.676477,27.51233 60.676477,27.51233 L 62.170193,28.37565 z "
-           id="path142"
-           sodipodi:nodetypes="ccccccscc" />
-        <path
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           style="color:#000000;fill-opacity:0.30952382;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M 59.752772,29.661147 L 62.45898,29.59048 L 62.294995,32.640869 C 62.294995,32.640869 59.792913,32.695178 59.343013,31.888843 C 58.889308,31.075686 59.387472,30.32123 59.752772,29.661147 z "
-           id="path143"
-           sodipodi:nodetypes="ccczc" />
-      </g>
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="matrix(0.997091,0,0,1.011161,0.253928,-0.654813)"
-         style="opacity:1;fill:url(#linearGradient374);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:14.96210194;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-         d="M 41.62473,23.651808 C 36.299359,25.986218 29.004203,28.320991 23.056218,28.370558 C 16.516233,28.425058 11.697549,31.531025 6.8162911,33.914752 C 7.010968,36.794969 7.225682,38.805946 7.4908471,42.031519 C 7.6231144,43.640472 8.1287711,43.602252 10.431218,43.602252 C 19.542668,43.602252 31.496634,43.615196 38.688801,43.615196 C 40.449339,43.615196 40.248374,42.363465 40.34348,41.164752 C 40.803877,35.361894 41.217727,29.476257 41.62473,23.651808 z "
-         id="path344"
-         sodipodi:nodetypes="cccssssc" />
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         transform="matrix(0.997091,0,0,1.011161,0.219976,-0.497829)"
-         sodipodi:nodetypes="cssssss"
-         id="path375"
-         d="M 5.2098606,19.402822 C 5.1584543,19.40269 6.0490537,32.078422 6.7566249,40.968384 C 6.9391608,43.250374 7.3101511,44.179154 8.747779,44.179154 C 20.599078,44.179154 37.441889,44.264299 38.015405,44.262223 C 40.789981,44.252176 40.738055,43.236189 40.967844,41.077514 C 41.051496,40.29168 42.504818,19.49121 42.490953,19.49121 C 32.560989,19.49121 17.47866,19.43444 5.2098606,19.402822 z "
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient384);stroke-width:0.99591541;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.2857143" />
-    </g>
-    <path
-       style="fill:url(#linearGradient1872);fill-opacity:1;fill-rule:evenodd;stroke:#4d5506;stroke-width:0.97544956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 7.538492,4.7306315 C 6.494167,4.7330003 5.620149,4.7569809 5.144078,5.7442051 C 5.061333,5.9157934 2.539129,12.879834 2.417869,13.145414 C 1.379764,15.419016 2.337109,18.283038 4.342179,18.263863 C 4.723494,18.260334 43.852401,18.281621 44.459163,18.263863 C 46.165984,18.214785 46.384401,14.898279 45.649626,13.406336 C 45.607999,13.321814 42.197827,5.6492999 42.110852,5.5134018 C 41.708578,4.9064789 40.807722,4.640488 40.138555,4.6654006 C 40.006734,4.6704304 7.668955,4.7303368 7.538492,4.7306315 z "
-       id="path1841"
-       sodipodi:nodetypes="cssssscss"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(1.021485,0,0,1.028865,-0.537224,-0.298421)" />
-    <path
-       style="color:#000000;fill:url(#linearGradient164);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
-       d="M 7.72045,6.3900545 C 6.735524,6.3773223 6.671388,6.3392466 6.449677,7.0362462 C 6.398497,7.1971422 4.336482,13.531607 4.255655,13.777418 C 3.980776,14.613371 4.36948,14.833988 5.323403,14.816995 C 5.661327,14.810975 42.670159,14.816995 43.208169,14.816995 C 43.971941,14.816995 44.198501,14.565395 44.025974,13.971598 C 43.955868,13.730313 41.085266,6.9669634 41.008179,6.8465153 C 40.651639,6.3085929 40.713471,6.3101594 40.09072,6.3025755 C 39.973809,6.301151 7.836071,6.3915492 7.72045,6.3900545 z "
-       id="path1864"
-       sodipodi:nodetypes="cssssscss"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(1.005586,0,0,1.027013,-0.134078,-0.270972)" />
-    <path
-       style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
-       d="M 7.191437,6.3869852 C 6.820562,6.4152986 6.642177,6.5251871 6.486944,7.0132015 C 6.435764,7.1740974 4.376014,13.499216 4.295186,13.745027 C 4.020307,14.580975 4.384957,14.805712 5.338881,14.78872 C 5.355404,14.788428 7.292214,14.788962 7.475548,14.78872 L 7.191437,6.3869852 z "
-       id="path1880"
-       sodipodi:nodetypes="cccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(1.005586,0,0,1.028865,-0.134078,-0.298421)" />
-    <path
-       style="color:#000000;fill:url(#linearGradient160);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
-       d="M 40.143457,6.2999077 C 40.594213,6.3037596 40.726578,6.2947269 41.014741,6.8394315 C 41.054147,6.9139229 43.889138,13.632601 43.990928,13.878411 C 44.337098,14.825515 43.677798,14.805712 42.632092,14.833183 C 42.433434,14.83289 40.083238,14.811194 39.852358,14.81095 L 40.143457,6.2999077 z "
-       id="path1888"
-       sodipodi:nodetypes="cscccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(1.005586,0,0,1.028865,-0.134078,-0.298421)" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/video-display.svg Deleted

@@ -1,487 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48.000000px"
-   height="48.000000px"
-   id="svg2327"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/devices"
-   sodipodi:docname="video-display.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2329">
-      <stop
-         id="stop2331"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2333"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2321"
-       inkscape:collect="always">
-      <stop
-         id="stop2323"
-         offset="0"
-         style="stop-color:#7b7f7a;stop-opacity:1;" />
-      <stop
-         id="stop2325"
-         offset="1"
-         style="stop-color:#7b7f7a;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2711">
-      <stop
-         id="stop2713"
-         offset="0.0000000"
-         style="stop-color:#909090;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2715"
-         offset="1.0000000"
-         style="stop-color:#bebebe;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2701">
-      <stop
-         id="stop2703"
-         offset="0.0000000"
-         style="stop-color:#585956;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2705"
-         offset="1.0000000"
-         style="stop-color:#bbbeb8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2683"
-       inkscape:collect="always">
-      <stop
-         id="stop2685"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop2687"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2675">
-      <stop
-         id="stop2677"
-         offset="0.0000000"
-         style="stop-color:#5b5b97;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2679"
-         offset="1.0000000"
-         style="stop-color:#1b1b43;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2667">
-      <stop
-         id="stop2669"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2671"
-         offset="1.0000000"
-         style="stop-color:#fcfcff;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2454">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2456" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2458" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2415">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2417" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2419" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2253">
-      <stop
-         style="stop-color:#8f8f8f;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2255" />
-      <stop
-         style="stop-color:#494949;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2257" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2245">
-      <stop
-         style="stop-color:#dde1d9;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2247" />
-      <stop
-         style="stop-color:#cacdc6;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2249" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2245"
-       id="linearGradient2251"
-       gradientTransform="matrix(1.129863,0.000000,0.000000,0.885063,2.875000,1.570628)"
-       x1="8.6116238"
-       y1="7.2293582"
-       x2="34.784473"
-       y2="33.339787"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2415"
-       id="linearGradient2421"
-       gradientTransform="matrix(1.108069,0.000000,0.000000,0.902471,5.500000,3.875000)"
-       x1="17.698339"
-       y1="13.004725"
-       x2="34.974548"
-       y2="55.200756"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2454"
-       id="radialGradient2460"
-       gradientTransform="scale(1.925808,0.519262)"
-       cx="12.575710"
-       cy="67.501709"
-       fx="12.575710"
-       fy="67.501709"
-       r="8.7662794"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="26.729263"
-       x2="17.199417"
-       y1="1.6537577"
-       x1="11.492236"
-       gradientTransform="matrix(1.238977,0.000000,0.000000,0.895955,5.090553,1.543476)"
-       id="linearGradient2673"
-       xlink:href="#linearGradient2667"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="8.8666229"
-       x2="16.315819"
-       y1="32.622238"
-       x1="19.150396"
-       gradientTransform="matrix(1.174139,0.000000,0.000000,0.945431,5.221825,1.543476)"
-       id="linearGradient2681"
-       xlink:href="#linearGradient2675"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="162.45061"
-       x2="3.7069974"
-       y1="171.29134"
-       x1="3.7069976"
-       gradientTransform="matrix(5.705159,0.000000,0.000000,0.175280,5.500000,2.195627)"
-       id="linearGradient2689"
-       xlink:href="#linearGradient2683"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="64.892525"
-       x2="12.127711"
-       y1="53.535141"
-       x1="12.206709"
-       gradientTransform="matrix(1.816345,0.000000,0.000000,1.278927,2.500000,-40.24508)"
-       id="linearGradient2707"
-       xlink:href="#linearGradient2701"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       id="linearGradient2717"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2721"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2725"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2729"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="3.8451097"
-       x2="35.520542"
-       y1="3.9384086"
-       x1="34.300991"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2733"
-       xlink:href="#linearGradient2711"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="31.246054"
-       x2="32.536823"
-       y1="5.3817744"
-       x1="10.390738"
-       gradientTransform="matrix(1.104397,0.000000,0.000000,0.905471,4.500000,2.875000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1561"
-       xlink:href="#linearGradient2253"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="28.205938"
-       x2="-35.658386"
-       y1="33.416473"
-       x1="-35.658386"
-       id="linearGradient2327"
-       xlink:href="#linearGradient2321"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="30.962345"
-       x2="-35.074745"
-       y1="34.242237"
-       x1="-35.122688"
-       id="linearGradient2337"
-       xlink:href="#linearGradient2329"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.12156863"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="35.613813"
-     inkscape:cy="27.608256"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="854"
-     inkscape:window-height="756"
-     inkscape:window-x="211"
-     inkscape:window-y="164"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Video Display</dc:title>
-        <dc:date />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>video</rdf:li>
-            <rdf:li>display</rdf:li>
-            <rdf:li>monitor</rdf:li>
-            <rdf:li>LCD</rdf:li>
-            <rdf:li>CRT</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:source>http://jimmac.musichall.cz/</dc:source>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.50857143;overflow:visible;display:inline;visibility:visible;stroke-opacity:0.70063692;stroke-dashoffset:0.0000000;stroke-miterlimit:4.0000000;marker-end:none;marker-mid:none;marker-start:none;marker:none;stroke-linejoin:miter;stroke-linecap:round;stroke-width:1.0000000;stroke:none;fill-rule:evenodd;fill-opacity:1.0000000;fill:url(#radialGradient2460);color:#000000"
-       id="path2452"
-       sodipodi:cx="24.218407"
-       sodipodi:cy="35.051105"
-       sodipodi:rx="16.882174"
-       sodipodi:ry="4.5520000"
-       d="M 41.100580 35.051105 A 16.882174 4.5520000 0 1 1  7.3362331,35.051105 A 16.882174 4.5520000 0 1 1  41.100580 35.051105 z"
-       transform="matrix(1.050251,0.000000,0.000000,1.867888,-0.945558,-28.10611)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#adb0aa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#4b4d4a;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="path2407"
-       sodipodi:cx="-35.658386"
-       sodipodi:cy="29.716238"
-       sodipodi:rx="9.3944187"
-       sodipodi:ry="3.9395950"
-       d="M -26.263968 29.716238 A 9.3944187 3.9395950 0 1 1  -45.052805,29.716238 A 9.3944187 3.9395950 0 1 1  -26.263968 29.716238 z"
-       transform="translate(60.03339,8.078430)" />
-    <path
-       transform="matrix(0.902373,0.000000,0.000000,0.827650,56.55215,12.86792)"
-       d="M -26.263968 29.716238 A 9.3944187 3.9395950 0 1 1  -45.052805,29.716238 A 9.3944187 3.9395950 0 1 1  -26.263968 29.716238 z"
-       sodipodi:ry="3.9395950"
-       sodipodi:rx="9.3944187"
-       sodipodi:cy="29.716238"
-       sodipodi:cx="-35.658386"
-       id="path1825"
-       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2327);stroke-width:1.1571338;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2337);stroke-width:1.1833371;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="path2983"
-       sodipodi:cx="-35.658386"
-       sodipodi:cy="29.716238"
-       sodipodi:rx="9.3944187"
-       sodipodi:ry="3.9395950"
-       d="M -26.263968 29.716238 A 9.3944187 3.9395950 0 1 1  -45.052805,29.716238 A 9.3944187 3.9395950 0 1 1  -26.263968 29.716238 z"
-       transform="matrix(0.837548,0.000000,0.000000,0.852655,54.17811,11.00615)" />
-    <rect
-       y="31.078613"
-       x="19.972397"
-       height="6.3650389"
-       width="9.0396729"
-       id="rect2699"
-       style="color:#000000;fill:url(#linearGradient2707);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.60872948;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="color:#000000;fill:url(#linearGradient2251);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient1561);stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 7.5809024,4.5706221 L 41.169097,4.5706221 C 42.080439,4.5706221 42.793244,5.1541039 42.835849,5.9722091 L 44.167893,31.550323 C 44.226102,32.668058 43.266837,33.570628 42.147588,33.570628 L 6.6024120,33.570628 C 5.4831629,33.570628 4.5238980,32.668058 4.5821068,31.550323 L 5.9141506,5.9722091 C 5.9544343,5.1986745 6.4616533,4.5706221 7.5809024,4.5706221 z "
-       id="rect2404"
-       sodipodi:nodetypes="cssssssss" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path2377"
-       d="M 8.9105350,7.1808270 L 7.6683398,29.226144 L 39.318729,29.226144 L 37.983712,7.2742560 L 8.9105350,7.1808270 z "
-       style="fill:url(#linearGradient2681);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000079;stroke-width:0.50000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cc"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:url(#linearGradient2689);stroke-width:0.99618119;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.24840762"
-       d="M 6.6774331,31.610789 L 42.105910,31.610789"
-       id="path2393" />
-    <path
-       sodipodi:nodetypes="cssssssss"
-       id="path2397"
-       d="M 7.4145985,5.5813396 L 41.260101,5.5435383 C 41.543798,5.5432214 41.819403,5.7807881 41.842206,6.1960820 L 43.204098,30.999330 C 43.262137,32.056361 42.664349,32.785201 41.605727,32.785201 L 7.0817583,32.785201 C 6.0231355,32.785201 5.4887439,32.056410 5.5458869,30.999330 L 6.8699773,6.5051630 C 6.9086732,5.7893326 7.0363626,5.5817620 7.4145985,5.5813396 z "
-       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2421);stroke-width:0.99999964;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.70063692;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       style="opacity:0.53142858;fill:url(#linearGradient2673);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 9.2115360,7.6213630 L 8.4090070,25.491693 C 19.453645,23.091063 23.830470,14.999494 37.563039,12.344943 L 37.401567,7.6874270 L 9.2115360,7.6213630 z "
-       id="path2443" />
-    <path
-       transform="matrix(1.331237,0.000000,0.000000,0.658449,-5.919330,5.728866)"
-       d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-       sodipodi:ry="0.83968931"
-       sodipodi:rx="0.83968931"
-       sodipodi:cy="3.9384086"
-       sodipodi:cx="34.780815"
-       id="path2709"
-       style="color:#000000;fill:url(#linearGradient2717);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.50000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient2721);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.50000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="path2719"
-       sodipodi:cx="34.780815"
-       sodipodi:cy="3.9384086"
-       sodipodi:rx="0.83968931"
-       sodipodi:ry="0.83968931"
-       d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-       transform="matrix(1.331237,0.000000,0.000000,0.658449,-5.805730,7.834650)" />
-    <path
-       transform="matrix(1.331237,0.000000,0.000000,0.658449,-5.692130,9.834650)"
-       d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-       sodipodi:ry="0.83968931"
-       sodipodi:rx="0.83968931"
-       sodipodi:cy="3.9384086"
-       sodipodi:cx="34.780815"
-       id="path2723"
-       style="color:#000000;fill:url(#linearGradient2725);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.50000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient2729);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.50000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="path2727"
-       sodipodi:cx="34.780815"
-       sodipodi:cy="3.9384086"
-       sodipodi:rx="0.83968931"
-       sodipodi:ry="0.83968931"
-       d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-       transform="matrix(1.331237,0.000000,0.000000,0.658449,-5.578530,11.83465)" />
-    <path
-       transform="matrix(1.331237,0.000000,0.000000,0.658449,-5.464930,13.83465)"
-       d="M 35.620504 3.9384086 A 0.83968931 0.83968931 0 1 1  33.941126,3.9384086 A 0.83968931 0.83968931 0 1 1  35.620504 3.9384086 z"
-       sodipodi:ry="0.83968931"
-       sodipodi:rx="0.83968931"
-       sodipodi:cy="3.9384086"
-       sodipodi:cx="34.780815"
-       id="path2731"
-       style="color:#000000;fill:url(#linearGradient2733);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.50000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       id="text2735"
-       d="M 22.500000,30.192666 L 22.781716,30.192666 C 22.865481,30.192667 22.929701,30.211330 22.974376,30.248656 C 23.019345,30.285690 23.041829,30.338594 23.041830,30.407370 C 23.041829,30.476440 23.019345,30.529638 22.974376,30.566965 C 22.929701,30.603998 22.865481,30.622515 22.781716,30.622515 L 22.669735,30.622515 L 22.669735,30.850885 L 22.500000,30.850885 L 22.500000,30.192666 M 22.669735,30.315669 L 22.669735,30.499512 L 22.763640,30.499512 C 22.796558,30.499512 22.821982,30.491576 22.839911,30.475705 C 22.857839,30.459540 22.866804,30.436762 22.866804,30.407370 C 22.866804,30.377979 22.857839,30.355348 22.839911,30.339476 C 22.821982,30.323605 22.796558,30.315669 22.763640,30.315669 L 22.669735,30.315669 M 23.461979,30.303765 C 23.410250,30.303766 23.370131,30.322870 23.341621,30.361078 C 23.313112,30.399288 23.298857,30.453074 23.298857,30.522437 C 23.298857,30.591507 23.313112,30.645146 23.341621,30.683355 C 23.370131,30.721564 23.410250,30.740668 23.461979,30.740668 C 23.514001,30.740668 23.554267,30.721564 23.582778,30.683355 C 23.611287,30.645146 23.625541,30.591507 23.625542,30.522437 C 23.625541,30.453074 23.611287,30.399288 23.582778,30.361078 C 23.554267,30.322870 23.514001,30.303766 23.461979,30.303765 M 23.461979,30.180762 C 23.567787,30.180763 23.650671,30.211036 23.710630,30.271582 C 23.770588,30.332128 23.800567,30.415747 23.800568,30.522437 C 23.800567,30.628834 23.770588,30.712305 23.710630,30.772851 C 23.650671,30.833398 23.567787,30.863671 23.461979,30.863671 C 23.356464,30.863671 23.273580,30.833398 23.213328,30.772851 C 23.153370,30.712305 23.123391,30.628834 23.123391,30.522437 C 23.123391,30.415747 23.153370,30.332128 23.213328,30.271582 C 23.273580,30.211036 23.356464,30.180763 23.461979,30.180762 M 23.928420,30.192666 L 24.117994,30.192666 L 24.357387,30.644117 L 24.357387,30.192666 L 24.518305,30.192666 L 24.518305,30.850885 L 24.328730,30.850885 L 24.089338,30.399434 L 24.089338,30.850885 L 23.928420,30.850885 L 23.928420,30.192666 M 24.591489,30.192666 L 24.777095,30.192666 L 24.926991,30.427209 L 25.076887,30.192666 L 25.262935,30.192666 L 25.012079,30.573578 L 25.012079,30.850885 L 24.842344,30.850885 L 24.842344,30.573578 L 24.591489,30.192666"
-       style="font-size:0.90290260;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;writing-mode:lr-tb;text-anchor:start;fill:#4a4a4a;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/video-x-generic.svg Deleted

@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   width="48px"
-   height="48px"
-    viewbox = "0 0 48 48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="/home/jimmac/Desktop"
-   sodipodi:docname="video-x-generic.svg">
-  <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7138">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7140" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7142" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7087">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop7089" />
-      <stop
-         style="stop-color:#b8b9b6;stop-opacity:1;"
-         offset="1"
-         id="stop7091" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7079">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7081" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7083" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7069">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop7071" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:0;"
-         offset="1"
-         id="stop7073" />
-    </linearGradient>
-    <radialGradient
-       id="aigrd4"
-       cx="9.3418"
-       cy="22.6138"
-       r="14.1515"
-       fx="9.3418"
-       fy="22.6138"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0"
-         style="stop-color:#767676"
-         id="stop6452" />
-      <stop
-         offset="1"
-         style="stop-color:#484848"
-         id="stop6454" />
-    </radialGradient>
-    <radialGradient
-       r="14.1515"
-       fy="24.735121"
-       fx="20.655508"
-       cy="24.735121"
-       cx="20.655508"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6540"
-       xlink:href="#aigrd4"
-       inkscape:collect="always"
-       gradientTransform="translate(1.971678,9.220141)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7054">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7056" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7058" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7054"
-       id="linearGradient7060"
-       x1="21.03167"
-       y1="31.867859"
-       x2="21.107563"
-       y2="-4.5986342"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7069"
-       id="linearGradient7075"
-       x1="46.54464"
-       y1="35.24506"
-       x2="40.820396"
-       y2="34.140205"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.884878,0,0,0.884878,5.318113,5.943159)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7079"
-       id="radialGradient7085"
-       cx="23.157747"
-       cy="26.963573"
-       fx="23.157747"
-       fy="26.963573"
-       r="21.566757"
-       gradientTransform="matrix(1,0,0,0.663934,0,9.061528)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient7093"
-       x1="23.816254"
-       y1="12.75"
-       x2="29.049412"
-       y2="25.772396"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7138"
-       id="linearGradient7144"
-       x1="43.6875"
-       y1="32.133045"
-       x2="26.625"
-       y2="32.133045"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2)" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#eeeeec"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.25490196"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="16.18058"
-     inkscape:cy="40.223164"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="872"
-     inkscape:window-height="630"
-     inkscape:window-x="477"
-     inkscape:window-y="185" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>Generic Video</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>video</rdf:li>
-            <rdf:li>audio</rdf:li>
-            <rdf:li>multimedia</rdf:li>
-            <rdf:li>movie</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.70329674;color:#000000;fill:url(#radialGradient7085);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path7077"
-       sodipodi:cx="23.157747"
-       sodipodi:cy="26.963573"
-       sodipodi:rx="21.566757"
-       sodipodi:ry="14.318913"
-       d="M 44.724504 26.963573 A 21.566757 14.318913 0 1 1  1.5909901,26.963573 A 21.566757 14.318913 0 1 1  44.724504 26.963573 z"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="translate(1.237437,0.762563)" />
-    <path
-       transform="matrix(1.254237,0,0,1.541926,-9.79661,-6.279528)"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       d="M 40.5 21 A 14.75 8.25 0 1 1  11,21 A 14.75 8.25 0 1 1  40.5 21 z"
-       sodipodi:ry="8.25"
-       sodipodi:rx="14.75"
-       sodipodi:cy="21"
-       sodipodi:cx="25.75"
-       id="path7028"
-       style="opacity:1;color:#000000;fill:#a1a39f;fill-opacity:1;fill-rule:evenodd;stroke:#6d6f6a;stroke-width:0.7190817;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.11522388;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path7042"
-       sodipodi:cx="25.75"
-       sodipodi:cy="21"
-       sodipodi:rx="14.75"
-       sodipodi:ry="8.25"
-       d="M 40.5 21 A 14.75 8.25 0 1 1  11,21 A 14.75 8.25 0 1 1  40.5 21 z"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(0.764011,0,0,1.001814,2.310475,2.543083)" />
-    <path
-       style="fill:url(#radialGradient6540);fill-rule:nonzero;stroke:#3b3d39;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 46.025804,41.226233 C 46.025804,41.226233 37.701909,37.489226 32.369805,37.959515 C 26.686793,38.460754 17.193028,38.796952 13.471708,32.920175 C 29.269805,37.684641 36.558698,29.774427 47.251087,34.22969 C 47.251087,34.22969 46.025804,41.226233 46.025804,41.226233 z "
-       id="path6456"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="czccc" />
-    <path
-       transform="matrix(0.760969,0,0,0.986663,2.905048,0.584267)"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       d="M 40.5 21 A 14.75 8.25 0 1 1  11,21 A 14.75 8.25 0 1 1  40.5 21 z"
-       sodipodi:ry="8.25"
-       sodipodi:rx="14.75"
-       sodipodi:cy="21"
-       sodipodi:cx="25.75"
-       id="path7026"
-       style="opacity:1;color:#000000;fill:url(#linearGradient7093);fill-opacity:1;fill-rule:evenodd;stroke:#757972;stroke-width:1.23408842;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1;color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 21.09375,7.71875 C 11.536229,8.2444238 4.0000001,14.13337 4,21.25 C 4,28.711046 12.288003,34.781251 22.5,34.78125 C 32.711998,34.78125 41,28.711045 41,21.25 C 41,13.788954 32.711998,7.71875 22.5,7.71875 C 22.460109,7.71875 22.414832,7.7185655 22.375,7.71875 C 22.136944,7.7198528 21.892094,7.7111092 21.65625,7.71875 C 21.541092,7.7224809 21.4271,7.7134779 21.3125,7.71875 C 21.236995,7.7222235 21.169006,7.7146108 21.09375,7.71875 z M 19.71875,9.90625 C 19.782003,9.9011431 19.842341,9.9097202 19.90625,9.90625 C 20.040354,9.8989684 20.175794,9.90625 20.3125,9.90625 C 23.228892,9.9062502 25.59375,11.608453 25.59375,13.6875 C 25.59375,15.766547 23.228891,17.4375 20.3125,17.4375 C 17.396109,17.4375 15.03125,15.766547 15.03125,13.6875 C 15.03125,11.752352 17.083204,10.119037 19.71875,9.90625 z M 31.21875,14.5 C 31.285397,14.494037 31.338935,14.504252 31.40625,14.5 C 31.523002,14.492625 31.631386,14.502149 31.75,14.5 C 31.798199,14.499127 31.826509,14.5 31.875,14.5 C 34.978453,14.5 37.5,16.314203 37.5,18.53125 C 37.5,20.748296 34.978454,22.53125 31.875,22.53125 C 28.771546,22.531251 26.25,20.748297 26.25,18.53125 C 26.249999,16.483247 28.441783,14.748443 31.21875,14.5 z M 12,17.65625 C 12.217826,17.638427 12.463035,17.65625 12.6875,17.65625 C 15.879889,17.65625 18.46875,19.498598 18.46875,21.78125 C 18.46875,24.063902 15.879889,25.90625 12.6875,25.90625 C 9.4951118,25.90625 6.90625,24.063902 6.90625,21.78125 C 6.90625,19.659098 9.1198541,17.891914 12,17.65625 z M 23.53125,22.78125 C 23.555225,22.778464 23.56969,22.783841 23.59375,22.78125 C 23.596499,22.781133 23.622453,22.781217 23.625,22.78125 C 23.627553,22.781295 23.653493,22.781349 23.65625,22.78125 C 23.662492,22.781356 23.684306,22.781365 23.6875,22.78125 C 23.713653,22.781429 23.755011,22.780867 23.78125,22.78125 C 23.78446,22.781173 23.806268,22.781167 23.8125,22.78125 C 24.053476,22.761472 24.28293,22.78125 24.53125,22.78125 C 28.062916,22.78125 30.9375,24.810811 30.9375,27.34375 C 30.9375,29.87669 28.062916,31.9375 24.53125,31.9375 C 20.999584,31.9375 18.125,29.876689 18.125,27.34375 C 18.125,25.061781 20.486444,23.135039 23.53125,22.78125 z "
-       id="path7012"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7060);stroke-width:1.05932879;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path7044"
-       sodipodi:cx="22.185474"
-       sodipodi:cy="19.008621"
-       sodipodi:rx="18.473166"
-       sodipodi:ry="13.435029"
-       d="M 40.65864 19.008621 A 18.473166 13.435029 0 1 1  3.7123089,19.008621 A 18.473166 13.435029 0 1 1  40.65864 19.008621 z"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       transform="matrix(0.950533,0,0,0.9375,1.450995,3.320621)" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient7075);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 46.875,34.493906 L 45.793438,40.543896 C 43.18442,39.668459 41.611389,38.97574 38.722272,38.287036 L 39.054101,33.374389 C 40.952632,33.173083 43.91738,33.516123 46.875,34.493906 z "
-       id="path7067"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:0.70329674;color:#000000;fill:url(#linearGradient7144);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 46.875,34.3125 L 46.6875,35.1875 C 38.582601,32.158614 31.121435,34.960781 23.3125,35.1875 C 33.923553,34.304921 37.402743,31.471843 46.875,34.3125 z "
-       id="path7136"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/view-fullscreen.svg Deleted

@@ -1,520 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   width="48px"
-   height="48px"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="view-fullscreen.svg">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3284">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3286" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3288" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3260">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="0"
-         id="stop3262" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop3264" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3239">
-      <stop
-         style="stop-color:#e3eded;stop-opacity:1;"
-         offset="0"
-         id="stop3241" />
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1;"
-         offset="1"
-         id="stop3243" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11520">
-      <stop
-         id="stop11522"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11524"
-         offset="1.0000000"
-         style="stop-color:#dcdcdc;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11508"
-       inkscape:collect="always">
-      <stop
-         id="stop11510"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop11512"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11494"
-       inkscape:collect="always">
-      <stop
-         id="stop11496"
-         offset="0"
-         style="stop-color:#ef2929;stop-opacity:1;" />
-      <stop
-         id="stop11498"
-         offset="1"
-         style="stop-color:#ef2929;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11415">
-      <stop
-         id="stop11417"
-         offset="0.0000000"
-         style="stop-color:#204a87;stop-opacity:0.0000000;" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop11423" />
-      <stop
-         id="stop11419"
-         offset="1"
-         style="stop-color:#204a87;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11399"
-       inkscape:collect="always">
-      <stop
-         id="stop11401"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop11403"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-60.28571,-0.285714)"
-       y2="34.462429"
-       x2="43.615788"
-       y1="3.7744560"
-       x1="15.828360"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11425"
-       xlink:href="#linearGradient11415"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-60.57143,0.000000)"
-       y2="39.033859"
-       x2="35.679932"
-       y1="9.3458843"
-       x1="9.6957054"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11427"
-       xlink:href="#linearGradient11415"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="33.462429"
-       x2="26.758644"
-       y1="19.774456"
-       x1="13.267134"
-       gradientTransform="translate(-60.85714,0.428571)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11439"
-       xlink:href="#linearGradient11415"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.5000000"
-       fy="39.142857"
-       fx="12.071428"
-       cy="39.142857"
-       cx="12.071428"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.487395,0.000000,20.06483)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient11441"
-       xlink:href="#linearGradient11399"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
-       gradientUnits="userSpaceOnUse"
-       r="3.8335034"
-       fy="15.048258"
-       fx="27.577173"
-       cy="15.048258"
-       cx="27.577173"
-       id="radialGradient11500"
-       xlink:href="#linearGradient11494"
-       inkscape:collect="always" />
-    <radialGradient
-       r="3.8335034"
-       fy="16.049133"
-       fx="27.577173"
-       cy="16.049133"
-       cx="27.577173"
-       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient11504"
-       xlink:href="#linearGradient11494"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,2.166583e-14,29.48178)"
-       r="6.5659914"
-       fy="44.565483"
-       fx="30.203562"
-       cy="44.565483"
-       cx="30.203562"
-       id="radialGradient11514"
-       xlink:href="#linearGradient11508"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(1.995058,-1.651527e-32,0.000000,1.995058,-24.32488,-35.70087)"
-       gradientUnits="userSpaceOnUse"
-       r="20.530962"
-       fy="35.878170"
-       fx="24.445690"
-       cy="35.878170"
-       cx="24.445690"
-       id="radialGradient11526"
-       xlink:href="#linearGradient11520"
-       inkscape:collect="always" />
-    <radialGradient
-       r="6.5659914"
-       fy="44.565483"
-       fx="30.203562"
-       cy="44.565483"
-       cx="30.203562"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,3.185827e-15,29.48178)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient11532"
-       xlink:href="#linearGradient11508"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient1348"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,-1.353344e-14,29.48178)"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient1350"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.995058,-1.651527e-32,0.000000,1.995058,-24.32488,-35.70087)"
-       cx="24.445690"
-       cy="35.878170"
-       fx="24.445690"
-       fy="35.878170"
-       r="20.530962" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11494"
-       id="radialGradient1352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
-       cx="27.577173"
-       cy="16.049133"
-       fx="27.577173"
-       fy="16.049133"
-       r="3.8335034" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11494"
-       id="radialGradient1354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
-       cx="27.577173"
-       cy="15.048258"
-       fx="27.577173"
-       fy="15.048258"
-       r="3.8335034" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11508"
-       id="radialGradient1356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,2.220359e-14,29.48178)"
-       cx="30.203562"
-       cy="44.565483"
-       fx="30.203562"
-       fy="44.565483"
-       r="6.5659914" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient1366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.049266,-1.696401e-32,0.000000,2.049266,-25.65002,-37.31089)"
-       cx="24.445690"
-       cy="35.878170"
-       fx="24.445690"
-       fy="35.878170"
-       r="20.530962" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3239"
-       id="linearGradient3249"
-       gradientUnits="userSpaceOnUse"
-       x1="22.625"
-       y1="7.7097101"
-       x2="22.625"
-       y2="40.5"
-       gradientTransform="matrix(1.011765,0,0,1.011765,-3.529411e-2,-0.529412)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3260"
-       id="linearGradient3266"
-       x1="12.363961"
-       y1="11.394304"
-       x2="18.22703"
-       y2="17.58149"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3260"
-       id="linearGradient3270"
-       gradientUnits="userSpaceOnUse"
-       x1="12.363961"
-       y1="11.394304"
-       x2="18.22703"
-       y2="17.58149"
-       gradientTransform="matrix(-1,0,0,1,49,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3260"
-       id="linearGradient3278"
-       gradientUnits="userSpaceOnUse"
-       x1="12.363961"
-       y1="11.394304"
-       x2="18.22703"
-       y2="17.58149"
-       gradientTransform="matrix(1,0,0,-1,0,47.03125)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3260"
-       id="linearGradient3280"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,49,47.03125)"
-       x1="12.363961"
-       y1="11.394304"
-       x2="18.22703"
-       y2="17.58149" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3284"
-       id="radialGradient3290"
-       cx="25.455845"
-       cy="43.403805"
-       fx="25.455845"
-       fy="43.403805"
-       r="20.682873"
-       gradientTransform="matrix(1,0,0,0.205128,0,34.50046)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#204a87"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.25490196"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="26.507105"
-     inkscape:cy="35.890897"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="970"
-     inkscape:window-height="979"
-     inkscape:window-x="2049"
-     inkscape:window-y="186" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>View Fullscreen</dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.312904e-2,0,0,1.485743e-2,44.96697,42.7963)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <rect
-       style="opacity:1;color:#000000;fill:url(#linearGradient3249);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2354"
-       width="41.988247"
-       height="41.988247"
-       x="3.5058835"
-       y="2.505883"
-       rx="1.8750006"
-       ry="1.8750006" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0340382"
-       inkscape:original="M 5.375 2.5 C 4.3362497 2.5 3.5 3.3362496 3.5 4.375 L 3.5 42.625 C 3.5 43.66375 4.3362496 44.500001 5.375 44.5 L 43.625 44.5 C 44.66375 44.5 45.500001 43.66375 45.5 42.625 L 45.5 4.375 C 45.5 3.3362497 44.663751 2.5 43.625 2.5 L 5.375 2.5 z "
-       xlink:href="#rect2354"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3247"
-       inkscape:href="#rect2354"
-       d="M 5.375,3.53125 C 4.8912209,3.53125 4.53125,3.8912205 4.53125,4.375 L 4.53125,42.625 C 4.53125,43.108779 4.8912224,43.46875 5.375,43.46875 L 43.125,43.46875 C 43.608779,43.46875 43.96875,43.108779 43.96875,42.625 L 43.96875,4.375 C 43.96875,3.8912207 43.608779,3.53125 43.125,3.53125 L 5.375,3.53125 z " />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient3266);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 6 5 L 6 18 L 10.03125 13.96875 L 18.03125 22.03125 L 23 17 L 15 9 L 19 5 L 6 5 z "
-       id="path3251" />
-    <path
-       id="path3268"
-       d="M 43,5 L 43,18 L 38.96875,13.96875 L 30.96875,22.03125 L 26,17 L 34,9 L 30,5 L 43,5 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient3270);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       id="path3274"
-       d="M 6,42.03125 L 6,29.03125 L 10.03125,33.0625 L 18.03125,25 L 23,30.03125 L 15,38.03125 L 19,42.03125 L 6,42.03125 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient3278);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient3280);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 43,42.03125 L 43,29.03125 L 38.96875,33.0625 L 30.96875,25 L 26,30.03125 L 34,38.03125 L 30,42.03125 L 43,42.03125 z "
-       id="path3276" />
-  </g>
-</svg>

gpac-0.5.0.svn5178.tar.bz2/include/gpac/math.h Deleted

@@ -1,1036 +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_MATH_H_
-#define _GF_MATH_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
- *	\file <gpac/math.h>
- *	\brief math and trigo functions.
- */
-
-#include <gpac/setup.h>
-	
-#include <math.h>
-
-
-/*!
- *\addtogroup math_grp math
- *\ingroup utils_grp
- *\brief Mathematics and Trigonometric functions
- *
- *This section documents the math and trigo functions used in the GPAC framework. GPAC can be compiled with
- *fixed-point support, representing float values on a 16.16 signed integer, which implies a developer 
- *must take care of float computations when using GPAC.\n
- *A developper should not need to know in which mode the framework has been compiled as long as he uses
- *the math functions of GPAC which work in both float and fixed-point mode.\n
- *Using fixed-point version is decided at compilation time and cannot be changed. The feature is signaled
- *through the following macros:
- *- GPAC_FIXED_POINT: when defined, GPAC has been compiled in fixed-point mode
- *- GPAC_NO_FIXED_POINT: when defined, GPAC has been compiled in regular (float) mode
- *	@{
- */
-
-
-/*****************************************************************************************
-			FIXED-POINT SUPPORT - HARDCODED FOR 16.16 representation
-	the software rasterizer also use a 16.16 representation even in non-fixed version
-******************************************************************************************/
-
-#ifdef GPAC_FIXED_POINT
-
-/*!
- *Fixed 16.16 number
- *\hideinitializer
- \note This documentation has been generated for a fixed-point version of the GPAC framework.
- */
-typedef s32 Fixed;
-#define FIX_ONE			0x10000L
-#define INT2FIX(v)		((Fixed)( ((s32) (v) ) << 16))
-#define FLT2FIX(v)		((Fixed) ((v) * FIX_ONE))
-#define FIX2INT(v)		((s32)(((v)+((FIX_ONE>>1)))>>16))
-#define FIX2FLT(v)		((Float)( ((Float)(v)) / ((Float) FIX_ONE)))
-#define FIX_EPSILON		2
-#define FIX_MAX			0x7FFFFFFF
-#define FIX_MIN			-FIX_MAX
-#define GF_PI2		102944
-#define GF_PI		205887
-#define GF_2PI		411774
-
-/*!\return 1/a, expressed as fixed number*/
-Fixed gf_invfix(Fixed a);
-/*!\return a*b, expressed as fixed number*/
-Fixed gf_mulfix(Fixed a, Fixed b);
-/*!\return a*b/c, expressed as fixed number*/
-Fixed gf_muldiv(Fixed a, Fixed b, Fixed c);
-/*!\return a/b, expressed as fixed number*/
-Fixed gf_divfix(Fixed a, Fixed b);
-/*!\return sqrt(a), expressed as fixed number*/
-Fixed gf_sqrt(Fixed x);
-/*!\return ceil(a), expressed as fixed number*/
-Fixed gf_ceil(Fixed a);
-/*!\return floor(a), expressed as fixed number*/
-Fixed gf_floor(Fixed a);
-/*!\return cos(a), expressed as fixed number*/
-Fixed gf_cos(Fixed angle);
-/*!\return sin(a), expressed as fixed number*/
-Fixed gf_sin(Fixed angle);
-/*!\return tan(a), expressed as fixed number*/
-Fixed gf_tan(Fixed angle);
-/*!\return acos(a), expressed as fixed number*/
-Fixed gf_acos(Fixed angle);
-/*!\return asin(a), expressed as fixed number*/
-Fixed gf_asin(Fixed angle);
-/*!\return atan(y, x), expressed as fixed number*/
-Fixed gf_atan2(Fixed y, Fixed x);
-
-#else
-
-
-/*!Fixed is 32bit float number
- \note This documentation has been generated for a float version of the GPAC framework.
-*/
-typedef Float Fixed;
-#define FIX_ONE			1.0f
-#define INT2FIX(v)		((Float) (v))
-#define FLT2FIX(v)		((Float) (v))
-#define FIX2INT(v)		((s32)(v))
-#define FIX2FLT(v)		((Float) (v))
-#define FIX_EPSILON		GF_EPSILON_FLOAT
-#define FIX_MAX			GF_MAX_FLOAT
-#define FIX_MIN			-GF_MAX_FLOAT
-#define GF_PI2		1.5707963267949f
-#define GF_PI		3.1415926535898f
-#define GF_2PI		6.2831853071796f
-
-/*!\hideinitializer 1/_a, expressed as fixed number*/
-#define gf_invfix(_a)	(FIX_ONE/(_a))
-/*!\hideinitializer _a*_b, expressed as fixed number*/
-#define gf_mulfix(_a, _b)		((_a)*(_b))
-/*!\hideinitializer _a*_b/_c, expressed as fixed number*/
-#define gf_muldiv(_a, _b, _c)	((_c) ? (_a)*(_b)/(_c) : GF_MAX_FLOAT)
-/*!\hideinitializer _a/_b, expressed as fixed number*/
-#define gf_divfix(_a, _b)		((_b) ? (_a)/(_b) : GF_MAX_FLOAT)
-/*!\hideinitializer sqrt(_a), expressed as fixed number*/
-#define gf_sqrt(_a) ((Float) sqrt(_a))
-/*!\hideinitializer ceil(_a), expressed as fixed number*/
-#define gf_ceil(_a) ((Float) ceil(_a))
-/*!\hideinitializer floor(_a), expressed as fixed number*/
-#define gf_floor(_a) ((Float) floor(_a))
-/*!\hideinitializer cos(_a), expressed as fixed number*/
-#define gf_cos(_a) ((Float) cos(_a))
-/*!\hideinitializer sin(_a), expressed as fixed number*/
-#define gf_sin(_a) ((Float) sin(_a))
-/*!\hideinitializer tan(_a), expressed as fixed number*/
-#define gf_tan(_a) ((Float) tan(_a))
-/*!\hideinitializer atan2(_y,_x), expressed as fixed number*/
-#define gf_atan2(_y, _x) ((Float) atan2(_y, _x))
-/*!\hideinitializer acos(_a), expressed as fixed number*/
-#define gf_acos(_a) ((Float) acos(_a))
-/*!\hideinitializer asin(_a), expressed as fixed number*/
-#define gf_asin(_a) ((Float) asin(_a))
-
-#endif
-
-/*!\def FIX_ONE
- \hideinitializer
- Fixed unit value
-*/
-/*!\def INT2FIX(v)
- \hideinitializer
- Conversion from integer to fixed
-*/
-/*!\def FLT2FIX(v)
- \hideinitializer
- Conversion from float to fixed
-*/
-/*!\def FIX2INT(v)
- \hideinitializer
- Conversion from fixed to integer
-*/
-/*!\def FIX2FLT(v)
- \hideinitializer
- Conversion from fixed to float
-*/
-/*!\def FIX_EPSILON
- \hideinitializer
- Epsilon Fixed (positive value closest to 0)
-*/
-/*!\def FIX_MAX
- \hideinitializer
- Maximum Fixed (maximum representable fixed value)
-*/
-/*!\def FIX_MIN
- \hideinitializer
- Minimum Fixed (minimum representable fixed value)
-*/
-/*!\def GF_PI2
- \hideinitializer
- PI/2 expressed as Fixed
-*/
-/*!\def GF_PI
- \hideinitializer
- PI expressed as Fixed
-*/
-/*!\def GF_2PI
- \hideinitializer
- 2*PI expressed as Fixed
-*/
-
-Fixed gf_angle_diff(Fixed a, Fixed b);
-
-/*!
- *	\brief Field bit-size 
- *
- *	Gets the number of bits needed to represent the value.
- *	\param MaxVal Maximum value to be represented.
- *	\return number of bits required to represent the value.
- */
-u32 gf_get_bit_size(u32 MaxVal);
-
-/*!
- *	\brief Get power of 2
- *
- *	Gets the closest power of 2 greater or equal to the value.
- *	\param val value to be used.
- *	\return requested power of 2.
- */
-u32 gf_get_next_pow2(u32 val);
-
-/*!
- *\addtogroup math2d_grp math2d
- *\ingroup math_grp
- *\brief 2D Mathematics functions
- *
- *This section documents mathematic tools for 2D geometry and color matrices operations
- *	@{
- */
-
-/*!\brief 2D point
- *
- *The 2D point object is used in all the GPAC framework for both point and vector representation.
-*/
-typedef struct __vec2f
-{
-	Fixed x;
-	Fixed y;
-} GF_Point2D;
-/*!
- *\brief get 2D vector length
- *
- *Gets the length of a 2D vector
- *\return length of the vector
- */
-Fixed gf_v2d_len(GF_Point2D *vec);
-/*!
- *\brief get distance between 2 points
- *
- *Gets the distance between the 2 points
- *\return distance
- */
-Fixed gf_v2d_distance(GF_Point2D *a, GF_Point2D *b);
-/*!
- *\brief 2D vector from polar coordinates
- *
- *Constructs a 2D vector from its polar coordinates
- *\param length the length of the vector
- *\param angle the angle of the vector in radians
- *\return the 2D vector
- */
-GF_Point2D gf_v2d_from_polar(Fixed length, Fixed angle);
-
-/*!\brief rectangle 2D
- *
- *The 2D rectangle used in the GPAC project.
- */
-typedef struct
-{
-	/*!the left coordinate of the rectangle*/
-	Fixed x;
-	/*!the top coordinate of the rectangle, regardless of the canvas orientation. In other words, y is always the 
-	greatest coordinate value, 	even if the rectangle is presented bottom-up. This insures proper rectangles testing*/
-	Fixed y;
-	/*!the width of the rectangle. Width must be greater than or equal to 0*/
-	Fixed width;
-	/*!the height of the rectangle. Height must be greater than or equal to 0*/
-	Fixed height;
-} GF_Rect;
-
-/*!
- \brief rectangle union
- *
- *Gets the union of two rectangles.
- *\param rc1 first rectangle of the union. Upon return, this rectangle will contain the result of the union
- *\param rc2 second rectangle of the union
-*/
-void gf_rect_union(GF_Rect *rc1, GF_Rect *rc2);
-/*!
- \brief centers a rectangle
- *
- *Builds a rectangle centered on the origin
- *\param w width of the rectangle
- *\param h height of the rectangle
- *\return centered rectangle object
-*/
-GF_Rect gf_rect_center(Fixed w, Fixed h);
-/*!
- \brief rectangle overlap test
- *
- *Tests if two rectangles overlap.
- *\param rc1 first rectangle to test
- *\param rc2 second rectangle to test
- *\return 1 if rectangles overlap, 0 otherwise
-*/
-Bool gf_rect_overlaps(GF_Rect rc1, GF_Rect rc2);
-/*!
- \brief rectangle identity test
- *
- *Tests if two rectangles are identical.
- *\param rc1 first rectangle to test
- *\param rc2 second rectangle to test
- *\return 1 if rectangles are identical, 0 otherwise
-*/
-Bool gf_rect_equal(GF_Rect rc1, GF_Rect rc2);
-
-/*!
- *\brief pixel-aligned rectangle
- *
- *Pixel-aligned rectangle used in the GPAC framework. This is usually needed for 2D drawing algorithms.
- */
-typedef struct
-{
-	/*!the left coordinate of the rectangle*/
-	s32 x;
-	/*!the top coordinate of the rectangle, regardless of the canvas orientation. In other words, y is always the 
-	greatest coordinate value, even if the rectangle is presented bottom-up. This insures proper rectangles operations*/
-	s32 y;
-	/*!the width of the rectangle. Width must be greater than or equal to 0*/
-	s32 width;
-	/*!the height of the rectangle. Height must be greater than or equal to 0*/
-	s32 height;
-} GF_IRect;
-/*!
- *\brief gets the pixelized version of a rectangle
- *
- *Returns the smallest pixel-aligned rectangle completely containing a rectangle
- *\param r the rectangle to transform
- *\return the pixel-aligned transformed rectangle
-*/
-GF_IRect gf_rect_pixelize(GF_Rect *r);
-
-
-/*!
- *\brief 2D matrix
- *
- *The 2D affine matrix object usied in GPAC. The transformation of P(x,y) in P'(X, Y) is:
- \code
-	X = m[0]*x + m[1]*y + m[2];
-	Y = m[3]*x + m[4]*y + m[5];
- \endcode
-*/
-typedef struct
-{
-	Fixed m[6];
-} GF_Matrix2D;
-
-/*!\brief matrix initialization
- *\hideinitializer
- *
- *Inits the matrix to the identity matrix
-*/
-#define gf_mx2d_init(_obj) { memset((_obj).m, 0, sizeof(Fixed)*6); (_obj).m[0] = (_obj).m[4] = FIX_ONE; }
-/*!\brief matrix copy
- *\hideinitializer
- *
- *Copies the matrix _from to the matrix _obj
-*/
-#define gf_mx2d_copy(_obj, from) memcpy((_obj).m, (from).m, sizeof(Fixed)*6)
-/*!\brief matrix identity testing
- *\hideinitializer
- *
- *This macro evaluates to 1 if the matrix _obj is the identity matrix, 0 otherwise
-*/
-#define gf_mx2d_is_identity(_obj) ((!(_obj).m[1] && !(_obj).m[2] && !(_obj).m[3] && !(_obj).m[5] && ((_obj).m[0]==FIX_ONE) && ((_obj).m[4]==FIX_ONE)) ? 1 : 0)
-
-/*!\brief 2D matrix multiplication
- *
- *Multiplies two 2D matrices from*_this
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param from transformation matrix to add
-*/
-void gf_mx2d_add_matrix(GF_Matrix2D *_this, GF_Matrix2D *from);
-
-/*!\brief 2D matrix pre-multiplication
- *
- *Multiplies two 2D matrices _this*from
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param from transformation matrix to add
-*/
-void gf_mx2d_pre_multiply(GF_Matrix2D *_this, GF_Matrix2D *from);
-
-/*!\brief matrix translating
- *
- *Translates a 2D matrix
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param cx horizontal translation
- *\param cy vertical translation
-*/
-void gf_mx2d_add_translation(GF_Matrix2D *_this, Fixed cx, Fixed cy);
-/*!\brief matrix rotating
- *
- *Rotates a 2D matrix
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param cx horizontal rotation center coordinate
- *\param cy vertical rotation center coordinate
- *\param angle rotation angle in radians
-*/
-void gf_mx2d_add_rotation(GF_Matrix2D *_this, Fixed cx, Fixed cy, Fixed angle);
-/*!\brief matrix scaling
- *
- *Scales a 2D matrix
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param scale_x horizontal scaling factor
- *\param scale_y vertical scaling factor
-*/
-void gf_mx2d_add_scale(GF_Matrix2D *_this, Fixed scale_x, Fixed scale_y);
-/*!\brief matrix uncentered scaling
- *
- *Scales a 2D matrix with a non-centered scale
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param scale_x horizontal scaling factor
- *\param scale_y vertical scaling factor
- *\param cx horizontal scaling center coordinate
- *\param cy vertical scaling center coordinate
- *\param angle scale orienttion angle in radians
-*/
-void gf_mx2d_add_scale_at(GF_Matrix2D *_this, Fixed scale_x, Fixed scale_y, Fixed cx, Fixed cy, Fixed angle);
-/*!\brief matrix skewing
- *
- *Skews a 2D matrix
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param skew_x horizontal skew factor
- *\param skew_y vertical skew factor
-*/
-void gf_mx2d_add_skew(GF_Matrix2D *_this, Fixed skew_x, Fixed skew_y);
-/*!\brief matrix horizontal skewing
- *
- *Skews a 2D matrix horizontally by a given angle
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param angle horizontal skew angle in radians
-*/
-void gf_mx2d_add_skew_x(GF_Matrix2D *_this, Fixed angle);
-/*!\brief matrix vertical skewing
- *
- *Skews a 2D matrix vertically by a given angle
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
- *\param angle vertical skew angle in radians
-*/
-void gf_mx2d_add_skew_y(GF_Matrix2D *_this, Fixed angle);
-/*!\brief matrix inversing
- *
- *Inverses a 2D matrix 
- *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
-*/
-void gf_mx2d_inverse(GF_Matrix2D *_this);
-/*!\brief matrix coordinate transformation
- *
- *Applies a 2D matrix transformation to coordinates
- *\param _this transformation matrix
- *\param x pointer to horizontal coordinate. Once the function is called, x contains the transformed horizontal coordinate
- *\param y pointer to vertical coordinate. Once the function is called, y contains the transformed vertical coordinate
-*/
-void gf_mx2d_apply_coords(GF_Matrix2D *_this, Fixed *x, Fixed *y);
-/*!\brief matrix point transformation
- *
- *Applies a 2D matrix transformation to a 2D point
- *\param _this transformation matrix
- *\param pt pointer to 2D point. Once the function is called, pt contains the transformed point
-*/
-void gf_mx2d_apply_point(GF_Matrix2D *_this, GF_Point2D *pt);
-/*!\brief matrix rectangle transformation
- *
- *Applies a 2D matrix transformation to a rectangle, giving the enclosing rectangle of the transformed one
- *\param _this transformation matrix
- *\param rc pointer to rectangle. Once the function is called, rc contains the transformed rectangle
-*/
-void gf_mx2d_apply_rect(GF_Matrix2D *_this, GF_Rect *rc);
-
-/*!\brief matrix decomposition
- *
- *Decomposes a 2D matrix M as M=Scale x Rotation x Translation if possible
- *\param _this transformation matrix
- *\param scale resulting scale part
- *\param rotate resulting rotation part
- *\param translate resulting translation part
- *\return 0 if matrix cannot be decomposed, 1 otherwise
-*/
-Bool gf_mx2d_decompose(GF_Matrix2D *_this, GF_Point2D *scale, Fixed *rotate, GF_Point2D *translate);
-
-/*! @} */
-
-
-/*!
- *\addtogroup math3d_grp math3d
- *\ingroup math_grp
- *\brief 3D Mathematics functions
- *
- *This section documents mathematic tools for 3D geometry operations
- *	@{
- */
-
-/*!\brief 3D point or vector
- *
- *The 3D point object is used in all the GPAC framework for both point and vector representation.
-*/
-typedef struct __vec3f
-{
-	Fixed x;
-	Fixed y;
-	Fixed z;
-} GF_Vec;
-
-/*base vector operations are MACROs for faster access*/
-/*!\hideinitializer macro evaluating to 1 if vectors are equal, 0 otherwise*/
-#define gf_vec_equal(v1, v2) (((v1).x == (v2).x) && ((v1).y == (v2).y) && ((v1).z == (v2).z))
-/*!\hideinitializer macro reversing a vector v = v*/
-#define gf_vec_rev(v) { (v).x = -(v).x; (v).y = -(v).y; (v).z = -(v).z; }
-/*!\hideinitializer macro performing the minus operation res = v1 - v2*/
-#define gf_vec_diff(res, v1, v2) { (res).x = (v1).x - (v2).x; (res).y = (v1).y - (v2).y; (res).z = (v1).z - (v2).z; }
-/*!\hideinitializer macro performing the add operation res = v1 + v2*/
-#define gf_vec_add(res, v1, v2) { (res).x = (v1).x + (v2).x; (res).y = (v1).y + (v2).y; (res).z = (v1).z + (v2).z; }
-
-/*!
- *\brief get 3D vector length
- *
- *Gets the length of a 3D vector
- *\return length of the vector
- */
-Fixed gf_vec_len(GF_Vec v);
-/*!
- *\brief get 3D vector square length
- *
- *Gets the square length of a 3D vector
- *\return square length of the vector
- */
-Fixed gf_vec_lensq(GF_Vec v);
-/*!
- *\brief get 3D vector dot product
- *
- *Gets the dot product of two vectors
- *\return dot product of the vectors
- */
-Fixed gf_vec_dot(GF_Vec v1, GF_Vec v2);
-/*!
- *\brief vector normalization
- *
- *Norms the vector, eg make its length equal to \ref FIX_ONE
- *\param v vector to normalize
- */
-void gf_vec_norm(GF_Vec *v);
-/*!
- *\brief vector scaling
- *
- *Scales a vector by a given amount
- *\param v vector to scale
- *\param f scale factor
- *\return scaled vector
- */
-GF_Vec gf_vec_scale(GF_Vec v, Fixed f);
-/*!
- *\brief vector cross product
- *
- *Gets the cross product of two vectors
- *\param v1 first vector
- *\param v2 second vector
- *\return cross-product vector
- */
-GF_Vec gf_vec_cross(GF_Vec v1, GF_Vec v2);
-
-/*!\brief 4D vector
- *
- *The 4D vector object is used in all the GPAC framework for 4 dimension vectors, VRML Rotations and quaternions representation.
-*/
-typedef struct __vec4f
-{
-	Fixed x;
-	Fixed y;
-	Fixed z;
-	Fixed q;
-} GF_Vec4;
-
-
-/*!\brief 3D matrix
- *
- *The 3D matrix object used in GPAC. The matrix is oriented like OpenGL matrices (column-major ordering), with 
- the translation part at the end of the coefficients list.
- \note Unless specified otherwise, the matrix object is always expected to represent an affine transformation.
- */
-typedef struct
-{
-	Fixed m[16];
-} GF_Matrix;
-
-
-/*!\hideinitializer gets the len of a quaternion*/
-#define gf_quat_len(v) gf_sqrt(gf_mulfix((v).q,(v).q) + gf_mulfix((v).x,(v).x) + gf_mulfix((v).y,(v).y) + gf_mulfix((v).z,(v).z))
-/*!\hideinitializer normalizes a quaternion*/
-#define gf_quat_norm(v) { \
-	Fixed __mag = gf_quat_len(v);	\
-	(v).x = gf_divfix((v).x, __mag); (v).y = gf_divfix((v).y, __mag); (v).z = gf_divfix((v).z, __mag); (v).q = gf_divfix((v).q, __mag);	\
-	}	\
-
-/*!\brief quaternion to rotation
- *
- *Transforms a quaternion to a Rotation, expressed as a 4 dimension vector with x,y,z for axis and q for rotation angle
- *\param quat the quaternion to transform
- *\return the rotation value
- */
-GF_Vec4 gf_quat_to_rotation(GF_Vec4 *quat);
-/*!\brief quaternion from rotation
- *
- *Transforms a Rotation to a quaternion
- *\param rot the rotation to transform
- *\return the quaternion value
- */
-GF_Vec4 gf_quat_from_rotation(GF_Vec4 rot);
-/*!inverses a quaternion*/
-GF_Vec4 gf_quat_get_inv(GF_Vec4 *quat);
-/*!\brief quaternion multiplication
- *
- *Multiplies two quaternions
- *\param q1 the first quaternion
- *\param q2 the second quaternion
- *\return the resulting quaternion
- */
-GF_Vec4 gf_quat_multiply(GF_Vec4 *q1, GF_Vec4 *q2);
-/*!\brief quaternion vector rotating
- *
- *Rotates a vector with a quaternion 
- *\param quat the quaternion modelizing the rotation
- *\param vec the vector to rotate
- *\return the resulting vector
- */
-GF_Vec gf_quat_rotate(GF_Vec4 *quat, GF_Vec *vec);
-/*!\brief quaternion from axis and cos
- *
- *Constructs a quaternion from an axis and a cosinus value (shortcut to \ref gf_quat_from_rotation)
- *\param axis the rotation axis
- *\param cos_a the rotation cosinus value
- *\return the resulting quaternion
- */
-GF_Vec4 gf_quat_from_axis_cos(GF_Vec axis, Fixed cos_a);
-/*!\brief quaternion interpolation
- *
- *Interpolates two quaternions using spherical linear interpolation
- *\param q1 the first quaternion
- *\param q2 the second quaternion
- *\param frac the fraction of the interpolation, between 0 and \ref FIX_ONE
- *\return the interpolated quaternion
- */
-GF_Vec4 gf_quat_slerp(GF_Vec4 q1, GF_Vec4 q2, Fixed frac);
-
-/*!\brief 3D Bounding Box
- *
- *The 3D Bounding Box is a 3D Axis-Aligned Bounding Box used to in various tools of the GPAC framework for bounds 
- estimation of a 3D object. It features an axis-aligned box and a sphere bounding volume for fast intersection tests.
- */
-typedef struct
-{
-	/*!minimum x, y, and z of the object*/
-	GF_Vec min_edge;
-	/*!maximum x, y, and z of the object*/
-	GF_Vec max_edge;
-
-	/*!center of the bounding box.\note this is computed from min_edge and max_edge*/
-	GF_Vec center;
-	/*!radius of the bounding sphere for this box.\note this is computed from min_edge and max_edge*/
-	Fixed radius;
-	/*!the bbox center and radius are valid*/
-	Bool is_set;
-} GF_BBox;
-/*!updates information of the bounding box based on the edge information*/
-void gf_bbox_refresh(GF_BBox *b);
-/*!builds a bounding box from a 2D rectangle*/
-void gf_bbox_from_rect(GF_BBox *box, GF_Rect *rc);
-/*!builds a rectangle from a 3D bounding box.\note The z dimension is lost and no projection is performed*/
-void gf_rect_from_bbox(GF_Rect *rc, GF_BBox *box);
-/*!\brief bounding box expansion
- *
- *Checks if a point is inside a bounding box and updates the bounding box to include it if not the case
- *\param box the bounding box object
- *\param pt the 3D point to check
-*/
-void gf_bbox_grow_point(GF_BBox *box, GF_Vec pt);
-/*!performs the union of two bounding boxes*/
-void gf_bbox_union(GF_BBox *b1, GF_BBox *b2);
-/*!checks if two bounding boxes are equal or not*/
-Bool gf_bbox_equal(GF_BBox *b1, GF_BBox *b2);
-/*!checks if a point is inside a bounding box or not*/
-Bool gf_bbox_point_inside(GF_BBox *box, GF_Vec *p);
-/*!\brief get box vertices
- *
- *Returns the 8 bounding box vertices given the minimum and maximum edge. Vertices are ordered to respect 
- "p-vertex indexes", (vertex from a box closest to plane) and so that n-vertex (vertex from a box farthest from plane) 
- is 7-p_vx_idx
- *\param bmin minimum edge of the box
- *\param bmax maximum edge of the box
- *\param vecs list of 8 3D points used to store the vertices.
-*/
-void gf_bbox_get_vertices(GF_Vec bmin, GF_Vec bmax, GF_Vec *vecs);
-
-
-/*!\brief matrix initialization
- *\hideinitializer
- *
- *Inits the matrix to the identity matrix
-*/
-#define gf_mx_init(_obj) { memset((_obj).m, 0, sizeof(Fixed)*16); (_obj).m[0] = (_obj).m[5] = (_obj).m[10] = (_obj).m[15] = FIX_ONE; }
-/*!\brief matrix copy
- *\hideinitializer
- *
- *Copies the matrix _from to the matrix _obj
-*/
-#define gf_mx_copy(_obj, from) memcpy(&(_obj), &(from), sizeof(GF_Matrix));
-/*!\brief matrix constructor from 2D
- *
- *Initializes a 3D matrix from a 2D matrix.\note all z-related coefficients will be set to default.
-*/
-void gf_mx_from_mx2d(GF_Matrix *mx, GF_Matrix2D *mat2D);
-/*!\brief matrix identity testing
- *
- *Tests if two matrices are equal or not.
- \return 1 if matrices are same, 0 otherwise
-*/
-Bool gf_mx_equal(GF_Matrix *mx1, GF_Matrix *mx2);
-/*!\brief matrix translation
- *
- *Translates a matrix 
- *\param mx the matrix being transformed. Once the function is called, contains the result matrix
- *\param tx horizontal translation
- *\param ty vertical translation
- *\param tz depth translation
-*/
-void gf_mx_add_translation(GF_Matrix *mx, Fixed tx, Fixed ty, Fixed tz);
-/*!\brief matrix scaling
- *
- *Scales a matrix 
- *\param mx the matrix being transformed. Once the function is called, contains the result matrix
- *\param sx horizontal translation scaling
- *\param sy vertical translation scaling
- *\param sz depth translation scaling
-*/
-void gf_mx_add_scale(GF_Matrix *mx, Fixed sx, Fixed sy, Fixed sz);
-/*!\brief matrix rotating
- *
- *Rotates a matrix 
- *\param mx the matrix being transformed. Once the function is called, contains the result matrix
- *\param angle rotation angle in radians
- *\param x horizontal coordinate of rotation axis
- *\param y vertical coordinate of rotation axis
- *\param z depth coordinate of rotation axis
-*/
-void gf_mx_add_rotation(GF_Matrix *mx, Fixed angle, Fixed x, Fixed y, Fixed z);
-/*!\brief matrices multiplication 
- *
- *Multiplies a matrix with another one mx = mx*mul
- *\param mx the matrix being transformed. Once the function is called, contains the result matrix
- *\param mul the matrix to add
-*/
-void gf_mx_add_matrix(GF_Matrix *mx, GF_Matrix *mul);
-/*!\brief 2D matrix multiplication
- *
- *Adds a 2D affine matrix to a matrix
- *\param mx the matrix 
- *\param mat2D the matrix to premultiply
- */
-void gf_mx_add_matrix_2d(GF_Matrix *mx, GF_Matrix2D *mat2D);
-
-/*!\brief affine matrix inversion
- *
- *Inverses an affine matrix.\warning Results are undefined if the matrix is not an affine one
- *\param mx the matrix to inverse
- */
-void gf_mx_inverse(GF_Matrix *mx);
-/*!\brief matrix point transformation
- *
- *Applies a 3D matrix transformation to a 3D point
- *\param mx transformation matrix
- *\param pt pointer to 3D point. Once the function is called, pt contains the transformed point
-*/
-void gf_mx_apply_vec(GF_Matrix *mx, GF_Vec *pt);
-/*!\brief matrix rectangle transformation
- *
- *Applies a 3D matrix transformation to a rectangle, giving the enclosing rectangle of the transformed one.\note all depth information are discarded.
- *\param _this transformation matrix
- *\param rc pointer to rectangle. Once the function is called, rc contains the transformed rectangle
-*/
-void gf_mx_apply_rect(GF_Matrix *_this, GF_Rect *rc);
-/*!\brief ortho matrix construction
- *
- *Creates an orthogonal projection matrix
- *\param mx matrix to initialize
- *\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
-*/
-void gf_mx_ortho(GF_Matrix *mx, Fixed left, Fixed right, Fixed bottom, Fixed top, Fixed z_near, Fixed z_far);
-/*!\brief perspective matrix construction
- *
- *Creates a perspective projection matrix
- *\param mx matrix to initialize
- *\param foc 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
-*/
-void gf_mx_perspective(GF_Matrix *mx, Fixed foc, Fixed aspect_ratio, Fixed z_near, Fixed z_far);
-/*!\brief creates look matrix
- *
- *Creates a transformation matrix looking at a given direction from a given point (camera matrix).
- *\param mx matrix to initialize
- *\param position position
- *\param target look direction
- *\param up_vector vector describing the up direction
-*/
-void gf_mx_lookat(GF_Matrix *mx, GF_Vec position, GF_Vec target, GF_Vec up_vector);
-/*!\brief matrix box transformation
- *
- *Applies a 3D matrix transformation to a bounding box, giving the enclosing box of the transformed one
- *\param mx transformation matrix
- *\param b pointer to bounding box. Once the function is called, contains the transformed bounding box
-*/
-void gf_mx_apply_bbox(GF_Matrix *mx, GF_BBox *b);
-/*!\brief matrix box sphere transformation
- *
- *Applies a 3D matrix transformation to a bounding box, computing only the enclosing sphere of the transformed one.
- *\param mx transformation matrix
- *\param box pointer to bounding box. Once the function is called, contains the transformed bounding sphere
-*/
-void gf_mx_apply_bbox_sphere(GF_Matrix *mx, GF_BBox *box);
-/*!\brief non-affine matrix multiplication
- *
- *Multiplies two non-affine matrices mx = mx*mul
-*/
-void gf_mx_add_matrix_4x4(GF_Matrix *mat, GF_Matrix *mul);
-/*!\brief non-affine matrix inversion
- *
- *Inverses a non-affine matrices
- *\return 1 if inversion was done, 0 if inversion not possible.
-*/
-Bool gf_mx_inverse_4x4(GF_Matrix *mx);
-/*!\brief matrix 4D vector transformation
- *
- *Applies a 3D non-affine matrix transformation to a 4 dimension vector
- *\param mx transformation matrix
- *\param vec pointer to the vector. Once the function is called, contains the transformed vector
-*/
-void gf_mx_apply_vec_4x4(GF_Matrix *mx, GF_Vec4 *vec);
-/*!\brief matrix decomposition
- *
- *Decomposes a matrix into translation, scale, shear and rotate
- *\param mx the matrix to decompose
- *\param translate the decomposed translation part
- *\param scale the decomposed scaling part
- *\param rotate the decomposed rotation part, expressed as a Rotataion (axis + angle)
- *\param shear the decomposed shear part
- */
-void gf_mx_decompose(GF_Matrix *mx, GF_Vec *translate, GF_Vec *scale, GF_Vec4 *rotate, GF_Vec *shear);
-/*!\brief matrix vector rotation
- *
- *Rotates a vector with a given matrix, ignoring any translation.
- *\param mx transformation matrix
- *\param pt pointer to 3D vector. Once the function is called, pt contains the transformed vector
- */
-void gf_mx_rotate_vector(GF_Matrix *mx, GF_Vec *pt);
-/*!\brief matrix initialization from vectors
- *
- *Inits a matrix to rotate the local axis in the given vectors
- \param mx matrix to initialize
- \param x_axis target normalized X axis
- \param y_axis target normalized Y axis
- \param z_axis target normalized Z axis
-*/
-void gf_mx_rotation_matrix_from_vectors(GF_Matrix *mx, GF_Vec x_axis, GF_Vec y_axis, GF_Vec z_axis);
-/*!\brief matrix to 2D matrix 
- *
- *Inits a 2D matrix by removing all depth info from a 3D matrix
- *\param mx2d 2D matrix to initialize
- *\param mx 3D matrix to use
-*/
-void gf_mx2d_from_mx(GF_Matrix2D *mx2d, GF_Matrix *mx);
-
-/*!\brief Plane object*/
-typedef struct
-{
-	/*!normal vector to the plane*/
-	GF_Vec normal;
-	/*!distance from origin of the plane*/
-	Fixed d;
-} GF_Plane;
-/*!\brief matrix plane transformation
- *
- *Transorms a plane by a given matrix
- *\param mx the matrix to use
- *\param plane pointer to 3D plane. Once the function is called, plane contains the transformed plane
- */
-void gf_mx_apply_plane(GF_Matrix *mx, GF_Plane *plane);
-/*!\brief point to plane distance
- *
- *Gets the distance between a point and a plne
- *\param plane the plane to use
- *\param p pointer to ^point to check
- *\return the distance between the place and the point
- */
-Fixed gf_plane_get_distance(GF_Plane *plane, GF_Vec *p);
-/*!\brief closest point on a line
- *
- *Gets the closest point on a line from a given point in space
- *\param line_pt a point of the line to test
- *\param line_vec the normalized direction vector of the line
- *\param pt the point to check
- *\return the closest point on the line to the desired point
- */
-GF_Vec gf_closest_point_to_line(GF_Vec line_pt, GF_Vec line_vec, GF_Vec pt);
-/*!\brief box p-vertex index
- *
- *Gets the p-vertex index for a given plane. The p-vertex index is the index of the closest vertex of a bounding box to the plane. The vertices of a box are always 
- *ordered in GPAC? cf \ref gf_bbox_get_vertices
- *\param p the plane to check
- *\return the p-vertex index value, ranging from 0 to 7
-*/
-u32 gf_plane_get_p_vertex_idx(GF_Plane *p);
-/*!\brief plane line intersection
- *
- *Checks for the intersection of a plane and a line
- *\param plane plane to test
- *\param linepoint a point on the line to test
- *\param linevec normalized direction vector of the line to test
- *\param outPoint optional pointer to retrieve the intersection point, NULL otherwise
- *\return 1 if line and plane intersect, 0 otherwise
-*/
-Bool gf_plane_intersect_line(GF_Plane *plane, GF_Vec *linepoint, GF_Vec *linevec, GF_Vec *outPoint);
-
-/*!Classification types for box/plane position used in \ref gf_bbox_plane_relation*/
-enum 
-{	
-	/*!box is in front of the plane*/
-	GF_BBOX_FRONT,
-	/*!box intersects the plane*/
-	GF_BBOX_INTER,
-	/*!box is back of the plane*/
-	GF_BBOX_BACK
-};
-/*!\brief box-plane relation
- *
- *Gets the spatial relation between a box and a plane
- *\param box the box to check
- *\param p the plane to check
- *\return the relation type
- */
-u32 gf_bbox_plane_relation(GF_BBox *box, GF_Plane *p);
-
-/*!\brief 3D Ray
- *
- *The 3D ray object is used in GPAC for all collision and mouse interaction tests
-*/
-typedef struct
-{
-	/*!origin point of the ray*/
-	GF_Vec orig;
-	/*!normalized direction vector of the ray*/
-	GF_Vec dir;
-} GF_Ray;
-
-/*!\brief ray constructor
- *
- *Constructs a ray object
- *\param start starting point of the ray
- *\param end end point of the ray, or any point on the ray
- *\return the ray object
-*/
-GF_Ray gf_ray(GF_Vec start, GF_Vec end);
-/*!\brief matrix ray transformation
- *
- *Transforms a ray by a given transformation matrix
- *\param mx the matrix to use
- *\param r pointer to the ray. Once the function is called, contains the transformed ray
-*/
-void gf_mx_apply_ray(GF_Matrix *mx, GF_Ray *r);
-/*!\brief ray box intersection test
- *
- *Checks if a ray intersects a box or not
- *\param ray the ray to check
- *\param min_edge the minimum edge of the box to check
- *\param max_edge the maximum edge of the box to check
- *\param out_point optional location of a 3D point to store the intersection, NULL otherwise.
- *\return retuns 1 if the ray intersects the box, 0 otherwise
-*/
-Bool gf_ray_hit_box(GF_Ray *ray, GF_Vec min_edge, GF_Vec max_edge, GF_Vec *out_point);
-/*!\brief ray sphere intersection test
- *
- *Checks if a ray intersects a box or not
- *\param ray the ray to check
- *\param center the center of the sphere to check. If NULL, the origin (0,0,0)is used
- *\param radius the radius of the sphere to check
- *\param out_point optional location of a 3D point to store the intersection, NULL otherwise
- *\return retuns 1 if the ray intersects the sphere, 0 otherwise
-*/
-Bool gf_ray_hit_sphere(GF_Ray *ray, GF_Vec *center, Fixed radius, GF_Vec *out_point);
-/*!\brief ray triangle intersection test
- *
- *Checks if a ray intersects a triangle or not
- *\param ray the ray to check
- *\param v0 first vertex of the triangle
- *\param v1 second vertex of the triangle
- *\param v2 third vertex of the triangle
- *\param dist optional location of a fixed number to store the intersection distance from ray origin if any, NULL otherwise
- *\return retuns 1 if the ray intersects the triangle, 0 otherwise
-*/
-Bool gf_ray_hit_triangle(GF_Ray *ray, GF_Vec *v0, GF_Vec *v1, GF_Vec *v2, Fixed *dist);
-/*same as above and performs backface cull (solid meshes)*/
-/*!\brief ray triangle intersection test
- *
- *Checks if a ray intersects a triangle or not, performing backface culling. For parameters details, look at \ref gf_ray_hit_triangle_backcull
- */
-Bool gf_ray_hit_triangle_backcull(GF_Ray *ray, GF_Vec *v0, GF_Vec *v1, GF_Vec *v2, Fixed *dist);
-
-/*! @} */
-
-/*! @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif		/*_GF_MATH_H_*/
-

gpac-0.5.1.svn5491.tar.xz/.travis.yml Added

gpac-0.5.0.svn5178.tar.bz2/Makefile -> gpac-0.5.1.svn5491.tar.xz/Makefile Changed

gpac-0.5.0.svn5178.tar.bz2/applications/GPAX/GPAX.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/GPAX/GPAX.cpp Changed

@@ -2,7 +2,7 @@
 
 
 // Note: Proxy/Stub Information
-//      To build a separate proxy/stub DLL, 
+//      To build a separate proxy/stub DLL,
 //      run nmake -f GPAXps.mk in the project directory.
 
 #include "stdafx.h"
@@ -30,14 +30,14 @@
 BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
 #endif
 {
-    if (dwReason == DLL_PROCESS_ATTACH)
-    {
-        _Module.Init(ObjectMap, (HINSTANCE) hInstance, &LIBID_GPAXLib);
-        DisableThreadLibraryCalls((HINSTANCE) hInstance);
-    }
-    else if (dwReason == DLL_PROCESS_DETACH)
-        _Module.Term();
-    return TRUE;    // ok
+	if (dwReason == DLL_PROCESS_ATTACH)
+	{
+		_Module.Init(ObjectMap, (HINSTANCE) hInstance, &LIBID_GPAXLib);
+		DisableThreadLibraryCalls((HINSTANCE) hInstance);
+	}
+	else if (dwReason == DLL_PROCESS_DETACH)
+		_Module.Term();
+	return TRUE;    // ok
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -45,7 +45,7 @@
 
 STDAPI DllCanUnloadNow(void)
 {
-    return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
+	return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -53,7 +53,7 @@
 
 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 {
-    return _Module.GetClassObject(rclsid, riid, ppv);
+	return _Module.GetClassObject(rclsid, riid, ppv);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -61,8 +61,8 @@
 
 STDAPI DllRegisterServer(void)
 {
-    // registers object, typelib and all interfaces in typelib
-    return _Module.RegisterServer(TRUE);
+	// registers object, typelib and all interfaces in typelib
+	return _Module.RegisterServer(TRUE);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@
 
 STDAPI DllUnregisterServer(void)
 {
-    return _Module.UnregisterServer(TRUE);
+	return _Module.UnregisterServer(TRUE);
 }

gpac-0.5.0.svn5178.tar.bz2/applications/GPAX/GPAX.h -> gpac-0.5.1.svn5491.tar.xz/applications/GPAX/GPAX.h Changed

@@ -4,13 +4,13 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
 
 
- /* File created by MIDL compiler version 5.03.0286 */
+/* File created by MIDL compiler version 5.03.0286 */
 /* at Thu Jul 20 19:14:15 2006
  */
 /* Compiler settings for \CVS\gpac\applications\GPAX\GPAX.idl:
     Oicf (OptLev=i2), W1, Zp8, env=Win32 (32b run), ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -28,7 +28,7 @@
 #ifndef __GPAX_h__
 #define __GPAX_h__
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 #ifndef __IGPAX_FWD_DEFINED__
 #define __IGPAX_FWD_DEFINED__
@@ -59,18 +59,18 @@
 #include "ocidl.h"
 
 #ifdef __cplusplus
-extern "C"{
-#endif 
+extern "C" {
+#endif
 
 void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t);
-void __RPC_USER MIDL_user_free( void __RPC_FAR * ); 
+void __RPC_USER MIDL_user_free( void __RPC_FAR * );
 
 
 #ifndef __GPAXLib_LIBRARY_DEFINED__
 #define __GPAXLib_LIBRARY_DEFINED__
 
 /* library GPAXLib */
-/* [helpstring][version][uuid] */ 
+/* [helpstring][version][uuid] */
 
 
 
@@ -93,146 +93,147 @@
 #define __IGPAX_INTERFACE_DEFINED__
 
 /* interface IGPAX */
-/* [object][oleautomation][hidden][dual][helpstring][uuid] */ 
+/* [object][oleautomation][hidden][dual][helpstring][uuid] */
 
 
 EXTERN_C const IID IID_IGPAX;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("E2A9A937-BB35-47E0-8942-964806299AB4")
-    IGPAX : public IDispatch
-    {
-    public:
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Play( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Pause( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Stop( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Update( 
-            /* [in] */ BSTR mtype,
-            /* [in] */ BSTR updates) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE QualitySwitch( 
-            /* [in] */ INT switchUp) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetURL( 
-            /* [in] */ BSTR url) = 0;
-        
-        virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE get_src( 
-            /* [retval][out] */ BSTR __RPC_FAR *url) = 0;
-        
-        virtual /* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE put_src( 
-            /* [in] */ BSTR url) = 0;
-        
-        virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE get_AutoStart( 
-            /* [retval][out] */ VARIANT_BOOL __RPC_FAR *autoplay) = 0;
-        
-        virtual /* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE put_AutoStart( 
-            /* [in] */ VARIANT_BOOL autoplay) = 0;
-
-		virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE get_DownloadProgress( 
-			/* [retval][out] */ INT __RPC_FAR *downloadProgress) = 0;
-
-		virtual /* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE put_DownloadProgress( 
-			/* [in] */ INT downloadProgress) = 0;
-        
-    };
-    
+
+MIDL_INTERFACE("E2A9A937-BB35-47E0-8942-964806299AB4")
+IGPAX :
+public IDispatch
+{
+public:
+	virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Play( void) = 0;
+
+	virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Pause( void) = 0;
+
+	virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Stop( void) = 0;
+
+	virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Update(
+	    /* [in] */ BSTR mtype,
+	    /* [in] */ BSTR updates) = 0;
+
+	virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE QualitySwitch(
+	    /* [in] */ INT switchUp) = 0;
+
+	virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetURL(
+	    /* [in] */ BSTR url) = 0;
+
+	virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE get_src(
+	    /* [retval][out] */ BSTR __RPC_FAR *url) = 0;
+
+	virtual /* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE put_src(
+	    /* [in] */ BSTR url) = 0;
+
+	virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE get_AutoStart(
+	    /* [retval][out] */ VARIANT_BOOL __RPC_FAR *autoplay) = 0;
+
+	virtual /* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE put_AutoStart(
+	    /* [in] */ VARIANT_BOOL autoplay) = 0;
+
+	virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE get_DownloadProgress(
+	    /* [retval][out] */ INT __RPC_FAR *downloadProgress) = 0;
+
+	virtual /* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE put_DownloadProgress(
+	    /* [in] */ INT downloadProgress) = 0;
+
+};
+
 #else 	/* C style interface */
 
-    typedef struct IGPAXVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
-            IGPAX __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
-            IGPAX __RPC_FAR * This);
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount )( 
-            IGPAX __RPC_FAR * This,
-            /* [out] */ UINT __RPC_FAR *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Invoke )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
-            /* [out] */ VARIANT __RPC_FAR *pVarResult,
-            /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
-            /* [out] */ UINT __RPC_FAR *puArgErr);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Play )( 
-            IGPAX __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Pause )( 
-            IGPAX __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Stop )( 
-            IGPAX __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Update )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ BSTR mtype,
-            /* [in] */ BSTR updates);
-
-		/* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QualitySwitch )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ INT switchUp);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetURL )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ BSTR url);
-
-        /* [helpstring][propget][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_src )( 
-            IGPAX __RPC_FAR * This,
-            /* [retval][out] */ BSTR __RPC_FAR *url);
-        
-        /* [helpstring][propput][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_src )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ BSTR url);
-        
-        /* [helpstring][propget][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_AutoStart )( 
-            IGPAX __RPC_FAR * This,
-            /* [retval][out] */ VARIANT_BOOL __RPC_FAR *autoplay);
-        
-        /* [helpstring][propput][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_AutoStart )( 
-            IGPAX __RPC_FAR * This,
-            /* [in] */ VARIANT_BOOL autoplay);
-        
-        END_INTERFACE
-    } IGPAXVtbl;
-
-    interface IGPAX
-    {
-        CONST_VTBL struct IGPAXVtbl __RPC_FAR *lpVtbl;
-    };
-
-    
+typedef struct IGPAXVtbl
+{
+	BEGIN_INTERFACE
+
+	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ REFIID riid,
+	    /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
+
+	ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
+	    IGPAX __RPC_FAR * This);
+
+	ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
+	    IGPAX __RPC_FAR * This);
+
+	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount )(
+	    IGPAX __RPC_FAR * This,
+	    /* [out] */ UINT __RPC_FAR *pctinfo);
+
+	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ UINT iTInfo,
+	    /* [in] */ LCID lcid,
+	    /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
+
+	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ REFIID riid,
+	    /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
+	    /* [in] */ UINT cNames,
+	    /* [in] */ LCID lcid,
+	    /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
+
+	/* [local] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Invoke )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ DISPID dispIdMember,
+	    /* [in] */ REFIID riid,
+	    /* [in] */ LCID lcid,
+	    /* [in] */ WORD wFlags,
+	    /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
+	    /* [out] */ VARIANT __RPC_FAR *pVarResult,
+	    /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
+	    /* [out] */ UINT __RPC_FAR *puArgErr);
+
+	/* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Play )(
+	    IGPAX __RPC_FAR * This);
+
+	/* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Pause )(
+	    IGPAX __RPC_FAR * This);
+
+	/* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Stop )(
+	    IGPAX __RPC_FAR * This);
+
+	/* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Update )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ BSTR mtype,
+	    /* [in] */ BSTR updates);
+
+	/* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QualitySwitch )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ INT switchUp);
+
+	/* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetURL )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ BSTR url);
+
+	/* [helpstring][propget][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_src )(
+	    IGPAX __RPC_FAR * This,
+	    /* [retval][out] */ BSTR __RPC_FAR *url);
+
+	/* [helpstring][propput][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_src )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ BSTR url);
+
+	/* [helpstring][propget][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_AutoStart )(
+	    IGPAX __RPC_FAR * This,
+	    /* [retval][out] */ VARIANT_BOOL __RPC_FAR *autoplay);
+
+	/* [helpstring][propput][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_AutoStart )(
+	    IGPAX __RPC_FAR * This,
+	    /* [in] */ VARIANT_BOOL autoplay);
+
+	END_INTERFACE
+} IGPAXVtbl;
+
+interface IGPAX
+{
+	CONST_VTBL struct IGPAXVtbl __RPC_FAR *lpVtbl;
+};
+
+
 
 #ifdef COBJMACROS
 
@@ -297,7 +298,7 @@
 
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_Play_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_Play_Proxy(
     IGPAX __RPC_FAR * This);
 
 
@@ -308,7 +309,7 @@
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_Pause_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_Pause_Proxy(
     IGPAX __RPC_FAR * This);
 
 
@@ -319,7 +320,7 @@
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_Stop_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_Stop_Proxy(
     IGPAX __RPC_FAR * This);
 
 
@@ -330,7 +331,7 @@
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_Update_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_Update_Proxy(
     IGPAX __RPC_FAR * This,
     /* [in] */ BSTR mtype,
     /* [in] */ BSTR updates);
@@ -342,7 +343,7 @@
     PRPC_MESSAGE _pRpcMessage,
     DWORD *_pdwStubPhase);
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_QualitySwitch_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_QualitySwitch_Proxy(
     IGPAX __RPC_FAR * This,
     /* [in] */ INT switchUp);
 
@@ -353,7 +354,7 @@
     PRPC_MESSAGE _pRpcMessage,
     DWORD *_pdwStubPhase);
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_SetURL_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IGPAX_SetURL_Proxy(
     IGPAX __RPC_FAR * This,
     /* [in] */ BSTR url);
 
@@ -365,7 +366,7 @@
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE IGPAX_get_src_Proxy( 
+/* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE IGPAX_get_src_Proxy(
     IGPAX __RPC_FAR * This,
     /* [retval][out] */ BSTR __RPC_FAR *url);
 
@@ -377,7 +378,7 @@
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE IGPAX_put_src_Proxy( 
+/* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE IGPAX_put_src_Proxy(
     IGPAX __RPC_FAR * This,
     /* [in] */ BSTR url);
 
@@ -389,7 +390,7 @@
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE IGPAX_get_AutoStart_Proxy( 
+/* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE IGPAX_get_AutoStart_Proxy(
     IGPAX __RPC_FAR * This,
     /* [retval][out] */ VARIANT_BOOL __RPC_FAR *autoplay);
 
@@ -401,7 +402,7 @@
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE IGPAX_put_AutoStart_Proxy( 
+/* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE IGPAX_put_AutoStart_Proxy(
     IGPAX __RPC_FAR * This,
     /* [in] */ VARIANT_BOOL autoplay);
 
@@ -412,28 +413,28 @@
     PRPC_MESSAGE _pRpcMessage,
     DWORD *_pdwStubPhase);
 
-/* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE IGPAX_get_DownloadProgress_Proxy( 
-	IGPAX __RPC_FAR * This,
-	/* [retval][out] */ INT __RPC_FAR *autoplay);
+/* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE IGPAX_get_DownloadProgress_Proxy(
+    IGPAX __RPC_FAR * This,
+    /* [retval][out] */ INT __RPC_FAR *autoplay);
 
 
 void __RPC_STUB IGPAX_get_DownloadProgress_Stub(
-	IRpcStubBuffer *This,
-	IRpcChannelBuffer *_pRpcChannelBuffer,
-	PRPC_MESSAGE _pRpcMessage,
-	DWORD *_pdwStubPhase);
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
 
 
-/* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE IGPAX_put_DownloadProgress_Proxy( 
-	IGPAX __RPC_FAR * This,
-	/* [in] */ INT autoplay);
+/* [helpstring][propput][id] */ HRESULT STDMETHODCALLTYPE IGPAX_put_DownloadProgress_Proxy(
+    IGPAX __RPC_FAR * This,
+    /* [in] */ INT autoplay);
 
 
 void __RPC_STUB IGPAX_put_DownloadProgress_Stub(
-	IRpcStubBuffer *This,
-	IRpcChannelBuffer *_pRpcChannelBuffer,
-	PRPC_MESSAGE _pRpcMessage,
-	DWORD *_pdwStubPhase);
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
 
 
 
@@ -444,73 +445,74 @@
 #define __IGPAXEvents_DISPINTERFACE_DEFINED__
 
 /* dispinterface IGPAXEvents */
-/* [helpstring][uuid] */ 
+/* [helpstring][uuid] */
 
 
 EXTERN_C const IID DIID_IGPAXEvents;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
 
-    MIDL_INTERFACE("1FDA32FC-4C9A-461F-B33B-0715B0343006")
-    IGPAXEvents : public IDispatch
-    {
-    };
-    
+MIDL_INTERFACE("1FDA32FC-4C9A-461F-B33B-0715B0343006")
+IGPAXEvents :
+public IDispatch
+{
+};
+
 #else 	/* C style interface */
 
-    typedef struct IGPAXEventsVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
-            IGPAXEvents __RPC_FAR * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
-            IGPAXEvents __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
-            IGPAXEvents __RPC_FAR * This);
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount )( 
-            IGPAXEvents __RPC_FAR * This,
-            /* [out] */ UINT __RPC_FAR *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo )( 
-            IGPAXEvents __RPC_FAR * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames )( 
-            IGPAXEvents __RPC_FAR * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Invoke )( 
-            IGPAXEvents __RPC_FAR * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
-            /* [out] */ VARIANT __RPC_FAR *pVarResult,
-            /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
-            /* [out] */ UINT __RPC_FAR *puArgErr);
-        
-        END_INTERFACE
-    } IGPAXEventsVtbl;
-
-    interface IGPAXEvents
-    {
-        CONST_VTBL struct IGPAXEventsVtbl __RPC_FAR *lpVtbl;
-    };
-
-    
+typedef struct IGPAXEventsVtbl
+{
+	BEGIN_INTERFACE
+
+	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
+	    IGPAXEvents __RPC_FAR * This,
+	    /* [in] */ REFIID riid,
+	    /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
+
+	ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
+	    IGPAXEvents __RPC_FAR * This);
+
+	ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
+	    IGPAXEvents __RPC_FAR * This);
+
+	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount )(
+	    IGPAXEvents __RPC_FAR * This,
+	    /* [out] */ UINT __RPC_FAR *pctinfo);
+
+	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo )(
+	    IGPAXEvents __RPC_FAR * This,
+	    /* [in] */ UINT iTInfo,
+	    /* [in] */ LCID lcid,
+	    /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
+
+	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames )(
+	    IGPAXEvents __RPC_FAR * This,
+	    /* [in] */ REFIID riid,
+	    /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
+	    /* [in] */ UINT cNames,
+	    /* [in] */ LCID lcid,
+	    /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
+
+	/* [local] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Invoke )(
+	    IGPAXEvents __RPC_FAR * This,
+	    /* [in] */ DISPID dispIdMember,
+	    /* [in] */ REFIID riid,
+	    /* [in] */ LCID lcid,
+	    /* [in] */ WORD wFlags,
+	    /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
+	    /* [out] */ VARIANT __RPC_FAR *pVarResult,
+	    /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
+	    /* [out] */ UINT __RPC_FAR *puArgErr);
+
+	END_INTERFACE
+} IGPAXEventsVtbl;
+
+interface IGPAXEvents
+{
+	CONST_VTBL struct IGPAXEventsVtbl __RPC_FAR *lpVtbl;
+};
+
+
 
 #ifdef COBJMACROS
 
@@ -551,7 +553,7 @@
 #ifdef __cplusplus
 
 class DECLSPEC_UUID("181D18E6-4DC1-4B55-B72E-BE2A10064995")
-GPAX;
+	GPAX;
 #endif
 #endif /* __GPAXLib_LIBRARY_DEFINED__ */

gpac-0.5.0.svn5178.tar.bz2/applications/GPAX/GPAXPlugin.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/GPAX/GPAXPlugin.cpp Changed

@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "stdafx.h"
@@ -70,7 +70,7 @@
 	char msg[1024];
 	if (!m_term) return GF_FALSE;
 
-    switch (evt->type) {
+	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));
@@ -78,7 +78,7 @@
 			sprintf(msg, "(GPAC) %s", evt->message.message);
 		}
 		SetStatusText(msg);
-        break;
+		break;
 	case GF_EVENT_PROGRESS:
 		if (evt->progress.done == evt->progress.total) {
 			SetStatusText(NULL);
@@ -86,8 +86,7 @@
 		} else {
 			char *szTitle = "";
 			if (evt->progress.progress_type==0) szTitle = "Buffer ";
-			else 
-			if (evt->progress.progress_type==1) 
+			else if (evt->progress.progress_type==1)
 			{
 				szTitle = "Download ";
 				m_iDownload_progress = (int)floor((100.0*evt->progress.done) / evt->progress.total);
@@ -97,25 +96,25 @@
 			SetStatusText(msg);
 		}
 		break;
-    case GF_EVENT_CONNECT:
-        m_bIsConnected = evt->connect.is_connected;
-        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;
+		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;
+		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 {
+		} else {
 			switch (evt->key.key_code) {
 			case GF_KEY_HOME:
 				gf_term_set_option(m_term, GF_OPT_NAVIGATION_TYPE, 1);
@@ -125,7 +124,7 @@
 				break;
 			}
 		}
-	    break;
+		break;
 	case GF_EVENT_NAVIGATE_INFO:
 		strcpy(msg, evt->navigate.to_url);
 		SetStatusText(msg);
@@ -134,7 +133,7 @@
 		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;
@@ -162,31 +161,31 @@
 		}
 #endif
 		break;
-    }
-    return GF_FALSE;
+	}
+	return GF_FALSE;
 }
 
 Bool GPAX_EventProc(void *ptr, GF_Event *evt)
 {
-    CGPAXPlugin *_this = (CGPAXPlugin *)ptr;
-    return _this->EventProc(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)
+                                  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)
-        {
+	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;
@@ -195,10 +194,10 @@
 				buf[(u32) len] = 0;
 				retval = GF_TRUE;
 			}
-        }
-        VariantClear(&v);
-    }
-    return retval;
+		}
+		VariantClear(&v);
+	}
+	return retval;
 }
 
 void CGPAXPlugin::LoadDATAUrl()
@@ -207,27 +206,27 @@
 	HRESULT hr;
 
 	if (m_url[0]) return;
-    /*get parent doc*/
+	/*get parent doc*/
 	CComPtr<IOleContainer> spContainer;
 	if (m_spClientSite->GetContainer(&spContainer) != S_OK)
 		return;
-    CComPtr<IHTMLDocument2> spDoc = CComQIPtr<IHTMLDocument2>(spContainer);
-    CComPtr<IHTMLElementCollection> spColl;
+	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<IDispatch> spDisp;
 	CComPtr<IHTMLElementCollection> sphtmlObjects;
 
-    CComPtr<IDispatch> spDispObjects;
+	CComPtr<IDispatch> spDispObjects;
 	if (spColl->tags(CComVariant("OBJECT"), &spDispObjects) != S_OK)
 		return;
-    CComPtr<IHTMLElementCollection> spObjs = CComQIPtr<IHTMLElementCollection>(spDispObjects);
-	
+	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++) {   
+	for (long lCnt = 0; lCnt < lCount; lCnt++) {
 		IDispatch *an_obj= NULL;
 		CComVariant varEmpty;
 		CComVariant varName;
@@ -268,26 +267,26 @@
 // 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;
+	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);
 }
 
@@ -307,10 +306,10 @@
 //GPAC player instance.
 LRESULT CGPAXPlugin::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-    if (m_term) return 0;
-    const char *str;
+	if (m_term) return 0;
+	const char *str;
 
-    if (m_hWnd==NULL) return 0;
+	if (m_hWnd==NULL) return 0;
 
 	gf_sys_init(GF_FALSE);
 
@@ -319,12 +318,12 @@
 	//2)Modules file path
 	//3)window handler
 	//4)EventProc
-    memset(&m_user, 0, sizeof(m_user));
+	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) {
+	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
@@ -333,49 +332,49 @@
 		goto err_exit;
 	}
 
-/*check log file*/	
+	/*check log file*/
 	str = gf_cfg_get_key(m_user.config, "General", "LogFile");
 	if (str) {
 		m_pLogs = gf_f64_open(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;
+	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);
+	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;
+	::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;
+	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;
+	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;
 }
@@ -389,7 +388,7 @@
 	}
 	if (m_user.modules) gf_modules_del(m_user.modules);
 	if (m_user.config) gf_cfg_del(m_user.config);
-	if (m_pLogs) 
+	if (m_pLogs)
 		fclose(m_pLogs);
 	m_pLogs = NULL;
 	gf_log_set_callback(NULL, NULL);
@@ -407,7 +406,7 @@
 LRESULT CGPAXPlugin::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
 	UnloadTerm();
-    return 0;
+	return 0;
 }
 
 
@@ -417,7 +416,7 @@
 		m_bInitialDraw = GF_FALSE;
 		if (m_bAutoStart) Play();
 	}
-    return S_OK;
+	return S_OK;
 }
 
 // Load is called before OnCreate, but it may not be called at
@@ -425,27 +424,27 @@
 STDMETHODIMP CGPAXPlugin::Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog)
 {
 	char szOpt[1024];
-    // examine the <embed>/<param> tag arguments
+	// examine the <embed>/<param> tag arguments
 
 	m_url[0] = 0;
-    ReadParamString(pPropBag,pErrorLog,L"src", m_url, MAXLEN_URL);
+	ReadParamString(pPropBag,pErrorLog,L"src", m_url, MAXLEN_URL);
 	if (!m_url[0])
-	    ReadParamString(pPropBag,pErrorLog,L"data", m_url, MAXLEN_URL);
+		ReadParamString(pPropBag,pErrorLog,L"data", m_url, MAXLEN_URL);
 
-    if (ReadParamString(pPropBag,pErrorLog,L"autostart", szOpt, 1024))
+	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))
+	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 (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))
+	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))
@@ -480,8 +479,8 @@
 	LPOLESTR sDisplayName;
 
 	if (SUCCEEDED(m_spClientSite->GetMoniker(OLEGETMONIKER_TEMPFORUSER,
-									   OLEWHICHMK_CONTAINER,
-									   &pMoniker) ) ) {
+	              OLEWHICHMK_CONTAINER,
+	              &pMoniker) ) ) {
 		char parent_url[1024];
 		pMoniker->GetDisplayName(NULL, NULL, &sDisplayName);
 		wcstombs(parent_url, sDisplayName, 300);
@@ -501,27 +500,27 @@
 	const char *sptr;
 	u16 len;
 
-    VARIANT value;
-    if( pPropBag == NULL) return E_INVALIDARG;
+	VARIANT value;
+	if( pPropBag == NULL) return E_INVALIDARG;
 
-    VariantInit(&value);
+	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_BOOL;
+	V_BOOL(&value) = m_bAutoStart ? VARIANT_TRUE : VARIANT_FALSE;
+	pPropBag->Write(OLESTR("AutoStart"), &value);
+	VariantClear(&value);
 
-    V_VT(&value) = VT_BSTR;
+	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);
+	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;
+
+	pPropBag->Write(OLESTR("src"), &value);
+	VariantClear(&value);
+	return S_OK;
 }
 
 STDMETHODIMP CGPAXPlugin::Play()
@@ -543,31 +542,31 @@
 		} else
 			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);   //if target is connected, set it playing
 	}
-    return S_OK;
+	return S_OK;
 }
 
 STDMETHODIMP CGPAXPlugin::Pause()
 {
-    if(m_term) {
+	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);
+			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);
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
 		}
 	}
-    return S_OK;
+	return S_OK;
 }
 
 STDMETHODIMP CGPAXPlugin::Stop()
 {
-    if(m_term) gf_term_disconnect(m_term);     //set it stop
-    return S_OK;
+	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;
+	if (m_term) gf_term_switch_quality(m_term, switch_up ? GF_TRUE : GF_FALSE);
+	return S_OK;
 }
 
 STDMETHODIMP CGPAXPlugin::SetURL(BSTR _url)
@@ -585,7 +584,7 @@
 			len = (u32) gf_utf8_wcstombs(url, len, (const u16 **)&srcp);
 			url[len] = 0;
 			strcpy(m_url, url);
-			gf_term_connect(m_term, url);     
+			gf_term_connect(m_term, url);
 			gf_free(url);
 		}
 	}
@@ -594,7 +593,7 @@
 
 STDMETHODIMP CGPAXPlugin::Update(BSTR _mtype, BSTR _updates)
 {
-    if (m_term) {
+	if (m_term) {
 		u16 *srcp;
 		u32 len;
 		char mtype[1024], *updates;
@@ -614,7 +613,7 @@
 			gf_free(updates);
 		}
 	}
-    return S_OK;
+	return S_OK;
 }
 
 STDMETHODIMP CGPAXPlugin::get_src(BSTR *url)
@@ -622,14 +621,14 @@
 	u16 wurl[MAXLEN_URL];
 	const char *sptr;
 	u16 len;
-    if (url==NULL) return E_POINTER;
+	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);
+	*url = SysAllocStringLen(NULL, len+1);
 	memcpy(*url, wurl, len*sizeof(u16));
 	*url[len] = 0;
-    return S_OK;
+	return S_OK;
 }
 STDMETHODIMP CGPAXPlugin::put_src(BSTR url)
 {
@@ -637,19 +636,19 @@
 	u32 len = (u32) gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
 	m_url[len] = 0;
 	UpdateURL();
-    return S_OK;
+	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;
+	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;
+	m_bAutoStart = (as !=VARIANT_FALSE) ? GF_TRUE : GF_FALSE;
+	return S_OK;
 }
 
 STDMETHODIMP CGPAXPlugin::get_DownloadProgress(INT *dp)
@@ -663,49 +662,49 @@
 	return S_OK;
 }
 
-STDMETHODIMP CGPAXPlugin::GetInterfaceSafetyOptions(      
+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;
+	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(      
+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;
+	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.5.0.svn5178.tar.bz2/applications/GPAX/GPAXPlugin.h -> gpac-0.5.1.svn5491.tar.xz/applications/GPAX/GPAXPlugin.h Changed

@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #ifndef __GPAXPLUGIN_H_
@@ -50,37 +50,37 @@
 /////////////////////////////////////////////////////////////////////////////
 // CGPAXPlugin
 class ATL_NO_VTABLE CGPAXPlugin :
-            public CComObjectRootEx<CComSingleThreadModel>,
-            public IDispatchImpl<IGPAX, &IID_IGPAX, &LIBID_GPAXLib>,
-            public CComControl<CGPAXPlugin>,
-            public CComCoClass<CGPAXPlugin, &CLSID_GPAX>,
-            public IOleControlImpl<CGPAXPlugin>,
-            public IOleObjectImpl<CGPAXPlugin>,
-            public IOleInPlaceActiveObjectImpl<CGPAXPlugin>,
-            public IViewObjectExImpl<CGPAXPlugin>,
-            public IOleInPlaceObjectWindowlessImpl<CGPAXPlugin>,
-            public IProvideClassInfo2Impl<&CLSID_GPAX, &DIID_IGPAXEvents, &LIBID_GPAXLib>,
-
-			public IPersistStreamInitImpl<CGPAXPlugin>,
-            public ISupportErrorInfo,
-            public IConnectionPointContainerImpl<CGPAXPlugin>,
-            public IPersistStorageImpl<CGPAXPlugin>,
-            public ISpecifyPropertyPagesImpl<CGPAXPlugin>,
-            public IQuickActivateImpl<CGPAXPlugin>,
-            public IDataObjectImpl<CGPAXPlugin>,
-            public IPropertyNotifySinkCP<CGPAXPlugin>,
-
-			public IPersistPropertyBagImpl<CGPAXPlugin>,
-			public IObjectSafetyImpl<CGPAXPlugin, INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA>
+	public CComObjectRootEx<CComSingleThreadModel>,
+	public IDispatchImpl<IGPAX, &IID_IGPAX, &LIBID_GPAXLib>,
+	public CComControl<CGPAXPlugin>,
+	public CComCoClass<CGPAXPlugin, &CLSID_GPAX>,
+	public IOleControlImpl<CGPAXPlugin>,
+	public IOleObjectImpl<CGPAXPlugin>,
+	public IOleInPlaceActiveObjectImpl<CGPAXPlugin>,
+	public IViewObjectExImpl<CGPAXPlugin>,
+	public IOleInPlaceObjectWindowlessImpl<CGPAXPlugin>,
+	public IProvideClassInfo2Impl<&CLSID_GPAX, &DIID_IGPAXEvents, &LIBID_GPAXLib>,
+
+	public IPersistStreamInitImpl<CGPAXPlugin>,
+	public ISupportErrorInfo,
+	public IConnectionPointContainerImpl<CGPAXPlugin>,
+	public IPersistStorageImpl<CGPAXPlugin>,
+	public ISpecifyPropertyPagesImpl<CGPAXPlugin>,
+	public IQuickActivateImpl<CGPAXPlugin>,
+	public IDataObjectImpl<CGPAXPlugin>,
+	public IPropertyNotifySinkCP<CGPAXPlugin>,
+
+	public IPersistPropertyBagImpl<CGPAXPlugin>,
+	public IObjectSafetyImpl<CGPAXPlugin, INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA>
 
 {
 public:
-    CGPAXPlugin() {
+	CGPAXPlugin() {
 		m_term = NULL;
 		m_bAutoStart = GF_TRUE;
 		m_bInitialDraw = GF_TRUE;
 		m_bWindowOnly = GF_TRUE;  //to declare that the control is a window control in order
-							   //to inherit the member variable m_hWnd which contains the window handler
+		//to inherit the member variable m_hWnd which contains the window handler
 		m_bIsConnected = GF_FALSE;
 		m_bUse3D = GF_FALSE;
 		m_bUseGUI = GF_FALSE;
@@ -94,7 +94,7 @@
 		memset(&m_user, 0, sizeof(m_user));
 
 		m_dwCurrentSafety = INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA;
-    }
+	}
 
 	~CGPAXPlugin();
 
@@ -102,132 +102,134 @@
 
 	BOOL PreTranslateMessage(MSG* pMsg);
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_GPAXPLUGIN)
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
+	DECLARE_REGISTRY_RESOURCEID(IDR_GPAXPLUGIN)
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
 #if (_MSC_VER >= 1300)
 	DECLARE_OLEMISC_STATUS(OLEMISC_ACTSLIKEBUTTON | OLEMISC_ACTIVATEWHENVISIBLE)
 #endif
 
-    static LPCTSTR GetWindowClassName() { return TEXT("GPAC ActiveX"); }
-
-    BEGIN_COM_MAP(CGPAXPlugin)
-    COM_INTERFACE_ENTRY(IGPAX)
-    COM_INTERFACE_ENTRY(IDispatch)
-    COM_INTERFACE_ENTRY(IViewObjectEx)
-    COM_INTERFACE_ENTRY(IProvideClassInfo)
-    COM_INTERFACE_ENTRY(IOleControl)
-    COM_INTERFACE_ENTRY(IOleObject)
-
-    COM_INTERFACE_ENTRY_IMPL(IViewObjectEx)
-    COM_INTERFACE_ENTRY_IMPL_IID(IID_IViewObject2, IViewObjectEx)
-    COM_INTERFACE_ENTRY_IMPL_IID(IID_IViewObject, IViewObjectEx)
-    COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleWindow, IOleInPlaceObjectWindowless)
-    COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleInPlaceObject, IOleInPlaceObjectWindowless)
-    COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleWindow, IOleInPlaceActiveObject)
-    
+	static LPCTSTR GetWindowClassName() {
+		return TEXT("GPAC ActiveX");
+	}
+
+	BEGIN_COM_MAP(CGPAXPlugin)
+	COM_INTERFACE_ENTRY(IGPAX)
+	COM_INTERFACE_ENTRY(IDispatch)
+	COM_INTERFACE_ENTRY(IViewObjectEx)
+	COM_INTERFACE_ENTRY(IProvideClassInfo)
+	COM_INTERFACE_ENTRY(IOleControl)
+	COM_INTERFACE_ENTRY(IOleObject)
+
+	COM_INTERFACE_ENTRY_IMPL(IViewObjectEx)
+	COM_INTERFACE_ENTRY_IMPL_IID(IID_IViewObject2, IViewObjectEx)
+	COM_INTERFACE_ENTRY_IMPL_IID(IID_IViewObject, IViewObjectEx)
+	COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleWindow, IOleInPlaceObjectWindowless)
+	COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleInPlaceObject, IOleInPlaceObjectWindowless)
+	COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleWindow, IOleInPlaceActiveObject)
+
 	COM_INTERFACE_ENTRY_IMPL(IOleInPlaceActiveObject)
-    COM_INTERFACE_ENTRY_IMPL(IOleInPlaceObjectWindowless)
-	
+	COM_INTERFACE_ENTRY_IMPL(IOleInPlaceObjectWindowless)
+
 //	COM_INTERFACE_ENTRY(IObjectSafety)
 	COM_INTERFACE_ENTRY_IID(IID_IObjectSafety, IObjectSafety)
 	COM_INTERFACE_ENTRY(IPersistPropertyBag)
-    COM_INTERFACE_ENTRY_IMPL_IID(IID_IPersist, IPersistPropertyBag)
-	
-/*	COM_INTERFACE_ENTRY(IViewObject)
-    COM_INTERFACE_ENTRY(IViewObject2)
-    COM_INTERFACE_ENTRY2(IOleWindow, IOleInPlaceObjectWindowless)
-    COM_INTERFACE_ENTRY(IOleInPlaceObject)
-	*/
+	COM_INTERFACE_ENTRY_IMPL_IID(IID_IPersist, IPersistPropertyBag)
+
+	/*	COM_INTERFACE_ENTRY(IViewObject)
+	    COM_INTERFACE_ENTRY(IViewObject2)
+	    COM_INTERFACE_ENTRY2(IOleWindow, IOleInPlaceObjectWindowless)
+	    COM_INTERFACE_ENTRY(IOleInPlaceObject)
+		*/
 
 	COM_INTERFACE_ENTRY(IProvideClassInfo2)
-    COM_INTERFACE_ENTRY(IPersistStreamInit)
-    COM_INTERFACE_ENTRY2(IPersist, IPersistStreamInit)
-    COM_INTERFACE_ENTRY(ISupportErrorInfo)
-    COM_INTERFACE_ENTRY(IConnectionPointContainer)
-    COM_INTERFACE_ENTRY(ISpecifyPropertyPages)
-    COM_INTERFACE_ENTRY(IQuickActivate)
-    COM_INTERFACE_ENTRY(IPersistStorage)
-    COM_INTERFACE_ENTRY(IDataObject)
-
-    END_COM_MAP()
-
-    BEGIN_PROP_MAP(CGPAXPlugin)
-    END_PROP_MAP()
-
-    BEGIN_CONNECTION_POINT_MAP(CGPAXPlugin)
-    CONNECTION_POINT_ENTRY(IID_IPropertyNotifySink)
-    END_CONNECTION_POINT_MAP()
-
-    BEGIN_MSG_MAP(CGPAXPlugin)
-    CHAIN_MSG_MAP(CComControl<CGPAXPlugin>)
-    DEFAULT_REFLECTION_HANDLER()
+	COM_INTERFACE_ENTRY(IPersistStreamInit)
+	COM_INTERFACE_ENTRY2(IPersist, IPersistStreamInit)
+	COM_INTERFACE_ENTRY(ISupportErrorInfo)
+	COM_INTERFACE_ENTRY(IConnectionPointContainer)
+	COM_INTERFACE_ENTRY(ISpecifyPropertyPages)
+	COM_INTERFACE_ENTRY(IQuickActivate)
+	COM_INTERFACE_ENTRY(IPersistStorage)
+	COM_INTERFACE_ENTRY(IDataObject)
+
+	END_COM_MAP()
+
+	BEGIN_PROP_MAP(CGPAXPlugin)
+	END_PROP_MAP()
+
+	BEGIN_CONNECTION_POINT_MAP(CGPAXPlugin)
+	CONNECTION_POINT_ENTRY(IID_IPropertyNotifySink)
+	END_CONNECTION_POINT_MAP()
+
+	BEGIN_MSG_MAP(CGPAXPlugin)
+	CHAIN_MSG_MAP(CComControl<CGPAXPlugin>)
+	DEFAULT_REFLECTION_HANDLER()
 	MESSAGE_HANDLER(WM_CREATE, OnCreate)
 	MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
 
-    END_MSG_MAP()
-    // Handler prototypes:
-    //  LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-    //  LRESULT CommandHandler(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-    //  LRESULT NotifyHandler(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
+	END_MSG_MAP()
+	// Handler prototypes:
+	//  LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+	//  LRESULT CommandHandler(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+	//  LRESULT NotifyHandler(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
 
 
 
-    // ISupportsErrorInfo
-    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid)
-    {
-        static const IID* arr[] =
-            {
-                &IID_IGPAX,
-            };
-        for (int i=0; i<sizeof(arr)/sizeof(arr[0]); i++)
-        {
+	// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid)
+	{
+		static const IID* arr[] =
+		{
+			&IID_IGPAX,
+		};
+		for (int i=0; i<sizeof(arr)/sizeof(arr[0]); i++)
+		{
 #if (_MSC_VER < 1300)
 			if (::ATL::InlineIsEqualGUID(*arr[i], riid))
 #else
 			if (::InlineIsEqualGUID(*arr[i], riid))
 #endif
 				return S_OK;
-        }
-        return S_FALSE;
-    }
-    STDMETHODIMP GetInterfaceSafetyOptions(      
-        REFIID riid,
-        DWORD *pdwSupportedOptions,
-        DWORD *pdwEnabledOptions
-    );
-
-    STDMETHODIMP SetInterfaceSafetyOptions(      
-        REFIID riid,
-        DWORD dwOptionSetMask,
-        DWORD dwEnabledOptions
-    );
-
-    // IViewObjectEx
-    DECLARE_VIEW_STATUS(VIEWSTATUS_SOLIDBKGND | VIEWSTATUS_OPAQUE)
-
-    // IGPAX
+		}
+		return S_FALSE;
+	}
+	STDMETHODIMP GetInterfaceSafetyOptions(
+	    REFIID riid,
+	    DWORD *pdwSupportedOptions,
+	    DWORD *pdwEnabledOptions
+	);
+
+	STDMETHODIMP SetInterfaceSafetyOptions(
+	    REFIID riid,
+	    DWORD dwOptionSetMask,
+	    DWORD dwEnabledOptions
+	);
+
+	// IViewObjectEx
+	DECLARE_VIEW_STATUS(VIEWSTATUS_SOLIDBKGND | VIEWSTATUS_OPAQUE)
+
+	// IGPAX
 public:
 	//Interface methods
 	STDMETHOD(Stop)();
 	STDMETHOD(Pause)();
 	STDMETHOD(Play)();
-    STDMETHOD(Update)(BSTR mtype,BSTR updates);
+	STDMETHOD(Update)(BSTR mtype,BSTR updates);
 	STDMETHOD(QualitySwitch)(int switch_up);
 	STDMETHOD(SetURL)(BSTR url);
 
 	//Interface properties
-    STDMETHODIMP get_src(BSTR *url);
-    STDMETHODIMP put_src(BSTR url);
-    STDMETHODIMP get_AutoStart(VARIANT_BOOL *as);
-    STDMETHODIMP put_AutoStart(VARIANT_BOOL as);
+	STDMETHODIMP get_src(BSTR *url);
+	STDMETHODIMP put_src(BSTR url);
+	STDMETHODIMP get_AutoStart(VARIANT_BOOL *as);
+	STDMETHODIMP put_AutoStart(VARIANT_BOOL as);
 	STDMETHODIMP get_DownloadProgress(INT *dp);
 	STDMETHODIMP put_DownloadProgress(INT dp);
 
 	//Customed Window Message functions: OnCreate and OnDestroy are called when a window
 	//is created or destroyed. OnDraw is to establish inital connection.
-    HRESULT OnDraw(ATL_DRAWINFO& di);
-    LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-    LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+	HRESULT OnDraw(ATL_DRAWINFO& di);
+	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+	LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
 	//IPersistPropertyBag method: to handle persist property packed and transfered by MSIE
 	//in html doc, the ActiveX control is added by tags
@@ -235,9 +237,9 @@
 	//		<PARAM name="..." value="...">
 	//   </object>
 	//the interface IPersistPropertyBag enable MSIE and ActiveX Control to communicate these
-	//properties included in tags <PARAM> 
-    STDMETHODIMP Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog);
-    STDMETHODIMP Save(LPPROPERTYBAG, BOOL, BOOL);
+	//properties included in tags <PARAM>
+	STDMETHODIMP Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog);
+	STDMETHODIMP Save(LPPROPERTYBAG, BOOL, BOOL);
 
 
 private:
@@ -248,7 +250,7 @@
 	void LoadDATAUrl();
 
 	GF_Terminal *m_term;
-    GF_User m_user;
+	GF_User m_user;
 	char m_url[MAXLEN_URL];
 #ifndef _WIN32_WCE
 	/*pointer to the parent browser if any*/

gpac-0.5.0.svn5178.tar.bz2/applications/GPAX/GPAX_i.c -> gpac-0.5.1.svn5491.tar.xz/applications/GPAX/GPAX_i.c Changed

@@ -6,13 +6,13 @@
 /* link this file in with the server and any clients */
 
 
- /* File created by MIDL compiler version 5.03.0286 */
+/* File created by MIDL compiler version 5.03.0286 */
 /* at Thu Jul 20 19:14:15 2006
  */
 /* Compiler settings for \CVS\gpac\applications\GPAX\GPAX.idl:
     Oicf (OptLev=i2), W1, Zp8, env=Win32 (32b run), ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -21,8 +21,8 @@
 #if !defined(_M_IA64) && !defined(_M_AXP64)
 
 #ifdef __cplusplus
-extern "C"{
-#endif 
+extern "C" {
+#endif
 
 
 #include <rpc.h>
@@ -48,10 +48,10 @@
 
 typedef struct _IID
 {
-    unsigned long x;
-    unsigned short s1;
-    unsigned short s2;
-    unsigned char  c[8];
+	unsigned long x;
+	unsigned short s1;
+	unsigned short s2;
+	unsigned char  c[8];
 } IID;
 
 #endif // __IID_DEFINED__
@@ -95,13 +95,13 @@
 /* link this file in with the server and any clients */
 
 
- /* File created by MIDL compiler version 5.03.0286 */
+/* File created by MIDL compiler version 5.03.0286 */
 /* at Thu Jul 20 19:14:15 2006
  */
 /* Compiler settings for \CVS\gpac\applications\GPAX\GPAX.idl:
     Oicf (OptLev=i2), W1, Zp8, env=Win64 (32b run,appending), ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -110,8 +110,8 @@
 #if defined(_M_IA64) || defined(_M_AXP64)
 
 #ifdef __cplusplus
-extern "C"{
-#endif 
+extern "C" {
+#endif
 
 
 #include <rpc.h>
@@ -137,10 +137,10 @@
 
 typedef struct _IID
 {
-    unsigned long x;
-    unsigned short s1;
-    unsigned short s2;
-    unsigned char  c[8];
+	unsigned long x;
+	unsigned short s1;
+	unsigned short s2;
+	unsigned char  c[8];
 } IID;
 
 #endif // __IID_DEFINED__

gpac-0.5.0.svn5178.tar.bz2/applications/GPAX/GPAX_p.c -> gpac-0.5.1.svn5491.tar.xz/applications/GPAX/GPAX_p.c Changed

@@ -6,7 +6,7 @@
  */
 /* Compiler settings for D:\CVS\gpac\applications\GPAX\GPAX.idl:
     Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data 
+    error checks: allocation ref bounds_check enum stub_data
 */
 //@@MIDL_FILE_HEADING(  )
 
@@ -27,20 +27,20 @@
 
 #include "GPAX.h"
 
-#define TYPE_FORMAT_STRING_SIZE   59                                
-#define PROC_FORMAT_STRING_SIZE   213                               
+#define TYPE_FORMAT_STRING_SIZE   59
+#define PROC_FORMAT_STRING_SIZE   213
 
 typedef struct _MIDL_TYPE_FORMAT_STRING
-    {
-    short          Pad;
-    unsigned char  Format[ TYPE_FORMAT_STRING_SIZE ];
-    } MIDL_TYPE_FORMAT_STRING;
+{
+	short          Pad;
+	unsigned char  Format[ TYPE_FORMAT_STRING_SIZE ];
+} MIDL_TYPE_FORMAT_STRING;
 
 typedef struct _MIDL_PROC_FORMAT_STRING
-    {
-    short          Pad;
-    unsigned char  Format[ PROC_FORMAT_STRING_SIZE ];
-    } MIDL_PROC_FORMAT_STRING;
+{
+	short          Pad;
+	unsigned char  Format[ PROC_FORMAT_STRING_SIZE ];
+} MIDL_PROC_FORMAT_STRING;
 
 
 extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;
@@ -71,129 +71,129 @@
 #pragma code_seg(".orpc")
 extern const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[1];
 
-static const MIDL_STUB_DESC Object_StubDesc = 
-    {
-    0,
-    NdrOleAllocate,
-    NdrOleFree,
-    0,
-    0,
-    0,
-    0,
-    0,
-    __MIDL_TypeFormatString.Format,
-    1, /* -error bounds_check flag */
-    0x20000, /* Ndr library version */
-    0,
-    0x50100a4, /* MIDL Version 5.1.164 */
-    0,
-    UserMarshalRoutines,
-    0,  /* notify & notify_flag routine table */
-    1,  /* Flags */
-    0,  /* Reserved3 */
-    0,  /* Reserved4 */
-    0   /* Reserved5 */
-    };
-
-static const unsigned short IGPAX_FormatStringOffsetTable[] = 
-    {
-    (unsigned short) -1,
-    (unsigned short) -1,
-    (unsigned short) -1,
-    (unsigned short) -1,
-    0,
-    22,
-    44,
-    66,
-    100,
-    128,
-    156,
-    184
-    };
-
-static const MIDL_SERVER_INFO IGPAX_ServerInfo = 
-    {
-    &Object_StubDesc,
-    0,
-    __MIDL_ProcFormatString.Format,
-    &IGPAX_FormatStringOffsetTable[-3],
-    0,
-    0,
-    0,
-    0
-    };
+static const MIDL_STUB_DESC Object_StubDesc =
+{
+	0,
+	NdrOleAllocate,
+	NdrOleFree,
+	0,
+	0,
+	0,
+	0,
+	0,
+	__MIDL_TypeFormatString.Format,
+	1, /* -error bounds_check flag */
+	0x20000, /* Ndr library version */
+	0,
+	0x50100a4, /* MIDL Version 5.1.164 */
+	0,
+	UserMarshalRoutines,
+	0,  /* notify & notify_flag routine table */
+	1,  /* Flags */
+	0,  /* Reserved3 */
+	0,  /* Reserved4 */
+	0   /* Reserved5 */
+};
+
+static const unsigned short IGPAX_FormatStringOffsetTable[] =
+{
+	(unsigned short) -1,
+	(unsigned short) -1,
+	(unsigned short) -1,
+	(unsigned short) -1,
+	0,
+	22,
+	44,
+	66,
+	100,
+	128,
+	156,
+	184
+};
+
+static const MIDL_SERVER_INFO IGPAX_ServerInfo =
+{
+	&Object_StubDesc,
+	0,
+	__MIDL_ProcFormatString.Format,
+	&IGPAX_FormatStringOffsetTable[-3],
+	0,
+	0,
+	0,
+	0
+};
 
 static const MIDL_STUBLESS_PROXY_INFO IGPAX_ProxyInfo =
-    {
-    &Object_StubDesc,
-    __MIDL_ProcFormatString.Format,
-    &IGPAX_FormatStringOffsetTable[-3],
-    0,
-    0,
-    0
-    };
-
-CINTERFACE_PROXY_VTABLE(15) _IGPAXProxyVtbl = 
 {
-    &IGPAX_ProxyInfo,
-    &IID_IGPAX,
-    IUnknown_QueryInterface_Proxy,
-    IUnknown_AddRef_Proxy,
-    IUnknown_Release_Proxy ,
-    0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
-    0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
-    0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
-    0 /* IDispatch_Invoke_Proxy */ ,
-    (void *)-1 /* IGPAX::Play */ ,
-    (void *)-1 /* IGPAX::Pause */ ,
-    (void *)-1 /* IGPAX::Stop */ ,
-    (void *)-1 /* IGPAX::Update */ ,
-    (void *)-1 /* IGPAX::QualitySwitch */ ,
-    (void *)-1 /* IGPAX::get_URL */ ,
-    (void *)-1 /* IGPAX::put_URL */ ,
-    (void *)-1 /* IGPAX::get_AutoStart */ ,
-    (void *)-1 /* IGPAX::put_AutoStart */
+	&Object_StubDesc,
+	__MIDL_ProcFormatString.Format,
+	&IGPAX_FormatStringOffsetTable[-3],
+	0,
+	0,
+	0
+};
+
+CINTERFACE_PROXY_VTABLE(15) _IGPAXProxyVtbl =
+{
+	&IGPAX_ProxyInfo,
+	&IID_IGPAX,
+	IUnknown_QueryInterface_Proxy,
+	IUnknown_AddRef_Proxy,
+	IUnknown_Release_Proxy ,
+	0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
+	0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
+	0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
+	0 /* IDispatch_Invoke_Proxy */ ,
+	(void *)-1 /* IGPAX::Play */ ,
+	(void *)-1 /* IGPAX::Pause */ ,
+	(void *)-1 /* IGPAX::Stop */ ,
+	(void *)-1 /* IGPAX::Update */ ,
+	(void *)-1 /* IGPAX::QualitySwitch */ ,
+	(void *)-1 /* IGPAX::get_URL */ ,
+	(void *)-1 /* IGPAX::put_URL */ ,
+	(void *)-1 /* IGPAX::get_AutoStart */ ,
+	(void *)-1 /* IGPAX::put_AutoStart */
 };
 
 
 static const PRPC_STUB_FUNCTION IGPAX_table[] =
 {
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    NdrStubCall2,
-    NdrStubCall2,
-    NdrStubCall2,
-    NdrStubCall2,
-    NdrStubCall2,
-    NdrStubCall2,
-    NdrStubCall2,
-    NdrStubCall2
+	STUB_FORWARDING_FUNCTION,
+	STUB_FORWARDING_FUNCTION,
+	STUB_FORWARDING_FUNCTION,
+	STUB_FORWARDING_FUNCTION,
+	NdrStubCall2,
+	NdrStubCall2,
+	NdrStubCall2,
+	NdrStubCall2,
+	NdrStubCall2,
+	NdrStubCall2,
+	NdrStubCall2,
+	NdrStubCall2
 };
 
 CInterfaceStubVtbl _IGPAXStubVtbl =
 {
-    &IID_IGPAX,
-    &IGPAX_ServerInfo,
-    15,
-    &IGPAX_table[-3],
-    CStdStubBuffer_DELEGATING_METHODS
+	&IID_IGPAX,
+	&IGPAX_ServerInfo,
+	15,
+	&IGPAX_table[-3],
+	CStdStubBuffer_DELEGATING_METHODS
 };
 
 #pragma data_seg(".rdata")
 
-static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[1] = 
-        {
-            
-            {
-            BSTR_UserSize
-            ,BSTR_UserMarshal
-            ,BSTR_UserUnmarshal
-            ,BSTR_UserFree
-            }
+static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[1] =
+{
+
+	{
+		BSTR_UserSize
+		,BSTR_UserMarshal
+		,BSTR_UserUnmarshal
+		,BSTR_UserFree
+	}
 
-        };
+};
 
 
 #if !defined(__RPC_WIN32__)
@@ -209,367 +209,367 @@
 
 
 static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =
-    {
-        0,
-        {
+{
+	0,
+	{
 
-	/* Procedure Play */
+		/* Procedure Play */
 
-			0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/*  2 */	NdrFcLong( 0x0 ),	/* 0 */
-/*  6 */	NdrFcShort( 0x7 ),	/* 7 */
+		0x33,		/* FC_AUTO_HANDLE */
+		0x6c,		/* Old Flags:  object, Oi2 */
+		/*  2 */	NdrFcLong( 0x0 ),	/* 0 */
+		/*  6 */	NdrFcShort( 0x7 ),	/* 7 */
 #ifndef _ALPHA_
-/*  8 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+		/*  8 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
 #else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
 #endif
-/* 10 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 12 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 14 */	0x4,		/* Oi2 Flags:  has return, */
-			0x1,		/* 1 */
+		/* 10 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 12 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 14 */	0x4,		/* Oi2 Flags:  has return, */
+		0x1,		/* 1 */
 
-	/* Return value */
+		/* Return value */
 
-/* 16 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+		/* 16 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
 #ifndef _ALPHA_
-/* 18 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+		/* 18 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
 #else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
 #endif
-/* 20 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
+		/* 20 */	0x8,		/* FC_LONG */
+		0x0,		/* 0 */
 
-	/* Procedure Pause */
+		/* Procedure Pause */
 
-/* 22 */	0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/* 24 */	NdrFcLong( 0x0 ),	/* 0 */
-/* 28 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 22 */	0x33,		/* FC_AUTO_HANDLE */
+		0x6c,		/* Old Flags:  object, Oi2 */
+		/* 24 */	NdrFcLong( 0x0 ),	/* 0 */
+		/* 28 */	NdrFcShort( 0x8 ),	/* 8 */
 #ifndef _ALPHA_
-/* 30 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+		/* 30 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
 #else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
 #endif
-/* 32 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 34 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 36 */	0x4,		/* Oi2 Flags:  has return, */
-			0x1,		/* 1 */
+		/* 32 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 34 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 36 */	0x4,		/* Oi2 Flags:  has return, */
+		0x1,		/* 1 */
 
-	/* Return value */
+		/* Return value */
 
-/* 38 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+		/* 38 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
 #ifndef _ALPHA_
-/* 40 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+		/* 40 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
 #else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
 #endif
-/* 42 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
+		/* 42 */	0x8,		/* FC_LONG */
+		0x0,		/* 0 */
 
-	/* Procedure Stop */
+		/* Procedure Stop */
 
-/* 44 */	0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/* 46 */	NdrFcLong( 0x0 ),	/* 0 */
-/* 50 */	NdrFcShort( 0x9 ),	/* 9 */
+		/* 44 */	0x33,		/* FC_AUTO_HANDLE */
+		0x6c,		/* Old Flags:  object, Oi2 */
+		/* 46 */	NdrFcLong( 0x0 ),	/* 0 */
+		/* 50 */	NdrFcShort( 0x9 ),	/* 9 */
 #ifndef _ALPHA_
-/* 52 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+		/* 52 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
 #else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
 #endif
-/* 54 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 56 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 58 */	0x4,		/* Oi2 Flags:  has return, */
-			0x1,		/* 1 */
+		/* 54 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 56 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 58 */	0x4,		/* Oi2 Flags:  has return, */
+		0x1,		/* 1 */
 
-	/* Return value */
+		/* Return value */
 
-/* 60 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+		/* 60 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
 #ifndef _ALPHA_
-/* 62 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+		/* 62 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
 #else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
 #endif
-/* 64 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
+		/* 64 */	0x8,		/* FC_LONG */
+		0x0,		/* 0 */
 
-	/* Procedure Update */
+		/* Procedure Update */
 
-/* 66 */	0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/* 68 */	NdrFcLong( 0x0 ),	/* 0 */
-/* 72 */	NdrFcShort( 0xa ),	/* 10 */
+		/* 66 */	0x33,		/* FC_AUTO_HANDLE */
+		0x6c,		/* Old Flags:  object, Oi2 */
+		/* 68 */	NdrFcLong( 0x0 ),	/* 0 */
+		/* 72 */	NdrFcShort( 0xa ),	/* 10 */
 #ifndef _ALPHA_
-/* 74 */	NdrFcShort( 0x10 ),	/* x86, MIPS, PPC Stack size/offset = 16 */
+		/* 74 */	NdrFcShort( 0x10 ),	/* x86, MIPS, PPC Stack size/offset = 16 */
 #else
-			NdrFcShort( 0x20 ),	/* Alpha Stack size/offset = 32 */
+		NdrFcShort( 0x20 ),	/* Alpha Stack size/offset = 32 */
 #endif
-/* 76 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 78 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 80 */	0x6,		/* Oi2 Flags:  clt must size, has return, */
-			0x3,		/* 3 */
+		/* 76 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 78 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 80 */	0x6,		/* Oi2 Flags:  clt must size, has return, */
+		0x3,		/* 3 */
 
-	/* Parameter mtype */
+		/* Parameter mtype */
 
-/* 82 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
+		/* 82 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
 #ifndef _ALPHA_
-/* 84 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+		/* 84 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
 #else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
 #endif
-/* 86 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
+		/* 86 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
 
-	/* Parameter updates */
+		/* Parameter updates */
 
-/* 88 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
+		/* 88 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
 #ifndef _ALPHA_
-/* 90 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+		/* 90 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
 #else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
 #endif
-/* 92 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
+		/* 92 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
 
-	/* Return value */
+		/* Return value */
 
-/* 94 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+		/* 94 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
 #ifndef _ALPHA_
-/* 96 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
+		/* 96 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
 #else
-			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
+		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
 #endif
-/* 98 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
+		/* 98 */	0x8,		/* FC_LONG */
+		0x0,		/* 0 */
 
-	/* Procedure get_URL */
+		/* Procedure get_URL */
 
-/* 100 */	0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/* 102 */	NdrFcLong( 0x0 ),	/* 0 */
-/* 106 */	NdrFcShort( 0xb ),	/* 11 */
+		/* 100 */	0x33,		/* FC_AUTO_HANDLE */
+		0x6c,		/* Old Flags:  object, Oi2 */
+		/* 102 */	NdrFcLong( 0x0 ),	/* 0 */
+		/* 106 */	NdrFcShort( 0xb ),	/* 11 */
 #ifndef _ALPHA_
-/* 108 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
+		/* 108 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
 #else
-			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
+		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
 #endif
-/* 110 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 112 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 114 */	0x5,		/* Oi2 Flags:  srv must size, has return, */
-			0x2,		/* 2 */
+		/* 110 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 112 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 114 */	0x5,		/* Oi2 Flags:  srv must size, has return, */
+		0x2,		/* 2 */
 
-	/* Parameter mrl */
+		/* Parameter mrl */
 
-/* 116 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
+		/* 116 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
 #ifndef _ALPHA_
-/* 118 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+		/* 118 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
 #else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
 #endif
-/* 120 */	NdrFcShort( 0x2c ),	/* Type Offset=44 */
+		/* 120 */	NdrFcShort( 0x2c ),	/* Type Offset=44 */
 
-	/* Return value */
+		/* Return value */
 
-/* 122 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+		/* 122 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
 #ifndef _ALPHA_
-/* 124 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+		/* 124 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
 #else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
 #endif
-/* 126 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
+		/* 126 */	0x8,		/* FC_LONG */
+		0x0,		/* 0 */
 
-	/* Procedure put_URL */
+		/* Procedure put_URL */
 
-/* 128 */	0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/* 130 */	NdrFcLong( 0x0 ),	/* 0 */
-/* 134 */	NdrFcShort( 0xc ),	/* 12 */
+		/* 128 */	0x33,		/* FC_AUTO_HANDLE */
+		0x6c,		/* Old Flags:  object, Oi2 */
+		/* 130 */	NdrFcLong( 0x0 ),	/* 0 */
+		/* 134 */	NdrFcShort( 0xc ),	/* 12 */
 #ifndef _ALPHA_
-/* 136 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
+		/* 136 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
 #else
-			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
+		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
 #endif
-/* 138 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 140 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 142 */	0x6,		/* Oi2 Flags:  clt must size, has return, */
-			0x2,		/* 2 */
+		/* 138 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 140 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 142 */	0x6,		/* Oi2 Flags:  clt must size, has return, */
+		0x2,		/* 2 */
 
-	/* Parameter mrl */
+		/* Parameter mrl */
 
-/* 144 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
+		/* 144 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
 #ifndef _ALPHA_
-/* 146 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+		/* 146 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
 #else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
 #endif
-/* 148 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
+		/* 148 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
 
-	/* Return value */
+		/* Return value */
 
-/* 150 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+		/* 150 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
 #ifndef _ALPHA_
-/* 152 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+		/* 152 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
 #else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
 #endif
-/* 154 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
+		/* 154 */	0x8,		/* FC_LONG */
+		0x0,		/* 0 */
 
-	/* Procedure get_AutoStart */
+		/* Procedure get_AutoStart */
 
-/* 156 */	0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/* 158 */	NdrFcLong( 0x0 ),	/* 0 */
-/* 162 */	NdrFcShort( 0xd ),	/* 13 */
+		/* 156 */	0x33,		/* FC_AUTO_HANDLE */
+		0x6c,		/* Old Flags:  object, Oi2 */
+		/* 158 */	NdrFcLong( 0x0 ),	/* 0 */
+		/* 162 */	NdrFcShort( 0xd ),	/* 13 */
 #ifndef _ALPHA_
-/* 164 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
+		/* 164 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
 #else
-			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
+		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
 #endif
-/* 166 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 168 */	NdrFcShort( 0xe ),	/* 14 */
-/* 170 */	0x4,		/* Oi2 Flags:  has return, */
-			0x2,		/* 2 */
+		/* 166 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 168 */	NdrFcShort( 0xe ),	/* 14 */
+		/* 170 */	0x4,		/* Oi2 Flags:  has return, */
+		0x2,		/* 2 */
 
-	/* Parameter autoplay */
+		/* Parameter autoplay */
 
-/* 172 */	NdrFcShort( 0x2150 ),	/* Flags:  out, base type, simple ref, srv alloc size=8 */
+		/* 172 */	NdrFcShort( 0x2150 ),	/* Flags:  out, base type, simple ref, srv alloc size=8 */
 #ifndef _ALPHA_
-/* 174 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+		/* 174 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
 #else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
 #endif
-/* 176 */	0x6,		/* FC_SHORT */
-			0x0,		/* 0 */
+		/* 176 */	0x6,		/* FC_SHORT */
+		0x0,		/* 0 */
 
-	/* Return value */
+		/* Return value */
 
-/* 178 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+		/* 178 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
 #ifndef _ALPHA_
-/* 180 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+		/* 180 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
 #else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
 #endif
-/* 182 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
+		/* 182 */	0x8,		/* FC_LONG */
+		0x0,		/* 0 */
 
-	/* Procedure put_AutoStart */
+		/* Procedure put_AutoStart */
 
-/* 184 */	0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/* 186 */	NdrFcLong( 0x0 ),	/* 0 */
-/* 190 */	NdrFcShort( 0xe ),	/* 14 */
+		/* 184 */	0x33,		/* FC_AUTO_HANDLE */
+		0x6c,		/* Old Flags:  object, Oi2 */
+		/* 186 */	NdrFcLong( 0x0 ),	/* 0 */
+		/* 190 */	NdrFcShort( 0xe ),	/* 14 */
 #ifndef _ALPHA_
-/* 192 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
+		/* 192 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
 #else
-			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
+		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
 #endif
-/* 194 */	NdrFcShort( 0x6 ),	/* 6 */
-/* 196 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 198 */	0x4,		/* Oi2 Flags:  has return, */
-			0x2,		/* 2 */
+		/* 194 */	NdrFcShort( 0x6 ),	/* 6 */
+		/* 196 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 198 */	0x4,		/* Oi2 Flags:  has return, */
+		0x2,		/* 2 */
 
-	/* Parameter autoplay */
+		/* Parameter autoplay */
 
-/* 200 */	NdrFcShort( 0x48 ),	/* Flags:  in, base type, */
+		/* 200 */	NdrFcShort( 0x48 ),	/* Flags:  in, base type, */
 #ifndef _ALPHA_
-/* 202 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+		/* 202 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
 #else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
 #endif
-/* 204 */	0x6,		/* FC_SHORT */
-			0x0,		/* 0 */
+		/* 204 */	0x6,		/* FC_SHORT */
+		0x0,		/* 0 */
 
-	/* Return value */
+		/* Return value */
 
-/* 206 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+		/* 206 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
 #ifndef _ALPHA_
-/* 208 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+		/* 208 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
 #else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
 #endif
-/* 210 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
+		/* 210 */	0x8,		/* FC_LONG */
+		0x0,		/* 0 */
 
-			0x0
-        }
-    };
+		0x0
+	}
+};
 
 static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =
-    {
-        0,
-        {
-			NdrFcShort( 0x0 ),	/* 0 */
-/*  2 */	
-			0x12, 0x0,	/* FC_UP */
-/*  4 */	NdrFcShort( 0xc ),	/* Offset= 12 (16) */
-/*  6 */	
-			0x1b,		/* FC_CARRAY */
-			0x1,		/* 1 */
-/*  8 */	NdrFcShort( 0x2 ),	/* 2 */
-/* 10 */	0x9,		/* Corr desc: FC_ULONG */
-			0x0,		/*  */
-/* 12 */	NdrFcShort( 0xfffc ),	/* -4 */
-/* 14 */	0x6,		/* FC_SHORT */
-			0x5b,		/* FC_END */
-/* 16 */	
-			0x17,		/* FC_CSTRUCT */
-			0x3,		/* 3 */
-/* 18 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 20 */	NdrFcShort( 0xfffffff2 ),	/* Offset= -14 (6) */
-/* 22 */	0x8,		/* FC_LONG */
-			0x8,		/* FC_LONG */
-/* 24 */	0x5c,		/* FC_PAD */
-			0x5b,		/* FC_END */
-/* 26 */	0xb4,		/* FC_USER_MARSHAL */
-			0x83,		/* 131 */
-/* 28 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 30 */	NdrFcShort( 0x4 ),	/* 4 */
-/* 32 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 34 */	NdrFcShort( 0xffffffe0 ),	/* Offset= -32 (2) */
-/* 36 */	
-			0x11, 0x4,	/* FC_RP [alloced_on_stack] */
-/* 38 */	NdrFcShort( 0x6 ),	/* Offset= 6 (44) */
-/* 40 */	
-			0x13, 0x0,	/* FC_OP */
-/* 42 */	NdrFcShort( 0xffffffe6 ),	/* Offset= -26 (16) */
-/* 44 */	0xb4,		/* FC_USER_MARSHAL */
-			0x83,		/* 131 */
-/* 46 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 48 */	NdrFcShort( 0x4 ),	/* 4 */
-/* 50 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 52 */	NdrFcShort( 0xfffffff4 ),	/* Offset= -12 (40) */
-/* 54 */	
-			0x11, 0xc,	/* FC_RP [alloced_on_stack] [simple_pointer] */
-/* 56 */	0x6,		/* FC_SHORT */
-			0x5c,		/* FC_PAD */
-
-			0x0
-        }
-    };
-
-const CInterfaceProxyVtbl * _GPAX_ProxyVtblList[] = 
 {
-    ( CInterfaceProxyVtbl *) &_IGPAXProxyVtbl,
-    0
+	0,
+	{
+		NdrFcShort( 0x0 ),	/* 0 */
+		/*  2 */
+		0x12, 0x0,	/* FC_UP */
+		/*  4 */	NdrFcShort( 0xc ),	/* Offset= 12 (16) */
+		/*  6 */
+		0x1b,		/* FC_CARRAY */
+		0x1,		/* 1 */
+		/*  8 */	NdrFcShort( 0x2 ),	/* 2 */
+		/* 10 */	0x9,		/* Corr desc: FC_ULONG */
+		0x0,		/*  */
+		/* 12 */	NdrFcShort( 0xfffc ),	/* -4 */
+		/* 14 */	0x6,		/* FC_SHORT */
+		0x5b,		/* FC_END */
+		/* 16 */
+		0x17,		/* FC_CSTRUCT */
+		0x3,		/* 3 */
+		/* 18 */	NdrFcShort( 0x8 ),	/* 8 */
+		/* 20 */	NdrFcShort( 0xfffffff2 ),	/* Offset= -14 (6) */
+		/* 22 */	0x8,		/* FC_LONG */
+		0x8,		/* FC_LONG */
+		/* 24 */	0x5c,		/* FC_PAD */
+		0x5b,		/* FC_END */
+		/* 26 */	0xb4,		/* FC_USER_MARSHAL */
+		0x83,		/* 131 */
+		/* 28 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 30 */	NdrFcShort( 0x4 ),	/* 4 */
+		/* 32 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 34 */	NdrFcShort( 0xffffffe0 ),	/* Offset= -32 (2) */
+		/* 36 */
+		0x11, 0x4,	/* FC_RP [alloced_on_stack] */
+		/* 38 */	NdrFcShort( 0x6 ),	/* Offset= 6 (44) */
+		/* 40 */
+		0x13, 0x0,	/* FC_OP */
+		/* 42 */	NdrFcShort( 0xffffffe6 ),	/* Offset= -26 (16) */
+		/* 44 */	0xb4,		/* FC_USER_MARSHAL */
+		0x83,		/* 131 */
+		/* 46 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 48 */	NdrFcShort( 0x4 ),	/* 4 */
+		/* 50 */	NdrFcShort( 0x0 ),	/* 0 */
+		/* 52 */	NdrFcShort( 0xfffffff4 ),	/* Offset= -12 (40) */
+		/* 54 */
+		0x11, 0xc,	/* FC_RP [alloced_on_stack] [simple_pointer] */
+		/* 56 */	0x6,		/* FC_SHORT */
+		0x5c,		/* FC_PAD */
+
+		0x0
+	}
 };
 
-const CInterfaceStubVtbl * _GPAX_StubVtblList[] = 
+const CInterfaceProxyVtbl * _GPAX_ProxyVtblList[] =
 {
-    ( CInterfaceStubVtbl *) &_IGPAXStubVtbl,
-    0
+	( CInterfaceProxyVtbl *) &_IGPAXProxyVtbl,
+	0
 };
 
-PCInterfaceName const _GPAX_InterfaceNamesList[] = 
+const CInterfaceStubVtbl * _GPAX_StubVtblList[] =
 {
-    "IGPAX",
-    0
+	( CInterfaceStubVtbl *) &_IGPAXStubVtbl,
+	0
 };
 
-const IID *  _GPAX_BaseIIDList[] = 
+PCInterfaceName const _GPAX_InterfaceNamesList[] =
 {
-    &IID_IDispatch,
-    0
+	"IGPAX",
+	0
+};
+
+const IID *  _GPAX_BaseIIDList[] =
+{
+	&IID_IDispatch,
+	0
 };
 
 
@@ -577,27 +577,27 @@
 
 int __stdcall _GPAX_IID_Lookup( const IID * pIID, int * pIndex )
 {
-    
-    if(!_GPAX_CHECK_IID(0))
-        {
-        *pIndex = 0;
-        return 1;
-        }
-
-    return 0;
+
+	if(!_GPAX_CHECK_IID(0))
+	{
+		*pIndex = 0;
+		return 1;
+	}
+
+	return 0;
 }
 
-const ExtendedProxyFileInfo GPAX_ProxyFileInfo = 
+const ExtendedProxyFileInfo GPAX_ProxyFileInfo =
 {
-    (PCInterfaceProxyVtblList *) & _GPAX_ProxyVtblList,
-    (PCInterfaceStubVtblList *) & _GPAX_StubVtblList,
-    (const PCInterfaceName * ) & _GPAX_InterfaceNamesList,
-    (const IID ** ) & _GPAX_BaseIIDList,
-    & _GPAX_IID_Lookup, 
-    1,
-    2,
-    0, /* table of [async_uuid] interfaces */
-    0, /* Filler1 */
-    0, /* Filler2 */
-    0  /* Filler3 */
+	(PCInterfaceProxyVtblList *) & _GPAX_ProxyVtblList,
+	(PCInterfaceStubVtblList *) & _GPAX_StubVtblList,
+	(const PCInterfaceName * ) & _GPAX_InterfaceNamesList,
+	(const IID ** ) & _GPAX_BaseIIDList,
+	& _GPAX_IID_Lookup,
+	1,
+	2,
+	0, /* table of [async_uuid] interfaces */
+	0, /* Filler1 */
+	0, /* Filler2 */
+	0  /* Filler3 */
 };

gpac-0.5.0.svn5178.tar.bz2/applications/GPAX/dlldata.c -> gpac-0.5.1.svn5491.tar.xz/applications/GPAX/dlldata.c Changed

gpac-0.5.0.svn5178.tar.bz2/applications/GPAX/resource.h -> gpac-0.5.1.svn5491.tar.xz/applications/GPAX/resource.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/Makefile -> gpac-0.5.1.svn5491.tar.xz/applications/Makefile Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/Makefile -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/Makefile Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_data.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/audio_data.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_decoder.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/audio_decoder.c Changed

@@ -99,6 +99,9 @@
 		return -1;
 	}
 
+#ifdef DC_AUDIO_RESAMPLER
+	audio_input_file->aresampler = NULL;
+#endif
 	audio_input_file->fifo = av_fifo_alloc(2 * MAX_AUDIO_PACKET_SIZE);
 
 	audio_data_conf->channels = codec_ctx->channels;
@@ -110,12 +113,57 @@
 	return 0;
 }
 
+#ifdef DC_AUDIO_RESAMPLER
+static int ensure_resampler(AudioInputFile *audio_input_file, int sample_rate, int num_channels, u64 channel_layout, enum AVSampleFormat sample_format)
+{
+	if (!audio_input_file->aresampler) {
+		audio_input_file->aresampler = avresample_alloc_context();
+		if (!audio_input_file->aresampler) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate the audio resampler. Aborting.\n"));
+			return -1;
+		}
+		av_opt_set_int(audio_input_file->aresampler, "in_channel_layout", channel_layout, 0);
+		av_opt_set_int(audio_input_file->aresampler, "out_channel_layout", DC_AUDIO_CHANNEL_LAYOUT, 0);
+		av_opt_set_int(audio_input_file->aresampler, "in_sample_fmt", sample_format, 0);
+		av_opt_set_int(audio_input_file->aresampler, "out_sample_fmt", DC_AUDIO_SAMPLE_FORMAT, 0);
+		av_opt_set_int(audio_input_file->aresampler, "in_sample_rate", sample_rate, 0);
+		av_opt_set_int(audio_input_file->aresampler, "out_sample_rate", DC_AUDIO_SAMPLE_RATE, 0);
+		av_opt_set_int(audio_input_file->aresampler, "in_channels", num_channels, 0);
+		av_opt_set_int(audio_input_file->aresampler, "out_channels", DC_AUDIO_NUM_CHANNELS, 0);
+
+		if (avresample_open(audio_input_file->aresampler)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not open the audio resampler. Aborting.\n"));
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+//resample - see http://ffmpeg.org/pipermail/libav-user/2012-June/002164.html
+static int resample_audio(AudioInputFile *audio_input_file, AudioInputData *audio_input_data, AVCodecContext *audio_codec_ctx, uint8_t ***output, int *num_planes_out, int num_channels, enum AVSampleFormat sample_format)
+{
+	int i;
+	*num_planes_out = av_sample_fmt_is_planar(DC_AUDIO_SAMPLE_FORMAT) ? DC_AUDIO_NUM_CHANNELS : 1;
+	*output = (uint8_t**)av_malloc(*num_planes_out*sizeof(uint8_t*));
+	for (i=0; i<*num_planes_out; i++) {
+		*output[i] = (uint8_t*)av_malloc(DC_AUDIO_MAX_CHUNCK_SIZE); //FIXME: fix using size below av_samples_get_buffer_size()
+	}
+
+	if (avresample_convert(audio_input_file->aresampler, *output, DC_AUDIO_MAX_CHUNCK_SIZE, audio_input_data->aframe->nb_samples, audio_input_data->aframe->extended_data, audio_input_data->aframe->linesize[0], audio_input_data->aframe->nb_samples) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not resample audio frame. Aborting.\n"));
+		return -1;
+	}
+
+	return 0;
+}
+#endif
+
 int dc_audio_decoder_read(AudioInputFile *audio_input_file, AudioInputData *audio_input_data)
 {
 	int ret;
 	AVPacket packet;
 	int got_frame = 0;
-	//int locked_already = 0;
 	AVCodecContext *codec_ctx;
 	AudioDataNode *audio_data_node;
 
@@ -155,14 +203,20 @@
 			/* Flush decoder */
 			packet.data = NULL;
 			packet.size = 0;
+
+#ifndef FF_API_AVFRAME_LAVC
 			avcodec_get_frame_defaults(audio_input_data->aframe);
+#else
+			av_frame_unref(audio_input_data->aframe);
+#endif
+
 			avcodec_decode_audio4(codec_ctx, audio_input_data->aframe, &got_frame, &packet);
 
 			if (got_frame) {
 				dc_producer_lock(&audio_input_data->producer, &audio_input_data->circular_buf);
 				dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
 				audio_data_node = (AudioDataNode*)dc_producer_produce(&audio_input_data->producer, &audio_input_data->circular_buf);
-				
+
 				audio_data_node->abuf_size = audio_input_data->aframe->linesize[0];
 				memcpy(audio_data_node->abuf, audio_input_data->aframe->data[0], audio_data_node->abuf_size);
 
@@ -184,7 +238,12 @@
 		/* Is this a packet from the audio stream? */
 		if (packet.stream_index == audio_input_file->astream_idx) {
 			/* Set audio frame to default */
+
+#ifndef FF_API_AVFRAME_LAVC
 			avcodec_get_frame_defaults(audio_input_data->aframe);
+#else
+			av_frame_unref(audio_input_data->aframe);
+#endif
 
 			/* Decode audio frame */
 			if (avcodec_decode_audio4(codec_ctx, audio_input_data->aframe, &got_frame, &packet) < 0) {
@@ -200,9 +259,54 @@
 
 			audio_input_data->next_pts += ((int64_t)AV_TIME_BASE * audio_input_data->aframe->nb_samples) / codec_ctx->sample_rate;
 
-			/* Did we get a video frame? */
+			/* Did we get an audio frame? */
 			if (got_frame) {
-				av_fifo_generic_write(audio_input_file->fifo, audio_input_data->aframe->data[0], audio_input_data->aframe->linesize[0], NULL);
+				uint8_t **data;
+				int data_size;
+#ifdef DC_AUDIO_RESAMPLER
+				int num_planes_out;
+#endif
+#ifdef GPAC_USE_LIBAV
+				int sample_rate = codec_ctx->sample_rate;
+				int num_channels = codec_ctx->channels;
+				u64 channel_layout = codec_ctx->channel_layout;
+#else
+				int sample_rate = audio_input_data->aframe->sample_rate;
+				int num_channels = audio_input_data->aframe->channels;
+				u64 channel_layout = audio_input_data->aframe->channel_layout;
+#endif
+				enum AVSampleFormat sample_format = (enum AVSampleFormat)audio_input_data->aframe->format;
+				Bool resample = (sample_rate    != DC_AUDIO_SAMPLE_RATE
+				                 || num_channels   != DC_AUDIO_NUM_CHANNELS
+				                 || channel_layout != DC_AUDIO_CHANNEL_LAYOUT
+				                 || sample_format  != DC_AUDIO_SAMPLE_FORMAT);
+
+				/* Resample if needed */
+				if (resample) {
+#ifndef DC_AUDIO_RESAMPLER
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Audio resampling is needed at the decoding stage, but not supported by your version of DashCast. Aborting.\n"));
+					exit(1);
+#else
+					uint8_t **output;
+					if (ensure_resampler(audio_input_file, sample_rate, num_channels, channel_layout, sample_format)) {
+						return -1;
+					}
+
+					if (resample_audio(audio_input_file, audio_input_data, codec_ctx, &output, &num_planes_out, num_channels, sample_format)) {
+						return -1;
+					} else {
+						data = output;
+						av_samples_get_buffer_size(&data_size, num_channels, audio_input_data->aframe->nb_samples, sample_format, 0);
+					}
+#endif
+				} else {
+					/*no resampling needed: read data from the AVFrame*/
+					data = audio_input_data->aframe->extended_data;
+					data_size = audio_input_data->aframe->linesize[0];
+				}
+
+				assert(!av_sample_fmt_is_planar(DC_AUDIO_SAMPLE_FORMAT));
+				av_fifo_generic_write(audio_input_file->fifo, data[0], data_size, NULL);
 
 				if (/*audio_input_file->circular_buf.mode == OFFLINE*/audio_input_file->mode == ON_DEMAND || audio_input_file->mode == LIVE_MEDIA) {
 					dc_producer_lock(&audio_input_data->producer, &audio_input_data->circular_buf);
@@ -212,18 +316,12 @@
 
 					/* Get the pointer of the current node in circular buffer. */
 					audio_data_node = (AudioDataNode *) dc_producer_produce(&audio_input_data->producer, &audio_input_data->circular_buf);
-#ifdef GPAC_USE_LIBAV
-					audio_data_node->channels = codec_ctx->channels;
-					audio_data_node->channel_layout = codec_ctx->request_channel_layout;
-					audio_data_node->sample_rate = codec_ctx->sample_rate;
-#else
-					audio_data_node->channels = audio_input_data->aframe->channels;
-					audio_data_node->channel_layout = audio_input_data->aframe->channel_layout;
-					audio_data_node->sample_rate = audio_input_data->aframe->sample_rate;
-#endif
-					audio_data_node->format = audio_input_data->aframe->format;
-					audio_data_node->abuf_size = audio_input_data->aframe->linesize[0];
-					av_fifo_generic_read(audio_input_file->fifo, audio_data_node->abuf, audio_data_node->abuf_size , NULL);
+					audio_data_node->channels = DC_AUDIO_NUM_CHANNELS;
+					audio_data_node->channel_layout = DC_AUDIO_CHANNEL_LAYOUT;
+					audio_data_node->sample_rate = DC_AUDIO_SAMPLE_RATE;
+					audio_data_node->format = DC_AUDIO_SAMPLE_FORMAT;
+					audio_data_node->abuf_size = data_size;
+					av_fifo_generic_read(audio_input_file->fifo, audio_data_node->abuf, audio_data_node->abuf_size, NULL);
 
 					dc_producer_advance(&audio_input_data->producer, &audio_input_data->circular_buf);
 				} else {
@@ -238,7 +336,7 @@
 						dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
 
 						/* Get the pointer of the current node in circular buffer. */
-						audio_data_node = (AudioDataNode *) dc_producer_produce( &audio_input_data->producer, &audio_input_data->circular_buf);
+						audio_data_node = (AudioDataNode *) dc_producer_produce(&audio_input_data->producer, &audio_input_data->circular_buf);
 
 						audio_data_node->abuf_size = LIVE_FRAME_SIZE;
 						av_fifo_generic_read(audio_input_file->fifo, audio_data_node->abuf, audio_data_node->abuf_size, NULL);
@@ -247,6 +345,16 @@
 					}
 				}
 
+#ifdef DC_AUDIO_RESAMPLER
+				if (resample) {
+					int i;
+					for (i=0; i<num_planes_out; ++i) {
+						av_free(data[i]);
+					}
+					av_free(data);
+				}
+#endif
+
 				return 0;
 			}
 		}
@@ -275,9 +383,14 @@
 			av_free_packet(pkt);
 			gf_list_rem_last(audio_input_file->av_pkt_list);
 		}
+		gf_list_del(audio_input_file->av_pkt_list);
 		gf_mx_v(audio_input_file->av_pkt_list_mutex);
 		gf_mx_del(audio_input_file->av_pkt_list_mutex);
 	}
 
 	av_fifo_free(audio_input_file->fifo);
+
+#ifdef DC_AUDIO_RESAMPLER
+	avresample_free(&audio_input_file->aresampler);
+#endif
 }

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_decoder.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/audio_decoder.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_encoder.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/audio_encoder.c Changed

@@ -31,15 +31,17 @@
 
 int dc_audio_encoder_open(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf)
 {
-	int osize;
+	AVDictionary *opts = NULL;
 
 	audio_output_file->fifo = av_fifo_alloc(2 * MAX_AUDIO_PACKET_SIZE);
 	audio_output_file->aframe = FF_ALLOC_FRAME();
 	audio_output_file->adata_buf = (uint8_t*) av_malloc(2 * MAX_AUDIO_PACKET_SIZE);
 #ifndef GPAC_USE_LIBAV
+	audio_output_file->aframe->channels = -1;
+#endif
+#ifndef LIBAV_FRAME_OLD
 	audio_output_file->aframe->channel_layout = 0;
 	audio_output_file->aframe->sample_rate = -1;
-	audio_output_file->aframe->channels = -1;
 #endif
 	audio_output_file->aframe->format = -1;
 	audio_output_file->codec = avcodec_find_encoder_by_name(audio_data_conf->codec);
@@ -48,7 +50,7 @@
 		return -1;
 	}
 
-	audio_output_file->codec_ctx = avcodec_alloc_context3(audio_output_file->codec);	
+	audio_output_file->codec_ctx = avcodec_alloc_context3(audio_output_file->codec);
 	audio_output_file->codec_ctx->codec_id = audio_output_file->codec->id;
 	audio_output_file->codec_ctx->codec_type = AVMEDIA_TYPE_AUDIO;
 	audio_output_file->codec_ctx->bit_rate = audio_data_conf->bitrate;
@@ -61,39 +63,43 @@
 	}
 	audio_output_file->codec_ctx->channels = audio_data_conf->channels;
 	audio_output_file->codec_ctx->channel_layout = AV_CH_LAYOUT_STEREO; /*FIXME: depends on channels -> http://ffmpeg.org/doxygen/trunk/channel__layout_8c_source.html#l00074*/
-	audio_output_file->codec_ctx->sample_fmt = AV_SAMPLE_FMT_S16;
+	audio_output_file->codec_ctx->sample_fmt = audio_output_file->codec->sample_fmts[0];
 #ifdef DC_AUDIO_RESAMPLER
 	audio_output_file->aresampler = NULL;
 #endif
 	if (audio_data_conf->custom) {
 		build_dict(audio_output_file->codec_ctx->priv_data, audio_data_conf->custom);
-		gf_free(audio_data_conf->custom);
-		audio_data_conf->custom = NULL;
 	}
 	audio_output_file->astream_idx = 0;
 
 	/* open the audio codec */
-	if (avcodec_open2(audio_output_file->codec_ctx, audio_output_file->codec, NULL) < 0) {
+	av_dict_set(&opts, "strict", "experimental", 0);
+	if (avcodec_open2(audio_output_file->codec_ctx, audio_output_file->codec, &opts) < 0) {
 		/*FIXME: if we enter here (set "mp2" as a codec and "200000" as a bitrate -> deadlock*/
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output audio codec\n"));
+		av_dict_free(&opts);
 		return -1;
 	}
+	av_dict_free(&opts);
 
-	osize = av_get_bytes_per_sample(audio_output_file->codec_ctx->sample_fmt);
-	audio_output_file->frame_bytes = audio_output_file->codec_ctx->frame_size * osize * audio_output_file->codec_ctx->channels;
+	audio_output_file->frame_bytes = audio_output_file->codec_ctx->frame_size * av_get_bytes_per_sample(DC_AUDIO_SAMPLE_FORMAT) * DC_AUDIO_NUM_CHANNELS;
+
+#ifndef FF_API_AVFRAME_LAVC
 	avcodec_get_frame_defaults(audio_output_file->aframe);
-	audio_output_file->aframe->nb_samples = audio_output_file->frame_bytes
-					/ (audio_output_file->codec_ctx->channels * av_get_bytes_per_sample(audio_output_file->codec_ctx->sample_fmt));
+#else
+	av_frame_unref(audio_output_file->aframe);
+#endif
+
 
-	if (avcodec_fill_audio_frame(audio_output_file->aframe,
-			audio_output_file->codec_ctx->channels, audio_output_file->codec_ctx->sample_fmt,
-			audio_output_file->adata_buf, audio_output_file->frame_bytes, 1) < 0) {
+	audio_output_file->aframe->nb_samples = audio_output_file->codec_ctx->frame_size;
+
+	if (avcodec_fill_audio_frame(audio_output_file->aframe, audio_output_file->codec_ctx->channels, audio_output_file->codec_ctx->sample_fmt,
+	                             audio_output_file->adata_buf, audio_output_file->codec_ctx->frame_size * av_get_bytes_per_sample(audio_output_file->codec_ctx->sample_fmt) * audio_output_file->codec_ctx->channels, 1) < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Fill audio frame failed\n"));
 		return -1;
 	}
 
 	//audio_output_file->acc_samples = 0;
-	audio_output_file->frame_size = audio_output_file->codec_ctx->frame_size;
 
 	return 0;
 }
@@ -113,15 +119,15 @@
 
 	audio_data_node = (AudioDataNode *) dc_consumer_consume(&audio_output_file->consumer, &audio_input_data->circular_buf);
 #ifndef GPAC_USE_LIBAV
-	audio_output_file->aframe->channels = audio_data_node->channels;
-	audio_output_file->aframe->channel_layout = audio_data_node->channel_layout;
-	audio_output_file->aframe->sample_rate = audio_data_node->sample_rate;
+	audio_output_file->aframe->channels = audio_output_file->codec_ctx->channels;
+#endif
+#ifndef LIBAV_FRAME_OLD
+	audio_output_file->aframe->channel_layout = audio_output_file->codec_ctx->channel_layout;
+	audio_output_file->aframe->sample_rate = audio_output_file->codec_ctx->sample_rate;
 #endif
-	audio_output_file->aframe->format = audio_data_node->format;
+	audio_output_file->aframe->format = audio_output_file->codec_ctx->sample_fmt;
 
 	/* Write audio sample on fifo */
-//	av_fifo_generic_write(audio_output_file->fifo, audio_data_node->aframe->data[0],
-//			audio_data_node->aframe->linesize[0], NULL);
 	av_fifo_generic_write(audio_output_file->fifo, audio_data_node->abuf, audio_data_node->abuf_size, NULL);
 
 	dc_consumer_advance(&audio_output_file->consumer);
@@ -160,27 +166,88 @@
 }
 #endif
 
+#ifdef DC_AUDIO_RESAMPLER
+static int ensure_resampler(AudioOutputFile *audio_output_file, AVCodecContext *audio_codec_ctx)
+{
+	if (!audio_output_file->aresampler) {
+		audio_output_file->aresampler = avresample_alloc_context();
+		if (!audio_output_file->aresampler) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate the audio resampler. Aborting.\n"));
+			return -1;
+		}
+		av_opt_set_int(audio_output_file->aresampler, "in_channel_layout", DC_AUDIO_CHANNEL_LAYOUT, 0);
+		av_opt_set_int(audio_output_file->aresampler, "out_channel_layout", audio_codec_ctx->channel_layout, 0);
+		av_opt_set_int(audio_output_file->aresampler, "in_sample_fmt", DC_AUDIO_SAMPLE_FORMAT, 0);
+		av_opt_set_int(audio_output_file->aresampler, "out_sample_fmt", audio_codec_ctx->sample_fmt, 0);
+		av_opt_set_int(audio_output_file->aresampler, "in_sample_rate", DC_AUDIO_SAMPLE_RATE, 0);
+		av_opt_set_int(audio_output_file->aresampler, "out_sample_rate", audio_codec_ctx->sample_rate, 0);
+		av_opt_set_int(audio_output_file->aresampler, "in_channels", DC_AUDIO_NUM_CHANNELS, 0);
+		av_opt_set_int(audio_output_file->aresampler, "out_channels", audio_codec_ctx->channels, 0);
+
+		if (avresample_open(audio_output_file->aresampler)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not open the audio resampler. Aborting.\n"));
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+//resample - see http://ffmpeg.org/pipermail/libav-user/2012-June/002164.html
+static int resample_audio(AudioOutputFile *audio_output_file, AVCodecContext *audio_codec_ctx, int *num_planes_out)
+{
+	int i, linesize;
+	uint8_t **output;
+	*num_planes_out = av_sample_fmt_is_planar(audio_output_file->codec->sample_fmts[0]) ? audio_output_file->codec_ctx->channels : 1;
+	linesize = audio_output_file->codec_ctx->frame_size * av_get_bytes_per_sample(audio_output_file->codec->sample_fmts[0]) * audio_output_file->codec_ctx->channels / *num_planes_out;
+	output = (uint8_t**)av_malloc(*num_planes_out*sizeof(uint8_t*));
+	for (i=0; i<*num_planes_out; i++) {
+		output[i] = (uint8_t*)av_malloc(linesize);
+	}
+
+	if (avresample_convert(audio_output_file->aresampler, output, linesize, audio_output_file->aframe->nb_samples, audio_output_file->aframe->extended_data, audio_output_file->aframe->linesize[0], audio_output_file->aframe->nb_samples) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not resample audio frame. Aborting.\n"));
+		return -1;
+	}
+
+	audio_output_file->aframe->extended_data = output;
+	for (i=0; i<*num_planes_out; i++) {
+		audio_output_file->aframe->linesize[i] = linesize;
+	}
+	audio_codec_ctx->channel_layout = audio_output_file->aframe->channel_layout;
+	audio_codec_ctx->sample_fmt = audio_output_file->aframe->format;
+	audio_codec_ctx->sample_rate = audio_output_file->aframe->sample_rate;
+#ifndef GPAC_USE_LIBAV
+	audio_codec_ctx->channels = audio_output_file->aframe->channels;
+#endif
+
+	return 0;
+}
+#endif
+
 int dc_audio_encoder_encode(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data)
 {
 	int got_pkt;
-#ifdef DC_AUDIO_RESAMPLER
-	int i;
-#endif
-	//AVStream *audio_stream = audio_output_file->av_fmt_ctx->streams[audio_output_file->astream_idx];
-	//AVCodecContext *audio_codec_ctx = audio_stream->codec;
 	AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
 
 	while (av_fifo_size(audio_output_file->fifo) >= audio_output_file->frame_bytes) {
+#ifdef DC_AUDIO_RESAMPLER
+		uint8_t **data; //mirror AVFrame::data
+		int num_planes_out;
+#endif
+		Bool resample;
+
 		av_fifo_generic_read(audio_output_file->fifo, audio_output_file->adata_buf, audio_output_file->frame_bytes, NULL);
 
 		audio_output_file->aframe->data[0] = audio_output_file->adata_buf;
 		audio_output_file->aframe->linesize[0] = audio_output_file->frame_bytes;
+		audio_output_file->aframe->linesize[1] = 0;
 
 		av_init_packet(&audio_output_file->packet);
 		audio_output_file->packet.data = NULL;
 		audio_output_file->packet.size = 0;
 
-		/* 
+		/*
 		 * Set PTS (method 1)
 		 */
 		//audio_output_file->aframe->pts = audio_input_data->next_pts;
@@ -196,59 +263,23 @@
 		//	audio_output_file->aframe->pts = av_rescale_q(now, avr, audio_codec_ctx->time_base);
 		//}
 
+		resample = (DC_AUDIO_SAMPLE_FORMAT != audio_codec_ctx->sample_fmt
+		            || DC_AUDIO_SAMPLE_RATE != audio_codec_ctx->sample_rate
+		            || DC_AUDIO_NUM_CHANNELS != audio_codec_ctx->channels
+		            || DC_AUDIO_CHANNEL_LAYOUT != audio_codec_ctx->channel_layout);
 		/* Resample if needed */
-		if ( audio_output_file->aframe->format != audio_codec_ctx->sample_fmt
-#ifndef GPAC_USE_LIBAV
-			|| audio_output_file->aframe->sample_rate != audio_codec_ctx->sample_rate
-			|| audio_output_file->aframe->channel_layout != audio_codec_ctx->channel_layout
-#endif
-		) {
-#ifndef DC_AUDIO_RESAMPLER			
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Audio resampling is needed, but not supported by your version of DashCast. Aborting.\n"));
+		if (resample) {
+#ifndef DC_AUDIO_RESAMPLER
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Audio resampling is needed at the encoding stage, but not supported by your version of DashCast. Aborting.\n"));
 			exit(1);
 #else
-			if (!audio_output_file->aresampler) {
-				audio_output_file->aresampler = avresample_alloc_context();
-				if (!audio_output_file->aresampler) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate the audio resampler. Aborting.\n"));
-					return -1;
-				}
-				av_opt_set_int(audio_output_file->aresampler, "in_channel_layout", audio_output_file->aframe->channel_layout, 0);
-				av_opt_set_int(audio_output_file->aresampler, "out_channel_layout", audio_codec_ctx->channel_layout, 0);
-				av_opt_set_int(audio_output_file->aresampler, "in_sample_fmt", audio_output_file->aframe->format, 0);
-				av_opt_set_int(audio_output_file->aresampler, "out_sample_fmt", audio_codec_ctx->sample_fmt, 0);
-				av_opt_set_int(audio_output_file->aresampler, "in_sample_rate", audio_output_file->aframe->sample_rate, 0);
-				av_opt_set_int(audio_output_file->aresampler, "out_sample_rate", audio_codec_ctx->sample_rate, 0);
-				av_opt_set_int(audio_output_file->aresampler, "in_channels", audio_output_file->aframe->channels, 0);
-				av_opt_set_int(audio_output_file->aresampler, "out_channels", audio_codec_ctx->channels, 0);
-				
-				if (avresample_open(audio_output_file->aresampler)) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not open the audio resampler. Aborting.\n"));
-					return -1;
-				}
+			if (ensure_resampler(audio_output_file, audio_codec_ctx)) {
+				return -1;
 			}
 
-			//resample - see http://ffmpeg.org/pipermail/libav-user/2012-June/002164.html
-			{
-				int num_planes = av_sample_fmt_is_planar(audio_codec_ctx->sample_fmt) ? 1 : audio_codec_ctx->channels;
-				uint8_t **output = (uint8_t**)av_malloc(num_planes*sizeof(uint8_t*));
-				for (i=0; i<num_planes; i++) {
-					output[i] = (uint8_t*)av_malloc(192000);
-				}
-				if (avresample_convert(audio_output_file->aresampler, output, 192000, audio_output_file->aframe->nb_samples, audio_output_file->aframe->extended_data, audio_output_file->aframe->linesize[0], audio_output_file->aframe->nb_samples) < 0) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not resample audio frame. Aborting.\n"));
-					return -1;
-				}
-				num_planes = av_sample_fmt_is_planar(audio_codec_ctx->sample_fmt) ? audio_codec_ctx->channels : 1;
-				for (i=0; i<num_planes; i++) {
-					av_free(audio_output_file->aframe->extended_data[i]);
-				}
-				av_free(audio_output_file->aframe->extended_data);
-				audio_output_file->aframe->extended_data = output;
-				audio_codec_ctx->channel_layout = audio_output_file->aframe->channel_layout;
-				audio_codec_ctx->sample_fmt = audio_output_file->aframe->format;
-				audio_codec_ctx->sample_rate = audio_output_file->aframe->sample_rate;
-				audio_codec_ctx->channels = audio_output_file->aframe->channels;
+			data = audio_output_file->aframe->extended_data;
+			if (resample_audio(audio_output_file, audio_codec_ctx, &num_planes_out)) {
+				return -1;
 			}
 #endif
 		}
@@ -256,9 +287,30 @@
 		/* Encode audio */
 		if (avcodec_encode_audio2(audio_codec_ctx, &audio_output_file->packet, audio_output_file->aframe, &got_pkt) != 0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while encoding audio.\n"));
+#ifdef DC_AUDIO_RESAMPLER
+			if (resample) {
+				int i;
+				for (i=0; i<num_planes_out; ++i) {
+					av_free(audio_output_file->aframe->extended_data[i]);
+				}
+				av_free(audio_output_file->aframe->extended_data);
+				audio_output_file->aframe->extended_data = data;
+			}
+#endif
 			return -1;
 		}
 
+#ifdef DC_AUDIO_RESAMPLER
+		if (resample) {
+			int i;
+			for (i=0; i<num_planes_out; ++i) {
+				av_free(audio_output_file->aframe->extended_data[i]);
+			}
+			av_free(audio_output_file->aframe->extended_data);
+			audio_output_file->aframe->extended_data = data;
+		}
+#endif
+
 		if (got_pkt) {
 			//audio_output_file->acc_samples += audio_output_file->aframe->nb_samples;
 			return 0;
@@ -287,4 +339,8 @@
 
 	avcodec_close(audio_output_file->codec_ctx);
 	av_free(audio_output_file->codec_ctx);
+
+#ifdef DC_AUDIO_RESAMPLER
+	avresample_free(&audio_output_file->aresampler);
+#endif
 }

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_encoder.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/audio_encoder.h Changed

@@ -33,8 +33,8 @@
  *
  * @param audio_output_file [in] add an audio stream to the file
  * with the parameters already passed to open_audio_output
- * 
- * @return 0 on success, -1 on failure 
+ *
+ * @return 0 on success, -1 on failure
  */
 int dc_audio_encoder_open(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf);
 
@@ -43,20 +43,20 @@
 //int dc_audio_encoder_flush(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data);
 
 /*
- * Read the decoded audio sample from circular buffer (which is in audio_input_data) 
+ * Read the decoded audio sample from circular buffer (which is in audio_input_data)
  * and encode and write them on the output file
- * 
+ *
  * @param audio_output_file [in] audio output file
  * @param audio_input_data [in] audio input data structure which contains a circular buffer with audio samples
- * 
+ *
  * @return 0 on success, -1 on failure, -2 on finishing;
- * when there is no more data on circular buffer to encode 
- */ 
+ * when there is no more data on circular buffer to encode
+ */
 int dc_audio_encoder_encode(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data);
 
 /*
  * Close the output audio file
- * 
+ *
  * @param audio_output_file [in] audio output file
  */
 void dc_audio_encoder_close(AudioOutputFile *audio_output_file);

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_muxer.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/audio_muxer.c Changed

@@ -53,23 +53,47 @@
 	esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
 	esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
-	esd->decoderConfig->bufferSizeDB = 20;
-	esd->slConfig->timestampResolution = audio_codec_ctx->sample_rate;
-	esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-	esd->ESID = 1;
+	if (!strcmp(audio_output_file->codec_ctx->codec->name, "aac")) { //TODO: find an automatic table
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_LCP;
+		esd->decoderConfig->bufferSizeDB = 20;
+		esd->slConfig->timestampResolution = audio_codec_ctx->sample_rate;
+		esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
+		esd->ESID = 1;
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-	memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
-	acfg.base_object_type = GF_M4A_LAYER2;
-	acfg.base_sr = audio_codec_ctx->sample_rate;
-	acfg.nb_chan = audio_codec_ctx->channels;
-	acfg.sbr_object_type = 0;
-	acfg.audioPL = gf_m4a_get_profile(&acfg);
-
-	ret = gf_m4a_write_config(&acfg, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-	assert(ret == GF_OK);
+		memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
+		acfg.base_object_type = GF_M4A_AAC_LC;
+		acfg.base_sr = audio_codec_ctx->sample_rate;
+		acfg.nb_chan = audio_codec_ctx->channels;
+		acfg.sbr_object_type = 0;
+		acfg.audioPL = gf_m4a_get_profile(&acfg);
+
+		ret = gf_m4a_write_config(&acfg, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+		assert(ret == GF_OK);
 #endif
+	} else {
+		if (strcmp(audio_output_file->codec_ctx->codec->name, "mp2")) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Unlisted codec, setting GPAC_OTI_AUDIO_MPEG1 descriptor.\n"));
+		}
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
+		esd->decoderConfig->bufferSizeDB = 20;
+		esd->slConfig->timestampResolution = audio_codec_ctx->sample_rate;
+		esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
+		esd->ESID = 1;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+		memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
+		acfg.base_object_type = GF_M4A_LAYER2;
+		acfg.base_sr = audio_codec_ctx->sample_rate;
+		acfg.nb_chan = audio_codec_ctx->channels;
+		acfg.sbr_object_type = 0;
+		acfg.audioPL = gf_m4a_get_profile(&acfg);
+
+		ret = gf_m4a_write_config(&acfg, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+		assert(ret == GF_OK);
+#endif
+	}
+
 	//gf_isom_store_movie_config(video_output_file->isof, 0);
 	track = gf_isom_new_track(audio_output_file->isof, esd->ESID, GF_ISOM_MEDIA_AUDIO, audio_codec_ctx->sample_rate);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("TimeScale: %d \n", audio_codec_ctx->time_base.den));
@@ -97,8 +121,7 @@
 
 	bpsample = av_get_bytes_per_sample(audio_output_file->codec_ctx->sample_fmt) * 8;
 
-	ret = gf_isom_set_audio_info(audio_output_file->isof, track, di,
-			audio_codec_ctx->sample_rate, audio_output_file->codec_ctx->channels, bpsample);
+	ret = gf_isom_set_audio_info(audio_output_file->isof, track, di, audio_codec_ctx->sample_rate, audio_output_file->codec_ctx->channels, bpsample);
 	if (ret != GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_audio_info\n", gf_error_to_string(ret)));
 		return -1;
@@ -106,17 +129,17 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 	ret = gf_isom_set_pl_indication(audio_output_file->isof, GF_ISOM_PL_AUDIO, acfg.audioPL);
-#endif
 	if (ret != GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_pl_indication\n", gf_error_to_string(ret)));
 		return -1;
 	}
+#endif
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("time scale: %d  sample dur: %d \n", audio_codec_ctx->time_base.den, audio_output_file->codec_ctx->frame_size));
 
 	ret = gf_isom_setup_track_fragment(audio_output_file->isof, track, 1, audio_output_file->codec_ctx->frame_size, 0, 0, 0, 0);
 	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_setutrack_fragment\n", gf_error_to_string(ret)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_setup_track_fragment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
@@ -148,15 +171,11 @@
 int dc_gpac_audio_isom_write(AudioOutputFile *audio_output_file)
 {
 	GF_Err ret;
-	//AVStream *video_stream = video_output_file->av_fmt_ctx->streams[video_output_file->vstream_idx];
-	//AVCodecContext *video_codec_ctx = video_stream->codec;
-	//AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
-
 	audio_output_file->sample->data = (char *) audio_output_file->packet.data;
 	audio_output_file->sample->dataLength = audio_output_file->packet.size;
 
 	audio_output_file->sample->DTS = audio_output_file->dts; //audio_output_file->aframe->pts;
-	audio_output_file->sample->IsRAP = 1; //audio_output_file->aframe->key_frame;//audio_codec_ctx->coded_frame->key_frame;
+	audio_output_file->sample->IsRAP = RAP; //audio_output_file->aframe->key_frame;//audio_codec_ctx->coded_frame->key_frame;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("RAP %d , DTS %ld \n", audio_output_file->sample->IsRAP, audio_output_file->sample->DTS));
 
 	ret = gf_isom_fragment_add_sample(audio_output_file->isof, 1, audio_output_file->sample, 1, audio_output_file->codec_ctx->frame_size, 0, 0, 0);
@@ -207,6 +226,7 @@
 {
 	AVStream *audio_stream;
 	AVOutputFormat *output_fmt;
+	AVDictionary *opts = NULL;
 
 	AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
 	audio_output_file->av_fmt_ctx = NULL;
@@ -252,7 +272,8 @@
 	audio_stream->codec->bit_rate = audio_codec_ctx->bit_rate;//audio_output_file->audio_data_conf->bitrate;
 	audio_stream->codec->sample_rate = audio_codec_ctx->sample_rate;//audio_output_file->audio_data_conf->samplerate;
 	audio_stream->codec->channels = audio_codec_ctx->channels;//audio_output_file->audio_data_conf->channels;
-	audio_stream->codec->sample_fmt = AV_SAMPLE_FMT_S16;
+	assert(audio_codec_ctx->codec->sample_fmts);
+	audio_stream->codec->sample_fmt = audio_codec_ctx->codec->sample_fmts[0];
 
 //	if (audio_output_file->av_fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
 //		audio_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
@@ -260,10 +281,13 @@
 	//video_stream->codec = video_output_file->codec_ctx;
 
 	/* open the video codec */
-	if (avcodec_open2(audio_stream->codec, audio_output_file->codec, NULL) < 0) {
+	av_dict_set(&opts, "strict", "experimental", 0);
+	if (avcodec_open2(audio_stream->codec, audio_output_file->codec, &opts) < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video codec\n"));
+		av_dict_free(&opts);
 		return -1;
 	}
+	av_dict_free(&opts);
 
 	avformat_write_header(audio_output_file->av_fmt_ctx, NULL);
 
@@ -387,7 +411,7 @@
 	case GPAC_INIT_AUDIO_MUXER:
 		if (frame_nb % audio_output_file->frame_per_frag == 0) {
 			gf_isom_start_fragment(audio_output_file->isof, 1);
-			gf_isom_set_traf_base_media_decode_time(audio_output_file->isof, 1, audio_output_file->first_dts * audio_output_file->frame_size);
+			gf_isom_set_traf_base_media_decode_time(audio_output_file->isof, 1, audio_output_file->first_dts * audio_output_file->codec_ctx->frame_size);
 			audio_output_file->first_dts += audio_output_file->frame_per_frag;
 		}
 		dc_gpac_audio_isom_write(audio_output_file);

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_muxer.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/audio_muxer.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/circular_buffer.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/circular_buffer.c Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/circular_buffer.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/circular_buffer.h Changed

@@ -47,7 +47,7 @@
 
 /*
  * Every node of the circular buffer has a data, plus
- * all the variables needed for multithread management. 
+ * all the variables needed for multithread management.
  */
 typedef struct {
 	/* Pointer to the data on the node */
@@ -80,18 +80,18 @@
  */
 typedef struct {
 	/* The size of circular buffer */
-	u32 size;	
+	u32 size;
 	/* A list of all the nodes */
-	Node *list;	
+	Node *list;
 	/* The mode for multithread management. */
-	LockMode mode;	
+	LockMode mode;
 	/* The maximum number of the consumers using the circular buffer */
 	u32 max_num_consumers;
 } CircularBuffer;
 
 /*
  * Producer has an index to the circular buffer.
- */ 
+ */
 typedef struct {
 	/* The index where the producer is using */
 	int idx;
@@ -115,7 +115,7 @@
 
 /*
  * Create a circular buffer
- * 
+ *
  * @param circular_buf [out] circular buffer to be created
  * @param size [in] size of circular buffer
  * @param mode [in] mode of multithread management (LIVE or OFFLINE)
@@ -130,9 +130,9 @@
  */
 void dc_circular_buffer_destroy(CircularBuffer *circular_buf);
 
-/* 
+/*
  * Initialize a consumer
- * 
+ *
  * @param consumer [out] the consumer to be initialize
  * @param num_consumers [in] maximum number of the consumers
  */
@@ -148,12 +148,12 @@
 
 /*
  * Consumer lock on circular buffer
- * 
+ *
  * @param consumer [in] consumer
  * @param circular_buf [in] circular buffer
  *
- * @return 0 on success, -1 if the node in question is the last node and not usable. 
- */ 
+ * @return 0 on success, -1 if the node in question is the last node and not usable.
+ */
 int dc_consumer_lock(Consumer *consumer, CircularBuffer *circular_buf);
 
 /*
@@ -178,14 +178,14 @@
 
 /*
  * Consumer leads its index
- * 
+ *
  * @param consumer [in] consumer
  */
 void dc_consumer_advance(Consumer *consumer);
 
-/* 
+/*
  * Initialize a producer
- * 
+ *
  * @param producer [out] the producer to be initialize
  * @param maxpro [in] maximum number of the producers
  */
@@ -201,12 +201,12 @@
 
 /*
  * Producer lock on circular buffer
- * 
+ *
  * @param producer [in] producer
  * @param circular_buf [in] circular buffer
  *
  * @return 0 on success, -1 if the mode is live and cannot wait.
- */ 
+ */
 int dc_producer_lock(Producer *producer, CircularBuffer *circular_buf);
 
 /*
@@ -227,7 +227,7 @@
 
 /*
  * Producer leads its index
- * 
+ *
  * @param producer [in] producer
  * @param circular_buf [in] circular buffer
  */
@@ -235,7 +235,7 @@
 
 /*
  * Producer signal that the current node is the last node
- * 
+ *
  * @param producer [in] producer
  * @param circular_buf [in] circular buffer
  */

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/cmd_data.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/cmd_data.c Changed

@@ -61,13 +61,13 @@
 #define DEFAULT_VIDEO_HEIGHT     480
 #define DEFAULT_VIDEO_CODEC      "libx264"
 #define DEFAULT_AUDIO_BITRATE    192000
-#define DEFAULT_AUDIO_SAMPLERATE 48000
+#define DEFAULT_AUDIO_SAMPLERATE 44100
 #define DEFAULT_AUDIO_CHANNELS   2
-#define DEFAULT_AUDIO_CODEC      "mp2"
+#define DEFAULT_AUDIO_CODEC      "aac"
 
 
 static void dc_create_configuration(CmdData *cmd_data)
-{	
+{
 	u32 i;
 	GF_Config *conf = cmd_data->conf;
 	u32 sec_count = gf_cfg_get_section_count(conf);
@@ -77,7 +77,7 @@
 		sec_count = gf_cfg_get_section_count(conf);
 	}
 	for (i=0; i<sec_count; i++) {
-		char value[GF_MAX_PATH];		
+		char value[GF_MAX_PATH];
 		const char *section_name = gf_cfg_get_section_name(conf, i);
 		const char *section_type = gf_cfg_get_key(conf, section_name, "type");
 
@@ -88,46 +88,49 @@
 				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.bitrate);
 				gf_cfg_set_key(conf, section_name, "bitrate", value);
 			}
-		
+
 			if (!gf_cfg_get_key(conf, section_name, "framerate")) {
 				if (cmd_data->video_data_conf.framerate == -1)
 					cmd_data->video_data_conf.framerate = DEFAULT_VIDEO_FRAMERATE;
 				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.framerate);
 				gf_cfg_set_key(conf, section_name, "framerate", value);
 			}
-		
+
 			if (!gf_cfg_get_key(conf, section_name, "width")) {
 				if (cmd_data->video_data_conf.width == -1)
 					cmd_data->video_data_conf.width = DEFAULT_VIDEO_WIDTH;
 				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.width);
 				gf_cfg_set_key(conf, section_name, "width", value);
 			}
-		
+
 			if (!gf_cfg_get_key(conf, section_name, "height")) {
 				if (cmd_data->video_data_conf.height == -1)
 					cmd_data->video_data_conf.height = DEFAULT_VIDEO_HEIGHT;
 				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.height);
 				gf_cfg_set_key(conf, section_name, "height", value);
 			}
-		
+
 			if (!gf_cfg_get_key(conf, section_name, "crop_x")) {
 				if (cmd_data->video_data_conf.crop_x == -1)
 					cmd_data->video_data_conf.crop_x = 0;
 				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.crop_x);
 				gf_cfg_set_key(conf, section_name, "crop_x", value);
 			}
-		
+			if (!gf_cfg_get_key(conf, section_name, "low_delay")) {
+				gf_cfg_set_key(conf, section_name, "low_delay", cmd_data->video_data_conf.low_delay ? "yes" : "no");
+			}
+
 			if (!gf_cfg_get_key(conf, section_name, "crop_y")) {
 				if (cmd_data->video_data_conf.crop_y == -1)
 					cmd_data->video_data_conf.crop_y = 0;
 				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.crop_y);
 				gf_cfg_set_key(conf, section_name, "crop_y", value);
 			}
-			
+
 			if (!gf_cfg_get_key(conf, section_name, "codec"))
 				gf_cfg_set_key(conf, section_name, "codec", DEFAULT_VIDEO_CODEC);
 		}
-		
+
 		if (strcmp(section_type, "audio") == 0) {
 			if (!gf_cfg_get_key(conf, section_name, "bitrate")) {
 				if (cmd_data->audio_data_conf.bitrate == -1)
@@ -135,21 +138,21 @@
 				snprintf(value, sizeof(value), "%d", cmd_data->audio_data_conf.bitrate);
 				gf_cfg_set_key(conf, section_name, "bitrate", value);
 			}
-			
+
 			if (!gf_cfg_get_key(conf, section_name, "samplerate")) {
 				if (cmd_data->audio_data_conf.samplerate == -1)
 					cmd_data->audio_data_conf.samplerate = DEFAULT_AUDIO_SAMPLERATE;
 				snprintf(value, sizeof(value), "%d", cmd_data->audio_data_conf.samplerate);
 				gf_cfg_set_key(conf, section_name, "samplerate", value);
 			}
-			
+
 			if (!gf_cfg_get_key(conf, section_name, "channels")) {
 				if (cmd_data->audio_data_conf.channels == -1)
 					cmd_data->audio_data_conf.channels = DEFAULT_AUDIO_CHANNELS;
 				snprintf(value, sizeof(value), "%d", cmd_data->audio_data_conf.channels);
 				gf_cfg_set_key(conf, section_name, "channels", value);
 			}
-			
+
 			if (!gf_cfg_get_key(conf, section_name, "codec"))
 				gf_cfg_set_key(conf, section_name, "codec", DEFAULT_AUDIO_CODEC);
 		}
@@ -186,8 +189,14 @@
 			video_data_conf->crop_x = opt ? atoi(opt) : 0;
 			opt = gf_cfg_get_key(conf, section_name, "crop_y");
 			video_data_conf->crop_x = opt ? atoi(opt) : 0;
+			opt = gf_cfg_get_key(conf, section_name, "low_delay");
+			video_data_conf->low_delay = (opt && !strcmp(opt, "yes")) ? 1 : 0;
 			opt = gf_cfg_get_key(conf, section_name, "custom");
-			video_data_conf->custom = opt ? gf_strdup(opt) : NULL;
+			if (opt) {
+				if (strlen(opt) >= GF_MAX_PATH)
+					fprintf(stderr, "Warning: video custom opt is too long. Truncating.\n");
+				strncpy(video_data_conf->custom, opt, GF_MAX_PATH-1);
+			}
 			gf_list_add(cmd_data->video_lst, (void *) video_data_conf);
 		}
 		else if (strcmp(section_type, "audio") == 0)
@@ -205,7 +214,11 @@
 			opt = gf_cfg_get_key(conf, section_name, "channels");
 			audio_data_conf->channels = opt ? atoi(opt) : DEFAULT_AUDIO_CHANNELS;
 			opt = gf_cfg_get_key(conf, section_name, "custom");
-			audio_data_conf->custom = opt ? gf_strdup(opt) : NULL;
+			if (opt) {
+				if (strlen(opt) >= GF_MAX_PATH)
+					fprintf(stderr, "Warning: audio custom opt is too long. Truncating.\n");
+				strncpy(audio_data_conf->custom, opt, GF_MAX_PATH-1);
+			}
 			gf_list_add(cmd_data->audio_lst, (void *) audio_data_conf);
 		} else {
 			fprintf(stderr, "Configuration file: type %s is not supported.\n", section_type);
@@ -217,8 +230,9 @@
 	for (i=0; i<gf_list_count(cmd_data->video_lst); i++) {
 		VideoDataConf *video_data_conf = gf_list_get(cmd_data->video_lst, i);
 		fprintf(stdout, "    id:%s\tres:%dx%d\tvbr:%d\n", video_data_conf->filename,
-				video_data_conf->width, video_data_conf->height,
-				video_data_conf->bitrate/*, video_data_conf->framerate, video_data_conf->codec*/);	}
+		        video_data_conf->width, video_data_conf->height,
+		        video_data_conf->bitrate/*, video_data_conf->framerate, video_data_conf->codec*/);
+	}
 
 	for (i=0; i<gf_list_count(cmd_data->audio_lst); i++) {
 		AudioDataConf *audio_data_conf = gf_list_get(cmd_data->audio_lst, i);
@@ -354,7 +368,6 @@
 {
 	while (gf_list_count(cmd_data->audio_lst)) {
 		AudioDataConf *audio_data_conf = gf_list_last(cmd_data->audio_lst);
-		gf_free(audio_data_conf->custom);
 		gf_list_rem_last(cmd_data->audio_lst);
 		gf_free(audio_data_conf);
 	}
@@ -362,7 +375,6 @@
 
 	while (gf_list_count(cmd_data->video_lst)) {
 		VideoDataConf *video_data_conf = gf_list_last(cmd_data->video_lst);
-		gf_free(video_data_conf->custom);
 		gf_list_rem_last(cmd_data->video_lst);
 		gf_free(video_data_conf);
 	}
@@ -393,99 +405,102 @@
 	int i;
 
 	const char *command_usage =
-			"Usage: DashCast [options]\n"
-					"\n"
-					"General options:\n"
-					"    -log-file filename       set output log file. Also works with -lf\n"
-					"    -logs LOGS               set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
+	    "Usage: DashCast [options]\n"
+	    "GPAC version " GPAC_FULL_VERSION"\n"
+	    "\n"
+	    "General options:\n"
+	    "    -log-file filename       set output log file. Also works with -lf\n"
+	    "    -logs LOGS               set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
 #ifdef GPAC_MEMORY_TRACKING
-					"    -mem-track               enable the memory tracker\n"
+	    "    -mem-track               enable the memory tracker\n"
 #endif
-					"    -conf filename           set the configuration file name (default: dashcast.conf)\n"
-					"    -switch-source filename  set the configuration file name for source switching\n"
-					"\n"
-					"Live options:\n"
-					"    -live                    system is live and input is a camera\n"
-					"    -live-media              system is live and input is a media file\n"
-					"    -no-loop                 system does not loop on the input media file when live\n"
-					"    -dynamic-ast             changes segment availability start time at each MPD generation (old behaviour but not allowed in most profiles)\n"
-					"    -insert-utc              inserts UTC clock at the start of each segment\n"
-					"\n"
-					"Source options:\n"
-					"    -npts                    use frame counting for timestamps (not error-free) instead of source timing (default)\n"
-					"    -av string               set the source name for a multiplexed audio and video input\n"
-					"                                - if this option is present, neither '-a' nor '-v' shall be present\n"
-					"* Video options:\n"
-					"    -v string                set the source name for a video input\n"
-					"                                - if input is from a webcam, use \"/dev/video[x]\" \n"
-					"                                  where x is the video device number\n"
-					"                                - if input is the screen video, use \":0.0+[x],[y]\" \n"
-					"                                  which captures from upper-left at x,y\n"
-					"                                - if input is from stdin, use \"pipe:\"\n"
-					"    -vf string               set the input video format\n"
+	    "    -conf filename           set the configuration file name (default: dashcast.conf)\n"
+	    "    -switch-source filename  set the configuration file name for source switching\n"
+	    "\n"
+	    "Live options:\n"
+	    "    -live                    system is live and input is a camera\n"
+	    "    -live-media              system is live and input is a media file\n"
+	    "    -no-loop                 system does not loop on the input media file when live\n"
+	    "    -dynamic-ast             changes segment availability start time at each MPD generation (old behaviour but not allowed in most profiles)\n"
+	    "    -insert-utc              inserts UTC clock at the start of each segment\n"
+	    "\n"
+	    "Source options:\n"
+	    "    -npts                    use frame counting for timestamps (not error-free) instead of source timing (default)\n"
+	    "    -av string               set the source name for a multiplexed audio and video input\n"
+	    "                                - if this option is present, neither '-a' nor '-v' shall be present\n"
+	    "* Video options:\n"
+	    "    -v string                set the source name for a video input\n"
+	    "                                - if input is from a webcam, use \"/dev/video[x]\" \n"
+	    "                                  where x is the video device number\n"
+	    "                                - if input is the screen video, use \":0.0+[x],[y]\" \n"
+	    "                                  which captures from upper-left at x,y\n"
+	    "                                - if input is from stdin, use \"pipe:\"\n"
+	    "    -vf string               set the input video format\n"
 #ifdef WIN32
-					"                                - to capture from a VfW webcam, set vfwcap\n"
-					"                                - to capture from a directshow device, set dshow\n"
+	    "                                - to capture from a VfW webcam, set vfwcap\n"
+	    "                                - to capture from a directshow device, set dshow\n"
 #else
-					"                                - to capture from a webcam, set video4linux2\n"
-					"                                - to capture the screen, set x11grab\n"
-					"    -v4l2f inv4l2f           inv4l2f is the input format for webcam acquisition\n"
-					"                                - it can be mjpeg, yuyv422, etc.\n"
+	    "                                - to capture from a webcam, set video4linux2\n"
+	    "                                - to capture the screen, set x11grab\n"
+	    "    -v4l2f inv4l2f           inv4l2f is the input format for webcam acquisition\n"
+	    "                                - it can be mjpeg, yuyv422, etc.\n"
 #endif
-					"    -pixf FMT                set the input pixel format\n"
-					"    -vfr N                   force the input video framerate\n"
-					"    -vres WxH                force the video resolution (e.g. 640x480)\n"
-					"    -vcrop XxY               crop the source video from X pixels left and Y pixels top. Must be used with -vres.\n"
-					"    -gdr                     use Gradual Decoder Refresh feature for video encoding (h264 codec only)\n"
-					"* Audio options:\n"
-					"    -a string                set the source name for an audio input\n"
-					"                                - if input is from microphone, use \"plughw:[x],[y]\"\n"
-					"                                  where x is the card number and y is the device number\n"
-					"    -af string               set the input audio format\n"
-					"\n"
-					"Output options:\n"
-					"* Video encoding options:\n"
-					"    -vcodec string          set the output video codec (default: h264)\n"
+	    "    -pixf FMT                set the input pixel format\n"
+	    "    -vfr N                   force the input video framerate\n"
+	    "    -vres WxH                force the video resolution (e.g. 640x480)\n"
+	    "    -vcrop XxY               crop the source video from X pixels left and Y pixels top. Must be used with -vres.\n"
+		"* Audio options:\n"
+	    "    -a string                set the source name for an audio input\n"
+	    "                                - if input is from microphone, use \"plughw:[x],[y]\"\n"
+	    "                                  where x is the card number and y is the device number\n"
+	    "    -af string               set the input audio format\n"
+	    "\n"
+	    "Output options:\n"
+	    "* Video encoding options:\n"
+	    "    -vcodec string          set the output video codec (default: h264)\n"
 #if 0 //TODO: bind to option and params - test first how it binds to current input parameters
-					"    -vb int                 set the output video bitrate (in bits)\n"
+	    "    -vb int                 set the output video bitrate (in bits)\n"
 #endif
-					"    -vcustom string         send custom parameters directly to the audio encoder\n"
-					"* Audio encoding options:\n"
-					"    -acodec string          set the output audio codec (default: mp2)\n"
+	    "    -vcustom string         send custom parameters directly to the video encoder\n"
+	    "    -gdr                    use Gradual Decoder Refresh feature for video encoding (h264 codec only)\n"
+		"    -gop                    specify GOP size in frames - default is framerate (1 sec gop)\n"
+		"    -low-delay               specify that low delay settings should be used (no B-frames, fast encoding)\n"
+	    "* Audio encoding options:\n"
+	    "    -acodec string          set the output audio codec (default: aac)\n"
 #if 0 //TODO: bind to option and params - test first how it binds to current input parameters
-					"    -ab int                 set the output audio bitrate in bits (default: 192000)\n"
-					"    -as int                 set the sample rate (default: 48000)\n"
-					"    -ach int                set the number of output audio channels (default: 2)\n"
+	    "    -ab int                 set the output audio bitrate in bits (default: 192000)\n"
+	    "    -as int                 set the sample rate (default: 44100)\n"
+	    "    -ach int                set the number of output audio channels (default: 2)\n"
 #endif
-					"    -acustom string         send custom parameters directly to the audio encoder\n"
-					"\n"
-					"DASH options:\n"
-					"    -seg-dur dur:int         set the segment duration in millisecond (default value: 1000)\n"
-					"    -frag-dur dur:int        set the fragment duration in millisecond (default value: 1000)\n"
-					"    -seg-marker marker:str   add a marker box named marker at the end of DASH segment\n"
-					"    -out outdir:str          outdir is the output data directory (default: output)\n"
-					"    -mpd mpdname:str         mpdname is the MPD file name (default: dashcast.mpd)\n"
-					"    -ast-offset dur:int      dur is the MPD availabilityStartTime shift in milliseconds (default value: 1000)\n"
-					"    -mpd-refresh dur:int     dur is the MPD minimumUpdatePeriod in seconds\n"
-					"    -time-shift dur:int      dur is the MPD TimeShiftBufferDepth in seconds\n"
-					"                                - the default value is 10. Specify -1 to keep all files.\n"
-					"    -min-buffer dur:float    dur is the MPD minBufferTime in seconds (default value: 1.0)\n"
-					"    -base-url baseurl:str    baseurl is the MPD BaseURL\n"
-					"\n"
-					"\n"
-					"Examples:\n"
-					"\n"
-					"    DashCast -av test.avi -live-media\n"
-					"    DashCast -a test_audio.mp3 -v test_audio.mp4 -live-media\n"
+	    "    -acustom string         send custom parameters directly to the audio encoder\n"
+	    "\n"
+	    "DASH options:\n"
+	    "    -seg-dur dur:int         set the segment duration in millisecond (default value: 1000)\n"
+	    "    -frag-dur dur:int        set the fragment duration in millisecond (default value: 1000)\n"
+	    "    -seg-marker marker:4cc   add a marker box named marker at the end of DASH segment\n"
+	    "    -out outdir:str          outdir is the output data directory (default: output)\n"
+	    "    -mpd mpdname:str         mpdname is the MPD file name (default: dashcast.mpd)\n"
+	    "    -ast-offset dur:int      dur is the MPD availabilityStartTime shift in milliseconds (default value: 0)\n"
+	    "    -mpd-refresh dur:int     dur is the MPD minimumUpdatePeriod in seconds\n"
+	    "    -time-shift dur:int      dur is the MPD TimeShiftBufferDepth in seconds\n"
+	    "                                - the default value is 10. Specify -1 to keep all files.\n"
+	    "    -min-buffer dur:float    dur is the MPD minBufferTime in seconds (default value: 1.0)\n"
+	    "    -base-url baseurl:str    baseurl is the MPD BaseURL\n"
+	    "\n"
+	    "\n"
+	    "Examples:\n"
+	    "\n"
+	    "    DashCast -av test.avi -live-media\n"
+	    "    DashCast -a test_audio.mp3 -v test_audio.mp4 -live-media\n"
 #ifdef WIN32
-					"    DashCast -vf vfwcap -vres 1280x720 -vfr 24 -v 0 -live\n"
-					"    DashCast -vf dshow  -vres 1280x720 -vfr 24 -v video=\"screen-capture-recorder\" -live (please install http://screencapturer.sf.net/)\n"
-					"    DashCast -vf dshow  -vres 1280x720 -vfr 24 -v video=\"YOUR-WEBCAM\" -pixf yuv420p -live\n"
+	    "    DashCast -vf vfwcap -vres 1280x720 -vfr 24 -v 0 -live\n"
+	    "    DashCast -vf dshow  -vres 1280x720 -vfr 24 -v video=\"screen-capture-recorder\" -live (please install http://screencapturer.sf.net/)\n"
+	    "    DashCast -vf dshow  -vres 1280x720 -vfr 24 -v video=\"YOUR-WEBCAM\" -pixf yuv420p -live\n"
 #else
-					"    DashCast -vf video4linux2 -vres 1280x720 -vfr 24 -v4l2f mjpeg -v /dev/video0 -af alsa -a plughw:1,0 -live\n"
-					"    DashCast -vf x11grab -vres 800x600 -vfr 25 -v :0.0 -live\n"
+	    "    DashCast -vf video4linux2 -vres 1280x720 -vfr 24 -v4l2f mjpeg -v /dev/video0 -af alsa -a plughw:1,0 -live\n"
+	    "    DashCast -vf x11grab -vres 800x600 -vfr 25 -v :0.0 -live\n"
 #endif
-					"\n";
+	    "\n";
 
 	const char *command_error = "\33[31mUnknown option or missing mandatory argument.\33[0m\n";
 
@@ -599,16 +614,18 @@
 				fprintf(stderr, "%s", command_usage);
 				return -1;
 			}
-			strncpy(cmd_data->video_data_conf.codec, argv[i], GF_MAX_PATH);
+			strncpy(cmd_data->video_data_conf.codec, argv[i], GF_MAX_PATH-1);
 			i++;
 		} else if (strcmp(argv[i], "-vcustom") == 0) {
 			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(cmd_data->video_data_conf.custom, "") != 0) {
+			if (strlen(cmd_data->video_data_conf.custom)) {
 				fprintf(stderr, "Video custom has already been specified: appending\n");
 				fprintf(stderr, "%s", command_usage);
 				return -1;
 			}
-			strncpy(cmd_data->video_data_conf.custom, argv[i], GF_MAX_PATH);
+			if (strlen(argv[i]) >= GF_MAX_PATH)
+				fprintf(stderr, "Warning: video custom is too long. Truncating.\n");
+			strncpy(cmd_data->video_data_conf.custom, argv[i], GF_MAX_PATH-1);
 			i++;
 		} else if (strcmp(argv[i], "-acodec") == 0) {
 			DASHCAST_CHECK_NEXT_ARG
@@ -617,16 +634,18 @@
 				fprintf(stderr, "%s", command_usage);
 				return -1;
 			}
-			strncpy(cmd_data->audio_data_conf.codec, argv[i], GF_MAX_PATH);
+			strncpy(cmd_data->audio_data_conf.codec, argv[i], GF_MAX_PATH-1);
 			i++;
 		} else if (strcmp(argv[i], "-acustom") == 0) {
 			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(cmd_data->audio_data_conf.custom, "") != 0) {
+			if (strlen(cmd_data->audio_data_conf.custom)) {
 				fprintf(stderr, "Audio custom has already been specified: appending\n");
 				fprintf(stderr, "%s", command_usage);
 				return -1;
 			}
-			strncpy(cmd_data->audio_data_conf.custom, argv[i], GF_MAX_PATH);
+			if (strlen(argv[i]) >= GF_MAX_PATH)
+				fprintf(stderr, "Warning: audio custom is too long. Truncating.\n");
+			strncpy(cmd_data->audio_data_conf.custom, argv[i], GF_MAX_PATH-1);
 			i++;
 		} else if (strcmp(argv[i], "-conf") == 0) {
 			DASHCAST_CHECK_NEXT_ARG
@@ -664,7 +683,7 @@
 				fprintf(stderr, "%s", command_usage);
 				return -1;
 			}
-			strncpy(cmd_data->mpd_filename, argv[i], GF_MAX_PATH);
+			strncpy(cmd_data->mpd_filename, argv[i], GF_MAX_PATH-1);
 			i++;
 		} else if (strcmp(argv[i], "-seg-dur") == 0) {
 			DASHCAST_CHECK_NEXT_ARG
@@ -736,7 +755,10 @@
 				fprintf(stderr, "%s", command_usage);
 				return -1;
 			}
-			strncpy(cmd_data->base_url, argv[i], GF_MAX_PATH);
+			strncpy(cmd_data->base_url, argv[i], GF_MAX_PATH-1);
+			i++;
+		} else if (strcmp(argv[i], "-low-delay") == 0) {
+			cmd_data->video_data_conf.low_delay = 1;
 			i++;
 		} else if (strcmp(argv[i], "-live") == 0) {
 			cmd_data->mode = LIVE_CAMERA;
@@ -871,8 +893,8 @@
 		fprintf(stdout, "    audio format: %s\n", cmd_data->audio_data_conf.format);
 	}
 	fprintf(stdout, "\33[0m");
-//	fflush(stdout);
-		
+	fflush(stdout);
+
 	if (!cmd_data->conf) {
 		cmd_data->conf = gf_cfg_force_new(NULL, "dashcast.conf");
 		dc_create_configuration(cmd_data);

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/cmd_data.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/cmd_data.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/controler.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/controler.c Changed

@@ -27,30 +27,20 @@
 
 
 #if (!defined(__DARWIN__) && !defined(__APPLE__))
-#include <malloc.h>
+# include <malloc.h>
 #endif
 
 #include <time.h>
-//FIXME: use GPAC utility functions
+
 #if defined(__GNUC__)
-#include <unistd.h>
-#include <sys/time.h>
+# include <unistd.h>
+# include <sys/time.h>
 #elif defined(WIN32)
-#include <Winsock.h>
-#include <sys/timeb.h>
-#define suseconds_t long
-
-s32 gettimeofday(struct timeval *tp, void *tz)
-{
-	struct _timeb timebuffer;
-
-	_ftime( &timebuffer );
-	tp->tv_sec  = (long) (timebuffer.time);
-	tp->tv_usec = timebuffer.millitm * 1000;
-	return 0;
-}
+# include <Winsock.h>
+# include <sys/timeb.h>
+# define suseconds_t long
 #else
-#error
+# error
 #endif
 
 
@@ -159,7 +149,7 @@
 		video_frag_dur = (int)(video_data_conf->framerate * (cmddata->frag_dur / 1000.0));
 		optimize_seg_frag_dur(&video_seg_dur, &video_frag_dur);
 	}
-	
+
 	f = fopen(name, "w");
 	//TODO: if (!f) ...
 
@@ -173,21 +163,21 @@
 
 	fprintf(f, "<?xml version=\"1.0\"?>\n");
 	fprintf(f, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" "
-							"%s=\"%s\" "
-							"minBufferTime=\"PT%fS\" %s type=\"%s\" "
-							"profiles=\"urn:mpeg:dash:profile:full:2011\"",
-							(cmddata->mode == ON_DEMAND) ? "mediaPresentationDuration" : "availabilityStartTime",
-							(cmddata->mode == ON_DEMAND) ? presentation_duration : availability_start_time,
-							cmddata->min_buffer_time, time_shift,
-							(cmddata->mode == ON_DEMAND) ? "static" : "dynamic");
+	        "%s=\"%s\" "
+	        "minBufferTime=\"PT%fS\" %s type=\"%s\" "
+	        "profiles=\"urn:mpeg:dash:profile:full:2011\"",
+	        (cmddata->mode == ON_DEMAND) ? "mediaPresentationDuration" : "availabilityStartTime",
+	        (cmddata->mode == ON_DEMAND) ? presentation_duration : availability_start_time,
+	        cmddata->min_buffer_time, time_shift,
+	        (cmddata->mode == ON_DEMAND) ? "static" : "dynamic");
 	if (cmddata->minimum_update_period > 0 ) {
 		fprintf(f, " minimumUpdatePeriod=\"PT%dS\"", cmddata->minimum_update_period);
 	}
 	fprintf(f, ">\n");
 	fprintf(f,
-		" <ProgramInformation moreInformationURL=\"http://gpac.sourceforge.net\">\n"
-		"  <Title>%s</Title>\n"
-		" </ProgramInformation>\n", cmddata->mpd_filename);
+	        " <ProgramInformation moreInformationURL=\"http://gpac.sourceforge.net\">\n"
+	        "  <Title>%s</Title>\n"
+	        " </ProgramInformation>\n", cmddata->mpd_filename);
 
 	if (strcmp(cmddata->base_url, "") != 0) {
 		fprintf(f, " <BaseURL>%s</BaseURL>\n", cmddata->base_url);
@@ -199,16 +189,16 @@
 		fprintf(f, "  <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"false\">\n");
 
 		fprintf(f,
-			"   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" "
-			"value=\"2\"/>\n");
+		        "   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" "
+		        "value=\"2\"/>\n");
 
 		fprintf(f,
-			"   <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"$RepresentationID$_$Number$_gpac.m4s\""
-			" startNumber=\"%d\" initialization=\"$RepresentationID$_init_gpac.mp4\"",
-			audio_data_conf->samplerate, audio_seg_dur * audio_frame_size, segnum);
+		        "   <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"$RepresentationID$_$Number$_gpac.m4s\""
+		        " startNumber=\"%d\" initialization=\"$RepresentationID$_init_gpac.mp4\"",
+		        audio_data_conf->samplerate, audio_seg_dur * audio_frame_size, segnum);
 
 		if (ast_offset<0) {
-			fprintf(f, " availabilityTimeOffset=\"%g\"", -ast_offset/1000.0);	
+			fprintf(f, " availabilityTimeOffset=\"%g\"", -ast_offset/1000.0);
 		}
 		fprintf(f, "/>\n");
 
@@ -217,9 +207,9 @@
 		for (i = 0; i < gf_list_count(cmddata->audio_lst); i++) {
 			audio_data_conf = gf_list_get(cmddata->audio_lst, i);
 			fprintf(f,
-				"   <Representation id=\"%s\" mimeType=\"audio/mp4\" codecs=\"mp4a.40.2\" "
-				"audioSamplingRate=\"%d\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
-				"   </Representation>\n", audio_data_conf->filename, audio_data_conf->samplerate, audio_data_conf->bitrate);
+			        "   <Representation id=\"%s\" mimeType=\"audio/mp4\" codecs=\"mp4a.40.2\" "
+			        "audioSamplingRate=\"%d\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
+			        "   </Representation>\n", audio_data_conf->filename, audio_data_conf->samplerate, audio_data_conf->bitrate);
 		}
 
 		fprintf(f, "  </AdaptationSet>\n");
@@ -229,24 +219,24 @@
 		fprintf(f, "  <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"false\">\n");
 
 		fprintf(f,
-			"   <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"$RepresentationID$_$Number$_gpac.m4s\""
-			" startNumber=\"%d\" initialization=\"$RepresentationID$_init_gpac.mp4\"",
-			video_data_conf->framerate, video_seg_dur, segnum);
+		        "   <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"$RepresentationID$_$Number$_gpac.m4s\""
+		        " startNumber=\"%d\" initialization=\"$RepresentationID$_init_gpac.mp4\"",
+		        video_data_conf->framerate, video_seg_dur, segnum);
 
 
 		if (ast_offset<0) {
-			fprintf(f, " availabilityTimeOffset=\"%g\"", -ast_offset/1000.0);	
+			fprintf(f, " availabilityTimeOffset=\"%g\"", -ast_offset/1000.0);
 		}
 		fprintf(f, "/>\n");
 
 		for (i = 0; i < gf_list_count(cmddata->video_lst); i++) {
 			video_data_conf = gf_list_get(cmddata->video_lst, i);
 			fprintf(f, "   <Representation id=\"%s\" mimeType=\"video/mp4\" codecs=\"%s\" "
-				"width=\"%d\" height=\"%d\" frameRate=\"%d\" sar=\"1:1\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
-				"   </Representation>\n", video_data_conf->filename,
-				VIDEO_MUXER == GPAC_INIT_VIDEO_MUXER_AVC1 ? "avc1.42e01e" : "avc3", //FIXME: hardcoded. We would need acces to the ISOFile to call gf_media_get_rfc_6381_codec_name()
-				video_data_conf->width, video_data_conf->height, video_data_conf->framerate,
-				video_data_conf->bitrate);
+			        "width=\"%d\" height=\"%d\" frameRate=\"%d\" sar=\"1:1\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
+			        "   </Representation>\n", video_data_conf->filename,
+			        VIDEO_MUXER == GPAC_INIT_VIDEO_MUXER_AVC1 ? video_data_conf->codec6381 : "avc3",
+			        video_data_conf->width, video_data_conf->height, video_data_conf->framerate,
+			        video_data_conf->bitrate);
 		}
 
 		fprintf(f, "  </AdaptationSet>\n");
@@ -308,7 +298,7 @@
 				if (cmddata->use_dynamic_ast) {
 					main_seg_time = seg_time;
 				} else {
-					//get the last notification of AST 
+					//get the last notification of AST
 					if (first) {
 						if (seg_time.segnum) {
 							first = GF_FALSE;
@@ -333,7 +323,7 @@
 			ast_time = *gmtime(&t);
 			sprintf(availability_start_time, "%d-%02d-%02dT%02d:%02d:%02d.%d", 1900 + ast_time.tm_year, ast_time.tm_mon+1, ast_time.tm_mday, ast_time.tm_hour, ast_time.tm_min, ast_time.tm_sec, msecs);
 			fprintf(stdout, "StartTime: %s - startNumber %d - last number %d\n", availability_start_time, main_seg_time.segnum, seg_time.segnum);
-			
+
 			if (cmddata->time_shift != -1) {
 				int ts, h, m, s;
 				ts = cmddata->time_shift;
@@ -381,7 +371,8 @@
 u32 delete_seg_thread(void *params)
 {
 	int ret;
-	ThreadParam *th_param = (ThreadParam*)params;CmdData *cmd_data = th_param->in_data;
+	ThreadParam *th_param = (ThreadParam*)params;
+	CmdData *cmd_data = th_param->in_data;
 	MessageQueue *mq = th_param->mq;
 
 	char buff[GF_MAX_PATH];
@@ -493,7 +484,7 @@
 //	}
 //
 //	dash_profile = cmd_data->live ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_MAIN;
-//	strncpy(sz_mpd, cmd_data->mpd_filename, GF_MAX_PATH);
+//	strncpy(sz_mpd, cmd_data->mpd_filename, GF_MAX_PATH-1);
 //
 //	dash_duration = cmd_data->dash_dur ? cmd_data->dash_dur / 1000 : 1;
 //
@@ -598,7 +589,7 @@
 	VideoInputData *video_input_data = thread_params->video_input_data;
 	VideoInputFile **video_input_file = thread_params->video_input_file;
 
-	suseconds_t total_wait_time = 1000000 / in_data->video_data_conf.framerate;
+	suseconds_t total_wait_time = (int) (1000000.0 / (double) in_data->video_data_conf.framerate);
 	suseconds_t pick_packet_delay, select_delay = 0, real_wait, other_delays = 2;
 
 	Task t;
@@ -614,7 +605,7 @@
 		//fprintf(stdout, "sourcenumber: %d\n", source_number);
 
 		if (video_input_file[source_number]->mode == LIVE_MEDIA) {
-			gettimeofday(&time_start, NULL);
+			gf_gettimeofday(&time_start, NULL);
 		}
 
 		ret = dc_video_decoder_read(video_input_file[source_number], video_input_data, source_number, in_data->use_source_timing, (in_data->mode == LIVE_CAMERA) ? 1 : 0, (const int *) &in_data->exit_signal);
@@ -637,16 +628,16 @@
 		}
 
 		if (video_input_file[source_number]->mode == LIVE_MEDIA) {
-			gettimeofday(&time_end, NULL);
+			gf_gettimeofday(&time_end, NULL);
 			pick_packet_delay = ((time_end.tv_sec - time_start.tv_sec) * 1000000) + time_end.tv_usec - time_start.tv_usec;
 			time_wait.tv_sec = 0;
 			real_wait = total_wait_time - pick_packet_delay - select_delay - other_delays;
 			time_wait.tv_usec = real_wait;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("delay: %ld = %ld - %ld\n", time_wait.tv_usec, total_wait_time, pick_packet_delay));
 
-			gettimeofday(&time_start, NULL);
+			gf_gettimeofday(&time_start, NULL);
 			select(0, NULL, NULL, NULL, &time_wait);
-			gettimeofday(&time_end, NULL);
+			gf_gettimeofday(&time_end, NULL);
 
 			select_delay = (((time_end.tv_sec - time_start.tv_sec) * 1000000) + time_end.tv_usec - time_start.tv_usec) - real_wait;
 		}
@@ -669,7 +660,7 @@
 	CmdData *in_data = thread_params->in_data;
 	AudioInputData *audio_input_data = thread_params->audio_input_data;
 	AudioInputFile *audio_input_file = thread_params->audio_input_file;
-	
+
 	suseconds_t pick_packet_delay, select_delay = 0, real_wait, other_delays = 1;
 	suseconds_t total_wait_time;
 	if (in_data->audio_data_conf.samplerate < 1024) {
@@ -678,7 +669,7 @@
 		//FIXME: deadlock on the mpd thread. Reproduce with big_buck_bunny.mp4.
 		return 1;
 	}
-	total_wait_time = 1000000 / (in_data->audio_data_conf.samplerate / 1024);
+	total_wait_time = (int) (1000000.0 / (in_data->audio_data_conf.samplerate / (double) AUDIO_FRAME_SIZE));
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("wait time : %ld\n", total_wait_time));
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("sample-rate : %ld\n", in_data->audio_data_conf.samplerate));
 
@@ -687,7 +678,7 @@
 
 	while (1) {
 		if (audio_input_file->mode == LIVE_MEDIA) {
-			gettimeofday(&time_start, NULL);
+			gf_gettimeofday(&time_start, NULL);
 		}
 
 		ret = dc_audio_decoder_read(audio_input_file, audio_input_data);
@@ -700,7 +691,7 @@
 			break;
 		}
 		if (ret == -1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occurred while reading video frame.\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occurred while reading audio frame.\n"));
 			break;
 		}
 
@@ -710,15 +701,15 @@
 		}
 
 		if (audio_input_file->mode == LIVE_MEDIA) {
-			gettimeofday(&time_end, NULL);
+			gf_gettimeofday(&time_end, NULL);
 			pick_packet_delay = ((time_end.tv_sec - time_start.tv_sec) * 1000000) + time_end.tv_usec - time_start.tv_usec;
 			time_wait.tv_sec = 0;
 			real_wait = total_wait_time - pick_packet_delay - select_delay - other_delays;
 			time_wait.tv_usec = real_wait;
 
-			gettimeofday(&time_start, NULL);
+			gf_gettimeofday(&time_start, NULL);
 			select(0, NULL, NULL, NULL, &time_wait);
-			gettimeofday(&time_end, NULL);
+			gf_gettimeofday(&time_end, NULL);
 
 			select_delay = (((time_end.tv_sec - time_start.tv_sec) * 1000000) + time_end.tv_usec - time_start.tv_usec) - real_wait;
 		}
@@ -755,7 +746,7 @@
 
 u32 video_encoder_thread(void *params)
 {
-	int ret, shift, frame_nb, seg_frame_max, frag_frame_max, seg_nb = 0, loss_state = 0, quit = 0;
+	int ret, shift, frame_nb, seg_frame_max, frag_frame_max, seg_nb = 0, loss_state = 0, quit = 0, real_video_seg_dur;
 	char name_to_delete[GF_MAX_PATH], name_to_send[GF_MAX_PATH];
 	u64 start_utc, seg_utc;
 	segtime time_at_segment_start;
@@ -784,6 +775,10 @@
 	frag_frame_max = (int)(video_data_conf->framerate * (float) (in_data->frag_dur / 1000.0));
 	optimize_seg_frag_dur(&seg_frame_max, &frag_frame_max);
 
+	real_video_seg_dur = (int) (seg_frame_max * 1000.0 / (float) video_data_conf->framerate);
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[video_encoder] seg_frame_max=%d, frag_frame_max=%d, real_video_seg_dur=%d ms\n", seg_frame_max, frag_frame_max, real_video_seg_dur));
+
+
 	if (seg_frame_max <= 0)
 		seg_frame_max = -1;
 
@@ -803,7 +798,7 @@
 		return -1;
 	}
 
-	if (dc_video_encoder_open(&out_file, video_data_conf, in_data->use_source_timing) < 0) {
+	if (dc_video_encoder_open(&out_file, video_data_conf, in_data->use_source_timing, video_scaled_data->sar) < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video stream.\n"));
 		in_data->exit_signal = 1;
 		return -1;
@@ -817,7 +812,7 @@
 		//logging at the end of the segment production will induce one segment delay
 		time_at_segment_start.segnum = seg_nb;
 		time_at_segment_start.time = gf_net_get_utc();
-		
+
 		if (dc_video_muxer_open(&out_file, in_data->out_dir, video_data_conf->filename, seg_nb) < 0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video file.\n"));
 			in_data->exit_signal = 1;
@@ -838,7 +833,7 @@
 			}
 
 			if (ret == -2) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio encoder has no more data to encode.\n"));
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video encoder has no more data to encode.\n"));
 				quit = 1;
 				break;
 			}
@@ -889,17 +884,18 @@
 			int seg_diff;
 			seg_utc = gf_net_get_utc();
 			diff = (int) (seg_utc - start_utc);
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[video_encoder] UTC diff %d - cumulated segment duration %d -> %d\n", diff, (seg_nb+1) * real_video_seg_dur, diff - (seg_nb+1) * real_video_seg_dur));
 
 			//if seg UTC is after next segment UTC (current ends at seg_nb+1, next at seg_nb+2), adjust numbers
-			if (diff > (seg_nb+2) * in_data->seg_dur) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Rep %s UTC diff %d bigger than segment duration %d - some frame where probably lost. Adjusting\n", out_file.rep_id, diff, seg_nb));
+			if (diff > (seg_nb+2) * real_video_seg_dur) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[video_encoder] Rep %s UTC diff %d bigger than segment duration %d - some frame where probably lost. Adjusting\n", out_file.rep_id, diff, seg_nb));
 
-				while (diff > (seg_nb+2) * in_data->seg_dur) {
+				while (diff > (seg_nb+2) * real_video_seg_dur) {
 					seg_nb++;
 
 					//do a rough estimate of losses to adjust timing...
 					if (! in_data->use_source_timing) {
-							out_file.first_dts += out_file.codec_ctx->time_base.den;
+						out_file.first_dts += out_file.codec_ctx->time_base.den;
 					}
 				}
 				//wait for RAP to cut next segment
@@ -908,21 +904,21 @@
 #define SYNC_SAFE	800
 
 				seg_diff = diff;
-				seg_diff -= (seg_nb+1) * in_data->seg_dur;
+				seg_diff -= (seg_nb+1) * real_video_seg_dur;
 				if (seg_diff > SYNC_SAFE) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Rep %s UTC diff at segment close: %d is higher than cumulated segment duration %d (diff %d) - frame rate is probably not correct !!\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));			
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[video_encoder] Rep %s UTC diff at segment close: %d is higher than cumulated segment duration %d (diff %d) - frame rate is probably not correct!\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));
 				}
 				else if (seg_diff < -SYNC_SAFE) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Rep %s UTC diff at segment close: %d is lower than cumulated segment duration %d (diff %d) - frame rate is probably not correct or frames were lost !!\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));			
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[video_encoder] Rep %s UTC diff at segment close: %d is lower than cumulated segment duration %d (diff %d) - frame rate is probably not correct or frames were lost!\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));
 				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Rep %s UTC diff at segment close: %d - cumulated segment duration %d (diff %d)\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));			
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[video_encoder] Rep %s UTC diff at segment close: %d - cumulated segment duration %d (diff %d)\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));
 				}
 			}
 
 			//time_t t = time(NULL);
 			dc_message_queue_put(mq, &time_at_segment_start, sizeof(time_at_segment_start));
 		}
-	
+
 		if ((in_data->time_shift != -1)) {
 			shift = 1000 * in_data->time_shift / in_data->seg_dur;
 			if (seg_nb - shift>=0) {
@@ -943,7 +939,7 @@
 		if (thread_params->video_conf_idx == 0) {
 			int dur = (seg_nb * seg_frame_max * 1000) / video_data_conf->framerate;
 			int dur_tot = (out_file.codec_ctx->frame_number * 1000)
-					/ video_data_conf->framerate;
+			              / video_data_conf->framerate;
 			if (dur > dur_tot)
 				dur = dur_tot;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Duration: %d \n", dur));
@@ -962,7 +958,7 @@
 
 u32 audio_encoder_thread(void *params)
 {
-	int ret, exit_loop = 0, quit = 0, seg_nb = 0, frame_per_seg, frame_per_frag, frame_nb, shift;
+	int ret, exit_loop = 0, quit = 0, seg_nb = 0, frame_per_seg, frame_per_frag, frame_nb, shift, real_audio_seg_dur;
 	//int seg_frame_max;
 	//int frag_frame_max;
 	//int audio_frame_size = AUDIO_FRAME_SIZE;
@@ -1001,10 +997,13 @@
 		return -1;
 	}
 
-	frame_per_seg  = (int)((audio_data_conf->samplerate / (double) audio_output_file.frame_size) * (in_data->seg_dur  / 1000.0));
-	frame_per_frag = (int)((audio_data_conf->samplerate / (double) audio_output_file.frame_size) * (in_data->frag_dur / 1000.0));
+	frame_per_seg  = (int)((audio_data_conf->samplerate / (double) audio_output_file.codec_ctx->frame_size) * (in_data->seg_dur  / 1000.0));
+	frame_per_frag = (int)((audio_data_conf->samplerate / (double) audio_output_file.codec_ctx->frame_size) * (in_data->frag_dur / 1000.0));
 	optimize_seg_frag_dur(&frame_per_seg, &frame_per_frag);
 
+	real_audio_seg_dur = (int) (frame_per_seg * (double) audio_output_file.codec_ctx->frame_size * 1000.0 / (double) audio_data_conf->samplerate);
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH,("[audio_encoder] frame_per_seg=%d, frame_per_frag=%d, real_audio_seg_dur=%d ms\n", frame_per_seg, frame_per_frag, real_audio_seg_dur) );
+
 	if (dc_audio_muxer_init(&audio_output_file, audio_data_conf, muxer_type, frame_per_seg, frame_per_frag, in_data->seg_marker) < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot init output audio.\n"));
 		in_data->exit_signal = 1;
@@ -1012,6 +1011,7 @@
 	}
 
 	start_utc = gf_net_get_utc();
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[audio_encoder] start_utc="LLU"\n", start_utc));
 	seg_utc = 0;
 	while (1) {
 		frame_nb = 0;
@@ -1088,19 +1088,19 @@
 		if (in_data->mode == LIVE_CAMERA || in_data->mode == LIVE_MEDIA) {
 			if (thread_params->audio_conf_idx == 0) {
 				segtime t;
-				
+
 				//check we don't loose sync
 				int diff;
 				seg_utc = gf_net_get_utc();
 				diff = (int) (seg_utc - start_utc);
 				//if seg UTC is after next segment UTC (current ends at seg_nb+1, next at seg_nb+2), adjust numbers
-				if (diff > (seg_nb+2) * in_data->seg_dur) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("UTC diff %d bigger than segment duration %d - some frame where probably lost. Adjusting\n", diff, seg_nb));
-					while (diff > (seg_nb+2) * in_data->seg_dur) {
+				if (diff > (seg_nb+2) * real_audio_seg_dur) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[audio_encoder] UTC diff %d bigger than segment duration %d - some frame where probably lost. Adjusting\n", diff, seg_nb));
+					while (diff > (seg_nb+2) * real_audio_seg_dur) {
 						seg_nb++;
 					}
 				}
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("UTC diff %d - cumulated segment duration %d\n", diff, (seg_nb+1) * in_data->seg_dur));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[audio_encoder] UTC diff %d - cumulated segment duration %d -> %d\n", diff, (seg_nb+1) * real_audio_seg_dur, diff - (seg_nb+1) * real_audio_seg_dur));
 				t.segnum = seg_nb;
 				t.time = gf_net_get_utc();
 				//time_t t = time(NULL);
@@ -1124,8 +1124,8 @@
 	// Send the duration of the video
 	if (in_data->mode == ON_DEMAND) {
 		if (thread_params->audio_conf_idx == 0) {
-			int dur = (seg_nb * audio_output_file.frame_size * frame_per_seg * 1000) / audio_data_conf->samplerate;
-			int dur_tot = (audio_output_file.codec_ctx->frame_number * audio_output_file.frame_size * 1000) / audio_data_conf->samplerate;
+			int dur = (seg_nb * audio_output_file.codec_ctx->frame_size * frame_per_seg * 1000) / audio_data_conf->samplerate;
+			int dur_tot = (audio_output_file.codec_ctx->frame_number * audio_output_file.codec_ctx->frame_size * 1000) / audio_data_conf->samplerate;
 			if (dur > dur_tot)
 				dur = dur_tot;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Duration: %d \n", dur));
@@ -1147,7 +1147,7 @@
 	int ret = 0;
 	u32 video_cb_size = VIDEO_CB_DEFAULT_SIZE;
 	u32 i, j;
-	
+
 	ThreadParam keyboard_th_params;
 	ThreadParam mpd_th_params;
 	ThreadParam delete_seg_th_params;
@@ -1225,7 +1225,7 @@
 		}
 
 		for (i=0; i<gf_list_count(in_data->vsrc) + 1; i++) {
-			dc_video_input_data_set_prop(&video_input_data, i, video_input_file[i]->width, video_input_file[i]->height, in_data->video_data_conf.crop_x, in_data->video_data_conf.crop_y, video_input_file[i]->pix_fmt);
+			dc_video_input_data_set_prop(&video_input_data, i, video_input_file[i]->width, video_input_file[i]->height, in_data->video_data_conf.crop_x, in_data->video_data_conf.crop_y, video_input_file[i]->pix_fmt, video_input_file[i]->sar);
 		}
 
 		for (i=0; i<video_scaled_data_list.size; i++) {
@@ -1282,7 +1282,7 @@
 
 	/* Initialize keyboard controller thread */
 	keyboard_th_params.thread = gf_th_new("keyboard_thread");
-	
+
 	/* Create keyboard controller thread */
 	keyboard_th_params.in_data = in_data;
 	if (gf_th_run(keyboard_th_params.thread, keyboard_thread, (void *)&keyboard_th_params) != GF_OK) {
@@ -1306,12 +1306,12 @@
 			tmvdata->time_base = in_data->video_data_conf.time_base;
 		}
 	}
-	
+
 	/******** MPD Thread ********/
 
 	/* Initialize MPD generator thread */
 	mpd_th_params.thread = gf_th_new("mpd_thread");
-	
+
 	/* Create MPD generator thread */
 	mpd_th_params.in_data = in_data;
 	mpd_th_params.mq = &mq;
@@ -1522,7 +1522,7 @@
 		dasher_thread((void*) &dasher_th_params);
 	}
 #endif
-	
+
 exit:
 	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
 		/* Destroy audio input data */
@@ -1557,7 +1557,7 @@
 	dc_message_queue_free(&mq);
 	dc_message_queue_free(&delete_seg_mq);
 	dc_message_queue_free(&send_frag_mq);
-	
+
 	dc_unregister_libav();
 
 	return ret;

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/controler.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/controler.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/libav_compat.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/libav_compat.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/register.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/register.c Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/register.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/register.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/task.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/task.c Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_data.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_data.c Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_data.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_data.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_decoder.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_decoder.c Changed

@@ -80,7 +80,7 @@
 		}
 	}
 #endif
-	
+
 	if (video_data_conf->format && strcmp(video_data_conf->format, "") != 0) {
 		in_fmt = av_find_input_format(video_data_conf->format);
 		if (in_fmt == NULL) {
@@ -153,9 +153,11 @@
 
 	video_input_file->width = codec_ctx->width;
 	video_input_file->height = codec_ctx->height;
+	video_input_file->sar = codec_ctx->sample_aspect_ratio;
+
 	video_input_file->pix_fmt = codec_ctx->pix_fmt;
-	if (video_data_conf->framerate >= 0) {
-		video_data_conf->framerate = codec_ctx->time_base.den / codec_ctx->time_base.num;	
+	if (video_data_conf->framerate >= 0 && codec_ctx->time_base.num) {
+		video_data_conf->framerate = codec_ctx->time_base.den / codec_ctx->time_base.num;
 	}
 	if (video_data_conf->framerate <= 1 || video_data_conf->framerate > 1000) {
 		const int num = video_input_file->av_fmt_ctx->streams[video_input_file->vstream_idx]->avg_frame_rate.num;
@@ -203,16 +205,16 @@
 	/* Read frames */
 	while (1) {
 #ifdef DASHCAST_DEBUG_TIME_
-		gettimeofday(&start, NULL);
+		gf_gettimeofday(&start, NULL);
 #endif
 		memset(&packet, 0, sizeof(AVPacket));
 		ret = av_read_frame(video_input_file->av_fmt_ctx, &packet);
 #ifdef DASHCAST_DEBUG_TIME_
-		gettimeofday(&end, NULL);
+		gf_gettimeofday(&end, NULL);
 		elapsed_time = (end.tv_sec * 1000000 + end.tv_usec) - (start.tv_sec * 1000000 + start.tv_usec);
 		fprintf(stdout, "fps: %f\n", 1000000.0/elapsed_time);
 #endif
-		
+
 		/* If we demux for the audio thread, send the packet to the audio */
 		if (video_input_file->av_fmt_ctx_ref_cnt && ((packet.stream_index != video_input_file->vstream_idx) || (ret == AVERROR_EOF))) {
 			AVPacket *packet_copy = NULL;
@@ -225,7 +227,7 @@
 			gf_mx_p(video_input_file->av_pkt_list_mutex);
 			gf_list_add(video_input_file->av_pkt_list, packet_copy);
 			gf_mx_v(video_input_file->av_pkt_list_mutex);
-			
+
 			if (ret != AVERROR_EOF) {
 				continue;
 			}
@@ -244,7 +246,12 @@
 			video_data_node->source_number = source_number;
 			/* Flush decoder */
 			memset(&packet, 0, sizeof(AVPacket));
+#ifndef FF_API_AVFRAME_LAVC
 			avcodec_get_frame_defaults(video_data_node->vframe);
+#else
+			av_frame_unref(video_data_node->vframe);
+#endif
+
 			avcodec_decode_video2(codec_ctx, video_data_node->vframe, &got_frame, &packet);
 			if (got_frame) {
 				dc_producer_advance(&video_input_data->producer, &video_input_data->circular_buf);
@@ -278,7 +285,11 @@
 			video_data_node->source_number = source_number;
 
 			/* Set video frame to default */
+#ifndef FF_API_AVFRAME_LAVC
 			avcodec_get_frame_defaults(video_data_node->vframe);
+#else
+			av_frame_unref(video_data_node->vframe);
+#endif
 
 			/* Decode video frame */
 			if (avcodec_decode_video2(codec_ctx, video_data_node->vframe, &got_frame, &packet) < 0) {
@@ -300,10 +311,10 @@
 						video_input_file->computed_pts = 0;
 						video_input_data->frame_duration = codec_ctx->time_base.num;
 						video_input_file->sync_tolerance = 9*video_input_data->frame_duration/5;
-						//TODO - check with audio if sync is OK 
-					} 
-					//perform FPS re-linearisation 
-					pts = packet.pts - video_input_file->first_pts;	
+						//TODO - check with audio if sync is OK
+					}
+					//perform FPS re-linearisation
+					pts = packet.pts - video_input_file->first_pts;
 					if (pts - video_input_file->prev_pts > video_input_file->sync_tolerance) {
 						u32 nb_lost=0;
 						while (pts > video_input_file->computed_pts) {
@@ -324,7 +335,7 @@
 				}
 
 				if (video_data_node->vframe->pts==AV_NOPTS_VALUE) {
-					if (!use_source_timing ) {
+					if (!use_source_timing) {
 						video_data_node->vframe->pts = video_input_file->frame_decoded;
 					} else {
 						video_data_node->vframe->pts = video_data_node->vframe->pkt_pts;
@@ -342,9 +353,6 @@
 					video_data_node->nb_raw_frames_ref = video_input_file->nb_consumers;
 
 					video_data_node->raw_packet = packet;
-#ifndef GPAC_USE_LIBAV
-					video_data_node->vframe = av_frame_clone(video_data_node->vframe);
-#endif
 
 					dc_producer_advance(&video_input_data->producer, &video_input_data->circular_buf);
 					while (video_data_node->nb_raw_frames_ref && ! *exit_signal_addr) {
@@ -372,7 +380,7 @@
 	/* Close the video format context */
 	if (!video_input_file->av_fmt_ctx_ref_cnt)
 		avformat_close_input(&video_input_file->av_fmt_ctx);
-	
+
 	video_input_file->av_pkt_list = NULL;
 	video_input_file->av_pkt_list_mutex = NULL;
 }

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_decoder.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_decoder.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_encoder.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_encoder.c Changed

@@ -33,12 +33,6 @@
 #define _TOSTR(_val) #_val
 #define TOSTR(_val) _TOSTR(_val)
 
-#pragma comment(lib, "avcodec-"TOSTR(LIBAVCODEC_VERSION_MAJOR) )
-#pragma comment(lib, "avdevice-"TOSTR(LIBAVDEVICE_VERSION_MAJOR) )
-#pragma comment(lib, "avformat-"TOSTR(LIBAVFORMAT_VERSION_MAJOR) )
-#pragma comment(lib, "avutil-"TOSTR(LIBAVUTIL_VERSION_MAJOR) )
-#pragma comment(lib, "swscale-"TOSTR(LIBSWSCALE_VERSION_MAJOR) )
-
 #endif
 
 
@@ -62,39 +56,33 @@
 	gf_free(opt);
 }
 
-int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, Bool use_source_timing)
+int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, Bool use_source_timing, AVRational sar)
 {
 	video_output_file->vbuf_size = 9 * video_data_conf->width * video_data_conf->height + 10000;
 	video_output_file->vbuf = (uint8_t *) av_malloc(video_output_file->vbuf_size);
+	video_output_file->video_data_conf = video_data_conf;
 
-//	video_output_file->codec = avcodec_find_encoder_by_name("libx264"/*video_data_conf->codec*/);
-	video_output_file->codec = avcodec_find_encoder(CODEC_ID_H264);
+	video_output_file->codec = avcodec_find_encoder_by_name(video_data_conf->codec);
 	if (video_output_file->codec == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Output video codec %d not found\n", CODEC_ID_H264));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Output video codec %s not found\n", video_data_conf->codec));
 		return -1;
 	}
 
 	video_output_file->codec_ctx = avcodec_alloc_context3(video_output_file->codec);
 
-	//Create new video stream
-//	video_stream = avformat_new_stream(video_output_file->av_fmt_ctx, video_codec);
-//	if (!video_stream) {
-//		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create output video stream\n"));
-//		return -1;
-//	}
-
 	video_output_file->codec_ctx->codec_id = video_output_file->codec->id;
 	video_output_file->codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
 	video_output_file->codec_ctx->bit_rate = video_data_conf->bitrate;
 	video_output_file->codec_ctx->width = video_data_conf->width;
 	video_output_file->codec_ctx->height = video_data_conf->height;
+	video_output_file->codec_ctx->sample_aspect_ratio = sar;
 
 	video_output_file->codec_ctx->time_base.num = 1;
 	video_output_file->codec_ctx->time_base.den = video_output_file->gop_size ? video_output_file->gop_size : video_data_conf->framerate;
-	
+
 	video_output_file->use_source_timing = use_source_timing;
 	if (use_source_timing) {
-		//for avcodec to do rate allcoation, we need to have ctx->timebase == 1/framerate
+		//for avcodec to do rate allocation, we need to have ctx->timebase == 1/framerate
 		video_output_file->codec_ctx->time_base.den = video_data_conf->time_base.den;
 		video_output_file->codec_ctx->time_base.num = video_data_conf->time_base.num * video_data_conf->time_base.den / video_data_conf->framerate;
 	}
@@ -138,11 +126,9 @@
 	 *
 	 */
 
-	if (video_data_conf->custom) {
+	if ( strlen(video_data_conf->custom) ) {
 		build_dict(video_output_file->codec_ctx->priv_data, video_data_conf->custom);
-		gf_free(video_data_conf->custom);
-		video_data_conf->custom = NULL;
-	} else {
+	} else if (video_data_conf->low_delay) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video Encoder: applying default options (preset=ultrafast tune=zerolatency)\n"));
 		av_opt_set(video_output_file->codec_ctx->priv_data, "preset", "ultrafast", 0);
 		av_opt_set(video_output_file->codec_ctx->priv_data, "tune", "zerolatency", 0);
@@ -153,40 +139,26 @@
 		av_opt_set_int(video_output_file->codec_ctx->priv_data, "key-int", video_output_file->gdr, 0);
 	}
 
-//	if (video_output_file->av_fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
 	//the global header gives access to the extradata (SPS/PPS)
 	video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
 
-//	if (video_output_file->av_fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
-//		video_stream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
 	video_output_file->vstream_idx = 0;//video_stream->index;
-	
+
 	/* open the video codec - options are passed thru video_output_file->codec_ctx->priv_data */
 	if (avcodec_open2(video_output_file->codec_ctx, video_output_file->codec, NULL) < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video codec\n"));
 		return -1;
 	}
 
-//	/* open the video codec */
-//	if (avcodec_open2(video_stream->codec, video_codec, NULL) < 0) {
-//		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video codec\n"));
-//		return -1;
-//	}
-
 	video_output_file->rep_id = video_data_conf->filename;
 	return 0;
 }
 
 int dc_video_encoder_encode(VideoOutputFile *video_output_file, VideoScaledData *video_scaled_data)
 {
-	//AVPacket pkt;
 	VideoDataNode *video_data_node;
 	int ret;
-	//int out_size;
 
-//	AVStream *video_stream = video_output_file->av_fmt_ctx->streams[video_output_file->vstream_idx];
-//	AVCodecContext *video_codec_ctx = video_stream->codec;
 	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
 
 	//FIXME: deadlock when pressing 'q' with BigBuckBunny_640x360.m4v
@@ -206,8 +178,8 @@
 	 */
 	if (!video_output_file->use_source_timing) {
 		video_data_node->vframe->pts = video_codec_ctx->frame_number;
-	}	
-	
+	}
+
 	/* Encoding video */
 	{
 		int got_packet = 0;
@@ -216,14 +188,20 @@
 		pkt.data = video_output_file->vbuf;
 		pkt.size = video_output_file->vbuf_size;
 		pkt.pts = pkt.dts = video_data_node->vframe->pkt_dts = video_data_node->vframe->pkt_pts = video_data_node->vframe->pts;
-#ifdef GPAC_USE_LIBAV
+#ifdef LIBAV_ENCODE_OLD
 		video_output_file->encoded_frame_size = avcodec_encode_video(video_codec_ctx, video_output_file->vbuf, video_output_file->vbuf_size, video_data_node->vframe);
 		got_packet = video_output_file->encoded_frame_size>=0 ? 1 : 0;
 #else
 		video_output_file->encoded_frame_size = avcodec_encode_video2(video_codec_ctx, &pkt, video_data_node->vframe, &got_packet);
+#endif
+
 		//this is not true with libav !
+#ifndef GPAC_USE_LIBAV
 		if (video_output_file->encoded_frame_size >= 0)
 			video_output_file->encoded_frame_size = pkt.size;
+#else
+		if (got_packet)
+			video_output_file->encoded_frame_size = pkt.size;
 #endif
 		if (video_output_file->encoded_frame_size >= 0) {
 			if (got_packet) {
@@ -248,7 +226,6 @@
 
 	/* if zero size, it means the image was buffered */
 //	if (out_size > 0) {
-//
 //		av_init_packet(&pkt);
 //		pkt.data = NULL;
 //		pkt.size = 0;

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_encoder.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_encoder.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_muxer.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_muxer.c Changed

@@ -42,7 +42,7 @@
 	u8 nal_size;
 	AVCState avc;
 	GF_BitStream *bs;
-	if (!extradata || !extradata_size)
+	if (!extradata || (extradata_size < sizeof(u32)))
 		return GF_BAD_PARAM;
 	bs = gf_bs_new(extradata, extradata_size, GF_BITSTREAM_READ);
 	if (!bs)
@@ -114,7 +114,7 @@
 			gf_free(buffer);
 			return GF_BAD_PARAM;
 		}
-		
+
 		idx = gf_media_avc_read_pps(buffer, nal_size, &avc);
 		if (idx < 0) {
 			gf_bs_del(bs);
@@ -136,37 +136,273 @@
 #endif
 }
 
-int dc_gpac_video_moov_create(VideoOutputFile *video_output_file, char *filename)
+/**
+ * A function which takes FFmpeg H265 extradata (SPS/PPS) and bring them ready to be pushed to the MP4 muxer.
+ * @param extradata
+ * @param extradata_size
+ * @param dstcfg
+ * @returns GF_OK is the extradata was parsed and is valid, other values otherwise.
+ */
+static GF_Err hevc_import_ffextradata(const u8 *extradata, const u64 extradata_size, GF_HEVCConfig *dst_cfg)
 {
-	GF_Err ret;
-	//AVStream *video_stream = video_output_file->av_fmt_ctx->streams[video_output_file->vstream_idx];
-	//AVCodecContext *video_codec_ctx = video_stream->codec;
+#ifdef GPAC_DISABLE_AV_PARSERS
+	return GF_OK;
+#else
+	HEVCState hevc;
+	GF_HEVCParamArray *vpss = NULL, *spss = NULL, *ppss = NULL;
+	GF_BitStream *bs;
+	char *buffer = NULL;
+	u32 buffer_size = 0;
+	if (!extradata || (extradata_size < sizeof(u32)))
+		return GF_BAD_PARAM;
+	bs = gf_bs_new(extradata, extradata_size, GF_BITSTREAM_READ);
+	if (!bs)
+		return GF_BAD_PARAM;
 
-	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
-	GF_AVCConfig *avccfg;
-	u32 di, track;
+	memset(&hevc, 0, sizeof(HEVCState));
+	hevc.sps_active_idx = -1;
 
-	// T0D0: For the moment it is fixed
-	//u32 sample_dur = video_output_file->codec_ctx->time_base.den;
+	while (gf_bs_available(bs)) {
+		s32 idx;
+		GF_AVCConfigSlot *slc;
+		u8 nal_unit_type, temporal_id, layer_id;
+		u64 nal_start;
+		u32 nal_size;
 
-	avccfg = gf_odf_avc_cfg_new();
-	if (!avccfg) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create AVCConfig\n"));
-		return -1;
+		if (gf_bs_read_u32(bs) != 0x00000001) {
+			gf_bs_del(bs);
+			return GF_BAD_PARAM;
+		}
+		nal_start = gf_bs_get_position(bs);
+		nal_size = gf_media_nalu_next_start_code_bs(bs);
+		if (nal_start + nal_size > extradata_size) {
+			gf_bs_del(bs);
+			return GF_BAD_PARAM;
+		}
+
+		if (nal_size > buffer_size) {
+			buffer = (char*)gf_realloc(buffer, nal_size);
+			buffer_size = nal_size;
+		}
+		gf_bs_read_data(bs, buffer, nal_size);
+		gf_bs_seek(bs, nal_start);
+
+		gf_media_hevc_parse_nalu(bs, &hevc, &nal_unit_type, &temporal_id, &layer_id);
+		if (layer_id) {
+			gf_bs_del(bs);
+			gf_free(buffer);
+			return GF_BAD_PARAM;
+		}
+
+		switch (nal_unit_type) {
+		case GF_HEVC_NALU_VID_PARAM:
+			idx = gf_media_hevc_read_vps(buffer, nal_size , &hevc);
+			if (idx < 0) {
+				gf_bs_del(bs);
+				gf_free(buffer);
+				return GF_BAD_PARAM;
+			}
+
+			assert(hevc.vps[idx].state == 1); //we don't expect multiple VPS
+			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;
+
+				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;
+				}
+
+				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);
+			}
+			break;
+		case GF_HEVC_NALU_SEQ_PARAM:
+			idx = gf_media_hevc_read_sps(buffer, nal_size, &hevc);
+			if (idx < 0) {
+				gf_bs_del(bs);
+				gf_free(buffer);
+				return GF_BAD_PARAM;
+			}
+
+			assert(!(hevc.sps[idx].state & AVC_SPS_DECLARED)); //we don't expect multiple SPS
+			if ((hevc.sps[idx].state & AVC_SPS_PARSED) && !(hevc.sps[idx].state & AVC_SPS_DECLARED)) {
+				hevc.sps[idx].state |= AVC_SPS_DECLARED;
+				hevc.sps[idx].crc = gf_crc_32(buffer, nal_size);
+			}
+
+			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;
+			}
+
+			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);
+			break;
+		case GF_HEVC_NALU_PIC_PARAM:
+			idx = gf_media_hevc_read_pps(buffer, nal_size, &hevc);
+			if (idx < 0) {
+				gf_bs_del(bs);
+				gf_free(buffer);
+				return GF_BAD_PARAM;
+			}
+
+			assert(hevc.pps[idx].state == 1); //we don't expect multiple PPS
+			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;
+				}
+
+				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);
+			}
+			break;
+		default:
+			break;
+		}
+
+		if (gf_bs_seek(bs, nal_start+nal_size)) {
+			assert(nal_start+nal_size <= gf_bs_get_size(bs));
+			break;
+		}
 	}
 
-	//int64_t profile = 0;
-	//av_opt_get_int(video_output_file->codec_ctx->priv_data, "level", AV_OPT_SEARCH_CHILDREN, &profile);
+	gf_bs_del(bs);
+	gf_free(buffer);
 
-	{
-		GF_Err e = avc_import_ffextradata(video_codec_ctx->extradata, video_codec_ctx->extradata_size, avccfg);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse H264 SPS/PPS\n"));
+	return GF_OK;
+#endif
+}
+
+static GF_Err dc_gpac_video_write_config(VideoOutputFile *video_output_file, u32 *di, u32 track) {
+	GF_Err ret;
+	if (video_output_file->codec_ctx->codec_id == CODEC_ID_H264) {
+		GF_AVCConfig *avccfg;
+		avccfg = gf_odf_avc_cfg_new();
+		if (!avccfg) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create AVCConfig\n"));
+			return GF_OUT_OF_MEM;
+		}
+
+		ret = avc_import_ffextradata(video_output_file->codec_ctx->extradata, video_output_file->codec_ctx->extradata_size, avccfg);
+		if (ret != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse AVC/H264 SPS/PPS\n"));
 			gf_odf_avc_cfg_del(avccfg);
-			return -1;
+			return ret;
+		}
+
+		ret = gf_isom_avc_config_new(video_output_file->isof, track, avccfg, NULL, NULL, di);
+		if (ret != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_avc_config_new\n", gf_error_to_string(ret)));
+			return ret;
+		}
+
+		gf_odf_avc_cfg_del(avccfg);
+
+		//inband SPS/PPS
+		if (video_output_file->muxer_type == GPAC_INIT_VIDEO_MUXER_AVC3) {
+			ret = gf_isom_avc_set_inband_config(video_output_file->isof, track, 1);
+			if (ret != GF_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_avc_set_inband_config\n", gf_error_to_string(ret)));
+				return ret;
+			}
+		}
+	} else if (!strcmp(video_output_file->codec_ctx->codec->name, "libx265")) { //FIXME CODEC_ID_HEVC would break on old releases
+		GF_HEVCConfig *hevccfg = gf_odf_hevc_cfg_new();
+		if (!hevccfg) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create HEVCConfig\n"));
+			return GF_OUT_OF_MEM;
+		}
+
+		ret = hevc_import_ffextradata(video_output_file->codec_ctx->extradata, video_output_file->codec_ctx->extradata_size, hevccfg);
+		if (ret != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse HEVC/H265 SPS/PPS\n"));
+			gf_odf_hevc_cfg_del(hevccfg);
+			return ret;
+		}
+
+		ret = gf_isom_hevc_config_new(video_output_file->isof, track, hevccfg, NULL, NULL, di);
+		if (ret != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_hevc_config_new\n", gf_error_to_string(ret)));
+			return ret;
+		}
+
+		gf_odf_hevc_cfg_del(hevccfg);
+
+		//inband SPS/PPS
+		if (video_output_file->muxer_type == GPAC_INIT_VIDEO_MUXER_AVC3) {
+			ret = gf_isom_hevc_set_inband_config(video_output_file->isof, track, 1);
+			if (ret != GF_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_hevc_set_inband_config\n", gf_error_to_string(ret)));
+				return ret;
+			}
 		}
 	}
 
+	return GF_OK;
+}
+
+int dc_gpac_video_moov_create(VideoOutputFile *video_output_file, char *filename)
+{
+	GF_Err ret;
+	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
+	u32 di, track;
+
+	//TODO: For the moment it is fixed
+	//u32 sample_dur = video_output_file->codec_ctx->time_base.den;
+
+	//int64_t profile = 0;
+	//av_opt_get_int(video_output_file->codec_ctx->priv_data, "level", AV_OPT_SEARCH_CHILDREN, &profile);
+
 	video_output_file->isof = gf_isom_open(filename, GF_ISOM_OPEN_WRITE, NULL);
 	if (!video_output_file->isof) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open iso file %s\n", filename));
@@ -177,7 +413,7 @@
 	video_output_file->trackID = gf_isom_get_track_id(video_output_file->isof, track);
 
 	video_output_file->timescale = video_codec_ctx->time_base.den;
-	if (!video_output_file->frame_dur) 
+	if (!video_output_file->frame_dur)
 		video_output_file->frame_dur = video_codec_ctx->time_base.num;
 
 	if (!track) {
@@ -191,30 +427,18 @@
 		return -1;
 	}
 
-	ret = gf_isom_avc_config_new(video_output_file->isof, track, avccfg, NULL, NULL, &di);
+	ret = dc_gpac_video_write_config(video_output_file, &di, track);
 	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_avc_config_new\n", gf_error_to_string(ret)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: dc_gpac_video_write_config\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	gf_odf_avc_cfg_del(avccfg);
-	//fprintf(stdout, "time scale: %d \n", video_codec_ctx->time_base.den);
-
 	gf_isom_set_visual_info(video_output_file->isof, track, di, video_codec_ctx->width, video_codec_ctx->height);
 	gf_isom_set_sync_table(video_output_file->isof, track);
 
-	//inband SPS/PPS
-	if (video_output_file->muxer_type == GPAC_INIT_VIDEO_MUXER_AVC3) {
-		ret = gf_isom_avc_set_inband_config(video_output_file->isof, track, 1);
-		if (ret != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_avc_set_inband_config\n", gf_error_to_string(ret)));
-			return -1;
-		}
-	}
-
 	ret = gf_isom_setup_track_fragment(video_output_file->isof, track, 1, video_output_file->use_source_timing ? (u32) video_output_file->frame_dur : 1, 0, 0, 0, 0);
 	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_setutrack_fragment\n", gf_error_to_string(ret)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_setup_track_fragment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
@@ -226,6 +450,12 @@
 		return -1;
 	}
 
+	ret = gf_media_get_rfc_6381_codec_name(video_output_file->isof, track, video_output_file->video_data_conf->codec6381);
+	if (ret != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_finalize_for_fragment\n", gf_error_to_string(ret)));
+		return -1;
+	}
+
 	return 0;
 }
 
@@ -254,8 +484,6 @@
 int dc_gpac_video_isom_write(VideoOutputFile *video_output_file)
 {
 	GF_Err ret;
-	//AVStream *video_stream = video_output_file->av_fmt_ctx->streams[video_output_file->vstream_idx];
-	//AVCodecContext *video_codec_ctx = video_stream->codec;
 	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
 
 	u32 sc_size = 0;
@@ -398,7 +626,7 @@
 	}
 
 	video_stream = avformat_new_stream(video_output_file->av_fmt_ctx,
-			video_output_file->codec);
+	                                   video_output_file->codec);
 	if (!video_stream) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create output video stream\n"));
 		return -1;
@@ -413,7 +641,7 @@
 	video_stream->codec->height = video_codec_ctx->height; //video_output_file->video_data_conf->height;
 
 	video_stream->codec->time_base = video_codec_ctx->time_base;
-	
+
 	video_stream->codec->pix_fmt = PIX_FMT_YUV420P;
 	video_stream->codec->gop_size = video_codec_ctx->time_base.den; //video_output_file->video_data_conf->framerate;
 
@@ -586,7 +814,9 @@
 
 					if (insert_utc) {
 						gf_net_get_ntp(&sec, &frac);
-						ntpts = sec; ntpts <<= 32; ntpts |= frac; 
+						ntpts = sec;
+						ntpts <<= 32;
+						ntpts |= frac;
 						gf_isom_set_fragment_reference_time(video_output_file->isof, video_output_file->trackID, ntpts, video_output_file->pts_at_segment_start);
 					}
 				}
@@ -607,7 +837,7 @@
 			video_output_file->last_pts = video_output_file->codec_ctx->coded_frame->pts;
 			video_output_file->last_dts = video_output_file->codec_ctx->coded_frame->pkt_dts;
 
-			if (( video_output_file->last_dts - video_output_file->first_dts + video_output_file->frame_dur) /video_output_file->timescale >= video_output_file->frag_dur / 1000) {
+			if (( video_output_file->last_dts - video_output_file->first_dts + video_output_file->frame_dur) * 1000 >= video_output_file->frag_dur * video_output_file->timescale) {
 				gf_isom_flush_fragments(video_output_file->isof, 1);
 				video_output_file->fragment_started = 0;
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Flushed fragment to disk at UTC "LLU" ms - last coded frame PTS %d\n", gf_net_get_utc(), video_output_file->codec_ctx->coded_frame->pts));
@@ -626,7 +856,7 @@
 			if (!video_output_file->segment_started) {
 				u32 sec, frac;
 				u64 ntpts;
-					
+
 				video_output_file->pts_at_segment_start = video_output_file->codec_ctx->coded_frame->pts;
 				video_output_file->segment_started = 1;
 
@@ -634,7 +864,9 @@
 					time_t secs;
 					struct tm t;
 					gf_net_get_ntp(&sec, &frac);
-					ntpts = sec; ntpts <<= 32; ntpts |= frac; 
+					ntpts = sec;
+					ntpts <<= 32;
+					ntpts |= frac;
 					gf_isom_set_fragment_reference_time(video_output_file->isof, video_output_file->trackID, ntpts, video_output_file->pts_at_segment_start);
 
 					secs = sec - GF_NTP_SEC_1900_TO_1970;

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_muxer.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_muxer.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_scaler.c -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_scaler.c Changed

@@ -60,7 +60,9 @@
 
 void dc_video_scaler_node_destroy(VideoScaledDataNode *video_scaled_data_node)
 {
+#ifndef GPAC_USE_LIBAV
 	av_frame_free(&video_scaled_data_node->v_frame);
+#endif
 	gf_free(video_scaled_data_node);
 }
 
@@ -77,7 +79,7 @@
 		found = 0;
 		for (j=0; j<video_scaled_data_list->size; j++) {
 			if (   video_scaled_data_list->video_scaled_data[j]->out_height == video_data_conf->height
-				  && video_scaled_data_list->video_scaled_data[j]->out_width  == video_data_conf->width) {
+			        && video_scaled_data_list->video_scaled_data[j]->out_width  == video_data_conf->width) {
 				found = 1;
 				video_scaled_data_list->video_scaled_data[j]->num_consumers++;
 				break;
@@ -141,12 +143,14 @@
 	video_scaled_data->vsprop[index].in_height  = video_input_data->vprop[index].height - video_input_data->vprop[index].crop_y;
 	video_scaled_data->vsprop[index].in_pix_fmt = video_input_data->vprop[index].pix_fmt;
 
+	video_scaled_data->sar  = video_input_data->vprop[index].sar;
+
 	video_scaled_data->vsprop[index].sws_ctx = sws_getContext(
-			video_scaled_data->vsprop[index].in_width,
-			video_scaled_data->vsprop[index].in_height,
-			video_scaled_data->vsprop[index].in_pix_fmt,
-			video_scaled_data->out_width, video_scaled_data->out_height,
-			video_scaled_data->out_pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+	            video_scaled_data->vsprop[index].in_width,
+	            video_scaled_data->vsprop[index].in_height,
+	            video_scaled_data->vsprop[index].in_pix_fmt,
+	            video_scaled_data->out_width, video_scaled_data->out_height,
+	            video_scaled_data->out_pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
 	if (video_scaled_data->vsprop[index].sws_ctx == NULL) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot initialize the conversion context!\n"));
 		return -1;
@@ -162,18 +166,25 @@
 	VideoScaledDataNode *video_scaled_data_node;
 	AVFrame *src_vframe;
 
+	//step 1: try to lock output slot. If none available, return ....
+	if (video_input_data->circular_buf.size > 1)
+		dc_consumer_unlock_previous(&video_scaled_data->consumer, &video_input_data->circular_buf);
+
+	ret = dc_producer_lock(&video_scaled_data->producer, &video_scaled_data->circular_buf);
+	//not ready
+	if (ret<0) {
+		return -1;
+	}
+	dc_producer_unlock_previous(&video_scaled_data->producer, &video_scaled_data->circular_buf);
+
+	//step 2: lock input
 	ret = dc_consumer_lock(&video_scaled_data->consumer, &video_input_data->circular_buf);
 	if (ret < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler got an end of buffer!\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler got an end of input tbuffer!\n"));
 		return -2;
 	}
 
-	if (video_input_data->circular_buf.size > 1) 
-		dc_consumer_unlock_previous(&video_scaled_data->consumer, &video_input_data->circular_buf);
-
-	dc_producer_lock(&video_scaled_data->producer, &video_scaled_data->circular_buf);
-	dc_producer_unlock_previous(&video_scaled_data->producer, &video_scaled_data->circular_buf);
-
+	//step 3 - grab source and dest images
 	video_data_node = (VideoDataNode*)dc_consumer_consume(&video_scaled_data->consumer, &video_input_data->circular_buf);
 	video_scaled_data_node = (VideoScaledDataNode*)dc_producer_produce(&video_scaled_data->producer, &video_scaled_data->circular_buf);
 	index = video_data_node->source_number;
@@ -199,11 +210,16 @@
 		src_height = video_input_data->vprop[index].height;
 	}
 
+
 	//rescale the cropped frame
-	sws_scale(video_scaled_data->vsprop[index].sws_ctx,
-			(const uint8_t * const *)src_vframe->data, src_vframe->linesize, 0, src_height,
-			video_scaled_data_node->v_frame->data, video_scaled_data_node->v_frame->linesize);
-	
+	ret = sws_scale(video_scaled_data->vsprop[index].sws_ctx,
+	          (const uint8_t * const *)src_vframe->data, src_vframe->linesize, 0, src_height,
+	          video_scaled_data_node->v_frame->data, video_scaled_data_node->v_frame->linesize);
+
+	if (!ret) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler: error while resizing picture.\n"));
+		return -1;
+	}
 	video_scaled_data_node->v_frame->pts = video_data_node->vframe->pts;
 
 	if (video_data_node->nb_raw_frames_ref) {
@@ -219,7 +235,7 @@
 	dc_consumer_advance(&video_scaled_data->consumer);
 	dc_producer_advance(&video_scaled_data->producer, &video_scaled_data->circular_buf);
 
-	if (video_input_data->circular_buf.size == 1) 
+	if (video_input_data->circular_buf.size == 1)
 		dc_consumer_unlock_previous(&video_scaled_data->consumer, &video_input_data->circular_buf);
 	return 0;
 }

gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_scaler.h -> gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_scaler.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/generators/MPEG4/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/generators/MPEG4/main.c Changed

@@ -1,8 +1,8 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2004-2012 
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG4 Scene Graph Generator sub-project
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -44,13 +44,13 @@
 void PrintUsage()
 {
 	printf("MPEG4Gen [-p file] [template_file_v1 (template_file_v2 ...) ]\n"
-			"\nGPAC MPEG4 Scene Graph generator. Usage:\n"
-			"-p: listing file of nodes to exclude from tables\n"
-			"Template files MUST be fed in order\n"
-			"\n"
-			"Generated Files are directly updated in the GPAC distribution - do NOT try to change this\n\n"
-			"Written by Jean Le Feuvre - Copyright (c) Telecom ParisTech 2000-2012\n"
-			);
+	       "\nGPAC MPEG4 Scene Graph generator. Usage:\n"
+	       "-p: listing file of nodes to exclude from tables\n"
+	       "Template files MUST be fed in order\n"
+	       "\n"
+	       "Generated Files are directly updated in the GPAC distribution - do NOT try to change this\n\n"
+	       "Written by Jean Le Feuvre - Copyright (c) Telecom ParisTech 2000-2012\n"
+	      );
 }
 
 //a node field
@@ -119,7 +119,7 @@
 	u32 i , j = 0;
 
 	strcpy(token, "");
-	
+
 	//skip separaors
 	while (*CurrentLine && strchr(sep, *CurrentLine)) {
 		CurrentLine = CurrentLine + 1;
@@ -228,7 +228,7 @@
 			sprintf(sPath, "..%c..%c..%csrc%cscenegraph%c%s.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, name);
 		}
 	}
-	
+
 	f = fopen(sPath, "wt");
 	fprintf(f, "%s\n", cprt);
 
@@ -290,7 +290,7 @@
 
 	//write all tags
 	fprintf(f, "\n\nenum {\n");
-	
+
 	for (i=0; i<gf_list_count(BNodes); i++) {
 		n = gf_list_get(BNodes, i);
 		if (i)
@@ -318,7 +318,7 @@
 		}
 		for (j=0; j<gf_list_count(n->Fields); j++) {
 			bf = gf_list_get(n->Fields, j);
-			
+
 			if (!strcmp(bf->name, "addChildren") || !strcmp(bf->name, "removeChildren")) continue;
 			if (!strcmp(bf->name, "children") && stricmp(n->name, "audioBuffer")) continue;
 
@@ -337,8 +337,8 @@
 				//we will likely need a function such as:
 				//	void SignalRoute(route_stack, node, par)
 				fprintf(f, "\t%s %s;\t/*eventOut*/\n", bf->familly, bf->name);
-			} else if (strstr(bf->familly, "Node")) {		
-				//this is a POINTER to a node 
+			} else if (strstr(bf->familly, "Node")) {
+				//this is a POINTER to a node
 				if (strstr(bf->familly, "SF")) {
 					fprintf(f, "\tGF_Node *%s;\t/*%s*/\n", bf->name, bf->type);
 				} else {
@@ -350,18 +350,18 @@
 			}
 		}
 		if (!strcmp(n->name, "CacheTexture")) {
-				fprintf(f, "\t/*GPAC private*/\n");
-				fprintf(f, "\tu8 *data;\n");
-				fprintf(f, "\tu32 data_len;\n");
+			fprintf(f, "\t/*GPAC private*/\n");
+			fprintf(f, "\tu8 *data;\n");
+			fprintf(f, "\tu32 data_len;\n");
 		}
 		if (!strcmp(n->name, "BitWrapper")) {
-				fprintf(f, "\t/*GPAC private*/\n");
-				fprintf(f, "\tu32 buffer_len;\n");
+			fprintf(f, "\t/*GPAC private*/\n");
+			fprintf(f, "\tu32 buffer_len;\n");
 		}
 		fprintf(f, "} M_%s;\n\n\n", n->name);
 	}
 
-	
+
 	hasViewport = 0;
 	//all NDTs are defined in v1
 	fprintf(f, "/*NodeDataType tags*/\nenum {\n");
@@ -465,11 +465,11 @@
 			count -= 1;
 		}
 		if (!count) continue;
-		
+
 		//numBits
 		fprintf(f, "#define %s_V%d_NUMBITS\t\t%d\n", NDTName, Version, GetBitsCount(count + ( (Version == 2) ? 1 : 0) ) );
 		fprintf(f, "#define %s_V%d_Count\t%d\n\n", NDTName, Version, count);
-		
+
 		fprintf(f, "static const u32 %s_V%d_TypeToTag[%d] = {\n", NDTName, Version, count);
 		first = 1;
 		//browse each node.
@@ -477,7 +477,7 @@
 			n = gf_list_get(BNodes, j);
 			if (n->version != Version) continue;
 			if (!IsNodeInTable(n, NDTName)) continue;
-			
+
 			if (first) {
 				fprintf(f, " TAG_MPEG4_%s", n->name);
 				first = 0;
@@ -492,7 +492,7 @@
 	fprintf(f, "\nu32 NDT_V%d_GetNumBits(u32 NDT_Tag);\n", Version);
 	fprintf(f, "u32 NDT_V%d_GetNodeTag(u32 Context_NDT_Tag, u32 NodeType);\n", Version);
 	fprintf(f, "u32 NDT_V%d_GetNodeType(u32 NDT_Tag, u32 NodeTag);\n", Version);
-	
+
 	fprintf(f, "\n\n");
 }
 
@@ -532,7 +532,7 @@
 			count -= 1;
 		}
 		if (!count) continue;
-		
+
 		fprintf(f, "\tcase NDT_%s:\n\t\tif (NodeType >= %s_V%d_Count) return 0;\n", NDTName, NDTName, Version);
 		fprintf(f, "\t\treturn %s_V%d_TypeToTag[NodeType];\n", NDTName, Version);
 	}
@@ -551,7 +551,7 @@
 			count -= 1;
 		}
 		if (!count) continue;
-		
+
 		fprintf(f, "\tcase NDT_%s:\n\t\treturn %s_V%d_NUMBITS;\n", NDTName, NDTName, Version);
 	}
 	/*all tables have 1 node in v2 for proto coding*/
@@ -588,7 +588,7 @@
 	u32 NbDef, NbIn, NbOut, NbDyn, hasAQ;
 
 	NbDef = NbIn = NbOut = NbDyn = hasAQ = 0;
-	for (i=0;i<gf_list_count(n->Fields); i++) {
+	for (i=0; i<gf_list_count(n->Fields); i++) {
 		bf = gf_list_get(n->Fields, i);
 		if (!strcmp(bf->type, "field") || !strcmp(bf->type, "exposedField")) {
 			NbDef += 1;
@@ -719,11 +719,11 @@
 
 
 	fprintf(f, "static GF_Err %s_get_field(GF_Node *node, GF_FieldInfo *info)\n{\n\tswitch (info->fieldIndex) {\n", n->name);
-	for (i=0;i<gf_list_count(n->Fields); i++) {
+	for (i=0; i<gf_list_count(n->Fields); i++) {
 		bf = gf_list_get(n->Fields, i);
 
 		fprintf(f, "\tcase %d:\n", i);
-		
+
 		fprintf(f, "\t\tinfo->name = \"%s\";\n", (bf->name[0]=='_') ? bf->name+1 : bf->name);
 
 		//skip all eventIn
@@ -763,7 +763,7 @@
 	fprintf(f, "\tdefault:\n\t\treturn GF_BAD_PARAM;\n\t}\n}\n\n");
 
 	fprintf(f, "\nstatic s32 %s_get_field_index_by_name(char *name)\n{\n", n->name);
-	for (i=0;i<gf_list_count(n->Fields); i++) {
+	for (i=0; i<gf_list_count(n->Fields); i++) {
 		bf = gf_list_get(n->Fields, i);
 		fprintf(f, "\tif (!strcmp(\"%s\", name)) return %d;\n", (bf->name[0]=='_') ? bf->name+1 : bf->name, i);
 	}
@@ -777,7 +777,7 @@
 	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);
 		if (!bf->hasAnim && !bf->hasQuant) continue;
@@ -787,7 +787,7 @@
 		fprintf(f, "\t\t*AType = %d;\n", bf->AnimType);
 		//Quant Type
 		fprintf(f, "\t\t*QType = %s;\n", bf->quant_type);
-		if (!strcmp(bf->quant_type, "13")) 
+		if (!strcmp(bf->quant_type, "13"))
 			fprintf(f, "\t\t*QT13_bits = %s;\n", bf->qt13_bits);
 
 		//Bounds
@@ -841,35 +841,35 @@
 			//nothing on child events
 			if (!strcmp(bf->name, "addChildren")) continue;
 			if (!strcmp(bf->name, "removeChildren")) continue;
-			
+
 			//delete all children node
 			if (!strcmp(bf->name, "children") && stricmp(n->name, "audioBuffer")) {
 				is_parent = 1;
 				continue;
 			}
 
-			//delete ALL fields that must be deleted: this includes eventIn and out since 
+			//delete ALL fields that must be deleted: this includes eventIn and out since
 			//all fields are defined in the node
 			if (!strcmp(bf->familly, "MFInt")
-				|| !strcmp(bf->familly, "MFFloat")
-				|| !strcmp(bf->familly, "MFDouble")
-				|| !strcmp(bf->familly, "MFBool")
-				|| !strcmp(bf->familly, "MFInt32")
-				|| !strcmp(bf->familly, "MFColor")
-				|| !strcmp(bf->familly, "MFRotation")
-				|| !strcmp(bf->familly, "MFString")
-				|| !strcmp(bf->familly, "MFTime")
-				|| !strcmp(bf->familly, "MFVec2f")
-				|| !strcmp(bf->familly, "MFVec3f")
-				|| !strcmp(bf->familly, "MFVec4f")
-				|| !strcmp(bf->familly, "MFVec2d")
-				|| !strcmp(bf->familly, "MFVec3d")
-				|| !strcmp(bf->familly, "MFURL")
-				|| !strcmp(bf->familly, "MFScript")
-				|| !strcmp(bf->familly, "SFString")
-				|| !strcmp(bf->familly, "SFURL")
-				|| !strcmp(bf->familly, "SFImage")
-				) {
+			        || !strcmp(bf->familly, "MFFloat")
+			        || !strcmp(bf->familly, "MFDouble")
+			        || !strcmp(bf->familly, "MFBool")
+			        || !strcmp(bf->familly, "MFInt32")
+			        || !strcmp(bf->familly, "MFColor")
+			        || !strcmp(bf->familly, "MFRotation")
+			        || !strcmp(bf->familly, "MFString")
+			        || !strcmp(bf->familly, "MFTime")
+			        || !strcmp(bf->familly, "MFVec2f")
+			        || !strcmp(bf->familly, "MFVec3f")
+			        || !strcmp(bf->familly, "MFVec4f")
+			        || !strcmp(bf->familly, "MFVec2d")
+			        || !strcmp(bf->familly, "MFVec3d")
+			        || !strcmp(bf->familly, "MFURL")
+			        || !strcmp(bf->familly, "MFScript")
+			        || !strcmp(bf->familly, "SFString")
+			        || !strcmp(bf->familly, "SFURL")
+			        || !strcmp(bf->familly, "SFImage")
+			   ) {
 				char szName[500];
 				strcpy(szName, bf->familly);
 				strlwr(szName);
@@ -878,8 +878,8 @@
 			else if (!strcmp(bf->familly, "SFCommandBuffer")) {
 				fprintf(f, "\tgf_sg_sfcommand_del(p->%s);\n", bf->name);
 			}
-			else if (strstr(bf->familly, "Node")) {		
-				//this is a POINTER to a node 
+			else if (strstr(bf->familly, "Node")) {
+				//this is a POINTER to a node
 				if (strstr(bf->familly, "SF")) {
 					fprintf(f, "\tgf_node_unregister((GF_Node *) p->%s, (GF_Node *) p);\t\n", bf->name);
 				} else {
@@ -913,9 +913,9 @@
 				fprintf(f, "\tgf_sg_vrml_parent_setup((GF_Node *) p);\n");
 				break;
 			}
-			else if ( strstr(bf->familly, "Node") && strncmp(bf->type, "event", 5) ) {		
+			else if ( strstr(bf->familly, "Node") && strncmp(bf->type, "event", 5) ) {
 #if 0
-				//this is a POINTER to a node 
+				//this is a POINTER to a node
 				if (strstr(bf->familly, "MF")) {
 					//this is a POINTER to a chain
 					fprintf(f, "\tp->%s = gf_list_new();\t\n", bf->name);
@@ -931,15 +931,15 @@
 		//check if we have a child node
 		for (i=0; i<gf_list_count(n->Fields); i++) {
 			bf = gf_list_get(n->Fields, i);
-			if ( !strcmp(bf->name, "children") || 
-					( !strstr(bf->type, "event") && strstr(bf->familly, "MF") && strstr(bf->familly, "Node")) ) {
+			if ( !strcmp(bf->name, "children") ||
+			        ( !strstr(bf->type, "event") && strstr(bf->familly, "MF") && strstr(bf->familly, "Node")) ) {
 				sprintf(n->Child_NDT_Name, "NDT_SF%s", bf->familly+2);
 				break;
 			}
 		}
 
 		fprintf(f, "\n\t/*default field values*/\n");
-		
+
 		for (i=0; i<gf_list_count(n->Fields); i++) {
 			bf = gf_list_get(n->Fields, i);
 
@@ -952,14 +952,14 @@
 			//no default on nodes
 			if (strstr(bf->familly, "Node")) continue;
 			//extract default falue
-			
+
 			//
 			//		SF Fields
 			//
-			
+
 			//SFBool
 			if (!strcmp(bf->familly, "SFBool")) {
-				if (!strcmp(bf->def, "1") || !strcmp(bf->def, "TRUE")) 
+				if (!strcmp(bf->def, "1") || !strcmp(bf->def, "TRUE"))
 					fprintf(f, "\tp->%s = 1;\n", bf->name);
 			}
 			//SFFloat
@@ -1040,7 +1040,7 @@
 				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
 			}
-		
+
 			//
 			//		MF Fields
 			//
@@ -1365,7 +1365,7 @@
 		if (sLine[0] == '\n') continue;
 
 		CurrentLine = sLine;
-		
+
 		//parse the line till end of line
 		while (GetNextToken(token, " \t")) {
 
@@ -1424,7 +1424,7 @@
 				}
 				f = BlankField();
 				gf_list_add(n->Fields, f);
-				
+
 				//get the field type
 				strcpy(f->type, token);
 				GetNextToken(f->familly, " \t");
@@ -1553,7 +1553,7 @@
 		//skip comment and empty lines
 		if (sLine[0] == '#') continue;
 		if (sLine[0] == '\n') continue;
-		if (strstr(sLine, "Proximity")) 
+		if (strstr(sLine, "Proximity"))
 			found = 0;
 		found = 1;
 		while (found) {
@@ -1620,25 +1620,25 @@
 	char szStr[100];
 	nb_ndt = gf_list_count(NDTs);
 	nb_nodes = gf_list_count(nodes);
-	for (i=0; i<nbVersion;i++) {
+	for (i=0; i<nbVersion; i++) {
 		char szFile[100];
 		FILE *f;
 		sprintf(szFile, "NdtListV%d.html", i+1);
 		f = fopen(szFile, "wt");
 
 		fprintf(f, "<html>\n"\
-"<head>\n"\
-"<meta name=\"Author\" content=\"Jean Le Feuvre - GPAC %s\">\n"\
-"<title>NdtListV%d.html</title>\n"\
-"</head>\n"\
-"<body>\n"\
-"<title>Node Coding Tables for BIFS Version %d group</title>\n"
-		,GPAC_FULL_VERSION, i+1, i+1);
+		        "<head>\n"\
+		        "<meta name=\"Author\" content=\"Jean Le Feuvre - GPAC %s\">\n"\
+		        "<title>NdtListV%d.html</title>\n"\
+		        "</head>\n"\
+		        "<body>\n"\
+		        "<title>Node Coding Tables for BIFS Version %d group</title>\n"
+		        ,GPAC_FULL_VERSION, i+1, i+1);
 
 		for (j=0; j<nb_ndt; j++) {
 			u32 nb_in_ndt = 0;
 			char *ndt = gf_list_get(NDTs, j);
-			for (k=0;k<nb_nodes;k++) {
+			for (k=0; k<nb_nodes; k++) {
 				BNode *n = gf_list_get(nodes, k);
 				if (n->version != i+1) continue;
 				if (!IsNodeInTable(n, ndt)) continue;
@@ -1648,22 +1648,22 @@
 			if (!nb_in_ndt) continue;
 
 			fprintf(f, "<BR><a name=\"%s\">\n"\
-"<TABLE BORDER COLS=\"10\" CELLSPACING=\"0\" WIDTH=\"100%%\">\n"\
-"<TD COLSPAN=\"2\" width=\"200\"><B>%s</B></TD>\n"\
-"<TD COLSPAN=\"4\"><B>%u nodes</B></TD>\n", ndt, ndt, nb_in_ndt);
+			        "<TABLE BORDER COLS=\"10\" CELLSPACING=\"0\" WIDTH=\"100%%\">\n"\
+			        "<TD COLSPAN=\"2\" width=\"200\"><B>%s</B></TD>\n"\
+			        "<TD COLSPAN=\"4\"><B>%u nodes</B></TD>\n", ndt, ndt, nb_in_ndt);
 
 			nb_bits = GetBitsCount(nb_in_ndt);
 			fprintf(f, "<TR><TD>reserved</TD><TD><P align=CENTER>%s</TD><TD><P align=RIGHT>&nbsp;</TD><TD><P align=RIGHT>&nbsp;</TD><TD><P align=RIGHT>&nbsp;</TD><TD><P align=RIGHT>&nbsp;</TD></TR>\n", format_bit_string(szStr, 0, nb_bits));
 
 			idx = 1;
-			for (k=0;k<nb_nodes;k++) {
+			for (k=0; k<nb_nodes; k++) {
 				BNode *n = gf_list_get(nodes, k);
 				if (n->version != i+1) continue;
 				if (!IsNodeInTable(n, ndt)) continue;
 
 
 				n->hasDef = n->hasIn = n->hasOut = n->hasDyn = 0;
-				for (l=0;l<gf_list_count(n->Fields); l++) {
+				for (l=0; l<gf_list_count(n->Fields); l++) {
 					BField *bf = gf_list_get(n->Fields, l);
 					if (!strcmp(bf->type, "field") || !strcmp(bf->type, "exposedField")) {
 						n->hasDef += 1;
@@ -1735,7 +1735,7 @@
 
 		//all nodes are in the same list but we keep version info
 		ParseTemplateFile(nodes, BNodes, NDTs, nbVersion);
-		
+
 
 		//special case for viewport: it is present in V1 but empty
 		if (nbVersion==1) CheckInTable("SFViewportNode", NDTs);
@@ -1769,7 +1769,7 @@
 
 	fprintf(ndt_c, "\n\n#include <gpac/internal/bifs_tables.h>\n");
 	fprintf(ndt_c, "\n\n#ifndef GPAC_DISABLE_BIFS\n");
-	
+
 	//prepare the encoding file
 	fprintf(ndt_h, "\n\nu32 ALL_GetNodeType(const u32 *table, const u32 count, u32 NodeTag, u32 Version);\n\n");
 	fprintf(ndt_c, "\n\nu32 ALL_GetNodeType(const u32 *table, const u32 count, u32 NodeTag, u32 Version)\n{\n\tu32 i = 0;");
@@ -1803,11 +1803,11 @@
 	for (i=0; i<nbVersion; i++) {
 		fprintf(ndt_c, "\tcase GF_BIFS_V%d:\n\t\treturn NDT_V%d_GetNodeType(NDT_Tag, NodeTag);\n", i+1, i+1);
 	}
-	fprintf(ndt_c, "\tdefault:\n\t\treturn 0;\n\t}\n}");	
+	fprintf(ndt_c, "\tdefault:\n\t\treturn 0;\n\t}\n}");
 
 	fprintf(ndt_h, "\nu32 NDT_GetChildTable(u32 NodeTag);\n");
 	fprintf(ndt_h, "\n\n");
-	
+
 	//NDT checking
 	fprintf(ndt_c, "u32 GetChildrenNDT(GF_Node *node)\n{\n\tif (!node) return 0;\n\tswitch (gf_node_get_tag(node)) {\n");
 	for (i=0; i<gf_list_count(BNodes); i++) {
@@ -1827,7 +1827,7 @@
 	fprintf(ndt_h, "\n\n#endif /*GPAC_DISABLE_BIFS*/\n\n");
 	EndFile(ndt_h, "NDT", 0);
 	EndFile(ndt_c, "", 1);
-	
+
 
 exit:
 	//free NDTs

gpac-0.5.0.svn5178.tar.bz2/applications/generators/SVG/html.c -> gpac-0.5.1.svn5491.tar.xz/applications/generators/SVG/html.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012 
+ *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph Generator sub-project
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -47,7 +47,7 @@
 
 	fprintf(f, "</head>\n");
 	fprintf(f, "<body>\n");
-    fprintf(f, "<h1 align='center'>Status of the SVG implementation in GPAC</h1>\n");
+	fprintf(f, "<h1 align='center'>Status of the SVG implementation in GPAC</h1>\n");
 	return f;
 }
 
@@ -66,7 +66,7 @@
 	FILE *f;
 	f = BeginHtml();
 
-	
+
 	fprintf(f, "<h2>Legend</h2>\n");
 	fprintf(f, "<table>\n");
 	fprintf(f, "<thead>\n");
@@ -111,7 +111,7 @@
 		fprintf(f, "<td class='element-observation'>&nbsp;</td>\n");
 		fprintf(f, "<td class='element-example'>&nbsp;</td>\n");
 		fprintf(f, "<td class='element-bug'>&nbsp;</td>\n");
-		fprintf(f, "</tr>\n");		
+		fprintf(f, "</tr>\n");
 	}
 	fprintf(f, "</tbody>\n");
 	fprintf(f, "</table>\n");
@@ -140,7 +140,7 @@
 			fprintf(f, "<td class='attribute-example'>%d - &nbsp;</td>\n",++nbExamples);
 			fprintf(f, "<td class='attribute-bug'>&nbsp;</td>\n");
 			fprintf(f, "</tr>\n");
-		}		
+		}
 		fprintf(f, "</tbody>\n");
 		fprintf(f, "</table>\n");
 	}

gpac-0.5.0.svn5178.tar.bz2/applications/generators/SVG/laser.c -> gpac-0.5.1.svn5491.tar.xz/applications/generators/SVG/laser.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012 
+ *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph Generator sub-project
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,17 +32,17 @@
 
 
 static char *laser_attribute_rare_type_list[] = {
-	"_class", "audio_level", "color", "color_rendering", "display", "display_align", "fill_opacity", 
-	"fill_rule",  "image_rendering", "line_increment", "pointer_events", "shape_rendering", "solid_color", 
-	"solid_opacity", "stop_color", "stop_opacity", "stroke_dasharray", "stroke_dashoffset", "stroke_linecap", 
-	"stroke_linejoin", "stroke_miterlimit",	"stroke_opacity", "stroke_width", "text_anchor", "text_rendering", 
-	"viewport_fill", "viewport_fill_opacity", "vector_effect", "visibility", "requiredExtensions", 
-	"requiredFeatures", "requiredFormats", "systemLanguage", "xml_base", "xml_lang", "xml_space", 
-	"nav_next", "nav_up", "nav_up_left", "nav_up_right", "nav_prev", "nav_down", "nav_down_left", 
-	"nav_down_right", "nav_left", "focusable", "nav_right", "transform","text_decoration", 
+	"_class", "audio_level", "color", "color_rendering", "display", "display_align", "fill_opacity",
+	"fill_rule",  "image_rendering", "line_increment", "pointer_events", "shape_rendering", "solid_color",
+	"solid_opacity", "stop_color", "stop_opacity", "stroke_dasharray", "stroke_dashoffset", "stroke_linecap",
+	"stroke_linejoin", "stroke_miterlimit",	"stroke_opacity", "stroke_width", "text_anchor", "text_rendering",
+	"viewport_fill", "viewport_fill_opacity", "vector_effect", "visibility", "requiredExtensions",
+	"requiredFeatures", "requiredFormats", "systemLanguage", "xml_base", "xml_lang", "xml_space",
+	"nav_next", "nav_up", "nav_up_left", "nav_up_right", "nav_prev", "nav_down", "nav_down_left",
+	"nav_down_right", "nav_left", "focusable", "nav_right", "transform","text_decoration",
 	"extension", /*LASER EXTENSIONS SVG*/
 
-	"font_variant", "font_family", "font_size", "font_style", "font_weight", "xlink_title", "xlink_type", 
+	"font_variant", "font_family", "font_size", "font_style", "font_weight", "xlink_title", "xlink_type",
 	"xlink_role", "xlink_arcrole", "xlink_actuate", "xlink_show", "end", "max", "min",
 	NULL
 };
@@ -99,7 +99,7 @@
 		if (elt->has_media_properties) generateGenericAttrib(output, elt, 2);
 		if (elt->has_properties) generateGenericAttrib(output, elt, 1);
 		if (elt->has_opacity_properties) generateGenericAttrib(output, elt, 3);
-		if (elt->has_focus) generateGenericAttrib(output, elt, 4); 
+		if (elt->has_focus) generateGenericAttrib(output, elt, 4);
 		if (elt->has_xlink) generateGenericAttrib(output, elt, 5);
 		if (elt->has_timing) generateGenericAttrib(output, elt, 6);
 		if (elt->has_sync) generateGenericAttrib(output, elt, 7);
@@ -119,12 +119,12 @@
 			SVGGenAttribute *att = gf_list_get(elt->attributes, j);
 			s32 type = get_lsr_att_name_type(att->svg_name);
 			if (special_cases==1) {
-				if (!strcmp(att->svg_name, "width")) 
+				if (!strcmp(att->svg_name, "width"))
 					type = 95;
-				else if (!strcmp(att->svg_name, "height")) 
+				else if (!strcmp(att->svg_name, "height"))
 					type = 94;
 			}
-			if ((special_cases==2) && !strcmp(att->svg_name, "target")) 
+			if ((special_cases==2) && !strcmp(att->svg_name, "target"))
 				type = 0;
 			fprintf(output, ", %d", type);
 		}
@@ -149,7 +149,7 @@
 	u32 i, count, j, count2;
 
 	output = BeginFile(2);
-	
+
 	fprintf(output, "\n#include <gpac/internal/laser_dev.h>\n\n");
 	fprintf(output, "\n\ns32 gf_lsr_anim_type_from_attribute(u32 tag) {\n\tswitch(tag) {\n");
 
@@ -247,7 +247,7 @@
 		}
 		for (i=0; i<count; i++) {
 			att = gf_list_get(atts, i);
-			if (!strcmp(att->implementation_name, laser_attribute_rare_type_list[j])) 
+			if (!strcmp(att->implementation_name, laser_attribute_rare_type_list[j]))
 				break;
 			att = NULL;
 		}
@@ -262,6 +262,6 @@
 		j++;
 	}
 	fprintf(output, "\treturn 1;\n}\n\n");
-	
+
 	fclose(output);
 }
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/applications/generators/SVG/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/generators/SVG/main.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012 
+ *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph Generator sub-project
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -49,7 +49,7 @@
 	return tmp;
 }
 
-SVGGenElement *NewSVGGenElement() 
+SVGGenElement *NewSVGGenElement()
 {
 	SVGGenElement *elt;
 	GF_SAFEALLOC(elt, SVGGenElement);
@@ -146,56 +146,65 @@
 	char *tmp;
 	strcpy(implementation_name, svg_name);
 	tmp = implementation_name;
-	while ( (tmp = strchr(tmp, '.')) ) { *tmp='_'; tmp++; }
+	while ( (tmp = strchr(tmp, '.')) ) {
+		*tmp='_';
+		tmp++;
+	}
 	tmp = implementation_name;
-	while ( (tmp = strchr(tmp, '-')) ) { *tmp='_'; tmp++; }
+	while ( (tmp = strchr(tmp, '-')) ) {
+		*tmp='_';
+		tmp++;
+	}
 	tmp = implementation_name;
-	while ( (tmp = strchr(tmp, ':')) ) { *tmp='_'; tmp++; }
+	while ( (tmp = strchr(tmp, ':')) ) {
+		*tmp='_';
+		tmp++;
+	}
 }
 
-static Bool isGenericAttributesGroup(char *name) 
+static Bool isGenericAttributesGroup(char *name)
 {
 	if (!strcmp(name, "svg.Core.attr") ||
-		!strcmp(name, "svg.CorePreserve.attr") ||
-		!strcmp(name, "svg.External.attr") ||
-		!strcmp(name, "svg.Properties.attr") ||
-		!strcmp(name, "svg.Media.attr") ||
-		!strcmp(name, "svg.MediaClip.attr") ||
-		!strcmp(name, "svg.Opacity.attr") ||
-		!strcmp(name, "svg.FocusHighlight.attr") || 
-		!strcmp(name, "svg.Focus.attr") ||
-		!strcmp(name, "svg.AnimateCommon.attr") ||
-		!strcmp(name, "svg.XLinkEmbed.attr") ||
-		!strcmp(name, "svg.XLinkRequired.attr") ||
-		!strcmp(name, "svg.XLinkReplace.attr") ||
+	        !strcmp(name, "svg.CorePreserve.attr") ||
+	        !strcmp(name, "svg.External.attr") ||
+	        !strcmp(name, "svg.Properties.attr") ||
+	        !strcmp(name, "svg.Media.attr") ||
+	        !strcmp(name, "svg.MediaClip.attr") ||
+	        !strcmp(name, "svg.Opacity.attr") ||
+	        !strcmp(name, "svg.FocusHighlight.attr") ||
+	        !strcmp(name, "svg.Focus.attr") ||
+	        !strcmp(name, "svg.AnimateCommon.attr") ||
+	        !strcmp(name, "svg.XLinkEmbed.attr") ||
+	        !strcmp(name, "svg.XLinkRequired.attr") ||
+	        !strcmp(name, "svg.XLinkReplace.attr") ||
 //		!strcmp(name, "svg.ContentType.attr") ||
-		!strcmp(name, "svg.AnimateTiming.attr") ||
-		!strcmp(name, "svg.AnimateTimingNoMinMax.attr") ||
-		!strcmp(name, "svg.AnimateBegin.attr") || 
-		!strcmp(name, "svg.AnimateTimingNoFillNoMinMax.attr") ||
-		!strcmp(name, "svg.AnimateSync.attr") ||
-		!strcmp(name, "svg.AnimateSyncDefault.attr") ||
-		!strcmp(name, "svg.AnimateAttributeCommon.attr") ||
-		!strcmp(name, "svg.AnimateToCommon.attr") ||
-		!strcmp(name, "svg.AnimateValueCommon.attr") ||
-		!strcmp(name, "svg.AnimateAdditionCommon.attr") ||
-		!strcmp(name, "svg.AnimateTypeCommon.attr") ||
-		!strcmp(name, "svg.Conditional.attr") ||
+	        !strcmp(name, "svg.AnimateTiming.attr") ||
+	        !strcmp(name, "svg.AnimateTimingNoMinMax.attr") ||
+	        !strcmp(name, "svg.AnimateBegin.attr") ||
+	        !strcmp(name, "svg.AnimateTimingNoFillNoMinMax.attr") ||
+	        !strcmp(name, "svg.AnimateSync.attr") ||
+	        !strcmp(name, "svg.AnimateSyncDefault.attr") ||
+	        !strcmp(name, "svg.AnimateAttributeCommon.attr") ||
+	        !strcmp(name, "svg.AnimateToCommon.attr") ||
+	        !strcmp(name, "svg.AnimateValueCommon.attr") ||
+	        !strcmp(name, "svg.AnimateAdditionCommon.attr") ||
+	        !strcmp(name, "svg.AnimateTypeCommon.attr") ||
+	        !strcmp(name, "svg.Conditional.attr") ||
 //		!strcmp(name, "svg.XY.attr") ||
-		!strcmp(name, "svg.Transform.attr")) {
+	        !strcmp(name, "svg.Transform.attr")) {
 		return 1;
 	} else {
 		return 0;
 	}
 }
 
-static Bool setGenericAttributesFlags(char *name, SVGGenElement *e) 
+static Bool setGenericAttributesFlags(char *name, SVGGenElement *e)
 {
 	Bool ret = 1;
 	if (!strcmp(name, "svg.Core.attr") ||
-		!strcmp(name, "svg.CorePreserve.attr") ||
-		!strcmp(name, "svg.External.attr")) {
-		e->has_svg_generic = 1; 
+	        !strcmp(name, "svg.CorePreserve.attr") ||
+	        !strcmp(name, "svg.External.attr")) {
+		e->has_svg_generic = 1;
 		e->has_xml_generic = 1;
 	} else if (!strcmp(name, "svg.Properties.attr")) {
 		e->has_properties = 1;
@@ -204,28 +213,28 @@
 		e->has_media_properties = 1;
 	} else if (!strcmp(name, "svg.Opacity.attr")) {
 		e->has_opacity_properties = 1;
-	} else if (!strcmp(name, "svg.FocusHighlight.attr") || 
-		       !strcmp(name, "svg.Focus.attr")) {
+	} else if (!strcmp(name, "svg.FocusHighlight.attr") ||
+	           !strcmp(name, "svg.Focus.attr")) {
 		e->has_focus = 1;
 	} else if (!strcmp(name, "svg.AnimateCommon.attr") ||
-			   !strcmp(name, "svg.XLinkEmbed.attr") ||
-			   !strcmp(name, "svg.XLinkRequired.attr") ||
-			   !strcmp(name, "svg.XLinkReplace.attr")) { //||
+	           !strcmp(name, "svg.XLinkEmbed.attr") ||
+	           !strcmp(name, "svg.XLinkRequired.attr") ||
+	           !strcmp(name, "svg.XLinkReplace.attr")) { //||
 //			   !strcmp(name, "svg.ContentType.attr")) {
 		e->has_xlink = 1;
 	} else if (!strcmp(name, "svg.AnimateTiming.attr") ||
-			   !strcmp(name, "svg.AnimateTimingNoMinMax.attr") ||
-			   !strcmp(name, "svg.AnimateBegin.attr") || 
-			   !strcmp(name, "svg.AnimateTimingNoFillNoMinMax.attr")) {
+	           !strcmp(name, "svg.AnimateTimingNoMinMax.attr") ||
+	           !strcmp(name, "svg.AnimateBegin.attr") ||
+	           !strcmp(name, "svg.AnimateTimingNoFillNoMinMax.attr")) {
 		e->has_timing = 1;
 	} else if (!strcmp(name, "svg.AnimateSync.attr") ||
-		       !strcmp(name, "svg.AnimateSyncDefault.attr")) {
+	           !strcmp(name, "svg.AnimateSyncDefault.attr")) {
 		e->has_sync= 1;
 	} else if (!strcmp(name, "svg.AnimateAttributeCommon.attr") ||
-			   !strcmp(name, "svg.AnimateToCommon.attr") ||
-			   !strcmp(name, "svg.AnimateValueCommon.attr") ||
-			   !strcmp(name, "svg.AnimateAdditionCommon.attr") ||
-			   !strcmp(name, "svg.AnimateTypeCommon.attr")) {
+	           !strcmp(name, "svg.AnimateToCommon.attr") ||
+	           !strcmp(name, "svg.AnimateValueCommon.attr") ||
+	           !strcmp(name, "svg.AnimateAdditionCommon.attr") ||
+	           !strcmp(name, "svg.AnimateTypeCommon.attr")) {
 		e->has_animation = 1;
 	} else if (!strcmp(name, "svg.Conditional.attr")) {
 		e->has_conditional = 1;
@@ -241,16 +250,16 @@
 
 static void flattenAttributeGroup(SVGGenAttrGrp attgrp, SVGGenElement *e, Bool all);
 
-static void flattenAttributeGroups(GF_List *attrgrps, SVGGenElement *e, Bool all) 
+static void flattenAttributeGroups(GF_List *attrgrps, SVGGenElement *e, Bool all)
 {
 	u32 i;
 	for (i = 0; i < gf_list_count(attrgrps); i ++) {
 		SVGGenAttrGrp *ag = gf_list_get(attrgrps, i);
 		flattenAttributeGroup(*ag, e, all);
-	} 
+	}
 }
 
-static void flattenAttributeGroup(SVGGenAttrGrp attgrp, SVGGenElement *e, Bool all) 
+static void flattenAttributeGroup(SVGGenAttrGrp attgrp, SVGGenElement *e, Bool all)
 {
 	u32 i;
 
@@ -263,15 +272,15 @@
 	} else {
 		flattenAttributeGroups(attgrp.attrgrps, e, all);
 		for (i = 0; i < gf_list_count(attgrp.attrs); i++) {
-			if (all) 
+			if (all)
 				gf_list_add(e->generic_attributes, gf_list_get(attgrp.attrs, i));
-			else 
+			else
 				gf_list_add(e->attributes, gf_list_get(attgrp.attrs, i));
 		}
 	}
 }
 
-SVGGenAttribute *findAttribute(SVGGenElement *e, char *name) 
+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name)
 {
 	u32 i;
 	for (i = 0; i < gf_list_count(e->attributes); i++) {
@@ -291,74 +300,74 @@
 	for (i = 0; i < gf_list_count(ag->attrgrps); i ++) {
 		SVGGenAttrGrp *agtmp = gf_list_get(ag->attrgrps, i);
 		ret += countAttributesAllInGroup(agtmp);
-	} 
+	}
 	ret += gf_list_count(ag->attrs);
 	return ret;
 }
 
 /* XML related functions */
-xmlNodeSetPtr findNodes( xmlXPathContextPtr ctxt, xmlChar * path ) 
+xmlNodeSetPtr findNodes( xmlXPathContextPtr ctxt, xmlChar * path )
 {
-    xmlXPathObjectPtr res = NULL;
-  
-    if ( ctxt->node != NULL && path != NULL ) {
-        xmlXPathCompExprPtr comp;
-
-        xmlDocPtr tdoc = NULL;
-        xmlNodePtr froot = ctxt->node;
-
-        comp = xmlXPathCompile( path );
-        if ( comp == NULL ) {
-            return NULL;
-        }
-        
-        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
-               scripters. thus we need to create a temporary document
-               to make libxml2 do it's job correctly.
-             */
-            tdoc = xmlNewDoc( NULL );
-
-            /* find refnode's root node */
-            while ( froot != NULL ) {
-                if ( froot->parent == NULL ) {
-                    break;
-                }
-                froot = froot->parent;
-            }
-            xmlAddChild((xmlNodePtr)tdoc, froot);
-
-            ctxt->node->doc = tdoc;
-        }
-       
-        res = xmlXPathCompiledEval(comp, ctxt);
-
-        xmlXPathFreeCompExpr(comp);
-
-        if ( tdoc != NULL ) {
-            /* after looking through a fragment, we need to drop the
-               fake document again */
-	    xmlSetTreeDoc(froot,NULL);
-            froot->doc = NULL;
-            tdoc->children = NULL;
-            tdoc->last     = NULL;
-            froot->parent  = NULL;
-            ctxt->node->doc = NULL;
-
-            xmlFreeDoc( tdoc );
-        }
-    }
+	xmlXPathObjectPtr res = NULL;
+
+	if ( ctxt->node != NULL && path != NULL ) {
+		xmlXPathCompExprPtr comp;
+
+		xmlDocPtr tdoc = NULL;
+		xmlNodePtr froot = ctxt->node;
+
+		comp = xmlXPathCompile( path );
+		if ( comp == NULL ) {
+			return NULL;
+		}
+
+		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
+			   scripters. thus we need to create a temporary document
+			   to make libxml2 do it's job correctly.
+			 */
+			tdoc = xmlNewDoc( NULL );
+
+			/* find refnode's root node */
+			while ( froot != NULL ) {
+				if ( froot->parent == NULL ) {
+					break;
+				}
+				froot = froot->parent;
+			}
+			xmlAddChild((xmlNodePtr)tdoc, froot);
+
+			ctxt->node->doc = tdoc;
+		}
+
+		res = xmlXPathCompiledEval(comp, ctxt);
+
+		xmlXPathFreeCompExpr(comp);
+
+		if ( tdoc != NULL ) {
+			/* after looking through a fragment, we need to drop the
+			   fake document again */
+			xmlSetTreeDoc(froot,NULL);
+			froot->doc = NULL;
+			tdoc->children = NULL;
+			tdoc->last     = NULL;
+			froot->parent  = NULL;
+			ctxt->node->doc = NULL;
+
+			xmlFreeDoc( tdoc );
+		}
+	}
 	if (res && res->type == XPATH_NODESET)
 		return res->nodesetval;
-    else 
+	else
 		return NULL;
 }
 
 
 /* definition of GPAC groups of SVG attributes */
 
-void setAttributeType(SVGGenAttribute *att) 
+void setAttributeType(SVGGenAttribute *att)
 {
 	if (!att->svg_type) { /* if the type is not given in the RNG, we explicitely set it */
 		if (!strcmp(att->svg_name, "textContent")) {
@@ -398,27 +407,27 @@
 			strcpy(att->impl_type, "SMIL_KeySplines");
 		} else if (!strcmp(att->svg_name, "keyPoints")) {
 			strcpy(att->impl_type, "SMIL_KeyPoints");
-		} else if (!strcmp(att->svg_name, "from") || 
-				   !strcmp(att->svg_name, "to") || 
-				   !strcmp(att->svg_name, "by")) {
+		} else if (!strcmp(att->svg_name, "from") ||
+		           !strcmp(att->svg_name, "to") ||
+		           !strcmp(att->svg_name, "by")) {
 			strcpy(att->impl_type, "SMIL_AnimateValue");
 		} else if (!strcmp(att->svg_name, "additive")) {
 			strcpy(att->impl_type, "SMIL_Additive");
 		} else if (!strcmp(att->svg_name, "accumulate")) {
 			strcpy(att->impl_type, "SMIL_Accumulate");
 		} else if (!strcmp(att->svg_name, "begin") ||
-				   !strcmp(att->svg_name, "end") 
-				  ) {
+		           !strcmp(att->svg_name, "end")
+		          ) {
 			strcpy(att->impl_type, "SMIL_Times");
 		} else if (!strcmp(att->svg_name, "clipBegin") ||
-				   !strcmp(att->svg_name, "clipEnd")
-				  ) {
+		           !strcmp(att->svg_name, "clipEnd")
+		          ) {
 			strcpy(att->impl_type, "SVG_Clock");
 		} else if (!strcmp(att->svg_name, "min") ||
-				   !strcmp(att->svg_name, "max") ||
-				   !strcmp(att->svg_name, "dur") ||
-				   !strcmp(att->svg_name, "repeatDur")
-				  ) {
+		           !strcmp(att->svg_name, "max") ||
+		           !strcmp(att->svg_name, "dur") ||
+		           !strcmp(att->svg_name, "repeatDur")
+		          ) {
 			strcpy(att->impl_type, "SMIL_Duration");
 		} else if (!strcmp(att->svg_name, "repeat")) {
 			strcpy(att->impl_type, "SMIL_Repeat");
@@ -506,8 +515,8 @@
 			strcpy(att->impl_type, "SVG_Boolean");
 		} else if (!strcmp(att->svg_name, "choice")) {
 			strcpy(att->impl_type, "LASeR_Choice");
-		} else if (!strcmp(att->svg_name, "size") || 
-				   !strcmp(att->svg_name, "delta")) {
+		} else if (!strcmp(att->svg_name, "size") ||
+		           !strcmp(att->svg_name, "delta")) {
 			strcpy(att->impl_type, "LASeR_Size");
 		} else if (!strcmp(att->svg_name, "syncReference")) {
 			strcpy(att->impl_type, "XMLRI");
@@ -541,20 +550,26 @@
 			char *tmp;
 			sprintf(att->impl_type, "SVG_%s", att->svg_type);
 			tmp = att->impl_type;
-			while ( (tmp = strstr(tmp, "-")) ) { *tmp='_'; tmp++; }
+			while ( (tmp = strstr(tmp, "-")) ) {
+				*tmp='_';
+				tmp++;
+			}
 			tmp = att->impl_type;
-			while ( (tmp = strstr(tmp, ".")) ) { *tmp='_'; tmp++; }
+			while ( (tmp = strstr(tmp, ".")) ) {
+				*tmp='_';
+				tmp++;
+			}
 			tmp = att->impl_type;;
 			if ( (tmp = strstr(tmp, "datatype")) ) {
 				tmp--;
 				*tmp = 0;
-			} 
+			}
 		}
 	}
 }
 
-void getAttributeType(xmlDocPtr doc, xmlXPathContextPtr xpathCtx, 
-					  xmlNodePtr attributeNode, SVGGenAttribute *a) 
+void getAttributeType(xmlDocPtr doc, xmlXPathContextPtr xpathCtx,
+                      xmlNodePtr attributeNode, SVGGenAttribute *a)
 {
 
 	xmlNodeSetPtr refNodes;
@@ -570,8 +585,8 @@
 	}
 }
 
-void getRealAttributes(xmlDocPtr doc, xmlXPathContextPtr xpathCtx, xmlNodePtr newCtxNode, 
-					   GF_List *attributes)
+void getRealAttributes(xmlDocPtr doc, xmlXPathContextPtr xpathCtx, xmlNodePtr newCtxNode,
+                       GF_List *attributes)
 {
 	xmlNodeSetPtr attributeNodes;
 	int k;
@@ -589,7 +604,7 @@
 			svgNameToImplementationName(a->svg_name, a->implementation_name);
 			getAttributeType(doc, xpathCtx, attributeNode, a);
 			setAttributeType(a);
-			for (j=0;j<gf_list_count(attributes); j++) {
+			for (j=0; j<gf_list_count(attributes); j++) {
 				SVGGenAttribute *ta = gf_list_get(attributes, j);
 				if (xmlStrEqual(ta->svg_name, a->svg_name)) {
 					already_exists = 1;
@@ -606,7 +621,7 @@
 	}
 }
 
-SVGGenAttrGrp *getOneGlobalAttrGrp(xmlDocPtr doc, xmlXPathContextPtr xpathCtx, xmlChar *name) 
+SVGGenAttrGrp *getOneGlobalAttrGrp(xmlDocPtr doc, xmlXPathContextPtr xpathCtx, xmlChar *name)
 {
 	SVGGenAttrGrp *attgrp = NULL;
 	xmlNodeSetPtr attrGrpDefNodes;
@@ -631,7 +646,7 @@
 		fprintf(stdout, "Warning: found 0 non-empty or allowed definition for the Group of Attributes: %s\n", name);
 		return NULL;
 	}
-	attgrp = NewSVGGenAttrGrp();				
+	attgrp = NewSVGGenAttrGrp();
 	attgrp->name = gf_strdup(name);
 	svgNameToImplementationName(attgrp->name, attgrp->imp_name);
 	gf_list_add(globalAttrGrp, attgrp);
@@ -659,7 +674,7 @@
 	return attgrp;
 }
 
-void getAllGlobalAttrGrp(xmlDocPtr doc, xmlXPathContextPtr xpathCtx) 
+void getAllGlobalAttrGrp(xmlDocPtr doc, xmlXPathContextPtr xpathCtx)
 {
 	xmlNodeSetPtr elementNodes = findNodes(xpathCtx, "//rng:define");
 	int k;
@@ -690,9 +705,9 @@
 			SVGGenElement *e = NewSVGGenElement();
 			e->svg_name = xmlStrdup(xmlGetProp(elementNode, "name"));
 			//fprintf(stdout, "\n\tElement %s\n", e->svg_name);
-			
+
 			svgNameToImplementationName(e->svg_name, e->implementation_name);
-		
+
 			/* getting the <define name="element.AT"/> */
 			expr = xmlStrdup("//rng:define[@name=\"");
 			if (!xmlStrcmp(e->svg_name, "polygon") || !xmlStrcmp(e->svg_name, "polyline")) {
@@ -710,7 +725,7 @@
 				for (j = 0; j <refNodes->nodeNr; j++) {
 					xmlNodePtr refNode = refNodes->nodeTab[j];
 					char *name = xmlGetProp(refNode, "name");
-					for (i = 0; i < gf_list_count(globalAttrGrp); i++) {						
+					for (i = 0; i < gf_list_count(globalAttrGrp); i++) {
 						SVGGenAttrGrp *a = gf_list_get(globalAttrGrp, i);
 						if (!strcmp(a->name, name)) {
 							if (isGenericAttributesGroup(a->name)) {
@@ -728,11 +743,11 @@
 				getRealAttributes(doc, xpathCtx, ATNodes->nodeTab[0], e->attributes);
 			}
 
-			/* checking if this element is already present in the list of possible elements 
+			/* checking if this element is already present in the list of possible elements
 			   and if not, adding it */
 			{
 				Bool found = 0;
-				for (i=0;i<gf_list_count(elements); i++) {
+				for (i=0; i<gf_list_count(elements); i++) {
 					SVGGenElement *etmp = gf_list_get(elements, i);
 					if (!strcmp(etmp->svg_name, e->svg_name)) {
 						found = 1;
@@ -757,21 +772,21 @@
 #ifdef LOCAL_SVG_NODES
 		sprintf(sPath, "nodes_svg.h", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
 #else
-		if (generation_mode == 1) 
+		if (generation_mode == 1)
 			sprintf(sPath, "..%c..%c..%c..%cinclude%cgpac%cnodes_svg_sa.h", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		else if (generation_mode == 2) 
+		else if (generation_mode == 2)
 			sprintf(sPath, "..%c..%c..%c..%cinclude%cgpac%cnodes_svg_sani.h", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
 		else if (generation_mode == 3)
 			sprintf(sPath, "..%c..%c..%c..%cinclude%cgpac%cnodes_svg_da.h", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		
+
 #endif
 	} else if (type==1) {
 #ifdef LOCAL_SVG_NODES
 		sprintf(sPath, "svg_nodes.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
 #else
-		if (generation_mode == 1) 
+		if (generation_mode == 1)
 			sprintf(sPath, "..%c..%c..%c..%csrc%cscenegraph%csvg_nodes_sa.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		else if (generation_mode == 2) 
+		else if (generation_mode == 2)
 			sprintf(sPath, "..%c..%c..%c..%csrc%cscenegraph%csvg_nodes_sani.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
 		else if (generation_mode == 3)
 			sprintf(sPath, "..%c..%c..%c..%csrc%cscenegraph%csvg_nodes_da.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
@@ -780,16 +795,16 @@
 #ifdef LOCAL_SVG_NODES
 		sprintf(sPath, "lsr_tables.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
 #else
-		if (generation_mode == 1) 
+		if (generation_mode == 1)
 			sprintf(sPath, "..%c..%c..%c..%csrc%claser%clsr_tables_sa.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		else if (generation_mode == 2) 
+		else if (generation_mode == 2)
 			sprintf(sPath, "..%c..%c..%c..%csrc%claser%clsr_tables_sani.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		else if (generation_mode == 3) 
+		else if (generation_mode == 3)
 			sprintf(sPath, "..%c..%c..%c..%csrc%claser%clsr_tables.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
 
 #endif
 	}
-	
+
 	f = fopen(sPath, "wt");
 	fprintf(f, "%s\n", COPYRIGHT);
 
@@ -828,17 +843,17 @@
 	fclose(f);
 }
 
-void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine) 
+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine)
 {
 	u32 i;
 	for (i = 0; i<gf_list_count(attributes); i++) {
 		SVGGenAttribute *att = (SVGGenAttribute *)gf_list_get(attributes, i);
-		if (inDefine) 
-			if (i == gf_list_count(attributes) -1) 
+		if (inDefine)
+			if (i == gf_list_count(attributes) -1)
 				fprintf(output, "\t%s %s;\n", att->impl_type, att->implementation_name);
-			else 
+			else
 				fprintf(output, "\t%s %s; \\\n", att->impl_type, att->implementation_name);
-		else 
+		else
 			fprintf(output, "\t%s %s;\n", att->impl_type, att->implementation_name);
 	}
 }
@@ -864,14 +879,14 @@
 {
 	int k;
 	xmlNodeSetPtr nodes;
-	xmlXPathObjectPtr xpathObj; 
-
-    /* Get all the RNG elements */
-    xpathObj = xmlXPathEvalExpression("//rng:include", xpathCtx);
-    if(xpathObj == NULL || xpathObj->type != XPATH_NODESET) return;
-	
-	nodes = xpathObj->nodesetval;	
-		
+	xmlXPathObjectPtr xpathObj;
+
+	/* Get all the RNG elements */
+	xpathObj = xmlXPathEvalExpression("//rng:include", xpathCtx);
+	if(xpathObj == NULL || xpathObj->type != XPATH_NODESET) return;
+
+	nodes = xpathObj->nodesetval;
+
 	for (k = 0; k < nodes->nodeNr; k++)	{
 		xmlNodePtr node = nodes->nodeTab[k];
 		if (node->type == XML_ELEMENT_NODE) {
@@ -889,31 +904,31 @@
 int main(int argc, char **argv)
 {
 	xmlDocPtr doc = NULL;
-	xmlXPathContextPtr xpathCtx = NULL; 
+	xmlXPathContextPtr xpathCtx = NULL;
 	GF_List *svg_elements = NULL;
 
-    xmlInitParser();
+	xmlInitParser();
 	LIBXML_TEST_VERSION
 
 	doc = xmlParseFile(argv[1]);
-    if (!doc) {
-        printf("error: could not parse file %s\n", argv[1]);
+	if (!doc) {
+		printf("error: could not parse file %s\n", argv[1]);
 		return -1;
-    }
+	}
 
 	xpathCtx = xmlXPathNewContext(doc);
-    if(xpathCtx == NULL) {
-        fprintf(stderr,"Error: unable to create new XPath context\n");
-        xmlFreeDoc(doc); 
-        return(-1);
-    }
+	if(xpathCtx == NULL) {
+		fprintf(stderr,"Error: unable to create new XPath context\n");
+		xmlFreeDoc(doc);
+		return(-1);
+	}
 	xmlXPathRegisterNs(xpathCtx, RNG_PREFIX, RNG_NS);
 	xmlXPathRegisterNs(xpathCtx, RNGA_PREFIX, RNGA_NS);
 	xmlXPathRegisterNs(xpathCtx, SVGA_PREFIX, SVGA_NS);
 
 	replaceIncludes(doc, xpathCtx);
 	xmlSaveFile("completerng_props.xml", doc);
-	
+
 	globalAttrGrp = gf_list_new();
 	getAllGlobalAttrGrp(doc, xpathCtx);
 
@@ -928,9 +943,9 @@
 		if (generation_mode == 3) generateSVGCode_V3(svg_elements);
 	}
 
-	xmlXPathFreeContext(xpathCtx); 
-	//xmlFreeDoc(doc); 
-	
+	xmlXPathFreeContext(xpathCtx);
+	//xmlFreeDoc(doc);
+
 	xmlCleanupParser();
 	return 0;
 }

gpac-0.5.0.svn5178.tar.bz2/applications/generators/SVG/svggen.h -> gpac-0.5.1.svn5491.tar.xz/applications/generators/SVG/svggen.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012 
+ *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph Generator sub-project
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #ifndef _SVGGEN_H_
@@ -39,9 +39,9 @@
 /* if defined generates .c/.h directly in the appropriate GPAC source folders */
 #undef LOCAL_SVG_NODES
 
-/* 
+/*
    Modes for generating SVG code
-   - 1 means static allocation of attributes (including properties, use Tiny-1.2-NG) 
+   - 1 means static allocation of attributes (including properties, use Tiny-1.2-NG)
    - 2 means static allocation of attributes (only useful properties on nodes, use Tiny-1.2-NG-noproperties)
    - 3 means dynamic allocation of attributes (including properties)
 */
@@ -58,8 +58,8 @@
 #define COPYRIGHT "/*\n *			GPAC - Multimedia Framework C SDK\n *\n *			Authors: Cyril Concolato - Jean Le Feuvre\n *    Copyright (c) Telecom ParisTech 2000-2012 - All rights reserved\n *\n *  This file is part of GPAC / SVG Scene Graph sub-project\n *\n *  GPAC is free software; you can redistribute it and/or modify\n *  it under the terms of the GNU Lesser General Public License as published by\n *  the Free Software Foundation; either version 2, or (at your option)\n *  any later version.\n *\n *  GPAC is distributed in the hope that it will be useful,\n *  but WITHOUT ANY WARRANTY; without even the implied warranty of\n *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n *  GNU Lesser General Public License for more details.	\n *\n *  You should have received a copy of the GNU Lesser General Public\n *  License along with this library; see the file COPYING.  If not, write to\n *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.\n *\n */\n"
 
 
-/* 
-	type declarations 
+/*
+	type declarations
 */
 
 typedef struct
@@ -88,12 +88,12 @@
 } SVGGenElement;
 
 typedef struct {
-	xmlChar *svg_name; 
+	xmlChar *svg_name;
 	char implementation_name[50];
-	xmlChar *svg_type; 
-	char impl_type[50]; 
-	u8 animatable; 
-	u8 inheritable; 
+	xmlChar *svg_type;
+	char impl_type[50];
+	u8 animatable;
+	u8 inheritable;
 	Bool optional;
 	xmlChar *default_value;
 	u32 index;
@@ -120,28 +120,28 @@
 
 /* Media Properties */
 static char *media_properties[] = {
-  "audio-level", "display", "image-rendering", "pointer-events", "shape-rendering", "text-rendering", 
-  "viewport-fill", "viewport-fill-opacity", "visibility"
+	"audio-level", "display", "image-rendering", "pointer-events", "shape-rendering", "text-rendering",
+	"viewport-fill", "viewport-fill-opacity", "visibility"
 };
 
 /* others */
 static char *other_properties[] = {
-  "color", "color-rendering", "display-align", "fill", "fill-opacity", "fill-rule", 
-  "font-family", "font-size", "font-style", "font-weight", "line-increment", 
-  "solid-color", "solid-opacity", "stop-color", "stop-opacity", 
-  "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", 
-   "stroke-opacity", "stroke-width", "text-align", "text-anchor", "vector-effect"
+	"color", "color-rendering", "display-align", "fill", "fill-opacity", "fill-rule",
+	"font-family", "font-size", "font-style", "font-weight", "line-increment",
+	"solid-color", "solid-opacity", "stop-color", "stop-opacity",
+	"stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit",
+	"stroke-opacity", "stroke-width", "text-align", "text-anchor", "vector-effect"
 };
 
 /* only opacity on image */
 static char *opacity_properties[] = {
- "opacity"
+	"opacity"
 };
 
 /* Focus */
-static char *focus[] = { 
-  "focusHighlight", "focusable", "nav-down", "nav-down-left", "nav-down-right", 
-  "nav-left", "nav-next", "nav-prev", "nav-right", "nav-up", "nav-up-left", "nav-up-right"
+static char *focus[] = {
+	"focusHighlight", "focusable", "nav-down", "nav-down-left", "nav-down-right",
+	"nav-left", "nav-next", "nav-prev", "nav-right", "nav-up", "nav-up-left", "nav-up-right"
 };
 
 /* Xlink */

gpac-0.5.0.svn5178.tar.bz2/applications/generators/SVG/v1.c -> gpac-0.5.1.svn5491.tar.xz/applications/generators/SVG/v1.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012 
+ *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph Generator sub-project
@@ -11,21 +11,21 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #include "svggen.h"
 
-void generateNode(FILE *output, SVGGenElement* svg_elt) 
+void generateNode(FILE *output, SVGGenElement* svg_elt)
 {
 	fprintf(output, "typedef struct _tagSVG_SA_%sElement\n{\n", svg_elt->implementation_name);
 
@@ -37,7 +37,7 @@
 
 	if (!strcmp(svg_elt->implementation_name, "conditional")) {
 		fprintf(output, "\tSVGCommandBuffer updates;\n");
-	} 
+	}
 
 	generateAttributes(output, svg_elt->attributes, 0);
 
@@ -202,64 +202,64 @@
 		char *att_name = generic_attributes[index].array[k];
 		SVGGenAttribute *a = findAttribute(elt, att_name);
 		if (a) {
-			fprintf(output, "\tif(!strcmp(\"%s\", name)) return %d;\n", att_name, i); 
+			fprintf(output, "\tif(!strcmp(\"%s\", name)) return %d;\n", att_name, i);
 			i++;
 		}
 	}
 	return i;
 }
 
-void generateNodeImpl(FILE *output, SVGGenElement* svg_elt) 
+void generateNodeImpl(FILE *output, SVGGenElement* svg_elt)
 {
-	u32 i;	
+	u32 i;
 
-	/***************************************************/	
+	/***************************************************/
 	/*				Constructor						   */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "void *gf_svg_new_%s()\n{\n\tSVG_SA_%sElement *p;\n", svg_elt->implementation_name,svg_elt->implementation_name);
 	fprintf(output, "\tGF_SAFEALLOC(p, SVG_SA_%sElement);\n\tif (!p) return NULL;\n\tgf_node_setup((GF_Node *)p, TAG_SVG_%s);\n\tgf_sg_parent_setup((GF_Node *) p);\n",svg_elt->implementation_name,svg_elt->implementation_name);
 
-	fprintf(output, "\tgf_svg_sa_init_core((SVG_SA_Element *)p);\n");		
-	if (svg_elt->has_properties || 
-		svg_elt->has_media_properties || 
-		svg_elt->has_opacity_properties) {
-		fprintf(output, "\tgf_svg_sa_init_properties((SVG_SA_Element *)p);\n");		
-	} 
+	fprintf(output, "\tgf_svg_sa_init_core((SVG_SA_Element *)p);\n");
+	if (svg_elt->has_properties ||
+	        svg_elt->has_media_properties ||
+	        svg_elt->has_opacity_properties) {
+		fprintf(output, "\tgf_svg_sa_init_properties((SVG_SA_Element *)p);\n");
+	}
 	if (svg_elt->has_focus) {
-		fprintf(output, "\tgf_svg_sa_init_focus((SVG_SA_Element *)p);\n");		
-	} 
+		fprintf(output, "\tgf_svg_sa_init_focus((SVG_SA_Element *)p);\n");
+	}
 	if (svg_elt->has_xlink) {
-		fprintf(output, "\tgf_svg_sa_init_xlink((SVG_SA_Element *)p);\n");		
-	} 
+		fprintf(output, "\tgf_svg_sa_init_xlink((SVG_SA_Element *)p);\n");
+	}
 	if (svg_elt->has_timing) {
-		fprintf(output, "\tgf_svg_sa_init_timing((SVG_SA_Element *)p);\n");		
-	} 
+		fprintf(output, "\tgf_svg_sa_init_timing((SVG_SA_Element *)p);\n");
+	}
 	if (svg_elt->has_sync) {
-		fprintf(output, "\tgf_svg_sa_init_sync((SVG_SA_Element *)p);\n");		
+		fprintf(output, "\tgf_svg_sa_init_sync((SVG_SA_Element *)p);\n");
+	}
+	if (svg_elt->has_animation) {
+		fprintf(output, "\tgf_svg_sa_init_anim((SVG_SA_Element *)p);\n");
 	}
-	if (svg_elt->has_animation){
-		fprintf(output, "\tgf_svg_sa_init_anim((SVG_SA_Element *)p);\n");		
-	} 
 	if (svg_elt->has_conditional) {
-		fprintf(output, "\tgf_svg_sa_init_conditional((SVG_SA_Element *)p);\n");		
-	} 
+		fprintf(output, "\tgf_svg_sa_init_conditional((SVG_SA_Element *)p);\n");
+	}
 
 	if (svg_elt->has_transform) {
 		fprintf(output, "\tgf_mx2d_init(p->transform.mat);\n");
-	} 
+	}
 
 	if (!strcmp(svg_elt->implementation_name, "conditional")) {
 		fprintf(output, "\tgf_svg_sa_init_lsr_conditional(&p->updates);\n");
-		fprintf(output, "\tgf_svg_sa_init_timing((SVG_SA_Element *)p);\n");		
+		fprintf(output, "\tgf_svg_sa_init_timing((SVG_SA_Element *)p);\n");
 
-	} 
+	}
 
 	for (i = 0; i < gf_list_count(svg_elt->attributes); i++) {
 		SVGGenAttribute *att = gf_list_get(svg_elt->attributes, i);
 		/* Initialization of complex types */
-		if ( !strcmp("SVG_Points", att->impl_type) || 
-			 !strcmp("SVG_Coordinates", att->impl_type) ||
-			 !strcmp("SMIL_KeyPoints", att->impl_type)) {
+		if ( !strcmp("SVG_Points", att->impl_type) ||
+		        !strcmp("SVG_Coordinates", att->impl_type) ||
+		        !strcmp("SMIL_KeyPoints", att->impl_type)) {
 			fprintf(output, "\tp->%s = gf_list_new();\n", att->implementation_name);
 		} else if (!strcmp("SVG_PathData", att->impl_type) && !strcmp(svg_elt->svg_name, "animateMotion")) {
 			fprintf(output, "#ifdef USE_GF_PATH\n");
@@ -277,7 +277,7 @@
 			fprintf(output, "#endif\n");
 		} else if (!strcmp(att->svg_name, "lsr:enabled")) {
 			fprintf(output, "\tp->lsr_enabled = 1;\n");
-		} 
+		}
 	}
 	/*some default values*/
 	if (!strcmp(svg_elt->svg_name, "svg")) {
@@ -309,9 +309,9 @@
 	}
 	fprintf(output, "\treturn p;\n}\n\n");
 
-	/***************************************************/	
+	/***************************************************/
 	/*                     Destructor                  */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "static void gf_svg_sa_%s_del(GF_Node *node)\n{\n", svg_elt->implementation_name);
 	fprintf(output, "\tSVG_SA_%sElement *p = (SVG_SA_%sElement *)node;\n", svg_elt->implementation_name, svg_elt->implementation_name);
 
@@ -319,10 +319,10 @@
 
 	if (!strcmp(svg_elt->implementation_name, "conditional")) {
 		fprintf(output, "\tgf_svg_sa_reset_lsr_conditional(&p->updates);\n");
-	} 
+	}
 	else if (!strcmp(svg_elt->implementation_name, "a")) {
 		fprintf(output, "\tif (p->target) free(p->target);\n");
-	} 
+	}
 
 	for (i = 0; i < gf_list_count(svg_elt->attributes); i++) {
 		SVGGenAttribute *att = gf_list_get(svg_elt->attributes, i);
@@ -348,43 +348,43 @@
 	}
 	if (svg_elt->has_transform) {
 		fprintf(output, "\tif (p->motionTransform) free(p->motionTransform);\n");
-	} 
+	}
 
 	fprintf(output, "\tgf_sg_parent_reset((GF_Node *) p);\n");
 	fprintf(output, "\tgf_node_free((GF_Node *)p);\n");
 	fprintf(output, "}\n\n");
-	
-	/***************************************************/	
+
+	/***************************************************/
 	/*				Attribute Access				   */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "static GF_Err gf_svg_sa_%s_get_attribute(GF_Node *node, GF_FieldInfo *info)\n{\n", svg_elt->implementation_name);
 	fprintf(output, "\tswitch (info->fieldIndex) {\n");
 	svg_elt->nb_atts = 0;
 	svg_elt->nb_atts = generateCoreInfo(output, svg_elt, svg_elt->nb_atts);
 
-	if (svg_elt->has_media_properties) 
+	if (svg_elt->has_media_properties)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 2, "((SVG_SA_Element *)node)->properties->", svg_elt->nb_atts);
-	if (svg_elt->has_properties) 
+	if (svg_elt->has_properties)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 1, "((SVG_SA_Element *)node)->properties->", svg_elt->nb_atts);
-	if (svg_elt->has_opacity_properties) 
+	if (svg_elt->has_opacity_properties)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 3, "((SVG_SA_Element *)node)->properties->", svg_elt->nb_atts);
-	if (svg_elt->has_focus) 
+	if (svg_elt->has_focus)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 4, "((SVG_SA_Element *)node)->focus->", svg_elt->nb_atts);
-	if (svg_elt->has_xlink) 
+	if (svg_elt->has_xlink)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 5, "((SVG_SA_Element *)node)->xlink->", svg_elt->nb_atts);
-	if (svg_elt->has_timing) 
+	if (svg_elt->has_timing)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 6, "((SVG_SA_Element *)node)->timing->", svg_elt->nb_atts);
-	if (svg_elt->has_sync) 
+	if (svg_elt->has_sync)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 7, "((SVG_SA_Element *)node)->sync->", svg_elt->nb_atts);
-	if (svg_elt->has_animation) 
+	if (svg_elt->has_animation)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 8, "((SVG_SA_Element *)node)->anim->", svg_elt->nb_atts);
-	if (svg_elt->has_conditional) 
+	if (svg_elt->has_conditional)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 9, "((SVG_SA_Element *)node)->conditional->", svg_elt->nb_atts);
 	if (svg_elt->has_transform) {
 		svg_elt->nb_atts = generateTransformInfo(output, svg_elt, svg_elt->nb_atts);
 		svg_elt->nb_atts = generateMotionTransformInfo(output, svg_elt, svg_elt->nb_atts);
 	}
-	if (svg_elt->has_xy) 
+	if (svg_elt->has_xy)
 		svg_elt->nb_atts = generateXYInfo(output, svg_elt, svg_elt->nb_atts);
 
 	for (i = 0; i < gf_list_count(svg_elt->attributes); i++) {
@@ -393,77 +393,77 @@
 	}
 	fprintf(output, "\t\tdefault: return GF_BAD_PARAM;\n\t}\n}\n\n");
 
-	/***************************************************/	
+	/***************************************************/
 	/*	gf_svg_sa_%s_get_attribute_index_from_name		   */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "s32 gf_svg_sa_%s_get_attribute_index_from_name(char *name)\n{\n", svg_elt->implementation_name);
 	{
 		u32 att_index = 0;
-		fprintf(output, "\tif(!strcmp(\"id\", name)) return %d;\n", att_index); 
+		fprintf(output, "\tif(!strcmp(\"id\", name)) return %d;\n", att_index);
 		att_index++;
-		fprintf(output, "\tif(!strcmp(\"xml:id\", name)) return %d;\n", att_index); 
+		fprintf(output, "\tif(!strcmp(\"xml:id\", name)) return %d;\n", att_index);
 		att_index++;
-		fprintf(output, "\tif(!strcmp(\"class\", name)) return %d;\n", att_index); 
+		fprintf(output, "\tif(!strcmp(\"class\", name)) return %d;\n", att_index);
 		att_index++;
-		fprintf(output, "\tif(!strcmp(\"xml:lang\", name)) return %d;\n", att_index); 
+		fprintf(output, "\tif(!strcmp(\"xml:lang\", name)) return %d;\n", att_index);
 		att_index++;
-		fprintf(output, "\tif(!strcmp(\"xml:base\", name)) return %d;\n", att_index); 
+		fprintf(output, "\tif(!strcmp(\"xml:base\", name)) return %d;\n", att_index);
 		att_index++;
-		fprintf(output, "\tif(!strcmp(\"xml:space\", name)) return %d;\n", att_index); 
+		fprintf(output, "\tif(!strcmp(\"xml:space\", name)) return %d;\n", att_index);
 		att_index++;
-		fprintf(output, "\tif(!strcmp(\"externalResourcesRequired\", name)) return %d;\n", att_index); 
+		fprintf(output, "\tif(!strcmp(\"externalResourcesRequired\", name)) return %d;\n", att_index);
 		att_index++;
-		if (svg_elt->has_media_properties) 
+		if (svg_elt->has_media_properties)
 			att_index = generateIndexInfo(output, svg_elt, 2, att_index);
-		if (svg_elt->has_properties) 
+		if (svg_elt->has_properties)
 			att_index = generateIndexInfo(output, svg_elt, 1, att_index);
-		if (svg_elt->has_opacity_properties) 
+		if (svg_elt->has_opacity_properties)
 			att_index = generateIndexInfo(output, svg_elt, 3, att_index);
-		if (svg_elt->has_focus) 
+		if (svg_elt->has_focus)
 			att_index = generateIndexInfo(output, svg_elt, 4, att_index);
-		if (svg_elt->has_xlink) 
+		if (svg_elt->has_xlink)
 			att_index = generateIndexInfo(output, svg_elt, 5, att_index);
-		if (svg_elt->has_timing) 
+		if (svg_elt->has_timing)
 			att_index = generateIndexInfo(output, svg_elt, 6, att_index);
-		if (svg_elt->has_sync) 
+		if (svg_elt->has_sync)
 			att_index = generateIndexInfo(output, svg_elt, 7, att_index);
-		if (svg_elt->has_animation) 
+		if (svg_elt->has_animation)
 			att_index = generateIndexInfo(output, svg_elt, 8, att_index);
-		if (svg_elt->has_conditional) 
+		if (svg_elt->has_conditional)
 			att_index = generateIndexInfo(output, svg_elt, 9, att_index);
 		if (svg_elt->has_transform) {
-			fprintf(output, "\tif(!strcmp(\"transform\", name)) return %d;\n", att_index); 
+			fprintf(output, "\tif(!strcmp(\"transform\", name)) return %d;\n", att_index);
 			att_index++;
 			/*motionTransform*/
-			fprintf(output, "\tif(!strcmp(\"motionTransform\", name)) return %d;\n", att_index); 
+			fprintf(output, "\tif(!strcmp(\"motionTransform\", name)) return %d;\n", att_index);
 			att_index++;
 		}
 		if (svg_elt->has_xy) {
-			fprintf(output, "\tif(!strcmp(\"x\", name)) return %d;\n", att_index); 
+			fprintf(output, "\tif(!strcmp(\"x\", name)) return %d;\n", att_index);
 			att_index++;
-			fprintf(output, "\tif(!strcmp(\"y\", name)) return %d;\n", att_index); 
+			fprintf(output, "\tif(!strcmp(\"y\", name)) return %d;\n", att_index);
 			att_index++;
 		}
 
 		for (i = 0; i < gf_list_count(svg_elt->attributes); i++) {
 			SVGGenAttribute *att = gf_list_get(svg_elt->attributes, i);
-			fprintf(output, "\tif(!strcmp(\"%s\", name)) return %d;\n", att->svg_name, att_index); 
+			fprintf(output, "\tif(!strcmp(\"%s\", name)) return %d;\n", att->svg_name, att_index);
 			att_index++;
 		}
 	}
 	fprintf(output, "\treturn -1;\n}\n\n");
 }
 
-void generateSVGCode_V1(GF_List *svg_elements) 
+void generateSVGCode_V1(GF_List *svg_elements)
 {
 	FILE *output;
 	u32 i;
 
-	/***************************************************/	
-	/***************************************************/	
-	/*************** Creating .h file ******************/	
-	/***************************************************/	
-	/***************************************************/	
+	/***************************************************/
+	/***************************************************/
+	/*************** Creating .h file ******************/
+	/***************************************************/
+	/***************************************************/
 	output = BeginFile(0);
 	fprintf(output, "#include <gpac/scenegraph_svg.h>\n\n\n");
 	fprintf(output, "/* Definition of SVG element internal tags */\n");
@@ -479,29 +479,29 @@
 			fprintf(output, ",\n\tTAG_SVG_%s", elt->implementation_name);
 		}
 	}
-	
+
 	fprintf(output, ",\n\t/*undefined elements (when parsing) use this tag*/\n\tTAG_SVG_UndefinedElement\n};\n\n");
-	
+
 	fprintf(output, "/******************************************\n");
- 	fprintf(output, "*   SVG Elements structure definitions    *\n");
- 	fprintf(output, "*******************************************/\n");
+	fprintf(output, "*   SVG Elements structure definitions    *\n");
+	fprintf(output, "*******************************************/\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
 		SVGGenElement *elt = (SVGGenElement *)gf_list_get(svg_elements, i);
 		generateNode(output, elt);
 	}
 	fprintf(output, "/******************************************\n");
- 	fprintf(output, "*  End SVG Elements structure definitions *\n");
- 	fprintf(output, "*******************************************/\n");
+	fprintf(output, "*  End SVG Elements structure definitions *\n");
+	fprintf(output, "*******************************************/\n");
 	EndFile(output, 0);
 
-	/***************************************************/	
-	/***************************************************/	
-	/*************** Creating .c file ******************/	
-	/***************************************************/	
-	/***************************************************/	
+	/***************************************************/
+	/***************************************************/
+	/*************** Creating .c file ******************/
+	/***************************************************/
+	/***************************************************/
 	output = BeginFile(1);
 	fprintf(output, "#include <gpac/nodes_svg_sa.h>\n\n");
-	
+
 	fprintf(output, "#ifndef GPAC_DISABLE_SVG\n\n");
 	fprintf(output, "#include <gpac/internal/scenegraph_dev.h>\n\n");
 	fprintf(output, "#ifdef GPAC_ENABLE_SVG_SA\n\n");
@@ -510,9 +510,9 @@
 		generateNodeImpl(output, elt);
 	}
 
-	/***************************************************/	
+	/***************************************************/
 	/* SVG_SA_Element *gf_svg_sa_create_node(u32 ElementTag)  */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "SVG_SA_Element *gf_svg_sa_create_node(u32 ElementTag)\n");
 	fprintf(output, "{\n");
 	fprintf(output, "\tswitch (ElementTag) {\n");
@@ -521,10 +521,10 @@
 		fprintf(output, "\t\tcase TAG_SVG_%s: return (SVG_SA_Element*) gf_svg_new_%s();\n",elt->implementation_name,elt->implementation_name);
 	}
 	fprintf(output, "\t\tdefault: return NULL;\n\t}\n}\n\n");
-	
-	/***************************************************/	
+
+	/***************************************************/
 	/* void gf_svg_sa_element_del(SVG_SA_Element *elt)        */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "void gf_svg_sa_element_del(SVG_SA_Element *elt)\n{\n");
 	fprintf(output, "\tGF_Node *node = (GF_Node *)elt;\n");
 	fprintf(output, "\tswitch (node->sgprivate->tag) {\n");
@@ -534,9 +534,9 @@
 	}
 	fprintf(output, "\t\tdefault: return;\n\t}\n}\n\n");
 
-	/***************************************************/	
+	/***************************************************/
 	/* u32 gf_svg_sa_get_attribute_count(SVG_SA_Element *elt) */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "u32 gf_svg_sa_get_attribute_count(GF_Node *node)\n{\n");
 	fprintf(output, "\tswitch (node->sgprivate->tag) {\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
@@ -544,10 +544,10 @@
 		fprintf(output, "\t\tcase TAG_SVG_%s: return %i;\n", elt->implementation_name, elt->nb_atts);
 	}
 	fprintf(output, "\t\tdefault: return 0;\n\t}\n}\n\n");
-	
-	/***********************************************************************/	
+
+	/***********************************************************************/
 	/* GF_Err gf_svg_sa_get_attribute_info(GF_Node *node, GF_FieldInfo *info) */
-	/***********************************************************************/	
+	/***********************************************************************/
 	fprintf(output, "GF_Err gf_svg_sa_get_attribute_info(GF_Node *node, GF_FieldInfo *info)\n{\n");
 	fprintf(output, "\tswitch (node->sgprivate->tag) {\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
@@ -556,9 +556,9 @@
 	}
 	fprintf(output, "\t\tdefault: return GF_BAD_PARAM;\n\t}\n}\n\n");
 
-	/****************************************************************/	
+	/****************************************************************/
 	/* u32 gf_svg_sa_node_type_by_class_name(const char *element_name) */
-	/****************************************************************/	
+	/****************************************************************/
 	fprintf(output, "u32 gf_svg_sa_node_type_by_class_name(const char *element_name)\n{\n\tif (!element_name) return TAG_UndefinedNode;\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
 		SVGGenElement *elt = (SVGGenElement *)gf_list_get(svg_elements, i);
@@ -567,9 +567,9 @@
 	fprintf(output, "\treturn TAG_UndefinedNode;\n}\n\n");
 
 
-	/***************************************************/	
+	/***************************************************/
 	/* const char *gf_svg_sa_get_element_name(u32 tag) */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "const char *gf_svg_sa_get_element_name(u32 tag)\n{\n\tswitch(tag) {\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
 		SVGGenElement *elt = (SVGGenElement *)gf_list_get(svg_elements, i);
@@ -577,9 +577,9 @@
 	}
 	fprintf(output, "\tdefault: return \"UndefinedNode\";\n\t}\n}\n\n");
 
-	/***************************************************/	
+	/***************************************************/
 	/* const char *gf_svg_sa_get_attribute_index_by_name(u32 tag) */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "s32 gf_svg_sa_get_attribute_index_by_name(GF_Node *node, char *name)\n{\n\tswitch(node->sgprivate->tag) {\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
 		SVGGenElement *elt = (SVGGenElement *)gf_list_get(svg_elements, i);
@@ -587,9 +587,9 @@
 	}
 	fprintf(output, "\tdefault: return -1;\n\t}\n}\n\n");
 
-	/***************************************************/	
+	/***************************************************/
 	/* Bool gf_svg_is_element_transformable(u32 tag) */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "Bool gf_svg_is_element_transformable(u32 tag)\n{\n\tswitch(tag) {\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
 		SVGGenElement *elt = (SVGGenElement *)gf_list_get(svg_elements, i);
@@ -601,7 +601,7 @@
 
 	fprintf(output, "#endif /*GPAC_ENABLE_SVG_SA*/\n");
 	fprintf(output, "#endif /*GPAC_DISABLE_SVG*/\n\n");
-	EndFile(output, 1); 
+	EndFile(output, 1);
 
 	generate_laser_tables(svg_elements);
 }

gpac-0.5.0.svn5178.tar.bz2/applications/generators/SVG/v2.c -> gpac-0.5.1.svn5491.tar.xz/applications/generators/SVG/v2.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012 
+ *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph Generator sub-project
@@ -11,21 +11,21 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #include "svggen.h"
 
-void generateAttributes2(FILE *output, GF_List *attributes) 
+void generateAttributes2(FILE *output, GF_List *attributes)
 {
 	u32 i;
 	for (i = 0; i<gf_list_count(attributes); i++) {
@@ -35,7 +35,7 @@
 	}
 }
 
-void generateNode2(FILE *output, SVGGenElement* svg_elt) 
+void generateNode2(FILE *output, SVGGenElement* svg_elt)
 {
 	fprintf(output, "typedef struct _tagSVG_SANI_%sElement\n{\n", svg_elt->implementation_name);
 
@@ -47,7 +47,7 @@
 
 	if (!strcmp(svg_elt->implementation_name, "conditional")) {
 		fprintf(output, "\tSVGCommandBuffer updates;\n");
-	} 
+	}
 
 	generateAttributes2(output, svg_elt->attributes);
 
@@ -113,47 +113,47 @@
 	return i;
 }
 
-void generateNodeImpl2(FILE *output, SVGGenElement* svg_elt) 
+void generateNodeImpl2(FILE *output, SVGGenElement* svg_elt)
 {
-	u32 i;	
+	u32 i;
 
 	/* Constructor */
 	fprintf(output, "void *gf_svg_sani_new_%s()\n{\n\tSVG_SANI_%sElement *p;\n", svg_elt->implementation_name,svg_elt->implementation_name);
 	fprintf(output, "\tGF_SAFEALLOC(p, SVG_SANI_%sElement);\n\tif (!p) return NULL;\n\tgf_node_setup((GF_Node *)p, TAG_SVG_SANI_%s);\n\tgf_sg_parent_setup((GF_Node *) p);\n",svg_elt->implementation_name,svg_elt->implementation_name);
 
-	fprintf(output, "\tgf_svg_sani_init_core((SVG_SANI_Element *)p);\n");		
+	fprintf(output, "\tgf_svg_sani_init_core((SVG_SANI_Element *)p);\n");
 	if (svg_elt->has_focus) {
-		fprintf(output, "\tgf_svg_sani_init_focus((SVG_SANI_Element *)p);\n");		
-	} 
+		fprintf(output, "\tgf_svg_sani_init_focus((SVG_SANI_Element *)p);\n");
+	}
 	if (svg_elt->has_xlink) {
-		fprintf(output, "\tgf_svg_sani_init_xlink((SVG_SANI_Element *)p);\n");		
-	} 
+		fprintf(output, "\tgf_svg_sani_init_xlink((SVG_SANI_Element *)p);\n");
+	}
 	if (svg_elt->has_timing) {
-		fprintf(output, "\tgf_svg_sani_init_timing((SVG_SANI_Element *)p);\n");		
-	} 
+		fprintf(output, "\tgf_svg_sani_init_timing((SVG_SANI_Element *)p);\n");
+	}
 	if (svg_elt->has_sync) {
-		fprintf(output, "\tgf_svg_sani_init_sync((SVG_SANI_Element *)p);\n");		
+		fprintf(output, "\tgf_svg_sani_init_sync((SVG_SANI_Element *)p);\n");
+	}
+	if (svg_elt->has_animation) {
+		fprintf(output, "\tgf_svg_sani_init_anim((SVG_SANI_Element *)p);\n");
 	}
-	if (svg_elt->has_animation){
-		fprintf(output, "\tgf_svg_sani_init_anim((SVG_SANI_Element *)p);\n");		
-	} 
 	if (svg_elt->has_conditional) {
-		fprintf(output, "\tgf_svg_sani_init_conditional((SVG_SANI_Element *)p);\n");		
-	} 
+		fprintf(output, "\tgf_svg_sani_init_conditional((SVG_SANI_Element *)p);\n");
+	}
 
 	if (svg_elt->has_transform) {
 		fprintf(output, "\tgf_mx2d_init(p->transform.mat);\n");
-	} 
+	}
 
 	if (!strcmp(svg_elt->implementation_name, "conditional")) {
 		fprintf(output, "\tgf_svg_sa_init_lsr_conditional(&p->updates);\n");
-		fprintf(output, "\tgf_svg_sani_init_timing((SVG_SANI_Element *)p);\n");		
+		fprintf(output, "\tgf_svg_sani_init_timing((SVG_SANI_Element *)p);\n");
 
-	} 
+	}
 
 	for (i = 0; i < gf_list_count(svg_elt->attributes); i++) {
 		SVGGenAttribute *att = gf_list_get(svg_elt->attributes, i);
-		
+
 		/* forcing initialization of old-properties */
 		if (!strcmp("audio-level", att->svg_name)) {
 			fprintf(output, "\tp->audio_level.type = SVG_NUMBER_VALUE;\n");
@@ -236,9 +236,9 @@
 		}
 
 		/* Initialization of complex types */
-		if ( !strcmp("SVG_Points", att->impl_type) || 
-			 !strcmp("SVG_Coordinates", att->impl_type) ||
-			 !strcmp("SMIL_KeyPoints", att->impl_type)) {
+		if ( !strcmp("SVG_Points", att->impl_type) ||
+		        !strcmp("SVG_Coordinates", att->impl_type) ||
+		        !strcmp("SMIL_KeyPoints", att->impl_type)) {
 			fprintf(output, "\tp->%s = gf_list_new();\n", att->implementation_name);
 		} else if (!strcmp("SVG_PathData", att->impl_type) && !strcmp(svg_elt->svg_name, "animateMotion")) {
 			fprintf(output, "#ifdef USE_GF_PATH\n");
@@ -256,7 +256,7 @@
 			fprintf(output, "#endif\n");
 		} else if (!strcmp(att->svg_name, "lsr:enabled")) {
 			fprintf(output, "\tp->lsr_enabled = 1;\n");
-		} 
+		}
 	}
 	/*some default values*/
 	if (!strcmp(svg_elt->svg_name, "svg")) {
@@ -289,10 +289,10 @@
 
 	if (!strcmp(svg_elt->implementation_name, "conditional")) {
 		fprintf(output, "\tgf_svg_sa_reset_lsr_conditional(&p->updates);\n");
-	} 
+	}
 	else if (!strcmp(svg_elt->implementation_name, "a")) {
 		fprintf(output, "\tif (p->target) free(p->target);\n");
-	} 
+	}
 
 	for (i = 0; i < gf_list_count(svg_elt->attributes); i++) {
 		SVGGenAttribute *att = gf_list_get(svg_elt->attributes, i);
@@ -318,7 +318,7 @@
 	}
 	if (svg_elt->has_transform) {
 		fprintf(output, "\tif (p->motionTransform) free(p->motionTransform);\n");
-	} 
+	}
 
 	fprintf(output, "\tgf_sg_parent_reset((GF_Node *) p);\n");
 	fprintf(output, "\tgf_node_free((GF_Node *)p);\n");
@@ -330,23 +330,23 @@
 	svg_elt->nb_atts = 0;
 	svg_elt->nb_atts = generateCoreInfo(output, svg_elt, svg_elt->nb_atts);
 
-	if (svg_elt->has_focus) 
+	if (svg_elt->has_focus)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 4, "((SVG_SANI_Element *)node)->focus->", svg_elt->nb_atts);
-	if (svg_elt->has_xlink) 
+	if (svg_elt->has_xlink)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 5, "((SVG_SANI_Element *)node)->xlink->", svg_elt->nb_atts);
-	if (svg_elt->has_timing) 
+	if (svg_elt->has_timing)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 6, "((SVG_SANI_Element *)node)->timing->", svg_elt->nb_atts);
-	if (svg_elt->has_sync) 
+	if (svg_elt->has_sync)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 7, "((SVG_SANI_Element *)node)->sync->", svg_elt->nb_atts);
-	if (svg_elt->has_animation) 
+	if (svg_elt->has_animation)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 8, "((SVG_SANI_Element *)node)->anim->", svg_elt->nb_atts);
-	if (svg_elt->has_conditional) 
+	if (svg_elt->has_conditional)
 		svg_elt->nb_atts = generateGenericInfo(output, svg_elt, 9, "((SVG_SANI_Element *)node)->conditional->", svg_elt->nb_atts);
 	if (svg_elt->has_transform) {
 		svg_elt->nb_atts = generateTransformInfo2(output, svg_elt, svg_elt->nb_atts);
 		svg_elt->nb_atts = generateMotionTransformInfo2(output, svg_elt, svg_elt->nb_atts);
 	}
-	if (svg_elt->has_xy) 
+	if (svg_elt->has_xy)
 		svg_elt->nb_atts = generateXYInfo2(output, svg_elt, svg_elt->nb_atts);
 
 	for (i = 0; i < gf_list_count(svg_elt->attributes); i++) {
@@ -357,7 +357,7 @@
 
 }
 
-void generateSVGCode_V2(GF_List *svg_elements) 
+void generateSVGCode_V2(GF_List *svg_elements)
 {
 	FILE *output;
 	u32 i;
@@ -377,12 +377,12 @@
 			fprintf(output, ",\n\tTAG_SVG_SANI_%s", elt->implementation_name);
 		}
 	}
-	
+
 	fprintf(output, ",\n\t/*undefined elements (when parsing) use this tag*/\n\tTAG_SVG_SANI_UndefinedElement\n};\n\n");
 
 	fprintf(output, "/******************************************\n");
- 	fprintf(output, "*   SVG_SANI_ Elements structure definitions    *\n");
- 	fprintf(output, "*******************************************/\n");
+	fprintf(output, "*   SVG_SANI_ Elements structure definitions    *\n");
+	fprintf(output, "*******************************************/\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
 		SVGGenElement *elt = (SVGGenElement *)gf_list_get(svg_elements, i);
 		generateNode2(output, elt);
@@ -407,7 +407,7 @@
 		fprintf(output, "\t\tcase TAG_SVG_SANI_%s: return (SVG_SANI_Element*) gf_svg_sani_new_%s();\n",elt->implementation_name,elt->implementation_name);
 	}
 	fprintf(output, "\t\tdefault: return NULL;\n\t}\n}\n\n");
-	
+
 	fprintf(output, "void gf_svg_sani_element_del(SVG_SANI_Element *elt)\n{\n");
 	fprintf(output, "\tGF_Node *node = (GF_Node *)elt;\n");
 	fprintf(output, "\tswitch (node->sgprivate->tag) {\n");
@@ -424,7 +424,7 @@
 		fprintf(output, "\t\tcase TAG_SVG_SANI_%s: return %i;\n", elt->implementation_name, elt->nb_atts);
 	}
 	fprintf(output, "\t\tdefault: return 0;\n\t}\n}\n\n");
-	
+
 	fprintf(output, "GF_Err gf_svg_sani_get_attribute_info(GF_Node *node, GF_FieldInfo *info)\n{\n");
 	fprintf(output, "\tswitch (node->sgprivate->tag) {\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
@@ -457,7 +457,7 @@
 	fprintf(output, "\tdefault: return 0;\n\t}\n}\n");
 
 	fprintf(output, "#endif /*GPAC_DISABLE_SVG*/\n\n");
-	EndFile(output, 1); 
+	EndFile(output, 1);
 
 	generate_laser_tables(svg_elements);
 }

gpac-0.5.0.svn5178.tar.bz2/applications/generators/SVG/v3.c -> gpac-0.5.1.svn5491.tar.xz/applications/generators/SVG/v3.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012 
+ *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph Generator sub-project
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,11 +40,11 @@
 				strcpy(att->implementation_name, "smil_fill");
 			} else if (!strcmp(att->impl_type, "SVG_TransformType")) {
 				strcpy(att->implementation_name, "transform_type");
-			} 
+			}
 			for (k = 0; k < gf_list_count(all_atts); k++) {
 				SVGGenAttribute *a = gf_list_get(all_atts, k);
 				if (!strcmp(a->implementation_name, att->implementation_name)
-					&& !strcmp(a->impl_type, att->impl_type)) {
+				        && !strcmp(a->impl_type, att->impl_type)) {
 					added = 1;
 					break;
 				}
@@ -78,7 +78,7 @@
 			for (k = 0; k < gf_list_count(all_atts); k++) {
 				SVGGenAttribute *a = gf_list_get(all_atts, k);
 				if (!strcmp(a->implementation_name, att->implementation_name)
-					&& !strcmp(a->impl_type, att->impl_type)) {
+				        && !strcmp(a->impl_type, att->impl_type)) {
 					added = 1;
 					break;
 				}
@@ -86,7 +86,7 @@
 			if (!added) {
 				gf_list_add(all_atts, att);
 			}
-		}	
+		}
 	}
 	/*motionTransform is not parsed in rng*/
 	{
@@ -107,11 +107,11 @@
 
 	buildGlobalAttributeList(svg_elements, all_atts);
 
-	/***************************************************/	
-	/***************************************************/	
-	/*************** Creating .h file ******************/	
-	/***************************************************/	
-	/***************************************************/	
+	/***************************************************/
+	/***************************************************/
+	/*************** Creating .h file ******************/
+	/***************************************************/
+	/***************************************************/
 	output = BeginFile(0);
 	fprintf(output, "#include <gpac/scenegraph_svg.h>\n\n\n");
 
@@ -133,7 +133,7 @@
 	fprintf(output, "/* Definition of SVG 3 attribute internal tags - %d defined */\n", gf_list_count(all_atts));
 	fprintf(output, "/* TAG names are made of \"TAG_SVG_ATT_\" + SVG attribute name (with - replaced by _) */\n");
 	fprintf(output, "enum {\n");
-	
+
 	for (i=0; i<gf_list_count(all_atts); i++) {
 		SVGGenAttribute *att = (SVGGenAttribute *)gf_list_get(all_atts, i);
 		if (i) fprintf(output, "\tTAG_SVG_ATT_%s,\n", att->implementation_name);
@@ -151,33 +151,33 @@
 
 	EndFile(output, 0);
 
-	/***************************************************/	
-	/***************************************************/	
-	/*************** Creating .c file ******************/	
-	/***************************************************/	
-	/***************************************************/	
-	output = BeginFile(1);	
+	/***************************************************/
+	/***************************************************/
+	/*************** Creating .c file ******************/
+	/***************************************************/
+	/***************************************************/
+	output = BeginFile(1);
 	fprintf(output, "#ifndef GPAC_DISABLE_SVG\n\n");
 	fprintf(output, "#include <gpac/internal/scenegraph_dev.h>\n\n");
 	fprintf(output, "#include <gpac/nodes_svg_da.h>\n\n");
 
-	
-	/****************************************************************/	
+
+	/****************************************************************/
 	/* u32 gf_svg_get_attribute_tag(u32 element_tag, const char *attribute_name) */
-	/****************************************************************/	
+	/****************************************************************/
 	fprintf(output, "u32 gf_svg_get_attribute_tag(u32 element_tag, const char *attribute_name)\n{\n\tif (!attribute_name) return TAG_SVG_ATT_Unknown;\n");
 	for (i=0; i<gf_list_count(all_atts); i++) {
 		SVGGenAttribute *att = (SVGGenAttribute *)gf_list_get(all_atts, i);
-		
+
 		/* get rid of duplicates */
-		if (!strcmp(att->impl_type, "SMIL_Fill")) continue; 
-		if (!strcmp(att->impl_type, "SVG_ContentType")) continue; 
-		if (!strcmp(att->implementation_name, "text_x")) continue; 
-		if (!strcmp(att->implementation_name, "text_y")) continue; 
-		if (!strcmp(att->implementation_name, "text_rotate")) continue; 
-		if (!strcmp(att->implementation_name, "cursorManager_x")) continue; 
-		if (!strcmp(att->implementation_name, "cursorManager_y")) continue; 
-		
+		if (!strcmp(att->impl_type, "SMIL_Fill")) continue;
+		if (!strcmp(att->impl_type, "SVG_ContentType")) continue;
+		if (!strcmp(att->implementation_name, "text_x")) continue;
+		if (!strcmp(att->implementation_name, "text_y")) continue;
+		if (!strcmp(att->implementation_name, "text_rotate")) continue;
+		if (!strcmp(att->implementation_name, "cursorManager_x")) continue;
+		if (!strcmp(att->implementation_name, "cursorManager_y")) continue;
+
 		if (!strcmp(att->svg_name, "x") || !strcmp(att->svg_name, "y")) {
 			fprintf(output, "\tif (!stricmp(attribute_name, \"%s\")) {\n", att->svg_name);
 			fprintf(output, "\t\tif (element_tag == TAG_SVG_text) return TAG_SVG_ATT_text_%s;\n", att->implementation_name);
@@ -205,9 +205,9 @@
 	}
 	fprintf(output, "\treturn TAG_SVG_ATT_Unknown;\n}\n\n");
 
-	/****************************************************************/	
+	/****************************************************************/
 	/* u32 gf_svg_get_attribute_type(u32 tag) */
-	/****************************************************************/	
+	/****************************************************************/
 	fprintf(output, "u32 gf_svg_get_attribute_type(u32 tag)\n{\n");
 	fprintf(output, "\tswitch(tag) {\n");
 	for (i=0; i<gf_list_count(all_atts); i++) {
@@ -218,9 +218,9 @@
 	fprintf(output, "\t}\n");
 	fprintf(output, "\treturn TAG_SVG_ATT_Unknown;\n}\n\n");
 
-	/****************************************************************/	
+	/****************************************************************/
 	/* const char* gf_svg_get_attribute_name(u32 tag) */
-	/****************************************************************/	
+	/****************************************************************/
 	fprintf(output, "const char*gf_svg_get_attribute_name(u32 tag)\n{\n");
 	fprintf(output, "\tswitch(tag) {\n");
 	for (i=0; i<gf_list_count(all_atts); i++) {
@@ -231,9 +231,9 @@
 	fprintf(output, "\t}\n");
 	fprintf(output, "}\n\n");
 
-	/***************************************************/	
+	/***************************************************/
 	/* SVGAttribute *gf_svg_create_attribute(GF_Node *node, u32 tag) */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "SVGAttribute *gf_svg_create_attribute(GF_Node *node, u32 tag)\n{\n\tswitch(tag) {\n");
 	for (i=0; i<gf_list_count(all_atts); i++) {
 		SVGGenAttribute *att = (SVGGenAttribute *)gf_list_get(all_atts, i);
@@ -241,9 +241,9 @@
 	}
 	fprintf(output, "\tdefault: return NULL;\n\t}\n}\n\n");
 
-	/****************************************************************/	
+	/****************************************************************/
 	/* void gf_svg_flatten_attributes(SVG_Element *e, SVGAllAttributes *all_atts) */
-	/****************************************************************/	
+	/****************************************************************/
 	fprintf(output, "void gf_svg_flatten_attributes(SVG_Element *e, SVGAllAttributes *all_atts)\n");
 
 	fprintf(output, "{\n");
@@ -263,9 +263,9 @@
 	fprintf(output, "}\n");
 	fprintf(output, "\n");
 
-	/****************************************************************/	
+	/****************************************************************/
 	/* u32 gf_svg_get_element_tag(const char *element_name) */
-	/****************************************************************/	
+	/****************************************************************/
 	fprintf(output, "u32 gf_svg_get_element_tag(const char *element_name)\n{\n\tif (!element_name) return TAG_UndefinedNode;\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
 		SVGGenElement *elt = (SVGGenElement *)gf_list_get(svg_elements, i);
@@ -273,9 +273,9 @@
 	}
 	fprintf(output, "\treturn TAG_UndefinedNode;\n}\n\n");
 
-	/***************************************************/	
+	/***************************************************/
 	/* const char *gf_svg_get_element_name(u32 tag) */
-	/***************************************************/	
+	/***************************************************/
 	fprintf(output, "const char *gf_svg_get_element_name(u32 tag)\n{\n\tswitch(tag) {\n");
 	for (i=0; i<gf_list_count(svg_elements); i++) {
 		SVGGenElement *elt = (SVGGenElement *)gf_list_get(svg_elements, i);
@@ -284,11 +284,11 @@
 	fprintf(output, "\tdefault: return \"TAG_SVG_UndefinedNode\";\n\t}\n}\n\n");
 
 	fprintf(output, "#endif /*GPAC_DISABLE_SVG*/\n\n");
-	EndFile(output, 1); 
+	EndFile(output, 1);
+
 
-	
 	generate_laser_tables_da(all_atts);
-	
+
 	gf_list_del(all_atts);
 
 }

gpac-0.5.0.svn5178.tar.bz2/applications/generators/X3D/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/generators/X3D/main.c Changed

@@ -1,8 +1,8 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2000-2012 
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / X3D Scene Graph Generator sub-project
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -37,12 +37,12 @@
 void PrintUsage()
 {
 	printf("X3DGen [skip_file]\n"
-			"\nGPAC X3D Scene Graph generator\n"
-			"\n"
-			"\nskip_file: txt file with list of nodes to leave unimplemented"
-			"Generated Files are directly updated in the GPAC distribution - do NOT try to change this\n\n"
-			"Written by Jean Le Feuvre - (c) 2000-2005\n"
-			);
+	       "\nGPAC X3D Scene Graph generator\n"
+	       "\n"
+	       "\nskip_file: txt file with list of nodes to leave unimplemented"
+	       "Generated Files are directly updated in the GPAC distribution - do NOT try to change this\n\n"
+	       "Written by Jean Le Feuvre - (c) 2000-2005\n"
+	      );
 }
 
 //a node field
@@ -93,7 +93,7 @@
 	u32 i , j = 0;
 
 	strcpy(token, "");
-	
+
 	//skip separaors
 	while (*CurrentLine && strchr(sep, *CurrentLine)) {
 		CurrentLine = CurrentLine + 1;
@@ -179,7 +179,7 @@
 	} else {
 		sprintf(sPath, "..%c..%c..%csrc%cscenegraph%cx3d_nodes.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
 	}
-	
+
 	f = fopen(sPath, "wt");
 	fprintf(f, "%s\n", COPYRIGHT);
 
@@ -231,7 +231,7 @@
 
 	//write all tags
 	fprintf(f, "\n\nenum {\n");
-	
+
 	for (i=0; i<gf_list_count(BNodes); i++) {
 		n = gf_list_get(BNodes, i);
 		if (i)
@@ -258,12 +258,12 @@
 		}
 		for (j=0; j<gf_list_count(n->Fields); j++) {
 			bf = gf_list_get(n->Fields, j);
-			
+
 			if (!strcmp(bf->name, "addChildren") || !strcmp(bf->name, "removeChildren")) continue;
 			if (strcmp(bf->type, "eventOut") && !strcmp(bf->name, "children")) continue;
 
-			if (strstr(bf->familly, "Node")) {		
-				//this is a POINTER to a node 
+			if (strstr(bf->familly, "Node")) {
+				//this is a POINTER to a node
 				if (strstr(bf->familly, "SF")) {
 					fprintf(f, "\tGF_Node *%s;\t/*%s*/\n", bf->name, bf->type);
 				} else {
@@ -273,7 +273,7 @@
 			} else {
 				fprintf(f, "\t%s %s;\t/*%s*/\n", bf->familly, bf->name, bf->type);
 			}
-			if (!strcmp(bf->type, "eventIn")) 
+			if (!strcmp(bf->type, "eventIn"))
 				fprintf(f, "\tvoid (*on_%s)(GF_Node *pThis, struct _route *route);\t/*eventInHandler*/\n", bf->name);
 		}
 		fprintf(f, "} X_%s;\n\n\n", n->name);
@@ -291,11 +291,11 @@
 
 	fprintf(f, "\nstatic u32 %s_get_field_count(GF_Node *node, u8 dummy)\n{\n\treturn %d;\n}\n\n", n->name, gf_list_count(n->Fields));
 	fprintf(f, "static GF_Err %s_get_field(GF_Node *node, GF_FieldInfo *info)\n{\n\tswitch (info->fieldIndex) {\n", n->name);
-	for (i=0;i<gf_list_count(n->Fields); i++) {
+	for (i=0; i<gf_list_count(n->Fields); i++) {
 		bf = gf_list_get(n->Fields, i);
 
 		fprintf(f, "\tcase %d:\n", i);
-		
+
 		fprintf(f, "\t\tinfo->name = \"%s\";\n", bf->name);
 
 		//skip all eventIn
@@ -335,7 +335,7 @@
 	fprintf(f, "\tdefault:\n\t\treturn GF_BAD_PARAM;\n\t}\n}\n\n");
 
 	fprintf(f, "\nstatic s32 %s_get_field_index_by_name(char *name)\n{\n", n->name);
-	for (i=0;i<gf_list_count(n->Fields); i++) {
+	for (i=0; i<gf_list_count(n->Fields); i++) {
 		bf = gf_list_get(n->Fields, i);
 		fprintf(f, "\tif (!strcmp(\"%s\", name)) return %d;\n", bf->name, i);
 	}
@@ -367,42 +367,42 @@
 			//nothing on child events
 			if (!strcmp(bf->name, "addChildren")) continue;
 			if (!strcmp(bf->name, "removeChildren")) continue;
-			
+
 			//delete all children node
 			if (strcmp(bf->type, "eventOut") && !strcmp(bf->name, "children")) {
 				is_parent = 1;
 				continue;
 			}
 
-			//delete ALL fields that must be deleted: this includes eventIn and out since 
+			//delete ALL fields that must be deleted: this includes eventIn and out since
 			//all fields are defined in the node
 			if (!strcmp(bf->familly, "MFInt")
-				|| !strcmp(bf->familly, "MFFloat")
-				|| !strcmp(bf->familly, "MFDouble")
-				|| !strcmp(bf->familly, "MFBool")
-				|| !strcmp(bf->familly, "MFInt32")
-				|| !strcmp(bf->familly, "MFColor")
-				|| !strcmp(bf->familly, "MFRotation")
-				|| !strcmp(bf->familly, "MFString")
-				|| !strcmp(bf->familly, "MFTime")
-				|| !strcmp(bf->familly, "MFVec2f")
-				|| !strcmp(bf->familly, "MFVec3f")
-				|| !strcmp(bf->familly, "MFVec4f")
-				|| !strcmp(bf->familly, "MFVec2d")
-				|| !strcmp(bf->familly, "MFVec3d")
-				|| !strcmp(bf->familly, "MFURL")
-				|| !strcmp(bf->familly, "MFScript")
-				|| !strcmp(bf->familly, "SFString")
-				|| !strcmp(bf->familly, "SFURL")
-				|| !strcmp(bf->familly, "SFImage")
-				
-				) {
+			        || !strcmp(bf->familly, "MFFloat")
+			        || !strcmp(bf->familly, "MFDouble")
+			        || !strcmp(bf->familly, "MFBool")
+			        || !strcmp(bf->familly, "MFInt32")
+			        || !strcmp(bf->familly, "MFColor")
+			        || !strcmp(bf->familly, "MFRotation")
+			        || !strcmp(bf->familly, "MFString")
+			        || !strcmp(bf->familly, "MFTime")
+			        || !strcmp(bf->familly, "MFVec2f")
+			        || !strcmp(bf->familly, "MFVec3f")
+			        || !strcmp(bf->familly, "MFVec4f")
+			        || !strcmp(bf->familly, "MFVec2d")
+			        || !strcmp(bf->familly, "MFVec3d")
+			        || !strcmp(bf->familly, "MFURL")
+			        || !strcmp(bf->familly, "MFScript")
+			        || !strcmp(bf->familly, "SFString")
+			        || !strcmp(bf->familly, "SFURL")
+			        || !strcmp(bf->familly, "SFImage")
+
+			   ) {
 				char szName[500];
 				strcpy(szName, bf->familly);
 				strlwr(szName);
 				fprintf(vrml_code, "\tgf_sg_%s_del(p->%s);\n", szName, bf->name);
-			} else if (strstr(bf->familly, "Node")) {		
-				//this is a POINTER to a node 
+			} else if (strstr(bf->familly, "Node")) {
+				//this is a POINTER to a node
 				if (strstr(bf->familly, "SF")) {
 					fprintf(vrml_code, "\tgf_node_unregister((GF_Node *) p->%s, node);\t\n", bf->name);
 				} else {
@@ -434,8 +434,8 @@
 				fprintf(vrml_code, "\tgf_sg_vrml_parent_setup((GF_Node *) p);\n");
 				break;
 			}
-			else if ( strstr(bf->familly, "Node") && strncmp(bf->type, "event", 5) ) {		
-				//this is a POINTER to a node 
+			else if ( strstr(bf->familly, "Node") && strncmp(bf->type, "event", 5) ) {
+				//this is a POINTER to a node
 				if (strstr(bf->familly, "MF")) {
 					//this is a POINTER to a chain
 					//fprintf(vrml_code, "\tp->%s = gf_list_new();\t\n", bf->name);
@@ -448,7 +448,7 @@
 		}
 
 		fprintf(vrml_code, "\n\t/*default field values*/\n");
-		
+
 		for (i=0; i<gf_list_count(n->Fields); i++) {
 			bf = gf_list_get(n->Fields, i);
 
@@ -461,14 +461,14 @@
 			//no default on nodes
 			if (strstr(bf->familly, "Node")) continue;
 			//extract default falue
-			
+
 			//
 			//		SF Fields
 			//
-			
+
 			//SFBool
 			if (!strcmp(bf->familly, "SFBool")) {
-				if (!strcmp(bf->def, "1") || !strcmp(bf->def, "TRUE")) 
+				if (!strcmp(bf->def, "1") || !strcmp(bf->def, "TRUE"))
 					fprintf(vrml_code, "\tp->%s = 1;\n", bf->name);
 			}
 			//SFFloat
@@ -569,7 +569,7 @@
 				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
 			}
-		
+
 			//
 			//		MF Fields
 			//
@@ -947,7 +947,7 @@
 		NDTName = gf_list_get(NDTs, i);
 		count = GetNDTCount(NDTName, XNodes);
 		if (!count) continue;
-		
+
 		fprintf(f, "#define %s_X3D_Count\t%d\n", NDTName, count);
 		fprintf(f, "static const u32 %s_X3D_TypeToTag[%d] = {\n", NDTName, count);
 		first = 1;
@@ -955,7 +955,7 @@
 		for (j=0; j<gf_list_count(XNodes); j++) {
 			n = gf_list_get(XNodes, j);
 			if (!IsNodeInTable(n, NDTName)) continue;
-			
+
 			if (first) {
 				fprintf(f, " TAG_X3D_%s", n->name);
 				first = 0;
@@ -1000,7 +1000,7 @@
 		if (sLine[0] == '\n') continue;
 
 		CurrentLine = sLine;
-		
+
 		//parse the line till end of line
 		while (GetNextToken(token, " \t")) {
 
@@ -1042,7 +1042,7 @@
 				}
 				f = BlankField();
 				gf_list_add(n->Fields, f);
-				
+
 				//get the field type
 				strcpy(f->type, token);
 				GetNextToken(f->familly, " \t");
@@ -1167,7 +1167,7 @@
 		//skip comment and empty lines
 		if (sLine[0] == '#') continue;
 		if (sLine[0] == '\n') continue;
-		if (strstr(sLine, "Proximity")) 
+		if (strstr(sLine, "Proximity"))
 			found = 0;
 		found = 1;
 		while (found) {
@@ -1228,12 +1228,12 @@
 			fclose(pf);
 		}
 	}
-	
+
 	//write the nodes def
 	WriteNodesFile(XNodes, NDTs);
 
 	nodes = BeginFile(1);
-	
+
 	//write all nodes init stuff
 	WriteNodeCode(XNodes, nodes);

gpac-0.5.0.svn5178.tar.bz2/applications/m3u82mpd/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/m3u82mpd/main.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Copyright (c) Telecom ParisTech 2010 - 
+ *			Copyright (c) Telecom ParisTech 2010 -
  *					All rights reserved
  *
  *  This file is part of GPAC / m3u82mpd application
@@ -10,15 +10,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -57,16 +57,16 @@
 
 		e = parse_root_playlist(m3u8_local_name, &pl, ".");
 		if (e != GF_OK) return -1;
-		
+
 		fmpd = fopen(argv[2], "wt");
-		
+
 		fprintf(fmpd, "<MPD type=\"Live\" xmlns=\"urn:3GPP:ns:PSS:AdaptiveHTTPStreamingMPD:2009\">\n");
 		fprintf(fmpd, " <ProgramInformation moreInformationURL=\"http://gpac.sourceforge.net\">\n");
 		fprintf(fmpd, "  <Title>Media Presentation Description for file %s</Title>\n", url);
 		fprintf(fmpd, "  <Source>Generated by GPAC %s</Source>\n", GPAC_FULL_VERSION);
 
 		fprintf(fmpd, " </ProgramInformation>\n");
-		fprintf(fmpd, " <Period start=\"PT0S\">\n");	
+		fprintf(fmpd, " <Period start=\"PT0S\">\n");
 
 		count = gf_list_count(pl->programs);
 		for (i=0; i<count; i++) {
@@ -80,7 +80,7 @@
 					u32 k, count3;
 					char *tmp;
 					char c;
-					char baseURL[GF_MAX_PATH]; 
+					char baseURL[GF_MAX_PATH];
 					tmp = strrchr(url, '/');
 					if (tmp) {
 						tmp++;
@@ -91,16 +91,16 @@
 					} else {
 						baseURL[0] = 0;
 					}
-					fprintf(fmpd, "  <Representation mimeType=\"video/mp2t\">\n");	
-					fprintf(fmpd, "   <SegmentInfo duration=\"PT%dS\"", pe->durationInfo);	
-					if (baseURL[0]) fprintf(fmpd, "baseURL=\"%s\"", baseURL);	
-					fprintf(fmpd, ">\n");	
+					fprintf(fmpd, "  <Representation mimeType=\"video/mp2t\">\n");
+					fprintf(fmpd, "   <SegmentInfo duration=\"PT%dS\"", pe->durationInfo);
+					if (baseURL[0]) fprintf(fmpd, "baseURL=\"%s\"", baseURL);
+					fprintf(fmpd, ">\n");
 					count3 = gf_list_count(pe->element.playlist.elements);
 					update_interval = (count3 - 1) * pe->durationInfo * 1000;
 					for (k=0; k<count3; k++) {
 						PlaylistElement *elt = gf_list_get(pe->element.playlist.elements, k);
-						if (k) fprintf(fmpd, "    <Url sourceURL=\"%s\"/>\n", elt->url);	
-						else fprintf(fmpd, "    <InitialisationSegmentURL sourceURL=\"%s\"/>\n", elt->url);	
+						if (k) fprintf(fmpd, "    <Url sourceURL=\"%s\"/>\n", elt->url);
+						else fprintf(fmpd, "    <InitialisationSegmentURL sourceURL=\"%s\"/>\n", elt->url);
 					}
 					fprintf(fmpd, "   </SegmentInfo>\n");
 					fprintf(fmpd, "  </Representation>\n");

gpac-0.5.0.svn5178.tar.bz2/applications/mp42avi/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp42avi/main.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,16 +34,16 @@
 #define GPAC_CFG_FILE "GPAC.cfg"
 #else
 #include <pwd.h>
-typedef struct tagBITMAPFILEHEADER 
+typedef struct tagBITMAPFILEHEADER
 {
-    u16	bfType;
-    u32	bfSize;
-    u16	bfReserved1;
-    u16	bfReserved2;
-    u32 bfOffBits;
+	u16	bfType;
+	u32	bfSize;
+	u16	bfReserved1;
+	u16	bfReserved2;
+	u32 bfOffBits;
 } BITMAPFILEHEADER;
 
-typedef struct tagBITMAPINFOHEADER{
+typedef struct tagBITMAPINFOHEADER {
 	u32	biSize;
 	s32	biWidth;
 	s32	biHeight;
@@ -73,26 +73,26 @@
 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");
+	        "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 
+typedef struct
 {
 	GF_Compositor *sr;
 	GF_SceneGraph *sg;
@@ -165,18 +165,18 @@
 	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(&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++) {
+		for (i=0; i<fb->width; i++) {
 			fputc(ptr[2], fout);
 			fputc(ptr[1], fout);
 			fputc(ptr[0], fout);
@@ -295,7 +295,7 @@
 	b2v.sr = gf_sc_new(&user, 0, NULL);
 	gf_sc_set_option(b2v.sr, GF_OPT_VISIBLE, 0);
 
-	/* Initialization of the scene graph */	
+	/* 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);
@@ -343,7 +343,7 @@
 		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);
 
@@ -398,7 +398,7 @@
 		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++) {
+			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 */
@@ -413,7 +413,7 @@
 		/*calibration*/
 		for (y=0; y<out_fb.height; y++) {
 			u32 line_shift = (5- y%5) % 5;
-			for (x=0; x<out_fb.width;x++) {
+			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;
@@ -434,17 +434,17 @@
 
 
 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]);
+	/*	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);
 		}
-		gf_free(rendered_frames);
-	}
-	if (output_merged_frame) gf_free(output_merged_frame);
-*/
+		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);
+	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)
@@ -460,7 +460,7 @@
 	char old_driv[1024];
 	const char *test;
 	char config_path[GF_MAX_PATH];
-	avi_t *avi_out; 
+	avi_t *avi_out;
 	Bool reset_fps;
 	GF_ESD *esd;
 	char comp[5];
@@ -500,7 +500,7 @@
 		needs_raw = 1;
 	}
 
-		needs_raw = 0;
+	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);
@@ -566,7 +566,7 @@
 	count = gf_isom_get_sample_count(file, i+1);
 
 	reset_fps = 0;
-	if (!fps) { 
+	if (!fps) {
 		fps = (Float) (count * timescale);
 		fps /= (Double) (s64) b2v.duration;
 		printf("Estimated BIFS FrameRate %g\n", fps);
@@ -689,7 +689,7 @@
 		if (arg[0] != '-') {
 			inName = arg;
 			break;
-		}		
+		}
 		if (!stricmp(arg, "-h")) {
 			PrintUsage();
 			return 0;
@@ -775,7 +775,7 @@
 	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);

gpac-0.5.0.svn5178.tar.bz2/applications/mp42ts/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp42ts/main.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -52,15 +52,11 @@
 
 #endif
 
-
-#define DEFAULT_PCR_OFFSET	18000
-
-#define UDP_BUFFER_SIZE	0x40000
-
 #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*/
 
 u32 temi_url_insertion_delay = 1000;
+Bool temi_disable_loop = 0;
 FILE *logfile = NULL;
 
 static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
@@ -70,70 +66,82 @@
 	fflush(logs);
 }
 
-static GFINLINE void usage() 
+static GFINLINE void usage()
 {
 	fprintf(stderr, "GPAC version " GPAC_FULL_VERSION "\n"
-		"GPAC Copyright (c) Telecom ParisTech 2000-2012\n"
-		"GPAC Configuration: " GPAC_CONFIGURATION "\n"
-		"Features: %s\n\n", gpac_features());
+	        "GPAC Copyright (c) Telecom ParisTech 2000-2014\n"
+	        "GPAC Configuration: " GPAC_CONFIGURATION "\n"
+	        "Features: %s\n\n", gpac_features());
 	fprintf(stderr, "mp2ts <inputs> <destinations> [options]\n"
-					"\n"
-					"Inputs:\n"
-					"-prog filename         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"
-					"\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: %d\n"
-					"-psi-rate V            sets PSI refresh rate V in ms (default 100ms).\n"
-					"                        * If 0, PSI data is only send once at the begining 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"
-					"-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 N TS packets together before sending on network or writing to file\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 optionnal\n"
-					"-temi-delay DelayMS    Specifies delay between two TEMI url descriptors\n"
-					"\n"		
-					"MPEG-4/T-DMB options:\n"
-					"-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"
+	        "\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"
+
+	        "\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 begining 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"
+	        "-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 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\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 optionnal\n"
+	        "-temi-delay DelayMS    Specifies delay between two TEMI url descriptors\n"
+	        "-temi-noloop           Do not restart the TEMI timeline at the end of the source\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             enables memory tracker\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", DEFAULT_PCR_OFFSET
-		);
+	        "-logs                  set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
+	        "-h or -help            print this screen\n"
+	        "\n"
+	       );
 }
 
 
@@ -148,7 +156,7 @@
 	GF_SceneEngine *seng;
 #endif
 	GF_Thread *th;
-	char *src_name;
+	char *bifs_src_name;
 	u32 rate;
 	Bool repeat;
 	u32 mpeg4_signaling;
@@ -158,8 +166,15 @@
 	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;
+
 	Double last_ntp;
-} M2TSProgram;
+} M2TSSource;
 
 typedef struct
 {
@@ -176,7 +191,7 @@
 	Bool loop;
 	Bool is_repeat;
 	s64 ts_offset;
-	M2TSProgram *prog;
+	M2TSSource *source;
 
 	const char *temi_url;
 	u32 last_temi_url;
@@ -236,16 +251,15 @@
 	if (!*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,	0x00, 8);
+		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,	strlen(temi_url) ? 0 : 1, 1); //external_url
-		gf_bs_write_int(bs,	0, 1); //use_base_temi_url 
-		gf_bs_write_int(bs,	0xFF, 3); //reserved
-		gf_bs_write_int(bs,	0, 8); //timeline_id
+		gf_bs_write_int(bs,	0, 1); //use_base_temi_url
+		gf_bs_write_int(bs,	0xFF, 5); //reserved
+		gf_bs_write_int(bs,	0, 7); //timeline_id
 
 		if (strlen(temi_url)) {
 			char *url = (char *)temi_url;
@@ -274,7 +288,7 @@
 		if (ntp) len += 8;
 
 		//write timeline descriptor
-		gf_bs_write_int(bs,	0x01, 8);
+		gf_bs_write_int(bs,	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR, 8);
 		gf_bs_write_int(bs,	len, 8);
 
 		gf_bs_write_int(bs,	timescale ? ((timecode > 0xFFFFFFUL) ? 2 : 1) : 0, 2); //has_timestamp
@@ -288,7 +302,7 @@
 		gf_bs_write_int(bs,	0, 8); //timeline_id
 		if (timescale) {
 			gf_bs_write_u32(bs,	timescale); //timescale
-			if (timecode > 0xFFFFFFUL)  
+			if (timecode > 0xFFFFFFUL)
 				gf_bs_write_u64(bs,	timecode); //timestamp
 			else
 				gf_bs_write_u32(bs,	(u32) timecode); //timestamp
@@ -315,7 +329,7 @@
 #ifndef GPAC_DISABLE_TTXT
 		GF_List *cues = NULL;
 #endif
-		if (!priv->sample) 
+		if (!priv->sample)
 			priv->sample = gf_isom_get_sample(priv->mp4, priv->track, priv->sample_number+1, NULL);
 
 		if (!priv->sample) {
@@ -330,6 +344,10 @@
 		if (priv->is_repeat) pck.flags |= GF_ESI_DATA_REPEAT;
 
 		if (priv->temi_url) {
+			u64 tc = priv->sample->DTS + priv->sample->CTS_Offset;
+			if (temi_disable_loop) {
+				tc += priv->ts_offset;
+			}
 			pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->sample->DTS + priv->sample->CTS_Offset, ifce->timescale, 0, priv->temi_url, &priv->last_temi_url);
 			pck.mpeg2_af_descriptors = af_data;
 		}
@@ -338,8 +356,8 @@
 			pck.cts += priv->nb_repeat_last*ifce->timescale * priv->image_repeat_ms / 1000;
 		}
 
+		pck.dts = pck.cts;
 		if (priv->sample->CTS_Offset) {
-			pck.dts = pck.cts;
 			pck.cts += priv->sample->CTS_Offset;
 			pck.flags |= GF_ESI_DATA_HAS_DTS;
 		}
@@ -363,7 +381,7 @@
 			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"));	
+				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) {
@@ -373,7 +391,7 @@
 				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));
@@ -392,9 +410,9 @@
 		gf_isom_sample_del(&priv->sample);
 		priv->sample_number++;
 
-		if (!priv->prog->real_time && !priv->is_repeat) {
-			priv->prog->samples_done++;
-			gf_set_progress("Converting to MPEG-2 TS", priv->prog->samples_done, priv->prog->samples_count);
+		if (!priv->source->real_time && !priv->is_repeat) {
+			priv->source->samples_done++;
+			gf_set_progress("Converting to MPEG-2 TS", priv->source->samples_done, priv->source->samples_count);
 		}
 
 		if (priv->sample_number==priv->sample_count) {
@@ -409,7 +427,7 @@
 				priv->sample_number = 0;
 				priv->is_repeat = (priv->sample_count==1) ? 1 : 0;
 			}
-			else if (priv->image_repeat_ms && priv->prog->nb_real_streams) {
+			else if (priv->image_repeat_ms && priv->source->nb_real_streams) {
 				priv->nb_repeat_last++;
 				priv->sample_number--;
 				priv->is_repeat = 1;
@@ -417,14 +435,14 @@
 				if (!(ifce->caps & GF_ESI_STREAM_IS_OVER)) {
 					ifce->caps |= GF_ESI_STREAM_IS_OVER;
 					if (priv->sample_count>1) {
-						assert(priv->prog->nb_real_streams);
-						priv->prog->nb_real_streams--;
+						assert(priv->source->nb_real_streams);
+						priv->source->nb_real_streams--;
 					}
 				}
 			}
 		}
 	}
-		return GF_OK;
+	return GF_OK;
 
 	case GF_ESI_INPUT_DESTROY:
 		if (priv->dsi) gf_free(priv->dsi);
@@ -440,10 +458,10 @@
 	}
 }
 
-static void fill_isom_es_ifce(M2TSProgram *prog, GF_ESInterface *ifce, GF_ISOFile *mp4, u32 track_num, u32 bifs_use_pes)
+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[4];
+	char *_lan;
 	GF_ESD *esd;
 	u64 avg_rate, duration;
 	s32 ref_count;
@@ -455,13 +473,13 @@
 	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 = prog->real_time ? 1 : 0;
+	priv->loop = source->real_time ? 1 : 0;
 	priv->sample_count = gf_isom_get_sample_count(mp4, track_num);
-	prog->samples_count += priv->sample_count;
+	source->samples_count += priv->sample_count;
 	if (priv->sample_count>1)
-		prog->nb_real_streams++;
+		source->nb_real_streams++;
 
-	priv->prog = prog;
+	priv->source = source;
 	memset(ifce, 0, sizeof(GF_ESInterface));
 	ifce->stream_id = gf_isom_get_track_id(mp4, track_num);
 
@@ -496,11 +514,15 @@
 		}
 		gf_odf_desc_del((GF_Descriptor *)esd);
 	}
-	gf_isom_get_media_language(mp4, track_num, _lan);
-	if (!strcmp(_lan, "und"))
+	gf_isom_get_media_language(mp4, track_num, &_lan);
+	if (!_lan || !strcmp(_lan, "und")) {
 		ifce->lang = 0;
-	else
+	} 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);
@@ -530,7 +552,7 @@
 		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
@@ -538,10 +560,10 @@
 #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 (priv != ifce->input_udta) {
+		if (ifce->input_udta)
+			gf_free(ifce->input_udta);
+		ifce->input_udta = priv;
 	}
 
 
@@ -556,6 +578,15 @@
 	else {
 		ifce->depends_on_stream = 0;
 	}
+
+	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;
+		}
+	}
+
 }
 
 
@@ -565,7 +596,7 @@
 	if (act_type==GF_ESI_INPUT_DESTROY) {
 		//TODO: free my data
 		if (ifce->input_udta)
-		  gf_free(ifce->input_udta);
+			gf_free(ifce->input_udta);
 		ifce->input_udta = NULL;
 		return GF_OK;
 	}
@@ -597,7 +628,7 @@
 
 	s64 ts_offset;
 	Bool rtcp_init;
-	M2TSProgram *prog;
+	M2TSSource *source;
 
 	u32 min_dts_inc;
 	u64 prev_cts;
@@ -628,11 +659,11 @@
 			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->prog->last_ntp) {
-					rtp->prog->last_ntp = time;
+				if (!rtp->source->last_ntp) {
+					rtp->source->last_ntp = time;
 				}
-				if (time >= rtp->prog->last_ntp) {
-					time -= rtp->prog->last_ntp;
+				if (time >= rtp->source->last_ntp) {
+					time -= rtp->source->last_ntp;
 				} else {
 					time = 0;
 				}
@@ -753,7 +784,7 @@
 	}
 }
 
-static void fill_rtp_es_ifce(GF_ESInterface *ifce, GF_SDPMedia *media, GF_SDPInfo *sdp, M2TSProgram *prog)
+static void fill_rtp_es_ifce(GF_ESInterface *ifce, GF_SDPMedia *media, GF_SDPInfo *sdp, M2TSSource *source)
 {
 	u32 i;
 	GF_Err e;
@@ -808,7 +839,7 @@
 	ifce->input_udta = rtp;
 	ifce->input_ctrl = rtp_input_ctrl;
 	rtp->ifce = ifce;
-	rtp->prog = prog;
+	rtp->source = source;
 
 	ifce->object_type_indication = rtp->depacketizer->sl_map.ObjectTypeIndication;
 	ifce->stream_type = rtp->depacketizer->sl_map.StreamType;
@@ -822,31 +853,31 @@
 		case GPAC_OTI_VIDEO_SVC:
 			rtp->is_264 = 1;
 			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_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_list_get(avccfg->pictureParameterSets, i);
-					gf_bs_write_u32(bs, 1);
-					gf_bs_write_data(bs, slc->data, slc->size);
+				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_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_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_bs_get_content(bs, (char **) &rtp->dsi_and_rap, &rtp->avc_dsi_size);
-				gf_bs_del(bs);
-			}	
-			gf_odf_avc_cfg_del(avccfg);
+				gf_odf_avc_cfg_del(avccfg);
 #endif
-		}
+			}
 			break;
 		case GPAC_OTI_AUDIO_AAC_MPEG4:
 			ifce->decoder_config = gf_malloc(sizeof(char) * rtp->depacketizer->sl_map.configSize);
@@ -885,12 +916,12 @@
 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" 
+#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) 
+static GF_Err encode_audio_desc(GF_ESD *esd, GF_SimpleDataDescriptor *audio_desc)
 {
 	GF_Err e;
 	GF_ODCodec *odc = gf_odf_codec_new();
@@ -931,12 +962,12 @@
 
 
 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) {
-		M2TSProgram *prog = (M2TSProgram *)calling_object;
+		M2TSSource *source = (M2TSSource *)calling_object;
 
 #ifndef GPAC_DISABLE_PLAYER
 		if (ESID == AUDIO_DATA_ESID) {
@@ -944,7 +975,7 @@
 				/*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 = prog->streams[audio_OD_stream_id].input_udta;
+				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*/
@@ -957,14 +988,14 @@
 					/*audio stream, all samples are RAPs*/
 					esd->slConfig->useRandomAccessPointFlag = 0;
 					esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
-					for (i=0; i<prog->nb_streams; i++) {
-						if (prog->streams[i].stream_id == AUDIO_DATA_ESID) {
+					for (i=0; i<source->nb_streams; i++) {
+						if (source->streams[i].stream_id == AUDIO_DATA_ESID) {
 							GF_Err e;
-							prog->streams[i].timescale = esd->slConfig->timestampResolution;
-							e = gf_m2ts_program_stream_update_ts_scale(&prog->streams[i], esd->slConfig->timestampResolution);
+							source->streams[i].timescale = esd->slConfig->timestampResolution;
+							e = gf_m2ts_program_stream_update_ts_scale(&source->streams[i], esd->slConfig->timestampResolution);
 							assert(!e);
-							if (!prog->streams[i].sl_config) prog->streams[i].sl_config = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
-							memcpy(prog->streams[i].sl_config, esd->slConfig, sizeof(GF_SLConfig));
+							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;
 						}
 					}
@@ -975,37 +1006,37 @@
 					/*build the ESI*/
 					{
 						/*audio OD descriptor: rap=1 and vers_inc=0*/
-						GF_SAFEALLOC(prog->streams[audio_OD_stream_id].input_udta, GF_ESIStream);
-						((GF_ESIStream*)prog->streams[audio_OD_stream_id].input_udta)->rap = 1;
+						GF_SAFEALLOC(source->streams[audio_OD_stream_id].input_udta, GF_ESIStream);
+						((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.*/
-						prog->repeat = 1;
-						SampleCallBack(prog, AUDIO_OD_ESID, audio_desc->data, audio_desc->size, 0/*gf_m2ts_get_sys_clock(muxer)*/);
-						prog->repeat = 0;
+						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(prog->streams[audio_OD_stream_id].input_udta);
-						prog->streams[audio_OD_stream_id].input_udta = NULL;
+						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 (!prog->audio_configured) {
+			else if (!source->audio_configured) {
 				GF_ESD *esd = AAC_GetESD(aac_reader);
 				assert(esd->slConfig->timestampResolution);
-				for (i=0; i<prog->nb_streams; i++) {
-					if (prog->streams[i].stream_id == AUDIO_DATA_ESID) {
+				for (i=0; i<source->nb_streams; i++) {
+					if (source->streams[i].stream_id == AUDIO_DATA_ESID) {
 						GF_Err e;
-						prog->streams[i].timescale = esd->slConfig->timestampResolution;
-						prog->streams[i].decoder_config = esd->decoderConfig->decoderSpecificInfo->data;
-						prog->streams[i].decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+						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(&prog->streams[i], esd->slConfig->timestampResolution);
+						e = gf_m2ts_program_stream_update_ts_scale(&source->streams[i], esd->slConfig->timestampResolution);
 						if (!e)
-							prog->audio_configured = 1;
+							source->audio_configured = 1;
 						break;
 					}
 				}
@@ -1017,13 +1048,13 @@
 		}
 #endif
 		i=0;
-		while (i<prog->nb_streams){
-			if (prog->streams[i].output_ctrl==NULL) {
+		while (i<source->nb_streams) {
+			if (source->streams[i].output_ctrl==NULL) {
 				fprintf(stderr, "MULTIPLEX NOT YET CREATED\n");
 				return;
 			}
-			if (prog->streams[i].stream_id == ESID) {
-				GF_ESIStream *priv = (GF_ESIStream *)prog->streams[i].input_udta;
+			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;
@@ -1036,19 +1067,19 @@
 
 				if (priv->rap)
 					pck.flags |= GF_ESI_DATA_AU_RAP;
-				if (prog->repeat || !priv->vers_inc) {
+				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); 
+						fprintf(stderr, "Update from scene engine sent: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
 				}
-				prog->streams[i].output_ctrl(&prog->streams[i], GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
+				source->streams[i].output_ctrl(&source->streams[i], GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
 				return;
 			}
-		i++;
+			i++;
 		}
-	} 
+	}
 	return;
 }
 
@@ -1058,7 +1089,7 @@
 static volatile Bool run = 1;
 
 #ifndef GPAC_DISABLE_SENG
-static GF_ESIStream * set_broadcast_params(M2TSProgram *prog, 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)
+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;
@@ -1066,13 +1097,13 @@
 
 	/*locate our stream*/
 	if (esid) {
-		while (i<prog->nb_streams) {
-			if (prog->streams[i].stream_id == esid){
-				priv = (GF_ESIStream *)prog->streams[i].input_udta; 
-				esi = &prog->streams[i]; 
+		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{
+			else {
 				i++;
 			}
 		}
@@ -1087,7 +1118,7 @@
 	}
 
 	/*remember RAP flag*/
-	priv->rap = signal_rap; 
+	priv->rap = signal_rap;
 	priv->critical = signal_critical;
 	priv->vers_inc = version_inc;
 
@@ -1096,7 +1127,7 @@
 
 	/*change stream aggregation mode*/
 	if ((aggregate_on_stream != (u16)-1) && (priv->aggregate_on_stream != aggregate_on_stream)) {
-		gf_seng_enable_aggregation(prog->seng, esid, aggregate_on_stream);
+		gf_seng_enable_aggregation(source->seng, esid, aggregate_on_stream);
 		priv->aggregate_on_stream = aggregate_on_stream;
 	}
 	/*change stream aggregation mode*/
@@ -1117,8 +1148,8 @@
 {
 	GF_Err e;
 	u64 last_src_modif, mod_time;
-	M2TSProgram *prog = (M2TSProgram *)param;
-	GF_SceneEngine *seng = prog->seng;
+	M2TSSource *source = (M2TSSource *)param;
+	GF_SceneEngine *seng = source->seng;
 	GF_SimpleDataDescriptor *audio_desc;
 	Bool update_context=0;
 	Bool force_rap, adjust_carousel_time, discard_pending, signal_rap, signal_critical, version_inc, aggregate_au;
@@ -1127,41 +1158,41 @@
 	e = GF_OK;
 	gf_sleep(2000); /*TODO: events instead? What are we waiting for?*/
 	gf_seng_encode_context(seng, SampleCallBack);
-	
-	last_src_modif = prog->src_name ? gf_file_modification_time(prog->src_name) : 0;
+
+	last_src_modif = source->bifs_src_name ? gf_file_modification_time(source->bifs_src_name) : 0;
 
 	/*send the audio descriptor*/
-	if (prog->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_FULL && audio_OD_stream_id!=(u32)-1) {
-		audio_desc = prog->streams[audio_OD_stream_id].input_udta;
+	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*/
-			prog->repeat = 1;
-			SampleCallBack(prog, AUDIO_OD_ESID, audio_desc->data, audio_desc->size, 0/*gf_m2ts_get_sys_clock(muxer)*/);
-			prog->repeat = 0;
+			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);
-			prog->streams[audio_OD_stream_id].input_udta = NULL;
+			source->streams[audio_OD_stream_id].input_udta = NULL;
 		}
 	}
 
 	while (run) {
 		if (!gf_prompt_has_input()) {
-			if (prog->src_name) {
-				mod_time = gf_file_modification_time(prog->src_name);
+			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_f64_open(prog->src_name, "rt");
+					srcf = gf_f64_open(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';
+						flag_buf[0] = '\0';
 					fclose(srcf);
 
 					aggregate_au = force_rap = adjust_carousel_time = discard_pending = signal_rap = signal_critical = 0;
@@ -1223,25 +1254,25 @@
 							}
 						}
 
-						set_broadcast_params(prog, es_id, period, ts_delta, aggregate_on_stream, adjust_carousel_time, force_rap, aggregate_au, discard_pending, signal_rap, signal_critical, version_inc);
+						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, prog->src_name, SampleCallBack);
-					if (e){
+					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) {
-				prog->repeat = 1;
+				source->repeat = 1;
 				e = gf_seng_encode_context(seng, SampleCallBack);
-				prog->repeat = 0;
+				source->repeat = 0;
 				update_context = 0;
 			}
 
@@ -1249,46 +1280,46 @@
 		} 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;
-				}
+			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;
-				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)); 
 				}
+				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;
-				case 'q':
-				{
-					run = 0;
 				}
+				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;
 }
 
@@ -1300,7 +1331,7 @@
 	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)); 
+	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));
 	}
@@ -1310,9 +1341,9 @@
 	memset(stream, 0, sizeof(GF_ESIStream));
 	stream->rap = 1;
 	if (ifce->input_udta)
-	  gf_free(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) {
@@ -1323,16 +1354,16 @@
 }
 #endif
 
-static Bool open_program(M2TSProgram *prog, 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)
+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)
 {
 #ifndef GPAC_DISABLE_STREAMING
 	GF_SDPInfo *sdp;
 #endif
 	u32 i;
 	s64 min_offset = 0;
-	
-	memset(prog, 0, sizeof(M2TSProgram));
-	prog->mpeg4_signaling = mpeg4_signaling;
+
+	memset(source, 0, sizeof(M2TSSource));
+	source->mpeg4_signaling = mpeg4_signaling;
 
 	/*open ISO file*/
 	if (gf_isom_probe_file(src)) {
@@ -1340,45 +1371,45 @@
 		Bool has_bifs_od = 0;
 		u32 first_audio = 0;
 		u32 first_other = 0;
-		prog->mp4 = gf_isom_open(src, GF_ISOM_OPEN_READ, 0);
-		prog->nb_streams = 0;
-		prog->real_time = force_real_time;
+		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(prog->mp4, 1);
-		nb_tracks = gf_isom_get_track_count(prog->mp4); 
+		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(prog->mp4, i+1) == GF_ISOM_MEDIA_HINT) 
-				continue; 
+			if (gf_isom_get_media_type(source->mp4, i+1) == GF_ISOM_MEDIA_HINT)
+				continue;
 
-			fill_isom_es_ifce(prog, &prog->streams[i], prog->mp4, i+1, bifs_use_pes);
-			if (min_offset > ((GF_ESIMP4 *)prog->streams[i].input_udta)->ts_offset)
-				min_offset = ((GF_ESIMP4 *)prog->streams[i].input_udta)->ts_offset;
+			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;
 
-			switch(prog->streams[i].stream_type) {
+			switch(source->streams[i].stream_type) {
 			case GF_STREAM_OD:
 				has_bifs_od = 1;
-				prog->streams[i].repeat_rate = carousel_rate;
+				source->streams[i].repeat_rate = carousel_rate;
 				break;
 			case GF_STREAM_SCENE:
 				has_bifs_od = 1;
-				prog->streams[i].repeat_rate = carousel_rate;
+				source->streams[i].repeat_rate = carousel_rate;
 				break;
 			case GF_STREAM_VISUAL:
 				/*turn on image repeat*/
-				switch (prog->streams[i].object_type_indication) {
+				switch (source->streams[i].object_type_indication) {
 				case GPAC_OTI_IMAGE_JPEG:
 				case GPAC_OTI_IMAGE_PNG:
-					((GF_ESIMP4 *)prog->streams[i].input_udta)->image_repeat_ms = carousel_rate;
+					((GF_ESIMP4 *)source->streams[i].input_udta)->image_repeat_ms = carousel_rate;
 					break;
 				default:
 					check_deps = 1;
-					if (gf_isom_get_sample_count(prog->mp4, i+1)>1) {
+					if (gf_isom_get_sample_count(source->mp4, i+1)>1) {
 						/*get first visual stream as PCR*/
-						if (!prog->pcr_idx) {
-							prog->pcr_idx = i+1;
-							((GF_ESIMP4 *)prog->streams[i].input_udta)->temi_url = temi_url;
+						if (!source->pcr_idx) {
+							source->pcr_idx = i+1;
+							((GF_ESIMP4 *)source->streams[i].input_udta)->temi_url = temi_url;
 						}
 					}
 					break;
@@ -1392,66 +1423,66 @@
 				/*log not supported stream type: %s*/
 				break;
 			}
-			prog->nb_streams++;
-			if (gf_isom_get_sample_count(prog->mp4, i+1)>1) first_other = i+1;
+			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(prog->mp4, k+1) != GF_ISOM_MEDIA_OD) 
-						continue; 
+					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(prog->mp4, k+1, GF_ISOM_REF_OD, gf_isom_get_track_id(prog->mp4, i+1) )==1) {
+					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) {
-					prog->streams[i].caps |= GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS;
+					source->streams[i].caps |= GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS;
 				}
 			}
 		}
-		if (has_bifs_od && !prog->mpeg4_signaling) prog->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
+		if (has_bifs_od && !source->mpeg4_signaling) source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
 
 		/*if no visual PCR found, use first audio*/
-		if (!prog->pcr_idx) prog->pcr_idx = first_audio;
-		if (!prog->pcr_idx) prog->pcr_idx = first_other;
-		if (prog->pcr_idx) {
+		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;
-			prog->pcr_idx-=1;
-			priv = prog->streams[prog->pcr_idx].input_udta;
-			gf_isom_set_default_sync_track(prog->mp4, priv->track);
+			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<prog->nb_streams; i++) {
-				((GF_ESIMP4 *)prog->streams[i].input_udta)->ts_offset += -min_offset;
+			for (i=0; i<source->nb_streams; i++) {
+				((GF_ESIMP4 *)source->streams[i].input_udta)->ts_offset += -min_offset;
 			}
 		}
 
-		prog->iod = gf_isom_get_root_od(prog->mp4);
-		if (prog->iod) {
-			GF_ObjectDescriptor*iod = (GF_ObjectDescriptor*)prog->iod;
-			if (gf_list_count( ((GF_ObjectDescriptor*)prog->iod)->ESDescriptors) == 0) {
-				gf_odf_desc_del(prog->iod);
-				prog->iod = NULL;
+		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 (prog->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_SCENE) {
+				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(prog->mp4, esd->ESID);
-						if (gf_isom_get_sample_count(prog->mp4, track_num)>1) 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(prog->mp4, track_num, 1, NULL);
+						sample = gf_isom_get_sample(source->mp4, track_num, 1, NULL);
 						if (sample->dataLength >= 255-2) {
 							gf_isom_sample_del(&sample);
 							continue;
@@ -1462,26 +1493,26 @@
 							if (dep_esd->dependsOnESID==esd->ESID) dep_esd->dependsOnESID = esd->dependsOnESID;
 						}
 
-						for (k=0; k<prog->nb_streams; k++) {
-							if (prog->streams[k].stream_id==esd->ESID) {
-								prog->streams[k].stream_type = 0;
+						for (k=0; k<source->nb_streams; k++) {
+							if (source->streams[k].stream_id==esd->ESID) {
+								source->streams[k].stream_type = 0;
 								break;
 							}
 						}
 
-						if (!prog->od_updates) prog->od_updates = gf_list_new();
-						GF_SAFEALLOC(oddesc, GF_M2TSDescriptor); 
+						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(prog->od_updates, oddesc);
+						gf_list_add(source->od_updates, oddesc);
 
 						gf_list_rem(iod->ESDescriptors, i);
 						i--;
 						gf_odf_desc_del((GF_Descriptor *) esd);
-						prog->samples_count--;
+						source->samples_count--;
 					}
 				}
 
@@ -1536,186 +1567,186 @@
 			size64 = (u32) strlen(buf64) - 1;
 			size = gf_base64_decode(buf64, size64, buf, 2000);
 
-			gf_odf_desc_read(buf, size, &prog->iod);
+			gf_odf_desc_read(buf, size, &source->iod);
 			break;
 		}
 
-		prog->nb_streams = gf_list_count(sdp->media_desc);
-		for (i=0; i<prog->nb_streams; i++) {
+		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(&prog->streams[i], media, sdp, prog);
-			switch(prog->streams[i].stream_type) {
+			fill_rtp_es_ifce(&source->streams[i], media, sdp, source);
+			switch(source->streams[i].stream_type) {
 			case GF_STREAM_OD:
 			case GF_STREAM_SCENE:
-				prog->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-				prog->streams[i].repeat_rate = carousel_rate;
+				source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
+				source->streams[i].repeat_rate = carousel_rate;
 				break;
 			}
-			if (!prog->pcr_idx && (prog->streams[i].stream_type == GF_STREAM_VISUAL)) {
-				prog->pcr_idx = i+1;
+			if (!source->pcr_idx && (source->streams[i].stream_type == GF_STREAM_VISUAL)) {
+				source->pcr_idx = i+1;
 			}
 		}
 
-		if (prog->pcr_idx) prog->pcr_idx-=1;
+		if (source->pcr_idx) source->pcr_idx-=1;
 		gf_sdp_info_del(sdp);
 
 		return 2;
-	} else 
+	} else
 #endif /*GPAC_DISABLE_STREAMING*/
 
 #ifndef GPAC_DISABLE_SENG
-	if (strstr(src, ".bt")) //open .bt file
-	{
-		u32 load_type=0;
-		prog->seng = gf_seng_init(prog, src, load_type, NULL, (load_type == GF_SM_LOAD_DIMS) ? 1 : 0);
-		if (!prog->seng) {
-			fprintf(stderr, "Cannot create scene engine\n");
-			exit(1);
-		}
-		else{
-			fprintf(stderr, "Scene engine created.\n");
-		}
-		assert( prog );
-		assert( prog->seng);
-		prog->iod = gf_seng_get_iod(prog->seng);
-		if (! prog->iod){
-		    fprintf(stderr, __FILE__": No IOD\n");
-		}
-
-		prog->nb_streams = gf_seng_get_stream_count(prog->seng);
-		prog->rate = carousel_rate;
-		prog->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-
-		for (i=0; i<prog->nb_streams; i++) {
-			fill_seng_es_ifce(&prog->streams[i], i, prog->seng, prog->rate);
-			//fprintf(stderr, "Fill interface\n");
-			if (!prog->pcr_idx && (prog->streams[i].stream_type == GF_STREAM_AUDIO)) {
-				prog->pcr_idx = i+1;
+		if (strstr(src, ".bt")) //open .bt file
+		{
+			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;
+				}
 			}
-		}
 
-		/*when an audio input is present, declare it and store OD + ESD_U*/
-		if (audio_input_ip) {
-			/*add the audio program*/
-			prog->pcr_idx = prog->nb_streams;
-			prog->streams[prog->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*/
-				prog->streams[prog->nb_streams].object_type_indication = GPAC_OTI_AUDIO_MPEG1;
-			} else { /*HTTP*/
-				aac_reader->oti = prog->streams[prog->nb_streams].object_type_indication = GPAC_OTI_AUDIO_AAC_MPEG4;
-			}
-			prog->streams[prog->nb_streams].input_ctrl = void_input_ctrl;
-			prog->streams[prog->nb_streams].stream_id = AUDIO_DATA_ESID;
-			prog->streams[prog->nb_streams].timescale = 1000;
-
-			GF_SAFEALLOC(prog->streams[prog->nb_streams].input_udta, GF_ESIStream);
-			((GF_ESIStream*)prog->streams[prog->nb_streams].input_udta)->vers_inc = 1;	/*increment version number at every audio update*/
-			assert( prog );
-			//assert( prog->iod);
-			if (prog->iod && ((prog->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);
+			/*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*/
-					esd = gf_odf_desc_esd_new(0);
-					esd->decoderConfig->streamType = prog->streams[prog->nb_streams].stream_type;
-					esd->decoderConfig->objectTypeIndication = prog->streams[prog->nb_streams].object_type_indication;
-				} else {				/*HTTP*/
-					esd = AAC_GetESD(aac_reader);		/*in case of AAC, we have to wait the first ADTS chunk*/
+					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;
 				}
-				assert( esd );
-				esd->ESID = prog->streams[prog->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);
+				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);
+				((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<prog->nb_streams; i++) {
-					if (prog->streams[i].stream_id == AUDIO_OD_ESID) {
-						if (prog->streams[i].input_udta)
-						  gf_free(prog->streams[i].input_udta);
-						prog->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;
+					/*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;
 				}
-				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 {
-				prog->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_SCENE;
+				source->nb_streams++;
 			}
-			prog->nb_streams++;
-		}
 
-		/*when an audio input is present, declare it and store OD + ESD_U*/
-		if (video_buffer) {
-			/*add the video program*/
-			prog->streams[prog->nb_streams].stream_type = GF_STREAM_VISUAL;
-			prog->streams[prog->nb_streams].object_type_indication = GPAC_OTI_VIDEO_AVC;
-			prog->streams[prog->nb_streams].input_ctrl = void_input_ctrl;
-			prog->streams[prog->nb_streams].stream_id = VIDEO_DATA_ESID;
-			prog->streams[prog->nb_streams].timescale = 1000;
+			/*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(prog->streams[prog->nb_streams].input_udta, GF_ESIStream);
-			((GF_ESIStream*)prog->streams[prog->nb_streams].input_udta)->vers_inc = 1;	/*increment version number at every video update*/
-			assert(prog);
+				GF_SAFEALLOC(source->streams[source->nb_streams].input_udta, GF_ESIStream);
+				((GF_ESIStream*)source->streams[source->nb_streams].input_udta)->vers_inc = 1;	/*increment version number at every video update*/
+				assert(source);
 
-			if (prog->iod && ((prog->iod->tag!=GF_ODF_IOD_TAG) || (mpeg4_signaling != GF_M2TS_MPEG4_SIGNALING_SCENE))) {
-				assert(0); /*TODO*/
+				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 = prog->streams[prog->nb_streams].stream_type;
-				esd->decoderConfig->objectTypeIndication = prog->streams[prog->nb_streams].object_type_indication;
-				esd->ESID = prog->streams[prog->nb_streams].stream_id;
-
-				/*find the audio OD stream and attach its descriptor*/
-				for (i=0; i<prog->nb_streams; i++) {
-					if (prog->streams[i].stream_id == 103/*TODO: VIDEO_OD_ESID*/) {
-						if (prog->streams[i].input_udta)
-						  gf_free(prog->streams[i].input_udta);
-						prog->streams[i].input_udta = (void*)video_desc;
-						audio_OD_stream_id = i;
-						break;
+					/*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;
 					}
-				}
-				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 (prog->mpeg4_signaling == GF_M2TS_MPEG4_SIGNALING_SCENE);
-			}
+				} else {
+					assert (source->mpeg4_signaling == GF_M2TS_MPEG4_SIGNALING_SCENE);
+				}
 
-			prog->nb_streams++;
-		}
+				source->nb_streams++;
+			}
 
-		if (!prog->pcr_idx) prog->pcr_idx=1;
-		prog->th = gf_th_new("Carousel");
-		prog->src_name = update;
-		gf_th_run(prog->th, seng_output, prog);
-		return 1;
-	} else
+			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 = fopen(src, "rt");
-		if (f) {
-			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);
+		{
+			FILE *f = fopen(src, "rt");
+			if (f) {
+				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;
 		}
-		return 0;
-	}
 }
 
 /*macro to keep retro compatibility with '=' and spaces in parse_args*/
@@ -1724,20 +1755,20 @@
             || ((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, u64 *pcr_init_val, u32 *pcr_offset, u32 *psi_refresh_rate, Bool *single_au_pes, u32 *bifs_use_pes, 
-								  M2TSProgram *progs, u32 *nb_progs, char **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 *ttl, const char **ip_ifce, const char **temi_url)
+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, Bool *single_au_pes, 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 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;
-	char *prog_name, *arg = NULL, *next_arg = NULL, *error_msg = "no argument found";
-	u32 mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_NONE; 
+	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;
+	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];
@@ -1795,28 +1826,28 @@
 #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;
+				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;
+				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);
+				default:
+					assert(0);
 				}
 			}
 		} else if (CHECK_PARAM("-psi-rate")) {
@@ -1835,7 +1866,7 @@
 			gf_sys_init(GF_TRUE);
 			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
 #else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n");
 #endif
 		} else if (CHECK_PARAM("-rate")) {
 			if (rate_found) {
@@ -1873,22 +1904,22 @@
 			*split_rap = 1;
 		} else if (!stricmp(arg, "-flush-rap")) {
 			*split_rap = 2;
-		}
-		else if (!strnicmp(arg, "-dst-udp", 8)) {
-			*real_time = 1;
-		} else if (!strnicmp(arg, "-dst-rtp", 8)) {
-			*real_time = 1;
 		} 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("-logs")) {
-				if (gf_log_set_tools_levels(next_arg) != GF_OK)
-					return GF_BAD_PARAM;
+		} 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_f64_open(next_arg, "wt");
 			gf_log_set_callback(logfile, on_gpac_log);
@@ -1923,30 +1954,29 @@
 			}
 			seg_number_found = 1;
 			*segment_number = atoi(next_arg);
-		} 
-		else if (CHECK_PARAM("-src")) {
+		}
+		else if (CHECK_PARAM("-bifs-src")) {
 			if (src_found) {
-				error_msg = "multiple '-src' found";
+				error_msg = "multiple '-bifs-src' found";
 				arg = NULL;
 				goto error;
 			}
 			src_found = 1;
-			*src_name = next_arg;
+			*bifs_src_name = next_arg;
 		} else if (CHECK_PARAM("-dst-file")) {
 			dst_found = 1;
 			*ts_out = gf_strdup(next_arg);
-		} else if (!strnicmp(arg, "-temi", 5)) {
-			*temi_url = "";
-			if (arg[5]=='=' || arg[5]==' ') {
-				*temi_url = arg+6; 
-				if (strlen(arg+6) > 150) {
-					fprintf(stderr, "URLs longer than 150 bytes are not currently supported\n");
-					return GF_NOT_SUPPORTED;
-				}
+		} else if (CHECK_PARAM("-temi")) {
+			*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;
 			}
 		}
 		else if (CHECK_PARAM("-temi-delay")) {
 			temi_url_insertion_delay = atoi(next_arg);
+		} else if (!stricmp(arg, "-temi-noloop")) {
+			temi_disable_loop = 1;
 		}
 		else if (CHECK_PARAM("-dst-udp")) {
 			char *sep = strchr(next_arg, ':');
@@ -1973,7 +2003,10 @@
 			} else {
 				*rtp_out = gf_strdup(next_arg);
 			}
-		} else if (strnicmp(arg, "-prog", 5)) { //second pass arguments
+		} else if (CHECK_PARAM("-src")) { //second pass arguments
+		} else if (CHECK_PARAM("-prog")) { //second pass arguments
+		}
+		else {
 			error_msg = "unknown option";
 			goto error;
 		}
@@ -1982,59 +2015,72 @@
 	rate_found = 1;
 
 	/*second pass: other*/
-	for (i=1; i<argc; i++) {		
-		arg = argv[i];		
-		if (arg[0]=='-') {
-			if (CHECK_PARAM("-prog")) {
-				u32 res;
-				prog_name = next_arg;
-				res = open_program(&progs[*nb_progs], prog_name, *carrousel_rate, mpeg4_signaling, *src_name, *audio_input_ip, *audio_input_port, *video_buffer, force_real_time, *bifs_use_pes, *temi_url);
-				if (res) {
-					(*nb_progs)++;
-					if (res==2) *real_time=1;
-				}
-			}
-		} 
-#if 0
-		else { /*"dst" argument (output)*/
-			if (dst_found) {
-				error_msg = "multiple output arguments (no '-') found";
-				arg = NULL;
-				goto error;
-			}
-			dst_found = 1;
-			if (!strnicmp(arg, "rtp://", 6) || !strnicmp(arg, "udp://", 6)) {
-				char *sep = strchr(arg+6, ':');
-				*output_type = (arg[0]=='r') ? 2 : 1;
-				*real_time=1;
-				if (sep) {
-					*output_port = atoi(sep+1);
-					sep[0]=0;
-					*ts_out = gf_strdup(arg+6);
-					sep[0]=':';
-				} else {
-					*ts_out = gf_strdup(arg+6);
+	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);
+
+
+		//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;
+						break;
+					}
 				}
-			} else {
-				*output_type = 0;
-				*ts_out = gf_strdup(arg);
 			}
+
+			if (sep) {
+				sep[0] = ':';
+				src_args = sep+1;
+			} else
+				break;
+		}
+
+		if (res) {
+			(*nb_sources)++;
+			if (res==2) *real_time=1;
 		}
-#endif
 	}
 	/*syntax is correct; now testing the presence of mandatory arguments*/
-	if (dst_found && *nb_progs && rate_found) {
+	if (dst_found && *nb_sources && rate_found) {
 		return GF_OK;
 	} else {
 		if (!dst_found)
 			fprintf(stderr, "Error: Destination argument not found\n");
-		if (! *nb_progs)
+		if (! *nb_sources)
 			fprintf(stderr, "Error: No Programs are available\n");
 		usage();
 		return GF_BAD_PARAM;
 	}
 
-error:	
+error:
 	if (!arg) {
 		fprintf(stderr, "Error: %s\n", error_msg);
 	} else {
@@ -2043,7 +2089,7 @@
 	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) 
+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;
@@ -2101,9 +2147,9 @@
 	GF_Err e;
 	u32 run_time;
 	Bool real_time, single_au_pes, is_stdout;
-	u64 pcr_init_val=0;
-	u32 usec_till_next, ttl, split_rap;
-	u32 i, j, mux_rate, nb_progs, cur_pid, carrousel_rate, last_print_time, last_video_time, bifs_use_pes, psi_refresh_rate, nb_pck_pack, nb_pck_in_pack;
+	s64 pcr_init_val = -1;
+	u32 usec_till_next, ttl, split_rap, sdt_refresh_rate;
+	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;
@@ -2118,9 +2164,9 @@
 	u32 output_type, audio_input_type, pcr_offset;
 	char *audio_input_buffer = NULL;
 	u32 audio_input_buffer_length=65536;
-	char *src_name;
+	char *bifs_src_name;
 	const char *insert_temi = 0;
-	M2TSProgram progs[MAX_MUX_SRC_PROG];
+	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;
@@ -2129,22 +2175,23 @@
 	const char *ip_ifce = NULL;
 	GF_M2TS_Time prev_seg_time;
 	GF_M2TS_Mux *muxer;
-	
+
 	/*****************/
 	/*   gpac init   */
 	/*****************/
 	gf_sys_init(GF_FALSE);
 	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-	
+
 	/***********************/
 	/*   initialisations   */
 	/***********************/
-	real_time = 0;	
+	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
@@ -2152,8 +2199,8 @@
 	rtp_out = NULL;
 #endif
 	ts_out = NULL;
-	src_name = NULL;
-	nb_progs = 0;
+	bifs_src_name = NULL;
+	nb_sources = 0;
 	mux_rate = 0;
 	run_time = 0;
 	carrousel_rate = 500;
@@ -2168,6 +2215,7 @@
 	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
@@ -2177,19 +2225,19 @@
 	split_rap = 0;
 	ttl = 1;
 	psi_refresh_rate = GF_M2TS_PSI_DEFAULT_REFRESH_RATE;
-	pcr_offset = DEFAULT_PCR_OFFSET;
+	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, &single_au_pes, &bifs_use_pes, progs, &nb_progs, &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, &ttl, &ip_ifce, &insert_temi)) {
+	if (GF_OK != parse_args(argc, argv, &mux_rate, &carrousel_rate, &pcr_init_val, &pcr_offset, &psi_refresh_rate, &single_au_pes, &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)) {
 		goto exit;
 	}
-	
+
 	if (run_time && !mux_rate) {
 		fprintf(stderr, "Cannot specify TS run time for VBR multiplex - disabling run time\n");
 		run_time = 0;
@@ -2200,7 +2248,8 @@
 	/***************************/
 	muxer = gf_m2ts_mux_new(mux_rate, psi_refresh_rate, real_time);
 	if (muxer) gf_m2ts_mux_use_single_au_pes_mode(muxer, single_au_pes);
-	if (pcr_init_val) gf_m2ts_mux_set_initial_pcr(muxer, pcr_init_val);
+	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);
 
 	if (ts_out != NULL) {
 		if (segment_duration) {
@@ -2218,12 +2267,12 @@
 				sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
 			}
 			ts_out = gf_strdup(segment_name);
-			if (!segment_manifest) { 
+			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;
@@ -2291,7 +2340,7 @@
 	/*   create streaming audio input   */
 	/************************************/
 	if (audio_input_ip)
-	switch(audio_input_type) {
+		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)) {
@@ -2316,7 +2365,7 @@
 			break;
 #ifndef GPAC_DISABLE_PLAYER
 		case GF_MP42TS_HTTP:
-			audio_prog = (void*)&progs[nb_progs-1];
+			audio_prog = (void*)&sources[nb_sources-1];
 			aac_download_file(aac_reader, audio_input_ip);
 			break;
 #endif
@@ -2325,44 +2374,80 @@
 			break;
 		default:
 			assert(0);
-	}
+		}
 
-	if (!nb_progs) {
+	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_progs; i++) {
-		GF_M2TS_Mux_Program *program = gf_m2ts_mux_program_add(muxer, i+1, cur_pid, psi_refresh_rate, pcr_offset, progs[i].mpeg4_signaling);
-		if (progs[i].mpeg4_signaling) program->iod = progs[i].iod;
-		if (progs[i].od_updates) {
-			program->loop_descriptors = progs[i].od_updates;
-			progs[i].od_updates = NULL;
+	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);
+			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<progs[i].nb_streams; j++) {
+		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 (!progs[i].streams[j].stream_type) continue;
+			if (!sources[i].streams[j].stream_type) continue;
 
-			if (progs[i].streams[j].stream_type==GF_STREAM_SCENE) force_pes_mode = bifs_use_pes ? 1 : 0;
+			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, &progs[i].streams[j], cur_pid+j+1, (progs[i].pcr_idx==j) ? 1 : 0, force_pes_mode);
-			if (split_rap && (progs[i].streams[j].stream_type==GF_STREAM_VISUAL)) stream->start_pes_at_rap = 1;
+			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 += progs[i].nb_streams;
+		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);
 	}
@@ -2378,32 +2463,33 @@
 		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*)&progs[nb_progs-1], AUDIO_DATA_ESID, audio_input_buffer, read, gf_m2ts_get_sys_clock(muxer));
-					}
-					break;
+			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;
+			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);
+			default:
+				assert(0);
 			}
 		}
 
@@ -2425,7 +2511,7 @@
 
 call_flush:
 			if (ts_output_file != NULL) {
-				gf_fwrite(ts_pck, 1, 188 * nb_pck_in_pack, ts_output_file); 
+				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;
 					fclose(ts_output_file);
@@ -2445,7 +2531,7 @@
 						goto exit;
 					}
 					/* delete the oldest segment */
-					if (segment_number && ((s32) (segment_index - segment_number - 1) >= 0)){
+					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])) {
@@ -2458,14 +2544,14 @@
 						}
 						gf_delete_file(old_segment_name);
 					}
-					write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, 
+					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);
-				} 
+					               ( (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); 
+				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));
 				}
@@ -2503,7 +2589,7 @@
 			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*)&progs[nb_progs-1], VIDEO_DATA_ESID, video_buffer, video_buffer_size, gf_m2ts_get_sys_clock(muxer)+1000/*try buffering due to VLC msg*/);
+					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;
 			}
 		}
@@ -2513,7 +2599,7 @@
 			u32 now=gf_sys_clock();
 			if (now > last_print_time + MP42TS_PRINT_TIME_MS) {
 				last_print_time = now;
-				fprintf(stderr, "M2TS: time %d - TS time %d - avg bitrate %d\r", gf_m2ts_get_sys_clock(muxer), gf_m2ts_get_ts_clock(muxer), muxer->average_birate_kbps);
+				fprintf(stderr, "M2TS: time % 6d - TS time % 6d - avg 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();
@@ -2550,6 +2636,7 @@
 	{
 		u64 bits = muxer->tot_pck_sent*8*188;
 		u32 dur_sec = gf_m2ts_get_ts_clock(muxer) / 1000;
+		if (!dur_sec) dur_sec = 1;
 		fprintf(stderr, "Done muxing - %d sec - average rate %d kbps "LLD" packets written\n", dur_sec, (u32) (bits/dur_sec/1000), muxer->tot_pck_sent);
 		fprintf(stderr, "\tPadding: "LLD" packets - "LLD" PES padded bytes (%g kbps)\n", muxer->tot_pad_sent, muxer->tot_pes_pad_bytes, (Double) (muxer->tot_pes_pad_bytes*8.0/dur_sec/1000) );
 	}
@@ -2574,29 +2661,29 @@
 	if (rtp_out) gf_free(rtp_out);
 #endif
 	if (muxer) gf_m2ts_mux_del(muxer);
-	
-	for (i=0; i<nb_progs; i++) {
-		for (j=0; j<progs[i].nb_streams; j++) {
-			if (progs[i].streams[j].input_ctrl) progs[i].streams[j].input_ctrl(&progs[i].streams[j], GF_ESI_INPUT_DESTROY, NULL);
-			if (progs[i].streams[j].input_udta){
-			  gf_free(progs[i].streams[j].input_udta);
+
+	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 (progs[i].streams[j].decoder_config) {
-			  gf_free(progs[i].streams[j].decoder_config);
+			if (sources[i].streams[j].decoder_config) {
+				gf_free(sources[i].streams[j].decoder_config);
 			}
-			if (progs[i].streams[j].sl_config) {
-			  gf_free(progs[i].streams[j].sl_config);
+			if (sources[i].streams[j].sl_config) {
+				gf_free(sources[i].streams[j].sl_config);
 			}
 		}
-		if (progs[i].iod) gf_odf_desc_del((GF_Descriptor*)progs[i].iod);
-		if (progs[i].mp4) gf_isom_close(progs[i].mp4);
+		if (sources[i].iod) gf_odf_desc_del((GF_Descriptor*)sources[i].iod);
+		if (sources[i].mp4) gf_isom_close(sources[i].mp4);
 #ifndef GPAC_DISABLE_SENG
-		if (progs[i].seng){
-		    gf_seng_terminate(progs[i].seng);
-		    progs[i].seng = NULL;
+		if (sources[i].seng) {
+			gf_seng_terminate(sources[i].seng);
+			sources[i].seng = NULL;
 		}
 #endif
-		if (progs[i].th) gf_th_del(progs[i].th);
+		if (sources[i].th) gf_th_del(sources[i].th);
 	}
 
 #ifndef GPAC_DISABLE_PLAYER

gpac-0.5.0.svn5178.tar.bz2/applications/mp42ts/mp42ts.h -> gpac-0.5.1.svn5491.tar.xz/applications/mp42ts/mp42ts.h Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/isomedia.h>
@@ -80,7 +80,7 @@
 
 	/*average stream bit-rate in bit/sec*/
 	u32 bit_rate;
-	
+
 	/*multiplexer time - NOT THE PCR*/
 	M2TS_Time time;
 
@@ -161,12 +161,12 @@
 
 	Bool needs_reconfig;
 
-    /* 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) */
+	/* 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)
-       or if the output stream will contain only input data*/
+	   or if the output stream will contain only input data*/
 	Bool fixed_rate;
 
 	/*output bit-rate in bit/sec*/
@@ -175,14 +175,14 @@
 	char dst_pck[188], null_pck[188];
 
 	/*multiplexer time, incremented each time a packet is sent
-      used to monitor the sending of muxer related data (PAT, ...) */
-	M2TS_Time time; 
-    
-    /* Time of the muxer when the first call to process is made (first packet sent?) */
-    M2TS_Time init_ts_time;
-	
-    /* System time when the muxer is started */
-    u32 init_sys_time;
+	  used to monitor the sending of muxer related data (PAT, ...) */
+	M2TS_Time time;
+
+	/* Time of the muxer when the first call to process is made (first packet sent?) */
+	M2TS_Time init_ts_time;
+
+	/* System time when the muxer is started */
+	u32 init_sys_time;
 
 	Bool eos_found;
 	u32 pck_sent_over_br_window, last_br_time, avg_br;

gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/filedump.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp4box/filedump.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -56,7 +56,7 @@
 
 extern u32 swf_flags;
 extern Float swf_flatten_angle;
-extern u32 get_file_type_by_ext(char *inName);
+extern GF_FileType get_file_type_by_ext(char *inName);
 
 void scene_coding_log(void *cbk, u32 log_level, u32 log_tool, const char *fmt, va_list vlist);
 
@@ -66,47 +66,20 @@
 
 void PrintLanguages()
 {
-	u32 i=0;
+	u32 i=0, count = gf_lang_get_count();
 	fprintf(stderr, "Supported ISO 639 languages and codes:\n\n");
-	while (GF_ISO639_Lang[i]) {
-		if (!GF_ISO639_Lang[i+2][0]) {
-			i+=3;
-			continue;
+	for (i=0; i<count; i++) {
+		if (gf_lang_get_2cc(i)) {
+			fprintf(stderr, "%s (%s - %s)\n", gf_lang_get_name(i), gf_lang_get_3cc(i), gf_lang_get_2cc(i));
 		}
-		fprintf(stderr, "%s (%s - %s)\n", GF_ISO639_Lang[i], GF_ISO639_Lang[i+1], GF_ISO639_Lang[i+2]);
-		i+=3;
 	}
 }
 
 static const char *GetLanguage(char *lcode)
 {
-	u32 i=0;
-	if ((lcode[0]=='u') && (lcode[1]=='n') && (lcode[2]=='d')) return "Undetermined";
-	while (GF_ISO639_Lang[i]) {
-		if (GF_ISO639_Lang[i+2][0] && strstr(GF_ISO639_Lang[i+1], lcode)) return GF_ISO639_Lang[i];
-		i+=3;
-	}
-	return "Unknown";
-}
-
-const char *GetLanguageCode(char *lang)
-{
-	u32 i;
-	Bool check_2cc = 0;
-	i = (u32) strlen(lang);
-	if (i==3) return lang;
-	if (i==2) check_2cc = 1;
-
-	i=0;
-	while (GF_ISO639_Lang[i]) {
-		if (GF_ISO639_Lang[i+2][0]) {
-			if (check_2cc) {
-				if (!stricmp(GF_ISO639_Lang[i+2], lang) ) return GF_ISO639_Lang[i+1];
-			} else if (!stricmp(GF_ISO639_Lang[i], lang)) return GF_ISO639_Lang[i+1];
-		}
-		i+=3;
-	}
-	return "und";
+	s32 idx = gf_lang_find(lcode);
+	if (idx>=0) return gf_lang_get_name(idx);
+	return lcode;
 }
 
 GF_Err dump_cover_art(GF_ISOFile *file, char *inName)
@@ -127,7 +100,7 @@
 	sprintf(szName, "%s.%s", inName, (tag_len>>31) ? "png" : "jpg");
 	t = gf_f64_open(szName, "wb");
 	gf_fwrite(tag, tag_len & 0x7FFFFFFF, 1, t);
-	
+
 	fclose(t);
 	return GF_OK;
 }
@@ -147,7 +120,7 @@
 	tag = gf_malloc(sizeof(char) * tag_len);
 	tag_len = (u32) fread(tag, sizeof(char), tag_len, t);
 	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);
@@ -159,13 +132,13 @@
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
 
-GF_Err dump_file_text(char *file, char *inName, u32 dump_mode, Bool do_log)
+GF_Err dump_file_text(char *file, char *inName, GF_SceneDumpFormat dump_mode, Bool do_log)
 {
 	GF_Err e;
 	GF_SceneManager *ctx;
 	GF_SceneGraph *sg;
 	GF_SceneLoader load;
-	u32 ftype;
+	GF_FileType ftype;
 	gf_log_cbk prev_logs = NULL;
 	FILE *logs = NULL;
 	e = GF_OK;
@@ -176,13 +149,14 @@
 	load.fileName = file;
 	load.ctx = ctx;
 	load.swf_import_flags = swf_flags;
-    if (dump_mode == GF_SM_DUMP_SVG) {
-        load.swf_import_flags |= GF_SM_SWF_USE_SVG;
-    }
+	if (dump_mode == GF_SM_DUMP_SVG) {
+		load.swf_import_flags |= GF_SM_SWF_USE_SVG;
+		load.svgOutFile = inName;
+	}
 	load.swf_flatten_limit = swf_flatten_angle;
 
 	ftype = get_file_type_by_ext(file);
-	if (ftype == 1) {
+	if (ftype == GF_FILE_TYPE_ISO_MEDIA) {
 		load.isom = gf_isom_open(file, GF_ISOM_OPEN_READ, NULL);
 		if (!load.isom) {
 			e = gf_isom_last_error(NULL);
@@ -191,9 +165,7 @@
 			gf_sg_del(sg);
 			return e;
 		}
-	}
-	/*SAF*/
-	else if (ftype==6) {
+	} 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)
@@ -229,7 +201,7 @@
 		gf_log_set_callback(NULL, prev_logs);
 		fclose(logs);
 	}
-	if (!e) {
+	if (!e && dump_mode != GF_SM_DUMP_SVG) {
 		u32 count = gf_list_count(ctx->streams);
 		if (count)
 			fprintf(stderr, "Scene loaded - dumping %d systems streams\n", count);
@@ -260,7 +232,7 @@
 	for (i=0; i<gf_list_count(stats->node_stats); i++) {
 		GF_NodeStats *ptr = gf_list_get(stats->node_stats, i);
 		fprintf(dump, "<NodeStat NodeName=\"%s\">\n", ptr->name);
-		
+
 		switch (ptr->tag) {
 #ifndef GPAC_DISABLE_VRML
 		case TAG_MPEG4_Bitmap:
@@ -359,10 +331,10 @@
 	for (i=0; i<gf_list_count(sample_list); i++) {
 		GF_AUContext *ptr = gf_list_get(sample_list, i);
 		if (
-			/*time ordered*/
-			(ptr->timing_sec > au->timing_sec) 
-			/*set bifs first*/
-			|| ((ptr->timing_sec == au->timing_sec) && (ptr->owner->streamType < au->owner->streamType))
+		    /*time ordered*/
+		    (ptr->timing_sec > au->timing_sec)
+		    /*set bifs first*/
+		    || ((ptr->timing_sec == au->timing_sec) && (ptr->owner->streamType < au->owner->streamType))
 		) {
 			gf_list_insert(sample_list, au, i);
 			return;
@@ -380,14 +352,14 @@
 	char szBuf[1024];
 	GF_SceneManager *ctx;
 	GF_SceneLoader load;
-	GF_StatManager *sm;	
+	GF_StatManager *sm;
 	GF_List *sample_list;
 	GF_SceneGraph *scene_graph;
 
 	dump = NULL;
 	sm = NULL;
 	sample_list = NULL;
-	
+
 	close = 0;
 
 	scene_graph = gf_sg_new();
@@ -450,7 +422,7 @@
 	count = gf_list_count(sample_list);
 	for (i=0; i<count; i++) {
 		GF_AUContext *au = gf_list_get(sample_list, i);
-		
+
 		for (j=0; j<gf_list_count(au->commands); j++) {
 			GF_Command *com = gf_list_get(au->commands, j);
 			/*stat level 2 - get command stats*/
@@ -485,7 +457,7 @@
 	}
 
 
-exit:	
+exit:
 	if (sample_list) gf_list_del(sample_list);
 	if (sm) gf_sm_stats_del(sm);
 	gf_sm_del(ctx);
@@ -593,8 +565,8 @@
 		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;
+		fprintf(stderr, "X3D node printing is not supported (X3D support disabled)\n");
+		return;
 #endif
 	} else {
 		tag = gf_node_mpeg4_type_by_class_name(name);
@@ -629,13 +601,13 @@
 			tfirst = GF_NODE_RANGE_FIRST_MPEG4;
 			tlast = GF_NODE_RANGE_LAST_MPEG4;
 		}
-		for (i=tfirst; i<tlast;i++) {
+		for (i=tfirst; i<tlast; i++) {
 			GF_Node *tmp = gf_node_new(sg, i);
 			gf_node_register(tmp, NULL);
 			if (gf_node_in_table_by_tag(i, f.NDTtype)) {
 				const char *nname = gf_node_get_class_name(tmp);
 				if (nname && strcmp(nname, "Unknown Node")) {
-					fprintf(stderr, "\t%s\n", nname); 
+					fprintf(stderr, "\t%s\n", nname);
 				}
 			}
 			gf_node_unregister(tmp, NULL);
@@ -704,8 +676,8 @@
 
 	if (graph_type==1) {
 #if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_X3D)
-                start_tag = GF_NODE_RANGE_FIRST_X3D;
-                end_tag = TAG_LastImplementedX3D;
+		start_tag = GF_NODE_RANGE_FIRST_X3D;
+		end_tag = TAG_LastImplementedX3D;
 #else
 		fprintf(stderr, "X3D scene graph disabled in this build of GPAC\n");
 		return;
@@ -729,7 +701,7 @@
 	}
 	nb_in = nb_not_in = 0;
 	sg = gf_sg_new();
-	
+
 	if (graph_type==1) {
 		fprintf(stderr, "Available X3D nodes in this build (dumping):\n");
 	} else if (graph_type==2) {
@@ -745,7 +717,7 @@
 			gf_node_unregister(node, NULL);
 			nb_in++;
 		} else {
-			if (graph_type==2) 
+			if (graph_type==2)
 				break;
 			nb_not_in++;
 		}
@@ -831,21 +803,25 @@
 	}
 
 	has_error = 0;
-	for (i=0; i<gf_isom_get_track_count(file); i++) {	
+	for (i=0; i<gf_isom_get_track_count(file); i++) {
 		u32 has_cts_offset = gf_isom_has_time_offset(file, i+1);
 
-		fprintf(dump, "#dumping track ID %d timing: Num DTS CTS Size RAP\n", gf_isom_get_track_id(file, i+1));
+		fprintf(dump, "#dumping track ID %d timing: Num DTS CTS Size RAP Offset\n", gf_isom_get_track_id(file, i+1));
 		count = gf_isom_get_sample_count(file, i+1);
 
 		for (j=0; j<count; j++) {
-			u64 dts, cts;
-			GF_ISOSample *samp = gf_isom_get_sample_info(file, i+1, j+1, NULL, NULL);
+			u64 dts, cts, offset;
+			u32 index;
+			GF_ISOSample *samp = gf_isom_get_sample_info(file, i+1, j+1, &index, &offset);
 			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);
-			if (cts<dts) { fprintf(dump, " #NEGATIVE CTS OFFSET!!!"); has_error = 1;}
-		
+			fprintf(dump, "Sample %d\tDTS "LLD"\tCTS "LLD"\t%d\t%d\t"LLD, j+1, LLD_CAST dts, LLD_CAST cts, samp->dataLength, samp->IsRAP, offset);
+			if (cts<dts) {
+				fprintf(dump, " #NEGATIVE CTS OFFSET!!!");
+				has_error = 1;
+			}
+
 			gf_isom_sample_del(&samp);
 
 			if (has_cts_offset) {
@@ -856,8 +832,14 @@
 					adts = samp->DTS;
 					acts = adts + (s32) samp->CTS_Offset;
 
-					if (adts==dts) { fprintf(dump, " #SAME DTS USED!!!"); has_error = 1; }
-					if (acts==cts) { fprintf(dump, " #SAME CTS USED!!! "); has_error = 1; }
+					if (adts==dts) {
+						fprintf(dump, " #SAME DTS USED!!!");
+						has_error = 1;
+					}
+					if (acts==cts) {
+						fprintf(dump, " #SAME CTS USED!!! ");
+						has_error = 1;
+					}
 
 					gf_isom_sample_del(&samp);
 				}
@@ -875,108 +857,203 @@
 
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, Bool is_hevc, AVCState *avc)
+
+static u32 read_nal_size_hdr(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_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, Bool is_hevc, AVCState *avc, u32 nalh_size)
+{
+	s32 res;
 	u8 type;
 	u8 dependency_id, quality_id, temporal_id;
 	u8 track_ref_index;
-	u32 data_offset, idx;
+	s8 sample_offset;
+	u32 data_offset, idx, data_size;
 	GF_BitStream *bs;
-	
+
 	if (is_hevc) {
 #ifndef GPAC_DISABLE_HEVC
 		type = (ptr[0]  & 0x7E) >> 1;
 		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: fputs("Video Parameter Set", dump); break;
-		case GF_HEVC_NALU_SEQ_PARAM: fputs("Sequence Parameter Set", dump); break;
-		case GF_HEVC_NALU_PIC_PARAM: fputs("Picture Parameter Set", dump); break;
-		case GF_HEVC_NALU_ACCESS_UNIT: fputs("AU Delimiter", dump); 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 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:
+			fputs("Video Parameter Set", dump);
+			break;
+		case GF_HEVC_NALU_SEQ_PARAM:
+			fputs("Sequence Parameter Set", dump);
+			break;
+		case GF_HEVC_NALU_PIC_PARAM:
+			fputs("Picture Parameter Set", dump);
+			break;
+		case GF_HEVC_NALU_ACCESS_UNIT:
+			fputs("AU Delimiter", dump);
+			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); 
+			fputs("HEVCAggregator", dump);
 			break;
 		case 49:
-			fputs("HEVCExtractor", dump); 
-			track_ref_index = (u8) ptr[4];
-			data_offset = (ptr[6] << 12) + (ptr[7] << 8) + (ptr[8] << 4) + ptr[9];
-			fprintf(dump, "\" track_ref_index=\"%d\" data_offset=\"%d", track_ref_index, data_offset);
+			fputs("HEVCExtractor", dump);
+			track_ref_index = (u8) ptr[2];
+			sample_offset = (s8) ptr[3];
+			data_offset = read_nal_size_hdr(&ptr[4], nalh_size);
+			data_size = read_nal_size_hdr(&ptr[4+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("UNKNOWN", dump);
+			break;
 		}
 		fputs("\"", dump);
 		fprintf(dump, " layer_id=\"%d\" temporal_id=\"%d\"", ((ptr[0] & 0x1) << 5) | (ptr[1]>>3), (ptr[1] & 0x7) );
 #endif //GPAC_DISABLE_HEVC
 		return;
-	} 
-	
+	}
+
 	bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
 	type = ptr[0] & 0x1F;
 	fprintf(dump, "code=\"%d\" type=\"", type);
+	res = 0;
 	switch (type) {
-	case GF_AVC_NALU_NON_IDR_SLICE: 
-		gf_media_avc_parse_nalu(bs, ptr[0], avc);
+	case GF_AVC_NALU_NON_IDR_SLICE:
+		res = gf_media_avc_parse_nalu(bs, ptr[0], avc);
 		fputs("Non IDR slice", dump);
-		fprintf(dump, "\" poc=\"%d", avc->s_info.poc);
+
+		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: 
-		gf_media_avc_parse_nalu(bs, ptr[0], avc);
+	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);
-		fprintf(dump, "\" poc=\"%d", avc->s_info.poc);
+		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_SEI: fputs("SEI Message", dump); break;
-	case GF_AVC_NALU_SEQ_PARAM: 
+	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);
 		break;
-	case GF_AVC_NALU_PIC_PARAM: 
+	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);
 		break;
-	case GF_AVC_NALU_ACCESS_UNIT: fputs("AccessUnit delimiter", dump); 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); 
+	case GF_AVC_NALU_ACCESS_UNIT:
+		fputs("AccessUnit delimiter", dump);
+		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_SLICE_AUX:
+		fputs("Auxiliary Slice", dump);
+		break;
 
-	case GF_AVC_NALU_SVC_SLICE: 
+	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;
@@ -985,18 +1062,26 @@
 		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 30:
+		fputs("SVCAggregator", dump);
+		break;
 	case 31:
-		fputs("SVCExtractor", dump); 
+		fputs("SVCExtractor", dump);
 		track_ref_index = (u8) ptr[4];
-		data_offset = (ptr[6] << 12) + (ptr[7] << 8) + (ptr[8] << 4) + ptr[9];
-		fprintf(dump, "\" track_ref_index=\"%d\" data_offset=\"%d", track_ref_index, data_offset);
+		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("UNKNOWN", dump);
+		break;
 	}
 	fputs("\"", dump);
+	if (res<0)
+		fprintf(dump, " status=\"error decoding slice\"");
+
 	if (bs) gf_bs_del(bs);
 }
 #endif
@@ -1040,6 +1125,12 @@
 	svccfg = gf_isom_svc_config_get(file, track, 1);
 	hevccfg = gf_isom_hevc_config_get(file, track, 1);
 	shvccfg = gf_isom_shvc_config_get(file, track, 1);
+	//for tile tracks the hvcC is stored in the 'tbas' track
+	if (!hevccfg && gf_isom_get_reference_count(file, track, GF_4CC('t','b','a','s'))) {
+		u32 tk = 0;
+		gf_isom_get_reference(file, track, GF_4CC('t','b','a','s'), 1, &tk);
+		hevccfg = gf_isom_hevc_config_get(file, tk, 1);
+	}
 	fprintf(dump, " <NALUConfig>\n");
 
 #define DUMP_ARRAY(arr, name)\
@@ -1047,11 +1138,11 @@
 		for (i=0; i<gf_list_count(arr); i++) {\
 			slc = gf_list_get(arr, i);\
 			fprintf(dump, "  <%s number=\"%d\" size=\"%d\" ", name, i+1, slc->size);\
-			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc, &avc);\
+			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc, &avc, nalh_size);\
 			fprintf(dump, "/>\n");\
 		}\
 	}\
-
+ 
 	nalh_size = 0;
 
 	if (avccfg) {
@@ -1079,7 +1170,7 @@
 				DUMP_ARRAY(ar->nalus, "HEVCPPSArray")
 			} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
 				DUMP_ARRAY(ar->nalus, "HEVCVPSArray")
-			} else { 
+			} else {
 				DUMP_ARRAY(ar->nalus, "HEVCUnknownPSArray")
 			}
 		}
@@ -1098,7 +1189,7 @@
 				DUMP_ARRAY(ar->nalus, "HEVCPPSArray")
 			} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
 				DUMP_ARRAY(ar->nalus, "HEVCVPSArray")
-			} else { 
+			} else {
 				DUMP_ARRAY(ar->nalus, "HEVCUnknownPSArray")
 			}
 		}
@@ -1121,7 +1212,7 @@
 			gf_isom_get_reference_ID(file, track, GF_ISOM_REF_SCAL, i, &refTrackID);
 			fprintf(dump, "  <SCALReference number=\"%d\" refTrackID=\"%d\"/>\n", i, refTrackID);
 		}
-			
+
 		fprintf(dump, " </SCALReferences>\n");
 	}
 
@@ -1137,8 +1228,8 @@
 		cts = dts + (s32) samp->CTS_Offset;
 
 		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"); 
-	
+		if (cts<dts) fprintf(dump, "\n");
+
 		idx = 1;
 		ptr = samp->data;
 		size = samp->dataLength;
@@ -1155,21 +1246,16 @@
 			}
 		}
 		while (size) {
-			u32 v = nalh_size;
-			nal_size = 0;
-			while (v) {
-				nal_size |= (u8) *ptr;
-				ptr++;
-				v-=1;
-				if (v) nal_size<<=8;
-			}
+			nal_size = read_nal_size_hdr(ptr, nalh_size);
+			ptr += nalh_size;
+
 			if (nalh_size + nal_size > size) {
 				fprintf(dump, "   \n", idx, nal_size, size);
 				break;
 			} else {
 				fprintf(dump, "   <NALU number=\"%d\" size=\"%d\" ", idx, nal_size);
 #ifndef GPAC_DISABLE_AV_PARSERS
-				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc, &avc);
+				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc, &avc, nalh_size);
 #endif
 				fprintf(dump, "/>\n");
 			}
@@ -1236,7 +1322,7 @@
 }
 
 
-void dump_timed_text_track(GF_ISOFile *file, u32 trackID, char *inName, Bool is_convert, u32 dump_type)
+void dump_timed_text_track(GF_ISOFile *file, u32 trackID, char *inName, Bool is_convert, GF_TextDumpType dump_type)
 {
 	FILE *dump;
 	GF_Err e;
@@ -1259,10 +1345,12 @@
 	}
 
 	if (inName) {
-		if (is_convert)	
-			sprintf(szBuf, "%s.%s", inName, (dump_type==2) ? "svg" : ((dump_type==1) ? "srt" : "ttxt") ) ;
+		char *ext;
+		ext = ((dump_type==GF_TEXTDUMPTYPE_SVG) ? "svg" : ((dump_type==GF_TEXTDUMPTYPE_SRT) ? "srt" : "ttxt"));
+		if (is_convert)
+			sprintf(szBuf, "%s.%s", inName, ext) ;
 		else
-			sprintf(szBuf, "%s_%d_text.%s", inName, trackID, (dump_type==2) ? "svg" : ((dump_type==1) ? "srt" : "ttxt") );
+			sprintf(szBuf, "%s_%d_text.%s", inName, trackID, ext);
 		dump = gf_f64_open(szBuf, "wt");
 	} else {
 		dump = stdout;
@@ -1380,15 +1468,15 @@
 
 	t = gf_f64_open(szName, "wt");
 	if (!t) return GF_IO_ERR;
-	
-	for (i=0; i<count;i++) {
+
+	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) {
 			fprintf(t, "CHAPTER%02d=%s\n", i+1, format_duration(chapter_time, 1000, szDur));
-			fprintf(t, "CHAPTER%02dNAME=%s\n", i+1, name);		
+			fprintf(t, "CHAPTER%02dNAME=%s\n", i+1, name);
 		} else {
 			chapter_time /= 1000;
 			fprintf(t, "AddChapterBySecond("LLD",%s)\n", chapter_time, name);
@@ -1409,12 +1497,16 @@
 	primary_id = gf_isom_get_meta_primary_item_id(file, root_meta, tk_num);
 	fprintf(stderr, "%s type: \"%s\" - %d resource item(s)\n", name, gf_4cc_to_str(brand), (count+(primary_id>0)));
 	switch (gf_isom_has_meta_xml(file, root_meta, tk_num)) {
-	case 1: fprintf(stderr, "Meta has XML resource\n"); break;
-	case 2: fprintf(stderr, "Meta has BinaryXML resource\n"); break;
+	case 1:
+		fprintf(stderr, "Meta has XML resource\n");
+		break;
+	case 2:
+		fprintf(stderr, "Meta has BinaryXML resource\n");
+		break;
 	}
 	if (primary_id) {
-		fprintf(stderr, "Primary Item - ID %d\n", primary_id); 
-	} 
+		fprintf(stderr, "Primary Item - ID %d\n", primary_id);
+	}
 	for (i=0; i<count; i++) {
 		const char *it_name, *mime, *enc, *url, *urn;
 		Bool self_ref;
@@ -1491,7 +1583,8 @@
 	u64 time_slice, dur, size;
 	u8 bps;
 	GF_ESD *esd;
-	char sType[5], szDur[50];
+	char szDur[50];
+	char *lang;
 
 	trackNum = gf_isom_get_track_by_id(file, trackID);
 	if (!trackNum) {
@@ -1507,14 +1600,22 @@
 
 	if (gf_isom_is_track_in_root_od(file, trackNum) ) fprintf(stderr, "Track is present in Root OD\n");
 	if (!gf_isom_is_track_enabled(file, trackNum))  fprintf(stderr, "Track is disabled\n");
-	gf_isom_get_media_language(file, trackNum, sType);
-	fprintf(stderr, "Media Info: Language \"%s\" - ", GetLanguage(sType) );
+	gf_isom_get_media_language(file, trackNum, &lang);
+	fprintf(stderr, "Media Info: Language \"%s (%s)\" - ", GetLanguage(lang), lang );
+	gf_free(lang);
 	mtype = gf_isom_get_media_type(file, trackNum);
 	fprintf(stderr, "Type \"%s:", gf_4cc_to_str(mtype));
 	msub_type = gf_isom_get_mpeg4_subtype(file, trackNum, 1);
 	if (!msub_type) msub_type = gf_isom_get_media_subtype(file, trackNum, 1);
 	fprintf(stderr, "%s\" - %d samples\n", gf_4cc_to_str(msub_type), gf_isom_get_sample_count(file, trackNum));
 
+	count = gf_isom_get_track_kind_count(file, trackNum);
+	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);
+	}
+
 	if (gf_isom_is_track_fragmented(file, trackID) ) {
 		u32 frag_samples;
 		u64 frag_duration;
@@ -1543,21 +1644,22 @@
 
 	gf_isom_get_audio_info(file, trackNum, 1, &sr, &nb_ch, &bps);
 	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) 
-		|| (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_LSR1)
-		|| (msub_type==GF_ISOM_SUBTYPE_HVC1)
-		|| (msub_type==GF_ISOM_SUBTYPE_HEV1)
-		|| (msub_type==GF_ISOM_SUBTYPE_SHV1)
-		|| (msub_type==GF_ISOM_SUBTYPE_SHC1)
-	)  {
+	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_LSR1)
+	        || (msub_type==GF_ISOM_SUBTYPE_HVC1)
+	        || (msub_type==GF_ISOM_SUBTYPE_HEV1)
+	        || (msub_type==GF_ISOM_SUBTYPE_SHV1)
+	        || (msub_type==GF_ISOM_SUBTYPE_SHC1)
+	        || (msub_type==GF_ISOM_SUBTYPE_HVT1)
+	   )  {
 		esd = gf_isom_get_esd(file, trackNum, 1);
 		if (!esd) {
 			fprintf(stderr, "WARNING: Broken MPEG-4 Track\n");
@@ -1565,12 +1667,12 @@
 			const char *st = gf_odf_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);
+				        full_dump ? "\n\t" : ": ", st, esd->decoderConfig->objectTypeIndication);
 			} else {
 				fprintf(stderr, "MPEG-4 Config%sStream Type 0x%02x - ObjectTypeIndication 0x%02x\n",
-							full_dump ? "\n\t" : ": ", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
+				        full_dump ? "\n\t" : ": ", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
 			}
-			if (esd->decoderConfig->streamType==GF_STREAM_OD) 
+			if (esd->decoderConfig->streamType==GF_STREAM_OD)
 				is_od_track=1;
 
 			if (esd->decoderConfig->streamType==GF_STREAM_VISUAL) {
@@ -1581,8 +1683,8 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 					if (!esd->decoderConfig->decoderSpecificInfo) {
 #else
-						gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
-						fprintf(stderr, "MPEG-4 Visual Size %d x %d\n", w, h);
+					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+					fprintf(stderr, "MPEG-4 Visual Size %d x %d\n", w, h);
 #endif
 						fprintf(stderr, "\tNon-compliant MPEG-4 Visual track: video_object_layer infos not found in sample description\n");
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -1654,8 +1756,8 @@
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 				} else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC)
-				|| (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SHVC)
-				) {
+				           || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SHVC)
+				          ) {
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
 					HEVCState hevc_state;
 					GF_HEVCConfig *hevccfg, *shvccfg;
@@ -1669,9 +1771,22 @@
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
 					hevccfg = gf_isom_hevc_config_get(file, trackNum, 1);
 					shvccfg = gf_isom_shvc_config_get(file, trackNum, 1);
-					if (!hevccfg && !shvccfg) {
+
+					if (msub_type==GF_ISOM_SUBTYPE_HVT1) {
+						const char *data;
+						u32 size;
+						u32  is_default, x,y,w,h, 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_4CC('t','r','i','f'), &is_default, &data, &size)) {
+							fprintf(stderr, "\tHEVC Tile track containing a tile set\n");
+						} else {
+							fprintf(stderr, "\tHEVC Tile track without tiling info\n");
+						}
+					} else if (!hevccfg && !shvccfg) {
 						fprintf(stderr, "\n\n\tNon-compliant HEVC track: No hvcC or shcC found in sample description\n");
-					} 
+					}
 					if (hevccfg) {
 						dump_hevc_track_info(file, trackNum, hevccfg, &hevc_state);
 						gf_odf_hevc_cfg_del(hevccfg);
@@ -1682,7 +1797,7 @@
 						gf_odf_hevc_cfg_del(shvccfg);
 					}
 #endif /*GPAC_DISABLE_AV_PARSERS  && defined(GPAC_DISABLE_HEVC)*/
-				} 
+				}
 
 				/*OGG media*/
 				else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_MEDIA_OGG) {
@@ -1736,7 +1851,7 @@
 					if (e) fprintf(stderr, "Corrupted AAC Config\n");
 					else {
 						fprintf(stderr, "%s - %d Channel(s) - SampleRate %d", gf_m4a_object_type_name(a_cfg.base_object_type), a_cfg.nb_chan, a_cfg.base_sr);
-						if (is_mp2) fprintf(stderr, " (MPEG-2 Signaling)"); 
+						if (is_mp2) fprintf(stderr, " (MPEG-2 Signaling)");
 						if (a_cfg.has_sbr) fprintf(stderr, " - SBR SampleRate %d", a_cfg.sbr_sr);
 						if (a_cfg.has_ps) fprintf(stderr, " - PS");
 						fprintf(stderr, "\n");
@@ -1756,11 +1871,11 @@
 							oti = 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(oti),
+							        gf_mp3_num_channels(oti),
+							        gf_mp3_sampling_rate(oti),
+							        gf_mp3_layer(oti)
+							       );
 							gf_isom_sample_del(&samp);
 						} else {
 							fprintf(stderr, "\n\tError fetching sample: %s\n", gf_error_to_string(gf_isom_last_error(file)) );
@@ -1781,16 +1896,22 @@
 					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:
+					fprintf(stderr, "EVRC Audio - Sample Rate 8000 - 1 channel\n");
+					break;
+				case GPAC_OTI_AUDIO_SMV_VOICE:
+					fprintf(stderr, "SMV Audio - Sample Rate 8000 - 1 channel\n");
+					break;
+				case GPAC_OTI_AUDIO_13K_VOICE:
+					fprintf(stderr, "QCELP Audio - Sample Rate 8000 - 1 channel\n");
 					break;
-				case GPAC_OTI_AUDIO_EVRC_VOICE: fprintf(stderr, "EVRC Audio - Sample Rate 8000 - 1 channel\n"); break;
-				case GPAC_OTI_AUDIO_SMV_VOICE: fprintf(stderr, "SMV Audio - Sample Rate 8000 - 1 channel\n"); break;
-				case GPAC_OTI_AUDIO_13K_VOICE: fprintf(stderr, "QCELP Audio - Sample Rate 8000 - 1 channel\n"); break;
 				/*packetVideo hack for EVRC...*/
-				case 0xD1: 
+				case 0xD1:
 					if (esd->decoderConfig->decoderSpecificInfo && (esd->decoderConfig->decoderSpecificInfo->dataLength==8)
-					&& !strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "pvmm", 4)) {
+					        && !strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "pvmm", 4)) {
 						if (full_dump) fprintf(stderr, "\t");
-						fprintf(stderr, "EVRC Audio (PacketVideo Mux) - Sample Rate 8000 - 1 channel\n"); 
+						fprintf(stderr, "EVRC Audio (PacketVideo Mux) - Sample Rate 8000 - 1 channel\n");
 					}
 					break;
 				}
@@ -1798,27 +1919,27 @@
 			else if (esd->decoderConfig->streamType==GF_STREAM_SCENE) {
 				if (esd->decoderConfig->objectTypeIndication<=4) {
 					GF_BIFSConfig *b_cfg = gf_odf_get_bifs_config(esd->decoderConfig->decoderSpecificInfo, esd->decoderConfig->objectTypeIndication);
-					fprintf(stderr, "BIFS Scene description - %s stream\n", b_cfg->elementaryMasks ? "Animation" : "Command"); 
+					fprintf(stderr, "BIFS Scene description - %s stream\n", b_cfg->elementaryMasks ? "Animation" : "Command");
 					if (full_dump && !b_cfg->elementaryMasks) {
-						fprintf(stderr, "\tWidth %d Height %d Pixel Metrics %s\n", b_cfg->pixelWidth, b_cfg->pixelHeight, b_cfg->pixelMetrics ? "yes" : "no"); 
+						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) {
 					u8 tag = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data[0] : 0xFF;
 					const char *afxtype = gf_afx_get_type_description(tag);
-					fprintf(stderr, "AFX Stream - type %s (%d)\n", afxtype, tag); 
+					fprintf(stderr, "AFX Stream - type %s (%d)\n", afxtype, tag);
 				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_FONT) {
-					fprintf(stderr, "Font Data stream\n"); 
+					fprintf(stderr, "Font Data stream\n");
 				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_SCENE_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"); 
+					fprintf(stderr, "LASER Stream - %s\n", l_cfg.newSceneIndicator ? "Full Scene" : "Scene Segment");
 				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_TEXT_MPEG4) {
-					fprintf(stderr, "MPEG-4 Streaming Text stream\n"); 
+					fprintf(stderr, "MPEG-4 Streaming Text stream\n");
 				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE) {
-					fprintf(stderr, "Synthetized Texture stream stream\n"); 
+					fprintf(stderr, "Synthetized Texture stream stream\n");
 				} else {
-					fprintf(stderr, "Unknown Systems stream OTI %d\n", esd->decoderConfig->objectTypeIndication); 
+					fprintf(stderr, "Unknown Systems stream OTI %d\n", esd->decoderConfig->objectTypeIndication);
 				}
 			}
 
@@ -1907,11 +2028,13 @@
 		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 		fprintf(stderr, "\tMotionJPEG2000 stream - Resolution %d x %d\n", w, h);
 	} else if ((msub_type == GF_ISOM_SUBTYPE_3GP_AMR) || (msub_type == GF_ISOM_SUBTYPE_3GP_AMR_WB)) {
-		fprintf(stderr, "\t3GPP AMR%s stream - Sample Rate %d - %d channel(s) %d bits per samples\n", (msub_type == GF_ISOM_SUBTYPE_3GP_AMR_WB) ? " Wide Band" : "", sr, nb_ch, (u32) bps);
+		fprintf(stderr, "\t3GPP AMR%s stream - Sample Rate %d - %d channel(s) %d bps\n", (msub_type == GF_ISOM_SUBTYPE_3GP_AMR_WB) ? " Wide Band" : "", sr, nb_ch, (u32) bps);
 	} else if (msub_type == GF_ISOM_SUBTYPE_3GP_EVRC) {
-		fprintf(stderr, "\t3GPP EVRC stream - Sample Rate %d - %d channel(s) %d bits per samples\n", sr, nb_ch, (u32) bps);
+		fprintf(stderr, "\t3GPP EVRC stream - Sample Rate %d - %d channel(s) %d bps\n", sr, nb_ch, (u32) bps);
 	} else if (msub_type == GF_ISOM_SUBTYPE_3GP_QCELP) {
-		fprintf(stderr, "\t3GPP QCELP stream - Sample Rate %d - %d channel(s) %d bits per samples\n", sr, nb_ch, (u32) bps);
+		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) {
 		u32 br = 0;
 		Bool lfe = 0;
@@ -1919,7 +2042,12 @@
 #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;
 			br = ac3->is_ec3 ? ac3->brcode : gf_ac3_get_bitrate(ac3->brcode);
 			is_ec3 = ac3->is_ec3;
@@ -1957,7 +2085,7 @@
 		}
 #ifndef GPAC_DISABLE_ISOM_HINTING
 		refCount = gf_isom_get_payt_count(file, trackNum);
-		for (i=0;i<refCount;i++) {
+		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);
 		}
@@ -1990,7 +2118,9 @@
 			} else {
 				fprintf(stderr, "Unknown media type\n");
 			}
-			fprintf(stderr, "\tVendor code \"%s\" - Version %d - revision %d\n", gf_4cc_to_str(udesc->vendor_code), udesc->version, udesc->revision);
+			if (udesc->vendor_code)
+				fprintf(stderr, "\tVendor code \"%s\" - Version %d - revision %d\n", gf_4cc_to_str(udesc->vendor_code), udesc->version, udesc->revision);
+
 			if (udesc->extension_buf) {
 				fprintf(stderr, "\tCodec configuration data size: %d bytes\n", udesc->extension_buf_size);
 				gf_free(udesc->extension_buf);
@@ -2007,7 +2137,7 @@
 	if (alt_group) {
 		fprintf(stderr, "Alternate Group ID %d\n", alt_group);
 		for (i=0; i<nb_groups; i++) {
-			u32 nb_crit, switchGroupID; 
+			u32 nb_crit, switchGroupID;
 			const u32 *criterias = gf_isom_get_track_switch_parameter(file, trackNum, i+1, &switchGroupID, &nb_crit);
 			if (!nb_crit) {
 				fprintf(stderr, "\tNo criteria in %s group\n", switchGroupID ? "switch" : "alternate");
@@ -2094,24 +2224,24 @@
 }
 
 static const char* ID3v1Genres[] = {
-    "Blues", "Classic Rock", "Country", "Dance", "Disco",
-		"Funk", "Grunge", "Hip-Hop", "Jazz", "Metal",
-		"New Age", "Oldies", "Other", "Pop", "R&B",
-		"Rap", "Reggae", "Rock", "Techno", "Industrial",
-		"Alternative", "Ska", "Death Metal", "Pranks", "Soundtrack",
-		"Euro-Techno", "Ambient", "Trip-Hop", "Vocal", "Jazz+Funk",
-    "Fusion", "Trance", "Classical", "Instrumental", "Acid",
-		"House", "Game", "Sound Clip", "Gospel", "Noise",
-		"AlternRock", "Bass", "Soul", "Punk", "Space", 
-		"Meditative", "Instrumental Pop", "Instrumental Rock", "Ethnic", "Gothic", 
-		"Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk", "Eurodance", 
-		"Dream", "Southern Rock", "Comedy", "Cult", "Gangsta",
-		"Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American",
-		"Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes",
-		"Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz",
-		"Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock",
-		"Folk", "Folk/Rock", "National Folk", "Swing",
-}; 
+	"Blues", "Classic Rock", "Country", "Dance", "Disco",
+	"Funk", "Grunge", "Hip-Hop", "Jazz", "Metal",
+	"New Age", "Oldies", "Other", "Pop", "R&B",
+	"Rap", "Reggae", "Rock", "Techno", "Industrial",
+	"Alternative", "Ska", "Death Metal", "Pranks", "Soundtrack",
+	"Euro-Techno", "Ambient", "Trip-Hop", "Vocal", "Jazz+Funk",
+	"Fusion", "Trance", "Classical", "Instrumental", "Acid",
+	"House", "Game", "Sound Clip", "Gospel", "Noise",
+	"AlternRock", "Bass", "Soul", "Punk", "Space",
+	"Meditative", "Instrumental Pop", "Instrumental Rock", "Ethnic", "Gothic",
+	"Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk", "Eurodance",
+	"Dream", "Southern Rock", "Comedy", "Cult", "Gangsta",
+	"Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American",
+	"Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes",
+	"Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz",
+	"Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock",
+	"Folk", "Folk/Rock", "National Folk", "Swing",
+};
 static const char *id3_get_genre(u32 tag)
 {
 	if ((tag>0) && (tag <= (sizeof(ID3v1Genres)/sizeof(const char *)) )) {
@@ -2122,6 +2252,7 @@
 u32 id3_get_genre_tag(const char *name)
 {
 	u32 i, count = sizeof(ID3v1Genres)/sizeof(const char *);
+	if (!name) return 0;
 	for (i=0; i<count; i++) {
 		if (!stricmp(ID3v1Genres[i], name)) return i+1;
 	}
@@ -2135,12 +2266,12 @@
 	const char *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);
+		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);
@@ -2151,16 +2282,16 @@
 					fprintf(stderr, "\tFragment #%d Track ID %d - TFDT "LLU"\n", i+1, ID, tfdt);
 				}
 			}
-        } else {
-		    fprintf(stderr, "File has no movie (moov) - static data container\n");
-        }
+		} else {
+			fprintf(stderr, "File has no movie (moov) - static data container\n");
+		}
 		return;
 	}
 
 	timescale = gf_isom_get_timescale(file);
 	fprintf(stderr, "* Movie Info *\n\tTimescale %d - Duration %s\n\t%d track(s)\n",
-		timescale, format_duration(gf_isom_get_duration(file), timescale, szDur), gf_isom_get_track_count(file));
-	
+	        timescale, format_duration(gf_isom_get_duration(file), timescale, szDur), gf_isom_get_track_count(file));
+
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (gf_isom_is_fragmented(file)) {
 		fprintf(stderr, "\tFragmented File: yes - duration %s\n%d fragments - %d SegmentIndexes\n", format_duration(gf_isom_get_fragmented_duration(file), timescale, szDur), gf_isom_get_fragments_count(file, 0) , gf_isom_get_fragments_count(file, 1) );
@@ -2210,7 +2341,7 @@
 			fprintf(stderr, "\t(%s) %s\n", lang, note);
 		}
 	}
-	
+
 	count = gf_isom_get_chapter_count(file, 0);
 	if (count) {
 		char szDur[20];
@@ -2233,7 +2364,7 @@
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_COMPOSER, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tComposer: %s\n", tag);
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_WRITER, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tWriter: %s\n", tag);
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_ALBUM_ARTIST, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tAlbum Artist: %s\n", tag);
-		
+
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_GENRE, &tag, &tag_len)==GF_OK) {
 			if (tag[0]) {
 				fprintf(stderr, "\tGenre: %s\n", tag);
@@ -2243,7 +2374,7 @@
 		}
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_COMPILATION, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tCompilation: %s\n", tag[0] ? "Yes" : "No");
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_GAPLESS, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tGapless album: %s\n", tag[0] ? "Yes" : "No");
-		
+
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_CREATED, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tCreated: %s\n", tag);
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_DISK, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tDisk: %d / %d\n", tag[3], tag[5]);
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_TOOL, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tEncoder Software: %s\n", tag);
@@ -2294,7 +2425,7 @@
 	/* For logging timing information (PCR, PTS/DTS) */
 	FILE *timestamps_info_file;
 	char timestamps_info_name[100];
-	
+
 	/* when dumping TS information */
 	u32 dump_pid;
 	Bool has_seen_pat;
@@ -2303,7 +2434,7 @@
 
 
 
-static void on_m2ts_dump_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+static void on_m2ts_dump_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
 {
 	u32 i, count;
 	GF_M2TS_Program *prog;
@@ -2322,7 +2453,7 @@
 		}
 		break;
 	case GF_M2TS_EVT_PAT_REPEAT:
-		/* WARNING: We detect the pat on a repetition, probably to ensure that we also have seen all the PMT 
+		/* WARNING: We detect the pat on a repetition, probably to ensure that we also have seen all the PMT
 		   To be checked */
 		dumper->has_seen_pat = 1;
 		if (dumper->timestamps_info_file) {
@@ -2349,7 +2480,7 @@
 		prog = (GF_M2TS_Program*)par;
 		if (gf_list_count(ts->programs)>1 && prog->number!=dumper->prog_number)
 			break;
-		
+
 		count = gf_list_count(prog->streams);
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program number %d found - %d streams:\n", prog->number, count));
@@ -2363,7 +2494,7 @@
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\tPID %d: %s ", pes->pid, gf_m2ts_get_stream_name(pes->stream_type) ));
 				if (pes->mpeg4_es_id) GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" - MPEG-4 ES ID %d", pes->mpeg4_es_id));
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
-			} 
+			}
 		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, prog->pmt_pid);
@@ -2423,16 +2554,16 @@
 			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; 
+				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;
+				        && (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);
 			}
-			
+
 			if (dumper->timestamps_info_file) {
 				Double diff;
 				fprintf(dumper->timestamps_info_file, "%u\t%d\t", pck->stream->pes_start_packet_number, pck->stream->pid);
@@ -2465,32 +2596,32 @@
 		break;
 	case GF_M2TS_EVT_SL_PCK:
 #if 0
-		{
-			GF_M2TS_SL_PCK *sl_pck = par;
-			if (dumper->pes_out && (dumper->dump_pid == sl_pck->stream->pid)) {
-				GF_SLHeader header;
-				u32 header_len;
-				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);
-						dumper->is_info_dumped = 1;
-						fprintf(dumper->pes_out_nhml, "<NHNTStream version=\"1.0\" ");
-						fprintf(dumper->pes_out_nhml, "timeScale=\"%d\" ", esd->slConfig->timestampResolution);
-						fprintf(dumper->pes_out_nhml, "streamType=\"%d\" ", esd->decoderConfig->streamType);
-						fprintf(dumper->pes_out_nhml, "objectTypeIndication=\"%d\" ", esd->decoderConfig->objectTypeIndication);
-						if (esd->decoderConfig->decoderSpecificInfo) fprintf(dumper->pes_out_nhml, "specificInfoFile=\"%s\" ", dumper->info);
-						fprintf(dumper->pes_out_nhml, "baseMediaFile=\"%s\" ", dumper->dump);
-						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_M2TS_SL_PCK *sl_pck = par;
+		if (dumper->pes_out && (dumper->dump_pid == sl_pck->stream->pid)) {
+			GF_SLHeader header;
+			u32 header_len;
+			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);
+					dumper->is_info_dumped = 1;
+					fprintf(dumper->pes_out_nhml, "<NHNTStream version=\"1.0\" ");
+					fprintf(dumper->pes_out_nhml, "timeScale=\"%d\" ", esd->slConfig->timestampResolution);
+					fprintf(dumper->pes_out_nhml, "streamType=\"%d\" ", esd->decoderConfig->streamType);
+					fprintf(dumper->pes_out_nhml, "objectTypeIndication=\"%d\" ", esd->decoderConfig->objectTypeIndication);
+					if (esd->decoderConfig->decoderSpecificInfo) fprintf(dumper->pes_out_nhml, "specificInfoFile=\"%s\" ", dumper->info);
+					fprintf(dumper->pes_out_nhml, "baseMediaFile=\"%s\" ", dumper->dump);
+					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"));
 			}
 		}
+	}
 #endif
-		break;
+	break;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/fileimport.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp4box/fileimport.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -47,7 +47,7 @@
 
 #include <gpac/xml.h>
 
-typedef struct 
+typedef struct
 {
 	const char *root_file;
 	const char *dir;
@@ -60,7 +60,6 @@
 extern Float swf_flatten_angle;
 extern Bool keep_sys_tracks;
 
-const char *GetLanguageCode(char *lang);
 void scene_coding_log(void *cbk, u32 log_level, u32 log_tool, const char *fmt, va_list vlist);
 
 void convert_file_info(char *inName, u32 trackID)
@@ -89,7 +88,7 @@
 		fprintf(stderr, "File has %d tracks\n", import.nb_tracks);
 	}
 	if (import.probe_duration) {
-		fprintf(stderr, "Duration: %g ms\n", (Double) (import.probe_duration/1000.0));
+		fprintf(stderr, "Duration: %g s\n", (Double) (import.probe_duration/1000.0));
 	}
 	found = 0;
 	for (i=0; i<import.nb_tracks; i++) {
@@ -98,13 +97,27 @@
 		else fprintf(stderr, "Track type: ");
 
 		switch (import.tk_info[i].type) {
-		case GF_ISOM_MEDIA_VISUAL: fprintf(stderr, "Video (%s)", gf_4cc_to_str(import.tk_info[i].media_type)); break;
-		case GF_ISOM_MEDIA_AUDIO: fprintf(stderr, "Audio (%s)", gf_4cc_to_str(import.tk_info[i].media_type)); break;
-		case GF_ISOM_MEDIA_TEXT: fprintf(stderr, "Text (%s)", gf_4cc_to_str(import.tk_info[i].media_type)); break;
-		case GF_ISOM_MEDIA_SCENE: fprintf(stderr, "Scene (%s)", gf_4cc_to_str(import.tk_info[i].media_type)); break;
-		case GF_ISOM_MEDIA_OD: fprintf(stderr, "OD (%s)", gf_4cc_to_str(import.tk_info[i].media_type)); break;
-		case GF_ISOM_MEDIA_META: fprintf(stderr, "Metadata (%s)", gf_4cc_to_str(import.tk_info[i].media_type)); break;
-		default: fprintf(stderr, "Other (4CC: %s)", gf_4cc_to_str(import.tk_info[i].type)); break;
+		case GF_ISOM_MEDIA_VISUAL:
+			fprintf(stderr, "Video (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+			break;
+		case GF_ISOM_MEDIA_AUDIO:
+			fprintf(stderr, "Audio (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+			break;
+		case GF_ISOM_MEDIA_TEXT:
+			fprintf(stderr, "Text (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+			break;
+		case GF_ISOM_MEDIA_SCENE:
+			fprintf(stderr, "Scene (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+			break;
+		case GF_ISOM_MEDIA_OD:
+			fprintf(stderr, "OD (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+			break;
+		case GF_ISOM_MEDIA_META:
+			fprintf(stderr, "Metadata (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+			break;
+		default:
+			fprintf(stderr, "Other (4CC: %s)", gf_4cc_to_str(import.tk_info[i].type));
+			break;
 		}
 
 		if (import.tk_info[i].lang) fprintf(stderr, " - lang %s", gf_4cc_to_str(import.tk_info[i].lang));
@@ -126,10 +139,10 @@
 		fprintf(stderr, "\n");
 		if (!trackID) continue;
 
-		if ((import.tk_info[i].type==GF_ISOM_MEDIA_VISUAL) 
-			&& import.tk_info[i].video_info.width 
-			&& import.tk_info[i].video_info.height
-			) {
+		if ((import.tk_info[i].type==GF_ISOM_MEDIA_VISUAL)
+		        && import.tk_info[i].video_info.width
+		        && import.tk_info[i].video_info.height
+		   ) {
 			fprintf(stderr, "Source: %s %dx%d", gf_4cc_to_str(import.tk_info[i].media_type), import.tk_info[i].video_info.width, import.tk_info[i].video_info.height);
 			if (import.tk_info[i].video_info.FPS) fprintf(stderr, " @ %g FPS", import.tk_info[i].video_info.FPS);
 			if (import.tk_info[i].video_info.par) fprintf(stderr, " PAR: %d:%d", import.tk_info[i].video_info.par >> 16, import.tk_info[i].video_info.par & 0xFFFF);
@@ -140,7 +153,7 @@
 		} else {
 			fprintf(stderr, "Source: %s\n", gf_4cc_to_str(import.tk_info[i].media_type));
 		}
-			
+
 
 		fprintf(stderr, "\nImport Capabilities:\n");
 		if (import.tk_info[i].flags & GF_IMPORT_USE_DATAREF) fprintf(stderr, "\tCan use data referencing\n");
@@ -183,21 +196,23 @@
 
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample)
 {
-	u32 track_id, i, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode, tile_mode;
+	u32 track_id, i, j, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode, tile_mode;
 	s32 par_d, par_n, prog_id, delay;
 	s32 tw, th, tx, ty, txtw, txth, txtx, txty;
-	Bool do_audio, do_video, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset;
+	Bool do_audio, do_video, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset, rap_only;
 	u32 group, handler, rvc_predefined, check_track_for_svc, check_track_for_shvc;
 	const char *szLan;
 	GF_Err e;
 	GF_MediaImporter import;
 	char *ext, szName[1000], *handler_name, *rvc_config, *chapter_name;
+	GF_List *kinds;
+
 	rvc_predefined = 0;
 	chapter_name = NULL;
 	new_timescale = 1;
 	rescale = 0;
 	text_layout = 0;
-	/*0: merge all 
+	/*0: merge all
 	  1: split base and all SVC in two tracks
 	  2: split all base and SVC layers in dedicated tracks
 	 */
@@ -212,6 +227,7 @@
 	disable = 0;
 	chap_ref = 0;
 	is_chap = 0;
+	kinds = gf_list_new();
 	track_layout = 0;
 	szLan = NULL;
 	delay = 0;
@@ -220,6 +236,7 @@
 	profile = level = 0;
 	negative_cts_offset = 0;
 	tile_mode = 0;
+	rap_only = 0;
 
 	tw = th = tx = ty = txtw = txth = txtx = txty = 0;
 	par_d = par_n = -2;
@@ -236,52 +253,9 @@
 		if (ext2) ext2[0] = 0;
 
 		/*all extensions for track-based importing*/
-		if (!strnicmp(ext+1, "lang=", 5)) szLan = GetLanguageCode(ext+6);
+		if (!strnicmp(ext+1, "dur=", 4)) import.duration = (u32) (atof(ext+5) * 1000);
+		else if (!strnicmp(ext+1, "lang=", 5)) szLan = ext+6;
 		else if (!strnicmp(ext+1, "delay=", 6)) delay = atoi(ext+7);
-		else if (!strnicmp(ext+1, "fps=", 4)) {
-			if (!strcmp(ext+5, "auto")) force_fps = GF_IMPORT_AUTO_FPS;
-			else if (strchr(ext+5, '-')) {
-				u32 ticks, dts_inc;
-				sscanf(ext+5, "%u-%u", &ticks, &dts_inc);
-				if (!dts_inc) dts_inc=1;
-				force_fps = ticks;
-				force_fps /= dts_inc;
-			}
-			else force_fps = atof(ext+5);
-		}
-		else if (!strnicmp(ext+1, "timescale=", 10)) {
-			new_timescale = atoi(ext+11);
-		}
-		else if (!strnicmp(ext+1, "rescale=", 8)) {
-			rescale = atoi(ext+9);
-		}
-		else if (!stricmp(ext+1, "chap")) is_chap = 1;
-		else if (!stricmp(ext+1, "dref")) import_flags |= GF_IMPORT_USE_DATAREF;
-		else if (!stricmp(ext+1, "nodrop")) import_flags |= GF_IMPORT_NO_FRAME_DROP;
-		else if (!stricmp(ext+1, "packed")) import_flags |= GF_IMPORT_FORCE_PACKED;
-		else if (!stricmp(ext+1, "sbr")) import_flags |= GF_IMPORT_SBR_IMPLICIT;
-		else if (!stricmp(ext+1, "sbrx")) import_flags |= GF_IMPORT_SBR_EXPLICIT;
-		else if (!stricmp(ext+1, "ovsbr")) import_flags |= GF_IMPORT_OVSBR;
-		else if (!stricmp(ext+1, "ps")) import_flags |= GF_IMPORT_PS_IMPLICIT;
-		else if (!stricmp(ext+1, "psx")) import_flags |= GF_IMPORT_PS_EXPLICIT;
-		else if (!stricmp(ext+1, "svc") || !stricmp(ext+1, "shvc") ) import_flags |= GF_IMPORT_SVC_EXPLICIT;
-		else if (!stricmp(ext+1, "nosvc") || !stricmp(ext+1, "noshvc")) import_flags |= GF_IMPORT_SVC_NONE;
-		else if (!stricmp(ext+1, "subsamples")) import_flags |= GF_IMPORT_SET_SUBSAMPLES;
-		else if (!stricmp(ext+1, "forcesync")) import_flags |= GF_IMPORT_FORCE_SYNC;
-		else if (!stricmp(ext+1, "mpeg4")) import_flags |= GF_IMPORT_FORCE_MPEG4;
-		else if (!stricmp(ext+1, "swf-global")) import.swf_flags |= GF_SM_SWF_STATIC_DICT;
-		else if (!stricmp(ext+1, "swf-no-ctrl")) import.swf_flags &= ~GF_SM_SWF_SPLIT_TIMELINE;
-		else if (!stricmp(ext+1, "swf-no-text")) import.swf_flags |= GF_SM_SWF_NO_TEXT;
-		else if (!stricmp(ext+1, "swf-no-font")) import.swf_flags |= GF_SM_SWF_NO_FONT;
-		else if (!stricmp(ext+1, "swf-no-line")) import.swf_flags |= GF_SM_SWF_NO_LINE;
-		else if (!stricmp(ext+1, "swf-no-grad")) import.swf_flags |= GF_SM_SWF_NO_GRADIENT;
-		else if (!stricmp(ext+1, "swf-quad")) import.swf_flags |= GF_SM_SWF_QUAD_CURVE;
-		else if (!stricmp(ext+1, "swf-xlp")) import.swf_flags |= GF_SM_SWF_SCALABLE_LINE;
-		else if (!stricmp(ext+1, "swf-ic2d")) import.swf_flags |= GF_SM_SWF_USE_IC2D;
-		else if (!stricmp(ext+1, "swf-same-app")) import.swf_flags |= GF_SM_SWF_REUSE_APPEARANCE;
-		else if (!strnicmp(ext+1, "swf-flatten=", 12)) import.swf_flatten_angle = (Float) atof(ext+13);
-		else if (!strnicmp(ext+1, "agg=", 4)) frames_per_sample = atoi(ext+5);
-		else if (!strnicmp(ext+1, "dur=", 4)) import.duration = (u32) (atof(ext+5) * 1000);
 		else if (!strnicmp(ext+1, "par=", 4)) {
 			if (!stricmp(ext+5, "none")) {
 				par_n = par_d = -1;
@@ -293,14 +267,6 @@
 			}
 		}
 		else if (!strnicmp(ext+1, "name=", 5)) handler_name = gf_strdup(ext+6);
-		else if (!strnicmp(ext+1, "rvc=", 4)) {
-			if (sscanf(ext+5, "%d", &rvc_predefined) != 1) {
-				rvc_config = gf_strdup(ext+5);
-			}
-		}
-		else if (!strnicmp(ext+1, "font=", 5)) import.fontName = gf_strdup(ext+6);
-		else if (!strnicmp(ext+1, "size=", 5)) import.fontSize = atoi(ext+6);
-		else if (!strnicmp(ext+1, "fmt=", 4)) import.streamFormat = gf_strdup(ext+5);
 		else if (!strnicmp(ext+1, "ext=", 4)) {
 			/*extensions begin with '.'*/
 			if (*(ext+5) == '.')
@@ -311,14 +277,64 @@
 				strcat(import.force_ext+1, ext+5);
 			}
 		}
+		else if (!strnicmp(ext+1, "hdlr=", 5)) handler = GF_4CC(ext[6], ext[7], ext[8], ext[9]);
 		else if (!strnicmp(ext+1, "disable", 7)) disable = 1;
 		else if (!strnicmp(ext+1, "group=", 6)) {
 			group = atoi(ext+7);
 			if (!group) group = gf_isom_get_next_alternate_group_id(dest);
 		}
-		else if (!strnicmp(ext+1, "hdlr=", 5))
-			handler = GF_4CC(ext[6], ext[7], ext[8], ext[9]);
-		
+		else if (!strnicmp(ext+1, "fps=", 4)) {
+			if (!strcmp(ext+5, "auto")) force_fps = GF_IMPORT_AUTO_FPS;
+			else if (strchr(ext+5, '-')) {
+				u32 ticks, dts_inc;
+				sscanf(ext+5, "%u-%u", &ticks, &dts_inc);
+				if (!dts_inc) dts_inc=1;
+				force_fps = ticks;
+				force_fps /= dts_inc;
+			}
+			else force_fps = atof(ext+5);
+		}
+		else if (!stricmp(ext+1, "rap")) rap_only = 1;
+		else if (!stricmp(ext+1, "trailing")) import_flags |= GF_IMPORT_KEEP_TRAILING;
+		else if (!strnicmp(ext+1, "agg=", 4)) frames_per_sample = atoi(ext+5);
+		else if (!stricmp(ext+1, "dref")) import_flags |= GF_IMPORT_USE_DATAREF;
+		else if (!stricmp(ext+1, "nodrop")) import_flags |= GF_IMPORT_NO_FRAME_DROP;
+		else if (!stricmp(ext+1, "packed")) import_flags |= GF_IMPORT_FORCE_PACKED;
+		else if (!stricmp(ext+1, "sbr")) import_flags |= GF_IMPORT_SBR_IMPLICIT;
+		else if (!stricmp(ext+1, "sbrx")) import_flags |= GF_IMPORT_SBR_EXPLICIT;
+		else if (!stricmp(ext+1, "ovsbr")) import_flags |= GF_IMPORT_OVSBR;
+		else if (!stricmp(ext+1, "ps")) import_flags |= GF_IMPORT_PS_IMPLICIT;
+		else if (!stricmp(ext+1, "psx")) import_flags |= GF_IMPORT_PS_EXPLICIT;
+		else if (!stricmp(ext+1, "mpeg4")) import_flags |= GF_IMPORT_FORCE_MPEG4;
+		else if (!stricmp(ext+1, "svc") || !stricmp(ext+1, "shvc") ) import_flags |= GF_IMPORT_SVC_EXPLICIT;
+		else if (!stricmp(ext+1, "nosvc") || !stricmp(ext+1, "noshvc")) import_flags |= GF_IMPORT_SVC_NONE;
+		/*split SVC layers*/
+		else if (!strnicmp(ext+1, "svcmode=", 8) || !strnicmp(ext+1, "shvcmode=", 9)) {
+			char *mode = ext+9;
+			if (mode[0]=='=') mode = ext+10;
+
+			if (!stricmp(mode, "splitnox"))
+				svc_mode = 3;
+			else if (!stricmp(mode, "splitall") || !stricmp(mode, "split"))
+				svc_mode = 2;
+			else if (!stricmp(mode, "splitbase"))
+				svc_mode = 1;
+			else if (!stricmp(mode, "merged"))
+				svc_mode = 0;
+		}
+		else if (!stricmp(ext+1, "subsamples")) import_flags |= GF_IMPORT_SET_SUBSAMPLES;
+		else if (!stricmp(ext+1, "forcesync")) import_flags |= GF_IMPORT_FORCE_SYNC;
+		/*force all composition offsets to be positive*/
+		else if (!strnicmp(ext+1, "negctts", 7)) negative_cts_offset = 1;
+		else if (!strnicmp(ext+1, "stype=", 6)) {
+			stype = GF_4CC(ext[7], ext[8], ext[9], ext[10]);
+		}
+		else if (!stricmp(ext+1, "chap")) is_chap = 1;
+		else if (!strnicmp(ext+1, "chapter=", 8)) chapter_name = gf_strdup(ext+9);
+		else if (!strnicmp(ext+1, "chapfile=", 9)) {
+			chapter_name = gf_strdup(ext+10);
+			is_chap_file=1;
+		}
 		else if (!strnicmp(ext+1, "layout=", 7)) {
 			if ( sscanf(ext+8, "%dx%dx%dx%d", &tw, &th, &tx, &ty)==4) {
 				track_layout = 1;
@@ -327,6 +343,26 @@
 				tx = ty = 0;
 			}
 		}
+		else if (!strnicmp(ext+1, "rescale=", 8)) {
+			rescale = atoi(ext+9);
+		}
+		else if (!strnicmp(ext+1, "timescale=", 10)) {
+			new_timescale = atoi(ext+11);
+		}
+		else if (!stricmp(ext+1, "noedit")) import_flags |= GF_IMPORT_NO_EDIT_LIST;
+
+
+		else if (!strnicmp(ext+1, "rvc=", 4)) {
+			if (sscanf(ext+5, "%d", &rvc_predefined) != 1) {
+				rvc_config = gf_strdup(ext+5);
+			}
+		}
+		else if (!strnicmp(ext+1, "fmt=", 4)) import.streamFormat = gf_strdup(ext+5);
+		else if (!strnicmp(ext+1, "profile=", 8)) profile = atoi(ext+9);
+		else if (!strnicmp(ext+1, "level=", 6)) level = atoi(ext+7);
+
+		else if (!strnicmp(ext+1, "font=", 5)) import.fontName = gf_strdup(ext+6);
+		else if (!strnicmp(ext+1, "size=", 5)) import.fontSize = atoi(ext+6);
 		else if (!strnicmp(ext+1, "text_layout=", 12)) {
 			if ( sscanf(ext+13, "%dx%dx%dx%d", &txtw, &txth, &txtx, &txty)==4) {
 				text_layout = 1;
@@ -335,39 +371,46 @@
 				txtx = txty = 0;
 			}
 		}
-		else if (!strnicmp(ext+1, "stype=", 6)) {
-			stype = GF_4CC(ext[7], ext[8], ext[9], ext[10]);
-		}
-		else if (!strnicmp(ext+1, "profile=", 8)) profile = atoi(ext+9);
-		else if (!strnicmp(ext+1, "level=", 6)) level = atoi(ext+7);
-		else if (!strnicmp(ext+1, "chapter=", 8)) chapter_name = gf_strdup(ext+9);
-		else if (!strnicmp(ext+1, "chapfile=", 9)) {
-			chapter_name = gf_strdup(ext+10);
-			is_chap_file=1;
-		}
-		/*force all composition offsets to be positive*/
-		else if (!strnicmp(ext+1, "negctts", 7)) negative_cts_offset = 1;
-		/*split SVC layers*/
-		else if (!strnicmp(ext+1, "svcmode=", 8) || !strnicmp(ext+1, "shvcmode=", 9)) {
-			char *mode = ext+9;
-			if (mode[0]=='=') mode = ext+10;
 
-			if (!stricmp(mode, "splitnox"))
-				svc_mode = 3;
-			else if (!stricmp(mode, "splitall") || !stricmp(mode, "split"))
-				svc_mode = 2;
-			else if (!stricmp(mode, "splitbase"))
-				svc_mode = 1;
-			else if (!stricmp(mode, "merged"))
-				svc_mode = 0;
+		else if (!stricmp(ext+1, "swf-global")) import.swf_flags |= GF_SM_SWF_STATIC_DICT;
+		else if (!stricmp(ext+1, "swf-no-ctrl")) import.swf_flags &= ~GF_SM_SWF_SPLIT_TIMELINE;
+		else if (!stricmp(ext+1, "swf-no-text")) import.swf_flags |= GF_SM_SWF_NO_TEXT;
+		else if (!stricmp(ext+1, "swf-no-font")) import.swf_flags |= GF_SM_SWF_NO_FONT;
+		else if (!stricmp(ext+1, "swf-no-line")) import.swf_flags |= GF_SM_SWF_NO_LINE;
+		else if (!stricmp(ext+1, "swf-no-grad")) import.swf_flags |= GF_SM_SWF_NO_GRADIENT;
+		else if (!stricmp(ext+1, "swf-quad")) import.swf_flags |= GF_SM_SWF_QUAD_CURVE;
+		else if (!stricmp(ext+1, "swf-xlp")) import.swf_flags |= GF_SM_SWF_SCALABLE_LINE;
+		else if (!stricmp(ext+1, "swf-ic2d")) import.swf_flags |= GF_SM_SWF_USE_IC2D;
+		else if (!stricmp(ext+1, "swf-same-app")) import.swf_flags |= GF_SM_SWF_REUSE_APPEARANCE;
+		else if (!strnicmp(ext+1, "swf-flatten=", 12)) import.swf_flatten_angle = (Float) atof(ext+13);
+
+		else if (!strnicmp(ext+1, "kind=", 5)) {
+			char *kind_scheme, *kind_value;
+			char *kind_data = ext+6;
+			char *sep = strchr(kind_data, '=');
+			if (sep) {
+				*sep = 0;
+			}
+			kind_scheme = gf_strdup(kind_data);
+			if (sep) {
+				*sep = '=';
+				kind_value = gf_strdup(sep+1);
+			} else {
+				kind_value = NULL;
+			}
+			gf_list_add(kinds, kind_scheme);
+			gf_list_add(kinds, kind_value);
 		}
+
+		/*EXPERIMENTAL OPTIONS NOT DOCUMENTED*/
 		else if (!strnicmp(ext+1, "tiles", 5)) {
 			tile_mode = 1;
 		}
+
 		/*unrecognized, assume name has colon in it*/
 		else {
-		 ext = ext2;
-		 continue;
+			ext = ext2;
+			continue;
 		}
 
 		if (ext2) ext2[0] = ':';
@@ -382,7 +425,7 @@
 		import.duration = (u32) (atof(ext+1) * 1000);
 		ext[0] = 0;
 	}
-	
+
 	/*select switches for av containers import*/
 	do_audio = do_video = 0;
 	track_id = prog_id = 0;
@@ -403,7 +446,7 @@
 		else if (!strnicmp(ext, "video", 5)) do_video = 1;
 		else if (!strnicmp(ext, "trackID=", 8)) track_id = atoi(&ext[8]);
 		else if (!strnicmp(ext, "PID=", 4)) track_id = atoi(&ext[4]);
-		else if (!strnicmp(ext, "program=", 8)) { 
+		else if (!strnicmp(ext, "program=", 8)) {
 			for (i=0; i<import.nb_progs; i++) {
 				if (!stricmp(import.pg_info[i].name, ext+8)) {
 					prog_id = import.pg_info[i].number;
@@ -412,7 +455,7 @@
 				}
 			}
 		}
-		else if (!strnicmp(ext, "prog_id=", 8)) { 
+		else if (!strnicmp(ext, "prog_id=", 8)) {
 			prog_id = atoi(ext+8);
 			do_all = 0;
 		}
@@ -466,7 +509,7 @@
 	import.video_fps = force_fps;
 	import.frames_per_sample = frames_per_sample;
 	import.flags = import_flags;
-	
+
 	if (!import.nb_tracks) {
 		u32 count, o_count;
 		o_count = gf_isom_get_track_count(import.dest);
@@ -496,6 +539,11 @@
 			if ((par_n>=0) && (par_d>=0)) {
 				e = gf_media_change_par(import.dest, i+1, par_n, par_d);
 			}
+
+			if (rap_only) {
+				e = gf_media_remove_non_rap(import.dest, i+1);
+			}
+
 			if (handler_name) gf_isom_set_handler_name(import.dest, i+1, handler_name);
 			else if (!keep_handler) {
 				char szHName[1024];
@@ -523,7 +571,13 @@
 				set_chapter_track(import.dest, i+1, chap_ref);
 			}
 
-			if (profile || level) 
+			for (j = 0; j < gf_list_count(kinds); j+=2) {
+				char *kind_scheme = (char *)gf_list_get(kinds, j);
+				char *kind_value = (char *)gf_list_get(kinds, j+1);
+				gf_isom_add_track_kind(import.dest, i+1, kind_scheme, kind_value);
+			}
+
+			if (profile || level)
 				gf_media_change_pl(import.dest, i+1, profile, level);
 
 			if (gf_isom_get_media_subtype(import.dest, i+1, 1)== GF_4CC( 'm', 'p', '4', 's' ))
@@ -533,7 +587,7 @@
 
 			if (gf_isom_get_avc_svc_type(import.dest, i+1, 1)>=GF_ISOM_AVCTYPE_AVC_SVC)
 				check_track_for_svc = i+1;
-			
+
 			if (gf_isom_get_hevc_shvc_type(import.dest, i+1, 1)>=GF_ISOM_HEVCTYPE_HEVC_SHVC)
 				check_track_for_shvc = i+1;
 
@@ -585,7 +639,7 @@
 					u64 to_skip = (timescale*(-delay))/1000;
 					if (to_skip<tk_dur) {
 						u64 media_time = (-delay)*gf_isom_get_media_timescale(import.dest, track) / 1000;
-						gf_isom_append_edit_segment(import.dest, i+1, tk_dur-to_skip, media_time, GF_ISOM_EDIT_NORMAL);
+						gf_isom_append_edit_segment(import.dest, track, tk_dur-to_skip, media_time, GF_ISOM_EDIT_NORMAL);
 					} else {
 						fprintf(stderr, "Warning: request negative delay longer than track duration - ignoring\n");
 					}
@@ -594,6 +648,9 @@
 			if ((import.tk_info[i].type==GF_ISOM_MEDIA_VISUAL) && (par_n>=-1) && (par_d>=-1)) {
 				e = gf_media_change_par(import.dest, track, par_n, par_d);
 			}
+			if (rap_only) {
+				e = gf_media_remove_non_rap(import.dest, track);
+			}
 			if (handler_name) gf_isom_set_handler_name(import.dest, track, handler_name);
 			else if (!keep_handler) {
 				char szHName[1024];
@@ -621,7 +678,13 @@
 				set_chapter_track(import.dest, track, chap_ref);
 			}
 
-			if (profile || level) 
+			for (j = 0; j < gf_list_count(kinds); j+=2) {
+				char *kind_scheme = (char *)gf_list_get(kinds, j);
+				char *kind_value = (char *)gf_list_get(kinds, j+1);
+				gf_isom_add_track_kind(import.dest, i+1, kind_scheme, kind_value);
+			}
+
+			if (profile || level)
 				gf_media_change_pl(import.dest, track, profile, level);
 
 			if (gf_isom_get_mpeg4_subtype(import.dest, track, 1))
@@ -731,6 +794,11 @@
 
 
 exit:
+	while (gf_list_count(kinds)) {
+		char *kind = (char *)gf_list_get(kinds, 0);
+		gf_list_rem(kinds, 0);
+		if (kind) gf_free(kind);
+	}
 	if (handler_name) gf_free(handler_name);
 	if (chapter_name ) gf_free(chapter_name );
 	if (import.fontName) gf_free(import.fontName);
@@ -793,18 +861,20 @@
 	ext = strrchr(szName, '.');
 	if (ext) ext[0] = 0;
 	ext = strrchr(inName, '.');
-	
+
 	dest = NULL;
 
 	conv_type = 0;
 	switch (gf_isom_guess_specification(mp4)) {
-	case GF_4CC('I','S','M','A'): conv_type = 1; break;
-	case GF_ISOM_BRAND_3GP4: 
+	case GF_4CC('I','S','M','A'):
+		conv_type = 1;
+		break;
+	case GF_ISOM_BRAND_3GP4:
 	case GF_ISOM_BRAND_3GP5:
 	case GF_ISOM_BRAND_3GP6:
 	case GF_ISOM_BRAND_3GG6:
 	case GF_ISOM_BRAND_3G2A:
-		conv_type = 2; 
+		conv_type = 2;
 		break;
 	}
 	if (!stricmp(ext, ".3gp") || !stricmp(ext, ".3g2")) conv_type = 2;
@@ -867,7 +937,7 @@
 		tks[nb_tk].has_non_raps = gf_isom_has_sync_points(mp4, i+1);
 		/*seen that on some 3gp files from nokia ...*/
 		if (mtype==GF_ISOM_MEDIA_AUDIO) tks[nb_tk].has_non_raps = 0;
-		
+
 		dur = (Double) (s64) gf_isom_get_media_duration(mp4, i+1);
 		dur /= tks[nb_tk].time_scale;
 		if (max_dur<dur) max_dur=dur;
@@ -1014,12 +1084,12 @@
 				Double t;
 				u64 dts;
 				tki = &tks[i];
-				
-				if (tki->stop_state) 
+
+				if (tki->stop_state)
 					continue;
-				if (tki->last_sample==tki->sample_count) 
+				if (tki->last_sample==tki->sample_count)
 					continue;
-			
+
 				/*get sample info, see if we need to check it (basic de-interleaver)*/
 				dts = gf_isom_get_sample_dts(mp4, tki->tk, tki->last_sample+1);
 
@@ -1060,7 +1130,7 @@
 					if (e==GF_EOS)
 						is_last = 1;
 					if (next_rap) {
-						if (!next_rap->IsRAP) 
+						if (!next_rap->IsRAP)
 							is_last = 1;
 						gf_isom_sample_del(&next_rap);
 					}
@@ -1075,7 +1145,7 @@
 					fprintf(stderr, "Error cloning track %d sample %d\n", tki->tk, tki->last_sample);
 					goto err_exit;
 				}
-	
+
 				tki->next_sample_is_rap = 0;
 				if (rap_split && tki->has_non_raps) {
 					if ( gf_isom_get_sample_sync(mp4, tki->tk, tki->last_sample+1))
@@ -1090,7 +1160,7 @@
 			if (split_size_kb) {
 				u64 est_size = gf_isom_estimate_size(dest);
 				/*while below desired size keep importing*/
-				if (est_size<split_size_kb) 
+				if (est_size<split_size_kb)
 					file_split_dur = (Double) GF_MAX_FLOAT;
 				else {
 					size_exceeded = 1;
@@ -1105,11 +1175,11 @@
 				}
 				time = (Double) (s64) tki->lastDTS;
 				time /= tki->time_scale;
-				if (size_exceeded 
-					|| (tki->last_sample==tki->sample_count) 
-					|| (!tki->can_duplicate && (time>file_split_dur))
-					|| (rap_split && tki->has_non_raps && tki->next_sample_is_rap)
-				) {
+				if (size_exceeded
+				        || (tki->last_sample==tki->sample_count)
+				        || (!tki->can_duplicate && (time>file_split_dur))
+				        || (rap_split && tki->has_non_raps && tki->next_sample_is_rap)
+				   ) {
 					nb_over++;
 					tki->stop_state = 1;
 					if (tki->last_sample<tki->sample_count)
@@ -1130,7 +1200,7 @@
 						tki->stop_state = 1;
 					}
 				}
-				if (!nb_add && (!max_dts || (tki->lastDTS <= 1 + (u64) (tki->time_scale*max_dts) ))) 
+				if (!nb_add && (!max_dts || (tki->lastDTS <= 1 + (u64) (tki->time_scale*max_dts) )))
 					tki->first_sample_done = 0;
 			}
 			if (nb_over==nb_tk) do_add = 0;
@@ -1150,7 +1220,7 @@
 				continue;
 			}
 
-			//if (tki->lastDTS) 
+			//if (tki->lastDTS)
 			{
 				//time = (Double) (s64) tki->lastDTS;
 				time = (Double) (s64) ( gf_isom_get_sample_dts(mp4, tki->tk, tki->last_sample+1) - tki->firstDTS);
@@ -1279,7 +1349,7 @@
 			for (j=0; j<count; j++) {
 				u64 editTime, segDur, MediaTime;
 				u8 mode;
-			
+
 				gf_isom_get_edit_segment(mp4, tki->tk, j+1, &editTime, &segDur, &MediaTime, &mode);
 				if (!j && (mode!=GF_ISOM_EDIT_EMPTY) ) {
 					fprintf(stderr, "Warning: Edit list doesn't look like a track delay scheme - ignoring\n");
@@ -1287,7 +1357,7 @@
 				}
 				if (mode==GF_ISOM_EDIT_NORMAL) {
 					segDur = new_track_dur;
-				} 
+				}
 				gf_isom_set_edit_segment(dest, tki->dst_tk, editTime, segDur, MediaTime, mode);
 			}
 		}
@@ -1361,10 +1431,10 @@
 {
 	GF_AVCConfig *avc_src, *avc_dst;
 	u32 dst_tk = gf_isom_get_track_by_id(dest, tk_id);
-				
+
 	avc_src = gf_isom_avc_config_get(orig, src_track, 1);
 	avc_dst = gf_isom_avc_config_get(dest, dst_tk, 1);
-				
+
 	if (avc_src->AVCLevelIndication!=avc_dst->AVCLevelIndication) {
 		dst_tk = 0;
 	} else if (avc_src->AVCProfileIndication!=avc_dst->AVCProfileIndication) {
@@ -1373,10 +1443,10 @@
 	else {
 		/*rewrite all samples if using different NALU size*/
 		if (avc_src->nal_unit_size > avc_dst->nal_unit_size) {
-			gf_media_avc_rewrite_samples(dest, dst_tk, 8*avc_dst->nal_unit_size, 8*avc_src->nal_unit_size); 
+			gf_media_avc_rewrite_samples(dest, dst_tk, 8*avc_dst->nal_unit_size, 8*avc_src->nal_unit_size);
 			avc_dst->nal_unit_size = avc_src->nal_unit_size;
 		} else if (avc_src->nal_unit_size < avc_dst->nal_unit_size) {
-			gf_media_avc_rewrite_samples(orig, src_track, 8*avc_src->nal_unit_size, 8*avc_dst->nal_unit_size); 
+			gf_media_avc_rewrite_samples(orig, src_track, 8*avc_src->nal_unit_size, 8*avc_dst->nal_unit_size);
 		}
 
 		/*merge PS*/
@@ -1384,7 +1454,7 @@
 			dst_tk = 0;
 		if (!merge_parameter_set(avc_src->pictureParameterSets, avc_dst->pictureParameterSets, "PPS"))
 			dst_tk = 0;
-					
+
 		gf_isom_avc_config_update(dest, dst_tk, 1, avc_dst);
 	}
 
@@ -1408,7 +1478,7 @@
 	u32 i;
 	GF_HEVCConfig *hevc_src, *hevc_dst;
 	u32 dst_tk = gf_isom_get_track_by_id(dest, tk_id);
-				
+
 	hevc_src = gf_isom_hevc_config_get(orig, src_track, 1);
 	hevc_dst = gf_isom_hevc_config_get(dest, dst_tk, 1);
 
@@ -1418,10 +1488,10 @@
 	else {
 		/*rewrite all samples if using different NALU size*/
 		if (hevc_src->nal_unit_size > hevc_dst->nal_unit_size) {
-			gf_media_avc_rewrite_samples(dest, dst_tk, 8*hevc_dst->nal_unit_size, 8*hevc_src->nal_unit_size); 
+			gf_media_avc_rewrite_samples(dest, dst_tk, 8*hevc_dst->nal_unit_size, 8*hevc_src->nal_unit_size);
 			hevc_dst->nal_unit_size = hevc_src->nal_unit_size;
 		} else if (hevc_src->nal_unit_size < hevc_dst->nal_unit_size) {
-			gf_media_avc_rewrite_samples(orig, src_track, 8*hevc_src->nal_unit_size, 8*hevc_dst->nal_unit_size); 
+			gf_media_avc_rewrite_samples(orig, src_track, 8*hevc_src->nal_unit_size, 8*hevc_dst->nal_unit_size);
 		}
 
 		/*merge PS*/
@@ -1437,7 +1507,7 @@
 				}
 			}
 		}
-					
+
 		gf_isom_hevc_config_update(dest, dst_tk, 1, hevc_dst);
 	}
 
@@ -1462,7 +1532,7 @@
 	GF_ISOFile *orig;
 	GF_Err e;
 	char *opts, *multi_cat;
-	Float ts_scale;
+	Double ts_scale;
 	Double dest_orig_dur;
 	u32 dst_tk, tk_id, mtype;
 	u64 insert_dts;
@@ -1471,14 +1541,14 @@
 	Double aligned_to_DTS = 0;
 
 	if (strchr(fileName, '*')) return cat_multiple_files(dest, fileName, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines, allow_add_in_command);
-	
+
 	multi_cat = allow_add_in_command ? strchr(fileName, '+') : NULL;
 	if (multi_cat) {
 		multi_cat[0] = 0;
 		multi_cat = &multi_cat[1];
 	}
 	opts = strchr(fileName, ':');
-	if (opts && (opts[1]=='\\')) 
+	if (opts && (opts[1]=='\\'))
 		opts = strchr(fileName, ':');
 
 	e = GF_OK;
@@ -1498,7 +1568,7 @@
 	while (multi_cat) {
 		char *sep = strchr(multi_cat, '+');
 		if (sep) sep[0] = 0;
-		
+
 		e = import_file(orig, multi_cat, import_flags, force_fps, frames_per_sample);
 		if (e) {
 			gf_isom_delete(orig);
@@ -1543,7 +1613,7 @@
 		fprintf(stderr, "No suitable media tracks to cat in %s - skipping\n", fileName);
 		goto err_exit;
 	}
-	
+
 	dest_orig_dur = (Double) (s64) gf_isom_get_duration(dest);
 	if (!gf_isom_get_timescale(dest)) {
 		gf_isom_set_timescale(dest, gf_isom_get_timescale(orig));
@@ -1624,12 +1694,21 @@
 					/*check language code*/
 					else if (!skip_lang_test && (mtype==GF_ISOM_MEDIA_AUDIO)) {
 						u32 lang_src, lang_dst;
-						char lang[4];
-						lang[3]=0;
-						gf_isom_get_media_language(orig, i+1, lang);
-						lang_src = GF_4CC(lang[0], lang[1], lang[2], lang[3]);
-						gf_isom_get_media_language(dest, j+1, lang);
-						lang_dst = GF_4CC(lang[0], lang[1], lang[2], lang[3]);
+						char *lang = NULL;
+						gf_isom_get_media_language(orig, i+1, &lang);
+						if (lang) {
+							lang_src = GF_4CC(lang[0], lang[1], lang[2], lang[3]);
+							gf_free(lang);
+						} else {
+							lang_src = 0;
+						}
+						gf_isom_get_media_language(dest, j+1, &lang);
+						if (lang) {
+							lang_dst = GF_4CC(lang[0], lang[1], lang[2], lang[3]);
+							gf_free(lang);
+						} else {
+							lang_dst = 0;
+						}
 						if (lang_dst==lang_src) {
 							dst_tk = j+1;
 							break;
@@ -1651,7 +1730,7 @@
 			/*if not forcing cat, check the media codec config is the same*/
 			if (!gf_isom_is_same_sample_description(orig, i+1, 0, dest, dst_tk, 0)) {
 				dst_tk = 0;
-			} 
+			}
 			/*we force the same visual resolution*/
 			else if (mtype==GF_ISOM_MEDIA_VISUAL) {
 				u32 w, h, ow, oh;
@@ -1664,17 +1743,17 @@
 
 			if (!dst_tk) {
 				/*merge AVC config if possible*/
-				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 ((stype == GF_ISOM_SUBTYPE_AVC_H264)
+				        || (stype == GF_ISOM_SUBTYPE_AVC2_H264)
+				        || (stype == GF_ISOM_SUBTYPE_AVC3_H264)
+				        || (stype == GF_ISOM_SUBTYPE_AVC4_H264) ) {
 					dst_tk = merge_avc_config(dest, tk_id, orig, i+1, force_cat);
 				}
 				/*merge HEVC config if possible*/
-				else if ((stype == GF_ISOM_SUBTYPE_HVC1) 
-					|| (stype == GF_ISOM_SUBTYPE_HEV1) 
-					|| (stype == GF_ISOM_SUBTYPE_HVC2) 
-					|| (stype == GF_ISOM_SUBTYPE_HEV2)) {
+				else if ((stype == GF_ISOM_SUBTYPE_HVC1)
+				         || (stype == GF_ISOM_SUBTYPE_HEV1)
+				         || (stype == GF_ISOM_SUBTYPE_HVC2)
+				         || (stype == GF_ISOM_SUBTYPE_HEV2)) {
 					dst_tk = merge_hevc_config(dest, tk_id, orig, i+1, force_cat);
 				}
 			}
@@ -1693,11 +1772,11 @@
 				u32 dst_timescale = 0;
 				u32 idx;
 				for (idx=0; idx<nb_tracks; idx++) {
-					if (max_timescale < gf_isom_get_media_timescale(orig, idx+1)) 
-						max_timescale = gf_isom_get_media_timescale(orig, idx+1); 
+					if (max_timescale < gf_isom_get_media_timescale(orig, idx+1))
+						max_timescale = gf_isom_get_media_timescale(orig, idx+1);
 				}
 				if (dst_timescale < max_timescale) {
-					dst_timescale = gf_isom_get_media_timescale(dest, dst_tk); 
+					dst_timescale = gf_isom_get_media_timescale(dest, dst_tk);
 					idx = max_timescale / dst_timescale;
 					if (dst_timescale * idx < max_timescale) idx ++;
 					dst_timescale *= idx;
@@ -1724,12 +1803,12 @@
 			if (!count) insert_dts = 0;
 		}
 
-		ts_scale = (Float) gf_isom_get_media_timescale(dest, dst_tk);
+		ts_scale = gf_isom_get_media_timescale(dest, dst_tk);
 		ts_scale /= gf_isom_get_media_timescale(orig, i+1);
 
 		/*if not a new track, see if we can merge the edit list - this is a crude test that only checks
 		we have the same edit types*/
-		if (nb_edits && (nb_edits == gf_isom_get_edit_segment_count(dest, dst_tk)) ) { 
+		if (nb_edits && (nb_edits == gf_isom_get_edit_segment_count(dest, dst_tk)) ) {
 			u64 editTime, segmentDuration, mediaTime, dst_editTime, dst_segmentDuration, dst_mediaTime;
 			u8 dst_editMode, editMode;
 			u32 j;
@@ -1738,9 +1817,9 @@
 				gf_isom_get_edit_segment(orig, i+1, j+1, &editTime, &segmentDuration, &mediaTime, &editMode);
 				gf_isom_get_edit_segment(dest, dst_tk, j+1, &dst_editTime, &dst_segmentDuration, &dst_mediaTime, &dst_editMode);
 
-				if (dst_editMode!=editMode) { 
-					merge_edits=0; 
-					break; 
+				if (dst_editMode!=editMode) {
+					merge_edits=0;
+					break;
 				}
 			}
 		}
@@ -1803,12 +1882,12 @@
 
 					dur *= rescale;
 					prev_dur *= rescale;
-					
-					/*safety test: some files have broken edit lists. If no more than 2 entries, check that the segment duration 
+
+					/*safety test: some files have broken edit lists. If no more than 2 entries, check that the segment duration
 					is less or equal to the movie duration*/
 					if (prev_dur < segmentDuration) {
 						fprintf(stderr, "Warning: suspicious edit list entry found: duration %g sec but longest track duration before cat is %g - fixing it\n", (Double) (s64) segmentDuration/1000.0, prev_dur/1000);
-						segmentDuration = (u64) (s64) ( (Double) (s64) (dest_track_dur_before_cat - mediaTime) * rescale ); 
+						segmentDuration = (u64) (s64) ( (Double) (s64) (dest_track_dur_before_cat - mediaTime) * rescale );
 					}
 
 					segmentDuration += (u64) (s64) dur;
@@ -1821,7 +1900,7 @@
 			Double t;
 			u8 editMode;
 			u32 j, count;
-			
+
 			count = gf_isom_get_edit_segment_count(dest, dst_tk);
 			if (count) {
 				e = gf_isom_get_edit_segment(dest, dst_tk, count, &editTime, &segmentDuration, &mediaTime, &editMode);
@@ -1851,9 +1930,17 @@
 			count = gf_isom_get_edit_segment_count(orig, i+1);
 			for (j=0; j<count; j++) {
 				gf_isom_get_edit_segment(orig, i+1, j+1, &editTime, &segmentDuration, &mediaTime, &editMode);
-				t = (Double) (s64) editTime; t *= ts_scale; t += (s64) edit_offset; editTime = (s64) t;
-				t = (Double) (s64) segmentDuration; t *= ts_scale; segmentDuration = (s64) t;
-				t = (Double) (s64) mediaTime; t *= ts_scale; t+= (s64) dest_track_dur_before_cat; mediaTime = (s64) t;
+				t = (Double) (s64) editTime;
+				t *= ts_scale;
+				t += (s64) edit_offset;
+				editTime = (s64) t;
+				t = (Double) (s64) segmentDuration;
+				t *= ts_scale;
+				segmentDuration = (s64) t;
+				t = (Double) (s64) mediaTime;
+				t *= ts_scale;
+				t+= (s64) dest_track_dur_before_cat;
+				mediaTime = (s64) t;
 				if ((editMode == GF_ISOM_EDIT_EMPTY) && (mediaTime > 0)) {
 					editMode = GF_ISOM_EDIT_NORMAL;
 				}
@@ -1905,7 +1992,7 @@
 	Bool force_cat, align_timelines, allow_add_in_command;
 } CATEnum;
 
-Bool cat_enumerate(void *cbk, char *szName, char *szPath)
+Bool cat_enumerate(void *cbk, char *szName, char *szPath, GF_FileEnumInfo *file_info)
 {
 	GF_Err e;
 	u32 len_rad1;
@@ -1967,7 +2054,7 @@
 		MPEG-4 encoding
 */
 
-GF_Err EncodeFile(char *in, GF_ISOFile *mp4, GF_SMEncodeOptions *opts, FILE *logs) 
+GF_Err EncodeFile(char *in, GF_ISOFile *mp4, GF_SMEncodeOptions *opts, FILE *logs)
 {
 #ifdef GPAC_DISABLE_SMGR
 	return GF_NOT_SUPPORTED;
@@ -1979,7 +2066,7 @@
 #ifndef GPAC_DISABLE_SCENE_STATS
 	GF_StatManager *statsman = NULL;
 #endif
-	
+
 	sg = gf_sg_new();
 	ctx = gf_sm_new(sg);
 	memset(&load, 0, sizeof(GF_SceneLoader));
@@ -2013,7 +2100,7 @@
 				} else if (stats->int_res_2d + opts->resolution <= 0) {
 					fprintf(stderr, " Given resolution %d is too low, using %d instead.\n", opts->resolution, stats->int_res_2d - 1);
 					opts->resolution = 1 - stats->int_res_2d;
-				}				
+				}
 				opts->coord_bits = stats->int_res_2d + opts->resolution;
 				fprintf(stderr, " Coordinates & Lengths encoded using ");
 				if (opts->resolution < 0) fprintf(stderr, "only the %d most significant bits (of %d).\n", opts->coord_bits, stats->int_res_2d);
@@ -2027,7 +2114,7 @@
 					opts->scale_bits = 0;
 					fprintf(stderr, "encoded using a %d.8 representation\n", opts->coord_bits - 8);
 				}
-			} 
+			}
 #ifndef GPAC_DISABLE_VRML
 			/*BIFS*/
 			else if (stats->base_layer) {
@@ -2036,7 +2123,7 @@
 				M_QuantizationParameter *qp;
 				GF_Command *com = gf_sg_command_new(ctx->scene_graph, GF_SG_GLOBAL_QUANTIZER);
 				qp = (M_QuantizationParameter *) gf_node_new(ctx->scene_graph, TAG_MPEG4_QuantizationParameter);
-	
+
 				inf = gf_sg_command_field_new(com);
 				inf->new_node = (GF_Node *)qp;
 				inf->field_ptr = &inf->new_node;
@@ -2234,7 +2321,7 @@
 		esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
 		esd->decoderConfig->decoderSpecificInfo->data = data;
 		esd->decoderConfig->decoderSpecificInfo->dataLength = data_len;
-		esd->decoderConfig->objectTypeIndication = gf_bifs_encoder_get_version(bifsenc, sc->ESID);		
+		esd->decoderConfig->objectTypeIndication = gf_bifs_encoder_get_version(bifsenc, sc->ESID);
 
 		for (j=1; j<gf_list_count(sc->AUs); j++) {
 			char *data;
@@ -2262,11 +2349,11 @@
  * \param chunkFile BT chunk to be encoded
  * \param bifs output file name for the BIFS data
  * \param inputContext initial BT upon which the chunk is based (shall not be NULL)
- * \param outputContext: file name to dump the context after applying the new chunk to the input context 
+ * \param outputContext: file name to dump the context after applying the new chunk to the input context
                    can be NULL, without .bt
  * \param tmpdir can be NULL
  */
-GF_Err EncodeFileChunk(char *chunkFile, char *bifs, char *inputContext, char *outputContext, const char *tmpdir) 
+GF_Err EncodeFileChunk(char *chunkFile, char *bifs, char *inputContext, char *outputContext, const char *tmpdir)
 {
 #if defined(GPAC_DISABLE_SMGR) || defined(GPAC_DISABLE_BIFS_ENC) || defined(GPAC_DISABLE_SCENE_ENCODER) || defined (GPAC_DISABLE_SCENE_DUMP)
 	fprintf(stderr, "BIFS encoding is not supported in this build of GPAC\n");
@@ -2296,7 +2383,7 @@
 	/* Step 2: make sure we have only ONE RAP for each stream*/
 	e = gf_sm_aggregate(ctx, 0);
 	if (e) goto exit;
-	
+
 	/*Step 3: loading the chunk into the context*/
 	memset(&load, 0, sizeof(GF_SceneLoader));
 	load.fileName = chunkFile;
@@ -2311,11 +2398,11 @@
 	}
 	fprintf(stderr, "Context and chunks loaded\n");
 
-	/* Assumes that the first AU contains only one command a SceneReplace and 
+	/* Assumes that the first AU contains only one command a SceneReplace and
 	   that is not part of the current chunk */
-	/* Last argument is a callback to pass the encoded AUs: not needed here 
+	/* Last argument is a callback to pass the encoded AUs: not needed here
 	   Saving is not handled correctly */
-	e = EncodeBIFSChunk(ctx, bifs, NULL); 
+	e = EncodeBIFSChunk(ctx, bifs, NULL);
 	if (e) goto exit;
 
 
@@ -2326,7 +2413,7 @@
 		/*make random access for storage*/
 		e = gf_sm_aggregate(ctx, 0);
 		if (e) goto exit;
-		
+
 		/*check if we dump to BT, XMT or encode to MP4*/
 		strcpy(szF, outputContext);
 		ext = strrchr(szF, '.');
@@ -2375,8 +2462,8 @@
 
 	/*do not process hyperlinks*/
 	if (!strcmp(node_name, "a") || !strcmp(node_name, "Anchor")) return;
-	
-	for (i=0; i<nb_attributes;i++) {
+
+	for (i=0; i<nb_attributes; i++) {
 		att = (GF_XMLAttribute *) &attributes[i];
 		if (stricmp(att->name, "xlink:href") && stricmp(att->name, "url")) continue;
 		if (att->value[0]=='#') continue;
@@ -2387,7 +2474,7 @@
 	}
 }
 
-static Bool wgt_enum_files(void *cbck, char *file_name, char *file_path)
+static Bool wgt_enum_files(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
 {
 	WGTEnum *wgt = (WGTEnum *)cbck;
 
@@ -2397,7 +2484,7 @@
 	gf_list_add(wgt->imports, gf_strdup(file_path) );
 	return 0;
 }
-static Bool wgt_enum_dir(void *cbck, char *file_name, char *file_path)
+static Bool wgt_enum_dir(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
 {
 	if (!stricmp(file_name, "cvs") || !stricmp(file_name, ".svn")) return 0;
 	gf_enum_directory(file_path, 0, wgt_enum_files, cbck, NULL);
@@ -2545,15 +2632,26 @@
 		ext = strrchr(item, '.');
 		if (!stricmp(ext, ".gz")) ext = strrchr(ext-1, '.');
 
-		if (!stricmp(ext, ".jpg") || !stricmp(ext, ".jpeg")) mime = "image/jpeg"; 
-		else if (!stricmp(ext, ".png")) mime = "image/png"; 
-		else if (!stricmp(ext, ".svg")) mime = "image/svg+xml"; 
-		else if (!stricmp(ext, ".x3d")) mime = "model/x3d+xml"; 
-		else if (!stricmp(ext, ".xmt")) mime = "application/x-xmt"; 
-		else if (!stricmp(ext, ".js")) { mime = "application/javascript"; }
-		else if (!stricmp(ext, ".svgz") || !stricmp(ext, ".svg.gz")) { mime = "image/svg+xml"; encoding = "binary-gzip"; }
-		else if (!stricmp(ext, ".x3dz") || !stricmp(ext, ".x3d.gz")) { mime = "model/x3d+xml"; encoding = "binary-gzip"; }
-		else if (!stricmp(ext, ".xmtz") || !stricmp(ext, ".xmt.gz")) { mime = "application/x-xmt"; encoding = "binary-gzip"; }
+		if (!stricmp(ext, ".jpg") || !stricmp(ext, ".jpeg")) mime = "image/jpeg";
+		else if (!stricmp(ext, ".png")) mime = "image/png";
+		else if (!stricmp(ext, ".svg")) mime = "image/svg+xml";
+		else if (!stricmp(ext, ".x3d")) mime = "model/x3d+xml";
+		else if (!stricmp(ext, ".xmt")) mime = "application/x-xmt";
+		else if (!stricmp(ext, ".js")) {
+			mime = "application/javascript";
+		}
+		else if (!stricmp(ext, ".svgz") || !stricmp(ext, ".svg.gz")) {
+			mime = "image/svg+xml";
+			encoding = "binary-gzip";
+		}
+		else if (!stricmp(ext, ".x3dz") || !stricmp(ext, ".x3d.gz")) {
+			mime = "model/x3d+xml";
+			encoding = "binary-gzip";
+		}
+		else if (!stricmp(ext, ".xmtz") || !stricmp(ext, ".xmt.gz")) {
+			mime = "application/x-xmt";
+			encoding = "binary-gzip";
+		}
 
 		e = gf_isom_add_meta_item(file, 1, 0, 0, item, name, 0, mime, NULL, NULL,  NULL);
 		gf_free(name);

gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/live.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp4box/live.c Changed

@@ -13,15 +13,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -54,21 +54,21 @@
 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"
-			"-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"
-		);
+	        "\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"
+	        "-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, u32 ll, u32 lm, const char *fmt, va_list list)
@@ -78,14 +78,14 @@
 	fflush(logs);
 }
 
-int stream_file_rtp(int argc, char **argv) 
+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; 
+	char *logs=NULL;
 	FILE *logfile=NULL;
 	u16 port = 7000;
 	u32 ttl = 1;
@@ -99,7 +99,10 @@
 		char *arg = argv[i];
 
 		if (arg[0] != '-') {
-			if (inName) { fprintf(stderr, "Error - 2 input names specified, please check usage\n"); return 1; }
+			if (inName) {
+				fprintf(stderr, "Error - 2 input names specified, please check usage\n");
+				return 1;
+			}
 			inName = arg;
 		}
 		else if (!stricmp(arg, "-noloop")) loop = 0;
@@ -116,9 +119,9 @@
 	}
 
 	gf_sys_init(mem_track);
-	if (logs) 
+	if (logs)
 		gf_log_set_tools_levels(logs);
-	else 
+	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);
@@ -144,7 +147,7 @@
 			check--;
 			if (!check) {
 				if (gf_prompt_has_input()) {
-					char c = (char) gf_prompt_get_char(); 
+					char c = (char) gf_prompt_get_char();
 					if (c=='q') break;
 				}
 				check = 50;
@@ -160,37 +163,37 @@
 
 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"
-		"");
+	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 
+typedef struct
 {
 	GF_RTPStreamer *rtp;
 	Bool manual_rtcp;
@@ -208,7 +211,7 @@
 	u32 critical;
 } RTPChannel;
 
-typedef struct 
+typedef struct
 {
 	GF_SceneEngine *seng;
 	Bool force_carousel, carousel_generation;
@@ -261,7 +264,7 @@
 
 	while ( (rtpch = gf_list_enum(livesess->streams, &i))) {
 		if (rtpch->ESID == ESID) {
-			
+
 			/*store carousel data*/
 			if (livesess->carousel_generation && rtpch->carousel_period) {
 				if (rtpch->carousel_alloc < size) {
@@ -357,9 +360,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_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);
 
 			if (rtpch->rtp) {
 				gf_rtp_streamer_disable_auto_rtcp(rtpch->rtp);
@@ -381,12 +384,12 @@
 
 		port += 2;
 	}
-    if (sdp) {
+	if (sdp) {
 		FILE *out = gf_f64_open(sdp_name, "wt");
-        fprintf(out, "%s", sdp);
+		fprintf(out, "%s", sdp);
 		fclose(out);
-	    gf_free(sdp);
-    }
+		gf_free(sdp);
+	}
 }
 
 void live_session_shutdown(LiveSession *livesess)
@@ -470,9 +473,9 @@
 	u64 last_src_modif, mod_time;
 	char *src_name = NULL;
 	Bool run, has_carousel, no_rap;
-    Bool udp = 0;
+	Bool udp = 0;
 	u16 sk_port=0;
-    GF_Socket *sk = NULL;
+	GF_Socket *sk = NULL;
 	LiveSession livesess;
 	RTPChannel *ch;
 	char *update_buffer = NULL;
@@ -489,10 +492,10 @@
 	gf_sys_init(GF_FALSE);
 
 	memset(&livesess, 0, sizeof(LiveSession));
-	
+
 	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_INFO);
 
-	for (i=1; i<argc; i++) {
+	for (i=1; i<(u32) argc; i++) {
 		char *arg = argv[i];
 		if (arg[0] != '-') filename = arg;
 		else if (!strnicmp(arg, "-dst=", 5)) dst = arg+5;
@@ -501,11 +504,17 @@
 		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, "-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;
-        else if (!strnicmp(arg, "-udp=", 5)) { sk_port = atoi(arg+5); udp = 1; }
-        else if (!strnicmp(arg, "-tcp=", 5)) { sk_port = atoi(arg+5); udp = 0; }		
+		else if (!strnicmp(arg, "-udp=", 5)) {
+			sk_port = atoi(arg+5);
+			udp = 1;
+		}
+		else if (!strnicmp(arg, "-tcp=", 5)) {
+			sk_port = atoi(arg+5);
+			udp = 0;
+		}
 	}
 	if (!filename) {
 		fprintf(stderr, "Missing filename\n");
@@ -516,29 +525,29 @@
 	if (dst_port && dst) livesess.streams = gf_list_new();
 
 	livesess.seng = gf_seng_init(&livesess, filename, load_type, NULL, (load_type == GF_SM_LOAD_DIMS) ? 1 : 0);
-    if (!livesess.seng) {
+	if (!livesess.seng) {
 		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);
 
 	has_carousel = 0;
 	last_src_modif = src_name ? gf_file_modification_time(src_name) : 0;
 
-    if (sk_port) {
-        sk = gf_sk_new(udp ? GF_SOCK_TYPE_UDP : GF_SOCK_TYPE_TCP);
-        if (udp) {
-            e = gf_sk_bind(sk, NULL, sk_port, NULL, 0, 0);
-            if (e != GF_OK) {
-                if (sk) gf_sk_del(sk);
-                sk = NULL;
-            }
-        } else {
-        }
-    }
+	if (sk_port) {
+		sk = gf_sk_new(udp ? GF_SOCK_TYPE_UDP : GF_SOCK_TYPE_TCP);
+		if (udp) {
+			e = gf_sk_bind(sk, NULL, sk_port, NULL, 0, 0);
+			if (e != GF_OK) {
+				if (sk) gf_sk_del(sk);
+				sk = NULL;
+			}
+		} else {
+		}
+	}
 
 
-	for (i=0; i<argc; i++) {
+	for (i=0; i<(u32) argc; i++) {
 		char *arg = argv[i];
 		if (!strnicmp(arg, "-rap=", 5)) {
 			u32 period, id, j;
@@ -602,9 +611,9 @@
 					char szCom[8192];
 					fprintf(stderr, "Enter command to send:\n");
 					szCom[0] = 0;
-					if (1 > scanf("%[^\t\n]", szCom)){
-					    fprintf(stderr, "No command entered properly, aborting.\n");
-					    break;
+					if (1 > scanf("%[^\t\n]", szCom)) {
+						fprintf(stderr, "No command entered properly, aborting.\n");
+						break;
 					}
 					/*stdin flush bug*/
 					while (getchar()!='\n') {}
@@ -614,7 +623,7 @@
 					livesess.critical = 0;
 					update_context = 1;
 				}
-					break;
+				break;
 				case 'E':
 					livesess.critical = 1;
 				case 'e':
@@ -623,32 +632,32 @@
 					char szCom[8192];
 					fprintf(stderr, "Enter command to send:\n");
 					szCom[0] = 0;
-					if (1 > scanf("%[^\t\n]", szCom)){
-					    printf("No command entered properly, aborting.\n");
-					    break;
+					if (1 > scanf("%[^\t\n]", szCom)) {
+						printf("No command entered properly, aborting.\n");
+						break;
 					}
 					/*stdin flush bug*/
 					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 = 0;
 					e = gf_seng_aggregate_context(livesess.seng, 0);
 
 				}
-					break;
+				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 ouput file name entered, aborting.\n");
-					    break;
+					if (1 > scanf("%s", rad)) {
+						fprintf(stderr, "No ouput file name entered, aborting.\n");
+						break;
 					}
 					e = gf_seng_save_context(livesess.seng, !strcmp(rad, "std") ? NULL : rad);
 					fprintf(stderr, "Dump done (%s)\n", gf_error_to_string(e));
 				}
-					break;
+				break;
 				case 'F':
 					update_context = 1;
 				case 'f':
@@ -673,7 +682,7 @@
 
 				/*checks if we have a broadcast config*/
 				if (!fgets(flag_buf, 200, srcf))
-				  flag_buf[0] = '\0';
+					flag_buf[0] = '\0';
 				fclose(srcf);
 
 				aggregate_on_stream = (u16) -1;
@@ -726,10 +735,10 @@
 
 		/*process updates from socket source*/
 		if (sk) {
-		    char buffer[2049];
-		    u32 bytes_read;
-		    u32 update_length;
-		    u32 bytes_received;
+			char buffer[2049];
+			u32 bytes_read;
+			u32 update_length;
+			u32 bytes_received;
 
 
 			e = gf_sk_receive(sk, buffer, 2048, 0, &bytes_read);
@@ -761,8 +770,8 @@
 					gf_bs_del(bs);
 				}
 
-					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);
-					break;
+				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);
+				break;
 				default:
 					update_length = 0;
 					break;
@@ -819,7 +828,7 @@
 			gf_sleep(10);
 			continue;
 		}
-		ch = next_carousel(&livesess, (u32 *) &next_time); 
+		ch = next_carousel(&livesess, (u32 *) &next_time);
 		if ((ch==NULL) || (next_time > 20)) {
 			gf_sleep(20);
 			continue;
@@ -841,7 +850,7 @@
 
 #endif /*defined(GPAC_DISABLE_ISOM) || defined(GPAC_DISABLE_ISOM_WRITE)*/
 
-u32 grab_live_m2ts(const char *grab_m2ts, const char *outName)
+u32 grab_live_m2ts(const char *grab_m2ts, const char *grab_ifce, const char *outName)
 {
 	char data[0x80000];
 	u32 check = 50;
@@ -853,7 +862,7 @@
 	GF_RTPReorder *ch = NULL;
 #endif
 	GF_Socket *sock;
-	GF_Err e = gf_m2ts_get_socket(grab_m2ts, NULL, 0x80000, &sock);
+	GF_Err e = gf_m2ts_get_socket(grab_m2ts, grab_ifce, 0x80000, &sock);
 
 	if (e) {
 		fprintf(stderr, "Cannot open %s: %s\n", grab_m2ts, gf_error_to_string(e));
@@ -865,7 +874,7 @@
 		gf_sk_del(sock);
 		return 1;
 	}
-	
+
 	fprintf(stderr, "Dumping %s stream to %s - press q to abort\n", grab_m2ts, outName);
 
 	first_run = 1;
@@ -876,7 +885,7 @@
 		check--;
 		if (!check) {
 			if (gf_prompt_has_input()) {
-				char c = (char) gf_prompt_get_char(); 
+				char c = (char) gf_prompt_get_char();
 				if (c=='q') break;
 			}
 			check = 50;
@@ -901,8 +910,8 @@
 		/*process chunk*/
 		if (is_rtp) {
 #ifndef GPAC_DISABLE_STREAMING
-			char *pck;				
-			seq_num = ((data[2] << 8) & 0xFF00) | (data[3] & 0xFF);				
+			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);
@@ -911,7 +920,7 @@
 				gf_free(pck);
 			}
 #else
-			fwrite(data+12, size-12, 1, output);			
+			fwrite(data+12, size-12, 1, output);
 #endif
 		} else {
 			fwrite(data, size, 1, output);

gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp4box/main.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -88,7 +88,7 @@
 
 /*in filedump.c*/
 #ifndef GPAC_DISABLE_SCENE_DUMP
-GF_Err dump_file_text(char *file, char *inName, u32 dump_mode, Bool do_log);
+GF_Err dump_file_text(char *file, char *inName, GF_SceneDumpFormat dump_mode, Bool do_log);
 //void gf_check_isom_files(char *conf_rules, char *inName);
 #endif
 #ifndef GPAC_DISABLE_SCENE_STATS
@@ -114,18 +114,17 @@
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 void dump_file_ismacryp(GF_ISOFile *file, char *inName);
-void dump_timed_text_track(GF_ISOFile *file, u32 trackID, char *inName, Bool is_convert, u32 dump_type);
+void dump_timed_text_track(GF_ISOFile *file, u32 trackID, char *inName, 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();
-const char *GetLanguageCode(char *lang);
 
 #ifndef GPAC_DISABLE_MPEG2TS
 void dump_mpeg2_ts(char *mpeg2ts_file, char *pes_out_name, Bool prog_num);
-#endif 
+#endif
 
 
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
@@ -136,7 +135,7 @@
 #endif
 
 #if !defined(GPAC_DISABLE_STREAMING)
-u32 grab_live_m2ts(const char *grab_m2ts, const char *outName);
+u32 grab_live_m2ts(const char *grab_m2ts, const char *ifce_name, const char *outName);
 #endif
 
 int mp4boxTerminal(int argc, char **argv);
@@ -152,7 +151,11 @@
 s32 laser_resolution = 0;
 
 
-typedef struct { u32 code; const char *name; const char *comment; } itunes_tag;
+typedef struct {
+	u32 code;
+	const char *name;
+	const char *comment;
+} itunes_tag;
 static const itunes_tag itags[] = {
 	{GF_ISOM_ITUNE_ALBUM_ARTIST, "album_artist", "usage: album_artist=album artist"},
 	{GF_ISOM_ITUNE_ALBUM, "album", "usage: album=name" },
@@ -181,575 +184,605 @@
 void PrintVersion()
 {
 	fprintf(stderr, "MP4Box - GPAC version " GPAC_FULL_VERSION "\n"
-		"GPAC Copyright (c) Telecom ParisTech 2000-2012\n"
-		"GPAC Configuration: " GPAC_CONFIGURATION "\n"
-		"Features: %s\n", gpac_features());
+	        "GPAC Copyright (c) Telecom ParisTech 2000-2012\n"
+	        "GPAC Configuration: " GPAC_CONFIGURATION "\n"
+	        "Features: %s\n", gpac_features());
 }
 
 void PrintGeneralUsage()
 {
 	fprintf(stderr, "General Options:\n"
 #ifdef GPAC_MEMORY_TRACKING
-			" -mem-track:  enables memory tracker\n"
+	        " -mem-track:  enables memory tracker\n"
 #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 accross 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"
-			" -ffspace size        inserts free space before moof in fragmented files\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"
-			" -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"
-			" -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"
-			" -rem trackID         removes track from file\n"
-			" -enable trackID      enables track\n"
-			" -disable trackID     disables track\n"
-			" -new                 forces creation of a new destination file\n"
-			" -lang [tkID=]LAN     sets track language. LAN is the ISO 639-2 code (eng, und)\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\")\n"
-			" -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\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 begining 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"
-			"                       * 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"
-			"\n");
+	        " -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 accross 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"
+	        " -ffspace size        inserts free space before moof in fragmented files\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"
+	        " -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"
+	        " -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"
+	        " -rem trackID         removes track from file\n"
+	        " -rap trackID         removes all non-RAP samples from track\n"
+	        " -enable trackID      enables track\n"
+	        " -disable trackID     disables track\n"
+	        " -new                 forces creation of a new destination file\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\")\n"
+	        " -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\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 begining 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"
+	        "                       * 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"
+	        "\n");
 }
 
 void PrintDASHUsage()
 {
 	fprintf(stderr, "DASH Options:\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"
-			" -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\", \"live\", \"main\", \"simple\", \"full\"\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"
-			"\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 video track from the source file\n"
-			" \":id=NAME\"         sets the representation ID to NAME\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"
-			" \":bandwidth=VALUE\" sets the representation's bandwidth to a given value\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"
-			"\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"
-			" -segment-ext name    sets the segment extension. Default is m4s, \"null\" means no extension\n"
-			" -segment-timeline    Uses SegmentTimeline when generating segments. NOT SUPPORTED BY LIVE/CTX MODE YET.\n"
-			" -segment-marker MARK Adds a box of type \'MARK\' at the end of each DASH segment. MARK shall be a 4CC identifier\n"
-			" -base-url string     sets Base url at MPD level. Can be used several times.\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-live[=F] dur   generates a live DASH session using dur segment duration, optionnally 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"
-			" -dash-ctx FILE       stores/restore DASH timing from FILE.\n"
-			" -dynamic             uses dynamic MPD type instead of static.\n"
-			" -mpd-refresh TIME    specifies MPD update time in seconds.\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"
-			" -min-buffer TIME     specifies MPD min buffer time in milliseconds\n"
-			" -ast-offset TIME     specifies MPD AvailabilityStartTime offset in seconds. Default is 1 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           stores PSSH boxes in first moof of each segments. By default PSSH are stored in movie box.\n"
-			" -sample-groups-traf  stores sample group descriptions in traf (duplicated for each traf) rather than in moof. By default sample group descriptions are stored in movie box.\n"		
-			
-			"\n"
-			"Advanced Options, should not be needed when using -dash-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"
-			" -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\", \"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 flags in fragments\n"
-			" -dash-ts-prog N      program_number to be considered in case of an MPTS input file.\n"
-			"\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"
+	        " -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"
+	        "                       \"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"
+	        "\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 video track from the source file\n"
+	        " \":id=NAME\"         sets the representation ID to NAME\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"
+	        " \":bandwidth=VALUE\" sets the representation's bandwidth to a given value\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.\n"
+	        " \":desc_as=VALUE\"   adds a descriptor at the AdaptationSet level \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 \n"
+	        "                       value is ignored to created AdaptationSet elements.\n"
+	        " \":desc_rep=VALUE\"  adds a descriptor at the Representation level.\n"
+	        "                       value is ignored to created AdaptationSet elements.\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"
+	        " -segment-ext name    sets the segment extension. Default is m4s, \"null\" means no extension\n"
+	        " -segment-timeline    Uses SegmentTimeline when generating segments. NOT SUPPORTED BY LIVE/CTX MODE YET.\n"
+	        " -segment-marker MARK Adds a box of type \'MARK\' at the end of each DASH segment. MARK shall be a 4CC identifier\n"
+	        " -base-url string     sets Base url at MPD level. Can be used several times.\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-live[=F] dur   generates a live DASH session using dur segment duration, optionnally 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"
+	        " -dash-ctx FILE       stores/restore DASH timing from FILE.\n"
+	        " -dynamic             uses dynamic MPD type instead of static.\n"
+	        " -mpd-refresh TIME    specifies MPD update time in seconds.\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"
+	        " -min-buffer TIME     specifies MPD min buffer time in milliseconds\n"
+	        " -ast-offset TIME     specifies MPD AvailabilityStartTime offset in seconds. Default is 1 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           stores PSSH boxes in first moof of each segments. By default PSSH are stored in movie box.\n"
+	        " -sample-groups-traf  stores sample group descriptions in traf (duplicated for each traf) rather than in moof. By default sample group descriptions are stored in movie box.\n"
+
+	        "\n"
+	        "Advanced Options, should not be needed when using -dash-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"
+	        " -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\", \"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 flags in fragments\n"
+	        " -single-traf         uses a single track fragment per moof (smooth streaming and derived specs may require this)\n"
+	        " -dash-ts-prog N      program_number to be considered in case of an MPTS input file.\n"
+	        "\n");
 }
 
 void PrintFormats()
 {
 	fprintf(stderr, "Suppported 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\n"
-			" JPEG Images          .jpg .jpeg\n"
-			" PNG Images           .png\n"
-			" MPEG 1-2 Audio       .mp3, .m1a, .m2a\n"
-			" ADTS-AAC Audio       .aac\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"
-			" GPAC Timed Text      .ttxt\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"
-			" 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"
-		);
+	        " 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\n"
+	        " JPEG Images          .jpg .jpeg\n"
+	        " PNG Images           .png\n"
+	        " MPEG 1-2 Audio       .mp3, .m1a, .m2a\n"
+	        " ADTS-AAC Audio       .aac\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"
+	        " GPAC Timed Text      .ttxt\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"
+	        " 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"
+	       );
 }
 
 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"
-			" \":agg=VAL\"           same as -agg option\n"
-			" \":par=VAL\"           same as -par option\n"
-			" \":dref\"              same as -dref option\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"
-			" \":ps\"                same as -ps option\n"
-			" \":psx\"               same as -psx option\n"
-			" \":ovsbr\"             same as -ovsbr option\n" 
-			" \":mpeg4\"             same as -mpeg4 option\n"
-			" \":svc\"               import SVC with explicit signaling (no AVC base compatibility)\n"
-			" \":nosvc\"             discard SVC data when importing\n"
-			" \":svcmode=MODE\"      sets SVC import mode:\n"
-			" \"                       split : each AVC/SVC layer is in its own track\n"
-			" \"                       merge : all AVC/SVC layers are merged in a single track\n"
-			" \"                       splitbase : all SVC layers are merged in a track, and the AVC base in another\n"
-			" \":subsamples\"        adds SubSample information for AVC+SVC\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"
-			" \":font=name\"         specifies font name for text import (default \"Serif\")\n"
-			" \":size=s\"            specifies font size for text import (default 18)\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 import timescale to TS\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"
+	        " \":trailing\"          keeps trailing 0-bytes in AVC/HEVC samples\n"
+	        " \":agg=VAL\"           same as -agg option\n"
+	        " \":dref\"              same as -dref option\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"
+	        " \":mpeg4\"             same as -mpeg4 option\n"
+	        " \":svc\"               import SVC/SHVC with explicit signaling (no AVC base compatibility)\n"
+	        " \":nosvc\"             discard SVC/SHVC data when importing\n"
+	        " \":svcmode=MODE\"      sets SVC/SHVC 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"
+	        " \":subsamples\"        adds SubSample information for AVC+SVC\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"
+	        " \":negctts\"           uses negative CTTS table\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 import timescale to TS\n"
+	        " \":noedit\"            do not set edit list when importing B-frames video tracks\n"
+	        " \":rvc=FILENAME\"      sets TVC 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"
+
+	        " \":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-flatten=ang\"   complementary angle below which 2 lines are merged\n"
-			"                         * Note: angle \'0\' means no flattening\n"
-			"\n"
-			" \":negctts\"           uses negative CTS-DTS offsets (ISO4 brand)\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"
-			" -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"
-			);
+	        "                         * 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"
+	        "\n"
+	        " \":negctts\"           uses negative CTS-DTS offsets (ISO4 brand)\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"
+	        " -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"
+	       );
 }
 
 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"
-			);
+	        " -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"
+	       );
 }
 
 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 adress 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"
-			"   \"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"
-		);
+	        " -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 adress 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"
+	        "   \"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"
+	       );
 }
 
 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");
+	        " -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");
 }
 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"
+	        " -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"
+	        " -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");
+	        "\n");
 }
 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                scene IsoMedia file boxes in XML output\n"
-			" -drtp                rtp hint samples structure to XML output\n"
-			" -dts                 prints sample timing to text output\n"
-			" -dnal trackID        prints NAL sample info of given track\n"
-			" -sdp                 dumps SDP description of hinted file\n"
-			" -dcr                 ISMACryp samples structure to XML output\n"
-			" -dump-cover          Extracts cover art\n"
-			" -dump-chap           Extracts chapter file\n"
-			"\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                scene IsoMedia file boxes in XML output\n"
+	        " -drtp                rtp hint samples structure to XML output\n"
+	        " -dts                 prints sample timing to text output\n"
+	        " -dnal trackID        prints NAL sample info of given track\n"
+	        " -sdp                 dumps SDP description of hinted file\n"
+	        " -dcr                 ISMACryp samples structure to XML output\n"
+	        " -dump-cover          Extracts cover art\n"
+	        " -dump-chap           Extracts chapter file\n"
+	        "\n"
 #ifndef GPAC_DISABLE_ISOM_WRITE
-			" -ttxt                Converts input subtitle to GPAC TTXT format\n"
+	        " -ttxt                Converts input subtitle to GPAC TTXT format\n"
 #endif
-			" -ttxt TrackID        Dumps Text track to GPAC TTXT format\n"
+	        " -ttxt TrackID        Dumps Text track to GPAC TTXT format\n"
 #ifndef GPAC_DISABLE_ISOM_WRITE
-			" -srt                 Converts input subtitle to SRT format\n"
+	        " -srt                 Converts input subtitle to SRT format\n"
 #endif
-			" -srt TrackID         Dumps Text track to SRT format\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");
+	        " -srt TrackID         Dumps Text track to SRT format\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");
 }
 
 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"
-			"                        tk=ID: meta adressing (file, moov, track)\n"
-			"                        name=str: item name\n"
-			"                        mime=mtype: item mime type\n"
-			"                        encoding=enctype: item content-encoding type\n"
-			"                        id=id: item ID\n"
-			"                       * file_path \"this\" or \"self\": item is the file itself\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"
-			"\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"
+	        "                        tk=ID: meta adressing (file, moov, track)\n"
+	        "                        name=str: item name\n"
+	        "                        mime=mtype: item mime type\n"
+	        "                        encoding=enctype: item content-encoding type\n"
+	        "                        id=id: item ID\n"
+	        "                       * file_path \"this\" or \"self\": item is the file itself\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"
+	        "\n");
 }
 
 void PrintSWFUsage()
 {
-	fprintf(stderr, 
-			"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"
-		);
+	fprintf(stderr,
+	        "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"
+	       );
 }
 
 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 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"
-			" -snode NodeName      gets SVG node syntax\n"
-			" -languages           lists supported ISO 639 languages\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"
-			" -version             gets build version\n"
-			" -- INPUT             escape option if INPUT starts with - character\n"
-			"\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 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"
+	         " -snode NodeName      gets SVG node syntax\n"
+	         " -languages           lists supported ISO 639 languages\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"
+	         " -version             gets build version\n"
+	         " -- INPUT             escape option if INPUT starts with - character\n"
+	         "\n"
+	        );
 }
 
 
@@ -757,7 +790,7 @@
 {
 	FILE *logs = cbk;
 	if (log_tool != GF_LOG_CODING) return;
-    vfprintf(logs, fmt, vlist);
+	vfprintf(logs, fmt, vlist);
 	fflush(logs);
 }
 
@@ -811,7 +844,7 @@
 	tot_bw = 0;
 	prev_ocr = 0;
 	single_ocr = 1;
-	
+
 	has_iod = 1;
 	iod = (GF_InitialObjectDescriptor *) gf_isom_get_root_od(file);
 	if (!iod) has_iod = 0;
@@ -913,26 +946,26 @@
 				if (!nb_done) return e;
 			}
 			continue;
-		} 
+		}
 		bw = gf_hinter_track_get_bandwidth(hinter);
 		tot_bw += bw;
 		flags = gf_hinter_track_get_flags(hinter);
-	
+
 		//set extraction mode for AVC/SVC
 		gf_isom_set_nalu_extract_mode(file, i+1, GF_ISOM_NALU_EXTRACT_LAYER_ONLY);
 
 		gf_hinter_track_get_payload_name(hinter, szPayload);
 		fprintf(stderr, "Hinting track ID %d - Type \"%s:%s\" (%s) - BW %d kbps\n", gf_isom_get_track_id(file, i+1), gf_4cc_to_str(mtype), gf_4cc_to_str(mtype), szPayload, bw);
 		if (flags & GP_RTP_PCK_SYSTEMS_CAROUSEL) fprintf(stderr, "\tMPEG-4 Systems stream carousel enabled\n");
-/*
-		if (flags & GP_RTP_PCK_FORCE_MPEG4) fprintf(stderr, "\tMPEG4 transport forced\n");
-		if (flags & GP_RTP_PCK_USE_MULTI) fprintf(stderr, "\tRTP aggregation enabled\n");
-*/
+		/*
+				if (flags & GP_RTP_PCK_FORCE_MPEG4) fprintf(stderr, "\tMPEG4 transport forced\n");
+				if (flags & GP_RTP_PCK_USE_MULTI) fprintf(stderr, "\tRTP aggregation enabled\n");
+		*/
 		e = gf_hinter_track_process(hinter);
 
 		if (!e) e = gf_hinter_track_finalize(hinter, has_iod);
 		gf_hinter_track_del(hinter);
-		
+
 		if (e) {
 			fprintf(stderr, "Error while hinting (%s)\n", gf_error_to_string(e));
 			if (!nb_done) return e;
@@ -982,9 +1015,9 @@
 	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_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);
@@ -1049,18 +1082,9 @@
 
 #endif /*!defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_AV_PARSERS)*/
 
-/*return value:
-	0: not supported 
-	1: ISO media 
-	2: input bt file (.bt, .wrl)
-	3: input XML file (.xmt)
-	4: input SVG file (.svg)
-	5: input SWF file (.swf)
-	6: input LASeR file (.lsr or .saf)
-*/
-u32 get_file_type_by_ext(char *inName)
+GF_FileType get_file_type_by_ext(char *inName)
 {
-	u32 type = 0;
+	GF_FileType type = GF_FILE_TYPE_NOT_SUPPORTED;
 	char *ext = strrchr(inName, '.');
 	if (ext) {
 		char *sep;
@@ -1069,26 +1093,30 @@
 		sep = strchr(ext, '.');
 		if (sep) sep[0] = 0;
 
-		if (!stricmp(ext, "mp4") || !stricmp(ext, "3gp") || !stricmp(ext, "mov") || !stricmp(ext, "3g2") || !stricmp(ext, "3gs")) type = 1;
-		else if (!stricmp(ext, "bt") || !stricmp(ext, "wrl") || !stricmp(ext, "x3dv")) type = 2;
-		else if (!stricmp(ext, "xmt") || !stricmp(ext, "x3d")) type = 3;
-		else if (!stricmp(ext, "lsr") || !stricmp(ext, "saf")) type = 6;
-		else if (!stricmp(ext, "svg")) type = 4;
-		else if (!stricmp(ext, "xsr")) type = 4;
-		else if (!stricmp(ext, "xml")) type = 4;
-		else if (!stricmp(ext, "swf")) type = 5;
-		else if (!stricmp(ext, "jp2")) {
+		if (!stricmp(ext, "mp4") || !stricmp(ext, "3gp") || !stricmp(ext, "mov") || !stricmp(ext, "3g2") || !stricmp(ext, "3gs")) {
+			type = GF_FILE_TYPE_ISO_MEDIA;
+		} else if (!stricmp(ext, "bt") || !stricmp(ext, "wrl") || !stricmp(ext, "x3dv")) {
+			type = GF_FILE_TYPE_BT_WRL_X3DV;
+		} else if (!stricmp(ext, "xmt") || !stricmp(ext, "x3d")) {
+			type = GF_FILE_TYPE_XMT_X3D;
+		} else if (!stricmp(ext, "lsr") || !stricmp(ext, "saf")) {
+			type = GF_FILE_TYPE_LSR_SAF;
+		} else if (!stricmp(ext, "svg") || !stricmp(ext, "xsr") || !stricmp(ext, "xml")) {
+			type = GF_FILE_TYPE_SVG;
+		} else if (!stricmp(ext, "swf")) {
+			type = GF_FILE_TYPE_SWF;
+		} else if (!stricmp(ext, "jp2")) {
 			if (sep) sep[0] = '.';
-			return 0;
+			return GF_FILE_TYPE_NOT_SUPPORTED;
 		}
-		else type = 0;
+		else type = GF_FILE_TYPE_NOT_SUPPORTED;
 
 		if (sep) sep[0] = '.';
 	}
 
 
 	/*try open file in read mode*/
-	if (!type && gf_isom_probe_file(inName)) type = 1;
+	if (!type && gf_isom_probe_file(inName)) type = GF_FILE_TYPE_ISO_MEDIA;
 	return type;
 }
 
@@ -1096,8 +1124,8 @@
 static Bool can_convert_to_isma(GF_ISOFile *file)
 {
 	u32 spec = gf_isom_guess_specification(file);
-	if (spec==GF_4CC('I','S','M','A')) return 1;
-	return 0;
+	if (spec==GF_4CC('I','S','M','A')) return GF_TRUE;
+	return GF_FALSE;
 }
 #endif
 
@@ -1110,20 +1138,21 @@
 	char *line;
 } SDPLine;
 
+typedef enum {
+	META_ACTION_SET_TYPE			= 0,
+	META_ACTION_ADD_ITEM			= 1,
+	META_ACTION_REM_ITEM			= 2,
+	META_ACTION_SET_PRIMARY_ITEM	= 3,
+	META_ACTION_SET_XML				= 4,
+	META_ACTION_SET_BINARY_XML		= 5,
+	META_ACTION_REM_XML				= 6,
+	META_ACTION_DUMP_ITEM			= 7,
+	META_ACTION_DUMP_XML			= 8,
+} MetaActionType;
+
 typedef struct
 {
-	/*actions:
-		0: set meta type
-		1: add item
-		2: rem item
-		3: set item primary
-		4: set XML
-		5: set binary XML
-		6: rem XML
-		7: dump item
-		8: dump XML
-	*/
-	u32 act_type;
+	MetaActionType act_type;
 	Bool root_meta, use_dref;
 	u32 trackID;
 	u32 meta_4cc;
@@ -1133,7 +1162,7 @@
 } MetaAction;
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-static Bool parse_meta_args(MetaAction *meta, u32 act_type, char *opts)
+static Bool parse_meta_args(MetaAction *meta, MetaActionType act_type, char *opts)
 {
 	Bool ret = 0;
 	char szSlot[1024], *next;
@@ -1156,41 +1185,61 @@
 		/*use ':' as separator, but beware DOS paths...*/
 		if (next && next[1]=='\\') next = strchr(szSlot+2, ':');
 		if (next) next[0] = 0;
-		
+
 		if (!strnicmp(szSlot, "tk=", 3)) {
 			sscanf(szSlot, "tk=%u", &meta->trackID);
 			meta->root_meta = 0;
 			ret = 1;
 		}
-		else if (!strnicmp(szSlot, "id=", 3)) { meta->item_id = atoi(szSlot+3); ret = 1; }
-		else if (!strnicmp(szSlot, "name=", 5)) { strcpy(meta->szName, szSlot+5); ret = 1; }
-		else if (!strnicmp(szSlot, "path=", 5)) { strcpy(meta->szPath, szSlot+5); ret = 1; }
-		else if (!strnicmp(szSlot, "mime=", 5)) { strcpy(meta->mime_type, szSlot+5); ret = 1; }
-		else if (!strnicmp(szSlot, "encoding=", 9)) { strcpy(meta->enc_type, szSlot+9); ret = 1; }
-		else if (!strnicmp(szSlot, "dref", 4)) { meta->use_dref = 1; ret = 1; }
+		else if (!strnicmp(szSlot, "id=", 3)) {
+			meta->item_id = atoi(szSlot+3);
+			ret = 1;
+		}
+		else if (!strnicmp(szSlot, "name=", 5)) {
+			strcpy(meta->szName, szSlot+5);
+			ret = 1;
+		}
+		else if (!strnicmp(szSlot, "path=", 5)) {
+			strcpy(meta->szPath, szSlot+5);
+			ret = 1;
+		}
+		else if (!strnicmp(szSlot, "mime=", 5)) {
+			strcpy(meta->mime_type, szSlot+5);
+			ret = 1;
+		}
+		else if (!strnicmp(szSlot, "encoding=", 9)) {
+			strcpy(meta->enc_type, szSlot+9);
+			ret = 1;
+		}
+		else if (!strnicmp(szSlot, "dref", 4)) {
+			meta->use_dref = 1;
+			ret = 1;
+		}
 		else if (!stricmp(szSlot, "binary")) {
-			if (meta->act_type==4) meta->act_type=5;
+			if (meta->act_type==META_ACTION_SET_XML) meta->act_type=META_ACTION_SET_BINARY_XML;
 			ret = 1;
 		}
 		else if (!strchr(szSlot, '=')) {
 			switch (meta->act_type) {
-			case 0:
+			case META_ACTION_SET_TYPE:
 				if (!stricmp(szSlot, "null") || !stricmp(szSlot, "0")) meta->meta_4cc = 0;
 				else meta->meta_4cc = GF_4CC(szSlot[0], szSlot[1], szSlot[2], szSlot[3]);
 				ret = 1;
 				break;
-			case 1: 
-			case 4: 
-			case 7: 
-				strcpy(meta->szPath, szSlot);  
+			case META_ACTION_ADD_ITEM:
+			case META_ACTION_SET_XML:
+			case META_ACTION_DUMP_ITEM:
+				strcpy(meta->szPath, szSlot);
 				ret = 1;
 				break;
-			case 2: 
-			case 3: 
-			case 8: 
-				meta->item_id = atoi(szSlot);  
+			case META_ACTION_REM_ITEM:
+			case META_ACTION_SET_PRIMARY_ITEM:
+			case META_ACTION_DUMP_XML:
+				meta->item_id = atoi(szSlot);
 				ret = 1;
 				break;
+			default:
+				break;
 			}
 		}
 		opts += strlen(szSlot);
@@ -1200,12 +1249,16 @@
 #endif
 
 
-
+typedef enum {
+	TSEL_ACTION_SET_PARAM = 0,
+	TSEL_ACTION_REMOVE_TSEL = 1,
+	TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP = 2,
+	TSEL_ACTION_REMOVE_ALL_TSEL_IN_FILE = 3,
+} TSELActionType;
 
 typedef struct
-{	
-	/*0: set tsel param - 1 remove tsel - 2 remove all tsel info in alternate group - 3 remove all tsel info in file*/
-	u32 act_type;
+{
+	TSELActionType act_type;
 	u32 trackID;
 
 	u32 refTrackID;
@@ -1217,7 +1270,7 @@
 
 static Bool parse_tsel_args(TSELAction **__tsel_list, char *opts, u32 *nb_tsel_act)
 {
-	u32 act;
+	TSELActionType act;
 	u32 refTrackID = 0;
 	Bool has_switch_id;
 	u32 switch_id = 0;
@@ -1229,7 +1282,7 @@
 
 	has_switch_id = 0;
 	act = tsel_list[*nb_tsel_act].act_type;
-			
+
 
 	if (!opts) return 0;
 	while (1) {
@@ -1242,19 +1295,19 @@
 		if (next) next[0] = 0;
 
 
-		if (!strnicmp(szSlot, "ref=", 4)) refTrackID = atoi(szSlot+4);  
+		if (!strnicmp(szSlot, "ref=", 4)) refTrackID = atoi(szSlot+4);
 		else if (!strnicmp(szSlot, "switchID=", 9)) {
 			if (atoi(szSlot+9)<0) {
-				switch_id = 0; 
+				switch_id = 0;
 				has_switch_id = 0;
 			} else {
-				switch_id = atoi(szSlot+9); 
+				switch_id = atoi(szSlot+9);
 				has_switch_id = 1;
 			}
 		}
 		else if (!strnicmp(szSlot, "switchID", 8)) {
-				switch_id = 0; 
-				has_switch_id = 1;
+			switch_id = 0;
+			has_switch_id = 1;
 		}
 		else if (!strnicmp(szSlot, "criteria=", 9)) {
 			u32 j=9;
@@ -1283,7 +1336,7 @@
 				refTrackID = tsel_act->trackID;
 
 			(*nb_tsel_act) ++;
-		}		
+		}
 		opts += strlen(szSlot);
 	}
 	return 1;
@@ -1292,30 +1345,34 @@
 
 #define CHECK_NEXT_ARG	if (i+1==(u32)argc) { fprintf(stderr, "Missing arg - please check usage\n"); MP4BOX_EXIT_WITH_CODE(1); }
 
+typedef enum {
+	TRAC_ACTION_REM_TRACK		= 0,
+	TRAC_ACTION_SET_LANGUAGE	= 1,
+	TRAC_ACTION_SET_DELAY		= 2,
+	TRAC_ACTION_SET_KMS_URI		= 3,
+	TRAC_ACTION_SET_PAR			= 4,
+	TRAC_ACTION_SET_HANDLER_NAME= 5,
+	TRAC_ACTION_ENABLE			= 6,
+	TRAC_ACTION_DISABLE			= 7,
+	TRAC_ACTION_REFERENCE		= 8,
+	TRAC_ACTION_RAW_EXTRACT		= 9,
+	TRAC_ACTION_REM_NON_RAP		= 10,
+	TRAC_ACTION_SET_KIND		= 11,
+	TRAC_ACTION_REM_KIND		= 12,
+} TrackActionType;
+
 typedef struct
 {
-	/*
-	0: rem track
-	1: set track language
-	2: set track delay
-	3: set track KMS URI
-	4: set visual track PAR if possible
-	5: set track handler name
-	6: enables track
-	7: disables track
-	8: referenceTrack
-	9: raw extraction
-	*/
-	u32 act_type;
-	/*track ID*/
+	TrackActionType act_type;
 	u32 trackID;
-	char lang[4];
+	char *lang;
 	s32 delay_ms;
 	const char *kms;
 	const char *hdl_name;
 	s32 par_num, par_den;
 	u32 dump_type, sample_num;
 	char *out_name;
+	char *kind_scheme, *kind_value;
 } TrackAction;
 
 enum
@@ -1335,16 +1392,39 @@
 		for (i=0; i<nb_track_act; i++) { \
 			if (tracks[i].out_name) \
 				gf_free(tracks[i].out_name); \
+			if (tracks[i].kind_scheme) \
+				gf_free(tracks[i].kind_scheme); \
+			if (tracks[i].kind_value) \
+				gf_free(tracks[i].kind_value); \
 		} \
 		gf_free(tracks); \
 	}\
 	if (tsel_acts) gf_free(tsel_acts); \
 	if (brand_add) gf_free(brand_add); \
 	if (brand_rem) gf_free(brand_rem); \
-	if (dash_inputs) gf_free(dash_inputs); \
+	if (dash_inputs) { \
+		u32 input_index; \
+		for (input_index = 0; input_index < dash_inputs->nb_rep_descs; input_index++) { \
+			gf_free(dash_inputs->rep_descs[input_index]); \
+		} \
+		gf_free(dash_inputs->rep_descs); \
+		for (input_index = 0; input_index < dash_inputs->nb_as_descs; input_index++) { \
+			gf_free(dash_inputs->as_descs[input_index]); \
+		} \
+		gf_free(dash_inputs->as_descs); \
+		for (input_index = 0; input_index < dash_inputs->nb_as_c_descs; input_index++) { \
+			gf_free(dash_inputs->as_c_descs[input_index]); \
+		} \
+		gf_free(dash_inputs->as_c_descs); \
+		for (input_index = 0; input_index < dash_inputs->nb_p_descs; input_index++) { \
+			gf_free(dash_inputs->p_descs[input_index]); \
+		} \
+		gf_free(dash_inputs->p_descs); \
+		gf_free(dash_inputs); \
+	} \
 	gf_sys_close();	\
 	return __ret_code; \
-
+ 
 
 GF_DashSegmenterInput *set_dash_input(GF_DashSegmenterInput *dash_inputs, char *name, u32 *nb_dash_inputs)
 {
@@ -1362,6 +1442,19 @@
 		sep[0] = 0;
 		while (opts) {
 			sep = strchr(opts, ':');
+			while (sep) {
+				/* this is a real separator if it is followed by a keyword we are looking for */
+				if (!strnicmp(sep, ":id=", 4) ||
+				        !strnicmp(sep, ":period=", 8) ||
+				        !strnicmp(sep, ":bandwidth=", 11) ||
+				        !strnicmp(sep, ":role=", 6) ||
+				        !strnicmp(sep, ":desc", 5) ||
+				        !strnicmp(sep, ":xlink=", 7)) {
+					break;
+				} else {
+					sep = strchr(sep+1, ':');
+				}
+			}
 			if (sep && !strncmp(sep, "://", 3)) sep = strchr(sep+3, ':');
 			if (sep) sep[0] = 0;
 
@@ -1369,7 +1462,7 @@
 				u32 i;
 				strncpy(di->representationID, opts+3, 99);
 				/* check to see if this representation Id has already been assigned */
-				for (i=0; i<(*nb_dash_inputs)-1;i++) {
+				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)) {
@@ -1381,16 +1474,46 @@
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] PeriodID cannot exceed 99 characters in MP4Box, truncating ...\n"));
 				}
 				strncpy(di->periodID, opts+7, 99);
-			} 
+			}
 			else if (!strnicmp(opts, "bandwidth=", 10)) di->bandwidth = atoi(opts+10);
 			else if (!strnicmp(opts, "role=", 5)) strncpy(di->role, opts+5, 99);
+			else if (!strnicmp(opts, "desc", 4)) {
+				u32 *nb_descs;
+				char ***descs;
+				u32 opt_offset;
+				u32 len;
+				if (!strnicmp(opts, "desc_p=", 7)) {
+					nb_descs = &di->nb_p_descs;
+					descs = &di->p_descs;
+					opt_offset = 7;
+				} else if (!strnicmp(opts, "desc_as=", 8)) {
+					nb_descs = &di->nb_as_descs;
+					descs = &di->as_descs;
+					opt_offset = 8;
+				} else if (!strnicmp(opts, "desc_as_c=", 8)) {
+					nb_descs = &di->nb_as_c_descs;
+					descs = &di->as_c_descs;
+					opt_offset = 10;
+				} else if (!strnicmp(opts, "desc_rep=", 8)) {
+					nb_descs = &di->nb_rep_descs;
+					descs = &di->rep_descs;
+					opt_offset = 9;
+				}
+				(*nb_descs)++;
+				opts += opt_offset;
+				len = (u32) strlen(opts);
+				(*descs) = (char **)gf_realloc((*descs), (*nb_descs)*sizeof(char *));
+				(*descs)[(*nb_descs)-1] = (char *)gf_malloc((len+1)*sizeof(char));
+				strncpy((*descs)[(*nb_descs)-1], opts, len);
+				(*descs)[(*nb_descs)-1][len] = 0;
+			}
 			else if (!strnicmp(opts, "xlink=", 6)) {
 				if (strlen(opts+6) > 199) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] XLink cannot exceed 99 characters in MP4Box, truncating ...\n"));
 				}
 				strncpy(di->xlink, opts+6, 199);
 			}
-			
+
 			if (!sep) break;
 			sep[0] = ':';
 			opts = sep+1;
@@ -1425,12 +1548,12 @@
 				action->sample_num = atoi(param);
 			}
 #endif
-		} 
+		}
 	}
 	if (!strcmp(string, "*")) {
 		action->trackID = (u32) -1;
 	} else {
-	    action->trackID = atoi(string);
+		action->trackID = atoi(string);
 	}
 	return GF_OK;
 }
@@ -1439,13 +1562,33 @@
 {
 	*actions = (TrackAction *)gf_realloc(*actions, sizeof(TrackAction) * (*nb_track_act+1));
 	memset(&(*actions)[*nb_track_act], 0, sizeof(TrackAction) );
-	(*actions)[*nb_track_act].act_type = 9;
+	(*actions)[*nb_track_act].act_type = TRAC_ACTION_RAW_EXTRACT;
 	(*actions)[*nb_track_act].dump_type = dump_type;
 	parse_track_action_params(string, &(*actions)[*nb_track_act]);
 	(*nb_track_act)++;
 	return dump_type;
 }
 
+
+
+static GF_Err hash_file(char *name, u32 dump_std)
+{
+	u32 i;
+	u8 hash[20];
+	GF_Err e = gf_media_get_file_hash(name, hash);
+	if (e) return e;
+	if (dump_std==2) {
+		fwrite(hash, 1, 20, stdout);
+	} else if (dump_std==1) {
+		for (i=0; i<20; i++) fprintf(stdout, "%02X", hash[i]);
+	}
+	fprintf(stderr, "File %s hash (SHA-1): ", name);
+	for (i=0; i<20; i++) fprintf(stderr, "%02X", hash[i]);
+	fprintf(stderr, "\n");
+
+	return GF_OK;
+}
+
 static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
 {
 	FILE *logs = cbk;
@@ -1470,9 +1613,10 @@
 	u32 *brand_add = NULL;
 	u32 *brand_rem = NULL;
 	GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
-	u32 i, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, raw_sample_num, 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, dash_dynamic, initial_moof_sn, dump_std, dump_mode, import_subtitle;
+	u32 i, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, raw_sample_num, 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, dash_dynamic, initial_moof_sn, dump_std, import_subtitle;
+	GF_SceneDumpFormat dump_mode;
 	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_isom, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, dump_timestamps, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, dash_live, no_fragments_defaults;
+	Bool print_sdp, print_info, open_edit, dump_isom, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, dump_timestamps, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, dash_live, no_fragments_defaults, single_traf_per_moof;
 	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;
 	u32 track_dump_type;
 	u32 trackID;
@@ -1523,9 +1667,10 @@
 	const char *dash_more_info = NULL;
 #if !defined(GPAC_DISABLE_STREAMING)
 	const char *grab_m2ts = NULL;
+	const char *grab_ifce = NULL;
 #endif
 	FILE *logfile = NULL;
-	
+
 	nb_tsel_acts = nb_add = nb_cat = nb_track_act = nb_sdp_ex = max_ptime = raw_sample_num = 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;
@@ -1538,9 +1683,11 @@
 	movie_time = 0;
 	dump_nal = 0;
 	FullInter = HintInter = encode = do_log = old_interleave = do_saf = do_hash = verbose = 0;
-	dump_mode = Frag = force_ocr = remove_sys_tracks = agg_samples = remove_hint = keep_sys_tracks = remove_root_od = single_group = 0;
+	dump_mode = GF_SM_DUMP_NONE;
+	Frag = force_ocr = remove_sys_tracks = agg_samples = remove_hint = keep_sys_tracks = remove_root_od = single_group = 0;
 	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_isom = dump_rtp = dump_cr = dump_srt = dump_ttxt = force_new = dump_timestamps = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = 0;
 	no_fragments_defaults = 0;
+	single_traf_per_moof = 0,
 	dash_dynamic = 0;
 	/*align cat is the new default behaviour for -cat*/
 	align_cat = 1;
@@ -1570,19 +1717,18 @@
 	swf_flatten_angle = 0.0f;
 	tmpdir = NULL;
 
-
-
 	for (i = 1; i < (u32) argc ; i++) {
 		if (!strcmp(argv[i], "-mem-track")) {
 #ifdef GPAC_MEMORY_TRACKING
 			enable_mem_tracker = 1;
 #else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n");
 #endif
 			break;
 		}
 	}
 
+	/*init libgpac*/
 	gf_sys_init(enable_mem_tracker);
 	if (argc < 2) {
 		PrintUsage();
@@ -1602,9 +1748,9 @@
 				i++;
 			}
 			if (argc < 3) {
-				fprintf(stderr, "Error - only one input file found as argument, please check usage\n"); 
-				MP4BOX_EXIT_WITH_CODE(1); 
-			} else if (inName) { 
+				fprintf(stderr, "Error - only one input file found as argument, please check usage\n");
+				MP4BOX_EXIT_WITH_CODE(1);
+			} else if (inName) {
 				if (dash_duration) {
 					if (!nb_dash_inputs) {
 						dash_inputs = set_dash_input(dash_inputs, inName, &nb_dash_inputs);
@@ -1612,18 +1758,24 @@
 					dash_inputs = set_dash_input(dash_inputs, arg_val, &nb_dash_inputs);
 				} else {
 					fprintf(stderr, "Error - 2 input names specified, please check usage\n");
-					MP4BOX_EXIT_WITH_CODE(1); 
+					MP4BOX_EXIT_WITH_CODE(1);
 				}
 			} else {
 				inName = arg_val;
 			}
 		}
-		else if (!stricmp(arg, "-?")) { PrintUsage(); MP4BOX_EXIT_WITH_CODE(0); }
-		else if (!stricmp(arg, "-version")) { PrintVersion(); MP4BOX_EXIT_WITH_CODE(0); }
+		else if (!stricmp(arg, "-?")) {
+			PrintUsage();
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
+		else if (!stricmp(arg, "-version")) {
+			PrintVersion();
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
 		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 (!stricmp(arg, "-logs")) {
 			CHECK_NEXT_ARG
 			gf_logs = argv[i+1];
@@ -1635,7 +1787,7 @@
 			logfile = gf_f64_open(argv[i+1], "wt");
 			gf_log_set_callback(logfile, on_gpac_log);
 			i++;
-		} 
+		}
 		else if (!stricmp(arg, "-noprog")) quiet = 1;
 		else if (!stricmp(arg, "-info")) {
 			print_info = 1;
@@ -1653,14 +1805,20 @@
 			CHECK_NEXT_ARG
 			grab_m2ts = argv[i+1];
 			i++;
-		}		
+		}
+		else if (!stricmp(arg, "-ifce")) {
+			CHECK_NEXT_ARG
+			grab_ifce = argv[i+1];
+			i++;
+		}
+		
 #endif
 #if !defined(GPAC_DISABLE_CORE_TOOLS)
 		else if (!stricmp(arg, "-wget")) {
 			CHECK_NEXT_ARG
 			do_wget = argv[i+1];
 			i++;
-		}		
+		}
 #endif
 		/*******************************************************************************/
 		else if (!stricmp(arg, "-dvbhdemux")) {
@@ -1690,7 +1848,10 @@
 				if (strlen(argv[i+1])==5) trackID = 2;
 				else trackID = 1 + atoi(argv[i+1] + 5);
 			}
-			else { fprintf(stderr, "Usage: \"-aviraw video\" or \"-aviraw audio\"\n"); MP4BOX_EXIT_WITH_CODE(1); }
+			else {
+				fprintf(stderr, "Usage: \"-aviraw video\" or \"-aviraw audio\"\n");
+				MP4BOX_EXIT_WITH_CODE(1);
+			}
 			track_dump_type = GF_EXPORT_AVI_NATIVE;
 			i++;
 		}
@@ -1737,26 +1898,44 @@
 			dump_iod = 1;
 		}
 #ifndef GPAC_DISABLE_VRML
-		else if (!stricmp(arg, "-node")) { CHECK_NEXT_ARG PrintNode(argv[i+1], 0); MP4BOX_EXIT_WITH_CODE(0); }
-		else if (!stricmp(arg, "-xnode")) { CHECK_NEXT_ARG PrintNode(argv[i+1], 1); MP4BOX_EXIT_WITH_CODE(0); }
-		else if (!stricmp(arg, "-nodes")) { PrintBuiltInNodes(0); MP4BOX_EXIT_WITH_CODE(0); }
-		else if (!stricmp(arg, "-xnodes")) { PrintBuiltInNodes(1); MP4BOX_EXIT_WITH_CODE(0); } 
+		else if (!stricmp(arg, "-node")) {
+			CHECK_NEXT_ARG PrintNode(argv[i+1], 0);
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
+		else if (!stricmp(arg, "-xnode")) {
+			CHECK_NEXT_ARG PrintNode(argv[i+1], 1);
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
+		else if (!stricmp(arg, "-nodes")) {
+			PrintBuiltInNodes(0);
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
+		else if (!stricmp(arg, "-xnodes")) {
+			PrintBuiltInNodes(1);
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
 #endif
 #ifndef GPAC_DISABLE_SVG
-		else if (!stricmp(arg, "-snode")) { CHECK_NEXT_ARG PrintNode(argv[i+1], 2); MP4BOX_EXIT_WITH_CODE(0); }
-		else if (!stricmp(arg, "-snodes")) { PrintBuiltInNodes(2); MP4BOX_EXIT_WITH_CODE(0); } 
+		else if (!stricmp(arg, "-snode")) {
+			CHECK_NEXT_ARG PrintNode(argv[i+1], 2);
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
+		else if (!stricmp(arg, "-snodes")) {
+			PrintBuiltInNodes(2);
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
 #endif
 		else if (!stricmp(arg, "-std")) dump_std = 2;
 		else if (!stricmp(arg, "-stdb")) dump_std = 1;
 
 #if !defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_SCENE_DUMP)
-		else if (!stricmp(arg, "-bt")) dump_mode = 1 + GF_SM_DUMP_BT;
-		else if (!stricmp(arg, "-xmt")) dump_mode = 1 + GF_SM_DUMP_XMTA;
-		else if (!stricmp(arg, "-wrl")) dump_mode = 1 + GF_SM_DUMP_VRML;
-		else if (!stricmp(arg, "-x3dv")) dump_mode = 1 + GF_SM_DUMP_X3D_VRML;
-		else if (!stricmp(arg, "-x3d")) dump_mode = 1 + GF_SM_DUMP_X3D_XML;
-		else if (!stricmp(arg, "-lsr")) dump_mode = 1 + GF_SM_DUMP_LASER;
-		else if (!stricmp(arg, "-svg")) dump_mode = 1 + GF_SM_DUMP_SVG;
+		else if (!stricmp(arg, "-bt")) dump_mode = GF_SM_DUMP_BT;
+		else if (!stricmp(arg, "-xmt")) dump_mode = GF_SM_DUMP_XMTA;
+		else if (!stricmp(arg, "-wrl")) dump_mode = GF_SM_DUMP_VRML;
+		else if (!stricmp(arg, "-x3dv")) dump_mode = GF_SM_DUMP_X3D_VRML;
+		else if (!stricmp(arg, "-x3d")) dump_mode = GF_SM_DUMP_X3D_XML;
+		else if (!stricmp(arg, "-lsr")) dump_mode = GF_SM_DUMP_LASER;
+		else if (!stricmp(arg, "-svg")) dump_mode = GF_SM_DUMP_SVG;
 #endif /*defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_SCENE_DUMP)*/
 
 		else if (!stricmp(arg, "-stat")) stat_level = 1;
@@ -1770,8 +1949,11 @@
 
 #if 0
 		else if (!stricmp(arg, "-conf")) {
-			if (i+1==(u32)argc) { fprintf(stderr, "Missing arg - please check usage\n"); MP4BOX_EXIT_WITH_CODE(1); }
-			if (i+2==(u32)argc) { 
+			if (i+1==(u32)argc) {
+				fprintf(stderr, "Missing arg - please check usage\n");
+				MP4BOX_EXIT_WITH_CODE(1);
+			}
+			if (i+2==(u32)argc) {
 				gf_check_isom_files(NULL, argv[i+1]);
 			} else {
 				gf_check_isom_files(argv[i+1], argv[i+2]);
@@ -1792,7 +1974,7 @@
 			}
 		} else if (!stricmp(arg, "-dnal")) {
 			CHECK_NEXT_ARG
-				dump_nal = atoi(argv[i+1]);
+			dump_nal = atoi(argv[i+1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-dcr")) dump_cr = 1;
@@ -1806,10 +1988,13 @@
 				trackID = 0;
 			}
 #ifdef GPAC_DISABLE_ISOM_WRITE
-			if (trackID) { fprintf(stderr, "Error: Read-Only version - subtitle conversion not available\n"); MP4BOX_EXIT_WITH_CODE(1); }
+			if (trackID) {
+				fprintf(stderr, "Error: Read-Only version - subtitle conversion not available\n");
+				MP4BOX_EXIT_WITH_CODE(1);
+			}
 #endif
-			if (!stricmp(arg, "-ttxt")) dump_ttxt = 1;
-			else dump_srt = 1;
+			if (!stricmp(arg, "-ttxt")) dump_ttxt = GF_TRUE;
+			else dump_srt = GF_TRUE;
 			import_subtitle = 1;
 		} else if (!stricmp(arg, "-dm2ts")) {
 			dump_m2ts = 1;
@@ -1838,25 +2023,58 @@
 		}
 #endif
 #ifndef GPAC_DISABLE_ISOM_WRITE
-		else if (!stricmp(arg, "-isma")) { conv_type = GF_ISOM_CONV_TYPE_ISMA; open_edit = 1; }
-		else if (!stricmp(arg, "-3gp")) { conv_type = GF_ISOM_CONV_TYPE_3GPP; open_edit = 1; }
-		else if (!stricmp(arg, "-ipod")) { conv_type = GF_ISOM_CONV_TYPE_IPOD; open_edit = 1; }
-		else if (!stricmp(arg, "-psp")) { conv_type = GF_ISOM_CONV_TYPE_PSP; open_edit = 1; }
-		else if (!stricmp(arg, "-ismax")) { conv_type = GF_ISOM_CONV_TYPE_ISMA_EX; open_edit = 1; }
-
-		else if (!stricmp(arg, "-no-sys") || !stricmp(arg, "-nosys")) { remove_sys_tracks = 1; open_edit = 1; }
-		else if (!stricmp(arg, "-no-iod")) { remove_root_od = 1; open_edit = 1; }
-		else if (!stricmp(arg, "-out")) { CHECK_NEXT_ARG outName = argv[i+1]; i++; }
+		else if (!stricmp(arg, "-isma")) {
+			conv_type = GF_ISOM_CONV_TYPE_ISMA;
+			open_edit = 1;
+		}
+		else if (!stricmp(arg, "-3gp")) {
+			conv_type = GF_ISOM_CONV_TYPE_3GPP;
+			open_edit = 1;
+		}
+		else if (!stricmp(arg, "-ipod")) {
+			conv_type = GF_ISOM_CONV_TYPE_IPOD;
+			open_edit = 1;
+		}
+		else if (!stricmp(arg, "-psp")) {
+			conv_type = GF_ISOM_CONV_TYPE_PSP;
+			open_edit = 1;
+		}
+		else if (!stricmp(arg, "-ismax")) {
+			conv_type = GF_ISOM_CONV_TYPE_ISMA_EX;
+			open_edit = 1;
+		}
+
+		else if (!stricmp(arg, "-no-sys") || !stricmp(arg, "-nosys")) {
+			remove_sys_tracks = 1;
+			open_edit = 1;
+		}
+		else if (!stricmp(arg, "-no-iod")) {
+			remove_root_od = 1;
+			open_edit = 1;
+		}
+		else if (!stricmp(arg, "-out")) {
+			CHECK_NEXT_ARG outName = argv[i+1];
+			i++;
+		}
 		else if (!stricmp(arg, "-tmp")) {
-			CHECK_NEXT_ARG tmpdir = argv[i+1]; i++; 
+			CHECK_NEXT_ARG tmpdir = argv[i+1];
+			i++;
 		}
 		else if (!stricmp(arg, "-write-buffer")) {
-			CHECK_NEXT_ARG 
+			CHECK_NEXT_ARG
 			gf_isom_set_output_buffering(NULL, atoi(argv[i+1]));
-			i++; 
+			i++;
+		}
+		else if (!stricmp(arg, "-cprt")) {
+			CHECK_NEXT_ARG cprt = argv[i+1];
+			i++;
+			if (!dash_duration) open_edit = 1;
+		}
+		else if (!stricmp(arg, "-chap")) {
+			CHECK_NEXT_ARG chap_file = argv[i+1];
+			i++;
+			open_edit = 1;
 		}
-		else if (!stricmp(arg, "-cprt")) { CHECK_NEXT_ARG cprt = argv[i+1]; i++; if (!dash_duration) open_edit = 1; }
-		else if (!stricmp(arg, "-chap")) { CHECK_NEXT_ARG chap_file = argv[i+1]; i++; open_edit = 1; }
 		else if (!strcmp(arg, "-strict-error")) {
 			gf_log_set_strict_error(1);
 		} else if (!stricmp(arg, "-inter") || !stricmp(arg, "-old-inter")) {
@@ -1917,7 +2135,9 @@
 			else bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
 			i++;
 		}
-		else if (!stricmp(arg, "-dynamic")) { dash_dynamic = 1; }
+		else if (!stricmp(arg, "-dynamic")) {
+			dash_dynamic = 1;
+		}
 		else if (!strnicmp(arg, "-dash-live", 10) || !strnicmp(arg, "-ddbg-live", 10)) {
 			dash_dynamic = !strnicmp(arg, "-ddbg-live", 10) ? 2 : 1;
 			dash_live = 1;
@@ -1928,46 +2148,63 @@
 			dash_duration = atof(argv[i+1]) / 1000;
 			i++;
 		}
-		else if (!stricmp(arg, "-mpd-refresh")) { CHECK_NEXT_ARG mpd_update_time = atoi(argv[i+1]); i++;   }
-		else if (!stricmp(arg, "-time-shift")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-mpd-refresh")) {
+			CHECK_NEXT_ARG mpd_update_time = atoi(argv[i+1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-time-shift")) {
+			CHECK_NEXT_ARG
 			time_shift_depth = (u32) atoi(argv[i+1]);
 			i++;
 		}
-		else if (!stricmp(arg, "-min-buffer")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-min-buffer")) {
+			CHECK_NEXT_ARG
 			min_buffer = atoi(argv[i+1]);
 			min_buffer /= 1000;
 			i++;
 		}
-		else if (!stricmp(arg, "-ast-offset")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-ast-offset")) {
+			CHECK_NEXT_ARG
 			ast_shift_sec = (u32) atoi(argv[i+1]);
 			i++;
 		}
-		else if (!stricmp(arg, "-moof-sn")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-moof-sn")) {
+			CHECK_NEXT_ARG
 			initial_moof_sn = (u32) atoi(argv[i+1]);
 			i++;
 		}
-		else if (!stricmp(arg, "-tfdt")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-tfdt")) {
+			CHECK_NEXT_ARG
 			sscanf(argv[i+1], LLU, &initial_tfdt);
 			i++;
 		}
-		else if (!stricmp(arg, "-no-frags-default")) { no_fragments_defaults = 1; }
-		else if (!stricmp(arg, "-mpd-title")) { CHECK_NEXT_ARG dash_title = argv[i+1]; i++; }
-		else if (!stricmp(arg, "-mpd-source")) { CHECK_NEXT_ARG dash_source = argv[i+1]; i++; }
-		else if (!stricmp(arg, "-mpd-info-url")) { CHECK_NEXT_ARG dash_more_info = argv[i+1]; i++; }
-		else if (!stricmp(arg, "-base-url")) { 
-			CHECK_NEXT_ARG 
-			dash_more_info = argv[i+1]; 
+		else if (!stricmp(arg, "-no-frags-default")) {
+			no_fragments_defaults = 1;
+		}
+		else if (!stricmp(arg, "-single-traf")) {
+			single_traf_per_moof = 1;
+		}
+		else if (!stricmp(arg, "-mpd-title")) {
+			CHECK_NEXT_ARG dash_title = argv[i+1];
+			i++;
+		}
+		else if (!stricmp(arg, "-mpd-source")) {
+			CHECK_NEXT_ARG dash_source = argv[i+1];
+			i++;
+		}
+		else if (!stricmp(arg, "-mpd-info-url")) {
+			CHECK_NEXT_ARG dash_more_info = argv[i+1];
+			i++;
+		}
+		else if (!stricmp(arg, "-base-url")) {
+			CHECK_NEXT_ARG
+			dash_more_info = argv[i+1];
 			mpd_base_urls = gf_realloc(mpd_base_urls, (nb_mpd_base_urls+1)*sizeof(char**));
 			mpd_base_urls[nb_mpd_base_urls] = argv[i+1];
 			nb_mpd_base_urls++;
-			i++; 
+			i++;
 		}
-		
+
 		else if (!stricmp(arg, "-dash-ctx")) {
 			CHECK_NEXT_ARG
 			dash_ctx_file = argv[i+1];
@@ -2009,10 +2246,20 @@
 			CHECK_NEXT_ARG
 			m = argv[i+1];
 			segment_marker = GF_4CC(m[0], m[1], m[2], m[3]);
-		} else if (!stricmp(arg, "-itags")) { CHECK_NEXT_ARG itunes_tags = argv[i+1]; i++; open_edit = 1; }
+		} else if (!stricmp(arg, "-itags")) {
+			CHECK_NEXT_ARG itunes_tags = argv[i+1];
+			i++;
+			open_edit = 1;
+		}
 #ifndef GPAC_DISABLE_ISOM_HINTING
-		else if (!stricmp(arg, "-hint")) { open_edit = 1; HintIt = 1; }
-		else if (!stricmp(arg, "-unhint")) { open_edit = 1; remove_hint = 1; }
+		else if (!stricmp(arg, "-hint")) {
+			open_edit = 1;
+			HintIt = 1;
+		}
+		else if (!stricmp(arg, "-unhint")) {
+			open_edit = 1;
+			remove_hint = 1;
+		}
 		else if (!stricmp(arg, "-copy")) HintCopy = 1;
 		else if (!stricmp(arg, "-tight")) {
 			FullInter = 1;
@@ -2021,6 +2268,17 @@
 		} else if (!stricmp(arg, "-ocr")) force_ocr = 1;
 		else if (!stricmp(arg, "-latm")) hint_flags |= GP_RTP_PCK_USE_LATM_AAC;
 		else if (!stricmp(arg, "-rap")) {
+			if ((i+1 < (u32)argc) && (argv[i+1][0] != '-')) {
+				if (sscanf(argv[i+1], "%d", &trackID) == 1) {
+					tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+					memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+					tracks[nb_track_act].act_type = TRAC_ACTION_REM_NON_RAP;
+					tracks[nb_track_act].trackID = trackID;
+					nb_track_act++;
+					i++;
+					open_edit = 1;
+				}
+			}
 			hint_flags |= GP_RTP_PCK_SIGNAL_RAP;
 			seg_at_rap=1;
 		}
@@ -2050,9 +2308,18 @@
 #endif
 		}
 #ifndef GPAC_DISABLE_ISOM_HINTING
-		else if (!stricmp(arg, "-mtu")) { CHECK_NEXT_ARG MTUSize = atoi(argv[i+1]); i++; }
-		else if (!stricmp(arg, "-cardur")) { CHECK_NEXT_ARG car_dur = atoi(argv[i+1]); i++; }
-		else if (!stricmp(arg, "-rate")) { CHECK_NEXT_ARG rtp_rate = atoi(argv[i+1]); i++; }
+		else if (!stricmp(arg, "-mtu")) {
+			CHECK_NEXT_ARG MTUSize = atoi(argv[i+1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-cardur")) {
+			CHECK_NEXT_ARG car_dur = atoi(argv[i+1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-rate")) {
+			CHECK_NEXT_ARG rtp_rate = atoi(argv[i+1]);
+			i++;
+		}
 #ifndef GPAC_DISABLE_SENG
 		else if (!stricmp(arg, "-add-sdp") || !stricmp(arg, "-sdp_ex")) {
 			char *id;
@@ -2087,7 +2354,7 @@
 			track_dump_type = GF_EXPORT_MP4;
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
-			tracks[nb_track_act].act_type = 9;
+			tracks[nb_track_act].act_type = TRAC_ACTION_RAW_EXTRACT;
 			tracks[nb_track_act].trackID = atoi(argv[i+1]);
 			tracks[nb_track_act].dump_type = GF_EXPORT_MP4;
 			nb_track_act++;
@@ -2135,10 +2402,9 @@
 			CHECK_NEXT_ARG
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
-
-			if (!stricmp(arg, "-enable")) tracks[nb_track_act].act_type = 6;
-			else if (!stricmp(arg, "-disable")) tracks[nb_track_act].act_type = 7;
-			else tracks[nb_track_act].act_type = 0;
+			if (!stricmp(arg, "-enable")) tracks[nb_track_act].act_type = TRAC_ACTION_ENABLE;
+			else if (!stricmp(arg, "-disable")) tracks[nb_track_act].act_type = TRAC_ACTION_DISABLE;
+			else tracks[nb_track_act].act_type = TRAC_ACTION_REM_TRACK;
 			tracks[nb_track_act].trackID = atoi(argv[i+1]);
 			open_edit = 1;
 			nb_track_act++;
@@ -2150,7 +2416,7 @@
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
-			tracks[nb_track_act].act_type = 4;
+			tracks[nb_track_act].act_type = TRAC_ACTION_SET_PAR;
 			assert(strlen(argv[i+1])+1 <= sizeof(szTK));
 			strncpy(szTK, argv[i+1], sizeof(szTK));
 			ext = strchr(szTK, '=');
@@ -2181,17 +2447,16 @@
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
-			tracks[nb_track_act].act_type = 1;
-			tracks[nb_track_act].lang[3] = 0;
+			tracks[nb_track_act].act_type = TRAC_ACTION_SET_LANGUAGE;
 			tracks[nb_track_act].trackID = 0;
 			strcpy(szTK, argv[i+1]);
 			ext = strchr(szTK, '=');
 			if (!strnicmp(argv[i+1], "all=", 4)) {
-				strncpy(tracks[nb_track_act].lang, argv[i+1]+1, 3);
+				tracks[nb_track_act].lang = gf_strdup(argv[i+1]+4);
 			} else if (!ext) {
-				strncpy(tracks[nb_track_act].lang, argv[i+1], 3);
+				tracks[nb_track_act].lang = gf_strdup(argv[i+1]);
 			} else {
-				strncpy(tracks[nb_track_act].lang, ext+1, 3);
+				tracks[nb_track_act].lang = gf_strdup(ext+1);
 				ext[0] = 0;
 				tracks[nb_track_act].trackID = atoi(szTK);
 				ext[0] = '=';
@@ -2200,6 +2465,56 @@
 			nb_track_act++;
 			i++;
 		}
+		else if (!stricmp(arg, "-kind") || !stricmp(arg, "-kind-rem")) {
+			char szTK[200], *ext;
+			char *scheme_start = NULL;
+			Bool has_track_id = GF_FALSE;
+			CHECK_NEXT_ARG
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+
+			if (!stricmp(arg, "-kind")) {
+				tracks[nb_track_act].act_type = TRAC_ACTION_SET_KIND;
+			} else {
+				tracks[nb_track_act].act_type = TRAC_ACTION_REM_KIND;
+			}
+			tracks[nb_track_act].trackID = 0;
+			if (!strnicmp(argv[i+1], "all=", 4)) {
+				scheme_start = argv[i+1]+4;
+				has_track_id = GF_TRUE;
+			}
+			if (!scheme_start) {
+				if (strlen(argv[i+1])>200) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_ALL, ("Warning: track kind parameter is too long!"));
+				}
+				strncpy(szTK, argv[i+1], 200);
+				ext = strchr(szTK, '=');
+				if (ext && !has_track_id) {
+					ext[0] = 0;
+					has_track_id = (sscanf(szTK, "%d", &tracks[nb_track_act].trackID) == 1 ? GF_TRUE : GF_FALSE);
+					if (has_track_id) {
+						scheme_start = ext+1;
+					} else {
+						scheme_start = szTK;
+					}
+					ext[0] = '=';
+				} else {
+					scheme_start = szTK;
+				}
+			}
+			ext = strchr(scheme_start, '=');
+			if (!ext) {
+				tracks[nb_track_act].kind_scheme = gf_strdup(scheme_start);
+			} else {
+				ext[0] = 0;
+				tracks[nb_track_act].kind_scheme = gf_strdup(scheme_start);
+				ext[0] = '=';
+				tracks[nb_track_act].kind_value = gf_strdup(ext+1);				
+			}						
+			open_edit = 1;
+			nb_track_act++;
+			i++;
+		}
 		else if (!stricmp(arg, "-delay")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
@@ -2212,7 +2527,7 @@
 				fprintf(stderr, "Bad format for track delay - expecting ID=DLAY got %s\n", argv[i+1]);
 				MP4BOX_EXIT_WITH_CODE(1);
 			}
-			tracks[nb_track_act].act_type = 2;
+			tracks[nb_track_act].act_type = TRAC_ACTION_SET_DELAY;
 			tracks[nb_track_act].delay_ms = atoi(ext+1);
 			ext[0] = 0;
 			tracks[nb_track_act].trackID = atoi(szTK);
@@ -2232,15 +2547,18 @@
 				fprintf(stderr, "Bad format for track reference - expecting ID:XXXX:refID got %s\n", argv[i+1]);
 				MP4BOX_EXIT_WITH_CODE(1);
 			}
-			tracks[nb_track_act].act_type = 8;
-			ext[0] = 0; tracks[nb_track_act].trackID = atoi(szTK); ext[0] = ':'; szTK = ext+1;
+			tracks[nb_track_act].act_type = TRAC_ACTION_REFERENCE;
+			ext[0] = 0;
+			tracks[nb_track_act].trackID = atoi(szTK);
+			ext[0] = ':';
+			szTK = ext+1;
 			ext = strchr(szTK, ':');
 			if (!ext) {
 				fprintf(stderr, "Bad format for track reference - expecting ID:XXXX:refID got %s\n", argv[i+1]);
 				MP4BOX_EXIT_WITH_CODE(1);
 			}
 			ext[0] = 0;
-			strncpy(tracks[nb_track_act].lang, szTK, 4);
+			tracks[nb_track_act].lang = gf_strdup(szTK);
 			ext[0] = ':';
 			tracks[nb_track_act].delay_ms = (s32) atoi(ext+1);
 			open_edit = 1;
@@ -2259,7 +2577,7 @@
 				fprintf(stderr, "Bad format for track name - expecting ID=name got %s\n", argv[i+1]);
 				MP4BOX_EXIT_WITH_CODE(1);
 			}
-			tracks[nb_track_act].act_type = 5;
+			tracks[nb_track_act].act_type = TRAC_ACTION_SET_HANDLER_NAME;
 			tracks[nb_track_act].hdl_name = strchr(argv[i+1], '=') + 1;
 			ext[0] = 0;
 			tracks[nb_track_act].trackID = atoi(szTK);
@@ -2277,8 +2595,8 @@
 		else if (!stricmp(arg, "-ps")) import_flags |= GF_IMPORT_PS_IMPLICIT;
 		else if (!stricmp(arg, "-psx")) import_flags |= GF_IMPORT_PS_EXPLICIT;
 		else if (!stricmp(arg, "-ovsbr")) import_flags |= GF_IMPORT_OVSBR;
-		else if (!stricmp(arg, "-fps")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-fps")) {
+			CHECK_NEXT_ARG
 			if (!strcmp(argv[i+1], "auto")) import_fps = GF_IMPORT_AUTO_FPS;
 			else if (strchr(argv[i+1], '-')) {
 				u32 ticks, dts_inc;
@@ -2287,25 +2605,38 @@
 				import_fps = ticks;
 				import_fps /= dts_inc;
 			} else import_fps = atof(argv[i+1]);
-			i++; 
+			i++;
+		}
+		else if (!stricmp(arg, "-agg")) {
+			CHECK_NEXT_ARG agg_samples = atoi(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")) { CHECK_NEXT_ARG mediaSource = argv[i+1]; i++; }
-		else if (!stricmp(arg, "-mp4")) { encode = 1; open_edit = 1; }
-		else if (!stricmp(arg, "-saf")) { do_saf = 1; }
-		else if (!stricmp(arg, "-log")) { do_log = 1; }
+		else if (!stricmp(arg, "-ms")) {
+			CHECK_NEXT_ARG mediaSource = argv[i+1];
+			i++;
+		}
+		else if (!stricmp(arg, "-mp4")) {
+			encode = 1;
+			open_edit = 1;
+		}
+		else if (!stricmp(arg, "-saf")) {
+			do_saf = 1;
+		}
+		else if (!stricmp(arg, "-log")) {
+			do_log = 1;
+		}
 #ifndef GPAC_DISABLE_MPD
-		else if (!stricmp(arg, "-mpd")) { 
-			do_mpd = 1; 
-			CHECK_NEXT_ARG 
-			outName = argv[i+1]; 
-			i++; 
+		else if (!stricmp(arg, "-mpd")) {
+			do_mpd = 1;
+			CHECK_NEXT_ARG
+			outName = argv[i+1];
+			i++;
 		}
 #endif
-		
+
 #ifndef GPAC_DISABLE_SCENE_ENCODER
 		else if (!stricmp(arg, "-def")) opts.flags |= GF_SM_ENCODE_USE_NAMES;
 		else if (!stricmp(arg, "-sync")) {
@@ -2324,7 +2655,7 @@
 			opts.flags &= ~(GF_SM_ENCODE_RAP_INBAND | GF_SM_ENCODE_RAP_SHADOW);
 			opts.rap_freq = atoi(argv[i+1]);
 			i++;
-		} 
+		}
 		/*LASeR options*/
 		else if (!stricmp(arg, "-resolution")) {
 			CHECK_NEXT_ARG
@@ -2356,7 +2687,10 @@
 			i++;
 		}
 		/*chunk encoding*/
-		else if (!stricmp(arg, "-ctx-out") || !stricmp(arg, "-outctx")) { CHECK_NEXT_ARG output_ctx = argv[i+1]; i++; }
+		else if (!stricmp(arg, "-ctx-out") || !stricmp(arg, "-outctx")) {
+			CHECK_NEXT_ARG output_ctx = argv[i+1];
+			i++;
+		}
 		else if (!stricmp(arg, "-ctx-in") || !stricmp(arg, "-inctx")) {
 			CHECK_NEXT_ARG
 			chunk_mode = 1;
@@ -2388,7 +2722,7 @@
 
 			strncpy(szTK, argv[i+1], 19);
 			ext = strchr(szTK, '=');
-			tracks[nb_track_act].act_type = 3;
+			tracks[nb_track_act].act_type = TRAC_ACTION_SET_KMS_URI;
 			tracks[nb_track_act].trackID = 0;
 			if (!strnicmp(argv[i+1], "all=", 4)) {
 				tracks[nb_track_act].kms = argv[i+1] + 4;
@@ -2404,97 +2738,103 @@
 			nb_track_act++;
 			i++;
 		}
-		else if (!stricmp(arg, "-split")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-split")) {
+			CHECK_NEXT_ARG
 			split_duration = atof(argv[i+1]);
 			if (split_duration<0) split_duration=0;;
 			i++;
 			split_size = 0;
 		}
-		else if (!stricmp(arg, "-split-rap") || !stricmp(arg, "-splitr")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-split-rap") || !stricmp(arg, "-splitr")) {
+			CHECK_NEXT_ARG
 			split_duration = -1;
 			split_size = -1;
 		}
-		else if (!stricmp(arg, "-split-size") || !stricmp(arg, "-splits")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-split-size") || !stricmp(arg, "-splits")) {
+			CHECK_NEXT_ARG
 			split_size = (u32) atoi(argv[i+1]);
-			i++; 
+			i++;
 			split_duration = 0;
 		}
-		else if (!stricmp(arg, "-split-chunk") || !stricmp(arg, "-splitx") || !stricmp(arg, "-splitz")) { 
-			CHECK_NEXT_ARG 
+		else if (!stricmp(arg, "-split-chunk") || !stricmp(arg, "-splitx") || !stricmp(arg, "-splitz")) {
+			CHECK_NEXT_ARG
 			if (!strstr(argv[i+1], ":")) {
 				fprintf(stderr, "Chunk extraction usage: \"-splitx start:end\" expressed in seconds\n");
 				MP4BOX_EXIT_WITH_CODE(1);
 			}
 			if (strstr(argv[i+1], "end")) {
 				sscanf(argv[i+1], "%lf:end", &split_start);
-				split_duration = -2; 
+				split_duration = -2;
 			} else {
 				sscanf(argv[i+1], "%lf:%lf", &split_start, &split_duration);
-				split_duration -= split_start; 
+				split_duration -= split_start;
 			}
 			split_size = 0;
 			if (!stricmp(arg, "-splitz")) adjust_split_end = 1;
 			i++;
 		}
 		/*meta*/
-		else if (!stricmp(arg, "-set-meta")) { 
+		else if (!stricmp(arg, "-set-meta")) {
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], 0, argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_TYPE, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
-		else if (!stricmp(arg, "-add-item")) { 
+		else if (!stricmp(arg, "-add-item")) {
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], 1, argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_ADD_ITEM, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
-		else if (!stricmp(arg, "-rem-item")) { 
+		else if (!stricmp(arg, "-rem-item")) {
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], 2, argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_REM_ITEM, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
-		else if (!stricmp(arg, "-set-primary")) { 
+		else if (!stricmp(arg, "-set-primary")) {
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], 3, argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_PRIMARY_ITEM, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
-		else if (!stricmp(arg, "-set-xml")) { 
+		else if (!stricmp(arg, "-set-xml")) {
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], 4, argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_XML, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
-		else if (!stricmp(arg, "-rem-xml")) { 
+		else if (!stricmp(arg, "-rem-xml")) {
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			if (parse_meta_args(&metas[nb_meta_act], 6, argv[i+1])) i++;
+			if (parse_meta_args(&metas[nb_meta_act], META_ACTION_REM_XML, argv[i+1])) i++;
 			nb_meta_act++;
 			open_edit = 1;
 		}
-		else if (!stricmp(arg, "-dump-xml")) { 
+		else if (!stricmp(arg, "-dump-xml")) {
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], 7, argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_DUMP_XML, argv[i+1]);
 			nb_meta_act++;
 			i++;
 		}
-		else if (!stricmp(arg, "-dump-item")) { 
+		else if (!stricmp(arg, "-dump-item")) {
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], 8, argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_DUMP_ITEM, argv[i+1]);
 			nb_meta_act++;
 			i++;
 		}
-		else if (!stricmp(arg, "-group-add") || !stricmp(arg, "-group-rem-track") || !stricmp(arg, "-group-rem")) { 
-			tsel_acts[nb_tsel_acts].act_type = !stricmp(arg, "-group-rem") ? 2 : ( !stricmp(arg, "-group-rem-track") ? 1 : 0 );
+		else if (!stricmp(arg, "-group-add") || !stricmp(arg, "-group-rem-track") || !stricmp(arg, "-group-rem")) {
+			if (!stricmp(arg, "-group-rem")) {
+				tsel_acts[nb_tsel_acts].act_type = TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP;
+			} else if ( !stricmp(arg, "-group-rem-track")) {
+				tsel_acts[nb_tsel_acts].act_type = TSEL_ACTION_REMOVE_TSEL;
+			} else {
+				tsel_acts[nb_tsel_acts].act_type = TSEL_ACTION_SET_PARAM;
+			}
 			if (parse_tsel_args(&tsel_acts, argv[i+1], &nb_tsel_acts)==0) {
 				fprintf(stderr, "Invalid group syntax - check usage\n");
 				MP4BOX_EXIT_WITH_CODE(1);
@@ -2502,37 +2842,37 @@
 			open_edit=1;
 			i++;
 		}
-		else if (!stricmp(arg, "-group-clean")) { 
-			tsel_acts[nb_tsel_acts].act_type = 3;
+		else if (!stricmp(arg, "-group-clean")) {
+			tsel_acts[nb_tsel_acts].act_type = TSEL_ACTION_REMOVE_ALL_TSEL_IN_FILE;
 			nb_tsel_acts++;
 			open_edit=1;
 		}
- 		else if (!stricmp(arg, "-group-single")) {
- 		    single_group = 1;
- 		}
+		else if (!stricmp(arg, "-group-single")) {
+			single_group = 1;
+		}
 		else if (!stricmp(arg, "-package")) {
-			CHECK_NEXT_ARG 
+			CHECK_NEXT_ARG
 			pack_file  = argv[i+1];
 			i++;
 		}
 		else if (!stricmp(arg, "-mgt")) {
-			CHECK_NEXT_ARG 
+			CHECK_NEXT_ARG
 			pack_file  = argv[i+1];
 			pack_wgt = 1;
 			i++;
 		}
-		
-		else if (!stricmp(arg, "-brand")) { 
+
+		else if (!stricmp(arg, "-brand")) {
 			char *b = argv[i+1];
-			CHECK_NEXT_ARG 
+			CHECK_NEXT_ARG
 			major_brand = GF_4CC(b[0], b[1], b[2], b[3]);
 			open_edit = 1;
 			if (b[4]==':') minor_version = atoi(b+5);
 			i++;
 		}
-		else if (!stricmp(arg, "-ab")) { 
+		else if (!stricmp(arg, "-ab")) {
 			char *b = argv[i+1];
-			CHECK_NEXT_ARG 
+			CHECK_NEXT_ARG
 			brand_add = gf_realloc(brand_add, sizeof(u32) * (nb_alt_brand_add+1));
 
 			brand_add[nb_alt_brand_add] = GF_4CC(b[0], b[1], b[2], b[3]);
@@ -2540,9 +2880,9 @@
 			open_edit = 1;
 			i++;
 		}
-		else if (!stricmp(arg, "-rb")) { 
+		else if (!stricmp(arg, "-rb")) {
 			char *b = argv[i+1];
-			CHECK_NEXT_ARG 
+			CHECK_NEXT_ARG
 			brand_rem = gf_realloc(brand_rem, sizeof(u32) * (nb_alt_brand_rem+1));
 
 			brand_rem[nb_alt_brand_rem] = GF_4CC(b[0], b[1], b[2], b[3]);
@@ -2551,7 +2891,7 @@
 			i++;
 		}
 #endif
-		else if (!stricmp(arg, "-languages")) { 
+		else if (!stricmp(arg, "-languages")) {
 			PrintLanguages();
 			MP4BOX_EXIT_WITH_CODE(0);
 		}
@@ -2605,7 +2945,7 @@
 		}
 	}
 
-	if (!inName && dump_std) 
+	if (!inName && dump_std)
 		inName = "std";
 
 	if (!inName) {
@@ -2620,20 +2960,20 @@
 
 	if (!interleaving_time) {
 		/*by default use single fragment per dash segment*/
-		if (dash_duration) 
+		if (dash_duration)
 			interleaving_time = dash_duration;
 		else
 			interleaving_time = 0.5;
 	}
 
-	if (dump_std) 
+	if (dump_std)
 		outName = "std";
 
 	if (dump_std==2) {
 #ifdef WIN32
-		if ( _setmode(_fileno(stdout), _O_BINARY) == -1 ) 
+		if ( _setmode(_fileno(stdout), _O_BINARY) == -1 )
 #else
-		if ( freopen(NULL, "wb", stdout) == NULL) 
+		if ( freopen(NULL, "wb", stdout) == NULL)
 #endif
 		{
 			fprintf(stderr, "Fatal error: cannot reopen stdout in binary mode.\n");
@@ -2678,16 +3018,11 @@
 		fclose(fout);
 		MP4BOX_EXIT_WITH_CODE(0);
 	}
-#if !defined(GPAC_DISABLE_STREAMING) 
+#if !defined(GPAC_DISABLE_STREAMING)
 	if (grab_m2ts) {
-		return grab_live_m2ts(grab_m2ts, inName);
+		return grab_live_m2ts(grab_m2ts, grab_ifce, inName);
 	}
 #endif
-	/*init libgpac*/
-	if (enable_mem_tracker) {
-		gf_sys_close();
-		gf_sys_init(enable_mem_tracker);
-	}
 
 	if (gf_logs) {
 		//gf_log_set_tools_levels(gf_logs);
@@ -2718,7 +3053,7 @@
 		MP4BOX_EXIT_WITH_CODE(1);
 	}
 #endif
-    
+
 #ifndef GPAC_DISABLE_MPD
 	if (do_mpd) {
 		Bool remote = 0;
@@ -2735,12 +3070,12 @@
 			remote = 1;
 #else
 			fprintf(stderr, "HTTP Downloader disabled in this build\n");
-            MP4BOX_EXIT_WITH_CODE(1);
+			MP4BOX_EXIT_WITH_CODE(1);
 #endif
 		}
-        e = gf_m3u8_to_mpd(inName, mpd_base_url, (outName ? outName : inName), 0, "video/mp2t", 1, use_url_template, NULL);
+		e = gf_m3u8_to_mpd(inName, mpd_base_url, (outName ? outName : inName), 0, "video/mp2t", 1, use_url_template, NULL);
 		gf_free(mpd_base_url);
-        
+
 		if (remote) {
 			//gf_delete_file("tmp_main.m3u8");
 		}
@@ -2760,26 +3095,38 @@
 
 	if (do_saf && !encode) {
 		switch (get_file_type_by_ext(inName)) {
-		case 2: case 3: case 4: 
+		case GF_FILE_TYPE_BT_WRL_X3DV:
+		case GF_FILE_TYPE_XMT_X3D:
+		case GF_FILE_TYPE_SVG:
 			encode = 1;
 			break;
+		case GF_FILE_TYPE_NOT_SUPPORTED:
+		case GF_FILE_TYPE_ISO_MEDIA:
+		case GF_FILE_TYPE_SWF:
+		case GF_FILE_TYPE_LSR_SAF:
+			break;
 		}
 	}
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
-	if (dump_mode == 1 + GF_SM_DUMP_SVG) {
+	if (dump_mode == GF_SM_DUMP_SVG) {
 		if (strstr(inName, ".srt") || strstr(inName, ".ttxt")) import_subtitle = 2;
 	}
 #endif
 
 
 	if (import_subtitle && !trackID) {
+		/* We import the subtitle file, 
+		   i.e. we parse it and store the content as samples of a 3GPP Timed Text track in an ISO file,
+		   possibly for later export (e.g. when converting SRT to TTXT, ...) */
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 		GF_MediaImporter import;
+		/* Prepare the importer */
 		file = gf_isom_open("ttxt_convert", GF_ISOM_OPEN_WRITE, NULL);
 		memset(&import, 0, sizeof(GF_MediaImporter));
 		import.dest = file;
 		import.in_name = inName;
+		/* Start the import */
 		e = gf_media_import(&import);
 		if (e) {
 			fprintf(stderr, "Error importing %s: %s\n", inName, gf_error_to_string(e));
@@ -2787,14 +3134,20 @@
 			gf_delete_file("ttxt_convert");
 			MP4BOX_EXIT_WITH_CODE(1);
 		}
-		strcpy(outfile, outName ? outName : inName);
+		/* Prepare the export */
+		strcpy(outfile, inName);
 		if (strchr(outfile, '.')) {
 			while (outfile[strlen(outfile)-1] != '.') outfile[strlen(outfile)-1] = 0;
 			outfile[strlen(outfile)-1] = 0;
 		}
 #ifndef GPAC_DISABLE_ISOM_DUMP
-		dump_timed_text_track(file, gf_isom_get_track_id(file, 1), dump_std ? NULL : outfile, 1, (import_subtitle==2) ? 2 : dump_srt);
+		/* Start the export of the track #1, in the appropriate dump type, indicating it's a conversion */
+		dump_timed_text_track(file, gf_isom_get_track_id(file, 1), 
+							  dump_std ? NULL : outfile, 
+							  GF_TRUE, 
+							  (import_subtitle==2) ? GF_TEXTDUMPTYPE_SVG : (dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT));
 #endif
+		/* Clean the importer */
 		gf_isom_delete(file);
 		gf_delete_file("ttxt_convert");
 		if (e) {
@@ -2952,7 +3305,7 @@
 			open_edit = 0;
 		}
 #endif
-	} 
+	}
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	else if (pack_file) {
@@ -2967,7 +3320,7 @@
 		if (!outName) outName = inName;
 		needSave = 1;
 		open_edit = 1;
-	} 
+	}
 #endif
 
 	if (dash_duration) {
@@ -2989,7 +3342,7 @@
 		if (!dash_ctx_file && dash_live) {
 			dash_ctx = gf_cfg_new(NULL, NULL);
 		} else if (dash_ctx_file) {
-			if (force_new) 
+			if (force_new)
 				gf_delete_file(dash_ctx_file);
 
 			dash_ctx = gf_cfg_force_new(NULL, dash_ctx_file);
@@ -3015,12 +3368,19 @@
 		while (!do_abort) {
 
 			e = gf_dasher_segment_files(szMPD, dash_inputs, nb_dash_inputs, dash_profile, dash_title, dash_source, cprt, dash_more_info,
-										(const char **) mpd_base_urls, nb_mpd_base_urls, 
-									   use_url_template, segment_timeline, single_segment, single_file, bitstream_switching_mode,
-									   seg_at_rap, dash_duration, seg_name, seg_ext, segment_marker,
-									   interleaving_time, subsegs_per_sidx, daisy_chain_sidx, frag_at_rap, tmpdir,
-									   dash_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_subduration, min_buffer, 
-									   ast_shift_sec, dash_scale, memory_frags, initial_moof_sn, initial_tfdt, no_fragments_defaults, pssh_in_moof, samplegroups_in_traf);
+			                            (const char **) mpd_base_urls, nb_mpd_base_urls,
+			                            use_url_template, segment_timeline, single_segment, single_file, bitstream_switching_mode,
+			                            seg_at_rap, dash_duration, seg_name, seg_ext, segment_marker,
+			                            interleaving_time, subsegs_per_sidx, daisy_chain_sidx, frag_at_rap, tmpdir,
+			                            dash_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_subduration, min_buffer,
+			                            ast_shift_sec, dash_scale, memory_frags, initial_moof_sn, initial_tfdt, no_fragments_defaults, pssh_in_moof, samplegroups_in_traf, single_traf_per_moof);
+
+			//this happens when reading file while writing them (local playback of the live session ...)
+			if (dash_live && (e==GF_IO_ERR) ) {
+				fprintf(stderr, "Error dashing file (%s) but continuing ...\n", gf_error_to_string(e) );
+				e = GF_OK;
+			}
+
 			if (e) break;
 
 			if (dash_live) {
@@ -3028,15 +3388,21 @@
 				fprintf(stderr, "sleep for %d ms\n", sleep_for);
 				while (1) {
 					if (gf_prompt_has_input()) {
-						char c = (char) gf_prompt_get_char(); 
-						if (c=='q') { do_abort = 1; break; }
-						if (c=='s') { do_abort = 2; break; }
+						char c = (char) gf_prompt_get_char();
+						if (c=='q') {
+							do_abort = 1;
+							break;
+						}
+						if (c=='s') {
+							do_abort = 2;
+							break;
+						}
 					}
 
 					if (dash_dynamic == 2) {
 						break;
 					}
-					if (sleep_for<100) 
+					if (sleep_for<100)
 						break;
 					gf_sleep(100);
 
@@ -3046,7 +3412,7 @@
 				break;
 			}
 		}
-		
+
 		if (dash_ctx) {
 			if (do_abort==2) {
 				char szName[1024];
@@ -3060,17 +3426,17 @@
 		}
 		if (e) fprintf(stderr, "Error DASHing file: %s\n", gf_error_to_string(e));
 		if (file) gf_isom_delete(file);
-		if (del_file) 
+		if (del_file)
 			gf_delete_file(inName);
-	
+
 		MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
 	}
 
 	else if (!file
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
-		&& !(track_dump_type & GF_EXPORT_AVI_NATIVE)
+	         && !(track_dump_type & GF_EXPORT_AVI_NATIVE)
 #endif
-		) {
+	        ) {
 		FILE *st = gf_f64_open(inName, "rb");
 		Bool file_exists = 0;
 		if (st) {
@@ -3109,17 +3475,17 @@
 		/*used for .saf / .lsr dump*/
 		case 6:
 #ifndef GPAC_DISABLE_SCENE_DUMP
-			if ((dump_mode==1+GF_SM_DUMP_LASER) || (dump_mode==1+GF_SM_DUMP_SVG)) {
+			if ((dump_mode==GF_SM_DUMP_LASER) || (dump_mode==GF_SM_DUMP_SVG)) {
 				break;
 			}
 #endif
 
 		default:
 			if (!open_edit && file_exists && !gf_isom_probe_file(inName) && track_dump_type) {
-			} 
+			}
 #ifndef GPAC_DISABLE_ISOM_WRITE
-			else if (!open_edit && file_exists /* && !gf_isom_probe_file(inName) */ && !dump_mode) {
-		/*************************************************************************************************/
+			else if (!open_edit && file_exists /* && !gf_isom_probe_file(inName) */ && dump_mode == GF_SM_DUMP_NONE) {
+				/*************************************************************************************************/
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 				if(dvbhdemux)
 				{
@@ -3148,6 +3514,8 @@
 					dump_mpeg2_ts(inName, pes_dump, program_number);
 #endif
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
+				} else if (do_hash) {
+					hash_file(inName, dump_std);
 				} else {
 					convert_file_info(inName, info_track_id);
 #endif
@@ -3177,13 +3545,13 @@
 		char *szExt = strrchr(outfile, '.');
 
 		/*turn on 3GP saving*/
-		if (!stricmp(szExt, ".3gp") || !stricmp(szExt, ".3gpp") || !stricmp(szExt, ".3g2")) 
+		if (!stricmp(szExt, ".3gp") || !stricmp(szExt, ".3gpp") || !stricmp(szExt, ".3g2"))
 			conv_type = GF_ISOM_CONV_TYPE_3GPP;
 		else if (!stricmp(szExt, ".m4a") || !stricmp(szExt, ".m4v"))
 			conv_type = GF_ISOM_CONV_TYPE_IPOD;
 		else if (!stricmp(szExt, ".psp"))
 			conv_type = GF_ISOM_CONV_TYPE_PSP;
-		
+
 		while (outfile[strlen(outfile)-1] != '.') outfile[strlen(outfile)-1] = 0;
 		outfile[strlen(outfile)-1] = 0;
 	}
@@ -3217,7 +3585,7 @@
 		char szFile[1024];
 		for (i=0; i<nb_track_act; i++) {
 			TrackAction *tka = &tracks[i];
-			if (tka->act_type != 9) continue;
+			if (tka->act_type != TRAC_ACTION_RAW_EXTRACT) continue;
 			memset(&mdump, 0, sizeof(mdump));
 			mdump.in_name = inName;
 			mdump.flags = tka->dump_type;
@@ -3236,13 +3604,13 @@
 			if (e) goto err_exit;
 		}
 		MP4BOX_EXIT_WITH_CODE(0);
-	} 
+	}
 
 #endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
-	if (dump_mode) {
-		e = dump_file_text(inName, dump_std ? NULL : outfile, dump_mode-1, do_log);
+	if (dump_mode != GF_SM_DUMP_NONE) {
+		e = dump_file_text(inName, dump_std ? NULL : outfile, dump_mode, do_log);
 		if (e) goto err_exit;
 	}
 #endif
@@ -3273,14 +3641,10 @@
 
 	if (dump_timestamps) dump_file_timestamps(file, dump_std ? NULL : outfile);
 	if (dump_nal) dump_file_nal(file, dump_nal, dump_std ? NULL : outfile);
-	
+
 	if (do_hash) {
-		u8 hash[20];
-		e = gf_media_get_file_hash(inName, hash);
+		e = hash_file(inName, dump_std);
 		if (e) goto err_exit;
-		fprintf(stderr, "File %s hash (SHA-1): ", inName);
-		for (i=0; i<20; i++) fprintf(stderr, "%02X", hash[i]);
-		fprintf(stderr, "\n");
 	}
 	if (dump_cart) dump_cover_art(file, outfile);
 	if (dump_chap) dump_chapters(file, outfile, (dump_chap==2) ? 1 : 0);
@@ -3310,7 +3674,7 @@
 				}
 				fclose(iodf);
 			}
-                        gf_free(bs);
+			gf_free(bs);
 		}
 	}
 
@@ -3329,7 +3693,7 @@
 		GF_MediaExporter mdump;
 		for (i=0; i<nb_track_act; i++) {
 			TrackAction *tka = &tracks[i];
-			if (tka->act_type != 9) continue;
+			if (tka->act_type != TRAC_ACTION_RAW_EXTRACT) continue;
 			memset(&mdump, 0, sizeof(mdump));
 			mdump.file = file;
 			mdump.flags = tka->dump_type;
@@ -3378,36 +3742,36 @@
 
 		switch (meta->act_type) {
 #ifndef GPAC_DISABLE_ISOM_WRITE
-		case 0:
+		case META_ACTION_SET_TYPE:
 			/*note: we don't handle file brand modification, this is an author stuff and cannot be guessed from meta type*/
 			e = gf_isom_set_meta_type(file, meta->root_meta, tk, meta->meta_4cc);
 			gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_ISO2, 1);
 			needSave = 1;
 			break;
-		case 1:
+		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->item_id,
-					strlen(meta->mime_type) ? meta->mime_type : NULL,  
-					strlen(meta->enc_type) ? meta->enc_type : NULL,  
-					meta->use_dref ? meta->szPath : NULL,  NULL);
+			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->item_id,
+			                          strlen(meta->mime_type) ? meta->mime_type : NULL,
+			                          strlen(meta->enc_type) ? meta->enc_type : NULL,
+			                          meta->use_dref ? meta->szPath : NULL,  NULL);
 			needSave = 1;
 			break;
-		case 2:
+		case META_ACTION_REM_ITEM:
 			e = gf_isom_remove_meta_item(file, meta->root_meta, tk, meta->item_id);
 			needSave = 1;
 			break;
-		case 3:
+		case META_ACTION_SET_PRIMARY_ITEM:
 			e = gf_isom_set_meta_primary_item(file, meta->root_meta, tk, meta->item_id);
 			needSave = 1;
 			break;
-		case 4:
-		case 5:
-			e = gf_isom_set_meta_xml(file, meta->root_meta, tk, meta->szPath, (meta->act_type==5) ? 1 : 0);
+		case META_ACTION_SET_XML:
+		case META_ACTION_SET_BINARY_XML:
+			e = gf_isom_set_meta_xml(file, meta->root_meta, tk, meta->szPath, (meta->act_type==META_ACTION_SET_BINARY_XML) ? 1 : 0);
 			needSave = 1;
 			break;
-		case 6:
+		case META_ACTION_REM_XML:
 			if (gf_isom_get_meta_item_count(file, meta->root_meta, tk)) {
 				e = gf_isom_remove_meta_xml(file, meta->root_meta, tk);
 				needSave = 1;
@@ -3415,7 +3779,7 @@
 				fprintf(stderr, "No meta box in input file\n");
 			}
 			break;
-		case 8:
+		case META_ACTION_DUMP_XML:
 			if (gf_isom_get_meta_item_count(file, meta->root_meta, tk)) {
 				e = gf_isom_extract_meta_item(file, meta->root_meta, tk, meta->item_id, strlen(meta->szPath) ? meta->szPath : NULL);
 			} else {
@@ -3423,13 +3787,15 @@
 			}
 			break;
 #endif
-		case 7:
+		case META_ACTION_DUMP_ITEM:
 			if (gf_isom_has_meta_xml(file, meta->root_meta, tk)) {
 				e = gf_isom_extract_meta_xml(file, meta->root_meta, tk, meta->szPath, NULL);
 			} else {
 				fprintf(stderr, "No meta box in input file\n");
 			}
 			break;
+		default: 
+			break;
 		}
 		if (e) goto err_exit;
 	}
@@ -3441,31 +3807,33 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	for (i=0; i<nb_tsel_acts; i++) {
 		switch (tsel_acts[i].act_type) {
-		case 0:
-			e = gf_isom_set_track_switch_parameter(file, 
-				gf_isom_get_track_by_id(file, tsel_acts[i].trackID),
-				tsel_acts[i].refTrackID ? gf_isom_get_track_by_id(file, tsel_acts[i].refTrackID) : 0,
-				tsel_acts[i].is_switchGroup ? 1 : 0,
-				&tsel_acts[i].switchGroupID,
-				tsel_acts[i].criteria, tsel_acts[i].nb_criteria);
+		case TSEL_ACTION_SET_PARAM:
+			e = gf_isom_set_track_switch_parameter(file,
+			                                       gf_isom_get_track_by_id(file, tsel_acts[i].trackID),
+			                                       tsel_acts[i].refTrackID ? gf_isom_get_track_by_id(file, tsel_acts[i].refTrackID) : 0,
+			                                       tsel_acts[i].is_switchGroup ? 1 : 0,
+			                                       &tsel_acts[i].switchGroupID,
+			                                       tsel_acts[i].criteria, tsel_acts[i].nb_criteria);
 			if (e) goto err_exit;
 			needSave = 1;
 			break;
-		case 1:
+		case TSEL_ACTION_REMOVE_TSEL:
 			e = gf_isom_reset_track_switch_parameter(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), 0);
 			if (e) goto err_exit;
 			needSave = 1;
 			break;
-		case 2:
+		case TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP:
 			e = gf_isom_reset_track_switch_parameter(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), 1);
 			if (e) goto err_exit;
 			needSave = 1;
 			break;
-		case 3:
+		case TSEL_ACTION_REMOVE_ALL_TSEL_IN_FILE:
 			e = gf_isom_reset_switch_parameters(file);
 			if (e) goto err_exit;
 			needSave = 1;
 			break;
+		default:
+			break;
 		}
 	}
 
@@ -3592,7 +3960,7 @@
 						/*this is a subtitle track*/
 						if (!is_chap)
 							gf_isom_set_media_type(file, i+1, GF_ISOM_MEDIA_SUBT);
-					} 
+					}
 					break;
 				}
 			}
@@ -3627,7 +3995,7 @@
 		u32 track = tka->trackID ? gf_isom_get_track_by_id(file, tka->trackID) : 0;
 		u32 timescale = gf_isom_get_timescale(file);
 		switch (tka->act_type) {
-		case 0:
+		case TRAC_ACTION_REM_TRACK:
 			e = gf_isom_remove_track(file, track);
 			if (e) {
 				fprintf(stderr, "Error Removing track ID %d: %s\n", tka->trackID, gf_error_to_string(e));
@@ -3636,16 +4004,34 @@
 			}
 			needSave = 1;
 			break;
-		case 1:
+		case TRAC_ACTION_SET_LANGUAGE:
 			for (i=0; i<gf_isom_get_track_count(file); i++) {
 				if (track && (track != i+1)) continue;
-				e = gf_isom_set_media_language(file, i+1, (char *) GetLanguageCode(tka->lang));
+				e = gf_isom_set_media_language(file, i+1, tka->lang);
 				if (e) goto err_exit;
 				needSave = 1;
 			}
 			needSave = 1;
 			break;
-		case 2:
+		case TRAC_ACTION_SET_KIND:
+			for (i=0; i<gf_isom_get_track_count(file); i++) {
+				if (track && (track != i+1)) continue;
+				e = gf_isom_add_track_kind(file, i+1, tka->kind_scheme, tka->kind_value);
+				if (e) goto err_exit;
+				needSave = 1;
+			}
+			needSave = 1;
+			break;
+		case TRAC_ACTION_REM_KIND:
+			for (i=0; i<gf_isom_get_track_count(file); i++) {
+				if (track && (track != i+1)) continue;
+				e = gf_isom_remove_track_kind(file, i+1, tka->kind_scheme, tka->kind_value);
+				if (e) goto err_exit;
+				needSave = 1;
+			}
+			needSave = 1;
+			break;
+		case TRAC_ACTION_SET_DELAY:
 			if (tka->delay_ms) {
 				u64 tk_dur;
 
@@ -3672,7 +4058,7 @@
 				needSave = 1;
 			}
 			break;
-		case 3:
+		case TRAC_ACTION_SET_KMS_URI:
 			for (i=0; i<gf_isom_get_track_count(file); i++) {
 				if (track && (track != i+1)) continue;
 				if (!gf_isom_is_media_encrypted(file, i+1, 1)) continue;
@@ -3682,30 +4068,37 @@
 				needSave = 1;
 			}
 			break;
-		case 4:
+		case TRAC_ACTION_SET_PAR:
 			e = gf_media_change_par(file, track, tka->par_num, tka->par_den);
 			needSave = 1;
 			break;
-		case 5:
+		case TRAC_ACTION_SET_HANDLER_NAME:
 			e = gf_isom_set_handler_name(file, track, tka->hdl_name);
 			needSave = 1;
 			break;
-		case 6:
+		case TRAC_ACTION_ENABLE:
 			if (!gf_isom_is_track_enabled(file, track)) {
 				e = gf_isom_set_track_enabled(file, track, 1);
 				needSave = 1;
 			}
 			break;
-		case 7:
+		case TRAC_ACTION_DISABLE:
 			if (gf_isom_is_track_enabled(file, track)) {
 				e = gf_isom_set_track_enabled(file, track, 0);
 				needSave = 1;
 			}
 			break;
-		case 8:
+		case TRAC_ACTION_REFERENCE:
 			e = gf_isom_set_track_reference(file, track, GF_4CC(tka->lang[0], tka->lang[1], tka->lang[2], tka->lang[3]), (u32) tka->delay_ms);
 			needSave = 1;
 			break;
+		case TRAC_ACTION_REM_NON_RAP:
+			fprintf(stderr, "Removing non-rap samples from track %d\n", tka->trackID);
+			e = gf_media_remove_non_rap(file, track);
+			needSave = 1;
+			break;
+		default:
+			break;
 		}
 		if (e) goto err_exit;
 	}
@@ -3719,7 +4112,7 @@
 			u32 tlen, itag = 0;
 			if (sep) {
 				while (sep) {
-					for (itag=0; itag<nb_itunes_tags;itag++) {
+					for (itag=0; itag<nb_itunes_tags; itag++) {
 						if (!strnicmp(sep+1, itags[itag].name, strlen(itags[itag].name))) break;
 					}
 					if (itag<nb_itunes_tags) {
@@ -3728,8 +4121,8 @@
 					sep = strchr(sep+1, ':');
 				}
 				if (sep) sep[0] = 0;
-			} 
-			for (itag=0; itag<nb_itunes_tags;itag++) {
+			}
+			for (itag=0; itag<nb_itunes_tags; itag++) {
 				if (!strnicmp(tags, itags[itag].name, strlen(itags[itag].name))) {
 					break;
 				}
@@ -3764,13 +4157,13 @@
 				d = gf_malloc(sizeof(char) * tlen);
 				tlen = (u32) fread(d, sizeof(char), tlen, t);
 				fclose(t);
-				
+
 				ext = strrchr(val, '.');
 				if (!stricmp(ext, ".png")) tlen |= 0x80000000;
 				e = gf_isom_apple_set_tag(file, GF_ISOM_ITUNE_COVER_ART, d, tlen);
 				gf_free(d);
 			}
-				break;
+			break;
 			case GF_ISOM_ITUNE_TEMPO:
 				gf_isom_apple_set_tag(file, itag, NULL, atoi(val) );
 				break;
@@ -3780,10 +4173,11 @@
 				if (_v) {
 					gf_isom_apple_set_tag(file, itag, NULL, _v);
 				} else {
+					if (!val) val="";
 					gf_isom_apple_set_tag(file, itag, val, (u32) strlen(val) );
 				}
 			}
-				break;
+			break;
 			case GF_ISOM_ITUNE_DISK:
 			case GF_ISOM_ITUNE_TRACKNUMBER:
 			{
@@ -3792,21 +4186,29 @@
 				n = t = 0;
 				memset(_t, 0, sizeof(char)*8);
 				tlen = (itag==GF_ISOM_ITUNE_DISK) ? 6 : 8;
-				if (sscanf(val, "%u/%u", &n, &t) == 2) { _t[3]=n; _t[2]=n>>8; _t[5]=t; _t[4]=t>>8; }
-				else if (sscanf(val, "%u", &n) == 1) { _t[3]=n; _t[2]=n>>8;}
+				if (sscanf(val, "%u/%u", &n, &t) == 2) {
+					_t[3]=n;
+					_t[2]=n>>8;
+					_t[5]=t;
+					_t[4]=t>>8;
+				}
+				else if (sscanf(val, "%u", &n) == 1) {
+					_t[3]=n;
+					_t[2]=n>>8;
+				}
 				else tlen = 0;
 				if (tlen) gf_isom_apple_set_tag(file, itag, _t, tlen);
 			}
-				break;
+			break;
 			case GF_ISOM_ITUNE_GAPLESS:
 			case GF_ISOM_ITUNE_COMPILATION:
 			{
 				char _t[1];
-				if (!stricmp(val, "yes")) _t[0] = 1;
+				if (val && !stricmp(val, "yes")) _t[0] = 1;
 				else  _t[0] = 0;
 				gf_isom_apple_set_tag(file, itag, _t, 1);
 			}
-				break;
+			break;
 			default:
 				gf_isom_apple_set_tag(file, itag, val, tlen);
 				break;
@@ -3850,7 +4252,7 @@
 	if (HintIt) {
 		if (force_ocr) SetupClockReferences(file);
 		fprintf(stderr, "Hinting file with Path-MTU %d Bytes\n", MTUSize);
-		MTUSize -= 12;		
+		MTUSize -= 12;
 		e = HintFile(file, MTUSize, max_ptime, rtp_rate, hint_flags, HintCopy, HintInter, regular_iod, single_group);
 		if (e) goto err_exit;
 		needSave = 1;
@@ -3968,7 +4370,7 @@
 #endif
 err_exit:
 	/*close libgpac*/
-	if (file) gf_isom_delete(file);		
+	if (file) gf_isom_delete(file);
 	fprintf(stderr, "\n\tError: %s\n", gf_error_to_string(e));
 	MP4BOX_EXIT_WITH_CODE(1);
 }

gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/wrapper.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp4box/wrapper.c Changed

@@ -24,41 +24,41 @@
                         }\
                         jlong h = env->GetLongField(obj, fid);
                         //CNativeWrapper* wr = (CNativeWrapper*) h;*/
- 
+
 char ** ConvertCommandLine( const char* sCommand, int* iNbArg );
-                        
+
 JNIEXPORT void JNICALL Java_com_enst_mp4box_mp4terminal_run(JNIEnv * env, jobject obj, jstring sCommand)
 {
 	//CAST_HANDLE(wr);
-    jniLOGV("mp4terminal::start");
-    /*if (!wr)
-    {
+	jniLOGV("mp4terminal::start");
+	/*if (!wr)
+	{
 		jniLOGV("mp4terminal::end : aborted");
-        return;
-    }*/
-    jboolean isCopy;
-    const char * sOriginalCommand = (*env)->GetStringUTFChars(env, sCommand, &isCopy);
-    
-    jniLOGV("mp4terminal::command get back ok");
-    jniLOGV(sOriginalCommand);
+	    return;
+	}*/
+	jboolean isCopy;
+	const char * sOriginalCommand = (*env)->GetStringUTFChars(env, sCommand, &isCopy);
+
+	jniLOGV("mp4terminal::command get back ok");
+	jniLOGV(sOriginalCommand);
 
 	int iNbArg = 0;
-	
+
 	int i = 0;
 	char** sConvertedCommandLine;
 	sConvertedCommandLine = ConvertCommandLine( sOriginalCommand, &i );
-	
-    jniLOGV("Convert command line done");
+
+	jniLOGV("Convert command line done");
 	FILE* ferr = freopen( "/mnt/sdcard/stderrout.txt", "w", stderr );
 
 	FILE* fout = freopen( "/mnt/sdcard/stdout.txt", "w", stdout );
 
-    mp4boxMain(i, sConvertedCommandLine);
+	mp4boxMain(i, sConvertedCommandLine);
 
-    (*env)->ReleaseStringUTFChars(env, sCommand, sOriginalCommand);
-    jniLOGV("mp4terminal::end");
-    fclose(ferr);
-    fclose(fout);
+	(*env)->ReleaseStringUTFChars(env, sCommand, sOriginalCommand);
+	jniLOGV("mp4terminal::end");
+	fclose(ferr);
+	fclose(fout);
 }
 
 char ** ConvertCommandLine( const char* sCommand, int* iNbArg )
@@ -83,7 +83,7 @@
 	pReturn[0] = (char*)malloc(sizeof( char) * ( 7 ));
 	strcpy( pReturn[0], "MP4Box" );//just a place holder , will never be read.
 	pReturn[0][6] = '\0';
-	
+
 	for ( l = 0; l <= iLength ; l++ )
 	{
 		if( sCommand[l] ==  ' ' ||  l == ( iLength ) )

gpac-0.5.0.svn5178.tar.bz2/applications/mp4client/Makefile -> gpac-0.5.1.svn5491.tar.xz/applications/mp4client/Makefile Changed

gpac-0.5.1.svn5491.tar.xz/applications/mp4client/carbon_events.c Added

@@ -0,0 +1,107 @@
+/*
+ *			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.
+ *
+ */
+
+#if defined(__DARWIN__) || defined(__APPLE__)
+#include <Carbon/Carbon.h>
+#endif
+
+
+void gf_sys_set_args(int argc, const char **argv);
+void send_open_url(const char *url);
+
+void RunApplicationEventLoop(void);
+void QuitApplicationEventLoop(void);
+
+char *my_argv[2];
+
+static int main_evt_loop_run = 1;
+
+static AEEventHandlerUPP	open_app_UPP, open_doc_UPP;
+
+static pascal OSErr ae_open_app (const AppleEvent *ae_event, AppleEvent *ae_reply, long ae_ref_count)
+{
+    if (main_evt_loop_run) {
+        QuitApplicationEventLoop();
+        main_evt_loop_run = 0;
+    }
+    return (noErr);
+}
+
+static pascal OSErr ae_open_doc (const AppleEvent *ae_event, AppleEvent *ae_reply, long ae_ref_count)
+{
+    OSErr err;
+    FSRef	ref;
+    AEDescList	docList;
+    long	count;
+
+    err = AEGetParamDesc(ae_event, keyDirectObject, typeAEList, &docList);
+    if (err)
+        return (noErr);
+    
+    err = AECountItems(&docList, &count);
+    if (err == noErr) {
+        err = AEGetNthPtr(&docList, 1, typeFSRef, NULL, NULL, &ref, sizeof(FSRef), NULL);
+        if (err == noErr) {
+            char path[4096];
+            FSRefMakePath(&ref, (UInt8 *) path, 4096);
+            if (main_evt_loop_run) {
+                my_argv[1] = strdup(path);
+                gf_sys_set_args(2, (const char **) my_argv);
+            } else {
+                send_open_url(path);
+            }
+        }
+    }
+    err = AEDisposeDesc(&docList);
+
+    if (main_evt_loop_run) {
+        QuitApplicationEventLoop();
+        main_evt_loop_run = 0;
+    }
+    return (noErr);
+}
+
+void carbon_init ()
+{
+    my_argv[0] = "GPAC";
+    my_argv[1] = NULL;
+    open_app_UPP = NewAEEventHandlerUPP(ae_open_app);
+    AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, open_app_UPP, 0L, false);
+    open_doc_UPP = NewAEEventHandlerUPP(ae_open_doc);
+    AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, open_doc_UPP, 0L, false);
+    
+    main_evt_loop_run = 1;
+    RunApplicationEventLoop();
+}
+
+void carbon_uninit()
+{
+    DisposeAEEventHandlerUPP(open_app_UPP);
+    DisposeAEEventHandlerUPP(open_doc_UPP);
+    
+    if (my_argv[1]) free(my_argv[1]);
+}
+
+

gpac-0.5.0.svn5178.tar.bz2/applications/mp4client/extract.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp4client/extract.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -31,16 +31,16 @@
 #ifdef WIN32
 #include <windows.h>
 #else
-typedef struct tagBITMAPFILEHEADER 
+typedef struct tagBITMAPFILEHEADER
 {
-    u16	bfType;
-    u32	bfSize;
-    u16	bfReserved1;
-    u16	bfReserved2;
-    u32 bfOffBits;
+	u16	bfType;
+	u32	bfSize;
+	u16	bfReserved1;
+	u16	bfReserved2;
+	u32 bfOffBits;
 } BITMAPFILEHEADER;
 
-typedef struct tagBITMAPINFOHEADER{
+typedef struct tagBITMAPINFOHEADER {
 	u32	biSize;
 	s32	biWidth;
 	s32	biHeight;
@@ -70,8 +70,8 @@
 
 static GFINLINE u8 colmask(s32 a, s32 n)
 {
-    s32 mask = (1 << n) - 1;
-    return (u8) (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
+	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)
@@ -87,7 +87,7 @@
 
 	case GF_PIXEL_BGR_32:
 	case GF_PIXEL_RGBA:
-                //probably due to tinygl bug - verify
+		//probably due to tinygl bug - verify
 #ifndef GPAC_USE_TINYGL
 		fputc(ptr[3], fout);
 		fputc(ptr[2], fout);
@@ -123,12 +123,12 @@
 		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*/ 
+	/* 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); 
+		fputc(ptr[0], fout);
 		/* if printing the characters corresponding to the float depth buffer: */
 		/*
 		{
@@ -180,17 +180,17 @@
 	fi.biSizeImage = fb->pitch_y * 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(&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);
 //#ifndef GPAC_USE_TINYGL
 	for (j=fb->height; j>0; j--) {
 		ptr = fb->video_buffer + (j-1)*fb->pitch_y;
-		for (i=0;i<fb->width; i++) {
+		for (i=0; i<fb->width; i++) {
 			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
 			assert(res);
 			ptr += res;
@@ -200,7 +200,7 @@
 #if 0
 	for (j=0; j<fb->height; j++) {
 		ptr = fb->video_buffer + j*fb->pitch;
-		for (i=0;i<fb->width; i++) {
+		for (i=0; i<fb->width; i++) {
 			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
 			assert(res);
 			ptr += res;
@@ -221,9 +221,9 @@
 	u32 dst_size;
 	char *dst;
 	char *prev = strrchr(rad_name, '.');
-	if (prev) prev[0] = '\0'; 
+	if (prev) prev[0] = '\0';
 	sprintf(str, "%s_%d.png", rad_name, img_num);
-	if (prev) prev[0] = '.'; 
+	if (prev) prev[0] = '.';
 
 	switch (fb->pixel_format) {
 	case GF_PIXEL_ARGB:
@@ -257,15 +257,15 @@
 void write_depthfile(GF_VideoSurface *fb, char *rad_name, u32 img_num)
 {
 	FILE *fout;
- 	u32 i, j;
+	u32 i, j;
 	unsigned char *depth;
 
 	depth = (unsigned char *) fb->video_buffer;
-	
+
 	fout = gf_f64_open("dump_depth", "wb");
 	if (!fout) return;
 	for (j=0; j<fb->height;  j++) {
-		for (i=0;i<fb->width; i++) {
+		for (i=0; i<fb->width; i++) {
 
 #ifdef GPAC_USE_TINYGL
 			fputc(depth[2*i+j*fb->width*sizeof(unsigned short)], fout);
@@ -282,18 +282,18 @@
 {
 
 	FILE *fout;
- 	u32 i, j;
+	u32 i, j;
 	unsigned char *buf;
 
 	buf = (unsigned char *) fb->video_buffer;
-	
+
 	if (dump_mode==6) fout = gf_f64_open("dump_rgbds", "wb");
 	else if (dump_mode==9) fout = gf_f64_open("dump_rgbd", "wb");
 	else return;
-	
+
 	if (!fout) return;
 	for (j=0; j<fb->height;  j++) {
-		for (i=0;i<fb->width*4; i++) {
+		for (i=0; i<fb->width*4; i++) {
 			fputc(buf[i+j*fb->pitch_y], fout);
 		}
 	}
@@ -308,7 +308,7 @@
 	char str[GF_MAX_PATH];
 	FILE *fout;
 	prev = strrchr(rad_name, '.');
-	if (prev) prev[0] = '\0'; 
+	if (prev) prev[0] = '\0';
 	if (img_num<10) {
 		sprintf(str, "%s_00%d.raw", rad_name, img_num);
 	} else if (img_num<100) {
@@ -320,10 +320,10 @@
 	fout = gf_f64_open(str, "wb");
 	if (!fout) return;
 
-	
-	for (j=0;j<fb->height; j++) {
+
+	for (j=0; j<fb->height; j++) {
 		ptr = fb->video_buffer + j*fb->pitch_y;
-		for (i=0;i<fb->width; i++) {
+		for (i=0; i<fb->width; i++) {
 			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
 			assert(res);
 			ptr += res;
@@ -354,8 +354,8 @@
 			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++) {
+
+			for (i=0; i<fb.width; i++) {
 				switch (fb.pixel_format) {
 				case GF_PIXEL_RGB_32:
 				case GF_PIXEL_ARGB:
@@ -364,7 +364,7 @@
 					dst[2] = src[2];
 					src+=4;
 					break;
-			
+
 				case GF_PIXEL_BGR_32:
 				case GF_PIXEL_RGBA:
 					dst[0] = src[3];
@@ -398,7 +398,7 @@
 					dst[0] = colmask(src_16 << 3, 3);
 					src+=2;
 					break;
-					/*for depth .avi*/
+				/*for depth .avi*/
 				case GF_PIXEL_GREYSCALE:
 					dst[0] = src[0];
 					dst[1] = src[0];
@@ -417,7 +417,7 @@
 	case 2:
 		write_bmp(&fb, rad_name, frameNum);
 		break;
-	case 11:
+	case 12:
 		write_png(&fb, rad_name, frameNum);
 		break;
 	case 3:
@@ -428,8 +428,8 @@
 		break;
 	case 7:
 		write_bmp(&fb, rad_name, frameNum);
-		break;	
-		
+		break;
+
 	}
 	/*unlock it*/
 	/*in -depth -avi mode, do not release it yet*/
@@ -464,8 +464,8 @@
 
 			switch (fb.pixel_format) {
 			case GF_PIXEL_RGB_32:
-			case GF_PIXEL_ARGB:
-				for (i=0;i<fb.width; i++) {
+			case GF_PIXEL_RGBA:
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[0];
 					dst[1] = src[1];
 					dst[2] = src[2];
@@ -474,7 +474,7 @@
 				}
 				break;
 			case GF_PIXEL_RGBDS:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
 					dst[1] = src[1];
 					dst[2] = src[0];
@@ -482,9 +482,9 @@
 					dst +=4;
 					src+=4;
 				}
-				break;		
+				break;
 			case GF_PIXEL_RGBD:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
 					dst[1] = src[1];
 					dst[2] = src[0];
@@ -492,10 +492,9 @@
 					dst += 4;
 					src+=4;
 				}
-				break;				
+				break;
 			case GF_PIXEL_BGR_32:
-			case GF_PIXEL_RGBA:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[3];
 					dst[1] = src[2];
 					dst[2] = src[1];
@@ -503,8 +502,17 @@
 					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++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
 					dst[1] = src[1];
 					dst[2] = src[0];
@@ -513,7 +521,7 @@
 				}
 				break;
 			case GF_PIXEL_BGR_24:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
 					dst[1] = src[1];
 					dst[2] = src[0];
@@ -522,7 +530,7 @@
 				}
 				break;
 			case GF_PIXEL_RGB_565:
-				for (i=0;i<fb.width; i++) {
+				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);
@@ -532,7 +540,7 @@
 				}
 				break;
 			case GF_PIXEL_RGB_555:
-				for (i=0;i<fb.width; i++) {
+				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);
@@ -543,18 +551,18 @@
 				break;
 			}
 		}
-		if (dump_type!=5 && dump_type!= 10 && dump_type!= 11) { 
+		if (dump_type!=5 && dump_type!= 10 && dump_type!= 11) {
 			out_size = fb.height*fb.width*3;
 		} else {
 			out_size = fb.height*fb.width*4;
 		}
 #ifndef GPAC_DISABLE_AVILIB
-		if (dump_type!=5 && dump_type!= 10) { 
+		if (dump_type!=5 && dump_type!= 10) {
 			if (AVI_write_frame(avi_out, conv_buf, out_size, 1) <0)
-			fprintf(stderr, "Error writing frame\n");
+				fprintf(stderr, "Error writing frame\n");
 		} else {
 			if (AVI_write_frame(avi_out, conv_buf, out_size, 1) <0)
-			fprintf(stderr, "Error writing frame\n");				
+				fprintf(stderr, "Error writing frame\n");
 		}
 #endif
 		break;
@@ -568,7 +576,7 @@
 	case 9:
 		write_texture_file(&fb, rad_name, frameNum, dump_type);
 		break;
-	
+
 	case 3:
 		write_raw(&fb, rad_name, frameNum);
 		break;
@@ -577,13 +585,14 @@
 	gf_sc_release_screen_buffer(term->compositor, &fb);
 }
 
-Bool dump_file(char *url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times)
+Bool dump_file(char *url, char *out_url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times)
 {
 	GF_Err e;
 	u32 i = 0;
 	GF_VideoSurface fb;
 	char szPath[GF_MAX_PATH];
-	char *prev=NULL;  
+	char szOutPath[GF_MAX_PATH];
+	char *prev=NULL;
 
 	prev = strstr(url, "://");
 	if (prev) {
@@ -591,33 +600,40 @@
 		if (prev) prev++;
 	}
 
-	if (!prev) prev = url; 
+	if (!prev) prev = url;
 	strcpy(szPath, prev);
 	prev = strrchr(szPath, '.');
 	if (prev) prev[0] = 0;
 
+	if (out_url) {
+		strcpy(szOutPath, out_url);
+	} else {
+		strcpy(szOutPath, szPath);
+	}
+	prev = strrchr(szOutPath, '.');
+	if (prev) prev[0] = 0;
+
+
 	fprintf(stderr, "Opening URL %s\n", url);
 	/*connect in pause mode*/
 	gf_term_connect_from_time(term, url, 0, 1);
 
-	while (!term->compositor->scene 
-		|| term->compositor->msg_type
-		|| (gf_term_get_option(term, GF_OPT_PLAY_STATE) == GF_STATE_STEP_PAUSE)
-	) {
+	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;
 		gf_term_process_flush(term);
 		gf_sleep(10);
 	}
-	
+
 	if (width && height) {
 		gf_term_set_size(term, width, height);
 		gf_term_process_flush(term);
-	} 
+	}
 #ifndef GPAC_USE_TINYGL
-        fprintf(stderr, "not tinygl\n");
 	e = gf_sc_get_screen_buffer(term->compositor, &fb, 0);
 #else
-        fprintf(stderr, "tinygl\n");
 	e = gf_sc_get_screen_buffer(term->compositor, &fb, 1);
 #endif
 	if (e != GF_OK) {
@@ -657,26 +673,26 @@
 		u32 time, prev_time, nb_frames;
 		u64 dump_dur;
 		char *conv_buf;
-		avi_t *avi_out = NULL; 
-		avi_t *depth_avi_out = NULL; 
+		avi_t *avi_out = NULL;
+		avi_t *depth_avi_out = NULL;
 		char szPath_depth[GF_MAX_PATH];
 		char comp[5];
-		strcpy(szPath_depth, szPath);
-		strcat(szPath, ".avi");
-		avi_out = AVI_open_output_file(szPath);
+		strcpy(szPath_depth, szOutPath);
+		strcat(szOutPath, ".avi");
+		avi_out = AVI_open_output_file(szOutPath);
 		if (!avi_out) {
-			fprintf(stderr, "Error creating AVI file %s\n", szPath);
+			fprintf(stderr, "Error creating AVI file %s\n", szOutPath);
 			return 1;
 		}
 		if (dump_mode==8) {
 			strcat(szPath_depth, "_depth.avi");
 			depth_avi_out = AVI_open_output_file(szPath_depth);
 			if (!depth_avi_out) {
-				fprintf(stderr, "Error creating AVI file %s\n", szPath);
+				fprintf(stderr, "Error creating AVI file %s\n", szPath_depth);
 				return 1;
-			}	
+			}
 		}
-		
+
 		if (!fps) fps = GF_IMPORT_DEFAULT_FPS;
 		time = prev_time = 0;
 		nb_frames = 0;
@@ -710,12 +726,12 @@
 				/*we'll dump both buffers at once*/
 				gf_mx_p(term->compositor->mx);
 				dump_depth(term, szPath_depth, dump_mode, i+1, conv_buf, depth_avi_out);
-				dump_frame(term, szPath, dump_mode, i+1, conv_buf, avi_out);
+				dump_frame(term, szOutPath, dump_mode, i+1, conv_buf, avi_out);
 				gf_mx_v(term->compositor->mx);
 
 			}
-			else dump_frame(term, szPath, dump_mode, i+1, conv_buf, avi_out);
-			
+			else dump_frame(term, szOutPath, dump_mode, i+1, conv_buf, avi_out);
+
 			nb_frames++;
 			time = (u32) (nb_frames*1000/fps);
 			gf_term_step_clocks(term, time - prev_time);
@@ -739,12 +755,12 @@
 				gf_term_process_flush(term);
 			}
 
-			if (dump_mode==4 || dump_mode==7) {
-				dump_depth(term, szPath, dump_mode, i+1, NULL, NULL);
+			if (dump_mode==4 || dump_mode==7 || dump_mode==12) {
+				dump_depth(term, szOutPath, dump_mode, i+1, NULL, NULL);
 			} else {
-				dump_frame(term, url, dump_mode, i+1, NULL, NULL);
+				dump_frame(term, out_url, dump_mode, i+1, NULL, NULL);
 			}
-			
+
 			if (i+1<nb_times) gf_term_step_clocks(term, times[i+1] - times[i]);
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/applications/mp4client/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/mp4client/main.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -11,18 +11,19 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
+
 /*includes both terminal and od browser*/
 #include <gpac/terminal.h>
 #include <gpac/term_info.h>
@@ -36,7 +37,7 @@
 /*ISO 639 languages*/
 #include <gpac/iso639.h>
 
-//FIXME we need a plugin for playlists 
+//FIXME we need a plugin for playlists
 #include <gpac/internal/terminal_dev.h>
 
 
@@ -47,6 +48,10 @@
 #if defined(__DARWIN__) || defined(__APPLE__)
 #include <sys/types.h>
 #include <sys/stat.h>
+
+void carbon_init();
+void carbon_uninit();
+
 #endif
 
 #else
@@ -78,14 +83,17 @@
 static u32 bench_mode_start = 0;
 static u32 bench_buffer = 0;
 static Bool eos_seen = GF_FALSE;
+static Bool addon_visible = GF_TRUE;
 Bool is_connected = GF_FALSE;
 Bool startup_file = GF_FALSE;
 GF_User user;
 GF_Terminal *term;
 u64 Duration;
 GF_Err last_error = GF_OK;
+static Bool enable_add_ons = GF_TRUE;
+static Fixed playback_speed = 1.0;
 
-static Bool request_next_playlist_item = GF_FALSE;
+static s32 request_next_playlist_item = GF_FALSE;
 FILE *playlist = NULL;
 static Bool readonly_playlist = GF_FALSE;
 
@@ -97,7 +105,7 @@
 static char pl_path[GF_MAX_PATH];
 static Bool no_mime_check = GF_TRUE;
 static Bool be_quiet = GF_FALSE;
-static u32 log_time_start = 0;
+static u64 log_time_start = 0;
 static Bool log_utc_time = GF_FALSE;
 static Bool loop_at_end = GF_FALSE;
 static u32 forced_width=0;
@@ -111,7 +119,7 @@
 Bool right_down = GF_FALSE;
 
 void dump_frame(GF_Terminal *term, char *rad_path, u32 dump_type, u32 frameNum);
-Bool dump_file(char *the_url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times);
+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);
 
 
 void hide_shell(u32 cmd_type)
@@ -127,182 +135,196 @@
 }
 
 
-
+void send_open_url(const char *url)
+{
+	GF_Event evt;
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_NAVIGATE;
+	evt.navigate.to_url = url;
+	gf_term_send_event(term, &evt);
+}
 
 void PrintUsage()
 {
 	fprintf(stderr, "Usage MP4Client [options] [filename]\n"
-		"\t-c fileName:    user-defined configuration file. Also works with -cfg\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:  enables memory tracker\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-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"
+	        "\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-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"
+	        "\t        \"mem\"        : GPAC memory tracker\n"
 #endif
 #ifndef GPAC_DISABLE_DASH_CLIENT
-		"\t        \"dash\"       : HTTP streaming logs\n"
+	        "\t        \"dash\"       : HTTP streaming logs\n"
 #endif
-		"\t        \"module\"     : GPAC modules debugging\n"
-		"\t        \"mutex\"      : mutex\n"
-		"\t        \"all\"        : all tools logged - other tools can be specified afterwards.\n"
-		"\n"
-		"\t-log-clock or -lc      : logs time in ms 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"
+	        "\t        \"module\"     : GPAC modules debugging\n"
+	        "\t        \"mutex\"      : mutex\n"
+	        "\t        \"all\"        : all tools logged - other tools can be specified afterwards.\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"
+	        "\t-thread:        enables thread usage for terminal and compositor \n"
 #else
-		"\t-no-thread:     disables thread usage (except for audio)\n"
+	        "\t-no-thread:     disables thread usage (except for audio)\n"
 #endif
-		"\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"
-		"                   possible v values: t(op), m(iddle), b(ottom)\n"
-		"                   possible h values: l(eft), m(iddle), r(ight)\n"
-		"                   default alignment is top-left\n"
-		"                   default alignment is top-left\n"
-		"\t-pause:         pauses at first frame\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"
-		"                    in this mode, URL argument of GPAC is ignored, GUI as well.\n"
-		"                    this is equivalent as using views://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-gui:           starts in GUI mode. The GUI is indicated in GPAC config, section General, by the key [StartupFile]\n"
-		"\n"
-		"Dumper Options:\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-rgbds:         dumps the RGBDS pixel format texture\n"
-		"                   with -avi [times]: dumps an rgbds-format .avi\n"
-		"\t-rgbd:          dumps the RGBD pixel format texture\n"
-		"					with -avi [times]: dumps an rgbd-format .avi\n"		
-		"\t-depth:         dumps depthmap (z-buffer) frames\n"
-		"                   with -avi [times]: dumps depthmap in grayscale .avi\n"		
-		"                   with -bmp: dumps depthmap in grayscale .bmp\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:          show window while dumping (default: no)\n"
-		"\n"
-		"\t-help:          show this screen\n"
-		"\n"
-		"MP4Client - GPAC command line player and dumper - version "GPAC_FULL_VERSION"\n"
-		"GPAC Written by Jean Le Feuvre (c) 2001-2005 - ENST (c) 2005-200X\n"
-		"GPAC Configuration: " GPAC_CONFIGURATION "\n"
-		"Features: %s\n", 
-		GF_IMPORT_DEFAULT_FPS,
-		gpac_features()
-		);
+	        "\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"
+	        "\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-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"
+	        "\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"
+	        "\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-help:          shows this screen\n"
+	        "\n"
+	        "MP4Client - GPAC command line player and dumper - version "GPAC_FULL_VERSION"\n"
+	        "GPAC Written by Jean Le Feuvre (c) 2001-2005 - ENST (c) 2005-200X\n"
+	        "GPAC Configuration: " GPAC_CONFIGURATION "\n"
+	        "Features: %s\n",
+	        GF_IMPORT_DEFAULT_FPS,
+	        gpac_features()
+	       );
 }
 
 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"
-		"\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
-		);
+	        "\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
+	       );
 }
 
 
@@ -328,25 +350,25 @@
 
 	/*refresh every second*/
 	if (!display_rti && !rti_logs) return;
-	if (!gf_sys_get_rti(rti_update_time_ms, &rti, 0) && !legend) 
+	if (!gf_sys_get_rti(rti_update_time_ms, &rti, 0) && !legend)
 		return;
 
 	if (display_rti) {
 		char szMsg[1024];
 
 		if (rti.total_cpu_usage && (bench_mode<2) ) {
-			sprintf(szMsg, "FPS %d CPU %2d (%02d) Mem %d kB", 
-					(u32) gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024));
+			sprintf(szMsg, "FPS %d CPU %2d (%02d) Mem %d kB",
+			        (u32) gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024));
 		} else {
-			sprintf(szMsg, "FPS %d CPU %02d Mem %d kB", 
-				(u32) gf_term_get_framerate(term, 0), rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
+			sprintf(szMsg, "FPS %d CPU %02d Mem %d kB",
+			        (u32) gf_term_get_framerate(term, 0), rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
 		}
 
 		if (display_rti==2) {
 			if (bench_mode>=2) {
 				PrintAVInfo(GF_FALSE);
 			}
-			fprintf(stderr, "%s\r", szMsg); 
+			fprintf(stderr, "%s\r", szMsg);
 		} else {
 			GF_Event evt;
 			evt.type = GF_EVENT_SET_CAPTION;
@@ -355,14 +377,14 @@
 		}
 	}
 	if (rti_logs) {
-		fprintf(rti_logs, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t%s", 
-			gf_sys_clock(),
-			gf_term_get_time_in_ms(term),
-			rti.total_cpu_usage,
-			(u32) gf_term_get_framerate(term, 0),
-			(u32) (rti.gpac_memory / 1024), 
-			legend ? legend : ""
-			);
+		fprintf(rti_logs, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t%s",
+		        gf_sys_clock(),
+		        gf_term_get_time_in_ms(term),
+		        rti.total_cpu_usage,
+		        (u32) gf_term_get_framerate(term, 0),
+		        (u32) (rti.gpac_memory / 1024),
+		        legend ? legend : ""
+		       );
 		if (!legend) fprintf(rti_logs, "\n");
 	}
 }
@@ -380,15 +402,30 @@
 		/*get any service info*/
 		if (!startup_file && gf_term_get_service_info(term, gf_term_get_root_object(term), &com) == GF_OK) {
 			strcpy(szName, "");
-			if (com.track_info) { 
+			if (com.track_info) {
 				char szBuf[10];
 				sprintf(szBuf, "%02d ", (u32) (com.track_info>>16) );
 				strcat(szName, szBuf);
 			}
-			if (com.artist) { strcat(szName, com.artist); strcat(szName, " "); }
-			if (com.name) { strcat(szName, com.name); strcat(szName, " "); }
-			if (com.album) { strcat(szName, "("); strcat(szName, com.album); strcat(szName, ")"); }
-			
+			if (com.artist) {
+				strcat(szName, com.artist);
+				strcat(szName, " ");
+			}
+			if (com.name) {
+				strcat(szName, com.name);
+				strcat(szName, " ");
+			}
+			if (com.album) {
+				strcat(szName, "(");
+				strcat(szName, com.album);
+				strcat(szName, ")");
+			}
+			if (com.provider) {
+				strcat(szName, "(");
+				strcat(szName, com.provider);
+				strcat(szName, ")");
+			}
+
 			if (strlen(szName)) event.caption.caption = szName;
 		}
 		if (!event.caption.caption) {
@@ -407,8 +444,10 @@
 {
 	u32 res;
 	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF; res<<=8;
-	res |= (val>>8)&0xFF; res<<=8;
+	res = (val)&0xFF;
+	res<<=8;
+	res |= (val>>8)&0xFF;
+	res<<=8;
 	res |= (val>>16)&0xFF;
 	return res;
 }
@@ -425,26 +464,26 @@
 #ifndef WIN32
 #include <termios.h>
 int getch() {
-    struct termios old;
-    struct termios new;
-    int rc;
-    if (tcgetattr(0, &old) == -1) {
-        return -1;
-    }
-    new = old;
-    new.c_lflag &= ~(ICANON | ECHO);
-    new.c_cc[VMIN] = 1;
-    new.c_cc[VTIME] = 0;
-    if (tcsetattr(0, TCSANOW, &new) == -1) {
-        return -1;
-    }
-    rc = getchar();
-    (void) tcsetattr(0, TCSANOW, &old);
-    return rc;
+	struct termios old;
+	struct termios new;
+	int rc;
+	if (tcgetattr(0, &old) == -1) {
+		return -1;
+	}
+	new = old;
+	new.c_lflag &= ~(ICANON | ECHO);
+	new.c_cc[VMIN] = 1;
+	new.c_cc[VTIME] = 0;
+	if (tcsetattr(0, TCSANOW, &new) == -1) {
+		return -1;
+	}
+	rc = getchar();
+	(void) tcsetattr(0, TCSANOW, &old);
+	return rc;
 }
 #else
-int getch(){
-    return getchar();
+int getch() {
+	return getchar();
 }
 #endif
 
@@ -452,38 +491,38 @@
  * Reads a line of input from stdin
  * @param line the buffer to fill
  * @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 
+ * @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){
-    char read;
-    int i = 0;
-    if (fflush( stderr ))
-      perror("Failed to flush buffer %s");
-    do {
-      line[i] = '\0';
-      if (i >= maxSize - 1)
+static const char * read_line_input(char * line, int maxSize, Bool showContent) {
+	char read;
+	int i = 0;
+	if (fflush( stderr ))
+		perror("Failed to flush buffer %s");
+	do {
+		line[i] = '\0';
+		if (i >= maxSize - 1)
+			return line;
+		read = getch();
+		if (read == 8 || read == 127) {
+			if (i > 0) {
+				fprintf(stderr, "\b \b");
+				i--;
+			}
+		} else if (read > 32) {
+			fputc(showContent ? read : '*', stderr);
+			line[i++] = read;
+		}
+		fflush(stderr);
+	} while (read != '\n');
+	if (!read)
+		return 0;
 	return line;
-      read = getch();
-      if (read == 8 || read == 127){
-	if (i > 0){
-	  fprintf(stderr, "\b \b");
-	  i--;
-	}
-      } else if (read > 32){
-	fputc(showContent ? read : '*', stderr);
-	line[i++] = read;
-      }
-      fflush(stderr);
-    } while (read != '\n');
-    if (!read)
-      return 0;
-    return line;
 }
 
 Bool GPAC_EventProc(void *ptr, GF_Event *evt)
 {
 	if (!term) return 0;
-	
+
 	if (gui_mode==1) {
 		if (evt->type==GF_EVENT_QUIT) {
 			Run = 0;
@@ -518,30 +557,30 @@
 			} 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 if (!be_quiet)
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONSOLE, ("%s %s\n", servName, evt->message.message));
 	}
-		break;
+	break;
 	case GF_EVENT_PROGRESS:
-		{
-			char *szTitle = "";
-			if (evt->progress.progress_type==0) {
-				szTitle = "Buffer ";
-				if (bench_mode) {
-					if (evt->progress.done >= evt->progress.total) bench_buffer = 0;
-					else bench_buffer = 1 + 100*evt->progress.done / evt->progress.total;
-					break;
-				}
-			}
-			else if (evt->progress.progress_type==1) {
-				if (bench_mode) break;
-				szTitle = "Download ";
+	{
+		char *szTitle = "";
+		if (evt->progress.progress_type==0) {
+			szTitle = "Buffer ";
+			if (bench_mode && (bench_mode!=3) ) {
+				if (evt->progress.done >= evt->progress.total) bench_buffer = 0;
+				else bench_buffer = 1 + 100*evt->progress.done / evt->progress.total;
+				break;
 			}
-			else if (evt->progress.progress_type==2) szTitle = "Import ";
-			gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
 		}
-		break;
-	
+		else if (evt->progress.progress_type==1) {
+			if (bench_mode) break;
+			szTitle = "Download ";
+		}
+		else if (evt->progress.progress_type==2) szTitle = "Import ";
+		gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
+	}
+	break;
+
 
 	case GF_EVENT_DBLCLICK:
 		gf_term_set_option(term, GF_OPT_FULLSCREEN, !gf_term_get_option(term, GF_OPT_FULLSCREEN));
@@ -606,27 +645,41 @@
 		case GF_KEY_D:
 			if (evt->key.flags & GF_KEY_MOD_CTRL) gf_term_set_option(term, GF_OPT_DRAW_MODE, (gf_term_get_option(term, GF_OPT_DRAW_MODE)==GF_DRAW_MODE_DEFER) ? GF_DRAW_MODE_IMMEDIATE : GF_DRAW_MODE_DEFER );
 			break;
-		case GF_KEY_4: 
+		case GF_KEY_4:
 			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3); 
+				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
 			break;
-		case GF_KEY_5: 
+		case GF_KEY_5:
 			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9); 
+				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
 			break;
-		case GF_KEY_6: 
+		case GF_KEY_6:
 			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN); 
+				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
 			break;
-		case GF_KEY_7: 
+		case GF_KEY_7:
 			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP); 
+				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
+			break;
+		case GF_KEY_O:
+			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
+				if (gf_term_get_option(term, GF_OPT_MAIN_ADDON)) {
+					fprintf(stderr, "Resuming to main content\n");
+					gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAY_LIVE);
+				} else {
+					fprintf(stderr, "Main addon not enabled\n");
+				}
+			}
 			break;
 		case GF_KEY_P:
 			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
-				Bool is_pause = gf_term_get_option(term, GF_OPT_PLAY_STATE);
+				u32 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, (gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) ? GF_STATE_PLAYING : GF_STATE_PAUSED);
+				if ((is_pause == GF_STATE_PAUSED) && (evt->key.flags & GF_KEY_MOD_SHIFT)) {
+					gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAY_LIVE);
+				} else {
+					gf_term_set_option(term, GF_OPT_PLAY_STATE, (gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) ? GF_STATE_PLAYING : GF_STATE_PAUSED);
+				}
 			}
 			break;
 		case GF_KEY_S:
@@ -657,6 +710,32 @@
 			if (is_connected)
 				reload = 1;
 			break;
+		case GF_KEY_A:
+			addon_visible = !addon_visible;
+			gf_term_toggle_addons(term, addon_visible);
+			break;
+		case GF_KEY_UP:
+			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
+				playback_speed *= 2;
+				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
+				gf_term_set_speed(term, playback_speed);
+			}
+			break;
+		case GF_KEY_DOWN:
+			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
+				playback_speed /= 2;
+				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
+				gf_term_set_speed(term, playback_speed);
+			}
+			break;
+		case GF_KEY_LEFT:
+			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
+				playback_speed = -playback_speed;
+				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
+				gf_term_set_speed(term, playback_speed);
+			}
+			break;
+
 		}
 		break;
 
@@ -665,6 +744,8 @@
 			is_connected = 1;
 			fprintf(stderr, "Service Connected\n");
 			eos_seen = GF_FALSE;
+			if (playback_speed != FIX_ONE)
+				gf_term_set_speed(term, playback_speed);
 		} else if (is_connected) {
 			fprintf(stderr, "Service %s\n", is_connected ? "Disconnected" : "Connection Failed");
 			is_connected = 0;
@@ -687,7 +768,7 @@
 			move.move.align_y = (align_mode>>8) & 0xFF;
 			move.move.relative = 2;
 			gf_term_user_event(term, &move);
-		} 
+		}
 		break;
 	case GF_EVENT_SCENE_SIZE:
 		if (forced_width && forced_height) {
@@ -703,7 +784,7 @@
 		ResetCaption();
 		break;
 
-	case GF_EVENT_OPENFILE:
+	case GF_EVENT_DROPFILE:
 	{
 		u32 i, pos;
 		/*todo - force playlist mode*/
@@ -720,14 +801,14 @@
 		i=0;
 		while (i<evt->open_file.nb_files) {
 			if (evt->open_file.files[i] != NULL) {
-				fprintf(playlist, "%s\n", evt->open_file.files[i]); 
+				fprintf(playlist, "%s\n", evt->open_file.files[i]);
 			}
 			i++;
 		}
 		fseek(playlist, pos, SEEK_SET);
 		request_next_playlist_item = 1;
 	}
-		return 1;
+	return 1;
 
 	case GF_EVENT_QUIT:
 		if (evt->message.error)  {
@@ -741,7 +822,7 @@
 	case GF_EVENT_MIGRATE:
 	{
 	}
-		break;
+	break;
 	case GF_EVENT_NAVIGATE_INFO:
 		if (evt->navigate.to_url) fprintf(stderr, "Go to URL: \"%s\"\r", evt->navigate.to_url);
 		break;
@@ -765,7 +846,7 @@
 		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)) && (maxTries--) >= 0) {
 			fprintf(stderr, "**** Authorization required for site %s ****\n", evt->auth.site_url);
 			fprintf(stderr, "login   : ");
 			read_line_input(evt->auth.user, 50, 1);
@@ -773,12 +854,18 @@
 			read_line_input(evt->auth.password, 50, 0);
 			fprintf(stderr, "*********\n");
 		}
-		if (maxTries < 0){
-		  fprintf(stderr, "**** No User or password has been filled, aborting ***\n");
-		  return 0;
+		if (maxTries < 0) {
+			fprintf(stderr, "**** No User or password has been filled, aborting ***\n");
+			return 0;
 		}
 		return 1;
 	}
+	case GF_EVENT_ADDON_DETECTED:
+		if (enable_add_ons) {
+			fprintf(stderr, "Media Addon %s detected - enabling it\n", evt->addon_connect.addon_url);
+			addon_visible = 1;
+		}
+		return enable_add_ons;
 	}
 	return 0;
 }
@@ -880,7 +967,7 @@
 		vsprintf(szMsg, fmt, list);
 		UpdateRTInfo(szMsg + 6 /*"[RTI] "*/);
 	} else {
-		if (log_time_start) fprintf(logs, "[At %d]", gf_sys_clock() - log_time_start);
+		if (log_time_start) fprintf(logs, "[At "LLD"]", gf_sys_clock_high_res() - log_time_start);
 		if (log_utc_time) {
 			u64 utc_clock = gf_net_get_utc() ;
 			time_t secs = utc_clock/1000;
@@ -910,7 +997,7 @@
 
 			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();
+			log_time_start = gf_sys_clock_high_res();
 		}
 	}
 }
@@ -925,7 +1012,8 @@
 	}
 	sep[0] = 0;
 	strcpy(szSec, opt_string);
-	sep[0] = ':'; sep ++;
+	sep[0] = ':';
+	sep ++;
 	sep2 = strchr(sep, '=');
 	if (!sep2) {
 		fprintf(stderr, "Badly formatted option %s - expected Section:Name=Value\n", opt_string);
@@ -934,7 +1022,7 @@
 	sep2[0] = 0;
 	strcpy(szKey, sep);
 	strcpy(szVal, sep2+1);
-	sep2[0] = '='; 
+	sep2[0] = '=';
 	if (!stricmp(szVal, "null")) szVal[0]=0;
 	gf_cfg_set_key(cfg_file, szSec, szKey, szVal[0] ? szVal : NULL);
 }
@@ -949,6 +1037,7 @@
 	const char *str;
 	u32 i, times[100], nb_times, dump_mode;
 	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;
@@ -963,7 +1052,7 @@
 #endif
 	Double fps = GF_IMPORT_DEFAULT_FPS;
 	Bool fill_ar, visible;
-	char *url_arg, *the_cfg, *rti_file, *views;
+	char *url_arg, *out_arg, *the_cfg, *rti_file, *views, *default_com;
 	FILE *logfile = NULL;
 	Float scale = 1;
 #ifndef WIN32
@@ -977,7 +1066,7 @@
 
 	dump_mode = 0;
 	fill_ar = visible = GF_FALSE;
-	url_arg = the_cfg = rti_file = views = NULL;
+	url_arg = out_arg = the_cfg = rti_file = views = default_com = NULL;
 	nb_times = 0;
 	times[0] = 0;
 
@@ -992,10 +1081,13 @@
 #ifdef GPAC_MEMORY_TRACKING
 			enable_mem_tracker = GF_TRUE;
 #else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n");
 #endif
-		}
-		else if (!strcmp(arg, "-h") || !strcmp(arg, "-help")) {
+		} else if (!strcmp(arg, "-gui")) {
+			gui_mode = 1;
+		} else if (!strcmp(arg, "-guid")) {
+			gui_mode = 2;
+		} else if (!strcmp(arg, "-h") || !strcmp(arg, "-help")) {
 			PrintUsage();
 			return 1;
 		}
@@ -1006,6 +1098,7 @@
 #else
 	gf_sys_init(GF_FALSE);
 #endif
+	gf_sys_set_args(argc, (const char **) argv);
 
 	cfg_file = gf_cfg_init(the_cfg, NULL);
 	if (!cfg_file) {
@@ -1017,75 +1110,26 @@
 		return 1;
 	}
 
-	if( gf_cfg_get_key(cfg_file, "General", "Logs") != NULL ){
+	if( gf_cfg_get_key(cfg_file, "General", "Logs") != NULL ) {
 		logs_set = GF_TRUE;
 	}
 
 	for (i=1; i<(u32) argc; i++) {
 		char *arg = argv[i];
-//		if (isalnum(arg[0]) || (arg[0]=='/') || (arg[0]=='.') || (arg[0]=='\\') ) {
-		if (arg[0] != '-') {
-			url_arg = arg;
-		} else if (!strcmp(arg, "-c") || !strcmp(arg, "-cfg")) {
-			the_cfg = argv[i+1];
-			i++;
-		} else if (!strcmp(arg, "-rti")) {
+		
+		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, "-fill")) {
-			fill_ar = GF_TRUE;
-		} else if (!strcmp(arg, "-gui")) {
-			gui_mode = 1;
-		} else if (!strcmp(arg, "-guid")) {
-			gui_mode = 2;
-		} else if (!strcmp(arg, "-show")) {
-			visible = 1;
-		} else if (!strcmp(arg, "-avi")) {
-			if (rgbds_dump) dump_mode = 5;
-			else if (depth_dump) dump_mode = 8;
-			else if (rgbd_dump) dump_mode = 10;
-			else dump_mode=1;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
-		} else if (!strcmp(arg, "-rgbds")) { /*get dump in rgbds pixel format*/
-			rgbds_dump = 1;
-			dump_mode=6;                    /* rgbds texture directly*/
-			if (dump_mode==1) dump_mode = 5;    /* .avi rgbds dump*/
-		} else if (!strcmp(arg, "-rgbd")) { /*get dump in rgbd pixel format*/
-			rgbd_dump = 1;
-			dump_mode=9;  /* rgbd texture directly*/
-			if (dump_mode==1) dump_mode = 10;    /* .avi rgbds dump*/
-		} else if (!strcmp(arg, "-depth")) {
-			depth_dump = 1;        
-			if (dump_mode==2) dump_mode=7; /* grayscale .bmp depth dump*/
-			else if (dump_mode==1) dump_mode=8; /* .avi depth dump*/
-			else dump_mode=4;   /*depth dump*/
-		} else if (!strcmp(arg, "-bmp")) {
-			if(depth_dump) dump_mode=7; /*grayscale depth .bmp dump*/
-			else dump_mode=2;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
-		} else if (!strcmp(arg, "-png")) {
-			dump_mode=11;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
-		} else if (!strcmp(arg, "-raw")) {
-			dump_mode = 3;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) 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 (!stricmp(arg, "-scale")) {
-			sscanf(argv[i+1], "%f", &scale);
-			i++;
-		} else if (!stricmp(arg, "-fps")) {
-			fps = atof(argv[i+1]);
-			i++;
 		} else if (!strcmp(arg, "-quiet")) {
 			be_quiet = 1;
 		} else if (!strcmp(arg, "-strict-error")) {
@@ -1104,16 +1148,7 @@
 			log_time_start = 1;
 		} else if (!strcmp(arg, "-log-utc") || !strcmp(arg, "-lu")) {
 			log_utc_time = 1;
-		} else if (!strcmp(arg, "-align")) {
-			if (argv[i+1][0]=='m') align_mode = 1;
-			else if (argv[i+1][0]=='b') align_mode = 2;
-			align_mode <<= 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, "-no-wnd")) user.init_flags |= GF_TERM_WINDOWLESS;
-		else if (!strcmp(arg, "-no-back")) user.init_flags |= GF_TERM_WINDOW_TRANSPARENT;
 #if defined(__DARWIN__) || defined(__APPLE__)
 		else if (!strcmp(arg, "-thread")) threading_flags = 0;
 #else
@@ -1122,22 +1157,7 @@
 		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, "-pause")) pause_at_first = 1;
-		else if (!strcmp(arg, "-play-from")) {
-			play_from = atof((const char *) argv[i+1]);
-		}
-		else if (!strcmp(arg, "-exit")) auto_exit = 1;
-		else if (!strcmp(arg, "-mem-track")) {
-#ifdef GPAC_MEMORY_TRACKING
-			enable_mem_tracker = 1;
-#else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
-#endif
-		}
-		else if (!strcmp(arg, "-loop")) loop_at_end = 1;
-		else if (!strcmp(arg, "-bench")) bench_mode = 1;
-		else if (!strcmp(arg, "-vbench")) bench_mode = 2;
-		else if (!strcmp(arg, "-sbench")) bench_mode = 3;
+
 		else if (!strcmp(arg, "-opt")) {
 			set_cfg_option(argv[i+1]);
 			i++;
@@ -1146,21 +1166,105 @@
 			gf_cfg_set_key(cfg_file, "Network", "DefaultMCastInterface", argv[i+1]);
 			i++;
 		}
-		else if (!stricmp(arg, "-views")) {
-			views = argv[i+1];
-			i++;
-		}
-		else if (!stricmp(arg, "-run-for")) {
-			simulation_time_in_ms = atoi(argv[i+1]) * 1000;
-			if (!simulation_time_in_ms)
-				simulation_time_in_ms = 1; /*1ms*/
-			i++;
-		}
 		else if (!stricmp(arg, "-help")) {
 			PrintUsage();
 			return 1;
-		} else { 
-			fprintf(stderr, "Unrecognized option %s - skipping\n", arg);
+		}
+
+		/*arguments only used in non-gui mode*/
+		else if (!gui_mode) {
+			if (arg[0] != '-') {
+				url_arg = arg;
+			} 
+			else if (!strcmp(arg, "-out")) {
+				out_arg = gf_strdup(argv[i+1]);
+			}
+			else if (!stricmp(arg, "-fps")) {
+				fps = atof(argv[i+1]);
+				i++;
+			} else if (!strcmp(arg, "-avi")) {
+				if (rgbds_dump) dump_mode = 5;
+				else if (depth_dump) dump_mode = 8;
+				else if (rgbd_dump) dump_mode = 10;
+				else dump_mode=1;
+				if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
+			} else if (!strcmp(arg, "-rgbds")) { /*get dump in rgbds pixel format*/
+				rgbds_dump = 1;
+				dump_mode=6;                    /* rgbds texture directly*/
+				if (dump_mode==1) dump_mode = 5;    /* .avi rgbds dump*/
+			} else if (!strcmp(arg, "-rgbd")) { /*get dump in rgbd pixel format*/
+				rgbd_dump = 1;
+				dump_mode=9;  /* rgbd texture directly*/
+				if (dump_mode==1) dump_mode = 10;    /* .avi rgbds dump*/
+			} else if (!strcmp(arg, "-depth")) {
+				depth_dump = 1;
+				if (dump_mode==2) dump_mode=7; /* grayscale .bmp depth dump*/
+				else if (dump_mode==1) dump_mode=8; /* .avi depth dump*/
+				else if (dump_mode==11)dump_mode=12;
+				else dump_mode=4;   /*depth dump*/
+			} else if (!strcmp(arg, "-bmp")) {
+				if(depth_dump) dump_mode=7; /*grayscale depth .bmp dump*/
+				else dump_mode=2;
+				if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
+			} else if (!strcmp(arg, "-png")) {
+				dump_mode=11;
+				if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
+			} else if (!strcmp(arg, "-raw")) {
+				dump_mode = 3;
+				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, "-loop")) loop_at_end = 1;
+			else if (!strcmp(arg, "-bench")) bench_mode = 1;
+			else if (!strcmp(arg, "-vbench")) bench_mode = 2;
+			else if (!strcmp(arg, "-sbench")) bench_mode = 3;
+			else if (!strcmp(arg, "-no-addon")) enable_add_ons = GF_FALSE;
+
+			else if (!strcmp(arg, "-pause")) pause_at_first = 1;
+			else if (!strcmp(arg, "-play-from")) {
+				play_from = atof((const char *) argv[i+1]);
+			}
+			else if (!strcmp(arg, "-speed")) {
+				playback_speed = FLT2FIX( atof((const char *) argv[i+1]) );
+				if (playback_speed <= 0) playback_speed = FIX_ONE;
+			}
+			else if (!strcmp(arg, "-no-wnd")) user.init_flags |= GF_TERM_WINDOWLESS;
+			else if (!strcmp(arg, "-no-back")) user.init_flags |= GF_TERM_WINDOW_TRANSPARENT;
+			else if (!strcmp(arg, "-align")) {
+				if (argv[i+1][0]=='m') align_mode = 1;
+				else if (argv[i+1][0]=='b') align_mode = 2;
+				align_mode <<= 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, "-exit")) auto_exit = 1;
+			else if (!stricmp(arg, "-views")) {
+				views = argv[i+1];
+				i++;
+			}
+			else if (!stricmp(arg, "-run-for")) {
+				simulation_time_in_ms = atoi(argv[i+1]) * 1000;
+				if (!simulation_time_in_ms)
+					simulation_time_in_ms = 1; /*1ms*/
+				i++;
+			}
+			else if (!stricmp(arg, "-com")) {
+				default_com = argv[i+1];
+				i++;
+			}
+			else if (!stricmp(arg, "-service")) {
+				initial_service_id = atoi(argv[i+1]);
+				i++;
+			} else {
+				fprintf(stderr, "Unrecognized option %s - skipping\n", arg);
+			}
 		}
 	}
 	if (dump_mode && !url_arg ) {
@@ -1181,7 +1285,7 @@
 	if (gui_mode) {
 		if (gui_mode==1) {
 			hide_shell(1);
-			user.init_flags |= GF_TERM_WINDOW_NO_DECORATION;
+			//user.init_flags |= GF_TERM_WINDOW_NO_DECORATION;
 		}
 	}
 
@@ -1198,7 +1302,7 @@
 		GF_SystemRTInfo rti;
 		if (gf_sys_get_rti(0, &rti, 0))
 			fprintf(stderr, "System info: %d MB RAM - %d cores\n", (u32) (rti.physical_memory/1024/1024), rti.nb_cores);
-	} 
+	}
 
 
 	/*setup dumping options*/
@@ -1246,7 +1350,7 @@
 		}
 	}
 
-	fprintf(stderr, "Loading GPAC Terminal\n");	
+	fprintf(stderr, "Loading GPAC Terminal\n");
 	i = gf_sys_clock();
 	term = gf_term_new(&user);
 	if (!term) {
@@ -1261,6 +1365,10 @@
 	}
 	fprintf(stderr, "Terminal Loaded in %d ms\n", gf_sys_clock()-i);
 
+#if defined(__DARWIN__) || defined(__APPLE__)
+    carbon_init();
+#endif
+    
 	if (bench_mode) {
 		display_rti = 2;
 		gf_term_set_option(term, GF_OPT_VIDEO_BENCH, (bench_mode==3) ? 2 : 1);
@@ -1305,13 +1413,13 @@
 			times[0] = 0;
 			nb_times++;
 		}
-		dump_file(url_arg, dump_mode, fps, forced_width, forced_height, scale, times, nb_times);
+		dump_file(url_arg, out_arg, dump_mode, fps, forced_width, forced_height, scale, times, nb_times);
 		Run = 0;
-	} else
-
+	} 
+	else if (views) {
+	} 
 	/*connect if requested*/
-	if (views) {
-	} else if (!gui_mode && url_arg) {
+	else if (!gui_mode && url_arg) {
 		char *ext;
 
 		strcpy(the_url, url_arg);
@@ -1319,7 +1427,7 @@
 		if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
 			GF_Err 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)) {
@@ -1330,18 +1438,18 @@
 					gf_dm_sess_del(sess);
 				}
 			}
-			
+
 			playlist = e ? NULL : gf_f64_open(the_url, "rt");
 			readonly_playlist = 1;
 			if (playlist) {
 				if (1 > fscanf(playlist, "%s", the_url))
-				  fprintf(stderr, "Cannot read any URL from playlist\n");
+					fprintf(stderr, "Cannot read any URL from playlist\n");
 				else {
-				  fprintf(stderr, "Opening URL %s\n", the_url);
-				  gf_term_connect_with_path(term, the_url, pl_path);
+					fprintf(stderr, "Opening URL %s\n", the_url);
+					gf_term_connect_with_path(term, the_url, pl_path);
 				}
 			} else {
-				if (e) 
+				if (e)
 					fprintf(stderr, "Failed to open playlist %s: %s\n", the_url, gf_error_to_string(e) );
 				fprintf(stderr, "Hit 'h' for help\n\n");
 			}
@@ -1358,9 +1466,6 @@
 			gf_term_connect(term, str);
 			startup_file = 1;
 		}
-		if (url_arg) {
-			gf_cfg_set_key(cfg_file, "Temp", "GUIStartupFile", url_arg);
-		}
 	}
 	if (gui_mode==2) gui_mode=0;
 
@@ -1376,15 +1481,17 @@
 		bench_mode_start = gf_sys_clock();
 	}
 
-	while (Run) {		
-		/*we don't want getchar to block*/
+
+	while (Run) {
+		
+        /*we don't want getchar to block*/
 		if (gui_mode || !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);
 			}
-			if (restart) {
+			if (restart && gf_term_get_option(term, GF_OPT_IS_OVER)) {
 				restart = 0;
 				gf_term_play_from_time(term, 0, 0);
 			}
@@ -1393,6 +1500,19 @@
 				request_next_playlist_item = 0;
 				goto force_input;
 			}
+
+			if (default_com && is_connected) {
+				gf_term_scene_update(term, NULL, default_com);
+				default_com = NULL;
+			}
+			if (initial_service_id && is_connected) {
+				GF_ObjectManager *root_od = gf_term_get_root_object(term);
+				if (root_od) {
+					gf_term_select_service(term, root_od, initial_service_id);
+					initial_service_id = 0;
+				}
+			}
+
 			if (!use_rtix || display_rti) UpdateRTInfo(NULL);
 			if (term_step) {
 				gf_term_process_step(term);
@@ -1401,12 +1521,12 @@
 			}
 			if (auto_exit && eos_seen && gf_term_get_option(term, GF_OPT_IS_OVER)) {
 				Run = 0;
-			} 
+			}
 
 			/*sim time*/
-			if (simulation_time_in_ms 
-				&& ( (gf_term_get_time_in_ms(term)>simulation_time_in_ms) || (!url_arg && gf_sys_clock()>simulation_time_in_ms))
-			) {
+			if (simulation_time_in_ms
+			        && ( (gf_term_get_time_in_ms(term)>simulation_time_in_ms) || (!url_arg && gf_sys_clock()>simulation_time_in_ms))
+			   ) {
 				Run = 0;
 			}
 			continue;
@@ -1427,9 +1547,9 @@
 			startup_file = 0;
 			gf_term_disconnect(term);
 			fprintf(stderr, "Enter the absolute URL\n");
-			if (1 > scanf("%s", the_url)){
-			    fprintf(stderr, "Cannot read absolute URL, aborting\n");
-			    break;
+			if (1 > scanf("%s", 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);
@@ -1437,16 +1557,16 @@
 		case 'O':
 			gf_term_disconnect(term);
 			fprintf(stderr, "Enter the absolute URL to the playlist\n");
-			if (1 > scanf("%s", the_url)){
-			    fprintf(stderr, "Cannot read the absolute URL, aborting.\n");
-			    break;
+			if (1 > scanf("%s", the_url)) {
+				fprintf(stderr, "Cannot read the absolute URL, aborting.\n");
+				break;
 			}
 			playlist = gf_f64_open(the_url, "rt");
 			if (playlist) {
-				if (1 >	fscanf(playlist, "%s", the_url)){
-				    fprintf(stderr, "Cannot read any URL from playlist, aborting.\n");
-				    fclose( playlist);
-				    break;
+				if (1 >	fscanf(playlist, "%s", the_url)) {
+					fprintf(stderr, "Cannot read any URL from playlist, aborting.\n");
+					fclose( playlist);
+					break;
 				}
 				fprintf(stderr, "Opening URL %s\n", the_url);
 				gf_term_connect(term, the_url);
@@ -1476,14 +1596,14 @@
 			if (playlist) {
 				u32 count;
 				gf_term_disconnect(term);
-				if (1 > scanf("%u", &count)){
-				  fprintf(stderr, "Cannot read number, aborting.\n");
-				  break;
+				if (1 > scanf("%u", &count)) {
+					fprintf(stderr, "Cannot read number, aborting.\n");
+					break;
 				}
 				while (count) {
-					if (fscanf(playlist, "%s", the_url)){
-					    fprintf(stderr, "Failed to read line, aborting\n");
-					    break;
+					if (fscanf(playlist, "%s", the_url)) {
+						fprintf(stderr, "Failed to read line, aborting\n");
+						break;
 					}
 					count--;
 				}
@@ -1492,10 +1612,10 @@
 			}
 			break;
 		case 'r':
-			if (is_connected) 
+			if (is_connected)
 				reload = 1;
 			break;
-		
+
 		case 'D':
 			if (is_connected) gf_term_disconnect(term);
 			break;
@@ -1527,11 +1647,14 @@
 				PrintTime(Duration);
 				res = gf_term_get_time_in_ms(term);
 				if (c=='z') {
-					res *= 100; res /= (s64)Duration;
+					res *= 100;
+					res /= (s64)Duration;
 					fprintf(stderr, " (current %.2f %%)\nEnter Seek percentage:\n", res);
-					if (scanf("%d", &seekTo) == 1) { 
+					if (scanf("%d", &seekTo) == 1) {
 						if (seekTo > 100) seekTo = 100;
-						res = (Double)(s64)Duration; res /= 100; res *= seekTo;
+						res = (Double)(s64)Duration;
+						res /= 100;
+						res *= seekTo;
 						gf_term_play_from_time(term, (u64) (s64) res, 0);
 					}
 				} else {
@@ -1541,8 +1664,15 @@
 					fprintf(stderr, "\nEnter seek time (Format: s, m:s or h:m:s):\n");
 					h = m = s = 0;
 					r =scanf("%d:%d:%d", &h, &m, &s);
-					if (r==2) { s = m; m = h; h = 0; }
-					else if (r==1) { s = h; m = h = 0;	}
+					if (r==2) {
+						s = m;
+						m = h;
+						h = 0;
+					}
+					else if (r==1) {
+						s = h;
+						m = h = 0;
+					}
 
 					if (r && (r<=3)) {
 						u64 time = h*3600 + m*60 + s;
@@ -1562,7 +1692,7 @@
 				fprintf(stderr, "\n");
 			}
 		}
-			break;
+		break;
 		case 'w':
 			if (is_connected) PrintWorldInfo(term);
 			break;
@@ -1573,8 +1703,8 @@
 			if (is_connected) {
 				u32 ID;
 				do {
-				  fprintf(stderr, "Enter OD ID (0 for main OD): ");
-				  fflush(stderr);
+					fprintf(stderr, "Enter OD ID (0 for main OD): ");
+					fflush(stderr);
 				} while( 1 > scanf("%ud", &ID));
 				ViewOD(term, ID, (u32)-1);
 			}
@@ -1583,8 +1713,8 @@
 			if (is_connected) {
 				u32 num;
 				do {
-				  fprintf(stderr, "Enter OD number (0 for main OD): ");
-				  fflush(stderr);
+					fprintf(stderr, "Enter OD number (0 for main OD): ");
+					fflush(stderr);
 				} while( 1 > scanf("%ud", &num));
 				ViewOD(term, (u32)-1, num);
 			}
@@ -1617,8 +1747,8 @@
 				Bool xml_dump, std_out;
 				radname[0] = 0;
 				do {
-				  fprintf(stderr, "Enter Inline OD ID if any or 0 : ");
-				  fflush(stderr);
+					fprintf(stderr, "Enter Inline OD ID if any or 0 : ");
+					fflush(stderr);
 				} while( 1 >  scanf("%ud", &odid));
 				if (odid) {
 					GF_ObjectManager *root_odm = gf_term_get_root_object(term);
@@ -1633,9 +1763,9 @@
 						odm = NULL;
 					}
 				}
-				do{
-				  fprintf(stderr, "Enter file radical name (+\'.x\' for XML dumping) - \"std\" for stderr: ");
-				  fflush(stderr);
+				do {
+					fprintf(stderr, "Enter file radical name (+\'.x\' for XML dumping) - \"std\" for stderr: ");
+					fflush(stderr);
 				} while( 1 > scanf("%s", radname));
 				sExt = strrchr(radname, '.');
 				xml_dump = 0;
@@ -1659,7 +1789,7 @@
 				fprintf(stderr, "Using %s for 2D drawing\n", use_3d ? "OpenGL" : "2D rasterizer");
 			}
 		}
-			break;
+		break;
 		case 'k':
 		{
 			Bool opt = gf_term_get_option(term, GF_OPT_STRESS_MODE);
@@ -1667,22 +1797,42 @@
 			fprintf(stderr, "Turning stress mode %s\n", opt ? "on" : "off");
 			gf_term_set_option(term, GF_OPT_STRESS_MODE, opt);
 		}
+		break;
+		case '4':
+			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
+			break;
+		case '5':
+			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
+			break;
+		case '6':
+			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
+			break;
+		case '7':
+			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
 			break;
-		case '4': gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3); break;
-		case '5': gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9); break;
-		case '6': gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN); break;
-		case '7': 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;
+			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;
+			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':
@@ -1711,14 +1861,14 @@
 			fprintf(stderr, "Enter command to send:\n");
 			fflush(stdin);
 			szCom[0] = 0;
-			if (1 > scanf("%[^\t\n]", szCom)){
-			    fprintf(stderr, "Cannot read command to send, aborting.\n");
-			    break;
+			if (1 > scanf("%[^\t\n]", szCom)) {
+				fprintf(stderr, "Cannot read command to send, aborting.\n");
+				break;
 			}
 			e = gf_term_scene_update(term, NULL, szCom);
 			if (e) fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
 		}
-			break;
+		break;
 		case 'e':
 		{
 			GF_Err e;
@@ -1726,14 +1876,14 @@
 			fprintf(stderr, "Enter JavaScript code to evaluate:\n");
 			fflush(stdin);
 			jsCode[0] = 0;
-			if (1 > scanf("%[^\t\n]", jsCode)){
-			    fprintf(stderr, "Cannot read code to evaluate, aborting.\n");
-			    break;
+			if (1 > scanf("%[^\t\n]", jsCode)) {
+				fprintf(stderr, "Cannot read code to evaluate, aborting.\n");
+				break;
 			}
 			e = gf_term_scene_update(term, "application/ecmascript", jsCode);
 			if (e) fprintf(stderr, "Processing JS code failed: %s\n", gf_error_to_string(e));
 		}
-			break;
+		break;
 
 		case 'L':
 		{
@@ -1742,12 +1892,12 @@
 			fprintf(stderr, "Enter new log level (current tools %s):\n", cur_logs);
 			gf_free(cur_logs);
 			if (scanf("%s", szLog) < 1) {
-			    fprintf(stderr, "Cannot read new log level, aborting.\n");
-			    break;
+				fprintf(stderr, "Cannot read new log level, aborting.\n");
+				break;
 			}
 			gf_log_modify_tools_levels(szLog);
 		}
-			break;
+		break;
 
 		case 'g':
 		{
@@ -1755,7 +1905,7 @@
 			gf_sys_get_rti(rti_update_time_ms, &rti, 0);
 			fprintf(stderr, "GPAC allocated memory "LLD"\n", rti.gpac_memory);
 		}
-			break;
+		break;
 		case 'M':
 		{
 			u32 size;
@@ -1764,21 +1914,21 @@
 			} while (1 > scanf("%ud", &size));
 			gf_term_set_option(term, GF_OPT_VIDEO_CACHE_SIZE, size);
 		}
-			break;
+		break;
 
 		case 'H':
 		{
-			u32 http_bitrate = gf_term_get_option(term, GF_OPT_HTTP_MAX_RATE);	
+			u32 http_bitrate = gf_term_get_option(term, GF_OPT_HTTP_MAX_RATE);
 			do {
 				fprintf(stderr, "Enter new http bitrate in bps (0 for none) - current limit: %d\n", http_bitrate);
 			} while (1 > scanf("%ud", &http_bitrate));
 
 			gf_term_set_option(term, GF_OPT_HTTP_MAX_RATE, http_bitrate);
 		}
-			break;
+		break;
 
 		case 'E':
-			gf_term_set_option(term, GF_OPT_RELOAD_CONFIG, 1); 
+			gf_term_set_option(term, GF_OPT_RELOAD_CONFIG, 1);
 			break;
 
 		case 'B':
@@ -1791,13 +1941,13 @@
 			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;
+			if (1 > scanf("%[^\t\n]", szOpt)) {
+				fprintf(stderr, "Cannot read option\n");
+				break;
 			}
 			set_cfg_option(szOpt);
 		}
-			break;
+		break;
 
 		/*extract to PNG*/
 		case 'Z':
@@ -1828,7 +1978,7 @@
 					sprintf(szFileName, "view%d_dump.png", offscreen_view);
 					e = gf_term_get_offscreen_buffer(term, &fb, offscreen_view-1, 0);
 				} else {
-					sprintf(szFileName, "video_dump.png");
+					sprintf(szFileName, "gpac_video_dump_"LLU".png", gf_net_get_utc() );
 					e = gf_term_get_screen_buffer(term, &fb);
 				}
 				offscreen_view++;
@@ -1862,7 +2012,34 @@
 			}
 			fprintf(stderr, "Done: %s\n", szFileName);
 		}
-			break;
+		break;
+
+		case 'G':
+		{
+			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);
+			szOpt[0] = 0;
+			if (1 > scanf("%[^\t\n]", szOpt)) {
+				fprintf(stderr, "Cannot read OD ID\n");
+				break;
+			}
+			index = atoi(szOpt);
+			odm = NULL;
+			root_od = gf_term_get_root_object(term);
+			if (root_od) {
+				odm = gf_term_get_object(term, root_od, index);
+				if (odm) {
+					gf_term_select_object(term, odm);
+				} else {
+					fprintf(stderr, "Cannot find object at index %d - trying with serviceID\n", index);
+					gf_term_select_service(term, root_od, index);
+				}
+			}
+		}
+		break;
 
 		case 'h':
 			PrintHelp();
@@ -1872,7 +2049,7 @@
 		}
 	}
 
-	if (bench_mode) { 
+	if (bench_mode) {
 		PrintAVInfo(GF_TRUE);
 	}
 
@@ -1882,8 +2059,13 @@
 
 	fprintf(stderr, "Deleting terminal... ");
 	if (playlist) fclose(playlist);
-	gf_term_del(term);
-	fprintf(stderr, "done (in %d ms)\n", gf_sys_clock() - i);
+
+#if defined(__DARWIN__) || defined(__APPLE__)
+    carbon_uninit();
+#endif
+	
+    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);
@@ -1947,7 +2129,7 @@
 		}
 	}
 
-	if (bench_buffer) {
+	if (0 && bench_buffer) {
 		fprintf(stderr, "Buffering %d %% ", bench_buffer-1);
 		return;
 	}
@@ -1958,9 +2140,9 @@
 			return;
 		}
 		avg_dec_time = 0;
-		if (v_odi.nb_dec_frames && v_odi.total_dec_time) { 
-			avg_dec_time = (Float) 1000000 * v_odi.nb_dec_frames; 
-			avg_dec_time /= v_odi.total_dec_time; 
+		if (v_odi.nb_dec_frames && v_odi.total_dec_time) {
+			avg_dec_time = (Float) 1000000 * v_odi.nb_dec_frames;
+			avg_dec_time /= v_odi.total_dec_time;
 		}
 	}
 	if (print_codecs && audio_odm) {
@@ -1979,9 +2161,9 @@
 		if (!video_odm) {
 			u32 nb_frames_drawn;
 			Double FPS = gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-			fprintf(stderr, "Drawn %d frames FPS %.2f (simulation FPS %.2f) - duration %d ms\n", nb_frames_drawn, ((Float)nb_frames_drawn*1000)/tot_time, FPS, gf_term_get_time_in_ms(term)  );
+			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);
@@ -1989,7 +2171,7 @@
 				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 "LLU" 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);
+				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_droped) {
 					fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_droped);
 				}
@@ -2007,17 +2189,17 @@
 					fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_droped);
 				}
 				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.width, s_odi.height, w, h, s_odi.duration);
 			if (final) {
-				if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) { 
+				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 "LLD" 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, "%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;
@@ -2038,24 +2220,33 @@
 		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 frames 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.instant_bitrate/1000);
 	}
 	else if (scene_odm) {
 
 		avg_dec_time = 0;
-		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.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 frames %.2f ("LLU" 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.instant_bitrate/1000);
 		} 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 frames FPS %.2f (abs %.2f) ", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
+			fprintf(stderr, "%d f FPS %.2f (abs %.2f) ", 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);
+		}
+		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 ) );
+		fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max)", a_odi.nb_dec_frames, ((Float)tot_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0);
+	}
 }
 
 void PrintWorldInfo(GF_Terminal *term)
@@ -2091,7 +2282,7 @@
 	if (!root_odm) return;
 
 	count = gf_term_get_current_service_id(term);
-	if (count) 
+	if (count)
 		fprintf(stderr, "Current service ID %d\n", count);
 
 	if (gf_term_get_object_info(term, root_odm, &odi) != GF_OK) return;
@@ -2100,9 +2291,9 @@
 		return;
 	}
 
-	for (i=0;i<indent;i++) szIndent[i]=' ';
+	for (i=0; i<indent; i++) szIndent[i]=' ';
 	szIndent[indent]=0;
-	
+
 	fprintf(stderr, "%s", szIndent);
 	fprintf(stderr, "#%d %s - ", num, root_name);
 	if (odi.od->ServiceID) fprintf(stderr, "Service ID %d ", odi.od->ServiceID);
@@ -2160,7 +2351,7 @@
 
 	odm = NULL;
 	if ((!OD_ID && (number == (u32)(-1))) ||
-		((OD_ID == (u32)(-1)) && !number)) {
+	        ((OD_ID == (u32)(-1)) && !number)) {
 		odm = root_odm;
 		if ((gf_term_get_object_info(term, odm, &odi) != GF_OK)) odm=NULL;
 	} else {
@@ -2182,7 +2373,7 @@
 	}
 	if (!odi.od) {
 		if (number == (u32)-1) fprintf(stderr, "Object %d not attached yet\n", OD_ID);
-		else fprintf(stderr, "Object #%d not attached yet\n", number);		
+		else fprintf(stderr, "Object #%d not attached yet\n", number);
 		return;
 	}
 
@@ -2193,8 +2384,8 @@
 
 	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, "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);
@@ -2202,16 +2393,15 @@
 
 	fprintf(stderr, "Object Duration: ");
 	if (odi.duration) {
-	  PrintTime((u32) (odi.duration*1000));
+		PrintTime((u32) (odi.duration*1000));
 	} else {
-	  fprintf(stderr, "unknown");
+		fprintf(stderr, "unknown");
 	}
 	fprintf(stderr, "\n");
 
-	if (odi.owns_service) {
-		fprintf(stderr, "Service Handler: %s\n", odi.service_handler);
-		fprintf(stderr, "Service URL: %s\n", odi.service_url);
-	}		
+	fprintf(stderr, "Service Handler: %s\n", odi.service_handler);
+	fprintf(stderr, "Service URL: %s\n", odi.service_url);
+
 	if (odi.codec_name) {
 		Float avg_dec_time;
 		switch (odi.od_type) {
@@ -2242,14 +2432,14 @@
 			fprintf(stderr, "Text Codec %s\n", odi.codec_name);
 			break;
 		}
-	
+
 		avg_dec_time = 0;
-		if (odi.nb_dec_frames) { 
-			avg_dec_time = (Float) odi.total_dec_time; 
-			avg_dec_time /= odi.nb_dec_frames; 
+		if (odi.nb_dec_frames) {
+			avg_dec_time = (Float) odi.total_dec_time;
+			avg_dec_time /= odi.nb_dec_frames;
 		}
-		fprintf(stderr, "\tBitrate over last second: %d kbps\n\tMax bitrate over one second: %d kbps\n\tAverage Decoding Time %.2f ms ("LLU" max)\n\tTotal decoded frames %d\n", 
-			(u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames);
+		fprintf(stderr, "\tBitrate over last second: %d kbps\n\tMax bitrate over one second: %d kbps\n\tAverage Decoding Time %.2f us %d max)\n\tTotal decoded frames %d\n",
+		        (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames);
 	}
 	if (odi.protection) fprintf(stderr, "Encrypted Media%s\n", (odi.protection==2) ? " NOT UNLOCKED" : "");
 
@@ -2310,25 +2500,17 @@
 
 		/*check language*/
 		if (esd->langDesc) {
-			u32 i=0;
-			char lan[4], *szLang;
+			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;
 
-			if ((lan[0]=='u') && (lan[1]=='n') && (lan[2]=='d')) szLang = "Undetermined";
-			else {
-				szLang = lan;
-				while (GF_ISO639_Lang[i]) {
-					if (GF_ISO639_Lang[i+2][0] && strstr(GF_ISO639_Lang[i+1], lan)) {
-						szLang = (char*) GF_ISO639_Lang[i];
-						break;
-					}
-					i+=3;
-				}
+			lang_idx = gf_lang_find(lan);
+			if (lang_idx>=0) {
+				fprintf(stderr, "\tStream Language: %s\n", gf_lang_get_name(lang_idx));
 			}
-			fprintf(stderr, "\tStream Language: %s\n", szLang);
 		}
 	}
 	fprintf(stderr, "\n");
@@ -2344,7 +2526,7 @@
 				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;
+			break;
 			case GF_ODF_CC_NAME_TAG:
 			{
 				GF_CC_Name *ccn = (GF_CC_Name *)desc;
@@ -2355,14 +2537,14 @@
 					fprintf(stderr, "\t%s\n", ci->contentCreatorName);
 				}
 			}
-				break;
+			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;
+			{
+				GF_ShortTextual *std = (GF_ShortTextual *)desc;
+				fprintf(stderr, "Description:\n\tEvent: %s\n\t%s\n", std->eventName, std->eventText);
+			}
+			break;
 			default:
 				break;
 			}
@@ -2371,11 +2553,21 @@
 	}
 
 	switch (odi.status) {
-	case 0: fprintf(stderr, "Stopped - "); break;
-	case 1: fprintf(stderr, "Playing - "); break;
-	case 2: fprintf(stderr, "Paused - "); break;
-	case 3: fprintf(stderr, "Not setup yet\n"); return;
-	default: fprintf(stderr, "Setup Failed\n"); return;
+	case 0:
+		fprintf(stderr, "Stopped - ");
+		break;
+	case 1:
+		fprintf(stderr, "Playing - ");
+		break;
+	case 2:
+		fprintf(stderr, "Paused - ");
+		break;
+	case 3:
+		fprintf(stderr, "Not setup yet\n");
+		return;
+	default:
+		fprintf(stderr, "Setup Failed\n");
+		return;
 	}
 	if (odi.buffer>=0) fprintf(stderr, "Buffer: %d ms - ", odi.buffer);
 	else fprintf(stderr, "Not buffering - ");
@@ -2426,9 +2618,11 @@
 	}
 }
 
-void PrintODTiming(GF_Terminal *term, GF_ObjectManager *odm)
+void PrintODTiming(GF_Terminal *term, GF_ObjectManager *odm, u32 indent)
 {
 	GF_MediaInfo odi;
+	u32 ind = indent;
+	u32 i, count;
 	if (!odm) return;
 
 	if (gf_term_get_object_info(term, odm, &odi) != GF_OK) return;
@@ -2436,25 +2630,50 @@
 		fprintf(stderr, "Service not attached\n");
 		return;
 	}
+	while (ind) {
+		fprintf(stderr, " ");
+		ind--;
+	}
 
-	fprintf(stderr, "OD %d: ", odi.od->objectDescriptorID);
-	switch (odi.status) {
-	case 1: fprintf(stderr, "Playing - "); break;
-	case 2: fprintf(stderr, "Paused - "); break;
-	default: fprintf(stderr, "Stopped - "); break;
+	if (! odi.generated_scene) {
+
+		fprintf(stderr, "- OD %d: ", odi.od->objectDescriptorID);
+		switch (odi.status) {
+		case 1:
+			fprintf(stderr, "Playing - ");
+			break;
+		case 2:
+			fprintf(stderr, "Paused - ");
+			break;
+		default:
+			fprintf(stderr, "Stopped - ");
+			break;
+		}
+		if (odi.buffer>=0) fprintf(stderr, "Buffer: %d ms - ", odi.buffer);
+		else fprintf(stderr, "Not buffering - ");
+		fprintf(stderr, "Clock drift: %d ms", odi.clock_drift);
+		fprintf(stderr, " - time: ");
+		PrintTime((u32) (odi.current_time*1000));
+		fprintf(stderr, "\n");
+
+	} else {
+		fprintf(stderr, "+ Service %s:\n", odi.service_url);
 	}
-	if (odi.buffer>=0) fprintf(stderr, "Buffer: %d ms - ", odi.buffer);
-	else fprintf(stderr, "Not buffering - ");
-	fprintf(stderr, "Clock drift: %d ms", odi.clock_drift);
-	fprintf(stderr, " - time: ");
-	PrintTime((u32) (odi.current_time*1000));
-	fprintf(stderr, "\n");
+
+	count = gf_term_get_object_count(term, odm);
+	for (i=0; i<count; i++) {
+		GF_ObjectManager *an_odm = gf_term_get_object(term, odm, i);
+		PrintODTiming(term, an_odm, indent+1);
+	}
+	return;
+
 }
 
-void PrintODBuffer(GF_Terminal *term, GF_ObjectManager *odm)
+void PrintODBuffer(GF_Terminal *term, GF_ObjectManager *odm, u32 indent)
 {
 	Float avg_dec_time;
 	GF_MediaInfo odi;
+	u32 ind, i, count;
 	if (!odm) return;
 
 	if (gf_term_get_object_info(term, odm, &odi) != GF_OK) return;
@@ -2463,42 +2682,72 @@
 		return;
 	}
 
-	fprintf(stderr, "OD %d: ", odi.od->objectDescriptorID);
-	switch (odi.status) {
-	case 1: fprintf(stderr, "Playing"); break;
-	case 2: fprintf(stderr, "Paused"); break;
-	default: fprintf(stderr, "Stopped"); break;
+	ind = indent;
+	while (ind) {
+		fprintf(stderr, " ");
+		ind--;
 	}
-	if (odi.buffer>=0) fprintf(stderr, " - Buffer: %d ms", odi.buffer);
-	if (odi.db_unit_count) fprintf(stderr, " - DB: %d AU", odi.db_unit_count);
-	if (odi.cb_max_count) fprintf(stderr, " - CB: %d/%d CUs", odi.cb_unit_count, odi.cb_max_count);
-	
-	fprintf(stderr, "\n * %d decoded frames - %d dropped frames\n", odi.nb_dec_frames, odi.nb_droped);
-	avg_dec_time = 0;
-	if (odi.nb_dec_frames) { avg_dec_time = (Float) odi.total_dec_time; avg_dec_time /= odi.nb_dec_frames; }
-	fprintf(stderr, " * Avg Bitrate %d kbps (%d max) - Avg Decoding Time %.2f ms ("LLU" max)\n",
-								(u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time);
+
+	if (odi.generated_scene) {
+		fprintf(stderr, "+ Service %s:\n", odi.service_url);
+	} else {
+		fprintf(stderr, "- OD %d: ", odi.od->objectDescriptorID);
+		switch (odi.status) {
+		case 1:
+			fprintf(stderr, "Playing");
+			break;
+		case 2:
+			fprintf(stderr, "Paused");
+			break;
+		default:
+			fprintf(stderr, "Stopped");
+			break;
+		}
+		if (odi.buffer>=0) fprintf(stderr, " - Buffer: %d ms", odi.buffer);
+		if (odi.db_unit_count) fprintf(stderr, " - DB: %d AU", odi.db_unit_count);
+		if (odi.cb_max_count) fprintf(stderr, " - CB: %d/%d CUs", odi.cb_unit_count, odi.cb_max_count);
+
+		fprintf(stderr, "\n");
+		ind = indent;
+		while (ind) {
+			fprintf(stderr, " ");
+			ind--;
+		}
+
+		fprintf(stderr, " %d decoded frames - %d dropped frames\n", odi.nb_dec_frames, odi.nb_droped);
+
+		ind = indent;
+		while (ind) {
+			fprintf(stderr, " ");
+			ind--;
+		}
+
+		avg_dec_time = 0;
+		if (odi.nb_dec_frames) {
+			avg_dec_time = (Float) odi.total_dec_time;
+			avg_dec_time /= odi.nb_dec_frames;
+		}
+		fprintf(stderr, " Avg Bitrate %d kbps (%d max) - Avg Decoding Time %.2f us (%d max)\n",
+		        (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time);
+	}
+
+	count = gf_term_get_object_count(term, odm);
+	for (i=0; i<count; i++) {
+		GF_ObjectManager *an_odm = gf_term_get_object(term, odm, i);
+		PrintODBuffer(term, an_odm, indent+1);
+	}
+
 }
 
 void ViewODs(GF_Terminal *term, Bool show_timing)
 {
-	u32 i, count;
-	GF_ObjectManager *odm, *root_odm = gf_term_get_root_object(term);
+	GF_ObjectManager *root_odm = gf_term_get_root_object(term);
 	if (!root_odm) return;
 
 	if (show_timing) {
-		PrintODTiming(term, root_odm);
+		PrintODTiming(term, root_odm, 0);
 	} else {
-		PrintODBuffer(term, root_odm);
-	}
-	count = gf_term_get_object_count(term, root_odm);
-	for (i=0; i<count; i++) {
-		odm = gf_term_get_object(term, root_odm, i);
-		if (show_timing) {
-			PrintODTiming(term, odm);
-		} else {
-			PrintODBuffer(term, odm);
-		}
+		PrintODBuffer(term, root_odm, 0);
 	}
 	fprintf(stderr, "\n");
 }
@@ -2511,9 +2760,9 @@
 	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 (1 > scanf("%s", szName)) {
+		fprintf(stderr, "No section name, aborting.\n");
+		return;
 	}
 	if (strcmp(szName, "*")) secName = szName;

gpac-0.5.0.svn5178.tar.bz2/applications/mp4client/resource.h -> gpac-0.5.1.svn5491.tar.xz/applications/mp4client/resource.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_android/jni/wrapper.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_android/jni/wrapper.cpp Changed

@@ -53,97 +53,134 @@
 
 static pthread_key_t jni_thread_env_key = 0;
 
+//these two are used by modumles - define them when using static module build
+#ifdef GPAC_STATIC_MODULES
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JavaVM* GetJavaVM()
+{
+	return javaVM;
+}
+
+JNIEnv* GetEnv()
+{
+	JNIEnv* env = 0;
+	if (javaVM) javaVM->GetEnv((void**)(&env), JNI_VERSION_1_2);
+	return env;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
 /**
  * This method is called when a pthread is destroyed, so we can delete the JNI env
  */
 static void jni_destroy_env_func(void * env) {
-  LOGI("Destroying a thread with attached data, env=%p.\n", env);
-  JavaEnvTh * jniEnv = (JavaEnvTh *) env;
-  if (jniEnv){
-    /*jniEnv->env->DeleteLocalRef(&jniEnv->cbk_displayMessage);
-    jniEnv->env->DeleteLocalRef(&jniEnv->cbk_onProgress);
-    jniEnv->env->DeleteLocalRef(&jniEnv->cbk_showKeyboard);
-    jniEnv->env->DeleteLocalRef(&jniEnv->cbk_setCaption);
-    jniEnv->env->DeleteLocalRef(&jniEnv->cbk_onLog);*/
-    memset(jniEnv, 0, sizeof(JavaEnvTh));
-    gf_free(jniEnv);
-  }
-  pthread_setspecific(jni_thread_env_key, NULL);
-  if (javaVM)
-    javaVM->DetachCurrentThread();
+	LOGI("Destroying a thread with attached data, env=%p.\n", env);
+	JavaEnvTh * jniEnv = (JavaEnvTh *) env;
+	if (jniEnv) {
+		/*jniEnv->env->DeleteLocalRef(&jniEnv->cbk_displayMessage);
+		jniEnv->env->DeleteLocalRef(&jniEnv->cbk_onProgress);
+		jniEnv->env->DeleteLocalRef(&jniEnv->cbk_showKeyboard);
+		jniEnv->env->DeleteLocalRef(&jniEnv->cbk_setCaption);
+		jniEnv->env->DeleteLocalRef(&jniEnv->cbk_onLog);*/
+		memset(jniEnv, 0, sizeof(JavaEnvTh));
+		gf_free(jniEnv);
+	}
+	pthread_setspecific(jni_thread_env_key, NULL);
+	if (javaVM)
+		javaVM->DetachCurrentThread();
 }
 
 static int jniRegisterNativeMethods(JNIEnv* env, const char* className,
-    const JNINativeMethod* gMethods, int numMethods)
+                                    const JNINativeMethod* gMethods, int numMethods)
 {
-    int res;
-    jclass clazz;
-    clazz = env->FindClass(className);
-    if (clazz == NULL) {
-        LOGE("Native registration unable to find class '%s'\n", className);
-        return -1;
-    }
-    LOGI("Registering %d methods...\n", numMethods );
-    res = env->RegisterNatives(clazz, gMethods, numMethods);
-    if (res < 0) {
-        LOGE("RegisterNatives failed for '%s'\n", className);
-        return res;
-    }
-    return 0;
+	int res;
+	jclass clazz;
+	clazz = env->FindClass(className);
+	if (clazz == NULL) {
+		LOGE("Native registration unable to find class '%s'\n", className);
+		return -1;
+	}
+	LOGI("Registering %d methods...\n", numMethods );
+	res = env->RegisterNatives(clazz, gMethods, numMethods);
+	if (res < 0) {
+		LOGE("RegisterNatives failed for '%s'\n", className);
+		return res;
+	}
+	return 0;
 }
 
 static JNINativeMethod sMethods[] = {
-     /* name, signature, funcPtr */
-
-    {"createInstance",
-      "(Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J",
-      (void*)&Java_com_gpac_Osmo4_GPACInstance_createInstance},
-    {"gpacdisconnect",
-      "()V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_gpacdisconnect},
-    {"gpacrender",
-      "()V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_gpacrender},
-    {"gpacresize",
-      "(II)V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_gpacresize},
-    {"gpacfree",
-      "()V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_gpacfree},
-    {"gpaceventkeypress",
-      "(IIIII)V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventkeypress},
-    {"gpaceventmousedown",
-      "(FF)V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmousedown},
-    {"gpaceventmouseup",
-      "(FF)V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmouseup},
-    {"gpaceventmousemove",
-      "(FF)V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmousemove},
-    {"setGpacPreference",
-      "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
-      (void*)Java_com_gpac_Osmo4_GPACInstance_setGpacPreference},
-    {"setGpacLogs",
-    "(Ljava/lang/String;)V",
-	  (void*)Java_com_gpac_Osmo4_GPACInstance_setGpacLogs},
-      NULL
+	/* name, signature, funcPtr */
+
+	{	"createInstance",
+		"(Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J",
+		(void*)&Java_com_gpac_Osmo4_GPACInstance_createInstance
+	},
+	{	"gpacdisconnect",
+		"()V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_gpacdisconnect
+	},
+	{	"gpacrender",
+		"()V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_gpacrender
+	},
+	{	"gpacresize",
+		"(II)V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_gpacresize
+	},
+	{	"gpacfree",
+		"()V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_gpacfree
+	},
+	{	"gpaceventkeypress",
+		"(IIIII)V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventkeypress
+	},
+	{	"gpaceventmousedown",
+		"(FF)V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmousedown
+	},
+	{	"gpaceventmouseup",
+		"(FF)V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmouseup
+	},
+	{	"gpaceventmousemove",
+		"(FF)V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmousemove
+	},
+	{	"setGpacPreference",
+		"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_setGpacPreference
+	},
+	{	"setGpacLogs",
+		"(Ljava/lang/String;)V",
+		(void*)Java_com_gpac_Osmo4_GPACInstance_setGpacLogs
+	},
+	NULL
 };
 
 
-jint JNI_OnUnLoad(JavaVM* vm, void* reserved){
-  LOGI("Deleting library, vm=%p...\n", vm);
-  if (pthread_key_delete(jni_thread_env_key)){
-    LOGW("Failed to delete key jni_thread_env_key jni_thread_env_key=%p\n", jni_thread_env_key);
-  }
-  javaVM = NULL;
-  jni_thread_env_key = NULL;
+jint JNI_OnUnLoad(JavaVM* vm, void* reserved) {
+	LOGI("Deleting library, vm=%p...\n", vm);
+	if (pthread_key_delete(jni_thread_env_key)) {
+		LOGW("Failed to delete key jni_thread_env_key jni_thread_env_key=%p\n", jni_thread_env_key);
+	}
+	javaVM = NULL;
+	jni_thread_env_key = (int) NULL;
 }
 
 #define NUM_JNI_VERSIONS 4
 //---------------------------------------------------------------------------------------------------
-jint JNI_OnLoad(JavaVM* vm, void* reserved){
+jint JNI_OnLoad(JavaVM* vm, void* reserved) {
 	int res;
 	int jniV;
 	int allowedVersions[NUM_JNI_VERSIONS];
@@ -155,29 +192,29 @@
 	JNIEnv * env;
 	if (!vm)
 		return -1;
-	for (int i = 0 ; i < NUM_JNI_VERSIONS; i++){
+	for (int i = 0 ; i < NUM_JNI_VERSIONS; i++) {
 		jniV = allowedVersions[i];
-		if (vm->GetEnv((void**)(&env), jniV) == JNI_OK){
+		if (vm->GetEnv((void**)(&env), jniV) == JNI_OK) {
 			LOGI("Selected JNI VERSION[%d]\n", i);
 			break;
 		} else {
-			if (i == NUM_JNI_VERSIONS - 1){
+			if (i == NUM_JNI_VERSIONS - 1) {
 				LOGW("Failed to find any supported JNI VERSION of the %d proposed.", NUM_JNI_VERSIONS);
 				return -1;
 			}
 		}
-		
+
 	}
 	javaVM = vm;
 	LOGI("Registering %s natives\n", className);
 	res = jniRegisterNativeMethods(env, className, sMethods, (sizeof(sMethods) - 1)/sizeof(JNINativeMethod));
-	if (res < 0){
+	if (res < 0) {
 		LOGE("Failed to register native methods, result was = %d, try to continue anyway...\n", res);
-					/*return -1;*/
+		/*return -1;*/
 	}
 	LOGI("Registering natives DONE, now registering pthread_keys with destructor=%p\n", &jni_destroy_env_func);
 	int ret = pthread_key_create(&jni_thread_env_key, &jni_destroy_env_func);
-	if (ret){
+	if (ret) {
 		LOGE("Failed to register jni_thread_env_key jni_thread_env_key=%p\n", jni_thread_env_key);
 	}
 	return jniV;
@@ -187,10 +224,10 @@
 //CNativeWrapper
 //-------------------------------
 
-CNativeWrapper::CNativeWrapper(){
+CNativeWrapper::CNativeWrapper() {
 	do_log = 1;
-  m_term = NULL;
-  m_mx = NULL;
+	m_term = NULL;
+	m_mx = NULL;
 	mainJavaEnv = NULL;
 #ifndef GPAC_GUI_ONLY
 	memset(&m_user, 0, sizeof(GF_User));
@@ -198,119 +235,119 @@
 #endif
 }
 //-------------------------------
-CNativeWrapper::~CNativeWrapper(){
-      debug_log("~CNativeWrapper()");
-      JavaEnvTh * env = getEnv();
-      if (env && env->cbk_obj)
-        env->env->DeleteGlobalRef(env->cbk_obj);
-      Shutdown();
-      debug_log("~CNativeWrapper() : DONE\n");
+CNativeWrapper::~CNativeWrapper() {
+	debug_log("~CNativeWrapper()");
+	JavaEnvTh * env = getEnv();
+	if (env && env->cbk_obj)
+		env->env->DeleteGlobalRef(env->cbk_obj);
+	Shutdown();
+	debug_log("~CNativeWrapper() : DONE\n");
 }
 //-------------------------------
-void CNativeWrapper::debug_log(const char* msg){
-  LOGV("%s", msg);
+void CNativeWrapper::debug_log(const char* msg) {
+	LOGV("%s", msg);
 }
 //-------------------------------
 void CNativeWrapper::Shutdown()
 {
-    debug_log("shutdown");
-    if (m_term)
-	gf_term_disconnect(m_term);
-    if (m_mx)
-        gf_mx_del(m_mx);
-    m_mx = NULL;
+	debug_log("shutdown");
+	if (m_term)
+		gf_term_disconnect(m_term);
+	if (m_mx)
+		gf_mx_del(m_mx);
+	m_mx = NULL;
 #ifndef GPAC_GUI_ONLY
-    if (m_term) {
+	if (m_term) {
 		GF_Terminal *t = m_term;
 		m_term = NULL;
 		gf_term_del(t);
-    }
-    if (m_user.config) {
+	}
+	if (m_user.config) {
 		gf_cfg_del(m_user.config);
 		m_user.config = NULL;
-    }
-    if (m_user.modules) {
+	}
+	if (m_user.modules) {
 		gf_modules_del(m_user.modules);
 		m_user.modules = NULL;
-    }
+	}
 #endif
-    m_term = NULL;
-    gf_sys_close();
-    debug_log("shutdown end");
-}
-
-void CNativeWrapper::setJavaEnv(JavaEnvTh * envToSet, JNIEnv *env, jobject callback){
-    assert( envToSet );
-    jclass localRef = env->GetObjectClass(callback);
-    envToSet->env = env;
-    envToSet->javaThreadId = gf_th_id();
-    envToSet->cbk_obj = callback;
-    envToSet->cbk_displayMessage =
-      env->GetMethodID(localRef, "displayMessage", "(Ljava/lang/String;Ljava/lang/String;I)V");
-    envToSet->cbk_onProgress =
-      env->GetMethodID(localRef, "onProgress", "(Ljava/lang/String;II)V");
-    envToSet->cbk_onLog =
-      env->GetMethodID(localRef, "onLog", "(IILjava/lang/String;)V");
-    envToSet->cbk_setCaption =
-      env->GetMethodID(localRef, "setCaption", "(Ljava/lang/String;)V");
-    envToSet->cbk_showKeyboard =
-      env->GetMethodID(localRef, "showKeyboard", "(Z)V");
-    env->DeleteLocalRef(localRef);
-}
-
-static u32 beforeThreadExits(void * param){
+	m_term = NULL;
+	gf_sys_close();
+	debug_log("shutdown end");
+}
+
+void CNativeWrapper::setJavaEnv(JavaEnvTh * envToSet, JNIEnv *env, jobject callback) {
+	assert( envToSet );
+	jclass localRef = env->GetObjectClass(callback);
+	envToSet->env = env;
+	envToSet->javaThreadId = gf_th_id();
+	envToSet->cbk_obj = callback;
+	envToSet->cbk_displayMessage =
+	    env->GetMethodID(localRef, "displayMessage", "(Ljava/lang/String;Ljava/lang/String;I)V");
+	envToSet->cbk_onProgress =
+	    env->GetMethodID(localRef, "onProgress", "(Ljava/lang/String;II)V");
+	envToSet->cbk_onLog =
+	    env->GetMethodID(localRef, "onLog", "(IILjava/lang/String;)V");
+	envToSet->cbk_setCaption =
+	    env->GetMethodID(localRef, "setCaption", "(Ljava/lang/String;)V");
+	envToSet->cbk_showKeyboard =
+	    env->GetMethodID(localRef, "showKeyboard", "(Z)V");
+	env->DeleteLocalRef(localRef);
+}
+
+static u32 beforeThreadExits(void * param) {
 	/* Ivica - I think there is no need for this because the detach is done in jni_destroy_env_func()
-  /*LOGI("Before Thread exist, detach the JavaVM from Thread for thread %p...\n", gf_th_current());
-   if (javaVM)
-    javaVM->DetachCurrentThread();
-    */
-}
-
-JavaEnvTh * CNativeWrapper::getEnv(){
-    JNIEnv *env;
-    JavaEnvTh * javaEnv;
-    if (!javaVM){
-      debug_log("************* No JVM Found ************");
-      return NULL;
-    }
-    javaEnv = (JavaEnvTh*) pthread_getspecific( jni_thread_env_key );
-    if (javaEnv)
-      return javaEnv;
-    javaEnv = (JavaEnvTh *) gf_malloc(sizeof(JavaEnvTh));
-    if (!javaEnv)
-      return NULL;
-    memset(javaEnv, 0, sizeof(JavaEnvTh));
-    javaVM->AttachCurrentThread(&env, NULL);
-    if (!env){
-      LOGE("Attaching to thread did failed for thread id=%d", gf_th_id());
-      gf_free(javaEnv);
-      return NULL;
-    }
-    LOGI("Rebuilding methods for thread %d", gf_th_id());
-    setJavaEnv(javaEnv, env, mainJavaEnv->cbk_obj);
-    if (pthread_setspecific(jni_thread_env_key, javaEnv)){
-      LOGE("Failed to set specific thread data to jni_thread_env_key for thread=%d. No ENV available !", gf_th_id());
-      gf_free(javaEnv);
-      return NULL;
-    }
-    GF_Thread * t;
-    LOGI("Getting current Thread %d...", gf_th_id());
-    t = gf_th_current();
-    LOGI("Getting current Thread DONE = %p, now registering before exit...", t);
-
-    if (GF_OK != gf_register_before_exit_function(gf_th_current(), &beforeThreadExits)){
-      LOGE("Failed to register exit function for thread %p, no javaEnv for current thread.", gf_th_current());
-      //javaVM->DetachCurrentThread();
-      gf_free(javaEnv);
-      javaEnv = NULL;
-    }
-    LOGI("Registering DONE for %d", gf_th_id());
-    return javaEnv;
+	/*LOGI("Before Thread exist, detach the JavaVM from Thread for thread %p...\n", gf_th_current());
+	if (javaVM)
+	javaVM->DetachCurrentThread();
+	*/
+}
+
+JavaEnvTh * CNativeWrapper::getEnv() {
+	JNIEnv *env;
+	JavaEnvTh * javaEnv;
+	if (!javaVM) {
+		debug_log("************* No JVM Found ************");
+		return NULL;
+	}
+	javaEnv = (JavaEnvTh*) pthread_getspecific( jni_thread_env_key );
+	if (javaEnv)
+		return javaEnv;
+	javaEnv = (JavaEnvTh *) gf_malloc(sizeof(JavaEnvTh));
+	if (!javaEnv)
+		return NULL;
+	memset(javaEnv, 0, sizeof(JavaEnvTh));
+	javaVM->AttachCurrentThread(&env, NULL);
+	if (!env) {
+		LOGE("Attaching to thread did failed for thread id=%d", gf_th_id());
+		gf_free(javaEnv);
+		return NULL;
+	}
+	LOGI("Rebuilding methods for thread %d", gf_th_id());
+	setJavaEnv(javaEnv, env, mainJavaEnv->cbk_obj);
+	if (pthread_setspecific(jni_thread_env_key, javaEnv)) {
+		LOGE("Failed to set specific thread data to jni_thread_env_key for thread=%d. No ENV available !", gf_th_id());
+		gf_free(javaEnv);
+		return NULL;
+	}
+	GF_Thread * t;
+	LOGI("Getting current Thread %d...", gf_th_id());
+	t = gf_th_current();
+	LOGI("Getting current Thread DONE = %p, now registering before exit...", t);
+
+	if (GF_OK != gf_register_before_exit_function(gf_th_current(), &beforeThreadExits)) {
+		LOGE("Failed to register exit function for thread %p, no javaEnv for current thread.", gf_th_current());
+		//javaVM->DetachCurrentThread();
+		gf_free(javaEnv);
+		javaEnv = NULL;
+	}
+	LOGI("Registering DONE for %d", gf_th_id());
+	return javaEnv;
 }
 
 
 //-------------------------------
-int CNativeWrapper::MessageBox(const char* msg, const char* title, GF_Err status){
+int CNativeWrapper::MessageBox(const char* msg, const char* title, GF_Err status) {
 	LOGV("MessageBox start %s", msg);
 	JavaEnvTh * env = getEnv();
 	if (!env || !env->cbk_displayMessage)
@@ -324,13 +361,13 @@
 	return 1;
 }
 //-------------------------------
-void CNativeWrapper::DisplayRTI(){
+void CNativeWrapper::DisplayRTI() {
 #ifndef GPAC_GUI_ONLY
 	// display some system informations ?
 #endif
 }
 //-------------------------------
-int CNativeWrapper::Quit(int code){
+int CNativeWrapper::Quit(int code) {
 
 	Shutdown();
 	// send shutdown request to java
@@ -339,257 +376,257 @@
 
 #include <stdio.h>
 
-void CNativeWrapper::on_fm_request(void *cbk, u32 type, u32 param, int *value){
+void CNativeWrapper::on_fm_request(void *cbk, u32 type, u32 param, int *value) {
 	CNativeWrapper * self = (CNativeWrapper *) cbk;
 	JavaEnvTh *envth = self->getEnv();
 
 	envth->env->PushLocalFrame(1);
 	switch(type) {
-		case 0: // Get PI
-		case 1: // Get RT
-		case 2: // Get PS
-			jint jvalue;
-			jvalue = envth->env->CallIntMethod(envth->cbk_obj, envth->cbk_onFmRequest, type, param);
-			*value = (int)jvalue;
-			break;
-		case 3: // Set Freq
-		case 4: // Set Volume
-			envth->env->CallVoidMethod(envth->cbk_obj, envth->cbk_onFmRequest, type, param);
-			break;
+	case 0: // Get PI
+	case 1: // Get RT
+	case 2: // Get PS
+		jint jvalue;
+		jvalue = envth->env->CallIntMethod(envth->cbk_obj, envth->cbk_onFmRequest, type, param);
+		*value = (int)jvalue;
+		break;
+	case 3: // Set Freq
+	case 4: // Set Volume
+		envth->env->CallVoidMethod(envth->cbk_obj, envth->cbk_onFmRequest, type, param);
+		break;
 	}
 	envth->env->PopLocalFrame(NULL);
 }
 
 
 //-------------------------------
-void CNativeWrapper::on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list){
+void CNativeWrapper::on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list) {
 	char szMsg[4096];
-        const char * tag;
-        char unknTag[32];
-        int debug = ANDROID_LOG_DEBUG;
-        vsnprintf(szMsg, 4096, fmt, list);
-        CNativeWrapper * self = (CNativeWrapper *) cbk;
-        if (!self)
-          goto displayInAndroidlogs;
-
-        {
-          JavaEnvTh *env = self->getEnv();
-          jstring msg;
-          
-          if (!env || !env->cbk_onLog)
-                goto displayInAndroidlogs;
-		  
-		  env->env->PushLocalFrame(1);
-          msg = env->env->NewStringUTF(szMsg);
-          env->env->CallVoidMethod(env->cbk_obj, env->cbk_onLog, debug, lm, msg);
-		  env->env->PopLocalFrame(NULL);
-          return;
-        }
+	const char * tag;
+	char unknTag[32];
+	int debug = ANDROID_LOG_DEBUG;
+	vsnprintf(szMsg, 4096, fmt, list);
+	CNativeWrapper * self = (CNativeWrapper *) cbk;
+	if (!self)
+		goto displayInAndroidlogs;
+
+	{
+		JavaEnvTh *env = self->getEnv();
+		jstring msg;
+
+		if (!env || !env->cbk_onLog)
+			goto displayInAndroidlogs;
+
+		env->env->PushLocalFrame(1);
+		msg = env->env->NewStringUTF(szMsg);
+		env->env->CallVoidMethod(env->cbk_obj, env->cbk_onLog, debug, lm, msg);
+		env->env->PopLocalFrame(NULL);
+		return;
+	}
 displayInAndroidlogs:
-  {
-  /* When no callback is properly set, we use direct logging */
-    switch( lm){
-          case GF_LOG_CORE:
-                tag="GF_LOG_CORE";
-                break;
-        case GF_LOG_CODING:
-                tag="GF_LOG_CODING";
-                break;
-        case GF_LOG_CONTAINER:
-                tag="GF_LOG_CONTAINER";
-                break;
-        case GF_LOG_NETWORK:
-                tag="GF_LOG_NETWORK";
-                break;
-        case GF_LOG_RTP:
-                tag="GF_LOG_RTP";
-                break;
-        case GF_LOG_AUTHOR:
-                tag="GF_LOG_AUTHOR";
-                break;
-        case GF_LOG_SYNC:
-                tag="GF_LOG_SYNC";
-                break;
-        case GF_LOG_CODEC:
-                tag="GF_LOG_CODEC";
-                break;
-        case GF_LOG_PARSER:
-                tag="GF_LOG_PARSER";
-                break;
-        case GF_LOG_MEDIA:
-                tag="GF_LOG_MEDIA";
-                break;
-        case GF_LOG_SCENE:
-                tag="GF_LOG_SCENE";
-                break;
-        case GF_LOG_SCRIPT:
-                tag="GF_LOG_SCRIPT";
-                break;
-        case GF_LOG_INTERACT:
-                tag="GF_LOG_INTERACT";
-                break;
-        case GF_LOG_COMPOSE:
-                tag="GF_LOG_COMPOSE";
-                break;
-        case GF_LOG_CACHE:
-                tag="GF_LOG_CACHE";
-                break;
-        case GF_LOG_MMIO:
-                tag="GF_LOG_MMIO";
-                break;
-        case GF_LOG_RTI:
-                tag="GF_LOG_RTI";
-                break;
-        case GF_LOG_SMIL:
-                tag="GF_LOG_SMIL";
-                break;
-        case GF_LOG_MEMORY:
-                tag="GF_LOG_MEMORY";
-                break;
-        case GF_LOG_AUDIO:
-                tag="GF_LOG_AUDIO";
-                break;
-        case GF_LOG_MODULE:
-                tag="GF_LOG_MODULE";
-                break;
-        case GF_LOG_MUTEX:
-                tag="GF_LOG_MUTEX";
-                break;
-        default:
-            snprintf(unknTag, 32, "GPAC_UNKNOWN[%d]", lm);
-            tag = unknTag;
-    }
-    __android_log_print(debug, tag, szMsg);
-  }
+	{
+		/* When no callback is properly set, we use direct logging */
+		switch( lm) {
+		case GF_LOG_CORE:
+			tag="GF_LOG_CORE";
+			break;
+		case GF_LOG_CODING:
+			tag="GF_LOG_CODING";
+			break;
+		case GF_LOG_CONTAINER:
+			tag="GF_LOG_CONTAINER";
+			break;
+		case GF_LOG_NETWORK:
+			tag="GF_LOG_NETWORK";
+			break;
+		case GF_LOG_RTP:
+			tag="GF_LOG_RTP";
+			break;
+		case GF_LOG_AUTHOR:
+			tag="GF_LOG_AUTHOR";
+			break;
+		case GF_LOG_SYNC:
+			tag="GF_LOG_SYNC";
+			break;
+		case GF_LOG_CODEC:
+			tag="GF_LOG_CODEC";
+			break;
+		case GF_LOG_PARSER:
+			tag="GF_LOG_PARSER";
+			break;
+		case GF_LOG_MEDIA:
+			tag="GF_LOG_MEDIA";
+			break;
+		case GF_LOG_SCENE:
+			tag="GF_LOG_SCENE";
+			break;
+		case GF_LOG_SCRIPT:
+			tag="GF_LOG_SCRIPT";
+			break;
+		case GF_LOG_INTERACT:
+			tag="GF_LOG_INTERACT";
+			break;
+		case GF_LOG_COMPOSE:
+			tag="GF_LOG_COMPOSE";
+			break;
+		case GF_LOG_CACHE:
+			tag="GF_LOG_CACHE";
+			break;
+		case GF_LOG_MMIO:
+			tag="GF_LOG_MMIO";
+			break;
+		case GF_LOG_RTI:
+			tag="GF_LOG_RTI";
+			break;
+		case GF_LOG_SMIL:
+			tag="GF_LOG_SMIL";
+			break;
+		case GF_LOG_MEMORY:
+			tag="GF_LOG_MEMORY";
+			break;
+		case GF_LOG_AUDIO:
+			tag="GF_LOG_AUDIO";
+			break;
+		case GF_LOG_MODULE:
+			tag="GF_LOG_MODULE";
+			break;
+		case GF_LOG_MUTEX:
+			tag="GF_LOG_MUTEX";
+			break;
+		default:
+			snprintf(unknTag, 32, "GPAC_UNKNOWN[%d]", lm);
+			tag = unknTag;
+		}
+		__android_log_print(debug, tag, szMsg);
+	}
 }
 //-------------------------------
-Bool CNativeWrapper::GPAC_EventProc(void *cbk, GF_Event *evt){
+Bool CNativeWrapper::GPAC_EventProc(void *cbk, GF_Event *evt) {
 	if (cbk)
 	{
 		CNativeWrapper* ptr = (CNativeWrapper*)cbk;
 		char msg[4096];
 		msg[0] = 0;
-                LOGD("GPAC_EventProc() Message=%d", evt->type);
-                switch (evt->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:
-                  case GF_EVENT_KEYUP:
-                  case GF_EVENT_KEYDOWN:
-                  case GF_EVENT_LONGKEYPRESS:
-                  case GF_EVENT_TEXTINPUT:
-                    /* We ignore all these events */
-                    break;
-                  case GF_EVENT_MEDIA_SETUP_BEGIN: 
-                  case GF_EVENT_MEDIA_SETUP_DONE: 
-                  case GF_EVENT_MEDIA_LOAD_START: 
-                  case GF_EVENT_MEDIA_PLAYING: 
-                  case GF_EVENT_MEDIA_WAITING: 
-                  case GF_EVENT_MEDIA_PROGRESS: 
-                  case GF_EVENT_MEDIA_LOAD_DONE: 
-                  case GF_EVENT_ABORT: 
-                  case GF_EVENT_ERROR:
-                    LOGD("GPAC_EventProc() Media Event detected = [index=%d]", evt->type - GF_EVENT_MEDIA_SETUP_BEGIN);
-                    break;
-                  case GF_EVENT_MESSAGE:
-                  {
-                          ptr->debug_log("GPAC_EventProc start");
-                          if ( evt->message.message )
-                          {
-                                  strcat(msg, evt->message.message);
-                                  strcat(msg, ": ");
-                          }
-                          strcat(msg, gf_error_to_string(evt->message.error));
-
-                          ptr->debug_log(msg);
-                          //ptr->MessageBox(msg, evt->message.service ? evt->message.service : "GF_EVENT_MESSAGE", evt->message.error);
-                          ptr->debug_log("GPAC_EventProc end");
-                  };
-                  break;
-                  case GF_EVENT_CONNECT:
-                    if (evt->connect.is_connected)
-                      ptr->MessageBox("Connected", "Connected to scene", GF_OK);
-                    else
-                      ptr->MessageBox("Disconnected", "Disconnected from scene.", GF_OK);
-                    break;
-                  case GF_EVENT_PROGRESS:
-                  {
-                          const char * szTitle;;
-                          if (evt->progress.progress_type==0)
-                            szTitle = "Buffering";
-                          else if (evt->progress.progress_type==1)
-                            szTitle = "Downloading...";
-                          else if (evt->progress.progress_type==2)
-                            szTitle = "Import ";
-                          else
-                            szTitle = "Unknown Progress Event";
-                          ptr->Osmo4_progress_cbk(ptr, szTitle, evt->progress.done, evt->progress.total);
-                          gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
-                  }
-                  break;
-                  case GF_EVENT_TEXT_EDITING_START:
-                  case GF_EVENT_TEXT_EDITING_END:
-                  {
-                      JavaEnvTh * env = ptr->getEnv();
-                      if (!env || !env->cbk_showKeyboard)
-                              return GF_FALSE;
-                      LOGI("Needs to display/hide the Virtual Keyboard (%d)", evt->type);
-                      env->env->CallVoidMethod(env->cbk_obj, env->cbk_showKeyboard, GF_EVENT_TEXT_EDITING_START == evt->type);
-                      LOGV("Done showing virtual keyboard (%d)", evt->type);
-                  }
-                    break;
-                  case GF_EVENT_EOS:
-                    LOGI("EOS Reached (%d)", evt->type);
-                    break;
-                  case GF_EVENT_DISCONNECT:
-                    /* FIXME : not sure about this behaviour */
-                    if (ptr)
-                      ptr->disconnect();
-                    break;
-                  case GF_EVENT_NAVIGATE:
-					ptr->navigate( evt);
-					break;
-                  default:
-                    LOGI("Unknown Message %d", evt->type);
-                }
+		LOGD("GPAC_EventProc() Message=%d", evt->type);
+		switch (evt->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:
+		case GF_EVENT_KEYUP:
+		case GF_EVENT_KEYDOWN:
+		case GF_EVENT_LONGKEYPRESS:
+		case GF_EVENT_TEXTINPUT:
+			/* We ignore all these events */
+			break;
+		case GF_EVENT_MEDIA_SETUP_BEGIN:
+		case GF_EVENT_MEDIA_SETUP_DONE:
+		case GF_EVENT_MEDIA_LOAD_START:
+		case GF_EVENT_MEDIA_PLAYING:
+		case GF_EVENT_MEDIA_WAITING:
+		case GF_EVENT_MEDIA_PROGRESS:
+		case GF_EVENT_MEDIA_LOAD_DONE:
+		case GF_EVENT_ABORT:
+		case GF_EVENT_ERROR:
+			LOGD("GPAC_EventProc() Media Event detected = [index=%d]", evt->type - GF_EVENT_MEDIA_SETUP_BEGIN);
+			break;
+		case GF_EVENT_MESSAGE:
+		{
+			ptr->debug_log("GPAC_EventProc start");
+			if ( evt->message.message )
+			{
+				strcat(msg, evt->message.message);
+				strcat(msg, ": ");
+			}
+			strcat(msg, gf_error_to_string(evt->message.error));
+
+			ptr->debug_log(msg);
+			//ptr->MessageBox(msg, evt->message.service ? evt->message.service : "GF_EVENT_MESSAGE", evt->message.error);
+			ptr->debug_log("GPAC_EventProc end");
+		};
+		break;
+		case GF_EVENT_CONNECT:
+			if (evt->connect.is_connected)
+				ptr->MessageBox("Connected", "Connected to scene", GF_OK);
+			else
+				ptr->MessageBox("Disconnected", "Disconnected from scene.", GF_OK);
+			break;
+		case GF_EVENT_PROGRESS:
+		{
+			const char * szTitle;;
+			if (evt->progress.progress_type==0)
+				szTitle = "Buffering";
+			else if (evt->progress.progress_type==1)
+				szTitle = "Downloading...";
+			else if (evt->progress.progress_type==2)
+				szTitle = "Import ";
+			else
+				szTitle = "Unknown Progress Event";
+			ptr->Osmo4_progress_cbk(ptr, szTitle, evt->progress.done, evt->progress.total);
+			gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
+		}
+		break;
+		case GF_EVENT_TEXT_EDITING_START:
+		case GF_EVENT_TEXT_EDITING_END:
+		{
+			JavaEnvTh * env = ptr->getEnv();
+			if (!env || !env->cbk_showKeyboard)
+				return GF_FALSE;
+			LOGI("Needs to display/hide the Virtual Keyboard (%d)", evt->type);
+			env->env->CallVoidMethod(env->cbk_obj, env->cbk_showKeyboard, GF_EVENT_TEXT_EDITING_START == evt->type);
+			LOGV("Done showing virtual keyboard (%d)", evt->type);
+		}
+		break;
+		case GF_EVENT_EOS:
+			LOGI("EOS Reached (%d)", evt->type);
+			break;
+		case GF_EVENT_DISCONNECT:
+			/* FIXME : not sure about this behaviour */
+			if (ptr)
+				ptr->disconnect();
+			break;
+		case GF_EVENT_NAVIGATE:
+			ptr->navigate( evt);
+			break;
+		default:
+			LOGI("Unknown Message %d", evt->type);
+		}
 	}
 	return GF_FALSE;
 }
 
 void CNativeWrapper::navigate( GF_Event* evt)
-{	
-	if (gf_term_is_supported_url(m_term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) 
+{
+	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);
-	} 
+	}
 }
 
-void CNativeWrapper::progress_cbk(const char *title, u64 done, u64 total){
-        JavaEnvTh *env = getEnv();
-        if (!env || !env->cbk_onProgress)
-                return;
-        //debug_log("Osmo4_progress_cbk start");
+void CNativeWrapper::progress_cbk(const char *title, u64 done, u64 total) {
+	JavaEnvTh *env = getEnv();
+	if (!env || !env->cbk_onProgress)
+		return;
+	//debug_log("Osmo4_progress_cbk start");
 	env->env->PushLocalFrame(1);
-        jstring js = env->env->NewStringUTF(title);
-        env->env->CallVoidMethod(env->cbk_obj, env->cbk_onProgress, js, done, total);
+	jstring js = env->env->NewStringUTF(title);
+	env->env->CallVoidMethod(env->cbk_obj, env->cbk_onProgress, js, done, total);
 	env->env->PopLocalFrame(NULL);
-        //debug_log("Osmo4_progress_cbk end");
+	//debug_log("Osmo4_progress_cbk end");
 }
 
 
 //-------------------------------
-void CNativeWrapper::Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total){
+void CNativeWrapper::Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total) {
 	if (!usr)
 		return;
 	CNativeWrapper * self = (CNativeWrapper *) usr;
 	self->progress_cbk(title, done, total);
 }
 //-------------------------------
-void CNativeWrapper::SetupLogs(){
+void CNativeWrapper::SetupLogs() {
 	const char *opt;
 	debug_log("SetupLogs()");
 
@@ -607,8 +644,8 @@
 }
 //-------------------------------
 // dir should end with /
-int CNativeWrapper::init(JNIEnv * env, void * bitmap, jobject * callback, int width, int height, const char * cfg_dir, const char * modules_dir, const char * cache_dir, const char * font_dir, const char * urlToLoad){
-        LOGI("Initializing GPAC with URL=%s...", urlToLoad);
+int CNativeWrapper::init(JNIEnv * env, void * bitmap, jobject * callback, int width, int height, const char * cfg_dir, const char * modules_dir, const char * cache_dir, const char * font_dir, const char * urlToLoad) {
+	LOGI("Initializing GPAC with URL=%s...", urlToLoad);
 	strcpy(m_cfg_dir, cfg_dir);
 	strcpy(m_modules_dir, modules_dir);
 	strcpy(m_cache_dir, cache_dir);
@@ -626,37 +663,37 @@
 
 	m_window = env;
 	m_session = bitmap;
-  if (!mainJavaEnv)
-  	mainJavaEnv = (JavaEnvTh *) gf_malloc(sizeof(JavaEnvTh));
-  memset(mainJavaEnv, 0, sizeof(JavaEnvTh));
-  setJavaEnv(mainJavaEnv, env, env->NewGlobalRef(*callback));
-  if (pthread_setspecific( jni_thread_env_key, mainJavaEnv)){
-    LOGE("Failed to set specific thread data to jni_thread_env_key=%p for main thread !", jni_thread_env_key);
-  }
+	if (!mainJavaEnv)
+		mainJavaEnv = (JavaEnvTh *) gf_malloc(sizeof(JavaEnvTh));
+	memset(mainJavaEnv, 0, sizeof(JavaEnvTh));
+	setJavaEnv(mainJavaEnv, env, env->NewGlobalRef(*callback));
+	if (pthread_setspecific( jni_thread_env_key, mainJavaEnv)) {
+		LOGE("Failed to set specific thread data to jni_thread_env_key=%p for main thread !", jni_thread_env_key);
+	}
 
 	m_mx = gf_mx_new("Osmo4");
 
 	//load config file
-        LOGI("Loading User Config %s...", "GPAC.cfg");
+	LOGI("Loading User Config %s...", "GPAC.cfg");
 	m_user.config = gf_cfg_force_new(cfg_dir, "GPAC.cfg");
 	gf_set_progress_callback(this, Osmo4_progress_cbk);
 
 	opt = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
 	if (!opt) {
-                FILE * fstart;
-                char msg[256];
-                LOGI("First launch, initializing new Config %s...", "GPAC.cfg");
+		FILE * fstart;
+		char msg[256];
+		LOGI("First launch, initializing new Config %s...", "GPAC.cfg");
 		/*hardcode module directory*/
 		gf_cfg_set_key(m_user.config, "Downloader", "CleanCache", "yes");
 		/*startup file*/
 		snprintf(msg, 256, "%sgui/gui.bt", cfg_dir);
-                fstart = fopen(msg, "r");
-                if (fstart){
-                  fclose(fstart);
-                  gf_cfg_set_key(m_user.config, "General", "StartupFile", msg);
-                } else {
-                  gf_cfg_set_key(m_user.config, "General", "#StartupFile", msg);
-                }
+		fstart = fopen(msg, "r");
+		if (fstart) {
+			fclose(fstart);
+			gf_cfg_set_key(m_user.config, "General", "StartupFile", msg);
+		} else {
+			gf_cfg_set_key(m_user.config, "General", "#StartupFile", msg);
+		}
 		gf_cfg_set_key(m_user.config, "GUI", "UnhideControlPlayer", "1");
 		/*setup UDP traffic autodetect*/
 		gf_cfg_set_key(m_user.config, "Network", "AutoReconfigUDP", "yes");
@@ -670,90 +707,90 @@
 	}
 	/* All of this has to be done for every instance */
 	gf_cfg_set_key(m_user.config, "General", "ModulesDirectory", modules_dir ? modules_dir : GPAC_MODULES_DIR);
-        gf_cfg_set_key(m_user.config, "General", "CacheDirectory", cache_dir ? cache_dir : GPAC_CACHE_DIR);
-        gf_cfg_set_key(m_user.config, "General", "LastWorkingDir", cfg_dir);
-        gf_cfg_set_key(m_user.config, "FontEngine", "FontDirectory", GPAC_FONT_DIR);
-        gf_cfg_set_key(m_user.config, "Video", "DriverName", "Android Video Output");
-        gf_cfg_set_key(m_user.config, "Audio", "DriverName", "Android Audio Output");
+	gf_cfg_set_key(m_user.config, "General", "CacheDirectory", cache_dir ? cache_dir : GPAC_CACHE_DIR);
+	gf_cfg_set_key(m_user.config, "General", "LastWorkingDir", cfg_dir);
+	gf_cfg_set_key(m_user.config, "FontEngine", "FontDirectory", GPAC_FONT_DIR);
+	gf_cfg_set_key(m_user.config, "Video", "DriverName", "Android Video Output");
+	gf_cfg_set_key(m_user.config, "Audio", "DriverName", "Android Audio Output");
 
 	opt = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
-        LOGI("loading modules in directory %s...", opt);
+	LOGI("loading modules in directory %s...", opt);
 	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);
+		LOGE("No modules found in directory %s !", opt);
 		if (m_user.modules)
-                  gf_modules_del(m_user.modules);
+			gf_modules_del(m_user.modules);
 		gf_cfg_del(m_user.config);
-                m_user.config = NULL;
+		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.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_FALSE);
+	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_FALSE);
 	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);
+		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);
-                m_user.modules = NULL;
+		m_user.modules = NULL;
 		gf_cfg_del(m_user.config);
-                m_user.config = NULL;
+		m_user.config = NULL;
 		return Quit(KErrGeneral);
 	}
 
 	//setAudioEnvironment(javaVM);
 
-        LOGD("Setting term size m_user=%p...", &m_user);
+	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");
 	LOGD("File loaded at startup=%s.", opt);
 
-        if (!urlToLoad)
-          urlToLoad = opt;
-	if (urlToLoad){
-          LOGI("Connecting to %s...", urlToLoad);
-          gf_term_connect(m_term, urlToLoad);
-        }
-        debug_log("init end");
+	if (!urlToLoad)
+		urlToLoad = opt;
+	if (urlToLoad) {
+		LOGI("Connecting to %s...", urlToLoad);
+		gf_term_connect(m_term, urlToLoad);
+	}
+	debug_log("init end");
 	LOGD("Saving config file %s...\n", m_cfg_filename);
-        gf_cfg_save(m_user.config);
-        LOGI("Initialization complete, config file saved as %s.\n", m_cfg_filename);	
-	
-        return 0;
+	gf_cfg_save(m_user.config);
+	LOGI("Initialization complete, config file saved as %s.\n", m_cfg_filename);
+
+	return 0;
 }
 //-------------------------------
 int CNativeWrapper::connect(const char *url)
 {
 	const char *str;
 	char the_url[256];
-	
+
 	if (m_term)
 	{
 		debug_log("Starting to connect ...");
 		str = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-		if (str) 
+		if (str)
 		{
 			gf_cfg_set_key(m_user.config, "Temp", "GUIStartupFile", url);
 			gf_term_connect(m_term, str);
 		}
 		if( url )
 		{
-			gf_term_connect_from_time(m_term, url, 0, GF_FALSE);		
+			gf_term_connect_from_time(m_term, url, 0, GF_FALSE);
 		}
 	}
 	debug_log("connected ...");
@@ -761,65 +798,64 @@
 
 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_cfg_set_key(m_user.config, category, name, value);
+		gf_cfg_save(m_user.config);
+	}
 }
 
 //-----------------------------------------------------
-void CNativeWrapper::disconnect(){
-        if (m_term){
-          debug_log("disconnecting");
-          gf_term_disconnect(m_term);
-          debug_log("disconnected ...");
-        }
+void CNativeWrapper::disconnect() {
+	if (m_term) {
+		debug_log("disconnecting");
+		gf_term_disconnect(m_term);
+		debug_log("disconnected ...");
+	}
 }
 //-----------------------------------------------------
-void CNativeWrapper::step(void * env, void * bitmap){
+void CNativeWrapper::step(void * env, void * bitmap) {
 	m_window = env;
 	m_session = bitmap;
 	//debug_log("Step ...");
-	if (!m_term){
+	if (!m_term) {
 		debug_log("step(): No m_term found.");
-                return;
-        } else
-          if (!m_term->compositor)
+		return;
+	} else if (!m_term->compositor)
 		debug_log("step(): No compositor found.");
-          else if (!m_term->compositor->video_out)
+	else if (!m_term->compositor->video_out)
 		debug_log("step(): No video_out found");
-          else if (!m_term->compositor->video_out->Setup)
+	else if (!m_term->compositor->video_out->Setup)
 		debug_log("step(): No video_out->Setup found");
-          else {
-			  m_term->compositor->frame_draw_type = GF_SC_DRAW_FRAME;
-                gf_term_process_step(m_term);
+	else {
+		m_term->compositor->frame_draw_type = GF_SC_DRAW_FRAME;
+		gf_term_process_step(m_term);
 	}
 }
 
 //-----------------------------------------------------
-void CNativeWrapper::setAudioEnvironment(JavaVM* javaVM){
-        if (!m_term){
-            debug_log("setAudioEnvironment(): no m_term found.");
-            return;
-        }
+void CNativeWrapper::setAudioEnvironment(JavaVM* javaVM) {
+	if (!m_term) {
+		debug_log("setAudioEnvironment(): no m_term found.");
+		return;
+	}
 	debug_log("setAudioEnvironment start");
 	m_term->compositor->audio_renderer->audio_out->Setup(m_term->compositor->audio_renderer->audio_out, javaVM, 0, 0);
-        debug_log("setAudioEnvironment end");
+	debug_log("setAudioEnvironment end");
 }
 //-----------------------------------------------------
-void CNativeWrapper::resize(int w, int h){
-        if (!m_term)
-          return;
-        debug_log("resize start");
+void CNativeWrapper::resize(int w, int h) {
+	if (!m_term)
+		return;
+	debug_log("resize start");
 	gf_term_set_size(m_term, w, h);
-        debug_log("resize end");
+	debug_log("resize end");
 }
 
 //-----------------------------------------------------
-void CNativeWrapper::onMouseDown(float x, float y){
-        if (!m_term)
-          return;
-        debug_log("onMouseDown start");
+void CNativeWrapper::onMouseDown(float x, float y) {
+	if (!m_term)
+		return;
+	debug_log("onMouseDown start");
 	//char msg[100];
 	//sprintf(msg, "onMousedown x=%f, y=%f", x, y );
 	//debug_log(msg);
@@ -831,13 +867,13 @@
 	evt.mouse.y = y;
 
 	int ret = gf_term_user_event(m_term, &evt);
-        debug_log("onMouseDown end");
+	debug_log("onMouseDown end");
 }
 //-----------------------------------------------------
-void CNativeWrapper::onMouseUp(float x, float y){
-        if (!m_term)
-          return;
-        debug_log("onMouseUp start");
+void CNativeWrapper::onMouseUp(float x, float y) {
+	if (!m_term)
+		return;
+	debug_log("onMouseUp start");
 	//char msg[100];
 	//sprintf(msg, "onMouseUp x=%f, y=%f", x, y );
 	//debug_log(msg);
@@ -849,12 +885,12 @@
 	evt.mouse.y = y;
 
 	int ret = gf_term_user_event(m_term, &evt);
-        debug_log("onMouseUp end");
+	debug_log("onMouseUp end");
 }
 //-----------------------------------------------------
-void CNativeWrapper::onMouseMove(float x, float y){
+void CNativeWrapper::onMouseMove(float x, float y) {
 	if (!m_term)
-          return;
+		return;
 	GF_Event evt;
 	evt.type = GF_EVENT_MOUSEMOVE;
 	evt.mouse.button = GF_MOUSE_LEFT;
@@ -864,12 +900,12 @@
 	int ret = gf_term_user_event(m_term, &evt);
 }
 //-----------------------------------------------------
-void CNativeWrapper::onKeyPress(int keycode, int rawkeycode, int up, int flag, int unicode){
-        if (!m_term)
-          return;
-        debug_log("onKeyPress start");
+void CNativeWrapper::onKeyPress(int keycode, int rawkeycode, int up, int flag, int unicode) {
+	if (!m_term)
+		return;
+	debug_log("onKeyPress start");
 	GF_Event evt;
-        memset(&evt, 0, sizeof(GF_Event));
+	memset(&evt, 0, sizeof(GF_Event));
 	if (up == 0) evt.type = GF_EVENT_KEYUP;
 	else evt.type = GF_EVENT_KEYDOWN;
 
@@ -880,83 +916,118 @@
 	//evt.key.key_code = GF_KEY_A;
 	int ret = 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);
-        }
+	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);
+	}
 }
 //-----------------------------------------------------
-	void CNativeWrapper::translate_key(ANDROID_KEYCODE keycode, GF_EventKey *evt){
-		evt->flags = 0;
-		switch (keycode) {
-			case ANDROID_KEYCODE_BACK: evt->key_code = GF_KEY_BACKSPACE; evt->hw_code = 8; break;
-			case ANDROID_KEYCODE_TAB: evt->key_code = GF_KEY_TAB; evt->hw_code = 9; break;
-			case ANDROID_KEYCODE_CLEAR: evt->key_code = GF_KEY_CLEAR; break;
-			case ANDROID_KEYCODE_ENTER: evt->key_code = GF_KEY_ENTER; evt->hw_code = 13; break;
-			case ANDROID_KEYCODE_SHIFT_LEFT: evt->key_code = GF_KEY_SHIFT; break;
-			case ANDROID_KEYCODE_SHIFT_RIGHT: evt->key_code = GF_KEY_SHIFT; break;
-			case ANDROID_KEYCODE_ALT_LEFT: evt->key_code = GF_KEY_ALT; break;
-			case ANDROID_KEYCODE_ALT_RIGHT: evt->key_code = GF_KEY_ALT; break;
-			case ANDROID_KEYCODE_SPACE: evt->key_code = GF_KEY_SPACE; evt->hw_code = 32; break;
-			case ANDROID_KEYCODE_HOME: evt->key_code = GF_KEY_HOME; break;
-			case ANDROID_KEYCODE_DPAD_LEFT: evt->key_code = GF_KEY_LEFT; break;
-			case ANDROID_KEYCODE_DPAD_UP: evt->key_code = GF_KEY_UP; break;
-			case ANDROID_KEYCODE_DPAD_RIGHT: evt->key_code = GF_KEY_RIGHT; break;
-			case ANDROID_KEYCODE_DPAD_DOWN: evt->key_code = GF_KEY_DOWN; break;
-			case ANDROID_KEYCODE_DEL: evt->key_code = GF_KEY_BACKSPACE; evt->hw_code = 8; break;
-			case ANDROID_KEYCODE_0:
-			evt->key_code = GF_KEY_0;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_1:
-			evt->key_code = GF_KEY_1;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_2:
-			evt->key_code = GF_KEY_2;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_3:
-			evt->key_code = GF_KEY_3;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_4:
-			evt->key_code = GF_KEY_4;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_5:
-			evt->key_code = GF_KEY_5;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_6:
-			evt->key_code = GF_KEY_6;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_7:
-			evt->key_code = GF_KEY_7;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_8:
-			evt->key_code = GF_KEY_8;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
-			case ANDROID_KEYCODE_9:
-			evt->key_code = GF_KEY_9;
-			evt->flags = GF_KEY_EXT_NUMPAD;
-			break;
+void CNativeWrapper::translate_key(ANDROID_KEYCODE keycode, GF_EventKey *evt) {
+	evt->flags = 0;
+	switch (keycode) {
+	case ANDROID_KEYCODE_BACK:
+		evt->key_code = GF_KEY_BACKSPACE;
+		evt->hw_code = 8;
+		break;
+	case ANDROID_KEYCODE_TAB:
+		evt->key_code = GF_KEY_TAB;
+		evt->hw_code = 9;
+		break;
+	case ANDROID_KEYCODE_CLEAR:
+		evt->key_code = GF_KEY_CLEAR;
+		break;
+	case ANDROID_KEYCODE_ENTER:
+		evt->key_code = GF_KEY_ENTER;
+		evt->hw_code = 13;
+		break;
+	case ANDROID_KEYCODE_SHIFT_LEFT:
+		evt->key_code = GF_KEY_SHIFT;
+		break;
+	case ANDROID_KEYCODE_SHIFT_RIGHT:
+		evt->key_code = GF_KEY_SHIFT;
+		break;
+	case ANDROID_KEYCODE_ALT_LEFT:
+		evt->key_code = GF_KEY_ALT;
+		break;
+	case ANDROID_KEYCODE_ALT_RIGHT:
+		evt->key_code = GF_KEY_ALT;
+		break;
+	case ANDROID_KEYCODE_SPACE:
+		evt->key_code = GF_KEY_SPACE;
+		evt->hw_code = 32;
+		break;
+	case ANDROID_KEYCODE_HOME:
+		evt->key_code = GF_KEY_HOME;
+		break;
+	case ANDROID_KEYCODE_DPAD_LEFT:
+		evt->key_code = GF_KEY_LEFT;
+		break;
+	case ANDROID_KEYCODE_DPAD_UP:
+		evt->key_code = GF_KEY_UP;
+		break;
+	case ANDROID_KEYCODE_DPAD_RIGHT:
+		evt->key_code = GF_KEY_RIGHT;
+		break;
+	case ANDROID_KEYCODE_DPAD_DOWN:
+		evt->key_code = GF_KEY_DOWN;
+		break;
+	case ANDROID_KEYCODE_DEL:
+		evt->key_code = GF_KEY_BACKSPACE;
+		evt->hw_code = 8;
+		break;
+	case ANDROID_KEYCODE_0:
+		evt->key_code = GF_KEY_0;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_1:
+		evt->key_code = GF_KEY_1;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_2:
+		evt->key_code = GF_KEY_2;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_3:
+		evt->key_code = GF_KEY_3;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_4:
+		evt->key_code = GF_KEY_4;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_5:
+		evt->key_code = GF_KEY_5;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_6:
+		evt->key_code = GF_KEY_6;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_7:
+		evt->key_code = GF_KEY_7;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_8:
+		evt->key_code = GF_KEY_8;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case ANDROID_KEYCODE_9:
+		evt->key_code = GF_KEY_9;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		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 ((keycode>=ANDROID_KEYCODE_A) && (keycode<=ANDROID_KEYCODE_Z)){
-				evt->key_code = GF_KEY_A + keycode - ANDROID_KEYCODE_A;
-			} else {
-				evt->key_code = GF_KEY_UNIDENTIFIED;
-			}
-			break;
+	default:
+		if ((keycode>=ANDROID_KEYCODE_A) && (keycode<=ANDROID_KEYCODE_Z)) {
+			evt->key_code = GF_KEY_A + keycode - ANDROID_KEYCODE_A;
+		} else {
+			evt->key_code = GF_KEY_UNIDENTIFIED;
 		}
+		break;
 	}
+}
 
 //-----------------------------------------------------
 void CNativeWrapper::setGpacLogs(const char *tools_at_level)

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_android/jni/wrapper.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_android/jni/wrapper.h Changed

@@ -145,88 +145,90 @@
 #include <jni.h>
 
 typedef struct _JavaEnvTh {
-  JNIEnv * env;
-  u32 javaThreadId;
-  jobject cbk_obj;
-  jmethodID cbk_displayMessage;
-  jmethodID cbk_onProgress;
-  jmethodID cbk_showKeyboard;
-  jmethodID cbk_setCaption;
-  jmethodID cbk_onLog;
-  jmethodID cbk_onFmRequest;
+	JNIEnv * env;
+	u32 javaThreadId;
+	jobject cbk_obj;
+	jmethodID cbk_displayMessage;
+	jmethodID cbk_onProgress;
+	jmethodID cbk_showKeyboard;
+	jmethodID cbk_setCaption;
+	jmethodID cbk_onLog;
+	jmethodID cbk_onFmRequest;
 } JavaEnvTh;
 
 
 //---------------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------------
-class CNativeWrapper{
-
-	private:
-		void* m_window;
-		void* m_session;
-
-		GF_User *GetUser() { return &m_user; }
-		GF_Terminal *m_term;
-
-		/*
-		 * Callback management
-		 */
-    JavaEnvTh *mainJavaEnv;
-
-		GF_Mutex *m_mx;
-		GF_User m_user;
-		GF_SystemRTInfo m_rti;
-
-		int	do_log;
-	private:
-		char m_cfg_dir[GF_MAX_PATH];
-		char m_modules_dir[GF_MAX_PATH];
-		char m_cache_dir[GF_MAX_PATH];
-		char m_font_dir[GF_MAX_PATH];
-                void setJavaEnv(JavaEnvTh * envToSet, JNIEnv *env, jobject callback);
-	private:
-		void SetupLogs();
-		void Shutdown();
-		void DisplayRTI();
-	protected:
-		JavaEnvTh * getEnv();
-
-	public:
-		CNativeWrapper();
-		~CNativeWrapper();
-		int init(JNIEnv * env, void * bitmap, jobject * callback, int width, int height, const char * cfg_dir, const char * modules_dir, const char * cache_dir, const char * font_dir, const char * urlToLoad);
-
-		int connect(const char *url);
-		void disconnect();
-		void step(void * env, void * bitmap);
-		void resize(int w, int h);
-		void setAudioEnvironment(JavaVM* javaVM);
-
-		void onMouseDown(float x, float y);
-		void onMouseUp(float x, float y);
-		void onMouseMove(float x, float y);
-		void onKeyPress(int keycode, int rawkeycode, int up, int flag, int unicode);
-		void translate_key(ANDROID_KEYCODE keycode, GF_EventKey *evt);
-		void navigate( GF_Event* evt);
-    void setGpacPreference( const char * category, const char * name, const char * value);
-    void setGpacLogs(const char *tools_at_level);
-
-	public:
-		int MessageBox(const char* msg, const char* title, GF_Err status);
-		int Quit(int code);
-		GF_Config *create_default_config(char *file_path, char *file_name);
-
-		static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list);
-		static void on_fm_request(void *cbk, u32 type, u32 param, int *value);
-		static Bool GPAC_EventProc(void *cbk, GF_Event *evt);
-                void progress_cbk(const char *title, u64 done, u64 total);
-		static void Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total);
-
-	private:
+class CNativeWrapper {
+
+private:
+	void* m_window;
+	void* m_session;
+
+	GF_User *GetUser() {
+		return &m_user;
+	}
+	GF_Terminal *m_term;
+
+	/*
+	 * Callback management
+	 */
+	JavaEnvTh *mainJavaEnv;
+
+	GF_Mutex *m_mx;
+	GF_User m_user;
+	GF_SystemRTInfo m_rti;
+
+	int	do_log;
+private:
+	char m_cfg_dir[GF_MAX_PATH];
+	char m_modules_dir[GF_MAX_PATH];
+	char m_cache_dir[GF_MAX_PATH];
+	char m_font_dir[GF_MAX_PATH];
+	void setJavaEnv(JavaEnvTh * envToSet, JNIEnv *env, jobject callback);
+private:
+	void SetupLogs();
+	void Shutdown();
+	void DisplayRTI();
+protected:
+	JavaEnvTh * getEnv();
+
+public:
+	CNativeWrapper();
+	~CNativeWrapper();
+	int init(JNIEnv * env, void * bitmap, jobject * callback, int width, int height, const char * cfg_dir, const char * modules_dir, const char * cache_dir, const char * font_dir, const char * urlToLoad);
+
+	int connect(const char *url);
+	void disconnect();
+	void step(void * env, void * bitmap);
+	void resize(int w, int h);
+	void setAudioEnvironment(JavaVM* javaVM);
+
+	void onMouseDown(float x, float y);
+	void onMouseUp(float x, float y);
+	void onMouseMove(float x, float y);
+	void onKeyPress(int keycode, int rawkeycode, int up, int flag, int unicode);
+	void translate_key(ANDROID_KEYCODE keycode, GF_EventKey *evt);
+	void navigate( GF_Event* evt);
+	void setGpacPreference( const char * category, const char * name, const char * value);
+	void setGpacLogs(const char *tools_at_level);
+
+public:
+	int MessageBox(const char* msg, const char* title, GF_Err status);
+	int Quit(int code);
+	GF_Config *create_default_config(char *file_path, char *file_name);
+
+	static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list);
+	static void on_fm_request(void *cbk, u32 type, u32 param, int *value);
+	static Bool GPAC_EventProc(void *cbk, GF_Event *evt);
+	void progress_cbk(const char *title, u64 done, u64 total);
+	static void Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total);
+
+private:
 #ifdef	DEBUG_MODE
-		FILE	*debug_f;
+	FILE	*debug_f;
 #endif
-		void debug_log(const char* msg);
+	void debug_log(const char* msg);
 
 };

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_android/jni/wrapper_jni.c -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_android/jni/wrapper_jni.c Changed

@@ -30,124 +30,124 @@
  */
 JNIEXPORT jlong JNICALL Java_com_gpac_Osmo4_GPACInstance_createInstance(JNIEnv * env, jclass obj, jobject callback, jint width, jint height, jstring cfg_dir, jstring modules_dir, jstring cache_dir, jstring font_dir, jstring url_to_open)
 {
-        jboolean isCopy;
-        const char * s1 = env->GetStringUTFChars(cfg_dir, &isCopy);
-        const char * s2 = env->GetStringUTFChars(modules_dir, &isCopy);
-        const char * s3 = env->GetStringUTFChars(cache_dir, &isCopy);
-        const char * s4 = env->GetStringUTFChars(font_dir, &isCopy);
-        const char * s5 = NULL;
-        if (url_to_open)
-          s5 = env->GetStringUTFChars(url_to_open, &isCopy);
-        else
-          s5 = NULL;
-        CNativeWrapper * gpac_obj = new CNativeWrapper();
-        if (gpac_obj){
-          int w = width;
-          int h = height;
-          jniLOGI("Calling gpac_obj->init()...");
-          if (gpac_obj->init(env, NULL, &callback,
-                              w, h,
-                              s1, s2, s3, s4, s5)){
-            jniLOGE("FAILED to init(), return code not 0");
-            delete gpac_obj;
-            gpac_obj = NULL;
-          }
-        } else {
-          jniLOGE("FAILED to create new CNativeWrapper() : not enough memory ?");
-        }
+	jboolean isCopy;
+	const char * s1 = env->GetStringUTFChars(cfg_dir, &isCopy);
+	const char * s2 = env->GetStringUTFChars(modules_dir, &isCopy);
+	const char * s3 = env->GetStringUTFChars(cache_dir, &isCopy);
+	const char * s4 = env->GetStringUTFChars(font_dir, &isCopy);
+	const char * s5 = NULL;
+	if (url_to_open)
+		s5 = env->GetStringUTFChars(url_to_open, &isCopy);
+	else
+		s5 = NULL;
+	CNativeWrapper * gpac_obj = new CNativeWrapper();
+	if (gpac_obj) {
+		int w = width;
+		int h = height;
+		jniLOGI("Calling gpac_obj->init()...");
+		if (gpac_obj->init(env, NULL, &callback,
+		                   w, h,
+		                   s1, s2, s3, s4, s5)) {
+			jniLOGE("FAILED to init(), return code not 0");
+			delete gpac_obj;
+			gpac_obj = NULL;
+		}
+	} else {
+		jniLOGE("FAILED to create new CNativeWrapper() : not enough memory ?");
+	}
 
-        env->ReleaseStringUTFChars(cfg_dir, s1);
-        env->ReleaseStringUTFChars(modules_dir, s2);
-        env->ReleaseStringUTFChars(cache_dir, s3);
-        env->ReleaseStringUTFChars(font_dir, s4);
-        if (s5)
-          env->ReleaseStringUTFChars(font_dir, s5);
-        __android_log_print(ANDROID_LOG_VERBOSE, jniTAG, "Returned Handle = %p", gpac_obj);
-        return (jlong) gpac_obj;
+	env->ReleaseStringUTFChars(cfg_dir, s1);
+	env->ReleaseStringUTFChars(modules_dir, s2);
+	env->ReleaseStringUTFChars(cache_dir, s3);
+	env->ReleaseStringUTFChars(font_dir, s4);
+	if (s5)
+		env->ReleaseStringUTFChars(font_dir, s5);
+	__android_log_print(ANDROID_LOG_VERBOSE, jniTAG, "Returned Handle = %p", gpac_obj);
+	return (jlong) gpac_obj;
 }
 //-----------------------------------
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacconnect(JNIEnv * env, jobject obj, jstring fileName)
 {
-        CAST_HANDLE(wr);
-        jniLOGV("connect::start");
-        if (!wr){
-          jniLOGV("connect::end : aborted");
-          return;
-        }
-        jboolean isCopy;
-        const char * cFileName = env->GetStringUTFChars(fileName, &isCopy);
+	CAST_HANDLE(wr);
+	jniLOGV("connect::start");
+	if (!wr) {
+		jniLOGV("connect::end : aborted");
+		return;
+	}
+	jboolean isCopy;
+	const char * cFileName = env->GetStringUTFChars(fileName, &isCopy);
 
-        wr->connect(cFileName);
+	wr->connect(cFileName);
 
-        env->ReleaseStringUTFChars(fileName, cFileName);
-        jniLOGV("connect::end");
+	env->ReleaseStringUTFChars(fileName, cFileName);
+	jniLOGV("connect::end");
 }
 //-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacdisconnect(JNIEnv * env, jobject obj){
-        CAST_HANDLE(wr);
-        jniLOGV("disconnect::start");
-        if (wr)
-          wr->disconnect();
-        jniLOGV("disconnect::end");
+JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacdisconnect(JNIEnv * env, jobject obj) {
+	CAST_HANDLE(wr);
+	jniLOGV("disconnect::start");
+	if (wr)
+		wr->disconnect();
+	jniLOGV("disconnect::end");
 }
 //-----------------------------------
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacfree(JNIEnv * env, jobject obj)
 {
-        CAST_HANDLE(wr);
-        jniLOGV("free::start");
-        if (wr)
-          delete wr;
-        jniLOGV("free::end");
+	CAST_HANDLE(wr);
+	jniLOGV("free::start");
+	if (wr)
+		delete wr;
+	jniLOGV("free::end");
 }
 //-----------------------------------
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacrender (JNIEnv * env, jobject obj)
 {
-        CAST_HANDLE(wr);
-        //jniLOGV("render::start");
-        if (wr)
-          wr->step(env, NULL);
-        //jniLOGV("render::end");
+	CAST_HANDLE(wr);
+	//jniLOGV("render::start");
+	if (wr)
+		wr->step(env, NULL);
+	//jniLOGV("render::end");
 }
 //-----------------------------------
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacresize (JNIEnv * env, jobject obj, jint width, jint height)
 {
-        CAST_HANDLE(wr);
-        jniLOGV("resize::start");
-        if (wr)
-          wr->resize(width, height);
-        jniLOGV("resize::end");
+	CAST_HANDLE(wr);
+	jniLOGV("resize::start");
+	if (wr)
+		wr->resize(width, height);
+	jniLOGV("resize::end");
 }
 //-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousedown(JNIEnv * env, jobject obj, jfloat x, jfloat y){
-        CAST_HANDLE(wr);
-        //jniLOGV("mouseDown::start");
-        if (wr)
-          wr->onMouseDown(x, y);
-        //jniLOGV("mouseDown::end");
+JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousedown(JNIEnv * env, jobject obj, jfloat x, jfloat y) {
+	CAST_HANDLE(wr);
+	//jniLOGV("mouseDown::start");
+	if (wr)
+		wr->onMouseDown(x, y);
+	//jniLOGV("mouseDown::end");
 }
 //-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmouseup(JNIEnv * env, jobject obj, jfloat x, jfloat y){
-        CAST_HANDLE(wr);
-        //jniLOGV("mouseUp::start");
-        if (wr)
-          wr->onMouseUp(x, y);
-        //jniLOGV("mouseUp::end");
+JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmouseup(JNIEnv * env, jobject obj, jfloat x, jfloat y) {
+	CAST_HANDLE(wr);
+	//jniLOGV("mouseUp::start");
+	if (wr)
+		wr->onMouseUp(x, y);
+	//jniLOGV("mouseUp::end");
 }
 //-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousemove(JNIEnv * env, jobject obj, jfloat x, jfloat y){
-        CAST_HANDLE(wr);
-        //jniLOGV("mouseMouv::start");
-        if (wr)
-          wr->onMouseMove(x, y);
-        //jniLOGV("mouseMouv::end");
+JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousemove(JNIEnv * env, jobject obj, jfloat x, jfloat y) {
+	CAST_HANDLE(wr);
+	//jniLOGV("mouseMouv::start");
+	if (wr)
+		wr->onMouseMove(x, y);
+	//jniLOGV("mouseMouv::end");
 }
 //-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventkeypress(JNIEnv * env, jobject obj, jint keycode, jint rawkeycode, jint up, jint flag, jint unicode){
-        CAST_HANDLE(wr);
-        //jniLOGV("keypress::start");
-        if (wr)
-          wr->onKeyPress(keycode, rawkeycode, up, flag, unicode);
-        //jniLOGV("keypress::end");
+JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventkeypress(JNIEnv * env, jobject obj, jint keycode, jint rawkeycode, jint up, jint flag, jint unicode) {
+	CAST_HANDLE(wr);
+	//jniLOGV("keypress::start");
+	if (wr)
+		wr->onKeyPress(keycode, rawkeycode, up, flag, unicode);
+	//jniLOGV("keypress::end");
 }
 /*
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_getdpi(JNIEnv * env, jobject obj, jint keycode,jfloat x, jfloat y){
@@ -168,37 +168,37 @@
  * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_setGpacPreference
-  (JNIEnv * env, jobject obj, jstring category, jstring name, jstring value){
-        CAST_HANDLE(wr);
-        jboolean isCopy;
-        const char * scat = env->GetStringUTFChars(category, &isCopy);
-        const char * sname = env->GetStringUTFChars(name, &isCopy);
-        const char * svalue;
-        if (value)
-          svalue = env->GetStringUTFChars(value, &isCopy);
-        else
-          svalue = NULL;
-        if (wr)
-          wr->setGpacPreference(scat, sname, svalue);
-        env->ReleaseStringUTFChars(category, scat);
-        env->ReleaseStringUTFChars(name, sname);
-        if (value)
-          env->ReleaseStringUTFChars(value, svalue);
-  }
+(JNIEnv * env, jobject obj, jstring category, jstring name, jstring value) {
+	CAST_HANDLE(wr);
+	jboolean isCopy;
+	const char * scat = env->GetStringUTFChars(category, &isCopy);
+	const char * sname = env->GetStringUTFChars(name, &isCopy);
+	const char * svalue;
+	if (value)
+		svalue = env->GetStringUTFChars(value, &isCopy);
+	else
+		svalue = NULL;
+	if (wr)
+		wr->setGpacPreference(scat, sname, svalue);
+	env->ReleaseStringUTFChars(category, scat);
+	env->ReleaseStringUTFChars(name, sname);
+	if (value)
+		env->ReleaseStringUTFChars(value, svalue);
+}
 //-----------------------------------
 
 
 
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_setGpacLogs(JNIEnv * env, jobject obj, jstring tools_at_levels){
-  CAST_HANDLE(wr);
-  jniLOGV("setDebug::start");
-  if (wr) {
-    jboolean isCopy;
-    const char * string_tools_at_levels = env->GetStringUTFChars(tools_at_levels, &isCopy);
-    wr->setGpacLogs(string_tools_at_levels);
-    env->ReleaseStringUTFChars(tools_at_levels, string_tools_at_levels);
-  }
-  jniLOGV("setDebug::end");
+JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_setGpacLogs(JNIEnv * env, jobject obj, jstring tools_at_levels) {
+	CAST_HANDLE(wr);
+	jniLOGV("setDebug::start");
+	if (wr) {
+		jboolean isCopy;
+		const char * string_tools_at_levels = env->GetStringUTFChars(tools_at_levels, &isCopy);
+		wr->setGpacLogs(string_tools_at_levels);
+		env->ReleaseStringUTFChars(tools_at_levels, string_tools_at_levels);
+	}
+	jniLOGV("setDebug::end");
 }
 
 #ifdef __cplusplus

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_ios/extract.c -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/extract.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -43,16 +43,16 @@
 #ifdef WIN32
 #include <windows.h>
 #else
-typedef struct tagBITMAPFILEHEADER 
+typedef struct tagBITMAPFILEHEADER
 {
-    u16	bfType;
-    u32	bfSize;
-    u16	bfReserved1;
-    u16	bfReserved2;
-    u32 bfOffBits;
+	u16	bfType;
+	u32	bfSize;
+	u16	bfReserved1;
+	u16	bfReserved2;
+	u32 bfOffBits;
 } BITMAPFILEHEADER;
 
-typedef struct tagBITMAPINFOHEADER{
+typedef struct tagBITMAPINFOHEADER {
 	u32	biSize;
 	s32	biWidth;
 	s32	biHeight;
@@ -82,8 +82,8 @@
 
 static GFINLINE u8 colmask(s32 a, s32 n)
 {
-    s32 mask = (1 << n) - 1;
-    return (u8) (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
+	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)
@@ -99,7 +99,7 @@
 
 	case GF_PIXEL_BGR_32:
 	case GF_PIXEL_RGBA:
-                //probably due to tinygl bug - verify
+		//probably due to tinygl bug - verify
 #ifndef GPAC_USE_TINYGL
 		fputc(ptr[3], fout);
 		fputc(ptr[2], fout);
@@ -135,12 +135,12 @@
 		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*/ 
+	/* 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); 
+		fputc(ptr[0], fout);
 		/* if printing the characters corresponding to the float depth buffer: */
 		/*
 		{
@@ -172,7 +172,7 @@
 	char *ptr, *prev;
 
 	prev = strrchr(rad_name, '.');
-	//if (prev) prev[0] = '\0'; 
+	//if (prev) prev[0] = '\0';
 
 	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);
@@ -195,17 +195,17 @@
 	fi.biSizeImage = fb->pitch_y * 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(&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);
 //#ifndef GPAC_USE_TINYGL
 	for (j=fb->height; j>0; j--) {
 		ptr = fb->video_buffer + (j-1)*fb->pitch_y;
-		for (i=0;i<fb->width; i++) {
+		for (i=0; i<fb->width; i++) {
 			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
 			assert(res);
 			ptr += res;
@@ -215,7 +215,7 @@
 #if 0
 	for (j=0; j<fb->height; j++) {
 		ptr = fb->video_buffer + j*fb->pitch;
-		for (i=0;i<fb->width; i++) {
+		for (i=0; i<fb->width; i++) {
 			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
 			assert(res);
 			ptr += res;
@@ -231,16 +231,16 @@
 void write_depthfile(GF_VideoSurface *fb, char *rad_name, u32 img_num)
 {
 	FILE *fout;
- 	u32 i, j;
- 	char val;
+	u32 i, j;
+	char val;
 	unsigned char *depth;
 
 	depth = (unsigned char *) fb->video_buffer;
-	
+
 	fout = gf_f64_open("dump_depth", "wb");
 	if (!fout) return;
 	for (j=0; j<fb->height;  j++) {
-		for (i=0;i<fb->width; i++) {
+		for (i=0; i<fb->width; i++) {
 
 #ifdef GPAC_USE_TINYGL
 			val = fputc(depth[2*i+j*fb->width*sizeof(unsigned short)], fout);
@@ -257,19 +257,19 @@
 {
 
 	FILE *fout;
- 	u32 i, j;
- 	char val;
+	u32 i, j;
+	char val;
 	unsigned char *buf;
 
 	buf = (unsigned char *) fb->video_buffer;
-	
+
 	if (dump_mode==6) fout = gf_f64_open("dump_rgbds", "wb");
 	else if (dump_mode==9) fout = gf_f64_open("dump_rgbd", "wb");
 	else return;
-	
+
 	if (!fout) return;
 	for (j=0; j<fb->height;  j++) {
-		for (i=0;i<fb->width*4; i++) {
+		for (i=0; i<fb->width*4; i++) {
 			val = fputc(buf[i+j*fb->pitch_y], fout);
 		}
 	}
@@ -284,7 +284,7 @@
 	char str[GF_MAX_PATH];
 	FILE *fout;
 	prev = strrchr(rad_name, '.');
-	if (prev) prev[0] = '\0'; 
+	if (prev) prev[0] = '\0';
 	if (img_num<10) {
 		sprintf(str, "%s_00%d.raw", rad_name, img_num);
 	} else if (img_num<100) {
@@ -296,10 +296,10 @@
 	fout = gf_f64_open(str, "wb");
 	if (!fout) return;
 
-	
-	for (j=0;j<fb->height; j++) {
+
+	for (j=0; j<fb->height; j++) {
 		ptr = fb->video_buffer + j*fb->pitch_y;
-		for (i=0;i<fb->width; i++) {
+		for (i=0; i<fb->width; i++) {
 			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
 			assert(res);
 			ptr += res;
@@ -330,8 +330,8 @@
 			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++) {
+
+			for (i=0; i<fb.width; i++) {
 				switch (fb.pixel_format) {
 				case GF_PIXEL_RGB_32:
 				case GF_PIXEL_ARGB:
@@ -340,7 +340,7 @@
 					dst[2] = src[2];
 					src+=4;
 					break;
-			
+
 				case GF_PIXEL_BGR_32:
 				case GF_PIXEL_RGBA:
 					dst[0] = src[3];
@@ -374,7 +374,7 @@
 					dst[0] = colmask(src_16 << 3, 3);
 					src+=2;
 					break;
-					/*for depth .avi*/
+				/*for depth .avi*/
 				case GF_PIXEL_GREYSCALE:
 					dst[0] = src[0];
 					dst[1] = src[0];
@@ -401,8 +401,8 @@
 		break;
 	case 7:
 		write_bmp(&fb, rad_name, frameNum);
-		break;	
-		
+		break;
+
 	}
 	/*unlock it*/
 	/*in -depth -avi mode, do not release it yet*/
@@ -421,7 +421,7 @@
 	else e = gf_sc_get_screen_buffer(term->compositor, &fb, 0);
 	if (e) fprintf(stdout, "Error grabbing frame buffer: %s\n", gf_error_to_string(e));
 
-	if (dump_type!=5 && dump_type!= 10) { 
+	if (dump_type!=5 && dump_type!= 10) {
 		out_size = fb.height*fb.width*3;
 	} else {
 		out_size = fb.height*fb.width*4;
@@ -443,7 +443,7 @@
 			switch (fb.pixel_format) {
 			case GF_PIXEL_RGB_32:
 			case GF_PIXEL_ARGB:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[0];
 					dst[1] = src[1];
 					dst[2] = src[2];
@@ -452,7 +452,7 @@
 				}
 				break;
 			case GF_PIXEL_RGBDS:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
 					dst[1] = src[1];
 					dst[2] = src[0];
@@ -460,9 +460,9 @@
 					dst +=4;
 					src+=4;
 				}
-				break;		
+				break;
 			case GF_PIXEL_RGBD:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
 					dst[1] = src[1];
 					dst[2] = src[0];
@@ -470,10 +470,10 @@
 					dst += 4;
 					src+=4;
 				}
-				break;				
+				break;
 			case GF_PIXEL_BGR_32:
 			case GF_PIXEL_RGBA:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[3];
 					dst[1] = src[2];
 					dst[2] = src[1];
@@ -482,7 +482,7 @@
 				}
 				break;
 			case GF_PIXEL_RGB_24:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
 					dst[1] = src[1];
 					dst[2] = src[0];
@@ -491,7 +491,7 @@
 				}
 				break;
 			case GF_PIXEL_BGR_24:
-				for (i=0;i<fb.width; i++) {
+				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
 					dst[1] = src[1];
 					dst[2] = src[0];
@@ -500,7 +500,7 @@
 				}
 				break;
 			case GF_PIXEL_RGB_565:
-				for (i=0;i<fb.width; i++) {
+				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);
@@ -510,7 +510,7 @@
 				}
 				break;
 			case GF_PIXEL_RGB_555:
-				for (i=0;i<fb.width; i++) {
+				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);
@@ -522,12 +522,12 @@
 			}
 		}
 #ifndef GPAC_DISABLE_AVILIB
-		if (dump_type!=5 && dump_type!= 10) { 
+		if (dump_type!=5 && dump_type!= 10) {
 			if (AVI_write_frame(avi_out, conv_buf, out_size, 1) <0)
-			printf("Error writing frame\n");
+				printf("Error writing frame\n");
 		} else {
 			if (AVI_write_frame(avi_out, conv_buf, out_size, 1) <0)
-			printf("Error writing frame\n");				
+				printf("Error writing frame\n");
 		}
 #endif
 		break;
@@ -538,7 +538,7 @@
 	case 9:
 		write_texture_file(&fb, rad_name, frameNum, dump_type);
 		break;
-	
+
 	case 3:
 		write_raw(&fb, rad_name, frameNum);
 		break;
@@ -553,7 +553,7 @@
 	u32 i = 0;
 	GF_VideoSurface fb;
 	char szPath[GF_MAX_PATH];
-	char *prev=NULL;  
+	char *prev=NULL;
 
 	prev = strstr(url, "://");
 	if (prev) {
@@ -561,7 +561,7 @@
 		if (prev) prev++;
 	}
 
-	if (!prev) prev = url; 
+	if (!prev) prev = url;
 	strcpy(szPath, prev);
 	prev = strrchr(szPath, '.');
 	if (prev) prev[0] = 0;
@@ -570,24 +570,24 @@
 	/*connect in pause mode*/
 	gf_term_connect_from_time(term, url, 0, 1);
 
-	while (!term->compositor->scene 
-		|| term->compositor->msg_type
-		|| (gf_term_get_option(term, GF_OPT_PLAY_STATE) == GF_STATE_STEP_PAUSE)
-	) {
+	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;
 		gf_term_process_flush(term);
 		gf_sleep(10);
 	}
-	
+
 	if (width && height) {
 		gf_term_set_size(term, width, height);
 		gf_term_process_flush(term);
-	} 
+	}
 #ifndef GPAC_USE_TINYGL
-        printf("not tinygl\n");
+	printf("not tinygl\n");
 	e = gf_sc_get_screen_buffer(term->compositor, &fb, 0);
 #else
-        printf("tinygl\n");
+	printf("tinygl\n");
 	e = gf_sc_get_screen_buffer(term->compositor, &fb, 1);
 #endif
 	if (e != GF_OK) {
@@ -626,8 +626,8 @@
 #else
 		u32 time, prev_time, nb_frames, dump_dur;
 		char *conv_buf;
-		avi_t *avi_out = NULL; 
-		avi_t *depth_avi_out = NULL; 
+		avi_t *avi_out = NULL;
+		avi_t *depth_avi_out = NULL;
 		char szPath_depth[GF_MAX_PATH];
 		char comp[5];
 		strcpy(szPath_depth, szPath);
@@ -643,9 +643,9 @@
 			if (!depth_avi_out) {
 				fprintf(stdout, "Error creating AVI file %s\n", szPath);
 				return 1;
-			}	
+			}
 		}
-		
+
 		if (!fps) fps = 25.0;
 		time = prev_time = 0;
 		nb_frames = 0;
@@ -684,7 +684,7 @@
 
 			}
 			else dump_frame(term, szPath, dump_mode, i+1, conv_buf, avi_out);
-			
+
 			nb_frames++;
 			time = (u32) (nb_frames*1000/fps);
 			gf_term_step_clocks(term, time - prev_time);
@@ -708,7 +708,7 @@
 			} else {
 				dump_frame(term, url, dump_mode, i+1, NULL, NULL);
 			}
-			
+
 			if (i+1<nb_times) gf_term_step_clocks(term, times[i+1] - times[i]);
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_ios/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/main.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -43,13 +43,13 @@
 #define SHGFP_TYPE_CURRENT 0 /*needed for MinGW*/
 #endif
 
-#ifdef _MSC_VER 
+#ifdef _MSC_VER
 /*get rid of console*/
 #if 0
 #pragma comment(linker,"/SUBSYSTEM:WINDOWS")
 #pragma comment(linker,"/ENTRY:main")
 #else
-#pragma comment(linker,"/SUBSYSTEM:CONSOLE") 
+#pragma comment(linker,"/SUBSYSTEM:CONSOLE")
 #endif
 
 #endif // _MSC_VER
@@ -103,75 +103,75 @@
 void PrintUsage()
 {
 	fprintf(stdout, "Usage Osmo4iOS [options] [filename]\n"
-		"\t-c fileName:    user-defined configuration file\n"
-		"\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-opt	option:    Overrides an option in the configuration file. String format is section:key=value\n"
-		"\t-log-file file: sets output log file.\n"
-		"\t-log-level lev: sets log level. Possible values are:\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"
-		"\n"
-		"\t-log-tools lt:  sets tool(s) to log. List of \':\'-separated values:\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        \"compose\"    : composition engine (2D, 3D, etc)\n"
-		"\t        \"service\"    : network service management\n"
-		"\t        \"mmio\"       : Audio/Video HW I/O management\n"
-		"\t        \"none\"       : no tool logged\n"
-		"\t        \"all\"        : all tools logged\n"
-		"\n"
-		"\t-size WxH:      specifies visual size (default: scene size)\n"
-		"\t-scale s:      scales the visual size (default: 1)\n"
+	        "\t-c fileName:    user-defined configuration file\n"
+	        "\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-opt	option:    Overrides an option in the configuration file. String format is section:key=value\n"
+	        "\t-log-file file: sets output log file.\n"
+	        "\t-log-level lev: sets log level. Possible values are:\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"
+	        "\n"
+	        "\t-log-tools lt:  sets tool(s) to log. List of \':\'-separated values:\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        \"compose\"    : composition engine (2D, 3D, etc)\n"
+	        "\t        \"service\"    : network service management\n"
+	        "\t        \"mmio\"       : Audio/Video HW I/O management\n"
+	        "\t        \"none\"       : no tool logged\n"
+	        "\t        \"all\"        : all tools logged\n"
+	        "\n"
+	        "\t-size WxH:      specifies visual size (default: scene size)\n"
+	        "\t-scale s:      scales the visual size (default: 1)\n"
 #if defined(__DARWIN__) || defined(__APPLE__)
-		"\t-thread:        enables thread usage for terminal and compositor \n"
+	        "\t-thread:        enables thread usage for terminal and compositor \n"
 #else
-		"\t-no-thread:     disables thread usage (except for audio)\n"
+	        "\t-no-thread:     disables thread usage (except for audio)\n"
 #endif
-		"\t-no-audio:	   disables audio \n"
-		"\t-no-wnd:        uses windowless mode (Win32 only)\n"
-		"\t-align vh:      specifies v and h alignment for windowless mode\n"
-		"                   possible v values: t(op), m(iddle), b(ottom)\n"
-		"                   possible h values: l(eft), m(iddle), r(ight)\n"
-		"                   default alignment is top-left\n"
-		"                   default alignment is top-left\n"
-		"\t-pause:         pauses at first frame\n"
-		"\n"
-		"Dumper Options:\n"
-		"\t-bmp [times]:   dumps given frames to bmp\n"
-		"\t-raw [times]:   dumps given frames to bmp\n"
-		"\t-avi [times]:   dumps given file to raw avi\n"
-		"\t-rgbds:         dumps the RGBDS pixel format texture\n"
-		"                   with -avi [times]: dumps an rgbds-format .avi\n"
-		"\t-rgbd:          dumps the RGBD pixel format texture\n"
-		"					with -avi [times]: dumps an rgbd-format .avi\n"		
-		"\t-depth:         dumps depthmap (z-buffer) frames\n"
-		"                   with -avi [times]: dumps depthmap in grayscale .avi\n"		
-		"                   with -bmp: dumps depthmap in grayscale .bmp\n"		
-		"\t-fps FPS:       specifies frame rate for AVI dumping (default: 25.0)\n"
-		"\t-2d:            uses 2D compositor\n"
-		"\t-3d:            uses 3D compositor\n"
-		"\t-fill:          uses fill aspect ratio for dumping (default: none)\n"
-		"\t-show:          show window while dumping (default: no)\n"
-		"MP4Client - GPAC command line player and dumper - version %s\n"
-		"GPAC Written by Jean Le Feuvre (c) 2001-2005 - ENST (c) 2005-200X\n",
-
-		GPAC_FULL_VERSION
-		);
+	        "\t-no-audio:	   disables audio \n"
+	        "\t-no-wnd:        uses windowless mode (Win32 only)\n"
+	        "\t-align vh:      specifies v and h alignment for windowless mode\n"
+	        "                   possible v values: t(op), m(iddle), b(ottom)\n"
+	        "                   possible h values: l(eft), m(iddle), r(ight)\n"
+	        "                   default alignment is top-left\n"
+	        "                   default alignment is top-left\n"
+	        "\t-pause:         pauses at first frame\n"
+	        "\n"
+	        "Dumper Options:\n"
+	        "\t-bmp [times]:   dumps given frames to bmp\n"
+	        "\t-raw [times]:   dumps given frames to bmp\n"
+	        "\t-avi [times]:   dumps given file to raw avi\n"
+	        "\t-rgbds:         dumps the RGBDS pixel format texture\n"
+	        "                   with -avi [times]: dumps an rgbds-format .avi\n"
+	        "\t-rgbd:          dumps the RGBD pixel format texture\n"
+	        "					with -avi [times]: dumps an rgbd-format .avi\n"
+	        "\t-depth:         dumps depthmap (z-buffer) frames\n"
+	        "                   with -avi [times]: dumps depthmap in grayscale .avi\n"
+	        "                   with -bmp: dumps depthmap in grayscale .bmp\n"
+	        "\t-fps FPS:       specifies frame rate for AVI dumping (default: 25.0)\n"
+	        "\t-2d:            uses 2D compositor\n"
+	        "\t-3d:            uses 3D compositor\n"
+	        "\t-fill:          uses fill aspect ratio for dumping (default: none)\n"
+	        "\t-show:          show window while dumping (default: no)\n"
+	        "MP4Client - GPAC command line player and dumper - version %s\n"
+	        "GPAC Written by Jean Le Feuvre (c) 2001-2005 - ENST (c) 2005-200X\n",
+
+	        GPAC_FULL_VERSION
+	       );
 }
 
 
@@ -196,7 +196,7 @@
 
 	/*refresh every second*/
 	if (!display_rti && !rti_logs) return;
-	if (!gf_sys_get_rti(rti_update_time_ms, &rti, 0) && !legend) 
+	if (!gf_sys_get_rti(rti_update_time_ms, &rti, 0) && !legend)
 		return;
 
 	if (display_rti) {
@@ -204,28 +204,28 @@
 		if (!rti.gpac_memory) rti.gpac_memory = (u32) (memory_at_gpac_startup-rti.physical_memory_avail);
 
 		if (display_rti==2) {
-			fprintf(stdout, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB\r", 
-				gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
+			fprintf(stdout, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB\r",
+			        gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
 		} else {
 			char szMsg[1024];
 			GF_Event evt;
 
-			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB", 
-				gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
+			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB",
+			        gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
 			evt.type = GF_EVENT_SET_CAPTION;
 			evt.caption.caption = szMsg;
 			gf_term_user_event(term, &evt);
 		}
 	}
 	if (rti_logs) {
-		fprintf(rti_logs, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t%s", 
-			gf_sys_clock(),
-			gf_term_get_time_in_ms(term),
-			rti.total_cpu_usage,
-			(u32) gf_term_get_framerate(term, 0),
-			(u32) (rti.gpac_memory / 1024), 
-			legend ? legend : ""
-			);
+		fprintf(rti_logs, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t%s",
+		        gf_sys_clock(),
+		        gf_term_get_time_in_ms(term),
+		        rti.total_cpu_usage,
+		        (u32) gf_term_get_framerate(term, 0),
+		        (u32) (rti.gpac_memory / 1024),
+		        legend ? legend : ""
+		       );
 		if (!legend) fprintf(rti_logs, "\n");
 	}
 }
@@ -243,15 +243,25 @@
 		/*get any service info*/
 		if (!startup_file && gf_term_get_service_info(term, gf_term_get_root_object(term), &com) == GF_OK) {
 			strcpy(szName, "");
-			if (com.track_info) { 
+			if (com.track_info) {
 				char szBuf[10];
 				sprintf(szBuf, "%02d ", (u32) (com.track_info>>16) );
 				strcat(szName, szBuf);
 			}
-			if (com.artist) { strcat(szName, com.artist); strcat(szName, " "); }
-			if (com.name) { strcat(szName, com.name); strcat(szName, " "); }
-			if (com.album) { strcat(szName, "("); strcat(szName, com.album); strcat(szName, ")"); }
-			
+			if (com.artist) {
+				strcat(szName, com.artist);
+				strcat(szName, " ");
+			}
+			if (com.name) {
+				strcat(szName, com.name);
+				strcat(szName, " ");
+			}
+			if (com.album) {
+				strcat(szName, "(");
+				strcat(szName, com.album);
+				strcat(szName, ")");
+			}
+
 			if (strlen(szName)) event.caption.caption = szName;
 		}
 		if (!event.caption.caption) {
@@ -270,8 +280,10 @@
 {
 	u32 res;
 	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF; res<<=8;
-	res |= (val>>8)&0xFF; res<<=8;
+	res = (val)&0xFF;
+	res<<=8;
+	res |= (val>>8)&0xFF;
+	res<<=8;
 	res |= (val>>16)&0xFF;
 	return res;
 }
@@ -311,10 +323,10 @@
 		if (evt->message.error) {
 			if (!is_connected) last_error = evt->message.error;
 			fprintf(stderr, "%s (%s): %s\n", evt->message.message, servName, gf_error_to_string(evt->message.error));
-		} else if (!be_quiet) 
+		} else if (!be_quiet)
 			fprintf(stderr, "(%s) %s\r", servName, evt->message.message);
 	}
-		break;
+	break;
 	case GF_EVENT_PROGRESS:
 	{
 		char *szTitle = "";
@@ -323,8 +335,8 @@
 		else if (evt->progress.progress_type==2) szTitle = "Import ";
 		gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
 	}
-		break;
-	
+	break;
+
 
 	case GF_EVENT_DBLCLICK:
 		gf_term_set_option(term, GF_OPT_FULLSCREEN, !gf_term_get_option(term, GF_OPT_FULLSCREEN));
@@ -389,21 +401,21 @@
 		case GF_KEY_D:
 			if (evt->key.flags & GF_KEY_MOD_CTRL) gf_term_set_option(term, GF_OPT_DRAW_MODE, (gf_term_get_option(term, GF_OPT_DRAW_MODE)==GF_DRAW_MODE_DEFER) ? GF_DRAW_MODE_IMMEDIATE : GF_DRAW_MODE_DEFER );
 			break;
-		case GF_KEY_4: 
+		case GF_KEY_4:
 			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3); 
+				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
 			break;
-		case GF_KEY_5: 
+		case GF_KEY_5:
 			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9); 
+				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
 			break;
-		case GF_KEY_6: 
+		case GF_KEY_6:
 			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN); 
+				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
 			break;
-		case GF_KEY_7: 
+		case GF_KEY_7:
 			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP); 
+				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
 			break;
 		case GF_KEY_P:
 			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
@@ -456,7 +468,7 @@
 			move.move.align_y = (align_mode>>8) & 0xFF;
 			move.move.relative = 2;
 			gf_term_user_event(term, &move);
-		} 
+		}
 		break;
 	case GF_EVENT_SCENE_SIZE:
 		if (forced_width && forced_height) {
@@ -481,7 +493,7 @@
 	case GF_EVENT_MIGRATE:
 	{
 	}
-		break;
+	break;
 	case GF_EVENT_NAVIGATE_INFO:
 		if (evt->navigate.to_url) fprintf(stderr, "Go to URL: \"%s\"\r", evt->navigate.to_url);
 		break;
@@ -703,8 +715,8 @@
 	FILE *playlist = NULL;
 	FILE *logfile = NULL;
 	Float scale = 1;
-    
-    /*by default use current dir*/
+
+	/*by default use current dir*/
 	strcpy(the_url, ".");
 
 	memset(&user, 0, sizeof(GF_User));
@@ -726,7 +738,7 @@
 	}
 
 	gf_sys_init(enable_mem_tracker);
-	
+
 	cfg_file = gf_cfg_init(the_cfg, NULL);
 	if (!cfg_file) {
 		fprintf(stdout, "Error: Configuration File \"GPAC.cfg\" not found\n");
@@ -770,7 +782,7 @@
 			dump_mode=9;  /* rgbd texture directly*/
 			if (dump_mode==1) dump_mode = 10;    /* .avi rgbds dump*/
 		} else if (!strcmp(arg, "-depth")) {
-			depth_dump = 1;        
+			depth_dump = 1;
 			if (dump_mode==2) dump_mode=7; /* grayscale .bmp depth dump*/
 			else if (dump_mode==1) dump_mode=8; /* .avi depth dump*/
 			else dump_mode=4;   /*depth dump*/
@@ -830,13 +842,14 @@
 			if (sep) {
 				sep[0] = 0;
 				strcpy(szSec, argv[i+1]);
-				sep[0] = ':'; sep ++;
+				sep[0] = ':';
+				sep ++;
 				sep2 = strchr(sep, '=');
 				if (sep2) {
 					sep2[0] = 0;
 					strcpy(szKey, sep);
 					strcpy(szVal, sep2+1);
-					sep2[0] = '='; 
+					sep2[0] = '=';
 					if (!stricmp(szVal, "null")) szVal[0]=0;
 					gf_cfg_set_key(cfg_file, szSec, szKey, szVal[0] ? szVal : NULL);
 				}
@@ -853,11 +866,11 @@
 		const char *opt = gf_cfg_get_key(cfg_file, "General", "LogFile");
 		if (opt) {
 			logfile = gf_f64_open(opt, "wt");
-			if (logfile) 
+			if (logfile)
 				gf_log_set_callback(logfile, on_gpac_log);
 		}
 	}
-		
+
 	if (dump_mode && !url_arg) {
 		fprintf(stdout, "Missing argument for dump\n");
 		PrintUsage();
@@ -893,7 +906,7 @@
 		return 1;
 	}
 	fprintf(stderr, "Modules Loaded (%d found in %s)\n", i, str);
-	
+
 	user.config = cfg_file;
 	user.EventProc = GPAC_EventProc;
 	/*dummy in this case (global vars) but MUST be non-NULL*/
@@ -902,7 +915,7 @@
 	if (no_audio) user.init_flags |= GF_TERM_NO_AUDIO;
 	if (no_regulation) user.init_flags |= GF_TERM_NO_REGULATION;
 
-	fprintf(stderr, "Loading GPAC Terminal\n");	
+	fprintf(stderr, "Loading GPAC Terminal\n");
 	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");
@@ -959,38 +972,38 @@
 		Run = 0;
 	} else
 
-	/*connect if requested*/
-	if (url_arg) {
-		char *ext;
-		strcpy(the_url, url_arg);
-		ext = strrchr(the_url, '.');
-		if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
-			fprintf(stdout, "Opening Playlist %s\n", the_url);
-			playlist = gf_f64_open(the_url, "rt");
-			if (playlist) {
-				strcpy(pl_path, the_url);
-				fscanf(playlist, "%s", the_url);
-				fprintf(stdout, "Opening URL %s\n", the_url);
-				gf_term_connect_with_path(term, the_url, pl_path);
+		/*connect if requested*/
+		if (url_arg) {
+			char *ext;
+			strcpy(the_url, url_arg);
+			ext = strrchr(the_url, '.');
+			if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
+				fprintf(stdout, "Opening Playlist %s\n", the_url);
+				playlist = gf_f64_open(the_url, "rt");
+				if (playlist) {
+					strcpy(pl_path, the_url);
+					fscanf(playlist, "%s", the_url);
+					fprintf(stdout, "Opening URL %s\n", the_url);
+					gf_term_connect_with_path(term, the_url, pl_path);
+				} else {
+					fprintf(stdout, "Hit 'h' for help\n\n");
+				}
 			} else {
-				fprintf(stdout, "Hit 'h' for help\n\n");
+				fprintf(stdout, "Opening URL %s\n", the_url);
+				if (pause_at_first) fprintf(stdout, "[Status: Paused]\n");
+				gf_term_connect_from_time(term, the_url, 0, pause_at_first);
 			}
 		} else {
-			fprintf(stdout, "Opening URL %s\n", the_url);
-			if (pause_at_first) fprintf(stdout, "[Status: Paused]\n");
-			gf_term_connect_from_time(term, the_url, 0, pause_at_first);
-		}
-	} else {
-		fprintf(stdout, "Hit 'h' for help\n\n");
-		str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
-		if (str) {
-			strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
-			gf_term_connect(term, str);
-			startup_file = 1;
+			fprintf(stdout, "Hit 'h' for help\n\n");
+			str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
+			if (str) {
+				strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
+				gf_term_connect(term, str);
+				startup_file = 1;
+			}
 		}
-	}
 	/*force fullscreen*/
-	if (0 && start_fs) 
+	if (0 && start_fs)
 		gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
 
 	while (Run) {
@@ -1003,7 +1016,7 @@
 			request_next_playlist_item = 0;
 			if (playlist) {
 				gf_term_disconnect(term);
-				
+
 				if (fscanf(playlist, "%s", the_url) == EOF) {
 					fprintf(stdout, "No more items - exiting\n");
 					Run = 0;
@@ -1019,7 +1032,7 @@
 			gf_term_process_step(term);
 			if (auto_exit && gf_term_get_option(term, GF_OPT_IS_OVER)) {
 				Run = 0;
-			} 
+			}
 		} else {
 			gf_sleep(rti_update_time_ms);
 		}

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_sym/osmo4.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_sym/osmo4.cpp Changed

@@ -3,18 +3,18 @@
 
 
 EXPORT_C CApaApplication* NewApplication()
-	{
+{
 	return new COsmo4Application;
-	}
+}
 
 
 #ifdef EKA2
 
 #include <eikstart.h>
 
-GLDEF_C TInt E32Main() 
+GLDEF_C TInt E32Main()
 {
-    return EikStart::RunApplication( NewApplication );
+	return EikStart::RunApplication( NewApplication );
 }
 
 #else
@@ -22,7 +22,7 @@
 
 GLDEF_C TInt E32Dll( TDllReason /*aReason*/ )
 {
-    return KErrNone;
+	return KErrNone;
 }
 
 #endif
@@ -37,37 +37,37 @@
 
 CApaDocument* COsmo4Application::CreateDocumentL()
 {
-    return (static_cast<CApaDocument*> ( COsmo4Document::NewL( *this ) ) );
+	return (static_cast<CApaDocument*> ( COsmo4Document::NewL( *this ) ) );
 }
 
 TUid COsmo4Application::AppDllUid() const
 {
-    return KUidOsmo4App;
+	return KUidOsmo4App;
 }
 
 
 COsmo4Document* COsmo4Document::NewL( CEikApplication& aApp )
 {
-    COsmo4Document* self = NewLC( aApp );
-    CleanupStack::Pop( self );
-    return self;
+	COsmo4Document* self = NewLC( aApp );
+	CleanupStack::Pop( self );
+	return self;
 }
 
 COsmo4Document* COsmo4Document::NewLC( CEikApplication& aApp )
 {
-    COsmo4Document* self =
-        new ( ELeave ) COsmo4Document( aApp );
+	COsmo4Document* self =
+	    new ( ELeave ) COsmo4Document( aApp );
 
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
+	CleanupStack::PushL( self );
+	self->ConstructL();
+	return self;
 }
 void COsmo4Document::ConstructL()
 {
 }
 
 COsmo4Document::COsmo4Document( CEikApplication& aApp )
-    : CAknDocument( aApp )
+	: CAknDocument( aApp )
 {
 }
 
@@ -77,6 +77,6 @@
 
 CEikAppUi* COsmo4Document::CreateAppUiL()
 {
-    return ( static_cast <CEikAppUi*> ( new ( ELeave ) COsmo4AppUi ) );
+	return ( static_cast <CEikAppUi*> ( new ( ELeave ) COsmo4AppUi ) );
 }

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_sym/osmo4.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_sym/osmo4.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_sym/osmo4_ui.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_sym/osmo4_ui.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,7 +35,7 @@
 #include <s32file.h>
 #include <bacline.h>
 #include <eikbtgps.h>
-#include <aknquerydialog.h> 
+#include <aknquerydialog.h>
 
 
 #include "osmo4_ui.h"
@@ -57,11 +57,11 @@
 //
 void COsmo4AppUi::ConstructL()
 {
-    // Initialise app UI with standard value.
-    BaseConstructL(CAknAppUi::EAknEnableSkin);
+	// Initialise app UI with standard value.
+	BaseConstructL(CAknAppUi::EAknEnableSkin);
 
-    /*Create display*/
-    iAppView = COsmo4AppView::NewL( ClientRect() );
+	/*Create display*/
+	iAppView = COsmo4AppView::NewL( ClientRect() );
 	AddToStackL(iAppView);
 
 	/*create playlist*/
@@ -70,7 +70,7 @@
 
 	iPlaylist->MakeVisible(EFalse);
 #endif
-	
+
 	iAppView->MakeVisible(ETrue);
 	view_mode = 0;
 
@@ -114,9 +114,9 @@
 // -----------------------------------------------------------------------------
 //
 COsmo4AppUi::COsmo4AppUi()
-    {
-    // No implementation required
-    }
+{
+	// No implementation required
+}
 
 // -----------------------------------------------------------------------------
 // COsmo4AppUi::~COsmo4AppUi()
@@ -135,8 +135,8 @@
 		if (iPlaylist) RemoveFromStack(iPlaylist);
 		break;
 	}
-    if (iAppView) delete iAppView;
-    if (iPlaylist) delete iPlaylist;
+	if (iAppView) delete iAppView;
+	if (iPlaylist) delete iPlaylist;
 	if (m_title) gf_free(m_title);
 	m_title = NULL;
 }
@@ -201,11 +201,11 @@
 	case EAknSoftkeyBack:
 		if (view_mode==1) TogglePlaylist();
 		break;
-    case EEikCmdExit:
-    case EAknSoftkeyExit:
-        iAppView->Shutdown();
+	case EEikCmdExit:
+	case EAknSoftkeyExit:
+		iAppView->Shutdown();
 		Exit();
-        break;
+		break;
 	/*PLAYLIST commands*/
 	case EOsmo4PlayListAdd:
 		iPlaylist->PlaylistAct(Osmo4PLAdd);
@@ -243,7 +243,7 @@
 		if (statusPane->IsVisible()) statusPane->MakeVisible(EFalse);
 		else statusPane->MakeVisible(ETrue);
 	}
-		break;
+	break;
 	case EOsmo4AROriginal:
 		gf_term_set_option(iAppView->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
 		break;
@@ -297,8 +297,8 @@
 		iAppView->show_rti = !iAppView->show_rti;
 		break;
 
-    case EOsmo4OptEnableLogs:
-    {
+	case EOsmo4OptEnableLogs:
+	{
 		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "General", "Logs");
 		if (opt && !stricmp(opt, "@debug")) {
 			gf_cfg_set_key(iAppView->m_user.config, "General", "Logs", "all@error");
@@ -306,8 +306,8 @@
 			gf_cfg_set_key(iAppView->m_user.config, "General", "Logs", "all@debug");
 		}
 		iAppView->SetupLogs();
-    }
-        break;
+	}
+	break;
 	case EOsmo4OptOpenGL:
 	{
 		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "Compositor", "ForceOpenGL");
@@ -315,7 +315,7 @@
 		gf_cfg_set_key(iAppView->m_user.config, "Compositor", "ForceOpenGL", use_gl ? "no" : "yes");
 		gf_term_set_option(iAppView->m_term, GF_OPT_USE_OPENGL, !use_gl);
 	}
-		break;
+	break;
 	case EOsmo4OptDirectDraw:
 	{
 		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "Compositor", "DirectDraw");
@@ -323,7 +323,7 @@
 		gf_cfg_set_key(iAppView->m_user.config, "Compositor", "DirectDraw", use_dd ? "no" : "yes");
 		gf_term_set_option(iAppView->m_term, GF_OPT_DIRECT_DRAW, !use_dd);
 	}
-		break;
+	break;
 	case EOsmo4OptXMLProgressive:
 	{
 		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "SAXLoader", "Progressive");
@@ -331,9 +331,9 @@
 		gf_cfg_set_key(iAppView->m_user.config, "SAXLoader", "Progressive", use_prog ? "no" : "yes");
 		gf_cfg_set_key(iAppView->m_user.config, "SAXLoader", "MaxDuration", "100");
 	}
-		break;
+	break;
 
-    default:
+	default:
 		if ((aCommand>=EOsmo4OpenRecentFirst) && (aCommand<=EOsmo4OpenRecentLast)) {
 			const char *sOpt = gf_cfg_get_key_name(iAppView->m_user.config, "RecentFiles", aCommand - EOsmo4OpenRecentFirst);
 			if (sOpt) iAppView->Connect(sOpt);
@@ -341,8 +341,8 @@
 			iAppView->MessageBox("Unandled command - panic", "Osmo4");
 			Panic( EOsmo4Ui );
 		}
-        break;
-    }
+		break;
+	}
 #endif
 }
 
@@ -359,7 +359,7 @@
 #ifndef GPAC_GUI_ONLY
 	iPlaylist->SetRect( ClientRect() );
 #endif
-} 
+}
 
 void COsmo4AppUi::TogglePlaylist()
 {
@@ -373,7 +373,7 @@
 		AddToStackL(iPlaylist);
 		if (cba) {
 			cba->SetCommandSetL(R_AVKON_SOFTKEYS_OPTIONS_BACK);
-       		cba->DrawDeferred();	
+			cba->DrawDeferred();
 		}
 		view_was_max = StatusPane()->IsVisible() ? 0 : 1;
 		if (view_was_max) StatusPane()->MakeVisible(ETrue);
@@ -386,7 +386,7 @@
 		AddToStackL(iAppView);
 		if (cba) {
 			cba->SetCommandSetL(R_AVKON_SOFTKEYS_OPTIONS_EXIT);
-       		cba->DrawDeferred();	
+			cba->DrawDeferred();
 		}
 		iAppView->ShowHide(1);
 		if (view_was_max) StatusPane()->MakeVisible(EFalse);
@@ -413,8 +413,8 @@
 void COsmo4AppUi::SetTitleInfo(const char *title)
 {
 #if 1
-    CEikStatusPane* statusPane = StatusPane();
-    CAknTitlePane *iTitlePane = (CAknTitlePane*) statusPane->ControlL(TUid::Uid(EEikStatusPaneUidTitle));
+	CEikStatusPane* statusPane = StatusPane();
+	CAknTitlePane *iTitlePane = (CAknTitlePane*) statusPane->ControlL(TUid::Uid(EEikStatusPaneUidTitle));
 
 	if (!title) title = "Osmo4";
 
@@ -453,7 +453,7 @@
 		item.iFlags = has_sep ? EEikMenuItemSeparatorAfter : 0;	\
 		if (__check) item.iFlags |= EEikMenuItemCheckBox | EEikMenuItemSymbolOn; \
 		item.iCascadeId = __res;	\
-		aMenuPane->AddMenuItemL(item);	
+		aMenuPane->AddMenuItemL(item);
 
 
 void COsmo4AppUi::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane)
@@ -461,7 +461,7 @@
 	CEikMenuPaneItem::SData item;
 
 	if (aResourceId==R_OSMO4_MENU) {
-        
+
 		aMenuPane->Reset();
 
 		if (view_mode==1) {
@@ -496,12 +496,12 @@
 		}
 		smenu_id = 0;
 		return;
-	} 
+	}
 	else if (aResourceId==R_OSMO4_SM1) {
 		aMenuPane->Reset();
 		/*sort menu*/
 		if (view_mode==1) {
-		} 
+		}
 		/*file menu*/
 		else {
 			DECLARE_MENU_ITEM(_L("Open local"), EOsmo4PlayListView, 0, 0, 0);
@@ -514,10 +514,10 @@
 		}
 		smenu_id = 1;
 		return;
-	} 
+	}
 	/*not used*/
 	if (view_mode==1) return;
-	
+
 	/*View menu*/
 	if (aResourceId==R_OSMO4_SM2) {
 		aMenuPane->Reset();
@@ -546,11 +546,11 @@
 		DECLARE_MENU_ITEM(_L("Progressive XML"), EOsmo4OptXMLProgressive, (opt && !strcmp(opt, "yes")) ? 1 : 0, 0, 0);
 
 #endif
-		
+
 		DECLARE_MENU_ITEM(_L("Enable Logs"), EOsmo4OptEnableLogs, iAppView->do_log, 0, 0);
 		return;
 	}
-	
+
 	if (aResourceId==R_OSMO4_SSM1) {
 		aMenuPane->Reset();
 		if (smenu_id == 1) {
@@ -565,7 +565,8 @@
 				else sep += 1;
 				item.iText.Copy( TPtrC8(( TText8* ) sep)  );
 				item.iCommandId = EOsmo4OpenRecentFirst + i;
-				item.iFlags = 0; item.iCascadeId = 0;
+				item.iFlags = 0;
+				item.iCascadeId = 0;
 				aMenuPane->AddMenuItemL(item);
 				i++;
 				if (i>=10) break;
@@ -591,7 +592,7 @@
 		}
 		return;
 	}
-	
+
 	if (aResourceId==R_OSMO4_SSM2) {
 		aMenuPane->Reset();
 		DECLARE_MENU_ITEM(_L("Keep Original"), EOsmo4AROriginal, 0, 0, 0);

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_sym/osmo4_ui.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_sym/osmo4_ui.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -39,10 +39,10 @@
 enum TOsmo4Ids
 {
 	/*Playlist commands*/
-    EOsmo4PlayListView = 0x6001,
+	EOsmo4PlayListView = 0x6001,
 	EOsmo4PlayListAdd,
 	EOsmo4PlayListRem,
-    EOsmo4PlayListMode,
+	EOsmo4PlayListMode,
 	EOsmo4PlayListMoveUp,
 	EOsmo4PlayListMoveDown,
 	EOsmo4PlayListClear,
@@ -72,10 +72,10 @@
 	EOsmo4ViewRTI,
 
 	/*option commands*/
-    EOsmo4OptEnableLogs,
-    EOsmo4OptOpenGL,
-    EOsmo4OptDirectDraw,
-    EOsmo4OptXMLProgressive,
+	EOsmo4OptEnableLogs,
+	EOsmo4OptOpenGL,
+	EOsmo4OptDirectDraw,
+	EOsmo4OptXMLProgressive,
 
 
 };
@@ -84,14 +84,14 @@
 /** osmo4 application panic codes */
 enum TOsmo4Panics
 {
-    EOsmo4Ui = 1
-    // add further panics here
+	EOsmo4Ui = 1
+	           // add further panics here
 };
 
 inline void Panic(TOsmo4Panics aReason)
 {
-    _LIT(applicationName,"Osmo4");
-    User::Panic(applicationName, aReason);
+	_LIT(applicationName,"Osmo4");
+	User::Panic(applicationName, aReason);
 }
 
 
@@ -109,71 +109,71 @@
 * from the handler class
 */
 class COsmo4AppUi : public CAknAppUi
-    {
-    public: // Constructors and destructor
-
-        /**
-        * ConstructL.
-        * 2nd phase constructor.
-        */
-        void ConstructL();
-
-        /**
-        * COsmo4AppUi.
-        * C++ default constructor. This needs to be public due to
-        * the way the framework constructs the AppUi
-        */
-        COsmo4AppUi();
-
-        /**
-        * ~COsmo4AppUi.
-        * Virtual Destructor.
-        */
-        virtual ~COsmo4AppUi();
-
-    private:  // Functions from base classes
-
-        /**
-        * From CEikAppUi, HandleCommandL.
-        * Takes care of command handling.
-        * @param aCommand Command to be handled.
-        */
-        void HandleCommandL( TInt aCommand );
-
-
-        /**
-        *  HandleStatusPaneSizeChange.
-        *  Called by the framework when the application status pane
- 		*  size is changed.
-        */
-
-		void HandleStatusPaneSizeChange();
-		virtual void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane);
+{
+public: // Constructors and destructor
+
+	/**
+	* ConstructL.
+	* 2nd phase constructor.
+	*/
+	void ConstructL();
+
+	/**
+	* COsmo4AppUi.
+	* C++ default constructor. This needs to be public due to
+	* the way the framework constructs the AppUi
+	*/
+	COsmo4AppUi();
+
+	/**
+	* ~COsmo4AppUi.
+	* Virtual Destructor.
+	*/
+	virtual ~COsmo4AppUi();
+
+private:  // Functions from base classes
+
+	/**
+	* From CEikAppUi, HandleCommandL.
+	* Takes care of command handling.
+	* @param aCommand Command to be handled.
+	*/
+	void HandleCommandL( TInt aCommand );
+
+
+	/**
+	*  HandleStatusPaneSizeChange.
+	*  Called by the framework when the application status pane
+	*  size is changed.
+	*/
+
+	void HandleStatusPaneSizeChange();
+	virtual void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane);
 
 public:
-		void PlayURL(const char *);
-		void SetTitle(const char *title, TBool store_it = ETrue);
-		void SetInfo(const char *);
+	void PlayURL(const char *);
+	void SetTitle(const char *title, TBool store_it = ETrue);
+	void SetInfo(const char *);
 
 private:
-		void TogglePlaylist();
-		void SetTitleInfo(const char *);
-		void HandleForegroundEventL(TBool aForeground);
-		void CaptureKeys(int do_capture);
-		void CaptureKey(TInt32 code, TInt32 scancode);
-		
+	void TogglePlaylist();
+	void SetTitleInfo(const char *);
+	void HandleForegroundEventL(TBool aForeground);
+	void CaptureKeys(int do_capture);
+	void CaptureKey(TInt32 code, TInt32 scancode);
+
 private:
-        COsmo4AppView* iAppView;
-		CPlaylist *iPlaylist;
-		int view_was_max;
-		int smenu_id;
-		char *m_title;
-		/*current view mode*/
-		int view_mode;
-
-		KeyCapInfo keys[MAX_KEY_CAP];
-		int nb_keys;
-    };
+	COsmo4AppView* iAppView;
+	CPlaylist *iPlaylist;
+	int view_was_max;
+	int smenu_id;
+	char *m_title;
+	/*current view mode*/
+	int view_mode;
+
+	KeyCapInfo keys[MAX_KEY_CAP];
+	int nb_keys;
+};
 
 #endif // __OSMO4_UI_H__

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_sym/osmo4_view.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_sym/osmo4_view.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -53,9 +53,9 @@
 //
 COsmo4AppView* COsmo4AppView::NewL( const TRect& aRect )
 {
-    COsmo4AppView* self = COsmo4AppView::NewLC( aRect );
-    CleanupStack::Pop( self );
-    return self;
+	COsmo4AppView* self = COsmo4AppView::NewLC( aRect );
+	CleanupStack::Pop( self );
+	return self;
 }
 
 // -----------------------------------------------------------------------------
@@ -65,10 +65,10 @@
 //
 COsmo4AppView* COsmo4AppView::NewLC( const TRect& aRect )
 {
-    COsmo4AppView* self = new ( ELeave ) COsmo4AppView;
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    return self;
+	COsmo4AppView* self = new ( ELeave ) COsmo4AppView;
+	CleanupStack::PushL( self );
+	self->ConstructL( aRect );
+	return self;
 }
 
 
@@ -80,7 +80,7 @@
 //
 COsmo4AppView::COsmo4AppView()
 {
-    // No implementation required
+	// No implementation required
 	m_pTimer = NULL;
 #ifndef GPAC_GUI_ONLY
 	memset(&m_user, 0, sizeof(GF_User));
@@ -134,7 +134,7 @@
 		fclose(m_Logs);
 		m_Logs = NULL;
 	}
-    if (m_user.config) {
+	if (m_user.config) {
 		gf_cfg_del(m_user.config);
 		m_user.config = NULL;
 	}
@@ -152,11 +152,11 @@
 	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;
@@ -251,7 +251,7 @@
 	}
 	/*setup GPAC logs: log all errors*/
 	opt = gf_cfg_get_key(m_user.config, "General", "Logs");
-	if (opt && !strstr(opt, "none")){ 
+	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");
@@ -312,12 +312,12 @@
 	selector->OpenTargetL();
 #endif
 
-    // Create a window for this application view
-    CreateWindowL();
-    // Set the windows size
-    SetRect( aRect );
+	// Create a window for this application view
+	CreateWindowL();
+	// Set the windows size
+	SetRect( aRect );
 	//draw
-    ActivateL();
+	ActivateL();
 
 #ifndef GPAC_GUI_ONLY
 	m_window = Window();
@@ -357,7 +357,7 @@
 		}
 	}
 
-	/*we don't thread the terminal, ie appart from the audio renderer, media decoding and visual rendering is 
+	/*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;
@@ -410,11 +410,11 @@
 		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);
+	CWindowGc& gc = SystemGc();
+	TRgb black(0,0,0);
+	TRect rect = Rect();
+	gc.SetBrushColor(black);
+	gc.Clear(rect);
 #endif
 }
 
@@ -442,7 +442,7 @@
 // -----------------------------------------------------------------------------
 //
 void COsmo4AppView::SizeChanged()
-{  
+{
 #ifndef GPAC_GUI_ONLY
 	if (m_term) {
 		TSize s = m_window.Size();
@@ -488,16 +488,32 @@
 	}
 
 	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;
+	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;
+		case EStdKeyIncVolume:
+			evt.key.key_code = GF_KEY_VOLUMEUP;
+			break;
+		case EStdKeyDecVolume:
+			evt.key.key_code = GF_KEY_VOLUMEDOWN;
+			break;
 		default:
 			return EKeyWasNotConsumed;
 		}
@@ -520,25 +536,25 @@
 {
 	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;
-		}
-*/
+	/*
+	    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
@@ -546,18 +562,18 @@
 		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; 
+		case ERemConCoreApiButtonPress:
+			e.type = GF_EVENT_KEYDOWN;
 			gf_term_user_event(m_term, &e);
 			break;
-		case ERemConCoreApiButtonRelease: 
-			e.type = GF_EVENT_KEYUP; 
+		case ERemConCoreApiButtonRelease:
+			e.type = GF_EVENT_KEYUP;
 			gf_term_user_event(m_term, &e);
 			break;
-		default: 
-			e.type = GF_EVENT_KEYDOWN; 
+		default:
+			e.type = GF_EVENT_KEYDOWN;
 			gf_term_user_event(m_term, &e);
-			e.type = GF_EVENT_KEYUP; 
+			e.type = GF_EVENT_KEYUP;
 			gf_term_user_event(m_term, &e);
 			break;
 		}

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_sym/osmo4_view.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_sym/osmo4_view.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -44,121 +44,125 @@
 // CLASS DECLARATION
 class COsmo4AppView : public CCoeControl
 #if defined(__SERIES60_3X__)
-		,MRemConCoreApiTargetObserver
+	,MRemConCoreApiTargetObserver
 #endif
 
-    {
-    public: // New methods
-
-        /**
-        * NewL.
-        * Two-phased constructor.
-        * Create a COsmo4AppView object, which will draw itself to aRect.
-        * @param aRect The rectangle this view will be drawn to.
-        * @return a pointer to the created instance of COsmo4AppView.
-        */
-        static COsmo4AppView* NewL( const TRect& aRect );
-
-        /**
-        * NewLC.
-        * Two-phased constructor.
-        * Create a COsmo4AppView object, which will draw itself
-        * to aRect.
-        * @param aRect Rectangle this view will be drawn to.
-        * @return A pointer to the created instance of COsmo4AppView.
-        */
-        static COsmo4AppView* NewLC( const TRect& aRect );
-
-        /**
-        * ~COsmo4AppView
-        * Virtual Destructor.
-        */
-        virtual ~COsmo4AppView();
-
-    public:  // Functions from base classes
-
-        /**
-        * From CCoeControl, Draw
-        * Draw this COsmo4AppView to the screen.
-        * @param aRect the rectangle of this view that needs updating
-        */
-        void Draw( const TRect& aRect ) const;
-
-        /**
-        * From CoeControl, SizeChanged.
-        * Called by framework when the view size is changed.
-        */
-        virtual void SizeChanged();
+{
+public: // New methods
+
+	/**
+	* NewL.
+	* Two-phased constructor.
+	* Create a COsmo4AppView object, which will draw itself to aRect.
+	* @param aRect The rectangle this view will be drawn to.
+	* @return a pointer to the created instance of COsmo4AppView.
+	*/
+	static COsmo4AppView* NewL( const TRect& aRect );
+
+	/**
+	* NewLC.
+	* Two-phased constructor.
+	* Create a COsmo4AppView object, which will draw itself
+	* to aRect.
+	* @param aRect Rectangle this view will be drawn to.
+	* @return A pointer to the created instance of COsmo4AppView.
+	*/
+	static COsmo4AppView* NewLC( const TRect& aRect );
+
+	/**
+	* ~COsmo4AppView
+	* Virtual Destructor.
+	*/
+	virtual ~COsmo4AppView();
+
+public:  // Functions from base classes
+
+	/**
+	* From CCoeControl, Draw
+	* Draw this COsmo4AppView to the screen.
+	* @param aRect the rectangle of this view that needs updating
+	*/
+	void Draw( const TRect& aRect ) const;
+
+	/**
+	* From CoeControl, SizeChanged.
+	* Called by framework when the view size is changed.
+	*/
+	virtual void SizeChanged();
 
 #ifndef GPAC_GUI_ONLY
-		GF_User *GetUser() { return &m_user; }
+	GF_User *GetUser() {
+		return &m_user;
+	}
 #else
-		GF_User *GetUser() { return NULL; }
+	GF_User *GetUser() {
+		return NULL;
+	}
 #endif
-		void SetupLogs();
-		void MessageBox(const char *text, const char *title);
+	void SetupLogs();
+	void MessageBox(const char *text, const char *title);
 
-		virtual TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
+	virtual TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
 
 #if defined(__SERIES60_3X__)
-		void MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct);
+	void MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct);
 #endif
 
-		TInt OnTick();
+	TInt OnTick();
+
+	void Shutdown();
 
-		void Shutdown();
-	
-		void Connect(const char *url);
-		void ShowHide(Bool show);
-		Bool EventProc(GF_Event *evt);
+	void Connect(const char *url);
+	void ShowHide(Bool show);
+	Bool EventProc(GF_Event *evt);
 
 #ifndef GPAC_GUI_ONLY
-		GF_Terminal *m_term;
+	GF_Terminal *m_term;
 #endif
 
-    private: // Constructors
+private: // Constructors
 
-        /**
-        * ConstructL
-        * 2nd phase constructor.
-        * Perform the second phase construction of a
-        * COsmo4AppView object.
-        * @param aRect The rectangle this view will be drawn to.
-        */
-        void ConstructL(const TRect& aRect);
+	/**
+	* ConstructL
+	* 2nd phase constructor.
+	* Perform the second phase construction of a
+	* COsmo4AppView object.
+	* @param aRect The rectangle this view will be drawn to.
+	*/
+	void ConstructL(const TRect& aRect);
 
-		void DisplayRTI();
+	void DisplayRTI();
 
-        /**
-        * COsmo4AppView.
-        * C++ default constructor.
-        */
-        COsmo4AppView();
+	/**
+	* COsmo4AppView.
+	* C++ default constructor.
+	*/
+	COsmo4AppView();
 
-		CPeriodic *m_pTimer;
+	CPeriodic *m_pTimer;
 
-		RWindow m_window;
-		RWsSession m_session;
+	RWindow m_window;
+	RWsSession m_session;
 #ifndef GPAC_GUI_ONLY
-		GF_SystemRTInfo m_rti;
+	GF_SystemRTInfo m_rti;
 #endif
 
 #if defined(__SERIES60_3X__)
-		CRemConInterfaceSelector *selector;
-		CRemConCoreApiTarget *target;
+	CRemConInterfaceSelector *selector;
+	CRemConCoreApiTarget *target;
 #endif
 
 
 public:
-		u32 last_title_update;
-		FILE *m_Logs;
-		Bool do_log;
-		Bool show_rti;
+	u32 last_title_update;
+	FILE *m_Logs;
+	Bool do_log;
+	Bool show_rti;
 #ifndef GPAC_GUI_ONLY
-		GF_Mutex *m_mx;
-		GF_User m_user;
+	GF_Mutex *m_mx;
+	GF_User m_user;
 #endif
-    };
+};
 
 
 #endif // __OSMO4_VIEW_H__

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_sym/playlist.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_sym/playlist.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -48,27 +48,27 @@
 }
 CPlaylist::~CPlaylist()
 {
-    delete iListBox;
+	delete iListBox;
 	delete iBackGround;
 }
 
 CPlaylist* CPlaylist::NewL( const TRect& aRect, GF_User *user)
 {
-    CPlaylist* self = CPlaylist::NewLC( aRect, user);
-    CleanupStack::Pop( self );
-    return self;
+	CPlaylist* self = CPlaylist::NewLC( aRect, user);
+	CleanupStack::Pop( self );
+	return self;
 }
 CPlaylist* CPlaylist::NewLC( const TRect& aRect, GF_User *user)
 {
-    CPlaylist* self = new ( ELeave ) CPlaylist;
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect, user);
-    return self;
+	CPlaylist* self = new ( ELeave ) CPlaylist;
+	CleanupStack::PushL( self );
+	self->ConstructL( aRect, user);
+	return self;
 }
 
 void CPlaylist::ConstructL(const TRect& aRect, GF_User *user)
 {
-    CreateWindowL();
+	CreateWindowL();
 
 #ifdef USE_SKIN
 	iListBox = new (ELeave) CAknSingleStyleListBox();
@@ -81,17 +81,17 @@
 
 	CDesCArray* textArray = new (ELeave) CDesCArrayFlat(16);
 	iListBox->Model()->SetItemTextArray( textArray );
-    iListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );
+	iListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );
 
-    // Creates scrollbar.
-    iListBox->CreateScrollBarFrameL( ETrue );
-    iListBox->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto);
-    //iListBox->ActivateL();
+	// Creates scrollbar.
+	iListBox->CreateScrollBarFrameL( ETrue );
+	iListBox->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto);
+	//iListBox->ActivateL();
 
 	iListBox->SetFocus(ETrue);
 
-    SetRect(aRect);
-    ActivateL();
+	SetRect(aRect);
+	ActivateL();
 	MakeVisible(EFalse);
 
 	strcpy(szCurrentDir, "");
@@ -127,10 +127,10 @@
 void CPlaylist::Draw(const TRect& aRect) const
 {
 #ifdef USE_SKIN
-    CWindowGc& gc = SystemGc();
+	CWindowGc& gc = SystemGc();
 	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 	MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
-    AknsDrawUtils::Background( skin, cc, this, gc, aRect );
+	AknsDrawUtils::Background( skin, cc, this, gc, aRect );
 #endif
 
 }
@@ -152,28 +152,30 @@
 }
 CCoeControl* CPlaylist::ComponentControl(TInt aIndex) const
 {
-    switch (aIndex) {
-	case 0: return iListBox;
-	default: return NULL;
+	switch (aIndex) {
+	case 0:
+		return iListBox;
+	default:
+		return NULL;
 	}
 }
 
 TKeyResponse CPlaylist::OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType)
 {
-	if (aType != EEventKey) return iListBox->OfferKeyEventL(aKeyEvent, aType);   
+	if (aType != EEventKey) return iListBox->OfferKeyEventL(aKeyEvent, aType);
 
-    switch (aKeyEvent.iScanCode) {
+	switch (aKeyEvent.iScanCode) {
 	case EStdKeyEnter:
 		HandleSelection();
 		return EKeyWasConsumed;
 	default:
-		return iListBox->OfferKeyEventL(aKeyEvent, aType);    
+		return iListBox->OfferKeyEventL(aKeyEvent, aType);
 	}
 }
 void CPlaylist::HandleListBoxEventL(CEikListBox* aListBox, TListBoxEvent aEventType )
 {
-    if (aEventType == MEikListBoxObserver::EEventItemClicked ||
-		aEventType == MEikListBoxObserver::EEventEnterKeyPressed)
+	if (aEventType == MEikListBoxObserver::EEventItemClicked ||
+	        aEventType == MEikListBoxObserver::EEventEnterKeyPressed)
 
 		HandleSelection();
 }
@@ -231,14 +233,14 @@
 	array->AppendL(tmp);
 }
 
-static Bool enum_dirs(void *cbk, char *name, char *path)
+static Bool enum_dirs(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
 {
 	CPlaylist *of = (CPlaylist *)cbk;
 	of->AddItem(name, 1);
 	return 0;
 }
 
-static Bool enum_files(void *cbk, char *name, char *path)
+static Bool enum_files(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
 {
 	CPlaylist *of = (CPlaylist *)cbk;
 	of->AddItem(name, 0);
@@ -255,7 +257,7 @@
 		TDriveList aList;
 		iFs.Connect();
 		iFs.DriveList(aList);
-		for (TInt i=0;i<KMaxDrives;i++) {
+		for (TInt i=0; i<KMaxDrives; i++) {
 			if (aList[i]) {
 				TChar aDrive;
 				iFs.DriveToChar(i, aDrive);
@@ -395,7 +397,7 @@
 	return 0;
 }
 
-static Bool dir_add_files(void *cbk, char *name, char *path)
+static Bool dir_add_files(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
 {
 	CPlaylist *pl = (CPlaylist *)cbk;

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_sym/playlist.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_sym/playlist.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -68,12 +68,16 @@
 	TInt CountComponentControls() const;
 	CCoeControl* ComponentControl(TInt aIndex) const;
 	void Draw(const TRect& aRect) const;
-	
+
 	void ShowHide(Bool show);
 	Bool SelectionIsFile();
 	Bool IsInPlaylist();
-	Bool PlaylistMode() { return playlist_mode; }
-	Bool ViewAllFiles() { return view_all_files; }
+	Bool PlaylistMode() {
+		return playlist_mode;
+	}
+	Bool ViewAllFiles() {
+		return view_all_files;
+	}
 
 	void PlaylistAct(Osmo4_PLActions act);
 
@@ -82,8 +86,8 @@
 #endif
 
 private:
-    void ConstructL(const TRect& aRect, GF_User *user);
-    CPlaylist();
+	void ConstructL(const TRect& aRect, GF_User *user);
+	CPlaylist();
 
 
 #ifdef USE_SKIN
@@ -99,7 +103,7 @@
 	void GetSelectionName(char *name);
 	void RefreshPlaylist();
 
-	char szCurrentDir[1024];	
+	char szCurrentDir[1024];
 	CEikTextListBox* iListBox;
 	Bool playlist_mode;
 	Bool view_all_files;

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/AddressBar.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/AddressBar.cpp Changed

@@ -79,7 +79,7 @@
 BOOL AddressBar::OnInitDialog()
 {
 	CInitDialogBar::OnInitDialog();
-	
+
 	return TRUE;
 }
 
@@ -97,12 +97,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // AddressBar message handlers
 
-void AddressBar::OnSize(UINT nType, int cx, int cy) 
+void AddressBar::OnSize(UINT nType, int cx, int cy)
 {
 	u32 w;
 	POINT pt;
 	//CDialog::OnSize(nType, cx, cy);
-	
+
 	if (!m_Address.m_hWnd) return;
 	RECT rc;
 	m_Title.GetClientRect(&rc);
@@ -116,7 +116,7 @@
 
 }
 
-void AddressBar::OnClose() 
+void AddressBar::OnClose()
 {
 }
 
@@ -134,7 +134,7 @@
 	}
 }
 
-void AddressBar::SelectionReady() 
+void AddressBar::SelectionReady()
 {
 	void UpdateLastFiles(GF_Config *cfg, const char *URL);
 
@@ -159,12 +159,12 @@
 	pl->PlayNext();
 }
 
-void AddressBar::OnSelendOK() 
+void AddressBar::OnSelendOK()
 {
 	SelectionReady();
 }
 
-BOOL AddressBar::PreTranslateMessage(MSG* pMsg) 
+BOOL AddressBar::PreTranslateMessage(MSG* pMsg)
 {
 	if (pMsg->message == WM_KEYDOWN) {
 		switch (pMsg->wParam) {

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/AddressBar.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/AddressBar.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/FileProps.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/FileProps.cpp Changed

@@ -56,13 +56,13 @@
 
 #define FP_TIMER_ID	20
 
-BOOL CFileProps::OnInitDialog() 
+BOOL CFileProps::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
 	char sText[5000];
 	sprintf(sText, "%s Properties", ((CMainFrame*)GetApp()->m_pMainWnd)->m_pPlayList->GetDisplayName());
-	
+
 	SetWindowText(sText);
 	current_odm = NULL;
 
@@ -114,7 +114,7 @@
 void CFileProps::RewriteODTree()
 {
 	Osmo4 *gpac = GetApp();
-	
+
 	m_ODTree.DeleteAllItems();
 
 	GF_ObjectManager *root_odm = gf_term_get_root_object(gpac->m_term);
@@ -127,35 +127,35 @@
 	WriteInlineTree(root_odm, root);
 }
 
-void CFileProps::OnSelchangedOdtree(NMHDR* pNMHDR, LRESULT* pResult) 
+void CFileProps::OnSelchangedOdtree(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
 	*pResult = 0;
-	
+
 	HTREEITEM item = m_ODTree.GetSelectedItem();
 	GF_ObjectManager *odm = (GF_ObjectManager *) m_ODTree.GetItemData(item);
 	if (!odm) return;
-	
+
 	SetInfo(odm);
 }
 
 
-void CFileProps::OnClose() 
+void CFileProps::OnClose()
 {
 	KillTimer(FP_TIMER_ID);
 	DestroyWindow();
 }
 
-void CFileProps::OnDestroy() 
+void CFileProps::OnDestroy()
 {
 	CDialog::OnDestroy();
 	delete this;
 	((CMainFrame *)GetApp()->m_pMainWnd)->m_pProps = NULL;
 }
 
-void CFileProps::OnSelchangeViewsel(NMHDR* pNMHDR, LRESULT* pResult) 
+void CFileProps::OnSelchangeViewsel(NMHDR* pNMHDR, LRESULT* pResult)
 {
-	SetInfo(current_odm);	
+	SetInfo(current_odm);
 	*pResult = 0;
 }
 
@@ -163,22 +163,34 @@
 {
 	current_odm = odm;
 	switch (m_ViewSel.GetCurSel()) {
-	case 3: SetNetworkInfo(); break;
-	case 2: SetDecoderInfo(); break;
-	case 1: SetStreamsInfo(); break;
-	default: SetGeneralInfo(); break;
+	case 3:
+		SetNetworkInfo();
+		break;
+	case 2:
+		SetDecoderInfo();
+		break;
+	case 1:
+		SetStreamsInfo();
+		break;
+	default:
+		SetGeneralInfo();
+		break;
 	}
 }
 
-void CFileProps::OnTimer(UINT_PTR nIDEvent) 
+void CFileProps::OnTimer(UINT_PTR nIDEvent)
 {
 	if (nIDEvent == FP_TIMER_ID) {
 		switch (m_ViewSel.GetCurSel()) {
-		case 3: SetNetworkInfo(); break;
-		case 2: SetDecoderInfo(); break;
+		case 3:
+			SetNetworkInfo();
+			break;
+		case 2:
+			SetDecoderInfo();
+			break;
 		}
 	}
-	
+
 	CDialog::OnTimer(nIDEvent);
 }
 
@@ -220,12 +232,12 @@
 		strcat(info, odi.service_url);
 		strcat(info, "\r\n");
 	}
-	
+
 	if (odi.od->URLString) {
 		strcat(info, "Remote OD - URL: ");
 		strcat(info, odi.od->URLString);
 		strcat(info, "\r\n");
-	} 
+	}
 	/*get OD content info*/
 	if (odi.codec_name) {
 		switch (odi.od_type) {
@@ -296,7 +308,7 @@
 			sprintf(buf, "Name: %s - start time %g sec - duration %g sec\r\n", sd->SegmentName, sd->startTime, sd->Duration);
 			strcat(info, buf);
 		}
-			break;
+		break;
 		case GF_ODF_CC_NAME_TAG:
 		{
 			GF_CC_Name *ccn = (GF_CC_Name *)desc;
@@ -309,18 +321,18 @@
 				strcat(info, "\r\n");
 			}
 		}
-			break;
+		break;
 
 		case GF_ODF_SHORT_TEXT_TAG:
-			{
-				GF_ShortTextual *std = (GF_ShortTextual *)desc;
-				strcat(info, "\r\n");
-				strcat(info, std->eventName);
-				strcat(info, ": ");
-				strcat(info, std->eventText);
-				strcat(info, "\r\n");
-			}
-			break;
+		{
+			GF_ShortTextual *std = (GF_ShortTextual *)desc;
+			strcat(info, "\r\n");
+			strcat(info, std->eventName);
+			strcat(info, ": ");
+			strcat(info, std->eventText);
+			strcat(info, "\r\n");
+		}
+		break;
 		/*todo*/
 		case GF_ODF_CC_DATE_TAG:
 			break;
@@ -333,7 +345,7 @@
 	m_ODInfo.SetWindowText(info);
 }
 
-void CFileProps::OnWorld() 
+void CFileProps::OnWorld()
 {
 	CString wit;
 	const char *str;
@@ -357,14 +369,14 @@
 	gf_list_del(descs);
 }
 
-void CFileProps::OnViewsg() 
+void CFileProps::OnViewsg()
 {
 	char szOutRadname[GF_MAX_PATH], *pFilename=NULL;
 	Osmo4 *gpac = GetApp();
 
 	strcpy(szOutRadname, gpac->szUserPath);
 	if ( szOutRadname[strlen(szOutRadname)-1] != '\\'
-		&& szOutRadname[strlen(szOutRadname)-1] != '/')
+	        && szOutRadname[strlen(szOutRadname)-1] != '/')
 		strcat(szOutRadname, "\\");
 	strcat(szOutRadname, "scene_dump");
 
@@ -435,12 +447,12 @@
 	}
 
 	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; 
+	if (odi.nb_dec_frames) {
+		avg_dec_time = (Float) odi.total_dec_time;
+		avg_dec_time /= odi.nb_dec_frames;
 	}
-	sprintf(buf, "Bitrate over last second: %d kbps\r\nMax bitrate over one second: %d kbps\r\nAverage Decoding Time %.2f ms (%d max)\r\nTotal decoded frames %d - %d dropped\r\n", 
-		(u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames, odi.nb_droped);
+	sprintf(buf, "Bitrate over last second: %d kbps\r\nMax bitrate over one second: %d kbps\r\nAverage Decoding Time %.2f ms (%d max)\r\nTotal decoded frames %d - %d dropped\r\n",
+	        (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames, odi.nb_droped);
 	strcat(info, buf);
 
 	m_ODInfo.SetWindowText(info);
@@ -512,30 +524,22 @@
 
 		/*check language*/
 		if (esd->langDesc) {
-			u32 i=0;
-			char lan[4], *szLang;
+			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;
 
-			if ((lan[0]=='u') && (lan[1]=='n') && (lan[2]=='d')) szLang = "Undetermined";
-			else {
-				szLang = lan;
-				while (GF_ISO639_Lang[i]) {
-					if (GF_ISO639_Lang[i+2][0] && strstr(GF_ISO639_Lang[i+1], lan)) {
-						szLang = (char*) GF_ISO639_Lang[i];
-						break;
-					}
-					i+=3;
-				}
+			lang_idx = gf_lang_find(lan);
+			if (lang_idx>=0) {
+				sprintf(buf, "Stream Language: %s\r\n", gf_lang_get_name(lang_idx) );
+				strcat(info, buf);
 			}
-			sprintf(buf, "Stream Language: %s\r\n", szLang);
-			strcat(info, buf);
 		}
 		strcat(info, "\r\n");
 	}
-	
+
 	m_ODInfo.SetWindowText(info);
 }

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/FileProps.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/FileProps.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/MainFrm.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/MainFrm.cpp Changed

@@ -40,13 +40,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // CChildView message handlers
 
-BOOL CChildView::PreCreateWindow(CREATESTRUCT& cs) 
+BOOL CChildView::PreCreateWindow(CREATESTRUCT& cs)
 {
 	cs.dwExStyle = 0;
 	cs.style &= ~WS_BORDER;
 
-	cs.lpszClass = AfxRegisterWndClass(CS_HREDRAW|CS_VREDRAW|CS_DBLCLKS, 
-		::LoadCursor(NULL, IDC_ARROW), HBRUSH(COLOR_WINDOW+1), NULL);
+	cs.lpszClass = AfxRegisterWndClass(CS_HREDRAW|CS_VREDRAW|CS_DBLCLKS,
+	                                   ::LoadCursor(NULL, IDC_ARROW), HBRUSH(COLOR_WINDOW+1), NULL);
 
 	return TRUE;
 }
@@ -69,7 +69,7 @@
 	ON_MESSAGE(WM_NAVIGATE,OnNavigate)
 	ON_MESSAGE(WM_OPENURL, Open)
 	ON_MESSAGE(WM_NEWINSTANCE, NewInstanceOpened)
-	
+
 	ON_WM_LBUTTONDOWN()
 	ON_WM_LBUTTONDBLCLK()
 	ON_WM_LBUTTONUP()
@@ -148,7 +148,7 @@
 	ON_UPDATE_COMMAND_UI(ID_FILE_COPY, OnUpdateFileCopy)
 	ON_COMMAND(ID_FILE_PASTE, OnFilePaste)
 	ON_UPDATE_COMMAND_UI(ID_FILE_PASTE, OnUpdateFilePaste)
-	
+
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -160,7 +160,7 @@
 {
 	m_icoerror = AfxGetApp()->LoadIcon(IDI_ERR);
 	m_icomessage = AfxGetApp()->LoadIcon(IDI_MESSAGE);
-	m_bFullScreen = GF_FALSE;	
+	m_bFullScreen = GF_FALSE;
 	m_RestoreFS = 0;
 	m_aspect_ratio = GF_ASPECT_RATIO_KEEP;
 	m_pProps = NULL;
@@ -204,8 +204,8 @@
 		if (!rti.gpac_memory) rti.gpac_memory = rti.process_memory ? rti.process_memory : rti.physical_memory;
 
 		if (pFrame->m_show_rti && !pFrame->m_timer_on) {
-			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB", 
-						gf_term_get_framerate(app->m_term, GF_FALSE), rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
+			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB",
+			        gf_term_get_framerate(app->m_term, GF_FALSE), rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
 			pFrame->m_wndStatusBar.SetPaneText(1, szMsg);
 		}
 	}
@@ -215,7 +215,7 @@
 		u32 h = ms / 1000 / 3600;
 		u32 m = ms / 1000 / 60 - h*60;
 		u32 s = ms / 1000 - h*3600 - m*60;
-		
+
 		sprintf(szMsg, "%02d:%02d.%02d", h, m, s);
 		pFrame->m_wndStatusBar.SetPaneText(0, szMsg);
 	}
@@ -249,25 +249,37 @@
 
 
 	if (!m_wndToolBar.CreateEx(this, WS_CHILD | CBRS_TOP | CBRS_FLYBY) ||
-		!m_wndToolBar.LoadBitmap(IDR_MAINTOOLS))
+	        !m_wndToolBar.LoadBitmap(IDR_MAINTOOLS))
 	{
 		TRACE0("Failed to create toolbar\n");
 		return -1;      // fail to create
 	}
 
 	ba = &buttonArray[0];
-	*ba = ID_OPEN_FILE; ba++;
-	*ba = ID_SEPARATOR; ba++;
-	*ba = ID_NAV_PREV; ba++;
-	*ba = ID_NAV_NEXT; ba++;
-	*ba = ID_SEPARATOR; ba++;
-	*ba = ID_FILE_PLAY; ba++;
-	*ba = ID_FILE_STEP; ba++;
-	*ba = ID_FILE_STOP; ba++;
-	*ba = ID_SEPARATOR; ba++;
-	*ba = ID_FILE_PROP; ba++;
-	*ba = ID_SEPARATOR; ba++;
-	*ba = ID_FILE_PROP; ba++;
+	*ba = ID_OPEN_FILE;
+	ba++;
+	*ba = ID_SEPARATOR;
+	ba++;
+	*ba = ID_NAV_PREV;
+	ba++;
+	*ba = ID_NAV_NEXT;
+	ba++;
+	*ba = ID_SEPARATOR;
+	ba++;
+	*ba = ID_FILE_PLAY;
+	ba++;
+	*ba = ID_FILE_STEP;
+	ba++;
+	*ba = ID_FILE_STOP;
+	ba++;
+	*ba = ID_SEPARATOR;
+	ba++;
+	*ba = ID_FILE_PROP;
+	ba++;
+	*ba = ID_SEPARATOR;
+	ba++;
+	*ba = ID_FILE_PROP;
+	ba++;
 	*ba = ID_SWITCH_RENDER;
 	m_wndToolBar.SetButtons(buttonArray, 13);
 	m_wndToolBar.SetButtonInfo(0, ID_OPEN_FILE, TBBS_BUTTON, 0);
@@ -301,8 +313,8 @@
 	ctrl.SetButtonInfo(ID_NAV_NEXT, &bi);
 
 	if (!m_wndStatusBar.Create(this) ||
-		!m_wndStatusBar.SetIndicators(status_indics,
-		  sizeof(status_indics)/sizeof(UINT)))
+	        !m_wndStatusBar.SetIndicators(status_indics,
+	                                      sizeof(status_indics)/sizeof(UINT)))
 	{
 		TRACE0("Failed to create status bar\n");
 		return -1;      // fail to create
@@ -379,7 +391,7 @@
 }
 
 
-void CMainFrame::OnSize(UINT nType, int cx, int cy) 
+void CMainFrame::OnSize(UINT nType, int cx, int cy)
 {
 	RECT rc2;
 	u32 tool_h, slide_h, add_h, stat_h;
@@ -466,11 +478,11 @@
 	return 0;
 }
 
-void CMainFrame::OnMove(int x, int y) 
+void CMainFrame::OnMove(int x, int y)
 {
 	CFrameWnd::OnMove(x, y);
 	RECT rc;
-	
+
 	m_wndToolBar.GetClientRect(&rc);
 	m_wndToolBar.SetWindowPos(this, x, y, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
 	y += rc.bottom - rc.top;
@@ -503,7 +515,7 @@
 		if (now >= app->max_duration + 100) {
 			if (gf_term_get_option(app->m_term, GF_OPT_IS_FINISHED)) {
 				pFrame->m_pPlayList->PlayNext();
-		}
+			}
 			/*if no IsOver go on forever*/
 		} else {
 			if (!app->m_reset)
@@ -512,10 +524,10 @@
 	}
 }
 
-void CMainFrame::SetProgTimer(Bool bOn) 
+void CMainFrame::SetProgTimer(Bool bOn)
 {
-	if (bOn) 
-		SetTimer(PROGRESS_TIMER, PROGRESS_REFRESH_MS, ProgressTimer); 
+	if (bOn)
+		SetTimer(PROGRESS_TIMER, PROGRESS_REFRESH_MS, ProgressTimer);
 	else
 		KillTimer(PROGRESS_TIMER);
 }
@@ -541,7 +553,7 @@
 	app->start_mode = 0;
 	app->UpdatePlayButton();
 	nb_viewpoints = 0;
-	return 1;	
+	return 1;
 }
 
 LRESULT CMainFrame::NewInstanceOpened(WPARAM wParam, LPARAM lParam)
@@ -564,16 +576,32 @@
 	const MSG *msg = GetCurrentMessage();
 	m_pWndView->SendMessage(msg->message, msg->wParam, msg->lParam);
 }
-void CMainFrame::OnSysKeyUp(UINT , UINT , UINT ) { ForwardMessage(); }
-void CMainFrame::OnSysKeyDown(UINT , UINT , UINT ) { ForwardMessage(); }
-void CMainFrame::OnChar(UINT , UINT , UINT ) { ForwardMessage(); }
-void CMainFrame::OnKeyDown(UINT , UINT , UINT ) { ForwardMessage(); }
-void CMainFrame::OnKeyUp(UINT , UINT , UINT ) { ForwardMessage(); }
-void CMainFrame::OnLButtonDown(UINT , CPoint ) { ForwardMessage(); }
-void CMainFrame::OnLButtonDblClk(UINT , CPoint ) { ForwardMessage(); }
-void CMainFrame::OnLButtonUp(UINT , CPoint ) { ForwardMessage(); }
+void CMainFrame::OnSysKeyUp(UINT , UINT , UINT ) {
+	ForwardMessage();
+}
+void CMainFrame::OnSysKeyDown(UINT , UINT , UINT ) {
+	ForwardMessage();
+}
+void CMainFrame::OnChar(UINT , UINT , UINT ) {
+	ForwardMessage();
+}
+void CMainFrame::OnKeyDown(UINT , UINT , UINT ) {
+	ForwardMessage();
+}
+void CMainFrame::OnKeyUp(UINT , UINT , UINT ) {
+	ForwardMessage();
+}
+void CMainFrame::OnLButtonDown(UINT , CPoint ) {
+	ForwardMessage();
+}
+void CMainFrame::OnLButtonDblClk(UINT , CPoint ) {
+	ForwardMessage();
+}
+void CMainFrame::OnLButtonUp(UINT , CPoint ) {
+	ForwardMessage();
+}
 
-void CMainFrame::OnDropFiles(HDROP hDropInfo) 
+void CMainFrame::OnDropFiles(HDROP hDropInfo)
 {
 	u32 i, count;
 	Osmo4 *app = GetApp();
@@ -591,11 +619,11 @@
 			return;
 		}
 	}
-	
-/*	if (count==1) 
-		m_pPlayList->Truncate();
-	else
-*/		m_pPlayList->Clear();
+
+	/*	if (count==1)
+			m_pPlayList->Truncate();
+		else
+	*/		m_pPlayList->Clear();
 
 	for (i=0; i<count; i++) {
 		::DragQueryFile (hDropInfo, i, fileName, MAX_PATH);
@@ -608,7 +636,7 @@
 void CALLBACK EXPORT ConsoleTimer(HWND , UINT , UINT_PTR , DWORD )
 {
 	CMainFrame *pFrame = (CMainFrame *) GetApp()->m_pMainWnd;
-	
+
 	pFrame->m_wndStatusBar.GetStatusBarCtrl().SetIcon(2, NULL);
 	pFrame->KillTimer(pFrame->m_timer_on);
 	pFrame->m_timer_on = 0;
@@ -620,7 +648,7 @@
 LRESULT CMainFrame::OnConsoleMessage(WPARAM wParam, LPARAM lParam)
 {
 	if (m_timer_on) KillTimer(m_timer_on);
-	
+
 	if (console_err>=0) {
 		m_wndStatusBar.GetStatusBarCtrl().SetIcon(2, m_icomessage);
 		m_wndStatusBar.SetPaneText(1, console_message);
@@ -634,7 +662,7 @@
 	return 0;
 }
 
-BOOL CMainFrame::DestroyWindow() 
+BOOL CMainFrame::DestroyWindow()
 {
 	if (GetApp()->m_isopen) KillTimer(PROGRESS_TIMER);
 	/*signal close to prevent callbacks but don't close, this is done in ExitInstance (otherwise there's a
@@ -644,72 +672,72 @@
 }
 
 
-void CMainFrame::OnViewOriginal() 
+void CMainFrame::OnViewOriginal()
 {
 	Osmo4 *gpac = GetApp();
-	gf_term_set_option(gpac->m_term, GF_OPT_ORIGINAL_VIEW, 1);	
+	gf_term_set_option(gpac->m_term, GF_OPT_ORIGINAL_VIEW, 1);
 	OnSetSize(gpac->orig_width, gpac->orig_height);
 }
 
-void CMainFrame::SetFullscreen() 
+void CMainFrame::SetFullscreen()
 {
 	Osmo4 *gpac = GetApp();
 	if (!m_bFullScreen) {
 		GetWindowRect(&backup_wnd_rc);
-		if (gf_term_set_option(gpac->m_term, GF_OPT_FULLSCREEN, 1) == GF_OK) 
+		if (gf_term_set_option(gpac->m_term, GF_OPT_FULLSCREEN, 1) == GF_OK)
 			m_bFullScreen = GF_TRUE;
 	} else {
-		if (gf_term_set_option(gpac->m_term, GF_OPT_FULLSCREEN, 0) == GF_OK) 
+		if (gf_term_set_option(gpac->m_term, GF_OPT_FULLSCREEN, 0) == GF_OK)
 			m_bFullScreen = GF_FALSE;
 		SetWindowPos(NULL, backup_wnd_rc.left, backup_wnd_rc.top, backup_wnd_rc.right-backup_wnd_rc.left, backup_wnd_rc.bottom-backup_wnd_rc.top, SWP_NOZORDER);
 	}
 }
 
-void CMainFrame::OnViewFullscreen() 
+void CMainFrame::OnViewFullscreen()
 {
 	SetFullscreen();
 }
 
-void CMainFrame::OnArKeep() 
+void CMainFrame::OnArKeep()
 {
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);	
+	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
 	m_aspect_ratio = GF_ASPECT_RATIO_KEEP;
 }
 
-void CMainFrame::OnArFill() 
+void CMainFrame::OnArFill()
 {
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);	
+	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
 	m_aspect_ratio = GF_ASPECT_RATIO_FILL_SCREEN;
 }
 
-void CMainFrame::OnAr43() 
+void CMainFrame::OnAr43()
 {
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);	
+	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
 	m_aspect_ratio = GF_ASPECT_RATIO_4_3;
 }
 
-void CMainFrame::OnAr169() 
+void CMainFrame::OnAr169()
 {
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);	
+	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
 	m_aspect_ratio = GF_ASPECT_RATIO_16_9;
 }
 
-void CMainFrame::OnUpdateAr169(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateAr169(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_aspect_ratio == GF_ASPECT_RATIO_16_9);
 }
 
-void CMainFrame::OnUpdateAr43(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateAr43(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_aspect_ratio == GF_ASPECT_RATIO_4_3);
 }
 
-void CMainFrame::OnUpdateArFill(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateArFill(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_aspect_ratio == GF_ASPECT_RATIO_FILL_SCREEN);
 }
 
-void CMainFrame::OnUpdateArKeep(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateArKeep(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_aspect_ratio == GF_ASPECT_RATIO_KEEP);
 }
@@ -720,7 +748,7 @@
 	Osmo4 *app = GetApp();
 	pCmdUI->Enable(FALSE);
 	if (!app->m_isopen) return;
-	
+
 	u32 type = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION_TYPE);
 	enable = type ? TRUE : FALSE;
 
@@ -731,12 +759,21 @@
 
 	u32 mode = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION);
 	/*common 2D/3D modes*/
-	if (pCmdUI->m_nID==ID_NAVIGATE_NONE) { pCmdUI->Enable(enable); pCmdUI->SetCheck(mode ? 0 : 1); }
-	else if (pCmdUI->m_nID==ID_NAVIGATE_EXAM) { pCmdUI->Enable(enable); pCmdUI->SetCheck((mode==GF_NAVIGATE_EXAMINE) ? 1 : 0); }
-	else if (pCmdUI->m_nID==ID_NAVIGATE_SLIDE) { pCmdUI->Enable(enable); pCmdUI->SetCheck((mode==GF_NAVIGATE_SLIDE) ? 1 : 0); }
+	if (pCmdUI->m_nID==ID_NAVIGATE_NONE) {
+		pCmdUI->Enable(enable);
+		pCmdUI->SetCheck(mode ? 0 : 1);
+	}
+	else if (pCmdUI->m_nID==ID_NAVIGATE_EXAM) {
+		pCmdUI->Enable(enable);
+		pCmdUI->SetCheck((mode==GF_NAVIGATE_EXAMINE) ? 1 : 0);
+	}
+	else if (pCmdUI->m_nID==ID_NAVIGATE_SLIDE) {
+		pCmdUI->Enable(enable);
+		pCmdUI->SetCheck((mode==GF_NAVIGATE_SLIDE) ? 1 : 0);
+	}
 
 	if (type==GF_NAVIGATE_TYPE_2D) return;
-	pCmdUI->Enable(enable); 	
+	pCmdUI->Enable(enable);
 	if (pCmdUI->m_nID==ID_NAVIGATE_WALK) pCmdUI->SetCheck((mode==GF_NAVIGATE_WALK) ? 1 : 0);
 	else if (pCmdUI->m_nID==ID_NAVIGATE_FLY) pCmdUI->SetCheck((mode==GF_NAVIGATE_FLY) ? 1 : 0);
 	else if (pCmdUI->m_nID==ID_NAVIGATE_PAN) pCmdUI->SetCheck((mode==GF_NAVIGATE_PAN) ? 1 : 0);
@@ -750,15 +787,33 @@
 	Osmo4 *app = GetApp();
 	gf_term_set_option(app->m_term, GF_OPT_NAVIGATION, mode);
 }
-void CMainFrame::OnNavigateNone() { SetNavigate(GF_NAVIGATE_NONE); }
-void CMainFrame::OnNavigateWalk() { SetNavigate(GF_NAVIGATE_WALK); }
-void CMainFrame::OnNavigateFly() { SetNavigate(GF_NAVIGATE_FLY); }
-void CMainFrame::OnNavigateExam() { SetNavigate(GF_NAVIGATE_EXAMINE); }
-void CMainFrame::OnNavigateSlide() { SetNavigate(GF_NAVIGATE_SLIDE); }
-void CMainFrame::OnNavigatePan() { SetNavigate(GF_NAVIGATE_PAN); }
-void CMainFrame::OnNavigateOrbit() { SetNavigate(GF_NAVIGATE_ORBIT); }
-void CMainFrame::OnNavigateVR() { SetNavigate(GF_NAVIGATE_VR); }
-void CMainFrame::OnNavigateGame() { SetNavigate(GF_NAVIGATE_GAME); }
+void CMainFrame::OnNavigateNone() {
+	SetNavigate(GF_NAVIGATE_NONE);
+}
+void CMainFrame::OnNavigateWalk() {
+	SetNavigate(GF_NAVIGATE_WALK);
+}
+void CMainFrame::OnNavigateFly() {
+	SetNavigate(GF_NAVIGATE_FLY);
+}
+void CMainFrame::OnNavigateExam() {
+	SetNavigate(GF_NAVIGATE_EXAMINE);
+}
+void CMainFrame::OnNavigateSlide() {
+	SetNavigate(GF_NAVIGATE_SLIDE);
+}
+void CMainFrame::OnNavigatePan() {
+	SetNavigate(GF_NAVIGATE_PAN);
+}
+void CMainFrame::OnNavigateOrbit() {
+	SetNavigate(GF_NAVIGATE_ORBIT);
+}
+void CMainFrame::OnNavigateVR() {
+	SetNavigate(GF_NAVIGATE_VR);
+}
+void CMainFrame::OnNavigateGame() {
+	SetNavigate(GF_NAVIGATE_GAME);
+}
 
 void CMainFrame::OnNavigateReset()
 {
@@ -788,7 +843,7 @@
 			return 0;
 		}
 	}
-	
+
 	if (m_bFullScreen) {
 		SetFullscreen();
 		m_RestoreFS = 1;
@@ -802,7 +857,7 @@
 	return 0;
 }
 
-void CMainFrame::OnFileProp() 
+void CMainFrame::OnFileProp()
 {
 	if (!m_pProps) {
 		m_pProps = new CFileProps(this);
@@ -811,12 +866,12 @@
 	m_pProps->ShowWindow(SW_SHOW);
 }
 
-void CMainFrame::OnUpdateFileProp(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateFileProp(CCmdUI* pCmdUI)
 {
-	pCmdUI->Enable(GetApp()->m_isopen);	
+	pCmdUI->Enable(GetApp()->m_isopen);
 }
 
-void CMainFrame::OnConfigure() 
+void CMainFrame::OnConfigure()
 {
 	if (!m_pOpt) {
 		m_pOpt = new COptions(this);
@@ -825,71 +880,71 @@
 	m_pOpt->ShowWindow(SW_SHOW);
 }
 
-void CMainFrame::OnShortcuts() 
+void CMainFrame::OnShortcuts()
 {
 	MessageBox(
-		"Open File: Ctrl + O\n"
-		"Open URL: Ctrl + U\n"
-		"Reload File: F5\n"
-		"Pause/Resume File: Ctrl + P\n"
-		"Step by Step: Ctrl + S\n"
-		"Seek +5%: Alt + left arrow\n"
-		"Seek -5%: Alt + right arrow\n"
-		"Switch quality up: Ctrl + H\n"
-		"Switch quality down: Ctrl + L\n"
-		"Fullscreen On/Off: Double-click or Escape\n"
-		"\n"
-		"Show Properties: Ctrl + I\n"
-		"Show Playlist: F3\n"
-		"Next Playlist Item: Ctrl + right arrow\n"
-		"Previous Playlist Item: Ctrl + left arrow\n"
-		"\n"
-		"Aspect Ratio Normal: Ctrl + 1\n"
-		"Aspect Ratio Fill: Ctrl + 2\n"
-		"Aspect Ratio 4/3: Ctrl + 3\n"
-		"Aspect Ratio 16/9: Ctrl + 4\n"
-		
-		
-		, "Shortcuts Available on Osmo4", MB_OK);
-}
-
-void CMainFrame::OnNavInfo() 
+	    "Open File: Ctrl + O\n"
+	    "Open URL: Ctrl + U\n"
+	    "Reload File: F5\n"
+	    "Pause/Resume File: Ctrl + P\n"
+	    "Step by Step: Ctrl + S\n"
+	    "Seek +5%: Alt + left arrow\n"
+	    "Seek -5%: Alt + right arrow\n"
+	    "Switch quality up: Ctrl + H\n"
+	    "Switch quality down: Ctrl + L\n"
+	    "Fullscreen On/Off: Double-click or Escape\n"
+	    "\n"
+	    "Show Properties: Ctrl + I\n"
+	    "Show Playlist: F3\n"
+	    "Next Playlist Item: Ctrl + right arrow\n"
+	    "Previous Playlist Item: Ctrl + left arrow\n"
+	    "\n"
+	    "Aspect Ratio Normal: Ctrl + 1\n"
+	    "Aspect Ratio Fill: Ctrl + 2\n"
+	    "Aspect Ratio 4/3: Ctrl + 3\n"
+	    "Aspect Ratio 16/9: Ctrl + 4\n"
+
+
+	    , "Shortcuts Available on Osmo4", MB_OK);
+}
+
+void CMainFrame::OnNavInfo()
 {
 	MessageBox(
-		"* Walk & Fly modes:\n"
-		"\tH move: H pan - V move: Z-translate - V move+CTRL or Wheel: V pan - Right Click (Walk only): Jump\n"
-		"\tleft/right: H pan - left/right+CTRL: H translate - up/down: Z-translate - up/down+CTRL: V pan\n"
-		"* Pan mode:\n"
-		"\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Z-translate\n"
-		"\tleft/right: H pan - left/right+CTRL: H translate - up/down: V pan - up/down+CTRL: Z-translate\n"
-		"* Slide mode:\n"
-		"\tH move: H translate - V move: V translate - V move+CTRL or Wheel: Z-translate\n"
-		"\tleft/right: H translate - left/right+CTRL: H pan - up/down: V translate - up/down+CTRL: Z-translate\n"
-		"* Examine & Orbit mode:\n"
-		"\tH move: Y-Axis rotate - H move+CTRL: Z-Axis rotate - V move: X-Axis rotate - V move+CTRL or Wheel: Z-translate\n"
-		"\tleft/right: Y-Axis rotate - left/right+CTRL: H translate - up/down: X-Axis rotate - up/down+CTRL: Y-translate\n"
-		"* VR mode:\n"
-		"\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Camera Zoom\n"
-		"\tleft/right: H pan - up/down: V pan - up/down+CTRL: Camera Zoom\n"
-		"* Game mode (press END to escape):\n"
-		"\tH move: H pan - V move: V pan\n"
-		"\tleft/right: H translate - up/down: Z-translate\n"
-		"\n"
-		"* All 3D modes: CTRL+PGUP/PGDOWN will zoom in/out camera (field of view) \n"
-
-		"\n"
-		"*Slide Mode in 2D:\n"
-		"\tH move: H translate - V move: V translate - V move+CTRL: zoom\n"
-		"\tleft/right: H translate - up/down: V translate - up/down+CTRL: zoom\n"
-		"*Examine Mode in 2D (3D renderer only):\n"
-		"\tH move: Y-Axis rotate - V move: X-Axis rotate\n"
-		"\tleft/right: Y-Axis rotate - up/down: X-Axis rotate\n"
-
-		"\n"
-		"HOME: reset navigation to last viewpoint (2D or 3D navigation)\n"
-		"SHIFT key in all modes: fast movement\n"
-
-		, "3D navigation keys (\'H\'orizontal and \'V\'ertical) used in GPAC", MB_OK);
+	    "* Walk & Fly modes:\n"
+	    "\tH move: H pan - V move: Z-translate - V move+CTRL or Wheel: V pan - Right Click (Walk only): Jump\n"
+	    "\tleft/right: H pan - left/right+CTRL: H translate - up/down: Z-translate - up/down+CTRL: V pan\n"
+	    "* Pan mode:\n"
+	    "\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Z-translate\n"
+	    "\tleft/right: H pan - left/right+CTRL: H translate - up/down: V pan - up/down+CTRL: Z-translate\n"
+	    "* Slide mode:\n"
+	    "\tH move: H translate - V move: V translate - V move+CTRL or Wheel: Z-translate\n"
+	    "\tleft/right: H translate - left/right+CTRL: H pan - up/down: V translate - up/down+CTRL: Z-translate\n"
+	    "* Examine & Orbit mode:\n"
+	    "\tH move: Y-Axis rotate - H move+CTRL: Z-Axis rotate - V move: X-Axis rotate - V move+CTRL or Wheel: Z-translate\n"
+	    "\tleft/right: Y-Axis rotate - left/right+CTRL: H translate - up/down: X-Axis rotate - up/down+CTRL: Y-translate\n"
+	    "* VR mode:\n"
+	    "\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Camera Zoom\n"
+	    "\tleft/right: H pan - up/down: V pan - up/down+CTRL: Camera Zoom\n"
+	    "* Game mode (press END to escape):\n"
+	    "\tH move: H pan - V move: V pan\n"
+	    "\tleft/right: H translate - up/down: Z-translate\n"
+	    "\n"
+	    "* All 3D modes: CTRL+PGUP/PGDOWN will zoom in/out camera (field of view) \n"
+
+	    "\n"
+	    "*Slide Mode in 2D:\n"
+	    "\tH move: H translate - V move: V translate - V move+CTRL: zoom\n"
+	    "\tleft/right: H translate - up/down: V translate - up/down+CTRL: zoom\n"
+	    "*Examine Mode in 2D (3D renderer only):\n"
+	    "\tH move: Y-Axis rotate - V move: X-Axis rotate\n"
+	    "\tleft/right: Y-Axis rotate - up/down: X-Axis rotate\n"
+
+	    "\n"
+	    "HOME: reset navigation to last viewpoint (2D or 3D navigation)\n"
+	    "SHIFT key in all modes: fast movement\n"
+
+	    , "3D navigation keys (\'H\'orizontal and \'V\'ertical) used in GPAC", MB_OK);
 }
 
 
@@ -1066,7 +1121,7 @@
 	if ((pPopupMenu->GetMenuItemID(0)==ID_NAV_PREV_0) || (pPopupMenu->GetMenuItemID(0)==ID_NAV_NEXT_0)) {
 		int count = pPopupMenu->GetMenuItemCount();
 		for (int i=0; i<count; i++) {
-			pPopupMenu->EnableMenuItem(i, MF_BYPOSITION);		
+			pPopupMenu->EnableMenuItem(i, MF_BYPOSITION);
 		}
 		return;
 	}
@@ -1131,50 +1186,50 @@
 	CFrameWnd::OnInitMenuPopup(pPopupMenu, ID, bSys);
 }
 
-void CMainFrame::OnCollideDisp() 
+void CMainFrame::OnCollideDisp()
 {
 	gf_term_set_option(GetApp()->m_term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
 }
 
-void CMainFrame::OnUpdateCollideDisp(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateCollideDisp(CCmdUI* pCmdUI)
 {
-	Osmo4 *gpac = GetApp(); 
-	pCmdUI->Enable(gpac->m_isopen);	
+	Osmo4 *gpac = GetApp();
+	pCmdUI->Enable(gpac->m_isopen);
 	pCmdUI->SetCheck( (gf_term_get_option(gpac->m_term, GF_OPT_COLLISION) == GF_COLLISION_DISPLACEMENT) ? 1 : 0);
 }
 
-void CMainFrame::OnCollideNone() 
+void CMainFrame::OnCollideNone()
 {
 	gf_term_set_option(GetApp()->m_term, GF_OPT_COLLISION, GF_COLLISION_NONE);
 }
 
-void CMainFrame::OnUpdateCollideNone(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateCollideNone(CCmdUI* pCmdUI)
 {
-	Osmo4 *gpac = GetApp(); 
-	pCmdUI->Enable(gpac->m_isopen);	
+	Osmo4 *gpac = GetApp();
+	pCmdUI->Enable(gpac->m_isopen);
 	pCmdUI->SetCheck( (gf_term_get_option(gpac->m_term, GF_OPT_COLLISION) == GF_COLLISION_NONE) ? 1 : 0);
 }
 
-void CMainFrame::OnCollideReg() 
+void CMainFrame::OnCollideReg()
 {
 	gf_term_set_option(GetApp()->m_term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
 }
 
-void CMainFrame::OnUpdateCollideReg(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateCollideReg(CCmdUI* pCmdUI)
 {
-	Osmo4 *gpac = GetApp(); 
-	pCmdUI->Enable(gpac->m_isopen);	
+	Osmo4 *gpac = GetApp();
+	pCmdUI->Enable(gpac->m_isopen);
 	pCmdUI->SetCheck( (gf_term_get_option(gpac->m_term, GF_OPT_COLLISION) == GF_COLLISION_NORMAL) ? 1 : 0);
 }
 
-void CMainFrame::OnHeadlight() 
+void CMainFrame::OnHeadlight()
 {
 	Osmo4 *app = GetApp();
 	Bool val = gf_term_get_option(app->m_term, GF_OPT_HEADLIGHT) ? GF_FALSE : GF_TRUE;
 	gf_term_set_option(app->m_term, GF_OPT_HEADLIGHT, val);
 }
 
-void CMainFrame::OnUpdateHeadlight(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateHeadlight(CCmdUI* pCmdUI)
 {
 	Osmo4 *app = GetApp();
 	pCmdUI->Enable(FALSE);
@@ -1186,14 +1241,14 @@
 	pCmdUI->SetCheck(gf_term_get_option(app->m_term, GF_OPT_HEADLIGHT) ? 1 : 0);
 }
 
-void CMainFrame::OnGravity() 
+void CMainFrame::OnGravity()
 {
 	Osmo4 *app = GetApp();
 	Bool val = gf_term_get_option(app->m_term, GF_OPT_GRAVITY) ? GF_FALSE : GF_TRUE;
 	gf_term_set_option(app->m_term, GF_OPT_GRAVITY, val);
 }
 
-void CMainFrame::OnUpdateGravity(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateGravity(CCmdUI* pCmdUI)
 {
 	Osmo4 *app = GetApp();
 	pCmdUI->Enable(FALSE);
@@ -1207,7 +1262,7 @@
 }
 
 
-BOOL CMainFrame::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL CMainFrame::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 
 	if (((LPNMHDR)lParam)->code == TBN_DROPDOWN) {
@@ -1252,7 +1307,7 @@
 	return CFrameWnd::OnNotify(wParam, lParam, pResult);
 }
 
-void CMainFrame::OnNavNext() 
+void CMainFrame::OnNavNext()
 {
 	Osmo4 *app = GetApp();
 	/*don't play if last could trigger playlist loop*/
@@ -1260,53 +1315,53 @@
 	m_pPlayList->PlayNext();
 }
 
-void CMainFrame::OnUpdateNavNext(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateNavNext(CCmdUI* pCmdUI)
 {
 	if (m_pPlayList->m_cur_entry<0) pCmdUI->Enable(FALSE);
 	else if ((u32) m_pPlayList->m_cur_entry + 1 == gf_list_count(m_pPlayList->m_entries) ) pCmdUI->Enable(FALSE);
 	else pCmdUI->Enable(TRUE);
 }
 
-void CMainFrame::OnNavPrev() 
+void CMainFrame::OnNavPrev()
 {
 	Osmo4 *app = GetApp();
 	if (m_pPlayList->m_cur_entry<=0) return;
 	m_pPlayList->PlayPrev();
 }
 
-void CMainFrame::OnUpdateNavPrev(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateNavPrev(CCmdUI* pCmdUI)
 {
 	if (m_pPlayList->m_cur_entry<=0) pCmdUI->Enable(FALSE);
 	else pCmdUI->Enable(TRUE);
 }
 
 
-void CMainFrame::OnClearNav() 
+void CMainFrame::OnClearNav()
 {
 	m_pPlayList->ClearButPlaying();
 }
 
-void CMainFrame::OnViewPlaylist() 
+void CMainFrame::OnViewPlaylist()
 {
 	m_pPlayList->ShowWindow(m_pPlayList->IsWindowVisible() ? SW_HIDE : SW_SHOW);
 }
 
-void CMainFrame::OnUpdateViewPlaylist(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewPlaylist(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_pPlayList->IsWindowVisible() ? 1 : 0);
 }
-void CMainFrame::OnPlaylistLoop() 
+void CMainFrame::OnPlaylistLoop()
 {
 	GetApp()->m_Loop = GetApp()->m_Loop ? GF_FALSE : GF_TRUE;
 	gf_cfg_set_key(GetApp()->m_user.config, "General", "PlaylistLoop", GetApp()->m_Loop ? "yes" : "no");
 }
 
-void CMainFrame::OnUpdatePlaylistLoop(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdatePlaylistLoop(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(GetApp()->m_Loop ? GF_TRUE : GF_FALSE);
 }
 
-void CMainFrame::OnAddSubtitle() 
+void CMainFrame::OnAddSubtitle()
 {
 	CFileDialog fd(TRUE,NULL,NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, "All Subtitles|*.srt;*.sub;*.ttxt;*.xml|SRT Subtitles|*.srt|SUB Subtitles|*.sub|3GPP TimedText|*.ttxt|QuckTime TeXML|*.xml|");
 	if (fd.DoModal() != IDOK) return;
@@ -1319,7 +1374,7 @@
 	gf_term_add_object(GetApp()->m_term, fileName, auto_play);
 }
 
-static Bool subs_enum_dir_item(void *cbck, char *item_name, char *item_path)
+static Bool subs_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	CMainFrame *_this = (CMainFrame *)cbck;
 	_this->AddSubtitle(item_path, GF_FALSE);
@@ -1349,26 +1404,26 @@
 	}
 }
 
-void CMainFrame::OnUpdateCacheEnable(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateCacheEnable(CCmdUI* pCmdUI)
 {
 	Osmo4 *app = GetApp();
 	u32 state = gf_term_get_option(app->m_term, GF_OPT_MEDIA_CACHE);
 	switch (state) {
 	case GF_MEDIA_CACHE_ENABLED:
-		pCmdUI->SetText("Enabled"); 
-		pCmdUI->Enable(TRUE); 
+		pCmdUI->SetText("Enabled");
+		pCmdUI->Enable(TRUE);
 		break;
-	case GF_MEDIA_CACHE_RUNNING: 
+	case GF_MEDIA_CACHE_RUNNING:
 		pCmdUI->SetText("Running");
-		pCmdUI->Enable(FALSE); 
+		pCmdUI->Enable(FALSE);
 		break;
-	case GF_MEDIA_CACHE_DISABLED: 
+	case GF_MEDIA_CACHE_DISABLED:
 		pCmdUI->SetText("Disabled");
 		break;
 	}
 }
 
-void CMainFrame::OnUpdateCacheStop(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateCacheStop(CCmdUI* pCmdUI)
 {
 	Osmo4 *app = GetApp();
 	u32 state = gf_term_get_option(app->m_term, GF_OPT_MEDIA_CACHE);
@@ -1386,7 +1441,7 @@
 	gf_term_set_option(app->m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISCARD);
 }
 
-void CMainFrame::OnFileExit() 
+void CMainFrame::OnFileExit()
 {
 	DestroyWindow();
 }
@@ -1434,11 +1489,23 @@
 	/*get any service info*/
 	if (!m_bStartupFile && gf_term_get_service_info(app->m_term, root_od, &com) == GF_OK) {
 		CString title("");
-		if (com.track_info) { title.Format("%02d ", (u32) (com.track_info>>16) ); }
-		if (com.artist) { title += com.artist; title += " "; }
-		if (com.name) { title += com.name; title += " "; }
-		if (com.album) { title += "("; title += com.album; title += ")"; }
-		
+		if (com.track_info) {
+			title.Format("%02d ", (u32) (com.track_info>>16) );
+		}
+		if (com.artist) {
+			title += com.artist;
+			title += " ";
+		}
+		if (com.name) {
+			title += com.name;
+			title += " ";
+		}
+		if (com.album) {
+			title += "(";
+			title += com.album;
+			title += ")";
+		}
+
 		if (title.GetLength()) SetWindowText(title);
 	}
 }
@@ -1448,7 +1515,7 @@
 	m_show_rti = m_show_rti ? GF_FALSE : GF_TRUE;
 }
 
-void CMainFrame::OnUpdateViewCPU(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewCPU(CCmdUI* pCmdUI)
 {
 	pCmdUI->Enable(TRUE);
 	pCmdUI->SetCheck(m_show_rti);
@@ -1464,26 +1531,26 @@
 	if (!IsClipboardFormatAvailable(CF_TEXT)) return;
 	if (!OpenClipboard()) return;
 	EmptyClipboard();
-	
+
 	len = strlen(text);
 	if (!len) return;
 
-	HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(char)); 
+	HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(char));
 	LPTSTR lptstrCopy = (char *) GlobalLock(hglbCopy);
-	memcpy(lptstrCopy, text, len * sizeof(char)); 
+	memcpy(lptstrCopy, text, len * sizeof(char));
 	lptstrCopy[len] = 0;
-	GlobalUnlock(hglbCopy); 
+	GlobalUnlock(hglbCopy);
 	SetClipboardData(CF_TEXT, hglbCopy);
-	CloseClipboard(); 
+	CloseClipboard();
 }
 
 void CMainFrame::OnUpdateFileCopy(CCmdUI* pCmdUI)
 {
 	Osmo4 *app = GetApp();
 	if (IsClipboardFormatAvailable(CF_TEXT)
-		&& app->m_term 
-		&& (gf_term_get_text_selection(app->m_term, GF_TRUE)!=NULL)
-	) {
+	        && app->m_term
+	        && (gf_term_get_text_selection(app->m_term, GF_TRUE)!=NULL)
+	   ) {
 		pCmdUI->Enable(TRUE);
 	} else {
 		pCmdUI->Enable(FALSE);
@@ -1500,18 +1567,18 @@
 	if (hglbCopy) {
 		LPTSTR lptstrCopy = (char *) GlobalLock(hglbCopy);
 		gf_term_paste_text(GetApp()->m_term, lptstrCopy, GF_FALSE);
-		GlobalUnlock(hglbCopy); 
+		GlobalUnlock(hglbCopy);
 	}
-	CloseClipboard(); 
+	CloseClipboard();
 }
 
 void CMainFrame::OnUpdateFilePaste(CCmdUI* pCmdUI)
 {
 	Osmo4 *app = GetApp();
 	if (IsClipboardFormatAvailable(CF_TEXT)
-		&& app->m_term 
-		&& (gf_term_paste_text(app->m_term, NULL, GF_TRUE)==GF_OK)
-	) {
+	        && app->m_term
+	        && (gf_term_paste_text(app->m_term, NULL, GF_TRUE)==GF_OK)
+	   ) {
 		pCmdUI->Enable(TRUE);
 	} else {
 		pCmdUI->Enable(FALSE);

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/MainFrm.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/MainFrm.h Changed

@@ -36,7 +36,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CChildView)
-	protected:
+protected:
 	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
 	//}}AFX_VIRTUAL
 
@@ -54,10 +54,10 @@
 
 class CMainFrame : public CFrameWnd
 {
-	
+
 public:
 	CMainFrame();
-protected: 
+protected:
 	DECLARE_DYNAMIC(CMainFrame)
 
 // Attributes
@@ -69,11 +69,11 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CMainFrame)
-	public:
+public:
 	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
 	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
 	virtual BOOL DestroyWindow();
-	protected:
+protected:
 	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
 	//}}AFX_VIRTUAL
 
@@ -85,7 +85,7 @@
 	virtual void Dump(CDumpContext& dc) const;
 #endif
 
-public:  
+public:
 	CStatusBar  m_wndStatusBar;
 	CToolBar    m_wndToolBar;
 	Sliders m_Sliders;
@@ -113,7 +113,7 @@
 	void BuildViewList();
 	void BuildStreamList(Bool reset_ony);
 	void BuildChapterList(Bool reset_ony);
-	void SetProgTimer(Bool bOn);		
+	void SetProgTimer(Bool bOn);
 	void AddSubtitle(const char *fileName, Bool auto_play);
 
 private:

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/OpenUrl.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/OpenUrl.cpp Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/OpenUrl.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/OpenUrl.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Options.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Options.cpp Changed

@@ -50,10 +50,10 @@
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-BOOL COptions::OnInitDialog() 
+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);
@@ -91,10 +91,10 @@
 	if (sel>13) sel=13;
 	m_Selector.SetCurSel(sel);
 	m_general.ShowWindow(SW_SHOW);
-	
+
 	OnSelchangeSelect();
 
-	return TRUE;  
+	return TRUE;
 }
 
 
@@ -120,28 +120,56 @@
 	m_logs.ShowWindow(SW_HIDE);
 }
 
-void COptions::OnSelchangeSelect() 
+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;
+	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() 
+void COptions::OnSaveopt()
 {
 	m_general.SaveOptions();
 	m_systems.SaveOptions();
@@ -162,7 +190,7 @@
 	m_render2d.SetYUV();
 }
 
-void COptions::OnClose() 
+void COptions::OnClose()
 {
 	char str[20];
 	sprintf(str, "%d", m_Selector.GetCurSel());
@@ -171,7 +199,7 @@
 	DestroyWindow();
 }
 
-void COptions::OnDestroy() 
+void COptions::OnDestroy()
 {
 	CDialog::OnDestroy();
 	delete this;
@@ -210,13 +238,13 @@
 
 
 
-BOOL COptGen::OnInitDialog() 
+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");
@@ -227,7 +255,7 @@
 	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; 
+	return TRUE;
 }
 
 void COptGen::SaveOptions()
@@ -250,7 +278,7 @@
 	: CDialog(COptSystems::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(COptSystems)
-		// NOTE: the ClassWizard will add member initialization here
+	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
 
@@ -279,10 +307,10 @@
 
 
 
-BOOL COptSystems::OnInitDialog() 
+BOOL COptSystems::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	Osmo4 *gpac = GetApp();
 	const char *sOpt;
 
@@ -290,18 +318,18 @@
 	if (!sOpt) sOpt = "eng";
 	s32 select = 0;
 	while (m_Lang.GetCount()) m_Lang.DeleteString(0);
-	s32 i = 0;
-	while (GF_ISO639_Lang[i]) {
-		/*only use common languages (having both 2- and 3-char code names)*/
-		if (GF_ISO639_Lang[i+2][0]) {
-			m_Lang.AddString(GF_ISO639_Lang[i]);
-			if (sOpt && !stricmp(sOpt, GF_ISO639_Lang[i+1])) select = m_Lang.GetCount() - 1;
-		}
-		i += 3;
+	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;
@@ -327,8 +355,8 @@
 		m_LateFramesAlwaysDrawn.SetCheck(0);
 	}
 
-	
-	return TRUE; 
+
+	return TRUE;
 }
 
 
@@ -338,17 +366,10 @@
 
 	s32 sel = m_Lang.GetCurSel();
 	u32 i=0;
-	while (GF_ISO639_Lang[i]) {
-		/*only use common languages (having both 2- and 3-char code names)*/
-		if (GF_ISO639_Lang[i+2][0]) {
-			if (!sel) break;
-			sel--;
-		}
-		i+=3;
-	}
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "LanguageName", GF_ISO639_Lang[i]);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language3CC", GF_ISO639_Lang[i+1]);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language2CC", GF_ISO639_Lang[i+2]);
+
+	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"));
@@ -361,7 +382,7 @@
 	: CDialog(OptDecoder::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(OptDecoder)
-		// NOTE: the ClassWizard will add member initialization here
+	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
 
@@ -386,14 +407,14 @@
 
 
 
-BOOL OptDecoder::OnInitDialog() 
+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");
@@ -432,7 +453,7 @@
 		gf_modules_close_interface((GF_BaseInterface *)ifce);
 	}
 	m_Video.SetCurSel(select);
-	return TRUE;  
+	return TRUE;
 }
 
 void OptDecoder::SaveOptions()
@@ -480,7 +501,7 @@
 
 
 #define NUM_RATES 11
-static char *BIFSRates[11] = 
+static char *BIFSRates[11] =
 {
 	"5.0",
 	"7.5",
@@ -497,14 +518,14 @@
 
 
 
-BOOL COptRender::OnInitDialog() 
+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);
 
@@ -520,10 +541,10 @@
 		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);
 
@@ -561,7 +582,7 @@
 	else if (sOpt && !stricmp(sOpt, "AABB")) m_DrawBounds.SetCurSel(2);
 	else m_DrawBounds.SetCurSel(0);
 
-	return TRUE;  
+	return TRUE;
 }
 
 
@@ -594,7 +615,7 @@
 	: CDialog(COptRender2D::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(COptRender2D)
-		// NOTE: the ClassWizard will add member initialization here
+	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
 
@@ -619,10 +640,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptRender2D message handlers
 
-BOOL COptRender2D::OnInitDialog() 
+BOOL COptRender2D::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	Osmo4 *gpac = GetApp();
 	const char *sOpt;
 
@@ -638,18 +659,18 @@
 	} 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
+	// EXCEPTION: OCX Property Pages should return FALSE
 }
 
 void COptRender2D::SetYUV()
@@ -708,10 +729,10 @@
 // COptRender3D message handlers
 
 
-BOOL COptRender3D::OnInitDialog() 
+BOOL COptRender3D::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 
 	Osmo4 *gpac = GetApp();
 	const char *sOpt;
@@ -739,7 +760,7 @@
 	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);
@@ -750,11 +771,11 @@
 
 	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
+	// EXCEPTION: OCX Property Pages should return FALSE
 }
 
 void COptRender3D::SaveOptions()
@@ -803,19 +824,19 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptVideo message handlers
 
-BOOL COptVideo::OnInitDialog() 
+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;
@@ -835,7 +856,7 @@
 	m_Videos.SetCurSel(select);
 
 	return TRUE;
-	            
+
 }
 
 void COptVideo::SaveOptions()
@@ -885,7 +906,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptAudio message handlers
 
-BOOL COptAudio::OnInitDialog() 
+BOOL COptAudio::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -921,7 +942,7 @@
 	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");
@@ -943,12 +964,12 @@
 	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")) 
+	if (sOpt && !stricmp(sOpt, "yes"))
 		m_Notifs.SetCheck(1);
 	else
 		m_Notifs.SetCheck(0);
 
-	return TRUE;  
+	return TRUE;
 }
 
 
@@ -975,7 +996,7 @@
 
 }
 
-void COptAudio::OnForceAudio() 
+void COptAudio::OnForceAudio()
 {
 	BOOL en = m_ForceConfig.GetCheck();
 
@@ -985,7 +1006,7 @@
 	m_AudioDur.EnableWindow(en);
 }
 
-void COptAudio::OnSelchangeDriverList() 
+void COptAudio::OnSelchangeDriverList()
 {
 	char str[50];
 	m_DriverList.GetWindowText(str, 50);
@@ -1027,13 +1048,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptFont message handlers
 
-BOOL COptFont::OnInitDialog() 
+BOOL COptFont::OnInitDialog()
 {
 	u32 i;
 	GF_BaseInterface *ifce;
-	
+
 	CDialog::OnInitDialog();
-	
+
 	Osmo4 *gpac = GetApp();
 	const char *sOpt;
 
@@ -1052,7 +1073,7 @@
 		to_sel++;
 	}
 	m_Fonts.SetCurSel(select);
-	
+
 
 	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontEngine", "FontDirectory");
 	if (sOpt) m_BrowseFont.SetWindowText(sOpt);
@@ -1067,14 +1088,14 @@
 	else if (sOpt && !stricmp(sOpt, "Always")) m_TextureModes.SetCurSel(2);
 	else m_TextureModes.SetCurSel(0);
 
-	return TRUE;  
+	return TRUE;
 }
 
 
 
 static char szCacheDir[MAX_PATH];
 
-static int CALLBACK LocCbck(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) 
+static int CALLBACK LocCbck(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
 {
 	char dir[MAX_PATH];
 	if (uMsg == BFFM_INITIALIZED) {
@@ -1084,7 +1105,7 @@
 	return 0;
 }
 
-void COptFont::OnBrowseFont() 
+void COptFont::OnBrowseFont()
 {
 	BROWSEINFO brw;
 	LPMALLOC pMalloc;
@@ -1118,15 +1139,21 @@
 {
 	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;
+	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;
 	}
 }
 
@@ -1167,7 +1194,7 @@
 // COptHTTP message handlers
 
 
-void COptHTTP::OnBrowseCache() 
+void COptHTTP::OnBrowseCache()
 {
 	BROWSEINFO brw;
 	LPMALLOC pMalloc;
@@ -1196,11 +1223,11 @@
 	}
 }
 
-BOOL COptHTTP::OnInitDialog() 
+BOOL COptHTTP::OnInitDialog()
 {
 	char proxy[GF_MAX_PATH];
 	CDialog::OnInitDialog();
-	
+
 	Osmo4 *gpac = GetApp();
 	const char *sOpt;
 
@@ -1239,10 +1266,10 @@
 		}
 	}
 	m_ProxyName.SetWindowText(proxy);
-	return TRUE; 
+	return TRUE;
 }
 
-void COptHTTP::OnSaxProgressive() 
+void COptHTTP::OnSaxProgressive()
 {
 	if (m_Progressive.GetCheck()) {
 		m_SAXDuration.EnableWindow(1);
@@ -1252,7 +1279,7 @@
 }
 
 
-void COptHTTP::OnUseProxy() 
+void COptHTTP::OnUseProxy()
 {
 	if (m_useProxy.GetCheck()) {
 		m_ProxyName.EnableWindow(1);
@@ -1325,7 +1352,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptStream message handlers
 
-BOOL COptStream::OnInitDialog() 
+BOOL COptStream::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -1407,11 +1434,11 @@
 		m_RebufferLen.EnableWindow(0);
 	}
 
-	return TRUE;  
+	return TRUE;
 }
 
 
-void COptStream::OnSelchangePort() 
+void COptStream::OnSelchangePort()
 {
 	s32 sel = m_Port.GetCurSel();
 	switch (sel) {
@@ -1432,7 +1459,7 @@
 	}
 }
 
-void COptStream::OnRtsp() 
+void COptStream::OnRtsp()
 {
 	if (m_UseRTSP.GetCheck()) {
 		m_Reorder.SetCheck(0);
@@ -1441,7 +1468,7 @@
 		m_Reorder.SetCheck(1);
 		m_Reorder.EnableWindow(1);
 	}
-	
+
 }
 
 void COptStream::CheckRebuffer()
@@ -1459,7 +1486,7 @@
 	}
 }
 
-void COptStream::OnRebuffer() 
+void COptStream::OnRebuffer()
 {
 	if (!m_Rebuffer.GetCheck()) {
 		m_RebufferLen.EnableWindow(0);
@@ -1469,14 +1496,14 @@
 	}
 }
 
-void COptStream::OnUpdateRebufferLen() 
+void COptStream::OnUpdateRebufferLen()
 {
 	CheckRebuffer();
 }
 
-void COptStream::OnUpdateBuffer() 
+void COptStream::OnUpdateBuffer()
 {
-	CheckRebuffer();	
+	CheckRebuffer();
 }
 
 void COptStream::SaveOptions()
@@ -1530,7 +1557,7 @@
 	: CDialog(COptMCache::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(COptMCache)
-		// NOTE: the ClassWizard will add member initialization here
+	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
 
@@ -1557,7 +1584,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptMCache message handlers
 
-void COptMCache::OnBrowseMcache() 
+void COptMCache::OnBrowseMcache()
 {
 	BROWSEINFO brw;
 	LPMALLOC pMalloc;
@@ -1586,13 +1613,13 @@
 	}
 }
 
-BOOL COptMCache::OnInitDialog() 
+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);
@@ -1613,7 +1640,7 @@
 	return TRUE;
 }
 
-void COptMCache::OnMcacheUsename() 
+void COptMCache::OnMcacheUsename()
 {
 	if (m_UseBase.GetCheck()) {
 		m_BaseName.EnableWindow(TRUE);
@@ -1644,7 +1671,7 @@
 	: CDialog(OptFiles::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(OptFiles)
-		// NOTE: the ClassWizard will add member initialization here
+	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
 
@@ -1672,10 +1699,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // OptFiles message handlers
 
-BOOL OptFiles::OnInitDialog() 
+BOOL OptFiles::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	Osmo4 *gpac = GetApp();
 	u32 count, i;
 
@@ -1701,7 +1728,7 @@
 	return TRUE;
 }
 
-void OptFiles::OnSelchangeFilelist() 
+void OptFiles::OnSelchangeFilelist()
 {
 	SetSelection(m_FileDescs.GetCurSel());
 }
@@ -1735,11 +1762,19 @@
 		Bool ok;
 		char szExt[50], szReg[60], c;
 		char *tmp = strchr(sKey, ' ');
-		if (!tmp) { go = GF_FALSE;}
-		else { c = tmp[0]; tmp[0] = 0; }
+		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 (tmp) {
+			tmp[0] = c;
+			tmp += 1;
+		}
 
 		if (RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, KEY_READ, &hKey ) == ERROR_SUCCESS) {
 			dwSize = 200;
@@ -1758,7 +1793,7 @@
 }
 
 
-void OptFiles::OnAssociate() 
+void OptFiles::OnAssociate()
 {
 	char *sKey, sDesc[200];
 	unsigned char szApp[MAX_PATH];
@@ -1779,11 +1814,19 @@
 			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; }
+			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 (tmp) {
+				tmp[0] = c;
+				tmp += 1;
+			}
 
 			RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, 0, &hKey );
 			dwSize = 200;
@@ -1793,18 +1836,21 @@
 			strcpy(szOld, "");
 			if (ok && stricmp((char *)sDesc, szReg)) strcpy(szOld, sDesc);
 
-			strcpy(szPath, szReg); strcat(szPath, "\\DefaultIcon");
+			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");
+			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");
+				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);
@@ -1826,13 +1872,22 @@
 			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; }
+			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 (tmp) {
+				tmp[0] = c;
+				tmp += 1;
+			}
 
-			strcpy(szPath, szReg); strcat(szPath, "\\Backup");
+			strcpy(szPath, szReg);
+			strcat(szPath, "\\Backup");
 			RegOpenKeyEx(HKEY_CLASSES_ROOT, szPath, 0, 0, &hKey );
 			dwSize = 200;
 			ok = GF_TRUE;
@@ -1855,14 +1910,14 @@
 
 			sKey = tmp;
 		}
-	}	
+	}
 }
 
 COptLogs::COptLogs(CWnd* pParent /*=NULL*/)
 	: CDialog(COptLogs::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(COptLogs)
-		// NOTE: the ClassWizard will add member initialization here
+	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
 
@@ -1899,18 +1954,28 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptLogs message handlers
 
-BOOL COptLogs::OnInitDialog() 
+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;
+	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);
@@ -1941,38 +2006,68 @@
 	u32 flags = 0;
 
 	switch (m_Level.GetCurSel()) {
-	case 1: 
+	case 1:
 		level = "error";
 		break;
-	case 2: 
+	case 2:
 		level = "warning";
 		break;
-	case 3: 
+	case 3:
 		level = "info";
 		break;
-	case 4: 
+	case 4:
 		level = "debug";
 		break;
-	default: 
+	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:"; }
+	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 += "@";

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Options.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Options.h Changed

@@ -33,7 +33,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptAudio)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -70,7 +70,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(OptDecoder)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -106,7 +106,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(OptFiles)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -145,7 +145,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptFont)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -184,7 +184,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptGen)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -226,7 +226,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptHTTP)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -267,7 +267,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptMCache)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -307,7 +307,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptRender)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -343,7 +343,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptRender2D)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -382,7 +382,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptRender3D)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -422,7 +422,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptStream)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -461,7 +461,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptSystems)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -495,7 +495,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptVideo)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -544,7 +544,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptLogs)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -583,7 +583,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptions)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Osmo4.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Osmo4.cpp Changed

@@ -73,7 +73,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(UserPassDialog)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -106,7 +106,7 @@
 	//}}AFX_DATA_MAP
 }
 
-BOOL UserPassDialog::OnInitDialog() 
+BOOL UserPassDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	m_SiteURL.SetWindowText(m_site_url);
@@ -214,14 +214,14 @@
 		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) 
+			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*/
+		/*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) ) 
+		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);
@@ -256,7 +256,7 @@
 	case GF_EVENT_MIGRATE:
 	{
 	}
-		break;
+	break;
 	case GF_EVENT_KEYDOWN:
 		gf_term_process_shortcut(gpac->m_term, evt);
 		/*update volume control*/
@@ -340,11 +340,11 @@
 
 /*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; 
+#pragma comment(linker, "/SECTION:.shr,RWS")
+#pragma data_seg(".shr")
+HWND static_gpac_hwnd = NULL;
 char static_szCmdLine[MAX_PATH] = "";
-#pragma data_seg() 
+#pragma data_seg()
 
 const char *static_gpac_get_url()
 {
@@ -354,7 +354,7 @@
 static void osmo4_do_log(void *cbk, u32 level, u32 tool, const char *fmt, va_list list)
 {
 	FILE *logs = (FILE *) cbk;
-    vfprintf(logs, fmt, list);
+	vfprintf(logs, fmt, list);
 	fflush(logs);
 }
 
@@ -362,7 +362,7 @@
 {
 	CCommandLineInfo cmdInfo;
 
-	afxAmbientActCtx = FALSE; 
+	afxAmbientActCtx = FALSE;
 
 	m_logs = NULL;
 
@@ -440,7 +440,7 @@
 					::SendMessageTimeout(static_gpac_hwnd, WM_NEWINSTANCE, 0, 0, 0, 1000, &res);
 				}
 			}
-			
+
 			return FALSE;
 		}
 	}
@@ -568,7 +568,7 @@
 	return TRUE;
 }
 
-int Osmo4::ExitInstance() 
+int Osmo4::ExitInstance()
 {
 	if (m_term) gf_term_del(m_term);
 	if (m_user.modules) gf_modules_del(m_user.modules);
@@ -607,7 +607,7 @@
 
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CAboutDlg)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -639,21 +639,21 @@
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-void Osmo4::OnAbout() 
+void Osmo4::OnAbout()
 {
 	CAboutDlg aboutDlg;
 	aboutDlg.DoModal();
 }
 
-BOOL CAboutDlg::OnInitDialog() 
+BOOL CAboutDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	CString str = "GPAC/Osmo4 - version " GPAC_FULL_VERSION;
 	SetWindowText(str);
-	return TRUE;  
+	return TRUE;
 }
 
-void CAboutDlg::OnGogpac() 
+void CAboutDlg::OnGogpac()
 {
 	ShellExecute(NULL, "open", "http://gpac.sourceforge.net", NULL, NULL, SW_SHOWNORMAL);
 }
@@ -677,7 +677,7 @@
 }
 
 
-void Osmo4::OnOpenUrl() 
+void Osmo4::OnOpenUrl()
 {
 	COpenUrl url;
 	if (url.DoModal() != IDOK) return;
@@ -741,7 +741,7 @@
 
 		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*/
@@ -775,11 +775,11 @@
 	return supportedFiles;
 }
 
-void Osmo4::OnOpenFile() 
+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;
@@ -800,7 +800,7 @@
 		nb_items++;
 	}
 	/*if several items, act as playlist (replace playlist), otherwise as browser (lost all "next" context)*/
-	if (nb_items==1) 
+	if (nb_items==1)
 		pFrame->m_pPlayList->Truncate();
 	else
 		pFrame->m_pPlayList->Clear();
@@ -822,19 +822,19 @@
 	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() 
+void Osmo4::OnMainPause()
 {
-	Pause();	
+	Pause();
 }
 
-void Osmo4::OnFileStep() 
+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) 
+void Osmo4::OnUpdateFileStep(CCmdUI* pCmdUI)
 {
-	pCmdUI->Enable(m_isopen && !m_reset);	
+	pCmdUI->Enable(m_isopen && !m_reset);
 }
 
 void Osmo4::PlayFromTime(u32 time)
@@ -848,19 +848,19 @@
 }
 
 
-void Osmo4::OnFileReload() 
+void Osmo4::OnFileReload()
 {
 	gf_term_disconnect(m_term);
 	m_pMainWnd->PostMessage(WM_OPENURL);
 }
 
-void Osmo4::OnFileMigrate() 
+void Osmo4::OnFileMigrate()
 {
 }
 
-void Osmo4::OnConfigReload() 
+void Osmo4::OnConfigReload()
 {
-	gf_term_set_option(m_term, GF_OPT_RELOAD_CONFIG, 1); 
+	gf_term_set_option(m_term, GF_OPT_RELOAD_CONFIG, 1);
 }
 
 void Osmo4::UpdatePlayButton(Bool force_play)
@@ -872,7 +872,7 @@
 	}
 }
 
-void Osmo4::OnFilePlay() 
+void Osmo4::OnFilePlay()
 {
 	if (m_isopen) {
 		if (m_reset) {
@@ -888,10 +888,10 @@
 	}
 }
 
-void Osmo4::OnUpdateFilePlay(CCmdUI* pCmdUI) 
+void Osmo4::OnUpdateFilePlay(CCmdUI* pCmdUI)
 {
 	if (m_isopen) {
-		pCmdUI->Enable(TRUE);	
+		pCmdUI->Enable(TRUE);
 		if (pCmdUI->m_nID==ID_FILE_PLAY) {
 			if (!m_isopen) {
 				pCmdUI->SetText("Play/Pause\tCtrl+P");
@@ -902,12 +902,12 @@
 			}
 		}
 	} else {
-		pCmdUI->Enable(((CMainFrame *)m_pMainWnd)->m_pPlayList->HasValidEntries() );	
+		pCmdUI->Enable(((CMainFrame *)m_pMainWnd)->m_pPlayList->HasValidEntries() );
 		pCmdUI->SetText("Play\tCtrl+P");
 	}
 }
 
-void Osmo4::OnFileStop() 
+void Osmo4::OnFileStop()
 {
 	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
 	if (m_reset) return;
@@ -919,12 +919,12 @@
 	start_mode = 2;
 }
 
-void Osmo4::OnUpdateFileStop(CCmdUI* pCmdUI) 
+void Osmo4::OnUpdateFileStop(CCmdUI* pCmdUI)
 {
-//	pCmdUI->Enable(m_isopen);	
+//	pCmdUI->Enable(m_isopen);
 }
 
-void Osmo4::OnSwitchRender() 
+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;

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Osmo4.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Osmo4.h Changed

@@ -9,7 +9,7 @@
 #endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
-	#error include 'stdafx.h' before including this file for PCH
+#error include 'stdafx.h' before including this file for PCH
 #endif
 
 #include "resource.h"       // main symbols
@@ -26,7 +26,7 @@
 #include <gpac/term_info.h>
 
 enum {
-	WM_SCENE_DONE = WM_USER + 1, 
+	WM_SCENE_DONE = WM_USER + 1,
 	WM_NAVIGATE,
 	WM_SETSIZE,
 	WM_OPENURL,
@@ -48,7 +48,7 @@
 	Bool m_isopen, m_reset;
 	u32 max_duration;
 	Bool can_seek;
-	u32 orig_width,orig_height, m_reconnect_time; 
+	u32 orig_width,orig_height, m_reconnect_time;
 
 	CString m_navigate_url;
 	void Pause();
@@ -63,7 +63,7 @@
 	u32 start_mode;
 
 	CString GetFileFilter();
-	
+
 	char szApplicationPath[GF_MAX_PATH];
 	char szUserPath[GF_MAX_PATH];
 
@@ -74,7 +74,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(Osmo4)
-	public:
+public:
 	virtual BOOL InitInstance();
 	virtual int ExitInstance();
 	//}}AFX_VIRTUAL
@@ -101,7 +101,9 @@
 	DECLARE_MESSAGE_MAP()
 };
 
-inline Osmo4 *GetApp() { return (Osmo4 *)AfxGetApp(); }
+inline Osmo4 *GetApp() {
+	return (Osmo4 *)AfxGetApp();
+}
 
 
 
@@ -111,4 +113,3 @@
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
 
 #endif // !defined(AFX_GPAC_H__8B06A368_E142_47E3_ABE7_0B459FC0E853__INCLUDED_)
-	
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Playlist.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Playlist.cpp Changed

@@ -117,35 +117,45 @@
 /////////////////////////////////////////////////////////////////////////////
 // Playlist message handlers
 
-BOOL Playlist::OnInitDialog() 
+BOOL Playlist::OnInitDialog()
 {
 	UINT buttonArray[50];
 	TBBUTTONINFO bi;
 	u32 *ba;
 	CDialog::OnInitDialog();
 
-	
+
 	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), TRUE);
 	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), FALSE);
 
 	if (!m_toolBar.CreateEx(this, WS_CHILD | CBRS_TOP | CBRS_FLYBY) ||
-		!m_toolBar.LoadBitmap(IDR_PLAYLIST))
+	        !m_toolBar.LoadBitmap(IDR_PLAYLIST))
 	{
 		TRACE0("Failed to create toolbar\n");
 		return 0;
 	}
-	
+
 	ba = &buttonArray[0];
-	*ba = ID_PL_OPEN; ba++;
-	*ba = ID_PL_SAVE; ba++;
-	*ba = ID_SEPARATOR; ba++;
-	*ba = ID_PL_ADD_FILE; ba++;
-	*ba = ID_PL_REM_FILE; ba++;
-	*ba = ID_SEPARATOR; ba++;
-	*ba = ID_PL_UP; ba++;
-	*ba = ID_PL_DOWN; ba++;
-	*ba = ID_SEPARATOR; ba++;
-	*ba = ID_PL_SORT_FILE; ba++;
+	*ba = ID_PL_OPEN;
+	ba++;
+	*ba = ID_PL_SAVE;
+	ba++;
+	*ba = ID_SEPARATOR;
+	ba++;
+	*ba = ID_PL_ADD_FILE;
+	ba++;
+	*ba = ID_PL_REM_FILE;
+	ba++;
+	*ba = ID_SEPARATOR;
+	ba++;
+	*ba = ID_PL_UP;
+	ba++;
+	*ba = ID_PL_DOWN;
+	ba++;
+	*ba = ID_SEPARATOR;
+	ba++;
+	*ba = ID_PL_SORT_FILE;
+	ba++;
 	m_toolBar.SetButtons(buttonArray, 9);
 	m_toolBar.SetButtonInfo(0, ID_PL_OPEN, TBBS_BUTTON, 0);
 	m_toolBar.SetButtonInfo(1, ID_PL_SAVE, TBBS_BUTTON, 1);
@@ -193,10 +203,10 @@
 	PostMessage(WM_NULL);
 	DragAcceptFiles();
 
-	return TRUE;  
+	return TRUE;
 }
 
-void Playlist::OnSize(UINT nType, int cx, int cy) 
+void Playlist::OnSize(UINT nType, int cx, int cy)
 {
 	u32 tool_h;
 	CDialog::OnSize(nType, cx, cy);
@@ -206,18 +216,18 @@
 
 	m_toolBar.GetClientRect(&rc);
 	tool_h = rc.bottom - rc.top;
-	m_toolBar.SetWindowPos(this, 0, 0, cx, tool_h, SWP_NOZORDER);		
-	m_FileList.SetWindowPos(this, 0, tool_h, cx, cy-tool_h, SWP_NOZORDER);		
+	m_toolBar.SetWindowPos(this, 0, 0, cx, tool_h, SWP_NOZORDER);
+	m_FileList.SetWindowPos(this, 0, tool_h, cx, cy-tool_h, SWP_NOZORDER);
 
 	m_FileList.SetExtendedStyle(m_FileList.GetExtendedStyle() | LVS_EX_FULLROWSELECT);
 
 	m_FileList.SetColumnWidth(0, 30);
 	m_FileList.SetColumnWidth(2, 60);
 	m_FileList.SetColumnWidth(1, cx-95);
-	
+
 }
 
-void Playlist::OnDropFiles(HDROP hDropInfo) 
+void Playlist::OnDropFiles(HDROP hDropInfo)
 {
 	u32 i, count;
 	Osmo4 *app = GetApp();
@@ -232,7 +242,7 @@
 }
 
 
-BOOL Playlist::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL Playlist::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 
 	if (((LPNMHDR)lParam)->code == TBN_DROPDOWN) {
@@ -311,11 +321,18 @@
 	m_FileList.SetItem(i, 0, LVIF_TEXT, szText, 0, 0, 0, 0);
 
 	CString str;
-	if (ple->m_bIsDead) { str = "!! DEAD !! "; str += ple->m_disp_name; }
-	else if (ple->m_bIsPlaying) { str = ">> "; str += ple->m_disp_name; str += " >>"; }
+	if (ple->m_bIsDead) {
+		str = "!! DEAD !! ";
+		str += ple->m_disp_name;
+	}
+	else if (ple->m_bIsPlaying) {
+		str = ">> ";
+		str += ple->m_disp_name;
+		str += " >>";
+	}
 	else str = ple->m_disp_name;
 	m_FileList.SetItem(i, 1, LVIF_TEXT, str, 0, 0, 0, 0);
-	
+
 	if (ple->m_duration) {
 		u32 h = (u32) (ple->m_duration / 3600);
 		u32 m = (u32) (ple->m_duration / 60) - h*60;
@@ -350,7 +367,7 @@
 			ple->m_bIsSelected = GF_FALSE;
 		}
 	}
-	
+
 	if (m_cur_entry >= (s32)gf_list_count(m_entries)) m_cur_entry = gf_list_count(m_entries);
 	else {
 		s32 last_idx = top_idx + m_FileList.GetCountPerPage();
@@ -365,11 +382,11 @@
 	Save(szPath, GF_TRUE);
 }
 
-void Playlist::OnPlAddFile() 
+void Playlist::OnPlAddFile()
 {
 	Osmo4 *app = GetApp();
 	CString sFiles = app->GetFileFilter();
-	
+
 	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);
@@ -387,12 +404,12 @@
 	RefreshList();
 }
 
-void Playlist::OnClose() 
+void Playlist::OnClose()
 {
 	ShowWindow(SW_HIDE);
 }
 
-void Playlist::OnPlRemFile() 
+void Playlist::OnPlRemFile()
 {
 	if (!m_FileList.GetSelectedCount()) return;
 	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
@@ -406,7 +423,7 @@
 	RefreshList();
 }
 
-void Playlist::OnSelUp() 
+void Playlist::OnSelUp()
 {
 	s32 i;
 	if (!m_FileList.GetSelectedCount()) return;
@@ -426,7 +443,7 @@
 	RefreshList();
 }
 
-void Playlist::OnSelDown() 
+void Playlist::OnSelDown()
 {
 	s32 i, nItem;
 	if (!m_FileList.GetSelectedCount()) return;
@@ -446,14 +463,14 @@
 	RefreshList();
 }
 
-void Playlist::OnPlRemAll() 
+void Playlist::OnPlRemAll()
 {
 	Clear();
 	RefreshList();
 	m_cur_entry = -1;
 }
 
-void Playlist::OnPlRemDead() 
+void Playlist::OnPlRemDead()
 {
 	for (u32 i=0; i<gf_list_count(m_entries); i++) {
 		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
@@ -467,7 +484,7 @@
 }
 
 
-static int CALLBACK LocCbck(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) 
+static int CALLBACK LocCbck(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
 {
 	char dir[MAX_PATH];
 	if (uMsg == BFFM_INITIALIZED) {
@@ -476,7 +493,7 @@
 	}
 	return 0;
 }
-static Bool pl_enum_dir_item(void *cbck, char *item_name, char *item_path)
+static Bool pl_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	Osmo4 *gpac = GetApp();
 	Playlist *_this = (Playlist *)cbck;
@@ -487,7 +504,7 @@
 	return GF_FALSE;
 }
 
-static Bool pl_enum_dir_dirs(void *cbck, char *item_name, char *item_path)
+static Bool pl_enum_dir_dirs(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	gf_enum_directory(item_path, GF_FALSE, pl_enum_dir_item, cbck, NULL);
 	gf_enum_directory(item_path, GF_TRUE, pl_enum_dir_dirs, cbck, NULL);
@@ -495,7 +512,7 @@
 }
 
 
-void Playlist::AddDir(Bool do_recurse) 
+void Playlist::AddDir(Bool do_recurse)
 {
 	BROWSEINFO brw;
 	LPMALLOC pMalloc;
@@ -526,16 +543,16 @@
 	m_all_dead_entries=-1;
 	RefreshList();
 }
-void Playlist::OnPlAddDir() 
+void Playlist::OnPlAddDir()
 {
 	AddDir(GF_FALSE);
 }
-void Playlist::OnPlAddDirRec() 
+void Playlist::OnPlAddDirRec()
 {
 	AddDir(GF_TRUE);
 }
 
-void Playlist::OnPlAddUrl() 
+void Playlist::OnPlAddUrl()
 {
 	COpenUrl url;
 	if (url.DoModal() != IDOK) return;
@@ -545,7 +562,7 @@
 	RefreshList();
 }
 
-void Playlist::OnPlSave() 
+void Playlist::OnPlSave()
 {
 	Bool save_m3u;
 	char szPath[GF_MAX_PATH];
@@ -574,10 +591,10 @@
 	Save(szPath, save_m3u);
 }
 
-void Playlist::Save(char *szPath, Bool save_m3u) 
+void Playlist::Save(char *szPath, Bool save_m3u)
 {
 	FILE *out = gf_f64_open(szPath, "wt");
-	if (!save_m3u) 
+	if (!save_m3u)
 		fprintf(out, "[playlist]\nNumberOfEntries=%d\n", gf_list_count(m_entries));
 
 	for (u32 i=0; i<gf_list_count(m_entries); i++) {
@@ -597,7 +614,7 @@
 	fclose(out);
 }
 
-void Playlist::OnPlOpen() 
+void Playlist::OnPlOpen()
 {
 	CFileDialog fd(TRUE,NULL,NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, "M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|");
 	if (fd.DoModal() != IDOK) return;
@@ -615,7 +632,7 @@
 	Bool load_m3u, go;
 	char szLine[GF_MAX_PATH], *sep;
 	char szPath[GF_MAX_PATH];
-	
+
 	strcpy(szPath, fileName);
 	sep = strrchr(szPath, '\\');
 	if (sep) sep[1] = 0;
@@ -670,11 +687,11 @@
 }
 
 
-void Playlist::OnRclickFilelist(NMHDR* pNMHDR, LRESULT* pResult) 
+void Playlist::OnRclickFilelist(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	if (!m_FileList.GetItemCount()) return;
 
-	CMenu *pPopup = new CMenu();	
+	CMenu *pPopup = new CMenu();
 	pPopup->CreatePopupMenu();
 
 	if (m_FileList.GetSelectedCount()==1) {
@@ -692,16 +709,16 @@
 		pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_REV, "Reverse List");
 		pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_RANDOM, "Randomize");
 	}
-	
+
 	POINT pt;
-    GetCursorPos(&pt);
+	GetCursorPos(&pt);
 	pPopup->TrackPopupMenu(TPM_RIGHTBUTTON, pt.x, pt.y, this);
 	delete pPopup;
 
 	*pResult = 0;
 }
 
-void Playlist::OnReverseSelection() 
+void Playlist::OnReverseSelection()
 {
 	u32 i;
 	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
@@ -769,13 +786,13 @@
 			s32 test = 0;
 			switch (type) {
 			case 0:
-                test = stricmp(ple1->m_url, ple2->m_url);
+				test = stricmp(ple1->m_url, ple2->m_url);
 				break;
 			case 1:
-                test = stricmp(ple1->m_disp_name, ple2->m_disp_name);
+				test = stricmp(ple1->m_disp_name, ple2->m_disp_name);
 				break;
 			case 2:
-                test = ple1->m_duration - ple2->m_duration;
+				test = ple1->m_duration - ple2->m_duration;
 				break;
 			}
 			if (test<0) smallest = j;
@@ -788,9 +805,15 @@
 	RefreshList();
 }
 
-void Playlist::OnSortFile() { Sort(0); }
-void Playlist::OnSortTitle() { Sort(1); }
-void Playlist::OnSortDuration() { Sort(2); }
+void Playlist::OnSortFile() {
+	Sort(0);
+}
+void Playlist::OnSortTitle() {
+	Sort(1);
+}
+void Playlist::OnSortDuration() {
+	Sort(2);
+}
 
 
 Bool Playlist::HasValidEntries()
@@ -847,7 +870,7 @@
 	}
 }
 
-void Playlist::OnDblclkFilelist(NMHDR* pNMHDR, LRESULT* pResult) 
+void Playlist::OnDblclkFilelist(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
 	RefreshCurrent();

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Playlist.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Playlist.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Sliders.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Sliders.cpp Changed

@@ -46,9 +46,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Sliders message handlers
 
-void Sliders::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void Sliders::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
-	
+
 	Osmo4 *app = GetApp();
 	if (pScrollBar->GetDlgCtrlID() == ID_SLIDER) {
 		switch (nSBCode) {
@@ -85,7 +85,7 @@
 	CDialog::OnHScroll(nSBCode, nPos, pScrollBar);
 }
 
-void Sliders::OnSize(UINT nType, int cx, int cy) 
+void Sliders::OnSize(UINT nType, int cx, int cy)
 {
 	CDialog::OnSize(nType, cx, cy);
 
@@ -105,7 +105,7 @@
 
 	const UINT nPixelsLength = 24;
 	m_PosSlider.ModifyStyle(0,TBS_FIXEDLENGTH,FALSE);
-	m_PosSlider.SendMessage(TBM_SETTHUMBLENGTH,nPixelsLength,0); 
+	m_PosSlider.SendMessage(TBM_SETTHUMBLENGTH,nPixelsLength,0);
 
 	m_AudioVol.GetClientRect(&rc2);
 	rc2.top = rc2.bottom = cy/2;
@@ -118,13 +118,13 @@
 }
 
 /*we sure don't want to close this window*/
-void Sliders::OnClose() 
+void Sliders::OnClose()
 {
 	u32 i = 0;
 	return;
 }
 
-BOOL Sliders::PreTranslateMessage(MSG* pMsg) 
+BOOL Sliders::PreTranslateMessage(MSG* pMsg)
 {
 	if (pMsg->message == WM_KEYDOWN) {
 		GetApp()->m_pMainWnd->SetFocus();
@@ -135,7 +135,7 @@
 }
 
 
-BOOL Sliders::OnInitDialog() 
+BOOL Sliders::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	m_AudioVol.SetRange(0, 100);

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Sliders.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Sliders.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/StdAfx.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/StdAfx.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/resource.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/resource.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/MainFrm.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/MainFrm.cpp Changed

@@ -46,14 +46,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // CChildView message handlers
 
-BOOL CChildView::PreCreateWindow(CREATESTRUCT& cs) 
+BOOL CChildView::PreCreateWindow(CREATESTRUCT& cs)
 {
 	if (!CWnd::PreCreateWindow(cs))
 		return FALSE;
 
 	cs.style &= ~WS_BORDER;
-	cs.lpszClass = AfxRegisterWndClass(CS_HREDRAW|CS_VREDRAW|CS_DBLCLKS, 
-		NULL, HBRUSH(COLOR_WINDOW+1), NULL);
+	cs.lpszClass = AfxRegisterWndClass(CS_HREDRAW|CS_VREDRAW|CS_DBLCLKS,
+	                                   NULL, HBRUSH(COLOR_WINDOW+1), NULL);
 
 	return TRUE;
 }
@@ -133,16 +133,16 @@
 
 	// create a view to occupy the client area of the frame
 	if (!m_wndView.Create(NULL, NULL, AFX_WS_DEFAULT_VIEW | WS_BORDER,
-		CRect(0, 0, 0, 0), this, AFX_IDW_PANE_FIRST, NULL))
+	                      CRect(0, 0, 0, 0), this, AFX_IDW_PANE_FIRST, NULL))
 	{
 		TRACE0("Failed to create view window\n");
 		return -1;
 	}
 	m_wndView.ShowWindow(SW_HIDE);
 
-	
+
 	if (!m_dumbWnd.Create(NULL, NULL, AFX_WS_DEFAULT_VIEW | WS_BORDER,
-		CRect(0, 0, 0, 0), this, AFX_IDW_PANE_FIRST, NULL))
+	                      CRect(0, 0, 0, 0), this, AFX_IDW_PANE_FIRST, NULL))
 	{
 		TRACE0("Failed to create dumb window\n");
 		return -1;
@@ -157,15 +157,15 @@
 	m_progBar.UpdateWindow();
 	m_progBar.SetWindowPos(this, 0, 0, app->m_screen_width, app->m_menu_height, 0L);
 	m_progBar.ShowWindow(SW_SHOWNORMAL);
-	
+
 
 //	m_wndCommandBar.m_bShowSharedNewButton = FALSE;
 
-	if (!m_wndCommandBar.Create(this) 
-			|| !m_wndCommandBar.InsertMenuBar(IDR_MENU)
-			|| !m_wndCommandBar.AddAdornments()
-			|| !m_wndCommandBar.LoadBitmap(IDR_MAINFRAME) 
-		)
+	if (!m_wndCommandBar.Create(this)
+	        || !m_wndCommandBar.InsertMenuBar(IDR_MENU)
+	        || !m_wndCommandBar.AddAdornments()
+	        || !m_wndCommandBar.LoadBitmap(IDR_MAINFRAME)
+	   )
 	{
 		TRACE0("Failed to create CommandBar\n");
 		return -1;      // fail to create
@@ -174,18 +174,36 @@
 	CToolBarCtrl & toolBar = m_wndCommandBar.GetToolBarCtrl();
 	TBBUTTON tb;
 	memset(&tb, 0, sizeof(tb));
-    tb.idCommand = ID_OPEN_FILE; tb.iBitmap = 0; tb.fsStyle = TBSTYLE_BUTTON; toolBar.AddButtons(1, &tb);
-    tb.idCommand = 0; tb.iBitmap = 0; tb.fsStyle = TBSTYLE_SEP; toolBar.AddButtons(1, &tb);
-    tb.idCommand = ID_FILE_PAUSE; tb.iBitmap = 1; tb.fsStyle = TBSTYLE_BUTTON; toolBar.AddButtons(1, &tb);
-    tb.idCommand = ID_FILE_STEP; tb.iBitmap = 2; tb.fsStyle = TBSTYLE_BUTTON; toolBar.AddButtons(1, &tb);
-    tb.idCommand = ID_FILE_STOP; tb.iBitmap = 3; tb.fsStyle = TBSTYLE_BUTTON; toolBar.AddButtons(1, &tb);
-    tb.idCommand = 0; tb.iBitmap = 0; tb.fsStyle = TBSTYLE_SEP; toolBar.AddButtons(1, &tb);
-	
+	tb.idCommand = ID_OPEN_FILE;
+	tb.iBitmap = 0;
+	tb.fsStyle = TBSTYLE_BUTTON;
+	toolBar.AddButtons(1, &tb);
+	tb.idCommand = 0;
+	tb.iBitmap = 0;
+	tb.fsStyle = TBSTYLE_SEP;
+	toolBar.AddButtons(1, &tb);
+	tb.idCommand = ID_FILE_PAUSE;
+	tb.iBitmap = 1;
+	tb.fsStyle = TBSTYLE_BUTTON;
+	toolBar.AddButtons(1, &tb);
+	tb.idCommand = ID_FILE_STEP;
+	tb.iBitmap = 2;
+	tb.fsStyle = TBSTYLE_BUTTON;
+	toolBar.AddButtons(1, &tb);
+	tb.idCommand = ID_FILE_STOP;
+	tb.iBitmap = 3;
+	tb.fsStyle = TBSTYLE_BUTTON;
+	toolBar.AddButtons(1, &tb);
+	tb.idCommand = 0;
+	tb.iBitmap = 0;
+	tb.fsStyle = TBSTYLE_SEP;
+	toolBar.AddButtons(1, &tb);
+
 	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), TRUE);
 	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), FALSE);
 	SetWindowPos(NULL, 0, 0, app->m_screen_width, app->m_screen_height, 0L);
 
-	SetWindowText(_T("Osmo4"));	
+	SetWindowText(_T("Osmo4"));
 	return 0;
 }
 
@@ -194,8 +212,9 @@
 	CToolBarCtrl & toolBar = m_wndCommandBar.GetToolBarCtrl();
 	TBBUTTON tb;
 	memset(&tb, 0, sizeof(tb));
-    tb.idCommand = ID_FILE_PAUSE; tb.fsStyle = TBSTYLE_BUTTON;
-	
+	tb.idCommand = ID_FILE_PAUSE;
+	tb.fsStyle = TBSTYLE_BUTTON;
+
 	if (force_play_button || GetApp()->m_stopped || gf_term_get_option(GetApp()->m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
 		tb.iBitmap = 4;
 	} else {
@@ -218,7 +237,7 @@
 	return TRUE;
 }
 
- 
+
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame diagnostics
 
@@ -277,7 +296,7 @@
 			}
 			return;
 		}
-	} 
+	}
 
 	if (!m_full_screen) m_progBar.SetPosition(now);
 }
@@ -295,13 +314,13 @@
 	m_progBar.SetPosition(0);
 }
 
-void CMainFrame::OnAppExit() 
+void CMainFrame::OnAppExit()
 {
 	CloseURL();
 	PostMessage(WM_QUIT);
 }
 
-void CMainFrame::OnSize(UINT nType, int cx, int cy) 
+void CMainFrame::OnSize(UINT nType, int cx, int cy)
 {
 	COsmo4 *app = GetApp();
 	u32 disp_w, disp_h, c_w, c_h, x, y;
@@ -349,13 +368,13 @@
 }
 
 
-void CMainFrame::OnViewFullscreen() 
+void CMainFrame::OnViewFullscreen()
 {
 	COsmo4 *app = GetApp();
 	if (!app->m_open) return;
 	u32 disp_w = app->m_screen_width;
 	u32 disp_h = app->m_screen_height;
-	
+
 	Bool is_full_screen = !m_full_screen;
 
 	/*prevent resize messages*/
@@ -384,7 +403,7 @@
 }
 
 
-void CMainFrame::OnUpdateViewFullscreen(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewFullscreen(CCmdUI* pCmdUI)
 {
 	pCmdUI->Enable(GetApp()->m_open ? TRUE : FALSE);
 }
@@ -395,7 +414,7 @@
 	if (m_full_screen) return 0;
 	GetWindowRect(&rc);
 	SetWindowPos(NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, SWP_NOZORDER | SWP_NOMOVE);
-	return 1;	
+	return 1;
 }
 
 LONG CMainFrame::Open(WPARAM wParam, LPARAM lParam)
@@ -405,7 +424,7 @@
 	char filename[5000];
 	CE_WideToChar((u16 *) (LPCTSTR) app->m_filename, filename);
 	app->m_stopped = 0;
-	
+
 	if (app->m_reconnect_time) {
 		gf_term_connect_from_time(app->m_term, filename, app->m_reconnect_time, 0);
 		app->m_reconnect_time = 0;
@@ -413,7 +432,7 @@
 		gf_term_connect(app->m_term, filename);
 	}
 	app->SetBacklightState(1);
-	return 1;	
+	return 1;
 }
 
 
@@ -441,13 +460,13 @@
 		console_err = GF_OK;
 		PostMessage(WM_CONSOLEMSG);
 
-		
+
 		if (m_full_screen) {
 			OnViewFullscreen();
 			app->ShowTaskBar(1);
 			m_restore_fs = 1;
 		}
-	
+
 		memset(&info, 0, sizeof(SHELLEXECUTEINFO));
 		info.cbSize = sizeof(SHELLEXECUTEINFO);
 		info.lpVerb = L"open";
@@ -457,7 +476,7 @@
 		info.nShow = SW_SHOWNORMAL;
 		ShellExecuteEx(&info);
 	}
-	return 1;	
+	return 1;
 }
 
 void CMainFrame::OnFilePause()
@@ -513,7 +532,7 @@
 	pCmdUI->Enable(GetApp()->m_open ? TRUE : FALSE);
 }
 
-void CMainFrame::OnClose() 
+void CMainFrame::OnClose()
 {
 	PostMessage(WM_DESTROY);
 }
@@ -524,46 +543,46 @@
 	return 1;
 }
 
-void CMainFrame::OnViewFit() 
+void CMainFrame::OnViewFit()
 {
 	COsmo4 *app = GetApp();
 	app->m_fit_screen = !app->m_fit_screen;
 	if (app->m_open) OnSetSize(0, 0);
 }
 
-void CMainFrame::OnUpdateViewFit(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewFit(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(GetApp()->m_fit_screen ? TRUE : FALSE);
 }
 
-void CMainFrame::OnViewArOrig() 
+void CMainFrame::OnViewArOrig()
 {
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);	
+	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
 }
-void CMainFrame::OnViewArFill() 
+void CMainFrame::OnViewArFill()
 {
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);	
+	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
 }
-void CMainFrame::OnViewAr43() 
+void CMainFrame::OnViewAr43()
 {
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);	
+	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
 }
-void CMainFrame::OnViewAr169() 
+void CMainFrame::OnViewAr169()
 {
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);	
+	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
 }
 
-void CMainFrame::OnNavNone() 
+void CMainFrame::OnNavNone()
 {
 	gf_term_set_option(GetApp()->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
 }
 
-void CMainFrame::OnNavSlide() 
+void CMainFrame::OnNavSlide()
 {
 	gf_term_set_option(GetApp()->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
 }
 
-void CMainFrame::OnNaveReset() 
+void CMainFrame::OnNaveReset()
 {
 	gf_term_set_option(GetApp()->m_term, GF_OPT_NAVIGATION_TYPE, 0);
 }
@@ -575,15 +594,15 @@
 }
 void CMainFrame::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
-	ForwardMessage(); 
+	ForwardMessage();
 }
 void CMainFrame::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
-	ForwardMessage(); 
+	ForwardMessage();
 }
 
 
-void CMainFrame::OnViewTiming() 
+void CMainFrame::OnViewTiming()
 {
 	if (m_full_screen) return;
 	if (m_view_timing) KillTimer(PROGRESS_TIMER);
@@ -591,28 +610,28 @@
 	OnSetSize(0, 0);
 }
 
-void CMainFrame::OnUpdateViewTiming(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewTiming(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_view_timing ? TRUE : FALSE);
 }
 
-void CMainFrame::OnSetNavigation(UINT nID) 
+void CMainFrame::OnSetNavigation(UINT nID)
 {
 	gf_term_set_option(GetApp()->m_term, GF_OPT_NAVIGATION, nID - ID_NAV_NONE);
 }
 
 
-void CMainFrame::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu) 
+void CMainFrame::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu)
 {
 	COsmo4 *app = GetApp();
 	CFrameWnd::OnInitMenuPopup(pPopupMenu, nIndex, bSysMenu);
 
-	u32 opt = gf_term_get_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO);	
+	u32 opt = gf_term_get_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO);
 	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_AR_ORIG, MF_BYCOMMAND| (opt==GF_ASPECT_RATIO_KEEP) ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_AR_FILL, MF_BYCOMMAND| (opt==GF_ASPECT_RATIO_FILL_SCREEN) ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_AR_43, MF_BYCOMMAND| (opt==GF_ASPECT_RATIO_4_3) ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_AR_169, MF_BYCOMMAND| (opt==GF_ASPECT_RATIO_16_9) ? MF_CHECKED : MF_UNCHECKED);
-	
+
 	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_FIT, MF_BYCOMMAND| app->m_fit_screen ? MF_CHECKED : MF_UNCHECKED);
 
 	u32 type;

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/MainFrm.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/MainFrm.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/OpenDlg.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/OpenDlg.cpp Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/OpenDlg.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/OpenDlg.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/Options.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/Options.cpp Changed

@@ -52,19 +52,37 @@
 // COptions message handlers
 
 
-void COptions::OnSelchangeCombosel() 
+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;
+	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;
 	}
 }
 
@@ -81,10 +99,10 @@
 	m_decoder.ShowWindow(SW_HIDE);
 }
 
-BOOL COptions::OnInitDialog() 
+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);
@@ -113,10 +131,10 @@
 	OnSelchangeCombosel();
 
 	SetFocus();
-	return TRUE;  
+	return TRUE;
 }
 
-void COptions::OnSaveopt() 
+void COptions::OnSaveopt()
 {
 	m_general.SaveOptions();
 	m_systems.SaveOptions();
@@ -132,7 +150,7 @@
 	gf_term_set_option(gpac->m_term, GF_OPT_RELOAD_CONFIG, 1);
 }
 
-void COptions::OnOK() 
+void COptions::OnOK()
 {
 	char str[20];
 	sprintf(str, "%d", m_Selection.GetCurSel());
@@ -175,7 +193,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptAudio message handlers
 
-BOOL COptAudio::OnInitDialog() 
+BOOL COptAudio::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -213,7 +231,7 @@
 	} 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");
@@ -231,9 +249,9 @@
 		to_sel++;
 	}
 	m_DriverList.SetCurSel(select);
-	
-	
-	return TRUE;  
+
+
+	return TRUE;
 }
 
 
@@ -259,7 +277,7 @@
 
 }
 
-void COptAudio::OnForceAudio() 
+void COptAudio::OnForceAudio()
 {
 	BOOL en = m_ForceConfig.GetCheck();
 
@@ -274,7 +292,7 @@
 	: CDialog(COptDecoder::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(COptDecoder)
-		// NOTE: the ClassWizard will add member initialization here
+	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
 
@@ -297,11 +315,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptDecoder message handlers
 
-BOOL COptDecoder::OnInitDialog() 
+BOOL COptDecoder::OnInitDialog()
 {
 	u32 i;
 	CDialog::OnInitDialog();
-	
+
 	COsmo4 *gpac = GetApp();
 	const char *sOpt;
 
@@ -393,13 +411,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptFont message handlers
 
-BOOL COptFont::OnInitDialog() 
+BOOL COptFont::OnInitDialog()
 {
 	u32 i;
 	GF_BaseInterface *ifce;
-	
+
 	CDialog::OnInitDialog();
-	
+
 	COsmo4 *gpac = GetApp();
 	TCHAR wTmp[500];
 	const char *sOpt;
@@ -420,7 +438,7 @@
 		to_sel++;
 	}
 	m_Fonts.SetCurSel(select);
-	
+
 
 	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontEngine", "FontDirectory");
 	CE_CharToWide((char *)sOpt, (u16 *)wTmp);
@@ -429,10 +447,10 @@
 	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "TextureTextMode");
 	m_UseTexture.SetCheck( (!sOpt || stricmp(sOpt, "Never")) ? 1 : 0);
 
-	return TRUE;  
+	return TRUE;
 }
 
-void COptFont::OnBrowseFont() 
+void COptFont::OnBrowseFont()
 {
 
 }
@@ -443,7 +461,7 @@
 	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);
@@ -486,12 +504,12 @@
 
 
 
-BOOL COptGen::OnInitDialog() 
+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);
@@ -505,7 +523,7 @@
 
 	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Logs");
 	m_Logs.SetCheck((sOpt && !strstr(sOpt, "none")) ? 1 : 0);
-	return TRUE; 
+	return TRUE;
 }
 
 void COptGen::SaveOptions()
@@ -522,7 +540,7 @@
 	gpac->EnableLogs(m_Logs.GetCheck() ? 1 : 0);
 }
 
-void COptGen::OnFileassoc() 
+void COptGen::OnFileassoc()
 {
 	HKEY hSection;
 	TCHAR szDir[MAX_PATH];
@@ -532,11 +550,11 @@
 	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) 
+	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);
@@ -600,15 +618,15 @@
 // COptHTTP message handlers
 
 
-void COptHTTP::OnBrowseCache() 
+void COptHTTP::OnBrowseCache()
 {
 
 }
 
-BOOL COptHTTP::OnInitDialog() 
+BOOL COptHTTP::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	COsmo4 *gpac = GetApp();
 	TCHAR wTmp[500];
 	const char *sOpt;
@@ -631,9 +649,9 @@
 	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; 
+	return TRUE;
 }
 
 void COptHTTP::OnProgressive()
@@ -695,7 +713,7 @@
 
 
 #define NUM_RATES 11
-static char *BIFSRates[11] = 
+static char *BIFSRates[11] =
 {
 	"5.0",
 	"7.5",
@@ -712,13 +730,13 @@
 
 
 
-BOOL COptRender::OnInitDialog() 
+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);
@@ -749,10 +767,10 @@
 		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);
 
@@ -764,7 +782,7 @@
 	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
 	m_Antialias.SetCurSel(select);
 
-	return TRUE;  
+	return TRUE;
 }
 
 
@@ -813,10 +831,10 @@
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-BOOL COptRender3D::OnInitDialog() 
+BOOL COptRender3D::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	COsmo4 *gpac = GetApp();
 	const char *sOpt;
 
@@ -848,7 +866,7 @@
 	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_DrawNormals.SetCurSel(2);
 	else m_DrawNormals.SetCurSel(0);
 
-	return TRUE;  
+	return TRUE;
 }
 
 
@@ -858,7 +876,7 @@
 
 	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");
 
@@ -903,7 +921,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // COptStream message handlers
 
-BOOL COptStream::OnInitDialog() 
+BOOL COptStream::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -989,11 +1007,11 @@
 		m_RebufferLen.EnableWindow(0);
 	}
 
-	return TRUE;  
+	return TRUE;
 }
 
 
-void COptStream::OnSelchangePort() 
+void COptStream::OnSelchangePort()
 {
 	s32 sel = m_Port.GetCurSel();
 	switch (sel) {
@@ -1014,7 +1032,7 @@
 	}
 }
 
-void COptStream::OnRtsp() 
+void COptStream::OnRtsp()
 {
 	if (m_UseRTSP.GetCheck()) {
 		m_Reorder.SetCheck(0);
@@ -1023,7 +1041,7 @@
 		m_Reorder.SetCheck(1);
 		m_Reorder.EnableWindow(1);
 	}
-	
+
 }
 
 void COptStream::CheckRebuffer()
@@ -1044,7 +1062,7 @@
 	}
 }
 
-void COptStream::OnRebuffer() 
+void COptStream::OnRebuffer()
 {
 	if (!m_Rebuffer.GetCheck()) {
 		m_RebufferLen.EnableWindow(0);
@@ -1054,14 +1072,14 @@
 	}
 }
 
-void COptStream::OnUpdateRebufferLen() 
+void COptStream::OnUpdateRebufferLen()
 {
 	CheckRebuffer();
 }
 
-void COptStream::OnUpdateBuffer() 
+void COptStream::OnUpdateBuffer()
 {
-	CheckRebuffer();	
+	CheckRebuffer();
 }
 
 void COptStream::SaveOptions()
@@ -1118,7 +1136,7 @@
 	: CDialog(COptSystems::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(COptSystems)
-		// NOTE: the ClassWizard will add member initialization here
+	// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
 
@@ -1145,10 +1163,10 @@
 
 
 
-BOOL COptSystems::OnInitDialog() 
+BOOL COptSystems::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	COsmo4 *gpac = GetApp();
 	const char *sOpt;
 
@@ -1156,20 +1174,18 @@
 	if (!sOpt) sOpt = "eng";
 	s32 select = 0;
 	while (m_Lang.GetCount()) m_Lang.DeleteString(0);
-	u32 i=0;
-	while (GF_ISO639_Lang[i]) {
+	s32 idx = gf_lang_find(sOpt);
+	u32 i, count = gf_lang_get_count();
+	for (i=0; i<count; i++) {
 		TCHAR szTmp[100];
-		/*only use common languages (having both 2- and 3-char code names)*/
-		if (GF_ISO639_Lang[i+2][0]) {
-			CE_CharToWide( (char *)GF_ISO639_Lang[i], (u16 *)szTmp);
-			m_Lang.AddString(szTmp);
-			if (sOpt && !stricmp(sOpt, GF_ISO639_Lang[i+1])) select = m_Lang.GetCount() - 1;
-		}
-		i+=3;
+		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;
@@ -1195,8 +1211,8 @@
 		m_BifsAlwaysDrawn.SetCheck(0);
 	}
 
-	
-	return TRUE; 
+
+	return TRUE;
 }
 
 
@@ -1205,18 +1221,9 @@
 	COsmo4 *gpac = GetApp();
 
 	s32 sel = m_Lang.GetCurSel();
-	u32 i=0;
-	while (GF_ISO639_Lang[i]) {
-		/*only use common languages (having both 2- and 3-char code names)*/
-		if (GF_ISO639_Lang[i+2][0]) {
-			if (!sel) break;
-			sel--;
-		}
-		i+=3;
-	}
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "LanguageName", GF_ISO639_Lang[i]);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language3CC", GF_ISO639_Lang[i+1]);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language2CC", GF_ISO639_Lang[i+2]);
+	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"));

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/Options.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/Options.h Changed

@@ -28,7 +28,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptSystems)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -68,7 +68,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptStream)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -109,7 +109,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptRender)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -144,7 +144,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptHTTP)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -179,7 +179,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptGen)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -213,7 +213,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptFont)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -245,7 +245,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptDecoder)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -282,7 +282,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptAudio)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -319,7 +319,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptRender)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -352,7 +352,7 @@
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COptions)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/Osmo4.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/Osmo4.cpp Changed

@@ -65,7 +65,7 @@
 	case GF_EVENT_SCENE_SIZE:
 		app->m_scene_width = event->size.width;
 		app->m_scene_height = event->size.height;
-		if (!pFrame->m_full_screen) 
+		if (!pFrame->m_full_screen)
 			pFrame->PostMessage(WM_SETSIZE, event->size.width, event->size.height);
 		break;
 	case GF_EVENT_CONNECT:
@@ -80,7 +80,7 @@
 		/*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) 
+			if (!pFrame->m_full_screen)
 				pFrame->PostMessage(WM_SETSIZE, 0, 0);
 		}
 		break;
@@ -95,11 +95,11 @@
 	/*ipaq keys*/
 	case GF_EVENT_KEYDOWN:
 		switch (event->key.key_code) {
-		case GF_KEY_F1: 
-			pFrame->PostMessage(WM_COMMAND, ID_FILE_OPEN); 
+		case GF_KEY_F1:
+			pFrame->PostMessage(WM_COMMAND, ID_FILE_OPEN);
 			break;
 		case GF_KEY_F2:
-			pFrame->PostMessage(WM_QUIT); 
+			pFrame->PostMessage(WM_QUIT);
 			break;
 		case GF_KEY_F3:
 			pFrame->PostMessage(WM_COMMAND, ID_FILE_RESTART);
@@ -125,7 +125,7 @@
 			}
 			break;
 		case GF_KEY_UP:
-			if (app->m_duration>=2000) pFrame->PostMessage(WM_COMMAND, ID_FILE_STEP);	
+			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);
@@ -136,7 +136,7 @@
 		pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
 		return 0;
 	}
-	
+
 	return 0;
 }
 
@@ -157,7 +157,7 @@
 {
 	FILE *logs = (FILE *) cbk;
 	if (logs) {
-	    vfprintf(logs, fmt, list);
+		vfprintf(logs, fmt, list);
 		fflush(logs);
 	}
 }
@@ -179,7 +179,7 @@
 			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) {
 			fclose(m_logs);
@@ -204,7 +204,7 @@
 	}
 
 	gf_sys_init();
-	
+
 	SetRegistryKey(_T("GPAC"));
 
 	m_prev_batt_bl = m_prev_ac_bl = 0;
@@ -322,7 +322,7 @@
 
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CAboutDlg)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
@@ -350,7 +350,7 @@
 
 BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
 	//{{AFX_MSG_MAP(CAboutDlg)
-		// No message handlers
+	// No message handlers
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -358,7 +358,7 @@
 // COsmo4 commands
 // Added for WCE apps
 
-BOOL CAboutDlg::OnInitDialog() 
+BOOL CAboutDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	CString str = _T("Osmo4 Player\nGPAC V");
@@ -367,7 +367,7 @@
 	str += _T(GPAC_BUILD_NUMBER);
 	str += _T(")");
 	m_AbtTxt.SetWindowText(str);
-	return TRUE; 
+	return TRUE;
 }
 
 
@@ -381,7 +381,7 @@
 }
 
 
-int COsmo4::ExitInstance() 
+int COsmo4::ExitInstance()
 {
 	gf_term_del(m_term);
 	gf_modules_del(m_user.modules);
@@ -425,7 +425,7 @@
 void COsmo4::OnConfigure()
 {
 	COptions dlg;
-	
+
 	ShowTaskBar(1);
 	dlg.DoModal();
 	ShowTaskBar(0);
@@ -487,7 +487,7 @@
 		CString sOpt;
 		const char *opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
 		/*remove #include <gpac/options.h>
- name*/
+		name*/
 		strcpy(szKeyList, opt+1);
 		sKey = strrchr(szKeyList, '\"');
 		if (!sKey) continue;
@@ -518,7 +518,7 @@
 
 		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*/
@@ -553,7 +553,7 @@
 	return supportedFiles;
 }
 
-void COsmo4::OnOpenFile() 
+void COsmo4::OnOpenFile()
 {
 	Bool res;
 	CFileDialog fd(TRUE,NULL,_T("\\"),OFN_HIDEREADONLY, GetFileFilter());
@@ -564,12 +564,12 @@
 		res = 1;
 		m_filename = fd.GetPathName();
 		m_DoResume = 0;/*done by term*/
-	} 
+	}
 	ShowTaskBar(0);
 	if (res) m_pMainWnd->PostMessage(WM_OPENURL);
 }
 
-void COsmo4::OnOpenUrl() 
+void COsmo4::OnOpenUrl()
 {
 	OpenDlg dlg;
 	Bool res;
@@ -578,12 +578,12 @@
 	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) 
+void COsmo4::SetBacklightState(Bool disable)
 {
 	HKEY hKey = 0;
 	DWORD dwSize;
@@ -623,16 +623,16 @@
 	}
 }
 
-void COsmo4::OnShortcuts() 
+void COsmo4::OnShortcuts()
 {
 	ShowTaskBar(1);
 
 	MessageBox(NULL,
-		_T("Double Click: Fullscreen on/off\n"),
+	           _T("Double Click: Fullscreen on/off\n"),
+
+	           _T("Osmo4 Shortcuts"),
+	           MB_OK);
 
-		_T("Osmo4 Shortcuts"),
-		MB_OK);
-	
 	ShowTaskBar(0);
 }

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/Osmo4.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/Osmo4.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/ProgressBar.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/ProgressBar.cpp Changed

@@ -46,7 +46,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // ProgressBar message handlers
 #define TEXT_RIGHT_PAD	2
-void ProgressBar::OnSize(UINT nType, int cx, int cy) 
+void ProgressBar::OnSize(UINT nType, int cx, int cy)
 {
 	u32 tw;
 	CDialog::OnSize(nType, cx, cy);
@@ -65,7 +65,7 @@
 	m_Slider.MoveWindow(&rc);
 }
 
-void ProgressBar::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void ProgressBar::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	COsmo4 *app = GetApp();
 
@@ -111,14 +111,14 @@
 		} else {
 			m_Slider.ShowWindow(SW_SHOWNORMAL);
 			m_Slider.EnableWindow(FALSE);
-			
+
 		}
 		m_range_invalidated = 0;
 	}
 	if (now==m_prev_time) return;
 
 	if (now<m_prev_time) m_prev_time = 0;
-	
+
 	if (!m_prev_time || (m_prev_time + 500 <= now)) {
 		m_FPS = gf_term_get_framerate(app->m_term, 0);
 		m_prev_time = now;
@@ -128,6 +128,6 @@
 	nb_s -= nb_m*60;
 	wsprintf(swText, _T("%02d:%02d FPS %02.2f"), nb_m, nb_s, m_FPS);
 	m_Time.SetWindowText(swText);
-	
+
 	if (!m_grabbed) m_Slider.SetPos(now);
 }

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/ProgressBar.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/ProgressBar.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/Resource.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/Resource.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wce/newres.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wce/newres.h Changed

@@ -3,25 +3,25 @@
 
 #define  SHMENUBAR RCDATA
 #if !(defined(_WIN32_WCE_PSPC) && (_WIN32_WCE >= 300))
-	#undef HDS_HORZ  
-	#undef HDS_BUTTONS 
-	#undef HDS_HIDDEN 
+#undef HDS_HORZ
+#undef HDS_BUTTONS
+#undef HDS_HIDDEN
 
-	#include <commctrl.h>
-	// for MenuBar
-	#define I_IMAGENONE		(-2)
-	#define NOMENU			0xFFFF
-	#define IDS_SHNEW		1
-	#define IDM_SHAREDNEW        10
-	#define IDM_SHAREDNEWDEFAULT 11
+#include <commctrl.h>
+// for MenuBar
+#define I_IMAGENONE		(-2)
+#define NOMENU			0xFFFF
+#define IDS_SHNEW		1
+#define IDM_SHAREDNEW        10
+#define IDM_SHAREDNEWDEFAULT 11
 
-	// for Tab Control
-	#define TCS_SCROLLOPPOSITE      0x0001   // assumes multiline tab
-	#define TCS_BOTTOM              0x0002
-	#define TCS_RIGHT               0x0002
-	#define TCS_VERTICAL            0x0080
-	#define TCS_MULTISELECT         0x0004  // allow multi-select in button mode
-	#define TCS_FLATBUTTONS         0x0008	
+// for Tab Control
+#define TCS_SCROLLOPPOSITE      0x0001   // assumes multiline tab
+#define TCS_BOTTOM              0x0002
+#define TCS_RIGHT               0x0002
+#define TCS_VERTICAL            0x0080
+#define TCS_MULTISELECT         0x0004  // allow multi-select in button mode
+#define TCS_FLATBUTTONS         0x0008
 #endif //_WIN32_WCE_PSPC

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/Playlist.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/Playlist.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 #include "wxOsmo4.h"
@@ -36,7 +36,10 @@
 	Bool is_remote = 0;;
 	wxCharBuffer the_url = (const char *) url.mb_str(wxConvUTF8);
 	const char *_url = strstr(the_url, "://");
-	if (_url) {_url += 3; is_remote = 1; }
+	if (_url) {
+		_url += 3;
+		is_remote = 1;
+	}
 	else _url = (const char *) the_url;
 
 	char *str = (char*)strrchr(_url, '\\');
@@ -66,8 +69,8 @@
 }
 
 wxPlaylist::wxPlaylist(wxWindow *parent)
-             : wxFrame(parent, -1, wxString(_T("Osmo4 Playlist")), wxDefaultPosition, wxDefaultSize, 
-			 wxCLOSE_BOX | wxSYSTEM_MENU | wxCAPTION | wxRESIZE_BORDER)
+	: wxFrame(parent, -1, wxString(_T("Osmo4 Playlist")), wxDefaultPosition, wxDefaultSize,
+	          wxCLOSE_BOX | wxSYSTEM_MENU | wxCAPTION | wxRESIZE_BORDER)
 {
 
 	m_pApp = (wxOsmo4Frame *)parent;
@@ -153,25 +156,25 @@
 BEGIN_EVENT_TABLE(wxPlaylist, wxWindow)
 	EVT_CLOSE(wxPlaylist::OnClose)
 	EVT_SIZE(wxPlaylist::OnSize)
-	EVT_TOOL(ID_PL_ADD_FILE, wxPlaylist::OnAddFile) 
-	EVT_TOOL(ID_PL_ADD_URL, wxPlaylist::OnAddURL) 
-	EVT_TOOL(ID_PL_ADD_DIR, wxPlaylist::OnAddDir) 
-	EVT_TOOL(ID_PL_ADD_DIR_REC, wxPlaylist::OnAddDirRec) 
-	EVT_TOOL(ID_PL_REM_FILE, wxPlaylist::OnRemFile) 
-	EVT_TOOL(ID_PL_REM_ALL, wxPlaylist::OnRemAll) 
-	EVT_TOOL(ID_PL_REM_DEAD, wxPlaylist::OnRemDead) 
-	EVT_TOOL(ID_PL_UP, wxPlaylist::OnSelUp) 
-	EVT_TOOL(ID_PL_DOWN, wxPlaylist::OnSelDown) 
-	EVT_TOOL(ID_PL_SAVE, wxPlaylist::OnSave) 
-	EVT_TOOL(ID_PL_OPEN, wxPlaylist::OnOpen) 
-	EVT_MENU(ID_PL_PLAY, wxPlaylist::OnPlay) 
-	EVT_MENU(ID_PL_RANDOMIZE, wxPlaylist::OnRandomize) 
-	EVT_MENU(ID_PL_REVERSE, wxPlaylist::OnReverseList) 
-	EVT_MENU(ID_PL_SEL_REV, wxPlaylist::OnReverseSelection) 
-	EVT_MENU(ID_PL_SORT_TITLE, wxPlaylist::OnSortTitle) 
-	EVT_MENU(ID_PL_SORT_FILE, wxPlaylist::OnSortFile) 
-	EVT_MENU(ID_PL_SORT_DUR, wxPlaylist::OnSortDuration) 
-	EVT_LIST_ITEM_ACTIVATED(ID_FILE_LIST, wxPlaylist::OnItemActivate) 
+	EVT_TOOL(ID_PL_ADD_FILE, wxPlaylist::OnAddFile)
+	EVT_TOOL(ID_PL_ADD_URL, wxPlaylist::OnAddURL)
+	EVT_TOOL(ID_PL_ADD_DIR, wxPlaylist::OnAddDir)
+	EVT_TOOL(ID_PL_ADD_DIR_REC, wxPlaylist::OnAddDirRec)
+	EVT_TOOL(ID_PL_REM_FILE, wxPlaylist::OnRemFile)
+	EVT_TOOL(ID_PL_REM_ALL, wxPlaylist::OnRemAll)
+	EVT_TOOL(ID_PL_REM_DEAD, wxPlaylist::OnRemDead)
+	EVT_TOOL(ID_PL_UP, wxPlaylist::OnSelUp)
+	EVT_TOOL(ID_PL_DOWN, wxPlaylist::OnSelDown)
+	EVT_TOOL(ID_PL_SAVE, wxPlaylist::OnSave)
+	EVT_TOOL(ID_PL_OPEN, wxPlaylist::OnOpen)
+	EVT_MENU(ID_PL_PLAY, wxPlaylist::OnPlay)
+	EVT_MENU(ID_PL_RANDOMIZE, wxPlaylist::OnRandomize)
+	EVT_MENU(ID_PL_REVERSE, wxPlaylist::OnReverseList)
+	EVT_MENU(ID_PL_SEL_REV, wxPlaylist::OnReverseSelection)
+	EVT_MENU(ID_PL_SORT_TITLE, wxPlaylist::OnSortTitle)
+	EVT_MENU(ID_PL_SORT_FILE, wxPlaylist::OnSortFile)
+	EVT_MENU(ID_PL_SORT_DUR, wxPlaylist::OnSortDuration)
+	EVT_LIST_ITEM_ACTIVATED(ID_FILE_LIST, wxPlaylist::OnItemActivate)
 	EVT_LIST_ITEM_RIGHT_CLICK(ID_FILE_LIST, wxPlaylist::OnRightClick)
 END_EVENT_TABLE()
 
@@ -233,7 +236,7 @@
 	else if (ple->m_bIsPlaying) str = wxT(">> ") + wxString(ple->m_disp_name, wxConvUTF8) + wxT(" >>");
 	else str = wxString(ple->m_disp_name, wxConvUTF8);
 	m_FileList->SetItem(idx, 1, str);
-	
+
 	if (ple->m_duration) {
 		u32 h = (u32) (ple->m_duration / 3600);
 		u32 m = (u32) (ple->m_duration / 60) - h*60;
@@ -273,7 +276,7 @@
 			}
 		}
 	}
-	
+
 	if (m_cur_entry >= (s32) gf_list_count(m_entries)-1) m_cur_entry = gf_list_count(m_entries)-1;
 	else {
 		s32 last_idx = top_idx + m_FileList->GetCountPerPage();
@@ -291,7 +294,7 @@
 	Save(szPath, 1);
 }
 
-void wxPlaylist::OnAddFile(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnAddFile(wxCommandEvent &WXUNUSED(event))
 {
 	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), m_pApp->GetFileFilter(), wxOPEN | wxCHANGE_DIR | /*wxHIDE_READONLY |*/ wxMULTIPLE);
 
@@ -308,7 +311,7 @@
 }
 
 
-static Bool pl_enum_dir_item(void *cbck, char *item_name, char *item_path)
+static Bool pl_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	wxPlaylist *_this = (wxPlaylist *)cbck;
 
@@ -319,7 +322,7 @@
 	return 0;
 }
 
-static Bool pl_enum_dir_dirs(void *cbck, char *item_name, char *item_path)
+static Bool pl_enum_dir_dirs(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	gf_enum_directory(item_path, 0, pl_enum_dir_item, cbck, NULL);
 	gf_enum_directory(item_path, 1, pl_enum_dir_dirs, cbck, NULL);
@@ -327,7 +330,7 @@
 }
 
 
-void wxPlaylist::AddDir(Bool do_recurse) 
+void wxPlaylist::AddDir(Bool do_recurse)
 {
 	wxDirDialog dlg(this);
 	dlg.SetPath(wxString(szCacheDir, wxConvUTF8) );
@@ -339,16 +342,16 @@
 	m_all_dead_entries = -1;
 	RefreshList();
 }
-void wxPlaylist::OnAddDir(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnAddDir(wxCommandEvent &WXUNUSED(event))
 {
 	AddDir(0);
 }
-void wxPlaylist::OnAddDirRec(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnAddDirRec(wxCommandEvent &WXUNUSED(event))
 {
 	AddDir(1);
 }
 
-void wxPlaylist::OnAddURL(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnAddURL(wxCommandEvent &WXUNUSED(event))
 {
 	OpenURLDlg dlg(this, m_pApp->m_user.config);
 	if (dlg.ShowModal() != wxID_OK) return;
@@ -358,22 +361,22 @@
 	RefreshList();
 }
 
-void wxPlaylist::OnRemFile(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnRemFile(wxCommandEvent &WXUNUSED(event))
 {
 	if (!m_FileList->GetSelectedItemCount()) return;
 
 	long item = -1;
 	for (;;) {
-        item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1) break;
 		PLEntry *ple = (PLEntry *) m_FileList->GetItemData(item);
 		gf_list_del_item(m_entries, ple);
 		delete ple;
-    }
+	}
 	RefreshList();
 }
 
-void wxPlaylist::OnRemAll(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnRemAll(wxCommandEvent &WXUNUSED(event))
 {
 	Clear();
 	RefreshList();
@@ -381,7 +384,7 @@
 	m_all_dead_entries = 1;
 }
 
-void wxPlaylist::OnRemDead(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnRemDead(wxCommandEvent &WXUNUSED(event))
 {
 	for (u32 i=0; i<gf_list_count(m_entries); i++) {
 		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
@@ -395,28 +398,28 @@
 }
 
 
-void wxPlaylist::OnSelUp(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnSelUp(wxCommandEvent &WXUNUSED(event))
 {
 	s32 i;
 	if (!m_FileList->GetSelectedItemCount()) return;
 	long item = -1;
 	item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (item <= 0) return;
-	
+
 	item = -1;
 	for (;;) {
-        item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1) break;
 		PLEntry *ple = (PLEntry *) m_FileList->GetItemData(item);
 		i = gf_list_del_item(m_entries, ple);
 		assert(i>=1);
 		gf_list_insert(m_entries, ple, i-1);
 		ple->m_bIsSelected = 1;
-    }
+	}
 	RefreshList();
 }
 
-void wxPlaylist::OnSelDown(wxCommandEvent &WXUNUSED(event)) 
+void wxPlaylist::OnSelDown(wxCommandEvent &WXUNUSED(event))
 {
 	s32 i;
 
@@ -427,23 +430,23 @@
 		if (item == -1) break;
 	}
 	if ((u32) item + 1 == gf_list_count(m_entries)) return;
-	
+
 	item = -1;
 	for (;;) {
-        item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1) break;
 		PLEntry *ple = (PLEntry *) m_FileList->GetItemData(item);
 		i = gf_list_del_item(m_entries, ple);
 		assert(i>=1);
 		gf_list_insert(m_entries, ple, i+1);
 		ple->m_bIsSelected = 1;
-    }
+	}
 	RefreshList();
 }
 
 
 
-void wxPlaylist::OnSave(wxCommandEvent & WXUNUSED(event)) 
+void wxPlaylist::OnSave(wxCommandEvent & WXUNUSED(event))
 {
 	Bool save_m3u;
 	char szPath[GF_MAX_PATH];
@@ -476,7 +479,7 @@
 void wxPlaylist::Save(char *szPath, Bool save_m3u)
 {
 	FILE *out = fopen(szPath, "wt");
-	if (!save_m3u) 
+	if (!save_m3u)
 		fprintf(out, "[playlist]\nNumberOfEntries=%d\n", gf_list_count(m_entries));
 
 	for (u32 i=0; i<gf_list_count(m_entries); i++) {
@@ -496,7 +499,7 @@
 	fclose(out);
 }
 
-void wxPlaylist::OnOpen(wxCommandEvent & WXUNUSED(event)) 
+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*/);
 	if (dlg.ShowModal() != wxID_OK) return;
@@ -562,11 +565,11 @@
 	RefreshList();
 }
 
-void wxPlaylist::OnRightClick(wxListEvent & event) 
+void wxPlaylist::OnRightClick(wxListEvent & event)
 {
 	if (!m_FileList->GetItemCount()) return;
 
-	wxMenu *popup = new wxMenu();	
+	wxMenu *popup = new wxMenu();
 
 	if (m_FileList->GetSelectedItemCount()==1) {
 		popup->Append(ID_PL_PLAY, wxT("Play"));
@@ -583,12 +586,12 @@
 		popup->Append(ID_PL_REVERSE, wxT("Reverse List"));
 		popup->Append(ID_PL_RANDOMIZE, wxT("Randomize"));
 	}
-	
+
 	PopupMenu(popup, event.GetPoint());
 	delete popup;
 }
 
-void wxPlaylist::OnReverseSelection(wxCommandEvent &WXUNUSED(event) ) 
+void wxPlaylist::OnReverseSelection(wxCommandEvent &WXUNUSED(event) )
 {
 	u32 i;
 	long item = -1;
@@ -655,13 +658,13 @@
 			s32 test = 0;
 			switch (type) {
 			case 0:
-                test = stricmp(ple1->m_url, ple2->m_url);
+				test = stricmp(ple1->m_url, ple2->m_url);
 				break;
 			case 1:
-                test = stricmp(ple1->m_disp_name, ple2->m_disp_name);
+				test = stricmp(ple1->m_disp_name, ple2->m_disp_name);
 				break;
 			case 2:
-                test = ple1->m_duration - ple2->m_duration;
+				test = ple1->m_duration - ple2->m_duration;
 				break;
 			}
 			if (test<0) smallest = j;
@@ -674,9 +677,15 @@
 	RefreshList();
 }
 
-void wxPlaylist::OnSortFile(wxCommandEvent &WXUNUSED(event) ) { Sort(0); }
-void wxPlaylist::OnSortTitle(wxCommandEvent &WXUNUSED(event) ) { Sort(1); }
-void wxPlaylist::OnSortDuration(wxCommandEvent &WXUNUSED(event) ) { Sort(2); }
+void wxPlaylist::OnSortFile(wxCommandEvent &WXUNUSED(event) ) {
+	Sort(0);
+}
+void wxPlaylist::OnSortTitle(wxCommandEvent &WXUNUSED(event) ) {
+	Sort(1);
+}
+void wxPlaylist::OnSortDuration(wxCommandEvent &WXUNUSED(event) ) {
+	Sort(2);
+}
 
 void wxPlaylist::RefreshCurrent()
 {
@@ -730,7 +739,7 @@
 	}
 }
 
-void wxPlaylist::OnItemActivate(wxListEvent &WXUNUSED(event) ) 
+void wxPlaylist::OnItemActivate(wxListEvent &WXUNUSED(event) )
 {
 	long item = m_FileList->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (item==-1) return;

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/Playlist.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/Playlist.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 #ifndef _PLAYLIST_H
@@ -30,7 +30,7 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif
 
 #include "menubtn.h"
@@ -42,7 +42,7 @@
 
 class wxOsmo4Frame;
 
-class PLEntry 
+class PLEntry
 {
 public:
 	PLEntry(wxString url);
@@ -61,7 +61,7 @@
 class wxPlaylist : public wxFrame
 {
 public:
-    wxPlaylist(wxWindow *parent);
+	wxPlaylist(wxWindow *parent);
 	virtual ~wxPlaylist();
 
 	void Clear();
@@ -104,7 +104,7 @@
 	void OnSave(wxCommandEvent &event);
 	void OnOpen(wxCommandEvent &event);
 	void OnRightClick(wxListEvent & event);
-	void OnReverseSelection(wxCommandEvent &event); 
+	void OnReverseSelection(wxCommandEvent &event);
 	void OnReverseList(wxCommandEvent &event);
 	void OnRandomize(wxCommandEvent &event);
 	void OnSortFile(wxCommandEvent &event);

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/fileprops.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/fileprops.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 #include "fileprops.h"
@@ -36,7 +36,7 @@
 
 
 wxFileProps::wxFileProps(wxWindow *parent)
-             : wxDialog(parent, -1, wxString(_T("File Properties")))
+	: wxDialog(parent, -1, wxString(_T("File Properties")))
 {
 
 	m_pApp = (wxOsmo4Frame *)parent;
@@ -44,16 +44,16 @@
 	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 = 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);
+	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")));
@@ -147,17 +147,27 @@
 	m_current_odm = odm;
 
 	switch (m_pViewSel->GetSelection()) {
-	case 3: SetNetworkInfo(); break;
-	case 2: SetDecoderInfo(); break;
-	case 1: SetStreamsInfo(); break;
-	default: SetGeneralInfo(); break;
+	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;
+	case 2:
+		SetDecoderInfo();
+		break;
 	}
 }
 void wxFileProps::OnSelectInfo(wxCommandEvent & WXUNUSED(event) )
@@ -193,10 +203,10 @@
 		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) {
@@ -227,8 +237,8 @@
 			break;
 		}
 	}
-	if (odi.protection==2) info += wxT("Encrypted Media NOT UNLOCKED"); 
-	else if (odi.protection==1) info += wxT("Encrypted Media"); 
+	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();
@@ -248,7 +258,7 @@
 			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;
+		break;
 		case GF_ODF_CC_NAME_TAG:
 		{
 			GF_CC_Name *ccn = (GF_CC_Name *)desc;
@@ -259,14 +269,14 @@
 				info += wxT("\t") + wxString(ci->contentCreatorName, wxConvUTF8) + wxT("\n");
 			}
 		}
-			break;
+		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;
+		{
+			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;
@@ -307,7 +317,7 @@
 
 	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);
@@ -328,24 +338,46 @@
 		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 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); 
+			default:
+				info += wxString::Format(wxT("Private/Unknown Type (0x%x)\n"), esd->decoderConfig->objectTypeIndication);
 				break;
 			}
 			break;
@@ -353,22 +385,40 @@
 		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 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); 
+			default:
+				info += wxString::Format(wxT("Private/Unknown Type (0x%x)\n"), esd->decoderConfig->objectTypeIndication);
 				break;
 			}
 			break;
@@ -398,30 +448,21 @@
 		} else {
 			info += wxString::Format(wxT("\tStream Clock Resolution %d\n"), esd->slConfig->timestampResolution);
 		}
-		if (esd->URLString) 
+		if (esd->URLString)
 			info += wxT("\tStream Location: ") + wxString(esd->URLString, wxConvUTF8) + wxT("\n");
 
 		/*check language*/
 		if (esd->langDesc) {
-			u32 i=0;
-			char lan[4], *szLang;
+			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;
-
-			if ((lan[0]=='u') && (lan[1]=='n') && (lan[2]=='d')) szLang = (char*) "Undetermined";
-			else {
-				szLang = lan;
-				while (GF_ISO639_Lang[i]) {
-					if (GF_ISO639_Lang[i+2][0] && strstr(GF_ISO639_Lang[i+1], lan)) {
-						szLang = (char*) GF_ISO639_Lang[i];
-						break;
-					}
-					i+=3;
-				}
+			idx = gf_lang_find(lan);
+			if (idx>=0) {
+				info += wxString::Format(wxT("\tStream Language: %s\n"), gf_lang_get_name(idx) );
 			}
-			info += wxString::Format(wxT("\tStream Language: %s\n"), szLang);
 		}
 
 	}
@@ -437,9 +478,9 @@
 	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;
+		m_pViewInfo->Clear();
+		m_pViewInfo->AppendText(info);
+		return;
 	}
 
 	info = wxT("Status: ");
@@ -476,16 +517,16 @@
 	/*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) 
+	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; 
+		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_droped);
+	                         (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames, odi.nb_droped);
 
 	m_pViewInfo->Clear();
 	m_pViewInfo->AppendText(info);
@@ -553,7 +594,7 @@
 }
 
 
-void wxFileProps::OnViewWorld(wxCommandEvent &WXUNUSED(event)) 
+void wxFileProps::OnViewWorld(wxCommandEvent &WXUNUSED(event))
 {
 	wxString wit;
 	const char *str;
@@ -576,7 +617,7 @@
 	gf_list_del(descs);
 }
 
-void wxFileProps::OnViewSG(wxCommandEvent &WXUNUSED(event)) 
+void wxFileProps::OnViewSG(wxCommandEvent &WXUNUSED(event))
 {
 	const char *sOpt;
 	Bool dump_xmt;

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/fileprops.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/fileprops.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 #ifndef _FILEPROPS_H
@@ -30,7 +30,7 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif
 
 #include <wx/treectrl.h>
@@ -47,11 +47,11 @@
 
 
 class wxOsmo4Frame;
-class wxFileProps : public wxDialog 
+class wxFileProps : public wxDialog
 {
 public:
-    wxFileProps(wxWindow *parent);
-    virtual ~wxFileProps();
+	wxFileProps(wxWindow *parent);
+	virtual ~wxFileProps();
 
 private:
 	DECLARE_EVENT_TABLE()

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/menubtn.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/menubtn.cpp Changed

@@ -10,23 +10,23 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "menubtn.h"
+#pragma implementation "menubtn.h"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+#pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/control.h"
-    #include "wx/menu.h"
-    #include "wx/settings.h"
-    #include "wx/bitmap.h"
-    #include "wx/pen.h"
-    #include "wx/dc.h"
+#include "wx/control.h"
+#include "wx/menu.h"
+#include "wx/settings.h"
+#include "wx/bitmap.h"
+#include "wx/pen.h"
+#include "wx/dc.h"
 #endif // WX_PRECOMP
 
 #include <wx/tglbtn.h>
@@ -44,26 +44,26 @@
 IMPLEMENT_DYNAMIC_CLASS( wxCustomButton, wxControl )
 
 BEGIN_EVENT_TABLE(wxCustomButton,wxControl)
-    EVT_MOUSE_EVENTS ( wxCustomButton::OnMouseEvents )
-    EVT_PAINT        ( wxCustomButton::OnPaint )
-    EVT_SIZE         ( wxCustomButton::OnSize )
+	EVT_MOUSE_EVENTS ( wxCustomButton::OnMouseEvents )
+	EVT_PAINT        ( wxCustomButton::OnPaint )
+	EVT_SIZE         ( wxCustomButton::OnSize )
 END_EVENT_TABLE()
 
 wxCustomButton::~wxCustomButton()
 {
-    if (HasCapture()) ReleaseMouse();
-    if (m_timer) delete m_timer;
+	if (HasCapture()) ReleaseMouse();
+	if (m_timer) delete m_timer;
 }
 
 void wxCustomButton::Init()
 {
-    m_focused = FALSE;
-    m_labelMargin = wxSize(4,4);
-    m_bitmapMargin = wxSize(2,2);
-    m_down = 0;
-    m_timer = NULL;
-    m_eventType = 0;
-    m_button_style = wxCUSTBUT_TOGGLE|wxCUSTBUT_BOTTOM;
+	m_focused = FALSE;
+	m_labelMargin = wxSize(4,4);
+	m_bitmapMargin = wxSize(2,2);
+	m_down = 0;
+	m_timer = NULL;
+	m_eventType = 0;
+	m_button_style = wxCUSTBUT_TOGGLE|wxCUSTBUT_BOTTOM;
 }
 
 bool wxCustomButton::Create(wxWindow* parent, wxWindowID id,
@@ -72,474 +72,481 @@
                             long style, const wxValidator& val,
                             const wxString& name)
 {
-    if (!wxControl::Create(parent,id,pos,size,wxNO_BORDER|wxCLIP_CHILDREN,val,name))
-        return FALSE;
-    
-    wxControl::SetLabel(label);    
-    wxControl::SetBackgroundColour(parent->GetBackgroundColour());
-    wxControl::SetForegroundColour(parent->GetForegroundColour());
-    wxControl::SetFont(parent->GetFont());
-
-    if (bitmap.Ok()) m_bmpLabel = bitmap;
-    
-    if (!SetButtonStyle(style)) return FALSE;
-
-    wxSize bestSize = DoGetBestSize();
-    SetSize(wxSize(size.x<0 ? bestSize.x:size.x, size.y<0 ? bestSize.y:size.y));
-#if (wxMINOR_VERSION<8) 
-    SetBestSize(GetSize());
+	if (!wxControl::Create(parent,id,pos,size,wxNO_BORDER|wxCLIP_CHILDREN,val,name))
+		return FALSE;
+
+	wxControl::SetLabel(label);
+	wxControl::SetBackgroundColour(parent->GetBackgroundColour());
+	wxControl::SetForegroundColour(parent->GetForegroundColour());
+	wxControl::SetFont(parent->GetFont());
+
+	if (bitmap.Ok()) m_bmpLabel = bitmap;
+
+	if (!SetButtonStyle(style)) return FALSE;
+
+	wxSize bestSize = DoGetBestSize();
+	SetSize(wxSize(size.x<0 ? bestSize.x:size.x, size.y<0 ? bestSize.y:size.y));
+#if (wxMINOR_VERSION<8)
+	SetBestSize(GetSize());
 #else
-    SetInitialSize(GetSize());
+	SetInitialSize(GetSize());
 #endif
-    
-    CalcLayout(TRUE);
-    return TRUE;
+
+	CalcLayout(TRUE);
+	return TRUE;
 }
 
 void wxCustomButton::SetValue(bool depressed)
 {
-    wxCHECK_RET(!(m_button_style & wxCUSTBUT_NOTOGGLE), wxT("can't set button state"));
-    m_down = depressed ? 1 : 0;
-    Refresh(FALSE);
+	wxCHECK_RET(!(m_button_style & wxCUSTBUT_NOTOGGLE), wxT("can't set button state"));
+	m_down = depressed ? 1 : 0;
+	Refresh(FALSE);
 }
 
 bool wxCustomButton::SetButtonStyle(long style)
 {
-    int n_styles = 0;
-    if ((style & wxCUSTBUT_LEFT) != 0)   n_styles++;
-    if ((style & wxCUSTBUT_RIGHT) != 0)  n_styles++;
-    if ((style & wxCUSTBUT_TOP) != 0)    n_styles++;
-    if ((style & wxCUSTBUT_BOTTOM) != 0) n_styles++;
-    wxCHECK_MSG(n_styles < 2, FALSE, wxT("Only one wxCustomButton label position allowed"));
-    
-    n_styles = 0;
-    if ((style & wxCUSTBUT_NOTOGGLE) != 0)       n_styles++;
-    if ((style & wxCUSTBUT_BUTTON) != 0)         n_styles++;
-    if ((style & wxCUSTBUT_TOGGLE) != 0)         n_styles++;
-    if ((style & wxCUSTBUT_BUT_DCLICK_TOG) != 0) n_styles++;
-    if ((style & wxCUSTBUT_TOG_DCLICK_BUT) != 0) n_styles++;
-    wxCHECK_MSG(n_styles < 2, FALSE, wxT("Only one wxCustomButton style allowed"));
-
-    m_button_style = style;
-    
-    if ((m_button_style & wxCUSTBUT_BUTTON) != 0) 
-        m_down = 0;
-    
-    CalcLayout(TRUE);
-    return TRUE;
+	int n_styles = 0;
+	if ((style & wxCUSTBUT_LEFT) != 0)   n_styles++;
+	if ((style & wxCUSTBUT_RIGHT) != 0)  n_styles++;
+	if ((style & wxCUSTBUT_TOP) != 0)    n_styles++;
+	if ((style & wxCUSTBUT_BOTTOM) != 0) n_styles++;
+	wxCHECK_MSG(n_styles < 2, FALSE, wxT("Only one wxCustomButton label position allowed"));
+
+	n_styles = 0;
+	if ((style & wxCUSTBUT_NOTOGGLE) != 0)       n_styles++;
+	if ((style & wxCUSTBUT_BUTTON) != 0)         n_styles++;
+	if ((style & wxCUSTBUT_TOGGLE) != 0)         n_styles++;
+	if ((style & wxCUSTBUT_BUT_DCLICK_TOG) != 0) n_styles++;
+	if ((style & wxCUSTBUT_TOG_DCLICK_BUT) != 0) n_styles++;
+	wxCHECK_MSG(n_styles < 2, FALSE, wxT("Only one wxCustomButton style allowed"));
+
+	m_button_style = style;
+
+	if ((m_button_style & wxCUSTBUT_BUTTON) != 0)
+		m_down = 0;
+
+	CalcLayout(TRUE);
+	return TRUE;
 }
 
 void wxCustomButton::SetLabel( const wxString &label )
 {
-    wxControl::SetLabel(label);
-    CalcLayout(TRUE);
+	wxControl::SetLabel(label);
+	CalcLayout(TRUE);
 }
 
 // sequence of events in GTK is up, dclick, up.
 
 void wxCustomButton::OnMouseEvents(wxMouseEvent& event)
 {
-    if (m_button_style & wxCUSTBUT_NOTOGGLE) return;
-    
-    if (event.LeftDown() || event.RightDown())
-    {
-        if (!HasCapture()) 
-            CaptureMouse(); // keep depressed until up
-        
-        m_down++;
-        Redraw();
-    }
-    else if (event.LeftDClick() || event.RightDClick())
-    {
-        m_down++; // GTK eats second down event
-        Redraw();
-    }
-    else if (event.LeftUp())
-    {
-        if (HasCapture()) 
-            ReleaseMouse();
-        
-        m_eventType = wxEVT_LEFT_UP;
-        
-#if (wxMINOR_VERSION<8) 
-        if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
+	if (m_button_style & wxCUSTBUT_NOTOGGLE) return;
+
+	if (event.LeftDown() || event.RightDown())
+	{
+		if (!HasCapture())
+			CaptureMouse(); // keep depressed until up
+
+		m_down++;
+		Redraw();
+	}
+	else if (event.LeftDClick() || event.RightDClick())
+	{
+		m_down++; // GTK eats second down event
+		Redraw();
+	}
+	else if (event.LeftUp())
+	{
+		if (HasCapture())
+			ReleaseMouse();
+
+		m_eventType = wxEVT_LEFT_UP;
+
+#if (wxMINOR_VERSION<8)
+		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
 #else
-        if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
+		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
 #endif
-        {
-            if ((m_button_style & wxCUSTBUT_BUTTON) && (m_down > 0))
-            {
-                m_down = 0;
-                Redraw();
-                SendEvent();
-                return;
-            }
-            else
-            {
-                if (!m_timer)
-                {
-                    m_timer = new wxTimer(this, m_down+1);
-                    m_timer->Start(200, TRUE);
-                }
-                else
-                {
-                    m_eventType = wxEVT_LEFT_DCLICK;
-                }
-                
-                if ((m_button_style & wxCUSTBUT_TOGGLE) && 
-                    (m_button_style & wxCUSTBUT_TOG_DCLICK_BUT)) m_down++;
-            }
-        }
-
-        Redraw();
-    }
-    else if (event.RightUp())
-    {
-        if (HasCapture()) 
-            ReleaseMouse();
-        
-        m_eventType = wxEVT_RIGHT_UP;
-
-#if (wxMINOR_VERSION<8) 
-        if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
+		{
+			if ((m_button_style & wxCUSTBUT_BUTTON) && (m_down > 0))
+			{
+				m_down = 0;
+				Redraw();
+				SendEvent();
+				return;
+			}
+			else
+			{
+				if (!m_timer)
+				{
+					m_timer = new wxTimer(this, m_down+1);
+					m_timer->Start(200, TRUE);
+				}
+				else
+				{
+					m_eventType = wxEVT_LEFT_DCLICK;
+				}
+
+				if ((m_button_style & wxCUSTBUT_TOGGLE) &&
+				        (m_button_style & wxCUSTBUT_TOG_DCLICK_BUT)) m_down++;
+			}
+		}
+
+		Redraw();
+	}
+	else if (event.RightUp())
+	{
+		if (HasCapture())
+			ReleaseMouse();
+
+		m_eventType = wxEVT_RIGHT_UP;
+
+#if (wxMINOR_VERSION<8)
+		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
 #else
-        if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
+		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
 #endif
-        {
-            if ((m_button_style & wxCUSTBUT_BUTTON) && (m_down > 0))
-            {
-                m_down = 0;
-                Redraw();
-                SendEvent();
-                return;
-            }
-            else
-            {
-                m_down++;
-            
-                if (!m_timer)
-                {
-                    m_timer = new wxTimer(this, m_down);
-                    m_timer->Start(250, TRUE);
-                }
-                else
-                {
-                    m_eventType = wxEVT_RIGHT_DCLICK;
-                }
-            }
-        }
-        
-        Redraw();
-    }
-    else if (event.Entering())
-    {
-        m_focused = TRUE;
-        if ((event.LeftIsDown() || event.RightIsDown()) && HasCapture()) 
-            m_down++;
-        
-        Redraw();
-    }
-    else if (event.Leaving())
-    {
-        m_focused = FALSE;
-        if ((event.LeftIsDown() || event.RightIsDown()) && HasCapture())
-            m_down--;
-        
-        Redraw();
-    }
+		{
+			if ((m_button_style & wxCUSTBUT_BUTTON) && (m_down > 0))
+			{
+				m_down = 0;
+				Redraw();
+				SendEvent();
+				return;
+			}
+			else
+			{
+				m_down++;
+
+				if (!m_timer)
+				{
+					m_timer = new wxTimer(this, m_down);
+					m_timer->Start(250, TRUE);
+				}
+				else
+				{
+					m_eventType = wxEVT_RIGHT_DCLICK;
+				}
+			}
+		}
+
+		Redraw();
+	}
+	else if (event.Entering())
+	{
+		m_focused = TRUE;
+		if ((event.LeftIsDown() || event.RightIsDown()) && HasCapture())
+			m_down++;
+
+		Redraw();
+	}
+	else if (event.Leaving())
+	{
+		m_focused = FALSE;
+		if ((event.LeftIsDown() || event.RightIsDown()) && HasCapture())
+			m_down--;
+
+		Redraw();
+	}
 }
 
 
 
 void wxCustomButton::SendEvent()
 {
-    if (((m_button_style & wxCUSTBUT_TOGGLE) && (m_eventType == wxEVT_LEFT_UP)) || 
-        ((m_button_style & wxCUSTBUT_BUT_DCLICK_TOG) && (m_eventType == wxEVT_LEFT_DCLICK)) ||
-        ((m_button_style & wxCUSTBUT_TOG_DCLICK_BUT) && (m_eventType == wxEVT_LEFT_UP)))
-    {
-        wxCommandEvent eventOut(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, GetId());
-        eventOut.SetInt(m_down%2 ? 1 : 0);
-        eventOut.SetExtraLong(m_eventType);
-        eventOut.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(eventOut);
-    }
-    else
-    {
-        wxCommandEvent eventOut(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
-        eventOut.SetInt(0);
-        eventOut.SetExtraLong(m_eventType);
-        eventOut.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(eventOut);
-    }
+	if (((m_button_style & wxCUSTBUT_TOGGLE) && (m_eventType == wxEVT_LEFT_UP)) ||
+	        ((m_button_style & wxCUSTBUT_BUT_DCLICK_TOG) && (m_eventType == wxEVT_LEFT_DCLICK)) ||
+	        ((m_button_style & wxCUSTBUT_TOG_DCLICK_BUT) && (m_eventType == wxEVT_LEFT_UP)))
+	{
+		wxCommandEvent eventOut(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, GetId());
+		eventOut.SetInt(m_down%2 ? 1 : 0);
+		eventOut.SetExtraLong(m_eventType);
+		eventOut.SetEventObject(this);
+		GetEventHandler()->ProcessEvent(eventOut);
+	}
+	else
+	{
+		wxCommandEvent eventOut(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+		eventOut.SetInt(0);
+		eventOut.SetExtraLong(m_eventType);
+		eventOut.SetEventObject(this);
+		GetEventHandler()->ProcessEvent(eventOut);
+	}
 }
 
 wxBitmap wxCustomButton::CreateBitmapDisabled(const wxBitmap &bitmap) const
-{    
-    wxCHECK_MSG(bitmap.Ok(), wxNullBitmap, wxT("invalid bitmap"));
-    
-    unsigned char br = GetBackgroundColour().Red();
-    unsigned char bg = GetBackgroundColour().Green();
-    unsigned char bb = GetBackgroundColour().Blue();
-        
-    wxImage image = bitmap.ConvertToImage();
-    int pos, width = image.GetWidth(), height = image.GetHeight();
-    unsigned char *img_data = image.GetData();
-
-    for (int j=0; j<height; j++)
-    {
-        for (int i=j%2; i<width; i+=2)
-        {   
-            pos = (j*width+i)*3;
-            img_data[pos  ] = br; 
-            img_data[pos+1] = bg; 
-            img_data[pos+2] = bb; 
-        }
-    }
-        
-    return wxBitmap(image);
+{
+	wxCHECK_MSG(bitmap.Ok(), wxNullBitmap, wxT("invalid bitmap"));
+
+	unsigned char br = GetBackgroundColour().Red();
+	unsigned char bg = GetBackgroundColour().Green();
+	unsigned char bb = GetBackgroundColour().Blue();
+
+	wxImage image = bitmap.ConvertToImage();
+	int pos, width = image.GetWidth(), height = image.GetHeight();
+	unsigned char *img_data = image.GetData();
+
+	for (int j=0; j<height; j++)
+	{
+		for (int i=j%2; i<width; i+=2)
+		{
+			pos = (j*width+i)*3;
+			img_data[pos  ] = br;
+			img_data[pos+1] = bg;
+			img_data[pos+2] = bb;
+		}
+	}
+
+	return wxBitmap(image);
 }
 
 void wxCustomButton::SetBitmapLabel(const wxBitmap& bitmap)
-{ 
-    m_bmpLabel = bitmap; 
-    CalcLayout(TRUE); 
+{
+	m_bmpLabel = bitmap;
+	CalcLayout(TRUE);
 }
 
 void wxCustomButton::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-    wxPaintDC dc(this);
-    Paint(dc);
+	wxPaintDC dc(this);
+	Paint(dc);
 }
 
 void wxCustomButton::Redraw()
 {
-    wxClientDC dc(this);
-    Paint(dc);
+	wxClientDC dc(this);
+	Paint(dc);
 }
 
 void wxCustomButton::Paint( wxDC &dc )
 {
-#if (wxMINOR_VERSION<8) 
-    dc.BeginDrawing();
+#if (wxMINOR_VERSION<8)
+	dc.BeginDrawing();
 #endif
 
-    int w, h;
-    GetSize(&w,&h);
- 
-    wxColour foreColour = GetForegroundColour();
-    wxColour backColour = GetBackgroundColour();
-
-    if (m_focused)
-    {
-        backColour.Set( wxMin(backColour.Red()   + 20, 255),
-                        wxMin(backColour.Green() + 20, 255),
-                        wxMin(backColour.Blue()  + 20, 255) );
-    }
-
-    wxBitmap bitmap;
-    
-    if (IsEnabled())
-    {
-        if (GetValue() && m_bmpSelected.Ok()) 
-            bitmap = m_bmpSelected;
-        else if (m_focused && m_bmpFocus.Ok()) 
-            bitmap = m_bmpFocus;
-        else if (m_bmpLabel.Ok())  
-            bitmap = m_bmpLabel;
-    }
-    else
-    {
-        // try to create disabled if it doesn't exist
-        if (!m_bmpDisabled.Ok() && m_bmpLabel.Ok())
-            m_bmpDisabled = CreateBitmapDisabled(m_bmpLabel);
-
-        if (m_bmpDisabled.Ok())
-            bitmap = m_bmpDisabled;
-        else if (m_bmpLabel.Ok()) 
-            bitmap = m_bmpLabel;
-
-        foreColour = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
-    }
-
-    wxBrush brush(backColour, wxSOLID);
-    dc.SetBackground(brush);
-    dc.SetBrush(brush);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-    dc.DrawRectangle(0, 0, w, h);
-
-    if (bitmap.Ok()) 
-        dc.DrawBitmap(bitmap, m_bitmapPos.x, m_bitmapPos.y, TRUE );
-
-    if (!GetLabel().IsEmpty())
-    {
-        dc.SetFont(GetFont());
-        dc.SetTextBackground(backColour);
-        dc.SetTextForeground(foreColour);
-        dc.DrawText(GetLabel(), m_labelPos.x, m_labelPos.y);
-    }
-    
-    if (GetValue())                                        // draw sunken border
-    {
-        dc.SetPen(*wxGREY_PEN);
-        dc.DrawLine(0,h-1,0,0);     dc.DrawLine(0,0,w,0);
-        dc.SetPen(*wxWHITE_PEN);
-        dc.DrawLine(w-1,1,w-1,h-1); dc.DrawLine(w-1,h-1,0,h-1);
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawLine(1,h-2,1,1);     dc.DrawLine(1,1,w-1,1);
-    }
-    else if (((m_button_style & wxCUSTBUT_FLAT) == 0) || m_focused) // draw raised border
-    {
-        dc.SetPen(*wxWHITE_PEN);
-        dc.DrawLine(0,h-2,0,0);     dc.DrawLine(0,0,w-1,0);
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawLine(w-1,0,w-1,h-1); dc.DrawLine(w-1,h-1,-1,h-1);
-        dc.SetPen(*wxGREY_PEN);
-        dc.DrawLine(2,h-2,w-2,h-2); dc.DrawLine(w-2,h-2,w-2,1);
-    }
-
-    dc.SetBackground(wxNullBrush);
-    dc.SetBrush(wxNullBrush);
-    dc.SetPen(wxNullPen);
-#if (wxMINOR_VERSION<8) 
-    dc.EndDrawing();
+	int w, h;
+	GetSize(&w,&h);
+
+	wxColour foreColour = GetForegroundColour();
+	wxColour backColour = GetBackgroundColour();
+
+	if (m_focused)
+	{
+		backColour.Set( wxMin(backColour.Red()   + 20, 255),
+		                wxMin(backColour.Green() + 20, 255),
+		                wxMin(backColour.Blue()  + 20, 255) );
+	}
+
+	wxBitmap bitmap;
+
+	if (IsEnabled())
+	{
+		if (GetValue() && m_bmpSelected.Ok())
+			bitmap = m_bmpSelected;
+		else if (m_focused && m_bmpFocus.Ok())
+			bitmap = m_bmpFocus;
+		else if (m_bmpLabel.Ok())
+			bitmap = m_bmpLabel;
+	}
+	else
+	{
+		// try to create disabled if it doesn't exist
+		if (!m_bmpDisabled.Ok() && m_bmpLabel.Ok())
+			m_bmpDisabled = CreateBitmapDisabled(m_bmpLabel);
+
+		if (m_bmpDisabled.Ok())
+			bitmap = m_bmpDisabled;
+		else if (m_bmpLabel.Ok())
+			bitmap = m_bmpLabel;
+
+		foreColour = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
+	}
+
+	wxBrush brush(backColour, wxSOLID);
+	dc.SetBackground(brush);
+	dc.SetBrush(brush);
+	dc.SetPen(*wxTRANSPARENT_PEN);
+
+	dc.DrawRectangle(0, 0, w, h);
+
+	if (bitmap.Ok())
+		dc.DrawBitmap(bitmap, m_bitmapPos.x, m_bitmapPos.y, TRUE );
+
+	if (!GetLabel().IsEmpty())
+	{
+		dc.SetFont(GetFont());
+		dc.SetTextBackground(backColour);
+		dc.SetTextForeground(foreColour);
+		dc.DrawText(GetLabel(), m_labelPos.x, m_labelPos.y);
+	}
+
+	if (GetValue())                                        // draw sunken border
+	{
+		dc.SetPen(*wxGREY_PEN);
+		dc.DrawLine(0,h-1,0,0);
+		dc.DrawLine(0,0,w,0);
+		dc.SetPen(*wxWHITE_PEN);
+		dc.DrawLine(w-1,1,w-1,h-1);
+		dc.DrawLine(w-1,h-1,0,h-1);
+		dc.SetPen(*wxBLACK_PEN);
+		dc.DrawLine(1,h-2,1,1);
+		dc.DrawLine(1,1,w-1,1);
+	}
+	else if (((m_button_style & wxCUSTBUT_FLAT) == 0) || m_focused) // draw raised border
+	{
+		dc.SetPen(*wxWHITE_PEN);
+		dc.DrawLine(0,h-2,0,0);
+		dc.DrawLine(0,0,w-1,0);
+		dc.SetPen(*wxBLACK_PEN);
+		dc.DrawLine(w-1,0,w-1,h-1);
+		dc.DrawLine(w-1,h-1,-1,h-1);
+		dc.SetPen(*wxGREY_PEN);
+		dc.DrawLine(2,h-2,w-2,h-2);
+		dc.DrawLine(w-2,h-2,w-2,1);
+	}
+
+	dc.SetBackground(wxNullBrush);
+	dc.SetBrush(wxNullBrush);
+	dc.SetPen(wxNullPen);
+#if (wxMINOR_VERSION<8)
+	dc.EndDrawing();
 #endif
 }
 
 void wxCustomButton::OnSize( wxSizeEvent &event )
 {
-    CalcLayout(TRUE);
-    event.Skip();
+	CalcLayout(TRUE);
+	event.Skip();
 }
 
 void wxCustomButton::SetMargins(const wxSize &margin, bool fit)
-{ 
-    m_labelMargin = margin; 
-    m_bitmapMargin = margin; 
-    CalcLayout(TRUE); 
-    if (fit) SetSize(DoGetBestSize());
+{
+	m_labelMargin = margin;
+	m_bitmapMargin = margin;
+	CalcLayout(TRUE);
+	if (fit) SetSize(DoGetBestSize());
 }
-void wxCustomButton::SetLabelMargin(const wxSize &margin, bool fit) 
-{ 
-    m_labelMargin = margin; 
-    CalcLayout(TRUE); 
-    if (fit) SetSize(DoGetBestSize());
+void wxCustomButton::SetLabelMargin(const wxSize &margin, bool fit)
+{
+	m_labelMargin = margin;
+	CalcLayout(TRUE);
+	if (fit) SetSize(DoGetBestSize());
 }
-void wxCustomButton::SetBitmapMargin(const wxSize &margin, bool fit) 
-{ 
-    m_bitmapMargin = margin; 
-    CalcLayout(TRUE); 
-    if (fit) SetSize(DoGetBestSize());
+void wxCustomButton::SetBitmapMargin(const wxSize &margin, bool fit)
+{
+	m_bitmapMargin = margin;
+	CalcLayout(TRUE);
+	if (fit) SetSize(DoGetBestSize());
 }
 
 wxSize wxCustomButton::DoGetBestSize() const
 {
-    int lw=0, lh=0;
-    int bw=0, bh=0;
-    bool has_bitmap = FALSE;
-    bool has_label = FALSE;
-    
-    if (!GetLabel().IsEmpty())
-    {
-        GetTextExtent(GetLabel(), &lw, &lh);
-        lw += 2*m_labelMargin.x;
-        lh += 2*m_labelMargin.y;
-        has_label = TRUE;
-    }
-    if (m_bmpLabel.Ok())
-    {
-        bw = m_bmpLabel.GetWidth() + 2*m_bitmapMargin.x;
-        bh = m_bmpLabel.GetHeight() + 2*m_bitmapMargin.y;
-        has_bitmap = TRUE;
-    }
-
-    if ((m_button_style & wxCUSTBUT_LEFT) || (m_button_style & wxCUSTBUT_RIGHT))
-    {
-        int h = bh > lh ? bh : lh;
-        if (has_bitmap && has_label) lw -= wxMin(m_labelMargin.x, m_bitmapMargin.x);
-        return wxSize(lw+bw, h);
-    }
-
-    int w = bw > lw ? bw : lw;
-    if (has_bitmap && has_label) lh -= wxMin(m_labelMargin.y, m_bitmapMargin.y);
-    return wxSize(w, lh+bh);
+	int lw=0, lh=0;
+	int bw=0, bh=0;
+	bool has_bitmap = FALSE;
+	bool has_label = FALSE;
+
+	if (!GetLabel().IsEmpty())
+	{
+		GetTextExtent(GetLabel(), &lw, &lh);
+		lw += 2*m_labelMargin.x;
+		lh += 2*m_labelMargin.y;
+		has_label = TRUE;
+	}
+	if (m_bmpLabel.Ok())
+	{
+		bw = m_bmpLabel.GetWidth() + 2*m_bitmapMargin.x;
+		bh = m_bmpLabel.GetHeight() + 2*m_bitmapMargin.y;
+		has_bitmap = TRUE;
+	}
+
+	if ((m_button_style & wxCUSTBUT_LEFT) || (m_button_style & wxCUSTBUT_RIGHT))
+	{
+		int h = bh > lh ? bh : lh;
+		if (has_bitmap && has_label) lw -= wxMin(m_labelMargin.x, m_bitmapMargin.x);
+		return wxSize(lw+bw, h);
+	}
+
+	int w = bw > lw ? bw : lw;
+	if (has_bitmap && has_label) lh -= wxMin(m_labelMargin.y, m_bitmapMargin.y);
+	return wxSize(w, lh+bh);
 }
 
 void wxCustomButton::CalcLayout(bool refresh)
 {
-    int w, h;
-    GetSize(&w,&h);
-
-    int bw = 0, bh = 0;
-    int lw = 0, lh = 0;
-
-    if (m_bmpLabel.Ok()) // assume they're all the same size
-    {
-        bw = m_bmpLabel.GetWidth();
-        bh = m_bmpLabel.GetHeight();
-    }
-    wxString label = GetLabel();
-    if (!label.IsEmpty())
-    {
-        GetTextExtent(label, &lw, &lh);
-    }
-    
-    // Center the label or bitmap if only one or the other
-    if (!m_bmpLabel.Ok())
-    {
-        m_bitmapPos = wxPoint(0,0);
-        m_labelPos = wxPoint((w-lw)/2, (h-lh)/2);
-    }
-    else if (label.IsEmpty())
-    {
-        m_bitmapPos = wxPoint((w-bw)/2, (h-bh)/2);
-        m_labelPos = wxPoint(0,0);
-    }
-    else if (m_button_style & wxCUSTBUT_LEFT)
-    {
-        int mid_margin = wxMax(m_labelMargin.x, m_bitmapMargin.x);
-        m_labelPos  = wxPoint((w - (bw+lw+m_labelMargin.x+m_bitmapMargin.x+mid_margin))/2 + m_labelMargin.x, (h - lh)/2);
-        m_bitmapPos = wxPoint(m_labelPos.x + lw + mid_margin,         (h - bh)/2);
-    }
-    else if (m_button_style & wxCUSTBUT_RIGHT)
-    {
-        int mid_margin = wxMax(m_labelMargin.x, m_bitmapMargin.x);
-        m_bitmapPos = wxPoint((w - (bw+lw+m_labelMargin.x+m_bitmapMargin.x+mid_margin))/2 + m_bitmapMargin.x, (h - bh)/2);
-        m_labelPos  = wxPoint(m_bitmapPos.x + bw + mid_margin,        (h - lh)/2);
-    }
-    else if (m_button_style & wxCUSTBUT_TOP)
-    {
-        int mid_margin = wxMax(m_labelMargin.y, m_bitmapMargin.y);
-        m_labelPos  = wxPoint((w - lw)/2, (h - (bh+lh+m_labelMargin.y+m_bitmapMargin.y+mid_margin))/2 + m_labelMargin.y);
-        m_bitmapPos = wxPoint((w - bw)/2, m_labelPos.y + lh + mid_margin);
-    }
-    else // if (m_button_style & wxCUSTBUT_BOTTOM)  DEFAULT
-    {
-        int mid_margin = wxMax(m_labelMargin.y, m_bitmapMargin.y);
-        m_bitmapPos = wxPoint((w - bw)/2, (h - (bh+lh+m_labelMargin.y+m_bitmapMargin.y+mid_margin))/2 + m_bitmapMargin.y);
-        m_labelPos  = wxPoint((w - lw)/2, m_bitmapPos.y + bh + mid_margin);
-    }
-    
-    if (refresh) Refresh(FALSE);
+	int w, h;
+	GetSize(&w,&h);
+
+	int bw = 0, bh = 0;
+	int lw = 0, lh = 0;
+
+	if (m_bmpLabel.Ok()) // assume they're all the same size
+	{
+		bw = m_bmpLabel.GetWidth();
+		bh = m_bmpLabel.GetHeight();
+	}
+	wxString label = GetLabel();
+	if (!label.IsEmpty())
+	{
+		GetTextExtent(label, &lw, &lh);
+	}
+
+	// Center the label or bitmap if only one or the other
+	if (!m_bmpLabel.Ok())
+	{
+		m_bitmapPos = wxPoint(0,0);
+		m_labelPos = wxPoint((w-lw)/2, (h-lh)/2);
+	}
+	else if (label.IsEmpty())
+	{
+		m_bitmapPos = wxPoint((w-bw)/2, (h-bh)/2);
+		m_labelPos = wxPoint(0,0);
+	}
+	else if (m_button_style & wxCUSTBUT_LEFT)
+	{
+		int mid_margin = wxMax(m_labelMargin.x, m_bitmapMargin.x);
+		m_labelPos  = wxPoint((w - (bw+lw+m_labelMargin.x+m_bitmapMargin.x+mid_margin))/2 + m_labelMargin.x, (h - lh)/2);
+		m_bitmapPos = wxPoint(m_labelPos.x + lw + mid_margin,         (h - bh)/2);
+	}
+	else if (m_button_style & wxCUSTBUT_RIGHT)
+	{
+		int mid_margin = wxMax(m_labelMargin.x, m_bitmapMargin.x);
+		m_bitmapPos = wxPoint((w - (bw+lw+m_labelMargin.x+m_bitmapMargin.x+mid_margin))/2 + m_bitmapMargin.x, (h - bh)/2);
+		m_labelPos  = wxPoint(m_bitmapPos.x + bw + mid_margin,        (h - lh)/2);
+	}
+	else if (m_button_style & wxCUSTBUT_TOP)
+	{
+		int mid_margin = wxMax(m_labelMargin.y, m_bitmapMargin.y);
+		m_labelPos  = wxPoint((w - lw)/2, (h - (bh+lh+m_labelMargin.y+m_bitmapMargin.y+mid_margin))/2 + m_labelMargin.y);
+		m_bitmapPos = wxPoint((w - bw)/2, m_labelPos.y + lh + mid_margin);
+	}
+	else // if (m_button_style & wxCUSTBUT_BOTTOM)  DEFAULT
+	{
+		int mid_margin = wxMax(m_labelMargin.y, m_bitmapMargin.y);
+		m_bitmapPos = wxPoint((w - bw)/2, (h - (bh+lh+m_labelMargin.y+m_bitmapMargin.y+mid_margin))/2 + m_bitmapMargin.y);
+		m_labelPos  = wxPoint((w - lw)/2, m_bitmapPos.y + bh + mid_margin);
+	}
+
+	if (refresh) Refresh(FALSE);
 }
 
 
 /* XPM */
 static const char *down_arrow_xpm_data[] = {
-/* columns rows colors chars-per-pixel */
-"5 3 2 1",
-"  c None",
-"a c Black",
-/* pixels */
-"aaaaa",
-" aaa ",
-"  a  "};
+	/* columns rows colors chars-per-pixel */
+	"5 3 2 1",
+	"  c None",
+	"a c Black",
+	/* pixels */
+	"aaaaa",
+	" aaa ",
+	"  a  "
+};
 
 static wxBitmap s_dropdownBitmap; // all buttons share the same bitmap
 
 enum
 {
-    IDD_DROPDOWN_BUTTON = 100
+	IDD_DROPDOWN_BUTTON = 100
 };
 
 //-----------------------------------------------------------------------------
@@ -555,46 +562,46 @@
 class MenuDropButton : public wxCustomButton
 {
 public:
-    MenuDropButton( wxWindow *parent, wxWindowID id, long style) : wxCustomButton()
-    {
-        if (!s_dropdownBitmap.Ok())
-            s_dropdownBitmap = wxBitmap(down_arrow_xpm_data);
-        
-        Create( parent, id, wxEmptyString, s_dropdownBitmap, wxDefaultPosition, 
-                wxSize(wxMENUBUTTON_DROP_WIDTH, wxMENUBUTTON_DROP_HEIGHT), style);    
-    }
-    
-    virtual void Paint( wxDC &dc )
-    {
-        wxCustomButton *labelBut = ((wxMenuButton*)GetParent())->GetLabelButton();
-        
-        // pretend that both buttons have focus (for flat style)
-        if (labelBut)
-        {
-            wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
-        
-#if (wxMINOR_VERSION<8) 
-            if (GetRect().Inside(p) || labelBut->GetRect().Inside(p))
+	MenuDropButton( wxWindow *parent, wxWindowID id, long style) : wxCustomButton()
+	{
+		if (!s_dropdownBitmap.Ok())
+			s_dropdownBitmap = wxBitmap(down_arrow_xpm_data);
+
+		Create( parent, id, wxEmptyString, s_dropdownBitmap, wxDefaultPosition,
+		        wxSize(wxMENUBUTTON_DROP_WIDTH, wxMENUBUTTON_DROP_HEIGHT), style);
+	}
+
+	virtual void Paint( wxDC &dc )
+	{
+		wxCustomButton *labelBut = ((wxMenuButton*)GetParent())->GetLabelButton();
+
+		// pretend that both buttons have focus (for flat style)
+		if (labelBut)
+		{
+			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
+
+#if (wxMINOR_VERSION<8)
+			if (GetRect().Inside(p) || labelBut->GetRect().Inside(p))
 #else
-            if (GetRect().Contains(p) || labelBut->GetRect().Contains(p))
+			if (GetRect().Contains(p) || labelBut->GetRect().Contains(p))
 #endif
-            {
-                m_focused = TRUE;
-                
-                if (!labelBut->GetFocused())
-                    labelBut->SetFocused(TRUE);
-            }
-            else
-            {
-                m_focused = FALSE;
-                
-                if (labelBut->GetFocused())
-                    labelBut->SetFocused(FALSE);
-            }
-        }
-        
-        wxCustomButton::Paint(dc);
-    }
+			{
+				m_focused = TRUE;
+
+				if (!labelBut->GetFocused())
+					labelBut->SetFocused(TRUE);
+			}
+			else
+			{
+				m_focused = FALSE;
+
+				if (labelBut->GetFocused())
+					labelBut->SetFocused(FALSE);
+			}
+		}
+
+		wxCustomButton::Paint(dc);
+	}
 };
 
 // ==========================================================================
@@ -604,45 +611,45 @@
 class MenuLabelButton : public wxCustomButton
 {
 public:
-    MenuLabelButton( wxWindow* parent, wxWindowID id, 
-                     const wxString &label, 
-                     const wxBitmap &bitmap,
-                     long style ) : wxCustomButton()
-    {
-        Create(parent, id, label, bitmap, wxDefaultPosition, wxDefaultSize, style);    
-    }
-    
-    virtual void Paint( wxDC &dc )
-    {
-        wxCustomButton *dropBut = ((wxMenuButton*)GetParent())->GetDropDownButton();
-
-        // pretend that both buttons have focus (for flat style)
-        if (dropBut) 
-        {
-            wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
-        
-#if (wxMINOR_VERSION<8) 
-            if (GetRect().Inside(p) || dropBut->GetRect().Inside(p))
+	MenuLabelButton( wxWindow* parent, wxWindowID id,
+	                 const wxString &label,
+	                 const wxBitmap &bitmap,
+	                 long style ) : wxCustomButton()
+	{
+		Create(parent, id, label, bitmap, wxDefaultPosition, wxDefaultSize, style);
+	}
+
+	virtual void Paint( wxDC &dc )
+	{
+		wxCustomButton *dropBut = ((wxMenuButton*)GetParent())->GetDropDownButton();
+
+		// pretend that both buttons have focus (for flat style)
+		if (dropBut)
+		{
+			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
+
+#if (wxMINOR_VERSION<8)
+			if (GetRect().Inside(p) || dropBut->GetRect().Inside(p))
 #else
-            if (GetRect().Contains(p) || dropBut->GetRect().Contains(p))
+			if (GetRect().Contains(p) || dropBut->GetRect().Contains(p))
 #endif
-            {
-                m_focused = TRUE;
-                
-                if (!dropBut->GetFocused())
-                    dropBut->SetFocused(TRUE);
-            }
-            else
-            {
-                m_focused = FALSE;
-                
-                if (dropBut->GetFocused())
-                    dropBut->SetFocused(FALSE);
-            }
-        }
-
-        wxCustomButton::Paint(dc);
-    }
+			{
+				m_focused = TRUE;
+
+				if (!dropBut->GetFocused())
+					dropBut->SetFocused(TRUE);
+			}
+			else
+			{
+				m_focused = FALSE;
+
+				if (dropBut->GetFocused())
+					dropBut->SetFocused(FALSE);
+			}
+		}
+
+		wxCustomButton::Paint(dc);
+	}
 };
 
 // ==========================================================================
@@ -652,212 +659,212 @@
 IMPLEMENT_DYNAMIC_CLASS( wxMenuButton, wxControl )
 
 BEGIN_EVENT_TABLE(wxMenuButton,wxControl)
-    EVT_BUTTON(wxID_ANY, wxMenuButton::OnButton)
+	EVT_BUTTON(wxID_ANY, wxMenuButton::OnButton)
 
 #ifdef __WXMSW__
-    EVT_MENU(wxID_ANY, wxMenuButton::OnMenu)
+	EVT_MENU(wxID_ANY, wxMenuButton::OnMenu)
 #endif
 END_EVENT_TABLE()
 
 wxMenuButton::~wxMenuButton()
 {
-    AssignMenu(NULL, TRUE);
+	AssignMenu(NULL, TRUE);
 }
 
 void wxMenuButton::Init()
 {
-    m_labelButton = NULL;
-    m_dropdownButton = NULL;
-    m_menu = NULL;
-    m_menu_static = FALSE;
-    m_style = 0;
+	m_labelButton = NULL;
+	m_dropdownButton = NULL;
+	m_menu = NULL;
+	m_menu_static = FALSE;
+	m_style = 0;
 }
 
 bool wxMenuButton::Create( wxWindow* parent, wxWindowID id,
-                           const wxString &label, 
+                           const wxString &label,
                            const wxBitmap &bitmap,
-                           const wxPoint& pos, 
+                           const wxPoint& pos,
                            const wxSize& size,
-                           long style, 
+                           long style,
                            const wxValidator& val,
                            const wxString& name)
 {
-    m_style = style;
-    
-    long flat = style & wxMENUBUT_FLAT;
-    
-    wxControl::Create(parent,id,pos,size,wxNO_BORDER|wxCLIP_CHILDREN,val,name);
-    wxControl::SetLabel(label);
-    SetBackgroundColour(parent->GetBackgroundColour());
-    SetForegroundColour(parent->GetForegroundColour());
-    SetFont(parent->GetFont());
-
-    m_labelButton = new MenuLabelButton(this, id, label, bitmap, wxCUSTBUT_BUTTON|flat);
-    m_dropdownButton = new MenuDropButton(this, IDD_DROPDOWN_BUTTON, wxCUSTBUT_BUTTON|flat);
-    
-    wxSize bestSize = DoGetBestSize();
-    SetSize( wxSize(size.x < 0 ? bestSize.x : size.x, 
-                    size.y < 0 ? bestSize.y : size.y) );
-   
-#if (wxMINOR_VERSION<8) 
-    SetBestSize(GetSize());
+	m_style = style;
+
+	long flat = style & wxMENUBUT_FLAT;
+
+	wxControl::Create(parent,id,pos,size,wxNO_BORDER|wxCLIP_CHILDREN,val,name);
+	wxControl::SetLabel(label);
+	SetBackgroundColour(parent->GetBackgroundColour());
+	SetForegroundColour(parent->GetForegroundColour());
+	SetFont(parent->GetFont());
+
+	m_labelButton = new MenuLabelButton(this, id, label, bitmap, wxCUSTBUT_BUTTON|flat);
+	m_dropdownButton = new MenuDropButton(this, IDD_DROPDOWN_BUTTON, wxCUSTBUT_BUTTON|flat);
+
+	wxSize bestSize = DoGetBestSize();
+	SetSize( wxSize(size.x < 0 ? bestSize.x : size.x,
+	                size.y < 0 ? bestSize.y : size.y) );
+
+#if (wxMINOR_VERSION<8)
+	SetBestSize(GetSize());
 #else
-    SetInitialSize(GetSize());
+	SetInitialSize(GetSize());
 #endif
-    
-    return TRUE;
+
+	return TRUE;
 }
 
 #ifdef __WXMSW__
 // FIXME - I think there was a patch to fix this
-void wxMenuButton::OnMenu( wxCommandEvent &event ) 
+void wxMenuButton::OnMenu( wxCommandEvent &event )
 {
-    event.Skip();    
-    wxMenuItem *mi = m_menu->FindItem(event.GetId());
-    if (mi && (mi->GetKind() == wxITEM_RADIO))
-        m_menu->Check(event.GetId(), TRUE);    
+	event.Skip();
+	wxMenuItem *mi = m_menu->FindItem(event.GetId());
+	if (mi && (mi->GetKind() == wxITEM_RADIO))
+		m_menu->Check(event.GetId(), TRUE);
 }
 #endif // __WXMSW__
 
 void wxMenuButton::OnButton( wxCommandEvent &event)
 {
-    int win_id = event.GetId();
-    
-    if (win_id == IDD_DROPDOWN_BUTTON)
-    {
-        wxNotifyEvent mevent(wxEVT_MENUBUTTON_OPEN, GetId());
-        mevent.SetEventObject(this);
-        if (GetEventHandler()->ProcessEvent(mevent) && !mevent.IsAllowed())
-            return;
-
-        if (!m_menu) 
-            return;
-        
-        PopupMenu(m_menu, wxPoint(0, GetSize().y));
-        
-        m_labelButton->Refresh(FALSE);
-        m_dropdownButton->Refresh(FALSE);
-    }
-    else if (win_id == m_labelButton->GetId())
-    {
-
-        wxCommandEvent cevent(wxEVT_COMMAND_MENU_SELECTED, win_id);
-        cevent.SetEventObject(this);
-        cevent.SetId(win_id);
+	int win_id = event.GetId();
+
+	if (win_id == IDD_DROPDOWN_BUTTON)
+	{
+		wxNotifyEvent mevent(wxEVT_MENUBUTTON_OPEN, GetId());
+		mevent.SetEventObject(this);
+		if (GetEventHandler()->ProcessEvent(mevent) && !mevent.IsAllowed())
+			return;
+
+		if (!m_menu)
+			return;
+
+		PopupMenu(m_menu, wxPoint(0, GetSize().y));
+
+		m_labelButton->Refresh(FALSE);
+		m_dropdownButton->Refresh(FALSE);
+	}
+	else if (win_id == m_labelButton->GetId())
+	{
+
+		wxCommandEvent cevent(wxEVT_COMMAND_MENU_SELECTED, win_id);
+		cevent.SetEventObject(this);
+		cevent.SetId(win_id);
 		GetParent()->GetEventHandler()->ProcessEvent(cevent);
 
-        if (!m_menu) return;
-        
-        const wxMenuItemList &items = m_menu->GetMenuItems();
-        int first_radio_id = -1;
-        int checked_id = -1;
-        bool check_next = FALSE;
-        
-        // find the next available radio item to check
-        for (wxMenuItemList::Node *node = items.GetFirst(); node; node = node->GetNext())
-        {
-            wxMenuItem *mi = (wxMenuItem*)node->GetData();
-            if (mi && (mi->GetKind() == wxITEM_RADIO))
-            {
-                if (first_radio_id == -1) 
-                    first_radio_id = mi->GetId();
-                
-                if (check_next) 
-                {
-                    check_next = FALSE;
-                    checked_id = mi->GetId();
-                    break;
-                }
-                else if (mi->IsChecked()) 
-                    check_next = TRUE;
-            }
-        }
-        // the last item was checked, go back to the first
-        if (check_next && (first_radio_id != -1))
-            checked_id = first_radio_id;
-        
-        if (checked_id != -1)
-        {
-            m_menu->Check(checked_id, TRUE);
-            
-            wxCommandEvent mevent( wxEVT_COMMAND_MENU_SELECTED, checked_id);
-            mevent.SetEventObject( m_menu );
-            mevent.SetInt(1);
-            GetEventHandler()->ProcessEvent(mevent);
-        }
-    }
+		if (!m_menu) return;
+
+		const wxMenuItemList &items = m_menu->GetMenuItems();
+		int first_radio_id = -1;
+		int checked_id = -1;
+		bool check_next = FALSE;
+
+		// find the next available radio item to check
+		for (wxMenuItemList::Node *node = items.GetFirst(); node; node = node->GetNext())
+		{
+			wxMenuItem *mi = (wxMenuItem*)node->GetData();
+			if (mi && (mi->GetKind() == wxITEM_RADIO))
+			{
+				if (first_radio_id == -1)
+					first_radio_id = mi->GetId();
+
+				if (check_next)
+				{
+					check_next = FALSE;
+					checked_id = mi->GetId();
+					break;
+				}
+				else if (mi->IsChecked())
+					check_next = TRUE;
+			}
+		}
+		// the last item was checked, go back to the first
+		if (check_next && (first_radio_id != -1))
+			checked_id = first_radio_id;
+
+		if (checked_id != -1)
+		{
+			m_menu->Check(checked_id, TRUE);
+
+			wxCommandEvent mevent( wxEVT_COMMAND_MENU_SELECTED, checked_id);
+			mevent.SetEventObject( m_menu );
+			mevent.SetInt(1);
+			GetEventHandler()->ProcessEvent(mevent);
+		}
+	}
 }
 
 int wxMenuButton::GetSelection() const
 {
-    wxCHECK_MSG(m_menu != NULL, wxNOT_FOUND, wxT("No attached menu in wxMenuButton::GetSelection"));
-        
-    const wxMenuItemList &items = m_menu->GetMenuItems();
-        
-    for (wxMenuItemList::Node *node = items.GetFirst(); node; node = node->GetNext())
-    {
-        wxMenuItem *mi = (wxMenuItem*)node->GetData();
-        if (mi && (mi->GetKind() == wxITEM_RADIO))
-        {
-            if (mi->IsChecked())
-                return mi->GetId();
-        }
-    }
-    
-    return wxNOT_FOUND;    
+	wxCHECK_MSG(m_menu != NULL, wxNOT_FOUND, wxT("No attached menu in wxMenuButton::GetSelection"));
+
+	const wxMenuItemList &items = m_menu->GetMenuItems();
+
+	for (wxMenuItemList::Node *node = items.GetFirst(); node; node = node->GetNext())
+	{
+		wxMenuItem *mi = (wxMenuItem*)node->GetData();
+		if (mi && (mi->GetKind() == wxITEM_RADIO))
+		{
+			if (mi->IsChecked())
+				return mi->GetId();
+		}
+	}
+
+	return wxNOT_FOUND;
 }
 
 void wxMenuButton::AssignMenu(wxMenu *menu, bool static_menu)
 {
-    if (!m_menu_static && m_menu) 
-        delete m_menu;
-    
-    m_menu = menu;
-    m_menu_static = static_menu;
+	if (!m_menu_static && m_menu)
+		delete m_menu;
+
+	m_menu = menu;
+	m_menu_static = static_menu;
 }
 
-void wxMenuButton::SetToolTip(const wxString &tip) 
-{ 
-    wxWindow::SetToolTip(tip);
-    ((wxWindow*)m_labelButton)->SetToolTip(tip); 
-    ((wxWindow*)m_dropdownButton)->SetToolTip(tip);
+void wxMenuButton::SetToolTip(const wxString &tip)
+{
+	wxWindow::SetToolTip(tip);
+	((wxWindow*)m_labelButton)->SetToolTip(tip);
+	((wxWindow*)m_dropdownButton)->SetToolTip(tip);
 }
-void wxMenuButton::SetToolTip(wxToolTip *tip) 
-{ 
-    wxWindow::SetToolTip(tip);
-    ((wxWindow*)m_labelButton)->SetToolTip(tip); 
-    ((wxWindow*)m_dropdownButton)->SetToolTip(tip);
+void wxMenuButton::SetToolTip(wxToolTip *tip)
+{
+	wxWindow::SetToolTip(tip);
+	((wxWindow*)m_labelButton)->SetToolTip(tip);
+	((wxWindow*)m_dropdownButton)->SetToolTip(tip);
 }
 
 void wxMenuButton::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
-    wxSize curSize( GetSize() );
-    wxSize bestSize( DoGetBestSize() );
-
-    if (width == -1)
-        width = curSize.GetWidth();
-    if (width < 10) 
-        width = bestSize.GetWidth();
-
-    if (height == -1)
-        height = curSize.GetHeight();
-    if (height < 5) 
-        height = bestSize.GetHeight();
-    
-    wxWindow::DoSetSize(x, y, width, height, sizeFlags);    
-
-    if (m_labelButton)
-        m_labelButton->SetSize(0, 0, width - wxMENUBUTTON_DROP_WIDTH, height);
-    if (m_dropdownButton)
-        m_dropdownButton->SetSize(width-wxMENUBUTTON_DROP_WIDTH, 0, wxMENUBUTTON_DROP_WIDTH, height);    
+	wxSize curSize( GetSize() );
+	wxSize bestSize( DoGetBestSize() );
+
+	if (width == -1)
+		width = curSize.GetWidth();
+	if (width < 10)
+		width = bestSize.GetWidth();
+
+	if (height == -1)
+		height = curSize.GetHeight();
+	if (height < 5)
+		height = bestSize.GetHeight();
+
+	wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+
+	if (m_labelButton)
+		m_labelButton->SetSize(0, 0, width - wxMENUBUTTON_DROP_WIDTH, height);
+	if (m_dropdownButton)
+		m_dropdownButton->SetSize(width-wxMENUBUTTON_DROP_WIDTH, 0, wxMENUBUTTON_DROP_WIDTH, height);
 }
 
 wxSize wxMenuButton::DoGetBestSize()
 {
-    if (!m_labelButton || !m_dropdownButton) 
-        return wxSize(wxMENUBUTTON_DROP_WIDTH+wxMENUBUTTON_DROP_HEIGHT, wxMENUBUTTON_DROP_HEIGHT);
+	if (!m_labelButton || !m_dropdownButton)
+		return wxSize(wxMENUBUTTON_DROP_WIDTH+wxMENUBUTTON_DROP_HEIGHT, wxMENUBUTTON_DROP_HEIGHT);
 
-    wxSize size = m_labelButton->GetBestSize();
-    size.x += wxMENUBUTTON_DROP_WIDTH;
-    return size;
+	wxSize size = m_labelButton->GetBestSize();
+	size.x += wxMENUBUTTON_DROP_WIDTH;
+	return size;
 }

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/menubtn.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/menubtn.h Changed

@@ -13,7 +13,7 @@
 wxMenuButton is a button that drops down an assigned wxMenu
 
 Create the button with either a text or bitmap label.
-    Create a new wxMenu and call AssignMenu and thats it. When you press the 
+    Create a new wxMenu and call AssignMenu and thats it. When you press the
     dropdown button the menu appears. When you press the label button the next
     wxITEM_RADIO (ie wxMenuItem::GetKind) in the menu is selected round robin.
     If there are no radio items then it really just acts like a menubar, though
@@ -26,7 +26,7 @@
 #define _WX_MENUBTN_H_
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menubtn.h"
+#pragma interface "menubtn.h"
 #endif
 
 class wxMenu;
@@ -39,19 +39,19 @@
 
 enum wxCustomButton_Style
 {
-    // Position of the label, use only one
-    wxCUSTBUT_LEFT           = 0x0001,
-    wxCUSTBUT_RIGHT          = 0x0002,
-    wxCUSTBUT_TOP            = 0x0004,
-    wxCUSTBUT_BOTTOM         = 0x0008,
-    // Button style, use only one
-    wxCUSTBUT_NOTOGGLE       = 0x0100,
-    wxCUSTBUT_BUTTON         = 0x0200,
-    wxCUSTBUT_TOGGLE         = 0x0400,
-    wxCUSTBUT_BUT_DCLICK_TOG = 0x0800,
-    wxCUSTBUT_TOG_DCLICK_BUT = 0x1000, 
-    // drawing styles
-    wxCUSTBUT_FLAT           = 0x2000 // flat, mouseover raises if not depressed
+	// Position of the label, use only one
+	wxCUSTBUT_LEFT           = 0x0001,
+	wxCUSTBUT_RIGHT          = 0x0002,
+	wxCUSTBUT_TOP            = 0x0004,
+	wxCUSTBUT_BOTTOM         = 0x0008,
+	// Button style, use only one
+	wxCUSTBUT_NOTOGGLE       = 0x0100,
+	wxCUSTBUT_BUTTON         = 0x0200,
+	wxCUSTBUT_TOGGLE         = 0x0400,
+	wxCUSTBUT_BUT_DCLICK_TOG = 0x0800,
+	wxCUSTBUT_TOG_DCLICK_BUT = 0x1000,
+	// drawing styles
+	wxCUSTBUT_FLAT           = 0x2000 // flat, mouseover raises if not depressed
 };
 
 //-----------------------------------------------------------------------------
@@ -62,148 +62,182 @@
 {
 public:
 
-    wxCustomButton() : wxControl() { Init(); }
-    
-    // wxToggleButton or wxButton compatible constructor (also wxTextCtrl)
-    wxCustomButton(wxWindow* parent, wxWindowID id,
-                   const wxString& label,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxCUSTBUT_TOGGLE,
-                   const wxValidator& val = wxDefaultValidator,
-                   const wxString& name = wxT("wxCustomButton"))
-                   : wxControl()
-    {
-        Init();
-        Create(parent,id,label,wxNullBitmap,pos,size,style,val,name);
-    }
-
-    // wxBitmapButton compatible constructor
-    wxCustomButton(wxWindow *parent, wxWindowID id,
-                   const wxBitmap& bitmap,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxCUSTBUT_TOGGLE,
-                   const wxValidator& val = wxDefaultValidator,
-                   const wxString& name = wxT("wxCustomButton"))
-                   : wxControl()
-    {
-        Init();
-        Create(parent,id,wxEmptyString,bitmap,pos,size,style,val,name);
-    }
-
-    // Native constructor
-    wxCustomButton(wxWindow *parent, wxWindowID id,
-                   const wxString& label, const wxBitmap& bitmap,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxCUSTBUT_TOGGLE|wxCUSTBUT_BOTTOM,
-                   const wxValidator& val = wxDefaultValidator,
-                   const wxString& name = wxT("wxCustomButton"))
-                   : wxControl()
-    {
-        Init();
-        Create(parent,id,label,bitmap,pos,size,style,val,name);
-    }
-
-    virtual ~wxCustomButton();
-        
-    bool Create(wxWindow* parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxBitmap &bitmap,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxT("wxCustomButton"));
-
-    bool GetValue() const { return m_down%2 != 0; }
-    void SetValue( bool depressed );
-
-    // Use combinations of wxCustomButton_Style(s)
-    long GetButtonStyle() const { return m_button_style; }
-    bool SetButtonStyle( long style );
-    
-    // Set the text label, wxEmptyString for none
-    void SetLabel( const wxString &label );
-
-    // set the bitmaps, ONLY this Label bitmap is used for calculating control size
-    //   all bitmaps will be centered accordingly in any case
-    //   call SetSet(GetBestSize()) if you change their size and want the control to resize appropriately
-    void SetBitmapLabel(const wxBitmap& bitmap);
-    void SetBitmapSelected(const wxBitmap& sel)      { m_bmpSelected = sel; CalcLayout(TRUE); };
-    void SetBitmapFocus(const wxBitmap& focus)       { m_bmpFocus = focus; CalcLayout(TRUE); };
-    void SetBitmapDisabled(const wxBitmap& disabled) { m_bmpDisabled = disabled; CalcLayout(TRUE); };
-    // wxBitmapButton compatibility
-    void SetLabel(const wxBitmap& bitmap)            { SetBitmapLabel(bitmap); }
-
-    // retrieve the bitmaps
-    const wxBitmap& GetBitmapLabel()    const { return m_bmpLabel;    }
-    const wxBitmap& GetBitmapSelected() const { return m_bmpSelected; }
-    const wxBitmap& GetBitmapFocus()    const { return m_bmpFocus;    }
-    const wxBitmap& GetBitmapDisabled() const { return m_bmpDisabled; }
-
-    // Creates a "disabled" bitmap by dithering it with the background colour
-    wxBitmap CreateBitmapDisabled(const wxBitmap &bitmap) const;
-    
-    // set/get the margins (in pixels) around the label and bitmap
-    //    if fit = TRUE then resize the button to fit
-    void SetMargins(const wxSize &margin, bool fit = FALSE); 
-    
-    // set/get the margins around the text label
-    //    the inter bitmap/label margin is the max of either margin, not the sum
-    void SetLabelMargin(const wxSize &margin, bool fit = FALSE);
-    wxSize GetLabelMargin() const { return m_labelMargin; }
-    // set/get the margins around the bitmap
-    //    the inter bitmap/label margin is the max of either margin, not the sum
-    void SetBitmapMargin(const wxSize &margin, bool fit = FALSE);
-    wxSize GetBitmapMargin() const { return m_bitmapMargin; }
-    
-    // can be used to activate the focused behavior (see MenuButton)
-    void SetFocused(bool focused) { m_focused = focused; Refresh(FALSE); }
-    bool GetFocused() const { return m_focused; }
-    
+	wxCustomButton() : wxControl() {
+		Init();
+	}
+
+	// wxToggleButton or wxButton compatible constructor (also wxTextCtrl)
+	wxCustomButton(wxWindow* parent, wxWindowID id,
+	               const wxString& label,
+	               const wxPoint& pos = wxDefaultPosition,
+	               const wxSize& size = wxDefaultSize,
+	               long style = wxCUSTBUT_TOGGLE,
+	               const wxValidator& val = wxDefaultValidator,
+	               const wxString& name = wxT("wxCustomButton"))
+		: wxControl()
+	{
+		Init();
+		Create(parent,id,label,wxNullBitmap,pos,size,style,val,name);
+	}
+
+	// wxBitmapButton compatible constructor
+	wxCustomButton(wxWindow *parent, wxWindowID id,
+	               const wxBitmap& bitmap,
+	               const wxPoint& pos = wxDefaultPosition,
+	               const wxSize& size = wxDefaultSize,
+	               long style = wxCUSTBUT_TOGGLE,
+	               const wxValidator& val = wxDefaultValidator,
+	               const wxString& name = wxT("wxCustomButton"))
+		: wxControl()
+	{
+		Init();
+		Create(parent,id,wxEmptyString,bitmap,pos,size,style,val,name);
+	}
+
+	// Native constructor
+	wxCustomButton(wxWindow *parent, wxWindowID id,
+	               const wxString& label, const wxBitmap& bitmap,
+	               const wxPoint& pos = wxDefaultPosition,
+	               const wxSize& size = wxDefaultSize,
+	               long style = wxCUSTBUT_TOGGLE|wxCUSTBUT_BOTTOM,
+	               const wxValidator& val = wxDefaultValidator,
+	               const wxString& name = wxT("wxCustomButton"))
+		: wxControl()
+	{
+		Init();
+		Create(parent,id,label,bitmap,pos,size,style,val,name);
+	}
+
+	virtual ~wxCustomButton();
+
+	bool Create(wxWindow* parent,
+	            wxWindowID id,
+	            const wxString& label,
+	            const wxBitmap &bitmap,
+	            const wxPoint& pos = wxDefaultPosition,
+	            const wxSize& size = wxDefaultSize,
+	            long style = 0,
+	            const wxValidator& val = wxDefaultValidator,
+	            const wxString& name = wxT("wxCustomButton"));
+
+	bool GetValue() const {
+		return m_down%2 != 0;
+	}
+	void SetValue( bool depressed );
+
+	// Use combinations of wxCustomButton_Style(s)
+	long GetButtonStyle() const {
+		return m_button_style;
+	}
+	bool SetButtonStyle( long style );
+
+	// Set the text label, wxEmptyString for none
+	void SetLabel( const wxString &label );
+
+	// set the bitmaps, ONLY this Label bitmap is used for calculating control size
+	//   all bitmaps will be centered accordingly in any case
+	//   call SetSet(GetBestSize()) if you change their size and want the control to resize appropriately
+	void SetBitmapLabel(const wxBitmap& bitmap);
+	void SetBitmapSelected(const wxBitmap& sel)      {
+		m_bmpSelected = sel;
+		CalcLayout(TRUE);
+	};
+	void SetBitmapFocus(const wxBitmap& focus)       {
+		m_bmpFocus = focus;
+		CalcLayout(TRUE);
+	};
+	void SetBitmapDisabled(const wxBitmap& disabled) {
+		m_bmpDisabled = disabled;
+		CalcLayout(TRUE);
+	};
+	// wxBitmapButton compatibility
+	void SetLabel(const wxBitmap& bitmap)            {
+		SetBitmapLabel(bitmap);
+	}
+
+	// retrieve the bitmaps
+	const wxBitmap& GetBitmapLabel()    const {
+		return m_bmpLabel;
+	}
+	const wxBitmap& GetBitmapSelected() const {
+		return m_bmpSelected;
+	}
+	const wxBitmap& GetBitmapFocus()    const {
+		return m_bmpFocus;
+	}
+	const wxBitmap& GetBitmapDisabled() const {
+		return m_bmpDisabled;
+	}
+
+	// Creates a "disabled" bitmap by dithering it with the background colour
+	wxBitmap CreateBitmapDisabled(const wxBitmap &bitmap) const;
+
+	// set/get the margins (in pixels) around the label and bitmap
+	//    if fit = TRUE then resize the button to fit
+	void SetMargins(const wxSize &margin, bool fit = FALSE);
+
+	// set/get the margins around the text label
+	//    the inter bitmap/label margin is the max of either margin, not the sum
+	void SetLabelMargin(const wxSize &margin, bool fit = FALSE);
+	wxSize GetLabelMargin() const {
+		return m_labelMargin;
+	}
+	// set/get the margins around the bitmap
+	//    the inter bitmap/label margin is the max of either margin, not the sum
+	void SetBitmapMargin(const wxSize &margin, bool fit = FALSE);
+	wxSize GetBitmapMargin() const {
+		return m_bitmapMargin;
+	}
+
+	// can be used to activate the focused behavior (see MenuButton)
+	void SetFocused(bool focused) {
+		m_focused = focused;
+		Refresh(FALSE);
+	}
+	bool GetFocused() const {
+		return m_focused;
+	}
+
 protected:
-    void OnPaint(wxPaintEvent &event);
-    void Redraw();
-    virtual void Paint( wxDC &dc );
+	void OnPaint(wxPaintEvent &event);
+	void Redraw();
+	virtual void Paint( wxDC &dc );
+
+	virtual wxSize DoGetBestSize() const;
 
-    virtual wxSize DoGetBestSize() const;
+	virtual void SendEvent();
 
-    virtual void SendEvent();
-    
-    void OnMouseEvents(wxMouseEvent &event);
+	void OnMouseEvents(wxMouseEvent &event);
 
-    void OnSize( wxSizeEvent &event );
+	void OnSize( wxSizeEvent &event );
 
-    virtual void CalcLayout(bool refresh);
+	virtual void CalcLayout(bool refresh);
 
-    long m_down;         // toggle state if m_down%2 then depressed
-    bool m_focused;     // mouse in window
-    long m_button_style;
+	long m_down;         // toggle state if m_down%2 then depressed
+	bool m_focused;     // mouse in window
+	long m_button_style;
 
-    // the bitmaps for various states
-    wxBitmap m_bmpLabel,
-             m_bmpSelected,
-             m_bmpFocus,
-             m_bmpDisabled;
+	// the bitmaps for various states
+	wxBitmap m_bmpLabel,
+	         m_bmpSelected,
+	         m_bmpFocus,
+	         m_bmpDisabled;
 
-    // the margins around the label/bitmap
-    wxSize m_labelMargin,
-           m_bitmapMargin;
+	// the margins around the label/bitmap
+	wxSize m_labelMargin,
+	       m_bitmapMargin;
 
-    wxPoint m_bitmapPos,
-            m_labelPos;
+	wxPoint m_bitmapPos,
+	        m_labelPos;
 
-    wxTimer *m_timer;
-    
-    wxEventType m_eventType;     // store the mouse event type
+	wxTimer *m_timer;
+
+	wxEventType m_eventType;     // store the mouse event type
 
 private:
-    void Init();
-    DECLARE_DYNAMIC_CLASS(wxCustomButton)
-    DECLARE_EVENT_TABLE()
+	void Init();
+	DECLARE_DYNAMIC_CLASS(wxCustomButton)
+	DECLARE_EVENT_TABLE()
 };
 
 //-----------------------------------------------------------------------------
@@ -215,7 +249,7 @@
 
 enum wxMenuButton_Styles
 {
-    wxMENUBUT_FLAT = wxCUSTBUT_FLAT
+	wxMENUBUT_FLAT = wxCUSTBUT_FLAT
 };
 
 //-----------------------------------------------------------------------------
@@ -226,87 +260,95 @@
 {
 public:
 
-    wxMenuButton() : wxControl() { Init(); }
-
-    // Use this constructor if you need one compatible with a wxBitmapButton
-    //   setup the button later with AssignMenu
-    wxMenuButton( wxWindow* parent, wxWindowID id,
-                  const wxBitmap &bitmap, 
-                  const wxPoint& pos = wxDefaultPosition,
-                  const wxSize& size = wxDefaultSize,
-                  long style = 0, 
-				  const wxValidator& val = wxDefaultValidator,
-                  const wxString& name = wxT("wxMenuButton"))
-                  : wxControl()
-    {
-        Init();
-        Create(parent,id,wxEmptyString,bitmap,pos,size,style,val,name);
-    }
-
-    virtual ~wxMenuButton();
-        
-    bool Create( wxWindow* parent,
-                 wxWindowID id,
-                 const wxString &label,
-                 const wxBitmap &bitmap,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxNO_BORDER,
-                 const wxValidator& val = wxDefaultValidator,
-                 const wxString& name = wxT("wxMenuButton"));
-
-    // Gets the id of the first selected radio item or wxNOT_FOUND (-1) if none
-    int GetSelection() const;
-    
-    // This menu will be displayed when the dropdown button is pressed.
-    //   if static_menu is FALSE it will be deleted when the buttton is destroyed.
-    void AssignMenu(wxMenu *menu, bool static_menu = FALSE); 
-    
-    wxMenu *GetMenu() const { return m_menu; }
-    
-    // get a pointer to the label button, for turning it into a toggle perhaps
-    wxCustomButton *GetLabelButton() const { return m_labelButton; }
-    wxCustomButton *GetDropDownButton() const { return m_dropdownButton; }
-    
-    void SetToolTip(const wxString &tip);
-    void SetToolTip(wxToolTip *tip);
-    
+	wxMenuButton() : wxControl() {
+		Init();
+	}
+
+	// Use this constructor if you need one compatible with a wxBitmapButton
+	//   setup the button later with AssignMenu
+	wxMenuButton( wxWindow* parent, wxWindowID id,
+	              const wxBitmap &bitmap,
+	              const wxPoint& pos = wxDefaultPosition,
+	              const wxSize& size = wxDefaultSize,
+	              long style = 0,
+	              const wxValidator& val = wxDefaultValidator,
+	              const wxString& name = wxT("wxMenuButton"))
+		: wxControl()
+	{
+		Init();
+		Create(parent,id,wxEmptyString,bitmap,pos,size,style,val,name);
+	}
+
+	virtual ~wxMenuButton();
+
+	bool Create( wxWindow* parent,
+	             wxWindowID id,
+	             const wxString &label,
+	             const wxBitmap &bitmap,
+	             const wxPoint& pos = wxDefaultPosition,
+	             const wxSize& size = wxDefaultSize,
+	             long style = wxNO_BORDER,
+	             const wxValidator& val = wxDefaultValidator,
+	             const wxString& name = wxT("wxMenuButton"));
+
+	// Gets the id of the first selected radio item or wxNOT_FOUND (-1) if none
+	int GetSelection() const;
+
+	// This menu will be displayed when the dropdown button is pressed.
+	//   if static_menu is FALSE it will be deleted when the buttton is destroyed.
+	void AssignMenu(wxMenu *menu, bool static_menu = FALSE);
+
+	wxMenu *GetMenu() const {
+		return m_menu;
+	}
+
+	// get a pointer to the label button, for turning it into a toggle perhaps
+	wxCustomButton *GetLabelButton() const {
+		return m_labelButton;
+	}
+	wxCustomButton *GetDropDownButton() const {
+		return m_dropdownButton;
+	}
+
+	void SetToolTip(const wxString &tip);
+	void SetToolTip(wxToolTip *tip);
+
 protected:
-    void OnButton(wxCommandEvent &event);    
+	void OnButton(wxCommandEvent &event);
 
-    virtual void DoSetSize(int x, int y, int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+	virtual void DoSetSize(int x, int y, int width, int height,
+	                       int sizeFlags = wxSIZE_AUTO);
 
-    virtual wxSize DoGetBestSize();
+	virtual wxSize DoGetBestSize();
 
 // FIXME! - in MSW the radio items don't check themselves
 #ifdef __WXMSW__
-    void OnMenu( wxCommandEvent &event );
+	void OnMenu( wxCommandEvent &event );
 #endif
 
-    wxCustomButton *m_labelButton;
-    wxCustomButton *m_dropdownButton;
+	wxCustomButton *m_labelButton;
+	wxCustomButton *m_dropdownButton;
 
-    wxMenu *m_menu;
-    bool m_menu_static;
-    long m_style;
+	wxMenu *m_menu;
+	bool m_menu_static;
+	long m_style;
 
 private:
-    void Init();
-    DECLARE_DYNAMIC_CLASS(wxMenuButton)
-    DECLARE_EVENT_TABLE()
+	void Init();
+	DECLARE_DYNAMIC_CLASS(wxMenuButton)
+	DECLARE_EVENT_TABLE()
 };
 
 //-----------------------------------------------------------------------------
 // wxMenuButtonEvents
-// 
+//
 // EVT_MENUBUTTON_OPEN(id, fn) - menu is about to be opened, (dis)(en)able items
 //                               or call Veto() to stop menu from popping up
 //                               this is a wxNotifyEvent
 //-----------------------------------------------------------------------------
 
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_LOCAL_EVENT_TYPE( wxEVT_MENUBUTTON_OPEN, 0 )
+DECLARE_LOCAL_EVENT_TYPE( wxEVT_MENUBUTTON_OPEN, 0 )
 END_DECLARE_EVENT_TYPES()
 
 #define EVT_MENUBUTTON_OPEN(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_MENUBUTTON_OPEN, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) & fn, (wxObject *) NULL ),

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/resource.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/resource.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/wxGPACControl.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/wxGPACControl.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 #include "wxOsmo4.h"
@@ -38,7 +38,7 @@
 
 
 #define NUM_RATES 11
-static const char *BIFSRates[11] = 
+static const char *BIFSRates[11] =
 {
 	"5.0",
 	"7.5",
@@ -66,7 +66,7 @@
 }
 
 wxGPACControl::wxGPACControl(wxWindow *parent)
-             : wxDialog(parent, -1, wxString(wxT("GPAC Control Panel")))
+	: wxDialog(parent, -1, wxString(wxT("GPAC Control Panel")))
 {
 	const char *sOpt;
 	SetSize(320, 240);
@@ -82,16 +82,16 @@
 	//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, 
+	s_header->Add( new wxButton(this, ID_APPLY, wxT("Apply"), wxDefaultPosition,
 #ifdef WIN32
-		wxSize(40, 20)
+	                            wxSize(40, 20)
 #else
-		wxSize(40, 30)
+	                            wxSize(40, 30)
 #endif
-		),
-		1, wxALIGN_TOP|wxALIGN_RIGHT|wxADJUST_MINSIZE);
+	                           ),
+	               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));
@@ -169,7 +169,7 @@
 	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"));
@@ -192,13 +192,13 @@
 	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);
@@ -225,7 +225,7 @@
 	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);
@@ -262,7 +262,7 @@
 	s_audio->Add(m_notifs);
 #endif
 	s_main->Add(s_audio, 0, wxEXPAND, 0);
-	
+
 	/*font*/
 	s_font = new wxBoxSizer(wxVERTICAL);
 	bs = new wxBoxSizer(wxHORIZONTAL);
@@ -369,20 +369,19 @@
 	sOpt = gf_cfg_get_key(cfg, "General", "ViewXMT");
 	m_viewxmt->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
 
-	/*systems config*/
+	/*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";
-	u32 select = 0;
-	i=0;
-	while (GF_ISO639_Lang[i]) {
-		/*only use common languages (having both 2- and 3-char code names)*/
-		if (GF_ISO639_Lang[i+2][0]) {
-			m_lang->Append(wxString(GF_ISO639_Lang[i], wxConvUTF8) );
-			if (sOpt && !stricmp(sOpt, GF_ISO639_Lang[i+1])) select = m_lang->GetCount() - 1;
-		}
-		i+=3;
-	}
+	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"));
@@ -445,7 +444,7 @@
 		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);
 
@@ -622,7 +621,7 @@
 	m_proxy_name->SetValue( wxString((char *)szProxy, wxConvUTF8) );
 	if (! m_use_proxy->GetValue()) m_proxy_name->Enable(0);
 
-	/*streaming*/	
+	/*streaming*/
 	m_port->Append(wxT("554 (RTSP standard)"));
 	m_port->Append(wxT("7070 (RTSP ext)"));
 	m_port->Append(wxT("80 (RTSP / HTTP tunnel)"));
@@ -763,20 +762,44 @@
 	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;
+	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);
+	SetSizer(s_main);
 	s_main->Fit(this);
 	//s_main->Layout();
 	return;
@@ -899,18 +922,9 @@
 	gf_cfg_set_key(cfg, "General", "ViewXMT", m_viewxmt->GetValue() ? "yes" : "no");
 
 	s32 sel = m_lang->GetSelection();
-	u32 i=0;
-	while (GF_ISO639_Lang[i]) {
-		/*only use common languages (having both 2- and 3-char code names)*/
-		if (GF_ISO639_Lang[i+2][0]) {
-			if (!sel) break;
-			sel--;
-		}
-		i+=3;
-	}
-	gf_cfg_set_key(cfg, "Systems", "LanguageName", GF_ISO639_Lang[i]);
-	gf_cfg_set_key(cfg, "Systems", "Language3CC", GF_ISO639_Lang[i+1]);
-	gf_cfg_set_key(cfg, "Systems", "Language2CC", GF_ISO639_Lang[i+2]);
+	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();
@@ -920,7 +934,7 @@
 
 	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");
@@ -961,21 +975,27 @@
 	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()) 
+	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;
+	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");

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/wxGPACControl.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/wxGPACControl.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 #ifndef _OPTIONS_H
@@ -30,7 +30,7 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif
 
 #include <wx/spinbutt.h>
@@ -56,10 +56,10 @@
 };
 
 class wxOsmo4Frame;
-class wxGPACControl : public wxDialog 
+class wxGPACControl : public wxDialog
 {
 public:
-    wxGPACControl(wxWindow *parent);
+	wxGPACControl(wxWindow *parent);
 	virtual ~wxGPACControl();
 
 private:

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/wxOsmo4.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/wxOsmo4.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -64,16 +64,16 @@
 	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*/
+	/*
+	#ifdef __WXMAC__
+		return wxT("safari");
+	#else
+	#ifdef WIN32
+		return wxT("explorer.exe");
+	#else
+		return wxT("mozilla");
+	#endif
+	#endif*/
 }
 
 
@@ -81,8 +81,8 @@
 
 wxGPACEvent::wxGPACEvent(wxWindow* win)
 {
-    SetEventType(GPAC_EVENT);
-    SetEventObject(win);
+	SetEventType(GPAC_EVENT);
+	SetEventObject(win);
 	gpac_evt.type = 0;
 	to_url = wxT("");
 }
@@ -98,11 +98,11 @@
 
 /*open file dlg*/
 BEGIN_EVENT_TABLE(OpenURLDlg, wxDialog)
-    EVT_BUTTON(ID_URL_GO, OpenURLDlg::OnGo)
+	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")))
+	: wxDialog(parent, -1, wxString(wxT("Enter remote presentation location")))
 {
 #ifndef WIN32
 	SetSize(430, 35);
@@ -110,9 +110,9 @@
 	SetSize(430, 55);
 #endif
 	Centre();
-    m_url = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN);
+	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 !"));
+	m_go = new wxButton(this, ID_URL_GO, wxT("Go !"));
 #ifndef WIN32
 	m_go->SetSize(344, 2, 20, 18, wxSIZE_AUTO);
 #else
@@ -159,8 +159,10 @@
 {
 	u32 res;
 	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF; res<<=8;
-	res |= (val>>8)&0xFF; res<<=8;
+	res = (val)&0xFF;
+	res<<=8;
+	res |= (val>>8)&0xFF;
+	res<<=8;
 	res |= (val>>16)&0xFF;
 	return res;
 }
@@ -230,7 +232,7 @@
 			::wxLogMessage(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(")"));
 #endif
 	}
-		break;
+	break;
 	case GF_EVENT_PROGRESS:
 	{
 		const char *sTitle;
@@ -239,7 +241,7 @@
 		else if (evt->progress.progress_type==2) sTitle = (char *)"Import";
 		gf_set_progress(sTitle, evt->progress.done, evt->progress.total);
 	}
-		break;
+	break;
 	case GF_EVENT_KEYDOWN:
 		if (app->m_can_seek && (evt->key.flags & GF_KEY_MOD_ALT)) {
 			s32 res;
@@ -289,7 +291,7 @@
 				wxevt.gpac_evt = *evt;
 				app->AddPendingEvent(wxevt);
 			}
-				break;
+			break;
 			}
 		}
 		break;
@@ -302,7 +304,7 @@
 		if (!evt->connect.is_connected) app->m_duration = 0;
 		app->AddPendingEvent(wxevt);
 	}
-		break;
+	break;
 	case GF_EVENT_NAVIGATE:
 	{
 		wxGPACEvent wxevt(app);
@@ -310,7 +312,7 @@
 		wxevt.gpac_evt.type = evt->type;
 		app->AddPendingEvent(wxevt);
 	}
-		return 1;
+	return 1;
 	case GF_EVENT_SET_CAPTION:
 	{
 		wxGPACEvent wxevt(app);
@@ -318,7 +320,7 @@
 		wxevt.gpac_evt.type = evt->type;
 		app->AddPendingEvent(wxevt);
 	}
-		return 1;
+	return 1;
 
 	case GF_EVENT_QUIT:
 	case GF_EVENT_VIEWPOINTS:
@@ -330,37 +332,37 @@
 		wxevt.gpac_evt = *evt;
 		app->AddPendingEvent(wxevt);
 	}
-		break;
+	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();
+			app->m_pVisual->SetFocus();
 #else
-		  app->m_pView->SetFocus();
+			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;
+		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
@@ -461,10 +463,10 @@
 #ifdef __WXGTK__
 extern "C" {
 #ifdef __WXGTK20__
-    int gdk_x11_drawable_get_xid( void * );
-    void *gdk_x11_drawable_get_xdisplay( void * );
+	int gdk_x11_drawable_get_xid( void * );
+	void *gdk_x11_drawable_get_xdisplay( void * );
 #endif
-    void *gtk_widget_get_parent_window( void * );
+	void *gtk_widget_get_parent_window( void * );
 }
 #endif
 
@@ -532,9 +534,9 @@
 	memset(&m_user, 0, sizeof(GF_User));
 
 	/*locate exec dir for cfg file*/
-    wxPathList pathList;
+	wxPathList pathList;
 	wxString currentDir(wxGetCwd());
-    wxString abs_gpac_path = wxT("");
+	wxString abs_gpac_path = wxT("");
 	char *gpac_cfg, *sep;
 
 	::wxLogMessage(wxT("Looking for GPAC configuration file"));
@@ -617,9 +619,9 @@
 
 
 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
-		)
+	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];
@@ -875,11 +877,11 @@
 	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"));
+		::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"));
+		SetStatus(wxT("Ready"));
 	}
 }
 
@@ -962,34 +964,34 @@
 
 	EVT_MENUBUTTON_OPEN(FILE_PREV, wxOsmo4Frame::OnFilePrevOpen)
 	EVT_MENUBUTTON_OPEN(FILE_NEXT, wxOsmo4Frame::OnFileNextOpen)
-    EVT_MENU(FILE_PREV, wxOsmo4Frame::OnNavPrev)
+	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_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_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_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_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_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_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_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_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)
@@ -1022,14 +1024,14 @@
 	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;
+		}
+		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) {
@@ -1295,29 +1297,29 @@
 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);
+	                    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();
 }
@@ -1325,39 +1327,39 @@
 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 );
+	                    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();
 }
 
@@ -1365,21 +1367,21 @@
 /*open file dlg*/
 class AboutDlg : public wxDialog {
 public:
-    AboutDlg(wxWindow *parent);
+	AboutDlg(wxWindow *parent);
 
 private:
-    wxStaticText *m_info;
-    wxButton *m_close;
+	wxStaticText *m_info;
+	wxButton *m_close;
 	void OnClose(wxCommandEvent& event);
-    DECLARE_EVENT_TABLE()
+	DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(AboutDlg, wxDialog)
-    EVT_BUTTON(ID_ABOUT_CLOSE, AboutDlg::OnClose)
+	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)))
+	: wxDialog(parent, -1, wxString(wxT("GPAC/Osmo4 V ")wxT(GPAC_FULL_VERSION)))
 {
 	SetSize(220, 320);
 	Centre();
@@ -1387,29 +1389,29 @@
 
 	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));
+	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")
-		);
+	    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);
@@ -1446,10 +1448,10 @@
 			return;
 		}
 		cmd = get_pref_browser(m_user.config);
-		if (cmd.IsEmpty()){
-		  cmd += wxT(" ");
-		  cmd += event.to_url;
-		  wxExecute(cmd);
+		if (cmd.IsEmpty()) {
+			cmd += wxT(" ");
+			cmd += event.to_url;
+			wxExecute(cmd);
 		} else {
 #ifdef wxLaunchDefaultBrowser
 			wxLaunchDefaultBrowser(event.to_url);
@@ -1547,7 +1549,7 @@
 		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);
+		                       rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
 
 		m_pStatusbar->SetStatusText(str, 2);
 	}
@@ -1565,19 +1567,19 @@
 	}
 #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;
-	  }
+		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
 
@@ -1681,24 +1683,24 @@
 #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) {
+		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);
+		}
+		gf_term_play_from_time(m_term, (u32) res, 0);
 	}
 #endif
 }
@@ -1748,14 +1750,30 @@
 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;
+	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))
@@ -1772,9 +1790,18 @@
 
 	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 (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);
@@ -1851,9 +1878,15 @@
 	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); }
+	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))
@@ -2149,7 +2182,7 @@
 	gf_term_add_object(m_term, fileName, auto_play);
 }
 
-static Bool subs_enum_dir_item(void *cbck, char *item_name, char *item_path)
+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);
@@ -2254,10 +2287,22 @@
 	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 (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);
 	}
@@ -2324,7 +2369,7 @@
 void wxOsmo4Frame::OnFilePaste(wxCommandEvent &event)
 {
 	if (!wxTheClipboard->Open()) return;
-    if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
+	if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
 		wxTextDataObject data;
 		wxTheClipboard->GetData(data);
 		gf_term_paste_text(m_term, data.GetText().mb_str(wxConvUTF8), 0);
@@ -2336,7 +2381,7 @@
 {
 	Bool ok = 0;
 	if (wxTheClipboard->Open()) {
-	    if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
+		if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
 			if (gf_term_paste_text(m_term, NULL, 1)==GF_OK) {
 				ok = 1;
 			}

gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/wxOsmo4.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/wxOsmo4.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -63,7 +63,7 @@
 
 class GPACLogs : public wxLogWindow {
 public:
-    GPACLogs(wxFrame *parent) : wxLogWindow(parent, wxT("GPAC Logs"), FALSE, FALSE) {
+	GPACLogs(wxFrame *parent) : wxLogWindow(parent, wxT("GPAC Logs"), FALSE, FALSE) {
 		m_pMain = (wxOsmo4Frame *) parent;
 	}
 	virtual bool OnFrameClose(wxFrame *frame);
@@ -202,14 +202,14 @@
 
 class OpenURLDlg : public wxDialog {
 public:
-    OpenURLDlg(wxWindow *parent, GF_Config *cfg);
+	OpenURLDlg(wxWindow *parent, GF_Config *cfg);
 	wxString m_urlVal;
 private:
-    wxButton *m_go;
-    wxComboBox *m_url;
+	wxButton *m_go;
+	wxComboBox *m_url;
 	GF_Config *m_cfg;
 	void OnGo(wxCommandEvent& event);
-    DECLARE_EVENT_TABLE()
+	DECLARE_EVENT_TABLE()
 };
 
 class wxMyComboBox : public wxComboBox
@@ -227,8 +227,8 @@
 
 class wxOsmo4Frame : public wxFrame {
 public:
-    wxOsmo4Frame();
-    virtual ~wxOsmo4Frame();
+	wxOsmo4Frame();
+	virtual ~wxOsmo4Frame();
 
 	char szAppPath[GF_MAX_PATH];
 
@@ -355,8 +355,8 @@
 
 	void CheckVideoOut();
 
-    wxMenuBar* m_pMenubar;
-    wxStatusBar* m_pStatusbar;
+	wxMenuBar* m_pMenubar;
+	wxStatusBar* m_pStatusbar;
 	wxTimer *m_pTimer;
 	GPACLogs *m_pLogs;
 	wxBoxSizer *m_pAddBar;

gpac-0.5.0.svn5178.tar.bz2/applications/osmophone/main.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmophone/main.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -213,24 +213,24 @@
 
 	if (lm & GF_LOG_RTI) {
 		GF_SystemRTInfo rti;
-		if (fmt) vfprintf(log_file, fmt, list);	
-	
+		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)
-		);
+
+		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);	
+		vfprintf(log_file, fmt, list);
 	}
 }
 static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
 {
-	if (fmt && log_file) vfprintf(log_file, fmt, list);	
+	if (fmt && log_file) vfprintf(log_file, fmt, list);
 }
 
 
@@ -272,7 +272,7 @@
 					gf_log_set_callback(log_file, on_gpac_log);
 				}
 			}
-		} 
+		}
 	}
 }
 
@@ -295,7 +295,7 @@
 	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*/
@@ -332,7 +332,7 @@
 		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;
+	break;
 	case GF_EVENT_PROGRESS:
 	{
 		char *szTitle = "";
@@ -341,8 +341,8 @@
 		else if (evt->progress.progress_type==2) szTitle = "Import ";
 		cbk_on_progress(szTitle, evt->progress.done, evt->progress.total);
 	}
-		break;
-	
+	break;
+
 	case GF_EVENT_SIZE:
 		break;
 	case GF_EVENT_RESOLUTION:
@@ -404,10 +404,10 @@
 #endif
 			SHELLEXECUTEINFO info;
 
-/*
-			if (full_screen) gf_term_set_option(term, GF_OPT_FULLSCREEN, 0);
-			full_screen = 0;
-*/
+			/*
+						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");
@@ -515,7 +515,7 @@
 }
 
 
-void set_backlight_state(Bool disable) 
+void set_backlight_state(Bool disable)
 {
 #ifdef _WIN32_WCE
 	HKEY hKey = 0;
@@ -569,7 +569,7 @@
 		}
 		/*gf_freeze display*/
 		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 1);
-		
+
 		set_backlight_state(GF_FALSE);
 		gf_sleep(100);
 	} else {
@@ -579,7 +579,7 @@
 		if (do_resume) {
 			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
 			set_backlight_state(GF_TRUE);
-		}	
+		}
 	}
 }
 
@@ -606,7 +606,7 @@
 #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);
+	HMENU hMenu = (HMENU)SendMessage(g_hwnd_menu, SHCMBM_GETSUBMENU, 0, ID_MENU_FILE);
 	/*pos is hardcoded*/
 	hMenu = GetSubMenu(hMenu, 2);
 
@@ -668,17 +668,17 @@
 	}
 }
 
-BOOL CALLBACK AboutDialogProc(const HWND hWnd, const UINT Msg, const WPARAM wParam, const LPARAM lParam) 
+BOOL CALLBACK AboutDialogProc(const HWND hWnd, const UINT Msg, const WPARAM wParam, const LPARAM lParam)
 {
 	BOOL ret = TRUE;
-    switch (Msg) {
-    case WM_INITDIALOG:
+	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];
+		TCHAR           psz[80];
 		ZeroMemory(psz, sizeof(psz));
 		SHINITDLGINFO sid;
 		ZeroMemory(&sid, sizeof(sid));
@@ -694,7 +694,7 @@
 		mbi.nToolBarId = IDR_ABOUT_MENU;
 		mbi.hInstRes = g_hinst;
 		mbi.nBmpId = 0;
-		mbi.cBmpImages = 0;	
+		mbi.cBmpImages = 0;
 		SHCreateMenuBar(&mbi);
 
 		u16 swText[4096];
@@ -708,9 +708,9 @@
 		MoveWindow(hWnd, 0, 0, screen_w, disp_w, 1);
 
 	}
-        break;
-    case WM_COMMAND:
-    case WM_CLOSE:
+	break;
+	case WM_COMMAND:
+	case WM_CLOSE:
 		EndDialog(hWnd, 0);
 		break;
 	default:
@@ -731,24 +731,24 @@
 {
 	if (!is_connected) return;
 #ifdef _WIN32_WCE
-	TBBUTTONINFO tbbi; 
-	tbbi.cbSize = sizeof(tbbi); 
-	tbbi.dwMask = TBIF_TEXT; 
+	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"); 
+		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"); 
+		tbbi.pszText = _T("Pause");
 #endif
 	}
 #ifdef _WIN32_WCE
-	SendMessage(g_hwnd_menu, TB_SETBUTTONINFO, IDM_FILE_PAUSE, (LPARAM)&tbbi); 
+	SendMessage(g_hwnd_menu, TB_SETBUTTONINFO, IDM_FILE_PAUSE, (LPARAM)&tbbi);
 #endif
 }
 
@@ -804,7 +804,7 @@
 			char *szString = (char *)GlobalLock(hglbCopy);
 			gf_term_paste_text(term, szString, GF_FALSE);
 #endif
-			GlobalUnlock(hglbCopy); 
+			GlobalUnlock(hglbCopy);
 		}
 	}
 	/*we have something to copy*/
@@ -816,22 +816,22 @@
 			len = strlen(text);
 
 #ifdef _WIN32_WCE
-			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u16)); 
+			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u16));
 			LPCTSTR new_string = (LPCTSTR) GlobalLock(hglbCopy);
-			CE_CharToWide((char*)text, (u16*)new_string); 
+			CE_CharToWide((char*)text, (u16*)new_string);
 #else
-			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u8)); 
+			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u8));
 			char *new_string = (char*) GlobalLock(hglbCopy);
-			strcpy(new_string, text); 
+			strcpy(new_string, text);
 #endif
-			GlobalUnlock(hglbCopy); 
+			GlobalUnlock(hglbCopy);
 			SetClipboardData(CF_TEXT, hglbCopy);
 		}
 	}
-	CloseClipboard(); 
+	CloseClipboard();
 }
 
-static void rewrite_log_tools(u32 tool) 
+static void rewrite_log_tools(u32 tool)
 {
 	char *logs;
 	if (tool == GF_LOG_ALL) {
@@ -940,23 +940,23 @@
 		gf_term_set_option(term, GF_OPT_DRAW_MODE, drend);
 		gf_cfg_set_key(user.config, "Compositor", "DrawMode", drend ? "immediate" : "defer");
 	}
-		break;
+	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); 
+	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:
@@ -995,26 +995,56 @@
 		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: 
+	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: 
+	case ID_LOGS_RESET:
 		if (log_file) {
 			fclose(log_file);
 			log_file = NULL;
@@ -1048,14 +1078,14 @@
 
 	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"); 
+	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);	
+	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);
@@ -1065,17 +1095,17 @@
 	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))
+	    (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;
@@ -1137,7 +1167,7 @@
 	CHECK_TOOL(ID_TOOLS_RTI, "rti");
 
 
-    return TRUE;
+	return TRUE;
 }
 
 
@@ -1153,8 +1183,8 @@
 		mbi.hwndParent = hwnd;
 		mbi.hInstRes = g_hinst;
 		mbi.nBmpId = 0;
-		mbi.cBmpImages = 0;	
-		
+		mbi.cBmpImages = 0;
+
 		mbi.nToolBarId = IDM_MAIN_MENU;
 		SHCreateMenuBar(&mbi);
 		g_hwnd_menu = mbi.hwndMB;
@@ -1166,8 +1196,8 @@
 
 		do_layout(GF_TRUE);
 	}
-		break;
-		
+	break;
+
 	case WM_COMMAND:
 		if (HandleCommand(hwnd, wParam, lParam))
 			return DefWindowProc(hwnd, msg, wParam, lParam);
@@ -1182,10 +1212,16 @@
 		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; }
+			if (wParam==VK_LEFT) {
+				switch_playlist(GF_TRUE);
+				break;
+			}
+			else if (wParam==VK_RIGHT) {
+				switch_playlist(GF_FALSE);
+				break;
+			}
 		}
-		/*fall through*/
+	/*fall through*/
 	case WM_SYSKEYDOWN:
 	case WM_SYSKEYUP:
 	case WM_KEYUP:
@@ -1196,22 +1232,22 @@
 	case WM_LBUTTONUP:
 		::SendMessage(g_hwnd_disp, msg, wParam, lParam);
 		return 0;
-    case WM_INITMENUPOPUP:
-        OnMenuPopup(hwnd, wParam);
-        break;
+	case WM_INITMENUPOPUP:
+		OnMenuPopup(hwnd, wParam);
+		break;
 	case WM_CLOSE:
 		DestroyWindow(hwnd);
 		break;
-    case WM_SETFOCUS:
+	case WM_SETFOCUS:
 		gf_freeze_display(GF_FALSE);
 		break;
-    case WM_KILLFOCUS:
-        if ((HWND) wParam==g_hwnd) {
+	case WM_KILLFOCUS:
+		if ((HWND) wParam==g_hwnd) {
 			gf_freeze_display(GF_TRUE);
 		}
 		break;
-    case WM_ACTIVATE:
-        if (WA_INACTIVE != LOWORD(wParam)) {
+	case WM_ACTIVATE:
+		if (WA_INACTIVE != LOWORD(wParam)) {
 			if ((HWND) lParam == g_hwnd) {
 				gf_freeze_display(GF_FALSE);
 				SetFocus(hwnd);
@@ -1221,7 +1257,7 @@
 				gf_freeze_display(GF_TRUE);
 			}
 		}
-        break;
+		break;
 	case WM_LOADTERM:
 		if (!LoadTerminal()) {
 			MessageBox(hwnd, _T("Cannot load GPAC"), _T("Error"), MB_OK);
@@ -1234,7 +1270,7 @@
 	default:
 		return DefWindowProc(hwnd, msg, wParam, lParam);
 	}
-	
+
 	return 0;
 }
 
@@ -1242,16 +1278,16 @@
 {
 	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");
+	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
@@ -1260,11 +1296,11 @@
 	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);
-	
+	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);
@@ -1281,49 +1317,49 @@
 }
 
 #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
+#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, 
+int WINAPI WinMain(HINSTANCE hInstance,
+                   HINSTANCE hPrevInstance,
 #ifdef _WIN32_WCE
-				   LPWSTR lpCmdLine, 
+                   LPWSTR lpCmdLine,
 #else
-				   LPSTR lpCmdLine, 
+                   LPSTR lpCmdLine,
 #endif
-				   int nShowCmd 
-) {
+                   int nShowCmd
+                  ) {
 	MSG 	msg;
 
-	HWND 	hwndOld = NULL;	
+	HWND 	hwndOld = NULL;
 	const char *str;
 	Bool initial_launch = GF_FALSE;
 
 	if (hwndOld = FindWindow(_T("Osmophone"), NULL))
 	{
-		SetForegroundWindow(hwndOld);    
+		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);
 
@@ -1354,9 +1390,9 @@
 		return 0;
 	}
 
-    str = gf_cfg_get_key(user.config, "Compositor", "ScreenWidth");
+	str = gf_cfg_get_key(user.config, "Compositor", "ScreenWidth");
 	if (str) screen_w = atoi(str);
-    str = gf_cfg_get_key(user.config, "Compositor", "ScreenHeight");
+	str = gf_cfg_get_key(user.config, "Compositor", "ScreenHeight");
 	if (str) screen_h = atoi(str);
 	disp_w = screen_w;
 #ifdef _WIN32_WCE
@@ -1385,7 +1421,8 @@
 		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;
+		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);

gpac-0.5.0.svn5178.tar.bz2/applications/osmophone/newres.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmophone/newres.h Changed

@@ -6,30 +6,30 @@
 #endif
 
 #if defined(_WIN32_WCE)
-	#if !defined(WCEOLE_ENABLE_DIALOGEX)
-		#define DIALOGEX DIALOG DISCARDABLE
-	#endif
-	#include <commctrl.h>
-	#define  SHMENUBAR RCDATA
-	#if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
-		#include <aygshell.h>
-		#define AFXCE_IDR_SCRATCH_SHMENU  28700
-	#else
-		#define I_IMAGENONE		(-2)
-		#define NOMENU			0xFFFF
-		#define IDS_SHNEW		1
+#if !defined(WCEOLE_ENABLE_DIALOGEX)
+#define DIALOGEX DIALOG DISCARDABLE
+#endif
+#include <commctrl.h>
+#define  SHMENUBAR RCDATA
+#if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
+#include <aygshell.h>
+#define AFXCE_IDR_SCRATCH_SHMENU  28700
+#else
+#define I_IMAGENONE		(-2)
+#define NOMENU			0xFFFF
+#define IDS_SHNEW		1
 
-		#define IDM_SHAREDNEW        10
-		#define IDM_SHAREDNEWDEFAULT 11
-	#endif // _WIN32_WCE_PSPC
-	#define AFXCE_IDD_SAVEMODIFIEDDLG 28701
+#define IDM_SHAREDNEW        10
+#define IDM_SHAREDNEWDEFAULT 11
+#endif // _WIN32_WCE_PSPC
+#define AFXCE_IDD_SAVEMODIFIEDDLG 28701
 #endif // _WIN32_WCE
 
 #ifdef RC_INVOKED
 #ifndef _INC_WINDOWS
 #define _INC_WINDOWS
-	#include "winuser.h"           // extract from windows header
-	#include "winver.h"   
+#include "winuser.h"           // extract from windows header
+#include "winver.h"
 #endif
 #endif

gpac-0.5.0.svn5178.tar.bz2/applications/osmophone/openfile.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmophone/openfile.cpp Changed

@@ -40,7 +40,7 @@
 	DeleteMenu(g_hMenuView, IDM_OF_PL_UP, MF_BYCOMMAND);
 	DeleteMenu(g_hMenuView, IDM_OF_PL_DOWN, MF_BYCOMMAND);
 	DeleteMenu(g_hMenuView, IDM_OF_PL_CLEAR, MF_BYCOMMAND);
-	
+
 	if (playlist_mode) {
 		InsertMenu(g_hMenuView, 0, MF_BYPOSITION, IDM_OF_PL_CLEAR, _T("Clear"));
 		InsertMenu(g_hMenuView, 0, MF_BYPOSITION, IDM_OF_PL_DOWN, _T("Move Down") );
@@ -48,28 +48,28 @@
 	} else {
 		InsertMenu(g_hMenuView, 0, MF_BYPOSITION, IDM_OF_VIEW_ALL, _T("All Unknown Files") );
 	}
-	TBBUTTONINFO tbbi; 
-	tbbi.cbSize = sizeof(tbbi); 
-	tbbi.dwMask = TBIF_TEXT; 
-	tbbi.pszText = playlist_mode ? _T("Remove") : _T("Add"); 
-	SendMessage(g_hWndMenuBar, TB_SETBUTTONINFO, IDM_OF_PL_ACT, (LPARAM)&tbbi); 
+	TBBUTTONINFO tbbi;
+	tbbi.cbSize = sizeof(tbbi);
+	tbbi.dwMask = TBIF_TEXT;
+	tbbi.pszText = playlist_mode ? _T("Remove") : _T("Add");
+	SendMessage(g_hWndMenuBar, TB_SETBUTTONINFO, IDM_OF_PL_ACT, (LPARAM)&tbbi);
 	refresh_menu_states();
 }
 
 
-Bool enum_dirs(void *cbk, char *name, char *path)
+Bool enum_dirs(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
 {
 	TCHAR w_name[GF_MAX_PATH], w_str_name[GF_MAX_PATH];
 
 	CE_CharToWide(name, (u16 *) w_name);
 	wcscpy(w_str_name, _T("+ "));
 	wcscat(w_str_name, w_name);
-    int iRes = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_str_name);
+	int iRes = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_str_name);
 	SendMessage(hList, LB_SETITEMDATA, iRes, (LPARAM) 1);
 	return GF_FALSE;
 }
 
-Bool enum_files(void *cbk, char *name, char *path)
+Bool enum_files(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
 {
 	TCHAR w_name[GF_MAX_PATH];
 
@@ -78,7 +78,7 @@
 		if (!ext || !strstr(extension_list, ext+1)) return GF_FALSE;
 	}
 	CE_CharToWide(name, (u16 *) w_name);
-    SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_name);
+	SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_name);
 	return GF_FALSE;
 }
 
@@ -100,7 +100,7 @@
 	gf_enum_directory((const char *) current_dir, GF_TRUE, enum_dirs, NULL, NULL);
 	/*enum files*/
 	gf_enum_directory((char *) current_dir, GF_FALSE, enum_files, NULL, NULL);
-    SendMessage(hList, LB_SETCURSEL, 0, 0);
+	SendMessage(hList, LB_SETCURSEL, 0, 0);
 	SetFocus(hList);
 }
 
@@ -126,7 +126,7 @@
 	const char *ple = gf_cfg_get_key(cfg, "General", "PLEntry");
 	i = ple ? atoi(ple) : 0;
 	if (i>=count) i=0;
-    SendMessage(hList, LB_SETCURSEL, i, 0);
+	SendMessage(hList, LB_SETCURSEL, i, 0);
 	SetFocus(hList);
 }
 
@@ -147,9 +147,9 @@
 		refresh_playlist();
 		return;
 	}
-    count = SendMessage(hList, LB_GETSELCOUNT, 0, 0);
+	count = SendMessage(hList, LB_GETSELCOUNT, 0, 0);
 	if (!count) return;
-    idx = SendMessage(hList, LB_GETCURSEL, 0, 0);
+	idx = SendMessage(hList, LB_GETCURSEL, 0, 0);
 
 	if ((act_type==1) && !idx) return;
 	else if ((act_type==2) && (idx+1==count)) return;
@@ -165,22 +165,22 @@
 		if (idx+1==count) idx--;
 		break;
 	/*up*/
-	case 1: 
+	case 1:
 		gf_cfg_insert_key(cfg, "Playlist", entry, "", idx-1);
 		idx--;
 		break;
 	/*down*/
-	case 2: 
+	case 2:
 		gf_cfg_insert_key(cfg, "Playlist", entry, "", idx+1);
 		idx++;
 		break;
 	}
 	refresh_playlist();
-    SendMessage(hList, LB_SETCURSEL, idx, 0);
+	SendMessage(hList, LB_SETCURSEL, idx, 0);
 	SetFocus(hList);
 }
 
-Bool add_files(void *cbk, char *name, char *path)
+Bool add_files(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
 {
 	if (!bViewUnknownTypes && extension_list) {
 		char *ext = strrchr(name, '.');
@@ -193,9 +193,9 @@
 void process_list_change(HWND hWnd, Bool add_to_pl)
 {
 	TCHAR sTxt[GF_MAX_PATH];
-    if (!SendMessage(hList, LB_GETSELCOUNT, 0, 0)) return;
+	if (!SendMessage(hList, LB_GETSELCOUNT, 0, 0)) return;
 
-    u32 idx = SendMessage(hList, LB_GETCURSEL, 0, 0);
+	u32 idx = SendMessage(hList, LB_GETCURSEL, 0, 0);
 	SendMessage(hList, LB_GETTEXT, idx, (LPARAM)(LPCTSTR) sTxt);
 
 	DWORD param = SendMessage(hList, LB_GETITEMDATA, idx, 0);
@@ -249,44 +249,44 @@
 
 BOOL InitFileDialog(const HWND hWnd)
 {
-    TCHAR           psz[80];
-    ZeroMemory(psz, sizeof(psz));
-    SHINITDLGINFO sid;
+	TCHAR           psz[80];
+	ZeroMemory(psz, sizeof(psz));
+	SHINITDLGINFO sid;
 	ZeroMemory(&sid, sizeof(sid));
-    sid.dwMask  = SHIDIM_FLAGS;
-    sid.dwFlags = SHIDIF_SIZEDLGFULLSCREEN;
-    sid.hDlg    = hWnd;
+	sid.dwMask  = SHIDIM_FLAGS;
+	sid.dwFlags = SHIDIF_SIZEDLGFULLSCREEN;
+	sid.hDlg    = hWnd;
 
 	if (FALSE == SHInitDialog(&sid))
 		return FALSE;
 
-    SHMENUBARINFO mbi;
+	SHMENUBARINFO mbi;
 	ZeroMemory(&mbi, sizeof(SHMENUBARINFO));
 	mbi.cbSize      = sizeof(SHMENUBARINFO);
 	mbi.hwndParent  = hWnd;
 	mbi.nToolBarId  = IDR_MENU_OPEN;
 	mbi.hInstRes    = g_hInst;
 
-    if (FALSE == SHCreateMenuBar(&mbi))
-    {
-        return FALSE;
-    }
-    g_hWndMenuBar = mbi.hwndMB;
-    
-    ShowWindow(g_hWndMenuBar, SW_SHOW);
+	if (FALSE == SHCreateMenuBar(&mbi))
+	{
+		return FALSE;
+	}
+	g_hWndMenuBar = mbi.hwndMB;
+
+	ShowWindow(g_hWndMenuBar, SW_SHOW);
 
 	the_wnd = hWnd;
 
-    hDirTxt = GetDlgItem(hWnd, IDC_DIRNAME);
-    hList = GetDlgItem(hWnd, IDC_FILELIST);
-    g_hMenuView = (HMENU)SendMessage(g_hWndMenuBar, SHCMBM_GETSUBMENU, 0, ID_OF_VIEW);
+	hDirTxt = GetDlgItem(hWnd, IDC_DIRNAME);
+	hList = GetDlgItem(hWnd, IDC_FILELIST);
+	g_hMenuView = (HMENU)SendMessage(g_hWndMenuBar, SHCMBM_GETSUBMENU, 0, ID_OF_VIEW);
 
 	RECT rc;
 	GetClientRect(hWnd, &rc);
 	u32 caption_h = GetSystemMetrics(SM_CYCAPTION) - 3;
 	MoveWindow(hDirTxt, 0, 0, rc.right - rc.left, caption_h, 1);
 	MoveWindow(hList, 0, caption_h, rc.right - rc.left, rc.bottom - rc.top - caption_h, 1);
-	
+
 	if (playlist_mode) {
 		refresh_playlist();
 	} else {
@@ -300,30 +300,30 @@
 	return TRUE;
 }
 
-BOOL CALLBACK FileDialogProc(const HWND hWnd, const UINT Msg, const WPARAM wParam, const LPARAM lParam) 
+BOOL CALLBACK FileDialogProc(const HWND hWnd, const UINT Msg, const WPARAM wParam, const LPARAM lParam)
 {
 	BOOL bProcessedMsg = TRUE;
 
-    switch (Msg) {
-    case WM_INITDIALOG:
-        if (FALSE == InitFileDialog(hWnd))
-            EndDialog(hWnd, -1);
-        break;
+	switch (Msg) {
+	case WM_INITDIALOG:
+		if (FALSE == InitFileDialog(hWnd))
+			EndDialog(hWnd, -1);
+		break;
 
-    case WM_ACTIVATE:
-        if (WA_INACTIVE != LOWORD(wParam)) SetFocus(hWnd);
-        break;
+	case WM_ACTIVATE:
+		if (WA_INACTIVE != LOWORD(wParam)) SetFocus(hWnd);
+		break;
 
-    case WM_CLOSE:
+	case WM_CLOSE:
 		EndDialog(hWnd, 0);
 		break;
 
-    case WM_COMMAND:
+	case WM_COMMAND:
 		if (LOWORD(wParam) == IDC_FILELIST) {
 			if (HIWORD(wParam) == LBN_DBLCLK) {
-		        process_list_change(hWnd, GF_FALSE);
+				process_list_change(hWnd, GF_FALSE);
 			} else {
-	            bProcessedMsg = FALSE;
+				bProcessedMsg = FALSE;
 			}
 		} else {
 			switch (LOWORD(wParam)) {
@@ -365,28 +365,28 @@
 				break;
 			}
 		}
-        break;
+		break;
 	case WM_KEYDOWN:
 		switch (wParam) {
-		case VK_LEFT: 
-		case '1': 
-			playlist_act(1); 
+		case VK_LEFT:
+		case '1':
+			playlist_act(1);
 			break;
-		case VK_RIGHT: 
-		case '2': 
-			playlist_act(2); 
+		case VK_RIGHT:
+		case '2':
+			playlist_act(2);
 			break;
 		default:
-            bProcessedMsg = FALSE;
+			bProcessedMsg = FALSE;
 			break;
 		}
 		break;
 
-    default:
-        bProcessedMsg = FALSE;
-    }
-    
-    return bProcessedMsg;
+	default:
+		bProcessedMsg = FALSE;
+	}
+
+	return bProcessedMsg;
 }
 
 Bool gf_file_dialog(HINSTANCE inst, HWND parent, char *url, const char *ext_list, GF_Config *gpac_cfg)

gpac-0.5.0.svn5178.tar.bz2/applications/osmophone/resource.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmophone/resource.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/nsIOsmozilla.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmozilla/nsIOsmozilla.h Changed

@@ -26,7 +26,7 @@
 	{ 0x9d, 0x10, 0x00, 0x60, 0xb0, 0xfb, 0xd8, 0x0b }}
 
 class NS_NO_VTABLE nsIOsmozilla : public nsISupports {
-public: 
+public:
 
 	NS_DEFINE_STATIC_IID_ACCESSOR(NS_IOSMOZILLA_IID)
 
@@ -56,7 +56,7 @@
 	NS_IMETHOD Stop(void); \
 	NS_IMETHOD Update(const char *type, const char *commands); \
 	NS_IMETHOD QualitySwitch(int switch_up); \
-	NS_IMETHOD SetURL(const char *type); 
+	NS_IMETHOD SetURL(const char *type);
 
 /* Use this macro to declare functions that forward the behavior of this interface to another object. */
 #define NS_FORWARD_NSIOSMOZILLA(_to) \
@@ -65,7 +65,7 @@
 	NS_IMETHOD Stop(void) { return _to Stop(); } \
 	NS_IMETHOD Update(const char *type, const char *commands) { return _to Update(type, commands); } \
 	NS_IMETHOD QualitySwitch(int switch_up) { return _to QualitySwitch( switch_up ); } \
-	NS_IMETHOD SetURL(const char *url) { return _to SetURL(url); } 
+	NS_IMETHOD SetURL(const char *url) { return _to SetURL(url); }
 
 /* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
 #define NS_FORWARD_SAFE_NSIOSMOZILLA(_to) \
@@ -75,7 +75,7 @@
 	NS_IMETHOD Update(const char *type, const char *commands) { return !_to ? NS_ERROR_NULL_POINTER : _to->Update(type, commands); } \
 	NS_IMETHOD QualitySwitch(int switch_up) { return !_to ? NS_ERROR_NULL_POINTER : _to->QualitySwitch(switch_up); } \
 	NS_IMETHOD SetURL(const char *url) { return !_to ? NS_ERROR_NULL_POINTER : _to->Update(url); } \
-
+ 
 #if 0
 /* Use the code below as a template for the implementation class for this interface. */
 
@@ -84,9 +84,9 @@
 {
 public:
 	NS_DECL_ISUPPORTS
-		NS_DECL_NSIOSMOZILLA
+	NS_DECL_NSIOSMOZILLA
 
-		nsOsmozilla();
+	nsOsmozilla();
 	virtual ~nsOsmozilla();
 	/* additional members */
 };

gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/osmo_npapi.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmozilla/osmo_npapi.cpp Changed

@@ -1,7 +1,7 @@
 /*
 *			GPAC - Multimedia Framework C SDK
 *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
 *					All rights reserved
 *
@@ -11,15 +11,15 @@
 *  it under the terms of the GNU Lesser General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
-*   
+*
 *  GPAC is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU Lesser General Public License for more details.
-*   
+*
 *  You should have received a copy of the GNU Lesser General Public
 *  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */
 
@@ -31,7 +31,7 @@
 #include "osmo_npapi.h"
 #include "osmozilla.h"
 
-#if defined(XP_UNIX) && !defined(XP_MACOS) 
+#if defined(XP_UNIX) && !defined(XP_MACOS)
 #include <malloc.h>
 #include <string.h>
 #endif
@@ -55,7 +55,7 @@
 #endif
 
 NPError NPOsmozilla_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
-{   
+{
 	Osmozilla *osmo;
 	NPError rv = NPERR_NO_ERROR;
 	if (instance == NULL)
@@ -108,7 +108,7 @@
 // is about to be destroyed so we can do some gui specific
 // initialization and shutdown
 NPError NPOsmozilla_SetWindow (NPP instance, NPWindow* pNPWindow)
-{    
+{
 	Osmozilla *osmozilla;
 	void *os_wnd_handle, *os_wnd_display;
 	NPError rv = NPERR_NO_ERROR;
@@ -129,8 +129,8 @@
 		os_wnd_display = NULL;
 #elif defined(XP_UNIX)
 		os_wnd_handle = pNPWindow->window;
-		/*HACK - although we don't use the display in the X11 plugin, this is used to signal that 
-		the user is mozilla and prevent some X11 calls crashing the browser in file playing mode 
+		/*HACK - although we don't use the display in the X11 plugin, this is used to signal that
+		the user is mozilla and prevent some X11 calls crashing the browser in file playing mode
 		(eg, "firefox myfile.mp4" )*/
 		os_wnd_display =((NPSetWindowCallbackStruct *)pNPWindow->ws_info)->display;
 #endif
@@ -165,7 +165,7 @@
 		return NPERR_INVALID_INSTANCE_ERROR;
 
 	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL) 
+	if(osmozilla== NULL)
 		return NPERR_GENERIC_ERROR;
 
 	Osmozilla_ConnectTo(osmozilla, stream->url);
@@ -179,7 +179,7 @@
 }
 
 NPINT32 NPOsmozilla_Write (NPP instance, NPStream *stream, NPINT32 offset, NPINT32 len, void *buffer)
-{   
+{
 	return len;
 }
 
@@ -199,12 +199,12 @@
 		return;
 
 	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL) 
+	if(osmozilla== NULL)
 		return;
 
-	Osmozilla_Print(osmozilla, (printInfo->mode == NP_EMBED) ? 1 : 0, printInfo->print.embedPrint.platformPrint, 
-		printInfo->print.embedPrint.window.x, printInfo->print.embedPrint.window.y,
-		printInfo->print.embedPrint.window.width, printInfo->print.embedPrint.window.height);
+	Osmozilla_Print(osmozilla, (printInfo->mode == NP_EMBED) ? 1 : 0, printInfo->print.embedPrint.platformPrint,
+	                printInfo->print.embedPrint.window.x, printInfo->print.embedPrint.window.y,
+	                printInfo->print.embedPrint.window.width, printInfo->print.embedPrint.window.height);
 }
 
 void NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData)
@@ -226,7 +226,7 @@
 #ifdef GECKO_XPCOM
 	case NPPVpluginScriptableInstance:
 		rv = NPOsmozilla_GetPeer(osmozilla, value);
-		break;	
+		break;
 
 	case NPPVpluginScriptableIID:
 		rv = NPOsmozilla_GetPeerIID(osmozilla, value);
@@ -280,7 +280,7 @@
 		return NPERR_INVALID_FUNCTABLE_ERROR;
 
 	// Set up the plugin function table that Netscape will use to
-	// call us. Netscape needs to know about our version and size   
+	// call us. Netscape needs to know about our version and size
 	// and have a UniversalProcPointer for every function we implement.
 
 	aNPPFuncs->version       = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
@@ -371,7 +371,7 @@
 	"application/sdp:sdp:Streaming Media Session;" \
 	/* explicit plugin call */ \
 	"application/x-gpac::GPAC plugin;" \
-
+ 
 char * NP_GetMIMEDescription(void)
 {
 	return (char *) GPAC_PLUGIN_MIMETYPES;
@@ -384,7 +384,7 @@
 }
 
 
-#if defined(XP_WIN) || defined(XP_MACOS) 
+#if defined(XP_WIN) || defined(XP_MACOS)
 
 NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs)
 {
@@ -441,26 +441,40 @@
 	// These flags are used by the DOM and security systems to signal that
 	// JavaScript callers are allowed to call this object's scritable methods.
 	NS_IMETHOD GetFlags(PRUint32 *aFlags)
-	{*aFlags = nsIClassInfo::PLUGIN_OBJECT | nsIClassInfo::DOM_OBJECT;
-	return NS_OK;}
+	{	*aFlags = nsIClassInfo::PLUGIN_OBJECT | nsIClassInfo::DOM_OBJECT;
+		return NS_OK;
+	}
 
 	NS_IMETHOD GetImplementationLanguage(PRUint32 *aImplementationLanguage)
-	{*aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS;
-	return NS_OK;}
+	{	*aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS;
+		return NS_OK;
+	}
 
 	// The rest of the methods can safely return error codes...
-	NS_IMETHOD GetInterfaces(PRUint32 *count, nsIID * **array)
-	{return NS_ERROR_NOT_IMPLEMENTED;}
+	NS_IMETHOD GetInterfaces(PRUint32 *count, nsIID ***array)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
 	NS_IMETHOD GetHelperForLanguage(PRUint32 language, nsISupports **_retval)
-	{return NS_ERROR_NOT_IMPLEMENTED;}
-	NS_IMETHOD GetContractID(char * *aContractID)
-	{return NS_ERROR_NOT_IMPLEMENTED;}
-	NS_IMETHOD GetClassDescription(char * *aClassDescription)
-	{return NS_ERROR_NOT_IMPLEMENTED;}
-	NS_IMETHOD GetClassID(nsCID * *aClassID)
-	{return NS_ERROR_NOT_IMPLEMENTED;}
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+	NS_IMETHOD GetContractID(char **aContractID)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+	NS_IMETHOD GetClassDescription(char **aClassDescription)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+	NS_IMETHOD GetClassID(nsCID **aClassID)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
 	NS_IMETHOD GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
-	{return NS_ERROR_NOT_IMPLEMENTED;}
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
 };
 
 
@@ -477,10 +491,10 @@
 
 public:
 	NS_DECL_NSIOSMOZILLA
-		void SetInstance(Osmozilla *osmo);
+	void SetInstance(Osmozilla *osmo);
 
 protected:
-	nsrefcnt mRefCnt; 
+	nsrefcnt mRefCnt;
 	Osmozilla *mPlugin;
 };
 
@@ -502,35 +516,35 @@
 //NS_IMPL_ISUPPORTS2(nsOsmozillaPeer, nsITestPlugin, nsIClassInfo)
 
 // the following method will be callable from JavaScript
-NS_IMETHODIMP nsOsmozillaPeer::Pause() { 
-	Osmozilla_Pause(mPlugin); 
-	return NS_OK; 
+NS_IMETHODIMP nsOsmozillaPeer::Pause() {
+	Osmozilla_Pause(mPlugin);
+	return NS_OK;
 }
-NS_IMETHODIMP nsOsmozillaPeer::Play() { 
-	Osmozilla_Play(mPlugin); 
-	return NS_OK; 
+NS_IMETHODIMP nsOsmozillaPeer::Play() {
+	Osmozilla_Play(mPlugin);
+	return NS_OK;
 }
-NS_IMETHODIMP nsOsmozillaPeer::Stop() { 
-	Osmozilla_Stop(mPlugin); 
-	return NS_OK; 
+NS_IMETHODIMP nsOsmozillaPeer::Stop() {
+	Osmozilla_Stop(mPlugin);
+	return NS_OK;
 }
 
-NS_IMETHODIMP nsOsmozillaPeer::Update(const char *type, const char *commands) 
+NS_IMETHODIMP nsOsmozillaPeer::Update(const char *type, const char *commands)
 {
-	Osmozilla_Update(mPlugin, type, commands); 
-	return NS_OK; 
+	Osmozilla_Update(mPlugin, type, commands);
+	return NS_OK;
 }
 
-NS_IMETHODIMP nsOsmozillaPeer::QualitySwitch(int switch_up) 
+NS_IMETHODIMP nsOsmozillaPeer::QualitySwitch(int switch_up)
 {
-	Osmozilla_QualitySwitch(mPlugin, switch_up); 
-	return NS_OK; 
+	Osmozilla_QualitySwitch(mPlugin, switch_up);
+	return NS_OK;
 }
 
-NS_IMETHODIMP nsOsmozillaPeer::SetURL(const char *url) 
+NS_IMETHODIMP nsOsmozillaPeer::SetURL(const char *url)
 {
-	Osmozilla_SetURL(mPlugin, url); 
-	return NS_OK; 
+	Osmozilla_SetURL(mPlugin, url);
+	return NS_OK;
 }
 
 void nsOsmozillaPeer::SetInstance(Osmozilla *osmo)
@@ -557,7 +571,7 @@
 // here nsOsmozillaPeer should return three interfaces it can be asked for by their iid's
 // static casts are necessary to ensure that correct pointer is returned
 NS_IMETHODIMP nsOsmozillaPeer::QueryInterface(const nsIID & aIID,
-											  void **aInstancePtr)
+        void **aInstancePtr)
 {
 	if (!aInstancePtr)
 		return NS_ERROR_NULL_POINTER;
@@ -657,7 +671,7 @@
 	kOSMOZILLA_ID_METHOD_UPDATE,
 	kOSMOZILLA_ID_METHOD_QUALITY_SWITCH,
 	kOSMOZILLA_ID_METHOD_SET_URL,
-	
+
 	kOSMOZILLA_NUM_METHODS
 };
 
@@ -732,8 +746,8 @@
 		const char *mime = NULL;
 		const char *update = NULL;
 		if (argCount==2) {
-			mime = (args[0].type==NPVariantType_String) ? args[0].value.stringValue.UTF8Characters : NULL; 
-			update = (args[1].type==NPVariantType_String) ? args[1].value.stringValue.UTF8Characters : NULL; 
+			mime = (args[0].type==NPVariantType_String) ? args[0].value.stringValue.UTF8Characters : NULL;
+			update = (args[1].type==NPVariantType_String) ? args[1].value.stringValue.UTF8Characters : NULL;
 		}
 		if (!update) return 0;
 		Osmozilla_Update(npo->osmo, mime, update);
@@ -751,7 +765,7 @@
 	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_SET_URL]) {
 		const char *url = "";
 		if (argCount>=1) {
-			if (args[0].type==NPVariantType_String) 
+			if (args[0].type==NPVariantType_String)
 				url = args[0].value.stringValue.UTF8Characters;
 		}
 		Osmozilla_SetURL(npo->osmo, url);

gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/osmo_npapi.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmozilla/osmo_npapi.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/osmozilla.cpp -> gpac-0.5.1.svn5491.tar.xz/applications/osmozilla/osmozilla.cpp Changed

@@ -1,7 +1,7 @@
 /*
 *			GPAC - Multimedia Framework C SDK
 *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
 *					All rights reserved
 *
@@ -11,15 +11,15 @@
 *  it under the terms of the GNU Lesser General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
-*   
+*
 *  GPAC is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU Lesser General Public License for more details.
-*   
+*
 *  You should have received a copy of the GNU Lesser General Public
 *  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */
 
@@ -86,33 +86,32 @@
 		} else {
 			char *szTitle = (char *)"";
 			if (evt->progress.progress_type==0) szTitle = (char *)"Buffer ";
-			else 
-			if (evt->progress.progress_type==1) 
+			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:	
+	/*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:	
+	/*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:	
+	case GF_EVENT_CONNECT:
 		osmo->is_connected = evt->connect.is_connected;
 		break;
-	case GF_EVENT_DURATION:	
+	case GF_EVENT_DURATION:
 		osmo->can_seek = evt->duration.can_seek;
 		osmo->duration = evt->duration.duration;
 		break;
@@ -154,9 +153,9 @@
 	osmo->use_gui = 0;
 
 	/*options sent from plugin*/
-	for(i=0;i<argc;i++) {   
+	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")) ) 
+		if (!stricmp(argn[i],"autostart") && (!stricmp(argv[i], "false") || !stricmp(argv[i], "no")) )
 			osmo->auto_start = 0;
 
 		else if (!stricmp(argn[i],"src") ) {
@@ -176,18 +175,18 @@
 			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") ) ) 
+		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 
+	/*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_f64_open(osmo->url, "rb");
-			if (test) {	
+			if (test) {
 				absolute_url = GF_TRUE;
 				fclose(test);
 			}
@@ -317,7 +316,7 @@
 
 	fprintf(stdout, "Osmozilla connecting to %s\n", url);
 
-	if (osmo->url) gf_free(osmo->url);	
+	if (osmo->url) gf_free(osmo->url);
 	osmo->url = gf_strdup(url);
 
 	/*connect from 0 and pause if not autoplay*/
@@ -361,26 +360,26 @@
 
 #ifdef XP_WIN
 PBITMAPINFO CreateBitmapInfoStruct(GF_VideoSurface *pfb)
-{ 
-	PBITMAPINFO pbmi; 
-	WORD    cClrBits; 
+{
+	PBITMAPINFO pbmi;
+	WORD    cClrBits;
 
 	cClrBits = 32;
 
-	pbmi = (PBITMAPINFO) LocalAlloc(LPTR, 
-		sizeof(BITMAPINFOHEADER)); 
+	pbmi = (PBITMAPINFO) LocalAlloc(LPTR,
+	                                sizeof(BITMAPINFOHEADER));
 
-	pbmi->bmiHeader.biSize = 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.biPlanes = 1;
+	pbmi->bmiHeader.biBitCount = cClrBits;
 
-	pbmi->bmiHeader.biCompression = BI_RGB; 
+	pbmi->bmiHeader.biCompression = BI_RGB;
 	pbmi->bmiHeader.biSizeImage = ((pbmi->bmiHeader.biWidth * cClrBits +31) & ~31) /8
-		* pbmi->bmiHeader.biHeight; 
-	pbmi->bmiHeader.biClrImportant = 0; 
-	return pbmi; 
+	                              * pbmi->bmiHeader.biHeight;
+	pbmi->bmiHeader.biClrImportant = 0;
+	return pbmi;
 }
 #endif
 
@@ -401,7 +400,7 @@
 #endif  // XP_UNIX
 #ifdef XP_WIN
 	/*
-	The coordinates for the window rectangle are in TWIPS format. 
+	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;
@@ -425,52 +424,52 @@
 		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;
+			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;
 		}
@@ -478,10 +477,10 @@
 		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);
+		    pDC, target_x, target_y, target_width,
+		    delta,
+		    0, 0, fb.width, 1,
+		    ligne, infoSrc, DIB_RGB_COLORS, SRCCOPY);
 	}
 
 	/*unlock GPAC frame buffer */
@@ -492,7 +491,7 @@
 #endif   // XP_WIN
 
 	return;
-} 
+}
 
 /*TODO - this is full print, present the print dialog and manage the print*/
 }

gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/osmozilla.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmozilla/osmozilla.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/resource.h -> gpac-0.5.1.svn5491.tar.xz/applications/osmozilla/resource.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/bmp4demux.vcxproj -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/bmp4demux/bmp4demux.vcxproj Changed

@@ -35,6 +35,7 @@
     <ClCompile Include="..\..\..\src\isomedia\stbl_read.c" />
     <ClCompile Include="..\..\..\src\isomedia\stbl_write.c" />
     <ClCompile Include="..\..\..\src\isomedia\track.c" />
+    <ClCompile Include="..\..\..\src\isomedia\ttml.c" />
     <ClCompile Include="..\..\..\src\isomedia\tx3g.c" />
     <ClCompile Include="..\..\..\src\media_tools\webvtt.c" />
     <ClCompile Include="..\..\..\src\odf\descriptors.c" />
@@ -61,13 +62,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/bmp4demux.vcxproj.filters -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/bmp4demux/bmp4demux.vcxproj.filters Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/bmp4demux/main.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -73,7 +73,7 @@
 		if (iso_sample) {
 			fprintf(stdout, "Found sample #%5d/%5d of length %8d, RAP: %d, DTS: "LLD", CTS: "LLD"\n", sample_index, sample_count, iso_sample->dataLength, iso_sample->IsRAP, iso_sample->DTS, iso_sample->DTS+iso_sample->CTS_Offset);
 			sample_index++;
-						
+
 			/*release the sample data, once you're done with it*/
 			gf_isom_sample_del(&iso_sample);
 		} else {

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/RTP_serv_generator.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/RTP_serv_generator.c Changed

@@ -10,14 +10,14 @@
 {
 	PNC_CallbackData *data = (PNC_CallbackData *)calling_object;
 	/* call the packetizer to create RTP packets */
-	PNC_ProcessData(data, au, size, ts); 
+	PNC_ProcessData(data, au, size, ts);
 	return GF_OK;
 }
 
 GF_Err (*MySampleCallBack)(void *, u16, char *data, u32 size, u64 ts) = &SampleCallBack;
 
 PNC_CallbackData *PNC_Init_SceneGenerator(GF_RTPChannel *p_chan, GF_RTPHeader *p_hdr, char *default_scene,
-										  u32 socketType, u16 socketPort, int debug) 
+        u32 socketType, u16 socketPort, int debug)
 {
 	GF_Err e;
 	PNC_CallbackData *data = gf_malloc(sizeof(PNC_CallbackData));
@@ -36,7 +36,7 @@
 	}
 	data->server_socket = NULL;
 	data->socket = NULL;
-	
+
 	if (socketType == GF_SOCK_TYPE_TCP)
 	{
 		data->server_socket = gf_sk_new(socketType);
@@ -62,7 +62,7 @@
 	u32 socket_type = 0;
 	e |= gf_sk_get_local_ip(data->socket, buffIp);
 	e |= gf_sk_get_local_info(data->socket, &port, &socket_type);
-	dprintf(DEBUG_RTP_serv_generator, "RTS_serv_generator %s:%d %s\n", 
+	dprintf(DEBUG_RTP_serv_generator, "RTS_serv_generator %s:%d %s\n",
 		buffIp, port, socket_type==GF_SOCK_TYPE_UDP?"UDP":"TCP", e==GF_OK?"OK":"ERROR");
 	*/
 	if (e) {
@@ -83,7 +83,7 @@
 
 void PNC_SendInitScene(PNC_CallbackData * data)
 {
-	data->RAP = 1; 
+	data->RAP = 1;
 	data->SAUN_inc = 1;
 	gf_seng_encode_context(data->codec, MySampleCallBack);
 }
@@ -107,13 +107,13 @@
 	assert( buffer );
 	assert( searchFrom >= 0);
 	/** We may have received #RTP_STREAM_ directive before the last update */
-	if (searchFrom < 30){
+	if (searchFrom < 30) {
 		searchFrom = 0;
 	} else {
 		searchFrom-= 30;
 	}
 	sstr = strstr(&(buffer[searchFrom]), "#_RTP_STREAM_");
-	if (sstr){
+	if (sstr) {
 		return (sstr - buffer);
 	}
 	return -1;
@@ -138,7 +138,7 @@
 	GF_Err error;
 	dprintf(DEBUG_RTP_serv_generator, "RTP STREAM RAP RESET\n");
 	gf_mx_p(data->carrousel_mutex);
-	data->RAP = 1; 
+	data->RAP = 1;
 	data->RAPsent++;
 	data->SAUN_inc = 1;
 	error = gf_seng_aggregate_context(data->codec, 0);
@@ -218,7 +218,7 @@
 	{
 		data->socket = NULL;
 		e = gf_sk_accept(data->server_socket, &(data->socket));
-		if (e){
+		if (e) {
 			return GF_OK;
 		} else {
 			dprintf(DEBUG_RTP_serv_generator, "New TCP client connected !\n");
@@ -231,53 +231,53 @@
 			return GF_OK;
 		e = gf_sk_receive(data->socket, tmpBuffer, tmpBufferSize, 0, & byteRead);
 		switch (e) {
-			case GF_IP_NETWORK_EMPTY:
-				e = GF_OK;
-				break;
-			case GF_OK:
-				if (byteRead > 0){
-					dprintf(DEBUG_RTP_serv_generator, "Received %d bytes\n", byteRead);
-					/* We copy data in buffer */
-					memcpy( &(data->buffer[data->bufferPosition]), tmpBuffer, byteRead );
-					data->buffer[data->bufferPosition + byteRead] = '\0';
-					retour = findCommand( data->buffer, data->bufferPosition);
-					data->bufferPosition += byteRead;
-					if (retour >= 0){
-						/** OK, it means we found a command ! */
-						if (strncmp(&(data->buffer[retour+13]),
-							"SEND_CRITICAL", 13)==0){
-								bsBuffer = eat_buffer_to_bs( data->buffer, retour, retour + 26, RECV_BUFFER_SIZE_FOR_COMMANDS);
-								data->bufferPosition = 0;
-								return processSendCritical(data, bsBuffer);
-						}
-						if (strncmp(&(data->buffer[retour+13]), "SEND", 4)==0){
-							bsBuffer = eat_buffer_to_bs( data->buffer, retour, retour + 17, RECV_BUFFER_SIZE_FOR_COMMANDS);
-							data->bufferPosition = 0;
-							return processSend(data, bsBuffer);
-						}
-						if (strncmp(&(data->buffer[retour+13]), "RAP", 3)==0){
-							bsBuffer = eat_buffer_to_bs( data->buffer, retour, retour + 16, RECV_BUFFER_SIZE_FOR_COMMANDS);
-							data->bufferPosition = 0;
-							return processRap(data, bsBuffer);
-						}
-						if (strncmp(&(data->buffer[retour+13]), "RAP_RESET", 9)==0){
-							bsBuffer = eat_buffer_to_bs( data->buffer, retour, retour + 22, RECV_BUFFER_SIZE_FOR_COMMANDS);
-							data->bufferPosition = 0;
-							return processRapReset(data, bsBuffer);
-						}
-						/** If we are here, it means probably we did not received fully the command */
-						break;
+		case GF_IP_NETWORK_EMPTY:
+			e = GF_OK;
+			break;
+		case GF_OK:
+			if (byteRead > 0) {
+				dprintf(DEBUG_RTP_serv_generator, "Received %d bytes\n", byteRead);
+				/* We copy data in buffer */
+				memcpy( &(data->buffer[data->bufferPosition]), tmpBuffer, byteRead );
+				data->buffer[data->bufferPosition + byteRead] = '\0';
+				retour = findCommand( data->buffer, data->bufferPosition);
+				data->bufferPosition += byteRead;
+				if (retour >= 0) {
+					/** OK, it means we found a command ! */
+					if (strncmp(&(data->buffer[retour+13]),
+					            "SEND_CRITICAL", 13)==0) {
+						bsBuffer = eat_buffer_to_bs( data->buffer, retour, retour + 26, RECV_BUFFER_SIZE_FOR_COMMANDS);
+						data->bufferPosition = 0;
+						return processSendCritical(data, bsBuffer);
 					}
+					if (strncmp(&(data->buffer[retour+13]), "SEND", 4)==0) {
+						bsBuffer = eat_buffer_to_bs( data->buffer, retour, retour + 17, RECV_BUFFER_SIZE_FOR_COMMANDS);
+						data->bufferPosition = 0;
+						return processSend(data, bsBuffer);
+					}
+					if (strncmp(&(data->buffer[retour+13]), "RAP", 3)==0) {
+						bsBuffer = eat_buffer_to_bs( data->buffer, retour, retour + 16, RECV_BUFFER_SIZE_FOR_COMMANDS);
+						data->bufferPosition = 0;
+						return processRap(data, bsBuffer);
+					}
+					if (strncmp(&(data->buffer[retour+13]), "RAP_RESET", 9)==0) {
+						bsBuffer = eat_buffer_to_bs( data->buffer, retour, retour + 22, RECV_BUFFER_SIZE_FOR_COMMANDS);
+						data->bufferPosition = 0;
+						return processRapReset(data, bsBuffer);
+					}
+					/** If we are here, it means probably we did not received fully the command */
+					break;
 				}
-				/* No bytes were received */
-				break;
-			default:
-				fprintf(stderr, "Socket error while receiving BIFS data %s\n", gf_error_to_string(e));
-				if (data->socket != NULL){
-					gf_sk_del(data->socket);
-					data->socket = NULL;
-				}
-				return e;
+			}
+			/* No bytes were received */
+			break;
+		default:
+			fprintf(stderr, "Socket error while receiving BIFS data %s\n", gf_error_to_string(e));
+			if (data->socket != NULL) {
+				gf_sk_del(data->socket);
+				data->socket = NULL;
+			}
+			return e;
 		}
 
 	} while (e == GF_OK);

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/RTP_serv_generator.h -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/RTP_serv_generator.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/RTP_serv_packetizer.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/RTP_serv_packetizer.c Changed

@@ -13,7 +13,7 @@
 
 void OnNewPacket(void *cbk, GF_RTPHeader *header)
 {
-	((PNC_CallbackData *)cbk)->formatedPacketLength = 0; 
+	((PNC_CallbackData *)cbk)->formatedPacketLength = 0;
 }
 
 void OnPacketDone(void *cbk, GF_RTPHeader *header)
@@ -21,7 +21,7 @@
 	PNC_CallbackData *data = (PNC_CallbackData *)cbk;
 	dprintf(DEBUG_RTP_serv_packetizer, "RTP Packet done\n");
 	PNC_SendRTP(data, ((PNC_CallbackData *)cbk)->formatedPacket, ((PNC_CallbackData *)cbk)->formatedPacketLength);
-	((PNC_CallbackData *)cbk)->formatedPacketLength = 0; 
+	((PNC_CallbackData *)cbk)->formatedPacketLength = 0;
 }
 
 void OnData(void *cbk, char *data, u32 data_size, Bool is_head)
@@ -38,16 +38,16 @@
 	sl.useTimestampsFlag = 1;
 	sl.useRandomAccessPointFlag = 1;
 	sl.timestampResolution = 1000;
-	sl.AUSeqNumLength = 16; 
+	sl.AUSeqNumLength = 16;
 
 	p = gf_rtp_builder_new(GF_RTP_PAYT_MPEG4,
-		&sl,
-		GP_RTP_PCK_SIGNAL_RAP | GP_RTP_PCK_SIGNAL_AU_IDX,
-		data,
-		OnNewPacket,
-		OnPacketDone,
-		NULL,
-		OnData);
+	                       &sl,
+	                       GP_RTP_PCK_SIGNAL_RAP | GP_RTP_PCK_SIGNAL_AU_IDX,
+	                       data,
+	                       OnNewPacket,
+	                       OnPacketDone,
+	                       NULL,
+	                       OnData);
 	if (!p) {
 		fprintf(stderr, "Cannot create RTP builder \n");
 		return;
@@ -58,7 +58,7 @@
 	gf_rtp_builder_init(p, 96, mtu_size, 0, 3, 1, 1, 0, 0, 0, 0, 0, 0, NULL);
 	gf_rtp_builder_format_sdp(p, "mpeg4-generic", sdp_fmt, NULL, 0);
 	p->rtp_header.Version=2;
-	p->rtp_header.SSRC=rand();  
+	p->rtp_header.SSRC=rand();
 	data->hdr=& p->rtp_header;
 	data->rtpBuilder=p;
 	data->formatedPacket = gf_malloc(MAX_PACKET_SIZE);
@@ -71,12 +71,12 @@
 	gf_rtp_builder_del(data->rtpBuilder);
 }
 
-GF_Err PNC_ProcessData(PNC_CallbackData * data, char *au, u32 size, u64 ts) 
+GF_Err PNC_ProcessData(PNC_CallbackData * data, char *au, u32 size, u64 ts)
 {
 	assert( data );
 	assert( au );
 	/* We need to set a TS different every time */
-	data->hdr->TimeStamp = (u32) gf_sys_clock(); 
+	data->hdr->TimeStamp = (u32) gf_sys_clock();
 	data->rtpBuilder->sl_header.compositionTimeStamp = (u32) gf_sys_clock();
 	data->rtpBuilder->sl_header.randomAccessPointFlag = data->RAP;
 	if (data->SAUN_inc) data->rtpBuilder->sl_header.AU_sequenceNumber++;
@@ -84,9 +84,9 @@
 	/* reset input data config */
 	data->RAP=0;
 	data->SAUN_inc=0;
-	
+
 	data->rtpBuilder->sl_header.paddingBits = 0;
 	gf_rtp_builder_process(data->rtpBuilder, au, size, 1, size, 0, 0);
-	
+
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/RTP_serv_sender.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/RTP_serv_sender.c Changed

@@ -13,7 +13,7 @@
 	res = gf_rtp_set_ports(*chan, 0);
 	if (res) {
 		fprintf(stderr, "Cannot set RTP ports: %s\n", gf_error_to_string(res));
-		gf_rtp_del(*chan);		
+		gf_rtp_del(*chan);
 		return res;
 	}
 
@@ -56,16 +56,16 @@
 GF_Err PNC_SendRTP(PNC_CallbackData *data, char *payload, int payloadSize)
 {
 	GF_Err e;
-	unsigned char feedback_buffer[250];	
-	
-	if (!data->hdr->TimeStamp) 
+	unsigned char feedback_buffer[250];
+
+	if (!data->hdr->TimeStamp)
 		data->hdr->TimeStamp = ((PNC_CallbackExt * )data->extension)->lastTS;
 
 	((PNC_CallbackExt * )data->extension)->lastTS = data->hdr->TimeStamp;
-	
+
 	e = gf_rtp_send_packet(data->chan, data->hdr, payload, payloadSize, 0);
 	dprintf(DEBUG_RTP_serv_sender, "SendPacket : %d, TimeStamp RTP = %d, sz= %d\n",
-			e, data->hdr->TimeStamp, payloadSize);
+	        e, data->hdr->TimeStamp, payloadSize);
 
 	// sending feedback bytes
 	memset(feedback_buffer, 0, sizeof(feedback_buffer));
@@ -77,7 +77,7 @@
 }
 
 GF_Err PNC_CloseRTP(GF_RTPChannel *chan)
-{ 
+{
 	gf_rtp_del(chan);
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/RTP_serv_sender.h -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/RTP_serv_sender.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/broadcaster.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/broadcaster.c Changed

@@ -16,12 +16,12 @@
 	unsigned long int v;
 	char * endptr = '\0';
 	const char * value = port_to_parse;
-	if (value == NULL || value[0] == '\0'){
+	if (value == NULL || value[0] == '\0') {
 		fprintf(stderr, "Value for port cannot be empty");
 		return 0;
 	}
 	v = strtoul(value, &endptr, 10);
-	if (*endptr != '\0' || v < 1 || v > 65535){
+	if (*endptr != '\0' || v < 1 || v > 65535) {
 		fprintf(stderr, "Value %s is not a valid port, port must be between 1 and 65535 !\n", value);
 		return 0;
 	}
@@ -29,8 +29,8 @@
 }
 
 static int command_line_parsing(int argc, const char** argv, unsigned short * tcp_port,
-				char *config_file, int *config_flag, unsigned short * mtu_size,
-				int * debug, u32 * socketType_for_updates)
+                                char *config_file, int *config_flag, unsigned short * mtu_size,
+                                int * debug, u32 * socketType_for_updates)
 {
 	int counter = 1;
 	if (argc < 2 || argc%2 != 1) {
@@ -39,7 +39,7 @@
 	}
 
 	for(counter = 1; counter < (argc - 1); counter+=2)
-	{	
+	{
 		const char * a = argv[counter];
 		if (!strcmp("-p", a) || !strcmp("--port", a))
 		{
@@ -57,7 +57,7 @@
 				printIncompatibleOptions();
 				return -2;
 			}
-			strcpy(config_file, argv[counter+1]);	
+			strcpy(config_file, argv[counter+1]);
 			(*config_flag) = 1;
 		}
 		else if (!strcmp("-m", a) || !strcmp("--mtu", a))
@@ -103,7 +103,7 @@
 	RAP_Input *input = par;
 	PNC_CallbackData *data = input->data;
 	u32 *timer;
-	
+
 	input->status = 1;
 	while (input->status==1) {
 		gf_mx_p(input->carrousel_mutex);
@@ -111,7 +111,7 @@
 		timer = input->RAPtimer;
 		data->RAPsent++;
 		dprintf(DEBUG_broadcaster, "Sending RAP, will sleep for %d seconds\n", *timer);
-		data->RAP = 1; 
+		data->RAP = 1;
 		gf_seng_aggregate_context(data->codec, 0);
 		gf_seng_encode_context(data->codec, SampleCallBack);
 
@@ -122,7 +122,7 @@
 	return GF_OK;
 }
 
-GF_Err parse_config(GF_Config *gf_config_file, CONF_Data *conf, int debug) 
+GF_Err parse_config(GF_Config *gf_config_file, CONF_Data *conf, int debug)
 {
 	conf->scene_init_file = gf_cfg_get_key(gf_config_file, MAIN_SECTION, SCENE_INIT);
 	if (!conf->scene_init_file) {
@@ -147,14 +147,14 @@
 
 	conf->dest_ip = gf_cfg_get_key(gf_config_file, DEST_SECTION, DEST_ADDRESS);
 	if (!conf->dest_ip)
-		conf->dest_ip = "127.0.0.1";		
+		conf->dest_ip = "127.0.0.1";
 	conf->dest_port = gf_cfg_get_key(gf_config_file, DEST_SECTION, PORT_OUTPUT);
 	if (!conf->dest_port)
 		conf->dest_port = "7000";
 	dprintf(DEBUG_broadcaster, "Destination: %s:%s\n", conf->dest_ip, conf->dest_port);
 
 	conf->feedback_ip = gf_cfg_get_key(gf_config_file, FEEDBACK_SECTION, IP_FEEDBACK);
-	if (!conf->feedback_ip) conf->feedback_ip = "127.0.0.1";		
+	if (!conf->feedback_ip) conf->feedback_ip = "127.0.0.1";
 	conf->feedback_port = gf_cfg_get_key(gf_config_file, FEEDBACK_SECTION, PORT_FEEDBACK);
 	if (!conf->feedback_port) conf->feedback_port = "5757";
 	dprintf(DEBUG_broadcaster, "Feedback host: %s:%s\n", conf->feedback_ip, conf->feedback_port);
@@ -174,7 +174,7 @@
 	GF_Socket *TCP_socket;
 	GF_Socket *conn_socket;
 	GF_Err e;
-	
+
 	int debug = input->debug;
 	input->status = 1;
 
@@ -183,10 +183,10 @@
 	e = gf_sk_listen(TCP_socket, 1);
 	e = gf_sk_set_block_mode(TCP_socket, 1);
 	e = gf_sk_server_mode(TCP_socket, 0);
-	
+
 	while(input->status == 1)
-	{	
-		memset(buffer, 0, sizeof(buffer));	
+	{
+		memset(buffer, 0, sizeof(buffer));
 		e = gf_sk_accept(TCP_socket, &conn_socket);
 		if (e == GF_OK) {
 			memset(buffer, 0, sizeof(buffer));
@@ -194,15 +194,15 @@
 		}
 
 		switch (e) {
-			case GF_IP_NETWORK_EMPTY:
-				gf_sleep(33);
-				continue;
-			case GF_OK:					
-				break;
-			default:
-				fprintf(stderr, "Error with TCP socket : %s\n", gf_error_to_string(e));
-				exit(1);
-				break;
+		case GF_IP_NETWORK_EMPTY:
+			gf_sleep(33);
+			continue;
+		case GF_OK:
+			break;
+		default:
+			fprintf(stderr, "Error with TCP socket : %s\n", gf_error_to_string(e));
+			exit(1);
+			break;
 		}
 
 		if((*(input->config_flag)) == 0)
@@ -215,7 +215,7 @@
 			}
 			ret = gf_fwrite(buffer, 1, byte_read, fp);
 			fclose(fp);
-			
+
 			/* parsing config info */
 			gf_config_file = gf_cfg_new(".", "temp.cfg");
 			if (!gf_config_file) {
@@ -224,7 +224,7 @@
 			}
 			parse_config(gf_config_file, input->config, debug);
 
-			/* Acknowledging the configuration */ 
+			/* Acknowledging the configuration */
 			gf_sk_send(conn_socket, "OK\n", 3);
 
 			memset(temp, 0, sizeof(temp));
@@ -256,7 +256,7 @@
 		}
 		/* we only wait now for the config updates */
 		if ( (*(input->config_flag)) == 1) {
-			ret = sscanf(buffer, "DelaiMax=%d\n", timer);							
+			ret = sscanf(buffer, "DelaiMax=%d\n", timer);
 			fprintf(stdout, "RAP timer changed, now : %d\n", *timer);
 		}
 		gf_sk_del(conn_socket);
@@ -265,7 +265,7 @@
 	input->status = 2;
 	return GF_OK;
 }
-	
+
 u8 get_a_char();
 Bool has_input();
 
@@ -275,7 +275,7 @@
 	Bool run;
 
 	/* location of the configuration file: 0 wait for config on a socket, 1 use the given file */
-	u32 config_flag;	
+	u32 config_flag;
 	char config_file_name[MAX_BUF];
 
 	int dest_port;
@@ -291,30 +291,30 @@
 	RAP_Input *rap_conf;
 	GF_Thread *rap_thread;
 
-	CONF_Data *conf;	
+	CONF_Data *conf;
 	GF_Config *gf_config_file;
 	GF_Err res;
-	
+
 	GF_Socket *UDP_feedback_socket;
 	u32 socketType_for_updates;
-	
+
 	PNC_CallbackData * data;
 	GF_RTPChannel * chan;
 	GF_RTPHeader hdr;
 	u32 timer = -1;
-	
-	GF_Mutex *carrousel_mutex;	
+
+	GF_Mutex *carrousel_mutex;
 	char sdp_fmt[5000];
 	tcp_thread = NULL;
-	
+
 	/* init gpac lib */
 	gf_sys_init();
-	
+
 	GF_SAFEALLOC(conf, CONF_Data);
-		
+
 	tcp_port = config_flag = 0;
 	socketType_for_updates = GF_SOCK_TYPE_UDP;
-	if (command_line_parsing(argc, argv, &tcp_port, config_file_name, (int *) &config_flag, &mtu_size, &debug, &socketType_for_updates)){
+	if (command_line_parsing(argc, argv, &tcp_port, config_file_name, (int *) &config_flag, &mtu_size, &debug, &socketType_for_updates)) {
 		print_usage();
 		return -1;
 	}
@@ -325,7 +325,7 @@
 		char *cfg_path;
 		char *cfg_fname;
 		char *tmp;
-		
+
 		cfg_fname = config_file_name;
 		cfg_path = config_file_name;
 		tmp = strrchr(cfg_fname, GF_PATH_SEPARATOR);
@@ -335,7 +335,7 @@
 		} else {
 			cfg_path = ".";
 		}
-		gf_config_file = gf_cfg_new(cfg_path, cfg_fname);	
+		gf_config_file = gf_cfg_new(cfg_path, cfg_fname);
 		if (!gf_config_file) {
 			fprintf(stderr, "Cannot open config file %s\n", config_file_name);
 			return -1;
@@ -356,33 +356,33 @@
 
 		/* Starting the thread which will write the received config in a temporary file */
 		th_err_tcp = gf_th_run(tcp_thread, tcp_server, tcp_conf);
-		
+
 		fprintf(stdout, "Waiting for configuration on port %d...\n", tcp_conf->port);
 
-		while(config_flag == 0) { 
-			gf_sleep(1000); 
+		while(config_flag == 0) {
+			gf_sleep(1000);
 		}
 		fprintf(stdout, "Configuration File received. Starting Streaming ...\n");
 	}
-	
+
 	timer = atoi(conf->rap_timer);
 	dest_port = atoi(conf->dest_port);
 	res = PNC_InitRTP(&chan, (char *)conf->dest_ip, dest_port, mtu_size);
- 	if (res != 0) {
-		fprintf(stderr, "Cannot initialize RTP output (error: %d)\n", res); 
+	if (res != 0) {
+		fprintf(stderr, "Cannot initialize RTP output (error: %d)\n", res);
 		exit(1);
-	} 
+	}
 
 	carrousel_mutex = gf_mx_new("Carrousel");
 	data = PNC_Init_SceneGenerator(chan, &hdr, (char *) conf->scene_init_file,
-								   socketType_for_updates, (u16) atoi(conf->modif_input_port), debug); 
+	                               socketType_for_updates, (u16) atoi(conf->modif_input_port), debug);
 	if (!data) {
-		fprintf(stderr, "Cannot initialize Scene Generator\n"); 
+		fprintf(stderr, "Cannot initialize Scene Generator\n");
 		exit(1);
 	}
 	data->carrousel_mutex = carrousel_mutex;
 	data->RAPsent = 1;
-	
+
 	UDP_feedback_socket = gf_sk_new(GF_SOCK_TYPE_UDP);
 	e = gf_sk_bind(UDP_feedback_socket, NULL, (u16)atoi(conf->feedback_port), (char*)conf->feedback_ip, (u16)atoi(conf->feedback_port), 0);
 	if (e) {
@@ -395,7 +395,7 @@
 	}
 	data->feedback_socket = UDP_feedback_socket;
 
-	PNC_InitPacketiser(data, sdp_fmt, mtu_size); 
+	PNC_InitPacketiser(data, sdp_fmt, mtu_size);
 	PNC_SendInitScene(data);
 
 	GF_SAFEALLOC(rap_conf, RAP_Input);
@@ -406,11 +406,11 @@
 	th_err_rap = gf_th_run(rap_thread, RAP_send, rap_conf);
 
 	sdp_generator(data, (char *)conf->dest_ip, sdp_fmt);
-	
+
 	run = 1;
 	while (run)
 	{
-		GF_Err e = PNC_processBIFSGenerator(data); 
+		GF_Err e = PNC_processBIFSGenerator(data);
 		if (e) {
 			fprintf(stderr, "Cannot Process BIFS data (%s)\n", gf_error_to_string(e));
 			break;
@@ -444,9 +444,9 @@
 	}
 
 	PNC_Close_SceneGenerator(data);
-	
+
 	gf_free(conf);
-	
+
 	if (gf_config_file)
 		gf_cfg_del(gf_config_file);
 
@@ -466,7 +466,7 @@
 {
 	return getchar();
 }
-void set_echo_off(Bool echo_off) 
+void set_echo_off(Bool echo_off)
 {
 	DWORD flags;
 	HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);
@@ -499,8 +499,8 @@
 	if (new_line) fprintf(stdout, "\n");
 }
 
-void set_echo_off(Bool echo_off) 
-{ 
+void set_echo_off(Bool echo_off)
+{
 	init_keyboard();
 	if (echo_off) t_orig.c_lflag &= ~ECHO;
 	else t_orig.c_lflag |= ECHO;

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/broadcaster.h -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/broadcaster.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/sdp_generator.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/sdp_generator.c Changed

@@ -13,7 +13,7 @@
 	char temp[5000];
 	u16 port;
 	u32 socket_type;
-		
+
 	gf_sk_get_local_info(data->chan->rtp, &port, &socket_type);
 
 	fp = fopen("broadcaster.sdp", "w+");
@@ -27,19 +27,19 @@
 	ret = gf_fwrite(temp, 1, strlen(temp), fp);
 
 	ret = gf_fwrite("s=MPEG4Broadcaster\n", 1, 19, fp);
-	
+
 	sprintf(temp, "c=IN IP%d %s\n", gf_net_is_ipv6(ip_dest) ? 6 : 4, ip_dest);
 	ret = gf_fwrite(temp, 1, strlen(temp), fp);
-	
+
 	ret = gf_fwrite("t=0 0\n", 1, 6, fp);
-	
+
 	codec = (GF_SceneEngine *) data->codec;
 	if (codec) {
 		buffer = NULL;
 		size = 0;
 		gf_odf_desc_write((GF_Descriptor *) codec->ctx->root_od, &buffer, &size);
 		esd = gf_list_get(codec->ctx->root_od->ESDescriptors, 0);
-	
+
 		size64 = gf_base64_encode((unsigned char *) buffer, size, (unsigned char *) buf64, 2000);
 		buf64[size64] = 0;
 		free(buffer);
@@ -47,17 +47,17 @@
 		sprintf(temp, "a=mpeg4-iod:\"data:application/mpeg4-iod;base64,%s\"\n", buf64);
 		ret = gf_fwrite(temp, 1, strlen(temp), fp);
 	}
-	
+
 	sprintf(temp, "m=application %d RTP/AVP 96\n", port);
 	ret = gf_fwrite(temp, 1, strlen(temp), fp);
-	
+
 	ret = gf_fwrite("a=rtpmap:96 mpeg4-generic/1000\n", 1, 31, fp);
 
 	if (esd) {
 		sprintf(temp, "a=mpeg4-esid:%d\n", esd->ESID);
 		ret = gf_fwrite(temp, 1, strlen(temp), fp);
 	}
-	
+
 	sprintf(temp, "%s\n", sdp_fmt);
 	ret = gf_fwrite(temp, 1, strlen(temp), fp);
 	fflush(fp);

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/broadcaster/sdp_generator.h -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/broadcaster/sdp_generator.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/dmbrs/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/dmbrs/main.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/mpegts.h>
@@ -72,7 +72,7 @@
 
 	k = 11;
 	bs_data = gf_bs_available(bs);
-	while (bs_data > 188 || k > 0){
+	while (bs_data > 188 || k > 0) {
 
 		gf_bs_read_data(bs, ts[11], 188);
 		if (bs_data == 0) {
@@ -81,11 +81,11 @@
 			k--;
 		}
 		bs_data = gf_bs_available(bs);
-				
-		for (i=0; i<(17*12); i+=12){  // 1 paquet RS
-		
+
+		for (i=0; i<(17*12); i+=12) { // 1 paquet RS
+
 			rs[i]    = ts[11][i];
-			if (rs[0] != 0x47){
+			if (rs[0] != 0x47) {
 				printf ("error ts sync byte");
 			}
 			rs[i+1]  = ts[10][i+1];
@@ -100,10 +100,10 @@
 			rs[i+10] = ts[1][i+10];
 			rs[i+11] = ts[0][i+11];
 		}
-		
+
 		if (rs[0] != 0x47) {
 			printf("error in output TS\n");
-		}else{
+		} else {
 			save_rs_0(out_name, rs);
 		}
 
@@ -147,17 +147,17 @@
 	memset(rs[11], 0, 204);
 
 	bs_data = gf_bs_available(bs);
-	while (bs_data > 204){
+	while (bs_data > 204) {
 		u64 pos;
 		k++;
 //		printf("TS Packet Number: %d\r", k);
-			
+
 		pos = gf_bs_get_position(bs);
 		gf_bs_read_data(bs, buf, 204);
 		bs_data = gf_bs_available(bs);
 
-		while ((buf[0] != 0x47) && (bs_data > 0)) { 
-			printf("error in input TS %d\n", k); 
+		while ((buf[0] != 0x47) && (bs_data > 0)) {
+			printf("error in input TS %d\n", k);
 			//return;
 			pos++;
 			gf_bs_seek(bs, pos);
@@ -165,8 +165,8 @@
 			bs_data = gf_bs_available(bs);
 		}
 
-		for (i=0; i<(17*12); i+=12){  // 1 paquet 
-			rs[0][i]     = buf[i]; 
+		for (i=0; i<(17*12); i+=12) { // 1 paquet
+			rs[0][i]     = buf[i];
 			rs[1][i+1]   = buf[i+1];
 			rs[2][i+2]	 = buf[i+2];
 			rs[3][i+3]   = buf[i+3];
@@ -179,10 +179,10 @@
 			rs[10][i+10] = buf[i+10];
 			rs[11][i+11] = buf[i+11];
 		}
-		if (k >= 12){
+		if (k >= 12) {
 			if (rs[11][0] != 0x47) {
 				printf("error in output TS\n");
-			}else{
+			} else {
 				save_ts(out_name, rs[11]);
 			}
 		}
@@ -208,39 +208,39 @@
 	GF_BitStream *bs;
 
 	/* generation d'un TS aléatoire */
-/*
-	if ((in=fopen(argv[1], "wb")) == NULL) {
-		printf( "Impossible d'ouvrir %s en lecture.\n", argv[1]);
-	}
-	{
-		char buffer[188];
-		u32 j, i, nb_packets = 300;
-		for (i = 0; i < nb_packets; i++) {
-			buffer[0] = 0x47;
-			for (j = 1; j <188; j++) {
-				buffer[j] = rand();//j; 
+	/*
+		if ((in=fopen(argv[1], "wb")) == NULL) {
+			printf( "Impossible d'ouvrir %s en lecture.\n", argv[1]);
+		}
+		{
+			char buffer[188];
+			u32 j, i, nb_packets = 300;
+			for (i = 0; i < nb_packets; i++) {
+				buffer[0] = 0x47;
+				for (j = 1; j <188; j++) {
+					buffer[j] = rand();//j;
+				}
+				gf_fwrite(buffer, 1, 188, in);
 			}
-			gf_fwrite(buffer, 1, 188, in);
-		}	
-	}
-	fclose(in);	
-	if ((in=fopen(argv[1], "rb")) == NULL) {
-		printf( "Impossible d'ouvrir %s en lecture.\n", argv[1]);
-	}
-			
-	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
-	if (bs == NULL) return;
+		}
+		fclose(in);
+		if ((in=fopen(argv[1], "rb")) == NULL) {
+			printf( "Impossible d'ouvrir %s en lecture.\n", argv[1]);
+		}
 
-	RS_Interleaver(bs, argv[2]);
-	fclose(in);
-	gf_bs_del(bs);
-*/
+		bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
+		if (bs == NULL) return;
+
+		RS_Interleaver(bs, argv[2]);
+		fclose(in);
+		gf_bs_del(bs);
+	*/
 
 
 	if ((in=fopen(argv[1], "rb")) == NULL) {
 		printf( "Impossible d'ouvrir %s en lecture.\n", argv[1]);
 	}
-			
+
 	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
 	if (bs == NULL) return;

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/fmp4demux.vcxproj -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/fmp4demux/fmp4demux.vcxproj Changed

@@ -35,6 +35,7 @@
     <ClCompile Include="..\..\..\src\isomedia\stbl_read.c" />
     <ClCompile Include="..\..\..\src\isomedia\stbl_write.c" />
     <ClCompile Include="..\..\..\src\isomedia\track.c" />
+    <ClCompile Include="..\..\..\src\isomedia\ttml.c" />
     <ClCompile Include="..\..\..\src\isomedia\tx3g.c" />
     <ClCompile Include="..\..\..\src\media_tools\webvtt.c" />
     <ClCompile Include="..\..\..\src\odf\descriptors.c" />
@@ -62,13 +63,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -111,7 +112,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_CORE_TOOLS;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZILB;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZLIB;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>
@@ -153,7 +154,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_CORE_TOOLS;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZILB;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZLIB;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>

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/fmp4demux.vcxproj.filters -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/fmp4demux/fmp4demux.vcxproj.filters Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/fmp4demux/main.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 //#define GPAC_HAVE_CONFIG_H
@@ -86,7 +86,7 @@
 			/* get the track number we want */
 			if (track_number == 0) {
 				track_number = gf_isom_get_track_by_id(reader->movie, reader->track_id);
-			} 
+			}
 
 			/* only if we have the track number can we try to get the sample data */
 			if (track_number != 0) {
@@ -109,7 +109,7 @@
 					gf_mx_v(reader->mutex);
 					//gf_sleep(1000);
 				} else {
-					/* we have some samples, lets keep things stable in the parser for now and 
+					/* we have some samples, lets keep things stable in the parser for now and
 					  don't let the data input force a reparsing of the data */
 					reader->refresh_boxes = GF_FALSE;
 
@@ -119,15 +119,15 @@
 						/* if you want the sample description data, you can call:
 						   GF_Descriptor *desc = gf_isom_get_decoder_config(reader->movie, reader->track_handle, di);
 						*/
-						
+
 						samples_processed++;
 						/*here we dump some sample info: samp->data, samp->dataLength, samp->isRAP, samp->DTS, samp->CTS_Offset */
 						fprintf(stdout, "Found sample #%5d (#%5d) of length %8d, RAP: %d, DTS: "LLD", CTS: "LLD"\r", sample_index, samples_processed, iso_sample->dataLength, iso_sample->IsRAP, iso_sample->DTS, iso_sample->DTS+iso_sample->CTS_Offset);
 						sample_index++;
-						
+
 						/*release the sample data, once you're done with it*/
 						gf_isom_sample_del(&iso_sample);
-						
+
 						/* once we have read all the samples, we can release some data and force a reparse of the input buffer */
 						if (sample_index > sample_count) {
 							u64 new_buffer_start;
@@ -144,7 +144,7 @@
 								u32 offset = (u32)new_buffer_start;
 								memmove(reader->data, reader->data+offset, reader->data_size-offset);
 								reader->valid_data_size -= offset;
-							} 
+							}
 							sprintf(reader->data_url, "gmem://%d@%p", reader->valid_data_size, reader->data);
 							gf_isom_refresh_fragmented(reader->movie, &missing_bytes, reader->data_url);
 #endif
@@ -237,7 +237,7 @@
 	while (1) {
 		/* block the parser until we are done manipulating the data buffer */
 		gf_mx_p(reader.mutex);
-		
+
 		if (reader.valid_data_size + BUFFER_BLOC_SIZE > MAX_BUFFER_SIZE) {
 			/* regulate the reader to limit the max buffer size and let some time to the parser to release buffer data */
 			fprintf(stdout, "Buffer full (%d/%d)- waiting to read next data \r", reader.valid_data_size, reader.data_size);
@@ -248,7 +248,7 @@
 			if (reader.valid_data_size + BUFFER_BLOC_SIZE > reader.data_size) {
 				reader.data = (u8 *)gf_realloc(reader.data, reader.data_size + BUFFER_BLOC_SIZE);
 				reader.data_size += BUFFER_BLOC_SIZE;
-			} 
+			}
 
 			/* read the next bloc of data and update the data buffer url */
 			read_bytes = fread(reader.data+reader.valid_data_size, 1, BUFFER_BLOC_SIZE, input);
@@ -279,7 +279,7 @@
 					fprintf(stdout, "Error opening fragmented mp4 in progressive mode: %s (missing "LLD" bytes)\n", gf_error_to_string(e), missing_bytes);
 					ret = 1;
 					goto exit;
-				} 
+				}
 			} else {
 				/* let inform the parser that the buffer has been updated with new data */
 				e = gf_isom_refresh_fragmented(reader.movie, &missing_bytes, reader.data_url);
@@ -293,7 +293,7 @@
 					goto exit;
 				}
 			}
-		
+
 			//gf_sleep(1);
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/hevcbench/defbench.h -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/hevcbench/defbench.h Changed

@@ -17,7 +17,7 @@
 #include <windows.h>
 #define SDL_MAIN_HANDLED
 #include <SDL.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 
 #define GL_GLEXT_PROTOTYPES
 
@@ -42,7 +42,7 @@
 #define GLDECL(ret, funname, args)	\
 typedef ret (GLAPICAST proc_ ## funname)args;	\
 extern proc_ ## funname funname;	\
-
+ 
 #define GLDECL_STATIC(funname) proc_ ## funname funname = NULL
 
 #if defined GPAC_USE_TINYGL
@@ -51,14 +51,14 @@
 //no extensions with OpenGL ES
 #elif defined(WIN32) || defined (GPAC_CONFIG_WIN32)
 #define LOAD_GL_FUNCS
-#define GET_GLFUN(funname) funname = (proc_ ## funname) wglGetProcAddress(#funname) 
+#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)  
+#define GET_GLFUN(funname) funname = (proc_ ## funname) glutGetProcAddress(#funname)
 #else
 #define LOAD_GL_FUNCS
 extern void (*glXGetProcAddress(const GLubyte *procname))( void );
-#define GET_GLFUN(funname) funname = (proc_ ## funname) glXGetProcAddress(#funname) 
+#define GET_GLFUN(funname) funname = (proc_ ## funname) glXGetProcAddress(#funname)
 #endif

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/hevcbench/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/hevcbench/main.c Changed

@@ -42,8 +42,8 @@
 GLint pixel_format=GL_LUMINANCE;
 GLint texture_type=GL_TEXTURE_RECTANGLE_EXT;
 u32 gl_nb_frames = 1;
-u32 gl_upload_time = 0;
-u32 gl_draw_time = 0;
+u64 gl_upload_time = 0;
+u64 gl_draw_time = 0;
 Bool pbo_mode = GF_TRUE;
 Bool first_tx_load = GF_FALSE;
 Bool use_vsync=0;
@@ -130,15 +130,15 @@
 
 Bool sdl_compile_shader(u32 shader_id, const char *name, const char *source)
 {
-	GLint blen = 0;	
+	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);       
+
+	glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH , &blen);
 	if (blen > 1) {
 		char* compiler_log = (char*) gf_malloc(blen);
 #ifdef CONFIG_DARWIN_GL
@@ -180,7 +180,7 @@
 	render = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
 
 
-#if (COPY_TYPE==5) 
+#if (COPY_TYPE==5)
 	size = stride*height;
 #else
 	size = width*height;
@@ -261,7 +261,7 @@
 
 	glAttachShader(glsl_program, vertex_shader);
 	glAttachShader(glsl_program, fragment_shader);
-	glLinkProgram(glsl_program);  
+	glLinkProgram(glsl_program);
 
 	glGenTextures(3, txid);
 	for (i=0; i<3; i++) {
@@ -277,9 +277,9 @@
 		glTexParameteri(texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP);
 		glTexParameteri(texture_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		glTexParameteri(texture_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	
+
 		if (bpp>8) {
-		    glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
 		} else {
 			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 		}
@@ -287,7 +287,7 @@
 	}
 
 	//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
-	glUseProgram(glsl_program);  
+	glUseProgram(glsl_program);
 	for (i=0; i<3; i++) {
 		const char *txname = (i==0) ? "y_plane" : (i==1) ? "u_plane" : "v_plane";
 		loc = glGetUniformLocation(glsl_program, txname);
@@ -308,7 +308,7 @@
 		glUniform1f(loc, h);
 	}
 
-	glUseProgram(0);  
+	glUseProgram(0);
 
 
 	if (glMapBuffer==NULL) use_pbo = GF_FALSE;
@@ -381,12 +381,12 @@
 void sdl_draw_frame(u8 *pY, u8 *pU, u8 *pV, u32 w, u32 h, u32 bit_depth, u32 stride)
 {
 	u32 needs_stride = 0;
-	u32 now, end;
+	u64 now, end;
 
 	if (stride != w) {
 		if (bit_depth==10) {
 			if (stride != 2*w) {
-				needs_stride = stride;
+				needs_stride = stride / 2;
 			}
 		} else {
 			needs_stride = stride;
@@ -395,7 +395,7 @@
 
 	glEnable(texture_type);
 
-	now = gf_sys_clock();
+	now = gf_sys_clock_high_res();
 
 
 	if (first_tx_load) {
@@ -432,7 +432,7 @@
 #elif (COPY_TYPE==4)
 #else
 		linesize = width*Bpp;
-		p_stride = stride*Bpp;
+		p_stride = stride;
 		count = h;
 #if (COPY_TYPE==2)
 		c2 = linesize/4;
@@ -467,7 +467,7 @@
 #elif (COPY_TYPE==4)
 #else
 		linesize = width*Bpp/2;
-		p_stride = stride*Bpp/2;
+		p_stride = stride/2;
 		count/=2;
 #if (COPY_TYPE==2)
 		c2 /= 2;
@@ -524,10 +524,10 @@
 #endif
 		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
 
-#if (COPY_TYPE!=5)	
+#if (COPY_TYPE!=5)
 		needs_stride=0;
 #endif
-		
+
 
 #if (NO_TEX==0)
 		glBindTexture(texture_type, txid[0] );
@@ -570,7 +570,7 @@
 
 		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 	}
-	end = gf_sys_clock() - now;
+	end = gf_sys_clock_high_res() - now;
 
 	if (!first_tx_load) {
 		gl_nb_frames ++;
@@ -587,7 +587,7 @@
 
 	glActiveTexture(GL_TEXTURE0 );
 	glBindTexture(texture_type, txid[0]);
-		
+
 	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 	glClientActiveTexture(GL_TEXTURE0);
 
@@ -601,7 +601,7 @@
 
 	SDL_GL_SwapWindow(window);
 
-	gl_draw_time += gf_sys_clock() - now;
+	gl_draw_time += gf_sys_clock_high_res() - now;
 	return;
 }
 
@@ -610,42 +610,47 @@
 {
 	Double rate;
 	u32 i, count;
-	u32 start = gf_sys_clock();
+	u64 start = gf_sys_clock_high_res();
 
 	count = 600;
 	for (i=0; i<count; i++) {
-		sdl_draw_frame(pY, pU, pV, width, height, 8, width);
+		sdl_draw_frame(pY, pU, pV, width, height, bpp, width);
 	}
-	
-	start = gf_sys_clock() - start;
+
+	start = gf_sys_clock_high_res() - start;
 	rate = 3*size/2;
+	rate *= count*1000;
 	rate /= start; //in ms
 	rate /= 1000; //==*1000 (in s) / 1000 * 1000 in MB /s
-	fprintf(stdout, "gltext pushed %d frames in %d ms - FPS %g - data rate %g MB/s\n", count, start, 100.0*count/start, rate);
+	fprintf(stdout, "gltext pushed %d frames in %d ms - FPS %g - data rate %g MB/s\n", count, start/1000, 1000000.0*count/start, rate);
 }
 
 void PrintUsage()
 {
 	fprintf(stderr, "USAGE: [OPTS] file.mp4\n"
-			"\n"
-			"Options:\n"
-			"-bench-yuv: only bench YUV upload rate\n"
-			"-sys-mem: uses  copy from decoder mem to system mem before upload (removes stride)\n"
-			"-use-pbo: uses PixelBufferObject for texture transfer\n"
-			"-no-display: disables video output\n"
-			"-nb-threads=N: sets number of frame to N (default N=6)\n"
-			"-mode=[frame|wpp|frame+wpp] : sets threading type (default is frame)\n"
-			);
+	        "\n"
+	        "Options:\n"
+	        "-bench-yuv: only bench YUV upload rate\n"
+	        "-bench-yuv10: only bench YUV10 upload rate\n"
+	        "-sys-mem: uses  copy from decoder mem to system mem before upload (removes stride)\n"
+	        "-use-pbo: uses PixelBufferObject for texture transfer\n"
+	        "-no-display: disables video output\n"
+	        "-nb-threads=N: sets number of frame to N (default N=6)\n"
+	        "-mode=[frame|wpp|frame+wpp] : sets threading type (default is frame)\n"
+	       );
 }
 
+
+
 int main(int argc, char **argv)
 {
 	Bool sdl_bench_yuv = GF_FALSE;
 	Bool no_display = GF_FALSE;
-	u32 start, now, check_prompt;
+	u64 start, now;
+	u32 check_prompt;
 	Bool sdl_is_init=GF_FALSE, run;
 	Bool paused = GF_FALSE;
-	u32 pause_time = 0;
+	u64 pause_time = 0;
 	GF_ISOFile *isom;
 	u32 i, count, track = 0;
 	u32 nb_frames_at_start = 0;
@@ -670,6 +675,7 @@
 			continue;
 		}
 		if (!strcmp(arg, "-bench-yuv")) sdl_bench_yuv=1;
+		else if (!strcmp(arg, "-bench-yuv10")) sdl_bench_yuv=2;
 		else if (!strcmp(arg, "-sys-mem")) use_raw_memory = 0;
 		else if (!strcmp(arg, "-vsync")) use_vsync = 1;
 		else if (!strcmp(arg, "-use-pbo")) use_pbo = 1;
@@ -688,7 +694,7 @@
 		}
 	}
 
-	
+
 
 	/*****************/
 	/*   gpac init   */
@@ -701,16 +707,16 @@
 	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
 
 	if (sdl_bench_yuv) {
-		sdl_init(3840, 2160, 8, 3840, use_pbo);
+		sdl_init(3840, 2160, (sdl_bench_yuv==2) ? 10 : 8, 3840, use_pbo);
 		sdl_bench();
 		sdl_close();
 		gf_sys_close();
 		return 0;
 	}
 	if (!src) {
-			PrintUsage();
-			gf_sys_close();
-			return 0;
+		PrintUsage();
+		gf_sys_close();
+		return 0;
 	}
 
 
@@ -736,14 +742,18 @@
 	}
 
 	count = gf_isom_get_sample_count(isom, track);
-	start = gf_sys_clock();
+	start = gf_sys_clock_high_res();
 
 	esd = gf_isom_get_esd(isom, track, 1);
 	ohevc = libOpenHevcInit(nb_threads, mode);
 	if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 		libOpenHevcCopyExtraData(ohevc, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength+8);
 	}
-    libOpenHevcStartDecoder(ohevc);
+
+	libOpenHevcSetActiveDecoders(ohevc, 1);
+	libOpenHevcSetViewLayers(ohevc, 1);
+
+	libOpenHevcStartDecoder(ohevc);
 	gf_odf_desc_del((GF_Descriptor *)esd);
 	gf_isom_set_sample_padding(isom, track, 8);
 
@@ -755,16 +765,6 @@
 			GF_ISOSample *sample = gf_isom_get_sample(isom, track, i+1, &di);
 
 			if ( libOpenHevcDecode(ohevc, sample->data, sample->dataLength, sample->DTS+sample->CTS_Offset) ) {
-				OpenHevc_Frame_cpy HVCFrame;
-
-				libOpenHevcGetPictureInfo(ohevc, &HVCFrame.frameInfo);
-				if (!sdl_is_init && !no_display) {
-					sdl_init(HVCFrame.frameInfo.nWidth, HVCFrame.frameInfo.nHeight, HVCFrame.frameInfo.nBitDepth, HVCFrame.frameInfo.nYPitch+32, use_pbo);
-					sdl_is_init=1;
-					start = gf_sys_clock();
-					nb_frames_at_start = i+1;
-				}
-			
 				if (no_display) {
 					OpenHevc_Frame HVCFrame_ptr;
 					libOpenHevcGetOutput(ohevc, 1, &HVCFrame_ptr);
@@ -772,21 +772,42 @@
 					OpenHevc_Frame HVCFrame_ptr;
 					libOpenHevcGetOutput(ohevc, 1, &HVCFrame_ptr);
 
-					sdl_draw_frame((u8 *) HVCFrame_ptr.pvY, (u8 *) HVCFrame_ptr.pvU, (u8 *) HVCFrame_ptr.pvV, HVCFrame.frameInfo.nWidth, HVCFrame.frameInfo.nHeight, HVCFrame.frameInfo.nBitDepth, HVCFrame.frameInfo.nYPitch+32);
+
+					if (!sdl_is_init && !no_display) {
+						sdl_init(HVCFrame_ptr.frameInfo.nWidth, HVCFrame_ptr.frameInfo.nHeight, HVCFrame_ptr.frameInfo.nBitDepth, HVCFrame_ptr.frameInfo.nYPitch, use_pbo);
+						sdl_is_init=1;
+						start = gf_sys_clock_high_res();
+						nb_frames_at_start = i+1;
+					}
+
+					sdl_draw_frame((u8 *) HVCFrame_ptr.pvY, (u8 *) HVCFrame_ptr.pvU, (u8 *) HVCFrame_ptr.pvV, HVCFrame_ptr.frameInfo.nWidth, HVCFrame_ptr.frameInfo.nHeight, HVCFrame_ptr.frameInfo.nBitDepth, HVCFrame_ptr.frameInfo.nYPitch);
 				} else {
-					memset(&HVCFrame, 0, sizeof(OpenHevc_Frame) );
+					OpenHevc_Frame_cpy HVCFrame;
+					memset(&HVCFrame, 0, sizeof(OpenHevc_Frame_cpy) );
+
+					libOpenHevcGetPictureInfoCpy(ohevc, &HVCFrame.frameInfo);
+
+					if (!sdl_is_init && !no_display) {
+						sdl_init(HVCFrame.frameInfo.nWidth, HVCFrame.frameInfo.nHeight, HVCFrame.frameInfo.nBitDepth, HVCFrame.frameInfo.nYPitch, use_pbo);
+						sdl_is_init=1;
+						start = gf_sys_clock_high_res();
+						nb_frames_at_start = i+1;
+					}
+
 					HVCFrame.pvY = (void*) pY;
 					HVCFrame.pvU = (void*) pU;
 					HVCFrame.pvV = (void*) pV;
+
 					libOpenHevcGetOutputCpy(ohevc, 1, &HVCFrame);
+
 					sdl_draw_frame(pY, pU, pV, HVCFrame.frameInfo.nWidth, HVCFrame.frameInfo.nHeight, HVCFrame.frameInfo.nBitDepth, HVCFrame.frameInfo.nYPitch);
 				}
 			}
 
 			gf_isom_sample_del(&sample);
 
-			now = gf_sys_clock();
-			fprintf(stderr, "%d %% %d frames in %d ms - FPS %02.2g - push time %d ms - draw %d ms\r", 100*(i+1-nb_frames_at_start)/count, i+1-nb_frames_at_start, now-start, 1000.0 * (i+1-nb_frames_at_start) / (now-start), gl_upload_time / gl_nb_frames , (gl_draw_time - gl_upload_time) / gl_nb_frames ); 
+			now = gf_sys_clock_high_res();
+			fprintf(stderr, "%d %% %d frames in %d ms - FPS %03.2f - push time "LLD" ms - draw "LLD" ms\r", 100*(i+1-nb_frames_at_start)/count, i+1-nb_frames_at_start, (now-start)/1000, 1000000.0 * (i+1-nb_frames_at_start) / (now-start), gl_upload_time / gl_nb_frames/1000 , (gl_draw_time - gl_upload_time) / gl_nb_frames/1000 );
 		} else {
 			gf_sleep(10);
 			i--;
@@ -804,14 +825,14 @@
 				case 'p':
 					if (paused) {
 						paused=0;
-						start += gf_sys_clock()-pause_time;
+						start += gf_sys_clock_high_res()-pause_time;
 					} else {
 						paused = 1;
-						pause_time=gf_sys_clock();
+						pause_time=gf_sys_clock_high_res();
 					}
 					break;
 				case 'r':
-					start = gf_sys_clock();
+					start = gf_sys_clock_high_res();
 					nb_frames_at_start = i+1;
 					gl_upload_time = gl_draw_time = 0;
 					gl_nb_frames=1;
@@ -822,15 +843,15 @@
 			check_prompt=0;
 		}
 	}
-	now = gf_sys_clock();
-	fprintf(stderr, "Decoded %d frames in %d ms - FPS %g\n", i+1, now-start, 1000.0 * (i+1) / (now-start) ); 
+	now = gf_sys_clock_high_res();
+	fprintf(stderr, "\nDecoded %d frames in %d ms - FPS %g\n", i+1, (now-start)/1000, 1000000.0 * (i+1) / (now-start) );
 
 	libOpenHevcClose(ohevc);
 	gf_isom_close(isom);
 
-	if (!no_display) 
+	if (!no_display)
 		sdl_close();
-		
+
 	gf_sys_close();
 	return 1;
 }

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/largefile/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/largefile/main.c Changed

@@ -2,14 +2,14 @@
 
 void PrintUsage()
 {
-	fprintf(stdout, 
-		"Usage: largefile [options]\n"
-		"Option is one of:\n"
-		"-flat        test file writing in flat mode (moov at end)\n"
-		"-inter       test file writing in interleaved mode (moov at begin)\n"
-		"-size size   specifies target media size in GB. Default is 5.0 GB\n"
-		""
-		);
+	fprintf(stdout,
+	        "Usage: largefile [options]\n"
+	        "Option is one of:\n"
+	        "-flat        test file writing in flat mode (moov at end)\n"
+	        "-inter       test file writing in interleaved mode (moov at begin)\n"
+	        "-size size   specifies target media size in GB. Default is 5.0 GB\n"
+	        ""
+	       );
 }
 #define TEST_FILE_NAME	"largefile.mp4"
 
@@ -39,7 +39,7 @@
 
 	nb_samp = (u32) (gb_size*1024);
 	fprintf(stdout, "Creating test file %s - %g GBytes - %d samples - %s mode\n", TEST_FILE_NAME, gb_size, nb_samp, (store_mode == GF_ISOM_OPEN_WRITE) ? "Flat" : "Interleaved");
-	
+
 	movie = gf_isom_open(TEST_FILE_NAME, store_mode, NULL);
 	if (!movie) {
 		fprintf(stdout, "Error creating file: %s\n", gf_error_to_string(gf_isom_last_error(NULL)));
@@ -54,8 +54,8 @@
 	samp = gf_isom_sample_new();
 	samp->dataLength = 1024*1024;
 	samp->data = gf_malloc(sizeof(char)*samp->dataLength);
-  memset(samp->data, 0, sizeof(char)*samp->dataLength);
-  
+	memset(samp->data, 0, sizeof(char)*samp->dataLength);
+
 	for (i=0; i<nb_samp; i++) {
 		if (samp->DTS % 25) samp->IsRAP = 0;
 		else samp->IsRAP = 1;
@@ -72,7 +72,7 @@
 		gf_isom_delete(movie);
 		return 1;
 	}
-	
+
 	fprintf(stdout, "\nDone writing samples\n");
 	e = gf_isom_close(movie);
 	if (e) {

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/loadcompare/loadcompare.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/loadcompare/loadcompare.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/scene_manager.h>
@@ -64,7 +64,7 @@
 	u32 nb;
 	if (lc->spread_repeat) nb = 1;
 	else nb = lc->nbloads ;
-	
+
 	*loadtime = 0;
 	for (i = 0; i< nb; i++) {
 		memset(&load, 0, sizeof(GF_SceneLoader));
@@ -86,7 +86,7 @@
 				*loadtime += endtime-starttime;
 			}
 			gf_sm_load_done(&load);
-		}		
+		}
 		gf_sm_del(load.ctx);
 		gf_sg_del(sg);
 	}
@@ -103,7 +103,7 @@
 	GF_SceneLoader load;
 	GF_SceneGraph *sg;
 	u32 i, starttime, endtime;
-	
+
 	u32 nb;
 	if (lc->spread_repeat) nb = 1;
 	else nb = lc->nbloads ;
@@ -131,7 +131,7 @@
 				*loadtime += endtime-starttime;
 			}
 			gf_sm_load_done(&load);
-		}		
+		}
 		gf_sm_del(load.ctx);
 		gf_sg_del(sg);
 	}
@@ -143,7 +143,7 @@
 	GF_Err e = GF_OK;
 	u32 j;
 	u32 track_id, trackNum;
-	
+
 	*size = 0;
 	track_id = gf_isom_get_track_id(mp4, 1);
 	trackNum = gf_isom_get_track_by_id(mp4, track_id);
@@ -155,7 +155,7 @@
 	return e;
 }
 
-GF_Err encode_laser(GF_LoadCompare *lc, char *item_path, GF_ISOFile *mp4, GF_SMEncodeOptions *opts) 
+GF_Err encode_laser(GF_LoadCompare *lc, char *item_path, GF_ISOFile *mp4, GF_SMEncodeOptions *opts)
 {
 	GF_Err e = GF_OK;
 	GF_SceneLoader load;
@@ -189,7 +189,7 @@
 					} else if (stats->int_res_2d + opts->resolution <= 0) {
 						if (lc->verbose) fprintf(stdout, " Given resolution %d is too low, using %d instead.\n", opts->resolution, stats->int_res_2d - 1);
 						opts->resolution = 1 - stats->int_res_2d;
-					}				
+					}
 					opts->coord_bits = stats->int_res_2d + opts->resolution;
 					if (lc->verbose) fprintf(stdout, " Coordinates & Lengths encoded using ");
 					if (opts->resolution < 0) {
@@ -209,7 +209,7 @@
 				}
 				gf_sm_stats_del(statsman);
 			}
-			
+
 			e = gf_sm_encode_to_file(ctx, mp4, opts);
 			if (e) {
 				fprintf(stderr, "Error while encoding mp4 file\n");
@@ -219,7 +219,7 @@
 			}
 
 			gf_sm_load_done(&load);
-		}		
+		}
 	}
 	gf_sm_del(ctx);
 	gf_sg_del(sg);
@@ -262,7 +262,7 @@
 				e = get_laser_track_size(mp4, size);
 				if (e) {
 					if (lc->verbose) fprintf(stdout, "Could not get MP4 file size\n");
-				} 
+				}
 				gf_isom_close(mp4);
 			}
 		}
@@ -290,7 +290,7 @@
 		e = load_mp4(lc, mp4, loadtime);
 		if (e) {
 			if (lc->verbose) fprintf(stdout, "Could not get MP4 file load time\n");
-		}	
+		}
 	}
 	gf_isom_close(mp4);
 	return e;
@@ -322,7 +322,7 @@
 		e = gf_sm_load_init(&load);
 		if (e) {
 			fprintf(stderr, "Error loading MP4 file\n");
-		} else {		
+		} else {
 			e = gf_sm_load_run(&load);
 			if (e) {
 				fprintf(stderr, "Error loading MP4 file\n");
@@ -350,7 +350,7 @@
 	GF_SceneGraph *sg;
 	u32 i, starttime, endtime;
 	void *p;
-	
+
 	u32 nb;
 	if (lc->spread_repeat) nb = 1;
 	else nb = lc->nbloads ;
@@ -393,7 +393,7 @@
 		if (*size == 0) {
 			if (lc->verbose) fprintf(stdout, "File %s has a size of 0\n", item_path);
 			e = GF_IO_ERR;
-		} 		
+		}
 	}
 	return e;
 }
@@ -452,7 +452,7 @@
 		if (*size == 0) {
 			if (lc->verbose) fprintf(stdout, "File %s has a size of 0\n", gz_path);
 			e = GF_IO_ERR;
-		} 
+		}
 	}
 	return e;
 }
@@ -514,7 +514,7 @@
 	fflush(lc->out);
 }
 
-Bool loadcompare_one(void *cbck, char *item_name, char *item_path)
+Bool loadcompare_one(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	GF_Err e;
 	GF_LoadCompare *lc = cbck;
@@ -573,9 +573,9 @@
 		if (e) return 1;
 		ld->track_loadtime += loadtime;
 
-/*		e = get_decoded_svg_loadtime_and_size(lc, item_name, item_path, &loadtime, &ld->decoded_size);
-		if (e) return 1;
-		ld->decoded_loadtime += loadtime;*/
+		/*		e = get_decoded_svg_loadtime_and_size(lc, item_name, item_path, &loadtime, &ld->decoded_size);
+				if (e) return 1;
+				ld->decoded_loadtime += loadtime;*/
 
 	} else if (lc->type == XMT) {
 		e = gpacctx_load_file(lc, item_path, &loadtime);
@@ -590,7 +590,7 @@
 	return 0;
 }
 
-void usage() 
+void usage()
 {
 	fprintf(stdout, "Compare LASeR and SVG encoding size and loading time\n");
 	fprintf(stdout, "usage: (-out output_result) (-single input.svg | -dir dir) (-nloads X) (-verbose X)\n");
@@ -611,7 +611,7 @@
 	memset(&lc, 0, sizeof(GF_LoadCompare));
 	lc.nbloads = 1;
 	lc.out = stdout;
-	
+
 	for (i = 1; i < (u32) argc ; i++) {
 		arg = argv[i];
 		if (!stricmp(arg, "-out")) {
@@ -641,7 +641,7 @@
 		} else {
 			usage();
 			return -1;
-		}	
+		}
 	}
 
 	gf_sys_init();
@@ -690,7 +690,7 @@
 		}
 	}
 	gf_list_del(lc.data);
-		
+
 	if (lc.out) fclose(lc.out);
 	gf_sys_close();
 	return 0;

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/mpedemux/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/mpedemux/main.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2007-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/mpegts.h>
@@ -60,15 +60,15 @@
 		/* called when an MPEG-4 SL-packet is parsed */
 		break;
 	case GF_M2TS_EVT_IP_DATAGRAM:
-		/* called when an IP packet is parsed 
-			TODO: send this packet on the right socket */		
+		/* called when an IP packet is parsed
+			TODO: send this packet on the right socket */
 		break;
 	}
 }
 
-static void usage() 
+static void usage()
 {
-		fprintf(stdout, "mpedemux input.ts\n");
+	fprintf(stdout, "mpedemux input.ts\n");
 }
 
 int main(int argc, char **argv)

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/mpeg2ts/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/mpeg2ts/main.c Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/segmp4demux/main.c Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/segmp4demux.vcxproj -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/segmp4demux/segmp4demux.vcxproj Changed

@@ -35,6 +35,7 @@
     <ClCompile Include="..\..\..\src\isomedia\stbl_read.c" />
     <ClCompile Include="..\..\..\src\isomedia\stbl_write.c" />
     <ClCompile Include="..\..\..\src\isomedia\track.c" />
+    <ClCompile Include="..\..\..\src\isomedia\ttml.c" />
     <ClCompile Include="..\..\..\src\isomedia\tx3g.c" />
     <ClCompile Include="..\..\..\src\media_tools\webvtt.c" />
     <ClCompile Include="..\..\..\src\odf\descriptors.c" />
@@ -61,13 +62,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -110,7 +111,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_CORE_TOOLS;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZILB;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZLIB;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>

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/segmp4demux.vcxproj.filters -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/segmp4demux/segmp4demux.vcxproj.filters Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/svg2bifs/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/testapps/svg2bifs/main.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -31,7 +31,7 @@
 
 typedef struct {
 	GF_SAXParser *sax_parser;
-	
+
 	GF_SceneGraph *svg_sg;
 	GF_Node *svg_parent;
 	SVGAllAttributes all_atts;
@@ -79,13 +79,13 @@
 	M_LinearGradient *lg;
 
 	app = (M_Appearance *)gf_node_new(sg, TAG_MPEG4_Appearance);
-	
+
 	app->material = gf_node_new(sg, TAG_MPEG4_Material2D);
 	mat = (M_Material2D *)app->material;
 	gf_node_register((GF_Node*)mat, (GF_Node*)app);
-	
+
 	if (svg_props->fill->type == SVG_PAINT_NONE) {
-		mat->filled = 0;	
+		mat->filled = 0;
 	} else {
 		mat->filled = 1;
 		if (svg_props->fill->type == SVG_PAINT_COLOR) {
@@ -110,12 +110,12 @@
 
 	mat->transparency = FIX_ONE - svg_props->fill_opacity->value;
 
-	if (svg_props->stroke->type != SVG_PAINT_NONE && 
-		svg_props->stroke_width->value != 0) {
+	if (svg_props->stroke->type != SVG_PAINT_NONE &&
+	        svg_props->stroke_width->value != 0) {
 		mat->lineProps = gf_node_new(sg, TAG_MPEG4_XLineProperties);
-		xlp = (M_XLineProperties *)mat->lineProps;	
+		xlp = (M_XLineProperties *)mat->lineProps;
 		gf_node_register((GF_Node*)xlp, (GF_Node*)mat);
-		
+
 		xlp->width = svg_props->stroke_width->value;
 
 		if (svg_props->stroke->type == SVG_PAINT_COLOR) {
@@ -149,7 +149,7 @@
 		}
 		xlp->miterLimit = svg_props->stroke_miterlimit->value;
 	}
-	
+
 	return (GF_Node*)app;
 }
 
@@ -168,7 +168,7 @@
 		tr->myx = svg_tr->mat.m[3];
 		tr->myy = svg_tr->mat.m[4];
 		tr->ty  = svg_tr->mat.m[5];
-	} 
+	}
 	return (GF_Node *)tr;
 
 }
@@ -188,15 +188,15 @@
 	u8 anim_value_type = 0;
 
 	if (anim->resolve_stage==0) {
-		/* Stage 0: parsing the animation attribute values 
+		/* Stage 0: parsing the animation attribute values
 					for that we need to resolve the target first */
-		if (!anim->target) 
+		if (!anim->target)
 			anim->target = (SVG_Element *) gf_sg_find_node_by_name(sg, anim->target_id + 1);
 
 		if (!anim->target) {
 			/* the target is still not known stay in stage 0 */
 			return;
-		} else { 
+		} else {
 			XMLRI *iri;
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_XLINK_ATT_href, 1, 0, &info);
 			iri = (XMLRI *)info.far_ptr;
@@ -254,15 +254,15 @@
 		if (anim->to) {
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_to, 1, 0, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->to, anim_value_type);
-		} 
+		}
 		if (anim->from) {
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_from, 1, 0, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->from, anim_value_type);
-		} 
+		}
 		if (anim->by) {
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_by, 1, 0, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->by, anim_value_type);
-		} 
+		}
 		if (anim->values) {
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_values, 1, 0, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->values, anim_value_type);
@@ -288,10 +288,10 @@
 		gf_node_register((GF_Node *)elt, NULL);
 		gf_sg_set_root_node(converter->svg_sg, (GF_Node *)elt);
 	} else {
-		gf_node_register((GF_Node *)elt, converter->svg_parent);	
+		gf_node_register((GF_Node *)elt, converter->svg_parent);
 		//gf_node_list_add_child(&((GF_ParentNode*)converter->svg_parent)->children, (GF_Node *)elt);
 	}
-	
+
 //	fprintf(stdout, "Converting %s\n", gf_node_get_class_name((GF_Node *)elt));
 //	if (converter->bifs_parent) fprintf(stdout, "%s\n", gf_node_get_class_name(converter->bifs_parent));
 
@@ -339,7 +339,7 @@
 
 	memset(&converter->all_atts, 0, sizeof(SVGAllAttributes));
 	gf_svg_flatten_attributes(elt, &converter->all_atts);
-	
+
 	backup_props = gf_malloc(sizeof(SVGPropertiesPointers));
 	memcpy(backup_props, &converter->svg_props, sizeof(SVGPropertiesPointers));
 	gf_node_set_private((GF_Node *)elt, backup_props);
@@ -401,7 +401,7 @@
 			{
 				M_Background2D *b = (M_Background2D *)child;
 				b->backColor.red = FIX_ONE;
-				b->backColor.green = FIX_ONE;				
+				b->backColor.green = FIX_ONE;
 				b->backColor.blue = FIX_ONE;
 			}
 
@@ -418,261 +418,321 @@
 		}
 	} else {
 		GF_Node *node, *child;
-		
+
 		node = converter->bifs_parent;
 
 		switch(tag) {
 		case TAG_SVG_g:
-			{
-				if (converter->all_atts.transform) {
-					node = add_transform_matrix(converter, node);
-					converter->bifs_parent = node;
-				} else {
-					M_Group *g = (M_Group*)gf_node_new(converter->bifs_sg, TAG_MPEG4_Group);
-					gf_node_register((GF_Node *)g, node);
-					gf_node_list_add_child(&((GF_ParentNode*)node)->children, (GF_Node *)g);
-					node = (GF_Node *)g;
-					converter->bifs_parent = node;
-				}
+		{
+			if (converter->all_atts.transform) {
+				node = add_transform_matrix(converter, node);
+				converter->bifs_parent = node;
+			} else {
+				M_Group *g = (M_Group*)gf_node_new(converter->bifs_sg, TAG_MPEG4_Group);
+				gf_node_register((GF_Node *)g, node);
+				gf_node_list_add_child(&((GF_ParentNode*)node)->children, (GF_Node *)g);
+				node = (GF_Node *)g;
+				converter->bifs_parent = node;
 			}
-			break;
+		}
+		break;
 		case TAG_SVG_rect:
-			{
-				Bool is_parent_set = 0;
-				if (converter->all_atts.transform) {
-					node = add_transform_matrix(converter, node);
+		{
+			Bool is_parent_set = 0;
+			if (converter->all_atts.transform) {
+				node = add_transform_matrix(converter, node);
+				converter->bifs_parent = node;
+				is_parent_set = 1;
+			}
+			if (converter->force_transform) {
+				node = add_transform2d(converter, node);
+				if (!is_parent_set) {
 					converter->bifs_parent = node;
 					is_parent_set = 1;
-				} 
-				if (converter->force_transform) {					
-					node = add_transform2d(converter, node);
-					if (!is_parent_set) {
-						converter->bifs_parent = node;
-						is_parent_set = 1;
-					}
 				}
-				if (converter->all_atts.x || converter->all_atts.y) {
-					child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
-					gf_node_register(child, node);
-					gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-					node = child;
-					child = NULL;
-					if (!is_parent_set) {
-						converter->bifs_parent = node;
-						is_parent_set = 1;
-					}
-					{
-						M_Transform2D *tr = (M_Transform2D *)node;
-						if (converter->all_atts.x) tr->translation.x = converter->all_atts.x->value + (converter->all_atts.width?converter->all_atts.width->value/2:0);
-						if (converter->all_atts.y) tr->translation.y = converter->all_atts.y->value + (converter->all_atts.height?converter->all_atts.height->value/2:0);
-					}
-				} 
-				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
+			}
+			if (converter->all_atts.x || converter->all_atts.y) {
+				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
 				gf_node_register(child, node);
 				gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
 				node = child;
 				child = NULL;
-				if (!is_parent_set) converter->bifs_parent = node;
+				if (!is_parent_set) {
+					converter->bifs_parent = node;
+					is_parent_set = 1;
+				}
 				{
-					M_Shape *shape = (M_Shape *)node;
-					shape->geometry = gf_node_new(converter->bifs_sg, TAG_MPEG4_Rectangle);
-					gf_node_register(shape->geometry, (GF_Node *)shape);
-					{
-						M_Rectangle *rect = (M_Rectangle *)shape->geometry;
-						if (converter->all_atts.width) rect->size.x = converter->all_atts.width->value;
-						if (converter->all_atts.height) rect->size.y = converter->all_atts.height->value;					
-					}			
-					
-					shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
-					gf_node_register(shape->appearance, (GF_Node *)shape);
+					M_Transform2D *tr = (M_Transform2D *)node;
+					if (converter->all_atts.x) tr->translation.x = converter->all_atts.x->value + (converter->all_atts.width?converter->all_atts.width->value/2:0);
+					if (converter->all_atts.y) tr->translation.y = converter->all_atts.y->value + (converter->all_atts.height?converter->all_atts.height->value/2:0);
 				}
 			}
-			break;
-		case TAG_SVG_path:
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
+			gf_node_register(child, node);
+			gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			node = child;
+			child = NULL;
+			if (!is_parent_set) converter->bifs_parent = node;
 			{
-				Bool is_parent_set = 0;
-				if (converter->all_atts.transform) {
-					node = add_transform_matrix(converter, node);
+				M_Shape *shape = (M_Shape *)node;
+				shape->geometry = gf_node_new(converter->bifs_sg, TAG_MPEG4_Rectangle);
+				gf_node_register(shape->geometry, (GF_Node *)shape);
+				{
+					M_Rectangle *rect = (M_Rectangle *)shape->geometry;
+					if (converter->all_atts.width) rect->size.x = converter->all_atts.width->value;
+					if (converter->all_atts.height) rect->size.y = converter->all_atts.height->value;
+				}
+
+				shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
+				gf_node_register(shape->appearance, (GF_Node *)shape);
+			}
+		}
+		break;
+		case TAG_SVG_path:
+		{
+			Bool is_parent_set = 0;
+			if (converter->all_atts.transform) {
+				node = add_transform_matrix(converter, node);
+				converter->bifs_parent = node;
+				is_parent_set = 1;
+			}
+			if (converter->force_transform) {
+				node = add_transform2d(converter, node);
+				if (!is_parent_set) {
 					converter->bifs_parent = node;
 					is_parent_set = 1;
-				} 
-				if (converter->force_transform) {					
-					node = add_transform2d(converter, node);
-					if (!is_parent_set) {
-						converter->bifs_parent = node;
-						is_parent_set = 1;
-					}
 				}
-				if (converter->all_atts.x || converter->all_atts.y) {
-					child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
-					gf_node_register(child, node);
-					gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-					node = child;
-					child = NULL;
-					if (!is_parent_set) {
-						converter->bifs_parent = node;
-						is_parent_set = 1;
-					}
-					{
-						M_Transform2D *tr = (M_Transform2D *)node;
-						if (converter->all_atts.x) tr->translation.x = converter->all_atts.x->value;
-						if (converter->all_atts.y) tr->translation.y = converter->all_atts.y->value;
-					}
-				} 
-				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
+			}
+			if (converter->all_atts.x || converter->all_atts.y) {
+				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
 				gf_node_register(child, node);
 				gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
 				node = child;
 				child = NULL;
-				if (!is_parent_set) converter->bifs_parent = node;
+				if (!is_parent_set) {
+					converter->bifs_parent = node;
+					is_parent_set = 1;
+				}
 				{
-					M_Shape *shape = (M_Shape *)node;
-					shape->geometry = gf_node_new(converter->bifs_sg, TAG_MPEG4_XCurve2D);
-					gf_node_register(shape->geometry, (GF_Node *)shape);
-					if (converter->all_atts.d) {
-						M_Coordinate2D *c2d;
-						M_XCurve2D *xc = (M_XCurve2D *)shape->geometry;
-						u32 i, j, c, k;
-
-						xc->point = gf_node_new(converter->bifs_sg, TAG_MPEG4_Coordinate2D);
-						c2d = (M_Coordinate2D *)xc->point;
-						gf_node_register(xc->point, (GF_Node *)xc);
-						
-						gf_sg_vrml_mf_alloc(&c2d->point, GF_SG_VRML_MFVEC2F, converter->all_atts.d->n_points);
-						gf_sg_vrml_mf_alloc(&xc->type, GF_SG_VRML_MFINT32, converter->all_atts.d->n_points);
-
-						c = 0;
-						k = 0;
-						j = 0;
-						c2d->point.vals[k] = converter->all_atts.d->points[0];
-						k++;
-						xc->type.vals[0] = 0;
-						for (i = 1; i < converter->all_atts.d->n_points; ) {
-							switch(converter->all_atts.d->tags[i]) {
-							case GF_PATH_CURVE_ON:
-								c2d->point.vals[k] = converter->all_atts.d->points[i];
-								k++;
-
-								if (i-1 == converter->all_atts.d->contours[c]) {
-									xc->type.vals[j] = 0;
-									c++;
-								} else {
-									xc->type.vals[j] = 1;
-								}
-								i++;
-								break;
-							case GF_PATH_CURVE_CUBIC:
-								c2d->point.vals[k] = converter->all_atts.d->points[i];
-								c2d->point.vals[k+1] = converter->all_atts.d->points[i+1];
-								c2d->point.vals[k+2] = converter->all_atts.d->points[i+2];
-								k+=3;
-
-								xc->type.vals[j] = 2;
-								if (converter->all_atts.d->tags[i+2]==GF_PATH_CLOSE)  {
-									j++;
-									xc->type.vals[j] = 6;
-								}
-								i+=3;
-								break;
-							case GF_PATH_CLOSE:
+					M_Transform2D *tr = (M_Transform2D *)node;
+					if (converter->all_atts.x) tr->translation.x = converter->all_atts.x->value;
+					if (converter->all_atts.y) tr->translation.y = converter->all_atts.y->value;
+				}
+			}
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
+			gf_node_register(child, node);
+			gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			node = child;
+			child = NULL;
+			if (!is_parent_set) converter->bifs_parent = node;
+			{
+				M_Shape *shape = (M_Shape *)node;
+				shape->geometry = gf_node_new(converter->bifs_sg, TAG_MPEG4_XCurve2D);
+				gf_node_register(shape->geometry, (GF_Node *)shape);
+				if (converter->all_atts.d) {
+					M_Coordinate2D *c2d;
+					M_XCurve2D *xc = (M_XCurve2D *)shape->geometry;
+					u32 i, j, c, k;
+
+					xc->point = gf_node_new(converter->bifs_sg, TAG_MPEG4_Coordinate2D);
+					c2d = (M_Coordinate2D *)xc->point;
+					gf_node_register(xc->point, (GF_Node *)xc);
+
+					gf_sg_vrml_mf_alloc(&c2d->point, GF_SG_VRML_MFVEC2F, converter->all_atts.d->n_points);
+					gf_sg_vrml_mf_alloc(&xc->type, GF_SG_VRML_MFINT32, converter->all_atts.d->n_points);
+
+					c = 0;
+					k = 0;
+					j = 0;
+					c2d->point.vals[k] = converter->all_atts.d->points[0];
+					k++;
+					xc->type.vals[0] = 0;
+					for (i = 1; i < converter->all_atts.d->n_points; ) {
+						switch(converter->all_atts.d->tags[i]) {
+						case GF_PATH_CURVE_ON:
+							c2d->point.vals[k] = converter->all_atts.d->points[i];
+							k++;
+
+							if (i-1 == converter->all_atts.d->contours[c]) {
+								xc->type.vals[j] = 0;
+								c++;
+							} else {
+								xc->type.vals[j] = 1;
+							}
+							i++;
+							break;
+						case GF_PATH_CURVE_CUBIC:
+							c2d->point.vals[k] = converter->all_atts.d->points[i];
+							c2d->point.vals[k+1] = converter->all_atts.d->points[i+1];
+							c2d->point.vals[k+2] = converter->all_atts.d->points[i+2];
+							k+=3;
+
+							xc->type.vals[j] = 2;
+							if (converter->all_atts.d->tags[i+2]==GF_PATH_CLOSE)  {
+								j++;
+								xc->type.vals[j] = 6;
+							}
+							i+=3;
+							break;
+						case GF_PATH_CLOSE:
+							xc->type.vals[j] = 6;
+							i++;
+							break;
+						case GF_PATH_CURVE_CONIC:
+							c2d->point.vals[k] = converter->all_atts.d->points[i];
+							c2d->point.vals[k+1] = converter->all_atts.d->points[i+1];
+							k+=2;
+
+							xc->type.vals[j] = 7;
+							if (converter->all_atts.d->tags[i+1]==GF_PATH_CLOSE)  {
+								j++;
 								xc->type.vals[j] = 6;
-								i++;
-								break;
-							case GF_PATH_CURVE_CONIC:
-								c2d->point.vals[k] = converter->all_atts.d->points[i];
-								c2d->point.vals[k+1] = converter->all_atts.d->points[i+1];
-								k+=2;
-
-								xc->type.vals[j] = 7;
-								if (converter->all_atts.d->tags[i+1]==GF_PATH_CLOSE)  {
-									j++;
-									xc->type.vals[j] = 6;
-								}
-								i+=2;
-								break;
 							}
-							j++;
+							i+=2;
+							break;
 						}
-						xc->type.count = j;
-						c2d->point.count = k;
-					}			
-					
-					shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
-					gf_node_register(shape->appearance, (GF_Node *)shape);
+						j++;
+					}
+					xc->type.count = j;
+					c2d->point.count = k;
 				}
+
+				shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
+				gf_node_register(shape->appearance, (GF_Node *)shape);
 			}
-			break;
+		}
+		break;
 		case TAG_SVG_polyline:
-			{
-				Bool is_parent_set = 0;
-				if (converter->all_atts.transform) {
-					node = add_transform_matrix(converter, node);
+		{
+			Bool is_parent_set = 0;
+			if (converter->all_atts.transform) {
+				node = add_transform_matrix(converter, node);
+				converter->bifs_parent = node;
+				is_parent_set = 1;
+			}
+			if (converter->force_transform) {
+				node = add_transform2d(converter, node);
+				if (!is_parent_set) {
 					converter->bifs_parent = node;
 					is_parent_set = 1;
-				} 
-				if (converter->force_transform) {					
-					node = add_transform2d(converter, node);
-					if (!is_parent_set) {
-						converter->bifs_parent = node;
-						is_parent_set = 1;
-					}
 				}
-				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
-				gf_node_register(child, node);
-				gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-				node = child;
-				child = NULL;
-				if (!is_parent_set) converter->bifs_parent = node;
-				{
-					M_Shape *shape = (M_Shape *)node;
-					shape->geometry = gf_node_new(converter->bifs_sg, TAG_MPEG4_IndexedFaceSet2D);
-					gf_node_register(shape->geometry, (GF_Node *)shape);
-					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;
-						gf_node_register(ifs->coord, (GF_Node *)ifs);
-						
-						gf_sg_vrml_mf_alloc(&c2d->point, GF_SG_VRML_MFVEC2F, gf_list_count(*converter->all_atts.points));
-						for (i = 0; i < gf_list_count(*converter->all_atts.points); i++) {
-							SVG_Point *p = (SVG_Point *)gf_list_get(*converter->all_atts.points, i);
-							c2d->point.vals[i].x = p->x;
-							c2d->point.vals[i].y = p->y;
-						}						
-					}			
-					
-					shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
-					gf_node_register(shape->appearance, (GF_Node *)shape);
+			}
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
+			gf_node_register(child, node);
+			gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			node = child;
+			child = NULL;
+			if (!is_parent_set) converter->bifs_parent = node;
+			{
+				M_Shape *shape = (M_Shape *)node;
+				shape->geometry = gf_node_new(converter->bifs_sg, TAG_MPEG4_IndexedFaceSet2D);
+				gf_node_register(shape->geometry, (GF_Node *)shape);
+				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;
+					gf_node_register(ifs->coord, (GF_Node *)ifs);
+
+					gf_sg_vrml_mf_alloc(&c2d->point, GF_SG_VRML_MFVEC2F, gf_list_count(*converter->all_atts.points));
+					for (i = 0; i < gf_list_count(*converter->all_atts.points); i++) {
+						SVG_Point *p = (SVG_Point *)gf_list_get(*converter->all_atts.points, i);
+						c2d->point.vals[i].x = p->x;
+						c2d->point.vals[i].y = p->y;
+					}
 				}
+
+				shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
+				gf_node_register(shape->appearance, (GF_Node *)shape);
 			}
-			break;
+		}
+		break;
 		case TAG_SVG_text:
-			{
-				Bool is_parent_set = 0;
-				if (converter->all_atts.transform) {
-					node = add_transform_matrix(converter, node);
+		{
+			Bool is_parent_set = 0;
+			if (converter->all_atts.transform) {
+				node = add_transform_matrix(converter, node);
+				converter->bifs_parent = node;
+				is_parent_set = 1;
+			}
+			if (converter->force_transform) {
+				node = add_transform2d(converter, node);
+				if (!is_parent_set) {
 					converter->bifs_parent = node;
 					is_parent_set = 1;
 				}
-				if (converter->force_transform) {					
-					node = add_transform2d(converter, node);
-					if (!is_parent_set) {
-						converter->bifs_parent = node;
-						is_parent_set = 1;
-					}
-				}
+			}
 
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
+			gf_node_register(child, node);
+			gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			{
+				M_Transform2D *tr = (M_Transform2D *)child;
+				if (converter->all_atts.text_x) tr->translation.x = ((SVG_Coordinate *)gf_list_get(*converter->all_atts.text_x, 0))->value;
+				if (converter->all_atts.text_y) tr->translation.y = ((SVG_Coordinate *)gf_list_get(*converter->all_atts.text_y, 0))->value;
+				tr->scale.y = -FIX_ONE;
+			}
+			node = child;
+			child = NULL;
+			if (!is_parent_set) {
+				converter->bifs_parent = node;
+				is_parent_set = 1;
+			}
+
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
+			gf_node_register(child, node);
+			gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			node = child;
+			child = NULL;
+			if (!is_parent_set) converter->bifs_parent = node;
+			{
+				M_FontStyle *fs;
+				M_Text *text;
+				M_Shape *shape = (M_Shape *)node;
+				text = (M_Text *)gf_node_new(converter->bifs_sg, TAG_MPEG4_Text);
+				shape->geometry = (GF_Node *)text;
+				converter->bifs_text_node = shape->geometry;
+				gf_node_register(shape->geometry, (GF_Node *)shape);
+
+				fs = (M_FontStyle *)gf_node_new(converter->bifs_sg, TAG_MPEG4_XFontStyle);
+				gf_node_register((GF_Node *)fs, (GF_Node*)text);
+				text->fontStyle = (GF_Node *)fs;
+
+				gf_sg_vrml_mf_alloc(&fs->family, GF_SG_VRML_MFSTRING, 1);
+				fs->family.vals[0] = gf_strdup(converter->svg_props.font_family->value);
+				fs->size = converter->svg_props.font_size->value;
+
+				shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
+				gf_node_register(shape->appearance, (GF_Node *)shape);
+			}
+		}
+		break;
+		case TAG_SVG_ellipse:
+		case TAG_SVG_circle:
+		{
+			Bool is_parent_set = 0;
+			if (converter->all_atts.transform) {
+				node = add_transform_matrix(converter, node);
+				converter->bifs_parent = node;
+				is_parent_set = 1;
+			}
+			if (converter->force_transform) {
+				node = add_transform2d(converter, node);
+				if (!is_parent_set) {
+					converter->bifs_parent = node;
+					is_parent_set = 1;
+				}
+			}
+			if (converter->all_atts.cx || converter->all_atts.cy) {
 				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
 				gf_node_register(child, node);
 				gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
 				{
 					M_Transform2D *tr = (M_Transform2D *)child;
-					if (converter->all_atts.text_x) tr->translation.x = ((SVG_Coordinate *)gf_list_get(*converter->all_atts.text_x, 0))->value;
-					if (converter->all_atts.text_y) tr->translation.y = ((SVG_Coordinate *)gf_list_get(*converter->all_atts.text_y, 0))->value;
-					tr->scale.y = -FIX_ONE;
+					if (converter->all_atts.cx) tr->translation.x = converter->all_atts.cx->value;
+					if (converter->all_atts.cy) tr->translation.y = converter->all_atts.cy->value;
 				}
 				node = child;
 				child = NULL;
@@ -680,295 +740,235 @@
 					converter->bifs_parent = node;
 					is_parent_set = 1;
 				}
-
-				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
-				gf_node_register(child, node);
-				gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-				node = child;
-				child = NULL;
-				if (!is_parent_set) converter->bifs_parent = node;
-				{
-					M_FontStyle *fs;
-					M_Text *text; 
-					M_Shape *shape = (M_Shape *)node;
-					text = (M_Text *)gf_node_new(converter->bifs_sg, TAG_MPEG4_Text);
-					shape->geometry = (GF_Node *)text;
-					converter->bifs_text_node = shape->geometry;
-					gf_node_register(shape->geometry, (GF_Node *)shape);
-					
-					fs = (M_FontStyle *)gf_node_new(converter->bifs_sg, TAG_MPEG4_XFontStyle);
-					gf_node_register((GF_Node *)fs, (GF_Node*)text);
-					text->fontStyle = (GF_Node *)fs;
-
-					gf_sg_vrml_mf_alloc(&fs->family, GF_SG_VRML_MFSTRING, 1);				
-					fs->family.vals[0] = gf_strdup(converter->svg_props.font_family->value);				
-					fs->size = converter->svg_props.font_size->value;
-
-					shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
-					gf_node_register(shape->appearance, (GF_Node *)shape);
-				}
 			}
-			break;
-		case TAG_SVG_ellipse:
-		case TAG_SVG_circle:
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
+			gf_node_register(child, node);
+			gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			node = child;
+			child = NULL;
+			if (!is_parent_set) converter->bifs_parent = node;
 			{
-				Bool is_parent_set = 0;
-				if (converter->all_atts.transform) {
-					node = add_transform_matrix(converter, node);
-					converter->bifs_parent = node;
-					is_parent_set = 1;
-				}
-				if (converter->force_transform) {					
-					node = add_transform2d(converter, node);
-					if (!is_parent_set) {
-						converter->bifs_parent = node;
-						is_parent_set = 1;
-					}
-				}
-				if (converter->all_atts.cx || converter->all_atts.cy) {
-					child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
-					gf_node_register(child, node);
-					gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-					{
-						M_Transform2D *tr = (M_Transform2D *)child;
-						if (converter->all_atts.cx) tr->translation.x = converter->all_atts.cx->value;
-						if (converter->all_atts.cy) tr->translation.y = converter->all_atts.cy->value;
-					}
-					node = child;
-					child = NULL;
-					if (!is_parent_set) {
-						converter->bifs_parent = node;
-						is_parent_set = 1;
-					}
-				} 
-				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
-				gf_node_register(child, node);
-				gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-				node = child;
-				child = NULL;
-				if (!is_parent_set) converter->bifs_parent = node;
-				{
-					M_Shape *shape = (M_Shape *)node;
-					if (tag == TAG_SVG_ellipse) {
-						M_Ellipse *e = (M_Ellipse *)gf_node_new(converter->bifs_sg, TAG_MPEG4_Ellipse);
-						shape->geometry = (GF_Node *)e;
-						e->radius.x = converter->all_atts.rx->value;
-						e->radius.y = converter->all_atts.ry->value;
-					} else {
-						M_Circle *c = (M_Circle *)gf_node_new(converter->bifs_sg, TAG_MPEG4_Circle);
-						shape->geometry = (GF_Node *)c;
-						c->radius = converter->all_atts.r->value;
-					}
-					gf_node_register(shape->geometry, (GF_Node *)shape);
-					
-					shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
-					gf_node_register(shape->appearance, (GF_Node *)shape);
+				M_Shape *shape = (M_Shape *)node;
+				if (tag == TAG_SVG_ellipse) {
+					M_Ellipse *e = (M_Ellipse *)gf_node_new(converter->bifs_sg, TAG_MPEG4_Ellipse);
+					shape->geometry = (GF_Node *)e;
+					e->radius.x = converter->all_atts.rx->value;
+					e->radius.y = converter->all_atts.ry->value;
+				} else {
+					M_Circle *c = (M_Circle *)gf_node_new(converter->bifs_sg, TAG_MPEG4_Circle);
+					shape->geometry = (GF_Node *)c;
+					c->radius = converter->all_atts.r->value;
 				}
+				gf_node_register(shape->geometry, (GF_Node *)shape);
+
+				shape->appearance = create_appearance(&converter->svg_props, converter->bifs_sg);
+				gf_node_register(shape->appearance, (GF_Node *)shape);
 			}
-			break;
+		}
+		break;
 
 		case TAG_SVG_defs:
+		{
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Switch);
+			gf_node_register(child, node);
+			gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			node = child;
+			child = NULL;
 			{
-				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Switch);
-				gf_node_register(child, node);
-				gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-				node = child;
-				child = NULL;
-				{
-					M_Switch *sw = (M_Switch *)node;
-					sw->whichChoice = -1;
-				}
-				converter->bifs_parent = node;
+				M_Switch *sw = (M_Switch *)node;
+				sw->whichChoice = -1;
 			}
-			break;
+			converter->bifs_parent = node;
+		}
+		break;
 		case TAG_SVG_solidColor:
-			{
-				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
-				gf_node_register(child, node);
-				gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-				node = child;
-				child = NULL;
-				converter->bifs_parent = node;
-			}
-			break;
+		{
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Shape);
+			gf_node_register(child, node);
+			gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			node = child;
+			child = NULL;
+			converter->bifs_parent = node;
+		}
+		break;
 		case TAG_SVG_animateTransform:
+		{
+			GF_Node *child_ts;
+			if (!gf_node_get_id(node)) {
+				gf_node_set_id(node, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
+			}
+
+			child_ts = gf_node_new(converter->bifs_sg, TAG_MPEG4_TimeSensor);
+			if (!gf_node_get_id(child_ts)) {
+				gf_node_set_id(child_ts, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
+			}
+			gf_node_register(child_ts, node);
+			gf_node_list_add_child(&((GF_ParentNode *)node)->children, child_ts);
 			{
-				GF_Node *child_ts;
-				if (!gf_node_get_id(node)) {
-					gf_node_set_id(node, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
+				M_TimeSensor *ts = (M_TimeSensor *)child_ts;
+				if (converter->all_atts.dur) {
+					ts->cycleInterval = converter->all_atts.dur->clock_value;
 				}
-				
-				child_ts = gf_node_new(converter->bifs_sg, TAG_MPEG4_TimeSensor);
-				if (!gf_node_get_id(child_ts)) {
-					gf_node_set_id(child_ts, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
+				if (converter->all_atts.repeatCount && converter->all_atts.repeatCount->type == SMIL_REPEATCOUNT_INDEFINITE) {
+					ts->loop = 1;
 				}
-				gf_node_register(child_ts, node);
-				gf_node_list_add_child(&((GF_ParentNode *)node)->children, child_ts);
-				{
-					M_TimeSensor *ts = (M_TimeSensor *)child_ts;
-					if (converter->all_atts.dur) {
-						ts->cycleInterval = converter->all_atts.dur->clock_value;
-					}
-					if (converter->all_atts.repeatCount && converter->all_atts.repeatCount->type == SMIL_REPEATCOUNT_INDEFINITE) {
-						ts->loop = 1;
+			}
+
+			if (converter->all_atts.transform_type) {
+				GF_FieldInfo fromField, toField;
+
+				switch (*converter->all_atts.transform_type) {
+				case SVG_TRANSFORM_ROTATE:
+					child = gf_node_new(converter->bifs_sg, TAG_MPEG4_PositionInterpolator2D);
+					if (!gf_node_get_id(child)) {
+						gf_node_set_id(child, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
 					}
-				}
-				
-				if (converter->all_atts.transform_type) {
-					GF_FieldInfo fromField, toField;
-
-					switch (*converter->all_atts.transform_type) {
-					case SVG_TRANSFORM_ROTATE:
-						child = gf_node_new(converter->bifs_sg, TAG_MPEG4_PositionInterpolator2D);
-						if (!gf_node_get_id(child)) {
-							gf_node_set_id(child, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
-						}
-						gf_node_register(child, node);
-						gf_node_list_add_child(&((GF_ParentNode *)node)->children, child);
-						
-						gf_node_get_field_by_name(child_ts, "fraction_changed", &fromField);
-						gf_node_get_field_by_name(child, "set_fraction", &toField);
-						gf_sg_route_new(converter->bifs_sg, child_ts, fromField.fieldIndex, child, toField.fieldIndex);
-
-						gf_node_get_field_by_name(child, "value_changed", &fromField);
-						gf_node_get_field_by_name(node, "rotationAngle", &toField);
-						gf_sg_route_new(converter->bifs_sg, child, fromField.fieldIndex, node, toField.fieldIndex);
-						{
-							M_PositionInterpolator2D *pi2d = (M_PositionInterpolator2D *)child;
-							if (converter->all_atts.keyTimes) {
-								SFFloat *g;
-								u32 count, i; 
-								count = gf_list_count(*converter->all_atts.keyTimes);
-								for (i = 0; i < count; i++) {
-									Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
-									gf_sg_vrml_mf_append(&pi2d->key, GF_SG_VRML_MFFLOAT, &g); 
-									*g = *f;
-								}
+					gf_node_register(child, node);
+					gf_node_list_add_child(&((GF_ParentNode *)node)->children, child);
+
+					gf_node_get_field_by_name(child_ts, "fraction_changed", &fromField);
+					gf_node_get_field_by_name(child, "set_fraction", &toField);
+					gf_sg_route_new(converter->bifs_sg, child_ts, fromField.fieldIndex, child, toField.fieldIndex);
+
+					gf_node_get_field_by_name(child, "value_changed", &fromField);
+					gf_node_get_field_by_name(node, "rotationAngle", &toField);
+					gf_sg_route_new(converter->bifs_sg, child, fromField.fieldIndex, node, toField.fieldIndex);
+					{
+						M_PositionInterpolator2D *pi2d = (M_PositionInterpolator2D *)child;
+						if (converter->all_atts.keyTimes) {
+							SFFloat *g;
+							u32 count, i;
+							count = gf_list_count(*converter->all_atts.keyTimes);
+							for (i = 0; i < count; i++) {
+								Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
+								gf_sg_vrml_mf_append(&pi2d->key, GF_SG_VRML_MFFLOAT, &g);
+								*g = *f;
 							}
-							if (converter->all_atts.values) {
-								SFVec2f *g;
-								u32 count, i; 
-								count = gf_list_count(converter->all_atts.values->values);
-								for (i = 0; i < count; i++) {
-									SVG_Point_Angle *p;
-									p = gf_list_get(converter->all_atts.values->values, i);
-									gf_sg_vrml_mf_append(&pi2d->keyValue, GF_SG_VRML_MFVEC2F, &g); 
-									g->x = p->x;
-									g->y = p->y;
-								}
+						}
+						if (converter->all_atts.values) {
+							SFVec2f *g;
+							u32 count, i;
+							count = gf_list_count(converter->all_atts.values->values);
+							for (i = 0; i < count; i++) {
+								SVG_Point_Angle *p;
+								p = gf_list_get(converter->all_atts.values->values, i);
+								gf_sg_vrml_mf_append(&pi2d->keyValue, GF_SG_VRML_MFVEC2F, &g);
+								g->x = p->x;
+								g->y = p->y;
 							}
 						}
+					}
 
 
-						child = gf_node_new(converter->bifs_sg, TAG_MPEG4_ScalarInterpolator);
-						if (!gf_node_get_id(child)) {
-							gf_node_set_id(child, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
-						}
-						gf_node_register(child, node);
-						gf_node_list_add_child(&((GF_ParentNode *)node)->children, child);
-						
-						gf_node_get_field_by_name(child_ts, "fraction_changed", &fromField);
-						gf_node_get_field_by_name(child, "set_fraction", &toField);
-						gf_sg_route_new(converter->bifs_sg, child_ts, fromField.fieldIndex, child, toField.fieldIndex);
-
-						gf_node_get_field_by_name(child, "value_changed", &fromField);
-						gf_node_get_field_by_name(node, "center", &toField);
-						gf_sg_route_new(converter->bifs_sg, child, fromField.fieldIndex, node, toField.fieldIndex);
-
-						{
-							M_ScalarInterpolator *si = (M_ScalarInterpolator *)child;
-							if (converter->all_atts.keyTimes) {
-								SFFloat *g;
-								u32 count, i; 
-								count = gf_list_count(*converter->all_atts.keyTimes);
-								for (i = 0; i < count; i++) {
-									Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
-									gf_sg_vrml_mf_append(&si->key, GF_SG_VRML_MFFLOAT, &g); 
-									*g = *f;
-								}
+					child = gf_node_new(converter->bifs_sg, TAG_MPEG4_ScalarInterpolator);
+					if (!gf_node_get_id(child)) {
+						gf_node_set_id(child, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
+					}
+					gf_node_register(child, node);
+					gf_node_list_add_child(&((GF_ParentNode *)node)->children, child);
+
+					gf_node_get_field_by_name(child_ts, "fraction_changed", &fromField);
+					gf_node_get_field_by_name(child, "set_fraction", &toField);
+					gf_sg_route_new(converter->bifs_sg, child_ts, fromField.fieldIndex, child, toField.fieldIndex);
+
+					gf_node_get_field_by_name(child, "value_changed", &fromField);
+					gf_node_get_field_by_name(node, "center", &toField);
+					gf_sg_route_new(converter->bifs_sg, child, fromField.fieldIndex, node, toField.fieldIndex);
+
+					{
+						M_ScalarInterpolator *si = (M_ScalarInterpolator *)child;
+						if (converter->all_atts.keyTimes) {
+							SFFloat *g;
+							u32 count, i;
+							count = gf_list_count(*converter->all_atts.keyTimes);
+							for (i = 0; i < count; i++) {
+								Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
+								gf_sg_vrml_mf_append(&si->key, GF_SG_VRML_MFFLOAT, &g);
+								*g = *f;
 							}
-							if (converter->all_atts.values) {
-								SFFloat *g;
-								u32 count, i; 
-								count = gf_list_count(converter->all_atts.values->values);
-								for (i = 0; i < count; i++) {
-									SVG_Point_Angle *p;
-									p = gf_list_get(converter->all_atts.values->values, i);
-									gf_sg_vrml_mf_append(&si->keyValue, GF_SG_VRML_MFFLOAT, &g); 
-									*g = p->angle;
-								}
+						}
+						if (converter->all_atts.values) {
+							SFFloat *g;
+							u32 count, i;
+							count = gf_list_count(converter->all_atts.values->values);
+							for (i = 0; i < count; i++) {
+								SVG_Point_Angle *p;
+								p = gf_list_get(converter->all_atts.values->values, i);
+								gf_sg_vrml_mf_append(&si->keyValue, GF_SG_VRML_MFFLOAT, &g);
+								*g = p->angle;
 							}
 						}
+					}
 
-						break;
+					break;
 
-					case SVG_TRANSFORM_SCALE:
-					case SVG_TRANSFORM_TRANSLATE:
-						child = gf_node_new(converter->bifs_sg, TAG_MPEG4_PositionInterpolator2D);
-						if (!gf_node_get_id(child)) {
-							gf_node_set_id(child, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
-						}
-						gf_node_register(child, node);
-						gf_node_list_add_child(&((GF_ParentNode *)node)->children, child);
-
-						gf_node_get_field_by_name(child_ts, "fraction_changed", &fromField);
-						gf_node_get_field_by_name(child, "set_fraction", &toField);
-						gf_sg_route_new(converter->bifs_sg, child_ts, fromField.fieldIndex, child, toField.fieldIndex);
-
-						gf_node_get_field_by_name(child, "value_changed", &fromField);
-						if (*converter->all_atts.transform_type == SVG_TRANSFORM_SCALE) 
-							gf_node_get_field_by_name(node, "scale", &toField);
-						else 
-							gf_node_get_field_by_name(node, "translation", &toField);
-
-						gf_sg_route_new(converter->bifs_sg, child, fromField.fieldIndex, node, toField.fieldIndex);
-						{
-							M_PositionInterpolator2D *pi2d = (M_PositionInterpolator2D *)child;
-							if (converter->all_atts.keyTimes) {
-								SFFloat *g;
-								u32 count, i; 
-								count = gf_list_count(*converter->all_atts.keyTimes);
-								for (i = 0; i < count; i++) {
-									Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
-									gf_sg_vrml_mf_append(&pi2d->key, GF_SG_VRML_MFFLOAT, &g); 
-									*g = *f;
-								}
+				case SVG_TRANSFORM_SCALE:
+				case SVG_TRANSFORM_TRANSLATE:
+					child = gf_node_new(converter->bifs_sg, TAG_MPEG4_PositionInterpolator2D);
+					if (!gf_node_get_id(child)) {
+						gf_node_set_id(child, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);
+					}
+					gf_node_register(child, node);
+					gf_node_list_add_child(&((GF_ParentNode *)node)->children, child);
+
+					gf_node_get_field_by_name(child_ts, "fraction_changed", &fromField);
+					gf_node_get_field_by_name(child, "set_fraction", &toField);
+					gf_sg_route_new(converter->bifs_sg, child_ts, fromField.fieldIndex, child, toField.fieldIndex);
+
+					gf_node_get_field_by_name(child, "value_changed", &fromField);
+					if (*converter->all_atts.transform_type == SVG_TRANSFORM_SCALE)
+						gf_node_get_field_by_name(node, "scale", &toField);
+					else
+						gf_node_get_field_by_name(node, "translation", &toField);
+
+					gf_sg_route_new(converter->bifs_sg, child, fromField.fieldIndex, node, toField.fieldIndex);
+					{
+						M_PositionInterpolator2D *pi2d = (M_PositionInterpolator2D *)child;
+						if (converter->all_atts.keyTimes) {
+							SFFloat *g;
+							u32 count, i;
+							count = gf_list_count(*converter->all_atts.keyTimes);
+							for (i = 0; i < count; i++) {
+								Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
+								gf_sg_vrml_mf_append(&pi2d->key, GF_SG_VRML_MFFLOAT, &g);
+								*g = *f;
 							}
-							if (converter->all_atts.values) {
-								SFVec2f *g;
-								u32 count, i; 
-								count = gf_list_count(converter->all_atts.values->values);
-								for (i = 0; i < count; i++) {
-									SVG_Point *p;
-									p = gf_list_get(converter->all_atts.values->values, i);
-									gf_sg_vrml_mf_append(&pi2d->keyValue, GF_SG_VRML_MFVEC2F, &g); 
-									g->x = p->x;
-									g->y = p->y;
-								}
+						}
+						if (converter->all_atts.values) {
+							SFVec2f *g;
+							u32 count, i;
+							count = gf_list_count(converter->all_atts.values->values);
+							for (i = 0; i < count; i++) {
+								SVG_Point *p;
+								p = gf_list_get(converter->all_atts.values->values, i);
+								gf_sg_vrml_mf_append(&pi2d->keyValue, GF_SG_VRML_MFVEC2F, &g);
+								g->x = p->x;
+								g->y = p->y;
 							}
 						}
-						break;
-					default:
-						fprintf(stdout, "Warning: transformation type not supported \n");						
 					}
-				}				
-				//converter->bifs_parent = node;
+					break;
+				default:
+					fprintf(stdout, "Warning: transformation type not supported \n");
+				}
 			}
-			break;
+			//converter->bifs_parent = node;
+		}
+		break;
 		default:
-			{
-				fprintf(stdout, "Warning: element %s not supported \n", gf_node_get_class_name((GF_Node *)elt));
-				child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
-				gf_node_register(child, node);
-				//gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
-				node = child;
-				child = NULL;
-				converter->bifs_parent = node;
-			}
-			break;
+		{
+			fprintf(stdout, "Warning: element %s not supported \n", gf_node_get_class_name((GF_Node *)elt));
+			child = gf_node_new(converter->bifs_sg, TAG_MPEG4_Transform2D);
+			gf_node_register(child, node);
+			//gf_node_list_add_child(&((GF_ParentNode*)node)->children, child);
+			node = child;
+			child = NULL;
+			converter->bifs_parent = node;
+		}
+		break;
 		}
 
-		if (id_string) 
+		if (id_string)
 			gf_node_set_id(converter->bifs_parent, gf_sg_get_next_available_node_id(converter->bifs_sg), NULL);//gf_node_get_name((GF_Node *)elt));
 
 	}
@@ -988,7 +988,7 @@
 	if (!(gf_node_get_tag(converter->svg_parent) == TAG_SVG_animateTransform))
 		converter->bifs_parent = gf_node_get_parent(converter->bifs_parent, 0);
 	parent = gf_node_get_parent(converter->svg_parent, 0);
-	gf_node_unregister(converter->svg_parent, parent);	
+	gf_node_unregister(converter->svg_parent, parent);
 	if (!parent) gf_sg_set_root_node(converter->svg_sg, NULL);
 	converter->svg_parent = parent;
 	converter->bifs_text_node = NULL;
@@ -1012,7 +1012,7 @@
 	GF_SceneDumper *dump;
 	char *tmp;
 
-	gf_sys_init();
+	gf_sys_init(0);
 
 	GF_SAFEALLOC(converter, SVG2BIFS_Converter);
 
@@ -1030,7 +1030,7 @@
 	fprintf(stdout, "Dumping BIFS scenegraph\n");
 	tmp = strchr(argv[1], '.');
 	tmp[0] = 0;
-	dump = gf_sm_dumper_new(converter->bifs_sg, argv[1], ' ', GF_SM_DUMP_XMTA);
+	dump = gf_sm_dumper_new(converter->bifs_sg, argv[1], ' ', GF_SM_DUMP_BT);
 	tmp[0] = '.';
 
 	gf_sm_dump_graph(dump, 1, 0);
@@ -1042,6 +1042,6 @@
 //	gf_sg_del(converter->bifs_sg);
 
 	gf_xml_sax_del(converter->sax_parser);
-	
+
 	gf_free(converter);
 }

gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/f4m.c -> gpac-0.5.1.svn5491.tar.xz/applications/ts2hds/f4m.c Changed

@@ -13,15 +13,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -47,18 +47,18 @@
 	GF_List *streams;
 };
 
-static GF_Err adobe_gen_stream_manifest(AdobeStream *as) 
-{ 
-	fprintf(as->f, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); 
-	fprintf(as->f, "<manifest xmlns=\"http://ns.adobe.com/f4m/1.0\">\n"); 
-	fprintf(as->f, "<id>%s</id>\n", as->id); 
-	if (as->base_url) 
-		fprintf(as->f, "<baseURL>%s</baseURL>\n", as->base_url); 
-	fprintf(as->f, "<bootstrapInfo profile=\"named\" id=\"boot_%s_%d\" url=\"%s_%d.bootstrap\"/>\n", as->id, as->bitrate, as->id, as->bitrate); 
-	fprintf(as->f, "<media url=\"%s_%u_\" bitrate=\"%u\" bootstrapInfoId=\"boot_%s_%d\"/>\n", as->id, as->bitrate, as->bitrate, as->id, as->bitrate); 
-	fprintf(as->f, "</manifest>\n"); 
-
-	return GF_OK; 
+static GF_Err adobe_gen_stream_manifest(AdobeStream *as)
+{
+	fprintf(as->f, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
+	fprintf(as->f, "<manifest xmlns=\"http://ns.adobe.com/f4m/1.0\">\n");
+	fprintf(as->f, "<id>%s</id>\n", as->id);
+	if (as->base_url)
+		fprintf(as->f, "<baseURL>%s</baseURL>\n", as->base_url);
+	fprintf(as->f, "<bootstrapInfo profile=\"named\" id=\"boot_%s_%d\" url=\"%s_%d.bootstrap\"/>\n", as->id, as->bitrate, as->id, as->bitrate);
+	fprintf(as->f, "<media url=\"%s_%u_\" bitrate=\"%u\" bootstrapInfoId=\"boot_%s_%d\"/>\n", as->id, as->bitrate, as->bitrate, as->id, as->bitrate);
+	fprintf(as->f, "</manifest>\n");
+
+	return GF_OK;
 }
 
 AdobeMultirate *adobe_alloc_multirate_manifest(char *id)
@@ -84,16 +84,16 @@
 		AdobeStream *as = gf_calloc(1, sizeof(AdobeStream));
 		as->id = "HD";
 		as->bitrate = 100;
-		sprintf(filename, "%s_%s_%d.f4m", am->id, as->id, as->bitrate); 
-		as->f = fopen(filename, "wt"); 
-		if (!as->f) { 
-			fprintf(stderr, "Couldn't create Adobe stream manifest file: %s\n", filename); 
-			assert(0); 
-			gf_list_del(am->streams); 
-			gf_free(as); 
-			gf_free(am); 
-			return NULL; 
-		} 
+		sprintf(filename, "%s_%s_%d.f4m", am->id, as->id, as->bitrate);
+		as->f = fopen(filename, "wt");
+		if (!as->f) {
+			fprintf(stderr, "Couldn't create Adobe stream manifest file: %s\n", filename);
+			assert(0);
+			gf_list_del(am->streams);
+			gf_free(as);
+			gf_free(am);
+			return NULL;
+		}
 		gf_list_add(am->streams, as);
 	}
 
@@ -110,8 +110,8 @@
 	for (i=0; i<gf_list_count(am->streams); i++) {
 		AdobeStream *as = gf_list_get(am->streams, i);
 		assert(as);
-		if (as->f) 
-			fclose(as->f); 
+		if (as->f)
+			fclose(as->f);
 		//TODO: base_url and id may be stored as gf_strdup in the future
 		gf_list_rem(am->streams, i);
 		gf_free(as);
@@ -134,7 +134,7 @@
 	fprintf(am->f, "<manifest xmlns=\"http://ns.adobe.com/f4m/2.0\">\n");
 	fprintf(am->f, "<id>%s</id>\n", am->id);
 	fprintf(am->f, "<baseURL>%s</baseURL>\n", am->base_url);
-    fprintf(am->f, "<streamType>live</streamType>\n");
+	fprintf(am->f, "<streamType>live</streamType>\n");
 
 	assert(am->streams);
 	for (i=0; i<gf_list_count(am->streams); i++) {
@@ -159,12 +159,12 @@
 			fclose(bstfile);
 		}
 #endif
-		e = adobe_gen_stream_manifest(as); 
-		if (!e) { 
-			if (!am->base_url && !as->base_url) 
-				fprintf(stderr, "Warning: no base_url specified\n"); 
+		e = adobe_gen_stream_manifest(as);
+		if (!e) {
+			if (!am->base_url && !as->base_url)
+				fprintf(stderr, "Warning: no base_url specified\n");
 
-			fprintf(am->f, "<media href=\"%s_%s_%d.f4m\" bitrate=\"%d\"/>\n", am->id, as->id, as->bitrate, as->bitrate); 
+			fprintf(am->f, "<media href=\"%s_%s_%d.f4m\" bitrate=\"%d\"/>\n", am->id, as->id, as->bitrate, as->bitrate);
 		}
 	}
 	fprintf(am->f, "</manifest>\n");

gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/f4v.c -> gpac-0.5.1.svn5491.tar.xz/applications/ts2hds/f4v.c Changed

gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/ts2hds/main.c Changed

@@ -13,15 +13,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -44,14 +44,14 @@
 #endif
 
 
-static GFINLINE void usage(const char * progname) 
+static GFINLINE void usage(const char * progname)
 {
 	fprintf(stderr, "USAGE: %s -i input -o output\n"
-					"\n"
+	        "\n"
 #ifdef GPAC_MEMORY_TRACKING
-					"\t-mem-track:  enables memory tracker\n"
+	        "\t-mem-track:  enables memory tracker\n"
 #endif
-		);
+	        , progname);
 }
 
 
@@ -84,7 +84,7 @@
 			gf_sys_init(1);
 			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
 #else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n");
 #endif
 		} else {
 			error_msg = "unknown option \"%s\"";
@@ -103,7 +103,7 @@
 		return GF_BAD_PARAM;
 	}
 
-error:	
+error:
 	if (!arg) {
 		fprintf(stderr, "Error: %s\n\n", error_msg);
 	} else {
@@ -118,29 +118,28 @@
 	/*   declarations   */
 	/********************/
 	char *input, *output, tmpstr[GF_MAX_PATH];
-	GF_ISOFile *isom_file_in, *isom_file_out;
+	GF_ISOFile *isom_file_in;
 	GF_MediaImporter import;
 	AdobeHDSCtx ctx;
 	GF_Err e;
 	u32 i;
-	
+
 	/*****************/
 	/*   gpac init   */
 	/*****************/
 	gf_sys_init(0);
 	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-	
+
 	/***********************/
 	/*   initialisations   */
 	/***********************/
 	input = NULL;
 	output = NULL;
 	isom_file_in = NULL;
-	isom_file_out = NULL;
 	memset(&import, 0, sizeof(GF_MediaImporter));
 	e = GF_OK;
 	memset(&ctx, 0, sizeof(ctx));
-	
+
 	ctx.curr_time = 0;
 	ctx.segnum = 1;
 
@@ -265,7 +264,7 @@
 	}
 
 	//interleave data and remove imported file
-	//FIXME: set multiple fragments: 
+	//FIXME: set multiple fragments:
 	sprintf(tmpstr, "%s_HD_100_Seg%u-Frag1", output, ctx.segnum); //FIXME: "HD", "100" and fragnum: pass as arg
 	//e = gf_media_fragment_file(isom_file_in, tmpstr, 1.0);
 	e = gf_media_fragment_file(isom_file_in, tmpstr, 1.0+gf_isom_get_duration(isom_file_in)/gf_isom_get_timescale(isom_file_in));
@@ -299,7 +298,7 @@
 	}
 
 	gf_sys_close();
-	
+
 	return !e ? 0 : 1;
 }

gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/ts2hds.h -> gpac-0.5.1.svn5491.tar.xz/applications/ts2hds/ts2hds.h Changed

gpac-0.5.0.svn5178.tar.bz2/applications/udptsseg/main.c -> gpac-0.5.1.svn5491.tar.xz/applications/udptsseg/main.c Changed

@@ -11,15 +11,15 @@
 *  it under the terms of the GNU Lesser General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
-*   
+*
 *  GPAC is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU Lesser General Public License for more details.
-*   
+*
 *  You should have received a copy of the GNU Lesser General Public
 *  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */
 #include <gpac/media_tools.h>
@@ -31,65 +31,65 @@
 #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;
+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);
-								 }
+	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 = fopen(tmp_manifest, "w");
-								 if (!manifest_fp) {
-									 fprintf(stderr, "Could not create m3u8 manifest file (%s)\n", tmp_manifest);
-									 return GF_BAD_PARAM;
-								 }
+	manifest_fp = 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);
+	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);
-								 }
+	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");
-								 }
-								 fclose(manifest_fp);
+	if (end) {
+		fprintf(manifest_fp, "#EXT-X-ENDLIST\n");
+	}
+	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;
-									 }
-								 }
+	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() 
+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");
+	        "-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)
@@ -120,7 +120,7 @@
 	u32 last_segment_size = 0;
 	u32 read = 0;
 	u32 towrite = 0;
-	u32 leftinbuffer = 0;			
+	u32 leftinbuffer = 0;
 
 	fprintf(stdout, "UDP Transport Stream Segmenter\n");
 
@@ -138,7 +138,7 @@
 	/*****************/
 	for (i = 1; i < (u32) argc ; i++) {
 		arg = argv[i];
-		if (!strnicmp(arg, "-src=udp://",11)) { 
+		if (!strnicmp(arg, "-src=udp://",11)) {
 			char *sep;
 			arg+=11;
 			sep = strchr(arg+6, ':');
@@ -165,7 +165,7 @@
 			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);
@@ -207,12 +207,12 @@
 		}
 		fprintf(stderr, "Processing %s segment\r", segment_name);
 		ts_out = gf_strdup(segment_name);
-		if (!segment_manifest) { 
+		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 = fopen(ts_out, "wb");
 	if (!ts_output_file) {
 		fprintf(stderr, "Error opening %s\n", ts_out);
@@ -240,7 +240,7 @@
 					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;					
+					leftinbuffer -=i;
 				}
 				if ((leftinbuffer % 188) != 0) {
 					fprintf(stderr, "Warning: data in buffer with a size (%d bytes) not multiple of 188 bytes\n", leftinbuffer);
@@ -255,7 +255,7 @@
 			if (ts_output_file != NULL) {
 				u32 now = gf_sys_clock();
 				if (towrite) {
-					gf_fwrite(input_buffer, 1, towrite, ts_output_file); 
+					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);
@@ -263,7 +263,7 @@
 					leftinbuffer -= towrite;
 					last_segment_size += towrite;
 				}
-				if ((now - last_segment_time) > segment_duration*1000) { 
+				if ((now - last_segment_time) > segment_duration*1000) {
 					last_segment_time = now;
 					fclose(ts_output_file);
 					fprintf(stderr, "Closing segment %s (%d bytes)\n", segment_name, last_segment_size);
@@ -284,7 +284,7 @@
 						goto exit;
 					}
 					/* delete the oldest segment */
-					if (segment_number && ((s32) (segment_index - segment_number - 1) >= 0)){
+					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])) {
@@ -298,10 +298,10 @@
 						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);
-				} 
+					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);
+				}
 			}
 
 			//}

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/dashcast.vcxproj -> gpac-0.5.1.svn5491.tar.xz/build/msvc10/dashcast.vcxproj Changed

@@ -84,7 +84,7 @@
     <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;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
@@ -103,7 +103,7 @@
     </ResourceCompile>
     <Link>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.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>
@@ -124,7 +124,7 @@
     <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;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
@@ -142,7 +142,7 @@
     </ResourceCompile>
     <Link>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.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>
@@ -163,7 +163,7 @@
       <Optimization>MinSpace</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;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
@@ -179,7 +179,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.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>
@@ -201,7 +201,7 @@
       <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;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
@@ -217,7 +217,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.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>

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/ffmpeg_in.vcxproj -> gpac-0.5.1.svn5491.tar.xz/build/msvc10/ffmpeg_in.vcxproj Changed

@@ -103,7 +103,7 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
@@ -121,6 +121,7 @@
       <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>
@@ -145,7 +146,7 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
@@ -162,6 +163,7 @@
       <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>
@@ -189,7 +191,7 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ClCompile>
     <ResourceCompile>
@@ -205,6 +207,7 @@
       <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>
@@ -232,7 +235,7 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ClCompile>
     <ResourceCompile>
@@ -247,8 +250,7 @@
       </ModuleDefinitionFile>
       <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
       <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
+      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;</AdditionalDependencies>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/gpac.sln -> gpac-0.5.1.svn5491.tar.xz/build/msvc10/gpac.sln Changed

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/libgpac.vcxproj -> gpac-0.5.1.svn5491.tar.xz/build/msvc10/libgpac.vcxproj Changed

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/libgpac.vcxproj.filters -> gpac-0.5.1.svn5491.tar.xz/build/msvc10/libgpac.vcxproj.filters Changed

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mp42ts.vcxproj -> gpac-0.5.1.svn5491.tar.xz/build/msvc10/mp42ts.vcxproj Changed

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mp4box.vcxproj -> gpac-0.5.1.svn5491.tar.xz/build/msvc10/mp4box.vcxproj Changed

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/redirect_av.vcxproj -> gpac-0.5.1.svn5491.tar.xz/build/msvc10/redirect_av.vcxproj Changed

@@ -103,7 +103,7 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
@@ -121,6 +121,7 @@
       <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>
@@ -145,7 +146,7 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
@@ -162,6 +163,7 @@
       <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>
@@ -189,7 +191,7 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ClCompile>
     <ResourceCompile>
@@ -205,6 +207,7 @@
       <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>
@@ -232,7 +235,7 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ClCompile>
     <ResourceCompile>
@@ -247,6 +250,7 @@
       </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>

gpac-0.5.1.svn5491.tar.xz/build/msvc10/rvc_dec.vcxproj Added

@@ -0,0 +1,172 @@
+<?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.5.0.svn5178.tar.bz2/build/symbian/symbian_dll_entry.cpp -> gpac-0.5.1.svn5491.tar.xz/build/symbian/symbian_dll_entry.cpp Changed

gpac-0.5.0.svn5178.tar.bz2/build/xcode/generate_ios.sh -> gpac-0.5.1.svn5491.tar.xz/build/xcode/generate_ios.sh Changed

gpac-0.5.0.svn5178.tar.bz2/build/xcode/gpac.xcodeproj/project.pbxproj -> gpac-0.5.1.svn5491.tar.xz/build/xcode/gpac.xcodeproj/project.pbxproj Changed

@@ -287,6 +287,8 @@
 		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 */; };
+		929F891C19FE83AE0076FC13 /* carbon_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 929F891B19FE83AE0076FC13 /* carbon_events.c */; };
+		929F891F19FE84AB0076FC13 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 929F891E19FE84AB0076FC13 /* Carbon.framework */; };
 		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 */; };
@@ -1032,6 +1034,8 @@
 		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>"; };
+		929F891B19FE83AE0076FC13 /* carbon_events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = carbon_events.c; path = ../../applications/mp4client/carbon_events.c; sourceTree = "<group>"; };
+		929F891E19FE84AB0076FC13 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Carbon.framework; sourceTree = DEVELOPER_DIR; };
 		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>"; };
@@ -1236,6 +1240,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				929F891F19FE84AB0076FC13 /* Carbon.framework in Frameworks */,
 				92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1449,6 +1454,7 @@
 		9201F92718D5A359003D1ACA = {
 			isa = PBXGroup;
 			children = (
+				929F891E19FE84AB0076FC13 /* Carbon.framework */,
 				92BE50AE18D6378C00AA59D8 /* xcode */,
 				92BE50AC18D6375100AA59D8 /* applications */,
 				92BE50AD18D6376A00AA59D8 /* modules */,
@@ -2340,6 +2346,7 @@
 		92BE50AC18D6375100AA59D8 /* applications */ = {
 			isa = PBXGroup;
 			children = (
+				929F891B19FE83AE0076FC13 /* carbon_events.c */,
 				92BE50C918D6D60100AA59D8 /* MP4Client */,
 				92BE50B518D6D53000AA59D8 /* MP42TS */,
 				92BE509218D6325E00AA59D8 /* MP4Box */,
@@ -3238,6 +3245,7 @@
 			files = (
 				92BE50D318D6D62600AA59D8 /* extract.c in Sources */,
 				92BE50D418D6D62600AA59D8 /* main.c in Sources */,
+				929F891C19FE83AE0076FC13 /* carbon_events.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3747,19 +3755,13 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec,
 					../../include,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libswscale,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavutil,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavformat,
+					/usr/local/include/,
+					/opt/local/include/,
+				);
+				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
+					/opt/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3792,19 +3794,13 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec,
 					../../include,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libswscale,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavutil,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavcodec/,
-					/usr/local/include/libavformat,
+					/usr/local/include/,
+					/opt/local/include/,
+				);
+				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
+					/opt/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = (
@@ -4019,6 +4015,8 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					GPAC_CONFIG_DARWIN,
+					CONFIG_DARWIN_GL,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;

gpac-0.5.0.svn5178.tar.bz2/build/xcode/gpac4ios.xcodeproj/project.pbxproj -> gpac-0.5.1.svn5491.tar.xz/build/xcode/gpac4ios.xcodeproj/project.pbxproj Changed

@@ -269,7 +269,6 @@
 		71CCF32C1277045100339E12 /* bitstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF22B1277045100339E12 /* bitstream.c */; };
 		71CCF32D1277045100339E12 /* color.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF22C1277045100339E12 /* color.c */; };
 		71CCF32E1277045100339E12 /* configfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF22D1277045100339E12 /* configfile.c */; };
-		71CCF32F1277045100339E12 /* dlmalloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF22E1277045100339E12 /* dlmalloc.c */; };
 		71CCF3301277045100339E12 /* downloader.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF22F1277045100339E12 /* downloader.c */; };
 		71CCF3311277045100339E12 /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2301277045100339E12 /* error.c */; };
 		71CCF3331277045100339E12 /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2321277045100339E12 /* list.c */; };
@@ -377,6 +376,9 @@
 		929A92A016EF8BC200B7C64F /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929A16EF8BC200B7C64F /* icon.png */; };
 		92A3A03E16F0C10C004EE581 /* extract.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A3A03D16F0C10C004EE581 /* extract.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 */; };
 		92BC210316EF8E7A000E0620 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199991278778800ACFF58 /* audio.c */; };
 		92BC210416EF8E7A000E0620 /* bifs_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1990E1278767B00ACFF58 /* bifs_dec.c */; };
@@ -874,7 +876,6 @@
 		71CCF22B1277045100339E12 /* bitstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitstream.c; sourceTree = "<group>"; };
 		71CCF22C1277045100339E12 /* color.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = color.c; sourceTree = "<group>"; };
 		71CCF22D1277045100339E12 /* configfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = configfile.c; sourceTree = "<group>"; };
-		71CCF22E1277045100339E12 /* dlmalloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlmalloc.c; sourceTree = "<group>"; };
 		71CCF22F1277045100339E12 /* downloader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = downloader.c; sourceTree = "<group>"; };
 		71CCF2301277045100339E12 /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = error.c; sourceTree = "<group>"; };
 		71CCF2321277045100339E12 /* list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = "<group>"; };
@@ -988,6 +989,9 @@
 		929A929A16EF8BC200B7C64F /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../../applications/osmo4_ios/Resources/icon.png; sourceTree = SOURCE_ROOT; };
 		92A3A03D16F0C10C004EE581 /* extract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extract.c; path = ../../applications/osmo4_ios/extract.c; sourceTree = SOURCE_ROOT; };
 		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>"; };
 		92FA813A16F235520002629E /* cam_wrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cam_wrap.h; path = ../../modules/ios_cam/cam_wrap.h; sourceTree = SOURCE_ROOT; };
 		92FA813C16F235520002629E /* CameraObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CameraObject.h; path = ../../modules/ios_cam/CameraObject.h; sourceTree = SOURCE_ROOT; };
 		92FA813E16F235520002629E /* ios_cam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ios_cam.c; path = ../../modules/ios_cam/ios_cam.c; sourceTree = SOURCE_ROOT; };
@@ -1646,6 +1650,7 @@
 		71CCF1FD1277045100339E12 /* scenegraph */ = {
 			isa = PBXGroup;
 			children = (
+				92B32CA31A08ABBF0065F44A /* webvtt_smjs.c */,
 				970FBA7F16F9F0910052216D /* html5_media_smjs.c */,
 				970FBA8016F9F0920052216D /* html5_mse_smjs.c */,
 				71CCF1FE1277045100339E12 /* base_scenegraph.c */,
@@ -1716,7 +1721,6 @@
 				71CCF22B1277045100339E12 /* bitstream.c */,
 				71CCF22C1277045100339E12 /* color.c */,
 				71CCF22D1277045100339E12 /* configfile.c */,
-				71CCF22E1277045100339E12 /* dlmalloc.c */,
 				71CCF22F1277045100339E12 /* downloader.c */,
 				71CCF2301277045100339E12 /* error.c */,
 				71CCF2321277045100339E12 /* list.c */,
@@ -1881,6 +1885,7 @@
 				71A1996A1278774A00ACFF58 /* rtp_in */,
 				71A199981278778800ACFF58 /* sdl_out */,
 				71A199141278769100ACFF58 /* soft_raster */,
+				92B32CA61A08ABF10065F44A /* vtt */,
 				71A199871278777A00ACFF58 /* widgetman */,
 				71A199071278765600ACFF58 /* aac_in.c */,
 				71A1990E1278767B00ACFF58 /* bifs_dec.c */,
@@ -1901,6 +1906,15 @@
 			name = modules;
 			sourceTree = "<group>";
 		};
+		92B32CA61A08ABF10065F44A /* vtt */ = {
+			isa = PBXGroup;
+			children = (
+				92B32CA71A08AC130065F44A /* vtt_dec.c */,
+				92B32CA81A08AC130065F44A /* vtt_in.c */,
+			);
+			name = vtt;
+			sourceTree = "<group>";
+		};
 		92FA813816F235470002629E /* camera */ = {
 			isa = PBXGroup;
 			children = (
@@ -2405,7 +2419,6 @@
 				71CCF32C1277045100339E12 /* bitstream.c in Sources */,
 				71CCF32D1277045100339E12 /* color.c in Sources */,
 				71CCF32E1277045100339E12 /* configfile.c in Sources */,
-				71CCF32F1277045100339E12 /* dlmalloc.c in Sources */,
 				71CCF3301277045100339E12 /* downloader.c in Sources */,
 				71CCF3311277045100339E12 /* error.c in Sources */,
 				71CCF3331277045100339E12 /* list.c in Sources */,
@@ -2451,6 +2464,9 @@
 				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;
 		};
@@ -2619,7 +2635,7 @@
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_USE_STANDARD_INCLUDE_SEARCHING = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../../extra_lib/include;
@@ -2649,7 +2665,7 @@
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_USE_STANDARD_INCLUDE_SEARCHING = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../../extra_lib/include;

gpac-0.5.0.svn5178.tar.bz2/configure -> gpac-0.5.1.svn5491.tar.xz/configure Changed

@@ -152,6 +152,7 @@
 disable_dvbx="yes"
 disable_vobsub="no"
 disable_ttxt="no"
+disable_ttml="no"
 disable_hevc="no"
 enable_depth_compositor="no"
 enable_renoir="no"
@@ -838,7 +839,7 @@
 				mozjs_pkgcfg="mozjs185"
 	    fi
 
-	    if test mozjs_pkgcfg != "no" ; then
+	    if test $mozjs_pkgcfg != "no" ; then
                 js_flags=`$pkg_config --cflags $mozjs_pkgcfg`
                 js_lib_pkg=`$pkg_config --libs $mozjs_pkgcfg`
                 if $cc -o $TMPO $TMPC $js_flags $js_lib_pkg $LDFLAGS -lpthread 2> /dev/null  ; then
@@ -1014,13 +1015,13 @@
 
 if test "$darwin" = "yes" ; then
 ohevc_cflags="-I/usr/include -I/usr/local/include"
-ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lLibOpenHevcWrapper -lpthread"
+ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lLibOpenHevcWrapper -lm -lpthread "
 elif test "$cross_prefix" = "" ; then
 ohevc_cflags=""
-ohevc_ldflags="-lLibOpenHevcWrapper -lpthread -lm"
+ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
 else
 ohevc_cflags="-I${prefix}include"
-ohevc_ldflags="-lLibOpenHevcWrapper -lpthread"
+ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
 fi
 
 cat > $TMPC << EOF
@@ -1028,12 +1029,12 @@
 #include <openHevcWrapper.h>
 int main( void ) { libOpenHevcInit(1, 1); return 0; }
 EOF
-if $cc -o $TMPO $TMPC $ohevc_cflags $LDFLAGS $ohevc_ldflags 2> /dev/null  ; then
+if $cc -o $TMPO $TMPC $ohevc_cflags $ohevc_ldflags $LDFLAGS 2> /dev/null  ; then
   has_openhevc="yes"
 else
   ohevc_cflags="-I$local_inc"
-  ohevc_ldflags="-lLibOpenHevcWrapper -lpthread -lm"
-  if $cc -o $TMPO $TMPC $ohevc_cflags $LDFLAGS -L$local_lib $ohevc_ldflags 2> /dev/null  ; then
+  ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
+  if $cc -o $TMPO $TMPC $ohevc_cflags $ohevc_ldflags $LDFLAGS -L$local_lib 2> /dev/null  ; then
     has_openhevc="yes"
     ohevc_ldflags="-L../../$local_lib $ohevc_ldflags"
   fi
@@ -1298,7 +1299,9 @@
 
 cat > $TMPC << EOF
 #include <libavcodec/avcodec.h>
-int main(void) {return 0;}
+int main(void) {
+    return 0;
+}
 EOF
 
 if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags $LDFLAGS 2> /dev/null  ; then
@@ -1306,7 +1309,7 @@
 else
     old_ffmpeg_inc="yes"
 
-    cat > $TMPC << EOF
+cat > $TMPC << EOF
 #include <ffmpeg/avcodec.h>
 int main(void) {
     AVFrame *f1, *f2;
@@ -1318,6 +1321,14 @@
 
 fi
 
+cat > $TMPC << EOF
+#include <libavcodec/avcodec.h>
+int main(void) {
+    CODEC_ID_H264;
+    return 0;
+}
+EOF
+
 if test "$cross_prefix" = "" ; then 
     if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib $ffmpeg_lflags $LDFLAGS 2> /dev/null  ; then
         has_ffmpeg="system"
@@ -1343,14 +1354,45 @@
 
 cat > $TMPC << EOF
 #include <libavutil/frame.h>
-int main(void) {return 0;}
+#include <libavcodec/avcodec.h>
+int main(void) {
+    CODEC_ID_H264;
+    return 0;
+}
 EOF
 if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null  ; then
-	is_libav="no"
+    is_libav="no"
 else
-	is_libav="yes"
+
+cat > $TMPC << EOF
+#include <libavcodec/avcodec.h>
+int main(void) {
+    CODEC_ID_H264;
+    return 0;
+}
+EOF
+
+    if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null  ; then
+        is_libav="yes"
+    else
+        is_libav="new"
+    fi
 fi
 
+#detect libavresample (libav only, but ffmpeg backported with '--enable-avresample') for dashcast only
+cat > $TMPC << EOF
+#include "libavresample/avresample.h"
+int main(void) {
+    AVAudioResampleContext *aresampler = avresample_alloc_context();
+    return 0;
+}
+EOF
+
+if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags -lavresample 2> /dev/null  ; then
+    has_libavresample="yes"
+else
+    has_libavresample="no"
+fi
 
 
 #look for FREENECT support
@@ -1814,7 +1856,7 @@
             ;;
         --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_mcrypt="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_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_isoff_hds="yes"; disable_hevc="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_mcrypt="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_ttml="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_isoff_hds="yes"; disable_hevc="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_mcrypt="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"
             ;;
@@ -1980,6 +2022,10 @@
             ;;
         --enable-ttxt) disable_ttxt="no"
             ;; 
+        --disable-ttml) disable_ttml="yes"
+            ;;
+        --enable-ttml) disable_ttml="no"
+            ;; 
         --disable-saf) disable_saf="yes"
             ;;
         --enable-saf) disable_saf="no"
@@ -2486,6 +2532,10 @@
     echo "SWF import disabled"
     echo "#define GPAC_DISABLE_SWF_IMPORT" >> $TMPH
 fi
+if test "$disable_scenegraph" = "yes" ; then
+    echo "Scene Graph disabled"
+    echo "#define GPAC_DISABLE_SCENEGRAPH" >> $TMPH
+fi
 if test "$disable_scene_stats" = "yes" ; then
     echo "Scene statistics disabled"
     echo "#define GPAC_DISABLE_SCENE_STATS" >> $TMPH
@@ -2557,10 +2607,15 @@
     echo "#define GPAC_DISABLE_VOBSUB" >> $TMPH
 fi
 if test "$disable_ttxt" = "yes" ; then
-    echo "TimedText disabled"
+    echo "3GPP/Apple TimedText disabled"
     echo "#define GPAC_DISABLE_TTXT" >> $TMPH
 fi
 
+if test "$disable_ttml" = "yes" ; then
+    echo "TTML TimedText disabled"
+    echo "#define GPAC_DISABLE_TTML" >> $TMPH
+fi
+
 if test "$enable_depth_compositor" = "yes" ; then
     echo "Depth Compositor enabled"
     echo "#define GF_SR_USE_DEPTH" >> $TMPH
@@ -2877,8 +2932,8 @@
 else
     echo "ffmpeg_cflags=$ffmpeg_cflags" >> config.mak
     echo "ffmpeg_lflags=$ffmpeg_lflags" >> config.mak
-#    echo "DISABLE_DASHCAST=$is_libav" >> config.mak
     echo "CONFIG_LIBAV=$is_libav" >> config.mak
+    echo "CONFIG_LIBAVRESAMPLE=$has_libavresample" >> config.mak
 fi
 echo "CONFIG_FFMPEG_OLD=$old_ffmpeg_inc" >> config.mak
 
@@ -2918,6 +2973,7 @@
 echo "DISABLE_ISOFF_HINT=$disable_isoff_hint" >> config.mak
 echo "DISABLE_VOBSUB=$disable_vobsub" >> config.mak
 echo "DISABLE_TTXT=$disable_ttxt" >> config.mak
+echo "DISABLE_TTML=$disable_ttml" >> config.mak
 echo "DISABLE_SMGR=$disable_smgr" >> config.mak
 echo "DISABLE_AV_PARSERS=$disable_parsers" >> config.mak
 echo "DISABLE_MEDIA_IMPORT=$disable_import" >> config.mak
@@ -3107,7 +3163,7 @@
     echo "Creating compilation tree image"
     SRC_DIRS="src src/utils src/isomedia src/ietf src/odf src/bifs src/scenegraph src/terminal src/mcrypt src/media_tools src/scene_manager src/compositor src/laser" 
 
-    APP_DIRS="applications/mp4box applications/mp4client applications/osmozilla applications/osmo4_wx applications/mp42ts"
+    APP_DIRS="applications/mp4box applications/mp4client applications/osmozilla applications/osmo4_wx applications/mp42ts applications/dashcast"
 
     for dir in $SRC_DIRS ; do
         mkdir -p "$dir"

gpac-0.5.0.svn5178.tar.bz2/doc/CODING_STYLE -> gpac-0.5.1.svn5491.tar.xz/doc/CODING_STYLE Changed

gpac-0.5.0.svn5178.tar.bz2/doc/INSTALL.w32 -> gpac-0.5.1.svn5491.tar.xz/doc/INSTALL.w32 Changed

gpac-0.5.0.svn5178.tar.bz2/doc/configuration.html -> gpac-0.5.1.svn5491.tar.xz/doc/configuration.html Changed

@@ -10,7 +10,7 @@
 <br/>
 <b><span style="Font-Size: 24pt">GPAC Configuration file documentation<br/>Version 0.5.0</span></b>
 <br/>
-<b><span style="Font-Size: 18pt">Last Modified $LastChangedDate: 2014-03-15 01:53:27 +0800 (六, 2014-03-15) $</span></b>
+<b><span style="Font-Size: 18pt">Last Modified $LastChangedDate: 2014-08-05 18:59:31 +0800 (二, 2014-08-05) $</span></b>
 </p>
 
 <br/><br/>
@@ -366,11 +366,6 @@
 <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>BitmapCopyPixels</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-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.
-</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>
@@ -727,6 +722,15 @@
 <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>BufferMode</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 (default mode), but segments are not pre-buffered.</li> 
+<li>none: uses the  player settings for buffering.</li> 
+</ul>
+</p>
 <b>DisableSwitching</b> [value: <i>yes, no</i>]
 <p style="text-indent: 5%">
 Disables automatic adaptation logic. Default is no</p>
@@ -742,9 +746,11 @@
 <b>StartRepresentation</b> [value: <i>minBandwidth, maxBandwidth, 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.</p>
-<b>InitialTimeshift</b> [value: <i>positive integer between 0 and 100</i> ]
+<b>InitialTimeshift</b> [value: <i>positive integer </i> ]
 <p style="text-indent: 5%">
-Uses the given percentage of the timeshift buffer when starting playback. Default is 0 to tune to the live point.</p>
+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.
@@ -759,6 +765,13 @@
 <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>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>
+
+
 
 <br/><br/>
 
@@ -834,6 +847,12 @@
 <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>
 
 
 <br/><br/>

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/avcodec.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavcodec/avcodec.h Changed

@@ -40,7 +40,13 @@
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
-#include "libavcodec/version.h"
+#include "version.h"
+
+#if FF_API_FAST_MALLOC
+// to provide fast_*alloc
+#include "libavutil/mem.h"
+#endif
+
 /**
  * @defgroup libavc Encoding/Decoding Library
  * @{
@@ -104,7 +110,9 @@
     /* video codecs */
     AV_CODEC_ID_MPEG1VIDEO,
     AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+#if FF_API_XVMC
     AV_CODEC_ID_MPEG2VIDEO_XVMC,
+#endif /* FF_API_XVMC */
     AV_CODEC_ID_H261,
     AV_CODEC_ID_H263,
     AV_CODEC_ID_RV10,
@@ -274,6 +282,10 @@
     AV_CODEC_ID_AIC,
     AV_CODEC_ID_ESCAPE130_DEPRECATED,
     AV_CODEC_ID_G2M_DEPRECATED,
+    AV_CODEC_ID_WEBP_DEPRECATED,
+    AV_CODEC_ID_HNM4_VIDEO,
+    AV_CODEC_ID_HEVC_DEPRECATED,
+    AV_CODEC_ID_FIC,
 
     AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
     AV_CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
@@ -300,6 +312,8 @@
     AV_CODEC_ID_SNOW       = MKBETAG('S','N','O','W'),
     AV_CODEC_ID_WEBP       = MKBETAG('W','E','B','P'),
     AV_CODEC_ID_SMVJPEG    = MKBETAG('S','M','V','J'),
+    AV_CODEC_ID_HEVC       = MKBETAG('H','2','6','5'),
+#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
 
     /* various PCM "codecs" */
     AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@ -331,6 +345,8 @@
     AV_CODEC_ID_PCM_LXF,
     AV_CODEC_ID_S302M,
     AV_CODEC_ID_PCM_S8_PLANAR,
+    AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED,
+    AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED,
     AV_CODEC_ID_PCM_S24LE_PLANAR = MKBETAG(24,'P','S','P'),
     AV_CODEC_ID_PCM_S32LE_PLANAR = MKBETAG(32,'P','S','P'),
     AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P','S','P',16),
@@ -371,6 +387,7 @@
     AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
     AV_CODEC_ID_ADPCM_DTK  = MKBETAG('D','T','K',' '),
     AV_CODEC_ID_ADPCM_IMA_RAD = MKBETAG('R','A','D',' '),
+    AV_CODEC_ID_ADPCM_G726LE = MKBETAG('6','2','7','G'),
 
     /* AMR */
     AV_CODEC_ID_AMR_NB = 0x12000,
@@ -497,6 +514,7 @@
     AV_CODEC_ID_OTF        = MKBETAG( 0 ,'O','T','F'),
     AV_CODEC_ID_SMPTE_KLV  = MKBETAG('K','L','V','A'),
     AV_CODEC_ID_DVD_NAV    = MKBETAG('D','N','A','V'),
+    AV_CODEC_ID_TIMED_ID3  = MKBETAG('T','I','D','3'),
 
 
     AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
@@ -619,16 +637,26 @@
     AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
     AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
     AVCOL_PRI_FILM        = 8,
+    AVCOL_PRI_BT2020      = 9, ///< ITU-R BT2020
     AVCOL_PRI_NB             , ///< Not part of ABI
 };
 
 enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709       = 1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED = 2,
-    AVCOL_TRC_GAMMA22     = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28     = 5, ///< also ITU-R BT470BG
-    AVCOL_TRC_SMPTE240M   = 7,
-    AVCOL_TRC_NB             , ///< Not part of ABI
+    AVCOL_TRC_BT709        =  1, ///< also ITU-R BT1361
+    AVCOL_TRC_UNSPECIFIED  =  2,
+    AVCOL_TRC_GAMMA22      =  4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_TRC_GAMMA28      =  5, ///< also ITU-R BT470BG
+    AVCOL_TRC_SMPTE170M    =  6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
+    AVCOL_TRC_SMPTE240M    =  7,
+    AVCOL_TRC_LINEAR       =  8, ///< "Linear transfer characteristics"
+    AVCOL_TRC_LOG          =  9, ///< "Logarithmic transfer characteristic (100:1 range)"
+    AVCOL_TRC_LOG_SQRT     = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt( 10 ) : 1 range)"
+    AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
+    AVCOL_TRC_BT1361_ECG   = 12, ///< ITU-R BT1361 Extended Colour Gamut
+    AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
+    AVCOL_TRC_BT2020_10    = 14, ///< ITU-R BT2020 for 10 bit system
+    AVCOL_TRC_BT2020_12    = 15, ///< ITU-R BT2020 for 12 bit system
+    AVCOL_TRC_NB               , ///< Not part of ABI
 };
 
 /**
@@ -670,7 +698,12 @@
     float quality_factor;
 } RcOverride;
 
+#if FF_API_MAX_BFRAMES
+/**
+ * @deprecated there is no libavcodec-wide limit on the number of B-frames
+ */
 #define FF_MAX_B_FRAMES 16
+#endif
 
 /* encoding support
    These flags can be passed in AVCodecContext.flags before initialization.
@@ -684,6 +717,7 @@
 #define CODEC_FLAG_UNALIGNED 0x0001
 #define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
 #define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
+#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
 #define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
 #define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
 #define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
@@ -696,7 +730,13 @@
 #define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
 #define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
 #define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
-#define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
+#if FF_API_EMU_EDGE
+/**
+ * @deprecated edges are not used/required anymore. I.e. this flag is now always
+ * set.
+ */
+#define CODEC_FLAG_EMU_EDGE        0x4000
+#endif
 #define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
 #define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
                                                   location instead of only at frame boundaries. */
@@ -734,8 +774,16 @@
  */
 #define CODEC_CAP_DR1             0x0002
 #define CODEC_CAP_TRUNCATED       0x0008
-/* Codec can export data for HW decoding (XvMC). */
+#if FF_API_XVMC
+/* Codec can export data for HW decoding. This flag indicates that
+ * the codec would call get_format() with list that might contain HW accelerated
+ * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them
+ * including raw image format.
+ * The application can use the passed context to determine bitstream version,
+ * chroma format, resolution etc.
+ */
 #define CODEC_CAP_HWACCEL         0x0010
+#endif /* FF_API_XVMC */
 /**
  * Encoder or decoder requires flushing with NULL input at the end in order to
  * give the complete and correct output.
@@ -792,12 +840,12 @@
  * Codec should fill in channel configuration and samplerate instead of container
  */
 #define CODEC_CAP_CHANNEL_CONF     0x0400
-
+#if FF_API_NEG_LINESIZES
 /**
- * Codec is able to deal with negative linesizes
+ * @deprecated no codecs use this capability
  */
 #define CODEC_CAP_NEG_LINESIZES    0x0800
-
+#endif
 /**
  * Codec supports frame-level multithreading.
  */
@@ -827,6 +875,7 @@
  */
 #define CODEC_CAP_LOSSLESS         0x80000000
 
+#if FF_API_MB_TYPE
 //The following defines may change, don't expect compatibility if you use them.
 #define MB_TYPE_INTRA4x4   0x0001
 #define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
@@ -850,6 +899,7 @@
 #define MB_TYPE_QUANT      0x00010000
 #define MB_TYPE_CBP        0x00020000
 //Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
+#endif
 
 /**
  * Pan Scan area.
@@ -880,10 +930,12 @@
     int16_t position[3][2];
 }AVPanScan;
 
+#if FF_API_QSCALE_TYPE
 #define FF_QSCALE_TYPE_MPEG1 0
 #define FF_QSCALE_TYPE_MPEG2 1
 #define FF_QSCALE_TYPE_H264  2
 #define FF_QSCALE_TYPE_VP56  3
+#endif
 
 #if FF_API_GET_BUFFER
 #define FF_BUFFER_TYPE_INTERNAL 1
@@ -1006,6 +1058,13 @@
      * follow the timestamp specifier of a WebVTT cue.
      */
     AV_PKT_DATA_WEBVTT_SETTINGS,
+
+    /**
+     * A list of zero terminated key/value strings. There is no end marker for
+     * the list, so it is required to rely on the side data size to stop. This
+     * side data includes updated metadata which appeared in the stream.
+     */
+    AV_PKT_DATA_METADATA_UPDATE,
 };
 
 /**
@@ -1316,7 +1375,9 @@
      */
     int coded_width, coded_height;
 
+#if FF_API_ASPECT_EXTENDED
 #define FF_ASPECT_EXTENDED 15
+#endif
 
     /**
      * the number of pictures in a group of pictures, or 0 for intra_only
@@ -1643,12 +1704,15 @@
 #define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
 #define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
 
+#if FF_API_XVMC
     /**
      * XVideo Motion Acceleration
      * - encoding: forbidden
      * - decoding: set by decoder
+     * @deprecated XvMC doesn't need it anymore.
      */
-    int xvmc_acceleration;
+    attribute_deprecated int xvmc_acceleration;
+#endif /* FF_API_XVMC */
 
     /**
      * macroblock decision mode
@@ -2095,12 +2159,11 @@
      * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
      * (read and/or written to if it is writable) later by libavcodec.
      *
-     * If CODEC_FLAG_EMU_EDGE is not set in s->flags, the buffer must contain an
-     * edge of the size returned by avcodec_get_edge_width() on all sides.
-     *
      * avcodec_align_dimensions2() should be used to find the required width and
      * height, as they normally need to be rounded up to the next multiple of 16.
      *
+     * Some decoders do not support linesizes changing between frames.
+     *
      * If frame multithreading is used and thread_safe_callbacks is set,
      * this callback may be called from a different thread, but not from more
      * than one at once. Does not need to be reentrant.
@@ -2383,12 +2446,16 @@
      */
     int workaround_bugs;
 #define FF_BUG_AUTODETECT       1  ///< autodetection
+#if FF_API_OLD_MSMPEG4
 #define FF_BUG_OLD_MSMPEG4      2
+#endif
 #define FF_BUG_XVID_ILACE       4
 #define FF_BUG_UMP4             8
 #define FF_BUG_NO_PADDING       16
 #define FF_BUG_AMV              32
+#if FF_API_AC_VLC
 #define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
+#endif
 #define FF_BUG_QPEL_CHROMA      64
 #define FF_BUG_STD_QPEL         128
 #define FF_BUG_QPEL_CHROMA2     256
@@ -2438,7 +2505,12 @@
 #define FF_DEBUG_BITSTREAM   4
 #define FF_DEBUG_MB_TYPE     8
 #define FF_DEBUG_QP          16
+#if FF_API_DEBUG_MV
+/**
+ * @deprecated this option does nothing
+ */
 #define FF_DEBUG_MV          32
+#endif
 #define FF_DEBUG_DCT_COEFF   0x00000040
 #define FF_DEBUG_SKIP        0x00000080
 #define FF_DEBUG_STARTCODE   0x00000100
@@ -2446,13 +2518,17 @@
 #define FF_DEBUG_ER          0x00000400
 #define FF_DEBUG_MMCO        0x00000800
 #define FF_DEBUG_BUGS        0x00001000
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
+#if FF_API_DEBUG_MV
+#define FF_DEBUG_VIS_QP      0x00002000 ///< only access through AVOptions from outside libavcodec
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec
+#endif
 #define FF_DEBUG_BUFFERS     0x00008000
 #define FF_DEBUG_THREADS     0x00010000
 
+#if FF_API_DEBUG_MV
     /**
      * debug
+     * Code outside libavcodec should access this field using AVOptions
      * - encoding: Set by user.
      * - decoding: Set by user.
      */
@@ -2460,6 +2536,7 @@
 #define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
 #define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
 #define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#endif
 
     /**
      * Error recognition; may misdetect some more or less valid parts as errors.
@@ -2467,14 +2544,21 @@
      * - decoding: Set by user.
      */
     int err_recognition;
+
+/**
+ * Verify checksums embedded in the bitstream (could be of either encoded or
+ * decoded data, depending on the codec) and print an error message on mismatch.
+ * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
+ * decoder returning an error.
+ */
 #define AV_EF_CRCCHECK  (1<<0)
-#define AV_EF_BITSTREAM (1<<1)
-#define AV_EF_BUFFER    (1<<2)
-#define AV_EF_EXPLODE   (1<<3)
-
-#define AV_EF_CAREFUL    (1<<16)
-#define AV_EF_COMPLIANT  (1<<17)
-#define AV_EF_AGGRESSIVE (1<<18)
+#define AV_EF_BITSTREAM (1<<1)          ///< detect bitstream specification deviations
+#define AV_EF_BUFFER    (1<<2)          ///< detect improper bitstream length
+#define AV_EF_EXPLODE   (1<<3)          ///< abort decoding on minor error detection
+
+#define AV_EF_CAREFUL    (1<<16)        ///< consider things that violate the spec, are fast to calculate and have not been seen in the wild as errors
+#define AV_EF_COMPLIANT  (1<<17)        ///< consider all spec non compliancies as errors
+#define AV_EF_AGGRESSIVE (1<<18)        ///< consider things that a sane encoder should not do as an error
 
 
     /**
@@ -2546,7 +2630,9 @@
 #define FF_IDCT_SIMPLEVIS     18
 #define FF_IDCT_FAAN          20
 #define FF_IDCT_SIMPLENEON    22
+#if FF_API_ARCH_ALPHA
 #define FF_IDCT_SIMPLEALPHA   23
+#endif
 
     /**
      * bits per sample/pixel from the demuxer (needed for huffyuv).
@@ -2576,7 +2662,7 @@
     /**
      * the picture in the bitstream
      * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
+     * - decoding: unused
      */
     AVFrame *coded_frame;
 
@@ -2648,13 +2734,13 @@
      */
     int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
 
+#if FF_API_THREAD_OPAQUE
     /**
-     * thread opaque
-     * Can be used by execute() to store some per AVCodecContext stuff.
-     * - encoding: set by execute()
-     * - decoding: set by execute()
+     * @deprecated this field should not be used from outside of lavc
      */
+    attribute_deprecated
     void *thread_opaque;
+#endif
 
     /**
      * noise vs. sse weight for the nsse comparsion function
@@ -2741,6 +2827,11 @@
 #define FF_PROFILE_JPEG2000_DCINEMA_2K              3
 #define FF_PROFILE_JPEG2000_DCINEMA_4K              4
 
+
+#define FF_PROFILE_HEVC_MAIN                        1
+#define FF_PROFILE_HEVC_MAIN_10                     2
+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE          3
+
     /**
      * level
      * - encoding: Set by user.
@@ -2781,21 +2872,22 @@
     uint8_t *subtitle_header;
     int subtitle_header_size;
 
+#if FF_API_ERROR_RATE
     /**
-     * Simulates errors in the bitstream to test error concealment.
-     * - encoding: Set by user.
-     * - decoding: unused
+     * @deprecated use the 'error_rate' private AVOption of the mpegvideo
+     * encoders
      */
+    attribute_deprecated
     int error_rate;
+#endif
 
+#if FF_API_CODEC_PKT
     /**
-     * Current packet as passed into the decoder, to avoid having
-     * to pass the packet into every function. Currently only valid
-     * inside lavc and get/release_buffer callbacks.
-     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
-     * - encoding: unused
+     * @deprecated this field is not supposed to be accessed from outside lavc
      */
+    attribute_deprecated
     AVPacket *pkt;
+#endif
 
     /**
      * VBV delay coded in the last frame (in periods of a 27 MHz clock).
@@ -2862,6 +2954,48 @@
 #define FF_SUB_CHARENC_MODE_AUTOMATIC    0  ///< libavcodec will select the mode itself
 #define FF_SUB_CHARENC_MODE_PRE_DECODER  1  ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the decoder, requires iconv
 
+    /**
+     * Skip processing alpha if supported by codec.
+     * Note that if the format uses pre-multiplied alpha (common with VP6,
+     * and recommended due to better video quality/compression)
+     * the image will look as if alpha-blended onto a black background.
+     * However for formats that do not use pre-multiplied alpha
+     * there might be serious artefacts (though e.g. libswscale currently
+     * assumes pre-multiplied alpha anyway).
+     * Code outside libavcodec should access this field using AVOptions
+     *
+     * - decoding: set by user
+     * - encoding: unused
+     */
+    int skip_alpha;
+
+    /**
+     * Number of samples to skip after a discontinuity
+     * - decoding: unused
+     * - encoding: set by libavcodec
+     */
+    int seek_preroll;
+
+#if !FF_API_DEBUG_MV
+    /**
+     * debug motion vectors
+     * Code outside libavcodec should access this field using AVOptions
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug_mv;
+#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
+#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#endif
+
+    /**
+     * custom intra quantization matrix
+     * Code outside libavcodec should access this field using av_codec_g/set_chroma_intra_matrix()
+     * - encoding: Set by user, can be NULL.
+     * - decoding: unused.
+     */
+    uint16_t *chroma_intra_matrix;
 } AVCodecContext;
 
 AVRational av_codec_get_pkt_timebase         (const AVCodecContext *avctx);
@@ -2873,6 +3007,12 @@
 int  av_codec_get_lowres(const AVCodecContext *avctx);
 void av_codec_set_lowres(AVCodecContext *avctx, int val);
 
+int  av_codec_get_seek_preroll(const AVCodecContext *avctx);
+void av_codec_set_seek_preroll(AVCodecContext *avctx, int val);
+
+uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx);
+void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val);
+
 /**
  * AVProfile.
  */
@@ -2913,7 +3053,9 @@
     const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
     const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
     const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
+#if FF_API_LOWRES
+    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder, no direct access, use av_codec_get_max_lowres()
+#endif
     const AVClass *priv_class;              ///< AVClass for the private context
     const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
 
@@ -2980,6 +3122,10 @@
     void (*flush)(AVCodecContext *);
 } AVCodec;
 
+int av_codec_get_max_lowres(const AVCodec *codec);
+
+struct MpegEncContext;
+
 /**
  * AVHWAccel.
  */
@@ -3041,6 +3187,7 @@
      *
      * Meaningful slice information (codec specific) is guaranteed to
      * be parsed at this point. This function is mandatory.
+     * The only exception is XvMC, that works on MB level.
      *
      * @param avctx the codec context
      * @param buf the slice data buffer base
@@ -3068,6 +3215,17 @@
      * AVCodecContext.release_buffer().
      */
     int priv_data_size;
+
+    /**
+     * Called for every Macroblock in a slice.
+     *
+     * XvMC uses it to replace the ff_MPV_decode_mb().
+     * Instead of decoding to raw picture, MB parameters are
+     * stored in an array provided by the video driver.
+     *
+     * @param s the mpeg context
+     */
+    void (*decode_mb)(struct MpegEncContext *s);
 } AVHWAccel;
 
 /**
@@ -3191,40 +3349,6 @@
  */
 void avcodec_register_all(void);
 
-
-#if FF_API_ALLOC_CONTEXT
-/**
- * Allocate an AVCodecContext and set its fields to default values.  The
- * resulting struct can be deallocated by simply calling av_free().
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
- *
- * @deprecated use avcodec_alloc_context3()
- */
-attribute_deprecated
-AVCodecContext *avcodec_alloc_context(void);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-attribute_deprecated
-AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
-
-/**
- * Set the fields of the given AVCodecContext to default values.
- *
- * @param s The AVCodecContext of which the fields should be set to default values.
- * @deprecated use avcodec_get_context_defaults3
- */
-attribute_deprecated
-void avcodec_get_context_defaults(AVCodecContext *s);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-attribute_deprecated
-void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
-#endif
-
 /**
  * Allocate an AVCodecContext and set its fields to default values.  The
  * resulting struct can be deallocated by calling avcodec_close() on it followed
@@ -3290,20 +3414,21 @@
  */
 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
 
+#if FF_API_AVFRAME_LAVC
 /**
- * Allocate an AVFrame and set its fields to default values.  The resulting
- * struct must be freed using avcodec_free_frame().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- * @see avcodec_get_frame_defaults
+ * @deprecated use av_frame_alloc()
  */
+attribute_deprecated
 AVFrame *avcodec_alloc_frame(void);
 
 /**
  * Set the fields of the given AVFrame to default values.
  *
  * @param frame The AVFrame of which the fields should be set to default values.
+ *
+ * @deprecated use av_frame_unref()
  */
+attribute_deprecated
 void avcodec_get_frame_defaults(AVFrame *frame);
 
 /**
@@ -3315,41 +3440,11 @@
  * @warning this function does NOT free the data buffers themselves
  * (it does not know how, since they might have been allocated with
  *  a custom get_buffer()).
- */
-void avcodec_free_frame(AVFrame **frame);
-
-#if FF_API_AVCODEC_OPEN
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated.
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
  *
- * context = avcodec_alloc_context3(codec);
- *
- * if (avcodec_open(context, codec) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context which will be set up to use the given codec.
- * @param codec The codec to use within the context.
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context3, avcodec_find_decoder, avcodec_find_encoder, avcodec_close
- *
- * @deprecated use avcodec_open2
+ * @deprecated use av_frame_free()
  */
 attribute_deprecated
-int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+void avcodec_free_frame(AVFrame **frame);
 #endif
 
 /**
@@ -3541,6 +3636,24 @@
 
 int av_packet_split_side_data(AVPacket *pkt);
 
+/**
+ * Pack a dictionary for use in side_data.
+ *
+ * @param dict The dictionary to pack.
+ * @param size pointer to store the size of the returned data
+ * @return pointer to data if successful, NULL otherwise
+ */
+uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size);
+/**
+ * Unpack a dictionary from side_data.
+ *
+ * @param data data from side_data
+ * @param size size of the data
+ * @param dict the metadata storage dictionary
+ * @return 0 on success, < 0 on failure
+ */
+int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict);
+
 
 /**
  * Convenience function to free all the side data stored.
@@ -3640,14 +3753,20 @@
  */
 int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
 
+#if FF_API_EMU_EDGE
 /**
  * Return the amount of padding in pixels which the get_buffer callback must
  * provide around the edge of the image for codecs which do not have the
  * CODEC_FLAG_EMU_EDGE flag.
  *
  * @return Required padding in pixels.
+ *
+ * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
+ * needed
  */
+attribute_deprecated
 unsigned avcodec_get_edge_width(void);
+#endif
 
 /**
  * Modify width and height values so that they will result in a memory
@@ -3655,8 +3774,6 @@
  * padding.
  *
  * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
  */
 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
 
@@ -3666,8 +3783,6 @@
  * line sizes are a multiple of the respective linesize_align[i].
  *
  * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
  */
 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
                                int linesize_align[AV_NUM_DATA_POINTERS]);
@@ -3758,19 +3873,25 @@
  * Decode the audio frame of size avpkt->size from avpkt->data into frame.
  *
  * Some decoders may support multiple frames in a single AVPacket. Such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio4 has to be called again with an AVPacket containing
- * the remaining data in order to decode the second frame, etc...
- * Even if no frames are returned, the packet needs to be fed to the decoder
- * with remaining data until it is completely consumed or an error occurs.
+ * decoders would then just decode the first frame and the return value would be
+ * less than the packet size. In this case, avcodec_decode_audio4 has to be
+ * called again with an AVPacket containing the remaining data in order to
+ * decode the second frame, etc...  Even if no frames are returned, the packet
+ * needs to be fed to the decoder with remaining data until it is completely
+ * consumed or an error occurs.
+ *
+ * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * and output. This means that for some packets they will not immediately
+ * produce decoded output and need to be flushed at the end of decoding to get
+ * all the decoded data. Flushing is done by calling this function with packets
+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
+ * returning samples. It is safe to flush even those decoders that are not
+ * marked with CODEC_CAP_DELAY, then no samples will be returned.
  *
  * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
  *          larger than the actual read bytes because some optimized bitstream
  *          readers read 32 or 64 bits at once and could read over the end.
  *
- * @note You might have to align the input buffer. The alignment requirements
- *       depend on the CPU and the decoder.
- *
  * @param      avctx the codec context
  * @param[out] frame The AVFrame in which to store decoded audio samples.
  *                   The decoder will allocate a buffer for the decoded frame by
@@ -3782,10 +3903,13 @@
  *                   to the frame if av_frame_is_writable() returns 1.
  *                   When AVCodecContext.refcounted_frames is set to 0, the returned
  *                   reference belongs to the decoder and is valid only until the
- *                   next call to this function or until closing the decoder.
- *                   The caller may not write to it.
+ *                   next call to this function or until closing or flushing the
+ *                   decoder. The caller may not write to it.
  * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
- *                           non-zero.
+ *                           non-zero. Note that this field being set to zero
+ *                           does not mean that an error has occurred. For
+ *                           decoders with CODEC_CAP_DELAY set, no given decode
+ *                           call is guaranteed to produce a frame.
  * @param[in]  avpkt The input AVPacket containing the input buffer.
  *                   At least avpkt->data and avpkt->size should be set. Some
  *                   decoders might also require additional fields to be set.
@@ -3808,13 +3932,6 @@
  * @warning The end of the input buffer buf should be set to 0 to ensure that
  * no overreading happens for damaged MPEG streams.
  *
- * @note You might have to align the input buffer avpkt->data.
- * The alignment requirements depend on the CPU: on some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum.
- *
  * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
  * between input and output, these need to be fed with avpkt->data=NULL,
  * avpkt->size=0 at the end to return the remaining frames.
@@ -3831,10 +3948,10 @@
  *             to the frame if av_frame_is_writable() returns 1.
  *             When AVCodecContext.refcounted_frames is set to 0, the returned
  *             reference belongs to the decoder and is valid only until the
- *             next call to this function or until closing the decoder. The
- *             caller may not write to it.
+ *             next call to this function or until closing or flushing the
+ *             decoder. The caller may not write to it.
  *
- * @param[in] avpkt The input AVpacket containing the input buffer.
+ * @param[in] avpkt The input AVPacket containing the input buffer.
  *            You can create such packet with av_init_packet() and by then setting
  *            data and size, some decoders might in addition need other fields like
  *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
@@ -3857,6 +3974,14 @@
  * and reusing a get_buffer written for video codecs would probably perform badly
  * due to a potentially very different allocation pattern.
  *
+ * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * and output. This means that for some packets they will not immediately
+ * produce decoded output and need to be flushed at the end of decoding to get
+ * all the decoded data. Flushing is done by calling this function with packets
+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
+ * returning subtitles. It is safe to flush even those decoders that are not
+ * marked with CODEC_CAP_DELAY, then no subtitles will be returned.
+ *
  * @param avctx the codec context
  * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
                    freed with avsubtitle_free if *got_sub_ptr is set.
@@ -4567,7 +4692,7 @@
  * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
  * @return The best pixel format to convert to or -1 if none was found.
  */
-enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(enum AVPixelFormat *pix_fmt_list,
+enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *pix_fmt_list,
                                             enum AVPixelFormat src_pix_fmt,
                                             int has_alpha, int *loss_ptr);
 
@@ -4606,7 +4731,7 @@
 
 attribute_deprecated
 #if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
+enum AVPixelFormat avcodec_find_best_pix_fmt2(const enum AVPixelFormat *pix_fmt_list,
                                               enum AVPixelFormat src_pix_fmt,
                                               int has_alpha, int *loss_ptr);
 #else
@@ -4621,12 +4746,20 @@
  * @}
  */
 
+#if FF_API_SET_DIMENSIONS
+/**
+ * @deprecated this function is not supposed to be used from outside of lavc
+ */
+attribute_deprecated
 void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+#endif
 
 /**
  * Put a string representing the codec tag codec_tag in buf.
  *
+ * @param buf       buffer to place codec tag in
  * @param buf_size size in bytes of buf
+ * @param codec_tag codec tag to assign
  * @return the length of the string that would have been generated if
  * enough space had been available, excluding the trailing null
  */
@@ -4675,7 +4808,13 @@
                              int buf_size, int align);
 
 /**
- * Flush buffers, should be called when seeking or when switching to a different stream.
+ * Reset the internal decoder state / flush internal buffers. Should be called
+ * e.g. when seeking or when switching to a different stream.
+ *
+ * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0),
+ * this invalidates the frames previously returned from the decoder. When
+ * refcounted frames are used, the decoder just releases any references it might
+ * keep internally, but the caller's reference remains valid.
  */
 void avcodec_flush_buffers(AVCodecContext *avctx);
 
@@ -4812,27 +4951,6 @@
 /* memory */
 
 /**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
  * Same behaviour av_fast_malloc but the buffer has additional
  * FF_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
  *

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/avfft.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavcodec/avfft.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/old_codec_ids.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavcodec/old_codec_ids.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/vda.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavcodec/vda.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/vdpau.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavcodec/vdpau.h Changed

@@ -54,12 +54,8 @@
 #include "libavutil/avconfig.h"
 #include "libavutil/attributes.h"
 
-#ifndef FF_API_CAP_VDPAU
-#define FF_API_CAP_VDPAU 1
-#endif
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU 1
-#endif
+#include "avcodec.h"
+#include "version.h"
 
 #if FF_API_BUFS_VDPAU
 union AVVDPAUPictureInfo {
@@ -86,6 +82,10 @@
  * during initialization or through each AVCodecContext.get_buffer()
  * function call. In any case, they must be valid prior to calling
  * decoding functions.
+ *
+ * The size of this structure is not a part of the public ABI and must not
+ * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
+ * AVVDPAUContext.
  */
 typedef struct AVVDPAUContext {
     /**
@@ -149,6 +149,26 @@
 AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
 void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
 
+/**
+ * Allocate an AVVDPAUContext.
+ *
+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
+ */
+AVVDPAUContext *av_vdpau_alloc_context(void);
+
+/**
+ * Get a decoder profile that should be used for initializing a VDPAU decoder.
+ * Should be called from the AVCodecContext.get_format() callback.
+ *
+ * @param avctx the codec context being used for decoding the stream
+ * @param profile a pointer into which the result will be written on success.
+ *                The contents of profile are undefined if this function returns
+ *                an error.
+ *
+ * @return 0 on success (non-negative), a negative AVERROR on failure.
+ */
+int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
+
 #if FF_API_CAP_VDPAU
 /** @brief The videoSurface is used for rendering. */
 #define FF_VDPAU_STATE_USED_FOR_RENDER 1

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/version.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavcodec/version.h Changed

@@ -26,11 +26,11 @@
  * Libavcodec version macros.
  */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR  29
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MINOR  52
+#define LIBAVCODEC_VERSION_MICRO 102
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
@@ -51,19 +51,9 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_ALLOC_CONTEXT
-#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_AVCODEC_OPEN
-#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
 #ifndef FF_API_OLD_DECODE_AUDIO
 #define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_OLD_TIMECODE
-#define FF_API_OLD_TIMECODE (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-
 #ifndef FF_API_OLD_ENCODE_AUDIO
 #define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
@@ -73,8 +63,11 @@
 #ifndef FF_API_CODEC_ID
 #define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_AUDIO_CONVERT
+#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
 #ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 56)
+#define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
 #endif
 #ifndef FF_API_DEINTERLACE
 #define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)
@@ -100,5 +93,53 @@
 #ifndef FF_API_VOXWARE
 #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_SET_DIMENSIONS
+#define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_DEBUG_MV
+#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_AC_VLC
+#define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_OLD_MSMPEG4
+#define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ASPECT_EXTENDED
+#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_THREAD_OPAQUE
+#define FF_API_THREAD_OPAQUE     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_CODEC_PKT
+#define FF_API_CODEC_PKT         (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ARCH_ALPHA
+#define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ERROR_RATE
+#define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_QSCALE_TYPE
+#define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_MB_TYPE
+#define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_MAX_BFRAMES
+#define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_FAST_MALLOC
+#define FF_API_FAST_MALLOC       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_NEG_LINESIZES
+#define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_EMU_EDGE
+#define FF_API_EMU_EDGE          (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
 
 #endif /* AVCODEC_VERSION_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/xvmc.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavcodec/xvmc.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavdevice/avdevice.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavdevice/avdevice.h Changed

@@ -66,4 +66,168 @@
  */
 void avdevice_register_all(void);
 
+typedef struct AVDeviceRect {
+    int x;      /**< x coordinate of top left corner */
+    int y;      /**< y coordinate of top left corner */
+    int width;  /**< width */
+    int height; /**< height */
+} AVDeviceRect;
+
+/**
+ * Message types used by avdevice_app_to_dev_control_message().
+ */
+enum AVAppToDevMessageType {
+    /**
+     * Dummy message.
+     */
+    AV_APP_TO_DEV_NONE = MKBETAG('N','O','N','E'),
+
+    /**
+     * Window size change message.
+     *
+     * Message is sent to the device every time the application changes the size
+     * of the window device renders to.
+     * Message should also be sent right after window is created.
+     *
+     * data: AVDeviceRect: new window size.
+     */
+    AV_APP_TO_DEV_WINDOW_SIZE = MKBETAG('G','E','O','M'),
+
+    /**
+     * Repaint request message.
+     *
+     * Message is sent to the device when window have to be rapainted.
+     *
+     * data: AVDeviceRect: area required to be repainted.
+     *       NULL: whole area is required to be repainted.
+     */
+    AV_APP_TO_DEV_WINDOW_REPAINT = MKBETAG('R','E','P','A')
+};
+
+/**
+ * Message types used by avdevice_dev_to_app_control_message().
+ */
+enum AVDevToAppMessageType {
+    /**
+     * Dummy message.
+     */
+    AV_DEV_TO_APP_NONE = MKBETAG('N','O','N','E'),
+
+    /**
+     * Create window buffer message.
+     *
+     * Device requests to create a window buffer. Exact meaning is device-
+     * and application-dependent. Message is sent before rendering first
+     * frame and all one-shot initializations should be done here.
+     * Application is allowed to ignore preferred window buffer size.
+     *
+     * @note: Application is obligated to inform about window buffer size
+     *        with AV_APP_TO_DEV_WINDOW_SIZE message.
+     *
+     * data: AVDeviceRect: preferred size of the window buffer.
+     *       NULL: no preferred size of the window buffer.
+     */
+    AV_DEV_TO_APP_CREATE_WINDOW_BUFFER = MKBETAG('B','C','R','E'),
+
+    /**
+     * Prepare window buffer message.
+     *
+     * Device requests to prepare a window buffer for rendering.
+     * Exact meaning is device- and application-dependent.
+     * Message is sent before rendering of each frame.
+     *
+     * data: NULL.
+     */
+    AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER = MKBETAG('B','P','R','E'),
+
+    /**
+     * Display window buffer message.
+     *
+     * Device requests to display a window buffer.
+     * Message is sent when new frame is ready to be displyed.
+     * Usually buffers need to be swapped in handler of this message.
+     *
+     * data: NULL.
+     */
+    AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER = MKBETAG('B','D','I','S'),
+
+    /**
+     * Destroy window buffer message.
+     *
+     * Device requests to destroy a window buffer.
+     * Message is sent when device is about to be destroyed and window
+     * buffer is not required anymore.
+     *
+     * data: NULL.
+     */
+    AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER = MKBETAG('B','D','E','S')
+};
+
+/**
+ * Send control message from application to device.
+ *
+ * @param s         device context.
+ * @param type      message type.
+ * @param data      message data. Exact type depends on message type.
+ * @param data_size size of message data.
+ * @return >= 0 on success, negative on error.
+ *         AVERROR(ENOSYS) when device doesn't implement handler of the message.
+ */
+int avdevice_app_to_dev_control_message(struct AVFormatContext *s,
+                                        enum AVAppToDevMessageType type,
+                                        void *data, size_t data_size);
+
+/**
+ * Send control message from device to application.
+ *
+ * @param s         device context.
+ * @param type      message type.
+ * @param data      message data. Can be NULL.
+ * @param data_size size of message data.
+ * @return >= 0 on success, negative on error.
+ *         AVERROR(ENOSYS) when application doesn't implement handler of the message.
+ */
+int avdevice_dev_to_app_control_message(struct AVFormatContext *s,
+                                        enum AVDevToAppMessageType type,
+                                        void *data, size_t data_size);
+
+/**
+ * Structure describes basic parameters of the device.
+ */
+typedef struct AVDeviceInfo {
+    char *device_name;                   /**< device name, format depends on device */
+    char *device_description;            /**< human friendly name */
+} AVDeviceInfo;
+
+/**
+ * List of devices.
+ */
+typedef struct AVDeviceInfoList {
+    AVDeviceInfo **devices;              /**< list of autodetected devices */
+    int nb_devices;                      /**< number of autodetected devices */
+    int default_device;                  /**< index of default device or -1 if no default */
+} AVDeviceInfoList;
+
+/**
+ * List devices.
+ *
+ * Returns available device names and their parameters.
+ *
+ * @note: Some devices may accept system-dependent device names that cannot be
+ *        autodetected. The list returned by this function cannot be assumed to
+ *        be always completed.
+ *
+ * @param s                device context.
+ * @param[out] device_list list of autodetected devices.
+ * @return count of autodetected devices, negative on error.
+ */
+int avdevice_list_devices(struct AVFormatContext *s, AVDeviceInfoList **device_list);
+
+/**
+ * Convinient function to free result of avdevice_list_devices().
+ *
+ * @param devices device list to be freed.
+ */
+void avdevice_free_list_devices(AVDeviceInfoList **device_list);
+
 #endif /* AVDEVICE_AVDEVICE_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavdevice/version.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavdevice/version.h Changed

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavfilter Added

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavfilter/asrc_abuffer.h Added

@@ -0,0 +1,91 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_ASRC_ABUFFER_H
+#define AVFILTER_ASRC_ABUFFER_H
+
+#include "avfilter.h"
+
+/**
+ * @file
+ * memory buffer source for audio
+ *
+ * @deprecated use buffersrc.h instead.
+ */
+
+/**
+ * Queue an audio buffer to the audio buffer source.
+ *
+ * @param abuffersrc audio source buffer context
+ * @param data pointers to the samples planes
+ * @param linesize linesizes of each audio buffer plane
+ * @param nb_samples number of samples per channel
+ * @param sample_fmt sample format of the audio data
+ * @param ch_layout channel layout of the audio data
+ * @param planar flag to indicate if audio data is planar or packed
+ * @param pts presentation timestamp of the audio buffer
+ * @param flags unused
+ *
+ * @deprecated use av_buffersrc_add_ref() instead.
+ */
+attribute_deprecated
+int av_asrc_buffer_add_samples(AVFilterContext *abuffersrc,
+                               uint8_t *data[8], int linesize[8],
+                               int nb_samples, int sample_rate,
+                               int sample_fmt, int64_t ch_layout, int planar,
+                               int64_t pts, int av_unused flags);
+
+/**
+ * Queue an audio buffer to the audio buffer source.
+ *
+ * This is similar to av_asrc_buffer_add_samples(), but the samples
+ * are stored in a buffer with known size.
+ *
+ * @param abuffersrc audio source buffer context
+ * @param buf pointer to the samples data, packed is assumed
+ * @param size the size in bytes of the buffer, it must contain an
+ * integer number of samples
+ * @param sample_fmt sample format of the audio data
+ * @param ch_layout channel layout of the audio data
+ * @param pts presentation timestamp of the audio buffer
+ * @param flags unused
+ *
+ * @deprecated use av_buffersrc_add_ref() instead.
+ */
+attribute_deprecated
+int av_asrc_buffer_add_buffer(AVFilterContext *abuffersrc,
+                              uint8_t *buf, int buf_size,
+                              int sample_rate,
+                              int sample_fmt, int64_t ch_layout, int planar,
+                              int64_t pts, int av_unused flags);
+
+/**
+ * Queue an audio buffer to the audio buffer source.
+ *
+ * @param abuffersrc audio source buffer context
+ * @param samplesref buffer ref to queue
+ * @param flags unused
+ *
+ * @deprecated use av_buffersrc_add_ref() instead.
+ */
+attribute_deprecated
+int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *abuffersrc,
+                                        AVFilterBufferRef *samplesref,
+                                        int av_unused flags);
+
+#endif /* AVFILTER_ASRC_ABUFFER_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavfilter/avcodec.h Added

@@ -0,0 +1,110 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_AVCODEC_H
+#define AVFILTER_AVCODEC_H
+
+/**
+ * @file
+ * libavcodec/libavfilter gluing utilities
+ *
+ * This should be included in an application ONLY if the installed
+ * libavfilter has been compiled with libavcodec support, otherwise
+ * symbols defined below will not be available.
+ */
+
+#include "avfilter.h"
+
+#if FF_API_AVFILTERBUFFER
+/**
+ * Create and return a picref reference from the data and properties
+ * contained in frame.
+ *
+ * @param perms permissions to assign to the new buffer reference
+ * @deprecated avfilter APIs work natively with AVFrame instead.
+ */
+attribute_deprecated
+AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame, int perms);
+
+
+/**
+ * Create and return a picref reference from the data and properties
+ * contained in frame.
+ *
+ * @param perms permissions to assign to the new buffer reference
+ * @deprecated avfilter APIs work natively with AVFrame instead.
+ */
+attribute_deprecated
+AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame,
+                                                            int perms);
+
+/**
+ * Create and return a buffer reference from the data and properties
+ * contained in frame.
+ *
+ * @param perms permissions to assign to the new buffer reference
+ * @deprecated avfilter APIs work natively with AVFrame instead.
+ */
+attribute_deprecated
+AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type,
+                                                      const AVFrame *frame,
+                                                      int perms);
+#endif
+
+#if FF_API_FILL_FRAME
+/**
+ * Fill an AVFrame with the information stored in samplesref.
+ *
+ * @param frame an already allocated AVFrame
+ * @param samplesref an audio buffer reference
+ * @return >= 0 in case of success, a negative AVERROR code in case of
+ * failure
+ * @deprecated Use avfilter_copy_buf_props() instead.
+ */
+attribute_deprecated
+int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
+                                              const AVFilterBufferRef *samplesref);
+
+/**
+ * Fill an AVFrame with the information stored in picref.
+ *
+ * @param frame an already allocated AVFrame
+ * @param picref a video buffer reference
+ * @return >= 0 in case of success, a negative AVERROR code in case of
+ * failure
+ * @deprecated Use avfilter_copy_buf_props() instead.
+ */
+attribute_deprecated
+int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
+                                              const AVFilterBufferRef *picref);
+
+/**
+ * Fill an AVFrame with information stored in ref.
+ *
+ * @param frame an already allocated AVFrame
+ * @param ref a video or audio buffer reference
+ * @return >= 0 in case of success, a negative AVERROR code in case of
+ * failure
+ * @deprecated Use avfilter_copy_buf_props() instead.
+ */
+attribute_deprecated
+int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
+                                        const AVFilterBufferRef *ref);
+#endif
+
+#endif /* AVFILTER_AVCODEC_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavfilter/avfilter.h Added

@@ -0,0 +1,1529 @@
+/*
+ * filter layer
+ * Copyright (c) 2007 Bobby Bingham
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_AVFILTER_H
+#define AVFILTER_AVFILTER_H
+
+/**
+ * @file
+ * @ingroup lavfi
+ * Main libavfilter public API header
+ */
+
+/**
+ * @defgroup lavfi Libavfilter - graph-based frame editing library
+ * @{
+ */
+
+#include <stddef.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/avutil.h"
+#include "libavutil/dict.h"
+#include "libavutil/frame.h"
+#include "libavutil/log.h"
+#include "libavutil/samplefmt.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
+
+#include "libavfilter/version.h"
+
+/**
+ * Return the LIBAVFILTER_VERSION_INT constant.
+ */
+unsigned avfilter_version(void);
+
+/**
+ * Return the libavfilter build-time configuration.
+ */
+const char *avfilter_configuration(void);
+
+/**
+ * Return the libavfilter license.
+ */
+const char *avfilter_license(void);
+
+typedef struct AVFilterContext AVFilterContext;
+typedef struct AVFilterLink    AVFilterLink;
+typedef struct AVFilterPad     AVFilterPad;
+typedef struct AVFilterFormats AVFilterFormats;
+
+#if FF_API_AVFILTERBUFFER
+/**
+ * A reference-counted buffer data type used by the filter system. Filters
+ * should not store pointers to this structure directly, but instead use the
+ * AVFilterBufferRef structure below.
+ */
+typedef struct AVFilterBuffer {
+    uint8_t *data[8];           ///< buffer data for each plane/channel
+
+    /**
+     * pointers to the data planes/channels.
+     *
+     * For video, this should simply point to data[].
+     *
+     * For planar audio, each channel has a separate data pointer, and
+     * linesize[0] contains the size of each channel buffer.
+     * For packed audio, there is just one data pointer, and linesize[0]
+     * contains the total size of the buffer for all channels.
+     *
+     * Note: Both data and extended_data will always be set, but for planar
+     * audio with more channels that can fit in data, extended_data must be used
+     * in order to access all channels.
+     */
+    uint8_t **extended_data;
+    int linesize[8];            ///< number of bytes per line
+
+    /** private data to be used by a custom free function */
+    void *priv;
+    /**
+     * A pointer to the function to deallocate this buffer if the default
+     * function is not sufficient. This could, for example, add the memory
+     * back into a memory pool to be reused later without the overhead of
+     * reallocating it from scratch.
+     */
+    void (*free)(struct AVFilterBuffer *buf);
+
+    int format;                 ///< media format
+    int w, h;                   ///< width and height of the allocated buffer
+    unsigned refcount;          ///< number of references to this buffer
+} AVFilterBuffer;
+
+#define AV_PERM_READ     0x01   ///< can read from the buffer
+#define AV_PERM_WRITE    0x02   ///< can write to the buffer
+#define AV_PERM_PRESERVE 0x04   ///< nobody else can overwrite the buffer
+#define AV_PERM_REUSE    0x08   ///< can output the buffer multiple times, with the same contents each time
+#define AV_PERM_REUSE2   0x10   ///< can output the buffer multiple times, modified each time
+#define AV_PERM_NEG_LINESIZES 0x20  ///< the buffer requested can have negative linesizes
+#define AV_PERM_ALIGN    0x40   ///< the buffer must be aligned
+
+#define AVFILTER_ALIGN 16 //not part of ABI
+
+/**
+ * Audio specific properties in a reference to an AVFilterBuffer. Since
+ * AVFilterBufferRef is common to different media formats, audio specific
+ * per reference properties must be separated out.
+ */
+typedef struct AVFilterBufferRefAudioProps {
+    uint64_t channel_layout;    ///< channel layout of audio buffer
+    int nb_samples;             ///< number of audio samples per channel
+    int sample_rate;            ///< audio buffer sample rate
+    int channels;               ///< number of channels (do not access directly)
+} AVFilterBufferRefAudioProps;
+
+/**
+ * Video specific properties in a reference to an AVFilterBuffer. Since
+ * AVFilterBufferRef is common to different media formats, video specific
+ * per reference properties must be separated out.
+ */
+typedef struct AVFilterBufferRefVideoProps {
+    int w;                      ///< image width
+    int h;                      ///< image height
+    AVRational sample_aspect_ratio; ///< sample aspect ratio
+    int interlaced;             ///< is frame interlaced
+    int top_field_first;        ///< field order
+    enum AVPictureType pict_type; ///< picture type of the frame
+    int key_frame;              ///< 1 -> keyframe, 0-> not
+    int qp_table_linesize;                ///< qp_table stride
+    int qp_table_size;            ///< qp_table size
+    int8_t *qp_table;             ///< array of Quantization Parameters
+} AVFilterBufferRefVideoProps;
+
+/**
+ * A reference to an AVFilterBuffer. Since filters can manipulate the origin of
+ * a buffer to, for example, crop image without any memcpy, the buffer origin
+ * and dimensions are per-reference properties. Linesize is also useful for
+ * image flipping, frame to field filters, etc, and so is also per-reference.
+ *
+ * TODO: add anything necessary for frame reordering
+ */
+typedef struct AVFilterBufferRef {
+    AVFilterBuffer *buf;        ///< the buffer that this is a reference to
+    uint8_t *data[8];           ///< picture/audio data for each plane
+    /**
+     * pointers to the data planes/channels.
+     *
+     * For video, this should simply point to data[].
+     *
+     * For planar audio, each channel has a separate data pointer, and
+     * linesize[0] contains the size of each channel buffer.
+     * For packed audio, there is just one data pointer, and linesize[0]
+     * contains the total size of the buffer for all channels.
+     *
+     * Note: Both data and extended_data will always be set, but for planar
+     * audio with more channels that can fit in data, extended_data must be used
+     * in order to access all channels.
+     */
+    uint8_t **extended_data;
+    int linesize[8];            ///< number of bytes per line
+
+    AVFilterBufferRefVideoProps *video; ///< video buffer specific properties
+    AVFilterBufferRefAudioProps *audio; ///< audio buffer specific properties
+
+    /**
+     * presentation timestamp. The time unit may change during
+     * filtering, as it is specified in the link and the filter code
+     * may need to rescale the PTS accordingly.
+     */
+    int64_t pts;
+    int64_t pos;                ///< byte position in stream, -1 if unknown
+
+    int format;                 ///< media format
+
+    int perms;                  ///< permissions, see the AV_PERM_* flags
+
+    enum AVMediaType type;      ///< media type of buffer data
+
+    AVDictionary *metadata;     ///< dictionary containing metadata key=value tags
+} AVFilterBufferRef;
+
+/**
+ * Copy properties of src to dst, without copying the actual data
+ */
+attribute_deprecated
+void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src);
+
+/**
+ * Add a new reference to a buffer.
+ *
+ * @param ref   an existing reference to the buffer
+ * @param pmask a bitmask containing the allowable permissions in the new
+ *              reference
+ * @return      a new reference to the buffer with the same properties as the
+ *              old, excluding any permissions denied by pmask
+ */
+attribute_deprecated
+AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask);
+
+/**
+ * Remove a reference to a buffer. If this is the last reference to the
+ * buffer, the buffer itself is also automatically freed.
+ *
+ * @param ref reference to the buffer, may be NULL
+ *
+ * @note it is recommended to use avfilter_unref_bufferp() instead of this
+ * function
+ */
+attribute_deprecated
+void avfilter_unref_buffer(AVFilterBufferRef *ref);
+
+/**
+ * Remove a reference to a buffer and set the pointer to NULL.
+ * If this is the last reference to the buffer, the buffer itself
+ * is also automatically freed.
+ *
+ * @param ref pointer to the buffer reference
+ */
+attribute_deprecated
+void avfilter_unref_bufferp(AVFilterBufferRef **ref);
+#endif
+
+/**
+ * Get the number of channels of a buffer reference.
+ */
+attribute_deprecated
+int avfilter_ref_get_channels(AVFilterBufferRef *ref);
+
+#if FF_API_AVFILTERPAD_PUBLIC
+/**
+ * A filter pad used for either input or output.
+ *
+ * See doc/filter_design.txt for details on how to implement the methods.
+ *
+ * @warning this struct might be removed from public API.
+ * users should call avfilter_pad_get_name() and avfilter_pad_get_type()
+ * to access the name and type fields; there should be no need to access
+ * any other fields from outside of libavfilter.
+ */
+struct AVFilterPad {
+    /**
+     * Pad name. The name is unique among inputs and among outputs, but an
+     * input may have the same name as an output. This may be NULL if this
+     * pad has no need to ever be referenced by name.
+     */
+    const char *name;
+
+    /**
+     * AVFilterPad type.
+     */
+    enum AVMediaType type;
+
+    /**
+     * Input pads:
+     * Minimum required permissions on incoming buffers. Any buffer with
+     * insufficient permissions will be automatically copied by the filter
+     * system to a new buffer which provides the needed access permissions.
+     *
+     * Output pads:
+     * Guaranteed permissions on outgoing buffers. Any buffer pushed on the
+     * link must have at least these permissions; this fact is checked by
+     * asserts. It can be used to optimize buffer allocation.
+     */
+    attribute_deprecated int min_perms;
+
+    /**
+     * Input pads:
+     * Permissions which are not accepted on incoming buffers. Any buffer
+     * which has any of these permissions set will be automatically copied
+     * by the filter system to a new buffer which does not have those
+     * permissions. This can be used to easily disallow buffers with
+     * AV_PERM_REUSE.
+     *
+     * Output pads:
+     * Permissions which are automatically removed on outgoing buffers. It
+     * can be used to optimize buffer allocation.
+     */
+    attribute_deprecated int rej_perms;
+
+    /**
+     * @deprecated unused
+     */
+    int (*start_frame)(AVFilterLink *link, AVFilterBufferRef *picref);
+
+    /**
+     * Callback function to get a video buffer. If NULL, the filter system will
+     * use ff_default_get_video_buffer().
+     *
+     * Input video pads only.
+     */
+    AVFrame *(*get_video_buffer)(AVFilterLink *link, int w, int h);
+
+    /**
+     * Callback function to get an audio buffer. If NULL, the filter system will
+     * use ff_default_get_audio_buffer().
+     *
+     * Input audio pads only.
+     */
+    AVFrame *(*get_audio_buffer)(AVFilterLink *link, int nb_samples);
+
+    /**
+     * @deprecated unused
+     */
+    int (*end_frame)(AVFilterLink *link);
+
+    /**
+     * @deprecated unused
+     */
+    int (*draw_slice)(AVFilterLink *link, int y, int height, int slice_dir);
+
+    /**
+     * Filtering callback. This is where a filter receives a frame with
+     * audio/video data and should do its processing.
+     *
+     * Input pads only.
+     *
+     * @return >= 0 on success, a negative AVERROR on error. This function
+     * must ensure that frame is properly unreferenced on error if it
+     * hasn't been passed on to another filter.
+     */
+    int (*filter_frame)(AVFilterLink *link, AVFrame *frame);
+
+    /**
+     * Frame poll callback. This returns the number of immediately available
+     * samples. It should return a positive value if the next request_frame()
+     * is guaranteed to return one frame (with no delay).
+     *
+     * Defaults to just calling the source poll_frame() method.
+     *
+     * Output pads only.
+     */
+    int (*poll_frame)(AVFilterLink *link);
+
+    /**
+     * Frame request callback. A call to this should result in at least one
+     * frame being output over the given link. This should return zero on
+     * success, and another value on error.
+     * See ff_request_frame() for the error codes with a specific
+     * meaning.
+     *
+     * Output pads only.
+     */
+    int (*request_frame)(AVFilterLink *link);
+
+    /**
+     * Link configuration callback.
+     *
+     * For output pads, this should set the following link properties:
+     * video: width, height, sample_aspect_ratio, time_base
+     * audio: sample_rate.
+     *
+     * This should NOT set properties such as format, channel_layout, etc which
+     * are negotiated between filters by the filter system using the
+     * query_formats() callback before this function is called.
+     *
+     * For input pads, this should check the properties of the link, and update
+     * the filter's internal state as necessary.
+     *
+     * For both input and output pads, this should return zero on success,
+     * and another value on error.
+     */
+    int (*config_props)(AVFilterLink *link);
+
+    /**
+     * The filter expects a fifo to be inserted on its input link,
+     * typically because it has a delay.
+     *
+     * input pads only.
+     */
+    int needs_fifo;
+
+    /**
+     * The filter expects writable frames from its input link,
+     * duplicating data buffers if needed.
+     *
+     * input pads only.
+     */
+    int needs_writable;
+};
+#endif
+
+/**
+ * Get the number of elements in a NULL-terminated array of AVFilterPads (e.g.
+ * AVFilter.inputs/outputs).
+ */
+int avfilter_pad_count(const AVFilterPad *pads);
+
+/**
+ * Get the name of an AVFilterPad.
+ *
+ * @param pads an array of AVFilterPads
+ * @param pad_idx index of the pad in the array it; is the caller's
+ *                responsibility to ensure the index is valid
+ *
+ * @return name of the pad_idx'th pad in pads
+ */
+const char *avfilter_pad_get_name(const AVFilterPad *pads, int pad_idx);
+
+/**
+ * Get the type of an AVFilterPad.
+ *
+ * @param pads an array of AVFilterPads
+ * @param pad_idx index of the pad in the array; it is the caller's
+ *                responsibility to ensure the index is valid
+ *
+ * @return type of the pad_idx'th pad in pads
+ */
+enum AVMediaType avfilter_pad_get_type(const AVFilterPad *pads, int pad_idx);
+
+/**
+ * The number of the filter inputs is not determined just by AVFilter.inputs.
+ * The filter might add additional inputs during initialization depending on the
+ * options supplied to it.
+ */
+#define AVFILTER_FLAG_DYNAMIC_INPUTS        (1 << 0)
+/**
+ * The number of the filter outputs is not determined just by AVFilter.outputs.
+ * The filter might add additional outputs during initialization depending on
+ * the options supplied to it.
+ */
+#define AVFILTER_FLAG_DYNAMIC_OUTPUTS       (1 << 1)
+/**
+ * The filter supports multithreading by splitting frames into multiple parts
+ * and processing them concurrently.
+ */
+#define AVFILTER_FLAG_SLICE_THREADS         (1 << 2)
+/**
+ * Some filters support a generic "enable" expression option that can be used
+ * to enable or disable a filter in the timeline. Filters supporting this
+ * option have this flag set. When the enable expression is false, the default
+ * no-op filter_frame() function is called in place of the filter_frame()
+ * callback defined on each input pad, thus the frame is passed unchanged to
+ * the next filters.
+ */
+#define AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC  (1 << 16)
+/**
+ * Same as AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, except that the filter will
+ * have its filter_frame() callback(s) called as usual even when the enable
+ * expression is false. The filter will disable filtering within the
+ * filter_frame() callback(s) itself, for example executing code depending on
+ * the AVFilterContext->is_disabled value.
+ */
+#define AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL (1 << 17)
+/**
+ * Handy mask to test whether the filter supports or no the timeline feature
+ * (internally or generically).
+ */
+#define AVFILTER_FLAG_SUPPORT_TIMELINE (AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL)
+
+/**
+ * Filter definition. This defines the pads a filter contains, and all the
+ * callback functions used to interact with the filter.
+ */
+typedef struct AVFilter {
+    /**
+     * Filter name. Must be non-NULL and unique among filters.
+     */
+    const char *name;
+
+    /**
+     * A description of the filter. May be NULL.
+     *
+     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
+     */
+    const char *description;
+
+    /**
+     * List of inputs, terminated by a zeroed element.
+     *
+     * NULL if there are no (static) inputs. Instances of filters with
+     * AVFILTER_FLAG_DYNAMIC_INPUTS set may have more inputs than present in
+     * this list.
+     */
+    const AVFilterPad *inputs;
+    /**
+     * List of outputs, terminated by a zeroed element.
+     *
+     * NULL if there are no (static) outputs. Instances of filters with
+     * AVFILTER_FLAG_DYNAMIC_OUTPUTS set may have more outputs than present in
+     * this list.
+     */
+    const AVFilterPad *outputs;
+
+    /**
+     * A class for the private data, used to declare filter private AVOptions.
+     * This field is NULL for filters that do not declare any options.
+     *
+     * If this field is non-NULL, the first member of the filter private data
+     * must be a pointer to AVClass, which will be set by libavfilter generic
+     * code to this class.
+     */
+    const AVClass *priv_class;
+
+    /**
+     * A combination of AVFILTER_FLAG_*
+     */
+    int flags;
+
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavfilter and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+
+    /**
+     * Filter initialization function.
+     *
+     * This callback will be called only once during the filter lifetime, after
+     * all the options have been set, but before links between filters are
+     * established and format negotiation is done.
+     *
+     * Basic filter initialization should be done here. Filters with dynamic
+     * inputs and/or outputs should create those inputs/outputs here based on
+     * provided options. No more changes to this filter's inputs/outputs can be
+     * done after this callback.
+     *
+     * This callback must not assume that the filter links exist or frame
+     * parameters are known.
+     *
+     * @ref AVFilter.uninit "uninit" is guaranteed to be called even if
+     * initialization fails, so this callback does not have to clean up on
+     * failure.
+     *
+     * @return 0 on success, a negative AVERROR on failure
+     */
+    int (*init)(AVFilterContext *ctx);
+
+    /**
+     * Should be set instead of @ref AVFilter.init "init" by the filters that
+     * want to pass a dictionary of AVOptions to nested contexts that are
+     * allocated during init.
+     *
+     * On return, the options dict should be freed and replaced with one that
+     * contains all the options which could not be processed by this filter (or
+     * with NULL if all the options were processed).
+     *
+     * Otherwise the semantics is the same as for @ref AVFilter.init "init".
+     */
+    int (*init_dict)(AVFilterContext *ctx, AVDictionary **options);
+
+    /**
+     * Filter uninitialization function.
+     *
+     * Called only once right before the filter is freed. Should deallocate any
+     * memory held by the filter, release any buffer references, etc. It does
+     * not need to deallocate the AVFilterContext.priv memory itself.
+     *
+     * This callback may be called even if @ref AVFilter.init "init" was not
+     * called or failed, so it must be prepared to handle such a situation.
+     */
+    void (*uninit)(AVFilterContext *ctx);
+
+    /**
+     * Query formats supported by the filter on its inputs and outputs.
+     *
+     * This callback is called after the filter is initialized (so the inputs
+     * and outputs are fixed), shortly before the format negotiation. This
+     * callback may be called more than once.
+     *
+     * This callback must set AVFilterLink.out_formats on every input link and
+     * AVFilterLink.in_formats on every output link to a list of pixel/sample
+     * formats that the filter supports on that link. For audio links, this
+     * filter must also set @ref AVFilterLink.in_samplerates "in_samplerates" /
+     * @ref AVFilterLink.out_samplerates "out_samplerates" and
+     * @ref AVFilterLink.in_channel_layouts "in_channel_layouts" /
+     * @ref AVFilterLink.out_channel_layouts "out_channel_layouts" analogously.
+     *
+     * This callback may be NULL for filters with one input, in which case
+     * libavfilter assumes that it supports all input formats and preserves
+     * them on output.
+     *
+     * @return zero on success, a negative value corresponding to an
+     * AVERROR code otherwise
+     */
+    int (*query_formats)(AVFilterContext *);
+
+    int priv_size;      ///< size of private data to allocate for the filter
+
+    /**
+     * Used by the filter registration system. Must not be touched by any other
+     * code.
+     */
+    struct AVFilter *next;
+
+    /**
+     * Make the filter instance process a command.
+     *
+     * @param cmd    the command to process, for handling simplicity all commands must be alphanumeric only
+     * @param arg    the argument for the command
+     * @param res    a buffer with size res_size where the filter(s) can return a response. This must not change when the command is not supported.
+     * @param flags  if AVFILTER_CMD_FLAG_FAST is set and the command would be
+     *               time consuming then a filter should treat it like an unsupported command
+     *
+     * @returns >=0 on success otherwise an error code.
+     *          AVERROR(ENOSYS) on unsupported commands
+     */
+    int (*process_command)(AVFilterContext *, const char *cmd, const char *arg, char *res, int res_len, int flags);
+
+    /**
+     * Filter initialization function, alternative to the init()
+     * callback. Args contains the user-supplied parameters, opaque is
+     * used for providing binary data.
+     */
+    int (*init_opaque)(AVFilterContext *ctx, void *opaque);
+} AVFilter;
+
+/**
+ * Process multiple parts of the frame concurrently.
+ */
+#define AVFILTER_THREAD_SLICE (1 << 0)
+
+typedef struct AVFilterInternal AVFilterInternal;
+
+/** An instance of a filter */
+struct AVFilterContext {
+    const AVClass *av_class;        ///< needed for av_log() and filters common options
+
+    const AVFilter *filter;         ///< the AVFilter of which this is an instance
+
+    char *name;                     ///< name of this filter instance
+
+    AVFilterPad   *input_pads;      ///< array of input pads
+    AVFilterLink **inputs;          ///< array of pointers to input links
+#if FF_API_FOO_COUNT
+    attribute_deprecated unsigned input_count; ///< @deprecated use nb_inputs
+#endif
+    unsigned    nb_inputs;          ///< number of input pads
+
+    AVFilterPad   *output_pads;     ///< array of output pads
+    AVFilterLink **outputs;         ///< array of pointers to output links
+#if FF_API_FOO_COUNT
+    attribute_deprecated unsigned output_count; ///< @deprecated use nb_outputs
+#endif
+    unsigned    nb_outputs;         ///< number of output pads
+
+    void *priv;                     ///< private data for use by the filter
+
+    struct AVFilterGraph *graph;    ///< filtergraph this filter belongs to
+
+    /**
+     * Type of multithreading being allowed/used. A combination of
+     * AVFILTER_THREAD_* flags.
+     *
+     * May be set by the caller before initializing the filter to forbid some
+     * or all kinds of multithreading for this filter. The default is allowing
+     * everything.
+     *
+     * When the filter is initialized, this field is combined using bit AND with
+     * AVFilterGraph.thread_type to get the final mask used for determining
+     * allowed threading types. I.e. a threading type needs to be set in both
+     * to be allowed.
+     *
+     * After the filter is initialzed, libavfilter sets this field to the
+     * threading type that is actually used (0 for no multithreading).
+     */
+    int thread_type;
+
+    /**
+     * An opaque struct for libavfilter internal use.
+     */
+    AVFilterInternal *internal;
+
+    struct AVFilterCommand *command_queue;
+
+    char *enable_str;               ///< enable expression string
+    void *enable;                   ///< parsed expression (AVExpr*)
+    double *var_values;             ///< variable values for the enable expression
+    int is_disabled;                ///< the enabled state from the last expression evaluation
+};
+
+/**
+ * A link between two filters. This contains pointers to the source and
+ * destination filters between which this link exists, and the indexes of
+ * the pads involved. In addition, this link also contains the parameters
+ * which have been negotiated and agreed upon between the filter, such as
+ * image dimensions, format, etc.
+ */
+struct AVFilterLink {
+    AVFilterContext *src;       ///< source filter
+    AVFilterPad *srcpad;        ///< output pad on the source filter
+
+    AVFilterContext *dst;       ///< dest filter
+    AVFilterPad *dstpad;        ///< input pad on the dest filter
+
+    enum AVMediaType type;      ///< filter media type
+
+    /* These parameters apply only to video */
+    int w;                      ///< agreed upon image width
+    int h;                      ///< agreed upon image height
+    AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio
+    /* These parameters apply only to audio */
+    uint64_t channel_layout;    ///< channel layout of current buffer (see libavutil/channel_layout.h)
+    int sample_rate;            ///< samples per second
+
+    int format;                 ///< agreed upon media format
+
+    /**
+     * Define the time base used by the PTS of the frames/samples
+     * which will pass through this link.
+     * During the configuration stage, each filter is supposed to
+     * change only the output timebase, while the timebase of the
+     * input link is assumed to be an unchangeable property.
+     */
+    AVRational time_base;
+
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavfilter and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    /**
+     * Lists of formats and channel layouts supported by the input and output
+     * filters respectively. These lists are used for negotiating the format
+     * to actually be used, which will be loaded into the format and
+     * channel_layout members, above, when chosen.
+     *
+     */
+    AVFilterFormats *in_formats;
+    AVFilterFormats *out_formats;
+
+    /**
+     * Lists of channel layouts and sample rates used for automatic
+     * negotiation.
+     */
+    AVFilterFormats  *in_samplerates;
+    AVFilterFormats *out_samplerates;
+    struct AVFilterChannelLayouts  *in_channel_layouts;
+    struct AVFilterChannelLayouts *out_channel_layouts;
+
+    /**
+     * Audio only, the destination filter sets this to a non-zero value to
+     * request that buffers with the given number of samples should be sent to
+     * it. AVFilterPad.needs_fifo must also be set on the corresponding input
+     * pad.
+     * Last buffer before EOF will be padded with silence.
+     */
+    int request_samples;
+
+    /** stage of the initialization of the link properties (dimensions, etc) */
+    enum {
+        AVLINK_UNINIT = 0,      ///< not started
+        AVLINK_STARTINIT,       ///< started, but incomplete
+        AVLINK_INIT             ///< complete
+    } init_state;
+
+    struct AVFilterPool *pool;
+
+    /**
+     * Graph the filter belongs to.
+     */
+    struct AVFilterGraph *graph;
+
+    /**
+     * Current timestamp of the link, as defined by the most recent
+     * frame(s), in AV_TIME_BASE units.
+     */
+    int64_t current_pts;
+
+    /**
+     * Index in the age array.
+     */
+    int age_index;
+
+    /**
+     * Frame rate of the stream on the link, or 1/0 if unknown;
+     * if left to 0/0, will be automatically be copied from the first input
+     * of the source filter if it exists.
+     *
+     * Sources should set it to the best estimation of the real frame rate.
+     * Filters should update it if necessary depending on their function.
+     * Sinks can use it to set a default output frame rate.
+     * It is similar to the r_frame_rate field in AVStream.
+     */
+    AVRational frame_rate;
+
+    /**
+     * Buffer partially filled with samples to achieve a fixed/minimum size.
+     */
+    AVFrame *partial_buf;
+
+    /**
+     * Size of the partial buffer to allocate.
+     * Must be between min_samples and max_samples.
+     */
+    int partial_buf_size;
+
+    /**
+     * Minimum number of samples to filter at once. If filter_frame() is
+     * called with fewer samples, it will accumulate them in partial_buf.
+     * This field and the related ones must not be changed after filtering
+     * has started.
+     * If 0, all related fields are ignored.
+     */
+    int min_samples;
+
+    /**
+     * Maximum number of samples to filter at once. If filter_frame() is
+     * called with more samples, it will split them.
+     */
+    int max_samples;
+
+    /**
+     * The buffer reference currently being received across the link by the
+     * destination filter. This is used internally by the filter system to
+     * allow automatic copying of buffers which do not have sufficient
+     * permissions for the destination. This should not be accessed directly
+     * by the filters.
+     */
+    AVFilterBufferRef *cur_buf_copy;
+
+    /**
+     * True if the link is closed.
+     * If set, all attemps of start_frame, filter_frame or request_frame
+     * will fail with AVERROR_EOF, and if necessary the reference will be
+     * destroyed.
+     * If request_frame returns AVERROR_EOF, this flag is set on the
+     * corresponding link.
+     * It can be set also be set by either the source or the destination
+     * filter.
+     */
+    int closed;
+
+    /**
+     * Number of channels.
+     */
+    int channels;
+
+    /**
+     * True if a frame is being requested on the link.
+     * Used internally by the framework.
+     */
+    unsigned frame_requested;
+
+    /**
+     * Link processing flags.
+     */
+    unsigned flags;
+
+    /**
+     * Number of past frames sent through the link.
+     */
+    int64_t frame_count;
+};
+
+/**
+ * Link two filters together.
+ *
+ * @param src    the source filter
+ * @param srcpad index of the output pad on the source filter
+ * @param dst    the destination filter
+ * @param dstpad index of the input pad on the destination filter
+ * @return       zero on success
+ */
+int avfilter_link(AVFilterContext *src, unsigned srcpad,
+                  AVFilterContext *dst, unsigned dstpad);
+
+/**
+ * Free the link in *link, and set its pointer to NULL.
+ */
+void avfilter_link_free(AVFilterLink **link);
+
+/**
+ * Get the number of channels of a link.
+ */
+int avfilter_link_get_channels(AVFilterLink *link);
+
+/**
+ * Set the closed field of a link.
+ */
+void avfilter_link_set_closed(AVFilterLink *link, int closed);
+
+/**
+ * Negotiate the media format, dimensions, etc of all inputs to a filter.
+ *
+ * @param filter the filter to negotiate the properties for its inputs
+ * @return       zero on successful negotiation
+ */
+int avfilter_config_links(AVFilterContext *filter);
+
+#if FF_API_AVFILTERBUFFER
+/**
+ * Create a buffer reference wrapped around an already allocated image
+ * buffer.
+ *
+ * @param data pointers to the planes of the image to reference
+ * @param linesize linesizes for the planes of the image to reference
+ * @param perms the required access permissions
+ * @param w the width of the image specified by the data and linesize arrays
+ * @param h the height of the image specified by the data and linesize arrays
+ * @param format the pixel format of the image specified by the data and linesize arrays
+ */
+attribute_deprecated
+AVFilterBufferRef *
+avfilter_get_video_buffer_ref_from_arrays(uint8_t * const data[4], const int linesize[4], int perms,
+                                          int w, int h, enum AVPixelFormat format);
+
+/**
+ * Create an audio buffer reference wrapped around an already
+ * allocated samples buffer.
+ *
+ * See avfilter_get_audio_buffer_ref_from_arrays_channels() for a version
+ * that can handle unknown channel layouts.
+ *
+ * @param data           pointers to the samples plane buffers
+ * @param linesize       linesize for the samples plane buffers
+ * @param perms          the required access permissions
+ * @param nb_samples     number of samples per channel
+ * @param sample_fmt     the format of each sample in the buffer to allocate
+ * @param channel_layout the channel layout of the buffer
+ */
+attribute_deprecated
+AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data,
+                                                             int linesize,
+                                                             int perms,
+                                                             int nb_samples,
+                                                             enum AVSampleFormat sample_fmt,
+                                                             uint64_t channel_layout);
+/**
+ * Create an audio buffer reference wrapped around an already
+ * allocated samples buffer.
+ *
+ * @param data           pointers to the samples plane buffers
+ * @param linesize       linesize for the samples plane buffers
+ * @param perms          the required access permissions
+ * @param nb_samples     number of samples per channel
+ * @param sample_fmt     the format of each sample in the buffer to allocate
+ * @param channels       the number of channels of the buffer
+ * @param channel_layout the channel layout of the buffer,
+ *                       must be either 0 or consistent with channels
+ */
+attribute_deprecated
+AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_arrays_channels(uint8_t **data,
+                                                                      int linesize,
+                                                                      int perms,
+                                                                      int nb_samples,
+                                                                      enum AVSampleFormat sample_fmt,
+                                                                      int channels,
+                                                                      uint64_t channel_layout);
+
+#endif
+
+
+#define AVFILTER_CMD_FLAG_ONE   1 ///< Stop once a filter understood the command (for target=all for example), fast filters are favored automatically
+#define AVFILTER_CMD_FLAG_FAST  2 ///< Only execute command when its fast (like a video out that supports contrast adjustment in hw)
+
+/**
+ * Make the filter instance process a command.
+ * It is recommended to use avfilter_graph_send_command().
+ */
+int avfilter_process_command(AVFilterContext *filter, const char *cmd, const char *arg, char *res, int res_len, int flags);
+
+/** Initialize the filter system. Register all builtin filters. */
+void avfilter_register_all(void);
+
+#if FF_API_OLD_FILTER_REGISTER
+/** Uninitialize the filter system. Unregister all filters. */
+attribute_deprecated
+void avfilter_uninit(void);
+#endif
+
+/**
+ * Register a filter. This is only needed if you plan to use
+ * avfilter_get_by_name later to lookup the AVFilter structure by name. A
+ * filter can still by instantiated with avfilter_graph_alloc_filter even if it
+ * is not registered.
+ *
+ * @param filter the filter to register
+ * @return 0 if the registration was successful, a negative value
+ * otherwise
+ */
+int avfilter_register(AVFilter *filter);
+
+/**
+ * Get a filter definition matching the given name.
+ *
+ * @param name the filter name to find
+ * @return     the filter definition, if any matching one is registered.
+ *             NULL if none found.
+ */
+#if !FF_API_NOCONST_GET_NAME
+const
+#endif
+AVFilter *avfilter_get_by_name(const char *name);
+
+/**
+ * Iterate over all registered filters.
+ * @return If prev is non-NULL, next registered filter after prev or NULL if
+ * prev is the last filter. If prev is NULL, return the first registered filter.
+ */
+const AVFilter *avfilter_next(const AVFilter *prev);
+
+#if FF_API_OLD_FILTER_REGISTER
+/**
+ * If filter is NULL, returns a pointer to the first registered filter pointer,
+ * if filter is non-NULL, returns the next pointer after filter.
+ * If the returned pointer points to NULL, the last registered filter
+ * was already reached.
+ * @deprecated use avfilter_next()
+ */
+attribute_deprecated
+AVFilter **av_filter_next(AVFilter **filter);
+#endif
+
+#if FF_API_AVFILTER_OPEN
+/**
+ * Create a filter instance.
+ *
+ * @param filter_ctx put here a pointer to the created filter context
+ * on success, NULL on failure
+ * @param filter    the filter to create an instance of
+ * @param inst_name Name to give to the new instance. Can be NULL for none.
+ * @return >= 0 in case of success, a negative error code otherwise
+ * @deprecated use avfilter_graph_alloc_filter() instead
+ */
+attribute_deprecated
+int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);
+#endif
+
+
+#if FF_API_AVFILTER_INIT_FILTER
+/**
+ * Initialize a filter.
+ *
+ * @param filter the filter to initialize
+ * @param args   A string of parameters to use when initializing the filter.
+ *               The format and meaning of this string varies by filter.
+ * @param opaque Any extra non-string data needed by the filter. The meaning
+ *               of this parameter varies by filter.
+ * @return       zero on success
+ */
+attribute_deprecated
+int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque);
+#endif
+
+/**
+ * Initialize a filter with the supplied parameters.
+ *
+ * @param ctx  uninitialized filter context to initialize
+ * @param args Options to initialize the filter with. This must be a
+ *             ':'-separated list of options in the 'key=value' form.
+ *             May be NULL if the options have been set directly using the
+ *             AVOptions API or there are no options that need to be set.
+ * @return 0 on success, a negative AVERROR on failure
+ */
+int avfilter_init_str(AVFilterContext *ctx, const char *args);
+
+/**
+ * Initialize a filter with the supplied dictionary of options.
+ *
+ * @param ctx     uninitialized filter context to initialize
+ * @param options An AVDictionary filled with options for this filter. On
+ *                return this parameter will be destroyed and replaced with
+ *                a dict containing options that were not found. This dictionary
+ *                must be freed by the caller.
+ *                May be NULL, then this function is equivalent to
+ *                avfilter_init_str() with the second parameter set to NULL.
+ * @return 0 on success, a negative AVERROR on failure
+ *
+ * @note This function and avfilter_init_str() do essentially the same thing,
+ * the difference is in manner in which the options are passed. It is up to the
+ * calling code to choose whichever is more preferable. The two functions also
+ * behave differently when some of the provided options are not declared as
+ * supported by the filter. In such a case, avfilter_init_str() will fail, but
+ * this function will leave those extra options in the options AVDictionary and
+ * continue as usual.
+ */
+int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options);
+
+/**
+ * Free a filter context. This will also remove the filter from its
+ * filtergraph's list of filters.
+ *
+ * @param filter the filter to free
+ */
+void avfilter_free(AVFilterContext *filter);
+
+/**
+ * Insert a filter in the middle of an existing link.
+ *
+ * @param link the link into which the filter should be inserted
+ * @param filt the filter to be inserted
+ * @param filt_srcpad_idx the input pad on the filter to connect
+ * @param filt_dstpad_idx the output pad on the filter to connect
+ * @return     zero on success
+ */
+int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
+                           unsigned filt_srcpad_idx, unsigned filt_dstpad_idx);
+
+#if FF_API_AVFILTERBUFFER
+/**
+ * Copy the frame properties of src to dst, without copying the actual
+ * image data.
+ *
+ * @return 0 on success, a negative number on error.
+ */
+attribute_deprecated
+int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src);
+
+/**
+ * Copy the frame properties and data pointers of src to dst, without copying
+ * the actual data.
+ *
+ * @return 0 on success, a negative number on error.
+ */
+attribute_deprecated
+int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src);
+#endif
+
+/**
+ * @return AVClass for AVFilterContext.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avfilter_get_class(void);
+
+typedef struct AVFilterGraphInternal AVFilterGraphInternal;
+
+/**
+ * A function pointer passed to the @ref AVFilterGraph.execute callback to be
+ * executed multiple times, possibly in parallel.
+ *
+ * @param ctx the filter context the job belongs to
+ * @param arg an opaque parameter passed through from @ref
+ *            AVFilterGraph.execute
+ * @param jobnr the index of the job being executed
+ * @param nb_jobs the total number of jobs
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+typedef int (avfilter_action_func)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
+
+/**
+ * A function executing multiple jobs, possibly in parallel.
+ *
+ * @param ctx the filter context to which the jobs belong
+ * @param func the function to be called multiple times
+ * @param arg the argument to be passed to func
+ * @param ret a nb_jobs-sized array to be filled with return values from each
+ *            invocation of func
+ * @param nb_jobs the number of jobs to execute
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+typedef int (avfilter_execute_func)(AVFilterContext *ctx, avfilter_action_func *func,
+                                    void *arg, int *ret, int nb_jobs);
+
+typedef struct AVFilterGraph {
+    const AVClass *av_class;
+#if FF_API_FOO_COUNT
+    attribute_deprecated
+    unsigned filter_count_unused;
+#endif
+    AVFilterContext **filters;
+#if !FF_API_FOO_COUNT
+    unsigned nb_filters;
+#endif
+
+    char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
+    char *resample_lavr_opts;   ///< libavresample options to use for the auto-inserted resample filters
+#if FF_API_FOO_COUNT
+    unsigned nb_filters;
+#endif
+
+    /**
+     * Type of multithreading allowed for filters in this graph. A combination
+     * of AVFILTER_THREAD_* flags.
+     *
+     * May be set by the caller at any point, the setting will apply to all
+     * filters initialized after that. The default is allowing everything.
+     *
+     * When a filter in this graph is initialized, this field is combined using
+     * bit AND with AVFilterContext.thread_type to get the final mask used for
+     * determining allowed threading types. I.e. a threading type needs to be
+     * set in both to be allowed.
+     */
+    int thread_type;
+
+    /**
+     * Maximum number of threads used by filters in this graph. May be set by
+     * the caller before adding any filters to the filtergraph. Zero (the
+     * default) means that the number of threads is determined automatically.
+     */
+    int nb_threads;
+
+    /**
+     * Opaque object for libavfilter internal use.
+     */
+    AVFilterGraphInternal *internal;
+
+    /**
+     * Opaque user data. May be set by the caller to an arbitrary value, e.g. to
+     * be used from callbacks like @ref AVFilterGraph.execute.
+     * Libavfilter will not touch this field in any way.
+     */
+    void *opaque;
+
+    /**
+     * This callback may be set by the caller immediately after allocating the
+     * graph and before adding any filters to it, to provide a custom
+     * multithreading implementation.
+     *
+     * If set, filters with slice threading capability will call this callback
+     * to execute multiple jobs in parallel.
+     *
+     * If this field is left unset, libavfilter will use its internal
+     * implementation, which may or may not be multithreaded depending on the
+     * platform and build options.
+     */
+    avfilter_execute_func *execute;
+
+    char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions
+
+    /**
+     * Private fields
+     *
+     * The following fields are for internal use only.
+     * Their type, offset, number and semantic can change without notice.
+     */
+
+    AVFilterLink **sink_links;
+    int sink_links_count;
+
+    unsigned disable_auto_convert;
+} AVFilterGraph;
+
+/**
+ * Allocate a filter graph.
+ */
+AVFilterGraph *avfilter_graph_alloc(void);
+
+/**
+ * Create a new filter instance in a filter graph.
+ *
+ * @param graph graph in which the new filter will be used
+ * @param filter the filter to create an instance of
+ * @param name Name to give to the new instance (will be copied to
+ *             AVFilterContext.name). This may be used by the caller to identify
+ *             different filters, libavfilter itself assigns no semantics to
+ *             this parameter. May be NULL.
+ *
+ * @return the context of the newly created filter instance (note that it is
+ *         also retrievable directly through AVFilterGraph.filters or with
+ *         avfilter_graph_get_filter()) on success or NULL or failure.
+ */
+AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
+                                             const AVFilter *filter,
+                                             const char *name);
+
+/**
+ * Get a filter instance with name name from graph.
+ *
+ * @return the pointer to the found filter instance or NULL if it
+ * cannot be found.
+ */
+AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
+
+#if FF_API_AVFILTER_OPEN
+/**
+ * Add an existing filter instance to a filter graph.
+ *
+ * @param graphctx  the filter graph
+ * @param filter the filter to be added
+ *
+ * @deprecated use avfilter_graph_alloc_filter() to allocate a filter in a
+ * filter graph
+ */
+attribute_deprecated
+int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
+#endif
+
+/**
+ * Create and add a filter instance into an existing graph.
+ * The filter instance is created from the filter filt and inited
+ * with the parameters args and opaque.
+ *
+ * In case of success put in *filt_ctx the pointer to the created
+ * filter instance, otherwise set *filt_ctx to NULL.
+ *
+ * @param name the instance name to give to the created filter instance
+ * @param graph_ctx the filter graph
+ * @return a negative AVERROR error code in case of failure, a non
+ * negative value otherwise
+ */
+int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt,
+                                 const char *name, const char *args, void *opaque,
+                                 AVFilterGraph *graph_ctx);
+
+/**
+ * Enable or disable automatic format conversion inside the graph.
+ *
+ * Note that format conversion can still happen inside explicitly inserted
+ * scale and aresample filters.
+ *
+ * @param flags  any of the AVFILTER_AUTO_CONVERT_* constants
+ */
+void avfilter_graph_set_auto_convert(AVFilterGraph *graph, unsigned flags);
+
+enum {
+    AVFILTER_AUTO_CONVERT_ALL  =  0, /**< all automatic conversions enabled */
+    AVFILTER_AUTO_CONVERT_NONE = -1, /**< all automatic conversions disabled */
+};
+
+/**
+ * Check validity and configure all the links and formats in the graph.
+ *
+ * @param graphctx the filter graph
+ * @param log_ctx context used for logging
+ * @return >= 0 in case of success, a negative AVERROR code otherwise
+ */
+int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx);
+
+/**
+ * Free a graph, destroy its links, and set *graph to NULL.
+ * If *graph is NULL, do nothing.
+ */
+void avfilter_graph_free(AVFilterGraph **graph);
+
+/**
+ * A linked-list of the inputs/outputs of the filter chain.
+ *
+ * This is mainly useful for avfilter_graph_parse() / avfilter_graph_parse2(),
+ * where it is used to communicate open (unlinked) inputs and outputs from and
+ * to the caller.
+ * This struct specifies, per each not connected pad contained in the graph, the
+ * filter context and the pad index required for establishing a link.
+ */
+typedef struct AVFilterInOut {
+    /** unique name for this input/output in the list */
+    char *name;
+
+    /** filter context associated to this input/output */
+    AVFilterContext *filter_ctx;
+
+    /** index of the filt_ctx pad to use for linking */
+    int pad_idx;
+
+    /** next input/input in the list, NULL if this is the last */
+    struct AVFilterInOut *next;
+} AVFilterInOut;
+
+/**
+ * Allocate a single AVFilterInOut entry.
+ * Must be freed with avfilter_inout_free().
+ * @return allocated AVFilterInOut on success, NULL on failure.
+ */
+AVFilterInOut *avfilter_inout_alloc(void);
+
+/**
+ * Free the supplied list of AVFilterInOut and set *inout to NULL.
+ * If *inout is NULL, do nothing.
+ */
+void avfilter_inout_free(AVFilterInOut **inout);
+
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE
+/**
+ * Add a graph described by a string to a graph.
+ *
+ * @note The caller must provide the lists of inputs and outputs,
+ * which therefore must be known before calling the function.
+ *
+ * @note The inputs parameter describes inputs of the already existing
+ * part of the graph; i.e. from the point of view of the newly created
+ * part, they are outputs. Similarly the outputs parameter describes
+ * outputs of the already existing filters, which are provided as
+ * inputs to the parsed filters.
+ *
+ * @param graph   the filter graph where to link the parsed grap context
+ * @param filters string to be parsed
+ * @param inputs  linked list to the inputs of the graph
+ * @param outputs linked list to the outputs of the graph
+ * @return zero on success, a negative AVERROR code on error
+ */
+int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
+                         AVFilterInOut *inputs, AVFilterInOut *outputs,
+                         void *log_ctx);
+#else
+/**
+ * Add a graph described by a string to a graph.
+ *
+ * @param graph   the filter graph where to link the parsed graph context
+ * @param filters string to be parsed
+ * @param inputs  pointer to a linked list to the inputs of the graph, may be NULL.
+ *                If non-NULL, *inputs is updated to contain the list of open inputs
+ *                after the parsing, should be freed with avfilter_inout_free().
+ * @param outputs pointer to a linked list to the outputs of the graph, may be NULL.
+ *                If non-NULL, *outputs is updated to contain the list of open outputs
+ *                after the parsing, should be freed with avfilter_inout_free().
+ * @return non negative on success, a negative AVERROR code on error
+ * @deprecated Use avfilter_graph_parse_ptr() instead.
+ */
+attribute_deprecated
+int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
+                         AVFilterInOut **inputs, AVFilterInOut **outputs,
+                         void *log_ctx);
+#endif
+
+/**
+ * Add a graph described by a string to a graph.
+ *
+ * @param graph   the filter graph where to link the parsed graph context
+ * @param filters string to be parsed
+ * @param inputs  pointer to a linked list to the inputs of the graph, may be NULL.
+ *                If non-NULL, *inputs is updated to contain the list of open inputs
+ *                after the parsing, should be freed with avfilter_inout_free().
+ * @param outputs pointer to a linked list to the outputs of the graph, may be NULL.
+ *                If non-NULL, *outputs is updated to contain the list of open outputs
+ *                after the parsing, should be freed with avfilter_inout_free().
+ * @return non negative on success, a negative AVERROR code on error
+ */
+int avfilter_graph_parse_ptr(AVFilterGraph *graph, const char *filters,
+                             AVFilterInOut **inputs, AVFilterInOut **outputs,
+                             void *log_ctx);
+
+/**
+ * Add a graph described by a string to a graph.
+ *
+ * @param[in]  graph   the filter graph where to link the parsed graph context
+ * @param[in]  filters string to be parsed
+ * @param[out] inputs  a linked list of all free (unlinked) inputs of the
+ *                     parsed graph will be returned here. It is to be freed
+ *                     by the caller using avfilter_inout_free().
+ * @param[out] outputs a linked list of all free (unlinked) outputs of the
+ *                     parsed graph will be returned here. It is to be freed by the
+ *                     caller using avfilter_inout_free().
+ * @return zero on success, a negative AVERROR code on error
+ *
+ * @note This function returns the inputs and outputs that are left
+ * unlinked after parsing the graph and the caller then deals with
+ * them.
+ * @note This function makes no reference whatsoever to already
+ * existing parts of the graph and the inputs parameter will on return
+ * contain inputs of the newly parsed part of the graph.  Analogously
+ * the outputs parameter will contain outputs of the newly created
+ * filters.
+ */
+int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
+                          AVFilterInOut **inputs,
+                          AVFilterInOut **outputs);
+
+/**
+ * Send a command to one or more filter instances.
+ *
+ * @param graph  the filter graph
+ * @param target the filter(s) to which the command should be sent
+ *               "all" sends to all filters
+ *               otherwise it can be a filter or filter instance name
+ *               which will send the command to all matching filters.
+ * @param cmd    the command to send, for handling simplicity all commands must be alphanumeric only
+ * @param arg    the argument for the command
+ * @param res    a buffer with size res_size where the filter(s) can return a response.
+ *
+ * @returns >=0 on success otherwise an error code.
+ *              AVERROR(ENOSYS) on unsupported commands
+ */
+int avfilter_graph_send_command(AVFilterGraph *graph, const char *target, const char *cmd, const char *arg, char *res, int res_len, int flags);
+
+/**
+ * Queue a command for one or more filter instances.
+ *
+ * @param graph  the filter graph
+ * @param target the filter(s) to which the command should be sent
+ *               "all" sends to all filters
+ *               otherwise it can be a filter or filter instance name
+ *               which will send the command to all matching filters.
+ * @param cmd    the command to sent, for handling simplicity all commands must be alphanummeric only
+ * @param arg    the argument for the command
+ * @param ts     time at which the command should be sent to the filter
+ *
+ * @note As this executes commands after this function returns, no return code
+ *       from the filter is provided, also AVFILTER_CMD_FLAG_ONE is not supported.
+ */
+int avfilter_graph_queue_command(AVFilterGraph *graph, const char *target, const char *cmd, const char *arg, int flags, double ts);
+
+
+/**
+ * Dump a graph into a human-readable string representation.
+ *
+ * @param graph    the graph to dump
+ * @param options  formatting options; currently ignored
+ * @return  a string, or NULL in case of memory allocation failure;
+ *          the string must be freed using av_free
+ */
+char *avfilter_graph_dump(AVFilterGraph *graph, const char *options);
+
+/**
+ * Request a frame on the oldest sink link.
+ *
+ * If the request returns AVERROR_EOF, try the next.
+ *
+ * Note that this function is not meant to be the sole scheduling mechanism
+ * of a filtergraph, only a convenience function to help drain a filtergraph
+ * in a balanced way under normal circumstances.
+ *
+ * Also note that AVERROR_EOF does not mean that frames did not arrive on
+ * some of the sinks during the process.
+ * When there are multiple sink links, in case the requested link
+ * returns an EOF, this may cause a filter to flush pending frames
+ * which are sent to another sink link, although unrequested.
+ *
+ * @return  the return value of ff_request_frame(),
+ *          or AVERROR_EOF if all links returned AVERROR_EOF
+ */
+int avfilter_graph_request_oldest(AVFilterGraph *graph);
+
+/**
+ * @}
+ */
+
+#endif /* AVFILTER_AVFILTER_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavfilter/avfiltergraph.h Added

@@ -0,0 +1,28 @@
+/*
+ * Filter graphs
+ * copyright (c) 2007 Bobby Bingham
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_AVFILTERGRAPH_H
+#define AVFILTER_AVFILTERGRAPH_H
+
+#include "avfilter.h"
+#include "libavutil/log.h"
+
+#endif /* AVFILTER_AVFILTERGRAPH_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavfilter/buffersink.h Added

@@ -0,0 +1,204 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_BUFFERSINK_H
+#define AVFILTER_BUFFERSINK_H
+
+/**
+ * @file
+ * @ingroup lavfi_buffersink
+ * memory buffer sink API for audio and video
+ */
+
+#include "avfilter.h"
+
+/**
+ * @defgroup lavfi_buffersink Buffer sink API
+ * @ingroup lavfi
+ * @{
+ */
+
+#if FF_API_AVFILTERBUFFER
+/**
+ * Get an audio/video buffer data from buffer_sink and put it in bufref.
+ *
+ * This function works with both audio and video buffer sinks.
+ *
+ * @param buffer_sink pointer to a buffersink or abuffersink context
+ * @param flags a combination of AV_BUFFERSINK_FLAG_* flags
+ * @return >= 0 in case of success, a negative AVERROR code in case of
+ * failure
+ */
+attribute_deprecated
+int av_buffersink_get_buffer_ref(AVFilterContext *buffer_sink,
+                                 AVFilterBufferRef **bufref, int flags);
+
+/**
+ * Get the number of immediately available frames.
+ */
+attribute_deprecated
+int av_buffersink_poll_frame(AVFilterContext *ctx);
+
+/**
+ * Get a buffer with filtered data from sink and put it in buf.
+ *
+ * @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
+ * @param buf pointer to the buffer will be written here if buf is non-NULL. buf
+ *            must be freed by the caller using avfilter_unref_buffer().
+ *            Buf may also be NULL to query whether a buffer is ready to be
+ *            output.
+ *
+ * @return >= 0 in case of success, a negative AVERROR code in case of
+ *         failure.
+ */
+attribute_deprecated
+int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf);
+
+/**
+ * Same as av_buffersink_read, but with the ability to specify the number of
+ * samples read. This function is less efficient than av_buffersink_read(),
+ * because it copies the data around.
+ *
+ * @param ctx pointer to a context of the abuffersink AVFilter.
+ * @param buf pointer to the buffer will be written here if buf is non-NULL. buf
+ *            must be freed by the caller using avfilter_unref_buffer(). buf
+ *            will contain exactly nb_samples audio samples, except at the end
+ *            of stream, when it can contain less than nb_samples.
+ *            Buf may also be NULL to query whether a buffer is ready to be
+ *            output.
+ *
+ * @warning do not mix this function with av_buffersink_read(). Use only one or
+ * the other with a single sink, not both.
+ */
+attribute_deprecated
+int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf,
+                               int nb_samples);
+#endif
+
+/**
+ * Get a frame with filtered data from sink and put it in frame.
+ *
+ * @param ctx    pointer to a buffersink or abuffersink filter context.
+ * @param frame  pointer to an allocated frame that will be filled with data.
+ *               The data must be freed using av_frame_unref() / av_frame_free()
+ * @param flags  a combination of AV_BUFFERSINK_FLAG_* flags
+ *
+ * @return  >= 0 in for success, a negative AVERROR code for failure.
+ */
+int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags);
+
+/**
+ * Tell av_buffersink_get_buffer_ref() to read video/samples buffer
+ * reference, but not remove it from the buffer. This is useful if you
+ * need only to read a video/samples buffer, without to fetch it.
+ */
+#define AV_BUFFERSINK_FLAG_PEEK 1
+
+/**
+ * Tell av_buffersink_get_buffer_ref() not to request a frame from its input.
+ * If a frame is already buffered, it is read (and removed from the buffer),
+ * but if no frame is present, return AVERROR(EAGAIN).
+ */
+#define AV_BUFFERSINK_FLAG_NO_REQUEST 2
+
+/**
+ * Struct to use for initializing a buffersink context.
+ */
+typedef struct {
+    const enum AVPixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by AV_PIX_FMT_NONE
+} AVBufferSinkParams;
+
+/**
+ * Create an AVBufferSinkParams structure.
+ *
+ * Must be freed with av_free().
+ */
+AVBufferSinkParams *av_buffersink_params_alloc(void);
+
+/**
+ * Struct to use for initializing an abuffersink context.
+ */
+typedef struct {
+    const enum AVSampleFormat *sample_fmts; ///< list of allowed sample formats, terminated by AV_SAMPLE_FMT_NONE
+    const int64_t *channel_layouts;         ///< list of allowed channel layouts, terminated by -1
+    const int *channel_counts;              ///< list of allowed channel counts, terminated by -1
+    int all_channel_counts;                 ///< if not 0, accept any channel count or layout
+    int *sample_rates;                      ///< list of allowed sample rates, terminated by -1
+} AVABufferSinkParams;
+
+/**
+ * Create an AVABufferSinkParams structure.
+ *
+ * Must be freed with av_free().
+ */
+AVABufferSinkParams *av_abuffersink_params_alloc(void);
+
+/**
+ * Set the frame size for an audio buffer sink.
+ *
+ * All calls to av_buffersink_get_buffer_ref will return a buffer with
+ * exactly the specified number of samples, or AVERROR(EAGAIN) if there is
+ * not enough. The last buffer at EOF will be padded with 0.
+ */
+void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size);
+
+/**
+ * Get the frame rate of the input.
+ */
+AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx);
+
+/**
+ * Get a frame with filtered data from sink and put it in frame.
+ *
+ * @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
+ * @param frame pointer to an allocated frame that will be filled with data.
+ *              The data must be freed using av_frame_unref() / av_frame_free()
+ *
+ * @return
+ *         - >= 0 if a frame was successfully returned.
+ *         - AVERROR(EAGAIN) if no frames are available at this point; more
+ *           input frames must be added to the filtergraph to get more output.
+ *         - AVERROR_EOF if there will be no more output frames on this sink.
+ *         - A different negative AVERROR code in other failure cases.
+ */
+int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame);
+
+/**
+ * Same as av_buffersink_get_frame(), but with the ability to specify the number
+ * of samples read. This function is less efficient than
+ * av_buffersink_get_frame(), because it copies the data around.
+ *
+ * @param ctx pointer to a context of the abuffersink AVFilter.
+ * @param frame pointer to an allocated frame that will be filled with data.
+ *              The data must be freed using av_frame_unref() / av_frame_free()
+ *              frame will contain exactly nb_samples audio samples, except at
+ *              the end of stream, when it can contain less than nb_samples.
+ *
+ * @return The return codes have the same meaning as for
+ *         av_buffersink_get_samples().
+ *
+ * @warning do not mix this function with av_buffersink_get_frame(). Use only one or
+ * the other with a single sink, not both.
+ */
+int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples);
+
+/**
+ * @}
+ */
+
+#endif /* AVFILTER_BUFFERSINK_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavfilter/buffersrc.h Added

@@ -0,0 +1,160 @@
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_BUFFERSRC_H
+#define AVFILTER_BUFFERSRC_H
+
+/**
+ * @file
+ * @ingroup lavfi_buffersrc
+ * Memory buffer source API.
+ */
+
+#include "libavcodec/avcodec.h"
+#include "avfilter.h"
+
+/**
+ * @defgroup lavfi_buffersrc Buffer source API
+ * @ingroup lavfi
+ * @{
+ */
+
+enum {
+
+    /**
+     * Do not check for format changes.
+     */
+    AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT = 1,
+
+#if FF_API_AVFILTERBUFFER
+    /**
+     * Ignored
+     */
+    AV_BUFFERSRC_FLAG_NO_COPY = 2,
+#endif
+
+    /**
+     * Immediately push the frame to the output.
+     */
+    AV_BUFFERSRC_FLAG_PUSH = 4,
+
+    /**
+     * Keep a reference to the frame.
+     * If the frame if reference-counted, create a new reference; otherwise
+     * copy the frame data.
+     */
+    AV_BUFFERSRC_FLAG_KEEP_REF = 8,
+
+};
+
+/**
+ * Add buffer data in picref to buffer_src.
+ *
+ * @param buffer_src  pointer to a buffer source context
+ * @param picref      a buffer reference, or NULL to mark EOF
+ * @param flags       a combination of AV_BUFFERSRC_FLAG_*
+ * @return            >= 0 in case of success, a negative AVERROR code
+ *                    in case of failure
+ */
+int av_buffersrc_add_ref(AVFilterContext *buffer_src,
+                         AVFilterBufferRef *picref, int flags);
+
+/**
+ * Get the number of failed requests.
+ *
+ * A failed request is when the request_frame method is called while no
+ * frame is present in the buffer.
+ * The number is reset when a frame is added.
+ */
+unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src);
+
+#if FF_API_AVFILTERBUFFER
+/**
+ * Add a buffer to a filtergraph.
+ *
+ * @param ctx an instance of the buffersrc filter
+ * @param buf buffer containing frame data to be passed down the filtergraph.
+ * This function will take ownership of buf, the user must not free it.
+ * A NULL buf signals EOF -- i.e. no more frames will be sent to this filter.
+ *
+ * @deprecated use av_buffersrc_write_frame() or av_buffersrc_add_frame()
+ */
+attribute_deprecated
+int av_buffersrc_buffer(AVFilterContext *ctx, AVFilterBufferRef *buf);
+#endif
+
+/**
+ * Add a frame to the buffer source.
+ *
+ * @param ctx   an instance of the buffersrc filter
+ * @param frame frame to be added. If the frame is reference counted, this
+ * function will make a new reference to it. Otherwise the frame data will be
+ * copied.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ *
+ * This function is equivalent to av_buffersrc_add_frame_flags() with the
+ * AV_BUFFERSRC_FLAG_KEEP_REF flag.
+ */
+int av_buffersrc_write_frame(AVFilterContext *ctx, const AVFrame *frame);
+
+/**
+ * Add a frame to the buffer source.
+ *
+ * @param ctx   an instance of the buffersrc filter
+ * @param frame frame to be added. If the frame is reference counted, this
+ * function will take ownership of the reference(s) and reset the frame.
+ * Otherwise the frame data will be copied. If this function returns an error,
+ * the input frame is not touched.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ *
+ * @note the difference between this function and av_buffersrc_write_frame() is
+ * that av_buffersrc_write_frame() creates a new reference to the input frame,
+ * while this function takes ownership of the reference passed to it.
+ *
+ * This function is equivalent to av_buffersrc_add_frame_flags() without the
+ * AV_BUFFERSRC_FLAG_KEEP_REF flag.
+ */
+int av_buffersrc_add_frame(AVFilterContext *ctx, AVFrame *frame);
+
+/**
+ * Add a frame to the buffer source.
+ *
+ * By default, if the frame is reference-counted, this function will take
+ * ownership of the reference(s) and reset the frame. This can be controled
+ * using the flags.
+ *
+ * If this function returns an error, the input frame is not touched.
+ *
+ * @param buffer_src  pointer to a buffer source context
+ * @param frame       a frame, or NULL to mark EOF
+ * @param flags       a combination of AV_BUFFERSRC_FLAG_*
+ * @return            >= 0 in case of success, a negative AVERROR code
+ *                    in case of failure
+ */
+int av_buffersrc_add_frame_flags(AVFilterContext *buffer_src,
+                                 AVFrame *frame, int flags);
+
+
+/**
+ * @}
+ */
+
+#endif /* AVFILTER_BUFFERSRC_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavfilter/version.h Added

@@ -0,0 +1,95 @@
+/*
+ * Version macros.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_VERSION_H
+#define AVFILTER_VERSION_H
+
+/**
+ * @file
+ * @ingroup lavfi
+ * Libavfilter version macros
+ */
+
+#include "libavutil/version.h"
+
+#define LIBAVFILTER_VERSION_MAJOR   4
+#define LIBAVFILTER_VERSION_MINOR   2
+#define LIBAVFILTER_VERSION_MICRO 100
+
+#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
+                                               LIBAVFILTER_VERSION_MINOR, \
+                                               LIBAVFILTER_VERSION_MICRO)
+#define LIBAVFILTER_VERSION     AV_VERSION(LIBAVFILTER_VERSION_MAJOR,   \
+                                           LIBAVFILTER_VERSION_MINOR,   \
+                                           LIBAVFILTER_VERSION_MICRO)
+#define LIBAVFILTER_BUILD       LIBAVFILTER_VERSION_INT
+
+#define LIBAVFILTER_IDENT       "Lavfi" AV_STRINGIFY(LIBAVFILTER_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_AVFILTERPAD_PUBLIC
+#define FF_API_AVFILTERPAD_PUBLIC           (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_FOO_COUNT
+#define FF_API_FOO_COUNT                    (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_FILL_FRAME
+#define FF_API_FILL_FRAME                   (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_BUFFERSRC_BUFFER
+#define FF_API_BUFFERSRC_BUFFER             (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_AVFILTERBUFFER
+#define FF_API_AVFILTERBUFFER               (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_OLD_FILTER_OPTS
+#define FF_API_OLD_FILTER_OPTS              (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_ACONVERT_FILTER
+#define FF_API_ACONVERT_FILTER              (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_AVFILTER_OPEN
+#define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_AVFILTER_INIT_FILTER
+#define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_OLD_FILTER_REGISTER
+#define FF_API_OLD_FILTER_REGISTER          (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_OLD_GRAPH_PARSE
+#define FF_API_OLD_GRAPH_PARSE              (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_DRAWTEXT_OLD_TIMELINE
+#define FF_API_DRAWTEXT_OLD_TIMELINE        (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_NOCONST_GET_NAME
+#define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_INTERLACE_LOWPASS_SET
+#define FF_API_INTERLACE_LOWPASS_SET        (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+
+#endif /* AVFILTER_VERSION_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavformat/avformat.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavformat/avformat.h Changed

@@ -173,6 +173,58 @@
  *
  * @defgroup lavf_encoding Muxing
  * @{
+ * Muxers take encoded data in the form of @ref AVPacket "AVPackets" and write
+ * it into files or other output bytestreams in the specified container format.
+ *
+ * The main API functions for muxing are avformat_write_header() for writing the
+ * file header, av_write_frame() / av_interleaved_write_frame() for writing the
+ * packets and av_write_trailer() for finalizing the file.
+ *
+ * At the beginning of the muxing process, the caller must first call
+ * avformat_alloc_context() to create a muxing context. The caller then sets up
+ * the muxer by filling the various fields in this context:
+ *
+ * - The @ref AVFormatContext.oformat "oformat" field must be set to select the
+ *   muxer that will be used.
+ * - Unless the format is of the AVFMT_NOFILE type, the @ref AVFormatContext.pb
+ *   "pb" field must be set to an opened IO context, either returned from
+ *   avio_open2() or a custom one.
+ * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
+ *   be created with the avformat_new_stream() function. The caller should fill
+ *   the @ref AVStream.codec "stream codec context" information, such as the
+ *   codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id
+ *   "id" and other parameters (e.g. width / height, the pixel or sample format,
+ *   etc.) as known. The @ref AVCodecContext.time_base "codec timebase" should
+ *   be set to the timebase that the caller desires to use for this stream (note
+ *   that the timebase actually used by the muxer can be different, as will be
+ *   described later).
+ * - The caller may fill in additional information, such as @ref
+ *   AVFormatContext.metadata "global" or @ref AVStream.metadata "per-stream"
+ *   metadata, @ref AVFormatContext.chapters "chapters", @ref
+ *   AVFormatContext.programs "programs", etc. as described in the
+ *   AVFormatContext documentation. Whether such information will actually be
+ *   stored in the output depends on what the container format and the muxer
+ *   support.
+ *
+ * When the muxing context is fully set up, the caller must call
+ * avformat_write_header() to initialize the muxer internals and write the file
+ * header. Whether anything actually is written to the IO context at this step
+ * depends on the muxer, but this function must always be called. Any muxer
+ * private options must be passed in the options parameter to this function.
+ *
+ * The data is then sent to the muxer by repeatedly calling av_write_frame() or
+ * av_interleaved_write_frame() (consult those functions' documentation for
+ * discussion on the difference between them; only one of them may be used with
+ * a single muxing context, they should not be mixed). Do note that the timing
+ * information on the packets sent to the muxer must be in the corresponding
+ * AVStream's timebase. That timebase is set by the muxer (in the
+ * avformat_write_header() step) and may be different from the timebase the
+ * caller set on the codec context.
+ *
+ * Once all the data has been written, the caller must call av_write_trailer()
+ * to flush any buffered packets and finalize the output file, then close the IO
+ * context (if any) and finally free the muxing context with
+ * avformat_free_context().
  * @}
  *
  * @defgroup lavf_io I/O Read/Write
@@ -209,6 +261,7 @@
 
 struct AVFormatContext;
 
+struct AVDeviceInfoList;
 
 /**
  * @defgroup metadata_api Public Metadata API
@@ -290,6 +343,7 @@
  * Allocate and read the payload of a packet and initialize its
  * fields with default values.
  *
+ * @param s    associated IO context
  * @param pkt packet
  * @param size desired payload size
  * @return >0 (read size) if OK, AVERROR_xxx otherwise
@@ -305,6 +359,7 @@
  * when there is no reasonable way to know (an upper bound of)
  * the final size.
  *
+ * @param s    associated IO context
  * @param pkt packet
  * @param size amount of data to read
  * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
@@ -338,6 +393,8 @@
 } AVProbeData;
 
 #define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
+#define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1)
+
 #define AVPROBE_SCORE_EXTENSION  50 ///< score for file extension
 #define AVPROBE_SCORE_MAX       100 ///< maximum score
 
@@ -453,6 +510,27 @@
 
     void (*get_output_timestamp)(struct AVFormatContext *s, int stream,
                                  int64_t *dts, int64_t *wall);
+    /**
+     * Allows sending messages from application to device.
+     */
+    int (*control_message)(struct AVFormatContext *s, int type,
+                           void *data, size_t data_size);
+
+    /**
+     * Write an uncoded AVFrame.
+     *
+     * See av_write_uncoded_frame() for details.
+     *
+     * The library will free *frame afterwards, but the muxer can prevent it
+     * by setting the pointer to NULL.
+     */
+    int (*write_uncoded_frame)(struct AVFormatContext *, int stream_index,
+                               AVFrame **frame, unsigned flags);
+    /**
+     * Returns device list with it properties.
+     * @see avdevice_list_devices() for more details.
+     */
+    int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
 } AVOutputFormat;
 /**
  * @}
@@ -581,6 +659,12 @@
      * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
      */
     int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+
+    /**
+     * Returns device list with it properties.
+     * @see avdevice_list_devices() for more details.
+     */
+    int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
 } AVInputFormat;
 /**
  * @}
@@ -756,9 +840,16 @@
         int64_t last_dts;
         int64_t duration_gcd;
         int duration_count;
+        int64_t rfps_duration_sum;
         double (*duration_error)[2][MAX_STD_TIMEBASES];
         int64_t codec_info_duration;
         int64_t codec_info_duration_fields;
+
+        /**
+         * 0  -> decoder has not been searched for yet.
+         * >0 -> decoder found
+         * <0 -> decoder with codec_id == -found_decoder has not been found
+         */
         int found_decoder;
 
         int64_t last_duration;
@@ -775,6 +866,11 @@
 
     int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
 
+#if FF_API_REFERENCE_DTS
+    /* a hack to keep ABI compatibility for ffmpeg and other applications, which accesses parser even
+     * though it should not */
+    int64_t do_not_use;
+#endif
     // Timestamp generation support:
     /**
      * Timestamp corresponding to the last dts sync point.
@@ -783,7 +879,6 @@
      * a DTS is received from the underlying container. Otherwise set to
      * AV_NOPTS_VALUE by default.
      */
-    int64_t reference_dts;
     int64_t first_dts;
     int64_t cur_dts;
     int64_t last_IP_pts;
@@ -888,6 +983,24 @@
      */
     int pts_wrap_behavior;
 
+    /**
+     * Internal data to prevent doing update_initial_durations() twice
+     */
+    int update_initial_durations_done;
+
+    /**
+     * Internal data to generate dts from pts
+     */
+    int64_t pts_reorder_error[MAX_REORDER_DELAY+1];
+    uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1];
+
+    /**
+     * Internal data to analyze DTS and detect faulty mpeg streams
+     */
+    int64_t last_dts_for_order_check;
+    uint8_t dts_ordered;
+    uint8_t dts_misordered;
+
 } AVStream;
 
 AVRational av_stream_get_r_frame_rate(const AVStream *s);
@@ -939,6 +1052,13 @@
 
 
 /**
+ * Callback used by devices to communicate with application.
+ */
+typedef int (*av_format_control_message)(struct AVFormatContext *s, int type,
+                                         void *data, size_t data_size);
+
+
+/**
  * The duration of a video can be estimated through various ways, and this enum can be used
  * to know how the duration was estimated.
  */
@@ -948,6 +1068,8 @@
     AVFMT_DURATION_FROM_BITRATE ///< Duration estimated from bitrate (less accurate)
 };
 
+typedef struct AVFormatInternal AVFormatInternal;
+
 /**
  * Format I/O context.
  * New fields can be added to the end with minor version bumps.
@@ -958,32 +1080,41 @@
  */
 typedef struct AVFormatContext {
     /**
-     * A class for logging and AVOptions. Set by avformat_alloc_context().
+     * A class for logging and @ref avoptions. Set by avformat_alloc_context().
      * Exports (de)muxer private options if they exist.
      */
     const AVClass *av_class;
 
     /**
-     * Can only be iformat or oformat, not both at the same time.
+     * The input container format.
      *
-     * decoding: set by avformat_open_input().
-     * encoding: set by the user.
+     * Demuxing only, set by avformat_open_input().
      */
     struct AVInputFormat *iformat;
+
+    /**
+     * The output container format.
+     *
+     * Muxing only, must be set by the caller before avformat_write_header().
+     */
     struct AVOutputFormat *oformat;
 
     /**
      * Format private data. This is an AVOptions-enabled struct
      * if and only if iformat/oformat.priv_class is not NULL.
+     *
+     * - muxing: set by avformat_write_header()
+     * - demuxing: set by avformat_open_input()
      */
     void *priv_data;
 
     /**
      * I/O context.
      *
-     * decoding: either set by the user before avformat_open_input() (then
-     * the user must close it manually) or set by avformat_open_input().
-     * encoding: set by the user.
+     * - demuxing: either set by the user before avformat_open_input() (then
+     *             the user must close it manually) or set by avformat_open_input().
+     * - muxing: set by the user before avformat_write_header(). The caller must
+     *           take care of closing / freeing the IO context.
      *
      * Do NOT set this field if AVFMT_NOFILE flag is set in
      * iformat/oformat.flags. In such a case, the (de)muxer will handle
@@ -995,36 +1126,53 @@
     int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
 
     /**
+     * Number of elements in AVFormatContext.streams.
+     *
+     * Set by avformat_new_stream(), must not be modified by any other code.
+     */
+    unsigned int nb_streams;
+    /**
      * A list of all streams in the file. New streams are created with
      * avformat_new_stream().
      *
-     * decoding: streams are created by libavformat in avformat_open_input().
-     * If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
-     * appear in av_read_frame().
-     * encoding: streams are created by the user before avformat_write_header().
+     * - demuxing: streams are created by libavformat in avformat_open_input().
+     *             If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
+     *             appear in av_read_frame().
+     * - muxing: streams are created by the user before avformat_write_header().
+     *
+     * Freed by libavformat in avformat_free_context().
      */
-    unsigned int nb_streams;
     AVStream **streams;
 
-    char filename[1024]; /**< input or output filename */
+    /**
+     * input or output filename
+     *
+     * - demuxing: set by avformat_open_input()
+     * - muxing: may be set by the caller before avformat_write_header()
+     */
+    char filename[1024];
 
     /**
-     * Decoding: position of the first frame of the component, in
+     * Position of the first frame of the component, in
      * AV_TIME_BASE fractional seconds. NEVER set this value directly:
      * It is deduced from the AVStream values.
+     *
+     * Demuxing only, set by libavformat.
      */
     int64_t start_time;
 
     /**
-     * Decoding: duration of the stream, in AV_TIME_BASE fractional
+     * Duration of the stream, in AV_TIME_BASE fractional
      * seconds. Only set this value if you know none of the individual stream
      * durations and also do not set any of them. This is deduced from the
      * AVStream values if not set.
+     *
+     * Demuxing only, set by libavformat.
      */
     int64_t duration;
 
     /**
-     * Decoding: total stream bitrate in bit/s, 0 if not
+     * Total stream bitrate in bit/s, 0 if not
      * available. Never set it directly if the file_size and the
      * duration are known as FFmpeg can compute it automatically.
      */
@@ -1043,19 +1191,23 @@
 #define AVFMT_FLAG_NOBUFFER     0x0040 ///< Do not buffer frames when possible
 #define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
 #define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
+#define AVFMT_FLAG_FLUSH_PACKETS    0x0200 ///< Flush the AVIOContext every packet.
 #define AVFMT_FLAG_MP4A_LATM    0x8000 ///< Enable RTP MP4A-LATM payload
 #define AVFMT_FLAG_SORT_DTS    0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
 #define AVFMT_FLAG_PRIV_OPT    0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
 #define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
 
     /**
-     * decoding: size of data to probe; encoding: unused.
+     * Maximum size of the data read from input for determining
+     * the input container format.
+     * Demuxing only, set by the caller before avformat_open_input().
      */
     unsigned int probesize;
 
     /**
-     * decoding: maximum time (in AV_TIME_BASE units) during which the input should
-     * be analyzed in avformat_find_stream_info().
+     * Maximum duration (in AV_TIME_BASE units) of the data read
+     * from input in avformat_find_stream_info().
+     * Demuxing only, set by the caller before avformat_find_stream_info().
      */
     int max_analyze_duration;
 
@@ -1090,8 +1242,8 @@
      * accurate seeking (depends on demuxer).
      * Demuxers for which a full in-memory index is mandatory will ignore
      * this.
-     * muxing  : unused
-     * demuxing: set by user
+     * - muxing: unused
+     * - demuxing: set by user
      */
     unsigned int max_index_size;
 
@@ -1101,38 +1253,57 @@
      */
     unsigned int max_picture_buffer;
 
+    /**
+     * Number of chapters in AVChapter array.
+     * When muxing, chapters are normally written in the file header,
+     * so nb_chapters should normally be initialized before write_header
+     * is called. Some muxers (e.g. mov and mkv) can also write chapters
+     * in the trailer.  To write chapters in the trailer, nb_chapters
+     * must be zero when write_header is called and non-zero when
+     * write_trailer is called.
+     * - muxing: set by user
+     * - demuxing: set by libavformat
+     */
     unsigned int nb_chapters;
     AVChapter **chapters;
 
+    /**
+     * Metadata that applies to the whole file.
+     *
+     * - demuxing: set by libavformat in avformat_open_input()
+     * - muxing: may be set by the caller before avformat_write_header()
+     *
+     * Freed by libavformat in avformat_free_context().
+     */
     AVDictionary *metadata;
 
     /**
      * Start time of the stream in real world time, in microseconds
-     * since the unix epoch (00:00 1st January 1970). That is, pts=0
-     * in the stream was captured at this real world time.
-     * - encoding: Set by user.
-     * - decoding: Unused.
+     * since the Unix epoch (00:00 1st January 1970). That is, pts=0 in the
+     * stream was captured at this real world time.
+     * Muxing only, set by the caller before avformat_write_header().
      */
     int64_t start_time_realtime;
 
     /**
-     * decoding: number of frames used to probe fps
+     * The number of frames used for determining the framerate in
+     * avformat_find_stream_info().
+     * Demuxing only, set by the caller before avformat_find_stream_info().
      */
     int fps_probe_size;
 
     /**
      * Error recognition; higher values will detect more errors but may
      * misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
+     * Demuxing only, set by the caller before avformat_open_input().
      */
     int error_recognition;
 
     /**
      * Custom interrupt callbacks for the I/O layer.
      *
-     * decoding: set by the user before avformat_open_input().
-     * encoding: set by the user before avformat_write_header()
+     * demuxing: set by the user before avformat_open_input().
+     * muxing: set by the user before avformat_write_header()
      * (mainly useful for AVFMT_NOFILE formats). The callback
      * should also be passed to avio_open2() if it's used to
      * open the file.
@@ -1146,6 +1317,24 @@
 #define FF_FDEBUG_TS        0x0001
 
     /**
+     * Maximum buffering duration for interleaving.
+     *
+     * To ensure all the streams are interleaved correctly,
+     * av_interleaved_write_frame() will wait until it has at least one packet
+     * for each stream before actually writing any packets to the output file.
+     * When some streams are "sparse" (i.e. there are large gaps between
+     * successive packets), this can result in excessive buffering.
+     *
+     * This field specifies the maximum difference between the timestamps of the
+     * first and the last packet in the muxing queue, above which libavformat
+     * will output a packet regardless of whether it has queued a packet for all
+     * the streams.
+     *
+     * Muxing only, set by the caller before avformat_write_header().
+     */
+    int64_t max_interleave_delta;
+
+    /**
      * Transport stream id.
      * This will be moved into demuxer private options. Thus no API/ABI compatibility
      */
@@ -1219,14 +1408,14 @@
     /**
      * Correct single timestamp overflows
      * - encoding: unused
-     * - decoding: Set by user via AVOPtions (NO direct access)
+     * - decoding: Set by user via AVOptions (NO direct access)
      */
     unsigned int correct_ts_overflow;
 
     /**
      * Force seeking to any (also non key) frames.
      * - encoding: unused
-     * - decoding: Set by user via AVOPtions (NO direct access)
+     * - decoding: Set by user via AVOptions (NO direct access)
      */
     int seek2any;
 
@@ -1237,6 +1426,15 @@
      */
     int flush_packets;
 
+    /**
+     * format probing score.
+     * The maximal score is AVPROBE_SCORE_MAX, its set when the demuxer probes
+     * the format.
+     * - encoding: unused
+     * - decoding: set by avformat, read by user via av_format_get_probe_score() (NO direct access)
+     */
+    int probe_score;
+
     /*****************************************************************
      * All fields below this line are not part of the public API. They
      * may not be used outside of libavformat and can be changed and
@@ -1288,14 +1486,83 @@
     AVRational offset_timebase;
 
     /**
+     * An opaque field for libavformat internal usage.
+     * Must not be accessed in any way by callers.
+     */
+    AVFormatInternal *internal;
+
+    /**
      * IO repositioned flag.
      * This is set by avformat when the underlaying IO context read pointer
      * is repositioned, for example when doing byte based seeking.
      * Demuxers can use the flag to detect such changes.
      */
     int io_repositioned;
+
+    /**
+     * Forced video codec.
+     * This allows forcing a specific decoder, even when there are multiple with
+     * the same codec_id.
+     * Demuxing: Set by user via av_format_set_video_codec (NO direct access).
+     */
+    AVCodec *video_codec;
+
+    /**
+     * Forced audio codec.
+     * This allows forcing a specific decoder, even when there are multiple with
+     * the same codec_id.
+     * Demuxing: Set by user via av_format_set_audio_codec (NO direct access).
+     */
+    AVCodec *audio_codec;
+
+    /**
+     * Forced subtitle codec.
+     * This allows forcing a specific decoder, even when there are multiple with
+     * the same codec_id.
+     * Demuxing: Set by user via av_format_set_subtitle_codec (NO direct access).
+     */
+    AVCodec *subtitle_codec;
+
+    /**
+     * Number of bytes to be written as padding in a metadata header.
+     * Demuxing: Unused.
+     * Muxing: Set by user via av_format_set_metadata_header_padding.
+     */
+    int metadata_header_padding;
+
+    /**
+     * User data.
+     * This is a place for some private data of the user.
+     * Mostly usable with control_message_cb or any future callbacks in device's context.
+     */
+    void *opaque;
+
+    /**
+     * Callback used by devices to communicate with application.
+     */
+    av_format_control_message control_message_cb;
+
+    /**
+     * Output timestamp offset, in microseconds.
+     * Muxing: set by user via AVOptions (NO direct access)
+     */
+    int64_t output_ts_offset;
 } AVFormatContext;
 
+int av_format_get_probe_score(const AVFormatContext *s);
+AVCodec * av_format_get_video_codec(const AVFormatContext *s);
+void      av_format_set_video_codec(AVFormatContext *s, AVCodec *c);
+AVCodec * av_format_get_audio_codec(const AVFormatContext *s);
+void      av_format_set_audio_codec(AVFormatContext *s, AVCodec *c);
+AVCodec * av_format_get_subtitle_codec(const AVFormatContext *s);
+void      av_format_set_subtitle_codec(AVFormatContext *s, AVCodec *c);
+int       av_format_get_metadata_header_padding(const AVFormatContext *s);
+void      av_format_set_metadata_header_padding(AVFormatContext *s, int c);
+void *    av_format_get_opaque(const AVFormatContext *s);
+void      av_format_set_opaque(AVFormatContext *s, void *opaque);
+av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s);
+void      av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback);
+
 /**
  * Returns the method used to set ctx->duration.
  *
@@ -1408,6 +1675,7 @@
  * User is required to call avcodec_close() and avformat_free_context() to
  * clean up the allocation by avformat_new_stream().
  *
+ * @param s media file handle
  * @param c If non-NULL, the AVCodecContext corresponding to the new stream
  * will be initialized to use this codec. This is needed for e.g. codec-specific
  * defaults to be set, so codec should be provided if it is known.
@@ -1465,6 +1733,7 @@
 /**
  * Guess the file format.
  *
+ * @param pd        data to be probed
  * @param is_opened Whether the file is already opened; determines whether
  *                  demuxers with or without AVFMT_NOFILE are probed.
  */
@@ -1473,6 +1742,7 @@
 /**
  * Guess the file format.
  *
+ * @param pd        data to be probed
  * @param is_opened Whether the file is already opened; determines whether
  *                  demuxers with or without AVFMT_NOFILE are probed.
  * @param score_max A probe score larger that this is required to accept a
@@ -1504,9 +1774,17 @@
  * @param logctx the log context
  * @param offset the offset within the bytestream to probe from
  * @param max_probe_size the maximum probe buffer size (zero for default)
- * @return 0 in case of success, a negative value corresponding to an
+ * @return the score in case of success, a negative value corresponding to an
+ *         the maximal score is AVPROBE_SCORE_MAX
  * AVERROR code otherwise
  */
+int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
+                           const char *filename, void *logctx,
+                           unsigned int offset, unsigned int max_probe_size);
+
+/**
+ * Like av_probe_input_buffer2() but returns 0 on success
+ */
 int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
                           const char *filename, void *logctx,
                           unsigned int offset, unsigned int max_probe_size);
@@ -1668,6 +1946,8 @@
 /**
  * Seek to the keyframe at timestamp.
  * 'timestamp' in 'stream_index'.
+ *
+ * @param s media file handle
  * @param stream_index If stream_index is (-1), a default
  * stream is selected, and timestamp is automatically converted
  * from AV_TIME_BASE units to the stream specific time_base.
@@ -1695,6 +1975,7 @@
  * keyframes (this may not be supported by all demuxers).
  * If flags contain AVSEEK_FLAG_BACKWARD, it is ignored.
  *
+ * @param s media file handle
  * @param stream_index index of the stream which is used as time base reference
  * @param min_ts smallest acceptable timestamp
  * @param ts target timestamp
@@ -1794,50 +2075,109 @@
 /**
  * Write a packet to an output media file.
  *
- * The packet shall contain one audio or video frame.
- * The packet must be correctly interleaved according to the container
- * specification, if not then av_interleaved_write_frame must be used.
+ * This function passes the packet directly to the muxer, without any buffering
+ * or reordering. The caller is responsible for correctly interleaving the
+ * packets if the format requires it. Callers that want libavformat to handle
+ * the interleaving should call av_interleaved_write_frame() instead of this
+ * function.
  *
  * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
- *            dts/pts, ...
- *            This can be NULL (at any time, not just at the end), in
- *            order to immediately flush data buffered within the muxer,
- *            for muxers that buffer up data internally before writing it
- *            to the output.
+ * @param pkt The packet containing the data to be written. Note that unlike
+ *            av_interleaved_write_frame(), this function does not take
+ *            ownership of the packet passed to it (though some muxers may make
+ *            an internal reference to the input packet).
+ *            <br>
+ *            This parameter can be NULL (at any time, not just at the end), in
+ *            order to immediately flush data buffered within the muxer, for
+ *            muxers that buffer up data internally before writing it to the
+ *            output.
+ *            <br>
+ *            Packet's @ref AVPacket.stream_index "stream_index" field must be
+ *            set to the index of the corresponding stream in @ref
+ *            AVFormatContext.streams "s->streams". It is very strongly
+ *            recommended that timing information (@ref AVPacket.pts "pts", @ref
+ *            AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
+ *            correct values.
  * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
+ *
+ * @see av_interleaved_write_frame()
  */
 int av_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
  * Write a packet to an output media file ensuring correct interleaving.
  *
- * The packet must contain one audio or video frame.
- * If the packets are already correctly interleaved, the application should
- * call av_write_frame() instead as it is slightly faster. It is also important
- * to keep in mind that completely non-interleaved input will need huge amounts
- * of memory to interleave with this, so it is preferable to interleave at the
- * demuxer level.
+ * This function will buffer the packets internally as needed to make sure the
+ * packets in the output file are properly interleaved in the order of
+ * increasing dts. Callers doing their own interleaving should call
+ * av_write_frame() instead of this function.
  *
  * @param s media file handle
- * @param pkt The packet containing the data to be written. pkt->buf must be set
- * to a valid AVBufferRef describing the packet data. Libavformat takes
- * ownership of this reference and will unref it when it sees fit. The caller
- * must not access the data through this reference after this function returns.
- * This can be NULL (at any time, not just at the end), to flush the
- * interleaving queues.
- * Packet's @ref AVPacket.stream_index "stream_index" field must be set to the
- * index of the corresponding stream in @ref AVFormatContext.streams
- * "s.streams".
- * It is very strongly recommended that timing information (@ref AVPacket.pts
- * "pts", @ref AVPacket.dts "dts" @ref AVPacket.duration "duration") is set to
- * correct values.
- *
- * @return 0 on success, a negative AVERROR on error.
+ * @param pkt The packet containing the data to be written.
+ *            <br>
+ *            If the packet is reference-counted, this function will take
+ *            ownership of this reference and unreference it later when it sees
+ *            fit.
+ *            The caller must not access the data through this reference after
+ *            this function returns. If the packet is not reference-counted,
+ *            libavformat will make a copy.
+ *            <br>
+ *            This parameter can be NULL (at any time, not just at the end), to
+ *            flush the interleaving queues.
+ *            <br>
+ *            Packet's @ref AVPacket.stream_index "stream_index" field must be
+ *            set to the index of the corresponding stream in @ref
+ *            AVFormatContext.streams "s->streams". It is very strongly
+ *            recommended that timing information (@ref AVPacket.pts "pts", @ref
+ *            AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
+ *            correct values.
+ *
+ * @return 0 on success, a negative AVERROR on error. Libavformat will always
+ *         take care of freeing the packet, even if this function fails.
+ *
+ * @see av_write_frame(), AVFormatContext.max_interleave_delta
  */
 int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
+ * Write a uncoded frame to an output media file.
+ *
+ * The frame must be correctly interleaved according to the container
+ * specification; if not, then av_interleaved_write_frame() must be used.
+ *
+ * See av_interleaved_write_frame() for details.
+ */
+int av_write_uncoded_frame(AVFormatContext *s, int stream_index,
+                           AVFrame *frame);
+
+/**
+ * Write a uncoded frame to an output media file.
+ *
+ * If the muxer supports it, this function allows to write an AVFrame
+ * structure directly, without encoding it into a packet.
+ * It is mostly useful for devices and similar special muxers that use raw
+ * video or PCM data and will not serialize it into a byte stream.
+ *
+ * To test whether it is possible to use it with a given muxer and stream,
+ * use av_write_uncoded_frame_query().
+ *
+ * The caller gives up ownership of the frame and must not access it
+ * afterwards.
+ *
+ * @return  >=0 for success, a negative code on error
+ */
+int av_interleaved_write_uncoded_frame(AVFormatContext *s, int stream_index,
+                                       AVFrame *frame);
+
+/**
+ * Test whether a muxer supports uncoded frame.
+ *
+ * @return  >=0 if an uncoded frame can be written to that muxer and stream,
+ *          <0 if not
+ */
+int av_write_uncoded_frame_query(AVFormatContext *s, int stream_index);
+
+/**
  * Write the stream trailer to an output media file and free the
  * file private data.
  *
@@ -1960,6 +2300,7 @@
  *
  * @param tags list of supported codec_id-codec_tag pairs, as stored
  * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param tag  codec tag to match to a codec ID
  */
 enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
 
@@ -1969,6 +2310,7 @@
  *
  * @param tags list of supported codec_id-codec_tag pairs, as stored
  * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param id   codec ID to match to a codec tag
  */
 unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
 
@@ -1988,6 +2330,9 @@
 
 /**
  * Get the index for a specific timestamp.
+ *
+ * @param st        stream that the timestamp belongs to
+ * @param timestamp timestamp to retrieve the index for
  * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
  *                 to the timestamp which is <= the requested one, if backward
  *                 is 0, then it will be >=
@@ -2084,6 +2429,7 @@
  * Return a positive value if the given filename has one of the given
  * extensions, 0 otherwise.
  *
+ * @param filename   file name to check against the given extensions
  * @param extensions a comma-separated list of filename extensions
  */
 int av_match_ext(const char *filename, const char *extensions);
@@ -2091,6 +2437,8 @@
 /**
  * Test if the given container can store a codec.
  *
+ * @param ofmt           container to check for compatibility
+ * @param codec_id       codec to potentially store in container
  * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
  *
  * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
@@ -2118,6 +2466,14 @@
  * @return the table mapping RIFF FourCCs for audio to AVCodecID.
  */
 const struct AVCodecTag *avformat_get_riff_audio_tags(void);
+/**
+ * @return the table mapping MOV FourCCs for video to libavcodec AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_mov_video_tags(void);
+/**
+ * @return the table mapping MOV FourCCs for audio to AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_mov_audio_tags(void);
 
 /**
  * @}

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavformat/avio.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavformat/avio.h Changed

@@ -151,6 +151,15 @@
 /* unbuffered I/O */
 
 /**
+ * Return the name of the protocol that will handle the passed URL.
+ *
+ * NULL is returned if no protocol could be found for the given URL.
+ *
+ * @return Name of the protocol or NULL.
+ */
+const char *avio_find_protocol_name(const char *url);
+
+/**
  * Return AVIO_FLAG_* access flags corresponding to the access permissions
  * of the resource in url, or a negative value corresponding to an
  * AVERROR code in case of failure. The returned access flags are
@@ -366,9 +375,10 @@
  *
  * @param s Used to return the pointer to the created AVIOContext.
  * In case of failure the pointed to value is set to NULL.
+ * @param url resource to access
  * @param flags flags which control how the resource indicated by url
  * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
+ * @return >= 0 in case of success, a negative value corresponding to an
  * AVERROR code in case of failure
  */
 int avio_open(AVIOContext **s, const char *url, int flags);
@@ -381,13 +391,14 @@
  *
  * @param s Used to return the pointer to the created AVIOContext.
  * In case of failure the pointed to value is set to NULL.
+ * @param url resource to access
  * @param flags flags which control how the resource indicated by url
  * is to be opened
  * @param int_cb an interrupt callback to be used at the protocols level
  * @param options  A dictionary filled with protocol-private options. On return
  * this parameter will be destroyed and replaced with a dict containing options
  * that were not found. May be NULL.
- * @return 0 in case of success, a negative value corresponding to an
+ * @return >= 0 in case of success, a negative value corresponding to an
  * AVERROR code in case of failure
  */
 int avio_open2(AVIOContext **s, const char *url, int flags,
@@ -454,6 +465,8 @@
 /**
  * Pause and resume playing - only meaningful if using a network streaming
  * protocol (e.g. MMS).
+ *
+ * @param h     IO context from which to call the read_pause function pointer
  * @param pause 1 for pause, 0 for resume
  */
 int     avio_pause(AVIOContext *h, int pause);
@@ -461,6 +474,8 @@
 /**
  * Seek to a given timestamp relative to some component stream.
  * Only meaningful if using a network streaming protocol (e.g. MMS.).
+ *
+ * @param h IO context from which to call the seek function pointers
  * @param stream_index The stream index that the timestamp is relative to.
  *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
  *        units from the beginning of the presentation.

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavformat/version.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavformat/version.h Changed

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavresample Added

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavresample/avresample.h Added

@@ -0,0 +1,417 @@
+/*
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVRESAMPLE_AVRESAMPLE_H
+#define AVRESAMPLE_AVRESAMPLE_H
+
+/**
+ * @file
+ * @ingroup lavr
+ * external API header
+ */
+
+/**
+ * @defgroup lavr Libavresample
+ * @{
+ *
+ * Libavresample (lavr) is a library that handles audio resampling, sample
+ * format conversion and mixing.
+ *
+ * Interaction with lavr is done through AVAudioResampleContext, which is
+ * allocated with avresample_alloc_context(). It is opaque, so all parameters
+ * must be set with the @ref avoptions API.
+ *
+ * For example the following code will setup conversion from planar float sample
+ * format to interleaved signed 16-bit integer, downsampling from 48kHz to
+ * 44.1kHz and downmixing from 5.1 channels to stereo (using the default mixing
+ * matrix):
+ * @code
+ * AVAudioResampleContext *avr = avresample_alloc_context();
+ * av_opt_set_int(avr, "in_channel_layout",  AV_CH_LAYOUT_5POINT1, 0);
+ * av_opt_set_int(avr, "out_channel_layout", AV_CH_LAYOUT_STEREO,  0);
+ * av_opt_set_int(avr, "in_sample_rate",     48000,                0);
+ * av_opt_set_int(avr, "out_sample_rate",    44100,                0);
+ * av_opt_set_int(avr, "in_sample_fmt",      AV_SAMPLE_FMT_FLTP,   0);
+ * av_opt_set_int(avr, "out_sample_fmt",     AV_SAMPLE_FMT_S16,    0);
+ * @endcode
+ *
+ * Once the context is initialized, it must be opened with avresample_open(). If
+ * you need to change the conversion parameters, you must close the context with
+ * avresample_close(), change the parameters as described above, then reopen it
+ * again.
+ *
+ * The conversion itself is done by repeatedly calling avresample_convert().
+ * Note that the samples may get buffered in two places in lavr. The first one
+ * is the output FIFO, where the samples end up if the output buffer is not
+ * large enough. The data stored in there may be retrieved at any time with
+ * avresample_read(). The second place is the resampling delay buffer,
+ * applicable only when resampling is done. The samples in it require more input
+ * before they can be processed. Their current amount is returned by
+ * avresample_get_delay(). At the end of conversion the resampling buffer can be
+ * flushed by calling avresample_convert() with NULL input.
+ *
+ * The following code demonstrates the conversion loop assuming the parameters
+ * from above and caller-defined functions get_input() and handle_output():
+ * @code
+ * uint8_t **input;
+ * int in_linesize, in_samples;
+ *
+ * while (get_input(&input, &in_linesize, &in_samples)) {
+ *     uint8_t *output
+ *     int out_linesize;
+ *     int out_samples = avresample_available(avr) +
+ *                       av_rescale_rnd(avresample_get_delay(avr) +
+ *                                      in_samples, 44100, 48000, AV_ROUND_UP);
+ *     av_samples_alloc(&output, &out_linesize, 2, out_samples,
+ *                      AV_SAMPLE_FMT_S16, 0);
+ *     out_samples = avresample_convert(avr, &output, out_linesize, out_samples,
+ *                                      input, in_linesize, in_samples);
+ *     handle_output(output, out_linesize, out_samples);
+ *     av_freep(&output);
+ *  }
+ *  @endcode
+ *
+ *  When the conversion is finished and the FIFOs are flushed if required, the
+ *  conversion context and everything associated with it must be freed with
+ *  avresample_free().
+ */
+
+#include "libavutil/avutil.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+
+#include "libavresample/version.h"
+
+#define AVRESAMPLE_MAX_CHANNELS 32
+
+typedef struct AVAudioResampleContext AVAudioResampleContext;
+
+/** Mixing Coefficient Types */
+enum AVMixCoeffType {
+    AV_MIX_COEFF_TYPE_Q8,   /** 16-bit 8.8 fixed-point                      */
+    AV_MIX_COEFF_TYPE_Q15,  /** 32-bit 17.15 fixed-point                    */
+    AV_MIX_COEFF_TYPE_FLT,  /** floating-point                              */
+    AV_MIX_COEFF_TYPE_NB,   /** Number of coeff types. Not part of ABI      */
+};
+
+/** Resampling Filter Types */
+enum AVResampleFilterType {
+    AV_RESAMPLE_FILTER_TYPE_CUBIC,              /**< Cubic */
+    AV_RESAMPLE_FILTER_TYPE_BLACKMAN_NUTTALL,   /**< Blackman Nuttall Windowed Sinc */
+    AV_RESAMPLE_FILTER_TYPE_KAISER,             /**< Kaiser Windowed Sinc */
+};
+
+enum AVResampleDitherMethod {
+    AV_RESAMPLE_DITHER_NONE,            /**< Do not use dithering */
+    AV_RESAMPLE_DITHER_RECTANGULAR,     /**< Rectangular Dither */
+    AV_RESAMPLE_DITHER_TRIANGULAR,      /**< Triangular Dither*/
+    AV_RESAMPLE_DITHER_TRIANGULAR_HP,   /**< Triangular Dither with High Pass */
+    AV_RESAMPLE_DITHER_TRIANGULAR_NS,   /**< Triangular Dither with Noise Shaping */
+    AV_RESAMPLE_DITHER_NB,              /**< Number of dither types. Not part of ABI. */
+};
+
+/**
+ * Return the LIBAVRESAMPLE_VERSION_INT constant.
+ */
+unsigned avresample_version(void);
+
+/**
+ * Return the libavresample build-time configuration.
+ * @return  configure string
+ */
+const char *avresample_configuration(void);
+
+/**
+ * Return the libavresample license.
+ */
+const char *avresample_license(void);
+
+/**
+ * Get the AVClass for AVAudioResampleContext.
+ *
+ * Can be used in combination with AV_OPT_SEARCH_FAKE_OBJ for examining options
+ * without allocating a context.
+ *
+ * @see av_opt_find().
+ *
+ * @return AVClass for AVAudioResampleContext
+ */
+const AVClass *avresample_get_class(void);
+
+/**
+ * Allocate AVAudioResampleContext and set options.
+ *
+ * @return  allocated audio resample context, or NULL on failure
+ */
+AVAudioResampleContext *avresample_alloc_context(void);
+
+/**
+ * Initialize AVAudioResampleContext.
+ *
+ * @param avr  audio resample context
+ * @return     0 on success, negative AVERROR code on failure
+ */
+int avresample_open(AVAudioResampleContext *avr);
+
+/**
+ * Check whether an AVAudioResampleContext is open or closed.
+ *
+ * @param avr AVAudioResampleContext to check
+ * @return 1 if avr is open, 0 if avr is closed.
+ */
+int avresample_is_open(AVAudioResampleContext *avr);
+
+/**
+ * Close AVAudioResampleContext.
+ *
+ * This closes the context, but it does not change the parameters. The context
+ * can be reopened with avresample_open(). It does, however, clear the output
+ * FIFO and any remaining leftover samples in the resampling delay buffer. If
+ * there was a custom matrix being used, that is also cleared.
+ *
+ * @see avresample_convert()
+ * @see avresample_set_matrix()
+ *
+ * @param avr  audio resample context
+ */
+void avresample_close(AVAudioResampleContext *avr);
+
+/**
+ * Free AVAudioResampleContext and associated AVOption values.
+ *
+ * This also calls avresample_close() before freeing.
+ *
+ * @param avr  audio resample context
+ */
+void avresample_free(AVAudioResampleContext **avr);
+
+/**
+ * Generate a channel mixing matrix.
+ *
+ * This function is the one used internally by libavresample for building the
+ * default mixing matrix. It is made public just as a utility function for
+ * building custom matrices.
+ *
+ * @param in_layout           input channel layout
+ * @param out_layout          output channel layout
+ * @param center_mix_level    mix level for the center channel
+ * @param surround_mix_level  mix level for the surround channel(s)
+ * @param lfe_mix_level       mix level for the low-frequency effects channel
+ * @param normalize           if 1, coefficients will be normalized to prevent
+ *                            overflow. if 0, coefficients will not be
+ *                            normalized.
+ * @param[out] matrix         mixing coefficients; matrix[i + stride * o] is
+ *                            the weight of input channel i in output channel o.
+ * @param stride              distance between adjacent input channels in the
+ *                            matrix array
+ * @param matrix_encoding     matrixed stereo downmix mode (e.g. dplii)
+ * @return                    0 on success, negative AVERROR code on failure
+ */
+int avresample_build_matrix(uint64_t in_layout, uint64_t out_layout,
+                            double center_mix_level, double surround_mix_level,
+                            double lfe_mix_level, int normalize, double *matrix,
+                            int stride, enum AVMatrixEncoding matrix_encoding);
+
+/**
+ * Get the current channel mixing matrix.
+ *
+ * If no custom matrix has been previously set or the AVAudioResampleContext is
+ * not open, an error is returned.
+ *
+ * @param avr     audio resample context
+ * @param matrix  mixing coefficients; matrix[i + stride * o] is the weight of
+ *                input channel i in output channel o.
+ * @param stride  distance between adjacent input channels in the matrix array
+ * @return        0 on success, negative AVERROR code on failure
+ */
+int avresample_get_matrix(AVAudioResampleContext *avr, double *matrix,
+                          int stride);
+
+/**
+ * Set channel mixing matrix.
+ *
+ * Allows for setting a custom mixing matrix, overriding the default matrix
+ * generated internally during avresample_open(). This function can be called
+ * anytime on an allocated context, either before or after calling
+ * avresample_open(), as long as the channel layouts have been set.
+ * avresample_convert() always uses the current matrix.
+ * Calling avresample_close() on the context will clear the current matrix.
+ *
+ * @see avresample_close()
+ *
+ * @param avr     audio resample context
+ * @param matrix  mixing coefficients; matrix[i + stride * o] is the weight of
+ *                input channel i in output channel o.
+ * @param stride  distance between adjacent input channels in the matrix array
+ * @return        0 on success, negative AVERROR code on failure
+ */
+int avresample_set_matrix(AVAudioResampleContext *avr, const double *matrix,
+                          int stride);
+
+/**
+ * Set a customized input channel mapping.
+ *
+ * This function can only be called when the allocated context is not open.
+ * Also, the input channel layout must have already been set.
+ *
+ * Calling avresample_close() on the context will clear the channel mapping.
+ *
+ * The map for each input channel specifies the channel index in the source to
+ * use for that particular channel, or -1 to mute the channel. Source channels
+ * can be duplicated by using the same index for multiple input channels.
+ *
+ * Examples:
+ *
+ * Reordering 5.1 AAC order (C,L,R,Ls,Rs,LFE) to FFmpeg order (L,R,C,LFE,Ls,Rs):
+ * { 1, 2, 0, 5, 3, 4 }
+ *
+ * Muting the 3rd channel in 4-channel input:
+ * { 0, 1, -1, 3 }
+ *
+ * Duplicating the left channel of stereo input:
+ * { 0, 0 }
+ *
+ * @param avr         audio resample context
+ * @param channel_map customized input channel mapping
+ * @return            0 on success, negative AVERROR code on failure
+ */
+int avresample_set_channel_mapping(AVAudioResampleContext *avr,
+                                   const int *channel_map);
+
+/**
+ * Set compensation for resampling.
+ *
+ * This can be called anytime after avresample_open(). If resampling is not
+ * automatically enabled because of a sample rate conversion, the
+ * "force_resampling" option must have been set to 1 when opening the context
+ * in order to use resampling compensation.
+ *
+ * @param avr                    audio resample context
+ * @param sample_delta           compensation delta, in samples
+ * @param compensation_distance  compensation distance, in samples
+ * @return                       0 on success, negative AVERROR code on failure
+ */
+int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta,
+                                int compensation_distance);
+
+/**
+ * Convert input samples and write them to the output FIFO.
+ *
+ * The upper bound on the number of output samples is given by
+ * avresample_available() + (avresample_get_delay() + number of input samples) *
+ * output sample rate / input sample rate.
+ *
+ * The output data can be NULL or have fewer allocated samples than required.
+ * In this case, any remaining samples not written to the output will be added
+ * to an internal FIFO buffer, to be returned at the next call to this function
+ * or to avresample_read().
+ *
+ * If converting sample rate, there may be data remaining in the internal
+ * resampling delay buffer. avresample_get_delay() tells the number of remaining
+ * samples. To get this data as output, call avresample_convert() with NULL
+ * input.
+ *
+ * At the end of the conversion process, there may be data remaining in the
+ * internal FIFO buffer. avresample_available() tells the number of remaining
+ * samples. To get this data as output, either call avresample_convert() with
+ * NULL input or call avresample_read().
+ *
+ * @see avresample_available()
+ * @see avresample_read()
+ * @see avresample_get_delay()
+ *
+ * @param avr             audio resample context
+ * @param output          output data pointers
+ * @param out_plane_size  output plane size, in bytes.
+ *                        This can be 0 if unknown, but that will lead to
+ *                        optimized functions not being used directly on the
+ *                        output, which could slow down some conversions.
+ * @param out_samples     maximum number of samples that the output buffer can hold
+ * @param input           input data pointers
+ * @param in_plane_size   input plane size, in bytes
+ *                        This can be 0 if unknown, but that will lead to
+ *                        optimized functions not being used directly on the
+ *                        input, which could slow down some conversions.
+ * @param in_samples      number of input samples to convert
+ * @return                number of samples written to the output buffer,
+ *                        not including converted samples added to the internal
+ *                        output FIFO
+ */
+int avresample_convert(AVAudioResampleContext *avr, uint8_t **output,
+                       int out_plane_size, int out_samples, uint8_t **input,
+                       int in_plane_size, int in_samples);
+
+/**
+ * Return the number of samples currently in the resampling delay buffer.
+ *
+ * When resampling, there may be a delay between the input and output. Any
+ * unconverted samples in each call are stored internally in a delay buffer.
+ * This function allows the user to determine the current number of samples in
+ * the delay buffer, which can be useful for synchronization.
+ *
+ * @see avresample_convert()
+ *
+ * @param avr  audio resample context
+ * @return     number of samples currently in the resampling delay buffer
+ */
+int avresample_get_delay(AVAudioResampleContext *avr);
+
+/**
+ * Return the number of available samples in the output FIFO.
+ *
+ * During conversion, if the user does not specify an output buffer or
+ * specifies an output buffer that is smaller than what is needed, remaining
+ * samples that are not written to the output are stored to an internal FIFO
+ * buffer. The samples in the FIFO can be read with avresample_read() or
+ * avresample_convert().
+ *
+ * @see avresample_read()
+ * @see avresample_convert()
+ *
+ * @param avr  audio resample context
+ * @return     number of samples available for reading
+ */
+int avresample_available(AVAudioResampleContext *avr);
+
+/**
+ * Read samples from the output FIFO.
+ *
+ * During conversion, if the user does not specify an output buffer or
+ * specifies an output buffer that is smaller than what is needed, remaining
+ * samples that are not written to the output are stored to an internal FIFO
+ * buffer. This function can be used to read samples from that internal FIFO.
+ *
+ * @see avresample_available()
+ * @see avresample_convert()
+ *
+ * @param avr         audio resample context
+ * @param output      output data pointers. May be NULL, in which case
+ *                    nb_samples of data is discarded from output FIFO.
+ * @param nb_samples  number of samples to read from the FIFO
+ * @return            the number of samples written to output
+ */
+int avresample_read(AVAudioResampleContext *avr, uint8_t **output, int nb_samples);
+
+/**
+ * @}
+ */
+
+#endif /* AVRESAMPLE_AVRESAMPLE_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavresample/version.h Added

@@ -0,0 +1,54 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVRESAMPLE_VERSION_H
+#define AVRESAMPLE_VERSION_H
+
+/**
+ * @file
+ * @ingroup lavr
+ * Libavresample version macros.
+ */
+
+#include "libavutil/version.h"
+
+#define LIBAVRESAMPLE_VERSION_MAJOR  1
+#define LIBAVRESAMPLE_VERSION_MINOR  2
+#define LIBAVRESAMPLE_VERSION_MICRO  0
+
+#define LIBAVRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \
+                                                  LIBAVRESAMPLE_VERSION_MINOR, \
+                                                  LIBAVRESAMPLE_VERSION_MICRO)
+#define LIBAVRESAMPLE_VERSION          AV_VERSION(LIBAVRESAMPLE_VERSION_MAJOR, \
+                                                  LIBAVRESAMPLE_VERSION_MINOR, \
+                                                  LIBAVRESAMPLE_VERSION_MICRO)
+#define LIBAVRESAMPLE_BUILD        LIBAVRESAMPLE_VERSION_INT
+
+#define LIBAVRESAMPLE_IDENT        "Lavr" AV_STRINGIFY(LIBAVRESAMPLE_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_RESAMPLE_CLOSE_OPEN
+#define FF_API_RESAMPLE_CLOSE_OPEN (LIBAVRESAMPLE_VERSION_MAJOR < 2)
+#endif
+
+#endif /* AVRESAMPLE_VERSION_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/adler32.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/adler32.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/attributes.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/attributes.h Changed

@@ -52,6 +52,8 @@
 
 #if AV_GCC_VERSION_AT_LEAST(3,1)
 #    define av_noinline __attribute__((noinline))
+#elif defined(_MSC_VER)
+#    define av_noinline __declspec(noinline)
 #else
 #    define av_noinline
 #endif
@@ -62,10 +64,6 @@
 #    define av_pure
 #endif
 
-#ifndef av_restrict
-#define av_restrict restrict
-#endif
-
 #if AV_GCC_VERSION_AT_LEAST(2,6)
 #    define av_const __attribute__((const))
 #else
@@ -78,7 +76,7 @@
 #    define av_cold
 #endif
 
-#if AV_GCC_VERSION_AT_LEAST(4,1)
+#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
 #    define av_flatten __attribute__((flatten))
 #else
 #    define av_flatten
@@ -86,6 +84,8 @@
 
 #if AV_GCC_VERSION_AT_LEAST(3,1)
 #    define attribute_deprecated __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#    define attribute_deprecated __declspec(deprecated)
 #else
 #    define attribute_deprecated
 #endif
@@ -102,6 +102,12 @@
         _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
         code \
         _Pragma("GCC diagnostic pop")
+#elif defined(_MSC_VER)
+#    define AV_NOWARN_DEPRECATED(code) \
+        __pragma(warning(push)) \
+        __pragma(warning(disable : 4996)) \
+        code; \
+        __pragma(warning(pop))
 #else
 #    define AV_NOWARN_DEPRECATED(code) code
 #endif

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/audio_fifo.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/audio_fifo.h Changed

@@ -2,20 +2,20 @@
  * Audio FIFO
  * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/avstring.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/avstring.h Changed

@@ -22,6 +22,7 @@
 #define AVUTIL_AVSTRING_H
 
 #include <stddef.h>
+#include <stdint.h>
 #include "attributes.h"
 
 /**
@@ -131,6 +132,20 @@
 size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
 
 /**
+ * Get the count of continuous non zero chars starting from the beginning.
+ *
+ * @param len maximum number of characters to check in the string, that
+ *            is the maximum value which is returned by the function
+ */
+static inline size_t av_strnlen(const char *s, size_t len)
+{
+    size_t i;
+    for (i = 0; i < len && s[i]; i++)
+        ;
+    return i;
+}
+
+/**
  * Print arguments following specified format into a large enough auto
  * allocated buffer. It is similar to GNU asprintf().
  * @param fmt printf-compatible format string, specifying how the
@@ -295,6 +310,45 @@
 int av_escape(char **dst, const char *src, const char *special_chars,
               enum AVEscapeMode mode, int flags);
 
+#define AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES          1 ///< accept codepoints over 0x10FFFF
+#define AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS             2 ///< accept non-characters - 0xFFFE and 0xFFFF
+#define AV_UTF8_FLAG_ACCEPT_SURROGATES                 4 ///< accept UTF-16 surrogates codes
+#define AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES 8 ///< exclude control codes not accepted by XML
+
+#define AV_UTF8_FLAG_ACCEPT_ALL \
+    AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES|AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS|AV_UTF8_FLAG_ACCEPT_SURROGATES
+
+/**
+ * Read and decode a single UTF-8 code point (character) from the
+ * buffer in *buf, and update *buf to point to the next byte to
+ * decode.
+ *
+ * In case of an invalid byte sequence, the pointer will be updated to
+ * the next byte after the invalid sequence and the function will
+ * return an error code.
+ *
+ * Depending on the specified flags, the function will also fail in
+ * case the decoded code point does not belong to a valid range.
+ *
+ * @note For speed-relevant code a carefully implemented use of
+ * GET_UTF8() may be preferred.
+ *
+ * @param codep   pointer used to return the parsed code in case of success.
+ *                The value in *codep is set even in case the range check fails.
+ * @param bufp    pointer to the address the first byte of the sequence
+ *                to decode, updated by the function to point to the
+ *                byte next after the decoded sequence
+ * @param buf_end pointer to the end of the buffer, points to the next
+ *                byte past the last in the buffer. This is used to
+ *                avoid buffer overreads (in case of an unfinished
+ *                UTF-8 sequence towards the end of the buffer).
+ * @param flags   a collection of AV_UTF8_FLAG_* flags
+ * @return >= 0 in case a sequence was successfully read, a negative
+ * value in case of invalid sequence
+ */
+int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
+                   unsigned int flags);
+
 /**
  * @}
  */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/avutil.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/avutil.h Changed

@@ -41,7 +41,7 @@
  * @li @ref lavu "libavutil" common utility library
  * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
  * @li @ref lpp  "libpostproc" post processing library
- * @li @ref lsws "libswscale" color conversion and scaling library
+ * @li @ref libsws "libswscale" color conversion and scaling library
  *
  * @section ffmpeg_versioning Versioning and compatibility
  *
@@ -128,6 +128,12 @@
  *
  * @}
  *
+ * @defgroup lavu_log Logging Facility
+ *
+ * @{
+ *
+ * @}
+ *
  * @defgroup lavu_misc Other
  *
  * @{
@@ -139,6 +145,12 @@
  * @{
  *
  * @}
+ *
+ * @defgroup preproc_misc Preprocessor String Macros
+ *
+ * @{
+ *
+ * @}
  */
 
 
@@ -271,9 +283,9 @@
 #include "common.h"
 #include "error.h"
 #include "version.h"
+#include "macros.h"
 #include "mathematics.h"
 #include "rational.h"
-#include "intfloat_readwrite.h"
 #include "log.h"
 #include "pixfmt.h"
 
@@ -307,6 +319,13 @@
     av_int_list_length_for_size(sizeof(*(list)), list, term)
 
 /**
+ * Open a file using a UTF-8 filename.
+ * The API of this function matches POSIX fopen(), errors are returned through
+ * errno.
+ */
+FILE *av_fopen_utf8(const char *path, const char *mode);
+
+/**
  * @}
  * @}
  */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/bprint.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/bprint.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/bswap.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/bswap.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/channel_layout.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/channel_layout.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/common.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/common.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/cpu.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/cpu.h Changed

@@ -33,9 +33,11 @@
 #define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
 #define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
 #define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
+                                        ///< than regular MMX/SSE (e.g. Core1)
 #define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
 #define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
 #define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
+                                        ///< than regular MMX/SSE (e.g. Core1)
 #define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
 #define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
 #define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
@@ -48,6 +50,10 @@
 // #else
 // #define AV_CPU_FLAG_CMOV         0x1000 ///< supports cmov instruction
 // #endif
+#define AV_CPU_FLAG_AVX2         0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used
+#define AV_CPU_FLAG_FMA3        0x10000 ///< Haswell FMA3 functions
+#define AV_CPU_FLAG_BMI1        0x20000 ///< Bit Manipulation Instruction Set 1
+#define AV_CPU_FLAG_BMI2        0x40000 ///< Bit Manipulation Instruction Set 2
 
 #define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
 
@@ -105,9 +111,4 @@
  */
 int av_cpu_count(void);
 
-/* The following CPU-specific functions shall not be called directly. */
-int ff_get_cpu_flags_arm(void);
-int ff_get_cpu_flags_ppc(void);
-int ff_get_cpu_flags_x86(void);
-
 #endif /* AVUTIL_CPU_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/dict.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/dict.h Changed

@@ -46,30 +46,31 @@
  * entries and finally av_dict_free() to free the dictionary
  * and all its contents.
  *
- * @code
- * AVDictionary *d = NULL;                // "create" an empty dictionary
- * av_dict_set(&d, "foo", "bar", 0);      // add an entry
- *
- * char *k = av_strdup("key");            // if your strings are already allocated,
- * char *v = av_strdup("value");          // you can avoid copying them like this
- * av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
- *
- * AVDictionaryEntry *t = NULL;
- * while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
- *     <....>                             // iterate over all entries in d
- * }
- *
- * av_dict_free(&d);
- * @endcode
+ @code
+   AVDictionary *d = NULL;           // "create" an empty dictionary
+   AVDictionaryEntry *t = NULL;
+
+   av_dict_set(&d, "foo", "bar", 0); // add an entry
+
+   char *k = av_strdup("key");       // if your strings are already allocated,
+   char *v = av_strdup("value");     // you can avoid copying them like this
+   av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+
+   while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
+       <....>                             // iterate over all entries in d
+   }
+   av_dict_free(&d);
+ @endcode
  *
  */
 
-#define AV_DICT_MATCH_CASE      1
-#define AV_DICT_IGNORE_SUFFIX   2
+#define AV_DICT_MATCH_CASE      1   /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */
+#define AV_DICT_IGNORE_SUFFIX   2   /**< Return first entry in a dictionary whose first part corresponds to the search key,
+                                         ignoring the suffix of the found key string. Only relevant in av_dict_get(). */
 #define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
-                                         allocated with av_malloc() and children. */
+                                         allocated with av_malloc() or another memory allocation function. */
 #define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
-                                         allocated with av_malloc() and chilren. */
+                                         allocated with av_malloc() or another memory allocation function. */
 #define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
 #define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
                                       delimiter is added, the strings are simply concatenated. */
@@ -84,10 +85,17 @@
 /**
  * Get a dictionary entry with matching key.
  *
+ * The returned entry key or value must not be changed, or it will
+ * cause undefined behavior.
+ *
+ * To iterate through all the dictionary entries, you can set the matching key
+ * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag.
+ *
  * @param prev Set to the previous matching element to find the next.
  *             If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found entry or NULL, changing key or value leads to undefined behavior.
+ * @param key matching key
+ * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved
+ * @return found entry or NULL in case no matching entry was found in the dictionary
  */
 AVDictionaryEntry *
 av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
@@ -113,7 +121,10 @@
 int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
 
 /**
- * Parse the key/value pairs list and add to a dictionary.
+ * Parse the key/value pairs list and add the parsed entries to a dictionary.
+ *
+ * In case of failure, all the successfully set entries are stored in
+ * *pm. You may need to manually free the created dictionary.
  *
  * @param key_val_sep  a 0-terminated list of characters used to separate
  *                     key from value

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/downmix_info.h Added

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_DOWNMIX_INFO_H
+#define AVUTIL_DOWNMIX_INFO_H
+
+#include "frame.h"
+
+/**
+ * @file
+ * audio downmix medatata
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup downmix_info Audio downmix metadata
+ * @{
+ */
+
+/**
+ * Possible downmix types.
+ */
+enum AVDownmixType {
+    AV_DOWNMIX_TYPE_UNKNOWN, /**< Not indicated. */
+    AV_DOWNMIX_TYPE_LORO,    /**< Lo/Ro 2-channel downmix (Stereo). */
+    AV_DOWNMIX_TYPE_LTRT,    /**< Lt/Rt 2-channel downmix, Dolby Surround compatible. */
+    AV_DOWNMIX_TYPE_DPLII,   /**< Lt/Rt 2-channel downmix, Dolby Pro Logic II compatible. */
+    AV_DOWNMIX_TYPE_NB       /**< Number of downmix types. Not part of ABI. */
+};
+
+/**
+ * This structure describes optional metadata relevant to a downmix procedure.
+ *
+ * All fields are set by the decoder to the value indicated in the audio
+ * bitstream (if present), or to a "sane" default otherwise.
+ */
+typedef struct AVDownmixInfo {
+    /**
+     * Type of downmix preferred by the mastering engineer.
+     */
+    enum AVDownmixType preferred_downmix_type;
+
+    /**
+     * Absolute scale factor representing the nominal level of the center
+     * channel during a regular downmix.
+     */
+    double center_mix_level;
+
+    /**
+     * Absolute scale factor representing the nominal level of the center
+     * channel during an Lt/Rt compatible downmix.
+     */
+    double center_mix_level_ltrt;
+
+    /**
+     * Absolute scale factor representing the nominal level of the surround
+     * channels during a regular downmix.
+     */
+    double surround_mix_level;
+
+    /**
+     * Absolute scale factor representing the nominal level of the surround
+     * channels during an Lt/Rt compatible downmix.
+     */
+    double surround_mix_level_ltrt;
+
+    /**
+     * Absolute scale factor representing the level at which the LFE data is
+     * mixed into L/R channels during downmixing.
+     */
+    double lfe_mix_level;
+} AVDownmixInfo;
+
+/**
+ * Get a frame's AV_FRAME_DATA_DOWNMIX_INFO side data for editing.
+ *
+ * The side data is created and added to the frame if it's absent.
+ *
+ * @param frame the frame for which the side data is to be obtained.
+ *
+ * @return the AVDownmixInfo structure to be edited by the caller.
+ */
+AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DOWNMIX_INFO_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/eval.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/eval.h Changed

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/ffversion.h Added

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/frame.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/frame.h Changed

@@ -17,29 +17,37 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * @ingroup lavu_frame
+ * reference-counted frame API
+ */
+
 #ifndef AVUTIL_FRAME_H
 #define AVUTIL_FRAME_H
 
 #include <stdint.h>
 
-#include "libavcodec/version.h"
-
 #include "avutil.h"
 #include "buffer.h"
 #include "dict.h"
 #include "rational.h"
 #include "samplefmt.h"
+#include "version.h"
+
 
 enum AVColorSpace{
-    AVCOL_SPC_RGB         = 0,
-    AVCOL_SPC_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED = 2,
-    AVCOL_SPC_FCC         = 4,
-    AVCOL_SPC_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M   = 7,
-    AVCOL_SPC_YCOCG       = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_NB             , ///< Not part of ABI
+    AVCOL_SPC_RGB         =  0,
+    AVCOL_SPC_BT709       =  1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    AVCOL_SPC_UNSPECIFIED =  2,
+    AVCOL_SPC_FCC         =  4,
+    AVCOL_SPC_BT470BG     =  5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    AVCOL_SPC_SMPTE170M   =  6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
+    AVCOL_SPC_SMPTE240M   =  7,
+    AVCOL_SPC_YCOCG       =  8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+    AVCOL_SPC_BT2020_NCL  =  9, ///< ITU-R BT2020 non-constant luminance system
+    AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
+    AVCOL_SPC_NB              , ///< Not part of ABI
 };
 #define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
 
@@ -50,11 +58,40 @@
     AVCOL_RANGE_NB             , ///< Not part of ABI
 };
 
+
+/**
+ * @defgroup lavu_frame AVFrame
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVFrame is an abstraction for reference-counted raw multimedia data.
+ */
+
 enum AVFrameSideDataType {
     /**
      * The data is the AVPanScan struct defined in libavcodec.
      */
     AV_FRAME_DATA_PANSCAN,
+    /**
+     * ATSC A53 Part 4 Closed Captions.
+     * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
+     * The number of bytes of CC data is AVFrameSideData.size.
+     */
+    AV_FRAME_DATA_A53_CC,
+    /**
+     * Stereoscopic 3d metadata.
+     * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
+     */
+    AV_FRAME_DATA_STEREO3D,
+    /**
+     * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h.
+     */
+    AV_FRAME_DATA_MATRIXENCODING,
+    /**
+     * Metadata relevant to a downmix procedure.
+     * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
+     */
+    AV_FRAME_DATA_DOWNMIX_INFO,
 };
 
 typedef struct AVFrameSideData {
@@ -117,6 +154,9 @@
      * preference, this is 16 or 32 for modern desktop CPUs.
      * Some code requires such alignment other code can be slower without
      * correct alignment, for yet other it makes no difference.
+     *
+     * @note The linesize may be larger than the size of usable data -- there
+     * may be extra padding present for performance reasons.
      */
     int linesize[AV_NUM_DATA_POINTERS];
 
@@ -383,6 +423,26 @@
     AVFrameSideData **side_data;
     int            nb_side_data;
 
+/**
+ * @defgroup lavu_frame_flags AV_FRAME_FLAGS
+ * Flags describing additional frame properties.
+ *
+ * @{
+ */
+
+/**
+ * The frame data may be corrupted, e.g. due to decoding errors.
+ */
+#define AV_FRAME_FLAG_CORRUPT       (1 << 0)
+/**
+ * @}
+ */
+
+    /**
+     * Frame flags, a combination of @ref lavu_frame_flags
+     */
+    int flags;
+
     /**
      * frame timestamp estimated using various heuristics, in stream time base
      * Code outside libavcodec should access this field using:
@@ -509,6 +569,12 @@
 void    av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
 
 /**
+ * Get the name of a colorspace.
+ * @return a static string identifying the colorspace; can be NULL.
+ */
+const char *av_get_colorspace_name(enum AVColorSpace val);
+
+/**
  * Allocate an AVFrame and set its fields to default values.  The resulting
  * struct must be freed using av_frame_free().
  *
@@ -530,7 +596,7 @@
 void av_frame_free(AVFrame **frame);
 
 /**
- * Setup a new reference to the data described by a given frame.
+ * Set up a new reference to the data described by the source frame.
  *
  * Copy frame properties from src to dst and create a new reference for each
  * AVBufferRef from src.
@@ -540,7 +606,7 @@
  *
  * @return 0 on success, a negative AVERROR on error
  */
-int av_frame_ref(AVFrame *dst, AVFrame *src);
+int av_frame_ref(AVFrame *dst, const AVFrame *src);
 
 /**
  * Create a new frame that references the same data as src.
@@ -549,7 +615,7 @@
  *
  * @return newly created AVFrame on success, NULL on error.
  */
-AVFrame *av_frame_clone(AVFrame *src);
+AVFrame *av_frame_clone(const AVFrame *src);
 
 /**
  * Unreference all the buffers referenced by frame and reset the frame fields.
@@ -608,6 +674,19 @@
 int av_frame_make_writable(AVFrame *frame);
 
 /**
+ * Copy the frame data from src to dst.
+ *
+ * This function does not allocate anything, dst must be already initialized and
+ * allocated with the same parameters as src.
+ *
+ * This function only copies the frame data (i.e. the contents of the data /
+ * extended data arrays), not any other properties.
+ *
+ * @return >= 0 on success, a negative AVERROR on error.
+ */
+int av_frame_copy(AVFrame *dst, const AVFrame *src);
+
+/**
  * Copy only "metadata" fields from src to dst.
  *
  * Metadata for the purpose of this function are those fields that do not affect
@@ -647,4 +726,8 @@
 AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
                                         enum AVFrameSideDataType type);
 
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_FRAME_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/intfloat.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/intfloat.h Changed

@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2011 Mans Rullgard
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/intfloat_readwrite.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/intfloat_readwrite.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/log.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/log.h Changed

@@ -125,8 +125,19 @@
     int (*query_ranges)(struct AVOptionRanges **, void *obj, const char *key, int flags);
 } AVClass;
 
-/* av_log API */
+/**
+ * @addtogroup lavu_log
+ *
+ * @{
+ *
+ * @defgroup lavu_log_constants Logging Constants
+ *
+ * @{
+ */
 
+/**
+ * Print no output.
+ */
 #define AV_LOG_QUIET    -8
 
 /**
@@ -153,7 +164,14 @@
  */
 #define AV_LOG_WARNING  24
 
+/**
+ * Standard information.
+ */
 #define AV_LOG_INFO     32
+
+/**
+ * Detailed information.
+ */
 #define AV_LOG_VERBOSE  40
 
 /**
@@ -164,26 +182,96 @@
 #define AV_LOG_MAX_OFFSET (AV_LOG_DEBUG - AV_LOG_QUIET)
 
 /**
+ * @}
+ */
+
+/**
  * Send the specified message to the log if the level is less than or equal
  * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different av_vlog callback
+ * stderr. This behavior can be altered by setting a different logging callback
  * function.
+ * @see av_log_set_callback
  *
  * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
  * @param fmt The format string (printf-compatible) that specifies how
- * subsequent arguments are converted to output.
- * @see av_vlog
+ *        subsequent arguments are converted to output.
  */
 void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
 
-void av_vlog(void *avcl, int level, const char *fmt, va_list);
+
+/**
+ * Send the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different logging callback
+ * function.
+ * @see av_log_set_callback
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ *        subsequent arguments are converted to output.
+ * @param vl The arguments referenced by the format string.
+ */
+void av_vlog(void *avcl, int level, const char *fmt, va_list vl);
+
+/**
+ * Get the current log level
+ *
+ * @see lavu_log_constants
+ *
+ * @return Current log level
+ */
 int av_log_get_level(void);
-void av_log_set_level(int);
-void av_log_set_callback(void (*)(void*, int, const char*, va_list));
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+
+/**
+ * Set the log level
+ *
+ * @see lavu_log_constants
+ *
+ * @param level Logging level
+ */
+void av_log_set_level(int level);
+
+/**
+ * Set the logging callback
+ *
+ * @note The callback must be thread safe, even if the application does not use
+ *       threads itself as some codecs are multithreaded.
+ *
+ * @see av_log_default_callback
+ *
+ * @param callback A logging function with a compatible signature.
+ */
+void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
+
+/**
+ * Default logging callback
+ *
+ * It prints the message to stderr, optionally colorizing it.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ *        subsequent arguments are converted to output.
+ * @param vl The arguments referenced by the format string.
+ */
+void av_log_default_callback(void *avcl, int level, const char *fmt,
+                             va_list vl);
+
+/**
+ * Return the context name
+ *
+ * @param  ctx The AVClass context
+ *
+ * @return The AVClass class_name
+ */
 const char* av_default_item_name(void* ctx);
 AVClassCategory av_default_get_category(void *ptr);
 
@@ -219,4 +307,8 @@
 #define AV_LOG_SKIP_REPEATED 1
 void av_log_set_flags(int arg);
 
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_LOG_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/macros.h Added

@@ -0,0 +1,48 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu
+ * Utility Preprocessor macros
+ */
+
+#ifndef AVUTIL_MACROS_H
+#define AVUTIL_MACROS_H
+
+/**
+ * @addtogroup preproc_misc Preprocessor String Macros
+ *
+ * String manipulation macros
+ *
+ * @{
+ */
+
+#define AV_STRINGIFY(s)         AV_TOSTRING(s)
+#define AV_TOSTRING(s) #s
+
+#define AV_GLUE(a, b) a ## b
+#define AV_JOIN(a, b) AV_GLUE(a, b)
+
+/**
+ * @}
+ */
+
+#define AV_PRAGMA(s) _Pragma(#s)
+
+#endif /* AVUTIL_MACROS_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/mathematics.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/mathematics.h Changed

@@ -45,6 +45,9 @@
 #ifndef M_PI
 #define M_PI           3.14159265358979323846  /* pi */
 #endif
+#ifndef M_PI_2
+#define M_PI_2         1.57079632679489661923  /* pi/2 */
+#endif
 #ifndef M_SQRT1_2
 #define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
 #endif
@@ -133,14 +136,28 @@
  * Rescale a timestamp while preserving known durations.
  *
  * @param in_ts Input timestamp
- * @param in_tb Input timesbase
+ * @param in_tb Input timebase
  * @param fs_tb Duration and *last timebase
  * @param duration duration till the next call
- * @param out_tb Output timesbase
+ * @param out_tb Output timebase
  */
 int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts,  AVRational fs_tb, int duration, int64_t *last, AVRational out_tb);
 
 /**
+ * Add a value to a timestamp.
+ *
+ * This function gurantees that when the same value is repeatly added that
+ * no accumulation of rounding errors occurs.
+ *
+ * @param ts Input timestamp
+ * @param ts_tb Input timestamp timebase
+ * @param inc value to add to ts
+ * @param inc_tb inc timebase
+ */
+int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc);
+
+
+    /**
  * @}
  */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/mem.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/mem.h Changed

@@ -83,8 +83,7 @@
 void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
 
 /**
- * Helper function to allocate a block of size * nmemb bytes with
- * using av_malloc()
+ * Allocate a block of size * nmemb bytes with av_malloc().
  * @param nmemb Number of elements
  * @param size Size of the single element
  * @return Pointer to the allocated block, NULL if the block cannot
@@ -93,7 +92,7 @@
  */
 av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
 {
-    if (size <= 0 || nmemb >= INT_MAX / size)
+    if (!size || nmemb >= INT_MAX / size)
         return NULL;
     return av_malloc(nmemb * size);
 }
@@ -103,11 +102,17 @@
  * If ptr is NULL and size > 0, allocate a new block. If
  * size is zero, free the memory block pointed to by ptr.
  * @param ptr Pointer to a memory block already allocated with
- * av_malloc(z)() or av_realloc() or NULL.
- * @param size Size in bytes for the memory block to be allocated or
+ * av_realloc() or NULL.
+ * @param size Size in bytes of the memory block to be allocated or
  * reallocated.
- * @return Pointer to a newly reallocated block or NULL if the block
+ * @return Pointer to a newly-reallocated block or NULL if the block
  * cannot be reallocated or the function is used to free the memory block.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ *          not be passed to av_realloc(). The former can be implemented using
+ *          memalign() (or other functions), and there is no guarantee that
+ *          pointers from such functions can be passed to realloc() at all.
+ *          The situation is undefined according to POSIX and may crash with
+ *          some libc implementations.
  * @see av_fast_realloc()
  */
 void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
@@ -123,28 +128,59 @@
 void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
 
 /**
+ * Allocate or reallocate a block of memory.
+ * If *ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
+ * @param   ptr Pointer to a pointer to a memory block already allocated
+ *          with av_realloc(), or pointer to a pointer to NULL.
+ *          The pointer is updated on success, or freed on failure.
+ * @param   size Size in bytes for the memory block to be allocated or
+ *          reallocated
+ * @return  Zero on success, an AVERROR error code on failure.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ *          not be passed to av_reallocp(). The former can be implemented using
+ *          memalign() (or other functions), and there is no guarantee that
+ *          pointers from such functions can be passed to realloc() at all.
+ *          The situation is undefined according to POSIX and may crash with
+ *          some libc implementations.
+ */
+int av_reallocp(void *ptr, size_t size);
+
+/**
  * Allocate or reallocate an array.
  * If ptr is NULL and nmemb > 0, allocate a new block. If
  * nmemb is zero, free the memory block pointed to by ptr.
  * @param ptr Pointer to a memory block already allocated with
- * av_malloc(z)() or av_realloc() or NULL.
+ * av_realloc() or NULL.
  * @param nmemb Number of elements
  * @param size Size of the single element
- * @return Pointer to a newly reallocated block or NULL if the block
+ * @return Pointer to a newly-reallocated block or NULL if the block
  * cannot be reallocated or the function is used to free the memory block.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ *          not be passed to av_realloc(). The former can be implemented using
+ *          memalign() (or other functions), and there is no guarantee that
+ *          pointers from such functions can be passed to realloc() at all.
+ *          The situation is undefined according to POSIX and may crash with
+ *          some libc implementations.
  */
 av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
 
 /**
- * Allocate or reallocate an array.
+ * Allocate or reallocate an array through a pointer to a pointer.
  * If *ptr is NULL and nmemb > 0, allocate a new block. If
  * nmemb is zero, free the memory block pointed to by ptr.
  * @param ptr Pointer to a pointer to a memory block already allocated
- * with av_malloc(z)() or av_realloc(), or pointer to a pointer to NULL.
+ * with av_realloc(), or pointer to a pointer to NULL.
  * The pointer is updated on success, or freed on failure.
  * @param nmemb Number of elements
  * @param size Size of the single element
  * @return Zero on success, an AVERROR error code on failure.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ *          not be passed to av_realloc(). The former can be implemented using
+ *          memalign() (or other functions), and there is no guarantee that
+ *          pointers from such functions can be passed to realloc() at all.
+ *          The situation is undefined according to POSIX and may crash with
+ *          some libc implementations.
  */
 av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
 
@@ -181,8 +217,7 @@
 void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
 
 /**
- * Helper function to allocate a block of size * nmemb bytes with
- * using av_mallocz()
+ * Allocate a block of size * nmemb bytes with av_mallocz().
  * @param nmemb Number of elements
  * @param size Size of the single element
  * @return Pointer to the allocated block, NULL if the block cannot
@@ -192,7 +227,7 @@
  */
 av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
 {
-    if (size <= 0 || nmemb >= INT_MAX / size)
+    if (!size || nmemb >= INT_MAX / size)
         return NULL;
     return av_mallocz(nmemb * size);
 }
@@ -200,7 +235,7 @@
 /**
  * Duplicate the string s.
  * @param s string to be duplicated
- * @return Pointer to a newly allocated string containing a
+ * @return Pointer to a newly-allocated string containing a
  * copy of s or NULL if the string cannot be allocated.
  */
 char *av_strdup(const char *s) av_malloc_attrib;
@@ -290,7 +325,7 @@
 void av_max_alloc(size_t max);
 
 /**
- * @brief deliberately overlapping memcpy implementation
+ * deliberately overlapping memcpy implementation
  * @param dst destination buffer
  * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0
  * @param cnt number of bytes to copy, must be >= 0
@@ -301,6 +336,27 @@
 void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
 
 /**
+ * Reallocate the given block if it is not large enough, otherwise do nothing.
+ *
+ * @see av_realloc
+ */
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Allocate a buffer, reusing the given one if large enough.
+ *
+ * Contrary to av_fast_realloc the current buffer contents might not be
+ * preserved and on error the old buffer is freed, thus no special
+ * handling to avoid memleaks is necessary.
+ *
+ * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
+ * @param size size of the buffer *ptr points to
+ * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
+ *                 *size 0 if an error occurred.
+ */
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
  * @}
  */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/old_pix_fmts.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/old_pix_fmts.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/opt.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/opt.h Changed

@@ -233,6 +233,7 @@
     AV_OPT_TYPE_VIDEO_RATE = MKBETAG('V','R','A','T'), ///< offset must point to AVRational
     AV_OPT_TYPE_DURATION   = MKBETAG('D','U','R',' '),
     AV_OPT_TYPE_COLOR      = MKBETAG('C','O','L','R'),
+    AV_OPT_TYPE_CHANNEL_LAYOUT = MKBETAG('C','H','L','A'),
 #if FF_API_OLD_AVOPTIONS
     FF_OPT_TYPE_FLAGS = 0,
     FF_OPT_TYPE_INT,
@@ -281,10 +282,21 @@
     int flags;
 #define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
 #define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
+#if FF_API_OPT_TYPE_METADATA
 #define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
+#endif
 #define AV_OPT_FLAG_AUDIO_PARAM     8
 #define AV_OPT_FLAG_VIDEO_PARAM     16
 #define AV_OPT_FLAG_SUBTITLE_PARAM  32
+/**
+ * The option is inteded for exporting values to the caller.
+ */
+#define AV_OPT_FLAG_EXPORT          64
+/**
+ * The option may not be set through the AVOptions API, only read.
+ * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set.
+ */
+#define AV_OPT_FLAG_READONLY        128
 #define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
 //FIXME think about enc-audio, ... style flags
 
@@ -319,7 +331,7 @@
 /**
  * Look for an option in obj. Look only for the options which
  * have the flags set as specified in mask and flags (that is,
- * for which it is the case that opt->flags & mask == flags).
+ * for which it is the case that (opt->flags & mask) == flags).
  *
  * @param[in] obj a pointer to a struct whose first element is a
  * pointer to an AVClass
@@ -657,6 +669,7 @@
 int av_opt_set_pixel_fmt (void *obj, const char *name, enum AVPixelFormat fmt, int search_flags);
 int av_opt_set_sample_fmt(void *obj, const char *name, enum AVSampleFormat fmt, int search_flags);
 int av_opt_set_video_rate(void *obj, const char *name, AVRational val, int search_flags);
+int av_opt_set_channel_layout(void *obj, const char *name, int64_t ch_layout, int search_flags);
 
 /**
  * Set a binary option to an integer list.
@@ -687,10 +700,10 @@
  * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
  * is passed here, then the option may be found in a child of obj.
  * @param[out] out_val value of the option will be written here
- * @return 0 on success, a negative error code otherwise
+ * @return >=0 on success, a negative error code otherwise
  */
 /**
- * @note the returned string will av_malloc()ed and must be av_free()ed by the caller
+ * @note the returned string will be av_malloc()ed and must be av_free()ed by the caller
  */
 int av_opt_get       (void *obj, const char *name, int search_flags, uint8_t   **out_val);
 int av_opt_get_int   (void *obj, const char *name, int search_flags, int64_t    *out_val);
@@ -700,6 +713,7 @@
 int av_opt_get_pixel_fmt (void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt);
 int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt);
 int av_opt_get_video_rate(void *obj, const char *name, int search_flags, AVRational *out_val);
+int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *ch_layout);
 /**
  * @}
  */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/parseutils.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/parseutils.h Changed

@@ -99,6 +99,19 @@
                    void *log_ctx);
 
 /**
+ * Get the name of a color from the internal table of hard-coded named
+ * colors.
+ *
+ * This function is meant to enumerate the color names recognized by
+ * av_parse_color().
+ *
+ * @param color_idx index of the requested color, starting from 0
+ * @param rgbp      if not NULL, will point to a 3-elements array with the color value in RGB
+ * @return the color name string or NULL if color_idx is not in the array
+ */
+const char *av_get_known_color_name(int color_idx, const uint8_t **rgb);
+
+/**
  * Parse timestr and return in *time a corresponding number of
  * microseconds.
  *
@@ -127,7 +140,7 @@
  * @endcode
  * @param duration flag which tells how to interpret timestr, if not
  * zero timestr is interpreted as a duration, otherwise as a date
- * @return 0 in case of success, a negative value corresponding to an
+ * @return >= 0 in case of success, a negative value corresponding to an
  * AVERROR code otherwise
  */
 int av_parse_time(int64_t *timeval, const char *timestr, int duration);

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/pixdesc.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/pixdesc.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/pixfmt.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/pixfmt.h Changed

@@ -28,7 +28,7 @@
  */
 
 #include "libavutil/avconfig.h"
-#include "libavutil/version.h"
+#include "version.h"
 
 #define AVPALETTE_SIZE 1024
 #define AVPALETTE_COUNT 256
@@ -59,8 +59,8 @@
  * allocating the picture.
  *
  * @note
- * Make sure that all newly added big-endian formats have pix_fmt & 1 == 1
- * and that all newly added little-endian formats have pix_fmt & 1 == 0.
+ * Make sure that all newly added big-endian formats have (pix_fmt & 1) == 1
+ * and that all newly added little-endian formats have (pix_fmt & 1) == 0.
  * This allows simpler detection of big vs little-endian.
  */
 enum AVPixelFormat {
@@ -80,8 +80,11 @@
     AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
     AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
     AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+#if FF_API_XVMC
     AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
     AV_PIX_FMT_XVMC_MPEG2_IDCT,
+#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT
+#endif /* FF_API_XVMC */
     AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
     AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
@@ -210,6 +213,9 @@
 
     AV_PIX_FMT_XYZ12LE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0
     AV_PIX_FMT_XYZ12BE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0
+    AV_PIX_FMT_NV16,         ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    AV_PIX_FMT_NV20LE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_NV20BE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 
 #ifndef AV_PIX_FMT_ABI_GIT_MASTER
     AV_PIX_FMT_RGBA64BE=0x123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
@@ -244,6 +250,23 @@
     AV_PIX_FMT_GBRAP16BE,   ///< planar GBRA 4:4:4:4 64bpp, big-endian
     AV_PIX_FMT_GBRAP16LE,   ///< planar GBRA 4:4:4:4 64bpp, little-endian
     AV_PIX_FMT_YUVJ411P,    ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of PIX_FMT_YUV411P and setting color_range
+
+    AV_PIX_FMT_BAYER_BGGR8,    ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */
+    AV_PIX_FMT_BAYER_RGGB8,    ///< bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples */
+    AV_PIX_FMT_BAYER_GBRG8,    ///< bayer, GBGB..(odd line), RGRG..(even line), 8-bit samples */
+    AV_PIX_FMT_BAYER_GRBG8,    ///< bayer, GRGR..(odd line), BGBG..(even line), 8-bit samples */
+    AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, little-endian */
+    AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, big-endian */
+    AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, little-endian */
+    AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, big-endian */
+    AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, little-endian */
+    AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
+    AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
+    AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
+#if !FF_API_XVMC
+    AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
+#endif /* !FF_API_XVMC */
+
     AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
 
 #if FF_API_PIX_FMT
@@ -306,6 +329,13 @@
 #define AV_PIX_FMT_GBRP12    AV_PIX_FMT_NE(GBRP12BE,    GBRP12LE)
 #define AV_PIX_FMT_GBRP14    AV_PIX_FMT_NE(GBRP14BE,    GBRP14LE)
 #define AV_PIX_FMT_GBRP16    AV_PIX_FMT_NE(GBRP16BE,    GBRP16LE)
+#define AV_PIX_FMT_GBRAP16   AV_PIX_FMT_NE(GBRAP16BE,   GBRAP16LE)
+
+#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE,    BAYER_BGGR16LE)
+#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE,    BAYER_RGGB16LE)
+#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE,    BAYER_GBRG16LE)
+#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE,    BAYER_GRBG16LE)
+
 
 #define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
 #define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
@@ -318,6 +348,7 @@
 #define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
 
 #define AV_PIX_FMT_XYZ12      AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
+#define AV_PIX_FMT_NV20       AV_PIX_FMT_NE(NV20BE,  NV20LE)
 
 #if FF_API_PIX_FMT
 #define PixelFormat AVPixelFormat

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/rational.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/rational.h Changed

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/stereo3d.h Added

@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "frame.h"
+
+/**
+ * List of possible 3D Types
+ */
+enum AVStereo3DType {
+    /**
+     * Video is not stereoscopic (and metadata has to be there).
+     */
+    AV_STEREO3D_2D,
+
+    /**
+     * Views are next to each other.
+     *
+     *    LLLLRRRR
+     *    LLLLRRRR
+     *    LLLLRRRR
+     *    ...
+     */
+    AV_STEREO3D_SIDEBYSIDE,
+
+    /**
+     * Views are on top of each other.
+     *
+     *    LLLLLLLL
+     *    LLLLLLLL
+     *    RRRRRRRR
+     *    RRRRRRRR
+     */
+    AV_STEREO3D_TOPBOTTOM,
+
+    /**
+     * Views are alternated temporally.
+     *
+     *     frame0   frame1   frame2   ...
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    ...      ...      ...
+     */
+    AV_STEREO3D_FRAMESEQUENCE,
+
+    /**
+     * Views are packed in a checkerboard-like structure per pixel.
+     *
+     *    LRLRLRLR
+     *    RLRLRLRL
+     *    LRLRLRLR
+     *    ...
+     */
+    AV_STEREO3D_CHECKERBOARD,
+
+    /**
+     * Views are next to each other, but when upscaling
+     * apply a checkerboard pattern.
+     *
+     *     LLLLRRRR          L L L L    R R R R
+     *     LLLLRRRR    =>     L L L L  R R R R
+     *     LLLLRRRR          L L L L    R R R R
+     *     LLLLRRRR           L L L L  R R R R
+     */
+    AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
+
+    /**
+     * Views are packed per line, as if interlaced.
+     *
+     *    LLLLLLLL
+     *    RRRRRRRR
+     *    LLLLLLLL
+     *    ...
+     */
+    AV_STEREO3D_LINES,
+
+    /**
+     * Views are packed per column.
+     *
+     *    LRLRLRLR
+     *    LRLRLRLR
+     *    LRLRLRLR
+     *    ...
+     */
+    AV_STEREO3D_COLUMNS,
+};
+
+
+/**
+ * Inverted views, Right/Bottom represents the left view.
+ */
+#define AV_STEREO3D_FLAG_INVERT     (1 << 0)
+
+/**
+ * Stereo 3D type: this structure describes how two videos are packed
+ * within a single video surface, with additional information as needed.
+ *
+ * @note The struct must be allocated with av_stereo3d_alloc() and
+ *       its size is not a part of the public ABI.
+ */
+typedef struct AVStereo3D {
+    /**
+     * How views are packed within the video.
+     */
+    enum AVStereo3DType type;
+
+    /**
+     * Additional information about the frame packing.
+     */
+    int flags;
+} AVStereo3D;
+
+/**
+ * Allocate an AVStereo3D structure and set its fields to default values.
+ * The resulting struct can be freed using av_freep().
+ *
+ * @return An AVStereo3D filled with default values or NULL on failure.
+ */
+AVStereo3D *av_stereo3d_alloc(void);
+
+/**
+ * Allocate a complete AVFrameSideData and add it to the frame.
+ *
+ * @param frame The frame which side data is added to.
+ *
+ * @return The AVStereo3D structure to be filled by caller.
+ */
+AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/timestamp.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/timestamp.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/version.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/version.h Changed

@@ -21,25 +21,7 @@
 #ifndef AVUTIL_VERSION_H
 #define AVUTIL_VERSION_H
 
-/**
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-/**
- * @}
- */
+#include "macros.h"
 
 /**
  * @defgroup version_utils Library Version Macros
@@ -58,7 +40,6 @@
  * @}
  */
 
-
 /**
  * @file
  * @ingroup lavu
@@ -75,7 +56,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR  42
+#define LIBAVUTIL_VERSION_MINOR  66
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -100,43 +81,61 @@
  */
 
 #ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_OLD_AVOPTIONS
-#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_AUDIOCONVERT
-#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_CPU_FLAG_MMX2
-#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
-#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_LLS_PRIVATE
-#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_LLS1
+#define FF_API_LLS1                     (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_AVFRAME_LAVC
-#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_VDPAU
-#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
+#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_OPENCL
+#define FF_API_OLD_OPENCL               (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_INTFLOAT
+#define FF_API_INTFLOAT                 (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OPT_TYPE_METADATA
+#define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 
 /**

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/xtea.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libavutil/xtea.h Changed

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libswresample Added

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libswresample/swresample.h Added

@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2011-2013 Michael Niedermayer (michaelni@gmx.at)
+ *
+ * This file is part of libswresample
+ *
+ * libswresample is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * libswresample is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with libswresample; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef SWRESAMPLE_SWRESAMPLE_H
+#define SWRESAMPLE_SWRESAMPLE_H
+
+/**
+ * @file
+ * @ingroup lswr
+ * libswresample public header
+ */
+
+/**
+ * @defgroup lswr Libswresample
+ * @{
+ *
+ * Libswresample (lswr) is a library that handles audio resampling, sample
+ * format conversion and mixing.
+ *
+ * Interaction with lswr is done through SwrContext, which is
+ * allocated with swr_alloc() or swr_alloc_set_opts(). It is opaque, so all parameters
+ * must be set with the @ref avoptions API.
+ *
+ * For example the following code will setup conversion from planar float sample
+ * format to interleaved signed 16-bit integer, downsampling from 48kHz to
+ * 44.1kHz and downmixing from 5.1 channels to stereo (using the default mixing
+ * matrix):
+ * @code
+ * SwrContext *swr = swr_alloc();
+ * av_opt_set_channel_layout(swr, "in_channel_layout",  AV_CH_LAYOUT_5POINT1, 0);
+ * av_opt_set_channel_layout(swr, "out_channel_layout", AV_CH_LAYOUT_STEREO,  0);
+ * av_opt_set_int(swr, "in_sample_rate",     48000,                0);
+ * av_opt_set_int(swr, "out_sample_rate",    44100,                0);
+ * av_opt_set_sample_fmt(swr, "in_sample_fmt",  AV_SAMPLE_FMT_FLTP, 0);
+ * av_opt_set_sample_fmt(swr, "out_sample_fmt", AV_SAMPLE_FMT_S16,  0);
+ * @endcode
+ *
+ * Once all values have been set, it must be initialized with swr_init(). If
+ * you need to change the conversion parameters, you can change the parameters
+ * as described above, or by using swr_alloc_set_opts(), then call swr_init()
+ * again.
+ *
+ * The conversion itself is done by repeatedly calling swr_convert().
+ * Note that the samples may get buffered in swr if you provide insufficient
+ * output space or if sample rate conversion is done, which requires "future"
+ * samples. Samples that do not require future input can be retrieved at any
+ * time by using swr_convert() (in_count can be set to 0).
+ * At the end of conversion the resampling buffer can be flushed by calling
+ * swr_convert() with NULL in and 0 in_count.
+ *
+ * The delay between input and output, can at any time be found by using
+ * swr_get_delay().
+ *
+ * The following code demonstrates the conversion loop assuming the parameters
+ * from above and caller-defined functions get_input() and handle_output():
+ * @code
+ * uint8_t **input;
+ * int in_samples;
+ *
+ * while (get_input(&input, &in_samples)) {
+ *     uint8_t *output;
+ *     int out_samples = av_rescale_rnd(swr_get_delay(swr, 48000) +
+ *                                      in_samples, 44100, 48000, AV_ROUND_UP);
+ *     av_samples_alloc(&output, NULL, 2, out_samples,
+ *                      AV_SAMPLE_FMT_S16, 0);
+ *     out_samples = swr_convert(swr, &output, out_samples,
+ *                                      input, in_samples);
+ *     handle_output(output, out_samples);
+ *     av_freep(&output);
+ * }
+ * @endcode
+ *
+ * When the conversion is finished, the conversion
+ * context and everything associated with it must be freed with swr_free().
+ * There will be no memory leak if the data is not completely flushed before
+ * swr_free().
+ */
+
+#include <stdint.h>
+#include "libavutil/samplefmt.h"
+
+#include "libswresample/version.h"
+
+#if LIBSWRESAMPLE_VERSION_MAJOR < 1
+#define SWR_CH_MAX 32   ///< Maximum number of channels
+#endif
+
+#define SWR_FLAG_RESAMPLE 1 ///< Force resampling even if equal sample rate
+//TODO use int resample ?
+//long term TODO can we enable this dynamically?
+
+enum SwrDitherType {
+    SWR_DITHER_NONE = 0,
+    SWR_DITHER_RECTANGULAR,
+    SWR_DITHER_TRIANGULAR,
+    SWR_DITHER_TRIANGULAR_HIGHPASS,
+
+    SWR_DITHER_NS = 64,         ///< not part of API/ABI
+    SWR_DITHER_NS_LIPSHITZ,
+    SWR_DITHER_NS_F_WEIGHTED,
+    SWR_DITHER_NS_MODIFIED_E_WEIGHTED,
+    SWR_DITHER_NS_IMPROVED_E_WEIGHTED,
+    SWR_DITHER_NS_SHIBATA,
+    SWR_DITHER_NS_LOW_SHIBATA,
+    SWR_DITHER_NS_HIGH_SHIBATA,
+    SWR_DITHER_NB,              ///< not part of API/ABI
+};
+
+/** Resampling Engines */
+enum SwrEngine {
+    SWR_ENGINE_SWR,             /**< SW Resampler */
+    SWR_ENGINE_SOXR,            /**< SoX Resampler */
+    SWR_ENGINE_NB,              ///< not part of API/ABI
+};
+
+/** Resampling Filter Types */
+enum SwrFilterType {
+    SWR_FILTER_TYPE_CUBIC,              /**< Cubic */
+    SWR_FILTER_TYPE_BLACKMAN_NUTTALL,   /**< Blackman Nuttall Windowed Sinc */
+    SWR_FILTER_TYPE_KAISER,             /**< Kaiser Windowed Sinc */
+};
+
+typedef struct SwrContext SwrContext;
+
+/**
+ * Get the AVClass for swrContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *swr_get_class(void);
+
+/**
+ * Allocate SwrContext.
+ *
+ * If you use this function you will need to set the parameters (manually or
+ * with swr_alloc_set_opts()) before calling swr_init().
+ *
+ * @see swr_alloc_set_opts(), swr_init(), swr_free()
+ * @return NULL on error, allocated context otherwise
+ */
+struct SwrContext *swr_alloc(void);
+
+/**
+ * Initialize context after user parameters have been set.
+ *
+ * @return AVERROR error code in case of failure.
+ */
+int swr_init(struct SwrContext *s);
+
+/**
+ * Check whether an swr context has been initialized or not.
+ *
+ * @return positive if it has been initialized, 0 if not initialized
+ */
+int swr_is_initialized(struct SwrContext *s);
+
+/**
+ * Allocate SwrContext if needed and set/reset common parameters.
+ *
+ * This function does not require s to be allocated with swr_alloc(). On the
+ * other hand, swr_alloc() can use swr_alloc_set_opts() to set the parameters
+ * on the allocated context.
+ *
+ * @param s               Swr context, can be NULL
+ * @param out_ch_layout   output channel layout (AV_CH_LAYOUT_*)
+ * @param out_sample_fmt  output sample format (AV_SAMPLE_FMT_*).
+ * @param out_sample_rate output sample rate (frequency in Hz)
+ * @param in_ch_layout    input channel layout (AV_CH_LAYOUT_*)
+ * @param in_sample_fmt   input sample format (AV_SAMPLE_FMT_*).
+ * @param in_sample_rate  input sample rate (frequency in Hz)
+ * @param log_offset      logging level offset
+ * @param log_ctx         parent logging context, can be NULL
+ *
+ * @see swr_init(), swr_free()
+ * @return NULL on error, allocated context otherwise
+ */
+struct SwrContext *swr_alloc_set_opts(struct SwrContext *s,
+                                      int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
+                                      int64_t  in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
+                                      int log_offset, void *log_ctx);
+
+/**
+ * Free the given SwrContext and set the pointer to NULL.
+ */
+void swr_free(struct SwrContext **s);
+
+/**
+ * Convert audio.
+ *
+ * in and in_count can be set to 0 to flush the last few samples out at the
+ * end.
+ *
+ * If more input is provided than output space then the input will be buffered.
+ * You can avoid this buffering by providing more output space than input.
+ * Convertion will run directly without copying whenever possible.
+ *
+ * @param s         allocated Swr context, with parameters set
+ * @param out       output buffers, only the first one need be set in case of packed audio
+ * @param out_count amount of space available for output in samples per channel
+ * @param in        input buffers, only the first one need to be set in case of packed audio
+ * @param in_count  number of input samples available in one channel
+ *
+ * @return number of samples output per channel, negative value on error
+ */
+int swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
+                                const uint8_t **in , int in_count);
+
+/**
+ * Convert the next timestamp from input to output
+ * timestamps are in 1/(in_sample_rate * out_sample_rate) units.
+ *
+ * @note There are 2 slightly differently behaving modes.
+ *       First is when automatic timestamp compensation is not used, (min_compensation >= FLT_MAX)
+ *              in this case timestamps will be passed through with delays compensated
+ *       Second is when automatic timestamp compensation is used, (min_compensation < FLT_MAX)
+ *              in this case the output timestamps will match output sample numbers
+ *
+ * @param pts   timestamp for the next input sample, INT64_MIN if unknown
+ * @return the output timestamp for the next output sample
+ */
+int64_t swr_next_pts(struct SwrContext *s, int64_t pts);
+
+/**
+ * Activate resampling compensation.
+ */
+int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensation_distance);
+
+/**
+ * Set a customized input channel mapping.
+ *
+ * @param s           allocated Swr context, not yet initialized
+ * @param channel_map customized input channel mapping (array of channel
+ *                    indexes, -1 for a muted channel)
+ * @return AVERROR error code in case of failure.
+ */
+int swr_set_channel_mapping(struct SwrContext *s, const int *channel_map);
+
+/**
+ * Set a customized remix matrix.
+ *
+ * @param s       allocated Swr context, not yet initialized
+ * @param matrix  remix coefficients; matrix[i + stride * o] is
+ *                the weight of input channel i in output channel o
+ * @param stride  offset between lines of the matrix
+ * @return  AVERROR error code in case of failure.
+ */
+int swr_set_matrix(struct SwrContext *s, const double *matrix, int stride);
+
+/**
+ * Drops the specified number of output samples.
+ */
+int swr_drop_output(struct SwrContext *s, int count);
+
+/**
+ * Injects the specified number of silence samples.
+ */
+int swr_inject_silence(struct SwrContext *s, int count);
+
+/**
+ * Gets the delay the next input sample will experience relative to the next output sample.
+ *
+ * Swresample can buffer data if more input has been provided than available
+ * output space, also converting between sample rates needs a delay.
+ * This function returns the sum of all such delays.
+ * The exact delay is not necessarily an integer value in either input or
+ * output sample rate. Especially when downsampling by a large value, the
+ * output sample rate may be a poor choice to represent the delay, similarly
+ * for upsampling and the input sample rate.
+ *
+ * @param s     swr context
+ * @param base  timebase in which the returned delay will be
+ *              if its set to 1 the returned delay is in seconds
+ *              if its set to 1000 the returned delay is in milli seconds
+ *              if its set to the input sample rate then the returned delay is in input samples
+ *              if its set to the output sample rate then the returned delay is in output samples
+ *              an exact rounding free delay can be found by using LCM(in_sample_rate, out_sample_rate)
+ * @returns     the delay in 1/base units.
+ */
+int64_t swr_get_delay(struct SwrContext *s, int64_t base);
+
+/**
+ * Return the LIBSWRESAMPLE_VERSION_INT constant.
+ */
+unsigned swresample_version(void);
+
+/**
+ * Return the swr build-time configuration.
+ */
+const char *swresample_configuration(void);
+
+/**
+ * Return the swr license.
+ */
+const char *swresample_license(void);
+
+/**
+ * @}
+ */
+
+#endif /* SWRESAMPLE_SWRESAMPLE_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libswresample/version.h Added

@@ -0,0 +1,45 @@
+/*
+ * Version macros.
+ *
+ * This file is part of libswresample
+ *
+ * libswresample is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * libswresample is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with libswresample; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef SWR_VERSION_H
+#define SWR_VERSION_H
+
+/**
+ * @file
+ * Libswresample version macros
+ */
+
+#include "libavutil/avutil.h"
+
+#define LIBSWRESAMPLE_VERSION_MAJOR 0
+#define LIBSWRESAMPLE_VERSION_MINOR 18
+#define LIBSWRESAMPLE_VERSION_MICRO 100
+
+#define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
+                                                  LIBSWRESAMPLE_VERSION_MINOR, \
+                                                  LIBSWRESAMPLE_VERSION_MICRO)
+#define LIBSWRESAMPLE_VERSION      AV_VERSION(LIBSWRESAMPLE_VERSION_MAJOR, \
+                                              LIBSWRESAMPLE_VERSION_MINOR, \
+                                              LIBSWRESAMPLE_VERSION_MICRO)
+#define LIBSWRESAMPLE_BUILD        LIBSWRESAMPLE_VERSION_INT
+
+#define LIBSWRESAMPLE_IDENT        "SwR" AV_STRINGIFY(LIBSWRESAMPLE_VERSION)
+
+#endif /* SWR_VERSION_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libswscale/swscale.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libswscale/swscale.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libswscale/version.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/libswscale/version.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/openHevcWrapper.h -> gpac-0.5.1.svn5491.tar.xz/extra_lib/include/openHevcWrapper.h Changed

@@ -1,7 +1,28 @@
+/*
+ * openhevc.h wrapper to openhevc or ffmpeg
+ * Copyright (c) 2012-2013 Micka�l Raulet, Wassim Hamidouche, Gildas Cocherel, Pierre Edouard Lepere
+ *
+ * This file is part of openhevc.
+ *
+ * openHevc is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * openhevc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with openhevc; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
 #ifndef OPEN_HEVC_WRAPPER_H
 #define OPEN_HEVC_WRAPPER_H
 
-#define NV_VERSION  "1.2" ///< Current software version
+#define NV_VERSION  "2.0" ///< Current software version
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,16 +74,19 @@
 void libOpenHevcGetPictureInfo(OpenHevc_Handle openHevcHandle, OpenHevc_FrameInfo *openHevcFrameInfo);
 void libOpenHevcCopyExtraData(OpenHevc_Handle openHevcHandle, unsigned char *extra_data, int extra_size_alloc);
 
-void libOpenHevcGetPictureSize2(OpenHevc_Handle openHevcHandle, OpenHevc_FrameInfo *openHevcFrameInfo);
+void libOpenHevcGetPictureInfoCpy(OpenHevc_Handle openHevcHandle, OpenHevc_FrameInfo *openHevcFrameInfo);
 int  libOpenHevcGetOutput(OpenHevc_Handle openHevcHandle, int got_picture, OpenHevc_Frame *openHevcFrame);
 int  libOpenHevcGetOutputCpy(OpenHevc_Handle openHevcHandle, int got_picture, OpenHevc_Frame_cpy *openHevcFrame);
 void libOpenHevcSetCheckMD5(OpenHevc_Handle openHevcHandle, int val);
 void libOpenHevcSetDebugMode(OpenHevc_Handle openHevcHandle, int val);
 void libOpenHevcSetTemporalLayer_id(OpenHevc_Handle openHevcHandle, int val);
 void libOpenHevcSetNoCropping(OpenHevc_Handle openHevcHandle, int val);
-
+void libOpenHevcSetActiveDecoders(OpenHevc_Handle openHevcHandle, int val);
+void libOpenHevcSetViewLayers(OpenHevc_Handle openHevcHandle, int val);
 void libOpenHevcClose(OpenHevc_Handle openHevcHandle);
 void libOpenHevcFlush(OpenHevc_Handle openHevcHandle);
+void libOpenHevcFlushSVC(OpenHevc_Handle openHevcHandle, int decoderId);
+
 const char *libOpenHevcVersion(OpenHevc_Handle openHevcHandle);
 
 #ifdef __cplusplus

gpac-0.5.1.svn5491.tar.xz/gui/extensions/H2B2VS Added

gpac-0.5.1.svn5491.tar.xz/gui/extensions/H2B2VS/H2B2VS.png Added

gpac-0.5.1.svn5491.tar.xz/gui/extensions/H2B2VS/h2b2vs.js Added

@@ -0,0 +1,200 @@
+extension = {
+    setup: false,
+    dialog: null,
+    active_addon: null,
+
+    ext_filter_event: function (evt) {
+        switch (evt.type) {
+            case GF_EVENT_ADDON_DETECTED:
+                this.confirm_addon(evt);
+                return true;
+            default:
+                return false;
+        }
+    },
+
+    create_event_filter: function (__anobj) {
+        return function (evt) {
+            __anobj.ext_filter_event(evt);
+        }
+    },
+
+    start: function () {
+        //first launch - register event filter and exit
+        if (!this.setup) {
+            gwlib_add_event_filter(this.create_event_filter(this));
+            this.setup = 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);
+
+
+        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.set_size(w, 12 * gwskin.default_icon_height);
+        }
+
+        wnd.check_pos(parseInt(this.get_option('OverlayPosition', '0')));
+        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.active_url) {
+            var odm = gpac.get_object_manager(this.active_url);
+            if (odm) {
+                odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
+            }
+        }
+    },
+
+    do_activate_addon: function (obj) {
+        var odm = gpac.get_object_manager(obj.scene_url);
+        if (odm) {
+            odm.enable_addon(obj.addon_url);
+            odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
+        }
+        this.active_url = obj.scene_url;
+    },
+
+    confirm_addon: function (evt) {
+
+        if (this.get_option('AutoSelect', 'no') == 'yes') {
+            this.do_activate_addon(evt);
+            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.do_activate_addon(this);
+        }
+    }
+};
+

gpac-0.5.1.svn5491.tar.xz/gui/extensions/H2B2VS/init.js Added

gpac-0.5.1.svn5491.tar.xz/gui/extensions/player Added

gpac-0.5.1.svn5491.tar.xz/gui/extensions/player/applications-multimedia.svg Changed

gpac-0.5.1.svn5491.tar.xz/gui/extensions/player/fileopen.js Added

@@ -0,0 +1,234 @@
+extension.open_local_file = function () {
+        var filebrowse = gw_new_file_dialog(null, 'Open file');
+        filebrowse.filter = '*';
+        filebrowse.browse(gpac.last_working_directory);
+
+        filebrowse.extension = this;
+        this.file_open_dlg = true;
+        gw_object_set_dragable(filebrowse);
+
+        filebrowse.on_display_size = function (width, height) {
+            var w = width / 2;
+            if (w < 200) w = width - 20;
+            if (w > 500) w = 500;
+            this.set_size(w, 0.8 * height);
+            this.move((width - w) / 2, 0);
+        }
+
+        filebrowse.on_browse = function (value, directory) {
+            if (value == null) {
+                this.extension.controler.show();
+            } else {
+                if (directory) gpac.last_working_directory = directory;
+                this.extension.set_movie_url(value);
+            }
+            this.file_open_dlg = false;
+        }
+
+        filebrowse.on_close = function () {
+            this.extension.controler.show();
+            this.extension.file_open_dlg = false;
+        }
+
+        if (this.history.length) {
+            filebrowse.go_hist = filebrowse.add_tool('history');
+            filebrowse.go_hist.on_click = function () {
+                var hist_items = [];
+                var history = this.dlg.extension.history;
+                for (var i = 0; i < history.length; i++) {
+                    var o = {};
+                    var f = history[history.length - i - 1];
+                    var names = f.url.split('/');
+                    if (names.length == 0) names = f.url.split('\\');
+
+                    o.name = names.pop();
+                    o.directory = false;
+                    o.path = f.url;
+                    var delim = f.url.slice(-1);
+                    hist_items.push(o);
+                }
+                this.dlg.set_label('History');
+                this.dlg.browse(hist_items);
+            }
+        }
+
+        filebrowse.go_fav = filebrowse.add_tool('favorite');
+        filebrowse.go_fav.on_click = function () {
+            var fav_items = [];
+            var bookmarks = this.dlg.extension.bookmarks;
+            for (var i = 0; i < bookmarks.length; i++) {
+                var o = {};
+                var f = bookmarks[bookmarks.length - i - 1];
+                var names = f.url.split('/');
+                if (names.length == 0) names = f.url.split('\\');
+
+                o.name = names.pop();
+                if (o.name == '') {
+                    o.directory = true;
+                    o.name = names.pop();
+                } else {
+                    o.directory = false;
+                }
+                o.path = f.url;
+                var delim = f.url.slice(-1);
+                fav_items.push(o);
+            }
+            this.dlg.set_label('Bookmarks');
+            this.dlg.browse(fav_items);
+        }
+        if (this.bookmarks.length) filebrowse.go_fav.show();
+        else filebrowse.go_fav.hide();
+
+
+        filebrowse.on_long_click = function (filename, path, directory) {
+            var popup = gw_new_window_full(null, true, '');
+            popup.dlg = this;
+            this.disable();
+            popup.area = gw_new_grid_container(popup);
+            popup.area.dlg = popup;
+            popup.area.break_at_line = true;
+            var hist_idx = this.extension.is_in_history(path, true);
+
+            if (hist_idx > -1) {
+                var item = gw_new_icon_button(popup.area, 'history', 'Remove from history', true, 'listitem');
+                item.dlg = popup;
+                item.set_size(0.9 * this.width, gwskin.default_control_height);
+                item.index = hist_idx;
+                item.on_click = function () {
+                    var fb_dlg = this.dlg.dlg;
+                    fb_dlg.extension.history.splice(this.index, 1);
+                    gpac.set_option('GUI', 'PlaybackHistory', gwskin.stringify(fb_dlg.extension.history));
+                    fb_dlg.go_hist.on_click();
+                    this.dlg.close();
+                }
+            }
+
+            if (this.extension.history.length) {
+                var item = gw_new_icon_button(popup.area, 'trash', 'Clear all history', true, 'listitem');
+                item.dlg = popup;
+                item.set_size(0.9 * this.width, gwskin.default_control_height);
+                item.index = hist_idx;
+                item.on_click = function () {
+                    var fb_dlg = this.dlg.dlg;
+                    fb_dlg.extension.history = [];
+                    gpac.set_option('GUI', 'PlaybackHistory', gwskin.stringify(fb_dlg.extension.history));
+                    fb_dlg.close();
+                    this.dlg.close();
+                }
+            }
+
+            var hist_idx = this.extension.is_in_history(path, false);
+            item = gw_new_icon_button(popup.area, 'favorite', hist_idx > -1 ? 'Remove from favorites' : 'Add to favorites', true, 'listitem');
+            item.dlg = popup;
+            item.set_size(0.9 * this.width, gwskin.default_control_height);
+            item.index = hist_idx;
+            item.on_click = function () {
+                var fb_dlg = this.dlg.dlg;
+                if (this.index > -1) {
+                    fb_dlg.extension.bookmarks.splice(this.index, 1);
+                    gpac.set_option('GUI', 'Bookmarks', gwskin.stringify(fb_dlg.extension.bookmarks));
+                    if (fb_dlg.extension.bookmarks.length == 0) {
+                        fb_dlg.go_fav.hide();
+                        fb_dlg.browse(fb_dlg.directory);
+                    }
+                } else {
+                    fb_dlg.extension.add_bookmark(path, false, filename);
+                    fb_dlg.go_fav.show();
+                }
+                fb_dlg.layout(this.dlg.dlg.width, this.dlg.dlg.height);
+                this.dlg.close();
+            }
+
+
+            popup.set_size(0.9 * this.width, 0.9 * this.height);
+            popup.set_alpha(this.get_alpha());
+
+            popup.on_close = function () {
+                this.dlg.enable();
+            }
+            popup.show();
+        }
+
+
+        filebrowse.go_net = filebrowse.add_tool('remote_location');
+        filebrowse.go_net.on_click = function () {
+            var popup = gw_new_window_full(null, true, 'Enter Adress');
+            popup.dlg = this.dlg;
+            this.dlg.disable();
+            popup.area = gw_new_grid_container(popup);
+            popup.area.dlg = popup;
+            popup.area.spread_h = true;
+
+            popup.edit = gw_new_text_edit(popup.area, '');
+            popup.edit.dlg = popup;
+            gpac.set_focus(popup.edit);
+            popup.edit.on_text = function (val) {
+                if (val != '') {
+                    this.dlg.dlg.on_browse(val, null);
+                    this.dlg.dlg.close();
+                }
+                this.dlg.close();
+            }
+
+            popup.on_display_size = function (w, h) {
+                this.edit.set_size(0.8 * w, 2 * gwskin.default_text_font_size);
+                this.set_size(0.8 * w, 2 * gwskin.default_text_font_size + gwskin.default_icon_height);
+            }
+
+            popup.on_display_size(gw_display_width, gw_display_height);
+            popup.set_alpha(1.0);
+
+            popup.on_close = function () {
+                this.dlg.enable();
+            }
+            popup.show();
+        }
+
+
+        filebrowse.on_display_size(gw_display_width, gw_display_height);
+        if (gpac.hardware_rgba) filebrowse.set_alpha(0.8);
+
+        this.controler.hide();
+        filebrowse.show();
+        
+        return filebrowse;
+    };
+    
+    
+extension.is_in_history = function (url, is_history) {
+        var search_in = is_history ? this.history : this.bookmarks;
+        var hist = search_in.filter(function (obj) { return obj.url == url; });
+        if (hist.length) {
+            var index = search_in.indexOf(hist[0]);
+            return index;
+        }
+        return -1;
+    };
+
+extension.add_bookmark = function (url, is_history) {
+        var store = is_history ? this.history : this.bookmarks;
+        var hist = store.filter(function (obj) { return obj.url == url; });
+        if (hist.length) {
+            var index = store.indexOf(hist[0]);
+            if (index > -1) store.splice(index, 1);
+            hist = hist[0];
+        } else {
+            hist = {};
+            hist.url = url;
+            hist.nb_access = 0;
+        }
+        hist.nb_access++;
+        var t = new Date()
+        hist.time = t.getTime();
+        store.push(hist);
+
+        if (is_history) {
+            var nb_max = 3;
+            if (this.history.length > nb_max) {
+                var rem = this.history.length - nb_max;
+                this.history.splice(-nb_max, rem);
+            }
+        }
+
+        gpac.set_option('GUI', is_history ? 'PlaybackHistory' : 'Bookmarks', gwskin.stringify(store));
+    };

gpac-0.5.1.svn5491.tar.xz/gui/extensions/player/init.js Added

gpac-0.5.1.svn5491.tar.xz/gui/extensions/player/player.js Added

@@ -0,0 +1,1343 @@
+
+extension = {
+    GF_STATE_PLAY: 0,
+    GF_STATE_PAUSE: 1,
+    GF_STATE_STOP: 2,
+    GF_STATE_TRICK: 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,
+    stat_wnd: null,
+    buffer_wnd: null,
+    current_time: 0,
+    duration: 0,
+    timeshift_depth: 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,
+    services: [],
+    channels_wnd: 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) {
+        switch (evt.type) {
+            case GF_EVENT_MOUSEUP:
+                this.do_show_controler();
+                return 1;
+            case GF_EVENT_KEYUP:
+                if (evt.keycode == gwskin.keys.close) {
+                    this.do_show_controler();
+                    return 1;
+                }
+                return 0;
+            case GF_EVENT_QUALITY_SWITCHED:
+                if (this.stat_wnd) {
+                    this.stat_wnd.quality_changed();
+                }
+                return 1;
+            case GF_EVENT_TIMESHIFT_UPDATE:
+                if (this.timeshift_depth) {
+                    this.set_time(0);
+                }
+                return 1;
+            case GF_EVENT_TIMESHIFT_OVERFLOW:
+                if (this.state == this.GF_STATE_PAUSE) {
+                    this.set_state(this.GF_STATE_PLAY);
+                    var 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 1;
+            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 1;
+            case GF_EVENT_NAVIGATE:
+                this.set_movie_url(evt.target_url);
+                return 1;
+        }
+    },
+
+    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();
+                    } else {
+                        this.movie_connected = true;
+                    }
+                }
+
+                //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);
+                ext.movie_control.mediaStartTime = ext.initial_start;
+                ext.movie_control.loop = ext.initial_loop;
+
+                ext.movie_control.url[0] = ext.current_url;
+                ext.movie_sensor.url[0] = ext.current_url;
+
+                ext.timeshift_depth = 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);
+
+
+                gw_background_control(false);
+
+                ext.controler.hide();
+                gpac.caption = ext.current_url;
+                ext.add_bookmark(ext.current_url, true);
+
+                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;
+                }
+                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);
+            }
+            if (!gpac.fullscreen && evt.width && evt.height) {
+                var w, h, r_w, r_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;
+
+                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);
+            }
+            ext.streamlist_changed();
+        }
+        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].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].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) {
+                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);
+            }
+        }
+        this.movie.children[0].on_main_addon = function (evt) {
+            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 = gpac.get_option('GUI', 'PlaybackHistory');
+        if ((hist != null) && (hist != '')) {
+            this.history = gwskin.parse(hist);
+        }
+
+        var bmarks = gpac.get_option('GUI', '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);
+
+        /*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;
+                alert('set media stop time to ' + (-time));
+                this.extension.movie_control.mediaStopTime = -time;
+                this.extension.controler.layout();
+                return;
+            }
+
+            if (this.extension.controlled_renderer) {
+                this.extension.controlled_renderer.Seek(time);
+                return;
+            }
+            gw_background_control(false);
+            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 (0 && this.extension.root_odm && this.extension.root_odm.main_addon_on) {
+                this.extension.root_odm.disable_main_addon();
+            }
+            else if (this.extension.movie_control.mediaStopTime < 0) {
+                this.extension.movie_control.mediaStopTime = 0;
+                this.extension.controler.layout();
+                this.extension.set_time(0);
+
+            }
+        }
+
+        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);
+        }
+
+        if (0) {
+            wnd.rewind = gw_new_icon(wnd.infobar, 'rewind');
+        } else {
+            wnd.rewind = null;
+        }
+
+        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_TRICK);
+                this.extension.set_speed(2 * this.extension.movie_control.mediaSpeed);
+            }
+        }
+        wnd.forward.on_long_click = function () {
+            if (this.extension.movie_control.mediaSpeed) {
+                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.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;
+                }
+                gw_show_dock();
+            }
+        }
+
+
+        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;
+        }
+
+        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 && (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);
+
+            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.dynamic_scene && this.extension.movie_connected && (gpac.navigation_type != GF_NAVIGATE_TYPE_NONE)) {
+                    show_navigate = true;
+                    full_w += control_icon_size;
+                }
+            }
+
+            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;
+
+                this.media_list.show();
+
+            } else {
+                this.stats.hide();
+                this.stop.hide();
+                this.play.hide();
+                this.media_list.hide();
+            }
+
+            if (this.extension.duration) {
+                if (this.rewind) full_w += control_icon_size;
+                if (this.forward) 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 (min_w + full_w + time_w < width) {
+                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.rewind) this.rewind.show();
+                    if (this.forward) this.forward.show();
+                    if (this.loop) this.loop.show();
+                    if (this.stop) this.stop.show();
+                }
+                else if (this.extension.movie_control.mediaStopTime < 0) {
+                    if (this.forward) this.forward.show();
+                } 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();
+                }
+            } else {
+
+                if (this.snd_low) this.snd_low.hide();
+                if (this.snd_ctrl) this.snd_ctrl.hide();
+                if (this.rewind) this.rewind.hide();
+                if (this.forward) this.forward.hide();
+                if (this.loop) this.loop.hide();
+                if (this.fullscreen) this.fullscreen.hide();
+                if (this.remote) this.remote.hide();
+
+                if (show_navigate) {
+                    if (min_w + time_w + this.navigate.width < width) {
+                        min_w += this.navigate.width;
+                        this.navigate.show();
+                    }
+                }
+
+                if (this.remote) {
+                    if (UPnP.MediaRenderersCount && (this.extension.current_url != '') && (min_w + time_w + this.remote.width < width)) {
+                        min_w += this.remote.width;
+                        this.remote.show();
+                    } else {
+                        this.remote.hide();
+                    }
+                }
+
+                if (this.media_line.visible)
+                    this.media_line.set_size(width - min_w - 5, control_icon_size / 3);
+
+            }
+
+            if (this.extension.duration || 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 (w, h) {
+            //            this.set_size(w, 1.2 * gwskin.default_icon_height);
+
+            if (this.extension.movie_connected) h = 3.3 * gwskin.default_icon_height;
+            else h = 2.2 * gwskin.default_icon_height;
+
+            this.set_size(480, h);
+
+            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);
+        }
+
+        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 == '-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++;
+                }
+            }
+
+            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) {
+            __anobj.ext_filter_event(evt);
+        }
+    },
+
+    declare_addons: function () {
+        alert('addon is ' + this.default_addon);
+        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;
+            var time_in_tsb = 0;
+            
+            if (this.movie_control.mediaStopTime < 0) {
+                time_in_tsb = this.root_odm.timeshift_time;
+                if (this.timeshift_depth > time_in_tsb) {
+                    pos = 100 * (this.timeshift_depth - time_in_tsb) / this.timeshift_depth;
+                }
+            }
+            this.controler.media_line.set_value(pos);
+            if (!time_in_tsb) {
+                this.controler.time.hide();
+                this.controler.layout();
+                return;
+            }
+
+            if (!this.controler.time.visible) {
+                this.controler.time.show();
+                this.controler.layout();
+            }
+            str = '-';
+            value = time_in_tsb;
+        } else {
+            if (!this.duration) return;
+
+            this.current_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();
+            if (dlg.rewind) 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 {
+            dlg.time.show();
+            dlg.media_line.show();
+            if (dlg.rewind) dlg.rewind.show();
+            dlg.stop.show();
+            dlg.forward.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());
+            }
+        }
+        dlg.layout();
+    },
+    set_timeshift_depth: function (value) {
+        alert('timeshift is ' + value);
+        if (this.timeshift_depth == value) return;
+
+        this.timeshift_depth = value;
+        var dlg = this.controler;
+
+        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();
+            /*
+            if (dlg.rewind) dlg.rewind.show();
+            if (dlg.stop) dlg.stop.show();
+            if (dlg.forward) dlg.forward.show();
+            if (dlg.loop) dlg.loop.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.layout();
+    },
+
+    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.stat_wnd) this.stat_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;
+            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);
+            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);
+            this.set_speed(1);
+            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();
+        alert('speed is '+ this.movie_control.mediaSpeed);
+    },
+
+    set_movie_url: function (url) {
+        this.initial_play_done = false;
+
+        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;
+            gw_background_control(this.movie_connected ? false : true);
+            gpac.caption = url;
+
+        } 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;
+                gw_background_control(false);
+
+                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 (url == '') this.controler.show();
+        else this.controler.hide();
+
+    },
+
+
+    show_buffer: function (level) {
+        if ((level < 0) || (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.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.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.timer.on_active = function (val) {
+                if (!val) this.wnd.close();
+            }
+
+        }
+
+        this.buffer_wnd.timer.stop(gwskin.default_message_timeout);
+        this.buffer_wnd.txt.set_label('Buffering ' + level + ' %');
+    },
+
+    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;
+            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();
+            return;
+        }
+        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.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();
+        }
+
+    }
+
+
+};
+

gpac-0.5.1.svn5491.tar.xz/gui/extensions/player/playlist.js Added

@@ -0,0 +1,326 @@
+
+extension.playlist_wnd = null;
+
+
+extension.playlist = [];
+var plist = gpac.get_option('GUI', 'Playlist');
+
+if ((plist != null) && (plist != '')) {
+    extension.playlist = gwskin.parse(plist);
+}
+
+extension.playlist_idx = 0;
+var plistidx = gpac.get_option('GUI', 'PlaylistIndex');
+if (plistidx != null) {
+    extension.playlist_idx = parseInt(plistidx);
+}
+
+extension.view_playlist = function () {
+    if (this.playlist_wnd) {
+        this.playlist_wnd.close();
+        this.playlist_wnd = null;
+        return;
+    }
+
+    var plist = gw_new_window_full(null, true, 'Playlist');
+    this.playlist_wnd = plist;
+    plist.extension = this;
+    plist.hide_controler = false;
+    
+    this.controler.hide();
+    
+    plist.on_close = function () {
+        if (! this.hide_controler)
+            this.extension.controler.show();
+
+        this.extension.playlist_wnd = null;
+        this.extension.file_open_dlg = false;
+    }
+
+    plist.area = gw_new_grid_container(plist);
+    plist.area.break_at_line = true;
+    plist.area.dlg = plist;
+
+    plist.go_prev = plist.add_tool('previous');
+    plist.go_prev.on_click = function () {
+        this.dlg.area._move_page(-1);
+    }
+
+    plist.go_next = plist.add_tool('next');
+    plist.go_next.on_click = function () {
+        this.dlg.area._move_page(1);
+    }
+
+    plist.add = plist.add_tool('add');
+    plist.add.on_click = function () {
+        this.dlg.browse_files();
+    }
+    plist.browse_files = function() {
+        this.hide();
+        
+        var fb = this.extension.open_local_file();
+        fb.playlist = this;
+        fb.on_browse = function (value, directory) {
+            this.playlist.show();
+            plist.add_files(value, false, false);
+            if (directory) gpac.last_working_directory = directory;
+
+        }
+        fb.on_close = function () {
+            this.playlist.show();
+        }
+
+
+        fb.on_long_click = function (filename, path, directory) {
+            var popup = gw_new_window_full(null, true, '');
+            popup.fb = fb;
+            this.disable();
+            popup.area = gw_new_grid_container(popup);
+            popup.area.dlg = popup;
+            popup.area.break_at_line = true;
+
+            popup.set_size(0.9 * this.width, 0.9 * this.height);
+            
+            if (directory) {
+                var item = gw_new_icon_button(popup.area, 'scan_directory', 'Add directory', true, 'listitem');
+                item.set_size(popup.width, gwskin.default_control_height);
+                item.dlg = popup;
+                item.on_click = function() {
+                    var filelist = gpac.enum_directory(path, '*', false);
+                    item.dlg.fb.playlist.add_files(filelist, false, false);
+                    item.dlg.fb.close();
+                    item.dlg.close();
+                }
+                item = gw_new_icon_button(popup.area, 'scan_directory', 'Insert directory', true, 'listitem');
+                item.set_size(popup.width, gwskin.default_control_height);
+                item.dlg = popup;
+                item.on_click = function() {
+                    var filelist = gpac.enum_directory(path, '*', false);
+                    item.dlg.fb.playlist.add_files(filelist, true, false);
+                    item.dlg.fb.close();
+                    item.dlg.close();
+                }
+
+            } else {
+                var item = gw_new_icon_button(popup.area, 'add', 'Add file', true, 'listitem');
+                item.set_size(popup.width, gwskin.default_control_height);
+                item.dlg = popup;
+                item.on_click = function() {
+                    item.dlg.fb.playlist.add_files(path, false, false);
+                    item.dlg.fb.close();
+                    item.dlg.close();
+                }
+                item = gw_new_icon_button(popup.area, 'add', 'Insert file', true, 'listitem');
+                item.set_size(popup.width, gwskin.default_control_height);
+                item.dlg = popup;
+                item.on_click = function() {
+                    item.dlg.fb.playlist.add_files(path, true, false);
+                    item.dlg.fb.close();
+                    item.dlg.close();
+                }
+            }
+            popup.area.layout();
+            //popup.set_alpha(this.get_alpha());
+            
+            popup.on_close = function () {
+                this.fb.enable();
+            }
+            popup.show();
+        }
+    }
+
+
+    plist.add_object = function(pl_item, is_selected) {
+        var icon_name = is_selected ? 'play' : gw_guess_mime_icon(pl_item.name);
+                
+        var item = gw_new_icon_button(this.area, icon_name, pl_item.name, true, 'listitem');
+        
+        item.set_size(this.width, gwskin.default_control_height);
+        item.dlg = this;
+        item.pl_item = pl_item;        
+        item.on_click = function() {
+            this.dlg.extension.playlist_play(this.pl_item);
+            this.dlg.hide_controler = true;
+            this.dlg.close();
+        }
+        this.trash.enable();
+        if (plist.extension.playlist.length>1)
+            this.sort.enable();
+    }
+    
+    plist.add_files = function(list, is_insert, recursive) {
+        if (typeof list =='string') {
+            var obj = {};
+            var names = list.split('/');
+            if (names.length == 0) names = list.split('\\');            
+            obj.name = names.pop();
+            var len = list.length - obj.name.length;
+            obj.path = list.slice(0, len);
+            
+            if (is_insert) {
+                this.extension.playlist.splice(this.extension.playlist_idx+1, 0, obj);
+            } else {
+                this.extension.playlist.push(obj);
+                this.add_object(obj, false);
+            }
+        } else {
+            //temp array for sorting, we have issues sorting Arrays creating by native code 
+            var ar = [];
+            for (var i=0; i<list.length; i++) {
+                if (list[i].directory) continue;
+                var obj = {};
+                obj.path = list[i].path;
+                obj.name = list[i].name;
+                ar.push(obj);
+            }
+            if (list.length) gpac.last_working_directory = list[0].path;
+
+            //sort
+            if (!this._sort_type) {
+                ar.sort( function(a, b) { return a.name > b.name; } );
+            } else {
+                ar.sort( function(a, b) { return a.name < b.name; } );
+            }
+                        
+            for (var i=0; i<ar.length; i++) {
+                var obj = ar[i];
+                if (is_insert) {
+                    this.extension.playlist.splice(this.extension.playlist_idx+1+i, 0, obj);
+                } else {
+                    this.extension.playlist.push(obj);
+                    this.add_object(obj, false);
+                }
+            }            
+        }
+        //in insert mode rebuild the UI (we cannot insert SFNode easily in an MFNode field)
+        if (is_insert) {
+            this.refresh_items();
+        }
+        this.area.layout();
+
+        gpac.set_option('GUI', 'Playlist', gwskin.stringify(this.extension.playlist));
+    }
+    
+    plist._sort_type = 0;
+    plist.sort = plist.add_tool('sort');
+    plist.sort.on_click = function() {
+        var wnd = this.dlg;
+        wnd.area.reset_children();
+        if (!wnd._sort_type) {
+            wnd.extension.playlist.sort( function (a, b) { return a.name > b.name;} );
+            wnd._sort_type = 1;
+        } else {
+            wnd.extension.playlist.sort( function (a, b) { return a.name < b.name;} );
+            wnd._sort_type = 0;
+        }
+        gpac.set_option('GUI', 'Playlist', gwskin.stringify(wnd.extension.playlist));
+        wnd.refresh_items();
+    }
+
+    plist.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();
+    }
+
+    plist.trash = plist.add_tool('trash');
+    plist.trash.on_click = function () {
+        this.dlg.area.reset_children();
+        this.dlg.extension.playlist = [];        
+        gpac.set_option('GUI', 'Playlist', gwskin.stringify(this.dlg.extension.playlist));
+        gpac.set_option('GUI', 'PlaylistIndex', '0');
+        this.dlg.extension.set_playlist_mode(true);
+
+        this.disable();
+    }
+    plist.trash.disable();
+    plist.sort.disable();
+
+    plist.refresh_items = function() {
+        this.area.reset_children();
+        
+        for (var i=0; i<this.extension.playlist.length; i++) {
+            var is_selected = false;
+            if (this.extension.playlist_mode && this.extension.current_url && (this.extension.playlist_idx==i)) {
+                is_selected = true;
+            }
+            this.add_object(this.extension.playlist[i], is_selected);
+        }
+        this.area.layout();
+    }
+
+    //init playlist
+    plist.refresh_items();
+
+    plist.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);
+    }
+
+    plist.on_display_size = function (width, height) {
+        var w = 2*width / 3;
+        this.set_size(w, 0.8 * height);
+    }
+
+   plist.on_display_size(gw_display_width, gw_display_height);
+   plist.set_alpha(0.9);
+   plist.show();
+}
+
+extension.playlist_mode = false;
+extension.set_playlist_mode = function(value)
+{
+    if (!value || (this.playlist.length<=1)) {
+        if (this.controler.playlist_next.visible) {
+            this.controler.playlist_next.hide();
+            this.controler.playlist_prev.hide();
+            extension.controler.layout();
+        }
+    } else {
+        if (!this.controler.playlist_next.visible) {
+            this.controler.playlist_next.show();
+            this.controler.playlist_prev.show();
+            extension.controler.layout();
+        }
+        if (this.playlist_idx == 0) {
+            this.controler.playlist_next.enable();
+            this.controler.playlist_prev.disable();
+        } else if (this.playlist_idx+1 == this.playlist.length) {
+            this.controler.playlist_next.disable();
+            this.controler.playlist_prev.enable();
+        }
+    }
+
+    extension.playlist_mode = value;
+}
+
+extension.playlist_play = function (pl_item) {
+    this.set_playlist_mode(true);
+    this.set_movie_url(pl_item.path + pl_item.name);
+
+    //save current index
+    this.playlist_idx = this.playlist.indexOf(pl_item);
+    gpac.set_option('GUI', 'PlaylistIndex', '' + this.playlist_idx);
+}
+
+extension.playlist_next = function()
+{
+    if (this.playlist_idx + 1 == this.playlist.length) return;
+    this.playlist_idx++;
+    this.playlist_play( this.playlist[extension.playlist_idx] );
+}
+
+extension.playlist_prev = function()
+{
+    if (!this.playlist_idx) return;
+    this.playlist_idx--;
+    this.playlist_play( this.playlist[extension.playlist_idx] );
+}
+
+
+    
\ No newline at end of file

gpac-0.5.1.svn5491.tar.xz/gui/extensions/player/stats.js Added

@@ -0,0 +1,573 @@
+
+extension.view_stats = function () {
+    if (this.stat_wnd) {
+        this.stat_wnd.close();
+        this.stat_wnd = null;
+        return;
+    }
+
+    var wnd = gw_new_window_full(null, true, 'Stats');
+    gw_object_set_dragable(wnd);
+    this.stat_wnd = wnd;
+    wnd.extension = this;
+
+    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;
+
+    wnd.has_select = false;
+    wnd.objs = [];
+
+    wnd.gather_res = function (root, selected_service) {
+        //if not dynamic scene, add main OD to satts
+        if (!root.dynamic_scene)
+            this.objs.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.service_id && (m.service_id != selected_service)) continue;
+
+            if (!m.dynamic_scene) {
+                this.objs.push(m);
+            }
+
+            if (m.type == 'Scene' || m.type == 'Subscene') {
+                this.gather_res(m);
+            }
+        }
+    }
+
+    wnd.gather_res(root_odm, root_odm.selected_service);
+
+    for (var res_i = 0; res_i < wnd.objs.length; res_i++) {
+        var m = wnd.objs[res_i];
+        m.gui = {};
+
+        var label = '' + m.type;
+        label += ' ID ' + m.ID;
+        if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
+        else if (m.samplerate) label += ' (' + m.samplerate + ' Hz ' + m.channels + ' channels)';
+
+        m.gui.txt = gw_new_text(wnd.area, label, 'lefttext');
+
+
+        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 {
+                    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 / 1024) + ' kbps';
+                else label += '' + Math.round(bw / 1024 / 1024) + ' mbps';
+
+                label += ' - Maximum ';
+                bw = m.max_bitrate;
+                if (bw < 8000000) label += '' + Math.round(bw / 1024) + ' kbps';
+                else label += '' + Math.round(bw / 1024 / 1024) + ' mbps';
+
+                label += '\n'
+                label += 'Download bandwidth: ';
+                var bw = m.bandwidth_down;
+                if (bw < 8000000) label += '' + Math.round(bw / 1024) + ' kbps';
+                else label += '' + Math.round(bw / 1024 / 1024) + ' 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) {
+                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();
+            }
+        }
+
+        if (m.nb_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);
+                } else {
+                    this.odm.select_quality('auto');
+
+                    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 {
+                    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 = [];
+                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 = m.nb_qualities;
+                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;
+                    }
+                    if (q.bandwidth < 1000000) label += '@' + Math.round(q.bandwidth / 1000) + 'K';
+                    else label += '@' + Math.round(q.bandwidth / 10000) / 100 + 'M';
+
+                    this.gui.select_label.set_label(label);
+                }
+            }
+            m.update_qualities();
+
+        } else {
+            m.gui.select = null;
+            m.gui.select_label = null;
+        }
+
+        nb_http += m.nb_http;
+
+        gw_new_separator(wnd.area);
+    }
+
+    wnd.http_control = null;
+    if (nb_http) {
+        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 / 1024 / 1024) / 100;
+            if (br > 200) bt = 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(100 * gpac.http_max_bitrate / 1024 / 1024) / 100 + ' Mbps');
+
+        } else {
+            wnd.http_control.set_value(0);
+            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) {
+                this.text.set_label('HTTP cap ' + Math.round(100 * br) / 100 + ' Mbps');
+            } else {
+                this.text.set_label('HTTP cap off');
+            }
+            gpac.http_max_bitrate = Math.round(br * 1024 * 1024);
+        }
+
+        gw_new_separator(wnd.area);
+    }
+
+    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 += 4 * gwskin.default_icon_height;
+
+        for (var i = 0; i < this.objs.length; i++) {
+            var aw = w;
+
+            this.objs[i].gui.info.set_size(1.5 * gwskin.default_icon_height, gwskin.default_icon_height);
+            aw -= this.objs[i].gui.info.width;
+
+            if (this.objs[i].gui.buffer) {
+                this.objs[i].gui.buffer.set_size(3 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
+            }
+            if (this.objs[i].gui.play) {
+                this.objs[i].gui.play.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+            }
+            aw -= 4 * gwskin.default_icon_height;
+
+            if (this.objs[i].gui.select) {
+                this.objs[i].gui.select.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+                aw -= gwskin.default_icon_height;
+                this.objs[i].gui.select_label.set_size(4 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
+                aw -= 4 * gwskin.default_icon_height;
+            }
+
+
+            this.objs[i].gui.txt.set_size(aw, gwskin.default_icon_height);
+            this.objs[i].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 (wnd.http_control) {
+            wnd.http_text.set_size(11 * gwskin.default_text_font_size, gwskin.default_icon_height);
+            wnd.http_control.set_size(w - 11 * gwskin.default_text_font_size, 0.2 * gwskin.default_icon_height);
+            h += gwskin.default_icon_height;
+        }
+
+        this.set_size(w, h);
+        this.move((w - width) / 2, (height - h) / 2);
+    }
+    wnd.on_close = function () {
+        this.timer.stop();
+        this.objs = [];
+        this.extension.stat_wnd = null;
+    }
+
+    wnd.timer = gw_new_timer(false);
+    wnd.timer.wnd = wnd;
+    wnd.timer.set_timeout(0.25, true);
+
+    var label = 'Statistics (' + gpac.nb_cores + ' cores - ';
+    if (gpac.system_memory > 1000000000) label += '' + Math.round(gpac.system_memory / 1024 / 1024 / 1024) + ' GB RAM)';
+    else label += '' + Math.round(gpac.system_memory / 1024 / 1024) + ' MB RAM)';
+
+    wnd.set_label(label);
+
+    wnd.stats = [];
+    wnd.stats_window = 32;
+
+    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', 'Mbps', 0.8, 0, 0.8);
+        } else {
+            wnd.s_bw = null;
+        }
+        wnd.s_bitrate = wnd.plot.add_serie('Rate', 'Mbps', 0, 0.8, 0);
+        if (nb_buffering)
+            wnd.s_buf = wnd.plot.add_serie('Buffer', 's', 0, 0, 0.8);
+        else
+            wnd.s_buf = null;
+
+        if (nb_ntp_diff)
+            wnd.s_ntp = wnd.plot.add_serie('NTP diff', '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.timer.on_event = function (val) {
+        var wnd = this.wnd;
+        var nb_buff = 0;
+       
+        var stat_obj = null;
+        //stats every second
+        if (!(val % 4)) {
+            if (wnd.stats.length >= wnd.stats_window) {
+                wnd.stats.splice(0, 1);
+            }
+            stat_obj = {};
+            wnd.stats.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 / 1024 / 1024) / 100;
+            stat_obj.bitrate = 0;
+            if (wnd.s_bw) {
+                var b = gpac.http_bitrate / 1024 / 1024;
+                stat_obj.http_bandwidth = Math.round(100 * b) / 100;
+            }
+            stat_obj.buffer = 0;
+            stat_obj.cumulated_bandwidth = 0;
+            stat_obj.ntp_diff = 0;
+        }
+
+        for (var i = 0; i < wnd.objs.length; i++) {
+            var m = wnd.objs[i];
+            
+            if (m.gui.buffer) {
+                var label = ' ' + m.type;
+                label += ' ID ' + m.ID;
+                if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
+                else if (m.samplerate) label += ' (' + m.samplerate + ' Hz ' + m.channels + ' channels)';
+                m.gui.txt.set_label(label);
+
+                var bl;
+                if (m.max_buffer) {
+                    var speed = wnd.extension.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) {
+//                            stat_obj.buffer = buf;
+//                        }
+
+                        stat_obj.buffer += buf;
+                        nb_buff++;
+                    }
+                }
+                else bl = 100;
+                m.gui.buffer.set_value(bl);
+
+                m.gui.buffer.set_label('' + Math.round(m.buffer / 10) / 100 + ' s');
+
+                if (stat_obj) {
+                  bl = m.ntp_diff;
+                  if (bl > stat_obj.ntp_diff) 
+                    stat_obj.ntp_diff = bl;
+                }
+            }
+
+            if (stat_obj) {
+                stat_obj.bitrate += Math.round(100 * m.avg_bitrate / 1024 / 1024) / 100;
+                stat_obj.cumulated_bandwidth += m.bandwidth_down;
+            }
+        }
+
+        if (stat_obj && wnd.stats.length) {
+            wnd.s_fps.refresh_serie(wnd.stats, 'time', 'fps', wnd.stats_window, 4);
+            if (wnd.s_bw) {
+                wnd.s_bw.refresh_serie(this.wnd.stats, 'time', 'http_bandwidth', wnd.stats_window, 1);
+            }
+            if (wnd.s_buf) {
+                if (nb_buff) {
+                    stat_obj.buffer /= nb_buff;
+                }
+                wnd.s_buf.refresh_serie(this.wnd.stats, 'time', 'buffer', wnd.stats_window, 1.5);
+            }
+            if (stat_obj.bitrate) {
+                wnd.s_bitrate.refresh_serie(this.wnd.stats, 'time', 'bitrate', wnd.stats_window, 2);
+            } else {
+                wnd.s_bitrate.hide();
+            }
+            if (wnd.s_ntp) {
+                wnd.s_ntp.refresh_serie(this.wnd.stats, 'time', 'ntp_diff', wnd.stats_window, 3);
+            }
+            
+            wnd.s_cpu.refresh_serie(wnd.stats, 'time', 'cpu', wnd.stats_window, 10);
+            wnd.s_mem.refresh_serie(wnd.stats, 'time', 'memory', wnd.stats_window, 6);
+        }
+    }
+
+    wnd.quality_changed = function () {
+        for (var i = 0; i < this.objs.length; i++) {
+            var m = this.objs[i];
+            m.update_qualities();
+        }
+    }
+    wnd.close_all = function () {
+        for (var i = 0; i < this.objs.length; i++) {
+            if (this.objs[i].gui.info_wnd) {
+                this.objs[i].gui.info_wnd.odm = null;
+                this.objs[i].gui.info_wnd.close();
+            }
+        }
+        this.objs.length = 0;
+        this.close();
+    }
+    wnd.on_display_size(gw_display_width, gw_display_height);
+    wnd.set_alpha(0.9);
+    wnd.show();
+};
+    
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/gui/extensions/widget_manager/init.js -> gpac-0.5.1.svn5491.tar.xz/gui/extensions/widget_manager/init.js Changed

@@ -61,10 +61,11 @@
 function open_widget_manager(extension)
 {
   if (widman_cfg_dlg) return;
-  
-  widman_cfg_dlg = gw_new_window_full(null, true, 'Widget Manager', 'window');  
+
+  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', 'button');
+
+  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;
@@ -90,7 +91,7 @@
     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', 'button');
+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);
@@ -110,7 +111,6 @@
 }
 
 function widget_insert_icon(new_wid) {
-	//var icon = gw_new_icon_button(dock, widget_get_icon(new_wid), new_wid.name, 'button');
 	var icon = gpacui_insert_dock_icon(new_wid.name, widget_get_icon(new_wid) );
 	new_wid.in_panel = true;
 	new_wid.visible = false;
@@ -361,7 +361,7 @@
 		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, 'button');
+    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;
@@ -550,7 +550,7 @@
   }
 	ctrl.inline.addEventListener('gpac_vp_changed', ctrl.on_widget_vp_changed, 0);
 		
-  ctrl.set_tool_size(widget_tool_size);  
+//  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;

gpac-0.5.0.svn5178.tar.bz2/gui/gui.bt -> gpac-0.5.1.svn5491.tar.xz/gui/gui.bt Changed

gpac-0.5.0.svn5178.tar.bz2/gui/gui.js -> gpac-0.5.1.svn5491.tar.xz/gui/gui.js Changed

@@ -6,1387 +6,275 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 
-/*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_inf;
-
-dictionary = null;
-top_wnd = null;
-controlled_renderer = null;
-movie_connected = false;
-UPnP_Enabled = false;
-browser_mode = false;
-upnp_renderers = null;
-current_url = '';
-current_duration = 0.0;
-current_time = 0.0;
-player_control = null;
-icon_pause=1;
-icon_play=0;
-max_playercontrol_width=1024;
-dynamic_scene=1;
-screen_width = 0;
-screen_height = 0;
-
-GF_STATE_PLAY=0;
-GF_STATE_PAUSE=1;
-GF_STATE_STOP=2;
-GF_STATE_TRICK=3;
-
 all_extensions = [];
 
-function new_extension()
-{
- var obj = new Object();
- obj.built_in = false;
- obj.upnp_add = function(name, uuid, is_add) {};
- all_extensions.push(obj);
- return obj;
-}
-
-function on_movie_duration(value)
-{
-  if (value<0) value=0;
-  current_duration = value;
-  player_control.set_duration(value);
-  if (UPnP_Enabled) UPnP.MovieDuration = value;
-}
-
-function on_movie_active(value)
-{
-  if (!value) {
-   movie_ctrl.mediaStartTime = -1; 
-  }
-}
-
-function on_movie_time(value)
-{
-  var diff = current_time - value;
-  if (diff<0) diff = -diff;
-  /*filter out every 1/2 seconds*/
-  if (diff < 0.5) return;
-  current_time = value;
-  player_control.set_time(value);
-  if (UPnP_Enabled) UPnP.MovieTime = value;
-}
-
 
-in_drag = false;
+in_drag = 0;
 start_drag_x=start_drag_y=0;
 
-function filter_event(evt)
+function my_filter_event(evt)
 {
- if (top_wnd && top_wnd.on_event(evt) ) return true;
-
  switch (evt.type) {
  case GF_EVENT_MOUSEDOWN:
   if (evt.picked) return false;
   start_drag_x = evt.mouse_x;
   start_drag_y = evt.mouse_y;
-  if (gpac.navigation!=GF_NAVIGATE_NONE) return false;
-  in_drag = true;
+  if (gpac.navigation != GF_NAVIGATE_NONE) return false;
+  if (!gpac.fullscreen)  in_drag = 1;
   return true;
- case GF_EVENT_MOUSEMOVE:
-  if (in_drag) {
-    gpac.move_window(evt.mouse_x - start_drag_x, evt.mouse_y - start_drag_y);
-    return true;
-  }
-  return false;
-  
- case GF_EVENT_OPENFILE:
-  var files = evt.files;
-  /*todo - handle playlist*/
-  if (files.length) {
-   set_movie_url(files[0]);
-  }
+ case GF_EVENT_DBLCLICK:
   return true;
-  
- case GF_EVENT_MOUSEUP:
-  in_drag = false;
-  if (evt.picked) return false;
-  if ((start_drag_x == evt.mouse_x) && (start_drag_y == evt.mouse_y)) {
-/*
-   if (dock.visible) {
-    show_dock(false);
-   } else 
-*/   
-   {
-    show_dock(false);
-    if (player_control.visible) {
-      //player_control.hide();
-      top_wnd = null;
-    } else {
-      player_control.show();
-      top_wnd = player_control;
-    }
-   }
-   return false;
-  }
-  return false;
- case GF_EVENT_KEYUP:
-//  alert(evt.keycode);
-  //commented out as HOME is used for viewpoint reset
-/*
-  if (evt.keycode=='Home') {
-    show_dock(!dock.visible);
-    return true;
-  }
-*/
-  if (evt.keycode=='Up') {
-   if (dock.visible) return false;
-    if (player_control.visible) {
-      player_control.hide();
-      top_wnd = null;
-    } else {
-      player_control.show();
-      top_wnd = player_control;
+case GF_EVENT_MOUSEMOVE:
+    if (in_drag) {
+        in_drag = 2;
+        gpac.move_window(evt.mouse_x - start_drag_x, evt.mouse_y - start_drag_y);
+        return true;
     }
-    return true;
-  }
-  return false;
- case GF_EVENT_KEYDOWN:
-  if (evt.keycode=='Left') {
-   gpac.set_focus('previous');
-   return true;
-  }
-  else if (evt.keycode=='Right') {
-   gpac.set_focus('next');
-   return true;
-  }
-  return false;
- case GF_EVENT_NAVIGATE_INFO:
-  //alert('Navigate to '+evt.target_url);
-  return true;
- case GF_EVENT_NAVIGATE:
-  set_movie_url(evt.target_url);
-  return true;
+    return false;
+
+case GF_EVENT_MOUSEUP:
+    if (in_drag == 2) {
+        in_drag = 0;
+        return true;
+    } 
+    in_drag = 0;
+    return false;
  default:
   return false;
  } 
  return false;
 }
 
-
-function show_dock(show)
+function gw_insert_media_node(node) 
 {
- if (show) {
-  dock.show();
-  if (movie_connected) {
-   dock.set_size(display_width, display_height/2);
-   dock.move(0, -display_height/4);
-   movie.scale.x = movie.scale.y = 0.5;
-   movie.translation.y = display_height/4;
-  } else {
-   dock.set_size(display_width, display_height);
-   dock.move(0, 0);
-  }
-  dock.layout();
-  player_control.hide();
-//  set_movie_url('');
-  top_wnd = dock;
-//  uidisplay.hide();
- } else {
-  movie.scale.x = movie.scale.y = 1;
-  movie.translation.y = 0;
-  dock.hide();
-  player_control.hide();
-  top_wnd = null;
-  if (uidisplay.children.length && typeof uidisplay.children[uidisplay.children.length-1].on_event != 'undefined') {
-   top_wnd = uidisplay.children[uidisplay.children.length-1];
-  }
- }
+    media_root.children[media_root.children.length] = node;
+}
+
+function gw_hide_dock() {
+    dock.hide();
+}
+
+function gw_show_dock() {
+    dock.show();
 }
 
-function gpacui_insert_dock_icon(label, icon)
+//insert an offscreen image + text
+function insert_dock_icon(label, icon)
 {
-  if (1) {
-    var wnd = gw_new_window(dock, true, 'offscreen');
-    var icon = gw_new_icon_button(wnd, icon, label, 'osdbutton');
+    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();
-    dock.set_size(display_width, display_height);
-    return icon;
-  } else {
-    var icon = gw_new_icon_button(dock, icon, label, 'osdbutton');
-    dock.set_size(display_width, display_height);
     return icon;
-  }
 }
 
-
-function gpacui_show_window(obj)
-{
- gw_add_child(uidisplay, obj);
-  if (!obj.width || !obj.height) {
-   obj.set_size(200, 200);
-  }
- obj.show();
- top_wnd = null;
- if (uidisplay.children.length && typeof uidisplay.children[uidisplay.children.length-1].on_event != 'undefined') {
-  top_wnd = uidisplay.children[uidisplay.children.length-1];
- }
- layout();
+function extension_option_setter(_ext) {
+    if ((typeof _ext.config_id == 'undefined') || !_ext.config_id || (_ext.config_id == '')) {
+        return function (key_name, value) {
+        }
+    } else {
+        var ext_section = 'GUI.' + _ext.config_id;
+        return function (key_name, value) {
+            gpac.set_option(ext_section, key_name, value);
+        }
+    }
 }
- 
-function compute_movie_size(width, height)
-{
-   var w, h, r_w, r_h;
-   if (!width || !height) return;
 
-   if (width > gpac.screen_width) width = gpac.screen_width;
-   if (height > gpac.screen_height) height = gpac.screen_height;
-   w = width;
-   h = 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);
+function extension_option_getter(_ext) {
+    if ((typeof _ext.config_id == 'undefined') || !_ext.config_id || (_ext.config_id == '')) {
+        return function (key_name, default_val) {
+        }
+    } else {
+        var ext_section = 'GUI.' + _ext.config_id;
+        return function (key_name, default_val) {
+            var value = gpac.get_option(ext_section, key_name);
+            if (value == null) {
+                gpac.set_option(ext_section, key_name, default_val);
+                value = default_val;
+            }
+            return value;
+        }
+    }
 }
 
-//Initialize the main UI script
+//Initialize our GUI
 function initialize() {
     //var icon;
     var i, count, wid;
 
-
     gpac.caption = 'Osmo4';
-    current_time = 0;
 
     min_width = 160;
     min_height = 80;
-    
-    /*load the UI lib*/
-    Browser.loadScript('gwlib.js', false);
-
-    browser_mode = gpac.getOption('Temp', 'BrowserMode');
-    if (browser_mode && (browser_mode=='yes')) {
-     browser_mode = true;
-    } else {
-     browser_mode = false;
+    gw_display_width = parseInt(gpac.getOption('General', 'LastWidth'));
+    gw_display_height = parseInt(gpac.getOption('General', 'LastHeight'));
+    if (!gpac.fullscreen && (!gw_display_width || !gw_display_height)) {
+        gw_display_width = 320;
+        gw_display_height = 240;
     }
-
-    
-//    gwskin.tooltip_callback = function(over, label) { alert('' + over ? label : ''); };
-
-    root.children[0].backColor = gwskin.back_color;
-    movie.children[0].on_size = function(evt) {
-      if (!movie_connected) {
-         movie_connected = true;
-         gpac.set_3d(evt.type3d ? 1 : 0);
-         player_control.play.switch_icon(icon_pause);
-         dynamic_scene = evt.dynamic_scene;
-      }
-      if (!gpac.fullscreen) {
-       compute_movie_size(evt.width, evt.height);
-      }
-    }
-
-    movie.children[0].on_media_progress = function(evt) {
-     if (!current_duration) return;
-     /*this is not conform to HTML5, we're using the old MediaAccessEvent syntax ...*/
-     var percent_dload = 100.0 * evt.loaded / evt.total;
-     var percent_playback = 100.0 * current_time / current_duration;
-     //alert('URL data ' + percent_dload + ' - ' + percent_playback + ' playback');     
-    }
-
-    movie.children[0].on_media_playing = function(evt) {
-     player_control.play.switch_icon(icon_pause);
-    }
-    movie.children[0].on_media_end = function(evt) {
-     if (player_control.duration && movie_ctrl.loop) {
-      movie_ctrl.mediaStartTime = 0;
-      current_time=0; 
-     }
-    }
-    
-    movie.children[0].addEventListener('gpac_scene_attached', movie.children[0].on_size, 0);
-    movie.children[0].addEventListener('progress', movie.children[0].on_media_progress, 0);
-    movie.children[0].addEventListener('playing', movie.children[0].on_media_playing, 0);
-    movie.children[0].addEventListener('canplay', movie.children[0].on_media_playing, 0);
-    movie.children[0].addEventListener('ended', movie.children[0].on_media_end, 0);
-
-    movie.children[0].on_media_waiting = function(evt) {
-     alert('URL is now buffering');     
-    }
-    movie.children[0].addEventListener('waiting', movie.children[0].on_media_waiting, 0);
-
-    
-    display_width = parseInt( gpac.getOption('General', 'LastWidth') );
-    display_height = parseInt( gpac.getOption('General', 'LastHeight') );
-    
-    if (!gpac.fullscreen && (!display_width || !display_height)) {
-     display_width = 320;
-     display_height = 240;
-    }
-    
-    if (!gpac.fullscreen && display_width && display_height) {
-     gpac.set_size(display_width, display_height);
+    if (!gpac.fullscreen && gw_display_width && gw_display_height) {
+        gpac.set_size(gw_display_width, gw_display_height);
     } else {
-     display_width = gpac.get_screen_width();
-     display_height = gpac.get_screen_height();
+        gw_display_width = gpac.get_screen_width();
+        gw_display_height = gpac.get_screen_height();
     }
-    screen_dpi = gpac.get_horizontal_dpi();
-
-
-    dictionary = gw_new_container(root);
-    dictionary.hide();
-    
-    //request event listeners on the window - GPAC specific BIFS extensions !!!     
+    //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);
-    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); 
-    Browser.addRoute(movie_sensor, 'isActive', movie_sensor, on_movie_active); 
     
-    scene_width = 0;
+    /*load the UI lib*/
+    Browser.loadScript('gwlib.js', false);
+    gwlib_init(ui_root);
 
-    /*init UPnP*/
-  	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.onMediaTimeChanged = onMediaTimeChanged;
-  		UPnP.onMediaDurationChanged = onMediaDurationChanged;
-  		UPnP.BindRenderer();
-  		UPnP.MovieURL = '';
-  		UPnP.MovieDuration = 0.0;
-  		UPnP.MovieTime = 0.0;
-  	}
-            
-    dock = gw_new_grid_container(ui_root);
-    dock.spread_h = true;
-    dock.hide();
+    //set background color
+    root.children[0].backColor = gwskin.back_color;
 
-    player_control = new_player_control(ui_root);
-    player_control.hide();
+    //register custom event filter
+    gwlib_add_event_filter(my_filter_event);
 
-    uidisplay = gw_new_container();
-    uidisplay._name = 'Root Display';
-    gw_add_child(ui_root, uidisplay);
-    
-    uidisplay.remove_child = function(child) {
-     this.removeChildren[0] = child;
-     top_wnd = null;
-     if (this.children.length && typeof this.children[this.children.length-1].on_event != 'undefined') {
-      top_wnd = this.children[this.children.length-1];
-     }
-     layout();
-    }
+    //what do we do with tooltips ?
+//    gwskin.tooltip_callback = function(over, label) { alert('' + over ? label : ''); };
 
 
-    /*init our internal extensions*/
-    var icon = gpacui_insert_dock_icon('Player', 'icons/applications-multimedia.svg');
-    icon.on_click = function () { show_dock(false); player_control.show(); };
-    
-    if (UPnP_Enabled) {
-      icon = gpacui_insert_dock_icon('Control', 'icons/video-display.svg');
-      icon.on_click = function () { show_dock(false); select_remote_display('select'); };
+    //create the dock containing all launchers            
+    dock = gw_new_grid_container(null);
 
-      icon = gpacui_insert_dock_icon('Remote', 'icons/applications-internet.svg');
-      icon.on_click = function () { set_movie_url(''); show_dock(false); browse_remote_servers('select'); };
+    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;
-      var extension = new_extension();
-      extension.path = 'extensions/' + list[i].name+'/';
+        if (!list[i].directory) continue;
 
       if (list[i].name.indexOf('.')==0) continue;
       
-      if ( Browser.loadScript('extensions/'+list[i].name+'/init.js', true) == false) continue;
-      if (!setup_extension(extension)) {
-        log(l_inf, 'UI extension '+list[i].name + ' is disabled');
-        continue;
-      }      
-      log(l_inf, 'Loading UI extension '+list[i].name + ' icon '+ extension.path+extension.icon);
-      
-      if (extension.icon && extension.launch) {
-       var icon = gpacui_insert_dock_icon(extension.label, extension.path+extension.icon);
-       icon.extension = extension;
-       icon.on_click = function () { show_dock(false); this.extension.launch(this.extension); }
+      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 (extension.initialize) extension.initialize(extension);
-    }
 
-    current_url = '';
-    //let's do the layout   
-    layout();
-    gpac.set_event_filter(filter_event);
-
-    var url = gpac.getOption('Temp', 'GUIStartupFile');
-    if (url) {
-      if (url.indexOf('://')<0) set_movie_url('gpac://'+url);
-      else set_movie_url(url);
-    } else {
-        player_control.show();
-  }
-}
+      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 + '/';
 
-function set_movie_url(url)
-{  
-  if ((url=='') || (url==current_url)) {
-    movie.children[0].url[0] = url;
-    movie_ctrl.url[0] = url;
-    movie_sensor.url[0] = url;    
-    if (UPnP_Enabled) UPnP.MovieURL = url;
-    movie_connected = (url=='') ? false : true;
-    root.children[0].set_bind = movie_connected ? FALSE : TRUE;
-  } else if (controlled_renderer==null) {
-    /*connect a new resource to the destination - if success, switch resources*/
-    var test_resource = new SFNode('Inline');
+      gwlog(l_deb, 'Loading UI extension ' + extension.name + ' ' + ' icon ' + extension.path + extension.icon + ' Author ' + extension.author);
 
-    test_resource.callback_done = false;
-    test_resource.on_attached = function(evt) {
+      all_extensions.push(extension);
 
-      this.callback_done = true;
-      current_url = this.url[0];
-      
-      /*process the error or connect service*/
-      if (evt.error) {
-        var notif = gw_new_message(null, 'Error!', 'Failed to open\n'+this.url[0]+ '\nReason: '+gpac.error_string(evt.error) );
-        gpacui_show_window(notif);
-      } else {
-        movie.children[0].url[0] = current_url;
-        movie_ctrl.mediaSpeed = 1;
-        movie_ctrl.mediaStartTime = 0;
-        movie_ctrl.url[0] = current_url;
-        movie_sensor.url[0] = current_url;
-        root.children[0].set_bind = FALSE;
-
-        movie.children[0].on_size(evt);
+      extension.icon = insert_dock_icon(extension.name, extension.path + extension.icon);
+      extension.icon.ext_description = extension;
+      extension.icon.extension_obj = null;
+      extension.icon.on_close = function () {
+        this.ext_description.icon = null;
+        this.ext_description = null;
       }
-      /*destroy the resource node*/
-      this.url.length = 0;
-      gw_detach_child(this);
-      test_resource.removeEventListener('gpac_scene_attached', test_resource.on_attached, 0);
-      this.on_attached = null;
-      
+      extension.icon.on_click = function () {
+          if (!this.extension_obj) {
+              for (var i=0; i<this.ext_description.execjs.length; i++) {
+                gwlog(l_deb, 'Loading UI extension ' + this.ext_description.name + ' - Executing JS ' + this.ext_description.path + this.ext_description.execjs[i]);
+                if (!i) {
+                    this.extension_obj = Browser.loadScript(this.ext_description.path + this.ext_description.execjs[i]);
+                    this.compatible = (this.extension_obj != null) ? true : false;
+                    if (!this.compatible) break;
+                } else {
+                    Browser.loadScript(this.ext_description.path + this.ext_description.execjs[i]);
+                }
+              }
+
+              if (this.compatible) {
+                    this.extension_obj.get_option = extension_option_getter(this.ext_description);
+                    this.extension_obj.set_option = extension_option_setter(this.ext_description);
+              }
+          }
+          if (!this.compatible) {
+              var w = gw_new_message(null, 'Error', 'Extension ' + this.ext_description.name + ' is not compatible');
+              w.show();
+              alert('Error');
+              this.parent.disable();
+              return;
+          }
+
+          if (this.extension_obj && (typeof this.extension_obj.start != 'undefined')) this.extension_obj.start();
+      } 
     }
-
-    /*get notified when service loads or fails*/
-    test_resource.addEventListener('gpac_scene_attached', test_resource.on_attached, 0);
-
-    /*handle navigation between local files*/    
-    if ((current_url.indexOf('gpac://')>=0) && (url.indexOf('://')<0)) {
-      test_resource.url[0] = "gpac://"+url;
-    } else {
-      test_resource.url[0] = url;
-    }
-    /*URL assignment may trigger synchronous replies*/
-    if (!test_resource.callback_done) {
-      gw_add_child(dictionary, test_resource);  
-    }
-
-    return;
     
-  } else {
-    var uri = UPnP.ShareResource(url);
-    controlled_renderer.Open(uri); 
-  }
-  current_url = url;
-  current_time = 0;
-  
-  if (url == '') player_control.show();
-  else player_control.hide();
+    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() 
 {
-  var i, list, start_x, w;
-  w = display_width;
-  if (max_playercontrol_width && (w>max_playercontrol_width)) w=max_playercontrol_width;
-  player_control.set_size(w, player_control.height);
-
-  
-  dock.set_size(display_width, display_height);
-//  dock.set_size(display_width, display_height);
-//  if (uidisplay.children.length) uidisplay.children[0].set_size(display_width, display_height);
+    gwlib_notify_display_size(gw_display_width, gw_display_height);
 }
 
 //resize event callback
 function on_resize(evt) {
-  if ((display_width == evt.width) && (display_height == evt.height)) return;
-  if (evt.width <=100) {
-    gpac.set_size(100, display_height);
-    return;
-  }
-  if (evt.height <=80) {
-    gpac.set_size(display_width, 40);
-    return;
-  }
-
-  display_width = evt.width;
-  display_height = evt.height;
-  if (!gpac.fullscreen) {
-    gpac.setOption('General', 'LastWidth', ''+display_width);
-    gpac.setOption('General', 'LastHeight', ''+display_height);
-  }
-  layout();
-
-  for (var i in all_extensions) {
-   if (typeof all_extensions[i].on_resize != 'undefined') {
-      all_extensions[i].on_resize(display_width, display_height);
-   }
-  }
-}
-
-//zoom event callback
-function on_zoom(evt) {
-    display_width = evt.width;
-    display_height = evt.height;
-    layout();
-}
-//scroll event callback
-function on_scroll(evt) {
-  layout();
-}
-
-
-function new_player_control(container)
-{ 
-  var control_icon_size = gwskin.default_icon_size;
-  var small_control_icon_size;
-  var wnd = gw_new_window(container, true, 'osdwindow');
-  wnd.connected = false;
-  this.stoped_url = null;
-
-  small_control_icon_size = control_icon_size;
-
-  wnd.set_corners(true, true, false, false);
-
-  /*first set of controls*/
-  wnd.infobar = gw_new_grid_container(wnd);
-  wnd.infobar.spread_h = true;
-  
-  /*add our controls in order*/
-  if (1) {
-    wnd.snd_low = gw_new_icon_button(wnd.infobar, 'icons/audio-volume-low.svg', 'Lower', 'icon');
-    wnd.snd_ctrl = gw_new_slider(wnd.infobar);
-    wnd.snd_low.add_icon('icons/audio-volume-muted.svg');
-    wnd.muted = 0;
-    wnd.snd_low.on_click = function() {
-     if (player_control.muted) {
-      gpac.volume = player_control.muted;
-      player_control.muted = 0;
-      this.switch_icon(0);
-     } else {
-      player_control.muted = gpac.volume ? gpac.volume : 1;
-      gpac.volume = 0;
-      this.switch_icon(1);
-     }
+    if ((gw_display_width == evt.width) && (gw_display_height == evt.height)) return;
+    if (evt.width <=100) {
+        gpac.set_size(100, gw_display_height);
+        return;
     }
-    wnd.snd_ctrl.on_slide = function(value, type) {
-     if (player_control.muted) player_control.snd_low.on_click();
-     gpac.volume = value;
+    if (evt.height <=80) {
+        gpac.set_size(gw_display_width, 40);
+        return;
     }
-    wnd.snd_low.set_size(small_control_icon_size, small_control_icon_size);
-    wnd.snd_ctrl.set_size(2*small_control_icon_size, 2, control_icon_size/3, control_icon_size/3);
-    wnd.snd_ctrl.set_value(gpac.volume);  
-  } else {
-    wnd.snd_low = null;
-    wnd.snd_ctrl = null;
-  }
-  
-  
-  wnd.set_state = function(state) {
-   if (!movie_connected && !controlled_renderer) return;
 
-   if (state==this.state) return;
-   
-   if (state == GF_STATE_STOP) {
-     this.stoped_url = ''+current_url;
-     if (controlled_renderer) controlled_renderer.Stop();
-     else {
-      set_movie_url(''); 
-      /*override movie_connected to avoid auto-resizing*/
-      movie_connected = true;
-     }
-     movie_ctrl.mediaStartTime = 0; 
-     this.media_line.set_value(0);
-     this.play.switch_icon(icon_play);
-     this.state = GF_STATE_STOP;
-     return;
-   }
-   if (state==GF_STATE_PAUSE) {
-    if (this.state==GF_STATE_STOP) return;    
-    if (controlled_renderer) controlled_renderer.Pause();
-    movie_ctrl.mediaSpeed = 0; 
-    this.state=GF_STATE_PAUSE;
-    this.play.switch_icon(icon_play);
-    return;
-   }
-   //we are playing, resume from stop if needed
-   if (this.stoped_url) {
-    if (controlled_renderer) {
-      controlled_renderer.Play();
-    } else {
-     set_movie_url(this.stoped_url);
+    gw_display_width = evt.width;
+    gw_display_height = evt.height;
+    if (!gpac.fullscreen) {
+        gpac.setOption('General', 'LastWidth', '' + gw_display_width);
+        gpac.setOption('General', 'LastHeight', '' + gw_display_height);
     }
-    this.stoped_url = null;
-    //not in trick mode, next pause/play will restart from current time
-    if (state != GF_STATE_TRICK)
-      movie_ctrl.mediaStartTime = -1; 
-   }
-   
-  
-   if (state==GF_STATE_PLAY) {
-    if (controlled_renderer) controlled_renderer.Play();
-    this.state = state;
-    movie_ctrl.mediaSpeed = 1; 
-    this.play.switch_icon(icon_pause);
-    return;
-   }
-   if (state==GF_STATE_TRICK) {
-    this.state = state;
-    this.play.switch_icon(icon_play);
-    movie_ctrl.mediaStartTime = -1; 
-    return;
-   }
-  }
-  
-  wnd.stop = gw_new_icon_button(wnd.infobar, 'icons/media-playback-stop.svg', 'Stop', 'icon');
-  wnd.stop.on_click = function() {
-   player_control.set_state(GF_STATE_STOP);
-  }
-  wnd.stop.set_size(small_control_icon_size, small_control_icon_size);
-
-
-  if (0) {
-    wnd.rewind = gw_new_icon_button(wnd.infobar, 'icons/media-seek-backward.svg', 'Rewind', 'icon');
-    wnd.rewind.set_size(small_control_icon_size, small_control_icon_size);
-  } else {
-    wnd.rewind = null;
-  } 
-
-  wnd.play = gw_new_icon_button(wnd.infobar, 'icons/media-playback-start.svg', 'Play', 'icon');
-  wnd.play.set_size(control_icon_size, control_icon_size);
-  wnd.state = GF_STATE_PLAY;
-  wnd.play.add_icon('icons/media-playback-pause.svg');
-  wnd.play.on_click = function() {
-    player_control.set_state( (player_control.state==GF_STATE_PLAY) ? GF_STATE_PAUSE : GF_STATE_PLAY);
-  }
-  
-  if (!browser_mode) {
-    wnd.forward = gw_new_icon_button(wnd.infobar, 'icons/media-seek-forward.svg', 'Forward', 'icon');
-    wnd.forward.on_click = function() {
-     if (movie_ctrl.mediaSpeed) {
-      player_control.set_state(GF_STATE_TRICK);
-      movie_ctrl.mediaSpeed = 2*movie_ctrl.mediaSpeed;
-     }
+/*
+    var v = 12;
+    if (gw_display_height<160) {
     }
-    wnd.forward.set_size(small_control_icon_size, small_control_icon_size);
-  } else {
-    wnd.forward = null;
-  }
-
-  wnd.media_line = gw_new_progress_bar(wnd.infobar, false, true);
-  wnd.media_line.on_slide = function(value, type) { 
-   if (!movie_connected && !controlled_renderer) {
-    this.set_value(0);
-    return;
-   }
-   
-   var duration = player_control.duration;
-   if (!duration) return;
-   var time = value*duration/100;
-
-   if (controlled_renderer) {
-    controlled_renderer.Seek(time);
-    return;
-   }
-   root.children[0].set_bind = FALSE;
-   switch (type) {
-   //sliding
-   case 1:
-    player_control.set_state(GF_STATE_PAUSE);
-    movie_ctrl.mediaStartTime = time; 
-    movie_ctrl.mediaSpeed = 0;
-    break;
-   //done sliding
-   case 2:
-    player_control.set_state(GF_STATE_PLAY);
-    if (time!= movie_ctrl.mediaStartTime) movie_ctrl.mediaStartTime = time;
-    movie_ctrl.mediaSpeed = 1;
-    break;
-   //init slide, go in play mode
-   default:
-    if (player_control.state==GF_STATE_STOP)
-      player_control.set_state(GF_STATE_PLAY);
-      
-    player_control.set_state(GF_STATE_PAUSE);
-    movie_ctrl.mediaStartTime = time;
-    break;
-   }   
-  }  
-  
-
-  wnd.time = gw_new_text(wnd.infobar, '00:00:00', 'osdwindow');
-  gw_object_set_hitable(wnd.time);
-  wnd.time.reversed = false;
-  wnd.time.on_down = function(val) {
-   if (!val) return;
-   this.reversed = !this.reversed;
-   player_control.set_time(player_control.current_time);
-  }
-  wnd.time.set_size(control_icon_size, control_icon_size);
-  wnd.time.set_width(4*wnd.time.font_size() );
-  
-  if (0) {
-    wnd.loop = gw_new_icon_button(wnd.infobar, 'vector/loop.svg', 'Loop', 'icon');
-    wnd.loop.on_click = function () { 
-      movie_ctrl.loop = movie_ctrl.loop ? FALSE : TRUE;
+    else if (gw_display_height<576) {
+        v = 24;
     }
-    wnd.loop.set_size(small_control_icon_size, small_control_icon_size);
-  } else {
-    wnd.loop = null;
-  }
-
-  wnd.view = gw_new_icon_button(wnd.infobar, 'icons/edit-find.svg', 'Navigation', 'icon');
-  wnd.view.on_click = function() {
-    select_navigation_type();
-  }
-  wnd.view.set_size(small_control_icon_size, small_control_icon_size);
-
-    
-  if (!browser_mode) {
-    wnd.open = gw_new_icon_button(wnd.infobar, 'icons/folder.svg', 'Open', 'icon');
-    wnd.open.on_click = function () { open_local_file(); }
-    wnd.open.on_long_click = function () { open_url(); }
-    wnd.open.set_size(small_control_icon_size, small_control_icon_size);
-  } else{ 
-    wnd.open = null;
-  }
-  
-  
-  if (!browser_mode) {
-    wnd.home = gw_new_icon_button(wnd.infobar, 'icons/go-home.svg', 'Home', 'icon');
-    wnd.home.on_click = function() { show_dock(true); }
-    wnd.home.set_size(small_control_icon_size, small_control_icon_size);
-  } else {
-    wnd.home = null;
-  }
-  
-  
-  if (UPnP_Enabled) {
-    wnd.remote =  gw_new_icon_button(wnd.infobar, 'icons/video-display.svg', 'Select Display', 'icon');
-    wnd.remote.on_click = function () { select_remote_display('push'); }
-    wnd.remote.set_size(small_control_icon_size, small_control_icon_size);
-  } else {
-    wnd.remote =  null;
-  }
-  
-  if (1) {
-    wnd.fullscreen = gw_new_icon_button(wnd.infobar, 'icons/view-fullscreen.svg', 'Fullscreen', 'icon');
-    wnd.fullscreen.on_click = function() { gpac.fullscreen = !gpac.fullscreen; }
-    wnd.fullscreen.set_size(small_control_icon_size, small_control_icon_size);
-  } else {
-    wnd.fullscreen = null;
-  }
-  
-  if (!browser_mode) {
-    wnd.exit = gw_new_icon_button(wnd.infobar, gwskin.images.cancel, gwskin.labels.close, 'icon');
-    wnd.exit.on_click = function() { gpac.exit(); }
-    wnd.exit.set_size(small_control_icon_size, small_control_icon_size);
-  } else {
-    wnd.exit = null;
-  }
-       
-  
-  
-  wnd.layout = function(width, height) {
-   var min_w, full_w, time_w;
-   var control_icon_size = gwskin.default_icon_size;
-   this.move(0, Math.floor( (height-display_height)/2) );
-    
-   width -= control_icon_size/2;
-   min_w = this.play.width + this.time.width;
-   if (this.open) min_w += this.open.width;
-   if (this.home) min_w += this.home.width;
-   if (this.exit && gpac.fullscreen) min_w += this.exit.width;
-   full_w = 0;
-   if (this.snd_low) full_w += this.snd_low.width;
-   if (this.snd_ctrl) full_w += this.snd_ctrl.width;
-   if (this.fullscreen) full_w += this.fullscreen.width;
-
-   if (this.view) {
-     this.view.hide();
-     if (!dynamic_scene && movie_connected && (gpac.navigation_type!= GF_NAVIGATE_TYPE_NONE) ) {
-      full_w+= this.view.width;
-     }
-   }
-   
-   if (this.duration) {
-     if (this.stop) full_w += this.stop.width;
-     if (this.play) full_w += this.play.width;
-     if (this.rewind) full_w+= this.rewind.width;
-     if (this.forward) full_w+= this.forward.width;
-     if (this.loop) full_w += this.loop.width;
-   }
-
-	 if (this.remote && UPnP.MediaRenderersCount && (current_url!='')) {
-      full_w += this.remote.width;
-   }
-   time_w = this.media_line.visible ? 2*control_icon_size : 0;
-
-   if (this.exit) {
-    if (gpac.fullscreen) {
-      this.exit.show();
-    } else {
-      this.exit.hide();
+    else if (gw_display_height<720) {
+        v = 32;
     }
-   } 
-
-   if (min_w + full_w + time_w < width) {
-     if (this.media_line.visible)
-       this.media_line.set_size(width - min_w - full_w - control_icon_size/3, control_icon_size/3);
-  
-     if (this.snd_low) this.snd_low.show();
-     if (this.snd_ctrl) this.snd_ctrl.show();
-     if (this.duration) {
-      if (this.rewind) this.rewind.show();
-      if (this.forward) this.forward.show();
-      if (this.loop) this.loop.show();
-      if (this.stop) this.stop.show();
-     }
-     if (wnd.fullscreen) wnd.fullscreen.show();
-  	 
-     if (this.remote) {
-      if (UPnP.MediaRenderersCount && (current_url!='')) {
-        this.remote.show();
-      } else {
-        this.remote.hide();
-      }
-  	 }
-  	 
-     if (this.view && !dynamic_scene && movie_connected && (gpac.navigation_type!= GF_NAVIGATE_TYPE_NONE) ) {
-      this.view.show();
-     }
-   } else {
-        
-     if (this.snd_low) this.snd_low.hide();
-     if (this.snd_ctrl) this.snd_ctrl.hide();
-     if (this.rewind) this.rewind.hide();
-     if (this.stop) this.stop.hide();
-     if (this.forward) this.forward.hide();
-     if (this.loop) this.loop.hide();
-     if (this.fullscreen) this.fullscreen.hide();
-  	 if (this.remote) this.remote.hide();
-  	 
-     if (this.view && movie_connected && (gpac.navigation_type!= GF_NAVIGATE_TYPE_NONE) ) {
-      if (min_w + time_w + this.view.width < width) {
-       min_w += this.view.width;
-       this.view.show();
-      }
-     }
-     
-     if (this.remote) {
-      if (UPnP.MediaRenderersCount && (current_url!='') && (min_w + time_w + this.remote.width < width)) {
-       min_w += this.remote.width;
-       this.remote.show();
-      } else {
-        this.remote.hide();
-  	  }
- 	   }
-     
-     if (this.media_line.visible)
-       this.media_line.set_size(width - min_w - 5, control_icon_size/3);
-
-   }   
-   width += control_icon_size/2;
-   this.infobar.set_size(width, height);
-  }
-
-  wnd.current_time = 0;
-  wnd.duration = 0;
-  wnd.set_duration = function(value) { 
-    this.duration = value; 
-    if (!value) {
-      wnd.time.hide();
-      wnd.media_line.hide();
-      if (wnd.rewind) wnd.rewind.hide();
-      if (wnd.stop) wnd.stop.hide();
-      if (wnd.forward) wnd.forward.hide();
-      if (wnd.loop) wnd.loop.hide();
-      wnd.time.set_size(0, control_icon_size);
-      wnd.time.set_width(0);
-    } else {
-      wnd.time.show();
-      wnd.media_line.show();
-      if (wnd.rewind) wnd.rewind.show();
-      if (wnd.stop) wnd.stop.show();
-      if (wnd.forward) wnd.forward.show();
-      if (wnd.loop) wnd.loop.show();
-      if (value<3600) {
-        wnd.time.set_size(control_icon_size/2, control_icon_size);
-        wnd.time.set_width(3*wnd.time.font_size() );
-      } else {
-        wnd.time.set_size(control_icon_size, control_icon_size);
-        wnd.time.set_width(4*wnd.time.font_size() );
-      }
-    }
-    this.layout(this.width, this.height);
-  }
-  wnd.set_time = function(value) {
-   var h, m, s, str;
-   if (!this.duration) return;
-   this.current_time = value;
-   if (this.duration) { 
-    this.media_line.set_value(100*value / this.duration);
-   }
-   str='';
-   if (this.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.time.set_label(str);   
-  }
-  wnd.on_event = function(evt) {
-   if (this.infobar.on_event(evt)) return true;
-   return false;
-  }
-  
-  gw_object_set_hitable(wnd);
-  wnd.set_size(200, control_icon_size);
-  wnd.set_duration(0);
-  wnd.set_time(0);
-  return wnd;
-}
-
-
-
-function open_local_file()
-{
-  var filebrowse = gw_new_file_open();
-  filebrowse.filter = '*';
-  filebrowse.browse(gpac.last_working_directory);  
-  
-  filebrowse.on_browse = function(value, directory) {
-    if (value==null) {
-      player_control.set_state(this.prev_state);
-      player_control.show();
-    } else {
-     if (directory) gpac.last_working_directory = directory;
-     set_movie_url(value);
-     show_dock(false);
+    else {
+        v = 48;
     }
- }
- var w = display_width/2;
- if (w<200) w = display_width-20;
- filebrowse.set_size(w, 3*display_height/4);
- if (gpac.hardware_rgba) filebrowse.set_alpha(0.8);
-
- player_control.hide();
- gpacui_show_window(filebrowse);
-
- filebrowse.prev_state = player_control.state;
- player_control.set_state(GF_STATE_PAUSE);
-}
-
-urldlg = null;
-
-function open_url()
-{
-  if (urldlg) return;
-  urldlg = gw_new_window(null, true, 'window');
-
-  urldlg.sizer = gw_new_grid_container(urldlg);
-
-  urldlg.icon = gw_new_icon_button(urldlg.sizer, gwskin.images.cancel, gwskin.labels.close, 'icon');
-  urldlg.icon.set_size(gwskin.default_icon_size, gwskin.default_icon_size);
-  urldlg.icon.on_click = function() {
-    urldlg.close();
-    urldlg = null;
-  }
-  urldlg.label = gw_new_text(urldlg.sizer, 'URL', 'window');
-  urldlg.label.set_size(gwskin.default_icon_size, gwskin.default_icon_size);
-  urldlg.label.set_width(gwskin.default_icon_size);
+    gwskin_set_default_control_height(v*2);
+    gwskin_set_default_icon_height(v);
+    gwlib_refresh_layout();
     
-  urldlg.edit = gw_new_text_edit(urldlg.sizer, '');
-  
-  urldlg.edit.on_text = function(value) {
-    if (value != '') set_movie_url(value);
-    urldlg.close();
-    urldlg = null;
- }
- urldlg.layout = function(width, height) {
-  var w = width - this.icon.width - this.label.width-5;
-  this.edit.set_size(w, 4*gwskin.default_icon_size/5);
-  this.sizer.set_size(width, height);
- }
- urldlg.close  = function() {
-  this.label = null;
-  this.icon = null;
-  this.edit = null;
-  this.sizer = null;
-  this.hide(this._on_wnd_close);
- }
- gpacui_show_window(urldlg);
- urldlg.set_size(display_width, gwskin.default_icon_size);
-}
-
-function onMediaRendererAdd(name, uuid, is_add)
-{
-	if (upnp_renderers) upnp_renderers.browse('');
-	if (!is_add && controlled_renderer && (name==controlled_renderer.Name) ) controlled_renderer = null;
-
-  /*redo player control*/	
-	player_control.layout(player_control.width, player_control.height);
-
-  for (var i in all_extensions) {
-   if (typeof all_extensions[i].on_upnp_add != 'undefined') all_extensions[i].on_upnp_add(name, uuid, is_add);
-  }
-}
-
-function onMediaConnect(url, src_ip)
-{
-  for (var i in all_extensions) {
-   if (typeof all_extensions[i].on_media_open != 'undefined') {
-    if (all_extensions[i].on_media_open(url, src_ip)>0) return;
-   }
-  }
-
-  {
-		log(l_inf, 'DLNA URL connect ' + url);
-		movie_ctrl.mediaStartTime = -1;
-		set_movie_url(url);
-	}
-}
-
-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, 'Migration Request received');
-	var str = gpac.migrate_url(movie.children[0].url[0]);
-	set_movie_url('');
-	return str;
-}
-
-function onMediaTimeChanged(render_idx, time)
-{
- if (!controlled_renderer) return;
- if (UPnP.GetMediaRenderer(render_idx).Name==controlled_renderer.Name) {
-  player_control.set_time(time);
- }
-}
-
-function onMediaDurationChanged(render_idx, time)
-{
- if (!controlled_renderer) return;
- if (UPnP.GetMediaRenderer(render_idx).Name==controlled_renderer.Name) {
-  player_control.set_duration(time);
- }
-}
-
-
-function select_remote_display(action_type, callback)
-{ 
-  if (upnp_renderers) return;
-  upnp_renderers = gw_new_file_open();
-  upnp_renderers.set_label('Select Remote Display');
-  upnp_renderers.action_type = action_type;
-  if (arguments.length<2) callback=null;
-  upnp_renderers.callback = callback;
-
-  upnp_renderers.on_close = function() {
-   upnp_renderers = null;
-  }
-  /*override browse function*/
-  upnp_renderers._on_upnp_click = function() {
-   	var renderer = (this.render_idx<0) ? null : UPnP.GetMediaRenderer(this.render_idx);
-    var act_type = upnp_renderers.action_type;
-    
-    if (act_type=='callback') {
-			if (upnp_renderers.callback) upnp_renderers.callback(renderer);
-			upnp_renderers.callback = null;
-      upnp_renderers.close();
-      upnp_renderers = null;
-      return;
-    }
-
-    upnp_renderers.close();
-    upnp_renderers = null;
-
-    if (act_type=='select') {
-     controlled_renderer = renderer;
-     return;
-    }
-
-    if ((current_url.indexOf('://') < 0) || (current_url.indexOf('file://') >= 0) ) {
-			if (! UPnP.MediaServerEnabled) {
-       log(l_err, 'GPAC Media Server is disabled - Cannot share '+current_url);
-       return;
-  		}
-	  	uri = UPnP.ShareResource(current_url);
-			log(l_inf, 'Sharing '+current_url+' to renderer '+renderer.Name + ' as resource '+uri);
-			renderer.Open(uri);
-			renderer.Seek(current_time);
-  	} else if (gpac.getOption('Network', 'MobileIPEnabled')=='yes') { 
-   		uri = gpac.migrate_url(movie.children[0].url[0]);
- 			log(l_inf, 'Migrating '+current_url+' to renderer '+renderer.Name + ' as Mobile IP resource '+uri);
- 			renderer.Open(uri);
- 		} else {
-  		log(l_inf, 'Migrating '+current_url+' to renderer '+renderer.Name);
-  		renderer.Open(current_url);
-  		renderer.Seek(current_time);
-  	}
- 		set_movie_url('');
-    player_control.show();
-  };
-
-  upnp_renderers._browse = function(dir, up) {
-   var w, h, i, y;
-   this.area.reset_children();
- 
-   if (this.action_type=='select') {
-    var item = gw_new_icon_button(this.area, controlled_renderer ? 'icons/applications-internet.svg' : 'icons/preferences-desktop-remote-desktop.svg', 'Local Display', 'button');
-    item.set_size(item.width, item.height);
-    item.render_idx = -1;
-    item.on_click = this._on_upnp_click;
-   }   
-   for (i=0; i<UPnP.MediaRenderersCount; i++) {
-		var render = UPnP.GetMediaRenderer(i);
-		var	icon = 'icons/applications-internet.svg';
-    if ((this.action_type=='select') && controlled_renderer && (controlled_renderer.Name==render.Name)) icon = 'icons/preferences-desktop-remote-desktop.svg';
-    var item = gw_new_icon_button(this.area, icon, render.Name, 'button');
-    item.set_size(item.width, item.height);
-    item.render_idx = i;
-    item.on_click = this._on_upnp_click;
-   }  
-   this.layout(this.width, this.height);
- }
- upnp_renderers.browse('');  
- upnp_renderers.go_up.hide();
- upnp_renderers.set_size(display_width, display_height);
- gpacui_show_window(upnp_renderers);
-}
-
-
-remote_servers = null;
-function browse_remote_servers()
-{
-  if (remote_servers) return;
-  remote_servers = gw_new_file_open();
-  remote_servers.set_label('Browse Remote Servers');
-
-
-  remote_servers.icon_server = gw_load_resource( 'icons/applications-internet.svg' );
-  remote_servers.icon_folder = gw_load_resource( gwskin.images.folder );
-  remote_servers.icon_file = gw_load_resource( gwskin.images.mime_generic );
-  
-  /*override browse function*/
-  remote_servers.server = null;
-  remote_servers._on_server_click = function() {
-   if (this.is_server) {
-    remote_servers.server = UPnP.GetMediaServer(this.server_idx);
-    remote_servers._browse('0', false);
-    return;
-   }
-   if (this.directory) {
-    remote_servers._browse(this.path, false);
-    return;
-   }
-   //alert('Opening file '+this.resource_uri);
-   set_movie_url(this.resource_uri);
-   remote_servers.close(); 
-   remote_servers = null;
-  }
-
-  remote_servers._browse = function(dir, up) {
-   var w, h, i, y;
-   this.area.reset_children();
-
-   //alert('Browsing dir '+dir+' on server '+ (this.server ? this.server.Name : 'null') );   
-   if (!this.server || (up && !this.server.HasParentDirectory())) dir='';
-   this.directory = dir;
-   
-   if (dir=='') {
-     for (i=0; i<UPnP.MediaServersCount; i++) {
-  		var server = UPnP.GetMediaServer(i);
-      var item = gw_new_icon_button(this.area, this.icon_server, server.Name, 'button');
-      item.set_size(item.width, item.height);
-      item.server_idx = i;
-  		item.directory = true;
-			item.is_server = true;
-      item.on_click = this._on_server_click;
-     }  
-   } else {
-     if (up) dir = '..';
-		 this.server.Browse(dir, this.filter);
-     //alert('Nb Files '+this.server.FilesCount);
-     this.directory = this.server.Name;
-		 
-		 for (var i=0; i<this.server.FilesCount; i++) {
-				var file = this.server.GetFile(i);
-				if (file.Directory) {
-          var item = gw_new_icon_button(this.area, this.icon_folder, file.Name, 'button');
-					item.directory = true;
-					item.path = file.ObjectID;
-					item.is_server = false;
-          item.on_click = this._on_server_click;
-				} else {
-				  /*FIXME - need a better way to handle this !!*/
-//					for (var j=0; j<file.ResourceCount; j++) {
-  					for (var j=0; j<1; j++) {
-            var item = gw_new_icon_button(this.area, this.icon_file, file.Name, 'button');
-						item.directory = false;
-						item.resource_uri = file.GetResourceURI(j);
-						var protoInfo = item.resource_uri.split(":");
-            item.set_label(file.Name + ' ('+protoInfo[0]+')' );
-						item.path = file.ObjectID;
-						item.is_server = false;
-            item.on_click = this._on_server_click;
-					}
-				}
-			}
-    }
-   //alert('Done Browsing, refreshing layout');
-   
- 	 if (this.directory == '') this.go_up.hide();
-   else this.go_up.show();
-
-   this.layout(this.width, this.height);
- }
- 
- remote_servers.predestroy = function() {
-  this.server = null;
-  this.scan_dir = null;
-  this.go_up = null;
-  gw_unload_resource(this.icon_server);
-  gw_unload_resource(this.icon_folder);
-  gw_unload_resource(this.icon_file);
-  remote_servers = null;
- }
- 
- remote_servers.browse('');  
- remote_servers.set_size(display_width, display_height);
- gpacui_show_window(remote_servers);
-} 
-
-nav_sel_wnd = null;
+*/
 
-function make_select_item(container, text, type, current_type)
-{
-  if (current_type==type) text = '* ' + text+ ' *';
-  var info = gw_new_button(container, text, 'osdwindow');
-	info.on_click = function() { nav_sel_wnd.select(type); };	
-	info.set_size(120, 20);
-	return info;
+    layout();
 }
 
-function select_navigation_type()
-{
-  var nb_items = 0;
-  var type = gpac.navigation;
-  if (nav_sel_wnd) return;
-  nav_sel_wnd = gw_new_window(null, true, 'osdwindow');
-  nav_sel_wnd.area = gw_new_grid_container(nav_sel_wnd);
-	nav_sel_wnd.layout = function(width, height) {
-   this.area.set_size(width, height);
-  }
-  nav_sel_wnd.select = function(type) {
-	  this.area = null;
-    this.close();
-    nav_sel_wnd = null;
-    if (type=='reset') {
-      gpac.navigation_type = 0;
-    } else {
-      gpac.navigation = type;
-    }
-  }
-
-  var info = gw_new_button(nav_sel_wnd.area, 'Reset', 'button');
-	info.on_click = function() { 
-    nav_sel_wnd.select('reset');
-  };	
-	info.set_size(120, 20);
-	nb_items = 1;
-	
-
-  var info = make_select_item(nav_sel_wnd.area, 'None', GF_NAVIGATE_NONE, type);	
-  make_select_item(nav_sel_wnd.area, 'Slide', GF_NAVIGATE_SLIDE, type);	
-  make_select_item(nav_sel_wnd.area, 'Examine', GF_NAVIGATE_EXAMINE, type);	
-  nb_items += 3;
-
-  if (gpac.navigation_type==GF_NAVIGATE_TYPE_3D) {
-    make_select_item(nav_sel_wnd.area, 'Walk', GF_NAVIGATE_WALK, type);	
-    make_select_item(nav_sel_wnd.area, 'Fly', GF_NAVIGATE_FLY, type);	
-    make_select_item(nav_sel_wnd.area, 'Pan', GF_NAVIGATE_PAN, type);	
-    make_select_item(nav_sel_wnd.area, 'Game', GF_NAVIGATE_GAME, type);	
-    make_select_item(nav_sel_wnd.area, 'Orbit', GF_NAVIGATE_ORBIT, type);	
-    make_select_item(nav_sel_wnd.area, 'VR', GF_NAVIGATE_VR, type);	
-    nb_items += 6;
-  }
-  nav_sel_wnd.on_event = function(evt) {
-   if (this.area && this.area.on_event(evt)) return true;
-   return false;
-  }
-
-  gpacui_show_window(nav_sel_wnd);  
-  nav_sel_wnd.set_size(120, nb_items*info.height);
-  nav_sel_wnd.show();
-
+function gw_background_control(enable) {
+    root.children[0].set_bind = enable ? true : false;
 }
-

gpac-0.5.0.svn5178.tar.bz2/gui/gwlib.js -> gpac-0.5.1.svn5491.tar.xz/gui/gwlib.js Changed

@@ -1,2136 +1,3386 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:	
-//					Jean Le Feuvre, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:	
+//					Jean Le Feuvre, Telecom ParisTech
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+/*log function*/
+function gwlog(lev, str) {
+    if (lev <= gw_log_level) alert('[GUI] ' + str);
+}
+
+/*log levels*/
+l_err = 0;
+l_war = 1;
+l_inf = 2;
+l_deb = 3;
+
+/*default log level*/
+gw_log_level = l_inf;
+
+
+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;
+        }
+    }
+    alert('Unloading resource for url ' + res.children[0].url[0] + ' not found in resource bank');
+}
+
+
+//static
+function gw_window_show_hide() {
+    if (typeof this._wnd_timer == 'undefined') {
+        this._wnd_timer = gw_new_timer(1);
+        this._wnd_timer.wnd = null;
+        this._wnd_timer.set_timeout(0.25, false);
+        this._wnd_timer.on_fraction = function (val) {
+            if (!this.wnd) return;
+            if (!this.wnd.visible) {
+                this.wnd.scale.x = 1 - val;
+                this.wnd.scale.y = 1 - val;
+                this.wnd.set_alpha((1 - val) * this.wnd.alpha);
+            } else {
+                this.wnd.scale.x = val;
+                this.wnd.scale.y = val;
+                this.wnd.set_alpha(val * this.wnd.alpha);
+            }
+        }
+        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(wnd.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;
+    this.alpha = this.get_alpha();
+    this.set_alpha(1.0);
+    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.8;
+gwskin.default_message_timeout = 2.0;
+gwskin.default_tooltip_timeout = 0.75;
+
+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);
+
+
+//static
+function gw_get_abs_pos(child) {
+    var pos = new SFVec2f(0, 0);
+    while (1) {
+        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_new_timer(progressive)
+function gw_get_adjusted_abs_pos(child, width, height, type)
 {
-	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) {
-		this.startTime = when + this.getTime();
-	}
-	obj.stop = function(when) {
-		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;
-}
-
-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); 
-}
-
-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;
-   if (this.on_over) this.on_over(val);
-  }
-  obj.last_click = 0;
-  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;
-    }
+    var pos = gw_get_abs_pos(child);
     
-    if (this.last_click && (timestamp - this.last_click<gwskin.double_click_delay) ) {
-      this.last_click = timestamp;
-      if (this.on_double_click) {
-       this.on_double_click();
-       return;
-      }
+    if (type == 0) {
+        pos.y += child.height/2 + height/2; 
+    } else if (type==1) {
+        pos.y -= child.height/2 + height/2; 
     }
     
-    this.last_click = timestamp;
-    if(this.on_click && this._over) this.on_click();
-   }
-  }
-  Browser.addRoute(ts, 'isOver', obj, obj._on_over); 
-  Browser.addRoute(ts, 'isActive', obj, obj._on_active); 
-}
-
-
-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;
-}
-
-function gw_make_gradient(type, keys, colors)
-{
- 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 (type=='vertical') {
-  obj.endPoint.x = 0;
-  obj.endPoint.y = 1;
- }
- return obj;
-}
-
-function gw_new_fontstyle(size, align)
-{
-    var fs = new SFNode('FontStyle');
-    fs.size = size;
-    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] = 'FIRST';
-    return fs;
-}
-
-gw_resources_bank = [];
-
-function gw_load_resource(url)
-{
-  var new_res;
-  if (gwskin.use_resource_bank) {
-   for (var i in gw_resources_bank) {
-    if (gw_resources_bank[i].url == url) {
-      gw_resources_bank[i].nb_instances++;
-      alert('Found existing resource for url '+url);
-      return gw_resources_bank[i];
-    }
-  }
- }
-  if (gwskin.use_offscreen_icons) {
-   new_res = new SFNode('OffscreenGroup');
-   new_res.offscreen_mode = 2;
-   new_res.children[0] = new SFNode('Inline');
-   new_res.children[0].url[0] = url;
-  } else {
-   new_res = new SFNode('Inline');
-   new_res.url[0] = url;
-  }
-  new_res.nb_instances = 1;
-  if (gwskin.use_resource_bank) {
-   new_res.url = url;
-   gw_resources_bank.push(new_res);
-   alert('Created resource for url '+url + ' nb loaded resources '+gw_resources_bank.length);
-  }
-  return new_res;
-}
-
-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) {
-   alert('Unloading resource '+ res  + ' nb loaded resources '+gw_resources_bank.length);
-   gw_resources_bank.splice(i, 1);
-   return;
-  }
- } 
- alert('Unloading resource for url '+res.children[0].url[0] + ' not found in resource bank');
-}
-
-
-function gw_window_show_hide()
-{
- if (typeof this.timer == 'undefined') {
-   this.timer = gw_new_timer(1);
-   this.timer.set_timeout(0.25, false);
-   this.timer.on_fraction = function(val) {
-    if (!this.wnd) return;
-    if (this.wnd.visible) {
-      this.wnd.scale.x = 1-val;
-      this.wnd.scale.y = 1-val;
-      this.wnd.set_alpha( (1-val) * this.wnd.alpha);
-    } else {
-      this.wnd.scale.x = val;
-      this.wnd.scale.y = val;
-      this.wnd.set_alpha(val * this.wnd.alpha);
-    }
-   }
-   this.timer.on_active = function(val) {
-    var fun;
-    if (val || !this.wnd) return;
-    var wnd = this.wnd;
-    this.wnd = null;
-    wnd.visible = !wnd.visible;
-    wnd.scale.x = wnd.visible ? 1 : 0;
-    wnd.scale.y = wnd.visible ? 1 : 0;
-    wnd.set_alpha(wnd.alpha);
-    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.timer.wnd) return;
- 
- this.alpha = this.get_alpha();
- this.set_alpha(1.0);
- this.timer.wnd = this;
- this.timer.start(0);
- this.timer.call_on_end = null;
- if (arguments.length) {
-  this.timer.call_on_end = arguments[0];
- }
-}
-
-function gw_window_show()
-{
- if (this.visible) return;
- gw_window_show_hide.call(this);
-}
-
-function gw_window_hide()
-{
- if (!this.visible) return;
- gw_window_show_hide.apply(this, arguments);
-}
-
-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.double_click_delay = 0.5;
-gwskin.use_resource_bank = false;
-gwskin.use_offscreen_icons = false;
-gwskin.default_icon_size = 32;
-gwskin.appearance_transparent = gw_new_appearance(0, 0, 0);
-gwskin.appearance_transparent.material.transparency = 1;
-gwskin.appearance_transparent.skin = true;
-
-gwskin.tooltip_callback = null;
-
-gwskin.default_text_size = 18;
-
-gwskin.control = new Object();
-gwskin.control.normal = gw_new_appearance(0.6, 0.6, 0.6);
-gwskin.control.normal.skin = true;
-if (gwskin.pointing_device) {
- gwskin.control.over = gw_new_appearance(0.7, 0.7, 0.8);
- gwskin.control.over.material.transparency = 0.5;
- gwskin.control.over.skin = true;
-} else {
- gwskin.control.over = null;
-}
-
-gwskin.button = new Object();
-gwskin.button.width = 48;
-gwskin.button.height = 48;
-gwskin.button.font_size = 12;
-gwskin.button.normal = gw_new_appearance(0.7, 0.7, 0.8);
-gwskin.button.normal.skin = true;
-if (gwskin.pointing_device) {
- gwskin.button.over = gw_new_appearance(0.7, 0.7, 0.8);
- gwskin.button.over.material.transparency = 0.4;
- gwskin.button.over.skin = true;
-} else {
- gwskin.button.over = null;
-}
-gwskin.button.down = gw_new_appearance(0.3, 0.3, 0.4);
-gwskin.button.down.material.transparency = 0.3;
-gwskin.button.down.skin = true;
-gwskin.button.text = gw_new_appearance(0, 0, 0);
-gwskin.button.text.skin = true;
-gwskin.button.font = gw_new_fontstyle(gwskin.button.font_size, 1);
-gwskin.button.font.skin = true;
-
-
-gwskin.osdbutton = new Object();
-gwskin.osdbutton.width = 48;
-gwskin.osdbutton.height = 48;
-gwskin.osdbutton.font_size = 12;
-gwskin.osdbutton.normal = gw_new_appearance(0.7, 0.7, 0.8);
-gwskin.osdbutton.normal.skin = true;
-if (gwskin.pointing_device) {
- gwskin.osdbutton.over = gw_new_appearance(0.7, 0.7, 0.8);
- gwskin.osdbutton.over.material.transparency = 0.4;
- gwskin.osdbutton.over.skin = true;
-} else {
- gwskin.button.over = null;
-}
-gwskin.osdbutton.down = gw_new_appearance(0.3, 0.3, 0.4);
-gwskin.osdbutton.down.material.transparency = 0.3;
-gwskin.osdbutton.down.skin = true;
-gwskin.osdbutton.text = gw_new_appearance(1, 1, 1);
-gwskin.osdbutton.text.skin = true;
-gwskin.osdbutton.font = gw_new_fontstyle(gwskin.button.font_size, 1);
-gwskin.osdbutton.font.skin = true;
-
-gwskin.listitem = new Object();
-gwskin.listitem.width = 48;
-gwskin.listitem.height = 48;
-gwskin.listitem.font_size = 12;
-gwskin.listitem.normal = gwskin.button.normal;
-gwskin.listitem.over = gwskin.button.over;
-gwskin.listitem.down = gwskin.button.down;
-gwskin.listitem.text = gwskin.button.text;
-gwskin.listitem.font = gw_new_fontstyle(gwskin.listitem.font_size, 0);
-gwskin.listitem.font.skin = true;
-
-gwskin.label = new Object();
-gwskin.label.font_size = 18;
-gwskin.label.text = gw_new_appearance(0, 0, 0);
-gwskin.label.text.skin = true;
-gwskin.label.font = gw_new_fontstyle(gwskin.label.font_size, 1);
-gwskin.label.font.skin = true;
-
-gwskin.text = new Object();
-gwskin.text.font_size = 14;
-gwskin.text.text = gw_new_appearance(0, 0, 0);
-gwskin.text.text.skin = true;
-gwskin.text.font = gw_new_fontstyle(gwskin.text.font_size, 0);
-gwskin.text.font.skin = true;
-
-
-gwskin.edit = new Object();
-gwskin.edit.normal = gw_new_appearance(1, 1, 1);
-gwskin.edit.font_size = 18;
-gwskin.edit.text = gwskin.label.text;
-gwskin.edit.font = gw_new_fontstyle(gwskin.edit.font_size, 0);
-gwskin.edit.font.style += ' SIMPLE_EDIT';
-gwskin.edit.font.skin = true;
-
-gwskin.window = new Object();
-gwskin.window.font_size = 14;
-gwskin.window.width = 320;
-gwskin.window.height = 240;
-gwskin.window.normal = gw_new_appearance(0.6, 0.6, 0.6);
-//gwskin.window.normal.texture = gw_make_gradient('vertical', [0, 0.85, 1], [0.6, 0.6, 0.6, 1, 1, 1, 0.6, 0.6, 0.6]);
-gwskin.window.normal.skin = true;
-gwskin.window.text = gwskin.label.text;
-gwskin.window.font = gw_new_fontstyle(gwskin.window.font_size, 1);
-gwskin.window.font.skin = true;
-gwskin.window.hide = gw_window_hide;
-gwskin.window.show = gw_window_show;
-
-gwskin.offscreen = new Object();
-gwskin.offscreen.font_size = 14;
-gwskin.offscreen.width = 100;
-gwskin.offscreen.height = 100;
-gwskin.offscreen.normal = gwskin.appearance_transparent;
-gwskin.offscreen.hide = gwskin.window.hide;
-gwskin.offscreen.show = gwskin.window.show;
-
-
-gwskin.osdwindow = new Object();
-gwskin.osdwindow.font_size = 14;
-gwskin.osdwindow.width = 320;
-gwskin.osdwindow.height = 240;
-gwskin.osdwindow.normal = gw_new_appearance(0.6, 0.6, 0.6);
-gwskin.osdwindow.normal.texture = gw_make_gradient('vertical', [0, 0.15, 0.85, 1], [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6]);
-gwskin.osdwindow.normal.skin = true;
-gwskin.osdwindow.text =  gw_new_appearance(1, 1, 1);
-gwskin.osdwindow.text.skin = true;
-gwskin.osdwindow.font = gw_new_fontstyle(gwskin.osdwindow.font_size, 1);
-gwskin.osdwindow.font.justify[1] = 'MIDDLE';
-gwskin.osdwindow.font.skin = true;
-gwskin.osdwindow.hide = gw_window_hide;
-gwskin.osdwindow.show = gw_window_show;
-gwskin.osdwindow.over = gwskin.button.over;
-gwskin.osdwindow.down = gwskin.button.down;
-
-gwskin.progress = new Object();
-gwskin.progress.width = 200;
-gwskin.progress.height = 48;
-gwskin.progress.normal = gw_new_appearance(0.6, 0.6, 0.6);
-gwskin.progress.normal.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.6, 0.6, 0.6, 0, 0, 0, 0.6, 0.6, 0.6]);
-gwskin.progress.normal.skin = true;
-gwskin.progress.over = gw_new_appearance(0.7, 0.7, 0.8);
-gwskin.progress.over.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.6, 0.6, 0.6, 0, 0, 1, 0.6, 0.6, 0.6]);
-gwskin.progress.over.skin = true;
-gwskin.progress.down = gw_new_appearance(0.7, 0.7, 0.8);
-gwskin.progress.down.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.6, 0.6, 0.6, 1, 1, 1, 0.6, 0.6, 0.6]);
-gwskin.progress.down.skin = true;
-gwskin.progress.text = null;
-gwskin.progress.font = null;
-
-gwskin.icon = new Object();
-gwskin.icon.normal = gwskin.button.normal;
-gwskin.icon.over = gwskin.button.over;
-gwskin.icon.down = gwskin.button.down;
-gwskin.icon.text = null;
-gwskin.icon.font = null;
-gwskin.icon.width = 32;
-gwskin.icon.height = 32;
-
-gwskin.images = new Object();
-gwskin.images.cancel = 'icons/emblem-unreadable.svg';
-gwskin.images.previous = 'icons/go-previous.svg';
-gwskin.images.next = 'icons/go-next.svg';
-gwskin.images.up = 'icons/go-up.svg';
-gwskin.images.scan_directory = 'icons/emblem-symbolic-link.svg';
-gwskin.images.folder = 'icons/folder.svg';
-gwskin.images.mime_generic = 'icons/applications-multimedia.svg';
-gwskin.images.trash = 'icons/user-trash.svg';
-gwskin.images.add = 'icons/list-add.svg';
-gwskin.images.remove = 'icons/list-remove.svg';
-gwskin.images.remote_display = 'icons/video-display.svg';
-gwskin.images.information = 'icons/dialog-information.svg';
-gwskin.images.resize = 'icons/media-record.svg';
-
-gwskin.labels = new Object();
-gwskin.labels.file_open = 'Open';
-gwskin.labels.close = 'Close';
-gwskin.labels.cancel = 'Cancel';
-gwskin.labels.up = 'Up';
-gwskin.labels.down = 'Down';
-gwskin.labels.left = 'Left';
-gwskin.labels.right = 'Right';
-gwskin.labels.scan_directory = 'Select directory';
-gwskin.labels.previous = 'Previous';
-gwskin.labels.next = 'Next';
-gwskin.labels.trash = 'Delete';
-gwskin.labels.remote_display = 'Push to';
-gwskin.labels.information = 'Information';
-gwskin.labels.resize = 'Resize';
-
-gwskin.keys = new Object();
-gwskin.keys.close = 'Enter';
-
-
-function gw_add_child(container, child)
-{
- if (container ==null) return;
- if (typeof (container.add_child) != 'undefined') {
-  container.add_child(child);
- } else {
-  container.children[container.children.length] = child;
- }
- child.parent = container;
-}
-
-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;
- }
-}
-
-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;
-  }
- }
-}
-
-gwskin.get_style = function(class_name, style_name)
-{
- if (arguments.length==1) style_name = 'normal';
- if (style_name=='invisible') return gwskin.appearance_transparent;
- 
- if (class_name=='null') return null;
- if (class_name=='self') return gw_new_appearance(0.6, 0.6, 0.6);
- if (typeof gwskin[class_name] == 'undefined') {
-  alert('Unknown class name ' + class_name);
-  return null;
- }
- if (typeof gwskin[class_name][style_name] != 'undefined') 
-  return gwskin[class_name][style_name];
-  
- alert('Unknown style '+style_name + ' in class ' + class_name);
- return null;
-}
-
-gwskin.get_font = function(class_name)
-{
- if (class_name=='null') return null;
- if (class_name=='self') return gw_new_fontstyle(gwskin.default_text_size, 1);
-
- if (typeof gwskin[class_name] == 'undefined') {
-  alert('Unknown class name ' + class_name);
-  return null;
- }
- if (typeof gwskin[class_name].font != 'undefined') 
-  return gwskin[class_name].font;
-  
- alert('No font style in class ' + class_name);
- return null;
-}
-
-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_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.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;
-
-   temp = this.children[0].geometry.point.point;
-   temp[0] = new SFVec2f(hw-rx_tr, hh);
-   temp[1] = new SFVec2f(hw, hh);/*bezier ctrl point or line-to*/
-   temp[2] = new SFVec2f(hw, hh-ry_tr);
-   temp[3] = new SFVec2f(hw, -hh+ry_br);
-   temp[4] = new SFVec2f(hw, -hh);/*bezier control point*/
-   temp[5] = new SFVec2f(hw-rx_br, -hh);
-   temp[6] = new SFVec2f(-hw+rx_bl, -hh);
-   temp[7] = new SFVec2f(-hw, -hh);/*bezier control point*/
-   temp[8] = new SFVec2f(-hw, -hh+ry_bl);
-   temp[9] = new SFVec2f(-hw, hh-ry_tl);
-   temp[10] = new SFVec2f(-hw, hh);/*bezier control point*/
-   temp[11] = new SFVec2f(-hw+rx_tl, hh);
-  }
-  return obj;
-}
-
-function gw_new_text(parent, label, class_name)
-{
-    var obj = new SFNode('Transform2D');
-    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].appearance = gwskin.get_style(class_name, 'text');
-
-    obj.children[0].children[0].geometry = new SFNode('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() {
-     return 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;
-     }
-    } else {
-     obj.set_color = function(r, g, b) {}
-     obj.set_alpha = 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.width = width;
-     this.height = height;     
-    }
-
-    if (obj.children[0].children[0].geometry.fontStyle && (typeof (obj.children[0].children[0].geometry.fontStyle.skin) == 'undefined')) {
-     obj.children[0].set_font_size = function(value) {
-      this.children[0].children[0].geometry.fontStyle.size = value;
-     }
-     obj.children[0].set_align = function(value) {
-      this.children[0].children[0].geometry.fontStyle.justify[0] = (value==0) ? 'BEGIN' : (value==2) ? 'END' : 'MIDDLE';
-     }
-    } else {
-     obj.set_font_size = function(value) {}
-     obj.set_align = function(value) {}
-    }    
-    if (label) obj.set_label(label);
-    return obj;
-}
-
-
-function gw_new_window(parent, offscreen, class_name)
-{
-  var obj = new SFNode('Transform2D');  
-  setup_gw_object(obj, 'Window');
-  obj.rect = gw_new_rectangle(class_name);  
-  obj.visible = false;
-  obj.scale.x = obj.scale.y = 0;
-  
-  obj.on_event = function(evt) { return 0; }
-  
-  obj.set_style = function(classname, style) {
-    this.rect.set_style(classname, style);
-  }
-  if (! offscreen) {
-    gw_add_child(obj, rect);
-    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;
-     this.children[0].set_size(width, height);
-     this.children[1].size.x = width;
-     this.children[1].size.y = height;
-     this.layout(width, height);
-    }  
-    obj.set_alpha = function(alpha) {
-     this.children[0].set_alpha(alpha);
-    } 
-    obj.add_child = function(child) {
-     this.children[1].children[this.children[1].children.length] = child;
-    }
-    obj.remove_child = function(child) {
-     this.children[1].removeChildren[0] = child;
-    }
-    obj._wnd_close = function() {
-     obj.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');
-    shape.appearance.texture.children[0] = obj.rect;
-    shape.geometry = new SFNode('Bitmap');
-    obj.children[0] = shape;
+    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;
     
-    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) {
-     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.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) {
-   this.rect.set_corners(tl, tr, br, bl);
-  }
-  
-  if (typeof gwskin[class_name] != 'undefined') {
-   if (typeof gwskin[class_name].show != 'undefined') obj.show = gwskin[class_name].show;
-   if (typeof gwskin[class_name].hide != 'undefined') obj.hide = gwskin[class_name].hide;
-  }
-  obj._on_wnd_close = obj.close;
-  obj.close = function () {
-   this.hide(this._on_wnd_close);
-  }
- obj.layout = function (w, h) {}
-   
-  gw_add_child(parent, obj);
-  return obj;
-}
-
-function gw_new_icon_button(parent, icon_url, label, class_name, horizontal)
-{
-  var touch;
-  var obj = new SFNode('Transform2D');
-  setup_gw_object(obj, 'IconButton');       
-
-  if (arguments.length<5) horizontal = false;
-  
-  obj.children[0] = new SFNode('Transform2D');
-  obj.children[0].children[0] = new SFNode('Layer2D');    
-  obj.children[1] = gw_new_rectangle(class_name, 'invisible');  
-
-  obj.children[2] = new SFNode('TouchSensor');
-
-  if (gwskin.get_font(class_name) != null) {
-    obj.children[3] = gw_new_text(null, label, class_name);
-    if (horizontal) {
-      obj.set_size = function(width, height) { 
-       this.children[0].children[0].size.x = height; 
-       this.children[0].children[0].size.y = height;
-       this.children[0].translation.x = (height-width)/2;
-       this.children[1].set_size(width, height);
-       this.children[3].set_width(width-height);
-       this.children[3].translation.x = height - width/2;
-       this.width = width;
-       this.height = height;
-      };
-    } else {
-      obj.set_size = function(width, height) { 
-       var fsize = this.children[3].font_size();
-       var h = height - fsize;
-       this.children[0].children[0].size.x = h; 
-       this.children[0].children[0].size.y = h;
-       this.children[0].translation.y = (height-h)/2;
-       this.children[1].set_size(3*width/2, height);
-       this.children[3].set_width(3*width/2);
-       this.children[3].translation.y = -height/2+fsize/2; 
-       this.width = 3*width/2;
-       this.height = height;
-      };
-    }
-    obj.set_label = function(label) {
-     this.children[3].set_label(label);
-    } 
-    obj.get_label = function() {
-     return this.children[3].get_label();
-    } 
-  } else {
-    obj.set_size = function(width, height) { 
-     this.children[0].children[0].size.x = width; 
-     this.children[0].children[0].size.y = height;
-     this.children[1].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;
-    this.children[1].set_style(class_name, 'down');
-    this._last_ts = timestamp;
-   } else {
-    if (this.down && this.over) {
-      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(); 
+    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;
+        }
     }
-    this.down = false;
-    this.children[1].set_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'invisible');
-   }
-  };
-  obj._on_over = function(value) { 
-   this.over = value; 
-   if (gwskin.pointing_device) {
-    var app = gwskin.get_style(class_name, 'over');
-    if (app) {   
-     this.children[1].set_style(class_name, value ? 'over' : 'invisible');
+    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;
+        }
     }
-    if (this.on_over) this.on_over(value); 
-    if (gwskin.tooltip_callback) gwskin.tooltip_callback(value, this.get_label() );
-   }
-  };
-  Browser.addRoute(obj.children[2], 'isOver', obj, obj._on_over); 
-  Browser.addRoute(obj.children[2], 'isActive', obj, obj._on_active); 
-
-  obj.icons = [];
-  obj.add_icon = function(url) {
-  
-   if(typeof url == 'string') {
-     var inl = gw_load_resource(url);
-   } else {
-     var inl = url;
-   }
-   this.icons[this.icons.length] = inl;
-
-   if (this.children[0].children[0].children.length==0) {
-    this.children[0].children[0].children[0] = this.icons[0];
-   }
-  }
-  obj.switch_icon = function(idx) {
-   while (idx>this.icons.length) idx-=this.icons.length;
-   this.children[0].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;
-   Browser.deleteRoute(this.children[2], 'ALL',  null, null);
-  }
-   
-  
-  if (icon_url) obj.add_icon(icon_url);
-  obj.set_label(label);
-  
-  
-  if (typeof gwskin[class_name] != 'undefined') {
-    if (typeof gwskin[class_name].width == 'undefined') gwskin[class_name].width = control_icon_size;
-    if (typeof gwskin[class_name].height == 'undefined') gwskin[class_name].height = control_icon_size;
-    obj.set_size(gwskin[class_name].width, gwskin[class_name].height);
-  } else {
-   obj.set_size(gwskin.control_icon_size, gwskin.control_icon_size);
-  }
-  gw_add_child(parent, obj);
-  return obj;
-}
 
+    return pos;
+}
 
-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;
-  obj = gw_new_rectangle(class_name, 'normal');
-  label = gw_new_text(obj, text, class_name);
-  gw_object_set_hitable(obj);
-  obj.on_over = function(val) {
-    if (gwskin.pointing_device) {
-     this.set_style(class_name, val ? 'over' : 'normal');
+
+gwskin.tooltip_wnd = null;
+
+gwskin.tooltip_callback = function (obj, show) {
+
+    if (!show) return;
+    
+    if (typeof obj.tooltip_shown == 'boolean') return;
+    obj.tooltip_shown = true;
+    
+    if (!gwskin.tooltip_wnd) {
+        wnd = gw_new_window(null, true, true, 'tooltip', true);
+        gwskin.tooltip_wnd = wnd;
+        wnd.txt = gw_new_text(gwskin.tooltip_wnd, '');
+        wnd.label = '';
+        wnd.on_display_size = function (w, h) {
+            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();
+        }
     }
-    if (gwskin.tooltip_callback) gwskin.tooltip_callback(value, this.get_label() );
-  }
-  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);
-  } 
-  gw_add_child(parent, obj);
-  return obj;
-}
-
-
-
-function grid_event_navigate(dlg, children, type) 
-{
- var i;
- if (dlg.current_focus==-1) {
-  for (i=0; i<children.length; i++) {
-   if (children[i].visible && (children[i].translation.x - children[i].width/2 >= -dlg.width/2)) {
-    dlg.current_focus = i;
-    gpac.set_focus(children[i]);
-    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) 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;
-    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;
-  }       
-  gpac.set_focus(children[dlg.current_focus]);
-  if (switch_page) dlg._move_to(dlg.translate - dlg.width);
-  return true;
- }
- 
- 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) 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;
-  }    
-  gpac.set_focus(children[dlg.current_focus]);
-  if (switch_page) dlg._move_to(dlg.translate + dlg.width);
-  return true;
- }
-
- if (type=='Down') {
-  var orig_focus = dlg.current_focus;
-  var switch_page = 0;
-  var ty = 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) {
-   if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height/2<ty))
-    break;
-   if (dlg.current_focus + 1 == children.length) {
-    dlg.current_focus = orig_focus;
-    return false;
-   }
-   dlg.current_focus++;
-  }
-  /*goto bottom 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 + 1 == children.length) break;
-   dlg.current_focus++;
-  }
-  
-  gpac.set_focus(children[dlg.current_focus]);
-  return true;
- }
- 
- if (type=='Up') {
-  var orig_focus = dlg.current_focus;
-  var switch_page = 0;
-  var ty = 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>ty))
-     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--;
-  }
-  gpac.set_focus(children[dlg.current_focus]);
-  return true;
- }
- return false;
-}
-  
-function gw_new_grid_container(parent)
-{
-  var obj = new SFNode('Transform2D');  
-  setup_gw_object(obj, 'FlipContainer');       
-  
-  obj._ps2d = new SFNode('PlaneSensor2D');
-  obj._ps2d.maxPosition.x = obj._ps2d.maxPosition.y = -1;
-  obj._ps2d.autoOffset = TRUE;
-
-  obj.children[0] = new SFNode('Layer2D');  
-//  obj.children[0].children[0] = gw_new_rectangle('', 'invisible');
-  obj.children[0].children[0] = obj._ps2d;
-  obj.children[0].children[1] = new SFNode('Transform2D');
     
-  obj._move_to = function(value) {
-   this.translate = value;
-   if (this.translate>0) this.translate = 0;
-   else if (this.translate<-this.max_width) this.translate = -this.max_width;
-   
-   if (0) {
-     this.timer = gw_new_timer(true);
-     this.timer.set_timeout(0.25, false);
-     this.timer.from = this.children[0].children[1].translation.x;
-     this.timer.dlg = this;
-     this.timer.on_fraction = function(val) {
-      var x = (1-val)*this.from + val*this.dlg.translate;
-      this.dlg.children[0].children[1].translation.x = x;
-      
-  /*
-      var children = obj.children[0].children[1].children;
-      for (var i=0; i<children.length; i++) {
-       children[i].scale.x = (val>0.5) ? (2*val - 1) : (1 - 2*val);
-      }
-  */
-     }
-     this.timer.on_active = function(val) {
-      if (!val) {
-       this.dlg.timer = null;
-       this.dlg = null;
-      }
-     }
-     this.timer.start(0);
-   } else {
-     this.children[0].children[1].translation.x = this.translate;
-   }
-   this._ps2d.offset.x = -this.translate;
-  }
-  
-  obj.translate = 0;
-  obj._on_slide = function(val) {
-   this.translate = - val.x;
-   if (this.translate>0) this.translate = 0;
-   else if (this.translate<-this.max_width) this.translate = -this.max_width;
-   this.children[0].children[1].translation.x = this.translate;
-  }
-  obj._on_active = function(val) {
-   if (!val) {
-    var off_x = 0;
-    while (off_x - this.width/2 > this.translate) off_x -= this.width;
-    this._move_to(off_x);
-   }
-  }
-  Browser.addRoute(obj._ps2d, 'translation_changed', obj, obj._on_slide);
-  Browser.addRoute(obj._ps2d, 'isActive', obj, obj._on_active);
-  obj.children[0].children[2] = obj._ps2d;
- 
-  obj.spread_h = false;
-  obj.spread_v = false;
-  obj.break_at_hidden = false;
-  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.children[0].children[0].set_size(width, height);
-    this.nb_visible=0;
-    this.first_visible=0;
-    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 = obj.children[0].children[1].children;
-   width = this.width;
-   height = this.height;   
-
-   page_x = 0;   
-   maxh = 0;
-   spread_x = -1;
-   start_x = -width/2;
-   start_y = height/2;
-   nb_on_line = 0;
-   this.current_focus = -1;
-   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;
-      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;
-         continue;
+    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.default_label_font_size = 14;
+gwskin.default_text_font_size = 14;
+
+gwskin.default_font_family = 'SANS';
+gwskin.default_icon_text_spacing = 6;
+gwskin.default_control_height = 48;
+gwskin.default_icon_height = 24;
+
+
+//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.05, 0.95, 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;
+
+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/seek_forward.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.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;
+    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 = (value > 10) ? value - 10 : 1;
+        }
+    }
+}
+
+
+//static
+function gwlib_filter_event(evt) {
+
+    if (gw_ui_root.has_popup && (evt.type == GF_EVENT_MOUSEDOWN)) {
+        //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--;
+            }
         }
-        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) break;
-      }
-      if (nb_child<=1) {
-       maxh = children[i].height;
-       if (this.spread_h) start_x = -len/2;
-      }
-      else if (this.spread_h) {
-       spread_x = (width - len) / (nb_child);
-       start_x += spread_x/2;
-      } else {
-       spread_x = 0;
-      }
-    }
-
-    if (!children[i].visible) {
-     if (nb_on_line && this.break_at_hidden) {
-       nb_on_line = 0;
-       spread_x = -1;
-       start_y -= maxh/2;
-       start_x = - width/2;
-     }
-     continue;
-   }
-   if (start_y - maxh < - height/2) {
-     nb_on_line = 0;
-     page_x += width;
-     spread_x = -1;
-     start_y = height/2;
-     i--;
-     continue;
+        gw_ui_root.has_popup = false;
     }
-    children[i].translation.x = start_x + children[i].width/2;
-    children[i].translation.y = start_y - maxh/2;
 
-//    alert('child i' + i + '/' + children.length + ' size ' + children[i].width + 'x' + children[i].height + ' translation ' + children[i].translation);
-    start_x += children[i].width + spread_x;
-     
-    nb_on_line++;
-
-    if (i+1==children.length) {
-     break;
-    }
-    if (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._ps2d.enabled = (this.max_width) ? TRUE : FALSE;
-  }
-  
-  obj.add_child = function(child) {
-   this.children[0].children[1].children[this.children[0].children[1].children.length] = child;
-   gw_add_child(child, this._ps2d);
-  }
-  obj.remove_child = function(child) {
-   /*remove ps2d from each child, otherwise we create references which screw up JS GC*/
-   if (typeof child.remove_child != 'undefined') child.remove_child(this._ps2d);
-   else child.removeChildren[0] = this._ps2d;
-   
-   this.children[0].children[1].removeChildren[0] = child;
-  }
-
-  obj.get_children = function() {
-  return this.children[0].children[1].children;
-  }
-  obj.reset_children = function () {
-   gw_close_child_list(this.children[0].children[1].children);
-   this.children[0].children[1].children.length = 0;
-  }
-  obj._pre_destroy = function() {
-    Browser.deleteRoute(this._ps2d, 'ALL', null, null);
-    this.reset_children();
-    this.children.length = 0;
-    this._ps2d = null;
-  }
-  
-  obj.set_focus = function(type) {
-   grid_event_navigate(this, this.children[0].children[1].children, type);
-  }
-
-  obj.on_event = function(evt) {
-   switch (evt.type) {
-   case GF_EVENT_MOUSEWHEEL:
-    if (evt.button==1) {
-      var tr = this.translate + (evt.wheel>0 ? this.width : -this.width);
-      this._move_to(this.translate + (evt.wheel<0 ? this.width : -this.width) );
-      return 1;
-    }
-    return 0;
-   case GF_EVENT_KEYDOWN:
-    if ((evt.keycode=='Up') || (evt.keycode=='Down') || (evt.keycode=='Right') || (evt.keycode=='Left') ) {
-      return grid_event_navigate(this, this.children[0].children[1].children, evt.keycode);
-    } 
-   case GF_EVENT_KEYDOWN:
-    if ((evt.keycode=='Up') || (evt.keycode=='Down') || (evt.keycode=='Right') || (evt.keycode=='Left') ) {
-      return grid_event_navigate(this, this.children[0].children[1].children, evt.keycode);
-    } 
-    return 0;
-   }
-   return 0;
-  } 
-
-  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');
-
-    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);
-     }
+    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)) 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);
     }
-  } else {
-    obj.set_progress = function(prog) {}
-  }
-  obj.slide_idx = obj.children.length;
-  obj.children[obj.slide_idx] = gw_new_rectangle(class_name, 'over');
-
-  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.prog = 0;
-  obj.frac = 0;
-  obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10);
+    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_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) {
-    this.frac = value.y/(this.height-this.children[1].height);
-   } else {
-    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);
-
-   value -= 0.5;
-   value *= (vertical ? this.height : this.width);
-
-   if (vertical) {
-    this.children[1].translation.y = value;
-   } else {
-    this.children[1].translation.x = value;
-   }   
-  }
+    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.getOption('Temp', 'BrowserMode') == 'yes') ? true : false;
+
+    gpac.focus_highlight = false;
+
+    gwskin.disable_transparency = false;
+    //remove window gradients 
+    if (!gwskin.has_opengl) {
+        s = gwskin.get_style('window', 'normal');
+        s.texture = null;
+        gwskin.disable_transparency = true;
+        gwskin.default_window_alpha = 1;
+    }
+
+	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) {
+            return eval(serial_obj);
+        }
+    
+}
+
+function gwlib_add_event_filter(evt_filter) {
+    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 {
+        alert('Non-existing class ' + class_name);
+    }
+
+    style = gwskin.styles[0];
+    if (typeof style[style_name] != 'undefined')
+        return style[style_name];
+
+    alert('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 {
+        alert('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.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;
+
+        temp = this.children[0].geometry.point.point;
+        temp[0] = new SFVec2f(hw - rx_tr, hh);
+        temp[1] = new SFVec2f(hw, hh); /*bezier ctrl point or line-to*/
+        temp[2] = new SFVec2f(hw, hh - ry_tr);
+        temp[3] = new SFVec2f(hw, -hh + ry_br);
+        temp[4] = new SFVec2f(hw, -hh); /*bezier control point*/
+        temp[5] = new SFVec2f(hw - rx_br, -hh);
+        temp[6] = new SFVec2f(-hw + rx_bl, -hh);
+        temp[7] = new SFVec2f(-hw, -hh); /*bezier control point*/
+        temp[8] = new SFVec2f(-hw, -hh + ry_bl);
+        temp[9] = new SFVec2f(-hw, hh - ry_tl);
+        temp[10] = new SFVec2f(-hw, hh); /*bezier control point*/
+        temp[11] = new SFVec2f(-hw + rx_tl, hh);
+    }
+    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_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._highlight = gw_new_rectangle(class_name, 'invisible');
+
+    obj._show_highlight = false;
+    obj._is_icon = false;
+    obj._tooltip = true;
+    if (class_name == 'icon') {
+        obj._is_icon = true;
+    }
+    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._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.get_label();
+        }
+    } 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 (this._tooltip && 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)) {
+                    return this.on_prev_page();
+                }
+                if ((evt.keycode == 'PageDown') && (this._page_idx < this._pages.length)) {
+                    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) {
+    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";
+
+    gw_new_text(obj.children[0], text_data, 'text');
+    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);
+
+    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();
+    }
+    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.getOption('MimeTypes', idx);
+        if (mime == null) break;
+        idx++;
+        var mime_ext = gpac.getOption('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._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) { return a.filename > b.filename} );
+            break;
+        case 1:
+            this.area._all_children.sort( function(a, b) { return a.filename < b.filename} );
+            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 a.size < b.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 a.date < b.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.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++) {
+            if (!is_listing && (filelist[i].hidden || filelist[i].system)) continue;
+
+            var icon_name = gwskin.images.mime_generic;
+
+            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 ? filelist[i].path : filelist[i].name);
+            }
+
+            var item = gw_new_icon_button(this.area, icon_name, filelist[i].name, true, 'listitem');
+            item.dlg = this;
+            item.filename = filelist[i].name;
+            item.directory = filelist[i].directory;
+            item.set_size(this.width, gwskin.default_control_height);
+            item.path = is_listing ? filelist[i].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 (filelist[i].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.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(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 = 100;
+
+    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(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;
     
-  obj.vertical = vertical;
-  obj.set_size = function(w, h, cursor_w, cursor_h) {
-   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;
-  obj.set_trackpoint(0);
-  
-  obj.move = function(x,y) {
-   this.translation.x = x;
-   this.translation.y = y;
-  }
-  obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10, 10, 10);
-
-  gw_add_child(parent, obj);
-  return obj;
-}
-
-
-function gw_new_window_full(parent, offscreen, the_label, class_name, child_to_insert)
-{
- var wnd = gw_new_window(parent, offscreen, class_name);
-
- if (arguments.length<=4) 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.tool_size = gwskin.icon.width;
-
- wnd.label = null;
- if (the_label) {
-  wnd.label = gw_new_text(wnd.tools, the_label, class_name);
-  wnd.label.set_size(wnd.tool_size, wnd.tool_size);
-  wnd.label.set_width(wnd.tool_size);
- }
- 
- wnd.set_label = function(label) {
-  if (wnd.label) wnd.label.set_label(label);
- }
-
- 
- wnd.add_tool = function(icon, name) {
-  var tool = gw_new_icon_button(this.tools, icon, name, 'icon');
-  if (this.label) {
-   this.tools.remove_child(this.label);
-   this.tools.add_child(this.label);
-  }
-  tool.set_size(wnd.tool_size, wnd.tool_size);
-  tool._name = name;
-  tool.dlg = this;
-  return tool;
- }
-
- 
- wnd.on_close = null;
- var icon = wnd.add_tool(gwskin.images.cancel, gwskin.labels.close);
- icon.on_click = function() {
-  if (this.dlg.on_close) this.dlg.on_close();
-  this.dlg.close(); 
- }
-
- 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();
-
-  if (this.area) {
-    this.area.set_size(width, height - this.tool_size);
-    this.area.move(0, (this.area.height-height)/2);
-  }
-  if (wnd.on_size) wnd.on_size(width, tools.length ? (height - this.tool_size) : height);
-  
-  if (this.label) {
-    var textw = width;
-    for (i=0; i<tools.length-1; i++) {
-     if (tools[i].visible) textw -= tools[i].width;
+    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();
     }
-    if (textw<0) textw=0;
-    this.label.set_size(textw, this.tool_size);
-	  this.label.set_width(textw);
-  }
-
-  this.tools.move(0, (height - this.tool_size)/2);
-  this.tools.set_size(width, this.tool_size);
- }
- 
-  wnd.set_tool_size = function(widget_tool_size) {
-   var i;
-   var tools = this.tools.get_children();
-   this.tool_size = widget_tool_size;
-   for (i=0; i<tools.length; i++) {
-    tools[i].set_size(this.tool_size, this.tool_size);
-   }
-   this.tools.set_size(this.width, widget_tool_size);
-  }
 
- return wnd; 
-}
-
-function gw_new_listbox(container)
-{
-  var obj = new SFNode('Transform2D');
-  setup_gw_object(obj, 'List');
-  obj.children[0] = new SFNode('Layer2D');
-
-  obj._ps2d = new SFNode('PlaneSensor2D');
-  obj._ps2d.maxPosition.x = obj._ps2d.maxPosition.y = -1;
-  obj._ps2d.autoOffset = FALSE;
-  obj._on_slide = function(val) {
-   this._translation_y = -val.y;
-   this.layout();
-  }
-  Browser.addRoute(obj._ps2d, 'translation_changed', obj, obj._on_slide);
-
-  obj.max_height = 0;
-  obj.set_size = function(width, height) {
-   for (var i=0; i<this.children[0].children.length; i++) {
-     this.children[0].children[i].set_size(width, this.children[0].children[i].height);
-   }
-   this.width = width;
-   this.height = height;
-   this.children[0].size.x = width;
-   this.children[0].size.y = height;
-   this._translation_y = 0;
-   this.selected_idx = 0;   
-   this.layout_changed();
-  }
-  obj.layout_changed = function() {
-   this.max_height = 0;
-   for (i=0; i<this.children[0].children.length; i++) {
-    if (this.children[0].children[i].visible) {
-      this.max_height += this.children[0].children[i].height;
+    
+    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(s * 0.9*gwskin.default_text_font_size, gwskin.default_icon_height);
+        }
+        this.area.set_size(s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
+        this.set_size(s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
+        this.reposition();
     }
-   }
-   this.max_height -= this.height;
-   if (this.max_height < 0) this.max_height=0;
-   this.layout();
-  }
-
-  obj.get_selection = function() {
-   if (this.selected_idx<this.children[0].children.length) return this.children[0].children[this.selected_idx];
-   return null;
-  }
-
-  obj._translation_y = 0;
-  obj.width = obj.height = 0;
-  obj.first_visible = -1;
-  obj.last_visible = -1;
-  
-  obj.layout = function() {
-   var children = this.children[0].children;
-   var start_y = this.height/2;
-   
-   if (this._translation_y < 0) this._translation_y = 0;
-   else if (this._translation_y > this.max_height) this._translation_y = this.max_height;
-
-   this.first_visible = -1;
-   this.last_visible = -1;
-   
-   for (var i=0; i<children.length; i++) {
-     var y = this._translation_y + start_y;
-     if (! children[i].visible) continue;
+    gw_ui_root.has_popup = true;
+          
      
-     if (y  - children[i].height > this.height/2) {
-       children[i].scale.x = 0;
-     } else if (y  + children[i].height < -this.height/2) {
-       children[i].scale.x = 0;
-     } else {
-       children[i].move(0, y - children[i].height/2);
-       children[i].scale.x = 1;
-
-       if (this.first_visible == -1) {
-        if (y  <= this.height/2) this.first_visible = i;
-       }
-       if (y - children[i].height >= -this.height/2) this.last_visible = i;
-
-       if (this.selected_idx == i) {
-        gpac.set_focus(children[i]);
-       }
-     }
-     start_y -= children[i].height;
-   }
-//   if (this.selected_idx < this.first_visible) this.selected_idx = this.first_visible;
-//   else if (this.selected_idx > this.last_visible) this.selected_idx = this.last_visible;
-
-   if (this.selected_idx < this.first_visible) this.selected_idx = -1;
-   else if (this.selected_idx > this.last_visible) this.selected_idx = -1;
-  }
-  obj.add_child = function(child) {
-   this.children[0].children[this.children[0].children.length] = child;
-   gw_add_child(child, this._ps2d);
-  }
-  obj.remove_child = function(child) {
-   /*remove ps2d from each child, otherwise we create references which screw up JS GC*/
-   if (typeof child.remove_child != 'undefined') child.remove_child(this._ps2d);
-   else child.removeChildren[0] = this._ps2d;
-   this.children[0].removeChildren[0] = child;
-  }
-
-  obj.get_children = function () {
-   return this.children[0].children;
-  }
-  obj.reset_children = function () {
-   gw_close_child_list(this.children[0].children);
-   this.children[0].children.length = 0;
-  }
-  obj._pre_destroy = function() {
-    this.reset_children();
-    this._ps2d = null;
-  }
-  
-  obj.on_event = function(evt) {
-   switch (evt.type) {
-   case GF_EVENT_MOUSEWHEEL:
-    this._translation_y += (evt.wheel>0) ? -this.height/20 : this.height/20;
-    this.layout();
-    return 1;
-   case GF_EVENT_KEYDOWN:
-    var children = this.get_children();
-
-   if (this.selected_idx < this.first_visible) this.selected_idx = this.first_visible;
-   else if (this.selected_idx > this.last_visible) this.selected_idx = this.last_visible;
-
-    if (evt.keycode=='Up') {
-//      alert('sel '+ this.selected_idx + ' first '+this.first_visible+ ' last '+this.last_visible);
-      if (children[this.selected_idx].translation.y + children[this.selected_idx].height/2 > this.height/2  ) {
-       this._translation_y -= this.height;
-       this.layout();
-       return 1;
-      }
-      if (!this.selected_idx) return 0;
-      this.selected_idx--;
-      if (this.selected_idx<this.first_visible)
-        this._translation_y -= children[this.last_visible].height;
-      this.layout();
-      return 1;
-    } else if (evt.keycode=='Down') {
-//      alert('sel '+ this.selected_idx + ' first '+this.first_visible+ ' last '+this.last_visible);
-      if (this.selected_idx==children.length) return 0;
-  
-      if (children[this.selected_idx].translation.y - children[this.selected_idx].height/2 < -this.height/2  ) {
-       this._translation_y += this.height;
-       this.layout();
-       return 1;
-      }
-      this.selected_idx++;
-      if (this.selected_idx>this.last_visible)
-        this._translation_y += children[this.first_visible].height;
-      this.layout();
-      return 1;
-    }
-    return 0;
-   }
-   return 0;
-  } 
-
-  
-  gw_add_child(container, obj);
-  return obj;
-}
-
-
-function gw_new_file_open(class_name)
-{
-  if (arguments.length==0) class_name = 'window';
-  
-  var dlg = gw_new_window_full(null, true, 'Browse FileSystem', 'window');
-  
-  dlg.area = gw_new_listbox(dlg);
-
-  dlg.on_event = function(evt) {
-   if (evt.type==GF_EVENT_KEYDOWN) {
-    if (evt.keycode=='Left') {
-     this._browse(null, true);
-     return 1;
-    }
-    else if (evt.keycode=='Enter') {
-     var child = this.area.get_selection();
-     if (child) child.on_click();
-     return 1;
-    }    
-   }
-   if (this.area && typeof this.area.on_event != 'undefined') {
-    return this.area.on_event(evt); 
-   }
-  }
-
-  dlg.on_close = function () {
-    if (this.on_browse) {
-      this.on_browse(null, false);
-    }
-  }
-  
-  dlg.go_up = dlg.add_tool(gwskin.images.previous, gwskin.labels.up);
-  dlg.go_up.on_click = function() {
-   this.dlg._browse(null, true);
-	}
-
-  dlg.on_directory = null;
-  dlg.scan_dir = dlg.add_tool(gwskin.images.scan_directory, gwskin.labels.scan_directory);
-  dlg.scan_dir.on_click = function() {
-   if (this.dlg.on_directory) this.dlg.on_directory(this.dlg.directory);
-   this.dlg.close(); 
-	}
-	
-  dlg.predestroy = function() {
-   this.scan_dir = null;
-   this.go_up = null;
-  }
-
-  dlg.directory = '';
-  dlg.show_directory = false;
-  dlg.filter = '*';
-
-  dlg._on_dir_browse = function() {
-    this.dlg._browse(this.dlg.path + this.filename, false);
-  }
-  dlg._on_file_select = function() {
-    if (this.dlg.on_browse) {
-      this.dlg.on_browse(this.dlg.path + this.filename, this.dlg.directory);
-    }
-    this.dlg.close(); 
-  }
- 
-  dlg.browse = function(dir) {
-    this.directory = dir;
-    this._browse(dir, false);
-  }
-  dlg._browse = function(dir, up) {
-   var w, h, i, y;
-   if (dir) this.directory = dir;
- 
-   var 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.area.reset_children();
-   
-   this.set_label(this.directory);
-
-   this.path = filelist.length ? filelist[0].path : '';
-
-   for (i=0; i<filelist.length; i++) {
-    var item = gw_new_icon_button(this.area, filelist[i].directory ? gwskin.images.folder : gwskin.images.mime_generic, filelist[i].name, 'listitem', true);
-    item.dlg = this;
-    item.filename = filelist[i].name;
-
-    if (filelist[i].directory) {
-      item.on_click = this._on_dir_browse;
-    } else {      
-      item.on_click = this._on_file_select;
-    }
-   }  
-   this.layout(this.width, this.height);
-
- 	 if (this.directory == '') this.go_up.hide();
-   else this.go_up.show();
-
-   if (this.show_directory || (this.filter == 'dir')) this.scan_dir.show();
-   else this.scan_dir.hide();
-
-   this.tools.layout(this.tools.width, this.tools.height);
-  }
-  dlg.scan_dir.hide();
-
-  dlg.on_size = function(width, height) {
-    dlg.area.set_size(width, height);
-  }
-  dlg.set_size(20, 20);
-  return dlg;
-}
-
-
-function gw_new_text_input(text_data, class_name)
-{
-  var obj = gw_new_text(null, text_data, 'edit');
-  obj.on_text = null;
-  obj._text_edited = function(val) {
-   if (this.on_text) this.on_text(val[0]);
-  }
-  Browser.addRoute(obj.children[0].children[0].geometry, 'string', obj, obj._text_edited);
-  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(null, 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);
-  };
-  
-  gw_add_child(parent, obj);
-
-  /*set focus to our edit node*/
-  gpac.set_focus(edit);
-
-  return obj;
-}
-
-function gw_new_text_area(parent, text_data, class_name)
-{
-  var obj = new SFNode('Transform2D');
-  setup_gw_object(obj, 'TextEdit');
-
-  obj.children[0] = new SFNode('Layout');
-  obj.children[0].parent = obj;
-  obj.children[0].wrap = true;
-  obj.children[0].justify[0] = "JUSTIFY";
-  obj.children[0].justify[1] = "FIRST";
-
-  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);
-  }
-
-  gw_add_child(parent, obj);
-  return obj;
-}
-
-
-
-function gw_new_scrolltext_area(parent, text_data, class_name)
-{
-  var obj = gw_new_listbox(parent);
-  var child = gw_new_text_area(obj, text_data, class_name);
-  /*erase the resize routine*/
-  child.set_size = function(width, height) {
-    var bounds = this.children[0]._bounds;
-    this.children[0].size.x = width;
-    this.children[0].size.y = Math.ceil(bounds.height);
-    this.width = width;
-    this.height = this.children[0].size.y;
-  }
-  
-  obj._orig_set_size = obj.set_size;
-  obj.set_size = function(width, height) {
-    this.get_children()[0].set_size(width, height);
-    this._orig_set_size(width, height);
-  }
-  obj.set_content = function(text) {
-    this.get_children()[0].set_label(text);
-  }
-  return obj;
-}
-
-
-function gw_new_message(container, label, content)
-{
-  var notif = gw_new_window_full(null, true, label, 'window');  
-  notif.area = gw_new_scrolltext_area(notif, content, 'window');
-  notif.on_size = function(width, height) {
-   this.area.set_size(width-10, height);
-  } 
-  notif.on_event = function(evt) { 
-    if ((evt.type==GF_EVENT_KEYUP) && evt.keycode==gwskin.keys.close) {
-     this.close();
-     return 1;
-    }
-    return this.area.on_event(evt); 
-  }
-	notif.set_size(240, 120);
-	return notif;
+    popup.set_alpha(0.9);
+    return popup;
 }
+
+

gpac-0.5.1.svn5491.tar.xz/gui/icons/add.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/app.svg Added

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M92.65,40.824l-5.183,0l3.665-3.665c1.528-1.528,1.528-4.005,0-5.533l-6.456-6.456
+		c-1.528-1.528-4.005-1.528-5.533,0l-3.666,3.665v-5.184c0-2.161-1.752-3.913-3.913-3.913h-9.129c-2.161,0-3.913,1.752-3.913,3.913
+		v5.183l-3.665-3.665c-1.528-1.528-4.005-1.528-5.533,0l-6.456,6.456c-1.528,1.528-1.528,4.005,0,5.533l3.665,3.665H41.35
+		c-2.161,0-3.913,1.752-3.913,3.913v9.129c0,2.161,1.752,3.913,3.913,3.913h5.183l-3.665,3.665c-1.528,1.528-1.528,4.005,0,5.533
+		l6.456,6.456c1.528,1.528,4.005,1.528,5.533,0l3.666-3.665v5.184c0,2.161,1.752,3.913,3.913,3.913h9.129
+		c2.161,0,3.913-1.752,3.913-3.913v-5.183l3.665,3.665c1.528,1.528,4.005,1.528,5.533,0l6.456-6.456
+		c1.528-1.528,1.528-4.005,0-5.533l-3.665-3.665h5.183c2.161,0,3.913-1.752,3.913-3.913v-9.13
+		C96.562,42.576,94.811,40.824,92.65,40.824z M67,58.776c-5.233,0-9.475-4.242-9.475-9.475s4.242-9.475,9.475-9.475
+		s9.475,4.242,9.475,9.475S72.233,58.776,67,58.776z"/>
+	<path style="fill:#000100;" d="M9.847,26.553h2.692l-1.904,1.904c-0.794,0.794-0.794,2.08,0,2.874l3.353,3.353
+		c0.793,0.794,2.081,0.794,2.874,0l1.904-1.904v2.692c0,1.122,0.91,2.032,2.032,2.032h4.742c1.122,0,2.032-0.91,2.032-2.032V32.78
+		l1.904,1.904c0.794,0.794,2.081,0.794,2.874,0l3.353-3.353c0.794-0.794,0.794-2.08,0-2.874L33.8,26.553h2.692
+		c1.122,0,2.032-0.91,2.032-2.032v-4.742c0-1.122-0.91-2.032-2.032-2.032H33.8l1.904-1.904c0.794-0.794,0.794-2.08,0-2.874
+		l-3.353-3.353c-0.793-0.794-2.08-0.794-2.874,0l-1.904,1.904V8.827c0-1.122-0.91-2.032-2.032-2.032h-4.742
+		c-1.122,0-2.032,0.91-2.032,2.032v2.692l-1.904-1.904c-0.793-0.794-2.081-0.794-2.874,0l-3.353,3.353
+		c-0.794,0.794-0.794,2.08,0,2.874l1.904,1.904H9.847c-1.123,0-2.032,0.91-2.032,2.032v4.742
+		C7.814,25.643,8.724,26.553,9.847,26.553z M23.169,17.228c2.718,0,4.922,2.203,4.922,4.922c0,2.718-2.203,4.922-4.922,4.922
+		s-4.922-2.203-4.922-4.922C18.248,19.432,20.451,17.228,23.169,17.228z"/>
+	<path style="fill:#000100;" d="M36.492,72.746H33.8l1.904-1.904c0.794-0.794,0.794-2.08,0-2.874l-3.353-3.353
+		c-0.793-0.794-2.08-0.794-2.874,0l-1.904,1.904v-2.692c0-1.122-0.91-2.032-2.032-2.032h-4.742c-1.122,0-2.032,0.91-2.032,2.032
+		v2.692l-1.904-1.904c-0.793-0.794-2.081-0.794-2.874,0l-3.353,3.353c-0.794,0.794-0.794,2.08,0,2.874l1.904,1.904H9.847
+		c-1.123,0-2.032,0.91-2.032,2.032v4.742c0,1.122,0.91,2.032,2.032,2.032h2.692l-1.904,1.904c-0.794,0.794-0.794,2.08,0,2.874
+		l3.353,3.353c0.793,0.794,2.081,0.794,2.874,0l1.904-1.904v2.692c0,1.122,0.91,2.032,2.032,2.032h4.742
+		c1.122,0,2.032-0.91,2.032-2.032V87.78l1.904,1.904c0.794,0.794,2.081,0.794,2.874,0l3.353-3.353c0.794-0.794,0.794-2.08,0-2.874
+		L33.8,81.553h2.692c1.122,0,2.032-0.91,2.032-2.032v-4.742C38.525,73.656,37.615,72.746,36.492,72.746z M23.169,82.071
+		c-2.718,0-4.922-2.203-4.922-4.922c0-2.718,2.203-4.922,4.922-4.922s4.922,2.203,4.922,4.922
+		C28.091,79.868,25.888,82.071,23.169,82.071z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/audio.svg Added

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M62.414,9.2c-1.439,0-2.684,0.526-3.734,1.576L31.049,28.46H9.311c-1.439,0-2.684,0.526-3.734,1.576
+		C4.525,31.087,4,32.332,4,33.77v31.862c0,1.439,0.525,2.684,1.577,3.734c1.05,1.051,2.294,1.576,3.734,1.576h21.739l27.63,17.683
+		c1.05,1.051,2.294,1.576,3.734,1.576c1.438,0,2.682-0.525,3.733-1.576c1.05-1.05,1.577-2.295,1.577-3.734V14.511
+		c0-1.438-0.526-2.682-1.577-3.734C65.096,9.727,63.851,9.2,62.414,9.2z"/>
+	<path style="fill:#1D1D1B;" d="M82.873,30.202c-0.554-0.276-1.245-0.415-2.074-0.415c-1.439,0-2.684,0.512-3.734,1.535
+		c-1.051,1.024-1.576,2.282-1.576,3.776c0,1.162,0.332,2.144,0.995,2.945c0.664,0.803,1.465,1.493,2.406,2.074
+		c0.94,0.581,1.88,1.217,2.821,1.908c0.94,0.692,1.743,1.674,2.406,2.946c0.664,1.273,0.996,2.849,0.996,4.729
+		c0,1.881-0.332,3.458-0.996,4.73c-0.664,1.273-1.466,2.255-2.406,2.945c-0.941,0.692-1.881,1.328-2.821,1.909
+		c-0.941,0.581-1.742,1.273-2.406,2.074c-0.664,0.803-0.995,1.784-0.995,2.945c0,1.494,0.525,2.753,1.576,3.776
+		c1.05,1.024,2.295,1.535,3.734,1.535c0.83,0,1.521-0.137,2.074-0.415c3.872-1.548,6.983-4.134,9.334-7.758
+		c2.351-3.622,3.526-7.536,3.526-11.741c0-4.203-1.176-8.131-3.526-11.782C89.855,34.268,86.744,31.695,82.873,30.202z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/audio_full.svg Added

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M49.43,22.2c-1.013,0-1.889,0.37-2.628,1.109L27.359,35.754H12.061c-1.013,0-1.889,0.37-2.628,1.109
+		c-0.74,0.74-1.109,1.615-1.109,2.627v22.421c0,1.013,0.37,1.889,1.109,2.628c0.739,0.74,1.615,1.109,2.628,1.109h15.298
+		l19.444,12.444c0.739,0.74,1.615,1.109,2.628,1.109c1.012,0,1.887-0.37,2.627-1.109c0.739-0.739,1.109-1.615,1.109-2.628V25.937
+		c0-1.012-0.37-1.888-1.109-2.628C51.317,22.571,50.442,22.2,49.43,22.2z"/>
+	<path style="fill:#1D1D1B;" d="M70.396,58.963c1.654-2.549,2.481-5.303,2.481-8.262c0-2.958-0.827-5.722-2.481-8.291
+		c-1.655-2.569-3.844-4.379-6.569-5.43c-0.39-0.194-0.876-0.292-1.46-0.292c-1.013,0-1.888,0.36-2.627,1.08
+		c-0.74,0.721-1.109,1.606-1.109,2.657c0,0.817,0.234,1.509,0.701,2.073c0.467,0.565,1.031,1.051,1.693,1.46
+		c0.661,0.409,1.323,0.857,1.985,1.343c0.661,0.487,1.226,1.178,1.693,2.073c0.467,0.896,0.701,2.005,0.701,3.328
+		c0,1.324-0.234,2.433-0.701,3.328c-0.467,0.896-1.032,1.587-1.693,2.073c-0.662,0.487-1.324,0.934-1.985,1.343
+		c-0.662,0.409-1.226,0.896-1.693,1.46c-0.467,0.565-0.701,1.255-0.701,2.073c0,1.051,0.37,1.937,1.109,2.657
+		c0.739,0.721,1.615,1.08,2.627,1.08c0.584,0,1.07-0.097,1.46-0.292C66.552,63.333,68.741,61.513,70.396,58.963z"/>
+	<path style="fill:#1D1D1B;" d="M69.725,23.2c-0.506-0.194-1.013-0.292-1.518-0.292c-1.013,0-1.889,0.37-2.628,1.109
+		c-0.74,0.74-1.109,1.616-1.109,2.628c0,1.518,0.759,2.667,2.277,3.445c2.18,1.13,3.658,1.985,4.438,2.569
+		c2.88,2.102,5.128,4.739,6.744,7.912c1.615,3.173,2.423,6.549,2.423,10.13c0,3.582-0.808,6.958-2.423,10.131
+		c-1.616,3.173-3.864,5.81-6.744,7.912c-0.779,0.584-2.258,1.44-4.438,2.569c-1.518,0.779-2.277,1.927-2.277,3.445
+		c0,1.013,0.37,1.889,1.109,2.628c0.739,0.74,1.635,1.109,2.686,1.109c0.467,0,0.953-0.097,1.46-0.292
+		c5.449-2.296,9.828-5.965,13.137-11.006c3.308-5.041,4.963-10.539,4.963-16.495c0-5.956-1.655-11.453-4.963-16.495
+		C79.553,29.165,75.174,25.497,69.725,23.2z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/audio_mute.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/check.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/close.svg Added

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M27.269,66.651l6.081,6.081c1.439,1.439,3.772,1.439,5.212,0L50,61.294l11.438,11.438
+		c1.439,1.439,3.772,1.439,5.212,0l6.081-6.081c1.439-1.439,1.439-3.773,0-5.212L61.293,50l11.438-11.438
+		c1.439-1.439,1.439-3.773,0-5.212l-6.081-6.081c-1.439-1.439-3.772-1.439-5.212,0L50,38.706L38.562,27.268
+		c-1.439-1.439-3.772-1.439-5.212,0l-6.081,6.081c-1.439,1.439-1.439,3.773,0,5.212L38.707,50L27.269,61.438
+		C25.829,62.878,25.829,65.211,27.269,66.651z"/>
+	<path style="fill:#1D1D1B;" d="M83.032,4.856H16.968c-6.611,0-11.989,5.378-11.989,11.989v66.064
+		c0,6.611,5.378,11.989,11.989,11.989h66.064c6.611,0,11.989-5.378,11.989-11.989V16.845C95.021,10.234,89.644,4.856,83.032,4.856z
+		 M80.021,79.898H19.979V19.856h60.043V79.898z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/cross.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/down.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/expand.svg Added

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28.36px"
+	 height="27.443px" viewBox="0 0 28.36 27.443" style="enable-background:new 0 0 28.36 27.443;" xml:space="preserve">
+<g id="c115_arrows">
+	<path style="fill:#000000;" d="M28.36,19.136c0-0.868-0.665-1.57-1.491-1.57c-0.819,0.002-1.492,0.702-1.492,1.57v3.25
+		l-6.018-6.021c-0.582-0.583-1.524-0.583-2.106,0c-0.582,0.582-0.582,1.527,0,2.109l5.989,5.987h-3.235
+		c-0.881,0.002-1.591,0.669-1.591,1.491c0,0.824,0.71,1.49,1.591,1.49h6.761c0.881,0,1.59-0.665,1.593-1.49
+		c-0.003-0.022-0.006-0.039-0.009-0.061c0.003-0.028,0.009-0.058,0.009-0.087V19.136z"/>
+	<path style="fill:#000000;" d="M9,16.365l-6.015,6.021v-3.25c0-0.868-0.672-1.568-1.493-1.57c-0.824,0-1.49,0.702-1.49,1.57
+		L0,25.806c0,0.029,0.008,0.059,0.01,0.087c-0.002,0.021-0.006,0.038-0.008,0.061c0.002,0.825,0.712,1.49,1.592,1.49h6.762
+		c0.879,0,1.59-0.666,1.59-1.49c0-0.822-0.711-1.489-1.59-1.491H5.121l5.989-5.987c0.58-0.582,0.58-1.527,0-2.109
+		C10.527,15.782,9.584,15.782,9,16.365z"/>
+	<path style="fill:#000000;" d="M19.359,11.076l6.018-6.017v3.25c0,0.865,0.673,1.565,1.492,1.568c0.826,0,1.491-0.703,1.491-1.568
+		V1.638c0-0.029-0.006-0.059-0.009-0.085c0.003-0.021,0.006-0.041,0.009-0.062C28.357,0.665,27.648,0,26.768,0h-6.761
+		c-0.881,0-1.591,0.665-1.591,1.491c0,0.821,0.71,1.49,1.591,1.492h3.235l-5.989,5.987c-0.582,0.581-0.582,1.524,0,2.105
+		C17.835,11.661,18.777,11.661,19.359,11.076z"/>
+	<path style="fill:#000000;" d="M5.121,2.983h3.234c0.879-0.002,1.59-0.671,1.59-1.492C9.945,0.665,9.234,0,8.355,0H1.594
+		c-0.88,0-1.59,0.665-1.592,1.491C0.004,1.512,0.008,1.532,0.01,1.553C0.008,1.579,0,1.608,0,1.638L0.002,8.31
+		c0,0.865,0.666,1.568,1.49,1.568C2.313,9.875,2.985,9.175,2.985,8.31V5.06L9,11.076c0.584,0.585,1.527,0.585,2.11,0
+		c0.58-0.581,0.58-1.524,0-2.105L5.121,2.983z"/>
+</g>
+<g id="Capa_1">
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/file.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/film.svg Added

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M92.682,9.424c0,0-0.417,0-0.932,0s-0.932,0.437-0.932,0.977v0.977c0,1.765-1.431,3.196-3.196,3.196
+		h-8.523c-1.765,0-3.196-1.431-3.196-3.196c0,0,0-0.437,0-0.977c0-0.539-0.417-0.977-0.932-0.977h-0.932h-47.41c0,0-0.417,0-0.932,0
+		c-0.515,0-0.932,0.437-0.932,0.977v0.977c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196
+		c0,0,0-0.437,0-0.977c0-0.539-0.417-0.977-0.932-0.977H7.984c-1.765,0-3.196,1.431-3.196,3.196v74.755
+		c0,1.765,1.431,3.196,3.196,3.196c0,0,0.417,0,0.932,0s0.932-0.437,0.932-0.977v-0.977c0-1.765,1.431-3.196,3.196-3.196h8.523
+		c0.726,0,1.394,0.243,1.93,0.652c0.439,0.335,0.689,1.167,0.689,1.719v1.867c0,0.552,0.448,1,1,1H75.48c0.552,0,1-0.448,1-1v-1.867
+		c0-0.552,0.25-1.384,0.689-1.719c0.536-0.409,1.204-0.652,1.93-0.652h8.523c1.765,0,3.196,1.431,3.196,3.196c0,0,0,0.437,0,0.977
+		s0.417,0.977,0.932,0.977h0.932c1.765,0,3.196-1.431,3.196-3.196V12.62C95.879,10.855,94.448,9.424,92.682,9.424z M24.764,75.3
+		c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523
+		c1.765,0,3.196,1.431,3.196,3.196V75.3z M24.764,53.992c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196
+		v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V53.992z M24.764,32.685
+		c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523
+		c1.765,0,3.196,1.431,3.196,3.196V32.685z M70.753,79.361c0,0.552-0.448,1-1,1h-38.84c-0.552,0-1-0.448-1-1V57.034
+		c0-0.552,0.448-1,1-1h38.84c0.552,0,1,0.448,1,1V79.361z M70.753,42.25c0,0.552-0.448,1-1,1h-38.84c-0.552,0-1-0.448-1-1V20.811
+		c0-0.552,0.448-1,1-1h38.84c0.552,0,1,0.448,1,1V42.25z M90.818,75.3c0,1.765-1.431,3.196-3.196,3.196h-8.523
+		c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V75.3z
+		 M90.818,53.992c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196
+		h8.523c1.765,0,3.196,1.431,3.196,3.196V53.992z M90.818,32.685c0,1.765-1.431,3.196-3.196,3.196h-8.523
+		c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V32.685z"/>
+</g>
+</svg>

gpac-0.5.0.svn5178.tar.bz2/gui/icons/folder.svg -> gpac-0.5.1.svn5491.tar.xz/gui/icons/folder.svg Changed

@@ -1,422 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48.000000px"
-   height="48.000000px"
-   id="svg97"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/places"
-   sodipodi:docname="folder.svg"
-   inkscape:export-filename="/home/jimmac/Desktop/horlander-style3.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000">
-  <defs
-     id="defs3">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient6717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient6715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9806">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop9808" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop9810" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9766">
-      <stop
-         style="stop-color:#6194cb;stop-opacity:1;"
-         offset="0"
-         id="stop9768" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="1"
-         id="stop9770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3096">
-      <stop
-         id="stop3098"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop3100"
-         offset="1.0000000"
-         style="stop-color:#777777;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient319"
-       inkscape:collect="always">
-      <stop
-         id="stop320"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop321"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1789">
-      <stop
-         style="stop-color:#202020;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop1790" />
-      <stop
-         style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop1791" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1789"
-       id="radialGradient238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.055022,-2.734504e-2,0.177703,1.190929,-3.572177,-7.125301)"
-       cx="20.706017"
-       cy="37.517986"
-       fx="20.706017"
-       fy="37.517986"
-       r="30.905205" />
-    <linearGradient
-       id="linearGradient3983">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.87628865;"
-         offset="0.0000000"
-         id="stop3984" />
-      <stop
-         style="stop-color:#fffffe;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop3985" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3983"
-       id="linearGradient491"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.516844,0.000000,0.000000,0.708978,-0.879573,-1.318166)"
-       x1="6.2297964"
-       y1="13.773066"
-       x2="9.8980894"
-       y2="66.834053" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="46.689312"
-       x2="12.853771"
-       y1="32.567184"
-       x1="13.035696"
-       gradientTransform="matrix(1.317489,0.000000,0.000000,0.816256,-0.879573,-1.318166)"
-       id="linearGradient322"
-       xlink:href="#linearGradient319"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="6.1802502"
-       x2="15.514889"
-       y1="31.367750"
-       x1="18.112709"
-       id="linearGradient3104"
-       xlink:href="#linearGradient3096"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9766"
-       id="linearGradient9772"
-       x1="22.175976"
-       y1="36.987999"
-       x2="22.065331"
-       y2="32.050499"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9806"
-       id="radialGradient9812"
-       cx="24.35099"
-       cy="41.591846"
-       fx="24.35099"
-       fy="41.591846"
-       r="19.136078"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.242494,1.565588e-16,31.50606)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     fill="#729fcf"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.10196078"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="54.359127"
-     inkscape:cy="-13.803699"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1026"
-     inkscape:window-height="998"
-     inkscape:window-x="584"
-     inkscape:window-y="100"
-     inkscape:showpageshadow="false"
-     stroke="#3465a4" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Folder Icon</dc:title>
-        <dc:date />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>folder</rdf:li>
-            <rdf:li>directory</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Folder"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       transform="matrix(2.262383e-2,0,0,2.086758e-2,43.38343,36.36962)"
-       id="g6707">
-      <rect
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect6709"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         id="path6711"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path6713"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <path
-       d="M 4.5217805,38.687417 C 4.5435766,39.103721 4.9816854,39.520026 5.3979900,39.520026 L 36.725011,39.520026 C 37.141313,39.520026 37.535823,39.103721 37.514027,38.687417 L 36.577584,11.460682 C 36.555788,11.044379 36.117687,10.628066 35.701383,10.628066 L 22.430510,10.628066 C 21.945453,10.628066 21.196037,10.312477 21.028866,9.5214338 L 20.417475,6.6283628 C 20.262006,5.8926895 19.535261,5.5904766 19.118957,5.5904766 L 4.3400975,5.5904766 C 3.9237847,5.5904766 3.5292767,6.0067807 3.5510726,6.4230849 L 4.5217805,38.687417 z "
-       id="path216"
-       style="fill:url(#radialGradient238);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient3104);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       sodipodi:nodetypes="ccccccssssccc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path9788"
-       d="M 5.2265927,22.5625 L 35.492173,22.5625"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path9784"
-       d="M 5.0421736,18.5625 L 35.489104,18.5625"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 4.9806965,12.5625 L 35.488057,12.5625"
-       id="path9778"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.3861577,32.5625 L 35.494881,32.5625"
-       id="path9798"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path9800"
-       d="M 5.5091398,34.5625 L 35.496893,34.5625"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.0421736,16.5625 L 35.489104,16.5625"
-       id="path9782"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path9780"
-       d="M 5.0114345,14.5625 L 35.48858,14.5625"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path9776"
-       d="M 4.9220969,10.5625 L 20.202912,10.5625"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 4.8737534,8.5624999 L 19.657487,8.5624999"
-       id="path9774"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.3246666,28.5625 L 35.493876,28.5625"
-       id="path9794"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path9792"
-       d="M 5.2880638,26.5625 L 35.493184,26.5625"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.2265927,24.5625 L 35.492173,24.5625"
-       id="path9790"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.1958537,20.5625 L 35.491649,20.5625"
-       id="path9786"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path9796"
-       d="M 5.3246666,30.5625 L 35.493876,30.5625"
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.5091398,36.5625 L 35.496893,36.5625"
-       id="path9802"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="color:#000000;fill:url(#linearGradient491);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.2138050;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible;opacity:0.45142857"
-       d="M 6.0683430,38.864023 C 6.0846856,39.176251 5.8874317,39.384402 5.5697582,39.280326 L 5.5697582,39.280326 C 5.2520766,39.176251 5.0330270,38.968099 5.0166756,38.655870 L 4.0689560,6.5913839 C 4.0526131,6.2791558 4.2341418,6.0906134 4.5463699,6.0906134 L 18.968420,6.0429196 C 19.280648,6.0429196 19.900363,6.3433923 20.101356,7.3651014 L 20.674845,10.180636 C 20.247791,9.7153790 20.255652,9.7010175 20.037287,9.0239299 L 19.631192,7.7647478 C 19.412142,7.0371009 18.932991,6.9328477 18.620763,6.9328477 L 5.7329889,6.9328477 C 5.4207613,6.9328477 5.2235075,7.1409999 5.2398583,7.4532364 L 6.1778636,38.968099 L 6.0683430,38.864023 z "
-       id="path219"
-       sodipodi:nodetypes="cccccccccscccccc" />
-    <g
-       style="stroke-miterlimit:4.0000000;stroke-width:0.99946535;stroke:none;fill-rule:nonzero;fill-opacity:0.75706214;fill:#ffffff"
-       id="g220"
-       transform="matrix(1.040764,0.000000,5.449252e-2,1.040764,-8.670199,2.670594)"
-       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
-       inkscape:export-xdpi="74.800003"
-       inkscape:export-ydpi="74.800003">
-      <path
-         style="fill-opacity:0.50847459;fill:#ffffff"
-         d="M 42.417183,8.5151772 C 42.422267,8.4180642 42.289022,8.2681890 42.182066,8.2681716 L 29.150665,8.2660527 C 29.150665,8.2660527 30.062379,8.8540072 31.352477,8.8622963 L 42.405974,8.9333167 C 42.417060,8.7215889 42.408695,8.6772845 42.417183,8.5151772 z "
-         id="path221"
-         sodipodi:nodetypes="cscscs" />
-    </g>
-    <path
-       style="color:#000000;fill:url(#linearGradient9772);fill-opacity:1.0;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:block"
-       d="M 39.783532,39.510620 C 40.927426,39.466556 41.746608,38.414321 41.830567,37.189615 C 42.622354,25.640928 43.489927,15.957666 43.489927,15.957666 C 43.562082,15.710182 43.322016,15.462699 43.009787,15.462699 L 8.6386304,15.462699 C 8.6386304,15.462699 6.7883113,37.329591 6.7883113,37.329591 C 6.6737562,38.311657 6.3223038,39.134309 5.2384755,39.513304 L 39.783532,39.510620 z "
-       id="path233"
-       sodipodi:nodetypes="cscccscc"
-       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
-       inkscape:export-xdpi="74.800003"
-       inkscape:export-ydpi="74.800003" />
-    <path
-       sodipodi:nodetypes="ccsscsc"
-       id="path304"
-       d="M 9.6202444,16.463921 L 42.411343,16.528735 L 40.837297,36.530714 C 40.752975,37.602225 40.386619,37.958929 38.964641,37.958929 C 37.093139,37.958929 10.286673,37.926522 7.569899,37.926522 C 7.8034973,37.605711 7.9036547,36.937899 7.9049953,36.92191 L 9.6202444,16.463921 z "
-       style="opacity:0.46590909;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient322);stroke-width:0.99999970px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path323"
-       d="M 9.6202481,16.223182 L 8.4536014,31.866453 C 8.4536014,31.866453 16.749756,27.718375 27.119949,27.718375 C 37.490142,27.718375 42.675239,16.223182 42.675239,16.223182 L 9.6202481,16.223182 z "
-       style="fill:#ffffff;fill-opacity:0.089285679;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="pattern" />
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M92.535,30.884H44.106c0.703,1.063,1.306,2.162,1.776,3.098h26.731c3.738,0,7.907,2.961,8.098,6.968
+		l5.71,34.744l0.04,0.242v0.15l9.431-40.986C96.427,32.772,94.925,30.884,92.535,30.884z"/>
+	<path style="fill:#000100;" d="M72.613,36.982H43.974c-0.434-1.004-0.958-2.034-1.511-2.998c-0.325-0.565-0.659-1.107-0.994-1.606
+		c-0.358-0.533-0.716-1.02-1.06-1.434C39.673,30.058,39,29.5,38.525,29.5H9.365c-2.662,0-4.82,1.905-4.82,4.254l6.594,42.427
+		c0,2.349,1.905,4.254,4.254,4.254h63.813c0.697,0,1.345-0.184,1.926-0.481c0.678-0.347,1.253-0.86,1.659-1.5
+		c0.286-0.451,0.491-0.955,0.592-1.5c0.046-0.252,0.078-0.508,0.078-0.773l-5.743-34.945C77.718,38.887,74.962,36.982,72.613,36.982
+		z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/harddrive.svg Added

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M82.881,63.906c1.82,0,3.513,0.556,4.918,1.506l-9.692-46.196c-0.567-2.703-3.265-4.893-6.027-4.893
+		H27.918c-2.761,0-5.46,2.191-6.027,4.893L12.2,65.412c1.405-0.951,3.098-1.506,4.918-1.506H82.881z"/>
+	<path style="fill:#000100;" d="M17.119,87.011h65.763c3.203,0,5.8-2.597,5.8-5.8v-8.506c0-1.139-0.333-2.197-0.9-3.093
+		c-1.028-1.625-2.836-2.706-4.9-2.706H17.119c-2.064,0-3.872,1.082-4.9,2.706c-0.567,0.896-0.9,1.955-0.9,3.093v8.506
+		C11.319,84.415,13.916,87.011,17.119,87.011z M78.667,76.167H66.034c-0.829,0-1.5-0.671-1.5-1.5s0.671-1.5,1.5-1.5h12.633
+		c0.829,0,1.5,0.671,1.5,1.5S79.495,76.167,78.667,76.167z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/heart.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/home.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/image.svg Added

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M89.5,20h-79c-2.761,0-5,2.239-5,5v50c0,2.761,2.239,5,5,5h79c2.761,0,5-2.239,5-5V25
+		C94.5,22.239,92.261,20,89.5,20z M49.288,73.572H32.383h-15.05c-2.761,0-3.417-1.583-1.464-3.536L29.775,56.13
+		c0.976-0.976,2.256-1.464,3.536-1.464c1.28,0,2.559,0.488,3.536,1.464l3.989,3.989l9.917,9.917
+		C52.705,71.989,52.05,73.572,49.288,73.572z M22.333,29.5c4.418,0,8,3.582,8,8s-3.582,8-8,8c-4.418,0-8-3.582-8-8
+		S17.915,29.5,22.333,29.5z M86.239,73.572H54.603c0.355-0.94,0.77-3.158-1.729-5.657l-9.917-9.917L55.775,45.18
+		c1.953-1.953,5.118-1.953,7.071,0l24.857,24.857C89.656,71.989,89,73.572,86.239,73.572z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/info.svg Added

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M62.87,81.493h-3.06V32.951c0-0.827-0.303-1.545-0.908-2.152c-0.606-0.605-1.323-0.908-2.151-0.908
+		H38.39c-0.829,0-1.546,0.303-2.152,0.908c-0.606,0.607-0.909,1.324-0.909,2.152v6.12c0,0.829,0.303,1.546,0.909,2.152
+		c0.605,0.607,1.322,0.91,2.152,0.91h3.06v39.36h-3.06c-0.829,0-1.546,0.303-2.152,0.908c-0.606,0.607-0.909,1.324-0.909,2.152v6.12
+		c0,0.829,0.303,1.546,0.909,2.152c0.605,0.607,1.322,0.91,2.152,0.91h24.48c0.829,0,1.546-0.303,2.152-0.91
+		c0.605-0.605,0.909-1.322,0.909-2.152v-6.12c0-0.827-0.303-1.545-0.909-2.152C64.416,81.795,63.698,81.493,62.87,81.493z"/>
+	<circle style="fill:#1D1D1B;" cx="50" cy="15.281" r="10.281"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/laptop.svg Added

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M16.871,71.484h65.644c2.655,0,4.927-0.945,6.818-2.836c1.89-1.889,2.836-4.163,2.836-6.817V19.355
+		c0-2.655-0.946-4.927-2.836-6.818c-1.891-1.889-4.163-2.835-6.818-2.835H16.871c-2.655,0-4.927,0.946-6.818,2.835
+		c-1.891,1.891-2.836,4.163-2.836,6.818V61.83c0,2.654,0.945,4.928,2.836,6.817C11.943,70.539,14.216,71.484,16.871,71.484z
+		 M13.776,18.072H85.61v43.801H13.776V18.072z"/>
+	<path style="fill:#1D1D1B;" d="M9.537,84.75h80.312c2.42,0,4.381-1.962,4.381-4.381v-1.031c0-2.42-1.962-4.381-4.381-4.381H9.537
+		c-2.42,0-4.381,1.962-4.381,4.381v1.031C5.156,82.788,7.117,84.75,9.537,84.75z M77.071,77.791h9.278
+		c0.854,0,1.546,0.692,1.546,1.546c0,0.854-0.692,1.546-1.546,1.546h-9.278c-0.854,0-1.546-0.692-1.546-1.546
+		C75.524,78.484,76.217,77.791,77.071,77.791z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/left.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/list.svg Added

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M89.5,12.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
+		c2.347,0,4.25-1.903,4.25-4.25C93.75,14.028,91.847,12.125,89.5,12.125z"/>
+	<path style="fill:#1D1D1B;" d="M89.5,34.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
+		c2.347,0,4.25-1.903,4.25-4.25C93.75,36.028,91.847,34.125,89.5,34.125z"/>
+	<path style="fill:#1D1D1B;" d="M89.5,56.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
+		c2.347,0,4.25-1.903,4.25-4.25C93.75,58.028,91.847,56.125,89.5,56.125z"/>
+	<path style="fill:#1D1D1B;" d="M89.5,79.375h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
+		c2.347,0,4.25-1.903,4.25-4.25C93.75,81.278,91.847,79.375,89.5,79.375z"/>
+	<circle style="fill:#1D1D1B;" cx="10.333" cy="16.375" r="4.25"/>
+	<circle style="fill:#1D1D1B;" cx="10.333" cy="38.375" r="4.25"/>
+	<circle style="fill:#1D1D1B;" cx="10.333" cy="60.375" r="4.25"/>
+	<circle style="fill:#1D1D1B;" cx="10.333" cy="83.625" r="4.25"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/live.svg Added

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path d="M31.104,20.789H25.52v-4.483h4.617C30.73,17.754,31.057,19.261,31.104,20.789z M31.094,21.827H25.52v4.483h4.502
+	C30.654,24.854,31.016,23.347,31.094,21.827z M24.48,16.306h-4.617c-0.594,1.449-0.919,2.957-0.967,4.483h5.584V16.306z
+	 M24.48,15.267v-5.258c-1.808,1.635-3.199,3.402-4.139,5.258H24.48z M34.673,15.267c-1.696-2.713-4.435-4.582-7.563-5.167
+	c1.621,1.626,2.865,3.363,3.705,5.167H34.673z M32.143,20.789h4.25c-0.072-1.573-0.455-3.08-1.142-4.483h-4
+	C31.799,17.759,32.1,19.267,32.143,20.789z M31.148,26.31h4.103c0.687-1.403,1.069-2.91,1.142-4.483h-4.259
+	C32.061,23.347,31.729,24.854,31.148,26.31z M24.48,26.31v-4.483h-5.575c0.08,1.52,0.44,3.027,1.073,4.483H24.48z M25.52,9.992
+	v5.275h4.14C28.711,13.396,27.307,11.617,25.52,9.992z M22.89,10.1c-3.129,0.585-5.866,2.454-7.563,5.167h3.858
+	C20.025,13.462,21.27,11.727,22.89,10.1z M18.852,26.31c-0.581-1.456-0.912-2.963-0.985-4.483h-4.258
+	c0.07,1.573,0.454,3.08,1.14,4.483H18.852z M37.371,29.498v10.51H12.629v-10.51h4.448c-0.658-0.64-1.251-1.353-1.75-2.149h3.986
+	c0.357,0.731,0.798,1.446,1.284,2.149h1.277c-0.528-0.701-1.005-1.416-1.395-2.149h4.002v2.149h1.039v-2.149h4.002
+	c-0.39,0.733-0.867,1.448-1.395,2.149h1.275c0.486-0.703,0.927-1.418,1.285-2.149h3.985c-0.499,0.797-1.092,1.51-1.75,2.149H37.371z
+	 M20.237,36.963h-3.41v-5.641h-0.718h-0.714v6.859h4.843v-0.612L20.237,36.963L20.237,36.963z M22.26,31.322h-0.718h-0.714v6.859
+	h0.719h0.713V31.322z M28.775,31.322h-0.74h-0.737l-1.502,5.234l-1.507-5.234h-0.761h-0.761l2.324,6.859h0.681h0.683L28.775,31.322z
+	 M34.605,36.963h-3.773v-1.787h3.354v-0.592v-0.588h-3.354v-1.455h3.616v-0.613v-0.605H29.4v6.858h5.207v-0.612v-0.605H34.605z
+	 M18.749,16.306h-4c-0.686,1.403-1.07,2.91-1.14,4.483h4.249C17.901,19.267,18.201,17.759,18.749,16.306z"/>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/media_next.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/media_prev.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/monitor.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/more.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/musical.svg Added

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M91.897,10.873H27.891c-1.208,0-2.188,0.98-2.188,2.188v6.018v14.224v25.133
+		c-1.551-0.506-3.203-0.789-4.924-0.789c-8.762,0-15.865,7.103-15.865,15.865s7.103,15.865,15.865,15.865
+		s15.865-7.103,15.865-15.865c0-0.067-0.009-0.132-0.01-0.199c0.001-0.025,0.01-0.049,0.01-0.075V35.491h46.5v22.945
+		c-1.551-0.506-3.203-0.789-4.924-0.789c-8.762,0-15.865,7.103-15.865,15.865s7.103,15.865,15.865,15.865
+		s15.865-7.103,15.865-15.865c0-0.067-0.009-0.132-0.01-0.199c0.001-0.025,0.01-0.049,0.01-0.075V33.303V19.079v-6.018
+		C94.086,11.853,93.106,10.873,91.897,10.873z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/navigation.svg Added

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M51.763,5.879c-0.974-1.706-2.552-1.706-3.525,0L36.032,27.271
+		c-0.974,1.706-0.171,3.089,1.794,3.089h24.348c1.965,0,2.768-1.383,1.794-3.089L51.763,5.879z"/>
+	<path style="fill:#1D1D1B;" d="M62.174,69.225H37.826c-1.965,0-2.768,1.383-1.794,3.089l12.205,21.392
+		c0.974,1.706,2.552,1.706,3.525,0l12.205-21.392C64.941,70.608,64.139,69.225,62.174,69.225z"/>
+	<path style="fill:#1D1D1B;" d="M93.913,48.03L72.521,35.824c-1.706-0.973-3.089-0.17-3.089,1.794v24.348
+		c0,1.964,1.383,2.767,3.089,1.794l21.392-12.206C95.619,50.581,95.619,49.003,93.913,48.03z"/>
+	<path style="fill:#1D1D1B;" d="M27.479,35.824L6.087,48.03c-1.706,0.973-1.706,2.552,0,3.525L27.479,63.76
+		c1.706,0.973,3.089,0.17,3.089-1.794V37.618C30.567,35.654,29.185,34.851,27.479,35.824z"/>
+	<circle style="fill:#1D1D1B;" cx="50" cy="49.792" r="12.374"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/network.svg Added

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M92.202,63.505h-5.064V53.376c0-1.828-0.668-3.41-2.004-4.748c-1.337-1.335-2.919-2.004-4.748-2.004
+		h-27.01V36.495h5.064c1.406,0,2.602-0.49,3.587-1.476c0.984-0.984,1.478-2.179,1.478-3.588V14.55c0-1.406-0.493-2.602-1.478-3.587
+		c-0.985-0.985-2.181-1.477-3.587-1.477H41.56c-1.407,0-2.603,0.492-3.587,1.477c-0.985,0.985-1.478,2.18-1.478,3.587v16.881
+		c0,1.409,0.492,2.604,1.478,3.588c0.984,0.986,2.18,1.476,3.587,1.476h5.064v10.129h-27.01c-1.829,0-3.412,0.669-4.748,2.004
+		c-1.337,1.337-2.004,2.92-2.004,4.748v10.129H7.798c-1.407,0-2.604,0.492-3.587,1.476c-0.985,0.986-1.477,2.181-1.477,3.588V85.45
+		c0,1.406,0.492,2.602,1.477,3.588c0.984,0.984,2.18,1.476,3.587,1.476h16.881c1.406,0,2.602-0.492,3.587-1.476
+		c0.984-0.986,1.478-2.181,1.478-3.588V68.569c0-1.406-0.493-2.602-1.478-3.588c-0.985-0.984-2.181-1.476-3.587-1.476h-5.064V53.376
+		h27.01v10.129H41.56c-1.407,0-2.603,0.492-3.587,1.476c-0.985,0.986-1.478,2.181-1.478,3.588V85.45
+		c0,1.406,0.492,2.602,1.478,3.588c0.984,0.984,2.18,1.476,3.587,1.476H58.44c1.406,0,2.602-0.492,3.587-1.476
+		c0.984-0.986,1.478-2.181,1.478-3.588V68.569c0-1.406-0.493-2.602-1.478-3.588c-0.985-0.984-2.181-1.476-3.587-1.476h-5.064V53.376
+		h27.01v10.129h-5.064c-1.407,0-2.603,0.492-3.587,1.476c-0.985,0.986-1.478,2.181-1.478,3.588V85.45
+		c0,1.406,0.492,2.602,1.478,3.588c0.984,0.984,2.18,1.476,3.587,1.476h16.881c1.406,0,2.603-0.492,3.587-1.476
+		c0.984-0.986,1.477-2.181,1.477-3.588V68.569c0-1.406-0.493-2.602-1.477-3.588C94.805,63.997,93.608,63.505,92.202,63.505z
+		 M22.891,67.521c1.556,0,2.817,1.261,2.817,2.817v13.616c0,1.556-1.261,2.817-2.817,2.817H9.275c-1.556,0-2.817-1.261-2.817-2.817
+		V70.338c0-1.556,1.261-2.817,2.817-2.817H22.891z M56.808,67.521c1.556,0,2.817,1.261,2.817,2.817v13.616
+		c0,1.556-1.261,2.817-2.817,2.817H43.192c-1.556,0-2.817-1.261-2.817-2.817V70.338c0-1.556,1.261-2.817,2.817-2.817H56.808z
+		 M43.192,32.521c-1.556,0-2.817-1.261-2.817-2.817V16.088c0-1.556,1.261-2.817,2.817-2.817h13.616c1.556,0,2.817,1.261,2.817,2.817
+		v13.616c0,1.556-1.261,2.817-2.817,2.817H43.192z M93.542,83.954c0,1.556-1.261,2.817-2.817,2.817H77.109
+		c-1.556,0-2.817-1.261-2.817-2.817V70.338c0-1.556,1.261-2.817,2.817-2.817h13.616c1.556,0,2.817,1.261,2.817,2.817V83.954z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/next.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/osmo.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/overflowing.svg Added

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path d="M25.856,82.795h0.004l31.031-0.044c1.378-0.002,2.5-1.125,2.5-2.503v-3.48c0-1.377-1.12-2.498-2.5-2.498l-31.031,0.043
+		c-1.378,0.002-2.5,1.125-2.5,2.503v3.482C23.36,81.675,24.48,82.795,25.856,82.795z"/>
+	<path d="M12.434,89.779c0.012,4.781,0.012,4.812,0.502,4.812c0.003,0,0.006,0,0.009,0l1.734,0.048c0.005,0,0.009,0,0.014,0
+		c0,0,14.022,0,28.044-0.006c7.012-0.003,14.023-0.008,19.281-0.015c2.629-0.003,4.821-0.007,6.354-0.012
+		c2.909-0.009,2.909-0.009,2.909-0.502l0.049-1.748V59.623c0-1.378-1.122-2.5-2.5-2.5h-1.946c-1.378,0-2.5,1.122-2.5,2.5v26.621
+		c0,0.827-0.673,1.5-1.5,1.5H20.905c-0.827,0-1.5-0.673-1.5-1.5V59.623c0-1.378-1.122-2.5-2.5-2.5H14.91c-1.378,0-2.5,1.121-2.5,2.5
+		c0,3.814,0.002,12.432,0.009,20.095C12.422,83.549,12.427,87.143,12.434,89.779z"/>
+	<path d="M26.103,70.097l30.948,2.854c0.078,0.007,0.155,0.01,0.231,0.01c1.3,0,2.364-0.978,2.477-2.274l0.299-3.447
+		c0.119-1.372-0.9-2.59-2.271-2.717l-30.899-2.853c-1.404-0.13-2.593,0.889-2.721,2.259l-0.322,3.449
+		c-0.062,0.665,0.138,1.314,0.564,1.827C24.836,69.719,25.438,70.036,26.103,70.097z"/>
+	<path d="M74.357,39.288c0.208,1.2,1.243,2.071,2.459,2.071c0.143,0,0.287-0.012,0.432-0.038l3.442-0.601
+		c1.358-0.237,2.271-1.535,2.035-2.893L77.414,7.234c-0.232-1.341-1.505-2.274-2.891-2.034l-3.442,0.601
+		c-1.358,0.237-2.271,1.535-2.035,2.893L74.357,39.288z"/>
+	<path d="M33.948,36.923L60.68,52.725c0.385,0.228,0.825,0.349,1.271,0.349c0.881,0,1.707-0.47,2.154-1.227l1.777-3
+		c0.34-0.575,0.437-1.247,0.271-1.894c-0.166-0.646-0.574-1.19-1.149-1.529L38.272,29.621c-1.146-0.678-2.751-0.261-3.426,0.878
+		l-1.776,3c-0.34,0.575-0.437,1.248-0.271,1.894C32.965,36.04,33.374,36.583,33.948,36.923z"/>
+	<path d="M66.169,44.46c0.466,0.682,1.237,1.088,2.063,1.088c0.505,0,0.993-0.151,1.411-0.438l2.844-1.95
+		c1.136-0.779,1.43-2.339,0.656-3.479l-17.47-25.678c-0.749-1.1-2.369-1.409-3.47-0.651l-2.898,1.995
+		c-1.135,0.781-1.426,2.341-0.649,3.479L66.169,44.46z"/>
+	<path d="M28.09,54.561l29.978,8.032c0.212,0.057,0.43,0.086,0.648,0.086c1.128,0,2.121-0.763,2.412-1.854l0.9-3.37
+		c0.356-1.332-0.438-2.705-1.769-3.062L30.281,46.36c-1.31-0.351-2.713,0.466-3.06,1.769l-0.9,3.371
+		C25.965,52.83,26.759,54.204,28.09,54.561z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/pause.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/pl_next.svg Added

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="13.373px" height="17.804px" viewBox="0 0 13.373 17.804" style="enable-background:new 0 0 13.373 17.804;"
+	 xml:space="preserve">
+<g id="c93_stop">
+	<path style="fill:#000000;" d="M0.224,0.043c0.14-0.071,0.304-0.051,0.425,0.044l10.777,8.502c0.094,0.074,0.152,0.191,0.152,0.312
+		c0,0.118-0.059,0.24-0.152,0.314L0.648,17.718c-0.072,0.056-0.162,0.086-0.25,0.086l-0.175-0.04C0.086,17.699,0,17.558,0,17.402
+		V0.403C0,0.249,0.086,0.106,0.224,0.043z"/>
+	<path style="fill:#000000;" d="M10.4,0.034h2.656c0.175,0,0.316,0.181,0.316,0.399v16.935c0,0.222-0.142,0.403-0.316,0.403H10.4
+		c-0.174,0-0.316-0.182-0.316-0.403V0.434C10.084,0.215,10.227,0.034,10.4,0.034z"/>
+</g>
+<g id="Capa_1">
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/pl_prev.svg Added

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="13.373px" height="17.803px" viewBox="0 0 13.373 17.803" style="enable-background:new 0 0 13.373 17.803;"
+	 xml:space="preserve">
+<g id="c92_stop">
+	<path style="fill:#000000;" d="M13.148,0.042c-0.139-0.07-0.303-0.051-0.424,0.043L1.948,8.587C1.854,8.664,1.795,8.78,1.795,8.9
+		c0,0.119,0.059,0.24,0.153,0.314l10.776,8.502c0.071,0.057,0.162,0.086,0.249,0.086l0.175-0.039
+		c0.139-0.064,0.225-0.207,0.225-0.361V0.403C13.373,0.249,13.287,0.107,13.148,0.042z"/>
+	<path style="fill:#000000;" d="M2.973,0.033H0.315C0.143,0.033,0,0.215,0,0.434v16.936c0,0.221,0.143,0.403,0.315,0.403h2.657
+		c0.174,0,0.315-0.183,0.315-0.403V0.434C3.288,0.215,3.146,0.033,2.973,0.033z"/>
+</g>
+<g id="Capa_1">
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/play.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/play_loop.svg Added

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M94.353,39.789h-6.51c0-0.5-0.067-1.008-0.215-1.512C82.677,21.439,66.949,9.679,49.382,9.679
+		c-17.563,0-33.29,11.757-38.244,28.591c-0.835,2.839,0.789,5.818,3.628,6.653c2.836,0.834,5.817-0.789,6.653-3.628
+		c3.621-12.305,15.12-20.9,27.963-20.9c12.31,0,23.362,7.903,27.451,19.393h-6.21c-2.466,0-3.052,1.414-1.308,3.157L79.33,52.962
+		c1.744,1.744,4.571,1.744,6.315,0l10.016-10.016C97.404,41.203,96.819,39.789,94.353,39.789z"/>
+	<path style="fill:#1D1D1B;" d="M83.898,58.321c-2.838-0.832-5.818,0.788-6.652,3.628c-3.621,12.305-15.121,20.899-27.963,20.899
+		c-12.31,0-23.362-7.904-27.451-19.393h6.21c2.466,0,3.051-1.414,1.308-3.157L19.334,50.282c-1.744-1.744-4.571-1.744-6.315,0
+		L3.004,60.298c-1.744,1.744-1.158,3.157,1.308,3.157h6.509c0,0.5,0.067,1.007,0.216,1.511
+		c4.951,16.838,20.678,28.598,38.246,28.598c17.564,0,33.291-11.757,38.244-28.591C88.362,62.135,86.738,59.156,83.898,58.321z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/play_shuffle.svg Added

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M85.39,46.171l9.202-9.202c0.825-0.825,0.825-2.162,0-2.987L85.39,24.78
+		c-1.237-1.237-2.24-0.822-2.24,0.928v4.768H72.228c-10.57,0-17.933,5.566-23.784,11.844c-5.05-6.14-10.472-11.844-18.146-11.844
+		H10.335c-2.761,0-5,2.238-5,5s2.239,5,5,5h12.57h7.391c2.873,0,5.886,2.853,9.034,6.534c0.838,0.979,1.686,2.017,2.543,3.076
+		c-0.857,1.058-1.705,2.096-2.542,3.075c-3.149,3.68-6.161,6.534-9.035,6.534h-7.392H10.335c-2.761,0-5,2.238-5,5s2.239,5,5,5
+		h19.961c7.674,0,13.097-5.704,18.146-11.844c5.851,6.277,13.214,11.844,23.784,11.844H83.15v4.768c0,1.75,1.003,2.165,2.24,0.928
+		l9.202-9.202c0.825-0.825,0.825-2.162,0-2.987l-9.202-9.202c-1.237-1.237-2.24-0.822-2.24,0.928v4.768H72.228
+		c-0.392,0-0.769-0.033-1.149-0.057c-4.026-0.259-7.447-1.852-10.509-4.18c-2.022-1.537-3.894-3.38-5.679-5.372
+		c1.786-1.993,3.658-3.836,5.68-5.373c3.061-2.327,6.481-3.919,10.506-4.179c0.381-0.025,0.759-0.057,1.151-0.057H83.15v4.768
+		C83.15,46.993,84.153,47.408,85.39,46.171z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/play_single.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/power.svg Added

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M69.766,10.121c-2.966-1.473-6.568-0.263-8.042,2.706c-1.474,2.968-0.262,6.568,2.706,8.042
+		C75.576,26.403,82.5,37.565,82.5,50c0,17.921-14.58,32.5-32.5,32.5S17.5,67.921,17.5,50c0-12.437,6.926-23.6,18.075-29.133
+		c2.969-1.473,4.181-5.073,2.708-8.042s-5.072-4.179-8.042-2.708C14.98,17.691,5.5,32.973,5.5,50c0,24.537,19.962,44.5,44.5,44.5
+		S94.5,74.537,94.5,50C94.5,32.976,85.022,17.696,69.766,10.121z"/>
+	<path style="fill:#1D1D1B;" d="M50,60.5c3.313,0,6-2.687,6-6V10c0-3.313-2.687-6-6-6s-6,2.687-6,6v44.5
+		C44,57.813,46.687,60.5,50,60.5z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/previous.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/remove.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/resize.svg Added

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M40.148,44.242c-0.558-0.558-1.464-0.558-2.022,0L20.351,62.017l-4.797-4.797
+		c-1.396-1.396-2.528-0.927-2.528,1.047l0,25.132c0,1.974,1.6,3.575,3.575,3.575l25.131,0c1.974,0,2.443-1.132,1.047-2.528
+		l-4.797-4.797l17.775-17.775c0.558-0.558,0.558-1.464,0-2.022L40.148,44.242z"/>
+	<path style="fill:#000100;" d="M83.399,13.026l-25.132,0c-1.974,0-2.443,1.132-1.047,2.528l4.797,4.797L44.242,38.126
+		c-0.558,0.558-0.558,1.464,0,2.022l15.61,15.61c0.558,0.558,1.464,0.558,2.022,0l17.775-17.775l4.797,4.797
+		c1.396,1.396,2.528,0.927,2.528-1.047l0-25.131C86.974,14.627,85.373,13.026,83.399,13.026z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/rewind.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/right.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/seek_forward.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/shrink.svg Added

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="25.94px" height="25.875px" viewBox="0 0 25.94 25.875" style="enable-background:new 0 0 25.94 25.875;"
+	 xml:space="preserve">
+<path d="M10.632,11.016l-6.527-0.617c0,0-0.869,0.023-0.385-0.461c0.488-0.486,1.664-1.664,1.664-1.664S5.097,7.988,4.66,7.547
+	C3.404,6.291,1.119,4.006,0.189,3.076c0,0-0.322-0.188,0.064-0.57C0.638,2.117,2.32,0.434,2.595,0.162
+	c0.271-0.275,0.479-0.053,0.479-0.053c0.904,0.9,3.27,3.264,4.482,4.479C7.951,4.982,8.208,5.24,8.208,5.24s0.943-0.945,1.539-1.539
+	c0.592-0.592,0.588,0.301,0.588,0.301s0.826,5.848,0.826,6.547C11.162,11.059,10.632,11.016,10.632,11.016z"/>
+<path d="M15.371,14.871l6.525,0.617c0,0,0.871-0.025,0.387,0.459c-0.486,0.486-1.666,1.67-1.666,1.67s0.285,0.281,0.727,0.723
+	c1.258,1.256,3.541,3.541,4.473,4.475c0,0,0.318,0.182-0.064,0.564c-0.385,0.387-2.07,2.074-2.348,2.348
+	c-0.27,0.271-0.475,0.055-0.475,0.055c-0.904-0.906-3.27-3.268-4.484-4.482c-0.393-0.393-0.646-0.648-0.646-0.648
+	s-0.945,0.941-1.543,1.535c-0.592,0.594-0.592-0.299-0.592-0.299s-0.82-5.852-0.82-6.547C14.843,14.83,15.371,14.871,15.371,14.871z
+	"/>
+<path d="M10.994,15.305l-0.615,6.529c0,0,0.025,0.873-0.461,0.385c-0.488-0.49-1.668-1.666-1.668-1.666s-0.287,0.287-0.721,0.727
+	c-1.258,1.258-3.547,3.541-4.477,4.475c0,0-0.186,0.314-0.57-0.068s-2.066-2.072-2.344-2.34c-0.275-0.273-0.055-0.482-0.055-0.482
+	c0.904-0.9,3.266-3.268,4.482-4.482c0.395-0.393,0.652-0.65,0.652-0.65s-0.943-0.945-1.539-1.535
+	c-0.596-0.596,0.297-0.592,0.297-0.592s5.852-0.822,6.553-0.822C11.037,14.781,10.994,15.305,10.994,15.305z"/>
+<path d="M14.849,10.568l0.615-6.531c0,0-0.023-0.867,0.461-0.383c0.488,0.488,1.666,1.668,1.666,1.668s0.287-0.287,0.729-0.727
+	c1.256-1.258,3.539-3.541,4.471-4.471c0,0,0.186-0.32,0.57,0.066c0.385,0.381,2.068,2.066,2.342,2.338
+	c0.277,0.275,0.057,0.482,0.057,0.482c-0.902,0.904-3.268,3.268-4.48,4.482c-0.396,0.391-0.656,0.648-0.656,0.648
+	s0.947,0.943,1.541,1.537c0.592,0.598-0.297,0.592-0.297,0.592s-5.852,0.824-6.553,0.824C14.808,11.096,14.849,10.568,14.849,10.568
+	z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/sort.svg Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="216px" height="146px" viewBox="0 0 216 146" enable-background="new 0 0 216 146" xml:space="preserve">
+<g>
+	<path d="M130.193,125.143h-20.856c-0.761,0-1.385,0.244-1.874,0.734c-0.488,0.488-0.733,1.113-0.733,1.873v15.643
+		c0,0.762,0.244,1.385,0.733,1.875c0.489,0.488,1.113,0.732,1.874,0.732h20.856c0.761,0,1.386-0.244,1.873-0.732
+		c0.49-0.49,0.732-1.113,0.732-1.875V127.75c0-0.76-0.242-1.385-0.732-1.873C131.579,125.387,130.954,125.143,130.193,125.143z"/>
+	<path d="M91.086,114.714H75.443V2.607c0-0.76-0.244-1.386-0.733-1.874C74.221,0.245,73.597,0,72.836,0H57.193
+		c-0.76,0-1.386,0.244-1.874,0.733c-0.488,0.489-0.733,1.114-0.733,1.874v112.107H38.943c-1.194,0-2.009,0.543-2.444,1.629
+		c-0.435,1.033-0.244,1.983,0.57,2.853l26.071,26.072c0.598,0.487,1.222,0.731,1.874,0.731c0.706,0,1.331-0.244,1.874-0.731
+		l25.99-25.99c0.544-0.651,0.815-1.305,0.815-1.954c0-0.763-0.245-1.386-0.733-1.878C92.471,114.958,91.847,114.714,91.086,114.714z
+		"/>
+	<path d="M145.836,83.43h-36.5c-0.761,0-1.385,0.244-1.874,0.732c-0.488,0.488-0.733,1.113-0.733,1.873v15.645
+		c0,0.76,0.244,1.385,0.733,1.873c0.489,0.488,1.113,0.732,1.874,0.732h36.5c0.76,0,1.385-0.244,1.873-0.732
+		c0.489-0.488,0.734-1.113,0.734-1.873V86.035c0-0.76-0.245-1.385-0.734-1.873C147.221,83.674,146.596,83.43,145.836,83.43z"/>
+	<path d="M178.996,0.733C178.507,0.245,177.883,0,177.122,0h-67.785c-0.761,0-1.385,0.244-1.874,0.733
+		c-0.488,0.489-0.733,1.114-0.733,1.874V18.25c0,0.761,0.244,1.385,0.733,1.874c0.489,0.488,1.113,0.733,1.874,0.733h67.785
+		c0.761,0,1.385-0.244,1.874-0.733c0.488-0.489,0.732-1.113,0.732-1.874V2.607C179.729,1.847,179.484,1.221,178.996,0.733z"/>
+	<path d="M161.479,41.715h-52.143c-0.761,0-1.385,0.244-1.874,0.733c-0.488,0.489-0.733,1.113-0.733,1.874v15.643
+		c0,0.761,0.244,1.385,0.733,1.874c0.489,0.488,1.113,0.733,1.874,0.733h52.143c0.76,0,1.385-0.244,1.875-0.733
+		c0.488-0.489,0.732-1.113,0.732-1.874V44.322c0-0.761-0.244-1.386-0.732-1.874C162.863,41.96,162.238,41.715,161.479,41.715z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/speed.svg Added

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M14.026,87.661h71.346c1.187,0,2.103-0.493,2.748-1.476c4.783-7.531,7.175-15.724,7.175-24.579
+		c0-6.173-1.204-12.077-3.613-17.71c-2.409-5.631-5.649-10.483-9.72-14.554c-4.071-4.071-8.923-7.31-14.554-9.72
+		c-5.632-2.408-11.535-3.613-17.709-3.613c-6.175,0-12.078,1.205-17.709,3.613c-5.632,2.409-10.483,5.648-14.554,9.72
+		c-4.071,4.071-7.311,8.923-9.72,14.554c-2.409,5.633-3.613,11.536-3.613,17.71c0,8.89,2.392,17.083,7.175,24.579
+		C11.922,87.168,12.838,87.661,14.026,87.661z M88.199,60.667c1.086,0,1.967,0.881,1.967,1.968s-0.881,1.968-1.967,1.968H77.801
+		c-1.086,0-1.967-0.881-1.967-1.968s0.881-1.968,1.967-1.968H88.199z M68.563,41.403l7.552-7.148
+		c0.789-0.747,2.035-0.713,2.781,0.077c0.747,0.789,0.713,2.035-0.077,2.781l-7.552,7.148c-0.79,0.747-2.035,0.713-2.782-0.077
+		S67.774,42.15,68.563,41.403z M49.051,64.65l1.423-0.119l0.349-1.385l3.132-12.409c0.101-0.374,0.283-0.615,0.609-0.806
+		c0.27-0.158,0.456-0.177,0.572-0.177c0.1,0,0.205,0.016,0.315,0.047c0.356,0.1,0.591,0.281,0.786,0.606
+		c0.19,0.317,0.234,0.613,0.157,0.949l-3.14,12.439l-0.342,1.356l1.156,0.787c1.366,0.93,2.322,2.14,2.924,3.699
+		c0.595,1.543,0.673,3.086,0.235,4.731c-0.544,2.094-1.72,3.639-3.596,4.726c-1.262,0.732-2.525,1.087-3.86,1.087
+		c-0.667,0-1.361-0.092-2.065-0.275c-2.092-0.542-3.637-1.718-4.725-3.595c-1.093-1.885-1.359-3.823-0.816-5.912
+		c0.436-1.635,1.267-2.937,2.541-3.98C45.993,65.365,47.414,64.787,49.051,64.65z M47.731,24.134c0-1.087,0.881-1.968,1.968-1.968
+		c1.086,0,1.967,0.881,1.967,1.968v10.398c0,1.087-0.881,1.968-1.967,1.968c-1.087,0-1.968-0.881-1.968-1.968V24.134z
+		 M21.436,34.332c0.747-0.789,1.993-0.823,2.782-0.077l7.552,7.148c0.789,0.747,0.823,1.992,0.077,2.781
+		c-0.747,0.789-1.993,0.823-2.782,0.077l-7.552-7.148C20.724,36.366,20.689,35.121,21.436,34.332z M10.167,62.634
+		c0-1.087,0.881-1.968,1.968-1.968h10.398c1.087,0,1.968,0.881,1.968,1.968s-0.881,1.968-1.968,1.968H12.134
+		C11.047,64.602,10.167,63.721,10.167,62.634z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/star.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/stop.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/stop2.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/trash.svg Added

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M79,22.167H67.932C67.243,12.312,59.026,4.5,49,4.5s-18.243,7.812-18.932,17.667H19
+		c-1.657,0-3,1.343-3,3v1.667c0,1.657,1.343,3,3,3h2.526L23.5,92.667c0,1.657,1.343,3,3,3h45c1.657,0,3-1.343,3-3l1.974-62.833H79
+		c1.657,0,3-1.343,3-3v-1.667C82,23.51,80.657,22.167,79,22.167z M35.569,83.992c-1.012,0.027-1.855-0.772-1.882-1.784l-1.04-38.986
+		c-0.027-1.012,0.772-1.855,1.784-1.882c1.012-0.027,1.855,0.772,1.882,1.784l1.04,38.986C37.38,83.123,36.581,83.965,35.569,83.992
+		z M51.833,82.167C51.833,83.179,51.013,84,50,84s-1.833-0.821-1.833-1.833v-39c0-1.013,0.821-1.833,1.833-1.833
+		s1.833,0.821,1.833,1.833V82.167z M36.068,22.167C36.738,15.622,42.282,10.5,49,10.5s12.262,5.122,12.932,11.667H36.068z
+		 M65.646,82.209c-0.027,1.012-0.869,1.811-1.882,1.784c-1.012-0.027-1.811-0.869-1.784-1.882l1.04-38.986
+		c0.027-1.012,0.869-1.811,1.882-1.784c1.012,0.027,1.811,0.869,1.784,1.882L65.646,82.209z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/tray.svg Added

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M70.851,17.701c-0.352-0.426-1.085-0.771-1.637-0.771H30.786c-0.552,0-1.285,0.345-1.637,0.771
+		L7.637,43.718C7.285,44.143,7,44.936,7,45.488v35.581c0,0.552,0.448,1,1,1h84c0.552,0,1-0.448,1-1V45.488
+		c0-0.552-0.285-1.345-0.637-1.771L70.851,17.701z M82.115,44.488H71.214c-0.552,0-1.062,0.443-1.138,0.99l-2.057,14.739
+		c-0.076,0.547-0.586,0.99-1.138,0.99H33.119c-0.552,0-1.062-0.443-1.138-0.99l-2.057-14.739c-0.076-0.547-0.586-0.99-1.138-0.99
+		H17.033c-0.552,0-0.719-0.349-0.373-0.779L32.769,23.67c0.346-0.43,1.074-0.779,1.627-0.779h30.356
+		c0.552,0,1.281,0.349,1.627,0.779l16.109,20.039C82.835,44.14,82.667,44.488,82.115,44.488z"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/tv.svg Added

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="54.01px" viewBox="0 0 55 54.01" enable-background="new 0 0 55 54.01" xml:space="preserve">
+<g>
+	<path id="path3378" fill="#040606" d="M47.47,27.216c-2.453,0-4.447-1.992-4.447-4.446c0-2.456,1.994-4.446,4.447-4.446
+		c2.458,0,4.446,1.99,4.446,4.446C51.916,25.224,49.928,27.216,47.47,27.216z M47.47,38.332c-2.453,0-4.447-1.99-4.447-4.447
+		c0-2.456,1.994-4.447,4.447-4.447c2.458,0,4.446,1.991,4.446,4.447S49.928,38.332,47.47,38.332z M40.977,45
+		c0,2.456-2.165,4.798-4.624,4.798H9.673c-2.451,0-4.226-2.342-4.226-4.798V22.768c0-2.454,1.775-4.825,4.226-4.825h26.679
+		c2.459,0,4.624,2.371,4.624,4.825V45z M49.692,14.268H33.214c-1.353,0-1.748-1.04-0.88-2.079l4.332-5.294
+		c0.867-1.04,1.646-1.913,1.739-1.891c0.054,0.016,0.109,0.002,0.172,0.002c1.229,0,2.224-1.005,2.224-2.236
+		c0-1.225-0.994-2.228-2.224-2.228c-1.226,0-2.224,0.995-2.224,2.22c0,0.132,0.016,0.259,0.043,0.382
+		c0.045,0.209-0.59,1.211-1.456,2.25l-5.501,6.598c-0.865,1.04-1.751,1.882-1.976,1.882c-0.225,0-1.108-0.842-1.975-1.883
+		L19.99,5.396c-0.867-1.041-1.508-2.045-1.464-2.254c0.026-0.124,0.041-0.251,0.041-0.382c0-1.225-0.994-2.222-2.224-2.222
+		c-1.225,0-2.224,0.997-2.224,2.222c0,1.23,0.999,2.224,2.224,2.224c0.064,0,0.121-0.012,0.176-0.026
+		c0.095-0.022,0.875,0.801,1.742,1.842l4.329,5.392c0.866,1.04,0.471,2.079-0.881,2.079H5.228c-2.452-0.002-4.681,1.596-4.681,4.051
+		v31.125c0,2.459,2.229,4.027,4.681,4.027h44.465c2.458,0,4.761-1.569,4.761-4.027V18.321C54.453,15.866,52.15,14.268,49.692,14.268
+		"/>
+</g>
+</svg>

gpac-0.5.1.svn5491.tar.xz/gui/icons/up.svg Added

gpac-0.5.1.svn5491.tar.xz/gui/icons/world.svg Added

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="28.335px" height="28.333px" viewBox="0 0 28.335 28.333" enable-background="new 0 0 28.335 28.333" xml:space="preserve">
+<g>
+	<path d="M14.167,0C6.356,0,0,6.355,0,14.167s6.356,14.167,14.167,14.167c7.812,0,14.168-6.354,14.168-14.167
+		C28.335,6.355,21.979,0,14.167,0z M11.443,5.072l0.662,0.188V4.389l0.258-0.243l0.276,0.536l0.526,0.635l-0.213,0.292l-0.848,0.195
+		V5.288l-0.662,0.516L11.25,5.511L11.443,5.072z M1.239,13.851c0.066-2.742,0.989-5.269,2.513-7.336
+		c0.051,0.007,0.087,0.02,0.087,0.02c0,0.195-0.266,0.242,0,0.732c0.34,0.634,0.048,0.927,0.048,0.927s-0.83,0.585-0.976,0.683
+		C2.765,8.974,2.375,9.511,2.618,9.364c0.244-0.146,0.536-0.292,0.293,0.098c-0.244,0.391-0.683,1.024-0.78,1.269
+		c-0.097,0.245-0.585,0.829-0.585,1.122S1.351,12.732,1.4,12.976C1.433,13.145,1.324,13.646,1.239,13.851z M6.277,21.999
+		l-0.196,0.73l0.196,0.585c0,0-0.294,0.245-0.487,0.245c-0.18,0-0.241,0.113-0.438,0.061c-1.86-1.738-3.21-4.01-3.795-6.576
+		c0.063,0.016,0.153,0.062,0.28,0.174c0.184,0.16,0.293,0.242,0.537,0.341c0.243,0.099,0.341,0.243,0.634,0.389
+		c0.293,0.148,0.196,0.05,0.585,0.489c0.391,0.438,0.342,0.438,0.439,0.682c0.097,0.244,0.244,0.488,0.342,0.635
+		s0.39,0.244,0.536,0.342c0.146,0.097,0.39,0.195,0.536,0.195c0.147,0,0.586,0.439,0.83,0.487c0.244,0.05,0.244,0.538,0.244,0.538
+		L6.277,21.999z M8.228,3.171C7.594,3.853,7.74,3.658,7.594,3.853c-0.146,0.195-0.098,0.243-0.44,0.488
+		C6.813,4.584,6.667,4.877,6.667,4.877L6.13,5.072L5.692,4.877c0,0-0.392,0.147-0.343-0.049c0.014-0.051,0.034-0.105,0.057-0.162
+		C6.6,3.564,7.997,2.687,9.539,2.093C9.387,2.288,9.203,2.488,9.203,2.488S8.862,2.487,8.228,3.171z M23.105,20.681
+		c-0.051,0.194-0.146,0.536-0.195,0.731s-0.293,0.586-0.438,0.683c-0.146,0.098-0.391,0.391-0.536,0.44
+		c-0.146,0.049-0.245-0.343-0.196-0.537c0.051-0.197,0.293-0.732,0.293-0.732s0.049-0.292,0.098-0.488
+		c0.05-0.193,0.635-0.438,0.635-0.438l0.391-0.732c0,0,0.049,0.196,0.049,0.342C23.203,20.095,23.154,20.486,23.105,20.681z
+		 M23.251,16.096c-0.098,0.146-0.391,0.535-0.537,0.73s-0.34,0.488-0.633,0.732s-0.295,0.486-0.439,0.684
+		c-0.146,0.195-0.342,0.633-0.342,0.633s0.098,0.977,0.146,1.172c0.05,0.195-0.341,0.73-0.341,0.73l-0.439,0.439l-0.588,0.781
+		l0.047,0.73c0,0-0.443,0.342-0.688,0.537c-0.242,0.195-0.204,0.341-0.399,0.537c-0.193,0.193-0.711,0.535-0.906,0.585
+		c-0.194,0.049-1.023,0.194-1.023,0.194v-0.438l-0.27-0.488c0,0-0.271-0.584-0.418-0.781c-0.146-0.194-0.145-0.488-0.389-0.731
+		c-0.244-0.244-0.363-0.438-0.412-0.586c-0.05-0.146,0.036-0.584,0.036-0.584s0.188-0.537,0.286-0.731
+		c0.098-0.195-0.003-0.488-0.102-0.684c-0.098-0.196-0.146-0.684-0.146-0.829s-0.394-0.392-0.539-0.537
+		c-0.146-0.147-0.098-0.342-0.098-0.536c0-0.195-0.146-0.635-0.099-0.976c0.049-0.341-0.438-0.099-0.73,0
+		c-0.293,0.097-0.487-0.099-0.487-0.392c0-0.291-0.536-0.047-0.878,0.146c-0.343,0.195-0.732,0.195-1.124,0.341
+		c-0.389,0.146-0.583-0.146-0.583-0.146s-0.343-0.293-0.585-0.439c-0.245-0.146-0.489-0.438-0.685-0.682
+		c-0.194-0.245-0.683-0.977-0.73-1.268c-0.049-0.294,0-0.49,0-0.831c0-0.341,0-0.536,0.048-0.78
+		c0.049-0.244,0.195-0.537,0.342-0.781c0.146-0.244,0.683-0.536,0.828-0.634c0.146-0.097,0.488-0.389,0.488-0.585
+		c0-0.195,0.196-0.292,0.292-0.488c0.099-0.195,0.44-0.682,0.879-0.487c0,0,0.389-0.048,0.535-0.097
+		c0.146-0.049,0.536-0.194,0.729-0.292c0.195-0.098,0.681-0.144,0.681-0.144s0.384,0.153,0.53,0.153s0.623-0.085,0.623-0.085
+		s0.22,0.707,0.22,0.854s0.146,0.292,0.392,0.39c0.242,0.097,1.365,0.341,1.854-0.049c0.113-0.09,0.486,0.146,0.486,0.146
+		s1.219,0.244,1.414,0.39c0.196,0.147,0.537,0.245,0.635,0.392c0.099,0.146,0.438,0.585,0.486,0.731
+		c0.051,0.146,0.295,0.684,0.344,0.878c0.049,0.195,0.194,0.683,0.34,0.927c0.146,0.245,0.977,1.316,1.269,1.805l0.88-0.146
+		C23.447,15.511,23.349,15.95,23.251,16.096z M26.812,14.244c-0.048-0.196-0.341-0.879-0.341-0.879s-0.293-0.39-0.488-0.488
+		c-0.194-0.098-0.341-0.342-0.683-0.536c-0.342-0.196-0.487-0.293-0.779-0.293c-0.294,0-0.585-0.391-0.928-0.586
+		c-0.342-0.194-0.391-0.097-0.391-0.097s0.391,0.585,0.391,0.731s0.438,0.39,0.879,0.292c0,0,0.292,0.537,0.438,0.683
+		c0.146,0.146-0.049,0.293-0.341,0.488c-0.293,0.194-0.243,0.146-0.392,0.292c-0.146,0.146-0.633,0.392-0.78,0.488
+		c-0.146,0.097-0.731,0.39-1.022,0.097c-0.144-0.141-0.1-0.438-0.195-0.634c-0.098-0.195-1.122-1.707-1.61-2.389
+		c-0.085-0.12-0.293-0.49-0.438-0.585c-0.146-0.099,0.343-0.099,0.343-0.099s0-0.342-0.05-0.585c-0.049-0.244,0.05-0.585,0.05-0.585
+		s-0.488,0.292-0.636,0.39c-0.146,0.098-0.293-0.194-0.486-0.439c-0.195-0.243-0.391-0.537-0.439-0.781
+		c-0.049-0.243,0.244-0.341,0.244-0.341l0.438-0.243c0,0,0.537-0.097,0.88-0.049c0.341,0.049,0.877,0.098,0.877,0.098
+		s0.146-0.342-0.05-0.488c-0.193-0.146-0.635-0.39-0.829-0.341c-0.194,0.048,0.097-0.244,0.34-0.439l-0.54-0.098
+		c0,0-0.491,0.244-0.639,0.293c-0.146,0.048-0.399,0.146-0.596,0.39c-0.193,0.244,0.078,0.585-0.117,0.683
+		c-0.193,0.098-0.326,0.146-0.473,0.194c-0.146,0.049-0.609,0-0.609,0c-0.504,0-0.182,0.46-0.051,0.623l-0.39-0.476l-0.289-0.684
+		c0,0-0.416-0.292-0.61-0.389c-0.197-0.097-0.797-0.439-0.797-0.439l0.041,0.439l0.565,0.572l0.05,0.013l0.346,0.39l-0.598,0.049
+		V8.101c-1-0.148-0.504-0.3-0.572-0.347c-0.145-0.097-0.51-0.342-0.51-0.342s-0.588,0.098-0.734,0.147
+		c-0.147,0.049-0.193,0.195-0.485,0.292c-0.294,0.098-0.43,0.244-0.527,0.39c-0.097,0.146-0.416,0.585-0.609,0.78
+		c-0.196,0.196-0.562,0.146-0.708,0.146c-0.147,0-0.854-0.195-0.854-0.195V8.145c0,0,0.098-0.464,0.049-0.61l0.429-0.072
+		l0.713-0.147l0.21-0.147l0.3-0.39c0,0-0.337-0.244-0.094-0.585c0.117-0.164,0.538-0.195,0.733-0.341
+		c0.194-0.146,0.489-0.244,0.489-0.244s0.342-0.292,0.683-0.634c0,0,0.244-0.147,0.536-0.245c0,0,0.83,0.732,0.977,0.732
+		c0.147,0,0.684-0.341,0.684-0.341s0.146-0.438,0.098-0.585c-0.049-0.146-0.293-0.634-0.293-0.634s-0.146,0.244-0.291,0.439
+		c-0.146,0.195-0.246,0.439-0.246,0.439s-0.684-0.047-0.731-0.193c-0.05-0.147-0.146-0.388-0.196-0.533
+		c-0.047-0.147-0.438-0.142-0.729-0.044c-0.294,0.098,0.047-0.526,0.047-0.526s0.294-0.368,0.488-0.368
+		c0.193,0,0.635-0.25,0.828-0.298c0.195-0.049,0.782-0.424,1.024-0.424c0.244,0,0.537-0.046,0.685-0.046c0.146,0,0.73,0,0.73,0
+		l1.023,0.069c0,0,0.879,0.4,0.584,0.596c0,0,0.344,0.25,0.49,0.396c0.137,0.138,0.49-0.108,0.693-0.221
+		c3.65,2.292,6.091,6.352,6.091,10.971c0,0.248-0.022,0.495-0.036,0.74C26.982,14.667,26.845,14.372,26.812,14.244z"/>
+	<polygon points="11.722,5.26 11.722,5.288 11.738,5.268 	"/>
+</g>
+</svg>

gpac-0.5.0.svn5178.tar.bz2/include/gpac/ait.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/ait.h Changed

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) TELECOM ParisTech 2011
  */
 
@@ -32,9 +32,9 @@
 } DESCRIPTOR_TAG;
 
 enum ApplicationControlCode {
-	AUTOSTART =				0x01, 
-	PRESENT = 				0x02, 
-	DESTROY =				0x03, 
+	AUTOSTART =				0x01,
+	PRESENT = 				0x02,
+	DESTROY =				0x03,
 	KILL =					0x04,
 	PREFETCH =				0x05,
 	REMOTE = 				0x06,
@@ -72,7 +72,7 @@
 typedef struct
 {
 	ABSTRACT_ES
-	GF_M2TS_SectionFilter *sec;	
+	GF_M2TS_SectionFilter *sec;
 
 } GF_M2TS_AIT_CARRY;
 
@@ -87,7 +87,7 @@
 	u8 application_descriptors_id[50];
 	u8 index_app_desc_id;
 
-}GF_M2TS_AIT_APPLICATION_DECODE;
+} GF_M2TS_AIT_APPLICATION_DECODE;
 
 
 typedef enum {
@@ -129,7 +129,7 @@
 	u8 descriptor_length;
 	char* initial_path_bytes;
 
-}GF_M2TS_SIMPLE_APPLICATION_LOCATION;
+} GF_M2TS_SIMPLE_APPLICATION_LOCATION;
 
 typedef struct
 {
@@ -141,19 +141,19 @@
 
 } GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE;
 
-typedef struct{
+typedef struct {
 
 	u8 URL_extension_length;
 	char* URL_extension_byte;
 
-}GF_M2TS_TRANSPORT_HTTP_URL_EXTENTION;
+} GF_M2TS_TRANSPORT_HTTP_URL_EXTENTION;
 
 typedef struct
 {
 	u8 URL_base_length;
 	char* URL_base_byte;
 	u8 URL_extension_count;
-	GF_M2TS_TRANSPORT_HTTP_URL_EXTENTION* URL_extentions;	
+	GF_M2TS_TRANSPORT_HTTP_URL_EXTENTION* URL_extentions;
 
 } GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE;
 
@@ -194,7 +194,7 @@
 } GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR;
 
 typedef struct
-{	
+{
 	u32 application_id;
 	u8 application_control_code;
 
@@ -211,7 +211,7 @@
 	/* Carousel */
 	u32 carousel_pid;
 	u32 component_tag;
-	
+
 
 	char* appli_name;
 
@@ -223,7 +223,7 @@
 	u32 version_number;
 	u32 ait_pid;
 	u32 nb_application;
-	GF_List *Application;	
+	GF_List *Application;
 
 } GF_M2TS_CHANNEL_APPLICATION_INFO;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/avparse.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/avparse.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -133,47 +133,56 @@
 
 enum
 {
-    GF_M4A_AAC_MAIN = 1,
-    GF_M4A_AAC_LC = 2,
-    GF_M4A_AAC_SSR = 3,
-    GF_M4A_AAC_LTP = 4,
-    GF_M4A_AAC_SBR = 5,
-    GF_M4A_AAC_SCALABLE = 6,
-    GF_M4A_TWINVQ = 7,
-    GF_M4A_CELP = 8, 
-    GF_M4A_HVXC = 9,
-    GF_M4A_TTSI = 12,
-    GF_M4A_MAIN_SYNTHETIC = 13,
-    GF_M4A_WAVETABLE_SYNTHESIS = 14,
-    GF_M4A_GENERAL_MIDI = 15,
-    GF_M4A_ALGO_SYNTH_AUDIO_FX = 16,
-    GF_M4A_ER_AAC_LC = 17,
-    GF_M4A_ER_AAC_LTP = 19,
-    GF_M4A_ER_AAC_SCALABLE = 20,
-    GF_M4A_ER_TWINVQ = 21,
-    GF_M4A_ER_BSAC = 22,
-    GF_M4A_ER_AAC_LD = 23,
-    GF_M4A_ER_CELP = 24,
-    GF_M4A_ER_HVXC = 25,
-    GF_M4A_ER_HILN = 26,
-    GF_M4A_ER_PARAMETRIC = 27,
-    GF_M4A_SSC = 28,
-    GF_M4A_AAC_PS = 29,
-    GF_M4A_LAYER1 = 32,
-    GF_M4A_LAYER2 = 33,
-    GF_M4A_LAYER3 = 34,
-    GF_M4A_DST = 35,
-    GF_M4A_ALS = 36
+	GF_M4A_AAC_MAIN = 1,
+	GF_M4A_AAC_LC = 2,
+	GF_M4A_AAC_SSR = 3,
+	GF_M4A_AAC_LTP = 4,
+	GF_M4A_AAC_SBR = 5,
+	GF_M4A_AAC_SCALABLE = 6,
+	GF_M4A_TWINVQ = 7,
+	GF_M4A_CELP = 8,
+	GF_M4A_HVXC = 9,
+	GF_M4A_TTSI = 12,
+	GF_M4A_MAIN_SYNTHETIC = 13,
+	GF_M4A_WAVETABLE_SYNTHESIS = 14,
+	GF_M4A_GENERAL_MIDI = 15,
+	GF_M4A_ALGO_SYNTH_AUDIO_FX = 16,
+	GF_M4A_ER_AAC_LC = 17,
+	GF_M4A_ER_AAC_LTP = 19,
+	GF_M4A_ER_AAC_SCALABLE = 20,
+	GF_M4A_ER_TWINVQ = 21,
+	GF_M4A_ER_BSAC = 22,
+	GF_M4A_ER_AAC_LD = 23,
+	GF_M4A_ER_CELP = 24,
+	GF_M4A_ER_HVXC = 25,
+	GF_M4A_ER_HILN = 26,
+	GF_M4A_ER_PARAMETRIC = 27,
+	GF_M4A_SSC = 28,
+	GF_M4A_AAC_PS = 29,
+	GF_M4A_LAYER1 = 32,
+	GF_M4A_LAYER2 = 33,
+	GF_M4A_LAYER3 = 34,
+	GF_M4A_DST = 35,
+	GF_M4A_ALS = 36
 };
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
 static const u32 GF_M4ASampleRates[] =
 {
-    96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 
+	96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
 	16000, 12000, 11025, 8000, 7350, 0, 0, 0
 };
 
+/*new values should now be defined in 23001-8*/
+static const u32 GF_M4ANumChannels[] =
+{
+	1, 2, 3, 4, 5, 6, 8, 2, 3, 4, 7, 8, 24, 8, 12, 10, 12, 14
+};
+
+/*returns channel config value (as written in AAC DSI) for the given number of channels*/
+u32 gf_m4a_get_channel_cfg(u32 nb_chan);
+
 /*get Audio type from dsi. return audio codec type:*/
 typedef struct
 {
@@ -210,12 +219,14 @@
 	u32 sample_rate;
 	u32 framesize;
 	u32 channels;
+	u16 substreams; //bit-mask, used for channel map > 5.1
 	/*only set if full parse*/
 	u8 fscod, bsid, bsmod, acmod, lfon, brcode;
 } GF_AC3Header;
 
 Bool gf_ac3_parser(u8 *buffer, u32 buffer_size, u32 *pos, GF_AC3Header *out_hdr, Bool full_parse);
 Bool gf_ac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse);
+Bool gf_eac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse);
 u32 gf_ac3_get_channels(u32 acmod);
 u32 gf_ac3_get_bitrate(u32 brcode);
 
@@ -230,7 +241,7 @@
 
 
 
-/*gets image size (bs must contain the whole image) 
+/*gets image size (bs must contain the whole image)
 @OTI: image type (JPEG=0x6C, PNG=0x6D)
 @width, height: image resolution - for jpeg max size if thumbnail included*/
 void gf_img_parse(GF_BitStream *bs, u8 *OTI, u32 *mtype, u32 *width, u32 *height, char **dsi, u32 *dsi_len);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/base_coding.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/base_coding.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/bifs.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/bifs.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,7 +40,7 @@
 
 typedef struct __tag_bifs_dec GF_BifsDecoder;
 
-/*BIFS decoder constructor - 
+/*BIFS decoder constructor -
  @command_dec: if set, the decoder will only work in memory mode (creating commands for the graph)
  otherwise the decoder will always apply commands while decoding them*/
 GF_BifsDecoder *gf_bifs_decoder_new(GF_SceneGraph *scenegraph, Bool command_dec);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/bitstream.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/bitstream.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -61,17 +61,17 @@
  *
  *	Constructs a bitstream from a buffer (read or write mode)
  *	\param buffer buffer to read or write. In WRITE mode, this can be NULL to let the bitstream object dynamically allocate memory, in which case the size param is ignored.
- *	\param size size of the buffer given. 
+ *	\param size size of the buffer given.
  *	\param mode operation mode for this bitstream: GF_BITSTREAM_READ for read, GF_BITSTREAM_WRITE for write.
  *	\return new bitstream object
- *	\note In write mode on an existing data buffer, data overflow is never signaled but simply ignored, it is the caller responsability to ensure it 
+ *	\note In write mode on an existing data buffer, data overflow is never signaled but simply ignored, it is the caller responsability to ensure it
  *	does not write more than possible.
  */
 GF_BitStream *gf_bs_new(const char *buffer, u64 size, u32 mode);
 /*!
  *	\brief bitstream constructor from file handle
  *
- * Creates a bitstream from a file handle. 
+ * Creates a bitstream from a file handle.
  * \param f handle of the file to use. This handle must be created with binary mode.
  *	\param mode operation mode for this bitstream: GF_BITSTREAM_READ for read, GF_BITSTREAM_WRITE for write.
  *	\return new bitstream object
@@ -92,8 +92,8 @@
 /*!
  *	\brief sets bitstream write cache size
  *
- * Sets the write cache size for file-based bitstreams.  
- *	\param bs the target bitstream 
+ * Sets the write cache size for file-based bitstreams.
+ *	\param bs the target bitstream
  *	\param size size of the write cache in bytes
  *	\return error if any.
  */
@@ -103,8 +103,8 @@
 /*!
  *	\brief gets bitstream write cache size
  *
- * Gets the write cache size for file-based bitstreams.  
- *	\param bs the target bitstream 
+ * Gets the write cache size for file-based bitstreams.
+ *	\param bs the target bitstream
  *	\return size of the write cache in bytes, 0 if no cache
  */
 u32 gf_bs_get_output_buffering(GF_BitStream *bs);
@@ -113,7 +113,7 @@
  *	\brief integer reading
  *
  *	Reads an integer coded on a number of bit.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param nBits the number of bits to read
  *	\return the integer value read.
  */
@@ -122,7 +122,7 @@
  *	\brief large integer reading
  *
  *	Reads a large integer coded on a number of bit bigger than 32.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param nBits the number of bits to read
  *	\return the large integer value read.
  */
@@ -131,7 +131,7 @@
  *	\brief float reading
  *
  *	Reads a float coded as IEEE 32 bit format.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the float value read.
  */
 Float gf_bs_read_float(GF_BitStream *bs);
@@ -139,7 +139,7 @@
  *	\brief double reading
  *
  *	Reads a double coded as IEEE 64 bit format.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the double value read.
  */
 Double gf_bs_read_double(GF_BitStream *bs);
@@ -147,7 +147,7 @@
  *	\brief data reading
  *
  *	Reads a data buffer
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param data the data buffer to be filled
  *	\param nbBytes the amount of bytes to read
  *	\return the number of bytes actually read.
@@ -160,7 +160,7 @@
  *
  *	Reads an integer coded on 8 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the char value read.
  */
 u32 gf_bs_read_u8(GF_BitStream *bs);
@@ -171,7 +171,7 @@
  *	Reads an integer coded on 8 bits starting at a byte boundary in the bitstream until
  *  the given appears on the bitstream.
  *	\note the bytes read in the bitstream will only be update if the delimiter is found
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param delimiter the stop condition
  *  \param out the resulting value
  *  \param max_length the maximum length of the output
@@ -184,7 +184,7 @@
  *
  *	Reads an integer coded on 16 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the short value read.
  */
 u32 gf_bs_read_u16(GF_BitStream *bs);
@@ -193,7 +193,7 @@
  *
  *	Reads an integer coded on 24 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the integer value read.
  */
 u32 gf_bs_read_u24(GF_BitStream *bs);
@@ -202,7 +202,7 @@
  *
  *	Reads an integer coded on 32 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the integer value read.
  */
 u32 gf_bs_read_u32(GF_BitStream *bs);
@@ -211,7 +211,7 @@
  *
  *	Reads an integer coded on 64 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the large integer value read.
  */
 u64 gf_bs_read_u64(GF_BitStream *bs);
@@ -219,7 +219,7 @@
  *	\brief little endian integer reading
  *
  *	Reads an integer coded on 32 bits in little-endian order.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the integer value read.
  */
 u32 gf_bs_read_u32_le(GF_BitStream *bs);
@@ -227,7 +227,7 @@
  *	\brief little endian integer reading
  *
  *	Reads an integer coded on 16 bits in little-endian order.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the integer value read.
  */
 u16 gf_bs_read_u16_le(GF_BitStream *bs);
@@ -237,7 +237,7 @@
  *	\brief variable length integer reading
  *
  *	Reads an integer coded on a variable number of 4-bits chunks. The number of chunks is given by the number of non-0 bits at the begining.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the integer value read.
  */
 u32 gf_bs_read_vluimsbf5(GF_BitStream *bs);
@@ -246,7 +246,7 @@
  *	\brief bit position
  *
  *	Returns current bit position in the bitstream - only works in memory mode.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the integer value read.
  */
 u32 gf_bs_get_bit_offset(GF_BitStream *bs);
@@ -255,7 +255,7 @@
  *	\brief current bit position
  *
  *	Returns bit position in the current byte of the bitstream - only works in memory mode.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\return the integer value read.
  */
 u32 gf_bs_get_bit_position(GF_BitStream *bs);
@@ -265,7 +265,7 @@
  *	\brief integer writing
  *
  *	Writes an integer on a given number of bits.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the integer to write
  *	\param nBits number of bits used to code the integer
  */
@@ -274,7 +274,7 @@
  *	\brief large integer writing
  *
  *	Writes an integer on a given number of bits greater than 32.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the large integer to write
  *	\param nBits number of bits used to code the integer
  */
@@ -283,7 +283,7 @@
  *	\brief float writing
  *
  *	Writes a float in IEEE 32 bits format.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the float to write
  */
 void gf_bs_write_float(GF_BitStream *bs, Float value);
@@ -291,7 +291,7 @@
  *	\brief double writing
  *
  *	Writes a double in IEEE 64 bits format.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the double to write
  */
 void gf_bs_write_double(GF_BitStream *bs, Double value);
@@ -299,7 +299,7 @@
  *	\brief data writing
  *
  *	Writes a data buffer.
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param data the data to write
  *	\param nbBytes number of data bytes to write
  */
@@ -310,7 +310,7 @@
  *
  *	Writes an integer on 8 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the char value to write
  */
 void gf_bs_write_u8(GF_BitStream *bs, u32 value);
@@ -319,7 +319,7 @@
  *
  *	Writes an integer on 16 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the short value to write
  */
 void gf_bs_write_u16(GF_BitStream *bs, u32 value);
@@ -328,7 +328,7 @@
  *
  *	Writes an integer on 24 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the integer value to write
  */
 void gf_bs_write_u24(GF_BitStream *bs, u32 value);
@@ -337,7 +337,7 @@
  *
  *	Writes an integer on 32 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the integer value to write
  */
 void gf_bs_write_u32(GF_BitStream *bs, u32 value);
@@ -347,7 +347,7 @@
  *
  *	Writes an integer on 64 bits starting at a byte boundary in the bitstream.
  *	\warning you must not use this function if the bitstream is not aligned
- *	\param bs the target bitstream 
+ *	\param bs the target bitstream
  *	\param value the large integer value to write
  */
 void gf_bs_write_u64(GF_BitStream *bs, u64 value);
@@ -415,7 +415,7 @@
  *	\param bs the target bitstream
  *	\param output address of a memory block to be allocated for bitstream data.
  *	\param outSize set to the size of the allocated memory block.
- *	\note 
+ *	\note
 	* It is the user responsability to destroy the allocated buffer
 	* Once this function has been called, the internal bitstream buffer is reseted.
  */
@@ -449,7 +449,7 @@
 void gf_bs_truncate(GF_BitStream *bs);
 
 /*!
- *\brief bit peeking 
+ *\brief bit peeking
  *
  *Peeks a given number of bits (read without moving the position indicator) for read modes only.
  *\param bs the target bitstream

gpac-0.5.0.svn5178.tar.bz2/include/gpac/cache.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/cache.h Changed

@@ -1,7 +1,7 @@
 /*
  *                      GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre, Pierre Souchay 
+ *			Authors: Jean Le Feuvre, Pierre Souchay
  *			Copyright (c) Telecom ParisTech 2000-2012
  *                                      All rights reserved
  *
@@ -48,191 +48,191 @@
 
 #include <gpac/tools.h>
 
-    /**
-     * Handle for Cache Entries.
-     * You can use the gf_cache_get_* functions to get the cache properties
-     */
-    typedef struct __DownloadedCacheEntryStruct * DownloadedCacheEntry;
-
-
-    typedef struct __CacheReaderStruct * GF_CacheReader;
-
-    /**
-     * 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
-     */
-    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
-     */
-    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
-     */
-    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)
-     */
-    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
-     */
-    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)
-     */
-    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
-     */
-    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)
-     */
-    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
-     */
-    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
-     */
-    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)
-     */
-    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
-     */
-    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
-     */
-    GF_Err gf_cache_flush_disk_cache( const DownloadedCacheEntry entry );
-
-    GF_Err gf_cache_set_content_length( const DownloadedCacheEntry entry, u32 length );
-
-    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
-     */
-    GF_Err appendHttpCacheHeaders(const DownloadedCacheEntry entry, char * httpRequest);
-
-    /*
-     * Cache Management functions
-     */
-
-    /*!
-     * 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);
+/**
+ * Handle for Cache Entries.
+ * You can use the gf_cache_get_* functions to get the cache properties
+ */
+typedef struct __DownloadedCacheEntryStruct * DownloadedCacheEntry;
+
+
+typedef struct __CacheReaderStruct * GF_CacheReader;
+
+/**
+ * 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
+ */
+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
+ */
+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
+ */
+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)
+ */
+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
+ */
+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)
+ */
+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
+ */
+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)
+ */
+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
+ */
+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
+ */
+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)
+ */
+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
+ */
+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
+ */
+GF_Err gf_cache_flush_disk_cache( const DownloadedCacheEntry entry );
+
+GF_Err gf_cache_set_content_length( const DownloadedCacheEntry entry, u32 length );
+
+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
+ */
+GF_Err appendHttpCacheHeaders(const DownloadedCacheEntry entry, char * httpRequest);
+
+/*
+ * Cache Management functions
+ */
+
+/*!
+ * 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);
+
+Bool gf_cache_check_if_cache_file_is_corrupted(const DownloadedCacheEntry entry);
 
-    Bool gf_cache_check_if_cache_file_is_corrupted(const DownloadedCacheEntry entry);
-
-    void gf_cache_entry_set_delete_files_when_deleted(const DownloadedCacheEntry entry);
+void gf_cache_entry_set_delete_files_when_deleted(const DownloadedCacheEntry entry);
 
-    Bool gf_cache_entry_is_delete_files_when_deleted(const DownloadedCacheEntry entry);
+Bool gf_cache_entry_is_delete_files_when_deleted(const DownloadedCacheEntry entry);
 
-    u32 gf_cache_get_sessions_count_for_cache_entry(const DownloadedCacheEntry entry);
+u32 gf_cache_get_sessions_count_for_cache_entry(const DownloadedCacheEntry entry);
 
-	u64 gf_cache_get_start_range( const DownloadedCacheEntry entry );
-	u64 gf_cache_get_end_range( const DownloadedCacheEntry entry );
+u64 gf_cache_get_start_range( const DownloadedCacheEntry entry );
+u64 gf_cache_get_end_range( const DownloadedCacheEntry entry );
 
 /*! @} */

gpac-0.5.0.svn5178.tar.bz2/include/gpac/color.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/color.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,7 +32,7 @@
 #endif
 
 #include <gpac/constants.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 
 
 /*!
@@ -56,10 +56,10 @@
 	u32 width;
 	/*!Height of the video framebuffer */
 	u32 height;
-	/*!Horizontal pitch of the video framebuffer (number of bytes to skip to go to next (right) pixel in the buffer). May be 
+	/*!Horizontal pitch of the video framebuffer (number of bytes to skip to go to next (right) pixel in the buffer). May be
 	negative for some framebuffers (embedded devices). 0 means linear frame buffer (pitch_x==bytes per pixel)*/
 	s32 pitch_x;
-	/*!Vertical pitch of the video framebuffer (number of bytes to skip to go down one line in the buffer). May be 
+	/*!Vertical pitch of the video framebuffer (number of bytes to skip to go down one line in the buffer). May be
 	negative for some framebuffers (embedded devices)*/
 	s32 pitch_y;
 	/*!Pixel format of the video framebuffer*/
@@ -144,14 +144,26 @@
 /*!\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) )
 
+/*!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
+*/
+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
+*/
+const char *gf_color_get_name(GF_Color col);
+
 /*!Inits a color matrix to identity*/
 void gf_cmx_init(GF_ColorMatrix *_this);
-/*!Inits all coefficients of a color matrix 
+/*!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 
+/*!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
@@ -174,11 +186,11 @@
  *\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);
+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
@@ -249,15 +261,15 @@
  * 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 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
  *\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);
+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);
 
 /*! @} */

gpac-0.5.0.svn5178.tar.bz2/include/gpac/compositor.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/compositor.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,7 +40,7 @@
 
 typedef struct __tag_compositor GF_Compositor;
 
-/*creates default compositor 
+/*creates default compositor
 if self_threaded, video compositor uses a dedicated thread, otherwise visual rendering is done by the user
 audio compositor always runs in its own thread if enabled
 term may be NULL, in which case InputSensors won't be enabled
@@ -60,7 +60,7 @@
 /*inits rendering info for the node - shall be called for all nodes the parent system doesn't handle*/
 void gf_sc_on_node_init(GF_Compositor *sr, GF_Node *node);
 
-/*notify the given node has been modified. The compositor filters object to decide whether the scene graph has to be 
+/*notify the given node has been modified. The compositor filters object to decide whether the scene graph has to be
 traversed or not- if object is NULL, this means complete traversing of the graph is requested (use carefully since it
 can be a time consuming operation)*/
 void gf_sc_invalidate(GF_Compositor *sr, GF_Node *byObj);
@@ -80,7 +80,7 @@
 Bool gf_sc_user_event(GF_Compositor *sr, GF_Event *event);
 
 /*maps screen coordinates to bifs 2D coordinates for the current zoom/pan settings
-X and Y are point coordinates in the display expressed in BIFS-like fashion (0,0) at center of 
+X and Y are point coordinates in the display expressed in BIFS-like fashion (0,0) at center of
 display and Y increasing from bottom to top*/
 void gf_sc_map_point(GF_Compositor *sr, s32 X, s32 Y, Fixed *bifsX, Fixed *bifsY);
 
@@ -104,7 +104,7 @@
 
 GF_Err gf_sc_paste_text(GF_Compositor *compositor, const char *text);
 
-/*user-define management: this is used for instant visual rendering of the scene graph, 
+/*user-define management: this is used for instant visual rendering of the scene graph,
 for exporting or authoring tools preview. User is responsible for calling render when desired and shall also maintain
 scene timing*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/config_file.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/config_file.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,16 +35,16 @@
  *	\brief configuration file functions.
  */
 
- /*!
- *	\addtogroup cfg_grp configuration
- *	\ingroup utils_grp
- *	\brief Configuration File object
- *
- *	This section documents the configuration file object of the GPAC framework.
- *	This file is formatted as the INI file mode of WIN32 in sections and keys.\n
- *\note For more information on the GPAC configuration file itself, please refer to the GPAC configuration help provided with GPAC.
- *	@{
- */
+/*!
+*	\addtogroup cfg_grp configuration
+*	\ingroup utils_grp
+*	\brief Configuration File object
+*
+*	This section documents the configuration file object of the GPAC framework.
+*	This file is formatted as the INI file mode of WIN32 in sections and keys.\n
+*\note For more information on the GPAC configuration file itself, please refer to the GPAC configuration help provided with GPAC.
+*	@{
+*/
 
 #include <gpac/tools.h>
 
@@ -55,7 +55,7 @@
  *	\brief configuration file initialization
  *
  * Constructs a configuration file from fileName. if fileName is NULL, the default GPAC configuration file is loaded.
- * If no configuration file is found, a default configuration file is created with the proper module directory, font directory 
+ * If no configuration file is found, a default configuration file is created with the proper module directory, font directory
  * and other default options.
  *\param file name of the configuration file, or NULL for default file
  *\param new_cfg Boolean set to true if a new configuration file has been created
@@ -173,7 +173,7 @@
 /*!
  *	\brief key insertion
  *
- *Inserts a new key in a given section. Returns an error if a key with the given name 
+ *Inserts a new key in a given section. Returns an error if a key with the given name
  *already exists in the section
  *\param cfgFile the target configuration file
  *\param secName the target section

gpac-0.5.0.svn5178.tar.bz2/include/gpac/configuration.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/configuration.h Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2008-2012
  *					All rights reserved
  *
- *  This file is part of GPAC 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,7 +34,7 @@
 
 
 /*visual studio and xcode*/
-#if defined(WIN32) || defined(_WIN32_WCE) || defined(GPAC_CONFIG_DARWIN) 
+#if defined(WIN32) || defined(_WIN32_WCE) || defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_ANDROID)
 
 /*enables GPAC memory tracking in debug mode only*/
 #if defined(DEBUG) || defined(_DEBUG)
@@ -50,8 +50,10 @@
 #define GPAC_HAS_SPIDERMONKEY
 #ifdef GPAC_CONFIG_DARWIN
 #define MOZILLA_1_8_BRANCH
+#ifndef XP_UNIX
 #define XP_UNIX
 #endif
+#endif
 
 /*libjpeg enabled*/
 #define GPAC_HAS_JPEG
@@ -90,6 +92,21 @@
 #endif  //end OSX flags
 
 
+//Android test compilation without any extra lib
+#if defined(GPAC_CONFIG_ANDROID)
+#define GPAC_ANDROID
+
+#define GPAC_HAS_IPV6
+#define GPAC_USE_OGL_ES
+#define GPAC_FIXED_POINT
+
+#undef GPAC_HAS_SPIDERMONKEY
+#undef GPAC_HAS_PNG
+#undef GPAC_HAS_JPEG
+
+#endif  //end OSX flags
+
+
 
 //WinCE flags
 #if defined(_WIN32_WCE)
@@ -133,9 +150,17 @@
 #define GPAC_HAS_GLU
 #endif
 
-#if defined(_WIN64)
-#define GPAC_X64
-#endif
+/*disables player */
+//#define GPAC_DISABLE_PLAYER
+
+/*disables scene manager */
+//#define GPAC_DISABLE_SMGR
+
+/*disables core tools */
+//#define GPAC_DISABLE_CORE_TOOLS
+
+/*disables core tools */
+//#define GPAC_DISABLE_ZLIB
 
 /*disables SVG scene graph*/
 //#define GPAC_DISABLE_SVG
@@ -154,6 +179,7 @@
 
 /*disables LASeR coder*/
 //#define GPAC_DISABLE_LASER
+//#define GPAC_DISABLE_SAF
 
 /*disables BIFS Engine support - TODO - merge DIMS and LASeR into BENG and rename it*/
 //#define GPAC_DISABLE_SENG
@@ -218,6 +244,9 @@
 /*disables ISO FF fragments*/
 //#define GPAC_DISABLE_ISOM_FRAGMENTS
 
+/*disables scene graph */
+//GPAC_DISABLE_SCENEGRAPH
+
 /*disables scene graph textual dump*/
 //#define GPAC_DISABLE_SCENE_DUMP
 
@@ -236,5 +265,17 @@
 /*disables Timed Text support */
 //#define GPAC_DISABLE_TTXT
 
+/*disables TTML */
+//#define GPAC_DISABLE_TTML
+
+/*disables DASH MPD */
+//#define GPAC_DISABLE_MPD
+
+/*disables HEVC */
+//#define GPAC_DISABLE_HEVC
+
+/*disables VOBSUB */
+//#define GPAC_DISABLE_VOBSUB
+
 #endif		/*_GF_CONFIG_H_*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/constants.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/constants.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -40,6 +40,22 @@
  *	@{
  */
 
+/*!
+ *	\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
@@ -75,6 +91,9 @@
 	GF_STREAM_FONT		= 0x0C,
 	/*!MPEG-4 Streaming Text Stream*/
 	GF_STREAM_TEXT		= 0x0D,
+
+	/* From 0x20 to Ox3F, this is the user private range */
+
 	/*!Nero Digital Subpicture Stream*/
 	GF_STREAM_ND_SUBPIC = 0x38,
 
@@ -106,7 +125,7 @@
 	/*!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 
+	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
@@ -115,7 +134,7 @@
 	*/
 	GF_STREAM_PRIVATE_MEDIA	= 0x21,
 
-	/*used internally to signal the the OTI carries a 4CC code, typically media subtype (stsd entry in file format)*/
+	/*used internally to signal that the OTI carries a 4CC code, typically media subtype (stsd entry in file format)*/
 	GF_STREAM_4CC		= 0xF0
 };
 
@@ -183,13 +202,13 @@
 	/*!32 bit RGBA (openGL like). Component ordering in bytes is R-G-B-A.*/
 	GF_PIXEL_RGBA		=	GF_4CC('R','G','B', 'A'),
 	/*!RGB24 + depth plane. Component ordering in bytes is R-G-B-D.*/
-    GF_PIXEL_RGBD		=	GF_4CC('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).*/
-    GF_PIXEL_RGBDS		=	GF_4CC('3', 'C', 'D', 'S'),
+	GF_PIXEL_RGBDS		=	GF_4CC('3', 'C', 'D', 'S'),
 	/*!Stereo RGB24 */
-    GF_PIXEL_RGBS		=	GF_4CC('R', 'G', 'B', 'S'),
+	GF_PIXEL_RGBS		=	GF_4CC('R', 'G', 'B', 'S'),
 	/*!Stereo RGBA. Component ordering in bytes is R-G-B-A. */
-    GF_PIXEL_RGBAS		=	GF_4CC('R', 'G', 'A', 'S'),
+	GF_PIXEL_RGBAS		=	GF_4CC('R', 'G', 'A', 'S'),
 
 	/*internal format for OpenGL using pachek RGB 24 bit plus planaer depth plane at the end of the image*/
 	GF_PIXEL_RGB_24_DEPTH = GF_4CC('R', 'G', 'B', 'd'),
@@ -255,11 +274,11 @@
 	GPAC_OTI_SCENE_BIFS_EXTENDED = 0x04,
 	/*!OTI for AFX streams with AFXConfig*/
 	GPAC_OTI_SCENE_AFX = 0x05,
-    /*!OTI for Font data streams */
+	/*!OTI for Font data streams */
 	GPAC_OTI_FONT = 0x06,
-    /*!OTI for synthesized texture streams */
+	/*!OTI for synthesized texture streams */
 	GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE = 0x07,
-    /*!OTI for streaming text streams */
+	/*!OTI for streaming text streams */
 	GPAC_OTI_TEXT_MPEG4 = 0x08,
 	/*!OTI for LASeR streams*/
 	GPAC_OTI_SCENE_LASER = 0x09,
@@ -279,105 +298,105 @@
 	/*!OTI for HEVC layered streams*/
 	GPAC_OTI_VIDEO_SHVC = 0x25,
 	/*!OTI for MPEG-4 AAC streams*/
-    GPAC_OTI_AUDIO_AAC_MPEG4 = 0x40,
+	GPAC_OTI_AUDIO_AAC_MPEG4 = 0x40,
 
 	/*!OTI for MPEG-2 Visual Simple Profile streams*/
-    GPAC_OTI_VIDEO_MPEG2_SIMPLE = 0x60,
+	GPAC_OTI_VIDEO_MPEG2_SIMPLE = 0x60,
 	/*!OTI for MPEG-2 Visual Main Profile streams*/
-    GPAC_OTI_VIDEO_MPEG2_MAIN = 0x61,
+	GPAC_OTI_VIDEO_MPEG2_MAIN = 0x61,
 	/*!OTI for MPEG-2 Visual SNR Profile streams*/
-    GPAC_OTI_VIDEO_MPEG2_SNR = 0x62,
+	GPAC_OTI_VIDEO_MPEG2_SNR = 0x62,
 	/*!OTI for MPEG-2 Visual SNR Profile streams*/
-    GPAC_OTI_VIDEO_MPEG2_SPATIAL = 0x63,
+	GPAC_OTI_VIDEO_MPEG2_SPATIAL = 0x63,
 	/*!OTI for MPEG-2 Visual SNR Profile streams*/
-    GPAC_OTI_VIDEO_MPEG2_HIGH = 0x64,
+	GPAC_OTI_VIDEO_MPEG2_HIGH = 0x64,
 	/*!OTI for MPEG-2 Visual SNR Profile streams*/
-    GPAC_OTI_VIDEO_MPEG2_422 = 0x65,
+	GPAC_OTI_VIDEO_MPEG2_422 = 0x65,
 
 
 	/*!OTI for MPEG-2 AAC Main Profile streams*/
-    GPAC_OTI_AUDIO_AAC_MPEG2_MP = 0x66,
+	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 Scaleable Sampling Rate Profile streams*/
-    GPAC_OTI_AUDIO_AAC_MPEG2_SSRP = 0x68,
+	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,
+	GPAC_OTI_AUDIO_MPEG2_PART3 = 0x69,
 	/*!OTI for MPEG-1 Video streams*/
-    GPAC_OTI_VIDEO_MPEG1 = 0x6A,
+	GPAC_OTI_VIDEO_MPEG1 = 0x6A,
 	/*!OTI for MPEG-1 Audio streams*/
-    GPAC_OTI_AUDIO_MPEG1 = 0x6B,
+	GPAC_OTI_AUDIO_MPEG1 = 0x6B,
 	/*!OTI for JPEG streams*/
-    GPAC_OTI_IMAGE_JPEG = 0x6C,
+	GPAC_OTI_IMAGE_JPEG = 0x6C,
 	/*!OTI for PNG streams*/
-    GPAC_OTI_IMAGE_PNG = 0x6D,
+	GPAC_OTI_IMAGE_PNG = 0x6D,
 	/*!OTI for JPEG-2000 streams*/
-    GPAC_OTI_IMAGE_JPEG_2000 = 0x6E,
-
-/*!
- * \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,
+	GPAC_OTI_IMAGE_JPEG_2000 = 0x6E,
+
+	/*!
+	 * \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 EVRC Voice streams*/
+	GPAC_OTI_AUDIO_EVRC_VOICE = 0xA0,
 	/*!OTI for SMV Voice streams*/
-    GPAC_OTI_AUDIO_SMV_VOICE = 0xA1,
+	GPAC_OTI_AUDIO_SMV_VOICE = 0xA1,
 	/*!OTI for 3GPP2 CMF streams*/
-    GPAC_OTI_3GPP2_CMF = 0xA2,
+	GPAC_OTI_3GPP2_CMF = 0xA2,
 	/*!OTI for SMPTE VC-1 Video streams*/
-    GPAC_OTI_VIDEO_SMPTE_VC1 = 0xA3,
+	GPAC_OTI_VIDEO_SMPTE_VC1 = 0xA3,
 	/*!OTI for Dirac Video streams*/
-    GPAC_OTI_VIDEO_DIRAC = 0xA4,
+	GPAC_OTI_VIDEO_DIRAC = 0xA4,
 	/*!OTI for AC-3 audio streams*/
-    GPAC_OTI_AUDIO_AC3 = 0xA5,
+	GPAC_OTI_AUDIO_AC3 = 0xA5,
 	/*!OTI for enhanced AC-3 audio streams*/
-    GPAC_OTI_AUDIO_AC3_ENHANCED = 0xA6,
+	GPAC_OTI_AUDIO_EAC3 = 0xA6,
 	/*!OTI for DRA audio streams*/
-    GPAC_OTI_AUDIO_DRA = 0xA7,
+	GPAC_OTI_AUDIO_DRA = 0xA7,
 	/*!OTI for ITU G719 audio streams*/
-    GPAC_OTI_AUDIO_ITU_G719 = 0xA8,
+	GPAC_OTI_AUDIO_ITU_G719 = 0xA8,
 	/*!OTI for DTS Coherent Acoustics audio streams*/
-    GPAC_OTI_AUDIO_DTS_CA = 0xA9,
+	GPAC_OTI_AUDIO_DTS_CA = 0xA9,
 	/*!OTI for DTS-HD High Resolution audio streams*/
-    GPAC_OTI_AUDIO_DTS_HD_HR = 0xAA,
+	GPAC_OTI_AUDIO_DTS_HD_HR = 0xAA,
 	/*!OTI for DTS-HD Master audio streams*/
-    GPAC_OTI_AUDIO_DTS_HD_MASTER = 0xAB,
+	GPAC_OTI_AUDIO_DTS_HD_MASTER = 0xAB,
 
-    /*!OTI for dummy streams (dsi = file name) using the generic context loader (BIFS/VRML/SWF/...) - GPAC internal*/
+	/*!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,
@@ -405,49 +424,49 @@
 	/*!OTI for streaming simple text from MP4- GPAC internal*/
 	GPAC_OTI_SCENE_SIMPLE_TEXT_MP4 = 0xD5,
 
-/*!
- * \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) {
-		bit(16) packet_size;
-		char packet[packet_size];
-		dsi_size -= packet_size;
-	}\endcode
-*/
-    GPAC_OTI_MEDIA_OGG = 0xDD,
-    GPAC_OTI_MEDIA_THEORA = 0xDF,
+	/*!
+	 * \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) {
+			bit(16) packet_size;
+			char packet[packet_size];
+			dsi_size -= packet_size;
+		}\endcode
+	*/
+	GPAC_OTI_MEDIA_OGG = 0xDD,
+	GPAC_OTI_MEDIA_THEORA = 0xDF,
 
-    GPAC_OTI_MEDIA_SUBPIC = 0xE0,
+	GPAC_OTI_MEDIA_SUBPIC = 0xE0,
 
-    /*!OTI for 13K Voice / QCELP audio streams*/
-    GPAC_OTI_AUDIO_13K_VOICE = 0xE1,
+	/*!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
+	*	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
 	*/
 	GPAC_OTI_RAW_MEDIA_STREAM = 0x101,
 
 	/*!OTI for LIBPLAYER private streams. The data pointer in the DSI is the libplayer handle object*/
-    GPAC_OTI_PRIVATE_MEDIA_LIBPLAYER = 0xF1
+	GPAC_OTI_PRIVATE_MEDIA_LIBPLAYER = 0xF1
 };

gpac-0.5.0.svn5178.tar.bz2/include/gpac/crypt.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/crypt.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -31,10 +31,10 @@
 
 /*
  * Copyright (C) 1998,1999,2000 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -67,7 +67,7 @@
 typedef struct _tag_crypt_stream GF_Crypt;
 
 /*supported modes (case insensitive): "CBC", "CFB", "CTR", "ECB", "nCFB", "nOFB", "OFB", "STREAM"*/
-/*supported algos (case insensitive): 
+/*supported algos (case insensitive):
 	"AES-128" == "Rijndael-128"
 	"AES-192" == "Rijndael-192"
 	"AES-256" == "Rijndael-256"
@@ -80,11 +80,11 @@
 /*close crypto context*/
 void gf_crypt_close(GF_Crypt *gfc);
 
-/* sets the state of the algorithm. Can be used only with block algorithms and certain modes like CBC, CFB etc. 
-It is usefully if you want to restart or start a different encryption quickly. 
+/* sets the state of the algorithm. Can be used only with block algorithms and certain modes like CBC, CFB etc.
+It is usefully if you want to restart or start a different encryption quickly.
 */
 GF_Err gf_crypt_set_state(GF_Crypt *gfc, const void *iv, int size);
-/*gets the state of the algorithm. Can be used only certain modes and algorithms. 
+/*gets the state of the algorithm. Can be used only certain modes and algorithms.
 The size will hold the size of the state and the state must have enough bytes to hold it.
 */
 GF_Err gf_crypt_get_state(GF_Crypt *gfc, void *iv, int *size);
@@ -101,12 +101,12 @@
 /*Returns the number of supported key sizes.
 @keys: array of at least MAX_KEY_SIZES size - will hold the supported sizes*/
 u32 gf_crypt_get_supported_key_sizes(GF_Crypt *gfc, u32 *key_sizes);
-/*Returns size (in bytes) of the IV of the algorithm specified for the context. 
-If it is '0' then the IV is ignored in that algorithm. 
+/*Returns size (in bytes) of the IV of the algorithm specified for the context.
+If it is '0' then the IV is ignored in that algorithm.
 IV is used in CBC, CFB, OFB modes, and in some algorithms in STREAM mode.
 */
 u32 gf_crypt_get_iv_size(GF_Crypt *gfc);
-/*Returns 1 if the mode needs an IV, 0 otherwise. 
+/*Returns 1 if the mode needs an IV, 0 otherwise.
 Some 'stream' algorithms may need an IV even if the mode itself does not need an IV.
 */
 Bool gf_crypt_mode_has_iv(GF_Crypt *gfc);
@@ -120,13 +120,13 @@
 
 /*
 This function initializes all buffers for the specified context
-@Lenofkey: key size in BYTES - maximum value of lenofkey should be the one obtained by 
+@Lenofkey: key size in BYTES - maximum value of lenofkey should be the one obtained by
 calling gf_crypt_get_key_size() and every value smaller than this is legal.
 @IV: usually size of the algorithms block size - get it by calling gf_crypt_get_iv_size().
 	IV is ignored in ECB. IV MUST exist in CFB, CBC, STREAM, nOFB and OFB modes.
 	It needs to be random and unique (but not secret). The same IV must be used
-	for encryption/decryption. 
-After calling this function you can use the descriptor for encryption or decryption (not both). 
+	for encryption/decryption.
+After calling this function you can use the descriptor for encryption or decryption (not both).
 */
 GF_Err gf_crypt_init(GF_Crypt *gfc, void *key, u32 lenofkey, const void *IV);
 /*releases context buffers - you may call gf_crypt_init after that, or gf_crypt_close*/
@@ -135,10 +135,10 @@
 GF_Err gf_crypt_set_key(GF_Crypt *gfc, void *key, u32 keysize, const void *iv);
 
 /*
-main encryption function. 
+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. 
+The plaintext is replaced by the ciphertext.
 */
 GF_Err gf_crypt_encrypt(GF_Crypt *gfc, void *plaintext, int len);
 /*decryption function. It is almost the same with gf_crypt_generic.*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/dash.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/dash.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -45,7 +45,7 @@
  */
 static const char * GF_DASH_M3U8_MIME_TYPES[] = { "video/x-mpegurl", "audio/x-mpegurl", "application/x-mpegurl", "application/vnd.apple.mpegurl", NULL};
 
-typedef enum 
+typedef enum
 {
 	/*event sent if an error occurs when setting up manifest*/
 	GF_DASH_EVENT_MANIFEST_INIT_ERROR,
@@ -62,6 +62,14 @@
 	GF_DASH_EVENT_BUFFER_DONE,
 
 	GF_DASH_EVENT_SEGMENT_AVAILABLE,
+
+	/*event sent when quality has been switched for the given group*/
+	GF_DASH_EVENT_QUALITY_SWITCH,
+
+	/*position in timeshift buffer has changed (eg, paused)*/
+	GF_DASH_EVENT_TIMESHIFT_UPDATE,
+	/*event sent when timeshift buffer is overflown - the group_idx param contains the max number of droped segments of all representations droped by the client, or -1 if play pos is ahead of live */
+	GF_DASH_EVENT_TIMESHIFT_OVERFLOW,
 } GF_DASHEventType;
 
 /*structure used for all IO operations for DASH*/
@@ -72,10 +80,14 @@
 {
 	/*user private data*/
 	void *udta;
-	
+
 	/*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 otheriwse
+	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*/
 	void (*delete_cache_file)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url);
 
@@ -96,7 +108,7 @@
 
 	/*get URL of the file - i tmay 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 UTL will be used when 
+	/*get the name of the cache file. If NULL is returned, the file cannot be cached and its associated UTL 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*/
@@ -130,14 +142,16 @@
 	@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, 
-						   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,
+                           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);
 
 /*delete the DASH client*/
 void gf_dash_del(GF_DashClient *dash);
@@ -163,7 +177,10 @@
 Double gf_dash_get_duration(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);
-
+/*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.
+*/
+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.*/
 u32 gf_dash_get_group_count(GF_DashClient *dash);
@@ -181,22 +198,54 @@
 void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select);
 
 /*performs selection of representations based on language code*/
-void gf_dash_groups_set_language(GF_DashClient *dash, const char *lang_3cc);
+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 tyhe 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 byte range of the next media resource to play in this group. 
+/*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, or NULL if none associated*/
+u32 gf_dash_group_get_audio_channels(GF_DashClient *dash, u32 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);
+
+/*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*/
+u32 gf_dash_get_timeshift_buffer_pos(GF_DashClient *dash);
+
+typedef enum
+{
+	GF_MPD_DESC_ACCESSIBILITY,
+	GF_MPD_DESC_AUDIOCONFIG,
+	GF_MPD_DESC_CONTENT_PROTECTION,
+	GF_MPD_DESC_ESSENTIAL_PROPERTIES,
+	GF_MPD_DESC_SUPPLEMENTAL_PROPERTIES,
+	GF_MPD_DESC_FRAME_PACKING,
+	GF_MPD_DESC_ROLE,
+	GF_MPD_DESC_RATING,
+	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
+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 
+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
 */
-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, 
-											s32 *switching_index, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range, 
-											const char **original_url, Bool *has_next_segment);
+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,
+        s32 *switching_index, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range,
+        const char **original_url, Bool *has_next_segment);
 
 /*same as gf_dash_group_get_next_segment_location but query the current downloaded segment*/
 GF_EXPORT
@@ -205,7 +254,9 @@
 /*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 */
+/*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*/
@@ -221,8 +272,8 @@
 
 /*returns 1 if the playback position is in the last period of the presentation*/
 Bool gf_dash_in_last_period(GF_DashClient *dash);
-/*return value: 
-	1 if the period switching has been requested (due to seeking), 
+/*return value:
+	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 stoped and restarted)
 	0 if no switching is requested
 */
@@ -231,15 +282,17 @@
 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)*/
 Bool gf_dash_in_period_setup(GF_DashClient *dash);
-/*seeks playback to the given time. If period changes, all playback is stopped and restarted*/
+/*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.*/
 void gf_dash_seek(GF_DashClient *dash, Double start_range);
-/*gets playback start range for the first segment to play after the seek has been done. This is the amount of data to skip from the first segment to be played*/
-Double gf_dash_get_playback_start_range(GF_DashClient *dash);
 /*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);
 
+/*sets playback speed of the session. Speed is used in adaptation logic*/
+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);
 
@@ -250,7 +303,7 @@
 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_buffering(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered);
+void gf_dash_get_buffer_info(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered);
 
 /*updates media bandwidth for the given group*/
 GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 idx);
@@ -273,22 +326,69 @@
 //shifts UTC clock of server by shift_utc_ms so that new UTC in MPD is old + shift_utc_ms
 void gf_dash_set_utc_shift(GF_DashClient *dash, s32 shift_utc_ms);
 
-//sets max resolution@bpp for all video 
+//sets max resolution@bpp for all video
 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.
 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 default value is 100 ms.
 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 @gf_dash_open. If group_index is <0 (default) no groups will be disabled. 
+//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);
 
 //indicates typical buffering used by the user app . This allows fetching data earlier in live mode, if the timeshiftbuffer allows for it
 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
+void gf_dash_set_switching_probe_count(GF_DashClient *dash, u32 switch_probe_count);
+
+/*returns active period start in ms*/
+u32 gf_dash_get_period_start(GF_DashClient *dash);
+/*returns active period duration in ms*/
+u32 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);
+
+
+typedef struct
+{
+	u32 bandwidth;
+	const char *ID;
+	const char *mime;
+	const char *codec;
+	u32 width;
+	u32 height;
+	Bool interlaced;
+	u32 fps_den, fps_num;
+	u32 par_num;
+	u32 par_den;
+	u32 sample_rate;
+	u32 nb_channels;
+	Bool disabled;
+	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);
+
+//returns 1 if automatic quality switching is enabled
+Bool gf_dash_get_automatic_switching(GF_DashClient *dash);
+
+//sets automatic quality switching enabled or disabled
+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);
+
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-0.5.0.svn5178.tar.bz2/include/gpac/download.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/download.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -52,494 +52,504 @@
 #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;
-
-    typedef struct GF_URL_Info_Struct {
-        const char * protocol;
-        char * server_name;
-        char * remotePath;
-        char * canonicalRepresentation;
-        char * userName;
-        char * password;
-        u16 port;
-    } 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
-     */
-    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
-     */
-    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
-     */
-    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
-    */
-    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
-     */
-    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.
-    */
-    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
-     */
-    void gf_dm_set_auth_callback(GF_DownloadManager *dm, gf_dm_get_usr_pass get_pass, void *usr_cbk);
-
-    /*!downloader session message types*/
-    typedef enum
-    {
-        /*!signal that session is setup and waiting for connection request*/
-        GF_NETIO_SETUP = 0,
-        /*!signal that session connection is done*/
-        GF_NETIO_CONNECTED,
-        /*!request a protocol method from the user. Default value is "GET" for HTTP*/
-        GF_NETIO_GET_METHOD,
-        /*!request a header from the user. */
-        GF_NETIO_GET_HEADER,
-        /*!requesting content from the user, if any. Content is appended to the request*/
-        GF_NETIO_GET_CONTENT,
-        /*!signal that request is sent and waiting for server reply*/
-        GF_NETIO_WAIT_FOR_REPLY,
-        /*!signal a header to user. */
-        GF_NETIO_PARSE_HEADER,
-        /*!signal request reply to user. The reply is always sent after the headers*/
-        GF_NETIO_PARSE_REPLY,
-        /*!send data to the user*/
-        GF_NETIO_DATA_EXCHANGE,
-        /*!all data has been transfered*/
-        GF_NETIO_DATA_TRANSFERED,
-        /*!signal that the session has been deconnected*/
-        GF_NETIO_DISCONNECTED,
-        /*!downloader session failed (error code set) or done/destroyed (no error code)*/
-        GF_NETIO_STATE_ERROR
-    } GF_NetIOStatus;
-
-    /*!session download flags*/
-    enum
-    {
-        /*!session is not threaded, the user must explicitely fetch the data , either with the function gf_dm_sess_fetch_data 
-		or the function gf_dm_sess_process- if the session is threaded, the user must call gf_dm_sess_process to start the session*/
-        GF_NETIO_SESSION_NOT_THREADED	=	1,
-        /*! session data is live, e.g. data will be sent to the user if threaded mode (live streams like radios & co)
-				Whether the data is cached or not to disk cannot be controlled by the user at the current time.
-		*/
-        GF_NETIO_SESSION_NOT_CACHED	=	1<<1,
-		/*indicates that the connection to the server should be kept once the download is successfully completed*/
-        GF_NETIO_SESSION_PERSISTENT =	1<<2,
-		/*file is stored in memory, and the cache name is set to gpac://%u@%p, where %d is the size in bytes and %d is the the pointer to the memory.
-		Memory cached files are destroyed upon downloader destruction*/
-        GF_NETIO_SESSION_MEMORY_CACHE	=	1<<3,
-    };
-
-
-    /*!protocol I/O parameter*/
-    typedef struct
-    {
-        /*!parameter message type*/
-        u32 msg_type;
-        /*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;
-        /*!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*/
-        const char *name;
-        /*protocol header value or server response. Only alid for GF_NETIO_GET_HEADER, GF_NETIO_PARSE_HEADER and GF_NETIO_PARSE_REPLY*/
-        char *value;
-        /*message-dependend
-			for GF_NETIO_PARSE_REPLY, response code
-			for GF_NETIO_DATA_EXCHANGE 
-				Set to 1 in to indicate end of chunk transfer
-				Set to 2 in GF_NETIO_DATA_EXCHANGE to indicate complete file is already received (replay of events from cache)
-			for all other, usage is reserved
-		*/
-        u32 reply;
-        /*download session for which the message is being sent*/
-		GF_DownloadSession *sess;
-    } 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
-    */
-    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
-     */
-    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 *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
-     */
-    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);
-
-    /*!
-     *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 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);
-
-    /*!
-     *\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
-     *
-     *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
-     */
-    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
-     */
-    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
-     */
-	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*/
-    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
-     */
-    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
-     */
-    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
-     *
-     *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
-     */
-    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);
-
-    /*!
-     *\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
-     *
-     *Fetch 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*/
-    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
-     *
-     *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);
-	
-
-    /*!
-     * \brief Download a file over the network using a download manager
-     * \param dm The downlaod 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
-     * \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);
-
-    /*!
-     * \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
-     * \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);
-
-    /*!
-     *\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);
-
-    /*!
-     * \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
-     */
-    DownloadedCacheEntry gf_dm_refresh_cache_entry(GF_DownloadSession *sess);
-    
-    /*!
-     * 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);
-
-
-    /*!
-     * 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
-     */
-	GF_Err gf_dm_sess_reassign(GF_DownloadSession *sess, u32 flags, gf_dm_user_io user_io, void *cbk);
-
-    /*!
-     * 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);
-
-    /*
-     *\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
-	 */
-	const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name);
-
-    /*
-     *\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
-     */
-    void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec);
-
-    /*
-     *\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
-     */
-    u32 gf_dm_get_data_rate(GF_DownloadManager *dm);
-
-
-    /*
-     *\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);
-	/*! @} */
+/*!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;
+
+typedef struct GF_URL_Info_Struct {
+	const char * protocol;
+	char * server_name;
+	char * remotePath;
+	char * canonicalRepresentation;
+	char * userName;
+	char * password;
+	u16 port;
+} 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
+ */
+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
+ */
+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
+ */
+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
+*/
+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
+ */
+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.
+*/
+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
+ */
+void gf_dm_set_auth_callback(GF_DownloadManager *dm, gf_dm_get_usr_pass get_pass, void *usr_cbk);
+
+/*!downloader session message types*/
+typedef enum
+{
+	/*!signal that session is setup and waiting for connection request*/
+	GF_NETIO_SETUP = 0,
+	/*!signal that session connection is done*/
+	GF_NETIO_CONNECTED,
+	/*!request a protocol method from the user. Default value is "GET" for HTTP*/
+	GF_NETIO_GET_METHOD,
+	/*!request a header from the user. */
+	GF_NETIO_GET_HEADER,
+	/*!requesting content from the user, if any. Content is appended to the request*/
+	GF_NETIO_GET_CONTENT,
+	/*!signal that request is sent and waiting for server reply*/
+	GF_NETIO_WAIT_FOR_REPLY,
+	/*!signal a header to user. */
+	GF_NETIO_PARSE_HEADER,
+	/*!signal request reply to user. The reply is always sent after the headers*/
+	GF_NETIO_PARSE_REPLY,
+	/*!send data to the user*/
+	GF_NETIO_DATA_EXCHANGE,
+	/*!all data has been transfered*/
+	GF_NETIO_DATA_TRANSFERED,
+	/*!signal that the session has been deconnected*/
+	GF_NETIO_DISCONNECTED,
+	/*!downloader session failed (error code set) or done/destroyed (no error code)*/
+	GF_NETIO_STATE_ERROR
+} GF_NetIOStatus;
+
+/*!session download flags*/
+enum
+{
+	/*!session is not threaded, the user must explicitely fetch the data , either with the function gf_dm_sess_fetch_data
+	or the function gf_dm_sess_process- if the session is threaded, the user must call gf_dm_sess_process to start the session*/
+	GF_NETIO_SESSION_NOT_THREADED	=	1,
+	/*! session data is live, e.g. data will be sent to the user if threaded mode (live streams like radios & co)
+			Whether the data is cached or not to disk cannot be controlled by the user at the current time.
+	*/
+	GF_NETIO_SESSION_NOT_CACHED	=	1<<1,
+	/*indicates that the connection to the server should be kept once the download is successfully completed*/
+	GF_NETIO_SESSION_PERSISTENT =	1<<2,
+	/*file is stored in memory, and the cache name is set to gpac://%u@%p, where %d is the size in bytes and %d is the the pointer to the memory.
+	Memory cached files are destroyed upon downloader destruction*/
+	GF_NETIO_SESSION_MEMORY_CACHE	=	1<<3,
+};
+
+
+/*!protocol I/O parameter*/
+typedef struct
+{
+	/*!parameter message type*/
+	u32 msg_type;
+	/*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;
+	/*!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*/
+	const char *name;
+	/*protocol header value or server response. Only alid for GF_NETIO_GET_HEADER, GF_NETIO_PARSE_HEADER and GF_NETIO_PARSE_REPLY*/
+	char *value;
+	/*message-dependend
+		for GF_NETIO_PARSE_REPLY, response code
+		for GF_NETIO_DATA_EXCHANGE
+			Set to 1 in to indicate end of chunk transfer
+			Set to 2 in GF_NETIO_DATA_EXCHANGE to indicate complete file is already received (replay of events from cache)
+		for all other, usage is reserved
+	*/
+	u32 reply;
+	/*download session for which the message is being sent*/
+	GF_DownloadSession *sess;
+} 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
+*/
+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
+ */
+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 *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
+ */
+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);
+
+/*!
+ *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 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);
+
+/*!
+ *\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
+ *
+ *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
+ */
+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
+ */
+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
+ */
+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*/
+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
+ */
+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
+ */
+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
+ *
+ *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
+ */
+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);
+
+/*!
+ *\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
+ *
+ *Fetch 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*/
+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
+ *
+ *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);
+
+
+/*!
+ * \brief Download a file over the network using a download manager
+ * \param dm The downlaod 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
+ * \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);
+
+/*!
+ * \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
+ * \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);
+
+/*!
+ *\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);
+
+/*!
+ * \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
+ */
+DownloadedCacheEntry gf_dm_refresh_cache_entry(GF_DownloadSession *sess);
+
+/*!
+ * 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);
+
+
+/*!
+ * 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
+ */
+GF_Err gf_dm_sess_reassign(GF_DownloadSession *sess, u32 flags, gf_dm_user_io user_io, void *cbk);
+
+/*!
+ * 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);
+
+/*
+ *\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
+ */
+const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name);
+
+/*
+ *\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
+ */
+void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec);
+
+/*
+ *\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
+ */
+u32 gf_dm_get_data_rate(GF_DownloadManager *dm);
+
+
+/*
+ *\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. If 0, HTTP rate is not limited
+ */
+u32 gf_dm_get_global_rate(GF_DownloadManager *dm);
+
+
+/*
+ *\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);
+/*! @} */
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn5178.tar.bz2/include/gpac/dsmcc.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/dsmcc.h Changed

@@ -41,27 +41,27 @@
 
 #define DSMCC_SECTION_LENGTH_MAX 4093
 
-typedef enum{
+typedef enum {
 	DOWNLOAD_INFO_REQUEST =					0x1001,
 	DOWNLOAD_INFO_REPONSE_INDICATION =		0x1002,
 	DOWNLOAD_DATA_BLOCK =					0x1003,
 	DOWNLOAD_DATA_REQUEST =					0x1004,
 	DOWNLOAD_DATA_CANCEL =					0x1005,
 	DOWNLOAD_SERVER_INITIATE =				0x1006
-}DSMCC_DOWNLOAD_MESSAGE_ID;
+} DSMCC_DOWNLOAD_MESSAGE_ID;
 
-typedef enum{
+typedef enum {
 	TAG_BIOP =				0x49534F06,
 	TAG_LITE_OPTIONS =		0x49534F05
-}DSMCC_DOWNLOAD_PROFILE_ID_TAG;
+} DSMCC_DOWNLOAD_PROFILE_ID_TAG;
 
-typedef enum{
+typedef enum {
 	CACHING_PRIORITY_DESCRIPTOR		=		0x71,
 	CONTENT_TYPE_DESCRIPTOR			=		0x72,
 	COMPRESSED_MODULE_DESCRIPTOR	=		0x09
-}DSMCC_BIOP_DESCRIPTOR;
+} DSMCC_BIOP_DESCRIPTOR;
 
-typedef struct{
+typedef struct {
 	u8 descriptor_tag;
 	u8 descriptor_length;
 	u32 carousel_id;
@@ -76,7 +76,7 @@
 	u8 TimeOut;
 	u8 ObjectKeyLength;
 	char* ObjectKeyData;
-}GF_M2TS_CAROUSEL_INDENTIFIER_DESCRIPTOR;
+} GF_M2TS_CAROUSEL_INDENTIFIER_DESCRIPTOR;
 
 typedef struct
 {
@@ -84,7 +84,7 @@
 	u32 downloadId;
 	u32 version_number;
 	Bool done;
-}GF_M2TS_DSMCC_PROCESSED;
+} GF_M2TS_DSMCC_PROCESSED;
 
 typedef struct
 {
@@ -116,7 +116,7 @@
 	Bool Gzip;
 	/* Size of the module's data after uncompression */
 	u32 original_size;
-}GF_M2TS_DSMCC_MODULE;
+} GF_M2TS_DSMCC_MODULE;
 
 typedef struct
 {
@@ -135,11 +135,11 @@
 	/* section number of the data block if carried by the section */
 	u8 section_number;
 	/* last section number of the data block if carried by the section */
-	u8 last_section_number; 
+	u8 last_section_number;
 	void* DSMCC_Extension;
 	u32 checksum;
 	u32 CRC_32;
-}GF_M2TS_DSMCC_SECTION;
+} GF_M2TS_DSMCC_SECTION;
 
 typedef struct
 {
@@ -164,7 +164,7 @@
 	u8 header_length;
 	GF_M2TS_DSMCC_ADAPTATION_HEADER* DsmccAdaptationHeader;
 
-}GF_M2TS_DSMCC_MESSAGE_DATA_HEADER;
+} GF_M2TS_DSMCC_MESSAGE_DATA_HEADER;
 
 /* DOWNLOAD_DATA_MESSAGE */
 typedef struct
@@ -178,15 +178,15 @@
 	u16 messageLength;
 	GF_M2TS_DSMCC_ADAPTATION_HEADER* DsmccAdaptationHeader;
 
-}GF_M2TS_DSMCC_DOWNLOAD_DATA_HEADER;
+} GF_M2TS_DSMCC_DOWNLOAD_DATA_HEADER;
 
 typedef struct
-{	
+{
 	u8 subDescriptorType;
-	u8 subDescriptorLength;	
+	u8 subDescriptorLength;
 	char *additionalInformation;
 
-}GF_M2TS_DSMCC_SUBDESCRIPTOR;
+} GF_M2TS_DSMCC_SUBDESCRIPTOR;
 
 typedef struct
 {
@@ -199,23 +199,23 @@
 	u8 subDescriptorCount;
 	GF_M2TS_DSMCC_SUBDESCRIPTOR* SubDescriptor;
 
-}GF_M2TS_DSMCC_DESCRIPTOR;
+} GF_M2TS_DSMCC_DESCRIPTOR;
 
 typedef struct
 {
 	u16 compatibilityDescriptorLength;
 	u16 descriptorCount;
 	GF_M2TS_DSMCC_DESCRIPTOR* Descriptor;
-}GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR;
+} GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR;
 
 typedef struct
-{	
+{
 	u32 bufferSize;
 	u16 maximumBlockSize;
 	GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR CompatibilityDescr;
 	u16 privateDataLength;
 	char* privateDataByte;
-}GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST;
+} GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST;
 
 typedef struct
 {
@@ -224,10 +224,10 @@
 	u8 moduleVersion;
 	u8 moduleInfoLength;
 	char* moduleInfoByte;
-}GF_M2TS_DSMCC_INFO_MODULES;
+} GF_M2TS_DSMCC_INFO_MODULES;
 
 typedef struct
-{  
+{
 	u32 downloadId;
 	u16 blockSize;
 	u8 windowSize;
@@ -237,12 +237,12 @@
 	GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR CompatibilityDescr;
 	u16 numberOfModules;
 	GF_M2TS_DSMCC_INFO_MODULES Modules;
-	u16 privateDataLength;     
+	u16 privateDataLength;
 	char* privateDataByte;
-}GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC;
+} GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC;
 
 typedef struct
-{  
+{
 	u8 moduleId;
 	u8 moduleVersion;
 	u8 reserved;
@@ -250,17 +250,17 @@
 	char* blockDataByte;
 	/*added not in the spec */
 	u32 dataBlocksize;
-}GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK;
+} GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK;
 
 typedef struct
-{ 
+{
 	u16 moduleId;
 	u16 blockNumber;
 	u8 downloadReason;
-}GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE;
+} GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE;
 
 typedef struct
-{  
+{
 	u32 downloadId;
 	u16 moduleId;
 	u16 blockNumber;
@@ -268,40 +268,40 @@
 	u8 reserved;
 	u16 privateDataLength;
 	char* privateDataByte;
-}GF_M2TS_DSMCC_DOWNLOAD_CANCEL;
+} GF_M2TS_DSMCC_DOWNLOAD_CANCEL;
 
 typedef struct
-{	
+{
 	u32 GroupId;
 	u32 GroupSize;
 	GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR CompatibilityDescr;
 	u16 GroupInfoLength;
 	char* groupInfoByte;
-}GF_M2TS_DSMCC_INFO_GROUP;
+} GF_M2TS_DSMCC_INFO_GROUP;
 
 typedef struct
 {
 	u16 NumberOfGroups;
-	GF_M2TS_DSMCC_INFO_GROUP* InfoGroup; 
+	GF_M2TS_DSMCC_INFO_GROUP* InfoGroup;
 	u16 PrivateDataLength;
 	char* privateDataByte;
 
-}GF_M2TS_DSMCC_GROUP_INFO_INDICATION;
+} GF_M2TS_DSMCC_GROUP_INFO_INDICATION;
 
 typedef struct
-{ 
+{
 	u8 serverId[20];
 	GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR CompatibilityDescr;
 	u16 privateDataLength;
 	char* privateDataByte;
 	GF_M2TS_DSMCC_GROUP_INFO_INDICATION* GroupInfoIndic;
-}GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT;
+} GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT;
 
 typedef struct
 {
 	GF_M2TS_DSMCC_MESSAGE_DATA_HEADER DownloadDataHeader;
 	void* dataMessagePayload;
-}GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE;
+} GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE;
 
 /* DESCRIPTOR LIST */
 
@@ -315,7 +315,7 @@
 	u8 NPT_Reference[5];
 	u16 scaleNumerator;
 	u16 scaleDenominator;
-}GF_M2TS_DSMCC_NPT_REFERENCE_DESCRIPTOR;
+} GF_M2TS_DSMCC_NPT_REFERENCE_DESCRIPTOR;
 
 
 typedef struct
@@ -323,10 +323,10 @@
 	u8 descriptorTag;
 	u8 descriptorLength;
 	void* descriptor;
-}GF_M2TS_DSMCC_STREAM_DESCRIPTOR;
+} GF_M2TS_DSMCC_STREAM_DESCRIPTOR;
 
 /* OBJECT CAROUSEL */
-typedef struct{
+typedef struct {
 	u16 id;
 	u16 use;
 	u16 assocTag;
@@ -335,21 +335,21 @@
 	u16 selector_type;
 	u32 transactionId;
 	u32 timeout;
-}GF_M2TS_DSMCC_BIOP_TAPS;
+} GF_M2TS_DSMCC_BIOP_TAPS;
 
-typedef struct{
+typedef struct {
 	u8 AFI;
 	u8 type;
 	u32 carouselId;
 	u8 specifierType;
 	u32 specifierData;
-	u16 transport_stream_id; 
+	u16 transport_stream_id;
 	u16 original_network_id;
 	u16 service_id;
 	u32 reserved;
-}GF_M2TS_DSMCC_SERVICE_DOMAIN;
+} GF_M2TS_DSMCC_SERVICE_DOMAIN;
 
-typedef struct{
+typedef struct {
 	u32 componentId_tag;
 	u8 component_data_length;
 	u32 carouselId;
@@ -358,29 +358,29 @@
 	u8 version_minor;
 	u8 objectKey_length;
 	u32 objectKey_data;
-}GF_M2TS_DSMCC_BIOP_OBJECT_LOCATION;
+} GF_M2TS_DSMCC_BIOP_OBJECT_LOCATION;
 
-typedef struct{
+typedef struct {
 	u32 componentId_tag;
 	u8 component_data_length;
 	u8 taps_count;
 	GF_M2TS_DSMCC_BIOP_TAPS* Taps;
 	char* additional_tap_byte;
-}GF_M2TS_DSMCC_BIOP_CONN_BINDER;
+} GF_M2TS_DSMCC_BIOP_CONN_BINDER;
 
-typedef struct{
+typedef struct {
 	GF_M2TS_DSMCC_BIOP_OBJECT_LOCATION ObjectLocation;
 	GF_M2TS_DSMCC_BIOP_CONN_BINDER ConnBinder;
-}GF_M2TS_DSMCC_BIOP_PROFILE_BODY;
+} GF_M2TS_DSMCC_BIOP_PROFILE_BODY;
 
-typedef struct{
+typedef struct {
 	u32 id_length;
 	char* id_data;
 	u32 kind_length;
 	char* kind_data;
-}GF_M2TS_DSMCC_BIOP_NAME_COMPONENT;
+} GF_M2TS_DSMCC_BIOP_NAME_COMPONENT;
 
-typedef struct{
+typedef struct {
 	u32 componentId_tag;
 	u8 component_data_length;
 	u8 serviceDomain_length;
@@ -389,15 +389,15 @@
 	GF_M2TS_DSMCC_BIOP_NAME_COMPONENT* NameComponent;
 	u32 initialContext_length;
 	char* InitialContext_data_byte;
-}GF_M2TS_DSMCC_BIOP_SERVICE_LOCATION;
+} GF_M2TS_DSMCC_BIOP_SERVICE_LOCATION;
 
-typedef struct{
+typedef struct {
 	u32 componentId_tag;
 	u8 component_data_length;
 	char* component_data_byte;
-}GF_M2TS_DSMCC_BIOP_LITE_COMPONENT;
+} GF_M2TS_DSMCC_BIOP_LITE_COMPONENT;
 
-typedef struct{
+typedef struct {
 	u32 profileId_tag;
 	u32 profile_data_length;
 	u8 profile_data_byte_order;
@@ -407,16 +407,16 @@
 	GF_M2TS_DSMCC_BIOP_SERVICE_LOCATION* ServiceLocation;
 	GF_M2TS_DSMCC_BIOP_LITE_COMPONENT* LiteComponent;
 
-}GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE;
+} GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE;
 
-typedef struct{
+typedef struct {
 	u32 type_id_length;
 	char* type_id_byte;
 	u32 taggedProfiles_count;
 	GF_List* taggedProfile;
-}GF_M2TS_DSMCC_IOR;
+} GF_M2TS_DSMCC_IOR;
 
-typedef struct{
+typedef struct {
 	u32 moduleTimeOut;
 	u32 blockTimeOut;
 	u32 minBlockTime;
@@ -426,17 +426,17 @@
 	u8* userInfo_data;
 	GF_List* descriptor;
 
-	u8 compression_method;	
-	u8 transparency_level; 
-}GF_M2TS_DSMCC_BIOP_MODULE_INFO;
+	u8 compression_method;
+	u8 transparency_level;
+} GF_M2TS_DSMCC_BIOP_MODULE_INFO;
 
-typedef struct{
+typedef struct {
 	u32 context_id;
 	u16 context_data_length;
 	char* context_data_byte;
-}GF_M2TS_DSMCC_SERVICE_CONTEXT;
+} GF_M2TS_DSMCC_SERVICE_CONTEXT;
 
-typedef struct{
+typedef struct {
 	GF_M2TS_DSMCC_IOR IOR;
 	u8 downloadTaps_count;
 	GF_M2TS_DSMCC_BIOP_TAPS* Taps;
@@ -444,32 +444,32 @@
 	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
 	u16 userInfoLength;
 	char* userInfo_data;
-}GF_M2TS_DSMCC_SERVICE_GATEWAY_INFO;
+} GF_M2TS_DSMCC_SERVICE_GATEWAY_INFO;
 
 
 /* DESCRIPTORS */
-typedef struct{
+typedef struct {
 	u8 descriptor_tag;
 	u8 descriptor_length;
 	u8 priority_value;
 	u8 transparency_level;
-}GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR;
+} GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR;
 
-typedef struct{
+typedef struct {
 	u8 descriptor_tag;
 	u8 descriptor_length;
 	u8 compression_method;
 	u32 original_size;
-}GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR;
+} GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR;
 
-typedef struct{
+typedef struct {
 	u8 descriptor_tag;
-	u8 descriptor_length;							
+	u8 descriptor_length;
 	char* content_type_data_byte;
-}GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR;
+} GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR;
 
 
-typedef struct{
+typedef struct {
 	/* "BIOP" */
 	u32 magic;
 	u8 biop_version_major;
@@ -490,9 +490,9 @@
 	/* The number that identifies the object in the module */
 	char* objectKind_data;
 	u16 objectInfo_length;
-}GF_M2TS_DSMCC_BIOP_HEADER;
+} GF_M2TS_DSMCC_BIOP_HEADER;
 
-typedef struct{
+typedef struct {
 	GF_M2TS_DSMCC_BIOP_HEADER* Header;
 	u64 ContentSize;
 	GF_List* descriptor;
@@ -503,9 +503,9 @@
 	u32 content_length;
 	/* data a the file */
 	char* content_byte;
-}GF_M2TS_DSMCC_BIOP_FILE;
+} GF_M2TS_DSMCC_BIOP_FILE;
 
-typedef struct{
+typedef struct {
 	/* Name */
 	u8 nameComponents_count;
 	/* There is must be only one nameComponent */
@@ -527,9 +527,9 @@
 	u16 objectInfo_length;
 	u64 ContentSize;
 	GF_List* descriptor;
-}GF_M2TS_DSMCC_BIOP_NAME;
+} GF_M2TS_DSMCC_BIOP_NAME;
 
-typedef struct{
+typedef struct {
 	GF_M2TS_DSMCC_BIOP_HEADER* Header;
 	char* objectInfo_data;
 	u8 serviceContextList_count;
@@ -539,49 +539,49 @@
 	/* Number of the item */
 	u16 bindings_count;
 	/* List of the item in the directory */
-	GF_M2TS_DSMCC_BIOP_NAME* Name;		
-}GF_M2TS_DSMCC_BIOP_DIRECTORY;
+	GF_M2TS_DSMCC_BIOP_NAME* Name;
+} GF_M2TS_DSMCC_BIOP_DIRECTORY;
 
-typedef struct{
-	u8 aDescription_length; 				
+typedef struct {
+	u8 aDescription_length;
 	char* aDescription_bytes;
 	u32 duration_aSeconds;
 	u32 duration_aMicroseconds;
-	u8 audio;	 
-	u8 video;	 
+	u8 audio;
+	u8 video;
 	u8 data;
-}GF_M2TS_DSMCC_STREAM_INFO;
+} GF_M2TS_DSMCC_STREAM_INFO;
 
-typedef struct{
-	GF_M2TS_DSMCC_BIOP_HEADER* Header;			
+typedef struct {
+	GF_M2TS_DSMCC_BIOP_HEADER* Header;
 	GF_M2TS_DSMCC_STREAM_INFO Info;
 	char* objectInfo_byte;
-	u8 serviceContextList_count; 				
+	u8 serviceContextList_count;
 	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
-	u32 messageBody_length; 
+	u32 messageBody_length;
 	u8 taps_count;
-	GF_M2TS_DSMCC_BIOP_TAPS* Taps; 				
-}GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE;
+	GF_M2TS_DSMCC_BIOP_TAPS* Taps;
+} GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE;
 
-typedef struct{					
-	u8 eventName_length; 				
+typedef struct {
+	u8 eventName_length;
 	char* eventName_data_byte;
-}GF_M2TS_DSMCC_BIOP_EVENT_LIST;
+} GF_M2TS_DSMCC_BIOP_EVENT_LIST;
 
-typedef struct{
-	GF_M2TS_DSMCC_BIOP_HEADER* Header; 
-	GF_M2TS_DSMCC_STREAM_INFO Info;				
+typedef struct {
+	GF_M2TS_DSMCC_BIOP_HEADER* Header;
+	GF_M2TS_DSMCC_STREAM_INFO Info;
 	u16 eventNames_count;
 	GF_M2TS_DSMCC_BIOP_EVENT_LIST* EventList;
 	char* objectInfo_byte;
-	u8 serviceContextList_count;				
+	u8 serviceContextList_count;
 	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
-	u32 messageBody_length; 	 
+	u32 messageBody_length;
 	u8 taps_count;
-	GF_M2TS_DSMCC_BIOP_TAPS* Taps;		
-	u8 eventIds_count;  				
+	GF_M2TS_DSMCC_BIOP_TAPS* Taps;
+	u8 eventIds_count;
 	u16* eventId;
-}GF_M2TS_DSMCC_BIOP_STREAM_EVENT;
+} GF_M2TS_DSMCC_BIOP_STREAM_EVENT;
 
 /*Define the base element for extracted dsmcc element*/
 #define GF_M2TS_DSMCC_ELEMENT		\
@@ -593,11 +593,11 @@
 			void* parent;
 
 typedef struct
-{	
+{
 	GF_M2TS_DSMCC_ELEMENT
 	/*Path to the file */
 	char* Path;
-}GF_M2TS_DSMCC_FILE;
+} GF_M2TS_DSMCC_FILE;
 
 typedef struct
 {	GF_M2TS_DSMCC_ELEMENT
@@ -607,7 +607,7 @@
 	GF_List* Dir;
 	/*Path to the directory */
 	char* Path;
-}GF_M2TS_DSMCC_DIR;
+} GF_M2TS_DSMCC_DIR;
 
 typedef struct
 {	GF_M2TS_DSMCC_ELEMENT
@@ -619,14 +619,14 @@
 	GF_List* File;
 	/* List of directories of the root of the file system*/
 	GF_List* Dir;
-}GF_M2TS_DSMCC_SERVICE_GATEWAY;
+} GF_M2TS_DSMCC_SERVICE_GATEWAY;
 
 typedef struct
-{	
+{
 	/* List that carries the modules to process */
 	GF_List* dsmcc_modules;
 	/* List of processed module */
-	GF_M2TS_DSMCC_PROCESSED processed[512];	
+	GF_M2TS_DSMCC_PROCESSED processed[512];
 	/*Check if the ServiceGateway has been recovered*/
 	/* 1 ServiceGateway received */
 	/* 0 otherwise */

gpac-0.5.0.svn5178.tar.bz2/include/gpac/dvb_mpe.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/dvb_mpe.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/esi.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/esi.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -60,7 +60,7 @@
 	*/
 	GF_ESI_OUTPUT_DATA_DISPATCH
 };
-	
+
 /*
 	data packet flags
 */
@@ -116,7 +116,7 @@
 	GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS =	1<<3,
 };
 
-typedef struct __elementary_stream_ifce 
+typedef struct __elementary_stream_ifce
 {
 	/*misc caps of the stream*/
 	u32 caps;
@@ -139,10 +139,10 @@
 	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;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/events.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/events.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -33,7 +33,7 @@
 #endif
 
 
-#include <gpac/math.h>
+#include <gpac/maths.h>
 #include <gpac/tools.h>
 #include <gpac/events_constants.h>
 
@@ -223,6 +223,15 @@
 	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*/
+typedef struct
+{
+	/*GF_EVENT_ADDON_DETECTED*/
+	u8 type;
+	const char *addon_url;
+	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)*/
 typedef struct
@@ -265,22 +274,22 @@
 
 
 typedef struct {
-	/* GF_EVENT_OPENFILE*/
+	/* GF_EVENT_DROPFILE*/
 	u8 type;
 	u32 nb_files;
 	char **files;
 } GF_EventOpenFile;
 
 typedef struct {
-	/* GF_EVENT_FORWARDED*/
+	/*GF_EVENT_FROM_SERVICE*/
 	u8 type;
-	/*one of te above event*/
+	//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_EventForwarded;
+} GF_EventFromService;
 
 typedef union
 {
@@ -302,8 +311,9 @@
 	GF_EventMove move;
 	GF_EventVideoSetup setup;
 	GF_EventMutation mutation;
-	GF_EventForwarded forwarded_event;
 	GF_EventOpenFile open_file;
+	GF_EventAddonConnect addon_connect;
+	GF_EventFromService from_service;
 } GF_Event;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/events_constants.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/events_constants.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -121,23 +121,23 @@
 	GF_EVENT_MEDIA_SETUP_DONE,	/*not HTML5 but should be :)*/
 	GF_EVENT_MEDIA_LOAD_START,
 	GF_EVENT_MEDIA_LOAD_DONE,	/*not HTML5 but should be :)*/
-	GF_EVENT_MEDIA_PROGRESS, 
-	GF_EVENT_MEDIA_SUSPEND, 
-	GF_EVENT_MEDIA_EMPTIED, 
-	GF_EVENT_MEDIA_STALLED, 
-	GF_EVENT_MEDIA_LOADED_METADATA, 
-	GF_EVENT_MEDIA_LODADED_DATA, 
-	GF_EVENT_MEDIA_CANPLAY, 
-	GF_EVENT_MEDIA_CANPLAYTHROUGH, 
-	GF_EVENT_MEDIA_PLAYING, 
-	GF_EVENT_MEDIA_WAITING, 
-	GF_EVENT_MEDIA_SEEKING, 
-	GF_EVENT_MEDIA_SEEKED, 
-	GF_EVENT_MEDIA_ENDED, 
-	GF_EVENT_MEDIA_DURATION_CHANGED, 
-	GF_EVENT_MEDIA_TIME_UPDATE, 
-	GF_EVENT_MEDIA_RATECHANGE, 
-	GF_EVENT_MEDIA_VOLUME_CHANGED, 
+	GF_EVENT_MEDIA_PROGRESS,
+	GF_EVENT_MEDIA_SUSPEND,
+	GF_EVENT_MEDIA_EMPTIED,
+	GF_EVENT_MEDIA_STALLED,
+	GF_EVENT_MEDIA_LOADED_METADATA,
+	GF_EVENT_MEDIA_LODADED_DATA,
+	GF_EVENT_MEDIA_CANPLAY,
+	GF_EVENT_MEDIA_CANPLAYTHROUGH,
+	GF_EVENT_MEDIA_PLAYING,
+	GF_EVENT_MEDIA_WAITING,
+	GF_EVENT_MEDIA_SEEKING,
+	GF_EVENT_MEDIA_SEEKED,
+	GF_EVENT_MEDIA_ENDED,
+	GF_EVENT_MEDIA_DURATION_CHANGED,
+	GF_EVENT_MEDIA_TIME_UPDATE,
+	GF_EVENT_MEDIA_RATECHANGE,
+	GF_EVENT_MEDIA_VOLUME_CHANGED,
 
 	GF_EVENT_HTML_MSE_SOURCE_OPEN,
 	GF_EVENT_HTML_MSE_SOURCE_ENDED,
@@ -184,10 +184,12 @@
 		if scene size hasn't changed (seeking or other) this event is not sent
 	*/
 	GF_EVENT_SCENE_SIZE,
-	GF_EVENT_SHOWHIDE,	/*window show/hide (minimized or other). This is also sent to the user to signal focus switch in fullscreen*/
+	GF_EVENT_SHOWHIDE,	/*window show/hide (minimized or other). */
+	GF_EVENT_SHOWHIDE_NOTIF,	/*window has been show/hide (minimized or other). This is sent to the user to signal focus switch in fullscreen*/
 	GF_EVENT_SET_CURSOR,	/*set mouse cursor*/
 	GF_EVENT_SET_CAPTION,	/*set window caption*/
 	GF_EVENT_MOVE,		/*move window*/
+	GF_EVENT_MOVE_NOTIF,		/*move window*/
 	GF_EVENT_REFRESH, /*window needs repaint (whenever needed, eg restore, hide->show, background refresh, paint)*/
 	GF_EVENT_QUIT,	/*app is being closed - associated structure is evt.message to carry any potential reason for quiting*/
 	/*video hw setup message:
@@ -196,7 +198,7 @@
 			* for 3D output, this means re-setup of OpenGL context (depending on HW constraints). Depending on windowing systems
 			and implementations, it could be possible to resize a window without destroying the GL context.
 
-		- when sent from plugin to gpac, indicates that hardware has been setup. 
+		- when sent from plugin to gpac, indicates that hardware has been setup.
 		- when sent from gpac to user, indicate aspect ratio has been modified and video output is ready
 	*/
 	GF_EVENT_VIDEO_SETUP,
@@ -224,10 +226,25 @@
 	GF_EVENT_MIGRATE, /*indicates a session migration request*/
 	GF_EVENT_DISCONNECT, /*indicates the current url should be disconnected*/
 	GF_EVENT_RESOLUTION, /*indicates the screen resolution has changed*/
-	GF_EVENT_OPENFILE,
-    /* Events for Keyboad */
-    GF_EVENT_TEXT_EDITING_START,
-    GF_EVENT_TEXT_EDITING_END,
+	GF_EVENT_DROPFILE,
+	/* Events for Keyboad */
+	GF_EVENT_TEXT_EDITING_START,
+	GF_EVENT_TEXT_EDITING_END,
+
+	GF_EVENT_QUALITY_SWITCHED,
+	//fire when timeshift depth changes
+	GF_EVENT_TIMESHIFT_DEPTH,
+	//fire when position in timeshift buffer changes
+	GF_EVENT_TIMESHIFT_UPDATE,
+	//fire when position overflows the timeshift buffer
+	GF_EVENT_TIMESHIFT_OVERFLOW,
+	//fire when position underruns the timeshift buffer (eg fast forward / seek in the future)
+	GF_EVENT_TIMESHIFT_UNDERRUN,
+	GF_EVENT_MAIN_ADDON_STATE,
+
+	GF_EVENT_FROM_SERVICE,
+
+	GF_EVENT_ADDON_DETECTED,
 } GF_EventType;
 
 /*GPAC/DOM3 key codes*/
@@ -438,7 +455,7 @@
 	GF_KEY_EPG, /*EPG*/
 	GF_KEY_RECORD, /*Record*/
 	GF_KEY_BEGINPAGE, /*BeginPage*/
-    /* end STB */
+	/* end STB */
 
 	/*non-dom keys, used in LASeR*/
 	GF_KEY_CELL_SOFT1,	/*soft1 key of cell phones*/
@@ -488,10 +505,10 @@
 
 enum
 {
+	//regular even codes
+	GF_EVT_REGULAR = 0,
 	/*events forwarded from MPEG-2 stack*/
-	GF_EVT_FORWARDED_MPEG2 = 0,
-	/*events forwarded from RTP/RTSP/IP stack (not used yet)*/
-	GF_EVT_FORWARDED_RTP_RTSP
+	GF_EVT_MPEG2 = 1,
 };
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/include/gpac/filestreamer.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/filestreamer.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2008-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -97,7 +97,7 @@
  *	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. 
+ *	\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);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/html5_media.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/html5_media.h Changed

@@ -46,46 +46,48 @@
 #include <gpac/xml.h>
 #include <gpac/internal/terminal_dev.h>
 
+#ifdef GPAC_HAS_SPIDERMONKEY
 #include <gpac/internal/smjs_api.h>
+#endif
 
 typedef struct
 {
-    u32 nb_inst;
-    /* Basic classes */
-    GF_JSClass  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;
-
-    /* Media Source Extensions */
-    GF_JSClass  mediaSourceClass;
-    GF_JSClass  sourceBufferClass;
-    GF_JSClass  sourceBufferListClass;
-    GF_JSClass  URLClass;
-
-    /* Media Capture */
-    GF_JSClass  mediaStreamClass;
-    GF_JSClass  localMediaStreamClass;
-    GF_JSClass  mediaStreamTrackClass;
-    GF_JSClass  mediaStreamTrackListClass;
-    GF_JSClass  navigatorUserMediaClass;
-    GF_JSClass  navigatorUserMediaErrorClass;
+	u32 nb_inst;
+	/* Basic classes */
+	GF_JSClass  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;
+
+	/* Media Source Extensions */
+	GF_JSClass  mediaSourceClass;
+	GF_JSClass  sourceBufferClass;
+	GF_JSClass  sourceBufferListClass;
+	GF_JSClass  URLClass;
+
+	/* Media Capture */
+	GF_JSClass  mediaStreamClass;
+	GF_JSClass  localMediaStreamClass;
+	GF_JSClass  mediaStreamTrackClass;
+	GF_JSClass  mediaStreamTrackListClass;
+	GF_JSClass  navigatorUserMediaClass;
+	GF_JSClass  navigatorUserMediaErrorClass;
 } GF_HTML_MediaRuntime;
 
 /************************************************************
@@ -97,55 +99,55 @@
 
 typedef enum
 {
-    MEDIA_ERR_ABORTED           = 1,
-    MEDIA_ERR_NETWORK           = 2,
-    MEDIA_ERR_DECODE            = 3,
-    MEDIA_ERR_SRC_NOT_SUPPORTED = 4
+	MEDIA_ERR_ABORTED           = 1,
+	MEDIA_ERR_NETWORK           = 2,
+	MEDIA_ERR_DECODE            = 3,
+	MEDIA_ERR_SRC_NOT_SUPPORTED = 4
 } GF_HTML_MediaErrorCode;
 
 typedef enum
 {
-    NETWORK_EMPTY               = 0,
-    NETWORK_IDLE                = 1,
-    NETWORK_LOADING             = 2,
-    NETWORK_NO_SOURCE           = 3
+	NETWORK_EMPTY               = 0,
+	NETWORK_IDLE                = 1,
+	NETWORK_LOADING             = 2,
+	NETWORK_NO_SOURCE           = 3
 } GF_HTML_NetworkState;
 
 typedef enum
 {
-    HAVE_NOTHING                = 0,
-    HAVE_METADATA               = 1,
-    HAVE_CURRENT_DATA           = 2,
-    HAVE_FUTURE_DATA            = 3,
-    HAVE_ENOUGH_DATA            = 4
+	HAVE_NOTHING                = 0,
+	HAVE_METADATA               = 1,
+	HAVE_CURRENT_DATA           = 2,
+	HAVE_FUTURE_DATA            = 3,
+	HAVE_ENOUGH_DATA            = 4
 } GF_HTML_MediaReadyState;
 
 typedef struct
 {
-    /* JavaScript context associated to this object */
-    JSContext               *c;
-    /* JavaScript counterpart */
-    JSObject                *_this;
+	/* JavaScript context associated to this object */
+	JSContext               *c;
+	/* JavaScript counterpart */
+	JSObject                *_this;
 
-    GF_HTML_MediaErrorCode   code;
+	GF_HTML_MediaErrorCode   code;
 } GF_HTML_MediaError;
 
 typedef struct _timerange
 {
-    /* JavaScript context associated to this object */
-    JSContext               *c;
-    /* JavaScript counterpart */
-    JSObject                *_this;
+	/* JavaScript context associated to this object */
+	JSContext               *c;
+	/* JavaScript counterpart */
+	JSObject                *_this;
 
-    GF_List                 *times;
+	GF_List                 *times;
 	u32						timescale;
 } GF_HTML_MediaTimeRanges;
 
 typedef enum {
-    HTML_MEDIA_TRACK_TYPE_UNKNOWN = 0,
-    HTML_MEDIA_TRACK_TYPE_AUDIO = 1,
-    HTML_MEDIA_TRACK_TYPE_VIDEO = 2,
-    HTML_MEDIA_TRACK_TYPE_TEXT  = 3
+	HTML_MEDIA_TRACK_TYPE_UNKNOWN = 0,
+	HTML_MEDIA_TRACK_TYPE_AUDIO = 1,
+	HTML_MEDIA_TRACK_TYPE_VIDEO = 2,
+	HTML_MEDIA_TRACK_TYPE_TEXT  = 3
 } GF_HTML_TrackType;
 
 #define BASE_HTML_TRACK     \
@@ -175,21 +177,21 @@
     char                    *label;\
     char                    *language;\
     char                    *mime; \
-    Bool                    enabled_or_selected; 
+    Bool                    enabled_or_selected;
 
 typedef struct
 {
-    BASE_HTML_TRACK
+	BASE_HTML_TRACK
 } GF_HTML_Track;
 
 typedef struct
 {
-    BASE_HTML_TRACK
+	BASE_HTML_TRACK
 	JSFunction				*oncuechange;
-    char                    *inBandMetadataTrackDispatchType;
-    //GF_HTMLTextTrackMode    mode;
-    //GF_HTMLTextTrackCueList cues;
-    //GF_HTMLTextTrackCueList activeCues;
+	char                    *inBandMetadataTrackDispatchType;
+	//GF_HTMLTextTrackMode    mode;
+	//GF_HTMLTextTrackCueList cues;
+	//GF_HTMLTextTrackCueList activeCues;
 } GF_HTML_TextTrack;
 
 #define BASE_HTML_TRACK_LIST     \
@@ -205,108 +207,108 @@
 
 typedef struct
 {
-    BASE_HTML_TRACK_LIST
+	BASE_HTML_TRACK_LIST
 } GF_HTML_TrackList;
 
 typedef enum
 {
-    MEDIA_CONTROLLER_WAITING = 0,
-    MEDIA_CONTROLLER_PLAYING = 1,
-    MEDIA_CONTROLLER_ENDED   = 2
+	MEDIA_CONTROLLER_WAITING = 0,
+	MEDIA_CONTROLLER_PLAYING = 1,
+	MEDIA_CONTROLLER_ENDED   = 2
 } GF_HTML_MediaControllerPlaybackState;
 
 typedef struct
 {
-    /* JavaScript context associated to this object */
-    JSContext               *c;
-    /* JavaScript counterpart */
-    JSObject                *_this;
-
-    GF_HTML_MediaTimeRanges  *buffered;
-    GF_HTML_MediaTimeRanges  *seekable;
-    GF_HTML_MediaTimeRanges  *played;
-    Bool                    paused;
-    GF_HTML_MediaControllerPlaybackState playbackState;
-    double                  defaultPlaybackRate;
-
-    /* list of media elements using this media controller */
-    GF_List                 *media_elements;
+	/* JavaScript context associated to this object */
+	JSContext               *c;
+	/* JavaScript counterpart */
+	JSObject                *_this;
+
+	GF_HTML_MediaTimeRanges  *buffered;
+	GF_HTML_MediaTimeRanges  *seekable;
+	GF_HTML_MediaTimeRanges  *played;
+	Bool                    paused;
+	GF_HTML_MediaControllerPlaybackState playbackState;
+	double                  defaultPlaybackRate;
+
+	/* list of media elements using this media controller */
+	GF_List                 *media_elements;
 } GF_HTML_MediaController;
 
 typedef struct
 {
-    /* JavaScript context associated to this object */
-    JSContext               *c;
-    /* JavaScript counterpart */
-    JSObject                *_this;
-
-    /* The audio or video node */
-    GF_Node                 *node;
-
-    /* error state */
-    GF_HTML_MediaError       error;
-
-    /* src: not stored in this structure, 
-            using the value stored in the node ( see HTML 5 "must reflect the content of the attribute")*/
-    /* currentSrc: the actual source used for the video (src attribute on video, audio or source elements) */
-    char                    *currentSrc;
-    /* crossOrigin: "must reflect the content of the attribute of the same name", use the node */
-    /* networkState: retrieved dynamically from GPAC Service */
-    /* preload: "must reflect the content of the attribute of the same name", use the node */
-    GF_HTML_MediaTimeRanges  *buffered;
-    /* ready state */
-    /* readyState: retrieved from GPAC Media Object dynamically */
-    Bool                    seeking;
-
-    /* playback state */
-    /* currentTime: retrieved from GPAC Media Object */
-    /* duration: retrieved from GPAC Media Object */
-    char                    *startDate;
-    Bool                    paused;
-    double                  defaultPlaybackRate;
-    GF_HTML_MediaTimeRanges  *played;
-    GF_HTML_MediaTimeRanges  *seekable;
-    /* ended: retrieved from the state of GPAC Media Object */
-    /* autoplay: "must reflect the content of the attribute of the same name", use the node */
-    /* loop: "must reflect the content of the attribute of the same name", use the node */
-
-    /* media controller*/
-    /* mediaGroup: "must reflect the content of the attribute of the same name", use the node */
-    GF_HTML_MediaController  *controller;
-
-    /* controls*/
-    /* controls: "must reflect the content of the attribute of the same name", use the node */
-    /* volume: retrieved from GPAC Audio Input in GPAC Media Object */
-    /* muted: retrieved from GPAC media object */
-    /* defaultMuted: "must reflect the content of the attribute of with the name" muted */
-
-    /* tracks*/
-    GF_HTML_TrackList        audioTracks;
-    GF_HTML_TrackList        videoTracks;
-    GF_HTML_TrackList        textTracks;
+	/* JavaScript context associated to this object */
+	JSContext               *c;
+	/* JavaScript counterpart */
+	JSObject                *_this;
+
+	/* The audio or video node */
+	GF_Node                 *node;
+
+	/* error state */
+	GF_HTML_MediaError       error;
+
+	/* src: not stored in this structure,
+	        using the value stored in the node ( see HTML 5 "must reflect the content of the attribute")*/
+	/* currentSrc: the actual source used for the video (src attribute on video, audio or source elements) */
+	char                    *currentSrc;
+	/* crossOrigin: "must reflect the content of the attribute of the same name", use the node */
+	/* networkState: retrieved dynamically from GPAC Service */
+	/* preload: "must reflect the content of the attribute of the same name", use the node */
+	GF_HTML_MediaTimeRanges  *buffered;
+	/* ready state */
+	/* readyState: retrieved from GPAC Media Object dynamically */
+	Bool                    seeking;
+
+	/* playback state */
+	/* currentTime: retrieved from GPAC Media Object */
+	/* duration: retrieved from GPAC Media Object */
+	char                    *startDate;
+	Bool                    paused;
+	double                  defaultPlaybackRate;
+	GF_HTML_MediaTimeRanges  *played;
+	GF_HTML_MediaTimeRanges  *seekable;
+	/* ended: retrieved from the state of GPAC Media Object */
+	/* autoplay: "must reflect the content of the attribute of the same name", use the node */
+	/* loop: "must reflect the content of the attribute of the same name", use the node */
+
+	/* media controller*/
+	/* mediaGroup: "must reflect the content of the attribute of the same name", use the node */
+	GF_HTML_MediaController  *controller;
+
+	/* controls*/
+	/* controls: "must reflect the content of the attribute of the same name", use the node */
+	/* volume: retrieved from GPAC Audio Input in GPAC Media Object */
+	/* muted: retrieved from GPAC media object */
+	/* defaultMuted: "must reflect the content of the attribute of with the name" muted */
+
+	/* tracks*/
+	GF_HTML_TrackList        audioTracks;
+	GF_HTML_TrackList        videoTracks;
+	GF_HTML_TrackList        textTracks;
 
 	GF_DOMEventTarget		 *evt_target;
 } GF_HTML_MediaElement;
 
-typedef struct 
+typedef struct
 {
-    /* JavaScript context used to create the JavaScript object below */
-    JSContext               *c;
+	/* JavaScript context used to create the JavaScript object below */
+	JSContext               *c;
 
-    /* JavaScript counterpart for this object*/
-    JSObject                *_this;
+	/* JavaScript counterpart for this object*/
+	JSObject                *_this;
 
 	char    *data;
-    u32     length;
-    char    *url;
+	u32     length;
+	char    *url;
 	Bool	is_init;
 
 	/* used to do proper garbage collection between JS and Terminal */
-    u32     reference_count;
+	u32     reference_count;
 } GF_HTML_ArrayBuffer;
 
-/* 
- * TimeRanges 
+/*
+ * TimeRanges
  */
 GF_HTML_MediaTimeRanges *gf_html_timeranges_new(u32 timescale);
 GF_Err gf_html_timeranges_add_start(GF_HTML_MediaTimeRanges *timeranges, u64 start);
@@ -320,8 +322,8 @@
  * HTML5 TrackList
  */
 GF_HTML_Track *html_media_add_new_track_to_list(GF_HTML_TrackList *tracklist,
-                                                       GF_HTML_TrackType type, const char *mime, Bool enable_or_selected,
-                                                       const char *id, const char *kind, const char *label, const char *lang);
+        GF_HTML_TrackType type, const char *mime, Bool enable_or_selected,
+        const char *id, const char *kind, const char *label, const char *lang);
 Bool html_media_tracklist_has_track(GF_HTML_TrackList *tracklist, const char *id);
 GF_HTML_Track *html_media_tracklist_get_track(GF_HTML_TrackList *tracklist, const char *id);
 void gf_html_tracklist_del(GF_HTML_TrackList *tlist);
@@ -333,7 +335,7 @@
                                        const char *id, const char *kind, const char *label, const char *lang);
 void gf_html_track_del(GF_HTML_Track *track);
 
-/* 
+/*
  * HTML5 Media Element
  */
 GF_HTML_MediaElement *gf_html_media_element_new(GF_Node *media_node, GF_HTML_MediaController *mc);
@@ -341,13 +343,13 @@
 
 void html_media_element_js_init(JSContext *c, JSObject *new_obj, GF_Node *n);
 
-/* 
+/*
  * HTML5 Media Controller
  */
 GF_HTML_MediaController *gf_html_media_controller_new();
 void gf_html_media_controller_del(GF_HTML_MediaController *mc);
 
-/* 
+/*
  * HTML5 Array Buffer
  */
 GF_HTML_ArrayBuffer *gf_arraybuffer_new(char *data, u32 length);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/html5_mse.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/html5_mse.h Changed

@@ -36,88 +36,88 @@
 #include <gpac/html5_media.h>
 #include <gpac/internal/smjs_api.h>
 
-typedef enum 
+typedef enum
 {
-    MEDIA_SOURCE_READYSTATE_CLOSED = 0,
-    MEDIA_SOURCE_READYSTATE_OPEN   = 1,
-    MEDIA_SOURCE_READYSTATE_ENDED  = 2,
+	MEDIA_SOURCE_READYSTATE_CLOSED = 0,
+	MEDIA_SOURCE_READYSTATE_OPEN   = 1,
+	MEDIA_SOURCE_READYSTATE_ENDED  = 2,
 } GF_HTML_MediaSource_ReadyState;
 
-typedef enum 
+typedef enum
 {
-    MEDIA_SOURCE_APPEND_MODE_SEGMENTS	= 0,
-    MEDIA_SOURCE_APPEND_MODE_SEQUENCE   = 1
+	MEDIA_SOURCE_APPEND_MODE_SEGMENTS	= 0,
+	MEDIA_SOURCE_APPEND_MODE_SEQUENCE   = 1
 } GF_HTML_MediaSource_AppendMode;
 
-typedef enum 
+typedef enum
 {
-    MEDIA_SOURCE_APPEND_STATE_WAITING_FOR_SEGMENT   = 0,
-    MEDIA_SOURCE_APPEND_STATE_PARSING_INIT_SEGMENT  = 1,
-    MEDIA_SOURCE_APPEND_STATE_PARSING_MEDIA_SEGMENT = 2
+	MEDIA_SOURCE_APPEND_STATE_WAITING_FOR_SEGMENT   = 0,
+	MEDIA_SOURCE_APPEND_STATE_PARSING_INIT_SEGMENT  = 1,
+	MEDIA_SOURCE_APPEND_STATE_PARSING_MEDIA_SEGMENT = 2
 } GF_HTML_MediaSource_AppendState;
 
 typedef struct
 {
-    /* Pointer back to the MediaSource object to which this source buffer is attached */
-    struct _html_mediasource *mediasource;
-
-    /* JavaScript counterpart for this object*/
-    JSObject                *_this;
-
-    /* MSE defined properties */
-    Bool                    updating;
-    GF_HTML_MediaTimeRanges *buffered;
-    s64						timestampOffset;
-    double                  appendWindowStart;
-    double                  appendWindowEnd;
-    u32                     timescale;
-
-    GF_HTML_MediaSource_AppendState append_state;
-    Bool                    buffer_full_flag;
-	/* Mode used to append media data: 
-	   - "segments" uses the timestamps in the media, 
+	/* Pointer back to the MediaSource object to which this source buffer is attached */
+	struct _html_mediasource *mediasource;
+
+	/* JavaScript counterpart for this object*/
+	JSObject                *_this;
+
+	/* MSE defined properties */
+	Bool                    updating;
+	GF_HTML_MediaTimeRanges *buffered;
+	s64						timestampOffset;
+	double                  appendWindowStart;
+	double                  appendWindowEnd;
+	u32                     timescale;
+
+	GF_HTML_MediaSource_AppendState append_state;
+	Bool                    buffer_full_flag;
+	/* Mode used to append media data:
+	   - "segments" uses the timestamps in the media,
 	   - "sequence" ignores them and appends just after the previous data */
-    GF_HTML_MediaSource_AppendMode   append_mode;
+	GF_HTML_MediaSource_AppendMode   append_mode;
 
 	/* time (in timescale units) of the first frame in the group */
-    u64						group_start_timestamp;
-    Bool                    group_start_timestamp_flag;
+	u64						group_start_timestamp;
+	Bool                    group_start_timestamp_flag;
 	/* time (in timescale units) of the frame end time (start + duration) in the group */
-    u64						group_end_timestamp;
-    Bool                    group_end_timestamp_set;
+	u64						group_end_timestamp;
+	Bool                    group_end_timestamp_set;
 
-    Bool                    first_init_segment;
+	Bool                    first_init_segment;
 
 	/* times (in timescale units) of the frames to be removed */
-    u64						remove_start;
-    u64						remove_end;
+	u64						remove_start;
+	u64						remove_end;
 
-    /*
-	 * GPAC internal objects 
+	/*
+	 * GPAC internal objects
 	 */
 
 	/* Media tracks (GF_HTML_Track) associated to this source buffer */
-    GF_List                 *tracks;
+	GF_List                 *tracks;
 	/* Buffers to parse */
 	GF_List					*input_buffer;
-	/* We can only delete a buffer when we know it has been parsed, 
-	   i.e. when the next buffer is asked for, 
+	/* We can only delete a buffer when we know it has been parsed,
+	   i.e. when the next buffer is asked for,
 	   so we need to keep the buffer in the meantime */
-    void                    *prev_buffer;
+	void                    *prev_buffer;
 
 	/* Media parser */
-    GF_InputService         *parser;
+	GF_InputService         *parser;
 
 	/* MPEG-4 Object descriptor as returned by the media parser */
-    GF_ObjectDescriptor     *service_desc;  
+	GF_ObjectDescriptor     *service_desc;
 
-    /* Boolean indicating that the parser has parsed the initialisation segment */
+	/* Boolean indicating that the parser has parsed the initialisation segment */
 	Bool                    parser_connected;
 
 	/* Threads used to asynchronously parse the buffer and remove media data */
 	GF_List					*threads;
-    GF_Thread               *parser_thread;
-    GF_Thread               *remove_thread;
+	GF_Thread               *parser_thread;
+	GF_Thread               *remove_thread;
 
 	/* Object used to fire JavaScript events to */
 	GF_DOMEventTarget		*evt_target;
@@ -125,10 +125,10 @@
 
 typedef struct
 {
-    /* JavaScript counterpart for this object */
-    JSObject                *_this;
+	/* JavaScript counterpart for this object */
+	JSObject                *_this;
 
-    GF_List                 *list;
+	GF_List                 *list;
 
 	struct _html_mediasource *parent;
 
@@ -138,48 +138,48 @@
 
 typedef enum
 {
-    DURATION_NAN        = 0,
-    DURATION_INFINITY   = 1,
-    DURATION_VALUE      = 2
+	DURATION_NAN        = 0,
+	DURATION_INFINITY   = 1,
+	DURATION_VALUE      = 2
 } GF_HTML_MediaSource_DurationType;
 
 typedef struct _html_mediasource
 {
-    /* JavaScript context associated to all the objects */
-    JSContext               *c;
+	/* JavaScript context associated to all the objects */
+	JSContext               *c;
 
-    /* JavaScript counterpart for this object*/
-    JSObject                *_this;
+	/* JavaScript counterpart for this object*/
+	JSObject                *_this;
 
 	/* Used to determine if the object can be safely deleted (not used by JS, not used by the service) */
 	u32 reference_count;
 
-    GF_HTML_SourceBufferList sourceBuffers;
-    GF_HTML_SourceBufferList activeSourceBuffers;
+	GF_HTML_SourceBufferList sourceBuffers;
+	GF_HTML_SourceBufferList activeSourceBuffers;
 
-    double  duration;
-    GF_HTML_MediaSource_DurationType    durationType;
+	double  duration;
+	GF_HTML_MediaSource_DurationType    durationType;
 
-    u32     readyState;
+	u32     readyState;
 
-    /* URL created by the call to createObjectURL on this MediaSource*/
-    char    *blobURI;
+	/* URL created by the call to createObjectURL on this MediaSource*/
+	char    *blobURI;
 
-    /* GPAC Terminal Service object 
-       it is associated to this MediaSource when the Media element uses the blobURI of this MediaSource
-       should be NULL when the MediaSource is not open 
-       we use only one service object for all sourceBuffers
-       */
-    GF_ClientService *service;
+	/* GPAC Terminal Service object
+	   it is associated to this MediaSource when the Media element uses the blobURI of this MediaSource
+	   should be NULL when the MediaSource is not open
+	   we use only one service object for all sourceBuffers
+	   */
+	GF_ClientService *service;
 
 	/* SceneGraph to be used before the node is actually attached */
-    GF_SceneGraph *sg;
+	GF_SceneGraph *sg;
 
-    /* Node the MediaSource is attached to */
-    GF_Node *node;
+	/* Node the MediaSource is attached to */
+	GF_Node *node;
 
-    /* object implementing Event Target Interface */
-    GF_DOMEventTarget *evt_target;
+	/* object implementing Event Target Interface */
+	GF_DOMEventTarget *evt_target;
 } GF_HTML_MediaSource;
 
 GF_HTML_MediaSource		*gf_mse_media_source_new();
@@ -199,29 +199,29 @@
 void                    gf_mse_source_buffer_append_arraybuffer(GF_HTML_SourceBuffer *sb, GF_HTML_ArrayBuffer *buffer);
 void                    gf_mse_source_buffer_update_buffered(GF_HTML_SourceBuffer *sb);
 void					gf_mse_remove(GF_HTML_SourceBuffer *sb, double start, double end);
-	
+
 typedef struct
 {
-    char        *data;
-    u32         size;
-    GF_SLHeader sl_header;
-    Bool        is_compressed;
-    Bool        is_new_data;
-    GF_Err      status;
+	char        *data;
+	u32         size;
+	GF_SLHeader sl_header;
+	Bool        is_compressed;
+	Bool        is_new_data;
+	GF_Err      status;
 } GF_MSE_Packet;
 
 GF_Err gf_mse_proxy(GF_InputService *parser, GF_NetworkCommand *command);
 void gf_mse_packet_del(GF_MSE_Packet *packet);
 
 GF_Err gf_mse_track_buffer_get_next_packet(GF_HTML_Track *track,
-											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 **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 gf_mse_track_buffer_release_packet(GF_HTML_Track *track);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif	
+#endif

gpac-0.5.0.svn5178.tar.bz2/include/gpac/ietf.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/ietf.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -94,7 +94,7 @@
 	NC_RTSP_Only_Aggregate_Operation_Allowed	=	460,
 	NC_RTSP_Unsupported_Transport	=	461,
 	NC_RTSP_Destination_Unreachable	=	462,
-	
+
 	NC_RTSP_Internal_Server_Error	=	500,
 	NC_RTSP_Not_Implemented	=	501,
 	NC_RTSP_Bad_Gateway	=	502,
@@ -135,7 +135,7 @@
 void gf_rtsp_range_del(GF_RTSPRange *range);
 
 /*
-			Transport structure 
+			Transport structure
 		contains all network info for RTSP sessions (ports, uni/multi-cast, ...)
 */
 
@@ -174,7 +174,7 @@
 	u16 client_port_first, client_port_last;
 	u32 SSRC;
 
-	/*Transport protocol. In this version we only support RTP/AVP, the following flag tells 
+	/*Transport protocol. In this version we only support RTP/AVP, the following flag tells
 	us if this is RTP/AVP/TCP or RTP/AVP (default)*/
 	char *Profile;
 } GF_RTSPTransport;
@@ -228,18 +228,18 @@
 	Double Scale;
 	char *Session;
 	Double Speed;
-	/*nota : RTSP allows several configurations for a single channel (multicast and 
+	/*nota : RTSP allows several configurations for a single channel (multicast and
 	unicast , ...). Usually only 1*/
 	GF_List *Transports;
 	char *User_Agent;
 
 	/*type of the command, one of the described above*/
 	char *method;
-	
+
 	/*Header extensions*/
 	GF_List *Xtensions;
 
-	/*body of the command, size is Content-Length (auto computed when sent). It is not 
+	/*body of the command, size is Content-Length (auto computed when sent). It is not
 	terminated by a NULL char*/
 	char *body;
 
@@ -247,7 +247,7 @@
 			Specify ControlString if your request targets
 		a specific media stream in the service. If null, the service name only will be used
 		for control (for ex, both A and V streams in a single file)
-		If the request is GF_RTSP_OPTIONS, you must provide a control string containing the options 
+		If the request is GF_RTSP_OPTIONS, you must provide a control string containing the options
 		you want to query
 	*/
 	char *ControlString;
@@ -262,7 +262,7 @@
 	*/
 
 	/*full URL of the command. Not used at client side, as the URL is ALWAYS relative
-	to the server / service of the RTSP session 
+	to the server / service of the RTSP session
 	On the server side however redirections are up to the server, so we cannot decide for it	*/
 	char *service_name;
 	/*RTSP status code of the command as parsed. One of the above RTSP StatusCode*/
@@ -312,7 +312,7 @@
 	u32 ResponseCode;
 	/* comment from the server */
 	char *ResponseInfo;
-	
+
 	/*	Header Fields	*/
 	char *Accept;
 	char *Accept_Encoding;
@@ -353,7 +353,7 @@
 	u32 SessionTimeOut;
 	Double Speed;
 	char *Timestamp;
-	/*nota : RTSP allows several configurations for a single channel (multicast and 
+	/*nota : RTSP allows several configurations for a single channel (multicast and
 	unicast , ...). Usually only 1*/
 	GF_List *Transports;
 	char *Unsupported;
@@ -365,8 +365,8 @@
 	/*Header extensions*/
 	GF_List *Xtensions;
 
-	/*body of the response, size is Content-Length (auto computed when sent). It is not 
-	terminated by a NULL char when response is parsed but must be null-terminated when 
+	/*body of the response, size is Content-Length (auto computed when sent). It is not
+	terminated by a NULL char when response is parsed but must be null-terminated when
 	response is being sent*/
 	char *body;
 } GF_RTSPResponse;
@@ -419,7 +419,7 @@
 	/*Waiting*/
 	GF_RTSP_STATE_WAITING,
 	/*PLAY, PAUSE, RECORD. Aggregation is allowed for the same type, you can send several command
-	in a row. However the session will return GF_SERVICE_ERROR if you do not have 
+	in a row. However the session will return GF_SERVICE_ERROR if you do not have
 	a valid SessionID in the command
 	You cannot issue a SETUP / DESCRIBE while in this state*/
 	GF_RTSP_STATE_WAIT_FOR_CONTROL,
@@ -429,7 +429,7 @@
 };
 
 u32 gf_rtsp_get_session_state(GF_RTSPSession *sess);
-/*aggregate command state-machine: the PLAY/PAUSE can be aggregated 
+/*aggregate command state-machine: the PLAY/PAUSE can be aggregated
 (sent before the reply is received). This function gets the last command sent*/
 char *gf_rtsp_get_last_request(GF_RTSPSession *sess);
 /*foce a reset in case of pbs*/
@@ -442,8 +442,8 @@
 
 
 GF_Err gf_rtsp_set_interleave_callback(GF_RTSPSession *sess,
-						GF_Err (*SignalData)(GF_RTSPSession *sess, void *cbk_ptr, char *buffer, u32 bufferSize, Bool IsRTCP)
-				);
+                                       GF_Err (*SignalData)(GF_RTSPSession *sess, void *cbk_ptr, char *buffer, u32 bufferSize, Bool IsRTCP)
+                                      );
 
 
 GF_Err gf_rtsp_session_read(GF_RTSPSession *sess);
@@ -463,7 +463,7 @@
 /*fetch an RTSP request. The GF_RTSPCommand will be reseted before fetch*/
 GF_Err gf_rtsp_get_command(GF_RTSPSession *sess, GF_RTSPCommand *com);
 
-/*unpack the URL, check the service name / server. Typically used when a client sends a 
+/*unpack the URL, check the service name / server. Typically used when a client sends a
  DESCRIBE || SETUP url RTSP/1.0. Server / service name check must be performed by your app as redirection
 or services available are unknown here.*/
 GF_Err gf_rtsp_load_service_name(GF_RTSPSession *sess, char *URL);
@@ -478,7 +478,7 @@
 buffer shall be GF_MAX_IP_NAME_LEN long*/
 GF_Err gf_rtsp_get_session_ip(GF_RTSPSession *sess, char *buffer);
 
-/*returns the next available ID for interleaving. It is recommended that you use 2 
+/*returns the next available ID for interleaving. It is recommended that you use 2
 consecutive IDs for RTP/RTCP interleaving*/
 u8 gf_rtsp_get_next_interleave_id(GF_RTSPSession *sess);
 
@@ -539,12 +539,12 @@
 GF_RTPChannel *gf_rtp_new();
 void gf_rtp_del(GF_RTPChannel *ch);
 
-/*you configure a server channel through the transport structure, with the same info as a 
+/*you configure a server channel through the transport structure, with the same info as a
 client channel, the client_port_* info designing the REMOTE client and port_* designing
 your server channel*/
 GF_Err gf_rtp_setup_transport(GF_RTPChannel *ch, GF_RTSPTransport *trans_info, const char *remote_address);
 
-/*auto-setup of rtp/rtcp transport ports - only effective in unicast, non interleaved cases. 
+/*auto-setup of rtp/rtcp transport ports - only effective in unicast, non interleaved cases.
 for multicast port setup MUST be done through the above gf_rtp_setup_transport function
 this will take care of port reuse*/
 GF_Err gf_rtp_set_ports(GF_RTPChannel *ch, u16 first_port);
@@ -554,8 +554,8 @@
 GF_Err gf_rtp_setup_payload(GF_RTPChannel *ch, GF_RTPMap *map);
 
 /*enables sending of NAT keep-alive packets for NAT traversal
-	@nat_timeout: specifies the inactivity period in ms after which NAT keepalive packets are sent. 
-	If 0, disables NAT keep-alive packets 
+	@nat_timeout: specifies the inactivity period in ms after which NAT keepalive packets are sent.
+	If 0, disables NAT keep-alive packets
 */
 void gf_rtp_enable_nat_keepalive(GF_RTPChannel *ch, u32 nat_timeout);
 
@@ -585,7 +585,7 @@
 GF_Err gf_rtp_stop(GF_RTPChannel *ch);
 
 /*init the RTP info after a PLAY or PAUSE, rtp_time is the rtp TimeStamp of the RTP packet
-with seq_num sequence number. This info is needed to compute the CurrentTime of the RTP channel 
+with seq_num sequence number. This info is needed to compute the CurrentTime of the RTP channel
 ssrc may not be known if sender hasn't indicated it (use 0 then)*/
 GF_Err gf_rtp_set_info_rtp(GF_RTPChannel *ch, u32 seq_num, u32 rtp_time, u32 ssrc);
 
@@ -612,17 +612,17 @@
 the callback function. NOTE: many RTP implementation do NOT process RTCP info received on TCP...
 the lib will decide whether the report shall be sent or not, therefore you should call
 this function at regular times*/
-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,
+                               GF_Err (*RTP_TCPCallback)(void *cbk, char *pck, u32 pck_size),
+                               void *rtsp_cbk);
 
 /*send a BYE info (leaving the session)*/
 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 (*RTP_TCPCallback)(void *cbk, char *pck, u32 pck_size),
+                       void *rtsp_cbk);
 
 
-/*send RTP packet. In fast_send mode, user passes a pck pointer with 12 bytes available BEFORE pck to 
+/*send RTP packet. In fast_send mode, user passes a pck pointer with 12 bytes available BEFORE pck to
 write the header in place*/
 GF_Err gf_rtp_send_packet(GF_RTPChannel *ch, GF_RTPHeader *rtp_hdr, char *pck, u32 pck_size, Bool fast_send);
 
@@ -656,31 +656,31 @@
 
 
 
-	
+
 /****************************************************************************
 
 					SDP LIBRARY EXPORTS
-		
-		  Note: SDP is mainly a text protocol with 
+
+		  Note: SDP is mainly a text protocol with
 	well defined containers. The following structures are used to write / read
 	SDP informations, and the library also provides consistency checking
 
   When reading SDP, all text items/structures are allocated by the lib, and you
   must call gf_sdp_info_reset(GF_SDPInfo *sdp) or gf_sdp_info_del(GF_SDPInfo *sdp) to release the memory
 
-  When writing the SDP from a GF_SDPInfo, the output buffer is allocated by the library, 
+  When writing the SDP from a GF_SDPInfo, the output buffer is allocated by the library,
   and you must release it yourself
 
   Some quick constructors are available for GF_SDPConnection and GF_SDPMedia in order to set up
   some specific parameters to their default value
 
-  An extra function gf_sdp_info_check(GF_SDPInfo *sdp) is provided for compliency check 
+  An extra function gf_sdp_info_check(GF_SDPInfo *sdp) is provided for compliency check
   with RFC2327: all requested fields are checked as well as conflicting information forbidden
   in RFC 2327
 ****************************************************************************/
 
 /*
-	All attributes x-ZZZZ are considered as extensions attributes. If no "x-" is found 
+	All attributes x-ZZZZ are considered as extensions attributes. If no "x-" is found
 	the attributes in the RTSP response is SKIPPED. The "x-" radical is removed in the structure
 	when parsing commands / responses
 */
@@ -737,13 +737,13 @@
 
 	/*timezone adjustments, to cope with #timezones, daylight saving countries and co ...
 	Ex: adjTime = [2882844526 2898848070] adjOffset=[-1h 0]
-	[0]: at 2882844526 the time base by which the session's repeat times are calculated 
+	[0]: at 2882844526 the time base by which the session's repeat times are calculated
 	is shifted back by 1 hour
 	[1]: at time 2898848070 the session's original time base is restored
 	*/
 
-	/*Adjustment time at which the corresponding time offset is to be applied to the 
-	session time line (time used to compute the "repeat session"). 
+	/*Adjustment time at which the corresponding time offset is to be applied to the
+	session time line (time used to compute the "repeat session").
 	All Expressed in NPT*/
 	u32 AdjustmentTime[GF_SDP_MAX_TIMEOFFSET];
 	/* Offset with the session time line, ALWAYS ABSOLUTE OFFSET TO the specified StartTime*/
@@ -788,12 +788,12 @@
 	/*m=
 	0: application - 1:video - 2: audio - 3: text - 4:data - 5: control*/
 	u32 Type;
-	/*Port Number - For transports based on UDP, the value should be in the range 1024 
+	/*Port Number - For transports based on UDP, the value should be in the range 1024
 	to 65535 inclusive. For RTP compliance it should be an even number*/
 	u32 PortNumber;
 	/*number of ports described. If >= 2, the next media(s) in the SDP will be configured
 	to use the next tuple (for RTP). If 0 or 1, ignored
-	Note: this is used for scalable media: PortNumber indicates the port of the base 
+	Note: this is used for scalable media: PortNumber indicates the port of the base
 	media and NumPorts the ports||total number of the upper layers*/
 	u32 NumPorts;
 	/*currently ony "RTP/AVP" and "udp" defined*/
@@ -807,7 +807,7 @@
 
 	/*FMTP contains a list of FMTP structures*/
 	GF_List *FMTP;
-	
+
 	/*for RTP this is PayloadType, but can be opaque (string) depending on the app.
 	Formated as XX WW QQ FF
 	When reading the SDP, the payloads defined in RTPMap are removed from this list
@@ -821,7 +821,7 @@
 	/*Other SDP attributes for media desc*/
 
 	/*k=
-	method is 'clear' (key follows), 'base64' (key in base64), 'uri' (key is the URI) 
+	method is 'clear' (key follows), 'base64' (key in base64), 'uri' (key is the URI)
 	or 'prompt' (key not included)*/
 	char *k_method, *k_key;
 
@@ -858,13 +858,13 @@
 	/*p=*/
 	char *p_phone;
 	/*c= either 1 or 0 GF_SDPConnection */
-	GF_SDPConnection *c_connection;	
+	GF_SDPConnection *c_connection;
 	/*b=*/
 	GF_List *b_bandwidth;
 	/*All time info (t, r, z)*/
 	GF_List *Timing;
 	/*k=
-	method is 'clear' (key follows), 'base64' (key in base64), 'uri' (key is the URI) 
+	method is 'clear' (key follows), 'base64' (key in base64), 'uri' (key is the URI)
 	or 'prompt' (key not included)*/
 	char *k_method, *k_key;
 	/*all possible attributes (a=), session level*/
@@ -878,15 +878,15 @@
 
 	/*all attributes not defined in RFC 2327 for the presentation*/
 	GF_List *Attributes;
-	
+
 	/*list of media in the SDP*/
 	GF_List *media_desc;
 } GF_SDPInfo;
 
 
 /*
-  Memory Consideration: the destructors free all non-NULL string. You should therefore 
-  be carefull while (de-)assigning the strings. The function gf_sdp_info_parse() performs a complete 
+  Memory Consideration: the destructors free all non-NULL string. You should therefore
+  be carefull while (de-)assigning the strings. The function gf_sdp_info_parse() performs a complete
   reset of the GF_SDPInfo
 */
 /*constructor*/
@@ -929,13 +929,13 @@
 
 
 /*RTP<->SL mapping*/
-typedef struct 
+typedef struct
 {
 	/*1 - required options*/
 
 	/*mode, or "" if no mode ("generic" should be used instead)*/
 	char mode[30];
-	
+
 	/*config of the stream if carried in SDP*/
 	char *config;
 	u32 configSize;
@@ -950,7 +950,7 @@
 	u32 rvc_config_size;
 
 	/*2 - optional options*/
-	
+
 	/*size of AUs if constant*/
 	u32 ConstantSize;
 	/*duration of AUs if constant, in RTP timescale*/
@@ -962,7 +962,7 @@
 	u32 maxDisplacement;
 	/*de-interleaveBufferSize if not recomputable from maxDisplacement*/
 	u32 deinterleaveBufferSize;
-	
+
 	/*The number of bits on which the AU-size field is encoded in the AU-header*/
 	u32 SizeLength;
 	/*The number of bits on which the AU-Index is encoded in the first AU-header*/
@@ -976,10 +976,10 @@
 	u32 CTSDeltaLength;
 	/*random access point flag present*/
 	Bool RandomAccessIndication;
-	
+
 	/*The number of bits on which the Stream-state field is encoded in the AU-header (systems only)*/
 	u32 StreamStateIndication;
-	/*The number of bits that is used to encode the auxiliary-data-size field 
+	/*The number of bits that is used to encode the auxiliary-data-size field
 	(no normative usage of this section)*/
 	u32 AuxiliaryDataSizeLength;
 
@@ -992,7 +992,7 @@
 	u32 auh_first_min_len;
 	u32 auh_min_len;
 } GP_RTPSLMap;
-	
+
 
 /*packetizer config flags - some flags are dynamically re-assigned when detecting multiSL / B-Frames / ...*/
 enum
@@ -1024,7 +1024,7 @@
 	GP_RTP_PCK_USE_LATM_AAC	=	(1<<9),
 
 	/*ISMACryp options*/
-	/*signals that input data is selectively encrypted (eg not all input frames are encrypted) 
+	/*signals that input data is selectively encrypted (eg not all input frames are encrypted)
 	- this is usually automatically set by hinter*/
 	GP_RTP_PCK_SELECTIVE_ENCRYPTION =	(1<<10),
 	/*signals that each sample will have its own key indicator - ignored in non-multi modes
@@ -1042,7 +1042,7 @@
 */
 
 /*currently supported payload types*/
-enum 
+enum
 {
 	/*not defined*/
 	GF_RTP_PAYT_UNKNOWN,
@@ -1076,6 +1076,7 @@
 	GF_RTP_PAYT_H264_SVC,
 	/*use HEVC/H265 transport - no RFC yet, only draft*/
 	GF_RTP_PAYT_HEVC,
+	GF_RTP_PAYT_SHVC
 };
 
 
@@ -1093,7 +1094,7 @@
 	Also note that AU start/end is automatically updated, therefore you should only
 	set CTS-DTS-OCR-sequenceNumber (which is automatically incremented when spliting a payload)
 	-padding-idle infos
-	SL flags are computed on the fly, but you may wish to modify them in case of 
+	SL flags are computed on the fly, but you may wish to modify them in case of
 	packet drop/... at the encoder side
 
 */
@@ -1103,10 +1104,10 @@
 	GF_SLHeader sl_header;
 
 	/*
-	
+
 		PRIVATE _ DO NOT TOUCH
 	*/
-	
+
 	/*RTP payload type (RFC type, NOT the RTP hdr payT)*/
 	u32 rtp_payt;
 	/*packetization flags*/
@@ -1128,10 +1129,10 @@
 	void (*OnDataReference)(void *cbk_obj, u32 payload_size, u32 offset_from_orig);
 	void (*OnData)(void *cbk_obj, char *data, u32 data_size, Bool is_header);
 	void *cbk_obj;
-	
-		/*********************************
-			MPEG-4 Generic hinting 
-		*********************************/
+
+	/*********************************
+		MPEG-4 Generic hinting
+	*********************************/
 
 	/*SL to RTP map*/
 	GP_RTPSLMap slMap;
@@ -1150,28 +1151,28 @@
 	/*info for the current packet*/
 	u32 auh_size, bytesInPacket;
 
-		/*********************************
-				ISMACryp info
-		*********************************/
+	/*********************************
+			ISMACryp info
+	*********************************/
 	Bool force_flush, is_encrypted;
 	u64 IV, first_AU_IV;
 	char *key_indicator;
 
-		/*********************************
-				AVC-H264 info
-		*********************************/
+	/*********************************
+			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 info
+	*********************************/
 	/*ac3 ft flags*/
 	u8 ac3_ft;
 
-		/*********************************
-				HEVC-H265 info
-		*********************************/	
+	/*********************************
+			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];
 };
@@ -1188,7 +1189,7 @@
 		@header: rtp header for new packet - note that RTP header flags are not used until PacketDone is called
 	@OnPacketDone: callback function closing current RTP packet
 		@header: final rtp header for packet
-	@OnDataReference: optional, to call each time data from input buffer is added to current RTP packet. 
+	@OnDataReference: optional, to call each time data from input buffer is added to current RTP packet.
 		If not set, data must be added through OnData
 		@payload_size: size of reference data
 		@offset_from_orig: start offset in input buffer
@@ -1197,15 +1198,15 @@
 		@is_head: signal the data added MUST be inserted at the begining of the payload. Otherwise data
 		is concatenated as received
 */
-GP_RTPPacketizer *gf_rtp_builder_new(u32 rtp_payt, 
-						GF_SLConfig *slc, 
-						u32 flags,
-						void *cbk_obj, 
-						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)
-					);
+GP_RTPPacketizer *gf_rtp_builder_new(u32 rtp_payt,
+                                     GF_SLConfig *slc,
+                                     u32 flags,
+                                     void *cbk_obj,
+                                     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)
+                                    );
 
 /*destroy builder*/
 void gf_rtp_builder_del(GP_RTPPacketizer *builder);
@@ -1214,37 +1215,37 @@
 		init the builder
 	@MaxPayloadSize: maximum payload size of RTP packets (eg MTU minus IP/UDP/RTP headers)
 	@max_ptime: maximum packet duration IN RTP TIMESCALE
-	@StreamType: MPEG-4 system stream type - MUST always be provided for payloads format specifying 
+	@StreamType: MPEG-4 system stream type - MUST always be provided for payloads format specifying
 		audio or video streams
 	@OTI : MPEG-4 system objectTypeIndication - may be 0 if stream is not mpeg4 systems
 
 			*** all other params are for MultiSL draft ***
-	
-	  @avgSize: average size of an AU. This is not always known (real-time encoding). 
-In this case you should specify a rough compute indicating how many packets could be 
+
+	  @avgSize: average size of an AU. This is not always known (real-time encoding).
+In this case you should specify a rough compute indicating how many packets could be
 stored per RTP packet. for ex AAC stereo at 44100 k / 64kbps , one AU ~= 380 bytes
 so 3 AUs for 1500 MTU is ok - BE CAREFULL: MultiSL adds some SL info on top of the 12
 byte RTP header so you should specify a smaller size
-The packetizer will ALWAYS make sure there's no pb storing the packets so specifying 
-more will result in a slight overhead in the SL mapping but the gain to singleSL 
+The packetizer will ALWAYS make sure there's no pb storing the packets so specifying
+more will result in a slight overhead in the SL mapping but the gain to singleSL
 will still be worth it.
-	-Nota: at init, the packetizer can decide to switch to SingleSL if the average size 
+	-Nota: at init, the packetizer can decide to switch to SingleSL if the average size
 specified is too close to the PathMTU
 
 	@maxSize: max size of an AU. If unknown (real-time) set to 0
 	@avgTS: average CTS progression (1000/FPS for video)
-	@maxDTS: maximum DTS offset in case of bidirectional coding. 
+	@maxDTS: maximum DTS offset in case of bidirectional coding.
 	@IV_length: size (in bytes) of IV when ISMACrypted
 	@KI_length: size (in bytes) of key indicator when ISMACrypted
 	@pref_mode: MPEG-4 generic only, specifies the payload mode - can be NULL (mode generic)
 */
 
 void gf_rtp_builder_init(GP_RTPPacketizer *builder, u8 PayloadType, u32 MaxPayloadSize, u32 max_ptime,
-					   u32 StreamType, u32 OTI, u32 PL_ID,
-					   u32 avgSize, u32 maxSize, 
-					   u32 avgTS, u32 maxDTS,
-					   u32 IV_length, u32 KI_length,
-					   char *pref_mode);
+                         u32 StreamType, u32 OTI, u32 PL_ID,
+                         u32 avgSize, u32 maxSize,
+                         u32 avgTS, u32 maxDTS,
+                         u32 IV_length, u32 KI_length,
+                         char *pref_mode);
 
 /*set frame crypto info*/
 void gp_rtp_builder_set_cryp_info(GP_RTPPacketizer *builder, u64 IV, char *key_indicator, Bool is_encrypted);
@@ -1284,7 +1285,7 @@
 	GF_RTP_HAS_ISMACRYP = (1<<5),
 	GF_RTP_ISMA_SEL_ENC = (1<<6),
 	GF_RTP_ISMA_HAS_KEY_IDX = (1<<7),
-	
+
 	GF_RTP_AVC_USE_ANNEX_B = (1<<8)
 };
 
@@ -1318,7 +1319,7 @@
 
 	/*H264/AVC config*/
 	u32 h264_pck_mode;
-	
+
 	/*3GP text reassembler state*/
 	u8 nb_txt_frag, cur_txt_frag, sidx, txt_len, nb_mod_frag;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/avilib.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/avilib.h Changed

@@ -5,23 +5,23 @@
  *  multiple audio track support Copyright (C) 2002 Thomas Östreich
  *
  *  Original code:
- *  Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de> 
+ *  Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
  *
  *  This file is part of transcode, a linux video stream processing tool
- *      
+ *
  *  transcode is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  transcode is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -36,16 +36,16 @@
 
 typedef struct
 {
-  u64 key;
-  u64 pos;
-  u64 len;
+	u64 key;
+	u64 pos;
+	u64 len;
 } video_index_entry;
 
 typedef struct
 {
-   u64 pos;
-   u64 len;
-   u64 tot;
+	u64 pos;
+	u64 len;
+	u64 tot;
 } audio_index_entry;
 
 
@@ -53,187 +53,187 @@
 
 
 #define AVI_INDEX_OF_INDEXES 0x00             // when each entry in aIndex
-                                              // array points to an index chunk
+// array points to an index chunk
 #define AVI_INDEX_OF_CHUNKS  0x01             // when each entry in aIndex
-                                              // array points to a chunk in the file
+// array points to a chunk in the file
 #define AVI_INDEX_IS_DATA    0x80             // when each entry is aIndex is
-                                              // really the data
+// really the data
 // bIndexSubtype codes for INDEX_OF_CHUNKS
 //
 #define AVI_INDEX_2FIELD     0x01             // when fields within frames
-                                              // are also indexed
+// are also indexed
 
 
 
 typedef struct _avisuperindex_entry {
-    u64 qwOffset;           // absolute file offset
-    u32 dwSize;                  // size of index chunk at this offset
-    u32 dwDuration;              // time span in stream ticks
+	u64 qwOffset;           // absolute file offset
+	u32 dwSize;                  // size of index chunk at this offset
+	u32 dwDuration;              // time span in stream ticks
 } avisuperindex_entry;
 
 typedef struct _avistdindex_entry {
-    u32 dwOffset;                // qwBaseOffset + this is absolute file offset
-    u32 dwSize;                  // bit 31 is set if this is NOT a keyframe
+	u32 dwOffset;                // qwBaseOffset + this is absolute file offset
+	u32 dwSize;                  // bit 31 is set if this is NOT a keyframe
 } avistdindex_entry;
 
-// Standard index 
+// Standard index
 typedef struct _avistdindex_chunk {
-    char           fcc[4];                 // ix##
-    u32 dwSize;                 // size of this chunk
-    u16 wLongsPerEntry;         // must be sizeof(aIndex[0])/sizeof(DWORD)
-    u8  bIndexSubType;          // must be 0
-    u8  bIndexType;             // must be AVI_INDEX_OF_CHUNKS
-    u32  nEntriesInUse;          //
-    char           dwChunkId[4];           // '##dc' or '##db' or '##wb' etc..
-    u64 qwBaseOffset;       // all dwOffsets in aIndex array are relative to this
-    u32  dwReserved3;            // must be 0
-    avistdindex_entry *aIndex;
+	char           fcc[4];                 // ix##
+	u32 dwSize;                 // size of this chunk
+	u16 wLongsPerEntry;         // must be sizeof(aIndex[0])/sizeof(DWORD)
+	u8  bIndexSubType;          // must be 0
+	u8  bIndexType;             // must be AVI_INDEX_OF_CHUNKS
+	u32  nEntriesInUse;          //
+	char           dwChunkId[4];           // '##dc' or '##db' or '##wb' etc..
+	u64 qwBaseOffset;       // all dwOffsets in aIndex array are relative to this
+	u32  dwReserved3;            // must be 0
+	avistdindex_entry *aIndex;
 } avistdindex_chunk;
-    
+
 
 // Base Index Form 'indx'
 typedef struct _avisuperindex_chunk {
-    char           fcc[4];
-    u32  dwSize;                 // size of this chunk
-    u16 wLongsPerEntry;         // size of each entry in aIndex array (must be 8 for us)
-    u8  bIndexSubType;          // future use. must be 0
-    u8 bIndexType;             // one of AVI_INDEX_* codes
-    u32 nEntriesInUse;          // index of first unused member in aIndex array
-    char           dwChunkId[4];           // fcc of what is indexed
-    u32 dwReserved[3];          // meaning differs for each index type/subtype.
-                                           // 0 if unused
-    avisuperindex_entry *aIndex;           // where are the ix## chunks
-    avistdindex_chunk **stdindex;          // the ix## chunks itself (array)
+	char           fcc[4];
+	u32  dwSize;                 // size of this chunk
+	u16 wLongsPerEntry;         // size of each entry in aIndex array (must be 8 for us)
+	u8  bIndexSubType;          // future use. must be 0
+	u8 bIndexType;             // one of AVI_INDEX_* codes
+	u32 nEntriesInUse;          // index of first unused member in aIndex array
+	char           dwChunkId[4];           // fcc of what is indexed
+	u32 dwReserved[3];          // meaning differs for each index type/subtype.
+	// 0 if unused
+	avisuperindex_entry *aIndex;           // where are the ix## chunks
+	avistdindex_chunk **stdindex;          // the ix## chunks itself (array)
 } avisuperindex_chunk;
-    
+
 
 
 typedef struct track_s
 {
 
-    long   a_fmt;             /* Audio format, see #defines below */
-    long   a_chans;           /* Audio channels, 0 for no audio */
-    long   a_rate;            /* Rate in Hz */
-    long   a_bits;            /* bits per audio sample */
-    long   mp3rate;           /* mp3 bitrate kbs*/
-    long   a_vbr;             /* 0 == no Variable BitRate */
-    long   padrate;	      /* byte rate used for zero padding */
+	long   a_fmt;             /* Audio format, see #defines below */
+	long   a_chans;           /* Audio channels, 0 for no audio */
+	long   a_rate;            /* Rate in Hz */
+	long   a_bits;            /* bits per audio sample */
+	long   mp3rate;           /* mp3 bitrate kbs*/
+	long   a_vbr;             /* 0 == no Variable BitRate */
+	long   padrate;	      /* byte rate used for zero padding */
 
-    long   audio_strn;        /* Audio stream number */
-    u64  audio_bytes;       /* Total number of bytes of audio data */
-    long   audio_chunks;      /* Chunks of audio data in the file */
+	long   audio_strn;        /* Audio stream number */
+	u64  audio_bytes;       /* Total number of bytes of audio data */
+	long   audio_chunks;      /* Chunks of audio data in the file */
 
-    char   audio_tag[4];      /* Tag of audio data */
-    long   audio_posc;        /* Audio position: chunk */
-    long   audio_posb;        /* Audio position: byte within chunk */
- 
-    u64  a_codech_off;       /* absolut offset of audio codec information */ 
-    u64  a_codecf_off;       /* absolut offset of audio codec information */ 
+	char   audio_tag[4];      /* Tag of audio data */
+	long   audio_posc;        /* Audio position: chunk */
+	long   audio_posb;        /* Audio position: byte within chunk */
 
-    audio_index_entry *audio_index;
-    avisuperindex_chunk *audio_superindex;
+	u64  a_codech_off;       /* absolut offset of audio codec information */
+	u64  a_codecf_off;       /* absolut offset of audio codec information */
+
+	audio_index_entry *audio_index;
+	avisuperindex_chunk *audio_superindex;
 
 } track_t;
 
 typedef struct
 {
-  u32  bi_size;
-  u32  bi_width;
-  u32  bi_height;
-  u16  bi_planes;
-  u16  bi_bit_count;
-  u32  bi_compression;
-  u32  bi_size_image;
-  u32  bi_x_pels_per_meter;
-  u32  bi_y_pels_per_meter;
-  u32  bi_clr_used;
-  u32  bi_clr_important;
+	u32  bi_size;
+	u32  bi_width;
+	u32  bi_height;
+	u16  bi_planes;
+	u16  bi_bit_count;
+	u32  bi_compression;
+	u32  bi_size_image;
+	u32  bi_x_pels_per_meter;
+	u32  bi_y_pels_per_meter;
+	u32  bi_clr_used;
+	u32  bi_clr_important;
 } alBITMAPINFOHEADER;
 
 typedef struct
 {
-  u16  w_format_tag;
-  u16  n_channels;
-  u32  n_samples_per_sec;
-  u32  n_avg_bytes_per_sec;
-  u16  n_block_align;
-  u16  w_bits_per_sample;
-  u16  cb_size;
+	u16  w_format_tag;
+	u16  n_channels;
+	u32  n_samples_per_sec;
+	u32  n_avg_bytes_per_sec;
+	u16  n_block_align;
+	u16  w_bits_per_sample;
+	u16  cb_size;
 } alWAVEFORMATEX;
 
 typedef struct
 {
-  u32 fcc_type; 
-  u32 fcc_handler; 
-  u32 dw_flags; 
-  u32 dw_caps; 
-  u16 w_priority;
-  u16 w_language;
-  u32 dw_scale;
-  u32 dw_rate;
-  u32 dw_start;
-  u32 dw_length;
-  u32 dw_initial_frames;
-  u32 dw_suggested_buffer_size;
-  u32 dw_quality;
-  u32 dw_sample_size;
-  u16 dw_left;
-  u16 dw_top;
-  u16 dw_right;
-  u16 dw_bottom;
+	u32 fcc_type;
+	u32 fcc_handler;
+	u32 dw_flags;
+	u32 dw_caps;
+	u16 w_priority;
+	u16 w_language;
+	u32 dw_scale;
+	u32 dw_rate;
+	u32 dw_start;
+	u32 dw_length;
+	u32 dw_initial_frames;
+	u32 dw_suggested_buffer_size;
+	u32 dw_quality;
+	u32 dw_sample_size;
+	u16 dw_left;
+	u16 dw_top;
+	u16 dw_right;
+	u16 dw_bottom;
 } alAVISTREAMHEADER;
 
 typedef struct
 {
-  
-  FILE *fdes;              /* File descriptor of AVI file */
-  long   mode;              /* 0 for reading, 1 for writing */
-  
-  long   width;             /* Width  of a video frame */
-  long   height;            /* Height of a video frame */
-  double fps;               /* Frames per second */
-  char   compressor[8];     /* Type of compressor, 4 bytes + padding for 0 byte */
-  char   compressor2[8];     /* Type of compressor, 4 bytes + padding for 0 byte */
-  u32   video_strn;        /* Video stream number */
-  long   video_frames;      /* Number of video frames */
-  char   video_tag[4];      /* Tag of video data */
-  long   video_pos;         /* Number of next frame to be read
+
+	FILE *fdes;              /* File descriptor of AVI file */
+	long   mode;              /* 0 for reading, 1 for writing */
+
+	long   width;             /* Width  of a video frame */
+	long   height;            /* Height of a video frame */
+	double fps;               /* Frames per second */
+	char   compressor[8];     /* Type of compressor, 4 bytes + padding for 0 byte */
+	char   compressor2[8];     /* Type of compressor, 4 bytes + padding for 0 byte */
+	u32   video_strn;        /* Video stream number */
+	long   video_frames;      /* Number of video frames */
+	char   video_tag[4];      /* Tag of video data */
+	long   video_pos;         /* Number of next frame to be read
 			       (if index present) */
-  alAVISTREAMHEADER video_stream_header;
-  
-  u32 max_len;    /* maximum video chunk present */
-  
-  track_t track[AVI_MAX_TRACKS];  // up to AVI_MAX_TRACKS audio tracks supported
-  
-  s64  pos;               /* position in file */
-  long   n_idx;             /* number of index entries actually filled */
-  long   max_idx;           /* number of index entries actually allocated */
-  
-  s64  v_codech_off;      /* absolut offset of video codec (strh) info */ 
-  s64  v_codecf_off;      /* absolut offset of video codec (strf) info */ 
-  
-  u8 (*idx)[16]; /* index entries (AVI idx1 tag) */
-
-  video_index_entry *video_index;
-  avisuperindex_chunk *video_superindex;  /* index of indices */
-  int is_opendml;           /* set to 1 if this is an odml file with multiple index chunks */
-  
-  s64  last_pos;          /* Position of last frame written */
-  u32 last_len;   /* Length of last frame written */
-  int must_use_index;       /* Flag if frames are duplicated */
-  s64  movi_start;
-  int total_frames;         /* total number of frames if dmlh is present */
-  
-  u32 anum;            // total number of audio tracks 
-  u32 aptr;            // current audio working track 
-  char *index_file;    // read the avi index from this file
-  
-  alBITMAPINFOHEADER *bitmap_info_header;
-  alWAVEFORMATEX *wave_format_ex[AVI_MAX_TRACKS];
-  alAVISTREAMHEADER stream_headers[AVI_MAX_TRACKS];
-
-  void*		extradata;
-  unsigned long	extradata_size;
+	alAVISTREAMHEADER video_stream_header;
+
+	u32 max_len;    /* maximum video chunk present */
+
+	track_t track[AVI_MAX_TRACKS];  // up to AVI_MAX_TRACKS audio tracks supported
+
+	s64  pos;               /* position in file */
+	long   n_idx;             /* number of index entries actually filled */
+	long   max_idx;           /* number of index entries actually allocated */
+
+	s64  v_codech_off;      /* absolut offset of video codec (strh) info */
+	s64  v_codecf_off;      /* absolut offset of video codec (strf) info */
+
+	u8 (*idx)[16]; /* index entries (AVI idx1 tag) */
+
+	video_index_entry *video_index;
+	avisuperindex_chunk *video_superindex;  /* index of indices */
+	int is_opendml;           /* set to 1 if this is an odml file with multiple index chunks */
+
+	s64  last_pos;          /* Position of last frame written */
+	u32 last_len;   /* Length of last frame written */
+	int must_use_index;       /* Flag if frames are duplicated */
+	s64  movi_start;
+	int total_frames;         /* total number of frames if dmlh is present */
+
+	u32 anum;            // total number of audio tracks
+	u32 aptr;            // current audio working track
+	char *index_file;    // read the avi index from this file
+
+	alBITMAPINFOHEADER *bitmap_info_header;
+	alWAVEFORMATEX *wave_format_ex[AVI_MAX_TRACKS];
+	alAVISTREAMHEADER stream_headers[AVI_MAX_TRACKS];
+
+	void*		extradata;
+	unsigned long	extradata_size;
 } avi_t;
 
 #define AVI_MODE_WRITE  0
@@ -356,8 +356,8 @@
 long AVI_read_audio(avi_t *AVI, char *audbuf, long bytes, int *continuous);
 
 int  AVI_read_data(avi_t *AVI, char *vidbuf, long max_vidbuf,
-                               char *audbuf, long max_audbuf,
-                               long *len);
+                   char *audbuf, long max_audbuf,
+                   long *len);
 
 int AVI_scan(char *name);
 int AVI_dump(char *name, int mode);
@@ -379,21 +379,21 @@
 void AVI_set_comment_fd(avi_t *AVI, int fd);
 int  AVI_get_comment_fd(avi_t *AVI);
 
-struct riff_struct 
+struct riff_struct
 {
-  u8 id[4];   /* RIFF */
-  u32 len;
-  u8 wave_id[4]; /* WAVE */
+	u8 id[4];   /* RIFF */
+	u32 len;
+	u8 wave_id[4]; /* WAVE */
 };
 
 
-struct chunk_struct 
+struct chunk_struct
 {
 	u8 id[4];
 	u32 len;
 };
 
-struct common_struct 
+struct common_struct
 {
 	u16 wFormatTag;
 	u16 wChannels;
@@ -403,7 +403,7 @@
 	u16 wBitsPerSample;  /* Only for PCM */
 };
 
-struct wave_header 
+struct wave_header
 {
 	struct riff_struct   riff;
 	struct chunk_struct  format;
@@ -419,18 +419,18 @@
 
 
 struct AVIStreamHeader {
-  long  fccType;
-  long  fccHandler;
-  long  dwFlags;
-  long  dwPriority;
-  long  dwInitialFrames;
-  long  dwScale;
-  long  dwRate;
-  long  dwStart;
-  long  dwLength;
-  long  dwSuggestedBufferSize;
-  long  dwQuality;
-  long  dwSampleSize;
+	long  fccType;
+	long  fccHandler;
+	long  dwFlags;
+	long  dwPriority;
+	long  dwInitialFrames;
+	long  dwScale;
+	long  dwRate;
+	long  dwStart;
+	long  dwLength;
+	long  dwSuggestedBufferSize;
+	long  dwQuality;
+	long  dwSampleSize;
 };
 
 #endif /*GPAC_DISABLE_AVILIB*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/bifs_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/bifs_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -74,14 +74,14 @@
 
 
 /*per_stream config support*/
-typedef struct 
+typedef struct
 {
 	BIFSConfig config;
 	u16 ESID;
 } BIFSStreamInfo;
 
 /*per_stream config support*/
-typedef struct 
+typedef struct
 {
 	GF_Node *node;
 	SFCommandBuffer *cb;
@@ -109,7 +109,7 @@
 	M_QuantizationParameter *ActiveQP;
 
 	/*QP 14 stuff: we need to store the last numb of fields in the last received Coord //field (!!!)*/
-	
+
 	/*number of iten in the Coord field*/
 	u32 NumCoord;
 	Bool coord_stored, storing_coord;
@@ -195,7 +195,7 @@
 
 GF_Err gf_bifs_enc_commands(GF_BifsEncoder *codec, GF_List *comList, GF_BitStream *bs);
 
-GF_Err gf_bifs_enc_node(GF_BifsEncoder * codec, GF_Node *node, u32 NDT_Tag, GF_BitStream *bs);
+GF_Err gf_bifs_enc_node(GF_BifsEncoder * codec, GF_Node *node, u32 NDT_Tag, GF_BitStream *bs, GF_Node *parent_node);
 GF_Err gf_bifs_enc_sf_field(GF_BifsEncoder *codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
 GF_Err gf_bifs_enc_field(GF_BifsEncoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
 GF_Err gf_bifs_enc_mf_field(GF_BifsEncoder *codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
@@ -207,7 +207,7 @@
 		gf_bs_write_int(bs, val, nbBits);	\
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] %s\t\t%d\t\t%d\t\t%s\n", str, nbBits, val, com ? com : "") );	\
 	} \
-
+ 
 GF_Route *gf_bifs_enc_is_field_ised(GF_BifsEncoder *codec, GF_Node *node, u32 fieldIndex);
 
 #endif /*GPAC_DISABLE_BIFS_ENC*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/bifs_tables.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/bifs_tables.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -15,7 +15,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -50,217 +50,217 @@
 #define SFWorldNode_V1_Count	100
 
 static const u32 SFWorldNode_V1_TypeToTag[100] = {
- TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Appearance, TAG_MPEG4_AudioBuffer, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioDelay, TAG_MPEG4_AudioFX, TAG_MPEG4_AudioMix, TAG_MPEG4_AudioSource, TAG_MPEG4_AudioSwitch, TAG_MPEG4_Background, TAG_MPEG4_Background2D, TAG_MPEG4_Billboard, TAG_MPEG4_Bitmap, TAG_MPEG4_Box, TAG_MPEG4_Circle, TAG_MPEG4_Collision, TAG_MPEG4_Color, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_CompositeTexture2D, TAG_MPEG4_CompositeTexture3D, TAG_MPEG4_Conditional, TAG_MPEG4_Cone, TAG_MPEG4_Coordinate, TAG_MPEG4_Coordinate2D, TAG_MPEG4_CoordinateInterpolator, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_Curve2D, TAG_MPEG4_Cylinder, TAG_MPEG4_CylinderSensor, TAG_MPEG4_DirectionalLight, TAG_MPEG4_DiscSensor, TAG_MPEG4_ElevationGrid, TAG_MPEG4_Expression, TAG_MPEG4_Extrusion, TAG_MPEG4_Face, TAG_MPEG4_FaceDefMesh, TAG_MPEG4_FaceDefTables, TAG_MPEG4_FaceDefTransform, TAG_MPEG4_FAP, TAG_MPEG4_FDP, TAG_MPEG4_FIT, TAG_MPEG4_Fog, TAG_MPEG4_FontStyle, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_ImageTexture, TAG_MPEG4_IndexedFaceSet, TAG_MPEG4_IndexedFaceSet2D, TAG_MPEG4_IndexedLineSet, TAG_MPEG4_IndexedLineSet2D, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_LineProperties, TAG_MPEG4_ListeningPoint, TAG_MPEG4_Material, TAG_MPEG4_Material2D, TAG_MPEG4_MovieTexture, TAG_MPEG4_NavigationInfo, TAG_MPEG4_Normal, TAG_MPEG4_NormalInterpolator, TAG_MPEG4_OrderedGroup, TAG_MPEG4_OrientationInterpolator, TAG_MPEG4_PixelTexture, TAG_MPEG4_PlaneSensor, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PointLight, TAG_MPEG4_PointSet, TAG_MPEG4_PointSet2D, TAG_MPEG4_PositionInterpolator, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_ProximitySensor, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_Rectangle, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound, TAG_MPEG4_Sound2D, TAG_MPEG4_Sphere, TAG_MPEG4_SphereSensor, TAG_MPEG4_SpotLight, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_Text, TAG_MPEG4_TextureCoordinate, TAG_MPEG4_TextureTransform, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_Viewpoint, TAG_MPEG4_VisibilitySensor, TAG_MPEG4_Viseme, TAG_MPEG4_WorldInfo
+	TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Appearance, TAG_MPEG4_AudioBuffer, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioDelay, TAG_MPEG4_AudioFX, TAG_MPEG4_AudioMix, TAG_MPEG4_AudioSource, TAG_MPEG4_AudioSwitch, TAG_MPEG4_Background, TAG_MPEG4_Background2D, TAG_MPEG4_Billboard, TAG_MPEG4_Bitmap, TAG_MPEG4_Box, TAG_MPEG4_Circle, TAG_MPEG4_Collision, TAG_MPEG4_Color, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_CompositeTexture2D, TAG_MPEG4_CompositeTexture3D, TAG_MPEG4_Conditional, TAG_MPEG4_Cone, TAG_MPEG4_Coordinate, TAG_MPEG4_Coordinate2D, TAG_MPEG4_CoordinateInterpolator, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_Curve2D, TAG_MPEG4_Cylinder, TAG_MPEG4_CylinderSensor, TAG_MPEG4_DirectionalLight, TAG_MPEG4_DiscSensor, TAG_MPEG4_ElevationGrid, TAG_MPEG4_Expression, TAG_MPEG4_Extrusion, TAG_MPEG4_Face, TAG_MPEG4_FaceDefMesh, TAG_MPEG4_FaceDefTables, TAG_MPEG4_FaceDefTransform, TAG_MPEG4_FAP, TAG_MPEG4_FDP, TAG_MPEG4_FIT, TAG_MPEG4_Fog, TAG_MPEG4_FontStyle, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_ImageTexture, TAG_MPEG4_IndexedFaceSet, TAG_MPEG4_IndexedFaceSet2D, TAG_MPEG4_IndexedLineSet, TAG_MPEG4_IndexedLineSet2D, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_LineProperties, TAG_MPEG4_ListeningPoint, TAG_MPEG4_Material, TAG_MPEG4_Material2D, TAG_MPEG4_MovieTexture, TAG_MPEG4_NavigationInfo, TAG_MPEG4_Normal, TAG_MPEG4_NormalInterpolator, TAG_MPEG4_OrderedGroup, TAG_MPEG4_OrientationInterpolator, TAG_MPEG4_PixelTexture, TAG_MPEG4_PlaneSensor, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PointLight, TAG_MPEG4_PointSet, TAG_MPEG4_PointSet2D, TAG_MPEG4_PositionInterpolator, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_ProximitySensor, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_Rectangle, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound, TAG_MPEG4_Sound2D, TAG_MPEG4_Sphere, TAG_MPEG4_SphereSensor, TAG_MPEG4_SpotLight, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_Text, TAG_MPEG4_TextureCoordinate, TAG_MPEG4_TextureTransform, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_Viewpoint, TAG_MPEG4_VisibilitySensor, TAG_MPEG4_Viseme, TAG_MPEG4_WorldInfo
 };
 
 #define SF3DNode_V1_NUMBITS		6
 #define SF3DNode_V1_Count	52
 
 static const u32 SF3DNode_V1_TypeToTag[52] = {
- TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Background, TAG_MPEG4_Background2D, TAG_MPEG4_Billboard, TAG_MPEG4_Collision, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_Conditional, TAG_MPEG4_CoordinateInterpolator, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_CylinderSensor, TAG_MPEG4_DirectionalLight, TAG_MPEG4_DiscSensor, TAG_MPEG4_Face, TAG_MPEG4_Fog, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_ListeningPoint, TAG_MPEG4_NavigationInfo, TAG_MPEG4_NormalInterpolator, TAG_MPEG4_OrderedGroup, TAG_MPEG4_OrientationInterpolator, TAG_MPEG4_PlaneSensor, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PointLight, TAG_MPEG4_PositionInterpolator, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_ProximitySensor, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound, TAG_MPEG4_Sound2D, TAG_MPEG4_SphereSensor, TAG_MPEG4_SpotLight, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_Viewpoint, TAG_MPEG4_VisibilitySensor, TAG_MPEG4_WorldInfo
+	TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Background, TAG_MPEG4_Background2D, TAG_MPEG4_Billboard, TAG_MPEG4_Collision, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_Conditional, TAG_MPEG4_CoordinateInterpolator, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_CylinderSensor, TAG_MPEG4_DirectionalLight, TAG_MPEG4_DiscSensor, TAG_MPEG4_Face, TAG_MPEG4_Fog, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_ListeningPoint, TAG_MPEG4_NavigationInfo, TAG_MPEG4_NormalInterpolator, TAG_MPEG4_OrderedGroup, TAG_MPEG4_OrientationInterpolator, TAG_MPEG4_PlaneSensor, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PointLight, TAG_MPEG4_PositionInterpolator, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_ProximitySensor, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound, TAG_MPEG4_Sound2D, TAG_MPEG4_SphereSensor, TAG_MPEG4_SpotLight, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_Viewpoint, TAG_MPEG4_VisibilitySensor, TAG_MPEG4_WorldInfo
 };
 
 #define SF2DNode_V1_NUMBITS		5
 #define SF2DNode_V1_Count	31
 
 static const u32 SF2DNode_V1_TypeToTag[31] = {
- TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Background2D, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_Conditional, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_DiscSensor, TAG_MPEG4_Face, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_OrderedGroup, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound2D, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_WorldInfo
+	TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Background2D, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_Conditional, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_DiscSensor, TAG_MPEG4_Face, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_OrderedGroup, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound2D, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_WorldInfo
 };
 
 #define SFStreamingNode_V1_NUMBITS		3
 #define SFStreamingNode_V1_Count	5
 
 static const u32 SFStreamingNode_V1_TypeToTag[5] = {
- TAG_MPEG4_AnimationStream, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioSource, TAG_MPEG4_Inline, TAG_MPEG4_MovieTexture
+	TAG_MPEG4_AnimationStream, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioSource, TAG_MPEG4_Inline, TAG_MPEG4_MovieTexture
 };
 
 #define SFAppearanceNode_V1_NUMBITS		1
 #define SFAppearanceNode_V1_Count	1
 
 static const u32 SFAppearanceNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Appearance
+	TAG_MPEG4_Appearance
 };
 
 #define SFAudioNode_V1_NUMBITS		3
 #define SFAudioNode_V1_Count	7
 
 static const u32 SFAudioNode_V1_TypeToTag[7] = {
- TAG_MPEG4_AudioBuffer, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioDelay, TAG_MPEG4_AudioFX, TAG_MPEG4_AudioMix, TAG_MPEG4_AudioSource, TAG_MPEG4_AudioSwitch
+	TAG_MPEG4_AudioBuffer, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioDelay, TAG_MPEG4_AudioFX, TAG_MPEG4_AudioMix, TAG_MPEG4_AudioSource, TAG_MPEG4_AudioSwitch
 };
 
 #define SFBackground3DNode_V1_NUMBITS		1
 #define SFBackground3DNode_V1_Count	1
 
 static const u32 SFBackground3DNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Background
+	TAG_MPEG4_Background
 };
 
 #define SFBackground2DNode_V1_NUMBITS		1
 #define SFBackground2DNode_V1_Count	1
 
 static const u32 SFBackground2DNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Background2D
+	TAG_MPEG4_Background2D
 };
 
 #define SFGeometryNode_V1_NUMBITS		5
 #define SFGeometryNode_V1_Count	17
 
 static const u32 SFGeometryNode_V1_TypeToTag[17] = {
- TAG_MPEG4_Bitmap, TAG_MPEG4_Box, TAG_MPEG4_Circle, TAG_MPEG4_Cone, TAG_MPEG4_Curve2D, TAG_MPEG4_Cylinder, TAG_MPEG4_ElevationGrid, TAG_MPEG4_Extrusion, TAG_MPEG4_IndexedFaceSet, TAG_MPEG4_IndexedFaceSet2D, TAG_MPEG4_IndexedLineSet, TAG_MPEG4_IndexedLineSet2D, TAG_MPEG4_PointSet, TAG_MPEG4_PointSet2D, TAG_MPEG4_Rectangle, TAG_MPEG4_Sphere, TAG_MPEG4_Text
+	TAG_MPEG4_Bitmap, TAG_MPEG4_Box, TAG_MPEG4_Circle, TAG_MPEG4_Cone, TAG_MPEG4_Curve2D, TAG_MPEG4_Cylinder, TAG_MPEG4_ElevationGrid, TAG_MPEG4_Extrusion, TAG_MPEG4_IndexedFaceSet, TAG_MPEG4_IndexedFaceSet2D, TAG_MPEG4_IndexedLineSet, TAG_MPEG4_IndexedLineSet2D, TAG_MPEG4_PointSet, TAG_MPEG4_PointSet2D, TAG_MPEG4_Rectangle, TAG_MPEG4_Sphere, TAG_MPEG4_Text
 };
 
 #define SFColorNode_V1_NUMBITS		1
 #define SFColorNode_V1_Count	1
 
 static const u32 SFColorNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Color
+	TAG_MPEG4_Color
 };
 
 #define SFTextureNode_V1_NUMBITS		3
 #define SFTextureNode_V1_Count	5
 
 static const u32 SFTextureNode_V1_TypeToTag[5] = {
- TAG_MPEG4_CompositeTexture2D, TAG_MPEG4_CompositeTexture3D, TAG_MPEG4_ImageTexture, TAG_MPEG4_MovieTexture, TAG_MPEG4_PixelTexture
+	TAG_MPEG4_CompositeTexture2D, TAG_MPEG4_CompositeTexture3D, TAG_MPEG4_ImageTexture, TAG_MPEG4_MovieTexture, TAG_MPEG4_PixelTexture
 };
 
 #define SFCoordinateNode_V1_NUMBITS		1
 #define SFCoordinateNode_V1_Count	1
 
 static const u32 SFCoordinateNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Coordinate
+	TAG_MPEG4_Coordinate
 };
 
 #define SFCoordinate2DNode_V1_NUMBITS		1
 #define SFCoordinate2DNode_V1_Count	1
 
 static const u32 SFCoordinate2DNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Coordinate2D
+	TAG_MPEG4_Coordinate2D
 };
 
 #define SFExpressionNode_V1_NUMBITS		1
 #define SFExpressionNode_V1_Count	1
 
 static const u32 SFExpressionNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Expression
+	TAG_MPEG4_Expression
 };
 
 #define SFFaceDefMeshNode_V1_NUMBITS		1
 #define SFFaceDefMeshNode_V1_Count	1
 
 static const u32 SFFaceDefMeshNode_V1_TypeToTag[1] = {
- TAG_MPEG4_FaceDefMesh
+	TAG_MPEG4_FaceDefMesh
 };
 
 #define SFFaceDefTablesNode_V1_NUMBITS		1
 #define SFFaceDefTablesNode_V1_Count	1
 
 static const u32 SFFaceDefTablesNode_V1_TypeToTag[1] = {
- TAG_MPEG4_FaceDefTables
+	TAG_MPEG4_FaceDefTables
 };
 
 #define SFFaceDefTransformNode_V1_NUMBITS		1
 #define SFFaceDefTransformNode_V1_Count	1
 
 static const u32 SFFaceDefTransformNode_V1_TypeToTag[1] = {
- TAG_MPEG4_FaceDefTransform
+	TAG_MPEG4_FaceDefTransform
 };
 
 #define SFFAPNode_V1_NUMBITS		1
 #define SFFAPNode_V1_Count	1
 
 static const u32 SFFAPNode_V1_TypeToTag[1] = {
- TAG_MPEG4_FAP
+	TAG_MPEG4_FAP
 };
 
 #define SFFDPNode_V1_NUMBITS		1
 #define SFFDPNode_V1_Count	1
 
 static const u32 SFFDPNode_V1_TypeToTag[1] = {
- TAG_MPEG4_FDP
+	TAG_MPEG4_FDP
 };
 
 #define SFFITNode_V1_NUMBITS		1
 #define SFFITNode_V1_Count	1
 
 static const u32 SFFITNode_V1_TypeToTag[1] = {
- TAG_MPEG4_FIT
+	TAG_MPEG4_FIT
 };
 
 #define SFFogNode_V1_NUMBITS		1
 #define SFFogNode_V1_Count	1
 
 static const u32 SFFogNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Fog
+	TAG_MPEG4_Fog
 };
 
 #define SFFontStyleNode_V1_NUMBITS		1
 #define SFFontStyleNode_V1_Count	1
 
 static const u32 SFFontStyleNode_V1_TypeToTag[1] = {
- TAG_MPEG4_FontStyle
+	TAG_MPEG4_FontStyle
 };
 
 #define SFTopNode_V1_NUMBITS		3
 #define SFTopNode_V1_Count	4
 
 static const u32 SFTopNode_V1_TypeToTag[4] = {
- TAG_MPEG4_Group, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_OrderedGroup
+	TAG_MPEG4_Group, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_OrderedGroup
 };
 
 #define SFLinePropertiesNode_V1_NUMBITS		1
 #define SFLinePropertiesNode_V1_Count	1
 
 static const u32 SFLinePropertiesNode_V1_TypeToTag[1] = {
- TAG_MPEG4_LineProperties
+	TAG_MPEG4_LineProperties
 };
 
 #define SFMaterialNode_V1_NUMBITS		2
 #define SFMaterialNode_V1_Count	2
 
 static const u32 SFMaterialNode_V1_TypeToTag[2] = {
- TAG_MPEG4_Material, TAG_MPEG4_Material2D
+	TAG_MPEG4_Material, TAG_MPEG4_Material2D
 };
 
 #define SFNavigationInfoNode_V1_NUMBITS		1
 #define SFNavigationInfoNode_V1_Count	1
 
 static const u32 SFNavigationInfoNode_V1_TypeToTag[1] = {
- TAG_MPEG4_NavigationInfo
+	TAG_MPEG4_NavigationInfo
 };
 
 #define SFNormalNode_V1_NUMBITS		1
 #define SFNormalNode_V1_Count	1
 
 static const u32 SFNormalNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Normal
+	TAG_MPEG4_Normal
 };
 
 #define SFTextureCoordinateNode_V1_NUMBITS		1
 #define SFTextureCoordinateNode_V1_Count	1
 
 static const u32 SFTextureCoordinateNode_V1_TypeToTag[1] = {
- TAG_MPEG4_TextureCoordinate
+	TAG_MPEG4_TextureCoordinate
 };
 
 #define SFTextureTransformNode_V1_NUMBITS		1
 #define SFTextureTransformNode_V1_Count	1
 
 static const u32 SFTextureTransformNode_V1_TypeToTag[1] = {
- TAG_MPEG4_TextureTransform
+	TAG_MPEG4_TextureTransform
 };
 
 #define SFViewpointNode_V1_NUMBITS		1
 #define SFViewpointNode_V1_Count	1
 
 static const u32 SFViewpointNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Viewpoint
+	TAG_MPEG4_Viewpoint
 };
 
 #define SFVisemeNode_V1_NUMBITS		1
 #define SFVisemeNode_V1_Count	1
 
 static const u32 SFVisemeNode_V1_TypeToTag[1] = {
- TAG_MPEG4_Viseme
+	TAG_MPEG4_Viseme
 };
 
 
@@ -277,70 +277,70 @@
 #define SFWorldNode_V2_Count	12
 
 static const u32 SFWorldNode_V2_TypeToTag[12] = {
- TAG_MPEG4_AcousticMaterial, TAG_MPEG4_AcousticScene, TAG_MPEG4_ApplicationWindow, TAG_MPEG4_BAP, TAG_MPEG4_BDP, TAG_MPEG4_Body, TAG_MPEG4_BodyDefTable, TAG_MPEG4_BodySegmentConnectionHint, TAG_MPEG4_DirectiveSound, TAG_MPEG4_Hierarchical3DMesh, TAG_MPEG4_MaterialKey, TAG_MPEG4_PerceptualParameters
+	TAG_MPEG4_AcousticMaterial, TAG_MPEG4_AcousticScene, TAG_MPEG4_ApplicationWindow, TAG_MPEG4_BAP, TAG_MPEG4_BDP, TAG_MPEG4_Body, TAG_MPEG4_BodyDefTable, TAG_MPEG4_BodySegmentConnectionHint, TAG_MPEG4_DirectiveSound, TAG_MPEG4_Hierarchical3DMesh, TAG_MPEG4_MaterialKey, TAG_MPEG4_PerceptualParameters
 };
 
 #define SF3DNode_V2_NUMBITS		3
 #define SF3DNode_V2_Count	3
 
 static const u32 SF3DNode_V2_TypeToTag[3] = {
- TAG_MPEG4_AcousticScene, TAG_MPEG4_Body, TAG_MPEG4_DirectiveSound
+	TAG_MPEG4_AcousticScene, TAG_MPEG4_Body, TAG_MPEG4_DirectiveSound
 };
 
 #define SF2DNode_V2_NUMBITS		2
 #define SF2DNode_V2_Count	2
 
 static const u32 SF2DNode_V2_TypeToTag[2] = {
- TAG_MPEG4_ApplicationWindow, TAG_MPEG4_Body
+	TAG_MPEG4_ApplicationWindow, TAG_MPEG4_Body
 };
 
 #define SFGeometryNode_V2_NUMBITS		2
 #define SFGeometryNode_V2_Count	1
 
 static const u32 SFGeometryNode_V2_TypeToTag[1] = {
- TAG_MPEG4_Hierarchical3DMesh
+	TAG_MPEG4_Hierarchical3DMesh
 };
 
 #define SFMaterialNode_V2_NUMBITS		2
 #define SFMaterialNode_V2_Count	2
 
 static const u32 SFMaterialNode_V2_TypeToTag[2] = {
- TAG_MPEG4_AcousticMaterial, TAG_MPEG4_MaterialKey
+	TAG_MPEG4_AcousticMaterial, TAG_MPEG4_MaterialKey
 };
 
 #define SFBAPNode_V2_NUMBITS		2
 #define SFBAPNode_V2_Count	1
 
 static const u32 SFBAPNode_V2_TypeToTag[1] = {
- TAG_MPEG4_BAP
+	TAG_MPEG4_BAP
 };
 
 #define SFBDPNode_V2_NUMBITS		2
 #define SFBDPNode_V2_Count	1
 
 static const u32 SFBDPNode_V2_TypeToTag[1] = {
- TAG_MPEG4_BDP
+	TAG_MPEG4_BDP
 };
 
 #define SFBodyDefTableNode_V2_NUMBITS		2
 #define SFBodyDefTableNode_V2_Count	1
 
 static const u32 SFBodyDefTableNode_V2_TypeToTag[1] = {
- TAG_MPEG4_BodyDefTable
+	TAG_MPEG4_BodyDefTable
 };
 
 #define SFBodySegmentConnectionHintNode_V2_NUMBITS		2
 #define SFBodySegmentConnectionHintNode_V2_Count	1
 
 static const u32 SFBodySegmentConnectionHintNode_V2_TypeToTag[1] = {
- TAG_MPEG4_BodySegmentConnectionHint
+	TAG_MPEG4_BodySegmentConnectionHint
 };
 
 #define SFPerceptualParameterNode_V2_NUMBITS		2
 #define SFPerceptualParameterNode_V2_Count	1
 
 static const u32 SFPerceptualParameterNode_V2_TypeToTag[1] = {
- TAG_MPEG4_PerceptualParameters
+	TAG_MPEG4_PerceptualParameters
 };
 
 
@@ -357,28 +357,28 @@
 #define SFWorldNode_V3_Count	3
 
 static const u32 SFWorldNode_V3_TypeToTag[3] = {
- TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
+	TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
 };
 
 #define SF3DNode_V3_NUMBITS		2
 #define SF3DNode_V3_Count	3
 
 static const u32 SF3DNode_V3_TypeToTag[3] = {
- TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
+	TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
 };
 
 #define SF2DNode_V3_NUMBITS		2
 #define SF2DNode_V3_Count	3
 
 static const u32 SF2DNode_V3_TypeToTag[3] = {
- TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
+	TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
 };
 
 #define SFTemporalNode_V3_NUMBITS		2
 #define SFTemporalNode_V3_Count	2
 
 static const u32 SFTemporalNode_V3_TypeToTag[2] = {
- TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup
+	TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup
 };
 
 
@@ -395,28 +395,28 @@
 #define SFWorldNode_V4_Count	5
 
 static const u32 SFWorldNode_V4_TypeToTag[5] = {
- TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
+	TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
 };
 
 #define SF3DNode_V4_NUMBITS		3
 #define SF3DNode_V4_Count	5
 
 static const u32 SF3DNode_V4_TypeToTag[5] = {
- TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
+	TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
 };
 
 #define SF2DNode_V4_NUMBITS		3
 #define SF2DNode_V4_Count	5
 
 static const u32 SF2DNode_V4_TypeToTag[5] = {
- TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
+	TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
 };
 
 #define SFTextureNode_V4_NUMBITS		1
 #define SFTextureNode_V4_Count	1
 
 static const u32 SFTextureNode_V4_TypeToTag[1] = {
- TAG_MPEG4_MatteTexture
+	TAG_MPEG4_MatteTexture
 };
 
 
@@ -433,147 +433,147 @@
 #define SFWorldNode_V5_Count	39
 
 static const u32 SFWorldNode_V5_TypeToTag[39] = {
- TAG_MPEG4_BitWrapper, TAG_MPEG4_CoordinateInterpolator4D, TAG_MPEG4_DepthImage, TAG_MPEG4_FFD, TAG_MPEG4_Implicit, TAG_MPEG4_XXLFM_Appearance, TAG_MPEG4_XXLFM_BlendList, TAG_MPEG4_XXLFM_FrameList, TAG_MPEG4_XXLFM_LightMap, TAG_MPEG4_XXLFM_SurfaceMapList, TAG_MPEG4_XXLFM_ViewMapList, TAG_MPEG4_MeshGrid, TAG_MPEG4_NonLinearDeformer, TAG_MPEG4_NurbsCurve, TAG_MPEG4_NurbsCurve2D, TAG_MPEG4_NurbsSurface, TAG_MPEG4_OctreeImage, TAG_MPEG4_XXParticles, TAG_MPEG4_XXParticleInitBox, TAG_MPEG4_XXPlanarObstacle, TAG_MPEG4_XXPointAttractor, TAG_MPEG4_PointTexture, TAG_MPEG4_PositionAnimator, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_PositionInterpolator4D, TAG_MPEG4_ProceduralTexture, TAG_MPEG4_Quadric, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator, TAG_MPEG4_SimpleTexture, TAG_MPEG4_SolidRep, TAG_MPEG4_SubdivisionSurface, TAG_MPEG4_SubdivSurfaceSector, TAG_MPEG4_WaveletSubdivisionSurface
+	TAG_MPEG4_BitWrapper, TAG_MPEG4_CoordinateInterpolator4D, TAG_MPEG4_DepthImage, TAG_MPEG4_FFD, TAG_MPEG4_Implicit, TAG_MPEG4_XXLFM_Appearance, TAG_MPEG4_XXLFM_BlendList, TAG_MPEG4_XXLFM_FrameList, TAG_MPEG4_XXLFM_LightMap, TAG_MPEG4_XXLFM_SurfaceMapList, TAG_MPEG4_XXLFM_ViewMapList, TAG_MPEG4_MeshGrid, TAG_MPEG4_NonLinearDeformer, TAG_MPEG4_NurbsCurve, TAG_MPEG4_NurbsCurve2D, TAG_MPEG4_NurbsSurface, TAG_MPEG4_OctreeImage, TAG_MPEG4_XXParticles, TAG_MPEG4_XXParticleInitBox, TAG_MPEG4_XXPlanarObstacle, TAG_MPEG4_XXPointAttractor, TAG_MPEG4_PointTexture, TAG_MPEG4_PositionAnimator, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_PositionInterpolator4D, TAG_MPEG4_ProceduralTexture, TAG_MPEG4_Quadric, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator, TAG_MPEG4_SimpleTexture, TAG_MPEG4_SolidRep, TAG_MPEG4_SubdivisionSurface, TAG_MPEG4_SubdivSurfaceSector, TAG_MPEG4_WaveletSubdivisionSurface
 };
 
 #define SF3DNode_V5_NUMBITS		5
 #define SF3DNode_V5_Count	17
 
 static const u32 SF3DNode_V5_TypeToTag[17] = {
- TAG_MPEG4_BitWrapper, TAG_MPEG4_CoordinateInterpolator4D, TAG_MPEG4_DepthImage, TAG_MPEG4_FFD, TAG_MPEG4_OctreeImage, TAG_MPEG4_XXParticles, TAG_MPEG4_PositionAnimator, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_PositionInterpolator4D, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator, TAG_MPEG4_WaveletSubdivisionSurface
+	TAG_MPEG4_BitWrapper, TAG_MPEG4_CoordinateInterpolator4D, TAG_MPEG4_DepthImage, TAG_MPEG4_FFD, TAG_MPEG4_OctreeImage, TAG_MPEG4_XXParticles, TAG_MPEG4_PositionAnimator, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_PositionInterpolator4D, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator, TAG_MPEG4_WaveletSubdivisionSurface
 };
 
 #define SF2DNode_V5_NUMBITS		4
 #define SF2DNode_V5_Count	9
 
 static const u32 SF2DNode_V5_TypeToTag[9] = {
- TAG_MPEG4_BitWrapper, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator
+	TAG_MPEG4_BitWrapper, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator
 };
 
 #define SFAppearanceNode_V5_NUMBITS		1
 #define SFAppearanceNode_V5_Count	1
 
 static const u32 SFAppearanceNode_V5_TypeToTag[1] = {
- TAG_MPEG4_XXLFM_Appearance
+	TAG_MPEG4_XXLFM_Appearance
 };
 
 #define SFGeometryNode_V5_NUMBITS		4
 #define SFGeometryNode_V5_Count	10
 
 static const u32 SFGeometryNode_V5_TypeToTag[10] = {
- TAG_MPEG4_BitWrapper, TAG_MPEG4_Implicit, TAG_MPEG4_MeshGrid, TAG_MPEG4_NonLinearDeformer, TAG_MPEG4_NurbsCurve, TAG_MPEG4_NurbsCurve2D, TAG_MPEG4_NurbsSurface, TAG_MPEG4_Quadric, TAG_MPEG4_SolidRep, TAG_MPEG4_SubdivisionSurface
+	TAG_MPEG4_BitWrapper, TAG_MPEG4_Implicit, TAG_MPEG4_MeshGrid, TAG_MPEG4_NonLinearDeformer, TAG_MPEG4_NurbsCurve, TAG_MPEG4_NurbsCurve2D, TAG_MPEG4_NurbsSurface, TAG_MPEG4_Quadric, TAG_MPEG4_SolidRep, TAG_MPEG4_SubdivisionSurface
 };
 
 #define SFTextureNode_V5_NUMBITS		1
 #define SFTextureNode_V5_Count	1
 
 static const u32 SFTextureNode_V5_TypeToTag[1] = {
- TAG_MPEG4_ProceduralTexture
+	TAG_MPEG4_ProceduralTexture
 };
 
 #define SFDepthImageNode_V5_NUMBITS		1
 #define SFDepthImageNode_V5_Count	1
 
 static const u32 SFDepthImageNode_V5_TypeToTag[1] = {
- TAG_MPEG4_DepthImage
+	TAG_MPEG4_DepthImage
 };
 
 #define SFBlendListNode_V5_NUMBITS		1
 #define SFBlendListNode_V5_Count	1
 
 static const u32 SFBlendListNode_V5_TypeToTag[1] = {
- TAG_MPEG4_XXLFM_BlendList
+	TAG_MPEG4_XXLFM_BlendList
 };
 
 #define SFFrameListNode_V5_NUMBITS		1
 #define SFFrameListNode_V5_Count	1
 
 static const u32 SFFrameListNode_V5_TypeToTag[1] = {
- TAG_MPEG4_XXLFM_FrameList
+	TAG_MPEG4_XXLFM_FrameList
 };
 
 #define SFLightMapNode_V5_NUMBITS		1
 #define SFLightMapNode_V5_Count	1
 
 static const u32 SFLightMapNode_V5_TypeToTag[1] = {
- TAG_MPEG4_XXLFM_LightMap
+	TAG_MPEG4_XXLFM_LightMap
 };
 
 #define SFSurfaceMapNode_V5_NUMBITS		1
 #define SFSurfaceMapNode_V5_Count	1
 
 static const u32 SFSurfaceMapNode_V5_TypeToTag[1] = {
- TAG_MPEG4_XXLFM_SurfaceMapList
+	TAG_MPEG4_XXLFM_SurfaceMapList
 };
 
 #define SFViewMapNode_V5_NUMBITS		1
 #define SFViewMapNode_V5_Count	1
 
 static const u32 SFViewMapNode_V5_TypeToTag[1] = {
- TAG_MPEG4_XXLFM_ViewMapList
+	TAG_MPEG4_XXLFM_ViewMapList
 };
 
 #define SFParticleInitializerNode_V5_NUMBITS		1
 #define SFParticleInitializerNode_V5_Count	1
 
 static const u32 SFParticleInitializerNode_V5_TypeToTag[1] = {
- TAG_MPEG4_XXParticleInitBox
+	TAG_MPEG4_XXParticleInitBox
 };
 
 #define SFInfluenceNode_V5_NUMBITS		2
 #define SFInfluenceNode_V5_Count	2
 
 static const u32 SFInfluenceNode_V5_TypeToTag[2] = {
- TAG_MPEG4_XXPlanarObstacle, TAG_MPEG4_XXPointAttractor
+	TAG_MPEG4_XXPlanarObstacle, TAG_MPEG4_XXPointAttractor
 };
 
 #define SFDepthTextureNode_V5_NUMBITS		2
 #define SFDepthTextureNode_V5_Count	2
 
 static const u32 SFDepthTextureNode_V5_TypeToTag[2] = {
- TAG_MPEG4_PointTexture, TAG_MPEG4_SimpleTexture
+	TAG_MPEG4_PointTexture, TAG_MPEG4_SimpleTexture
 };
 
 #define SFSBBoneNode_V5_NUMBITS		1
 #define SFSBBoneNode_V5_Count	1
 
 static const u32 SFSBBoneNode_V5_TypeToTag[1] = {
- TAG_MPEG4_SBBone
+	TAG_MPEG4_SBBone
 };
 
 #define SFSBMuscleNode_V5_NUMBITS		1
 #define SFSBMuscleNode_V5_Count	1
 
 static const u32 SFSBMuscleNode_V5_TypeToTag[1] = {
- TAG_MPEG4_SBMuscle
+	TAG_MPEG4_SBMuscle
 };
 
 #define SFSBSegmentNode_V5_NUMBITS		1
 #define SFSBSegmentNode_V5_Count	1
 
 static const u32 SFSBSegmentNode_V5_TypeToTag[1] = {
- TAG_MPEG4_SBSegment
+	TAG_MPEG4_SBSegment
 };
 
 #define SFSBSiteNode_V5_NUMBITS		1
 #define SFSBSiteNode_V5_Count	1
 
 static const u32 SFSBSiteNode_V5_TypeToTag[1] = {
- TAG_MPEG4_SBSite
+	TAG_MPEG4_SBSite
 };
 
 #define SFBaseMeshNode_V5_NUMBITS		1
 #define SFBaseMeshNode_V5_Count	1
 
 static const u32 SFBaseMeshNode_V5_TypeToTag[1] = {
- TAG_MPEG4_SubdivisionSurface
+	TAG_MPEG4_SubdivisionSurface
 };
 
 #define SFSubdivSurfaceSectorNode_V5_NUMBITS		1
 #define SFSubdivSurfaceSectorNode_V5_Count	1
 
 static const u32 SFSubdivSurfaceSectorNode_V5_TypeToTag[1] = {
- TAG_MPEG4_SubdivSurfaceSector
+	TAG_MPEG4_SubdivSurfaceSector
 };
 
 
@@ -590,63 +590,63 @@
 #define SFWorldNode_V6_Count	12
 
 static const u32 SFWorldNode_V6_TypeToTag[12] = {
- TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_Ellipse, TAG_MPEG4_LinearGradient, TAG_MPEG4_PathLayout, TAG_MPEG4_RadialGradient, TAG_MPEG4_SynthesizedTexture, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport, TAG_MPEG4_XCurve2D, TAG_MPEG4_XFontStyle, TAG_MPEG4_XLineProperties
+	TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_Ellipse, TAG_MPEG4_LinearGradient, TAG_MPEG4_PathLayout, TAG_MPEG4_RadialGradient, TAG_MPEG4_SynthesizedTexture, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport, TAG_MPEG4_XCurve2D, TAG_MPEG4_XFontStyle, TAG_MPEG4_XLineProperties
 };
 
 #define SF3DNode_V6_NUMBITS		3
 #define SF3DNode_V6_Count	5
 
 static const u32 SF3DNode_V6_TypeToTag[5] = {
- TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_PathLayout, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport
+	TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_PathLayout, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport
 };
 
 #define SF2DNode_V6_NUMBITS		3
 #define SF2DNode_V6_Count	5
 
 static const u32 SF2DNode_V6_TypeToTag[5] = {
- TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_PathLayout, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport
+	TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_PathLayout, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport
 };
 
 #define SFGeometryNode_V6_NUMBITS		2
 #define SFGeometryNode_V6_Count	2
 
 static const u32 SFGeometryNode_V6_TypeToTag[2] = {
- TAG_MPEG4_Ellipse, TAG_MPEG4_XCurve2D
+	TAG_MPEG4_Ellipse, TAG_MPEG4_XCurve2D
 };
 
 #define SFTextureNode_V6_NUMBITS		2
 #define SFTextureNode_V6_Count	3
 
 static const u32 SFTextureNode_V6_TypeToTag[3] = {
- TAG_MPEG4_LinearGradient, TAG_MPEG4_RadialGradient, TAG_MPEG4_SynthesizedTexture
+	TAG_MPEG4_LinearGradient, TAG_MPEG4_RadialGradient, TAG_MPEG4_SynthesizedTexture
 };
 
 #define SFFontStyleNode_V6_NUMBITS		1
 #define SFFontStyleNode_V6_Count	1
 
 static const u32 SFFontStyleNode_V6_TypeToTag[1] = {
- TAG_MPEG4_XFontStyle
+	TAG_MPEG4_XFontStyle
 };
 
 #define SFLinePropertiesNode_V6_NUMBITS		1
 #define SFLinePropertiesNode_V6_Count	1
 
 static const u32 SFLinePropertiesNode_V6_TypeToTag[1] = {
- TAG_MPEG4_XLineProperties
+	TAG_MPEG4_XLineProperties
 };
 
 #define SFTextureTransformNode_V6_NUMBITS		1
 #define SFTextureTransformNode_V6_Count	1
 
 static const u32 SFTextureTransformNode_V6_TypeToTag[1] = {
- TAG_MPEG4_TransformMatrix2D
+	TAG_MPEG4_TransformMatrix2D
 };
 
 #define SFViewportNode_V6_NUMBITS		1
 #define SFViewportNode_V6_Count	1
 
 static const u32 SFViewportNode_V6_TypeToTag[1] = {
- TAG_MPEG4_Viewport
+	TAG_MPEG4_Viewport
 };
 
 
@@ -663,49 +663,49 @@
 #define SFWorldNode_V7_Count	11
 
 static const u32 SFWorldNode_V7_TypeToTag[11] = {
- TAG_MPEG4_AdvancedAudioBuffer, TAG_MPEG4_AudioChannelConfig, TAG_MPEG4_DepthImageV2, TAG_MPEG4_MorphShape, TAG_MPEG4_MultiTexture, TAG_MPEG4_PointTextureV2, TAG_MPEG4_SBVCAnimationV2, TAG_MPEG4_SimpleTextureV2, TAG_MPEG4_SurroundingSound, TAG_MPEG4_Transform3DAudio, TAG_MPEG4_WideSound
+	TAG_MPEG4_AdvancedAudioBuffer, TAG_MPEG4_AudioChannelConfig, TAG_MPEG4_DepthImageV2, TAG_MPEG4_MorphShape, TAG_MPEG4_MultiTexture, TAG_MPEG4_PointTextureV2, TAG_MPEG4_SBVCAnimationV2, TAG_MPEG4_SimpleTextureV2, TAG_MPEG4_SurroundingSound, TAG_MPEG4_Transform3DAudio, TAG_MPEG4_WideSound
 };
 
 #define SF3DNode_V7_NUMBITS		3
 #define SF3DNode_V7_Count	6
 
 static const u32 SF3DNode_V7_TypeToTag[6] = {
- TAG_MPEG4_DepthImageV2, TAG_MPEG4_MorphShape, TAG_MPEG4_SBVCAnimationV2, TAG_MPEG4_SurroundingSound, TAG_MPEG4_Transform3DAudio, TAG_MPEG4_WideSound
+	TAG_MPEG4_DepthImageV2, TAG_MPEG4_MorphShape, TAG_MPEG4_SBVCAnimationV2, TAG_MPEG4_SurroundingSound, TAG_MPEG4_Transform3DAudio, TAG_MPEG4_WideSound
 };
 
 #define SF2DNode_V7_NUMBITS		2
 #define SF2DNode_V7_Count	3
 
 static const u32 SF2DNode_V7_TypeToTag[3] = {
- TAG_MPEG4_MorphShape, TAG_MPEG4_SBVCAnimationV2, TAG_MPEG4_Transform3DAudio
+	TAG_MPEG4_MorphShape, TAG_MPEG4_SBVCAnimationV2, TAG_MPEG4_Transform3DAudio
 };
 
 #define SFAudioNode_V7_NUMBITS		2
 #define SFAudioNode_V7_Count	2
 
 static const u32 SFAudioNode_V7_TypeToTag[2] = {
- TAG_MPEG4_AdvancedAudioBuffer, TAG_MPEG4_AudioChannelConfig
+	TAG_MPEG4_AdvancedAudioBuffer, TAG_MPEG4_AudioChannelConfig
 };
 
 #define SFTextureNode_V7_NUMBITS		1
 #define SFTextureNode_V7_Count	1
 
 static const u32 SFTextureNode_V7_TypeToTag[1] = {
- TAG_MPEG4_MultiTexture
+	TAG_MPEG4_MultiTexture
 };
 
 #define SFDepthImageNode_V7_NUMBITS		1
 #define SFDepthImageNode_V7_Count	1
 
 static const u32 SFDepthImageNode_V7_TypeToTag[1] = {
- TAG_MPEG4_DepthImageV2
+	TAG_MPEG4_DepthImageV2
 };
 
 #define SFDepthTextureNode_V7_NUMBITS		2
 #define SFDepthTextureNode_V7_Count	2
 
 static const u32 SFDepthTextureNode_V7_TypeToTag[2] = {
- TAG_MPEG4_PointTextureV2, TAG_MPEG4_SimpleTextureV2
+	TAG_MPEG4_PointTextureV2, TAG_MPEG4_SimpleTextureV2
 };
 
 
@@ -722,28 +722,28 @@
 #define SFWorldNode_V8_Count	2
 
 static const u32 SFWorldNode_V8_TypeToTag[2] = {
- TAG_MPEG4_ScoreShape, TAG_MPEG4_MusicScore
+	TAG_MPEG4_ScoreShape, TAG_MPEG4_MusicScore
 };
 
 #define SF3DNode_V8_NUMBITS		1
 #define SF3DNode_V8_Count	1
 
 static const u32 SF3DNode_V8_TypeToTag[1] = {
- TAG_MPEG4_ScoreShape
+	TAG_MPEG4_ScoreShape
 };
 
 #define SF2DNode_V8_NUMBITS		1
 #define SF2DNode_V8_Count	1
 
 static const u32 SF2DNode_V8_TypeToTag[1] = {
- TAG_MPEG4_ScoreShape
+	TAG_MPEG4_ScoreShape
 };
 
 #define SFMusicScoreNode_V8_NUMBITS		1
 #define SFMusicScoreNode_V8_Count	1
 
 static const u32 SFMusicScoreNode_V8_TypeToTag[1] = {
- TAG_MPEG4_MusicScore
+	TAG_MPEG4_MusicScore
 };
 
 
@@ -760,21 +760,21 @@
 #define SFWorldNode_V9_Count	6
 
 static const u32 SFWorldNode_V9_TypeToTag[6] = {
- TAG_MPEG4_FootPrintSetNode, TAG_MPEG4_FootPrintNode, TAG_MPEG4_BuildingPartNode, TAG_MPEG4_RoofNode, TAG_MPEG4_FacadeNode, TAG_MPEG4_Shadow
+	TAG_MPEG4_FootPrintSetNode, TAG_MPEG4_FootPrintNode, TAG_MPEG4_BuildingPartNode, TAG_MPEG4_RoofNode, TAG_MPEG4_FacadeNode, TAG_MPEG4_Shadow
 };
 
 #define SF3DNode_V9_NUMBITS		3
 #define SF3DNode_V9_Count	6
 
 static const u32 SF3DNode_V9_TypeToTag[6] = {
- TAG_MPEG4_FootPrintSetNode, TAG_MPEG4_FootPrintNode, TAG_MPEG4_BuildingPartNode, TAG_MPEG4_RoofNode, TAG_MPEG4_FacadeNode, TAG_MPEG4_Shadow
+	TAG_MPEG4_FootPrintSetNode, TAG_MPEG4_FootPrintNode, TAG_MPEG4_BuildingPartNode, TAG_MPEG4_RoofNode, TAG_MPEG4_FacadeNode, TAG_MPEG4_Shadow
 };
 
 #define SFGeometryNode_V9_NUMBITS		3
 #define SFGeometryNode_V9_Count	6
 
 static const u32 SFGeometryNode_V9_TypeToTag[6] = {
- TAG_MPEG4_FootPrintSetNode, TAG_MPEG4_FootPrintNode, TAG_MPEG4_BuildingPartNode, TAG_MPEG4_RoofNode, TAG_MPEG4_FacadeNode, TAG_MPEG4_Shadow
+	TAG_MPEG4_FootPrintSetNode, TAG_MPEG4_FootPrintNode, TAG_MPEG4_BuildingPartNode, TAG_MPEG4_RoofNode, TAG_MPEG4_FacadeNode, TAG_MPEG4_Shadow
 };
 
 
@@ -791,28 +791,28 @@
 #define SFWorldNode_V10_Count	5
 
 static const u32 SFWorldNode_V10_TypeToTag[5] = {
- TAG_MPEG4_CacheTexture, TAG_MPEG4_EnvironmentTest, TAG_MPEG4_KeyNavigator, TAG_MPEG4_SpacePartition, TAG_MPEG4_Storage
+	TAG_MPEG4_CacheTexture, TAG_MPEG4_EnvironmentTest, TAG_MPEG4_KeyNavigator, TAG_MPEG4_SpacePartition, TAG_MPEG4_Storage
 };
 
 #define SF3DNode_V10_NUMBITS		3
 #define SF3DNode_V10_Count	5
 
 static const u32 SF3DNode_V10_TypeToTag[5] = {
- TAG_MPEG4_CacheTexture, TAG_MPEG4_EnvironmentTest, TAG_MPEG4_KeyNavigator, TAG_MPEG4_SpacePartition, TAG_MPEG4_Storage
+	TAG_MPEG4_CacheTexture, TAG_MPEG4_EnvironmentTest, TAG_MPEG4_KeyNavigator, TAG_MPEG4_SpacePartition, TAG_MPEG4_Storage
 };
 
 #define SF2DNode_V10_NUMBITS		3
 #define SF2DNode_V10_Count	4
 
 static const u32 SF2DNode_V10_TypeToTag[4] = {
- TAG_MPEG4_CacheTexture, TAG_MPEG4_EnvironmentTest, TAG_MPEG4_KeyNavigator, TAG_MPEG4_Storage
+	TAG_MPEG4_CacheTexture, TAG_MPEG4_EnvironmentTest, TAG_MPEG4_KeyNavigator, TAG_MPEG4_Storage
 };
 
 #define SFTextureNode_V10_NUMBITS		1
 #define SFTextureNode_V10_Count	1
 
 static const u32 SFTextureNode_V10_TypeToTag[1] = {
- TAG_MPEG4_CacheTexture
+	TAG_MPEG4_CacheTexture
 };

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/camera.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/camera.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/compositor_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/compositor_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -50,7 +50,7 @@
 
 
 /*if defined, events are queued before being processed, otherwise they are handled whenever triggered*/
-//#define GF_SR_EVENT_QUEUE	
+//#define GF_SR_EVENT_QUEUE
 
 
 /*use 2D caching for groups*/
@@ -91,7 +91,7 @@
 #include <gpac/internal/camera.h>
 #include <gpac/internal/mesh.h>
 
-typedef struct 
+typedef struct
 {
 	Bool multisample;
 	Bool bgra_texture;
@@ -182,11 +182,12 @@
 	GF_List *extra_scenes;
 
 	u32 inherit_type_3d;
-	
+
 	/*all time nodes registered*/
 	GF_List *time_nodes;
 	/*all textures (texture handlers)*/
 	GF_List *textures;
+	Bool texture_inserted;
 
 	/*all textures to be destroyed (needed for openGL context ...)*/
 	GF_List *textures_gc;
@@ -220,7 +221,7 @@
 	/*display size*/
 	u32 display_width, display_height;
 
-	/*visual output location on window (we may draw background color outside of it) 
+	/*visual output location on window (we may draw background color outside of it)
 		vp_x & vp_y: horizontal & vertical offset of the drawing area in the video output
 		vp_width & vp_height: width & height of the drawing area
 			* in scalable mode, this is the display size
@@ -268,7 +269,7 @@
 	Bool opengl_raster;
 #endif
 
-	//in this mode all 2D raster is done through and RGBA canvas except background IO and textures which are done by the GPU. The canvas is then flushed to GPU. 
+	//in this mode all 2D raster is done through and RGBA canvas except background IO and textures which are done by the GPU. The canvas is then flushed to GPU.
 	//the mode supports defer and immediate rendering
 	Bool hybrid_opengl;
 
@@ -305,7 +306,7 @@
 	GF_VisualManager *visual;
 	/*set to false whenever a new scene is attached to compositor*/
 	Bool root_visual_setup;
-	
+
 	/*indicates whether the aspect ratio shall be recomputed:
 		1: AR changed
 		2: AR changed and root visual type changed between 2D and 3D
@@ -400,6 +401,7 @@
 	/*highlight fill and stroke colors (ARGB)*/
 	u32 highlight_fill, highlight_stroke;
 	Fixed highlight_stroke_width;
+	Bool disable_focus_highlight;
 
 	/*picking info*/
 
@@ -430,8 +432,8 @@
 	/*the active parent text node under selection*/
 	GF_Node *text_selection;
 	/*text selection start/end in world coord system*/
-	SFVec2f start_sel, end_sel;	
-	/*text selection state*/ 
+	SFVec2f start_sel, end_sel;
+	/*text selection state*/
 	u32 store_text_state;
 	/*parent text node when a text is hit (to handle tspan selection)*/
 	GF_Node *hit_text;
@@ -461,8 +463,6 @@
 	/*disable RECT extensions (except for Bitmap...)*/
 	Bool disable_rect_ext;
 	/*disable RECT extensions (except for Bitmap...)*/
-	Bool bitmap_use_pixels;
-	/*disable RECT extensions (except for Bitmap...)*/
 	u32 draw_normals;
 	/*backface cull type: 0 off, 1: on, 2: on with transparency*/
 	u32 backcull;
@@ -495,6 +495,8 @@
 
 	u32 offscreen_width, offscreen_height;
 
+	Bool shader_only_mode;
+
 #ifdef GPAC_USE_TINYGL
 	void *tgl_ctx;
 #endif
@@ -513,7 +515,7 @@
 #endif
 
 	Bool texture_from_decoder_memory;
-    
+
 	u32 networks_time;
 	u32 decoders_time;
 
@@ -550,6 +552,7 @@
 
 void gf_sc_queue_dom_event(GF_Compositor *compositor, GF_Node *node, GF_DOM_Event *evt);
 void gf_sc_queue_dom_event_on_target(GF_Compositor *compositor, GF_DOM_Event *evt, GF_DOMEventTarget *target, GF_SceneGraph *sg);
+void gf_sc_queue_event(GF_Compositor *compositor, GF_Event *evt);
 
 /*base stack for timed nodes (nodes that activate themselves at given times)
 	@UpdateTimeNode: shall be setup by the node handler and is called once per simulation frame
@@ -579,7 +582,7 @@
 	GF_SR_TEXTURE_MATTE = (1<<2),
 	/*texture doesn't need vertical flip for OpenGL*/
 	GF_SR_TEXTURE_NO_GL_FLIP = (1<<3),
-	/*Set durin a composition cycle. If not set at the end of the cycle, 
+	/*Set durin a composition cycle. If not set at the end of the cycle,
 	the hardware binding is released*/
 	GF_SR_TEXTURE_USED = (1<<4),
 
@@ -614,20 +617,20 @@
 	u32 last_frame_time;
 	/*active display in the texture (0, 0 == top, left)*/
 	//GF_Rect active_window;
-	/*texture is transparent*/		
+	/*texture is transparent*/
 	Bool transparent;
 	/*flags for user - the repeatS and repeatT are set upon creation, the rest is NEVER touched by compositor*/
 	u32 flags;
 	/*gradients are relative to the object bounds, therefore a gradient is not the same if used on 2 different
-	objects - since we don't want to build an offscreen texture for the gradient, gradients have to be updated 
+	objects - since we don't want to build an offscreen texture for the gradient, gradients have to be updated
 	at each draw - the matrix shall be updated to the gradient transformation in the local system
 	MUST be set for gradient textures*/
 	void (*compute_gradient_matrix)(struct _gf_sc_texture_handler *txh, GF_Rect *bounds, GF_Matrix2D *mat, Bool for_3d);
 
 	/*image data for natural media*/
 	char *data;
-	u32 width, height, stride, pixelformat, pixel_ar;
-    Bool is_flipped;
+	u32 size, width, height, stride, pixelformat, pixel_ar;
+	Bool is_flipped;
 
 	Bool raw_memory;
 	u8 *pU, *pV;
@@ -674,7 +677,7 @@
 void gf_sc_texture_cleanup_hw(GF_Compositor *compositor);
 
 
-/*sensor node handler - this is not defined as a stack because Anchor is both a grouping node and a 
+/*sensor node handler - this is not defined as a stack because Anchor is both a grouping node and a
 sensor node, and we DO need the groupingnode stack...*/
 typedef struct _sensor_handler
 {
@@ -699,6 +702,7 @@
 /*returns associated sensor handler from traversable stack (the node handler is always responsible for creation/deletion)
 returns NULL if not a sensor or sensor is not activated*/
 GF_SensorHandler *compositor_mpeg4_get_sensor_handler(GF_Node *n);
+GF_SensorHandler *compositor_mpeg4_get_sensor_handler_ex(GF_Node *n, Bool skip_anchors);
 
 /*rendering modes*/
 enum
@@ -727,7 +731,7 @@
 #ifndef GPAC_DISABLE_3D
 	/*explicit draw routine used when flushing 3D display list*/
 	TRAVERSE_DRAW_3D,
-	/*set global lights on. Since the model_matrix is not pushed to the target in this 
+	/*set global lights on. Since the model_matrix is not pushed to the target in this
 	pass, global lights shall not forget to do it (cf lighting.c)*/
 	TRAVERSE_LIGHTING,
 	/*collision routine*/
@@ -743,7 +747,7 @@
 #define MAX_USER_CLIP_PLANES		4
 
 
-/*the traversing context: set_up at top-level and passed through SFNode_Render. Each node is responsible for 
+/*the traversing context: set_up at top-level and passed through SFNode_Render. Each node is responsible for
 restoring the context state before returning*/
 struct _traversing_state
 {
@@ -779,7 +783,7 @@
 
 	/*the one and only visual manager currently being traversed*/
 	GF_VisualManager *visual;
-	
+
 #ifndef GPAC_DISABLE_VRML
 	/*current background and viewport stacks*/
 	GF_List *backgrounds;
@@ -810,6 +814,9 @@
 	/*parent group for composition: can be Form, Layout or Layer2D*/
 	struct _parent_node_2d *parent;
 
+	/*override appearance of all nodes with this one*/
+	GF_Node *override_appearance;
+
 	/*group/object bounds in local coordinate system*/
 	GF_Rect bounds;
 
@@ -818,7 +825,7 @@
 	Bool abort_bounds_traverse;
 	GF_Matrix2D mx_at_node;
 	Bool ignore_strike;
-	
+
 	GF_List *use_stack;
 
 	/* Styling Property and others for SVG context */
@@ -845,7 +852,7 @@
 	Fixed base_x, base_y;
 	Fixed line_spacing;
 	Fixed base_shift;
-	/*quick and dirty hack to try to solve xml:space across text and tspans without 
+	/*quick and dirty hack to try to solve xml:space across text and tspans without
 	flattening the DOMText nodes
 	0: first block of text
 	1: previous block of text ended with a space
@@ -873,7 +880,7 @@
 	/*current object (model) transformation at the given layer*/
 	GF_Matrix layer_matrix;
 
-	
+
 	/*set when traversing a cached group during offscreen bitmap construction.*/
 	Bool in_group_cache;
 
@@ -890,7 +897,7 @@
 
 #ifndef GPAC_DISABLE_VRML
 	/*fog bind stack*/
-	GF_List *fogs; 
+	GF_List *fogs;
 	/*navigation bind stack*/
 	GF_List *navigations;
 #endif
@@ -919,20 +926,20 @@
 
 	/*layer traversal state:
 		set to the first traversed layer3D when picking
-		set to the current layer3D traversed when rendering 3D to an offscreen bitmap. This alows other 
-			nodes (typically bindables) seting the layer dirty flags to force a redraw 
+		set to the current layer3D traversed when rendering 3D to an offscreen bitmap. This alows other
+			nodes (typically bindables) seting the layer dirty flags to force a redraw
 	*/
 	GF_Node *layer3d;
 #endif
 
-	
+
 #ifdef GF_SR_USE_DEPTH
-    Fixed depth_gain, depth_offset;
+	Fixed depth_gain, depth_offset;
 #endif
 
 
 #ifdef GF_SR_USE_VIDEO_CACHE
-	/*set to 1 if cache evaluation can be skipped - this is only set when there is not enough memory 
+	/*set to 1 if cache evaluation can be skipped - this is only set when there is not enough memory
 	to cache a sub-group, in which case the group cannot be cached (we're caching in display coordinates)*/
 	Bool cache_too_small;
 #endif
@@ -945,7 +952,7 @@
 /*the audio object as used by the mixer. All audio nodes need to implement this interface*/
 typedef struct _audiointerface
 {
-	/*fetch audio data for a given audio delay (~soundcard drift) - if delay is 0 sync should not be performed 
+	/*fetch audio data for a given audio delay (~soundcard drift) - if delay is 0 sync should not be performed
 	(eg intermediate mix) */
 	char *(*FetchFrame) (void *callback, u32 *size, u32 audio_delay_ms);
 	/*release a number of bytes in the indicated frame (ts)*/
@@ -958,7 +965,7 @@
 	Bool (*IsMuted)(void *callback);
 	/*user callback*/
 	void *callback;
-	/*returns 0 if config is not known yet or changed, 
+	/*returns 0 if config is not known yet or changed,
 	otherwise AND IF @for_reconf is set, updates member var below and return TRUE
 	You may return 0 to force parent user invalidation*/
 	Bool (*GetConfig)(struct _audiointerface *ai, Bool for_reconf);
@@ -1034,7 +1041,7 @@
 	/*frozen time counter if set*/
 	Bool Frozen;
 	u32 FreezeTime;
-	
+
 	/*final output*/
 	GF_AudioMixer *mixer;
 	Bool need_reconfig;
@@ -1050,7 +1057,7 @@
 	u32 audio_delay, volume, pan, mute;
 
 	GF_AudioFilterChain filter_chain;
-	u32 nb_filled, nb_used; 
+	u32 nb_filled, nb_used;
 } GF_AudioRenderer;
 
 /*creates audio renderer*/
@@ -1133,7 +1140,7 @@
 #define AUDIO_GROUP_NODE	\
 	GF_AudioInput output;		\
 	void (*add_source)(struct _audio_group *_this, GF_AudioInput *src);	\
-
+ 
 typedef struct _audio_group
 {
 	AUDIO_GROUP_NODE
@@ -1162,6 +1169,7 @@
 #ifndef GPAC_DISABLE_3D
 void compositor_2d_reset_gl_auto(GF_Compositor *compositor);
 void compositor_2d_hybgl_flush_video(GF_Compositor *compositor, GF_IRect *area);
+void compositor_2d_hybgl_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, Bool is_offscreen_clear);
 #endif
 
 Bool compositor_texture_rectangles(GF_VisualManager *visual, GF_TextureHandler *txh, GF_IRect *clip, GF_Rect *unclip, GF_Window *src, GF_Window *dst, Bool *disable_blit, Bool *has_scale);
@@ -1255,7 +1263,7 @@
 
 typedef struct _gf_font GF_Font;
 
-struct _gf_font 
+struct _gf_font
 {
 	/*fonts are linked within the font manager*/
 	GF_Font *next;
@@ -1282,7 +1290,7 @@
 	GF_List *spans;
 };
 
-enum 
+enum
 {
 	/*span direction is horizontal*/
 	GF_TEXT_SPAN_HORIZONTAL = 1,
@@ -1299,7 +1307,7 @@
 typedef struct __text_span
 {
 	GF_Font *font;
-	
+
 	GF_Glyph **glyphs;
 	u32 nb_glyphs;
 
@@ -1386,10 +1394,10 @@
 typedef struct
 {
 	void *udta;
-	/*called when audio frame is ready to be sent to the sound card. 
+	/*called when audio frame is ready to be sent to the sound card.
 		@buffer, @buffer_size: audio buffer
 		@time: the terminal global clock in ms
-		@delay: Due to sound card latencies, audio is sent to the sound card delay milliseconds earlier than 
+		@delay: Due to sound card latencies, audio is sent to the sound card delay milliseconds earlier than
 		its associated video.
 	*/
 	void (*on_audio_frame)(void *udta, char *buffer, u32 buffer_size, u32 time, u32 delay);
@@ -1408,7 +1416,7 @@
 Bool gf_sc_use_raw_texture(GF_Compositor *compositor);
 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);
 
-//signals the compositor a system frame is pending on a future frame 
+//signals the compositor a system frame is pending on a future frame
 void gf_sc_set_system_pending_frame(GF_Compositor *compositor, Bool frame_pending);
 
 //indicates a video frame is pending - this is used fo decoders dispatching their internal memory in order to wake up the compositor asap

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/crypt_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/crypt_dev.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/dvb_mpe_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/dvb_mpe_dev.h Changed

@@ -54,18 +54,18 @@
 	u32 service_id;
 	u32 component_tag;
 
-}GF_M2TS_LOC_DSCPTR_IP_STREAM;
+} GF_M2TS_LOC_DSCPTR_IP_STREAM;
 
 typedef struct descriptor_TimeSliceFec
 {
 	Bool time_slicing;
 	u8 mpe_fec;
 	u8 frame_size;
-  	u8 max_burst_duration;
+	u8 max_burst_duration;
 	u8 max_average_rate;
 	u8 time_slice_fec_id;
 	u8 * id_selector;
-}GF_M2TS_DesTimeSliceFec;
+} GF_M2TS_DesTimeSliceFec;
 
 typedef struct
 {
@@ -74,7 +74,7 @@
 	u16 transport_stream_id;
 	u16 service_id;
 	u8 component_tag;
-}GF_M2TS_DesLocation;
+} GF_M2TS_DesLocation;
 
 typedef struct {
 	u8 type; /* 0 = target_IP_descriptor, 1 = target_IP_address_descriptor */
@@ -100,7 +100,7 @@
 /*IP_Platform object*/
 typedef struct __gf_dvb_mpe_ip_platform
 {
-/* remaining from INT, to be delete */
+	/* remaining from INT, to be delete */
 	u32 id;
 	u32 processing_order;
 	u32 number_of_descriptor;
@@ -142,7 +142,7 @@
 	u32 u32_rx_udp_port;                /* destination port */
 	u32 u32_udp_data_size;
 	u32 u32_udp_chksm;
-}GF_M2TS_IP_Packet;
+} GF_M2TS_IP_Packet;
 
 
 
@@ -155,7 +155,7 @@
 	u32 offset;
 	u32 length;
 
-}MPE_Error_Holes;
+} MPE_Error_Holes;
 
 typedef struct mpe_fec_frame
 {
@@ -164,13 +164,13 @@
 	u32 col_rs ;
 	u8 *p_adt; /* pointer to the application data table*/
 	u8 *p_rs;  /* pointer to the RS data table*/
-    u32 *p_error_adt;
+	u32 *p_error_adt;
 	u32 *p_error_rs ;
 
 	u32 capacity_total;
 	u32 current_offset_adt ;
 	u32 current_offset_rs;
-    u32 initialized ;
+	u32 initialized ;
 	u8  ADT_done;
 	u32 PID;
 	GF_List *mpe_holes;
@@ -228,7 +228,7 @@
 
 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, unsigned char *data, u32 data_size);
 
 /* allocate the necessary memory space*/
 u32 init_frame(MPE_FEC_FRAME * mff, u32 rows);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/ietf_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/ietf_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -50,7 +50,7 @@
 	u16 Length;
 	/*sync source identifier*/
 	u32 SSRC;
-} GF_RTCPHeader;	
+} GF_RTCPHeader;
 
 
 typedef struct __PRO_item
@@ -94,12 +94,12 @@
 {
 	/*global transport info for the session*/
 	GF_RTSPTransport net_info;
-	
+
 	/*RTP CHANNEL*/
 	GF_Socket *rtp;
 	/*RTCP CHANNEL*/
 	GF_Socket *rtcp;
-	
+
 	/*RTP Packet reordering. Turned on/off during initialization. The library forces a 200 ms
 	max latency at the reordering queue*/
 	GF_RTPReorder *po;
@@ -111,7 +111,7 @@
 	/*NAT keep-alive*/
 	u32 last_nat_keepalive_time, nat_keepalive_time_period;
 
-	
+
 	/*the seq number of the first packet as signaled by the server if any, or first
 	RTP SN received (RTP multicast)*/
 	u32 rtp_first_SN;
@@ -156,7 +156,7 @@
 	u32 last_num_pck_rcv, last_num_pck_expected, last_num_pck_loss;
 	/*jitter compute*/
 	u32 Jitter, ntp_init;
-	s32 last_deviance;	
+	s32 last_deviance;
 	/*NTP of last SR*/
 	u32 last_SR_NTP_sec, last_SR_NTP_frac;
 	/*RTP time at last SR as indicated in SR*/
@@ -190,12 +190,12 @@
 	}	\
 	strcpy(buf+pos, (const char *) str);		\
 	pos += (u32) strlen((const char *) str); \
-
+ 
 #define RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, str)		\
 	if (str){	\
 		RTSP_WRITE_ALLOC_STR_WITHOUT_CHECK(buf, buf_size, pos, str);	\
 	}	\
-		
+	
 #define RTSP_WRITE_HEADER(buf, buf_size, pos, type, str)		\
 	if( str ) {	\
 	RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, type);		\
@@ -203,7 +203,7 @@
 	RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, str);		\
 	RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, "\r\n");	\
 	}	\
-
+ 
 #define RTSP_WRITE_INT(buf, buf_size, pos, d, sig)		\
 	if (sig < 0) { \
 		sprintf(temp, "%d", d);		\
@@ -238,7 +238,7 @@
 struct _tag_rtsp_session
 {
 	/*service name (extracted from URL) ex: news/latenight.mp4, vod.mp4 ...*/
-	char *Service;	
+	char *Service;
 	/*server name (extracted from URL)*/
 	char *Server;
 	/*server port (extracted from URL)*/
@@ -278,7 +278,7 @@
 
 	/*RTSP interleaving*/
 	GF_Err (*RTSP_SignalData)(GF_RTSPSession *sess, void *chan, char *buffer, u32 bufferSize, Bool IsRTCP);
-	
+
 	/*buffer for pck reconstruction*/
 	char *rtsp_pck_buf;
 	u32 rtsp_pck_size;
@@ -289,7 +289,7 @@
 	/*thread-safe, full duplex library for PLAY and RECORD*/
 	GF_Mutex *mx;
 
-	char *MobileIP;	
+	char *MobileIP;
 };
 
 GF_RTSPSession *gf_rtsp_session_new(char *sURL, u16 DefaultPort);
@@ -299,7 +299,7 @@
 /*send data on RTSP*/
 GF_Err gf_rtsp_send_data(GF_RTSPSession *sess, char *buffer, u32 Size);
 
-/* 
+/*
 			Common RTSP tools
 */
 
@@ -335,7 +335,7 @@
 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_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);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/isomedia_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/isomedia_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -37,7 +37,7 @@
 
 /*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 
+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
@@ -46,17 +46,17 @@
 	u32 type;			\
 	u64 size;			\
 	GF_List *other_boxes;	\
-
+ 
 #define GF_ISOM_FULL_BOX		\
 	GF_ISOM_BOX			\
 	u8 version;			\
 	u32 flags;			\
-
+ 
 #define GF_ISOM_UUID_BOX	\
 	GF_ISOM_BOX			\
 	u8 uuid[16];		\
 	u32 internal_4cc;		\
-
+ 
 typedef struct
 {
 	GF_ISOM_BOX
@@ -114,6 +114,7 @@
 	GF_ISOM_BOX_TYPE_CRHD	= GF_4CC( 'c', 'r', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_CTTS	= GF_4CC( 'c', 't', 't', 's' ),
 	GF_ISOM_BOX_TYPE_CPRT	= GF_4CC( 'c', 'p', 'r', 't' ),
+	GF_ISOM_BOX_TYPE_KIND	= GF_4CC( 'k', 'i', 'n', 'd' ),
 	GF_ISOM_BOX_TYPE_CHPL	= GF_4CC( 'c', 'h', 'p', 'l' ),
 	GF_ISOM_BOX_TYPE_URL	= GF_4CC( 'u', 'r', 'l', ' ' ),
 	GF_ISOM_BOX_TYPE_URN	= GF_4CC( 'u', 'r', 'n', ' ' ),
@@ -129,6 +130,7 @@
 	GF_ISOM_BOX_TYPE_HMHD	= GF_4CC( 'h', 'm', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_HINT	= GF_4CC( 'h', 'i', 'n', 't' ),
 	GF_ISOM_BOX_TYPE_MDIA	= GF_4CC( 'm', 'd', 'i', 'a' ),
+	GF_ISOM_BOX_TYPE_ELNG	= GF_4CC( 'e', 'l', 'n', 'g' ),
 	GF_ISOM_BOX_TYPE_MDAT	= GF_4CC( 'm', 'd', 'a', 't' ),
 	GF_ISOM_BOX_TYPE_MDHD	= GF_4CC( 'm', 'd', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_MINF	= GF_4CC( 'm', 'i', 'n', 'f' ),
@@ -178,6 +180,7 @@
 	GF_ISOM_BOX_TYPE_MVEX	= GF_4CC( 'm', 'v', 'e', 'x' ),
 	GF_ISOM_BOX_TYPE_MEHD	= GF_4CC( 'm', 'e', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_TREX	= GF_4CC( 't', 'r', 'e', 'x' ),
+	GF_ISOM_BOX_TYPE_TREP	= GF_4CC( 't', 'r', 'e', 'p' ),
 	GF_ISOM_BOX_TYPE_MOOF	= GF_4CC( 'm', 'o', 'o', 'f' ),
 	GF_ISOM_BOX_TYPE_MFHD	= GF_4CC( 'm', 'f', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_TRAF	= GF_4CC( 't', 'r', 'a', 'f' ),
@@ -215,6 +218,7 @@
 	GF_ISOM_BOX_TYPE_HVCC	= GF_4CC( 'h', 'v', 'c', 'C' ),
 	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_HVC2	= GF_4CC( 'h', 'v', 'c', '2' ),
 	GF_ISOM_BOX_TYPE_HEV2	= GF_4CC( 'h', 'e', 'v', '2' ),
@@ -234,7 +238,7 @@
 	GF_ISOM_BOX_TYPE_DSMV	= GF_4CC( 'd', 's', 'm', 'v' ),
 	GF_ISOM_BOX_TYPE_TSEL	= GF_4CC( 't', 's', 'e', 'l' ),
 
-    /* 3GPP Adaptive Streaming extensions */
+	/* 3GPP Adaptive Streaming extensions */
 	GF_ISOM_BOX_TYPE_STYP	= GF_4CC( 's', 't', 'y', 'p' ),
 	GF_ISOM_BOX_TYPE_TFDT	= GF_4CC( 't', 'f', 'd', 't' ),
 	GF_ISOM_BOX_TYPE_SIDX	= GF_4CC( 's', 'i', 'd', 'x' ),
@@ -305,7 +309,7 @@
 	GF_ISOM_BOX_TYPE_TSRO	= GF_4CC( 't', 's', 'r', 'o' ),
 	GF_ISOM_BOX_TYPE_SNRO	= GF_4CC( 's', 'n', 'r', 'o' ),
 	GF_ISOM_BOX_TYPE_RTPO	= GF_4CC( 'r', 't', 'p', 'o' ),
-	
+
 	/*internal type for track references*/
 	GF_ISOM_BOX_TYPE_REFT	= GF_4CC( 'R', 'E', 'F', 'T' ),
 
@@ -348,7 +352,7 @@
 	GF_ISOM_HANDLER_TYPE_MDIR	= GF_4CC( 'm', 'd', 'i', 'r' ),
 	GF_ISOM_BOX_TYPE_CHAP	= GF_4CC( 'c', 'h', 'a', 'p' ),
 	GF_ISOM_BOX_TYPE_TEXT	= GF_4CC( 't', 'e', 'x', 't' ),
-	
+
 	/*OMA (P)DCF boxes*/
 	GF_ISOM_BOX_TYPE_OHDR	= GF_4CC( 'o', 'h', 'd', 'r' ),
 	GF_ISOM_BOX_TYPE_GRPI	= GF_4CC( 'g', 'r', 'p', 'i' ),
@@ -372,10 +376,11 @@
 	GF_ISOM_BOX_TYPE_SUBS	= GF_4CC( 's', 'u', 'b', 's' ),
 
 	GF_ISOM_BOX_TYPE_RVCC	= GF_4CC( 'r', 'v', 'c', 'c' ),
-	
+
 	GF_ISOM_BOX_TYPE_VTTC	= GF_4CC( 'v', 't', 't', 'C' ),
 	GF_ISOM_BOX_TYPE_VTCU	= GF_4CC( 'v', 't', 't', 'c' ),
 	GF_ISOM_BOX_TYPE_VTTE	= GF_4CC( 'v', 't', 't', 'e' ),
+	GF_ISOM_BOX_TYPE_VTTA	= GF_4CC( 'v', 't', 't', 'a' ),
 	GF_ISOM_BOX_TYPE_CTIM	= GF_4CC( 'c', 't', 'i', 'm' ),
 	GF_ISOM_BOX_TYPE_IDEN	= GF_4CC( 'i', 'd', 'e', 'n' ),
 	GF_ISOM_BOX_TYPE_STTG	= GF_4CC( 's', 't', 't', 'g' ),
@@ -385,11 +390,11 @@
 	GF_ISOM_BOX_TYPE_STPP	= GF_4CC( 's', 't', 'p', 'p' ),
 	GF_ISOM_BOX_TYPE_SBTT	= GF_4CC( 's', 'b', 't', 't' ),
 
-	GF_ISOM_BOX_TYPE_STSE	= GF_4CC( 's', 't', 's', 'e' ),
+	GF_ISOM_BOX_TYPE_STXT	= GF_4CC( 's', 't', 'x', 't' ),
 	GF_ISOM_BOX_TYPE_STTC	= GF_4CC( 's', 't', 't', 'C' ),
 
 	GF_ISOM_BOX_TYPE_PRFT   = GF_4CC( 'p', 'r', 'f', 't' ),
-	
+
 	/*ALL INTERNAL BOXES - NEVER WRITTEN TO FILE!!*/
 
 	/*generic handlers*/
@@ -408,6 +413,8 @@
 	GF_ISOM_BOX_UUID_TENC	= GF_4CC( 'T', 'E', 'N', 'C' ),
 	GF_ISOM_BOX_UUID_TFRF	= GF_4CC( 'T', 'F', 'R', 'F' ),
 	GF_ISOM_BOX_UUID_TFXD	= GF_4CC( 'T', 'F', 'X', 'D' ),
+
+	GF_ISOM_BOX_TYPE_MP3	= GF_4CC( '.', 'm', 'p', '3' ),
 };
 
 
@@ -575,7 +582,7 @@
 	u32 sample_count_at_seg_start;
 	Bool first_traf_merged;
 	Bool present_in_scalable_segment;
-#endif 
+#endif
 } GF_TrackBox;
 
 typedef struct
@@ -612,6 +619,12 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
+	char *extended_language;
+} GF_ExtendedLanguageBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
 	u64 reserved;
 } GF_VideoMediaHeaderBox;
 
@@ -868,7 +881,7 @@
 	s16 color_table_index;				\
 	GF_PixelAspectRatioBox *pasp;		\
 	GF_RVCConfigurationBox *rvcc;		\
-
+ 
 typedef struct
 {
 	GF_ISOM_VISUAL_SAMPLE_ENTRY
@@ -946,9 +959,9 @@
 	u16 samplerate_hi;				\
 	u16 samplerate_lo;				\
 	u8 extensions[36];				\
+ 
 
-
-typedef struct 
+typedef struct
 {
 	GF_ISOM_AUDIO_SAMPLE_ENTRY
 } GF_AudioSampleEntryBox;
@@ -1061,7 +1074,7 @@
 	/*if this is the compact version, sample size is actually fieldSize*/
 	u32 sampleSize;
 	u32 sampleCount;
- 	u32 alloc_size;
+	u32 alloc_size;
 	u32 *sizes;
 } GF_SampleSizeBox;
 
@@ -1073,7 +1086,7 @@
 	u32 *offsets;
 } GF_ChunkOffsetBox;
 
-typedef struct 
+typedef struct
 {
 	GF_ISOM_FULL_BOX
 	u32 nb_entries;
@@ -1172,7 +1185,7 @@
 	GF_ISOM_FULL_BOX
 	GF_List *Samples;
 } GF_SubSampleInformationBox;
- 
+
 u32 gf_isom_sample_get_subsample_entry(GF_ISOFile *movie, u32 track, u32 sampleNumber, GF_SubSampleInfoEntry **sub_sample);
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_Err gf_isom_add_subsample_info(GF_SubSampleInformationBox *sub_samples, u32 sampleNumber, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable);
@@ -1183,10 +1196,10 @@
 {
 	GF_ISOM_FULL_BOX
 
-	s32 compositionToDTSShift; 
-	s32 leastDecodeToDisplayDelta; 
+	s32 compositionToDTSShift;
+	s32 leastDecodeToDisplayDelta;
 	s32 greatestDecodeToDisplayDelta;
-	s32 compositionStartTime; 
+	s32 compositionStartTime;
 	s32 compositionEndTime;
 } GF_CompositionToDecodeBox;
 
@@ -1197,8 +1210,8 @@
 	u32 aux_info_type;
 	u32 aux_info_type_parameter;
 
-	u8 default_sample_info_size; 
-	u32 sample_count; 
+	u8 default_sample_info_size;
+	u32 sample_count;
 	u8 *sample_info_size;
 } GF_SampleAuxiliaryInfoSizeBox;
 
@@ -1209,7 +1222,7 @@
 	u32 aux_info_type;
 	u32 aux_info_type_parameter;
 
-	u8 default_sample_info_size; 
+	u8 default_sample_info_size;
 	u32 entry_count;  //1 or stco / trun count
 	u32 *offsets;
 	u64 *offsets_large;
@@ -1266,6 +1279,7 @@
 	u32 dataEntryIndex;
 } GF_MediaInformationBox;
 
+GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 dependsOn, u32 dependedOn, u32 redundant);
 
 typedef struct
 {
@@ -1281,6 +1295,13 @@
 	char *notice;
 } GF_CopyrightBox;
 
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	char *schemeURI;
+	char *value;
+} GF_KindBox;
+
 
 typedef struct
 {
@@ -1339,7 +1360,7 @@
 	s8 vertical_justification;
 	/*ARGB*/
 	u32 back_color;
-	GF_BoxRecord default_box; 
+	GF_BoxRecord default_box;
 	GF_StyleRecord	default_style;
 	GF_FontTableBox *font_table;
 } GF_Tx3gSampleEntryBox;
@@ -1351,7 +1372,7 @@
 	u32 displayFlags;
 	u32 textJustification;
 	char background_color[6], foreground_color[6];
-	GF_BoxRecord default_box; 
+	GF_BoxRecord default_box;
 	u16 fontNumber;
 	u16 fontFace;
 	char reserved1[8];
@@ -1371,7 +1392,7 @@
 {
 	GF_ISOM_BOX
 	u16 startcharoffset;
-	u16 endcharoffset; 
+	u16 endcharoffset;
 } GF_TextHighlightBox;
 
 typedef struct
@@ -1465,7 +1486,7 @@
 #endif
 } GF_ItemExtentEntry;
 
-typedef struct 
+typedef struct
 {
 	u16 item_ID;
 	u16 data_reference_index;
@@ -1481,12 +1502,12 @@
 {
 	GF_ISOM_FULL_BOX
 	u8 offset_size;
-    u8 length_size;
+	u8 length_size;
 	u8 base_offset_size;
 	GF_List *location_entries;
 } GF_ItemLocationBox;
 
-typedef	struct 
+typedef	struct
 {
 	GF_ISOM_FULL_BOX
 	u16 item_ID;
@@ -1498,7 +1519,7 @@
 	GF_List *protection_information;
 } GF_ItemProtectionBox;
 
-typedef struct 
+typedef struct
 {
 	GF_ISOM_FULL_BOX
 	u16 item_ID;
@@ -1586,7 +1607,7 @@
 typedef struct __tag_meta_box
 {
 	GF_ISOM_FULL_BOX
-	GF_HandlerBox *handler;	
+	GF_HandlerBox *handler;
 	GF_PrimaryItemBox *primary_resource;
 	GF_DataInformationBox *file_locations;
 	GF_ItemLocationBox *item_locations;
@@ -1613,6 +1634,7 @@
 {
 	GF_ISOM_BOX
 	GF_List *TrackExList;
+	GF_List *TrackExPropList;
 	GF_MovieExtendsHeaderBox *mehd;
 	GF_ISOFile *mov;
 } GF_MovieExtendsBox;
@@ -1629,6 +1651,13 @@
 	GF_TrackBox *track;
 } GF_TrackExtendsBox;
 
+/*the TrackExtends contains default values for the track fragments*/
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 trackID;
+} GF_TrackExtensionPropertiesBox;
+
 /*indicates the seq num of this fragment*/
 typedef struct
 {
@@ -1708,7 +1737,7 @@
 
 	/*when data caching is on*/
 	u32 DataCache;
-    GF_TFBaseMediaDecodeTimeBox *tfdt;
+	GF_TFBaseMediaDecodeTimeBox *tfdt;
 
 	u64 moof_start_in_bs;
 } GF_TrackFragmentBox;
@@ -1743,7 +1772,10 @@
 	u32 Duration;
 	u32 size;
 	u32 flags;
-	u32 CTS_Offset;
+	s32 CTS_Offset;
+
+	/*internal*/
+	u32 SAP_type;
 } GF_TrunEntry;
 
 typedef struct
@@ -1822,7 +1854,7 @@
 typedef struct
 {
 	GF_ISOM_BOX
-	u32 TimeOffset;	
+	u32 TimeOffset;
 } GF_TimeOffHintEntryBox;
 
 typedef struct
@@ -2166,7 +2198,7 @@
 	GF_ISOM_FULL_BOX
 	u32 grouping_type;
 	u32 grouping_type_parameter;
-    
+
 	u32 entry_count;
 	GF_SampleGroupEntry *sample_entries;
 
@@ -2178,32 +2210,33 @@
 	u32 grouping_type;
 	u32 default_length;
 
+	u32 default_description_index;
 	GF_List *group_descriptions;
 } GF_SampleGroupDescriptionBox;
 
 /*default entry */
 typedef struct
 {
-	u32 length; 
-	u8 *data; 
+	u32 length;
+	u8 *data;
 } GF_DefaultSampleGroupDescriptionEntry;
 
 /*VisualRandomAccessEntry - 'rap ' type*/
 typedef struct
 {
-	u8 num_leading_samples_known; 
-	u8 num_leading_samples; 
+	u8 num_leading_samples_known;
+	u8 num_leading_samples;
 } GF_VisualRandomAccessEntry;
 
 /*RollRecoveryEntry - 'roll' type*/
 typedef struct
 {
-	s16 roll_distance; 
+	s16 roll_distance;
 } GF_RollRecoveryEntry;
 
 
 
-/* 
+/*
 		CENC stuff
 */
 
@@ -2211,7 +2244,7 @@
 typedef struct
 {
 	u32 IsEncrypted;
-	u8 IV_size; 
+	u8 IV_size;
 	bin128 KID;
 } GF_CENCSampleEncryptionGroupEntry;
 
@@ -2231,7 +2264,7 @@
 	GF_ISOM_FULL_BOX
 
 	u32 IsEncrypted;
-	u8 IV_size; 
+	u8 IV_size;
 	bin128 KID;
 } GF_TrackEncryptionBox;
 
@@ -2239,10 +2272,10 @@
 {
 	GF_ISOM_UUID_BOX
 	u8 version;
-	u32 flags;		
+	u32 flags;
 
 	u32 AlgorithmID;
-	u8 IV_size; 
+	u8 IV_size;
 	bin128 KID;
 } GF_PIFFTrackEncryptionBox;
 
@@ -2250,7 +2283,7 @@
 {
 	GF_ISOM_UUID_BOX
 	u8 version;
-	u32 flags;		
+	u32 flags;
 
 	bin128 SystemID;
 	u32 private_data_size;
@@ -2262,7 +2295,7 @@
 {
 	GF_ISOM_UUID_BOX
 	u8 version;
-	u32 flags;		
+	u32 flags;
 
 	GF_List *samp_aux_info;
 	u64 bs_offset;
@@ -2288,7 +2321,7 @@
 {
 	GF_ISOM_UUID_BOX
 	u8 version;
-	u32 flags;		
+	u32 flags;
 
 	GF_List *samp_aux_info;
 	u64 bs_offset;
@@ -2363,7 +2396,7 @@
 } GF_AdobeDRMKeyManagementSystemBox;
 
 
-typedef struct 
+typedef struct
 {
 	GF_ISOM_FULL_BOX
 	u32 refTrackID;
@@ -2412,7 +2445,7 @@
 	GF_ISOM_BASE_DATA_HANDLER
 } GF_DataMap;
 
-typedef struct 
+typedef struct
 {
 	GF_ISOM_BASE_DATA_HANDLER
 	FILE *stream;
@@ -2424,7 +2457,7 @@
 } GF_FileDataMap;
 
 /*file mapping handler. used if supported, only on read mode for complete files  (not in file download)*/
-typedef struct 
+typedef struct
 {
 	GF_ISOM_BASE_DATA_HANDLER
 	char *name;
@@ -2456,7 +2489,7 @@
 #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);
-#endif	
+#endif
 
 void gf_isom_datamap_flush(GF_DataMap *map);
 
@@ -2587,7 +2620,7 @@
 GF_Err GetESDForTime(GF_MovieBox *moov, u32 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 - 
+/*get esd for given sample desc -
 	@true_desc_only: if true doesn't emulate desc and returns native ESD,
 				otherwise emulates if needed/possible (TimedText) and return a hard copy of the desc
 */
@@ -2621,9 +2654,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, u8 *IsRAP, u32 *prevRAP, u32 *nextRAP);
+GF_Err stbl_GetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, SAPType *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, u8 *IsRAP, u32 *prevRAP, u32 *nextRAP);
+GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP);
 GF_Err stbl_GetSampleInfos(GF_SampleTableBox *stbl, u32 sampleNumber, u64 *offset, u32 *chunkNumber, u32 *descIndex, u8 *isEdited);
 GF_Err stbl_GetSampleShadow(GF_ShadowSyncBox *stsh, u32 *sampleNumber, u32 *syncNum);
 GF_Err stbl_GetPaddingBits(GF_PaddingBitsBox *padb, u32 SampleNumber, u8 *PadBits);
@@ -2752,6 +2785,8 @@
 void gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u32 offset, u32 len);
 Bool gf_isom_cenc_has_saiz_saio(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf);
 
+void gf_isom_parse_trif_info(const char *data, u32 size, u32 *id, u32 *independent, Bool *full_frame, u32 *x, u32 *y, u32 *w, u32 *h);
+
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
 /*
@@ -2877,8 +2912,8 @@
 /*the RTP packet*/
 typedef struct
 {
-	GF_ISOM_BASE_PACKET	
-	
+	GF_ISOM_BASE_PACKET
+
 	/*RTP Header*/
 	u8 P_bit;
 	u8 X_bit;
@@ -2907,11 +2942,11 @@
 #endif
 
 
-struct _3gpp_text_sample 
+struct _3gpp_text_sample
 {
 	char *text;
 	u32 len;
-	
+
 	GF_TextStyleBox *styles;
 	/*at most one of these*/
 	GF_TextHighlightColorBox *highlight_color;
@@ -2963,6 +2998,7 @@
 GF_Box *url_New();
 GF_Box *urn_New();
 GF_Box *cprt_New();
+GF_Box *kind_New();
 GF_Box *chpl_New();
 GF_Box *hdlr_New();
 GF_Box *iods_New();
@@ -3014,6 +3050,7 @@
 void urn_del(GF_Box *);
 void chpl_del(GF_Box *);
 void cprt_del(GF_Box *);
+void kind_del(GF_Box *);
 void hdlr_del(GF_Box *);
 void iods_del(GF_Box *);
 void trak_del(GF_Box *);
@@ -3065,6 +3102,7 @@
 GF_Err urn_Write(GF_Box *s, GF_BitStream *bs);
 GF_Err chpl_Write(GF_Box *s, GF_BitStream *bs);
 GF_Err cprt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err kind_Write(GF_Box *s, GF_BitStream *bs);
 GF_Err hdlr_Write(GF_Box *s, GF_BitStream *bs);
 GF_Err iods_Write(GF_Box *s, GF_BitStream *bs);
 GF_Err trak_Write(GF_Box *s, GF_BitStream *bs);
@@ -3116,6 +3154,7 @@
 GF_Err urn_Size(GF_Box *);
 GF_Err chpl_Size(GF_Box *);
 GF_Err cprt_Size(GF_Box *);
+GF_Err kind_Size(GF_Box *);
 GF_Err hdlr_Size(GF_Box *);
 GF_Err iods_Size(GF_Box *);
 GF_Err trak_Size(GF_Box *);
@@ -3167,6 +3206,7 @@
 GF_Err urn_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err chpl_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err cprt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err kind_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err hdlr_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err iods_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err trak_Read(GF_Box *s, GF_BitStream *bs);
@@ -3418,7 +3458,7 @@
 GF_Err mehd_Write(GF_Box *s, GF_BitStream *bs);
 GF_Err mehd_Size(GF_Box *s);
 
-#endif 
+#endif
 
 /*avc ext*/
 GF_Box *avcc_New();
@@ -3547,21 +3587,21 @@
 GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config);
 GF_ISOSample *gf_isom_webvtt_to_sample(void *samp);
 
-typedef struct 
+typedef struct
 {
-    GF_ISOM_BOX
-    char *string;
+	GF_ISOM_BOX
+	char *string;
 } GF_StringBox;
 
 typedef struct
 {
-    GF_ISOM_SAMPLE_ENTRY_FIELDS
-    GF_StringBox *config;
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
+	GF_StringBox *config;
 } GF_WebVTTSampleEntryBox;
 
 typedef struct
 {
-    GF_ISOM_SAMPLE_ENTRY_FIELDS
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
 	char *xmlnamespace;			// not optional
 	char *schema_location;		// optional
 	char *auxiliary_mime_types;	// optional
@@ -3570,11 +3610,11 @@
 
 typedef struct
 {
-    GF_ISOM_SAMPLE_ENTRY_FIELDS
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
 	char *content_encoding;			//optional
 	char *mime_type;				//not optional
 	GF_MPEG4BitRateBox *bitrate;	// optional
-    GF_StringBox *config;
+	GF_StringBox *config;
 } GF_SimpleTextSampleEntryBox;
 
 GF_List *gf_webvtt_parse_cues_from_data(const char *data, u32 dataLength, u64 start);
@@ -3600,6 +3640,7 @@
 void meta_del(GF_Box *s);
 void xml_del(GF_Box *s);
 void bxml_del(GF_Box *s);
+void iloc_entry_del(GF_ItemLocationEntry *location);
 void iloc_del(GF_Box *s);
 void pitm_del(GF_Box *s);
 void ipro_del(GF_Box *s);
@@ -3731,6 +3772,7 @@
 GF_Err url_dump(GF_Box *a, FILE * trace);
 GF_Err urn_dump(GF_Box *a, FILE * trace);
 GF_Err cprt_dump(GF_Box *a, FILE * trace);
+GF_Err kind_dump(GF_Box *a, FILE * trace);
 GF_Err hdlr_dump(GF_Box *a, FILE * trace);
 GF_Err iods_dump(GF_Box *a, FILE * trace);
 GF_Err trak_dump(GF_Box *a, FILE * trace);
@@ -3923,12 +3965,12 @@
 GF_Err metx_Size(GF_Box *s);
 GF_Err metx_dump(GF_Box *a, FILE * trace);
 
-GF_Box *stse_New();
-void stse_del(GF_Box *s);
-GF_Err stse_Read(GF_Box *s, GF_BitStream *bs);
-GF_Err stse_Write(GF_Box *s, GF_BitStream *bs);
-GF_Err stse_Size(GF_Box *s);
-GF_Err stse_dump(GF_Box *a, FILE * trace);
+GF_Box *stxt_New();
+void stxt_del(GF_Box *s);
+GF_Err stxt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stxt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stxt_Size(GF_Box *s);
+GF_Err stxt_dump(GF_Box *a, FILE * trace);
 
 GF_Box *stpp_New();
 void stpp_del(GF_Box *s);
@@ -4127,6 +4169,14 @@
 //exported for sgpd comparison in traf merge
 void sgpd_write_entry(u32 grouping_type, void *entry, GF_BitStream *bs);
 
+GF_Box *trep_New();
+void trep_del(GF_Box *);
+GF_Err trep_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err trep_Size(GF_Box *s);
+GF_Err trep_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err trep_dump(GF_Box *a, FILE * trace);
+
+
 /*
 	Adobe's protection boxes
 */
@@ -4185,6 +4235,13 @@
 GF_Err adaf_Size(GF_Box *s);
 GF_Err adaf_dump(GF_Box *a, FILE * trace);
 
+GF_Box *elng_New();
+void elng_del(GF_Box *s);
+GF_Err elng_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err elng_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err elng_Size(GF_Box *s);
+GF_Err elng_dump(GF_Box *a, FILE * trace);
+
 #endif /*GPAC_DISABLE_ISOM*/
 
 #ifdef __cplusplus

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/laser_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/laser_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -28,11 +28,12 @@
 #define _GF_LASER_DEV_H_
 
 #include <gpac/laser.h>
+#include <gpac/maths.h>
 
 #ifndef GPAC_DISABLE_LASER
 
 /*per_stream config support*/
-typedef struct 
+typedef struct
 {
 	GF_LASERConfig cfg;
 	u16 ESID;
@@ -142,7 +143,7 @@
 	LSR_EVT_textinput = 30,
 	LSR_EVT_unload = 31,
 	LSR_EVT_zoom = 32
-};	
+};
 
 u32 dom_to_lsr_key(u32 dom_k);
 
@@ -179,18 +180,18 @@
 	LSR_PATH_COM_C = 0,
 	LSR_PATH_COM_H,
 	LSR_PATH_COM_L,
-	LSR_PATH_COM_M, 
-	LSR_PATH_COM_Q, 
-	LSR_PATH_COM_S, 
-	LSR_PATH_COM_T, 
-	LSR_PATH_COM_V, 
-	LSR_PATH_COM_Z, 
-	LSR_PATH_COM_c, 
-	LSR_PATH_COM_h, 
-	LSR_PATH_COM_l, 
-	LSR_PATH_COM_m, 
-	LSR_PATH_COM_q, 
-	LSR_PATH_COM_s, 
+	LSR_PATH_COM_M,
+	LSR_PATH_COM_Q,
+	LSR_PATH_COM_S,
+	LSR_PATH_COM_T,
+	LSR_PATH_COM_V,
+	LSR_PATH_COM_Z,
+	LSR_PATH_COM_c,
+	LSR_PATH_COM_h,
+	LSR_PATH_COM_l,
+	LSR_PATH_COM_m,
+	LSR_PATH_COM_q,
+	LSR_PATH_COM_s,
 	LSR_PATH_COM_t,
 	LSR_PATH_COM_v,
 	LSR_PATH_COM_z

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/m3u8.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/m3u8.h Changed

@@ -62,20 +62,20 @@
  * Basic Stream structure
  */
 typedef struct s_stream {
-    u8 i;
+	u8 i;
 } Stream;
 
 /**
  * The playlist contains a list of elements to play
  */
 typedef struct s_playList {
-    int currentMediaSequence;
-    int target_duration;
-    int mediaSequenceMin;
-    int mediaSequenceMax;
-    int computed_duration;
-    char is_ended;
-    GF_List * elements;
+	int currentMediaSequence;
+	int target_duration;
+	int mediaSequenceMin;
+	int mediaSequenceMax;
+	int computed_duration;
+	char is_ended;
+	GF_List * elements;
 } Playlist;
 
 typedef enum e_playlistElementType  { TYPE_PLAYLIST, TYPE_STREAM, TYPE_UNKNOWN} PlaylistElementType;
@@ -84,23 +84,24 @@
  * The Structure containing the playlist element
  */
 typedef struct s_playlistElement {
-    int durationInfo;
-    u64 byteRangeStart, byteRangeEnd;
-    int bandwidth, width, height;
-    char * title;
+	int durationInfo;
+	u64 byteRangeStart, byteRangeEnd;
+	int bandwidth, width, height;
+	char * title;
 	char * codecs;
-    char * url;
-    PlaylistElementType elementType;
-    union { Playlist playlist;
-        Stream stream;
-    } element;
+	char * url;
+	PlaylistElementType elementType;
+	union {
+		Playlist playlist;
+		Stream stream;
+	} element;
 
 } PlaylistElement;
 
 typedef struct s_program {
-    int programId;
-    GF_List * bitrates;
-    int currentBitrateIndex;
+	int programId;
+	GF_List * bitrates;
+	int currentBitrateIndex;
 	int computed_duration;
 } Program;
 
@@ -109,9 +110,9 @@
  * The root playlist, can contains several PlaylistElements structures
  */
 typedef struct s_variantPlaylist {
-    GF_List * programs;
-    int currentProgram;
-    Bool playlistNeedsRefresh;
+	GF_List * programs;
+	int currentProgram;
+	Bool playlistNeedsRefresh;
 } VariantPlaylist;
 
 /**
@@ -144,7 +145,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 recusively 
+ * \return NULL if element could not be created. Elements will be deleted recusively
  */
 PlaylistElement * playlist_element_new(PlaylistElementType elementType, const char * url, const char * title, const char *codecs, int durationInfo, u64 byteRangeStart, u64 byteRangeEnd);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/media_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/media_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -46,7 +46,7 @@
 
 u32 gf_latm_get_value(GF_BitStream *bs);
 
-#define GF_SVC_SSPS_ID_SHIFT	16	
+#define GF_SVC_SSPS_ID_SHIFT	16
 
 /*returns 0 if not a start code, or size of start code (3 or 4 bytes). If start code, bitstream
 is positionned AFTER start code*/
@@ -55,6 +55,9 @@
 /*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(u8 *data, u32 data_len, u32 *sc_size);
@@ -78,7 +81,7 @@
 	AVC_SPS_EXT_DECLARED = 1<<4,
 };
 
-typedef struct 
+typedef struct
 {
 	u8 cpb_removal_delay_length_minus1;
 	u8 dpb_output_delay_length_minus1;
@@ -86,7 +89,7 @@
 	/*to be eventually completed by other hrd members*/
 } AVC_HRD;
 
-typedef struct 
+typedef struct
 {
 	s32 timing_info_present_flag;
 	u32 num_units_in_tick;
@@ -123,7 +126,7 @@
 	u32 width, height;
 
 	AVC_VUI vui;
-	
+
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 sent*/
 	u32 state;
 
@@ -131,7 +134,7 @@
 	u32 nb_ei, nb_ep, nb_eb;
 } AVC_SPS;
 
-typedef struct 
+typedef struct
 {
 	s32 id; /* used to compare pps when storing SVC PSS */
 	s32 sps_id;
@@ -143,7 +146,7 @@
 
 } AVC_PPS;
 
-typedef struct 
+typedef struct
 {
 	s32 idr_pic_flag;
 	u8 temporal_id, priority_id, dependency_id, quality_id;
@@ -167,7 +170,7 @@
 } AVCSliceInfo;
 
 
-typedef struct 
+typedef struct
 {
 	u32 frame_cnt;
 	u8 exact_match_flag;
@@ -176,13 +179,13 @@
 	u8 valid;
 } AVCSeiRecoveryPoint;
 
-typedef struct 
+typedef struct
 {
 	u8 pic_struct;
 	/*to be eventually completed by other pic_timing members*/
 } AVCSeiPicTiming;
 
-typedef struct 
+typedef struct
 {
 	AVCSeiRecoveryPoint recovery_point;
 	AVCSeiPicTiming pic_timing;
@@ -257,7 +260,7 @@
 	Bool general_non_packed_constraint_flag;
 	Bool general_frame_only_constraint_flag;
 	u64 general_reserved_44bits;
-	
+
 	HEVC_SublayerPTL sub_ptl[8];
 } HEVC_ProfileTierLevel;
 
@@ -270,7 +273,7 @@
 
 typedef struct
 {
-	s32 id, vps_id; 
+	s32 id, vps_id;
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
 	u32 state;
 	u32 crc;
@@ -306,8 +309,8 @@
 
 typedef struct
 {
-	s32 id; 
-	u32 sps_id; 
+	s32 id;
+	u32 sps_id;
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
 	u32 state;
 	u32 crc;
@@ -324,11 +327,11 @@
 
 typedef struct RepFormat
 {
-    u32 chroma_format_idc;
-    u32 pic_width_luma_samples;
-    u32 pic_height_luma_samples;
-    u32 bit_depth_luma;
-    u32 bit_depth_chroma;
+	u32 chroma_format_idc;
+	u32 pic_width_luma_samples;
+	u32 pic_height_luma_samples;
+	u32 bit_depth_luma;
+	u32 bit_depth_chroma;
 	u8 separate_colour_plane_flag;
 } HEVC_RepFormat;
 
@@ -342,7 +345,7 @@
 #define MAX_SHVC_LAYERS	4
 typedef struct
 {
-	s32 id; 
+	s32 id;
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
 	u32 state;
 	u32 crc;
@@ -355,9 +358,9 @@
 
 
 	u32 scalability_mask[16];
-    u32 dimension_id[MAX_SHVC_LAYERS][16];
-    u32 layer_id_in_nuh[MAX_SHVC_LAYERS];
-    u32 layer_id_in_vps[MAX_SHVC_LAYERS];
+	u32 dimension_id[MAX_SHVC_LAYERS][16];
+	u32 layer_id_in_nuh[MAX_SHVC_LAYERS];
+	u32 layer_id_in_vps[MAX_SHVC_LAYERS];
 
 
 	u32 profile_level_tier_idx[MAX_SHVC_LAYERS];
@@ -365,7 +368,7 @@
 
 	u32 num_rep_formats;
 	HEVC_RepFormat rep_formats[16];
-    u32 rep_format_idx[16];
+	u32 rep_format_idx[16];
 } HEVC_VPS;
 
 typedef struct
@@ -437,21 +440,21 @@
 
 #if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_STREAMING)
 
-GP_RTPPacketizer *gf_rtp_packetizer_create_and_init_from_file(GF_ISOFile *file, 
-															  u32 TrackNum,
-															  void *cbk_obj, 
-															  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),
-															  u32 Path_MTU, 
-															  u32 max_ptime, 
-															  u32 default_rtp_rate, 
-															  u32 flags, 
-															  u8 PayloadID, 
-															  Bool copy_media, 
-															  u32 InterleaveGroupID, 
-															  u8 InterleaveGroupPriority);
+GP_RTPPacketizer *gf_rtp_packetizer_create_and_init_from_file(GF_ISOFile *file,
+        u32 TrackNum,
+        void *cbk_obj,
+        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),
+        u32 Path_MTU,
+        u32 max_ptime,
+        u32 default_rtp_rate,
+        u32 flags,
+        u8 PayloadID,
+        Bool copy_media,
+        u32 InterleaveGroupID,
+        u8 InterleaveGroupPriority);
 
 void gf_media_format_ttxt_sdp(GP_RTPPacketizer *builder, char *payload_name, char *sdpLine, GF_ISOFile *file, u32 track);
 
@@ -475,10 +478,10 @@
 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, 
-                                    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_init(GF_WebVTTParser *parser, const char *input_file,
+                             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);
 void gf_webvtt_parser_del(GF_WebVTTParser *parser);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/mesh.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/mesh.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -73,7 +73,7 @@
 typedef struct
 {
 	/*position*/
-	SFVec3f pos;	
+	SFVec3f pos;
 	/*texture coordinates*/
 	SFVec2f texcoords;
 	/*normal*/
@@ -118,19 +118,19 @@
 enum
 {
 	/*vertex.color is used*/
-	MESH_HAS_COLOR = 1, 
+	MESH_HAS_COLOR = 1,
 	/*mesh is 2D: normal should be ignored and a global normal set to 0 0 1*/
-	MESH_IS_2D = 1<<1, 
+	MESH_IS_2D = 1<<1,
 	/*mesh has no texture coords - disable texturing*/
-	MESH_NO_TEXTURE = 1<<2, 
+	MESH_NO_TEXTURE = 1<<2,
 	/*mesh faces are clockwise*/
-	MESH_IS_CW = 1<<3, 
+	MESH_IS_CW = 1<<3,
 	/*mesh is solid (back face culling + 2 side lighting)*/
-	MESH_IS_SOLID = 1<<4, 
+	MESH_IS_SOLID = 1<<4,
 	/*mesh has smoothed normals*/
-	MESH_IS_SMOOTHED = 1<<5, 
+	MESH_IS_SMOOTHED = 1<<5,
 	/*vertex.color is used with alpha channel*/
-	MESH_HAS_ALPHA = 1<<6, 
+	MESH_HAS_ALPHA = 1<<6,
 };
 
 /*indexes as used in glDrawElements - note that integer type is not allowed with oglES*/
@@ -224,7 +224,7 @@
 begin_cap, end_cap: indicates whether start/end faces shall be added
 @spine_ori: orientation at spine points
 @spine_scale: scale at spine points
-@tx_along_spine: if set, texture coords are generated so that the texture is mapped on the side, 
+@tx_along_spine: if set, texture coords are generated so that the texture is mapped on the side,
 otherwise the same txcoords are used all along the extrusion spine
 */
 void mesh_extrude_path(GF_Mesh *mesh, GF_Path *path, MFVec3f *thespine, Fixed creaseAngle, Bool begin_cap, Bool end_cap, MFRotation *spine_ori, MFVec2f *spine_scale, Bool tx_along_spine);
@@ -256,13 +256,13 @@
 enum
 {
 	/*AABB tree is not used*/
-	AABB_NONE, 
+	AABB_NONE,
 	/*longest box axis is used to divide an AABB node*/
-	AABB_LONGEST, 
+	AABB_LONGEST,
 	/*keep tree well-balanced*/
 	AABB_BALANCED,
 	/*best axis is use: test largest, then middle, then smallest axis*/
-	AABB_BEST_AXIS, 
+	AABB_BEST_AXIS,
 	/*use variance to pick axis*/
 	AABB_SPLATTER,
 	/*fifty/fifty point split*/
@@ -277,7 +277,7 @@
  */
 
 /*appends given face (and tesselate if needed) to the mesh. Only vertices are used in the face
-indices are ignored. 
+indices are ignored.
 partially implemented on ogl-ES*/
 void TesselateFaceMesh(GF_Mesh *mesh, GF_Mesh *face);
 
@@ -291,7 +291,7 @@
 void gf_mesh_tesselate_path(GF_Mesh *mesh, GF_Path *path, u32 outline_style);
 
 /*appends given face (and tesselate if needed) to the mesh. Only vertices are used in the face
-indices are ignored. 
+indices are ignored.
 Same as TesselateFaceMesh + faces info to determine where are the polygons in the face - used by extruder only
 */
 void TesselateFaceMeshComplex(GF_Mesh *dest, GF_Mesh *orig, u32 nbFaces, u32 *ptsPerFaces);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/mpd.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/mpd.h Changed

@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 #ifndef _MPD_H_
 #define _MPD_H_
@@ -30,64 +30,66 @@
 #include <gpac/media_tools.h>
 
 /*TODO*/
-typedef struct 
+typedef struct
 {
 	u32 dummy;
 } GF_MPD_Metrics;
 
 /*TODO*/
-typedef struct 
+typedef struct
 {
 	u32 dummy;
 } GF_MPD_ContentComponent;
 
 /*TODO*/
-typedef struct 
+typedef struct
 {
 	char *scheme_id_uri; /*MANDATORY*/
 	char *value;
+	char *id;
 } GF_MPD_Descriptor;
 
 /*TODO*/
-typedef struct 
+typedef struct
 {
 	u32 dummy;
 } GF_MPD_Subset;
 
-typedef struct 
+typedef struct
 {
 	u64 start_time;
 	u32 duration; /*MANDATORY*/
+	//may be -1 (FIXME this needs further testing)
 	u32 repeat_count;
 } GF_MPD_SegmentTimelineEntry;
 
-typedef struct 
+typedef struct
 {
 	GF_List *entries;
 } GF_MPD_SegmentTimeline;
 
-typedef struct 
+typedef struct
 {
 	u64 start_range, end_range;
 } GF_MPD_ByteRange;
 
 
-typedef struct 
+typedef struct
 {
-    char *URL;
-    char *service_location;
-    GF_MPD_ByteRange *byte_range;
+	char *URL;
+	char *service_location;
+	GF_MPD_ByteRange *byte_range;
 } GF_MPD_BaseURL;
 
-typedef struct 
+typedef struct
 {
-    char *sourceURL;
-    GF_MPD_ByteRange *byte_range;
+	char *sourceURL;
+	GF_MPD_ByteRange *byte_range;
 } GF_MPD_URL;
 
-typedef struct 
+typedef struct
 {
-    u32 num, den;
+	u32 num, den;
 } GF_MPD_Fractional;
 
 
@@ -100,9 +102,9 @@
 	Double availability_time_offset;	\
 	GF_MPD_URL *initialization_segment;	\
 	GF_MPD_URL *representation_index;	\
+ 
 
-
-typedef struct 
+typedef struct
 {
 	GF_MPD_SEGMENT_BASE
 } GF_MPD_SegmentBase;
@@ -114,13 +116,13 @@
 	u32 start_number;	\
 	GF_MPD_SegmentTimeline *segment_timeline;	\
 	GF_MPD_URL *bitstream_switching_url;	\
-
-typedef struct 
+ 
+typedef struct
 {
 	GF_MPD_MULTIPLE_SEGMENT_BASE
 } GF_MPD_MultipleSegmentBase;
 
-typedef struct 
+typedef struct
 {
 	char *media;
 	GF_MPD_ByteRange *media_range;
@@ -129,9 +131,9 @@
 	u64 duration;
 } GF_MPD_SegmentURL;
 
-typedef struct 
+typedef struct
 {
-	GF_MPD_MULTIPLE_SEGMENT_BASE	
+	GF_MPD_MULTIPLE_SEGMENT_BASE
 	/*list of segments - can be NULL if no segment*/
 	GF_List *segment_URLs;
 
@@ -139,9 +141,9 @@
 	Bool xlink_actuate_on_load;
 } GF_MPD_SegmentList;
 
-typedef struct 
+typedef struct
 {
-	GF_MPD_MULTIPLE_SEGMENT_BASE	
+	GF_MPD_MULTIPLE_SEGMENT_BASE
 	char *media;
 	char *index;
 	char *initialization;
@@ -177,15 +179,16 @@
 	GF_List *frame_packing;	\
 	GF_List *audio_channels;	\
 	GF_List *content_protection;	\
-
-
+	GF_List *essential_properties;	\
+	GF_List *supplemental_properties;	\
+ 
 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*/
@@ -197,17 +200,20 @@
 	Bool disabled;
 	char *cached_init_segment_url;
 	u64 init_start_range, init_end_range;
+	u32 probe_switch_count;
+	char *init_segment_data;
+	u32 init_segment_size;
 } GF_DASH_RepresentationPlayback;
 
 typedef struct {
 	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
 
 	char *id; /*MANDATORY*/
-    u32 bandwidth; /*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;
@@ -223,8 +229,8 @@
 } GF_MPD_Representation;
 
 
-typedef struct 
-{	
+typedef struct
+{
 	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
 
 	u32 id;
@@ -265,10 +271,10 @@
 } GF_MPD_AdaptationSet;
 
 
-typedef struct 
+typedef struct
 {
 	char *ID;
-    u32 start; /* expressed in ms, relative to the start of the MPD */
+	u32 start; /* expressed in ms, relative to the start of the MPD */
 	u32 duration; /* expressed in ms*/
 	Bool bitstream_switching;
 
@@ -283,31 +289,31 @@
 	Bool xlink_actuate_on_load;
 } GF_MPD_Period;
 
-typedef struct 
+typedef struct
 {
-    char *lang;
-    char *title;
-    char *source;
-    char *copyright;
-    char *more_info_url;
+	char *lang;
+	char *title;
+	char *source;
+	char *copyright;
+	char *more_info_url;
 } GF_MPD_ProgramInfo;
 
 
 typedef enum {
-    GF_MPD_TYPE_STATIC,
-    GF_MPD_TYPE_DYNAMIC,
+	GF_MPD_TYPE_STATIC,
+	GF_MPD_TYPE_DYNAMIC,
 } GF_MPD_Type;
 
 typedef struct {
-    char *ID;
-    char *profiles;	/*MANDATORY*/
-    GF_MPD_Type type;
+	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 */	
-    u32 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*/
+	u64 availabilityEndTime;/* expressed in milliseconds */
+	u64 publishTime;/* expressed in milliseconds */
+	u32 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_presentaton_delay; /* expressed in milliseconds */
@@ -324,13 +330,14 @@
 	/*list of Metrics */
 	GF_List *metrics;
 	/*list of GF_MPD_Period */
-    GF_List *periods;
+	GF_List *periods;
 
 	/*set during parsing*/
 	const char *xml_namespace;
 } 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);
@@ -338,6 +345,8 @@
 void gf_mpd_segment_url_free(void *ptr);
 void gf_mpd_segment_base_free(void *ptr);
 
+void gf_mpd_period_free(void *_item);
+
 typedef struct _gf_file_get GF_FileDownload;
 struct _gf_file_get
 {

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/odf_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/odf_dev.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/odf_parse_common.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/odf_parse_common.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -28,11 +28,11 @@
 #define _GF_OD_PARSE_COMMON_H_
 #include <gpac/setup.h>
 
-#define GET_U8(field) { u32 d; if (strstr(val, "0x")) { ret += sscanf(val, "%x", &d); if (ret) field = (u8) d; } else { ret += sscanf(val, "%u", &d); if (ret) field = (u8) d; }	}	
+#define GET_U8(field) { u32 d; if (strstr(val, "0x")) { ret += sscanf(val, "%x", &d); if (ret) field = (u8) d; } else { ret += sscanf(val, "%u", &d); if (ret) field = (u8) d; }	}
 #define GET_U16(field) { u16 d; if (strstr(val, "0x")) { ret += sscanf(val, "%hx", &d); if (ret) field = d; } else { ret += sscanf(val, "%hu", &d); if (ret) field = d; }	}
-#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_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")) ? 1 : 0; }
 #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; }	}

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/ogg.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/ogg.h Changed

@@ -35,57 +35,57 @@
 #endif
 
 typedef struct {
-  s32 endbyte;
-  s32  endbit;
+	s32 endbyte;
+	s32  endbit;
 
-  unsigned char *buffer;
-  unsigned char *ptr;
-  s32 storage;
+	unsigned char *buffer;
+	unsigned char *ptr;
+	s32 storage;
 } oggpack_buffer;
 
 /* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/
 
 typedef struct {
-  unsigned char *header;
-  s32 header_len;
-  unsigned char *body;
-  s32 body_len;
+	unsigned char *header;
+	s32 header_len;
+	unsigned char *body;
+	s32 body_len;
 } ogg_page;
 
 /* ogg_stream_state contains the current encode/decode state of a logical
    Ogg bitstream **********************************************************/
 
 typedef struct {
-  unsigned char   *body_data;    /* bytes from packet bodies */
-  s32    body_storage;          /* storage elements allocated */
-  s32    body_fill;             /* elements stored; fill mark */
-  s32    body_returned;         /* elements of fill returned */
+	unsigned char   *body_data;    /* bytes from packet bodies */
+	s32    body_storage;          /* storage elements allocated */
+	s32    body_fill;             /* elements stored; fill mark */
+	s32    body_returned;         /* elements of fill returned */
 
 
-  s32     *lacing_vals;      /* The values that will go to the segment table */
-  s64 *granule_vals; /* granulepos values for headers. Not compact
+	s32     *lacing_vals;      /* The values that will go to the segment table */
+	s64 *granule_vals; /* granulepos values for headers. Not compact
 				this way, but it is simple coupled to the
 				lacing fifo */
-  s32    lacing_storage;
-  s32    lacing_fill;
-  s32    lacing_packet;
-  s32    lacing_returned;
+	s32    lacing_storage;
+	s32    lacing_fill;
+	s32    lacing_packet;
+	s32    lacing_returned;
 
-  unsigned char    header[282];      /* working space for header encode */
-  s32              header_fill;
+	unsigned char    header[282];      /* working space for header encode */
+	s32              header_fill;
 
-  s32     e_o_s;          /* set when we have buffered the last packet in the
+	s32     e_o_s;          /* set when we have buffered the last packet in the
                              logical bitstream */
-  s32     b_o_s;          /* set after we've written the initial page
+	s32     b_o_s;          /* set after we've written the initial page
                              of a logical bitstream */
-  s32    serialno;
-  s32    pageno;
-  s64  packetno;      /* sequence number for decode; the framing
+	s32    serialno;
+	s32    pageno;
+	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
                              layer) also knows about the gap */
-  s64   granulepos;
+	s64   granulepos;
 
 } ogg_stream_state;
 
@@ -93,14 +93,14 @@
    to a single raw Ogg/Vorbis packet *************************************/
 
 typedef struct {
-  unsigned char *packet;
-  s32  bytes;
-  s32  b_o_s;
-  s32  e_o_s;
-
-  s64  granulepos;
-  
-  s64  packetno;     /* sequence number for decode; the framing
+	unsigned char *packet;
+	s32  bytes;
+	s32  b_o_s;
+	s32  e_o_s;
+
+	s64  granulepos;
+
+	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
@@ -108,14 +108,14 @@
 } ogg_packet;
 
 typedef struct {
-  unsigned char *data;
-  s32 storage;
-  s32 fill;
-  s32 returned;
-
-  s32 unsynced;
-  s32 headerbytes;
-  s32 bodybytes;
+	unsigned char *data;
+	s32 storage;
+	s32 fill;
+	s32 returned;
+
+	s32 unsynced;
+	s32 headerbytes;
+	s32 bodybytes;
 } ogg_sync_state;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/reedsolomon.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/reedsolomon.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/scenegraph_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/scenegraph_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -130,7 +130,7 @@
 
 	/*list of all parent nodes (needed to invalidate parent tree)*/
 	GF_ParentList *parents;
-	
+
 	/*holder for all interactive stuff - THIS IS DYNAMICALLY CREATED*/
 	struct _node_interactive_ext *interact;
 } NodePriv;
@@ -154,7 +154,7 @@
 	u32 xmlns_id;
 } GF_XMLNS;
 
-struct __tag_scene_graph 
+struct __tag_scene_graph
 {
 	/*used to discriminate between node and scenegraph*/
 	u64 __reserved_null;
@@ -215,7 +215,7 @@
 	/*all routes available*/
 	GF_List *Routes;
 
-	/*when a proto is instanciated it creates its own scene graph. BIFS/VRML specify that the namespace is the same 
+	/*when a proto is instanciated it creates its own scene graph. BIFS/VRML specify that the namespace is the same
 	(eg cannot reuse a NodeID or route name/ID), but this could be done differently by some other stds
 	if NULL this is the main scenegraph*/
 	struct _proto_instance *pOwningProto;
@@ -226,7 +226,7 @@
 	GF_List *unregistered_protos;
 
 	/*routes to be activated (cascade model). This is used at the top-level graph only (eg
-	proto routes use that too, ecept ISed fields). It is the app responsability to 
+	proto routes use that too, ecept ISed fields). It is the app responsability to
 	correctly connect or browse scene graphs connected through Inline*/
 	GF_List *routes_to_activate;
 
@@ -284,10 +284,10 @@
 	/*
 			Note about reference counter
 
-	  A DOM document (<=> scenegraph) may be created through javascript, and the JS object having created the 
+	  A DOM document (<=> scenegraph) may be created through javascript, and the JS object having created the
 	  document may be destroyed while the document is still in use. Moreover with XMLHttpRequest, the
 	  "associated" doc is re-created at each request, but the script may still refer to the original document.
-	  Since the document doesn't have a fixed owner, a reference counter is use and the scenegraph is kept alive 
+	  Since the document doesn't have a fixed owner, a reference counter is use and the scenegraph is kept alive
 	  until the last object using it is destroyed.
 
 	If this counter is set to 0 when creating DOM Elements/..., this means the scenegraph is hold by an external
@@ -300,6 +300,8 @@
 	struct JSObject *document;
 
 	Bool dcci_doc;
+
+	Bool trigger_gc;
 #endif
 };
 
@@ -436,7 +438,7 @@
 
 	/*default field value*/
 	void *def_value;
-	
+
 	GF_Node *def_sfnode_value;
 	GF_ChildNodeItem *def_mfnode_value;
 
@@ -463,12 +465,13 @@
 
 /*proto field instance. since it is useless to duplicate all coding info, names and the like
 we seperate proto declaration and proto instanciation*/
-typedef struct 
+typedef struct
 {
 	u8 EventType;
 	u8 FieldType;
 	u8 has_been_accessed;
 	void *field_pointer;
+	void (*on_event_in)(GF_Node *pThis, struct _route *route);	/*eventInHandler*/
 } GF_ProtoField;
 
 
@@ -508,6 +511,7 @@
 {
 	GF_SG_PROTO_LOADED	=	1,
 	GF_SG_PROTO_IS_GROUPING =	2,
+	GF_SG_PROTO_HARDCODED =	4,
 };
 
 typedef struct _proto_instance
@@ -549,7 +553,7 @@
 u32 gf_sg_proto_get_root_tag(GF_Proto *proto);
 
 
-/*to call when a proto field has been modified (at creation or through commands, modifications through events 
+/*to call when a proto field has been modified (at creation or through commands, modifications through events
 are handled internally).
 node can be the proto instance or a node from the proto code
 this will call NodeChanged if needed, forward to proto/node or trigger any route if needed*/
@@ -590,7 +594,7 @@
 	XMLRI *href;
 	SVG_ContentType *type;
 	SVG_String *title;
-	XMLRI *arcrole; 
+	XMLRI *arcrole;
 	XMLRI *role;
 	SVG_String *show;
 	SVG_String *actuate;
@@ -617,7 +621,7 @@
 } SMILSyncAttributesPointers;
 
 typedef struct __smil_anim_attrip_ptrs {
-	SMIL_AttributeName *attributeName; 
+	SMIL_AttributeName *attributeName;
 	SMIL_AttributeType *attributeType;
 	SMIL_AnimateValue *to, *by, *from;
 	SMIL_AnimateValues *values;
@@ -663,7 +667,7 @@
 
 
 /* SMIL Timing structures */
-/* status of an SMIL timed element */ 
+/* status of an SMIL timed element */
 enum {
 	SMIL_STATUS_WAITING_TO_BEGIN = 0,
 	SMIL_STATUS_ACTIVE,
@@ -680,11 +684,11 @@
 	Bool min_active;
 
 	/* negative values mean indefinite */
-	Double begin, 
-		   end,
-		   simple_duration, 
-		   active_duration,
-		   repeat_duration;
+	Double begin,
+	       end,
+	       simple_duration,
+	       active_duration,
+	       repeat_duration;
 
 } SMIL_Interval;
 
@@ -745,15 +749,15 @@
 /* This structure is used per animated attribute,
    it contains:
     - all the animations applying to the same attribute,
-    - the specified value before any inheritance has been applied nor any animation started 
+    - the specified value before any inheritance has been applied nor any animation started
 	    (as specified in the SVG document),
     - the presentation value passed from one animation to the next one, at the same level in the tree
 	- a boolean indicating if the animated attribute is in fact a property
-   
+
    and if the attribute is a property:
 	- a pointer to presentation value passed from the previous level in the tree
 	- a pointer to the value of the color property (for handling of 'currentColor'), from previous level in the tree
-	- the location of the attribute in the elt structure when it was created 
+	- the location of the attribute in the elt structure when it was created
 	  (used for fast comparison of SVG properties when animating from/to/by/values/... inherited values)
 */
 typedef struct {
@@ -771,8 +775,8 @@
 	Bool dirty_parents;
 } SMIL_AttributeAnimations;
 
-/* This structure is per animation element, 
-   it holds the result of the animation and 
+/* This structure is per animation element,
+   it holds the result of the animation and
    some info to make animation computation faster */
 typedef struct _smil_anim_rti {
 	SMIL_AttributeAnimations *owner;
@@ -794,16 +798,16 @@
 
 	/* last value of the animation, used in accumulation phase */
 	/* normally the far pointer in the last specified value is a pointer to a real attribute value,
-	   and there's no need to allocate a new value. Except if the last specified value is the last 
+	   and there's no need to allocate a new value. Except if the last specified value is the last
 	   point in a path (animateMotion) in which case we allocate a matrix as last spec value,
 	   which we need to delete (see animate-elem-202-t.svg). This is signaled if rai->path is not NULL*/
 	GF_FieldInfo last_specified_value;
 
-	/* temporary value needed when the type of 
+	/* temporary value needed when the type of
 	   the key values is different from the target attribute type */
 	GF_FieldInfo tmp_value;
 
-	/* the number of values in animations should be constant (unless updated with LASeR commands) 
+	/* the number of values in animations should be constant (unless updated with LASeR commands)
 	   we can store them to avoid computing them at each cycle */
 	u32 values_count;
 	u32 key_times_count;
@@ -811,8 +815,8 @@
 	u32 key_splines_count;
 
 
-	/* In change detection mode, we test previous animation parameters to determine 
-	   if a new evaluation of the animation will produce a different result. 
+	/* In change detection mode, we test previous animation parameters to determine
+	   if a new evaluation of the animation will produce a different result.
 	   The result of these test is stored in interpolated_value_changed */
 	Bool	change_detection_mode;
 	Bool	interpolated_value_changed;
@@ -854,7 +858,7 @@
 		Script node
 */
 
-typedef struct 
+typedef struct
 {
 	//extra script fields
 	GF_List *fields;
@@ -942,7 +946,7 @@
 #endif /* GPAC_HAS_SPIDERMONKEY */
 
 
-typedef struct 
+typedef struct
 {
 	GF_FieldInfo field;
 	GF_Node *owner;
@@ -957,7 +961,7 @@
 	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;
@@ -973,7 +977,7 @@
 
 #ifndef GPAC_DISABLE_SVG
 
-typedef struct __tag_svg_script_ctx 
+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);
@@ -989,7 +993,7 @@
 	Bool force_gc;
 } GF_SVGJS;
 
-typedef struct __tag_html_media_script_ctx 
+typedef struct __tag_html_media_script_ctx
 {
 	/*global script context for the scene*/
 	struct JSContext *js_ctx;
@@ -1047,13 +1051,13 @@
 	GF_DOM_EXC_VALIDATION_ERR = 16,
 	GF_DOM_EXC_TYPE_MISMATCH_ERR = 17,
 	GF_DOM_EXC_SECURITY_ERR = 18,
-    GF_DOM_EXC_NETWORK_ERR = 19,
-    GF_DOM_EXC_ABORT_ERR = 20,
-    GF_DOM_EXC_URL_MISMATCH_ERR = 21,
-    GF_DOM_EXC_QUOTA_EXCEEDED_ERR = 22,
-    GF_DOM_EXC_TIMEOUT_ERR = 23,
-    GF_DOM_EXC_INVALID_NODE_TYPE_ERR = 24,
-    GF_DOM_EXC_DATA_CLONE_ERR = 25,
+	GF_DOM_EXC_NETWORK_ERR = 19,
+	GF_DOM_EXC_ABORT_ERR = 20,
+	GF_DOM_EXC_URL_MISMATCH_ERR = 21,
+	GF_DOM_EXC_QUOTA_EXCEEDED_ERR = 22,
+	GF_DOM_EXC_TIMEOUT_ERR = 23,
+	GF_DOM_EXC_INVALID_NODE_TYPE_ERR = 24,
+	GF_DOM_EXC_DATA_CLONE_ERR = 25,
 
 };
 
@@ -1079,7 +1083,7 @@
 GF_Err gf_node_get_attribute_by_name(GF_Node *node, char *name, u32 xmlns_code, Bool create_if_not_found, Bool set_default, GF_FieldInfo *field);
 void *gf_svg_get_property_pointer_from_tag(SVGPropertiesPointers *output_property_context, u32 prop_tag);
 void *gf_svg_get_property_pointer(SVG_Element *elt, void *input_attribute,
-								   SVGPropertiesPointers *output_property_context);
+                                  SVGPropertiesPointers *output_property_context);
 
 Bool gf_svg_is_property(GF_Node *node, GF_FieldInfo *target_attribute);
 
@@ -1093,7 +1097,7 @@
 through DOM*/
 GF_Err gf_node_deactivate(GF_Node *node);
 
-/*post a listener to be added - this is only used by LASeR:activate and DOM.addEventListener. This 
+/*post a listener to be added - this is only used by LASeR:activate and DOM.addEventListener. This
 is to ensure that when a node is processing an event creating a new listener on this node, this listener
 will not be triggered*/
 void gf_sg_listener_post_add(GF_Node *obs, GF_Node *listener);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/smjs_api.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/smjs_api.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *				Authors: Jean Le Feuvre 
+ *				Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2010
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -99,7 +99,7 @@
 
 #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_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._);
 
@@ -117,7 +117,7 @@
 
 #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_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._);
@@ -128,8 +128,8 @@
 
 #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_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) {
 
@@ -160,7 +160,7 @@
 #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
@@ -179,6 +179,7 @@
 #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
@@ -198,6 +199,7 @@
 #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)
@@ -217,8 +219,8 @@
 #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 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)
@@ -230,7 +232,7 @@
 #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
 #define SMJS_OBJ_CONSTRUCTOR(__classp)
 #define SMJS_GET_RVAL rval
 #define SMJS_SET_RVAL(__rval) *rval = __rval
@@ -250,6 +252,7 @@
 #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
 
@@ -285,7 +288,7 @@
 	the_class._class.hasInstance = gf_sg_js_has_instance;
 
 
-#define JS_MAKE_DOUBLE(__c, __double)	DOUBLE_TO_JSVAL(JS_NewDouble(__c, __double) ) 
+#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)
@@ -293,6 +296,19 @@
 #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

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/swf_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/swf_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -79,13 +79,13 @@
 	Bool has_interact, no_as;
 	Bool empty_frame;
 
-	/*copy of the swf import flags*/	
+	/*copy of the swf import flags*/
 	u32 flags;
 
 	/*bit reader*/
 	GF_BitStream *bs;
-	GF_Err ioerr;	
-	
+	GF_Err ioerr;
+
 	u32 current_frame;
 
 	/*current tag*/
@@ -103,7 +103,7 @@
 	/*the one and only sound stream for current timeline*/
 	SWFSound *sound_stream;
 
-	/*when creating sprites: 
+	/*when creating sprites:
 		1- all BIFS AUs in sprites are random access
 		2- depth is ignored in Sprites
 	*/
@@ -124,7 +124,7 @@
 	GF_Err (*show_frame)(SWFReader *read);
 
 	/*checks if display list is large enough - returns 1 if yes, 0 otherwise (and allocate space)*/
-	Bool (*allocate_depth)(SWFReader *read, u32 depth); 
+	Bool (*allocate_depth)(SWFReader *read, u32 depth);
 	GF_Err (*place_obj)(SWFReader *read, u32 depth, u32 ID, u32 prev_id, u32 type, GF_Matrix2D *mat, GF_ColorMatrix *cmat, GF_Matrix2D *prev_mat, GF_ColorMatrix *prev_cmat);
 	GF_Err (*remove_obj)(SWFReader *read, u32 depth, u32 ID);
 
@@ -132,12 +132,12 @@
 	GF_Err (*define_sprite)(SWFReader *read, u32 nb_frames);
 	GF_Err (*define_text)(SWFReader *read, SWFText *text);
 	GF_Err (*define_edit_text)(SWFReader *read, SWFEditText *text);
-	/*@button is NULL to signal end of button declaration, non-null otherwise. "action" callback will be 
+	/*@button is NULL to signal end of button declaration, non-null otherwise. "action" callback will be
 	called inbetween*/
 	GF_Err (*define_button)(SWFReader *read, SWF_Button *button);
 
 	GF_Err (*setup_image)(SWFReader *read, u32 ID, char *fileName);
-	/*called whenever a sound is found. For soundstreams, called twice, once on the header (declaration), 
+	/*called whenever a sound is found. For soundstreams, called twice, once on the header (declaration),
 	and one on the first soundstream block for offset signaling*/
 	GF_Err (*setup_sound)(SWFReader *read, SWFSound *snd, Bool soundstream_first_block);
 	GF_Err (*start_sound)(SWFReader *read, SWFSound *snd, Bool stop);
@@ -177,19 +177,19 @@
 
 	/* </BIFS conversion state> */
 
-    /* SVG conversion state */
+	/* SVG conversion state */
 	Bool print_stream_header;
 	Bool print_frame_header;
 	u32 frame_header_offset;
 	char *svg_data;
 	u32 svg_data_size;
 	Bool svg_shape_started;
-    /* end of SVG conversion state */
+	/* end of SVG conversion state */
 
 	/* MP4 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);
+	GF_Err (*add_header)(void *user, const char *data, u32 length, Bool isHeader);
 };
 
 
@@ -200,14 +200,17 @@
 
 GF_Err swf_to_bifs_init(SWFReader *read);
 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);
+
 
 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_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));
+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));
 
 typedef struct
 {
@@ -241,7 +244,7 @@
 	SWFPath *path;
 } SWFShapeRec;
 
-struct SWFShape 
+struct SWFShape
 {
 	GF_List *fill_left, *fill_right, *lines;
 	u32 ID;
@@ -295,7 +298,7 @@
 	GF_List *text;
 };
 
-struct SWFEditText 
+struct SWFEditText
 {
 	u32 ID;
 	char *init_value;
@@ -336,7 +339,7 @@
 	Bool is_setup;
 };
 
-typedef struct 
+typedef struct
 {
 	/*interaction states*/
 	Bool hitTest, down, over, up;
@@ -348,7 +351,7 @@
 } SWF_ButtonRecord;
 
 
-struct SWF_Button 
+struct SWF_Button
 {
 	u32 count;
 	SWF_ButtonRecord buttons[40];

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/terminal_dev.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/terminal_dev.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -47,6 +47,7 @@
 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
@@ -54,17 +55,28 @@
 	/*the module handling this service - must be declared first to typecast with GF_DownlaodSession 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;
-	
+
 	/*clock objects. Kept at service level since ESID namespace is the service one*/
 	GF_List *Clocks;
 	/*all downloaders objects used in this service*/
@@ -76,6 +88,8 @@
 	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
@@ -128,12 +142,13 @@
 	/*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 
+	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;
 
@@ -160,11 +175,14 @@
 
 	/*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); 
+	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;
 
@@ -209,6 +227,12 @@
 	/*list of M_KeyNavigator nodes*/
 	GF_List *keynavigators;
 #endif
+
+	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;
 };
 
 GF_Scene *gf_scene_new(GF_Scene *parentScene);
@@ -222,8 +246,10 @@
 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 settings*/
+/*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*/
@@ -238,7 +264,8 @@
 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, u64 from_time);
+void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only);
+
 /*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);
@@ -252,6 +279,8 @@
 
 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);
+
 #ifndef GPAC_DISABLE_VRML
 
 /*extern proto fetcher*/
@@ -302,7 +331,7 @@
 };
 
 /*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 
+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
@@ -311,17 +340,17 @@
 
 #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	
+struct __gf_uri_relocator
+{
+	GF_TERM_URI_RELOCATOR
 };
 
-typedef struct 
-{	
-	GF_TERM_URI_RELOCATOR	
+typedef struct
+{
+	GF_TERM_URI_RELOCATOR
 	GF_Terminal *term;
 	char *szAbsRelocatedPath;
 } GF_TermLocales;
@@ -340,7 +369,7 @@
 {
 	u32 flags;
 
-	/*callback to user application*/	
+	/*callback to user application*/
 	GF_User *user;
 	/*scene compositor*/
 	struct __tag_compositor *compositor;
@@ -381,7 +410,7 @@
 	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
@@ -393,7 +422,7 @@
 	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). 
+	/*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;
 
@@ -419,6 +448,8 @@
 
 	/*bench mode type: 0-none 1: regular 2- systems layers only: all decoders inputs are discarded*/
 	u32 bench_mode;
+
+	u32 prefered_audio_codec_oti;
 };
 
 
@@ -469,7 +500,7 @@
 /*callbacks for scene graph library so that all related ESM nodes are properly instanciated*/
 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). 
+/*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);
@@ -489,9 +520,9 @@
 
 
 /*clock*/
-struct _object_clock 
+struct _object_clock
 {
-	u16 clockID;	
+	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
@@ -508,7 +539,13 @@
 	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;
 };
 
 /*destroys clock*/
@@ -527,8 +564,8 @@
 void gf_clock_stop(GF_Clock *ck);
 /*return clock time in ms*/
 u32 gf_clock_time(GF_Clock *ck);
-/*return elapsed time in ms since start of the clock*/
-u32 gf_clock_elapse_time(GF_Clock *ck);
+/*return media time in ms*/
+u32 gf_clock_media_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*/
@@ -572,7 +609,7 @@
 };
 
 /*data channel (elementary stream)*/
-struct _es_channel 
+struct _es_channel
 {
 	/*service this channel belongs to*/
 	GF_ClientService *service;
@@ -590,6 +627,7 @@
 	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. */
@@ -623,19 +661,19 @@
 	/*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)*/
-	Bool codec_resilient;
+	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 */ 
+	/* 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;
@@ -654,14 +692,14 @@
 
 	/*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 
+	/*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 
+	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;
 
@@ -677,13 +715,13 @@
 
 	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;
+	u64 net_dts, net_cts, sender_ntp;
 
 	Bool last_au_was_seek;
 	Bool no_timestamps;
-	u32 prev_aggregated_dts;
 
 	Bool pull_forced_buffer;
 
@@ -732,6 +770,8 @@
 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
@@ -743,12 +783,12 @@
 	/*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. 
+	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
-	THIS IS NOT USED AS A CODEC STATUS, but only for signaling that the CB shouldn't 
-	be reseted - the real status of a "paused" decoder is STOP*/
+	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...)*/
@@ -768,14 +808,14 @@
 	GF_ESM_CODEC_IS_RAW_MEDIA = 1<<3,
 };
 
-struct _generic_codec 
+struct _generic_codec
 {
-	/*codec type (streamType from base layer)*/
-	u32 type;
+	/*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);
 
@@ -805,6 +845,8 @@
 	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;
@@ -812,17 +854,28 @@
 	Bool direct_vout;
 
 	/*statistics*/
-	u32 last_stat_start, cur_bit_size, tot_bit_size, stat_start;
+	u32 last_stat_start, cur_bit_size, stat_start;
 	u32 avg_bit_rate, max_bit_rate;
-	u32 nb_dec_frames;
-	u64 total_dec_time, max_dec_time;
+	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;
 	/*number of frames dropped at the presentation*/
 	u32 nb_droped;
 	/*we detect if the same image is sent again and again to the decoder (using last_unit_signature)*/
 	u32 nb_repeted_frames;
-
-	/*for CTS reconstruction (channels not using SL): we cannot just update timing at each frame, not precise enough 
+	/*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;
 
@@ -839,7 +892,7 @@
 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 
+/*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);
 
@@ -870,12 +923,21 @@
 	/*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
@@ -927,25 +989,31 @@
 
 	/*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 */
-	u32 current_time;
+	/* 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, media_stop_time;
+	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;
+
 //	u32 raw_media_frame_pending;
 	GF_Semaphore *raw_frame_sema;
 
@@ -957,8 +1025,17 @@
 	/*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 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;
+};
 
 GF_ObjectManager *gf_odm_new();
 void gf_odm_del(GF_ObjectManager *ODMan);
@@ -976,17 +1053,21 @@
 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 
+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 
+/*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);
 
@@ -995,7 +1076,7 @@
 /*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);
+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*/
@@ -1009,7 +1090,9 @@
 
 void gf_odm_signal_eos(GF_ObjectManager *odm);
 
-/*GF_MediaObject: link between real object manager and scene. although there is a one-to-one mapping between a 
+void gf_odm_reset_media_control(GF_ObjectManager *odm, Bool signal_reset);
+
+/*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 seperated in order to handle OD remove commands which destroy
 ObjectManagers. */
 struct _mediaobj
@@ -1049,7 +1132,7 @@
 	   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) 
+	ONLY used for scene media type (animationStreams)
 	Reset upon creation of the decoder.
 	*/
 	void *node_ptr;
@@ -1059,10 +1142,10 @@
 
 
 /*used for delayed channel setup*/
-typedef struct 
+typedef struct
 {
 	struct _generic_codec *dec;
-	struct _es_channel *ch;	
+	struct _es_channel *ch;
 } GF_ChannelSetup;
 
 /*post-poned channel connect*/
@@ -1084,12 +1167,69 @@
 u32 gf_mo_get_od_id(MFURL *url);
 
 void gf_scene_generate_views(GF_Scene *scene, char *url, char *parent_url);
+//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_Scene *scene, Double clock_time, GF_AddonMedia *addon, u32 *timestamp_based);
+u64 gf_scene_adjust_timestamp_for_addon(GF_Scene *scene, u64 orig_ts, GF_AddonMedia *addon);
+void gf_scene_select_scalable_addon(GF_Scene *scene, GF_ObjectManager *odm);
+void 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,
+};
+
+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;
+};
 
 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);
+void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons);
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/vobsub.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/vobsub.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/ismacryp.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/ismacryp.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -38,7 +38,7 @@
 
 /*loads key and salt for MPEG4IP protected files*/
 Bool gf_ismacryp_mpeg4ip_get_info(char *kms_uri, char *key, char *salt);
-	
+
 enum
 {
 	/*no selective encryption*/
@@ -89,7 +89,7 @@
 
 	/*CENC extensions*/
 	u32 IsEncrypted;
-	u8 IV_size; 
+	u8 IV_size;
 	bin128 default_KID;
 	u32 KID_count;
 	bin128 *KIDs;
@@ -127,13 +127,13 @@
 GF_Err (*gf_encrypt_track)(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
 GF_Err (*gf_decrypt_track)(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
 
-/*decrypt a file 
+/*decrypt a file
 @drm_file: location of DRM data (cf MP4Box doc).
 @LogMsg: redirection for message or NULL for default
 */
 GF_Err gf_decrypt_file(GF_ISOFile *mp4file, const char *drm_file);
 
-/*Crypt a the file 
+/*Crypt a the file
 @drm_file: location of DRM data.
 @LogMsg: redirection for message or NULL for default
 */

gpac-0.5.0.svn5178.tar.bz2/include/gpac/iso639.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/iso639.h Changed

@@ -1,526 +1,73 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
- *  This file is part of GPAC 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #ifndef _GF_ISO_639_H
 #define _GF_ISO_639_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/setup.h>
+
+/*!
+ *	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
+*/
+s32 gf_lang_find(const char *lang_or_rfc_5646_code);
 
-/*ISO 639 code names 
-	- first string is readable english name of the language
-	- second string is 3-char code of language as per ISO/IEC 639-2/T
-	- third string is 2-char code of language as per ISO/IEC 639-1, and may be empty 
+/*!
+ *	Gets the langauge name for the given index
+ *	\param lang_idx the langauge 0-based IDX 
+ *	\return the name of the language
 */
-static const char *GF_ISO639_Lang[] = 
-{
-	"Abkhazian","abk","ab",
-	"Achinese","ace","",
-	"Acoli","ach","",
-	"Adangme","ada","",
-	"Adyghe; Adygei","ady","",
-	"Afar","aar","aa",
-	"Afrihili","afh","",
-	"Afrikaans","afr","af",
-	"Afro-Asiatic languages","afa","",
-	"Ainu","ain","",
-	"Akan","aka","ak",
-	"Akkadian","akk","",
-	"Albanian","sqi","sq",
-	"Aleut","ale","",
-	"Algonquian languages","alg","",
-	"Altaic languages","tut","",
-	"Amharic","amh","am",
-	"Angika","anp","",
-	"Apache languages","apa","",
-	"Arabic","ara","ar",
-	"Aragonese","arg","an",
-	"Arapaho","arp","",
-	"Arawak","arw","",
-	"Armenian","hye","hy",
-	"Aromanian; Arumanian; Macedo-Romanian","rup","",
-	"Artificial languages","art","",
-	"Assamese","asm","as",
-	"Asturian; Bable; Leonese; Asturleonese","ast","",
-	"Athapascan languages","ath","",
-	"Australian languages","aus","",
-	"Austronesian languages","map","",
-	"Avaric","ava","av",
-	"Avestan","ave","ae",
-	"Awadhi","awa","",
-	"Aymara","aym","ay",
-	"Azerbaijani","aze","az",
-	"Balinese","ban","",
-	"Baltic languages","bat","",
-	"Baluchi","bal","",
-	"Bambara","bam","bm",
-	"Bamileke languages","bai","",
-	"Banda languages","bad","",
-	"Bantu languages","bnt","",
-	"Basa","bas","",
-	"Bashkir","bak","ba",
-	"Basque","eus","eu",
-	"Batak languages","btk","",
-	"Beja; Bedawiyet","bej","",
-	"Belarusian","bel","be",
-	"Bemba","bem","",
-	"Bengali","ben","bn",
-	"Berber languages","ber","",
-	"Bhojpuri","bho","",
-	"Bihari languages","bih","bh",
-	"Bikol","bik","",
-	"Bini; Edo","bin","",
-	"Bislama","bis","bi",
-	"Blin; Bilin","byn","",
-	"Blissymbols; Blissymbolics; Bliss","zbl","",
-	"Bokmål, Norwegian; Norwegian Bokmål","nob","nb",
-	"Bosnian","bos","bs",
-	"Braj","bra","",
-	"Breton","bre","br",
-	"Buginese","bug","",
-	"Bulgarian","bul","bg",
-	"Buriat","bua","",
-	"Burmese","mya","my",
-	"Caddo","cad","",
-	"Catalan; Valencian","cat","ca",
-	"Caucasian languages","cau","",
-	"Cebuano","ceb","",
-	"Celtic languages","cel","",
-	"Central American Indian languages","cai","",
-	"Central Khmer","khm","km",
-	"Chagatai","chg","",
-	"Chamic languages","cmc","",
-	"Chamorro","cha","ch",
-	"Chechen","che","ce",
-	"Cherokee","chr","",
-	"Cheyenne","chy","",
-	"Chibcha","chb","",
-	"Chichewa; Chewa; Nyanja","nya","ny",
-	"Chinese","zho","zh",
-	"Chinook jargon","chn","",
-	"Chipewyan; Dene Suline","chp","",
-	"Choctaw","cho","",
-	"Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic","chu","cu",
-	"Chuukese","chk","",
-	"Chuvash","chv","cv",
-	"Classical Newari; Old Newari; Classical Nepal Bhasa","nwc","",
-	"Classical Syriac","syc","",
-	"Coptic","cop","",
-	"Cornish","cor","kw",
-	"Corsican","cos","co",
-	"Cree","cre","cr",
-	"Creek","mus","",
-	"Creoles and pidgins","crp","",
-	"Creoles and pidgins, English based","cpe","",
-	"Creoles and pidgins, French-based","cpf","",
-	"Creoles and pidgins, Portuguese-based","cpp","",
-	"Crimean Tatar; Crimean Turkish","crh","",
-	"Croatian","hrv","hr",
-	"Cushitic languages","cus","",
-	"Czech","ces","cs",
-	"Dakota","dak","",
-	"Danish","dan","da",
-	"Dargwa","dar","",
-	"Delaware","del","",
-	"Dinka","din","",
-	"Divehi; Dhivehi; Maldivian","div","dv",
-	"Dogri","doi","",
-	"Dogrib","dgr","",
-	"Dravidian languages","dra","",
-	"Duala","dua","",
-	"Dutch, Middle (ca.1050-1350)","dum","",
-	"Dutch; Flemish","nld","nl",
-	"Dyula","dyu","",
-	"Dzongkha","dzo","dz",
-	"Eastern Frisian","frs","",
-	"Efik","efi","",
-	"Egyptian (Ancient)","egy","",
-	"Ekajuk","eka","",
-	"Elamite","elx","",
-	"English","eng","en",
-	"English, Middle (1100-1500)","enm","",
-	"English, Old (ca.450-1100)","ang","",
-	"Erzya","myv","",
-	"Esperanto","epo","eo",
-	"Estonian","est","et",
-	"Ewe","ewe","ee",
-	"Ewondo","ewo","",
-	"Fang","fan","",
-	"Fanti","fat","",
-	"Faroese","fao","fo",
-	"Fijian","fij","fj",
-	"Filipino; Pilipino","fil","",
-	"Finnish","fin","fi",
-	"Finno-Ugrian languages","fiu","",
-	"Fon","fon","",
-	"French","fra","fr",
-	"French, Middle (ca.1400-1600)","frm","",
-	"French, Old (842-ca.1400)","fro","",
-	"Friulian","fur","",
-	"Fulah","ful","ff",
-	"Ga","gaa","",
-	"Gaelic; Scottish Gaelic","gla","gd",
-	"Galibi Carib","car","",
-	"Galician","glg","gl",
-	"Ganda","lug","lg",
-	"Gayo","gay","",
-	"Gbaya","gba","",
-	"Geez","gez","",
-	"Georgian","kat","ka",
-	"German","deu","de",
-	"German, Middle High (ca.1050-1500)","gmh","",
-	"German, Old High (ca.750-1050)","goh","",
-	"Germanic languages","gem","",
-	"Gilbertese","gil","",
-	"Gondi","gon","",
-	"Gorontalo","gor","",
-	"Gothic","got","",
-	"Grebo","grb","",
-	"Greek, Ancient (to 1453)","grc","",
-	"Greek, Modern (1453-)","ell","el",
-	"Guarani","grn","gn",
-	"Gujarati","guj","gu",
-	"Gwich'in","gwi","",
-	"Haida","hai","",
-	"Haitian; Haitian Creole","hat","ht",
-	"Hausa","hau","ha",
-	"Hawaiian","haw","",
-	"Hebrew","heb","he",
-	"Herero","her","hz",
-	"Hiligaynon","hil","",
-	"Himachali languages; Western Pahari languages","him","",
-	"Hindi","hin","hi",
-	"Hiri Motu","hmo","ho",
-	"Hittite","hit","",
-	"Hmong; Mong","hmn","",
-	"Hungarian","hun","hu",
-	"Hupa","hup","",
-	"Iban","iba","",
-	"Icelandic","isl","is",
-	"Ido","ido","io",
-	"Igbo","ibo","ig",
-	"Ijo languages","ijo","",
-	"Iloko","ilo","",
-	"Inari Sami","smn","",
-	"Indic languages","inc","",
-	"Indo-European languages","ine","",
-	"Indonesian","ind","id",
-	"Ingush","inh","",
-	"Interlingua (International Auxiliary Language Association)","ina","ia",
-	"Interlingue; Occidental","ile","ie",
-	"Inuktitut","iku","iu",
-	"Inupiaq","ipk","ik",
-	"Iranian languages","ira","",
-	"Irish","gle","ga",
-	"Irish, Middle (900-1200)","mga","",
-	"Irish, Old (to 900)","sga","",
-	"Iroquoian languages","iro","",
-	"Italian","ita","it",
-	"Japanese","jpn","ja",
-	"Javanese","jav","jv",
-	"Judeo-Arabic","jrb","",
-	"Judeo-Persian","jpr","",
-	"Kabardian","kbd","",
-	"Kabyle","kab","",
-	"Kachin; Jingpho","kac","",
-	"Kalaallisut; Greenlandic","kal","kl",
-	"Kalmyk; Oirat","xal","",
-	"Kamba","kam","",
-	"Kannada","kan","kn",
-	"Kanuri","kau","kr",
-	"Kara-Kalpak","kaa","",
-	"Karachay-Balkar","krc","",
-	"Karelian","krl","",
-	"Karen languages","kar","",
-	"Kashmiri","kas","ks",
-	"Kashubian","csb","",
-	"Kawi","kaw","",
-	"Kazakh","kaz","kk",
-	"Khasi","kha","",
-	"Khoisan languages","khi","",
-	"Khotanese; Sakan","kho","",
-	"Kikuyu; Gikuyu","kik","ki",
-	"Kimbundu","kmb","",
-	"Kinyarwanda","kin","rw",
-	"Kirghiz; Kyrgyz","kir","ky",
-	"Klingon; tlhIngan-Hol","tlh","",
-	"Komi","kom","kv",
-	"Kongo","kon","kg",
-	"Konkani","kok","",
-	"Korean","kor","ko",
-	"Kosraean","kos","",
-	"Kpelle","kpe","",
-	"Kru languages","kro","",
-	"Kuanyama; Kwanyama","kua","kj",
-	"Kumyk","kum","",
-	"Kurdish","kur","ku",
-	"Kurukh","kru","",
-	"Kutenai","kut","",
-	"Ladino","lad","",
-	"Lahnda","lah","",
-	"Lamba","lam","",
-	"Land Dayak languages","day","",
-	"Lao","lao","lo",
-	"Latin","lat","la",
-	"Latvian","lav","lv",
-	"Lezghian","lez","",
-	"Limburgan; Limburger; Limburgish","lim","li",
-	"Lingala","lin","ln",
-	"Lithuanian","lit","lt",
-	"Lojban","jbo","",
-	"Low German; Low Saxon; German, Low; Saxon, Low","nds","",
-	"Lower Sorbian","dsb","",
-	"Lozi","loz","",
-	"Luba-Katanga","lub","lu",
-	"Luba-Lulua","lua","",
-	"Luiseno","lui","",
-	"Lule Sami","smj","",
-	"Lunda","lun","",
-	"Luo (Kenya and Tanzania)","luo","",
-	"Lushai","lus","",
-	"Luxembourgish; Letzeburgesch","ltz","lb",
-	"Macedonian","mkd","mk",
-	"Madurese","mad","",
-	"Magahi","mag","",
-	"Maithili","mai","",
-	"Makasar","mak","",
-	"Malagasy","mlg","mg",
-	"Malay","msa","ms",
-	"Malayalam","mal","ml",
-	"Maltese","mlt","mt",
-	"Manchu","mnc","",
-	"Mandar","mdr","",
-	"Mandingo","man","",
-	"Manipuri","mni","",
-	"Manobo languages","mno","",
-	"Manx","glv","gv",
-	"Maori","mri","mi",
-	"Mapudungun; Mapuche","arn","",
-	"Marathi","mar","mr",
-	"Mari","chm","",
-	"Marshallese","mah","mh",
-	"Marwari","mwr","",
-	"Masai","mas","",
-	"Mayan languages","myn","",
-	"Mende","men","",
-	"Mi'kmaq; Micmac","mic","",
-	"Minangkabau","min","",
-	"Mirandese","mwl","",
-	"Mohawk","moh","",
-	"Moksha","mdf","",
-	"Mon-Khmer languages","mkh","",
-	"Mongo","lol","",
-	"Mongolian","mon","mn",
-	"Mossi","mos","",
-	"Multiple languages","mul","",
-	"Munda languages","mun","",
-	"N'Ko","nqo","",
-	"Nahuatl languages","nah","",
-	"Nauru","nau","na",
-	"Navajo; Navaho","nav","nv",
-	"Ndebele, North; North Ndebele","nde","nd",
-	"Ndebele, South; South Ndebele","nbl","nr",
-	"Ndonga","ndo","ng",
-	"Neapolitan","nap","",
-	"Nepal Bhasa; Newari","new","",
-	"Nepali","nep","ne",
-	"Nias","nia","",
-	"Niger-Kordofanian languages","nic","",
-	"Nilo-Saharan languages","ssa","",
-	"Niuean","niu","",
-	"No linguistic content; Not applicable","zxx","",
-	"Nogai","nog","",
-	"Norse, Old","non","",
-	"North American Indian languages","nai","",
-	"Northern Frisian","frr","",
-	"Northern Sami","sme","se",
-	"Norwegian","nor","no",
-	"Norwegian Nynorsk; Nynorsk, Norwegian","nno","nn",
-	"Nubian languages","nub","",
-	"Nyamwezi","nym","",
-	"Nyankole","nyn","",
-	"Nyoro","nyo","",
-	"Nzima","nzi","",
-	"Occitan (post 1500)","oci","oc",
-	"Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)","arc","",
-	"Ojibwa","oji","oj",
-	"Oriya","ori","or",
-	"Oromo","orm","om",
-	"Osage","osa","",
-	"Ossetian; Ossetic","oss","os",
-	"Otomian languages","oto","",
-	"Pahlavi","pal","",
-	"Palauan","pau","",
-	"Pali","pli","pi",
-	"Pampanga; Kapampangan","pam","",
-	"Pangasinan","pag","",
-	"Panjabi; Punjabi","pan","pa",
-	"Papiamento","pap","",
-	"Papuan languages","paa","",
-	"Pedi; Sepedi; Northern Sotho","nso","",
-	"Persian","fas","fa",
-	"Persian, Old (ca.600-400 B.C.)","peo","",
-	"Philippine languages","phi","",
-	"Phoenician","phn","",
-	"Pohnpeian","pon","",
-	"Polish","pol","pl",
-	"Portuguese","por","pt",
-	"Prakrit languages","pra","",
-	"Provençal, Old (to 1500);Occitan, Old (to 1500)","pro","",
-	"Pushto; Pashto","pus","ps",
-	"Quechua","que","qu",
-	"Rajasthani","raj","",
-	"Rapanui","rap","",
-	"Rarotongan; Cook Islands Maori","rar","",
-	"Reserved for local use","qaa-qtz","",
-	"Romance languages","roa","",
-	"Romanian; Moldavian; Moldovan","ron","ro",
-	"Romansh","roh","rm",
-	"Romany","rom","",
-	"Rundi","run","rn",
-	"Russian","rus","ru",
-	"Salishan languages","sal","",
-	"Samaritan Aramaic","sam","",
-	"Sami languages","smi","",
-	"Samoan","smo","sm",
-	"Sandawe","sad","",
-	"Sango","sag","sg",
-	"Sanskrit","san","sa",
-	"Santali","sat","",
-	"Sardinian","srd","sc",
-	"Sasak","sas","",
-	"Scots","sco","",
-	"Selkup","sel","",
-	"Semitic languages","sem","",
-	"Serbian","srp","sr",
-	"Serer","srr","",
-	"Shan","shn","",
-	"Shona","sna","sn",
-	"Sichuan Yi; Nuosu","iii","ii",
-	"Sicilian","scn","",
-	"Sidamo","sid","",
-	"Sign Languages","sgn","",
-	"Siksika","bla","",
-	"Sindhi","snd","sd",
-	"Sinhala; Sinhalese","sin","si",
-	"Sino-Tibetan languages","sit","",
-	"Siouan languages","sio","",
-	"Skolt Sami","sms","",
-	"Slave (Athapascan)","den","",
-	"Slavic languages","sla","",
-	"Slovak","slk","sk",
-	"Slovenian","slv","sl",
-	"Sogdian","sog","",
-	"Somali","som","so",
-	"Songhai languages","son","",
-	"Soninke","snk","",
-	"Sorbian languages","wen","",
-	"Sotho, Southern","sot","st",
-	"South American Indian languages","sai","",
-	"Southern Altai","alt","",
-	"Southern Sami","sma","",
-	"Spanish; Castilian","spa","es",
-	"Sranan Tongo","srn","",
-	"Sukuma","suk","",
-	"Sumerian","sux","",
-	"Sundanese","sun","su",
-	"Susu","sus","",
-	"Swahili","swa","sw",
-	"Swati","ssw","ss",
-	"Swedish","swe","sv",
-	"Swiss German; Alemannic; Alsatian","gsw","",
-	"Syriac","syr","",
-	"Tagalog","tgl","tl",
-	"Tahitian","tah","ty",
-	"Tai languages","tai","",
-	"Tajik","tgk","tg",
-	"Tamashek","tmh","",
-	"Tamil","tam","ta",
-	"Tatar","tat","tt",
-	"Telugu","tel","te",
-	"Tereno","ter","",
-	"Tetum","tet","",
-	"Thai","tha","th",
-	"Tibetan","bod","bo",
-	"Tigre","tig","",
-	"Tigrinya","tir","ti",
-	"Timne","tem","",
-	"Tiv","tiv","",
-	"Tlingit","tli","",
-	"Tok Pisin","tpi","",
-	"Tokelau","tkl","",
-	"Tonga (Nyasa)","tog","",
-	"Tonga (Tonga Islands)","ton","to",
-	"Tsimshian","tsi","",
-	"Tsonga","tso","ts",
-	"Tswana","tsn","tn",
-	"Tumbuka","tum","",
-	"Tupi languages","tup","",
-	"Turkish","tur","tr",
-	"Turkish, Ottoman (1500-1928)","ota","",
-	"Turkmen","tuk","tk",
-	"Tuvalu","tvl","",
-	"Tuvinian","tyv","",
-	"Twi","twi","tw",
-	"Udmurt","udm","",
-	"Ugaritic","uga","",
-	"Uighur; Uyghur","uig","ug",
-	"Ukrainian","ukr","uk",
-	"Umbundu","umb","",
-	"Uncoded languages","mis","",
-	"Undetermined","und","",
-	"Upper Sorbian","hsb","",
-	"Urdu","urd","ur",
-	"Uzbek","uzb","uz",
-	"Vai","vai","",
-	"Venda","ven","ve",
-	"Vietnamese","vie","vi",
-	"Volapük","vol","vo",
-	"Votic","vot","",
-	"Wakashan languages","wak","",
-	"Walloon","wln","wa",
-	"Waray","war","",
-	"Washo","was","",
-	"Welsh","cym","cy",
-	"Western Frisian","fry","fy",
-	"Wolaitta; Wolaytta","wal","",
-	"Wolof","wol","wo",
-	"Xhosa","xho","xh",
-	"Yakut","sah","",
-	"Yao","yao","",
-	"Yapese","yap","",
-	"Yiddish","yid","yi",
-	"Yoruba","yor","yo",
-	"Yupik languages","ypk","",
-	"Zande languages","znd","",
-	"Zapotec","zap","",
-	"Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki","zza","",
-	"Zenaga","zen","",
-	"Zhuang; Chuang","zha","za",
-	"Zulu","zul","zu",
-	"Zuni","zun","",
-	NULL
-};
+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
+*/
+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
+*/
+const char *gf_lang_get_3cc(u32 lang_idx);
+
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/include/gpac/isomedia.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/isomedia.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -41,24 +41,24 @@
 ********************************************************************/
 
 /*Modes for file opening
-		NOTE 1: All the READ function in this API can be used in EDIT/WRITE mode. 
+		NOTE 1: 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 
+		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 
+		NOTE 2: 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
 to something different. This API doesn't allow file overwriting.
 */
-enum 
+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, 
+	/*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*/
@@ -74,7 +74,7 @@
 {
 	/*FLAT: the MediaData (MPEG4 ESs) is stored at the begining of the file*/
 	GF_ISOM_STORE_FLAT = 1,
-	/*STREAMABLE: the MetaData (File Info) is stored at the begining of the file 
+	/*STREAMABLE: the MetaData (File Info) is stored at the begining 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*/
@@ -87,7 +87,7 @@
 
 };
 
-/*Some track may depend on other tracks for several reasons. They reference these tracks 
+/*Some track may depend on other tracks for several reasons. They reference these tracks
 through the following Reference Types*/
 enum
 {
@@ -107,7 +107,8 @@
 	GF_ISOM_REF_CHAP		= GF_4CC( 'c', 'h', 'a', 'p' ),
 	/*ref type for the SVC tracks*/
 	GF_ISOM_REF_BASE = GF_4CC( 's', 'b', 'a', 's' ),
-	GF_ISOM_REF_SCAL = GF_4CC( 's', 'c', 'a', 'l' )
+	GF_ISOM_REF_SCAL = GF_4CC( 's', 'c', 'a', 'l' ),
+	GF_ISOM_REF_TBAS = GF_4CC( 't', 'b', 'a', 's' )
 };
 
 /*Track Edition flag*/
@@ -165,7 +166,7 @@
 
 	/* 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'),
 
@@ -180,7 +181,7 @@
 	/*reserved, internal use in the lib. Indicates the track complies to MPEG-4 system
 	specification, and the usual OD framework tools may be used*/
 	GF_ISOM_SUBTYPE_MPEG4		= GF_4CC( 'M', 'P', 'E', 'G' ),
-	
+
 	/*reserved, internal use in the lib. Indicates the track is of GF_ISOM_SUBTYPE_MPEG4
 	but it is encrypted.*/
 	GF_ISOM_SUBTYPE_MPEG4_CRYP	= GF_4CC( 'E', 'N', 'C', 'M' ),
@@ -198,6 +199,7 @@
 	GF_ISOM_SUBTYPE_HEV2			= GF_4CC( 'h', 'e', 'v', '2' ),
 	GF_ISOM_SUBTYPE_SHC1			= GF_4CC( 's', 'h', 'c', '1' ),
 	GF_ISOM_SUBTYPE_SHV1			= GF_4CC( 's', 'h', 'v', '1' ),
+	GF_ISOM_SUBTYPE_HVT1			= GF_4CC( 'h', 'v', 't', '1' ),
 
 	/*3GPP(2) extension subtypes*/
 	GF_ISOM_SUBTYPE_3GP_H263		= GF_4CC( 's', '2', '6', '3' ),
@@ -211,10 +213,11 @@
 	GF_ISOM_SUBTYPE_3GP_DIMS	= GF_4CC( 'd', 'i', 'm', 's' ),
 
 	GF_ISOM_SUBTYPE_AC3			= GF_4CC( 'a', 'c', '-', '3' ),
+	GF_ISOM_SUBTYPE_MP3			= GF_4CC( '.', 'm', 'p', '3' ),
 
 	GF_ISOM_SUBTYPE_LSR1		= GF_4CC( 'l', 's', 'r', '1' ),
 	GF_ISOM_SUBTYPE_WVTT		= GF_4CC( 'w', 'v', 't', 't' ),
-	GF_ISOM_SUBTYPE_STSE		= GF_4CC( 's', 't', 's', 'e' ),
+	GF_ISOM_SUBTYPE_STXT		= GF_4CC( 's', 't', 'x', 't' ),
 	GF_ISOM_SUBTYPE_STPP		= GF_4CC( 's', 't', 'p', 'p' ),
 	GF_ISOM_SUBTYPE_SBTT		= GF_4CC( 's', 'b', 't', 't' ),
 };
@@ -300,6 +303,19 @@
 /*the isomedia file*/
 typedef struct __tag_isom GF_ISOFile;
 
+/*Random Access Point flag*/
+typedef enum {
+	RAP_REDUNDANT = -1,
+	RAP_NO = 0,
+	RAP = 1,
+	SAP_TYPE_1 = 1,
+	SAP_TYPE_2 = 2,
+	SAP_TYPE_3 = 3,
+	SAP_TYPE_4 = 4,
+	SAP_TYPE_5 = 5,
+	SAP_TYPE_6 = 6
+} SAPType;
+
 /*media sample object*/
 typedef struct
 {
@@ -311,12 +327,7 @@
 	u64 DTS;
 	/*relative offset for composition if needed*/
 	s32 CTS_Offset;
-	/*Random Access Point flag:
-	 0: not random access
-	 1: regular RAP, 
-	 2: sample is a redundant RAP. If set when adding the sample, this will create a sample dependency entry
-	*/
-	u8 IsRAP;
+	SAPType IsRAP;
 } GF_ISOSample;
 
 
@@ -324,7 +335,7 @@
 GF_ISOSample *gf_isom_sample_new();
 
 /*delete a sample. NOTE:the buffer content will be destroyed by default.
-if you wish to keep the buffer, set dataLength to 0 in the sample 
+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*/
 void gf_isom_sample_del(GF_ISOSample **samp);
@@ -336,17 +347,17 @@
 /*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 
+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 1 if it is a non-special file, 2 if an init segment, 3 if a media segment,
   returns 0 otherwise*/
 u32 gf_isom_probe_file(const char *fileName);
 
 /*Opens an isoMedia File.
-tmp_dir: for the 2 edit modes only, specifies a location for temp file. If NULL, the librairy will use the default
+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);
 
@@ -376,7 +387,7 @@
 /*open a movie that can be uncomplete in READ_ONLY mode
 to use for http streaming & co
 
-NOTE: you must buffer the data to a local file, this mode DOES NOT handle 
+NOTE: you must buffer the data to a local file, this mode DOES NOT handle
 http/ftp/... streaming
 
 start_range and end_range restricts the media byte range in the URL (used by DASH)
@@ -400,9 +411,9 @@
 /*return 0 if track isn't fragmented, 1 otherwise*/
 u32 gf_isom_is_track_fragmented(GF_ISOFile *the_file, u32 TrackID);
 
-/*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 
+/*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 ...
@@ -425,7 +436,7 @@
 /*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);
 
-/* Indicates that we want to parse only one moof/mdat at a time 
+/* 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
 */
 void gf_isom_set_single_moof_mode(GF_ISOFile *file, Bool mode);
@@ -531,8 +542,8 @@
 /*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.
-	
-	  NOTE: when both StreamDescriptionIndex and data_offset are NULL, only DTS, CTS_Offset and RAP indications are 
+
+	  NOTE: when both StreamDescriptionIndex and data_offset are NULL, only DTS, CTS_Offset and RAP indications are
 retrieved (faster)
 */
 GF_ISOSample *gf_isom_get_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *StreamDescriptionIndex, u64 *data_offset);
@@ -568,7 +579,7 @@
 /*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. 
+sample must be set to NULL before calling.
 
 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
@@ -576,8 +587,8 @@
 
 WARNING: the sample may not be sync even though the sync was requested (depends on the media and the editList)
 
-Note: this function will handle re-timestamping the sample according to the mapping  of the media time-line 
-on the track time-line. The sample TSs (DTS / CTS offset) are expressed in MEDIA TIME SCALE 
+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)
 
 sampleNumber is optional and gives the number of the sample in the media
@@ -611,7 +622,7 @@
 /*
 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 
+return 2 if the media has empty sync point info (eg no samples are RAPs). This will likely only happen
 			in scalable context
 */
 u8 gf_isom_has_sync_points(GF_ISOFile *the_file, u32 trackNumber);
@@ -621,8 +632,8 @@
 
 /*
 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) 
+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)
 */
 u32 gf_isom_has_time_offset(GF_ISOFile *the_file, u32 trackNumber);
 
@@ -696,10 +707,10 @@
 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) , 
+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. 
+AlternateBrandsCount is an optional parameter (can be set to NULL) ,
+	giving the number of compatible brands.
 
 	The function will set brand to 0 if no brand indication is found in the file
 */
@@ -736,7 +747,7 @@
 	User Data Manipulation (cf write API too)
 */
 
-/* Gets the number of UserDataItems with the same ID / UUID in the desired track or 
+/* 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
@@ -745,8 +756,12 @@
 GF_Err gf_isom_get_user_data(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex, char **userData, u32 *userDataSize);
 
 
-/*gets 3char media language code - @three_char_code must be at least 4 char long*/
-GF_Err gf_isom_get_media_language(GF_ISOFile *the_file, u32 trackNumber, char *three_char_code);
+/*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);
 
 /*Unknown sample description*/
 typedef struct
@@ -782,14 +797,14 @@
 /*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);
 
-/*retrieves default values for a track fragment. Each variable is optional and 
+/*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);
+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);
 
 
-/*non standard extensions used for video packets in order to keep AU structure in the file format 
+/*non standard extensions used for video packets in order to keep AU structure in the file format
 (no normative tables for that). Info is NOT written to disk.
 */
 /*get number of fragments for a sample */
@@ -857,8 +872,11 @@
 /*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, GF_ISOSample *sample);
 
-/*Add sync shadow sample to a track. 
-- There must be a regular sample with the same DTS. 
+//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)
 */
@@ -887,7 +905,7 @@
 /*removes a track reference*/
 GF_Err gf_isom_remove_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferenceIndex);
 
-/*sets track handler name. name is either NULL (reset), a UTF-8 formatted string or a UTF8 file 
+/*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);
 
@@ -911,7 +929,7 @@
 /*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. 
+/*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*/
@@ -933,6 +951,11 @@
 /*deletes copyright (1-based indexes)*/
 GF_Err gf_isom_remove_copyright(GF_ISOFile *the_file, u32 index);
 
+/*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);
+
 /*changes the handler type of the media*/
 GF_Err gf_isom_set_media_type(GF_ISOFile *movie, u32 trackNumber, u32 new_type);
 
@@ -1010,9 +1033,9 @@
 
 /*
 		Update of the Writing API for IsoMedia Version 2
-*/	
+*/
 
-/*use a compact track version for sample size. This is not usually recommended 
+/*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);
@@ -1035,7 +1058,7 @@
 /*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);
 
-/*mainly used for 3GPP text since most ISO-based formats ignore these (except MJ2K) 
+/*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);
 
@@ -1064,8 +1087,8 @@
 /*remove CTS offset table (used for B-frames)*/
 GF_Err gf_isom_remove_cts_info(GF_ISOFile *the_file, u32 trackNumber);
 
-/*set 3char code media language*/
-GF_Err gf_isom_set_media_language(GF_ISOFile *the_file, u32 trackNumber, char *three_char_code);
+/*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);
@@ -1093,7 +1116,7 @@
 /*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);
 
-/*set the rootOD URL of the movie if you need it (only needed to create empty file pointing 
+/*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);
 
@@ -1109,7 +1132,7 @@
 /*remove a track to the root OD*/
 GF_Err gf_isom_remove_track_from_root_od(GF_ISOFile *the_file, u32 trackNumber);
 
-/*Create a new StreamDescription (GF_ESD) in the file. The URL and URN are used to 
+/*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);
 
@@ -1123,7 +1146,7 @@
 
 /*Default extensions*/
 
-/*Create a new unknown StreamDescription in the file. The URL and URN are used to 
+/*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
 */
@@ -1143,7 +1166,7 @@
 /*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);
 
-/*special shortcut: clones a track (everything except media data and sample info (DTS? CTS, RAPs, etc...) 
+/*special shortcut: clones a track (everything except media data and sample info (DTS? CTS, RAPs, etc...)
 also clones sampleDescriptions
 @keep_data_ref: if set, external data references are kept, otherwise they are removed (track media data will be self-contained)
 @dest_track: track number of cloned track*/
@@ -1174,12 +1197,21 @@
 
 /*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
+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);
+
+/*Flags for gf_isom_open_segment*/
+enum
+{
+	/*FLAT: the MediaData (MPEG4 ESs) is stored at the begining 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, Bool is_scalable_segment);
+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);
@@ -1200,10 +1232,10 @@
 		2- possibly add some samples in the regular fashion
 		3- setup track fragments for all track that will be written in a fragmented way
 	(note that you can create/write a track that has no fragmentation at all)
-		4- finalize the movie for fragmentation (this will flush all meta-data and 
+		4- finalize the movie for fragmentation (this will flush all meta-data and
 	any media-data added to disk, ensuring all vital information for the presentation
 	is stored on file and not lost in case of crash/poweroff)
-	
+
 	  then 5-6 as often as desired
 		5- start a new movie fragment
 		6- add samples to each setup track
@@ -1212,11 +1244,11 @@
   IMPORTANT NOTES:
 		* 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 
+		* the fragmented movie API uses TrackID and not TrackNumber
 */
 
 /*
-setup a track for fragmentation by specifying some default values for 
+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
@@ -1227,23 +1259,23 @@
 *DefaultDegradationPriority: default degradation priority for samples in this track
 
 */
-GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, u32 TrackID, 
-							 u32 DefaultStreamDescriptionIndex,
-							 u32 DefaultSampleDuration,
-							 u32 DefaultSampleSize,
-							 u8 DefaultSampleIsSync,
-							 u8 DefaultSamplePadding,
-							 u16 DefaultDegradationPriority);
+GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, u32 TrackID,
+                                    u32 DefaultStreamDescriptionIndex,
+                                    u32 DefaultSampleDuration,
+                                    u32 DefaultSampleSize,
+                                    u8 DefaultSampleIsSync,
+                                    u8 DefaultSamplePadding,
+                                    u16 DefaultDegradationPriority);
 
-/*change the default parameters of an existing trak fragment - should not be used if samples have 
+/*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, 
-							 u32 DefaultSampleDescriptionIndex,
-							 u32 DefaultSampleDuration,
-							 u32 DefaultSampleSize,
-							 u8 DefaultSampleIsSync,
-							 u8 DefaultSamplePadding,
-							 u16 DefaultDegradationPriority);
+GF_Err gf_isom_change_track_fragment_defaults(GF_ISOFile *movie, u32 TrackID,
+        u32 DefaultSampleDescriptionIndex,
+        u32 DefaultSampleDuration,
+        u32 DefaultSampleSize,
+        u8 DefaultSampleIsSync,
+        u8 DefaultSamplePadding,
+        u16 DefaultDegradationPriority);
 
 /*flushes data to disk and prepare movie fragmentation
 @media_segment_type: 0 if no segments, 1 if regular segment, 2 if single segment*/
@@ -1257,7 +1289,7 @@
 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, char *SegName, Bool memory_mode);
+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);
@@ -1273,7 +1305,7 @@
 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, 
+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*/
@@ -1282,7 +1314,7 @@
 enum
 {
 	/*indicates that the track fragment has no samples but still has a duration
-	(silence-detection in audio codecs, ...). 
+	(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
@@ -1291,7 +1323,7 @@
 	GF_ISOM_TRAF_RANDOM_ACCESS,
 	/*activate data cache on track fragment. This is usefull 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 
+	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
 };
@@ -1305,7 +1337,7 @@
 
 *TrackID: destination track
 *sample: sample to add
-*StreamDescriptionIndex: stream description for this sample. If 0, the default one 
+*StreamDescriptionIndex: stream 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
@@ -1316,9 +1348,9 @@
 
 */
 
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, GF_ISOSample *sample, 
-								 u32 StreamDescriptionIndex, 
-								 u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundantCoding);
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, GF_ISOSample *sample,
+                                   u32 StreamDescriptionIndex,
+                                   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*/
@@ -1359,10 +1391,10 @@
 for BIFS presentation so that static resources of the scene can be downloaded before BIFS*/
 GF_Err gf_isom_set_track_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 
+/*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 
+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);
 
@@ -1425,7 +1457,7 @@
 GF_Err gf_isom_begin_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TransmissionTime);
 
 /*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 
+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);
 
@@ -1456,7 +1488,7 @@
 	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 
+Note that if you want to reference a previous HintSample in the hintTrack, you will
 have to parse the sample yourself ...
 */
 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);
@@ -1468,7 +1500,7 @@
 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 
+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);
@@ -1478,9 +1510,9 @@
 		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 
+- 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
@@ -1496,13 +1528,13 @@
 /*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);
 
-/*set 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 
+/*set 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
 */
 GF_Err gf_isom_rtp_packet_set_offset(GF_ISOFile *the_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
@@ -1583,7 +1615,7 @@
 /*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 
+@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 droped when late (B-frames & co)
 @repeated (optional): indicates this is a repeated packet (same one has already been sent)
@@ -1605,7 +1637,7 @@
 */
 
 /*Generic 3GP/3GP2 config record*/
-typedef struct 
+typedef struct
 {
 	/*GF_4CC record type, one fo the above GF_ISOM_SUBTYPE_3GP_ * subtypes*/
 	u32 type;
@@ -1708,6 +1740,9 @@
 /*sets hev1 entry type (inband SPS/PPS) instead of of hvc1 (SPS/PPS in avcC box)*/
 GF_Err gf_isom_hevc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
+/*sets hvt1 entry type (tile track) - 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);
+
 
 /*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);
@@ -1736,14 +1771,19 @@
 /*exports text track to given format
 @dump_type: 0 for TTXT, 1 for srt, 2 for SVG
 */
-GF_Err gf_isom_text_dump(GF_ISOFile *the_file, u32 track, FILE *dump, u32 dump_type);
+typedef enum {
+	GF_TEXTDUMPTYPE_TTXT = 0,
+	GF_TEXTDUMPTYPE_SRT  = 1,
+	GF_TEXTDUMPTYPE_SVG  = 2,
+} 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: 
+	@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 
+		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)
 
 */
@@ -1772,9 +1812,12 @@
 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);
 
+GF_Err gf_isom_stxt_info_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, char **mime, char **config);
+
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-/*Create a new TextSampleDescription in the file. 
+/*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
 */
@@ -1787,17 +1830,17 @@
 /*reset text sample styles but keep text*/
 GF_Err gf_isom_text_reset_styles(GF_TextSample * samp);
 
-/*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, 
+/*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 
+/*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, 
+/*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*/
@@ -1809,7 +1852,7 @@
 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, 
+	@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);
@@ -1820,14 +1863,14 @@
 /*appends hyperlinking for the sample
 	@URL: ASCII url
 	@altString: ASCII hint (tooltip, ...) for end user
-	@start_char: first char hyperlinked, 
+	@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, 
+	@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);
@@ -1843,6 +1886,8 @@
 GF_ISOSample *gf_isom_generic_subtitle_to_sample(GF_GenericSubtitleSample * tx_samp);
 GF_Err gf_isom_generic_subtitle_sample_add_text(GF_GenericSubtitleSample *samp, char *text_data, u32 text_len);
 
+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_Err gf_isom_new_xml_subtitle_description(GF_ISOFile  *movie,  u32 trackNumber, char *xmlnamespace, char *xml_schema_loc, char *mimes, u32 *outDescriptionIndex);
 GF_ISOSample *gf_isom_xml_subtitle_to_sample(GF_GenericSubtitleSample * tx_samp);
@@ -1854,7 +1899,7 @@
 		ISMACryp Samples
 *****************************************************/
 /*flags for GF_ISMASample*/
-enum 
+enum
 {
 	/*signals the stream the sample belongs to uses selective encryption*/
 	GF_ISOM_ISMA_USE_SEL_ENC = 1,
@@ -1887,7 +1932,7 @@
 /*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 
+/*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);
 
@@ -1901,19 +1946,19 @@
 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,
-							   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);
+                               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 
+	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 
+  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);
@@ -1921,15 +1966,28 @@
 /*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);
 
+typedef struct
+{
+	u16 bytes_clear_data;
+	u32 bytes_encrypted_data;
+} GF_CENCSubSampleEntry;
+
+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*/
+	u16 subsample_count;
+	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, 
-						   u32 scheme_version, char *scheme_uri, char *kms_URI,
-						   Bool selective_encryption, u32 KI_length, u32 IV_length);
+GF_Err gf_isom_set_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, 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
@@ -1939,31 +1997,17 @@
 
 
 GF_Err gf_isom_set_oma_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index,
-						   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);
+                                  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);
 
 
 GF_Err gf_isom_cenc_allocate_storage(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u32 AlgorithmID, u8 IV_size, bin128 KID);
 GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 IV_size, char *buf, u32 len);
 
 
-typedef struct 
-{
-	u16 bytes_clear_data;
-	u32 bytes_encrypted_data;
-} GF_CENCSubSampleEntry;
 
-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*/
-    u16 subsample_count;
-	GF_CENCSubSampleEntry *subsamples;
-} GF_CENCSampleAuxInfo;
-
-
-GF_Err gf_isom_set_cenc_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type, 
-									u32 scheme_version, u32 default_IsEncrypted, u8 default_IV_size, bin128 default_KID);
+GF_Err gf_isom_set_cenc_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type,
+                                   u32 scheme_version, u32 default_IsEncrypted, u8 default_IV_size, bin128 default_KID);
 
 GF_Err gf_cenc_set_pssh(GF_ISOFile *mp4, bin128 systemID, u32 version, u32 KID_count, bin128 *KID, char *data, u32 len);
 
@@ -2007,13 +2051,13 @@
 
 /********************************************************************
 				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
@@ -2024,7 +2068,7 @@
 /*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). 
+/*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);
 
@@ -2044,14 +2088,14 @@
 	@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. 
+	@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
 
 */
-GF_Err gf_isom_get_meta_item_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num, 
-							u32 *itemID, 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_meta_item_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num,
+                                  u32 *itemID, 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);
 
 
 /*gets item idx from item ID*/
@@ -2073,9 +2117,9 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-/*sets meta type (four char int, eg "mp21", ... 
+/*sets meta type (four char int, eg "mp21", ...
 	Creates a meta box if none found
-	if metaType is 0, REMOVES META 
+	if metaType is 0, REMOVES META
 */
 GF_Err gf_isom_set_meta_type(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 metaType);
 
@@ -2091,7 +2135,7 @@
 	@self_reference: indicates this item is the file itself
 	@resource_path: file to add - can be NULL when URL/URN is used
 	@item_name: item name - if NULL, use file name. CANNOT BE NULL if resource_path is not set
-	@item_id: item id - if 0, use the last item id + 1. 
+	@item_id: item id - if 0, use the last item id + 1.
 	@mime_type: item mime type - if NULL, use "application/octet-stream"
 	@content_encoding: content encoding type - if NULL, none specified
 	@URL, @URN: if set, resource will be remote (same as stream descriptions)
@@ -2149,8 +2193,8 @@
 	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 
+/*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
 */
@@ -2215,8 +2259,8 @@
 	const char *textEncoding;
 	const char *contentEncoding;
 	const char *content_script_types;
-    const char *mime_type;
-    const char *xml_schema_loc;
+	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);
@@ -2240,7 +2284,7 @@
 };
 
 /*AC3 config record*/
-typedef struct 
+typedef struct
 {
 	u8 is_ec3;
 	u8 nb_streams; //1 for AC3, max 8 for EC3
@@ -2280,6 +2324,12 @@
 /*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);
 
+/*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);
+
+/*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);
+
 /*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
@@ -2290,11 +2340,18 @@
 - 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; buf specifies the parameters for this group: IsEncrypted, IV_size, KID*/ 
+/*set encryption group for a sample_number; buf specifies the parameters for this group: IsEncrypted, IV_size, KID*/
 GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *movie, u32 track, u32 sample_number, Bool isEncrypted, u8 IV_size, bin128 KeyID);
 
 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);
+
+//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);
+
 #endif
 
 GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/laser.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/laser.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/list.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/list.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -144,7 +144,7 @@
 /*!
  *	\brief gets last item
  *
- *	Gets last item o fthe list 
+ *	Gets last item o fthe list
  *	\param ptr target list object
  */
 void *gf_list_last(GF_List *ptr);
@@ -217,7 +217,7 @@
 /*!
  *	\brief Pop the first element in the list
  *
- *	Removes the first element in the list container, effectively reducing its size by one 
+ *	Removes the first element in the list container, effectively reducing its size by one
  *  and returns the popped element.
  *	\param ptr the list to pop
  *	\return the popped element

gpac-0.5.0.svn5178.tar.bz2/include/gpac/map.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/map.h Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -37,7 +37,7 @@
 /*!
  *	\addtogroup  map_grp map
  *	\ingroup utils_grp
- *	\brief 
+ *	\brief
  *
  *	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.
@@ -76,7 +76,7 @@
  *
  * Allows to go through each pair key/value in the map.
  */
-typedef struct _it_map{
+typedef struct _it_map {
 	/* The current map*/
 	GF_Map* map;
 
@@ -88,8 +88,8 @@
 
 	/* The current index in the hasmap*/
 	u32 hash;
-	
-}GF_It_Map;
+
+} GF_It_Map;
 
 /*!
  *	\brief map constructor

gpac-0.5.1.svn5491.tar.xz/include/gpac/maths.h Added

@@ -0,0 +1,1036 @@
+/*
+ *			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_MATH_H_
+#define _GF_MATH_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/maths.h>
+ *	\brief math and trigo functions.
+ */
+
+#include <gpac/setup.h>
+
+#include <math.h>
+
+
+/*!
+ *\addtogroup math_grp math
+ *\ingroup utils_grp
+ *\brief Mathematics and Trigonometric functions
+ *
+ *This section documents the math and trigo functions used in the GPAC framework. GPAC can be compiled with
+ *fixed-point support, representing float values on a 16.16 signed integer, which implies a developer
+ *must take care of float computations when using GPAC.\n
+ *A developper should not need to know in which mode the framework has been compiled as long as he uses
+ *the math functions of GPAC which work in both float and fixed-point mode.\n
+ *Using fixed-point version is decided at compilation time and cannot be changed. The feature is signaled
+ *through the following macros:
+ *- GPAC_FIXED_POINT: when defined, GPAC has been compiled in fixed-point mode
+ *- GPAC_NO_FIXED_POINT: when defined, GPAC has been compiled in regular (float) mode
+ *	@{
+ */
+
+
+/*****************************************************************************************
+			FIXED-POINT SUPPORT - HARDCODED FOR 16.16 representation
+	the software rasterizer also use a 16.16 representation even in non-fixed version
+******************************************************************************************/
+
+#ifdef GPAC_FIXED_POINT
+
+/*!
+ *Fixed 16.16 number
+ *\hideinitializer
+ \note This documentation has been generated for a fixed-point version of the GPAC framework.
+ */
+typedef s32 Fixed;
+#define FIX_ONE			0x10000L
+#define INT2FIX(v)		((Fixed)( ((s32) (v) ) << 16))
+#define FLT2FIX(v)		((Fixed) ((v) * FIX_ONE))
+#define FIX2INT(v)		((s32)(((v)+((FIX_ONE>>1)))>>16))
+#define FIX2FLT(v)		((Float)( ((Float)(v)) / ((Float) FIX_ONE)))
+#define FIX_EPSILON		2
+#define FIX_MAX			0x7FFFFFFF
+#define FIX_MIN			-FIX_MAX
+#define GF_PI2		102944
+#define GF_PI		205887
+#define GF_2PI		411774
+
+/*!\return 1/a, expressed as fixed number*/
+Fixed gf_invfix(Fixed a);
+/*!\return a*b, expressed as fixed number*/
+Fixed gf_mulfix(Fixed a, Fixed b);
+/*!\return a*b/c, expressed as fixed number*/
+Fixed gf_muldiv(Fixed a, Fixed b, Fixed c);
+/*!\return a/b, expressed as fixed number*/
+Fixed gf_divfix(Fixed a, Fixed b);
+/*!\return sqrt(a), expressed as fixed number*/
+Fixed gf_sqrt(Fixed x);
+/*!\return ceil(a), expressed as fixed number*/
+Fixed gf_ceil(Fixed a);
+/*!\return floor(a), expressed as fixed number*/
+Fixed gf_floor(Fixed a);
+/*!\return cos(a), expressed as fixed number*/
+Fixed gf_cos(Fixed angle);
+/*!\return sin(a), expressed as fixed number*/
+Fixed gf_sin(Fixed angle);
+/*!\return tan(a), expressed as fixed number*/
+Fixed gf_tan(Fixed angle);
+/*!\return acos(a), expressed as fixed number*/
+Fixed gf_acos(Fixed angle);
+/*!\return asin(a), expressed as fixed number*/
+Fixed gf_asin(Fixed angle);
+/*!\return atan(y, x), expressed as fixed number*/
+Fixed gf_atan2(Fixed y, Fixed x);
+
+#else
+
+
+/*!Fixed is 32bit float number
+ \note This documentation has been generated for a float version of the GPAC framework.
+*/
+typedef Float Fixed;
+#define FIX_ONE			1.0f
+#define INT2FIX(v)		((Float) (v))
+#define FLT2FIX(v)		((Float) (v))
+#define FIX2INT(v)		((s32)(v))
+#define FIX2FLT(v)		((Float) (v))
+#define FIX_EPSILON		GF_EPSILON_FLOAT
+#define FIX_MAX			GF_MAX_FLOAT
+#define FIX_MIN			-GF_MAX_FLOAT
+#define GF_PI2		1.5707963267949f
+#define GF_PI		3.1415926535898f
+#define GF_2PI		6.2831853071796f
+
+/*!\hideinitializer 1/_a, expressed as fixed number*/
+#define gf_invfix(_a)	(FIX_ONE/(_a))
+/*!\hideinitializer _a*_b, expressed as fixed number*/
+#define gf_mulfix(_a, _b)		((_a)*(_b))
+/*!\hideinitializer _a*_b/_c, expressed as fixed number*/
+#define gf_muldiv(_a, _b, _c)	((_c) ? (_a)*(_b)/(_c) : GF_MAX_FLOAT)
+/*!\hideinitializer _a/_b, expressed as fixed number*/
+#define gf_divfix(_a, _b)		((_b) ? (_a)/(_b) : GF_MAX_FLOAT)
+/*!\hideinitializer sqrt(_a), expressed as fixed number*/
+#define gf_sqrt(_a) ((Float) sqrt(_a))
+/*!\hideinitializer ceil(_a), expressed as fixed number*/
+#define gf_ceil(_a) ((Float) ceil(_a))
+/*!\hideinitializer floor(_a), expressed as fixed number*/
+#define gf_floor(_a) ((Float) floor(_a))
+/*!\hideinitializer cos(_a), expressed as fixed number*/
+#define gf_cos(_a) ((Float) cos(_a))
+/*!\hideinitializer sin(_a), expressed as fixed number*/
+#define gf_sin(_a) ((Float) sin(_a))
+/*!\hideinitializer tan(_a), expressed as fixed number*/
+#define gf_tan(_a) ((Float) tan(_a))
+/*!\hideinitializer atan2(_y,_x), expressed as fixed number*/
+#define gf_atan2(_y, _x) ((Float) atan2(_y, _x))
+/*!\hideinitializer acos(_a), expressed as fixed number*/
+#define gf_acos(_a) ((Float) acos(_a))
+/*!\hideinitializer asin(_a), expressed as fixed number*/
+#define gf_asin(_a) ((Float) asin(_a))
+
+#endif
+
+/*!\def FIX_ONE
+ \hideinitializer
+ Fixed unit value
+*/
+/*!\def INT2FIX(v)
+ \hideinitializer
+ Conversion from integer to fixed
+*/
+/*!\def FLT2FIX(v)
+ \hideinitializer
+ Conversion from float to fixed
+*/
+/*!\def FIX2INT(v)
+ \hideinitializer
+ Conversion from fixed to integer
+*/
+/*!\def FIX2FLT(v)
+ \hideinitializer
+ Conversion from fixed to float
+*/
+/*!\def FIX_EPSILON
+ \hideinitializer
+ Epsilon Fixed (positive value closest to 0)
+*/
+/*!\def FIX_MAX
+ \hideinitializer
+ Maximum Fixed (maximum representable fixed value)
+*/
+/*!\def FIX_MIN
+ \hideinitializer
+ Minimum Fixed (minimum representable fixed value)
+*/
+/*!\def GF_PI2
+ \hideinitializer
+ PI/2 expressed as Fixed
+*/
+/*!\def GF_PI
+ \hideinitializer
+ PI expressed as Fixed
+*/
+/*!\def GF_2PI
+ \hideinitializer
+ 2*PI expressed as Fixed
+*/
+
+Fixed gf_angle_diff(Fixed a, Fixed b);
+
+/*!
+ *	\brief Field bit-size
+ *
+ *	Gets the number of bits needed to represent the value.
+ *	\param MaxVal Maximum value to be represented.
+ *	\return number of bits required to represent the value.
+ */
+u32 gf_get_bit_size(u32 MaxVal);
+
+/*!
+ *	\brief Get power of 2
+ *
+ *	Gets the closest power of 2 greater or equal to the value.
+ *	\param val value to be used.
+ *	\return requested power of 2.
+ */
+u32 gf_get_next_pow2(u32 val);
+
+/*!
+ *\addtogroup math2d_grp math2d
+ *\ingroup math_grp
+ *\brief 2D Mathematics functions
+ *
+ *This section documents mathematic tools for 2D geometry and color matrices operations
+ *	@{
+ */
+
+/*!\brief 2D point
+ *
+ *The 2D point object is used in all the GPAC framework for both point and vector representation.
+*/
+typedef struct __vec2f
+{
+	Fixed x;
+	Fixed y;
+} GF_Point2D;
+/*!
+ *\brief get 2D vector length
+ *
+ *Gets the length of a 2D vector
+ *\return length of the vector
+ */
+Fixed gf_v2d_len(GF_Point2D *vec);
+/*!
+ *\brief get distance between 2 points
+ *
+ *Gets the distance between the 2 points
+ *\return distance
+ */
+Fixed gf_v2d_distance(GF_Point2D *a, GF_Point2D *b);
+/*!
+ *\brief 2D vector from polar coordinates
+ *
+ *Constructs a 2D vector from its polar coordinates
+ *\param length the length of the vector
+ *\param angle the angle of the vector in radians
+ *\return the 2D vector
+ */
+GF_Point2D gf_v2d_from_polar(Fixed length, Fixed angle);
+
+/*!\brief rectangle 2D
+ *
+ *The 2D rectangle used in the GPAC project.
+ */
+typedef struct
+{
+	/*!the left coordinate of the rectangle*/
+	Fixed x;
+	/*!the top coordinate of the rectangle, regardless of the canvas orientation. In other words, y is always the
+	greatest coordinate value, 	even if the rectangle is presented bottom-up. This insures proper rectangles testing*/
+	Fixed y;
+	/*!the width of the rectangle. Width must be greater than or equal to 0*/
+	Fixed width;
+	/*!the height of the rectangle. Height must be greater than or equal to 0*/
+	Fixed height;
+} GF_Rect;
+
+/*!
+ \brief rectangle union
+ *
+ *Gets the union of two rectangles.
+ *\param rc1 first rectangle of the union. Upon return, this rectangle will contain the result of the union
+ *\param rc2 second rectangle of the union
+*/
+void gf_rect_union(GF_Rect *rc1, GF_Rect *rc2);
+/*!
+ \brief centers a rectangle
+ *
+ *Builds a rectangle centered on the origin
+ *\param w width of the rectangle
+ *\param h height of the rectangle
+ *\return centered rectangle object
+*/
+GF_Rect gf_rect_center(Fixed w, Fixed h);
+/*!
+ \brief rectangle overlap test
+ *
+ *Tests if two rectangles overlap.
+ *\param rc1 first rectangle to test
+ *\param rc2 second rectangle to test
+ *\return 1 if rectangles overlap, 0 otherwise
+*/
+Bool gf_rect_overlaps(GF_Rect rc1, GF_Rect rc2);
+/*!
+ \brief rectangle identity test
+ *
+ *Tests if two rectangles are identical.
+ *\param rc1 first rectangle to test
+ *\param rc2 second rectangle to test
+ *\return 1 if rectangles are identical, 0 otherwise
+*/
+Bool gf_rect_equal(GF_Rect rc1, GF_Rect rc2);
+
+/*!
+ *\brief pixel-aligned rectangle
+ *
+ *Pixel-aligned rectangle used in the GPAC framework. This is usually needed for 2D drawing algorithms.
+ */
+typedef struct
+{
+	/*!the left coordinate of the rectangle*/
+	s32 x;
+	/*!the top coordinate of the rectangle, regardless of the canvas orientation. In other words, y is always the
+	greatest coordinate value, even if the rectangle is presented bottom-up. This insures proper rectangles operations*/
+	s32 y;
+	/*!the width of the rectangle. Width must be greater than or equal to 0*/
+	s32 width;
+	/*!the height of the rectangle. Height must be greater than or equal to 0*/
+	s32 height;
+} GF_IRect;
+/*!
+ *\brief gets the pixelized version of a rectangle
+ *
+ *Returns the smallest pixel-aligned rectangle completely containing a rectangle
+ *\param r the rectangle to transform
+ *\return the pixel-aligned transformed rectangle
+*/
+GF_IRect gf_rect_pixelize(GF_Rect *r);
+
+
+/*!
+ *\brief 2D matrix
+ *
+ *The 2D affine matrix object usied in GPAC. The transformation of P(x,y) in P'(X, Y) is:
+ \code
+	X = m[0]*x + m[1]*y + m[2];
+	Y = m[3]*x + m[4]*y + m[5];
+ \endcode
+*/
+typedef struct
+{
+	Fixed m[6];
+} GF_Matrix2D;
+
+/*!\brief matrix initialization
+ *\hideinitializer
+ *
+ *Inits the matrix to the identity matrix
+*/
+#define gf_mx2d_init(_obj) { memset((_obj).m, 0, sizeof(Fixed)*6); (_obj).m[0] = (_obj).m[4] = FIX_ONE; }
+/*!\brief matrix copy
+ *\hideinitializer
+ *
+ *Copies the matrix _from to the matrix _obj
+*/
+#define gf_mx2d_copy(_obj, from) memcpy((_obj).m, (from).m, sizeof(Fixed)*6)
+/*!\brief matrix identity testing
+ *\hideinitializer
+ *
+ *This macro evaluates to 1 if the matrix _obj is the identity matrix, 0 otherwise
+*/
+#define gf_mx2d_is_identity(_obj) ((!(_obj).m[1] && !(_obj).m[2] && !(_obj).m[3] && !(_obj).m[5] && ((_obj).m[0]==FIX_ONE) && ((_obj).m[4]==FIX_ONE)) ? 1 : 0)
+
+/*!\brief 2D matrix multiplication
+ *
+ *Multiplies two 2D matrices from*_this
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param from transformation matrix to add
+*/
+void gf_mx2d_add_matrix(GF_Matrix2D *_this, GF_Matrix2D *from);
+
+/*!\brief 2D matrix pre-multiplication
+ *
+ *Multiplies two 2D matrices _this*from
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param from transformation matrix to add
+*/
+void gf_mx2d_pre_multiply(GF_Matrix2D *_this, GF_Matrix2D *from);
+
+/*!\brief matrix translating
+ *
+ *Translates a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param cx horizontal translation
+ *\param cy vertical translation
+*/
+void gf_mx2d_add_translation(GF_Matrix2D *_this, Fixed cx, Fixed cy);
+/*!\brief matrix rotating
+ *
+ *Rotates a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param cx horizontal rotation center coordinate
+ *\param cy vertical rotation center coordinate
+ *\param angle rotation angle in radians
+*/
+void gf_mx2d_add_rotation(GF_Matrix2D *_this, Fixed cx, Fixed cy, Fixed angle);
+/*!\brief matrix scaling
+ *
+ *Scales a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param scale_x horizontal scaling factor
+ *\param scale_y vertical scaling factor
+*/
+void gf_mx2d_add_scale(GF_Matrix2D *_this, Fixed scale_x, Fixed scale_y);
+/*!\brief matrix uncentered scaling
+ *
+ *Scales a 2D matrix with a non-centered scale
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param scale_x horizontal scaling factor
+ *\param scale_y vertical scaling factor
+ *\param cx horizontal scaling center coordinate
+ *\param cy vertical scaling center coordinate
+ *\param angle scale orienttion angle in radians
+*/
+void gf_mx2d_add_scale_at(GF_Matrix2D *_this, Fixed scale_x, Fixed scale_y, Fixed cx, Fixed cy, Fixed angle);
+/*!\brief matrix skewing
+ *
+ *Skews a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param skew_x horizontal skew factor
+ *\param skew_y vertical skew factor
+*/
+void gf_mx2d_add_skew(GF_Matrix2D *_this, Fixed skew_x, Fixed skew_y);
+/*!\brief matrix horizontal skewing
+ *
+ *Skews a 2D matrix horizontally by a given angle
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param angle horizontal skew angle in radians
+*/
+void gf_mx2d_add_skew_x(GF_Matrix2D *_this, Fixed angle);
+/*!\brief matrix vertical skewing
+ *
+ *Skews a 2D matrix vertically by a given angle
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param angle vertical skew angle in radians
+*/
+void gf_mx2d_add_skew_y(GF_Matrix2D *_this, Fixed angle);
+/*!\brief matrix inversing
+ *
+ *Inverses a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+*/
+void gf_mx2d_inverse(GF_Matrix2D *_this);
+/*!\brief matrix coordinate transformation
+ *
+ *Applies a 2D matrix transformation to coordinates
+ *\param _this transformation matrix
+ *\param x pointer to horizontal coordinate. Once the function is called, x contains the transformed horizontal coordinate
+ *\param y pointer to vertical coordinate. Once the function is called, y contains the transformed vertical coordinate
+*/
+void gf_mx2d_apply_coords(GF_Matrix2D *_this, Fixed *x, Fixed *y);
+/*!\brief matrix point transformation
+ *
+ *Applies a 2D matrix transformation to a 2D point
+ *\param _this transformation matrix
+ *\param pt pointer to 2D point. Once the function is called, pt contains the transformed point
+*/
+void gf_mx2d_apply_point(GF_Matrix2D *_this, GF_Point2D *pt);
+/*!\brief matrix rectangle transformation
+ *
+ *Applies a 2D matrix transformation to a rectangle, giving the enclosing rectangle of the transformed one
+ *\param _this transformation matrix
+ *\param rc pointer to rectangle. Once the function is called, rc contains the transformed rectangle
+*/
+void gf_mx2d_apply_rect(GF_Matrix2D *_this, GF_Rect *rc);
+
+/*!\brief matrix decomposition
+ *
+ *Decomposes a 2D matrix M as M=Scale x Rotation x Translation if possible
+ *\param _this transformation matrix
+ *\param scale resulting scale part
+ *\param rotate resulting rotation part
+ *\param translate resulting translation part
+ *\return 0 if matrix cannot be decomposed, 1 otherwise
+*/
+Bool gf_mx2d_decompose(GF_Matrix2D *_this, GF_Point2D *scale, Fixed *rotate, GF_Point2D *translate);
+
+/*! @} */
+
+
+/*!
+ *\addtogroup math3d_grp math3d
+ *\ingroup math_grp
+ *\brief 3D Mathematics functions
+ *
+ *This section documents mathematic tools for 3D geometry operations
+ *	@{
+ */
+
+/*!\brief 3D point or vector
+ *
+ *The 3D point object is used in all the GPAC framework for both point and vector representation.
+*/
+typedef struct __vec3f
+{
+	Fixed x;
+	Fixed y;
+	Fixed z;
+} GF_Vec;
+
+/*base vector operations are MACROs for faster access*/
+/*!\hideinitializer macro evaluating to 1 if vectors are equal, 0 otherwise*/
+#define gf_vec_equal(v1, v2) (((v1).x == (v2).x) && ((v1).y == (v2).y) && ((v1).z == (v2).z))
+/*!\hideinitializer macro reversing a vector v = v*/
+#define gf_vec_rev(v) { (v).x = -(v).x; (v).y = -(v).y; (v).z = -(v).z; }
+/*!\hideinitializer macro performing the minus operation res = v1 - v2*/
+#define gf_vec_diff(res, v1, v2) { (res).x = (v1).x - (v2).x; (res).y = (v1).y - (v2).y; (res).z = (v1).z - (v2).z; }
+/*!\hideinitializer macro performing the add operation res = v1 + v2*/
+#define gf_vec_add(res, v1, v2) { (res).x = (v1).x + (v2).x; (res).y = (v1).y + (v2).y; (res).z = (v1).z + (v2).z; }
+
+/*!
+ *\brief get 3D vector length
+ *
+ *Gets the length of a 3D vector
+ *\return length of the vector
+ */
+Fixed gf_vec_len(GF_Vec v);
+/*!
+ *\brief get 3D vector square length
+ *
+ *Gets the square length of a 3D vector
+ *\return square length of the vector
+ */
+Fixed gf_vec_lensq(GF_Vec v);
+/*!
+ *\brief get 3D vector dot product
+ *
+ *Gets the dot product of two vectors
+ *\return dot product of the vectors
+ */
+Fixed gf_vec_dot(GF_Vec v1, GF_Vec v2);
+/*!
+ *\brief vector normalization
+ *
+ *Norms the vector, eg make its length equal to \ref FIX_ONE
+ *\param v vector to normalize
+ */
+void gf_vec_norm(GF_Vec *v);
+/*!
+ *\brief vector scaling
+ *
+ *Scales a vector by a given amount
+ *\param v vector to scale
+ *\param f scale factor
+ *\return scaled vector
+ */
+GF_Vec gf_vec_scale(GF_Vec v, Fixed f);
+/*!
+ *\brief vector cross product
+ *
+ *Gets the cross product of two vectors
+ *\param v1 first vector
+ *\param v2 second vector
+ *\return cross-product vector
+ */
+GF_Vec gf_vec_cross(GF_Vec v1, GF_Vec v2);
+
+/*!\brief 4D vector
+ *
+ *The 4D vector object is used in all the GPAC framework for 4 dimension vectors, VRML Rotations and quaternions representation.
+*/
+typedef struct __vec4f
+{
+	Fixed x;
+	Fixed y;
+	Fixed z;
+	Fixed q;
+} GF_Vec4;
+
+
+/*!\brief 3D matrix
+ *
+ *The 3D matrix object used in GPAC. The matrix is oriented like OpenGL matrices (column-major ordering), with
+ the translation part at the end of the coefficients list.
+ \note Unless specified otherwise, the matrix object is always expected to represent an affine transformation.
+ */
+typedef struct
+{
+	Fixed m[16];
+} GF_Matrix;
+
+
+/*!\hideinitializer gets the len of a quaternion*/
+#define gf_quat_len(v) gf_sqrt(gf_mulfix((v).q,(v).q) + gf_mulfix((v).x,(v).x) + gf_mulfix((v).y,(v).y) + gf_mulfix((v).z,(v).z))
+/*!\hideinitializer normalizes a quaternion*/
+#define gf_quat_norm(v) { \
+	Fixed __mag = gf_quat_len(v);	\
+	(v).x = gf_divfix((v).x, __mag); (v).y = gf_divfix((v).y, __mag); (v).z = gf_divfix((v).z, __mag); (v).q = gf_divfix((v).q, __mag);	\
+	}	\
+ 
+/*!\brief quaternion to rotation
+ *
+ *Transforms a quaternion to a Rotation, expressed as a 4 dimension vector with x,y,z for axis and q for rotation angle
+ *\param quat the quaternion to transform
+ *\return the rotation value
+ */
+GF_Vec4 gf_quat_to_rotation(GF_Vec4 *quat);
+/*!\brief quaternion from rotation
+ *
+ *Transforms a Rotation to a quaternion
+ *\param rot the rotation to transform
+ *\return the quaternion value
+ */
+GF_Vec4 gf_quat_from_rotation(GF_Vec4 rot);
+/*!inverses a quaternion*/
+GF_Vec4 gf_quat_get_inv(GF_Vec4 *quat);
+/*!\brief quaternion multiplication
+ *
+ *Multiplies two quaternions
+ *\param q1 the first quaternion
+ *\param q2 the second quaternion
+ *\return the resulting quaternion
+ */
+GF_Vec4 gf_quat_multiply(GF_Vec4 *q1, GF_Vec4 *q2);
+/*!\brief quaternion vector rotating
+ *
+ *Rotates a vector with a quaternion
+ *\param quat the quaternion modelizing the rotation
+ *\param vec the vector to rotate
+ *\return the resulting vector
+ */
+GF_Vec gf_quat_rotate(GF_Vec4 *quat, GF_Vec *vec);
+/*!\brief quaternion from axis and cos
+ *
+ *Constructs a quaternion from an axis and a cosinus value (shortcut to \ref gf_quat_from_rotation)
+ *\param axis the rotation axis
+ *\param cos_a the rotation cosinus value
+ *\return the resulting quaternion
+ */
+GF_Vec4 gf_quat_from_axis_cos(GF_Vec axis, Fixed cos_a);
+/*!\brief quaternion interpolation
+ *
+ *Interpolates two quaternions using spherical linear interpolation
+ *\param q1 the first quaternion
+ *\param q2 the second quaternion
+ *\param frac the fraction of the interpolation, between 0 and \ref FIX_ONE
+ *\return the interpolated quaternion
+ */
+GF_Vec4 gf_quat_slerp(GF_Vec4 q1, GF_Vec4 q2, Fixed frac);
+
+/*!\brief 3D Bounding Box
+ *
+ *The 3D Bounding Box is a 3D Axis-Aligned Bounding Box used to in various tools of the GPAC framework for bounds
+ estimation of a 3D object. It features an axis-aligned box and a sphere bounding volume for fast intersection tests.
+ */
+typedef struct
+{
+	/*!minimum x, y, and z of the object*/
+	GF_Vec min_edge;
+	/*!maximum x, y, and z of the object*/
+	GF_Vec max_edge;
+
+	/*!center of the bounding box.\note this is computed from min_edge and max_edge*/
+	GF_Vec center;
+	/*!radius of the bounding sphere for this box.\note this is computed from min_edge and max_edge*/
+	Fixed radius;
+	/*!the bbox center and radius are valid*/
+	Bool is_set;
+} GF_BBox;
+/*!updates information of the bounding box based on the edge information*/
+void gf_bbox_refresh(GF_BBox *b);
+/*!builds a bounding box from a 2D rectangle*/
+void gf_bbox_from_rect(GF_BBox *box, GF_Rect *rc);
+/*!builds a rectangle from a 3D bounding box.\note The z dimension is lost and no projection is performed*/
+void gf_rect_from_bbox(GF_Rect *rc, GF_BBox *box);
+/*!\brief bounding box expansion
+ *
+ *Checks if a point is inside a bounding box and updates the bounding box to include it if not the case
+ *\param box the bounding box object
+ *\param pt the 3D point to check
+*/
+void gf_bbox_grow_point(GF_BBox *box, GF_Vec pt);
+/*!performs the union of two bounding boxes*/
+void gf_bbox_union(GF_BBox *b1, GF_BBox *b2);
+/*!checks if two bounding boxes are equal or not*/
+Bool gf_bbox_equal(GF_BBox *b1, GF_BBox *b2);
+/*!checks if a point is inside a bounding box or not*/
+Bool gf_bbox_point_inside(GF_BBox *box, GF_Vec *p);
+/*!\brief get box vertices
+ *
+ *Returns the 8 bounding box vertices given the minimum and maximum edge. Vertices are ordered to respect
+ "p-vertex indexes", (vertex from a box closest to plane) and so that n-vertex (vertex from a box farthest from plane)
+ is 7-p_vx_idx
+ *\param bmin minimum edge of the box
+ *\param bmax maximum edge of the box
+ *\param vecs list of 8 3D points used to store the vertices.
+*/
+void gf_bbox_get_vertices(GF_Vec bmin, GF_Vec bmax, GF_Vec *vecs);
+
+
+/*!\brief matrix initialization
+ *\hideinitializer
+ *
+ *Inits the matrix to the identity matrix
+*/
+#define gf_mx_init(_obj) { memset((_obj).m, 0, sizeof(Fixed)*16); (_obj).m[0] = (_obj).m[5] = (_obj).m[10] = (_obj).m[15] = FIX_ONE; }
+/*!\brief matrix copy
+ *\hideinitializer
+ *
+ *Copies the matrix _from to the matrix _obj
+*/
+#define gf_mx_copy(_obj, from) memcpy(&(_obj), &(from), sizeof(GF_Matrix));
+/*!\brief matrix constructor from 2D
+ *
+ *Initializes a 3D matrix from a 2D matrix.\note all z-related coefficients will be set to default.
+*/
+void gf_mx_from_mx2d(GF_Matrix *mx, GF_Matrix2D *mat2D);
+/*!\brief matrix identity testing
+ *
+ *Tests if two matrices are equal or not.
+ \return 1 if matrices are same, 0 otherwise
+*/
+Bool gf_mx_equal(GF_Matrix *mx1, GF_Matrix *mx2);
+/*!\brief matrix translation
+ *
+ *Translates a matrix
+ *\param mx the matrix being transformed. Once the function is called, contains the result matrix
+ *\param tx horizontal translation
+ *\param ty vertical translation
+ *\param tz depth translation
+*/
+void gf_mx_add_translation(GF_Matrix *mx, Fixed tx, Fixed ty, Fixed tz);
+/*!\brief matrix scaling
+ *
+ *Scales a matrix
+ *\param mx the matrix being transformed. Once the function is called, contains the result matrix
+ *\param sx horizontal translation scaling
+ *\param sy vertical translation scaling
+ *\param sz depth translation scaling
+*/
+void gf_mx_add_scale(GF_Matrix *mx, Fixed sx, Fixed sy, Fixed sz);
+/*!\brief matrix rotating
+ *
+ *Rotates a matrix
+ *\param mx the matrix being transformed. Once the function is called, contains the result matrix
+ *\param angle rotation angle in radians
+ *\param x horizontal coordinate of rotation axis
+ *\param y vertical coordinate of rotation axis
+ *\param z depth coordinate of rotation axis
+*/
+void gf_mx_add_rotation(GF_Matrix *mx, Fixed angle, Fixed x, Fixed y, Fixed z);
+/*!\brief matrices multiplication
+ *
+ *Multiplies a matrix with another one mx = mx*mul
+ *\param mx the matrix being transformed. Once the function is called, contains the result matrix
+ *\param mul the matrix to add
+*/
+void gf_mx_add_matrix(GF_Matrix *mx, GF_Matrix *mul);
+/*!\brief 2D matrix multiplication
+ *
+ *Adds a 2D affine matrix to a matrix
+ *\param mx the matrix
+ *\param mat2D the matrix to premultiply
+ */
+void gf_mx_add_matrix_2d(GF_Matrix *mx, GF_Matrix2D *mat2D);
+
+/*!\brief affine matrix inversion
+ *
+ *Inverses an affine matrix.\warning Results are undefined if the matrix is not an affine one
+ *\param mx the matrix to inverse
+ */
+void gf_mx_inverse(GF_Matrix *mx);
+/*!\brief matrix point transformation
+ *
+ *Applies a 3D matrix transformation to a 3D point
+ *\param mx transformation matrix
+ *\param pt pointer to 3D point. Once the function is called, pt contains the transformed point
+*/
+void gf_mx_apply_vec(GF_Matrix *mx, GF_Vec *pt);
+/*!\brief matrix rectangle transformation
+ *
+ *Applies a 3D matrix transformation to a rectangle, giving the enclosing rectangle of the transformed one.\note all depth information are discarded.
+ *\param _this transformation matrix
+ *\param rc pointer to rectangle. Once the function is called, rc contains the transformed rectangle
+*/
+void gf_mx_apply_rect(GF_Matrix *_this, GF_Rect *rc);
+/*!\brief ortho matrix construction
+ *
+ *Creates an orthogonal projection matrix
+ *\param mx matrix to initialize
+ *\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
+*/
+void gf_mx_ortho(GF_Matrix *mx, Fixed left, Fixed right, Fixed bottom, Fixed top, Fixed z_near, Fixed z_far);
+/*!\brief perspective matrix construction
+ *
+ *Creates a perspective projection matrix
+ *\param mx matrix to initialize
+ *\param foc 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
+*/
+void gf_mx_perspective(GF_Matrix *mx, Fixed foc, Fixed aspect_ratio, Fixed z_near, Fixed z_far);
+/*!\brief creates look matrix
+ *
+ *Creates a transformation matrix looking at a given direction from a given point (camera matrix).
+ *\param mx matrix to initialize
+ *\param position position
+ *\param target look direction
+ *\param up_vector vector describing the up direction
+*/
+void gf_mx_lookat(GF_Matrix *mx, GF_Vec position, GF_Vec target, GF_Vec up_vector);
+/*!\brief matrix box transformation
+ *
+ *Applies a 3D matrix transformation to a bounding box, giving the enclosing box of the transformed one
+ *\param mx transformation matrix
+ *\param b pointer to bounding box. Once the function is called, contains the transformed bounding box
+*/
+void gf_mx_apply_bbox(GF_Matrix *mx, GF_BBox *b);
+/*!\brief matrix box sphere transformation
+ *
+ *Applies a 3D matrix transformation to a bounding box, computing only the enclosing sphere of the transformed one.
+ *\param mx transformation matrix
+ *\param box pointer to bounding box. Once the function is called, contains the transformed bounding sphere
+*/
+void gf_mx_apply_bbox_sphere(GF_Matrix *mx, GF_BBox *box);
+/*!\brief non-affine matrix multiplication
+ *
+ *Multiplies two non-affine matrices mx = mx*mul
+*/
+void gf_mx_add_matrix_4x4(GF_Matrix *mat, GF_Matrix *mul);
+/*!\brief non-affine matrix inversion
+ *
+ *Inverses a non-affine matrices
+ *\return 1 if inversion was done, 0 if inversion not possible.
+*/
+Bool gf_mx_inverse_4x4(GF_Matrix *mx);
+/*!\brief matrix 4D vector transformation
+ *
+ *Applies a 3D non-affine matrix transformation to a 4 dimension vector
+ *\param mx transformation matrix
+ *\param vec pointer to the vector. Once the function is called, contains the transformed vector
+*/
+void gf_mx_apply_vec_4x4(GF_Matrix *mx, GF_Vec4 *vec);
+/*!\brief matrix decomposition
+ *
+ *Decomposes a matrix into translation, scale, shear and rotate
+ *\param mx the matrix to decompose
+ *\param translate the decomposed translation part
+ *\param scale the decomposed scaling part
+ *\param rotate the decomposed rotation part, expressed as a Rotataion (axis + angle)
+ *\param shear the decomposed shear part
+ */
+void gf_mx_decompose(GF_Matrix *mx, GF_Vec *translate, GF_Vec *scale, GF_Vec4 *rotate, GF_Vec *shear);
+/*!\brief matrix vector rotation
+ *
+ *Rotates a vector with a given matrix, ignoring any translation.
+ *\param mx transformation matrix
+ *\param pt pointer to 3D vector. Once the function is called, pt contains the transformed vector
+ */
+void gf_mx_rotate_vector(GF_Matrix *mx, GF_Vec *pt);
+/*!\brief matrix initialization from vectors
+ *
+ *Inits a matrix to rotate the local axis in the given vectors
+ \param mx matrix to initialize
+ \param x_axis target normalized X axis
+ \param y_axis target normalized Y axis
+ \param z_axis target normalized Z axis
+*/
+void gf_mx_rotation_matrix_from_vectors(GF_Matrix *mx, GF_Vec x_axis, GF_Vec y_axis, GF_Vec z_axis);
+/*!\brief matrix to 2D matrix
+ *
+ *Inits a 2D matrix by removing all depth info from a 3D matrix
+ *\param mx2d 2D matrix to initialize
+ *\param mx 3D matrix to use
+*/
+void gf_mx2d_from_mx(GF_Matrix2D *mx2d, GF_Matrix *mx);
+
+/*!\brief Plane object*/
+typedef struct
+{
+	/*!normal vector to the plane*/
+	GF_Vec normal;
+	/*!distance from origin of the plane*/
+	Fixed d;
+} GF_Plane;
+/*!\brief matrix plane transformation
+ *
+ *Transorms a plane by a given matrix
+ *\param mx the matrix to use
+ *\param plane pointer to 3D plane. Once the function is called, plane contains the transformed plane
+ */
+void gf_mx_apply_plane(GF_Matrix *mx, GF_Plane *plane);
+/*!\brief point to plane distance
+ *
+ *Gets the distance between a point and a plne
+ *\param plane the plane to use
+ *\param p pointer to ^point to check
+ *\return the distance between the place and the point
+ */
+Fixed gf_plane_get_distance(GF_Plane *plane, GF_Vec *p);
+/*!\brief closest point on a line
+ *
+ *Gets the closest point on a line from a given point in space
+ *\param line_pt a point of the line to test
+ *\param line_vec the normalized direction vector of the line
+ *\param pt the point to check
+ *\return the closest point on the line to the desired point
+ */
+GF_Vec gf_closest_point_to_line(GF_Vec line_pt, GF_Vec line_vec, GF_Vec pt);
+/*!\brief box p-vertex index
+ *
+ *Gets the p-vertex index for a given plane. The p-vertex index is the index of the closest vertex of a bounding box to the plane. The vertices of a box are always
+ *ordered in GPAC? cf \ref gf_bbox_get_vertices
+ *\param p the plane to check
+ *\return the p-vertex index value, ranging from 0 to 7
+*/
+u32 gf_plane_get_p_vertex_idx(GF_Plane *p);
+/*!\brief plane line intersection
+ *
+ *Checks for the intersection of a plane and a line
+ *\param plane plane to test
+ *\param linepoint a point on the line to test
+ *\param linevec normalized direction vector of the line to test
+ *\param outPoint optional pointer to retrieve the intersection point, NULL otherwise
+ *\return 1 if line and plane intersect, 0 otherwise
+*/
+Bool gf_plane_intersect_line(GF_Plane *plane, GF_Vec *linepoint, GF_Vec *linevec, GF_Vec *outPoint);
+
+/*!Classification types for box/plane position used in \ref gf_bbox_plane_relation*/
+enum
+{
+	/*!box is in front of the plane*/
+	GF_BBOX_FRONT,
+	/*!box intersects the plane*/
+	GF_BBOX_INTER,
+	/*!box is back of the plane*/
+	GF_BBOX_BACK
+};
+/*!\brief box-plane relation
+ *
+ *Gets the spatial relation between a box and a plane
+ *\param box the box to check
+ *\param p the plane to check
+ *\return the relation type
+ */
+u32 gf_bbox_plane_relation(GF_BBox *box, GF_Plane *p);
+
+/*!\brief 3D Ray
+ *
+ *The 3D ray object is used in GPAC for all collision and mouse interaction tests
+*/
+typedef struct
+{
+	/*!origin point of the ray*/
+	GF_Vec orig;
+	/*!normalized direction vector of the ray*/
+	GF_Vec dir;
+} GF_Ray;
+
+/*!\brief ray constructor
+ *
+ *Constructs a ray object
+ *\param start starting point of the ray
+ *\param end end point of the ray, or any point on the ray
+ *\return the ray object
+*/
+GF_Ray gf_ray(GF_Vec start, GF_Vec end);
+/*!\brief matrix ray transformation
+ *
+ *Transforms a ray by a given transformation matrix
+ *\param mx the matrix to use
+ *\param r pointer to the ray. Once the function is called, contains the transformed ray
+*/
+void gf_mx_apply_ray(GF_Matrix *mx, GF_Ray *r);
+/*!\brief ray box intersection test
+ *
+ *Checks if a ray intersects a box or not
+ *\param ray the ray to check
+ *\param min_edge the minimum edge of the box to check
+ *\param max_edge the maximum edge of the box to check
+ *\param out_point optional location of a 3D point to store the intersection, NULL otherwise.
+ *\return retuns 1 if the ray intersects the box, 0 otherwise
+*/
+Bool gf_ray_hit_box(GF_Ray *ray, GF_Vec min_edge, GF_Vec max_edge, GF_Vec *out_point);
+/*!\brief ray sphere intersection test
+ *
+ *Checks if a ray intersects a box or not
+ *\param ray the ray to check
+ *\param center the center of the sphere to check. If NULL, the origin (0,0,0)is used
+ *\param radius the radius of the sphere to check
+ *\param out_point optional location of a 3D point to store the intersection, NULL otherwise
+ *\return retuns 1 if the ray intersects the sphere, 0 otherwise
+*/
+Bool gf_ray_hit_sphere(GF_Ray *ray, GF_Vec *center, Fixed radius, GF_Vec *out_point);
+/*!\brief ray triangle intersection test
+ *
+ *Checks if a ray intersects a triangle or not
+ *\param ray the ray to check
+ *\param v0 first vertex of the triangle
+ *\param v1 second vertex of the triangle
+ *\param v2 third vertex of the triangle
+ *\param dist optional location of a fixed number to store the intersection distance from ray origin if any, NULL otherwise
+ *\return retuns 1 if the ray intersects the triangle, 0 otherwise
+*/
+Bool gf_ray_hit_triangle(GF_Ray *ray, GF_Vec *v0, GF_Vec *v1, GF_Vec *v2, Fixed *dist);
+/*same as above and performs backface cull (solid meshes)*/
+/*!\brief ray triangle intersection test
+ *
+ *Checks if a ray intersects a triangle or not, performing backface culling. For parameters details, look at \ref gf_ray_hit_triangle_backcull
+ */
+Bool gf_ray_hit_triangle_backcull(GF_Ray *ray, GF_Vec *v0, GF_Vec *v1, GF_Vec *v2, Fixed *dist);
+
+/*! @} */
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_MATH_H_*/
+

gpac-0.5.0.svn5178.tar.bz2/include/gpac/media_tools.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/media_tools.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,11 +42,18 @@
 /*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...*/
 GF_ESD *gf_media_map_esd(GF_ISOFile *mp4, u32 track);
+
+/*!
+ * \brief Get RFC 6381 description for @track from @movie.
+ * \parama szCodec a pointer to an already allocated string.
+ */
+GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec);
 #endif
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*changes pixel aspect ratio for visual tracks if supported. Negative values remove any PAR info*/
 GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den);
+GF_Err gf_media_remove_non_rap(GF_ISOFile *file, u32 track);
 #endif
 
 
@@ -54,10 +61,10 @@
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 
-/*			
+/*
 			track importers
 
-	All these can import a file into a dedicated track. If esd is NULL the track is blindly added 
+	All these can import a file into a dedicated track. If esd is NULL the track is blindly added
 	otherwise it is added with the requested ESID if non-0, otherwise the new trackID is stored in ESID
 	if use_data_ref is set, data is only referenced in the file
 	if duration is not 0, only the first duration seconds are imported
@@ -74,7 +81,7 @@
 	GF_IMPORT_FORCE_PACKED = 1<<2,
 	/*for AAC audio: forces SBR mode with implicit signaling (backward compatible)*/
 	GF_IMPORT_SBR_IMPLICIT = 1<<3,
-	/*for AAC audio: forces SBR mode with explicit signaling (non-backward compatible). 
+	/*for AAC audio: forces SBR mode with explicit signaling (non-backward compatible).
 	Will override GF_IMPORT_SBR_IMPLICIT flag when set*/
 	GF_IMPORT_SBR_EXPLICIT = 1<<4,
 	/*forces MPEG-4 import - some 3GP2 streams have both native IsoMedia sample description and MPEG-4 one possible*/
@@ -95,20 +102,26 @@
 
 	/*for AAC audio: forces PS mode with implicit signaling (backward compatible)*/
 	GF_IMPORT_PS_IMPLICIT = 1<<12,
-	/*for AAC audio: forces PS mode with explicit signaling (non-backward compatible). 
+	/*for AAC audio: forces PS mode with explicit signaling (non-backward compatible).
 	Will override GF_IMPORT_PS_IMPLICIT flag when set*/
 	GF_IMPORT_PS_EXPLICIT = 1<<13,
-	
+
 	/* oversampled SBR */
 	GF_IMPORT_OVSBR = 1<<14,
 
 	/* set subsample information with SVC*/
 	GF_IMPORT_SET_SUBSAMPLES = 1<<15,
 
-	/* force to mark non-IDR frmaes with sync data (I slices,) to be marked as sync points points 
+	/* force to mark non-IDR frmaes with sync data (I slices,) to be marked as sync points points
 	THE RESULTING FILE IS NOT COMPLIANT*/
 	GF_IMPORT_FORCE_SYNC = 1<<16,
 
+	/*keep trailing 0 bytes in AU payloads when any*/
+	GF_IMPORT_KEEP_TRAILING = 1<<17,
+
+	/*do not compute edit list for B-frames video tracks*/
+	GF_IMPORT_NO_EDIT_LIST = 1<<18,
+
 	/*when set, only updates tracks info and return*/
 	GF_IMPORT_PROBE_ONLY	= 1<<20,
 	/*only set when probing, signals several frames per sample possible*/
@@ -172,11 +185,11 @@
 	GF_ISOFile *dest;
 	/*media to import:
 		MP4/ISO media: trackID
-		AVI files: 
+		AVI files:
 			0: first video and first audio,
 			1: video track
 			2->any: audio track(s)
-		MPEG-PS files with N video streams: 
+		MPEG-PS files with N video streams:
 			0: first video and first audio
 			1->N: video track
 			N+1->any: audio track
@@ -204,7 +217,7 @@
 	u32 final_trackID;
 	/*optional format indication for media source (used in IM1)*/
 	char *force_ext;
-	
+
 	/*for MP4 import only*/
 	GF_ISOFile *orig;
 
@@ -217,7 +230,7 @@
 	/*Initial offset of the first AU to import*/
 	Double initial_time_offset;
 
-	/*number of tracks after probing - may be set to 0, in which case no track 
+	/*number of tracks after probing - may be set to 0, in which case no track
 	selection can be performed. It may also be inaccurate if probing doesn't
 	detect all available tracks (cf ogg import)*/
 	u32 nb_tracks;
@@ -272,13 +285,21 @@
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 
-typedef struct 
+typedef struct
 {
 	char *file_name;
 	char representationID[100];
 	char periodID[100];
 	char xlink[100];
 	char role[100];
+	u32 nb_rep_descs;
+	char **rep_descs;
+	u32 nb_p_descs;
+	char **p_descs;
+	u32 nb_as_descs;
+	char **as_descs;
+	u32 nb_as_c_descs;
+	char **as_c_descs;
 	u32 bandwidth;
 } GF_DashSegmenterInput;
 
@@ -306,14 +327,14 @@
 	GF_DASH_BSMODE_SINGLE
 } GF_DashSwitchingMode;
 
-GF_Err gf_dasher_segment_files(const char *mpd_name, GF_DashSegmenterInput *inputs, u32 nb_inputs, GF_DashProfile profile, 
-							   const char *mpd_title, const char *mpd_source, const char *mpd_copyright,
-							   const char *mpd_moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls, 
-							   u32 use_url_template, Bool use_segment_timeline,  Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching_mode,
-							   Bool segments_start_with_rap, Double dash_duration_sec, char *seg_rad_name, char *seg_ext, u32 segment_marker_4cc,
-							   Double frag_duration_sec, s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool fragments_start_with_rap, const char *tmp_dir,  
-							   GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double subduration, Double min_buffer, 
-							   u32 ast_shift_sec, u32 dash_scale, Bool fragments_in_memory, u32 initial_moof_sn, u64 initial_tfdt, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf);
+GF_Err gf_dasher_segment_files(const char *mpd_name, GF_DashSegmenterInput *inputs, u32 nb_inputs, GF_DashProfile profile,
+                               const char *mpd_title, const char *mpd_source, const char *mpd_copyright,
+                               const char *mpd_moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls,
+                               u32 use_url_template, Bool use_segment_timeline,  Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching_mode,
+                               Bool segments_start_with_rap, Double dash_duration_sec, char *seg_rad_name, char *seg_ext, u32 segment_marker_4cc,
+                               Double frag_duration_sec, s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool fragments_start_with_rap, const char *tmp_dir,
+                               GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double subduration, Double min_buffer,
+                               u32 ast_shift_sec, u32 dash_scale, Bool fragments_in_memory, u32 initial_moof_sn, u64 initial_tfdt, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf, Bool single_traf_per_moof);
 
 /*returns time to wait until end of currently generated segments*/
 u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time);
@@ -334,7 +355,7 @@
 
 enum
 {
-	/*track dumper types are formatted as flags for conveniency for 
+	/*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,
@@ -406,9 +427,9 @@
 */
 typedef struct __tag_isom_hinter GF_RTPHinter;
 
-GF_RTPHinter *gf_hinter_track_new(GF_ISOFile *file, u32 TrackNum, 
-							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);
+GF_RTPHinter *gf_hinter_track_new(GF_ISOFile *file, u32 TrackNum,
+                                  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*/
 void gf_hinter_track_del(GF_RTPHinter *tkHinter);
 /*hints all samples in the media track*/
@@ -417,7 +438,7 @@
 u32 gf_hinter_track_get_bandwidth(GF_RTPHinter *tkHinter);
 /*retrieves hinter flags*/
 u32 gf_hinter_track_get_flags(GF_RTPHinter *tkHinter);
-/*retrieves rtp payload name 
+/*retrieves rtp payload name
 	@payloadName: static buffer for retrieval, minimum 30 bytes
 */
 void gf_hinter_track_get_payload_name(GF_RTPHinter *tkHint, char *payloadName);
@@ -466,7 +487,7 @@
 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*/
 GF_Err gf_saf_mux_stream_rem(GF_SAFMuxer *mux, u32 stream_id);
-/*adds an AU to the given stream. !!AU data will be freed by the multiplexer!! 
+/*adds an AU to the given stream. !!AU data will be freed by the multiplexer!!
 AUs are not reinterleaved based on their CTS, in order to enable audio interleaving
 */
 GF_Err gf_saf_mux_add_au(GF_SAFMuxer *mux, u32 stream_id, u32 CTS, char *data, u32 data_len, Bool is_rap);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/mediaobject.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/mediaobject.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -39,7 +39,7 @@
 		Media Object
 
   opaque handler for all natural media objects (audio, video, image) so that compositor and systems engine
-are not too tied up. 
+are not too tied up.
 	NOTE: the media object location relies on the node parent graph (this is to deal with namespaces in OD framework)
 therefore it is the task of the media management app to setup clear links between the scene graph and its ressources
 (but this is not mandatory, cf URLs in VRML )
@@ -76,15 +76,15 @@
 /*set speed of media - speed is not always applied, depending on media control settings.
 NOTE: audio pitching is the responsability of the rendering app*/
 void gf_mo_set_speed(GF_MediaObject *mo, Fixed speed);
-/*returns current speed of media - in_speed is the speed of the media as set in the node (MovieTexture, 
+/*returns current speed of media - in_speed is the speed of the media as set in the node (MovieTexture,
 AudioClip and AudioSource) - the return value is the real speed of the media as overloaded by mediaControl if any*/
 Fixed gf_mo_get_speed(GF_MediaObject *mo, Fixed in_speed);
-/*returns looping flag of media - in_loop is the looping flag of the media as set in the node (MovieTexture, 
+/*returns looping flag of media - in_loop is the looping flag of the media as set in the node (MovieTexture,
 AudioClip) - the return value is the real loop flag of the media as overloaded by mediaControl if any*/
 Bool gf_mo_get_loop(GF_MediaObject *mo, Bool in_loop);
 /*returns media object duration*/
 Double gf_mo_get_duration(GF_MediaObject *mo);
-/*returns whether the object should be deactivated (stop) or not - this checks object status as well as 
+/*returns whether the object should be deactivated (stop) or not - this checks object status as well as
 mediaControl status */
 Bool gf_mo_should_deactivate(GF_MediaObject *mo);
 /*checks whether the target object is changed - you MUST use this in order to detect url changes*/
@@ -94,7 +94,11 @@
 Bool gf_mo_is_raw_memory(GF_MediaObject *mo);
 GF_Err gf_mo_get_raw_image_planes(GF_MediaObject *mo, u8 **pY_or_RGB, u8 **pU, u8 **pV);
 
-/*fetch media data 
+
+/*returns min frame duration for his object or 0 if unknown*/
+u32 gf_mo_get_min_frame_dur(GF_MediaObject *mo);
+
+/*fetch media data
 
 */
 char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size, s32 *ms_until_pres, s32 *ms_until_next);
@@ -102,7 +106,7 @@
 /*release given amount of media data - nb_bytes is used for audio  - drop_mode can take the following values:
 -1: do not drop
 0: do not force drop: the unlocked frame it will be droped based on object time (typically video)
-1: force drop : the unlocked frame will be droped if all bytes are consumed (typically audio) 
+1: force drop : the unlocked frame will be droped if all bytes are consumed (typically audio)
 2: the frame will be stated as a discraded frame
 */
 void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 drop_mode);
@@ -137,7 +141,7 @@
 
 enum
 {
-	/*this is set to 0 by the OD manager whenever a change occur in the media (w/h change, SR change, etc) 
+	/*this is set to 0 by the OD manager whenever a change occur in the media (w/h change, SR change, etc)
 	as a hint for the compositor*/
 	GF_MO_IS_INIT = (1<<1),
 	/*used by animation stream to remove TEXT from display upon delete and URL change*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/module.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/module.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -80,12 +80,12 @@
 	const char *module_name;		\
 	const char *author_name;		\
 	void *HPLUG;					\
-
+ 
 /*!
  *\brief Base Interface
  *
  *This structure represent a base interface, e.g. the minimal interface declaration without functionalities. Each interface is
- *type-casted to this structure and shall always be checked against its interface type. API Versioning is taken care of in the 
+ *type-casted to this structure and shall always be checked against its interface type. API Versioning is taken care of in the
  *interface type itsel, changing at each modification of the interface API
  */
 typedef struct
@@ -150,7 +150,7 @@
 */
 #ifdef GPAC_STATIC_MODULES
 
-#define GPAC_MODULE_STATIC_DELARATION(__name)	\
+#define GPAC_MODULE_STATIC_DECLARATION(__name)	\
 	GF_InterfaceRegister *gf_register_module_##__name()	{	\
 		GF_InterfaceRegister *reg;	\
 		GF_SAFEALLOC(reg, GF_InterfaceRegister);	\
@@ -160,15 +160,15 @@
 		reg->ShutdownInterface = ShutdownInterface;	\
 		return reg;\
 	}	\
-
+ 
 #else
-#define GPAC_MODULE_STATIC_DELARATION(__name)
+#define GPAC_MODULE_STATIC_DECLARATION(__name)
 #endif
 /*!
  *\brief module manager construtcor
  *
  *Constructs a module manager object.
- *\param directory absolute path to the directory where the manager shall look for modules 
+ *\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
@@ -262,7 +262,7 @@
 /*!
  *\brief interface option query
  *
- *Gets an option from the config file associated with the module manager 
+ *Gets an option from the config file associated with the module manager
  *\param interface_obj the interface object used
  *\param secName the desired key parent section name
  *\param keyName the desired key name
@@ -272,7 +272,7 @@
 /*!
  *\brief interface option update
  *
- *Sets an option in the config file associated with the module manager 
+ *Sets an option in the config file associated with the module manager
  *\param interface_obj the interface object used
  *\param secName the desired key parent section name
  *\param keyName the desired key name

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/audio_out.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/audio_out.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -56,7 +56,7 @@
 	/* interface declaration*/
 	GF_DECL_MODULE_INTERFACE
 
-	/*setup system 
+	/*setup system
 		Win32: os_handle is HWND
 
 	if num_buffer is set, the audio driver should work with num_buffers with a total amount of audio data
@@ -68,14 +68,14 @@
 	/*shutdown system */
 	void (*Shutdown) (struct _audiooutput *aout);
 
-	/*query output frequency available - if the requested sampleRate is not available, the driver shall return the best 
+	/*query output frequency available - if the requested sampleRate is not available, the driver shall return the best
 	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);
 
 	/*set output config - if audio is not running, driver must start it
-	*SampleRate, *NbChannels, *nbBitsPerSample: 
+	*SampleRate, *NbChannels, *nbBitsPerSample:
 		input: desired value
 		output: final values
 	channel_cfg is the channels output cfg, eg set of flags as specified in constants.h
@@ -86,7 +86,7 @@
 	u32 (*GetTotalBufferTime)(struct _audiooutput *aout);
 
 	/*returns audio delay in ms, eg time delay until written audio data is outputed by the sound card
-	This function is only called after ConfigureOuput*/ 
+	This function is only called after ConfigureOuput*/
 	u32 (*GetAudioDelay)(struct _audiooutput *aout);
 
 	/*set output volume(between 0 and 100) */
@@ -114,9 +114,9 @@
 
 	/*your private data handler - should be allocated when creating the interface object*/
 	void *opaque;
-	
+
 	/*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);
 	void *audio_renderer;
@@ -134,13 +134,13 @@
 /*interface returned on query interface*/
 typedef struct _tag_audio_filter GF_AudioFilter;
 
-struct _tag_audio_filter 
+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 ';;' seperated list in the "Filter" key of 
+	/*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 ';;' seperated list in the "Filter" key of
 	the [Audio] section.
 		@returns: 1 is this module can handle the filterstring, 0 otherwise.
 	*/
@@ -148,32 +148,32 @@
 	/*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_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_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. 
+		&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. 
+	/*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 
+		@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. 
+		@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);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/codec.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/codec.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -53,8 +53,18 @@
 	GF_CODEC_LEVEL_SEEK
 };
 
+
+/*codec resilience type*/
+enum
+{
+	GF_CODEC_NOT_RESILIENT=0,
+	GF_CODEC_RESILIENT_ALWAYS=1,
+	GF_CODEC_RESILIENT_AFTER_FIRST_RAP=2
+};
+
+
 /*the structure for capabilities*/
-typedef struct 
+typedef struct
 {
 	/*cap code cf below*/
 	u16 CapCode;
@@ -75,7 +85,11 @@
 	/*size of a single composition unit */
 	GF_CODEC_OUTPUT_SIZE =	0x01,
 	/*resilency: if packets are lost within an AU, resilience means the AU won't be discarded and the codec
-	will try to decode */
+	will try to decode
+	0: not resilient
+	1: resilient
+	2: resilient after first rap
+	*/
 	GF_CODEC_RESILIENT,
 	/*critical level of composition memory - if below, media management for the object */
 	GF_CODEC_BUFFER_MIN,
@@ -95,13 +109,16 @@
 	GF_CODEC_HEIGHT,
 	GF_CODEC_STRIDE,
 	GF_CODEC_FPS,
-    GF_CODEC_FLIP,
+	GF_CODEC_FLIP,
 	/*Pixel Aspect Ratio, expressed as (par.num<<16) | par.den*/
 	GF_CODEC_PAR,
 	/*video color mode - color modes are defined in constants.h*/
 	GF_CODEC_PIXEL_FORMAT,
-	/*isgnal decoder performs frame re-ordering in temporal scalability*/
+	/*signal decoder performs frame re-ordering in temporal scalability*/
 	GF_CODEC_REORDER,
+	/*signal decoder can safely handle CTS when outputing a picture. If not supported by the
+	decoder, the terminal will automatically handle CTS adjustments*/
+	GF_CODEC_TRUSTED_CTS,
 
 	/*set cap only, indicate smax bpp of display*/
 	GF_CODEC_DISPLAY_BPP,
@@ -122,7 +139,7 @@
 	/*queries or set  support for usage of decoded frame from decoder memory - used for video codecs only*/
 	GF_CODEC_DIRECT_OUTPUT,
 
-	/*This is only called on scene decoders to signal that potential overlay scene should be 
+	/*This is only called on scene decoders to signal that potential overlay scene should be
 	showed (cap.valueINT=1) or hidden (cap.valueINT=0). Currently only used with SetCap*/
 	GF_CODEC_SHOW_SCENE,
 	/*This is only called on scene decoders, GetCap only. If the decoder may continue modifying the scene once the last AU is received,
@@ -130,7 +147,7 @@
 	after the last AU). Otherwise the decoder will be stopped and ask to remove any extra scene being displayed*/
 	GF_CODEC_MEDIA_NOT_OVER,
 
-	/*switches up or down media quality for scalable coding*/
+	/*switches up (1), max (2), down (0) or min (-1) media quality for scalable coding. */
 	GF_CODEC_MEDIA_SWITCH_QUALITY,
 
 	/*special cap indicating the codec should abort processing as soon as possible because it is about to be destroyed*/
@@ -150,28 +167,28 @@
 	GF_CODEC_SUPPORTED = 255,
 };
 
-	/* Generic interface used by both media decoders and scene decoders
+/* Generic interface used by both media decoders and scene decoders
 @AttachStream:
-	Add a Stream to the codec. If DependsOnESID is NULL, the stream is a base layer
-	UpStream means that the decoder should send feedback on this channel. 
-	WARNING: Feedback format is not standardized by MPEG
-	the same API is used for both encoder and decoder (decSpecInfo is ignored
-	for an encoder) 
+Add a Stream to the codec. If DependsOnESID is NULL, the stream is a base layer
+UpStream means that the decoder should send feedback on this channel.
+WARNING: Feedback format is not standardized by MPEG
+the same API is used for both encoder and decoder (decSpecInfo is ignored
+for an encoder)
 @DetachStream:
-	Remove stream
+Remove stream
 @GetCapabilities:
-	Get the desired capability given its code
+Get the desired capability given its code
 @SetCapabilities
-	Set the desired capability given its code if possible
-	if the codec does not support the request capability, return GF_NOT_SUPPORTED
+Set the desired capability given its code if possible
+if the codec does not support the request capability, return GF_NOT_SUPPORTED
 @CanHandleStream
-	Can module handle this codec? Return one of GF_CODEC_NOT_SUPPORTED, GF_CODEC_MAYBE_SUPPORTED or GF_CODEC_SUPPORTED
-	esd is provided for more advanced inspection ( eg MPEG4 audio/visual where a bunch of codecs are defined with same objectType). If esd is NULL, only 
-	decoder type is checked (audio or video), not codec type
+Can module handle this codec? Return one of GF_CODEC_NOT_SUPPORTED, GF_CODEC_MAYBE_SUPPORTED or GF_CODEC_SUPPORTED
+esd is provided for more advanced inspection ( eg MPEG4 audio/visual where a bunch of codecs are defined with same objectType). If esd is NULL, only
+decoder type is checked (audio or video), not codec type
 @GetDecoderName
-	returns codec name - only called once the stream is successfully attached
+returns codec name - only called once the stream is successfully attached
 @privateStack
-	user defined.
+user defined.
 */
 
 #define GF_CODEC_BASE_INTERFACE(IFCE_NAME)		\
@@ -183,7 +200,7 @@
 	u32 (*CanHandleStream)(IFCE_NAME, u32 StreamType, GF_ESD *esd, u8 ProfileLevelIndication);\
 	const char *(*GetName)(IFCE_NAME);\
 	void *privateStack;	\
-
+ 
 
 typedef struct _basedecoder
 {
@@ -191,27 +208,27 @@
 } GF_BaseDecoder;
 
 /*interface name and version for media decoder */
-#define GF_MEDIA_DECODER_INTERFACE		GF_4CC('G', 'M', 'D', '2')
+#define GF_MEDIA_DECODER_INTERFACE		GF_4CC('G', 'M', 'D', '3')
 
-/*the media module interface. A media module MUST be implemented in synchronous mode as time 
+/*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. 
+	/*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 
+		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,
-			char *outBuffer, u32 *outBufferLength,
-			u8 PaddingBits, u32 mmlevel);
+	GF_Err (*ProcessData)(struct _mediadecoder *,
+	                      char *inBuffer, u32 inBufferLength,
+	                      u16 ES_ID, u32 *CTS,
+	                      char *outBuffer, u32 *outBufferLength,
+	                      u8 PaddingBits, u32 mmlevel);
 
 
 	/*optionnal (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_DIRECT_OUTPUT*/
@@ -231,8 +248,8 @@
 typedef struct _scenedecoder
 {
 	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
-	
-	/*Process the scene data in inAU. 
+
+	/*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
@@ -240,11 +257,11 @@
 	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);
+	                      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. 
+	(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
@@ -252,7 +269,7 @@
 	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, 
+	/*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)
@@ -269,8 +286,8 @@
 typedef struct _nodedecoder
 {
 	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
-	
-	/*Process the node data in inAU. 
+
+	/*Process the node 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
@@ -278,7 +295,7 @@
 	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 _nodedecoder *, const char *inBuffer, u32 inBufferLength,
-					u16 ES_ID, u32 AU_Time, u32 mmlevel);
+	                      u16 ES_ID, u32 AU_Time, u32 mmlevel);
 
 	/*attaches node to the decoder - currently only one node is only attached to a single decoder*/
 	GF_Err (*AttachNode)(struct _nodedecoder *, LPNODE node);
@@ -311,13 +328,13 @@
 /*interface name and version for media decoder */
 #define GF_PRIVATE_MEDIA_DECODER_INTERFACE		GF_4CC('G', 'P', 'M', '2')
 
-/*the media module interface. A media module MUST be implemented in synchronous mode as time 
+/*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
 {
 	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
 
-	/*Control media decoder. 
+	/*Control media decoder.
 	@mute: set mute or not
 	@x, y, w, h: video output position in screen coordinate
 	*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/font.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/font.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -100,7 +100,7 @@
 	/*shutdown font engine*/
 	GF_Err (*shutdown_font_engine)(struct _font_reader *dr);
 
-	/*set active font . @styles indicates font styles (PLAIN, BOLD, ITALIC, 
+	/*set active font . @styles indicates font styles (PLAIN, BOLD, ITALIC,
 	BOLDITALIC and UNDERLINED, STRIKEOUT)*/
 	GF_Err (*set_font)(struct _font_reader *dr, const char *fontName, u32 styles);
 	/*gets font info*/
@@ -112,7 +112,7 @@
 	/*loads glyph by name - returns NULL if glyph cannot be found*/
 	GF_Glyph *(*load_glyph)(struct _font_reader *dr, u32 glyph_name);
 
-/*module private*/
+	/*module private*/
 	void *udta;
 } GF_FontReader;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/hardcoded_proto.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/hardcoded_proto.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/ipmp.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/ipmp.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/js_usr.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/js_usr.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -49,7 +49,7 @@
 
 	/*load JS extension
 	 doc: scene graph in which the extension is loaded
-	 jsctx: JavaScript context 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

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/raster2d.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/raster2d.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -103,7 +103,7 @@
 	@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 
+	@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
 */
@@ -155,7 +155,7 @@
 	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, 
+	/*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
@@ -170,11 +170,11 @@
 	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
@@ -188,9 +188,9 @@
 	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);
-	/*creates internal texture - pixel data is owned by texture brush - set to NULL if not supported - this is used to 
-	cope with engines that don't support random strides (ex: Gdiplus needs stride to be a multiple of 4) 
-	if not set the compositor will create its own mem texture and pass it through set_texture - pixel format shall 
+	/*creates internal texture - pixel data is owned by texture brush - set to NULL if not supported - this is used to
+	cope with engines that don't support random strides (ex: Gdiplus needs stride to be a multiple of 4)
+	if not set the compositor will create its own mem texture and pass it through set_texture - pixel format shall
 	be respected as far as Alpha is concerned (eg alpha info shall be kept and used in blit) */
 	GF_Err (*stencil_create_texture) (GF_STENCIL _this, u32 width, u32 height, GF_PixelFormat pixelFormat);
 	/*signals the texture has been modified (internal texture only)*/
@@ -204,7 +204,7 @@
 	GF_Err (*stencil_set_color_matrix) (GF_STENCIL _this, GF_ColorMatrix *cmat);
 
 	/*creates surface object*/
-	/* @center_coords: true indicates mathematical-like coord system, 
+	/* @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 */
@@ -252,7 +252,7 @@
 	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:*/
+	/*private:*/
 	void *internal;
 } GF_Raster2D;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/service.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/service.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -63,18 +63,20 @@
 	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). 
+	/*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 
+	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 
+	/*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,
@@ -83,12 +85,12 @@
 
 	/*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,
-	
+
 	/*service buffer query (for all channels running in service), app<-module*/
 	GF_NET_BUFFER_QUERY,
 	/*retrieves network stats for service/channel; app->module*/
@@ -108,12 +110,15 @@
 	/*instructs the service to get the migration info - term->net only*/
 	GF_NET_SERVICE_MIGRATION_INFO,
 
-	/*When using DASH or playlists, query the next file to concatenate to thecurrent one net->proxy only*/
+	/*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 
+	/*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 */
@@ -125,6 +130,22 @@
 	/*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,
+
+	/*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,
 } GF_NET_CHAN_CMD;
 
 /*channel command for all commands that don't need params:
@@ -149,8 +170,14 @@
 	/*params for GF_NET_CHAN_PLAY and GF_NET_CHAN_SPEED*/
 	Double speed;
 	Bool dash_segment_switch;
-	/*indicates theis is the first PLAY on an elemnt inserted from bcast*/
+	/*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;
 
 
@@ -164,10 +191,10 @@
 	LPNETCHANNEL on_channel;
 
 	/*SL config of the stream as delivered in OD (app->channel) or by network (channel->app)*/
-	GF_SLConfig sl_config;		
+	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 
+	/*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*/
@@ -181,11 +208,11 @@
 {
 	u32 command_type;
 	LPNETCHANNEL on_channel;
-	/*the recommended buffering limits in ms - this depends on the modules preferences and on the service 
+	/*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 - amount of media in decoding buffer, in ms*/
+	/*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;
 } GF_NetComBuffer;
 
@@ -196,6 +223,8 @@
 	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*/
@@ -216,6 +245,16 @@
 	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
+	u32 time;
+} GF_NetComTimeShift;
+
+
 
 /*GF_NET_SERVICE_PROXY_DATA_RECEIVE*/
 typedef struct
@@ -287,7 +326,7 @@
 
 /*GF_NET_GET_STATS
 Notes
-1: only channels using network must reply. All channels fetching data through a 
+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
 */
@@ -302,10 +341,11 @@
 	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*/
+	/*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 
+	/*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;
@@ -325,6 +365,7 @@
 	u32 command_type;
 	/*currently NULL only*/
 	LPNETCHANNEL on_channel;
+	u32 service_id;
 	/*packed trackNumber(16 bits)/totaltrack(16 bits)*/
 	u32 track_info;
 	u32 genre;
@@ -334,9 +375,14 @@
 	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_CHAN_GET_PIXEL_AR*/
+/*GF_NET_SERVICE_HAS_AUDIO*/
 typedef struct
 {
 	u32 command_type;
@@ -353,11 +399,21 @@
 	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 
+	//input
 
 	/*drops first segment */
 	Bool drop_first_segment;
@@ -383,12 +439,14 @@
 
 
 	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).	
+	/*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;
 
@@ -396,12 +454,46 @@
 typedef struct
 {
 	u32 command_type;
-	/*currently NULL only*/
+	/*NULL only when request, or channel for witch quality has been changed for notif*/
 	LPNETCHANNEL on_channel;
-	/*out: next url to play after current one*/
+	//switch quality up or down - request only
 	Bool up;
+
+	Bool set_auto;
+	//or ID of the quality to switch, as indicated in query quality
+	const char *ID;
 } 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
+	u32 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;
+} GF_NetQualityQuery;
+
 /*GF_NET_SERVICE_STATUS_PROXY*/
 typedef struct
 {
@@ -431,6 +523,48 @@
 	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;
+	Double activation_countdown;
+} 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;
+} 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)
+	u32 extract_mode;
+} GF_NALUExtractMode;
+
 typedef union __netcommand
 {
 	GF_NET_CHAN_CMD command_type;
@@ -441,6 +575,7 @@
 	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;
@@ -454,6 +589,11 @@
 	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_NetworkCommand;
 
 /*
@@ -469,36 +609,36 @@
 	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_term_register_mime_type below)
+	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. 
+	/*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. 
+	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 
+	/*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 
+	@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" 
+		"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:
@@ -506,14 +646,14 @@
 		* 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, 
+	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);
@@ -521,7 +661,7 @@
 	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 
+	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
 	*/
@@ -531,77 +671,74 @@
 	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 
+	/*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*/
+	/*private*/
 	void *priv;
 
-/*proxy stuff*/
+	/*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_term_register_mime_type() for all the mime-types
+	 * 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_term_register_mime_type(GF_InputService *, const char *, const char *, const char *)
+	 * \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*/
-/*message from service - error is set if error*/
-void gf_term_on_message(GF_ClientService *service, GF_Err error, const char *message);
+
 /*to call on service (if channel is NULL) or channel connect completed*/
-void gf_term_on_connect(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
+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_term_on_disconnect(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
+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. 
+with remote servers.
 command can also be triggered from the service (QoS, broadcast announcements)
 cf above for command usage
 */
-void gf_term_on_command(GF_ClientService *service, GF_NetworkCommand *com, GF_Err response);
-/*to call when data packet is received. 
+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 
+@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_term_on_sl_packet(GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status);
+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_term_get_service_url(GF_ClientService *service);
+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_term_add_media(GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_update);
-
-Bool gf_term_on_service_event(GF_ClientService *service, GF_Event *service_event);
+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_term_check_extension(GF_InputService *ifce, const char *mimeType, const char *extList, const char *description, const char *fileExt);
+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_term_register_mime_type(const GF_InputService *ifce, const char *mimeType, const char *extList, const char *description);
-
-GF_InputService *gf_term_get_service_interface(GF_ClientService *service);
+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 
+/*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_term_download_new(GF_ClientService *service, const char *url, u32 flags, gf_dm_user_io user_io, void *cbk);
+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_term_download_del(GF_DownloadSession * dnload);
+void gf_service_download_del(GF_DownloadSession * dnload);
 /*send progress and connection messages to user...*/
-void gf_term_download_update_stats(GF_DownloadSession * sess);
+void gf_service_download_update_stats(GF_DownloadSession * sess);
 
 
 /*MPEG-4 media cache interface name*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/term_ext.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/term_ext.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -64,7 +64,7 @@
 		@return: ignored
 	*/
 	GF_TERM_EXT_PROCESS,
-	
+
 	/*load/unload js bindings of this extension
 		associated param: GF_TermExtJS *jsext
 		@return: ignored

gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/video_out.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/video_out.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -84,7 +84,7 @@
 };
 
 typedef struct
-{	
+{
 	GF_IRect *list;
 	u32 count;
 } GF_DirtyRectangles;
@@ -92,19 +92,19 @@
 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','1')
 
 /*
 			video output interface
 
 	the video output may run in 2 modes: 2D and 3D.
 
-	** the 2D video output works by accessing a backbuffer surface on the video mem board - 
-	the app accesses to the surface through the GF_VideoSurface handler. 
+	** the 2D video output works by accessing a backbuffer surface on the video mem board -
+	the app accesses to the surface through the GF_VideoSurface handler.
 	The module may support HW blitting of RGB or YUV data to backbuffer.
 
 	** the 3D video output only handles window management and openGL contexts setup.
-	The context shall be setup in Resize and SetFullScreen calls which are always happening in the main 
+	The context shall be setup in Resize and SetFullScreen calls which are always happening in the main
 	rendering thread. This will take care of openGL context issues with multithreading
 
 	By default all modules are required to be setup in 2D. If 3D is needed, a GF_EVENT_VIDEO_SETUP will
@@ -125,7 +125,7 @@
 	/*shutdown system */
 	void (*Shutdown) (struct _video_out *vout);
 
-	/*flush video: the video shall be presented to screen 
+	/*flush video: the video shall be presented to screen
 	the destination area to update is in client display coordinates (0,0) being top-left, (w,h) bottom-right
 	Note: dest is always NULL in 3D mode (buffer flip only)*/
 	GF_Err (*Flush) (struct _video_out *vout, GF_Window *dest);
@@ -143,16 +143,16 @@
 			* This can be a request for an offscreen rendering surface. If supported, this surface SHALL
 			be readable through glReadPixels. If not supported, just return an error.
 			Note that GPAC never uses more than one GL context (offscreen or main video)
-			* Depending on windowing systems and implementations, it could be possible to resize a window 
+			* Depending on windowing systems and implementations, it could be possible to resize a window
 		without destroying the GL context. If the GL context is destroyed, the module should send an event
 		of the same type to the player.
-	
-	This function is also called with a NULL event at the begining of each rendering cycle, in order to allow event 
+
+	This function is also called with a NULL event at the begining of each rendering cycle, in order to allow event
 	handling for modules uncapable of safe multithreading (eg X11)
 	*/
 	GF_Err (*ProcessEvent)(struct _video_out *vout, GF_Event *event);
 
-	/*pass events to user (assigned before setup) - return 1 if the event has been processed by GPAC 
+	/*pass events to user (assigned before setup) - return 1 if the event has been processed by GPAC
 	(eiher scene or navigation), 0 otherwise*/
 	void *evt_cbk_hdl;
 	Bool (*on_event)(void *hdl, GF_Event *event);
@@ -180,7 +180,7 @@
 	GF_Err (*Blit)(struct _video_out *vout, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type);
 
 	/*optional
-	blits the texture as a bitmap with the specified transform cliped with the given cliper, with alpha and 
+	blits the texture as a bitmap with the specified transform cliped with the given cliper, with alpha and
 	color keying (NULL if no keying)
 	*/
 	Bool (*BlitTexture)(struct _video_out *vout, GF_TextureH *texture, GF_Matrix2D *transform, GF_IRect *clip, u8 alpha, GF_ColorKey *col_key, Fixed depth_offset, Fixed depth_gain);
@@ -194,7 +194,7 @@
 		flushes only the listed rectangles
 	*/
 	void (*FlushRectangles)(struct _video_out *vout, GF_DirtyRectangles *rectangles);
-	
+
 	/*ignored if GF_VIDEO_HW_HAS_LINE_BLIT is not set*/
 	void (*DrawHLine)(struct _video_out *vout, u32 x, u32 y, u32 length, GF_Color color);
 	void (*DrawHLineAlpha)(struct _video_out *vout, u32 x, u32 y, u32 length, GF_Color color, u8 alpha);
@@ -219,10 +219,10 @@
 	u32 overlay_color_key;
 
 	/*for auto-stereoscopic output*/
-    /*maximum pixel disparity*/
-    u32 disparity;
-    /*nominal display viewing distance in cm*/
-    Fixed view_distance;
+	/*maximum pixel disparity*/
+	u32 disparity;
+	/*nominal display viewing distance in cm*/
+	Fixed view_distance;
 
 	/*driver private*/
 	void *opaque;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/mpeg4_odf.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/mpeg4_odf.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -60,10 +60,10 @@
 	GF_ODF_ISOM_OD_TAG		= 0x11,
 	GF_ODF_ISOM_IPI_PTR_TAG	= 0x12,
 	/*END FILE FORMAT RESERVED*/
-	
+
 	GF_ODF_EXT_PL_TAG		= 0x13,
 	GF_ODF_PL_IDX_TAG		= 0x14,
-	
+
 	GF_ODF_ISO_BEGIN_TAG	= 0x15,
 	GF_ODF_ISO_END_TAG		= 0x3F,
 
@@ -87,7 +87,7 @@
 
 	GF_ODF_ISO_RES_BEGIN_TAG	= 0x62,
 	GF_ODF_ISO_RES_END_TAG		= 0xBF,
-	
+
 	GF_ODF_USER_BEGIN_TAG	= 0xC0,
 
 	/*internal descriptor for mux input description*/
@@ -132,7 +132,7 @@
 } GF_Descriptor;
 
 
-/*	default descriptor. 
+/*	default descriptor.
 	NOTE: The decoderSpecificInfo is used as a default desc with tag 0x05 */
 typedef struct
 {
@@ -161,7 +161,7 @@
 	GF_List *extensionDescriptors;
 	/*MPEG-2 (or other service mux formats) service ID*/
 	u16 ServiceID;
-	/*pointer to the service interface (GF_InputService) of the service having declared the object 
+	/*pointer to the service interface (GF_InputService) of the service having declared the object
 	only used for DASH*/
 	void *service_ifce;
 } GF_ObjectDescriptor;
@@ -181,7 +181,7 @@
 	GF_List *extensionDescriptors;
 	/*MPEG-2 (or other service mux formats) service ID*/
 	u16 ServiceID;
-	/*pointer to the service interface (GF_InputService) of the service having declared the object 
+	/*pointer to the service interface (GF_InputService) of the service having declared the object
 	only used for DASH*/
 	void *service_ifce;
 
@@ -256,7 +256,7 @@
 	u32 maxBitrate;
 	u32 avgBitrate;
 	GF_DefaultDescriptor *decoderSpecificInfo;
-	
+
 	/*placeholder for RVC decoder config if any*/
 	u16 predefined_rvc_config;
 	GF_DefaultDescriptor *rvc_config;
@@ -277,7 +277,7 @@
 	u8 contentType;
 	u8 contentIdentifierType;
 	/*international code string*/
-	char *contentIdentifier;	
+	char *contentIdentifier;
 } GF_CIDesc;
 
 /*Supplementary Content Identification Descriptor)*/
@@ -299,7 +299,7 @@
 	BASE_DESCRIPTOR
 	u8 IPMP_DescriptorID;
 	u16 IPMP_DescriptorIDEx;
-	u16 IPMP_ES_ID;	
+	u16 IPMP_ES_ID;
 } GF_IPMPPtr;
 
 /*IPMPX control points*/
@@ -315,7 +315,7 @@
 	IPMP_CP_CM = 3,
 	/*control point in BIFS tree (???)*/
 	IPMP_CP_BIFS = 4
-	/*the rest is reserved or forbidden(0xFF)*/
+	               /*the rest is reserved or forbidden(0xFF)*/
 };
 
 /*IPMPX base classe*/
@@ -323,8 +323,8 @@
 	u8 tag;	\
 	u8 version;	\
 	u32 dataID;	\
-
-typedef struct 
+ 
+typedef struct
 {
 	GF_IPMPX_BASE
 } GF_GF_IPMPX_Base;
@@ -693,7 +693,7 @@
 	GF_Registration *RegDescriptor;
 	/*0 or 1 lang desc*/
 	GF_Language *langDesc;
-	
+
 	GF_List *IPIDataSet;
 	GF_List *IPMPDescriptorPointers;
 	GF_List *extensionDescriptors;
@@ -856,18 +856,18 @@
 {
 	u16 size;
 	char *data;
-    /* used of AVC/SVC detection */
-    s32 id;
+	/* used of AVC/SVC detection */
+	s32 id;
 } GF_AVCConfigSlot;
 
-typedef struct 
+typedef struct
 {
 	u8 configurationVersion;
 	u8 AVCProfileIndication;
 	u8 profile_compatibility;
-	u8 AVCLevelIndication; 
+	u8 AVCLevelIndication;
 	u8 nal_unit_size;
-	
+
 	GF_List *sequenceParameterSets;
 	GF_List *pictureParameterSets;
 
@@ -893,7 +893,7 @@
 } GF_HEVCParamArray;
 
 
-typedef struct 
+typedef struct
 {
 	u8 configurationVersion;
 	u8 profile_space;
@@ -919,7 +919,7 @@
 	u8 temporalIdNested;
 
 	u8 nal_unit_size;
-	
+
 	GF_List *param_array;
 
 	//set by libisomedia at import/export time
@@ -974,7 +974,7 @@
 
 	GF_ODF_COM_ISO_BEGIN_TAG		= 0x0D,
 	GF_ODF_COM_ISO_END_TAG		= 0xBF,
-	
+
 	GF_ODF_COM_USER_BEGIN_TAG	= 0xC0,
 	GF_ODF_COM_USER_END_TAG		= 0xFE
 };
@@ -1065,7 +1065,7 @@
 void gf_odf_codec_del(GF_ODCodec *codec);
 /* add a command to the codec command list. */
 GF_Err gf_odf_codec_add_com(GF_ODCodec *codec, GF_ODCom *command);
-/*encode the current command list - once called the commands are removed or destroyed depending on @cleanup_type: 
+/*encode the current command list - once called the commands are removed or destroyed depending on @cleanup_type:
 	0: commands are removed from the list but not destroyed
 	1: commands are removed from the list and destroyed
 	2: commands are kept in the list and not destroyed
@@ -1077,7 +1077,7 @@
 GF_Err gf_odf_codec_set_au(GF_ODCodec *codec, const char *au, u32 au_length);
 /*decode the previously set-up AU*/
 GF_Err gf_odf_codec_decode(GF_ODCodec *codec);
-/*get the first OD command in the list. Once called, the command is removed 
+/*get the first OD command in the list. Once called, the command is removed
 from the command list. Return NULL when commandList is empty*/
 GF_ODCom *gf_odf_codec_get_com(GF_ODCodec *codec);
 
@@ -1102,7 +1102,7 @@
 GF_Descriptor *gf_odf_desc_new(u8 tag);
 void gf_odf_desc_del(GF_Descriptor *desc);
 
-/*this is a helper for building a preformatted GF_ESD with decoderConfig, decoderSpecificInfo with no data and 
+/*this is a helper for building a preformatted GF_ESD with decoderConfig, decoderSpecificInfo with no data and
 SLConfig descriptor with predefined*/
 GF_ESD *gf_odf_desc_esd_new(u32 sl_predefined);
 
@@ -1139,7 +1139,7 @@
 /*use this function to decode a standalone descriptor
 the raw descriptor MUST be formatted with tag and size field!!!
 a new desc is created and you must delete it when done*/
-GF_Err gf_odf_desc_read(char *raw_desc, u32 descSize, GF_Descriptor * *outDesc);
+GF_Err gf_odf_desc_read(char *raw_desc, u32 descSize, GF_Descriptor **outDesc);
 
 /*use this function to encode a standalone descriptor
 the desc will be formatted with tag and size field
@@ -1155,7 +1155,7 @@
 
 /*This functions handles internally what desc can be added to another desc
 and adds it. NO DUPLICATION of the descriptor, so
-once a desc is added to its parent, destroying the parent WILL DESTROY 
+once a desc is added to its parent, destroying the parent WILL DESTROY
 this descriptor*/
 GF_Err gf_odf_desc_add_desc(GF_Descriptor *parentDesc, GF_Descriptor *newDesc);
 
@@ -1236,12 +1236,12 @@
 void gf_oci_codec_del(OCICodec *codec);
 
 /*				ENCODER FUNCTIONS
-add a command to the codec event list. 
+add a command to the codec event list.
 The event WILL BE DESTROYED BY THE CODEC after encoding*/
 GF_Err gf_oci_codec_add_event(OCICodec *codec, OCIEvent *event);
 
 /*encode AU. The memory allocation is done in place
-WARNING: once this function called, the codec event List is empty 
+WARNING: once this function called, the codec event List is empty
 and events destroyed
 you must set *outAU = NULL*/
 GF_Err gf_oci_codec_encode(OCICodec *codec, char **outAU, u32 *au_length);
@@ -1252,7 +1252,7 @@
 the input buffer is cleared once decoded*/
 GF_Err gf_oci_codec_decode(OCICodec *codec, char *au, u32 au_length);
 
-/*get the first OCI Event in the list. Once called, the event is removed 
+/*get the first OCI Event in the list. Once called, the event is removed
 from the event list. Return NULL when the event List is empty
 you MUST delete events */
 OCIEvent *gf_oci_codec_get_event(OCICodec *codec);
@@ -1319,7 +1319,7 @@
 /*IPMPX authentication descriptors*/
 #define GF_IPMPX_AUTH_DESC	\
 	u8 tag;	\
-
+ 
 typedef struct
 {
 	GF_IPMPX_AUTH_DESC
@@ -1350,7 +1350,7 @@
 
 
 /*IPMP data messages*/
-enum 
+enum
 {
 	GF_IPMPX_OPAQUE_DATA_TAG = 0x01,
 	GF_IPMPX_AUDIO_WM_INIT_TAG = 0x02,
@@ -1383,7 +1383,7 @@
 	GF_IPMPX_TOOL_API_CONFIG_TAG = 0x1C,
 
 	/*ISMA*/
-	GF_IPMPX_ISMACRYP_TAG = 0xD0, 
+	GF_IPMPX_ISMACRYP_TAG = 0xD0,
 
 	/*intern ones for parsing (not real datas)*/
 	GF_IPMPX_TRUSTED_TOOL_TAG = 0xA1,
@@ -1403,7 +1403,7 @@
 	u8 tag;	\
 	u8 Version;	\
 	u8 dataID;	\
-
+ 
 typedef struct
 {
 	GF_IPMPX_DATA_BASE
@@ -1430,7 +1430,7 @@
 typedef struct
 {
 	GF_IPMPX_DATA_BASE
-	bin128 toolID;	
+	bin128 toolID;
 	GF_IPMPX_Date AuditDate;
 	GF_List *trustSpecifications;
 } GF_IPMPX_TrustedTool;
@@ -1609,7 +1609,7 @@
 typedef struct
 {
 	GF_IPMPX_DATA_BASE
-	GF_IPMPX_ByteArray *rightsInfo;	
+	GF_IPMPX_ByteArray *rightsInfo;
 } GF_IPMPX_RightsData;
 
 
@@ -1617,22 +1617,22 @@
 typedef struct
 {
 	GF_IPMPX_DATA_BASE
-	bin128 cipher_Id; 
+	bin128 cipher_Id;
 	u8 syncBoundary;
 	/*block mode if stream cypher info is NULL*/
-	u8 mode;  
+	u8 mode;
 	u16 blockSize;
 	u16 keySize;
-	GF_IPMPX_ByteArray *Stream_Cipher_Specific_Init_Info; 
+	GF_IPMPX_ByteArray *Stream_Cipher_Specific_Init_Info;
 } GF_IPMPX_SelEncBuffer;
 
 /*not a real GF_IPMPX_Data in spec, but emulated as if for parsing*/
 typedef struct
 {
 	GF_IPMPX_DATA_BASE
-	u8 field_Id; 
+	u8 field_Id;
 	u8 field_Scope;
-	u8 buf; 
+	u8 buf;
 
 	u16 mappingTableSize;
 	u16 *mappingTable;
@@ -1645,7 +1645,7 @@
 {
 	GF_IPMPX_SE_MT_ISO_IEC = 0x00,
 	GF_IPMPX_SE_MT_ITU = 0x01
-	/*the rest is reserved or forbidden*/
+	                     /*the rest is reserved or forbidden*/
 };
 
 /*compliance*/
@@ -1659,12 +1659,12 @@
 	/*0x05-2F	ISO Reserved for video*/
 	GF_IPMPX_SE_COMP_AAC_DF = 0x30,
 	GF_IPMPX_SE_COMP_AAC_NONE = 0x31
-	/*
-	0x32 -  0x5F	ISO Reserved for audio
-	0x60 - 0xCF	ISO Reserved
-	0xD0 - 0xFE	User Defined
-	0xFF	Forbidden
-	*/
+	                            /*
+	                            0x32 -  0x5F	ISO Reserved for audio
+	                            0x60 - 0xCF	ISO Reserved
+	                            0xD0 - 0xFE	User Defined
+	                            0xFF	Forbidden
+	                            */
 };
 
 /*syncBoundary*/
@@ -1675,11 +1675,11 @@
 	GF_IPMPX_SE_SYNC_VIDEO_GOV = 0x02,
 	/*0x03-2F	ISO Reserved for video,*/
 	GF_IPMPX_SE_SYNC_AAC_DF = 0x30
-	/*0x31 -  0x5F	ISO Reserved for audio
-	0x60 - 0xCF	ISO Reserved
-	0xD0 - 0xFE	User Defined
-	0xFF	Forbidden
-	*/
+	                          /*0x31 -  0x5F	ISO Reserved for audio
+	                          0x60 - 0xCF	ISO Reserved
+	                          0xD0 - 0xFE	User Defined
+	                          0xFF	Forbidden
+	                          */
 };
 
 /*field_Id*/
@@ -1695,19 +1695,19 @@
 	GF_IPMPX_SE_FID_AAC_SIGN = 0x30,
 	GF_IPMPX_SE_FID_AAC_CODEWORDS = 0x31,
 	GF_IPMPX_SE_FID_AAC_SCALE = 0x32
-	/*0x32 -  0x5F	ISO Reserved for audio
-	0x60 - 0xCF	ISO Reserved
-	0xD0 - 0xFE	User Defined
-	0xFF	Forbidden*/
+	                            /*0x32 -  0x5F	ISO Reserved for audio
+	                            0x60 - 0xCF	ISO Reserved
+	                            0xD0 - 0xFE	User Defined
+	                            0xFF	Forbidden*/
 };
 
 
 typedef struct
 {
 	GF_IPMPX_DATA_BASE
-	u8 mediaTypeExtension; 
+	u8 mediaTypeExtension;
 	u8 mediaTypeIndication;
-	u8 profileLevelIndication; 
+	u8 profileLevelIndication;
 	u8 compliance;
 
 	GF_List *SelEncBuffer;
@@ -1753,7 +1753,7 @@
 	char *wmPayload;
 
 	u16 wmRecipientId;
-	
+
 	u32 opaqueDataSize;
 	char *opaqueData;
 } GF_IPMPX_WatermarkingInit;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/mpegts.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/mpegts.h Changed

@@ -10,15 +10,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -64,7 +64,7 @@
 	GF_M2TS_METADATA_DESCRIPTOR					= 0x26,
 	/* ... */
 	GF_M2TS_AVC_VIDEO_DESCRIPTOR				= 0x28,
-	/* ... */	
+	/* ... */
 	GF_M2TS_AVC_TIMING_HRD_DESCRIPTOR			= 0x2A,
 	/* ... */
 	GF_M2TS_SVC_EXTENSION_DESCRIPTOR			= 0x30,
@@ -110,7 +110,7 @@
 	GF_M2TS_DVB_TIME_SLICE_FEC_DESCRIPTOR 		   = 0x77,
 	/* ... */
 	GF_M2TS_DVB_EAC3_DESCRIPTOR				= 0x7A,
-	GF_M2TS_DVB_LOGICAL_CHANNEL_DESCRIPTOR = 0x83,		
+	GF_M2TS_DVB_LOGICAL_CHANNEL_DESCRIPTOR = 0x83,
 };
 
 /* Reserved PID values */
@@ -118,7 +118,7 @@
 	GF_M2TS_PID_PAT			= 0x0000,
 	GF_M2TS_PID_CAT			= 0x0001,
 	GF_M2TS_PID_TSDT		= 0x0002,
-	/* reserved 0x0003 to 0x000F */ 
+	/* reserved 0x0003 to 0x000F */
 	GF_M2TS_PID_NIT_ST		= 0x0010,
 	GF_M2TS_PID_SDT_BAT_ST	= 0x0011,
 	GF_M2TS_PID_EIT_ST_CIT	= 0x0012,
@@ -126,7 +126,7 @@
 	GF_M2TS_PID_TDT_TOT_ST	= 0x0014,
 	GF_M2TS_PID_NET_SYNC	= 0x0015,
 	GF_M2TS_PID_RNT			= 0x0016,
-	/* reserved 0x0017 to 0x001B */ 
+	/* reserved 0x0017 to 0x001B */
 	GF_M2TS_PID_IN_SIG		= 0x001C,
 	GF_M2TS_PID_MEAS		= 0x001D,
 	GF_M2TS_PID_DIT			= 0x001E,
@@ -136,16 +136,16 @@
 /* max size includes first header, second header, payload and CRC */
 enum {
 	GF_M2TS_TABLE_ID_PAT			= 0x00,
-	GF_M2TS_TABLE_ID_CAT			= 0x01, 
-	GF_M2TS_TABLE_ID_PMT			= 0x02, 
+	GF_M2TS_TABLE_ID_CAT			= 0x01,
+	GF_M2TS_TABLE_ID_PMT			= 0x02,
 	GF_M2TS_TABLE_ID_TSDT			= 0x03, /* max size for section 1024 */
 	GF_M2TS_TABLE_ID_MPEG4_BIFS		= 0x04, /* max size for section 4096 */
 	GF_M2TS_TABLE_ID_MPEG4_OD		= 0x05, /* max size for section 4096 */
-	GF_M2TS_TABLE_ID_METADATA		= 0x06, 
-	GF_M2TS_TABLE_ID_IPMP_CONTROL	= 0x07, 
+	GF_M2TS_TABLE_ID_METADATA		= 0x06,
+	GF_M2TS_TABLE_ID_IPMP_CONTROL	= 0x07,
 	/* 0x08 - 0x37 reserved */
 	/* 0x38 - 0x3D DSM-CC defined */
-	GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA		= 0x3A, 
+	GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA		= 0x3A,
 	GF_M2TS_TABLE_ID_DSM_CC_UN_MESSAGE				= 0x3B, /* used for MPE (only, not MPE-FEC) */
 	GF_M2TS_TABLE_ID_DSM_CC_DOWNLOAD_DATA_MESSAGE	= 0x3C, /* used for MPE (only, not MPE-FEC) */
 	GF_M2TS_TABLE_ID_DSM_CC_STREAM_DESCRIPTION		= 0x3D, /* used for MPE (only, not MPE-FEC) */
@@ -161,7 +161,7 @@
 	/* 0x4b	reserved */
 	GF_M2TS_TABLE_ID_INT			= 0x4c, /* max size for section 4096 */
 	/* 0x4d reserved */
-	
+
 	GF_M2TS_TABLE_ID_EIT_ACTUAL_PF	= 0x4E, /* max size for section 4096 */
 	GF_M2TS_TABLE_ID_EIT_OTHER_PF	= 0x4F,
 	/* 0x50 - 0x6f EIT SCHEDULE */
@@ -192,7 +192,7 @@
 	GF_M2TS_VIDEO_MPEG1				= 0x01,
 	GF_M2TS_VIDEO_MPEG2				= 0x02,
 	GF_M2TS_AUDIO_MPEG1				= 0x03,
-	GF_M2TS_AUDIO_MPEG2				= 0x04, 
+	GF_M2TS_AUDIO_MPEG2				= 0x04,
 	GF_M2TS_PRIVATE_SECTION			= 0x05,
 	GF_M2TS_PRIVATE_DATA			= 0x06,
 	GF_M2TS_MHEG					= 0x07,
@@ -223,8 +223,8 @@
 	GF_M2TS_AUDIO_DTS				= 0x8A,
 	GF_M2TS_MPE_SECTIONS            = 0x90,
 	GF_M2TS_SUBTITLE_DVB			= 0x100,
-	
-	/*internal use*/	
+
+	/*internal use*/
 	GF_M2TS_AUDIO_EC3				= 0x150,
 	GF_M2TS_VIDEO_VC1				= 0x151,
 	GF_M2TS_DVB_TELETEXT			= 0x152,
@@ -238,9 +238,9 @@
 /*MPEG-2 Descriptor tags*/
 enum
 {
-	GF_M2TS_AFDESC_LOCATION_DESCRIPTOR	= 0x00,
-	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR	= 0x01,
-	GF_M2TS_AFDESC_BASEURL_DESCRIPTOR	= 0x02,
+	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR	= 0x04,
+	GF_M2TS_AFDESC_LOCATION_DESCRIPTOR	= 0x05,
+	GF_M2TS_AFDESC_BASEURL_DESCRIPTOR	= 0x06,
 };
 
 #define SECTION_HEADER_LENGTH 3 /* header till the last bit of the section_length field */
@@ -268,7 +268,7 @@
 #define GF_M2TS_MAX_SERVICES	65535
 
 /*Maximum size of the buffer in UDP */
-#define UDP_BUFFER_SIZE	0x40000
+#define UDP_BUFFER_SIZE	0x4000
 
 /*returns readable name for given stream type*/
 const char *gf_m2ts_get_stream_name(u32 streamType);
@@ -276,7 +276,7 @@
 /*returns 1 if file is an MPEG-2 TS */
 Bool gf_m2ts_probe_file(const char *fileName);
 
-/*shifts all timing by the given value 
+/*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
 */
 GF_Err gf_m2ts_restamp(char *buffer, u32 size, s64 ts_shift, u8 *is_pes);
@@ -284,14 +284,15 @@
 /*PES data framing modes*/
 enum
 {
-	/*use data framing: recompute start of AUs (data frames)*/
-	GF_M2TS_PES_FRAMING_DEFAULT,
-	/*don't use data framing: all packets are raw PES packets*/
-	GF_M2TS_PES_FRAMING_RAW,
 	/*skip pes processing: all transport packets related to this stream are discarded*/
 	GF_M2TS_PES_FRAMING_SKIP,
 	/*same as GF_M2TS_PES_FRAMING_SKIP but keeps internal PES buffer alive*/
 	GF_M2TS_PES_FRAMING_SKIP_NO_RESET,
+	/*don't use data framing: all packets are raw PES packets*/
+	GF_M2TS_PES_FRAMING_RAW,
+
+	/*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,
 };
@@ -383,8 +384,13 @@
 	GF_M2TS_EVT_AIT_FOUND,
 	/*DSCM-CC has been found (carousel) */
 	GF_M2TS_EVT_DSMCC_FOUND,
-	GF_M2TS_EVT_EOS,
 
+	/*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,
 };
 
 enum
@@ -396,7 +402,7 @@
 	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); 
+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);
 
 typedef struct __m2ts_demux_section
 {
@@ -442,7 +448,7 @@
 
 	/*section->table aggregator*/
 	GF_M2TS_Table *table;
-	
+
 	/* indicates that the section and last_section_number do not need to be checked */
 	Bool process_individual;
 
@@ -453,7 +459,9 @@
 	/* this field is used for AIT sections, to link the AIT with the program */
 	u32 service_id;
 
-	gf_m2ts_section_callback process_section; 
+	gf_m2ts_section_callback process_section;
+
+	Bool demux_restarted;
 } GF_M2TS_SectionFilter;
 
 enum metadata_carriage {
@@ -480,17 +488,41 @@
 	u32 data_size;
 } GF_M2TS_MetadataPointerDescriptor;
 
+typedef struct
+{
+	u32 timeline_id;
+	//for now we only support one URL announcement
+	const char *external_URL;
+	Bool is_announce, is_splicing;
+	Bool reload_external;
+	Double activation_countdown;
+} GF_M2TS_TemiLocationDescriptor;
+
+typedef struct
+{
+	u32 timeline_id;
+	u32 media_timescale;
+	u64 media_timestamp;
+	u64 pes_pts;
+	Bool force_reload;
+	Bool is_paused;
+	Bool is_discontinuity;
+} GF_M2TS_TemiTimecodeDescriptor;
+
+
 /*MPEG-2 TS program object*/
-typedef struct 
+typedef struct
 {
+	GF_M2TS_Demuxer *ts;
+
 	GF_List *streams;
-	u32 pmt_pid;  
+	u32 pmt_pid;
 	u32 pcr_pid;
 	u32 number;
 
 	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 !! used by media importer only , refine this !!
 		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
 	*/
@@ -501,7 +533,7 @@
 	/* Last PCR value received for this program and associated packet number */
 	u64 last_pcr_value;
 	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;
 	u32 before_last_pcr_value_pck_number;
@@ -532,7 +564,7 @@
 	GF_M2TS_ES_IS_MPE = 1<<5,
 	/*stream is used to send PCR to upper layer*/
 	GF_M2TS_INHERIT_PCR = 1<<6,
-	
+
 	/*all flags above this mask are used by importers & co*/
 	GF_M2TS_ES_STATIC_FLAGS_MASK = 0x0000FFFF,
 
@@ -556,15 +588,15 @@
 			s16 component_tag; \
 			void *user; \
 			u64 first_dts; \
-			u32 service_id; 
+			u32 service_id;
 
 struct tag_m2ts_es
 {
-	ABSTRACT_ES	
+	ABSTRACT_ES
 };
 
 
-typedef struct 
+typedef struct
 {
 	u8 id;
 	u16 pck_len;
@@ -577,7 +609,7 @@
 {
 	ABSTRACT_ES
 	GF_M2TS_SectionFilter *sec;
-};			
+};
 
 
 /*******************************************************************************/
@@ -623,7 +655,7 @@
 	u32 lang;
 
 	/*object info*/
-	u32 vid_w, vid_h, vid_par, aud_sr, aud_nb_ch, aud_obj_type;
+	u32 vid_w, vid_h, vid_par, aud_sr, aud_nb_ch, aud_aac_obj_type, aud_aac_sr_idx;
 
 	u32 depends_on_pid;
 
@@ -652,7 +684,7 @@
 	/* Last PCR value received for this program and associated packet number */
 	u64 last_pcr_value;
 	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;
 	u32 before_last_pcr_value_pck_number;
@@ -666,12 +698,17 @@
 	/*used by several reframers to store their parsing state*/
 	u32 frame_state;
 	/*LATM stuff - should be moved out of mpegts*/
-	unsigned char *buf;
+	unsigned char *buf, *reassemble_buf;
 	u32 buf_len;
+	u32 reassemble_len, reassemble_alloc;
 	u64 prev_PTS;
 
 	GF_M2TS_DVB_Subtitling_Descriptor sub;
 	GF_M2TS_MetadataDescriptor *metadata_descriptor;
+
+
+	char *temi_tc_desc;
+	u32 temi_tc_desc_len, temi_tc_desc_alloc_size;
 } GF_M2TS_PES;
 
 /*SDT information object*/
@@ -772,7 +809,7 @@
 	GF_List *extended_events;
 	GF_List *components;
 	GF_List *contents;
-	GF_List *ratings;	
+	GF_List *ratings;
 } GF_M2TS_EIT_Event;
 
 typedef struct
@@ -808,7 +845,7 @@
 /*MPEG-2 TS demuxer*/
 struct tag_m2ts_demux
 {
-	/* From M2TSIn */	
+	/* From M2TSIn */
 	GF_List *requested_progs;
 	GF_List *requested_pids;
 
@@ -817,7 +854,7 @@
 	u32 run_state;
 
 	Bool force_file_refresh;
-    /*net playing*/
+	/*net playing*/
 	GF_Socket *sock;
 
 #ifdef GPAC_HAS_LINUX_DVB
@@ -827,14 +864,11 @@
 	/*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_playing;
-	Bool file_regulate;
-	u64 pcr_last;
-	u32 stb_at_last_pcr;
 	u32 nb_pck;
 	Bool loop_demux;
 	const char *ts_data_chunk;
@@ -844,6 +878,8 @@
 	/* "Network" =  "MobileIP", "DefaultMCastInterface" */
 	Bool MobileIPEnabled;
 	const char *network_type;
+	//for sockets, we need to reopen them after resume/restart....
+	char *socket_url;
 	/* Set it to 1 if the TS is meant to be played during the demux */
 	Bool demux_and_play;
 	/* End of M2TSIn */
@@ -876,12 +912,12 @@
 
 	Bool dvb_h_demux;
 	Bool notify_pes_timing;
-	
+
 	/*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 */
 	struct __gf_dvb_mpe_ip_platform *ip_platform;
-	
+
 	u32 pck_number;
 
 	/*remote file handling - created and destroyed by user*/
@@ -892,17 +928,20 @@
 	/*AIT*/
 	GF_List* ChannelAppList;
 
-	/*Carousel*/	
+	/*Carousel*/
 	Bool process_dmscc;
 	char* dsmcc_root_dir;
 	GF_List* dsmcc_controler;
 
 	Bool segment_switch;
+	Bool table_reset;
 
 	//duration estimation
 	u64 first_pcr_found;
 	u16 pcr_pid;
 	u64 nb_pck_at_pcr;
+
+	Bool paused;
 };
 
 GF_M2TS_Demuxer *gf_m2ts_demux_new();
@@ -910,12 +949,15 @@
 void gf_m2ts_reset_parsers(GF_M2TS_Demuxer *ts);
 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);
 
+void gf_m2ts_pause_demux(GF_M2TS_Demuxer *ts, Bool do_pause);
 
+GF_M2TS_SDT *gf_m2ts_get_sdt_info(GF_M2TS_Demuxer *ts, u32 program_id);
 
 Bool gf_m2ts_crc32_check(char *data, u32 len);
 
@@ -948,19 +990,19 @@
 	u32 splicing_point_flag;
 	u32 transport_private_data_flag;
 	u32 adaptation_field_extension_flag;
-/*	
-	u32 splice_countdown;
-	u32 transport_private_data_length;
-	u32 adaptation_field_extension_length;
-	u32 ltw_flag;
-	u32 piecewise_rate_flag;
-	u32 seamless_splice_flag;
-	u32 ltw_valid_flag;
-	u32 ltw_offset;
-	u32 piecewise_rate;
-	u32 splice_type;
-	u32 DTS_next_AU;
-*/
+	/*
+		u32 splice_countdown;
+		u32 transport_private_data_length;
+		u32 adaptation_field_extension_length;
+		u32 ltw_flag;
+		u32 piecewise_rate_flag;
+		u32 seamless_splice_flag;
+		u32 ltw_valid_flag;
+		u32 ltw_offset;
+		u32 piecewise_rate;
+		u32 splice_type;
+		u32 DTS_next_AU;
+	*/
 } GF_M2TS_AdaptationField;
 
 
@@ -1040,11 +1082,9 @@
 
 	/*average stream bit-rate in bit/sec*/
 	u32 bit_rate;
-	
+
 	/*multiplexer time - NOT THE PCR*/
 	GF_M2TS_Time time;
-	/*for PCR strreams, set to 1 when PCR has to be sent, 0 otherwise*/
-	u32 pcr_priority;
 
 	/*table tools*/
 	GF_M2TS_Mux_Table *tables;
@@ -1058,7 +1098,7 @@
 	Bool table_needs_update;
 	Bool table_needs_send;
 
-	/*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
@@ -1073,11 +1113,11 @@
 
 	GF_ESIPacket curr_pck; /*current packet being processed - does not belong to the packet fifo*/
 	u32 pck_offset;
-	u32 next_payload_size, copy_from_next_packets;
+	u32 next_payload_size, copy_from_next_packets, next_next_payload_size;
 	u32 pes_data_len, pes_data_remain;
 	Bool force_new;
 	Bool discard_data;
-	
+
 	u32 next_pck_flags;
 	u64 next_pck_cts, next_pck_dts;
 
@@ -1102,7 +1142,6 @@
 	GF_SLHeader sl_header;
 
 	u32 last_aac_time;
-
 	/*list of GF_M2TSDescriptor to add to the MPEG-2 stream. By default set to NULL*/
 	GF_List *loop_descriptors;
 } GF_M2TS_Mux_Stream;
@@ -1114,7 +1153,7 @@
 	GF_M2TS_MPEG4_SIGNALING_SCENE
 };
 
-typedef struct __m2ts_base_descriptor 
+typedef struct __m2ts_base_descriptor
 {
 	u8 tag;
 	u8 data_len;
@@ -1138,9 +1177,12 @@
 	u64 pcr_init_time, num_pck_at_pcr_init;
 	u64 last_pcr;
 	u64 last_dts;
-	u32 last_sys_clock;
+	//high res clock at last PCR
+	u64 sys_clock_at_last_pcr;
+	u64 nb_pck_last_pcr;
 	u64 initial_ts;
 	Bool initial_ts_set;
+	Bool pcr_init_time_set;
 	u32 pcr_offset;
 
 	GF_Descriptor *iod;
@@ -1149,6 +1191,7 @@
 	u32 mpeg4_signaling;
 	Bool mpeg4_signaling_for_scene_only;
 
+	char *name, *provider;
 };
 
 enum
@@ -1164,17 +1207,18 @@
 struct __m2ts_mux {
 	GF_M2TS_Mux_Program *programs;
 	GF_M2TS_Mux_Stream *pat;
+	GF_M2TS_Mux_Stream *sdt;
 
 	u16 ts_id;
 
 	Bool needs_reconfig;
 
-    /* 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) */
+	/* 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)
-       or if the output stream will contain only input data*/
+	   or if the output stream will contain only input data*/
 	Bool fixed_rate;
 
 	/*output bit-rate in bit/sec*/
@@ -1183,24 +1227,27 @@
 	/*init value for PCRs on all streams if 0, random value is used*/
 	u64 init_pcr_value;
 
+	u32 pcr_update_ms;
+
 	char dst_pck[188], null_pck[188];
 
 	/*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?) */
-    GF_M2TS_Time init_ts_time;
-	
-    /* System time when the muxer is started */
-    u32 init_sys_time;
+	  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?) */
+	GF_M2TS_Time init_ts_time;
+
+	/* System time high res when the muxer is started */
+	u64 init_sys_time;
 
 	Bool force_pat;
 
 	Bool one_au_per_pes;
 
 	Bool eos_found;
-	u32 pck_sent_over_br_window, last_br_time;
+	u64 last_br_time_us;
+	u32 pck_sent_over_br_window;
 	u64 tot_pck_sent, tot_pad_sent, tot_pes_pad_bytes;
 
 
@@ -1228,10 +1275,13 @@
  */
 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);
 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);	
-void gf_m2ts_mux_update_bitrate(GF_M2TS_Mux *mux);
+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);
 u32 gf_m2ts_get_sys_clock(GF_M2TS_Mux *muxer);
@@ -1244,14 +1294,15 @@
 /*user inteface functions*/
 GF_Err gf_m2ts_program_stream_update_ts_scale(GF_ESInterface *_self, u32 time_scale);
 
+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);
+
 
 #endif /*GPAC_DISABLE_MPEG2TS_MUX*/
 
 /******************* Demux DVB ****************************/
 
 
-#define UDP_BUFFER_SIZE	0x40000
-
 
 #ifdef GPAC_HAS_LINUX_DVB
 #include <fcntl.h>
@@ -1278,7 +1329,7 @@
 
 
 // DVB buffer size 188x20
-#define DVB_BUFFER_SIZE 3760							
+#define DVB_BUFFER_SIZE 3760
 
 #endif //GPAC_HAS_LINUX_DVB

gpac-0.5.0.svn5178.tar.bz2/include/gpac/network.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/network.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,14 +35,14 @@
  *	\brief IP network functions.
  */
 
- /*!
- *	\addtogroup net_grp network
- *	\ingroup utils_grp
- *	\brief IP Network Functions
- *
- *This section documents the IP network functions of the GPAC framework.
- *	@{
- */
+/*!
+*	\addtogroup net_grp network
+*	\ingroup utils_grp
+*	\brief IP Network Functions
+*
+*This section documents the IP network functions of the GPAC framework.
+*	@{
+*/
 
 #include <gpac/tools.h>
 
@@ -61,7 +61,7 @@
  *
  *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 
+ *\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
  */
@@ -102,7 +102,7 @@
  *\brief Extract resource name from URL
  *
  * Extracts the resource name from the URL
- *\param url input url 
+ *\param url input url
  *\return resource name.
  */
 const char *gf_url_get_resource_name(const char *url);
@@ -111,7 +111,7 @@
  *\brief Extract resource path from URL
  *
  *Extracts the reource path from the URL
- *\param url input 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.
  */
@@ -121,7 +121,7 @@
  *\brief Remove last delimenter from URL
  *
  * Remove last delimenter from URL
- *\param sURL input url 
+ *\param sURL input url
  *\param res_path buffer for resulting path storage
  *\return GF_TRUE if delimiter was extracted, otherwise GF_FALSE.
  */
@@ -131,13 +131,19 @@
  *\brief Extract extension from a resource path in URL
  *
  * Extract a resource path of URL and analyze its extension
- *\param sURL input url 
+ *\param sURL input url
  *\return The corresponding extension if exists, otherwise NULL.
  */
 const char* gf_url_get_ressource_extension(const char *sURL);
 
 /*!
- *\brief gets UTC time 
+ *\brief Portable version of UNIX gettimeofday()
+ */
+struct timeval;
+s32 gf_gettimeofday(struct timeval *tp, void *tz);
+
+/*!
+ *\brief gets UTC time
  *
  *Gets UTC time since midnight Jan 1970
  *\param sec number of seconds
@@ -155,7 +161,7 @@
 #define GF_NTP_SEC_1900_TO_1970 2208988800ul
 
 /*!
- *\brief gets NTP time 
+ *\brief gets NTP time
  *
  *Gets NTP (Network Time Protocol) in seconds and fractional side
  \param sec NTP time in seconds
@@ -164,6 +170,14 @@
 void gf_net_get_ntp(u32 *sec, u32 *frac);
 
 /*!
+ *
+ *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);
+
+/*!
  * Socket options
  *	\hideinitializer
  */
@@ -228,7 +242,7 @@
 /*!
  *\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 
+ *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
@@ -247,9 +261,9 @@
  */
 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 
+ *\brief connects a socket
  *
- *Connects a socket to a remote peer on a given port 
+ *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
@@ -267,7 +281,7 @@
 GF_Err gf_sk_send(GF_Socket *sock, const char *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 recpetion buffer where data is written
@@ -279,7 +293,7 @@
 /*!
  *\brief socket listening
  *
- *Sets the socket in a listening state. This socket must have been bound to a port before 
+ *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
  */
@@ -294,9 +308,9 @@
 GF_Err gf_sk_accept(GF_Socket *sock, GF_Socket **new_conn);
 
 /*!
- *\brief server socket mode 
+ *\brief server socket mode
  *
- *Disable the Nable algo (e.g. set TCP_NODELAY) and set the KEEPALIVE on 
+ *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
 */

gpac-0.5.0.svn5178.tar.bz2/include/gpac/nodes_mpeg4.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/nodes_mpeg4.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/nodes_svg.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/nodes_svg.h Changed

@@ -14,7 +14,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -104,7 +104,7 @@
 	TAG_SVG_feSpecularLighting,
 	TAG_SVG_feTile,
 	TAG_SVG_feTurbulence,
-	
+
 	TAG_LSR_conditional,
 	TAG_LSR_cursorManager,
 	TAG_LSR_rectClip,
@@ -120,7 +120,7 @@
 /* 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__class,
 
 	TAG_SVG_ATT_requiredFeatures,
 	TAG_SVG_ATT_requiredExtensions,
@@ -518,9 +518,9 @@
 	SVG_Boolean *fullscreen;
 	SVG_Motion *motionTransform;
 
-    SVG_Boolean *gpac_useAsPrimary;
-    SVG_Number *gpac_depthOffset;
-    SVG_Number *gpac_depthGain;
+	SVG_Boolean *gpac_useAsPrimary;
+	SVG_Number *gpac_depthOffset;
+	SVG_Number *gpac_depthGain;
 };
 #ifdef __cplusplus
 }

gpac-0.5.0.svn5178.tar.bz2/include/gpac/nodes_x3d.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/nodes_x3d.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/nodes_xbl.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/nodes_xbl.h Changed

@@ -4,7 +4,7 @@
  *			Authors: Cyril Concolato
  *    Copyright (c)2004-2012 Telecom ParisTech - All rights reserved
  *
- *  This file is part of GPAC / XBL Elements 
+ *  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
@@ -14,7 +14,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -33,7 +33,7 @@
 #include <gpac/internal/scenegraph_dev.h>
 #include <gpac/svg_types.h>
 
-#define XBL_String_datatype SVG_String_datatype 
+#define XBL_String_datatype SVG_String_datatype
 
 struct _all_atts {
 	DOM_String *id;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/options.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/options.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -65,6 +65,8 @@
 	GF_STATE_PLAYING = 0,	/*terminal is playing*/
 	GF_STATE_PAUSED, /*terminal is paused*/
 	GF_STATE_STEP_PAUSE, /*get/set only: terminal will pause after next frame (simulation tick). On get, indicates that rendering step hasn't performed yet*/
+
+	GF_STATE_PLAY_LIVE = 10 //set only: indicates resume shall restart from live point if any rather than pause point
 };
 
 /*refresh mode*/
@@ -76,7 +78,7 @@
 
 /*interaction level settings*/
 enum
-{	
+{
 	/*regular interactions enabled (touch sensors)*/
 	GF_INTERACT_NORMAL = 1,
 	/*InputSensor interactions enabled (mouse and keyboard)*/
@@ -106,7 +108,7 @@
 
 
 /*navigation type*/
-enum 
+enum
 {
 	/*navigation is disabled by content and cannot be forced by user*/
 	GF_NAVIGATE_TYPE_NONE,
@@ -207,31 +209,31 @@
 	GF_OPT_AUDIO_MUTE,
 	/*get javascript flag (no set, depends on compil) - value: boolean, true if JS enabled in build*/
 	GF_OPT_HAS_JAVASCRIPT,
-	/*get selectable stream flag (no set) - value: boolean, true if audio/video/subtitle stream selection is 
+	/*get selectable stream flag (no set) - value: boolean, true if audio/video/subtitle stream selection is
 	possible with content (if an MPEG-4 scene description is not present). Use regular OD browsing to get streams*/
 	GF_OPT_CAN_SELECT_STREAMS,
 	/*set/get control interaction, OR'ed combination of interaction flags*/
 	GF_OPT_INTERACTION_LEVEL,
 	/*set display window visible / get show/hide state*/
 	GF_OPT_VISIBLE,
-	/*set freeze display on/off / get freeze state freeze_display prevents any screen updates 
+	/*set freeze display on/off / get freeze state freeze_display prevents any screen updates
 	needed when output driver uses direct video memory access*/
 	GF_OPT_FREEZE_DISPLAY,
-	/*Returns 1 if file playback is considered as done (all streams finished, no active time sensors 
+	/*Returns 1 if file playback is considered as done (all streams finished, no active time sensors
 	and no user interactions in the scene)*/
 	GF_OPT_IS_FINISHED,
 	/*Returns 1 if file timeline is considered as done (all streams finished, no active time sensors)*/
 	GF_OPT_IS_OVER,
 	/*set/get aspect ratio (value: one of AspectRatio enum) */
 	GF_OPT_ASPECT_RATIO,
-	/*send a redraw message (SetOption only): all graphics info (display list, vectorial path) is 
+	/*send a redraw message (SetOption only): all graphics info (display list, vectorial path) is
 	recomputed, and textures are reloaded in HW*/
 	GF_OPT_REFRESH,
 	/*set/get stress mode (value: boolean) - in stress mode a GF_OPT_FORCE_REDRAW is emulated at each frame*/
 	GF_OPT_STRESS_MODE,
 	/*get/set bounding volume drawing (value: one of the above option)*/
 	GF_OPT_DRAW_BOUNDS,
-	/*get/set texture text option - when enabled and usable (that depends on content), text is first rendered 
+	/*get/set texture text option - when enabled and usable (that depends on content), text is first rendered
 	to a texture and only the texture is drawn, rather than drawing all the text each time (CPU intensive)*/
 	GF_OPT_TEXTURE_TEXT,
 	/*fake option, reload config file (set only), including drivers. Plugins configs are not reloaded*/
@@ -246,12 +248,14 @@
 	GF_OPT_MEDIA_CACHE,
 	/*get/set Play state - cf above states for set*/
 	GF_OPT_PLAY_STATE,
+	/*get only: returns 1 if main addon is playing, 0 if regular scene is playing*/
+	GF_OPT_MAIN_ADDON,
 	/*get/set benvch mode - if enabled, video frames are drawn as soon as possible witthout checking synchronisation*/
 	GF_OPT_VIDEO_BENCH,
 	/*get/set OpenGL force mode - returns error if OpenGL is not supported*/
 	GF_OPT_USE_OPENGL,
 
-	/*set/get draw mode. 
+	/*set/get draw mode.
 		In immediate mode, the screen is entirely redrawn at each frame
 		In defer mode, only the changed ares are redrawn
 		In defer-debug mode, unchanged areas are erased and changed ares are redrawn
@@ -271,9 +275,9 @@
 	/*max HTTP download rate in bits per second, 0 if no limit*/
 	GF_OPT_HTTP_MAX_RATE,
 
-	
+
 	/*		3D ONLY OPTIONS		*/
-	/*set/get raster outline flag (value: boolean) - when set, no vectorial outlining is done, only 
+	/*set/get raster outline flag (value: boolean) - when set, no vectorial outlining is done, only
 	openGL raster outline*/
 	GF_OPT_RASTER_OUTLINES,
 	/*set/get pow2 emulation flag (value: boolean) - when set, video textures with non power of 2 dimensions
@@ -288,11 +292,9 @@
 	GF_OPT_NORMALS,
 	/*disable backface culling*/
 	GF_OPT_BACK_CULL,
-	/*get/set RECT Ext flag (value: boolean) - when set, GL rectangular texture extension is not used 
+	/*get/set RECT Ext flag (value: boolean) - when set, GL rectangular texture extension is not used
 	(but NPO2 texturing is if available)*/
 	GF_OPT_NO_RECT_TEXTURE,
-	/*get/set bitmap draw mode. If set, bitmap doesn't use texturing but direct video copy*/
-	GF_OPT_BITMAP_COPY,
 	/*set/get headlight (value: boolean)*/
 	GF_OPT_HEADLIGHT,
 	/*set/get collision (value: cf above)*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/path2d.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/path2d.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <gpac/math.h>
+#include <gpac/maths.h>
 #include <gpac/tools.h>
 
 
@@ -47,11 +47,11 @@
  *\ingroup utils_grp
  *\brief Vectorial 2D Path manipulation functions
  *
- *This section documents the 2D path object used in the GPAC framework. 
+ *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
@@ -217,7 +217,7 @@
  *
  *	Adds a rectangle contour to the path
  *	\param gp the target path
- *	\param ox left-most coordinate of the rectangle 
+ *	\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
@@ -270,7 +270,7 @@
  *	\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 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.
@@ -282,7 +282,7 @@
  *
  *	Adds an arc contour to the path.
  *	\param gp the target path
- *	\param radius radius of the arc 
+ *	\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
@@ -296,7 +296,7 @@
  *	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 
+ *	\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);
@@ -319,14 +319,14 @@
  */
 GF_Err gf_path_get_bounds(GF_Path *gp, GF_Rect *rc);
 /*!
- *	\brief flattens 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 
+ *	\brief gets flatten copy of path
  *
  *	Gets a flatten copy of the path.
  *	\param gp the target path
@@ -354,7 +354,7 @@
 Bool gf_path_is_empty(GF_Path *gp);
 
 /*!
- *	\brief path iterator 
+ *	\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.
@@ -388,8 +388,8 @@
 /*!
  *\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 
+ * 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
@@ -397,7 +397,7 @@
  *	\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. 
+ *	\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
@@ -405,7 +405,7 @@
 	ratio = (len1 + len_last - offset) / length_after_point;
 	then THETA = ratio * slope(L1) + (1-ratio) * slope(L2)
 
-  Of course care must be taken for PI/2 angles and similar situations 
+  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.
@@ -451,7 +451,7 @@
 {
 	/*! Path is filled using the zero-nonzero rule. If not set, filling uses odd/even rule*/
 	GF_PATH_FILL_ZERO_NONZERO = 1,
-	/*! When set bbox must be recomputed. 
+	/*! When set bbox must be recomputed.
 	\note Read only, used to avoid wasting time on bounds calculation*/
 	GF_PATH_BBOX_DIRTY = 2,
 	/*! Indicates the path is flattened flattened
@@ -484,7 +484,7 @@
  *	\hideinitializer
  */
 enum
-{	
+{
 	/*! outline is centered on the path (default)*/
 	GF_PATH_LINE_CENTER = 0,
 	/*! outline is inside the path*/
@@ -563,11 +563,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;
+	/*! SVG/CSS unit for the dashes */
+	u8 *dash_units;
 } GF_DashSettings;
 
-/*!\brief Pen properties 
+/*!\brief Pen properties
  *
  *The pen properties object is used to specify several parameters used when building
  *the vectorial outline of a path.
@@ -586,7 +586,7 @@
 	u8 dash;
 	/*! The miter limit of the line joins*/
 	Fixed miterLimit;
-	/*! The initial dash offset in the outline. All points before this offset will be 
+	/*! 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*/
@@ -600,7 +600,7 @@
  * 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 
+ * \return the outline of the path
 */
 GF_Path *gf_path_get_outline(GF_Path *path, GF_PenSettings pen);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/ringbuffer.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/ringbuffer.h Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,12 +35,12 @@
 
 typedef struct
 {
-  u8           *buf;
-  volatile u32 write_ptr;
-  volatile u32 read_ptr;
-  u32          size;
-  u32          size_mask;
-  GF_Mutex *   mx;
+	u8           *buf;
+	volatile u32 write_ptr;
+	volatile u32 read_ptr;
+	u32          size;
+	u32          size_mask;
+	GF_Mutex *   mx;
 }
 GF_Ringbuffer ;
 
@@ -54,7 +54,7 @@
  * \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
@@ -87,7 +87,7 @@
  * \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

gpac-0.5.0.svn5178.tar.bz2/include/gpac/rtp_streamer.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/rtp_streamer.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -47,7 +47,7 @@
 #include <gpac/isomedia.h>
 
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_ISOM)
-    
+
 typedef struct __rtp_streamer GF_RTPStreamer;
 
 /*!
@@ -60,17 +60,17 @@
  *\param ip_dest IP address of the destination
  *\param port port number of the destination
  *\param MTU Maximum Transmission Unit size to use
- *\param TTL Time To Leave 
+ *\param TTL Time To Leave
  *\param ifce_addr IP of the local interface to use (may be NULL)
- *\param flags 
+ *\param flags
  *\param dsi MPEG-4 Decoder Specific Info for the stream
  *\param dsi_len length of the dsi parameter
  *\return new object
  */
 
-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);
+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);
 
 /*!
  *	\brief RTP Streamer constructor with extended parameters
@@ -82,9 +82,9 @@
  *\param ip_dest IP address of the destination
  *\param port port number of the destination
  *\param MTU Maximum Transmission Unit size to use
- *\param TTL Time To Leave 
+ *\param TTL Time To Leave
  *\param ifce_addr IP of the local interface to use (may be NULL)
- *\param flags 
+ *\param flags
  *\param dsi MPEG-4 Decoder Specific Info for the stream
  *\param dsi_len length of the dsi parameter
  *\param PayloadType RTP payload type
@@ -92,24 +92,24 @@
  *\param nb_ch number of channels in audio streams
  *\param is_crypted Boolean indicating if the stream is crypted
  *\param IV_length lenght of the Initialisation Vector used for encryption
- *\param KI_length length of the key index 
- *\param MinSize 
- *\param MaxSize 
- *\param avgTS 
- *\param maxDTSDelta 
- *\param const_dur 
- *\param bandwidth 
- *\param max_ptime 
+ *\param KI_length length of the key index
+ *\param MinSize
+ *\param MaxSize
+ *\param avgTS
+ *\param maxDTSDelta
+ *\param const_dur
+ *\param bandwidth
+ *\param max_ptime
  *\param au_sn_len length of the MPEG-4 SL descriptor AU sequence number field
  *\return new object
  */
-GF_RTPStreamer *gf_rtp_streamer_new_extended(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, 								 
-								 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);
+GF_RTPStreamer *gf_rtp_streamer_new_extended(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,
+        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);
 
 /*!
  *	\brief RTP file streamer destructor

gpac-0.5.0.svn5178.tar.bz2/include/gpac/scene_engine.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/scene_engine.h Changed

@@ -5,21 +5,21 @@
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
- *  This file is part of GPAC 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -44,7 +44,7 @@
  * \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 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
@@ -58,7 +58,7 @@
  * \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 
+ * \param dump_path the path where scenes are dumped
  *
  * must be called only one time (by process calling the DLL) before other calls
  */
@@ -68,7 +68,7 @@
 /**
  * \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 
+ * \param dump_path the path where scenes are dumped
  *
  * must be called only one time (by process calling the DLL) before other calls
  */
@@ -84,7 +84,7 @@
 /**
  * \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 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()
@@ -103,7 +103,7 @@
  *
  * 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);
+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
@@ -118,7 +118,7 @@
 /**
  * \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 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
  *
@@ -128,7 +128,7 @@
 /**
  * \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 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
  *
@@ -138,7 +138,7 @@
 /**
  * \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 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
@@ -161,7 +161,7 @@
  * \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
  */
 GF_Err gf_seng_enable_aggregation(GF_SceneEngine *seng, u16 ESID, u16 onESID);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/scene_manager.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/scene_manager.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -58,7 +58,7 @@
 
 /*generic systems access unit context*/
 typedef struct
-{	
+{
 	/*AU timing in TimeStampResolution*/
 	u64 timing;
 	/*timing in sec - used if timing isn't set*/
@@ -104,7 +104,7 @@
 } GF_StreamContext;
 
 /*generic presentation context*/
-typedef struct 
+typedef struct
 {
 	/*the one and only scene graph used by the scene manager.*/
 	GF_SceneGraph *scene_graph;
@@ -131,7 +131,7 @@
 /*scene manager destructor - does not destroy the attached scene graph*/
 void gf_sm_del(GF_SceneManager *ctx);
 /*retrive or create a stream context in the presentation context
-WARNING: if a stream with the same streamType and no ESID already exists in the context, 
+WARNING: if a stream with the same streamType and no ESID already exists in the context,
 it is assigned the requested ES_ID - this is needed to solve base layer*/
 GF_StreamContext *gf_sm_stream_new(GF_SceneManager *ctx, u16 ES_ID, u8 streamType, u8 objectType);
 /*removes and destroy stream context from presentation context*/
@@ -143,8 +143,8 @@
 
 GF_MuxInfo *gf_sm_get_mux_info(GF_ESD *src);
 
-/*reset the context: 
-- purge all access units on all streams 
+/*reset the context:
+- purge all access units on all streams
 - destroy root OD
 */
 void gf_sm_reset(GF_SceneManager *ctx);
@@ -194,7 +194,7 @@
 {
 	/*if set, always load MPEG-4 nodes, otherwise X3D versions are used for vrml/x3d*/
 	GF_SM_LOAD_MPEG4_STRICT = 1,
-	/*signal loading is done for playback:	
+	/*signal loading is done for playback:
 		scrips will be queued in their parent command for later loading
 		SFTime (MPEG-4 only) fields will be handled correctly when inserting/creating nodes based on AU timing
 	*/
@@ -212,8 +212,8 @@
 };
 
 /*loader type, usually detected based on file ext*/
-enum
-{	
+typedef enum
+{
 	GF_SM_LOAD_BT = 1, /*BT loader*/
 	GF_SM_LOAD_VRML, /*VRML97 loader*/
 	GF_SM_LOAD_X3DV, /*X3D VRML loader*/
@@ -226,21 +226,21 @@
 	GF_SM_LOAD_QT, /*MOV->MPEG-4 converter (only cubic QTVR for now)*/
 	GF_SM_LOAD_MP4, /*MP4 memory loader*/
 	GF_SM_LOAD_XBL
-};
+} GF_SceneManager_LoadType;
 
 typedef struct __scene_loader GF_SceneLoader;
 
-struct __scene_loader 
+struct __scene_loader
 {
 	/*loader type, one of the above value. If not set, detected based on file extension*/
-	u32 type;
+	GF_SceneManager_LoadType type;
 
 	/*scene graph worked on - may be NULL if ctx is present*/
 	GF_SceneGraph *scene_graph;
 
 	struct _scene  *is;
 
-	/*context manager to load (MUST BE RESETED BEFORE if needed) - may be NULL for loaders not using commands, 
+	/*context manager to load (MUST BE RESETED BEFORE if needed) - may be NULL for loaders not using commands,
 	in which case the graph will be directly updated*/
 	GF_SceneManager *ctx;
 	/*file to import except IsoMedia files*/
@@ -251,13 +251,16 @@
 #endif
 	/*swf import flags*/
 	u32 swf_import_flags;
-	/*swf flatten limit: angle limit below which 2 lines are considered as aligned, 
+	/*swf flatten limit: angle limit below which 2 lines are considered as aligned,
 	in which case the lines are merged as one. If 0, no flattening happens*/
 	Float swf_flatten_limit;
 	/*swf extraction path: if set, swf media (mp3, jpeg) are extracted to this path. If not set
 	media are extracted to original file directory*/
 	const char *localPath;
 
+	/* carrying svgOutFile when the loader is used by a SceneDumper */
+	const char *svgOutFile;
+
 	/*loader flags*/
 	u32 flags;
 
@@ -282,9 +285,9 @@
 
 /*parses memory scene (any textural format) into the context
 !! THE LOADER TYPE MUST BE ASSIGNED (BT/WRL/XMT/X3D/SVG only) !!
-The string MUST be at least 4 bytes long in order to detect BOM (unicode encoding). 
+The string MUST be at least 4 bytes long in order to detect BOM (unicode encoding).
 The string can ba either UTF-8 or UTF-16 data
-if clean_at_end is set, associated parser is destroyed. Otherwise, a call to gf_sm_load_done must be done 
+if clean_at_end is set, associated parser is destroyed. Otherwise, a call to gf_sm_load_done must be done
 to clean ressources (needed for SAX progressive loading)
 */
 GF_Err gf_sm_load_string(GF_SceneLoader *load, const char *str, Bool clean_at_end);
@@ -336,7 +339,7 @@
 #ifndef GPAC_DISABLE_SCENE_DUMP
 
 /*scene dump mode*/
-enum
+typedef enum
 {
 	/*BT*/
 	GF_SM_DUMP_BT = 0,
@@ -358,23 +361,25 @@
 	GF_SM_DUMP_AUTO_TXT,
 	/*automatic selection of MPEG4 vs X3D, xml mode*/
 	GF_SM_DUMP_AUTO_XML,
-};
+	/* disables dumping the scene */
+	GF_SM_DUMP_NONE
+} GF_SceneDumpFormat;
 
-/*dumps scene context to BT or XMT
+/*dumps scene context to a given format
 @rad_name: file name & loc without extension - if NULL dump will happen in stdout
 @dump_mode: one of the above*/
-GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, u32 dump_mode);
+GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, GF_SceneDumpFormat dump_mode);
 
 typedef struct _scenedump GF_SceneDumper;
 
-/*create a scene dumper 
+/*create a scene dumper
 @graph: scene graph being dumped
 @rad_name: file radical (NULL for stdout) - if not NULL MUST BE GF_MAX_PATH length
 @indent_char: indent format
 @dump_mode: if set, dumps in XML format otherwise regular text
 returns NULL if can't create a file
 */
-GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *_rad_name, char indent_char, u32 dump_mode);
+GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *_rad_name, char indent_char, GF_SceneDumpFormat dump_mode);
 void gf_sm_dumper_set_extra_graph(GF_SceneDumper *sdump, GF_SceneGraph *extra);
 void gf_sm_dumper_del(GF_SceneDumper *bd);
 
@@ -389,7 +394,7 @@
 */
 GF_Err gf_sm_dump_command_list(GF_SceneDumper *sdump, GF_List *comList, u32 indent, Bool skip_first_replace);
 
-/*dumps complete graph - 
+/*dumps complete graph -
 @skip_proto: proto declarations are skipped
 @skip_routes: routes are not dumped
 */
@@ -420,7 +425,7 @@
 	GF_List *node_stats;
 
 	GF_List *proto_stats;
-	
+
 	/*ranges of all SFVec2fs for points only (MFVec2fs)*/
 	SFVec2f max_2d, min_2d;
 	/* resolution of 2D points (nb bits for integer part and decimal part)*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/scenegraph.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/scenegraph.h Changed

@@ -2,7 +2,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -12,15 +12,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -33,7 +33,7 @@
 #endif
 
 #include <gpac/list.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 
 /*
 	TAG definitions are static, in order to be able to mix nodes from different standard
@@ -53,7 +53,7 @@
 	GF_NODE_RANGE_LAST_MPEG4 = GF_NODE_RANGE_FIRST_MPEG4+512,
 
 	/*range for X3D*/
-	GF_NODE_RANGE_FIRST_X3D, 
+	GF_NODE_RANGE_FIRST_X3D,
 	GF_NODE_RANGE_LAST_X3D = GF_NODE_RANGE_FIRST_X3D+512,
 
 	/*all nodes after this are always parent nodes*/
@@ -69,16 +69,16 @@
 	TAG_DOMText,
 	/*all nodes below MUST use the base DOM structure (with dyn attribute list)*/
 	GF_NODE_FIRST_DOM_NODE_TAG,
-	
+
 	/*full node*/
 	TAG_DOMFullNode = GF_NODE_FIRST_DOM_NODE_TAG,
 
 	/*range for SVG*/
-	GF_NODE_RANGE_FIRST_SVG, 
+	GF_NODE_RANGE_FIRST_SVG,
 	GF_NODE_RANGE_LAST_SVG = GF_NODE_RANGE_FIRST_SVG+100,
 
 	/*range for XBL*/
-	GF_NODE_RANGE_FIRST_XBL, 
+	GF_NODE_RANGE_FIRST_XBL,
 	TAG_XBL_bindings = GF_NODE_RANGE_FIRST_XBL,
 	TAG_XBL_binding,
 	TAG_XBL_content,
@@ -156,7 +156,7 @@
 /*tag is set upon creation and cannot be modified*/
 u32 gf_node_get_tag(GF_Node*);
 /*set node def
-	@ID: node ID, !=0 set def node - if a different node with the same ID exists, returns error. 
+	@ID: node ID, !=0 set def node - if a different node with the same ID exists, returns error.
 You may change the node ID by recalling the function with a different ID value. You may get a node ID
 by calling the gf_sg_get_next_available_node_id function
 	@defName: optional readable name (script, MPEGJ). To change the name, recall the function with a different name and the same ID
@@ -180,7 +180,7 @@
 void *gf_node_get_private(GF_Node*);
 void gf_node_set_private(GF_Node*, void *);
 
-/*set traversal callback function. If a node has no associated callback, the traversing of the 
+/*set traversal callback function. If a node has no associated callback, the traversing of the
 graph won't propagate below it. It is the app responsability to setup traversing functions as needed
 VRML/MPEG4:  Instanciated Protos are handled internally as well as interpolators, valuators and scripts
 @is_destroy: set when the node is about to be destroyed
@@ -188,7 +188,7 @@
 GF_Err gf_node_set_callback_function(GF_Node *, void (*NodeFunction)(GF_Node *node, void *traverse_state, Bool is_destroy) );
 
 /*register a node (DEFed or not), specifying parent if any.
-A node must be registered whenever used by something (a parent node, a command, whatever) to prevent its 
+A node must be registered whenever used by something (a parent node, a command, whatever) to prevent its
 destruction (think of it as a reference counting).
 NOTE: NODES ARE CREATED WITHOUT BEING REGISTERED
 */
@@ -197,7 +197,7 @@
 /*unregister a node from parent (node may or not be DEF'ed). Parent may be NULL (DEF root node, commands).
 This MUST be called whenever a node is destroyed (removed from a parent node)
 If this is the last instance of the node, the node is destroyed
-NOTE: NODES ARE CREATED WITHOUT BEING REGISTERED, hence they MUST be registered at least once before 
+NOTE: NODES ARE CREATED WITHOUT BEING REGISTERED, hence they MUST be registered at least once before
 being destroyed
 */
 GF_Err gf_node_unregister(GF_Node *node, GF_Node *parent_node);
@@ -214,7 +214,7 @@
 
 /*calls node traverse callback routine on this node*/
 void gf_node_traverse(GF_Node *node, void *udta);
-/*allows a node to be re-rendered - by default a node in its render phase will never be retraversed a second time. 
+/*allows a node to be re-rendered - by default a node in its render phase will never be retraversed a second time.
 Use this function to enable a second traverse for this node while traversing the node*/
 void gf_node_allow_cyclic_traverse(GF_Node *node);
 
@@ -242,7 +242,7 @@
 	if relying on this flag for sub-tree discarding (eg, culling or similar)*/
 	GF_SG_CHILD_DIRTY = 1<<1,
 
-	/*flag set by bindable nodes to indicate a modification of the bindable stack. This is 
+	/*flag set by bindable nodes to indicate a modification of the bindable stack. This is
 	only used for offscreen rendering of Layer3D*/
 	GF_SG_VRML_BINDABLE_DIRTY = 1<<2,
 
@@ -310,7 +310,7 @@
 u32 gf_node_dirty_get(GF_Node *node);
 
 /*Notes on GF_FieldInfo
-all scene graph implementations should answer node field query with this interface. 
+all scene graph implementations should answer node field query with this interface.
 In case an implementation does not use this:
 	- the implementation shall handle the parent node dirty flag itself most of the time
 	- the implementation shall NOT allow referencing of a graph node in a parent graph node (when inlining
@@ -322,7 +322,7 @@
 /*other fieldTypes may be ignored by implmentation not using VRML/MPEG4 native types*/
 
 typedef struct
-{	
+{
 	/*0-based index of the field in the node*/
 	u32 fieldIndex;
 	/*field type - VRML/MPEG4 types are listed in scenegraph_vrml.h*/
@@ -353,10 +353,10 @@
 /*scene graph constructor*/
 GF_SceneGraph *gf_sg_new();
 
-/*creates a sub scene graph (typically used with Inline node): independent graph with same private stack, 
-and user callbacks as parent. All routes triggered in this subgraph are executed in the parent graph (this 
+/*creates a sub scene graph (typically used with Inline node): independent graph with same private stack,
+and user callbacks as parent. All routes triggered in this subgraph are executed in the parent graph (this
 means you only have to activate routes on the main graph)
-NOTE: the resulting graph is not destroyed when the parent graph is 
+NOTE: the resulting graph is not destroyed when the parent graph is
 */
 GF_SceneGraph *gf_sg_new_subscene(GF_SceneGraph *scene);
 
@@ -377,7 +377,7 @@
 
 enum
 {
-	/*function called upon node creation. 
+	/*function called upon node creation.
 		ctxdata is not used*/
 	GF_SG_CALLBACK_INIT = 0,
 	/*function called upon node modification. You typically will set some of the dirty flags here.
@@ -390,7 +390,7 @@
 	GF_SG_CALLBACK_NODE_DESTROY,
 };
 
-/*set node callback: function called upon node creation. 
+/*set node callback: function called upon node creation.
 Application should instanciate the node rendering stack and any desired callback*/
 void gf_sg_set_node_callback(GF_SceneGraph *sg, void (*NodeCallback)(void *user_priv, u32 type, GF_Node *node, void *ctxdata) );
 
@@ -403,7 +403,7 @@
 /*finds a registered node by DEF name*/
 GF_Node *gf_sg_find_node_by_name(GF_SceneGraph *sg, char *name);
 
-/*used to signal modification of a node, indicating which field is modified - exposed for BIFS codec, 
+/*used to signal modification of a node, indicating which field is modified - exposed for BIFS codec,
 should not be needed by other apps*/
 void gf_node_changed(GF_Node *node, GF_FieldInfo *fieldChanged);
 
@@ -430,7 +430,7 @@
 
 /*clones a node in the given graph and register with parent cloned. The cloning handles ID based on id_suffix:
  id_suffix = NULL: all IDs are removed from the cloned subtree, (each node instance will become a hard copy)
- id_suffix = "": ID will be kept exactly as they where in the original subtree - this may lead to errors due to 
+ id_suffix = "": ID will be kept exactly as they where in the original subtree - this may lead to errors due to
 		the presence of the same ID depending on the standard (DOM, ...).
  id_suffix = anything: all IDs are translated ($(name) -> $(name)id_suffix) and bynary IDs are generated on the fly
 */
@@ -464,8 +464,8 @@
 
 typedef struct
 {
-	/*for GF_JSAPI_OP_RESOLVE_URI, 
-		set by caller to the URI to resolve. 
+	/*for GF_JSAPI_OP_RESOLVE_URI,
+		set by caller to the URI to resolve.
 				If NULL, the return URI is the unresolved parent scene one.
 				Otherwise, the input URL will be reolved to its local name (eg for ZIP/... packages)
 		upon return, ALLOCATED by the callee and must be freed by the caller
@@ -482,7 +482,7 @@
 	const char *key_val;
 } GF_JSAPIOPT;
 
-	/*for script message option*/
+/*for script message option*/
 typedef struct
 {
 	GF_Err e;
@@ -604,8 +604,8 @@
 
 /*
 			scene graph command tools used for BIFS and LASeR
-		These are used to store updates in memory without applying changes to the graph, 
-	for dumpers, encoders ... 
+		These are used to store updates in memory without applying changes to the graph,
+	for dumpers, encoders ...
 		The commands can then be applied through this lib
 */
 
@@ -621,7 +621,7 @@
 	/*BIFS commands*/
 	GF_SG_SCENE_REPLACE,
 	GF_SG_NODE_REPLACE,
-	GF_SG_FIELD_REPLACE, 
+	GF_SG_FIELD_REPLACE,
 	GF_SG_INDEXED_REPLACE,
 	GF_SG_ROUTE_REPLACE,
 	GF_SG_NODE_DELETE,
@@ -641,7 +641,7 @@
 	GF_SG_NODE_DELETE_EX,
 
 	/*BIFS*/
-	GF_SG_XREPLACE, 
+	GF_SG_XREPLACE,
 
 #endif
 	GF_SG_LAST_BIFS_COMMAND,
@@ -668,8 +668,8 @@
 /*
 				single command wrapper
 
-  NOTE: In order to maintain node registry, the nodes replaced/inserted MUST be registered with 
-  their parents even when the command is never applied. Registering shall be performed 
+  NOTE: In order to maintain node registry, the nodes replaced/inserted MUST be registered with
+  their parents even when the command is never applied. Registering shall be performed
   with gf_node_register (see below).
   If you fail to do so, a node may be destroyed when destroying a command while still used
   in another command or in the graph - this will just crash.
@@ -700,7 +700,7 @@
 	/*node the command applies to - may be NULL*/
 	GF_Node *node;
 
-	/*list of GF_CommandField for all field commands replace/ index insert / index replace / index delete / MultipleReplace / MultipleIndexedreplace 
+	/*list of GF_CommandField for all field commands replace/ index insert / index replace / index delete / MultipleReplace / MultipleIndexedreplace
 	the content is destroyed when deleting the command*/
 	GF_List *command_fields;
 
@@ -712,7 +712,7 @@
 
 
 	union {
-		/*scene replace command: 
+		/*scene replace command:
 			root node is stored in com->node
 			protos are stored in com->new_proto_list
 			routes are stored as RouteInsert in the same frame

gpac-0.5.0.svn5178.tar.bz2/include/gpac/scenegraph_svg.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/scenegraph_svg.h Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,7 +35,7 @@
 
 
 /*******************************************************************************
- * 
+ *
  *          DOM base scene graph
  *
  *******************************************************************************/
@@ -116,9 +116,9 @@
 	TAG_XBL_ATT_preventdefault,
 	TAG_XBL_ATT_src,
 
-    TAG_GSVG_ATT_useAsPrimary,
-    TAG_GSVG_ATT_depthOffset,
-    TAG_GSVG_ATT_depthGain,
+	TAG_GSVG_ATT_useAsPrimary,
+	TAG_GSVG_ATT_depthOffset,
+	TAG_GSVG_ATT_depthGain,
 };
 
 
@@ -130,7 +130,7 @@
 
 #define GF_DOM_FULL_ATTRIBUTE	\
 	GF_DOM_ATTRIBUTE	\
-
+ 
 typedef struct __dom_base_attribute
 {
 	GF_DOM_BASE_ATTRIBUTE
@@ -172,7 +172,7 @@
 	GF_XMLNS_SVG,
 	GF_XMLNS_XBL,
 
-    GF_XMLNS_SVG_GPAC_EXTENSION,
+	GF_XMLNS_SVG_GPAC_EXTENSION,
 
 	/*any other namespace uses the CRC32 of the namespace as an identifier*/
 } GF_NamespaceType;
@@ -235,7 +235,7 @@
 /*creates a new updates node and register node with parent*/
 GF_DOMUpdates *gf_dom_add_updates_node(GF_Node *parent);
 
-/* 
+/*
 	DOM event handling
 */
 typedef enum
@@ -266,7 +266,7 @@
 
 
 /* Structure representing the DOM EventTarget Interface */
-typedef struct 
+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
@@ -299,15 +299,15 @@
 	u8 cancelable;
 	/*output only - indicates UI events (mouse) have been detected*/
 	u8 has_ui_events;
-	
+
 	/*we don't use a GF_DOMEventTarget here since the structure is only created when events are attached */
 	void *target;
 	GF_DOMEventTargetType target_type;
 
 	GF_DOMEventTarget *currentTarget;
 	Double timestamp;
-	/*UIEvent extension.	
-		For mouse extensions: number of clicks 
+	/*UIEvent extension.
+		For mouse extensions: number of clicks
 		For key event: the key code
 		For SMIL event: number of iteration (repeat)
 	*/
@@ -339,7 +339,7 @@
 	/*DOM event used in VRML (GPAC's internal)*/
 	Bool is_vrml;
 	/*media event*/
-	GF_DOMMediaEvent *media_event;
+	GF_DOMMediaEvent media_event;
 
 	/*number of listeners triggered by the event*/
 	u32 consumed;
@@ -347,6 +347,9 @@
 	/*for GF_EVENT_ATTR_MODIFIED*/
 	GF_FieldInfo *attr;
 	GF_Err error_state;
+
+	/* ADDON_DETECTED event*/
+	const char *addon_url;
 } GF_DOM_Event;
 
 /*fires event on the specified node
@@ -368,7 +371,7 @@
 GF_KeyCode gf_dom_get_key_type(char *key_name);
 
 
-/*listener is simply a node added to the node events list. 
+/*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 	\
@@ -382,9 +385,9 @@
 	/*compiled function for the case were CallFunction is needed*/\
 	void *js_fun; \
 	/* text content of the callback */ \
-	char *callback; 
+	char *callback;
 
-typedef struct __xml_ev_handler 
+typedef struct __xml_ev_handler
 {
 	GF_DOM_BASE_NODE
 	void (*handle_event)(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer);
@@ -419,6 +422,8 @@
 	/*HTML Media Source events*/
 	GF_DOM_EVENT_MEDIASOURCE = 1<<11,
 
+	/*Internal GPAC events*/
+	GF_DOM_EVENT_GPAC = 1<<30,
 	/*fake events - these events are NEVER fired*/
 	GF_DOM_EVENT_FAKE = 1<<31,
 } GF_DOMEventCategory;
@@ -437,7 +442,7 @@
 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 
+/*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);
@@ -457,7 +462,7 @@
 typedef struct {
 	/* Tiny 1.2 properties*/
 	SVG_Paint					*color;
-	SVG_Paint					*fill; 
+	SVG_Paint					*fill;
 	SVG_Paint					*stroke;
 	SVG_Paint					*solid_color;
 	SVG_Paint					*stop_color;
@@ -478,67 +483,67 @@
 	SVG_RenderingHint			*shape_rendering;
 	SVG_RenderingHint			*text_rendering;
 
-	SVG_Display					*display; 
+	SVG_Display					*display;
 	SVG_Visibility				*visibility;
 	SVG_Overflow				*overflow; /* Restricted property in Tiny 1.2 */
-	
+
 	SVG_FontFamily				*font_family;
 	SVG_FontSize				*font_size;
-	SVG_FontStyle				*font_style; 
-	SVG_FontWeight				*font_weight; 
-	SVG_FontVariant				*font_variant; 
-	SVG_Number					*line_increment;	
+	SVG_FontStyle				*font_style;
+	SVG_FontWeight				*font_weight;
+	SVG_FontVariant				*font_variant;
+	SVG_Number					*line_increment;
 	SVG_TextAnchor				*text_anchor;
 	SVG_DisplayAlign			*display_align;
 	SVG_TextAlign				*text_align;
 
 	SVG_PointerEvents			*pointer_events;
-	
-	SVG_FillRule				*fill_rule; 
-	
+
+	SVG_FillRule				*fill_rule;
+
 	SVG_StrokeDashArray			*stroke_dasharray;
 	SVG_Length					*stroke_dashoffset;
-	SVG_StrokeLineCap			*stroke_linecap; 
-	SVG_StrokeLineJoin			*stroke_linejoin; 
-	SVG_Number					*stroke_miterlimit; 
+	SVG_StrokeLineCap			*stroke_linecap;
+	SVG_StrokeLineJoin			*stroke_linejoin;
+	SVG_Number					*stroke_miterlimit;
 	SVG_Length					*stroke_width;
 	SVG_VectorEffect			*vector_effect;
-	
+
 	/* Full 1.1 props, i.e. not implemented */
-/*
-	SVG_String *font;
-	SVG_String *font_size_adjust;
-	SVG_String *font_stretch;
-	SVG_String *direction;
-	SVG_String *letter_spacing;
-	SVG_String *text_decoration;
-	SVG_String *unicode_bidi;
-	SVG_String *word_spacing;
-	SVG_String *clip; 
-	SVG_String *cursor;
-	SVG_String *clip_path;
-	SVG_String *clip_rule;
-	SVG_String *mask;
-	SVG_String *enable_background;
-	SVG_String *filter;
-	SVG_String *flood_color;
-	SVG_String *flood_opacity;
-	SVG_String *lighting_color;
-	SVG_String *color_interpolation;
-	SVG_String *color_interpolation_filters;
-	SVG_String *color_profile;
-	SVG_String *marker;
-	SVG_String *marker_end;
-	SVG_String *marker_mid;
-	SVG_String *marker_start;
-	SVG_String *alignment_baseline;
-	SVG_String *baseline_shift;
-	SVG_String *dominant_baseline;
-	SVG_String *glyph_orientation_horizontal;
-	SVG_String *glyph_orientation_vertical;
-	SVG_String *kerning;
-	SVG_String *writing_mode;
-*/
+	/*
+		SVG_String *font;
+		SVG_String *font_size_adjust;
+		SVG_String *font_stretch;
+		SVG_String *direction;
+		SVG_String *letter_spacing;
+		SVG_String *text_decoration;
+		SVG_String *unicode_bidi;
+		SVG_String *word_spacing;
+		SVG_String *clip;
+		SVG_String *cursor;
+		SVG_String *clip_path;
+		SVG_String *clip_rule;
+		SVG_String *mask;
+		SVG_String *enable_background;
+		SVG_String *filter;
+		SVG_String *flood_color;
+		SVG_String *flood_opacity;
+		SVG_String *lighting_color;
+		SVG_String *color_interpolation;
+		SVG_String *color_interpolation_filters;
+		SVG_String *color_profile;
+		SVG_String *marker;
+		SVG_String *marker_end;
+		SVG_String *marker_mid;
+		SVG_String *marker_start;
+		SVG_String *alignment_baseline;
+		SVG_String *baseline_shift;
+		SVG_String *dominant_baseline;
+		SVG_String *glyph_orientation_horizontal;
+		SVG_String *glyph_orientation_vertical;
+		SVG_String *kerning;
+		SVG_String *writing_mode;
+	*/
 } SVGPropertiesPointers;
 
 /*************************************
@@ -606,8 +611,8 @@
 	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));
+void gf_smil_set_evaluation_callback(GF_Node *smil_time,
+                                     void (*smil_evaluate)(struct _smil_timing_rti *rti, Fixed normalized_simple_time, u32 state));
 
 void gf_smil_set_media_duration(SMIL_Timing_RTI *rti, Double media_duration);
 Double gf_smil_get_media_duration(SMIL_Timing_RTI *rti);
@@ -617,7 +622,7 @@
 void gf_smil_timing_modified(GF_Node *node, GF_FieldInfo *field);
 
 /*******************************************************************************
- * 
+ *
  *          SVG Scene Graph for dynamic allocation of attributes	           *
  *
  *******************************************************************************/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/scenegraph_vrml.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/scenegraph_vrml.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,10 +32,10 @@
 #endif
 
 #include <gpac/scenegraph.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 
 /*
-	All extensions for VRML/MPEG-4/X3D graph structure	
+	All extensions for VRML/MPEG-4/X3D graph structure
 */
 
 /*reserved NDT for MPEG4 (match binary coding)*/
@@ -60,7 +60,7 @@
 */
 
 /*
-				event types, as defined in the specs 
+				event types, as defined in the specs
 	this should not be needed by non binary codecs
 */
 enum
@@ -311,8 +311,8 @@
 	GF_SG_VRML_MFVEC2D,
 	GF_SG_VRML_MFVEC3D,
 
-	/*special event only used in routes for binding eventOut/exposedFields to script functions. 
-	 A route with ToField.FieldType set to this value holds a pointer to a function object. 
+	/*special event only used in routes for binding eventOut/exposedFields to script functions.
+	 A route with ToField.FieldType set to this value holds a pointer to a function object.
 	*/
 	GF_SG_VRML_SCRIPT_FUNCTION,
 
@@ -367,17 +367,17 @@
 
 
 
-/*VRML grouping nodes macro - note we have inverted the children field to be 
+/*VRML grouping nodes macro - note we have inverted the children field to be
 compatible with the base GF_ParentNode node
-All grouping nodes (with "children" field) implement the following: 
+All grouping nodes (with "children" field) implement the following:
 
 addChildren: chain containing nodes to add passed as eventIn - handled internally through ROUTE
-void (*on_addChildren)(GF_Node *pNode): add eventIn signaler - this is handled internally by the scene_graph and SHALL 
+void (*on_addChildren)(GF_Node *pNode): add feventIn signaler - this is handled internally by the scene_graph and SHALL
 NOT BE OVERRIDEN since it takes care of node(s) routing
 
 removeChildren: chain containing nodes to remove passed as eventIn - handled internally through ROUTE
 
-void (*on_removeChildren)(GF_Node *pNode): remove eventIn signaler - this is handled internally by the scene_graph and SHALL 
+void (*on_removeChildren)(GF_Node *pNode): remove eventIn signaler - this is handled internally by the scene_graph and SHALL
 NOT BE OVERRIDEN since it takes care of node(s) routing
 
 children: list of children SFNodes
@@ -389,7 +389,7 @@
 	void (*on_addChildren)(GF_Node *pNode, struct _route *route);		\
 	GF_ChildNodeItem *removeChildren;						\
 	void (*on_removeChildren)(GF_Node *pNode, struct _route *route);		\
-
+ 
 typedef struct
 {
 	BASE_NODE
@@ -407,7 +407,7 @@
 
 
 /*
-allocates a new field and gets it back. 
+allocates a new field and gets it back.
 	NOTE:
 			GF_SG_VRML_MFNODE will return a pointer to a GF_List structure (eg GF_List *)
 			GF_SG_VRML_SFNODE will return NULL
@@ -482,10 +482,10 @@
 	- routes are collected during eventOut generation
 	- routes are activated. If eventOuts are generated during activation the cycle goes on.
 
-  A route cannot be activated twice in the same simulation tick, hence this function shall be called 
+  A route cannot be activated twice in the same simulation tick, hence this function shall be called
   ONCE AND ONLY ONCE per simulation tick
 
-Note that children scene graphs register their routes with the top-level graph, so only the main 
+Note that children scene graphs register their routes with the top-level graph, so only the main
 scene graph needs to be activated*/
 void gf_sg_activate_routes(GF_SceneGraph *sg);
 
@@ -493,7 +493,7 @@
 /*
 				proto handling
 
-	The lib allows you to construct prototype nodes as defined in VRML/MPEG4 by constructing 
+	The lib allows you to construct prototype nodes as defined in VRML/MPEG4 by constructing
 	proto interfaces and instanciating them. An instanciated proto is handled as a single node for
 	rendering, thus an application will never handle proto instances for rendering
 */
@@ -556,11 +556,11 @@
 
 /*
 	NOTE on proto instances:
-		The proto instance is handled as an GF_Node outside the scenegraph lib, and is manipulated with the same functions 
-		as an GF_Node 
-		The proto instance may or may not be loaded. 
-		An unloaded instance only contains the proto instance fields 
-		A loaded instance contains the proto instance fields plus all the proto code (Nodes, routes) and 
+		The proto instance is handled as an GF_Node outside the scenegraph lib, and is manipulated with the same functions
+		as an GF_Node
+		The proto instance may or may not be loaded.
+		An unloaded instance only contains the proto instance fields
+		A loaded instance contains the proto instance fields plus all the proto code (Nodes, routes) and
 		will load any scripts present in it. This allows keeping the memory usage of proto very low, especially
 		when nested protos (protos used as building blocks of their parent proto) are used.
 */
@@ -658,6 +658,10 @@
 /*tags a hardcoded proto as being a grouping node*/
 GF_Err gf_node_proto_set_grouping(GF_Node *node);
 
+/*assigns callback to an eventIn field of an hardcoded proto*/
+GF_Err gf_node_set_proto_eventin_handler(GF_Node *node, u32 fieldIndex, void (*event_in_cbk)(GF_Node *pThis, struct _route *route) );
+
+
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn5178.tar.bz2/include/gpac/setup.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/setup.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/svg_types.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/svg_types.h Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,21 +35,21 @@
 
 
 
-/* Attributes in SVG can be accessed using a GF_FieldInfo structure 
+/* Attributes in SVG can be accessed using a GF_FieldInfo structure
    like it is done in the BIFS part of the implementation:
 
 	fieldIndex:		attribute tag to identify the attribute in the element in the case of dynamic alloc (default)
 	             or index of the attribute in the element in the case of static allocation of attributes
 
 	fieldType:		attribute data type as in the enumeration below
-	
+
 	name:			attribute name (WARNING: this may be NULL)
 
 	far_ptr:		pointer to the actual data with one of the type given in this file
 
 	NDTType:		unused in SVG
 	eventType:		unused in SVG
-	on_event_in:	unused in SVG 
+	on_event_in:	unused in SVG
 */
 
 /* SVG attribute types */
@@ -68,8 +68,8 @@
 	SVG_FontWeight_datatype,
 	SVG_FontVariant_datatype,
 	SVG_TextAnchor_datatype,
-	SVG_TransformType_datatype, 
-	SVG_Display_datatype, 
+	SVG_TransformType_datatype,
+	SVG_Display_datatype,
 	SVG_Visibility_datatype,
 	SVG_Overflow_datatype,
 	SVG_ZoomAndPan_datatype,
@@ -95,7 +95,7 @@
 	SMIL_Additive_datatype,
 	SMIL_Accumulate_datatype,
 	SMIL_Restart_datatype,
-	SMIL_Fill_datatype,	
+	SMIL_Fill_datatype,
 
 	SVG_LAST_U8_PROPERTY,
 
@@ -234,15 +234,15 @@
 	/* Type of timing value*/
 	u8 type;
 	/* in case of syncbase, event, repeat value: this is the pointer to the source of the event */
-	GF_Node *element; 
+	GF_Node *element;
 	/* id of the element before resolution of the pointer to the element */
-	char *element_id; 
+	char *element_id;
 	/* listener associated with event */
-	GF_Node *listener; 
+	GF_Node *listener;
 
 	/* event type and parameter */
-	XMLEV_Event event; 
-	/*set if event is 
+	XMLEV_Event event;
+	/*set if event is
 		begin rather than beginEvent,
 		end rather than endEvent,
 		repeat rather than repeatEvent */
@@ -274,7 +274,7 @@
 enum {
 	SMIL_FILL_FREEZE=0,
 	SMIL_FILL_REMOVE,
-	
+
 };
 typedef u8 SMIL_Fill;
 
@@ -302,13 +302,13 @@
 enum {
 	SMIL_ADDITIVE_REPLACE = 0,
 	SMIL_ADDITIVE_SUM
-}; 
+};
 typedef u8 SMIL_Additive;
 
 enum {
 	SMIL_ACCUMULATE_NONE = 0,
 	SMIL_ACCUMULATE_SUM
-}; 
+};
 typedef u8 SMIL_Accumulate;
 
 enum {
@@ -338,9 +338,9 @@
 
 enum
 {
-	SVG_FOCUS_AUTO = 0, 
-	SVG_FOCUS_SELF, 
-	SVG_FOCUS_IRI, 
+	SVG_FOCUS_AUTO = 0,
+	SVG_FOCUS_SELF,
+	SVG_FOCUS_IRI,
 };
 
 typedef struct
@@ -361,10 +361,10 @@
 
 enum {
 	SVG_FONTSTYLE_INHERIT = 0,
-	SVG_FONTSTYLE_ITALIC = 1,  
+	SVG_FONTSTYLE_ITALIC = 1,
 	SVG_FONTSTYLE_NORMAL = 2,
 	SVG_FONTSTYLE_OBLIQUE = 3
-}; 
+};
 typedef u8 SVG_FontStyle;
 
 /*the values are chosen to match LASeR code points*/
@@ -412,7 +412,7 @@
 	SVG_FILLRULE_INHERIT
 };
 typedef u8 SVG_FillRule;
-	
+
 enum {
 	SVG_STROKELINEJOIN_MITER = GF_LINE_JOIN_MITER_SVG,
 	SVG_STROKELINEJOIN_ROUND = GF_LINE_JOIN_ROUND,
@@ -510,11 +510,11 @@
 typedef struct {
 	u8 type;
 	Fixed value;
-} SVG_Number, 
-  SVG_FontSize, 
-  SVG_Length, 
-  SVG_Coordinate, 
-  SVG_Rotate;
+} SVG_Number,
+SVG_FontSize,
+SVG_Length,
+SVG_Coordinate,
+SVG_Rotate;
 
 typedef struct {
 	u8 is_ref;
@@ -530,22 +530,22 @@
 	SVG_TRANSFORM_SKEWY		= 5
 };
 
-typedef u8 SVG_TransformType; 
+typedef u8 SVG_TransformType;
 
 enum {
-	SVG_FONTWEIGHT_100 = 0, 
+	SVG_FONTWEIGHT_100 = 0,
 	SVG_FONTWEIGHT_200,
-	SVG_FONTWEIGHT_300, 
+	SVG_FONTWEIGHT_300,
 	SVG_FONTWEIGHT_400,
 	SVG_FONTWEIGHT_500,
 	SVG_FONTWEIGHT_600,
 	SVG_FONTWEIGHT_700,
 	SVG_FONTWEIGHT_800,
 	SVG_FONTWEIGHT_900,
-	SVG_FONTWEIGHT_BOLD, 
-	SVG_FONTWEIGHT_BOLDER, 
+	SVG_FONTWEIGHT_BOLD,
+	SVG_FONTWEIGHT_BOLDER,
 	SVG_FONTWEIGHT_INHERIT,
-	SVG_FONTWEIGHT_LIGHTER, 
+	SVG_FONTWEIGHT_LIGHTER,
 	SVG_FONTWEIGHT_NORMAL
 };
 typedef u8 SVG_FontWeight;
@@ -613,7 +613,7 @@
 typedef struct {
 	u32 count;
 	Fixed* vals;
-    u8 *units;
+	u8 *units;
 } UnitArray;
 
 typedef struct {
@@ -667,7 +667,7 @@
 	Bool defer;
 	u8 align;
 	u8 meetOrSlice;
-} SVG_PreserveAspectRatio; 
+} SVG_PreserveAspectRatio;
 
 enum {
 	SVG_ZOOMANDPAN_DISABLE = 0,
@@ -683,33 +683,33 @@
 };
 
 enum {
-    // textPath Method Types
+	// textPath Method Types
 	TEXTPATH_METHODTYPE_UNKNOWN   = 0,
 	TEXTPATH_METHODTYPE_ALIGN     = 1,
 	TEXTPATH_METHODTYPE_STRETCH     = 2
 };
 enum {
-    // textPath Spacing Types
+	// textPath Spacing Types
 	TEXTPATH_SPACINGTYPE_UNKNOWN   = 0,
 	TEXTPATH_SPACINGTYPE_AUTO     = 1,
 	TEXTPATH_SPACINGTYPE_EXACT     = 2
 };
 
 enum {
-    // Marker Unit Types
+	// Marker Unit Types
 	SVG_MARKERUNITS_UNKNOWN        = 0,
 	SVG_MARKERUNITS_USERSPACEONUSE = 1,
 	SVG_MARKERUNITS_STROKEWIDTH    = 2
 };
 enum {
-    // Marker Orientation Types
+	// Marker Orientation Types
 	SVG_MARKER_ORIENT_UNKNOWN      = 0,
 	SVG_MARKER_ORIENT_AUTO         = 1,
 	SVG_MARKER_ORIENT_ANGLE        = 2
 };
 
 enum {
-    // Spread Method Types
+	// Spread Method Types
 	SVG_SPREADMETHOD_UNKNOWN = 0,
 	SVG_SPREADMETHOD_PAD     = 1,
 	SVG_SPREADMETHOD_REFLECT = 2,
@@ -759,7 +759,7 @@
 enum {
 	XMLEVENT_DEFAULTACTION_CANCEL = 0,
 	XMLEVENT_DEFAULTACTION_PERFORM,
-	
+
 };
 typedef u8 XMLEV_DefaultAction;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/sync_layer.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/sync_layer.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-	
+
 /*the Sync Layer config descriptor*/
 typedef struct
 {
@@ -116,9 +116,12 @@
 	u32 saiz;
 	/*version_number are pushed from m2ts sections to the mpeg4sl layer so as to handle mpeg4 stream dependencies*/
 	u8 m2ts_version_number_plus_one;
+	//0: not mpeg-2 TS PCR, 1: MEPG-2 TS PCR, 2: MPEG-2 TS PCR with discontinuity
 	u8 m2ts_pcr;
 	/* HTML5 MSE Packet info */
 	s64 timeStampOffset;
+	//ntp at sender/producer side for this packet, 0 otherwise
+	u64 sender_ntp;
 } GF_SLHeader;

gpac-0.5.0.svn5178.tar.bz2/include/gpac/term_info.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/term_info.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,7 +34,7 @@
 #endif
 
 /*
-	OD Browsing API - YOU MUST INCLUDE <gpac/terminal.h> before 
+	OD Browsing API - YOU MUST INCLUDE <gpac/terminal.h> before
 	(this has been separated from terminal.h to limit dependency of core to mpeg4_odf.h header)
 	ALL ITEMS ARE READ-ONLY AND SHALL NOT BE MODIFIED
 */
@@ -57,6 +57,12 @@
 /*select given object when stream selection is available*/
 void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm);
 
+/*select service by given ID for multiplexed services (MPEG-2 TS)*/
+void gf_term_select_service(GF_Terminal *term, GF_ObjectManager *odm, u32 service_id);
+
+/*sets addon on or off (only one addon possible for now). When OFF , the associated service is shut down*/
+void gf_term_toggle_addons(GF_Terminal *term, Bool show_addons);
+
 typedef struct
 {
 	GF_ObjectDescriptor *od;
@@ -67,7 +73,7 @@
 	/*if set, the PL flags are valid*/
 	Bool has_profiles;
 	Bool inline_pl;
-	u8 OD_pl; 
+	u8 OD_pl;
 	u8 scene_pl;
 	u8 audio_pl;
 	u8 visual_pl;
@@ -88,6 +94,7 @@
 		>=0: amount of media data present in buffer, in ms
 	*/
 	s32 buffer;
+	u32 min_buffer, max_buffer;
 	/*number of AUs in DB (cumulated on all input channels)*/
 	u32 db_unit_count;
 	/*number of CUs in composition memory (if any) and CM capacity*/
@@ -109,7 +116,11 @@
 	u32 avg_bitrate, instant_bitrate, max_bitrate;
 	u32 nb_dec_frames, nb_droped;
 	u32 first_frame_time, last_frame_time;
-	u64 max_dec_time, total_dec_time;
+	u64 total_dec_time, irap_total_dec_time;
+	u32 max_dec_time, irap_max_dec_time;
+	u32 au_duration;
+	u32 nb_iraps;
+	s32 ntp_diff;
 
 	/*set if ISMACryp present on the object - will need refinement for IPMPX...
 	0: not protected - 1: protected and OK - 2: protected and DRM failed*/
@@ -124,7 +135,7 @@
 /*fills the GF_MediaInfo structure describing the OD manager*/
 GF_Err gf_term_get_object_info(GF_Terminal *term, GF_ObjectManager *odm, GF_MediaInfo *info);
 /*gets current downloads info for the service - only use if ODM owns thesrevice, returns 0 otherwise.
-	@d_enum: in/out current enum - shall start to 0, incremented at each call. fct returns 0 if no more 
+	@d_enum: in/out current enum - shall start to 0, incremented at each call. fct returns 0 if no more
 	downloads
 	@server: server name
 	@path: file/data location on server
@@ -141,11 +152,11 @@
 typedef struct __netinfocom NetInfoCommand;
 GF_Err gf_term_get_service_info(GF_Terminal *term, GF_ObjectManager *odm, NetInfoCommand *netcom);
 
-/*retrieves world info of the scene @od belongs to. 
+/*retrieves world info of the scene @od belongs to.
 If @odm is or points to an inlined OD the world info of the inlined content is retrieved
 If @odm is NULL the world info of the main scene is retrieved
 returns NULL if no WorldInfo available
-returns world title if available 
+returns world title if available
 @descriptions: any textual descriptions is stored here
   strings are not allocated
 */

gpac-0.5.0.svn5178.tar.bz2/include/gpac/terminal.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/terminal.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -47,12 +47,12 @@
 /*disconnects the url*/
 void gf_term_disconnect(GF_Terminal *term);
 /*navigates to a given destination or shutdown/restart the current one if any.
-This is the only safe way of restarting/jumping a presentation from inside the EventProc 
+This is the only safe way of restarting/jumping a presentation from inside the EventProc
 where doing a disconnect/connect could deadlock if toURL is NULL, uses the current URL*/
 void gf_term_navigate_to(GF_Terminal *term, const char *toURL);
-/*restarts url from given time (in ms). 
+/*restarts url from given time (in ms).
 @pause_at_first_frame: if 1, pauses at the first frame. If 2, pauses at the first frame only if the terminal is in paused state.
-Return value: 
+Return value:
 	0: service is not connected yet
 	1: service has no seeking capabilities
 	2: service has been seeked
@@ -67,9 +67,9 @@
 
 /*returns current framerate
 	if @absoluteFPS is set, the return value is the absolute framerate, eg NbFrameCount/NbTimeSpent regardless of
-whether a frame has been drawn or not, which means the FPS returned can be much greater than the target rendering 
+whether a frame has been drawn or not, which means the FPS returned can be much greater than the target rendering
 framerate
-	if @absoluteFPS is not set, the return value is the FPS taking into account not drawn frames (eg, less than 
+	if @absoluteFPS is not set, the return value is the FPS taking into account not drawn frames (eg, less than
 	or equal to compositor FPS)
 */
 Double gf_term_get_framerate(GF_Terminal *term, Bool absoluteFPS);
@@ -114,7 +114,7 @@
 void gf_term_set_speed(GF_Terminal *term, Fixed speed);
 
 /*sends a set of scene commands (BT, XMT, X3D, LASeR+XML) to the scene
-type indicates the language used - accepted values are 
+type indicates the language used - accepted values are
 	"model/x3d+xml" or "x3d": commands is an X3D+XML scene
 	"model/x3d+vrml" or  "xrdv": commands is an X3D+VRML scene
 	"model/vrml" or "vrml": commands is an VRML scene
@@ -133,7 +133,7 @@
 */
 GF_Err gf_term_set_size(GF_Terminal *term, u32 NewWidth, u32 NewHeight);
 
-/*returns current text selection if any, or NULL otherwise. If probe mode is set, returns a non-NULL string ("") 
+/*returns current text selection if any, or NULL otherwise. If probe mode is set, returns a non-NULL string ("")
 if some text is selected*/
 const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only);
 /*pastes text into current selection if any. If probe mode is set, only check if text is currently edited
@@ -141,7 +141,7 @@
 GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only);
 
 
-/*decodes pending media and render frame. 
+/*decodes pending media and render frame.
 NOTE: This can only be used when the terminal runs without visual thread (GF_TERM_NO_VISUAL_THREAD flag set)
 returns estimated time left until next frame should be drawn. If GF_TERM_NO_REGULATION is not set, the function will sleep
 for until next frame should be drawn before returning.
@@ -157,7 +157,7 @@
 /*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
 Bool gf_term_user_event(GF_Terminal *term, GF_Event *event);
 
-/*post extended user mouse interaction to terminal 
+/*post extended user mouse interaction to terminal
 	X and Y are point coordinates in the display expressed in 2D coord system top-left (0,0), Y increasing towards bottom
 	@xxx_but_down: specifiy whether the mouse button is down(2) or up (1), 0 if unchanged
 	@wheel: specifiy current wheel inc (0: unchanged , +1 for one wheel delta forward, -1 for one wheel delta backward)
@@ -165,7 +165,7 @@
 /*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
 void gf_term_mouse_input(GF_Terminal *term, GF_EventMouse *event);
 
-/*post extended user key interaction to terminal 
+/*post extended user key interaction to terminal
 	@key_code: GPAC DOM code of input key
 	@hw_code: hardware code of input key
 	@isKeyUp: set if key is released
@@ -173,7 +173,7 @@
 /*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
 Bool gf_term_keyboard_input(GF_Terminal *term, u32 key_code, u32 hw_code, Bool isKeyUp);
 
-/*post extended user character interaction to terminal 
+/*post extended user character interaction to terminal
 	@character: unicode character input
 */
 /*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/thread.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/thread.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -35,15 +35,15 @@
  *	\brief threading functions.
  */
 
- /*!
- *	\addtogroup thr_grp threading
- *	\ingroup utils_grp
- *	\brief Threading and Mutual Exclusion Functions
- *
- *This section documents the threading of the GPAC framework. These provide an easy way to implement
- *safe multithreaded tools.
- *	@{
- */
+/*!
+*	\addtogroup thr_grp threading
+*	\ingroup utils_grp
+*	\brief Threading and Mutual Exclusion Functions
+*
+*This section documents the threading of the GPAC framework. These provide an easy way to implement
+*safe multithreaded tools.
+*	@{
+*/
 
 #include <gpac/tools.h>
 
@@ -220,7 +220,7 @@
 /*
  *\brief get mutex number of locks
  *
- *Returns the number of locks on the mutex if the caller thread is holding the mutex. 
+ *Returns the number of locks on the mutex if the caller thread is holding the mutex.
  *\param mx the mutex object
  *\return -1 if the mutex is not hold by the calling thread, or the number of locks (possibly 0) otherwise.
  */

gpac-0.5.0.svn5178.tar.bz2/include/gpac/token.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/token.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,19 +35,19 @@
  *	\brief tokenizer functions.
  */
 
- /*!
- *	\addtogroup tok_grp tokenizer
- *	\ingroup utils_grp
- *	\brief String Tokenizer Functions
- *
- *This section documents the basic string tokenizer of the GPAC framework.
- *	@{
- */
+/*!
+*	\addtogroup tok_grp tokenizer
+*	\ingroup utils_grp
+*	\brief String Tokenizer Functions
+*
+*This section documents the basic string tokenizer of the GPAC framework.
+*	@{
+*/
 
 #include <gpac/tools.h>
 
 /*!
- *\brief get string component 
+ *\brief get string component
  *
  *Gets the next string component comprised in a given set of characters
  *\param Buffer source string to scan

gpac-0.5.0.svn5178.tar.bz2/include/gpac/tools.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/tools.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -454,7 +454,7 @@
  *	\brief Set log tools and levels
  *
  *	Set log tools and levels according to the log_tools_levels string. All previous log settings are discarded.
- *	\param log_tools_levels string specifying the tools and levels. It is formatted as logToolX\@logLevelX:logToolZ\@logLevelZ:... 
+ *	\param log_tools_levels string specifying the tools and levels. It is formatted as logToolX\@logLevelX:logToolZ\@logLevelZ:...
  *	\return GF_OK or GF_BAD_PARAM
 */
 GF_Err gf_log_set_tools_levels(const char *log_tools_levels);
@@ -463,7 +463,7 @@
  *	\brief Modify log tools and levels
  *
  *	Modify log tools and levels according to the log_tools_levels string. Previous log settings are kept.
- *	\param val string specifying the tools and levels. It is formatted as logToolX\@logLevelX:logToolZ\@logLevelZ:... 
+ *	\param val string specifying the tools and levels. It is formatted as logToolX\@logLevelX:logToolZ\@logLevelZ:...
  *	\return GF_OK or GF_BAD_PARAM
 */
 GF_Err gf_log_modify_tools_levels(const char *val);
@@ -518,6 +518,27 @@
 */
 void gf_get_user_name(char *buf, u32 buf_size);
 
+
+/*!\brief FileEnum info object
+ *
+ *The FileEnumInfo object is used to get file attributes upon enumeration of a directory.
+*/
+typedef struct
+{
+	/*!File is marked as hidden*/
+	Bool hidden;
+	/*!File is a directory*/
+	Bool directory;
+	/*!File is a drive mountpoint*/
+	Bool drive;
+	/*!File is a system file*/
+	Bool system;
+	/*!File size in bytes*/
+	u64 size;
+	/*!File last modif time in UTC seconds*/
+	u64 last_modified;
+} GF_FileEnumInfo;
+
 /*!
  *	\brief Directory Enumeration Callback
  *
@@ -525,10 +546,11 @@
  *	\param cbck Opaque user data.
  *	\param item_name File or directory name.
  *	\param item_path File or directory full path and name from filesystem root.
+ *	\param file_info information for the file or directory.
  *	\return 1 to abort enumeration, 0 to continue enumeration.
  *
  */
-typedef Bool (*gf_enum_dir_item)(void *cbck, char *item_name, char *item_path);
+typedef Bool (*gf_enum_dir_item)(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info);
 /*!
  *	\brief Directory enumeration
  *
@@ -664,6 +686,32 @@
  */
 void gf_sys_close();
 /*!
+ *	\brief System arguments
+ *
+ *	Sets the user app arguments (used by GUI mode)
+ *	\param argc Number of arguments
+ *	\param argv Array of arguments
+ */
+void gf_sys_set_args(s32 argc, const char **argv);
+
+/*!
+ *	\brief Get number of args
+ *
+ *	Gets the number of argument of the user application if any
+ *	\return number of argument of the user application
+ */
+u32 gf_sys_get_argc();
+
+/*!
+ *	\brief Get number of args
+ *
+ *	Gets the number of argument of the user application if any
+ *	\param arg Index of argument to retrieve
+ *	\return number of argument of the user application
+ */
+const char *gf_sys_get_arg(u32 arg);
+
+/*!
  *	\brief System clock query
  *
  *	Gets the system clock time.
@@ -720,7 +768,7 @@
  */
 u32 gf_crc_32(const char *data, u32 size);
 
-#ifdef _WIN32_WCE
+#ifdef WIN32
 /*!
  *	\brief WINCE time constant
  *	\hideinitializer
@@ -732,7 +780,7 @@
 #endif
 
 /*!
- *\brief gets UTC time in milliseconds 
+ *\brief gets UTC time in milliseconds
  *
  * Gets UTC clock in milliseconds
  * \return UTC time in milliseconds
@@ -740,10 +788,10 @@
 u64 gf_net_get_utc();
 
 /*!
- *\brief parses date and returns UTC value for this date. Date format is an XSD dateTime format or any of the supported formats from HTTP 1.1: 
-	Sun, 06 Nov 1994 08:49:37 GMT  ; RFC 822, updated by RFC 1123  
+ *\brief parses date and returns UTC value for this date. Date format is an XSD dateTime format or any of the supported formats from HTTP 1.1:
+	Sun, 06 Nov 1994 08:49:37 GMT  ; RFC 822, updated by RFC 1123
 	Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
-	Sun Nov  6 08:49:37 1994       ; ANSI C's asctime() formatgets UTC time in milliseconds 
+	Sun Nov  6 08:49:37 1994       ; ANSI C's asctime() formatgets UTC time in milliseconds
  *
  * \param date string containing the date to parse
  * \return UTC time in milliseconds
@@ -751,7 +799,7 @@
 u64 gf_net_parse_date(const char *date);
 
 /*!
- *\brief gets timezone adjustment in seconds 
+ *\brief gets timezone adjustment in seconds
  *
  * Gets timezone adjustment in seconds, with localtime - timezone = UTC time
  * \return timezone shift in seconds
@@ -759,9 +807,9 @@
 s32 gf_net_get_timezone();
 
 /*!
- *\brief parses 128 bit from string 
+ *\brief parses 128 bit from string
  *
- * Parses 128 bit from string 
+ * Parses 128 bit from string
  *
  * \param string the string containing the value in hexa. Non alphanum characters are skipped
  * \param value the value parsed
@@ -879,7 +927,7 @@
 GF_Err gf_gz_compress_payload(char **data, u32 data_len, u32 *out_size);
 
 /**
- * Decompresses a data buffer using zlib. 
+ * Decompresses a data buffer using zlib.
  * \param data data buffer to be decompressed
  * \param data_len length of the data buffer to be decompressed
  * \param uncompressed_data pointer to the uncompressed data buffer. It is the responsibility of the caller to free this buffer.
@@ -892,23 +940,25 @@
 /*SHA1*/
 typedef struct __sha1_context GF_SHA1Context;
 
+#define GF_SHA1_DIGEST_SIZE		20
+#define GF_SHA1_DIGEST_SIZE_HEXA		41
 /*
  * Core SHA-1 functions
  */
 GF_SHA1Context *gf_sha1_starts();
 void gf_sha1_update(GF_SHA1Context *ctx, u8 *input, u32 length);
-void gf_sha1_finish(GF_SHA1Context *ctx, u8 digest[20] );
+void gf_sha1_finish(GF_SHA1Context *ctx, u8 digest[GF_SHA1_DIGEST_SIZE] );
 
 /*
  * Output SHA-1(file contents), returns 0 if successful.
  */
-int gf_sha1_file(const char *filename, u8 digest[20]);
+int gf_sha1_file(const char *filename, u8 digest[GF_SHA1_DIGEST_SIZE]);
 
 /*
  * Output SHA-1(buf)
  */
-void gf_sha1_csum(u8 *buf, u32 buflen, u8 digest[20]);
-void gf_sha1_csum_hexa(u8 *buf, u32 buflen, u8 digest[41]);
+void gf_sha1_csum(u8 *buf, u32 buflen, u8 digest[GF_SHA1_DIGEST_SIZE]);
+void gf_sha1_csum_hexa(u8 *buf, u32 buflen, u8 digest[GF_SHA1_DIGEST_SIZE_HEXA]);
 
 #ifdef GPAC_ANDROID
 typedef void (*fm_callback_func)(void *cbk_obj, u32 type, u32 param, int *value);

gpac-0.5.0.svn5178.tar.bz2/include/gpac/unicode.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/unicode.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -31,8 +31,8 @@
 #endif
 
 /*!
- *	\file <gpac/math.h>
- *	\brief math and trigo functions.
+ *	\file <gpac/unicode.h>
+ *	\brief Unicode conversion functions.
  */
 
 #include <gpac/setup.h>
@@ -45,7 +45,7 @@
  * \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

gpac-0.5.0.svn5178.tar.bz2/include/gpac/user.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/user.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,14 +32,13 @@
 extern "C" {
 #endif
 
-//#include <gpac/math.h>
 #include <gpac/events.h>
 #include <gpac/module.h>
 
 /*GPAC client terminal*/
 typedef struct _tag_terminal GF_Terminal;
 typedef struct _tag_user GF_User;
-	
+
 
 enum
 {
@@ -47,14 +46,14 @@
 	GF_TERM_INIT_HIDE = 1,
 	/*no audio renderer will be created*/
 	GF_TERM_NO_AUDIO = 1<<1,
-	/*terminal is used without visual threading: 
+	/*terminal is used without visual threading:
 		* media codecs are not threaded
 		* all composition memories are filled before rendering
 		* rendering is done after media decoding
 		* the user is responsible for updating the terminal
 	*/
 	GF_TERM_NO_DECODER_THREAD = 1<<2,
-	
+
 	/*works with no visual thread for the composition - compositor is driven by the media manager
 		if GF_TERM_NO_DECODER_THREAD, equivalent to GF_TERM_NO_COMPOSITOR_THREAD
 	*/
@@ -91,7 +90,7 @@
 	GF_Config *config;
 	/*modules manager - cannot be NULL - owned by the user (to allow selection of module directory)*/
 	GF_ModuleManager *modules;
-	/*optional os window handler (HWND on win32/winCE, XWindow for X11) 
+	/*optional os window handler (HWND on win32/winCE, XWindow for X11)
 	if not set the video outut will create and manage the display window.*/
 	void *os_window_handler;
 	/*for now, only used by X11 (indicates display the window is on)*/

gpac-0.5.0.svn5178.tar.bz2/include/gpac/utf.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/utf.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -63,7 +63,7 @@
 /*!
  *\brief multibyte to wide-char conversion
  *
- *Converts a multibyte string to a wide-char string 
+ *Converts a multibyte string to a wide-char string
  *\param dst wide-char destination buffer
  *\param dst_len wide-char destination buffer size
  *\param srcp address of the multibyte character buffer. This will be set to the next char to be converted in the input buffer if not enough space in the destination, or NULL if conversion was completed.

gpac-0.5.0.svn5178.tar.bz2/include/gpac/version.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/version.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/webvtt.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/webvtt.h Changed

@@ -5,7 +5,7 @@
  *			Copyright (c) Telecom ParisTech 2013-
  *					All rights reserved
  *
- *  This file is part of GPAC / WebVTT header 
+ *  This file is part of GPAC / WebVTT header
  *
  *  GPAC is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -32,14 +32,15 @@
 
 /* WebVTT types */
 typedef enum {
-    WEBVTT_ID,
-    WEBVTT_SETTINGS,
-    WEBVTT_PAYLOAD,
-    WEBVTT_TIME
+	WEBVTT_ID,
+	WEBVTT_SETTINGS,
+	WEBVTT_PAYLOAD,
+	WEBVTT_POSTCUE_TEXT,
+	WEBVTT_PRECUE_TEXT,
 } GF_WebVTTCuePropertyType;
 
 typedef struct _webvtt_timestamp {
-    u32 hour, min, sec, ms;
+	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);
@@ -47,17 +48,18 @@
 
 typedef struct _webvtt_cue
 {
-    GF_WebVTTTimestamp start;
-    GF_WebVTTTimestamp end;
-    char *id;
-    char *settings;
-    char *text;
-    char *time;
+	GF_WebVTTTimestamp start;
+	GF_WebVTTTimestamp end;
+	char *id;
+	char *settings;
+	char *text;
+	char *pre_text;
+	char *post_text;
 
-    Bool split;
-    /* original times before split, if applicable */
-    GF_WebVTTTimestamp orig_start;
-    GF_WebVTTTimestamp orig_end;
+	Bool split;
+	/* original times before split, if applicable */
+	GF_WebVTTTimestamp orig_start;
+	GF_WebVTTTimestamp orig_end;
 } GF_WebVTTCue;
 
 void gf_webvtt_cue_del(GF_WebVTTCue * cue);
@@ -67,10 +69,10 @@
 #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_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

gpac-0.5.0.svn5178.tar.bz2/include/gpac/xml.h -> gpac-0.5.1.svn5491.tar.xz/include/gpac/xml.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -94,10 +94,10 @@
 typedef	void (*gf_xml_sax_progress)(void *cbck, u64 done, u64 tot);
 
 /*creates new sax parser - all callbacks are optionals*/
-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);
+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 */
 void gf_xml_sax_del(GF_SAXParser *parser);
@@ -106,7 +106,7 @@
 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)*/
 GF_Err gf_xml_sax_parse(GF_SAXParser *parser, const void *string_bytes);
-/*suspends/resume sax parsing. 
+/*suspends/resume 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
 */
@@ -141,6 +141,10 @@
 const char *gf_xml_dom_get_error(GF_DOMParser *parser);
 u32 gf_xml_dom_get_line(GF_DOMParser *parser);
 
+u32 gf_xml_dom_get_root_nodes_count(GF_DOMParser *parser);
+GF_XMLNode *gf_xml_dom_get_root_idx(GF_DOMParser *parser, u32 idx);
+
+
 /*
  *\brief Serialize a node
  *
@@ -155,7 +159,7 @@
 /*
  *\brief Create the root element of the DOM
  *
- * Create the root element -- the only top level element -- of the document. 
+ * 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;
@@ -165,7 +169,7 @@
 /*
  *\brief Get the root element of the DOM
  *
- * Get the root element -- the only top level element -- of the document. 
+ * 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;
@@ -217,6 +221,18 @@
 GF_Err gf_xml_dom_append_child(GF_XMLNode *node, GF_XMLNode *child);
 
 /*
+ *\brief Removes the node to the list of children of this node.
+ *
+ * Removes the node to the list of children of this node.
+ * 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
+ */
+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.
@@ -240,8 +256,8 @@
  *\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 
+ *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
@@ -249,8 +265,8 @@
  *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 
+ *data64: value gives data coded as base64
+ *data: value gives data coded in hexa
  *
  *
  *

gpac-0.5.0.svn5178.tar.bz2/include/win32/inttypes.h -> gpac-0.5.1.svn5491.tar.xz/include/win32/inttypes.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/Makefile -> gpac-0.5.1.svn5491.tar.xz/modules/Makefile Changed

gpac-0.5.0.svn5178.tar.bz2/modules/aac_in/aac_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/aac_in/aac_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -92,28 +92,28 @@
 
 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_term_register_mime_type( plug, AAC_MIMES[i], AAC_EXTENSIONS, AAC_DESC);
-    return i;
+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 0;
+	if (!plug || !url)
+		return 0;
 	sExt = strrchr(url, '.');
 	if (!strnicmp(url, "rtsp://", 7)) return 0;
 	{
-	    int i;
-	    for (i = 0 ; AAC_MIMES[i] ; i++)
-	      if (gf_term_check_extension(plug, AAC_MIMES[i], AAC_EXTENSIONS, AAC_DESC, sExt))
-		return 1;
+		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 1;
 	}
 	return 0;
 }
@@ -127,7 +127,7 @@
 
 	esd = gf_odf_desc_esd_new(0);
 	if (!esd)
-	  return NULL;
+		return NULL;
 	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
 	esd->decoderConfig->objectTypeIndication = read->oti;
 	esd->ESID = 1;
@@ -176,7 +176,7 @@
 	esd->OCRESID = 0;
 	gf_list_add(od->ESDescriptors, esd);
 
-	gf_term_add_media(read->service, (GF_Descriptor*)od, 0);
+	gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
 }
 #endif
 
@@ -244,7 +244,7 @@
 	Bool sync;
 	GF_BitStream *bs;
 	ADTSHeader hdr;
-        if (!read || !read->stream) return 0;
+	if (!read || !read->stream) return 0;
 	bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
 
 	sync = ADTS_SyncFrame(bs, !read->is_remote, &hdr);
@@ -277,13 +277,13 @@
 static void AAC_RegulateDataRate(AACReader *read)
 {
 	GF_NetworkCommand com;
-        if (!read)
-          return;
+	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_term_on_command(read->service, &com, GF_OK);
+		gf_service_command(read->service, &com, GF_OK);
 		if (com.buffer.occupancy < com.buffer.max) break;
 		gf_sleep(2);
 	}
@@ -315,7 +315,7 @@
 		read->is_live = 1;
 		memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
 #ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_term_on_connect(read->service, NULL, GF_OK);
+		gf_service_connect_ack(read->service, NULL, GF_OK);
 		AAC_SetupObject(read);
 #endif
 	}
@@ -336,7 +336,7 @@
 		read->sl_hdr.compositionTimeStampFlag = 1;
 		read->sl_hdr.compositionTimeStamp += 1024;
 #ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_term_on_sl_packet(read->service, read->ch, read->data + pos, hdr.frame_size, &read->sl_hdr, GF_OK);
+		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
@@ -350,12 +350,12 @@
 			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); 
+			time(&now);
 			now += (s32)hybrid_delay;
 			now_tm = gmtime(&now);
 			{
@@ -364,12 +364,12 @@
 				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.map_time.reset_buffers = 0;
 				com.base.on_channel = read->ch;
-				gf_term_on_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));
+				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;
@@ -399,17 +399,17 @@
 
 static void AAC_disconnect_from_http_and_free(AACReader * read)
 {
-  if (!read)
-    return;
-  if (read->dnload){
-    gf_dm_sess_abort(read->dnload);
+	if (!read)
+		return;
+	if (read->dnload) {
+		gf_dm_sess_abort(read->dnload);
 #ifdef DONT_USE_TERMINAL_MODULE_API
-    gf_dm_sess_del( read->dnload);
+		gf_dm_sess_del( read->dnload);
 #else
-    gf_term_download_del(read->dnload);
+		gf_service_download_del(read->dnload);
 #endif /* DONT_USE_TERMINAL_MODULE_API */
-  }
-  read->dnload = NULL;
+	}
+	read->dnload = NULL;
 }
 
 void AAC_NetIO(void *cbk, GF_NETIO_Parameter *param)
@@ -451,10 +451,10 @@
 
 				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 (!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;
@@ -463,14 +463,14 @@
 			}
 #ifndef DONT_USE_TERMINAL_MODULE_API
 			com.base.command_type = GF_NET_SERVICE_INFO;
-			gf_term_on_command(read->service, &com, GF_OK);
+			gf_service_command(read->service, &com, GF_OK);
 #endif
 		}
 		return;
 	} else {
 		/*handle service message*/
 #ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_term_download_update_stats(read->dnload);
+		gf_service_download_update_stats(read->dnload);
 #endif
 		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) return;
 	}
@@ -516,7 +516,7 @@
 	if (read->needs_connection) {
 		read->needs_connection = 0;
 #ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_term_on_connect(read->service, NULL, e);
+		gf_service_connect_ack(read->service, NULL, e);
 		if (!e) AAC_SetupObject(read);
 #endif
 	}
@@ -527,21 +527,21 @@
 	read->needs_connection = 1;
 	AAC_disconnect_from_http_and_free(read);
 #ifndef DONT_USE_TERMINAL_MODULE_API
-	read->dnload = gf_term_download_new(read->service, url, 0, AAC_NetIO, read);
+	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);
+		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_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 #endif
 	}
 
@@ -555,33 +555,33 @@
 
 static void AAC_Reader_del(AACReader * read)
 {
-  if (!read)
-    return;
-  AAC_disconnect_from_http_and_free(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;
+	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)
-    fclose(read->stream);
-  if (read->data)
-    gf_free(read->data);
-  read->data = NULL;
-  read->stream = NULL;
+	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)
+		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 );
+	gf_free( read );
 #endif
 }
 
-static AACReader * AAC_Reader_new(){
+static AACReader * AAC_Reader_new() {
 	AACReader *reader = gf_malloc(sizeof(AACReader));
 	memset(reader, 0, sizeof(AACReader));
 	return reader;
@@ -633,7 +633,7 @@
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
 	}
-	gf_term_on_connect(serv, NULL, reply);
+	gf_service_connect_ack(serv, NULL, reply);
 	if (!reply && read->is_inline ) AAC_SetupObject(read);
 	return GF_OK;
 }
@@ -641,12 +641,12 @@
 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_term_on_disconnect(read->service, NULL, GF_OK);
+	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;
@@ -683,9 +683,9 @@
 
 	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;
-        }
+		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")) {
@@ -700,7 +700,7 @@
 	}
 
 exit:
-	gf_term_on_connect(read->service, channel, e);
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -713,11 +713,11 @@
 		AAC_disconnect_from_http_and_free(read);
 		read->ch = NULL;
 		if (read->data)
-		  gf_free(read->data);
+			gf_free(read->data);
 		read->data = NULL;
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(read->service, channel, e);
+	gf_service_disconnect_ack(read->service, channel, e);
 	return GF_OK;
 }
 
@@ -774,7 +774,7 @@
 					rcfg.base.command_type = GF_NET_CHAN_DURATION;
 					rcfg.duration.duration = read->duration;
 					rcfg.duration.duration /= read->sample_rate;
-					gf_term_on_command(read->service, &rcfg, GF_OK);
+					gf_service_command(read->service, &rcfg, GF_OK);
 				}
 			}
 		}
@@ -830,9 +830,9 @@
 				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
-					) {
+					if ((read->input->query_proxy(read->input, &param)==GF_OK)
+					        && param.url_query.next_url
+					   ) {
 						fclose(read->stream);
 						read->stream = gf_f64_open(param.url_query.next_url, "rb");
 						*out_reception_status = GF_OK;
@@ -919,15 +919,15 @@
 
 void AAC_Delete(void *ifce)
 {
-        AACReader *read;
+	AACReader *read;
 	GF_InputService *plug = (GF_InputService *) ifce;
-        if (!plug)
-          return;
+	if (!plug)
+		return;
 	read = plug->priv;
-        if (read){
-          AAC_Reader_del(read);
-          plug->priv = NULL;
-        }
+	if (read) {
+		AAC_Reader_del(read);
+		plug->priv = NULL;
+	}
 	gf_free(plug);
 }
 
@@ -940,12 +940,12 @@
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
-	#ifndef GPAC_DISABLE_AV_PARSERS
+#ifndef GPAC_DISABLE_AV_PARSERS
 		GF_NET_CLIENT_INTERFACE,
-	#endif
-	#ifdef GPAC_HAS_FAAD
+#endif
+#ifdef GPAC_HAS_FAAD
 		GF_MEDIA_DECODER_INTERFACE,
-	#endif
+#endif
 		0
 	};
 
@@ -986,6 +986,6 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( aac_in )
+GPAC_MODULE_STATIC_DECLARATION( aac_in )
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/aac_in/faad_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/aac_in/faad_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -54,8 +54,9 @@
 	u16 ES_ID;
 	Bool signal_mc;
 	Bool is_sbr;
-	
+
 	char ch_reorder[16];
+	GF_ESD *esd;
 } FAADDec;
 
 
@@ -68,11 +69,14 @@
 	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;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Attaching stream %d\n", esd->ESID));
+	if (!ctx->esd) {
+		ctx->esd = esd;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Attaching stream %d\n", esd->ESID));
+	}
 
 	if (ctx->codec) faacDecClose(ctx->codec);
 	ctx->codec = faacDecOpen();
@@ -85,34 +89,34 @@
 	e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
 	if (e) return e;
 #endif
-	if (faacDecInit2(ctx->codec, (unsigned char *)esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, (unsigned long*)&ctx->sample_rate, (u8*)&ctx->num_channels) < 0) 
+	if (faacDecInit2(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;
+		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 = 0;
@@ -121,7 +125,7 @@
 		gf_m4a_write_config(&a_cfg, &dsi, &dsi_len);
 		res = faacDecInit2(ctx->codec, (unsigned char *) dsi, dsi_len, (unsigned long *) &ctx->sample_rate, (u8 *) &ctx->num_channels);
 		gf_free(dsi);
-		if (res < 0) 
+		if (res < 0)
 #endif
 		{
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FAAD] Error when initializing AAC decoder for stream %d\n", esd->ESID));
@@ -189,16 +193,35 @@
 		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;
+			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;
@@ -219,25 +242,43 @@
 	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;
+		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,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -265,8 +306,10 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Decoding AU\n"));
 	buffer = faacDecDecode(ctx->codec, &ctx->info, (unsigned char *) inBuffer, inBufferLength);
 	if (ctx->info.error>0) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Error decoding AU %s\n", faacDecGetErrorMessage(ctx->info.error) ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FAAD] Error decoding AU %s\n", faacDecGetErrorMessage(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) {
@@ -286,34 +329,61 @@
 
 		/*get cfg*/
 		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_FRONT_LEFT);
-		if (ch>=0) { ctx->ch_reorder[idx] = ch; idx++; }
+		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++; }
+		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++; }
+		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++; }
+		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++; }
+		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++; }
+		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++; }
+		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++; }
+		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++; }
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
 
 		*outBufferLength = ctx->out_size;
 		if (sizeof(short) * ctx->info.samples > *outBufferLength) {
-			*outBufferLength = ctx->out_size = sizeof(short)*ctx->info.samples; 
+			*outBufferLength = ctx->out_size = sizeof(short)*ctx->info.samples;
 		}
 		return GF_BUFFER_TOO_SMALL;
 	}
 	if (sizeof(short) * ctx->info.samples > *outBufferLength) {
-		*outBufferLength = sizeof(short)*ctx->info.samples; 
+		*outBufferLength = sizeof(short)*ctx->info.samples;
 		return GF_BUFFER_TOO_SMALL;
-	} 
+	}
 
 	/*we assume left/right order*/
 	if (ctx->num_channels<=2) {
@@ -345,7 +415,7 @@
 	GF_M4ADecSpecInfo a_cfg;
 #endif
 
-	/*audio decs*/	
+	/*audio decs*/
 	if (StreamType != GF_STREAM_AUDIO) return GF_CODEC_NOT_SUPPORTED;
 	/*media type query*/
 	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
@@ -356,7 +426,7 @@
 	case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
 	case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
 	/*MPEG4 aac*/
-	case GPAC_OTI_AUDIO_AAC_MPEG4: 
+	case GPAC_OTI_AUDIO_AAC_MPEG4:
 		break;
 	default:
 		return GF_CODEC_NOT_SUPPORTED;
@@ -398,7 +468,7 @@
 
 	ifce->privateStack = dec;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifce->AttachStream = FAAD_AttachStream;
 	ifce->DetachStream = FAAD_DetachStream;
 	ifce->GetCapabilities = FAAD_GetCapabilities;

gpac-0.5.0.svn5178.tar.bz2/modules/ac3_in/ac3_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/ac3_in/ac3_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include <gpac/modules/service.h>
@@ -35,7 +35,7 @@
 	GF_ClientService *service;
 
 	Bool is_remote;
-	
+
 	FILE *stream;
 	u32 duration;
 
@@ -72,10 +72,10 @@
 
 static u32 AC3_RegisterMimeTypes(const GF_InputService *plug)
 {
-    u32 i;
-    for (i = 0 ; AC3_MIMES[i]; i++)
-      gf_term_register_mime_type(plug, AC3_MIMES[i], AC3_EXTS, AC3_DESC);
-    return i;
+	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)
@@ -83,8 +83,8 @@
 	char *sExt;
 	u32 i;
 	sExt = strrchr(url, '.');
-	for (i = 0 ; AC3_MIMES[i]; i++){
-	  if (gf_term_check_extension(plug, AC3_MIMES[i], AC3_EXTS, AC3_DESC, sExt)) return 1;
+	for (i = 0 ; AC3_MIMES[i]; i++) {
+		if (gf_service_check_mime_register(plug, AC3_MIMES[i], AC3_EXTS, AC3_DESC, sExt)) return 1;
 	}
 	return 0;
 }
@@ -117,7 +117,7 @@
 	esd = AC3_GetESD(read);
 	esd->OCRESID = 0;
 	gf_list_add(od->ESDescriptors, esd);
-	gf_term_add_media(read->service, (GF_Descriptor*)od, 0);
+	gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
 }
 
 
@@ -126,23 +126,24 @@
 	Bool sync;
 	GF_BitStream *bs;
 	GF_AC3Header hdr;
+	memset(&hdr, 0, sizeof(GF_AC3Header));
 	if (!read->stream) return 0;
 	bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
 
-	
-	sync = gf_ac3_parser_bs(bs, &hdr, 1);
+
+	sync = gf_ac3_parser_bs(bs, &hdr, GF_TRUE);
 	if (!sync) {
 		gf_bs_del(bs);
-		return 0;
+		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, 0)) {
+		while (gf_ac3_parser_bs(bs, &hdr, GF_FALSE)) {
 			read->duration += 1536;
 			gf_bs_skip_bytes(bs, hdr.framesize);
 		}
@@ -160,7 +161,7 @@
 	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
 	com.base.on_channel = read->ch;
 	while (read->ch) {
-		gf_term_on_command(read->service, &com, GF_OK);
+		gf_service_command(read->service, &com, GF_OK);
 		if (com.buffer.occupancy < com.buffer.max) break;
 		gf_sleep(2);
 	}
@@ -172,7 +173,9 @@
 	Bool sync;
 	GF_BitStream *bs;
 	GF_AC3Header hdr;
-	
+
+	memset(&hdr, 0, sizeof(GF_AC3Header));
+
 	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;
@@ -180,14 +183,14 @@
 	if (read->needs_connection) {
 		read->needs_connection = 0;
 		bs = gf_bs_new((char *) read->data, read->data_size, GF_BITSTREAM_READ);
-		sync = gf_ac3_parser_bs(bs, &hdr, 1);
+		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 = 1;
 		memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-		gf_term_on_connect(read->service, NULL, GF_OK);
+		gf_service_connect_ack(read->service, NULL, GF_OK);
 		AC3_SetupObject(read);
 	}
 	if (!read->ch) return;
@@ -198,14 +201,14 @@
 	bs = gf_bs_new((char *) read->data, read->data_size, GF_BITSTREAM_READ);
 	hdr.framesize = 0;
 	pos = 0;
-	while (gf_ac3_parser_bs(bs, &hdr, 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_term_on_sl_packet(read->service, read->ch, (char *) read->data + pos, hdr.framesize, &read->sl_hdr, GF_OK);
+		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);
 	}
 
@@ -257,7 +260,7 @@
 			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);
 				}
@@ -267,12 +270,12 @@
 			}
 
 			com.base.command_type = GF_NET_SERVICE_INFO;
-			gf_term_on_command(read->service, &com, GF_OK);
+			gf_service_command(read->service, &com, GF_OK);
 		}
 		return;
 	} else {
 		/*handle service message*/
-		gf_term_download_update_stats(read->dnload);
+		gf_service_download_update_stats(read->dnload);
 		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) return;
 	}
 
@@ -316,7 +319,7 @@
 	/*OK confirm*/
 	if (read->needs_connection) {
 		read->needs_connection = 0;
-		gf_term_on_connect(read->service, NULL, e);
+		gf_service_connect_ack(read->service, NULL, e);
 		if (!e) AC3_SetupObject(read);
 	}
 }
@@ -327,10 +330,10 @@
 
 	read->needs_connection = 1;
 
-	read->dnload = gf_term_download_new(read->service, url, 0, AC3_NetIO, read);
+	read->dnload = gf_service_download_new(read->service, url, 0, AC3_NetIO, read);
 	if (!read->dnload ) {
 		read->needs_connection = 0;
-		gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(read->dnload);
@@ -347,7 +350,7 @@
 	AC3Reader *read = plug->priv;
 	read->service = serv;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	strcpy(szURL, url);
@@ -370,7 +373,7 @@
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
 	}
-	gf_term_on_connect(serv, NULL, reply);
+	gf_service_connect_ack(serv, NULL, reply);
 	if (!reply && read->is_inline ) AC3_SetupObject(read);
 	return GF_OK;
 }
@@ -380,12 +383,12 @@
 	AC3Reader *read = plug->priv;
 	if (read->stream) fclose(read->stream);
 	read->stream = NULL;
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	if (read->data) gf_free(read->data);
 	read->data = NULL;
-	gf_term_on_disconnect(read->service, NULL, GF_OK);
+	gf_service_disconnect_ack(read->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -434,7 +437,7 @@
 	}
 
 exit:
-	gf_term_on_connect(read->service, channel, e);
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -449,7 +452,7 @@
 		read->data = NULL;
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(read->service, channel, e);
+	gf_service_disconnect_ack(read->service, channel, e);
 	return GF_OK;
 }
 
@@ -495,8 +498,8 @@
 		read->current_time = 0;
 		if (read->stream) gf_f64_seek(read->stream, 0, SEEK_SET);
 
-		if (read->ch == com->base.on_channel) { 
-			read->done = 0; 
+		if (read->ch == com->base.on_channel) {
+			read->done = 0;
 			/*PLAY after complete download, estimate duration*/
 			if (!read->is_remote && !read->duration) {
 				AC3_ConfigureFromFile(read);
@@ -506,7 +509,7 @@
 					rcfg.base.command_type = GF_NET_CHAN_DURATION;
 					rcfg.duration.duration = read->duration;
 					rcfg.duration.duration /= read->sample_rate;
-					gf_term_on_command(read->service, &rcfg, GF_OK);
+					gf_service_command(read->service, &rcfg, GF_OK);
 				}
 			}
 		}
@@ -530,6 +533,7 @@
 	*out_reception_status = GF_OK;
 	*sl_compressed = 0;
 	*is_new_data = 0;
+	memset(&hdr, 0, sizeof(GF_AC3Header));
 
 	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
 	read->sl_hdr.randomAccessPointFlag = 1;
@@ -554,7 +558,7 @@
 
 fetch_next:
 		pos = gf_f64_tell(read->stream);
-		sync = gf_ac3_parser_bs(bs, &hdr, 0);
+		sync = gf_ac3_parser_bs(bs, &hdr, GF_FALSE);
 		if (!sync) {
 			gf_bs_del(bs);
 			if (!read->dnload) {
@@ -585,7 +589,7 @@
 				read->start_range = 0;
 			}
 		}
-		
+
 		read->sl_hdr.compositionTimeStamp = read->current_time;
 
 		read->data = gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
@@ -654,23 +658,23 @@
 #endif
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
-static u32 si [] = {
+	static u32 si [] = {
 #ifndef GPAC_DISABLE_AV_PARSERS
-	GF_NET_CLIENT_INTERFACE,
+		GF_NET_CLIENT_INTERFACE,
 #endif
 #ifdef GPAC_HAS_LIBA52
-	GF_MEDIA_DECODER_INTERFACE,
+		GF_MEDIA_DECODER_INTERFACE,
 #endif
-	0
-};
+		0
+	};
 
 	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if (InterfaceType == GF_NET_CLIENT_INTERFACE) return (GF_BaseInterface *)AC3_Load();
@@ -698,4 +702,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( ac3 )
+GPAC_MODULE_STATIC_DECLARATION( ac3 )

gpac-0.5.0.svn5178.tar.bz2/modules/ac3_in/liba52_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/ac3_in/liba52_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -49,7 +49,7 @@
 typedef struct
 {
 	a52_state_t *codec;
-    sample_t* samples;
+	sample_t* samples;
 
 	u32 sample_rate, num_samples, out_size, flags;
 	u8 num_channels;
@@ -76,7 +76,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[A52] Error initializing decoder\n"));
 		return GF_IO_ERR;
 	}
-    ctx->samples = a52_samples(ctx->codec);
+	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"));
@@ -187,15 +187,33 @@
 	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;
+		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;
@@ -205,39 +223,39 @@
 /**** 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;
+	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]);
-    }
+	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
+	2, 1, 2, 3, 3, 4, 4, 5
 };
 
 static GF_Err AC3_ProcessData(GF_MediaDecoder *ifcg,
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+                              char *inBuffer, u32 inBufferLength,
+                              u16 ES_ID, u32 *CTS,
+                              char *outBuffer, u32 *outBufferLength,
+                              u8 PaddingBits, u32 mmlevel)
 {
-    short *out_samples;
+	short *out_samples;
 	int i, len, bit_rate;
 	sample_t level;
 	A52CTX();
@@ -339,16 +357,16 @@
 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;
-        }
+	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);
 }

gpac-0.5.0.svn5178.tar.bz2/modules/alsa/alsa.c -> gpac-0.5.1.svn5491.tar.xz/modules/alsa/alsa.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -28,11 +28,11 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <poll.h>
-#include <alsa/asoundlib.h>	      
+#include <alsa/asoundlib.h>
 #include <gpac/modules/audio_out.h>
 
 
-typedef struct 
+typedef struct
 {
 	snd_pcm_t *playback_handle;
 	u32 nb_ch, buf_size, delay, num_buffers, total_duration, block_align;
@@ -47,7 +47,7 @@
 	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);
@@ -180,7 +180,7 @@
 	ctx->buf_size *= ctx->block_align;
 	/*get period time*/
 	snd_pcm_hw_params_get_period_time(hw_params, &period_time, 0);
-	
+
 	err = snd_pcm_hw_params(ctx->playback_handle, hw_params);
 	if (err < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[ALSA] Cannot set parameters: %s\n", snd_strerror (err)) );
@@ -196,7 +196,7 @@
 	if(!ctx->wav_buf) return GF_OUT_OF_MEM;
 	memset(ctx->wav_buf, 0, ctx->buf_size*sizeof(char));
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[ALSA] Setup %d ch @ %d hz - %d periods of %d us - total buffer size %d - overall delay %d ms\n", ctx->nb_ch, sr, nb_bufs, period_time, ctx->buf_size, ctx->delay));
-	
+
 	return GF_OK;
 
 err_exit:
@@ -239,7 +239,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[ALSA] no frame to write\n" ));
 		return;
 	}
-	
+
 	//assert(nb_frames*ctx->block_align<=ctx->buf_size);
 	written = dr->FillBuffer(dr->audio_renderer, ctx->wav_buf, (u32) (ctx->block_align*nb_frames) );
 	if (!written) return;
@@ -260,11 +260,11 @@
 {
 }
 
-static void ALSA_SetPan(GF_AudioOutput*dr, u32 Pan) 
+static void ALSA_SetPan(GF_AudioOutput*dr, u32 Pan)
 {
 }
 
-static void ALSA_SetPriority(GF_AudioOutput*dr, u32 Priority) 
+static void ALSA_SetPriority(GF_AudioOutput*dr, u32 Priority)
 {
 }
 
@@ -352,19 +352,19 @@
  * interface
  */
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_AUDIO_OUTPUT_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
-	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) 
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
 		return NewALSAOutput();
 	return NULL;
 }
@@ -376,4 +376,4 @@
 		DeleteALSAOutput((GF_AudioOutput*)ifce);
 }
 
-GPAC_MODULE_STATIC_DELARATION( alsa )
+GPAC_MODULE_STATIC_DECLARATION( alsa )

gpac-0.5.0.svn5178.tar.bz2/modules/amr_dec/amr_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/amr_dec/amr_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,7 +42,7 @@
 #define DEFAULT_AUDIO_CM_TRIGGER		4
 
 /*our own headers for AMR NB*/
-#if (defined(WIN32) || defined(_WIN32_WCE)) 
+#if (defined(WIN32) || defined(_WIN32_WCE))
 #include "amr_nb_api.h"
 #if !defined(__GNUC__)
 #pragma comment(lib, "libamrnb")
@@ -57,9 +57,9 @@
 	u32 out_size;
 	/*AMR NB state vars*/
 	__Speech_Decode_FrameState * speech_decoder_state;
-    enum RXFrameType rx_type;
-    enum Mode mode;
-   
+	enum RXFrameType rx_type;
+	enum Mode mode;
+
 	s16 reset_flag, reset_flag_old;
 
 } AMRDec;
@@ -72,9 +72,9 @@
 	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;
+
+	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;
@@ -86,7 +86,7 @@
 	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;
 }
@@ -150,18 +150,18 @@
 /* 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,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
+	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)*/
@@ -178,15 +178,15 @@
 		*outBufferLength = ctx->out_size;
 		return GF_BUFFER_TOO_SMALL;
 	}
-	
-    synth = (s16 *) outBuffer;
+
+	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;
+	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];
@@ -199,7 +199,7 @@
 		} 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 */
@@ -210,14 +210,14 @@
 			for (i = 0; i < L_FRAME; i++) {
 				synth[i] = EHF_MASK;
 			}
-		} else {     
+		} 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);
@@ -233,7 +233,7 @@
 		inBuffer += offset;
 
 		if (*outBufferLength > ctx->out_size) return GF_NON_COMPLIANT_BITSTREAM;
-    }
+	}
 	return GF_OK;
 }
 
@@ -250,7 +250,7 @@
 	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;
 }
@@ -271,7 +271,7 @@
 	ifce->privateStack = dec;
 	ifce->CanHandleStream = AMR_CanHandleStream;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifce->AttachStream = AMR_AttachStream;
 	ifce->DetachStream = AMR_DetachStream;
 	ifce->GetCapabilities = AMR_GetCapabilities;
@@ -292,7 +292,7 @@
 }
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_NET_CLIENT_INTERFACE,
@@ -309,9 +309,12 @@
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE: return (GF_BaseInterface *) NewAMRDecoder();
-	case GF_NET_CLIENT_INTERFACE: return (GF_BaseInterface *) NewAESReader();
-	default: return NULL;
+	case GF_MEDIA_DECODER_INTERFACE:
+		return (GF_BaseInterface *) NewAMRDecoder();
+	case GF_NET_CLIENT_INTERFACE:
+		return (GF_BaseInterface *) NewAESReader();
+	default:
+		return NULL;
 	}
 }
 
@@ -319,9 +322,13 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE: DeleteAMRDecoder((GF_BaseDecoder *)ifce); break;
-	case GF_NET_CLIENT_INTERFACE:  DeleteAESReader(ifce); break;
+	case GF_MEDIA_DECODER_INTERFACE:
+		DeleteAMRDecoder((GF_BaseDecoder *)ifce);
+		break;
+	case GF_NET_CLIENT_INTERFACE:
+		DeleteAESReader(ifce);
+		break;
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( amr_dec )
+GPAC_MODULE_STATIC_DECLARATION( amr_dec )

gpac-0.5.0.svn5178.tar.bz2/modules/amr_dec/amr_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/amr_dec/amr_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include <gpac/modules/service.h>
@@ -71,9 +71,9 @@
 
 static u32 AMR_RegisterMimeTypes(const GF_InputService *plug)
 {
-	gf_term_register_mime_type(plug, "audio/amr", "amr awb", "AMR Speech Data");
-	gf_term_register_mime_type(plug, "audio/evrc", "evc", "EVRC Speech Data");
-	gf_term_register_mime_type(plug, "audio/smv", "smv", "SMV Speech Data");
+	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;
 }
 
@@ -101,9 +101,9 @@
 		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 = 0xA0;
-	else if (read->mtype==TYPE_SMV) esd->decoderConfig->objectTypeIndication = 0xA1;
+	}
+	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;
 }
 
@@ -115,7 +115,7 @@
 	esd = AMR_GetESD(read);
 	esd->OCRESID = 0;
 	gf_list_add(od->ESDescriptors, esd);
-	gf_term_add_media(read->service, (GF_Descriptor*)od, 0);
+	gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
 }
 
 static Bool AMR_CanHandleURL(GF_InputService *plug, const char *url)
@@ -123,9 +123,9 @@
 	char *sExt;
 	sExt = strrchr(url, '.');
 	if (!sExt) return 0;
-	if (gf_term_check_extension(plug, "audio/amr", "amr awb", "AMR Speech Data", sExt)) return 1;
-	if (gf_term_check_extension(plug, "audio/evrc", "evc", "EVRC Speech Data", sExt)) return 1;
-	if (gf_term_check_extension(plug, "audio/smv", "smv", "SMV Speech Data", sExt)) return 1;
+	if (gf_service_check_mime_register(plug, "audio/amr", "amr awb", "AMR Speech Data", sExt)) return 1;
+	if (gf_service_check_mime_register(plug, "audio/evrc", "evc", "EVRC Speech Data", sExt)) return 1;
+	if (gf_service_check_mime_register(plug, "audio/smv", "smv", "SMV Speech Data", sExt)) return 1;
 	return 0;
 }
 
@@ -175,7 +175,7 @@
 
 
 	read->duration = 0;
-	
+
 	if (!read->is_remote) {
 		u32 size;
 		while (!feof(read->stream)) {
@@ -223,7 +223,7 @@
 		}
 	} else {
 		/*handle service message*/
-		gf_term_download_update_stats(read->dnload);
+		gf_service_download_update_stats(read->dnload);
 		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) return;
 	}
 
@@ -259,7 +259,7 @@
 	/*OK confirm*/
 	if (read->needs_connection) {
 		read->needs_connection = 0;
-		gf_term_on_connect(read->service, NULL, e);
+		gf_service_connect_ack(read->service, NULL, e);
 		if (!e) AMR_SetupObject(read);
 	}
 }
@@ -270,10 +270,10 @@
 
 	read->needs_connection = 1;
 
-	read->dnload = gf_term_download_new(read->service, url, 0, AMR_NetIO, read);
+	read->dnload = gf_service_download_new(read->service, url, 0, AMR_NetIO, read);
 	if (!read->dnload) {
 		read->needs_connection = 0;
-		gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(read->dnload);
@@ -290,7 +290,7 @@
 	AMR_Reader *read = plug->priv;
 	read->service = serv;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	strcpy(szURL, url);
@@ -313,7 +313,7 @@
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
 	}
-	gf_term_on_connect(serv, NULL, reply);
+	gf_service_connect_ack(serv, NULL, reply);
 	if (!reply && read->is_inline) AMR_SetupObject(read);
 	return GF_OK;
 }
@@ -323,12 +323,12 @@
 	AMR_Reader *read = plug->priv;
 	if (read->stream) fclose(read->stream);
 	read->stream = NULL;
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	if (read->data) gf_free(read->data);
 	read->data = NULL;
-	gf_term_on_disconnect(read->service, NULL, GF_OK);
+	gf_service_disconnect_ack(read->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -375,7 +375,7 @@
 	}
 
 exit:
-	gf_term_on_connect(read->service, channel, e);
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -390,7 +390,7 @@
 		read->data = NULL;
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(read->service, channel, e);
+	gf_service_disconnect_ack(read->service, channel, e);
 	return GF_OK;
 }
 
@@ -419,8 +419,8 @@
 		read->current_time = 0;
 		if (read->stream) fseek(read->stream, read->start_offset, SEEK_SET);
 
-		if (read->ch == com->base.on_channel) { 
-			read->done = 0; 
+		if (read->ch == com->base.on_channel) {
+			read->done = 0;
 			/*PLAY after complete download, estimate duration*/
 			if (!read->is_remote && !read->duration) {
 				AMR_ConfigureFromFile(read);
@@ -430,7 +430,7 @@
 					rcfg.base.command_type = GF_NET_CHAN_DURATION;
 					rcfg.duration.duration = read->duration;
 					rcfg.duration.duration /= read->sample_rate;
-					gf_term_on_command(read->service, &rcfg, GF_OK);
+					gf_service_command(read->service, &rcfg, GF_OK);
 				}
 			}
 		}
@@ -506,7 +506,7 @@
 				read->start_range = 0;
 			}
 		}
-		
+
 		read->data_size++;
 		read->sl_hdr.compositionTimeStamp = read->current_time;
 		read->data = gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
@@ -570,7 +570,7 @@
 
 #ifdef GPAC_AMR_IN_STANDALONE
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_NET_CLIENT_INTERFACE,
@@ -583,8 +583,10 @@
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE: return (GF_BaseInterface *) NewAESReader();
-	default: return NULL;
+	case GF_NET_CLIENT_INTERFACE:
+		return (GF_BaseInterface *) NewAESReader();
+	default:
+		return NULL;
 	}
 }
 
@@ -592,11 +594,13 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE:  DeleteAESReader(ifce); break;
+	case GF_NET_CLIENT_INTERFACE:
+		DeleteAESReader(ifce);
+		break;
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( amr_in )
+GPAC_MODULE_STATIC_DECLARATION( amr_in )
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/amr_dec/amr_nb/typedefs.h -> gpac-0.5.1.svn5491.tar.xz/modules/amr_dec/amr_nb/typedefs.h Changed

@@ -2,8 +2,8 @@
 ********************************************************************************
 *
 *      GSM AMR-NB speech codec   R98   Version 7.6.0   December 12, 2001
-*                                R99   Version 3.3.0                
-*                                REL-4 Version 4.1.0                
+*                                R99   Version 3.3.0
+*                                REL-4 Version 4.1.0
 *
 ********************************************************************************
 *
@@ -36,7 +36,7 @@
 *        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
@@ -58,7 +58,7 @@
 
 /*
 ********************************************************************************
-*                         DEFINITION OF CONSTANTS 
+*                         DEFINITION OF CONSTANTS
 ********************************************************************************
 */
 /*
@@ -147,8 +147,8 @@
  ********* define complex type
  */
 typedef struct {
-  Float r;  /* real      part */
-  Float i;  /* imaginary part */
+	Float r;  /* real      part */
+	Float i;  /* imaginary part */
 } CPX;
 
 /*
@@ -185,9 +185,9 @@
 #error "can't determine architecture; adapt typedefs.h to your platform"
 #endif
 
-#if defined(_WIN32_WCE) 
+#if defined(_WIN32_WCE)
 # ifndef abort
-#  define abort() 
+#  define abort()
 # endif
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/amr_dec/amr_nb_api.h -> gpac-0.5.1.svn5491.tar.xz/modules/amr_dec/amr_nb_api.h Changed

@@ -1,21 +1,21 @@
-#ifndef _AMR_NB_API_H
-#define _AMR_NB_API_H
-
+#ifndef _AMR_NB_API_H
+#define _AMR_NB_API_H
+
 enum Mode { MR475 = 0,
-            MR515,            
+            MR515,
             MR59,
             MR67,
             MR74,
             MR795,
             MR102,
-            MR122,            
+            MR122,
+
+            MRDTX,
 
-	    MRDTX,
-	    
             N_MODES     /* number of (SPC) modes */
 
           };
-
+
 enum RXFrameType { RX_SPEECH_GOOD = 0,
                    RX_SPEECH_DEGRADED,
                    RX_ONSET,
@@ -25,36 +25,36 @@
                    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            */
+                 };
+
+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);
+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
-
+
+#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                               */

gpac-0.5.0.svn5178.tar.bz2/modules/amr_float_dec/amr_api.h -> gpac-0.5.1.svn5491.tar.xz/modules/amr_float_dec/amr_api.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/amr_float_dec/amr_float_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/amr_float_dec/amr_float_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -69,7 +69,7 @@
 
 	/*AMR NB state vars*/
 	int *nb_destate;
-    void *wb_destate;
+	void *wb_destate;
 } AMRFTDec;
 
 #define AMRFTCTX() AMRFTDec *ctx = (AMRFTDec *) ifcg->privateStack
@@ -80,7 +80,7 @@
 	GF_BitStream *bs;
 	u32 packed;
 	AMRFTCTX();
-	if (esd->dependsOnESID || !esd->decoderConfig->decoderSpecificInfo) return GF_NOT_SUPPORTED;	
+	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 = 1;
@@ -193,14 +193,14 @@
 }
 
 
-static GF_Err AMR_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
+	u32 offset;
+	u8 toc, ft;
 	AMRFTCTX();
 
 	/*if late or seeking don't decode (each frame is a RAP)*/
@@ -217,10 +217,10 @@
 		*outBufferLength = ctx->out_size;
 		return GF_BUFFER_TOO_SMALL;
 	}
-	
+
 	*outBufferLength = 0;
 
-    while (inBufferLength) {
+	while (inBufferLength) {
 		toc = inBuffer[0];
 		ft = (toc >> 3) & 0x0F;
 
@@ -289,7 +289,7 @@
 	ifce->privateStack = dec;
 	ifce->CanHandleStream = AMR_CanHandleStream;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifce->AttachStream = AMR_AttachStream;
 	ifce->DetachStream = AMR_DetachStream;
 	ifce->GetCapabilities = AMR_GetCapabilities;
@@ -314,7 +314,7 @@
 void DeleteAESReader(void *ifce);
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_NET_CLIENT_INTERFACE,
@@ -328,9 +328,12 @@
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE: return (GF_BaseInterface *)NewAMRFTDecoder();
-	case GF_NET_CLIENT_INTERFACE: return (GF_BaseInterface *)NewAESReader();
-	default: return NULL;
+	case GF_MEDIA_DECODER_INTERFACE:
+		return (GF_BaseInterface *)NewAMRFTDecoder();
+	case GF_NET_CLIENT_INTERFACE:
+		return (GF_BaseInterface *)NewAESReader();
+	default:
+		return NULL;
 	}
 }
 
@@ -338,9 +341,13 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE: DeleteAMRFTDecoder((GF_BaseDecoder *)ifce); break;
-	case GF_NET_CLIENT_INTERFACE:  DeleteAESReader(ifce); break;
+	case GF_MEDIA_DECODER_INTERFACE:
+		DeleteAMRFTDecoder((GF_BaseDecoder *)ifce);
+		break;
+	case GF_NET_CLIENT_INTERFACE:
+		DeleteAESReader(ifce);
+		break;
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( amr_float )
+GPAC_MODULE_STATIC_DECLARATION( amr_float )

gpac-0.5.0.svn5178.tar.bz2/modules/audio_filter/audio_filter.c -> gpac-0.5.1.svn5491.tar.xz/modules/audio_filter/audio_filter.c Changed

@@ -12,27 +12,27 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
 #include <gpac/modules/audio_out.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 
 #ifndef PI
 #define PI GF_PI
 #endif
 
-typedef struct 
+typedef struct
 {
 	u32 type;
 	Bool inplace;
@@ -140,7 +140,7 @@
 		if (ctx->delai_buffer) gf_free(ctx->delai_buffer);
 		ctx->delai_buffer = gf_malloc(sizeof(char)*ctx->delai_buffer_size);
 		memset(ctx->delai_buffer, 0, sizeof(char)*ctx->delai_buffer_size);
-		
+
 		if (ctx->block_buffer) gf_free(ctx->block_buffer);
 		ctx->block_buffer = gf_malloc(sizeof(char)*ctx->block_size);
 		memset(ctx->block_buffer, 0, sizeof(char)*ctx->block_size);
@@ -261,19 +261,19 @@
  * interface
  */
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_AUDIO_FILTER_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
-	if (InterfaceType == GF_AUDIO_FILTER_INTERFACE) 
+	if (InterfaceType == GF_AUDIO_FILTER_INTERFACE)
 		return NewAudioFilter();
 	return NULL;
 }
@@ -285,4 +285,4 @@
 		DeleteAudioFilter((GF_AudioFilter*)ifce);
 }
 
-GPAC_MODULE_STATIC_DELARATION( audio_filter )
+GPAC_MODULE_STATIC_DECLARATION( audio_filter )

gpac-0.5.0.svn5178.tar.bz2/modules/avcap/avcap.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/avcap/avcap.cpp Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -60,7 +60,7 @@
 class GPACCaptureHandler : public CaptureHandler
 {
 public:
-	GPACCaptureHandler(GF_ClientService *service, LPNETCHANNEL channel) 
+	GPACCaptureHandler(GF_ClientService *service, LPNETCHANNEL channel)
 		: m_pService(service), m_pChannel(channel), m_data(NULL)
 	{
 		memset(&m_pSLHeader, 0, sizeof(GF_SLHeader));
@@ -103,9 +103,9 @@
 		for (u32 i=0; i<m_height; i++) {
 			memcpy(m_data + (m_height - 1 - i) * m_stride, data + i*m_stride, m_stride);
 		}
-		gf_term_on_sl_packet(m_pService, m_pChannel, m_data, (u32)io_buf->getValidBytes(), &m_pSLHeader, GF_OK);
+		gf_service_send_packet(m_pService, m_pChannel, m_data, (u32)io_buf->getValidBytes(), &m_pSLHeader, GF_OK);
 	} else {
-		gf_term_on_sl_packet(m_pService, m_pChannel, (char *) io_buf->getPtr(), (u32)io_buf->getValidBytes(), &m_pSLHeader, GF_OK);
+		gf_service_send_packet(m_pService, m_pChannel, (char *) io_buf->getPtr(), (u32)io_buf->getValidBytes(), &m_pSLHeader, GF_OK);
 	}
 	io_buf->release();
 }
@@ -120,7 +120,7 @@
 	for(DeviceCollector::DeviceList::const_iterator i = dl.begin(); i != dl.end(); i++, index++) {
 		dd = *i;
 
-		if (!name || !stricmp(name, "default") ) 
+		if (!name || !stricmp(name, "default") )
 			return dd;
 		if (strstr((char *) dd->getName().c_str(), name) != NULL)
 			return dd;
@@ -193,26 +193,26 @@
 
 		if (!vcap->device_desc) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Failed to instanciate AVCap\n"));
-			gf_term_on_connect(serv, NULL, GF_REMOTE_SERVICE_ERROR);
+			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_term_on_connect(serv, NULL, GF_URL_ERROR);
+			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_term_on_connect(serv, NULL, GF_URL_ERROR);
+			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_term_on_connect(serv, NULL, GF_SERVICE_ERROR);
+			gf_service_connect_ack(serv, NULL, GF_SERVICE_ERROR);
 			return GF_OK;
 		}
 		vcap->device->getFormatMgr()->setFramerate(30);
@@ -228,7 +228,7 @@
 		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)) {
@@ -272,7 +272,7 @@
 
 		if (default_4cc )
 			vcap->device->getFormatMgr()->setFormat(default_4cc );
-	
+
 		format = vcap->device->getFormatMgr()->getFormat();
 		switch (format->getFourcc()) {
 		case GF_4CC('V', 'Y', 'U', 'Y'):
@@ -294,19 +294,19 @@
 		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_term_on_connect(serv, NULL, GF_NOT_SUPPORTED);
+			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_term_on_connect(serv, NULL, GF_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)) {
@@ -319,7 +319,7 @@
 		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);
@@ -330,7 +330,7 @@
 	gf_bs_del(bs);
 
 	gf_list_add(od->ESDescriptors, esd);
-	gf_term_add_media(vcap->service, (GF_Descriptor*)od, GF_FALSE);
+	gf_service_declare_media(vcap->service, (GF_Descriptor*)od, GF_FALSE);
 
 	return GF_OK;
 }
@@ -344,7 +344,7 @@
 	}
 
 	vcap->state = 0;
-	gf_term_on_disconnect(vcap->service, NULL, GF_OK);
+	gf_service_disconnect_ack(vcap->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -362,10 +362,13 @@
 	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_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_SET_PADDING:
+		return GF_OK;
 	case GF_NET_CHAN_BUFFER:
 		com->buffer.max = com->buffer.min = 500;
 		return GF_OK;
@@ -379,7 +382,7 @@
 			if (vcap->video_handler)
 				vcap->device->getVidCapMgr()->registerCaptureHandler(vcap->video_handler);
 
-			if (vcap->device->getVidCapMgr()->startCapture() != -1) 
+			if (vcap->device->getVidCapMgr()->startCapture() != -1)
 				vcap->state = 1;
 			else
 				vcap->device->getVidCapMgr()->removeCaptureHandler();
@@ -389,11 +392,12 @@
 		if (vcap->state==1) {
 			/*stop capture*/
 			vcap->device->getVidCapMgr()->removeCaptureHandler();
-			vcap->device->getVidCapMgr()->stopCapture(); 
+			vcap->device->getVidCapMgr()->stopCapture();
 			vcap->state = 0;
 		}
 		return GF_OK;
-	case GF_NET_CHAN_CONFIG: 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;
@@ -408,7 +412,7 @@
 {
 	u32 ESID;
 	AVCapIn *vcap = (AVCapIn *) plug->priv;
-	
+
 	sscanf(url, "ES_ID=%u", &ESID);
 	if (ESID == 1) {
 		/*video connect*/
@@ -417,13 +421,13 @@
 		if (vcap->flip_video)
 			vcap->video_handler->AllocData(vcap->height, vcap->stride);
 
-		gf_term_on_connect(vcap->service, channel, GF_OK);
+		gf_service_connect_ack(vcap->service, channel, GF_OK);
 	} else if (ESID == 2) {
 		/*audio connect*/
 		vcap->audio_handler = new GPACCaptureHandler(vcap->service, channel);
-		gf_term_on_connect(vcap->service, channel, GF_OK);
+		gf_service_connect_ack(vcap->service, channel, GF_OK);
 	} else {
-		gf_term_on_connect(vcap->service, channel, GF_STREAM_NOT_FOUND);
+		gf_service_connect_ack(vcap->service, channel, GF_STREAM_NOT_FOUND);
 	}
 	return GF_OK;
 }
@@ -439,7 +443,7 @@
 		delete vcap->audio_handler;
 		vcap->audio_handler = NULL;
 	}
-	gf_term_on_disconnect(vcap->service, channel, GF_OK);
+	gf_service_disconnect_ack(vcap->service, channel, GF_OK);
 	return GF_OK;
 }
 
@@ -450,7 +454,7 @@
 
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_NET_CLIENT_INTERFACE,
@@ -482,7 +486,7 @@
 		GF_SAFEALLOC(vcap, AVCapIn);
 		plug->priv = vcap;
 		return (GF_BaseInterface *)plug;
-	} 
+	}
 	return NULL;
 }
 
@@ -497,7 +501,7 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( avcap )
+GPAC_MODULE_STATIC_DECLARATION( avcap )
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn5178.tar.bz2/modules/bifs_dec/bifs_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/bifs_dec/bifs_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -95,7 +95,7 @@
 }
 
 static GF_Err BIFS_ProcessData(GF_SceneDecoder*plug, const char *inBuffer, u32 inBufferLength,
-								u16 ES_ID, u32 AU_time, u32 mmlevel)
+                               u16 ES_ID, u32 AU_time, u32 mmlevel)
 {
 	Double ts_offset;
 	s32 time;
@@ -137,16 +137,16 @@
 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;
-        }
+	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);
 }
 
@@ -213,4 +213,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( bifs )
+GPAC_MODULE_STATIC_DECLARATION( bifs )

gpac-0.5.0.svn5178.tar.bz2/modules/ctx_load/ctx_load.c -> gpac-0.5.1.svn5491.tar.xz/modules/ctx_load/ctx_load.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -74,7 +74,9 @@
 	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);
@@ -231,8 +233,8 @@
 
 	ext++;
 	if (!stricmp(ext, "xmt") || !stricmp(ext, "xmtz") || !stricmp(ext, "xmta")
-		|| !stricmp(ext, "x3d") || !stricmp(ext, "x3dz")
-	) {
+	        || !stricmp(ext, "x3d") || !stricmp(ext, "x3dz")
+	   ) {
 		ext = gf_modules_get_option((GF_BaseInterface *)plug, "SAXLoader", "Progressive");
 		priv->progressive_support = (ext && !stricmp(ext, "yes")) ? 1 : 0;
 	}
@@ -320,7 +322,7 @@
 }
 
 static GF_Err CTXLoad_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-								u16 ES_ID, u32 stream_time, u32 mmlevel)
+                                  u16 ES_ID, u32 stream_time, u32 mmlevel)
 {
 	GF_Err e = GF_OK;
 	u32 i, j, k, nb_updates, last_rap=0;
@@ -633,7 +635,7 @@
 						}
 						if (keep_com) break;
 					}
-						break;
+					break;
 					case GF_ODF_OD_REMOVE_TAG:
 					{
 						GF_ODRemove *odR = (GF_ODRemove*)com;
@@ -642,7 +644,7 @@
 							if (odm) gf_odm_disconnect(odm, 1);
 						}
 					}
-						break;
+					break;
 					default:
 						break;
 					}
@@ -681,17 +683,27 @@
 	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";
+	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";
 	}
 }
 
@@ -721,7 +733,7 @@
 		case GPAC_OTI_SCENE_SVG_GZ:
 		case GPAC_OTI_SCENE_DIMS:
 			return GF_CODEC_MAYBE_SUPPORTED;
-		default:	
+		default:
 			break;
 		}
 	}
@@ -731,20 +743,20 @@
 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;
-        }
+	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);
 }
 
@@ -777,11 +789,12 @@
 GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
-static u32 si [] = {
+	static u32 si [] = {
 #ifndef GPAC_DISABLE_VRML
-	GF_SCENE_DECODER_INTERFACE,
+		GF_SCENE_DECODER_INTERFACE,
 #endif
-	0};
+		0
+	};
 	return si;
 }
 
@@ -790,7 +803,8 @@
 {
 	switch (InterfaceType) {
 #ifndef GPAC_DISABLE_VRML
-	case GF_SCENE_DECODER_INTERFACE: return (GF_BaseInterface *)NewContextLoader();
+	case GF_SCENE_DECODER_INTERFACE:
+		return (GF_BaseInterface *)NewContextLoader();
 #endif
 	default:
 		return NULL;
@@ -809,4 +823,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( ctx_load )
+GPAC_MODULE_STATIC_DECLARATION( ctx_load )

gpac-0.5.0.svn5178.tar.bz2/modules/demo_is/demo_is.c -> gpac-0.5.1.svn5491.tar.xz/modules/demo_is/demo_is.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -46,7 +46,7 @@
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	/*HTK sensor buffer format: SFString - SFInt32 - SFFloat*/
-	gf_bs_write_int(bs, 1, 1); 
+	gf_bs_write_int(bs, 1, 1);
 	len = strlen(szWord);
 	val = gf_get_bit_size(len);
 	gf_bs_write_int(bs, val, 5);
@@ -67,7 +67,7 @@
 
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_INPUT_DEVICE_INTERFACE,
@@ -101,4 +101,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( demo_is )
+GPAC_MODULE_STATIC_DECLARATION( demo_is )

gpac-0.5.0.svn5178.tar.bz2/modules/directfb_out/directfb_out.c -> gpac-0.5.1.svn5491.tar.xz/modules/directfb_out/directfb_out.c Changed

@@ -1,7 +1,7 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Romain Bouqueau - Jean Le Feuvre 
+ *			Authors: Romain Bouqueau - Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2010-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.0
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,7 +34,7 @@
 
 /**
  *	function DirectFBVid_DrawHLine
- *	- using hardware accelerator to a draw horizontal line   
+ *	- using hardware accelerator to a draw horizontal line
  **/
 static void DirectFBVid_DrawHLine(GF_VideoOutput *driv, u32 x, u32 y, u32 length, GF_Color color)
 {
@@ -49,7 +49,7 @@
 
 /**
  *	function DirectFBVid_DrawHLineAlpha
- *	- using hardware accelerator to draw a horizontal line with alpha   
+ *	- 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)
 {
@@ -64,7 +64,7 @@
 
 /**
  *	function DirectFBVid_DrawRectangle
- *	- using hardware accelerator to fill a rectangle   
+ *	- 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)
 {
@@ -79,15 +79,15 @@
 
 /**
  *	function DirectFBVid_Setup
- * 	- DirectFB setup  
+ * 	- DirectFB setup
  **/
 GF_Err DirectFBVid_Setup(GF_VideoOutput *driv, void *os_handle, void *os_display, u32 init_flags)
 {
 	const char* opt;
-	
+
 	DirectFBVID();
 	DirectFBVid_CtxSetIsInit(ctx, 0);
-	
+
 	// initialisation and surface creation
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DirectFB] Initialization\n"));
 	// check window mode used - SDL or X11
@@ -99,7 +99,7 @@
 		else if (opt && !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");
@@ -121,7 +121,7 @@
 		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;
-		
+
 		DirectFBVid_CtxSetFlipMode(ctx, flip_mode);
 	}
 
@@ -173,7 +173,7 @@
 
 /**
  *	function DirectFBVid_Flush
- * 	- flushing buffer 
+ * 	- flushing buffer
  **/
 static GF_Err DirectFBVid_Flush(GF_VideoOutput *driv, GF_Window *dest)
 {
@@ -188,7 +188,7 @@
 
 /**
  *	function DirectFBVid_SetFullScreen
- * 	- set fullscreen mode  
+ * 	- set fullscreen mode
  **/
 GF_Err DirectFBVid_SetFullScreen(GF_VideoOutput *driv, u32 bFullScreenOn, u32 *screen_width, u32 *screen_height)
 {
@@ -203,7 +203,7 @@
 
 /**
  *	function DirectFBVid_ProcessMessageQueue
- * 	- handle DirectFB events 
+ * 	- handle DirectFB events
  **/
 Bool DirectFBVid_ProcessMessageQueue(DirectFBVidCtx *ctx, GF_VideoOutput *driv)
 {
@@ -221,7 +221,7 @@
 
 /**
  *	function DirectFBVid_ProcessEvent
- * 	- process events 
+ * 	- process events
  **/
 static GF_Err DirectFBVid_ProcessEvent(GF_VideoOutput *driv, GF_Event *evt)
 {
@@ -294,14 +294,14 @@
 		DirectFBVid_CtxPrimaryUnlock(ctx);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DirectFB] backbuffer unlocked\n"));
 	}
-	
+
 	return GF_OK;
 }
 
 
 /**
  *	function DirectFBVid_Blit
- * 	- blit a surface  
+ * 	- blit a surface
  **/
 static GF_Err DirectFBVid_Blit(GF_VideoOutput *driv, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
 {
@@ -322,7 +322,7 @@
 
 /**
  *	function DirectFBNewVideo
- * 	- creates a DirectFb module  
+ * 	- creates a DirectFb module
  **/
 void *DirectFBNewVideo()
 {
@@ -353,7 +353,7 @@
 
 
 /**
- *	function DirectFBDeleteVideo  
+ *	function DirectFBDeleteVideo
  * 	- delete video
  **/
 void DirectFBDeleteVideo(void *ifce)
@@ -397,4 +397,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( directfb_out )
+GPAC_MODULE_STATIC_DECLARATION( directfb_out )

gpac-0.5.0.svn5178.tar.bz2/modules/directfb_out/directfb_out.h -> gpac-0.5.1.svn5491.tar.xz/modules/directfb_out/directfb_out.h Changed

@@ -1,7 +1,7 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Romain Bouqueau - Jean Le Feuvre 
+ *			Authors: Romain Bouqueau - Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2010-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */

gpac-0.5.0.svn5178.tar.bz2/modules/directfb_out/directfb_wrapper.c -> gpac-0.5.1.svn5491.tar.xz/modules/directfb_out/directfb_wrapper.c Changed

@@ -1,8 +1,8 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Romain Bouqueau - Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2010-2012
+ *			Authors: Romain Bouqueau - Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2010-2012
  *					All rights reserved
  *
  *  This file is part of GPAC / DirectFB video output module
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -53,7 +53,7 @@
                     DirectFBErrorFatal( #x, err );                         \
                }                                                           \
           } while (0)
-         
+
 #define SET_DRAWING_FLAGS( flags ) \
           ctx->primary->SetDrawingFlags( ctx->primary, (flags) | (do_xor ? DSDRAW_XOR : 0) )
 
@@ -62,39 +62,39 @@
 
 struct __DirectFBVidCtx
 {
-    /* the super interface */
-    IDirectFB *dfb;
-    /* the primary surface */
-    IDirectFBSurface *primary;
-    
-    /* for keyboard input */
-    //~ IDirectFBInputDevice *keyboard;
-
-    /* screen width, height */
-    u32 width, height, pixel_format;
-    Bool use_systems_memory, disable_acceleration, disable_aa, is_init, disable_display;
-
-     /* acceleration */
-    int accel_drawline, accel_fillrect;
-    DFBSurfaceFlipFlags flip_mode;
-
-    /*===== for key events =====*/
-
-    /* Input interfaces: devices and its buffer */
-    IDirectFBEventBuffer *events;
-    
-    /* mouse events */
-    IDirectFBInputDevice *mouse;
-
-     /*=============================
+	/* the super interface */
+	IDirectFB *dfb;
+	/* the primary surface */
+	IDirectFBSurface *primary;
+
+	/* for keyboard input */
+	//~ IDirectFBInputDevice *keyboard;
+
+	/* screen width, height */
+	u32 width, height, pixel_format;
+	Bool use_systems_memory, disable_acceleration, disable_aa, is_init, disable_display;
+
+	/* acceleration */
+	int accel_drawline, accel_fillrect;
+	DFBSurfaceFlipFlags flip_mode;
+
+	/*===== for key events =====*/
+
+	/* Input interfaces: devices and its buffer */
+	IDirectFBEventBuffer *events;
+
+	/* mouse events */
+	IDirectFBInputDevice *mouse;
+
+	/*=============================
 	if using window
-    ============================= */
-    
-    /* DirectFB window */
-    IDirectFBWindow *window;
-    
-    /* display layer */
-    IDirectFBDisplayLayer *layer;
+	   ============================= */
+
+	/* DirectFB window */
+	IDirectFBWindow *window;
+
+	/* display layer */
+	IDirectFBDisplayLayer *layer;
 
 };
 
@@ -107,9 +107,9 @@
 
 typedef struct _DeviceInfo DeviceInfo;
 struct _DeviceInfo {
-     DFBInputDeviceID           device_id;
-     DFBInputDeviceDescription  desc;
-     DeviceInfo                *next;
+	DFBInputDeviceID           device_id;
+	DFBInputDeviceDescription  desc;
+	DeviceInfo                *next;
 };
 
 
@@ -118,18 +118,18 @@
 
 /**
  *	function DirectFBVid_DrawHLineWrapper
- * 	- using hardware accelerator to draw horizontal line     
+ * 	- using hardware accelerator to draw horizontal line
  **/
 void DirectFBVid_DrawHLineWrapper(DirectFBVidCtx *ctx, u32 x, u32 y, u32 length, u8 r, u8 g, u8 b)
 {
 	//GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DirectFB] in DirectFBVid_DrawHLine(). Drawing line x %d y %d length %d color %08X\n", x, y, length, color));
-	
-	// DSDRAW_NOFX: flag controlling drawing command, drawing without using any effects 
+
+	// DSDRAW_NOFX: flag controlling drawing command, drawing without using any effects
 	SET_DRAWING_FLAGS( DSDRAW_NOFX );
 
-	// set the color used without alpha 
-	ctx->primary->SetColor(ctx->primary, r, g, b, 0xFF); 
-	
+	// set the color used without alpha
+	ctx->primary->SetColor(ctx->primary, r, g, b, 0xFF);
+
 	// to draw a line using hardware accelerators, we can use either DrawLine (in our STB, DrawLine() function is not accelerated) or FillRectangle function with height equals to 1
 	//ctx->primary->DrawLine(ctx->primary, x, y, x+length, y);	// no acceleration
 	ctx->primary->FillRectangle(ctx->primary, x, y,length, 1);
@@ -138,7 +138,7 @@
 
 /**
  *	function DirectFBVid_DrawHLineWrapper
- * 	- using hardware accelerator to draw horizontal line with alpha     
+ * 	- using hardware accelerator to draw horizontal line with alpha
  **/
 void DirectFBVid_DrawHLineAlphaWrapper(DirectFBVidCtx *ctx, u32 x, u32 y, u32 length, u8 r, u8 g, u8 b, u8 alpha)
 {
@@ -155,7 +155,7 @@
 
 /**
  *	function DirectFBVid_DrawRectangleWrapper
- *	- using hardware accelerator to fill a rectangle with the given color  
+ *	- using hardware accelerator to fill a rectangle with the given color
  **/
 void DirectFBVid_DrawRectangleWrapper(DirectFBVidCtx *ctx, u32 x, u32 y, u32 width, u32 height, u8 r, u8 g, u8 b, u8 a)
 {
@@ -171,7 +171,7 @@
 
 /**
  *	function DirectFBVid_CtxPrimaryLock
- * 	- lock the surface (in order to access certain data)  
+ * 	- lock the surface (in order to access certain data)
  **/
 u32 DirectFBVid_CtxPrimaryLock(DirectFBVidCtx *ctx, void **buf, u32 *pitch)
 {
@@ -186,7 +186,7 @@
 	DeviceInfo **devices = data;
 
 	DeviceInfo *device = malloc(sizeof(DeviceInfo) );
-	
+
 	device->device_id = device_id;
 	device->desc = desc;
 	device->next = *devices;
@@ -199,7 +199,7 @@
 
 /**
  *	function DirectFBVid_InitAndCreateSurface
- * 	- initialize and create DirectFB surface 
+ * 	- initialize and create DirectFB surface
  **/
 u32 DirectFBVid_TranslatePixelFormatToGPAC(u32 dfbpf);
 void DirectFBVid_InitAndCreateSurface(DirectFBVidCtx *ctx, u32 window_mode)
@@ -208,7 +208,7 @@
 	DFBSurfaceDescription dsc;
 	DFBSurfacePixelFormat dfbpf;
 	DeviceInfo *devices = NULL;
-	
+
 	//fake arguments and DirectFBInit()
 	{
 		int i, argc=2, argc_ro=2;
@@ -222,14 +222,14 @@
 		} else {
 			argv_ro[1]=argv[1]=strdup("--dfb:system=x11");
 		}
-		
+
 		// screen resolution 640x480
 		//~ argv_ro[2]=argv[2]=strdup("--dfb:mode=640x480");
 		//~ argv_ro[2]=argv[2]=strdup("");
 
 		/* create the super interface */
 		DFBCHECK(DirectFBInit(&argc, &argv));
-	
+
 		for (i=0; i<argc_ro; i++)
 			free(argv_ro[i]);
 		free(argv);
@@ -249,7 +249,7 @@
 		// for mouse
 		DFBCHECK(ctx->dfb->GetInputDevice(ctx->dfb, devices->device_id, &(ctx->mouse)));
 	}
-	
+
 	/* create an event buffer for all devices */
 	DFBCHECK(ctx->dfb->CreateInputEventBuffer(ctx->dfb, DICAPS_KEYS, DFB_FALSE, &(ctx->events) ));
 
@@ -289,7 +289,7 @@
 
 /**
  *	function DirectFBVid_CtxGetWidth
- * 	- returns screen width 
+ * 	- returns screen width
  **/
 u32 DirectFBVid_CtxGetWidth(DirectFBVidCtx *ctx)
 {
@@ -299,7 +299,7 @@
 
 /**
  *	function DirectFBVid_CtxGetHeight
- * 	- returns screen height 
+ * 	- returns screen height
  **/
 u32 DirectFBVid_CtxGetHeight(DirectFBVidCtx *ctx)
 {
@@ -309,7 +309,7 @@
 
 /**
  *	function DirectFBVid_CtxGetPrimary
- * 	- return the primary surface  
+ * 	- return the primary surface
  **/
 void *DirectFBVid_CtxGetPrimary(DirectFBVidCtx *ctx)
 {
@@ -319,7 +319,7 @@
 
 /**
  *	function DirectFBVid_CtxGetPixelFormat
- * 	- get pixel format  
+ * 	- get pixel format
  **/
 u32 DirectFBVid_CtxGetPixelFormat(DirectFBVidCtx *ctx)
 {
@@ -329,7 +329,7 @@
 
 /**
  *	function DirectFBVid_CtxIsHwMemory
- * 	- return value whether system memory is used or not  
+ * 	- return value whether system memory is used or not
  **/
 Bool DirectFBVid_CtxIsHwMemory(DirectFBVidCtx *ctx)
 {
@@ -339,7 +339,7 @@
 
 /**
  *	function DirectFBVid_CtxPrimaryFlip
- * 	- flipping buffers 
+ * 	- flipping buffers
  **/
 u32 DirectFBVid_CtxPrimaryFlip(DirectFBVidCtx *ctx)
 {
@@ -349,7 +349,7 @@
 
 /**
  *	function DirectFBVid_CtxSetDisableDisplay
- * 	- set disable display value   
+ * 	- set disable display value
  **/
 void DirectFBVid_CtxSetDisableDisplay(DirectFBVidCtx *ctx, Bool val)
 {
@@ -359,7 +359,7 @@
 
 /**
  *	function DirectFBVid_CtxGetDisableDisplay
- * 	- boolean showing whether display is enabled/disabled   
+ * 	- boolean showing whether display is enabled/disabled
  **/
 Bool DirectFBVid_CtxGetDisableDisplay(DirectFBVidCtx *ctx)
 {
@@ -369,7 +369,7 @@
 
 /**
  *	function DirectFBVid_CtxSetDisableAcceleration
- * 	- boolean showing whether hardware accelerator is enabled/disabled   
+ * 	- boolean showing whether hardware accelerator is enabled/disabled
  **/
 void DirectFBVid_CtxSetDisableAcceleration(DirectFBVidCtx *ctx, Bool val)
 {
@@ -379,7 +379,7 @@
 
 /**
  *	function DirectFBVid_CtxGetDisableAcceleration
- * 	- return disable_acceleration value  
+ * 	- return disable_acceleration value
  **/
 Bool DirectFBVid_CtxGetDisableAcceleration(DirectFBVidCtx *ctx)
 {
@@ -389,7 +389,7 @@
 
 /**
  *	function DirectFBVid_CtxSetIsInit
- * 	- boolean showing whether DirectFB is initialized   
+ * 	- boolean showing whether DirectFB is initialized
  **/
 void DirectFBVid_CtxSetIsInit(DirectFBVidCtx *ctx, Bool val)
 {
@@ -399,24 +399,24 @@
 
 /**
  *	function DirectFBVid_CtxSetFlipMode
- * 	- set flip mode   
+ * 	- set flip mode
  **/
 void DirectFBVid_CtxSetFlipMode(DirectFBVidCtx *ctx, u32 flip_mode)
 {
 	ctx->flip_mode = DSFLIP_BLIT;
 	switch(flip_mode) {
-		case FLIP_WAITFORSYNC:
-			ctx->flip_mode |= DSFLIP_WAITFORSYNC;
-			break;
-		case FLIP_WAIT:
-			ctx->flip_mode |= DSFLIP_WAIT;
-			break;
-		case FLIP_ONSYNC:
-			ctx->flip_mode |= DSFLIP_ONSYNC;
-			break;
-		case FLIP_SWAP:
-			ctx->flip_mode &= ~DSFLIP_BLIT;
-			break;
+	case FLIP_WAITFORSYNC:
+		ctx->flip_mode |= DSFLIP_WAITFORSYNC;
+		break;
+	case FLIP_WAIT:
+		ctx->flip_mode |= DSFLIP_WAIT;
+		break;
+	case FLIP_ONSYNC:
+		ctx->flip_mode |= DSFLIP_ONSYNC;
+		break;
+	case FLIP_SWAP:
+		ctx->flip_mode &= ~DSFLIP_BLIT;
+		break;
 	}
 }
 
@@ -439,7 +439,7 @@
 
 /**
  *	function DirectFBVid_ShutdownWrapper
- * 	- shutdown DirectFB module  
+ * 	- shutdown DirectFB module
  **/
 u32 DirectFBVid_ShutdownWrapper(DirectFBVidCtx *ctx)
 {
@@ -458,7 +458,7 @@
 
 
 /**
- *	Blit a surface 
+ *	Blit a surface
  **/
 u32 DirectFBVid_TranslatePixelFormatFromGPAC(u32 gpacpf);
 u32 DirectFBVid_BlitWrapper(DirectFBVidCtx *ctx, u32 video_src_width, u32 video_src_height, u32 video_src_pixel_format, char *video_src_buffer, s32 video_src_pitch_y, u32 src_wnd_x, u32 src_wnd_y, u32 src_wnd_w, u32 src_wnd_h, u32 dst_wnd_x, u32 dst_wnd_y, u32 dst_wnd_w, u32 dst_wnd_h, u32 overlay_type)
@@ -482,12 +482,12 @@
 
 
 	switch (video_src_pixel_format) {
-		case GF_PIXEL_ARGB: //return DSPF_ARGB;
-		case GF_PIXEL_RGBA: //return DSPF_ARGB;
-			ctx->primary->SetBlittingFlags(ctx->primary, DSBLIT_BLEND_ALPHACHANNEL);
-			break;
-		default:
-			ctx->primary->SetBlittingFlags(ctx->primary, DSBLIT_NOFX);
+	case GF_PIXEL_ARGB: //return DSPF_ARGB;
+	case GF_PIXEL_RGBA: //return DSPF_ARGB;
+		ctx->primary->SetBlittingFlags(ctx->primary, DSBLIT_BLEND_ALPHACHANNEL);
+		break;
+	default:
+		ctx->primary->SetBlittingFlags(ctx->primary, DSBLIT_NOFX);
 	}
 
 	// create a surface with the new surface description
@@ -505,8 +505,8 @@
 
 	// blit on the surface
 	if (!src_wnd_x && !src_wnd_y && (dst_wnd_w==src_wnd_w) && (dst_wnd_h==src_wnd_h)) {
-		 ctx->primary->Blit(ctx->primary, src, &dfbsrc, dst_wnd_x, dst_wnd_y);
-	// blit an area scaled from the source to the destination rectangle
+		ctx->primary->Blit(ctx->primary, src, &dfbsrc, dst_wnd_x, dst_wnd_y);
+		// blit an area scaled from the source to the destination rectangle
 	} else {
 		dfbdst.x = dst_wnd_x;
 		dfbdst.y = dst_wnd_y;
@@ -516,13 +516,13 @@
 	}
 
 	src->Release(src);
-	
+
 	return 0;
 }
 
 
 /**
- *	function DirectFBVid_ProcessMessageQueueWrapper  
+ *	function DirectFBVid_ProcessMessageQueueWrapper
  * 	- handle DirectFB events
  * 	- key events
  **/
@@ -534,36 +534,36 @@
 	if (ctx->events->GetEvent( ctx->events, DFB_EVENT(&directfb_evt) ) == DFB_OK)
 	{
 		switch (directfb_evt.type) {
-			case DIET_KEYPRESS:
-			case DIET_KEYRELEASE:
-				directfb_translate_key(directfb_evt.key_id, flags, key_code);
-				*type = (directfb_evt.type == DIET_KEYPRESS) ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
+		case DIET_KEYPRESS:
+		case DIET_KEYRELEASE:
+			directfb_translate_key(directfb_evt.key_id, flags, key_code);
+			*type = (directfb_evt.type == DIET_KEYPRESS) ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
+			break;
+		case DIET_BUTTONPRESS:
+		case DIET_BUTTONRELEASE:
+			*type = (directfb_evt.type == DIET_BUTTONPRESS) ? GF_EVENT_MOUSEUP : GF_EVENT_MOUSEDOWN;
+			switch(directfb_evt.button) {
+			case DIBI_LEFT:
+				*button = GF_MOUSE_LEFT;
 				break;
-			case DIET_BUTTONPRESS:
-			case DIET_BUTTONRELEASE:
-				*type = (directfb_evt.type == DIET_BUTTONPRESS) ? GF_EVENT_MOUSEUP : GF_EVENT_MOUSEDOWN;
-				switch(directfb_evt.button) {
-					case DIBI_LEFT:
-						*button = GF_MOUSE_LEFT;
-						break;
-					case DIBI_RIGHT:
-						*button = GF_MOUSE_RIGHT;
-						break;
-					case DIBI_MIDDLE:
-						*button = GF_MOUSE_MIDDLE;
-						break;
-					default:
-						//fprintf(stderr, "in here for others\n");
-						break;
-				}
+			case DIBI_RIGHT:
+				*button = GF_MOUSE_RIGHT;
+				break;
+			case DIBI_MIDDLE:
+				*button = GF_MOUSE_MIDDLE;
 				break;
-			case DIET_AXISMOTION:
-				*type = GF_EVENT_MOUSEMOVE;
-				ctx->mouse->GetXY(ctx->mouse, x, y);
 			default:
+				//fprintf(stderr, "in here for others\n");
 				break;
+			}
+			break;
+		case DIET_AXISMOTION:
+			*type = GF_EVENT_MOUSEMOVE;
+			ctx->mouse->GetXY(ctx->mouse, x, y);
+		default:
+			break;
 		}
-		
+
 		return 0;
 	}
 
@@ -574,38 +574,53 @@
 /* Events translation */
 /**
  *	function DirectFBVid_TranslatePixelFormatToGPAC
- * 	- translate pixel from DirectFb to GPAC  
+ * 	- translate pixel from DirectFb to GPAC
  **/
 u32 DirectFBVid_TranslatePixelFormatToGPAC(u32 dfbpf)
 {
 	switch (dfbpf) {
-		case DSPF_RGB16: return GF_PIXEL_RGB_565;
-		case DSPF_RGB555: return GF_PIXEL_RGB_555;
-		case DSPF_RGB24: return GF_PIXEL_RGB_24;
-		case DSPF_RGB32: return GF_PIXEL_RGB_32;
-		case DSPF_ARGB: return GF_PIXEL_ARGB;
-		default: return 0;
+	case DSPF_RGB16:
+		return GF_PIXEL_RGB_565;
+	case DSPF_RGB555:
+		return GF_PIXEL_RGB_555;
+	case DSPF_RGB24:
+		return GF_PIXEL_RGB_24;
+	case DSPF_RGB32:
+		return GF_PIXEL_RGB_32;
+	case DSPF_ARGB:
+		return GF_PIXEL_ARGB;
+	default:
+		return 0;
 	}
 }
 
 /**
  *	function DirectFBVid_TranslatePixelFormatToGPAC
- * 	- translate pixel from GPAC to DirectFB  
+ * 	- translate pixel from GPAC to DirectFB
  **/
 u32 DirectFBVid_TranslatePixelFormatFromGPAC(u32 gpacpf)
 {
 	switch (gpacpf) {
-		case GF_PIXEL_RGB_565: return DSPF_RGB16;
-		case GF_PIXEL_RGB_555 : return DSPF_RGB555;
-		case GF_PIXEL_BGR_24 : return DSPF_RGB24;
-		case GF_PIXEL_RGB_24 : return DSPF_RGB24;
-		case GF_PIXEL_RGB_32 : return DSPF_RGB32;
-		case GF_PIXEL_ARGB: return DSPF_ARGB;
-		case GF_PIXEL_RGBA: return DSPF_ARGB;
-		case GF_PIXEL_YUY2 : return DSPF_YUY2;
-		case GF_PIXEL_YV12 : return DSPF_YV12;
-		default:
-			;//GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DirectFB] pixel format %s not supported\n", gf_4cc_to_str(gpacpf)));
+	case GF_PIXEL_RGB_565:
+		return DSPF_RGB16;
+	case GF_PIXEL_RGB_555 :
+		return DSPF_RGB555;
+	case GF_PIXEL_BGR_24 :
+		return DSPF_RGB24;
+	case GF_PIXEL_RGB_24 :
+		return DSPF_RGB24;
+	case GF_PIXEL_RGB_32 :
+		return DSPF_RGB32;
+	case GF_PIXEL_ARGB:
+		return DSPF_ARGB;
+	case GF_PIXEL_RGBA:
+		return DSPF_ARGB;
+	case GF_PIXEL_YUY2 :
+		return DSPF_YUY2;
+	case GF_PIXEL_YV12 :
+		return DSPF_YV12;
+	default:
+		;//GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DirectFB] pixel format %s not supported\n", gf_4cc_to_str(gpacpf)));
 	}
 
 	return 0;
@@ -614,218 +629,302 @@
 
 /**
  *	function directfb_translate_key
- * 	- translate key from DirectFB to GPAC  
+ * 	- translate key from DirectFB to GPAC
  **/
 void directfb_translate_key(DFBInputDeviceKeyIdentifier DirectFBkey, u32 *flags, u32 *key_code)
 {
 	//~ fprintf(stderr, "DirectFBkey=%d\n", DirectFBkey);
 
 	switch (DirectFBkey) {
-		case DIKI_BACKSPACE:
-			*key_code = GF_KEY_BACKSPACE; 
-			//~ fprintf(stderr, "DIKI_BACKSPACE\n"); 
-			break;
-		case DIKI_TAB:
-			*key_code = GF_KEY_TAB; 
-			//~ fprintf(stderr, "DIKI_TAB\n"); 
-			break;
-		case DIKI_ENTER:
-			*key_code = GF_KEY_ENTER; 
-			//~ fprintf(stderr, "DIKI_ENTER\n"); 
-			break;
-		case DIKI_ESCAPE:
-			*key_code = GF_KEY_ESCAPE; 
-			//~ fprintf(stderr, "DIKI_ESCAPE\n"); 
-			break;
-		case DIKI_SPACE:
-			*key_code = GF_KEY_SPACE; 
-			//~ fprintf(stderr, "DIKI_SPACE\n"); 
-			break;
-		case DIKI_SHIFT_L:
-		case DIKI_SHIFT_R:
-			*key_code = GF_KEY_SHIFT; 
-			//~ fprintf(stderr, "DIKI_SHIFT_R/DIKI_SHIFT_L\n"); 
-			break;
-		case DIKI_CONTROL_L:
-		case DIKI_CONTROL_R:
-			*key_code = GF_KEY_CONTROL; 
-			//~ fprintf(stderr, "DIKI_CONTROL_L/DIKI_CONTROL_R\n"); 
-			break;
-		case DIKI_ALT_L:
-		case DIKI_ALT_R:
-			*key_code = GF_KEY_ALT; 
-			//~ fprintf(stderr, "DIKI_ALT_L/DIKI_ALT_R\n"); 
-			break;
-		case DIKI_CAPS_LOCK:
-			*key_code = GF_KEY_CAPSLOCK; 
-			//~ fprintf(stderr, "DIKI_CAPS_LOCK\n"); 
-			break;
-		case DIKI_META_L:
-		case DIKI_META_R:
-			*key_code = GF_KEY_META; break;
-		case DIKI_KP_EQUAL:
-			*key_code = GF_KEY_EQUALS; break;
-		case DIKI_SUPER_L:
-		case DIKI_SUPER_R:
-			*key_code = GF_KEY_WIN; break;
-		
-		/* alphabets */
-		case DIKI_A:
-			*key_code = GF_KEY_A; 
-			//~ fprintf(stderr, "DIKI_A\n"); 
-			break;
-		case DIKI_B:
-			*key_code = GF_KEY_B; 
-			//~ fprintf(stderr, "DIKI_B\n"); 
-			break;
-		case DIKI_C:
-			*key_code = GF_KEY_C; 
-			//~ fprintf(stderr, "DIKI_C\n"); 
-			break;
-		case DIKI_D:
-			*key_code = GF_KEY_D; 
-			//~ fprintf(stderr, "DIKI_D\n"); 
-			break;
-		case DIKI_E:
-			*key_code = GF_KEY_E; 
-			//~ fprintf(stderr, "DIKI_E\n"); 
-			break;
-		case DIKI_F:
-			*key_code = GF_KEY_F; break;
-		case DIKI_G:
-			*key_code = GF_KEY_G; break;
-		case DIKI_H:
-			*key_code = GF_KEY_H; break;
-		case DIKI_I:
-			*key_code = GF_KEY_I; break;
-		case DIKI_J:
-			*key_code = GF_KEY_J; break;
-		case DIKI_K:
-			*key_code = GF_KEY_K; break;
-		case DIKI_L:
-			*key_code = GF_KEY_L; break;
-		case DIKI_M:
-			*key_code = GF_KEY_M; break;
-		case DIKI_N:
-			*key_code = GF_KEY_N; break;
-		case DIKI_O:
-			*key_code = GF_KEY_O; break;
-		case DIKI_P:
-			*key_code = GF_KEY_P; break;
-		case DIKI_Q:
-			*key_code = GF_KEY_Q; break;
-		case DIKI_R:
-			*key_code = GF_KEY_R; break;
-		case DIKI_S:
-			*key_code = GF_KEY_S; break;
-		case DIKI_T:
-			*key_code = GF_KEY_T; break;
-		case DIKI_U:
-			*key_code = GF_KEY_U; break;
-		case DIKI_V:
-			*key_code = GF_KEY_V; break;
-		case DIKI_W:
-			*key_code = GF_KEY_W; break;
-		case DIKI_X:
-			*key_code = GF_KEY_X; break;
-		case DIKI_Y:
-			*key_code = GF_KEY_Y; break;
-		case DIKI_Z:
-			*key_code = GF_KEY_Z; break;
-			
-		case DIKI_PRINT:
-			*key_code = GF_KEY_PRINTSCREEN; break;
-		case DIKI_SCROLL_LOCK:
-			*key_code = GF_KEY_SCROLL; break;
-		case DIKI_PAUSE:
-			*key_code = GF_KEY_PAUSE; break;
-		case DIKI_INSERT:
-			*key_code = GF_KEY_INSERT; break;
-		case DIKI_DELETE:
-			*key_code = GF_KEY_DEL; break;
-		case DIKI_HOME:
-			*key_code = GF_KEY_HOME; break;
-		case DIKI_END:
-			*key_code = GF_KEY_END; break;
-		case DIKI_PAGE_UP:
-			*key_code = GF_KEY_PAGEUP; break;
-		case DIKI_PAGE_DOWN:
-			*key_code = GF_KEY_PAGEDOWN; break;
-		
-		/* arrows */
-		case DIKI_UP:
-			*key_code = GF_KEY_UP; break;
-		case DIKI_DOWN:
-			*key_code = GF_KEY_DOWN; break;
-		case DIKI_RIGHT:
-			*key_code = GF_KEY_RIGHT; break;
-		case DIKI_LEFT:
-			*key_code = GF_KEY_LEFT; break;
- 
-		/* extended numerical pad */
-		case DIKI_NUM_LOCK:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_NUMLOCK; break;
-		case DIKI_KP_DIV:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_SLASH; break;
-		case DIKI_KP_MULT:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_STAR; break;
-		case DIKI_KP_MINUS:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_HYPHEN; break;
-		case DIKI_KP_PLUS:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_PLUS; break;
-		case DIKI_KP_ENTER:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_ENTER; break; 
-		case DIKI_KP_DECIMAL:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_FULLSTOP; break;
-		case DIKI_KP_0:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_0; break;
-		case DIKI_KP_1:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_1; break;
-		case DIKI_KP_2:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_2; break;
-		case DIKI_KP_3:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_3; break;
-		case DIKI_KP_4:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_4; break;
-		case DIKI_KP_5: 
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_5; break;
-		case DIKI_KP_6:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_6; break;
-		case DIKI_KP_7:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_7; break;
-		case DIKI_KP_8:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_8; break;
-		case DIKI_KP_9:
-			*flags = GF_KEY_EXT_NUMPAD; *key_code = GF_KEY_9; break;
-		
-		/* Fn functions */
-		case DIKI_F1:
-			*key_code = GF_KEY_F1; break;
-		case DIKI_F2:
-			*key_code = GF_KEY_F2; break;
-		case DIKI_F3:
-			*key_code = GF_KEY_F3; break;
-		case DIKI_F4:
-			*key_code = GF_KEY_F4; break;
-		case DIKI_F5:
-			*key_code = GF_KEY_F5; break;
-		case DIKI_F6:
-			*key_code = GF_KEY_F6; break;
-		case DIKI_F7:
-			*key_code = GF_KEY_F7; break;
-		case DIKI_F8:
-			*key_code = GF_KEY_F8; break;
-		case DIKI_F9:
-			*key_code = GF_KEY_F9; break;
-		case DIKI_F10:
-			*key_code = GF_KEY_F10; break;
-		case DIKI_F11:
-			*key_code = GF_KEY_F11; break;
-		case DIKI_F12:
-			*key_code = GF_KEY_F12; break;
-
-		default:
-			*key_code = GF_KEY_UNIDENTIFIED; break;
+	case DIKI_BACKSPACE:
+		*key_code = GF_KEY_BACKSPACE;
+		//~ fprintf(stderr, "DIKI_BACKSPACE\n");
+		break;
+	case DIKI_TAB:
+		*key_code = GF_KEY_TAB;
+		//~ fprintf(stderr, "DIKI_TAB\n");
+		break;
+	case DIKI_ENTER:
+		*key_code = GF_KEY_ENTER;
+		//~ fprintf(stderr, "DIKI_ENTER\n");
+		break;
+	case DIKI_ESCAPE:
+		*key_code = GF_KEY_ESCAPE;
+		//~ fprintf(stderr, "DIKI_ESCAPE\n");
+		break;
+	case DIKI_SPACE:
+		*key_code = GF_KEY_SPACE;
+		//~ fprintf(stderr, "DIKI_SPACE\n");
+		break;
+	case DIKI_SHIFT_L:
+	case DIKI_SHIFT_R:
+		*key_code = GF_KEY_SHIFT;
+		//~ fprintf(stderr, "DIKI_SHIFT_R/DIKI_SHIFT_L\n");
+		break;
+	case DIKI_CONTROL_L:
+	case DIKI_CONTROL_R:
+		*key_code = GF_KEY_CONTROL;
+		//~ fprintf(stderr, "DIKI_CONTROL_L/DIKI_CONTROL_R\n");
+		break;
+	case DIKI_ALT_L:
+	case DIKI_ALT_R:
+		*key_code = GF_KEY_ALT;
+		//~ fprintf(stderr, "DIKI_ALT_L/DIKI_ALT_R\n");
+		break;
+	case DIKI_CAPS_LOCK:
+		*key_code = GF_KEY_CAPSLOCK;
+		//~ fprintf(stderr, "DIKI_CAPS_LOCK\n");
+		break;
+	case DIKI_META_L:
+	case DIKI_META_R:
+		*key_code = GF_KEY_META;
+		break;
+	case DIKI_KP_EQUAL:
+		*key_code = GF_KEY_EQUALS;
+		break;
+	case DIKI_SUPER_L:
+	case DIKI_SUPER_R:
+		*key_code = GF_KEY_WIN;
+		break;
+
+	/* alphabets */
+	case DIKI_A:
+		*key_code = GF_KEY_A;
+		//~ fprintf(stderr, "DIKI_A\n");
+		break;
+	case DIKI_B:
+		*key_code = GF_KEY_B;
+		//~ fprintf(stderr, "DIKI_B\n");
+		break;
+	case DIKI_C:
+		*key_code = GF_KEY_C;
+		//~ fprintf(stderr, "DIKI_C\n");
+		break;
+	case DIKI_D:
+		*key_code = GF_KEY_D;
+		//~ fprintf(stderr, "DIKI_D\n");
+		break;
+	case DIKI_E:
+		*key_code = GF_KEY_E;
+		//~ fprintf(stderr, "DIKI_E\n");
+		break;
+	case DIKI_F:
+		*key_code = GF_KEY_F;
+		break;
+	case DIKI_G:
+		*key_code = GF_KEY_G;
+		break;
+	case DIKI_H:
+		*key_code = GF_KEY_H;
+		break;
+	case DIKI_I:
+		*key_code = GF_KEY_I;
+		break;
+	case DIKI_J:
+		*key_code = GF_KEY_J;
+		break;
+	case DIKI_K:
+		*key_code = GF_KEY_K;
+		break;
+	case DIKI_L:
+		*key_code = GF_KEY_L;
+		break;
+	case DIKI_M:
+		*key_code = GF_KEY_M;
+		break;
+	case DIKI_N:
+		*key_code = GF_KEY_N;
+		break;
+	case DIKI_O:
+		*key_code = GF_KEY_O;
+		break;
+	case DIKI_P:
+		*key_code = GF_KEY_P;
+		break;
+	case DIKI_Q:
+		*key_code = GF_KEY_Q;
+		break;
+	case DIKI_R:
+		*key_code = GF_KEY_R;
+		break;
+	case DIKI_S:
+		*key_code = GF_KEY_S;
+		break;
+	case DIKI_T:
+		*key_code = GF_KEY_T;
+		break;
+	case DIKI_U:
+		*key_code = GF_KEY_U;
+		break;
+	case DIKI_V:
+		*key_code = GF_KEY_V;
+		break;
+	case DIKI_W:
+		*key_code = GF_KEY_W;
+		break;
+	case DIKI_X:
+		*key_code = GF_KEY_X;
+		break;
+	case DIKI_Y:
+		*key_code = GF_KEY_Y;
+		break;
+	case DIKI_Z:
+		*key_code = GF_KEY_Z;
+		break;
+
+	case DIKI_PRINT:
+		*key_code = GF_KEY_PRINTSCREEN;
+		break;
+	case DIKI_SCROLL_LOCK:
+		*key_code = GF_KEY_SCROLL;
+		break;
+	case DIKI_PAUSE:
+		*key_code = GF_KEY_PAUSE;
+		break;
+	case DIKI_INSERT:
+		*key_code = GF_KEY_INSERT;
+		break;
+	case DIKI_DELETE:
+		*key_code = GF_KEY_DEL;
+		break;
+	case DIKI_HOME:
+		*key_code = GF_KEY_HOME;
+		break;
+	case DIKI_END:
+		*key_code = GF_KEY_END;
+		break;
+	case DIKI_PAGE_UP:
+		*key_code = GF_KEY_PAGEUP;
+		break;
+	case DIKI_PAGE_DOWN:
+		*key_code = GF_KEY_PAGEDOWN;
+		break;
+
+	/* arrows */
+	case DIKI_UP:
+		*key_code = GF_KEY_UP;
+		break;
+	case DIKI_DOWN:
+		*key_code = GF_KEY_DOWN;
+		break;
+	case DIKI_RIGHT:
+		*key_code = GF_KEY_RIGHT;
+		break;
+	case DIKI_LEFT:
+		*key_code = GF_KEY_LEFT;
+		break;
+
+	/* extended numerical pad */
+	case DIKI_NUM_LOCK:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_NUMLOCK;
+		break;
+	case DIKI_KP_DIV:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_SLASH;
+		break;
+	case DIKI_KP_MULT:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_STAR;
+		break;
+	case DIKI_KP_MINUS:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_HYPHEN;
+		break;
+	case DIKI_KP_PLUS:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_PLUS;
+		break;
+	case DIKI_KP_ENTER:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_ENTER;
+		break;
+	case DIKI_KP_DECIMAL:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_FULLSTOP;
+		break;
+	case DIKI_KP_0:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_0;
+		break;
+	case DIKI_KP_1:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_1;
+		break;
+	case DIKI_KP_2:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_2;
+		break;
+	case DIKI_KP_3:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_3;
+		break;
+	case DIKI_KP_4:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_4;
+		break;
+	case DIKI_KP_5:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_5;
+		break;
+	case DIKI_KP_6:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_6;
+		break;
+	case DIKI_KP_7:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_7;
+		break;
+	case DIKI_KP_8:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_8;
+		break;
+	case DIKI_KP_9:
+		*flags = GF_KEY_EXT_NUMPAD;
+		*key_code = GF_KEY_9;
+		break;
+
+	/* Fn functions */
+	case DIKI_F1:
+		*key_code = GF_KEY_F1;
+		break;
+	case DIKI_F2:
+		*key_code = GF_KEY_F2;
+		break;
+	case DIKI_F3:
+		*key_code = GF_KEY_F3;
+		break;
+	case DIKI_F4:
+		*key_code = GF_KEY_F4;
+		break;
+	case DIKI_F5:
+		*key_code = GF_KEY_F5;
+		break;
+	case DIKI_F6:
+		*key_code = GF_KEY_F6;
+		break;
+	case DIKI_F7:
+		*key_code = GF_KEY_F7;
+		break;
+	case DIKI_F8:
+		*key_code = GF_KEY_F8;
+		break;
+	case DIKI_F9:
+		*key_code = GF_KEY_F9;
+		break;
+	case DIKI_F10:
+		*key_code = GF_KEY_F10;
+		break;
+	case DIKI_F11:
+		*key_code = GF_KEY_F11;
+		break;
+	case DIKI_F12:
+		*key_code = GF_KEY_F12;
+		break;
+
+	default:
+		*key_code = GF_KEY_UNIDENTIFIED;
+		break;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/modules/droid_audio/droidaudio.c -> gpac-0.5.1.svn5491.tar.xz/modules/droid_audio/droidaudio.c Changed

@@ -44,6 +44,15 @@
 /*for channel codes*/
 #include <gpac/constants.h>
 
+#ifdef GPAC_STATIC_MODULES
+
+JavaVM* GetJavaVM();
+JNIEnv* GetEnv();
+
+#endif
+
+
+
 static const char android_device[] = "Android Default";
 
 static jclass cAudioTrack = NULL;
@@ -91,8 +100,8 @@
 	u32 channelConfig; //AudioFormat.CHANNEL_OUT_MONO
 	u32 audioFormat; //AudioFormat.ENCODING_PCM_16BIT
 	s32 mbufferSizeInBytes;
-		u32 volume;
-		u32 pan;
+	u32 volume;
+	u32 pan;
 	jarray buff;
 } DroidContext;
 
@@ -112,13 +121,13 @@
 	if (ctx->cfg_num_buffers <= 1) ctx->cfg_num_buffers = 2;
 	ctx->cfg_duration = total_duration;
 	if (!ctx->force_config) ctx->num_buffers = 1;
-		ctx->volume = 100;
-		ctx->pan = 50;
+	ctx->volume = 100;
+	ctx->pan = 50;
 
-	if (!cAudioTrack){
+	if (!cAudioTrack) {
 		cAudioTrack = (*env)->FindClass(env, "android/media/AudioTrack");
 		if (!cAudioTrack) {
-				return GF_NOT_SUPPORTED;
+			return GF_NOT_SUPPORTED;
 		}
 
 		cAudioTrack = (*env)->NewGlobalRef(env, cAudioTrack);
@@ -161,7 +170,7 @@
 	(*env)->DeleteGlobalRef(env, cAudioTrack);
 
 	//if ( res == JNI_EDETACHED ) {
-		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
+	(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
 	//}
 
 	LOGV("[Android Audio] Shutdown DONE.", 0);
@@ -194,7 +203,7 @@
 
 	ctx->num_buffers = 1;
 	ctx->mbufferSizeInBytes = (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-		ctx->sampleRateInHz, ctx->channelConfig, ctx->audioFormat);
+	                          ctx->sampleRateInHz, ctx->channelConfig, ctx->audioFormat);
 
 	//ctx->mbufferSizeInBytes *= 3;
 
@@ -214,11 +223,11 @@
 	ctx->delay = ctx->total_length_ms;
 
 	mtrack = (*env)->NewObject(env, cAudioTrack, mAudioTrack, STREAM_MUSIC, ctx->sampleRateInHz,
-		ctx->channelConfig, ctx->audioFormat, ctx->mbufferSizeInBytes, MODE_STREAM); //AudioTrack.MODE_STREAM
-	if (mtrack){
-	  mtrack = (*env)->NewGlobalRef(env, mtrack);
-	  ctx->mtrack = mtrack;
-	  (*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mPlay);
+	                           ctx->channelConfig, ctx->audioFormat, ctx->mbufferSizeInBytes, MODE_STREAM); //AudioTrack.MODE_STREAM
+	if (mtrack) {
+		mtrack = (*env)->NewGlobalRef(env, mtrack);
+		ctx->mtrack = mtrack;
+		(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mPlay);
 //	  (*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mStop);
 	}  else {
 		LOGV("[Android Audio] mtrack = %p", mtrack);
@@ -229,7 +238,7 @@
 		ctx->buff = (*env)->NewByteArray(env, ctx->mbufferSizeInBytes);
 	else
 		ctx->buff = (*env)->NewShortArray(env, ctx->mbufferSizeInBytes/2);
-	if ( ctx->buff ){
+	if ( ctx->buff ) {
 		ctx->buff = (*env)->NewGlobalRef(env, ctx->buff);
 	} else {
 		LOGV("[Android Audio] ctx->buff = %p", ctx->buff );
@@ -244,15 +253,15 @@
 static void WAV_WriteAudio(GF_AudioOutput *dr)
 {
 	DroidContext *ctx = (DroidContext *)dr->opaque;
-		if (!ctx)
-		  return;
+	if (!ctx)
+		return;
 	JNIEnv* env = ctx->env;
 	u32 written;
 	void* pBuffer;
-		if (!env)
-		  return;
+	if (!env)
+		return;
 #ifdef DROID_EXTREME_LOGS
-		LOGV("[Android Audio] WAV_WriteAudio() : entering",ctx->sampleRateInHz);
+	LOGV("[Android Audio] WAV_WriteAudio() : entering",ctx->sampleRateInHz);
 #endif /* DROID_EXTREME_LOGS */
 	pBuffer = (*env)->GetPrimitiveArrayCritical(env, ctx->buff, NULL);
 	if (pBuffer)
@@ -286,45 +295,45 @@
 
 	switch ( PlayType )
 	{
-		case 0:
-			// Stop playing
-			(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mStop);
-			// Clear the internal buffers
-			(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mFlush);
-			break;
-		case 2:
-			(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mFlush);
-		case 1:
-			(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mPlay);
-			break;
-		default:
-			LOGW("[Android Audio] Unknown Play method=%d.\n", PlayType);
+	case 0:
+		// Stop playing
+		(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mStop);
+		// Clear the internal buffers
+		(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mFlush);
+		break;
+	case 2:
+		(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mFlush);
+	case 1:
+		(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mPlay);
+		break;
+	default:
+		LOGW("[Android Audio] Unknown Play method=%d.\n", PlayType);
 	}
 	LOGV("[Android Audio] Play DONE (%d).\n", PlayType);
 }
 
-static void WAV_UpdateVolume(DroidContext *ctx){
-		float lV, rV;
-		JNIEnv* env = GetEnv();
-		if (!ctx)
-			return;
-		if (ctx->pan > 100)
-			ctx->pan = 100;
-		lV =rV = ctx->volume / 100.0;
-		if (ctx->pan > 50){
-			float m = (100 - ctx->pan) / 50.0;
-			lV*=m;
-		} else if (ctx->pan < 50){
-			float m = ctx->pan / 50.0;
-			rV*=m;
-		}
-		if (env && setStereoVolume && mtrack && cAudioTrack){
-			int success;
-			if (0!= (success=((*env)->CallNonvirtualIntMethod(env, mtrack, cAudioTrack, setStereoVolume, lV, rV))))
-				LOGE3("SetVolume(%f,%f) returned Error code %d", lV, rV, success );
-		} else {
-			LOGD2("SetVolume(%f,%f)", lV, rV );
-		}
+static void WAV_UpdateVolume(DroidContext *ctx) {
+	float lV, rV;
+	JNIEnv* env = GetEnv();
+	if (!ctx)
+		return;
+	if (ctx->pan > 100)
+		ctx->pan = 100;
+	lV =rV = ctx->volume / 100.0;
+	if (ctx->pan > 50) {
+		float m = (100 - ctx->pan) / 50.0;
+		lV*=m;
+	} else if (ctx->pan < 50) {
+		float m = ctx->pan / 50.0;
+		rV*=m;
+	}
+	if (env && setStereoVolume && mtrack && cAudioTrack) {
+		int success;
+		if (0!= (success=((*env)->CallNonvirtualIntMethod(env, mtrack, cAudioTrack, setStereoVolume, lV, rV))))
+			LOGE3("SetVolume(%f,%f) returned Error code %d", lV, rV, success );
+	} else {
+		LOGD2("SetVolume(%f,%f)", lV, rV );
+	}
 }
 
 static void WAV_SetVolume(GF_AudioOutput *dr, u32 Volume) {
@@ -354,53 +363,53 @@
 	audioFormat = (*nbBitsPerSample == 8)? ENCODING_PCM_8BIT : ENCODING_PCM_16BIT;
 
 	LOGV3("[Android Audio] Query: SampleRate ChannelConfig AudioFormat: %d %d %d \n",
-		sampleRateInHz,
-		(channelConfig == CHANNEL_CONFIGURATION_MONO)? 1 : 2,
-		(ctx->audioFormat == ENCODING_PCM_8BIT)? 8 : 16);
+	      sampleRateInHz,
+	      (channelConfig == CHANNEL_CONFIGURATION_MONO)? 1 : 2,
+	      (ctx->audioFormat == ENCODING_PCM_8BIT)? 8 : 16);
 
 	switch (*desired_samplerate) {
 	case 11025:
 		*desired_samplerate = 11025;
 		if ( (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			*desired_samplerate, channelConfig, audioFormat) > 0 )
+		                                 *desired_samplerate, channelConfig, audioFormat) > 0 )
 			return GF_OK;
 	case 22050:
 		*desired_samplerate = 22050;
 		if ( (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			*desired_samplerate, channelConfig, audioFormat) > 0 )
+		                                 *desired_samplerate, channelConfig, audioFormat) > 0 )
 			return GF_OK;
 		break;
 	case 8000:
 		*desired_samplerate = 8000;
 		if ( (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			*desired_samplerate, channelConfig, audioFormat) > 0 )
+		                                 *desired_samplerate, channelConfig, audioFormat) > 0 )
 			return GF_OK;
 	case 16000:
 		*desired_samplerate = 16000;
 		if ( (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			*desired_samplerate, channelConfig, audioFormat) > 0 )
+		                                 *desired_samplerate, channelConfig, audioFormat) > 0 )
 			return GF_OK;
 	case 32000:
 		*desired_samplerate = 32000;
 		if ( (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			*desired_samplerate, channelConfig, audioFormat) > 0 )
+		                                 *desired_samplerate, channelConfig, audioFormat) > 0 )
 			return GF_OK;
 		break;
 	case 24000:
 		*desired_samplerate = 24000;
 		if ( (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			*desired_samplerate, channelConfig, audioFormat) > 0 )
+		                                 *desired_samplerate, channelConfig, audioFormat) > 0 )
 			return GF_OK;
 	case 48000:
 		*desired_samplerate = 48000;
 		if ( (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			*desired_samplerate, channelConfig, audioFormat) > 0 )
+		                                 *desired_samplerate, channelConfig, audioFormat) > 0 )
 			return GF_OK;
 		break;
 	case 44100:
 		*desired_samplerate = 44100;
 		if ( (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			*desired_samplerate, channelConfig, audioFormat) > 0 )
+		                                 *desired_samplerate, channelConfig, audioFormat) > 0 )
 			return GF_OK;
 		break;
 	default:
@@ -491,4 +500,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( droid_audio )
+GPAC_MODULE_STATIC_DECLARATION( droid_audio )

gpac-0.5.0.svn5178.tar.bz2/modules/droid_audio/javaenv.c -> gpac-0.5.1.svn5491.tar.xz/modules/droid_audio/javaenv.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -30,20 +30,20 @@
 //----------------------------------------------------------------------
 jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
-    javaVM = vm;
-    return JNI_VERSION_1_2;
+	javaVM = vm;
+	return JNI_VERSION_1_2;
 }
 //----------------------------------------------------------------------
 JNIEnv* GetEnv()
 {
-    JNIEnv* env = 0;
-    //if (javaVM) javaVM->GetEnv((void**)&env, JNI_VERSION_1_2);
+	JNIEnv* env = 0;
+	//if (javaVM) javaVM->GetEnv((void**)&env, JNI_VERSION_1_2);
 	if (javaVM) (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
-    return env;
+	return env;
 }
 //----------------------------------------------------------------------
 JavaVM* GetJavaVM()
 {
-    return javaVM;
+	return javaVM;
 }
 //----------------------------------------------------------------------

gpac-0.5.0.svn5178.tar.bz2/modules/droid_audio/javaenv.h -> gpac-0.5.1.svn5491.tar.xz/modules/droid_audio/javaenv.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/droid_cam/droid_cam.c -> gpac-0.5.1.svn5491.tar.xz/modules/droid_cam/droid_cam.c Changed

@@ -57,10 +57,14 @@
 static jmethodID getImageHeight;
 static jmethodID getImageWidth;
 
+#ifndef GPAC_STATIC_MODULES
 jint JNI_OnLoad(JavaVM* vm, void* reserved)
+#else
+jint static_JNI_OnLoad(JavaVM* vm, void* reserved)
+#endif
 {
 	JNIEnv* env = 0;
-  javaVM = vm;
+	javaVM = vm;
 
 	if ( (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
 		return -1;
@@ -144,10 +148,12 @@
 
 	return JNI_VERSION_1_2;
 }
+
+#ifndef GPAC_STATIC_MODULES
 //----------------------------------------------------------------------
 JavaVM* GetJavaVM()
 {
-    return javaVM;
+	return javaVM;
 }
 
 JNIEnv* GetEnv()
@@ -158,14 +164,19 @@
 
 	return env;
 }
+#else
+JavaVM* GetJavaVM();
+JNIEnv* GetEnv();
+
+#endif
 
 void JNI_OnUnload(JavaVM *vm, void *reserved)
 {
 	JNIEnv* env = 0;
-  	
+
 	if ( (*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
 		return;
-	
+
 	(*env)->DeleteGlobalRef(env, camCtrlClass);
 }
 //----------------------------------------------------------------------
@@ -268,12 +279,11 @@
 		read->isAttached = 1;
 		//(*rc->env)->PushLocalFrame(rc->env, 2);
 	}
-	else 
-		if ( res == JNI_EVERSION )
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The specified version is not supported\n"));
-			return;
-		}
+	else if ( res == JNI_EVERSION )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The specified version is not supported\n"));
+		return;
+	}
 
 	read->env = env;
 	read->camCtrlClass = camCtrlClass;
@@ -313,7 +323,7 @@
 	loadCameraControler(read);
 
 	/*reply to user*/
-	gf_term_on_connect(serv, NULL, GF_OK);
+	gf_service_connect_ack(serv, NULL, GF_OK);
 	//if (read->no_service_desc) isor_declare_objects(read);
 
 	return GF_OK;
@@ -330,12 +340,12 @@
 
 	reply = GF_OK;
 
-	(*GetEnv())->DeleteLocalRef( GetEnv(), read->camCtrlObj ); 
+	(*GetEnv())->DeleteLocalRef( GetEnv(), read->camCtrlObj );
 	read->camCtrlObj = NULL;
 
 	//unloadCameraControler(read);
 
-	gf_term_on_disconnect(read->service, NULL, reply);
+	gf_service_disconnect_ack(read->service, NULL, reply);
 	return GF_OK;
 }
 
@@ -367,7 +377,7 @@
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 		esd->ESID = 1;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
-		
+
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 		read->width = getWidth(read);
@@ -414,7 +424,7 @@
 
 	camStartCamera(read);
 
-	gf_term_on_connect(read->service, channel, e);
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -431,7 +441,7 @@
 
 	camStopCamera(read);
 
-	gf_term_on_disconnect(read->service, channel, e);
+	gf_service_disconnect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -474,7 +484,7 @@
 				b = 262143;
 
 			rgb[yp] = 0xff000000 | ((r << 6) & 0xff0000)
-						| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
+			          | ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
 //			rgb[ti+tj] = 0xff000000 | ((r << 6) & 0xff0000)
 //					| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
 		}
@@ -512,8 +522,8 @@
 		memset(&hdr, 0, sizeof(hdr));
 		hdr.compositionTimeStampFlag = 1;
 		hdr.compositionTimeStamp = cts;
-		gf_term_on_sl_packet(ctx->service, ctx->channel, (void*)data, datasize, &hdr, GF_OK);
-		
+		gf_service_send_packet(ctx->service, ctx->channel, (void*)data, datasize, &hdr, GF_OK);
+
 		//gf_free(data);
 
 		(*env)->ReleaseByteArrayElements(env,arr,jdata,JNI_ABORT);
@@ -545,7 +555,7 @@
 	(*env)->CallNonvirtualVoidMethod(env, read->camCtrlObj, read->camCtrlClass, methodID);
 
 	if (isAttached)
-	{	
+	{
 		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
 	}
 }
@@ -645,28 +655,28 @@
 	case GF_NET_CHAN_GET_PIXEL_AR:
 		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_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));
-			/*it may happen that there are conflicting config when using ESD URLs...*/
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-			read->width = getWidth(read);
-			read->height = getHeight(read);
-
-			gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
-			gf_bs_write_u16(bs, read->width); // width
-			gf_bs_write_u16(bs, read->height); // height
-			gf_bs_write_u32(bs, read->width * read->height * CAM_PIXEL_SIZE); // framesize
-			gf_bs_write_u32(bs, read->width * CAM_PIXEL_SIZE); // stride
-
-			gf_bs_align(bs);
-			gf_bs_get_content(bs, &buf, &buf_size);
-			gf_bs_del(bs);
-
-			com->get_dsi.dsi = buf;
-			com->get_dsi.dsi_len = buf_size;
-			return GF_OK;
-		}
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));
+		/*it may happen that there are conflicting config when using ESD URLs...*/
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		read->width = getWidth(read);
+		read->height = getHeight(read);
+
+		gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
+		gf_bs_write_u16(bs, read->width); // width
+		gf_bs_write_u16(bs, read->height); // height
+		gf_bs_write_u32(bs, read->width * read->height * CAM_PIXEL_SIZE); // framesize
+		gf_bs_write_u32(bs, read->width * CAM_PIXEL_SIZE); // stride
+
+		gf_bs_align(bs);
+		gf_bs_get_content(bs, &buf, &buf_size);
+		gf_bs_del(bs);
+
+		com->get_dsi.dsi = buf;
+		com->get_dsi.dsi_len = buf_size;
+		return GF_OK;
+	}
 	}
 	return GF_NOT_SUPPORTED;
 }
@@ -688,6 +698,12 @@
 	GF_SAFEALLOC(reader, ISOMReader);
 	plug->priv = reader;
 	globReader = reader;
+
+
+#ifdef GPAC_STATIC_MODULES
+	static_JNI_OnLoad(GetJavaVM(), NULL);
+#endif
+
 	return plug;
 }
 
@@ -722,8 +738,10 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE: CAM_client_del(ifce); break;
+	case GF_NET_CLIENT_INTERFACE:
+		CAM_client_del(ifce);
+		break;
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( droid_cam )
+GPAC_MODULE_STATIC_DECLARATION( droid_cam )

gpac-0.5.0.svn5178.tar.bz2/modules/droid_mpegv/droid_mpegv.c -> gpac-0.5.1.svn5491.tar.xz/modules/droid_mpegv/droid_mpegv.c Changed

@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include <jni.h>
@@ -57,11 +57,13 @@
 static jmethodID startSensor;
 static jmethodID stopSensor;
 
+#ifndef GPAC_STATIC_MODULES
+
 //----------------------------------------------------------------------
 jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
 	JNIEnv* env = 0;
-  	javaVM = vm;
+	javaVM = vm;
 
 	if ( (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
 		return -1;
@@ -114,18 +116,24 @@
 void JNI_OnUnload(JavaVM *vm, void *reserved)
 {
 	JNIEnv* env = 0;
-  	
+
 	if ( (*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
 		return;
-	
+
 	(*env)->DeleteGlobalRef(env, sensCtrlClass);
 }
+
 //----------------------------------------------------------------------
 JavaVM* GetJavaVM()
 {
 	return javaVM;
 }
 //----------------------------------------------------------------------
+#else
+JavaVM* GetJavaVM();
+JNIEnv* GetEnv();
+
+#endif
 
 typedef struct
 {
@@ -177,18 +185,17 @@
 		rc->isAttached = 1;
 		(*env)->PushLocalFrame(env, 2);
 	}
-	else 
-		if ( res == JNI_EVERSION )
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] The specified version is not supported\n"));
-			return;
-		}
-	
+	else if ( res == JNI_EVERSION )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] The specified version is not supported\n"));
+		return;
+	}
+
 	rc->env = env;
 	rc->sensCtrlClass = sensCtrlClass;
 	rc->cid = cid;
 	rc->startSensor = startSensor;
-	rc->stopSensor = stopSensor;	
+	rc->stopSensor = stopSensor;
 
 	// Create the sensor object in the thread
 	rc->sensCtrlObj = (*rc->env)->NewObject(rc->env, rc->sensCtrlClass, rc->cid);
@@ -202,7 +209,7 @@
 Bool MPEGVS_RegisterDevice(struct __input_device *dr, const char *urn, GF_BitStream *dsi, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name))
 {
 	MPEGVSCTX;
-	
+
 	//"MPEG-V:siv:OrientationSensorType"
 
 	if ( strnicmp(urn, "MPEG-V", 6) )
@@ -213,7 +220,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] No sensor type specified\n"));
 		return 0;
 	}
-	
+
 	if ( strnicmp(urn+6, ":siv:", 5) )
 	{
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] Not valid sensor type specified\n"));
@@ -302,13 +309,13 @@
 	u32 buf_size;
 	float x, y, z, q, a, b;
 	MPEGVSCTX;
-	
+
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
-	if ( rc->sensorAndroidType == 1 
-			|| rc->sensorAndroidType == 2
-			|| rc->sensorAndroidType == 3
-			|| rc->sensorAndroidType == 4 )
+	if ( rc->sensorAndroidType == 1
+	        || rc->sensorAndroidType == 2
+	        || rc->sensorAndroidType == 3
+	        || rc->sensorAndroidType == 4 )
 	{
 		sscanf(data, "%f;%f;%f;", &x, &y, &z);
 		gf_bs_write_int(bs, 1, 1);
@@ -316,17 +323,15 @@
 		gf_bs_write_float(bs, y);
 		gf_bs_write_float(bs, z);
 	}
-	else
-	if ( rc->sensorAndroidType == 5
-			|| rc->sensorAndroidType == 6 )
+	else if ( rc->sensorAndroidType == 5
+	          || rc->sensorAndroidType == 6 )
 	{
 		sscanf(data, "%f;", &x);
-		
+
 		gf_bs_write_int(bs, 1, 1);
 		gf_bs_write_float(bs, x);
 	}
-	else 
-	if ( rc->sensorAndroidType == 11 )
+	else if ( rc->sensorAndroidType == 11 )
 	{
 		sscanf(data, "%f;%f;%f;", &x, &y, &z);
 
@@ -336,8 +341,7 @@
 		gf_bs_write_float(bs, z);
 		/*gf_bs_write_float(bs, q);*/
 	}
-	else 
-	if ( rc->sensorAndroidType == 100 )
+	else if ( rc->sensorAndroidType == 100 )
 	{
 		sscanf(data, "%f;%f;%f;%f;%f;", &x, &y, &z, &a, &b);
 
@@ -388,14 +392,14 @@
 
 	while (!rc->stop)
 		gf_sleep(10);
-	
+
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Stop: %d\n", gf_th_id()));
 
 	if (!rc->env)
 		return;
 
 	if ( rc->sensCtrlObj )
- 	{
+	{
 		(*rc->env)->CallNonvirtualVoidMethod(rc->env, rc->sensCtrlObj, rc->sensCtrlClass, rc->stopSensor);
 
 		(*rc->env)->DeleteLocalRef( rc->env, rc->sensCtrlObj );
@@ -407,7 +411,7 @@
 void MPEGVS_Start(struct __input_device * dr)
 {
 	MPEGVSCTX;
-	
+
 	rc->trd = gf_th_new("MPEG-V_IN");
 	gf_th_run(rc->trd, ThreadRun, dr);
 }
@@ -432,7 +436,7 @@
 {
 	MPEGVSensorContext* ctx = NULL;
 	GF_InputSensorDevice* driv = NULL;
-	
+
 	driv = (GF_InputSensorDevice *) gf_malloc(sizeof(GF_InputSensorDevice));
 	memset(driv, 0, sizeof(GF_InputSensorDevice));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_INPUT_DEVICE_INTERFACE, "MPEG-V Sensors Input Module", "gpac distribution");
@@ -443,7 +447,7 @@
 
 	ctx = (MPEGVSensorContext*) gf_malloc (sizeof(MPEGVSensorContext));
 	memset(ctx, 0, sizeof(MPEGVSensorContext));
-	
+
 	driv->udta = (void*)ctx;
 
 	return driv;
@@ -458,13 +462,13 @@
 
 /*interface query*/
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_INPUT_DEVICE_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 /*interface create*/
@@ -486,4 +490,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( droid_mpegv )
+GPAC_MODULE_STATIC_DECLARATION( droid_mpegv )

gpac-0.5.0.svn5178.tar.bz2/modules/droid_out/droid_vout-bitmap.c -> gpac-0.5.1.svn5491.tar.xz/modules/droid_out/droid_vout-bitmap.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -59,14 +59,14 @@
 	RAWCTX;
 	void * pixels;
 	int ret;
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Android vout RAW_Setup\n"));
-	
+
 	if (!rc->width)
 	{
 		rc->env = (JNIEnv *)os_handle;
 		rc->bitmap = (jobject *)os_display;
-		
+
 		AndroidBitmap_getInfo(rc->env, *(rc->bitmap), &info);
 		rc->width = info.width;
 		rc->height = info.height;
@@ -77,9 +77,9 @@
 		rc->env = (JNIEnv *)os_handle;
 		rc->bitmap = (jobject *)os_display;
 	}
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Android vout rc dims: %d:%d\n", rc->height, rc->width));
-	
+
 	return GF_OK;
 }
 
@@ -103,7 +103,7 @@
 	RAWCTX;
 	int ret;
 	void * pixels;
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Android vout RAW_LockBackBuffer: %d\n", do_lock));
 	if (do_lock) {
 		if (!vi) return GF_BAD_PARAM;
@@ -168,9 +168,9 @@
 	driv->Setup = RAW_Setup;
 	driv->Shutdown = RAW_Shutdown;
 	driv->ProcessEvent = RAW_ProcessEvent;
-	
+
 	driv->hw_caps = GF_VIDEO_HW_OPENGL;
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Android vout init\n"));
 	return (void *)driv;
 }
@@ -184,19 +184,19 @@
 	rc = (AndroidContext *)driv->opaque;
 	gf_free(rc);
 	gf_free(driv);
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Android vout deinit\n"));
 }
 
 /*interface query*/
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_VIDEO_OUTPUT_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 /*interface create*/
 GPAC_MODULE_EXPORT
@@ -216,4 +216,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( droid_vidbmp )
+GPAC_MODULE_STATIC_DECLARATION( droid_vidbmp )

gpac-0.5.0.svn5178.tar.bz2/modules/droid_out/droid_vout.c -> gpac-0.5.1.svn5491.tar.xz/modules/droid_out/droid_vout.c Changed

@@ -107,78 +107,78 @@
 		LOG( ANDROID_LOG_INFO, TAG, "Using GL_ARB_texture_non_power_of_two");
 	}
 
-    /* Enable smooth shading */
-    glShadeModel(GL_SMOOTH);
+	/* Enable smooth shading */
+	glShadeModel(GL_SMOOTH);
 
-    /* Set the background black */
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+	/* Set the background black */
+	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
-    /* Depth buffer setup */
-    glClearDepthf(1.0f);
+	/* Depth buffer setup */
+	glClearDepthf(1.0f);
 
-    /* Enables Depth Testing */
-    glEnable(GL_DEPTH_TEST);
+	/* Enables Depth Testing */
+	glEnable(GL_DEPTH_TEST);
 
-    /* The Type Of Depth Test To Do */
-    glDepthFunc(GL_LEQUAL);
+	/* The Type Of Depth Test To Do */
+	glDepthFunc(GL_LEQUAL);
 
-    /* Really Nice Perspective Calculations */
-    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+	/* Really Nice Perspective Calculations */
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
-    glDisable(GL_CULL_FACE | GL_NORMALIZE | GL_LIGHTING | GL_BLEND | GL_FOG | GL_COLOR_MATERIAL | GL_TEXTURE_2D);
+	glDisable(GL_CULL_FACE | GL_NORMALIZE | GL_LIGHTING | GL_BLEND | GL_FOG | GL_COLOR_MATERIAL | GL_TEXTURE_2D);
 }
 
 void gluPerspective(GLfloat fovy, GLfloat aspect,
-                           GLfloat zNear, GLfloat zFar)
+                    GLfloat zNear, GLfloat zFar)
 {
-    GLfloat xmin, xmax, ymin, ymax;
+	GLfloat xmin, xmax, ymin, ymax;
 
-    ymax = zNear * (GLfloat)tan(fovy * PI / 360);
-    ymin = -ymax;
-    xmin = ymin * aspect;
-    xmax = ymax * aspect;
+	ymax = zNear * (GLfloat)tan(fovy * PI / 360);
+	ymin = -ymax;
+	xmin = ymin * aspect;
+	xmax = ymax * aspect;
 
-    glFrustumx((GLfixed)(xmin * 65536), (GLfixed)(xmax * 65536),
-               (GLfixed)(ymin * 65536), (GLfixed)(ymax * 65536),
-               (GLfixed)(zNear * 65536), (GLfixed)(zFar * 65536));
+	glFrustumx((GLfixed)(xmin * 65536), (GLfixed)(xmax * 65536),
+	           (GLfixed)(ymin * 65536), (GLfixed)(ymax * 65536),
+	           (GLfixed)(zNear * 65536), (GLfixed)(zFar * 65536));
 }
 
 void resizeWindow(AndroidContext *rc)
 {
-    LOG( ANDROID_LOG_VERBOSE, TAG, "resizeWindow : start");
-    /* Height / width ration */
-    GLfloat ratio;
+	LOG( ANDROID_LOG_VERBOSE, TAG, "resizeWindow : start");
+	/* Height / width ration */
+	GLfloat ratio;
 
-    /* Protect against a divide by zero */
-    if (rc->height==0)
-    {
-    	rc->height=1;
-    }
+	/* Protect against a divide by zero */
+	if (rc->height==0)
+	{
+		rc->height=1;
+	}
 
-    ratio=(GLfloat)rc->width/(GLfloat)rc->height;
+	ratio=(GLfloat)rc->width/(GLfloat)rc->height;
 
-    /* Setup our viewport. */
-    glViewport(0, 0, (GLsizei)rc->width, (GLsizei)rc->height);
+	/* Setup our viewport. */
+	glViewport(0, 0, (GLsizei)rc->width, (GLsizei)rc->height);
 
-    /* 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();
-    LOG( ANDROID_LOG_VERBOSE, TAG, "resizeWindow : end");
+	/* Reset The View */
+	glLoadIdentity();
+	LOG( ANDROID_LOG_VERBOSE, TAG, "resizeWindow : end");
 }
 
 void drawGLScene(AndroidContext *rc)
 {
 #ifdef DROID_EXTREME_LOGS
-        LOG( ANDROID_LOG_VERBOSE, TAG, "drawGLScene : start");
+	LOG( ANDROID_LOG_VERBOSE, TAG, "drawGLScene : start");
 #endif /* DROID_EXTREME_LOGS */
 	GLfloat vertices[4][3];
 	GLfloat texcoord[4][2];
@@ -199,14 +199,14 @@
 	glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, rgba);
 	glDisable(GL_CULL_FACE | GL_NORMALIZE | GL_LIGHTING | GL_BLEND | GL_FOG | GL_COLOR_MATERIAL | GL_TEXTURE_2D);
 
-    /* Clear The Screen And The Depth Buffer */
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	/* Clear The Screen And The Depth Buffer */
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    //glEnable(GL_BLEND);
-    //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	//glEnable(GL_BLEND);
+	//glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-    glEnable(GL_TEXTURE_2D);
-    glBindTexture( GL_TEXTURE_2D, rc->texID);
+	glEnable(GL_TEXTURE_2D);
+	glBindTexture( GL_TEXTURE_2D, rc->texID);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
 	glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -219,8 +219,8 @@
 
 //    memset(rc->texData, 255, 4 * rc->width * rc->height );
 #ifndef GLES_FRAMEBUFFER_TEST
-    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, rc->tex_width, rc->tex_height, 0,
-		GL_RGBA, GL_UNSIGNED_BYTE, rc->texData );
+	glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, rc->tex_width, rc->tex_height, 0,
+	              GL_RGBA, GL_UNSIGNED_BYTE, rc->texData );
 #endif
 
 	if ( rc->draw_texture )
@@ -246,17 +246,29 @@
 		//glTranslatef(0.0f, 0.0f, -2.3f);
 
 		/* Top Right Of The Quad    */
-		vertices[0][0]=rc->tex_width;  vertices[0][1]=rc->tex_height;  vertices[0][2]=0.0f;
-		texcoord[0][0]=1.f;   texcoord[0][1]=0.f;
+		vertices[0][0]=rc->tex_width;
+		vertices[0][1]=rc->tex_height;
+		vertices[0][2]=0.0f;
+		texcoord[0][0]=1.f;
+		texcoord[0][1]=0.f;
 		/* Top Left Of The Quad     */
-		vertices[1][0]=0.f; vertices[1][1]=rc->tex_height;  vertices[1][2]=0.0f;
-		texcoord[1][0]=0.f;   texcoord[1][1]=0.f;
+		vertices[1][0]=0.f;
+		vertices[1][1]=rc->tex_height;
+		vertices[1][2]=0.0f;
+		texcoord[1][0]=0.f;
+		texcoord[1][1]=0.f;
 		/* Bottom Left Of The Quad  */
-		vertices[2][0]=rc->tex_width;  vertices[2][1]=0.f; vertices[2][2]=0.0f;
-		texcoord[2][0]=1.f;   texcoord[2][1]=1.f;
+		vertices[2][0]=rc->tex_width;
+		vertices[2][1]=0.f;
+		vertices[2][2]=0.0f;
+		texcoord[2][0]=1.f;
+		texcoord[2][1]=1.f;
 		/* Bottom Right Of The Quad */
-		vertices[3][0]=0.f; vertices[3][1]=0.f; vertices[3][2]=0.0f;
-		texcoord[3][0]=0.f;   texcoord[3][1]=1.f;
+		vertices[3][0]=0.f;
+		vertices[3][1]=0.f;
+		vertices[3][2]=0.0f;
+		texcoord[3][0]=0.f;
+		texcoord[3][1]=1.f;
 
 		/* Drawing using triangle strips, draw triangles using 4 vertices */
 		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -266,22 +278,22 @@
 		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	}
 
-    glDisable(GL_TEXTURE_2D);
+	glDisable(GL_TEXTURE_2D);
 
-    /* Flush all drawings */
-    glFinish();
+	/* Flush all drawings */
+	glFinish();
 #ifdef GLES_FRAMEBUFFER_TEST
 	glBindFramebufferOES(GL_FRAMEBUFFER_OES, rc->framebuff);
 #endif
 #ifdef DROID_EXTREME_LOGS
-    LOG( ANDROID_LOG_VERBOSE, TAG, "drawGLScene : end");
+	LOG( ANDROID_LOG_VERBOSE, TAG, "drawGLScene : end");
 #endif /* DROID_EXTREME_LOGS */
 }
 
 int releaseTexture(AndroidContext *rc)
 {
-        if (!rc)
-          return 0;
+	if (!rc)
+		return 0;
 	LOG( ANDROID_LOG_DEBUG, TAG, "Android Delete Texture");
 
 	if ( rc->texID >= 0 )
@@ -300,13 +312,13 @@
 
 int createTexture(AndroidContext *rc)
 {
-        if (!rc)
-          return 0;
+	if (!rc)
+		return 0;
 	if ( rc->texID >= 0 )
 		releaseTexture(rc);
 
 	LOG( ANDROID_LOG_INFO, TAG, "Android Create Texture Size: WxH: %dx%d",
-                                            rc->tex_width, rc->tex_height);
+	     rc->tex_width, rc->tex_height);
 
 	glGenTextures( 1, &(rc->texID) );
 
@@ -322,10 +334,10 @@
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
 	glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, rc->tex_width, rc->tex_height, 0,
-				GL_RGBA, GL_UNSIGNED_BYTE, NULL/*rc->texData*/ );
+	              GL_RGBA, GL_UNSIGNED_BYTE, NULL/*rc->texData*/ );
 
 	glBindTexture( GL_TEXTURE_2D, 0);
-        LOG( ANDROID_LOG_VERBOSE, TAG, "Android Create Texture DONE");
+	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Create Texture DONE");
 	return 0;
 }
 
@@ -361,7 +373,7 @@
 	LOG( ANDROID_LOG_DEBUG, TAG, "Android Create FrameBuffer"));
 
 	glGenFramebuffersOES(1, &(rc->framebuff));
-    glBindFramebufferOES(GL_FRAMEBUFFER_OES, rc->framebuff);
+	glBindFramebufferOES(GL_FRAMEBUFFER_OES, rc->framebuff);
 
 //	glGenRenderbuffersOES(1, &(rc->depthbuff));
 //	glBindRenderbufferOES(GL_RENDERBUFFER_OES, rc->depthbuff);
@@ -377,37 +389,37 @@
 //            GL_RENDERBUFFER_OES, rc->depthbuff);
 
 	glFramebufferTexture2DOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES,
-			GL_TEXTURE_2D, rc->texID, 0);
+	                          GL_TEXTURE_2D, rc->texID, 0);
 
 	if ( (res=(int)glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES)) != GL_FRAMEBUFFER_COMPLETE_OES )
 	{
 		LOG( ANDROID_LOG_ERROR, TAG, "Android failed to make complete framebuffer object:");
 		switch (res)
 		{
-			case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES:
-				LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES");
-				break;
-			case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES:
-				LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES");
-				break;
-			case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES:
-				LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES");
-				break;
-			case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES:
-				LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES");
-				break;
-			case GL_FRAMEBUFFER_UNSUPPORTED_OES:
-				LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_UNSUPPORTED_OES");
-				break;
-			default :
-				LOG( ANDROID_LOG_ERROR, TAG, "Unknown error: %d", res);
-				break;
+		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES:
+			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES");
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES:
+			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES");
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES:
+			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES");
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES:
+			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES");
+			break;
+		case GL_FRAMEBUFFER_UNSUPPORTED_OES:
+			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_UNSUPPORTED_OES");
+			break;
+		default :
+			LOG( ANDROID_LOG_ERROR, TAG, "Unknown error: %d", res);
+			break;
 		}
 
-        return 1;
-    }
+		return 1;
+	}
 
-    //glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
+	//glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
 
 	return 0;
 }
@@ -450,7 +462,7 @@
 		createFrameBuffer(rc);
 #endif
 	}
-        LOG( ANDROID_LOG_VERBOSE, TAG, "Android Resize DONE", w, h);
+	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Resize DONE", w, h);
 	return GF_OK;
 }
 
@@ -466,7 +478,7 @@
 	if ( rc->out_3d_type == 0 )
 #endif
 		initGL(rc);
-        LOG( ANDROID_LOG_VERBOSE, TAG, "Android Setup DONE");
+	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Setup DONE");
 	return GF_OK;
 }
 
@@ -480,7 +492,7 @@
 #ifdef GLES_FRAMEBUFFER_TEST
 	releaseFrameBuffer(rc);
 #endif
-        LOG( ANDROID_LOG_VERBOSE, TAG, "Android Shutdown DONE");
+	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Shutdown DONE");
 }
 
 
@@ -496,7 +508,7 @@
 #endif
 		drawGLScene(rc);
 #ifdef DROID_EXTREME_LOGS
-        LOG( ANDROID_LOG_VERBOSE, TAG, "Android Flush DONE");
+	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Flush DONE");
 #endif /* DROID_EXTREME_LOGS */
 	return GF_OK;
 }
@@ -550,39 +562,39 @@
 	if (evt) {
 		switch (evt->type) {
 		case GF_EVENT_SIZE:
-                        LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SIZE( %d x %d)",
-                              evt->setup.width, evt->setup.height);
+			LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SIZE( %d x %d)",
+			     evt->setup.width, evt->setup.height);
 			//if (evt->setup.opengl_mode) return GF_OK;
 			return droid_Resize(dr, evt->setup.width, evt->setup.height);
 		case GF_EVENT_VIDEO_SETUP:
 			LOG( ANDROID_LOG_DEBUG, TAG, "Android OpenGL mode: %d", evt->setup.opengl_mode);
 			switch (evt->setup.opengl_mode)
 			{
-				case 0:
-					rc->out_3d_type = 0;
+			case 0:
+				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:
-                                        LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SET_CURSOR");
-                                        return GF_OK;
-                                case GF_EVENT_SET_CAPTION:
-                                        LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SET_CAPTION");
-                                        return GF_OK;
-                                case GF_EVENT_SHOWHIDE:
-                                        LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SHOWHIDE");
-                                        return GF_OK;
-                                default:
-                                  LOG( ANDROID_LOG_DEBUG, TAG, "Process Unknown Event: %d", evt->type);
-                                  return GF_OK;
+				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:
+				LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SET_CURSOR");
+				return GF_OK;
+			case GF_EVENT_SET_CAPTION:
+				LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SET_CAPTION");
+				return GF_OK;
+			case GF_EVENT_SHOWHIDE:
+				LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SHOWHIDE");
+				return GF_OK;
+			default:
+				LOG( ANDROID_LOG_DEBUG, TAG, "Process Unknown Event: %d", evt->type);
+				return GF_OK;
 			}
 			break;
 		}
@@ -590,11 +602,11 @@
 	return GF_OK;
 }
 
-GF_VideoOutput *NewRawVideoOutput()
+GF_VideoOutput *NewAndroidVideoOutput()
 {
 	AndroidContext *pCtx;
 	GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
-        LOG( ANDROID_LOG_INFO, TAG, "Android Video Initialization in progress...");
+	LOG( ANDROID_LOG_INFO, TAG, "Android Video Initialization in progress...");
 	memset(driv, 0, sizeof(GF_VideoOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Android Video Output", "gpac distribution")
 
@@ -621,17 +633,17 @@
 	return (void *)driv;
 }
 
-void DeleteVideoOutput(void *ifce)
+void DeleteAndroidVideoOutput(void *ifce)
 {
 	AndroidContext *rc;
 	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
-        if (!ifce)
-          return;
+	if (!ifce)
+		return;
 	droid_Shutdown(driv);
 	rc = (AndroidContext *)driv->opaque;
-        if (rc)
-          gf_free(rc);
-        driv->opaque = NULL;
+	if (rc)
+		gf_free(rc);
+	driv->opaque = NULL;
 	gf_free(driv);
 	LOG( ANDROID_LOG_DEBUG, TAG, "Android vout deinit\n");
 }
@@ -650,7 +662,7 @@
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
-	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewRawVideoOutput();
+	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewAndroidVideoOutput();
 	return NULL;
 }
 /*interface destroy*/
@@ -659,9 +671,9 @@
 {
 	switch (ifce->InterfaceType) {
 	case GF_VIDEO_OUTPUT_INTERFACE:
-		DeleteVideoOutput((GF_VideoOutput *)ifce);
+		DeleteAndroidVideoOutput((GF_VideoOutput *)ifce);
 		break;
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( droid_vidgl )
+GPAC_MODULE_STATIC_DECLARATION( droid_vidgl )

gpac-0.5.0.svn5178.tar.bz2/modules/dummy_in/dummy_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/dummy_in/dummy_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -76,38 +76,38 @@
 }
 
 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
+	/*  "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_term_register_mime_type(plug, DC_MIME_TYPES[i], DC_MIME_TYPES[i+1], DC_MIME_TYPES[i+2]);
-    return i / 3;
+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 0;
-        sExt = strrchr(url, '.');
+	if (!plug || !url)
+		return 0;
+	sExt = strrchr(url, '.');
 	if (sExt) {
 		Bool ok = 0;
 		char *cgi_par;
@@ -117,16 +117,16 @@
 		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_term_check_extension(plug, DC_MIME_TYPES[i], DC_MIME_TYPES[i+1], DC_MIME_TYPES[i+2], sExt)))
-		      break;
+			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 1;
 	}
 	/*views:// internal URI*/
-	if (!strnicmp(url, "views://", 8)) 
+	if (!strnicmp(url, "views://", 8))
 		return 1;
 
 	if (!strncmp(url, "\\\\", 2)) return 0;
@@ -154,7 +154,7 @@
 	DCReader *read = (DCReader *) cbk;
 
 	/*handle service message*/
-	gf_term_download_update_stats(read->dnload);
+	gf_service_download_update_stats(read->dnload);
 
 	e = param->error;
 
@@ -181,7 +181,7 @@
 	/*OK confirm*/
 	if (!read->is_service_connected) {
 		if (!gf_dm_sess_get_cache_name(read->dnload)) e = GF_IO_ERR;
-		gf_term_on_connect(read->service, NULL, e);
+		gf_service_connect_ack(read->service, NULL, e);
 		read->is_service_connected = 1;
 	}
 }
@@ -190,9 +190,9 @@
 {
 	DCReader *read = (DCReader *) plug->priv;
 
-	read->dnload = gf_term_download_new(read->service, url, 0, DC_NetIO, read);
+	read->dnload = gf_service_download_new(read->service, url, 0, DC_NetIO, read);
 	if (!read->dnload) {
-		gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(read->dnload);
@@ -208,7 +208,7 @@
 
 	if (!read || !serv || !url) return GF_BAD_PARAM;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	read->url = gf_strdup(url);
@@ -233,7 +233,7 @@
 
 	if (!strnicmp(url, "views://", 8)) {
 		read->is_views_url = 1;
-		gf_term_on_connect(serv, NULL, GF_OK);
+		gf_service_connect_ack(serv, NULL, GF_OK);
 		read->is_service_connected = 1;
 		return GF_OK;
 	}
@@ -242,19 +242,21 @@
 		char *cgi_par = NULL;
 		ext += 1;
 		if (ext) {
-			tmp = strchr(ext, '#'); if (tmp) tmp[0] = 0;
+			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;
+			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")
-			)
+		        || !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")) {
@@ -295,12 +297,12 @@
 
 	test = gf_f64_open(read->url, "rt");
 	if (!test) {
-		gf_term_on_connect(serv, NULL, GF_URL_ERROR);
+		gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
 		return GF_OK;
 	}
 	fclose(test);
 	if (!read->is_service_connected) {
-		gf_term_on_connect(serv, NULL, GF_OK);
+		gf_service_connect_ack(serv, NULL, GF_OK);
 		read->is_service_connected = 1;
 	}
 	return GF_OK;
@@ -309,9 +311,9 @@
 GF_Err DC_CloseService(GF_InputService *plug)
 {
 	DCReader *read = (DCReader *) plug->priv;
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
-	gf_term_on_disconnect(read->service, NULL, GF_OK);
+	gf_service_disconnect_ack(read->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -374,10 +376,13 @@
 	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;
+	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_SET_PADDING:
+		return GF_OK;
 	case GF_NET_CHAN_BUFFER:
 		com->buffer.max = com->buffer.min = 0;
 		return GF_OK;
@@ -391,7 +396,8 @@
 		return GF_OK;
 	case GF_NET_CHAN_STOP:
 		return GF_OK;
-	case GF_NET_CHAN_CONFIG: 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;
@@ -409,14 +415,14 @@
 
 	sscanf(url, "ES_ID=%ud", &ESID);
 	if (!ESID) {
-		gf_term_on_connect(read->service, channel, GF_STREAM_NOT_FOUND);
+		gf_service_connect_ack(read->service, channel, GF_STREAM_NOT_FOUND);
 	} else {
 		DummyChannel *dc;
 		GF_SAFEALLOC(dc, DummyChannel);
 		dc->ch = channel;
 		dc->ESID = ESID;
 		gf_list_add(read->channels, dc);
-		gf_term_on_connect(read->service, channel, GF_OK);
+		gf_service_connect_ack(read->service, channel, GF_OK);
 	}
 	return GF_OK;
 }
@@ -427,7 +433,7 @@
 	DCReader *read = (DCReader *) plug->priv;
 
 	had_ch = DC_RemoveChannel(read, channel);
-	gf_term_on_disconnect(read->service, channel, had_ch ? GF_OK : GF_STREAM_NOT_FOUND);
+	gf_service_disconnect_ack(read->service, channel, had_ch ? GF_OK : GF_STREAM_NOT_FOUND);
 	return GF_OK;
 }
 
@@ -510,4 +516,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( dummy_in )
+GPAC_MODULE_STATIC_DECLARATION( dummy_in )

gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/copy_pixels.c -> gpac-0.5.1.svn5491.tar.xz/modules/dx_hw/copy_pixels.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,22 +11,22 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #include "dx_hw.h"
 
 
-static u32 get_yuv_base(u32 in_pf) 
+static u32 get_yuv_base(u32 in_pf)
 {
 	switch (in_pf) {
 	case GF_PIXEL_I420:
@@ -85,7 +85,7 @@
 
 
 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)
+                              u32 src_width, u32 src_height, const GF_Window *src_wnd, u8 *pU, u8 *pV)
 {
 
 	if (!pU) {
@@ -120,7 +120,7 @@
 
 			src = pY;
 			dst = vs->video_buffer;
-			
+
 			src2 = (vs->pixel_format != GF_PIXEL_YV12) ? pU : pV;
 			dst2 = vs->video_buffer + vs->pitch_y * vs->height;
 			src3 = (vs->pixel_format != GF_PIXEL_YV12) ? pV : pU;
@@ -148,7 +148,7 @@
 			v = pV + (i/2) * src_stride/2;
 			dst = vs->video_buffer + i*vs->pitch_y;
 
-			for (j=0; j<src_wnd->w/2;j++) {
+			for (j=0; j<src_wnd->w/2; j++) {
 				*dst = *u;
 				dst++;
 				u++;
@@ -172,7 +172,7 @@
 			v = pV + (i/2) * src_stride/2;
 			dst = vs->video_buffer + i*vs->pitch_y;
 
-			for (j=0; j<src_wnd->w/2;j++) {
+			for (j=0; j<src_wnd->w/2; j++) {
 				*dst = *y;
 				dst++;
 				y++;
@@ -196,7 +196,7 @@
 			v = pV + (i/2) * src_stride/2;
 			dst = vs->video_buffer + i*vs->pitch_y;
 
-			for (j=0; j<src_wnd->w/2;j++) {
+			for (j=0; j<src_wnd->w/2; j++) {
 				*dst = *y;
 				dst++;
 				y++;
@@ -215,7 +215,7 @@
 }
 
 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 src_width, u32 src_height, const GF_Window *src_wnd)
 {
 	u32 i, j, base_pf;
 	unsigned char *pY, *pU, *pV;
@@ -274,7 +274,7 @@
 		}
 		return;
 	}
-	
+
 	if (get_yuv_base(src_pf) == get_yuv_base(vs->pixel_format)) {
 		u32 i;
 		for (i=0; i<src_wnd->h; i++) {
@@ -404,7 +404,7 @@
 			}
 		}
 		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)
@@ -560,7 +560,7 @@
 	} 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);
+			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 (format_is_yuv(src_s->pixel_format)) {
@@ -589,7 +589,7 @@
 			return;
 		}
 	}
-	
+
 	gf_stretch_bits(dst_s, (GF_VideoSurface*) src_s, NULL, (GF_Window *)src_wnd, 0xFF, 0, NULL, NULL);
 }

gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_2d.c -> gpac-0.5.1.svn5491.tar.xz/modules/dx_hw/dx_2d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -90,21 +90,21 @@
 {
 	HRESULT hr;
 	RECT rc;
-    DDBLTFX ddbltfx;
+	DDBLTFX ddbltfx;
 	DDCONTEXT;
 
 	// Erase the background
-    ZeroMemory( &ddbltfx, sizeof(ddbltfx) );
-    ddbltfx.dwSize = sizeof(ddbltfx);
+	ZeroMemory( &ddbltfx, sizeof(ddbltfx) );
+	ddbltfx.dwSize = sizeof(ddbltfx);
 	switch (dd->pixelFormat) {
 	case GF_PIXEL_RGB_565:
-	    ddbltfx.dwFillColor = GF_COL_TO_565(color);
+		ddbltfx.dwFillColor = GF_COL_TO_565(color);
 		break;
 	case GF_PIXEL_RGB_555:
-	    ddbltfx.dwFillColor = GF_COL_TO_555(color);
+		ddbltfx.dwFillColor = GF_COL_TO_555(color);
 		break;
 	default:
-	    ddbltfx.dwFillColor = color;
+		ddbltfx.dwFillColor = color;
 		break;
 	}
 	rc.left = rc.top = 0;
@@ -120,8 +120,8 @@
 {
 	Bool force_reinit;
 	HRESULT hr;
-	const char *opt; 
-    DDSURFDESC ddsd;
+	const char *opt;
+	DDSURFDESC ddsd;
 
 	DDCONTEXT;
 
@@ -147,7 +147,7 @@
 	/*create backbuffer*/
 	ZeroMemory(&ddsd, sizeof(ddsd));
 	ddsd.dwSize = sizeof(ddsd);
-	ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;    
+	ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
 
 	if (dd->systems_memory==2) {
@@ -203,9 +203,9 @@
 	HRESULT hr;
 	DWORD cooplev;
 	LPDIRECTDRAW ddraw;
-    DDSURFDESC ddsd;
+	DDSURFDESC ddsd;
 	DDPIXELFORMAT pixelFmt;
-    LPDIRECTDRAWCLIPPER pcClipper;
+	LPDIRECTDRAWCLIPPER pcClipper;
 	DDCONTEXT;
 	if (!dd->cur_hwnd || !Width || !Height || !dd->DirectDrawCreate) return GF_BAD_PARAM;
 	DestroyObjects(dd);
@@ -240,15 +240,15 @@
 	if( FAILED(hr) ) return GF_IO_ERR;
 
 	/*create primary*/
-    ZeroMemory( &ddsd, sizeof( ddsd ) );
-    ddsd.dwSize = sizeof( ddsd );
-    ddsd.dwFlags = DDSD_CAPS;
+	ZeroMemory( &ddsd, sizeof( ddsd ) );
+	ddsd.dwSize = sizeof( ddsd );
+	ddsd.dwFlags = DDSD_CAPS;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
 
-    hr = dd->pDD->lpVtbl->CreateSurface(dd->pDD, &ddsd, &dd->pPrimary, NULL);
+	hr = dd->pDD->lpVtbl->CreateSurface(dd->pDD, &ddsd, &dd->pPrimary, NULL);
 	if( FAILED(hr) ) {
-   		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DX Out] Failed creating primary surface: error %08x\n", hr));
-	    return GF_IO_ERR;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DX Out] Failed creating primary surface: error %08x\n", hr));
+		return GF_IO_ERR;
 	}
 
 	/*get pixel format of video board*/
@@ -264,7 +264,7 @@
 			dd->pixelFormat = GF_PIXEL_RGB_565;
 		else if ((pixelFmt.dwRBitMask == 0x7c00) && (pixelFmt.dwGBitMask == 0x03e0) && (pixelFmt.dwBBitMask == 0x001f))
 			dd->pixelFormat = GF_PIXEL_RGB_555;
-		else 
+		else
 			return GF_NOT_SUPPORTED;
 		dd->video_bpp = 16;
 		break;
@@ -288,19 +288,19 @@
 	}
 
 	hr = dd->pDD->lpVtbl->CreateClipper(dd->pDD, 0, &pcClipper, NULL);
-    if( FAILED(hr)) 
+	if( FAILED(hr))
 		return GF_IO_ERR;
 
 	hr = pcClipper->lpVtbl->SetHWnd(pcClipper, 0, dd->cur_hwnd);
 	if( FAILED(hr) ) {
-        pcClipper->lpVtbl->Release(pcClipper);
-        return GF_IO_ERR;
-    }
-    hr = dd->pPrimary->lpVtbl->SetClipper(dd->pPrimary, pcClipper);
+		pcClipper->lpVtbl->Release(pcClipper);
+		return GF_IO_ERR;
+	}
+	hr = dd->pPrimary->lpVtbl->SetClipper(dd->pPrimary, pcClipper);
 	if( FAILED(hr)) {
 		pcClipper->lpVtbl->Release(pcClipper);
-        return GF_IO_ERR;
-    }
+		return GF_IO_ERR;
+	}
 	pcClipper->lpVtbl->Release(pcClipper);
 
 
@@ -311,16 +311,16 @@
 
 static GF_Err DD_LockSurface(DDContext *dd, GF_VideoSurface *vi, LPDDRAWSURFACE surface)
 {
-    HRESULT hr;
+	HRESULT hr;
 	DDSURFDESC desc;
-	
+
 	if (!dd || !vi || !surface) return GF_BAD_PARAM;
 
 	ZeroMemory(&desc, sizeof(desc));
 	desc.dwSize = sizeof(DDSURFACEDESC);
 
 	hr = surface->lpVtbl->Lock(surface, NULL, &desc, DDLOCK_SURFACEMEMORYPTR | /*DDLOCK_WRITEONLY | */ DDLOCK_WAIT, NULL);
-	if (FAILED(hr)) 
+	if (FAILED(hr))
 		return GF_IO_ERR;
 
 	vi->video_buffer = desc.lpSurface;
@@ -334,7 +334,7 @@
 
 static GF_Err DD_UnlockSurface(DDContext *dd, LPDDRAWSURFACE surface)
 {
-    HRESULT hr;
+	HRESULT hr;
 	if (!dd || !dd->ddraw_init) return GF_IO_ERR;
 	hr = surface->lpVtbl->Unlock(surface, NULL);
 	return FAILED(hr) ? GF_IO_ERR : GF_OK;
@@ -361,9 +361,9 @@
 
 	if (do_lock) {
 		if (!dd->lock_hdc && ! dd->pBack->lpVtbl->IsLost(dd->pBack)) {
-			if (FAILED(dd->pBack->lpVtbl->GetDC(dd->pBack, &dd->lock_hdc)) ) 
+			if (FAILED(dd->pBack->lpVtbl->GetDC(dd->pBack, &dd->lock_hdc)) )
 				dd->lock_hdc = NULL;
-		} 
+		}
 	} else if (dd->lock_hdc) {
 		dd->pBack->lpVtbl->ReleaseDC(dd->pBack, dd->lock_hdc);
 		dd->lock_hdc = NULL;
@@ -392,14 +392,18 @@
 		col = GF_COL_ARGB(0xFF, key->r, key->g, key->b);
 		ck.dwColorSpaceHighValue = ck.dwColorSpaceLowValue = col;
 		hr = src->pSurface->lpVtbl->SetColorKey(src->pSurface, DDCKEY_SRCBLT, &ck);
-		if (FAILED(hr)) 
+		if (FAILED(hr))
 			return GF_IO_ERR;
 	}
 
 	if ((dst_w==src_w) && (dst_h==src_h)) {
 		flags = DDBLTFAST_WAIT;
 		if (key) flags |= DDBLTFAST_SRCCOLORKEY;
-		if (dst_wnd) { left = r_dst.left; top = r_dst.top; } else left = top = 0; 
+		if (dst_wnd) {
+			left = r_dst.left;
+			top = r_dst.top;
+		}
+		else left = top = 0;
 		hr = dd->pBack->lpVtbl->BltFast(dd->pBack, left, top, src->pSurface, src_wnd ? &r_src : NULL, flags);
 	} else {
 		flags = DDBLT_WAIT;
@@ -434,7 +438,7 @@
 		while (height%2) height++;
 
 		if (dr->yuv_pixel_format) {
-			DDSurface *yuvp = &dd->yuv_pool;		
+			DDSurface *yuvp = &dd->yuv_pool;
 
 			/*don't recreate a surface if not needed*/
 			if (yuvp->pSurface && (yuvp->width >= width) && (yuvp->height >= height) ) return yuvp;
@@ -537,7 +541,7 @@
 	DDCONTEXT;
 
 	if (!video_src) {
-		if (overlay_type && dd->yuv_pool.pSurface) 
+		if (overlay_type && dd->yuv_pool.pSurface)
 			dd->yuv_pool.pSurface->lpVtbl->UpdateOverlay(dd->yuv_pool.pSurface, NULL, dd->pPrimary, NULL, DDOVER_HIDE, NULL);
 		return GF_OK;
 	}
@@ -552,7 +556,7 @@
 	//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;
 	pool = DD_GetSurface(dr, w, h, video_src->pixel_format, 0);
-	if (!pool) 
+	if (!pool)
 		return GF_IO_ERR;
 
 	memset(&temp_surf, 0, sizeof(GF_VideoSurface));
@@ -583,8 +587,8 @@
 		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") 
-		));
+		                                   (overlay_type==0)? "none" : ((overlay_type==1) ? "Top-Level" : "ColorKey")
+		                                  ));
 
 #if 1
 		if (overlay_type==1) {
@@ -685,7 +689,7 @@
 			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");
-			if (opt && !strcmp(opt, "yes")) 
+			if (opt && !strcmp(opt, "yes"))
 				dr->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY;
 			dd->yuv_init = 1;
 			num_yuv = 1;
@@ -693,7 +697,7 @@
 	}
 
 	/*first run on this machine, to some benchmark*/
-	if (! dd->yuv_init) {		
+	if (! dd->yuv_init) {
 		char szOpt[100];
 		dd->yuv_init = 1;
 
@@ -703,14 +707,14 @@
 		if (!numCodes) return;
 		codes = (DWORD *)gf_malloc(numCodes*sizeof(DWORD));
 		dd->pDD->lpVtbl->GetFourCCCodes(dd->pDD, &numCodes, codes);
-		
+
 		num_yuv = 0;
 		for (i=0; i<numCodes; i++) {
 			formats[num_yuv] = is_yuv_supported(codes[i]);
 			if (formats[num_yuv]) num_yuv++;
 		}
 		gf_free(codes);
-		
+
 		/*too bad*/
 		if (!num_yuv) {
 			dr->hw_caps &= ~(GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_HAS_YUV_OVERLAY);
@@ -741,7 +745,7 @@
 					goto rem_fmt;
 			}
 			now = gf_sys_clock() - now;
-			if (formats[i]== GF_PIXEL_YV12) 
+			if (formats[i]== GF_PIXEL_YV12)
 				force_yv12=1;
 
 			if (!checkPacked) {
@@ -782,7 +786,7 @@
 		} else {
 			min_planar = min_packed;
 			dr->yuv_pixel_format = best_packed;
-		} 
+		}
 		if (force_yv12)
 			dr->yuv_pixel_format = GF_PIXEL_YV12;
 
@@ -824,10 +828,10 @@
 	}
 	sscanf(opt, "%06x", &dr->overlay_color_key);
 	if (dr->overlay_color_key) dr->overlay_color_key |= 0xFF000000;
-	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DX Out] YUV->RGB enabled: %s - ColorKey enabled: %s (key %x)\n", 
-									(dr->hw_caps & GF_VIDEO_HW_HAS_YUV) ? "Yes" : "No",
-									dr->overlay_color_key ? "Yes" : "No", dr->overlay_color_key
-							));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DX Out] YUV->RGB enabled: %s - ColorKey enabled: %s (key %x)\n",
+	                                  (dr->hw_caps & GF_VIDEO_HW_HAS_YUV) ? "Yes" : "No",
+	                                  dr->overlay_color_key ? "Yes" : "No", dr->overlay_color_key
+	                                 ));
 }
 
 GF_Err DD_SetBackBufferSize(GF_VideoOutput *dr, u32 width, u32 height, Bool use_system_memory)

gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_audio.c -> gpac-0.5.1.svn5491.tar.xz/modules/dx_hw/dx_audio.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -34,7 +34,8 @@
 #include <ks.h>
 #include <ksmedia.h>
 const static GUID  GPAC_KSDATAFORMAT_SUBTYPE_PCM = {0x00000001,0x0000,0x0010,
-{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}};
+	{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}
+};
 #endif
 
 
@@ -45,7 +46,7 @@
 */
 #define MAX_NUM_BUFFERS		20
 
-typedef struct 
+typedef struct
 {
 	Bool force_config;
 	u32 cfg_num_buffers, cfg_duration;
@@ -56,12 +57,12 @@
 	IDirectSoundBuffer *pOutput;
 
 	u32 buffer_size, num_audio_buffer, total_audio_buffer_ms;
-	
+
 	/*notifs*/
 	Bool use_notif;
-    u32 frame_state[MAX_NUM_BUFFERS];
-    DSBPOSITIONNOTIFY notif_events[MAX_NUM_BUFFERS];
-    HANDLE events[MAX_NUM_BUFFERS];
+	u32 frame_state[MAX_NUM_BUFFERS];
+	DSBPOSITIONNOTIFY notif_events[MAX_NUM_BUFFERS];
+	HANDLE events[MAX_NUM_BUFFERS];
 
 	HMODULE hDSoundLib;
 	DIRECTSOUNDCREATEPROC DirectSoundCreate;
@@ -75,7 +76,7 @@
 static GF_Err DS_Setup(GF_AudioOutput *dr, void *os_handle, u32 num_buffers, u32 total_duration)
 {
 	DWORD flags;
-    HRESULT hr;
+	HRESULT hr;
 
 	DSCONTEXT();
 	ctx->hWnd = (HWND) os_handle;
@@ -92,7 +93,7 @@
 	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 ); 
+		SAFE_DS_RELEASE( ctx->pDS );
 		return GF_IO_ERR;
 	}
 	return GF_OK;
@@ -101,13 +102,13 @@
 
 void DS_ResetBuffer(DSContext *ctx)
 {
-    VOID *pLock = NULL;
-    DWORD size;
+	VOID *pLock = NULL;
+	DWORD size;
 
-    if( FAILED(ctx->pOutput->lpVtbl->Lock(ctx->pOutput, 0, ctx->buffer_size*ctx->num_audio_buffer, &pLock, &size, NULL, NULL, 0 ) ) )
-        return;
+	if( FAILED(ctx->pOutput->lpVtbl->Lock(ctx->pOutput, 0, ctx->buffer_size*ctx->num_audio_buffer, &pLock, &size, NULL, NULL, 0 ) ) )
+		return;
 	memset(pLock, 0, (size_t) size);
-	ctx->pOutput->lpVtbl->Unlock(ctx->pOutput, pLock, size, NULL, 0L); 
+	ctx->pOutput->lpVtbl->Unlock(ctx->pOutput, pLock, size, NULL, 0L);
 }
 
 void DS_ReleaseBuffer(GF_AudioOutput *dr)
@@ -118,7 +119,7 @@
 	/*stop playing and notif proc*/
 	if (ctx->pOutput) ctx->pOutput->lpVtbl->Stop(ctx->pOutput);
 	SAFE_DS_RELEASE(ctx->pOutput);
-	
+
 	/*use notif, shutdown notifier and event watcher*/
 	if (ctx->use_notif) {
 		for (i=0; i<ctx->num_audio_buffer; i++) CloseHandle(ctx->events[i]);
@@ -130,14 +131,14 @@
 {
 	DSCONTEXT();
 	DS_ReleaseBuffer(dr);
-	SAFE_DS_RELEASE(ctx->pDS ); 
+	SAFE_DS_RELEASE(ctx->pDS );
 }
 
 /*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)
 {
-    u32 i;
-	HRESULT hr; 
+	u32 i;
+	HRESULT hr;
 	const char *sOpt;
 	DSBUFFERDESC dsbBufferDesc;
 	IDirectSoundNotify *pNotify;
@@ -207,7 +208,14 @@
 		ctx->use_notif = 0;
 		dsbBufferDesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_GLOBALFOCUS;
 		hr = ctx->pDS->lpVtbl->CreateSoundBuffer(ctx->pDS, &dsbBufferDesc, &ctx->pOutput, NULL );
-		if (FAILED(hr)) return GF_IO_ERR;
+		if (FAILED(hr)) {
+			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 GF_IO_ERR;
+		}
 	}
 
 	for (i=0; i<ctx->num_audio_buffer; i++) ctx->frame_state[i] = 0;
@@ -248,46 +256,46 @@
 	/*reset*/
 	DS_ResetBuffer(ctx);
 	/*play*/
-	ctx->pOutput->lpVtbl->Play(ctx->pOutput, 0, 0, DSBPLAY_LOOPING);	
+	ctx->pOutput->lpVtbl->Play(ctx->pOutput, 0, 0, DSBPLAY_LOOPING);
 	return GF_OK;
 }
 
 static Bool DS_RestoreBuffer(LPDIRECTSOUNDBUFFER pDSBuffer)
 {
 	DWORD dwStatus;
-    pDSBuffer->lpVtbl->GetStatus(pDSBuffer, &dwStatus );
-    if( dwStatus & DSBSTATUS_BUFFERLOST ) {
+	pDSBuffer->lpVtbl->GetStatus(pDSBuffer, &dwStatus );
+	if( dwStatus & DSBSTATUS_BUFFERLOST ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DirectSound] buffer lost\n"));
 		pDSBuffer->lpVtbl->Restore(pDSBuffer);
-	    pDSBuffer->lpVtbl->GetStatus(pDSBuffer, &dwStatus);
+		pDSBuffer->lpVtbl->GetStatus(pDSBuffer, &dwStatus);
 		if( dwStatus & DSBSTATUS_BUFFERLOST ) return 1;
-    }
+	}
 	return 0;
 }
 
 
 
-void DS_FillBuffer(GF_AudioOutput *dr, u32 buffer) 
+void DS_FillBuffer(GF_AudioOutput *dr, u32 buffer)
 {
 	HRESULT hr;
-    VOID *pLock;
+	VOID *pLock;
 	u32 pos;
-    DWORD size;
+	DWORD size;
 	DSCONTEXT();
 
 	/*restoring*/
-    if (DS_RestoreBuffer(ctx->pOutput)) {
+	if (DS_RestoreBuffer(ctx->pOutput)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DirectSound] restoring sound buffer\n"));
 		return;
 	}
-	
+
 	/*lock and fill from current pos*/
 	pos = buffer * ctx->buffer_size;
 	pLock = NULL;
-    if( FAILED( hr = ctx->pOutput->lpVtbl->Lock(ctx->pOutput, pos, ctx->buffer_size,  
-			&pLock,  &size, NULL, NULL, 0L ) ) ) {
+	if( FAILED( hr = ctx->pOutput->lpVtbl->Lock(ctx->pOutput, pos, ctx->buffer_size,
+	                 &pLock,  &size, NULL, NULL, 0L ) ) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DirectSound] Error locking sound buffer\n"));
-        return;
+		return;
 	}
 
 	assert(size == ctx->buffer_size);
@@ -295,7 +303,7 @@
 	dr->FillBuffer(dr->audio_renderer, pLock, size);
 
 	/*update current pos*/
-    if( FAILED( hr = ctx->pOutput->lpVtbl->Unlock(ctx->pOutput, pLock, size, NULL, 0)) ) {
+	if( FAILED( hr = ctx->pOutput->lpVtbl->Unlock(ctx->pOutput, pLock, size, NULL, 0)) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DirectSound] Error unlocking sound buffer\n"));
 	}
 	ctx->frame_state[buffer] = 1;
@@ -324,7 +332,7 @@
 void DS_WriteAudio(GF_AudioOutput *dr)
 {
 	u32 retry;
-    DWORD in_play, cur_play;
+	DWORD in_play, cur_play;
 	DSCONTEXT();
 
 	/*wait for end of current play buffer*/
@@ -424,7 +432,7 @@
 
 	if( FAILED( hr = CoInitialize(NULL) ) ) return NULL;
 
-	
+
 	ctx = gf_malloc(sizeof(DSContext));
 	memset(ctx, 0, sizeof(DSContext));
 	ctx->hDSoundLib = LoadLibrary("dsound.dll");
@@ -433,7 +441,8 @@
 	}
 	if (!ctx->DirectSoundCreate) {
 		if (ctx->hDSoundLib) FreeLibrary(ctx->hDSoundLib);
-		gf_free(ctx);return NULL;
+		gf_free(ctx);
+		return NULL;
 	}
 
 
@@ -464,7 +473,7 @@
 	GF_AudioOutput *dr = (GF_AudioOutput *)ifce;
 	DSCONTEXT();
 
-	if (ctx->hDSoundLib) 
+	if (ctx->hDSoundLib)
 		FreeLibrary(ctx->hDSoundLib);
 	gf_free(ctx);
 	gf_free(ifce);

gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_hw.h -> gpac-0.5.1.svn5491.tar.xz/modules/dx_hw/dx_hw.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -90,7 +90,7 @@
 
 typedef struct
 {
-    LPDDRAWSURFACE pSurface;
+	LPDDRAWSURFACE pSurface;
 	u32 width, height, format, pitch;
 	Bool is_yuv;
 } DDSurface;
@@ -113,13 +113,13 @@
 	Bool switch_res;
 
 #ifdef USE_DX_3
-    LPDIRECTDRAW pDD;
-    LPDIRECTDRAWSURFACE pPrimary;
-    LPDIRECTDRAWSURFACE pBack;
+	LPDIRECTDRAW pDD;
+	LPDIRECTDRAWSURFACE pPrimary;
+	LPDIRECTDRAWSURFACE pBack;
 #else
-    LPDIRECTDRAW7 pDD;
-    LPDIRECTDRAWSURFACE7 pPrimary;
-    LPDIRECTDRAWSURFACE7 pBack;
+	LPDIRECTDRAW7 pDD;
+	LPDIRECTDRAWSURFACE7 pPrimary;
+	LPDIRECTDRAWSURFACE7 pBack;
 #endif
 	Bool ddraw_init;
 	Bool yuv_init;
@@ -155,16 +155,16 @@
 	HCURSOR curs_normal, curs_hand, curs_collide;
 	u32 cursor_type;
 	Bool is_setup, disable_vsync;
-
+	char *caption;
 	/*gl*/
 #ifndef GPAC_DISABLE_3D
 
 #ifdef GPAC_USE_OGL_ES
 	NativeDisplayType gl_HDC;
-    EGLDisplay egldpy;
-    EGLSurface surface;
-    EGLConfig eglconfig;
-    EGLContext eglctx;
+	EGLDisplay egldpy;
+	EGLSurface surface;
+	EGLConfig eglconfig;
+	EGLContext eglctx;
 #else
 	HDC gl_HDC, pb_HDC;
 	HGLRC gl_HRC, pb_HRC;
@@ -190,7 +190,7 @@
 	Bool force_video_mem_for_yuv;
 
 	HMODULE hDDrawLib;
-    DIRECTDRAWCREATEPROC DirectDrawCreate;
+	DIRECTDRAWCREATEPROC DirectDrawCreate;
 } DDContext;
 
 void DD_SetupWindow(GF_VideoOutput *dr, Bool hide);

gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_video.c -> gpac-0.5.1.svn5491.tar.xz/modules/dx_hw/dx_video.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -111,7 +111,7 @@
 		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 
+	} else
 #endif
 	{
 		u32 gl_type = 1;
@@ -144,7 +144,7 @@
 #endif
 
 
-static void RestoreWindow(DDContext *dd) 
+static void RestoreWindow(DDContext *dd)
 {
 	if (!dd->NeedRestore) return;
 	dd->NeedRestore = 0;
@@ -154,10 +154,10 @@
 #ifndef _WIN32_WCE
 		ChangeDisplaySettings(NULL,0);
 #endif
-	} else 
+	} else
 #endif
 
-	dd->pDD->lpVtbl->SetCooperativeLevel(dd->pDD, dd->cur_hwnd, DDSCL_NORMAL);
+		dd->pDD->lpVtbl->SetCooperativeLevel(dd->pDD, dd->cur_hwnd, DDSCL_NORMAL);
 	dd->NeedRestore = 0;
 
 //	SetForegroundWindow(dd->cur_hwnd);
@@ -200,7 +200,7 @@
 		dd->gl_HDC = 0L;
 		dd->egldpy = NULL;
 	}
-#elif !defined(_WIN32_WCE) 
+#elif !defined(_WIN32_WCE)
 
 	if (dd->pb_HRC) {
 		wglMakeCurrent(dd->pb_HDC, NULL);
@@ -216,7 +216,7 @@
 		wglDestroyPbufferARB(dd->pbuffer);
 		dd->pbuffer = NULL;
 	}
-	
+
 	if (dd->gl_HRC) {
 		//wglMakeCurrent(NULL, NULL);
 		wglDeleteContext(dd->gl_HRC);
@@ -239,7 +239,7 @@
 
 #ifndef GPAC_DISABLE_3D
 
-GF_Err DD_SetupOpenGL(GF_VideoOutput *dr, u32 offscreen_width, u32 offscreen_height) 
+GF_Err DD_SetupOpenGL(GF_VideoOutput *dr, u32 offscreen_width, u32 offscreen_height)
 {
 	const char *sOpt;
 	GF_Event evt;
@@ -257,15 +257,21 @@
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsPerComponent");
 	nb_bits = sOpt ? atoi(sOpt) : 5;
 
-	egl_atts[i++] = EGL_RED_SIZE; egl_atts[i++] = nb_bits;
-	egl_atts[i++] = EGL_GREEN_SIZE; egl_atts[i++] = nb_bits;
-	egl_atts[i++] = EGL_BLUE_SIZE; egl_atts[i++] = nb_bits;
+	egl_atts[i++] = EGL_RED_SIZE;
+	egl_atts[i++] = nb_bits;
+	egl_atts[i++] = EGL_GREEN_SIZE;
+	egl_atts[i++] = nb_bits;
+	egl_atts[i++] = EGL_BLUE_SIZE;
+	egl_atts[i++] = nb_bits;
 	/*alpha for compositeTexture*/
-	egl_atts[i++] = EGL_ALPHA_SIZE; egl_atts[i++] = 1;
+	egl_atts[i++] = EGL_ALPHA_SIZE;
+	egl_atts[i++] = 1;
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
 	nb_bits = sOpt ? atoi(sOpt) : 5;
-	egl_atts[i++] = EGL_DEPTH_SIZE; egl_atts[i++] = nb_bits;
-	egl_atts[i++] = EGL_STENCIL_SIZE; egl_atts[i++] = EGL_DONT_CARE;
+	egl_atts[i++] = EGL_DEPTH_SIZE;
+	egl_atts[i++] = nb_bits;
+	egl_atts[i++] = EGL_STENCIL_SIZE;
+	egl_atts[i++] = EGL_DONT_CARE;
 	egl_atts[i++] = EGL_NONE;
 
 	/*already setup*/
@@ -276,14 +282,14 @@
 	if (!eglChooseConfig(dd->egldpy, egl_atts, configs, 1, &n)) return GF_IO_ERR;
 	dd->eglconfig = configs[0];
 	dd->surface = eglCreateWindowSurface(dd->egldpy, dd->eglconfig, dd->cur_hwnd, 0);
-	if (!dd->surface) return GF_IO_ERR; 
+	if (!dd->surface) return GF_IO_ERR;
 	dd->eglctx = eglCreateContext(dd->egldpy, dd->eglconfig, NULL, NULL);
 	if (!dd->eglctx) {
 		eglDestroySurface(dd->egldpy, dd->surface);
 		dd->surface = 0L;
-		return GF_IO_ERR; 
+		return GF_IO_ERR;
 	}
-    if (!eglMakeCurrent(dd->egldpy, dd->surface, dd->surface, dd->eglctx)) {
+	if (!eglMakeCurrent(dd->egldpy, dd->surface, dd->surface, dd->eglctx)) {
 		eglDestroyContext(dd->egldpy, dd->eglctx);
 		dd->eglctx = 0L;
 		eglDestroySurface(dd->egldpy, dd->surface);
@@ -291,17 +297,17 @@
 		return GF_IO_ERR;
 	}
 #elif !defined(_WIN32_WCE)
-    PIXELFORMATDESCRIPTOR pfd; 
-    s32 pixelformat;
+	PIXELFORMATDESCRIPTOR pfd;
+	s32 pixelformat;
 	HWND highbpp_hwnd = NULL;
 	HWND target_hwnd = NULL;
-	int bits_depth = 24;
+	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;
-	if ((dd->bound_hwnd == target_hwnd) && dd->gl_HRC) 
+	if ((dd->bound_hwnd == target_hwnd) && dd->gl_HRC)
 		goto exit;
 
 	hw_reset = GF_TRUE;
@@ -310,9 +316,9 @@
 	/*cleanup*/
 	DestroyObjectsEx(dd, (dd->output_3d_type==1) ? 0 : 1);
 
-	//first time we init GL: create a dummy window to select pixel format for high bpp - we must do this because 
+	//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 
+	//- 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");
@@ -330,11 +336,11 @@
 			pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
 			pfd.nVersion = 1;
 			pfd.dwFlags = PFD_SUPPORT_OPENGL;
-			if ( (pixelformat = ChoosePixelFormat(dd->gl_HDC, &pfd)) == FALSE ) return GF_IO_ERR; 
-			
+			if ( (pixelformat = ChoosePixelFormat(dd->gl_HDC, &pfd)) == FALSE ) return GF_IO_ERR;
+
 			if (SetPixelFormat(dd->gl_HDC, pixelformat, &pfd) == FALSE) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DX GL] Cannot select pixel format: error %d- disabling GL\n", GetLastError() ));
-				return GF_IO_ERR; 
+				return GF_IO_ERR;
 			}
 			dd->gl_HRC = wglCreateContext(dd->gl_HDC);
 			if (!dd->gl_HRC) return GF_IO_ERR;
@@ -349,7 +355,7 @@
 			ReleaseDC(highbpp_hwnd, dd->gl_HDC);
 			DestroyWindow(highbpp_hwnd);
 
-			
+
 			dd->mode_high_bpp = wglChoosePixelFormatARB ? 1 : 2;
 		} else {
 			dd->mode_high_bpp = 2;
@@ -378,23 +384,23 @@
 		int pformats[200];
 		u32 nbformats=0;
 		Bool found = GF_FALSE;
-		float fattribs[1] = { 0.0f }; 
-		
+		float fattribs[1] = { 0.0f };
+
 		int hdcAttributes[] = {
 			WGL_SUPPORT_OPENGL_ARB, TRUE,
 			WGL_DRAW_TO_WINDOW_ARB, (dd->bound_hwnd != dd->fs_hwnd) ? TRUE : FALSE,
 			WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
-			WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB, 
+			WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB,
 			WGL_RED_BITS_ARB, dd->bpp,
 			WGL_GREEN_BITS_ARB, dd->bpp,
-			WGL_BLUE_BITS_ARB, dd->bpp, 
-			WGL_ALPHA_BITS_ARB, (dd->bpp==10) ? 2 : 0, 
+			WGL_BLUE_BITS_ARB, dd->bpp,
+			WGL_ALPHA_BITS_ARB, (dd->bpp==10) ? 2 : 0,
 			WGL_DEPTH_BITS_ARB, bits_depth,
-			WGL_DOUBLE_BUFFER_ARB, use_double_buffer ? TRUE : FALSE, 
+			WGL_DOUBLE_BUFFER_ARB, use_double_buffer ? TRUE : FALSE,
 			0,0
-		}; 
+		};
 
-		wglChoosePixelFormatARB(dd->gl_HDC, hdcAttributes, NULL, 200, pformats, &nbformats); 
+		wglChoosePixelFormatARB(dd->gl_HDC, hdcAttributes, NULL, 200, pformats, &nbformats);
 
 		for (i=0; i<nbformats; i++) {
 			if (SetPixelFormat(dd->gl_HDC, pformats[i], &pfd) != FALSE) {
@@ -439,11 +445,11 @@
 		/*we need alpha support for composite textures...*/
 		pfd.cAlphaBits = 8;
 
-		if ( (pixelformat = ChoosePixelFormat(dd->gl_HDC, &pfd)) == FALSE ) return GF_IO_ERR; 
+		if ( (pixelformat = ChoosePixelFormat(dd->gl_HDC, &pfd)) == FALSE ) return GF_IO_ERR;
 
 		if (SetPixelFormat(dd->gl_HDC, pixelformat, &pfd) == FALSE) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DX GL] Cannot select pixel format: error %d- disabling GL\n", GetLastError() ));
-			return GF_IO_ERR; 
+			return GF_IO_ERR;
 		}
 	}
 
@@ -480,14 +486,14 @@
 			WGL_DRAW_TO_PBUFFER_ARB, TRUE,
 			WGL_RED_BITS_ARB, 8,
 			WGL_GREEN_BITS_ARB, 8,
-			WGL_BLUE_BITS_ARB, 8, 
+			WGL_BLUE_BITS_ARB, 8,
 			WGL_DEPTH_BITS_ARB, bits_depth,
 			0
-		}; 
-		wglChoosePixelFormatARB(dd->gl_HDC, hdcAttributes, NULL, 20, pformats, &nbformats); 
+		};
+		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); 
+			dd->pbuffer = wglCreatePbufferARB(dd->gl_HDC, pformats[i], offscreen_width, offscreen_height, pbufferAttributes);
 			if (dd->pbuffer) break;
 		}
 		if (!dd->pbuffer) return GF_IO_ERR;
@@ -496,7 +502,7 @@
 		dd->pb_HRC = wglCreateContext(dd->pb_HDC);
 		if (!wglMakeCurrent(dd->pb_HDC, dd->pb_HRC)) return GF_IO_ERR;
 
-	
+
 	}
 #endif
 
@@ -504,7 +510,7 @@
 	for our plugin window - avoid this by overriding the WindowProc once OpenGL is setup!!*/
 	if ((dd->bound_hwnd==dd->os_hwnd) && dd->orig_wnd_proc)
 #ifdef _WIN64
-        SetWindowLongPtr(dd->os_hwnd, GWLP_WNDPROC, (DWORD) DD_WindowProc);
+		SetWindowLongPtr(dd->os_hwnd, GWLP_WNDPROC, (DWORD) DD_WindowProc);
 #else
 		SetWindowLong(dd->os_hwnd, GWL_WNDPROC, (DWORD) DD_WindowProc);
 #endif
@@ -514,7 +520,7 @@
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_VIDEO_SETUP;
 		evt.setup.hw_reset = hw_reset;
-		dr->on_event(dr->evt_cbk_hdl, &evt);	
+		dr->on_event(dr->evt_cbk_hdl, &evt);
 	}
 	return GF_OK;
 }
@@ -529,7 +535,7 @@
 	DDCONTEXT
 	const char *opt;
 	dd->os_hwnd = (HWND) os_handle;
-	
+
 	DD_SetupWindow(dr, init_flags);
 	/*fatal error*/
 	if (!dd->os_hwnd) return GF_IO_ERR;
@@ -580,7 +586,7 @@
 	dd->fullscreen = bOn;
 
 	if (!dd->width ||!dd->height) return GF_OK;
-	
+
 	/*whenever changing card display mode relocate fastest YUV format for blit (since it depends
 	on the dest pixel format)*/
 	dd->yuv_init = 0;
@@ -651,8 +657,8 @@
 		}
 
 		if (!e) e = DD_SetupOpenGL(dr, 0, 0);
-		
-	} else 
+
+	} else
 #endif
 	{
 
@@ -719,7 +725,7 @@
 		dr->LockOSContext(dr, 0);
 		return GF_OK;
 	}
-	
+
 	if (!dd->disable_vsync)
 		hr = dd->pDD->lpVtbl->WaitForVerticalBlank(dd->pDD, DDWAITVB_BLOCKBEGIN, NULL);
 
@@ -747,15 +753,15 @@
 HRESULT WINAPI EnumDisplayModes( LPDDSURFDESC lpDDDesc, LPVOID lpContext)
 {
 	DDContext *dd = (DDContext *) lpContext;
-	
+
 	//check W and H
 	if (dd->width <= lpDDDesc->dwWidth  && dd->height <= lpDDDesc->dwHeight
-		//check FSW and FSH
-		&& dd->fs_width > lpDDDesc->dwWidth && dd->fs_height > lpDDDesc->dwHeight) {
+	        //check FSW and FSH
+	        && dd->fs_width > lpDDDesc->dwWidth && dd->fs_height > lpDDDesc->dwHeight) {
 
 		if (lpDDDesc->dwHeight == 200)
 			return DDENUMRET_OK;
-		
+
 		dd->fs_width = lpDDDesc->dwWidth;
 		dd->fs_height = lpDDDesc->dwHeight;
 
@@ -812,8 +818,8 @@
 		pCtx->DirectDrawCreate = (DIRECTDRAWCREATEPROC) GetProcAddress(pCtx->hDDrawLib, "DirectDrawCreate");
 	}
 
-    driv->max_screen_width = GetSystemMetrics(SM_CXSCREEN);
-    driv->max_screen_height = GetSystemMetrics(SM_CYSCREEN);
+	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;
 
@@ -868,4 +874,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( dx_out )
+GPAC_MODULE_STATIC_DECLARATION( dx_out )

gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_window.c -> gpac-0.5.1.svn5491.tar.xz/modules/dx_hw/dx_window.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -63,88 +63,157 @@
 	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_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;
+		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;
 
 #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;
-#endif 
+	case VK_OEM_PLUS:
+		evt->key_code = GF_KEY_PLUS;
+		break;
+	case VK_OEM_MINUS:
+		evt->key_code = GF_KEY_PLUS;
+		break;
+#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;
+	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;
 #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: 
+	/*	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;
@@ -184,11 +253,11 @@
 		evt->key_code = GF_KEY_9;
 		evt->flags = GF_KEY_EXT_NUMPAD;
 		break;
-	case VK_MULTIPLY: 
+	case VK_MULTIPLY:
 		evt->key_code = GF_KEY_STAR;
 		evt->flags = GF_KEY_EXT_NUMPAD;
 		break;
-	case VK_ADD: 
+	case VK_ADD:
 		evt->key_code = GF_KEY_PLUS;
 		evt->flags = GF_KEY_EXT_NUMPAD;
 		break;
@@ -208,40 +277,92 @@
 		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;
+	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;
 
-/*
- * 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: 
+	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;
@@ -267,22 +388,38 @@
 		break;
 
 #if(WINVER >= 0x0400)
-	case VK_PROCESSKEY: evt->key_code = GF_KEY_PROCESS; break;
+	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_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;
+	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: 
+	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".*/
@@ -327,7 +464,7 @@
 	GF_Event evt;
 	DDContext *ctx;
 #ifdef _WIN64
-    GF_VideoOutput *vout = (GF_VideoOutput *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
+	GF_VideoOutput *vout = (GF_VideoOutput *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
 #else
 	GF_VideoOutput *vout = (GF_VideoOutput *) GetWindowLong(hWnd, GWL_USERDATA);
 #endif
@@ -338,14 +475,14 @@
 	case WM_SIZE:
 		/*always notify GPAC since we're not sure the owner of the window is listening to these events*/
 		if (wParam==SIZE_MINIMIZED) {
-			evt.type = GF_EVENT_SHOWHIDE;
+			evt.type = GF_EVENT_SHOWHIDE_NOTIF;
 			evt.show.show_type = 0;
 			ctx->hidden = 1;
 			vout->on_event(vout->evt_cbk_hdl, &evt);
 		} else {
 			if (ctx->hidden && wParam==SIZE_RESTORED) {
 				ctx->hidden = 0;
-				evt.type = GF_EVENT_SHOWHIDE;
+				evt.type = GF_EVENT_SHOWHIDE_NOTIF;
 				evt.show.show_type = 1;
 				vout->on_event(vout->evt_cbk_hdl, &evt);
 			}
@@ -356,7 +493,7 @@
 		}
 		break;
 	case WM_MOVE:
-		evt.type = GF_EVENT_MOVE;
+		evt.type = GF_EVENT_MOVE_NOTIF;
 		evt.move.x = LOWORD(lParam);
 		evt.move.y = HIWORD(lParam);
 		vout->on_event(vout->evt_cbk_hdl, &evt);
@@ -374,7 +511,7 @@
 		} else if (ctx->orig_wnd_proc) {
 			/*restore window proc*/
 #ifdef _WIN64
-            SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, ctx->orig_wnd_proc);
+			SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, ctx->orig_wnd_proc);
 #else
 			SetWindowLong(ctx->os_hwnd, GWL_WNDPROC, ctx->orig_wnd_proc);
 #endif
@@ -390,13 +527,13 @@
 		break;
 
 	case WM_ACTIVATE:
-		if (!ctx->on_secondary_screen && ctx->fullscreen && (LOWORD(wParam)==WA_INACTIVE) 
-			&& (hWnd==ctx->fs_hwnd)
+		if (!ctx->on_secondary_screen && ctx->fullscreen && (LOWORD(wParam)==WA_INACTIVE)
+		        && (hWnd==ctx->fs_hwnd)
 #ifndef GPAC_DISABLE_3D
-			&& (ctx->output_3d_type!=2)
+		        && (ctx->output_3d_type!=2)
 #endif
-			) {
-			evt.type = GF_EVENT_SHOWHIDE;
+		   ) {
+			evt.type = GF_EVENT_SHOWHIDE_NOTIF;
 			vout->on_event(vout->evt_cbk_hdl, &evt);
 		}
 		/*fallthrough*/
@@ -430,34 +567,34 @@
 		}
 		/*this avoids 100% cpu usage in Firefox*/
 		return DefWindowProc (hWnd, msg, wParam, lParam);
-		
+
 	case WM_SETCURSOR:
 		if (ctx->cur_hwnd==hWnd) DD_SetCursor(vout, ctx->cursor_type);
 		break;
 
 	case WM_DROPFILES:
-		{
-			char szFile[GF_MAX_PATH];
-			GF_Event evt;
-			u32 i;
-			
-			HDROP hDrop = (HDROP) wParam;
-			evt.type = GF_EVENT_OPENFILE;
-			evt.open_file.nb_files = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
-			evt.open_file.files = gf_malloc(sizeof(char *)*evt.open_file.nb_files);
-			for (i=0; i<evt.open_file.nb_files; i++) {
-				u32 res = DragQueryFile(hDrop, i, szFile, GF_MAX_PATH);
-				evt.open_file.files[i] = res ? gf_strdup(szFile) : NULL;
-			}
-			DragFinish(hDrop);
-			/*send message*/
-			vout->on_event(vout->evt_cbk_hdl, &evt);
-			for (i=0; i<evt.open_file.nb_files; i++) {
-				if (evt.open_file.files[i]) gf_free(evt.open_file.files[i]);
-			}
-			gf_free(evt.open_file.files);
+	{
+		char szFile[GF_MAX_PATH];
+		GF_Event evt;
+		u32 i;
+
+		HDROP hDrop = (HDROP) wParam;
+		evt.type = GF_EVENT_DROPFILE;
+		evt.open_file.nb_files = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
+		evt.open_file.files = gf_malloc(sizeof(char *)*evt.open_file.nb_files);
+		for (i=0; i<evt.open_file.nb_files; i++) {
+			u32 res = DragQueryFile(hDrop, i, szFile, GF_MAX_PATH);
+			evt.open_file.files[i] = res ? gf_strdup(szFile) : NULL;
 		}
-		break;
+		DragFinish(hDrop);
+		/*send message*/
+		vout->on_event(vout->evt_cbk_hdl, &evt);
+		for (i=0; i<evt.open_file.nb_files; i++) {
+			if (evt.open_file.files[i]) gf_free(evt.open_file.files[i]);
+		}
+		gf_free(evt.open_file.files);
+	}
+	break;
 
 	case WM_MOUSEMOVE:
 		if (ctx->cur_hwnd!=hWnd) break;
@@ -543,7 +680,7 @@
 		ret = vout->on_event(vout->evt_cbk_hdl, &evt);
 		mouse_start_timer(ctx, hWnd, vout);
 		break;
-	case WM_MOUSEWHEEL: 
+	case WM_MOUSEWHEEL:
 		if (ctx->cur_hwnd==hWnd) {
 			DD_SetCursor(vout, (ctx->cursor_type==GF_CURSOR_HIDE) ? ctx->cursor_type_backup : ctx->cursor_type);
 			evt.type = GF_EVENT_MOUSEWHEEL;
@@ -559,12 +696,24 @@
 			evt.type = GF_EVENT_MOUSEWHEEL;
 			evt.mouse.button = 1;
 			switch (LOWORD(wParam)) {
-			case SB_LEFT: evt.mouse.wheel_pos = -1; break;
-			case SB_RIGHT: evt.mouse.wheel_pos = +1; break;
-			case SB_LINELEFT: evt.mouse.wheel_pos = -5; break;
-			case SB_LINERIGHT: evt.mouse.wheel_pos = +5; break;
-			case SB_PAGELEFT: evt.mouse.wheel_pos = -10; break;
-			case SB_PAGERIGHT: evt.mouse.wheel_pos = +10; break;
+			case SB_LEFT:
+				evt.mouse.wheel_pos = -1;
+				break;
+			case SB_RIGHT:
+				evt.mouse.wheel_pos = +1;
+				break;
+			case SB_LINELEFT:
+				evt.mouse.wheel_pos = -5;
+				break;
+			case SB_LINERIGHT:
+				evt.mouse.wheel_pos = +5;
+				break;
+			case SB_PAGELEFT:
+				evt.mouse.wheel_pos = -10;
+				break;
+			case SB_PAGERIGHT:
+				evt.mouse.wheel_pos = +10;
+				break;
 			default:
 				break;
 			}
@@ -597,9 +746,9 @@
 				evt.type = GF_EVENT_PASTE_TEXT;
 				evt.message.message = lptstrCopy;
 				ret = vout->on_event(vout->evt_cbk_hdl, &evt);
-				GlobalUnlock(hglbCopy); 
+				GlobalUnlock(hglbCopy);
 			}
-			CloseClipboard(); 
+			CloseClipboard();
 			break;
 		}
 		else if (ctx->ctrl_down && (evt.type==GF_EVENT_KEYUP) && (evt.key.key_code==GF_KEY_C)) {
@@ -611,54 +760,50 @@
 				if (!IsClipboardFormatAvailable(CF_TEXT)) break;
 				if (!OpenClipboard(ctx->cur_hwnd)) break;
 				EmptyClipboard();
-				
+
 				len = strlen(evt.message.message);
 				if (!len) break;
 
-				hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(char)); 
+				hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(char));
 				lptstrCopy = (char *) GlobalLock(hglbCopy);
-				memcpy(lptstrCopy, evt.message.message, len * sizeof(char)); 
+				memcpy(lptstrCopy, evt.message.message, len * sizeof(char));
 				lptstrCopy[len] = 0;
-				GlobalUnlock(hglbCopy); 
+				GlobalUnlock(hglbCopy);
 				SetClipboardData(CF_TEXT, hglbCopy);
-				CloseClipboard(); 
+				CloseClipboard();
 				break;
 			}
 		}
 		ret = vout->on_event(vout->evt_cbk_hdl, &evt);
-		
+
 		if ( !ctx->ctrl_down && !ctx->alt_down
-			&& evt.key.key_code != GF_KEY_CONTROL && evt.key.key_code != GF_KEY_ALT )
+		        && evt.key.key_code != GF_KEY_CONTROL && evt.key.key_code != GF_KEY_ALT )
 			ret = 1;
 		break;
 
 	case WM_UNICHAR:
 	case WM_CHAR:
-		/*no reason to filter out things*/
-//		if (wParam>=32) 
-		{
-			evt.type = GF_EVENT_TEXTINPUT;
-			evt.character.unicode_char = (u32) wParam;
-			ret = vout->on_event(vout->evt_cbk_hdl, &evt);
-		}
+		evt.type = GF_EVENT_TEXTINPUT;
+		evt.character.unicode_char = (u32) wParam;
+		ret = vout->on_event(vout->evt_cbk_hdl, &evt);
 		break;
-/*
-	case WM_CANCELMODE:
-	case WM_CAPTURECHANGED:
-	case WM_NCHITTEST:
-		return 0;
-*/
+	/*
+		case WM_CANCELMODE:
+		case WM_CAPTURECHANGED:
+		case WM_NCHITTEST:
+			return 0;
+	*/
 	default:
 		return DefWindowProc (hWnd, msg, wParam, lParam);
 	}
 
-	if (!ret &&(ctx->os_hwnd==hWnd) && ctx->orig_wnd_proc) 
+	if (!ret &&(ctx->os_hwnd==hWnd) && ctx->orig_wnd_proc)
 		return CallWindowProc((WNDPROC) ctx->orig_wnd_proc, hWnd, msg, wParam, lParam);
 	return 0;
 }
 
 #ifndef WS_EX_LAYERED
-#define WS_EX_LAYERED 0x80000 
+#define WS_EX_LAYERED 0x80000
 #endif
 #ifndef LWA_COLORKEY
 #define LWA_COLORKEY   0x00000001
@@ -683,9 +828,9 @@
 	u32 isWin2K;
 	OSVERSIONINFO Version = {sizeof(OSVERSIONINFO)};
 	GetVersionEx(&Version);
-	isWin2K = (Version.dwPlatformId == VER_PLATFORM_WIN32_NT && Version.dwMajorVersion >= 5); 
+	isWin2K = (Version.dwPlatformId == VER_PLATFORM_WIN32_NT && Version.dwMajorVersion >= 5);
 	if (!isWin2K) return;
-	
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DX Out] Enabling windowless mode\n"));
 	hUser32 = GetModuleHandle("USER32.DLL");
 	if (hUser32 == NULL) return;
@@ -810,20 +955,20 @@
 		}
 		ShowWindow(ctx->fs_hwnd, SW_HIDE);
 #ifdef _WIN64
-        SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG) vout);
+		SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG) vout);
 #else
 		SetWindowLong(ctx->fs_hwnd, GWL_USERDATA, (LONG) vout);
 #endif
 	} else {
 		ctx->fs_hwnd = ctx->os_hwnd;
 	}
-	
+
 	/*if visible set focus*/
 	if (!ctx->switch_res) SetFocus(ctx->os_hwnd);
 
 	ctx->switch_res = 0;
 #ifdef _WIN64
-    SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG) vout);
+	SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG) vout);
 #else
 	SetWindowLong(ctx->os_hwnd, GWL_USERDATA, (LONG) vout);
 #endif
@@ -850,10 +995,17 @@
 		ctx->th_state = 1;
 		while (msg_ok) {
 			msg_ok = GetMessage (&(msg), NULL, 0, 0);
-			if (msg_ok == -1) msg_ok = 0;			
+			if (msg_ok == -1) msg_ok = 0;
 			if (msg.message == WM_DESTROY) PostQuitMessage(0);	//WM_DESTROY: exit
 			TranslateMessage (&(msg));
 			DispatchMessage (&(msg));
+
+			if (ctx->caption) {
+				SetWindowText(ctx->os_hwnd, ctx->caption);
+				gf_free(ctx->caption);
+				ctx->caption = NULL;
+			}
+
 		}
 	}
 	ctx->th_state = 2;
@@ -869,8 +1021,8 @@
 		/*override window proc*/
 		if (!(flags & GF_TERM_NO_WINDOWPROC_OVERRIDE) ) {
 #ifdef _WIN64
-            ctx->orig_wnd_proc = GetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC);
-            SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, (DWORD) DD_WindowProc);
+			ctx->orig_wnd_proc = GetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC);
+			SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, (DWORD) DD_WindowProc);
 #else
 			ctx->orig_wnd_proc = GetWindowLong(ctx->os_hwnd, GWL_WNDPROC);
 			SetWindowLong(ctx->os_hwnd, GWL_WNDPROC, (DWORD) DD_WindowProc);
@@ -906,7 +1058,7 @@
 	} else if (ctx->orig_wnd_proc) {
 		/*restore window proc*/
 #ifdef _WIN64
-        SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, ctx->orig_wnd_proc);
+		SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, ctx->orig_wnd_proc);
 #else
 		SetWindowLong(ctx->os_hwnd, GWL_WNDPROC, ctx->orig_wnd_proc);
 #endif
@@ -916,8 +1068,8 @@
 	if (ctx->fs_hwnd != ctx->os_hwnd) {
 		dd_closewindow(ctx->fs_hwnd);
 #ifdef _WIN64
-        SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG) NULL);
-        SetWindowLongPtr(ctx->fs_hwnd, GWLP_WNDPROC, (DWORD) DefWindowProc);
+		SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG) NULL);
+		SetWindowLongPtr(ctx->fs_hwnd, GWLP_WNDPROC, (DWORD) DefWindowProc);
 #else
 		SetWindowLong(ctx->fs_hwnd, GWL_USERDATA, (LONG) NULL);
 		SetWindowLong(ctx->fs_hwnd, GWL_WNDPROC, (DWORD) DefWindowProc);
@@ -929,7 +1081,7 @@
 #endif
 
 	if (ctx->th) {
-		while (ctx->th_state!=2) 
+		while (ctx->th_state!=2)
 			gf_sleep(10);
 
 		gf_th_del(ctx->th);
@@ -939,7 +1091,7 @@
 	/*special care for Firefox: the windows created by our NP plugin may still be called
 	after the shutdown of the plugin !!*/
 #ifdef _WIN64
-    SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG) NULL);
+	SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG) NULL);
 #else
 	SetWindowLong(ctx->os_hwnd, GWL_USERDATA, (LONG) NULL);
 #endif
@@ -997,15 +1149,17 @@
 {
 	u32 res;
 	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF; res<<=8;
-	res |= (val>>8)&0xFF; res<<=8;
+	res = (val)&0xFF;
+	res<<=8;
+	res |= (val>>8)&0xFF;
+	res<<=8;
 	res |= (val>>16)&0xFF;
 	return res;
 }
 
 
 /*Note: all calls to SetWindowPos are made in a non-blocking way using SWP_ASYNCWINDOWPOS. This avoids deadlocks
-when the compositor request a size change and the DX window thread has grabbed the main compositor mutex. 
+when the compositor request a size change and the DX window thread has grabbed the main compositor mutex.
 This typically happens when switching playlist items as fast as possible*/
 GF_Err DD_ProcessEvent(GF_VideoOutput*dr, GF_Event *evt)
 {
@@ -1014,6 +1168,13 @@
 	if (!evt) {
 		if (!ctx->th) {
 			MSG msg;
+
+			if (ctx->caption) {
+				SetWindowText(ctx->os_hwnd, ctx->caption);
+				gf_free(ctx->caption);
+				ctx->caption = NULL;
+			}
+
 			while (PeekMessage (&(msg), NULL, 0, 0, PM_REMOVE)) {
 				TranslateMessage (&(msg));
 				DispatchMessage (&(msg));
@@ -1028,7 +1189,7 @@
 		break;
 	case GF_EVENT_SET_CAPTION:
 #ifndef _WIN32_WCE
-		if (evt->caption.caption) SetWindowText(ctx->os_hwnd, evt->caption.caption);
+		if (evt->caption.caption && !ctx->caption) ctx->caption = gf_strdup(evt->caption.caption);
 #endif
 		break;
 	case GF_EVENT_MOVE:
@@ -1067,7 +1228,7 @@
 			} else {
 				if (ctx->windowless)
 					SetWindowPos(ctx->os_hwnd, NULL, 0, 0, evt->size.width, evt->size.height, SWP_NOZORDER | SWP_NOMOVE | SWP_ASYNCWINDOWPOS);
-				else 
+				else
 					SetWindowPos(ctx->os_hwnd, NULL, 0, 0, evt->size.width + ctx->off_w, evt->size.height + ctx->off_h, SWP_NOZORDER | SWP_NOMOVE | SWP_ASYNCWINDOWPOS);
 			}
 		}
@@ -1095,7 +1256,7 @@
 		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) 
+			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);

gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/resource.h -> gpac-0.5.1.svn5491.tar.xz/modules/dx_hw/resource.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/epoc_hw/epoc_aout.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/epoc_hw/epoc_aout.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -90,21 +90,39 @@
 	u32 count;
 	TMdaAudioDataSettings::TAudioCaps epoc_sr;
 
-	
+
 	switch (sample_rate) {
-	case 8000: epoc_sr = TMdaAudioDataSettings::ESampleRate8000Hz; break;
-	case 11025: epoc_sr = TMdaAudioDataSettings::ESampleRate11025Hz; break;
-	case 12000: epoc_sr = TMdaAudioDataSettings::ESampleRate12000Hz; break;
-	case 16000: epoc_sr = TMdaAudioDataSettings::ESampleRate16000Hz; break;
-	case 22050: epoc_sr = TMdaAudioDataSettings::ESampleRate22050Hz; break;
-	case 24000: epoc_sr = TMdaAudioDataSettings::ESampleRate24000Hz; break;
-	case 32000: epoc_sr = TMdaAudioDataSettings::ESampleRate32000Hz; break;
-	case 44100: epoc_sr = TMdaAudioDataSettings::ESampleRate44100Hz; break;
-	case 48000: epoc_sr = TMdaAudioDataSettings::ESampleRate48000Hz; break;
+	case 8000:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate8000Hz;
+		break;
+	case 11025:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate11025Hz;
+		break;
+	case 12000:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate12000Hz;
+		break;
+	case 16000:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate16000Hz;
+		break;
+	case 22050:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate22050Hz;
+		break;
+	case 24000:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate24000Hz;
+		break;
+	case 32000:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate32000Hz;
+		break;
+	case 44100:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate44100Hz;
+		break;
+	case 48000:
+		epoc_sr = TMdaAudioDataSettings::ESampleRate48000Hz;
+		break;
 	default:
 		return GF_NOT_SUPPORTED;
 	}
-	
+
 	state = EPOC_AUDIO_INIT;
 
 	gf_sleep(10);
@@ -231,10 +249,10 @@
 
 	e = ctx->Open(*SampleRate, (*NbChannels ==2) ? 1 : 0);
 	if (e) return e;
-	
+
 	snd_align = *NbChannels * 2;
-	bps = snd_align * *SampleRate;
-	
+	bps = snd_align **SampleRate;
+
 	if (ctx->cfg_total_duration) {
 		ctx->num_buffers = ctx->cfg_num_buffers;
 		ctx->buffer_size = (bps*ctx->cfg_total_duration/1000) / ctx->num_buffers;

gpac-0.5.0.svn5178.tar.bz2/modules/epoc_hw/epoc_codec.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/epoc_hw/epoc_codec.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -93,7 +93,7 @@
 		ctx->caps |= GF_EPOC_HAS_HEAAC;
 		delete codec;
 	}
-	
+
 	/*MP3*/
 	TRAP(err, codec = CMMFCodec::NewL(KMMFFourCCCodeMP3, KMMFFourCCCodePCM16));
 	if (err==KErrNone) {
@@ -115,17 +115,17 @@
 	if (ctx->dec) return GF_BAD_PARAM;
 
 
-	/*audio decs*/	
+	/*audio decs*/
 	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: 
+	case GPAC_OTI_AUDIO_AAC_MPEG4:
 		if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) return GF_NON_COMPLIANT_BITSTREAM;
 		if (gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg) != GF_OK) return GF_NON_COMPLIANT_BITSTREAM;
-		
+
 		aac_sbr_upsample = 0;
 #if !defined(__SYMBIAN32__) || defined(__SERIES60_3X__)
 		if (a_cfg.has_sbr && (ctx->caps & GF_EPOC_HAS_HEAAC)) {
@@ -147,7 +147,7 @@
 			configParams.Append(16);								//  8: Sample resolution, 8Khz (8-bit PCM) or 16Khz (16-bit)
 			configParams.Append(a_cfg.sbr_sr);						//  9: Output Sample Frequency
 			configParams.Append(5);									// 10: Extension Object Type
-		
+
 			TRAP(err, ctx->dec->ConfigureL(TUid::Uid(KUidMmfCodecAudioSettings), (TDesC8&) configParams));
 			if (err != KErrNone) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[EPOC Decoder] Failed to configure HE-AAC decoder (error %d) - retrying with AAC\n", err));
@@ -158,7 +158,7 @@
 			ctx->num_channels = a_cfg.nb_chan;
 			ctx->num_samples = aac_sbr_upsample ? 2048 : 1024;
 			ctx->sample_rate = a_cfg.sbr_sr;
-		} else 
+		} else
 #endif
 		{
 retry_no_sbr:
@@ -176,7 +176,7 @@
 			configParams.Append(0);                    // Aac decimation factor {0 - none, 2 - decimation by 2, 4 - decimation by 4}
 			configParams.Append(0);                    // Aac concealment - It can be {0 - none, 1 - basic}
 			configParams.Append(16);     // Sample resolution - It can be {16 - 16-bit resolution}
-			configParams.Append(0);                    // Sample Rate Conversion 0 : none 
+			configParams.Append(0);                    // Sample Rate Conversion 0 : none
 
 			TRAP(err, ctx->dec->ConfigureL(TUid::Uid(KUidMmfCodecAudioSettings), (TDesC8&) configParams));
 			if (err != KErrNone) {
@@ -298,11 +298,11 @@
 }
 
 
-static GF_Err EDEC_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+static GF_Err EDEC_ProcessData(GF_MediaDecoder *ifcg,
+                               char *inBuffer, u32 inBufferLength,
+                               u16 ES_ID, u32 *CTS,
+                               char *outBuffer, u32 *outBufferLength,
+                               u8 PaddingBits, u32 mmlevel)
 {
 	TCodecProcessResult res;
 	EPOCCodec *ctx = (EPOCCodec *)ifcg->privateStack;
@@ -339,7 +339,7 @@
 	GF_M4ADecSpecInfo a_cfg;
 	EPOCCodec *ctx = (EPOCCodec *)ifcg->privateStack;
 
-	/*audio decs*/	
+	/*audio decs*/
 	if (StreamType == GF_STREAM_AUDIO) {
 		/*media type query*/
 		if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
@@ -350,7 +350,7 @@
 		case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
 		case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
 		/*MPEG4 aac*/
-		case GPAC_OTI_AUDIO_AAC_MPEG4: 
+		case GPAC_OTI_AUDIO_AAC_MPEG4:
 			if (!dsi) return GF_CODEC_NOT_SUPPORTED;
 			if (gf_m4a_get_config(dsi, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg) != GF_OK) return GF_CODEC_MAYBE_SUPPORTED;
 			switch (a_cfg.base_object_type) {
@@ -401,7 +401,7 @@
 	GF_SAFEALLOC(ctx, EPOCCodec);
 	ifce->privateStack = ctx;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifce->AttachStream = EDEC_AttachStream;
 	ifce->DetachStream = EDEC_DetachStream;
 	ifce->GetCapabilities = EDEC_GetCapabilities;

gpac-0.5.0.svn5178.tar.bz2/modules/epoc_hw/epoc_vout.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/epoc_hw/epoc_vout.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 /*driver interface*/
@@ -65,8 +65,8 @@
 		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; 
+		if (ctx->egl_surface) eglDestroySurface(ctx->egl_display, ctx->egl_surface);
+		ctx->egl_surface = NULL;
 		eglTerminate(ctx->egl_display);
 		ctx->egl_display = NULL;
 	}
@@ -100,12 +100,12 @@
 		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();
+	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);
+	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;
@@ -127,36 +127,36 @@
 
 	gl_buffer_size = 0;
 	switch (disp_mode) {
-	case EGray256: 
-		ctx->pixel_format = GF_PIXEL_GREYSCALE; 
+	case EGray256:
+		ctx->pixel_format = GF_PIXEL_GREYSCALE;
 		ctx->bpp = 1;
 		break;
-	case EColor64K: 
-		ctx->pixel_format = GF_PIXEL_RGB_565; 
+	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; 
+	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; 
+	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; 
+	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; 
+	case EColor16MA:
+		ctx->pixel_format = GF_PIXEL_ARGB;
 		ctx->bpp = 4;
 		gl_buffer_size = 32;
 		break;
@@ -185,22 +185,25 @@
 			return GF_IO_ERR;
 		}
 		EGLConfig *configList = NULL;
-		EGLint numOfConfigs = 0; 
+		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);
+		configSize = numOfConfigs;
+		configList = (EGLConfig*) gf_malloc(sizeof(EGLConfig)*configSize);
 
-		// Define properties for the wanted EGLSurface 
+		// 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[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) {
@@ -245,15 +248,25 @@
 	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;
+	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;
+	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;
+	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;
+	case EColor16MA:
+		gl_buffer_size = 32;
+		break;
 #endif
 	case EGray256:
 	default:
@@ -273,7 +286,7 @@
 	}
 
 	EGLConfig *configList = NULL;
-	EGLint numOfConfigs = 0; 
+	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"));
@@ -282,15 +295,21 @@
 	configSize = numOfConfigs;
 	configList = (EGLConfig*) gf_malloc(sizeof(EGLConfig)*configSize);
 
-	// Define properties for the wanted EGLSurface 
+	// 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[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) {
@@ -300,8 +319,10 @@
 	EGLConfig gl_cfg = configList[0];
 	gf_free(configList);
 
-	atts[0] = EGL_WIDTH; atts[1] = width;
-	atts[2] = EGL_HEIGHT; atts[3] = height;
+	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);
@@ -484,10 +505,10 @@
 
 void EPOC_codec_del(void *ifcg);
 void *EPOC_codec_new();
-	
+
 /*interface query*/
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_VIDEO_OUTPUT_INTERFACE,
@@ -526,7 +547,7 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( epoc_vout )
+GPAC_MODULE_STATIC_DECLARATION( epoc_vout )
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn5178.tar.bz2/modules/ffmpeg_in/ffmpeg_decode.c -> gpac-0.5.1.svn5491.tar.xz/modules/ffmpeg_in/ffmpeg_decode.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -25,9 +25,10 @@
 
 #include "ffmpeg_in.h"
 #include <gpac/avparse.h>
+#include <libavcodec/avcodec.h>
 
 
-#if (LIBAVCODEC_VERSION_MAJOR >= 55) && (LIBAVCODEC_VERSION_MINOR >= 38)
+#if ((LIBAVCODEC_VERSION_MAJOR == 55) && (LIBAVCODEC_VERSION_MINOR >= 38)) || (LIBAVCODEC_VERSION_MAJOR > 55)
 #define HAS_HEVC
 
 #include <libavutil/opt.h>
@@ -44,7 +45,7 @@
  * \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){
+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 ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
@@ -116,7 +117,7 @@
 			gf_bs_read_data(bs, (char *)ctx->extradata + 0x5a, size);
 		}
 	}
-		break;
+	break;
 	default:
 		if (ctx->extradata)
 			gf_free(ctx->extradata);
@@ -168,12 +169,12 @@
 		codec = &ffd->base_codec;
 		frame = &ffd->base_frame;
 	}
-	if (!(*ctx)){
+	if (!(*ctx)) {
 
 #ifdef USE_AVCTX3
-	  *ctx = avcodec_alloc_context3(NULL);
+		*ctx = avcodec_alloc_context3(NULL);
 #else
-	  *ctx = avcodec_alloc_context();
+		*ctx = avcodec_alloc_context();
 #endif
 	}
 
@@ -219,9 +220,9 @@
 			/*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;
+				(*ctx)->sample_rate = 8000;
+				(*ctx)->channels = 1;
+				(*ctx)->frame_size = 160;
 			}
 		} else if (ffd->st==GF_STREAM_VISUAL) {
 			(*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
@@ -245,11 +246,11 @@
 				codec_id = CODEC_ID_H264;
 				break;
 #ifdef HAS_HEVC
-            case GPAC_OTI_VIDEO_HEVC:
-                codec_id = AV_CODEC_ID_HEVC;
-                break;
+			case GPAC_OTI_VIDEO_HEVC:
+				codec_id = AV_CODEC_ID_HEVC;
+				break;
 #endif
-                case GPAC_OTI_VIDEO_MPEG1:
+			case GPAC_OTI_VIDEO_MPEG1:
 			case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
 			case GPAC_OTI_VIDEO_MPEG2_MAIN:
 			case GPAC_OTI_VIDEO_MPEG2_SNR:
@@ -274,6 +275,12 @@
 				(*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;
 			}
 		}
 		else if ((ffd->st==GF_STREAM_ND_SUBPIC) && (ffd->oti==0xe0)) {
@@ -311,7 +318,7 @@
 
 				/*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){
+				if ((*ctx)->extradata) {
 					memcpy((*ctx)->extradata, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 					(*ctx)->extradata_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
 				} else {
@@ -320,7 +327,12 @@
 				}
 			}
 		}
+#ifndef FF_API_AVFRAME_LAVC
 		*frame = avcodec_alloc_frame();
+#else
+		*frame = av_frame_alloc();
+#endif
+
 	}
 #ifdef HAS_HEVC
 	if (ffd->oti == GPAC_OTI_VIDEO_HEVC) {
@@ -351,9 +363,9 @@
 			GF_LOG(GF_LOG_CODEC, GF_LOG_INFO, ("[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);
+		av_opt_set_int(*ctx, "threads", nb_threads, 0);
 
-        /* Set the decoder id */
+		/* 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");
@@ -385,7 +397,13 @@
 		if (!(*ctx)->channels) (*ctx)->channels = 2;
 
 #if defined(USE_AVCTX3)
+
+#ifndef FF_API_AVFRAME_LAVC
 		ffd->audio_frame = avcodec_alloc_frame();
+#else
+		ffd->audio_frame = av_frame_alloc();
+#endif
+
 #endif
 
 	} else {
@@ -401,14 +419,19 @@
 			break;
 
 		case CODEC_ID_DVD_SUBTITLE:
+#ifndef 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);
+				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);
@@ -551,7 +574,7 @@
 		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)*/
+		/*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)*/
@@ -565,11 +588,11 @@
 		capability->cap.valueInt = ffd->base_ctx->height;
 		break;
 	case GF_CODEC_STRIDE:
-		if (ffd->out_pix_fmt==GF_PIXEL_RGB_24) 
+		if (ffd->out_pix_fmt==GF_PIXEL_RGB_24)
 			capability->cap.valueInt = ffd->stride*3;
-		else if (ffd->conv_buffer) 
+		else if (ffd->conv_buffer)
 			capability->cap.valueInt = ffd->base_ctx->width;
-		else 
+		else
 			capability->cap.valueInt = ffd->stride;
 		break;
 	case GF_CODEC_FPS:
@@ -634,10 +657,10 @@
 }
 
 static GF_Err FFDEC_ProcessData(GF_MediaDecoder *plug,
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+                                char *inBuffer, u32 inBufferLength,
+                                u16 ES_ID, u32 *CTS,
+                                char *outBuffer, u32 *outBufferLength,
+                                u8 PaddingBits, u32 mmlevel)
 {
 #ifdef USE_AVCODEC2
 	AVPacket pkt;
@@ -710,12 +733,20 @@
 			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) gotpic = ffd->audio_frame->nb_samples * 2 * ctx->channels;
+		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);
@@ -723,14 +754,22 @@
 		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; }
+		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) {
-			if (ctx->channels * ctx->frame_size* 2 < gotpic) ctx->frame_size = gotpic / (2 * ctx->channels);
+			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 * 2 /* 16 / 8 */;
+			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*/
@@ -755,12 +794,29 @@
 					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 {
+		} 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;
+			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;
+			shift = 1<<31;
+			for (i=0;i<size;i++) {
+				output [i] = input[i] * shift;
+			}
+		} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S16) {
 			memcpy(outBuffer, ffd->audio_frame->data, sizeof(char) * ffd->audio_frame->nb_samples * ctx->channels*2);
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFMPEG Decoder] Raw Audio format %d not supoorted\n", ffd->audio_frame->format ));
 		}
 #else
 		/*we're sure to have at least gotpic bytes available in output*/
@@ -770,6 +826,10 @@
 		(*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;
@@ -864,11 +924,11 @@
 			}
 		}
 
-	#ifdef USE_AVCODEC2
+#ifdef USE_AVCODEC2
 		if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
-	#else
+#else
 		if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
-	#endif
+#endif
 			if (!ffd->check_short_header) {
 				return GF_NON_COMPLIANT_BITSTREAM;
 			}
@@ -888,11 +948,11 @@
 				if (! (*codec) || (avcodec_open(ctx, *codec)<0)) return GF_NON_COMPLIANT_BITSTREAM;
 #endif
 
-	#if USE_AVCODEC2
+#if USE_AVCODEC2
 				if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
-	#else
+#else
 				if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
-	#endif
+#endif
 					/*nope, stay in MPEG-4*/
 					avcodec_close(ctx);
 					*codec = avcodec_find_decoder(old_codec);
@@ -907,13 +967,13 @@
 			}
 		}
 
-	/*
-		if (!gotpic && (!ctx->width || !ctx->height) ) {
-			ctx->width = w;
-			ctx->height = h;
-			return GF_OK;
-		}
-	*/
+		/*
+			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++;
@@ -931,19 +991,19 @@
 
 	stride = frame->linesize[0];
 #ifndef NO_10bit
-    if ((ctx->pix_fmt == PIX_FMT_YUV420P10LE) && ffd->output_as_8bit && (frame->linesize[0] >= 2*w) )  {
+	if ((ctx->pix_fmt == PIX_FMT_YUV420P10LE) && ffd->output_as_8bit && (frame->linesize[0] >= 2*w) )  {
 		ffd->conv_to_8bit = 1;
 		stride=w;
 	}
 #endif
-            
+
 	/*recompute outsize in case on-the-fly change*/
 	if ((w != ctx->width) || (h != ctx->height)
-		|| (ffd->direct_output && (stride != ffd->stride)) 
-		|| ((ffd->out_pix_fmt==GF_PIXEL_YV12) && (ctx->pix_fmt != PIX_FMT_YUV420P) && !ffd->output_as_8bit ) 
-		//need to realloc the conversion buffer
-		|| (ffd->conv_to_8bit && !ffd->conv_buffer && ffd->direct_output)  
-	) {
+	        || (ffd->direct_output && (stride != ffd->stride))
+	        || ((ffd->out_pix_fmt==GF_PIXEL_YV12) && (ctx->pix_fmt != PIX_FMT_YUV420P) && !ffd->output_as_8bit )
+	        //need to realloc the conversion buffer
+	        || (ffd->conv_to_8bit && !ffd->conv_buffer && ffd->direct_output)
+	   ) {
 
 		ffd->stride = (!ffd->conv_to_8bit && ffd->direct_output) ? frame->linesize[0] : ctx->width;
 		if (ffd->out_pix_fmt == GF_PIXEL_RGB_24) {
@@ -973,7 +1033,7 @@
 			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 
+		/*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 = 1;
@@ -1019,7 +1079,7 @@
 	if (!gotpic) return GF_OK;
 
 #if (LIBAVCODEC_VERSION_MAJOR>52)
-	//fixme - investigate this, happens in some dash cases 
+	//fixme - investigate this, happens in some dash cases
 	if ((frame->width!=ctx->width) || (frame->height!=ctx->height))  {
 		*outBufferLength = 0;
 		return GF_OK;
@@ -1040,8 +1100,8 @@
 		dst.video_buffer = ffd->direct_output ? ffd->conv_buffer : outBuffer;
 		dst.pixel_format = GF_PIXEL_YV12;
 
-		gf_color_write_yv12_10_to_yuv(&dst, (u8 *) frame->data[0], frame->data[1], frame->data[2], frame->linesize[0], ctx->width, ctx->height, NULL);
-		*outBufferLength = ffd->out_size;	
+		gf_color_write_yv12_10_to_yuv(&dst, (u8 *) frame->data[0], frame->data[1], frame->data[2], frame->linesize[0], ctx->width, ctx->height, NULL, 0);
+		*outBufferLength = ffd->out_size;
 		return GF_OK;
 	}
 
@@ -1121,9 +1181,9 @@
 	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);
+	                                   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)
 		int sz = sws_scale((*cached_sws), frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
@@ -1144,7 +1204,7 @@
 {
 	FFDec *ffd = ifcg->privateStack;
 	AVFrame *frame;
-	
+
 
 	if (ffd->conv_buffer) {
 		*pY_or_RGB = (u8 *) ffd->conv_buffer;
@@ -1161,7 +1221,7 @@
 		*pY_or_RGB = frame->data[0];
 		*pU = frame->data[1];
 		*pV = frame->data[2];
-	} 
+	}
 	return GF_OK;
 }
 
@@ -1200,16 +1260,25 @@
 	}
 	else if (StreamType==GF_STREAM_AUDIO) {
 		/*std MPEG-2 audio*/
-		if ((ffd->oti==GPAC_OTI_AUDIO_MPEG2_PART3) || (ffd->oti==GPAC_OTI_AUDIO_MPEG1)) codec_id = CODEC_ID_MP2;
-		/*std AC3 audio*/
-		//if (ffd->oti==0xA5) codec_id = CODEC_ID_AC3;
+		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;
+		}
 	}
 
 	/*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->objectTypeIndication == GPAC_OTI_VIDEO_AVC) {
 			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 				Bool is_svc = 0;
 				u32 i, count;
@@ -1239,15 +1308,19 @@
 
 		switch (ffd->oti) {
 		/*MPEG-4 v1 simple profile*/
-		case GPAC_OTI_VIDEO_MPEG4_PART2: codec_id = CODEC_ID_MPEG4; break;
+		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;
+			codec_id = CODEC_ID_H264;
+			break;
 #ifdef HAS_HEVC
-        case GPAC_OTI_VIDEO_HEVC:
-            codec_id = AV_CODEC_ID_HEVC; break;
+		case GPAC_OTI_VIDEO_HEVC:
+			codec_id = AV_CODEC_ID_HEVC;
+			break;
 #endif
-        /*MPEG1 video*/
+		/*MPEG1 video*/
 		case GPAC_OTI_VIDEO_MPEG1:
 		/*MPEG2 video*/
 		case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
@@ -1256,15 +1329,16 @@
 		case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
 		case GPAC_OTI_VIDEO_MPEG2_HIGH:
 		case GPAC_OTI_VIDEO_MPEG2_422:
-			codec_id = CODEC_ID_MPEG2VIDEO; break;
+			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) 
+			if (avcodec_find_decoder(codec_id) != NULL)
 				return GF_CODEC_MAYBE_SUPPORTED;
-			
+
 			return GF_CODEC_NOT_SUPPORTED;
 		default:
 			return GF_CODEC_NOT_SUPPORTED;
@@ -1283,8 +1357,16 @@
 
 	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;
 }
 
@@ -1341,7 +1423,7 @@
 		return;
 	ffd = dec->privateStack;
 	dec->privateStack = NULL;
-	if (ffd){
+	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);

gpac-0.5.0.svn5178.tar.bz2/modules/ffmpeg_in/ffmpeg_demux.c -> gpac-0.5.1.svn5491.tar.xz/modules/ffmpeg_in/ffmpeg_demux.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -54,13 +54,10 @@
 #endif /* AVERROR_NOFMT */
 
 
-#if (LIBAVFORMAT_VERSION_MAJOR >= 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)
+#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)
-#ifndef FF_API_FORMAT_PARAMETERS
-#define FF_API_FORMAT_PARAMETERS	1
-#endif
-
+#define USE_AVFORMAT_OPEN_INPUT	1
 #endif
 
 
@@ -81,11 +78,12 @@
 	com.command_type = GF_NET_BUFFER_QUERY;
 
 	memset(&slh, 0, sizeof(GF_SLHeader));
-	
+
 	slh.compositionTimeStampFlag = slh.decodingTimeStampFlag = 1;
 
 	while (ffd->is_running) {
-		if ((!ffd->video_ch && (ffd->video_st>=0)) || (!ffd->audio_ch && (ffd->audio_st>=0))) {
+		//nothing connected, wait
+		if (!ffd->video_ch && !ffd->audio_ch) {
 			gf_sleep(100);
 			continue;
 		}
@@ -107,28 +105,16 @@
 		gf_mx_p(ffd->mx);
 		/*blindly send audio as soon as video is init*/
 		if (ffd->audio_ch && (pkt.stream_index == ffd->audio_st) ) {
-//			u64 seek_audio = ffd->seek_time ? (u64) (s64) (ffd->seek_time*ffd->audio_tscale.den) : 0;
 			slh.compositionTimeStamp *= ffd->audio_tscale.num;
 			slh.decodingTimeStamp *= ffd->audio_tscale.num;
 
-#if 0
-			if (slh.compositionTimeStamp < seek_audio) {
-				slh.decodingTimeStamp = slh.compositionTimeStamp = seek_audio;
-			}
-#endif
-			gf_term_on_sl_packet(ffd->service, ffd->audio_ch, (char *) pkt.data, pkt.size, &slh, GF_OK);
+			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)) {
-//			u64 seek_video = ffd->seek_time ? (u64) (s64) (ffd->seek_time*ffd->video_tscale.den) : 0;
 			slh.compositionTimeStamp *= ffd->video_tscale.num;
 			slh.decodingTimeStamp *= ffd->video_tscale.num;
-
-#if 0
-			if (slh.compositionTimeStamp < seek_video) {
-				slh.decodingTimeStamp = slh.compositionTimeStamp = seek_video;
-			}
-#endif
-			gf_term_on_sl_packet(ffd->service, ffd->video_ch, (char *) pkt.data, pkt.size, &slh, GF_OK);
+			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);
@@ -136,58 +122,59 @@
 		/*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_term_on_command(ffd->service, &com, GF_OK);
-			if (com.buffer.occupancy < com.buffer.max) 
+			gf_service_command(ffd->service, &com, GF_OK);
+			if (com.buffer.occupancy < com.buffer.max)
 				break;
-			gf_sleep(10);
 
+			gf_sleep(1);
 		}
+
 		if (!ffd->audio_run && !ffd->video_run) break;
 	}
 	/*signal EOS*/
-	if (ffd->audio_ch) gf_term_on_sl_packet(ffd->service, ffd->audio_ch, NULL, 0, NULL, GF_EOS);
-	if (ffd->video_ch) gf_term_on_sl_packet(ffd->service, ffd->video_ch, NULL, 0, NULL, GF_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",
+	"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",
+	"video/mp2t", "ts", "MPEG 2 TS",
 #endif
-  NULL
+	NULL
 };
 
-static u32 FFD_RegisterMimeTypes(const GF_InputService *plug){
-    u32 i;
-    for (i = 0 ; FFD_MIME_TYPES[i]; i+=3)
-      gf_term_register_mime_type(plug, FFD_MIME_TYPES[i], FFD_MIME_TYPES[i+1], FFD_MIME_TYPES[i+2]);
-    return i/3;
+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){
+static int open_file(AVFormatContext **	ic_ptr, const char * 	filename, AVInputFormat * 	fmt) {
 #ifdef USE_PRE_0_7
 	return av_open_input_file(ic_ptr, filename, fmt, 0, NULL);
 #else
@@ -234,30 +221,30 @@
 
 		/*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 0;
+		        || !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 0;
 
 		/*check any default stuff that should work with ffmpeg*/
 		{
-		  u32 i;
-		  for (i = 0 ; FFD_MIME_TYPES[i]; i+=3){
-		    if (gf_term_check_extension(plug, FFD_MIME_TYPES[i], FFD_MIME_TYPES[i+1], FFD_MIME_TYPES[i+2], ext))
-		      return 1;
-		  }
+			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 1;
+			}
 		}
 	}
 
 	ctx = NULL;
-    if (open_file(&ctx, szName, NULL)<0) {
+	if (open_file(&ctx, szName, NULL)<0) {
 		AVInputFormat *av_in = NULL;;
 		/*some extensions not supported by ffmpeg*/
 		if (ext && !strcmp(szExt, "cmp")) av_in = av_find_input_format("m4v");
@@ -266,7 +253,7 @@
 			return 0;
 		}
 	}
-    if (!ctx || av_find_stream_info(ctx) <0) goto exit;
+	if (!ctx || av_find_stream_info(ctx) <0) goto exit;
 
 	/*figure out if we can use codecs or not*/
 	has_video = has_audio = 0;
@@ -285,12 +272,12 @@
 	}
 	if (!has_audio && !has_video) goto exit;
 	ret = 1;
-#if LIBAVFORMAT_VERSION_MAJOR < 53 && LIBAVFORMAT_VERSION_MINOR < 45
+#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_term_register_mime_type(plug, fmt_out->mime_type, fmt_out->extensions, fmt_out->name);
+	if (fmt_out) gf_service_register_mime(plug, fmt_out->mime_type, fmt_out->extensions, fmt_out->name);
 	else {
 		ext = strrchr(szName, '.');
 		if (ext) {
@@ -299,7 +286,7 @@
 
 			szExtList = gf_modules_get_option((GF_BaseInterface *)plug, "MimeTypes", "application/x-ffmpeg");
 			if (!szExtList) {
-				gf_term_register_mime_type(plug, "application/x-ffmpeg", szExt, "Other Movies (FFMPEG)");
+				gf_service_register_mime(plug, "application/x-ffmpeg", szExt, "Other Movies (FFMPEG)");
 			} else if (!strstr(szExtList, szExt)) {
 				u32 len;
 				char *buf;
@@ -314,7 +301,11 @@
 	}
 
 exit:
-    if (ctx) av_close_input_file(ctx);
+#ifndef FF_API_CLOSE_INPUT_FILE
+	if (ctx) av_close_input_file(ctx);
+#else
+	if (ctx) avformat_close_input(&ctx);
+#endif
 	return ret;
 }
 
@@ -330,7 +321,7 @@
 	/*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;
+		AVCodecContext *dec = ffd->ctx->streams[ffd->audio_st]->codec;
 		esd->slConfig->timestampResolution = ffd->audio_tscale.den;
 		switch (dec->codec_id) {
 		case CODEC_ID_MP2:
@@ -345,8 +336,8 @@
 			esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
 			esd->decoderConfig->decoderSpecificInfo->data = gf_malloc(sizeof(char)*dec->extradata_size);
 			memcpy(esd->decoderConfig->decoderSpecificInfo->data,
-					dec->extradata,
-					sizeof(char)*dec->extradata_size);
+			       dec->extradata,
+			       sizeof(char)*dec->extradata_size);
 			break;
 		default:
 opaque_audio:
@@ -375,9 +366,9 @@
 		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*/
+			/*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;
@@ -386,8 +377,8 @@
 			esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
 			esd->decoderConfig->decoderSpecificInfo->data = gf_malloc(sizeof(char)*dec->extradata_size);
 			memcpy(esd->decoderConfig->decoderSpecificInfo->data,
-					dec->extradata,
-					sizeof(char)*dec->extradata_size);
+			       dec->extradata,
+			       sizeof(char)*dec->extradata_size);
 			break;
 		case CODEC_ID_MPEG1VIDEO:
 			esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
@@ -422,7 +413,11 @@
 	} else {
 		/*only send full AUs*/
 		esd->slConfig->useAccessUnitStartFlag = esd->slConfig->useAccessUnitEndFlag = 0;
-		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		if (for_audio) {
+			esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		} else {
+			esd->slConfig->useRandomAccessPointFlag = 1;
+		}
 		esd->slConfig->useTimestampsFlag = 1;
 	}
 
@@ -442,7 +437,7 @@
 		od->objectDescriptorID = esd->ESID;
 		audio_esid = esd->ESID;
 		gf_list_add(od->ESDescriptors, esd);
-		gf_term_add_media(ffd->service, (GF_Descriptor*)od, (ffd->video_st>=0) ? 1 : 0);
+		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, (ffd->video_st>=0) ? 1 : 0);
 	}
 	if ((ffd->video_st>=0) && (ffd->service_type != 2)) {
 		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
@@ -450,7 +445,7 @@
 		od->objectDescriptorID = esd->ESID;
 		esd->OCRESID = audio_esid;
 		gf_list_add(od->ESDescriptors, esd);
-		gf_term_add_media(ffd->service, (GF_Descriptor*)od, 0);
+		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, 0);
 	}
 }
 
@@ -564,7 +559,7 @@
 		ffd->io.seekable = 1;
 #endif
 
-		ffd->dnload = gf_term_download_new(ffd->service, url, GF_NETIO_SESSION_NOT_THREADED  | GF_NETIO_SESSION_NOT_CACHED, NULL, ffd);
+		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;
@@ -590,7 +585,7 @@
 			}
 			/*setup downloader*/
 			av_in->flags |= AVFMT_NOFILE;
-#if FF_API_FORMAT_PARAMETERS /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
+#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);
@@ -602,13 +597,25 @@
 
 	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;
+	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;
+	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));
@@ -673,7 +680,11 @@
 
 		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
 		if (!ffd->seekable) {
+#ifndef 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);
 			av_find_stream_info(ffd->ctx);
@@ -681,16 +692,20 @@
 	}
 
 	/*let's go*/
-	gf_term_on_connect(serv, NULL, GF_OK);
+	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 (ffd->ctx) av_close_input_file(ffd->ctx);
+#ifndef 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_term_on_connect(serv, NULL, e);
+	gf_service_connect_ack(serv, NULL, e);
 	return GF_OK;
 }
 
@@ -742,7 +757,12 @@
 
 	ffd->is_running = 0;
 
+#ifndef 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 = 0;
@@ -752,13 +772,13 @@
 			while (!ffd->is_running) gf_sleep(1);
 			ffd->is_running = 0;
 		}
-		gf_term_download_del(ffd->dnload);
+		gf_service_download_del(ffd->dnload);
 		ffd->dnload = NULL;
 	}
 	if (ffd->buffer) gf_free(ffd->buffer);
 	ffd->buffer = NULL;
 
-	gf_term_on_disconnect(ffd->service, NULL, GF_OK);
+	gf_service_disconnect_ack(ffd->service, NULL, GF_OK);
 #ifdef FFMPEG_DUMP_REMOTE
 	if (ffd->outdbg) fclose(ffd->outdbg);
 #endif
@@ -800,7 +820,7 @@
 	}
 
 exit:
-	gf_term_on_connect(ffd->service, channel, e);
+	gf_service_connect_ack(ffd->service, channel, e);
 	return GF_OK;
 }
 
@@ -820,7 +840,7 @@
 		ffd->video_ch = NULL;
 		ffd->video_run = 0;
 	}
-	gf_term_on_disconnect(ffd->service, channel, e);
+	gf_service_disconnect_ack(ffd->service, channel, e);
 	return GF_OK;
 }
 
@@ -892,7 +912,7 @@
 	if (!plug || !url)
 		return GF_FALSE;
 	ffd = (FFDemux *)plug->priv;
-	this_url = gf_term_get_service_url(ffd->service);
+	this_url = gf_service_get_url(ffd->service);
 	if (!this_url)
 		return GF_FALSE;
 
@@ -915,13 +935,13 @@
 
 	GF_SAFEALLOC(priv, FFDemux);
 
-    GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Registering all ffmpeg plugins...\n") );
-    /* register all codecs, demux and protocols */
-    av_register_all();
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Registering all ffmpeg plugins DONE.\n") );
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Registering all ffmpeg plugins...\n") );
+	/* register all codecs, demux and protocols */
+	av_register_all();
+	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->CanHandleURL = FFD_CanHandleURL;
 	ffd->CloseService = FFD_CloseService;
 	ffd->ConnectChannel = FFD_ConnectChannel;
 	ffd->ConnectService = FFD_ConnectService;

gpac-0.5.0.svn5178.tar.bz2/modules/ffmpeg_in/ffmpeg_in.h -> gpac-0.5.1.svn5491.tar.xz/modules/ffmpeg_in/ffmpeg_in.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -99,7 +99,7 @@
 
 #ifndef FFMPEG_OLD_HEADERS
 
-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 20)
+#if ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR <= 20)) || (LIBAVCODEC_VERSION_MAJOR < 52)
 #undef USE_AVCODEC2
 #else
 #define USE_AVCODEC2	1
@@ -109,7 +109,7 @@
 #undef USE_AVCODEC2
 #endif
 
-#if (LIBAVCODEC_VERSION_MAJOR >= 55) 
+#if (LIBAVCODEC_VERSION_MAJOR >= 55)
 #define USE_AVCTX3
 #elif (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35)
 #define USE_AVCTX3
@@ -117,7 +117,7 @@
 
 
 /*FFMPEG decoder module */
-typedef struct 
+typedef struct
 {
 	char szCodec[100];
 	u32 out_size;
@@ -196,7 +196,7 @@
 
 	/*input file*/
 	AVFormatContext *ctx;
-	
+
 	Bool seekable;
 	Double seek_time;
 
@@ -244,14 +244,14 @@
 
 	u32 codec_id
 
-- for audio - 
+- for audio -
 	u32 sample_rate: sampling rate or 0 if unknown
 	u16 nb_channels: num channels or 0 if unknown
 	u16 nb_bits_per_sample: nb bits or 0 if unknown
 	u16 num_samples: num audio samples per frame or 0 if unknown
 	u16 block_align: audio block align
 
-- for video - 
+- for video -
 	u32 width: video width or 0 if unknown;
 	u32 height: video height or 0 if unknown;

gpac-0.5.0.svn5178.tar.bz2/modules/ffmpeg_in/ffmpeg_load.c -> gpac-0.5.1.svn5491.tar.xz/modules/ffmpeg_in/ffmpeg_load.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -28,7 +28,7 @@
 
 #if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
 
-#if defined(_WIN32_WCE) 
+#if defined(_WIN32_WCE)
 #pragma comment(lib, "toolhelp")
 #pragma comment(lib, "winsock")
 #endif
@@ -36,11 +36,6 @@
 #define _TOSTR(_val) #_val
 #define TOSTR(_val) _TOSTR(_val)
 
-#pragma comment(lib, "avcodec-"TOSTR(LIBAVCODEC_VERSION_MAJOR) )
-#pragma comment(lib, "avformat-"TOSTR(LIBAVFORMAT_VERSION_MAJOR) )
-#pragma comment(lib, "avutil-"TOSTR(LIBAVUTIL_VERSION_MAJOR) )
-#pragma comment(lib, "swscale-"TOSTR(LIBSWSCALE_VERSION_MAJOR) )
-
 #endif
 
 
@@ -52,7 +47,7 @@
 #ifndef DISABLE_FFMPEG_DEMUX
 		GF_NET_CLIENT_INTERFACE,
 #endif
-	0
+		0
 	};
 	return si;
 }
@@ -83,4 +78,4 @@
 }
 
 
-GPAC_MODULE_STATIC_DELARATION( ffmpeg )
+GPAC_MODULE_STATIC_DECLARATION( ffmpeg )

gpac-0.5.0.svn5178.tar.bz2/modules/freenect/freenect.c -> gpac-0.5.1.svn5491.tar.xz/modules/freenect/freenect.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -89,7 +89,7 @@
 			}
 		}
 		vcap->depth_sl_header.compositionTimeStamp = timestamp;
-		gf_term_on_sl_packet(vcap->service, vcap->depth_channel, (char *) vcap->depth_buf, vcap->out_depth_size, &vcap->depth_sl_header, GF_OK);
+		gf_service_send_packet(vcap->service, vcap->depth_channel, (char *) vcap->depth_buf, vcap->out_depth_size, &vcap->depth_sl_header, GF_OK);
 	}
 }
 
@@ -101,7 +101,7 @@
 		memcpy(vcap->depth_buf, v_depth, vcap->out_depth_size);
 
 		vcap->depth_sl_header.compositionTimeStamp = timestamp;
-		gf_term_on_sl_packet(vcap->service, vcap->depth_channel, (char *) vcap->depth_buf, vcap->out_depth_size, &vcap->depth_sl_header, GF_OK);
+		gf_service_send_packet(vcap->service, vcap->depth_channel, (char *) vcap->depth_buf, vcap->out_depth_size, &vcap->depth_sl_header, GF_OK);
 	}
 }
 
@@ -121,7 +121,7 @@
 		}
 //		vcap->depth_sl_header.compositionTimeStamp = timestamp;
 		vcap->depth_sl_header.compositionTimeStamp ++;
-		gf_term_on_sl_packet(vcap->service, vcap->depth_channel, (char *) vcap->depth_buf, vcap->out_depth_size, &vcap->depth_sl_header, GF_OK);
+		gf_service_send_packet(vcap->service, vcap->depth_channel, (char *) vcap->depth_buf, vcap->out_depth_size, &vcap->depth_sl_header, GF_OK);
 	}
 }
 
@@ -136,45 +136,45 @@
 			int pval = vcap->gamma[depth[i]];
 			int lb = pval & 0xff;
 			switch (pval>>8) {
-				case 0:
-					vcap->depth_buf[3*i+0] = 255;
-					vcap->depth_buf[3*i+1] = 255-lb;
-					vcap->depth_buf[3*i+2] = 255-lb;
-					break;
-				case 1:
-					vcap->depth_buf[3*i+0] = 255;
-					vcap->depth_buf[3*i+1] = lb;
-					vcap->depth_buf[3*i+2] = 0;
-					break;
-				case 2:
-					vcap->depth_buf[3*i+0] = 255-lb;
-					vcap->depth_buf[3*i+1] = 255;
-					vcap->depth_buf[3*i+2] = 0;
-					break;
-				case 3:
-					vcap->depth_buf[3*i+0] = 0;
-					vcap->depth_buf[3*i+1] = 255;
-					vcap->depth_buf[3*i+2] = lb;
-					break;
-				case 4:
-					vcap->depth_buf[3*i+0] = 0;
-					vcap->depth_buf[3*i+1] = 255-lb;
-					vcap->depth_buf[3*i+2] = 255;
-					break;
-				case 5:
-					vcap->depth_buf[3*i+0] = 0;
-					vcap->depth_buf[3*i+1] = 0;
-					vcap->depth_buf[3*i+2] = 255-lb;
-					break;
-				default:
-					vcap->depth_buf[3*i+0] = 0;
-					vcap->depth_buf[3*i+1] = 0;
-					vcap->depth_buf[3*i+2] = 0;
-					break;
+			case 0:
+				vcap->depth_buf[3*i+0] = 255;
+				vcap->depth_buf[3*i+1] = 255-lb;
+				vcap->depth_buf[3*i+2] = 255-lb;
+				break;
+			case 1:
+				vcap->depth_buf[3*i+0] = 255;
+				vcap->depth_buf[3*i+1] = lb;
+				vcap->depth_buf[3*i+2] = 0;
+				break;
+			case 2:
+				vcap->depth_buf[3*i+0] = 255-lb;
+				vcap->depth_buf[3*i+1] = 255;
+				vcap->depth_buf[3*i+2] = 0;
+				break;
+			case 3:
+				vcap->depth_buf[3*i+0] = 0;
+				vcap->depth_buf[3*i+1] = 255;
+				vcap->depth_buf[3*i+2] = lb;
+				break;
+			case 4:
+				vcap->depth_buf[3*i+0] = 0;
+				vcap->depth_buf[3*i+1] = 255-lb;
+				vcap->depth_buf[3*i+2] = 255;
+				break;
+			case 5:
+				vcap->depth_buf[3*i+0] = 0;
+				vcap->depth_buf[3*i+1] = 0;
+				vcap->depth_buf[3*i+2] = 255-lb;
+				break;
+			default:
+				vcap->depth_buf[3*i+0] = 0;
+				vcap->depth_buf[3*i+1] = 0;
+				vcap->depth_buf[3*i+2] = 0;
+				break;
 			}
 		}
 		vcap->depth_sl_header.compositionTimeStamp = timestamp;
-		gf_term_on_sl_packet(vcap->service, vcap->depth_channel, (char *) vcap->depth_buf, vcap->out_depth_size, &vcap->depth_sl_header, GF_OK);
+		gf_service_send_packet(vcap->service, vcap->depth_channel, (char *) vcap->depth_buf, vcap->out_depth_size, &vcap->depth_sl_header, GF_OK);
 	}
 }
 
@@ -183,7 +183,7 @@
 	FreenectIn *vcap = freenect_get_user(dev);
 	if (vcap->color_channel) {
 		vcap->color_sl_header.compositionTimeStamp = timestamp;
-		gf_term_on_sl_packet(vcap->service, vcap->color_channel, (char *) rgb, vcap->out_color_size, &vcap->color_sl_header, GF_OK);
+		gf_service_send_packet(vcap->service, vcap->color_channel, (char *) rgb, vcap->out_color_size, &vcap->color_sl_header, GF_OK);
 	}
 }
 
@@ -294,7 +294,7 @@
 		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)) {
@@ -388,12 +388,12 @@
 	}
 
 	/*ACK connection is OK*/
-	gf_term_on_connect(serv, NULL, GF_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) || !strnicmp(url, "kinect://", 8)) {
@@ -412,7 +412,7 @@
 		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, (esd->ESID==2) ? vcap->color_pixel_format : vcap->depth_pixel_format);
 	gf_bs_write_u16(bs, vcap->width);
@@ -423,7 +423,7 @@
 	gf_bs_del(bs);
 
 	gf_list_add(od->ESDescriptors, esd);
-	gf_term_add_media(vcap->service, (GF_Descriptor*)od, 0);
+	gf_service_declare_media(vcap->service, (GF_Descriptor*)od, 0);
 
 	return GF_OK;
 }
@@ -435,7 +435,7 @@
 	if (vcap->f_ctx) freenect_shutdown(vcap->f_ctx);
 	vcap->f_ctx = NULL;
 	vcap->f_dev = NULL;
-	gf_term_on_disconnect(vcap->service, NULL, GF_OK);
+	gf_service_disconnect_ack(vcap->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -453,10 +453,13 @@
 	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_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_SET_PADDING:
+		return GF_OK;
 	case GF_NET_CHAN_BUFFER:
 		com->buffer.max = com->buffer.min = 500;
 		return GF_OK;
@@ -480,7 +483,8 @@
 			}
 		}
 		return GF_OK;
-	case GF_NET_CHAN_CONFIG: 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;
@@ -495,21 +499,21 @@
 {
 	u32 ESID;
 	FreenectIn *vcap = (FreenectIn *) plug->priv;
-	
+
 	sscanf(url, "ES_ID=%u", &ESID);
 	if (ESID == 1) {
 		vcap->depth_channel = channel;
 		memset(&vcap->depth_sl_header, 0, sizeof(GF_SLHeader));
 		vcap->depth_sl_header.compositionTimeStampFlag = 1;
-		gf_term_on_connect(vcap->service, channel, GF_OK);
+		gf_service_connect_ack(vcap->service, channel, GF_OK);
 	} else if (ESID == 2) {
 		vcap->color_channel = channel;
 		memset(&vcap->color_sl_header, 0, sizeof(GF_SLHeader));
 		vcap->color_sl_header.compositionTimeStampFlag = 1;
-		gf_term_on_connect(vcap->service, channel, GF_OK);
+		gf_service_connect_ack(vcap->service, channel, GF_OK);
 	} else {
 		/*TODO*/
-		gf_term_on_connect(vcap->service, channel, GF_STREAM_NOT_FOUND);
+		gf_service_connect_ack(vcap->service, channel, GF_STREAM_NOT_FOUND);
 	}
 	return GF_OK;
 }
@@ -523,7 +527,7 @@
 	else if (vcap->color_channel == channel) {
 		vcap->color_channel = NULL;
 	}
-	gf_term_on_disconnect(vcap->service, channel, GF_OK);
+	gf_service_disconnect_ack(vcap->service, channel, GF_OK);
 	return GF_OK;
 }
 
@@ -534,7 +538,7 @@
 
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_NET_CLIENT_INTERFACE,
@@ -566,7 +570,7 @@
 		GF_SAFEALLOC(vcap, FreenectIn);
 		plug->priv = vcap;
 		return (GF_BaseInterface *)plug;
-	} 
+	}
 	return NULL;
 }
 
@@ -585,5 +589,5 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( freenect )
+GPAC_MODULE_STATIC_DECLARATION( freenect )

gpac-0.5.0.svn5178.tar.bz2/modules/ft_font/ft_font.c -> gpac-0.5.1.svn5491.tar.xz/modules/ft_font/ft_font.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -43,7 +43,7 @@
 #include FT_GLYPH_H
 #include FT_OUTLINE_H
 /*TrueType tables*/
-#include FT_TRUETYPE_TABLES_H 
+#include FT_TRUETYPE_TABLES_H
 
 typedef struct
 {
@@ -92,7 +92,7 @@
 	u32 i;
 	assert( fontName );
 	assert( listOfFonts );
-	for (i = 0 ; listOfFonts[i]; i++){
+	for (i = 0 ; listOfFonts[i]; i++) {
 		const char * best = listOfFonts[i];
 		if (!stricmp(best, fontName))
 			return GF_TRUE;
@@ -103,18 +103,18 @@
 	return currentBestFont == NULL;
 }
 
-void setBestFont(const char * listOfFonts[], char ** currentBestFont, const char * fontName){
-	if (isBestFontFor(listOfFonts, *currentBestFont, fontName)){
+void setBestFont(const char * listOfFonts[], char ** currentBestFont, const char * fontName) {
+	if (isBestFontFor(listOfFonts, *currentBestFont, fontName)) {
 		if (*currentBestFont)
 			gf_free(*currentBestFont);
 		*currentBestFont = NULL;
 	}
-	if (! (*currentBestFont)){
+	if (! (*currentBestFont)) {
 		*currentBestFont = gf_strdup(fontName);
 	}
 }
 
-static Bool ft_enum_fonts(void *cbck, char *file_name, char *file_path)
+static Bool ft_enum_fonts(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
 {
 	char *szfont;
 	FT_Face face;
@@ -176,7 +176,7 @@
 				strcpy(szfont, face->family_name);
 				strlwr(szfont);
 
-				if (face->face_flags & FT_FACE_FLAG_FIXED_WIDTH){
+				if (face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) {
 					setBestFont(BEST_FIXED_FONTS, &(ftpriv->font_fixed), face->family_name);
 				}
 				setBestFont(BEST_SERIF_FONTS, &(ftpriv->font_serif), face->family_name);
@@ -195,7 +195,7 @@
 	return 0;
 }
 
-static Bool ft_enum_fonts_dir(void *cbck, char *file_name, char *file_path)
+static Bool ft_enum_fonts_dir(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
 {
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[FreeType] Scanning directory %s (%s)\n", file_name, file_path));
 	gf_enum_directory(file_path, 0, ft_enum_fonts, cbck, "ttf;ttc");
@@ -257,8 +257,8 @@
 		if (!strchr(opt, '/') && !strchr(opt, '\\')) continue;
 		if (!strcmp(key, "FontDirectory")) continue;
 
-		if (strstr(key, "Bold")) continue; 
-		if (strstr(key, "Italic")) continue; 
+		if (strstr(key, "Bold")) continue;
+		if (strstr(key, "Italic")) continue;
 
 		strcpy(fkey, key);
 		strcat(fkey, " Italic");
@@ -277,18 +277,18 @@
 
 		strcpy(fkey, key);
 		strlwr(fkey);
-		
+
 		/*this font is suited for our case*/
 		if (isBestFontFor(BEST_FIXED_FONTS, ftpriv->font_fixed, key) || (!ftpriv->font_fixed && (strstr(fkey, "fixed") || strstr(fkey, "mono")) ) ) {
 			if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
 			ftpriv->font_fixed = gf_strdup(key);
 		}
-		
+
 		if (isBestFontFor(BEST_SANS_FONTS, ftpriv->font_sans, key) || (!ftpriv->font_sans && strstr(fkey, "sans")) ) {
 			if (ftpriv->font_sans) gf_free(ftpriv->font_sans);
 			ftpriv->font_sans = gf_strdup(key);
 		}
-		
+
 		if (isBestFontFor(BEST_SERIF_FONTS, ftpriv->font_serif, key) || (!ftpriv->font_serif && strstr(fkey, "serif")) ) {
 			if (ftpriv->font_serif) gf_free(ftpriv->font_serif);
 			ftpriv->font_serif = gf_strdup(key);
@@ -324,7 +324,7 @@
 	}
 
 	/*remove the final delimiter*/
-    ftpriv->font_dir = gf_strdup(sOpt);
+	ftpriv->font_dir = gf_strdup(sOpt);
 	while ( (ftpriv->font_dir[strlen(ftpriv->font_dir)-1] == '\n') || (ftpriv->font_dir[strlen(ftpriv->font_dir)-1] == '\r') )
 		ftpriv->font_dir[strlen(ftpriv->font_dir)-1] = 0;
 
@@ -341,7 +341,7 @@
 	}
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "RescanFonts");
-	if (!sOpt || !strcmp(sOpt, "yes") ) 
+	if (!sOpt || !strcmp(sOpt, "yes") )
 		ft_rescan_fonts(dr);
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif");
@@ -349,12 +349,12 @@
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSans");
 	ftpriv->font_sans = gf_strdup(sOpt ? sOpt : "");
-	
+
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed");
 	ftpriv->font_fixed = gf_strdup(sOpt ? sOpt : "");
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[FreeType] Init OK - font directory %s\n", ftpriv->font_dir));
-	
+
 	return GF_OK;
 }
 
@@ -403,10 +403,10 @@
 	loc_styles = styles & GF_FONT_WEIGHT_MASK;
 	if (loc_styles>=GF_FONT_WEIGHT_BOLD)
 		styles = (styles & 0x00000007) | GF_FONT_WEIGHT_BOLD;
-	else 
+	else
 		styles = (styles & 0x00000007);
 
-	if (ft_style==styles) 
+	if (ft_style==styles)
 		return 1;
 	return 0;
 }
@@ -455,7 +455,7 @@
 
 	{
 		int checkStyles = (styles & GF_FONT_WEIGHT_BOLD) | (styles & GF_FONT_ITALIC);
-	checkFont:
+checkFont:
 		strcpy(fname, fontName);
 		if (styles & GF_FONT_WEIGHT_BOLD & checkStyles) strcat(fname, " Bold");
 		if (styles & GF_FONT_ITALIC & checkStyles) strcat(fname, " Italic");
@@ -471,10 +471,10 @@
 			ftpriv->active_face = face;
 			return GF_OK;
 		}
-		if (checkStyles){
+		if (checkStyles) {
 			/* If we tried font + bold + italic -> we will try font + [bold | italic]
 			   If we tried font + [bold | italic] -> we try font
-		         */
+			     */
 			if (checkStyles == (GF_FONT_WEIGHT_BOLD | GF_FONT_ITALIC))
 				checkStyles = GF_FONT_WEIGHT_BOLD;
 			else if (checkStyles == GF_FONT_WEIGHT_BOLD && (styles & GF_FONT_ITALIC))
@@ -635,7 +635,7 @@
 	ft_outl_funcs.cubic_to = ft_cubic_to;
 	outl.path = glyph->path;
 	outl.ftpriv = ftpriv;
-	
+
 	/*FreeType is marvelous and gives back the right advance on space char !!!*/
 	FT_Outline_Decompose(&outline->outline, &ft_outl_funcs, &outl);
 
@@ -645,10 +645,10 @@
 	glyph->utf_name = glyph_name;
 	glyph->horiz_advance = ftpriv->active_face->glyph->metrics.horiAdvance;
 	glyph->vert_advance = ftpriv->active_face->glyph->metrics.vertAdvance;
-/*
-	glyph->x = bbox.xMin;
-	glyph->y = bbox.yMax;
-*/
+	/*
+		glyph->x = bbox.xMin;
+		glyph->y = bbox.yMax;
+	*/
 	glyph->width = ftpriv->active_face->glyph->metrics.width;
 	glyph->height = ftpriv->active_face->glyph->metrics.height;
 	FT_Done_Glyph((FT_Glyph) outline);
@@ -671,7 +671,7 @@
 
 	dr->udta = ftpriv;
 
-	
+
 	dr->init_font_engine = ft_init_font_engine;
 	dr->shutdown_font_engine = ft_shutdown_font_engine;
 	dr->set_font = ft_set_font;
@@ -703,7 +703,7 @@
 #ifndef GPAC_STANDALONE_RENDER_2D
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_FONT_READER_INTERFACE,
@@ -713,7 +713,7 @@
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_FONT_READER_INTERFACE) return (GF_BaseInterface *)ft_load();
 	return NULL;
@@ -729,7 +729,7 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( ftfont )
+GPAC_MODULE_STATIC_DECLARATION( ftfont )
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/ft_font/ft_font.h -> gpac-0.5.1.svn5491.tar.xz/modules/ft_font/ft_font.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/gapi/gapi.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/gapi/gapi.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -98,44 +98,103 @@
 	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_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_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;
@@ -175,11 +234,11 @@
 		evt->key_code = GF_KEY_9;
 		evt->flags = GF_KEY_EXT_NUMPAD;
 		break;
-	case VK_MULTIPLY: 
+	case VK_MULTIPLY:
 		evt->key_code = GF_KEY_STAR;
 		evt->flags = GF_KEY_EXT_NUMPAD;
 		break;
-	case VK_ADD: 
+	case VK_ADD:
 		evt->key_code = GF_KEY_PLUS;
 		evt->flags = GF_KEY_EXT_NUMPAD;
 		break;
@@ -199,43 +258,95 @@
 		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_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;
+	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;
 
-/*
- * 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: 
+	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;
@@ -261,22 +372,38 @@
 		break;
 
 #if(WINVER >= 0x0400)
-	case VK_PROCESSKEY: evt->key_code = GF_KEY_PROCESS; break;
+	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_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;
+	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: 
+	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 {
@@ -288,17 +415,17 @@
 			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) 
+			else if (res==ctx->keys.vkA)
 				evt->key_code = GF_KEY_MEDIAPREVIOUSTRACK;
-			else if (res==ctx->keys.vkB) 
+			else if (res==ctx->keys.vkB)
 				evt->key_code = GF_KEY_MEDIANEXTTRACK;
-			else if (res==ctx->keys.vkC) 
+			else if (res==ctx->keys.vkC)
 				evt->key_code = GF_KEY_SHIFT;
-			else if (res==0xc1) 
+			else if (res==0xc1)
 				evt->key_code = GF_KEY_ALT;
-			else if (res==0xc2) 
+			else if (res==0xc2)
 				evt->key_code = GF_KEY_CONTROL;
-			else if (res==0xc5) 
+			else if (res==0xc5)
 				evt->key_code = GF_KEY_VOLUMEDOWN;
 			else {
 				evt->key_code = GF_KEY_UNIDENTIFIED;
@@ -322,7 +449,7 @@
 		evt.size.height = HIWORD(lParam);
 		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
 	}
-		break;
+	break;
 	case WM_CLOSE:
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_QUIT;
@@ -339,7 +466,7 @@
 			ctx->orig_wnd_proc = 0L;
 		}
 	}
-		break;
+	break;
 
 	case WM_ERASEBKGND:
 		evt.type = GF_EVENT_REFRESH;
@@ -347,15 +474,15 @@
 		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;
+	break;
 
 	case WM_MOUSEMOVE:
 		GAPI_GetCoordinates(lParam, &evt);
@@ -406,7 +533,7 @@
 	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;
@@ -529,41 +656,47 @@
 
 static void createPixmap(GAPIPriv *ctx, u32 pix_type)
 {
-    const size_t    bmiSize = sizeof(BITMAPINFO) + 256U*sizeof(RGBQUAD);
-    BITMAPINFO*     bmi;
-    DWORD*          p;
+	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 = (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;
+	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;
+	p = (DWORD*)bmi->bmiColors;
 	switch (ctx->pixel_format) {
 	case GF_PIXEL_RGB_555:
-		p[0] = 0x00007c00; p[1] = 0x000003e0; p[2] = 0x0000001f;
+		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;
+		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;
+		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_OGL_ES
 		ctx->gl_bitmap = CreateDIBSection(ctx->hdc, bmi, DIB_RGB_COLORS, (void **) &ctx->gl_bits, NULL, 0);
@@ -576,7 +709,7 @@
 		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 ++;
 	}
@@ -601,16 +734,16 @@
 		if (ctx->egldpy) eglTerminate(ctx->egldpy);
 		ctx->egldpy = 0;
 	}
-    if (ctx->gl_bitmap) DeleteObject(ctx->gl_bitmap);
+	if (ctx->gl_bitmap) DeleteObject(ctx->gl_bitmap);
 	ctx->gl_bitmap = NULL;
 
 	if (offscreen_only) return;
 
-    if (ctx->bitmap) DeleteObject(ctx->bitmap);
+	if (ctx->bitmap) DeleteObject(ctx->bitmap);
 	ctx->bitmap = NULL;
 }
 
-GF_Err GAPI_SetupOGL_ES(GF_VideoOutput *dr) 
+GF_Err GAPI_SetupOGL_ES(GF_VideoOutput *dr)
 {
 	EGLint n, maj, min;
 	u32 i;
@@ -620,12 +753,16 @@
 	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;
+	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; 
+	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;
@@ -633,8 +770,10 @@
 	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_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*/
@@ -669,9 +808,9 @@
 
 	if (gctx->fullscreen
 #ifdef GLES_NO_PIXMAP
-		|| 1
+	        || 1
 #endif
-		) {
+	   ) {
 		gctx->surface = eglCreateWindowSurface(gctx->egldpy, gctx->eglconfig, gctx->hWnd, 0);
 	} else {
 		gctx->surface = eglCreatePixmapSurface(gctx->egldpy, gctx->eglconfig, gctx->bitmap, 0);
@@ -679,16 +818,16 @@
 
 	if (!gctx->surface) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot create OpenGL surface - error %d\n", eglGetError()));
-		return GF_IO_ERR; 
+		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; 
+		return GF_IO_ERR;
 	}
-    if (!eglMakeCurrent(gctx->egldpy, gctx->surface, gctx->surface, gctx->eglctx)) {
+	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;
@@ -700,13 +839,13 @@
 	memset(&evt, 0, sizeof(GF_Event));
 	evt.type = GF_EVENT_VIDEO_SETUP;
 	evt.hw_reset = 1;
-	dr->on_event(dr->evt_cbk_hdl, &evt);	
+	dr->on_event(dr->evt_cbk_hdl, &evt);
 	return GF_OK;
 }
 
 
 
-GF_Err GAPI_SetupOGL_ES_Offscreen(GF_VideoOutput *dr, u32 width, u32 height) 
+GF_Err GAPI_SetupOGL_ES_Offscreen(GF_VideoOutput *dr, u32 width, u32 height)
 {
 	int atts[15];
 	const char *opt;
@@ -726,15 +865,22 @@
 		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;
+	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[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[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);
@@ -745,23 +891,25 @@
 	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[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; 
+		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; 
+		return GF_IO_ERR;
 	}
-    if (!eglMakeCurrent(gctx->egldpy, gctx->surface, gctx->surface, gctx->eglctx)) {
+	if (!eglMakeCurrent(gctx->egldpy, gctx->surface, gctx->surface, gctx->eglctx)) {
 		eglDestroyContext(gctx->egldpy, gctx->eglctx);
 		gctx->eglctx = 0L;
 		eglDestroySurface(gctx->egldpy, gctx->surface);
@@ -782,8 +930,8 @@
 	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);
+		if (ctx->bitmap) DeleteObject(ctx->bitmap);
+		else if (ctx->backbuffer) gf_free(ctx->backbuffer);
 	ctx->backbuffer = NULL;
 	ctx->bitmap = NULL;
 
@@ -803,36 +951,36 @@
 	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) {
+	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;
 	}
+	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;
@@ -842,7 +990,7 @@
 		MessageBox(NULL, _T("Cannot open display"), _T("GAPI Error"), MB_OK);
 		return GF_IO_ERR;
 	}
-    GetClientRect(gctx->hWnd, &rc);
+	GetClientRect(gctx->hWnd, &rc);
 	gctx->backup_w = rc.right - rc.left;
 	gctx->backup_h = rc.bottom - rc.top;
 
@@ -948,7 +1096,7 @@
 		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;
@@ -977,7 +1125,7 @@
 	}
 
 	/*apply x/y offset*/
-	if (!gctx->fullscreen) 
+	if (!gctx->fullscreen)
 		dst.video_buffer += gctx->dst_blt.x * gctx->x_pitch + gctx->y_pitch * gctx->dst_blt.y;
 
 	if (gctx->contiguous_mem) {
@@ -1012,7 +1160,7 @@
 	if (!gctx) return GF_BAD_PARAM;
 
 	gf_mx_p(gctx->mx);
-	
+
 #ifdef GPAC_USE_OGL_ES
 	if (gctx->output_3d_type==1) {
 #ifndef GLES_NO_PIXMAP
@@ -1025,7 +1173,7 @@
 			eglSwapBuffers(gctx->egldpy, gctx->surface);
 #ifndef GLES_NO_PIXMAP
 		} else {
-		    InvalidateRect(gctx->hWnd, NULL, gctx->erase_dest);
+			InvalidateRect(gctx->hWnd, NULL, gctx->erase_dest);
 			gctx->erase_dest = GF_FALSE;
 		}
 #endif
@@ -1069,8 +1217,10 @@
 {
 	u32 res;
 	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF; res<<=8;
-	res |= (val>>8)&0xFF; res<<=8;
+	res = (val)&0xFF;
+	res<<=8;
+	res |= (val>>8)&0xFF;
+	res<<=8;
 	res |= (val>>16)&0xFF;
 	return res;
 }
@@ -1146,7 +1296,7 @@
 #define ESC_QUERYESCSUPPORT 8
 #define GETGXINFO			0x00020000
 
-typedef struct GXDeviceInfo 
+typedef struct GXDeviceInfo
 {
 	long Version;           //00
 	void * pvFrameBuffer;   //04
@@ -1195,21 +1345,21 @@
 }
 
 #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
+#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)
@@ -1236,8 +1386,8 @@
 
 			// 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)))
+			        ((DCWidth == GXInfo.cxWidth && DCHeight == GXInfo.cyHeight) ||
+			         (DCWidth == GXInfo.cyHeight && DCHeight == GXInfo.cxWidth)))
 			{
 				Bool Detect = GF_FALSE;
 				int* p = (int*)GXInfo.pvFrameBuffer;
@@ -1270,7 +1420,7 @@
 	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
+		        abs(Info.cxStride)*8 >= Info.cxPixels*Info.wBPP) { //swapped resolution
 			tmp = Info.cxPixels;
 			Info.cxPixels = Info.cyPixels;
 			Info.cyPixels = tmp;
@@ -1279,7 +1429,7 @@
 	else
 	{
 		if (abs(Info.cyStride)*8 < Info.cxPixels*Info.wBPP &&
-			abs(Info.cyStride)*8 >= Info.cyPixels*Info.wBPP) {//swapped resolution
+		        abs(Info.cyStride)*8 >= Info.cyPixels*Info.wBPP) {//swapped resolution
 			tmp = Info.cxPixels;
 			Info.cxPixels = Info.cyPixels;
 			Info.cyPixels = tmp;
@@ -1288,12 +1438,12 @@
 
 	gctx->raw_ptr = (unsigned char *)Info.pFramePointer;
 
-	if (Info.cxStride<0) 
+	if (Info.cxStride<0)
 		gctx->raw_ptr += (Info.cxStride * (Info.cxPixels-1));
-	if (Info.cyStride<0) 
+	if (Info.cyStride<0)
 		gctx->raw_ptr += (Info.cyStride * (Info.cyPixels-1));
 
-	if (check_resolution_switch(dr, Info.cxPixels, Info.cyPixels)) 
+	if (check_resolution_switch(dr, Info.cxPixels, Info.cyPixels))
 		return GF_EOS;
 
 	return GF_OK;
@@ -1386,7 +1536,7 @@
 		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;
@@ -1398,7 +1548,7 @@
 		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;
@@ -1410,7 +1560,7 @@
 		/*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;
@@ -1437,7 +1587,7 @@
 		vi->pitch_x = gctx->x_pitch;
 		vi->pitch_y = gctx->y_pitch;
 
-		if (landscape) 
+		if (landscape)
 			GAPI_AdjustLandscape(gctx, vi, gctx->x_pitch, gctx->y_pitch);
 	}
 	return GF_OK;
@@ -1488,7 +1638,7 @@
 
 /*interface query*/
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_VIDEO_OUTPUT_INTERFACE,
@@ -1517,7 +1667,7 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( gapi )
+GPAC_MODULE_STATIC_DECLARATION( gapi )
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn5178.tar.bz2/modules/gapi/gapi.h -> gpac-0.5.1.svn5491.tar.xz/modules/gapi/gapi.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -79,19 +79,19 @@
 	u32 off_x, off_y;
 
 	HBITMAP bitmap, old_bitmap;
-    DWORD * bits;
+	DWORD * bits;
 	HDC hdcBitmap, hdc;
 	BITMAPINFO*     bmi;
 
 #ifdef GPAC_USE_OGL_ES
 	u32 output_3d_type;
-    EGLDisplay egldpy;
-    EGLSurface surface;
-    EGLConfig eglconfig;
-    EGLContext eglctx;
+	EGLDisplay egldpy;
+	EGLSurface surface;
+	EGLConfig eglconfig;
+	EGLContext eglctx;
 
 	HBITMAP gl_bitmap;
-    DWORD *gl_bits;
+	DWORD *gl_bits;
 	HWND gl_hwnd;
 	Bool use_pbuffer;
 #endif
@@ -105,4 +105,4 @@
 }
 #endif
 
-#endif 
+#endif

gpac-0.5.0.svn5178.tar.bz2/modules/gdip_raster/gdip_font.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/gdip_raster/gdip_font.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -53,7 +53,7 @@
 
 	if (ctx->font) GdipDeleteFontFamily(ctx->font);
 	ctx->font = NULL;
-	
+
 	/*nothing to do*/
 	return GF_OK;
 }
@@ -136,7 +136,7 @@
 
 	GdipDeleteStringFormat(fmt);
 	GdipDeletePath(path_tmp);
-	
+
 	return GF_OK;
 }
 
@@ -155,8 +155,8 @@
 	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]) );
+	MultiByteToWideChar(CP_ACP, 0, fontName, (u32)strlen(fontName)+1,
+	                    wcFontName, sizeof(wcFontName)/sizeof(wcFontName[0]) );
 
 
 	GdipCreateFontFamilyFromName(wcFontName, NULL, &ctx->font);
@@ -187,7 +187,8 @@
 	ctx->ascent = (Float) val;
 	*ascent = (s32) val;
 	GdipGetCellDescent(ctx->font, ctx->font_style, &val);
-	*descent = (s32) val; *descent *= -1;
+	*descent = (s32) val;
+	*descent *= -1;
 	ctx->descent = -1 * (Float) val;
 	*underline = *descent / 2;
 	GdipGetLineSpacing(ctx->font, ctx->font_style, &val);
@@ -242,7 +243,7 @@
 		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 
+		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) '_';
@@ -251,7 +252,7 @@
 		GdipGetPathWorldBounds(path_tmp, &rc, NULL, NULL);
 		est_advance_h = rc.Width - ctx->underscore_width;
 	}
-	
+
 	GdipResetPath(path_tmp);
 
 	str[0] = glyph_name;
@@ -284,7 +285,7 @@
 	for (i=0; i<count; ) {
 		BOOL closed = 0;
 		s32 sub_type;
-		
+
 		sub_type = types[i] & PathPointTypePathTypeMask;
 
 		if (sub_type == PathPointTypeStart) {
@@ -293,7 +294,7 @@
 		}
 		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++;
@@ -310,7 +311,7 @@
 			break;
 		}
 	}
-	
+
 	delete [] pts;
 	delete [] types;
 	GdipDeleteStringFormat(fmt);
@@ -368,7 +369,7 @@
 #endif
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_FONT_READER_INTERFACE,
@@ -399,7 +400,7 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( gdiplus )
+GPAC_MODULE_STATIC_DECLARATION( gdiplus )
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn5178.tar.bz2/modules/gdip_raster/gdip_grad.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/gdip_raster/gdip_grad.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -29,7 +29,7 @@
 GF_STENCIL gdip_new_stencil(GF_Raster2D *, GF_StencilType type)
 {
 	struct _stencil *sten;
-	
+
 	switch (type) {
 	case GF_STENCIL_SOLID:
 	case GF_STENCIL_LINEAR_GRADIENT:
@@ -80,7 +80,7 @@
 {
 	GPSTEN();
 	CHECK_RET(GF_STENCIL_SOLID);
-	if (!_sten->pSolid) 
+	if (!_sten->pSolid)
 		GdipCreateSolidFill(c, &_sten->pSolid);
 	else
 		GdipSetSolidFillColor(_sten->pSolid, c);
@@ -99,7 +99,7 @@
 	return GF_OK;
 }
 
-static 
+static
 GF_Err gdip_set_linear_gradient (GF_STENCIL _this, Fixed start_x, Fixed start_y, Fixed end_x, Fixed end_y)
 {
 	GPSTEN();
@@ -142,7 +142,7 @@
 		GdipSetLinePresetBlend(_sten->pLinear, (ARGB *) _sten->cols, _sten->pos, _sten->num_pos);
 		return;
 	}
-	/*currently gdiplus doesn't support padded mode on gradients, so update the line gradient by 
+	/*currently gdiplus doesn't support padded mode on gradients, so update the line gradient by
 	using a line 3 times longer*/
 	w = _sten->end.X - _sten->start.X;
 	h = _sten->end.Y - _sten->start.Y;
@@ -173,7 +173,7 @@
 	cases the x3 dilatation is enough*/
 	GdipSetLineWrapMode(_sten->pLinear, WrapModeTileFlipXY);
 	GdipSetLinePresetBlend(_sten->pLinear, cols, pos, 2+_sten->num_pos);
-	
+
 	delete [] cols;
 	delete [] pos;
 }
@@ -212,22 +212,22 @@
 	if (_sten->spread == GF_GRADIENT_MODE_PAD) {
 
 
-		GdipAddPathEllipse(_sten->circle, - _sten->radius.X, -_sten->radius.Y, 
-								2*_sten->radius.X, 2*_sten->radius.Y);
-	
+		GdipAddPathEllipse(_sten->circle, - _sten->radius.X, -_sten->radius.Y,
+		                   2*_sten->radius.X, 2*_sten->radius.Y);
+
 		GdipCreatePathGradientFromPath(_sten->circle, &_sten->pRadial);
 
 		ARGB *blends = new ARGB[_sten->num_pos + 1];
 
 		/*radial blend pos are from bounds to center in gdiplus*/
 		blends[0] = _sten->cols[_sten->num_pos - 1];
-		for (i=0; i<_sten->num_pos;i++) {
+		for (i=0; i<_sten->num_pos; i++) {
 			blends[i+1] = _sten->cols[_sten->num_pos - i - 1];
 		}
-	
+
 		REAL *pos = new REAL[_sten->num_pos + 1];
 		pos[0] = 0;
-		for (i=0; i<_sten->num_pos;i++) {
+		for (i=0; i<_sten->num_pos; i++) {
 			pos[i+1] = _sten->pos[i];
 		}
 
@@ -239,7 +239,7 @@
 		pt = _sten->focal;
 		pt.X -= _sten->center.X;
 		pt.Y -= _sten->center.Y;
-		GdipSetPathGradientCenterPoint(_sten->pRadial, &pt);	
+		GdipSetPathGradientCenterPoint(_sten->pRadial, &pt);
 
 		/*set transform*/
 		GdipCreateMatrix(&mat);
@@ -251,14 +251,14 @@
 		/*create back brush*/
 		GdipCreateSolidFill(_sten->cols[_sten->num_pos - 1], &_sten->pSolid);
 		GdipResetPath(_sten->circle);
-		GdipAddPathEllipse(_sten->circle, - _sten->radius.X + _sten->center.X, -_sten->radius.Y + _sten->center.Y, 
-								2*_sten->radius.X, 2*_sten->radius.Y);
+		GdipAddPathEllipse(_sten->circle, - _sten->radius.X + _sten->center.X, -_sten->radius.Y + _sten->center.Y,
+		                   2*_sten->radius.X, 2*_sten->radius.Y);
 
 	} else {
 		repeat = 10;
 
-		GdipAddPathEllipse(_sten->circle, - repeat * _sten->radius.X, - repeat*_sten->radius.Y, 
-								2*repeat*_sten->radius.X,  2*repeat*_sten->radius.Y);
+		GdipAddPathEllipse(_sten->circle, - repeat * _sten->radius.X, - repeat*_sten->radius.Y,
+		                   2*repeat*_sten->radius.X,  2*repeat*_sten->radius.Y);
 
 		GdipCreatePathGradientFromPath(_sten->circle, &_sten->pRadial);
 		GdipDeletePath(_sten->circle);
@@ -296,13 +296,13 @@
 		pt = _sten->focal;
 		pt.X -= (1 - repeat) * (_sten->focal.X - _sten->center.X) + _sten->center.X;
 		pt.Y -= (1 - repeat) * (_sten->focal.Y - _sten->center.Y) + _sten->center.Y;
-		GdipSetPathGradientCenterPoint(_sten->pRadial, &pt);	
+		GdipSetPathGradientCenterPoint(_sten->pRadial, &pt);
 
 		/*set transform*/
 		GdipCreateMatrix(&mat);
 		GdipTranslateMatrix(mat, (1 - repeat) * (_sten->focal.X - _sten->center.X) + _sten->center.X,
-								(1 - repeat) * (_sten->focal.Y - _sten->center.Y) + _sten->center.Y, 
-								MatrixOrderAppend);
+		                    (1 - repeat) * (_sten->focal.Y - _sten->center.Y) + _sten->center.Y,
+		                    MatrixOrderAppend);
 		if (_sten->pMat) GdipMultiplyMatrix(mat, _sten->pMat, MatrixOrderAppend);
 		GdipSetTextureTransform((GpTexture*)_sten->pRadial, mat);
 		GdipDeleteMatrix(mat);
@@ -311,7 +311,7 @@
 	}
 }
 
-static 
+static
 GF_Err gdip_set_radial_gradient(GF_STENCIL _this, Fixed cx, Fixed cy, Fixed fx, Fixed fy, Fixed x_radius, Fixed y_radius)
 {
 	GPSTEN();
@@ -348,7 +348,7 @@
 }
 
 
-static 
+static
 GF_Err gdip_set_vertex_path(GF_STENCIL _this, GF_Path *path)
 {
 	GPSTEN();
@@ -361,7 +361,7 @@
 	return GF_OK;
 }
 
-static 
+static
 GF_Err gdip_set_vertex_center (GF_STENCIL _this, Fixed cx, Fixed cy, u32 color)
 {
 	GpStatus ret;

gpac-0.5.0.svn5178.tar.bz2/modules/gdip_raster/gdip_priv.h -> gpac-0.5.1.svn5491.tar.xz/modules/gdip_raster/gdip_priv.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/gdip_raster/gdip_rend.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/gdip_raster/gdip_rend.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -63,7 +63,7 @@
 	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;
@@ -82,11 +82,11 @@
 				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)
-									);
+				                  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:
@@ -99,15 +99,15 @@
 				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)
-								);
+				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;
+			break;
 			}
 		}
 		GdipClosePathFigure(p);
@@ -220,7 +220,7 @@
 	}
 	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) {
@@ -276,7 +276,7 @@
 {
 	GPGRAPH();
 	if (_graph->mat) GdipDeleteMatrix(_graph->mat);
-	
+
 	_graph->mat = mat_gpac_to_gdip(mat);
 	return GF_OK;
 }
@@ -320,7 +320,7 @@
 	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;
@@ -337,7 +337,8 @@
 	GPGRAPH();
 	if (!_this) return GF_BAD_PARAM;
 	if (!_graph->current) return GF_OK;
-	_sten = (struct _stencil *)stencil; assert(_sten);
+	_sten = (struct _stencil *)stencil;
+	assert(_sten);
 
 #ifdef NODRAW
 	return GF_OK;
@@ -375,7 +376,7 @@
 		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;
@@ -405,10 +406,10 @@
 				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);	
+			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);
@@ -441,10 +442,10 @@
 		/*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);
+		/*		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*/

gpac-0.5.0.svn5178.tar.bz2/modules/gdip_raster/gdip_texture.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/gdip_raster/gdip_texture.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -135,62 +135,63 @@
 		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);
+			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;
 				}
-				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);
 			}
-			GdipBitmapSetPixel(_sten->pBitmap, i, j, col);
-		}}
+		}
 	}
 
 	return GF_OK;

gpac-0.5.0.svn5178.tar.bz2/modules/gpac_js/gpac_js.c -> gpac-0.5.1.svn5491.tar.xz/modules/gpac_js/gpac_js.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2007-2012
  *			All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -56,11 +56,12 @@
 #endif
 
 #include <gpac/internal/scenegraph_dev.h>
-#include <gpac/internal/smjs_api.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
 
@@ -71,6 +72,7 @@
 
 	GF_JSClass gpacClass;
 	GF_JSClass gpacEvtClass;
+	GF_JSClass odmClass;
 	GF_JSClass anyClass;
 
 	jsval evt_fun;
@@ -95,153 +97,234 @@
 static SMJS_FUNC_PROP_GET( gpac_getProperty)
 
 	const char *res;
-	char *prop_name;
+	s32 prop_id;
 	GF_Terminal *term = gpac_get_term(c, obj);
 	if (!term) 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 (!SMJS_ID_IS_INT(id)) return JS_TRUE;
+	prop_id = SMJS_ID_TO_INT(id);
 
-	if (!strcmp(prop_name, "last_working_directory")) {
+	switch (prop_id) {
+	case -1: //"last_working_directory"
 		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)); 
-	}
-	else if (!strcmp(prop_name, "scale_x")) {
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, res));
+		break;
+
+	case -2: //"scale_x")) 
 		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->scale_x)) );
-	}
-	else if (!strcmp(prop_name, "scale_y")) {
+		break;
+
+	case -3: //"scale_y"
 		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->scale_y)) );
-	}
-	else if (!strcmp(prop_name, "translation_x")) {
+		break;
+
+	case -4: //"translation_x"
 		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_x)) );
-	}
-	else if (!strcmp(prop_name, "translation_y")) {
+		break;
+
+	case -5: //"translation_y"
 		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_y)) );
-	}
-	else if (!strcmp(prop_name, "rectangular_textures")) {
+		break;
+
+	case -6: //"rectangular_textures"
+	{
 		Bool any_size = GF_FALSE;
-#ifndef GPAC_DISABLE_3D
+	#ifndef GPAC_DISABLE_3D
 		if (term->compositor->gl_caps.npot_texture || term->compositor->gl_caps.rect_texture)
 			any_size = GF_TRUE;
-#endif
+	#endif
 		*vp = BOOLEAN_TO_JSVAL( any_size ? JS_TRUE : JS_FALSE );
 	}
-	else if (!strcmp(prop_name, "batteryOn")) {
+		break;
+
+	case -7: //"batteryOn"
+	{
 		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 );
 	}
-	else if (!strcmp(prop_name, "batteryCharging")) {
+		break;
+
+	case -8: //	"batteryCharging"
+	{
 		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 );
 	}
-	else if (!strcmp(prop_name, "batteryPercent")) {
+		break;
+
+	case -9: //	"batteryPercent"
+	{
 		u32 level = 0;
 		gf_sys_get_battery_state(NULL, NULL, &level, NULL, NULL);
 		*vp = INT_TO_JSVAL( level );
 	}
-	else if (!strcmp(prop_name, "batteryLifeTime")) {
+		break;
+
+	case -10: //"batteryLifeTime"
+	{
 		u32 level = 0;
 		gf_sys_get_battery_state(NULL, NULL, NULL, &level, NULL);
 		*vp = INT_TO_JSVAL( level );
 	}
-	else if (!strcmp(prop_name, "batteryFullLifeTime")) {
+		break;
+
+	case -11: //"batteryFullLifeTime"
+	{
 		u32 level = 0;
 		gf_sys_get_battery_state(NULL, NULL, NULL, NULL, &level);
 		*vp = INT_TO_JSVAL( level );
 	}
-	else if (!strcmp(prop_name, "hostname")) {
+		break;
+
+	case -12: //"hostname"
+	{
 		char hostname[100];
 		gf_sk_get_host_name((char*)hostname);
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, hostname)); 
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, hostname));
 	}
-	else if (!strcmp(prop_name, "fullscreen")) {
-		*vp = BOOLEAN_TO_JSVAL( term->compositor->fullscreen ? JS_TRUE : JS_FALSE); 
-	}
-	else if (!strcmp(prop_name, "current_path")) {
+		break;
+
+	case -13: //"fullscreen"
+		*vp = BOOLEAN_TO_JSVAL( term->compositor->fullscreen ? JS_TRUE : JS_FALSE);
+		break;
+
+	case -14: //"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)); 
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, url));
 		gf_free(url);
 	}
-	else if (!strcmp(prop_name, "volume")) {
+		break;
+
+	case -15: //"volume"
 		*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_AUDIO_VOLUME));
-	}
-	else if (!strcmp(prop_name, "navigation")) {
+		break;
+
+	case -16: //"navigation"
 		*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_NAVIGATION));
-	}
-	else if (!strcmp(prop_name, "navigation_type")) {
+		break;
+
+	case -17: //"navigation_type"
 		*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE) );
-	}
-	else if (!strcmp(prop_name, "hardware_yuv")) {
+		break;
+
+	case -18: //"hardware_yuv"
 		*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_YUV) ? 1 : 0 );
-	}
-	else if (!strcmp(prop_name, "hardware_rgb")) {
+		break;
+
+	case -19: //"hardware_rgb"
 		*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGB) ? 1 : 0 );
-	}
-	else if (!strcmp(prop_name, "hardware_rgba")) {
+		break;
+
+	case -20: //"hardware_rgba"
+	{
 		u32 has_rgba = (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGBA) ? 1 : 0;
-#ifndef GPAC_DISABLE_3D
+	#ifndef GPAC_DISABLE_3D
 		if (term->compositor->hybrid_opengl || term->compositor->is_opengl) has_rgba = 1;
-#endif
+	#endif
 		*vp = INT_TO_JSVAL( has_rgba  );
 	}
-	else if (!strcmp(prop_name, "hardware_stretch")) {
+		break;
+
+	case -21: //"hardware_stretch"
 		*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_STRETCH) ? 1 : 0 );
-	}
-	else if (!strcmp(prop_name, "screen_width")) {
+		break;
+
+	case -22: //"screen_width"
 		*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_width);
-	}
-	else if (!strcmp(prop_name, "screen_height")) {
+		break;
+
+	case -23: //"screen_height"
 		*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_height);
+		break;
+
+	case -24: //"http_max_bitrate"
+		*vp = INT_TO_JSVAL( gf_dm_get_data_rate(term->downloader));
+		break;
+
+	case -25: //"http_bitrate"
+		*vp = INT_TO_JSVAL( gf_dm_get_global_rate(term->downloader));
+		break;
+
+	case -26: //"fps"
+		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, gf_sc_get_fps(term->compositor, 0) ) );
+		break;
+
+	case -27: //"cpu_load" || "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);
 	}
-	else if (!strcmp(prop_name, "http_bitrate")) {
-		*vp = INT_TO_JSVAL( gf_dm_get_data_rate(term->downloader)*8/1024);
-	}
-	else if (!strcmp(prop_name, "fps")) {
-		Double fps = gf_sc_get_fps(term->compositor, 0);
-		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, fps) );
+		break;
+
+	case -28: //"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);
 	}
-	else if (!strcmp(prop_name, "cpu_load")) {
+		break;
+
+	case -29: //"system_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_cpu_usage);
+		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, (Double) ext->rti.physical_memory ) );
 	}
-	else if (!strcmp(prop_name, "memory")) {
+		break;
+
+	case -30: //"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 -31: //"argc"
+		*vp = INT_TO_JSVAL(gf_sys_get_argc() );
+		break;
+
+	case -36://"dpi_x"
+		*vp = INT_TO_JSVAL(term->compositor->video_out->dpi_x);
+		break;
+
+	case -37://"dpi_y"
+		*vp = INT_TO_JSVAL(term->compositor->video_out->dpi_y);
+		break;
+	}
 
-	SMJS_FREE(c, prop_name);
 	return JS_TRUE;
 }
+
+
 static SMJS_FUNC_PROP_SET( gpac_setProperty)
 
-	char *prop_name, *prop_val;
+	s32 prop_id;
+	char *prop_val;
 	GF_Terminal *term = gpac_get_term(c, obj);
 	if (!term) 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 (!SMJS_ID_IS_INT(id)) return JS_TRUE;
+	prop_id = SMJS_ID_TO_INT(id);
 
-	if (!strcmp(prop_name, "last_working_directory")) {
+	switch (prop_id) {
+	case -1: //"last_working_directory"
 		if (!JSVAL_IS_STRING(*vp)) {
-			SMJS_FREE(c, prop_name);
 			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);
-	}
-	else if (!strcmp(prop_name, "caption")) {
+		break;
+	case -32://"caption"
+	{
 		GF_Event evt;
 		if (!JSVAL_IS_STRING(*vp)) {
-			SMJS_FREE(c, prop_name);
 			return JS_FALSE;
 		}
 		evt.type = GF_EVENT_SET_CAPTION;
@@ -249,35 +332,40 @@
 		gf_term_user_event(term, &evt);
 		SMJS_FREE(c, (char*)evt.caption.caption);
 	}
-	else if (!strcmp(prop_name, "fullscreen")) {
+		break;
+	case -13://"fullscreen"
+	{
 		/*no fullscreen for iOS (always on)*/
-#ifndef GPAC_IPHONE
+	#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
+	#endif
 	}
-	else if (!strcmp(prop_name, "volume")) {
+		break;
+	case -15: //"volume"
 		if (JSVAL_IS_NUMBER(*vp)) {
 			jsdouble d;
-			JS_ValueToNumber(c, *vp, &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));
 		}
-	}
-	else if (!strcmp(prop_name, "navigation")) {
+		break;
+
+	case -16: //"navigation"
 		gf_term_set_option(term, GF_OPT_NAVIGATION, JSVAL_TO_INT(*vp) );
-	}
-	else if (!strcmp(prop_name, "navigation_type")) {
+		break;
+	case -17: //"navigation_type"
 		gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
-	}
-	else if (!strcmp(prop_name, "disable_hardware_blit")) {
+		break;
+	case -33: //"disable_hardware_blit"
 		term->compositor->disable_hardware_blit = JSVAL_TO_INT(*vp) ? 1 : 0;
 		gf_sc_set_option(term->compositor, GF_OPT_REFRESH, 0);
-	}
-	else if (!strcmp(prop_name, "disable_composite_blit")) {
+		break;
+	case -34: //"disable_composite_blit"
+	{
 		Bool new_val = JSVAL_TO_INT(*vp) ? 1 : 0;
 		if (new_val != term->compositor->disable_composite_blit) {
 			term->compositor->disable_composite_blit = new_val;
@@ -285,12 +373,17 @@
 			gf_sc_set_option(term->compositor, GF_OPT_REFRESH, 0);
 		}
 	}
-	else if (!strcmp(prop_name, "http_bitrate")) {
+		break;
+	case -24:  //"http_max_bitrate"
+	{
 		u32 new_rate = JSVAL_TO_INT(*vp);
 		gf_dm_set_data_rate(term->downloader, new_rate);
 	}
-
-	SMJS_FREE(c, prop_name);
+		break;
+	case -35: //"focus_highlight"
+		term->compositor->disable_focus_highlight = JSVAL_TO_BOOLEAN(*vp) ? 0 : 1;
+		break;
+	}
 	return JS_TRUE;
 }
 
@@ -298,6 +391,7 @@
 {
 	const char *opt;
 	char *sec_name, *key_name;
+	s32 idx = -1;
 	JSString *s;
 	SMJS_OBJ
 	SMJS_ARGS
@@ -305,31 +399,43 @@
 	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])) 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 = SMJS_CHARS(c, argv[1]);
+	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;
+		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 {
+	} 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);
+	}
+	if (key_name) {
+		SMJS_FREE(c, key_name);
 	}
-	SMJS_FREE(c, key_name);
 	SMJS_FREE(c, sec_name);
 
-	s = JS_NewStringCopyZ(c, opt ? opt : "");
-	if (!s) return JS_FALSE;
-	SMJS_SET_RVAL( STRING_TO_JSVAL(s) ); 
-	return JS_TRUE; 
+	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_setOption)
@@ -340,18 +446,19 @@
 	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;
-	if (!JSVAL_IS_STRING(argv[2])) return JS_FALSE;
 
 	sec_name = SMJS_CHARS(c, argv[0]);
 	key_name = SMJS_CHARS(c, argv[1]);
-	key_val = SMJS_CHARS(c, argv[2]);
+	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->SetOption(term->compositor->audio_renderer->filter_chain.filters->filter, key_name, key_val);
 		}
 	} else {
@@ -362,18 +469,46 @@
 	}
 	SMJS_FREE(c, sec_name);
 	SMJS_FREE(c, key_name);
-	SMJS_FREE(c, key_val);
+	if (key_val) {
+		SMJS_FREE(c, key_val);
+	}
 	return JS_TRUE;
 }
 
-typedef struct 
+
+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;
+}
+
+
+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)
+static Bool enum_dir_fct(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
 {
 	u32 i, len;
 	char *sep;
@@ -407,6 +542,12 @@
 	}
 	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);
@@ -449,6 +590,7 @@
 				if ((dir[1]==':') && ((dir[2]=='/') || (dir[2]=='\\')) ) browse_root = 1;
 				else if (!strcmp(dir, "/")) browse_root = 1;
 			}
+			if (!strcmp(url, "/")) browse_root = 1;
 		}
 	}
 
@@ -512,14 +654,14 @@
 
 	w = h = 0;
 	if ((argc >= 1) && JSVAL_IS_NUMBER(argv[0])) {
-		JS_ValueToNumber(c, argv[0], &d);
+		SMJS_GET_NUMBER(argv[0], d);
 		w = (u32) d;
 	}
 	if ((argc >= 2) && JSVAL_IS_NUMBER(argv[1])) {
-		JS_ValueToNumber(c, argv[1], &d);
+		SMJS_GET_NUMBER(argv[1], d);
 		h = (u32) d;
 	}
-	if ((argc >= 3) && JSVAL_IS_BOOLEAN(argv[2]) && (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) ) 
+	if ((argc >= 3) && JSVAL_IS_BOOLEAN(argv[2]) && (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) )
 		override_size_info = 1;
 
 	if (w && h) {
@@ -545,37 +687,6 @@
 	return JS_TRUE;
 }
 
-static JSBool SMJS_FUNCTION(gpac_get_horizontal_dpi)
-{
-	SMJS_OBJ
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (term) SMJS_SET_RVAL( INT_TO_JSVAL(term->compositor->video_out->dpi_x) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_get_vertical_dpi)
-{
-	SMJS_OBJ
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (term) SMJS_SET_RVAL( INT_TO_JSVAL(term->compositor->video_out->dpi_y) );	
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_get_screen_width)
-{
-	SMJS_OBJ
-	GF_Terminal *term = gpac_get_term(c, obj);
-	SMJS_SET_RVAL( INT_TO_JSVAL(term->compositor->video_out->max_screen_width));
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_get_screen_height)
-{
-	SMJS_OBJ
-	GF_Terminal *term = gpac_get_term(c, obj);
-	SMJS_SET_RVAL( INT_TO_JSVAL(term->compositor->video_out->max_screen_height));
-	return JS_TRUE;
-}
 
 static JSBool SMJS_FUNCTION(gpac_exit)
 {
@@ -611,13 +722,13 @@
 	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;
 }
 
@@ -630,7 +741,7 @@
 	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;
 }
@@ -652,6 +763,18 @@
 	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;
@@ -661,10 +784,10 @@
 	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);
@@ -679,71 +802,541 @@
 		} else {
 			SMJS_SET_RVAL( STRING_TO_JSVAL(JS_NewStringCopyZ(c, odm->net_service->url)) );
 		}
-		break;		
+		break;
 	}
 	SMJS_FREE(c, url);
 	return JS_TRUE;
 }
 
-static SMJS_FUNC_PROP_GET( gpacevt_getProperty)
+static SMJS_FUNC_PROP_GET( odm_getProperty)
 
-	GF_GPACJSExt *gjs = SMJS_GET_PRIVATE(c, obj);
-	GF_Event *evt = gjs->evt;
-	if (!evt) return 0;
+	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
+	GF_MediaInfo odi;
+	char *str;
+	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 
-	if (SMJS_ID_IS_INT(id)) {
-		switch (SMJS_ID_TO_INT(id)) {
-		case -1:
-#ifndef GPAC_DISABLE_SVG
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, gf_dom_get_key_name(evt->key.key_code) )); 
-#endif
-			break;
-		case -2:
-			*vp = INT_TO_JSVAL(evt->mouse.x); 
-			break;
-		case -3:
-			*vp = INT_TO_JSVAL(evt->mouse.y); 
-			break;
-		case -4:
-			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 -5:
-			*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(evt->mouse.wheel_pos)) );
-			break;
-		case -6:
-			*vp = INT_TO_JSVAL( evt->mouse.button);
+	gf_term_get_object_info(odm->term, odm, &odi);
+
+	switch (SMJS_ID_TO_INT(id)) {
+	case -1:
+		*vp = INT_TO_JSVAL(odi.od->objectDescriptorID);
+		break;
+	case -2:
+		*vp = INT_TO_JSVAL(odm->subscene ? gf_list_count(odm->subscene->resources) : 0);
+		break;
+	case -3:
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.service_url));
+		break;
+	case -4:
+		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, odi.duration) );
+		break;
+	case -5:
+		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, odi.current_time) );
+		break;
+	case -6:
+		*vp = INT_TO_JSVAL( odi.clock_drift);
+		break;
+	case -7:
+		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 -8:
+		*vp = INT_TO_JSVAL( odi.buffer);
+		break;
+	case -9:
+		*vp = INT_TO_JSVAL( odi.db_unit_count);
+		break;
+	case -10:
+		*vp = INT_TO_JSVAL( odi.cb_unit_count);
+		break;
+	case -11:
+		*vp = INT_TO_JSVAL( odi.cb_max_count);
+		break;
+	case -12:
+		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 = "Unknow";
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, str));
+		break;
+	case -13:
+		*vp = INT_TO_JSVAL( odi.sample_rate);
+		break;
+	case -14:
+		*vp = INT_TO_JSVAL( odi.num_channels);
+		break;
+	case -15:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_4cc_to_str(odi.lang) ) );
+		break;
+	case -16:
+		*vp = INT_TO_JSVAL( odi.width);
+		break;
+	case -17:
+		*vp = INT_TO_JSVAL( odi.height);
+		break;
+	case -18:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_4cc_to_str(odi.pixelFormat) ) );
+		break;
+	case -19:
+		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 -20:
+		*vp = INT_TO_JSVAL(odi.nb_dec_frames);
+		break;
+	case -21:
+		*vp = INT_TO_JSVAL(odi.nb_droped);
+		break;
+	case -22:
+		*vp = INT_TO_JSVAL(odi.max_dec_time);
+		break;
+	case -23:
+		*vp = INT_TO_JSVAL(odi.total_dec_time);
+		break;
+	case -24:
+		*vp = INT_TO_JSVAL(odi.avg_bitrate);
+		break;
+	case -25:
+		*vp = INT_TO_JSVAL(odi.max_bitrate);
+		break;
+	case -26:
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.service_handler));
+		break;
+	case -27:
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.codec_name));
+		break;
+	case -28:
+	{
+		//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;
-        case -7:
-            *vp = INT_TO_JSVAL(evt->type);
-            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) );
+	
+#if 0
+		//otherwise use input channels
+		if (odm->codec->type==GF_STREAM_VISUAL) {
+			*vp = INT_TO_JSVAL(gf_list_count(odm->codec->inChannels));
+		} else {
+			*vp = INT_TO_JSVAL(0);
 		}
-		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);
+#endif
+	}
+		break;
+	case -29:
+		*vp = INT_TO_JSVAL(odi.max_buffer);
+		break;
+	case -30:
+		*vp = INT_TO_JSVAL(odi.min_buffer);
+		break;
+	case -31:
+		*vp = INT_TO_JSVAL(odi.au_duration);
+		break;
+	case -32:
+		*vp = INT_TO_JSVAL(odi.nb_iraps);
+		break;
+	case -33:
+		*vp = INT_TO_JSVAL(odi.irap_total_dec_time);
+		break;
+	case -34:
+		*vp = INT_TO_JSVAL(odi.irap_max_dec_time);
+		break;
+	case -35:
+		*vp = INT_TO_JSVAL(odi.od ? odi.od->ServiceID : 0);
+		break;
+	case -36:
+		*vp = INT_TO_JSVAL( (!odm->addon && odm->subscene) ? odm->subscene->selected_service_id : odm->parentscene->selected_service_id);
+		break;
+	case -37:
+	{
+		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);
+	}
+		break;
+	case -38:
+		*vp = INT_TO_JSVAL(gf_list_count(odm->net_service->dnloads) );
+		break;
+	case -39:
+		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, -1) );
+		}
+		break;
+	case -40:
+	{
+		GF_NetworkCommand com;
+		GF_Scene *scene;
+
+		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;
 				}
 			}
-			*vp = OBJECT_TO_JSVAL(files_array);
 		}
-		SMJS_FREE(c, name);
+
+		//can be NULL
+		com.base.on_channel = gf_list_get(odm->channels, 0);
+		gf_term_service_command(odm->net_service, &com);
+		*vp = INT_TO_JSVAL(com.timeshift.time);
+	}
+		break;
+	case -41:
+		*vp = BOOLEAN_TO_JSVAL( (odm->addon || (!odm->subscene && odm->parentscene->root_od->addon)) ? JS_TRUE : JS_FALSE);
+		break;
+	case -42:
+	{
+		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+		*vp = BOOLEAN_TO_JSVAL( scene->main_addon_selected ? JS_TRUE : JS_FALSE);
+	}
+		break;
+	case -43:
+	{
+		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 -44:
+	{
+		GF_Channel *ch = gf_list_get(odm->channels, 0);
+		*vp = BOOLEAN_TO_JSVAL((ch && ch->is_pulling) ? JS_TRUE : JS_FALSE);
+	}
+		break;
+	case -45:
+		*vp = BOOLEAN_TO_JSVAL(odm->subscene && odm->subscene->is_dynamic_scene ? JS_TRUE : JS_FALSE);
+		break;
+	case -46:
+	{
+		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 -47:
+		*vp = INT_TO_JSVAL( odi.ntp_diff);
+		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);
+
+	if (!odm) return JS_TRUE;
+	if (argc<1) return JS_TRUE;
+	if (! JSVAL_IS_INT(argv[0]) ) return JS_TRUE;
+
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.base.command_type = GF_NET_SERVICE_QUALITY_QUERY;
+	com.quality_query.index = 1 + JSVAL_TO_INT(argv[0]);
+	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);
+
+		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;
+	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 (!ID) {
+		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 (!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_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 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) {
+		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 = 1;
+		gf_scene_register_associated_media(odm->subscene ? odm->subscene : odm->parentscene, &addon_info);
+	}
+	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;
+		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;
+		count = gf_list_count(scene->resources);
+		for (i=0; i<count; i++) {
+			odm = gf_list_get(scene->resources, i);
+			if (odm->net_service && !strcmp(odm->net_service->url, url)) 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 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 -1:
+#ifndef GPAC_DISABLE_SVG
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, gf_dom_get_key_name(evt->key.key_code) ));
+#endif
+		break;
+	case -2:
+		*vp = INT_TO_JSVAL(evt->mouse.x);
+		break;
+	case -3:
+		*vp = INT_TO_JSVAL(evt->mouse.y);
+		break;
+	case -4:
+		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 -5:
+		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(evt->mouse.wheel_pos)) );
+		break;
+	case -6:
+		*vp = INT_TO_JSVAL( evt->mouse.button);
+		break;
+	case -7:
+		*vp = INT_TO_JSVAL(evt->type);
+		break;
+	case -8:
+#ifndef GPAC_DISABLE_SVG
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, gf_dom_event_get_name(evt->type) ));
+#endif
+		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(void *udta, GF_Event *evt, Bool consumed_by_compositor)
 {
 	Bool res;
@@ -805,11 +1398,16 @@
 	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);
 		}
@@ -861,8 +1459,8 @@
 	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);	
+	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;
 }
@@ -877,10 +1475,10 @@
 	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);
-	} 
+		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;
 }
 
@@ -897,6 +1495,7 @@
 		SMJS_PROPERTY_SPEC("wheel",			 -5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("button",			-6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("type",			 -7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("name",			 -8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec gpacEvtClassFuncs[] = {
@@ -904,6 +1503,46 @@
 	};
 
 	JSPropertySpec gpacClassProps[] = {
+
+		SMJS_PROPERTY_SPEC("last_working_directory",	-1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
+		SMJS_PROPERTY_SPEC("scale_x",					-2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("scale_y",					-3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("translation_x",				-4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("translation_y",				-5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("rectangular_textures",		-6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("batteryOn",					-7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("batteryCharging",			-8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("batteryPercent",			-9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("batteryLifeTime",			-10,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("batteryFullLifeTime",		-11,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("hostname",					-12,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("fullscreen",				-13,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+		SMJS_PROPERTY_SPEC("current_path",				-14,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("volume",					-15,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
+		SMJS_PROPERTY_SPEC("navigation",				-16,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
+		SMJS_PROPERTY_SPEC("navigation_type",			-17,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
+		SMJS_PROPERTY_SPEC("hardware_yuv",				-18,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("hardware_rgb",				-19,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("hardware_rgba",				-20,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("hardware_stretch",			-21,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("screen_width",				-22,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("screen_height",				-23,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("http_max_bitrate",			-24,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
+		SMJS_PROPERTY_SPEC("http_bitrate",				-25,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("fps",						-26,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("cpu_load",					-27,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("cpu",						-27,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("nb_cores",					-28,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("system_memory",				-29,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("memory",					-30,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("argc",						-31,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("caption",					-32,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+		SMJS_PROPERTY_SPEC("disable_hardware_blit",		-33,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+		SMJS_PROPERTY_SPEC("disable_composite_blit",	-34,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+		SMJS_PROPERTY_SPEC("focus_highlight",			-35,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+		SMJS_PROPERTY_SPEC("dpi_x",						-36,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("dpi_y",						-37,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+
 		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec gpacClassFuncs[] = {
@@ -911,12 +1550,9 @@
 		SMJS_FUNCTION_SPEC("setOption",		gpac_setOption, 4),
 		SMJS_FUNCTION_SPEC("get_option",		gpac_getOption, 3),
 		SMJS_FUNCTION_SPEC("set_option",		gpac_setOption, 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("get_horizontal_dpi",	gpac_get_horizontal_dpi, 0),
-		SMJS_FUNCTION_SPEC("get_vertical_dpi",	gpac_get_vertical_dpi, 0),
-		SMJS_FUNCTION_SPEC("get_screen_width",	gpac_get_screen_width, 0),
-		SMJS_FUNCTION_SPEC("get_screen_height",	gpac_get_screen_height, 0),
 		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),
@@ -927,11 +1563,78 @@
 		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(0, 0, 0)
 	};
 
+	JSPropertySpec odmClassProps[] = {
+		SMJS_PROPERTY_SPEC("ID",				-1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("nb_resources",			-2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("service_url",		-3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("duration",			-4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("clock_time",		-5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("clock_drift",		-6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("status",			-7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("buffer",			-8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("db_unit_count",		-9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("cb_unit_count",		-10,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("cb_capacity",		-11,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("type",				-12,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("samplerate",		-13,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("channels",			-14,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("lang",				-15,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("width",				-16,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("height",			-17,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("pixelformt",		-18,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("par",				-19,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("dec_frames",		-20,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("drop_frames",		-21,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("max_dec_time",		-22,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("total_dec_time",	-23,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("avg_bitrate",		-24,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("max_bitrate",		-25,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("service_handler",	-26,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("codec",				-27,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("nb_qualities",		-28,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("max_buffer",		-29,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("min_buffer",		-30,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("frame_duration",	-31,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("irap_frames",		-32,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("irap_dec_time",		-33,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("irap_max_time",		-34,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("service_id",		-35,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("selected_service",	-36,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("bandwidth_down",	-37,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("nb_http",			-38,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("timeshift_depth",	-39,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("timeshift_time",	-40,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("is_addon",			-41,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("main_addon_on",		-42,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("is_over",			-43,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("is_pulling",		-44,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("dynamic_scene",		-45,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("service_name",		-46,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("ntp_diff",			-47,       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_declare_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(0, 0, 0)
+	};
+
 	gjs = jsext->udta;
 	/*nothing to do on unload*/
 	if (unload) {
@@ -947,7 +1650,7 @@
 	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) {
@@ -960,6 +1663,9 @@
 			}
 		}
 		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);
 	} else {
 		JS_DefineProperty(c, global, "gpac", OBJECT_TO_JSVAL(gjs->gpac_obj), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
 	}
@@ -977,14 +1683,21 @@
 		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_OPENFILE);
-
+		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_NAVIGATE_NONE);
 		DECLARE_GPAC_CONST(GF_NAVIGATE_WALK);
 		DECLARE_GPAC_CONST(GF_NAVIGATE_FLY);
@@ -998,12 +1711,12 @@
 		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;
-		}
+	}
 }
 
 
@@ -1020,6 +1733,7 @@
 
 	GF_SAFEALLOC(gjs, GF_GPACJSExt);
 	gjs->rti_refresh_rate = GPAC_JS_RTI_REFRESH_RATE;
+	gjs->evt_fun = JSVAL_NULL;
 	dr->load = gjs_load;
 	dr->udta = gjs;
 	return dr;
@@ -1038,7 +1752,7 @@
 
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 #ifdef GPAC_HAS_SPIDERMONKEY
@@ -1050,7 +1764,7 @@
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
 	if (InterfaceType == GF_JS_USER_EXT_INTERFACE) return (GF_BaseInterface *)gjs_new();
@@ -1070,4 +1784,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( gpac_js )
+GPAC_MODULE_STATIC_DECLARATION( gpac_js )

gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/fm_fake_pull.c -> gpac-0.5.1.svn5491.tar.xz/modules/hyb_in/fm_fake_pull.c Changed

gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/fm_fake_push.c -> gpac-0.5.1.svn5491.tar.xz/modules/hyb_in/fm_fake_push.c Changed

@@ -159,11 +159,11 @@
 	od->URLString = gf_strdup("http://gpac.sourceforge.net/screenshots/lion.jpg");
 	od->objectDescriptorID = 0;
 	gf_sleep(2000); //TODO: remove the sleep
-	gf_term_add_media(self->owner, (GF_Descriptor*)od, 0);
+	gf_service_declare_media(self->owner, (GF_Descriptor*)od, 0);
 	return 0;
 }
 
-static u32 audio_gen_th(void *par) 
+static u32 audio_gen_th(void *par)
 {
 	GF_Err e;
 	char *data;
@@ -202,10 +202,10 @@
 				com.map_time.timestamp = slh.compositionTimeStamp;
 				com.map_time.reset_buffers = 0;
 				com.base.on_channel = self->channel;
-				gf_term_on_command(self->owner, &com, GF_OK);
+				gf_service_command(self->owner, &com, GF_OK);
 				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[HYB In] Mapping WC  Time %04d/%02d/%02d %02d:%02d:%02d and Hyb time "LLD"\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));
+				                                   (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));
 			}
 		}
 
@@ -232,7 +232,7 @@
 #endif
 
 		e = GetData(self, &data, &data_size, &slh);
-		gf_term_on_sl_packet(self->owner, self->channel, data, data_size, &slh, e);
+		gf_service_send_packet(self->owner, self->channel, data, data_size, &slh, e);
 	}
 
 	self->state = HYB_STATE_STOPPED;
@@ -307,20 +307,20 @@
 static GF_Err FM_FAKE_PUSH_SetState(GF_HYBMEDIA *self, const GF_NET_CHAN_CMD state)
 {
 	switch(state) {
-		case GF_NET_CHAN_PLAY:
-			self->state = HYB_STATE_PLAYING;
-			break;
-		case GF_NET_CHAN_STOP:
-			audio_gen_stop(self);
-			break;
-		case GF_NET_CHAN_PAUSE:
-			self->state = HYB_STATE_PAUSE;
-			break;
-		case GF_NET_CHAN_RESUME:
-			self->state = HYB_STATE_PLAYING;
-			break;
-		default:
-			return GF_BAD_PARAM;
+	case GF_NET_CHAN_PLAY:
+		self->state = HYB_STATE_PLAYING;
+		break;
+	case GF_NET_CHAN_STOP:
+		audio_gen_stop(self);
+		break;
+	case GF_NET_CHAN_PAUSE:
+		self->state = HYB_STATE_PAUSE;
+		break;
+	case GF_NET_CHAN_RESUME:
+		self->state = HYB_STATE_PLAYING;
+		break;
+	default:
+		return GF_BAD_PARAM;
 	}
 
 	return GF_OK;

gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/hyb_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/hyb_in/hyb_in.c Changed

@@ -122,7 +122,7 @@
 	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_term_on_connect(hyb_in->service, NULL, e);
+		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));
@@ -131,11 +131,11 @@
 	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_term_on_connect(hyb_in->service, NULL, GF_BAD_PARAM);
+		gf_service_connect_ack(hyb_in->service, NULL, GF_BAD_PARAM);
 		return e;
 	}
-	gf_term_on_connect(hyb_in->service, NULL, GF_OK);
-	gf_term_add_media(hyb_in->service, (GF_Descriptor*)hyb_in->master->GetOD(), 0);
+	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;
 }
@@ -152,11 +152,11 @@
 	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_term_on_connect(hyb_in->service, NULL, GF_BAD_PARAM);
+		gf_service_connect_ack(hyb_in->service, NULL, GF_BAD_PARAM);
 		return e;
 	}
 
-	gf_term_on_disconnect(hyb_in->service, NULL, GF_OK);
+	gf_service_disconnect_ack(hyb_in->service, NULL, GF_OK);
 
 	return GF_OK;
 }
@@ -175,14 +175,14 @@
 
 	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_term_on_connect(hyb_in->service, channel, GF_OK);
+	gf_service_connect_ack(hyb_in->service, channel, GF_OK);
 
 	return GF_OK;
 }
@@ -193,7 +193,7 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Disconnect Service (%p) request from terminal\n", hyb_in->service));
 
-	gf_term_on_disconnect(hyb_in->service, channel, GF_OK);
+	gf_service_disconnect_ack(hyb_in->service, channel, GF_OK);
 	hyb_in->master->channel = NULL;
 
 	return GF_OK;
@@ -271,7 +271,7 @@
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
- 	GF_HYB_In *hyb_in;
+	GF_HYB_In *hyb_in;
 	GF_InputService *plug;
 	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
 
@@ -309,4 +309,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( hyb_in )
+GPAC_MODULE_STATIC_DECLARATION( hyb_in )

gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/hyb_in.h -> gpac-0.5.1.svn5491.tar.xz/modules/hyb_in/hyb_in.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/img_in/bmp_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/img_in/bmp_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -36,7 +36,7 @@
 	u16 ES_ID;
 	u32 width, height, out_size, pixel_format;
 } BMPDec;
-	
+
 #define BMPCTX()	BMPDec *ctx = (BMPDec *) ((IMGDec *)ifcg->privateStack)->opaque
 
 
@@ -104,11 +104,11 @@
 	return GF_NOT_SUPPORTED;
 }
 
-static GF_Err BMP_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -193,7 +193,7 @@
 	wrap->opaque = dec;
 	wrap->type = DEC_BMP;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = BMP_AttachStream;
 	ifcd->DetachStream = BMP_DetachStream;
 	ifcd->GetCapabilities = BMP_GetCapabilities;

gpac-0.5.0.svn5178.tar.bz2/modules/img_in/img_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/img_in/img_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -55,15 +55,15 @@
 
 	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
+	{
+		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;
 }
 
@@ -91,11 +91,11 @@
 void DeleteBaseDecoder(GF_BaseDecoder *ifcd)
 {
 	IMGDec *wrap;
-        if (!ifcd)
-          return;
-        wrap = (IMGDec *)ifcd->privateStack;
-        if (!wrap)
-          return;
+	if (!ifcd)
+		return;
+	wrap = (IMGDec *)ifcd->privateStack;
+	if (!wrap)
+		return;
 	switch (wrap->type) {
 	case DEC_PNG:
 		DeletePNGDec(ifcd);
@@ -115,7 +115,7 @@
 		break;
 	}
 	gf_free(wrap);
-        ifcd->privateStack = NULL;
+	ifcd->privateStack = NULL;
 	gf_free(ifcd);
 }
 
@@ -156,4 +156,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( img_in )
+GPAC_MODULE_STATIC_DECLARATION( img_in )

gpac-0.5.0.svn5178.tar.bz2/modules/img_in/img_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/img_in/img_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -105,24 +105,24 @@
 }
 
 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
+	"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_MEDIA, GF_LOG_ERROR, ("IMG_RegisterMimeTypes : plug is NULL !!\n"));
-    }
-    for (i = 0 ; IMG_MIME_TYPES[i]; i+=3)
-      gf_term_register_mime_type(plug, IMG_MIME_TYPES[i], IMG_MIME_TYPES[i+1], IMG_MIME_TYPES[i+2]);
-    return i/3;
+static u32 IMG_RegisterMimeTypes(const GF_InputService *plug) {
+	u32 i;
+	if (!plug) {
+		GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("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;
 }
 
 
@@ -130,13 +130,13 @@
 {
 	char *sExt;
 	u32 i;
-        GF_LOG(GF_LOG_MEDIA, GF_LOG_INFO, ("IMG_CanHandleURL(%s)\n", url));
-        if (!plug || !url)
-          return 0;
+	GF_LOG(GF_LOG_MEDIA, GF_LOG_INFO, ("IMG_CanHandleURL(%s)\n", url));
+	if (!plug || !url)
+		return 0;
 	sExt = strrchr(url, '.');
-	for (i = 0 ; IMG_MIME_TYPES[i]; i+=3){
-	  if (gf_term_check_extension(plug, IMG_MIME_TYPES[i], IMG_MIME_TYPES[i+1], IMG_MIME_TYPES[i+2], sExt))
-	    return 1;
+	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 1;
 	}
 	return 0;
 }
@@ -156,7 +156,7 @@
 		GF_ESD *esd = IMG_GetESD(read);
 		od->objectDescriptorID = 1;
 		gf_list_add(od->ESDescriptors, esd);
-		gf_term_add_media(read->service, (GF_Descriptor *)od, 0);
+		gf_service_declare_media(read->service, (GF_Descriptor *)od, 0);
 	}
 }
 
@@ -169,7 +169,7 @@
 	if (!read->dnload) return;
 
 	/*handle service message*/
-	gf_term_download_update_stats(read->dnload);
+	gf_service_download_update_stats(read->dnload);
 
 	e = param->error;
 	/*wait to get the whole file*/
@@ -190,7 +190,7 @@
 		}
 	}
 	/*OK confirm*/
-	gf_term_on_connect(read->service, NULL, e);
+	gf_service_connect_ack(read->service, NULL, e);
 	if (!e) IMG_SetupObject(read);
 }
 
@@ -198,9 +198,9 @@
 {
 	IMGLoader *read = (IMGLoader *) plug->priv;
 
-	read->dnload = gf_term_download_new(read->service, url, 0, IMG_NetIO, read);
+	read->dnload = gf_service_download_new(read->service, url, 0, IMG_NetIO, read);
 	if (!read->dnload) {
-		gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(read->dnload);
@@ -214,8 +214,8 @@
 	IMGLoader *read = (IMGLoader *)plug->priv;
 
 	read->service = serv;
-        if (!url)
-          return GF_BAD_PARAM;
+	if (!url)
+		return GF_BAD_PARAM;
 	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;
@@ -224,7 +224,7 @@
 	else if (!stricmp(sExt, ".pngs")) read->img_type = IMG_PNGS;
 	else if (!stricmp(sExt, ".bmp")) read->img_type = IMG_BMP;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	/*remote fetch*/
@@ -239,7 +239,7 @@
 		read->data_size = (u32) gf_f64_tell(read->stream);
 		gf_f64_seek(read->stream, 0, SEEK_SET);
 	}
-	gf_term_on_connect(serv, NULL, read->stream ? GF_OK : GF_URL_ERROR);
+	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;
 }
@@ -254,10 +254,10 @@
 		return GF_BAD_PARAM;
 	if (read->stream) fclose(read->stream);
 	read->stream = NULL;
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 	if (read->service)
-		gf_term_on_disconnect(read->service, NULL, GF_OK);
+		gf_service_disconnect_ack(read->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -287,14 +287,14 @@
 	u32 ES_ID=0;
 	GF_Err e;
 	IMGLoader *read;
-        if (!plug)
-          return 0;
-        read = (IMGLoader *)plug->priv;
+	if (!plug)
+		return 0;
+	read = (IMGLoader *)plug->priv;
 
 	e = GF_SERVICE_ERROR;
 	if (read->ch==channel) goto exit;
-        if (!url)
-          goto exit;
+	if (!url)
+		goto exit;
 	e = GF_STREAM_NOT_FOUND;
 	if (strstr(url, "ES_ID")) {
 		sscanf(url, "ES_ID=%ud", &ES_ID);
@@ -308,7 +308,7 @@
 	}
 
 exit:
-	gf_term_on_connect(read->service, channel, e);
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -321,7 +321,7 @@
 		read->ch = NULL;
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(read->service, channel, e);
+	gf_service_disconnect_ack(read->service, channel, e);
 	return GF_OK;
 }
 
@@ -341,7 +341,9 @@
 		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 = 0; }
+		if (read->ch == com->base.on_channel) {
+			read->done = 0;
+		}
 		return GF_OK;
 	case GF_NET_CHAN_STOP:
 		return GF_OK;

gpac-0.5.0.svn5178.tar.bz2/modules/img_in/img_in.h -> gpac-0.5.1.svn5491.tar.xz/modules/img_in/img_in.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -66,16 +66,16 @@
 #if defined(WIN32) || defined(_WIN32_WCE)
 #include <windows.h>
 #else
-typedef struct tagBITMAPFILEHEADER 
+typedef struct tagBITMAPFILEHEADER
 {
-    u16	bfType;
-    u32	bfSize;
-    u16	bfReserved1;
-    u16	bfReserved2;
-    u32 bfOffBits;
+	u16	bfType;
+	u32	bfSize;
+	u16	bfReserved1;
+	u16	bfReserved2;
+	u32 bfOffBits;
 } BITMAPFILEHEADER;
 
-typedef struct tagBITMAPINFOHEADER{
+typedef struct tagBITMAPINFOHEADER {
 	u32	biSize;
 	s32	biWidth;
 	s32	biHeight;

gpac-0.5.0.svn5178.tar.bz2/modules/img_in/jp2_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/img_in/jp2_dec.c Changed

@@ -1,7 +1,7 @@
 /*
 *			GPAC - Multimedia Framework C SDK
 *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
 *					All rights reserved
 *
@@ -11,15 +11,15 @@
 *  it under the terms of the GNU Lesser General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
-*   
+*
 *  GPAC is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU Lesser General Public License for more details.
-*   
+*
 *  You should have received a copy of the GNU Lesser General Public
 *  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */
 
@@ -69,11 +69,20 @@
 		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;
+		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);
@@ -98,7 +107,7 @@
 
 		ctx->nb_comp = 3;
 		ctx->out_size = 3*ctx->width*ctx->height/2;
-		ctx->pixel_format = GF_PIXEL_YV12; 
+		ctx->pixel_format = GF_PIXEL_YV12;
 	}
 
 	return GF_OK;
@@ -165,21 +174,21 @@
 /**
 sample error callback expecting a FILE* client object
 */
-void error_callback(const char *msg, void *client_data) 
+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) 
+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) 
+void info_callback(const char *msg, void *client_data)
 {
 	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[OpenJPEG] Info %s", msg));
 }
@@ -193,11 +202,11 @@
 	return (a + (1 << b) - 1) >> b;
 }
 
-static GF_Err JP2_ProcessData(GF_MediaDecoder *ifcg, 
-							  char *inBuffer, u32 inBufferLength,
-							  u16 ES_ID,
-							  char *outBuffer, u32 *outBufferLength,
-							  u8 PaddingBits, u32 mmlevel)
+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 */
@@ -263,11 +272,20 @@
 			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;
+			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 ) {
@@ -315,94 +333,94 @@
 	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)) {
+		        && (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 (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)];
-					}
+			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)];
-					}
+		           && (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)];
-					}
+		        && (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) {
@@ -432,7 +450,7 @@
 	wrap->opaque = dec;
 	wrap->type = DEC_JPEG;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = JP2_AttachStream;
 	ifcd->DetachStream = JP2_DetachStream;
 	ifcd->GetCapabilities = JP2_GetCapabilities;

gpac-0.5.0.svn5178.tar.bz2/modules/img_in/jpeg_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/img_in/jpeg_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -99,11 +99,11 @@
 	return GF_NOT_SUPPORTED;
 }
 
-static GF_Err JPEG_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -111,8 +111,12 @@
 
 	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;
+	case GF_PIXEL_GREYSCALE:
+		ctx->BPP = 1;
+		break;
+	case GF_PIXEL_RGB_24:
+		ctx->BPP = 3;
+		break;
 	}
 	ctx->out_size = *outBufferLength;
 	return e;
@@ -135,7 +139,7 @@
 	wrap->opaque = dec;
 	wrap->type = DEC_JPEG;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = JPEG_AttachStream;
 	ifcd->DetachStream = JPEG_DetachStream;
 	ifcd->GetCapabilities = JPEG_GetCapabilities;

gpac-0.5.0.svn5178.tar.bz2/modules/img_in/png_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/img_in/png_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -33,7 +33,7 @@
 	u32 BPP, width, height, out_size, pixel_format;
 	u32 aux_type;
 } PNGDec;
-	
+
 #define PNGCTX()	PNGDec *ctx = (PNGDec *) ((IMGDec *)ifcg->privateStack)->opaque
 
 
@@ -113,11 +113,11 @@
 }
 
 
-static GF_Err PNG_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -126,15 +126,19 @@
 	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: 
+	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; 
+		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;
@@ -160,7 +164,7 @@
 	wrap->opaque = dec;
 	wrap->type = DEC_PNG;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = PNG_AttachStream;
 	ifcd->DetachStream = PNG_DetachStream;
 	ifcd->GetCapabilities = PNG_GetCapabilities;

gpac-0.5.0.svn5178.tar.bz2/modules/ios_cam/CameraObject.h -> gpac-0.5.1.svn5491.tar.xz/modules/ios_cam/CameraObject.h Changed

@@ -29,23 +29,23 @@
 #include "cam_wrap.h"
 
 @interface CameraObject : NSObject
-<AVCaptureVideoDataOutputSampleBufferDelegate>
+	<AVCaptureVideoDataOutputSampleBufferDelegate>
 {
-    //    AVCaptureSession *session;
-    //    AVCaptureDevice *device;
-    AVCaptureDeviceInput *input;
-    AVCaptureVideoDataOutput *output;
-    
-    int desiredWidth;
-    int desiredHeight;
-    int desiredColor;
-    
-    int m_width;
-    int m_height;
-    int m_color;
-    int m_stride;
-    
-    GetPixelsCallback *callback;
+	//    AVCaptureSession *session;
+	//    AVCaptureDevice *device;
+	AVCaptureDeviceInput *input;
+	AVCaptureVideoDataOutput *output;
+
+	int desiredWidth;
+	int desiredHeight;
+	int desiredColor;
+
+	int m_width;
+	int m_height;
+	int m_color;
+	int m_stride;
+
+	GetPixelsCallback *callback;
 }
 
 @property (retain) AVCaptureSession *captureSession;
@@ -58,7 +58,7 @@
 - (int) setCallback:(GetPixelsCallback*) func;
 
 - (void)captureOutput:(AVCaptureOutput *)captureOutput
-didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
-       fromConnection:(AVCaptureConnection *)connection;
+    didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
+    fromConnection:(AVCaptureConnection *)connection;
 
 @end

gpac-0.5.0.svn5178.tar.bz2/modules/ios_cam/cam_wrap.h -> gpac-0.5.1.svn5491.tar.xz/modules/ios_cam/cam_wrap.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/ios_cam/ios_cam.c -> gpac-0.5.1.svn5491.tar.xz/modules/ios_cam/ios_cam.c Changed

@@ -50,23 +50,23 @@
 	/*the service we're responsible for*/
 	GF_ClientService *service;
 	LPNETCHANNEL channel;
-    
+
 	/*input file*/
 	u32 time_scale;
-    
+
 	u32 base_track_id;
-    
+
 	struct _tag_terminal *term;
-    
+
 	u32 cntr;
-    
+
 	u32 width;
 	u32 height;
-    
+
 	Bool started;
-    
-    void* camInst;
-    
+
+	void* camInst;
+
 } IOSCamCtx;
 
 IOSCamCtx* globReader = NULL;
@@ -78,7 +78,7 @@
 Bool CAM_CanHandleURL(GF_InputService *plug, const char *url)
 {
 	if (!strnicmp(url, "hw://camera", 11)) return 1;
-    
+
 	return 0;
 }
 
@@ -87,25 +87,25 @@
 	IOSCamCtx *read;
 	if (!plug || !plug->priv || !serv) return GF_SERVICE_ERROR;
 	read = (IOSCamCtx *) plug->priv;
-    
+
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectService: %d\n", gf_th_id()));
-    
-    globReader = read;
-    
+
+	globReader = read;
+
 	read->input = plug;
 	read->service = serv;
 	read->base_track_id = 1;
 	read->time_scale = 1000;
-    
+
 	read->term = serv->term;
-    
+
 	read->camInst = CAM_CreateInstance();
-    CAM_SetCallback(read->camInst, processFrameBuf);
-    
+	CAM_SetCallback(read->camInst, processFrameBuf);
+
 	/*reply to user*/
-	gf_term_on_connect(serv, NULL, GF_OK);
+	gf_service_connect_ack(serv, NULL, GF_OK);
 	//if (read->no_service_desc) isor_declare_objects(read);
-    
+
 	return GF_OK;
 }
 
@@ -115,14 +115,14 @@
 	IOSCamCtx *read;
 	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
 	read = (IOSCamCtx *) plug->priv;
-    
+
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_CloseService: %d\n", gf_th_id()));
-    
+
 	reply = GF_OK;
-    
+
 	CAM_DestroyInstance(&read->camInst);
-    
-	gf_term_on_disconnect(read->service, NULL, reply);
+
+	gf_service_disconnect_ack(read->service, NULL, reply);
 	return GF_OK;
 }
 
@@ -138,46 +138,46 @@
 	GF_BitStream *bs;
 	char *buf;
 	u32 buf_size;
-    s32 color;
-    s32 stride;
+	s32 color;
+	s32 stride;
 	if (!plug || !plug->priv) return NULL;
 	read = (IOSCamCtx *) plug->priv;
-    
+
 	trackID = read->base_track_id;
 	read->base_track_id = 0;
-    
+
 	if (trackID && (expect_type==GF_MEDIA_OBJECT_VIDEO) ) {
 		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 		od->objectDescriptorID = 1;
-        
+
 		esd = gf_odf_desc_esd_new(0);
 		esd->slConfig->timestampResolution = 1000;
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 		esd->ESID = 1;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
-		
+
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-        
-        CAM_GetCurrentFormat(read->camInst, &read->width, &read->height, &color, &stride);
-        
+
+		CAM_GetCurrentFormat(read->camInst, &read->width, &read->height, &color, &stride);
+
 		gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
 		gf_bs_write_u16(bs, read->width); // width
 		gf_bs_write_u16(bs, read->height); // height
 		gf_bs_write_u32(bs, read->height * stride); // framesize
 		gf_bs_write_u32(bs, stride); // stride
-        gf_bs_write_u8(bs, 1); // is_flipped
-        
+		gf_bs_write_u8(bs, 1); // is_flipped
+
 		gf_bs_align(bs);
 		gf_bs_get_content(bs, &buf, &buf_size);
 		gf_bs_del(bs);
-        
+
 		esd->decoderConfig->decoderSpecificInfo->data = buf;
 		esd->decoderConfig->decoderSpecificInfo->dataLength = buf_size;
-        
+
 		gf_list_add(od->ESDescriptors, esd);
 		return (GF_Descriptor *) od;
 	}
-    
+
 	return NULL;
 }
 
@@ -187,19 +187,19 @@
 	IOSCamCtx *read;
 	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
 	read = (IOSCamCtx *) plug->priv;
-    
+
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectChannel: %d\n", gf_th_id()));
-    
+
 	e = GF_OK;
 	if (upstream) {
 		e = GF_ISOM_INVALID_FILE;
 	}
-    
+
 	read->channel = channel;
-    
+
 	camStartCamera(read);
-    
-	gf_term_on_connect(read->service, channel, e);
+
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -209,14 +209,14 @@
 	IOSCamCtx *read;
 	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
 	read = (IOSCamCtx *) plug->priv;
-    
+
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_DisconnectChannel: %d\n", gf_th_id()));
-    
+
 	e = GF_OK;
-    
+
 	camStopCamera(read);
-    
-	gf_term_on_disconnect(read->service, channel, e);
+
+	gf_service_disconnect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -225,7 +225,7 @@
 	int frameSize = width * height;
 	int j, yp, uvp, i, y, y1192, r, g, b, u, v;
 	int ti, tj;
-    
+
 	int* rgb = (int*)gf_malloc(width*height*4);
 	for (j = 0, yp = 0, tj=height-1; j < height; j++, tj--)
 	{
@@ -239,12 +239,12 @@
 				v = (0xff & yuv420sp[uvp++]) - 128;
 				u = (0xff & yuv420sp[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)
@@ -257,11 +257,11 @@
 				b = 0;
 			else if (b > 262143)
 				b = 262143;
-            
+
 			rgb[yp] = 0xff000000 | ((r << 6) & 0xff0000)
-            | ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
-            //			rgb[ti+tj] = 0xff000000 | ((r << 6) & 0xff0000)
-            //					| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
+			          | ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
+			//			rgb[ti+tj] = 0xff000000 | ((r << 6) & 0xff0000)
+			//					| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
 		}
 	}
 	return rgb;
@@ -272,34 +272,34 @@
 	IOSCamCtx* ctx = globReader;
 	GF_SLHeader hdr;
 	u32 cts = 0;
-	    
+
 	cts = gf_term_get_time(ctx->term);
-        
+
 	memset(&hdr, 0, sizeof(hdr));
 	hdr.compositionTimeStampFlag = 1;
 	hdr.compositionTimeStamp = cts;
-	gf_term_on_sl_packet(ctx->service, ctx->channel, (void*)data, dataSize, &hdr, GF_OK);
+	gf_service_send_packet(ctx->service, ctx->channel, (void*)data, dataSize, &hdr, GF_OK);
 
 }
 
 void camStartCamera(IOSCamCtx *read)
 {
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] startCamera: %d\n", gf_th_id()));
-    
+
 	//CAM_Start(read->camInst);
 }
 
 void camStopCamera(IOSCamCtx *read)
 {
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] stopCamera: %d\n", gf_th_id()));
-    
-    //CAM_Stop(read->camInst);
+
+	//CAM_Stop(read->camInst);
 }
 
 void pauseCamera(IOSCamCtx *read)
 {
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] pauseCamera: %d\n", gf_th_id()));
-    
+
 	read->started = 0;
 	CAM_Stop(read->camInst);
 }
@@ -307,7 +307,7 @@
 void resumeCamera(IOSCamCtx *read)
 {
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] resumeCamera: %d\n", gf_th_id()));
-    
+
 	read->started = 1;
 	CAM_Start(read->camInst);
 }
@@ -320,7 +320,7 @@
 	u32 buf_size;
 	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
 	read = (IOSCamCtx *) plug->priv;
-    
+
 	if (com->command_type==GF_NET_SERVICE_INFO) {
 		return GF_OK;
 	}
@@ -328,48 +328,50 @@
 		return GF_NOT_SUPPORTED;
 	}
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-    
+
 	switch (com->command_type) {
-        case GF_NET_CHAN_INTERACTIVE:
-            return GF_OK;
-        case GF_NET_CHAN_BUFFER:
-            com->buffer.max = com->buffer.min = 0;
-            return GF_OK;
-        case GF_NET_CHAN_PLAY:
-            resumeCamera(read);
-            return GF_OK;
-        case GF_NET_CHAN_STOP:
-            pauseCamera(read);
-            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 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:
-		{
-            s32 color;
-            s32 stride;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));
-			/*it may happen that there are conflicting config when using ESD URLs...*/
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-            
-			CAM_GetCurrentFormat(read->camInst, &read->width, &read->height, &color, &stride);
-            
-			gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
-			gf_bs_write_u16(bs, read->width); // width
-			gf_bs_write_u16(bs, read->height); // height
-			gf_bs_write_u32(bs, read->height * stride); // framesize
-			gf_bs_write_u32(bs, stride); // stride
-            
-			gf_bs_align(bs);
-			gf_bs_get_content(bs, &buf, &buf_size);
-			gf_bs_del(bs);
-            
-			com->get_dsi.dsi = buf;
-			com->get_dsi.dsi_len = buf_size;
-			return GF_OK;
-		}
+	case GF_NET_CHAN_INTERACTIVE:
+		return GF_OK;
+	case GF_NET_CHAN_BUFFER:
+		com->buffer.max = com->buffer.min = 0;
+		return GF_OK;
+	case GF_NET_CHAN_PLAY:
+		resumeCamera(read);
+		return GF_OK;
+	case GF_NET_CHAN_STOP:
+		pauseCamera(read);
+		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 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:
+	{
+		s32 color;
+		s32 stride;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));
+		/*it may happen that there are conflicting config when using ESD URLs...*/
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		CAM_GetCurrentFormat(read->camInst, &read->width, &read->height, &color, &stride);
+
+		gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
+		gf_bs_write_u16(bs, read->width); // width
+		gf_bs_write_u16(bs, read->height); // height
+		gf_bs_write_u32(bs, read->height * stride); // framesize
+		gf_bs_write_u32(bs, stride); // stride
+
+		gf_bs_align(bs);
+		gf_bs_get_content(bs, &buf, &buf_size);
+		gf_bs_del(bs);
+
+		com->get_dsi.dsi = buf;
+		com->get_dsi.dsi_len = buf_size;
+		return GF_OK;
+	}
+    default:
+        return GF_NOT_SUPPORTED;
 	}
 	return GF_NOT_SUPPORTED;
 }
@@ -387,7 +389,7 @@
 	plug->ConnectChannel = CAM_ConnectChannel;
 	plug->DisconnectChannel = CAM_DisconnectChannel;
 	plug->ServiceCommand = CAM_ServiceCommand;
-    
+
 	GF_SAFEALLOC(reader, IOSCamCtx);
 	plug->priv = reader;
 	return plug;
@@ -397,7 +399,7 @@
 {
 	GF_InputService *plug = (GF_InputService *) bi;
 	IOSCamCtx *read = (IOSCamCtx *)plug->priv;
-    
+
 	gf_free(read);
 	gf_free(bi);
 }
@@ -424,8 +426,10 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-        case GF_NET_CLIENT_INTERFACE: CAM_client_del(ifce); break;
+	case GF_NET_CLIENT_INTERFACE:
+		CAM_client_del(ifce);
+		break;
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( ios_cam )
+GPAC_MODULE_STATIC_DECLARATION( ios_cam )

gpac-0.5.0.svn5178.tar.bz2/modules/ios_mpegv/SensorAccess.h -> gpac-0.5.1.svn5491.tar.xz/modules/ios_mpegv/SensorAccess.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/ios_mpegv/ios_mpegv.c -> gpac-0.5.1.svn5491.tar.xz/modules/ios_mpegv/ios_mpegv.c Changed

@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 /*driver interfaces*/
@@ -42,8 +42,8 @@
 	char sensor[50];
 	u16 sensorIOSType;
 	u8 isAttached;
-    
-    GF_Mutex* mx;
+
+	GF_Mutex* mx;
 
 	void* inst;
 
@@ -54,7 +54,7 @@
 Bool MPEGVS_RegisterDevice(struct __input_device *dr, const char *urn, GF_BitStream *dsi, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name))
 {
 	MPEGVSCTX;
-	
+
 	//"MPEG-V:siv:OrientationSensorType"
 
 	if ( strnicmp(urn, "MPEG-V", 6) )
@@ -65,7 +65,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] No sensor type specified\n"));
 		return 0;
 	}
-	
+
 	if ( strnicmp(urn+6, ":siv:", 5) )
 	{
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] Not valid sensor type specified\n"));
@@ -153,18 +153,18 @@
 	char *buf;
 	u32 buf_size;
 	float x, y, z, a, b;
-    struct __input_device * dr = (struct __input_device *)ptr;
+	struct __input_device * dr = (struct __input_device *)ptr;
 	MPEGVSCTX;
-    
-    if (!gf_mx_try_lock(rc->mx))
-        return;
-    
+
+	if (!gf_mx_try_lock(rc->mx))
+		return;
+
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
-	if ( rc->sensorIOSType == SENSOR_ACCELEROMETER 
-			|| rc->sensorIOSType == SENSOR_GYROSCOPE
-			//|| rc->sensorIOSType == 3
-			|| rc->sensorIOSType == SENSOR_MAGNETOMETER )
+	if ( rc->sensorIOSType == SENSOR_ACCELEROMETER
+	        || rc->sensorIOSType == SENSOR_GYROSCOPE
+	        //|| rc->sensorIOSType == 3
+	        || rc->sensorIOSType == SENSOR_MAGNETOMETER )
 	{
 		sscanf(data, "%f;%f;%f;", &x, &y, &z);
 		gf_bs_write_int(bs, 1, 1);
@@ -172,17 +172,15 @@
 		gf_bs_write_float(bs, y);
 		gf_bs_write_float(bs, z);
 	}
-	else
-	if ( rc->sensorIOSType == 5
-			|| rc->sensorIOSType == 6 )
+	else if ( rc->sensorIOSType == 5
+	          || rc->sensorIOSType == 6 )
 	{
 		sscanf(data, "%f;", &x);
-		
+
 		gf_bs_write_int(bs, 1, 1);
 		gf_bs_write_float(bs, x);
 	}
-	else 
-	if ( rc->sensorIOSType == 11 )
+	else if ( rc->sensorIOSType == 11 )
 	{
 		sscanf(data, "%f;%f;%f;", &x, &y, &z);
 
@@ -192,8 +190,7 @@
 		gf_bs_write_float(bs, z);
 		/*gf_bs_write_float(bs, q);*/
 	}
-	else 
-	if ( rc->sensorIOSType == SENSOR_GPS )
+	else if ( rc->sensorIOSType == SENSOR_GPS )
 	{
 		sscanf(data, "%f;%f;%f;%f;%f;", &x, &y, &z, &a, &b);
 
@@ -214,42 +211,42 @@
 
 	dr->DispatchFrame(dr, (u8*)buf, buf_size);
 	gf_free(buf);
-    
-    gf_mx_v(rc->mx);
+
+	gf_mx_v(rc->mx);
 }
 
 void MPEGVS_Start(struct __input_device * dr)
 {
 	MPEGVSCTX;
-    
-    GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Start: %d\n", gf_th_id()));
-
-    if ( rc->inst ) {
-        SENS_Stop(rc->inst);
-        SENS_DestroyInstance(&rc->inst);
-    }
-	
-    rc->inst = SENS_CreateInstance();
-    SENS_SetSensorType(rc->inst, rc->sensorIOSType);
-    SENS_SetCallback(rc->inst, MPEGVSensorCallback, dr);
-    SENS_Start(rc->inst);
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Start: %d\n", gf_th_id()));
+
+	if ( rc->inst ) {
+		SENS_Stop(rc->inst);
+		SENS_DestroyInstance(&rc->inst);
+	}
+
+	rc->inst = SENS_CreateInstance();
+	SENS_SetSensorType(rc->inst, rc->sensorIOSType);
+	SENS_SetCallback(rc->inst, MPEGVSensorCallback, dr);
+	SENS_Start(rc->inst);
 }
 
 void MPEGVS_Stop(struct __input_device * dr)
 {
 	MPEGVSCTX;
-    
-    GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Stop: %d\n", gf_th_id()));
 
-    SENS_Stop(rc->inst);
-    SENS_DestroyInstance(&rc->inst);
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Stop: %d\n", gf_th_id()));
+
+	SENS_Stop(rc->inst);
+	SENS_DestroyInstance(&rc->inst);
 }
 
 GF_InputSensorDevice* NewMPEGVSInputSesor()
 {
 	MPEGVSensorContext* ctx = NULL;
 	GF_InputSensorDevice* driv = NULL;
-	
+
 	driv = (GF_InputSensorDevice *) gf_malloc(sizeof(GF_InputSensorDevice));
 	memset(driv, 0, sizeof(GF_InputSensorDevice));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_INPUT_DEVICE_INTERFACE, "MPEG-V Sensors Input Module", "gpac distribution");
@@ -260,8 +257,8 @@
 
 	ctx = (MPEGVSensorContext*) gf_malloc (sizeof(MPEGVSensorContext));
 	memset(ctx, 0, sizeof(MPEGVSensorContext));
-    ctx->mx = gf_mx_new(NULL);
-	
+	ctx->mx = gf_mx_new(NULL);
+
 	driv->udta = (void*)ctx;
 
 	return driv;
@@ -270,21 +267,21 @@
 void DeleteMPEGVSInputSensor(GF_InputSensorDevice* dev)
 {
 	MPEGVS_Stop(dev);
-    MPEGVSensorContext* ctx = (MPEGVSensorContext*)dev->udta;
-    gf_mx_del(ctx->mx);
+	MPEGVSensorContext* ctx = (MPEGVSensorContext*)dev->udta;
+	gf_mx_del(ctx->mx);
 	gf_free(dev->udta);
 	gf_free(dev);
 }
 
 /*interface query*/
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_INPUT_DEVICE_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 /*interface create*/
@@ -306,4 +303,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( ios_mpegv )
+GPAC_MODULE_STATIC_DECLARATION( ios_mpegv )

gpac-0.5.0.svn5178.tar.bz2/modules/ios_mpegv/sensor_wrap.h -> gpac-0.5.1.svn5491.tar.xz/modules/ios_mpegv/sensor_wrap.h Changed

@@ -12,30 +12,30 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
-    #define SENSOR_ACCELEROMETER    0
-    #define SENSOR_GYROSCOPE        1
-    #define SENSOR_MAGNETOMETER     2
-    #define SENSOR_GPS              3
-    
-    typedef void (SensorDataCallback)(void* user, const char* data);
-    
-    void* SENS_CreateInstance();
-    
-    int SENS_DestroyInstance(void** inst);
-    
-    int SENS_SetSensorType(void* inst, int type);
-    
-    int SENS_GetCurrentSensorType(void* inst);
-    
-    int SENS_Start(void* inst);
-    
-    int SENS_Stop(void* inst);
-    
-    int SENS_IsStarted(void* inst);
-    
-    int SENS_SetCallback(void* inst, SensorDataCallback *callback, void* user);
-    
+
+#define SENSOR_ACCELEROMETER    0
+#define SENSOR_GYROSCOPE        1
+#define SENSOR_MAGNETOMETER     2
+#define SENSOR_GPS              3
+
+typedef void (SensorDataCallback)(void* user, const char* data);
+
+void* SENS_CreateInstance();
+
+int SENS_DestroyInstance(void** inst);
+
+int SENS_SetSensorType(void* inst, int type);
+
+int SENS_GetCurrentSensorType(void* inst);
+
+int SENS_Start(void* inst);
+
+int SENS_Stop(void* inst);
+
+int SENS_IsStarted(void* inst);
+
+int SENS_SetCallback(void* inst, SensorDataCallback *callback, void* user);
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/ismacryp/isma_ea.c -> gpac-0.5.1.svn5491.tar.xz/modules/ismacryp/isma_ea.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,7 +42,7 @@
 	ISMAEA_STATE_PLAY,
 };
 
-typedef struct 
+typedef struct
 {
 	GF_Crypt *crypt;
 	char key[16], salt[8];
@@ -85,7 +85,7 @@
 	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_term_download_new(ch->service, kms_url, 0, ISMA_KMS_NetIO, ch);
+	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);
@@ -97,7 +97,7 @@
 	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_term_download_del(sess);
+	gf_service_download_del(sess);
 	return e;
 }
 
@@ -131,16 +131,18 @@
 		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); 
+		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); 
+		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;
 		}
 	}
@@ -159,8 +161,10 @@
 	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 } };
+			{	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);
 	}
@@ -173,14 +177,14 @@
 {
 	GF_Err e;
 	char IV[16];
-	
+
 	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("AES-128", "CTR");
 		if (!priv->crypt) return GF_IO_ERR;
@@ -206,7 +210,7 @@
 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*/
@@ -268,14 +272,14 @@
 	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) 
+static GF_Err CENC_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt)
 {
 	GF_CENCConfig *cfg = (GF_CENCConfig*)evt->config_data;
 	u32 i;
@@ -353,14 +357,14 @@
 }
 
 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("AES-128", "CTR");
@@ -400,8 +404,8 @@
 	max_size = 4096;
 
 	if (!priv->crypt) return GF_SERVICE_ERROR;
-	
-	if (!evt->is_encrypted || !evt->IV_size) return GF_OK;
+
+	if (!evt->is_encrypted || !evt->IV_size || !evt->saiz) 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);
@@ -465,70 +469,82 @@
 		}
 	}
 
-	subsample_count = 0;
-	BSO = 0;
-	while (gf_bs_available(cyphertext_bs)) {
-		assert(subsample_count < sai->subsample_count);
-
-		/*read clear data and write it to pleintext 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(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
-
-		/*now read encrypted data, decrypted it and write to pleintext 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);
-		gf_crypt_decrypt(priv->crypt, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
-		gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+	//sub-sample encryption
+	if (sai->subsample_count) {
+		subsample_count = 0;
+		BSO = 0;
+		while (gf_bs_available(cyphertext_bs)) {
+			if (subsample_count >= sai->subsample_count)
+				break;
+
+			/*read clear data and write it to pleintext 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(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
 
-		/*update IV for next subsample*/
-		if (priv->is_cenc) {
-			BSO += sai->subsamples[subsample_count].bytes_encrypted_data;
-			if (gf_bs_available(cyphertext_bs)) {
-				char next_IV[17];
-				u64 prev_block_count, salt_portion, block_count_portion;
-				u32 remain;
-				GF_BitStream *bs, *tmp;
-
-				prev_block_count = BSO / 16;
-				remain = BSO % 16;
-				tmp = gf_bs_new((const char *)sai->IV, 16, GF_BITSTREAM_READ);
-				bs = gf_bs_new(next_IV, 17, GF_BITSTREAM_WRITE);
-				gf_bs_write_u8(bs, 0);	/*begin of counter*/
-
-				salt_portion = gf_bs_read_u64(tmp);
-				block_count_portion = gf_bs_read_u64(tmp);
-				/*reset the block counter to zero without affecting the other 64 bits of the IV*/
-				if (prev_block_count > 0xFFFFFFFFFFFFFFFFULL - block_count_portion)
-					block_count_portion = prev_block_count - (0xFFFFFFFFFFFFFFFFULL - block_count_portion) - 1;
-				else
-					block_count_portion +=  prev_block_count;
-				gf_bs_write_u64(bs, salt_portion);
-				gf_bs_write_u64(bs, block_count_portion);
-
-				gf_crypt_set_state(priv->crypt, next_IV, 17);
-				/*decrypt remain bytes*/
-				if (remain) {
-					char dummy[20];
-					gf_crypt_decrypt(priv->crypt, dummy, remain);
+			/*now read encrypted data, decrypted it and write to pleintext 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);
+			gf_crypt_decrypt(priv->crypt, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+			gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+
+			/*update IV for next subsample*/
+			if (priv->is_cenc) {
+				BSO += sai->subsamples[subsample_count].bytes_encrypted_data;
+				if (gf_bs_available(cyphertext_bs)) {
+					char next_IV[17];
+					u64 prev_block_count, salt_portion, block_count_portion;
+					u32 remain;
+					GF_BitStream *bs, *tmp;
+
+					prev_block_count = BSO / 16;
+					remain = BSO % 16;
+					tmp = gf_bs_new((const char *)sai->IV, 16, GF_BITSTREAM_READ);
+					bs = gf_bs_new(next_IV, 17, GF_BITSTREAM_WRITE);
+					gf_bs_write_u8(bs, 0);	/*begin of counter*/
+
+					salt_portion = gf_bs_read_u64(tmp);
+					block_count_portion = gf_bs_read_u64(tmp);
+					/*reset the block counter to zero without affecting the other 64 bits of the IV*/
+					if (prev_block_count > 0xFFFFFFFFFFFFFFFFULL - block_count_portion)
+						block_count_portion = prev_block_count - (0xFFFFFFFFFFFFFFFFULL - block_count_portion) - 1;
+					else
+						block_count_portion +=  prev_block_count;
+					gf_bs_write_u64(bs, salt_portion);
+					gf_bs_write_u64(bs, block_count_portion);
+
+					gf_crypt_set_state(priv->crypt, next_IV, 17);
+					/*decrypt remain bytes*/
+					if (remain) {
+						char dummy[20];
+						gf_crypt_decrypt(priv->crypt, dummy, remain);
+					}
+
+					gf_bs_del(bs);
+					gf_bs_del(tmp);
 				}
-
-				gf_bs_del(bs);
-				gf_bs_del(tmp);
 			}
-		}
 
-		subsample_count++;
+			subsample_count++;
+		}
+		if (buffer) gf_free(buffer);
+		gf_bs_get_content(pleintext_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);
+			max_size = evt->data_size;
+		}
+		gf_bs_read_data(cyphertext_bs, buffer, evt->data_size);
+		gf_crypt_decrypt(priv->crypt, buffer, evt->data_size);
 	}
-
-	if (buffer) gf_free(buffer);
-	gf_bs_get_content(pleintext_bs, &buffer, &evt->data_size);
 	memmove(evt->data, buffer, evt->data_size);
 
 exit:
@@ -541,6 +557,7 @@
 	return e;
 }
 
+
 static GF_Err IPMP_Process(GF_IPMPTool *plug, GF_IPMPEvent *evt)
 {
 	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
@@ -553,7 +570,7 @@
 #endif
 		if((evt->config_data_code != GF_4CC('c', 'e', 'n', 'c')) || (evt->config_data_code != GF_4CC('c','b','c','1'))) 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) {
@@ -593,7 +610,7 @@
 {
 	ISMAEAPriv *priv;
 	GF_IPMPTool *tmp;
-	
+
 	GF_SAFEALLOC(tmp, GF_IPMPTool);
 	if (!tmp) return NULL;
 	GF_SAFEALLOC(priv, ISMAEAPriv);
@@ -606,7 +623,7 @@
 #endif /*GPAC_DISABLE_MCRYPT*/
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 #ifndef GPAC_DISABLE_MCRYPT
@@ -642,5 +659,5 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( isma_ea )
+GPAC_MODULE_STATIC_DECLARATION( isma_ea )

gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/isom_cache.c -> gpac-0.5.1.svn5491.tar.xz/modules/isom_in/isom_cache.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "isom_in.h"
@@ -52,7 +52,7 @@
 			}
 		}
 	}
-	
+
 	/*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);
@@ -100,21 +100,40 @@
 		GF_NetworkCommand com;
 		com.base.on_channel = ch;
 		com.base.command_type = GF_NET_CHAN_GET_ESD;
-		gf_term_on_command(cache->service, &com, GF_OK);
+		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;
+		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);
 		mch->time_scale = esd->slConfig->timestampResolution;
@@ -147,7 +166,7 @@
 				gf_isom_3gp_config_new(cache->mov, mch->track, &h263c, NULL, NULL, &di);
 				mapped = 1;
 			}
-		} 
+		}
 		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);
@@ -184,7 +203,7 @@
 		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 
+	/*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);
@@ -192,7 +211,7 @@
 		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) 
+	if (mch->cache_sample->CTS_Offset)
 		mch->max_cts = mch->cache_sample->DTS+mch->cache_sample->CTS_Offset;
 
 	/*add cache*/

gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/isom_in.h -> gpac-0.5.1.svn5491.tar.xz/modules/isom_in/isom_in.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -53,16 +53,17 @@
 	/*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 base_track_id;
+	u32 play_only_track_id;
 
 	/*0: not fragmented - 1 fragmented - 2 fragmented and last fragment received*/
 	u32 frag_type;
-	Bool waiting_for_data;
+	Bool waiting_for_data, reset_frag_state;
 	GF_Mutex *segment_mutex;
 
 	Bool use_memory;
@@ -70,10 +71,15 @@
 	u32 seg_opened;
 	Bool drop_next_segment;
 	Bool in_data_flush;
-	s32 has_pending_segments;
+	u32 has_pending_segments, nb_force_flush;
 
 	Bool clock_discontinuity;
 	Bool disconnected;
+	Bool no_order_check;
+
+	u64 last_sender_ntp;
+	Double remain_at_buffering_start;
+	Bool buffering;
 } ISOMReader;
 
 
@@ -106,7 +112,7 @@
 	u32 time_scale;
 	Bool to_init, is_playing, has_rap;
 	u8 streamType;
-	
+
 	Bool is_encrypted, is_cenc;
 
 	/*cache stuff*/
@@ -117,6 +123,9 @@
 
 	Bool buffering;
 	u32 buffer_min, buffer_max;
+
+	Bool disable_seek;
+	u32 nalu_extract_mode;
 } ISOMChannel;
 void isor_reset_reader(ISOMChannel *ch);
 void isor_reader_get_sample(ISOMChannel *ch);

gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/load.c -> gpac-0.5.1.svn5491.tar.xz/modules/isom_in/load.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "isom_in.h"
@@ -88,22 +88,14 @@
 	const char *tag;
 	u32 i, count, ocr_es_id, tlen, base_track, j, track_id;
 	Bool highest_stream;
-	char *opt;
-	Bool add_ps_lower = GF_TRUE;
 
 	ocr_es_id = 0;
-	opt = (char*) gf_modules_get_option((GF_BaseInterface *)read->input, "ISOReader", "DeclareScalableXPS");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)read->input, "ISOReader", "DeclareScalableXPS", "yes");
-	} else if (!strcmp(opt, "no")) {
-		add_ps_lower = GF_FALSE;
-	}
 
 	/*TODO check for alternate tracks*/
 	count = gf_isom_get_track_count(read->mov);
 	for (i=0; i<count; i++) {
 		if (!gf_isom_is_track_enabled(read->mov, i+1)) continue;
-	
+
 		switch (gf_isom_get_media_type(read->mov, i+1)) {
 		case GF_ISOM_MEDIA_AUDIO:
 		case GF_ISOM_MEDIA_VISUAL:
@@ -115,10 +107,18 @@
 		default:
 			continue;
 		}
-		
+		//some subtypes are not declared as readable objects
+		switch (gf_isom_get_media_subtype(read->mov, i+1, 1)) {
+		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;
@@ -141,13 +141,13 @@
 			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_term_add_media(read->service, (GF_Descriptor*)od, GF_TRUE);
+				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_term_get_service_interface(read->service), "General", "CacheDirectory");
+		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;
@@ -190,7 +190,7 @@
 					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_term_add_media(read->service, (GF_Descriptor*)od, GF_TRUE);
+						gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_TRUE);
 					}
 				}
 			}
@@ -199,22 +199,22 @@
 	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_term_add_media(read->service, NULL, GF_FALSE);
-	} 
+		gf_service_declare_media(read->service, NULL, GF_FALSE);
+	}
 }
 
 #endif /*GPAC_DISABLE_ISOM*/
 
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 #ifndef GPAC_DISABLE_ISOM
-	GF_NET_CLIENT_INTERFACE,
+		GF_NET_CLIENT_INTERFACE,
 #endif
 #ifndef GPAC_DISABLE_ISOM_WRITE
-	GF_STREAMING_MEDIA_CACHE,
+		GF_STREAMING_MEDIA_CACHE,
 #endif
 		0
 	};
@@ -222,14 +222,14 @@
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifndef GPAC_DISABLE_ISOM
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE) 
+	if (InterfaceType == GF_NET_CLIENT_INTERFACE)
 		return (GF_BaseInterface *)isor_client_load();
 #endif
 #ifndef GPAC_DISABLE_ISOM_WRITE
-	if (InterfaceType == GF_STREAMING_MEDIA_CACHE) 
+	if (InterfaceType == GF_STREAMING_MEDIA_CACHE)
 		return (GF_BaseInterface *)isow_load_cache();
 #endif
 	return NULL;
@@ -240,12 +240,16 @@
 {
 	switch (ifce->InterfaceType) {
 #ifndef GPAC_DISABLE_ISOM
-	case GF_NET_CLIENT_INTERFACE: isor_client_del(ifce); break;
+	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;
+	case GF_STREAMING_MEDIA_CACHE:
+		isow_delete_cache(ifce);
+		break;
 #endif
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( isom )
+GPAC_MODULE_STATIC_DECLARATION( isom )

gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/read.c -> gpac-0.5.1.svn5491.tar.xz/modules/isom_in/read.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "isom_in.h"
@@ -63,23 +63,23 @@
 }
 
 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", "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",
-  NULL
+	/* 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", "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",
+	NULL
 };
-  
-u32 ISOR_RegisterMimeTypes(const GF_InputService *plug){
-  u32 i;
-  for (i = 0 ; ISOR_MIME_TYPES[i]; i+=3)
-    gf_term_register_mime_type(plug, ISOR_MIME_TYPES[i], ISOR_MIME_TYPES[i+1], ISOR_MIME_TYPES[i+2]);
-  return i/3;
+
+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)
@@ -88,15 +88,15 @@
 	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_term_check_extension(plug, ISOR_MIME_TYPES[i], ISOR_MIME_TYPES[i+1], ISOR_MIME_TYPES[i+2], ext))
-		return GF_TRUE;
+		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_term_check_extension(plug, ISOR_MIME_TYPES[0], ext+1, ISOR_MIME_TYPES[2], ext);
+		gf_service_check_mime_register(plug, ISOR_MIME_TYPES[0], ext+1, ISOR_MIME_TYPES[2], ext);
 		return GF_TRUE;
 	}
 	return GF_FALSE;
@@ -128,8 +128,15 @@
 	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;
+
+	//we add 30 seconds to smooth out bitrate variations ..;
+	dld_time_remaining += 30;
+
 	mov_rate = total;
 	dur = gf_isom_get_duration(read->mov);
 	if (dur) {
@@ -164,19 +171,22 @@
 			//we have enough buffer
 			else if ((data_offset + ch->buffer_max * mov_rate/1000 <= done)) {
 				do_buffer = GF_FALSE;
-			} 
+			}
 #endif
 			time_remain_ch -= (samp->DTS + samp->CTS_Offset);
 			if (time_remain_ch<0) time_remain_ch=0;
 			gf_isom_sample_del(&samp);
 
 			time_remain_ch /= ch->time_scale;
-			//we add 2 seconds safety
-			if (time_remain_ch && (time_remain_ch < dld_time_remaining + 2)) {
+			if (time_remain_ch && (time_remain_ch < dld_time_remaining)) {
 				do_buffer = GF_TRUE;
-				buffer_level = (u32) (ch->buffer_max * time_remain_ch / dld_time_remaining);
+				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 {
-				buffer_level = (u32) (1000 * (data_offset - done)/mov_rate);
 				do_buffer = GF_FALSE;
 			}
 		}
@@ -187,8 +197,11 @@
 			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;
-			gf_term_on_command(read->service, &com, GF_OK);
+			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;
@@ -196,9 +209,10 @@
 			com.buffer.min = ch->buffer_min;
 			com.buffer.max = ch->buffer_max;
 			com.buffer.occupancy = buffer_level;
-			gf_term_on_command(read->service, &com, GF_OK);
+			gf_service_command(read->service, &com, GF_OK);
 		}
 	}
+	gf_mx_v(read->segment_mutex);
 }
 
 void isor_net_io(void *cbk, GF_NETIO_Parameter *param)
@@ -207,9 +221,10 @@
 	u32 size = 0;
 	char *local_name;
 	ISOMReader *read = (ISOMReader *) cbk;
-	
+
 	/*handle service message*/
-	gf_term_download_update_stats(read->dnload);
+	if (!read->buffering) 
+		gf_service_download_update_stats(read->dnload);
 
 	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
 		e = GF_EOS;
@@ -223,13 +238,13 @@
 	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_term_on_connect(read->service, NULL, e);
-            }
-        }
+			/* 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;
 	}
 
@@ -239,25 +254,25 @@
 		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_term_on_connect(read->service, NULL, GF_SERVICE_ERROR);
-            }
+			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;
 		}
 		e = GF_OK;
 		read->mov = gf_isom_open(local_name, GF_ISOM_OPEN_READ, NULL);
 		if (!read->mov) e = gf_isom_last_error(NULL);
 		else 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_term_on_connect(read->service, NULL, GF_OK);
-        }
+		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*/
@@ -277,11 +292,11 @@
 	/*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_term_on_connect(read->service, NULL, GF_SERVICE_ERROR);
-        }
+		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;
 	}
 
@@ -290,7 +305,7 @@
 		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:
@@ -298,22 +313,22 @@
 	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_term_on_connect(read->service, NULL, e);
-        }
+		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_term_on_connect(read->service, NULL, GF_OK);
-    }
+	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);
 }
@@ -322,13 +337,13 @@
 void isor_setup_download(GF_InputService *plug, const char *url)
 {
 	ISOMReader *read = (ISOMReader *) plug->priv;
-	read->dnload = gf_term_download_new(read->service, url, 0, isor_net_io, read);
+	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_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
-        }
+		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);
@@ -347,10 +362,9 @@
 	read->input = plug;
 	read->service = serv;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
-	read->base_track_id = 0;
 	if (!url) return GF_URL_ERROR;
 
 	strcpy(szURL, url);
@@ -359,9 +373,9 @@
 		tmp = strchr(tmp, '#');
 		if (tmp) {
 			if (!strnicmp(tmp, "#trackID=", 9)) {
-				read->base_track_id = atoi(tmp+9);
+				read->play_only_track_id = atoi(tmp+9);
 			} else {
-				read->base_track_id = atoi(tmp+1);
+				read->play_only_track_id = atoi(tmp+1);
 			}
 			tmp[0] = 0;
 		}
@@ -380,13 +394,13 @@
 			}
 		}
 		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_term_on_connect(read->service, NULL, e);
-            }
+		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;
@@ -394,11 +408,11 @@
 
 		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_term_on_connect(read->service, NULL, GF_OK);
-        }
+		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);
 
@@ -427,14 +441,14 @@
 		isor_delete_channel(read, ch);
 	}
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = 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_term_on_disconnect(read->service, NULL, reply);
-    }
+	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;
 }
 
@@ -531,8 +545,8 @@
 
 	trackID = 0;
 	if (!sub_url) {
-		trackID = read->base_track_id;
-		read->base_track_id = 0;
+		trackID = read->play_only_track_id;
+		read->play_only_track_id = 0;
 	} else {
 		char *ext = (char *)strrchr(sub_url, '#');
 		if (!ext) {
@@ -559,8 +573,8 @@
 		for (i=0; i<gf_isom_get_track_count(read->mov); i++) {
 			u32 type = gf_isom_get_media_type(read->mov, i+1);
 			if (
-				((type==GF_ISOM_MEDIA_VISUAL) && (expect_type==GF_MEDIA_OBJECT_VIDEO)) 
-				|| ((type==GF_ISOM_MEDIA_AUDIO) && (expect_type==GF_MEDIA_OBJECT_AUDIO)) ) {
+			    ((type==GF_ISOM_MEDIA_VISUAL) && (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;
 			}
@@ -638,9 +652,15 @@
 	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;
+		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) {
@@ -657,12 +677,12 @@
 {
 	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);
@@ -676,10 +696,10 @@
 	//fixme - check MSE and EME
 #if 0
 	if (read->input->query_proxy && read->input->proxy_udta) {
-        read->input->query_proxy(read->input, &com);
-    } else 
+		read->input->query_proxy(read->input, &com);
+	} else
 #endif
-		gf_term_on_command(ch->owner->service, &com, GF_OK);
+		gf_service_command(ch->owner->service, &com, GF_OK);
 	//free our PSSH
 	if (com.drm_cfg.PSSHs) gf_free(com.drm_cfg.PSSHs);
 }
@@ -764,7 +784,8 @@
 		gf_isom_get_reference(ch->owner->mov, ch->track, GF_ISOM_REF_BASE, 1, &ch->base_track);
 		ch->next_track = 0;
 		/*in scalable mode add SPS/PPS in-band*/
-		gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+		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);
 		break;
 	}
 
@@ -773,11 +794,11 @@
 	ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
 
 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_term_on_connect(read->service, channel, e);
-    }
+	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;
@@ -794,11 +815,11 @@
 			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_term_on_command(read->service, &com, GF_OK);
-        }
+		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));
@@ -807,20 +828,20 @@
 		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_term_on_command(read->service, &com, GF_OK);
-            }
+			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_term_on_command(read->service, &com, GF_OK);
-            }
+			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);
@@ -838,6 +859,7 @@
 	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);
@@ -850,11 +872,12 @@
 	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_term_on_disconnect(read->service, channel, e);
-    }
+	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;
 }
 
@@ -894,7 +917,7 @@
 	*out_reception_status = ch->last_state;
 	if (read->waiting_for_data)
 		*out_reception_status = GF_BUFFER_TOO_SMALL;
-	
+
 	return GF_OK;
 }
 
@@ -952,7 +975,7 @@
 				break;
 			}
 		}
-		/*this is the highest quality*/ 
+		/*this is the highest quality*/
 		if (!next_track)
 			return cur_track;
 	}
@@ -969,7 +992,7 @@
 	}
 
 	/*in scalable mode add SPS/PPS in-band*/
-	gf_isom_set_nalu_extract_mode(the_file, next_track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+	gf_isom_set_nalu_extract_mode(the_file, next_track, ch->nalu_extract_mode);
 
 	return next_track;
 }
@@ -1033,7 +1056,7 @@
 		return GF_OK;
 	}
 	if (com->command_type == GF_NET_SERVICE_FLUSH_DATA) {
-		if (plug->query_proxy)
+		if (read->nb_playing && plug->query_proxy)
 			isor_flush_data(read, 0, 0);
 		return GF_OK;
 	}
@@ -1051,7 +1074,7 @@
 	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) 
+		if (read->input->proxy_udta && !read->input->proxy_type)
 			return GF_NOT_SUPPORTED;
 #endif
 
@@ -1090,8 +1113,12 @@
 		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;
+		gf_mx_v(read->segment_mutex);
+
 		ch->start = ch->end = 0;
 		if (com->play.speed>0) {
 			if (com->play.start_range>=0) {
@@ -1103,8 +1130,11 @@
 				ch->end = check_round(ch, ch->end, com->play.end_range, 0);
 			}
 		} else if (com->play.speed<0) {
-			if (com->play.end_range>=com->play.start_range) ch->start = (u64) (s64) (com->play.start_range * ch->time_scale);
-			if (com->play.end_range >= 0) ch->end = (u64) (s64) (com->play.end_range*ch->time_scale);
+			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;
@@ -1112,11 +1142,18 @@
 
 		//and check buffer level on play request
 		isor_check_buffer_level(read);
+		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;
@@ -1137,10 +1174,20 @@
 			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;
+		ch->disable_seek = 1;
+		//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) {
+			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;
 }
 
@@ -1148,7 +1195,7 @@
 {
 	char szURL[2048], *sep;
 	ISOMReader *read = (ISOMReader *)plug->priv;
-	const char *this_url = gf_term_get_service_url(read->service);
+	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;
@@ -1185,7 +1232,7 @@
 	GF_SAFEALLOC(reader, ISOMReader);
 	reader->channels = gf_list_new();
 	reader->segment_mutex = gf_mx_new("ISO Segment");
-	
+
 	plug->priv = reader;
 	return plug;
 }

gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/read_ch.c -> gpac-0.5.1.svn5491.tar.xz/modules/isom_in/read_ch.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -46,12 +46,12 @@
 }
 
 /*
-	refresh type: 
+	refresh type:
 		0: not progressive
 		1: progressive
 		2: not progressive and don't check current download
 */
-void isor_segment_switch_or_refresh(ISOMReader *read, u32 refresh_type)
+void isor_segment_switch_or_refresh(ISOMReader *read, Bool do_refresh)
 {
 	GF_NetworkCommand param;
 	u32 i, count;
@@ -68,18 +68,17 @@
 
 	memset(&param, 0, sizeof(GF_NetworkCommand));
 	param.command_type = GF_NET_SERVICE_QUERY_NEXT;
-	param.url_query.current_download = (refresh_type==2) ? 0 : 1;
-	if (refresh_type==2) 
-		refresh_type = 0;
-	
+	//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: refresh_type %d - seg opened %d\n", refresh_type , read->seg_opened));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Refresh seg: do_refresh %d - seg opened %d\n", do_refresh, read->seg_opened));
 
-	if (refresh_type && !read->seg_opened)
-		refresh_type = 0;
+	if (do_refresh && !read->seg_opened)
+		do_refresh = 0;
 
-	if ((read->seg_opened==1) && !refresh_type) {
+	if ((read->seg_opened==1) && !do_refresh) {
 		gf_mx_v(read->segment_mutex);
 		return;
 	}
@@ -90,7 +89,7 @@
 	}
 
 	//if first time trying to fetch next segment, check if we have to discard it
-	if (!refresh_type && (read->seg_opened==2)) {
+	if (!do_refresh && (read->seg_opened==2)) {
 #ifdef DASH_USE_PULL
 		for (i=0; i<count; i++) {
 			ISOMChannel *ch = gf_list_get(read->channels, i);
@@ -117,17 +116,23 @@
 	if (e == GF_OK) {
 		u64 timestamp, ntp;
 		u32 trackID = 0;
-		if (param.url_query.next_url){
+		if (param.url_query.next_url) {
+			u32 flags;
 
 			//previously loaded file has been aborted, reload segment !
-			if (refresh_type && param.url_query.discontinuity_type) {
+			if (do_refresh && param.url_query.discontinuity_type) {
 				gf_isom_release_segment(read->mov, 1);
 				gf_isom_reset_fragment_info(read->mov, 1);
-				refresh_type = 0;
+				do_refresh = 0;
+			}
+
+			if (read->reset_frag_state) {
+				read->reset_frag_state = 0;
+				gf_isom_reset_fragment_info(read->mov, 0);
 			}
 
 			//refresh file
-			if (refresh_type) {
+			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;
@@ -153,28 +158,35 @@
 				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) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Switching between files - opening new init segment %s\n", param.url_query.next_url_init_or_switch_segment));
 				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) ));
+				}
 			}
-
-			e = gf_isom_open_segment(read->mov, param.url_query.next_url, param.url_query.start_range, param.url_query.end_range, scalable_segment);
-
-			if (param.url_query.current_download  && (e==GF_ISOM_INCOMPLETE_FILE)) {
-				e = GF_OK;
-			}
+			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;
+				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\n", param.url_query.next_url));
-			}
+				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\n", param.url_query.next_url));
+				}
 #endif
+			}
 
 			if (e<0) {
 				gf_isom_release_segment(read->mov, 1);
@@ -184,7 +196,8 @@
 				gf_isom_reset_fragment_info(read->mov, 0);
 				for (i=0; i<count; i++) {
 					ISOMChannel *ch = gf_list_get(read->channels, i);
-					ch->sample_num = 0;
+					if (ch)
+						ch->sample_num = 0;
 				}
 
 				//cannot open file, don't change our state
@@ -203,26 +216,16 @@
 
 #ifndef _WIN32_WCE
 			if (gf_isom_get_last_producer_time_box(read->mov, &trackID, &ntp, &timestamp, 1)) {
-				u32 remote_s, remote_f, local_s, local_f;
-				s64 diff_s, diff_f;
 				time_t secs;
 				struct tm t;
-				remote_s = (ntp>>32);
-				remote_f = (u32) (ntp & 0xFFFFFFFFULL);
-				gf_net_get_ntp(&local_s, &local_f);
-				diff_s = local_s;
-				diff_s -= remote_s;
-				diff_s *= 1000;
-				diff_f = local_f;
-				diff_f -= remote_f;
-				diff_f *= 1000;
-				diff_f /= 0xFFFFFFFFULL;
-				diff_s += diff_f;
-
-				secs = remote_s - GF_NTP_SEC_1900_TO_1970;
+
+				s32 diff = gf_net_get_ntp_diff_ms(ntp);
+
+				secs = (ntp>>32) - GF_NTP_SEC_1900_TO_1970;
 				t = *gmtime(&secs);
 
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] TrackID %d: Timestamp %d matches sender NTP time %d-%02d-%02dT%02d:%02d:%02dZ - NTP clock diff (local - remote): %d ms\n", trackID, (u32) timestamp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, diff_s ));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] TrackID %d: Timestamp %d matches sender NTP time %d-%02d-%02dT%02d:%02d:%02dZ - NTP clock diff (local - remote): %d ms\n", trackID, (u32) timestamp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, diff ));
+				read->last_sender_ntp = ntp;
 			}
 #endif
 
@@ -268,10 +271,10 @@
 					}
 				}
 				/*rewrite all upcoming SPS/PPS into the samples*/
-				gf_isom_set_nalu_extract_mode(read->mov, ch->track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+				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);
 				}
@@ -292,8 +295,8 @@
 		/*consider we are done*/
 		read->frag_type = 2;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] No more segments - done playing file\n"));
-	} else if (e==GF_BUFFER_TOO_SMALL){
-		if (refresh_type==0) {
+	} else if (e==GF_BUFFER_TOO_SMALL) {
+		if (do_refresh==0) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Next segment is not yet available\n"));
 			read->waiting_for_data = GF_TRUE;
 		} else {
@@ -312,7 +315,7 @@
 	u32 ivar;
 	if (ch->is_pulling && ch->wait_for_segment_switch) {
 		isor_segment_switch_or_refresh(ch->owner, 0);
-		if (ch->wait_for_segment_switch) 
+		if (ch->wait_for_segment_switch)
 			return;
 	}
 
@@ -329,18 +332,21 @@
 	if (ch->streamType==GF_STREAM_OCR) {
 		assert(!ch->sample);
 		ch->sample = gf_isom_sample_new();
-		ch->sample->IsRAP = 1;
+		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, &ivar, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->sample, &ch->sample_num);
+			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->duration, &ivar, mode, &ch->sample, &ch->sample_num);
 		} else {
-			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->start, &ivar, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->sample, &ch->sample_num);
+			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->start, &ivar, 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;
 		}
@@ -361,14 +367,33 @@
 			ch->last_state = (ch->owner->frag_type==1) ? GF_OK : GF_EOS;
 			ch->to_init = 0;
 		}
-	} else {
+		return;
+	}
+
+	if (ch->has_edit_list) {
 		ch->sample_time = ch->sample->DTS;
-		ch->to_init = 0;
+	} 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))	//should not happen
+			ch->sample_time = 0;
+		else
+			ch->sample_time = ch->sample->DTS + ch->dts_offset;
+	}
+	ch->to_init = 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;
 	}
-	ch->current_slh.decodingTimeStamp = ch->start;
-	ch->current_slh.compositionTimeStamp = ch->start;
 	ch->current_slh.randomAccessPointFlag = ch->sample ? ch->sample->IsRAP : 0;
 
+	ch->owner->no_order_check = ch->speed < 0 ? GF_TRUE : GF_FALSE;
 }
 
 
@@ -390,6 +415,30 @@
 
 	if (ch->to_init) {
 		init_reader(ch);
+	} else if (ch->speed < 0) {
+		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time - 1, &ivar, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->sample, &ch->sample_num);
+		if (e) {
+			if (e==GF_EOS) {
+				ch->last_state = GF_EOS;
+				return;
+			}
+			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, &ivar, GF_ISOM_SEARCH_FORWARD, &ch->sample, &ch->sample_num);
@@ -412,7 +461,7 @@
 				/*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) 
+						if (ch->sample)
 							gf_isom_sample_del(&ch->sample);
 					} else {
 						u32 time_diff = 2;
@@ -462,28 +511,33 @@
 		}
 	} else {
 		ch->sample_num++;
-fetch_next:
+
 		ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->sample_num, &ivar);
 		/*if sync shadow / carousel RAP skip*/
-		if (ch->sample && (ch->sample->IsRAP==2)) {
+		if (ch->sample && (ch->sample->IsRAP==RAP_REDUNDANT)) {
 			gf_isom_sample_del(&ch->sample);
 			ch->sample_num++;
-			goto fetch_next;
-		}
-		if (ch->sample && ch->sample->IsRAP && ch->next_track) {
-			ch->track = ch->next_track;
-			ch->next_track = 0;
-			gf_isom_sample_del(&ch->sample);
-			goto fetch_next;
+			isor_reader_get_sample(ch);
+			return;
 		}
-		if (ch->sample && ch->dts_offset) {
-			if ( (ch->dts_offset<0) && (ch->sample->DTS < (u64) -ch->dts_offset)) {
-				ch->sample->DTS = 0;
-			} else {
-				ch->sample->DTS += ch->dts_offset;
-			}
+	}
+
+	//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 && ch->dts_offset) {
+		if ( (ch->dts_offset<0) && (ch->sample->DTS < (u64) -ch->dts_offset)) {
+			ch->sample->DTS = 0;
+		} else {
+			ch->sample->DTS += ch->dts_offset;
 		}
 	}
+
 	if (!ch->sample) {
 		/*incomplete file - check if we're still downloading or not*/
 		if (gf_isom_get_missing_bytes(ch->owner->mov, ch->track)) {
@@ -493,14 +547,19 @@
 				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) 
+					if (!ch->has_edit_list)
 						ch->sample_num--;
 				}
 			}
 			else if (ch->owner->input->query_proxy) {
 				ch->last_state = GF_OK;
 			}
-		} else if (!ch->sample_num || (ch->sample_num >= gf_isom_get_sample_count(ch->owner->mov, ch->track))) {
+		}
+		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) ) {
@@ -510,7 +569,7 @@
 				/*if sample cannot be found and file is fragmented, rewind sample*/
 				if (ch->sample_num) ch->sample_num--;
 				ch->last_state = GF_OK;
-			} else if (!ch->owner->frag_type) {
+			} else {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track #%d end of stream reached\n", ch->track));
 				ch->last_state = GF_EOS;
 			}
@@ -530,8 +589,12 @@
 	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);
-	/*still seeking or not ?*/
-	if (ch->start <= ch->sample->DTS + ch->sample->CTS_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 - !! FIXME we should not change the TS but rather signal the frame is a seek frame
+	 */
+	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;
 	} else {
@@ -549,6 +612,10 @@
 		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.sender_ntp = ch->owner->last_sender_ntp;
+		ch->owner->last_sender_ntp = 0;
+	}
 
 	if (ch->is_encrypted) {
 		GF_ISMASample *ismasamp = gf_isom_get_ismacryp_sample(ch->owner->mov, ch->track, ch->sample, 1);
@@ -617,7 +684,7 @@
 {
 	u32 i, count;
 	GF_Err e = GF_OK;
-	Bool in_progressive_mode;
+	Bool do_refresh;
 	GF_NetworkCommand com;
 	ISOMChannel *ch;
 
@@ -634,9 +701,9 @@
 	read->in_data_flush = 1;
 	count = gf_list_count(read->channels);
 
-	in_progressive_mode = (read->seg_opened==1) ? 1 : 0;
+	do_refresh = (read->seg_opened==1) ? 1 : 0;
 
-	if (in_progressive_mode) {
+	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;
@@ -645,7 +712,7 @@
 		}
 		//otherwise this is new chunk or end of chunk, process
 	}
-	//this is a new file, check buffer level 
+	//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++) {
@@ -654,7 +721,7 @@
 			memset(&com, 0, sizeof(GF_NetworkCommand));
 			com.command_type = GF_NET_BUFFER_QUERY;
 			com.base.on_channel = ch->channel;
-			gf_term_on_command(read->service, &com, GF_OK);
+			gf_service_command(read->service, &com, GF_OK);
 			if ((com.buffer.occupancy < MAX(com.buffer.max, 1000) )) {
 				buffer_full = 0;
 				break;
@@ -670,39 +737,39 @@
 			return;
 		}
 	}
-#if 1
 	//flush request from terminal: only process if nothing is opened and we have pending segments
-	if (!check_buffer_level && !read->seg_opened && !read->has_pending_segments && !read->drop_next_segment) {
+	//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;
 	}
-#endif
 
-	//if this is a request from terminal to flush pending segments, do not attempt to open the current download one, only open the first available in the cache
-	if (!check_buffer_level && !in_progressive_mode) 
-		in_progressive_mode = 2;
- 
+	//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, in_progressive_mode);
+	isor_segment_switch_or_refresh(read, do_refresh);
 
 	//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;
-			gf_term_on_sl_packet(read->service, ch->channel, ch->sample->data, ch->sample->dataLength, &ch->current_slh, GF_OK);
+			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_term_on_sl_packet(read->service, ch->channel, NULL, 0, NULL, GF_EOS);
+		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: 
+	//done playing the file after notification from DASH client:
 	if (read->seg_opened==2) {
 		GF_NetworkCommand param;
 		//drop this segment
@@ -712,17 +779,23 @@
 		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 (e==GF_EOS) {
 			for (i=0; i<count; i++) {
 				ch = (ISOMChannel *)gf_list_get(read->channels, i);
-				gf_term_on_sl_packet(read->service, ch->channel, NULL, 0, NULL, GF_EOS);
+				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);
@@ -730,6 +803,10 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Done playing segment \n"));
 	}
 	read->in_data_flush = 0;
+
+	if (!read->has_pending_segments) {
+		read->nb_force_flush ++;
+	}
 	gf_mx_v(read->segment_mutex);
 }

gpac-0.5.0.svn5178.tar.bz2/modules/jack/jack.c -> gpac-0.5.1.svn5491.tar.xz/modules/jack/jack.c Changed

@@ -21,18 +21,17 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <poll.h>
 #include <strings.h>
 #include <jack/types.h>
 #include <jack/jack.h>
@@ -44,14 +43,14 @@
 int
 getPid ()
 {
-  return getpid ();
+	return getpid ();
 }
 #else
-	// FIXME : get handle under WIN32 ?
+#include <windows.h>
 int
 getPid ()
 {
-  return 1979;
+	return GetCurrentProcessId();
 }
 #endif
 
@@ -61,19 +60,19 @@
  */
 typedef struct
 {
-  char jackClientName[MAX_JACK_CLIENT_NAME_SZ];
-  jack_client_t *jack;
-  jack_port_t **jackPorts;
-  jack_nframes_t currentBlockSize;
-  u32 numChannels;
-  char *buffer;
-  u32 bufferSz;
-  u32 bytesPerSample;
-  char isActive;
-  char autoConnect;
-  char autoStartJackd;
-  jack_default_audio_sample_t **channels;
-  float volume;
+	char jackClientName[MAX_JACK_CLIENT_NAME_SZ];
+	jack_client_t *jack;
+	jack_port_t **jackPorts;
+	jack_nframes_t currentBlockSize;
+	u32 numChannels;
+	char *buffer;
+	u32 bufferSz;
+	u32 bytesPerSample;
+	char isActive;
+	char autoConnect;
+	char autoStartJackd;
+	jack_default_audio_sample_t **channels;
+	float volume;
 } JackContext;
 
 #ifndef TRUE
@@ -86,45 +85,45 @@
 static void
 Jack_cleanup (JackContext * ctx)
 {
-  u32 channels = 0;
-  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)
-    {
-      jack_deactivate (ctx->jack);
-    }
-  if (ctx->buffer != NULL)
-    {
-      gf_free(ctx->buffer);
-      ctx->bufferSz = 0;
-      ctx->buffer = NULL;
-    }
-  if (ctx->jackPorts != NULL)
-    {
-      for (channels = 0; channels < ctx->numChannels; channels++)
+	u32 channels = 0;
+	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)
 	{
-	  if (ctx->jackPorts[channels] != NULL)
-	    jack_port_unregister (ctx->jack, ctx->jackPorts[channels]);
-	  ctx->jackPorts[channels] = NULL;
+		jack_deactivate (ctx->jack);
 	}
-      gf_free(ctx->jackPorts);
-      ctx->jackPorts = NULL;
-    }
-  if (ctx->jack != NULL)
-    {
-      jack_client_close (ctx->jack);
-    }
-  if (ctx->channels != NULL)
-    {
-      gf_free(ctx->channels);
-      ctx->channels = NULL;
-    }
-  ctx->numChannels = 0;
-  ctx->currentBlockSize = 0;
-  bzero (ctx->jackClientName, MAX_JACK_CLIENT_NAME_SZ);
-  ctx->jack = NULL;
+	if (ctx->buffer != NULL)
+	{
+		gf_free(ctx->buffer);
+		ctx->bufferSz = 0;
+		ctx->buffer = NULL;
+	}
+	if (ctx->jackPorts != NULL)
+	{
+		for (channels = 0; channels < ctx->numChannels; channels++)
+		{
+			if (ctx->jackPorts[channels] != NULL)
+				jack_port_unregister (ctx->jack, ctx->jackPorts[channels]);
+			ctx->jackPorts[channels] = NULL;
+		}
+		gf_free(ctx->jackPorts);
+		ctx->jackPorts = NULL;
+	}
+	if (ctx->jack != NULL)
+	{
+		jack_client_close (ctx->jack);
+	}
+	if (ctx->channels != NULL)
+	{
+		gf_free(ctx->channels);
+		ctx->channels = NULL;
+	}
+	ctx->numChannels = 0;
+	ctx->currentBlockSize = 0;
+	memset (ctx->jackClientName, 0, MAX_JACK_CLIENT_NAME_SZ);
+	ctx->jack = NULL;
 }
 
 /**
@@ -133,46 +132,46 @@
 static int
 process_callback (jack_nframes_t nframes, void *arg)
 {
-  uint channel, i;
-  short *tmpBuffer;
-  size_t toRead;
-  size_t bytesToRead;
-  size_t readen;
-  GF_AudioOutput *dr = (GF_AudioOutput *) arg;
-  JackContext *ctx;
-  if (dr == NULL)
-    {
-      // Should not happen
-      return 1;
-    }
-  ctx = dr->opaque;
-  toRead = nframes * ctx->numChannels;
-  bytesToRead = toRead * ctx->bytesPerSample;
-  readen = dr->FillBuffer (dr->audio_renderer, (void *) ctx->buffer,
-			   bytesToRead);
-  toRead = readen / ctx->bytesPerSample;
-  if (ctx->bytesPerSample == 2)
-    {
-      tmpBuffer = (short *) ctx->buffer;
-      for (channel = 0; channel < nframes; channel += ctx->numChannels)
+	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)
 	{
-	  for (i = 0; i < ctx->numChannels; i++)
-	    ctx->channels[i][channel] =
-	      (float) (ctx->volume / 32768.0 *
-		       (tmpBuffer[channel * ctx->numChannels + i]));
+		// Should not happen
+		return 1;
 	}
-    }
-  else
-    {
-      for (channel = 0; channel < nframes; channel += ctx->numChannels)
+	ctx = dr->opaque;
+	toRead = nframes * ctx->numChannels;
+	bytesToRead = toRead * ctx->bytesPerSample;
+	readen = dr->FillBuffer (dr->audio_renderer, (void *) ctx->buffer,
+	                         bytesToRead);
+	toRead = readen / ctx->bytesPerSample;
+	if (ctx->bytesPerSample == 2)
 	{
-	  for (i = 0; i < ctx->numChannels; i++)
-	    ctx->channels[i][channel] =
-	      (float) (ctx->volume / 255.0 *
-		       (ctx->buffer[channel * ctx->numChannels + i]));
+		tmpBuffer = (short *) ctx->buffer;
+		for (channel = 0; channel < nframes; channel += ctx->numChannels)
+		{
+			for (i = 0; i < ctx->numChannels; i++)
+				ctx->channels[i][channel] =
+				    (float) (ctx->volume / 32768.0 *
+				             (tmpBuffer[channel * ctx->numChannels + i]));
+		}
 	}
-    }
-  return 0;
+	else
+	{
+		for (channel = 0; channel < nframes; channel += ctx->numChannels)
+		{
+			for (i = 0; i < ctx->numChannels; i++)
+				ctx->channels[i][channel] =
+				    (float) (ctx->volume / 255.0 *
+				             (ctx->buffer[channel * ctx->numChannels + i]));
+		}
+	}
+	return 0;
 }
 
 /**
@@ -181,57 +180,57 @@
 static int
 onBufferSizeChanged (jack_nframes_t nframes, void *arg)
 {
-  GF_AudioOutput *dr = (GF_AudioOutput *) arg;
-  JackContext *ctx;
-  size_t realBuffSize;
-  u32 channel;
-  if (dr == NULL)
-    {
-      // Should not happen
-      return 1;
-    }
-  ctx = dr->opaque;
-  realBuffSize = nframes * ctx->numChannels * sizeof (short);
-  if (ctx->buffer != NULL && ctx->bufferSz == realBuffSize)
-    return 0;
-  if (ctx->channels != NULL)
-    gf_free(ctx->channels);
-  ctx->channels = NULL;
-  ctx->channels = gf_calloc (ctx->numChannels, sizeof (jack_default_audio_sample_t *));
-  if (ctx->channels == NULL)
-    {
-      Jack_cleanup (ctx);
-      return 2;
-    }
-  for (channel = 0; channel < ctx->numChannels; channel++)
-    {
-      ctx->channels[channel] =
-	jack_port_get_buffer (ctx->jackPorts[channel], nframes);
-      if (ctx->channels[channel] == NULL)
+	GF_AudioOutput *dr = (GF_AudioOutput *) arg;
+	JackContext *ctx;
+	size_t realBuffSize;
+	u32 channel;
+	if (dr == NULL)
+	{
+		// Should not happen
+		return 1;
+	}
+	ctx = dr->opaque;
+	realBuffSize = nframes * ctx->numChannels * sizeof (short);
+	if (ctx->buffer != NULL && ctx->bufferSz == realBuffSize)
+		return 0;
+	if (ctx->channels != NULL)
+		gf_free(ctx->channels);
+	ctx->channels = NULL;
+	ctx->channels = gf_calloc (ctx->numChannels, sizeof (jack_default_audio_sample_t *));
+	if (ctx->channels == NULL)
+	{
+		Jack_cleanup (ctx);
+		return 2;
+	}
+	for (channel = 0; channel < ctx->numChannels; channel++)
+	{
+		ctx->channels[channel] =
+		    jack_port_get_buffer (ctx->jackPorts[channel], nframes);
+		if (ctx->channels[channel] == NULL)
+		{
+			Jack_cleanup (ctx);
+			return 3;
+		}
+	}
+
+	if (ctx->buffer != NULL)
+		gf_free(ctx->buffer);
+	ctx->buffer = gf_calloc (realBuffSize, sizeof (char));
+	if (ctx->buffer == NULL)
+	{
+		Jack_cleanup (ctx);
+		return 4;
+	}
+	ctx->bufferSz = realBuffSize;
+	GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
+	        ("[Jack] onBufferSizeChanged : resized to %d.\n", realBuffSize));
+	if (ctx->buffer == NULL)
 	{
-	  Jack_cleanup (ctx);
-	  return 3;
+		ctx->bufferSz = 0;
+		Jack_cleanup (ctx);
+		return 5;
 	}
-    }
-
-  if (ctx->buffer != NULL)
-    gf_free(ctx->buffer);
-  ctx->buffer = gf_calloc (realBuffSize, sizeof (char));
-  if (ctx->buffer == NULL)
-    {
-      Jack_cleanup (ctx);
-      return 4;
-    }
-  ctx->bufferSz = realBuffSize;
-  GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
-	  ("[Jack] onBufferSizeChanged : resized to %d.\n", realBuffSize));
-  if (ctx->buffer == NULL)
-    {
-      ctx->bufferSz = 0;
-      Jack_cleanup (ctx);
-      return 5;
-    }
-  return 0;
+	return 0;
 }
 
 static const char *MODULE_NAME = "Jack";
@@ -247,295 +246,295 @@
 static char
 optionIsTrue (const char *optionValue)
 {
-  return (0 == strcasecmp (TRUE_OPTION, optionValue) ||
-	  0 == strcasecmp (YES_OPTION, optionValue)
-	  || 0 == strcmp ("1", 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)
+            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 ());
-
-  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)
-    {
-      options |= JackNoStartServer;
-    }
-  ctx->jack = jack_client_open (ctx->jackClientName, options, &status, NULL);
-  if (status & JackNameNotUnique)
-    {
-      GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-	      ("[Jack] Cannot open connection to jackd as %s since name was not unique.\n",
-	       ctx->jackClientName));
-      Jack_cleanup (ctx);
-      return GF_IO_ERR;
-    }
-
-  if (ctx->jack == NULL)
-    {
-      GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-	      ("[Jack] Cannot open connection to jackd as %s.\n",
-	       ctx->jackClientName));
-      return GF_IO_ERR;
-    }
-  return GF_OK;
+	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 ());
+
+	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)
+	{
+		options |= JackNoStartServer;
+	}
+	ctx->jack = jack_client_open (ctx->jackClientName, options, &status, NULL);
+	if (status & JackNameNotUnique)
+	{
+		GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
+		        ("[Jack] Cannot open connection to jackd as %s since name was not unique.\n",
+		         ctx->jackClientName));
+		Jack_cleanup (ctx);
+		return GF_IO_ERR;
+	}
+
+	if (ctx->jack == NULL)
+	{
+		GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
+		        ("[Jack] Cannot open connection to jackd as %s.\n",
+		         ctx->jackClientName));
+		return GF_IO_ERR;
+	}
+	return GF_OK;
 }
 
 static void
 Jack_Shutdown (GF_AudioOutput * dr)
 {
-  JackContext *ctx = (JackContext *) dr->opaque;
-  Jack_cleanup (ctx);
+	JackContext *ctx = (JackContext *) dr->opaque;
+	Jack_cleanup (ctx);
 }
 
 #define JACK_PORT_NAME_MAX_SZ 128
 
 static GF_Err
 Jack_ConfigureOutput (GF_AudioOutput * dr, u32 * SampleRate, u32 * NbChannels,
-		      u32 * nbBitsPerSample, u32 channel_cfg)
+                      u32 * nbBitsPerSample, u32 channel_cfg)
 {
-  u32 channels;
-  u32 i;
-  char port_name[JACK_PORT_NAME_MAX_SZ];
-  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;
-    }
-  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));
-  if (ctx->jackPorts == NULL)
-    ctx->jackPorts = gf_calloc (ctx->numChannels, sizeof (jack_port_t *));
-  if (ctx->jackPorts == NULL)
-    {
-      goto exit_cleanup;
-    }
-  if (!ctx->isActive)
-    {
-      for (channels = 0; channels < ctx->numChannels; channels++)
+	u32 channels;
+	u32 i;
+	char port_name[JACK_PORT_NAME_MAX_SZ];
+	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;
+	}
+	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));
+	if (ctx->jackPorts == NULL)
+		ctx->jackPorts = gf_calloc (ctx->numChannels, sizeof (jack_port_t *));
+	if (ctx->jackPorts == NULL)
+	{
+		goto exit_cleanup;
+	}
+	if (!ctx->isActive)
 	{
-	  snprintf (port_name, JACK_PORT_NAME_MAX_SZ, "playback_%d",
-		    channels + 1);
-	  ctx->jackPorts[channels] =
-	    jack_port_register (ctx->jack, port_name, JACK_DEFAULT_AUDIO_TYPE,
-				JackPortIsOutput, 0);
-	  if (ctx->jackPorts[channels] == NULL)
-	    goto exit_cleanup;
+		for (channels = 0; channels < ctx->numChannels; channels++)
+		{
+			snprintf (port_name, JACK_PORT_NAME_MAX_SZ, "playback_%d",
+			          channels + 1);
+			ctx->jackPorts[channels] =
+			    jack_port_register (ctx->jack, port_name, JACK_DEFAULT_AUDIO_TYPE,
+			                        JackPortIsOutput, 0);
+			if (ctx->jackPorts[channels] == NULL)
+				goto exit_cleanup;
+		}
+		onBufferSizeChanged (jack_get_buffer_size (ctx->jack), dr);
+		jack_set_buffer_size_callback (ctx->jack, onBufferSizeChanged, dr);
+		jack_set_process_callback (ctx->jack, process_callback, dr);
 	}
-      onBufferSizeChanged (jack_get_buffer_size (ctx->jack), dr);
-      jack_set_buffer_size_callback (ctx->jack, onBufferSizeChanged, dr);
-      jack_set_process_callback (ctx->jack, process_callback, dr);
-    }
-  ctx->currentBlockSize = jack_get_buffer_size (ctx->jack);
-  if (!ctx->isActive)
-    {
-      jack_activate (ctx->jack);
-      if (ctx->autoConnect)
+	ctx->currentBlockSize = jack_get_buffer_size (ctx->jack);
+	if (!ctx->isActive)
 	{
-	  const char **matching_outputs =
-	    jack_get_ports (ctx->jack, NULL, NULL,
-			    JackPortIsInput | JackPortIsPhysical |
-			    JackPortIsTerminal);
-	  if (matching_outputs != NULL)
-	    {
-	      channels = 0;
-	      i = 0;
-	      while (matching_outputs[i] != NULL
-		     && channels < ctx->numChannels)
+		jack_activate (ctx->jack);
+		if (ctx->autoConnect)
 		{
-		  if (!jack_connect (ctx->jack,
-				     jack_port_name (ctx->
-						     jackPorts[channels++]),
-				     matching_outputs[i]))
-		    {
-		      GF_LOG (GF_LOG_INFO, GF_LOG_MMIO,
-			      ("[Jack] Jack_ConfigureOutput: Failed to connect port[%d] to %s.\n",
-			       channels - 1, matching_outputs[i]));
-		    }
-		  i++;
+			const char **matching_outputs =
+			    jack_get_ports (ctx->jack, NULL, NULL,
+			                    JackPortIsInput | JackPortIsPhysical |
+			                    JackPortIsTerminal);
+			if (matching_outputs != NULL)
+			{
+				channels = 0;
+				i = 0;
+				while (matching_outputs[i] != NULL
+				        && channels < ctx->numChannels)
+				{
+					if (!jack_connect (ctx->jack,
+					                   jack_port_name (ctx->
+					                                   jackPorts[channels++]),
+					                   matching_outputs[i]))
+					{
+						GF_LOG (GF_LOG_INFO, GF_LOG_MMIO,
+						        ("[Jack] Jack_ConfigureOutput: Failed to connect port[%d] to %s.\n",
+						         channels - 1, matching_outputs[i]));
+					}
+					i++;
+				}
+			}
 		}
-	    }
+		ctx->isActive = TRUE;
 	}
-      ctx->isActive = TRUE;
-    }
-  return GF_OK;
+	return GF_OK;
 exit_cleanup:
-  Jack_cleanup (ctx);
-  return GF_IO_ERR;
+	Jack_cleanup (ctx);
+	return GF_IO_ERR;
 }
 
 static void
 Jack_SetVolume (GF_AudioOutput * dr, u32 Volume)
 {
-  JackContext *ctx = (JackContext *) dr->opaque;
-  if (ctx == NULL)
-    {
-      return;
-    }
-  /* We support ajust the volume to more than 100, up to +6dB even
-   * if frontends don't support it, it may be useful */
-  if (Volume > 400)
-    Volume = 400;
-  ctx->volume = (float) Volume / 100.0;
-  GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
-	  ("[Jack] Jack_SetVolume: Volume set to %d%%.\n", Volume));
+	JackContext *ctx = (JackContext *) dr->opaque;
+	if (ctx == NULL)
+	{
+		return;
+	}
+	/* We support ajust the volume to more than 100, up to +6dB even
+	 * if frontends don't support it, it may be useful */
+	if (Volume > 400)
+		Volume = 400;
+	ctx->volume = (float) Volume / 100.0;
+	GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
+	        ("[Jack] Jack_SetVolume: Volume set to %d%%.\n", Volume));
 }
 
 static void
 Jack_SetPan (GF_AudioOutput * dr, u32 Pan)
 {
-  GF_LOG (GF_LOG_INFO, GF_LOG_MMIO, ("[Jack] Jack_SetPan: Not supported.\n"));
+	GF_LOG (GF_LOG_INFO, GF_LOG_MMIO, ("[Jack] Jack_SetPan: Not supported.\n"));
 
 }
 
 static void
 Jack_SetPriority (GF_AudioOutput * dr, u32 Priority)
 {
-  /**
-   * Jack manages the priority itself, we don't need
-   * to interfere here...
-   */
+	/**
+	 * Jack manages the priority itself, we don't need
+	 * to interfere here...
+	 */
 }
 
 static u32
 Jack_GetAudioDelay (GF_AudioOutput * dr)
 {
-  jack_nframes_t max = 0;
-  jack_nframes_t latency;
-  u32 channel;
-  JackContext *ctx = (JackContext *) dr->opaque;
-  if (ctx == NULL)
-    {
-      return 0;
-    }
-  jack_recompute_total_latencies (ctx->jack);
-  for (channel = 0; channel < ctx->numChannels; channel++)
-    {
-      latency =
-	jack_port_get_total_latency (ctx->jack, ctx->jackPorts[channel]);
-      if (latency > max)
-	max = latency;
-    }
-  channel = max * 1000 / jack_get_sample_rate (ctx->jack);
-  GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
-	  ("[Jack] Jack_GetAudioDelay latency = %d ms.\n", channel));
-  return channel;
+	jack_nframes_t max = 0;
+	jack_nframes_t latency;
+	u32 channel;
+	JackContext *ctx = (JackContext *) dr->opaque;
+	if (ctx == NULL)
+	{
+		return 0;
+	}
+	jack_recompute_total_latencies (ctx->jack);
+	for (channel = 0; channel < ctx->numChannels; channel++)
+	{
+		latency =
+		    jack_port_get_total_latency (ctx->jack, ctx->jackPorts[channel]);
+		if (latency > max)
+			max = latency;
+	}
+	channel = max * 1000 / jack_get_sample_rate (ctx->jack);
+	GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
+	        ("[Jack] Jack_GetAudioDelay latency = %d ms.\n", channel));
+	return channel;
 }
 
 static GF_Err
 Jack_QueryOutputSampleRate (GF_AudioOutput * dr, u32 * desired_sr,
-			    u32 * NbChannels, u32 * nbBitsPerSample)
+                            u32 * NbChannels, u32 * nbBitsPerSample)
 {
-  JackContext *ctx = (JackContext *) dr->opaque;
-  if (!ctx)
-    return GF_IO_ERR;
-  *desired_sr = jack_get_sample_rate (ctx->jack);
-  *NbChannels = 2;
-  GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
-	  ("[Jack] Jack output sample rate %d\n", *desired_sr));
-  return GF_OK;
+	JackContext *ctx = (JackContext *) dr->opaque;
+	if (!ctx)
+		return GF_IO_ERR;
+	*desired_sr = jack_get_sample_rate (ctx->jack);
+	*NbChannels = 2;
+	GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
+	        ("[Jack] Jack output sample rate %d\n", *desired_sr));
+	return GF_OK;
 }
 
 void *
 NewJackOutput ()
 {
-  JackContext *ctx;
-  GF_AudioOutput *driv;
-  GF_SAFEALLOC (ctx, JackContext);
-  if (!ctx)
-    return NULL;
-  GF_SAFEALLOC (driv, GF_AudioOutput);
-  if (!driv)
-    {
-      gf_free(ctx);
-      return NULL;
-    }
-  driv->opaque = ctx;
-  driv->SelfThreaded = 1;
-  driv->Setup = Jack_Setup;
-  driv->Shutdown = Jack_Shutdown;
-  driv->ConfigureOutput = Jack_ConfigureOutput;
-  driv->GetAudioDelay = Jack_GetAudioDelay;
-  driv->SetVolume = Jack_SetVolume;
-  driv->SetPan = Jack_SetPan;
-  driv->SetPriority = Jack_SetPriority;
-  driv->QueryOutputSampleRate = Jack_QueryOutputSampleRate;
-
-  ctx->jack = NULL;
-  ctx->numChannels = 0;
-  ctx->jackPorts = NULL;
-  ctx->currentBlockSize = 0;
-  ctx->numChannels = 0;
-  ctx->buffer = NULL;
-  ctx->bufferSz = 0;
-  ctx->bytesPerSample = 0;
-  ctx->isActive = FALSE;
-  ctx->autoConnect = FALSE;
-  ctx->autoStartJackd = FALSE;
-  ctx->volume = 1.0;
-
-  GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE,
-				"Jack Audio Output", "gpac distribution");
-  return driv;
+	JackContext *ctx;
+	GF_AudioOutput *driv;
+	GF_SAFEALLOC (ctx, JackContext);
+	if (!ctx)
+		return NULL;
+	GF_SAFEALLOC (driv, GF_AudioOutput);
+	if (!driv)
+	{
+		gf_free(ctx);
+		return NULL;
+	}
+	driv->opaque = ctx;
+	driv->SelfThreaded = 1;
+	driv->Setup = Jack_Setup;
+	driv->Shutdown = Jack_Shutdown;
+	driv->ConfigureOutput = Jack_ConfigureOutput;
+	driv->GetAudioDelay = Jack_GetAudioDelay;
+	driv->SetVolume = Jack_SetVolume;
+	driv->SetPan = Jack_SetPan;
+	driv->SetPriority = Jack_SetPriority;
+	driv->QueryOutputSampleRate = Jack_QueryOutputSampleRate;
+
+	ctx->jack = NULL;
+	ctx->numChannels = 0;
+	ctx->jackPorts = NULL;
+	ctx->currentBlockSize = 0;
+	ctx->numChannels = 0;
+	ctx->buffer = NULL;
+	ctx->bufferSz = 0;
+	ctx->bytesPerSample = 0;
+	ctx->isActive = FALSE;
+	ctx->autoConnect = FALSE;
+	ctx->autoStartJackd = FALSE;
+	ctx->volume = 1.0;
+
+	GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE,
+	                              "Jack Audio Output", "gpac distribution");
+	return driv;
 }
 
 void
 DeleteJackOutput (void *ifce)
 {
-  GF_AudioOutput *dr = (GF_AudioOutput *) ifce;
-  JackContext *ctx = (JackContext *) dr->opaque;
-  Jack_cleanup (ctx);
-  gf_free(ctx);
-  dr->opaque = NULL;
-  gf_free(dr);
+	GF_AudioOutput *dr = (GF_AudioOutput *) ifce;
+	JackContext *ctx = (JackContext *) dr->opaque;
+	Jack_cleanup (ctx);
+	gf_free(ctx);
+	dr->opaque = NULL;
+	gf_free(dr);
 }
 
 /*
@@ -556,18 +555,18 @@
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface (u32 InterfaceType)
 {
-  if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
-    {
-      return NewJackOutput ();
-    }
-  return NULL;
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
+	{
+		return NewJackOutput ();
+	}
+	return NULL;
 }
 
 GPAC_MODULE_EXPORT
 void ShutdownInterface (GF_BaseInterface * ifce)
 {
-  if (ifce->InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
-    DeleteJackOutput ((GF_AudioOutput *) ifce);
+	if (ifce->InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
+		DeleteJackOutput ((GF_AudioOutput *) ifce);
 }
 
-GPAC_MODULE_STATIC_DELARATION( jack )
+GPAC_MODULE_STATIC_DECLARATION( jack )

gpac-0.5.0.svn5178.tar.bz2/modules/laser_dec/laser_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/laser_dec/laser_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -93,7 +93,7 @@
 }
 
 static GF_Err LSR_ProcessData(GF_SceneDecoder*plug, const char *inBuffer, u32 inBufferLength,
-								u16 ES_ID, u32 AU_time, u32 mmlevel)
+                              u16 ES_ID, u32 AU_time, u32 mmlevel)
 {
 	GF_Err e = GF_OK;
 	LSRPriv *priv = (LSRPriv *)plug->privateStack;
@@ -118,17 +118,17 @@
 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;
-        }
+	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);
 }
 
@@ -195,4 +195,4 @@
 }
 
 
-GPAC_MODULE_STATIC_DELARATION( laser )
+GPAC_MODULE_STATIC_DECLARATION( laser )

gpac-0.5.0.svn5178.tar.bz2/modules/libplayer/libplayer.c -> gpac-0.5.1.svn5491.tar.xz/modules/libplayer/libplayer.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -45,12 +45,12 @@
 
 #endif
 
-// variable used to detect the number of libplayer instances created - up to 2 instances  
+// variable used to detect the number of libplayer instances created - up to 2 instances
 static int libplayer_id = 0;
-//! unfortunately, saving data would not be a good solution for Mosaic Mode in ESG Application since the position changes everytime user 
+//! unfortunately, saving data would not be a good solution for Mosaic Mode in ESG Application since the position changes everytime user
 //! uses the navigation button
-// value for input output windows, when save_data_instance1 equals to 1 <=> the second instance is already created with the correct size, 
-// save these values in in_instance1 and out_instance1 so that we do not need to recalculate every time  
+// value for input output windows, when save_data_instance1 equals to 1 <=> the second instance is already created with the correct size,
+// save these values in in_instance1 and out_instance1 so that we do not need to recalculate every time
 //~ static video_rect_t in_instance1, out_instance1;
 //~ static save_data_instance1 = 0;
 
@@ -74,7 +74,7 @@
 	u32 player_type;
 	u32 width;
 	u32 height;
-    char *url;
+	char *url;
 #ifndef TEST_LIBPLAYER
 	player_t *player;
 #endif
@@ -83,35 +83,35 @@
 
 
 static const char * LIBPLAYER_MIME_TYPES[] = {
-  "video/x-mpeg", "mpg mpeg mp2 mpa mpe mpv2 ts", "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",
-  "video/mp4", "mp4", "MPEG-4 Movie",
-  "video/quicktime", "mov qt", "QuickTime Movies",
-  "video/webm", "webm", "Google WebM Movies",
-  "audio/webm", "webm", "Google WebM Music",
-    NULL
+	"video/x-mpeg", "mpg mpeg mp2 mpa mpe mpv2 ts", "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",
+	"video/mp4", "mp4", "MPEG-4 Movie",
+	"video/quicktime", "mov qt", "QuickTime Movies",
+	"video/webm", "webm", "Google WebM Movies",
+	"audio/webm", "webm", "Google WebM Music",
+	NULL
 };
 
 
-static u32 LIBPLAYER_RegisterMimeTypes(const GF_InputService *plug){
-    u32 i;
-    if (!plug)
-      return 0;
-    for (i = 0 ; LIBPLAYER_MIME_TYPES[i] ; i+=3)
-      gf_term_register_mime_type(plug, LIBPLAYER_MIME_TYPES[i], LIBPLAYER_MIME_TYPES[i+1], LIBPLAYER_MIME_TYPES[i+2]);
-    return i / 3;
+static u32 LIBPLAYER_RegisterMimeTypes(const GF_InputService *plug) {
+	u32 i;
+	if (!plug)
+		return 0;
+	for (i = 0 ; LIBPLAYER_MIME_TYPES[i] ; i+=3)
+		gf_service_register_mime(plug, LIBPLAYER_MIME_TYPES[i], LIBPLAYER_MIME_TYPES[i+1], LIBPLAYER_MIME_TYPES[i+2]);
+	return i / 3;
 }
 
 Bool LIBPLAYER_CanHandleURL(GF_InputService *plug, const char *url)
@@ -139,7 +139,7 @@
 		if (cgi_par) cgi_par[0] = '?';
 		if (ok) return 1;
 	}
-	
+
 	return 0;
 }
 
@@ -153,18 +153,18 @@
 	case PLAYER_EVENT_PLAYBACK_FINISHED:
 		player_playback_stop(data);
 		player_playback_start(data);
-	  break;
-    case PLAYER_EVENT_FE_HAS_LOCK:
-      break;
-    case PLAYER_EVENT_FE_TIMEDOUT:
-      break;
-    case PLAYER_EVENT_VIDEO_PICTURE:
-	  break;
-    default:
-      break;
-  }
-
-  return 0;
+		break;
+	case PLAYER_EVENT_FE_HAS_LOCK:
+		break;
+	case PLAYER_EVENT_FE_TIMEDOUT:
+		break;
+	case PLAYER_EVENT_VIDEO_PICTURE:
+		break;
+	default:
+		break;
+	}
+
+	return 0;
 }
 
 
@@ -179,11 +179,11 @@
 #endif
 
 	GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[LibPlayerIN] Connecting\n"));
-	
+
 	if (!read || !serv || !url) return GF_BAD_PARAM;
 
 	if (!strnicmp(url, "libplayer://", 12)) url+=12;
-  
+
 	if (!read->init) {
 		read->init=1;
 		/* libplayer init with default width/height */
@@ -192,30 +192,30 @@
 		read->url = url;
 		read->player_id = libplayer_id;
 		read->player_type = PLAYER_FILE;
-		
+
 #ifndef TEST_LIBPLAYER
 		read->player = player_init(PLAYER_TYPE_DUMMY, PLAYER_AO_AUTO, PLAYER_VO_AUTO, PLAYER_MSG_INFO, read->player_id, on_libplayer_event);
-		
+
 		if (!read->player) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[LibPlayerIN] Failed to instanciate libplayer instance %d\n", read->player_id));
-			gf_term_on_connect(serv, NULL, GF_REMOTE_SERVICE_ERROR);
+			gf_service_connect_ack(serv, NULL, GF_REMOTE_SERVICE_ERROR);
 			return GF_OK;
 		}
 #endif
 		libplayer_id++;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIN] Opening URL %s for Player instance %d\n", url, read->player_id));
 	}
-	
+
 #ifndef TEST_LIBPLAYER
 	mrl = NULL;
-	
-	// dvb 
+
+	// dvb
 	if (!strnicmp(url, "dvb://", 6)) {
 		read->player_type = PLAYER_DVB;
 		mrl_resource_dvb_args_t *mrl_dvb_args;
 		mrl_dvb_args = calloc(1, sizeof(mrl_resource_dvb_args_t));
 		char *frequency;
-		
+
 		// fetch frequency
 		if (frequency = strchr(url+6, '@')) {
 			char *enc, *pid;
@@ -235,15 +235,15 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[LibPlayerIN] Unknown video encoding\n"));
 				mrl_dvb_args->video_enc = PLAYER_VIDEO_UNKNOWN;
 			}
-			
+
 			// video PID
 			if (mrl_dvb_args->video_enc != PLAYER_VIDEO_UNKNOWN) {
 				pid = strchr(enc, ':');
 				mrl_dvb_args->video_pid = atoi(pid+1);
 			}
-			
+
 			/*
-			 * audio 
+			 * audio
 			 */
 			// audio codec
 			if (enc = strstr(url+6, "mp2")) {
@@ -256,13 +256,13 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[LibPlayerIN] Unknown audio encoding\n"));
 				mrl_dvb_args->audio_enc = PLAYER_AUDIO_UNKNOWN;
 			}
-			
+
 			// audio PID
 			if (mrl_dvb_args->audio_enc != PLAYER_AUDIO_UNKNOWN) {
 				pid = strchr(enc, ':');
 				mrl_dvb_args->audio_pid = atoi(pid+1);
 			}
-			
+
 			if (mrl_dvb_args->video_enc == PLAYER_VIDEO_UNKNOWN && mrl_dvb_args->audio_enc == PLAYER_AUDIO_UNKNOWN) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[LibPlayerIN] Unknown video and audio encoding\n"));
 				free(mrl_dvb_args);
@@ -275,12 +275,12 @@
 			return GF_BAD_PARAM;
 		}
 
-		// player instance 1 has not starter yet in dvb case <=> player instance 1 is not created yet 
+		// player instance 1 has not starter yet in dvb case <=> player instance 1 is not created yet
 		if (start_dvb == 0) {
 			mrl = mrl_new(read->player, MRL_RESOURCE_DVB, mrl_dvb_args);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIN] MRL created for DVB\n"));
-		
-		// player has already started, zapping case, make sure the player is not recreated
+
+			// player has already started, zapping case, make sure the player is not recreated
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIN] Starting DVB PES filtering\n"));
 			player_dvb_pes_filter_start(read->player, mrl_dvb_args->video_enc, mrl_dvb_args->video_pid, mrl_dvb_args->audio_enc, mrl_dvb_args->audio_pid);
@@ -296,17 +296,17 @@
 			mrl_args->location = strdup(url);
 		}
 		mrl = mrl_new (read->player, MRL_RESOURCE_FILE, mrl_args);
-		
+
 	}
 
 	// only for DVB case to make sure player is only set once
 	if (start_dvb == 0) {
 		if (!mrl) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[LibPlayerIN] Failed to create MRL for url %s\n", url));
-			gf_term_on_connect(serv, NULL, GF_URL_ERROR);
+			gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
 			return GF_OK;
 		}
-		
+
 		player_mrl_set(read->player, mrl);
 	}
 
@@ -315,7 +315,7 @@
 	read->service = serv;
 
 	/*ACK connection is OK*/
-	gf_term_on_connect(serv, NULL, GF_OK);
+	gf_service_connect_ack(serv, NULL, GF_OK);
 
 
 	/*setup LIBPLAYER object descriptor*/
@@ -334,7 +334,7 @@
 #endif
 
 		gf_list_add(od->ESDescriptors, esd);
-		gf_term_add_media(read->service, (GF_Descriptor*)od, 0);
+		gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
 	}
 
 	return GF_OK;
@@ -343,9 +343,9 @@
 GF_Err LIBPLAYER_CloseService(GF_InputService *plug)
 {
 	LibPlayerIn *read = (LibPlayerIn *) plug->priv;
-	
+
 #ifndef TEST_LIBPLAYER
-	// only disconnect if 
+	// only disconnect if
 	if (read->player_type == PLAYER_FILE) {
 		player_playback_stop(read->player);
 		fprintf(stderr, "[LibPlayerIN]player_playback_stop for instance %d\n", read->player_id);
@@ -353,15 +353,15 @@
 		fprintf(stderr, "[LibPlayerIN]player_uninit for instance %d\n", read->player_id);
 		read->player = NULL;
 		libplayer_id--;
-		
+
 		read->state = 0;
 
-		gf_term_on_disconnect(read->service, NULL, GF_OK);
+		gf_service_disconnect_ack(read->service, NULL, GF_OK);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIn] Closing libplayer instance %d\n", read->player_id));
-		
-		
-	
-	// channel zapping dvb case, don't disconnect service
+
+
+
+		// channel zapping dvb case, don't disconnect service
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIn] Don't close service libplayer instance %d, use this instance for channel zapping\n", read->player_id));
 	}
@@ -387,12 +387,15 @@
 	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) 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_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_SET_PADDING:
+		return GF_OK;
 	case GF_NET_CHAN_BUFFER:
- 		return GF_OK; 
+		return GF_OK;
 		com->buffer.max = com->buffer.min = 0;
 		return GF_OK;
 	case GF_NET_CHAN_DURATION:
@@ -404,25 +407,25 @@
 #ifndef TEST_LIBPLAYER
 			if ((read->player_id == 0) && (read->player_type == PLAYER_DVB) && (start_dvb == 1)) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIN] Instance %d has already started, zapping mode\n", read->player_id));
-			
+
 			} else {
 				player_playback_start(read->player);
 				if ((read->player_id == 0) && (read->player_type == PLAYER_DVB)) {
 					start_dvb = 1;
 				}
-				
+
 				read->state = 1;
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIN] Starting playback for instance %d\n", read->player_id));
 			}
 #endif
 		}
-		
+
 		return GF_OK;
 	case GF_NET_CHAN_STOP:
 		if (read->state==1) {
 #ifndef TEST_LIBPLAYER
 			// channel zapping, don't stop channel
-            if ((read->player_id == 0) && (read->player_type == PLAYER_DVB) && (start_dvb = 1)) {
+			if ((read->player_id == 0) && (read->player_type == PLAYER_DVB) && (start_dvb = 1)) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIN] Instance %d is in zapping mode, don't stop channel\n", read->player_id));
 			} else {
 				player_playback_stop(read->player);
@@ -432,7 +435,8 @@
 #endif
 		}
 		return GF_OK;
-	case GF_NET_CHAN_CONFIG:  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;
@@ -448,9 +452,9 @@
 	sscanf(url, "ES_ID=%ud", &ESID);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIN] instance %d connect channel %d\n", read->player_id, ESID));
 	if (ESID != 1+read->player_id) {
-		gf_term_on_connect(read->service, channel, GF_STREAM_NOT_FOUND);
+		gf_service_connect_ack(read->service, channel, GF_STREAM_NOT_FOUND);
 	} else {
-		gf_term_on_connect(read->service, channel, GF_OK);
+		gf_service_connect_ack(read->service, channel, GF_OK);
 	}
 	return GF_OK;
 }
@@ -459,7 +463,7 @@
 {
 	LibPlayerIn *read = (LibPlayerIn *) plug->priv;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerIN] instance %d disconnect channel\n", read->player_id));
-	gf_term_on_disconnect(read->service, channel, GF_OK);
+	gf_service_disconnect_ack(read->service, channel, GF_OK);
 	return GF_OK;
 }
 
@@ -533,23 +537,23 @@
 	video_rect_t in, out;
 	LibPlayerIn *read = dec->privateStack;
 	u32 width, height;
-	
+
 	if (!read) return GF_OK;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerDEC] Control instance %d\n",read->player_id));
-	//! unfortunately, saving data would not be a good solution for Mosaic Mode in ESG Application since the position changes everytime user 
+	//! unfortunately, saving data would not be a good solution for Mosaic Mode in ESG Application since the position changes everytime user
 	//! uses the navigation button
 	//~ if (read->player_id == 1 && save_data_instance1 == 1) {
-		//~ fprintf(stderr, "in here for save data instance\n");
-		//~ player_video_io_windows_set(read->player, &in_instance1, &out_instance1);
-		//~ 
-		//~ return GF_OK;
-		//~ 
+	//~ fprintf(stderr, "in here for save data instance\n");
+	//~ player_video_io_windows_set(read->player, &in_instance1, &out_instance1);
+	//~
+	//~ return GF_OK;
+	//~
 	//~ } else {
 	width = mrl_get_property(read->player, NULL, MRL_PROPERTY_VIDEO_WIDTH);
 	height = mrl_get_property(read->player, NULL, MRL_PROPERTY_VIDEO_HEIGHT);
 	//~ }
 
-	
+
 
 	if((width != read->width) || (height != read->height))	{
 		fprintf(stderr, "in here for video size changed\t");
@@ -561,7 +565,7 @@
 		}
 		return GF_BUFFER_TOO_SMALL;
 	}
-	
+
 	in.x = src->x;
 	in.y = src->y;
 	in.w = src->w;
@@ -571,20 +575,20 @@
 	out.w = dst->w;
 	out.h = dst->h;
 	player_video_io_windows_set(read->player, &in, &out);
-	
-	//! unfortunately, saving data would not be a good solution for Mosaic Mode in ESG Application since the position changes everytime user 
+
+	//! unfortunately, saving data would not be a good solution for Mosaic Mode in ESG Application since the position changes everytime user
 	//! uses the navigation button
 	//~ if (read->player_id == 1) {
-		//~ in_instance1 = in;
+	//~ in_instance1 = in;
 	//~ //	//~ out_instance1.w = out.w;
 	//~ //	//~ out_instance1.h = out.h;
-		//~ out_instance1 = out;
-		//~ save_data_instance1 = 1;
+	//~ out_instance1 = out;
+	//~ save_data_instance1 = 1;
 	//~ }
-	//~ 
-	
+	//~
+
 #endif
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[LibPlayerDEC] Repositioning video src %d %d %d %d - dest %d %d %d %d\n", src->x, src->y, src->w, src->h, dst->x, dst->y, dst->w, dst->h) );
 	return GF_OK;
 }
@@ -657,4 +661,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( libplayer )
+GPAC_MODULE_STATIC_DECLARATION( libplayer )

gpac-0.5.0.svn5178.tar.bz2/modules/modules_export.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/modules_export.cpp Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
- *  This file is part of GPAC 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */

gpac-0.5.0.svn5178.tar.bz2/modules/mp3_in/mad_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/mp3_in/mad_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -199,12 +199,12 @@
 	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,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+                              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;
@@ -267,7 +267,7 @@
 
 	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);
+		memmove(ctx->buffer, ctx->stream.next_frame, ctx->len);
 	}
 
 
@@ -304,7 +304,7 @@
 static const char *MAD_GetCodecName(GF_BaseDecoder *dec)
 {
 	return "MAD " \
-		MAD_VERSION;
+	       MAD_VERSION;
 }
 
 static u32 MAD_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
@@ -351,22 +351,22 @@
 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 = 0;
-          ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
-          ctx->num_channels = 0;
-          gf_free(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 = 0;
+		ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
+		ctx->num_channels = 0;
+		gf_free(ctx);
 	}
-        gf_free(ifcg);
+	gf_free(ifcg);
 }
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/mp3_in/mp3_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/mp3_in/mp3_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -79,24 +79,24 @@
 
 static u32 MP3_RegisterMimeTypes(const GF_InputService *plug)
 {
-  u32 i;
-  for (i =0 ; MP3_MIME_TYPES[i] ; i++)
-	gf_term_register_mime_type(plug, MP3_MIME_TYPES[i], MP3_EXTENSIONS, MP3_DESC);
-  return i;
+	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 0;
+	if (!plug || !url)
+		return 0;
 	sExt = strrchr(url, '.');
 	if (!strnicmp(url, "rtsp://", 7)) return 0;
 	{
-	  u32 i;
-	  for (i =0 ; MP3_MIME_TYPES[i] ; i++)
-	    if (gf_term_check_extension(plug, MP3_MIME_TYPES[i], MP3_EXTENSIONS, MP3_DESC, sExt))
-	      return 1;
+		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 1;
 	}
 	return 0;
 }
@@ -127,7 +127,7 @@
 		od->objectDescriptorID = 1;
 		esd = MP3_GetESD(read);
 		gf_list_add(od->ESDescriptors, esd);
-		gf_term_add_media(read->service, (GF_Descriptor*)od, 0);
+		gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
 	}
 }
 
@@ -143,17 +143,17 @@
 	u64 pos;
 	if (!read->stream) return 0;
 	/* ID3VVFFFFSIZE = 13bytes
-         * ID3 string
+	     * ID3 string
 	 * VV = Version
-         * F = Flags
-         * SIZE = 32bits size with first Most Significant bit set to 0 -> 28 bits
+	     * 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){
+	if (pos == 10) {
 		/* Did we read an ID3v2 ? */
-		if (id3v2[0] == 'I' && id3v2[1] == 'D' && id3v2[2] == '3'){
+		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;
@@ -194,7 +194,7 @@
 	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
 	com.base.on_channel = read->ch;
 	while (read->ch) {
-		gf_term_on_command(read->service, &com, GF_OK);
+		gf_service_command(read->service, &com, GF_OK);
 		if (com.buffer.occupancy < com.buffer.max) break;
 		gf_sleep(2);
 	}
@@ -214,7 +214,7 @@
 		memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
 
 		read->needs_connection = 0;
-		gf_term_on_connect(read->service, NULL, GF_OK);
+		gf_service_connect_ack(read->service, NULL, GF_OK);
 		mp3_setup_object(read);
 	}
 	if (!data_size) return;
@@ -250,7 +250,7 @@
 		read->sl_hdr.AU_sequenceNumber++;
 		read->sl_hdr.compositionTimeStampFlag = 1;
 		read->sl_hdr.compositionTimeStamp += gf_mp3_window_size(hdr);
-		gf_term_on_sl_packet(read->service, read->ch, data + pos, size, &read->sl_hdr, GF_OK);
+		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;
@@ -292,13 +292,13 @@
 				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;
+					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 (!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;
@@ -307,12 +307,12 @@
 			}
 
 			com.base.command_type = GF_NET_SERVICE_INFO;
-			gf_term_on_command(read->service, &com, GF_OK);
+			gf_service_command(read->service, &com, GF_OK);
 		}
 		return;
 	} else {
 		/*handle service message*/
-		gf_term_download_update_stats(read->dnload);
+		gf_service_download_update_stats(read->dnload);
 		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) return;
 	}
 
@@ -323,12 +323,12 @@
 		}
 		/*looks like a live stream*/
 		if (read->is_live) {
-		  if (read->liveDataCopySize < param->size){
-		      read->liveDataCopy = 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->liveDataCopySize < param->size) {
+				read->liveDataCopy = 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;
@@ -363,7 +363,7 @@
 	/*OK confirm*/
 	if (read->needs_connection) {
 		read->needs_connection = 0;
-		gf_term_on_connect(read->service, NULL, e);
+		gf_service_connect_ack(read->service, NULL, e);
 		if (!e) mp3_setup_object(read);
 	}
 }
@@ -374,10 +374,10 @@
 
 	read->needs_connection = 1;
 
-	read->dnload = gf_term_download_new(read->service, url, 0, MP3_NetIO, read);
+	read->dnload = gf_service_download_new(read->service, url, 0, MP3_NetIO, read);
 	if (!read->dnload) {
 		read->needs_connection = 0;
-		gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(read->dnload);
@@ -395,7 +395,7 @@
 	MP3Reader *read = plug->priv;
 	read->service = serv;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	strcpy(szURL, url);
@@ -418,7 +418,7 @@
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
 	}
-	gf_term_on_connect(serv, NULL, reply);
+	gf_service_connect_ack(serv, NULL, reply);
 	if (!reply) mp3_setup_object(read);
 	return GF_OK;
 }
@@ -429,26 +429,26 @@
 	if (read->stream) fclose(read->stream);
 	read->stream = NULL;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	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->liveDataCopy) {
+		gf_free(read->liveDataCopy);
+		read->liveDataCopy = NULL;
+		read->liveDataCopySize = 0;
 	}
 	if (read->icy_name)
-	  gf_free(read->icy_name);
+		gf_free(read->icy_name);
 	read->icy_name = NULL;
 	if (read->icy_genre)
-	  gf_free(read->icy_genre);
+		gf_free(read->icy_genre);
 	read->icy_genre = NULL;
 	if (read->icy_track_name)
-	  gf_free(read->icy_track_name);
+		gf_free(read->icy_track_name);
 	read->icy_track_name = NULL;
-	gf_term_on_disconnect(read->service, NULL, GF_OK);
+	gf_service_disconnect_ack(read->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -493,7 +493,7 @@
 	}
 
 exit:
-	gf_term_on_connect(read->service, channel, e);
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -507,7 +507,7 @@
 		read->data = NULL;
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(read->service, channel, e);
+	gf_service_disconnect_ack(read->service, channel, e);
 	return GF_OK;
 }
 
@@ -564,7 +564,7 @@
 					rcfg.base.command_type = GF_NET_CHAN_DURATION;
 					rcfg.duration.duration = read->duration;
 					rcfg.duration.duration /= read->sample_rate;
-					gf_term_on_command(read->service, &rcfg, GF_OK);
+					gf_service_command(read->service, &rcfg, GF_OK);
 				}
 			}
 		}
@@ -778,4 +778,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( mp3_in )
+GPAC_MODULE_STATIC_DECLARATION( mp3_in )

gpac-0.5.0.svn5178.tar.bz2/modules/mpd_in/mpd_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/mpd_in/mpd_in.c Changed

@@ -30,28 +30,42 @@
 #include <gpac/dash.h>
 #include <gpac/internal/terminal_dev.h>
 
-typedef struct __mpd_module 
+typedef enum
 {
-    /* GPAC Service object (i.e. how this module is seen by the terminal)*/
-    GF_ClientService *service;
+	MPDIN_BUFFER_NONE=0,
+	MPDIN_BUFFER_MIN=1,
+	MPDIN_BUFFER_SEGMENTS=2
+} MpdInBuffer;
+
+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;
 
+	GF_DashClient *dash;
+	Bool closed;
 	/*interface to mpd parser*/
 	GF_DASHFileIO dash_io;
 
 	Bool connection_ack_sent;
 	Bool in_seek;
 	Bool memory_storage;
-	Bool use_max_res, immediate_switch, allow_http_abort, enable_buffering;
+	Bool use_max_res, immediate_switch, allow_http_abort;
 	u32 use_low_latency;
+	MpdInBuffer buffer_mode;
 	Double previous_start_range;
 	/*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 
+typedef struct
 {
 	GF_MPD_In *mpdin;
 	GF_InputService *segment_ifce;
@@ -61,6 +75,10 @@
 	Bool has_new_data;
 	u32 idx;
 	GF_DownloadSession *sess;
+	Bool in_seek, is_timestamp_based, pto_setup;
+	u32 timescale;
+	s64 pto;
+	s64 max_cts_in_period;
 } GF_MPDGroup;
 
 const char * MPD_MPD_DESC = "MPEG-DASH Streaming";
@@ -70,35 +88,145 @@
 
 static u32 MPD_RegisterMimeTypes(const GF_InputService *plug)
 {
-    u32 i, c;
-    for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i]; i++)
-        gf_term_register_mime_type (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_term_register_mime_type(plug, GF_DASH_M3U8_MIME_TYPES[i], MPD_M3U8_EXT, MPD_M3U8_DESC);
-    return c+i;
+	u32 i, c;
+	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);
+	return c+i;
 }
 
 Bool MPD_CanHandleURL(GF_InputService *plug, const char *url)
 {
-    u32 i;
+	u32 i;
 	char *sExt;
-    if (!plug || !url)
-      return 0;
-    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_term_check_extension(plug, GF_DASH_MPD_MIME_TYPES[i], MPD_MPD_EXT, MPD_MPD_DESC, sExt))
-            return 1;
-    }
-    for (i = 0 ; GF_DASH_M3U8_MIME_TYPES[i]; i++) {
-        if (gf_term_check_extension(plug, GF_DASH_M3U8_MIME_TYPES[i], MPD_M3U8_EXT, MPD_M3U8_DESC, sExt))
-            return 1;
-    }
+	if (!plug || !url)
+		return 0;
+	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 1;
+	}
+	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 1;
+	}
 
 	return gf_dash_check_mpd_root_type(url);
 }
 
+
+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;
+	GF_MPD_In *mpdin = (GF_MPD_In*) service->ifce->priv;
+	GF_Channel *ch;
+	GF_MPDGroup *group;
+	Bool do_map_time = 0;
+	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);
+
+	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);
+	//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;
+			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 != ch->esd->slConfig->timestampResolution)) {
+				group->pto *= ch->esd->slConfig->timestampResolution;
+				group->pto /= group->timescale;
+			}
+			scale = ch->esd->slConfig->timestampResolution;
+			scale /= 1000;
+			dur = (u64) (scale * gf_dash_get_period_duration(mpdin->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(mpdin->dash) );
+			group->pto -= start;
+		}
+		//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 ((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 CTS to 0\n", hdr->compositionTimeStamp, group->pto));
+			hdr->decodingTimeStamp = 0;
+        }
+		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;
+        }
+	} else if (!group->pto_setup) {
+		do_map_time = 1;
+		group->pto_setup = 1;
+	}
+
+	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;
@@ -114,25 +242,26 @@
 	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;
+	if (!param || !ifce || !ifce->proxy_udta) return GF_BAD_PARAM;
+
+	mpdin->in_seek = 0;
 
 	/*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;
-		
-		mpdin->in_seek = 0;
 
 		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
 			GF_MPDGroup *group;
-			if (!gf_dash_is_group_selected(mpdin->dash, i)) continue;
+			if (!gf_dash_is_group_selectable(mpdin->dash, i)) continue;
 			group = gf_dash_get_group_udta(mpdin->dash, i);
 			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;
 				return GF_OK;
 			}
-		}		
+		}
 		return GF_SERVICE_ERROR;
 	}
 
@@ -145,17 +274,12 @@
 		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();
+		u32 timer = gf_sys_clock();
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Query Next request from input service %s\n", ifce->module_name));
 
 
 		param->url_query.current_download = 0;
 		param->url_query.discontinuity_type = 0;
-		if (mpdin->in_seek) {
-			mpdin->in_seek = 0;
-			param->url_query.discontinuity_type = 2;
-			discard_first_cache_entry = 0;
-		}
 
 		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
 			if (!gf_dash_is_group_selected(mpdin->dash, i)) continue;
@@ -165,11 +289,18 @@
 				break;
 			}
 			group=NULL;
-		}		
-		
+		}
+
 		if (!group) {
 			return GF_SERVICE_ERROR;
 		}
+
+		if (group->in_seek) {
+			group->in_seek = 0;
+			param->url_query.discontinuity_type = 2;
+			discard_first_cache_entry = 0;
+		}
+
 		//update group idx
 		if (group->idx != group_idx) {
 			group->idx = group_idx;
@@ -184,24 +315,28 @@
 		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) 
+			if (nb_segments_cached>=1)
 				break;
 
 			if (group_done) {
 				if (!gf_dash_get_period_switch_status(mpdin->dash) && !gf_dash_in_last_period(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;
-					while (gf_dash_get_period_switch_status(mpdin->dash) != 1) {
-						gf_term_on_command(mpdin->service, &com, GF_OK);
+					if (gf_dash_get_period_switch_status(mpdin->dash) != 1) {
+						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;
 							gf_dash_request_period_switch(mpdin->dash);
-							break;
 						}
-						gf_sleep(30);
 					}
-				} 
-				return GF_EOS;
+					if (param->url_query.in_end_of_period)
+						return GF_BUFFER_TOO_SMALL;
+				} else {
+					return GF_EOS;
+				}
 			}
 
 			if (check_current_download && mpdin->use_low_latency) {
@@ -217,48 +352,48 @@
 					group->has_new_data = 0;
 					return GF_OK;
 				}
-	            return GF_BUFFER_TOO_SMALL;
+				return GF_BUFFER_TOO_SMALL;
 			}
-            return GF_BUFFER_TOO_SMALL;
-        }
-	
+			return GF_BUFFER_TOO_SMALL;
+		}
+
 		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)));
-        }
+		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);
+		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);
 		if (e)
 			return e;
 
 		if (gf_dash_group_loop_detected(mpdin->dash, group_idx))
 			param->url_query.discontinuity_type = 2;
 
-		
-#ifndef GPAC_DISABLE_LOG		
+
+#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));
-            }
+			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_INFO, 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));
+				GF_LOG(GF_LOG_INFO, 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_INFO, GF_LOG_DASH, ("[MPD_IN] Next Segment is %s\n", src_url));
+				GF_LOG(GF_LOG_INFO, 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
-    }
+	}
 
 
-    return GF_OK;
+	return GF_OK;
 }
 
 /*locates input service (demuxer) based on mime type or segment name*/
@@ -266,7 +401,7 @@
 {
 	GF_InputService *segment_ifce;
 	u32 i;
-    const char *sPlug;
+	const char *sPlug;
 	if (mime) {
 		/* Check MIME type to start the right InputService */
 		sPlug = gf_cfg_get_key(mpdin->service->term->user->config, "MimeTypes", mime);
@@ -291,7 +426,7 @@
 		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);
@@ -307,7 +442,7 @@
 		}
 	}
 	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;
+	return GF_CODEC_NOT_FOUND;
 }
 
 
@@ -347,19 +482,19 @@
 
 GF_Err MPD_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
 {
-    GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
+	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));
+	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_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));
+	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);
 }
@@ -384,12 +519,12 @@
 			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)));
 
-			if (group->mpdin->use_low_latency) 
+			if (group->mpdin->use_low_latency)
 				MPD_NotifyData(group, 1);
 		} else if (group->mpdin->use_low_latency==2) {
 			MPD_NotifyData(group, 1);
 		}
-	
+
 		if (group->mpdin->allow_http_abort)
 			gf_dash_group_check_bandwidth(group->mpdin->dash, group->idx);
 	}
@@ -422,19 +557,19 @@
 	}
 	if (group) {
 		group->netio_assigned = GF_TRUE;
-		group->sess = sess = gf_term_download_new(mpdin->service, url, flags, mpdin_dash_segment_netio, group);
+		group->sess = sess = gf_service_download_new(mpdin->service, url, flags, mpdin_dash_segment_netio, group);
 	} else {
-		sess = gf_term_download_new(mpdin->service, url, flags, NULL, NULL);
+		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_term_download_del((GF_DownloadSession *)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_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)
 {
@@ -490,21 +625,21 @@
 {
 	u32 bps=0;
 //	GF_DownloadSession *sess = (GF_DownloadSession *)session;
-    gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, NULL, &bps, NULL);
+	gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, NULL, &bps, NULL);
 	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);
+	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);
+	gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, &size, NULL, NULL);
 	return size;
 }
 
@@ -517,24 +652,25 @@
 
 	if (dash_evt==GF_DASH_EVENT_PERIOD_SETUP_ERROR) {
 		if (!mpdin->connection_ack_sent) {
-	        gf_term_on_connect(mpdin->service, NULL, error_code);
+			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) {
+		const char *opt;
 		//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->use_low_latency) {
 			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->enable_buffering) {
-				buffer_ms = gf_dash_get_min_buffer_time(mpdin->dash);
-			} 
-			//use default GPAC buffer
-			else {
-				const char *opt = gf_modules_get_option((GF_BaseInterface *)mpdin->plug, "Network", "BufferLength");
-				if (opt) buffer_ms = atoi(opt);
+			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) {
@@ -542,15 +678,20 @@
 			}
 		}
 		//let the player decide which group to play: we declare everything
+
+		//however select the default languague
+		opt = gf_modules_get_option((GF_BaseInterface *)mpdin->plug, "Systems", "LanguageName");
+		if (opt) 
+			gf_dash_groups_set_language(mpdin->dash, opt);
+
 		return GF_OK;
 	}
 
 	/*for all selected groups, create input service and connect to init/first segment*/
 	if (dash_evt==GF_DASH_EVENT_CREATE_PLAYBACK) {
-
 		/*select input services if possible*/
 		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			const char *mime, *init_segment;			
+			const char *mime, *init_segment;
 			//let the player decide which group to play
 			if (!gf_dash_is_group_selectable(mpdin->dash, i))
 				continue;
@@ -577,13 +718,25 @@
 				} else {
 					group->service_connected = 1;
 				}
+				if (mpdin->closed) return GF_OK;
 			}
 		}
 
 		if (!mpdin->connection_ack_sent) {
-	        gf_term_on_connect(mpdin->service, NULL, GF_OK);
+			mpdin->fn_connect_ack(mpdin->service, NULL, GF_OK);
 			mpdin->connection_ack_sent=1;
 		}
+
+		//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;
 	}
 
@@ -591,7 +744,7 @@
 	if (dash_evt==GF_DASH_EVENT_DESTROY_PLAYBACK) {
 
 		mpdin->service->subservice_disconnect = 1;
-		gf_term_on_disconnect(mpdin->service, NULL, GF_OK);
+		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++) {
@@ -604,7 +757,7 @@
 				}
 				gf_modules_close_interface((GF_BaseInterface *) group->segment_ifce);
 			}
-			gf_free(group);			
+			gf_free(group);
 			gf_dash_set_group_udta(mpdin->dash, i, NULL);
 		}
 		mpdin->service->subservice_disconnect = 0;
@@ -613,7 +766,7 @@
 
 	if (dash_evt==GF_DASH_EVENT_BUFFERING) {
 		u32 tot, done;
-		gf_dash_get_buffer_info_buffering(mpdin->dash, &tot, &done);
+		gf_dash_get_buffer_info(mpdin->dash, &tot, &done);
 		fprintf(stderr, "DASH: Buffering %g%% out of %d ms\n", (100.0*done)/tot, tot);
 		return GF_OK;
 	}
@@ -622,16 +775,44 @@
 			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) {
+				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);
 	}
+	
 	return GF_OK;
 }
 
 
 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;
+	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;
 	Bool use_server_utc;
@@ -640,9 +821,11 @@
 
 	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;
+	if (!mpdin || !serv || !url)
+		return GF_BAD_PARAM;
 
-    mpdin->service = serv;
+	mpdin->service = serv;
+	mpdin->seek_request = -1;
 
 	mpdin->dash_io.udta = mpdin;
 	mpdin->dash_io.delete_cache_file = mpdin_dash_io_delete_cache_file;
@@ -665,21 +848,21 @@
 
 	max_cache_duration = 0;
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "Network", "BufferLength");
-    if (opt) max_cache_duration = atoi(opt);
+	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);
+	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 = 0;
-    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 = 1;
+	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 = 1;
 
 	disable_switching = 0;
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "DisableSwitching");
-    if (opt && !strcmp(opt, "yes")) disable_switching = 1;
+	if (opt && !strcmp(opt, "yes")) disable_switching = 1;
 
 	first_select_mode = 0;
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "StartRepresentation");
@@ -688,9 +871,9 @@
 		opt = "minBandwidth";
 	}
 	if (opt && !strcmp(opt, "maxBandwidth")) first_select_mode = GF_DASH_SELECT_BANDWIDTH_HIGHEST;
-    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;
+	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");
@@ -698,7 +881,7 @@
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution");
 	if (!opt) {
-#if defined(_WIN32_WCE) || defined(GPAC_ANDROID) || defined(GPAC_IPHONE) 
+#if defined(_WIN32_WCE) || defined(GPAC_ANDROID) || defined(GPAC_IPHONE)
 		opt = "yes";
 #else
 		opt = "no";
@@ -710,10 +893,14 @@
 	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")) ? 1 : 0;
-	
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "EnableBuffering");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "EnableBuffering", "no");
-	mpdin->enable_buffering = (opt && !strcmp(opt, "yes")) ? 1 : 0;
+
+	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");
@@ -725,28 +912,34 @@
 	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->in_seek = 0;
-	mpdin->previous_start_range = -1;
+	mpdin->previous_start_range = 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);
-	
-	mpdin->dash = gf_dash_new(&mpdin->dash_io, max_cache_duration, auto_switch_count, keep_files, disable_switching, first_select_mode, mpdin->enable_buffering, init_timeshift);
+
+	//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);
 
 	if (!mpdin->dash) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error - cannot create DASH Client for %s\n", url));
-        gf_term_on_connect(mpdin->service, NULL, GF_IO_ERR);
+		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;
 	}
 
@@ -760,10 +953,8 @@
 		GF_NetworkCommand com;
 		memset(&com, 0, sizeof(GF_NetworkCommand));
 		com.base.command_type = GF_NET_SERVICE_MEDIA_CAP_QUERY;
-		gf_term_on_command(serv, &com, GF_OK);
+		gf_service_command(serv, &com, GF_OK);
 
-		com.mcaps.width = 1920;
-		com.mcaps.height = 1080;
 		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);
 		}
@@ -779,6 +970,13 @@
 		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", "DebugAdaptationSet");
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "DebugAdaptationSet", "-1");
@@ -790,7 +988,7 @@
 	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) ));
-        gf_term_on_connect(mpdin->service, NULL, e);
+		mpdin->fn_connect_ack(mpdin->service, NULL, e);
 		return GF_OK;
 	}
 	return GF_OK;
@@ -800,7 +998,7 @@
 {
 	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));
+	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;
@@ -814,7 +1012,7 @@
 
 		desc = mudta->segment_ifce->GetServiceDescriptor(mudta->segment_ifce, expect_type, sub_url);
 		if (desc) mudta->service_descriptor_fetched = 1;
-		return desc;
+		gf_odf_desc_del(desc);
 	}
 	return NULL;
 }
@@ -822,14 +1020,16 @@
 
 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));
-   
+	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));
+
+	mpdin->closed = 1;
+
 	if (mpdin->dash)
 		gf_dash_close(mpdin->dash);
 
-	gf_term_on_disconnect(mpdin->service, NULL, GF_OK);
+	gf_service_disconnect_ack(mpdin->service, NULL, GF_OK);
 
 	return GF_OK;
 }
@@ -837,8 +1037,8 @@
 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_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;
@@ -846,9 +1046,10 @@
 	segment_ifce = MPD_GetInputServiceForChannel(mpdin, com->base.on_channel);
 
 	switch (com->command_type) {
-    case GF_NET_SERVICE_INFO:
-    {
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Info command from terminal on Service (%p)\n", mpdin->service));
+	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) {
@@ -858,98 +1059,231 @@
 
 		if (e!= GF_OK || !com->info.name || 2 > strlen(com->info.name)) {
 			gf_dash_get_info(mpdin->dash, &com->info.name, &com->info.comment);
-        }
-        return GF_OK;
-    }
+		}
+		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:
+	case GF_NET_SERVICE_HAS_AUDIO:
 	case GF_NET_SERVICE_FLUSH_DATA:
 		if (segment_ifce) {
-	        /* defer to the real input service */
-		    return segment_ifce->ServiceCommand(segment_ifce, com);
+			/* defer to the real input service */
+			return segment_ifce->ServiceCommand(segment_ifce, com);
 		}
-        return GF_NOT_SUPPORTED;
+		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;
+		return GF_OK;
 
 	case GF_NET_SERVICE_QUALITY_SWITCH:
-		gf_dash_switch_quality(mpdin->dash, com->switch_quality.up, mpdin->immediate_switch);
-        return GF_OK;
+		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_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;
 
 	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:
-        /* we are interactive (that's the whole point of MPD) */
-        return GF_OK;
+	case GF_NET_CHAN_INTERACTIVE:
+		/* TODO - we are interactive if not live without timeshift */
+		return GF_OK;
+
+	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;
+		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.index = count;
+			return GF_OK;
+		}
+		if (com->quality_query.index>count) return GF_BAD_PARAM;
+	
+		e = gf_dash_group_get_quality_info(mpdin->dash, idx, com->quality_query.index-1, &qinfo);
+		if (e) return e;
+
+		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;
+		}
+		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);
+		return GF_OK;
+	}
+
+		break;
 
 	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->enable_buffering && !mpdin->use_low_latency) {
-			com->buffer.max = gf_dash_get_min_buffer_time(mpdin->dash);
-			if (! gf_dash_is_dynamic_mpd(mpdin->dash)) { 
+		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 (! gf_dash_is_dynamic_mpd(mpdin->dash)) {
 				com->buffer.min = 1;
 			}
 		}
-        return GF_OK;
+		return GF_OK;
 
 	case GF_NET_CHAN_DURATION:
-		/* Ignore the duration given by the input service and use the one given in the MPD
-		   Note: the duration of the initial segment will be 0 anyway (in MP4).*/
 		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;
+		}
+
+		//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*/
-		if (!com->play.initial_broadcast_play) {
+		if (! mpdin->in_seek && (!com->play.initial_broadcast_play || (com->play.start_range>2.0) ) ) {
+			Bool skip_seek;
 			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 (!gf_dash_in_period_setup(mpdin->dash) && !com->play.dash_segment_switch && ! mpdin->in_seek) {
-				//Bool skip_seek;
-				
-				mpdin->in_seek = 1;
-				
-				/*if start range request is the same as previous one, don't process it
-				- this happens at period switch when new objects are declared*/
-				//skip_seek = (mpdin->previous_start_range==com->play.start_range) ? 1 : 0;
-				mpdin->previous_start_range = com->play.start_range;
+			mpdin->in_seek = 1;
 
+			/*if start range request is the same as previous one, don't process it
+			- this happens at period switch when new objects are declared*/
+			skip_seek = 0;
+			if (com->play.initial_broadcast_play && (mpdin->previous_start_range==com->play.start_range))
+				skip_seek = 1;
+
+			mpdin->previous_start_range = com->play.start_range;
+
+			if (!skip_seek) {
+				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);
+				}
 				gf_dash_seek(mpdin->dash, com->play.start_range);
-			} 
-			/*For MPEG-2 TS or formats not using Init Seg: since objects are declared and started once the first
-			segment is playing, we will stay in playback_start_range!=-1 until next segment (because we won't have a query_next),
-			which will prevent seeking until then ... we force a reset of playback_start_range to allow seeking asap*/
-			else if (mpdin->in_seek && (com->play.start_range==0)) {
-//				mpdin->in_seek = 0;
-			}
-			else if (gf_dash_in_period_setup(mpdin->dash) && (com->play.start_range==0)) {
-				com->play.start_range = gf_dash_get_playback_start_range(mpdin->dash);
-			}
 
-			idx = MPD_GetGroupIndexForChannel(mpdin, com->play.on_channel);
-			if (idx>=0) {
-				gf_dash_group_select(mpdin->dash, idx, GF_TRUE);
-				gf_dash_set_group_done(mpdin->dash, idx, 0);
+				//we have issued a seek request, mark the group as seeking
+				if (mpdin->in_seek) {
+					//group->in_seek = 1;
+				}
+				//and check if current segment playback should be aborted
 				com->play.dash_segment_switch = gf_dash_group_segment_switch_forced(mpdin->dash, idx);
 			}
 
-			/*don't forward commands, we are killing the service anyway ...*/
+			//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 {
-			idx = MPD_GetGroupIndexForChannel(mpdin, com->play.on_channel);
-			if (idx>=0)
-				gf_dash_group_select(mpdin->dash, idx, GF_TRUE);
-				com->play.start_range = gf_dash_group_get_start_range(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;
 		}
 
 		return segment_ifce->ServiceCommand(segment_ifce, com);
@@ -960,36 +1294,38 @@
 		if (idx>=0) {
 			gf_dash_set_group_done(mpdin->dash, (u32) idx, 1);
 		}
+		mpdin->previous_start_range = -1;
 	}
-		return segment_ifce->ServiceCommand(segment_ifce, com);
+	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);
+		/* defer to the real input service */
+		return segment_ifce->ServiceCommand(segment_ifce, com);
 
 	case GF_NET_CHAN_SET_SPEED:
-        return segment_ifce->ServiceCommand(segment_ifce, com);
+		gf_dash_set_speed(mpdin->dash, com->play.speed);
+		return segment_ifce->ServiceCommand(segment_ifce, com);
 
-    default:
-        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_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);
+	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_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);
+	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)
@@ -999,15 +1335,15 @@
 	*/
 	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) return GF_FALSE;
+	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++) {
+		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);
@@ -1020,37 +1356,37 @@
 GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
-    static u32 si [] = {
-        GF_NET_CLIENT_INTERFACE,
-        0
-    };
-    return si;
+	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);
-    GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC MPD Loader", "gpac distribution")
-    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;
-    GF_SAFEALLOC(mpdin, GF_MPD_In);
-    plug->priv = mpdin;
+	GF_MPD_In *mpdin;
+	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 MPD Loader", "gpac distribution")
+	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;
+	GF_SAFEALLOC(mpdin, GF_MPD_In);
+	plug->priv = mpdin;
 	mpdin->plug = plug;
-    return (GF_BaseInterface *)plug;
+	return (GF_BaseInterface *)plug;
 }
 
 GPAC_MODULE_EXPORT
@@ -1071,6 +1407,6 @@
 }
 
 
-GPAC_MODULE_STATIC_DELARATION( mpd_in )
+GPAC_MODULE_STATIC_DECLARATION( mpd_in )
 
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-0.5.0.svn5178.tar.bz2/modules/mpegts_in/mpegts_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/mpegts_in/mpegts_in.c Changed

@@ -44,7 +44,7 @@
 	u32 pid;
 } M2TSIn_Prog;
 
-typedef struct 
+typedef struct
 {
 	GF_M2TS_Demuxer *ts;
 
@@ -75,8 +75,23 @@
 	Bool skip_regulation;
 	Bool has_pending_segments;
 
+	Bool in_data_flush;
+
 	Bool hybrid_on;
-}M2TSIn;
+
+	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;
+} M2TSIn;
 
 
 static void M2TS_GetNetworkType(GF_InputService *plug,M2TSIn *reader);
@@ -84,23 +99,23 @@
 static Bool M2TS_CanHandleURL(GF_InputService *plug, const char *url)
 {
 	char *sExt;
-        if (!plug || !url)
-          return 0;
+	if (!plug || !url)
+		return 0;
 	if (!strnicmp(url, "udp://", 6)
-		|| !strnicmp(url, "mpegts-udp://", 13)
-		|| !strnicmp(url, "mpegts-tcp://", 13)
+	        || !strnicmp(url, "mpegts-udp://", 13)
+	        || !strnicmp(url, "mpegts-tcp://", 13)
 #ifdef GPAC_HAS_LINUX_DVB
-		|| !strnicmp(url, "dvb://", 6)
+	        || !strnicmp(url, "dvb://", 6)
 #endif
-	) {
-	  	return 1;
+	   ) {
+		return 1;
 	}
 
 	sExt = strrchr(url, '.');
 	{
 		int i=0;
 		for (i = 0 ; NULL != MIMES[i]; i++)
-			if (gf_term_check_extension(plug, MIMES[i], "ts m2t dmb", "MPEG-2 TS", sExt))
+			if (gf_service_check_mime_register(plug, MIMES[i], "ts m2t dmb trp", "MPEG-2 TS", sExt))
 				return 1;
 	}
 	return 0;
@@ -146,21 +161,21 @@
 		}
 	} 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 (!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] = '#';
 		}
-		if (frag) frag[0] = '#';
-	}
 	return ret;
 }
 
@@ -219,9 +234,10 @@
 				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->ts->file_regulate = 2;
-
+			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;
@@ -233,6 +249,10 @@
 		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);
@@ -309,7 +329,7 @@
 	GF_ObjectDescriptor *od = MP2TS_GetOD(m2ts, stream, dsi, dsi_size, NULL);
 	if (!od) return;
 	/*declare but don't regenerate scene*/
-	gf_term_add_media(m2ts->service, (GF_Descriptor*)od, 1);
+	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)
@@ -330,9 +350,11 @@
 #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->ts->file_regulate = 1;
-		
+	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;
@@ -345,23 +367,28 @@
 	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 ) 
+		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 (!prog->pmt_iod && !no_declare) {
 			MP2TS_DeclareStream(m2ts, (GF_M2TS_PES *)es, NULL, 0);
-		} 
+		}
 		/*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_term_add_media(m2ts->service, NULL, 0);
+		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)
@@ -375,22 +402,16 @@
 	memset(&slh, 0, sizeof(GF_SLHeader));
 	slh.accessUnitStartFlag = (pck->flags & GF_M2TS_PES_PCK_AU_START) ? 1 : 0;
 	if (slh.accessUnitStartFlag) {
-#if 0
-		slh.OCRflag = 1;
-		slh.m2ts_pcr = 1;
-		slh.objectClockReference = pck->stream->program->last_pcr_value;
-#else
-		slh.OCRflag = 0;
-#endif
 		slh.compositionTimeStampFlag = 1;
 		slh.compositionTimeStamp = pck->PTS;
-		if (pck->DTS) {
+		if (pck->DTS != pck->PTS) {
 			slh.decodingTimeStampFlag = 1;
 			slh.decodingTimeStamp = pck->DTS;
 		}
 		slh.randomAccessPointFlag = (pck->flags & GF_M2TS_PES_PCK_RAP) ? 1 : 0;
 	}
-	gf_term_on_sl_packet(m2ts->service, pck->stream->user, pck->data, pck->data_len, &slh, GF_OK);
+	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)
@@ -404,7 +425,7 @@
 		SLHeader.m2ts_version_number_plus_one = pck->version_number + 1;
 		slh = &SLHeader;
 	}
-	gf_term_on_sl_packet(m2ts->service, pck->stream->user, pck->data+SLHdrLen, pck->data_len-SLHdrLen, slh, GF_OK);
+	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)
@@ -440,6 +461,19 @@
 
 	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++) {
@@ -460,6 +494,7 @@
 	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++) {
@@ -474,7 +509,7 @@
 				if (prog_id==ts_prog->number) {
 					req_prog->id = prog_id;
 					break;
-					}
+				}
 			}
 		}
 		if (req_prog->id) {
@@ -500,93 +535,92 @@
 		if (!m2ts->has_eit) {
 			GF_ObjectDescriptor *od = M2TS_GenerateEPG_OD(m2ts);
 			/*declare but don't regenerate scene*/
-			gf_term_add_media(m2ts->service, (GF_Descriptor*)od, 0);
+			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_term_add_media(m2ts->service, NULL, 0);
+			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)
 {
-	GF_Event evt;
 	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*/
+		/*	example code showing how to forward an event from MPEG-2 TS input service to GPAC user*/
 #if 0
-		{
-		GF_Event evt;
-		evt.type = GF_EVENT_FORWARDED;
-		evt.forwarded_event.forward_type = GF_EVT_FORWARDED_MPEG2;
-		evt.forwarded_event.forward_type = GF_EVT_FORWARDED_MPEG2;
-		evt.forwarded_event.service_event_type = evt_type;
-		evt.forwarded_event.param = param;
-		gf_term_on_service_event(m2ts->service, &evt);
-	}
+		send_m2ts_event(m2ts, evt_type, param);
 #endif
 		break;
 	case GF_M2TS_EVT_AIT_FOUND:
-		evt.type = GF_EVENT_FORWARDED;
-		evt.forwarded_event.forward_type = GF_EVT_FORWARDED_MPEG2;
-		evt.forwarded_event.service_event_type = evt_type;
-		evt.forwarded_event.param = param;		  
-		gf_term_on_service_event(m2ts->service, &evt);
+		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 */		
+		/* 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_term_on_connect(m2ts->service, NULL, GF_OK);
+			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*/
-		evt.type = GF_EVENT_FORWARDED;
-		evt.forwarded_event.forward_type = GF_M2TS_EVT_PAT_FOUND;
-		evt.forwarded_event.service_event_type = evt_type;
-		evt.forwarded_event.param = ts;
-		gf_term_on_service_event(m2ts->service, &evt);		
+		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:
-		evt.type = GF_EVENT_FORWARDED;
-		evt.forwarded_event.forward_type = GF_EVT_FORWARDED_MPEG2;
-		evt.forwarded_event.service_event_type = evt_type;
-		evt.forwarded_event.param = param;		  
-		gf_term_on_service_event(m2ts->service, &evt);
+		forward_m2ts_event(m2ts, evt_type, param);
 		break;
 	case GF_M2TS_EVT_PMT_FOUND:
 		if (gf_list_count(m2ts->ts->programs) == 1) {
-			gf_term_on_connect(m2ts->service, NULL, GF_OK);
+			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);		
+		M2TS_FlushRequested(m2ts);
 		/* Send the TS to the a user if needed. Useful to check the number of received programs*/
-		evt.type = GF_EVENT_FORWARDED;
-		evt.forwarded_event.forward_type = GF_M2TS_EVT_PMT_FOUND;
-		evt.forwarded_event.service_event_type = evt_type;
-		evt.forwarded_event.param = param;
-		gf_term_on_service_event(m2ts->service, &evt);		
+		forward_m2ts_event(m2ts, evt_type, param);
 		break;
 	case GF_M2TS_EVT_PMT_REPEAT:
 //	case GF_M2TS_EVT_PMT_UPDATE:
 		M2TS_FlushRequested(m2ts);
 		break;
-	case GF_M2TS_EVT_SDT_REPEAT:
-	case GF_M2TS_EVT_SDT_UPDATE:
 	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_term_on_sl_packet(m2ts->service, m2ts->eit_channel, pck->data, pck->data_len, NULL, GF_OK);
+			gf_service_send_packet(m2ts->service, m2ts->eit_channel, pck->data, pck->data_len, NULL, GF_OK);
 		}
 		break;
 	case GF_M2TS_EVT_PES_PCK:
@@ -596,7 +630,7 @@
 		MP2TS_SendSLPacket(m2ts, param);
 		break;
 	case GF_M2TS_EVT_EOS:
-		gf_term_on_sl_packet(m2ts->service, ((GF_M2TS_PES *)param)->user, NULL, 0, NULL, GF_EOS);
+		gf_service_send_packet(m2ts->service, ((GF_M2TS_PES *)param)->user, NULL, 0, NULL, GF_EOS);
 		break;
 	case GF_M2TS_EVT_AAC_CFG:
 	{
@@ -604,43 +638,78 @@
 		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) 
-				ts->file_regulate = 1;
+			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_term_add_media(m2ts->service, NULL, 0);
+			gf_service_declare_media(m2ts->service, NULL, 0);
 		}
 	}
-		break;
+	break;
 	case GF_M2TS_EVT_PES_PCR:
+	{
+		Bool discontinuity = ( ((GF_M2TS_PES_PCK *) param)->flags & GF_M2TS_PES_PCK_DISCONTINUITY) ? 1 : 0;
 		/*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 = ( ((GF_M2TS_PES_PCK *) param)->flags & GF_M2TS_PES_PCK_DISCONTINUITY) ? 2 : 1;
+			slh.m2ts_pcr = discontinuity ? 2 : 1;
 			slh.objectClockReference = ((GF_M2TS_PES_PCK *) param)->PTS;
-			gf_term_on_sl_packet(m2ts->service, ((GF_M2TS_PES_PCK *) param)->stream->user, NULL, 0, &slh, GF_OK);
+			
+			//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) {
+						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;
+			}
 		}
 		((GF_M2TS_PES_PCK *) param)->stream->program->first_dts = 1;
 
-		if ( ((GF_M2TS_PES_PCK *) param)->flags & GF_M2TS_PES_PCK_DISCONTINUITY) {
+		if (discontinuity) {
 #if 0
 			if (ts->pcr_last) {
 				ts->pcr_last = ((GF_M2TS_PES_PCK *) param)->PTS;
 				ts->stb_at_last_pcr = gf_sys_clock();
 			}
 #endif
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TS In] PCR discontinuity - switching from old STB "LLD" to new one "LLD"\n", ts->pcr_last, ((GF_M2TS_PES_PCK *) param)->PTS));
-			/*FIXME - we need to find a way to treat PCR discontinuities correctly while ignoring broken PCR discontinuities 
+			GF_LOG(GF_LOG_ERROR, 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));
+			/*FIXME - we need to find a way to treat PCR discontinuities correctly while ignoring broken PCR discontinuities
 			seen in many HLS solutions*/
 			return;
 		}
 
-		if (ts->file_regulate) {
+		if (m2ts->file_regulate) {
 			u64 pcr = ((GF_M2TS_PES_PCK *) param)->PTS;
 			u32 stb = gf_sys_clock();
-			
+
 			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*/
@@ -650,25 +719,25 @@
 			}
 
 
-			if (ts->pcr_last) {
+			if (m2ts->pcr_last) {
 				s32 diff;
-				if (pcr < ts->pcr_last) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TS In] PCR "LLU" less than previous PCR "LLU"\n", ((GF_M2TS_PES_PCK *) param)->PTS, ts->pcr_last));
-					ts->pcr_last = pcr;
-					ts->stb_at_last_pcr = gf_sys_clock();
+				if (pcr < m2ts->pcr_last) {
+					GF_LOG(GF_LOG_ERROR, 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 - ts->pcr_last);
+					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, ts->pcr_last));
+						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 - ts->stb_at_last_pcr);
+						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, ts->pcr_last));
+					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
@@ -679,7 +748,7 @@
 					com.command_type = GF_NET_BUFFER_QUERY;
 					com.base.on_channel = NULL;
 					while (ts->run_state) {
-						gf_term_on_command(m2ts->service, &com, GF_OK);
+						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;
@@ -701,16 +770,17 @@
 						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
-					ts->pcr_last = pcr;
-					ts->stb_at_last_pcr = gf_sys_clock();
+					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, ts->pcr_last));
+					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 {
-				ts->pcr_last = pcr;
-				ts->stb_at_last_pcr = gf_sys_clock();
+				m2ts->pcr_last = pcr;
+				m2ts->stb_at_last_pcr = gf_sys_clock();
 			}
 		}
+	}
 		break;
 	case GF_M2TS_EVT_TDT:
 		if (m2ts->hybrid_on) {
@@ -734,11 +804,11 @@
 					GF_M2TS_ES * stream = gf_list_get(prog->streams, j);
 					if (stream->user) {
 						com.base.on_channel = stream->user;
-						gf_term_on_command(m2ts->service, &com, GF_OK);
+						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));
+				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;
@@ -762,12 +832,41 @@
 				GF_M2TS_ES * stream = gf_list_get(prog->streams, j);
 				if (stream->user) {
 					com.base.on_channel = stream->user;
-					gf_term_on_command(m2ts->service, &com, GF_OK);
+					gf_service_command(m2ts->service, &com, GF_OK);
 				}
 			}
 		}
 	}
-		break;
+	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;
+		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;
+		gf_service_command(m2ts->service, &com, GF_OK);
+	}
+	break;
 	}
 }
 
@@ -777,17 +876,17 @@
 	M2TSIn *m2ts = (M2TSIn *) cbk;
 	assert( m2ts );
 	/*handle service message*/
-	gf_term_download_update_stats(m2ts->ts->dnload);
+	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){
+		if (param->size > 0) {
 			/*process chunk*/
 			assert(param->data);
-			if (m2ts->network_buffer_size < param->size){
+			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;
 			}
@@ -797,8 +896,8 @@
 		}
 
 		/*if asked to regulate, wait until we get a play request*/
-		if (m2ts->ts->run_state && !m2ts->ts->nb_playing && (m2ts->ts->file_regulate==1)) {
-			while (m2ts->ts->run_state && !m2ts->ts->nb_playing && (m2ts->ts->file_regulate==1) ) {
+		if (m2ts->ts->paused) {
+			while (m2ts->ts->run_state && m2ts->ts->paused ) {
 				gf_sleep(50);
 				continue;
 			}
@@ -807,8 +906,8 @@
 		}
 #if 1 //see commit 3642: crashes when reload quickly with http
 		if (!m2ts->ts->run_state) {
-			if (m2ts->ts->dnload) 
-				gf_term_download_del( m2ts->ts->dnload );
+			if (m2ts->ts->dnload)
+				gf_service_download_del( m2ts->ts->dnload );
 			m2ts->ts->dnload = NULL;
 		}
 #endif
@@ -817,20 +916,20 @@
 		e = param->error;
 	}
 
-	switch (e){
-	  case GF_EOS:
-		  if (!m2ts->is_connected) {
-			  gf_term_on_connect(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_term_on_connect(m2ts->service, NULL, e);
+	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);
 	}
 }
 
@@ -863,9 +962,9 @@
 
 	query_ret = m2ts->owner->query_proxy(m2ts->owner, &param);
 
-	if ((query_ret==GF_BUFFER_TOO_SMALL) && query_type && !param.url_query.next_url){
+	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){
+	} 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) {
 		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)));
@@ -899,6 +998,13 @@
 	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;
@@ -906,39 +1012,48 @@
 	u32 refresh_type = 0;
 	const char *url;
 
+	if (m2ts->in_data_flush) {
+		if (flush_type==GF_M2TS_PUSH_SEGMENT)
+			m2ts->has_pending_segments++;
+		return;
+	}
 	gf_mx_p(m2ts->mx);
+	m2ts->in_data_flush = 1;
 
 	//check buffer level when start of new segment
-	if (flush_type<=1) {
+	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_term_on_command(m2ts->service, &com, GF_OK);
+		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==1)
+			if (flush_type==GF_M2TS_PUSH_SEGMENT)
 				m2ts->has_pending_segments++;
-			
+
+			m2ts->in_data_flush = 0;
 			gf_mx_v(m2ts->mx);
 			return;
 		}
 	}
-	else if (flush_type==2) {
+	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==2) ? 2 : 1, &url, &start_byterange, &end_byterange, &refresh_type);
+	e = M2TS_QueryNextFile(m2ts, (flush_type==GF_M2TS_FLUSH_DATA) ? 2 : 1, &url, &start_byterange, &end_byterange, &refresh_type);
 	if (e) {
+		m2ts->in_data_flush = 0;
 		gf_mx_v(m2ts->mx);
 		return;
 	}
 	gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, refresh_type, 0);
 
-	//done, drop segment 
+	//done, drop segment
 	if (!m2ts->in_segment_download) {
 		e = M2TS_QueryNextFile(m2ts, 3, &url, &start_byterange, &end_byterange, &refresh_type);
 
@@ -950,13 +1065,13 @@
 		}
 
 	}
+	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;	
+	GF_Err e;
 	const char *opt;
 	M2TSIn *m2ts = plug->priv;
 
@@ -967,7 +1082,7 @@
 	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");
 
@@ -979,21 +1094,26 @@
 	}
 
 	if (url && !strnicmp(url, "http://", 7)) {
-		m2ts->ts->dnload = gf_term_download_new(m2ts->service, url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, m2ts_net_io, m2ts);
-		if (!m2ts->ts->dnload){
-			gf_term_on_connect(m2ts->service, NULL, GF_NOT_SUPPORTED);
+		m2ts->ts->dnload = gf_service_download_new(m2ts->service, url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, 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 
+		//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, 0, NULL, &start_byterange, &end_byterange, NULL);
 				e = gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, 0, 0);
+				M2TS_QueryNextFile(m2ts, 3, NULL, NULL, NULL, NULL);
+				m2ts->in_data_flush = 0;
+				gf_mx_v(m2ts->mx);
 			} else {
 				e = GF_OK;
 			}
@@ -1004,7 +1124,7 @@
 	}
 
 	if (e) {
-		gf_term_on_connect(m2ts->service, NULL, e);	
+		gf_service_connect_ack(m2ts->service, NULL, e);
 	}
 	return e;
 }
@@ -1015,14 +1135,14 @@
 	GF_M2TS_Demuxer* ts = m2ts->ts;
 
 	if (!plug->query_proxy)
-		gf_m2ts_demuxer_close(ts);	
-	
+		gf_m2ts_demuxer_close(ts);
+
 	m2ts->ts->run_state = 0;
 
-	if (ts->dnload) gf_term_download_del(ts->dnload);
+	if (ts->dnload) gf_service_download_del(ts->dnload);
 	ts->dnload = NULL;
 
-	gf_term_on_disconnect(m2ts->service, NULL, GF_OK);
+	gf_service_disconnect_ack(m2ts->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -1091,7 +1211,7 @@
 			}
 		}
 		/*if we expect scene, return NULL and repost a connection ack when we get the PMT*/
-		if (expect_type==GF_MEDIA_OBJECT_SCENE) 
+		if (expect_type==GF_MEDIA_OBJECT_SCENE)
 			return NULL;
 		if (m2ts->epg_requested) {
 			GF_ObjectDescriptor *od = M2TS_GenerateEPG_OD(m2ts);
@@ -1108,7 +1228,7 @@
 	/* 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->ts->file_regulate = 0;
+			m2ts->file_regulate = 0;
 			gf_m2ts_demuxer_play(m2ts->ts);
 		}
 	}
@@ -1135,17 +1255,17 @@
 					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))
-					) {
+					        /*for pid:// url*/
+					        || (!pes->mpeg4_es_id && (pes->pid == ES_ID))
+					   ) {
 						if (pes->user) {
 							e = GF_SERVICE_ERROR;
-							gf_term_on_connect(m2ts->service, channel, e);
+							gf_service_connect_ack(m2ts->service, channel, e);
 							return e;
 						} else {
 							pes->user = channel;
 							e = GF_OK;
-							gf_term_on_connect(m2ts->service, channel, e);
+							gf_service_connect_ack(m2ts->service, channel, e);
 							return e;
 						}
 					}
@@ -1159,33 +1279,60 @@
 		if (ES_ID == 18) {
 			e = GF_OK; /* 18 is the PID of EIT packets */
 			m2ts->eit_channel = channel;
-		} else if ((ES_ID<GF_M2TS_MAX_STREAMS) && m2ts->ts->ess[ES_ID]) {
-			GF_M2TS_PES *pes = (GF_M2TS_PES *)m2ts->ts->ess[ES_ID];
-			if (pes->user) {
-				e = GF_SERVICE_ERROR;
-			} else {
-				pes->user = channel;
-				e = GF_OK;
+		} 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;
+					}
+				}
 			}
-			/*we try to play the highest layer*/
-			if (pes->program->pid_playing < pes->pid)
-				pes->program->pid_playing = pes->pid;
 		}
 	}
-	gf_term_on_connect(m2ts->service, channel, e);
+	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 == channel) return pes;
+		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;
@@ -1195,7 +1342,7 @@
 		pes->user = NULL;
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(m2ts->service, channel, e);
+	gf_service_disconnect_ack(m2ts->service, channel, e);
 	return GF_OK;
 }
 
@@ -1229,7 +1376,7 @@
 				memset(&com, 0, sizeof(com));
 				com.command_type = GF_NET_CHAN_RESET;
 				com.base.on_channel = ((GF_M2TS_PES *)es)->user;
-				gf_term_on_command(((M2TSIn *)ts->user)->service, &com, GF_OK);
+				gf_service_command(((M2TSIn *)ts->user)->service, &com, GF_OK);
 				prog->pid_playing = ((GF_M2TS_PES *)es)->depends_on_pid;
 				return;
 			}
@@ -1241,7 +1388,7 @@
 {
 	GF_M2TS_PES *pes;
 	M2TSIn *m2ts = plug->priv;
-	GF_M2TS_Demuxer *ts = m2ts->ts;	
+	GF_M2TS_Demuxer *ts = m2ts->ts;
 
 	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
 		char *frag = strchr(com->audio.base_url, '#');
@@ -1258,12 +1405,30 @@
 		return GF_OK;
 	}
 	if (com->command_type == GF_NET_SERVICE_PROXY_DATA_RECEIVE) {
-		m2ts_flush_data(m2ts, com->proxy_data.is_chunk);
+		m2ts_flush_data(m2ts, com->proxy_data.is_chunk ? GF_M2TS_PUSH_CHUNK : GF_M2TS_PUSH_SEGMENT);
 		return GF_OK;
 	}
 	if (com->command_type == GF_NET_SERVICE_FLUSH_DATA) {
 		if (plug->query_proxy)
-			m2ts_flush_data(m2ts, 2);
+			m2ts_flush_data(m2ts, GF_M2TS_FLUSH_DATA);
+		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;
 	}
 
@@ -1278,7 +1443,7 @@
 		if (m2ts->ts->file) return GF_OK;
 		return GF_NOT_SUPPORTED;
 	case GF_NET_CHAN_BUFFER:
-		//do not override config 
+		//do not override config
 		if (ts->dnload || plug->query_proxy) {
 			if (!com->buffer.max) com->buffer.max = 1000;
 		}
@@ -1299,11 +1464,16 @@
 		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 (!ts->nb_playing) {
-			ts->start_range = (u32) (com->play.start_range*1000);
-			ts->end_range = (com->play.end_range>0) ? (u32) (com->play.end_range*1000) : 0;
+		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 (plug->query_proxy && ts->file) 
+			if (plug->query_proxy && ts->file)
 				ts->segment_switch = 1;
 
 			/*start demuxer*/
@@ -1313,7 +1483,15 @@
 				}
 			}
 		}
-		ts->nb_playing++;
+		//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);
@@ -1324,15 +1502,15 @@
 			return GF_STREAM_NOT_FOUND;
 		}
 		/* In case of EOS, we may receive a stop command after no one is playing */
-		if (ts->nb_playing)
-		  ts->nb_playing--;
+		if (m2ts->nb_playing)
+			m2ts->nb_playing--;
 		/*stop demuxer*/
 		if (!plug->query_proxy) {
-			if (!ts->nb_playing && (ts->run_state==1)) {
+			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)) {
-					ts->file_regulate = 0;
+					m2ts->file_regulate = 0;
 					gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
 					return gf_m2ts_demuxer_play(ts);
 				}
@@ -1351,18 +1529,35 @@
 			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_term_register_mime_type( service, MIMES[i], "ts m2t dmb", "MPEG-2 TS");
-  return i;
+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], "ts m2t dmb", "MPEG-2 TS");
+	return i;
 }
 
 static void M2TS_GetNetworkType(GF_InputService *plug,M2TSIn *reader)
@@ -1371,12 +1566,12 @@
 	const char *mcast_ifce;
 
 	mob_on = gf_modules_get_option((GF_BaseInterface*)plug, "Network", "MobileIPEnabled");
-	if(mob_on && !strcmp(mob_on, "yes")){
+	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");
+	mcast_ifce = gf_modules_get_option((GF_BaseInterface*)plug, "Network", "DefaultMCastInterface");
 	if(mcast_ifce) reader->ts->network_type = gf_strdup(mcast_ifce);
 }
 
@@ -1407,7 +1602,7 @@
 	reader->ts->th = gf_th_new("MPEG-2 TS Demux");
 
 	reader->mx = gf_mx_new("MPEG2 Demux");
-	
+
 	return plug;
 }
 
@@ -1417,11 +1612,11 @@
 	M2TSIn *m2ts;
 	GF_InputService *plug = (GF_InputService *) ifce;
 	if (!ifce)
-	  return;
+		return;
 	m2ts = plug->priv;
 	if (!m2ts)
-	  return;
-	if( m2ts->ts->requested_progs ){
+		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);
@@ -1431,7 +1626,7 @@
 		gf_list_del(m2ts->ts->requested_progs);
 		m2ts->ts->requested_progs = NULL;
 	}
-	if( m2ts->ts->requested_pids ){
+	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);
@@ -1474,9 +1669,11 @@
 {
 	switch (InterfaceType) {
 #ifndef GPAC_DISABLE_MPEG2TS
-	case GF_NET_CLIENT_INTERFACE: return (GF_BaseInterface *) NewM2TSReader();
+	case GF_NET_CLIENT_INTERFACE:
+		return (GF_BaseInterface *) NewM2TSReader();
 #endif
-	default: return NULL;
+	default:
+		return NULL;
 	}
 }
 
@@ -1485,9 +1682,11 @@
 {
 	switch (ifce->InterfaceType) {
 #ifndef GPAC_DISABLE_MPEG2TS
-	case GF_NET_CLIENT_INTERFACE:  DeleteM2TSReader(ifce); break;
+	case GF_NET_CLIENT_INTERFACE:
+		DeleteM2TSReader(ifce);
+		break;
 #endif
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( mpegts_in )
+GPAC_MODULE_STATIC_DECLARATION( mpegts_in )

gpac-0.5.0.svn5178.tar.bz2/modules/mse_in/mse_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/mse_in/mse_in.c Changed

@@ -27,10 +27,10 @@
 #include <gpac/internal/terminal_dev.h>
 #include <gpac/html5_mse.h>
 
-typedef struct __mse_module 
+typedef struct __mse_module
 {
-    GF_HTML_MediaSource *mediasource;
-    GF_InputService *plug;
+	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)*/
@@ -42,14 +42,14 @@
 /* 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;
-    }
+	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 */
@@ -73,79 +73,79 @@
 	}
 }
 
-/* For a given source buffer, returns the media track associated with the terminal channel object 
+/* 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;
+	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;
+	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;
+	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;
-    }
+			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_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;
+	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);
+	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:
@@ -153,161 +153,161 @@
    - 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) {
+	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;
+		GF_HTML_MediaSource     *ms = NULL;
 
-        sscanf(url, "blob:%p", &ms);
-        msein->mediasource = ms;
+		sscanf(url, "blob:%p", &ms);
+		msein->mediasource = ms;
 		ms->reference_count++;
-        ms->service = serv;
+		ms->service = serv;
 		gf_mse_mediasource_open(ms, serv->owner->mo);
-	    return GF_OK;
-    }
+		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;
+	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));
+	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_term_on_disconnect(msein->mediasource->service, NULL, GF_OK);
+		gf_service_disconnect_ack(msein->mediasource->service, NULL, GF_OK);
 		gf_mse_mediasource_del(msein->mediasource, GF_FALSE);
 		msein->mediasource = NULL;
 	}
-    return GF_OK;
+	return GF_OK;
 }
 
-/* Forward all the commands received from the the terminal 
+/* 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;
+	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;
 	case GF_NET_SERVICE_FLUSH_DATA:
 		return GF_NOT_SUPPORTED;
-    default:
-        break;
-    }
+	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));
+	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));
+	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);
+	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_STOP:
+		return sb->parser->ServiceCommand(sb->parser, com);
 
-    case GF_NET_CHAN_PAUSE:
-        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_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_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_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_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:
+		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_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_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_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_SET_PULL:
+		return sb->parser->ServiceCommand(sb->parser, com);
 
-    case GF_NET_CHAN_INTERACTIVE:
-        /* we are interactive */
-        return GF_OK;
+	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);
+	case GF_NET_CHAN_GET_PIXEL_AR:
+		return sb->parser->ServiceCommand(sb->parser, com);
 
-    default:
-        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)
+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_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;
+	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_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;
+	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;
+	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 {
@@ -318,49 +318,49 @@
 GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
-    static u32 si [] = {
-        GF_NET_CLIENT_INTERFACE,
-        0
-    };
-    return si;
+	static u32 si [] = {
+		GF_NET_CLIENT_INTERFACE,
+		0
+	};
+	return si;
 }
 
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
-    GF_MSE_In *msein;
-    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 MSE Loader", "gpac distribution")
-    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;
-    GF_SAFEALLOC(msein, GF_MSE_In);
-    plug->priv = msein;
-    msein->plug = plug;
-    return (GF_BaseInterface *)plug;
+	GF_MSE_In *msein;
+	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 MSE Loader", "gpac distribution")
+	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;
+	GF_SAFEALLOC(msein, GF_MSE_In);
+	plug->priv = msein;
+	msein->plug = plug;
+	return (GF_BaseInterface *)plug;
 }
 GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *bi)
 {
-    GF_MSE_In *msein;
+	GF_MSE_In *msein;
 
-    if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
+	if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
 
-    msein = (GF_MSE_In*) ((GF_InputService*)bi)->priv;
-    assert(msein);
-    gf_free(msein);
-    gf_free(bi);
+	msein = (GF_MSE_In*) ((GF_InputService*)bi)->priv;
+	assert(msein);
+	gf_free(msein);
+	gf_free(bi);
 }
 
-GPAC_MODULE_STATIC_DELARATION( mse_in )
+GPAC_MODULE_STATIC_DECLARATION( mse_in )

gpac-0.5.0.svn5178.tar.bz2/modules/odf_dec/odf_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/odf_dec/odf_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -61,7 +61,9 @@
 	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);
@@ -164,7 +166,7 @@
 
 
 static GF_Err ODF_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-							u16 ES_ID, u32 AU_time, u32 mmlevel)
+                              u16 ES_ID, u32 AU_time, u32 mmlevel)
 {
 	GF_Err e;
 	GF_ODCom *com;
@@ -208,9 +210,9 @@
 			e = GF_OK;
 		}
 #else
-			e = GF_OK;
+		e = GF_OK;
 #endif
-			break;
+		break;
 		case GF_ODF_IPMP_REMOVE_TAG:
 			e = GF_NOT_SUPPORTED;
 			break;
@@ -251,13 +253,13 @@
 void DeleteODDec(GF_BaseDecoder *plug)
 {
 	ODPriv *priv;
-        if (!plug)
-          return;
-        priv = (ODPriv *)plug->privateStack;
-        if (priv){
-          gf_free(priv);
-          plug->privateStack = NULL;
-        }
+	if (!plug)
+		return;
+	priv = (ODPriv *)plug->privateStack;
+	if (priv) {
+		gf_free(priv);
+		plug->privateStack = NULL;
+	}
 	gf_free(plug);
 }
 
@@ -308,8 +310,8 @@
 GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
-        if (!ifce)
-          return;
+	if (!ifce)
+		return;
 	switch (ifce->InterfaceType) {
 	case GF_SCENE_DECODER_INTERFACE:
 		DeleteODDec((GF_BaseDecoder *)ifce);
@@ -318,4 +320,4 @@
 }
 
 
-GPAC_MODULE_STATIC_DELARATION( odf_dec )
+GPAC_MODULE_STATIC_DECLARATION( odf_dec )

gpac-0.5.0.svn5178.tar.bz2/modules/ogg/ogg_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/ogg/ogg_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "ogg_in.h"
@@ -28,7 +28,7 @@
 
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)
 
-typedef struct 
+typedef struct
 {
 	u32 streamType;	/*MPEG-4 streamType*/
 	u32 num_init_headers;
@@ -77,8 +77,8 @@
 	u32 nb_playing, kill_demux, do_seek, service_type, init_remain, bos_done;
 
 	/*ogg ogfile state*/
-    ogg_sync_state oy;
-	
+	ogg_sync_state oy;
+
 	OGGStream *resync_stream;
 
 	Bool has_video, has_audio, is_single_media;
@@ -100,7 +100,7 @@
 	OGGStream *st;
 	u32 i=0;
 	while ((st = gf_list_enum(read->streams, &i))) {
-		gf_term_on_sl_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
+		gf_service_send_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
 	}
 }
 
@@ -132,10 +132,10 @@
 		}
 	}
 
-    while (ogg_sync_pageout(&read->oy, oggpage ) != 1 ) {
-        char *buffer;
+	while (ogg_sync_pageout(&read->oy, oggpage ) != 1 ) {
+		char *buffer;
 		u32 bytes;
-		
+
 		if (read->ogfile) {
 			if (feof(read->ogfile)) {
 				OGG_EndOfFile(read);
@@ -149,9 +149,9 @@
 		if (!bytes) return 0;
 		buffer = ogg_sync_buffer(&read->oy, bytes);
 		memcpy(buffer, buf, bytes);
-        ogg_sync_wrote(&read->oy, bytes);
-    }
-    return 1;
+		ogg_sync_wrote(&read->oy, bytes);
+	}
+	return 1;
 }
 
 static OGGStream *OGG_FindStreamForPage(OGGReader *read, ogg_page *oggpage)
@@ -160,7 +160,7 @@
 	count = gf_list_count(read->streams);
 	for (i=0; i<count; i++) {
 		OGGStream *st = gf_list_get(read->streams, i);
-        if (ogg_stream_pagein(&st->os, oggpage) == 0) return st;
+		if (ogg_stream_pagein(&st->os, oggpage) == 0) return st;
 	}
 	return NULL;
 }
@@ -217,7 +217,7 @@
 }
 
 
-static void OGG_GetStreamInfo(ogg_packet *oggpacket, OGGInfo *info) 
+static void OGG_GetStreamInfo(ogg_packet *oggpacket, OGGInfo *info)
 {
 	oggpack_buffer opb;
 
@@ -285,7 +285,7 @@
 			info->theora_kgs ++;
 			keyframe_freq_force >>= 1;
 		}
-	    info->frame_rate = ((Float)fps_numerator) / fps_denominator;
+		info->frame_rate = ((Float)fps_numerator) / fps_denominator;
 		info->num_init_headers = 3;
 		gf_bs_del(bs);
 		info->frame_rate_base = fps_denominator;
@@ -298,7 +298,7 @@
 	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) {
@@ -341,23 +341,23 @@
 			}
 			ogg_stream_clear(&os);
 			/*nope streams are different, signal eos on this one*/
-			gf_term_on_sl_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
+			gf_service_send_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
 		}
 	}
 
 	GF_SAFEALLOC(st, OGGStream);
-    st->serial_no = serial_no;
-    ogg_stream_init(&st->os, st->serial_no);
+	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)) )
+	        || ((read->service_type==2) && (st->info.streamType==GF_STREAM_VISUAL)) )
 	{
-	    ogg_stream_clear(&st->os);
+		ogg_stream_clear(&st->os);
 		gf_free(st);
 		return;
 	}
@@ -366,7 +366,7 @@
 	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) {
@@ -381,13 +381,13 @@
 	} else {
 		read->has_audio = 1;
 	}
-	if (st->got_headers && read->is_inline) gf_term_add_media(read->service, (GF_Descriptor*) OGG_GetOD(st), 0);
+	if (st->got_headers && read->is_inline) gf_service_declare_media(read->service, (GF_Descriptor*) OGG_GetOD(st), 0);
 }
 
 void OGG_SignalEndOfStream(OGGReader *read, OGGStream *st)
 {
 	if (st->eos_detected) {
-		gf_term_on_sl_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
+		gf_service_send_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
 		ogg_stream_clear(&st->os);
 	}
 }
@@ -402,7 +402,7 @@
 		slh.randomAccessPointFlag = 1;
 		slh.compositionTimeStampFlag = 1;
 		slh.compositionTimeStamp = st->ogg_ts;
-		gf_term_on_sl_packet(read->service, st->ch, (char *) oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
+		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) {
@@ -415,7 +415,7 @@
 			slh.randomAccessPointFlag = oggpackB_read(&opb, 1) ? 0 : 1;
 			slh.compositionTimeStampFlag = 1;
 			slh.compositionTimeStamp = st->ogg_ts;
-			gf_term_on_sl_packet(read->service, st->ch, (char *) oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
+			gf_service_send_packet(read->service, st->ch, (char *) oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
 			st->ogg_ts += 1000;
 		}
 	}
@@ -424,7 +424,7 @@
 void OGG_Process(OGGReader *read)
 {
 	OGGStream *st;
-    ogg_packet oggpacket;
+	ogg_packet oggpacket;
 	ogg_page oggpage;
 
 	if (read->resync_stream) {
@@ -447,14 +447,14 @@
 		if (!read->bos_done && read->is_live) {
 			u32 now = gf_sys_clock();
 			if (now-read->tune_in_time > 1000) {
-				gf_term_on_message(read->service, GF_OK, "Waiting for tune in...");
+				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)) 
+	if (ogg_page_eos(&oggpage))
 		st->eos_detected = 1;
 
 	if (st->parse_headers && !st->got_headers) {
@@ -477,8 +477,8 @@
 			st->parse_headers--;
 			if (!st->parse_headers) {
 				st->got_headers = 1;
-				if (read->is_inline) 
-					gf_term_add_media(read->service, (GF_Descriptor*) OGG_GetOD(st), 0);
+				if (read->is_inline)
+					gf_service_declare_media(read->service, (GF_Descriptor*) OGG_GetOD(st), 0);
 				break;
 			}
 		}
@@ -515,7 +515,7 @@
 				map.map_time.reset_buffers = (read->start_range>0.2) ? 1 : 0;
 				map.map_time.timestamp = st->ogg_ts = 0;
 				map.map_time.media_time = t;
-				gf_term_on_command(read->service, &map, GF_OK);
+				gf_service_command(read->service, &map, GF_OK);
 				st->map_time = 0;
 				OGG_SendPackets(read, st, &oggpacket);
 			}
@@ -540,17 +540,17 @@
 
 	if (read->needs_connection) {
 		read->needs_connection=0;
-		gf_term_on_connect(read->service, NULL, GF_OK);
+		gf_service_connect_ack(read->service, NULL, GF_OK);
 	}
 
-    ogg_sync_init(&read->oy);
+	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);
@@ -585,7 +585,7 @@
 				st = gf_list_get(read->streams, i);
 				if (!st->ch) continue;
 				com.base.on_channel = st->ch;
-				gf_term_on_command(read->service, &com, GF_OK);
+				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 = 0;
@@ -596,7 +596,7 @@
 			gf_sleep(0);
 		}
 	}
-    ogg_sync_clear(&read->oy);
+	ogg_sync_clear(&read->oy);
 	read->kill_demux=2;
 	return 0;
 }
@@ -613,7 +613,7 @@
 	gf_f64_seek(read->ogfile, 0, SEEK_SET);
 
 	ogg_sync_init(&read->oy);
-	memset(&the_info, 0, sizeof(OGGInfo));	
+	memset(&the_info, 0, sizeof(OGGInfo));
 	max_gran = 0;
 	while (1) {
 		if (!OGG_ReadPage(read, &oggpage)) break;
@@ -624,7 +624,7 @@
 				ogg_stream_packetpeek(&os, &oggpacket);
 				if (ogg_stream_pagein(&os, &oggpage) >= 0 ) {
 					ogg_stream_packetpeek(&os, &oggpacket);
-					OGG_GetStreamInfo(&oggpacket, &info); 
+					OGG_GetStreamInfo(&oggpacket, &info);
 				}
 				if (!has_stream) {
 					has_stream = 1;
@@ -643,7 +643,7 @@
 			}
 		}
 	}
-    ogg_sync_clear(&read->oy);
+	ogg_sync_clear(&read->oy);
 	read->file_size = gf_f64_tell(read->ogfile);
 	gf_f64_seek(read->ogfile, 0, SEEK_SET);
 	read->dur = 0;
@@ -657,7 +657,7 @@
 }
 
 static const char * OGG_MIMES_AUDIO[] = {
-    "audio/ogg", "audio/x-ogg", "audio/x-vorbis+ogg", NULL
+	"audio/ogg", "audio/x-ogg", "audio/x-vorbis+ogg", NULL
 };
 
 static const char * OGG_MIMES_AUDIO_EXT = "oga spx";
@@ -665,21 +665,21 @@
 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
+	"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_term_register_mime_type(plug, OGG_MIMES_AUDIO[i], OGG_MIMES_AUDIO_EXT, OGG_MIMES_AUDIO_DESC);
-    c = i;
-    for (i = 0 ; OGG_MIMES_VIDEO[i]; i++)
-      gf_term_register_mime_type(plug, OGG_MIMES_VIDEO[i], OGG_MIMES_VIDEO_EXT, OGG_MIMES_VIDEO_DESC);
-    return c+i;
+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)
@@ -687,13 +687,13 @@
 	char *sExt;
 	u32 i;
 	sExt = strrchr(url, '.');
-	for (i = 0 ; OGG_MIMES_AUDIO[i]; i++){
-	  if (gf_term_check_extension(plug, OGG_MIMES_AUDIO[i], OGG_MIMES_AUDIO_EXT, OGG_MIMES_AUDIO_DESC, sExt))
-	    return 1;
+	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 1;
 	}
-	for (i = 0 ; OGG_MIMES_VIDEO[i]; i++){
-	  if (gf_term_check_extension(plug, OGG_MIMES_VIDEO[i], OGG_MIMES_VIDEO_EXT, OGG_MIMES_VIDEO_DESC, sExt))
-	    return 1;
+	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 1;
 	}
 	return 0;
 }
@@ -709,8 +709,8 @@
 {
 	OGGReader *read = (OGGReader *) cbk;
 
-	gf_term_download_update_stats(read->dnload);
-	
+	gf_service_download_update_stats(read->dnload);
+
 	/*done*/
 	if ((param->msg_type==GF_NETIO_DATA_TRANSFERED) && read->ogfile) {
 		read->is_remote = 0;
@@ -721,7 +721,7 @@
 	if (param->error && read->needs_connection) {
 		read->needs_connection = 0;
 		read->kill_demux = 2;
-		gf_term_on_connect(read->service, NULL, param->error);
+		gf_service_connect_ack(read->service, NULL, param->error);
 	}
 	/*we never receive data from here since the downloader is not threaded*/
 }
@@ -730,11 +730,11 @@
 {
 	OGGReader *read = (OGGReader*) plug->priv;
 
-	read->dnload = gf_term_download_new(read->service, url, GF_NETIO_SESSION_NOT_THREADED, OGG_NetIO, read);
+	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 = 0;
-		gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+		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);
@@ -749,7 +749,7 @@
 	OGGReader *read = plug->priv;
 	read->service = serv;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	read->service_type = 0;
@@ -787,7 +787,7 @@
 	}
 	/*error*/
 	read->kill_demux=2;
-	gf_term_on_connect(serv, NULL, reply);
+	gf_service_connect_ack(serv, NULL, reply);
 	return GF_OK;
 }
 
@@ -801,9 +801,9 @@
 
 	if (read->ogfile) fclose(read->ogfile);
 	read->ogfile = NULL;
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
-	gf_term_on_disconnect(read->service, NULL, GF_OK);
+	gf_service_disconnect_ack(read->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -823,7 +823,7 @@
 		while ((st = 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 = 1;
 			return (GF_Descriptor *) od;
@@ -856,7 +856,7 @@
 			break;
 		}
 	}
-	gf_term_on_connect(read->service, channel, e);
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -875,7 +875,7 @@
 			break;
 		}
 	}
-	gf_term_on_disconnect(read->service, channel, e);
+	gf_service_disconnect_ack(read->service, channel, e);
 	return GF_OK;
 }
 
@@ -902,7 +902,8 @@
 		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_SET_PADDING:
+		return GF_NOT_SUPPORTED;
 
 	case GF_NET_CHAN_DURATION:
 		com->duration.duration = read->dur;
@@ -921,12 +922,12 @@
 			}
 		}
 		/*recfg duration in case*/
-		if (!read->is_remote && read->dur) { 
+		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_term_on_command(read->service, &rcfg, GF_OK);
+			gf_service_command(read->service, &rcfg, GF_OK);
 		}
 		return GF_OK;
 	case GF_NET_CHAN_STOP:
@@ -948,7 +949,7 @@
 {
 	char szURL[2048], *sep;
 	OGGReader *read = (OGGReader *)plug->priv;
-	const char *this_url = gf_term_get_service_url(read->service);
+	const char *this_url = gf_service_get_url(read->service);
 	if (!this_url || !url) return 0;
 
 	strcpy(szURL, this_url);

gpac-0.5.0.svn5178.tar.bz2/modules/ogg/ogg_in.h -> gpac-0.5.1.svn5491.tar.xz/modules/ogg/ogg_in.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/ogg/ogg_load.c -> gpac-0.5.1.svn5491.tar.xz/modules/ogg/ogg_load.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -27,7 +27,7 @@
 
 
 #if !defined(__GNUC__)
-# if (defined(_WIN32_WCE) || defined (WIN32)) 
+# if (defined(_WIN32_WCE) || defined (WIN32))
 #  pragma comment(lib, "libogg_static")
 #  pragma comment(lib, "libvorbis_static")
 #  pragma comment(lib, "libtheora_static")
@@ -43,7 +43,7 @@
 		/*media type query*/
 		if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
 		dsi = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data : NULL;
-		
+
 		switch (esd->decoderConfig->objectTypeIndication) {
 #ifdef GPAC_HAS_THEORA
 		case GPAC_OTI_MEDIA_OGG:
@@ -52,7 +52,7 @@
 			}
 			return GF_CODEC_NOT_SUPPORTED;
 #endif
-		default: 
+		default:
 			return GF_CODEC_NOT_SUPPORTED;
 		}
 	}
@@ -71,7 +71,7 @@
 			}
 			return GF_CODEC_NOT_SUPPORTED;
 #endif
-		default: 
+		default:
 			return GF_CODEC_NOT_SUPPORTED;
 		}
 	}
@@ -96,23 +96,27 @@
 void DeleteOGGDecoder(GF_BaseDecoder *ifcd)
 {
 	OGGWraper *wrap;
-        if (!ifcd)
-          return;
-        wrap = (OGGWraper *)ifcd->privateStack;
-        if (wrap){
-          switch (wrap->type) {
+	if (!ifcd)
+		return;
+	wrap = (OGGWraper *)ifcd->privateStack;
+	if (wrap) {
+		switch (wrap->type) {
 #ifdef GPAC_HAS_VORBIS
-            case OGG_VORBIS: DeleteVorbisDecoder(ifcd); break;
+		case OGG_VORBIS:
+			DeleteVorbisDecoder(ifcd);
+			break;
 #endif
 #ifdef GPAC_HAS_THEORA
-            case OGG_THEORA: DeleteTheoraDecoder(ifcd); break;
+		case OGG_THEORA:
+			DeleteTheoraDecoder(ifcd);
+			break;
 #endif
-            default:
-		break;
-          }
-          gf_free(wrap);
-          ifcd->privateStack = NULL;
-        }
+		default:
+			break;
+		}
+		gf_free(wrap);
+		ifcd->privateStack = NULL;
+	}
 	gf_free(ifcd);
 }
 
@@ -155,4 +159,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( ogg_in )
+GPAC_MODULE_STATIC_DECLARATION( ogg_in )

gpac-0.5.0.svn5178.tar.bz2/modules/ogg/theora_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/ogg/theora_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,11 +32,11 @@
 
 typedef struct
 {
-    theora_info ti;
+	theora_info ti;
 	theora_state td;
-    theora_comment tc;
-    ogg_packet op;
-	
+	theora_comment tc;
+	ogg_packet op;
+
 	u16 ES_ID;
 	Bool has_reconfigured;
 } TheoraDec;
@@ -45,12 +45,12 @@
 
 static GF_Err THEO_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
 {
-    ogg_packet oggpacket;
+	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;
@@ -63,8 +63,8 @@
 
 	ctx->ES_ID = esd->ESID;
 
-    theora_info_init(&ctx->ti);
-    theora_comment_init(&ctx->tc);
+	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);
@@ -79,7 +79,7 @@
 		}
 		gf_free(oggpacket.packet);
 	}
-    theora_decode_init(&ctx->td, &ctx->ti);
+	theora_decode_init(&ctx->td, &ctx->ti);
 	gf_bs_del(bs);
 	return GF_OK;
 }
@@ -89,9 +89,9 @@
 	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);
+	theora_clear(&ctx->td);
+	theora_info_clear(&ctx->ti);
+	theora_comment_clear(&ctx->tc);
 
 	ctx->ES_ID = 0;
 	return GF_OK;
@@ -148,11 +148,11 @@
 }
 
 
-static GF_Err THEO_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -168,15 +168,15 @@
 	op.b_o_s = 0;
 	op.e_o_s = 0;
 	op.packetno = 0;
-    op.packet = inBuffer;
-    op.bytes = inBufferLength;
+	op.packet = inBuffer;
+	op.bytes = inBufferLength;
 
 
 	*outBufferLength = 0;
 
-    if (theora_decode_packetin(&ctx->td, &op)<0) return GF_NON_COMPLIANT_BITSTREAM;
+	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;
+	if (theora_decode_YUVout(&ctx->td, &yuv)<0) return GF_OK;
 
 	pYO = yuv.y;
 	pUO = yuv.u;
@@ -184,7 +184,7 @@
 	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;
@@ -215,7 +215,7 @@
 	GF_SAFEALLOC(dec, TheoraDec);
 	((OGGWraper *)ifcd->privateStack)->opaque = dec;
 	((OGGWraper *)ifcd->privateStack)->type = OGG_THEORA;
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = THEO_AttachStream;
 	ifcd->DetachStream = THEO_DetachStream;
 	ifcd->GetCapabilities = THEO_GetCapabilities;

gpac-0.5.0.svn5178.tar.bz2/modules/ogg/vorbis_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/ogg/vorbis_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -32,11 +32,11 @@
 
 typedef struct
 {
-    vorbis_info vi;
+	vorbis_info vi;
 	vorbis_dsp_state vd;
 	vorbis_block vb;
-    vorbis_comment vc;
-    ogg_packet op;
+	vorbis_comment vc;
+	ogg_packet op;
 
 	u16 ES_ID;
 	Bool has_reconfigured;
@@ -46,7 +46,7 @@
 
 static GF_Err VORB_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
 {
-    ogg_packet oggpacket;
+	ogg_packet oggpacket;
 	GF_BitStream *bs;
 
 	VORBISCTX();
@@ -58,8 +58,8 @@
 
 	ctx->ES_ID = esd->ESID;
 
-    vorbis_info_init(&ctx->vi);
-    vorbis_comment_init(&ctx->vc);
+	vorbis_info_init(&ctx->vi);
+	vorbis_comment_init(&ctx->vc);
 
 	oggpacket.granulepos = -1;
 	oggpacket.b_o_s = 1;
@@ -92,8 +92,8 @@
 
 	vorbis_block_clear(&ctx->vb);
 	vorbis_dsp_clear(&ctx->vd);
-    vorbis_info_clear(&ctx->vi);
-    vorbis_comment_clear(&ctx->vc);
+	vorbis_info_clear(&ctx->vi);
+	vorbis_comment_clear(&ctx->vc);
 
 	ctx->ES_ID = 0;
 	return GF_OK;
@@ -134,7 +134,9 @@
 		break;
 	case GF_CODEC_CHANNEL_CONFIG:
 		switch (ctx->vi.channels) {
-		case 1: capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER; break;
+		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;
@@ -173,7 +175,7 @@
 	ogg_int16_t *ptr, *data = (ogg_int16_t*)buf ;
 	Float *mono;
 
-    for (i=0 ; i<channels ; i++) {
+	for (i=0 ; i<channels ; i++) {
 		ptr = &data[i];
 		if (channels>2) {
 			/*center is third in gpac*/
@@ -195,18 +197,18 @@
 			*ptr = val;
 			ptr += channels;
 		}
-    }
+	}
 }
 
 static GF_Err VORB_ProcessData(GF_MediaDecoder *ifcg,
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+                               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;
+	Float **pcm;
+	u32 samples, total_samples, total_bytes;
 
 	VORBISCTX();
 	/*not using scalabilty*/
@@ -216,8 +218,8 @@
 	op.b_o_s = 0;
 	op.e_o_s = 0;
 	op.packetno = 0;
-    op.packet = inBuffer;
-    op.bytes = inBufferLength;
+	op.packet = inBuffer;
+	op.bytes = inBufferLength;
 
 
 	*outBufferLength = 0;
@@ -263,13 +265,13 @@
 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;
-        }
+	if (!ifcg || !ifcg->privateStack)
+		return;
+	ctx = (VorbDec *) ((OGGWraper *)ifcg->privateStack)->opaque;
+	if (ctx) {
+		gf_free(ctx);
+		((OGGWraper *)ifcg->privateStack)->opaque = NULL;
+	}
 }
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/opencv_is/opencv_is.c -> gpac-0.5.1.svn5491.tar.xz/modules/opencv_is/opencv_is.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -54,55 +54,55 @@
 
 CvHaarClassifierCascade* load_object_detector( const char* cascade_path )
 {
-    return (CvHaarClassifierCascade*)cvLoad( cascade_path, NULL, NULL, NULL );
+	return (CvHaarClassifierCascade*)cvLoad( cascade_path, NULL, NULL, NULL );
 }
 
 int prev_x0=0, prev_y0=0;
 
 void detect_and_draw_objects(GF_InputSensorDevice *ifce, IplImage* image,
-                              CvHaarClassifierCascade* cascade,
-                              int do_pyramids )
+                             CvHaarClassifierCascade* cascade,
+                             int do_pyramids )
 {
-    IplImage* small_image = image;
-    CvMemStorage* storage = cvCreateMemStorage(0);
-    CvSeq* faces;
-    int i, scale = 1;
-    //CvRect* theRealFace;
-    int theRealX=0, theRealY=0, theRealHeight=0 , theRealWidth=0;
-
-    int tmpMaxSurface=0;
-
-
-    if( do_pyramids )
-    {
-        small_image = cvCreateImage( cvSize(image->width/2,image->height/2), IPL_DEPTH_8U, 3 );
-        cvPyrDown( image, small_image, CV_GAUSSIAN_5x5 );
-        scale = 2;
-    }
-
-    faces = cvHaarDetectObjects( small_image, cascade, storage, 1.2, 2, CV_HAAR_DO_CANNY_PRUNING, cvSize(0,0) );
-
-    for( i = 0; i < faces->total; i++ )
-    {
-        
-        CvRect face_rect = *(CvRect*)cvGetSeqElem( faces, i );
-       /* cvRectangle( image, cvPoint(face_rect.x*scale,face_rect.y*scale),
-                     cvPoint((face_rect.x+face_rect.width)*scale,
-                             (face_rect.y+face_rect.height)*scale),
-                     CV_RGB(0,255,0), 3 );*/
-    if(face_rect.width*face_rect.height>tmpMaxSurface){
-        theRealX=face_rect.x;
-        theRealY=face_rect.y;
-        theRealHeight=face_rect.height;
-        theRealWidth=face_rect.width;
-        tmpMaxSurface=face_rect.width*face_rect.height;
-        }
-
-    }
-    cvRectangle( image, cvPoint(theRealX*scale,theRealY*scale),
-                     cvPoint((theRealX+theRealWidth)*scale,
-                             (theRealY+theRealHeight)*scale),
-                     CV_RGB(0,255,0), 3, 8, 0 );
+	IplImage* small_image = image;
+	CvMemStorage* storage = cvCreateMemStorage(0);
+	CvSeq* faces;
+	int i, scale = 1;
+	//CvRect* theRealFace;
+	int theRealX=0, theRealY=0, theRealHeight=0 , theRealWidth=0;
+
+	int tmpMaxSurface=0;
+
+
+	if( do_pyramids )
+	{
+		small_image = cvCreateImage( cvSize(image->width/2,image->height/2), IPL_DEPTH_8U, 3 );
+		cvPyrDown( image, small_image, CV_GAUSSIAN_5x5 );
+		scale = 2;
+	}
+
+	faces = cvHaarDetectObjects( small_image, cascade, storage, 1.2, 2, CV_HAAR_DO_CANNY_PRUNING, cvSize(0,0) );
+
+	for( i = 0; i < faces->total; i++ )
+	{
+
+		CvRect face_rect = *(CvRect*)cvGetSeqElem( faces, i );
+		/* cvRectangle( image, cvPoint(face_rect.x*scale,face_rect.y*scale),
+		              cvPoint((face_rect.x+face_rect.width)*scale,
+		                      (face_rect.y+face_rect.height)*scale),
+		              CV_RGB(0,255,0), 3 );*/
+		if(face_rect.width*face_rect.height>tmpMaxSurface) {
+			theRealX=face_rect.x;
+			theRealY=face_rect.y;
+			theRealHeight=face_rect.height;
+			theRealWidth=face_rect.width;
+			tmpMaxSurface=face_rect.width*face_rect.height;
+		}
+
+	}
+	cvRectangle( image, cvPoint(theRealX*scale,theRealY*scale),
+	             cvPoint((theRealX+theRealWidth)*scale,
+	                     (theRealY+theRealHeight)*scale),
+	             CV_RGB(0,255,0), 3, 8, 0 );
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[OpenCV] translation selon X : %d - translation selon Y : %d\n", (theRealX - prev_x0), (theRealY -prev_y0) ));
 
@@ -111,7 +111,7 @@
 		char *buf;
 		u32 buf_size;
 		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_int(bs, 1, 1); 
+		gf_bs_write_int(bs, 1, 1);
 		gf_bs_write_float(bs, (Float) (theRealX - 640/2) );
 		gf_bs_write_float(bs, (Float) (480/2 - theRealY) );
 
@@ -125,42 +125,42 @@
 
 	prev_x0=theRealX;
 	prev_y0=theRealY;
-	
+
 	if( small_image != image )
-        cvReleaseImage( &small_image );
-    
+		cvReleaseImage( &small_image );
+
 	cvReleaseMemStorage( &storage );
 }
 
 static u32 OCV_Run(void *par)
 {
-    IplImage* image;
-    CvCapture *capture;
+	IplImage* image;
+	CvCapture *capture;
 	GF_InputSensorDevice *ifce = (GF_InputSensorDevice *)par;
 	GF_OpenCV *ocv = (GF_OpenCV *)ifce->udta;
 
-    capture= cvCaptureFromCAM(0);
-    cvSetCaptureProperty(capture, CV_CAP_PROP_FRAME_WIDTH,640  );
-    cvSetCaptureProperty( capture, CV_CAP_PROP_FRAME_HEIGHT, 480 );
+	capture= cvCaptureFromCAM(0);
+	cvSetCaptureProperty(capture, CV_CAP_PROP_FRAME_WIDTH,640  );
+	cvSetCaptureProperty( capture, CV_CAP_PROP_FRAME_HEIGHT, 480 );
 
-    cvNamedWindow( "test", 0 );
+	cvNamedWindow( "test", 0 );
 
-    image = NULL;
-	while (ocv->running) { 
+	image = NULL;
+	while (ocv->running) {
 		if (cvGrabFrame(capture)) {
-            CvHaarClassifierCascade* cascade;
-			
+			CvHaarClassifierCascade* cascade;
+
 			image = cvRetrieveFrame(capture);
-			
+
 			cascade = load_object_detector("haarcascade_frontalface_default.xml");
 			detect_and_draw_objects(ifce, image, cascade, 1 );
 
-			
+
 			cvShowImage( "test", image );
 			cvWaitKey(40);
 		}
 	}
-    if (image) cvReleaseImage( &image);
+	if (image) cvReleaseImage( &image);
 	return 0;
 }
 
@@ -179,7 +179,7 @@
 
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_INPUT_DEVICE_INTERFACE,
@@ -218,4 +218,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( opencv_is )
+GPAC_MODULE_STATIC_DECLARATION( opencv_is )

gpac-0.5.0.svn5178.tar.bz2/modules/openhevc_dec/openhevc_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/openhevc_dec/openhevc_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2010-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,18 +34,15 @@
 
 #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
 #  pragma comment(lib, "libLibOpenHevcWrapper")
-#endif
 
-//temporary hack for WIN32 version
-#if defined(_WIN32) && !defined (WIN64)
-void libOpenHevcSetActiveDecoders(OpenHevc_Handle openHevcHandle, int val)
-{
-}
+#if !defined _WIN64
 void libOpenHevcSetViewLayers(OpenHevc_Handle openHevcHandle, int val)
 {
 }
 #endif
 
+#endif
+
 typedef struct
 {
 	u16 ES_ID;
@@ -61,46 +58,81 @@
 
 	GF_ESD *esd;
 	OpenHevc_Handle openHevcHandle;
-
 	u32 nb_layers;
-    Bool base_only;
-
 	u32 output_cb_size;
 
 	u32 display_bpp;
 	Bool conv_to_8bit;
 	char *conv_buffer;
+
+	u32 frame_idx;
+	Bool pack_mode;
+
+	u32 dec_frames;
+
 } 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 (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data)
+		return GF_OK;
+	cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
+	if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
+	if (ctx->nalu_size_length != cfg->nal_unit_size)
+		return GF_NON_COMPLIANT_BITSTREAM;
+
+	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->nalu_size_length);
+			gf_bs_write_data(bs, sl->data, sl->size);
+		}
+	}
 
+	gf_bs_get_content(bs, &data, &data_len);
+	gf_bs_del(bs);
+	libOpenHevcDecode(ctx->openHevcHandle, (u8 *)data, data_len, 0);
+	gf_free(data);
+
+	libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 2);
+	libOpenHevcSetViewLayers(ctx->openHevcHandle, 1);
+
+	return GF_OK;
+}
 
 static GF_Err HEVC_ConfigureStream(HEVCDec *ctx, GF_ESD *esd)
 {
-    u32 i, j;
-    GF_HEVCConfig *cfg = NULL;
+	u32 i, j;
+	GF_HEVCConfig *cfg = NULL;
 	ctx->ES_ID = esd->ESID;
 	ctx->width = ctx->height = ctx->out_size = ctx->luma_bpp = ctx->chroma_bpp = 0;
-	
-    ctx->nb_layers = 1;
-    ctx->base_only = GF_FALSE;
-   
-    
+
+	ctx->nb_layers = 1;
+
 	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 		HEVCState hevc;
 		memset(&hevc, 0, sizeof(HEVCState));
 
 		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;
-        
- 		for (i=0; i< gf_list_count(cfg->param_array); i++) {
- 			GF_HEVCParamArray *ar = gf_list_get(cfg->param_array, i);
-            for (j=0; j< gf_list_count(ar->nalus); j++) {
-                GF_AVCConfigSlot *sl = 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) {
+		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->nalu_size_length = cfg->nal_unit_size;
+
+		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);
+				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);
@@ -109,38 +141,43 @@
 
 					if (hdr & 0x1f8) {
 						ctx->nb_layers ++;
-                    }
+					}
 				}
-	            else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+				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) {
+				else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
 					gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
 				}
-            }
-        }
+			}
+		}
 		gf_odf_hevc_cfg_del(cfg);
-    } else {
+	} else {
 		ctx->nalu_size_length = 0;
-		ctx->nb_layers = 2;
 	}
 
+	ctx->openHevcHandle = libOpenHevcInit(ctx->nb_threads, ctx->threading_type);
 
-    ctx->openHevcHandle = libOpenHevcInit(ctx->nb_threads, ctx->threading_type);
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_DEBUG) ) {	
+	if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_DEBUG) ) {
 		libOpenHevcSetDebugMode(ctx->openHevcHandle, 1);
 	}
 #endif
 
-	libOpenHevcSetActiveDecoders(ctx->openHevcHandle, ctx->nb_layers);
-    libOpenHevcSetViewLayers(ctx->openHevcHandle, ctx->nb_layers);
 
 	if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-		libOpenHevcCopyExtraData(ctx->openHevcHandle, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength+8);
+		libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 1/*ctx->nb_layers*/);
+		libOpenHevcSetViewLayers(ctx->openHevcHandle, ctx->nb_layers-1);
+
+		libOpenHevcCopyExtraData(ctx->openHevcHandle, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+	} else {
+		//hardcoded values: 2 layers max, display layer 0
+		libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 1/*ctx->nb_layers*/);
+		libOpenHevcSetViewLayers(ctx->openHevcHandle, 0/*ctx->nb_layers-1*/);
 	}
 
-    libOpenHevcStartDecoder(ctx->openHevcHandle);
+	libOpenHevcStartDecoder(ctx->openHevcHandle);
+
 
 	ctx->stride = ((ctx->luma_bpp==8) && (ctx->chroma_bpp==8)) ? ctx->width : ctx->width * 2;
 	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
@@ -150,7 +187,9 @@
 		ctx->out_size /= 2;
 		ctx->chroma_bpp = ctx->luma_bpp = 8;
 		ctx->conv_to_8bit = 1;
+		ctx->pack_mode = 0;
 	}
+	ctx->dec_frames = 0;
 	return GF_OK;
 }
 
@@ -195,10 +234,16 @@
 	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->pack_mode = 1;
+	else if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "PackHFR", "no");
 
 
-	/*once base layer is configured, nothing to do on enhancement*/
-	if (esd->dependsOnESID) return GF_OK;
+	/*RTP case: configure enhancement now*/
+	if (esd->dependsOnESID) {
+		HEVC_ConfigurationScalableStream(ctx, esd);
+		return GF_OK;
+	}
 
 	ctx->esd = esd;
 	return HEVC_ConfigureStream(ctx, esd);
@@ -209,10 +254,11 @@
 {
 	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
 
-	if (ctx->is_init) {
+	if (ctx->openHevcHandle) {
 		libOpenHevcClose(ctx->openHevcHandle);
-		ctx->is_init = GF_FALSE;
+		ctx->openHevcHandle = NULL;
 	}
+	ctx->is_init = 0;
 	ctx->width = ctx->height = ctx->out_size = 0;
 	if (ctx->conv_buffer) gf_free(ctx->conv_buffer);
 	ctx->conv_buffer = NULL;
@@ -230,18 +276,21 @@
 		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;
+		}
 		break;
 	case GF_CODEC_STRIDE:
 		capability->cap.valueInt = ctx->stride;
-		if (ctx->direct_output && !ctx->conv_buffer) {
-			//to fix soon - currently hardcoded to 32 pixels
-			if ((ctx->luma_bpp==8) && (ctx->chroma_bpp==8)) 
-				capability->cap.valueInt += 32;
-			else
-				capability->cap.valueInt += 64;
+
+		if (ctx->pack_mode) {
+			capability->cap.valueInt *= 2;
 		}
 		break;
 	case GF_CODEC_PAR:
@@ -249,6 +298,9 @@
 		break;
 	case GF_CODEC_OUTPUT_SIZE:
 		capability->cap.valueInt = ctx->out_size;
+		if (ctx->pack_mode) {
+			capability->cap.valueInt *= 4;
+		}
 		break;
 	case GF_CODEC_PIXEL_FORMAT:
 		capability->cap.valueInt = (ctx->luma_bpp==10) ? GF_PIXEL_YV12_10 : GF_PIXEL_YV12;
@@ -268,6 +320,9 @@
 	case GF_CODEC_REORDER:
 		capability->cap.valueInt = 1;
 		break;
+	case GF_CODEC_TRUSTED_CTS:
+		capability->cap.valueInt = 1;
+		break;
 	case GF_CODEC_DIRECT_OUTPUT:
 		capability->cap.valueBool = 1;
 		break;
@@ -286,27 +341,32 @@
 	case GF_CODEC_DISPLAY_BPP:
 		ctx->display_bpp = capability.cap.valueInt;
 		return GF_OK;
-    case GF_CODEC_WAIT_RAP:
-		if (ctx->openHevcHandle)
-            libOpenHevcFlush(ctx->openHevcHandle);
-        return GF_OK;
+	case GF_CODEC_WAIT_RAP:
+		if (ctx->dec_frames) {
+			//quick hack, we have an issue with openHEVC resuming after being flushed ...
+			ctx->had_pic = 0;
+			libOpenHevcClose(ctx->openHevcHandle);
+			ctx->openHevcHandle = NULL;
+			ctx->is_init = GF_FALSE;
+			HEVC_ConfigureStream(ctx, ctx->esd);
+		}
+		return GF_OK;
 	case GF_CODEC_MEDIA_SWITCH_QUALITY:
 		/*switch up*/
-		if (capability.cap.valueInt) {
-            ctx->base_only = GF_FALSE;
-			libOpenHevcSetViewLayers(ctx->openHevcHandle, 1);		
-//			libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 1);
+		if (capability.cap.valueInt > 0) {
+			libOpenHevcSetViewLayers(ctx->openHevcHandle, 1);
+			libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 1);
 		} else {
-            ctx->base_only = GF_TRUE;
-			libOpenHevcSetViewLayers(ctx->openHevcHandle, 0);		
-//			libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 0);
+			libOpenHevcSetViewLayers(ctx->openHevcHandle, 0);
+			libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 0);
 		}
 		return GF_OK;
 	case GF_CODEC_DIRECT_OUTPUT:
 		ctx->direct_output = GF_TRUE;
+		ctx->pack_mode = 0;
 		if (ctx->conv_to_8bit && ctx->out_size)
 			ctx->conv_buffer = gf_realloc(ctx->conv_buffer, sizeof(char)*ctx->out_size);
-		
+
 		return GF_OK;
 	}
 	/*return unsupported to avoid confusion by the player (like color space changing ...) */
@@ -314,30 +374,37 @@
 
 }
 
-static GF_Err HEVC_flush_picture(HEVCDec *ctx, char *outBuffer, u32 *outBufferLength )
+static GF_Err HEVC_flush_picture(HEVCDec *ctx, char *outBuffer, u32 *outBufferLength, u32 *CTS)
 {
 	unsigned int a_w, a_h, a_stride, bit_depth;
-    OpenHevc_Frame_cpy openHevcFrame;
-
-	libOpenHevcGetPictureInfo(ctx->openHevcHandle, &openHevcFrame.frameInfo);
+	OpenHevc_Frame_cpy openHevcFrame;
 
+	if (ctx->direct_output)
+		libOpenHevcGetPictureInfo(ctx->openHevcHandle, &openHevcFrame.frameInfo);
+	else
+		libOpenHevcGetPictureInfoCpy(ctx->openHevcHandle, &openHevcFrame.frameInfo);
 
 	a_w      = openHevcFrame.frameInfo.nWidth;
-    a_h      = openHevcFrame.frameInfo.nHeight;
-    a_stride = openHevcFrame.frameInfo.nYPitch;
+	a_h      = openHevcFrame.frameInfo.nHeight;
+	a_stride = openHevcFrame.frameInfo.nYPitch;
 	bit_depth = openHevcFrame.frameInfo.nBitDepth;
 
+	*CTS = (u32) openHevcFrame.frameInfo.nTimeStamp;
+
 	if (!ctx->output_as_8bit) {
-		if ((ctx->luma_bpp>8) || (ctx->chroma_bpp>8)) a_stride *= 2;
+		if ((ctx->luma_bpp>8) || (ctx->chroma_bpp>8)) {
+			ctx->pack_mode = 0;
+		}
 	} else {
 		if (bit_depth>8) {
 			bit_depth=8;
-
 			ctx->conv_to_8bit = 1;
+			a_stride /= 2;
+			ctx->pack_mode = 0;
 		}
 	}
 
-	if ((ctx->width != a_w) || (ctx->height!=a_h) || (ctx->stride != a_stride) || (ctx->luma_bpp!= bit_depth)  || (ctx->chroma_bpp != bit_depth) ){
+	if ((ctx->width != a_w) || (ctx->height!=a_h) || (ctx->stride != a_stride) || (ctx->luma_bpp!= bit_depth)  || (ctx->chroma_bpp != bit_depth) ) {
 		ctx->width = a_w;
 		ctx->stride = a_stride;
 		ctx->height = a_h;
@@ -355,43 +422,92 @@
 	if (!ctx->conv_to_8bit && ctx->direct_output) {
 		*outBufferLength = ctx->out_size;
 		ctx->has_pic = GF_TRUE;
-	} else {
-		if (ctx->conv_to_8bit) {
-			OpenHevc_Frame openHevcFramePtr;
-			if (libOpenHevcGetOutput(ctx->openHevcHandle, 1, &openHevcFramePtr)) {
-				GF_VideoSurface dst;
-				memset(&dst, 0, sizeof(GF_VideoSurface));
-				dst.width = ctx->width;
-				dst.height = ctx->height;
-				dst.pitch_y = ctx->width;
-				dst.video_buffer = ctx->direct_output ? ctx->conv_buffer : outBuffer;
-				dst.pixel_format = GF_PIXEL_YV12;
-
-				gf_color_write_yv12_10_to_yuv(&dst, (u8 *) openHevcFramePtr.pvY, (u8 *) openHevcFramePtr.pvU, (u8 *) openHevcFramePtr.pvV, (openHevcFramePtr.frameInfo.nYPitch + 32)*2, ctx->width, ctx->height, NULL);
-				*outBufferLength = ctx->out_size;	
-				
-				if (ctx->direct_output ) 
-					ctx->has_pic = GF_TRUE;
+		return GF_OK;
+	}
+
+	if (ctx->conv_to_8bit) {
+		OpenHevc_Frame openHevcFramePtr;
+		if (libOpenHevcGetOutput(ctx->openHevcHandle, 1, &openHevcFramePtr)) {
+			GF_VideoSurface dst;
+			memset(&dst, 0, sizeof(GF_VideoSurface));
+			dst.width = ctx->width;
+			dst.height = ctx->height;
+			dst.pitch_y = ctx->width;
+			dst.video_buffer = ctx->direct_output ? ctx->conv_buffer : outBuffer;
+			dst.pixel_format = GF_PIXEL_YV12;
+
+			gf_color_write_yv12_10_to_yuv(&dst, (u8 *) openHevcFramePtr.pvY, (u8 *) openHevcFramePtr.pvU, (u8 *) openHevcFramePtr.pvV, openHevcFramePtr.frameInfo.nYPitch, ctx->width, ctx->height, NULL, 0);
+			*outBufferLength = ctx->out_size;
+
+			if (ctx->direct_output )
+				ctx->has_pic = GF_TRUE;
+		}
+		return GF_OK;
+	}
+
+	if (ctx->pack_mode) {
+		OpenHevc_Frame openHFrame;
+		u8 *pY, *pU, *pV;
+
+		u32 idx_w, idx_h;
+		idx_w = ((ctx->frame_idx==0) || (ctx->frame_idx==2)) ? 0 : ctx->width;
+		idx_h = ((ctx->frame_idx==0) || (ctx->frame_idx==1)) ? 0 : ctx->height*2*ctx->stride;
+
+		pY = (void*) ( outBuffer + idx_h + idx_w );
+		pU = (void*) (outBuffer + 2*ctx->stride*2*ctx->height + idx_w/2 +  idx_h/4);
+		pV = (void*) (outBuffer + 2*ctx->stride*2*ctx->height + ctx->stride*ctx->height + idx_w/2 + idx_h/4);
+
+
+		*outBufferLength = 0;
+		if (libOpenHevcGetOutput(ctx->openHevcHandle, 1, &openHFrame)) {
+			u32 i, s_stride, qs_stride, d_stride, dd_stride, hd_stride;
+
+			s_stride = openHFrame.frameInfo.nYPitch;
+			qs_stride = s_stride / 4;
+
+			d_stride = ctx->stride;
+			dd_stride = 2*ctx->stride;
+			hd_stride = ctx->stride/2;
+
+			for (i=0; i<ctx->height; i++) {
+				memcpy(pY,  (u8 *) openHFrame.pvY + i*s_stride, d_stride);
+				pY += dd_stride;
+
+				if (! (i%2) ) {
+					memcpy(pU,  (u8 *) openHFrame.pvU + i*qs_stride, hd_stride);
+					pU += d_stride;
+
+					memcpy(pV,  (u8 *) openHFrame.pvV + i*qs_stride, hd_stride);
+					pV += d_stride;
+				}
 			}
-		} else {
-			openHevcFrame.pvY = (void*) outBuffer;
-			openHevcFrame.pvU = (void*) (outBuffer + ctx->stride * ctx->height);
-			openHevcFrame.pvV = (void*) (outBuffer + 5*ctx->stride * ctx->height/4);
-			*outBufferLength = 0;
-			if (libOpenHevcGetOutputCpy(ctx->openHevcHandle, 1, &openHevcFrame)) {
-				*outBufferLength = ctx->out_size;
+
+			ctx->frame_idx++;
+			if (ctx->frame_idx==4) {
+				*outBufferLength = 4 * ctx->out_size;
+				ctx->frame_idx = 0;
 			}
 		}
+		return GF_OK;
 	}
-    return GF_OK;
+
+
+	openHevcFrame.pvY = (void*) outBuffer;
+	openHevcFrame.pvU = (void*) (outBuffer + ctx->stride * ctx->height);
+	openHevcFrame.pvV = (void*) (outBuffer + 5*ctx->stride * ctx->height/4);
+	*outBufferLength = 0;
+	if (libOpenHevcGetOutputCpy(ctx->openHevcHandle, 1, &openHevcFrame)) {
+		*outBufferLength = ctx->out_size;
+	}
+	return GF_OK;
 }
 
 
-static GF_Err HEVC_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -399,18 +515,23 @@
 
 	if (!inBuffer) {
 		if ( libOpenHevcDecode(ctx->openHevcHandle, NULL, 0, 0) ) {
-			return HEVC_flush_picture(ctx, outBuffer, outBufferLength);
+			return HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
 		}
- 		return GF_OK;
-	}
-
+		//quick hack, we have an issue with openHEVC resuming after being flushed ...
+		ctx->had_pic = 0;
+		libOpenHevcClose(ctx->openHevcHandle);
+		ctx->openHevcHandle = NULL;
+		ctx->is_init = GF_FALSE;
+		HEVC_ConfigureStream(ctx, ctx->esd);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("HEVC: Decoding AU %d bytes\n", inBufferLength));
+		return GF_OK;
+	}
 
-	if (!ES_ID || (ES_ID!=ctx->ES_ID) ) {
+	if (!ES_ID) {
 		*outBufferLength = 0;
 		return GF_OK;
 	}
+
 	if (*outBufferLength < ctx->out_size) {
 		*outBufferLength = ctx->out_size;
 		return GF_BUFFER_TOO_SMALL;
@@ -420,15 +541,17 @@
 
 	if (ctx->had_pic) {
 		ctx->had_pic = 0;
-		return HEVC_flush_picture(ctx, outBuffer, outBufferLength);
+		return HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
 	}
-	
-	got_pic = libOpenHevcDecode(ctx->openHevcHandle, (u8 *) inBuffer, inBufferLength, 0);
+	ctx->dec_frames++;
+	got_pic = libOpenHevcDecode(ctx->openHevcHandle, (u8 *) inBuffer, inBufferLength, *CTS);
+	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);
+		e = HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
 		if (e) return e;
 		got_pic = 0;
 	}
+
 	return GF_OK;
 }
 
@@ -436,7 +559,7 @@
 static GF_Err HEVC_GetOutputBuffer(GF_MediaDecoder *ifcg, u16 ESID, u8 **pY_or_RGB, u8 **pU, u8 **pV)
 {
 	s32 res;
-    OpenHevc_Frame openHevcFrame;
+	OpenHevc_Frame openHevcFrame;
 	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
 	if (!ctx->has_pic) return GF_BAD_PARAM;
 	ctx->has_pic = GF_FALSE;
@@ -485,14 +608,14 @@
 {
 	GF_MediaDecoder *ifcd;
 	HEVCDec *dec;
-	
+
 	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
 	GF_SAFEALLOC(dec, HEVCDec);
 	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "HEVC Decoder", "gpac distribution")
 
 	ifcd->privateStack = dec;
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = HEVC_AttachStream;
 	ifcd->DetachStream = HEVC_DetachStream;
 	ifcd->GetCapabilities = HEVC_GetCapabilities;
@@ -512,7 +635,7 @@
 }
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -520,11 +643,11 @@
 #endif
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewHEVCDec();
@@ -537,11 +660,11 @@
 {
 	switch (ifce->InterfaceType) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE: 
+	case GF_MEDIA_DECODER_INTERFACE:
 		DeleteHEVCDec((GF_BaseDecoder*)ifce);
 		break;
 #endif
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( openhevc )
+GPAC_MODULE_STATIC_DECLARATION( openhevc )

gpac-0.5.0.svn5178.tar.bz2/modules/opensvc_dec/opensvc_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/opensvc_dec/opensvc_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2010-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -51,8 +51,8 @@
 	int CurrentDqId;
 	int MaxDqId;
 	int DqIdTable[8];
-    int TemporalId;
-    int TemporalCom;
+	int TemporalId;
+	int TemporalCom;
 } OSVCDec;
 
 static GF_Err OSVC_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
@@ -63,10 +63,10 @@
 	int Layer[4];
 	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
 
-	/*todo: we should check base layer of this stream is indeed our base layer*/ 	
+	/*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;
+		ctx->width = ctx->height = ctx->out_size = 0;
 		if (!esd->dependsOnESID) ctx->baseES_ID = esd->ESID;
 	}
 
@@ -80,10 +80,10 @@
 
 		/*decode all NALUs*/
 		count = gf_list_count(cfg->sequenceParameterSets);
-        SetCommandLayer(Layer, 255, 0, &res, 0);//bufindex can be reset without pb
+		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;
+			s32 par_n=0, par_d=0;
 			GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
 
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -210,16 +210,16 @@
 
 }
 
-static GF_Err OSVC_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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];
+	int Layer[4];
 	u32 i, nalu_size, sc_size;
 	u8 *ptr;
 	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
@@ -236,10 +236,10 @@
 
 	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) 
+		//AVC stream in a h264 file
+		if (ctx->MaxDqId == -1)
 			ctx->MaxDqId = 0;
-		
+
 		ctx->CurrentDqId = ctx->MaxDqId;
 		ctx->init_layer_set = 1;
 	}
@@ -279,23 +279,23 @@
 		}
 #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));
+		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) {
@@ -310,7 +310,7 @@
 		}
 
 		if (ctx->state_found) {
-			if (!got_pic) 
+			if (!got_pic)
 				got_pic = decodeNAL(ctx->codec, ptr, nalu_size, &pic, Layer);
 			else
 				decodeNAL(ctx->codec, ptr, nalu_size, &pic, Layer);
@@ -397,14 +397,14 @@
 {
 	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*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = OSVC_AttachStream;
 	ifcd->DetachStream = OSVC_DetachStream;
 	ifcd->GetCapabilities = OSVC_GetCapabilities;
@@ -423,7 +423,7 @@
 }
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -431,11 +431,11 @@
 #endif
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewOSVCDec();
@@ -448,12 +448,12 @@
 {
 	switch (ifce->InterfaceType) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE: 
+	case GF_MEDIA_DECODER_INTERFACE:
 		DeleteOSVCDec((GF_BaseDecoder*)ifce);
 		break;
 #endif
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( opensvc )
+GPAC_MODULE_STATIC_DECLARATION( opensvc )

gpac-0.5.0.svn5178.tar.bz2/modules/osd/osd.c -> gpac-0.5.1.svn5491.tar.xz/modules/osd/osd.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2011-2012
  *			All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -152,7 +152,7 @@
 	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);
 
@@ -274,17 +274,17 @@
 }
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_TERM_EXT_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)osd_new();
 	return NULL;
@@ -300,4 +300,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( osd )
+GPAC_MODULE_STATIC_DECLARATION( osd )

gpac-0.5.0.svn5178.tar.bz2/modules/oss_audio/oss.c -> gpac-0.5.1.svn5491.tar.xz/modules/oss_audio/oss.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -51,7 +51,7 @@
 
 #define OSS_AUDIO_DEVICE	"/dev/dsp"
 
-typedef struct 
+typedef struct
 {
 	int audio_dev, sr, nb_ch;
 	u32 buf_size, delay, num_buffers, total_duration;
@@ -75,8 +75,8 @@
 	/*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;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[OSS] Cannot open audio device\n"));
+		return GF_NOT_SUPPORTED;
 	}
 
 	/*set blocking mode back*/
@@ -112,7 +112,7 @@
 	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 
+	/* 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;
@@ -123,26 +123,26 @@
 
 	blockalign = ctx->nb_ch;
 	if ((*nbBitsPerSample) == 16) {
-	  blockalign *= 2;
-	  format = AFMT_S16_LE;
+		blockalign *= 2;
+		format = AFMT_S16_LE;
 	} else {
-	  format = AFMT_S8;
+		format = AFMT_S8;
 	}
 	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SETFMT,&format)==-1) return GF_IO_ERR;
-        ctx->sr = (*SampleRate);
+	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))) 
+	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;
 
@@ -159,10 +159,10 @@
 	OSSCTX();
 	written = dr->FillBuffer(dr->audio_renderer, ctx->wav_buf, ctx->buf_size);
 	/*this will also perform sleep*/
-	if (written){
+	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));
+		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));
 		}
 	}
 }
@@ -172,8 +172,8 @@
 static void OSS_SetPriority(GF_AudioOutput*dr, u32 Priority) {}
 static u32 OSS_GetAudioDelay(GF_AudioOutput*dr)
 {
-  OSSCTX()
-  return ctx->delay;
+	OSSCTX()
+	return ctx->delay;
 }
 
 /*
@@ -186,18 +186,18 @@
 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;
+	*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;
+		*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;
@@ -259,7 +259,7 @@
  * interface
  */
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_AUDIO_OUTPUT_INTERFACE,
@@ -271,7 +271,7 @@
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
-	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) 
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
 		return NewOSSRender();
 	return NULL;
 }
@@ -283,4 +283,4 @@
 		DeleteOSSRender((GF_AudioOutput*)ifce);
 }
 
-GPAC_MODULE_STATIC_DELARATION( oss )
+GPAC_MODULE_STATIC_DECLARATION( oss )

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACFileMediaServer.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACFileMediaServer.cpp Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -43,9 +43,9 @@
 NPT_SET_LOCAL_LOGGER("gpac.media.server.file")
 
 GPAC_FileMediaServer::GPAC_FileMediaServer(const char*  friendly_name,
-                        bool         show_ip,
-                        const char*  uuid,
-						NPT_UInt16   port) : PLT_FileMediaServer("", friendly_name, show_ip, uuid, port) 
+        bool         show_ip,
+        const char*  uuid,
+        NPT_UInt16   port) : PLT_FileMediaServer("", friendly_name, show_ip, uuid, port)
 {
 }
 
@@ -53,8 +53,8 @@
 {
 	u8 buf[10];
 	if (!alias) {
-			sprintf((char*)buf, "%08X", gf_crc_32((char*) path, (u32) strlen(path)));
-			alias = (const char *)buf;
+		sprintf((char*)buf, "%08X", gf_crc_32((char*) path, (u32) strlen(path)));
+		alias = (const char *)buf;
 	}
 	m_Directories.Add(GPAC_MediaDirectory(alias, path, is_hidden));
 }
@@ -62,13 +62,13 @@
 
 
 NPT_Result
-GPAC_FileMediaServer::OnBrowseDirectChildren(PLT_ActionReference&          action, 
-												const char*                   object_id, 
-												const char*                   filter,
-												NPT_UInt32                    start_index,
-												NPT_UInt32                    req_count,
-												const char*   sort_criteria,
-												const PLT_HttpRequestContext& context)
+GPAC_FileMediaServer::OnBrowseDirectChildren(PLT_ActionReference&          action,
+        const char*                   object_id,
+        const char*                   filter,
+        NPT_UInt32                    start_index,
+        NPT_UInt32                    req_count,
+        const char*   sort_criteria,
+        const PLT_HttpRequestContext& context)
 {
 	/*not the root of our server*/
 	if (strcmp(object_id, "/") && strcmp(object_id, "\\") && strcmp(object_id, "0")) {
@@ -76,61 +76,61 @@
 	}
 
 	unsigned long cur_index = 0;
-    unsigned long num_returned = 0;
-    unsigned long total_matches = 0;
-    NPT_String didl = didl_header;
+	unsigned long num_returned = 0;
+	unsigned long total_matches = 0;
+	NPT_String didl = didl_header;
 
-    PLT_MediaObjectReference item;
+	PLT_MediaObjectReference item;
 	for (u32 i=0; i<m_Directories.GetItemCount(); i++) {
 		GPAC_MediaDirectory *alias;
 		m_Directories.Get(i, alias);
 		if (alias->m_Hide) continue;
 
-        item = BuildFromFilePath(alias->m_Path, context, true, false);
+		item = BuildFromFilePath(alias->m_Path, context, true, false);
 
-        if (!item.IsNull()) {
-            if ((cur_index >= start_index) && ((num_returned < req_count) || (req_count == 0))) {
-                NPT_String tmp;
-                NPT_CHECK_SEVERE(PLT_Didl::ToDidl(*item.AsPointer(), filter, tmp));
+		if (!item.IsNull()) {
+			if ((cur_index >= start_index) && ((num_returned < req_count) || (req_count == 0))) {
+				NPT_String tmp;
+				NPT_CHECK_SEVERE(PLT_Didl::ToDidl(*item.AsPointer(), filter, tmp));
 
-                didl += tmp;
-                num_returned++;
-            }
-            cur_index++;
-            total_matches++;        
-        }
-    };
+				didl += tmp;
+				num_returned++;
+			}
+			cur_index++;
+			total_matches++;
+		}
+	};
 
-    didl += didl_footer;
+	didl += didl_footer;
 
-    NPT_CHECK_SEVERE(action->SetArgumentValue("Result", didl));
-    NPT_CHECK_SEVERE(action->SetArgumentValue("NumberReturned", NPT_String::FromInteger(num_returned)));
-    NPT_CHECK_SEVERE(action->SetArgumentValue("TotalMatches", NPT_String::FromInteger(total_matches))); // 0 means we don't know how many we have but most browsers don't like that!!
-    NPT_CHECK_SEVERE(action->SetArgumentValue("UpdateId", "1"));
+	NPT_CHECK_SEVERE(action->SetArgumentValue("Result", didl));
+	NPT_CHECK_SEVERE(action->SetArgumentValue("NumberReturned", NPT_String::FromInteger(num_returned)));
+	NPT_CHECK_SEVERE(action->SetArgumentValue("TotalMatches", NPT_String::FromInteger(total_matches))); // 0 means we don't know how many we have but most browsers don't like that!!
+	NPT_CHECK_SEVERE(action->SetArgumentValue("UpdateId", "1"));
 
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
-NPT_Result 
-GPAC_FileMediaServer::ServeFile(NPT_HttpRequest&              request, 
-                                 const NPT_HttpRequestContext& context,
-                                 NPT_HttpResponse&             response,
-                                 const NPT_String&             _file_path)
+NPT_Result
+GPAC_FileMediaServer::ServeFile(NPT_HttpRequest&              request,
+                                const NPT_HttpRequestContext& context,
+                                NPT_HttpResponse&             response,
+                                const NPT_String&             _file_path)
 {
-    NPT_COMPILER_UNUSED(context);
+	NPT_COMPILER_UNUSED(context);
 
 	NPT_String file_path = _file_path;
-    NPT_String uri_path = NPT_Uri::PercentDecode(request.GetUrl().GetPath());
+	NPT_String uri_path = NPT_Uri::PercentDecode(request.GetUrl().GetPath());
 	NPT_String query = request.GetUrl().GetQuery();
 	if (! query.IsEmpty()) {
 		uri_path += "?";
 		uri_path += query;
 	}
 
-    // prevent hackers from accessing files outside of our root
-    if ((file_path.Find("/..") >= 0) || (file_path.Find("\\..") >= 0)) {
-        return NPT_FAILURE;
-    }
+	// prevent hackers from accessing files outside of our root
+	if ((file_path.Find("/..") >= 0) || (file_path.Find("\\..") >= 0)) {
+		return NPT_FAILURE;
+	}
 
 	NPT_String file_id = (const char *) file_path + ((file_path[0]=='0') ? 2:1);
 	for (u32 i=0; i<m_Directories.GetItemCount(); i++) {
@@ -166,35 +166,35 @@
 		}
 	}
 
-    // File requested
-    NPT_String path = m_FileRoot;
-    if (path.Compare(uri_path.Left(path.GetLength()), true) == 0) {
+	// File requested
+	NPT_String path = m_FileRoot;
+	if (path.Compare(uri_path.Left(path.GetLength()), true) == 0) {
 #if 0
-        NPT_Position start, end;
-        PLT_HttpHelper::GetRange(request, start, end);
-
-			return PLT_HttpServer::ServeFile(response,
-                                         file_path, 
-                                         start, 
-                                         end, 
-                                         !request.GetMethod().Compare("HEAD"));
+		NPT_Position start, end;
+		PLT_HttpHelper::GetRange(request, start, end);
+
+		return PLT_HttpServer::ServeFile(response,
+		                                 file_path,
+		                                 start,
+		                                 end,
+		                                 !request.GetMethod().Compare("HEAD"));
 #else
-			return PLT_HttpServer::ServeFile(request, context, response, NPT_FilePath::Create(m_FileRoot, file_path) );
+		return PLT_HttpServer::ServeFile(request, context, response, NPT_FilePath::Create(m_FileRoot, file_path) );
 #endif
-	} 
+	}
 
-    
-    return NPT_FAILURE;
+
+	return NPT_FAILURE;
 }
 
 NPT_Result
-GPAC_FileMediaServer::GetFilePath(const char* object_id, 
-                                 NPT_String& filepath) 
+GPAC_FileMediaServer::GetFilePath(const char* object_id,
+                                  NPT_String& filepath)
 {
-    if (!object_id) return NPT_ERROR_INVALID_PARAMETERS;
+	if (!object_id) return NPT_ERROR_INVALID_PARAMETERS;
 
 	NPT_String obj_id = object_id + (object_id[0]=='0' ? 2 : 1);
-    filepath = "";
+	filepath = "";
 	for (u32 i=0; i<m_Directories.GetItemCount(); i++) {
 		GPAC_MediaDirectory *dir;
 		m_Directories.Get(i, dir);
@@ -210,38 +210,38 @@
 		}
 	}
 
-    if (NPT_StringLength(object_id) > 2 || object_id[0]!='0') {
-        filepath += (const char*)object_id + (object_id[0]=='0'?1:0);
-    }
+	if (NPT_StringLength(object_id) > 2 || object_id[0]!='0') {
+		filepath += (const char*)object_id + (object_id[0]=='0'?1:0);
+	}
 
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 PLT_MediaObject*
-GPAC_FileMediaServer::BuildFromFilePath(const NPT_String&        filepath, 
-                                       const PLT_HttpRequestContext &context,
-                                       bool                     with_count,
-                                       bool                     keep_extension_in_title)
+GPAC_FileMediaServer::BuildFromFilePath(const NPT_String&        filepath,
+                                        const PLT_HttpRequestContext &context,
+                                        bool                     with_count,
+                                        bool                     keep_extension_in_title)
 {
 	return BuildFromFilePathAndHost(filepath, &context, with_count, keep_extension_in_title, NULL);
 
 }
 
 PLT_MediaObject*
-GPAC_FileMediaServer::BuildFromFilePathAndHost(const NPT_String&        __filepath, 
-                                       const PLT_HttpRequestContext *context,
-                                       bool                     with_count /* = true */,
-                                       bool                     keep_extension_in_title /* = false */,
-									   const char *host)
+GPAC_FileMediaServer::BuildFromFilePathAndHost(const NPT_String&        __filepath,
+        const PLT_HttpRequestContext *context,
+        bool                     with_count /* = true */,
+        bool                     keep_extension_in_title /* = false */,
+        const char *host)
 {
-    PLT_MediaItemResource resource;
-    PLT_MediaObject*      object = NULL;
+	PLT_MediaItemResource resource;
+	PLT_MediaObject*      object = NULL;
 	NPT_String filepath = __filepath;
 	unsigned int len;
 
-    /* retrieve the entry type (directory or file) */
-    NPT_FileInfo info; 
-    NPT_CHECK_LABEL_FATAL(NPT_File::GetInfo(__filepath, &info), failure);
+	/* retrieve the entry type (directory or file) */
+	NPT_FileInfo info;
+	NPT_CHECK_LABEL_FATAL(NPT_File::GetInfo(__filepath, &info), failure);
 
 	len = 0;
 	for (u32 i=0; i<m_Directories.GetItemCount(); i++) {
@@ -255,24 +255,24 @@
 	}
 
 
-    if (info.m_Type == NPT_FileInfo::FILE_TYPE_REGULAR) {
+	if (info.m_Type == NPT_FileInfo::FILE_TYPE_REGULAR) {
 		NPT_IpAddress ip;
 
-        object = new PLT_MediaItem();
+		object = new PLT_MediaItem();
 
-        /* Set the title using the filename for now */
-        object->m_Title = NPT_FilePath::BaseName(filepath, keep_extension_in_title);
-        if (object->m_Title.GetLength() == 0) goto failure;
+		/* Set the title using the filename for now */
+		object->m_Title = NPT_FilePath::BaseName(filepath, keep_extension_in_title);
+		if (object->m_Title.GetLength() == 0) goto failure;
 
-        /* Set the protocol Info from the extension */
-        resource.m_ProtocolInfo = PLT_ProtocolInfo(PLT_ProtocolInfo::GetProtocolInfo(filepath, true, context));
-        if (!resource.m_ProtocolInfo.IsValid())  goto failure;
+		/* Set the protocol Info from the extension */
+		resource.m_ProtocolInfo = PLT_ProtocolInfo(PLT_ProtocolInfo::GetProtocolInfo(filepath, true, context));
+		if (!resource.m_ProtocolInfo.IsValid())  goto failure;
 
-        /* Set the resource file size */
-        resource.m_Size = info.m_Size;
- 
-        /* format the resource URI */
-        NPT_String url = "0" + filepath;
+		/* Set the resource file size */
+		resource.m_Size = info.m_Size;
+
+		/* format the resource URI */
+		NPT_String url = "0" + filepath;
 
 
 		if (host) {
@@ -306,37 +306,37 @@
 
 #if 0
 		/* Look to see if a metadatahandler exists for this extension */
-        PLT_MetadataHandler* handler = NULL;
-        NPT_Result res = NPT_ContainerFind(
-            m_MetadataHandlers, 
-            PLT_MetadataHandlerFinder(NPT_FilePath::FileExtension(filepath)), 
-            handler);
-        if (NPT_SUCCEEDED(res) && handler) {
-            /* if it failed loading data, reset the metadatahandler so we don't use it */
-            if (NPT_SUCCEEDED(handler->Load(filepath))) {
-                /* replace the title with the one from the Metadata */
-                NPT_String newTitle;
-                if (handler->GetTitle(newTitle) != NULL) {
-                    object->m_Title = newTitle;
-                }
-
-                /* assign description */
-                handler->GetDescription(object->m_Description.long_description);
-
-                /* assign album art uri if we haven't yet */
-                /* prepend the album art base URI and url encode it */ 
-                if (object->m_ExtraInfo.album_art_uri.GetLength() == 0) {
-                    object->m_ExtraInfo.album_art_uri = 
-						NPT_Uri::PercentEncode(BuildResourceUri(m_AlbumArtBaseUri, ip.ToString(), url), 
-                                               NPT_Uri::UnsafeCharsToEncode);
-                }
-
-                /* duration */
-                handler->GetDuration(resource.m_Duration);
-
-                /* protection */
-                handler->GetProtection(resource.m_Protection);
-            }
+		PLT_MetadataHandler* handler = NULL;
+		NPT_Result res = NPT_ContainerFind(
+		                     m_MetadataHandlers,
+		                     PLT_MetadataHandlerFinder(NPT_FilePath::FileExtension(filepath)),
+		                     handler);
+		if (NPT_SUCCEEDED(res) && handler) {
+			/* if it failed loading data, reset the metadatahandler so we don't use it */
+			if (NPT_SUCCEEDED(handler->Load(filepath))) {
+				/* replace the title with the one from the Metadata */
+				NPT_String newTitle;
+				if (handler->GetTitle(newTitle) != NULL) {
+					object->m_Title = newTitle;
+				}
+
+				/* assign description */
+				handler->GetDescription(object->m_Description.long_description);
+
+				/* assign album art uri if we haven't yet */
+				/* prepend the album art base URI and url encode it */
+				if (object->m_ExtraInfo.album_art_uri.GetLength() == 0) {
+					object->m_ExtraInfo.album_art_uri =
+					    NPT_Uri::PercentEncode(BuildResourceUri(m_AlbumArtBaseUri, ip.ToString(), url),
+					                           NPT_Uri::UnsafeCharsToEncode);
+				}
+
+				/* duration */
+				handler->GetDuration(resource.m_Duration);
+
+				/* protection */
+				handler->GetProtection(resource.m_Protection);
+			}
 		}
 #endif
 		object->m_ObjectClass.type = PLT_MediaItem::GetUPnPClass(filepath, context);
@@ -346,53 +346,53 @@
 		object->m_Resources.Add(resource);
 
 	} else {
-        object = new PLT_MediaContainer;
+		object = new PLT_MediaContainer;
 
-        /* Assign a title for this container */
-        if ((filepath.Compare("/", true) == 0) || (filepath.Compare("\\", true) == 0)) {
-            object->m_Title = "Root";
-        } else {
+		/* Assign a title for this container */
+		if ((filepath.Compare("/", true) == 0) || (filepath.Compare("\\", true) == 0)) {
+			object->m_Title = "Root";
+		} else {
 			filepath.TrimRight("/\\");
-            object->m_Title = NPT_FilePath::BaseName(filepath, keep_extension_in_title);
-            if (object->m_Title.GetLength() == 0) goto failure;
-        }
+			object->m_Title = NPT_FilePath::BaseName(filepath, keep_extension_in_title);
+			if (object->m_Title.GetLength() == 0) goto failure;
+		}
 
 #ifndef _WIN32_WCE
 		/* Get the number of children for this container */
-        NPT_Cardinal count = 0;
+		NPT_Cardinal count = 0;
 
 		// reset output params
 		count = 0;
-        if (with_count ) {
+		if (with_count ) {
 			NPT_List<NPT_String> entries;
-			NPT_File::ListDir(__filepath, entries);    
+			NPT_File::ListDir(__filepath, entries);
 			count = entries.GetItemCount();
-            ((PLT_MediaContainer*)object)->m_ChildrenCount = count;
-        }
+			((PLT_MediaContainer*)object)->m_ChildrenCount = count;
+		}
 #endif	//_WIN32_WCE
 
-        object->m_ObjectClass.type = "object.container";
-    }
+		object->m_ObjectClass.type = "object.container";
+	}
 
-    /* is it the root? */
-    if ((filepath.Compare("/", true) == 0) || (filepath.Compare("\\", true) == 0)) {
-        object->m_ParentID = "-1";
-        object->m_ObjectID = "0";
-    } else {
-        NPT_String directory = NPT_FilePath::DirName(filepath);
-        /* is the parent path the root? */
+	/* is it the root? */
+	if ((filepath.Compare("/", true) == 0) || (filepath.Compare("\\", true) == 0)) {
+		object->m_ParentID = "-1";
+		object->m_ObjectID = "0";
+	} else {
+		NPT_String directory = NPT_FilePath::DirName(filepath);
+		/* is the parent path the root? */
 		if ((directory.Compare("/", true) == 0) || (directory.Compare("\\", true) == 0)) {
-            object->m_ParentID = "0";
-        } else {
-            object->m_ParentID = "0" + directory;
-        }
-        object->m_ObjectID = "0" + filepath;
-    }
-    return object;
+			object->m_ParentID = "0";
+		} else {
+			object->m_ParentID = "0" + directory;
+		}
+		object->m_ObjectID = "0" + filepath;
+	}
+	return object;
 
 failure:
-    delete object;
-    return NULL;
+	delete object;
+	return NULL;
 }
 
 
@@ -435,7 +435,7 @@
 		}
 		/*if no parent directory, we don't allow sharing of the resource*/
 		if (nb_sep!=2) return "";
-		
+
 		char sep = abs_url[len-i];
 		abs_url[len-i] = 0;
 		newdir = abs_url;
@@ -493,7 +493,7 @@
 				the_uri += "?";
 			else if (!strnicmp(sep, "%5c", 3))
 				the_uri += "/";
-			else 
+			else
 				the_uri += " ";
 			uri= sep+3;
 			continue;
@@ -511,22 +511,22 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[UPnP] sharing virtual file %s as %s\n", res_uri, (const char *)the_uri));
 }
 
-NPT_Result 
+NPT_Result
 GPAC_FileMediaServer::ServeVirtualFile(NPT_HttpResponse& response,
-                          GPAC_VirtualFile  *vfile, 
-                          NPT_Position      start,
-                          NPT_Position      end,
-                          bool              request_is_head) 
+                                       GPAC_VirtualFile  *vfile,
+                                       NPT_Position      start,
+                                       NPT_Position      end,
+                                       bool              request_is_head)
 {
-    NPT_LargeSize            total_len;
-    NPT_Result               result;
+	NPT_LargeSize            total_len;
+	NPT_Result               result;
 
 	NPT_MemoryStream* memory_stream = new NPT_MemoryStream(vfile->m_Content.GetChars(), vfile->m_Content.GetLength() );
-    NPT_InputStreamReference stream(memory_stream);
+	NPT_InputStreamReference stream(memory_stream);
 
 	if (NPT_FAILED(result = stream->GetSize(total_len)) ) {
-        response.SetStatus(404, "File Not Found");
-        return NPT_SUCCESS;
+		response.SetStatus(404, "File Not Found");
+		return NPT_SUCCESS;
 	}
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[UPnP] Serving virtual file %s\n", vfile->m_Content.GetChars()));
@@ -536,44 +536,44 @@
 	response.SetEntity(entity);
 	entity->SetContentType(vfile->m_MIME);
 
-    // request is HEAD, returns without setting a body
-    if (request_is_head) return NPT_SUCCESS;
-
-    // see if it was a byte range request
-    if (start != (NPT_Position)-1 || end != (NPT_Position)-1) {
-        // we can only support a range from an offset to the end of the resource for now
-        // due to the fact we can't limit how much to read from a stream yet
-        NPT_Position start_offset = (NPT_Position)-1, end_offset = total_len - 1, len;
-        if (start == (NPT_Position)-1 && end != (NPT_Position)-1) {
-            // we are asked for the last N=end bytes
-            // adjust according to total length
-            if (end >= total_len) {
-                start_offset = 0;
-            } else {
-                start_offset = total_len-end;
-            }
-        } else if (start != (NPT_Position)-1) {
-            start_offset = start;
-            // if the end is specified but incorrect
-            // set the end_offset in order to generate a bad response
-            if (end != (NPT_Position)-1 && end < start) {
-                end_offset = (NPT_Position)-1;
-            }
-        }
-
-        // in case the range request was invalid or we can't seek then respond appropriately
-        if (start_offset == (NPT_Position)-1 || end_offset == (NPT_Position)-1 || 
-            start_offset > end_offset || NPT_FAILED(stream->Seek(start_offset))) {
-            response.SetStatus(416, "Requested range not satisfiable");
-        } else {
-            len = end_offset - start_offset + 1;
-            response.SetStatus(206, "Partial Content");
-            entity->SetInputStream(stream);
-            entity->SetContentLength(len);
-        }
-    } else {
-        entity->SetInputStream(stream);
-    }
-    return NPT_SUCCESS;
+	// request is HEAD, returns without setting a body
+	if (request_is_head) return NPT_SUCCESS;
+
+	// see if it was a byte range request
+	if (start != (NPT_Position)-1 || end != (NPT_Position)-1) {
+		// we can only support a range from an offset to the end of the resource for now
+		// due to the fact we can't limit how much to read from a stream yet
+		NPT_Position start_offset = (NPT_Position)-1, end_offset = total_len - 1, len;
+		if (start == (NPT_Position)-1 && end != (NPT_Position)-1) {
+			// we are asked for the last N=end bytes
+			// adjust according to total length
+			if (end >= total_len) {
+				start_offset = 0;
+			} else {
+				start_offset = total_len-end;
+			}
+		} else if (start != (NPT_Position)-1) {
+			start_offset = start;
+			// if the end is specified but incorrect
+			// set the end_offset in order to generate a bad response
+			if (end != (NPT_Position)-1 && end < start) {
+				end_offset = (NPT_Position)-1;
+			}
+		}
+
+		// in case the range request was invalid or we can't seek then respond appropriately
+		if (start_offset == (NPT_Position)-1 || end_offset == (NPT_Position)-1 ||
+		        start_offset > end_offset || NPT_FAILED(stream->Seek(start_offset))) {
+			response.SetStatus(416, "Requested range not satisfiable");
+		} else {
+			len = end_offset - start_offset + 1;
+			response.SetStatus(206, "Partial Content");
+			entity->SetInputStream(stream);
+			entity->SetContentLength(len);
+		}
+	} else {
+		entity->SetInputStream(stream);
+	}
+	return NPT_SUCCESS;
 }

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACFileMediaServer.h -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACFileMediaServer.h Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -73,7 +73,7 @@
 		m_MIME = mime;
 		m_temporary = temporary;
 	}
-	bool operator==(const GPAC_VirtualFile & v1) { 
+	bool operator==(const GPAC_VirtualFile & v1) {
 		return m_URI==v1.m_URI;
 	}
 
@@ -86,49 +86,49 @@
 class GPAC_FileMediaServer : public PLT_FileMediaServer
 {
 public:
-    GPAC_FileMediaServer(const char*  friendly_name,
-                        bool         show_ip = false,
-                        const char*  uuid = NULL,
-						NPT_UInt16   port = 0);
+	GPAC_FileMediaServer(const char*  friendly_name,
+	                     bool         show_ip = false,
+	                     const char*  uuid = NULL,
+	                     NPT_UInt16   port = 0);
 
 
 	void AddSharedDirectory(const char *path, const char *alias, Bool is_hidden = GF_FALSE);
 
-    NPT_String GetResourceURI(const char *file_path, const char *for_host);
-    void ShareVirtualResource(const char *res_uri, const char *res_val, const char *res_mime, Bool temporary = GF_FALSE);
+	NPT_String GetResourceURI(const char *file_path, const char *for_host);
+	void ShareVirtualResource(const char *res_uri, const char *res_val, const char *res_mime, Bool temporary = GF_FALSE);
 
 protected:
-    virtual NPT_Result OnBrowseDirectChildren(PLT_ActionReference&          action, 
-												const char*                   object_id, 
-												const char*                   filter,
-												NPT_UInt32                    starting_index,
-												NPT_UInt32                    requested_count,
-												const char *   sort_criteria,
-												const PLT_HttpRequestContext& context);
+	virtual NPT_Result OnBrowseDirectChildren(PLT_ActionReference&          action,
+	        const char*                   object_id,
+	        const char*                   filter,
+	        NPT_UInt32                    starting_index,
+	        NPT_UInt32                    requested_count,
+	        const char *   sort_criteria,
+	        const PLT_HttpRequestContext& context);
 
 	virtual NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
 
-    virtual NPT_Result ServeFile(NPT_HttpRequest&              request, 
-                                 const NPT_HttpRequestContext& context,
-                                 NPT_HttpResponse&             response,
-                                 const NPT_String&             file_path);
+	virtual NPT_Result ServeFile(NPT_HttpRequest&              request,
+	                             const NPT_HttpRequestContext& context,
+	                             NPT_HttpResponse&             response,
+	                             const NPT_String&             file_path);
 
-    virtual PLT_MediaObject* BuildFromFilePath(const NPT_String&             filepath, 
-                                               const PLT_HttpRequestContext& context,
-                                               bool                          with_count = true,
-                                               bool                          keep_extension_in_title = false);
+	virtual PLT_MediaObject* BuildFromFilePath(const NPT_String&             filepath,
+	        const PLT_HttpRequestContext& context,
+	        bool                          with_count = true,
+	        bool                          keep_extension_in_title = false);
 
-    PLT_MediaObject* BuildFromFilePathAndHost(const NPT_String&        filepath, 
-                                       const PLT_HttpRequestContext *context = NULL,
-                                       bool                     with_count = true,
-                                       bool                     keep_extension_in_title = false,
-									   const char *for_host = NULL);
+	PLT_MediaObject* BuildFromFilePathAndHost(const NPT_String&        filepath,
+	        const PLT_HttpRequestContext *context = NULL,
+	        bool                     with_count = true,
+	        bool                     keep_extension_in_title = false,
+	        const char *for_host = NULL);
 
 	NPT_Result ServeVirtualFile(NPT_HttpResponse& response,
-                          GPAC_VirtualFile  *vfile, 
-                          NPT_Position      start,
-                          NPT_Position      end,
-                          bool              request_is_head);
+	                            GPAC_VirtualFile  *vfile,
+	                            NPT_Position      start,
+	                            NPT_Position      end,
+	                            bool              request_is_head);
 
 private:
 	NPT_List<GPAC_MediaDirectory> m_Directories;

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACMediaController.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACMediaController.cpp Changed

@@ -2,25 +2,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -34,8 +34,8 @@
 
 GPAC_MediaController::GPAC_MediaController(PLT_CtrlPointReference& ctrlPoint, GF_UPnP *upnp)
 {
-    m_MediaController = new PLT_MediaController(ctrlPoint, this);
-    m_MediaBrowser = new PLT_MediaBrowser(ctrlPoint, this);
+	m_MediaController = new PLT_MediaController(ctrlPoint, this);
+	m_MediaBrowser = new PLT_MediaBrowser(ctrlPoint, this);
 
 	m_MediaServers = gf_list_new();
 	m_MediaRenderers = gf_list_new();
@@ -48,7 +48,7 @@
 {
 	delete m_MediaController;
 	m_MediaController=NULL;
-    delete m_MediaBrowser;
+	delete m_MediaBrowser;
 	m_MediaBrowser=NULL;
 
 	while (gf_list_count(m_MediaServers)) {
@@ -71,28 +71,28 @@
 
 
 
-bool 
+bool
 GPAC_MediaController::OnMRAdded(PLT_DeviceDataReference& device)
 {
-    NPT_String uuid = device->GetUUID();
+	NPT_String uuid = device->GetUUID();
 
 	gf_mx_p(m_ControlPointLock);
 
-    // test if it's a media renderer
-    PLT_Service* service;
-    if (NPT_SUCCEEDED(device->FindServiceByType("urn:schemas-upnp-org:service:AVTransport:1", service))) {
-        gf_list_add(m_MediaRenderers, new GPAC_MediaRendererItem(device, uuid) );
-    }
+	// test if it's a media renderer
+	PLT_Service* service;
+	if (NPT_SUCCEEDED(device->FindServiceByType("urn:schemas-upnp-org:service:AVTransport:1", service))) {
+		gf_list_add(m_MediaRenderers, new GPAC_MediaRendererItem(device, uuid) );
+	}
 	m_pUPnP->OnMediaRendererAdd(device, 1);
 	gf_mx_v(m_ControlPointLock);
 	return true;
 }
 
 
-void 
+void
 GPAC_MediaController::OnMRRemoved(PLT_DeviceDataReference& device)
 {
-    NPT_String uuid = device->GetUUID();
+	NPT_String uuid = device->GetUUID();
 
 	gf_mx_p(m_ControlPointLock);
 
@@ -111,19 +111,19 @@
 	gf_mx_v(m_ControlPointLock);
 }
 
-bool 
+bool
 GPAC_MediaController::OnMSAdded(PLT_DeviceDataReference& device)
 {
-    NPT_String uuid = device->GetUUID();
+	NPT_String uuid = device->GetUUID();
 
-     gf_mx_p(m_ControlPointLock);
-    // test if it's a media server
-    PLT_Service* service;
-    if (NPT_SUCCEEDED(device->FindServiceByType("urn:schemas-upnp-org:service:ContentDirectory:1", service))) {
+	gf_mx_p(m_ControlPointLock);
+	// test if it's a media server
+	PLT_Service* service;
+	if (NPT_SUCCEEDED(device->FindServiceByType("urn:schemas-upnp-org:service:ContentDirectory:1", service))) {
 		gf_list_add(m_MediaServers, new GPAC_MediaServerItem(device, uuid) );
-    }
+	}
 	m_pUPnP->OnMediaServerAdd(device, 1);
-    gf_mx_v(m_ControlPointLock);
+	gf_mx_v(m_ControlPointLock);
 	return true;
 }
 
@@ -131,9 +131,9 @@
 void
 GPAC_MediaController::OnMSRemoved(PLT_DeviceDataReference& device)
 {
-    NPT_String uuid = device->GetUUID();
+	NPT_String uuid = device->GetUUID();
 
-     gf_mx_p(m_ControlPointLock);
+	gf_mx_p(m_ControlPointLock);
 	u32 i, count;
 	count = gf_list_count(m_MediaServers);
 	for (i=0; i<count; i++) {
@@ -145,15 +145,15 @@
 		}
 	}
 	m_pUPnP->OnMediaServerAdd(device, 0);
-    gf_mx_v(m_ControlPointLock);
+	gf_mx_v(m_ControlPointLock);
 }
 
 
 
 NPT_Result
-GPAC_MediaController::OnActionResponse(NPT_Result           res, 
-                                      PLT_ActionReference& action, 
-                                      void*                userdata)
+GPAC_MediaController::OnActionResponse(NPT_Result           res,
+                                       PLT_ActionReference& action,
+                                       void*                userdata)
 {
 	return NPT_SUCCESS;
 }
@@ -178,7 +178,7 @@
 		}
 	}
 	if (render_idx < 0) return;
-	
+
 	count = vars->GetItemCount();
 	for (i=0; i<count; i++) {
 		PLT_StateVariable *svar;
@@ -204,22 +204,22 @@
 
 void GPAC_MediaController::OnBrowseResult(NPT_Result res, PLT_DeviceDataReference& device, PLT_BrowseInfo* info, void* userdata)
 {
-    NPT_COMPILER_UNUSED(device);
+	NPT_COMPILER_UNUSED(device);
 
-    NPT_COMPILER_UNUSED(device);
+	NPT_COMPILER_UNUSED(device);
 
-    if (!userdata) return;
+	if (!userdata) return;
 
-    GPAC_BrowseDataReference* data = (GPAC_BrowseDataReference*) userdata;
-    (*data)->res = res;
-    if (NPT_SUCCEEDED(res) && info) {
-        (*data)->info = *info;
-    }
-    (*data)->shared_var.SetValue(1);
-    delete data;
+	GPAC_BrowseDataReference* data = (GPAC_BrowseDataReference*) userdata;
+	(*data)->res = res;
+	if (NPT_SUCCEEDED(res) && info) {
+		(*data)->info = *info;
+	}
+	(*data)->shared_var.SetValue(1);
+	delete data;
 }
 
-void 
+void
 GPAC_MediaController::OnMSStateVariablesChanged(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars)
 {
 	GPAC_MediaServerItem *ms = NULL;
@@ -234,129 +234,129 @@
 		}
 		ms = NULL;
 	}
-	
+
 	if (!ms) {
 		gf_mx_v(m_ControlPointLock);
 		return;
 	}
 
-    PLT_StateVariable* var = PLT_StateVariable::Find(*vars, "ContainerUpdateIDs");
-    if (var) {
-        // variable found, parse value
-        NPT_String value = var->GetValue();
-        NPT_String item_id, update_id;
-        int index;
-
-        while (value.GetLength()) {
-            // look for container id
-            index = value.Find(',');
-            if (index < 0) break;
-            item_id = value.Left(index);
-            value = value.SubString(index+1);
-
-            // look for update id
-            if (value.GetLength()) {
-                index = value.Find(',');
-                update_id = (index<0)?value:value.Left(index);
-                value = (index<0)?"":value.SubString(index+1);
+	PLT_StateVariable* var = PLT_StateVariable::Find(*vars, "ContainerUpdateIDs");
+	if (var) {
+		// variable found, parse value
+		NPT_String value = var->GetValue();
+		NPT_String item_id, update_id;
+		int index;
+
+		while (value.GetLength()) {
+			// look for container id
+			index = value.Find(',');
+			if (index < 0) break;
+			item_id = value.Left(index);
+			value = value.SubString(index+1);
+
+			// look for update id
+			if (value.GetLength()) {
+				index = value.Find(',');
+				update_id = (index<0)?value:value.Left(index);
+				value = (index<0)?"":value.SubString(index+1);
 
 				m_pUPnP->ContainerChanged(ms->m_device, item_id, update_id);
-            }       
-        }
-    }        
+			}
+		}
+	}
 	gf_mx_v(m_ControlPointLock);
 }
 
 NPT_Result
 GPAC_MediaController::WaitForResponse(NPT_SharedVariable& shared_var)
 {
-    return shared_var.WaitUntilEquals(1, 30000);
+	return shared_var.WaitUntilEquals(1, 30000);
 }
 
 
-NPT_Result 
+NPT_Result
 GPAC_MediaController::Browse(GPAC_BrowseDataReference& browse_data,
-                             PLT_DeviceDataReference& device, 
-                             const char*              object_id, 
-                             NPT_Int32                index, 
+                             PLT_DeviceDataReference& device,
+                             const char*              object_id,
+                             NPT_Int32                index,
                              NPT_Int32                count,
                              bool                     browse_metadata,
-                             const char*              filter, 
+                             const char*              filter,
                              const char*              sort)
 {
-    NPT_Result res;
-
-    browse_data->shared_var.SetValue(0);
-
-    // send off the browse packet.  Note that this will
-    // not block.  There is a call to WaitForResponse in order
-    // to block until the response comes back.
-    res = m_MediaBrowser->Browse(device,
-        (const char*)object_id,
-        index,
-        count,
-        browse_metadata,
-        filter,
-        sort,
-        new GPAC_BrowseDataReference(browse_data));		
-    NPT_CHECK_SEVERE(res);
-
-    return WaitForResponse(browse_data->shared_var);
+	NPT_Result res;
+
+	browse_data->shared_var.SetValue(0);
+
+	// send off the browse packet.  Note that this will
+	// not block.  There is a call to WaitForResponse in order
+	// to block until the response comes back.
+	res = m_MediaBrowser->Browse(device,
+	                             (const char*)object_id,
+	                             index,
+	                             count,
+	                             browse_metadata,
+	                             filter,
+	                             sort,
+	                             new GPAC_BrowseDataReference(browse_data));
+	NPT_CHECK_SEVERE(res);
+
+	return WaitForResponse(browse_data->shared_var);
 }
 
-NPT_Result 
+NPT_Result
 GPAC_MediaController::Browse(GPAC_MediaServerItem *server, const char *object_id, const char *filter)
 {
-    NPT_Result res = NPT_FAILURE;
-    NPT_Int32  index = 0;
+	NPT_Result res = NPT_FAILURE;
+	NPT_Int32  index = 0;
 
-    // reset output params
+	// reset output params
 	server->m_BrowseResults = NULL;
 
 
-	do {	
-        GPAC_BrowseDataReference browse_data(new GPAC_BrowseData());
-
-        // send off the browse packet.  Note that this will
-        // not block.  There is a call to WaitForResponse in order
-        // to block until the response comes back.
-        res = Browse(browse_data,
-			server->m_device,
-            (const char*)object_id,
-            index,
-            1024,
-            false,
-            filter,
-            "");		
-        NPT_CHECK_LABEL_WARNING(res, done);
-        
-        if (NPT_FAILED(browse_data->res)) {
-            res = browse_data->res;
-            NPT_CHECK_LABEL_WARNING(res, done);
-        }
-
-        if (browse_data->info.items->GetItemCount() == 0)
-            break;
-
-        if (server->m_BrowseResults.IsNull()) {
-            server->m_BrowseResults = browse_data->info.items;
-        } else {
-            server->m_BrowseResults->Add(*browse_data->info.items);
-            // clear the list items so that the data inside is not
-            // cleaned up by PLT_MediaItemList dtor since we copied
-            // each pointer into the new list.
-            browse_data->info.items->Clear();
-        }
-
-        // stop now if our list contains exactly what the server said it had
-        if (browse_data->info.tm && browse_data->info.tm == server->m_BrowseResults->GetItemCount())
-            break;
-
-        // ask for the next chunk of entries
-        index = server->m_BrowseResults->GetItemCount();
-    } while(1);
+	do {
+		GPAC_BrowseDataReference browse_data(new GPAC_BrowseData());
+
+		// send off the browse packet.  Note that this will
+		// not block.  There is a call to WaitForResponse in order
+		// to block until the response comes back.
+		res = Browse(browse_data,
+		             server->m_device,
+		             (const char*)object_id,
+		             index,
+		             1024,
+		             false,
+		             filter,
+		             "");
+		NPT_CHECK_LABEL_WARNING(res, done);
+
+		if (NPT_FAILED(browse_data->res)) {
+			res = browse_data->res;
+			NPT_CHECK_LABEL_WARNING(res, done);
+		}
+
+		if (browse_data->info.items->GetItemCount() == 0)
+			break;
+
+		if (server->m_BrowseResults.IsNull()) {
+			server->m_BrowseResults = browse_data->info.items;
+		} else {
+			server->m_BrowseResults->Add(*browse_data->info.items);
+			// clear the list items so that the data inside is not
+			// cleaned up by PLT_MediaItemList dtor since we copied
+			// each pointer into the new list.
+			browse_data->info.items->Clear();
+		}
+
+		// stop now if our list contains exactly what the server said it had
+		if (browse_data->info.tm && browse_data->info.tm == server->m_BrowseResults->GetItemCount())
+			break;
+
+		// ask for the next chunk of entries
+		index = server->m_BrowseResults->GetItemCount();
+	} while(1);
 
 done:
-    return res;
+	return res;
 }

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACMediaController.h -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACMediaController.h Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -40,9 +40,9 @@
 #include <gpac/thread.h>
 
 typedef struct {
-    NPT_SharedVariable shared_var;
-    NPT_Result         res;
-    PLT_BrowseInfo     info;
+	NPT_SharedVariable shared_var;
+	NPT_Result         res;
+	PLT_BrowseInfo     info;
 } GPAC_BrowseData;
 
 /*basic class to hold each media renderer*/
@@ -71,40 +71,40 @@
 
 class GF_UPnP;
 
-class GPAC_MediaController : public PLT_CtrlPointListener, 
-							public PLT_MediaControllerDelegate,
-							public PLT_MediaBrowserDelegate
+class GPAC_MediaController : public PLT_CtrlPointListener,
+	public PLT_MediaControllerDelegate,
+	public PLT_MediaBrowserDelegate
 {
 public:
-    GPAC_MediaController(PLT_CtrlPointReference& ctrlPoint, GF_UPnP *upnp);
-    ~GPAC_MediaController();
+	GPAC_MediaController(PLT_CtrlPointReference& ctrlPoint, GF_UPnP *upnp);
+	~GPAC_MediaController();
 
-	virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device) 
+	virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device)
 	{
 		return NPT_SUCCESS;
 	}
-    virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device)
+	virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device)
 	{
 		return NPT_SUCCESS;
 	}
-	virtual NPT_Result OnActionResponse(NPT_Result           res, 
-                                      PLT_ActionReference& action, 
-                                      void*                userdata);
-    virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
+	virtual NPT_Result OnActionResponse(NPT_Result           res,
+	                                    PLT_ActionReference& action,
+	                                    void*                userdata);
+	virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
 
-    // PLT_MediaControllerDelegate
+	// PLT_MediaControllerDelegate
 	virtual bool OnMRAdded(PLT_DeviceDataReference& device);
 	virtual void OnMRRemoved(PLT_DeviceDataReference& device);
-    virtual void OnMRStateVariablesChanged(PLT_Service* /* service */, NPT_List<PLT_StateVariable*>* /* vars */);
+	virtual void OnMRStateVariablesChanged(PLT_Service* /* service */, NPT_List<PLT_StateVariable*>* /* vars */);
 
 	//PLT_MediaBrowserDelegate
-    virtual bool OnMSAdded(PLT_DeviceDataReference& device);
-    virtual void OnMSRemoved(PLT_DeviceDataReference& device);
-    virtual void OnMSStateVariablesChanged(PLT_Service *service, NPT_List<PLT_StateVariable*>* vars);
-	virtual void OnBrowseResult(NPT_Result               res, 
-                                  PLT_DeviceDataReference& device, 
-                                  PLT_BrowseInfo*          info, 
-                                  void*                    userdata);
+	virtual bool OnMSAdded(PLT_DeviceDataReference& device);
+	virtual void OnMSRemoved(PLT_DeviceDataReference& device);
+	virtual void OnMSStateVariablesChanged(PLT_Service *service, NPT_List<PLT_StateVariable*>* vars);
+	virtual void OnBrowseResult(NPT_Result               res,
+	                            PLT_DeviceDataReference& device,
+	                            PLT_BrowseInfo*          info,
+	                            void*                    userdata);
 
 	NPT_Result Browse(GPAC_MediaServerItem *server, const char *id, const char *filter);
 
@@ -112,23 +112,23 @@
 	GF_List *m_MediaRenderers;
 	GF_List *m_MediaServers;
 
-    /* The UPnP MediaRenderer control point. */
-    PLT_MediaController*    m_MediaController;
-    /* The UPnP MediaServer control point. */
-    PLT_MediaBrowser *m_MediaBrowser;
+	/* The UPnP MediaRenderer control point. */
+	PLT_MediaController*    m_MediaController;
+	/* The UPnP MediaServer control point. */
+	PLT_MediaBrowser *m_MediaBrowser;
 
 protected:
-    NPT_Result Browse(GPAC_BrowseDataReference& browse_data,
-                      PLT_DeviceDataReference& device, 
-                      const char*              object_id,
-                      NPT_Int32                index, 
-                      NPT_Int32                count,
-                      bool                     browse_metadata = false,
-                      const char*              filter = "*", 
-                      const char*              sort = "");
+	NPT_Result Browse(GPAC_BrowseDataReference& browse_data,
+	                  PLT_DeviceDataReference& device,
+	                  const char*              object_id,
+	                  NPT_Int32                index,
+	                  NPT_Int32                count,
+	                  bool                     browse_metadata = false,
+	                  const char*              filter = "*",
+	                  const char*              sort = "");
 
 private:
-    NPT_Result  WaitForResponse(NPT_SharedVariable& shared_var);
+	NPT_Result  WaitForResponse(NPT_SharedVariable& shared_var);
 
 	GF_UPnP *m_pUPnP;
 	GF_Mutex *m_ControlPointLock;

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACMediaRenderer.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACMediaRenderer.cpp Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -46,11 +46,11 @@
 	sprintf(str, "%02d:%02d:%02d", h, m, s);
 }
 
-GPAC_MediaRenderer::GPAC_MediaRenderer(GF_UPnP *upnp, const char*  friendly_name, 
-                                     bool         show_ip, 
-                                     const char*  uuid, 
-                                     unsigned int port) :	
-    PLT_DeviceHost("/", uuid, "urn:schemas-upnp-org:device:MediaRenderer:1", friendly_name, show_ip, port)
+GPAC_MediaRenderer::GPAC_MediaRenderer(GF_UPnP *upnp, const char*  friendly_name,
+                                       bool         show_ip,
+                                       const char*  uuid,
+                                       unsigned int port) :
+	PLT_DeviceHost("/", uuid, "urn:schemas-upnp-org:device:MediaRenderer:1", friendly_name, show_ip, port)
 {
 	m_mediaHistoryList = gf_list_new();
 	m_pUPnP = upnp;
@@ -74,113 +74,113 @@
 NPT_Result
 GPAC_MediaRenderer::SetupServices()
 {
-    PLT_Service* service;
-
-    {
-        /* AVTransport */
-        m_pAVService = new PLT_Service(
-            this,
-            "urn:schemas-upnp-org:service:AVTransport:1", 
-            "urn:upnp-org:serviceId:AVTransport",
-            "AVTransport",
-            "urn:schemas-upnp-org:metadata-1-0/AVT/");
-
-        NPT_CHECK_FATAL(m_pAVService->SetSCPDXML((const char*) RDR_AVTransportSCPD));
-        NPT_CHECK_FATAL(AddService(m_pAVService));
-
-        m_pAVService->SetStateVariableRate("LastChange", NPT_TimeInterval(0.2f));
-        m_pAVService->SetStateVariable("A_ARG_TYPE_InstanceID", "0"); 
-
-        // GetCurrentTransportActions
-        m_pAVService->SetStateVariable("CurrentTransportActions", "Play,Pause,Stop,Seek,Next,Previous");
-
-        // GetDeviceCapabilities
-        m_pAVService->SetStateVariable("PossiblePlaybackStorageMedia", "NONE,NETWORK");
-        m_pAVService->SetStateVariable("PossibleRecordStorageMedia", "NOT_IMPLEMENTED");
-        m_pAVService->SetStateVariable("PossibleRecordQualityModes", "NOT_IMPLEMENTED");
-
-        // GetMediaInfo
-        m_pAVService->SetStateVariable("NumberOfTracks", "0");
-        m_pAVService->SetStateVariable("CurrentMediaDuration", "00:00:00");;
-        m_pAVService->SetStateVariable("AVTransportURI", "");
-        m_pAVService->SetStateVariable("AVTransportURIMetadata", "");;
-        m_pAVService->SetStateVariable("NextAVTransportURI", "NOT_IMPLEMENTED");
-        m_pAVService->SetStateVariable("NextAVTransportURIMetadata", "NOT_IMPLEMENTED");
-        m_pAVService->SetStateVariable("PlaybackStorageMedium", "NONE");
-        m_pAVService->SetStateVariable("RecordStorageMedium", "NOT_IMPLEMENTED");
-        m_pAVService->SetStateVariable("RecordMediumWriteStatus", "NOT_IMPLEMENTED");
-
-        // GetPositionInfo
-        m_pAVService->SetStateVariable("CurrentTrack", "0");
-        m_pAVService->SetStateVariable("CurrentTrackDuration", "00:00:00");
-        m_pAVService->SetStateVariable("CurrentTrackMetadata", "");
-        m_pAVService->SetStateVariable("CurrentTrackURI", "");
-        m_pAVService->SetStateVariable("RelativeTimePosition", "00:00:00"); 
-        m_pAVService->SetStateVariable("AbsoluteTimePosition", "00:00:00");
-        m_pAVService->SetStateVariable("RelativeCounterPosition", "2147483647"); // means NOT_IMPLEMENTED
-        m_pAVService->SetStateVariable("AbsoluteCounterPosition", "2147483647"); // means NOT_IMPLEMENTED
-
-        // disable indirect eventing for certain state variables
-        //PLT_StateVariable* var;
-        //var = 
-			m_pAVService->FindStateVariable("RelativeTimePosition");
-        //if (var) var->DisableIndirectEventing();
-        //var = 
-			m_pAVService->FindStateVariable("AbsoluteTimePosition");
-        //if (var) var->DisableIndirectEventing();
-        //var = 
-			m_pAVService->FindStateVariable("RelativeCounterPosition");
-        //if (var) var->DisableIndirectEventing();
-        //var = 
-			m_pAVService->FindStateVariable("AbsoluteCounterPosition");
-        //if (var) var->DisableIndirectEventing();
-
-        // GetTransportInfo
-        m_pAVService->SetStateVariable("TransportState", "NO_MEDIA_PRESENT");
-        m_pAVService->SetStateVariable("TransportStatus", "OK");
-        m_pAVService->SetStateVariable("TransportPlaySpeed", "1");
-
-        // GetTransportSettings
-        m_pAVService->SetStateVariable("CurrentPlayMode", "NORMAL");
-        m_pAVService->SetStateVariable("CurrentRecordQualityMode", "NOT_IMPLEMENTED");
-    }
-
-    {
-        /* ConnectionManager */
-        service = new PLT_Service(
-            this,
-            "urn:schemas-upnp-org:service:ConnectionManager:1", 
-            "urn:upnp-org:serviceId:ConnectionManager",
-            "ConnectionManager");
-        NPT_CHECK_FATAL(service->SetSCPDXML((const char*) RDR_ConnectionManagerSCPD));
-        NPT_CHECK_FATAL(AddService(service));
-
-        service->SetStateVariable("CurrentConnectionIDs", "0");
-
-        // put all supported mime types here instead
-        service->SetStateVariable("SinkProtocolInfo", "http-get:*:*:*, rtsp-rtp-udp:*:*:*");
-        service->SetStateVariable("SourceProtocolInfo", "");
-    }
-
-    {
-        /* RenderingControl */
-        service = new PLT_Service(
-            this,
-            "urn:schemas-upnp-org:service:RenderingControl:1", 
-            "urn:upnp-org:serviceId:RenderingControl",
-            "RenderingControl",
-            "urn:schemas-upnp-org:metadata-1-0/RCS/");
-        NPT_CHECK_FATAL(service->SetSCPDXML((const char*) RDR_RenderingControlSCPD));
-        NPT_CHECK_FATAL(AddService(service));
-
-        service->SetStateVariableRate("LastChange", NPT_TimeInterval(0.2f));
-
-        service->SetStateVariable("Mute", "0");
-        service->SetStateVariable("Volume", "100");
-    }
-
-    {
-static NPT_UInt8 MIGRATION_SCPDXML[] = "<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\
+	PLT_Service* service;
+
+	{
+		/* AVTransport */
+		m_pAVService = new PLT_Service(
+		    this,
+		    "urn:schemas-upnp-org:service:AVTransport:1",
+		    "urn:upnp-org:serviceId:AVTransport",
+		    "AVTransport",
+		    "urn:schemas-upnp-org:metadata-1-0/AVT/");
+
+		NPT_CHECK_FATAL(m_pAVService->SetSCPDXML((const char*) RDR_AVTransportSCPD));
+		NPT_CHECK_FATAL(AddService(m_pAVService));
+
+		m_pAVService->SetStateVariableRate("LastChange", NPT_TimeInterval(0.2f));
+		m_pAVService->SetStateVariable("A_ARG_TYPE_InstanceID", "0");
+
+		// GetCurrentTransportActions
+		m_pAVService->SetStateVariable("CurrentTransportActions", "Play,Pause,Stop,Seek,Next,Previous");
+
+		// GetDeviceCapabilities
+		m_pAVService->SetStateVariable("PossiblePlaybackStorageMedia", "NONE,NETWORK");
+		m_pAVService->SetStateVariable("PossibleRecordStorageMedia", "NOT_IMPLEMENTED");
+		m_pAVService->SetStateVariable("PossibleRecordQualityModes", "NOT_IMPLEMENTED");
+
+		// GetMediaInfo
+		m_pAVService->SetStateVariable("NumberOfTracks", "0");
+		m_pAVService->SetStateVariable("CurrentMediaDuration", "00:00:00");;
+		m_pAVService->SetStateVariable("AVTransportURI", "");
+		m_pAVService->SetStateVariable("AVTransportURIMetadata", "");;
+		m_pAVService->SetStateVariable("NextAVTransportURI", "NOT_IMPLEMENTED");
+		m_pAVService->SetStateVariable("NextAVTransportURIMetadata", "NOT_IMPLEMENTED");
+		m_pAVService->SetStateVariable("PlaybackStorageMedium", "NONE");
+		m_pAVService->SetStateVariable("RecordStorageMedium", "NOT_IMPLEMENTED");
+		m_pAVService->SetStateVariable("RecordMediumWriteStatus", "NOT_IMPLEMENTED");
+
+		// GetPositionInfo
+		m_pAVService->SetStateVariable("CurrentTrack", "0");
+		m_pAVService->SetStateVariable("CurrentTrackDuration", "00:00:00");
+		m_pAVService->SetStateVariable("CurrentTrackMetadata", "");
+		m_pAVService->SetStateVariable("CurrentTrackURI", "");
+		m_pAVService->SetStateVariable("RelativeTimePosition", "00:00:00");
+		m_pAVService->SetStateVariable("AbsoluteTimePosition", "00:00:00");
+		m_pAVService->SetStateVariable("RelativeCounterPosition", "2147483647"); // means NOT_IMPLEMENTED
+		m_pAVService->SetStateVariable("AbsoluteCounterPosition", "2147483647"); // means NOT_IMPLEMENTED
+
+		// disable indirect eventing for certain state variables
+		//PLT_StateVariable* var;
+		//var =
+		m_pAVService->FindStateVariable("RelativeTimePosition");
+		//if (var) var->DisableIndirectEventing();
+		//var =
+		m_pAVService->FindStateVariable("AbsoluteTimePosition");
+		//if (var) var->DisableIndirectEventing();
+		//var =
+		m_pAVService->FindStateVariable("RelativeCounterPosition");
+		//if (var) var->DisableIndirectEventing();
+		//var =
+		m_pAVService->FindStateVariable("AbsoluteCounterPosition");
+		//if (var) var->DisableIndirectEventing();
+
+		// GetTransportInfo
+		m_pAVService->SetStateVariable("TransportState", "NO_MEDIA_PRESENT");
+		m_pAVService->SetStateVariable("TransportStatus", "OK");
+		m_pAVService->SetStateVariable("TransportPlaySpeed", "1");
+
+		// GetTransportSettings
+		m_pAVService->SetStateVariable("CurrentPlayMode", "NORMAL");
+		m_pAVService->SetStateVariable("CurrentRecordQualityMode", "NOT_IMPLEMENTED");
+	}
+
+	{
+		/* ConnectionManager */
+		service = new PLT_Service(
+		    this,
+		    "urn:schemas-upnp-org:service:ConnectionManager:1",
+		    "urn:upnp-org:serviceId:ConnectionManager",
+		    "ConnectionManager");
+		NPT_CHECK_FATAL(service->SetSCPDXML((const char*) RDR_ConnectionManagerSCPD));
+		NPT_CHECK_FATAL(AddService(service));
+
+		service->SetStateVariable("CurrentConnectionIDs", "0");
+
+		// put all supported mime types here instead
+		service->SetStateVariable("SinkProtocolInfo", "http-get:*:*:*, rtsp-rtp-udp:*:*:*");
+		service->SetStateVariable("SourceProtocolInfo", "");
+	}
+
+	{
+		/* RenderingControl */
+		service = new PLT_Service(
+		    this,
+		    "urn:schemas-upnp-org:service:RenderingControl:1",
+		    "urn:upnp-org:serviceId:RenderingControl",
+		    "RenderingControl",
+		    "urn:schemas-upnp-org:metadata-1-0/RCS/");
+		NPT_CHECK_FATAL(service->SetSCPDXML((const char*) RDR_RenderingControlSCPD));
+		NPT_CHECK_FATAL(AddService(service));
+
+		service->SetStateVariableRate("LastChange", NPT_TimeInterval(0.2f));
+
+		service->SetStateVariable("Mute", "0");
+		service->SetStateVariable("Volume", "100");
+	}
+
+	{
+		static NPT_UInt8 MIGRATION_SCPDXML[] = "<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\">\
     <serviceStateTable>\
         <stateVariable>\
             <name>MigrationStatus</name>\
@@ -226,88 +226,88 @@
     </actionList>\
 </scpd>";
 
-        /* MigrationService */
-        m_pMigrationService = new PLT_Service(this, "urn:intermedia:service:migration:1", "urn:intermedia:service:migration.001", "SessionMigration");
-		
+		/* MigrationService */
+		m_pMigrationService = new PLT_Service(this, "urn:intermedia:service:migration:1", "urn:intermedia:service:migration.001", "SessionMigration");
+
 		NPT_CHECK_FATAL(m_pMigrationService->SetSCPDXML((const char*) MIGRATION_SCPDXML));
-        NPT_CHECK_FATAL(AddService(m_pMigrationService));
+		NPT_CHECK_FATAL(AddService(m_pMigrationService));
 
-        m_pMigrationService->SetStateVariable("MigrationStatus", "OK");
-        m_pMigrationService->SetStateVariable("MigrationMetaData", "");
-    }
+		m_pMigrationService->SetStateVariable("MigrationStatus", "OK");
+		m_pMigrationService->SetStateVariable("MigrationMetaData", "");
+	}
 
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 NPT_Result
-GPAC_MediaRenderer::OnAction(PLT_ActionReference&          action, 
-                            const PLT_HttpRequestContext& context)
+GPAC_MediaRenderer::OnAction(PLT_ActionReference&          action,
+                             const PLT_HttpRequestContext& context)
 {
-    NPT_COMPILER_UNUSED(context);
+	NPT_COMPILER_UNUSED(context);
 
-    /* parse the action name */
-    NPT_String name = action->GetActionDesc().GetName();
+	/* parse the action name */
+	NPT_String name = action->GetActionDesc().GetName();
 
 	m_ip_src = context.GetRemoteAddress().GetIpAddress().ToString();
 
 	/* Is it a ConnectionManager Service Action ? */
-    if (name.Compare("GetCurrentConnectionIDs", true) == 0) {
-        if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
-            return NPT_FAILURE;
-        }
-        return NPT_SUCCESS;
-    }
-    if (name.Compare("GetProtocolInfo", true) == 0) {
-        if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
-            return NPT_FAILURE;
-        }
-        return NPT_SUCCESS;
-    }    
-    if (name.Compare("GetCurrentConnectionInfo", true) == 0) {
-        return OnGetCurrentConnectionInfo(action);
-    }  
-    if (name.Compare("StopForMigration", true) == 0) {
+	if (name.Compare("GetCurrentConnectionIDs", true) == 0) {
+		if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
+			return NPT_FAILURE;
+		}
+		return NPT_SUCCESS;
+	}
+	if (name.Compare("GetProtocolInfo", true) == 0) {
+		if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
+			return NPT_FAILURE;
+		}
+		return NPT_SUCCESS;
+	}
+	if (name.Compare("GetCurrentConnectionInfo", true) == 0) {
+		return OnGetCurrentConnectionInfo(action);
+	}
+	if (name.Compare("StopForMigration", true) == 0) {
 		NPT_String res = m_pUPnP->OnMigrate();
-        m_pMigrationService->SetStateVariable("MigrationStatus", "OK");
-        m_pMigrationService->SetStateVariable("MigrationMetaData", res);
+		m_pMigrationService->SetStateVariable("MigrationStatus", "OK");
+		m_pMigrationService->SetStateVariable("MigrationMetaData", res);
 
 		if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
-            return NPT_FAILURE;
-        }
-        return NPT_SUCCESS;
-    }  
-
-    /* Is it a AVTransport Service Action ? */
-
-    // since all actions take an instance ID and we only support 1 instance
-    // verify that the Instance ID is 0 and return an error here now if not
-    NPT_String serviceType = action->GetActionDesc().GetService()->GetServiceType();
-    if (serviceType.Compare("urn:schemas-upnp-org:service:AVTransport:1", true) == 0) {
-        if (NPT_FAILED(action->VerifyArgumentValue("InstanceID", "0"))) {
-            action->SetError(802,"Not valid InstanceID.");
-            return NPT_FAILURE;
-        }
-    }
-
-    if (name.Compare("GetCurrentTransportActions", true) == 0) {
-        if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
-            return NPT_FAILURE;
-        }
-        return NPT_SUCCESS;
-    }
-    if (name.Compare("GetDeviceCapabilities", true) == 0) {
-        if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
-            return NPT_FAILURE;
-        }
-        return NPT_SUCCESS;
-    }
-    if (name.Compare("GetMediaInfo", true) == 0) {
-        if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
-            return NPT_FAILURE;
-        }
-        return NPT_SUCCESS;
-    }
-    if (name.Compare("GetPositionInfo", true) == 0) {
+			return NPT_FAILURE;
+		}
+		return NPT_SUCCESS;
+	}
+
+	/* Is it a AVTransport Service Action ? */
+
+	// since all actions take an instance ID and we only support 1 instance
+	// verify that the Instance ID is 0 and return an error here now if not
+	NPT_String serviceType = action->GetActionDesc().GetService()->GetServiceType();
+	if (serviceType.Compare("urn:schemas-upnp-org:service:AVTransport:1", true) == 0) {
+		if (NPT_FAILED(action->VerifyArgumentValue("InstanceID", "0"))) {
+			action->SetError(802,"Not valid InstanceID.");
+			return NPT_FAILURE;
+		}
+	}
+
+	if (name.Compare("GetCurrentTransportActions", true) == 0) {
+		if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
+			return NPT_FAILURE;
+		}
+		return NPT_SUCCESS;
+	}
+	if (name.Compare("GetDeviceCapabilities", true) == 0) {
+		if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
+			return NPT_FAILURE;
+		}
+		return NPT_SUCCESS;
+	}
+	if (name.Compare("GetMediaInfo", true) == 0) {
+		if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
+			return NPT_FAILURE;
+		}
+		return NPT_SUCCESS;
+	}
+	if (name.Compare("GetPositionInfo", true) == 0) {
 		if (m_pUPnP->m_pTerm->root_scene) {
 			char szVal[100];
 
@@ -318,7 +318,7 @@
 			m_pAVService->SetStateVariable("CurrentTrackMetadata", "");
 			m_pAVService->SetStateVariable("CurrentTrackURI", "");
 			format_time_string(szVal, m_Time);
-			m_pAVService->SetStateVariable("RelativeTimePosition", szVal); 
+			m_pAVService->SetStateVariable("RelativeTimePosition", szVal);
 			m_pAVService->SetStateVariable("AbsoluteTimePosition", szVal);
 			m_pAVService->SetStateVariable("RelativeCounterPosition", "2147483647"); // means NOT_IMPLEMENTED
 			m_pAVService->SetStateVariable("AbsoluteCounterPosition", "2147483647"); // means NOT_IMPLEMENTED
@@ -327,119 +327,119 @@
 				return NPT_FAILURE;
 			}
 		}
-        return NPT_SUCCESS;
-    }
-    if (name.Compare("GetTransportInfo", true) == 0) {
-        if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
-            return NPT_FAILURE;
-        }
-        return NPT_SUCCESS;
-    }
-    if (name.Compare("GetTransportSettings", true) == 0) {
-        if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
-            return NPT_FAILURE;
-        }
-        return NPT_SUCCESS;
-    }
-    if (name.Compare("Next", true) == 0) {
-        return OnNext(action);
-    }
-    if (name.Compare("Pause", true) == 0) {
-        return OnPause(action);
-    }
-    if (name.Compare("Play", true) == 0) {
-        return OnPlay(action);
-    }
-    if (name.Compare("Previous", true) == 0) {
-        return OnPrevious(action);
-    }
-    if (name.Compare("Seek", true) == 0) {
-        return OnSeek(action);
-    }
-    if (name.Compare("Stop", true) == 0) {
-        return OnStop(action);
-    }
-    if (name.Compare("SetAVTransportURI", true) == 0) {
-        return OnSetAVTransportURI(action);
-    }
-    if (name.Compare("SetPlayMode", true) == 0) {
-        return OnSetPlayMode(action);
-    }
-
-    /* Is it a RendererControl Service Action ? */
-    if (serviceType.Compare("urn:schemas-upnp-org:service:RenderingControl:1", true) == 0) {
-        /* we only support master channel */
-        if (NPT_FAILED(action->VerifyArgumentValue("Channel", "Master"))) {
-            action->SetError(402,"Invalid Args.");
-            return NPT_FAILURE;
-        }
-    }
-
-    if ((name.Compare("GetVolume", true) == 0) || (name.Compare("GetVolumeRangeDB", true) == 0) ) {
-        NPT_CHECK_SEVERE(action->SetArgumentsOutFromStateVariable());
-        return NPT_SUCCESS;
-    }
-
-    if (name.Compare("GetMute", true) == 0) {
-        NPT_CHECK_SEVERE(action->SetArgumentsOutFromStateVariable());
-        return NPT_SUCCESS;
-    }
-
-    if (name.Compare("SetVolume", true) == 0) {
-          return OnSetVolume(action);
-    }
-    if (name.Compare("SetVolumeDB", true) == 0) {
-          return OnSetVolumeDB(action);
-    }
-
-    if (name.Compare("SetMute", true) == 0) {
-          return OnSetMute(action);
-    }
-
-    action->SetError(401,"No Such Action.");
-    return NPT_FAILURE;
+		return NPT_SUCCESS;
+	}
+	if (name.Compare("GetTransportInfo", true) == 0) {
+		if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
+			return NPT_FAILURE;
+		}
+		return NPT_SUCCESS;
+	}
+	if (name.Compare("GetTransportSettings", true) == 0) {
+		if (NPT_FAILED(action->SetArgumentsOutFromStateVariable())) {
+			return NPT_FAILURE;
+		}
+		return NPT_SUCCESS;
+	}
+	if (name.Compare("Next", true) == 0) {
+		return OnNext(action);
+	}
+	if (name.Compare("Pause", true) == 0) {
+		return OnPause(action);
+	}
+	if (name.Compare("Play", true) == 0) {
+		return OnPlay(action);
+	}
+	if (name.Compare("Previous", true) == 0) {
+		return OnPrevious(action);
+	}
+	if (name.Compare("Seek", true) == 0) {
+		return OnSeek(action);
+	}
+	if (name.Compare("Stop", true) == 0) {
+		return OnStop(action);
+	}
+	if (name.Compare("SetAVTransportURI", true) == 0) {
+		return OnSetAVTransportURI(action);
+	}
+	if (name.Compare("SetPlayMode", true) == 0) {
+		return OnSetPlayMode(action);
+	}
+
+	/* Is it a RendererControl Service Action ? */
+	if (serviceType.Compare("urn:schemas-upnp-org:service:RenderingControl:1", true) == 0) {
+		/* we only support master channel */
+		if (NPT_FAILED(action->VerifyArgumentValue("Channel", "Master"))) {
+			action->SetError(402,"Invalid Args.");
+			return NPT_FAILURE;
+		}
+	}
+
+	if ((name.Compare("GetVolume", true) == 0) || (name.Compare("GetVolumeRangeDB", true) == 0) ) {
+		NPT_CHECK_SEVERE(action->SetArgumentsOutFromStateVariable());
+		return NPT_SUCCESS;
+	}
+
+	if (name.Compare("GetMute", true) == 0) {
+		NPT_CHECK_SEVERE(action->SetArgumentsOutFromStateVariable());
+		return NPT_SUCCESS;
+	}
+
+	if (name.Compare("SetVolume", true) == 0) {
+		return OnSetVolume(action);
+	}
+	if (name.Compare("SetVolumeDB", true) == 0) {
+		return OnSetVolumeDB(action);
+	}
+
+	if (name.Compare("SetMute", true) == 0) {
+		return OnSetMute(action);
+	}
+
+	action->SetError(401,"No Such Action.");
+	return NPT_FAILURE;
 }
 
 NPT_Result
 GPAC_MediaRenderer::OnGetCurrentConnectionInfo(PLT_ActionReference& action)
 {
-    if (NPT_FAILED(action->VerifyArgumentValue("ConnectionID", "0"))) {
-        action->SetError(706,"No Such Connection.");
-        return NPT_FAILURE;
-    }
-
-    if (NPT_FAILED(action->SetArgumentValue("RcsID", "0"))){
-        return NPT_FAILURE;
-    }
-    if (NPT_FAILED(action->SetArgumentValue("AVTransportID", "0"))) {
-        return NPT_FAILURE;
-    }
-    if (NPT_FAILED(action->SetArgumentValue("ProtocolInfo", "http-get:*:*:*"))) {
-        return NPT_FAILURE;
-    }
-    if (NPT_FAILED(action->SetArgumentValue("PeerConnectionManager", "/"))) {
-        return NPT_FAILURE;
-    }
-    if (NPT_FAILED(action->SetArgumentValue("PeerConnectionID", "-1"))) {
-        return NPT_FAILURE;
-    }
-    if (NPT_FAILED(action->SetArgumentValue("Direction", "Input"))) {
-        return NPT_FAILURE;
-    }
-    if (NPT_FAILED(action->SetArgumentValue("Status", "Unknown"))) {
-        return NPT_FAILURE;
-    }
-
-    return NPT_SUCCESS;
+	if (NPT_FAILED(action->VerifyArgumentValue("ConnectionID", "0"))) {
+		action->SetError(706,"No Such Connection.");
+		return NPT_FAILURE;
+	}
+
+	if (NPT_FAILED(action->SetArgumentValue("RcsID", "0"))) {
+		return NPT_FAILURE;
+	}
+	if (NPT_FAILED(action->SetArgumentValue("AVTransportID", "0"))) {
+		return NPT_FAILURE;
+	}
+	if (NPT_FAILED(action->SetArgumentValue("ProtocolInfo", "http-get:*:*:*"))) {
+		return NPT_FAILURE;
+	}
+	if (NPT_FAILED(action->SetArgumentValue("PeerConnectionManager", "/"))) {
+		return NPT_FAILURE;
+	}
+	if (NPT_FAILED(action->SetArgumentValue("PeerConnectionID", "-1"))) {
+		return NPT_FAILURE;
+	}
+	if (NPT_FAILED(action->SetArgumentValue("Direction", "Input"))) {
+		return NPT_FAILURE;
+	}
+	if (NPT_FAILED(action->SetArgumentValue("Status", "Unknown"))) {
+		return NPT_FAILURE;
+	}
+
+	return NPT_SUCCESS;
 }
 
 NPT_Result GPAC_MediaRenderer::OnSetAVTransportURI(PLT_ActionReference& action)
 {
 	char the_url[4096], szVal[100];
-    NPT_String url_id;
+	NPT_String url_id;
 	const char *MediaUri;
-    if (NPT_FAILED(action->GetArgumentValue("CurrentURI", url_id))) {
-        return NPT_FAILURE;
+	if (NPT_FAILED(action->GetArgumentValue("CurrentURI", url_id))) {
+		return NPT_FAILURE;
 	}
 	MediaUri = url_id;
 	if (!MediaUri) return NPT_FAILURE;
@@ -466,22 +466,22 @@
 	m_connected = GF_TRUE;
 	m_pUPnP->OnConnect(the_url, m_ip_src);
 	/* Set UPnP datas */
-    m_pAVService->SetStateVariable("TransportState", "PLAYING");
-    m_pAVService->SetStateVariable("AVTransportURI", the_url);
+	m_pAVService->SetStateVariable("TransportState", "PLAYING");
+	m_pAVService->SetStateVariable("AVTransportURI", the_url);
 
 	sprintf(szVal, "%d", gf_list_count(m_mediaHistoryList));
-    m_pAVService->SetStateVariable("NumberOfTracks", szVal);
+	m_pAVService->SetStateVariable("NumberOfTracks", szVal);
 	sprintf(szVal, "%d", m_track_pos);
-    m_pAVService->SetStateVariable("CurrentTrack", szVal);
+	m_pAVService->SetStateVariable("CurrentTrack", szVal);
 	return NPT_SUCCESS;
 }
 
 NPT_Result GPAC_MediaRenderer::OnPause(PLT_ActionReference& action)
 {
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Request: change state : PAUSE\n"));
-    m_pAVService->SetStateVariable("TransportState", "PAUSED_PLAYBACK");
+	m_pAVService->SetStateVariable("TransportState", "PAUSED_PLAYBACK");
 	m_pUPnP->OnPause(GF_FALSE, m_ip_src);
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 NPT_Result GPAC_MediaRenderer::OnPlay(PLT_ActionReference& action)
@@ -490,19 +490,19 @@
 
 	/* if nothing playing, connect to first media of mediaHistoryList */
 	if (m_connected) {
-	    m_pAVService->SetStateVariable("TransportState", "PLAYING");
+		m_pAVService->SetStateVariable("TransportState", "PLAYING");
 		m_pUPnP->OnPause(GF_TRUE, m_ip_src);
 	} else if (gf_list_count(m_mediaHistoryList) >= 1) {
 		char *track = (char *) gf_list_get(m_mediaHistoryList, 0);
 		m_track_pos = 1;
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Reading first media : %s\n", track));
-	    m_pAVService->SetStateVariable("TransportState", "PLAYING");
+		m_pAVService->SetStateVariable("TransportState", "PLAYING");
 		m_connected = GF_TRUE;
 		m_pUPnP->OnConnect(track, m_ip_src);
 		//MRSetTrack(track, upnph->TrackPosition);
 	}
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 
@@ -510,7 +510,7 @@
 {
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Request: change state : STOP\n"));
 	if (m_pUPnP->m_pTerm->root_scene) {
-	    m_pAVService->SetStateVariable("TransportState", "STOPPED");
+		m_pAVService->SetStateVariable("TransportState", "STOPPED");
 		m_pUPnP->OnStop(m_ip_src);
 	}
 	return NPT_SUCCESS;
@@ -518,60 +518,60 @@
 
 NPT_Result GPAC_MediaRenderer::OnPrevious(PLT_ActionReference& action)
 {
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 NPT_Result GPAC_MediaRenderer::OnNext(PLT_ActionReference& action)
 {
-   return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 NPT_Result GPAC_MediaRenderer::OnSeek(PLT_ActionReference& action)
 {
 	u32 h, m, s;
 	Double time;
-    NPT_String unit, target;
-    if (NPT_FAILED(action->GetArgumentValue("Unit", unit))) {
-        return NPT_FAILURE;
+	NPT_String unit, target;
+	if (NPT_FAILED(action->GetArgumentValue("Unit", unit))) {
+		return NPT_FAILURE;
 	}
-    if (NPT_FAILED(action->GetArgumentValue("Target", target))) {
-        return NPT_FAILURE;
+	if (NPT_FAILED(action->GetArgumentValue("Target", target))) {
+		return NPT_FAILURE;
 	}
 	if ((unit!="ABS_TIME") && (unit!="REL_TIME")) {
 		action->SetError(710,"Seek mode not supported");
-        return NPT_FAILURE;
+		return NPT_FAILURE;
 	}
 	sscanf(target, "%d:%d:%d", &h, &m, &s);
 	time = h*3600.0 + m*60.0 + s;
 	m_pUPnP->OnSeek(time);
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 
 NPT_Result GPAC_MediaRenderer::OnSetPlayMode(PLT_ActionReference& action)
 {
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 
 NPT_Result GPAC_MediaRenderer::OnSetVolume(PLT_ActionReference& action)
 {
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 NPT_Result GPAC_MediaRenderer::OnSetVolumeDB(PLT_ActionReference& action)
 {
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 NPT_Result GPAC_MediaRenderer::OnSetMute(PLT_ActionReference& action)
 {
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 NPT_Result GPAC_MediaRenderer::OnGetVolumeDBRange(PLT_ActionReference& action )
 {
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 void GPAC_MediaRenderer::SetDuration(Double duration, Bool can_seek)
@@ -579,7 +579,7 @@
 	char szVal[100];
 	format_time_string(szVal, duration);
 	m_Duration = duration;
-    m_pAVService->SetStateVariable("CurrentTrackDuration", szVal);
+	m_pAVService->SetStateVariable("CurrentTrackDuration", szVal);
 }
 
 void GPAC_MediaRenderer::SetTime(Double time)
@@ -587,14 +587,14 @@
 	char szVal[100];
 	format_time_string(szVal, time);
 	m_Time = time;
-    m_pAVService->SetStateVariable("RelativeTimePosition", szVal);
-    m_pAVService->SetStateVariable("AbsoluteTimePosition", szVal);
+	m_pAVService->SetStateVariable("RelativeTimePosition", szVal);
+	m_pAVService->SetStateVariable("AbsoluteTimePosition", szVal);
 }
 
 void GPAC_MediaRenderer::SetConnected(const char *url)
 {
-    m_pAVService->SetStateVariable("AVTransportURI", url);
-    m_pAVService->SetStateVariable("CurrentTrackURI", url);
-    m_pAVService->SetStateVariable("TransportState", "PLAYING");
+	m_pAVService->SetStateVariable("AVTransportURI", url);
+	m_pAVService->SetStateVariable("CurrentTrackURI", url);
+	m_pAVService->SetStateVariable("TransportState", "PLAYING");
 	m_connected = url ? GF_TRUE : GF_FALSE;
 }

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACMediaRenderer.h -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACMediaRenderer.h Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -40,17 +40,17 @@
 class GF_UPnP;
 
 class GPAC_MediaRenderer  : public PLT_DeviceHost,
-                          public PLT_MediaRendererDelegate
+	public PLT_MediaRendererDelegate
 {
 public:
-    GPAC_MediaRenderer (GF_UPnP *upnp, const char*          friendly_name,
-                      bool                 show_ip = false,
-                      const char*          uuid = NULL,
-                      unsigned int         port = 0);
+	GPAC_MediaRenderer (GF_UPnP *upnp, const char*          friendly_name,
+	                    bool                 show_ip = false,
+	                    const char*          uuid = NULL,
+	                    unsigned int         port = 0);
 
-    // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices();
-    virtual NPT_Result OnAction(PLT_ActionReference &action, const PLT_HttpRequestContext& context);
+	// PLT_DeviceHost methods
+	virtual NPT_Result SetupServices();
+	virtual NPT_Result OnAction(PLT_ActionReference &action, const PLT_HttpRequestContext& context);
 
 	/*these are called when event filtering is used (no JS)*/
 	void SetDuration(Double duration, Bool can_seek);
@@ -58,28 +58,28 @@
 	void SetConnected(const char *url);
 
 protected:
-    virtual ~GPAC_MediaRenderer();
-
-    // PLT_MediaRendererInterface methods
-    // ConnectionManager
-    virtual NPT_Result OnGetCurrentConnectionInfo(PLT_ActionReference& action);
-
-    // AVTransport
-    virtual NPT_Result OnNext(PLT_ActionReference& action);
-    virtual NPT_Result OnPause(PLT_ActionReference& action);
-    virtual NPT_Result OnPlay(PLT_ActionReference& action);
-    virtual NPT_Result OnPrevious(PLT_ActionReference& action);
-    virtual NPT_Result OnSeek(PLT_ActionReference& action);
-    virtual NPT_Result OnStop(PLT_ActionReference& action);
-    virtual NPT_Result OnSetAVTransportURI(PLT_ActionReference& action);
-    virtual NPT_Result OnSetPlayMode(PLT_ActionReference& action);
-
-    // RenderingControl
-    //virtual NPT_Result OnGetVolume(PLT_ActionReference& action);
-    virtual NPT_Result OnSetVolume(PLT_ActionReference& action);
-    virtual NPT_Result OnSetVolumeDB(PLT_ActionReference& action);
-    virtual NPT_Result OnSetMute(PLT_ActionReference& action);
-    virtual NPT_Result OnGetVolumeDBRange(PLT_ActionReference &action);
+	virtual ~GPAC_MediaRenderer();
+
+	// PLT_MediaRendererInterface methods
+	// ConnectionManager
+	virtual NPT_Result OnGetCurrentConnectionInfo(PLT_ActionReference& action);
+
+	// AVTransport
+	virtual NPT_Result OnNext(PLT_ActionReference& action);
+	virtual NPT_Result OnPause(PLT_ActionReference& action);
+	virtual NPT_Result OnPlay(PLT_ActionReference& action);
+	virtual NPT_Result OnPrevious(PLT_ActionReference& action);
+	virtual NPT_Result OnSeek(PLT_ActionReference& action);
+	virtual NPT_Result OnStop(PLT_ActionReference& action);
+	virtual NPT_Result OnSetAVTransportURI(PLT_ActionReference& action);
+	virtual NPT_Result OnSetPlayMode(PLT_ActionReference& action);
+
+	// RenderingControl
+	//virtual NPT_Result OnGetVolume(PLT_ActionReference& action);
+	virtual NPT_Result OnSetVolume(PLT_ActionReference& action);
+	virtual NPT_Result OnSetVolumeDB(PLT_ActionReference& action);
+	virtual NPT_Result OnSetMute(PLT_ActionReference& action);
+	virtual NPT_Result OnGetVolumeDBRange(PLT_ActionReference &action);
 
 
 private:
@@ -88,8 +88,8 @@
 	Bool m_connected;
 
 	/*pointer to the AV service for further StateVariable modifications*/
-    PLT_Service *m_pAVService;
-    PLT_Service *m_pMigrationService;
+	PLT_Service *m_pAVService;
+	PLT_Service *m_pMigrationService;
 
 	GF_List *m_mediaHistoryList;
 	u32 m_track_pos;

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACPlatinum.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACPlatinum.cpp Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -37,37 +37,37 @@
 #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_DELARATION( platinum )
-    
+
+
+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
@@ -92,12 +92,12 @@
 GF_UPnP::GF_UPnP()
 {
 	m_pTerm = NULL;
-    m_pPlatinum = NULL;
+	m_pPlatinum = NULL;
 	m_pMediaRenderer = NULL;
 	m_pMediaServer = NULL;
 	m_pAVCtrlPoint = NULL;
 	m_renderer_bound = GF_FALSE;
-	m_pGenericController = NULL;	
+	m_pGenericController = NULL;
 
 #ifdef GPAC_HAS_SPIDERMONKEY
 	m_Devices = NULL;
@@ -177,7 +177,7 @@
 }
 
 #ifdef GPAC_HAS_SPIDERMONKEY
-jsval GF_UPnP::GetUPnPDevice(const char *src_url) 
+jsval GF_UPnP::GetUPnPDevice(const char *src_url)
 {
 	return src_url ? STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, src_url ) ) : JSVAL_NULL;
 }
@@ -242,8 +242,8 @@
 	} 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)
-		) {
+		        || (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);
@@ -308,7 +308,7 @@
 		break;
 
 	case GF_EVENT_DURATION:
-			m_pMediaRenderer->SetDuration(evt->duration.duration, evt->duration.can_seek);
+		m_pMediaRenderer->SetDuration(evt->duration.duration, evt->duration.can_seek);
 	case GF_EVENT_METADATA:
 		if (m_pTerm->root_scene) {
 			char szName[1024];
@@ -318,8 +318,15 @@
 			/*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, ")"); }
+				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;
@@ -382,7 +389,7 @@
 
 	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");
@@ -392,7 +399,7 @@
 			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);
@@ -428,7 +435,7 @@
 			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);
@@ -467,7 +474,7 @@
 				media_root = sep2+1;
 			}
 		}
-	    PLT_DeviceHostReference device(m_pMediaServer);
+		PLT_DeviceHostReference device(m_pMediaServer);
 		device->m_ModelDescription = "GPAC Media Server";
 		device->m_ModelURL = "http://gpac.sourceforge.net";
 		device->m_ModelNumber = GPAC_FULL_VERSION;
@@ -499,7 +506,7 @@
 		m_pAVCtrlPoint = new GPAC_MediaController(m_ctrlPtRef, this);
 	}
 
-	// add control point to upnp engine 
+	// add control point to upnp engine
 	if (m_pCtrlPoint) {
 		if (ignore_local_devices) {
 			if (m_pMediaServer) m_pCtrlPoint->IgnoreUUID(m_pMediaServer->GetUUID());
@@ -514,7 +521,7 @@
 
 	//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();
@@ -530,7 +537,7 @@
 	delete m_pPlatinum;
 
 	/*final cleanup of UPnP lib*/
-    NPT_AutomaticCleaner::Shutdown();
+	NPT_AutomaticCleaner::Shutdown();
 }
 
 
@@ -551,7 +558,7 @@
 		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);
@@ -572,7 +579,7 @@
 		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);
@@ -610,14 +617,14 @@
 		}
 		VPASSIGN( INT_TO_JSVAL(count)  );
 	}
-	SMJS_FREE(c, prop_name);	
+	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;
+	PLT_Service* service;
 	char *service_uuid;
 	GPAC_DeviceItem *item = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
 	if (!item || (argc!=2) ) return JS_FALSE;
@@ -911,7 +918,7 @@
 		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])) 
+	else if (JSVAL_IS_STRING(argv[0]))
 		resource_url = SMJS_CHARS(c, argv[0]);
 
 	if (!item && !resource_url) {
@@ -925,10 +932,10 @@
 		return JS_TRUE;
 	}
 
-    if (NPT_SUCCEEDED(render->m_device->FindServiceByType("urn:schemas-upnp-org:service:AVTransport:1", service))) {
+	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);                        
+			upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, "1", NULL);
 		} else {
 			NPT_String objID = item;
 
@@ -938,7 +945,7 @@
 				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);                        
+						upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, "1", NULL);
 					}
 					break;
 				}
@@ -972,15 +979,15 @@
 			JS_ValueToNumber(c, argv[0], &d);
 			sprintf(szSpeed, "%2.2f", d);
 		}
-		upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, szSpeed, NULL);                        
+		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);                        
+		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);                        
+		upnp->m_pAVCtrlPoint->m_MediaController->Stop(render->m_device, 0, NULL);
 		break;
 	/*seek*/
 	case 3:
@@ -1082,11 +1089,11 @@
 				SMJS_FREE(c, _filter);
 				return JS_FALSE;
 			}
-	        server->m_ParentDirectories.Pop(parent);
-	        server->m_ParentDirectories.Peek(parent);
+			server->m_ParentDirectories.Pop(parent);
+			server->m_ParentDirectories.Peek(parent);
 			dir=parent;
 
-			if (server->m_ParentDirectories.GetItemCount()==1) 
+			if (server->m_ParentDirectories.GetItemCount()==1)
 				server->m_ParentDirectories.Clear();
 
 		} else {
@@ -1165,7 +1172,7 @@
 	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;
 }
@@ -1512,12 +1519,12 @@
 		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("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)
 	};
 
@@ -1571,7 +1578,7 @@
 	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)
@@ -1583,12 +1590,12 @@
 	};
 	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");
@@ -1598,7 +1605,7 @@
 		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, ';');
@@ -1606,7 +1613,7 @@
 		sep[0] = 0;
 		strcpy(szFile, dev);
 		sep[0] = ';';
-		
+
 		if (!sep[1]) continue;
 		strcpy(szFriendlyName, sep+1);
 
@@ -1675,7 +1682,7 @@
 			u32 now;
 			now = gf_sys_clock() - upnp->upnp_init_time;
 			if (now - upnp->last_time > 200) {
-				u32 i, count, arg_set; 
+				u32 i, count, arg_set;
 				jsval argv[1], rval;
 				upnp->LockJavascript(GF_TRUE);
 				arg_set = 0;

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACPlatinum.h -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACPlatinum.h Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -75,8 +75,8 @@
 	GF_Terminal *m_pTerm;
 
 	/*Platinum's UPnP stack*/
-    PLT_UPnP *m_pPlatinum;
-	
+	PLT_UPnP *m_pPlatinum;
+
 	/*GPAC UPnP/DLNA media renderer if loaded*/
 	GPAC_MediaRenderer *m_pMediaRenderer;
 	/*is renderer bound to the script ? If so, events are dispatched to the script's "UPnP" object*/
@@ -143,11 +143,11 @@
 SMJS_DECL_FUNC_PROP_GET( upnpservice_getProperty);
 
 #ifdef USE_FFDEV_17
-	#define VPASSIGN(__b) __vp.set( __b )
-	#define VPGET() (jsval) __vp
+#define VPASSIGN(__b) __vp.set( __b )
+#define VPGET() (jsval) __vp
 #else
-	#define VPASSIGN(__b) *vp = __b
-	#define VPGET() *vp
+#define VPASSIGN(__b) *vp = __b
+#define VPGET() *vp
 #endif
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GenericDevice.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GenericDevice.cpp Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -35,7 +35,7 @@
 
 NPT_SET_LOCAL_LOGGER("gpac.genericdevice")
 
-GPAC_ServiceItem::GPAC_ServiceItem(GPAC_DeviceItem *device, PLT_Service *service) : m_device(device), m_service(service) 
+GPAC_ServiceItem::GPAC_ServiceItem(GPAC_DeviceItem *device, PLT_Service *service) : m_device(device), m_service(service)
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
 	obj = NULL;
@@ -47,7 +47,7 @@
 #endif
 }
 
-GPAC_ServiceItem::~GPAC_ServiceItem() 
+GPAC_ServiceItem::~GPAC_ServiceItem()
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
 	DetachJS();
@@ -57,7 +57,7 @@
 }
 
 #ifdef GPAC_HAS_SPIDERMONKEY
-void GPAC_ServiceItem::DetachJS() 
+void GPAC_ServiceItem::DetachJS()
 {
 	if (obj) {
 		gf_js_remove_root(js_ctx, &obj, GF_JSGC_OBJECT);
@@ -84,9 +84,9 @@
 #endif
 
 
-GPAC_DeviceItem::GPAC_DeviceItem(PLT_DeviceDataReference device, NPT_String uuid) 
-	: m_device(device), m_UUID(uuid) 
-{ 
+GPAC_DeviceItem::GPAC_DeviceItem(PLT_DeviceDataReference device, NPT_String uuid)
+	: m_device(device), m_UUID(uuid)
+{
 #ifdef GPAC_HAS_SPIDERMONKEY
 	obj = NULL;
 	js_ctx = NULL;
@@ -94,7 +94,7 @@
 #endif
 }
 
-GPAC_DeviceItem::~GPAC_DeviceItem() 
+GPAC_DeviceItem::~GPAC_DeviceItem()
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
 	DetachJS();
@@ -185,7 +185,7 @@
 	SMJS_ARGS
 	GPAC_ServiceItem *service = (GPAC_ServiceItem *)SMJS_GET_PRIVATE(c, obj);
 	if (!service || (argc<2) || !JSVAL_IS_STRING(argv[0]) || !JSVAL_IS_OBJECT(argv[1])) return JS_FALSE;
-	
+
 	name = SMJS_CHARS(c, argv[0]);
 	if (!name) return JS_FALSE;
 
@@ -238,7 +238,7 @@
 	NPT_String name;
 	SMJS_OBJ
 	GPAC_ServiceItem *service = (GPAC_ServiceItem *)SMJS_GET_PRIVATE(c, obj);
-	if (!service ) 
+	if (!service )
 		return JS_FALSE;
 
 	service->m_service->GetSCPDXML(name);
@@ -278,7 +278,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	GPAC_ServiceItem *service = (GPAC_ServiceItem *)SMJS_GET_PRIVATE(c, obj);
-	if (!service || !argc || !JSVAL_IS_STRING(argv[0]) ) 
+	if (!service || !argc || !JSVAL_IS_STRING(argv[0]) )
 		return JS_FALSE;
 
 	name = SMJS_CHARS(c, argv[0]);
@@ -329,11 +329,11 @@
 	PLT_ActionReference action;
 
 	NPT_CHECK_SEVERE(
-		service->m_device->m_pUPnP->m_pGenericController->m_CtrlPoint->CreateAction(
-			service->m_device->m_device, 
-			service->m_service->GetServiceType(), 
-			action_name,
-			action)
+	    service->m_device->m_pUPnP->m_pGenericController->m_CtrlPoint->CreateAction(
+	        service->m_device->m_device,
+	        service->m_service->GetServiceType(),
+	        action_name,
+	        action)
 	);
 
 
@@ -380,11 +380,11 @@
 			SMJS_FREE(c, _param_val);
 
 			if (res != NPT_SUCCESS) return JS_FALSE;
-			
+
 			i+=2;
 		}
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, (" )\n"));
-    }
+	}
 
 	if ((argc==3) && JSVAL_IS_OBJECT(argv[2])) {
 		act_udta = new 	GPAC_ActionUDTA();
@@ -416,7 +416,7 @@
 	count = gf_list_count(m_Services);
 	for (i=0; i<count; i++) {
 		serv = (GPAC_ServiceItem*)gf_list_get(m_Services, i);
-		if (serv->m_service->GetServiceType() == type) 
+		if (serv->m_service->GetServiceType() == type)
 			return serv;
 	}
 
@@ -424,7 +424,7 @@
 	if (m_device->FindServiceByType(type, service) != NPT_SUCCESS) return NULL;
 
 	serv = new GPAC_ServiceItem(this, service);
-	
+
 #ifdef GPAC_HAS_SPIDERMONKEY
 	serv->js_ctx = js_ctx;
 	serv->obj = JS_NewObject(serv->js_ctx, &m_pUPnP->upnpServiceClass._class, 0, obj);
@@ -439,7 +439,7 @@
 	JS_DefineFunction(serv->js_ctx, serv->obj, "CallAction", upnp_service_call_action, 2, 0);
 	JS_DefineFunction(serv->js_ctx, serv->obj, "SetActionListener", upnp_service_set_action_listener, 2, 0);
 	JS_DefineFunction(serv->js_ctx, serv->obj, "GetSCPD", upnp_service_get_scpd, 1, 0);
-	
+
 #endif
 
 	gf_list_add(m_Services, serv);
@@ -451,14 +451,14 @@
 {
 	m_pUPnP = upnp;
 	m_CtrlPoint = ctrlPoint;
-    m_CtrlPoint->AddListener(this);
+	m_CtrlPoint->AddListener(this);
 	m_ControlPointLock = gf_mx_new("GenericController");
 	m_Devices = gf_list_new();
 }
 
 GPAC_GenericController::~GPAC_GenericController()
 {
-    m_CtrlPoint->RemoveListener(this);
+	m_CtrlPoint->RemoveListener(this);
 	gf_mx_del(m_ControlPointLock);
 	while (gf_list_count(m_Devices)) {
 		GPAC_DeviceItem*ms = (GPAC_DeviceItem*)gf_list_get(m_Devices, 0);
@@ -567,14 +567,14 @@
 	PLT_Service* service = action->GetActionDesc().GetService();
 	NPT_String uuid;
 	GPAC_ActionUDTA *act_udta = (GPAC_ActionUDTA *)userdata;
-	
+
 	/*this is NOT an actionResponse to an action triggered on a generic device*/
 	if (act_udta && act_udta->m_Reserved) act_udta = NULL;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Receive %s Response - error code %d\n", (char *) action->GetActionDesc().GetName(), res));
 
 	gf_mx_p(m_ControlPointLock);
-       
+
 	/*get our device*/
 	uuid = service->GetDevice()->GetUUID();
 	count = gf_list_count(m_Devices);
@@ -614,7 +614,7 @@
 		if (argl->arg==NULL) {
 			act_l = argl;
 			continue;
-		} 
+		}
 		/*if error don't trigger listeners*/
 		if (res != NPT_SUCCESS) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[UPnP] Receive %s Response: error on remote device %d\n", (char *) action->GetActionDesc().GetName(), res));
@@ -692,7 +692,7 @@
 	GPAC_StateVariableListener *svl;
 
 	gf_mx_p(m_ControlPointLock);
-       
+
 	NPT_String uuid = service->GetDevice()->GetUUID();
 	count = gf_list_count(m_Devices);
 	for (i=0; i<count; i++) {
@@ -705,7 +705,7 @@
 	gf_mx_v(m_ControlPointLock);
 
 	if (!item) return NPT_SUCCESS;
-	
+
 	count = gf_list_count(item->m_Services);
 	for (i=0; i<count; i++) {
 		serv = (GPAC_ServiceItem *)gf_list_get(item->m_Services, i);
@@ -852,9 +852,9 @@
 	count = gf_list_count(m_pServices);
 	for (i=0; i<count; i++) {
 		GPAC_Service *service = (GPAC_Service *)gf_list_get(m_pServices, i);
-	    AddService(service);
+		AddService(service);
 	}
-    return NPT_SUCCESS;
+	return NPT_SUCCESS;
 }
 
 
@@ -882,7 +882,7 @@
 	SMJS_ARGS
 	GPAC_GenericDevice *device = (GPAC_GenericDevice *)SMJS_GET_PRIVATE(c, obj);
 	if (!device) return JS_FALSE;
-	
+
 	if (argc && JSVAL_IS_OBJECT(argv[0]) ) {
 		JSObject *list = JSVAL_TO_OBJECT(argv[0]);
 		u32 i, count;
@@ -941,21 +941,21 @@
 
 
 NPT_Result
-GPAC_GenericDevice::OnAction(PLT_ActionReference&          action, 
-                                const PLT_HttpRequestContext& context)
+GPAC_GenericDevice::OnAction(PLT_ActionReference&          action,
+                             const PLT_HttpRequestContext& context)
 {
-    NPT_COMPILER_UNUSED(context);
+	NPT_COMPILER_UNUSED(context);
 
 #ifdef GPAC_HAS_SPIDERMONKEY
 	gf_mx_p(m_pMutex);
 #endif
 	PLT_ActionDesc &act_desc = action->GetActionDesc();
-        NPT_String name = act_desc.GetName();
+	NPT_String name = act_desc.GetName();
 #ifdef GPAC_HAS_SPIDERMONKEY
 	assert(!m_pSema);
 #endif
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Action %s called (thread %d)\n", (char *) name, gf_th_id() ));
-	
+
 #ifdef GPAC_HAS_SPIDERMONKEY
 	if (JSVAL_IS_NULL(act_proc)) {
 		gf_mx_v(m_pMutex);
@@ -969,7 +969,7 @@
 	JSObject *js_action = JS_NewObject(m_pUPnP->m_pJSCtx, &m_pUPnP->upnpDeviceClass._class, 0, 0);
 	argv[0] = OBJECT_TO_JSVAL(js_action);
 	SMJS_SET_PRIVATE(m_pUPnP->m_pJSCtx, js_action, this);
-	
+
 	act_ref = action;
 
 	JS_DefineProperty(m_pUPnP->m_pJSCtx, js_action, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(m_pUPnP->m_pJSCtx, name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
@@ -987,7 +987,7 @@
 	m_pUPnP->LockJavascript(GF_FALSE);
 
 	if (JSVAL_IS_INT(rval) && (JSVAL_TO_INT(rval) != 0)) {
-	    action->SetError(JSVAL_TO_INT(rval), "Action Failed");
+		action->SetError(JSVAL_TO_INT(rval), "Action Failed");
 	}
 	/*wait on the semaphore*/
 	if (!gf_sema_wait_for(m_pSema, 10000)) {

gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GenericDevice.h -> gpac-0.5.1.svn5491.tar.xz/modules/platinum/GenericDevice.h Changed

@@ -1,25 +1,25 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *			All rights reserved
  *
- *  This file is part of GPAC / Platinum UPnP module 
+ *  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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	----------------------------------------------------------------------------------
@@ -98,10 +98,13 @@
 	Bool is_script;
 };
 
-class GPAC_ActionUDTA 
+class GPAC_ActionUDTA
 {
 public:
-	GPAC_ActionUDTA() { m_Reserved = NULL; udta = JSVAL_NULL;}
+	GPAC_ActionUDTA() {
+		m_Reserved = NULL;
+		udta = JSVAL_NULL;
+	}
 	/*members*/
 
 	/*this is used to differentiate browse request from JS (using BrowseDataReference)
@@ -141,14 +144,14 @@
 class GPAC_GenericController :  public PLT_CtrlPointListener
 {
 public:
-    GPAC_GenericController(PLT_CtrlPointReference& ctrlPoint, GF_UPnP *upnp);
-    ~GPAC_GenericController();
+	GPAC_GenericController(PLT_CtrlPointReference& ctrlPoint, GF_UPnP *upnp);
+	~GPAC_GenericController();
 
 	/*any device control point*/
-    virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
-    virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
-    virtual NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata);
-    virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
+	virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
+	virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
+	virtual NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata);
+	virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
 
 	GF_List *m_Devices;
 	GF_UPnP *m_pUPnP;
@@ -161,13 +164,13 @@
 {
 public:
 	GPAC_GenericDevice(const char* FriendlyName, const char *device_id);
-    virtual ~GPAC_GenericDevice();
+	virtual ~GPAC_GenericDevice();
 
 protected:
-    // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices();
-    virtual NPT_Result OnAction(PLT_ActionReference&          action, 
-                                const PLT_HttpRequestContext& context);
+	// PLT_DeviceHost methods
+	virtual NPT_Result SetupServices();
+	virtual NPT_Result OnAction(PLT_ActionReference&          action,
+	                            const PLT_HttpRequestContext& context);
 public:
 	GF_UPnP *m_pUPnP;
 	GF_List *m_pServices;

gpac-0.5.0.svn5178.tar.bz2/modules/pulseaudio/pulseaudio.c -> gpac-0.5.1.svn5491.tar.xz/modules/pulseaudio/pulseaudio.c Changed

@@ -37,28 +37,28 @@
 
 typedef struct
 {
-    pa_simple *playback_handle;
-    pa_sample_spec sample_spec;
-    const char *output_name;
-    const char *output_description;
-    u32 errors;
-    u32 consecutive_zero_reads;
+	pa_simple *playback_handle;
+	pa_sample_spec sample_spec;
+	const char *output_name;
+	const char *output_description;
+	u32 errors;
+	u32 consecutive_zero_reads;
 } PulseAudioContext;
 
 static void
 free_pulseaudio_resources (GF_AudioOutput * dr)
 {
-    PulseAudioContext *ctx;
-    if (dr == NULL)
-        return;
-    ctx = (PulseAudioContext *) dr->opaque;
-    if (ctx == NULL)
-        return;
-    if (ctx->playback_handle != NULL)
-    {
-        pa_simple_free (ctx->playback_handle);
-    }
-    ctx->playback_handle = NULL;
+	PulseAudioContext *ctx;
+	if (dr == NULL)
+		return;
+	ctx = (PulseAudioContext *) dr->opaque;
+	if (ctx == NULL)
+		return;
+	if (ctx->playback_handle != NULL)
+	{
+		pa_simple_free (ctx->playback_handle);
+	}
+	ctx->playback_handle = NULL;
 }
 
 static const char *MODULE_NAME = "PulseAudio";
@@ -75,57 +75,57 @@
 PulseAudio_Setup (GF_AudioOutput * dr, void *os_handle,
                   u32 num_buffers, u32 total_duration)
 {
-    const char *opt;
-    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);
-    }
-    return GF_OK;
+	const char *opt;
+	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);
+	}
+	return GF_OK;
 }
 
 static void
 PulseAudio_Shutdown (GF_AudioOutput * dr)
 {
-    int pa_error = 0;
-    PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
-    if (ctx == NULL)
-        return;
-    if (ctx->playback_handle)
-    {
-        GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
-                ("[PulseAudio] Closing PulseAudio output\n"));
-        pa_simple_drain (ctx->playback_handle, &pa_error);
-        if (pa_error)
-        {
-            GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-                    ("[PulseAudio] Error while closing PulseAudio output: %s\n",
-                     pa_strerror (pa_error)));
+	int pa_error = 0;
+	PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
+	if (ctx == NULL)
+		return;
+	if (ctx->playback_handle)
+	{
+		GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
+		        ("[PulseAudio] Closing PulseAudio output\n"));
+		pa_simple_drain (ctx->playback_handle, &pa_error);
+		if (pa_error)
+		{
+			GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
+			        ("[PulseAudio] Error while closing PulseAudio output: %s\n",
+			         pa_strerror (pa_error)));
 
-        }
-    }
+		}
+	}
 }
 
 static GF_Err
@@ -133,37 +133,37 @@
                             u32 * NbChannels, u32 * nbBitsPerSample,
                             u32 channel_cfg)
 {
-    int pa_error = 0;
-    PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
-    if (ctx->playback_handle != NULL)
-    {
-        GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
-                ("[PulseAudio] PulseAudio output already configured !\n"));
-        /* Should not happen */
-        pa_simple_flush (ctx->playback_handle, &pa_error);
-        pa_simple_free (ctx->playback_handle);
-        ctx->playback_handle = NULL;
-    }
-    ctx->consecutive_zero_reads = 0;
-    ctx->sample_spec.format = PA_SAMPLE_S16NE;
-    ctx->sample_spec.channels = *NbChannels;
-    ctx->sample_spec.rate = *SampleRate;
-    ctx->playback_handle = pa_simple_new (NULL,
-                                          ctx->output_name,
-                                          PA_STREAM_PLAYBACK,
-                                          NULL,
-                                          ctx->output_description,
-                                          &(ctx->sample_spec),
-                                          NULL, NULL, &pa_error);
-    if (ctx->playback_handle == NULL || pa_error != 0)
-    {
-        GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-                ("[PulseAudio] Error while allocating PulseAudio output: %s.\n",
-                 pa_strerror (pa_error)));
-        return GF_IO_ERR;
-    }
-    GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO, ("[PulseAudio] Initialized - sampling rate %d - %d channels\n", ctx->sample_spec.rate, ctx->sample_spec.channels));
-    return GF_OK;
+	int pa_error = 0;
+	PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
+	if (ctx->playback_handle != NULL)
+	{
+		GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
+		        ("[PulseAudio] PulseAudio output already configured !\n"));
+		/* Should not happen */
+		pa_simple_flush (ctx->playback_handle, &pa_error);
+		pa_simple_free (ctx->playback_handle);
+		ctx->playback_handle = NULL;
+	}
+	ctx->consecutive_zero_reads = 0;
+	ctx->sample_spec.format = PA_SAMPLE_S16NE;
+	ctx->sample_spec.channels = *NbChannels;
+	ctx->sample_spec.rate = *SampleRate;
+	ctx->playback_handle = pa_simple_new (NULL,
+	                                      ctx->output_name,
+	                                      PA_STREAM_PLAYBACK,
+	                                      NULL,
+	                                      ctx->output_description,
+	                                      &(ctx->sample_spec),
+	                                      NULL, NULL, &pa_error);
+	if (ctx->playback_handle == NULL || pa_error != 0)
+	{
+		GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
+		        ("[PulseAudio] Error while allocating PulseAudio output: %s.\n",
+		         pa_strerror (pa_error)));
+		return GF_IO_ERR;
+	}
+	GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO, ("[PulseAudio] Initialized - sampling rate %d - %d channels\n", ctx->sample_spec.rate, ctx->sample_spec.channels));
+	return GF_OK;
 }
 
 #define BUFF_SIZE 8192
@@ -171,54 +171,54 @@
 static void
 PulseAudio_WriteAudio (GF_AudioOutput * dr)
 {
-    char data[BUFF_SIZE];
-    int written = 0;
-    int pa_error = 0;
-    PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
-    if (ctx == NULL || ctx->playback_handle == NULL)
-    {
-        if (ctx == NULL || ctx->errors == 0)
-        {
-            if (ctx != NULL)
-                ctx->errors++;
-            GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-                    ("[PulseAudio] unable to connect to a PulseAudio daemon!\n"))
-        }
-        return;
-    }
-    written = dr->FillBuffer (dr->audio_renderer, data, BUFF_SIZE / 4);
-    if (written <= 0)
-    {
-	ctx->consecutive_zero_reads++;
-	if (ctx->consecutive_zero_reads > 5){
-		gf_sleep(5);
-	} else if (ctx->consecutive_zero_reads < 25) {
-		gf_sleep(10);
-	} else {
-		gf_sleep(33);
+	char data[BUFF_SIZE];
+	int written = 0;
+	int pa_error = 0;
+	PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
+	if (ctx == NULL || ctx->playback_handle == NULL)
+	{
+		if (ctx == NULL || ctx->errors == 0)
+		{
+			if (ctx != NULL)
+				ctx->errors++;
+			GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
+			        ("[PulseAudio] unable to connect to a PulseAudio daemon!\n"))
+		}
+		return;
+	}
+	written = dr->FillBuffer (dr->audio_renderer, data, BUFF_SIZE / 4);
+	if (written <= 0)
+	{
+		ctx->consecutive_zero_reads++;
+		if (ctx->consecutive_zero_reads > 5) {
+			gf_sleep(5);
+		} else if (ctx->consecutive_zero_reads < 25) {
+			gf_sleep(10);
+		} else {
+			gf_sleep(33);
+		}
+		return;
+	}
+	ctx->consecutive_zero_reads = 0;
+	written = pa_simple_write (ctx->playback_handle, data, written, &pa_error);
+	if (pa_error != 0)
+	{
+		if (ctx->errors < 1)
+			GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
+			        ("[PulseAudio] Write failure: %s\n", pa_strerror (pa_error)));
+		ctx->errors++;
+	}
+	else
+	{
+		ctx->errors = 0;
 	}
-        return;
-    }
-    ctx->consecutive_zero_reads = 0;
-    written = pa_simple_write (ctx->playback_handle, data, written, &pa_error);
-    if (pa_error != 0)
-    {
-        if (ctx->errors < 1)
-            GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-                    ("[PulseAudio] Write failure: %s\n", pa_strerror (pa_error)));
-        ctx->errors++;
-    }
-    else
-    {
-        ctx->errors = 0;
-    }
 }
 
 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));
+	GF_LOG (GF_LOG_WARNING, GF_LOG_MMIO,
+	        ("[PulseAudio] Set volume to %lu: not yet implemented.\n", Volume));
 }
 
 static void
@@ -234,83 +234,83 @@
 static u32
 PulseAudio_GetAudioDelay (GF_AudioOutput * dr)
 {
-    pa_usec_t delay = 0;
-    int pa_error = 0;
-    u32 ms_delay = 0;
-    PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
-    if (ctx == NULL || ctx->playback_handle == NULL)
-    {
-        GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-                ("[PulseAudio] missing connection to pulseaudio daemon!\n"))
-        return 0;
-    }
-    delay = pa_simple_get_latency (ctx->playback_handle, &pa_error);
-    if (pa_error)
-    {
-        GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-                ("[PulseAudio] Error while retrieving pulseaudio delay: %s.\n",
-                 pa_strerror (pa_error)));
-        return 0;
-    }
-    ms_delay = (u32) (delay / 1000);
-    GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO, ("[PulseAudio] Audio delay: %llu us.\n",
-                                        delay));
-    return ms_delay;
+	pa_usec_t delay = 0;
+	int pa_error = 0;
+	u32 ms_delay = 0;
+	PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
+	if (ctx == NULL || ctx->playback_handle == NULL)
+	{
+		GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
+		        ("[PulseAudio] missing connection to pulseaudio daemon!\n"))
+		return 0;
+	}
+	delay = pa_simple_get_latency (ctx->playback_handle, &pa_error);
+	if (pa_error)
+	{
+		GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
+		        ("[PulseAudio] Error while retrieving pulseaudio delay: %s.\n",
+		         pa_strerror (pa_error)));
+		return 0;
+	}
+	ms_delay = (u32) (delay / 1000);
+	GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO, ("[PulseAudio] Audio delay: %llu us.\n",
+	                                    delay));
+	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;
+	/**
+	 * PulseAudio can do the resampling by itself and play any number of channels
+	 */
+	return GF_OK;
 }
 
 void *
 NewPulseAudioOutput ()
 {
-    PulseAudioContext *ctx;
-    GF_AudioOutput *driv;
-    GF_SAFEALLOC (ctx, PulseAudioContext);
-    if (!ctx)
-        return NULL;
+	PulseAudioContext *ctx;
+	GF_AudioOutput *driv;
+	GF_SAFEALLOC (ctx, PulseAudioContext);
+	if (!ctx)
+		return NULL;
 
-    GF_SAFEALLOC (driv, GF_AudioOutput);
-    if (!driv)
-    {
-        gf_free(ctx);
-        return NULL;
-    }
-    driv->opaque = ctx;
-    ctx->playback_handle = NULL;
-    ctx->errors = 0;
-    driv->SelfThreaded = 0;
-    driv->Setup = PulseAudio_Setup;
-    driv->Shutdown = PulseAudio_Shutdown;
-    driv->ConfigureOutput = PulseAudio_ConfigureOutput;
-    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");
-    return driv;
+	GF_SAFEALLOC (driv, GF_AudioOutput);
+	if (!driv)
+	{
+		gf_free(ctx);
+		return NULL;
+	}
+	driv->opaque = ctx;
+	ctx->playback_handle = NULL;
+	ctx->errors = 0;
+	driv->SelfThreaded = 0;
+	driv->Setup = PulseAudio_Setup;
+	driv->Shutdown = PulseAudio_Shutdown;
+	driv->ConfigureOutput = PulseAudio_ConfigureOutput;
+	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");
+	return driv;
 }
 
 void
 DeletePulseAudioOutput (void *ifce)
 {
-    GF_AudioOutput *dr = (GF_AudioOutput *) ifce;
-    free_pulseaudio_resources (dr);
-    if (dr != NULL) {
-        if (dr->opaque)
-            gf_free(dr->opaque);
-        dr->opaque = NULL;
-        gf_free(dr);
-    }
+	GF_AudioOutput *dr = (GF_AudioOutput *) ifce;
+	free_pulseaudio_resources (dr);
+	if (dr != NULL) {
+		if (dr->opaque)
+			gf_free(dr->opaque);
+		dr->opaque = NULL;
+		gf_free(dr);
+	}
 }
 
 
@@ -321,26 +321,26 @@
 GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces(u32 InterfaceType)
 {
-    static u32 si [] = {
-        GF_AUDIO_OUTPUT_INTERFACE,
-        0
-    };
-    return si;
+	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 NewPulseAudioOutput ();
-    return NULL;
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
+		return NewPulseAudioOutput ();
+	return NULL;
 }
 
 GPAC_MODULE_EXPORT
 void ShutdownInterface (GF_BaseInterface * ifce)
 {
-    if (ifce->InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
-        DeletePulseAudioOutput ((GF_AudioOutput *) ifce);
+	if (ifce->InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
+		DeletePulseAudioOutput ((GF_AudioOutput *) ifce);
 }
 
-GPAC_MODULE_STATIC_DELARATION( pulseaudio )
+GPAC_MODULE_STATIC_DECLARATION( pulseaudio )

gpac-0.5.0.svn5178.tar.bz2/modules/raw_out/raw_video.c -> gpac-0.5.1.svn5491.tar.xz/modules/raw_out/raw_video.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -153,7 +153,7 @@
 	return (void *)driv;
 }
 
-void DeleteVideoOutput(void *ifce)
+void DeleteRawVideoOutput(void *ifce)
 {
 	RawContext *rc;
 	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
@@ -254,14 +254,14 @@
 
 /*interface query*/
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_VIDEO_OUTPUT_INTERFACE,
 		GF_AUDIO_OUTPUT_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 /*interface create*/
@@ -279,7 +279,7 @@
 {
 	switch (ifce->InterfaceType) {
 	case GF_VIDEO_OUTPUT_INTERFACE:
-		DeleteVideoOutput((GF_VideoOutput *)ifce);
+		DeleteRawVideoOutput((GF_VideoOutput *)ifce);
 		break;
 	case GF_AUDIO_OUTPUT_INTERFACE:
 		DeleteAudioOutput((GF_AudioOutput *)ifce);
@@ -288,6 +288,6 @@
 }
 
 
-GPAC_MODULE_STATIC_DELARATION( raw_out )
+GPAC_MODULE_STATIC_DECLARATION( raw_out )
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/redirect_av/ffmpeg_ts_muxer.c -> gpac-0.5.1.svn5491.tar.xz/modules/redirect_av/ffmpeg_ts_muxer.c Changed

@@ -21,22 +21,22 @@
 #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;
+	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;
+	Bool ret;
+	gf_mx_p(mx);
+	ret = (*pkts) != NULL;
+	gf_mx_v(mx);
+	return ret;
 }
 
 
@@ -49,359 +49,359 @@
  * \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);
+	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;
+	}
+	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_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;
+	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 < 53 && LIBAVFORMAT_VERSION_MINOR < 45
+#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 /*  LIBAVFORMAT_VERSION_MAJOR < 53 && LIBAVFORMAT_VERSION_MINOR < 45 */
+#endif
 
 GF_AbstractTSMuxer * ts_amux_new(GF_AVRedirect * avr, u32 videoBitrateInBitsPerSec, u32 width, u32 height, u32 audioBitRateInBitsPerSec) {
-    GF_AbstractTSMuxer * ts = 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);
+	GF_AbstractTSMuxer * ts = 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
-    ts->audio_st = av_new_stream(ts->oc, avr->audioCodec->id);
-    {
-        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 |= CODEC_FLAG_GLOBAL_HEADER;
-    }
+	ts->audio_st = av_new_stream(ts->oc, avr->audioCodec->id);
+	{
+		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 |= CODEC_FLAG_GLOBAL_HEADER;
+	}
 #endif
 
-    ts->video_st = av_new_stream(ts->oc, avr->videoCodec->id);
-    {
-        AVCodecContext * c = ts->video_st->codec;
-        c->codec_id = avr->videoCodec->id;
-        c->codec_type = AVMEDIA_TYPE_VIDEO;
+	ts->video_st = av_new_stream(ts->oc, avr->videoCodec->id);
+	{
+		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 |= CODEC_FLAG_GLOBAL_HEADER;
+		/* 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 |= CODEC_FLAG_GLOBAL_HEADER;
 
-    }
-    //av_set_pts_info(ts->audio_st, 33, 1, audioBitRateInBitsPerSec);
+	}
+	//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;
-    }
+	   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));
+	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) {
+	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;
-    }
+		return NULL;
+	}
 #if REDIRECT_AV_AUDIO_ENABLED
 #if (LIBAVCODEC_VERSION_MAJOR<55)
-    if (avcodec_open(ts->audio_st->codec, avr->audioCodec) < 0) {
+	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");
+		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 = 1;
-    ts->audioPackets = NULL;
-    ts->videoPackets = NULL;
-    gf_th_run(ts->tsEncodingThread, ts_interleave_thread_run, ts);
-    return ts;
+	ts->videoMx = gf_mx_new("TS_VideoMx");
+	ts->tsEncodingThread = gf_th_new("ts_interleave_thread_run");
+	ts->encode = 1;
+	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 = 0;
-    gf_sleep(100);
-    gf_th_stop(muxerToDelete->tsEncodingThread);
-    muxerToDelete->tsEncodingThread = NULL;
+	if (!muxerToDelete)
+		return;
+	muxerToDelete->encode = 0;
+	gf_sleep(100);
+	gf_th_stop(muxerToDelete->tsEncodingThread);
+	muxerToDelete->tsEncodingThread = NULL;
 #if REDIRECT_AV_AUDIO_ENABLED
-    gf_mx_del(muxerToDelete->audioMx);
-    muxerToDelete->audioMx = NULL;
+	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;
-    }
+	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;
-    }
+	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]);
-        }
+	/* 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;
-    }
+		/* 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 1;
-    pl = 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 0;
+	AVPacketList *pl;
+	AVPacket * pkt;
+	if (!ts->encode)
+		return 1;
+	pl = 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 0;
 }
 
 Bool ts_encode_video_frame(GF_AbstractTSMuxer* ts, uint8_t* data, int encoded) {
-    AVPacketList *pl;
-    AVPacket * pkt;
-    if (!ts->encode)
-        return 1;
-    pl = gf_malloc(sizeof(AVPacketList));
-    pl->next = NULL;
-    pkt = &(pl->pkt);
+	AVPacketList *pl;
+	AVPacket * pkt;
+	if (!ts->encode)
+		return 1;
+	pl = gf_malloc(sizeof(AVPacketList));
+	pl->next = NULL;
+	pkt = &(pl->pkt);
 
-    av_init_packet(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 0;
+	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 0;
 }
 
 AVCodecContext * ts_get_video_codec_context(GF_AbstractTSMuxer * ts) {
-    return !ts ? NULL : ts->video_st->codec;
+	return !ts ? NULL : ts->video_st->codec;
 }
 
 AVCodecContext * ts_get_audio_codec_context(GF_AbstractTSMuxer * ts) {
-    return !ts ? NULL : ts->audio_st->codec;
+	return !ts ? NULL : ts->audio_st->codec;
 }

gpac-0.5.0.svn5178.tar.bz2/modules/redirect_av/gpac_ts_muxer.c -> gpac-0.5.1.svn5491.tar.xz/modules/redirect_av/gpac_ts_muxer.c Changed

@@ -2,12 +2,12 @@
 #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;
+	GF_M2TS_Mux *muxer;
+	GF_ESIPacket videoCurrentTSPacket;
+	GF_ESIPacket audioCurrentTSPacket;
+	GF_ESInterface * video, * audio;
+	u64 frameTimeSentOverTS;
+	GF_Socket * ts_output_udp_sk;
 };
 
 /*!
@@ -16,163 +16,163 @@
  */
 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;
+	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;
+	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;
+	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;
+	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;
+	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;
+		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;
+		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 = 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;
+		ts->audio->object_type_indication = GPAC_OTI_AUDIO_MPEG2_PART3;
+		ts->audio->input_udta = ts;
 #ifdef TS_MUX_MODE_PUT
-        ts->audio->caps = 0;
+		ts->audio->caps = 0;
 #else
-        ts->audio->input_ctrl = void_input_ctrl;
-        ts->audio->caps = GF_ESI_AU_PULL_CAP;
+		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 );
+		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;
+		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;
-    }
+	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.5.0.svn5178.tar.bz2/modules/redirect_av/redirect_av.c -> gpac-0.5.1.svn5491.tar.xz/modules/redirect_av/redirect_av.c Changed

@@ -76,7 +76,7 @@
 
 #if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
 
-#if defined(_WIN32_WCE) 
+#if defined(_WIN32_WCE)
 #pragma comment(lib, "toolhelp")
 #pragma comment(lib, "winsock")
 #endif
@@ -84,11 +84,6 @@
 #define _TOSTR(_val) #_val
 #define TOSTR(_val) _TOSTR(_val)
 
-#pragma comment(lib, "avcodec-"TOSTR(LIBAVCODEC_VERSION_MAJOR) )
-#pragma comment(lib, "avformat-"TOSTR(LIBAVFORMAT_VERSION_MAJOR) )
-#pragma comment(lib, "avutil-"TOSTR(LIBAVUTIL_VERSION_MAJOR) )
-#pragma comment(lib, "swscale-"TOSTR(LIBSWSCALE_VERSION_MAJOR) )
-
 #endif
 
 
@@ -122,106 +117,106 @@
  */
 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 = 1;
-    GF_AVRedirect * avr = (GF_AVRedirect*) param;
-    AVCodecContext * ctx = NULL;
-    assert( avr );
-
-    outBuffSize = FF_MIN_BUFFER_SIZE;
-
-    outBuff = gf_malloc(outBuffSize* sizeof(u8));
-    inBuff = NULL;
+	u8 * inBuff;
+	u8 * outBuff;
+	u32 inBuffSize, outBuffSize, samplesReaden, toRead;
+	u64 myTime = 0;
+	u32 frameCountSinceReset = 0;
+	u32 lastCurrentTime;
+	Bool sendPts = 1;
+	GF_AVRedirect * avr = (GF_AVRedirect*) param;
+	AVCodecContext * ctx = NULL;
+	assert( avr );
+
+	outBuffSize = FF_MIN_BUFFER_SIZE;
+
+	outBuff = gf_malloc(outBuffSize* sizeof(u8));
+	inBuff = NULL;
 #ifdef DUMP_MP3
-    FILE * mp3 = fopen("/tmp/dump.mp3", "w");
+	FILE * mp3 = fopen("/tmp/dump.mp3", "w");
 #endif /* DUMP_MP3 */
-    sendPts = 1;
-    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 = 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 = 1;
-        }
-        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++;
+	sendPts = 1;
+	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 = 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 = 1;
+		}
+		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);
+					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 = 1;
-                } else {
-                    GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[RedirectAV]: no encoded frame.\n"));
-                    //frameCountSinceReset++;
-                }
-                //ctx->frame_size = oldFrameSize;
-            }
-        }
+					//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 = 1;
+				} 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 );
+	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)
-        fclose(mp3);
+	if (mp3)
+		fclose(mp3);
 #endif /* DUMP_MP3 */
-    if (avr->term)
-        gf_sc_remove_audio_listener ( avr->term->compositor, &avr->audio_listen );
-    return GF_OK;
+	if (avr->term)
+		gf_sc_remove_audio_listener ( avr->term->compositor, &avr->audio_listen );
+	return GF_OK;
 }
 #endif
 
@@ -231,261 +226,261 @@
  */
 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_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;
-            {
+			}
+			assert( currentFrameTimeProcessed != avr->frameTime);
+			currentFrameTimeProcessed = avr->frameTime;
+			{
 				avpicture_fill ( ( AVPicture * ) avr->RGBpicture, avr->frame, PIX_FMT_RGB24, avr->srcWidth, avr->srcHeight );
-                assert( avr->swsContext );
-                sws_scale ( avr->swsContext,
+				assert( avr->swsContext );
+				sws_scale ( avr->swsContext,
 #ifdef USE_AVCODEC2
-                            ( const uint8_t * const * )
+				            ( const uint8_t * const * )
 #else
-                            ( uint8_t ** )
+				            ( uint8_t ** )
 #endif /* USE_AVCODEC2 */
-                            avr->RGBpicture->data, avr->RGBpicture->linesize,
-                            0, avr->srcHeight,
-                            avr->YUVpicture->data, avr->YUVpicture->linesize );
+				            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" ) );
-                }
+				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 */
+				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;
+	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 0;
-    gf_mx_p(avr->frameMutex);
-    if (avr->is_open) {
-        gf_mx_v(avr->frameMutex);
-        return 0;
-    }
+	enum PixelFormat pxlFormatForCodec = PIX_FMT_YUV420P;
+	if (avr->is_open)
+		return 0;
+	gf_mx_p(avr->frameMutex);
+	if (avr->is_open) {
+		gf_mx_v(avr->frameMutex);
+		return 0;
+	}
 	if (!avr->srcWidth || !avr->srcHeight
 #if REDIRECT_AV_AUDIO_ENABLED
-		|| !avr->audioSampleRate || !avr->audioChannels
+	        || !avr->audioSampleRate || !avr->audioChannels
 #endif
-		) {
-        gf_mx_v(avr->frameMutex);
-        return 3;
-    }
+	   ) {
+		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;
-    }
+	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;
+	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 1;
-        }
+		if ( !avr->audioCodec)
+		{
+			gf_mx_v(avr->frameMutex);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Cannot find audio codec.\n" ) );
+			return 1;
+		}
 #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;
-        }
-
-        avr->RGBpicture = avcodec_alloc_frame();
-        assert ( avr->RGBpicture );
-        avr->RGBpicture->data[0] = NULL;
-        avr->YUVpicture = avcodec_alloc_frame();
-        assert ( avr->YUVpicture );
-        {
-            u32 sz = sizeof ( uint8_t ) * avpicture_get_size ( pxlFormatForCodec, avr->srcWidth, avr->srcHeight );
-            avr->yuv_data = 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 = gf_malloc ( avr->videoOutbufSize );
-        memset ( avr->videoOutbuf, 0, avr->videoOutbufSize );
-    }
+		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;
+		}
+
+		avr->RGBpicture = avcodec_alloc_frame();
+		assert ( avr->RGBpicture );
+		avr->RGBpicture->data[0] = NULL;
+		avr->YUVpicture = avcodec_alloc_frame();
+		assert ( avr->YUVpicture );
+		{
+			u32 sz = sizeof ( uint8_t ) * avpicture_get_size ( pxlFormatForCodec, avr->srcWidth, avr->srcHeight );
+			avr->yuv_data = 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 = 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" ) );
+	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 ? 1 : 0;
+	/* 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 ? 1 : 0;
 }
 
 
 static GF_Err avr_open ( GF_AVRedirect *avr )
 {
-    assert( avr );
-    if ( avr->is_open)
-        return GF_OK;
-    if (!avr->is_running) {
-        avr->is_running = 1;
-        gf_th_run(avr->encodingThread, video_encoding_thread_run, avr);
+	assert( avr );
+	if ( avr->is_open)
+		return GF_OK;
+	if (!avr->is_running) {
+		avr->is_running = 1;
+		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);
+		gf_th_run(avr->audioEncodingThread, audio_encoding_thread_run, avr);
 #endif
-    }
-    return GF_OK;
+	}
+	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;
+	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 );
+	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;
-    }
+	{
+		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));
+	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 );
+		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;
-    }
+		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*/
+	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++) {
@@ -504,34 +499,34 @@
 		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" ) );
+	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;
+	GF_AVRedirect *avr = ( GF_AVRedirect * ) udta;
 
-    if ((avr->srcHeight != height || avr->srcWidth != width))
-    {
+	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 );
+		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 = 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);
-    }
+		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 = 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);
+	}
 }
 
 
@@ -542,24 +537,24 @@
  */
 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;
+	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 */
 
@@ -576,32 +571,32 @@
 
 static void avr_close ( GF_AVRedirect *avr )
 {
-    if ( !avr->is_open ) return;
-    avr->is_open = 0;
+	if ( !avr->is_open ) return;
+	avr->is_open = 0;
 #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;
+	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 = udta;
-    switch ( evt->type )
-    {
-    case GF_EVENT_CONNECT:
-        if ( evt->connect.is_connected )
-        {
-            avr_open ( avr );
-        }
-        else
-        {
-            avr_close ( avr );
-        }
-        break;
-    }
-    return 0;
+	GF_AVRedirect *avr = udta;
+	switch ( evt->type )
+	{
+	case GF_EVENT_CONNECT:
+		if ( evt->connect.is_connected )
+		{
+			avr_open ( avr );
+		}
+		else
+		{
+			avr_close ( avr );
+		}
+		break;
+	}
+	return 0;
 }
 
 static const char * AVR_ENABLED_OPTION = "Enabled";
@@ -614,243 +609,243 @@
 
 static Bool avr_process ( GF_TermExt *termext, u32 action, void *param )
 {
-    const char *opt;
-    GF_AVRedirect *avr = 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 0;
-        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 0;
-        }
+	const char *opt;
+	GF_AVRedirect *avr = 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 0;
+		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 0;
+		}
 #ifndef AVIO_FLAG_WRITE
-        /* must be called before using avcodec lib */
-        avcodec_init();
+		/* 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 );
-            }
-        }
+		/* 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);
+		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 1;
-
-    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 0;
+		/*
+		        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 1;
+
+	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 0;
 }
 
 
 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 = 1;
-    uir->is_open = 0;
-    uir->is_running = 0;
-    return dr;
+	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 = 1;
+	uir->is_open = 0;
+	uir->is_running = 0;
+	return dr;
 }
 
 
 void avr_delete ( GF_BaseInterface *ifce )
 {
-    GF_TermExt *dr = ( GF_TermExt * ) ifce;
-    GF_AVRedirect *avr = dr->udta;
-    avr->is_running = 0;
-    /* 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 );
+	GF_TermExt *dr = ( GF_TermExt * ) ifce;
+	GF_AVRedirect *avr = dr->udta;
+	avr->is_running = 0;
+	/* 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;
+	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;
+	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;
-    }
+	switch ( ifce->InterfaceType )
+	{
+	case GF_TERM_EXT_INTERFACE:
+		avr_delete ( ifce );
+		break;
+	}
 }
 
 
-GPAC_MODULE_STATIC_DELARATION( redirect_av )
+GPAC_MODULE_STATIC_DECLARATION( redirect_av )

gpac-0.5.0.svn5178.tar.bz2/modules/redirect_av/ts_muxer.h -> gpac-0.5.1.svn5491.tar.xz/modules/redirect_av/ts_muxer.h Changed

@@ -32,7 +32,7 @@
 #include <gpac/tools.h>
 #include <libavcodec/avcodec.h>
 
-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 20)
+#if ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR <= 20)) || (LIBAVCODEC_VERSION_MAJOR < 52)
 #undef USE_AVCODEC2
 #else
 #define USE_AVCODEC2	1
@@ -60,48 +60,48 @@
 
 typedef struct
 {
-    GF_Terminal *term;
+	GF_Terminal *term;
 
-    Bool is_open;
-    GF_AudioListener audio_listen;
-    GF_VideoListener video_listen;
-    GF_TermEventFilter term_listen;
+	Bool is_open;
+	GF_AudioListener audio_listen;
+	GF_VideoListener video_listen;
+	GF_TermEventFilter term_listen;
 #ifdef AVR_DUMP_RAW_AVI
-    avi_t *avi_out;
+	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;
+	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);

gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/rtp_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -141,7 +141,7 @@
 			/*for interleaved channels don't read too fast, query the buffer occupancy*/
 			if (ch->flags & RTP_INTERLEAVED) {
 				com.base.on_channel = ch->channel;
-				gf_term_on_command(rtp->service, &com, GF_OK);
+				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;
@@ -156,7 +156,7 @@
 			RP_ProcessCommands(sess);
 
 			if (sess->connect_error) {
-				gf_term_on_connect(sess->owner->service, NULL, sess->connect_error);
+				gf_service_connect_ack(sess->owner->service, NULL, sess->connect_error);
 				sess->connect_error = 0;
 			}
 
@@ -167,7 +167,7 @@
 		gf_sleep(1);
 	}
 
-	if (rtp->dnload) gf_term_download_del(rtp->dnload);
+	if (rtp->dnload) gf_service_download_del(rtp->dnload);
 	rtp->dnload = NULL;
 
 	rtp->th_state = 2;
@@ -180,11 +180,11 @@
 
 static const char * sdp_desc = "OnDemand Media/Multicast Session";
 
-static u32 RP_RegisterMimeTypes(const GF_InputService *plug){
-    if (!plug)
-      return 0;
-    gf_term_register_mime_type(plug, sdp_mime, sdp_exts, sdp_desc);
-    return 1;
+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)
@@ -194,14 +194,14 @@
 		return 0;
 	sExt = strrchr(url, '.');
 
-	if (sExt && gf_term_check_extension(plug, sdp_mime, sdp_exts, sdp_desc, sExt)) return 1;
+	if (sExt && gf_service_check_mime_register(plug, sdp_mime, sdp_exts, sdp_desc, sExt)) return 1;
 
 	/*local */
 	if (strstr(url, "data:application/sdp")) return 1;
 	/*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 1;
+	        strstr(url, "data:application/mpeg4-bifs-au;base64") ||
+	        strstr(url, "data:application/mpeg4-es-au;base64")) return 1;
 
 	/*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)) return 1;
@@ -218,7 +218,7 @@
 	/*store user address*/
 	priv->service = serv;
 
-	if (priv->dnload) gf_term_download_del(priv->dnload);
+	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));
@@ -266,7 +266,7 @@
 		sess = RP_NewSession(priv, (char *) the_url);
 		gf_free(the_url);
 		if (!sess) {
-			gf_term_on_connect(serv, NULL, GF_NOT_SUPPORTED);
+			gf_service_connect_ack(serv, NULL, GF_NOT_SUPPORTED);
 		} else {
 			RP_Describe(sess, 0, NULL);
 		}
@@ -275,7 +275,7 @@
 
 	/*direct RTP (no control) or embedded data - this means the service is attached to a single channel (no IOD)
 	reply right away*/
-	gf_term_on_connect(serv, NULL, GF_OK);
+	gf_service_connect_ack(serv, NULL, GF_OK);
 	RP_SetupObjects(priv);
 	return GF_OK;
 }
@@ -344,7 +344,7 @@
 	if (rtp->th_state==1) rtp->th_state = 0;
 
 	/*confirm close*/
-	gf_term_on_disconnect(rtp->service, NULL, GF_OK);
+	gf_service_disconnect_ack(rtp->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -414,9 +414,9 @@
 	}
 	/*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")
-		) {
+	         || strstr(url, "data:application/mpeg4-bifs-au;base64")
+	         || strstr(url, "data:application/mpeg4-es-au;base64")
+	        ) {
 
 		GF_SAFEALLOC(ch, RTPStream);
 		ch->control = gf_strdup(url);
@@ -460,7 +460,7 @@
 	ch->flags &= ~RTP_CONNECTED;
 	ch->channel = NULL;
 	gf_mx_v(priv->mx);
-	gf_term_on_disconnect(priv->service, channel, GF_OK);
+	gf_service_disconnect_ack(priv->service, channel, GF_OK);
 	return GF_OK;
 }
 
@@ -469,7 +469,7 @@
 	u32 i,count;
 	RTPStream *ch, *cur_ch;
 	GF_NetworkCommand com;
-	
+
 	count = gf_list_count(rtp->channels);
 	/*find the current stream*/
 	ch = cur_ch = NULL;
@@ -505,9 +505,9 @@
 					rtp->cur_mid = ch->mid;
 					break;
 				}
-			
+
 			}
-		}	
+		}
 	}
 	else
 	{
@@ -528,12 +528,12 @@
 					cur_ch->status = RTP_Connected;
 					com.command_type = GF_NET_CHAN_RESET;
 					com.base.on_channel = cur_ch;
-					gf_term_on_command(rtp->service, &com, GF_OK);
+					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;
@@ -709,9 +709,18 @@
 			} 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;
+			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;
 	default:
@@ -781,9 +790,9 @@
 	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 1;
+	        || strstr(url, "data:application/mpeg4-bifs-au;base64")
+	        || strstr(url, "data:application/mpeg4-es-au;base64")
+	   ) return 1;
 
 	if (url[0]=='#') {
 		Bool st_type = 0;
@@ -908,4 +917,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( rtp_in )
+GPAC_MODULE_STATIC_DECLARATION( rtp_in )

gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_in.h -> gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/rtp_in.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #ifndef RTP_IN_H
@@ -91,10 +91,10 @@
 //	Bool handle_announce;
 
 	Double last_ntp;
-	
+
 	Bool session_migration;
 
-	Bool is_svc;
+	Bool is_scalable;
 
 	u32 cur_mid;
 } RTPClient;
@@ -121,7 +121,7 @@
 	GF_RTSPSession *session;
 	/*session ID for aggregated stream control*/
 	char *session_id;
-	
+
 	/*session control string*/
 	char *control;
 
@@ -145,6 +145,8 @@
 
 void RP_ProcessCommands(RTSPSession *sess);
 
+void RP_SendMessage(GF_ClientService *service, GF_Err e, const char *message);
+
 /*RTP channel state*/
 enum
 {
@@ -179,7 +181,7 @@
 	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)*/
@@ -200,14 +202,14 @@
 	RTP_SET_TIME_NONE = 0,
 	RTP_SET_TIME_RTP,
 	RTP_SET_TIME_RTP_SEEK,
- };
+};
 
 /*rtp channel*/
 typedef struct
 {
 	/*module*/
 	RTPClient *owner;
-	
+
 	/*channel flags*/
 	u32 flags;
 
@@ -225,7 +227,7 @@
 	/*logical app channel*/
 	LPNETCHANNEL channel;
 	u32 status;
-	
+
 	u32 ES_ID, OD_ID;
 	char *control;
 
@@ -250,7 +252,7 @@
 
 	/*stream id*/
 	u32 mid;
-	
+
 	u32 prev_stream;
 	u32 next_stream;
 	u32 base_stream;

gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_session.c -> gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/rtp_session.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "rtp_in.h"
@@ -32,24 +32,24 @@
 {
 	char sMsg[1000];
 	sprintf(sMsg, "Cannot send %s", com->method);
-	gf_term_on_message(sess->owner->service, e, sMsg);
+	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)) 
+	if (!strcmp(com->method, GF_RTSP_DESCRIBE))
 		return RP_ProcessDescribe(sess, com, e);
-	else if (!strcmp(com->method, GF_RTSP_SETUP)) 
+	else if (!strcmp(com->method, GF_RTSP_SETUP))
 		RP_ProcessSetup(sess, com, e);
-	else if (!strcmp(com->method, GF_RTSP_TEARDOWN)) 
+	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)) 
+	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 
+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)
 {
@@ -93,7 +93,7 @@
 			if (e!=GF_OK) {
 				RP_RemoveCommand(sess);
 				gf_rtsp_command_del(com);
-				gf_term_on_connect(sess->owner->service, NULL, e);
+				gf_service_connect_ack(sess->owner->service, NULL, e);
 				return;
 			}
 
@@ -108,10 +108,10 @@
 
 			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 
+			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)) {
@@ -147,7 +147,7 @@
 		return;
 	}
 	/*process*/
-	com->User_Agent = (char*)gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(sess->owner->service), "Downloader", "UserAgent");
+	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*/
@@ -164,9 +164,9 @@
 		}
 	}
 	/*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)) {
+	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;
@@ -225,7 +225,7 @@
 	RTSPSession *sess;
 	if (!control) return NULL;
 
-	if (!strcmp(control, "*")) control = (char *) gf_term_get_service_url(rtp->service);
+	if (!strcmp(control, "*")) control = (char *) gf_service_get_url(rtp->service);
 
 	i=0;
 	while ( (sess = (RTSPSession *)gf_list_enum(rtp->sessions, &i)) ) {
@@ -262,9 +262,9 @@
 	tmp->session = rtsp;
 
 
-	szCtrl = (char *)gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(rtp->service), "Network", "MobileIPEnabled");
+	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_term_get_service_interface(rtp->service), "Network", "MobileIP");
+		char *ip = (char *)gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(rtp->service), "Network", "MobileIP");
 		gf_rtsp_set_mobile_ip(rtsp, ip);
 	}
 
@@ -274,7 +274,7 @@
 		gf_rtsp_set_buffer_size(rtsp, RTSP_BUFFER_SIZE);
 	}
 	tmp->rtsp_commands = gf_list_new();
-	tmp->rtsp_rsp = gf_rtsp_response_new();	
+	tmp->rtsp_rsp = gf_rtsp_response_new();
 
 	gf_list_add(rtp->sessions, tmp);
 
@@ -381,7 +381,7 @@
 		gf_rtsp_command_del(com);
 		//first = 0;
 	}
-	/*reset session state*/	
+	/*reset session state*/
 	gf_rtsp_session_reset(sess->session, 1);
 	sess->flags &= ~RTSP_WAIT_REPLY;
 }
@@ -398,5 +398,15 @@
 	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.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_signaling.c -> gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/rtp_signaling.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "rtp_in.h"
@@ -90,14 +90,14 @@
 	GF_RTSPCommand *com;
 	GF_RTSPTransport *trans;
 
-	com = gf_rtsp_command_new();	
+	com = gf_rtsp_command_new();
 	com->method = gf_strdup(GF_RTSP_SETUP);
 
 	def_first_port = 0;
-	opt = gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(ch->owner->service), "Streaming", "ForceFirstPort");
+	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_term_get_service_interface(ch->owner->service), "Streaming", "ForceMulticastIP");
+	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) ) {
@@ -113,25 +113,25 @@
 	trans->SSRC = 0;
 
 	/*override transport: */
-		/*1: multicast forced*/
-	opt = gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(ch->owner->service), "Streaming", "ForceMulticastIP");
+	/*1: multicast forced*/
+	opt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ForceMulticastIP");
 	if (opt) {
 		trans->IsUnicast = 0;
 		trans->destination = gf_strdup(opt);
-		opt = gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(ch->owner->service), "Streaming", "ForceMulticastTTL");
+		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 
+			/*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*/
+	/*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);
@@ -196,7 +196,7 @@
 	RTPStream *ch;
 	u32 i;
 	GF_RTSPTransport *trans;
-	
+
 	ch = (RTPStream *)com->user_data;
 	if (e) goto exit;
 
@@ -225,8 +225,8 @@
 	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_term_get_service_interface(ch->owner->service), "Streaming", "ForceClientPorts");
-		if (opt && !stricmp(opt, "yes")) 
+		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) {
@@ -251,9 +251,9 @@
 	}
 
 exit:
-		/*confirm only on first connect, otherwise this is a re-SETUP of the rtsp session, not the channel*/
+	/*confirm only on first connect, otherwise this is a re-SETUP of the rtsp session, not the channel*/
 	if (! (ch->flags & RTP_CONNECTED) ) {
-		if (!e) 
+		if (!e)
 			ch->flags |= RTP_CONNECTED;
 		RP_ConfirmChannelConnect(ch, e);
 	}
@@ -272,7 +272,7 @@
 	ChannelDescribe *ch_desc;
 	/*not a channel describe*/
 	if (!com->user_data) {
-		gf_term_on_message(sess->owner->service, GF_OK, "Connecting...");
+		RP_SendMessage(sess->owner->service, GF_OK, "Connecting...");
 		return 1;
 	}
 
@@ -282,7 +282,7 @@
 
 	/*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 0;
@@ -318,7 +318,7 @@
 	if (ch_desc) {
 		ch = RP_FindChannel(sess->owner, ch_desc->channel, ch_desc->ES_ID, ch_desc->esd_url, 0);
 	} else {
-		gf_term_on_message(sess->owner->service, GF_OK, "Connected");
+		RP_SendMessage(sess->owner->service, GF_OK, "Connected");
 	}
 
 	/*error on loading SDP is done internally*/
@@ -340,7 +340,7 @@
 		} else if (ch) {
 			RP_ConfirmChannelConnect(ch, e);
 		} else {
-			gf_term_on_connect(sess->owner->service, ch_desc->channel, e);
+			gf_service_connect_ack(sess->owner->service, ch_desc->channel, e);
 		}
 	}
 	if (ch_desc) gf_free(ch_desc);
@@ -373,7 +373,7 @@
 			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;
@@ -392,7 +392,7 @@
 		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
@@ -401,7 +401,7 @@
 	}
 
 	/*need better tuning ...*/
-	opt = (char *) gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(sess->owner->service), "Network", "Bandwidth");
+	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, 0);
@@ -437,7 +437,7 @@
 	if (strcmp(com->method, GF_RTSP_TEARDOWN)) ch_ctrl = (ChannelControl *)com->user_data;
 	if (!ch_ctrl || !ch_ctrl->ch) return 1;
 	ch = ch_ctrl->ch;
-	
+
 	if (!ch->channel || !channel_is_valid(sess->owner, ch)) {
 		gf_free(ch_ctrl);
 		com->user_data = NULL;
@@ -463,7 +463,7 @@
 	/*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_term_on_command(sess->owner->service, &ch_ctrl->com, GF_OK);
+		gf_service_command(sess->owner->service, &ch_ctrl->com, GF_OK);
 		gf_free(ch_ctrl);
 		com->user_data = NULL;
 		return 0;
@@ -474,7 +474,7 @@
 	gf_rtsp_reset_aggregation(ch->rtsp->session);
 	ch->status = RTP_Disconnected;
 	ch->check_rtp_time = RTP_SET_TIME_NONE;
-	gf_term_on_command(sess->owner->service, &ch_ctrl->com, e);
+	gf_service_command(sess->owner->service, &ch_ctrl->com, e);
 	gf_free(ch_ctrl);
 	com->user_data = NULL;
 	return 0;
@@ -500,14 +500,14 @@
 		assert(ch->channel==ch_ctrl->com.base.on_channel);
 	}
 
-	/*some consistency checking: on interleaved sessions, some servers do NOT reply to the 
+	/*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 
+			/*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;
@@ -533,11 +533,11 @@
 
 process_reply:
 
-	gf_term_on_command(sess->owner->service, &ch_ctrl->com, GF_OK);
+	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) ) {
+	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) {
@@ -546,7 +546,7 @@
 
 		//process all RTP infos
 		count = gf_list_count(sess->rtsp_rsp->RTP_Infos);
-		for (i=0;i<count; i++) {
+		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, 0);
 
@@ -557,7 +557,7 @@
 				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;
@@ -577,10 +577,10 @@
 
 
 			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));
+				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*/
@@ -590,8 +590,8 @@
 			RP_InitStream(ch, 1);
 			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));
+				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));
 			}
 		}
 		ch->flags &= ~RTP_SKIP_NEXT_COM;
@@ -609,7 +609,7 @@
 
 
 err_exit:
-	gf_term_on_command(sess->owner->service, &ch_ctrl->com, e);
+	gf_service_command(sess->owner->service, &ch_ctrl->com, e);
 	if (ch) {
 		ch->status = RTP_Disconnected;
 		gf_rtsp_reset_aggregation(ch->rtsp->session);
@@ -667,11 +667,11 @@
 	case GF_NET_CHAN_STOP:
 		break;
 	default:
-		gf_term_on_command(sess->owner->service, command, GF_NOT_SUPPORTED);
+		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) {
@@ -679,7 +679,7 @@
 				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) 
+					if (a_ch->status == RTP_Disconnected)
 						RP_Setup(a_ch);
 				}
 			} else {
@@ -687,7 +687,7 @@
 			}
 		}
 	}
-	
+
 	com	= gf_rtsp_command_new();
 	range = NULL;
 
@@ -696,11 +696,11 @@
 		range = gf_rtsp_range_new();
 		range->start = ch->range_start;
 		range->end = ch->range_end;
-		
+
 		com->method = gf_strdup(GF_RTSP_PLAY);
 
 		ch->paused=0;
-		
+
 		/*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;
@@ -738,9 +738,9 @@
 			com->Range = range;
 		}
 
-		if (sess->flags & RTSP_AGG_CONTROL) 
+		if (sess->flags & RTSP_AGG_CONTROL)
 			SkipCommandOnSession(ch);
-		else if (strlen(ch->control)) 
+		else if (strlen(ch->control))
 			com->ControlString = gf_strdup(ch->control);
 
 		if (RP_SessionActive(ch)) {
@@ -763,13 +763,13 @@
 			range->end = -1.0;
 			com->Range = range;
 
-			if (sess->flags & RTSP_AGG_CONTROL) 
+			if (sess->flags & RTSP_AGG_CONTROL)
 				SkipCommandOnSession(ch);
-			else if (strlen(ch->control)) 
+			else if (strlen(ch->control))
 				com->ControlString = gf_strdup(ch->control);
 
 			ch->paused=1;
-		} 
+		}
 	}
 	else if (command->command_type==GF_NET_CHAN_STOP) {
 		ch->current_start = 0;
@@ -786,7 +786,7 @@
 			if (!RP_SessionActive(ch))
 				RP_Teardown(sess, ch);
 			return;
-		} 
+		}
 		/* otherwise send a PAUSE on the stream */
 		else {
 			if (ch->paused) {
@@ -802,7 +802,7 @@
 			if (ch->control) com->ControlString = gf_strdup(ch->control);
 		}
 	} else {
-		gf_term_on_command(sess->owner->service, command, GF_NOT_SUPPORTED);
+		gf_service_command(sess->owner->service, command, GF_NOT_SUPPORTED);
 		gf_rtsp_command_del(com);
 		return;
 	}

gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_stream.c -> gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/rtp_stream.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "rtp_in.h"
@@ -31,12 +31,12 @@
 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_term_on_connect(ch->owner->service, ch->channel, e);
+	gf_service_connect_ack(ch->owner->service, ch->channel, e);
 	if (e != GF_OK || !ch->rtp_ch) return;
 
 	/*success, overwrite SL config*/
@@ -46,7 +46,7 @@
 
 	gf_rtp_depacketizer_get_slconfig(ch->depacketizer, &com.cfg.sl_config);
 	/*reconfig*/
-	gf_term_on_command(ch->owner->service, &com, GF_OK);
+	gf_service_command(ch->owner->service, &com, GF_OK);
 
 	/*ISMACryp config*/
 	if (ch->depacketizer->flags & GF_RTP_HAS_ISMACRYP) {
@@ -58,7 +58,7 @@
 		/*not transported in SDP!!!*/
 		com.drm_cfg.scheme_uri = NULL;
 		com.drm_cfg.kms_uri = ch->depacketizer->key;
-		gf_term_on_command(ch->owner->service, &com, GF_OK);
+		gf_service_command(ch->owner->service, &com, GF_OK);
 	}
 }
 
@@ -70,16 +70,16 @@
 		const char *ip_ifce = NULL;
 		u32 reorder_size = 0;
 		if (!ch->owner->transport_mode) {
-			const char *sOpt = gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(ch->owner->service), "Streaming", "ReorderSize");
+			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_term_get_service_interface(ch->owner->service), "Network", "DefaultMCastInterface");
+
+			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_term_get_service_interface(ch->owner->service), "Network", "MobileIPEnabled");
+				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_term_get_service_interface(ch->owner->service), "Network", "MobileIP");
+					ip_ifce = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Network", "MobileIP");
 					ch->flags |= RTP_MOBILEIP;
 				}
 
@@ -120,16 +120,16 @@
 	if (!ch->rtcp_init) return;
 	cts = hdr->compositionTimeStamp;
 	dts = hdr->decodingTimeStamp;
-	hdr->compositionTimeStamp += ch->ts_offset;
-	hdr->decodingTimeStamp += ch->ts_offset;
+	hdr->compositionTimeStamp -= ch->ts_offset;
+	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_term_on_sl_packet(ch->owner->service, ch->channel, payload, size, hdr, e);
+			gf_service_send_packet(ch->owner->service, ch->channel, payload, size, hdr, e);
 	} else {
-		gf_term_on_sl_packet(ch->owner->service, ch->channel, payload, size, hdr, e);
+		gf_service_send_packet(ch->owner->service, ch->channel, payload, size, hdr, e);
 	}
 	hdr->compositionTimeStamp = cts;
 	hdr->decodingTimeStamp = dts;
@@ -174,15 +174,15 @@
 		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);
+			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 = 1;
 		}
 		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")) { 
+		} else if (!stricmp(att->Name, "rvc-config-predef")) {
 			rvc_predef = atoi(att->Value);
-		} else if (!stricmp(att->Name, "rvc-config")) { 
+		} else if (!stricmp(att->Name, "rvc-config")) {
 			rvc_config_att = att->Value;
 		} else if (!stricmp(att->Name, "mid")) {
 			sscanf(att->Value, "L%d", &mid);
@@ -219,8 +219,8 @@
 	}
 	/*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; 
+	        && 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;
@@ -281,11 +281,11 @@
 
 //	tmp->status = NM_Disconnected;
 
-	ctrl = (char *) gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(rtp->service), "Streaming", "DisableRTCP");
+	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_term_get_service_interface(rtp->service), "Streaming", "NATKeepAlive");
+	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;
@@ -357,7 +357,7 @@
 
 	/*corrupted or NULL data*/
 	if (e || (PayloadStart >= size)) {
-		//gf_term_on_sl_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_CORRUPTED_DATA);
+		//gf_service_send_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_CORRUPTED_DATA);
 		return;
 	}
 
@@ -367,12 +367,12 @@
 
 		/*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) 
-		) {
+		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));
+			                                    hdr.TimeStamp, ch->rtp_ch->rtp_time, ((hdr.TimeStamp - ch->rtp_ch->rtp_time)*1000) / ch->rtp_ch->TimeScale));
 			return;
 		}
 
@@ -380,11 +380,11 @@
 
 		/*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 
+			/*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 
+			packets in order to see the maximum video. We could drop it, this would mean
 			wait for next RAP...*/
 
 			memset(&com, 0, sizeof(com));
@@ -398,11 +398,11 @@
 
 			com.map_time.timestamp = hdr.TimeStamp;
 			com.map_time.reset_buffers = 0;
-			gf_term_on_command(ch->owner->service, &com, GF_OK);
+			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
-				));
+			                                 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 = 1;
@@ -418,7 +418,7 @@
 		}
 		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*/
@@ -429,7 +429,7 @@
 		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_term_on_sl_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_EOS);
+			gf_service_send_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_EOS);
 		}
 	}
 }
@@ -452,14 +452,14 @@
 
 		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 
+			//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 - safety_offset;	
+			//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) {
@@ -468,7 +468,7 @@
 			ntp_clock = 0;
 		}
 
-		assert(ch->rtp_ch->last_SR_rtp_time >= (u64) (ntp_clock * ch->rtp_ch->TimeScale));
+		//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);
 
@@ -478,7 +478,7 @@
 		com.command_type = GF_NET_CHAN_MAP_TIME;
 		com.base.on_channel = ch->channel;
 		com.map_time.media_time = ntp;
-		
+
 		if (com.map_time.media_time >= ch->owner->last_ntp) {
 			com.map_time.media_time -= ch->owner->last_ntp;
 		} else {
@@ -486,12 +486,12 @@
 		}
 		com.map_time.timestamp = ch->rtp_ch->last_SR_rtp_time;
 		com.map_time.reset_buffers = 1;
-		gf_term_on_command(ch->owner->service, &com, GF_OK);
+		gf_service_command(ch->owner->service, &com, GF_OK);
 #endif
 
 		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
-		));
+		                                 gf_sys_clock(), ch->rtp_ch->last_SR_rtp_time, ntp_clock, ch->ts_offset
+		                                ));
 
 		ch->rtcp_init = 1;
 		ch->check_rtp_time = RTP_SET_TIME_NONE;
@@ -500,7 +500,7 @@
 	if (e == GF_EOS) {
 		ch->flags |= RTP_EOS;
 		ch->stat_stop_time = gf_sys_clock();
-		gf_term_on_sl_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_EOS);
+		gf_service_send_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_EOS);
 	}
 }
 
@@ -552,20 +552,20 @@
 	}
 	/*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) ){
+		} 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);
-				gf_term_on_message(ch->owner->service, GF_IP_UDP_TIMEOUT, szMessage);
+				RP_SendMessage(ch->owner->service, GF_IP_UDP_TIMEOUT, szMessage);
 				ch->status = RTP_Unavailable;
 			}
 		}

gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/sdp_fetch.c -> gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/sdp_fetch.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "rtp_in.h"
@@ -36,7 +36,7 @@
 
 	url = strstr(s_url, ",");
 	if (!url) {
-		gf_term_on_connect(rtp->service, NULL, GF_URL_ERROR);
+		gf_service_connect_ack(rtp->service, NULL, GF_URL_ERROR);
 		return;
 	}
 	url += 1;
@@ -59,7 +59,7 @@
 
 	if (file_name && strstr(file_name, "file://")) file_name += strlen("file://");
 	if (!file_name || !(_sdp = gf_f64_open(file_name, "rt")) ) {
-		gf_term_on_connect(rtp->service, NULL, GF_URL_ERROR);
+		gf_service_connect_ack(rtp->service, NULL, GF_URL_ERROR);
 		return;
 	}
 
@@ -67,10 +67,10 @@
 	sdp_size = (u32) gf_f64_tell(_sdp);
 	gf_f64_seek(_sdp, 0, SEEK_SET);
 	sdp_buf = (char*)gf_malloc(sdp_size);
-	if (1 > fread(sdp_buf, 1, sdp_size, _sdp)){
-	  gf_term_on_connect(rtp->service, NULL, GF_URL_ERROR);
+	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);
+		RP_LoadSDP(rtp, sdp_buf, sdp_size, stream);
 	}
 	fclose(_sdp);
 	gf_free(sdp_buf);
@@ -82,7 +82,7 @@
 	RTPClient *rtp = (RTPClient *)cbk;
 	SDPFetch *sdp = rtp->sdp_temp;
 
-	gf_term_download_update_stats(rtp->dnload);
+	gf_service_download_update_stats(rtp->dnload);
 
 	e = param->error;
 	switch (param->msg_type) {
@@ -93,7 +93,7 @@
 	case GF_NETIO_GET_CONTENT:
 		if (sdp->original_url) {
 			char szBody[4096], *opt;
-			opt = (char *) gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(rtp->service), "Network", "MobileIP");
+			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);
@@ -103,7 +103,7 @@
 		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) { 
+			if (sdp_size) {
 				const char *szFile = gf_dm_sess_get_cache_name(rtp->dnload);
 				if (!szFile) {
 					e = GF_SERVICE_ERROR;
@@ -128,17 +128,17 @@
 		gf_free(sdp->remote_url);
 		gf_free(sdp);
 		rtp->sdp_temp = NULL;
-		gf_term_on_message(rtp->service, e, "Error fetching session state - restarting");
-		RP_ConnectServiceEx(gf_term_get_service_interface(rtp->service), rtp->service, url, 1);
+		RP_SendMessage(rtp->service, e, "Error fetching session state - restarting");
+		RP_ConnectServiceEx(gf_service_get_interface(rtp->service), rtp->service, url, 1);
 		gf_free(url);
-		return;	 
+		return;
 	}
 
 	/*error*/
 	if (sdp->chan) {
-		gf_term_on_connect(rtp->service, sdp->chan->channel, e);
+		gf_service_connect_ack(rtp->service, sdp->chan->channel, e);
 	} else {
-		gf_term_on_connect(rtp->service, NULL, e);
+		gf_service_connect_ack(rtp->service, NULL, e);
 		rtp->sdp_temp = NULL;
 	}
 	gf_free(sdp->remote_url);
@@ -159,7 +159,7 @@
 		RP_SDPFromFile(rtp, url, stream);
 		return;
 	}
-	
+
 	sdp = (SDPFetch*)gf_malloc(sizeof(SDPFetch));
 	memset(sdp, 0, sizeof(SDPFetch));
 	sdp->client = rtp;
@@ -170,13 +170,13 @@
 	}
 
 	/*otherwise setup download*/
-	if (rtp->dnload) gf_term_download_del(rtp->dnload);
+	if (rtp->dnload) gf_service_download_del(rtp->dnload);
 	rtp->dnload = NULL;
 
 	rtp->sdp_temp = sdp;
-	rtp->dnload = gf_term_download_new(rtp->service, url, 0, SDP_NetIO, rtp);
+	rtp->dnload = gf_service_download_new(rtp->service, url, 0, SDP_NetIO, rtp);
 	if (!rtp->dnload) {
-		gf_term_on_connect(rtp->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(rtp->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(rtp->dnload);

gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/sdp_load.c -> gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/sdp_load.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "rtp_in.h"
@@ -57,7 +57,7 @@
 		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_svc = 1;
+		else if (!strcmp(att->Name, "group") && !strncmp(att->Value, "DDP", 3)) rtp->is_scalable = 1;
 	}
 	if (range) {
 		Start = range->start;
@@ -94,7 +94,7 @@
 			if (End > 0) ch->flags |= RTP_HAS_RANGE;
 		}
 
-		/*force interleaving whenever needed*/	
+		/*force interleaving whenever needed*/
 		if (ch->rtsp) {
 			switch (ch->depacketizer->sl_map.StreamType) {
 			case GF_STREAM_VISUAL:
@@ -112,7 +112,7 @@
 				break;
 			}
 		}
-	
+
 	}
 	return GF_OK;
 }
@@ -160,10 +160,14 @@
 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;
+	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;
 	}
 }
 
@@ -215,7 +219,7 @@
 	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_svc)
+	if (ch->owner->is_scalable)
 	{
 		u32 i, count;
 
@@ -226,7 +230,7 @@
 			GF_ESD *the_esd;
 
 			the_channel = (RTPStream *)gf_list_get(ch->owner->channels, i);
-			if (the_channel->base_stream == ch->mid) 
+			if (the_channel->base_stream == ch->mid)
 			{
 				the_esd = RP_GetChannelESD(the_channel, i);
 				the_esd->dependsOnESID = the_channel->prev_stream;
@@ -234,7 +238,7 @@
 			}
 		}
 	}
-	
+
 	return od;
 }
 
@@ -286,16 +290,16 @@
 		if (!rtp->media_type) {
 			od = RP_GetChannelOD(ch, i);
 			if (!od) continue;
-			gf_term_add_media(rtp->service, (GF_Descriptor*)od, 1);
+			gf_service_declare_media(rtp->service, (GF_Descriptor*)od, 1);
 		} else if (rtp->media_type==ch->depacketizer->sl_map.StreamType) {
 			od = RP_GetChannelOD(ch, i);
 			if (!od) continue;
-			gf_term_add_media(rtp->service, (GF_Descriptor*)od, 1);
+			gf_service_declare_media(rtp->service, (GF_Descriptor*)od, 1);
 			rtp->media_type = 0;
 			break;
 		}
 	}
-	gf_term_add_media(rtp->service, NULL, 0);
+	gf_service_declare_media(rtp->service, NULL, 0);
 }
 
 void RP_LoadSDP(RTPClient *rtp, char *sdp_text, u32 sdp_len, RTPStream *stream)
@@ -329,7 +333,7 @@
 			/*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 
+			/*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;
@@ -340,15 +344,15 @@
 						break;
 					}
 				}
-			} 
+			}
 			if (!iod_str) {
 				RTPStream *ch;
 				Bool needs_iod = 0;
 				i=0;
 				while ((ch = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-					if ((ch->depacketizer->payt==GF_RTP_PAYT_MPEG4) && (ch->depacketizer->sl_map.StreamType==GF_STREAM_SCENE) 
+					if ((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 = 1;
 						break;
 					}
@@ -357,19 +361,19 @@
 					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 ? 1 : 0;
-		gf_term_on_connect(rtp->service, NULL, e);
+		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_term_on_connect(rtp->service, stream->channel, e);
+			gf_service_connect_ack(rtp->service, stream->channel, e);
 			stream->status = RTP_Unavailable;
 		} else {
 			/*connect*/
@@ -472,14 +476,14 @@
 			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
-			);
+			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);
 
@@ -494,7 +498,7 @@
 	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);
@@ -532,20 +536,20 @@
 	gf_sdp_info_del(sdp);
 
 
-	opt = (char *) gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(rtp->service), "Streaming", "SessionMigrationServer");
+	opt = (char *) gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(rtp->service), "Streaming", "SessionMigrationServer");
 	if (opt) {
-		if (rtp->dnload) gf_term_download_del(rtp->dnload);
+		if (rtp->dnload) gf_service_download_del(rtp->dnload);
 		rtp->dnload = NULL;
 
 		if (strnicmp(opt, "http://", 7)) {
-			rtp->dnload = gf_term_download_new(rtp->service, opt, GF_NETIO_SESSION_NOT_THREADED, MigrateSDP_NetIO, rtp);
+			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_term_download_del(rtp->dnload);
+			gf_service_download_del(rtp->dnload);
 			rtp->dnload = NULL;
 		} else {
 			FILE *f = gf_f64_open(opt, "wt");
@@ -558,7 +562,7 @@
 			}
 		}
 		if (e<0) {
-			gf_term_on_message(sess->owner->service, e, "Error saving session state");
+			RP_SendMessage(sess->owner->service, e, "Error saving session state");
 		}
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/modules/rvc_dec/rvc_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/rvc_dec/rvc_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2010-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,11 +42,11 @@
 
 
 
-typedef struct{
+typedef struct {
 	int Width;
 	int Height;
 	unsigned char* pY[1];
-	unsigned char* pU[1]; 
+	unsigned char* pU[1];
 	unsigned char* pV[1];
 } RVCFRAME;
 
@@ -74,22 +74,22 @@
 	s32 res;
 	char Picture;
 	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-	char* VTLFolder; 
-	char *XDF_doc = NULL; 
-	int isAVCFile;
+	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_Dec] Cannot locate VTL: path is unknown. Please indicate path in GPAC config file:\n[RVCDecoder]\nVTLPath=PATH\n"));
+		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_Dec] Using VTL in %s\n", VTLFolder));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[RVC Decoder] Using VTL in %s\n", VTLFolder));
 	}
 
 	/*initialize RVC*/
@@ -114,16 +114,25 @@
 		fclose(f);
 		XDF_doc[size]=0;
 	} else {
-		if (!esd->decoderConfig->rvc_config) 
+		if (!esd->decoderConfig->rvc_config)
 			return GF_NOT_SUPPORTED;
 		XDF_doc = esd->decoderConfig->rvc_config->data;
 	}
 
 
-	if(esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) isAVCFile = 1;
-	else isAVCFile = 0;
+	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, isAVCFile); //->data contains the uncompressed XDF
+	rvc_init(XDF_doc, VTLFolder, isNALUFile); //->data contains the uncompressed XDF
 
 	/*free data*/
 	gf_free(XDF_doc);
@@ -131,17 +140,17 @@
 		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) 
+	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data)
 		return GF_OK;
 
 	/*initialize the decoder */
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
+	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++) {
@@ -158,29 +167,63 @@
 						ctx->pixel_ar = (par_n<<16) || par_d;
 				}
 			}
-			/* call decode - warning for AVC: the data blocks do not contain startcode prefixes (00000001), you may need to add them) */
-			
+
+			/* call decode*/
 			res = rvc_decode(slc->data, slc->size, &Picture, 1);
 			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding SPS %d\n", res));
+				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);
-			/*same remark as above*/
-
-			
 			res = rvc_decode(slc->data, slc->size, &Picture, 1);
 			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding PPS %d\n", res));
+				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;
@@ -191,22 +234,22 @@
 		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, ("[SVC Decoder] Error decoding PPS %d\n", res));
+			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, ("[SVC Decoder] Error decoding PPS %d\n", res));
+			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;
@@ -278,11 +321,11 @@
 
 int bookmark = 0;
 
-static GF_Err RVCD_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -299,12 +342,12 @@
 	//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];
@@ -312,23 +355,23 @@
 			ptr += ctx->nalu_size_length;
 
 			//same remark as above regardin start codes
-			
-			if(nalNumber > bookmark){
+
+			if(nalNumber > bookmark) {
 				got_pic = rvc_decode(ptr, nalu_size, outBuffer, !got_pic);
 				bookmark ++;
-				if(got_pic>1){
+				if(got_pic>1) {
 					return GF_PACKED_FRAMES;
 				}
-			}else if(nalNumber == bookmark){
+			} else if(nalNumber == bookmark) {
 				got_pic = rvc_decode(NULL, 0, outBuffer, !got_pic);
-				if(got_pic>1){
+				if(got_pic>1) {
 					return GF_PACKED_FRAMES;
 				}
 			}
 			nalNumber ++;
 
 			ptr += nalu_size;
-			if (inBufferLength < nalu_size + ctx->nalu_size_length) 
+			if (inBufferLength < nalu_size + ctx->nalu_size_length)
 				break;
 
 			inBufferLength -= nalu_size + ctx->nalu_size_length;
@@ -338,7 +381,7 @@
 	} else {
 		u32 nalu_size = 0;
 		u8 *ptr = inBuffer;
-		
+
 
 		got_pic = rvc_decode(ptr, inBufferLength, outBuffer, 1);
 	}
@@ -346,7 +389,7 @@
 	//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)) 
+	/*if ((pic.Width != ctx->width) || (pic.Height!=ctx->height))
 	{
 		ctx->width = pic.Width;
 		ctx->stride = pic.Width;
@@ -355,14 +398,14 @@
 		*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, 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);*/	
+	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;
@@ -375,7 +418,10 @@
 	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;
 	}
@@ -384,21 +430,21 @@
 
 static const char *RVCD_GetCodecName(GF_BaseDecoder *dec)
 {
-	return "RVC Decoder";
+	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*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = RVCD_AttachStream;
 	ifcd->DetachStream = RVCD_DetachStream;
 	ifcd->GetCapabilities = RVCD_GetCapabilities;
@@ -417,7 +463,7 @@
 }
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -425,11 +471,11 @@
 #endif
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewRVCDec();
@@ -442,7 +488,7 @@
 {
 	switch (ifce->InterfaceType) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE: 
+	case GF_MEDIA_DECODER_INTERFACE:
 		DeleteRVCDec((GF_BaseDecoder*)ifce);
 		break;
 #endif
@@ -450,4 +496,4 @@
 }
 
 
-GPAC_MODULE_STATIC_DELARATION( rev_dec )
+GPAC_MODULE_STATIC_DECLARATION( rev_dec )

gpac-0.5.0.svn5178.tar.bz2/modules/saf_in/saf_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/saf_in/saf_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -86,18 +86,18 @@
 static u32 SAF_RegisterMimeTypes(const GF_InputService *plug)
 {
 	if (!plug)
-	  return 0;
-	gf_term_register_mime_type(plug, SAF_MIME, SAF_MIME_EXT, SAF_MIME_DESC);
+		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 0;
+	if (!plug || !url)
+		return 0;
 	sExt = strrchr(url, '.');
-	if (gf_term_check_extension(plug, SAF_MIME, SAF_MIME_EXT, SAF_MIME_DESC, sExt)) return 1;
+	if (gf_service_check_mime_register(plug, SAF_MIME, SAF_MIME_EXT, SAF_MIME_DESC, sExt)) return 1;
 	return 0;
 }
 
@@ -114,7 +114,7 @@
 		u32 i=0;
 		while ( (ch = (SAFChannel *)gf_list_enum(read->channels, &i))) {
 			com.base.on_channel = ch->ch;
-			gf_term_on_command(read->service, &com, GF_OK);
+			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);
 		}
@@ -143,12 +143,12 @@
 		return;
 	} else {
 		/*handle service message*/
-		gf_term_download_update_stats(read->dnload);
+		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 = 0;
-					gf_term_on_connect(read->service, NULL, e);
+					gf_service_connect_ack(read->service, NULL, e);
 				}
 				return;
 			}
@@ -245,7 +245,7 @@
 				if (read->needs_connection && (ch->esd->decoderConfig->streamType==GF_STREAM_SCENE)) {
 					gf_list_add(read->channels, ch);
 					read->needs_connection = 0;
-					gf_term_on_connect(read->service, NULL, GF_OK);
+					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);
@@ -258,7 +258,7 @@
 					gf_list_add(od->ESDescriptors, ch->esd);
 					ch->esd = NULL;
 					od->objectDescriptorID = ch->stream_id;
-					gf_term_add_media(read->service, (GF_Descriptor*)od, 0);
+					gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
 
 				}
 			}
@@ -275,19 +275,19 @@
 				if (read->start_range && (read->start_range*ch->ts_res>cts*1000)) {
 					sl_hdr.compositionTimeStamp = read->start_range*ch->ts_res/1000;
 				}
-				gf_term_on_sl_packet(read->service, ch->ch, read->saf_data+bs_pos, au_size, &sl_hdr, GF_OK);
+				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_term_on_sl_packet(read->service, ch->ch, NULL, 0, NULL, GF_EOS);
+			if (ch) gf_service_send_packet(read->service, ch->ch, NULL, 0, NULL, GF_EOS);
 			break;
 		case 5:
 			go = 0;
 			read->run_state = 0;
 			i=0;
 			while ((ch = (SAFChannel *)gf_list_enum(read->channels, &i))) {
-				gf_term_on_sl_packet(read->service, ch->ch, NULL, 0, NULL, GF_EOS);
+				gf_service_send_packet(read->service, ch->ch, NULL, 0, NULL, GF_EOS);
 			}
 			break;
 		}
@@ -328,10 +328,10 @@
 {
 	SAFIn *read = (SAFIn*) plug->priv;
 
-	read->dnload = gf_term_download_new(read->service, url, 0, SAF_NetIO, read);
+	read->dnload = gf_service_download_new(read->service, url, 0, SAF_NetIO, read);
 	if (!read->dnload) {
 		read->needs_connection = 0;
-		gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(read->dnload);
@@ -363,7 +363,9 @@
 		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; }
+		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);
@@ -392,7 +394,7 @@
 	SAFIn *read = (SAFIn *)plug->priv;
 	read->service = serv;
 
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
 	strcpy(szURL, url);
@@ -412,7 +414,7 @@
 
 	read->stream = gf_f64_open(szURL, "rb");
 	if (!read->stream) {
-		gf_term_on_connect(serv, NULL, GF_URL_ERROR);
+		gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
 		return GF_OK;
 	}
 	SAF_CheckFile(read);
@@ -437,9 +439,9 @@
 
 	if (read->stream) fclose(read->stream);
 	read->stream = NULL;
-	if (read->dnload) gf_term_download_del(read->dnload);
+	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
-	gf_term_on_disconnect(read->service, NULL, GF_OK);
+	gf_service_disconnect_ack(read->service, NULL, GF_OK);
 	return GF_OK;
 }
 
@@ -484,7 +486,7 @@
 		}
 	}
 
-	gf_term_on_connect(read->service, channel, e);
+	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
 
@@ -501,7 +503,7 @@
 		gf_free(ch);
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(read->service, channel, e);
+	gf_service_disconnect_ack(read->service, channel, e);
 	return GF_OK;
 }
 
@@ -571,8 +573,8 @@
 {
 	GF_InputService *plug = (GF_InputService *) ifce;
 	SAFIn *read = (SAFIn *)plug->priv;
-        if (!ifce)
-          return;
+	if (!ifce)
+		return;
 	while (gf_list_count(read->channels)) {
 		SAFChannel *ch = (SAFChannel *)gf_list_last(read->channels);
 		gf_list_rem_last(read->channels);
@@ -581,10 +583,10 @@
 	}
 	gf_list_del(read->channels);
 	if (read->saf_data)
-          gf_free(read->saf_data);
-        read->saf_data = NULL;
+		gf_free(read->saf_data);
+	read->saf_data = NULL;
 	gf_free(read);
-        plug->priv = NULL;
+	plug->priv = NULL;
 	gf_free(plug);
 }
 
@@ -603,8 +605,10 @@
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE: return (GF_BaseInterface *) NewSAFReader();
-	default: return NULL;
+	case GF_NET_CLIENT_INTERFACE:
+		return (GF_BaseInterface *) NewSAFReader();
+	default:
+		return NULL;
 	}
 }
 
@@ -612,8 +616,10 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE:  DeleteSAFReader(ifce); break;
+	case GF_NET_CLIENT_INTERFACE:
+		DeleteSAFReader(ifce);
+		break;
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( saf_in )
+GPAC_MODULE_STATIC_DECLARATION( saf_in )

gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/audio.c -> gpac-0.5.1.svn5491.tar.xz/modules/sdl_out/audio.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,24 +11,24 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "sdl_out.h"
-	
+
 #define SDLAUD()	SDLAudCtx *ctx = (SDLAudCtx *)dr->opaque
 
-static void sdl_close_audio(){
-  SDL_CloseAudio();
+static void sdl_close_audio() {
+	SDL_CloseAudio();
 }
 
 
@@ -36,18 +36,18 @@
 {
 	GF_AudioOutput *dr = (GF_AudioOutput *)udata;
 	SDLAUD();
-	if (ctx->volume != SDL_MIX_MAXVOLUME){
+	if (ctx->volume != SDL_MIX_MAXVOLUME) {
 		u32 written;
 		if (ctx->alloc_size < (u32) len) {
 			ctx->audioBuff = gf_realloc( ctx->audioBuff, sizeof(Uint8) * len);
 			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, (char *) 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, (char *) stream, (u32) len);
 	}
 }
 
@@ -64,7 +64,7 @@
 	flags = SDL_WasInit(SDL_INIT_AUDIO);
 	if (!(flags & SDL_INIT_AUDIO)) {
 		if (SDL_InitSubSystem(SDL_INIT_AUDIO)<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Audio output initialization error\n")); 
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Audio output initialization error\n"));
 			SDLOUT_CloseSDL();
 			return GF_IO_ERR;
 		}
@@ -81,14 +81,14 @@
 		sdl_close_audio();
 		SDL_QuitSubSystem(SDL_INIT_AUDIO);
 		SDLOUT_CloseSDL();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Audio output format not supported\n")); 
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Audio output format not supported\n"));
 		return GF_IO_ERR;
 	}
 	sdl_close_audio();
 	ctx->is_init = GF_TRUE;
 	ctx->num_buffers = num_buffers;
 	ctx->total_duration = total_duration;
-	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Audio output setup\n")); 
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Audio output setup\n"));
 	return GF_OK;
 }
 
@@ -103,7 +103,7 @@
 	}
 }
 
-void SDL_DeleteAudio(void *ifce){
+void SDL_DeleteAudio(void *ifce) {
 	SDLAudCtx *ctx;
 	GF_AudioOutput * dr;
 	if (!ifce)
@@ -166,7 +166,7 @@
 	}
 	/*and play*/
 	SDL_PauseAudio(0);
-	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Audio output setup - SampleRate %d Nb Channels %d - %d ms delay\n", got_format.freq, got_format.channels, ctx->delay_ms)); 
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Audio output setup - SampleRate %d Nb Channels %d - %d ms delay\n", got_format.freq, got_format.channels, ctx->delay_ms));
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/cursors.c -> gpac-0.5.1.svn5491.tar.xz/modules/sdl_out/cursors.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,23 +11,23 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
 #if 0
-static char hand_data[] = 
+static char hand_data[] =
 {
-	0,0,0,0,0,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,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,1,2,2,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,1,2,2,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,1,2,2,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,

gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/sdl_out.c -> gpac-0.5.1.svn5491.tar.xz/modules/sdl_out/sdl_out.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "sdl_out.h"
@@ -60,14 +60,14 @@
 
 /*interface query*/
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_VIDEO_OUTPUT_INTERFACE,
 		GF_AUDIO_OUTPUT_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 /*interface create*/
@@ -93,4 +93,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( sdl_out )
+GPAC_MODULE_STATIC_DECLARATION( sdl_out )

gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/sdl_out.h -> gpac-0.5.1.svn5491.tar.xz/modules/sdl_out/sdl_out.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #ifndef _GF_SDL_OUT_H_
@@ -66,7 +66,7 @@
 	SDL_Cursor *curs_def, *curs_hand, *curs_collide;
 	Bool use_systems_memory;
 
-	
+
 #if SDL_VERSION_ATLEAST(2,0,0)
 	SDL_GLContext gl_context;
 	SDL_Renderer *renderer;

gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/video.c -> gpac-0.5.1.svn5491.tar.xz/modules/sdl_out/video.c Changed

@@ -1,27 +1,27 @@
- /*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre - Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / SDL audio and video 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. 
- *		
- */
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Jean Le Feuvre - Romain Bouqueau
+*			Copyright (c) Telecom ParisTech 2000-2012
+*					All rights reserved
+*
+*  This file is part of GPAC / SDL audio and video 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 "sdl_out.h"
 #include <gpac/user.h>
@@ -38,9 +38,9 @@
 #endif
 
 /*cursors data*/
-static char hand_data[] = 
+static char hand_data[] =
 {
-	0,0,0,0,0,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,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,1,2,2,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,1,2,2,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,1,2,2,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,
@@ -77,8 +77,8 @@
 
 static char collide_data[] =
 {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,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,1,1,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -91,8 +91,8 @@
 	0,0,0,1,1,1,0,0,0,0,0,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,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,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -117,7 +117,7 @@
 #define SDLVID()	SDLVidCtx *ctx = (SDLVidCtx *)dr->opaque
 
 
-	
+
 #if SDL_VERSION_ATLEAST(2,0,0)
 void SDLVid_SetCaption(SDL_Window* window)
 {
@@ -147,7 +147,7 @@
 #define SDLK_PRINTSCREEN SDLK_PRINT
 #define SDL_WINDOW_RESIZABLE SDL_RESIZABLE
 
-static u32 video_modes[] = 
+static u32 video_modes[] =
 {
 	320, 200,
 	320, 240,
@@ -172,7 +172,7 @@
 	}
 }
 #endif
-	
+
 
 
 SDL_Cursor *SDLVid_LoadCursor(char *maskdata)
@@ -206,191 +206,326 @@
 }
 
 
-static void sdl_translate_key(u32 SDLkey, GF_EventKey *evt) 
+static void sdl_translate_key(u32 SDLkey, GF_EventKey *evt)
 {
 	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_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; 
+	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; 
+	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; 
+	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; 
+	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; 
+	case SDLK_KP_DIVIDE:
+		evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_SLASH:
+		evt->key_code = GF_KEY_SLASH;
 		break;
 
-	case SDLK_KP_0: evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_0: 
-		evt->key_code = GF_KEY_0; 
+	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; 
+	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; 
+	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; 
+	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; 
+	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; 
+	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; 
+	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; 
+	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; 
+	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; 
+	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_KP_PERIOD:
+		evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_PERIOD:
-		evt->key_code = GF_KEY_FULLSTOP; 
+		evt->key_code = GF_KEY_FULLSTOP;
 		break;
-	case SDLK_KP_EQUALS: evt->flags = GF_KEY_EXT_NUMPAD;
+	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_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: 
+	case SDLK_LSHIFT:
 		evt->key_code = GF_KEY_SHIFT;
 		evt->flags = GF_KEY_EXT_LEFT;
 		break;
-	case SDLK_LCTRL: 
+	case SDLK_LCTRL:
 		evt->key_code = GF_KEY_CONTROL;
 		evt->flags = GF_KEY_EXT_LEFT;
 		break;
-	case SDLK_RCTRL: 
+	case SDLK_RCTRL:
 		evt->key_code = GF_KEY_CONTROL;
 		evt->flags = GF_KEY_EXT_RIGHT;
 		break;
-	case SDLK_LALT: 
+	case SDLK_LALT:
 		evt->key_code = GF_KEY_ALT;
 		evt->flags = GF_KEY_EXT_LEFT;
 		break;
-	case SDLK_RALT: 
+	case SDLK_RALT:
 		evt->key_code = GF_KEY_ALT;
 		evt->flags = GF_KEY_EXT_RIGHT;
 		break;
 #if (SDL_MAJOR_VERSION<=1) && (SDL_MINOR_VERSION<3)
-    case SDLK_LMETA:
-    case SDLK_LSUPER:
+	case SDLK_LMETA:
+	case SDLK_LSUPER:
 #else
-    case SDLK_LGUI:
+	case SDLK_LGUI:
 #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:
+	case SDLK_RMETA:
+	case SDLK_RSUPER:
 #else
-    case SDLK_RGUI:
+	case SDLK_RGUI:
 #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;
+	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,
- */
+	/*
+		SDLK_CARET		= 94,
+	 */
 	case SDLK_a:
 	case SDLK_b:
 	case SDLK_c:
@@ -419,20 +554,20 @@
 	case SDLK_z:
 		evt->key_code = GF_KEY_A + SDLkey - SDLK_a;
 		break;
-			/*
- SDLK_DELETE		= 127,
+		/*
+		SDLK_DELETE		= 127,
 
-	SDLK_SYSREQ		= 317,
-	SDLK_POWER		= 320,
+		SDLK_SYSREQ		= 317,
+		SDLK_POWER		= 320,
 
-*/
+		*/
 #endif
-			
+
 	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	
+		else
 		{
 			evt->key_code = GF_KEY_UNIDENTIFIED;
 		}
@@ -513,12 +648,12 @@
 	Bool hw_reset = GF_FALSE;
 	SDLVID();
 	GF_Event evt;
-	
+
 	/*lock X mutex to make sure the event queue is not being processed*/
 	gf_mx_p(ctx->evt_mx);
-    
-    GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Resizing window %dx%d\n", width, height));
-		
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Resizing window %dx%d\n", width, height));
+
 	if (ctx->output_3d_type) {
 		u32 flags, nb_bits;
 		const char *opt;
@@ -527,7 +662,7 @@
 			gf_mx_v(ctx->evt_mx);
 			return GF_OK;
 		}
-		
+
 #if SDL_VERSION_ATLEAST(2,0,0)
 		flags = SDL_GL_WINDOW_FLAGS;
 		if (ctx->os_handle) flags &= ~SDL_WINDOW_RESIZABLE;
@@ -552,14 +687,14 @@
 
 		assert(width);
 		assert(height);
-#if SDL_VERSION_ATLEAST(2,0,0)				
+#if SDL_VERSION_ATLEAST(2,0,0)
 		if (!ctx->screen) {
 			if (!(ctx->screen = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags))) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create window: %s\n", SDL_GetError()));
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
 			}
-            GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
 		}
 
 		if ( !ctx->gl_context ) {
@@ -575,8 +710,8 @@
 			}
 			hw_reset = GF_TRUE;
 		}
-        SDL_SetWindowSize(ctx->screen, width, height);
-				
+		SDL_SetWindowSize(ctx->screen, width, height);
+
 #else
 		hw_reset = GF_TRUE;
 		ctx->screen = SDL_SetVideoMode(width, height, 0, flags);
@@ -609,22 +744,22 @@
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
 			}
-            GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
 		}
 		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 (!opt || strcmp(opt, "yes"))
 				flags |= SDL_RENDERER_PRESENTVSYNC;
 
-			
+
 			if (!(ctx->renderer = SDL_CreateRenderer(ctx->screen, -1, flags))) {
-                GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create renderer: %s\n", SDL_GetError()));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create renderer: %s\n", SDL_GetError()));
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
 			}
-        }
-        SDL_SetWindowSize(ctx->screen, width, height);
+		}
+		SDL_SetWindowSize(ctx->screen, width, height);
 #else
 		ctx->screen = SDL_SetVideoMode(width, height, 0, flags);
 #endif
@@ -647,14 +782,14 @@
 #ifdef WIN32
 	putenv("directx");
 #endif
-	
-    flags = SDL_WasInit(SDL_INIT_VIDEO);
+
+	flags = SDL_WasInit(SDL_INIT_VIDEO);
 	if (!(flags & SDL_INIT_VIDEO)) {
 		if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
 			return 0;
 		}
 	}
-    
+
 	ctx->curs_def = SDL_GetCursor();
 	ctx->curs_hand = SDLVid_LoadCursor(hand_data);
 	ctx->curs_collide = SDLVid_LoadCursor(collide_data);
@@ -686,16 +821,16 @@
 		SDL_Rect** modes;
 		modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
 		assert( (modes != (SDL_Rect**)0));
-		if ( modes == (SDL_Rect**)-1 ){
+		if ( modes == (SDL_Rect**)-1 ) {
 			fprintf(stderr, "SDL : DONT KNOW WHICH MODE TO USE, using 640x480\n");
 			dr->max_screen_width = 640;
 			dr->max_screen_height = 480;
 		} else {
 			int i;
 			dr->max_screen_width = 0;
-			for (i=0; modes[i]; ++i){
+			for (i=0; modes[i]; ++i) {
 				int w = modes[i]->w;
-				if (w > dr->max_screen_width){
+				if (w > dr->max_screen_width) {
 					dr->max_screen_width = w;
 					dr->max_screen_height = modes[i]->h;
 				}
@@ -706,13 +841,13 @@
 #endif /* versions prior to 1.2.10 do not have the size of screen */
 #endif
 
-	if (!ctx->os_handle) 
+	if (!ctx->os_handle)
 #if SDL_VERSION_ATLEAST(2,0,0)
 		SDLVid_SetCaption(ctx->screen);
 #else
 		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)); 
+	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 1;
 }
 
@@ -722,14 +857,14 @@
 #if SDL_VERSION_ATLEAST(2,0,0)
 	if ( ctx->gl_context ) {
 		SDL_GL_DeleteContext(ctx->gl_context);
-        ctx->gl_context = NULL;
-    }
+		ctx->gl_context = NULL;
+	}
 	if ( ctx->renderer ) {
 		SDL_DestroyRenderer(ctx->renderer);
-        ctx->renderer = NULL;
-    }
-    
-    /*iOS SDL2 has a nasty bug that breaks switching between 2D and GL context if we don't re-init the video subsystem*/
+		ctx->renderer = NULL;
+	}
+
+	/*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
 	if ( ctx->screen ) {
 		SDL_DestroyWindow(ctx->screen);
@@ -738,7 +873,7 @@
 	SDL_QuitSubSystem(SDL_INIT_VIDEO);
 	SDL_InitSubSystem(SDL_INIT_VIDEO);
 #endif
-	
+
 #endif
 }
 
@@ -765,7 +900,7 @@
 		case SDL_WINDOWEVENT:
 			switch (sdl_evt.window.event) {
 			case SDL_WINDOWEVENT_SIZE_CHANGED:
-                gpac_evt.type = GF_EVENT_SIZE;
+				gpac_evt.type = GF_EVENT_SIZE;
 				gpac_evt.size.width = sdl_evt.window.data1;
 				gpac_evt.size.height = sdl_evt.window.data2;
 				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
@@ -780,7 +915,7 @@
 			break;
 #else
 		case SDL_VIDEORESIZE:
-		  	gpac_evt.type = GF_EVENT_SIZE;
+			gpac_evt.type = GF_EVENT_SIZE;
 			gpac_evt.size.width = sdl_evt.resize.w;
 			gpac_evt.size.height = sdl_evt.resize.h;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
@@ -790,13 +925,13 @@
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 			break;
 #endif
-				
+
 		case SDL_QUIT:
 			memset(&gpac_evt, 0, sizeof(GF_Event));
 			gpac_evt.type = GF_EVENT_QUIT;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 			return 0;
-			
+
 #ifdef SDL_TEXTINPUTEVENT_TEXT_SIZE
 		/*keyboard*/
 		case SDL_TEXTINPUT: /* Since SDL 1.3, text-input is handled in a specific event */
@@ -805,8 +940,10 @@
 			u32 ucs4_len;
 			assert( len < 5 );
 			ucs4_len = utf8_to_ucs4 (&(gpac_evt.character.unicode_char), len, (unsigned char*)(sdl_evt.text.text));
-			gpac_evt.type = GF_EVENT_TEXTINPUT;
-			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);	
+			if (ucs4_len) {
+				gpac_evt.type = GF_EVENT_TEXTINPUT;
+				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+			}
 			break;
 		}
 #endif /* SDL_TEXTINPUTEVENT_TEXT_SIZE */
@@ -818,16 +955,16 @@
 			if (gpac_evt.key.key_code==GF_KEY_CONTROL) ctx->ctrl_down = (sdl_evt.key.type==SDL_KEYDOWN) ? 1 : 0;
 			else if (gpac_evt.key.key_code==GF_KEY_ALT) ctx->alt_down = (sdl_evt.key.type==SDL_KEYDOWN) ? 1 : 0;
 			else if (gpac_evt.key.key_code==GF_KEY_META) ctx->meta_down = (sdl_evt.key.type==SDL_KEYDOWN) ? 1 : 0;
-		
+
 #if (SDL_MAJOR_VERSION>=1) && (SDL_MINOR_VERSION>=3)
 
-			if ((gpac_evt.type==GF_EVENT_KEYUP) && (gpac_evt.key.key_code==GF_KEY_V)	
+			if ((gpac_evt.type==GF_EVENT_KEYUP) && (gpac_evt.key.key_code==GF_KEY_V)
 #if defined(__DARWIN__) || defined(__APPLE__)
-				&& ctx->meta_down 
+			        && ctx->meta_down
 #else
-				&& ctx->ctrl_down 
+			        && ctx->ctrl_down
 #endif
-            ) {
+			   ) {
 #if defined(__DARWIN__) || defined(__APPLE__)
 #else
 				gpac_evt.type = GF_EVENT_PASTE_TEXT;
@@ -836,33 +973,33 @@
 				SDL_free((char *) gpac_evt.message.message);
 #endif
 			}
-			else if ((gpac_evt.type==GF_EVENT_KEYUP) && (gpac_evt.key.key_code==GF_KEY_C)	
+			else if ((gpac_evt.type==GF_EVENT_KEYUP) && (gpac_evt.key.key_code==GF_KEY_C)
 #if defined(__DARWIN__) || defined(__APPLE__)
-				&& ctx->meta_down 
+			         && ctx->meta_down
 #else
-				&& ctx->ctrl_down 
+			         && ctx->ctrl_down
 #endif
-            ) {
-			gpac_evt.type = GF_EVENT_COPY_TEXT;
+			        ) {
+				gpac_evt.type = GF_EVENT_COPY_TEXT;
 #if defined(__DARWIN__) || defined(__APPLE__)
 #else
-			if (dr->on_event(dr->evt_cbk_hdl, &gpac_evt)==GF_TRUE)
-				SDL_SetClipboardText((char *)gpac_evt.message.message );
+				if (dr->on_event(dr->evt_cbk_hdl, &gpac_evt)==GF_TRUE)
+					SDL_SetClipboardText((char *)gpac_evt.message.message );
 #endif
 			}
 #endif
 
 #ifndef SDL_TEXTINPUTEVENT_TEXT_SIZE
 			if ((sdl_evt.key.type==SDL_KEYDOWN)
-				&& sdl_evt.key.keysym.unicode
-				&& ((sdl_evt.key.keysym.unicode=='\r') || (sdl_evt.key.keysym.unicode=='\n')  || (sdl_evt.key.keysym.unicode=='\b') || (sdl_evt.key.keysym.unicode=='\t') )
-			) {
+			        && sdl_evt.key.keysym.unicode
+			        && ((sdl_evt.key.keysym.unicode=='\r') || (sdl_evt.key.keysym.unicode=='\n')  || (sdl_evt.key.keysym.unicode=='\b') || (sdl_evt.key.keysym.unicode=='\t') )
+			   ) {
 				gpac_evt.character.unicode_char = sdl_evt.key.keysym.unicode;
 				gpac_evt.type = GF_EVENT_TEXTINPUT;
 				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 			}
 #endif
-                break;
+			break;
 
 		/*mouse*/
 		case SDL_MOUSEMOTION:
@@ -879,15 +1016,15 @@
 			gpac_evt.mouse.y = sdl_evt.motion.y;
 			gpac_evt.type = (sdl_evt.type==SDL_MOUSEBUTTONUP) ? GF_EVENT_MOUSEUP : GF_EVENT_MOUSEDOWN;
 			switch (sdl_evt.button.button) {
-			case SDL_BUTTON_LEFT: 
+			case SDL_BUTTON_LEFT:
 				gpac_evt.mouse.button = GF_MOUSE_LEFT;
 				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 				break;
-			case SDL_BUTTON_MIDDLE: 
+			case SDL_BUTTON_MIDDLE:
 				gpac_evt.mouse.button = GF_MOUSE_MIDDLE;
 				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 				break;
-			case SDL_BUTTON_RIGHT: 
+			case SDL_BUTTON_RIGHT:
 				gpac_evt.mouse.button = GF_MOUSE_RIGHT;
 				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 				break;
@@ -959,7 +1096,7 @@
 			cursor_on = 1;
 		}
 #endif
-	
+
 		/*QUIT message has been processed*/
 		if (!ret) {
 			ctx->sdl_th_state = SDL_STATE_STOP_REQ;
@@ -992,7 +1129,7 @@
 	ctx->force_alpha = (init_flags & GF_TERM_WINDOW_TRANSPARENT) ? 1 : 0;
 
 	if (!SDLOUT_InitSDL())
-        return GF_IO_ERR;
+		return GF_IO_ERR;
 
 #ifdef	SDL_WINDOW_THREAD
 	ctx->sdl_th_state = SDL_STATE_STOPPED;
@@ -1009,7 +1146,7 @@
 	}
 #else
 	if (!SDLVid_InitializeWindow(ctx, dr)) {
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+		SDL_QuitSubSystem(SDL_INIT_VIDEO);
 		SDLOUT_CloseSDL();
 		return GF_IO_ERR;
 	}
@@ -1057,7 +1194,7 @@
 #endif
 
 	if (ctx->fullscreen==bFullScreenOn) return GF_OK;
-	
+
 	/*lock to get sure the event queue is not processed under X*/
 	gf_mx_p(ctx->evt_mx);
 	ctx->fullscreen = bFullScreenOn;
@@ -1071,13 +1208,14 @@
 #endif
 
 	if (ctx->fullscreen) {
-		u32 flags;
+#if ! ( SDL_VERSION_ATLEAST(2,0,0) )
+		u32 flags = (ctx->output_3d_type==1) ? 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 = 1;
 		if (!dr->max_screen_width || !dr->max_screen_height) switch_res = 1;
 
-		flags = (ctx->output_3d_type==1) ? SDL_GL_FULLSCREEN_FLAGS : SDL_FULLSCREEN_FLAGS;
 		ctx->store_width = *screen_width;
 		ctx->store_height = *screen_height;
 		if (switch_res) {
@@ -1158,7 +1296,7 @@
 #else
 	u32 col;
 #endif
-	
+
 	if (ctx->output_3d_type==1) return GF_BAD_PARAM;
 
 	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "HardwareMemory");
@@ -1249,9 +1387,9 @@
 	/*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"));
-	
-    if (ctx->output_3d_type==1) {
+	//GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Flush\n"));
+
+	if (ctx->output_3d_type==1) {
 #if SDL_VERSION_ATLEAST(2,0,0)
 		SDL_GL_SwapWindow(ctx->screen);
 #else
@@ -1303,12 +1441,15 @@
 		SDL_UnlockSurface(ctx->screen);
 #endif
 		SDL_UnlockSurface(ctx->back_buffer);
-		
+
 	} else {
 #if SDL_VERSION_ATLEAST(2,0,0)
 		SDL_Texture* tx;
 #endif
-		rc.x = dest->x; rc.y = dest->y; rc.w = dest->w; rc.h = dest->h;
+		rc.x = dest->x;
+		rc.y = dest->y;
+		rc.w = dest->w;
+		rc.h = dest->h;
 #if SDL_VERSION_ATLEAST(2,0,0)
 		SDL_ClearError();
 		if (!(tx = SDL_CreateTextureFromSurface(ctx->renderer, ctx->back_buffer))) {
@@ -1355,8 +1496,10 @@
 {
 	u32 res;
 	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF; res<<=8;
-	res |= (val>>8)&0xFF; res<<=8;
+	res = (val)&0xFF;
+	res<<=8;
+	res |= (val>>8)&0xFF;
+	res<<=8;
 	res |= (val>>16)&0xFF;
 	return res;
 }
@@ -1368,7 +1511,7 @@
 #ifndef	SDL_WINDOW_THREAD
 		SDLVID();
 		SDLVid_ProcessMessageQueue(ctx, dr);
-#endif		
+#endif
 #if SDL_VERSION_ATLEAST(2,0,0)
 		{
 			SDLVID();
@@ -1400,9 +1543,9 @@
 		ctx->szCaption[99]=0;
 	}
 #else
-		SDL_WM_SetCaption(evt->caption.caption, NULL);
+	SDL_WM_SetCaption(evt->caption.caption, NULL);
 #endif
-		break;
+	break;
 	case GF_EVENT_SHOWHIDE:
 		/*the only way to have proper show/hide with SDL is to shutdown the video system and reset it up
 		which we don't want to do since the setup MUST occur in the rendering thread for some configs (openGL)*/
@@ -1422,9 +1565,28 @@
 #endif
 		}
 	}
-		break;
+	break;
 	case GF_EVENT_MOVE:
-		break;
+
+#if !defined(GPAC_IPHONE) && SDL_VERSION_ATLEAST(2,0,0)
+        {
+            SDLVID();
+
+			if (ctx->fullscreen) return GF_OK;
+            
+			if (evt->move.relative == 2) {
+			}
+			else if (evt->move.relative) {
+				s32 x, y;
+				x = y = 0;
+                SDL_GetWindowPosition(ctx->screen, &x, &y);
+                SDL_SetWindowPosition(ctx->screen, x + evt->move.x, y + evt->move.y);
+			} else {
+                SDL_SetWindowPosition(ctx->screen, evt->move.x, evt->move.y);
+			}
+        }
+#endif
+            break;
 	case GF_EVENT_VIDEO_SETUP:
 	{
 		SDLVID();
@@ -1435,7 +1597,7 @@
 				ctx->width = ctx->height = 0;
 				ctx->output_3d_type = 0;
 				SDLVid_ResetWindow(ctx);
-		        SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
+				SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
 			} else {
 #if SDL_VERSION_ATLEAST(2,0,0)
 				SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
@@ -1450,7 +1612,7 @@
 				SDLVid_ResetWindow(ctx);
 			}
 			ctx->output_3d_type = 1;
-            GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Setting up 3D in SDL.\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Setting up 3D in SDL.\n"));
 #ifdef GPAC_IPHONE
 //            return SDLVid_ResizeWindow(dr, dr->max_screen_width, dr->max_screen_height);
 			return SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
@@ -1466,7 +1628,7 @@
 		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
@@ -1533,7 +1695,7 @@
 		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){
+	} else if (src_pf==GF_PIXEL_YUY2) {
 		u32 i, j;
 		unsigned char *dst_y, *dst_u, *dst_v;
 
@@ -1565,7 +1727,7 @@
 				pV += src_stride;
 			}
 		}
-	} else if (src_pf==GF_PIXEL_YV12_10){
+	} 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);
@@ -1598,7 +1760,7 @@
 
 		src = pY;
 		dst = pYD;
-		
+
 		src2 = (pixel_format != GF_PIXEL_YV12) ? pU : pV;
 		dst2 = pVD;
 		src3 = (pixel_format  != GF_PIXEL_YV12) ? pV : pU;
@@ -1632,7 +1794,7 @@
 	SDL_Rect dstrc;
 	SDL_Surface **pool;
 
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] Bliting surface (overlay type %d)\n", overlay_type));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] Bliting surface (overlay type %d)\n", overlay_type));
 
 	if (overlay_type) {
 #if SDL_VERSION_ATLEAST(2,0,0)
@@ -1701,9 +1863,9 @@
 		/*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);
+		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);
 
 		SDL_UnlockYUVOverlay(ctx->yuv_overlay);
 
@@ -1717,7 +1879,7 @@
 	}
 
 	/*SDL doesn't support stretching ...*/
-	if ((src_wnd->w != dst_wnd->w) || (src_wnd->h!=dst_wnd->h)) 
+	if ((src_wnd->w != dst_wnd->w) || (src_wnd->h!=dst_wnd->h))
 		return GF_NOT_SUPPORTED;
 
 	switch (video_src->pixel_format) {
@@ -1730,7 +1892,7 @@
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
 		amask = 0x000000FF;
 #else
-        amask = 0xFF000000;
+		amask = 0xFF000000;
 #endif
 		bpp = 4;
 		break;
@@ -1738,33 +1900,33 @@
 		return GF_NOT_SUPPORTED;
 	}
 #if SDL_VERSION_ATLEAST(2,0,0)
-    if ((*pool)) SDL_FreeSurface((*pool));
-    (*pool) = SDL_CreateRGBSurfaceFrom(video_src->video_buffer + video_src->pitch_y*src_wnd->y + src_wnd->x*bpp,
-        src_wnd->w, src_wnd->h, 8*bpp, video_src->pitch_y,
+	if ((*pool)) SDL_FreeSurface((*pool));
+	(*pool) = SDL_CreateRGBSurfaceFrom(video_src->video_buffer + video_src->pitch_y*src_wnd->y + src_wnd->x*bpp,
+	                                   src_wnd->w, src_wnd->h, 8*bpp, video_src->pitch_y,
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-        0xFF000000, 0x00FF0000, 0x0000FF00, amask);
+	                                   0xFF000000, 0x00FF0000, 0x0000FF00, amask);
 #else
-        0x000000FF, 0x0000FF00, 0x00FF0000, amask);
+	                                   0x000000FF, 0x0000FF00, 0x00FF0000, amask);
 #endif
-    dstrc.w = dst_wnd->w;
+	dstrc.w = dst_wnd->w;
 	dstrc.h = dst_wnd->h;
 	dstrc.x = dst_wnd->x;
 	dstrc.y = dst_wnd->y;
-    
+
 	if (SDL_BlitSurface(*pool, NULL, ctx->back_buffer, &dstrc))
-        GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Blit error: %s\n", SDL_GetError()));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Blit error: %s\n", SDL_GetError()));
+
 
-	
 	SDL_FreeSurface((*pool));
-    *pool = NULL;
+	*pool = NULL;
 
 #else
 	if (! *pool || ((*pool)->w < (int) src_wnd->w) || ((*pool)->h < (int) src_wnd->h) ) {
 		if ((*pool)) SDL_FreeSurface((*pool));
 
-		(*pool) = SDL_CreateRGBSurface(ctx->use_systems_memory ? SDL_SWSURFACE : SDL_HWSURFACE, 
-						src_wnd->w, src_wnd->h, 8*bpp, 
-						0x000000FF, 0x0000FF00, 0x00FF0000, amask);
+		(*pool) = SDL_CreateRGBSurface(ctx->use_systems_memory ? SDL_SWSURFACE : SDL_HWSURFACE,
+		                               src_wnd->w, src_wnd->h, 8*bpp,
+		                               0x000000FF, 0x0000FF00, 0x00FF0000, amask);
 
 		if (! (*pool) ) return GF_IO_ERR;
 	}
@@ -1786,10 +1948,10 @@
 	dstrc.y = dst_wnd->y;
 
 	if (SDL_BlitSurface(*pool, NULL, ctx->back_buffer, &dstrc))
-        GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Blit error: %s\n", SDL_GetError()));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Blit error: %s\n", SDL_GetError()));
 #endif
-    
-    
+
+
 	return GF_OK;
 }
 
@@ -1799,7 +1961,7 @@
 {
 	SDLVidCtx *ctx;
 	GF_VideoOutput *driv;
-	
+
 	driv = (GF_VideoOutput*)gf_malloc(sizeof(GF_VideoOutput));
 	memset(driv, 0, sizeof(GF_VideoOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "SDL Video Output", "gpac distribution");
@@ -1810,7 +1972,7 @@
 	ctx->sdl_th = gf_th_new("SDLVideo");
 #endif
 	ctx->evt_mx = gf_mx_new("SDLEvents");
-	
+
 	driv->opaque = ctx;
 	driv->Setup = SDLVid_Setup;
 	driv->Shutdown = SDLVid_Shutdown;
@@ -1838,9 +2000,9 @@
 	}
 	sscanf(opt, "%06x", &driv->overlay_color_key);
 	if (driv->overlay_color_key) driv->overlay_color_key |= 0xFF000000;
-	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL Out] YUV Overlays enabled - ColorKey enabled: %s (key %x)\n", 
-									driv->overlay_color_key ? "Yes" : "No", driv->overlay_color_key
-							));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL Out] YUV Overlays enabled - ColorKey enabled: %s (key %x)\n",
+	                                  driv->overlay_color_key ? "Yes" : "No", driv->overlay_color_key
+	                                 ));
 #endif
 #ifndef SDL_TEXTINPUTEVENT_TEXT_SIZE
 	SDL_EnableUNICODE(1);

gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/video2d.c -> gpac-0.5.1.svn5491.tar.xz/modules/sdl_out/video2d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "sdl_out.h"

gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/ftgrays.c -> gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/ftgrays.c Changed

@@ -15,45 +15,45 @@
 /*                                                                         */
 /***************************************************************************/
 
-  /*************************************************************************/
-  /*                                                                       */
-  /* 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.                                                           */
-  /*                                                                       */
-  /*************************************************************************/
+/*************************************************************************/
+/*                                                                       */
+/* 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.                                                           */
+/*                                                                       */
+/*************************************************************************/
 
 
 /*
@@ -112,7 +112,7 @@
 #endif
 
 
-  /* maximal number of gray spans in a call to the span callback */
+/* maximal number of gray spans in a call to the span callback */
 #define FT_MAX_GRAY_SPANS  64
 
 typedef struct  TCell_
@@ -151,7 +151,7 @@
 
 #define AA_CELL_STEP_ALLOC	8
 
-static GFINLINE void gray_record_cell( TRaster *raster ) 
+static GFINLINE void gray_record_cell( TRaster *raster )
 {
 	if (( raster->area | raster->cover) && (raster->ey<raster->max_ey)) {
 		AACell *cell;
@@ -190,16 +190,16 @@
 
 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);
+	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);
+	*x = UPSCALE(_x);
+	*y = UPSCALE(_y);
 #else
-		*x = (s32) (_x * ONE_PIXEL);
-		*y = (s32) (_y * ONE_PIXEL);
+	*x = (s32) (_x * ONE_PIXEL);
+	*y = (s32) (_y * ONE_PIXEL);
 #endif
 }
 #endif
@@ -241,7 +241,7 @@
 	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; */
@@ -261,13 +261,13 @@
 		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;
@@ -302,7 +302,7 @@
 			mod  += rem;
 			if ( mod >= 0 ) {
 				mod -= (TCoord)dx;
-				delta++; 
+				delta++;
 			}
 
 			raster->area  += (TArea)ONE_PIXEL * delta;
@@ -455,7 +455,7 @@
 }
 
 
- 
+
 static int EVG_Outline_Decompose(EVG_Outline *outline, TRaster *user)
 {
 	EVG_Vector   v_start;
@@ -508,14 +508,14 @@
                                   }
 
 
-  /* 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...                            */
+/* 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             */
+/* through a normal insertion sort             */
 
-static void gray_quick_sort( AACell *cells, int    count ) 
+static void gray_quick_sort( AACell *cells, int    count )
 {
 	AACell *stack[80];  /* should be enough ;-) */
 	AACell **top;        /* top of stack */
@@ -549,8 +549,10 @@
 
 			for (;;) {
 				int x = base->x;
-				do i++; while( i->x < x );
-				do j--; while( x < j->x );
+				do i++;
+				while( i->x < x );
+				do j--;
+				while( x < j->x );
 
 				if ( i > j )
 					break;
@@ -579,7 +581,7 @@
 			for ( ; i < limit; j = i, i++ ) {
 				for ( ; j[1].x < j->x; j-- ) {
 					SWAP_CELLS( j + 1, j, temp );
-					if ( j == base ) 
+					if ( j == base )
 						break;
 				}
 			}
@@ -610,9 +612,9 @@
 	/* the coverage percentage is area/(PIXEL_BITS*PIXEL_BITS*2) */
 	/*                                                           */
 	coverage = (int)( area >> ( PIXEL_BITS * 2 + 1 - 8 ) );
-									/* use range 0..256 */
+	/* use range 0..256 */
 	if ( coverage < 0 )
-	coverage = -coverage;
+		coverage = -coverage;
 
 	if (zero_non_zero_rule) {
 		/* normal non-zero winding rule */
@@ -632,8 +634,8 @@
 		count = raster->num_gray_spans;
 		span  = raster->gray_spans + count - 1;
 		if ( count > 0                          &&
-			(int)span->x + span->len == (int)x &&
-			span->coverage == coverage )
+		        (int)span->x + span->len == (int)x &&
+		        span->coverage == coverage )
 		{
 			span->len = (unsigned short)( span->len + acount );
 			return;
@@ -680,7 +682,7 @@
 			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 ) {
@@ -719,19 +721,19 @@
 #endif
 
 	size_y = raster->max_ey - raster->min_ey;
-    if (raster->max_lines < size_y) {
+	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 = raster->max_ex+1;
 	raster->ey = raster->max_ey+1;
 	raster->cover = 0;
 	raster->area = 0;
 	EVG_Outline_Decompose(outline, raster);
-    gray_record_cell( raster );
-	
+	gray_record_cell( raster );
+
 	/*store odd/even rule*/
 	zero_non_zero_rule = (outline->flags & GF_PATH_FILL_ZERO_NONZERO) ? 1 : 0;
 
@@ -771,7 +773,7 @@
 		gf_free(raster->scanlines[i].cells);
 	}
 	gf_free(raster->scanlines);
-    gf_free(raster);
+	gf_free(raster);
 }
 
 /* END */

gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/rast_soft.h -> gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/rast_soft.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 
@@ -54,7 +54,7 @@
 	GF_Matrix2D smat;					\
 	GF_Rect frame;					\
 	GF_ColorMatrix cmat;			\
-
+ 
 typedef struct _evg_base_stencil
 {
 	EVGBASESTENCIL
@@ -197,7 +197,7 @@
 		u32	col[EVGGRADIENTSLOTS];		\
 		Fixed pos[EVGGRADIENTSLOTS];	\
 		u8 alpha;		\
-
+ 
 typedef struct
 {
 	EVGBASESTENCIL
@@ -209,7 +209,7 @@
 {
 	EVGBASESTENCIL
 	EVGGRADIENT
-	
+
 	GF_Point2D start, end;
 	GF_Matrix2D vecmat;
 	s32	curp;
@@ -221,7 +221,7 @@
 {
 	EVGBASESTENCIL
 	EVGGRADIENT
-	
+
 	GF_Point2D center, focus, radius;
 	/*drawing state vars*/
 	GF_Point2D cur_p, d_f, d_i;
@@ -363,5 +363,5 @@
 }
 #endif
 
-#endif 
+#endif

gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/raster_565.c -> gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/raster_565.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
  */
 
 
@@ -30,7 +30,7 @@
 
 /*
 	FIXME / WARNING - this code only works for little endian platfoms
-		not seen any big endian platform using RGB565/RGB555 output 
+		not seen any big endian platform using RGB565/RGB555 output
 */
 
 
@@ -385,7 +385,7 @@
 		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);		
+		dst = (u16*) (((u8*)dst)+dst_pitch_x);
 		count--;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/raster_argb.c -> gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/raster_argb.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 #include "rast_soft.h"
@@ -109,7 +109,7 @@
 	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;
@@ -195,7 +195,7 @@
 	w = rc.width;
 	sx = rc.x;
 	sy = rc.y;
-	
+
 	use_memset = 0;
 	if (_this->pitch_x !=4) use_memset = 0;
 	else if (!col_a) use_memset = 1;
@@ -355,7 +355,7 @@
 	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];
@@ -514,7 +514,7 @@
 	u8 dsta = dst[3];
 
 	srca = mul255(srca, alpha);
-	/*special case for RGBA: 
+	/*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
 	*/
@@ -553,7 +553,7 @@
 
 	while (count) {
 		u8 dsta = dst[3];
-		/*special case for RGBA: 
+		/*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
 		*/
@@ -601,7 +601,7 @@
 	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
@@ -660,13 +660,14 @@
 	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--) {
+							*p = 0xFF-spans[i].coverage;
+							p += surf->pitch_x;
+						}
+			*/
+		} else {
 			while (len--) {
 				*(u32 *)p = 0;
 				p += surf->pitch_x;

gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/raster_load.c -> gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/raster_load.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,17 +11,17 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
- *		
  */
 
 #include "rast_soft.h"
@@ -75,13 +75,13 @@
 #ifndef GPAC_STANDALONE_RENDER_2D
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_RASTER_2D_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
@@ -101,6 +101,6 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( soft_raster )
+GPAC_MODULE_STATIC_DECLARATION( soft_raster )
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/raster_rgb.c -> gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/raster_rgb.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,18 +11,18 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  *
  *
- *		
  */
 
 #include "rast_soft.h"
@@ -91,7 +91,7 @@
 	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;
@@ -243,7 +243,7 @@
 	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;
@@ -349,7 +349,7 @@
 	s32 i;
 
 	col_no_a = surf->fill_col;
-	for (i=0; i<count; i++) {	
+	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);

gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/stencil.c -> gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/stencil.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include "rast_soft.h"
@@ -32,16 +32,16 @@
 
 
 
-GF_Color color_interpolate(u32 a, u32 b, u8 pos) 
-{ 
+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)    );
+	        (((cr+(cr>>8)+1)>>8)<<16)|
+	        (((cg+(cg>>8)+1)>>8)<< 8)|
+	        (((cb+(cb>>8)+1)>>8)    );
 }
 
 
@@ -63,11 +63,11 @@
 	if (_this->pos[0]>=0) {
 		if(_this->pos[0]>0) {
 			end = FIX2INT(gf_mulfix(_this->pos[0], maxPos));
-			for (i=0; i<= end;i++) {
+			for (i=0; i<= end; i++) {
 				_this->pre[i] = _this->col[0];
 			}
 		}
-		for (c=0; c<EVGGRADIENTSLOTS;c++) {
+		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));
@@ -75,14 +75,14 @@
 				diff = end-start;
 
 				if (diff) {
-					for (i=start;i<=end;i++) {
+					for (i=start; i<=end; i++) {
 						_this->pre[i] = color_interpolate(_this->col[c], _this->col[c+1],
-							(u8) ( ( (i-start) * 255) / diff) );
+						                                  (u8) ( ( (i-start) * 255) / diff) );
 					}
 				}
 			} else {
 				start = FIX2INT(gf_mulfix(_this->pos[c+0], maxPos));
-				for(i=start;i<=EVGGRADIENTMAXINTPOS;i++) {
+				for(i=start; i<=EVGGRADIENTMAXINTPOS; i++) {
 					_this->pre[i] = _this->col[c];
 				}
 			}
@@ -90,7 +90,7 @@
 	}
 }
 
-static u32 gradient_get_color(EVG_BaseGradient *_this, s32 pos) 
+static u32 gradient_get_color(EVG_BaseGradient *_this, s32 pos)
 {
 	s32 max_pos = 1 << EVGGRADIENTBITS;
 
@@ -179,7 +179,7 @@
 		if (tx->owns_texture && tx->pixels) gf_free(tx->pixels);
 		gf_free(_this);
 	}
-		return;
+	return;
 	}
 }
 
@@ -224,7 +224,7 @@
 	linear gradient stencil
 */
 
-static void lgb_fill_run(EVGStencil *p, EVGSurface *surf, s32 x, s32 y, u32 count) 
+static void lgb_fill_run(EVGStencil *p, EVGSurface *surf, s32 x, s32 y, u32 count)
 {
 	Bool has_cmat, has_a;
 	Fixed _res;
@@ -246,7 +246,7 @@
 		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--;
@@ -306,7 +306,7 @@
 	radial gradient stencil
 */
 
-static void rg_fill_run(EVGStencil *p, EVGSurface *surf, s32 _x, s32 _y, u32 count) 
+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;
@@ -334,8 +334,8 @@
 		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);		
+		}
+		if (has_cmat) col = gf_cmx_apply(&p->cmat, col);
 		*data++ = col;
 
 		dx += _this->d_i.x;
@@ -344,7 +344,7 @@
 	}
 }
 
-void evg_radial_init(EVG_RadialGradient *_this) 
+void evg_radial_init(EVG_RadialGradient *_this)
 {
 	GF_Point2D p0, p1;
 	p0.x = p0.y = p1.y = 0;
@@ -499,7 +499,7 @@
 	*outy=y;
 }
 
-static void bmp_fill_run(EVGStencil *p, EVGSurface *surf, s32 _x, s32 _y, u32 count) 
+static void bmp_fill_run(EVGStencil *p, EVGSurface *surf, s32 _x, s32 _y, u32 count)
 {
 	s32 cx, x0, y0;
 	u32 pix, replace_col;
@@ -518,12 +518,12 @@
 	incy = (_this->inc_y>0) ? 1 : -1;
 #endif
 
-	_fd = INT2FIX(_this->width); 
+	_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); 
+	_fd = INT2FIX(_this->height);
 	repeat_t = _this->mod & GF_TEXTURE_REPEAT_T;
 	if (!repeat_t && (y < - _fd)) y = 0;
 	while (y<0) y += _fd;
@@ -542,7 +542,7 @@
 		} else {
 			x0 = MIN(x0, (s32) _this->width - 1);
 		}
-		
+
 		y0 = FIX2INT(y);
 		assert((s32)y0 >=0);
 		if (repeat_t) {
@@ -624,7 +624,7 @@
 
 
 /*just a little faster...*/
-static void bmp_fill_run_straight(EVGStencil *p, EVGSurface *surf, s32 _x, s32 _y, u32 count) 
+static void bmp_fill_run_straight(EVGStencil *p, EVGSurface *surf, s32 _x, s32 _y, u32 count)
 {
 	s32 x0, y0;
 	u32 pix;
@@ -683,7 +683,7 @@
 	}
 }
 
-void evg_bmp_init(EVGStencil *p) 
+void evg_bmp_init(EVGStencil *p)
 {
 	GF_Point2D p0, p1;
 	EVG_Texture *_this = (EVG_Texture *) p;
@@ -698,10 +698,10 @@
 	_this->replace_col = 0;
 	_this->cmat_is_replace = 0;
 	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.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 = 1;
 		_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));
 	}
@@ -731,16 +731,40 @@
 }
 
 
-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); }
+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)
 {

gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/surface.c -> gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/surface.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  */
@@ -54,7 +54,7 @@
 {
 	EVGSurface *surf = (EVGSurface *)_this;
 	if (!surf)
-	  return;
+		return;
 #ifndef INLINE_POINT_CONVERSION
 	if (surf->points) gf_free(surf->points);
 	surf->points = NULL;
@@ -216,7 +216,7 @@
 	EVGSurface *surf = (EVGSurface *)_this;
 	if (!surf) return GF_BAD_PARAM;
 
-	if (rc) {	
+	if (rc) {
 		s32 _x, _y;
 		if (surf->center_coords) {
 			_x = rc->x + surf->width / 2;
@@ -247,7 +247,7 @@
 		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;
@@ -350,7 +350,7 @@
 		col = a = 0;
 		use_const = 0;
 	}
-	
+
 	if (surf->raster_cbk) {
 		if (use_const) {
 			if (!a) return 0;
@@ -534,7 +534,7 @@
 		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);
@@ -567,7 +567,7 @@
 	/*setup ft raster calllbacks*/
 	if (!setup_grey_callback(surf)) return GF_OK;
 
-/*	surf->ftparams.gray_spans = gray_spans_stub; */
+	/*	surf->ftparams.gray_spans = gray_spans_stub; */
 
 	get_surface_world_matrix(surf, &mat);
 
@@ -615,7 +615,7 @@
 			gf_mx2d_add_scale(&sten->smat, INT2FIX(1<<EVGGRADIENTBITS), INT2FIX(1<<EVGGRADIENTBITS));
 
 		}
-			break;
+		break;
 		case GF_STENCIL_RADIAL_GRADIENT:
 		{
 			EVG_RadialGradient *rad = (EVG_RadialGradient*)sten;
@@ -630,7 +630,7 @@
 			/*init*/
 			evg_radial_init(rad);
 		}
-			break;
+		break;
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/modules/svg_in/svg_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/svg_in/svg_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -96,7 +96,7 @@
 }
 
 static GF_Err SVG_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-								u16 ES_ID, u32 stream_time, u32 mmlevel)
+                              u16 ES_ID, u32 stream_time, u32 mmlevel)
 {
 	GF_Err e = GF_OK;
 	SVGIn *svgin = (SVGIn *)plug->privateStack;
@@ -188,43 +188,43 @@
 
 	/*!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);
+	{
+		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_f64_open("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;
-				}
+		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, 0);
-				}
-				buf2[pos + nb_bytes + size] = prev;
-				gf_bs_skip_bytes(bs, size-1);
+			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, 0);
 			}
-//          fclose(f);
-			gf_bs_del(bs);
+			buf2[pos + nb_bytes + size] = prev;
+			gf_bs_skip_bytes(bs, size-1);
+
 		}
-		break;
+//          fclose(f);
+		gf_bs_del(bs);
+	}
+	break;
 
 	default:
 		return GF_BAD_PARAM;
@@ -344,7 +344,7 @@
 	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) {
@@ -356,7 +356,7 @@
 		case GPAC_OTI_SCENE_SVG_GZ:
 		case GPAC_OTI_SCENE_DIMS:
 			return GF_CODEC_SUPPORTED;
-		default:	
+		default:
 			return GF_CODEC_NOT_SUPPORTED;
 		}
 	}
@@ -415,14 +415,14 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	SVGIn *svgin;
-        GF_SceneDecoder *sdec = (GF_SceneDecoder *)ifce;
-        if (!sdec)
-          return;
+	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;
+	svgin = (SVGIn *) sdec->privateStack;
+	if (svgin)
+		gf_free(svgin);
+	sdec->privateStack = NULL;
 	gf_free(sdec);
 }
 
@@ -458,4 +458,4 @@
 	return si;
 }
 
-GPAC_MODULE_STATIC_DELARATION( svg_in )
+GPAC_MODULE_STATIC_DECLARATION( svg_in )

gpac-0.5.0.svn5178.tar.bz2/modules/timedtext/timedtext_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/timedtext/timedtext_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -124,8 +124,10 @@
 	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 = 0;
-		vw = priv->cfg->horiz_offset; if (vw<0) vw = 0;
-		vh = priv->cfg->vert_offset; if (vh<0) vh = 0;
+		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 = 1;
@@ -412,7 +414,7 @@
 				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;
+		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:
@@ -960,19 +962,26 @@
 			/*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;
+				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");
+				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];
+					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->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;
+				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;
+				gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
+				(*id) = -1;
 			}
 			start_idx = i+1;
 			nb_lines ++;
@@ -986,56 +995,92 @@
 	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*/
+		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*/
+		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;
+	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) = i+start_idx;
 	}
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id); (*id) = -1;
+	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;
+	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) = i+start_idx;
 	}
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id); (*id) = -1;
+	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) = i+1;
 	}
-	gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id); (*id) = -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*/
+		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*/
+		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_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, 1);
@@ -1059,7 +1104,7 @@
 }
 
 static GF_Err TTD_ProcessData(GF_SceneDecoder*plug, const char *inBuffer, u32 inBufferLength,
-								u16 ES_ID, u32 AU_time, u32 mmlevel)
+                              u16 ES_ID, u32 AU_time, u32 mmlevel)
 {
 	GF_BitStream *bs;
 	GF_Err e = GF_OK;
@@ -1148,11 +1193,14 @@
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
-	case GF_SCENE_DECODER_INTERFACE: return (GF_BaseInterface *)NewTimedTextDec();
+	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();
+	case GF_NET_CLIENT_INTERFACE:
+		return (GF_BaseInterface *)NewTTReader();
 #endif
-	default: return NULL;
+	default:
+		return NULL;
 	}
 }
 
@@ -1174,7 +1222,9 @@
 #else
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) { return NULL; }
+GF_BaseInterface *LoadInterface(u32 InterfaceType) {
+	return NULL;
+}
 GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce) {}
 
@@ -1194,4 +1244,4 @@
 	return si;
 }
 
-GPAC_MODULE_STATIC_DELARATION( timedtext )
+GPAC_MODULE_STATIC_DECLARATION( timedtext )

gpac-0.5.0.svn5178.tar.bz2/modules/timedtext/timedtext_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/timedtext/timedtext_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -54,40 +54,40 @@
 
 
 const char * TTIN_MIME_TYPES[] = {
-  "x-subtitle/srt", "srt", "SRT SubTitles",
-  "x-subtitle/sub", "sub", "SUB SubTitles",
-  "x-subtitle/ttxt", "ttxt", "3GPP TimedText",
-  NULL
+	"x-subtitle/srt", "srt", "SRT SubTitles",
+	"x-subtitle/sub", "sub", "SUB SubTitles",
+	"x-subtitle/ttxt", "ttxt", "3GPP TimedText",
+	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_term_register_mime_type(plug, TTIN_MIME_TYPES[i], TTIN_MIME_TYPES[i+1], TTIN_MIME_TYPES[i+2]);
-    }
-    return i/3;
+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 0;
+	if (!plug || !url)
+		return 0;
 	sExt = strrchr(url, '.');
 	if (!sExt) return 0;
-	for (i = 0 ; TTIN_MIME_TYPES[i]; i+=3){
-	  if (gf_term_check_extension(plug, TTIN_MIME_TYPES[i], TTIN_MIME_TYPES[i+1], TTIN_MIME_TYPES[i+2], sExt)) return 1;
+	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 1;
 	}
 	return 0;
 }
 
 static Bool TTIn_is_local(const char *url)
 {
-        if (!url)
-          return 0;
+	if (!url)
+		return 0;
 	if (!strnicmp(url, "file://", 7)) return 1;
 	if (strstr(url, "://")) return 0;
 	return 1;
@@ -104,7 +104,7 @@
 	GF_ESD *esd = tti_get_esd(tti);
 	od->objectDescriptorID = esd->ESID;
 	gf_list_add(od->ESDescriptors, esd);
-	gf_term_add_media(tti->service, (GF_Descriptor *)od, 0);
+	gf_service_declare_media(tti->service, (GF_Descriptor *)od, 0);
 }
 
 
@@ -115,9 +115,9 @@
 	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 (!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);
@@ -129,8 +129,8 @@
 	}
 	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);
+	if (tti->szFile)
+		gf_free(tti->szFile);
 	tti->szFile = gf_strdup(szFILE);
 
 	memset(&import, 0, sizeof(GF_MediaImporter));
@@ -145,7 +145,7 @@
 		gf_isom_text_set_streaming_mode(tti->mp4, 1);
 	}
 	if (import.in_name)
-          gf_free(import.in_name);
+		gf_free(import.in_name);
 	return e;
 }
 
@@ -155,9 +155,9 @@
 	const char *szCache;
 	GF_InputService *plug = (GF_InputService *)cbk;
 	TTIn *tti = (TTIn *) plug->priv;
-        if (!tti)
-          return;
-	gf_term_download_update_stats(tti->dnload);
+	if (!tti)
+		return;
+	gf_service_download_update_stats(tti->dnload);
 
 	e = param->error;
 	/*done*/
@@ -174,7 +174,7 @@
 	/*OK confirm*/
 	if (tti->needs_connection) {
 		tti->needs_connection = 0;
-		gf_term_on_connect(tti->service, NULL, e);
+		gf_service_connect_ack(tti->service, NULL, e);
 		if (!e && !tti->od_done) tti_setup_object(tti);
 	}
 }
@@ -182,13 +182,13 @@
 void TTIn_download_file(GF_InputService *plug, const char *url)
 {
 	TTIn *tti = (TTIn *) plug->priv;
-        if (!plug || !url)
-          return;
+	if (!plug || !url)
+		return;
 	tti->needs_connection = 1;
-	tti->dnload = gf_term_download_new(tti->service, url, 0, TTIn_NetIO, plug);
+	tti->dnload = gf_service_download_new(tti->service, url, 0, TTIn_NetIO, plug);
 	if (!tti->dnload) {
 		tti->needs_connection = 0;
-		gf_term_on_connect(tti->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(tti->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(tti->dnload);
@@ -200,11 +200,11 @@
 {
 	GF_Err e;
 	TTIn *tti = (TTIn *)plug->priv;
-        if (!plug || !url)
-          return GF_BAD_PARAM;
+	if (!plug || !url)
+		return GF_BAD_PARAM;
 	tti->service = serv;
 
-	if (tti->dnload) gf_term_download_del(tti->dnload);
+	if (tti->dnload) gf_service_download_del(tti->dnload);
 	tti->dnload = NULL;
 
 	/*remote fetch*/
@@ -213,7 +213,7 @@
 		return GF_OK;
 	}
 	e = TTIn_LoadFile(plug, url, 0);
-	gf_term_on_connect(serv, NULL, e);
+	gf_service_connect_ack(serv, NULL, e);
 	if (!e && !tti->od_done) tti_setup_object(tti);
 	return GF_OK;
 }
@@ -221,16 +221,16 @@
 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 (!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;
+		gf_isom_sample_del(&tti->samp);
+	tti->samp = NULL;
 	if (tti->mp4)
-          gf_isom_delete(tti->mp4);
+		gf_isom_delete(tti->mp4);
 	tti->mp4 = NULL;
 	if (tti->szFile) {
 		gf_delete_file(tti->szFile);
@@ -238,22 +238,22 @@
 		tti->szFile = NULL;
 	}
 	if (tti->dnload)
-          gf_term_download_del(tti->dnload);
+		gf_service_download_del(tti->dnload);
 	tti->dnload = NULL;
-        if (tti->service)
-          gf_term_on_disconnect(tti->service, NULL, GF_OK);
-        tti->service = 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;
+	if (!plug)
+		return NULL;
+	tti = (TTIn *)plug->priv;
+	if (!tti)
+		return NULL;
 	/*visual object*/
 	switch (expect_type) {
 	case GF_MEDIA_OBJECT_UNDEF:
@@ -278,8 +278,8 @@
 	u32 ES_ID;
 	GF_Err e;
 	TTIn *tti = (TTIn *)plug->priv;
-        if (!tti)
-          return GF_BAD_PARAM;
+	if (!tti)
+		return GF_BAD_PARAM;
 	e = GF_SERVICE_ERROR;
 	if (!tti || tti->ch==channel) goto exit;
 
@@ -293,7 +293,7 @@
 	}
 
 exit:
-	gf_term_on_connect(tti->service, channel, e);
+	gf_service_connect_ack(tti->service, channel, e);
 	return e;
 }
 
@@ -306,15 +306,15 @@
 		tti->ch = NULL;
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(tti->service, channel, e);
+	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 (!tti)
+		return GF_BAD_PARAM;
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
 	switch (com->command_type) {
 	case GF_NET_CHAN_SET_PADDING:
@@ -425,15 +425,15 @@
 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_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);
 }

gpac-0.5.0.svn5178.tar.bz2/modules/ui_rec/ui_rec.c -> gpac-0.5.1.svn5491.tar.xz/modules/ui_rec/ui_rec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2007-2012
  *			All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -63,10 +63,10 @@
 			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_CLICK:
 	case GF_EVENT_MOUSEUP:
-	case GF_EVENT_MOUSEDOWN: 
-	case GF_EVENT_MOUSEOVER: 
+	case GF_EVENT_MOUSEDOWN:
+	case GF_EVENT_MOUSEOVER:
 	case GF_EVENT_MOUSEOUT:
 	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
 	case GF_EVENT_MOUSEMOVE:
@@ -110,10 +110,10 @@
 	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_CLICK:
 	case GF_EVENT_MOUSEUP:
-	case GF_EVENT_MOUSEDOWN: 
-	case GF_EVENT_MOUSEOVER: 
+	case GF_EVENT_MOUSEDOWN:
+	case GF_EVENT_MOUSEOVER:
 	case GF_EVENT_MOUSEOUT:
 	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
 	case GF_EVENT_MOUSEMOVE:
@@ -223,17 +223,17 @@
 }
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_TERM_EXT_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)uir_new();
 	return NULL;
@@ -249,4 +249,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( ui_rec )
+GPAC_MODULE_STATIC_DECLARATION( ui_rec )

gpac-0.5.0.svn5178.tar.bz2/modules/validator/validator.c -> gpac-0.5.1.svn5491.tar.xz/modules/validator/validator.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,45 +32,45 @@
 
 typedef struct __validation_module
 {
-    GF_Terminal *term;
+	GF_Terminal *term;
 
-    Bool is_recording;
-    char *prev_fps;
-    char *prev_alias;
+	Bool is_recording;
+	char *prev_fps;
+	char *prev_alias;
 
-    /* Clock used to synchronize events in recording and playback*/
+	/* Clock used to synchronize events in recording and playback*/
 	GF_Clock *ck;
 
-    /* Next event to process */
-    Bool next_event_snapshot;
+	/* Next event to process */
+	Bool next_event_snapshot;
 	GF_Event next_event;
-    u32 xvs_event_index;
+	u32 xvs_event_index;
 	u32 next_time;
 	Bool evt_loaded;
 
-    GF_VideoListener video_listener;
-
-    /* XML Validation List (the list of files to be tested) */
-    char *xvl_filename;
-    GF_DOMParser *xvl_parser;
-    GF_XMLNode *xvl_node;
-    GF_XMLNode *xvs_node_in_xvl;
-    u32 xvl_node_index;
-
-    /* Pointer to the current validation script file being tested */
-    char *xvs_filename;
-    GF_DOMParser *xvs_parser;
-    GF_XMLNode *xvs_node;
-    Bool xvs_result;
-
-    /* test sequence */
-    char *test_base;
-    char *test_filename;
-    
-    Bool snapshot_next_frame;
-    u32 snapshot_number;
-
-    GF_TermEventFilter evt_filter;
+	GF_VideoListener video_listener;
+
+	/* XML Validation List (the list of files to be tested) */
+	char *xvl_filename;
+	GF_DOMParser *xvl_parser;
+	GF_XMLNode *xvl_node;
+	GF_XMLNode *xvs_node_in_xvl;
+	u32 xvl_node_index;
+
+	/* Pointer to the current validation script file being tested */
+	char *xvs_filename;
+	GF_DOMParser *xvs_parser;
+	GF_XMLNode *xvs_node;
+	Bool xvs_result;
+
+	/* test sequence */
+	char *test_base;
+	char *test_filename;
+
+	Bool snapshot_next_frame;
+	u32 snapshot_number;
+
+	GF_TermEventFilter evt_filter;
 } GF_Validator;
 
 static void validator_xvs_close(GF_Validator *validator);
@@ -78,137 +78,137 @@
 
 static void validator_xvs_add_snapshot_node(GF_Validator *validator, const char *filename, u32 scene_time)
 {
-    GF_XMLNode *snap_node;
-    GF_XMLAttribute *att;
-    GF_SAFEALLOC(snap_node, GF_XMLNode);
-    snap_node->name = gf_strdup("snapshot");
-    snap_node->attributes = gf_list_new();
-    GF_SAFEALLOC(att, GF_XMLAttribute);
-    att->name = gf_strdup("time");
-    att->value = gf_malloc(100);
-    sprintf(att->value, "%d", scene_time);
-    gf_list_add(snap_node->attributes, att);
-    GF_SAFEALLOC(att, GF_XMLAttribute);
-    att->name = gf_strdup("image");
-    att->value = gf_strdup(filename);
-    gf_list_add(snap_node->attributes, att);
-    gf_list_add(validator->xvs_node->content, snap_node);
-
-    /* adding an extra text node for line break in serialization */
-    GF_SAFEALLOC(snap_node, GF_XMLNode);
-    snap_node->type = GF_XML_TEXT_TYPE;
-    snap_node->name = gf_strdup("\n");
-    gf_list_add(validator->xvs_node->content, snap_node);
+	GF_XMLNode *snap_node;
+	GF_XMLAttribute *att;
+	GF_SAFEALLOC(snap_node, GF_XMLNode);
+	snap_node->name = gf_strdup("snapshot");
+	snap_node->attributes = gf_list_new();
+	GF_SAFEALLOC(att, GF_XMLAttribute);
+	att->name = gf_strdup("time");
+	att->value = gf_malloc(100);
+	sprintf(att->value, "%d", scene_time);
+	gf_list_add(snap_node->attributes, att);
+	GF_SAFEALLOC(att, GF_XMLAttribute);
+	att->name = gf_strdup("image");
+	att->value = gf_strdup(filename);
+	gf_list_add(snap_node->attributes, att);
+	gf_list_add(validator->xvs_node->content, snap_node);
+
+	/* adding an extra text node for line break in serialization */
+	GF_SAFEALLOC(snap_node, GF_XMLNode);
+	snap_node->type = GF_XML_TEXT_TYPE;
+	snap_node->name = gf_strdup("\n");
+	gf_list_add(validator->xvs_node->content, snap_node);
 }
 
 static char *validator_get_snapshot_name(char *test_filename, Bool is_reference, u32 number)
 {
-    char *dot;
-    char dumpname[GF_MAX_PATH];
-    dot = strrchr(test_filename, '.');
-    dot[0] = 0;
-    sprintf(dumpname, "%s-%s-%03d.png", test_filename, (is_reference?"reference":"newest"), number);
-    dot[0] = '.';
-    return gf_strdup(dumpname);
+	char *dot;
+	char dumpname[GF_MAX_PATH];
+	dot = strrchr(test_filename, '.');
+	dot[0] = 0;
+	sprintf(dumpname, "%s-%s-%03d.png", test_filename, (is_reference?"reference":"newest"), number);
+	dot[0] = '.';
+	return gf_strdup(dumpname);
 }
 
-static char *validator_create_snapshot(GF_Validator *validator) 
+static char *validator_create_snapshot(GF_Validator *validator)
 {
-    GF_Err e;
+	GF_Err e;
 	GF_VideoSurface fb;
-    GF_Terminal *term = validator->term;
-    char *dumpname;
-    
-    dumpname = validator_get_snapshot_name(validator->test_filename, validator->is_recording, validator->snapshot_number);
-    
-    e = gf_term_get_screen_buffer(term, &fb);
-    if (e) {
-	    GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error dumping screen buffer %s\n", gf_error_to_string(e)));
-    } else {
-	    u32 dst_size = fb.width*fb.height*3;
-	    char *dst=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) {
-		    GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error encoding PNG %s\n", gf_error_to_string(e)));
-	    } else {
-		    FILE *png = gf_f64_open(dumpname, "wb");
-		    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);
-			    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);
-    }
-    validator->snapshot_number++;
-    return dumpname;
+	GF_Terminal *term = validator->term;
+	char *dumpname;
+
+	dumpname = validator_get_snapshot_name(validator->test_filename, validator->is_recording, validator->snapshot_number);
+
+	e = gf_term_get_screen_buffer(term, &fb);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error dumping screen buffer %s\n", gf_error_to_string(e)));
+	} else {
+		u32 dst_size = fb.width*fb.height*3;
+		char *dst=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) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error encoding PNG %s\n", gf_error_to_string(e)));
+		} else {
+			FILE *png = gf_f64_open(dumpname, "wb");
+			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);
+				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);
+	}
+	validator->snapshot_number++;
+	return dumpname;
 }
 
 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;
-    Bool result = 0;
-    GF_Err e;
-    u32 i;
-
-    u32 snap_number = validator->snapshot_number - 1;
-    ref_name = validator_get_snapshot_name(validator->test_filename, 1, snap_number);
-    new_name = validator_get_snapshot_name(validator->test_filename, 0, snap_number);
-
-    e = gf_img_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);
-    if (e) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Cannot decode PNG file %s\n", new_name));
-        goto end;
-    }
-    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;
-    }
-    if (ref_height != new_height) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Snapshots have different heights: %d vs %d\n", ref_height, new_height));
-        goto end;
-    }
-    if (ref_pixel_format != new_pixel_format) {
-        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]) {
-            GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Snapshots have different pixel values at position %d: %d vs %d\n", i, ref_data[i], new_data[i]));
-            break;
-        }
-    }
-    if (i==ref_data_size) result = 1;
+	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;
+	Bool result = 0;
+	GF_Err e;
+	u32 i;
+
+	u32 snap_number = validator->snapshot_number - 1;
+	ref_name = validator_get_snapshot_name(validator->test_filename, 1, snap_number);
+	new_name = validator_get_snapshot_name(validator->test_filename, 0, snap_number);
+
+	e = gf_img_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);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Cannot decode PNG file %s\n", new_name));
+		goto end;
+	}
+	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;
+	}
+	if (ref_height != new_height) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Snapshots have different heights: %d vs %d\n", ref_height, new_height));
+		goto end;
+	}
+	if (ref_pixel_format != new_pixel_format) {
+		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]) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Snapshots have different pixel values at position %d: %d vs %d\n", i, ref_data[i], new_data[i]));
+			break;
+		}
+	}
+	if (i==ref_data_size) result = 1;
 
 end:
-    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);
-    return result;
+	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);
+	return result;
 }
 
 static void validator_on_video_frame(void *udta, u32 time)
 {
 	GF_Validator *validator = (GF_Validator *)udta;
-    if (validator->snapshot_next_frame) {
-        char *snap_name = validator_create_snapshot(validator);
-        validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->ck));
-        gf_free(snap_name);
-        validator->snapshot_next_frame = 0;
-    }
+	if (validator->snapshot_next_frame) {
+		char *snap_name = validator_create_snapshot(validator);
+		validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->ck));
+		gf_free(snap_name);
+		validator->snapshot_next_frame = 0;
+	}
 }
 
 static void validator_on_video_reconfig(void *udta, u32 width, u32 height, u8 bpp)
@@ -221,171 +221,171 @@
 	switch (event->type) {
 	case GF_EVENT_CONNECT:
 		if (event->connect.is_connected) {
-            gf_sc_add_video_listener(validator->term->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;
+			gf_sc_add_video_listener(validator->term->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;
 		}
 		break;
-	case GF_EVENT_CLICK: 
+	case GF_EVENT_CLICK:
 	case GF_EVENT_MOUSEUP:
-	case GF_EVENT_MOUSEDOWN: 
-	case GF_EVENT_MOUSEOVER: 
+	case GF_EVENT_MOUSEDOWN:
+	case GF_EVENT_MOUSEOVER:
 	case GF_EVENT_MOUSEOUT:
 	case GF_EVENT_MOUSEMOVE:
 	case GF_EVENT_MOUSEWHEEL:
 	case GF_EVENT_KEYDOWN:
 	case GF_EVENT_TEXTINPUT:
-        return 1;
+		return 1;
 	case GF_EVENT_KEYUP:
-        if ((event->key.key_code == GF_KEY_END)&&(event->key.flags & GF_KEY_MOD_CTRL)) { 
-            GF_Event evt;
+		if ((event->key.key_code == GF_KEY_END)&&(event->key.flags & GF_KEY_MOD_CTRL)) {
+			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);                
-        }
-        return 1;
+			evt.type = GF_EVENT_QUIT;
+			validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
+		}
+		return 1;
 	}
 	return 0;
 }
 
-static void validator_xvs_add_event_dom(GF_Validator *validator, GF_Event *event) 
+static void validator_xvs_add_event_dom(GF_Validator *validator, GF_Event *event)
 {
-    GF_XMLNode *evt_node;
-    GF_XMLAttribute *att;
-    
-    GF_SAFEALLOC(evt_node, GF_XMLNode);
+	GF_XMLNode *evt_node;
+	GF_XMLAttribute *att;
 
-    switch (event->type) {
-	case GF_EVENT_CLICK: 
+	GF_SAFEALLOC(evt_node, GF_XMLNode);
+
+	switch (event->type) {
+	case GF_EVENT_CLICK:
 	case GF_EVENT_MOUSEUP:
-	case GF_EVENT_MOUSEDOWN: 
-	case GF_EVENT_MOUSEOVER: 
+	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_TEXTINPUT:
-        evt_node->name = gf_strdup(gf_dom_event_get_name(event->type));
-        break;
-    }
-    
-    if (!evt_node->name) {
-        gf_free(evt_node);
-        return;
-    }
-
-    evt_node->attributes = gf_list_new();
-
-    GF_SAFEALLOC(att, GF_XMLAttribute);
-    att->name = gf_strdup("time");
-    att->value = gf_malloc(100);
-    sprintf(att->value, "%f", gf_scene_get_time(validator->term->root_scene)*1000);
-    gf_list_add(evt_node->attributes, att);
-
-    switch (event->type) {
-	case GF_EVENT_CLICK: 
+		evt_node->name = gf_strdup(gf_dom_event_get_name(event->type));
+		break;
+	}
+
+	if (!evt_node->name) {
+		gf_free(evt_node);
+		return;
+	}
+
+	evt_node->attributes = gf_list_new();
+
+	GF_SAFEALLOC(att, GF_XMLAttribute);
+	att->name = gf_strdup("time");
+	att->value = gf_malloc(100);
+	sprintf(att->value, "%f", gf_scene_get_time(validator->term->root_scene)*1000);
+	gf_list_add(evt_node->attributes, att);
+
+	switch (event->type) {
+	case GF_EVENT_CLICK:
 	case GF_EVENT_MOUSEUP:
-	case GF_EVENT_MOUSEDOWN: 
-	case GF_EVENT_MOUSEOVER: 
+	case GF_EVENT_MOUSEDOWN:
+	case GF_EVENT_MOUSEOVER:
 	case GF_EVENT_MOUSEOUT:
 	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->name = gf_strdup("button");
-            switch (event->mouse.button) {
-                case 0:
-                    att->value = gf_strdup("Left");
-                    break;
-                case 1:
-                    att->value = gf_strdup("Middle");
-                    break;
-                case 2:
-                    att->value = gf_strdup("Right");
-                    break;
-            }
-            gf_list_add(evt_node->attributes, att);
-        }
-        GF_SAFEALLOC(att, GF_XMLAttribute);
-        att->name = gf_strdup("x");
-        att->value = gf_malloc(100);
-        sprintf(att->value, "%d", event->mouse.x);
-        gf_list_add(evt_node->attributes, att);
-        GF_SAFEALLOC(att, GF_XMLAttribute);
-        att->name = gf_strdup("y");
-        att->value = gf_malloc(100);
-        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->name = gf_strdup("wheel_pos");
-            att->value = gf_malloc(100);
-            sprintf(att->value, "%f", event->mouse.wheel_pos);
-            gf_list_add(evt_node->attributes, att);
-        }
-        if (event->mouse.key_states & GF_KEY_MOD_SHIFT) {
-            GF_SAFEALLOC(att, GF_XMLAttribute);
-            att->name = gf_strdup("shift");
-            att->value = gf_strdup("true");
-            gf_list_add(evt_node->attributes, att);
-        }
-        if (event->mouse.key_states & GF_KEY_MOD_CTRL) {
-            GF_SAFEALLOC(att, GF_XMLAttribute);
-            att->name = gf_strdup("ctrl");
-            att->value = gf_strdup("true");
-            gf_list_add(evt_node->attributes, att);
-        }
-        if (event->mouse.key_states & GF_KEY_MOD_ALT) {
-            GF_SAFEALLOC(att, GF_XMLAttribute);
-            att->name = gf_strdup("alt");
-            att->value = gf_strdup("true");
-            gf_list_add(evt_node->attributes, att);
-        }
-        break;
+		if (event->type == GF_EVENT_MOUSEDOWN || event->type == GF_EVENT_MOUSEUP) {
+			GF_SAFEALLOC(att, GF_XMLAttribute);
+			att->name = gf_strdup("button");
+			switch (event->mouse.button) {
+			case 0:
+				att->value = gf_strdup("Left");
+				break;
+			case 1:
+				att->value = gf_strdup("Middle");
+				break;
+			case 2:
+				att->value = gf_strdup("Right");
+				break;
+			}
+			gf_list_add(evt_node->attributes, att);
+		}
+		GF_SAFEALLOC(att, GF_XMLAttribute);
+		att->name = gf_strdup("x");
+		att->value = gf_malloc(100);
+		sprintf(att->value, "%d", event->mouse.x);
+		gf_list_add(evt_node->attributes, att);
+		GF_SAFEALLOC(att, GF_XMLAttribute);
+		att->name = gf_strdup("y");
+		att->value = gf_malloc(100);
+		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->name = gf_strdup("wheel_pos");
+			att->value = gf_malloc(100);
+			sprintf(att->value, "%f", FIX2FLT( event->mouse.wheel_pos) );
+			gf_list_add(evt_node->attributes, att);
+		}
+		if (event->mouse.key_states & GF_KEY_MOD_SHIFT) {
+			GF_SAFEALLOC(att, GF_XMLAttribute);
+			att->name = gf_strdup("shift");
+			att->value = gf_strdup("true");
+			gf_list_add(evt_node->attributes, att);
+		}
+		if (event->mouse.key_states & GF_KEY_MOD_CTRL) {
+			GF_SAFEALLOC(att, GF_XMLAttribute);
+			att->name = gf_strdup("ctrl");
+			att->value = gf_strdup("true");
+			gf_list_add(evt_node->attributes, att);
+		}
+		if (event->mouse.key_states & GF_KEY_MOD_ALT) {
+			GF_SAFEALLOC(att, GF_XMLAttribute);
+			att->name = gf_strdup("alt");
+			att->value = gf_strdup("true");
+			gf_list_add(evt_node->attributes, att);
+		}
+		break;
 	/*Key Events*/
 	case GF_EVENT_KEYUP:
 	case GF_EVENT_KEYDOWN:
 	case GF_EVENT_LONGKEYPRESS:
-        GF_SAFEALLOC(att, GF_XMLAttribute);
-        att->name = gf_strdup("key_identifier");
-        att->value = gf_strdup(gf_dom_get_key_name(event->key.key_code));
-        gf_list_add(evt_node->attributes, att);        
-        if (event->key.flags & GF_KEY_MOD_SHIFT) {
-            GF_SAFEALLOC(att, GF_XMLAttribute);
-            att->name = gf_strdup("shift");
-            att->value = gf_strdup("true");
-            gf_list_add(evt_node->attributes, att);
-        }
-        if (event->key.flags & GF_KEY_MOD_CTRL) {
-            GF_SAFEALLOC(att, GF_XMLAttribute);
-            att->name = gf_strdup("ctrl");
-            att->value = gf_strdup("true");
-            gf_list_add(evt_node->attributes, att);
-        }
-        if (event->key.flags & GF_KEY_MOD_ALT) {
-            GF_SAFEALLOC(att, GF_XMLAttribute);
-            att->name = gf_strdup("alt");
-            att->value = gf_strdup("true");
-            gf_list_add(evt_node->attributes, att);
-        }
+		GF_SAFEALLOC(att, GF_XMLAttribute);
+		att->name = gf_strdup("key_identifier");
+		att->value = gf_strdup(gf_dom_get_key_name(event->key.key_code));
+		gf_list_add(evt_node->attributes, att);
+		if (event->key.flags & GF_KEY_MOD_SHIFT) {
+			GF_SAFEALLOC(att, GF_XMLAttribute);
+			att->name = gf_strdup("shift");
+			att->value = gf_strdup("true");
+			gf_list_add(evt_node->attributes, att);
+		}
+		if (event->key.flags & GF_KEY_MOD_CTRL) {
+			GF_SAFEALLOC(att, GF_XMLAttribute);
+			att->name = gf_strdup("ctrl");
+			att->value = gf_strdup("true");
+			gf_list_add(evt_node->attributes, att);
+		}
+		if (event->key.flags & GF_KEY_MOD_ALT) {
+			GF_SAFEALLOC(att, GF_XMLAttribute);
+			att->name = gf_strdup("alt");
+			att->value = gf_strdup("true");
+			gf_list_add(evt_node->attributes, att);
+		}
 		break;
 	case GF_EVENT_TEXTINPUT:
-        GF_SAFEALLOC(att, GF_XMLAttribute);
-        att->name = gf_strdup("unicode-char");
-        att->value = gf_malloc(100);
-        sprintf(att->value, "%d", event->character.unicode_char);
-        gf_list_add(evt_node->attributes, att);
-        break;
-    }
-    gf_list_add(validator->xvs_node->content, evt_node);
-    /* adding an extra text node for line break in serialization */
-    GF_SAFEALLOC(evt_node, GF_XMLNode);
-    evt_node->type = GF_XML_TEXT_TYPE;
-    evt_node->name = gf_strdup("\n");
-    gf_list_add(validator->xvs_node->content, evt_node);
-} 
+		GF_SAFEALLOC(att, GF_XMLAttribute);
+		att->name = gf_strdup("unicode-char");
+		att->value = gf_malloc(100);
+		sprintf(att->value, "%d", event->character.unicode_char);
+		gf_list_add(evt_node->attributes, att);
+		break;
+	}
+	gf_list_add(validator->xvs_node->content, evt_node);
+	/* adding an extra text node for line break in serialization */
+	GF_SAFEALLOC(evt_node, GF_XMLNode);
+	evt_node->type = GF_XML_TEXT_TYPE;
+	evt_node->name = gf_strdup("\n");
+	gf_list_add(validator->xvs_node->content, evt_node);
+}
 
 Bool validator_on_event_record(void *udta, GF_Event *event, Bool consumed_by_compositor)
 {
@@ -394,402 +394,402 @@
 	switch (event->type) {
 	case GF_EVENT_CONNECT:
 		if (event->connect.is_connected) {
-            gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+			gf_sc_add_video_listener(validator->term->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;
 		}
 		break;
 	case GF_EVENT_KEYDOWN:
-        if (event->key.key_code == GF_KEY_INSERT) { 
-            rec_event = 0;
-        } else if (event->key.key_code == GF_KEY_PAGEDOWN) { 
-            rec_event = 0;
-        } else if (event->key.key_code == GF_KEY_PAGEUP) { 
-            rec_event = 0;
-        } else if (event->key.key_code == GF_KEY_END) { 
-            rec_event = 0;
-        } else if (event->key.key_code == GF_KEY_CONTROL) { 
-            rec_event = 0;
-        } else if (event->key.flags & GF_KEY_MOD_CTRL) {
-            rec_event = 0;
-        }
-        break;
+		if (event->key.key_code == GF_KEY_INSERT) {
+			rec_event = 0;
+		} else if (event->key.key_code == GF_KEY_PAGEDOWN) {
+			rec_event = 0;
+		} else if (event->key.key_code == GF_KEY_PAGEUP) {
+			rec_event = 0;
+		} else if (event->key.key_code == GF_KEY_END) {
+			rec_event = 0;
+		} else if (event->key.key_code == GF_KEY_CONTROL) {
+			rec_event = 0;
+		} else if (event->key.flags & GF_KEY_MOD_CTRL) {
+			rec_event = 0;
+		}
+		break;
 	case GF_EVENT_KEYUP:
-        if (event->key.flags & GF_KEY_MOD_CTRL) {
-            rec_event = 0;
-            if (event->key.key_code == GF_KEY_INSERT) { 
-                char *snap_name = validator_create_snapshot(validator);
-                validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->ck));
-                gf_free(snap_name);
-            } else if (event->key.key_code == GF_KEY_END) {
-                GF_Event evt;
+		if (event->key.flags & GF_KEY_MOD_CTRL) {
+			rec_event = 0;
+			if (event->key.key_code == GF_KEY_INSERT) {
+				char *snap_name = validator_create_snapshot(validator);
+				validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->ck));
+				gf_free(snap_name);
+			} 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);                
-            } else if (event->key.key_code == GF_KEY_F1) {
-                validator->snapshot_next_frame = 1;
-            }
-        } else if (event->key.key_code == GF_KEY_PAGEDOWN) { 
-            rec_event = 0;
-            validator_xvs_close(validator);
-            gf_term_disconnect(validator->term);
-            gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
-            validator_xvs_next(validator, 0);
-        } else if (event->key.key_code == GF_KEY_PAGEUP) { 
-            rec_event = 0;
-            validator_xvs_close(validator);
-            gf_term_disconnect(validator->term);
-            gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
-            validator_xvs_next(validator, 1);
-        } else if (event->key.key_code == GF_KEY_CONTROL) { 
-            rec_event = 0;
-        }
-        break;
+				evt.type = GF_EVENT_QUIT;
+				validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
+			} else if (event->key.key_code == GF_KEY_F1) {
+				validator->snapshot_next_frame = 1;
+			}
+		} else if (event->key.key_code == GF_KEY_PAGEDOWN) {
+			rec_event = 0;
+			validator_xvs_close(validator);
+			gf_term_disconnect(validator->term);
+			gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
+			validator_xvs_next(validator, 0);
+		} else if (event->key.key_code == GF_KEY_PAGEUP) {
+			rec_event = 0;
+			validator_xvs_close(validator);
+			gf_term_disconnect(validator->term);
+			gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
+			validator_xvs_next(validator, 1);
+		} else if (event->key.key_code == GF_KEY_CONTROL) {
+			rec_event = 0;
+		}
+		break;
+	}
+	if (rec_event) {
+		validator_xvs_add_event_dom(validator, event);
 	}
-    if (rec_event) {
-        validator_xvs_add_event_dom(validator, event);
-    }
 	return 0;
 }
 
-static void validator_xvl_open(GF_Validator *validator) 
+static void validator_xvl_open(GF_Validator *validator)
 {
-    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) {
-        gf_xml_dom_del(validator->xvl_parser);
-        validator->xvl_parser = NULL;
-        return;
-    }
-    validator->xvl_node = gf_xml_dom_get_root(validator->xvl_parser);
-    if (!validator->xvl_node) {
-        gf_xml_dom_del(validator->xvl_parser);
-        validator->xvl_parser = NULL;
-        return;
-    }
-    att_index = 0;
-    while (1) {
-        att = 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);
-        }
-        att_index++;
-    }
+	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) {
+		gf_xml_dom_del(validator->xvl_parser);
+		validator->xvl_parser = NULL;
+		return;
+	}
+	validator->xvl_node = gf_xml_dom_get_root(validator->xvl_parser);
+	if (!validator->xvl_node) {
+		gf_xml_dom_del(validator->xvl_parser);
+		validator->xvl_parser = NULL;
+		return;
+	}
+	att_index = 0;
+	while (1) {
+		att = 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);
+		}
+		att_index++;
+	}
 }
 
-static void validator_xvl_close(GF_Validator *validator) 
+static void validator_xvl_close(GF_Validator *validator)
 {
-    if (validator->xvl_parser) {
-        /* writing the validation results */
-        if (!validator->is_recording) {
-            FILE *xvl_fp;
-            char *xvl_content;
-            char result_filename[GF_MAX_PATH];
-            char *dot;
-            xvl_content = gf_xml_dom_serialize(validator->xvl_node, 0);
-            dot = strrchr(validator->xvl_filename, '.');
-            dot[0] = 0;
-            sprintf(result_filename, "%s-result.xml", validator->xvl_filename);
-            dot[0] = '.';
-            xvl_fp = gf_f64_open(result_filename, "wt");
-            gf_fwrite(xvl_content, strlen(xvl_content), 1, xvl_fp);
-            fclose(xvl_fp);
-            gf_free(xvl_content);
-        } 
-        gf_xml_dom_del(validator->xvl_parser);
-        validator->xvl_parser = NULL;
-        validator->xvl_filename = NULL;
-    }
+	if (validator->xvl_parser) {
+		/* writing the validation results */
+		if (!validator->is_recording) {
+			FILE *xvl_fp;
+			char *xvl_content;
+			char result_filename[GF_MAX_PATH];
+			char *dot;
+			xvl_content = gf_xml_dom_serialize(validator->xvl_node, 0);
+			dot = strrchr(validator->xvl_filename, '.');
+			dot[0] = 0;
+			sprintf(result_filename, "%s-result.xml", validator->xvl_filename);
+			dot[0] = '.';
+			xvl_fp = gf_f64_open(result_filename, "wt");
+			gf_fwrite(xvl_content, strlen(xvl_content), 1, xvl_fp);
+			fclose(xvl_fp);
+			gf_free(xvl_content);
+		}
+		gf_xml_dom_del(validator->xvl_parser);
+		validator->xvl_parser = NULL;
+		validator->xvl_filename = NULL;
+	}
 }
 
 static void validator_xvl_get_next_xvs(GF_Validator *validator, Bool reverse)
-{    
-    u32 xvl_att_index;
-    validator->xvs_node = NULL;
-    validator->xvs_filename = NULL;
-    validator->test_filename = NULL;
-    while (1) {
-        validator->xvs_node_in_xvl = gf_list_get(validator->xvl_node->content, validator->xvl_node_index);
-        if (!validator->xvs_node_in_xvl) {
-            return;
-        } 
-        if (validator->xvs_node_in_xvl->type != GF_XML_NODE_TYPE) {
-            if (!reverse) validator->xvl_node_index++;
-            else validator->xvl_node_index--;
-            continue;
-        }
-        xvl_att_index = 0;
-        while(1) {
-            GF_XMLAttribute *att = gf_list_get(validator->xvs_node_in_xvl->attributes, xvl_att_index);
-            if (!att) break;
-            if (!strcmp(att->name, "scenario")) {
-                validator->xvs_filename = att->value;
-            } else if (!strcmp(att->name, "content")) {
-                validator->test_filename = att->value;
-            }
-            xvl_att_index++;
-        }
-        if (!reverse) validator->xvl_node_index++;
-        else validator->xvl_node_index--;
-        break;
-    }
+{
+	u32 xvl_att_index;
+	validator->xvs_node = NULL;
+	validator->xvs_filename = NULL;
+	validator->test_filename = NULL;
+	while (1) {
+		validator->xvs_node_in_xvl = gf_list_get(validator->xvl_node->content, validator->xvl_node_index);
+		if (!validator->xvs_node_in_xvl) {
+			return;
+		}
+		if (validator->xvs_node_in_xvl->type != GF_XML_NODE_TYPE) {
+			if (!reverse) validator->xvl_node_index++;
+			else validator->xvl_node_index--;
+			continue;
+		}
+		xvl_att_index = 0;
+		while(1) {
+			GF_XMLAttribute *att = gf_list_get(validator->xvs_node_in_xvl->attributes, xvl_att_index);
+			if (!att) break;
+			if (!strcmp(att->name, "scenario")) {
+				validator->xvs_filename = att->value;
+			} else if (!strcmp(att->name, "content")) {
+				validator->test_filename = att->value;
+			}
+			xvl_att_index++;
+		}
+		if (!reverse) validator->xvl_node_index++;
+		else validator->xvl_node_index--;
+		break;
+	}
 }
 
-static Bool validator_xvs_open(GF_Validator *validator) 
+static Bool validator_xvs_open(GF_Validator *validator)
 {
-    GF_Err e;
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Validator] Opening Validation Script: %s\n", validator->xvs_filename));
-    validator->snapshot_number = 0;
-    validator->xvs_parser = gf_xml_dom_new();
-    e = gf_xml_dom_parse(validator->xvs_parser, validator->xvs_filename, NULL, NULL);
-    if (e != GF_OK) {
-        if (validator->is_recording) {
-            GF_SAFEALLOC(validator->xvs_node, GF_XMLNode);
-            validator->xvs_node->name = gf_strdup("TestValidationScript");
-            validator->xvs_node->attributes = gf_list_new();
-            validator->xvs_node->content = gf_list_new();
-        } else {
-            gf_xml_dom_del(validator->xvs_parser);
-            validator->xvs_parser = NULL;
-            return 0;
-        }
-    } else {
-        validator->xvs_node = gf_xml_dom_get_root(validator->xvs_parser);
-    }
-    /* Get the file name from the XVS if not found in the XVL */
-    if (!validator->test_filename) {
-        GF_XMLAttribute *att;
-        GF_XMLAttribute *att_file;
-        u32 att_index = 0;
-        att_file = NULL;
-        while (1) {
-            att = gf_list_get(validator->xvs_node->attributes, att_index);
-            if (!att) {
-                break;
-            } else if (!strcmp(att->name, "file")) {
-                att_file = att;
-            }
-            att_index++;
-        }
-        if (!att_file) {
-            gf_xml_dom_del(validator->xvs_parser);
-            validator->xvs_parser = NULL;
-            validator->xvs_node = NULL;
-            return 0;
-        } else {
-            char *sep;
-            sep = strrchr(att_file->value, GF_PATH_SEPARATOR);
-            if (!sep) {
-                validator->test_filename = att_file->value;
-            } else {
-                sep[0] = 0;
-                validator->test_base = gf_strdup(att_file->value);
-                sep[0] = GF_PATH_SEPARATOR;
-                validator->test_filename = sep+1;
-            }
-        }        
-    }
-    if (validator->is_recording) {
-        GF_XMLNode *node;
-        /* Removing prerecorded interactions */
+	GF_Err e;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Validator] Opening Validation Script: %s\n", validator->xvs_filename));
+	validator->snapshot_number = 0;
+	validator->xvs_parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(validator->xvs_parser, validator->xvs_filename, NULL, NULL);
+	if (e != GF_OK) {
+		if (validator->is_recording) {
+			GF_SAFEALLOC(validator->xvs_node, GF_XMLNode);
+			validator->xvs_node->name = gf_strdup("TestValidationScript");
+			validator->xvs_node->attributes = gf_list_new();
+			validator->xvs_node->content = gf_list_new();
+		} else {
+			gf_xml_dom_del(validator->xvs_parser);
+			validator->xvs_parser = NULL;
+			return 0;
+		}
+	} else {
+		validator->xvs_node = gf_xml_dom_get_root(validator->xvs_parser);
+	}
+	/* Get the file name from the XVS if not found in the XVL */
+	if (!validator->test_filename) {
+		GF_XMLAttribute *att;
+		GF_XMLAttribute *att_file;
+		u32 att_index = 0;
+		att_file = NULL;
+		while (1) {
+			att = gf_list_get(validator->xvs_node->attributes, att_index);
+			if (!att) {
+				break;
+			} else if (!strcmp(att->name, "file")) {
+				att_file = att;
+			}
+			att_index++;
+		}
+		if (!att_file) {
+			gf_xml_dom_del(validator->xvs_parser);
+			validator->xvs_parser = NULL;
+			validator->xvs_node = NULL;
+			return 0;
+		} else {
+			char *sep;
+			sep = strrchr(att_file->value, GF_PATH_SEPARATOR);
+			if (!sep) {
+				validator->test_filename = att_file->value;
+			} else {
+				sep[0] = 0;
+				validator->test_base = gf_strdup(att_file->value);
+				sep[0] = GF_PATH_SEPARATOR;
+				validator->test_filename = sep+1;
+			}
+		}
+	}
+	if (validator->is_recording) {
+		GF_XMLNode *node;
+		/* Removing prerecorded interactions */
 		while (gf_list_count(validator->xvs_node->content)) {
 			GF_XMLNode *child = (GF_XMLNode *)gf_list_last(validator->xvs_node->content);
 			gf_list_rem_last(validator->xvs_node->content);
 			gf_xml_dom_node_del(child);
 		}
-        /* adding an extra text node for line break in serialization */
-        GF_SAFEALLOC(node, GF_XMLNode);
-        node->type = GF_XML_TEXT_TYPE;
-        node->name = gf_strdup("\n");
-        gf_list_add(validator->xvs_node->content, node);
-    } else {
-        validator->xvs_result = 1;
-    }
-    return 1;
+		/* adding an extra text node for line break in serialization */
+		GF_SAFEALLOC(node, GF_XMLNode);
+		node->type = GF_XML_TEXT_TYPE;
+		node->name = gf_strdup("\n");
+		gf_list_add(validator->xvs_node->content, node);
+	} else {
+		validator->xvs_result = 1;
+	}
+	return 1;
 }
 
 static void validator_xvs_close(GF_Validator *validator)
 {
-    if (validator->xvs_parser) {
-        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;
-            while (1) {
-                att = gf_list_get(validator->xvs_node->attributes, att_index);
-                if (!att) {
-                    break;
-                } else if (!strcmp(att->name, "file")) {
-                    att_file = att;
-                }
-                att_index++;
-            }
-
-            if (!att_file) {
-                GF_SAFEALLOC(att, GF_XMLAttribute);
-                att->name = gf_strdup("file");
-                gf_list_add(validator->xvs_node->attributes, att);
-            } else {
-                att = att_file;
-                if (att->value) gf_free(att->value);
-            }
-            sprintf(filename, "%s%c%s", validator->test_base, GF_PATH_SEPARATOR, validator->test_filename);
-            att->value = gf_strdup(filename);
-            xvs_content = gf_xml_dom_serialize(validator->xvs_node, 0);
-            xvs_fp = gf_f64_open(validator->xvs_filename, "wt");
-            gf_fwrite(xvs_content, strlen(xvs_content), 1, xvs_fp);
-            fclose(xvs_fp);
-            gf_free(xvs_content);
-        } else {
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Validator] XVS Result : %s\n", (validator->xvs_result?"Success":"Failure")));
-            if (validator->xvs_node_in_xvl) {
-                GF_XMLAttribute *att;
-                GF_XMLAttribute *att_result = NULL;
-                u32 att_index = 0;
-                while (1) {
-                    att = gf_list_get(validator->xvs_node_in_xvl->attributes, att_index);
-                    if (!att) {
-                        break;
-                    } else if (!strcmp(att->name, "result")) {
-                        att_result = att;
-                    }
-                    att_index++;
-                }
-                if (!att_result) {
-                    GF_SAFEALLOC(att_result, GF_XMLAttribute);
-                    att_result->name = gf_strdup("result");
-                    gf_list_add(validator->xvs_node_in_xvl->attributes, att_result);
-                } 
-                if (att_result->value) gf_free(att_result->value);
-                att_result->value = gf_strdup(validator->xvs_result ? "pass" : "fail");
-            }
-        }
-        gf_xml_dom_del(validator->xvs_parser);
-        validator->xvs_parser = NULL;
-    } 
-    validator->xvs_node = NULL;
-    validator->xvs_node_in_xvl = NULL;
-    validator->xvs_filename = NULL;
-    validator->test_filename = NULL;
-    validator->ck = NULL;
-    validator->xvs_event_index = 0;
-    validator->snapshot_number = 0;
+	if (validator->xvs_parser) {
+		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;
+			while (1) {
+				att = gf_list_get(validator->xvs_node->attributes, att_index);
+				if (!att) {
+					break;
+				} else if (!strcmp(att->name, "file")) {
+					att_file = att;
+				}
+				att_index++;
+			}
+
+			if (!att_file) {
+				GF_SAFEALLOC(att, GF_XMLAttribute);
+				att->name = gf_strdup("file");
+				gf_list_add(validator->xvs_node->attributes, att);
+			} else {
+				att = att_file;
+				if (att->value) gf_free(att->value);
+			}
+			sprintf(filename, "%s%c%s", validator->test_base, GF_PATH_SEPARATOR, validator->test_filename);
+			att->value = gf_strdup(filename);
+			xvs_content = gf_xml_dom_serialize(validator->xvs_node, 0);
+			xvs_fp = gf_f64_open(validator->xvs_filename, "wt");
+			gf_fwrite(xvs_content, strlen(xvs_content), 1, xvs_fp);
+			fclose(xvs_fp);
+			gf_free(xvs_content);
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Validator] XVS Result : %s\n", (validator->xvs_result?"Success":"Failure")));
+			if (validator->xvs_node_in_xvl) {
+				GF_XMLAttribute *att;
+				GF_XMLAttribute *att_result = NULL;
+				u32 att_index = 0;
+				while (1) {
+					att = gf_list_get(validator->xvs_node_in_xvl->attributes, att_index);
+					if (!att) {
+						break;
+					} else if (!strcmp(att->name, "result")) {
+						att_result = att;
+					}
+					att_index++;
+				}
+				if (!att_result) {
+					GF_SAFEALLOC(att_result, GF_XMLAttribute);
+					att_result->name = gf_strdup("result");
+					gf_list_add(validator->xvs_node_in_xvl->attributes, att_result);
+				}
+				if (att_result->value) gf_free(att_result->value);
+				att_result->value = gf_strdup(validator->xvs_result ? "pass" : "fail");
+			}
+		}
+		gf_xml_dom_del(validator->xvs_parser);
+		validator->xvs_parser = NULL;
+	}
+	validator->xvs_node = NULL;
+	validator->xvs_node_in_xvl = NULL;
+	validator->xvs_filename = NULL;
+	validator->test_filename = NULL;
+	validator->ck = NULL;
+	validator->xvs_event_index = 0;
+	validator->snapshot_number = 0;
 }
 
 static void validator_test_open(GF_Validator *validator)
 {
-    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);
-    if (validator->is_recording) 
-        validator->snapshot_next_frame = 1;
-    gf_term_connect(validator->term, filename);
-	validator->ck = validator->term->root_scene->scene_codec ? 
-                    validator->term->root_scene->scene_codec->ck : 
-                    validator->term->root_scene->dyn_ck;
+	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);
+	if (validator->is_recording)
+		validator->snapshot_next_frame = 1;
+	gf_term_connect(validator->term, filename);
+	validator->ck = validator->term->root_scene->scene_codec ?
+	                validator->term->root_scene->scene_codec->ck :
+	                validator->term->root_scene->dyn_ck;
 }
 
 static Bool validator_xvs_next(GF_Validator *validator, Bool reverse)
 {
-    if (validator->xvl_node) {
-        validator_xvl_get_next_xvs(validator, reverse);            
-        if (validator->xvs_filename) {
-            validator_xvs_open(validator);
-            if (!validator->xvs_node) {
-                return 0;
-            }
-            if (validator->test_filename) {
-                validator_test_open(validator);
-            } else {
-                validator_xvs_close(validator);
-                return 0;
-            }
-        } else {
-            return 0;
-        }
-        return 1;
-    } else {
-        return 0;
-    }
+	if (validator->xvl_node) {
+		validator_xvl_get_next_xvs(validator, reverse);
+		if (validator->xvs_filename) {
+			validator_xvs_open(validator);
+			if (!validator->xvs_node) {
+				return 0;
+			}
+			if (validator->test_filename) {
+				validator_test_open(validator);
+			} else {
+				validator_xvs_close(validator);
+				return 0;
+			}
+		} else {
+			return 0;
+		}
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
-static Bool validator_load_event(GF_Validator *validator) 
+static Bool validator_load_event(GF_Validator *validator)
 {
-    GF_XMLNode *event_node;
-    GF_XMLAttribute *att;
-    u32 att_index;
+	GF_XMLNode *event_node;
+	GF_XMLAttribute *att;
+	u32 att_index;
 
 	memset(&validator->next_event, 0, sizeof(GF_Event));
 	validator->evt_loaded = 0;
-    validator->next_event_snapshot = 0;
-
-    if (!validator->xvs_node) return 0;
-
-    while (1) {
-        event_node = gf_list_get(validator->xvs_node->content, validator->xvs_event_index);
-        if (!event_node) {
-            return 0;
-        } else if (event_node->type == GF_XML_NODE_TYPE) {
-            validator->xvs_event_index++;
-            break;
-        } else {
-            validator->xvs_event_index++;
-        }
-    }
-
-    if (!strcmp(event_node->name, "snapshot")) {
-        validator->next_event_snapshot = 1;
-    } else {
-        validator->next_event.type = gf_dom_event_type_by_name(event_node->name);
-        if (validator->next_event.type == GF_EVENT_UNKNOWN) {
-            return 1;
-        }
-    }
-
-    att_index = 0;
-    while (1) {
-        att = gf_list_get(event_node->attributes, att_index);
-        if (!att) break;
-        if (!strcmp(att->name, "time")) {
-            validator->next_time = atoi(att->value);
-        } else if (!strcmp(att->name, "button")) {
-            if (!strcmp(att->value, "Left")) {
-                validator->next_event.mouse.button = 0;
-            } else if (!strcmp(att->value, "Middle")) {
-                validator->next_event.mouse.button = 1;
-            } else if (!strcmp(att->value, "Right")) {
-                validator->next_event.mouse.button = 2;
-            }
-        } else if (!strcmp(att->name, "x")) {
-            validator->next_event.mouse.x = atoi(att->value);
-        } else if (!strcmp(att->name, "y")) {
-            validator->next_event.mouse.y = atoi(att->value);
-        } else if (!strcmp(att->name, "wheel_pos")) {
-            validator->next_event.mouse.wheel_pos = FLT2FIX(atof(att->value));
-        } else if (!strcmp(att->name, "shift") && !strcmp(att->value, "true")) {
-            validator->next_event.mouse.key_states |= GF_KEY_MOD_SHIFT;
-        } else if (!strcmp(att->name, "alt") && !strcmp(att->value, "true")) {
-            validator->next_event.mouse.key_states |= GF_KEY_MOD_ALT;
-        } else if (!strcmp(att->name, "ctrl") && !strcmp(att->value, "true")) {
-            validator->next_event.mouse.key_states |= GF_KEY_MOD_CTRL;
-        } else if (!strcmp(att->name, "key_identifier")) {
-            validator->next_event.key.key_code = gf_dom_get_key_type(att->value); 
-        } else if (!strcmp(att->name, "unicode-char")) {
-            validator->next_event.character.unicode_char = atoi(att->value);
-        } 
-        att_index++;
-    }
+	validator->next_event_snapshot = 0;
+
+	if (!validator->xvs_node) return 0;
+
+	while (1) {
+		event_node = gf_list_get(validator->xvs_node->content, validator->xvs_event_index);
+		if (!event_node) {
+			return 0;
+		} else if (event_node->type == GF_XML_NODE_TYPE) {
+			validator->xvs_event_index++;
+			break;
+		} else {
+			validator->xvs_event_index++;
+		}
+	}
+
+	if (!strcmp(event_node->name, "snapshot")) {
+		validator->next_event_snapshot = 1;
+	} else {
+		validator->next_event.type = gf_dom_event_type_by_name(event_node->name);
+		if (validator->next_event.type == GF_EVENT_UNKNOWN) {
+			return 1;
+		}
+	}
+
+	att_index = 0;
+	while (1) {
+		att = gf_list_get(event_node->attributes, att_index);
+		if (!att) break;
+		if (!strcmp(att->name, "time")) {
+			validator->next_time = atoi(att->value);
+		} else if (!strcmp(att->name, "button")) {
+			if (!strcmp(att->value, "Left")) {
+				validator->next_event.mouse.button = 0;
+			} else if (!strcmp(att->value, "Middle")) {
+				validator->next_event.mouse.button = 1;
+			} else if (!strcmp(att->value, "Right")) {
+				validator->next_event.mouse.button = 2;
+			}
+		} else if (!strcmp(att->name, "x")) {
+			validator->next_event.mouse.x = atoi(att->value);
+		} else if (!strcmp(att->name, "y")) {
+			validator->next_event.mouse.y = atoi(att->value);
+		} else if (!strcmp(att->name, "wheel_pos")) {
+			validator->next_event.mouse.wheel_pos = FLT2FIX(atof(att->value));
+		} else if (!strcmp(att->name, "shift") && !strcmp(att->value, "true")) {
+			validator->next_event.mouse.key_states |= GF_KEY_MOD_SHIFT;
+		} else if (!strcmp(att->name, "alt") && !strcmp(att->value, "true")) {
+			validator->next_event.mouse.key_states |= GF_KEY_MOD_ALT;
+		} else if (!strcmp(att->name, "ctrl") && !strcmp(att->value, "true")) {
+			validator->next_event.mouse.key_states |= GF_KEY_MOD_CTRL;
+		} else if (!strcmp(att->name, "key_identifier")) {
+			validator->next_event.key.key_code = gf_dom_get_key_type(att->value);
+		} else if (!strcmp(att->name, "unicode-char")) {
+			validator->next_event.character.unicode_char = atoi(att->value);
+		}
+		att_index++;
+	}
 	validator->evt_loaded = 1;
-    return 1;
+	return 1;
 }
 
 static Bool validator_process(GF_TermExt *termext, u32 action, void *param)
@@ -799,41 +799,41 @@
 
 	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:
+	/* 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, 
+		/* 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);
+		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);
 
 		/* Check if the validator should be loaded and in which mode */
-        opt = gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "Mode");
+		opt = gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "Mode");
 		if (!opt) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("Validator missing configuration, stopping.\n"));
 			return 0;
 		} else if (!strcmp(opt, "Play")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in playback mode.\n"));
-            validator->is_recording = 0;
-        } else if (!strcmp(opt, "Record")) {
+			validator->is_recording = 0;
+		} else if (!strcmp(opt, "Record")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in recording mode.\n"));
-            validator->is_recording = 1;
-        } else if (!strcmp(opt, "Disable")) {
+			validator->is_recording = 1;
+		} else if (!strcmp(opt, "Disable")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator is disabled.\n"));
-            return 0;
-        } else {
+			return 0;
+		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration using wrong mode, stopping.\n"));
-            return 0;
-        }
+			return 0;
+		}
 
 		/* initializes the validator and starts */
-        validator->xvs_filename = NULL;
-        validator->xvl_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "XVL");
-        if (!validator->xvl_filename) {
-            validator->xvs_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "XVS");
+		validator->xvs_filename = NULL;
+		validator->xvl_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "XVL");
+		if (!validator->xvl_filename) {
+			validator->xvs_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "XVS");
 			if (!validator->xvs_filename) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration without input, stopping.\n"));
 				return 0;
@@ -845,64 +845,64 @@
 		}
 
 		/* 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);
+		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);
 
 		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;
-        } else {
-		validator->evt_filter.on_event = validator_on_event_record;
-        } 
-	gf_term_add_event_filter(validator->term, &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;
+			termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+		} else {
+			validator->evt_filter.on_event = validator_on_event_record;
+		}
+		gf_term_add_event_filter(validator->term, &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;
 
 		/* 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) {
-            validator_xvl_open(validator);
-            if (!validator->xvl_node) {
-                return 0;
-            }
-            validator_xvs_next(validator, 0);
-            if (!validator->xvs_node) {
-                return 0;
-            }
-        } else if (validator->xvs_filename) {
-            validator_xvs_open(validator);
-            if (!validator->xvs_node) {
-                return 0;
-            }
-            if (validator->test_filename) {
-                validator_test_open(validator);
-            } else {
-                validator_xvs_close(validator);
-                return 0;
-            }
-        } else {
-            return 0;
-        }
-        if (!validator->is_recording) {
-            validator_load_event(validator);
-        }
+		if (validator->xvl_filename) {
+			validator_xvl_open(validator);
+			if (!validator->xvl_node) {
+				return 0;
+			}
+			validator_xvs_next(validator, 0);
+			if (!validator->xvs_node) {
+				return 0;
+			}
+		} else if (validator->xvs_filename) {
+			validator_xvs_open(validator);
+			if (!validator->xvs_node) {
+				return 0;
+			}
+			if (validator->test_filename) {
+				validator_test_open(validator);
+			} else {
+				validator_xvs_close(validator);
+				return 0;
+			}
+		} else {
+			return 0;
+		}
+		if (!validator->is_recording) {
+			validator_load_event(validator);
+		}
 		return 1;
 
-    /* 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 */
+	/* 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);
+		gf_term_remove_event_filter(validator->term, &validator->evt_filter);
 		validator_xvs_close(validator);
-        validator_xvl_close(validator);
+		validator_xvl_close(validator);
 		validator->term = NULL;
-        if (validator->test_base) {
-            gf_free(validator->test_base);
-            validator->test_base = NULL;
-        }
+		if (validator->test_base) {
+			gf_free(validator->test_base);
+			validator->test_base = NULL;
+		}
 		/*auto-disable the recording by default*/
 		if (validator->is_recording) {
 			gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Play");
@@ -912,52 +912,52 @@
 		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;
-        }
+			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 */
+	/* 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:
-        /* if the time is right, dispatch the event and load the next one */
+		/* 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) )) {
-            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));
-            if (validator->next_event_snapshot) {
-                Bool res;
-                char *snap_name = validator_create_snapshot(validator);
-                gf_free(snap_name);
-                res = validator_compare_snapshots(validator);
-                validator->xvs_result &= res; 
-                validator->next_event_snapshot = 0;
-            } else {
-                validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &validator->next_event);
-            }
-		    has_more_events = validator_load_event(validator);
-            if (!has_more_events) {
-                validator_xvs_close(validator);
-                gf_term_disconnect(validator->term);
-                gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
-                validator_xvs_next(validator, 0);
-                if (!validator->xvs_node) {
-                    GF_Event evt;
+			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));
+			if (validator->next_event_snapshot) {
+				Bool res;
+				char *snap_name = validator_create_snapshot(validator);
+				gf_free(snap_name);
+				res = validator_compare_snapshots(validator);
+				validator->xvs_result &= res;
+				validator->next_event_snapshot = 0;
+			} else {
+				validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &validator->next_event);
+			}
+			has_more_events = validator_load_event(validator);
+			if (!has_more_events) {
+				validator_xvs_close(validator);
+				gf_term_disconnect(validator->term);
+				gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
+				validator_xvs_next(validator, 0);
+				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);                
-                } else {
-                    if (!validator->is_recording) {
-                        validator_load_event(validator);
-                    }
-                }
-            }
+					evt.type = GF_EVENT_QUIT;
+					validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
+				} else {
+					if (!validator->is_recording) {
+						validator_load_event(validator);
+					}
+				}
+			}
 		}
 		break;
 	}
@@ -986,22 +986,22 @@
 	GF_Validator *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(validator);
 	gf_free(dr);
 }
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_TERM_EXT_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)validator_new();
 	return NULL;
@@ -1017,4 +1017,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( validator )
+GPAC_MODULE_STATIC_DECLARATION( validator )

gpac-0.5.0.svn5178.tar.bz2/modules/vtt_in/vtt_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/vtt_in/vtt_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Cyril Concolato 
+ *			Authors: Cyril Concolato
  *			Copyright (c) Telecom ParisTech 2013-
  *					All rights reserved
  *
@@ -51,13 +51,13 @@
 	   0 if no dependency */
 	u32 base_es_id;
 
-	/* file_name of the VTT file when parsing a input text file 
+	/* 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 
+	/* config of the VTT file when parsing an MP4 file
 	   not used when parsing from text file or from a stream */
 	char *config;
 
@@ -96,7 +96,7 @@
 
 
 static GF_Err VTT_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-							  u16 ES_ID, u32 stream_time, u32 mmlevel)
+                              u16 ES_ID, u32 stream_time, u32 mmlevel)
 {
 	GF_Err e = GF_OK;
 	VTTDec *vttdec = (VTTDec *)plug->privateStack;
@@ -127,23 +127,23 @@
 		break;
 
 	case GPAC_OTI_SCENE_VTT_MP4:
-		{ 
-			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_list_del(cues);
+	{
+		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);
+			}
 		}
-		break;
+		gf_list_del(cues);
+	}
+	break;
 
 	default:
 		return GF_BAD_PARAM;
@@ -266,7 +266,7 @@
 		vttdec->config = ((GF_StringBox *)b)->string;
 		((GF_StringBox *)b)->string = NULL;
 		gf_isom_box_del(b);
-	} 
+	}
 	gf_bs_del(bs);
 }
 
@@ -331,7 +331,7 @@
 		case GPAC_OTI_SCENE_VTT:
 		case GPAC_OTI_SCENE_VTT_MP4:
 			return GF_CODEC_SUPPORTED;
-		default:	
+		default:
 			return GF_CODEC_NOT_SUPPORTED;
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/modules/vtt_in/vtt_in.c -> gpac-0.5.1.svn5491.tar.xz/modules/vtt_in/vtt_in.c Changed

@@ -1,7 +1,7 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Cyril Concolato 
+ *			Authors: Cyril Concolato
  *			Copyright (c) Telecom ParisTech 2013-
  *					All rights reserved
  *
@@ -48,15 +48,15 @@
 } VTTIn;
 
 const char * VTT_MIME_TYPES[] = {
-  "text/vtt", "vtt", "VTT SubTitles",
-  NULL
+	"text/vtt", "vtt", "VTT SubTitles",
+	NULL
 };
 
-static u32 VTT_RegisterMimeTypes(const GF_InputService *plug){
+static u32 VTT_RegisterMimeTypes(const GF_InputService *plug) {
 	u32 i;
 	if (!plug) return 0;
-	for (i = 0 ; VTT_MIME_TYPES[i]; i+=3){
-		gf_term_register_mime_type(plug, VTT_MIME_TYPES[i], VTT_MIME_TYPES[i+1], VTT_MIME_TYPES[i+2]);
+	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;
 }
@@ -68,8 +68,8 @@
 	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_term_check_extension(plug, VTT_MIME_TYPES[i], VTT_MIME_TYPES[i+1], VTT_MIME_TYPES[i+2], sExt)) return GF_TRUE;
+	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;
 }
@@ -90,7 +90,7 @@
 	VTTIn *vttin = (VTTIn *) plug->priv;
 
 	if (!vttin)	return;
-	gf_term_download_update_stats(vttin->dnload);
+	gf_service_download_update_stats(vttin->dnload);
 
 	e = param->error;
 	/*done*/
@@ -108,7 +108,7 @@
 	/*OK confirm*/
 	if (vttin->needs_connection) {
 		vttin->needs_connection = GF_FALSE;
-		gf_term_on_connect(vttin->service, NULL, e);
+		gf_service_connect_ack(vttin->service, NULL, e);
 		//if (!e && !vttin->od_done) tti_setup_object(vttin);
 	}
 }
@@ -116,13 +116,13 @@
 void VTT_download_file(GF_InputService *plug, const char *url)
 {
 	VTTIn *vttin = (VTTIn *) plug->priv;
-        if (!plug || !url)
-          return;
+	if (!plug || !url)
+		return;
 	vttin->needs_connection = GF_TRUE;
-	vttin->dnload = gf_term_download_new(vttin->service, url, 0, VTT_NetIO, plug);
+	vttin->dnload = gf_service_download_new(vttin->service, url, 0, VTT_NetIO, plug);
 	if (!vttin->dnload) {
 		vttin->needs_connection = GF_FALSE;
-		gf_term_on_connect(vttin->service, NULL, GF_NOT_SUPPORTED);
+		gf_service_connect_ack(vttin->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(vttin->dnload);
@@ -134,11 +134,11 @@
 {
 	GF_Err e;
 	VTTIn *vttin = (VTTIn *)plug->priv;
-        if (!plug || !url)
-          return GF_BAD_PARAM;
+	if (!plug || !url)
+		return GF_BAD_PARAM;
 	vttin->service = serv;
 
-	if (vttin->dnload) gf_term_download_del(vttin->dnload);
+	if (vttin->dnload) gf_service_download_del(vttin->dnload);
 	vttin->dnload = NULL;
 
 	/*remote fetch*/
@@ -148,7 +148,7 @@
 	} else {
 		e = GF_OK;
 		//e = TTIn_LoadFile(plug, url, 0);
-		gf_term_on_connect(serv, NULL, e);
+		gf_service_connect_ack(serv, NULL, e);
 		//if (!e && !vttin->od_done) tti_setup_object(vttin);
 	}
 	return GF_OK;
@@ -158,7 +158,7 @@
 {
 	VTTIn *vttin;
 	if (!plug)	return GF_BAD_PARAM;
-	
+
 	vttin = (VTTIn *)plug->priv;
 	if (!vttin)	return GF_BAD_PARAM;
 
@@ -169,15 +169,15 @@
 	//vttin->szFile = NULL;
 
 	if (vttin->dnload) {
-		gf_term_download_del(vttin->dnload);
+		gf_service_download_del(vttin->dnload);
 	}
 	vttin->dnload = NULL;
 
 	if (vttin->service) {
-		gf_term_on_disconnect(vttin->service, NULL, GF_OK);
+		gf_service_disconnect_ack(vttin->service, NULL, GF_OK);
 	}
 	vttin->service = NULL;
-	
+
 	return GF_OK;
 }
 
@@ -225,7 +225,7 @@
 	}
 
 exit:
-	gf_term_on_connect(vttin->service, channel, e);
+	gf_service_connect_ack(vttin->service, channel, e);
 	return e;
 }
 
@@ -240,7 +240,7 @@
 		vttin->channel = NULL;
 		e = GF_OK;
 	}
-	gf_term_on_disconnect(vttin->service, channel, e);
+	gf_service_disconnect_ack(vttin->service, channel, e);
 	return GF_OK;
 }
 
@@ -361,7 +361,7 @@
 	if (!plug)
 		return;
 	vttin = (VTTIn *)plug->priv;
-	if (vttin){
+	if (vttin) {
 		VTT_CloseService(plug);
 		gf_free(vttin);
 	}
@@ -379,10 +379,13 @@
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
-	case GF_SCENE_DECODER_INTERFACE: return (GF_BaseInterface *)NewVTTDec();
-	case GF_NET_CLIENT_INTERFACE: return (GF_BaseInterface *)NewVTTInput();
+	case GF_SCENE_DECODER_INTERFACE:
+		return (GF_BaseInterface *)NewVTTDec();
+	case GF_NET_CLIENT_INTERFACE:
+		return (GF_BaseInterface *)NewVTTInput();
 //	case GF_JS_USER_EXT_INTERFACE: return (GF_BaseInterface *)NewVTTJS();
-	default: return NULL;
+	default:
+		return NULL;
 	}
 }
 
@@ -398,9 +401,9 @@
 	case GF_NET_CLIENT_INTERFACE:
 		DeleteVTTInput(ifce);
 		break;
-	//case GF_JS_USER_EXT_INTERFACE: 
-	//	DeleteVTTJS(ifce);
-	//	break;
+		//case GF_JS_USER_EXT_INTERFACE:
+		//	DeleteVTTJS(ifce);
+		//	break;
 	}
 }
 
@@ -438,4 +441,4 @@
 	return si;
 }
 
-GPAC_MODULE_STATIC_DELARATION( vtt_in )
+GPAC_MODULE_STATIC_DECLARATION( vtt_in )

gpac-0.5.0.svn5178.tar.bz2/modules/wav_out/wav_out.c -> gpac-0.5.1.svn5491.tar.xz/modules/wav_out/wav_out.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 
@@ -29,7 +29,7 @@
 
 #define MAX_AUDIO_BUFFER	30
 
-typedef struct 
+typedef struct
 {
 	HWAVEOUT hwo;
 	WAVEHDR wav_hdr[MAX_AUDIO_BUFFER];
@@ -91,15 +91,15 @@
 
 #ifndef _WAVEFORMATEXTENSIBLE_
 typedef struct {
-    WAVEFORMATEX    Format;
-    union {
-        WORD wValidBitsPerSample;       /* bits of precision  */
-        WORD wSamplesPerBlock;          /* valid if wBitsPerSample==0 */
-        WORD wReserved;                 /* If neither applies, set to zero. */
-    } Samples;
-    DWORD           dwChannelMask;      /* which channels are */
-                                        /* present in stream  */
-    GUID            SubFormat;
+	WAVEFORMATEX    Format;
+	union {
+		WORD wValidBitsPerSample;       /* bits of precision  */
+		WORD wSamplesPerBlock;          /* valid if wBitsPerSample==0 */
+		WORD wReserved;                 /* If neither applies, set to zero. */
+	} Samples;
+	DWORD           dwChannelMask;      /* which channels are */
+	/* present in stream  */
+	GUID            SubFormat;
 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
 #endif
 
@@ -134,14 +134,14 @@
 	if (uMsg != WOM_DONE) return;
 	if (ctx->exit_request) return;
 	SetEvent(ctx->event);
-} 
+}
 
 
 static void close_waveform(GF_AudioOutput *dr)
 {
 	WAVCTX();
 
-    if (!ctx->event) return;
+	if (!ctx->event) return;
 
 	/*brute-force version, actually much safer on winCE*/
 #ifdef _WIN32_WCE
@@ -151,7 +151,7 @@
 	waveOutClose(ctx->hwo);
 	if (ctx->wav_buf) gf_free(ctx->wav_buf);
 	ctx->wav_buf = NULL;
-    CloseHandle(ctx->event);
+	CloseHandle(ctx->event);
 	ctx->event = NULL;
 	ctx->exit_request = 0;
 #else
@@ -182,7 +182,7 @@
 	}
 	if (ctx->wav_buf) gf_free(ctx->wav_buf);
 	ctx->wav_buf = NULL;
-    CloseHandle(ctx->event);
+	CloseHandle(ctx->event);
 	ctx->event = NULL;
 	ctx->exit_request = 0;
 #endif
@@ -222,7 +222,7 @@
 	ctx->fmt.wBitsPerSample = *nbBitsPerSample;
 	ctx->fmt.nSamplesPerSec = *SampleRate;
 	ctx->fmt.nBlockAlign = ctx->fmt.wBitsPerSample * ctx->fmt.nChannels / 8;
-	ctx->fmt.nAvgBytesPerSec = *SampleRate * ctx->fmt.nBlockAlign; 
+	ctx->fmt.nAvgBytesPerSec = *SampleRate * ctx->fmt.nBlockAlign;
 	fmt = &ctx->fmt;
 
 #ifdef USE_WAVE_EXT
@@ -247,12 +247,12 @@
 	}
 #endif
 
-	/* Open a waveform device for output using window callback. */ 
+	/* Open a waveform device for output using window callback. */
 	retry = 10;
-	while (retry) {		
-		hr = waveOutOpen((LPHWAVEOUT)&ctx->hwo, WAVE_MAPPER, &ctx->fmt, (DWORD) WaveProc, (DWORD) dr, 
-			CALLBACK_FUNCTION | WAVE_ALLOWSYNC | WAVE_FORMAT_DIRECT
-			);
+	while (retry) {
+		hr = waveOutOpen((LPHWAVEOUT)&ctx->hwo, WAVE_MAPPER, &ctx->fmt, (DWORD) WaveProc, (DWORD) dr,
+		                 CALLBACK_FUNCTION | WAVE_ALLOWSYNC | WAVE_FORMAT_DIRECT
+		                );
 
 		if (hr == MMSYSERR_NOERROR) break;
 		/*couldn't open audio*/
@@ -270,7 +270,7 @@
 		ctx->buffer_size = (ctx->fmt.nAvgBytesPerSec * ctx->cfg_duration) / (1000 * ctx->cfg_num_buffers);
 	}
 
-    ctx->event = CreateEvent( NULL, FALSE, FALSE, NULL);
+	ctx->event = CreateEvent( NULL, FALSE, FALSE, NULL);
 
 	/*make sure we're aligned*/
 	while (ctx->buffer_size % ctx->fmt.nBlockAlign) ctx->buffer_size++;
@@ -281,7 +281,7 @@
 	/*setup wave headers*/
 	for (i=0 ; i < ctx->num_buffers; i++) {
 		memset(& ctx->wav_hdr[i], 0, sizeof(WAVEHDR));
-		ctx->wav_hdr[i].dwBufferLength = ctx->buffer_size; 
+		ctx->wav_hdr[i].dwBufferLength = ctx->buffer_size;
 		ctx->wav_hdr[i].lpData = & ctx->wav_buf[i*ctx->buffer_size];
 		ctx->wav_hdr[i].dwFlags = WHDR_DONE;
 		waveOutPrepareHeader(ctx->hwo, &ctx->wav_hdr[i], sizeof(WAVEHDR));
@@ -320,7 +320,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));
+			hr = waveOutPrepareHeader(ctx->hwo, hdr, sizeof(WAVEHDR));
 			/*write it*/
 			waveOutWrite(ctx->hwo, hdr, sizeof(WAVEHDR));
 		}
@@ -466,13 +466,13 @@
 }
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_AUDIO_OUTPUT_INTERFACE,
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
@@ -492,4 +492,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( wave_out )
+GPAC_MODULE_STATIC_DECLARATION( wave_out )

gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/unzip.c -> gpac-0.5.1.svn5491.tar.xz/modules/widgetman/unzip.c Changed

@@ -48,282 +48,281 @@
 #endif
 
 voidpf ZCALLBACK fopen_file_func OF((
-   voidpf opaque,
-   const char* filename,
-   int mode));
+                                        voidpf opaque,
+                                        const char* filename,
+                                        int mode));
 
 uLong ZCALLBACK fread_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   void* buf,
-   uLong size));
+                                       voidpf opaque,
+                                       voidpf stream,
+                                       void* buf,
+                                       uLong size));
 
 uLong ZCALLBACK fwrite_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   const void* buf,
-   uLong size));
+                                        voidpf opaque,
+                                        voidpf stream,
+                                        const void* buf,
+                                        uLong size));
 
 long ZCALLBACK ftell_file_func OF((
-   voidpf opaque,
-   voidpf stream));
+                                      voidpf opaque,
+                                      voidpf stream));
 
 long ZCALLBACK fseek_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   uLong offset,
-   int origin));
+                                      voidpf opaque,
+                                      voidpf stream,
+                                      uLong offset,
+                                      int origin));
 
 int ZCALLBACK fclose_file_func OF((
-   voidpf opaque,
-   voidpf stream));
+                                      voidpf opaque,
+                                      voidpf stream));
 
 int ZCALLBACK ferror_file_func OF((
-   voidpf opaque,
-   voidpf stream));
+                                      voidpf opaque,
+                                      voidpf stream));
 
 
 voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
+voidpf opaque;
+const char* filename;
+int mode;
 {
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = fopen(filename, mode_fopen);
-    return file;
+	FILE* file = NULL;
+	const char* mode_fopen = NULL;
+	if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+		mode_fopen = "rb";
+	else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+		mode_fopen = "r+b";
+	else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+		mode_fopen = "wb";
+
+	if ((filename!=NULL) && (mode_fopen != NULL))
+		file = fopen(filename, mode_fopen);
+	return file;
 }
 
 
 uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
+voidpf opaque;
+voidpf stream;
+void* buf;
+uLong size;
 {
-    uLong ret;
-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
+	uLong ret;
+	ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
+	return ret;
 }
 
 
 uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
+voidpf opaque;
+voidpf stream;
+const void* buf;
+uLong size;
 {
-    uLong ret;
-    ret = (uLong)gf_fwrite(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
+	uLong ret;
+	ret = (uLong)gf_fwrite(buf, 1, (size_t)size, (FILE *)stream);
+	return ret;
 }
 
 long ZCALLBACK ftell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+voidpf opaque;
+voidpf stream;
 {
-    long ret;
-    ret = ftell((FILE *)stream);
-    return ret;
+	long ret;
+	ret = ftell((FILE *)stream);
+	return ret;
 }
 
 long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
+voidpf opaque;
+voidpf stream;
+uLong offset;
+int origin;
 {
-    int fseek_origin=0;
-    long ret;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-    fseek((FILE *)stream, offset, fseek_origin);
-    return ret;
+	int fseek_origin=0;
+	long ret;
+	switch (origin)
+	{
+	case ZLIB_FILEFUNC_SEEK_CUR :
+		fseek_origin = SEEK_CUR;
+		break;
+	case ZLIB_FILEFUNC_SEEK_END :
+		fseek_origin = SEEK_END;
+		break;
+	case ZLIB_FILEFUNC_SEEK_SET :
+		fseek_origin = SEEK_SET;
+		break;
+	default:
+		return -1;
+	}
+	ret = 0;
+	fseek((FILE *)stream, offset, fseek_origin);
+	return ret;
 }
 
 int ZCALLBACK fclose_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+voidpf opaque;
+voidpf stream;
 {
-    int ret;
-    ret = fclose((FILE *)stream);
-    return ret;
+	int ret;
+	ret = fclose((FILE *)stream);
+	return ret;
 }
 
 int ZCALLBACK ferror_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+voidpf opaque;
+voidpf stream;
 {
-    int ret;
-    ret = ferror((FILE *)stream);
-    return ret;
+	int ret;
+	ret = ferror((FILE *)stream);
+	return ret;
 }
 
 void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
+zlib_filefunc_def* pzlib_filefunc_def;
 {
-    pzlib_filefunc_def->zopen_file = fopen_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell_file = ftell_file_func;
-    pzlib_filefunc_def->zseek_file = fseek_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
+	pzlib_filefunc_def->zopen_file = fopen_file_func;
+	pzlib_filefunc_def->zread_file = fread_file_func;
+	pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+	pzlib_filefunc_def->ztell_file = ftell_file_func;
+	pzlib_filefunc_def->zseek_file = fseek_file_func;
+	pzlib_filefunc_def->zclose_file = fclose_file_func;
+	pzlib_filefunc_def->zerror_file = ferror_file_func;
+	pzlib_filefunc_def->opaque = NULL;
 }
 
 static int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
+const zlib_filefunc_def* pzlib_filefunc_def;
+voidpf filestream;
+int *pi;
 {
-    unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return UNZ_OK;
-    }
-    else
-    {
-        if (ZERROR(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
+	unsigned char c;
+	int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
+	if (err==1)
+	{
+		*pi = (int)c;
+		return UNZ_OK;
+	}
+	else
+	{
+		if (ZERROR(*pzlib_filefunc_def,filestream))
+			return UNZ_ERRNO;
+		else
+			return UNZ_EOF;
+	}
 }
 
 static int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+const zlib_filefunc_def* pzlib_filefunc_def;
+voidpf filestream;
+uLong *pX;
 {
-    uLong x ;
-    int err;
-    int i = 0;
-
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
+	uLong x ;
+	int err;
+	int i = 0;
+
+	err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+	x = (uLong)i;
+
+	if (err==UNZ_OK)
+		err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+	x += ((uLong)i)<<8;
+
+	if (err==UNZ_OK)
+		*pX = x;
+	else
+		*pX = 0;
+	return err;
 }
 
 static int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+const zlib_filefunc_def* pzlib_filefunc_def;
+voidpf filestream;
+uLong *pX;
 {
-    uLong x ;
-    int err;
-    int i = 0;
-
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
+	uLong x ;
+	int err;
+	int i = 0;
+
+	err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+	x = (uLong)i;
+
+	if (err==UNZ_OK)
+		err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+	x += ((uLong)i)<<8;
+
+	if (err==UNZ_OK)
+		err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+	x += ((uLong)i)<<16;
+
+	if (err==UNZ_OK)
+		err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+	x += ((uLong)i)<<24;
+
+	if (err==UNZ_OK)
+		*pX = x;
+	else
+		*pX = 0;
+	return err;
 }
 
 static uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
+const zlib_filefunc_def* pzlib_filefunc_def;
+voidpf filestream;
 {
-    unsigned char* buf;
-    uLong uSizeFile;
-    uLong uBackRead;
-    uLong uMaxBack=0xffff; /* maximum size of global comment */
-    uLong uPosFound=0;
-
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize,uReadPos ;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    return uPosFound;
+	unsigned char* buf;
+	uLong uSizeFile;
+	uLong uBackRead;
+	uLong uMaxBack=0xffff; /* maximum size of global comment */
+	uLong uPosFound=0;
+
+	if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+		return 0;
+
+
+	uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
+
+	if (uMaxBack>uSizeFile)
+		uMaxBack = uSizeFile;
+
+	buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+	if (buf==NULL)
+		return 0;
+
+	uBackRead = 4;
+	while (uBackRead<uMaxBack)
+	{
+		uLong uReadSize,uReadPos ;
+		int i;
+		if (uBackRead+BUFREADCOMMENT>uMaxBack)
+			uBackRead = uMaxBack;
+		else
+			uBackRead+=BUFREADCOMMENT;
+		uReadPos = uSizeFile-uBackRead ;
+
+		uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+		            (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
+		if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+			break;
+
+		if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+			break;
+
+		for (i=(int)uReadSize-3; (i--)>0;)
+			if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+			        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+			{
+				uPosFound = uReadPos+i;
+				break;
+			}
+
+		if (uPosFound!=0)
+			break;
+	}
+	TRYFREE(buf);
+	return uPosFound;
 }
 
 
@@ -331,191 +330,191 @@
    Translate date/time from Dos format to tm_unz (readable more easilty)
 */
 void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
-    uLong ulDosDate;
-    tm_unz* ptm;
+uLong ulDosDate;
+tm_unz* ptm;
 {
-    uLong uDate;
-    uDate = (uLong)(ulDosDate>>16);
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
+	uLong uDate;
+	uDate = (uLong)(ulDosDate>>16);
+	ptm->tm_mday = (uInt)(uDate&0x1f) ;
+	ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
+	ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
+
+	ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
+	ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
+	ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
 }
 
 static int unzlocal_GetCurrentFileInfoInternal (file,
-                                              pfile_info,
-                                              pfile_info_internal,
-                                              szFileName, fileNameBufferSize,
-                                              extraField, extraFieldBufferSize,
-                                              szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    unz_file_info_internal *pfile_info_internal;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
+        pfile_info,
+        pfile_info_internal,
+        szFileName, fileNameBufferSize,
+        extraField, extraFieldBufferSize,
+        szComment,  commentBufferSize)
+unzFile file;
+unz_file_info *pfile_info;
+unz_file_info_internal *pfile_info_internal;
+char *szFileName;
+uLong fileNameBufferSize;
+void *extraField;
+uLong extraFieldBufferSize;
+char *szComment;
+uLong commentBufferSize;
 {
-    unz_s* s;
-    unz_file_info file_info;
-    unz_file_info_internal file_info_internal;
-    int err=UNZ_OK;
-    uLong uMagic;
-    long lSeek=0;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (ZSEEK(s->z_filefunc, s->filestream,
-              s->pos_in_central_dir+s->byte_before_the_zipfile,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-
-    /* we check the magic */
-    if (err==UNZ_OK){
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x02014b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    lSeek+=file_info.size_filename;
-    if ((err==UNZ_OK) && (szFileName!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_filename<fileNameBufferSize)
-        {
-            *(szFileName+file_info.size_filename)='\0';
-            uSizeRead = file_info.size_filename;
-        }
-        else
-            uSizeRead = fileNameBufferSize;
-
-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek -= uSizeRead;
-    }
-
-
-    if ((err==UNZ_OK) && (extraField!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_extra<extraFieldBufferSize)
-            uSizeRead = file_info.size_file_extra;
-        else
-            uSizeRead = extraFieldBufferSize;
-
-        if (lSeek!=0){
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
+	unz_s* s;
+	unz_file_info file_info;
+	unz_file_info_internal file_info_internal;
+	int err=UNZ_OK;
+	uLong uMagic;
+	long lSeek=0;
+
+	if (file==NULL)
+		return UNZ_PARAMERROR;
+	s=(unz_s*)file;
+	if (ZSEEK(s->z_filefunc, s->filestream,
+	          s->pos_in_central_dir+s->byte_before_the_zipfile,
+	          ZLIB_FILEFUNC_SEEK_SET)!=0)
+		err=UNZ_ERRNO;
+
+
+	/* we check the magic */
+	if (err==UNZ_OK) {
+		if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+			err=UNZ_ERRNO;
+		else if (uMagic!=0x02014b50)
+			err=UNZ_BADZIPFILE;
+	}
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	lSeek+=file_info.size_filename;
+	if ((err==UNZ_OK) && (szFileName!=NULL))
+	{
+		uLong uSizeRead ;
+		if (file_info.size_filename<fileNameBufferSize)
+		{
+			*(szFileName+file_info.size_filename)='\0';
+			uSizeRead = file_info.size_filename;
+		}
+		else
+			uSizeRead = fileNameBufferSize;
+
+		if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+			if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+				err=UNZ_ERRNO;
+		lSeek -= uSizeRead;
 	}
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek += file_info.size_file_extra - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_extra;
-
-
-    if ((err==UNZ_OK) && (szComment!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_comment<commentBufferSize)
-        {
-            *(szComment+file_info.size_file_comment)='\0';
-            uSizeRead = file_info.size_file_comment;
-        }
-        else
-            uSizeRead = commentBufferSize;
-
-        if (lSeek!=0){
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
+
+
+	if ((err==UNZ_OK) && (extraField!=NULL))
+	{
+		uLong uSizeRead ;
+		if (file_info.size_file_extra<extraFieldBufferSize)
+			uSizeRead = file_info.size_file_extra;
+		else
+			uSizeRead = extraFieldBufferSize;
+
+		if (lSeek!=0) {
+			if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+				lSeek=0;
+			else
+				err=UNZ_ERRNO;
+		}
+		if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+			if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
+				err=UNZ_ERRNO;
+		lSeek += file_info.size_file_extra - uSizeRead;
 	}
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek+=file_info.size_file_comment - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_comment;
+	else
+		lSeek+=file_info.size_file_extra;
+
+
+	if ((err==UNZ_OK) && (szComment!=NULL))
+	{
+		uLong uSizeRead ;
+		if (file_info.size_file_comment<commentBufferSize)
+		{
+			*(szComment+file_info.size_file_comment)='\0';
+			uSizeRead = file_info.size_file_comment;
+		}
+		else
+			uSizeRead = commentBufferSize;
+
+		if (lSeek!=0) {
+			if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+				lSeek=0;
+			else
+				err=UNZ_ERRNO;
+		}
+		if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+			if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+				err=UNZ_ERRNO;
+		lSeek+=file_info.size_file_comment - uSizeRead;
+	}
+	else
+		lSeek+=file_info.size_file_comment;
 
-    if ((err==UNZ_OK) && (pfile_info!=NULL))
-        *pfile_info=file_info;
+	if ((err==UNZ_OK) && (pfile_info!=NULL))
+		*pfile_info=file_info;
 
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-        *pfile_info_internal=file_info_internal;
+	if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+		*pfile_info_internal=file_info_internal;
 
-    return err;
+	return err;
 }
 
 int unzGetCurrentFileInfo(unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize)
+                          unz_file_info *pfile_info,
+                          char *szFileName,
+                          uLong fileNameBufferSize,
+                          void *extraField,
+                          uLong extraFieldBufferSize,
+                          char *szComment,
+                          uLong commentBufferSize)
 {
 	return unzlocal_GetCurrentFileInfoInternal(file, pfile_info, NULL, szFileName, fileNameBufferSize, extraField, extraFieldBufferSize, szComment, commentBufferSize);
 }
@@ -526,28 +525,28 @@
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
 int unzGoToNextFile (file)
-    unzFile file;
+unzFile file;
 {
-    unz_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
-      if (s->num_file+1==s->gi.number_entry)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-    s->num_file++;
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
+	unz_s* s;
+	int err;
+
+	if (file==NULL)
+		return UNZ_PARAMERROR;
+	s=(unz_s*)file;
+	if (!s->current_file_ok)
+		return UNZ_END_OF_LIST_OF_FILE;
+	if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+		if (s->num_file+1==s->gi.number_entry)
+			return UNZ_END_OF_LIST_OF_FILE;
+
+	s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+	                         s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+	s->num_file++;
+	err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+	        &s->cur_file_info_internal,
+	        NULL,0,NULL,0,NULL,0);
+	s->current_file_ok = (err == UNZ_OK);
+	return err;
 }
 
 /*
@@ -555,32 +554,32 @@
   return UNZ_OK if there is no problem
 */
 int unzGoToFirstFile (file)
-    unzFile file;
+unzFile file;
 {
-    int err=UNZ_OK;
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    s->pos_in_central_dir=s->offset_central_dir;
-    s->num_file=0;
-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                             &s->cur_file_info_internal,
-                                             NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
+	int err=UNZ_OK;
+	unz_s* s;
+	if (file==NULL)
+		return UNZ_PARAMERROR;
+	s=(unz_s*)file;
+	s->pos_in_central_dir=s->offset_central_dir;
+	s->num_file=0;
+	err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+	                                        &s->cur_file_info_internal,
+	                                        NULL,0,NULL,0,NULL,0);
+	s->current_file_ok = (err == UNZ_OK);
+	return err;
 }
 
 int unzGetGlobalInfo (file,pglobal_info)
-    unzFile file;
-    unz_global_info *pglobal_info;
+unzFile file;
+unz_global_info *pglobal_info;
 {
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    *pglobal_info=s->gi;
-    return UNZ_OK;
+	unz_s* s;
+	if (file==NULL)
+		return UNZ_PARAMERROR;
+	s=(unz_s*)file;
+	*pglobal_info=s->gi;
+	return UNZ_OK;
 }
 
 /*
@@ -588,40 +587,40 @@
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
 int unzCloseCurrentFile (file)
-    unzFile file;
+unzFile file;
 {
-    int err=UNZ_OK;
+	int err=UNZ_OK;
 
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
+	unz_s* s;
+	file_in_zip_read_info_s* pfile_in_zip_read_info;
+	if (file==NULL)
+		return UNZ_PARAMERROR;
+	s=(unz_s*)file;
+	pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
+	if (pfile_in_zip_read_info==NULL)
+		return UNZ_PARAMERROR;
 
 
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
-        (!pfile_in_zip_read_info->raw))
-    {
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-            err=UNZ_CRCERROR;
-    }
+	if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+	        (!pfile_in_zip_read_info->raw))
+	{
+		if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+			err=UNZ_CRCERROR;
+	}
 
 
-    TRYFREE(pfile_in_zip_read_info->read_buffer);
-    pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised)
-        inflateEnd(&pfile_in_zip_read_info->stream);
+	TRYFREE(pfile_in_zip_read_info->read_buffer);
+	pfile_in_zip_read_info->read_buffer = NULL;
+	if (pfile_in_zip_read_info->stream_initialised)
+		inflateEnd(&pfile_in_zip_read_info->stream);
 
-    pfile_in_zip_read_info->stream_initialised = 0;
-    TRYFREE(pfile_in_zip_read_info);
+	pfile_in_zip_read_info->stream_initialised = 0;
+	TRYFREE(pfile_in_zip_read_info);
 
-    s->pfile_in_zip_read=NULL;
+	s->pfile_in_zip_read=NULL;
 
-    return err;
+	return err;
 }
 
 
@@ -635,102 +634,102 @@
        of this unzip package.
 */
 extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
-    const char *path;
-    zlib_filefunc_def* pzlib_filefunc_def;
+const char *path;
+zlib_filefunc_def* pzlib_filefunc_def;
 {
-    unz_s us;
-    unz_s *s;
-    uLong central_pos,uL;
+	unz_s us;
+	unz_s *s;
+	uLong central_pos,uL;
 
-    uLong number_disk;          /* number of the current dist, used for
+	uLong number_disk;          /* number of the current dist, used for
                                    spaning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+	uLong number_disk_with_CD;  /* number the the disk with central dir, used
                                    for spaning ZIP, unsupported, always 0*/
-    uLong number_entry_CD;      /* total number of entries in
+	uLong number_entry_CD;      /* total number of entries in
                                    the central dir
                                    (same than number_entry on nospan) */
 
-    int err=UNZ_OK;
-
-    if (pzlib_filefunc_def==NULL)
-        fill_fopen_filefunc(&us.z_filefunc);
-    else
-        us.z_filefunc = *pzlib_filefunc_def;
-
-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
-                                                 path,
-                                                 ZLIB_FILEFUNC_MODE_READ |
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);
-    if (us.filestream==NULL)
-        return NULL;
-
-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
-    if (central_pos==0)
-        err=UNZ_ERRNO;
-
-    if (ZSEEK(us.z_filefunc, us.filestream,
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-    /* the signature, already checked */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir on this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((number_entry_CD!=us.gi.number_entry) ||
-        (number_disk_with_CD!=0) ||
-        (number_disk!=0))
-        err=UNZ_BADZIPFILE;
-
-    /* size of the central directory */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* offset of start of central directory with respect to the
-          starting disk number */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* zipfile comment length */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
-        (err==UNZ_OK))
-        err=UNZ_BADZIPFILE;
-
-    if (err!=UNZ_OK)
-    {
-        ZCLOSE(us.z_filefunc, us.filestream);
-        return NULL;
-    }
-
-    us.byte_before_the_zipfile = central_pos -
-                            (us.offset_central_dir+us.size_central_dir);
-    us.central_pos = central_pos;
-    us.pfile_in_zip_read = NULL;
-    us.encrypted = 0;
-
-
-    s=(unz_s*)ALLOC(sizeof(unz_s));
-    *s=us;
-    unzGoToFirstFile((unzFile)s);
-    return (unzFile)s;
+	int err=UNZ_OK;
+
+	if (pzlib_filefunc_def==NULL)
+		fill_fopen_filefunc(&us.z_filefunc);
+	else
+		us.z_filefunc = *pzlib_filefunc_def;
+
+	us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
+	               path,
+	               ZLIB_FILEFUNC_MODE_READ |
+	               ZLIB_FILEFUNC_MODE_EXISTING);
+	if (us.filestream==NULL)
+		return NULL;
+
+	central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
+	if (central_pos==0)
+		err=UNZ_ERRNO;
+
+	if (ZSEEK(us.z_filefunc, us.filestream,
+	          central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+		err=UNZ_ERRNO;
+
+	/* the signature, already checked */
+	if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+		err=UNZ_ERRNO;
+
+	/* number of this disk */
+	if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+		err=UNZ_ERRNO;
+
+	/* number of the disk with the start of the central directory */
+	if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+		err=UNZ_ERRNO;
+
+	/* total number of entries in the central dir on this disk */
+	if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+		err=UNZ_ERRNO;
+
+	/* total number of entries in the central dir */
+	if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if ((number_entry_CD!=us.gi.number_entry) ||
+	        (number_disk_with_CD!=0) ||
+	        (number_disk!=0))
+		err=UNZ_BADZIPFILE;
+
+	/* size of the central directory */
+	if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+		err=UNZ_ERRNO;
+
+	/* offset of start of central directory with respect to the
+	      starting disk number */
+	if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+		err=UNZ_ERRNO;
+
+	/* zipfile comment length */
+	if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+	        (err==UNZ_OK))
+		err=UNZ_BADZIPFILE;
+
+	if (err!=UNZ_OK)
+	{
+		ZCLOSE(us.z_filefunc, us.filestream);
+		return NULL;
+	}
+
+	us.byte_before_the_zipfile = central_pos -
+	                             (us.offset_central_dir+us.size_central_dir);
+	us.central_pos = central_pos;
+	us.pfile_in_zip_read = NULL;
+	us.encrypted = 0;
+
+
+	s=(unz_s*)ALLOC(sizeof(unz_s));
+	*s=us;
+	unzGoToFirstFile((unzFile)s);
+	return (unzFile)s;
 }
 
 
@@ -745,147 +744,147 @@
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
 int unzReadCurrentFile  (file, buf, len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
+unzFile file;
+voidp buf;
+unsigned len;
 {
-    int err=UNZ_OK;
-    uInt iRead = 0;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if (pfile_in_zip_read_info->read_buffer == NULL)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (len==0)
-        return 0;
-
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
-        (!(pfile_in_zip_read_info->raw)))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+
-           pfile_in_zip_read_info->stream.avail_in) &&
-         (pfile_in_zip_read_info->raw))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in;
-
-    while (pfile_in_zip_read_info->stream.avail_out>0)
-    {
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
-        {
-            uInt uReadThis = UNZ_BUFSIZE;
-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-            if (uReadThis == 0)
-                return UNZ_EOF;
-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile,
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)
-                return UNZ_ERRNO;
-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->read_buffer,
-                      uReadThis)!=uReadThis)
-                return UNZ_ERRNO;
-
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
-            pfile_in_zip_read_info->stream.next_in =
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-        }
-
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
-        {
-            uInt uDoCopy,i ;
-
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                return (iRead==0) ? UNZ_EOF : iRead;
-
-            if (pfile_in_zip_read_info->stream.avail_out <
-                            pfile_in_zip_read_info->stream.avail_in)
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-            else
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-
-            for (i=0;i<uDoCopy;i++)
-                *(pfile_in_zip_read_info->stream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-                                pfile_in_zip_read_info->stream.next_out,
-                                uDoCopy);
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-            iRead += uDoCopy;
-        }
-        else
-        {
-            uLong uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            uLong uOutThis;
-            int flush=Z_SYNC_FLUSH;
-
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-            bufBefore = pfile_in_zip_read_info->stream.next_out;
-
-            /*
-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-                     pfile_in_zip_read_info->stream.avail_out) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                flush = Z_FINISH;
-            */
-            err=inflate(&pfile_in_zip_read_info->stream,flush);
-
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
-              err = Z_DATA_ERROR;
-
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->crc32 =
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
-
-            pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
-
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=Z_OK)
-                break;
-        }
-    }
-
-    if (err==Z_OK)
-        return iRead;
-    return err;
+	int err=UNZ_OK;
+	uInt iRead = 0;
+	unz_s* s;
+	file_in_zip_read_info_s* pfile_in_zip_read_info;
+	if (file==NULL)
+		return UNZ_PARAMERROR;
+	s=(unz_s*)file;
+	pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+	if (pfile_in_zip_read_info==NULL)
+		return UNZ_PARAMERROR;
+
+
+	if (pfile_in_zip_read_info->read_buffer == NULL)
+		return UNZ_END_OF_LIST_OF_FILE;
+	if (len==0)
+		return 0;
+
+	pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
+
+	pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+
+	if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+	        (!(pfile_in_zip_read_info->raw)))
+		pfile_in_zip_read_info->stream.avail_out =
+		    (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+	if ((len>pfile_in_zip_read_info->rest_read_compressed+
+	        pfile_in_zip_read_info->stream.avail_in) &&
+	        (pfile_in_zip_read_info->raw))
+		pfile_in_zip_read_info->stream.avail_out =
+		    (uInt)pfile_in_zip_read_info->rest_read_compressed+
+		    pfile_in_zip_read_info->stream.avail_in;
+
+	while (pfile_in_zip_read_info->stream.avail_out>0)
+	{
+		if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+		        (pfile_in_zip_read_info->rest_read_compressed>0))
+		{
+			uInt uReadThis = UNZ_BUFSIZE;
+			if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+				uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+			if (uReadThis == 0)
+				return UNZ_EOF;
+			if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+			          pfile_in_zip_read_info->filestream,
+			          pfile_in_zip_read_info->pos_in_zipfile +
+			          pfile_in_zip_read_info->byte_before_the_zipfile,
+			          ZLIB_FILEFUNC_SEEK_SET)!=0)
+				return UNZ_ERRNO;
+			if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+			          pfile_in_zip_read_info->filestream,
+			          pfile_in_zip_read_info->read_buffer,
+			          uReadThis)!=uReadThis)
+				return UNZ_ERRNO;
+
+			pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+			pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+			pfile_in_zip_read_info->stream.next_in =
+			    (Bytef*)pfile_in_zip_read_info->read_buffer;
+			pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+		}
+
+		if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+		{
+			uInt uDoCopy,i ;
+
+			if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+			        (pfile_in_zip_read_info->rest_read_compressed == 0))
+				return (iRead==0) ? UNZ_EOF : iRead;
+
+			if (pfile_in_zip_read_info->stream.avail_out <
+			        pfile_in_zip_read_info->stream.avail_in)
+				uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+			else
+				uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+			for (i=0; i<uDoCopy; i++)
+				*(pfile_in_zip_read_info->stream.next_out+i) =
+				    *(pfile_in_zip_read_info->stream.next_in+i);
+
+			pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+			                                      pfile_in_zip_read_info->stream.next_out,
+			                                      uDoCopy);
+			pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+			pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+			pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+			pfile_in_zip_read_info->stream.next_out += uDoCopy;
+			pfile_in_zip_read_info->stream.next_in += uDoCopy;
+			pfile_in_zip_read_info->stream.total_out += uDoCopy;
+			iRead += uDoCopy;
+		}
+		else
+		{
+			uLong uTotalOutBefore,uTotalOutAfter;
+			const Bytef *bufBefore;
+			uLong uOutThis;
+			int flush=Z_SYNC_FLUSH;
+
+			uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+			bufBefore = pfile_in_zip_read_info->stream.next_out;
+
+			/*
+			if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+			         pfile_in_zip_read_info->stream.avail_out) &&
+			    (pfile_in_zip_read_info->rest_read_compressed == 0))
+			    flush = Z_FINISH;
+			*/
+			err=inflate(&pfile_in_zip_read_info->stream,flush);
+
+			if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+				err = Z_DATA_ERROR;
+
+			uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+			uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+			pfile_in_zip_read_info->crc32 =
+			    crc32(pfile_in_zip_read_info->crc32,bufBefore,
+			          (uInt)(uOutThis));
+
+			pfile_in_zip_read_info->rest_read_uncompressed -=
+			    uOutThis;
+
+			iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+			if (err==Z_STREAM_END)
+				return (iRead==0) ? UNZ_EOF : iRead;
+			if (err!=Z_OK)
+				break;
+		}
+	}
+
+	if (err==Z_OK)
+		return iRead;
+	return err;
 }
 
 /*
@@ -896,90 +895,90 @@
         (filename and size of extra field data)
 */
 int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
-                                                    poffset_local_extrafield,
-                                                    psize_local_extrafield)
-    unz_s* s;
-    uInt* piSizeVar;
-    uLong *poffset_local_extrafield;
-    uInt  *psize_local_extrafield;
+        poffset_local_extrafield,
+        psize_local_extrafield)
+unz_s* s;
+uInt* piSizeVar;
+uLong *poffset_local_extrafield;
+uInt  *psize_local_extrafield;
 {
-    uLong uMagic,uData,uFlags;
-    uLong size_filename;
-    uLong size_extra_field;
-    int err=UNZ_OK;
+	uLong uMagic,uData,uFlags;
+	uLong size_filename;
+	uLong size_extra_field;
+	int err=UNZ_OK;
 
-    *piSizeVar = 0;
-    *poffset_local_extrafield = 0;
-    *psize_local_extrafield = 0;
+	*piSizeVar = 0;
+	*poffset_local_extrafield = 0;
+	*psize_local_extrafield = 0;
 
-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-
-    if (err==UNZ_OK){
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x04034b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-/*
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-        err=UNZ_BADZIPFILE;
-*/
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
-        err=UNZ_ERRNO;
+	if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+	          s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+		return UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-        err=UNZ_BADZIPFILE;
 
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-        err=UNZ_BADZIPFILE;
-
-    *piSizeVar += (uInt)size_filename;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
-        err=UNZ_ERRNO;
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-                                    SIZEZIPLOCALHEADER + size_filename;
-    *psize_local_extrafield = (uInt)size_extra_field;
-
-    *piSizeVar += (uInt)size_extra_field;
+	if (err==UNZ_OK) {
+		if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+			err=UNZ_ERRNO;
+		else if (uMagic!=0x04034b50)
+			err=UNZ_BADZIPFILE;
+	}
 
-    return err;
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+		err=UNZ_ERRNO;
+	/*
+	    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+	        err=UNZ_BADZIPFILE;
+	*/
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+		err=UNZ_ERRNO;
+	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+		err=UNZ_BADZIPFILE;
+
+	if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
+	        (s->cur_file_info.compression_method!=Z_DEFLATED))
+		err=UNZ_BADZIPFILE;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+		err=UNZ_ERRNO;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+		err=UNZ_ERRNO;
+	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
+	         ((uFlags & 8)==0))
+		err=UNZ_BADZIPFILE;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+		err=UNZ_ERRNO;
+	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
+	         ((uFlags & 8)==0))
+		err=UNZ_BADZIPFILE;
+
+	if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+		err=UNZ_ERRNO;
+	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
+	         ((uFlags & 8)==0))
+		err=UNZ_BADZIPFILE;
+
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+		err=UNZ_ERRNO;
+	else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+		err=UNZ_BADZIPFILE;
+
+	*piSizeVar += (uInt)size_filename;
+
+	if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+		err=UNZ_ERRNO;
+	*poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+	                           SIZEZIPLOCALHEADER + size_filename;
+	*psize_local_extrafield = (uInt)size_extra_field;
+
+	*piSizeVar += (uInt)size_extra_field;
+
+	return err;
 }
 
 /*
@@ -987,122 +986,128 @@
   If there is no error and the file is opened, the return value is UNZ_OK.
 */
 int unzOpenCurrentFile3 (file, method, level, raw, password)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-    const char* password;
+unzFile file;
+int* method;
+int* level;
+int raw;
+const char* password;
 {
-    int err=UNZ_OK;
-    uInt iSizeVar;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uLong offset_local_extrafield;  /* offset of the local extra field */
-    uInt  size_local_extrafield;    /* size of the local extra field */
+	int err=UNZ_OK;
+	uInt iSizeVar;
+	unz_s* s;
+	file_in_zip_read_info_s* pfile_in_zip_read_info;
+	uLong offset_local_extrafield;  /* offset of the local extra field */
+	uInt  size_local_extrafield;    /* size of the local extra field */
 
 	if (password != NULL)
-        return UNZ_PARAMERROR;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_PARAMERROR;
-
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
-
-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-        return UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-                                        ALLOC(sizeof(file_in_zip_read_info_s));
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_INTERNALERROR;
-
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-    pfile_in_zip_read_info->pos_local_extrafield=0;
-    pfile_in_zip_read_info->raw=raw;
-
-    if (pfile_in_zip_read_info->read_buffer==NULL)
-    {
-        TRYFREE(pfile_in_zip_read_info);
-        return UNZ_INTERNALERROR;
-    }
-
-    pfile_in_zip_read_info->stream_initialised=0;
-
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
-
-    if (level!=NULL)
-    {
-        *level = 6;
-        switch (s->cur_file_info.flag & 0x06)
-        {
-          case 6 : *level = 1; break;
-          case 4 : *level = 2; break;
-          case 2 : *level = 9; break;
-        }
-    }
-
-    if ((s->cur_file_info.compression_method!=0) &&
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-    pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->compression_method =
-            s->cur_file_info.compression_method;
-    pfile_in_zip_read_info->filestream=s->filestream;
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
-        (!raw))
-    {
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=1;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-        /* 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.
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
-         * size of both compressed and uncompressed data
-         */
-    }
-    pfile_in_zip_read_info->rest_read_compressed =
-            s->cur_file_info.compressed_size ;
-    pfile_in_zip_read_info->rest_read_uncompressed =
-            s->cur_file_info.uncompressed_size ;
-
-
-    pfile_in_zip_read_info->pos_in_zipfile =
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
-              iSizeVar;
-
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
-
-    s->pfile_in_zip_read = pfile_in_zip_read_info;
-
-    return UNZ_OK;
+		return UNZ_PARAMERROR;
+
+	if (file==NULL)
+		return UNZ_PARAMERROR;
+	s=(unz_s*)file;
+	if (!s->current_file_ok)
+		return UNZ_PARAMERROR;
+
+	if (s->pfile_in_zip_read != NULL)
+		unzCloseCurrentFile(file);
+
+	if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
+	        &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+		return UNZ_BADZIPFILE;
+
+	pfile_in_zip_read_info = (file_in_zip_read_info_s*)
+	                         ALLOC(sizeof(file_in_zip_read_info_s));
+	if (pfile_in_zip_read_info==NULL)
+		return UNZ_INTERNALERROR;
+
+	pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+	pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+	pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+	pfile_in_zip_read_info->pos_local_extrafield=0;
+	pfile_in_zip_read_info->raw=raw;
+
+	if (pfile_in_zip_read_info->read_buffer==NULL)
+	{
+		TRYFREE(pfile_in_zip_read_info);
+		return UNZ_INTERNALERROR;
+	}
+
+	pfile_in_zip_read_info->stream_initialised=0;
+
+	if (method!=NULL)
+		*method = (int)s->cur_file_info.compression_method;
+
+	if (level!=NULL)
+	{
+		*level = 6;
+		switch (s->cur_file_info.flag & 0x06)
+		{
+		case 6 :
+			*level = 1;
+			break;
+		case 4 :
+			*level = 2;
+			break;
+		case 2 :
+			*level = 9;
+			break;
+		}
+	}
+
+	if ((s->cur_file_info.compression_method!=0) &&
+	        (s->cur_file_info.compression_method!=Z_DEFLATED))
+		err=UNZ_BADZIPFILE;
+
+	pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+	pfile_in_zip_read_info->crc32=0;
+	pfile_in_zip_read_info->compression_method =
+	    s->cur_file_info.compression_method;
+	pfile_in_zip_read_info->filestream=s->filestream;
+	pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+	pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+
+	pfile_in_zip_read_info->stream.total_out = 0;
+
+	if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
+	        (!raw))
+	{
+		pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+		pfile_in_zip_read_info->stream.zfree = (free_func)0;
+		pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+		pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+		pfile_in_zip_read_info->stream.avail_in = 0;
+
+		err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
+		if (err == Z_OK)
+			pfile_in_zip_read_info->stream_initialised=1;
+		else
+		{
+			TRYFREE(pfile_in_zip_read_info);
+			return err;
+		}
+		/* 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.
+		 * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+		 * size of both compressed and uncompressed data
+		 */
+	}
+	pfile_in_zip_read_info->rest_read_compressed =
+	    s->cur_file_info.compressed_size ;
+	pfile_in_zip_read_info->rest_read_uncompressed =
+	    s->cur_file_info.uncompressed_size ;
+
+
+	pfile_in_zip_read_info->pos_in_zipfile =
+	    s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+	    iSizeVar;
+
+	pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+	s->pfile_in_zip_read = pfile_in_zip_read_info;
+
+	return UNZ_OK;
 }
 
 /*
@@ -1111,19 +1116,19 @@
     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
   return UNZ_OK if there is no problem. */
 extern int ZEXPORT unzClose (file)
-    unzFile file;
+unzFile file;
 {
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+	unz_s* s;
+	if (file==NULL)
+		return UNZ_PARAMERROR;
+	s=(unz_s*)file;
 
-    if (s->pfile_in_zip_read!=NULL)
-        unzCloseCurrentFile(file);
+	if (s->pfile_in_zip_read!=NULL)
+		unzCloseCurrentFile(file);
 
-    ZCLOSE(s->z_filefunc, s->filestream);
-    TRYFREE(s);
-    return UNZ_OK;
+	ZCLOSE(s->z_filefunc, s->filestream);
+	TRYFREE(s);
+	return UNZ_OK;
 }
 
 #ifndef _WIN32_WCE
@@ -1132,60 +1137,60 @@
    As I don't know well Unix, I wait feedback for the unix portion */
 
 int mymkdir(dirname)
-    const char* dirname;
+const char* dirname;
 {
-    int ret=0;
+	int ret=0;
 #if defined(WIN32) || defined(_WIN32_WCE)
-    return mkdir(dirname);
+	return mkdir(dirname);
 #else
-    return mkdir (dirname, 700);
+	return mkdir (dirname, 700);
 #endif
-    return ret;
+	return ret;
 }
 
 int makedir (newdir)
-    const char *newdir;
+const char *newdir;
 {
-  char *buffer ;
-  char *p;
-  int  len = (int)strlen(newdir);
-
-  if (len <= 0)
-    return 0;
-
-  buffer = (char*)gf_malloc(len+1);
-  strcpy(buffer,newdir);
-
-  if (buffer[len-1] == '/') {
-    buffer[len-1] = '\0';
-  }
-  if (mymkdir(buffer) == 0)
-    {
-      gf_free(buffer);
-      return 1;
-    }
-
-  p = buffer+1;
-  while (1)
-    {
-      char hold;
-
-      while(*p && *p != '\\' && *p != '/')
-        p++;
-      hold = *p;
-      *p = 0;
-      if ((mymkdir(buffer) == -1) && (errno == ENOENT))
-        {
-          fprintf(stderr, "couldn't create directory %s\n",buffer);
-          gf_free(buffer);
-          return 0;
-        }
-      if (hold == 0)
-        break;
-      *p++ = hold;
-    }
-  gf_free(buffer);
-  return 1;
+	char *buffer ;
+	char *p;
+	int  len = (int)strlen(newdir);
+
+	if (len <= 0)
+		return 0;
+
+	buffer = (char*)gf_malloc(len+1);
+	strcpy(buffer,newdir);
+
+	if (buffer[len-1] == '/') {
+		buffer[len-1] = '\0';
+	}
+	if (mymkdir(buffer) == 0)
+	{
+		gf_free(buffer);
+		return 1;
+	}
+
+	p = buffer+1;
+	while (1)
+	{
+		char hold;
+
+		while(*p && *p != '\\' && *p != '/')
+			p++;
+		hold = *p;
+		*p = 0;
+		if ((mymkdir(buffer) == -1) && (errno == ENOENT))
+		{
+			fprintf(stderr, "couldn't create directory %s\n",buffer);
+			gf_free(buffer);
+			return 0;
+		}
+		if (hold == 0)
+			break;
+		*p++ = hold;
+	}
+	gf_free(buffer);
+	return 1;
 }
 #else
 int makedir (newdir)
@@ -1196,167 +1201,167 @@
 
 
 int do_extract_currentfile(uf)
-    unzFile uf;
+unzFile uf;
 {
-    char filename_inzip[256];
-    char* filename_withoutpath;
-    char* p;
-    int err=UNZ_OK;
-    FILE *fout=NULL;
-    void* buf;
-    uInt size_buf;
-
-    unz_file_info file_info;
-    err = unzlocal_GetCurrentFileInfoInternal(uf,&file_info,NULL,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
-
-    if (err!=UNZ_OK)
-    {
-        fprintf(stderr, "error %d with zipfile in unzGetCurrentFileInfo\n",err);
-        return err;
-    }
-
-    size_buf = WRITEBUFFERSIZE;
-    buf = (void*)gf_malloc(size_buf);
-    if (buf==NULL)
-    {
-        fprintf(stderr, "Error allocating memory\n");
-        return UNZ_INTERNALERROR;
-    }
-
-    p = filename_withoutpath = filename_inzip;
-    while ((*p) != '\0')
-    {
-        if (((*p)=='/') || ((*p)=='\\'))
-            filename_withoutpath = p+1;
-        p++;
-    }
-
-    if ((*filename_withoutpath)=='\0')
-    {
+	char filename_inzip[256];
+	char* filename_withoutpath;
+	char* p;
+	int err=UNZ_OK;
+	FILE *fout=NULL;
+	void* buf;
+	uInt size_buf;
+
+	unz_file_info file_info;
+	err = unzlocal_GetCurrentFileInfoInternal(uf,&file_info,NULL,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+
+	if (err!=UNZ_OK)
+	{
+		fprintf(stderr, "error %d with zipfile in unzGetCurrentFileInfo\n",err);
+		return err;
+	}
+
+	size_buf = WRITEBUFFERSIZE;
+	buf = (void*)gf_malloc(size_buf);
+	if (buf==NULL)
+	{
+		fprintf(stderr, "Error allocating memory\n");
+		return UNZ_INTERNALERROR;
+	}
+
+	p = filename_withoutpath = filename_inzip;
+	while ((*p) != '\0')
+	{
+		if (((*p)=='/') || ((*p)=='\\'))
+			filename_withoutpath = p+1;
+		p++;
+	}
+
+	if ((*filename_withoutpath)=='\0')
+	{
 #ifndef _WIN32_WCE
 		fprintf(stderr, "creating directory: %s\n",filename_inzip);
-           mymkdir(filename_inzip);
+		mymkdir(filename_inzip);
 #endif
 	}
-    else
-    {
-        const char* write_filename;
-        int skip=0;
+	else
+	{
+		const char* write_filename;
+		int skip=0;
 
-        write_filename = filename_inzip;
+		write_filename = filename_inzip;
 
 		err = unzOpenCurrentFile3(uf, NULL, NULL, 0, NULL/*password*/);
-        if (err!=UNZ_OK)
-        {
-            fprintf(stderr, "error %d with zipfile in unzOpenCurrentFilePassword\n",err);
-        }
-
-        if ((skip==0) && (err==UNZ_OK))
-        {
-            fout=fopen(write_filename,"wb");
-
-            /* some zipfile don't contain directory alone before file */
-            if ((fout==NULL) && (filename_withoutpath!=(char*)filename_inzip))
-            {
-                char c=*(filename_withoutpath-1);
-                *(filename_withoutpath-1)='\0';
-                makedir(write_filename);
-                *(filename_withoutpath-1)=c;
-                fout=fopen(write_filename,"wb");
-            }
-
-            if (fout==NULL)
-            {
-                fprintf(stderr, "error opening %s\n",write_filename);
-            }
-        }
-
-        if (fout!=NULL)
-        {
-            fprintf(stderr, " extracting: %s\n",write_filename);
-
-            do
-            {
-                err = unzReadCurrentFile(uf,buf,size_buf);
-                if (err<0)
-                {
-                    fprintf(stderr, "error %d with zipfile in unzReadCurrentFile\n",err);
-                    break;
-                }
-                if (err>0)
-                    if (gf_fwrite(buf,err,1,fout)!=1)
-                    {
-                        fprintf(stderr, "error in writing extracted file\n");
-                        err=UNZ_ERRNO;
-                        break;
-                    }
-            }
-            while (err>0);
-            if (fout)
-                    fclose(fout);
-        }
-
-        if (err==UNZ_OK)
-        {
-            err = unzCloseCurrentFile (uf);
-            if (err!=UNZ_OK)
-            {
-                fprintf(stderr, "error %d with zipfile in unzCloseCurrentFile\n",err);
-            }
-        }
-        else
-            unzCloseCurrentFile(uf); /* don't lose the error */
-    }
-
-    gf_free(buf);
-    return err;
+		if (err!=UNZ_OK)
+		{
+			fprintf(stderr, "error %d with zipfile in unzOpenCurrentFilePassword\n",err);
+		}
+
+		if ((skip==0) && (err==UNZ_OK))
+		{
+			fout=fopen(write_filename,"wb");
+
+			/* some zipfile don't contain directory alone before file */
+			if ((fout==NULL) && (filename_withoutpath!=(char*)filename_inzip))
+			{
+				char c=*(filename_withoutpath-1);
+				*(filename_withoutpath-1)='\0';
+				makedir(write_filename);
+				*(filename_withoutpath-1)=c;
+				fout=fopen(write_filename,"wb");
+			}
+
+			if (fout==NULL)
+			{
+				fprintf(stderr, "error opening %s\n",write_filename);
+			}
+		}
+
+		if (fout!=NULL)
+		{
+			fprintf(stderr, " extracting: %s\n",write_filename);
+
+			do
+			{
+				err = unzReadCurrentFile(uf,buf,size_buf);
+				if (err<0)
+				{
+					fprintf(stderr, "error %d with zipfile in unzReadCurrentFile\n",err);
+					break;
+				}
+				if (err>0)
+					if (gf_fwrite(buf,err,1,fout)!=1)
+					{
+						fprintf(stderr, "error in writing extracted file\n");
+						err=UNZ_ERRNO;
+						break;
+					}
+			}
+			while (err>0);
+			if (fout)
+				fclose(fout);
+		}
+
+		if (err==UNZ_OK)
+		{
+			err = unzCloseCurrentFile (uf);
+			if (err!=UNZ_OK)
+			{
+				fprintf(stderr, "error %d with zipfile in unzCloseCurrentFile\n",err);
+			}
+		}
+		else
+			unzCloseCurrentFile(uf); /* don't lose the error */
+	}
+
+	gf_free(buf);
+	return err;
 }
 
 
 int gf_unzip_archive(const char *zipfilename, const char *dirname)
 {
-    uLong i;
-    unz_global_info gi;
-    int err;
-
-    unzFile uf=NULL;
-
-    uf = unzOpen2(zipfilename, NULL);
-    if (uf==NULL)
-    {
-        fprintf(stderr, "Cannot open %s\n", zipfilename);
-        return 1;
-    }
+	uLong i;
+	unz_global_info gi;
+	int err;
+
+	unzFile uf=NULL;
+
+	uf = unzOpen2(zipfilename, NULL);
+	if (uf==NULL)
+	{
+		fprintf(stderr, "Cannot open %s\n", zipfilename);
+		return 1;
+	}
 #ifndef _WIN32_WCE
-	if (chdir(dirname)) 
-    {
-      fprintf(stderr, "Error changing into %s, aborting\n", dirname);
-      exit(-1);
-    }
+	if (chdir(dirname))
+	{
+		fprintf(stderr, "Error changing into %s, aborting\n", dirname);
+		exit(-1);
+	}
 #endif
 
-    err = unzGetGlobalInfo (uf,&gi);
-    if (err!=UNZ_OK)
-        fprintf(stderr, "error %d with zipfile in unzGetGlobalInfo \n",err);
-
-    for (i=0;i<gi.number_entry;i++)
-    {
-        if (do_extract_currentfile(uf) != UNZ_OK)
-            break;
-
-        if ((i+1)<gi.number_entry)
-        {
-            err = unzGoToNextFile(uf);
-            if (err!=UNZ_OK)
-            {
-                fprintf(stderr, "error %d with zipfile in unzGoToNextFile\n",err);
-                break;
-            }
-        }
-    }
-	 unzClose(uf);
-
-    return 0;
+	err = unzGetGlobalInfo (uf,&gi);
+	if (err!=UNZ_OK)
+		fprintf(stderr, "error %d with zipfile in unzGetGlobalInfo \n",err);
+
+	for (i=0; i<gi.number_entry; i++)
+	{
+		if (do_extract_currentfile(uf) != UNZ_OK)
+			break;
+
+		if ((i+1)<gi.number_entry)
+		{
+			err = unzGoToNextFile(uf);
+			if (err!=UNZ_OK)
+			{
+				fprintf(stderr, "error %d with zipfile in unzGoToNextFile\n",err);
+				break;
+			}
+		}
+	}
+	unzClose(uf);
+
+	return 0;
 }
 
 int gf_unzip_probe(const char *zipfilename)

gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/unzip.h -> gpac-0.5.1.svn5491.tar.xz/modules/widgetman/unzip.h Changed

@@ -67,7 +67,7 @@
 
 #define ZLIB_FILEFUNC_MODE_EXISTING (4)
 #define ZLIB_FILEFUNC_MODE_CREATE   (8)
-	
+
 typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
 typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
 typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
@@ -78,14 +78,14 @@
 
 typedef struct zlib_filefunc_def_s
 {
-    open_file_func      zopen_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
+	open_file_func      zopen_file;
+	read_file_func      zread_file;
+	write_file_func     zwrite_file;
+	tell_file_func      ztell_file;
+	seek_file_func      zseek_file;
+	close_file_func     zclose_file;
+	testerror_file_func zerror_file;
+	voidpf              opaque;
 } zlib_filefunc_def;
 
 
@@ -102,7 +102,9 @@
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
+typedef struct TagunzFile__ {
+	int unused;
+} unzFile__;
 typedef unzFile__ *unzFile;
 #else
 typedef voidp unzFile;
@@ -148,44 +150,44 @@
 /* tm_unz contain date/time info */
 typedef struct tm_unz_s
 {
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
+	uInt tm_sec;            /* seconds after the minute - [0,59] */
+	uInt tm_min;            /* minutes after the hour - [0,59] */
+	uInt tm_hour;           /* hours since midnight - [0,23] */
+	uInt tm_mday;           /* day of the month - [1,31] */
+	uInt tm_mon;            /* months since January - [0,11] */
+	uInt tm_year;           /* years - [1980..2044] */
 } tm_unz;
 
 /* unz_global_info structure contain global data about the ZIPfile
    These data comes from the end of central dir */
 typedef struct unz_global_info_s
 {
-    uLong number_entry;         /* total number of entries in
+	uLong number_entry;         /* total number of entries in
                        the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
+	uLong size_comment;         /* size of the global comment of the zipfile */
 } unz_global_info;
 
 
 /* unz_file_info contain information about a file in the zipfile */
 typedef struct unz_file_info_s
 {
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
+	uLong version;              /* version made by                 2 bytes */
+	uLong version_needed;       /* version needed to extract       2 bytes */
+	uLong flag;                 /* general purpose bit flag        2 bytes */
+	uLong compression_method;   /* compression method              2 bytes */
+	uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+	uLong crc;                  /* crc-32                          4 bytes */
+	uLong compressed_size;      /* compressed size                 4 bytes */
+	uLong uncompressed_size;    /* uncompressed size               4 bytes */
+	uLong size_filename;        /* filename length                 2 bytes */
+	uLong size_file_extra;      /* extra field length              2 bytes */
+	uLong size_file_comment;    /* file comment length             2 bytes */
+
+	uLong disk_num_start;       /* disk number start               2 bytes */
+	uLong internal_fa;          /* internal file attributes        2 bytes */
+	uLong external_fa;          /* external file attributes        4 bytes */
+
+	tm_unz tmu_date;
 } unz_file_info;
 
 
@@ -193,7 +195,7 @@
 /* unz_file_info_interntal contain internal info about a file in zipfile*/
 typedef struct unz_file_info_internal_s
 {
-    uLong offset_curfile;/* relative offset of local header 4 bytes */
+	uLong offset_curfile;/* relative offset of local header 4 bytes */
 } unz_file_info_internal;
 
 
@@ -201,25 +203,25 @@
     when reading and decompress it */
 typedef struct
 {
-    char  *read_buffer;         /* internal buffer for compressed data */
-    z_stream stream;            /* zLib stream structure for inflate */
-
-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for gf_f64_seek*/
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-    uLong offset_local_extrafield;/* offset of the local extra field */
-    uInt  size_local_extrafield;/* size of the local extra field */
-    uLong pos_local_extrafield;   /* position in the local extra field in read*/
-
-    uLong crc32;                /* crc32 of all data uncompressed */
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    uLong rest_read_compressed; /* number of byte to be decompressed */
-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    uLong compression_method;   /* compression method (0==store) */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    int   raw;
+	char  *read_buffer;         /* internal buffer for compressed data */
+	z_stream stream;            /* zLib stream structure for inflate */
+
+	uLong pos_in_zipfile;       /* position in byte on the zipfile, for gf_f64_seek*/
+	uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+	uLong offset_local_extrafield;/* offset of the local extra field */
+	uInt  size_local_extrafield;/* size of the local extra field */
+	uLong pos_local_extrafield;   /* position in the local extra field in read*/
+
+	uLong crc32;                /* crc32 of all data uncompressed */
+	uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+	uLong rest_read_compressed; /* number of byte to be decompressed */
+	uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+	zlib_filefunc_def z_filefunc;
+	voidpf filestream;        /* io structore of the zipfile */
+	uLong compression_method;   /* compression method (0==store) */
+	uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+	int   raw;
 } file_in_zip_read_info_s;
 
 
@@ -227,35 +229,35 @@
 */
 typedef struct
 {
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    unz_global_info gi;       /* public global information */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    uLong num_file;             /* number of the current file in the zipfile*/
-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
-    uLong current_file_ok;      /* flag about the usability of the current file*/
-    uLong central_pos;          /* position of the beginning of the central dir*/
-
-    uLong size_central_dir;     /* size of the central directory  */
-    uLong offset_central_dir;   /* offset of start of central directory with
+	zlib_filefunc_def z_filefunc;
+	voidpf filestream;        /* io structore of the zipfile */
+	unz_global_info gi;       /* public global information */
+	uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+	uLong num_file;             /* number of the current file in the zipfile*/
+	uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
+	uLong current_file_ok;      /* flag about the usability of the current file*/
+	uLong central_pos;          /* position of the beginning of the central dir*/
+
+	uLong size_central_dir;     /* size of the central directory  */
+	uLong offset_central_dir;   /* offset of start of central directory with
                                    respect to the starting disk number */
 
-    unz_file_info cur_file_info; /* public info about the current file in zip*/
-    unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
+	unz_file_info cur_file_info; /* public info about the current file in zip*/
+	unz_file_info_internal cur_file_info_internal; /* private info about it*/
+	file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
                                         file if we are decompressing it */
-    int encrypted;
+	int encrypted;
 #    ifndef NOUNCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const unsigned long* pcrc_32_tab;
+	unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+	const unsigned long* pcrc_32_tab;
 #    endif
 } unz_s;
 
 
 
 extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
+        const char* fileName2,
+        int iCaseSensitivity));
 /*
    Compare two filename (fileName1,fileName2).
    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
@@ -300,8 +302,8 @@
 
 
 extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
+        char *szComment,
+        uLong uSizeBuf));
 /*
   Get the global comment string of the ZipFile, in the szComment buffer.
   uSizeBuf is the size of the szComment buffer.
@@ -326,8 +328,8 @@
 */
 
 extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
+                                     const char *szFileName,
+                                     int iCaseSensitivity));
 /*
   Try locate the file szFileName in the zipfile.
   For the iCaseSensitivity signification, see unzStringFileNameCompare
@@ -343,8 +345,8 @@
 /* unz_file_info contain information about a file in the zipfile */
 typedef struct unz_file_pos_s
 {
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
+	uLong pos_in_zip_directory;   /* offset in zip file directory */
+	uLong num_of_file;            /* # of file */
 } unz_file_pos;
 
 extern int ZEXPORT unzGetFilePos(
@@ -358,13 +360,13 @@
 /* ****************************************** */
 
 extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
+        unz_file_info *pfile_info,
+        char *szFileName,
+        uLong fileNameBufferSize,
+        void *extraField,
+        uLong extraFieldBufferSize,
+        char *szComment,
+        uLong commentBufferSize));
 /*
   Get Info about the current file
   if pfile_info!=NULL, the *pfile_info structure will contain somes info about
@@ -390,7 +392,7 @@
 */
 
 extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
+        const char* password));
 /*
   Open for reading data the current file in the zipfile.
   password is a crypting password
@@ -398,9 +400,9 @@
 */
 
 extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
+        int* method,
+        int* level,
+        int raw));
 /*
   Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
     if raw==1
@@ -411,10 +413,10 @@
 */
 
 extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
+        int* method,
+        int* level,
+        int raw,
+        const char* password));
 /*
   Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
     if raw==1
@@ -432,8 +434,8 @@
 */
 
 extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
+        voidp buf,
+        unsigned len));
 /*
   Read bytes from the current file (opened by unzOpenCurrentFile)
   buf contain buffer where data must be copied
@@ -456,8 +458,8 @@
 */
 
 extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
+        voidp buf,
+        unsigned len));
 /*
   Read extra field from the current file (opened by unzOpenCurrentFile)
   This is the local-header version of the extra field (sometimes, there is

gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/wgt_load.c -> gpac-0.5.1.svn5491.tar.xz/modules/widgetman/wgt_load.c Changed

@@ -55,7 +55,7 @@
 } WgtLoad;
 
 static GF_Err WGT_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-								u16 ES_ID, u32 stream_time, u32 mmlevel)
+                              u16 ES_ID, u32 stream_time, u32 mmlevel)
 {
 	GF_Err e = GF_OK;
 	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
@@ -90,13 +90,13 @@
 			gf_svg_parse_attribute(n, &info, "0 0 320 240", 0);
 			gf_node_get_attribute_by_name(n, "xmlns", 0, 1, 0, &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_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);
@@ -126,15 +126,15 @@
 				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";
+				                       "	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) );
 			}
@@ -290,12 +290,12 @@
 {
 	GF_SceneDecoder *sdec = (GF_SceneDecoder *)ifce;
 	WgtLoad *wgtload;
-        if (!ifce)
-          return;
-        wgtload = (WgtLoad *) sdec->privateStack;
-        if (wgtload)
-          gf_free(wgtload);
-        sdec->privateStack = NULL;
+	if (!ifce)
+		return;
+	wgtload = (WgtLoad *) sdec->privateStack;
+	if (wgtload)
+		gf_free(wgtload);
+	sdec->privateStack = NULL;
 	gf_free(sdec);
 }

gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/widget.c -> gpac-0.5.1.svn5491.tar.xz/modules/widgetman/widget.c Changed

@@ -1,7 +1,7 @@
 //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 
+//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
@@ -10,13 +10,13 @@
 //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. 
+//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.
 //
@@ -32,7 +32,7 @@
 
 /////////////////////////////////////////////////////////////////////////////////
 //
-//	Authors:	
+//	Authors:
 //					Jean Le Feuvre, Telecom ParisTech
 //
 /////////////////////////////////////////////////////////////////////////////////
@@ -105,7 +105,7 @@
 		u32 i;
 		vars = gf_malloc(sizeof(jsval)*(argc+1));
 		vars[0] = OBJECT_TO_JSVAL(wid->obj);
-		for (i=0; i<argc; i++) 
+		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);
@@ -166,7 +166,7 @@
 
 			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) );
 		}
 	}
@@ -287,7 +287,7 @@
 	for (i=0; i<count; i++) {
 		GF_WidgetComponent *comp = 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 {
@@ -317,7 +317,7 @@
 	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) 
+	if (JS_LookupProperty(ifce->wid->scene_context, ifce->wid->scene_obj, fun_name, &funval)!=JS_TRUE)
 		return;
 	if (!JSVAL_IS_OBJECT(funval)) return;
 
@@ -329,67 +329,67 @@
 
 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;
+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 (!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;
+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) 
+SMJS_FUNC_PROP_SET( widget_setProperty)
 
-	/*avoids GCC warning*/
-	if (!obj) obj = NULL;
+/*avoids GCC warning*/
+if (!obj) obj = NULL;
 #ifndef GPAC_CONFIG_DARWIN
-	if (!id) id=0;
+if (!id) id=0;
 #endif
-    if (!vp) vp=0;
-	return JS_TRUE;
+if (!vp) vp=0;
+return JS_TRUE;
 }
 
 void widget_load(GF_WidgetManager *wm, GF_SceneGraph *scene, JSContext *c, JSObject *global, Bool unload)
@@ -439,7 +439,7 @@
 
 		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);

gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/widgetman.c -> gpac-0.5.1.svn5491.tar.xz/modules/widgetman/widgetman.c Changed

@@ -151,7 +151,7 @@
 {
 	u32 count, i;
 	count = gf_list_count(wpack->resources);
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		GF_WidgetPackageResource *pack_res = gf_list_get(wpack->resources, i);
 		if (is_same_path(res_path, pack_res->inner_path, 0)) {
 			strcpy(localized_rel_path, res_path);
@@ -409,7 +409,7 @@
 		}
 
 		if ((i+1)<gi.number_entry)
-            unzGoToNextFile(uf);
+			unzGoToNextFile(uf);
 	}
 	unzClose(uf);
 
@@ -471,10 +471,10 @@
 	if (!content) return;
 
 	while (gf_list_count(content->interfaces)) {
-		 GF_WidgetInterface*ifce = gf_list_last(content->interfaces);
-		 gf_list_rem_last(content->interfaces);
+		GF_WidgetInterface*ifce = gf_list_last(content->interfaces);
+		gf_list_rem_last(content->interfaces);
 
-		 while (gf_list_count(ifce->messages)) {
+		while (gf_list_count(ifce->messages)) {
 			GF_WidgetMessage *msg = gf_list_last(ifce->messages);
 			gf_list_rem_last(ifce->messages);
 
@@ -502,32 +502,32 @@
 	gf_list_del(content->interfaces);
 
 	while (gf_list_count(content->components)) {
-		 GF_WidgetComponent *comp = gf_list_last(content->components);
-		 gf_list_rem_last(content->components);
+		GF_WidgetComponent *comp = gf_list_last(content->components);
+		gf_list_rem_last(content->components);
 
-		 wm_delete_message_param(comp->activateTrigger);
-		 wm_delete_message_param(comp->deactivateTrigger);
+		wm_delete_message_param(comp->activateTrigger);
+		wm_delete_message_param(comp->deactivateTrigger);
 
-		 while (gf_list_count(comp->required_interfaces)) {
+		while (gf_list_count(comp->required_interfaces)) {
 			char *type = 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(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_list_last(content->preferences);
-		 gf_list_rem_last(content->preferences);
+		GF_WidgetPreference *pref = 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);
+		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);
 
@@ -858,9 +858,9 @@
 		//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)
+		        || (n->sgprivate->tag==TAG_X3D_Script)
 #endif
-				) 
+		   )
 			gf_sg_script_event_in(n, &info);
 
 		gf_node_changed(n, &info);
@@ -952,7 +952,7 @@
 
 	evt_type = GF_EVENT_ATTR_MODIFIED;
 	n = gf_sg_find_node_by_name(wid->scene, param->node);
-	if (!n) 
+	if (!n)
 		return NULL;
 
 	att_name = 0;
@@ -1465,7 +1465,7 @@
 
 	comp_id = SMJS_CHARS(c, argv[0]);
 	count = gf_list_count(wid->components);
-	for (i=0; i<count;i++) {
+	for (i=0; i<count; i++) {
 		comp_inst = 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) );
@@ -1582,7 +1582,7 @@
 
 	count = gf_list_count(wid->widget->main->preferences);
 	for (i=0; i<count; i++) {
-		 GF_WidgetPreference *pref = gf_list_get(wid->widget->main->preferences, i);
+		GF_WidgetPreference *pref = 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;
@@ -1609,13 +1609,13 @@
 					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);
+					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*/
@@ -1646,304 +1646,304 @@
 
 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;
+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;
 
-	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_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);
-			}
+/*
+		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_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_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, "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_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_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_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, "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_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_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);
 	}
+	*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_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);
+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_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);
-			}
+/*
+		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;
+}
+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) ? 1 : 0;
+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) ? 1 : 0;
+}
+
+/*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;
 	}
 
-	/*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);
-	}
+	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;
+SMJS_FREE(c, prop_name);
+return JS_TRUE;
 }
 
 
@@ -2231,7 +2231,7 @@
 		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);
 	}
 
@@ -2313,44 +2313,44 @@
 
 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;
+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;
+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)
@@ -2726,20 +2726,20 @@
 	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];
+		case ' ':
+		case '\t':
+		case '\r':
+		case '\n':
+			if (!first_space_copied) {
+				output[j] = ' ';
 				j++;
-				first_space_copied = 0;
+				first_space_copied = 1;
+			}
+			break;
+		default:
+			output[j] = input[i];
+			j++;
+			first_space_copied = 0;
 		}
 	}
 	if (j && output[j-1] == ' ') output[j-1] = 0;
@@ -3061,7 +3061,7 @@
 
 		/* 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"))))
+		        (!root->ns && (widget_ns_prefix || strcmp(root->name, "widget"))))
 			goto exit;
 
 
@@ -3183,8 +3183,8 @@
 		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))) {
+			        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;
@@ -3290,8 +3290,8 @@
 		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))) {
+			        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;
@@ -3328,8 +3328,8 @@
 				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))) {
+					        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;
@@ -3445,7 +3445,7 @@
 }
 
 
-static Bool wm_enum_widget(void *cbk, char *file_name, char *file_path)
+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;
@@ -3459,7 +3459,7 @@
 	return 0;
 }
 
-static Bool wm_enum_dir(void *cbk, char *file_name, char *file_path)
+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;
 }
@@ -3550,32 +3550,32 @@
 
 
 	{
-	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);
+		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->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);
@@ -3608,21 +3608,21 @@
 
 static void gwm_delete(GF_BaseInterface *ifce)
 {
-        GF_WidgetManager *wm;
+	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;
+	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;
+	dr->udta = NULL;
 	gf_free(dr);
 }
 #endif
@@ -3667,4 +3667,4 @@
 }
 
 
-GPAC_MODULE_STATIC_DELARATION( widgetman )
+GPAC_MODULE_STATIC_DECLARATION( widgetman )

gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/widgetman.h -> gpac-0.5.1.svn5491.tar.xz/modules/widgetman/widgetman.h Changed

@@ -1,7 +1,7 @@
 //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 
+//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
@@ -10,13 +10,13 @@
 //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. 
+//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.
 //
@@ -32,7 +32,7 @@
 
 /////////////////////////////////////////////////////////////////////////////////
 //
-//	Authors:	
+//	Authors:
 //					Jean Le Feuvre, Telecom ParisTech
 //					Cyril Concolato, Telecom ParisTech
 //
@@ -96,9 +96,9 @@
 
 enum
 {
-	GF_WPIN_STRING, 
-	GF_WPIN_INTEGER, 
-	GF_WPIN_NUMBER, 
+	GF_WPIN_STRING,
+	GF_WPIN_INTEGER,
+	GF_WPIN_NUMBER,
 };
 
 typedef struct
@@ -124,7 +124,7 @@
 
 enum
 {
-	GF_WM_PARAM_OUTPUT, 
+	GF_WM_PARAM_OUTPUT,
 	GF_WM_PARAM_INPUT,
 	GF_WM_INPUT_ACTION,
 	GF_WM_OUTPUT_TRIGGER,
@@ -143,7 +143,7 @@
 #define GF_WM_PARAM_SCRIPT_BOOL		(u16) 1
 #define GF_WM_PARAM_SCRIPT_NUMBER	(u16) 2
 
-typedef struct 
+typedef struct
 {
 	struct __widget_message *msg;
 
@@ -203,19 +203,19 @@
 	GF_WM_PREF_MIGRATE = 1<<2,
 };
 
-typedef struct 
+typedef struct
 {
 	char *name, *value;
 	u32 flags;
 	GF_WidgetPin *connectTo;
 } GF_WidgetPreference;
 
-typedef struct 
+typedef struct
 {
 	char *name, *value;
 } GF_WidgetFeatureParam;
 
-typedef struct 
+typedef struct
 {
 	char *name;
 	Bool required;
@@ -255,27 +255,27 @@
 	char *manifest_path;
 
 	GF_List *icons;
-/*
-	GF_WidgetContent *simple;
-	char *icon_url;
-*/
+	/*
+		GF_WidgetContent *simple;
+		char *icon_url;
+	*/
 	GF_WidgetContent *main;
 
 	GF_WidgetPackage *wpack;
 
 	/*misc metadata for W3C Widgets API*/
-	char *name, *shortname, *identifier, 
-		*authorName, *authorEmail, *authorHref, 
-		*description, *version, 
-		*uuid, *license, *licenseHref, *viewmodes;
-	
+	char *name, *shortname, *identifier,
+	     *authorName, *authorEmail, *authorHref,
+	     *description, *version,
+	     *uuid, *license, *licenseHref, *viewmodes;
+
 	u32 width, height;
 
 	GF_List *features;
 
 	Bool discardable, multipleInstance;
 
-	/*when a widget is being received from a remote peer, 
+	/*when a widget is being received from a remote peer,
 	we remember where we locally store it to be able to further remote it
 	This is only supported for packaged widgets*/
 	char *local_path;
@@ -312,7 +312,7 @@
 } GF_WidgetInstance;
 
 
-typedef struct 
+typedef struct
 {
 	GF_WidgetInterface *ifce;
 	GF_WidgetInstance *wid;
@@ -321,7 +321,7 @@
 	JSObject *cookie;
 } GF_WidgetInterfaceInstance;
 
-typedef struct 
+typedef struct
 {
 	GF_WidgetComponent *comp;
 	GF_WidgetInstance *wid;

gpac-0.5.0.svn5178.tar.bz2/modules/wiiis/wiiis.c -> gpac-0.5.1.svn5491.tar.xz/modules/wiiis/wiiis.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2009-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -80,7 +80,7 @@
 	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
 
@@ -100,7 +100,7 @@
 	if (opt) scan_delay = atoi(opt);
 
 	/*locate the wiimotes*/
-	count = wiiuse_find(wii->wiimotes, wii->nb_wiimotes, scan_delay); 
+	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) {
@@ -131,24 +131,24 @@
 		}
 	}
 
-	while (wii->running) { 
+	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) { 
+			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); 
+					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); 
+					gf_bs_write_int(bs, 0, 1);
 				}
 
 				/*write buttons state*/
@@ -165,13 +165,13 @@
 				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_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_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);
@@ -189,16 +189,16 @@
 				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_INSERTED:
 			case WIIUSE_NUNCHUK_REMOVED:
-			case  WIIUSE_CLASSIC_CTRL_INSERTED: 
+			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;
 }
 
@@ -217,7 +217,7 @@
 
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_INPUT_DEVICE_INTERFACE,
@@ -252,7 +252,7 @@
 	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);
@@ -261,4 +261,4 @@
 	gf_free(bi);
 }
 
-GPAC_MODULE_STATIC_DELARATION( wiiis )
\ No newline at end of file
+GPAC_MODULE_STATIC_DECLARATION( wiiis )

gpac-0.5.0.svn5178.tar.bz2/modules/x11_out/x11_out.c -> gpac-0.5.1.svn5491.tar.xz/modules/x11_out/x11_out.c Changed

@@ -1,7 +1,7 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,7 +40,7 @@
 {
 	if (xwin->overlay) XFree(xwin->overlay);
 	xwin->overlay = NULL;
-	xwin->xv_pf_format = 0;	
+	xwin->xv_pf_format = 0;
 	if (xwin->xvport>=0) {
 		XvUngrabPort(xwin->display, xwin->xvport, CurrentTime );
 		xwin->xvport = -1;
@@ -99,89 +99,90 @@
 	unsigned int nb_adaptors;
 	int selected_port;
 
-    if (XvQueryExtension(xwin->display, &i, &i, &i, &i, &i ) != Success) return -1;
-    if (XvQueryAdaptors(xwin->display, DefaultRootWindow(xwin->display), &nb_adaptors, &adaptors) != Success) return -1;
+	if (XvQueryExtension(xwin->display, &i, &i, &i, &i, &i ) != Success) return -1;
+	if (XvQueryAdaptors(xwin->display, DefaultRootWindow(xwin->display), &nb_adaptors, &adaptors) != Success) return -1;
 
-    selected_port = -1;
-    for (i=0; i < nb_adaptors; i++) {
-        XvImageFormatValues *formats;
-        int j, num_formats, port;
+	selected_port = -1;
+	for (i=0; i < nb_adaptors; i++) {
+		XvImageFormatValues *formats;
+		int j, num_formats, port;
 
-        if( !( adaptors[i].type & XvInputMask ) || !(adaptors[i].type & XvImageMask ) )
-            continue;
+		if( !( adaptors[i].type & XvInputMask ) || !(adaptors[i].type & XvImageMask ) )
+			continue;
 
-        /* Check for our format... */
-        formats = XvListImageFormats(xwin->display, adaptors[i].base_id, &num_formats);
+		/* Check for our format... */
+		formats = XvListImageFormats(xwin->display, adaptors[i].base_id, &num_formats);
 
-        for (j=0; j<num_formats && (selected_port == -1 ); j++) {
-		XvAttribute *attr;
-		int k, nb_attributes;
-		u32 pformat = X11_GetPixelFormat(formats[j].id);
+		for (j=0; j<num_formats && (selected_port == -1 ); j++) {
+			XvAttribute *attr;
+			int k, nb_attributes;
+			u32 pformat = X11_GetPixelFormat(formats[j].id);
 
-		if( !is_same_yuv(pformat, pixel_format) ) continue;
+			if( !is_same_yuv(pformat, pixel_format) ) continue;
 
-		/* Grab first port  supporting this format */
-		for (port=adaptors[i].base_id; (port < (int)(adaptors[i].base_id + adaptors[i].num_ports) ) && (selected_port == -1); port++) {
-			if (port==xwin->xvport) continue;
+			/* Grab first port  supporting this format */
+			for (port=adaptors[i].base_id; (port < (int)(adaptors[i].base_id + adaptors[i].num_ports) ) && (selected_port == -1); port++) {
+				if (port==xwin->xvport) continue;
 
-			attr = XvQueryPortAttributes(xwin->display, port, &nb_attributes);
-			for (k=0; k<nb_attributes; k++ ) {
-			        if (!strcmp(attr[k].name, "XV_COLORKEY")) {
-					const Atom ckey = XInternAtom(xwin->display, "XV_COLORKEY", False);
-					XvGetPortAttribute(xwin->display, port, ckey, &vout->overlay_color_key);
-					has_color_key = 1;
-					vout->overlay_color_key |= 0xFF000000;
-				}
-/*			        else if (!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) {
-			            const Atom paint = XInternAtom(xwin->display, "XV_AUTOPAINT_COLORKEY", False);
-			            XvSetPortAttribute(xwin->display, port, paint, 1);
+				attr = XvQueryPortAttributes(xwin->display, port, &nb_attributes);
+				for (k=0; k<nb_attributes; k++ ) {
+					if (!strcmp(attr[k].name, "XV_COLORKEY")) {
+						const Atom ckey = XInternAtom(xwin->display, "XV_COLORKEY", False);
+						XvGetPortAttribute(xwin->display, port, ckey, &vout->overlay_color_key);
+						has_color_key = 1;
+						vout->overlay_color_key |= 0xFF000000;
+					}
+					/*			        else if (!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) {
+								            const Atom paint = XInternAtom(xwin->display, "XV_AUTOPAINT_COLORKEY", False);
+								            XvSetPortAttribute(xwin->display, port, paint, 1);
+									}
+					*/
 				}
-*/			}
-			if (check_color && !has_color_key) continue;
+				if (check_color && !has_color_key) continue;
 
-			if (XvGrabPort(xwin->display, port, CurrentTime) == Success) {
-				selected_port = port;
-				xwin->xv_pf_format = formats[j].id;
+				if (XvGrabPort(xwin->display, port, CurrentTime) == Success) {
+					selected_port = port;
+					xwin->xv_pf_format = formats[j].id;
+				}
 			}
+			if (selected_port == -1 )
+				continue;
+
 		}
-		if (selected_port == -1 )
-	                continue;
- 
-       }
-        if (formats != NULL) XFree(formats);
-    }
-    if (nb_adaptors > 0) 
-	XvFreeAdaptorInfo(adaptors);
-
-   return selected_port;
+		if (formats != NULL) XFree(formats);
+	}
+	if (nb_adaptors > 0)
+		XvFreeAdaptorInfo(adaptors);
+
+	return selected_port;
 }
 static GF_Err X11_InitOverlay(GF_VideoOutput *vout, u32 VideoWidth, u32 VideoHeight)
 {
 	XWindow *xwin = (XWindow *)vout->opaque;
 	if (xwin->overlay && (VideoWidth<=xwin->overlay->width) && (VideoHeight<=xwin->overlay->height)) {
-		return GF_OK;	
+		return GF_OK;
 	}
 
 	X11_DestroyOverlay(xwin);
 
 	xwin->xvport = X11_GetXVideoPort(vout, GF_PIXEL_I420, 0);
-	if (xwin->xvport<0) 
+	if (xwin->xvport<0)
 		xwin->xvport = X11_GetXVideoPort(vout, GF_PIXEL_YUY2, 0);
 
 	if (xwin->xvport<0) {
 		return GF_NOT_SUPPORTED;
 	}
 
-        /* Create overlay image */
+	/* Create overlay image */
 	xwin->overlay = XvCreateImage(xwin->display, xwin->xvport, xwin->xv_pf_format, NULL, VideoWidth, VideoHeight);
 	if (!xwin->overlay) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Xv Overlay Creation Failure\n"));
 		return GF_IO_ERR;
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Overlay init %d x %d - pixel format %s - XV port %d\n", 
-			VideoWidth, VideoHeight, 
-			gf_4cc_to_str(vout->yuv_pixel_format), xwin->xvport ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Overlay init %d x %d - pixel format %s - XV port %d\n",
+	                                  VideoWidth, VideoHeight,
+	                                  gf_4cc_to_str(vout->yuv_pixel_format), xwin->xvport ));
 
 	return GF_OK;
 }
@@ -216,8 +217,8 @@
 		if (!xwin->overlay) return GF_IO_ERR;
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[X11] Blit surface to dest %d x %d - overlay type %s\n", dest->w, dest->h,
-					(overlay_type==0)? "none" : ((overlay_type==1) ? "Top-Level" : "ColorKey") 
-	));
+	                                   (overlay_type==0)? "none" : ((overlay_type==1) ? "Top-Level" : "ColorKey")
+	                                  ));
 
 	overlay = xwin->overlay;
 	xvport = xwin->xvport;
@@ -239,9 +240,9 @@
 		}
 		dst_dr = xwin->pixmap;
 	}
-     XvPutImage(xwin->display, xvport, dst_dr, xwin->the_gc, overlay, 
-		src->x, src->y, src->w, src->h,
-		dest->x, dest->y, dest->w, dest->h);
+	XvPutImage(xwin->display, xvport, dst_dr, xwin->the_gc, overlay,
+	           src->x, src->y, src->w, src->h,
+	           dest->x, dest->y, dest->w, dest->h);
 
 	return GF_OK;
 }
@@ -276,14 +277,14 @@
 	} else if (xWindow->use_shared_memory) {
 		XSync(xWindow->display, False);
 		XShmPutImage (xWindow->display, cur_wnd, xWindow->the_gc, xWindow->surface,
-			0, 0, dest->x, dest->y, dest->w, dest->h, True);
+		              0, 0, dest->x, dest->y, dest->w, dest->h, True);
 	} else
 #endif
 	{
 		XSync(xWindow->display, False);
 		//XRaiseWindow(xWindow->display, xWindow->wnd);
 		XPutImage (xWindow->display, cur_wnd, xWindow->the_gc, xWindow->surface,
-			0, 0, dest->x, dest->y, dest->w, dest->h);
+		           0, 0, dest->x, dest->y, dest->w, dest->h);
 	}
 	return GF_OK;
 }
@@ -299,182 +300,380 @@
 	evt->hw_code = X11Key & 0xFF;
 	switch (X11Key) {
 
-	case XK_BackSpace: evt->key_code = GF_KEY_BACKSPACE; break;
-	case XK_Tab: evt->key_code = GF_KEY_TAB; break;
+	case XK_BackSpace:
+		evt->key_code = GF_KEY_BACKSPACE;
+		break;
+	case XK_Tab:
+		evt->key_code = GF_KEY_TAB;
+		break;
 	//case XK_Linefeed: evt->key_code = GF_KEY_LINEFEED; break;
-	case XK_Clear: evt->key_code = GF_KEY_CLEAR; break;
+	case XK_Clear:
+		evt->key_code = GF_KEY_CLEAR;
+		break;
 
 	case XK_KP_Enter:
-		evt->flags = GF_KEY_EXT_NUMPAD; 
-	case XK_Return: 
-		evt->key_code = GF_KEY_ENTER; 
-		break;
-	case XK_Pause: evt->key_code = GF_KEY_PAUSE; break;
-	case XK_Caps_Lock: evt->key_code = GF_KEY_CAPSLOCK; break;
-	case XK_Scroll_Lock: evt->key_code = GF_KEY_SCROLL; break;
-	case XK_Escape: evt->key_code = GF_KEY_ESCAPE; break;
-	case XK_Delete: 
-		evt->key_code = GF_KEY_DEL; 
-		break;
-
-	case XK_Kanji: evt->key_code = GF_KEY_KANJIMODE; break;
-	case XK_Katakana: evt->key_code = GF_KEY_JAPANESEKATAKANA; break;
-	case XK_Romaji: evt->key_code = GF_KEY_JAPANESEROMAJI; break;
-	case XK_Hiragana: evt->key_code = GF_KEY_JAPANESEHIRAGANA; break;
-	case XK_Kana_Lock: evt->key_code = GF_KEY_KANAMODE; break;
-
-	case XK_Home: evt->key_code = GF_KEY_HOME; break;
-	case XK_Left: evt->key_code = GF_KEY_LEFT; break;
-	case XK_Up: evt->key_code = GF_KEY_UP; break;
-	case XK_Right: evt->key_code = GF_KEY_RIGHT; break;
-	case XK_Down: evt->key_code = GF_KEY_DOWN; break;
-	case XK_Page_Up: evt->key_code = GF_KEY_PAGEUP; break;
-	case XK_Page_Down: evt->key_code = GF_KEY_PAGEDOWN; break;
-	case XK_End: evt->key_code = GF_KEY_END; break;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+	case XK_Return:
+		evt->key_code = GF_KEY_ENTER;
+		break;
+	case XK_Pause:
+		evt->key_code = GF_KEY_PAUSE;
+		break;
+	case XK_Caps_Lock:
+		evt->key_code = GF_KEY_CAPSLOCK;
+		break;
+	case XK_Scroll_Lock:
+		evt->key_code = GF_KEY_SCROLL;
+		break;
+	case XK_Escape:
+		evt->key_code = GF_KEY_ESCAPE;
+		break;
+	case XK_Delete:
+		evt->key_code = GF_KEY_DEL;
+		break;
+
+	case XK_Kanji:
+		evt->key_code = GF_KEY_KANJIMODE;
+		break;
+	case XK_Katakana:
+		evt->key_code = GF_KEY_JAPANESEKATAKANA;
+		break;
+	case XK_Romaji:
+		evt->key_code = GF_KEY_JAPANESEROMAJI;
+		break;
+	case XK_Hiragana:
+		evt->key_code = GF_KEY_JAPANESEHIRAGANA;
+		break;
+	case XK_Kana_Lock:
+		evt->key_code = GF_KEY_KANAMODE;
+		break;
+
+	case XK_Home:
+		evt->key_code = GF_KEY_HOME;
+		break;
+	case XK_Left:
+		evt->key_code = GF_KEY_LEFT;
+		break;
+	case XK_Up:
+		evt->key_code = GF_KEY_UP;
+		break;
+	case XK_Right:
+		evt->key_code = GF_KEY_RIGHT;
+		break;
+	case XK_Down:
+		evt->key_code = GF_KEY_DOWN;
+		break;
+	case XK_Page_Up:
+		evt->key_code = GF_KEY_PAGEUP;
+		break;
+	case XK_Page_Down:
+		evt->key_code = GF_KEY_PAGEDOWN;
+		break;
+	case XK_End:
+		evt->key_code = GF_KEY_END;
+		break;
 	//case XK_Begin: evt->key_code = GF_KEY_BEGIN; break;
 
 
-	case XK_Select: evt->key_code = GF_KEY_SELECT; break;
-	case XK_Print: evt->key_code = GF_KEY_PRINTSCREEN; break;
-	case XK_Execute: evt->key_code = GF_KEY_EXECUTE; break;
-	case XK_Insert: evt->key_code = GF_KEY_INSERT; break;
-	case XK_Undo: evt->key_code = GF_KEY_UNDO; break;
+	case XK_Select:
+		evt->key_code = GF_KEY_SELECT;
+		break;
+	case XK_Print:
+		evt->key_code = GF_KEY_PRINTSCREEN;
+		break;
+	case XK_Execute:
+		evt->key_code = GF_KEY_EXECUTE;
+		break;
+	case XK_Insert:
+		evt->key_code = GF_KEY_INSERT;
+		break;
+	case XK_Undo:
+		evt->key_code = GF_KEY_UNDO;
+		break;
 	//case XK_Redo: evt->key_code = GF_KEY_BEGIN; break;
 	//case XK_Menu: evt->key_code = GF_KEY_BEGIN; break;
-	case XK_Find: evt->key_code = GF_KEY_FIND; break;
-	case XK_Cancel: evt->key_code = GF_KEY_CANCEL; break;
-	case XK_Help: evt->key_code = GF_KEY_HELP; break;
+	case XK_Find:
+		evt->key_code = GF_KEY_FIND;
+		break;
+	case XK_Cancel:
+		evt->key_code = GF_KEY_CANCEL;
+		break;
+	case XK_Help:
+		evt->key_code = GF_KEY_HELP;
+		break;
 	//case XK_Break: evt->key_code = GF_KEY_BREAK; break;
 	//case XK_Mode_switch: evt->key_code = GF_KEY_BEGIN; break;
-	case XK_Num_Lock: evt->key_code = GF_KEY_NUMLOCK; break;
-	
-	case XK_F1: evt->key_code = GF_KEY_F1; break;
-	case XK_F2: evt->key_code = GF_KEY_F2; break;
-	case XK_F3: evt->key_code = GF_KEY_F3; break;
-	case XK_F4: evt->key_code = GF_KEY_F4; break;
-	case XK_F5: evt->key_code = GF_KEY_F5; break;
-	case XK_F6: evt->key_code = GF_KEY_F6; break;
-	case XK_F7: evt->key_code = GF_KEY_F7; break;
-	case XK_F8: evt->key_code = GF_KEY_F8; break;
-	case XK_F9: evt->key_code = GF_KEY_F9; break;
-	case XK_F10: evt->key_code = GF_KEY_F10; break;
-	case XK_F11: evt->key_code = GF_KEY_F11; break;
-	case XK_F12: evt->key_code = GF_KEY_F12; break;
-	case XK_F13: evt->key_code = GF_KEY_F13; break;
-	case XK_F14: evt->key_code = GF_KEY_F14; break;
-	case XK_F15: evt->key_code = GF_KEY_F15; break;
-	case XK_F16: evt->key_code = GF_KEY_F16; break;
-	case XK_F17: evt->key_code = GF_KEY_F17; break;
-	case XK_F18: evt->key_code = GF_KEY_F18; break;
-	case XK_F19: evt->key_code = GF_KEY_F19; break;
-	case XK_F20: evt->key_code = GF_KEY_F20; break;
-	case XK_F21: evt->key_code = GF_KEY_F21; break;
-	case XK_F22: evt->key_code = GF_KEY_F22; break;
-	case XK_F23: evt->key_code = GF_KEY_F23; break;
-	case XK_F24: evt->key_code = GF_KEY_F24; break;
-
-	case XK_KP_Delete: 
-	case XK_KP_Decimal: 
-		evt->flags = GF_KEY_EXT_NUMPAD; 
-		evt->key_code = GF_KEY_COMMA; 
+	case XK_Num_Lock:
+		evt->key_code = GF_KEY_NUMLOCK;
+		break;
+
+	case XK_F1:
+		evt->key_code = GF_KEY_F1;
+		break;
+	case XK_F2:
+		evt->key_code = GF_KEY_F2;
+		break;
+	case XK_F3:
+		evt->key_code = GF_KEY_F3;
+		break;
+	case XK_F4:
+		evt->key_code = GF_KEY_F4;
+		break;
+	case XK_F5:
+		evt->key_code = GF_KEY_F5;
+		break;
+	case XK_F6:
+		evt->key_code = GF_KEY_F6;
+		break;
+	case XK_F7:
+		evt->key_code = GF_KEY_F7;
+		break;
+	case XK_F8:
+		evt->key_code = GF_KEY_F8;
+		break;
+	case XK_F9:
+		evt->key_code = GF_KEY_F9;
+		break;
+	case XK_F10:
+		evt->key_code = GF_KEY_F10;
+		break;
+	case XK_F11:
+		evt->key_code = GF_KEY_F11;
+		break;
+	case XK_F12:
+		evt->key_code = GF_KEY_F12;
+		break;
+	case XK_F13:
+		evt->key_code = GF_KEY_F13;
+		break;
+	case XK_F14:
+		evt->key_code = GF_KEY_F14;
+		break;
+	case XK_F15:
+		evt->key_code = GF_KEY_F15;
+		break;
+	case XK_F16:
+		evt->key_code = GF_KEY_F16;
+		break;
+	case XK_F17:
+		evt->key_code = GF_KEY_F17;
+		break;
+	case XK_F18:
+		evt->key_code = GF_KEY_F18;
+		break;
+	case XK_F19:
+		evt->key_code = GF_KEY_F19;
+		break;
+	case XK_F20:
+		evt->key_code = GF_KEY_F20;
+		break;
+	case XK_F21:
+		evt->key_code = GF_KEY_F21;
+		break;
+	case XK_F22:
+		evt->key_code = GF_KEY_F22;
+		break;
+	case XK_F23:
+		evt->key_code = GF_KEY_F23;
+		break;
+	case XK_F24:
+		evt->key_code = GF_KEY_F24;
+		break;
+
+	case XK_KP_Delete:
+	case XK_KP_Decimal:
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_COMMA;
 		break;
 
 	case XK_KP_Insert:
-	case XK_KP_0: 
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_0; break;
+	case XK_KP_0:
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_0;
+		break;
 	case XK_KP_End:
-	case XK_KP_1: 
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_1; break;
-	case XK_KP_Down: 
-	case XK_KP_2: 
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_2; break;
-	case XK_KP_Page_Down: 
+	case XK_KP_1:
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_1;
+		break;
+	case XK_KP_Down:
+	case XK_KP_2:
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_2;
+		break;
+	case XK_KP_Page_Down:
 	case XK_KP_3:
-		 evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_3; break;
-	case XK_KP_Left: 
-	case XK_KP_4: 
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_4; break;
-	case XK_KP_Begin: 
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_3;
+		break;
+	case XK_KP_Left:
+	case XK_KP_4:
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_4;
+		break;
+	case XK_KP_Begin:
 	case XK_KP_5:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_5; break;
-	case XK_KP_Right: 
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_5;
+		break;
+	case XK_KP_Right:
 	case XK_KP_6:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_6; break;
-	case XK_KP_Home: 
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_6;
+		break;
+	case XK_KP_Home:
 	case XK_KP_7:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_7; break;
-	case XK_KP_Up: 
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_7;
+		break;
+	case XK_KP_Up:
 	case XK_KP_8:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_8; break;
-	case XK_KP_Page_Up: 
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_8;
+		break;
+	case XK_KP_Page_Up:
 	case XK_KP_9:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_9; break;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_9;
+		break;
 	case XK_KP_Add:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_PLUS; break;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_PLUS;
+		break;
 	case XK_KP_Subtract:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_HYPHEN; break;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_HYPHEN;
+		break;
 	case XK_KP_Multiply:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_STAR; break;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_STAR;
+		break;
 	case XK_KP_Divide:
-		evt->flags = GF_KEY_EXT_NUMPAD; evt->key_code = GF_KEY_SLASH; break;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		evt->key_code = GF_KEY_SLASH;
+		break;
 
 
 	case XK_Shift_R:
 		evt->flags = GF_KEY_EXT_RIGHT;
 	case XK_Shift_L:
-		evt->key_code = GF_KEY_SHIFT; 
+		evt->key_code = GF_KEY_SHIFT;
 		break;
 	case XK_Control_R:
 		evt->flags = GF_KEY_EXT_RIGHT;
 	case XK_Control_L:
-		evt->key_code = GF_KEY_CONTROL; 
+		evt->key_code = GF_KEY_CONTROL;
 		break;
 	case XK_Alt_R:
 		evt->flags = GF_KEY_EXT_RIGHT;
 	case XK_Alt_L:
-		evt->key_code = GF_KEY_ALT; 
+		evt->key_code = GF_KEY_ALT;
 		break;
 	case XK_Super_R:
 		evt->flags = GF_KEY_EXT_RIGHT;
 	case XK_Super_L:
-		evt->key_code = GF_KEY_WIN; 
+		evt->key_code = GF_KEY_WIN;
 		break;
 
-	case XK_Menu: evt->key_code = GF_KEY_META; break;
+	case XK_Menu:
+		evt->key_code = GF_KEY_META;
+		break;
 #ifdef XK_XKB_KEYS
-	case XK_ISO_Level3_Shift: evt->key_code = GF_KEY_ALTGRAPH; break;
+	case XK_ISO_Level3_Shift:
+		evt->key_code = GF_KEY_ALTGRAPH;
+		break;
 
 #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_HYPHEN; 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 '!':
+		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_HYPHEN;
+		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;
 	default:
 		if ((X11Key>='0') && (X11Key<='9'))  evt->key_code = GF_KEY_0 + X11Key - '0';
 		else if ((X11Key>='A') && (X11Key<='Z'))  evt->key_code = GF_KEY_A + X11Key - 'A';
@@ -484,7 +683,7 @@
 			evt->hw_code = X11Key - 'a' + 'A';
 		}
 		else {
-			evt->key_code = 0; 
+			evt->key_code = 0;
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[X11] Unrecognized key %X\n", X11Key));
 		}
 		break;
@@ -494,7 +693,7 @@
 
 
 /* taken from SDL
- Ack!  XPending() actually performs a blocking read if no events available 
+ Ack!  XPending() actually performs a blocking read if no events available
 */
 static int X11_Pending(Display *display)
 {
@@ -534,52 +733,52 @@
 	XSync(xWindow->display, False);
 
 	while (X11_Pending(xWindow->display)) {
-		  XNextEvent(xWindow->display, &xevent);
-		  if (xevent.xany.window!=the_window) continue;
-		  switch (xevent.type) {
-		    /*
-		     * X11 window resized event
-		     * must inform GPAC
-		     */
-		  case ConfigureNotify:
-		    if ((unsigned int) xevent.xconfigure.width != xWindow->w_width
-			|| (unsigned int) xevent.xconfigure.height != xWindow->w_height)
-		      {
-			evt.type = GF_EVENT_SIZE;
-			xWindow->w_width = evt.size.width = xevent.xconfigure.width;
-			xWindow->w_height = evt.size.height = xevent.xconfigure.height;
-			vout->on_event(vout->evt_cbk_hdl, &evt);
-		      } else {
-			evt.type = GF_EVENT_MOVE;
-			evt.move.x = xevent.xconfigure.x;
-			evt.move.y = xevent.xconfigure.y;
-			vout->on_event(vout->evt_cbk_hdl, &evt);
-		      }
-		    break;
-		    /*
-		     * Windows need repaint
-		     */
-		  case Expose:
-		    if (xevent.xexpose.count > 0)	break;
-		    evt.type = GF_EVENT_REFRESH;
-		    vout->on_event (vout->evt_cbk_hdl, &evt);
-		    break;
-		    
-		    /* Have we been requested to quit (or another client message?) */
-		  case ClientMessage:
-		    if ( (xevent.xclient.format == 32) && (xevent.xclient.data.l[0] == xWindow->WM_DELETE_WINDOW) ) {
+		XNextEvent(xWindow->display, &xevent);
+		if (xevent.xany.window!=the_window) continue;
+		switch (xevent.type) {
+		/*
+		 * X11 window resized event
+		 * must inform GPAC
+		 */
+		case ConfigureNotify:
+			if ((unsigned int) xevent.xconfigure.width != xWindow->w_width
+			        || (unsigned int) xevent.xconfigure.height != xWindow->w_height)
+			{
+				evt.type = GF_EVENT_SIZE;
+				xWindow->w_width = evt.size.width = xevent.xconfigure.width;
+				xWindow->w_height = evt.size.height = xevent.xconfigure.height;
+				vout->on_event(vout->evt_cbk_hdl, &evt);
+			} else {
+				evt.type = GF_EVENT_MOVE_NOTIF;
+				evt.move.x = xevent.xconfigure.x;
+				evt.move.y = xevent.xconfigure.y;
+				vout->on_event(vout->evt_cbk_hdl, &evt);
+			}
+			break;
+		/*
+		 * Windows need repaint
+		 */
+		case Expose:
+			if (xevent.xexpose.count > 0)	break;
+			evt.type = GF_EVENT_REFRESH;
+			vout->on_event (vout->evt_cbk_hdl, &evt);
+			break;
+
+		/* Have we been requested to quit (or another client message?) */
+		case ClientMessage:
+			if ( (xevent.xclient.format == 32) && (xevent.xclient.data.l[0] == xWindow->WM_DELETE_WINDOW) ) {
 				memset(&evt, 0, sizeof(GF_Event));
-		      evt.type = GF_EVENT_QUIT;
-		      vout->on_event(vout->evt_cbk_hdl, &evt);
-		    }
-		    break;
-		  	
-		  case KeyPress:
-		  case KeyRelease:
-		    x11_translate_key(XKeycodeToKeysym (xWindow->display, xevent.xkey.keycode, 0), &evt.key);
+				evt.type = GF_EVENT_QUIT;
+				vout->on_event(vout->evt_cbk_hdl, &evt);
+			}
+			break;
+
+		case KeyPress:
+		case KeyRelease:
+			x11_translate_key(XKeycodeToKeysym (xWindow->display, xevent.xkey.keycode, 0), &evt.key);
 			evt.type = (xevent.type ==KeyPress) ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
 			vout->on_event (vout->evt_cbk_hdl, &evt);
-		    
+
 			if (xevent.type ==KeyPress) {
 				s32 len;
 				len = XLookupString (&xevent.xkey, (char *) keybuf, sizeof(keybuf), NULL, &state);
@@ -595,128 +794,130 @@
 			else if (evt.key.key_code==GF_KEY_META) xWindow->meta_down = (xevent.type==KeyPress) ? 1 : 0;
 
 			if ((evt.type==GF_EVENT_KEYUP) && (evt.key.key_code==GF_KEY_V) && xWindow->ctrl_down) {
-			    int sformat;
-			    unsigned long nb_bytes, overflow;
-			    unsigned char *data;
-			    Window owner;
-	   		    Atom selection, stype;
-			    Atom clipb_atom = XInternAtom(xWindow->display, "CLIPBOARD", 0);
-			    if (clipb_atom == None) break;
-    			    owner = XGetSelectionOwner(xWindow->display, clipb_atom);
-			    if ((owner == None) || (owner == the_window)) {
-			        owner = DefaultRootWindow(xWindow->display);
-			        selection = XA_CUT_BUFFER0;
-			    } else {
-			       owner = the_window;
-			       selection = XInternAtom(xWindow->display, "GPAC_TEXT_SEL", False);
-			       XConvertSelection(xWindow->display, clipb_atom, XA_STRING, selection, owner, CurrentTime);
-			    }
-
-
-			   if (XGetWindowProperty(xWindow->display, owner, selection, 0, INT_MAX/4, False, AnyPropertyType, &stype, &sformat, &nb_bytes, &overflow, &data) == Success) {
-			        if (stype == XA_STRING) {
-			            char *text = gf_malloc(sizeof(char)*(nb_bytes+1));
-			            if (text) {
-					memcpy(text, data, nb_bytes);
-			                text[nb_bytes] = 0;
-					evt.type = GF_EVENT_PASTE_TEXT;
-					evt.message.message = (const char *) text;
-					vout->on_event(vout->evt_cbk_hdl, &evt);
-					gf_free(text);
-			            }
-			        }
-			        XFree(data);
-			    }
-			}	
+				int sformat;
+				unsigned long nb_bytes, overflow;
+				unsigned char *data;
+				Window owner;
+				Atom selection, stype;
+				Atom clipb_atom = XInternAtom(xWindow->display, "CLIPBOARD", 0);
+				if (clipb_atom == None) break;
+				owner = XGetSelectionOwner(xWindow->display, clipb_atom);
+				if ((owner == None) || (owner == the_window)) {
+					owner = DefaultRootWindow(xWindow->display);
+					selection = XA_CUT_BUFFER0;
+				} else {
+					owner = the_window;
+					selection = XInternAtom(xWindow->display, "GPAC_TEXT_SEL", False);
+					XConvertSelection(xWindow->display, clipb_atom, XA_STRING, selection, owner, CurrentTime);
+				}
+
+
+				if (XGetWindowProperty(xWindow->display, owner, selection, 0, INT_MAX/4, False, AnyPropertyType, &stype, &sformat, &nb_bytes, &overflow, &data) == Success) {
+					if (stype == XA_STRING) {
+						char *text = gf_malloc(sizeof(char)*(nb_bytes+1));
+						if (text) {
+							memcpy(text, data, nb_bytes);
+							text[nb_bytes] = 0;
+							evt.type = GF_EVENT_PASTE_TEXT;
+							evt.message.message = (const char *) text;
+							vout->on_event(vout->evt_cbk_hdl, &evt);
+							gf_free(text);
+						}
+					}
+					XFree(data);
+				}
+			}
 			else if ((evt.type==GF_EVENT_KEYUP) && (evt.key.key_code==GF_KEY_C) && xWindow->ctrl_down) {
 				Atom clipb_atom = XInternAtom(xWindow->display, "CLIPBOARD", 0);
 				evt.type = GF_EVENT_COPY_TEXT;
 				if (vout->on_event(vout->evt_cbk_hdl, &evt)==GF_TRUE) {
 					const char *txt = evt.message.message;
- 					XChangeProperty(xWindow->display, DefaultRootWindow(xWindow->display), XA_CUT_BUFFER0, XA_STRING, 8, PropModeReplace, (const unsigned char *)txt, strlen(txt));
+					if (txt) {
+						XChangeProperty(xWindow->display, DefaultRootWindow(xWindow->display), XA_CUT_BUFFER0, XA_STRING, 8, PropModeReplace, (const unsigned char *)txt, strlen(txt));
+					}
 
 					if ((clipb_atom != None) && XGetSelectionOwner(xWindow->display, clipb_atom) != the_window) {
-			        		XSetSelectionOwner(xWindow->display, clipb_atom, the_window, CurrentTime);
+						XSetSelectionOwner(xWindow->display, clipb_atom, the_window, CurrentTime);
 					}
 					if (XGetSelectionOwner(xWindow->display, XA_PRIMARY) != the_window) {
 						XSetSelectionOwner(xWindow->display, XA_PRIMARY, the_window, CurrentTime);
-					}					
+					}
 				}
 			}
 			break;
-		    
-		  case ButtonPress:
-			  if (!xWindow->fullscreen && !xWindow->has_focus) {
-				  xWindow->has_focus = 1;
-				  XSetInputFocus(xWindow->display, xWindow->wnd, RevertToParent, CurrentTime);
-			  }
-		  case ButtonRelease:
-		    //				last_mouse_move = xevent.xbutton.time;
-		    evt.mouse.x = xevent.xbutton.x;
-		    evt.mouse.y = xevent.xbutton.y;
+
+		case ButtonPress:
+			if (!xWindow->fullscreen && !xWindow->has_focus) {
+				xWindow->has_focus = 1;
+				XSetInputFocus(xWindow->display, xWindow->wnd, RevertToParent, CurrentTime);
+			}
+		case ButtonRelease:
+			//				last_mouse_move = xevent.xbutton.time;
+			evt.mouse.x = xevent.xbutton.x;
+			evt.mouse.y = xevent.xbutton.y;
 			evt.type = (xevent.type == ButtonRelease) ? GF_EVENT_MOUSEUP : GF_EVENT_MOUSEDOWN;
-		    
-		    switch (xevent.xbutton.button) {
-		    case Button1:
-		      evt.mouse.button = GF_MOUSE_LEFT;
-		      vout->on_event (vout->evt_cbk_hdl, &evt);
-		      break;
-		    case Button2:
-		      evt.mouse.button = GF_MOUSE_MIDDLE;
-		      vout->on_event (vout->evt_cbk_hdl, &evt);
-		      break;
-		    case Button3:
-		      evt.mouse.button = GF_MOUSE_RIGHT;
-		      vout->on_event (vout->evt_cbk_hdl, &evt);
-		      break;
-		    case Button4:
-		      evt.type = GF_EVENT_MOUSEWHEEL;
-		      evt.mouse.wheel_pos = FIX_ONE;
-		      vout->on_event(vout->evt_cbk_hdl, &evt);
-		      break;
-		    case Button5:
-		      evt.type = GF_EVENT_MOUSEWHEEL;
-		      evt.mouse.wheel_pos = -FIX_ONE;
-		      vout->on_event(vout->evt_cbk_hdl, &evt);
-		      break;
-		    }
-		    if (!xWindow->fullscreen && (xevent.type==ButtonPress) ) 
-		      XSetInputFocus(xWindow->display, xWindow->wnd, RevertToNone, CurrentTime);
-		    break;
-		    
-		  case MotionNotify:
-		    evt.type = GF_EVENT_MOUSEMOVE;
-		    evt.mouse.x = xevent.xmotion.x;
-		    evt.mouse.y = xevent.xmotion.y;
-		    vout->on_event (vout->evt_cbk_hdl, &evt);
-		    break;
-		  case PropertyNotify:
-		    break;
-		  case MapNotify:
-		    break;
-		  case CirculateNotify:
-		    break;
-		  case UnmapNotify:
-		    break;
-		  case ReparentNotify:
-		    break;
-		  case FocusOut:
+
+			switch (xevent.xbutton.button) {
+			case Button1:
+				evt.mouse.button = GF_MOUSE_LEFT;
+				vout->on_event (vout->evt_cbk_hdl, &evt);
+				break;
+			case Button2:
+				evt.mouse.button = GF_MOUSE_MIDDLE;
+				vout->on_event (vout->evt_cbk_hdl, &evt);
+				break;
+			case Button3:
+				evt.mouse.button = GF_MOUSE_RIGHT;
+				vout->on_event (vout->evt_cbk_hdl, &evt);
+				break;
+			case Button4:
+				evt.type = GF_EVENT_MOUSEWHEEL;
+				evt.mouse.wheel_pos = FIX_ONE;
+				vout->on_event(vout->evt_cbk_hdl, &evt);
+				break;
+			case Button5:
+				evt.type = GF_EVENT_MOUSEWHEEL;
+				evt.mouse.wheel_pos = -FIX_ONE;
+				vout->on_event(vout->evt_cbk_hdl, &evt);
+				break;
+			}
+			if (!xWindow->fullscreen && (xevent.type==ButtonPress) )
+				XSetInputFocus(xWindow->display, xWindow->wnd, RevertToNone, CurrentTime);
+			break;
+
+		case MotionNotify:
+			evt.type = GF_EVENT_MOUSEMOVE;
+			evt.mouse.x = xevent.xmotion.x;
+			evt.mouse.y = xevent.xmotion.y;
+			vout->on_event (vout->evt_cbk_hdl, &evt);
+			break;
+		case PropertyNotify:
+			break;
+		case MapNotify:
+			break;
+		case CirculateNotify:
+			break;
+		case UnmapNotify:
+			break;
+		case ReparentNotify:
+			break;
+		case FocusOut:
 			if (!xWindow->fullscreen) xWindow->has_focus = 0;
-		    break;
-		  case FocusIn:
+			break;
+		case FocusIn:
 			if (!xWindow->fullscreen) xWindow->has_focus = 1;
-		    break;
-
-		  case DestroyNotify:
-			  memset(&evt, 0, sizeof(GF_Event));
-		      evt.type = GF_EVENT_QUIT;
-		      vout->on_event(vout->evt_cbk_hdl, &evt);
-		    break;
-		    
-		  default:
-		    break;
-		  }
-	 }
+			break;
+
+		case DestroyNotify:
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = GF_EVENT_QUIT;
+			vout->on_event(vout->evt_cbk_hdl, &evt);
+			break;
+
+		default:
+			break;
+		}
+	}
 
 }
 
@@ -725,94 +926,94 @@
 #ifdef GPAC_HAS_OPENGL
 static GF_Err X11_SetupGL(GF_VideoOutput *vout)
 {
-  GF_Event evt;
-  XWindow *xWin = (XWindow *)vout->opaque;
-
-  if (!xWin->glx_visualinfo) return GF_IO_ERR;
-  memset(&evt, 0, sizeof(GF_Event));
-
-  if (!xWin->glx_context) {
-	  GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[X11] Setting up GL for display %d\n", xWin->display));
-	  XSync(xWin->display, False);
-	  xWin->glx_context = glXCreateContext(xWin->display,xWin->glx_visualinfo, NULL, True);
-	  XSync(xWin->display, False);
-	  if (!xWin->glx_context) return GF_IO_ERR;
-	  if (xWin->output_3d_mode==2)  return GF_IO_ERR;
-
-	  evt.setup.hw_reset = 1;
-  }
-  if ( ! glXMakeCurrent(xWin->display, xWin->fullscreen ? xWin->full_wnd : xWin->wnd, xWin->glx_context) ) return GF_IO_ERR;
-  XSync(xWin->display, False);
-
-  evt.type = GF_EVENT_VIDEO_SETUP;
-  vout->on_event (vout->evt_cbk_hdl,&evt);
-  xWin->is_init = 1;
-  return GF_OK;
+	GF_Event evt;
+	XWindow *xWin = (XWindow *)vout->opaque;
+
+	if (!xWin->glx_visualinfo) return GF_IO_ERR;
+	memset(&evt, 0, sizeof(GF_Event));
+
+	if (!xWin->glx_context) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[X11] Setting up GL for display %d\n", xWin->display));
+		XSync(xWin->display, False);
+		xWin->glx_context = glXCreateContext(xWin->display,xWin->glx_visualinfo, NULL, True);
+		XSync(xWin->display, False);
+		if (!xWin->glx_context) return GF_IO_ERR;
+		if (xWin->output_3d_mode==2)  return GF_IO_ERR;
+
+		evt.setup.hw_reset = 1;
+	}
+	if ( ! glXMakeCurrent(xWin->display, xWin->fullscreen ? xWin->full_wnd : xWin->wnd, xWin->glx_context) ) return GF_IO_ERR;
+	XSync(xWin->display, False);
+
+	evt.type = GF_EVENT_VIDEO_SETUP;
+	vout->on_event (vout->evt_cbk_hdl,&evt);
+	xWin->is_init = 1;
+	return GF_OK;
 }
 
 static GF_Err X11_SetupGLPixmap(GF_VideoOutput *vout, u32 width, u32 height)
 {
-  XWindow *xWin = (XWindow *)vout->opaque;
-
-  if (xWin->glx_context) {
-    glXMakeCurrent(xWin->display, None, NULL);
-    glXDestroyContext(xWin->display, xWin->glx_context);
-    xWin->glx_context = NULL;
-  }
-  if (xWin->gl_offscreen) glXDestroyGLXPixmap(xWin->display, xWin->gl_offscreen);
-  xWin->gl_offscreen = 0;
-  if (xWin->gl_pixmap) XFreePixmap(xWin->display, xWin->gl_pixmap);
-  xWin->gl_pixmap = 0;
-
-  if (xWin->offscreen_type) {
-	  GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Using offscreen GL context through XWindow\n"));
-	  if (xWin->offscreen_type==2) {
+	XWindow *xWin = (XWindow *)vout->opaque;
+
+	if (xWin->glx_context) {
+		glXMakeCurrent(xWin->display, None, NULL);
+		glXDestroyContext(xWin->display, xWin->glx_context);
+		xWin->glx_context = NULL;
+	}
+	if (xWin->gl_offscreen) glXDestroyGLXPixmap(xWin->display, xWin->gl_offscreen);
+	xWin->gl_offscreen = 0;
+	if (xWin->gl_pixmap) XFreePixmap(xWin->display, xWin->gl_pixmap);
+	xWin->gl_pixmap = 0;
+
+	if (xWin->offscreen_type) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Using offscreen GL context through XWindow\n"));
+		if (xWin->offscreen_type==2) {
+			XSync(xWin->display, False);
+			XMapWindow (xWin->display, (Window) xWin->gl_wnd);
+			XSync(xWin->display, False);
+//		XSetWMNormalHints (xWin->display, xWin->gl_wnd, Hints);
+			XStoreName (xWin->display, xWin->gl_wnd, "GPAC Offscreeen Window - debug mode");
+		}
+
 		XSync(xWin->display, False);
-		XMapWindow (xWin->display, (Window) xWin->gl_wnd);
+		xWin->glx_context = glXCreateContext(xWin->display,xWin->glx_visualinfo, NULL, True);
 		XSync(xWin->display, False);
-//		XSetWMNormalHints (xWin->display, xWin->gl_wnd, Hints);
- 		XStoreName (xWin->display, xWin->gl_wnd, "GPAC Offscreeen Window - debug mode");
+		if (!xWin->glx_context) return GF_IO_ERR;
+		if ( ! glXMakeCurrent(xWin->display, xWin->gl_wnd, xWin->glx_context) ) return GF_IO_ERR;
+		XSync(xWin->display, False);
+
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Using offscreen GL context through glXPixmap\n"));
+		xWin->gl_pixmap = XCreatePixmap(xWin->display, xWin->gl_wnd, width, height, xWin->depth);
+		if (!xWin->gl_pixmap) return GF_IO_ERR;
+
+		xWin->gl_offscreen = glXCreateGLXPixmap(xWin->display, xWin->glx_visualinfo, xWin->gl_pixmap);
+		if (!xWin->gl_offscreen) return GF_IO_ERR;
+
+		XSync(xWin->display, False);
+		xWin->glx_context = glXCreateContext(xWin->display, xWin->glx_visualinfo, 0, GL_FALSE);
+		XSync(xWin->display, False);
+		if (!xWin->glx_context) return GF_IO_ERR;
+
+		XSync(xWin->display, False);
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[X11] Activating GLContext on GLPixmap - this may crash !!\n"));
+		glXMakeCurrent(xWin->display, xWin->gl_offscreen, xWin->glx_context);
 	}
 
-	  XSync(xWin->display, False);
-	  xWin->glx_context = glXCreateContext(xWin->display,xWin->glx_visualinfo, NULL, True);
-	  XSync(xWin->display, False);
-	  if (!xWin->glx_context) return GF_IO_ERR;
-	  if ( ! glXMakeCurrent(xWin->display, xWin->gl_wnd, xWin->glx_context) ) return GF_IO_ERR;
-	  XSync(xWin->display, False);
-
-  } else {
-  GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Using offscreen GL context through glXPixmap\n"));
-  xWin->gl_pixmap = XCreatePixmap(xWin->display, xWin->gl_wnd, width, height, xWin->depth);
-  if (!xWin->gl_pixmap) return GF_IO_ERR;
- 
-  xWin->gl_offscreen = glXCreateGLXPixmap(xWin->display, xWin->glx_visualinfo, xWin->gl_pixmap);
-  if (!xWin->gl_offscreen) return GF_IO_ERR;
- 
-  XSync(xWin->display, False);
-  xWin->glx_context = glXCreateContext(xWin->display, xWin->glx_visualinfo, 0, GL_FALSE);
-  XSync(xWin->display, False);
-  if (!xWin->glx_context) return GF_IO_ERR;
-
- XSync(xWin->display, False);
- GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[X11] Activating GLContext on GLPixmap - this may crash !!\n"));
- glXMakeCurrent(xWin->display, xWin->gl_offscreen, xWin->glx_context);
-  }
-
-  GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Offscreen GL context setup\n"));
-  return GF_OK;
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Offscreen GL context setup\n"));
+	return GF_OK;
 }
 
 static void X11_ReleaseGL(XWindow *xWin)
 {
-  XSync(xWin->display, False);
-  if (xWin->glx_context) {
-    glXMakeCurrent(xWin->display, None, NULL);
-    glXDestroyContext(xWin->display, xWin->glx_context);
-    xWin->glx_context = NULL;
-  }
-  xWin->is_init = 0;
-  XSync(xWin->display, False);
+	XSync(xWin->display, False);
+	if (xWin->glx_context) {
+		glXMakeCurrent(xWin->display, None, NULL);
+		glXDestroyContext(xWin->display, xWin->glx_context);
+		xWin->glx_context = NULL;
+	}
+	xWin->is_init = 0;
+	XSync(xWin->display, False);
 }
 
 #endif
@@ -849,7 +1050,7 @@
 #ifdef GPAC_HAS_X11_XV
 	X11_DestroyOverlay(xWindow);
 #endif
-	
+
 }
 
 /*
@@ -870,8 +1071,8 @@
 
 	X11_ReleaseBackBuffer(vout);
 	/*WATCHOUT seems we need even width when using shared memory extensions*/
-	if (xWindow->use_shared_memory && (VideoWidth%2)) 
-	  VideoWidth++;
+	if (xWindow->use_shared_memory && (VideoWidth%2))
+		VideoWidth++;
 
 	size = VideoWidth * VideoHeight * xWindow->bpp;
 	cur_wnd = xWindow->fullscreen ? xWindow->full_wnd : xWindow->wnd;
@@ -887,8 +1088,8 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Failed to attach shared memory!\n"));
 		}
 		xWindow->pixmap = XShmCreatePixmap(xWindow->display, cur_wnd,
-							(unsigned char *) xWindow->shmseginfo->shmaddr, xWindow->shmseginfo,
-							VideoWidth, VideoHeight, xWindow->depth);
+		                                   (unsigned char *) xWindow->shmseginfo->shmaddr, xWindow->shmseginfo,
+		                                   VideoWidth, VideoHeight, xWindow->depth);
 		memset((unsigned char *) xWindow->shmseginfo->shmaddr, 0, sizeof(char)*size);
 		XSetWindowBackgroundPixmap (xWindow->display, cur_wnd, xWindow->pixmap);
 		xWindow->pwidth = VideoWidth;
@@ -897,10 +1098,10 @@
 	} else if (xWindow->use_shared_memory) {
 		GF_SAFEALLOC(xWindow->shmseginfo, XShmSegmentInfo);
 		xWindow->surface = XShmCreateImage (xWindow->display, xWindow->visual,
-									 xWindow->depth, ZPixmap, NULL, xWindow->shmseginfo, 
-									 VideoWidth, VideoHeight);
+		                                    xWindow->depth, ZPixmap, NULL, xWindow->shmseginfo,
+		                                    VideoWidth, VideoHeight);
 		xWindow->shmseginfo->shmid = shmget(IPC_PRIVATE, xWindow->surface->bytes_per_line * xWindow->surface->height,
-									 IPC_CREAT | 0777);
+		                                    IPC_CREAT | 0777);
 
 		xWindow->surface->data = xWindow->shmseginfo->shmaddr = shmat(xWindow->shmseginfo->shmid, NULL, 0);
 		xWindow->shmseginfo->readOnly = False;
@@ -910,11 +1111,11 @@
 	{
 		char *data = (char *) gf_malloc(sizeof(char)*size);
 		xWindow->surface = XCreateImage (xWindow->display, xWindow->visual,
-				      xWindow->depth, ZPixmap,
-				      0,
-				      data,
-				      VideoWidth, VideoHeight,
-				      xWindow->bpp*8, xWindow->bpp*VideoWidth);
+		                                 xWindow->depth, ZPixmap,
+		                                 0,
+		                                 data,
+		                                 VideoWidth, VideoHeight,
+		                                 xWindow->bpp*8, xWindow->bpp*VideoWidth);
 		if (!xWindow->surface) {
 			gf_free(data);
 			return GF_IO_ERR;
@@ -948,49 +1149,64 @@
 
 	if (evt) {
 
-	switch (evt->type) {
-	case GF_EVENT_SET_CURSOR:
-		break;
-	case GF_EVENT_SET_CAPTION:
-		if (!xWindow->par_wnd) XStoreName (xWindow->display, xWindow->wnd, evt->caption.caption);
-		break;
-	case GF_EVENT_SHOWHIDE:
-		break;
-	case GF_EVENT_SIZE:
-		/*if owning the window and not in fullscreen, resize it (initial scene size)*/
-	xWindow->w_width = evt->size.width;
-	xWindow->w_height = evt->size.height;
-        
-	  if (!xWindow->fullscreen) {
-	    if (xWindow->par_wnd) {
-	      XWindowAttributes pwa;
-	      XGetWindowAttributes(xWindow->display, xWindow->par_wnd, &pwa);
-	      XMoveResizeWindow(xWindow->display, xWindow->wnd, pwa.x, pwa.y, evt->size.width, evt->size.height);
-	      if (!xWindow->no_select_input) XSetInputFocus(xWindow->display, xWindow->wnd, RevertToNone, CurrentTime);
-	    } else {
-		XResizeWindow (xWindow->display, xWindow->wnd, evt->size.width, evt->size.height);
-	    }
-	  }
-	  break;
-	case GF_EVENT_VIDEO_SETUP:
-		switch (evt->setup.opengl_mode){
+		switch (evt->type) {
+		case GF_EVENT_SET_CURSOR:
+			break;
+		case GF_EVENT_SET_CAPTION:
+			if (!xWindow->par_wnd) XStoreName (xWindow->display, xWindow->wnd, evt->caption.caption);
+			break;
+		case GF_EVENT_SHOWHIDE:
+			break;
+		case GF_EVENT_MOVE:
+			if (xWindow->fullscreen) return GF_OK;
+
+			if (evt->move.relative == 2) {
+			}
+			else if (evt->move.relative) {
+				s32 x, y;
+				Window child;
+				x = y = 0;
+				XTranslateCoordinates(xWindow->display, xWindow->wnd, RootWindowOfScreen (xWindow->screenptr), 0, 0, &x, &y, &child );
+				XMoveWindow(xWindow->display, xWindow->wnd, x + evt->move.x, y + evt->move.y);
+			} else {
+				XMoveWindow(xWindow->display, xWindow->wnd, evt->move.x, evt->move.y);
+			}
+			break;
+		case GF_EVENT_SIZE:
+			/*if owning the window and not in fullscreen, resize it (initial scene size)*/
+			xWindow->w_width = evt->size.width;
+			xWindow->w_height = evt->size.height;
+
+			if (!xWindow->fullscreen) {
+				if (xWindow->par_wnd) {
+					XWindowAttributes pwa;
+					XGetWindowAttributes(xWindow->display, xWindow->par_wnd, &pwa);
+					XMoveResizeWindow(xWindow->display, xWindow->wnd, pwa.x, pwa.y, evt->size.width, evt->size.height);
+					if (!xWindow->no_select_input) XSetInputFocus(xWindow->display, xWindow->wnd, RevertToNone, CurrentTime);
+				} else {
+					XResizeWindow (xWindow->display, xWindow->wnd, evt->size.width, evt->size.height);
+				}
+			}
+			break;
+		case GF_EVENT_VIDEO_SETUP:
+			switch (evt->setup.opengl_mode) {
 #ifdef GPAC_HAS_OPENGL
-		case 1:
-			xWindow->output_3d_mode = 1;
-			return X11_SetupGL(vout);
-		case 2:
-			xWindow->output_3d_mode = 2;
-			return X11_SetupGLPixmap(vout, evt->setup.width, evt->setup.height);
+			case 1:
+				xWindow->output_3d_mode = 1;
+				return X11_SetupGL(vout);
+			case 2:
+				xWindow->output_3d_mode = 2;
+				return X11_SetupGLPixmap(vout, evt->setup.width, evt->setup.height);
 #endif
-		case 0:
-			xWindow->output_3d_mode = 0;
-			return X11_ResizeBackBuffer(vout, evt->setup.width, evt->setup.height);
-		default:
-			return GF_NOT_SUPPORTED;
+			case 0:
+				xWindow->output_3d_mode = 0;
+				return X11_ResizeBackBuffer(vout, evt->setup.width, evt->setup.height);
+			default:
+				return GF_NOT_SUPPORTED;
+			}
 		}
-	}
 	} else {
-	  X11_HandleEvents(vout);
+		X11_HandleEvents(vout);
 	}
 	return GF_OK;
 
@@ -1016,9 +1232,9 @@
 		xWindow->the_gc = XCreateGC (xWindow->display, xWindow->full_wnd, 0, NULL);
 
 		XMoveResizeWindow (xWindow->display,
-				   (Window) xWindow->full_wnd, 0, 0,
-				   vout->max_screen_width,
-				   vout->max_screen_height);
+		                   (Window) xWindow->full_wnd, 0, 0,
+		                   vout->max_screen_width,
+		                   vout->max_screen_height);
 		*screen_width = xWindow->w_width;
 		*screen_height = xWindow->w_height;
 		XUnmapWindow (xWindow->display, xWindow->wnd);
@@ -1083,7 +1299,7 @@
 static XErrorHandler old_handler = NULL;
 static int selectinput_err = 0;
 static int X11_BadAccess_ByPass(Display * display,
-                                        XErrorEvent * event)
+                                XErrorEvent * event)
 {
 	char msg[60];
 	if (event->error_code == BadAccess)
@@ -1105,14 +1321,14 @@
 static void X11_XScreenSaverState(XWindow *xwin, Bool turn_on)
 {
 	return;
- 	if (turn_on) {
+	if (turn_on) {
 		if (!xwin->ss_t) return;
-	        XSetScreenSaver(xwin->display, xwin->ss_t, xwin->ss_i, xwin->ss_b, xwin->ss_e);
+		XSetScreenSaver(xwin->display, xwin->ss_t, xwin->ss_i, xwin->ss_b, xwin->ss_e);
 	} else {
 		/* Save state information */
 		XGetScreenSaver(xwin->display, &xwin->ss_t, &xwin->ss_i, &xwin->ss_b, &xwin->ss_e);
 		if (xwin->ss_t)
-		        XSetScreenSaver(xwin->display, 0, xwin->ss_i, xwin->ss_b, xwin->ss_e);
+			XSetScreenSaver(xwin->display, 0, xwin->ss_i, xwin->ss_b, xwin->ss_e);
 	}
 }
 
@@ -1124,7 +1340,7 @@
 {
 	X11VID ();
 	const char *sOpt;
-        Bool autorepeat, supported;
+	Bool autorepeat, supported;
 
 	xWindow->display = XOpenDisplay (NULL);
 	xWindow->screennum = DefaultScreen (xWindow->display);
@@ -1138,7 +1354,7 @@
 		Float screenHeight = (Float)XHeightOfScreen(xWindow->screenptr);
 		Float screenHeightIn = (Float)XHeightMMOfScreen(xWindow->screenptr) / 25.4f;
 		vout->dpi_x = (u32)(screenWidth / screenWidthIn);
-		vout->dpi_y = (u32)(screenHeight / screenHeightIn);	
+		vout->dpi_y = (u32)(screenHeight / screenHeightIn);
 	}
 
 	switch (xWindow->depth) {
@@ -1158,7 +1374,7 @@
 	xWindow->bpp = xWindow->depth / 8;
 	xWindow->bpp = xWindow->bpp == 3 ? 4 : xWindow->bpp;
 
-xWindow->screennum=0;
+	xWindow->screennum=0;
 	vout->max_screen_width = DisplayWidth(xWindow->display, xWindow->screennum);
 	vout->max_screen_height = DisplayHeight(xWindow->display, xWindow->screennum);
 	vout->max_screen_bpp = 8;
@@ -1167,24 +1383,24 @@
 	 * Full screen wnd
 	 */
 	xWindow->full_wnd = XCreateWindow (xWindow->display,
-								   RootWindowOfScreen (xWindow->screenptr),
-								   0, 0,
-								   vout->max_screen_width,
-								   vout->max_screen_height, 0,
-								   xWindow->depth, InputOutput,
-								   xWindow->visual, 0, NULL);
+	                                   RootWindowOfScreen (xWindow->screenptr),
+	                                   0, 0,
+	                                   vout->max_screen_width,
+	                                   vout->max_screen_height, 0,
+	                                   xWindow->depth, InputOutput,
+	                                   xWindow->visual, 0, NULL);
 
 	XSelectInput(xWindow->display, xWindow->full_wnd,
-					FocusChangeMask | ExposureMask | PointerMotionMask | ButtonReleaseMask | ButtonPressMask | KeyPressMask | KeyReleaseMask);
+	             FocusChangeMask | ExposureMask | PointerMotionMask | ButtonReleaseMask | ButtonPressMask | KeyPressMask | KeyReleaseMask);
 
 	if (!xWindow->par_wnd) {
 		xWindow->w_width = 320;
 		xWindow->w_height = 240;
 		xWindow->wnd = XCreateWindow (xWindow->display,
-					   RootWindowOfScreen(xWindow->screenptr), 0, 0,
-					   xWindow->w_width, xWindow->w_height, 0,
-					   xWindow->depth, InputOutput,
-					   xWindow->visual, 0, NULL);
+		                              RootWindowOfScreen(xWindow->screenptr), 0, 0,
+		                              xWindow->w_width, xWindow->w_height, 0,
+		                              xWindow->depth, InputOutput,
+		                              xWindow->visual, 0, NULL);
 		XMapWindow (xWindow->display, (Window) xWindow->wnd);
 	} else {
 		XWindowAttributes pwa;
@@ -1192,9 +1408,9 @@
 		xWindow->w_width = pwa.width;
 		xWindow->w_height = pwa.height;
 		xWindow->wnd = XCreateWindow (xWindow->display, xWindow->par_wnd, pwa.x, pwa.y,
-					xWindow->w_width, xWindow->w_height, 0,
-					   xWindow->depth, InputOutput,
-					   xWindow->visual, 0, NULL);
+		                              xWindow->w_width, xWindow->w_height, 0,
+		                              xWindow->depth, InputOutput,
+		                              xWindow->visual, 0, NULL);
 		XMapWindow (xWindow->display, (Window) xWindow->wnd);
 	}
 
@@ -1204,15 +1420,15 @@
 	old_handler = XSetErrorHandler(X11_BadAccess_ByPass);
 	selectinput_err = 0;
 	XSelectInput(xWindow->display, xWindow->wnd,
-		FocusChangeMask | StructureNotifyMask | PropertyChangeMask | ExposureMask |
-		PointerMotionMask | ButtonReleaseMask | ButtonPressMask |
-		KeyPressMask | KeyReleaseMask);
+	             FocusChangeMask | StructureNotifyMask | PropertyChangeMask | ExposureMask |
+	             PointerMotionMask | ButtonReleaseMask | ButtonPressMask |
+	             KeyPressMask | KeyReleaseMask);
 	XSync(xWindow->display, False);
 	XSetErrorHandler(old_handler);
 	if (selectinput_err) {
-	       	XSelectInput(xWindow->display, xWindow->wnd,
-			StructureNotifyMask | PropertyChangeMask | ExposureMask |
-			KeyPressMask | KeyReleaseMask);
+		XSelectInput(xWindow->display, xWindow->wnd,
+		             StructureNotifyMask | PropertyChangeMask | ExposureMask |
+		             KeyPressMask | KeyReleaseMask);
 
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Cannot select input focus\n"));
 	}
@@ -1234,6 +1450,13 @@
 	Hints->flags |= USPosition;
 	XSetWMNormalHints (xWindow->display, xWindow->full_wnd, Hints);
 
+	{
+		XClassHint hint;
+		hint.res_name = "gpac";
+		hint.res_class = "gpac";
+		XSetClassHint(xWindow->display, xWindow->wnd, &hint);
+	}
+
 	autorepeat = 1;
 	XkbSetDetectableAutoRepeat(xWindow->display, autorepeat, &supported);
 
@@ -1241,18 +1464,18 @@
 	if (xWindow->init_flags & GF_TERM_WINDOW_NO_DECORATION) {
 #define PROP_MOTIF_WM_HINTS_ELEMENTS 5
 #define MWM_HINTS_DECORATIONS (1L << 1)
-	  struct {
-	    unsigned long flags;
-	    unsigned long functions;
-	    unsigned long decorations;
-	    long inputMode;
-	    unsigned long status;
-	  } hints = {2, 0, 0, 0, 0};
+		struct {
+			unsigned long flags;
+			unsigned long functions;
+			unsigned long decorations;
+			long inputMode;
+			unsigned long status;
+		} hints = {2, 0, 0, 0, 0};
 
-	  hints.flags = MWM_HINTS_DECORATIONS;
-	  hints.decorations = 0;
+		hints.flags = MWM_HINTS_DECORATIONS;
+		hints.decorations = 0;
 
-	  XChangeProperty(xWindow->display, xWindow->wnd, XInternAtom(xWindow->display,"_MOTIF_WM_HINTS", False), XInternAtom(xWindow->display, "_MOTIF_WM_HINTS", False), 32, PropModeReplace, (unsigned char *)&hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
+		XChangeProperty(xWindow->display, xWindow->wnd, XInternAtom(xWindow->display,"_MOTIF_WM_HINTS", False), XInternAtom(xWindow->display, "_MOTIF_WM_HINTS", False), 32, PropModeReplace, (unsigned char *)&hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
 
 	}
 
@@ -1261,16 +1484,16 @@
 
 #ifdef GPAC_HAS_X11_SHM
 	sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "UseHardwareMemory");
-        if (sOpt && !strcmp(sOpt, "yes")) {
-	  int XShmMajor, XShmMinor;
-	  Bool XShmPixmaps;
-	  if (XShmQueryVersion(xWindow->display, &XShmMajor, &XShmMinor, &XShmPixmaps)) {
-		xWindow->use_shared_memory = 1;
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Using X11 Shared Memory\n"));
-		if ((XShmPixmaps==True) && (XShmPixmapFormat(xWindow->display)==ZPixmap)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] X11 Shared Memory Pixmaps available\n"));
+	if (sOpt && !strcmp(sOpt, "yes")) {
+		int XShmMajor, XShmMinor;
+		Bool XShmPixmaps;
+		if (XShmQueryVersion(xWindow->display, &XShmMajor, &XShmMinor, &XShmPixmaps)) {
+			xWindow->use_shared_memory = 1;
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Using X11 Shared Memory\n"));
+			if ((XShmPixmaps==True) && (XShmPixmapFormat(xWindow->display)==ZPixmap)) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] X11 Shared Memory Pixmaps available\n"));
+			}
 		}
-	  }
 	}
 
 #endif
@@ -1305,7 +1528,7 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[X11] Using XV Offscreen YUV2RGB acceleration\n"));
 		}
 #endif
-	} 
+	}
 #endif
 
 	XSetWindowAttributes xsw;
@@ -1316,7 +1539,7 @@
 
 	xsw.override_redirect = True;
 	XChangeWindowAttributes(xWindow->display, xWindow->full_wnd,
-				CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWWinGravity, &xsw);
+	                        CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWWinGravity, &xsw);
 
 	if (!xWindow->par_wnd) {
 		xWindow->WM_DELETE_WINDOW = XInternAtom (xWindow->display, "WM_DELETE_WINDOW", False);
@@ -1337,108 +1560,108 @@
 		ev.xclient.data.l[1] = CurrentTime;
 		mask = SubstructureRedirectMask;
 		XSendEvent (xWindow->display,RootWindowOfScreen (xWindow->screenptr), False,
-			    mask, &ev);
+		            mask, &ev);
 	}
 
 	/*openGL setup*/
 #ifdef GPAC_HAS_OPENGL
 	{
-	  int attribs[64];
-	  int i, nb_bits, nb_depth_bits;
-
-	  sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "GLNbBitsPerComponent");
-	  /* Most outputs are 24/32 bits these days, use 8 bits per channel instead of 5, works better on MacOS X */
-	  nb_bits = sOpt ? atoi(sOpt) : 8;
-          if (!sOpt){
-             gf_modules_set_option((GF_BaseInterface *)vout, "Video", "GLNbBitsPerComponent", "8");
-          }
+		int attribs[64];
+		int i, nb_bits, nb_depth_bits;
+
+		sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "GLNbBitsPerComponent");
+		/* Most outputs are 24/32 bits these days, use 8 bits per channel instead of 5, works better on MacOS X */
+		nb_bits = sOpt ? atoi(sOpt) : 8;
+		if (!sOpt) {
+			gf_modules_set_option((GF_BaseInterface *)vout, "Video", "GLNbBitsPerComponent", "8");
+		}
 retry_8bpp:
-	  i=0;
-	  if (nb_bits>8) {
-		  attribs[i++] = GLX_DRAWABLE_TYPE;
-		  attribs[i++] =  GLX_WINDOW_BIT;
-		  attribs[i++] = GLX_RENDER_TYPE;
-		  attribs[i++] = GLX_RGBA_BIT;
-	  } else {
-		  attribs[i++] = GLX_RGBA;
-	  }
-	  attribs[i++] = GLX_RED_SIZE;
-	  attribs[i++] = nb_bits;
-	  attribs[i++] = GLX_GREEN_SIZE;
-	  attribs[i++] = nb_bits;
-	  attribs[i++] = GLX_BLUE_SIZE;
-	  attribs[i++] = nb_bits;
-	  if (nb_bits==10) {
-		  attribs[i++] = GLX_ALPHA_SIZE;
-		  attribs[i++] = 2;
-	  }
-
- 	  sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "GLNbBitsDepth");
-	  nb_depth_bits = sOpt ? atoi(sOpt) : 16;
-          if (!sOpt){
-             gf_modules_set_option((GF_BaseInterface *)vout, "Video", "GLNbBitsDepth", "16");
-          }
-	  if (nb_bits) {
-		  attribs[i++] = GLX_DEPTH_SIZE;
-		  attribs[i++] = nb_depth_bits;
-	  }
-	  sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "UseGLDoubleBuffering");
-          if (!sOpt){
-             gf_modules_set_option((GF_BaseInterface *)vout, "Video", "UseGLDoubleBuffering", "yes");
-          }
-	  if (!sOpt || !strcmp(sOpt, "yes")) {
-	  	  attribs[i++] = GLX_DOUBLEBUFFER;
-	  	  attribs[i++] = True;
-	  }
-          attribs[i++] = None;
-
- 	  if (nb_bits>8) {
-		int fbcount=0;
-		GLXFBConfig *fb=NULL;
-		typedef GLXFBConfig * (* FnGlXChooseFBConfigProc)( Display *, int, int const *,int * );
-		typedef XVisualInfo * (* FnGlXGetVisualFromFBConfigProc)( Display *, GLXFBConfig );
-		typedef int (* FnGlXGetFBConfigAttrib) (Display *  dpy,  GLXFBConfig  config,  int  attribute,  int *  value);
-
-
-		FnGlXChooseFBConfigProc my_glXChooseFBConfig = (FnGlXChooseFBConfigProc) glXGetProcAddress((GLubyte*) "glXChooseFBConfig");
-		FnGlXGetVisualFromFBConfigProc my_glXGetVisualFromFBConfig = (FnGlXGetVisualFromFBConfigProc)glXGetProcAddress((GLubyte*) "glXGetVisualFromFBConfig");
-		FnGlXGetFBConfigAttrib my_glXGetFBConfigAttrib = (FnGlXGetFBConfigAttrib)glXGetProcAddress((GLubyte*) "glXGetFBConfigAttrib");
-
-		if (my_glXChooseFBConfig && my_glXGetVisualFromFBConfig) {
-			fb = my_glXChooseFBConfig(xWindow->display, xWindow->screennum, attribs, &fbcount);
+		i=0;
+		if (nb_bits>8) {
+			attribs[i++] = GLX_DRAWABLE_TYPE;
+			attribs[i++] =  GLX_WINDOW_BIT;
+			attribs[i++] = GLX_RENDER_TYPE;
+			attribs[i++] = GLX_RGBA_BIT;
+		} else {
+			attribs[i++] = GLX_RGBA;
+		}
+		attribs[i++] = GLX_RED_SIZE;
+		attribs[i++] = nb_bits;
+		attribs[i++] = GLX_GREEN_SIZE;
+		attribs[i++] = nb_bits;
+		attribs[i++] = GLX_BLUE_SIZE;
+		attribs[i++] = nb_bits;
+		if (nb_bits==10) {
+			attribs[i++] = GLX_ALPHA_SIZE;
+			attribs[i++] = 2;
 		}
 
-		if (fbcount==0) {
-			  GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Failed to choose GLX config for 10 bit depth - retrying with 8 bit depth\n"));
-			  nb_bits = 8;
-			goto retry_8bpp;
+		sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "GLNbBitsDepth");
+		nb_depth_bits = sOpt ? atoi(sOpt) : 16;
+		if (!sOpt) {
+			gf_modules_set_option((GF_BaseInterface *)vout, "Video", "GLNbBitsDepth", "16");
+		}
+		if (nb_bits) {
+			attribs[i++] = GLX_DEPTH_SIZE;
+			attribs[i++] = nb_depth_bits;
 		}
-		xWindow->glx_visualinfo = my_glXGetVisualFromFBConfig(xWindow->display, fb[0]);
-
-		if (my_glXGetFBConfigAttrib && fb) {
-			int r, g, b;
-			glXGetFBConfigAttrib(xWindow->display, fb[0], GLX_RED_SIZE, &r);
-			glXGetFBConfigAttrib(xWindow->display, fb[0], GLX_GREEN_SIZE, &g);
-			glXGetFBConfigAttrib(xWindow->display, fb[0], GLX_BLUE_SIZE, &b);
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[GLX] Configured display asked %d bits got r:%d g:%d b:%d bits\n", nb_bits, r, g, b));
+		sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "UseGLDoubleBuffering");
+		if (!sOpt) {
+			gf_modules_set_option((GF_BaseInterface *)vout, "Video", "UseGLDoubleBuffering", "yes");
+		}
+		if (!sOpt || !strcmp(sOpt, "yes")) {
+			attribs[i++] = GLX_DOUBLEBUFFER;
+			attribs[i++] = True;
+		}
+		attribs[i++] = None;
+
+		if (nb_bits>8) {
+			int fbcount=0;
+			GLXFBConfig *fb=NULL;
+			typedef GLXFBConfig * (* FnGlXChooseFBConfigProc)( Display *, int, int const *,int * );
+			typedef XVisualInfo * (* FnGlXGetVisualFromFBConfigProc)( Display *, GLXFBConfig );
+			typedef int (* FnGlXGetFBConfigAttrib) (Display *  dpy,  GLXFBConfig  config,  int  attribute,  int *  value);
+
+
+			FnGlXChooseFBConfigProc my_glXChooseFBConfig = (FnGlXChooseFBConfigProc) glXGetProcAddress((GLubyte*) "glXChooseFBConfig");
+			FnGlXGetVisualFromFBConfigProc my_glXGetVisualFromFBConfig = (FnGlXGetVisualFromFBConfigProc)glXGetProcAddress((GLubyte*) "glXGetVisualFromFBConfig");
+			FnGlXGetFBConfigAttrib my_glXGetFBConfigAttrib = (FnGlXGetFBConfigAttrib)glXGetProcAddress((GLubyte*) "glXGetFBConfigAttrib");
+
+			if (my_glXChooseFBConfig && my_glXGetVisualFromFBConfig) {
+				fb = my_glXChooseFBConfig(xWindow->display, xWindow->screennum, attribs, &fbcount);
+			}
+
+			if (fbcount==0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Failed to choose GLX config for 10 bit depth - retrying with 8 bit depth\n"));
+				nb_bits = 8;
+				goto retry_8bpp;
+			}
+			xWindow->glx_visualinfo = my_glXGetVisualFromFBConfig(xWindow->display, fb[0]);
+
+			if (my_glXGetFBConfigAttrib && fb) {
+				int r, g, b;
+				glXGetFBConfigAttrib(xWindow->display, fb[0], GLX_RED_SIZE, &r);
+				glXGetFBConfigAttrib(xWindow->display, fb[0], GLX_GREEN_SIZE, &g);
+				glXGetFBConfigAttrib(xWindow->display, fb[0], GLX_BLUE_SIZE, &b);
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[GLX] Configured display asked %d bits got r:%d g:%d b:%d bits\n", nb_bits, r, g, b));
+			}
+		} else {
+			xWindow->glx_visualinfo = glXChooseVisual(xWindow->display, xWindow->screennum, attribs);
+		}
+		vout->max_screen_bpp = nb_bits;
+
+		if (!xWindow->glx_visualinfo) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Error selecting GL display\n"));
 		}
- 	  } else {
-		  xWindow->glx_visualinfo = glXChooseVisual(xWindow->display, xWindow->screennum, attribs);
-	  }
-	  vout->max_screen_bpp = nb_bits;
-
-	  if (!xWindow->glx_visualinfo) {
-		  GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Error selecting GL display\n"));
-	  }
 	}
 
 	xWindow->gl_wnd = XCreateWindow (xWindow->display, RootWindowOfScreen (xWindow->screenptr),
-								   0,
-								   0,
-								   200,
-								   200, 0,
-								   xWindow->depth, InputOutput,
-								   xWindow->visual, 0, NULL);
+	                                 0,
+	                                 0,
+	                                 200,
+	                                 200, 0,
+	                                 xWindow->depth, InputOutput,
+	                                 xWindow->visual, 0, NULL);
 
 	XSync(xWindow->display, False);
 	XUnmapWindow(xWindow->display, (Window) xWindow->gl_wnd);
@@ -1447,12 +1670,12 @@
 	sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "X113DOffscreenMode");
 	if (!sOpt)
 		gf_modules_set_option((GF_BaseInterface *)vout, "Video", "X113DOffscreenMode", "Pixmap");
-        if (sOpt && !strcmp(sOpt, "Window")) {
+	if (sOpt && !strcmp(sOpt, "Window")) {
 		xWindow->offscreen_type = 1;
-        } else if (sOpt && !strcmp(sOpt, "VisibleWindow")) {
+	} else if (sOpt && !strcmp(sOpt, "VisibleWindow")) {
 		xWindow->offscreen_type = 2;
 		XSetWMNormalHints (xWindow->display, xWindow->gl_wnd, Hints);
-       } else if (sOpt && !strcmp(sOpt, "Pixmap")) {
+	} else if (sOpt && !strcmp(sOpt, "Pixmap")) {
 		xWindow->offscreen_type = 0;
 	} else {
 		xWindow->offscreen_type = 0;
@@ -1495,7 +1718,7 @@
 	}
 #ifdef GPAC_HAS_OPENGL
 	if (xWindow->glx_visualinfo)
-	  XFree(xWindow->glx_visualinfo);
+		XFree(xWindow->glx_visualinfo);
 	xWindow->glx_visualinfo = NULL;
 #endif
 	XFreeGC (xWindow->display, xWindow->the_gc);
@@ -1558,7 +1781,7 @@
  * interface query
  */
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 		GF_VIDEO_OUTPUT_INTERFACE,
@@ -1594,4 +1817,4 @@
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( x11_out )
+GPAC_MODULE_STATIC_DECLARATION( x11_out )

gpac-0.5.0.svn5178.tar.bz2/modules/x11_out/x11_out.h -> gpac-0.5.1.svn5491.tar.xz/modules/x11_out/x11_out.h Changed

@@ -1,7 +1,7 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #ifndef _X11_OUT_H
@@ -65,7 +65,7 @@
 #endif
 
 #define X11VID()	XWindow *xWindow = (XWindow *)vout->opaque;
-        
+
 #define RGB555(r,g,b) (((r&248)<<7) + ((g&248)<<2)  + (b>>3))
 #define RGB565(r,g,b) (((r&248)<<8) + ((g&252)<<3)  + (b>>3))
 
@@ -88,13 +88,13 @@
 
 	Bool use_shared_memory;	//
 	/*screensaver state*/
-        int ss_t, ss_b, ss_i, ss_e;
+	int ss_t, ss_b, ss_i, ss_e;
 
 #ifdef GPAC_HAS_X11_SHM
 	XShmSegmentInfo *shmseginfo;
 #endif
 
-	/*YUV overlay*/	
+	/*YUV overlay*/
 #ifdef GPAC_HAS_X11_XV
 	int xvport;
 	u32 xv_pf_format;
@@ -126,7 +126,7 @@
 } XWindow;
 
 void StretchBits (void *dst, u32 dst_bpp, u32 dst_w, u32 dst_h, u32 dst_pitch,
-	     void *src, u32 src_bpp, u32 src_w, u32 src_h, u32 src_pitch, Bool FlipIt);
+                  void *src, u32 src_bpp, u32 src_w, u32 src_h, u32 src_pitch, Bool FlipIt);
 
 
 #endif /* _X11_OUT_H */

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_dec.c -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -85,7 +85,7 @@
 	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;
@@ -166,14 +166,14 @@
 		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)
@@ -224,7 +224,7 @@
 		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "XviD", "Threaded");
 		capability->cap.valueInt = (sOpt && stricmp(sOpt, "yes")) ? 1 : 0;
 	}
-		break;
+	break;
 	/*not known at our level...*/
 	case GF_CODEC_CU_DURATION:
 	default:
@@ -238,11 +238,11 @@
 	/*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,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -336,7 +336,12 @@
 	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'; }
+	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) {
@@ -352,7 +357,7 @@
 	switch (mmlevel) {
 	case GF_CODEC_LEVEL_SEEK:
 	case GF_CODEC_LEVEL_DROP:
-		if (ES_ID == ctx->base_ES_ID) 
+		if (ES_ID == ctx->base_ES_ID)
 			*outBufferLength = 0;
 		break;
 	default:
@@ -401,7 +406,7 @@
 	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")
@@ -451,7 +456,7 @@
 		}
 	}
 
-	/*setup our own interface*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = XVID_AttachStream;
 	ifcd->DetachStream = XVID_DetachStream;
 	ifcd->GetCapabilities = XVID_GetCapabilities;
@@ -475,7 +480,7 @@
 
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -483,11 +488,11 @@
 #endif
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewXVIDDec();
@@ -500,11 +505,11 @@
 {
 	switch (ifce->InterfaceType) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE: 
+	case GF_MEDIA_DECODER_INTERFACE:
 		DeleteXVIDDec((GF_BaseDecoder*)ifce);
 		break;
 #endif
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( xvid )
+GPAC_MODULE_STATIC_DECLARATION( xvid )

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_dec_wce.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_dec_wce.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -141,7 +141,7 @@
 		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "XviD", "Threaded");
 		capability->cap.valueInt = (sOpt && stricmp(sOpt, "yes")) ? 1 : 0;
 	}
-		break;
+	break;
 	/*not known at our level...*/
 	case GF_CODEC_CU_DURATION:
 	default:
@@ -155,11 +155,11 @@
 	/*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,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
+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;
@@ -235,13 +235,13 @@
 
 	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*/	
+	/*setup our own interface*/
 	ifcd->AttachStream = XVID_AttachStream;
 	ifcd->DetachStream = XVID_DetachStream;
 	ifcd->GetCapabilities = XVID_GetCapabilities;
@@ -268,7 +268,7 @@
 #endif
 
 GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
+const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -276,11 +276,11 @@
 #endif
 		0
 	};
-	return si; 
+	return si;
 }
 
 GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *) NewXVIDDec();
 	return NULL;
@@ -290,13 +290,13 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE: 
+	case GF_MEDIA_DECODER_INTERFACE:
 		DeleteXVIDDec((GF_BaseDecoder *)ifce);
 		break;
 	}
 }
 
-GPAC_MODULE_STATIC_DELARATION( xvid_dec_wce )
+GPAC_MODULE_STATIC_DECLARATION( xvid_dec_wce )
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/CodecAPI.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/CodecAPI.cpp Changed

@@ -1,6 +1,6 @@
 //----------------------------
 // Symbian codec API
-// 
+//
 //----------------------------
 #include "rules.h"
 #include "global.h"
@@ -16,99 +16,99 @@
 
 //----------------------------
 
-struct S_decoder{
-   xvid_dec_frame_t xvid_dec_frame;
-   dword size_x;
-   void *dec_handle;
+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;
+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;
+	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;
+	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;
+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){
+int DecodeFrame(void *handle, const void *buf, dword sz_in, byte *&y, byte *&u, byte *&v, dword &pitch) {
 
-   S_decoder *dec = (S_decoder*)handle;
+	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);
+	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;
+	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;
+	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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/Rules.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/Rules.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/bitstream.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/bitstream.cpp Changed

@@ -33,133 +33,133 @@
 
 //----------------------------
 
-inline dword ByteSwap(dword a){
-   return (a<<24) | ((a&0xff00) << 8) | ((a&0xff0000) >> 8) | (a>>24);
+inline dword ByteSwap(dword a) {
+	return (a<<24) | ((a&0xff00) << 8) | ((a&0xff0000) >> 8) | (a>>24);
 }
 
 //----------------------------
 
-void Bitstream::Init(const void *bitstream, dword _length){
+void Bitstream::Init(const void *bitstream, dword _length) {
 
-   dword adjbitstream = (dword)bitstream;
+	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;
+	/*
+	 * 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;
+	if(_length) {
+		dword tmp = *start;
 #ifndef ARCH_IS_BIG_ENDIAN
-      tmp = ByteSwap(tmp);
+		tmp = ByteSwap(tmp);
 #endif
-      bufa = tmp;
-      if(_length>4){
-         tmp = *(start + 1);
+		bufa = tmp;
+		if(_length>4) {
+			tmp = *(start + 1);
 #ifndef ARCH_IS_BIG_ENDIAN
-         tmp = ByteSwap(tmp);
+			tmp = ByteSwap(tmp);
 #endif
-         bufb = tmp;
-      }else
-         bufb = 0;
-   }else
-      bufa = bufb = 0;
-
-   buf = 0;
-   pos = initpos = bitpos*8;
-   length = _length;
+			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){
+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);
+	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){
+void Bitstream::Skip(dword bits) {
 
-   pos += bits;
-   if(pos >= 32){
-      dword tmp;
+	pos += bits;
+	if(pos >= 32) {
+		dword tmp;
 
-      bufa = bufb;
-      tmp = *((dword *) tail + 2);
+		bufa = bufb;
+		tmp = *((dword *) tail + 2);
 #ifndef ARCH_IS_BIG_ENDIAN
-      tmp = ByteSwap(tmp);
+		tmp = ByteSwap(tmp);
 #endif
-      bufb = tmp;
-      tail++;
-      pos -= 32;
-   }
+		bufb = tmp;
+		tail++;
+		pos -= 32;
+	}
 }
 
 //---------------------------
 /* show nbits from next byte alignment */
-dword Bitstream::ShowBitsFromByteAlign(int bits){
+dword Bitstream::ShowBitsFromByteAlign(int bits) {
 
-   int bspos = pos + NumBitsToByteAlign();
-   int nbit = (bits + bspos) - 32;
+	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);
-   }
+	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;
+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,
+	32,                     /* never use */
+	13,
+	15,
+	17,
+	19,
+	21,
+	23,
+	1,
 };
 
 //----------------------------
 
-void Bitstream::get_matrix(byte * matrix){
+void Bitstream::get_matrix(byte * matrix) {
 
-   int i = 0;
-   int last, value = 0;
+	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 */
+	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;
-   }
+	while (i < 64) {
+		matrix[scan_tables[0][i++]] = last;
+	}
 }
 
 //----------------------------
@@ -168,265 +168,265 @@
  * 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;
+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 */
-      }
-   }
+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);  /* */
-      }
-   }
+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);  /* */
+		}
+	}
 }
 
 //----------------------------
@@ -437,667 +437,667 @@
 #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;
-               
+                                    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;
+				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;
+				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;
+				(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 */
+				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);
-               }
-            }
+			{
+				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);
-               
+		}
+		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--;
+				time_inc_resolution--;
 #endif
-               
-               if(time_inc_resolution > 0){
-                  time_inc_bits = log2bin(time_inc_resolution-1);
-               }else{
+
+				if(time_inc_resolution > 0) {
+					time_inc_bits = log2bin(time_inc_resolution-1);
+				} else {
 #if 0
-                  time_inc_bits = 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);
-            }
-         }
-      }
-   }
+					/* 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");
+	DPRINTF("*** WARNING: no vop_start_code found");
 #endif
-   return -1;                 //ignore it
+	return -1;                 //ignore it
 }
 
 //----------------------------

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/decoder.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/decoder.cpp Changed

@@ -52,257 +52,257 @@
 
 //----------------------------
 
-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 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){
+int decoder_create(xvid_dec_create_t *create) {
 
-   if(XVID_VERSION_MAJOR(create->version) != 1)   /* v1.x.x */
-      return XVID_ERR_VERSION;
+	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;
+	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);
+	return dec->Init(create);
 }
 
 //----------------------------
 
 S_decoder::S_decoder(xvid_dec_create_t *create):
 #ifdef PROFILE
-   prof(*create->prof),
+	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)
+	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));
+	MemSet(&p_fmv, 0, sizeof(p_fmv));
+	MemSet(&p_bmv, 0, sizeof(p_bmv));
 }
 
 //----------------------------
 
-S_decoder::~S_decoder(){
+S_decoder::~S_decoder() {
 
-   xvid_free(last_mbs);
-   xvid_free(mbs);
+	xvid_free(last_mbs);
+	xvid_free(mbs);
 
-                              //image based GMC
-   image_destroy(&gmc, edged_width, edged_height);
+	//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);
+	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){
+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;
-   }
+	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;
+	create->handle = this;
 
-   width = create->width;
-   height = create->height;
+	width = create->width;
+	height = create->height;
 
-   cur.Null();
-   refn[0].Null();
-   refn[1].Null();
-   tmp.Null();
-   qtmp.Null();
+	cur.Null();
+	refn[0].Null();
+	refn[1].Null();
+	tmp.Null();
+	qtmp.Null();
 
-                              //image based GMC
-   gmc.Null();
+	//image based GMC
+	gmc.Null();
 
 
-   mbs = NULL;
-   last_mbs = NULL;
+	mbs = NULL;
+	last_mbs = NULL;
 
-   init_mpeg_matrix(mpeg_quant_matrices);
+	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;
+	//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);
+	fixed_dimensions = (width > 0 && height > 0);
 
-   init_vlc_tables();
-   idct_int32_init();
+	init_vlc_tables();
+	idct_int32_init();
 
-   if(fixed_dimensions)
-      return Resize();
-   return 0;
+	if(fixed_dimensions)
+		return Resize();
+	return 0;
 }
 
 //----------------------------
 
 static const int dquant_table[4] = {
-   -1, -2, 1, 2
+	-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;
+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;
 }
 
 //---------------------------
@@ -314,737 +314,731 @@
 #else
 void XVID_ClearMatrix(void *dst);
 #ifndef USE_ARM_ASM
-inline void XVID_ClearMatrix(void *dst){ MemSet(dst, 0, 64 * sizeof(int)); }
+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);
-   }
+                        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::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);
+                                      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){
+inline int gmc_sanitize(int value, int quarterpel, int fcode) {
 
-   int length = 1 << (fcode+4);
+	int length = 1 << (fcode+4);
 
 #if 0
-   if (quarterpel) value *= 2;
+	if (quarterpel) value *= 2;
 #endif
 
-   if (value < -length)
-      return -length;
-   else if (value >= length)
-      return length-1;
-   else return value;
+	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){
+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;
+	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);
+	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;
+	NEW_GMC_DATA *gmc_data = &new_gmc_data;
 
-   pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv;
+	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);
+	//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->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;
+	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);
+	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::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){
+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 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;
+	const VECTOR pmv = get_pmv2(mbs, mb_width, bound, x, y, k);
+	VECTOR mv;
 
-   mv.x = bs->GetMoveVector(fcode);
-   mv.y = bs->GetMoveVector(fcode);
+	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);
+	//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;
+	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.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;
-   }
+	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;
+	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);
+                        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){
+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);
+	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);
+	int mv_x = bs->GetMoveVector(fcode);
+	int mv_y = bs->GetMoveVector(fcode);
 
-   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_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;
+	if (mv_y < low)
+		mv_y += range;
+	else if (mv_y > high)
+		mv_y -= range;
 
-   mv->x = mv_x;
-   mv->y = mv_y;
+	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);
+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);
+static int get_dbquant(Bitstream * bs) {
+	if (!bs->GetBit())     /*  '0' */
+		return (0);
+	else if (!bs->GetBit())   /* '10' */
+		return (-2);
+	else                    /* '11' */
+		return (2);
 }
 
 //----------------------------
@@ -1056,155 +1050,155 @@
  * 001      2
  * 0001     3
  */
-static int get_mbtype(Bitstream * bs){
-   int mb_type;
+static int get_mbtype(Bitstream * bs) {
+	int mb_type;
 
-   for (mb_type = 0; mb_type <= 3; mb_type++)
-      if (bs->GetBit())
-         return (mb_type);
+	for (mb_type = 0; mb_type <= 3; mb_type++)
+		if (bs->GetBit())
+			return (mb_type);
 
-   return -1;
+	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);
+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);
 }
 
 //----------------------------
@@ -1225,223 +1219,220 @@
 
 //----------------------------
 
-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);
-   */
+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;
-   }
+	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;
+	//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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/decoder.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/decoder.h Changed

@@ -38,223 +38,223 @@
  ****************************************************************************/
 
 /* 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 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{
+struct S_decoder {
 private:
 #ifdef PROFILE
-   mutable C_profiler &prof;
+mutable C_profiler &prof;
 #endif
 
-   int Resize();
+int Resize();
 
 //----------------------------
-   void SetEdges(IMAGE &img) const;
+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 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 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 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 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 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);
+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 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);
+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;
+void idct_int32_init();
+void InverseDiscreteCosineTransform(int *block) const;
 
-   friend int decoder_create(xvid_dec_create_t *create);
+friend int decoder_create(xvid_dec_create_t *create);
 
-   int Init(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));
-   }
+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;
-
-   /*
+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
+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];
+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
+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);
+void init_vlc_tables();
+int Decode(xvid_dec_frame_t * frame, xvid_dec_stats_t * stats);
 };
 
 /*****************************************************************************

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/font.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/font.cpp Changed

@@ -33,473 +33,531 @@
 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,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,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,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},
+	{	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},
+	{	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,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,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,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,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,
+		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,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,
+		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,
+		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,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,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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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,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,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,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,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,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,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,
+		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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	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},
+	{	1,1,1,1,
+		0,0,0,1,
+		0,0,1,0,
+		0,1,0,0,
+		1,0,0,0,
+		1,1,1,1
+	},
 
 };
 
@@ -507,76 +565,82 @@
 
 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},
+	{	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},
+	{	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,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,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,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}
+	{	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){
+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)]){
+	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){
+void IMAGE::Print(int edged_width, int height, int x, int y, const char *buf) {
 
 	int i;

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/global.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/global.h Changed

@@ -36,13 +36,19 @@
 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; }
+inline void Swap(T &l, T &r) {
+T tmp = r;
+r = l;
+l = tmp;
+}
 
 #ifndef __SYMBIAN32__
 
-enum TLeave{ ELeave };
+enum TLeave { ELeave };
 void *operator new(size_t sz, TLeave);
-inline void operator delete(void *vp, TLeave){ operator delete(vp); }
+inline void operator delete(void *vp, TLeave) {
+	operator delete(vp);
+}
 
 #endif
 
@@ -96,21 +102,21 @@
 
 //----------------------------
 // convert mpeg-4 coding type i/p/b/s_VOP to XVID_TYPE_xxx
-inline int coding2type(int coding_type){
-   return coding_type + 1;
+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;
+inline int type2coding(int xvid_type) {
+	return xvid_type - 1;
 }
 
 
 typedef struct
 {
-   int x;
-   int y;
+	int x;
+	int y;
 }
 VECTOR;
 
@@ -118,7 +124,7 @@
 
 typedef struct
 {
-   VECTOR duv[3];
+	VECTOR duv[3];
 }
 WARPPOINTS;
 
@@ -129,217 +135,217 @@
 
 /* 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 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 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{
+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);
+	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;
-   }
+	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);
+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);
+	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);
-      }
-   }
+	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));
-   }
+	inline dword Pos() const {
+		return((dword)(8*((dword)tail - (dword)start) + pos - initpos));
+	}
 
-   dword GetBits(const dword n);
+	dword GetBits(const dword n);
 
 //----------------------------
 // read single bit from bitstream
-   inline dword GetBit(){
-      return GetBits(1);
-   }
+	inline dword GetBit() {
+		return GetBits(1);
+	}
 
 //----------------------------
 
-   int GetMcbpcInter();
-   int GetCbpy(int intra);
-   int GetMoveVector(int fcode);
+	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();
+	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];
+struct MACROBLOCK {
+	/* decoder/encoder */
+	VECTOR mvs[4];
 
-   int pred_values[6][MBPRED_SIZE];
-   int acpred_directions[6];
+	int pred_values[6][MBPRED_SIZE];
+	int acpred_directions[6];
 
-   int mode;
-   int quant;              /* absolute quant */
+	int mode;
+	int quant;              /* absolute quant */
 
-   int field_dct;
-   int field_pred;
-   int field_for_top;
-   int field_for_bot;
+	int field_dct;
+	int field_pred;
+	int field_for_top;
+	int field_for_bot;
 
-   /* encoder specific */
+	/* encoder specific */
 
-   VECTOR mv16;
-   VECTOR pmvs[4];
-   VECTOR qmvs[4];            /* mvs in quarter pixel resolution */
+	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 sad8[4];        /* SAD values for inter4v-VECTORs */
+	int sad16;          /* SAD value for inter-VECTOR */
 
-   int dquant;
-   int cbp;
+	int dquant;
+	int cbp;
 
-   /* bframe stuff */
+	/* bframe stuff */
 
-   VECTOR b_mvs[4];
-   VECTOR b_qmvs[4];
+	VECTOR b_mvs[4];
+	VECTOR b_qmvs[4];
 
-   int mb_type;
+	int mb_type;
 
-   /*
-    * stuff for block based ME (needed for Qpel ME)
-    * backup of last integer ME vectors/sad
-    */
+	/*
+	 * 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;
+	VECTOR amv; /* average motion vectors from GMC  */
+	int mcsel;
 
-/* This structure has become way to big! What to do? Split it up?   */
+	/* This structure has become way to big! What to do? Split it up?   */
 
 };
 
 //----------------------------
 
-inline dword log2bin(dword value){
-   int n = 0;
+inline dword log2bin(dword value) {
+	int n = 0;
 
-   while (value) {
-      value >>= 1;
-      n++;
-   }
-   return n;
+	while (value) {
+		value >>= 1;
+		n++;
+	}
+	return n;
 }
 
 //----------------------------

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/gmc.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/gmc.cpp Changed

@@ -34,363 +34,379 @@
  * of pixel 0,0), not the macroblock one.
  * Conversely, *dst is the macroblock top-left adress.
  */
-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_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;
-   }
+                          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 );
+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_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;
-   }
+                              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){
+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);
+	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? */
-      
+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
+		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;
-   }
+		{
+			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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/gmc.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/gmc.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/idct.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/idct.cpp Changed

@@ -79,132 +79,132 @@
 #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)
+          __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{
+void S_decoder::InverseDiscreteCosineTransform(int *block) const {
 
-   const t_clip_val *iclp = iclip + 512;
+	const t_clip_val *iclp = iclip + 512;
 #if defined USE_ARM_ASM
-   void InverseDiscreteCosineTransform_ARM(int *block, const int *iclip);
-   InverseDiscreteCosineTransform_ARM(block, iclp);
+	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];
-   }
+	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(){
+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);
+	t_clip_val *iclp = iclip + 512;
+	for(int i = -512; i < 512; i++)
+		iclp[i] = (i < -256) ? -256 : ((i > 255) ? 255 : i);
 }
 
 //----------------------------

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/image.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/image.cpp Changed

@@ -38,68 +38,68 @@
 
 //----------------------------
 
-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;
+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_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);
+void IMAGE::Swap(IMAGE *image2) {
+	::Swap(y, image2->y);
+	::Swap(u, image2->u);
+	::Swap(v, image2->v);
 }
 
 //----------------------------
@@ -111,31 +111,31 @@
 
 #else
 
-void XVID_MemCpy(void *dst, const void *src, dword count){
-   assert(!(dword(dst)&3));
-   assert(!(dword(count)&3));
+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)
-      : 
-      );
+	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);
+	MemCpy(dst, src, count);
 #endif
 }
 
@@ -143,148 +143,148 @@
 
 //---------------------------
 
-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);
+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_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;
+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 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){
+void IMAGE::Clear(int width, int height, int edged_width, int y, int u, int v) {
 
-   byte * p;
-   int i;
+	byte * p;
+	int i;
 
-   p = IMAGE::y;
-   for(i = 0; i < height; i++){
-      MemSet(p, y, width);
-      p += edged_width;
-   }
+	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::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;
-   }
+	p = IMAGE::v;
+	for(i = 0; i < height/2; i++) {
+		MemSet(p, v, width/2);
+		p += edged_width/2;
+	}
 }
 
 //----------------------------
@@ -292,65 +292,65 @@
    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);
-         }
-      }
+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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/interpolate8x8.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/interpolate8x8.cpp Changed

@@ -29,489 +29,489 @@
 
 //----------------------------
 
-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_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 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 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;
-   }
+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){
+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)
-         );
-   }
+	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);
-      }
-   }
+	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
 }
 
@@ -521,127 +521,127 @@
 
 #ifndef _ARM_
 
-void interpolate8x8_halfpel_v(byte *dst, const byte *src, dword stride, bool rounding){
+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)
-         );
-   }
+	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);
-      }
-   }
+	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
@@ -652,221 +652,221 @@
 
 #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);
-      }
-   }
+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 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 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 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 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 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);
+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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/interpolate8x8.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/interpolate8x8.h Changed

@@ -38,17 +38,17 @@
 typedef INTERPOLATE8X8_AVG4 *INTERPOLATE8X8_AVG4_PTR;
 
 typedef void (INTERPOLATE_LOWPASS) (byte *dst,
-									   byte *src,
-									   int stride,
-									   int rounding);
+                                    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);
+                                       byte *dst2,
+                                       byte *src,
+                                       int stride,
+                                       int rounding);
 
 typedef INTERPOLATE_LOWPASS_HV *INTERPOLATE_LOWPASS_HV_PTR;
 
@@ -57,12 +57,12 @@
 typedef INTERPOLATE8X8_6TAP_LOWPASS *INTERPOLATE8X8_6TAP_LOWPASS_PTR;
 
 #ifdef _ARM_                  //PPC
-extern"C"{
+extern"C" {
 #endif
 
-INTERPOLATE8X8 interpolate8x8_halfpel_h;
-INTERPOLATE8X8 interpolate8x8_halfpel_hv;
-INTERPOLATE8X8 interpolate8x8_halfpel_v;
+	INTERPOLATE8X8 interpolate8x8_halfpel_h;
+	INTERPOLATE8X8 interpolate8x8_halfpel_hv;
+	INTERPOLATE8X8 interpolate8x8_halfpel_v;
 
 #ifdef _ARM_
 }
@@ -86,7 +86,7 @@
 //    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){
+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);
@@ -94,7 +94,7 @@
 	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){
+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);

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/mbcoding.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/mbcoding.cpp Changed

@@ -33,328 +33,328 @@
  * VLC tables and other constant arrays
  ****************************************************************************/
 
-struct VLC_TABLE{
-   VLC vlc;
-   EVENT event;
+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}}
-   }
+	/* 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
-      }
-   }
+	{
+		/* 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,
-      }
-   }
+	{
+		/* 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,
+		}
+	}
 };
 
 /******************************************************************
@@ -362,10 +362,11 @@
  ******************************************************************/
 
 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} };
+	{ 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}
+};
 
 
 /******************************************************************
@@ -373,285 +374,285 @@
  ******************************************************************/
 
 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}
+	{-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}
+	{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}
+	{-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}
+	{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}
+	{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}
+	{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},
+	{0, 0}, {4, 3}, {3, 3}, {0, 3},
+	{2, 2}, {2, 2}, {1, 2}, {1, 2},
 };
 
 //---------------------------
 #define LEVELOFFSET 32
 
-int Bitstream::bs_get_spritetrajectory(){
+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;
+	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;
-      }
-   }
-   }
-   */
+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;
+	   }
+	}
+	}
+	*/
 }
 
 
@@ -666,270 +667,270 @@
  * for BVOP addbits == max(fcode,bcode) - 1
  * returns true or false
  */
-int Bitstream::check_resync_marker(int addbits){
+int Bitstream::check_resync_marker(int addbits) {
 
-   dword nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + addbits;
-   dword nbits = NumBitsToByteAlign();
-   dword code = ShowBits(nbits);
+	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;
+	if(code == (((dword)1 << (nbits - 1)) - 1)) {
+		return ShowBitsFromByteAlign(nbitsresyncmarker) == RESYNC_MARKER;
+	}
+	return 0;
 }
 
 //----------------------------
 
-int Bitstream::get_mcbpc_intra(){
+int Bitstream::get_mcbpc_intra() {
 
-   dword index;
+	dword index;
 
-   index = ShowBits(9);
-   index >>= 3;
+	index = ShowBits(9);
+	index >>= 3;
 
-   Skip(mcbpc_intra_table[index].len);
+	Skip(mcbpc_intra_table[index].len);
 
-   return mcbpc_intra_table[index].code;
+	return mcbpc_intra_table[index].code;
 
 }
 
 //----------------------------
 
-int Bitstream::GetMcbpcInter(){
+int Bitstream::GetMcbpcInter() {
 
-   dword index = MIN(ShowBits(9), 256);
-   Skip(mcbpc_inter_table[index].len);
+	dword index = MIN(ShowBits(9), 256);
+	Skip(mcbpc_inter_table[index].len);
 
-   return mcbpc_inter_table[index].code;
+	return mcbpc_inter_table[index].code;
 }
 
 //----------------------------
 
-int Bitstream::GetCbpy(int intra){
+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;
+	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){
+static int get_mv_data(Bitstream * bs) {
 
-   if(bs->GetBit())
-      return 0;
+	if(bs->GetBit())
+		return 0;
 
-   dword index = bs->ShowBits(12);
+	dword index = bs->ShowBits(12);
 
-   if(index >= 512){
-      index = (index >> 8) - 2;
-      bs->Skip(TMNMVtab0[index].len);
-      return TMNMVtab0[index].code;
-   }
+	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;
-   }
+	if (index >= 128) {
+		index = (index >> 2) - 32;
+		bs->Skip(TMNMVtab1[index].len);
+		return TMNMVtab1[index].code;
+	}
 
-   index -= 4;
+	index -= 4;
 
-   bs->Skip(TMNMVtab2[index].len);
-   return TMNMVtab2[index].code;
+	bs->Skip(TMNMVtab2[index].len);
+	return TMNMVtab2[index].code;
 }
 
 //----------------------------
 
-int Bitstream::GetMoveVector(int fcode){
+int Bitstream::GetMoveVector(int fcode) {
 
-   int scale_fac = 1 << (fcode - 1);
-   int data = get_mv_data(this);
+	int scale_fac = 1 << (fcode - 1);
+	int data = get_mv_data(this);
 
-   if(scale_fac == 1 || data == 0)
-      return data;
+	if(scale_fac == 1 || data == 0)
+		return data;
 
-   int res = GetBits(fcode - 1);
-   int mv = ((ABS(data) - 1) * scale_fac) + res + 1;
+	int res = GetBits(fcode - 1);
+	int mv = ((ABS(data) - 1) * scale_fac) + res + 1;
 
-   return data < 0 ? -mv : mv;
+	return data < 0 ? -mv : mv;
 }
 
 //----------------------------
 
-int Bitstream::get_dc_dif(dword dc_size){
+int Bitstream::get_dc_dif(dword dc_size) {
 
-   int code = GetBits(dc_size);
-   int msb = code >> (dc_size - 1);
+	int code = GetBits(dc_size);
+	int msb = code >> (dc_size - 1);
 
-   if (msb == 0)
-      return (-1 * (code ^ ((1 << dc_size) - 1)));
+	if (msb == 0)
+		return (-1 * (code ^ ((1 << dc_size) - 1)));
 
-   return code;
+	return code;
 
 }
 
 //----------------------------
 
-int Bitstream::get_dc_size_lum(){
+int Bitstream::get_dc_size_lum() {
 
-   int code = ShowBits(11);
+	int code = ShowBits(11);
 
-   for(int i = 11; i > 3; i--) {
-      if (code == 1) {
-         Skip(i);
-         return i + 1;
-      }
-      code >>= 1;
-   }
+	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;
+	Skip(dc_lum_tab[code].len);
+	return dc_lum_tab[code].code;
 
 }
 
 //----------------------------
 
-int Bitstream::get_dc_size_chrom(){
+int Bitstream::get_dc_size_chrom() {
 
-   dword code, i;
+	dword code, i;
 
-   code = ShowBits(12);
+	code = ShowBits(12);
 
-   for (i = 12; i > 2; i--) {
-      if (code == 1) {
-         Skip(i);
-         return i;
-      }
-      code >>= 1;
-   }
+	for (i = 12; i > 2; i--) {
+		if (code == 1) {
+			Skip(i);
+			return i;
+		}
+		code >>= 1;
+	}
 
-   return 3 - GetBits(2);
+	return 3 - GetBits(2);
 
 }
 
 //----------------------------
 
-int S_decoder::get_coeff(Bitstream *bs, int *run, int *last, int intra, int short_video_header){
+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;
+	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(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(bs->ShowBits(7) != ESCAPE) {
+		reverse_event = &DCT3D[intra][bs->ShowBits(12)];
 
-      if((level = reverse_event->event.level) == 0)
-         goto error;
+		if((level = reverse_event->event.level) == 0)
+			goto error;
 
-      *last = reverse_event->event.last;
-      *run  = reverse_event->event.run;
+		*last = reverse_event->event.last;
+		*run  = reverse_event->event.run;
 
-      bs->Skip(reverse_event->len);
+		bs->Skip(reverse_event->len);
 
-      return bs->GetBits(1) ? -level : level;
-   }
+		return bs->GetBits(1) ? -level : level;
+	}
 
-   bs->Skip(7);
+	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;
-   }
+	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);
+	mode = bs->ShowBits(2);
+	if(mode < 3) {
+		bs->Skip((mode == 2) ? 2 : 1);
 
-      reverse_event = &DCT3D[intra][bs->ShowBits(12)];
+		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((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
+		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;
+	return (level << 20) >> 20;
 
 error:
-   *run = VLC_ERROR;
-   return 0;
+	*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_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);
+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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/mbprediction.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/mbprediction.cpp Changed

@@ -38,304 +38,359 @@
 #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);
+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){
+inline int rescale(int predict_quant, int current_quant, int coeff) {
 
-   if(!coeff)
-      return 0;
-   return Divide(coeff * predict_quant, current_quant);
+	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
+	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]);
-   }
+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];
-      }
-   }
+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
+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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/mbprediction.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/mbprediction.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/mem_align.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/mem_align.cpp Changed

@@ -49,7 +49,7 @@
 
 #include "Rules.h"
 
-void *xvid_malloc(long size, dword alignment){
+void *xvid_malloc(long size, dword alignment) {
 
 	byte *mem_ptr;
 
@@ -57,9 +57,9 @@
 	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];
+		//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) */
@@ -73,14 +73,14 @@
 
 		/* 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];
+		//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)));
+			    (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
@@ -111,7 +111,7 @@
  *
  ****************************************************************************/
 
-void xvid_free(void *mem_ptr){
+void xvid_free(void *mem_ptr) {
 
 	if(!mem_ptr)
 		return;
@@ -125,7 +125,7 @@
 
 	/* Free the memory */
 	//free(ptr);
-   delete[] ptr;
+	delete[] ptr;
 }
 
 //----------------------------

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/mem_transfer.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/mem_transfer.cpp Changed

@@ -47,21 +47,21 @@
  *    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;
-   }
+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;
+	}
 }
 
 //----------------------------
@@ -74,22 +74,22 @@
  *    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;
-   }
+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_
@@ -103,87 +103,86 @@
  *    SRC (8bit) = SRC
  *    DST (8bit) = SRC
  */
-void transfer8x8_copy(byte *dst, const byte *src, dword stride){
+void transfer8x8_copy(byte *dst, const byte *src, dword stride) {
 
-   assert(!(stride&3));
-   assert(!(dword(dst)&3));
+	assert(!(stride&3));
+	assert(!(dword(dst)&3));
 #if defined USE_ARM_ASM && 1
-   int y, tmp, tmp1;
+	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"
+	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"
+	    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"
+	    "\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)
-      );
+	    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;
-      }
-   }
+	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
@@ -195,33 +194,36 @@
 
 #include <e32base.h>
 
-void MemSet(void *dst, byte c, dword len){
-   Mem::Fill(dst, len, c);
+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);
+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);
+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); }
+dword StrLen(const char *cp) {
+	return User::StringLength((const byte*)cp);
+}
 
 //----------------------------
 
-void Fatal(const char *msg, dword code){
+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);
+	int len = StrLen(msg);
+	TBuf16<20> desc;
+	desc.Copy(TPtr8((byte*)msg, Min(len, 20), len));
+	User::Panic(desc, code);
 }
 
 
@@ -231,48 +233,48 @@
 #include <memory.h>
 #include <stdio.h>
 
-void MemSet(void *dst, byte c, dword len){
-   memset(dst, c, len);
+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);
+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);
+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;
+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){
+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);
+	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);
+	char buf[256];
+	sprintf(buf, "%i (%i)", msg, code);
+	MessageBox(NULL, buf, "Fatal error", MB_OK | MB_ICONERROR);
 #endif
-   exit(1);
+	exit(1);
 }
 
 //----------------------------

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/mem_transfer.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/mem_transfer.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/portab.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/portab.h Changed

@@ -78,20 +78,20 @@
  | 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
-     */
+/*
+ * 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){}
+inline void DPRINTF(int level, char *fmt, int p=0) {}
 
 #endif
 
@@ -112,17 +112,17 @@
  */
 #    ifdef _DEBUG
 
-        /* Needed for all debuf fprintf calls */
+/* 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);
-      }
-  }
+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) {}
@@ -130,28 +130,28 @@
 
 #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.
-       */
+/*
+ * 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 */
+/* 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);
-   }
+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){}
+inline void DPRINTF(int level, char *format, int p=0) {}
 #endif //_DEBUG
 
 #define ByteSwap(a) \

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/quant_h263.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/quant_h263.cpp Changed

@@ -29,57 +29,55 @@
 //----------------------------
 /* 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){
+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);
+	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++;
+	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);
-      }
-   }
+		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){
+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);
+	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++;
+	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);
-      }
-   }
+		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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/quant_matrix.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/quant_matrix.cpp Changed

@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 static const byte default_intra_matrix[64] = {
-	 8, 17, 18, 19, 21, 23, 25, 27,
+	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,
@@ -59,19 +59,19 @@
 
 //----------------------------
 
-const byte *get_default_intra_matrix(){
+const byte *get_default_intra_matrix() {
 	return default_intra_matrix;
 }
 
 //----------------------------
 
-const byte *get_default_inter_matrix(){
+const byte *get_default_inter_matrix() {
 	return default_inter_matrix;
 }
 
 //----------------------------
 
-void set_intra_matrix(dword *mpeg_quant_matrices, const byte *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;
@@ -89,14 +89,14 @@
 
 //----------------------------
 
-void set_inter_matrix(dword *mpeg_quant_matrices, const byte *matrix){
+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++){
+	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]);
@@ -106,7 +106,7 @@
 
 //----------------------------
 
-void init_mpeg_matrix(dword *mpeg_quant_matrices){
+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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/quant_matrix.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/quant_matrix.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/quant_mpeg.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/quant_mpeg.cpp Changed

@@ -32,34 +32,32 @@
  *
  * 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){
+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);
+	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;
-   }
+	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];
+	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 <= 2048 ? -level : -2048);
+		} else {
+			dword level = coeff[i];
 
-         level = (level * intra_matrix[i] * quant) >> 3;
-         data[i] = (level <= 2047 ? level : 2047);
-      }
-   }
+			level = (level * intra_matrix[i] * quant) >> 3;
+			data[i] = (level <= 2047 ? level : 2047);
+		}
+	}
 }
 
 //----------------------------
@@ -67,31 +65,30 @@
  * 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){
+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);
+	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];
+	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;
-   }
+			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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/reduced.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/reduced.cpp Changed

@@ -64,102 +64,102 @@
 
 #define ADD(dst,src)  (dst) = CLIP((dst)+(src), 0, 255)
 
-inline void Filter_31(byte *Dst1, byte *Dst2, const int *Src1, const int *Src2){
+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);
+	/* 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);
+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);
+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){
+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);
+	/* 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){
+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);
+	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]);
+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
 
@@ -167,29 +167,29 @@
  * horizontal and vertical deblocking
  *--------------------------------------------------------------------------*/
 
-void hfilter_31(byte *Src1, byte *Src2, int Nb_Blks){
+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;
-  }
+	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;
-  }
+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.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/vlc_codes.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/vlc_codes.h Changed

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/xvid.cpp -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/xvid.cpp Changed

@@ -49,17 +49,17 @@
  ****************************************************************************/
 
 
-static int xvid_gbl_init(xvid_gbl_init_t * init){
-   //unsigned int cpu_flags;
+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 (XVID_VERSION_MAJOR(init->version) != 1)
+		return XVID_ERR_VERSION;
 
 #if defined(_DEBUG)
-    xvid_debug = init->debug;
+	xvid_debug = init->debug;
 #endif
 
-    return 0;
+	return 0;
 }
 
 /*****************************************************************************
@@ -72,21 +72,21 @@
  *
  ****************************************************************************/
 
-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;
-   }
+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;
+	}
 }
 
 /*****************************************************************************
@@ -98,57 +98,60 @@
  *                   else returns the wrapped function result
  *
  ****************************************************************************/
-int xvid_decore(void *handle, int opt, void *param1, void *param2){
+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);
+	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_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);
+	case XVID_DEC_DECODE:
+		return ((S_decoder*)handle)->Decode((xvid_dec_frame_t *) param1, (xvid_dec_stats_t*) param2);
 
-   default:
-      return XVID_ERR_FAIL;
-   }
+	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}
+	/* 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
+	}
 };
 
 //----------------------------
@@ -161,22 +164,22 @@
 #    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);
-   }
+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){
+inline void DPRINTF(int level, char *fmt, int p) {
 }
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/xvid_wce/xvid.h -> gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/xvid.h Changed

@@ -39,24 +39,24 @@
 #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,
+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
@@ -119,7 +119,7 @@
  * error codes
  ****************************************************************************/
 
-	/*	all functions return values <0 indicate error */
+/*	all functions return values <0 indicate error */
 
 #define XVID_ERR_FAIL		-1		/* general fault */
 #define XVID_ERR_MEMORY		-2		/* memory allocation error */
@@ -253,17 +253,17 @@
 int xvid_global(void *handle, int opt, void *param1, void *param2);
 
 
-class C_xvid_image{
+class C_xvid_image {
 public:
-   byte *y;
-   byte *u;
-   byte *v;
-
-   C_xvid_image():
-      y(NULL),
-      u(NULL),
-      v(NULL)
-   {}
+	byte *y;
+	byte *u;
+	byte *v;
+
+	C_xvid_image():
+		y(NULL),
+		u(NULL),
+		v(NULL)
+	{}
 };
 
 void * InitCodec(dword sx, dword sy, dword fcc);
@@ -290,7 +290,7 @@
 	int height;    /* [in:opt] image width */
 	void *handle; /* [out]	   decore context handle */
 #ifdef PROFILE
-   C_profiler *prof;
+	C_profiler *prof;
 #endif
 } xvid_dec_create_t;
 
@@ -306,7 +306,7 @@
 	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;
+	const C_xvid_image *img_out;
 } xvid_dec_frame_t;

gpac-0.5.0.svn5178.tar.bz2/packagers/win32_64/nsis/gpac_installer.nsi -> gpac-0.5.1.svn5491.tar.xz/packagers/win32_64/nsis/gpac_installer.nsi Changed

@@ -245,8 +245,8 @@
 lbl_done:
 FunctionEnd
 
-;osmo4 install
-Section "Osmo4/GPAC Player" SecOsmo4
+;GPAC core
+Section "GPAC Core" SecGPAC
   SectionIn RO
   SetOutPath $INSTDIR
 
@@ -255,23 +255,35 @@
   File /oname=Changelog.txt "${GPAC_ROOT}\Changelog"
   File "${GPAC_ROOT}\doc\configuration.html"
   File "${GPAC_ROOT}\doc\gpac.mp4"
-
-  !ifndef IS_WIN64
-  File "${GPAC_BIN}\Osmo4.exe"
-  !endif
   File "${GPAC_ROOT}\doc\osmo4.ico"
   File "${GPAC_BIN}\libgpac.dll"
-  File "${GPAC_BIN}\gm_dummy_in.dll"
-  File "${GPAC_BIN}\gm_dx_hw.dll"
   File "${GPAC_BIN}\js.dll"
-  File "${GPAC_BIN}\gm_gpac_js.dll"
   File "${GPAC_BIN}\libeay32.dll"
   File "${GPAC_BIN}\ssleay32.dll"
-  File "${GPAC_BIN}\gm_ismacryp.dll"
 
   ;create default cache
   SetOutPath $INSTDIR\cache
 
+  SetOutPath $INSTDIR
+  
+  ${WriteRegStrAuth} HKCU "SOFTWARE\GPAC" "InstallDir" "$INSTDIR"
+  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC" "DisplayName" "GPAC (remove only)"
+  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC" "UninstallString" "$INSTDIR\uninstall.exe"
+  WriteUninstaller "uninstall.exe"
+
+SectionEnd
+
+;player install
+Section "GPAC Player" SecOsmo4
+  SectionIn 1
+
+  !ifndef IS_WIN64
+  File "${GPAC_BIN}\Osmo4.exe"
+  !endif
+  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
@@ -286,12 +298,6 @@
   File /r /x .svn ${GPAC_ROOT}\gui\extensions\*
 
   SetOutPath $INSTDIR
-  
-  ${WriteRegStrAuth} HKCU "SOFTWARE\GPAC" "InstallDir" "$INSTDIR"
-  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4" "DisplayName" "Osmo4/GPAC (remove only)"
-  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4" "UninstallString" "$INSTDIR\uninstall.exe"
-  WriteUninstaller "uninstall.exe"
-
 SectionEnd
 
 SubSection "GPAC Plugins" SecPlugins
@@ -353,9 +359,10 @@
   File "${GPAC_BIN}\avfilter-*.dll"
   File "${GPAC_BIN}\avformat-*.dll"
   File "${GPAC_BIN}\avutil-*.dll"
-  File "${GPAC_BIN}\postproc-*.dll"
+  File "${GPAC_BIN}\avresample-*.dll"
   File "${GPAC_BIN}\swresample-*.dll"
   File "${GPAC_BIN}\swscale-*.dll"
+  File "${GPAC_BIN}\libx264-*.dll"
 SectionEnd
 
 Section "XviD Video Decoder" SecXVID
@@ -480,9 +487,22 @@
   SectionIn 1
   SetOutPath $INSTDIR
   File "${GPAC_BIN}\MP4Box.exe"
+  Push $INSTDIR
+  Call AddToPath
+SectionEnd
+
+Section "MP42TS" SecMP42TS
+  SectionIn 1
+  SetOutPath $INSTDIR
   File "${GPAC_BIN}\MP42TS.exe"
-  File "${GPAC_BIN}\dashcast.exe"
+  Push $INSTDIR
+  Call AddToPath
+SectionEnd
 
+Section "DashCast" SecDC
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\dashcast.exe"
   Push $INSTDIR
   Call AddToPath
 SectionEnd
@@ -543,7 +563,7 @@
 
 
 
-SubSection "Osmo4 Shortcuts"
+SubSection "GPAC Shortcuts"
 
 Section "Add Start Menu Shortcuts"
   SectionIn 1
@@ -552,23 +572,23 @@
   Pop $0
   StrCmp $0 "Admin" +1 +2
   SetShellVarContext all
-  CreateDirectory "$SMPROGRAMS\Osmo4"
-  CreateShortCut "$SMPROGRAMS\Osmo4\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateDirectory "$SMPROGRAMS\GPAC"
+  CreateShortCut "$SMPROGRAMS\GPAC\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4/MP4Client.lnk" "$INSTDIR\MP4Client.exe" "-gui" 
+  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4/MP4Client (with Console).lnk" "$INSTDIR\MP4Client.exe" ""
   !ifndef IS_WIN64
-  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (Classic UI).lnk" "$INSTDIR\Osmo4.exe" ""
+  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4 (Old UI).lnk" "$INSTDIR\Osmo4.exe" ""
   !endif
-  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (New UI).lnk" "$INSTDIR\MP4Client.exe" "-gui" 
-  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (New UI With Console).lnk" "$INSTDIR\MP4Client.exe" ""
-  CreateShortCut "$SMPROGRAMS\Osmo4\Readme.lnk" "$INSTDIR\ReadMe.txt"
-  CreateShortCut "$SMPROGRAMS\Osmo4\License.lnk" "$INSTDIR\License.txt"
-  CreateShortCut "$SMPROGRAMS\Osmo4\History.lnk" "$INSTDIR\changelog.txt"
-  CreateShortCut "$SMPROGRAMS\Osmo4\Configuration Info.lnk" "$INSTDIR\configuration.html"
+  CreateShortCut "$SMPROGRAMS\GPAC\Readme.lnk" "$INSTDIR\ReadMe.txt"
+  CreateShortCut "$SMPROGRAMS\GPAC\License.lnk" "$INSTDIR\License.txt"
+  CreateShortCut "$SMPROGRAMS\GPAC\History.lnk" "$INSTDIR\changelog.txt"
+  CreateShortCut "$SMPROGRAMS\GPAC\Configuration Info.lnk" "$INSTDIR\configuration.html"
 SectionEnd
 
 !ifndef IS_WIN64
 Section "Add shortcut to QuickLaunch"
   SectionIn 1
-  CreateShortCut "$QUICKLAUNCH\Osmo4.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
+  CreateShortCut "$QUICKLAUNCH\GPAC.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
 SectionEnd
 
 Section "Add shortcut to Desktop"
@@ -613,7 +633,8 @@
 
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOsmo4} "Osmo4 player"
+  !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"
@@ -647,6 +668,8 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMobIP} "UNIGE Mobile IP Framework"
   !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 ${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)"
@@ -656,7 +679,7 @@
 
 
 Function .onInstSuccess
-;  MessageBox MB_YESNO "GPAC Framework installation complete. Do you want to launch the Osmo4 player?" IDNO NoLaunch
+;  MessageBox MB_YESNO "GPAC Framework installation complete. Do you want to launch the player?" IDNO NoLaunch
 ;  Exec $INSTDIR\Osmo4.exe
 ;  NoLaunch:
 FunctionEnd
@@ -667,12 +690,12 @@
 
 ; uninstall stuff
 
-UninstallText "This will uninstall OSMO4/GPAC from your computer. Hit next to continue."
+UninstallText "This will uninstall GPAC from your computer. Hit next to continue."
 
 ; special uninstall section.
 Section "Uninstall"
   ; remove registry keys
-  ${DeleteRegKeyAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4"
+  ${DeleteRegKeyAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC"
   ${DeleteRegKeyAuth} HKCU "SOFTWARE\GPAC"
   ${DeleteRegKeyAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
   ${DeleteRegKeyAuth} HKCR GPAC\mp4\DefaultIcon
@@ -698,8 +721,8 @@
   Pop $0
   StrCmp $0 "Admin" +1 +2
   SetShellVarContext all
-  Delete "$SMPROGRAMS\Osmo4\*.*"
-  RMDir "$SMPROGRAMS\Osmo4"
+  Delete "$SMPROGRAMS\GPAC\*.*"
+  RMDir "$SMPROGRAMS\GPAC"
   Delete "$QUICKLAUNCH\Osmo4.lnk"
   Delete "$DESKTOP\Osmo4.lnk"

gpac-0.5.0.svn5178.tar.bz2/regression_tests/auxiliary_files/subtitle.srt -> gpac-0.5.1.svn5491.tar.xz/regression_tests/auxiliary_files/subtitle.srt Changed

gpac-0.5.1.svn5491.tar.xz/regression_tests/bifs/bifs-misc-hc-proto-events.bt Added

@@ -0,0 +1,57 @@
+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.5.1.svn5491.tar.xz/regression_tests/ttml Added

gpac-0.5.1.svn5491.tar.xz/regression_tests/ttml/ebu-ttd_sample.ttml Added

@@ -0,0 +1,39 @@
+<?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.5.1.svn5491.tar.xz/regression_tests/ttml/ebu-ttd_sample_invalid_ns.ttml Added

@@ -0,0 +1,28 @@
+<?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.5.1.svn5491.tar.xz/regression_tests/ttml/ebu-ttd_sample_span.ttml Added

@@ -0,0 +1,29 @@
+<?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.5.1.svn5491.tar.xz/regression_tests/ttml/ebu-ttd_timing_contiguous.ttml Added

@@ -0,0 +1,30 @@
+<?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.5.1.svn5491.tar.xz/regression_tests/ttml/ebu-ttd_timing_non-contiguous.ttml Added

@@ -0,0 +1,30 @@
+<?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.5.1.svn5491.tar.xz/regression_tests/ttml/ebu-ttd_timing_overlapping_fail.ttml Added

@@ -0,0 +1,29 @@
+<?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.5.0.svn5178.tar.bz2/src/Makefile -> gpac-0.5.1.svn5491.tar.xz/src/Makefile Changed

@@ -37,13 +37,17 @@
 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/ttml.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  
 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 
@@ -555,7 +559,7 @@
 ##libgpac library output
 LIB=libgpac.$(DYN_LIB_SUFFIX)
 ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols libgpac.def
+#LDFLAGS+=-Wl,-out-implib=../bin/gcc/libgpac.a
 else
 ifeq ($(CONFIG_DARWIN),yes)
 LDFLAGS+=-dynamiclib -install_name $(prefix)/lib/$(LIB)
@@ -614,7 +618,13 @@
 	mv $@ $@.$(VERSION_SONAME)
 	ln -sf $(notdir $@).$(VERSION_SONAME) $@.$(VERSION_MAJOR)
 	ln -sf $(notdir $@).$(VERSION_SONAME) $@
+else
+	ln -sf $@ $(notdir $@).a
+	mv $(notdir $@).a $@.a
+endif
 endif
+ifeq ($(shell fgrep "Libs.private:" ../gpac.pc),)
+	@echo "Libs.private: $(EXTRALIBS)" >> ../gpac.pc
 endif
 
 dep:

gpac-0.5.0.svn5178.tar.bz2/src/bifs/arith_decoder.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/arith_decoder.c Changed

gpac-0.5.0.svn5178.tar.bz2/src/bifs/bifs_codec.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/bifs_codec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -64,7 +64,7 @@
 		info->config.BAnimRAP = gf_bs_read_int(bs, 1);
 		info->config.elementaryMasks = gf_list_new();
 		while (1) {
-		  /*u32 node_id = */gf_bs_read_int(bs, info->config.NodeIDBits);
+			/*u32 node_id = */gf_bs_read_int(bs, info->config.NodeIDBits);
 			/*this assumes only FDP, BDP and IFS2D (no elem mask)*/
 			if (gf_bs_read_int(bs, 1) == 0) break;
 		}
@@ -93,7 +93,7 @@
 
 	tmp->QPs = gf_list_new();
 	tmp->streamInfo = gf_list_new();
-	tmp->info = NULL;	
+	tmp->info = NULL;
 
 	tmp->pCurrentProto = NULL;
 	tmp->scenegraph = scenegraph;
@@ -127,7 +127,7 @@
 	GF_BitStream *bs;
 	BIFSStreamInfo *pInfo;
 	GF_Err e;
-	
+
 	if (!DecoderSpecificInfo) {
 		/* Hack for T-DMB non compliant streams */
 		GF_SAFEALLOC(pInfo, BIFSStreamInfo);
@@ -204,7 +204,7 @@
 
 GF_EXPORT
 void gf_bifs_decoder_del(GF_BifsDecoder *codec)
-{	
+{
 	assert(gf_list_count(codec->QPs)==0);
 	gf_list_del(codec->QPs);
 
@@ -270,7 +270,7 @@
 //	gf_mx_v(codec->mx);
 	return e;
 }
-	
+
 
 void gf_bifs_decoder_set_time_offset(GF_BifsDecoder *codec, Double ts)
 {
@@ -296,7 +296,7 @@
 	if (!tmp) return NULL;
 	tmp->QPs = gf_list_new();
 	tmp->streamInfo = gf_list_new();
-	tmp->info = NULL;	
+	tmp->info = NULL;
 	tmp->encoded_nodes = gf_list_new();
 	tmp->scene_graph = graph;
 	return tmp;
@@ -316,7 +316,7 @@
 
 GF_EXPORT
 void gf_bifs_encoder_del(GF_BifsEncoder *codec)
-{	
+{
 	assert(gf_list_count(codec->QPs)==0);
 	gf_list_del(codec->QPs);
 	/*destroy all config*/
@@ -334,15 +334,15 @@
 GF_EXPORT
 GF_Err gf_bifs_encoder_new_stream(GF_BifsEncoder *codec, u16 ESID, GF_BIFSConfig *cfg, Bool encodeNames, Bool has_predictive)
 {
-	u32 i, count; 
+	u32 i, count;
 	BIFSStreamInfo *pInfo;
-	
+
 //	gf_mx_p(codec->mx);
 	if (BE_GetStream(codec, ESID) != NULL) {
 //		gf_mx_v(codec->mx);
 		return GF_BAD_PARAM;
 	}
-	
+
 	GF_SAFEALLOC(pInfo, BIFSStreamInfo);
 	pInfo->ESID = ESID;
 	codec->UseName = encodeNames;
@@ -368,7 +368,7 @@
 			gf_list_add(pInfo->config.elementaryMasks, bem);
 		}
 	}
-	
+
 	gf_list_add(codec->streamInfo, pInfo);
 //	gf_mx_v(codec->mx);
 	return GF_OK;
@@ -450,7 +450,7 @@
 			gf_bs_write_int(bs, 0, 1);
 		}
 	}
-	
+
 	gf_bs_align(bs);
 	gf_bs_get_content(bs, out_data, out_data_length);
 	gf_bs_del(bs);
@@ -484,12 +484,12 @@
 	switch (Node->sgprivate->tag) {
 	case TAG_ProtoNode:
 		return gf_sg_proto_get_field_ind_static(Node, inField, IndexMode, allField);
-	case TAG_MPEG4_Script: 
+	case TAG_MPEG4_Script:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Script: 
+	case TAG_X3D_Script:
 #endif
 		return gf_sg_script_get_field_index(Node, inField, IndexMode, allField);
-	default: 
+	default:
 		return gf_sg_mpeg4_node_get_field_index(Node, inField, IndexMode, allField);
 	}
 }
@@ -500,8 +500,10 @@
 Bool gf_bifs_get_aq_info(GF_Node *Node, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (Node->sgprivate->tag) {
-	case TAG_ProtoNode: return gf_sg_proto_get_aq_info(Node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	default: return gf_sg_mpeg4_node_get_aq_info(Node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_ProtoNode:
+		return gf_sg_proto_get_aq_info(Node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	default:
+		return gf_sg_mpeg4_node_get_aq_info(Node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
 	}
 }
 
@@ -513,7 +515,7 @@
 	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.5.0.svn5178.tar.bz2/src/bifs/bifs_node_tables.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/bifs_node_tables.c Changed

gpac-0.5.0.svn5178.tar.bz2/src/bifs/com_dec.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/com_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,21 +11,21 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #include "math.h"
 #include <gpac/internal/bifs_dev.h>
-#include "quant.h" 
+#include "quant.h"
 
 #ifndef GPAC_DISABLE_BIFS
 
@@ -185,7 +185,7 @@
 		}
 		gf_bifs_check_field_change(target, &targetField);
 		return GF_OK;
-	} 
+	}
 	switch (targetField.fieldType) {
 	case GF_SG_VRML_SFNODE:
 	{
@@ -243,9 +243,9 @@
 		if (e) return e;
 
 		if (fromNode) {
-			if (fromField.fieldType == targetField.fieldType) 
+			if (fromField.fieldType == targetField.fieldType)
 				gf_sg_vrml_field_clone(targetField.far_ptr, fromField.far_ptr, targetField.fieldType, codec->current_graph);
-		} else {	
+		} else {
 			e = gf_bifs_dec_field(codec, bs, target, &targetField, 0);
 		}
 		break;
@@ -288,7 +288,7 @@
 	GF_Node *node, *new_node;
 	GF_Err e;
 	GF_FieldInfo field, sffield;
-	
+
 	ID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	node = gf_sg_find_node(codec->current_graph, ID);
 	if (!node) return GF_NON_COMPLIANT_BITSTREAM;
@@ -307,7 +307,7 @@
 	/*cf index value replace */
 	if (field.fieldType == GF_SG_VRML_MFNODE) {
 		while (count) {
-			pos = gf_bs_read_int(bs, lenpos);		
+			pos = gf_bs_read_int(bs, lenpos);
 			/*first decode*/
 			new_node = gf_bifs_dec_node(codec, bs, field.NDTtype);
 			if (!new_node) return codec->LastError;
@@ -350,7 +350,7 @@
 	NodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	node = gf_sg_find_node(codec->current_graph, NodeID);
 	if (!node) return GF_NON_COMPLIANT_BITSTREAM;
-	
+
 	flag = gf_bs_read_int(bs, 1);
 	if (flag) {
 		e = gf_bifs_dec_node_mask(codec, bs, node, 0);
@@ -372,7 +372,7 @@
 		codec->scenegraph->global_qp = NULL;
 	}
 	codec->ActiveQP = NULL;
-	
+
 	if (!node || (gf_node_get_tag(node) != TAG_MPEG4_QuantizationParameter)) {
 		if (node) gf_node_unregister(node, NULL);
 		return codec->LastError;
@@ -438,7 +438,7 @@
 		case 3:
 			/*-1 means append*/
 			pos = ((GenMFField *)field.far_ptr)->count;
-			if (!pos) 
+			if (!pos)
 				return GF_NON_COMPLIANT_BITSTREAM;
 			pos -= 1;
 			break;
@@ -483,7 +483,7 @@
 		case 3:
 			/*-1 means append*/
 			pos = ((GenMFField *)src_field.far_ptr)->count;
-			if (!pos) 
+			if (!pos)
 				return GF_NON_COMPLIANT_BITSTREAM;
 			pos -= 1;
 			break;
@@ -632,7 +632,7 @@
 		} else {
 			e = gf_node_list_insert_child((GF_ChildNodeItem **) field.far_ptr, node, pos);
 		}
-		
+
 		if (!e) gf_bifs_check_field_change(def, &field);
 	} else {
 		if (pos == -1) {
@@ -678,7 +678,7 @@
 	GF_Node *node;
 	GF_Err e;
 	GF_FieldInfo field;
-	
+
 	NodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	node = gf_sg_find_node(codec->current_graph, NodeID);
 	if (!node) return GF_NON_COMPLIANT_BITSTREAM;
@@ -713,7 +713,7 @@
 		GF_ChildNodeItem** nlist_ptr = (GF_ChildNodeItem**) field.far_ptr;
 		if (*nlist_ptr) {
 			e = gf_node_replace_child(node, nlist_ptr, pos, NULL);
-		} 
+		}
 	} else {
 		e = gf_sg_vrml_mf_remove(field.far_ptr, field.fieldType, pos);
 	}
@@ -760,16 +760,16 @@
 	u32 NodeID;
 	GF_Node *node, *new_node;
 	GF_Err e;
-	
+
 	NodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	/*this is delete / new on a DEF node: replace ALL instances*/
 	node = gf_sg_find_node(codec->current_graph, NodeID);
 	if (!node) return GF_NON_COMPLIANT_BITSTREAM;
-	
+
 	/*and just parse a new GF_Node - it is encoded in SFWorldNode table */
 	new_node = gf_bifs_dec_node(codec, bs, NDT_SFWorldNode);
 	if (!new_node && codec->LastError) return codec->LastError;
-	
+
 	e = gf_node_replace(node, new_node, 0);
 	return e;
 }
@@ -858,7 +858,7 @@
 	default:
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
-	
+
 	/*if MFNode remove the child and parse new node*/
 	if (field.fieldType == GF_SG_VRML_MFNODE) {
 		/*get the new node*/
@@ -904,14 +904,14 @@
 	GF_Node *OutNode, *InNode;
 
 	RouteID = 1+gf_bs_read_int(bs, codec->info->config.RouteIDBits);
-	
+
 	r = gf_sg_route_find(codec->current_graph, RouteID);
 #ifdef MPEG4_STRICT
 	if (!r) return GF_NON_COMPLIANT_BITSTREAM;
 	ptr = gf_sg_route_get_name(r);
 	gf_sg_route_del(r);
 #else
-	ptr = NULL; 
+	ptr = NULL;
 	if (r) {
 		ptr = gf_sg_route_get_name(r);
 //		gf_sg_route_del(r);
@@ -1020,7 +1020,7 @@
 		/*create a proto in the current graph*/
 		proto = gf_sg_proto_new(codec->current_graph, ID, name, proto_list ? 1 : 0);
 		if (proto_list) gf_list_add(proto_list, proto);
-		
+
 		/*during parsing, this proto is the current active one - all nodes/proto defined/declared
 		below it will belong to its namespace*/
 		codec->current_graph = gf_sg_proto_get_graph(proto);
@@ -1031,7 +1031,7 @@
 		while (flag) {
 			event_type = gf_bs_read_int(bs, 2);
 			field_type = gf_bs_read_int(bs, 6);
-			
+
 			if (codec->UseName) {
 				gf_bifs_dec_name(bs, name);
 			} else {
@@ -1109,7 +1109,7 @@
 			if (e) goto exit;
 
 			flag = 1;
-			
+
 			while (flag) {
 				/*parse all nodes in SFWorldNode table*/
 				node = gf_bifs_dec_node(codec, bs, NDT_SFWorldNode);
@@ -1131,7 +1131,7 @@
 				gf_sg_proto_add_node_code(proto, node);
 				flag = gf_bs_read_int(bs, 1);
 			}
-			
+
 			/*routes*/
 			flag = gf_bs_read_int(bs, 1);
 			if (flag) {
@@ -1189,7 +1189,7 @@
 						break;
 					}
 					field.fieldType = qpsftype;
-					
+
 					qp_min_value = gf_sg_vrml_field_pointer_new(qpsftype);
 					field.name = "QPMinValue";
 					field.far_ptr = qp_min_value;
@@ -1319,7 +1319,7 @@
 	/*Parse the routes*/
 	flag = gf_bs_read_int(bs, 1);
 
-	
+
 	if (flag) {
 		flag = gf_bs_read_int(bs, 1);
 		if (flag) {

gpac-0.5.0.svn5178.tar.bz2/src/bifs/com_enc.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/com_enc.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,21 +11,21 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 
 #include <gpac/internal/bifs_dev.h>
-#include "quant.h" 
+#include "quant.h"
 
 #ifndef GPAC_DISABLE_BIFS_ENC
 
@@ -54,10 +54,10 @@
 	GF_FieldInfo field;
 	GF_Err e;
 	GF_CommandField *inf;
-	if (!gf_list_count(com->command_fields)) return GF_BAD_PARAM; 
+	if (!gf_list_count(com->command_fields)) return GF_BAD_PARAM;
 	inf = (GF_CommandField *)gf_list_get(com->command_fields, 0);
 
-	
+
 	gf_bs_write_int(bs, gf_node_get_id(com->node)-1, codec->info->config.NodeIDBits);
 	nbBits = gf_get_bit_size(gf_node_get_num_fields_in_mode(com->node, GF_SG_FIELD_CODING_IN)-1);
 	gf_bifs_field_index_by_mode(com->node, inf->fieldIndex, GF_SG_FIELD_CODING_IN, &i);
@@ -122,8 +122,8 @@
 		GF_BIFS_WRITE_INT(codec, bs, i, nbBits, "sourceField", NULL);
 
 		return GF_OK;
-	} 
-	
+	}
+
 	GF_BIFS_WRITE_INT(codec, bs, 0, 1, "valueFromNode", NULL);
 
 	field.far_ptr = inf->field_ptr;
@@ -138,10 +138,10 @@
 	GF_FieldInfo field;
 	GF_Err e;
 	GF_CommandField *inf;
-	if (!gf_list_count(com->command_fields)) return GF_OK; 
+	if (!gf_list_count(com->command_fields)) return GF_OK;
 	inf = (GF_CommandField *)gf_list_get(com->command_fields, 0);
 
-	
+
 	gf_bs_write_int(bs, gf_node_get_id(com->node)-1, codec->info->config.NodeIDBits);
 	nbBits = gf_get_bit_size(gf_node_get_num_fields_in_mode(com->node, GF_SG_FIELD_CODING_IN)-1);
 	gf_bifs_field_index_by_mode(com->node, inf->fieldIndex, GF_SG_FIELD_CODING_IN, &i);
@@ -158,7 +158,7 @@
 	}
 	nbBitsPos = gf_get_bit_size(maxPos);
 	GF_BIFS_WRITE_INT(codec, bs, nbBitsPos, 5, "nbBitsPos", NULL);
-	
+
 	nbBits = gf_get_bit_size(count);
 	GF_BIFS_WRITE_INT(codec, bs, nbBits, 5, "nbBits", NULL);
 	GF_BIFS_WRITE_INT(codec, bs, count, nbBits, "count", NULL);
@@ -227,7 +227,7 @@
 	if (!gf_list_count(com->command_fields)) return GF_OK;
 	inf = (GF_CommandField *)gf_list_get(com->command_fields, 0);
 	if (inf->new_node) ((M_QuantizationParameter *)inf->new_node)->isLocal = 0;
-	e = gf_bifs_enc_node(codec, inf->new_node, NDT_SFWorldNode, bs);
+	e = gf_bifs_enc_node(codec, inf->new_node, NDT_SFWorldNode, bs, NULL);
 	if (e) return e;
 
 	/*reset global QP*/
@@ -236,7 +236,7 @@
 		codec->scene_graph->global_qp = NULL;
 	}
 	codec->ActiveQP = NULL;
-	
+
 	/*no QP*/
 	if (!inf->new_node) return GF_OK;
 
@@ -326,7 +326,7 @@
 		GF_BIFS_WRITE_INT(codec, bs, inf->pos, 8, "pos", NULL);
 		break;
 	}
-	return gf_bifs_enc_node(codec, inf->new_node, NDT, bs);
+	return gf_bifs_enc_node(codec, inf->new_node, NDT, bs, NULL);
 }
 
 GF_Err BE_IndexInsert(GF_BifsEncoder *codec, GF_Command *com, GF_BitStream *bs)
@@ -359,7 +359,7 @@
 	}
 	e = gf_node_get_field(com->node, inf->fieldIndex, &field);
 	if (e) return e;
-	if (gf_sg_vrml_is_sf_field(field.fieldType)) 
+	if (gf_sg_vrml_is_sf_field(field.fieldType))
 		return GF_NON_COMPLIANT_BITSTREAM;
 
 	memcpy(&sffield, &field, sizeof(GF_FieldInfo));
@@ -368,7 +368,7 @@
 
 	/*rescale the MFField and parse the SFField*/
 	if (field.fieldType==GF_SG_VRML_MFNODE) {
-		return gf_bifs_enc_node(codec, inf->new_node, field.NDTtype, bs);
+		return gf_bifs_enc_node(codec, inf->new_node, field.NDTtype, bs, com->node);
 	} else {
 		return gf_bifs_enc_sf_field(codec, bs, com->node, &sffield);
 	}
@@ -412,7 +412,7 @@
 	if (!gf_list_count(com->command_fields)) return GF_OK;
 	inf = (GF_CommandField *)gf_list_get(com->command_fields, 0);
 	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);
+	return gf_bifs_enc_node(codec, inf->new_node, NDT_SFWorldNode, bs, NULL);
 }
 
 GF_Err BE_FieldReplace(GF_BifsEncoder *codec, GF_Command *com, GF_BitStream *bs)
@@ -433,7 +433,7 @@
 	e = gf_node_get_field(com->node, inf->fieldIndex, &field);
 	if (e) return e;
 	field.far_ptr = inf->field_ptr;
-	
+
 	/* Warning: To be changed when proper solution is found */
 	if (gf_sg_vrml_get_sf_type(field.fieldType) == GF_SG_VRML_SFSCRIPT) codec->is_encoding_command = 1;
 
@@ -458,9 +458,9 @@
 	GF_BIFS_WRITE_INT(codec, bs, ind, NumBits, "field", NULL);
 
 	e = gf_node_get_field(com->node, inf->fieldIndex, &field);
-	if (gf_sg_vrml_is_sf_field(field.fieldType)) 
+	if (gf_sg_vrml_is_sf_field(field.fieldType))
 		return GF_NON_COMPLIANT_BITSTREAM;
-	
+
 	switch (inf->pos) {
 	case 0:
 		GF_BIFS_WRITE_INT(codec, bs, 2, 2, "FIRST", "idx");
@@ -473,9 +473,9 @@
 		GF_BIFS_WRITE_INT(codec, bs, inf->pos, 16, "pos", NULL);
 		break;
 	}
-	
+
 	if (field.fieldType == GF_SG_VRML_MFNODE) {
-		e = gf_bifs_enc_node(codec, inf->new_node, field.NDTtype, bs);
+		e = gf_bifs_enc_node(codec, inf->new_node, field.NDTtype, bs, com->node);
 	} else {
 		memcpy(&sffield, &field, sizeof(GF_FieldInfo));
 		sffield.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
@@ -538,7 +538,7 @@
 		GF_BIFS_WRITE_INT(codec, bs, 0, 1, "moreProto", NULL);
 		return GF_OK;
 	}
-	if (!codec->info->config.ProtoIDBits) 
+	if (!codec->info->config.ProtoIDBits)
 		return GF_NON_COMPLIANT_BITSTREAM;
 
 	/*store state*/
@@ -567,7 +567,7 @@
 			GF_BIFS_WRITE_INT(codec, bs, 1, 1, "moreField", NULL);
 			GF_BIFS_WRITE_INT(codec, bs, proto_field->EventType, 2, "eventType", NULL);
 			GF_BIFS_WRITE_INT(codec, bs, proto_field->FieldType, 6, "fieldType", NULL);
-			
+
 			if (codec->UseName) gf_bifs_enc_name(codec, bs, proto_field->FieldName);
 			switch (proto_field->EventType) {
 			case GF_SG_EVENT_EXPOSED_FIELD:
@@ -586,7 +586,7 @@
 			if (proto_field->Anim_Type) useAnim = 1;
 		}
 		GF_BIFS_WRITE_INT(codec, bs, 0, 1, "moreField", NULL);
-		
+
 		GF_BIFS_WRITE_INT(codec, bs, proto->ExternProto.count ? 1 : 0, 1, "externProto", NULL);
 		/*externProto*/
 		if (proto->ExternProto.count) {
@@ -606,13 +606,13 @@
 			count = gf_list_count(proto->node_code);
 			/*BIFS cannot encode empty protos ! We therefore encode a NULL node instead*/
 			if (!count) {
-				gf_bifs_enc_node(codec, NULL, NDT_SFWorldNode, bs);
+				gf_bifs_enc_node(codec, NULL, NDT_SFWorldNode, bs, NULL);
 				GF_BIFS_WRITE_INT(codec, bs, 0, 1, "moreNodes", NULL);
 			} else {
 				for (j=0; j<count; j++) {
 					/*parse all nodes in SFWorldNode table*/
 					node = (GF_Node*)gf_list_get(proto->node_code, j);
-					e = gf_bifs_enc_node(codec, node, NDT_SFWorldNode, bs);
+					e = gf_bifs_enc_node(codec, node, NDT_SFWorldNode, bs, NULL);
 					if (e) goto exit;
 					GF_BIFS_WRITE_INT(codec, bs, (j+1==count) ? 0 : 1, 1, "moreNodes", NULL);
 				}
@@ -755,7 +755,7 @@
 	}
 
 	/*NULL root is valid for ProtoLibraries*/
-	e = gf_bifs_enc_node(codec, com->node, NDT_SFTopNode, bs);
+	e = gf_bifs_enc_node(codec, com->node, NDT_SFTopNode, bs, NULL);
 	if (e || !gf_list_count(routes) ) {
 		GF_BIFS_WRITE_INT(codec, bs, 0, 1, "hasRoute", NULL);
 		return codec->LastError = e;
@@ -802,7 +802,7 @@
 	if (e) goto exit;
 
 	/*NULL root is valid for ProtoLibraries*/
-	e = gf_bifs_enc_node(codec, graph ? graph->RootNode : NULL, NDT_SFTopNode, bs);
+	e = gf_bifs_enc_node(codec, graph ? graph->RootNode : NULL, NDT_SFTopNode, bs, NULL);
 	if (e || !graph || !gf_list_count(graph->Routes) ) {
 		GF_BIFS_WRITE_INT(codec, bs, 0, 1, "hasRoute", NULL);
 		return codec->LastError = e;
@@ -853,7 +853,7 @@
 			/*reset node context*/
 			while (gf_list_count(codec->encoded_nodes)) gf_list_rem(codec->encoded_nodes, 0);
 			GF_BIFS_WRITE_INT(codec, bs, 3, 2, "SceneReplace", NULL);
-		
+
 			if (!com->aggregated) {
 				routes = gf_list_new();
 				/*now the trick: get all following InsertRoutes and convert as routes*/
@@ -882,7 +882,7 @@
 				e = BE_SceneReplaceEx(codec, com, bs, codec->scene_graph->Routes);
 			}
 		}
-			break;
+		break;
 		/*replace commands*/
 		case GF_SG_NODE_REPLACE:
 			GF_BIFS_WRITE_INT(codec, bs, 2, 2, "Replace", NULL);
@@ -970,7 +970,7 @@
 		gf_bs_get_content(bs, out_data, out_data_length);
 	}
 	gf_bs_del(bs);
-	
+
 	/*restore context*/
 	gf_list_del(codec->encoded_nodes);
 	codec->encoded_nodes = ctx_bck;

gpac-0.5.0.svn5178.tar.bz2/src/bifs/conditional.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/conditional.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -77,7 +77,7 @@
 
 	/*set isActive - to clarify in the specs*/
 	node->isActive = 1;
-	gf_node_event_out_str((GF_Node *)node, "isActive");
+	gf_node_event_out((GF_Node *)node, 3/*"isActive"*/);
 	if (!node->buffer.bufferSize) return;
 
 	/*we may replace ourselves*/

gpac-0.5.0.svn5178.tar.bz2/src/bifs/field_decode.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/field_decode.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,23 +11,23 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 
 
 #include <gpac/internal/bifs_dev.h>
-#include "quant.h" 
-#include "script.h" 
+#include "quant.h"
+#include "script.h"
 
 #ifndef GPAC_DISABLE_BIFS
 
@@ -54,7 +54,7 @@
 void BD_CheckSFTimeOffset(GF_BifsDecoder *codec, GF_Node *node, GF_FieldInfo *inf)
 {
 	if (gf_node_get_tag(node) != TAG_ProtoNode) {
-		if (!stricmp(inf->name, "startTime") || !stricmp(inf->name, "stopTime")) 
+		if (!stricmp(inf->name, "startTime") || !stricmp(inf->name, "stopTime"))
 			BD_OffsetSFTime(codec,  (Double *)inf->far_ptr);
 	} else if (gf_sg_proto_field_is_sftime_offset(node, inf)) {
 		BD_OffsetSFTime(codec,  (Double *)inf->far_ptr);
@@ -64,7 +64,7 @@
 
 Fixed BD_ReadSFFloat(GF_BifsDecoder * codec, GF_BitStream *bs)
 {
-	if (codec->ActiveQP && codec->ActiveQP->useEfficientCoding) 
+	if (codec->ActiveQP && codec->ActiveQP->useEfficientCoding)
 		return gf_bifs_dec_mantissa_float(codec, bs);
 
 	return FLT2FIX(gf_bs_read_float(bs));
@@ -140,7 +140,7 @@
 			((SFString *)field->far_ptr)->buffer = (char *)gf_malloc(sizeof(char)*(length+1));
 			memset(((SFString *)field->far_ptr)->buffer , 0, length+1);
 			for (i=0; i<length; i++) {
-				 ((SFString *)field->far_ptr)->buffer[i] = gf_bs_read_int(bs, 8);
+				((SFString *)field->far_ptr)->buffer[i] = gf_bs_read_int(bs, 8);
 			}
 		}
 		break;
@@ -174,7 +174,7 @@
 			}
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_SFIMAGE:
 		if (((SFImage *)field->far_ptr)->pixels) gf_free(((SFImage *)field->far_ptr)->pixels);
 		w = gf_bs_read_int(bs, 12);
@@ -198,7 +198,7 @@
 	{
 		SFCommandBuffer *sfcb = (SFCommandBuffer *)field->far_ptr;
 		if (sfcb->buffer) {
-			gf_free(sfcb->buffer);		
+			gf_free(sfcb->buffer);
 			sfcb->buffer = NULL;
 		}
 		while (gf_list_count(sfcb->commandList)) {
@@ -219,7 +219,7 @@
 				sfcb->buffer[i] = gf_bs_read_int(bs, 8);
 			}
 		}
-		//notify the node - this is needed in case an enhencement layer replaces the buffer, in which case 
+		//notify the node - this is needed in case an enhencement layer replaces the buffer, in which case
 		//the # ID Bits may change
 		SFCommandBufferChanged(codec, node);
 
@@ -233,8 +233,8 @@
 			cbi->cb = sfcb;
 			gf_list_add(codec->command_buffers, cbi);
 		}
-	} 
-		break;
+	}
+	break;
 	case GF_SG_VRML_SFNODE:
 		//for nodes the field ptr is a ptr to the field, which is a node ptr ;)
 		new_node = gf_bifs_dec_node(codec, bs, field->NDTtype);
@@ -265,7 +265,7 @@
 			codec->LastError = gf_bifs_get_field_index(ar->node, field_ref, GF_SG_FIELD_CODING_DEF, &ar->fieldIndex);
 		}
 	}
-		break;
+	break;
 	default:
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -281,7 +281,7 @@
 	u32 nbF;
 
 	GF_FieldInfo sffield;
-	
+
 	memset(&sffield, 0, sizeof(GF_FieldInfo));
 	sffield.fieldIndex = field->fieldIndex;
 	sffield.fieldType = gf_sg_vrml_get_sf_type(field->fieldType);
@@ -321,10 +321,10 @@
 							gf_node_register(new_node, NULL);
 							gf_node_unregister(new_node, node);
 						}
-					} else 
+					} else
 						//this is generic MFNode container
 						e = gf_node_list_add_child_last(field->far_ptr, new_node, &last);
-					
+
 				}
 				//proto coding: directly add the child
 				else if (codec->pCurrentProto) {
@@ -339,7 +339,7 @@
 
 		endFlag = gf_bs_read_int(bs, 1);
 
-		//according to the spec, the QP applies to the current node itself, 
+		//according to the spec, the QP applies to the current node itself,
 		//not just children. If IsLocal is TRUE remove the node
 		if (qp_on && qp_local) {
 			if (qp_local == 2) {
@@ -370,7 +370,7 @@
 	u8 qp_local, qp_on, initial_qp;
 	GF_Node *new_node;
 	GF_FieldInfo sffield;
-	
+
 	memset(&sffield, 0, sizeof(GF_FieldInfo));
 	sffield.fieldIndex = field->fieldIndex;
 	sffield.fieldType = gf_sg_vrml_get_sf_type(field->fieldType);
@@ -378,7 +378,7 @@
 
 	initial_qp = qp_local = qp_on = 0;
 
-	//vector description - alloc the MF size before 
+	//vector description - alloc the MF size before
 	NbBits = gf_bs_read_int(bs, 5);
 	nbFields = gf_bs_read_int(bs, NbBits);
 
@@ -392,14 +392,14 @@
 		e = gf_sg_vrml_mf_alloc(field->far_ptr, field->fieldType, nbFields);
 		if (e) return e;
 
-		for (i=0;i<nbFields; i++) {
+		for (i=0; i<nbFields; i++) {
 			e = gf_sg_vrml_mf_get_item(field->far_ptr, field->fieldType, & sffield.far_ptr, i);
 			if (e) return e;
 			e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, 0);
 		}
 	} else {
 		last = NULL;
-		for (i=0;i<nbFields; i++) {
+		for (i=0; i<nbFields; i++) {
 			new_node = gf_bifs_dec_node(codec, bs, field->NDTtype);
 			if (new_node) {
 				e = gf_node_register(new_node, is_mem_com ? NULL : node);
@@ -410,7 +410,7 @@
 					if (gf_node_get_tag(new_node) == TAG_MPEG4_QuantizationParameter) {
 						qp_local = ((M_QuantizationParameter *)new_node)->isLocal;
 						/*we have a QP in the same scope, remove previous
-						NB: we assume this is the right behaviour, the spec doesn't say 
+						NB: we assume this is the right behaviour, the spec doesn't say
 						whether QP is cumulative or not*/
 						if (qp_on) gf_bifs_dec_qp_remove(codec, 0);
 
@@ -427,7 +427,7 @@
 					} else {
 						e = gf_node_list_add_child_last(field->far_ptr, new_node, &last);
 					}
-				} 
+				}
 				/*proto coding*/
 				else if (codec->pCurrentProto) {
 					/*TO DO: what happens if this is a QP node on the interface ?*/
@@ -437,7 +437,7 @@
 				return codec->LastError ? codec->LastError : GF_NON_COMPLIANT_BITSTREAM;
 			}
 		}
-		/*according to the spec, the QP applies to the current node itself, not just children. 
+		/*according to the spec, the QP applies to the current node itself, not just children.
 		If IsLocal is TRUE remove the node*/
 		if (qp_on && qp_local) {
 			if (qp_local == 2) {
@@ -480,7 +480,7 @@
 
 	assert(node);
 //	if (field->fieldType == GF_SG_VRML_UNKNOWN) return GF_NON_COMPLIANT_BITSTREAM;
-	
+
 	if (gf_sg_vrml_is_sf_field(field->fieldType)) {
 		e = gf_bifs_dec_sf_field(codec, bs, node, field, is_mem_com);
 		if (e) return e;
@@ -499,7 +499,7 @@
 		/*predictiveMFField*/
 		if (codec->info->config.UsePredictiveMFField) {
 			flag = gf_bs_read_int(bs, 1);
-			if (flag) { 
+			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);
@@ -617,7 +617,7 @@
 				if (e) return e;
 				e = BD_SetProtoISed(codec, flag, node, i);
 			}
-			//regular field, parse it (nb: no contextual coding for protos in maskNode, 
+			//regular field, parse it (nb: no contextual coding for protos in maskNode,
 			//all node fields are coded
 			else {
 				e = gf_node_get_field(node, i, &field);
@@ -684,7 +684,7 @@
 			BD_CheckSFTimeOffset(codec, node, &inf);
 		}
 	}
-		break;
+	break;
 	}
 }
 
@@ -726,21 +726,21 @@
 			/*restore QP14 length*/
 			switch (gf_node_get_tag(new_node)) {
 			case TAG_MPEG4_Coordinate:
-				{
-					u32 nbCoord = ((M_Coordinate *)new_node)->point.count;
-					gf_bifs_dec_qp14_enter(codec, 1);
-					gf_bifs_dec_qp14_set_length(codec, nbCoord);
-					gf_bifs_dec_qp14_enter(codec, 0);
-				}
-				break;
+			{
+				u32 nbCoord = ((M_Coordinate *)new_node)->point.count;
+				gf_bifs_dec_qp14_enter(codec, 1);
+				gf_bifs_dec_qp14_set_length(codec, nbCoord);
+				gf_bifs_dec_qp14_enter(codec, 0);
+			}
+			break;
 			case TAG_MPEG4_Coordinate2D:
-				{
-					u32 nbCoord = ((M_Coordinate2D *)new_node)->point.count;
-					gf_bifs_dec_qp14_enter(codec, 1);
-					gf_bifs_dec_qp14_set_length(codec, nbCoord);
-					gf_bifs_dec_qp14_enter(codec, 0);
-				}
-				break;
+			{
+				u32 nbCoord = ((M_Coordinate2D *)new_node)->point.count;
+				gf_bifs_dec_qp14_enter(codec, 1);
+				gf_bifs_dec_qp14_set_length(codec, nbCoord);
+				gf_bifs_dec_qp14_enter(codec, 0);
+			}
+			break;
 			}
 		}
 		return new_node;
@@ -842,7 +842,7 @@
 		}
 	}
 #endif
-	
+
 	if (!new_node) {
 		if (proto) {
 			skip_init = 1;
@@ -857,7 +857,7 @@
 		return NULL;
 	}
 
-	/*VRML: "The transformation hierarchy shall be a directed acyclic graph; results are undefined if a node 
+	/*VRML: "The transformation hierarchy shall be a directed acyclic graph; results are undefined if a node
 	in the transformation hierarchy is its own ancestor"
 	that's good, because the scene graph can't handle cyclic graphs (destroy will never be called).
 	We therefore only register the node once parsed*/
@@ -878,7 +878,7 @@
 	/*if coords were not stored for QP14 before coding this node, reset QP14 it when leaving*/
 	reset_qp14 = !codec->coord_stored;
 
-	/*QP 14 is a special quant mode for IndexFace/Line(2D)Set to quantize the 
+	/*QP 14 is a special quant mode for IndexFace/Line(2D)Set to quantize the
 	coordonate(2D) child, based on the first field parsed
 	we must check the type of the node and notfy the QP*/
 	switch (node_tag) {
@@ -892,7 +892,7 @@
 	} else {
 		e = gf_bifs_dec_node_list(codec, bs, new_node, proto ? 1 : 0);
 	}
-	if (codec->coord_stored && reset_qp14) 
+	if (codec->coord_stored && reset_qp14)
 		gf_bifs_dec_qp14_reset(codec);
 
 	if (e) {
@@ -904,7 +904,7 @@
 		return NULL;
 	}
 
-	if (!skip_init) 
+	if (!skip_init)
 		gf_node_init(new_node);
 
 	switch (node_tag) {

gpac-0.5.0.svn5178.tar.bz2/src/bifs/field_encode.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/field_encode.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -27,8 +27,8 @@
 
 #include <gpac/internal/bifs_dev.h>
 #include <gpac/internal/bifs_tables.h>
-#include "quant.h" 
-#include "script.h" 
+#include "quant.h"
+#include "script.h"
 
 #ifndef GPAC_DISABLE_BIFS_ENC
 
@@ -55,7 +55,7 @@
 		gf_bifs_enc_mantissa_float(codec, val, bs);
 	} else {
 		gf_bs_write_float(bs, FIX2FLT(val));
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] SFFloat\t\t32\t\t%g\t\t%s\n", FIX2FLT(val), com ? com : "") );	
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] SFFloat\t\t32\t\t%g\t\t%s\n", FIX2FLT(val), com ? com : "") );
 	}
 }
 
@@ -132,7 +132,7 @@
 		BE_WriteSFFloat(codec, ((SFVec2f *)field->far_ptr)->x, bs, "vec2f.x");
 		BE_WriteSFFloat(codec, ((SFVec2f *)field->far_ptr)->y, bs, "vec2f.y");
 		break;
-	
+
 	case GF_SG_VRML_SFVEC3F:
 		BE_WriteSFFloat(codec, ((SFVec3f *)field->far_ptr)->x, bs, "vec3f.x");
 		BE_WriteSFFloat(codec, ((SFVec3f *)field->far_ptr)->y, bs, "vec3f.y");
@@ -154,7 +154,7 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] string\t\t%d\t\t%s\t\t//SFURL\n", 8*len, url->url));
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_SFIMAGE:
 	{
 		u32 size, i;
@@ -166,7 +166,7 @@
 		for (i=0; i<size; i++) gf_bs_write_int(bs, img->pixels[i], 8);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] pixels\t\t%d\t\tnot dumped\t\t//SFImage\n", 8*size));
 	}
-		break;
+	break;
 
 	case GF_SG_VRML_SFCOMMANDBUFFER:
 	{
@@ -193,10 +193,10 @@
 			GF_BIFS_WRITE_INT(codec, bs, 0, 5, "NbBits", NULL);
 		}
 	}
-		break;
+	break;
 
 	case GF_SG_VRML_SFNODE:
-		return gf_bifs_enc_node(codec, *((GF_Node **)field->far_ptr), field->NDTtype, bs);
+		return gf_bifs_enc_node(codec, *((GF_Node **)field->far_ptr), field->NDTtype, bs, node);
 
 	case GF_SG_VRML_SFSCRIPT:
 #ifdef GPAC_HAS_SPIDERMONKEY
@@ -211,11 +211,11 @@
 		SFAttrRef *ar = (SFAttrRef *)field->far_ptr;
 		u32 nbBitsDEF = gf_get_bit_size(gf_node_get_num_fields_in_mode(ar->node, GF_SG_FIELD_CODING_DEF) - 1);
 		GF_BIFS_WRITE_INT(codec, bs, gf_node_get_id(ar->node) - 1, codec->info->config.NodeIDBits, "NodeID", NULL);
-			
+
 		gf_bifs_field_index_by_mode(ar->node, ar->fieldIndex, GF_SG_FIELD_CODING_DEF, &idx);
 		GF_BIFS_WRITE_INT(codec, bs, idx, nbBitsDEF, "field", NULL);
 	}
-		break;
+	break;
 	default:
 		return GF_NOT_SUPPORTED;
 	}
@@ -231,7 +231,7 @@
 	Bool use_list, qp_on, initial_qp;
 	u32 nbF, i;
 	GF_FieldInfo sffield;
-		
+
 	nbF = 0;
 	if (field->fieldType != GF_SG_VRML_MFNODE) {
 		nbF = field->far_ptr ? ((GenMFField *)field->far_ptr)->count : 0;
@@ -278,7 +278,7 @@
 			e = gf_bifs_enc_sf_field(codec, bs, node, &sffield);
 		} else {
 			assert(list);
-			e = gf_bifs_enc_node(codec, list->node, field->NDTtype, bs);
+			e = gf_bifs_enc_node(codec, list->node, field->NDTtype, bs, node);
 
 			/*activate QP*/
 			if (list->node->sgprivate->tag == TAG_MPEG4_QuantizationParameter) {
@@ -291,7 +291,7 @@
 			}
 			list = list->next;
 		}
-		
+
 		if (e) return e;
 
 		if (qp_on && qp_local) {
@@ -314,9 +314,9 @@
 GF_Err gf_bifs_enc_field(GF_BifsEncoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field)
 {
 	assert(node);
-	if (field->fieldType == GF_SG_VRML_UNKNOWN) 
+	if (field->fieldType == GF_SG_VRML_UNKNOWN)
 		return GF_NON_COMPLIANT_BITSTREAM;
-	
+
 	if (gf_sg_vrml_is_sf_field(field->fieldType)) {
 		return gf_bifs_enc_sf_field(codec, bs, node, field);
 	}
@@ -393,7 +393,7 @@
 		clone = gf_node_new(node->sgprivate->scenegraph, node->sgprivate->tag);
 	}
 	if (clone) gf_node_register(clone, NULL);
-	
+
 	numBitsDEF = gf_get_bit_size(gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_DEF) - 1);
 
 	enc_fields = (s32*)gf_malloc(sizeof(s32) * count);
@@ -423,23 +423,36 @@
 		/*if field is default skip*/
 		switch (field.fieldType) {
 		case GF_SG_VRML_SFNODE:
-			if (* (GF_Node **) field.far_ptr) { enc_fields[i] = allInd; nbFinal++; }
+			if (* (GF_Node **) field.far_ptr) {
+				enc_fields[i] = allInd;
+				nbFinal++;
+			}
 			break;
 		case GF_SG_VRML_MFNODE:
-			if (* (GF_ChildNodeItem **) field.far_ptr) { enc_fields[i] = allInd; nbFinal++; }
+			if (* (GF_ChildNodeItem **) field.far_ptr) {
+				enc_fields[i] = allInd;
+				nbFinal++;
+			}
 			break;
 		case GF_SG_VRML_SFCOMMANDBUFFER:
 		{
 			SFCommandBuffer *cb = (SFCommandBuffer *)field.far_ptr;
-			if (gf_list_count(cb->commandList)) { enc_fields[i] = allInd; nbFinal++; }
+			if (gf_list_count(cb->commandList)) {
+				enc_fields[i] = allInd;
+				nbFinal++;
+			}
 		}
-			break;
+		break;
 		case GF_SG_VRML_MFSCRIPT:
-			enc_fields[i] = allInd; nbFinal++;
+			enc_fields[i] = allInd;
+			nbFinal++;
 			break;
 		default:
 			gf_node_get_field(clone, allInd, &clone_field);
-			if (!gf_sg_vrml_field_equal(clone_field.far_ptr, field.far_ptr, field.fieldType)) { enc_fields[i] = allInd; nbFinal++; }
+			if (!gf_sg_vrml_field_equal(clone_field.far_ptr, field.far_ptr, field.fieldType)) {
+				enc_fields[i] = allInd;
+				nbFinal++;
+			}
 			break;
 		}
 	}
@@ -456,7 +469,7 @@
 		use_list = 1;
 	}
 	/*number of bits in mask node is count*1, in list node is 1+nbFinal*(1+numBitsDEF) */
-	else if (count < 1+nbFinal*(1+numBitsDEF)) 
+	else if (count < 1+nbFinal*(1+numBitsDEF))
 		use_list = 0;
 
 	GF_BIFS_WRITE_INT(codec, bs, use_list ? 0 : 1, 1, "isMask", NULL);
@@ -532,7 +545,7 @@
 	return 0;
 }
 
-GF_Err gf_bifs_enc_node(GF_BifsEncoder * codec, GF_Node *node, u32 NDT_Tag, GF_BitStream *bs)
+GF_Err gf_bifs_enc_node(GF_BifsEncoder * codec, GF_Node *node, u32 NDT_Tag, GF_BitStream *bs, GF_Node *parent_node)
 {
 	u32 NDTBits, node_type, node_tag, BVersion, node_id;
 	const char *node_name;
@@ -541,6 +554,7 @@
 	GF_Err e;
 
 	assert(codec->info);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[BIFS] Encode node %s\n", gf_node_get_class_name(node) ));
 
 	/*NULL node is a USE of maxID*/
 	if (!node) {
@@ -555,9 +569,9 @@
 	if (flag) {
 		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) 
+		if (!new_node)
 			return codec->LastError = GF_SG_UNKNOWN_NODE;
-		
+
 		/*restore QP14 length*/
 		switch (gf_node_get_tag(new_node)) {
 		case TAG_MPEG4_Coordinate:
@@ -567,7 +581,7 @@
 			gf_bifs_enc_qp14_set_length(codec, nbCoord);
 			gf_bifs_enc_qp14_enter(codec, 0);
 		}
-			break;
+		break;
 		case TAG_MPEG4_Coordinate2D:
 		{
 			u32 nbCoord = ((M_Coordinate2D *)new_node)->point.count;
@@ -575,7 +589,7 @@
 			gf_bifs_enc_qp14_set_length(codec, nbCoord);
 			gf_bifs_enc_qp14_enter(codec, 0);
 		}
-			break;
+		break;
 		}
 		return GF_OK;
 	}
@@ -590,7 +604,14 @@
 		if (node_type) break;
 
 		BVersion += 1;
-		if (BVersion > GF_BIFS_NUM_VERSION) return codec->LastError = GF_BIFS_UNKNOWN_VERSION;
+		if (BVersion > GF_BIFS_NUM_VERSION) {
+			if (parent_node) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[BIFS] Cannot encode node %s as a child of %s\n", gf_node_get_class_name(node), gf_node_get_class_name(parent_node) ));
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[BIFS] Cannot encode node %s in the SFWorldNode context\n", gf_node_get_class_name(node) ));
+			}
+			return codec->LastError = GF_BIFS_UNKNOWN_VERSION;
+		}
 	}
 	if (BVersion==2 && node_type==1) {
 		GF_Proto *proto = ((GF_ProtoInstance *)node)->proto_interface;
@@ -622,7 +643,7 @@
 	e = EncNodeFields(codec, bs, node);
 	if (e) return e;
 
-	if (codec->coord_stored && reset_qp14) 
+	if (codec->coord_stored && reset_qp14)
 		gf_bifs_enc_qp14_reset(codec);
 
 	switch (node_tag) {

gpac-0.5.0.svn5178.tar.bz2/src/bifs/memory_decoder.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/memory_decoder.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -48,7 +48,7 @@
 	GF_Command *com;
 	GF_CommandField *inf;
 	GF_FieldInfo field;
-	
+
 	ID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	node = gf_sg_find_node(codec->current_graph, ID);
 	if (!node) return GF_NON_COMPLIANT_BITSTREAM;
@@ -62,7 +62,7 @@
 	lenpos = gf_bs_read_int(bs, 5);
 	lennum = gf_bs_read_int(bs, 5);
 	count = gf_bs_read_int(bs, lennum);
-	
+
 	com = gf_sg_command_new(codec->current_graph, GF_SG_MULTIPLE_INDEXED_REPLACE);
 	BM_SetCommandNode(com, node);
 	field.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
@@ -72,7 +72,7 @@
 		inf->pos = gf_bs_read_int(bs, lenpos);
 		inf->fieldIndex = field.fieldIndex;
 		inf->fieldType = field.fieldType;
-		
+
 		if (field.fieldType==GF_SG_VRML_SFNODE) {
 			inf->new_node = gf_bifs_dec_node(codec, bs, field.NDTtype);
 			if (codec->LastError) goto err;
@@ -104,7 +104,7 @@
 	NodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	node = gf_sg_find_node(codec->current_graph, NodeID);
 	if (!node) return GF_NON_COMPLIANT_BITSTREAM;
-	
+
 	e = GF_OK;
 	com = gf_sg_command_new(codec->current_graph, GF_SG_MULTIPLE_REPLACE);
 	BM_SetCommandNode(com, node);
@@ -155,7 +155,7 @@
 		}
 	}
 
-	
+
 exit:
 	if (e) gf_sg_command_del(com);
 	else gf_list_add(com_list, com);
@@ -175,7 +175,7 @@
 	}
 	codec->ActiveQP = NULL;
 	codec->scenegraph->global_qp = NULL;
-	
+
 	if (node && (gf_node_get_tag(node) != TAG_MPEG4_QuantizationParameter)) {
 		gf_node_unregister(node, NULL);
 		return GF_NON_COMPLIANT_BITSTREAM;
@@ -239,7 +239,7 @@
 	id = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	target = gf_sg_find_node(codec->current_graph, id);
 	if (!target) return GF_SG_UNKNOWN_NODE;
-	
+
 	e = GF_OK;
 	com = gf_sg_command_new(codec->current_graph, GF_SG_XREPLACE);
 	BM_SetCommandNode(com, target);
@@ -364,7 +364,7 @@
 		if (e) gf_sg_command_del(com);
 		else gf_list_add(com_list, com);
 	}
-		return e;
+	return e;
 	case 1:
 		return BM_ParseProtoDelete(codec, bs, com_list);
 	case 2:
@@ -388,7 +388,7 @@
 		BM_SetCommandNode(com, n);
 		gf_list_add(com_list, com);
 	}
-		return GF_OK;
+	return GF_OK;
 	case 7:
 		return BM_XReplace(codec, bs, com_list);
 
@@ -599,7 +599,7 @@
 	GF_Err e;
 	GF_CommandField *inf;
 	GF_FieldInfo field;
-	
+
 	NodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	node = gf_sg_find_node(codec->current_graph, NodeID);
 	if (!node) return GF_NON_COMPLIANT_BITSTREAM;
@@ -675,7 +675,7 @@
 	GF_Command *com;
 	GF_Node *node;
 	GF_CommandField *inf;
-	
+
 	NodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	/*this is delete / new on a DEF node: replace ALL instances*/
 	node = gf_sg_find_node(codec->current_graph, NodeID);
@@ -767,7 +767,7 @@
 	default:
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
-	
+
 	com = gf_sg_command_new(codec->current_graph, GF_SG_INDEXED_REPLACE);
 	BM_SetCommandNode(com, node);
 	inf = gf_sg_command_field_new(com);

gpac-0.5.0.svn5178.tar.bz2/src/bifs/predictive_mffield.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/predictive_mffield.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,7 +42,7 @@
 	SFVec3f BMin, BMax;
 
 	s32 direction, orientation, inverse;
-	
+
 	u32 cur_field;
 
 	GF_AAModel *models[3];
@@ -73,7 +73,7 @@
 			scale = width/2;
 		}
 	}
-    return BMin + scale * vq;
+	return BMin + scale * vq;
 }
 
 GF_Err PMF_UnquantizeNormal(PredMF *pmf, GF_FieldInfo *field)
@@ -81,17 +81,17 @@
 	void *slot;
 	Fixed comp[3];
 	Fixed tang[2];
- 	u32 i;
+	u32 i;
 	Fixed delta=FIX_ONE;
-    for (i=0; i<2; i++) {
+	for (i=0; i<2; i++) {
 		Fixed v = PMF_UnquantizeFloat(pmf->current_val[i] - (1<< (pmf->QNbBits -1) ), 0 , FIX_ONE, pmf->QNbBits, 1);
 		tang[i]= gf_tan(gf_mulfix(GF_PI * 4, v));
 		delta += gf_mulfix(tang[i], tang[i]);
 	}
-    delta = gf_divfix(pmf->direction, gf_sqrt(delta) );
+	delta = gf_divfix(pmf->direction, gf_sqrt(delta) );
 
-    comp[(pmf->orientation) % 3] = delta;
-    for (i=0; i<2; i++) 
+	comp[(pmf->orientation) % 3] = delta;
+	for (i=0; i<2; i++)
 		comp[(pmf->orientation + i+1)%3] = gf_mulfix(tang[i], delta);
 
 	gf_sg_vrml_mf_get_item(field->far_ptr, field->fieldType, &slot, pmf->cur_field);
@@ -114,12 +114,12 @@
 		tang[i] = gf_tan(gf_mulfix(GF_PI / 4, v));
 		delta += gf_mulfix(tang[i], tang[i]);
 	}
-    delta = gf_divfix(pmf->direction , gf_sqrt(delta) );
+	delta = gf_divfix(pmf->direction , gf_sqrt(delta) );
 
-    comp[(pmf->orientation)%4] = delta;
-    for (i=0; i<3; i++) 
+	comp[(pmf->orientation)%4] = delta;
+	for (i=0; i<3; i++)
 		comp[(pmf->orientation + i+1)%4] = gf_mulfix(tang[i], delta);
-  
+
 	gf_sg_vrml_mf_get_item(field->far_ptr, field->fieldType, &slot, pmf->cur_field);
 	delta = 2 * gf_acos(comp[0]);
 	sine = gf_sin(delta / 2);
@@ -204,44 +204,44 @@
 	case QC_NORMALS:
 	case QC_ROTATION:
 		/*NOT TESTED*/
-		{
-			s32 temp_val[3];
-			s32 diff_dir = prev_dir * (pmf->direction ? -1 : 1);
-			s32 inv=1;
-			s32 diff_ori = 0;
-			s32 shift = 1 << (pmf->QNbBits - 1);
-
-			for (i=0; i<3; i++) {
-				pmf->previous_val[i] -= shift;
-				pmf->current_val[i] -= shift;
+	{
+		s32 temp_val[3];
+		s32 diff_dir = prev_dir * (pmf->direction ? -1 : 1);
+		s32 inv=1;
+		s32 diff_ori = 0;
+		s32 shift = 1 << (pmf->QNbBits - 1);
+
+		for (i=0; i<3; i++) {
+			pmf->previous_val[i] -= shift;
+			pmf->current_val[i] -= shift;
+		}
+		for (i=0; i< pmf->num_comp; i++) {
+			temp_val[i] = pmf->previous_val[i] + pmf->current_val[i];
+			if ( abs(temp_val[i]) > shift - 1) {
+				diff_ori = i+1;
+				inv = ( temp_val[i] > 0) ? 1 : -1;
+				break;
 			}
-			for (i=0; i< pmf->num_comp; i++) {
-				temp_val[i] = pmf->previous_val[i] + pmf->current_val[i];
-				if ( abs(temp_val[i]) > shift - 1) {
-					diff_ori = i+1;
-					inv = ( temp_val[i] > 0) ? 1 : -1;
-					break;
-				}
+		}
+		if (diff_ori != 0) {
+			s32 k=0;
+			for (i=0; i< pmf->num_comp - diff_ori; i++) {
+				k = (i + diff_ori) % pmf->num_comp;
+				temp_val[i] = inv * ( pmf->previous_val[i] + pmf->current_val[i]);
 			}
-			if (diff_ori != 0) {
-				s32 k=0;
-				for (i=0; i< pmf->num_comp - diff_ori; i++) {
-					k = (i + diff_ori) % pmf->num_comp;
-					temp_val[i] = inv * ( pmf->previous_val[i] + pmf->current_val[i]);
-				}
-				k = diff_ori - 1;
-				temp_val[pmf->num_comp - diff_ori] = inv * 2 * (shift - 1) - (pmf->previous_val[k] + pmf->current_val[k]) ; 
-				for (i = pmf->num_comp - diff_ori + 1; i<pmf->num_comp; i++) {
-					k = (i+diff_ori-1) % pmf->num_comp;
-					temp_val[i] = inv * (pmf->previous_val[k] + pmf->current_val[k]);
-				}
+			k = diff_ori - 1;
+			temp_val[pmf->num_comp - diff_ori] = inv * 2 * (shift - 1) - (pmf->previous_val[k] + pmf->current_val[k]) ;
+			for (i = pmf->num_comp - diff_ori + 1; i<pmf->num_comp; i++) {
+				k = (i+diff_ori-1) % pmf->num_comp;
+				temp_val[i] = inv * (pmf->previous_val[k] + pmf->current_val[k]);
 			}
-			pmf->orientation = (pmf->orientation + diff_ori) % (pmf->num_comp + 1);
-			pmf->direction = diff_dir * inv;
-			for (i=0; i< pmf->num_comp; i++) 
-				pmf->current_val[i]= temp_val[i] + shift;
 		}
-		break;
+		pmf->orientation = (pmf->orientation + diff_ori) % (pmf->num_comp + 1);
+		pmf->direction = diff_dir * inv;
+		for (i=0; i< pmf->num_comp; i++)
+			pmf->current_val[i]= temp_val[i] + shift;
+	}
+	break;
 	default:
 		for (i=0; i< pmf->num_comp; i++)
 			pmf->current_val[i] += pmf->previous_val[i];
@@ -309,14 +309,14 @@
 	Fixed b_min, b_max;
 	u32 i, flag;
 	PredMF pmf;
-	
+
 	memset(&pmf, 0, sizeof(PredMF));
-	
+
 	HasQ = gf_bifs_get_aq_info(node, field->fieldIndex, &pmf.QType, &AType, &b_min, &b_max, &pmf.QNbBits);
 	if (!HasQ || !pmf.QType) return GF_EOS;
 
 	/*get NbBits for QP14 (QC_COORD_INDEX)*/
-	if (pmf.QType == QC_COORD_INDEX) 
+	if (pmf.QType == QC_COORD_INDEX)
 		pmf.QNbBits = gf_bifs_dec_qp14_get_bits(codec);
 
 	pmf.BMin.x = pmf.BMin.y = pmf.BMin.z = b_min;
@@ -324,7 +324,7 @@
 
 	/*check is the QP is on and retrieves the bounds*/
 	if (!Q_IsTypeOn(codec->ActiveQP, pmf.QType, &pmf.QNbBits, &pmf.BMin, &pmf.BMax)) return GF_EOS;
-	
+
 	switch (field->fieldType) {
 	case GF_SG_VRML_MFCOLOR:
 	case GF_SG_VRML_MFVEC3F:
@@ -355,7 +355,7 @@
 	case 1:
 		flag = gf_bs_read_int(bs, 5);
 		pmf.intra_inter = gf_bs_read_int(bs, flag);
-		/*no break*/
+	/*no break*/
 	case 2:
 	case 0:
 		pmf.compNbBits = gf_bs_read_int(bs, 5);

gpac-0.5.0.svn5178.tar.bz2/src/bifs/quant.h -> gpac-0.5.1.svn5491.tar.xz/src/bifs/quant.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,20 +35,20 @@
 enum
 {
 	QC_NONE				=	0,
-	QC_3DPOS			=	1, 
-	QC_2DPOS			=	2, 
-	QC_ORDER			=	3, 
-	QC_COLOR			=	4, 
-	QC_TEXTURE_COORD	=	5, 
-	QC_ANGLE			=	6, 
-	QC_SCALE			=	7, 
-	QC_INTERPOL_KEYS	=	8, 
-	QC_NORMALS			=	9, 
-	QC_ROTATION			=	10, 
-	QC_SIZE_3D			=	11, 
-	QC_SIZE_2D			=	12, 
-	QC_LINEAR_SCALAR	=	13, 
-	QC_COORD_INDEX		=	14, 
+	QC_3DPOS			=	1,
+	QC_2DPOS			=	2,
+	QC_ORDER			=	3,
+	QC_COLOR			=	4,
+	QC_TEXTURE_COORD	=	5,
+	QC_ANGLE			=	6,
+	QC_SCALE			=	7,
+	QC_INTERPOL_KEYS	=	8,
+	QC_NORMALS			=	9,
+	QC_ROTATION			=	10,
+	QC_SIZE_3D			=	11,
+	QC_SIZE_2D			=	12,
+	QC_LINEAR_SCALAR	=	13,
+	QC_COORD_INDEX		=	14,
 	QC_RESERVED			=	15,
 	QC_NOTDEF			=	16,
 };
@@ -119,4 +119,4 @@
 
 #endif /*GPAC_DISABLE_BIFS*/
 
-#endif	
+#endif

gpac-0.5.0.svn5178.tar.bz2/src/bifs/quantize.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/quantize.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -33,9 +33,9 @@
 	if (gf_node_get_tag(qp) != TAG_MPEG4_QuantizationParameter) return GF_BAD_PARAM;
 
 	/*if we have an active QP, push it into the stack*/
-	if (codec->ActiveQP && ((GF_Node*)codec->ActiveQP != codec->scene_graph->global_qp) ) 
+	if (codec->ActiveQP && ((GF_Node*)codec->ActiveQP != codec->scene_graph->global_qp) )
 		gf_list_insert(codec->QPs, codec->ActiveQP, 0);
-	
+
 	codec->ActiveQP = (M_QuantizationParameter *)qp;
 	return GF_OK;
 }
@@ -58,7 +58,7 @@
 u32 gf_bifs_enc_qp14_get_bits(GF_BifsEncoder *codec)
 {
 	if (!codec->ActiveQP || !codec->coord_stored) return 0;
-	return (u32) ceil(log(codec->NumCoord+1) / log(2) ); 
+	return (u32) ceil(log(codec->NumCoord+1) / log(2) );
 }
 
 void gf_bifs_enc_qp14_enter(GF_BifsEncoder *codec, Bool Enter)
@@ -90,31 +90,31 @@
 	s32 exp;
 
 	union
-	{	
+	{
 		Float f;
 		s32 l;
 	} ft_val;
 
 	if (ft == 0) {
-	    gf_bs_write_int(bs, 0, 4);
+		gf_bs_write_int(bs, 0, 4);
 		return;
 	}
 	ft_val.f = FIX2FLT(ft);
-  
+
 	mantSign = ((ft_val.l & 0x80000000) >> 31) & 0x1;
 	mantissa = (ft_val.l & 0x007FFFFF) >> 9;
 	mantLength = 15;
 	expSign=0;
 	exp =(((ft_val.l & 0x7F800000) >> 23)-127);
 	expLength = 8;
-  
+
 	if (mantissa == 0) mantLength = 1;
-  
+
 
 	if (exp) {
 		if (exp< 0) {
 			expSign = 1;
-			exp = -exp;	    
+			exp = -exp;
 		}
 		while ((exp & (1<<(--expLength)))==0) { }
 		exp &= ~(1<<expLength);
@@ -122,7 +122,7 @@
 	} else {
 		expLength=0;
 	}
-  
+
 	nbBits=0;
 	for(i = mantissa; i>0; ++nbBits) i >>= 1;
 
@@ -207,7 +207,7 @@
 	}
 }
 
-GF_Err Q_EncCoordOnUnitSphere(GF_BifsEncoder *codec, GF_BitStream *bs, u32 NbBits, u32 NbComp, Fixed *m_ft) 
+GF_Err Q_EncCoordOnUnitSphere(GF_BifsEncoder *codec, GF_BitStream *bs, u32 NbBits, u32 NbComp, Fixed *m_ft)
 {
 	u32 i;
 	u32 len = NbComp+1;
@@ -219,7 +219,7 @@
 			orientation = i;
 		}
 	}
-	if(NbComp==2) gf_bs_write_int(bs, ((m_ft[orientation]>0) ? 0 : 1), 1); 
+	if(NbComp==2) gf_bs_write_int(bs, ((m_ft[orientation]>0) ? 0 : 1), 1);
 	gf_bs_write_int(bs, orientation, 2);
 	for (i=0; i<NbComp; i++) {
 		Fixed v = gf_mulfix(gf_divfix(INT2FIX(4), GF_PI) , gf_atan2(m_ft[orientation], m_ft[(orientation+i+1) % len]));
@@ -245,7 +245,7 @@
 {
 	GF_Vec4 quat;
 	Fixed comp[4];
-	
+
 	/*get quaternion*/
 	quat = gf_quat_from_rotation(*(SFRotation *)field_ptr);
 	comp[0] = quat.q;
@@ -279,7 +279,7 @@
 	default:
 		return GF_EOS;
 	}
-	
+
 	/*check NDT*/
 	HasQ = gf_bifs_get_aq_info(node, field->fieldIndex, &QType, &AType, &b_min, &b_max, &NbBits);
 	if (!HasQ || !QType) return GF_EOS;
@@ -288,7 +288,7 @@
 	if (QType == QC_COORD_INDEX) {
 		NbBits = gf_bifs_enc_qp14_get_bits(codec);
 		/*QP14 is always on, not having NbBits set means the coord field is set after the index field, hence not decodable*/
-		if (!NbBits) 
+		if (!NbBits)
 			return GF_NON_COMPLIANT_BITSTREAM;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/bifs/script.h -> gpac-0.5.1.svn5491.tar.xz/src/bifs/script.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,14 +34,14 @@
 #define NUMBITS_EXPR_TYPE	6
 #define MAX_NUM_EXPR		100
 
-enum 
+enum
 {
-	ST_IF=0, 
-	ST_FOR=1, 
-	ST_WHILE=2, 
-	ST_RETURN=3, 
-	ST_BREAK=5, 
-	ST_CONTINUE=6, 
+	ST_IF=0,
+	ST_FOR=1,
+	ST_WHILE=2,
+	ST_RETURN=3,
+	ST_BREAK=5,
+	ST_CONTINUE=6,
 	ST_COMPOUND_EXPR=4,
 	ST_SWITCH=7
 };
@@ -90,7 +90,7 @@
 	ET_MOD=39,
 	ET_LAND=40,
 	ET_LOR=41,
-    ET_AND=42,
+	ET_AND=42,
 	ET_OR=43,
 	ET_XOR=44,
 	ET_LSHIFT=45,

gpac-0.5.0.svn5178.tar.bz2/src/bifs/script_dec.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/script_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -136,9 +136,15 @@
 	return parser->codec->LastError;
 }
 
-static void SFS_IncIndent(ScriptParser *pars) { pars->indent++; }
-static void SFS_DecIndent(ScriptParser *pars) { pars->indent--; }
-static void SFS_Space(ScriptParser *pars) { if (pars->new_line) SFS_AddString(pars, " ");}
+static void SFS_IncIndent(ScriptParser *pars) {
+	pars->indent++;
+}
+static void SFS_DecIndent(ScriptParser *pars) {
+	pars->indent--;
+}
+static void SFS_Space(ScriptParser *pars) {
+	if (pars->new_line) SFS_AddString(pars, " ");
+}
 static void SFS_Indent(ScriptParser *pars)
 {
 	u32 i;
@@ -177,7 +183,7 @@
 
 	if (gf_bs_read_int(bs, 1)) {
 		//endFlag
-		while (!gf_bs_read_int(bs, 1)){
+		while (!gf_bs_read_int(bs, 1)) {
 			e = ParseScriptField(&parser);
 			if (e) goto exit;
 		}
@@ -237,7 +243,7 @@
 		SFS_AddString(parser, (char *)gf_list_get(parser->identifiers, index));
 	}
 	//parse
-	else{
+	else {
 		gf_bifs_dec_name(parser->bs, name);
 		gf_list_add(parser->identifiers, gf_strdup(name));
 		SFS_AddString(parser, name);
@@ -263,7 +269,7 @@
 {
 	if (parser->codec->LastError) return;
 
-    if (gf_bs_read_int(parser->bs, 1)) {
+	if (gf_bs_read_int(parser->bs, 1)) {
 		SFS_AddString(parser, "{");
 		SFS_IncIndent(parser);
 
@@ -486,16 +492,16 @@
 		SFS_FunctionCall(parser);
 		break;
 	case ET_NEW:
-        SFS_NewObject(parser);
+		SFS_NewObject(parser);
 		break;
 	case ET_OBJECT_MEMBER_ACCESS:
-   		SFS_ObjectMemberAccess(parser);
+		SFS_ObjectMemberAccess(parser);
 		break;
 	case ET_OBJECT_METHOD_CALL:
-        SFS_ObjectMethodCall(parser);
+		SFS_ObjectMethodCall(parser);
 		break;
 	case ET_ARRAY_DEREFERENCE:
-        SFS_ArrayDeref(parser);
+		SFS_ArrayDeref(parser);
 		break;
 
 	case ET_MULTIPLY:
@@ -653,9 +659,9 @@
 		SFS_AddString(parser, "|=");
 		SFS_Expression(parser);
 		break;
-    case ET_BOOLEAN:
+	case ET_BOOLEAN:
 		SFS_GetBoolean(parser);
-        break;
+		break;
 	case ET_VAR:
 		SFS_AddString(parser, "var ");
 		SFS_Arguments(parser, 1);
@@ -675,7 +681,7 @@
 {
 	if (parser->codec->LastError) return;
 	SFS_AddString(parser, "new ");
-    SFS_Identifier(parser);
+	SFS_Identifier(parser);
 	SFS_AddString(parser, "(");
 	SFS_Params(parser);
 	SFS_AddString(parser, ") ");
@@ -685,7 +691,7 @@
 {
 	if (parser->codec->LastError) return;
 	SFS_Expression(parser);
-    SFS_AddString(parser, "[");
+	SFS_AddString(parser, "[");
 	SFS_CompoundExpression(parser);
 	SFS_AddString(parser, "]");
 }
@@ -704,7 +710,7 @@
 	if (parser->codec->LastError) return;
 	SFS_Expression(parser);
 	SFS_AddString(parser, ".");
-    SFS_Identifier(parser);
+	SFS_Identifier(parser);
 }
 
 
@@ -752,7 +758,7 @@
 			SFS_AddChar(parser, '.');
 		} else if (val==11) {
 			SFS_AddChar(parser, 'E');
-		} else if (val==12){
+		} else if (val==12) {
 			SFS_AddChar(parser, '-');
 		}
 		val = gf_bs_read_int(parser->bs, 4);

gpac-0.5.0.svn5178.tar.bz2/src/bifs/script_enc.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/script_enc.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -33,7 +33,7 @@
 
 #if !defined(GPAC_DISABLE_BIFS) && !defined(GPAC_DISABLE_BIFS_ENC) && defined(GPAC_HAS_SPIDERMONKEY)
 
-typedef struct 
+typedef struct
 {
 	GF_Node *script;
 	GF_BifsEncoder *codec;
@@ -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)
 {
@@ -134,7 +134,7 @@
 
 
 
-enum 
+enum
 {
 	TOK_FUNCTION,
 	TOK_IF,
@@ -201,7 +201,7 @@
 	TOK_STRING,
 	TOK_NUMBER,
 	TOK_EOF,
-    TOK_BOOLEAN 
+	TOK_BOOLEAN
 };
 
 const char *tok_names[] =
@@ -218,7 +218,7 @@
 	"switch",
 	"case",
 	"default",
-    "var",
+	"var",
 	"{",
 	"}",
 	"(",
@@ -269,7 +269,7 @@
 	"identifier",
 	"string",
 	"number",
-    "boolean",
+	"boolean",
 	"end of script"
 };
 
@@ -294,13 +294,13 @@
 {
 	u32 i = 0;
 	Bool exp = 0;
-	while ( isdigit(sc_enc->cur_buf[i]) 
-		|| (toupper(sc_enc->cur_buf[i])=='X') 
-		|| ((toupper(sc_enc->cur_buf[i]) >='A') && (toupper(sc_enc->cur_buf[i])<='F')) 
-		|| (sc_enc->cur_buf[i]=='.')
-		|| (tolower(sc_enc->cur_buf[i])=='e')
-		|| (exp && (sc_enc->cur_buf[i] == '-'))
-		) {
+	while ( isdigit(sc_enc->cur_buf[i])
+	        || (toupper(sc_enc->cur_buf[i])=='X')
+	        || ((toupper(sc_enc->cur_buf[i]) >='A') && (toupper(sc_enc->cur_buf[i])<='F'))
+	        || (sc_enc->cur_buf[i]=='.')
+	        || (tolower(sc_enc->cur_buf[i])=='e')
+	        || (exp && (sc_enc->cur_buf[i] == '-'))
+	      ) {
 		sc_enc->token[i] = sc_enc->cur_buf[i];
 		if (tolower(sc_enc->cur_buf[i])=='e') exp = 1;
 		i++;
@@ -362,9 +362,9 @@
 	/*get a number*/
 	if (isdigit(sc_enc->cur_buf[i])) return SFE_GetNumber(sc_enc);
 	/*get a string*/
-	if ((sc_enc->cur_buf[i]=='\'') || (sc_enc->cur_buf[i]=='\"') 
-		|| ((sc_enc->cur_buf[i]=='\\') && (sc_enc->cur_buf[i+1]=='\"'))
-		) {
+	if ((sc_enc->cur_buf[i]=='\'') || (sc_enc->cur_buf[i]=='\"')
+	        || ((sc_enc->cur_buf[i]=='\\') && (sc_enc->cur_buf[i+1]=='\"'))
+	   ) {
 		char end;
 		Bool skip_last = 0;
 		end = sc_enc->cur_buf[i];
@@ -407,7 +407,7 @@
 		} else {
 			sc_enc->token_code = TOK_ASSIGN;
 		}
-		break; 
+		break;
 	case '+':
 		if(sc_enc->cur_buf[i+1]=='=') {
 			sc_enc->token_code = TOK_PLUSEQ;
@@ -575,7 +575,7 @@
 	return 1;
 }
 
-void SFE_PutIdentifier(ScriptEnc *sc_enc, char *id) 
+void SFE_PutIdentifier(ScriptEnc *sc_enc, char *id)
 {
 	u32 i;
 	u32 nbBits, length;
@@ -589,11 +589,14 @@
 
 		nbBits = 0;
 		length = gf_list_count(sc_enc->identifiers) - 1;
-		while (length > 0) { length >>= 1; nbBits ++; }
+		while (length > 0) {
+			length >>= 1;
+			nbBits ++;
+		}
 		GF_BIFS_WRITE_INT(sc_enc->codec, sc_enc->bs, 1, 1, "received", str);
 		GF_BIFS_WRITE_INT(sc_enc->codec, sc_enc->bs, i-1, nbBits, "identifierCode", str);
 		return;
-	} 
+	}
 	GF_BIFS_WRITE_INT(sc_enc->codec, sc_enc->bs, 0, 1, "received", id);
 	gf_list_add(sc_enc->identifiers, gf_strdup(id));
 	gf_bifs_enc_name(sc_enc->codec, sc_enc->bs, id);
@@ -643,7 +646,7 @@
 	u32 nbExpr = 1;
 	u32 nbIndir = 0;
 	expr_sep[0] = 0;
-	
+
 	sc_enc->expr_toks_len = 0;
 
 	while ( (sc_enc->token_code != TOK_SEMICOLON) && (sc_enc->token_code != TOK_RIGHT_CURVE) ) {
@@ -681,16 +684,16 @@
 		else if (sc_enc->token_code == TOK_LEFT_BRACE) close_code = TOK_RIGHT_BRACE;
 
 		/*other expr*/
-		if ((sc_enc->token_code == TOK_COMMA) && (sc_enc->expr_toks[0] != TOK_VAR) ){
+		if ((sc_enc->token_code == TOK_COMMA) && (sc_enc->expr_toks[0] != TOK_VAR) ) {
 			expr_sep[nbExpr++] = sc_enc->expr_toks_len - 1;
-		} 
+		}
 		/*sub-expr*/
 		else if (close_code) {
 			count++;
 			do {
 				SFE_NextToken(sc_enc);
-				if ((sc_enc->token_code == TOK_IDENTIFIER) || (sc_enc->token_code == TOK_NUMBER) 
-					|| (sc_enc->token_code == TOK_STRING) || (sc_enc->token_code == TOK_BOOLEAN) ) {
+				if ((sc_enc->token_code == TOK_IDENTIFIER) || (sc_enc->token_code == TOK_NUMBER)
+				        || (sc_enc->token_code == TOK_STRING) || (sc_enc->token_code == TOK_BOOLEAN) ) {
 					gf_list_add(sc_enc->id_buf, gf_strdup(sc_enc->token));
 				}
 				sc_enc->expr_toks[sc_enc->expr_toks_len] = sc_enc->token_code;
@@ -708,11 +711,11 @@
 		return 0;
 	}
 	expr_sep[nbExpr] = sc_enc->expr_toks_len;
-	if ((sc_enc->token_code == TOK_IDENTIFIER) || (sc_enc->token_code == TOK_NUMBER) 
-		|| (sc_enc->token_code == TOK_STRING) || (sc_enc->token_code == TOK_BOOLEAN) ) {
+	if ((sc_enc->token_code == TOK_IDENTIFIER) || (sc_enc->token_code == TOK_NUMBER)
+	        || (sc_enc->token_code == TOK_STRING) || (sc_enc->token_code == TOK_BOOLEAN) ) {
 		gf_list_add(sc_enc->id_buf, gf_strdup(sc_enc->token));
 	}
-	
+
 	if ((sc_enc->token_code != TOK_CONDSEP) && (sc_enc->token_code != TOK_RIGHT_BRACE) && (sc_enc->expr_toks[0] != TOK_VAR)) {
 		sc_enc->expr_toks[sc_enc->expr_toks_len] = sc_enc->token_code;
 		sc_enc->expr_toks_len++;
@@ -813,11 +816,11 @@
 	SFE_NextToken(sc_enc);
 	SFE_OptionalExpression(sc_enc);
 	SFE_CheckToken(sc_enc, TOK_SEMICOLON);
-	
+
 	SFE_NextToken(sc_enc);
 	SFE_OptionalExpression(sc_enc);
 	SFE_CheckToken(sc_enc, TOK_SEMICOLON);
-	
+
 	SFE_NextToken(sc_enc);
 	SFE_OptionalExpression(sc_enc);
 	SFE_CheckToken(sc_enc, TOK_RIGHT_CURVE);
@@ -853,18 +856,18 @@
 	SFE_NextToken(sc_enc);
 	if (sc_enc->token_code == TOK_LEFT_BRACE) {
 		SFE_NextToken(sc_enc);
-	    while (sc_enc->token_code != TOK_RIGHT_BRACE) {
+		while (sc_enc->token_code != TOK_RIGHT_BRACE) {
 			SFE_WRITE_INT(sc_enc, 1, 1, "hasStatement", NULL);
-		    SFE_Statement(sc_enc);
+			SFE_Statement(sc_enc);
 			SFE_NextToken(sc_enc);
-	    }
+		}
 		SFE_NextToken(sc_enc);
 	}
-    while ((sc_enc->token_code != TOK_CASE) && (sc_enc->token_code != TOK_DEFAULT) && (sc_enc->token_code != TOK_RIGHT_BRACE)) {
+	while ((sc_enc->token_code != TOK_CASE) && (sc_enc->token_code != TOK_DEFAULT) && (sc_enc->token_code != TOK_RIGHT_BRACE)) {
 		SFE_WRITE_INT(sc_enc, 1, 1, "hasStatement", NULL);
 		SFE_Statement(sc_enc);
 		SFE_NextToken(sc_enc);
-    }
+	}
 	SFE_WRITE_INT(sc_enc, 0, 1, "hasStatement", NULL);
 }
 
@@ -914,7 +917,7 @@
 	sc_enc->emul = 1;
 
 	SFE_NextToken(sc_enc);
-    while (sc_enc->token_code == TOK_CASE) {
+	while (sc_enc->token_code == TOK_CASE) {
 		SFE_NextToken(sc_enc);
 		SFE_CheckToken(sc_enc, TOK_NUMBER);
 		nbBits = SFE_PutCaseInteger(sc_enc, sc_enc->token, 0);
@@ -923,19 +926,19 @@
 		SFE_NextToken(sc_enc);
 		SFE_CheckToken(sc_enc, TOK_CONDSEP);
 
-        SFE_CaseBlock(sc_enc);
+		SFE_CaseBlock(sc_enc);
 		SFE_WRITE_INT(sc_enc, (sc_enc->token_code == TOK_CASE) ? 1 : 0, 1, "hasMoreCases", NULL);
-    }
+	}
 
 	/*second pass in parent mode*/
 	sc_enc->cur_buf = buf_bck;
- 	sc_enc->token_code = tok_bck;
+	sc_enc->token_code = tok_bck;
 	sc_enc->emul = prev_emu;
 	maxBits ++;
 	SFE_WRITE_INT(sc_enc, maxBits, 5, "caseNbBits", NULL);
 
 	SFE_NextToken(sc_enc);
-    while (sc_enc->token_code == TOK_CASE) {
+	while (sc_enc->token_code == TOK_CASE) {
 		SFE_NextToken(sc_enc);
 		SFE_CheckToken(sc_enc, TOK_NUMBER);
 		SFE_PutCaseInteger(sc_enc, sc_enc->token, maxBits);
@@ -943,18 +946,18 @@
 		SFE_NextToken(sc_enc);
 		SFE_CheckToken(sc_enc, TOK_CONDSEP);
 
-        SFE_CaseBlock(sc_enc);
+		SFE_CaseBlock(sc_enc);
 		SFE_WRITE_INT(sc_enc, (sc_enc->token_code == TOK_CASE) ? 1 : 0, 1, "hasMoreCases", NULL);
-    }
+	}
 
-    if (sc_enc->token_code == TOK_DEFAULT) {
+	if (sc_enc->token_code == TOK_DEFAULT) {
 		SFE_WRITE_INT(sc_enc, 1, 1, "hasDefault", NULL);
 		SFE_NextToken(sc_enc);
 		SFE_CheckToken(sc_enc, TOK_CONDSEP);
-        SFE_CaseBlock(sc_enc);
-    } else {
+		SFE_CaseBlock(sc_enc);
+	} else {
 		SFE_WRITE_INT(sc_enc, 0, 1, "hasDefault", NULL);
-    }
+	}
 	SFE_CheckToken(sc_enc, TOK_RIGHT_BRACE);
 }
 
@@ -1029,7 +1032,7 @@
 	SFE_CheckToken(sc_enc, TOK_IDENTIFIER);
 	strcpy(szName, sc_enc->token);
 	SFE_PutIdentifier(sc_enc, sc_enc->token);
-	
+
 	SFE_NextToken(sc_enc);
 	SFE_CheckToken(sc_enc, TOK_LEFT_CURVE);
 
@@ -1057,7 +1060,7 @@
 	if (codec->is_encoding_command) {
 		GF_BIFS_WRITE_INT(codec, bs, 1, 1, "Script::isList", NULL);
 		GF_BIFS_WRITE_INT(codec, bs, 1, 1, "end", NULL);
-	} else {	
+	} else {
 		EncScriptFields(&sc_enc);
 	}
 	/*reserevd*/
@@ -1069,10 +1072,10 @@
 		sc_enc.cur_buf = (char *)((M_Script*)n)->url.vals[0].script_text;
 	}
 	if (sc_enc.cur_buf) {
-		if (!strnicmp(sc_enc.cur_buf, "javascript:", 11) 
-			|| !strnicmp(sc_enc.cur_buf, "vrmlscript:", 11)
-			|| !strnicmp(sc_enc.cur_buf, "ECMAScript:", 11)
-			) {
+		if (!strnicmp(sc_enc.cur_buf, "javascript:", 11)
+		        || !strnicmp(sc_enc.cur_buf, "vrmlscript:", 11)
+		        || !strnicmp(sc_enc.cur_buf, "ECMAScript:", 11)
+		   ) {
 			sc_enc.cur_buf += 11;
 		} else if (!strnicmp(sc_enc.cur_buf, "mpeg4script:", 12) ) {
 			sc_enc.cur_buf += 12;
@@ -1105,7 +1108,7 @@
 		gf_free(ptr);
 	}
 	gf_list_del(sc_enc.id_buf);
-	
+
 	return sc_enc.err;
 }
 
@@ -1116,14 +1119,22 @@
 	size_t length = strlen(str);
 	for (i=0; i<length; i++) {
 		s32 c = str[i];
-		if (c >= '0' && c <= '9') 
-			{ SFE_WRITE_INT(sc_enc, c-'0', 4, "floatChar", "Digital"); }
-		else if (c == '.') 
-			{ SFE_WRITE_INT(sc_enc, 10, 4, "floatChar", "Decimal Point"); }
-		else if (c == 'e' || c == 'E') 
-			{ SFE_WRITE_INT(sc_enc, 11, 4, "floatChar", "Exponential");}
-		else if (c == '-') 
-			{SFE_WRITE_INT(sc_enc, 12, 4, "floatChar", "Sign");}
+		if (c >= '0' && c <= '9')
+		{
+			SFE_WRITE_INT(sc_enc, c-'0', 4, "floatChar", "Digital");
+		}
+		else if (c == '.')
+		{
+			SFE_WRITE_INT(sc_enc, 10, 4, "floatChar", "Decimal Point");
+		}
+		else if (c == 'e' || c == 'E')
+		{
+			SFE_WRITE_INT(sc_enc, 11, 4, "floatChar", "Exponential");
+		}
+		else if (c == '-')
+		{
+			SFE_WRITE_INT(sc_enc, 12, 4, "floatChar", "Sign");
+		}
 		else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: %s is not a real number\n", str));
 			sc_enc->err = GF_BAD_PARAM;
@@ -1133,9 +1144,9 @@
 	SFE_WRITE_INT(sc_enc, 15, 4, "floatChar", "End Symbol");
 }
 
-void SFE_PutNumber(ScriptEnc *sc_enc, char *str) 
+void SFE_PutNumber(ScriptEnc *sc_enc, char *str)
 {
-   if (strpbrk(str,".eE-") == 0) {
+	if (strpbrk(str,".eE-") == 0) {
 		SFE_WRITE_INT(sc_enc, 1, 1, "isInteger", "integer");
 		SFE_PutInteger(sc_enc, str);
 	} else {
@@ -1146,7 +1157,7 @@
 
 void SFE_PutBoolean(ScriptEnc *sc_enc, char *str)
 {
-    u32 v = 1;
+	u32 v = 1;
 	if (!stricmp(str, "false") || !strcmp(str, "0")) v = 0;
 	SFE_WRITE_INT(sc_enc, v, 1, "value", "bolean");
 }
@@ -1157,49 +1168,86 @@
 		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)
 {
 	switch(tok) {
-	case TOK_INCREMENT: return ET_INCREMENT;
-	case TOK_DECREMENT: return ET_DECREMENT;
-	case TOK_NOT: return ET_NOT;
-	case TOK_ONESCOMP: return ET_ONESCOMP;
-	case TOK_MULTIPLY : return ET_MULTIPLY;
-	case TOK_DIVIDE : return ET_DIVIDE;
-	case TOK_MOD : return ET_MOD;
-	case TOK_PLUS : return ET_PLUS;
-	case TOK_MINUS : return ET_MINUS;
-	case TOK_LSHIFT : return ET_LSHIFT;
-	case TOK_RSHIFT : return ET_RSHIFT;
-	case TOK_RSHIFTFILL : return ET_RSHIFTFILL;
-	case TOK_LT : return ET_LT;
-	case TOK_LE : return ET_LE;
-	case TOK_GT : return ET_GT;
-	case TOK_GE : return ET_GE;
-	case TOK_EQ : return ET_EQ;
-	case TOK_NE : return ET_NE;
-	case TOK_AND : return ET_AND;
-	case TOK_XOR : return ET_XOR;
-	case TOK_OR : return ET_OR;
-	case TOK_LAND : return ET_LAND;
-	case TOK_LOR : return ET_LOR;
-	case TOK_CONDTEST : return ET_CONDTEST;
-	case TOK_ASSIGN : return ET_ASSIGN;
-	case TOK_PLUSEQ : return ET_PLUSEQ;
-	case TOK_MINUSEQ : return ET_MINUSEQ;
-	case TOK_MULTIPLYEQ : return ET_MULTIPLYEQ;
-	case TOK_DIVIDEEQ : return ET_DIVIDEEQ;
-	case TOK_MODEQ : return ET_MODEQ;
-	case TOK_LSHIFTEQ : return ET_LSHIFTEQ;
-	case TOK_RSHIFTEQ : return ET_RSHIFTEQ;
-	case TOK_RSHIFTFILLEQ : return ET_RSHIFTFILLEQ;
-	case TOK_ANDEQ : return ET_ANDEQ;
-	case TOK_XOREQ : return ET_XOREQ;
-	case TOK_OREQ : return ET_OREQ;
-	case TOK_FUNCTION: return ET_FUNCTION_CALL;
-	case TOK_VAR: 
+	case TOK_INCREMENT:
+		return ET_INCREMENT;
+	case TOK_DECREMENT:
+		return ET_DECREMENT;
+	case TOK_NOT:
+		return ET_NOT;
+	case TOK_ONESCOMP:
+		return ET_ONESCOMP;
+	case TOK_MULTIPLY :
+		return ET_MULTIPLY;
+	case TOK_DIVIDE :
+		return ET_DIVIDE;
+	case TOK_MOD :
+		return ET_MOD;
+	case TOK_PLUS :
+		return ET_PLUS;
+	case TOK_MINUS :
+		return ET_MINUS;
+	case TOK_LSHIFT :
+		return ET_LSHIFT;
+	case TOK_RSHIFT :
+		return ET_RSHIFT;
+	case TOK_RSHIFTFILL :
+		return ET_RSHIFTFILL;
+	case TOK_LT :
+		return ET_LT;
+	case TOK_LE :
+		return ET_LE;
+	case TOK_GT :
+		return ET_GT;
+	case TOK_GE :
+		return ET_GE;
+	case TOK_EQ :
+		return ET_EQ;
+	case TOK_NE :
+		return ET_NE;
+	case TOK_AND :
+		return ET_AND;
+	case TOK_XOR :
+		return ET_XOR;
+	case TOK_OR :
+		return ET_OR;
+	case TOK_LAND :
+		return ET_LAND;
+	case TOK_LOR :
+		return ET_LOR;
+	case TOK_CONDTEST :
+		return ET_CONDTEST;
+	case TOK_ASSIGN :
+		return ET_ASSIGN;
+	case TOK_PLUSEQ :
+		return ET_PLUSEQ;
+	case TOK_MINUSEQ :
+		return ET_MINUSEQ;
+	case TOK_MULTIPLYEQ :
+		return ET_MULTIPLYEQ;
+	case TOK_DIVIDEEQ :
+		return ET_DIVIDEEQ;
+	case TOK_MODEQ :
+		return ET_MODEQ;
+	case TOK_LSHIFTEQ :
+		return ET_LSHIFTEQ;
+	case TOK_RSHIFTEQ :
+		return ET_RSHIFTEQ;
+	case TOK_RSHIFTFILLEQ :
+		return ET_RSHIFTFILLEQ;
+	case TOK_ANDEQ :
+		return ET_ANDEQ;
+	case TOK_XOREQ :
+		return ET_XOREQ;
+	case TOK_OREQ :
+		return ET_OREQ;
+	case TOK_FUNCTION:
+		return ET_FUNCTION_CALL;
+	case TOK_VAR:
 		return ET_VAR;
 	default:
 		assert(0);
@@ -1207,58 +1255,58 @@
 	}
 }
 
-static const char *expr_name[] ={
-"ET_CURVED_EXPR",
-"ET_NEGATIVE",
-"ET_NOT",
-"ET_ONESCOMP",
-"ET_INCREMENT",
-"ET_DECREMENT",
-"ET_POST_INCREMENT",
-"ET_POST_DECREMENT",
-"ET_CONDTEST",
-"ET_STRING",
-"ET_NUMBER",
-"ET_IDENTIFIER",
-"ET_FUNCTION_CALL",
-"ET_NEW",
-"ET_OBJECT_MEMBER_ACCESS",
-"ET_OBJECT_METHOD_CALL",
-"ET_ARRAY_DEREFERENCE",
-"ET_ASSIGN",
-"ET_PLUSEQ",
-"ET_MINUSEQ",
-"ET_MULTIPLYEQ",
-"ET_DIVIDEEQ",
-"ET_MODEQ",
-"ET_ANDEQ",
-"ET_OREQ",
-"ET_XOREQ",
-"ET_LSHIFTEQ",
-"ET_RSHIFTEQ",
-"ET_RSHIFTFILLEQ",
-"ET_EQ",
-"ET_NE",
-"ET_LT",
-"ET_LE",
-"ET_GT",
-"ET_GE",
-"ET_PLUS",
-"ET_MINUS",
-"ET_MULTIPLY",
-"ET_DIVIDE",
-"ET_MOD",
-"ET_LAND",
-"ET_LOR",
-"ET_AND",
-"ET_OR",
-"ET_XOR",
-"ET_LSHIFT",
-"ET_RSHIFT",
-"ET_RSHIFTFILL",
-"ET_BOOLEAN",
-"ET_VAR",
-"NUMBER_OF_EXPR_TYPE"
+static const char *expr_name[] = {
+	"ET_CURVED_EXPR",
+	"ET_NEGATIVE",
+	"ET_NOT",
+	"ET_ONESCOMP",
+	"ET_INCREMENT",
+	"ET_DECREMENT",
+	"ET_POST_INCREMENT",
+	"ET_POST_DECREMENT",
+	"ET_CONDTEST",
+	"ET_STRING",
+	"ET_NUMBER",
+	"ET_IDENTIFIER",
+	"ET_FUNCTION_CALL",
+	"ET_NEW",
+	"ET_OBJECT_MEMBER_ACCESS",
+	"ET_OBJECT_METHOD_CALL",
+	"ET_ARRAY_DEREFERENCE",
+	"ET_ASSIGN",
+	"ET_PLUSEQ",
+	"ET_MINUSEQ",
+	"ET_MULTIPLYEQ",
+	"ET_DIVIDEEQ",
+	"ET_MODEQ",
+	"ET_ANDEQ",
+	"ET_OREQ",
+	"ET_XOREQ",
+	"ET_LSHIFTEQ",
+	"ET_RSHIFTEQ",
+	"ET_RSHIFTFILLEQ",
+	"ET_EQ",
+	"ET_NE",
+	"ET_LT",
+	"ET_LE",
+	"ET_GT",
+	"ET_GE",
+	"ET_PLUS",
+	"ET_MINUS",
+	"ET_MULTIPLY",
+	"ET_DIVIDE",
+	"ET_MOD",
+	"ET_LAND",
+	"ET_LOR",
+	"ET_AND",
+	"ET_OR",
+	"ET_XOR",
+	"ET_LSHIFT",
+	"ET_RSHIFT",
+	"ET_RSHIFTFILL",
+	"ET_BOOLEAN",
+	"ET_VAR",
+	"NUMBER_OF_EXPR_TYPE"
 };
 
 #define NUMBER_OF_RANK	15
@@ -1315,23 +1363,23 @@
 	0, // ET_BOOLEAN
 	14 // ET_VAR
 
-/*
-	0, 0, 0,			// variable, number, string
-	1, 1, 1, 1, 1,			// curved expr, call, member, array
-	2, 2, 2, 2, 2, 2, 2, 2,		// unary operator
-	3, 3, 3,			// multiply, divide, mod
-	4, 4,				// add, subtract
-	5, 5, 5,			// bitwise shift
-	6, 6, 6, 6,			// relational
-	7, 7,				// equality
-	8,				// bitwise and
-	9,				// bitwise xor
-	10,				// bitwise or
-	11,				// logical and
-	12,				// logical or
-	13,				// conditional
-	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14	// assignment
-	*/
+	/*
+		0, 0, 0,			// variable, number, string
+		1, 1, 1, 1, 1,			// curved expr, call, member, array
+		2, 2, 2, 2, 2, 2, 2, 2,		// unary operator
+		3, 3, 3,			// multiply, divide, mod
+		4, 4,				// add, subtract
+		5, 5, 5,			// bitwise shift
+		6, 6, 6, 6,			// relational
+		7, 7,				// equality
+		8,				// bitwise and
+		9,				// bitwise xor
+		10,				// bitwise or
+		11,				// logical and
+		12,				// logical or
+		13,				// conditional
+		14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14	// assignment
+		*/
 };
 static s32 ET_leftAssoc[NUMBER_OF_RANK] = {1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
 
@@ -1339,7 +1387,7 @@
 {
 	u32 cnt = 0;
 	u32 startTok = TOK_EOF, curTok;
-	
+
 	if (endTok == TOK_RIGHT_CURVE) startTok = TOK_LEFT_CURVE;
 	else if (endTok == TOK_RIGHT_BRACKET) startTok = TOK_LEFT_BRACKET;
 	else if (endTok == TOK_RIGHT_BRACE) startTok = TOK_LEFT_BRACE;
@@ -1388,9 +1436,9 @@
 		case TOK_NUMBER:
 			curExpr = ET_NUMBER;
 			break;
-        case TOK_BOOLEAN:
-            curExpr = ET_BOOLEAN;
-            break;
+		case TOK_BOOLEAN:
+			curExpr = ET_BOOLEAN;
+			break;
 		case TOK_STRING:
 			curExpr = ET_STRING;
 			break;
@@ -1430,10 +1478,10 @@
 			break;
 		case TOK_PLUS:
 			if (
-				prevTok==TOK_RIGHT_CURVE || prevTok==TOK_RIGHT_BRACKET ||
-				prevTok==TOK_IDENTIFIER || prevTok==TOK_NUMBER ||
-				prevTok==TOK_STRING || prevTok==TOK_INCREMENT ||
-				prevTok==TOK_DECREMENT
+			    prevTok==TOK_RIGHT_CURVE || prevTok==TOK_RIGHT_BRACKET ||
+			    prevTok==TOK_IDENTIFIER || prevTok==TOK_NUMBER ||
+			    prevTok==TOK_STRING || prevTok==TOK_INCREMENT ||
+			    prevTok==TOK_DECREMENT
 			) {
 				curExpr = ET_PLUS;
 			} else {
@@ -1442,10 +1490,10 @@
 			break;
 		case TOK_MINUS:
 			if (
-				prevTok==TOK_RIGHT_CURVE || prevTok==TOK_RIGHT_BRACKET ||
-				prevTok==TOK_IDENTIFIER || prevTok==TOK_NUMBER ||
-				prevTok==TOK_STRING || prevTok==TOK_INCREMENT ||
-				prevTok==TOK_DECREMENT
+			    prevTok==TOK_RIGHT_CURVE || prevTok==TOK_RIGHT_BRACKET ||
+			    prevTok==TOK_IDENTIFIER || prevTok==TOK_NUMBER ||
+			    prevTok==TOK_STRING || prevTok==TOK_INCREMENT ||
+			    prevTok==TOK_DECREMENT
 			) {
 				curExpr = ET_MINUS;
 			} else {
@@ -1478,8 +1526,8 @@
 			break;
 		default:
 
-			if (curTok && (curTok != TOK_VAR)  
-				&& (curTok < TOK_MULTIPLY || curTok > TOK_OREQ)) {
+			if (curTok && (curTok != TOK_VAR)
+			        && (curTok < TOK_MULTIPLY || curTok > TOK_OREQ)) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: illegal token %s read\n", tok_names[curTok]));
 				sc_enc->err = GF_BAD_PARAM;
 				return 0;
@@ -1523,7 +1571,7 @@
 			return expr;
 		}
 	}
-	
+
 	SFE_WRITE_INT(sc_enc, expr, NUMBITS_EXPR_TYPE, "expressionType", (char *) expr_name[expr]);
 
 	switch (expr) {
@@ -1570,7 +1618,7 @@
 		}
 		SFE_Expression(sc_enc, finalPos+1, end, 0);
 	}
-		break;
+	break;
 
 	case ET_IDENTIFIER:
 		str = (char *)gf_list_get(sc_enc->id_buf, 0);
@@ -1588,13 +1636,13 @@
 		SFE_PutNumber(sc_enc, str);
 		gf_free(str);
 		break;
-    case ET_BOOLEAN:
+	case ET_BOOLEAN:
 		str = (char *)gf_list_get(sc_enc->id_buf, 0);
 		gf_list_rem(sc_enc->id_buf, 0);
 		SFE_PutBoolean(sc_enc, str);
 		gf_free(str);
 		break;
-    case ET_VAR:
+	case ET_VAR:
 		while (1) {
 			str = (char *)gf_list_get(sc_enc->id_buf, 0);
 			if (!str) break;
@@ -1690,7 +1738,7 @@
 	CHECK_TOK(TOK_IDENTIFIER);
 	str = (char *)gf_list_get(sc_enc->id_buf, 0);
 	gf_list_rem(sc_enc->id_buf, 0);
-    SFE_PutIdentifier(sc_enc, str);
+	SFE_PutIdentifier(sc_enc, str);
 	gf_free(str);
 }
 
@@ -1706,7 +1754,7 @@
 	CHECK_TOK(TOK_IDENTIFIER);
 	str = (char *)gf_list_get(sc_enc->id_buf, 0);
 	gf_list_rem(sc_enc->id_buf, 0);
-    SFE_PutIdentifier(sc_enc, str);
+	SFE_PutIdentifier(sc_enc, str);
 	gf_free(str);
 	curTok = sc_enc->expr_toks[op+2];
 	CHECK_TOK(TOK_LEFT_CURVE);
@@ -1768,10 +1816,10 @@
 
 	curTok = sc_enc->expr_toks[start];
 	if (curTok != TOK_RIGHT_CURVE) {
-		SFE_WRITE_INT(sc_enc, 1, 1, "hasParam", NULL); 
+		SFE_WRITE_INT(sc_enc, 1, 1, "hasParam", NULL);
 		SFE_CompoundExpression(sc_enc, start, end, 1);
 	} else {
-		SFE_WRITE_INT(sc_enc, 0, 1, "hasParam", NULL); 
+		SFE_WRITE_INT(sc_enc, 0, 1, "hasParam", NULL);
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/bifs/unquantize.c -> gpac-0.5.1.svn5491.tar.xz/src/bifs/unquantize.c Changed

gpac-0.5.0.svn5178.tar.bz2/src/compositor/audio_input.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/audio_input.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -58,7 +58,7 @@
 	GF_AudioInput *ai = (GF_AudioInput *) callback;
 	/*even if the stream is signaled as finished we must check it, because it may have been restarted by a mediaControl*/
 	if (!ai->stream) return NULL;
-	
+
 	frame = gf_mo_fetch_data(ai->stream, 0, &ai->stream_finished, &ts, size, NULL, NULL);
 	/*invalidate scene on end of stream to refresh audio graph*/
 	if (ai->stream_finished) gf_sc_invalidate(ai->compositor, NULL);
@@ -82,7 +82,7 @@
 		drift = (s32)obj_time;
 		drift -= (s32)ts;
 	}
-	
+
 #ifdef ENABLE_EARLY_FRAME_DETECTION
 	/*too early (silence insertions), skip*/
 	if (drift < 0) {
@@ -95,7 +95,7 @@
 #endif
 	/*adjust drift*/
 	if (audio_delay_ms) {
-		s32 resync_delay = FIX2INT(speed * MAX_RESYNC_TIME);
+		s32 resync_delay = speed > 0 ? FIX2INT(speed * MAX_RESYNC_TIME) : FIX2INT(-speed * MAX_RESYNC_TIME);
 		/*CU is way too late, discard and fetch a new one - this usually happen when media speed is more than 1*/
 		if (drift>resync_delay) {
 			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));
@@ -138,7 +138,7 @@
 {
 	GF_AudioInput *ai = (GF_AudioInput *) callback;
 	if (!ai->stream) return 1;
-	if (ai->is_muted) 
+	if (ai->is_muted)
 		return 1;
 	return gf_mo_is_muted(ai->stream);
 }
@@ -149,7 +149,7 @@
 	if (!ai->stream) return 0;
 	/*watchout for object reuse*/
 	if (aifc->samplerate && (gf_mo_get_flags(ai->stream) & GF_MO_IS_INIT)) return 1;
-	if (!for_recf) 
+	if (!for_recf)
 		return 0;
 
 	gf_mo_get_audio_info(ai->stream, &aifc->samplerate, &aifc->bps , &aifc->chan, &aifc->ch_cfg);
@@ -211,11 +211,11 @@
 
 	if (ai->filter) gf_af_del(ai->filter);
 	ai->filter = NULL;
-	
+
 	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) 
+			if (ai->filter)
 				break;
 		}
 	}
@@ -226,7 +226,7 @@
 void gf_sc_audio_stop(GF_AudioInput *ai)
 {
 	if (!ai->is_open) return;
-	
+
 	/*we must make sure audio mixer is not using the stream otherwise we may leave it dirty (with unrelease frame)*/
 	gf_mixer_lock(ai->compositor->audio_renderer->mixer, 1);
 
@@ -269,12 +269,12 @@
 
 	/*check interface is valid*/
 	if (!ai->input_ifce.FetchFrame
-		|| !ai->input_ifce.GetChannelVolume
-		|| !ai->input_ifce.GetConfig
-		|| !ai->input_ifce.GetSpeed
-		|| !ai->input_ifce.IsMuted
-		|| !ai->input_ifce.ReleaseFrame
-		) return;
+	        || !ai->input_ifce.GetChannelVolume
+	        || !ai->input_ifce.GetConfig
+	        || !ai->input_ifce.GetSpeed
+	        || !ai->input_ifce.IsMuted
+	        || !ai->input_ifce.ReleaseFrame
+	   ) return;
 
 	aifce = &ai->input_ifce;
 	if (ai->filter) aifce = &ai->filter->input;
@@ -290,7 +290,7 @@
 		ai->register_with_parent = 1;
 		ai->snd = tr_state->sound_holder;
 	} else if (!ai->register_with_renderer) {
-		
+
 		if (ai->register_with_parent) {
 			ai->register_with_parent = 0;
 			/*if used in a parent audio group, do a complete traverse to rebuild the group*/
@@ -331,7 +331,7 @@
 			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) 
+			if (!data || !nb_bytes)
 				return NULL;
 
 			if (nb_bytes > af->filter_chain.min_block_size) nb_bytes = af->filter_chain.min_block_size;
@@ -376,7 +376,7 @@
 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 0;
 	if (!for_reconf) return 1;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/audio_mixer.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/audio_mixer.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,7 +32,7 @@
 	Notes about the mixer:
 	1- spatialization is out of scope for the mixer (eg that's the sound node responsability)
 	2- mixing is performed by resampling input source & deinterleaving its channels into dedicated buffer.
-	We could directly deinterleave in the main mixer ouput buffer, but this would prevent any future 
+	We could directly deinterleave in the main mixer ouput buffer, but this would prevent any future
 	gain correction.
 */
 typedef struct
@@ -44,7 +44,7 @@
 	u32 buffer_size;
 
 	u32 bytes_per_sec;
-	
+
 	Bool has_prev;
 	s32 last_channels[GF_SR_MAX_CHANNELS];
 
@@ -97,7 +97,7 @@
 	return am;
 }
 
-Bool gf_mixer_must_reconfig(GF_AudioMixer *am) 
+Bool gf_mixer_must_reconfig(GF_AudioMixer *am)
 {
 	return am->must_reconfig;
 }
@@ -123,7 +123,7 @@
 		gf_free(in);
 	}
 	am->isEmpty = 1,
-	gf_mixer_lock(am, 0);
+	    gf_mixer_lock(am, 0);
 }
 
 Bool gf_mixer_is_src_present(GF_AudioMixer *am, GF_AudioInterface *ifce)
@@ -223,8 +223,8 @@
 GF_EXPORT
 void gf_mixer_set_config(GF_AudioMixer *am, u32 outSR, u32 outCH, u32 outBPS, u32 outChCfg)
 {
-	if ((am->bits_per_sample == outBPS) && (am->nb_channels == outCH) 
-		&& (am->sample_rate==outSR) && (am->channel_cfg == outChCfg)) return;
+	if ((am->bits_per_sample == outBPS) && (am->nb_channels == outCH)
+	        && (am->sample_rate==outSR) && (am->channel_cfg == outChCfg)) return;
 
 	gf_mixer_lock(am, 1);
 	am->bits_per_sample = outBPS;
@@ -306,7 +306,7 @@
 			memset(&in->last_channels, 0, sizeof(s16)*GF_SR_MAX_CHANNELS);
 		}
 	}
-	
+
 	if (cfg_changed || (max_sample_rate && (max_sample_rate != am->sample_rate)) ) {
 		if (max_channels>2) {
 			if (ch_cfg != am->channel_cfg) {
@@ -328,7 +328,7 @@
 		}
 		gf_mixer_set_config(am, max_sample_rate, max_channels, max_bps, ch_cfg);
 	}
-	
+
 	if (numInit == count) am->must_reconfig = 0;
 
 	gf_mixer_lock(am, 0);
@@ -474,7 +474,7 @@
 		in_s8 = NULL;
 	}
 
-	/*just in case, if only 1 sample available in src, copy over and discard frame since we cannot 
+	/*just in case, if only 1 sample available in src, copy over and discard frame since we cannot
 	interpolate audio*/
 	if (src_samp==1) {
 		in->has_prev = 1;
@@ -494,14 +494,14 @@
 		next = prev+1;
 		frac = (i*ratio) - 255*prev;
 		if (frac && (next==src_samp)) break;
-		if (use_prev && prev) 
+		if (use_prev && prev)
 			use_prev = 0;
 
 		if (in_s16) {
 			for (j=0; j<in_ch; j++) {
 				inChan[j] = use_prev ? in->last_channels[j] : in_s16[in_ch*prev + j];
 				inChanNext[j] = in_s16[in_ch*next + j];
-				inChan[j] = (frac*inChanNext[j] + (255-frac)*inChan[j]) / 255;			
+				inChan[j] = (frac*inChanNext[j] + (255-frac)*inChan[j]) / 255;
 			}
 		} else {
 			for (j=0; j<in_ch; j++) {
@@ -592,7 +592,7 @@
 	single_source->muted = single_source->src->IsMuted(single_source->src->callback);
 	/*this happens if input SR cannot be mapped to output audio hardware*/
 	if (single_source->src->samplerate != am->sample_rate) goto do_mix;
-	/*note we don't check output cfg: if the number of channel is the same then the channel cfg is the 
+	/*note we don't check output cfg: if the number of channel is the same then the channel cfg is the
 	same*/
 	if (single_source->src->chan != am->nb_channels) goto do_mix;
 	if (single_source->src->GetSpeed(single_source->src->callback)!=FIX_ONE) goto do_mix;
@@ -654,16 +654,16 @@
 		in->muted = in->src->IsMuted(in->src->callback);
 		if (in->muted) continue;
 
-		if (in->buffer_size < nb_samples) { 
+		if (in->buffer_size < nb_samples) {
 			for (j=0; j<GF_SR_MAX_CHANNELS; j++) {
-				if (in->ch_buf[j]) gf_free(in->ch_buf[j]); 
+				if (in->ch_buf[j]) gf_free(in->ch_buf[j]);
 				in->ch_buf[j] = (s32 *) gf_malloc(sizeof(s32) * nb_samples);
 			}
-			in->buffer_size = nb_samples; 
+			in->buffer_size = nb_samples;
 		}
 		in->speed = in->src->GetSpeed(in->src->callback);
 		if (in->speed<0) in->speed *= -1;
-		
+
 		in->out_samples_written = 0;
 		in->in_bytes_used = 0;
 
@@ -677,11 +677,11 @@
 				}
 				in->muted = 1;
 				continue;
-			} 
+			}
 			//otherwise fallthrou, mixer keeps the same config
 			force_mix = GF_TRUE;
-		} 
-		
+		}
+
 		if (in->speed==0) {
 			in->out_samples_to_write = 0;
 		} else {
@@ -692,9 +692,9 @@
 			} else {
 				if (!force_mix  && !in->src->GetChannelVolume(in->src->callback, in->pan)) {
 					/*track first active source with same cfg as mixer*/
-					if (!single_source && (in->src->samplerate == am->sample_rate) 
-						&& (in->src->chan == am->nb_channels) && (in->speed == FIX_ONE) 
-					) 
+					if (!single_source && (in->src->samplerate == am->sample_rate)
+					        && (in->src->chan == am->nb_channels) && (in->speed == FIX_ONE)
+					   )
 						single_source = in;
 				}
 			}
@@ -791,7 +791,7 @@
 	}
 
 	nb_written *= am->nb_channels*am->bits_per_sample/8;
-	if (buffer_size > nb_written) 
+	if (buffer_size > nb_written)
 		memset((char *)buffer + nb_written, 0, sizeof(char)*(buffer_size-nb_written));
 
 	gf_mixer_lock(am, 0);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/audio_render.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/audio_render.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,24 +11,24 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #include <gpac/internal/compositor_dev.h>
 
 GF_Err gf_afc_load(GF_AudioFilterChain *afc, GF_User *user, char *filterstring)
-{	
+{
 	struct _audiofilterentry *prev_filter = NULL;
-	
+
 	while (filterstring) {
 		u32 i, count;
 		GF_AudioFilter *filter;
@@ -41,13 +41,13 @@
 			filter = (GF_AudioFilter *)gf_modules_load_interface(user->modules, i, GF_AUDIO_FILTER_INTERFACE);
 			if (filter) {
 				if (filter->SetFilter
-					&& filter->Configure
-					&& filter->Process
-					&& filter->Reset
-					&& filter->SetOption 
-					&& filter->GetOption 
-					&& filter->SetFilter(filter, filterstring)
-				)
+				        && filter->Configure
+				        && filter->Process
+				        && filter->Reset
+				        && filter->SetOption
+				        && filter->GetOption
+				        && filter->SetFilter(filter, filterstring)
+				   )
 					break;
 
 				gf_modules_close_interface((GF_BaseInterface *)filter);
@@ -101,7 +101,7 @@
 		if (entry->filter->Configure(entry->filter, sr, bps, chan, ch_cfg, &och, &ocfg, &block_len, &entry->delay_ms, &entry->in_place)==GF_OK) {
 			u32 out_block_size;
 			entry->in_block_size = chan * bps * block_len / 8;
-			if (!afc->min_block_size || (afc->min_block_size > entry->in_block_size)) 
+			if (!afc->min_block_size || (afc->min_block_size > entry->in_block_size))
 				afc->min_block_size = entry->in_block_size;
 
 			out_block_size = och * bps * block_len / 8;
@@ -168,7 +168,7 @@
 			/*copy bytes in input*/
 			memcpy(entry->in_block + entry->nb_bytes, inptr, nb_bytes);
 			entry->nb_bytes += nb_bytes;
-			
+
 			/*and process*/
 			while (entry->nb_bytes >= entry->in_block_size) {
 				u32 done;
@@ -179,7 +179,7 @@
 				processed += entry->in_block_size;
 			}
 			/*move remaining data at the begining of the buffer*/
-			if (processed && entry->nb_bytes) 
+			if (processed && entry->nb_bytes)
 				memmove(entry->in_block, entry->in_block+processed, entry->nb_bytes);
 
 			nb_bytes = nb_bytes_out;
@@ -246,7 +246,7 @@
 		nb_chan = och;
 
 		/*try to reconfigure audio output*/
-		if (!e) 
+		if (!e)
 			e = ar->audio_out->ConfigureOutput(ar->audio_out, &osr, &och, &obps, ocfg);
 
 		/*output module cannot support filter output, disable it ...*/
@@ -271,7 +271,7 @@
 		}
 		if (e) return e;
 	}
-	gf_mixer_set_config(ar->mixer, in_freq, in_ch, in_bps, in_cfg);
+	gf_mixer_set_config(ar->mixer, freq, nb_chan, nb_bits, in_cfg);
 	ar->audio_delay = ar->audio_out->GetAudioDelay(ar->audio_out);
 
 	ar->audio_out->SetVolume(ar->audio_out, ar->volume);
@@ -283,7 +283,7 @@
 		while ((l = gf_list_enum(ar->audio_listeners, &k))) {
 			l->on_audio_reconfig(l->udta, in_freq, in_bps, in_ch, in_cfg);
 		}
-	}	
+	}
 	return GF_OK;
 }
 
@@ -308,7 +308,7 @@
 
 					/*fill input block*/
 					nb_bytes = gf_mixer_get_output(ar->mixer, ar->filter_chain.tmp_block1, ar->filter_chain.min_block_size, delay_ms);
-					if (!nb_bytes) 
+					if (!nb_bytes)
 						return written;
 
 					/*delay used to check for late frames - we only use it on the first call to gf_mixer_get_output()*/
@@ -356,15 +356,9 @@
 	gf_mixer_lock(ar->mixer, 0);
 
 	while (ar->audio_th_state == 1) {
-		//GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioRender] Audio simulation step\n"));
-		
-		/*THIS IS NEEDED FOR SYMBIAN - if no yield here, the audio module always grabs the 
-		main mixer mutex and it takes forever before it can be grabed by another thread, 
-		for instance when reconfiguring scene*/
-//		gf_sleep(1);
-
 		gf_mixer_lock(ar->mixer, 1);
-		if (ar->Frozen || gf_mixer_empty(ar->mixer) ) {
+		//do mix even if mixer is empty, otherwise we will push the same buffer over and over to the sound card
+		if (ar->Frozen ) {
 			gf_mixer_lock(ar->mixer, 0);
 			gf_sleep(33);
 		} else {
@@ -403,7 +397,7 @@
 	ar->disable_resync = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
 	sOpt = gf_cfg_get_key(user->config, "Audio", "DisableMultiChannel");
 	ar->disable_multichannel = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	
+
 	ar->mixer = gf_mixer_new(ar);
 	ar->user = user;
 
@@ -458,7 +452,7 @@
 			ar->audio_out->audio_renderer = ar;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioRender] Setting up audio module %s\n", ar->audio_out->module_name));
 			e = ar->audio_out->Setup(ar->audio_out, ar->user->os_window_handler, num_buffers, total_duration);
-			
+
 
 			/*load main audio filter*/
 			gf_afc_load(&ar->filter_chain, user, (char*)gf_cfg_get_key(user->config, "Audio", "Filter"));
@@ -553,7 +547,7 @@
 }
 
 void gf_sc_ar_set_volume(GF_AudioRenderer *ar, u32 Volume)
-{	
+{
 	char sOpt[10];
 	gf_mixer_lock(ar->mixer, 1);
 	ar->volume = MIN(Volume, 100);
@@ -565,7 +559,7 @@
 }
 
 void gf_sc_ar_mute(GF_AudioRenderer *ar, Bool mute)
-{	
+{
 	gf_mixer_lock(ar->mixer, 1);
 	ar->mute = mute;
 	if (ar->audio_out) ar->audio_out->SetVolume(ar->audio_out, mute ? 0 : ar->volume);
@@ -592,7 +586,7 @@
 	recfg = gf_mixer_reconfig(ar->mixer);
 	if (!ar->need_reconfig) ar->need_reconfig = recfg;
 
-	if (!gf_mixer_empty(ar->mixer) && ar->audio_out && ar->audio_out->Play) 
+	if (!gf_mixer_empty(ar->mixer) && ar->audio_out && ar->audio_out->Play)
 		ar->audio_out->Play(ar->audio_out, 1);
 	/*unlock mixer*/
 	gf_mixer_lock(ar->mixer, 0);
@@ -602,7 +596,7 @@
 {
 	if (ar) {
 		gf_mixer_remove_input(ar->mixer, source);
-		if (gf_mixer_empty(ar->mixer) && ar->audio_out && ar->audio_out->Play) 
+		if (gf_mixer_empty(ar->mixer) && ar->audio_out && ar->audio_out->Play)
 			ar->audio_out->Play(ar->audio_out, 0);
 	}
 }
@@ -624,10 +618,10 @@
 	gf_mixer_lock(ar->mixer, 1);
 
 	gf_ar_freeze_intern(ar, 1, 1, 0);
-	ar->need_reconfig = 0;		
+	ar->need_reconfig = 0;
 	gf_ar_setup_output_format(ar);
 	gf_ar_freeze_intern(ar, 0, 1, 0);
-	
+
 	/*unlock mixer*/
 	gf_mixer_lock(ar->mixer, 0);
 }
@@ -656,7 +650,7 @@
 	gf_afc_load(&ar->filter_chain, ar->user, (char*)gf_cfg_get_key(ar->user->config, "Audio", "Filter"));
 
 	gf_ar_freeze_intern(ar, 1, 1, 0);
-	ar->need_reconfig = 0;		
+	ar->need_reconfig = 0;
 	gf_ar_setup_output_format(ar);
 	gf_ar_freeze_intern(ar, 0, 1, 0);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/bindable.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/bindable.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -33,28 +33,30 @@
 	if (!bindable) return 0;
 	st = gf_node_get_private(bindable);
 	switch (gf_node_get_tag(bindable)) {
-	case TAG_MPEG4_Background2D: return ((Background2DStack*)st)->reg_stacks;
+	case TAG_MPEG4_Background2D:
+		return ((Background2DStack*)st)->reg_stacks;
 	case TAG_MPEG4_Viewport:
-	case TAG_MPEG4_NavigationInfo: 
+	case TAG_MPEG4_NavigationInfo:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_NavigationInfo: 
+	case TAG_X3D_NavigationInfo:
 #endif
 		return ((ViewStack*)st)->reg_stacks;
 #ifndef GPAC_DISABLE_3D
-	case TAG_MPEG4_Background: 
+	case TAG_MPEG4_Background:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Background: 
+	case TAG_X3D_Background:
 #endif
 		return ((BackgroundStack*)st)->reg_stacks;
-	case TAG_MPEG4_Viewpoint: 
-	case TAG_MPEG4_Fog: 
+	case TAG_MPEG4_Viewpoint:
+	case TAG_MPEG4_Fog:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Viewpoint: 
+	case TAG_X3D_Viewpoint:
 	case TAG_X3D_Fog:
 #endif
 		return ((ViewStack*)st)->reg_stacks;
 #endif
-	default: return NULL;
+	default:
+		return NULL;
 	}
 }
 
@@ -62,29 +64,32 @@
 {
 	if (!bindable) return 0;
 	switch (gf_node_get_tag(bindable)) {
-	case TAG_MPEG4_Background2D: return ((M_Background2D*)bindable)->isBound;
-	case TAG_MPEG4_Viewport: return ((M_Viewport*)bindable)->isBound;
-	case TAG_MPEG4_Background: 
+	case TAG_MPEG4_Background2D:
+		return ((M_Background2D*)bindable)->isBound;
+	case TAG_MPEG4_Viewport:
+		return ((M_Viewport*)bindable)->isBound;
+	case TAG_MPEG4_Background:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Background: 
+	case TAG_X3D_Background:
 #endif
 		return ((M_Background*)bindable)->isBound;
-	case TAG_MPEG4_NavigationInfo: 
+	case TAG_MPEG4_NavigationInfo:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_NavigationInfo: 
+	case TAG_X3D_NavigationInfo:
 #endif
 		return ((M_NavigationInfo*)bindable)->isBound;
-	case TAG_MPEG4_Viewpoint: 
+	case TAG_MPEG4_Viewpoint:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Viewpoint: 
+	case TAG_X3D_Viewpoint:
 #endif
 		return ((M_Viewpoint*)bindable)->isBound;
-	case TAG_MPEG4_Fog: 
+	case TAG_MPEG4_Fog:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Fog: 
+	case TAG_X3D_Fog:
 #endif
 		return ((M_Fog*)bindable)->isBound;
-	default: return 0;
+	default:
+		return 0;
 	}
 }
 
@@ -93,7 +98,7 @@
 	Bool has_bind_time = 0;
 	if (!bindable) return;
 	switch (gf_node_get_tag(bindable)) {
-	case TAG_MPEG4_Background2D: 
+	case TAG_MPEG4_Background2D:
 		if ( ((M_Background2D*)bindable)->isBound == val) return;
 		((M_Background2D*)bindable)->isBound = val;
 		break;
@@ -116,20 +121,20 @@
 		((M_Background*)bindable)->isBound = val;
 		break;
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_NavigationInfo: 
+	case TAG_X3D_NavigationInfo:
 		if ( ((X_NavigationInfo*)bindable)->isBound == val) return;
 		((X_NavigationInfo*)bindable)->isBound = val;
 		((X_NavigationInfo*)bindable)->bindTime = gf_node_get_scene_time(bindable);
 		has_bind_time = 1;
 		break;
 #endif
-	case TAG_MPEG4_NavigationInfo: 
+	case TAG_MPEG4_NavigationInfo:
 		if ( ((M_NavigationInfo*)bindable)->isBound == val) return;
 		((M_NavigationInfo*)bindable)->isBound = val;
 		break;
-	case TAG_MPEG4_Viewpoint: 
+	case TAG_MPEG4_Viewpoint:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Viewpoint: 
+	case TAG_X3D_Viewpoint:
 #endif
 		if ( ((M_Viewpoint*)bindable)->isBound == val) return;
 		((M_Viewpoint*)bindable)->isBound = val;
@@ -137,18 +142,18 @@
 		has_bind_time = 1;
 		break;
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Fog: 
+	case TAG_X3D_Fog:
 		if ( ((X_Fog*)bindable)->isBound == val) return;
 		((X_Fog*)bindable)->isBound = val;
 		((X_Fog*)bindable)->bindTime = gf_node_get_scene_time(bindable);
 		has_bind_time = 1;
 		break;
 #endif
-	case TAG_MPEG4_Fog: 
+	case TAG_MPEG4_Fog:
 		if ( ((M_Fog*)bindable)->isBound == val) return;
 		((M_Fog*)bindable)->isBound = val;
 		break;
-	default: 
+	default:
 		return;
 	}
 	gf_node_event_out_str(bindable, "isBound");
@@ -162,29 +167,32 @@
 {
 	if (!bindable) return 0;
 	switch (gf_node_get_tag(bindable)) {
-	case TAG_MPEG4_Background2D: return ((M_Background2D*)bindable)->set_bind;
-	case TAG_MPEG4_Viewport: return ((M_Viewport*)bindable)->set_bind;
-	case TAG_MPEG4_Background: 
+	case TAG_MPEG4_Background2D:
+		return ((M_Background2D*)bindable)->set_bind;
+	case TAG_MPEG4_Viewport:
+		return ((M_Viewport*)bindable)->set_bind;
+	case TAG_MPEG4_Background:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Background: 
+	case TAG_X3D_Background:
 #endif
 		return ((M_Background*)bindable)->set_bind;
-	case TAG_MPEG4_NavigationInfo: 
+	case TAG_MPEG4_NavigationInfo:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_NavigationInfo: 
+	case TAG_X3D_NavigationInfo:
 #endif
 		return ((M_NavigationInfo*)bindable)->set_bind;
-	case TAG_MPEG4_Viewpoint: 
+	case TAG_MPEG4_Viewpoint:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Viewpoint: 
+	case TAG_X3D_Viewpoint:
 #endif
 		return ((M_Viewpoint*)bindable)->set_bind;
-	case TAG_MPEG4_Fog: 
+	case TAG_MPEG4_Fog:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Fog: 
+	case TAG_X3D_Fog:
 #endif
 		return ((M_Fog*)bindable)->set_bind;
-	default: return 0;
+	default:
+		return 0;
 	}
 }
 
@@ -192,43 +200,44 @@
 {
 	if (!bindable) return;
 	switch (gf_node_get_tag(bindable)) {
-	case TAG_MPEG4_Background2D: 
+	case TAG_MPEG4_Background2D:
 		((M_Background2D*)bindable)->set_bind = val;
 		((M_Background2D*)bindable)->on_set_bind(bindable, NULL);
 		break;
-	case TAG_MPEG4_Viewport: 
+	case TAG_MPEG4_Viewport:
 		((M_Viewport*)bindable)->set_bind = val;
 		((M_Viewport*)bindable)->on_set_bind(bindable, (GF_Route*)stack);
 		break;
-	case TAG_MPEG4_Background: 
+	case TAG_MPEG4_Background:
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Background:
 #endif
 		((M_Background*)bindable)->set_bind = val;
 		((M_Background*)bindable)->on_set_bind(bindable, NULL);
 		break;
-	case TAG_MPEG4_NavigationInfo: 
+	case TAG_MPEG4_NavigationInfo:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_NavigationInfo: 
+	case TAG_X3D_NavigationInfo:
 #endif
 		((M_NavigationInfo*)bindable)->set_bind = val;
 		((M_NavigationInfo*)bindable)->on_set_bind(bindable, NULL);
 		break;
-	case TAG_MPEG4_Viewpoint: 
+	case TAG_MPEG4_Viewpoint:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Viewpoint: 
+	case TAG_X3D_Viewpoint:
 #endif
 		((M_Viewpoint*)bindable)->set_bind = val;
 		((M_Viewpoint*)bindable)->on_set_bind(bindable, NULL);
 		break;
-	case TAG_MPEG4_Fog: 
+	case TAG_MPEG4_Fog:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Fog: 
+	case TAG_X3D_Fog:
 #endif
 		((M_Fog*)bindable)->set_bind = val;
 		((M_Fog*)bindable)->on_set_bind(bindable, NULL);
 		break;
-	default: return;
+	default:
+		return;
 	}
 }
 void Bindable_SetSetBind(GF_Node *bindable, Bool val)

gpac-0.5.0.svn5178.tar.bz2/src/compositor/camera.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/camera.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -95,7 +95,9 @@
 		vy = FIX2FLT(cam->planes[i].normal.y);
 		vz = FIX2FLT(cam->planes[i].normal.z);
 		nor = (Float) sqrt(vx*vx + vy*vy + vz*vz);
-		vx /= nor; vy /= nor; vz /= nor;
+		vx /= nor;
+		vy /= nor;
+		vz /= nor;
 		cam->planes[i].d = FLT2FIX (FIX2FLT(cam->planes[i].d) / nor);
 		cam->planes[i].normal.x = FLT2FIX(vx);
 		cam->planes[i].normal.y = FLT2FIX(vy);
@@ -122,26 +124,40 @@
 	tmp = gf_vec_scale(dir, gf_vec_dot(up, dir));
 	gf_vec_diff(v, up, tmp);
 	gf_vec_norm(&v);
-	axis.x = dir.y; axis.y = -dir.x; axis.z = 0;
+	axis.x = dir.y;
+	axis.y = -dir.x;
+	axis.z = 0;
 
 	if (gf_vec_dot(axis, axis) < FIX_EPSILON) {
 		if (dir.z> 0) {
-			norm.x = 0; norm.y = FIX_ONE; norm.z = 0; norm.q = 0;
+			norm.x = 0;
+			norm.y = FIX_ONE;
+			norm.z = 0;
+			norm.q = 0;
 		} else {
-			norm.x = 0; norm.y = 0; norm.z = 0; norm.q = FIX_ONE;
+			norm.x = 0;
+			norm.y = 0;
+			norm.z = 0;
+			norm.q = FIX_ONE;
 		}
 	} else {
 		gf_vec_norm(&axis);
 		norm = gf_quat_from_axis_cos(axis, -dir.z);
 	}
 	/* Find the inverse rotation. */
-    inv_norm.x = -norm.x; inv_norm.y = -norm.y; inv_norm.z = -norm.z; inv_norm.q = norm.q;
+	inv_norm.x = -norm.x;
+	inv_norm.y = -norm.y;
+	inv_norm.z = -norm.z;
+	inv_norm.q = norm.q;
 	/* Rotate the y. */
-	y_quat.x = y_quat.z = y_quat.q = 0; y_quat.y = FIX_ONE;
+	y_quat.x = y_quat.z = y_quat.q = 0;
+	y_quat.y = FIX_ONE;
 	ny_quat = gf_quat_multiply(&norm, &y_quat);
 	ny_quat = gf_quat_multiply(&ny_quat, &inv_norm);
 
-	new_y.x = ny_quat.x; new_y.y = ny_quat.y; new_y.z = ny_quat.z;
+	new_y.x = ny_quat.x;
+	new_y.y = ny_quat.y;
+	new_y.z = ny_quat.z;
 
 	tmp = gf_vec_cross(new_y, v);
 
@@ -149,9 +165,13 @@
 		/* The old and new may be pointing in the same or opposite. Need
 		** to generate a vector perpendicular to the old or new y.
 		*/
-		tmp.x = 0; tmp.y = -v.z; tmp.z = v.y;
+		tmp.x = 0;
+		tmp.y = -v.z;
+		tmp.z = v.y;
 		if (gf_vec_dot(tmp, tmp) < FIX_EPSILON) {
-			tmp.x = v.z; tmp.y = 0; tmp.z = -v.x;
+			tmp.x = v.z;
+			tmp.y = 0;
+			tmp.z = -v.x;
 		}
 	}
 	gf_vec_norm(&tmp);
@@ -174,11 +194,15 @@
 {
 	cam->is_3D = 0;
 #ifdef FORCE_CAMERA_3D
-	cam->position.x = cam->position.y = 0; cam->position.z = INT2FIX(NEAR_PLANE_2D);
-	cam->up.x = cam->up.z = 0; cam->up.y = FIX_ONE;
+	cam->position.x = cam->position.y = 0;
+	cam->position.z = INT2FIX(NEAR_PLANE_2D);
+	cam->up.x = cam->up.z = 0;
+	cam->up.y = FIX_ONE;
 	cam->target.x = cam->target.y = cam->target.z = 0;
 	cam->vp_position = cam->position;
-	cam->vp_orientation.x = cam->vp_orientation.y = 0; cam->vp_orientation.q = 0; cam->vp_orientation.y = FIX_ONE;
+	cam->vp_orientation.x = cam->vp_orientation.y = 0;
+	cam->vp_orientation.q = 0;
+	cam->vp_orientation.y = FIX_ONE;
 	cam->vp_fov = cam->fieldOfView = FLT2FIX(0.785398);
 	cam->vp_dist = INT2FIX(NEAR_PLANE_2D);
 	cam->end_zoom = FIX_ONE;
@@ -255,8 +279,12 @@
 		vlen = cam->z_far - cam->z_near;
 		h = gf_mulfix(vlen , gf_tan(cam->fieldOfView / 2));
 		w = gf_mulfix(h, ar);
-		center.x = 0; center.y = 0; center.z = cam->z_near + vlen / 2;
-		corner.x = w; corner.y = h; corner.z = vlen;
+		center.x = 0;
+		center.y = 0;
+		center.z = cam->z_near + vlen / 2;
+		corner.x = w;
+		corner.y = h;
+		corner.z = vlen;
 		gf_vec_diff(corner, corner, center);
 		cam->radius = gf_vec_len(corner);
 		gf_vec_diff(cam->center, cam->target, cam->position);
@@ -290,7 +318,7 @@
 			if (! (cam->flags & CAM_NO_LOOKAT)) {
 				GF_Matrix mx;
 				gf_mx_from_mx2d(&mx, user_transform);
-				mx.m[10] = mx.m[0]; 
+				mx.m[10] = mx.m[0];
 				gf_mx_add_matrix(&post_model_view, &mx);
 			} else
 #endif
@@ -345,7 +373,7 @@
 		gf_vec_diff(center, cam->world_bbox.center, cam->position);
 		vlen = gf_vec_len(center);
 		vlen += gf_mulfix(view_distance_offset, gf_divfix(vlen, nominal_view_distance));
-	
+
 		gf_vec_diff(eye, cam->target, cam->position);
 		gf_vec_norm(&eye);
 		tar = gf_vec_scale(eye, vlen);
@@ -409,7 +437,7 @@
 		return;
 	}
 #ifndef FORCE_CAMERA_3D
-	if (cam->is_3D) 
+	if (cam->is_3D)
 #endif
 	{
 		cam->start_pos = cam->position;
@@ -507,12 +535,12 @@
 		if (now > cam->anim_len) {
 			cam->anim_len = 0;
 #ifndef FORCE_CAMERA_3D
-			if (cam->is_3D) 
+			if (cam->is_3D)
 #endif
 			{
 				camera_set_vectors(cam, cam->end_pos, cam->end_ori, cam->end_fov);
 				cam->end_zoom = FIX_ONE;
-			} 
+			}
 #ifndef FORCE_CAMERA_3D
 			else {
 				cam->flags |= CAM_IS_DIRTY;
@@ -543,7 +571,7 @@
 		dif = gf_vec_scale(dif, frac);
 		gf_vec_add(pos, cam->start_pos, dif);
 		fov = gf_mulfix(cam->end_fov - cam->start_fov, frac) + cam->start_fov;
-		cam->end_zoom = frac + gf_mulfix((FIX_ONE-frac), cam->start_zoom); 
+		cam->end_zoom = frac + gf_mulfix((FIX_ONE-frac), cam->start_zoom);
 		camera_set_vectors(cam, pos, rot, fov);
 	}
 	return 1;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/compositor.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/compositor.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -64,9 +64,9 @@
 
 	if (compositor->fullscreen && (compositor->scene_width>=compositor->scene_height)
 #ifndef GPAC_DISABLE_3D
-			&& !compositor->visual->type_3d 
+	        && !compositor->visual->type_3d
 #endif
-			) {
+	   ) {
 		e = compositor->video_out->SetFullScreen(compositor->video_out, 2, &compositor->display_width, &compositor->display_height);
 	} else {
 		e = compositor->video_out->SetFullScreen(compositor->video_out, compositor->fullscreen, &compositor->display_width, &compositor->display_height);
@@ -92,9 +92,9 @@
 
 
 /*this is needed for:
-- audio: since the audio compositor may not be threaded, it must be reconfigured by another thread otherwise 
+- audio: since the audio compositor may not be threaded, it must be reconfigured by another thread otherwise
 we lock the audio module
-- video: this is typical to OpenGL&co: multithreaded is forbidden, so resizing/fullscreen MUST be done by the same 
+- video: this is typical to OpenGL&co: multithreaded is forbidden, so resizing/fullscreen MUST be done by the same
 thread accessing the HW ressources
 */
 static void gf_sc_reconfig_task(GF_Compositor *compositor)
@@ -102,7 +102,7 @@
 	GF_Event evt;
 	Bool notif_size=GF_FALSE;
 	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);
 
@@ -162,7 +162,7 @@
 				gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 			}
 			notif_size=1;
-			
+
 		}
 		/*aspect ratio modif*/
 		if (compositor->msg_type & GF_SR_CFG_AR) {
@@ -172,7 +172,7 @@
 		/*fullscreen on/off request*/
 		if (compositor->msg_type & GF_SR_CFG_FULLSCREEN) {
 			compositor->msg_type &= ~GF_SR_CFG_FULLSCREEN;
-			//video is about to resetup, wait for the setup 
+			//video is about to resetup, wait for the setup
 			if (compositor->recompute_ar) {
 				compositor->fullscreen_postponed = 1;
 			} else {
@@ -213,10 +213,10 @@
 
 GF_EXPORT
 Bool gf_sc_draw_frame(GF_Compositor *compositor, u32 *ms_till_next)
-{	
+{
 	gf_sc_simulation_tick(compositor);
 	if (ms_till_next) {
-		if ((s32) compositor->next_frame_delay == -1)	
+		if ((s32) compositor->next_frame_delay == -1)
 			*ms_till_next = compositor->frame_duration;
 		else
 			*ms_till_next = MIN(compositor->next_frame_delay, compositor->frame_duration);
@@ -230,7 +230,7 @@
 /*forces graphics redraw*/
 GF_EXPORT
 void gf_sc_reset_graphics(GF_Compositor *compositor)
-{	
+{
 	if (compositor) {
 		Bool locked = gf_mx_try_lock(compositor->mx);
 		compositor->reset_graphics = 1;
@@ -274,7 +274,7 @@
 	compositor->focus_use_stack = gf_list_new();
 
 	compositor->env_tests = gf_list_new();
-	
+
 	/*setup main visual*/
 	compositor->visual = visual_new(compositor);
 	compositor->visual->GetSurfaceAccess = compositor_2d_get_video_access;
@@ -284,7 +284,7 @@
 
 	compositor_2d_init_callbacks(compositor);
 
-    // default value for depth gain is not zero
+	// default value for depth gain is not zero
 #ifdef GF_SR_USE_DEPTH
 	compositor->traverse_state->depth_gain = FIX_ONE;
 #endif
@@ -300,7 +300,7 @@
 	gf_node_register(compositor->focus_highlight->node, NULL);
 	gf_node_set_callback_function(compositor->focus_highlight->node, drawable_traverse_focus);
 
-	
+
 #ifndef GPAC_DISABLE_3D
 	/*default collision mode*/
 	compositor->collide_mode = GF_COLLISION_DISPLACEMENT; //GF_COLLISION_NORMAL
@@ -309,6 +309,7 @@
 	/*create default unit sphere and box for bounds*/
 	compositor->unit_bbox = new_mesh();
 	mesh_new_unit_bbox(compositor->unit_bbox);
+	gf_mx_init(compositor->traverse_state->model_matrix);
 #endif
 
 	compositor->was_system_memory=1;
@@ -421,7 +422,7 @@
 
 	compositor->textures = gf_list_new();
 	compositor->textures_gc = gf_list_new();
-	compositor->frame_rate = 30.0;	
+	compositor->frame_rate = 30.0;
 	compositor->frame_duration = 33;
 	compositor->time_nodes = gf_list_new();
 	compositor->event_queue = gf_list_new();
@@ -432,14 +433,14 @@
 	compositor->cached_groups = gf_list_new();
 	compositor->cached_groups_queue = gf_list_new();
 #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->user);
 
-	gf_sc_reset_framerate(compositor);	
+	gf_sc_reset_framerate(compositor);
 	compositor->font_manager = gf_font_manager_new(compositor->user);
-	
+
 	compositor->extra_scenes = gf_list_new();
 	compositor->interaction_level = GF_INTERACT_NORMAL | GF_INTERACT_INPUT_SENSOR | GF_INTERACT_NAVIGATION;
 
@@ -458,12 +459,12 @@
 };
 
 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) {
@@ -472,14 +473,14 @@
 		return 1;
 	}
 
-	compositor->video_th_state = GF_COMPOSITOR_THREAD_RUN;	
+	compositor->video_th_state = GF_COMPOSITOR_THREAD_RUN;
 	while (compositor->video_th_state == GF_COMPOSITOR_THREAD_RUN) {
 		if (compositor->is_hidden==1) {
 			if (!compositor->bench_mode) {
 				compositor->scene_sampled_clock = gf_sc_ar_get_clock(compositor->audio_renderer);
 			}
 			gf_sleep(compositor->frame_duration);
-		} else	
+		} else
 			gf_sc_simulation_tick(compositor);
 	}
 
@@ -504,7 +505,7 @@
 	GF_Compositor *tmp;
 
 	GF_SAFEALLOC(tmp, GF_Compositor);
-	if (!tmp){
+	if (!tmp) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to allocate compositor : OUT OF MEMORY!\n"));
 		return NULL;
 	}
@@ -532,7 +533,7 @@
 		while (tmp->video_th_state < GF_COMPOSITOR_THREAD_RUN) {
 			gf_sleep(1);
 		}
-		/*init failure*/		
+		/*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);
@@ -546,7 +547,7 @@
 			return NULL;
 		}
 	}
-	
+
 	if ((tmp->user->init_flags & GF_TERM_NO_REGULATION) || !tmp->VisualThread)
 		tmp->no_regulation = GF_TRUE;
 
@@ -665,7 +666,7 @@
 	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);
-	
+
 	gf_sc_lock(compositor, GF_FALSE);
 	gf_mx_del(compositor->mx);
 	gf_free(compositor);
@@ -677,7 +678,7 @@
 	if (fps) {
 		compositor->frame_rate = fps;
 		compositor->frame_duration = (u32) (1000 / fps);
-		gf_sc_reset_framerate(compositor);	
+		gf_sc_reset_framerate(compositor);
 	}
 }
 
@@ -697,10 +698,20 @@
 	/*step mode*/
 	if (PlayState==GF_STATE_STEP_PAUSE) {
 		compositor->step_mode = 1;
-		if (!compositor->paused) 
+		if (!compositor->paused)
 			gf_term_set_option(compositor->term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		else
-			gf_term_step_clocks(compositor->term, compositor->frame_duration);
+		else {
+			u32 dur = compositor->frame_duration;
+			u32 i, 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->stream) {
+					u32 d = gf_mo_get_min_frame_dur(txh->stream);
+					if (d && d<dur) dur = d;
+				}
+			}
+			gf_term_step_clocks(compositor->term, dur);
+		}
 	} else {
 		compositor->step_mode = 0;
 		if (compositor->audio_renderer) gf_sc_ar_control(compositor->audio_renderer, (compositor->paused && (PlayState==0xFF)) ? 2 : compositor->paused);
@@ -793,7 +804,7 @@
 static void gf_sc_reset(GF_Compositor *compositor, Bool has_scene)
 {
 	Bool draw_mode;
-	
+
 	GF_VisualManager *visual;
 	u32 i=0;
 	while ((visual = (GF_VisualManager *)gf_list_enum(compositor->visuals, &i))) {
@@ -889,7 +900,7 @@
 		gf_free(qev);
 	}
 	gf_mx_v(compositor->evq_mx);
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Reseting compositor module\n"));
 	/*reset main surface*/
 	gf_sc_reset(compositor, scene_graph ? 1 : 0);
@@ -931,11 +942,11 @@
 		if ((tag>=GF_NODE_RANGE_FIRST_SVG) && (tag<=GF_NODE_RANGE_LAST_SVG)) {
 			GF_FieldInfo info;
 			is_svg = 1;
-			if (gf_node_get_attribute_by_tag(top_node, TAG_SVG_ATT_width, 0, 0, &info)==GF_OK) 
+			if (gf_node_get_attribute_by_tag(top_node, TAG_SVG_ATT_width, 0, 0, &info)==GF_OK)
 				w = info.far_ptr;
-			if (gf_node_get_attribute_by_tag(top_node, TAG_SVG_ATT_height, 0, 0, &info)==GF_OK) 
+			if (gf_node_get_attribute_by_tag(top_node, TAG_SVG_ATT_height, 0, 0, &info)==GF_OK)
 				h = info.far_ptr;
-			if (gf_node_get_attribute_by_tag(top_node, TAG_SVG_ATT_viewBox, 0, 0, &info)==GF_OK) 
+			if (gf_node_get_attribute_by_tag(top_node, TAG_SVG_ATT_viewBox, 0, 0, &info)==GF_OK)
 				vb = info.far_ptr;
 		}
 		/*default back color is white*/
@@ -965,7 +976,7 @@
 		if (is_svg) {
 			compositor->has_size_info = 0;
 			gf_sc_focus_switch_ring(compositor, 0, NULL, 0);
-		} else 
+		} else
 #endif
 		{
 			GF_Node *keynav = gf_scene_get_keynav(compositor->scene, NULL);
@@ -1009,8 +1020,8 @@
 		}
 	}
 
-	gf_sc_reset_framerate(compositor);	
-	
+	gf_sc_reset_framerate(compositor);
+
 	gf_sc_lock(compositor, 0);
 	if (scene_graph)
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
@@ -1021,13 +1032,13 @@
 	if (do_notif) {
 		GF_Event evt;
 		/*wait for user ack*/
-		gf_sc_next_frame_state(compositor, GF_SC_DRAW_NONE);
+//		gf_sc_next_frame_state(compositor, GF_SC_DRAW_NONE);
 
 		evt.type = GF_EVENT_SCENE_SIZE;
 		evt.size.width = width;
 		evt.size.height = height;
 		gf_term_send_event(compositor->term, &evt);
-	} 
+	}
 	return GF_OK;
 }
 
@@ -1058,14 +1069,14 @@
 		compositor->msg_type |= GF_SR_CFG_AR;
 		return GF_OK;
 	}
-	/*EXTRA CARE HERE: the caller (user app) is likely a different thread than the compositor one, and depending on window 
+	/*EXTRA CARE HERE: the caller (user app) is likely a different thread than the compositor one, and depending on window
 	manager we may get called here as a result of a message sent to user but not yet returned */
 	lock_ok = gf_mx_try_lock(compositor->mx);
-	
+
 	compositor->new_width = NewWidth;
 	compositor->new_height = NewHeight;
 	compositor->msg_type |= GF_SR_CFG_SET_SIZE;
-	
+
 	/*if same size only request for video setup */
 	compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
 	if ((compositor->display_width == NewWidth) && (compositor->display_height == NewHeight) ) {
@@ -1083,7 +1094,7 @@
 
 	/*changing drivers needs exclusive access*/
 	gf_sc_lock(compositor, 1);
-	
+
 
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "FrameRate");
 	if (!sOpt) {
@@ -1109,7 +1120,7 @@
 		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");
@@ -1122,7 +1133,7 @@
 		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");
@@ -1134,7 +1145,10 @@
 		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 (!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")) {
@@ -1143,7 +1157,7 @@
 		}
 		else compositor->traverse_state->immediate_draw = 0;
 	}
-	
+
 	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");
@@ -1196,7 +1210,7 @@
 
 	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) 
+	if (!sOpt)
 		gf_cfg_set_key(compositor->user->config, "Compositor", "TextureFromDecoderMemory", "no");
 
 #ifndef GPAC_DISABLE_3D
@@ -1222,7 +1236,7 @@
 	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;
@@ -1233,12 +1247,9 @@
 #ifndef GPAC_USE_OGL_ES
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "EmulatePOW2");
 	compositor->emul_pow2 = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "BitmapCopyPixels");
-	compositor->bitmap_use_pixels = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
 #else
 	compositor->raster_outlines = 1;
 	compositor->emul_pow2 = 1;
-	compositor->bitmap_use_pixels = 0;
 #endif
 
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "PolygonAA");
@@ -1260,7 +1271,7 @@
 	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;
+	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;
@@ -1313,12 +1324,12 @@
 	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;
-	
+
 	else {
 		compositor->visual->autostereo_type = GF_3D_STEREO_NONE;
 		compositor->visual->nb_views = 1;
 	}
-	if (compositor->visual->autostereo_type) 
+	if (compositor->visual->autostereo_type)
 		compositor->force_opengl_2d = 1;
 
 	switch (compositor->visual->autostereo_type) {
@@ -1351,7 +1362,7 @@
 	if (sOpt && !strcmp(sOpt, "yes")) compositor->visual->reverse_views = 1;
 
 #endif //GPAC_DISABLE_3D
-	
+
 #ifdef GF_SR_USE_DEPTH
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "AutoStereoCalibration");
 	compositor->auto_calibration = (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0;
@@ -1368,14 +1379,14 @@
 
 	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 ); 
+		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) ); 
+	if (sOpt)
+		compositor->focus_distance = FLT2FIX( atof(sOpt) );
 	else
 		gf_cfg_set_key(compositor->user->config, "Compositor", "FocusDistance", "0");
 #endif
@@ -1397,56 +1408,56 @@
 
 	e = GF_OK;
 	switch (type) {
-	case GF_OPT_PLAY_STATE: 
-		gf_sc_set_play_state(compositor, value); 
+	case GF_OPT_PLAY_STATE:
+		gf_sc_set_play_state(compositor, value);
 		break;
-	case GF_OPT_AUDIO_VOLUME: 
-		gf_sc_ar_set_volume(compositor->audio_renderer, value); 
+	case GF_OPT_AUDIO_VOLUME:
+		gf_sc_ar_set_volume(compositor->audio_renderer, value);
 		break;
-	case GF_OPT_AUDIO_PAN: 
-		gf_sc_ar_set_pan(compositor->audio_renderer, value); 
+	case GF_OPT_AUDIO_PAN:
+		gf_sc_ar_set_pan(compositor->audio_renderer, value);
 		break;
-	case GF_OPT_AUDIO_MUTE: 
-		gf_sc_ar_mute(compositor->audio_renderer, value); 
+	case GF_OPT_AUDIO_MUTE:
+		gf_sc_ar_mute(compositor->audio_renderer, value);
 		break;
 	case GF_OPT_OVERRIDE_SIZE:
 		compositor->override_size_flags = value ? 1 : 0;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
-	case GF_OPT_STRESS_MODE: 
-		compositor->stress_mode = value; 
+	case GF_OPT_STRESS_MODE:
+		compositor->stress_mode = value;
 		break;
-	case GF_OPT_ANTIALIAS: 
-		compositor->antiAlias = value; 
+	case GF_OPT_ANTIALIAS:
+		compositor->antiAlias = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
-	case GF_OPT_HIGHSPEED: 
-		compositor->high_speed = value; 
+	case GF_OPT_HIGHSPEED:
+		compositor->high_speed = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
-	case GF_OPT_DRAW_BOUNDS: 
-		compositor->draw_bvol = value; 
+	case GF_OPT_DRAW_BOUNDS:
+		compositor->draw_bvol = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
-	case GF_OPT_TEXTURE_TEXT: 
-		compositor->texture_text_mode = value; 
+	case GF_OPT_TEXTURE_TEXT:
+		compositor->texture_text_mode = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
-	case GF_OPT_ASPECT_RATIO: 
-		compositor->aspect_ratio = value; 
+	case GF_OPT_ASPECT_RATIO:
+		compositor->aspect_ratio = value;
 		compositor->msg_type |= GF_SR_CFG_AR;
 		break;
-	case GF_OPT_INTERACTION_LEVEL: 
-		compositor->interaction_level = value; 
+	case GF_OPT_INTERACTION_LEVEL:
+		compositor->interaction_level = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
-	case GF_OPT_REFRESH: 
-		gf_sc_reset_graphics(compositor); 
-		compositor->traverse_state->invalidate_all = 1; 
+	case GF_OPT_REFRESH:
+		gf_sc_reset_graphics(compositor);
+		compositor->traverse_state->invalidate_all = 1;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_FULLSCREEN:
-		if (compositor->fullscreen != value) compositor->msg_type |= GF_SR_CFG_FULLSCREEN; 
+		if (compositor->fullscreen != value) compositor->msg_type |= GF_SR_CFG_FULLSCREEN;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_ORIGINAL_VIEW:
@@ -1463,11 +1474,11 @@
 		}
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
-	case GF_OPT_FREEZE_DISPLAY: 
+	case GF_OPT_FREEZE_DISPLAY:
 		compositor->freeze_display = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
-	case GF_OPT_RELOAD_CONFIG: 
+	case GF_OPT_RELOAD_CONFIG:
 		gf_sc_reload_config(compositor);
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
@@ -1484,7 +1495,7 @@
 		/*emulate size message to force AR recompute*/
 		compositor->msg_type |= GF_SR_CFG_AR;
 		break;
-	case GF_OPT_USE_OPENGL: 
+	case GF_OPT_USE_OPENGL:
 		if (compositor->force_opengl_2d != value) {
 			compositor->force_opengl_2d = value;
 			/*force resetup*/
@@ -1502,7 +1513,7 @@
 	case GF_OPT_YUV_HARDWARE:
 		compositor->enable_yuv_hw = value;
 		break;
-	case GF_OPT_NAVIGATION_TYPE: 
+	case GF_OPT_NAVIGATION_TYPE:
 		compositor->rotation = 0;
 		compositor_2d_set_user_transform(compositor, FIX_ONE, 0, 0, 0);
 #ifndef GPAC_DISABLE_3D
@@ -1515,48 +1526,48 @@
 			e = GF_NOT_SUPPORTED;
 		} else
 #ifndef GPAC_DISABLE_3D
-		if (compositor->visual->type_3d || compositor->active_layer) {
-			GF_Camera *cam = compositor_3d_get_camera(compositor);
-			if (cam->navigation_flags & NAV_ANY) {
-				/*if not specifying mode, try to (un)bind top*/
-				if (!value) {
+			if (compositor->visual->type_3d || compositor->active_layer) {
+				GF_Camera *cam = compositor_3d_get_camera(compositor);
+				if (cam->navigation_flags & NAV_ANY) {
+					/*if not specifying mode, try to (un)bind top*/
+					if (!value) {
 #ifndef GPAC_DISABLE_VRML
-					if (compositor->active_layer) {
-						compositor_layer3d_bind_camera(compositor->active_layer, 0, value);
-					} else {
-						GF_Node *n = (GF_Node*)gf_list_get(compositor->visual->navigation_stack, 0);
-						if (n) 
-							Bindable_SetSetBind(n, 0);
-						else 
-							cam->navigate_mode = value;
-					}
+						if (compositor->active_layer) {
+							compositor_layer3d_bind_camera(compositor->active_layer, 0, value);
+						} else {
+							GF_Node *n = (GF_Node*)gf_list_get(compositor->visual->navigation_stack, 0);
+							if (n)
+								Bindable_SetSetBind(n, 0);
+							else
+								cam->navigate_mode = value;
+						}
 #else
-					cam->navigate_mode = value;
+						cam->navigate_mode = value;
 #endif
-				} else {
-					cam->navigate_mode = value;
+					} else {
+						cam->navigate_mode = value;
+					}
+					break;
 				}
-				break;
-			}
-		} else 
+			} else
 #endif
-		{
-			if ((value!=GF_NAVIGATE_NONE) && (value!=GF_NAVIGATE_SLIDE) && (value!=GF_NAVIGATE_EXAMINE)) {
-				e = GF_NOT_SUPPORTED;
+			{
+				if ((value!=GF_NAVIGATE_NONE) && (value!=GF_NAVIGATE_SLIDE) && (value!=GF_NAVIGATE_EXAMINE)) {
+					e = GF_NOT_SUPPORTED;
+					break;
+				}
+				compositor->navigate_mode = value;
 				break;
 			}
-			compositor->navigate_mode = value;
-			break;
-		}
 		e = GF_NOT_SUPPORTED;
 		break;
 
-	case GF_OPT_HEADLIGHT: 
+	case GF_OPT_HEADLIGHT:
 #ifndef GPAC_DISABLE_3D
 		if (compositor->visual->type_3d || compositor->active_layer) {
 			GF_Camera *cam = compositor_3d_get_camera(compositor);
 			if (cam->navigation_flags & NAV_ANY) {
-				if (value) 
+				if (value)
 					cam->navigation_flags |= NAV_HEADLIGHT;
 				else
 					cam->navigation_flags &= ~NAV_HEADLIGHT;
@@ -1566,16 +1577,28 @@
 #endif
 		e = GF_NOT_SUPPORTED;
 		break;
-	
+
 #ifndef GPAC_DISABLE_3D
 
-	case GF_OPT_EMULATE_POW2: compositor->emul_pow2 = value; break;
-	case GF_OPT_POLYGON_ANTIALIAS: compositor->poly_aa = value; break;
-	case GF_OPT_BACK_CULL: compositor->backcull = value; break;
-	case GF_OPT_WIREFRAME: compositor->wiremode = value; break;
-	case GF_OPT_NORMALS: compositor->draw_normals = value; break;
+	case GF_OPT_EMULATE_POW2:
+		compositor->emul_pow2 = value;
+		break;
+	case GF_OPT_POLYGON_ANTIALIAS:
+		compositor->poly_aa = value;
+		break;
+	case GF_OPT_BACK_CULL:
+		compositor->backcull = value;
+		break;
+	case GF_OPT_WIREFRAME:
+		compositor->wiremode = value;
+		break;
+	case GF_OPT_NORMALS:
+		compositor->draw_normals = value;
+		break;
 #ifdef GPAC_HAS_GLU
-	case GF_OPT_RASTER_OUTLINES: compositor->raster_outlines = value; break;
+	case GF_OPT_RASTER_OUTLINES:
+		compositor->raster_outlines = value;
+		break;
 #endif
 
 	case GF_OPT_NO_RECT_TEXTURE:
@@ -1585,17 +1608,18 @@
 			gf_sc_reset_graphics(compositor);
 		}
 		break;
-	case GF_OPT_BITMAP_COPY: compositor->bitmap_use_pixels = value; break;
-	case GF_OPT_COLLISION: compositor->collide_mode = value; break;
-	case GF_OPT_GRAVITY: 
-	{	
+	case GF_OPT_COLLISION:
+		compositor->collide_mode = value;
+		break;
+	case GF_OPT_GRAVITY:
+	{
 		GF_Camera *cam = compositor_3d_get_camera(compositor);
 		compositor->gravity_on = value;
 		/*force collision pass*/
 		cam->last_pos.z -= 1;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 	}
-		break;	
+	break;
 #endif
 
 	case GF_OPT_VIDEO_CACHE_SIZE:
@@ -1606,7 +1630,7 @@
 #endif
 		break;
 
-	default: 
+	default:
 		e = GF_BAD_PARAM;
 		break;
 	}
@@ -1614,6 +1638,7 @@
 	return e;
 }
 
+GF_EXPORT
 Bool gf_sc_is_over(GF_Compositor *compositor, GF_SceneGraph *scene_graph)
 {
 	u32 i, count;
@@ -1627,27 +1652,27 @@
 
 		switch (gf_node_get_tag((GF_Node *)tn->udta)) {
 #ifndef GPAC_DISABLE_VRML
-		case TAG_MPEG4_TimeSensor: 
+		case TAG_MPEG4_TimeSensor:
 #endif
 #ifndef GPAC_DISABLE_X3D
-		case TAG_X3D_TimeSensor: 
+		case TAG_X3D_TimeSensor:
 #endif
 			return 0;
 
 #ifndef GPAC_DISABLE_VRML
-		case TAG_MPEG4_MovieTexture: 
+		case TAG_MPEG4_MovieTexture:
 #ifndef GPAC_DISABLE_X3D
-		case TAG_X3D_MovieTexture: 
+		case TAG_X3D_MovieTexture:
 #endif
 			if (((M_MovieTexture *)tn->udta)->loop) return 0;
 			break;
-		case TAG_MPEG4_AudioClip: 
+		case TAG_MPEG4_AudioClip:
 #ifndef GPAC_DISABLE_X3D
-		case TAG_X3D_AudioClip: 
+		case TAG_X3D_AudioClip:
 #endif
 			if (((M_AudioClip*)tn->udta)->loop) return 0;
 			break;
-		case TAG_MPEG4_AnimationStream: 
+		case TAG_MPEG4_AnimationStream:
 			if (((M_AnimationStream*)tn->udta)->loop) return 0;
 			break;
 #endif
@@ -1660,35 +1685,53 @@
 u32 gf_sc_get_option(GF_Compositor *compositor, u32 type)
 {
 	switch (type) {
-	case GF_OPT_PLAY_STATE: return compositor->paused ? 1 : 0;
-	case GF_OPT_OVERRIDE_SIZE: return (compositor->override_size_flags & 1) ? 1 : 0;
+	case GF_OPT_PLAY_STATE:
+		return compositor->paused ? 1 : 0;
+	case GF_OPT_OVERRIDE_SIZE:
+		return (compositor->override_size_flags & 1) ? 1 : 0;
 	case GF_OPT_IS_FINISHED:
 		if (compositor->interaction_sensors) return 0;
 	case GF_OPT_IS_OVER:
 		return gf_sc_is_over(compositor, NULL);
-	case GF_OPT_STRESS_MODE: return compositor->stress_mode;
-	case GF_OPT_AUDIO_VOLUME: return compositor->audio_renderer->volume;
-	case GF_OPT_AUDIO_PAN: return compositor->audio_renderer->pan;
-	case GF_OPT_AUDIO_MUTE: return compositor->audio_renderer->mute;
-
-	case GF_OPT_ANTIALIAS: return compositor->antiAlias;
-	case GF_OPT_HIGHSPEED: return compositor->high_speed;
-	case GF_OPT_ASPECT_RATIO: return compositor->aspect_ratio;
-	case GF_OPT_FULLSCREEN: return compositor->fullscreen;
-	case GF_OPT_INTERACTION_LEVEL: return compositor->interaction_level;
-	case GF_OPT_VISIBLE: return !compositor->is_hidden;
-	case GF_OPT_FREEZE_DISPLAY: return compositor->freeze_display;
-	case GF_OPT_TEXTURE_TEXT: return compositor->texture_text_mode;
-	case GF_OPT_USE_OPENGL: return compositor->force_opengl_2d;
+	case GF_OPT_STRESS_MODE:
+		return compositor->stress_mode;
+	case GF_OPT_AUDIO_VOLUME:
+		return compositor->audio_renderer->volume;
+	case GF_OPT_AUDIO_PAN:
+		return compositor->audio_renderer->pan;
+	case GF_OPT_AUDIO_MUTE:
+		return compositor->audio_renderer->mute;
+
+	case GF_OPT_ANTIALIAS:
+		return compositor->antiAlias;
+	case GF_OPT_HIGHSPEED:
+		return compositor->high_speed;
+	case GF_OPT_ASPECT_RATIO:
+		return compositor->aspect_ratio;
+	case GF_OPT_FULLSCREEN:
+		return compositor->fullscreen;
+	case GF_OPT_INTERACTION_LEVEL:
+		return compositor->interaction_level;
+	case GF_OPT_VISIBLE:
+		return !compositor->is_hidden;
+	case GF_OPT_FREEZE_DISPLAY:
+		return compositor->freeze_display;
+	case GF_OPT_TEXTURE_TEXT:
+		return compositor->texture_text_mode;
+	case GF_OPT_USE_OPENGL:
+		return compositor->force_opengl_2d;
 
 	case GF_OPT_DRAW_MODE:
 		if (compositor->traverse_state->immediate_draw) return GF_DRAW_MODE_IMMEDIATE;
 		if (compositor->debug_defer) return GF_DRAW_MODE_DEFER_DEBUG;
 		return GF_DRAW_MODE_DEFER;
-	case GF_OPT_SCALABLE_ZOOM: return compositor->scalable_zoom;
-	case GF_OPT_YUV_HARDWARE: return compositor->enable_yuv_hw;
-	case GF_OPT_YUV_FORMAT: return compositor->enable_yuv_hw ? compositor->video_out->yuv_pixel_format : 0;
-	case GF_OPT_NAVIGATION_TYPE: 
+	case GF_OPT_SCALABLE_ZOOM:
+		return compositor->scalable_zoom;
+	case GF_OPT_YUV_HARDWARE:
+		return compositor->enable_yuv_hw;
+	case GF_OPT_YUV_FORMAT:
+		return compositor->enable_yuv_hw ? 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;
 		if (compositor->visual->type_3d || compositor->active_layer) {
@@ -1696,23 +1739,26 @@
 			if (!(cam->navigation_flags & NAV_ANY)) return GF_NAVIGATE_TYPE_NONE;
 //			return ((cam->is_3D || compositor->active_layer) ? GF_NAVIGATE_TYPE_3D : GF_NAVIGATE_TYPE_2D);
 			return GF_NAVIGATE_TYPE_3D;
-		} else 
+		} else
 #endif
 		{
 			return GF_NAVIGATE_TYPE_2D;
 		}
-	case GF_OPT_NAVIGATION: 
+	case GF_OPT_NAVIGATION:
 #ifndef GPAC_DISABLE_3D
 		if (compositor->visual->type_3d || compositor->active_layer) {
 			GF_Camera *cam = compositor_3d_get_camera(compositor);
 			return cam->navigate_mode;
-		} 
+		}
 #endif
 		return compositor->navigate_mode;
 
-	case GF_OPT_HEADLIGHT: return 0;
-	case GF_OPT_COLLISION: return GF_COLLISION_NONE;
-	case GF_OPT_GRAVITY: return 0;
+	case GF_OPT_HEADLIGHT:
+		return 0;
+	case GF_OPT_COLLISION:
+		return GF_COLLISION_NONE;
+	case GF_OPT_GRAVITY:
+		return 0;
 
 	case GF_OPT_VIDEO_CACHE_SIZE:
 #ifdef GF_SR_USE_VIDEO_CACHE
@@ -1730,7 +1776,8 @@
 #endif
 		return 1;
 
-	default: return 0;
+	default:
+		return 0;
 	}
 }
 
@@ -1752,13 +1799,14 @@
 	gf_mx_p(compositor->mx);
 
 #ifndef GPAC_DISABLE_3D
-	if (compositor->visual->type_3d) e = compositor_3d_get_screen_buffer(compositor, framebuffer, depth_dump_mode);
+	if (compositor->visual->type_3d || compositor->hybrid_opengl)
+		e = compositor_3d_get_screen_buffer(compositor, framebuffer, depth_dump_mode);
 	else
 #endif
-	/*no depth dump in 2D mode*/
-	if (depth_dump_mode) e = GF_NOT_SUPPORTED;
-	else e = compositor->video_out->LockBackBuffer(compositor->video_out, framebuffer, 1);
-	
+		/*no depth dump in 2D mode*/
+		if (depth_dump_mode) e = GF_NOT_SUPPORTED;
+		else e = compositor->video_out->LockBackBuffer(compositor->video_out, framebuffer, 1);
+
 	if (e != GF_OK) gf_mx_v(compositor->mx);
 	return e;
 }
@@ -1786,10 +1834,11 @@
 	if (!compositor || !framebuffer) return GF_BAD_PARAM;
 
 #ifndef GPAC_DISABLE_3D
-	if (compositor->visual->type_3d) e = compositor_3d_release_screen_buffer(compositor, framebuffer);
+	if (compositor->visual->type_3d || compositor->hybrid_opengl)
+		e = compositor_3d_release_screen_buffer(compositor, framebuffer);
 	else
 #endif
-	e = compositor->video_out->LockBackBuffer(compositor->video_out, framebuffer, 0);
+		e = compositor->video_out->LockBackBuffer(compositor->video_out, framebuffer, 0);
 
 	gf_mx_v(compositor->mx);
 	return e;
@@ -1823,7 +1872,7 @@
 		fidx = compositor->current_frame;
 		frames = 0;
 		run_time = compositor->frame_time[fidx];
-		fidx = (fidx+1)% GF_SR_FPS_COMPUTE_SIZE; 
+		fidx = (fidx+1)% GF_SR_FPS_COMPUTE_SIZE;
 		assert(run_time >= compositor->frame_time[fidx]);
 		run_time -= compositor->frame_time[fidx];
 		frames = GF_SR_FPS_COMPUTE_SIZE-1;
@@ -1858,6 +1907,85 @@
 	return NULL;
 }
 
+static void gf_sc_recompute_ar(GF_Compositor *compositor, GF_Node *top_node)
+{
+
+#ifndef GPAC_DISABLE_LOG
+	compositor->visual_config_time = 0;
+#endif
+	if (compositor->recompute_ar) {
+#ifndef GPAC_DISABLE_LOG
+		u32 time=0;
+
+		if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) {
+			time = gf_sys_clock();
+		}
+#endif
+
+		gf_sc_ar_control(compositor->audio_renderer, 0);
+#ifndef GPAC_DISABLE_3D
+		if (compositor->autoconfig_opengl) {
+			compositor->visual->type_3d = 1;
+		}
+		if (compositor->visual->type_3d) {
+			compositor_3d_set_aspect_ratio(compositor);
+			gf_sc_load_opengl_extensions(compositor, compositor->visual->type_3d);
+			if (compositor->autoconfig_opengl) {
+#ifndef GPAC_USE_OGL_ES
+				visual_3d_init_shaders(compositor->visual);
+#endif
+				compositor->autoconfig_opengl = 0;
+				compositor->visual->type_3d = 0;
+				compositor->force_opengl_2d = 0;
+
+				//enable hybrid mode by default
+				if (compositor->visual->yuv_rect_glsl_program) {
+					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->type_3d)
+#endif
+		{
+			compositor_2d_set_aspect_ratio(compositor);
+#ifndef GPAC_DISABLE_3D
+			if (compositor->hybrid_opengl) {
+				gf_sc_load_opengl_extensions(compositor, GF_TRUE);
+#ifndef GPAC_USE_OGL_ES
+				visual_3d_init_shaders(compositor->visual);
+#endif
+				if (!compositor->visual->hybgl_drawn.list) {
+					ra_init(&compositor->visual->hybgl_drawn);
+				}
+			}
+#endif
+		}
+
+		gf_sc_ar_control(compositor->audio_renderer, 1);
+
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) {
+			compositor->visual_config_time = gf_sys_clock() - time;
+		}
+#endif
+
+#ifndef GPAC_DISABLE_VRML
+		compositor_evaluate_envtests(compositor, 0);
+#endif
+		//fullscreen was postponed, retry now that the AR has been recomputed
+		if (compositor->fullscreen_postponed) {
+			compositor->fullscreen_postponed = 0;
+			compositor->msg_type |= GF_SR_CFG_FULLSCREEN;
+		}
+
+	}
+}
+
+
 
 static void gf_sc_setup_root_visual(GF_Compositor *compositor, GF_Node *top_node)
 {
@@ -1886,7 +2014,7 @@
 			if (compositor->display_depth) {
 				compositor->visual->type_3d = 0;
 				compositor->visual->camera.is_3D = 0;
-			} else 
+			} else
 #endif
 			{
 				compositor->visual->type_3d = 0;
@@ -1923,7 +2051,7 @@
 			if (compositor->display_depth) {
 				compositor->visual->type_3d = 2;
 				compositor->visual->camera.is_3D = 1;
-			} else 
+			} else
 #endif
 			{
 				compositor->visual->type_3d = 0;
@@ -1936,7 +2064,7 @@
 #endif /*GPAC_DISABLE_SVG*/
 		}
 
-		/*!! by default we don't set the focus on the content - this is conform to SVG and avoids displaying the 
+		/*!! by default we don't set the focus on the content - this is conform to SVG and avoids displaying the
 		focus box for MPEG-4 !! */
 
 		/*setup OpenGL & camera mode*/
@@ -1974,85 +2102,6 @@
 	}
 }
 
-static void gf_sc_recompute_ar(GF_Compositor *compositor, GF_Node *top_node)
-{
-
-#ifndef GPAC_DISABLE_LOG
-	compositor->visual_config_time = 0;
-#endif
-	if (compositor->recompute_ar) {
-#ifndef GPAC_DISABLE_LOG
-		u32 time=0;
-		
-		if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) { 
-			time = gf_sys_clock();
-		}
-#endif
-
-		gf_sc_ar_control(compositor->audio_renderer, 0);
-#ifndef GPAC_DISABLE_3D
-		if (compositor->autoconfig_opengl) {
-			compositor->visual->type_3d = 1;
-		}
-		if (compositor->visual->type_3d) {
-			compositor_3d_set_aspect_ratio(compositor);
-			gf_sc_load_opengl_extensions(compositor, compositor->visual->type_3d);
-			if (compositor->autoconfig_opengl) {
-#ifndef GPAC_USE_OGL_ES
-				visual_3d_init_yuv_shader(compositor->visual);
-#endif
-				compositor->autoconfig_opengl = 0;
-
-				//enable hybrid mode by default
-				if (compositor->visual->yuv_rect_glsl_program) {
-					gf_cfg_set_key(compositor->user->config, "Compositor", "OpenGLMode", "hybrid");
-					compositor->force_opengl_2d = 0;
-					compositor->hybrid_opengl = 1;
-				} else {
-					gf_cfg_set_key(compositor->user->config, "Compositor", "OpenGLMode", "disable");
-					compositor->force_opengl_2d = 0;
-					compositor->visual->type_3d = 0;
-				}
-			}
-
-		}
-		if (!compositor->visual->type_3d) 
-#endif
-		{
-			compositor_2d_set_aspect_ratio(compositor);
-#ifndef GPAC_DISABLE_3D
-			if (compositor->hybrid_opengl) {
-				gf_sc_load_opengl_extensions(compositor, GF_TRUE);
-#ifndef GPAC_USE_OGL_ES
-				visual_3d_init_yuv_shader(compositor->visual);
-#endif
-				if (!compositor->visual->hybgl_drawn.list) {
-					ra_init(&compositor->visual->hybgl_drawn);
-				}
-			}
-#endif
-		}
-
-		gf_sc_ar_control(compositor->audio_renderer, 1);
-
-		gf_sc_next_frame_state(compositor, GF_SC_DRAW_NONE);
-
-#ifndef GPAC_DISABLE_LOG
-		if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) { 
-			compositor->visual_config_time = gf_sys_clock() - time;
-		}
-#endif
-
-		compositor_evaluate_envtests(compositor, 0);
-
-		//fullscreen was postponed, retry now that the AR has been recomputed
-		if (compositor->fullscreen_postponed) {
-			compositor->fullscreen_postponed = 0;
-			compositor->msg_type |= GF_SR_CFG_FULLSCREEN;
-		}
-
-	} 
-}
 
 static void gf_sc_draw_scene(GF_Compositor *compositor)
 {
@@ -2065,8 +2114,6 @@
 		return;
 	}
 
-	gf_sc_recompute_ar(compositor, top_node);
-
 #ifdef GF_SR_USE_VIDEO_CACHE
 	if (!compositor->video_cache_max_size)
 		compositor->traverse_state->in_group_cache = 1;
@@ -2117,7 +2164,7 @@
 	for (i=0; i<count; i++) {
 		GF_TextureHandler *txh = (GF_TextureHandler *)gf_list_get(compositor->textures, i);
 		gf_sc_texture_release_stream(txh);
-		if (frame_drawn && txh->tx_io && !(txh->flags & GF_SR_TEXTURE_USED)) 
+		if (frame_drawn && txh->tx_io && !(txh->flags & GF_SR_TEXTURE_USED))
 			gf_sc_texture_reset(txh);
 		/*remove the use flag*/
 		txh->flags &= ~GF_SR_TEXTURE_USED;
@@ -2126,19 +2173,22 @@
 
 
 void gf_sc_simulation_tick(GF_Compositor *compositor)
-{	
+{
+#ifndef GPAC_DISABLE_SCENEGRAPH
 	GF_SceneGraph *sg;
+#endif
 	GF_List *temp_queue;
-	u32 in_time, end_time, i, count;
+	u32 in_time, end_time, i, count, frame_duration;
 	Bool frame_drawn, has_timed_nodes=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
 
-	in_time = gf_sys_clock();
 	/*lock compositor for the whole cycle*/
 	gf_sc_lock(compositor, 1);
 
+	in_time = gf_sys_clock();
+
 	gf_sc_texture_cleanup_hw(compositor);
 
 	/*first thing to do, let the video output handle user event if it is not threaded*/
@@ -2158,7 +2208,7 @@
 	/* 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
+		//increase clock in bench mode before releasing mutex
 		if (compositor->bench_mode && (compositor->force_bench_frame==1)) {
 			compositor->scene_sampled_clock += compositor->frame_duration;
 		}
@@ -2183,7 +2233,7 @@
 	gf_mx_p(compositor->evq_mx);
 	temp_queue = compositor->event_queue;
 	compositor->event_queue = compositor->event_queue_back;
-	compositor->event_queue_back = temp_queue; 
+	compositor->event_queue_back = temp_queue;
 	gf_mx_v(compositor->evq_mx);
 	while (gf_list_count(compositor->event_queue_back)) {
 		GF_QueuedEvent *qev = (GF_QueuedEvent*)gf_list_get(compositor->event_queue_back, 0);
@@ -2221,6 +2271,7 @@
 	//first update all natural textures to figure out timing
 	compositor->frame_delay = (u32) -1;
 	compositor->next_frame_delay = (u32) -1;
+	frame_duration = compositor->frame_duration;
 
 #ifndef GPAC_DISABLE_LOG
 	texture_time = gf_sys_clock();
@@ -2237,10 +2288,15 @@
 		if (compositor->reset_graphics && txh->tx_io) gf_sc_texture_reset(txh);
 		txh->update_texture_fcnt(txh);
 
-		if (!txh->stream_finished) all_tx_done=0;
+		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 
+	//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);
@@ -2252,55 +2308,8 @@
 	texture_time = gf_sys_clock() - texture_time;
 #endif
 
-	//this is correct but doesn't bring much and we may actually waste time while sleeping that could be used for texture upload - we prefer sleeping at the end of the pass
-#if 0
-	//if next video frame is due in this render cycle, wait until it matures
-	if ((compositor->frame_delay > 0) && (compositor->frame_delay != (u32) -1)) {
-		u32 diff=0;
-		compositor->frame_delay = MIN(compositor->frame_delay, (s32) compositor->frame_duration);
-		while (!compositor->video_frame_pending) {
-			gf_sleep(0);
-			diff = gf_sys_clock() - in_time;
-			if (diff >= (u32) compositor->frame_delay)
-				break;
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Compositor] Waited %d ms for next frame and %d ms was required\n", diff, compositor->frame_delay));
-		if (compositor->next_frame_delay != (u32) -1) {
-			if (diff < compositor->next_frame_delay) compositor->next_frame_delay -= diff;
-			else compositor->next_frame_delay = 1;
-		}
-	}
-#endif
-
-
 
 #ifndef GPAC_DISABLE_SVG
-#if SVG_FIXME
-	{ /* Experimental (Not SVG compliant system events (i.e. battery, cpu ...) triggered to the root node)*/
-		GF_Node *root = gf_sg_get_root_node(compositor->scene);
-		GF_DOM_Event evt;
-		if (gf_dom_listener_count(root)) {
-			u32 i, count;
-			count = gf_dom_listener_count(root);
-			for (i=0;i<count; i++) {
-				SVG_SA_listenerElement *l = gf_dom_listener_get(root, i);
-				if (l->event.type == GF_EVENT_CPU) {
-					GF_SystemRTInfo sys_rti;
-					if (gf_sys_get_rti(500, &sys_rti, GF_RTI_ALL_PROCESSES_TIMES)) {
-						evt.type = GF_EVENT_CPU;
-						evt.cpu_percentage = sys_rti.total_cpu_usage;
-						//fprintf(stderr, "%d\n",sys_rti.total_cpu_usage);
-						gf_dom_event_fire(root, NULL, &evt);
-					} 
-				} else if (l->event.type == GF_EVENT_BATTERY) { //&& l->observer.target == (SVG_SA_Element *)node) {
-					evt.type = GF_EVENT_BATTERY;
-					gf_sys_get_battery_state(&evt.onBattery, &evt.batteryState, &evt.batteryLevel, NULL, NULL);
-					gf_dom_event_fire(root, NULL, &evt);
-				}
-			}
-		}
-	}
-#endif
 
 #ifndef GPAC_DISABLE_LOG
 	smil_timing_time = gf_sys_clock();
@@ -2319,8 +2328,8 @@
 	smil_timing_time = gf_sys_clock() - smil_timing_time;
 #endif
 
-#endif
-	
+#endif //GPAC_DISABLE_SVG
+
 
 #ifndef GPAC_DISABLE_LOG
 	time_node_time = gf_sys_clock();
@@ -2384,14 +2393,17 @@
 #endif /*GPAC_DISABLE_VRML*/
 
 
-
 	/*setup root visual BEFORE updating the composite textures (since they may depend on root setup)*/
 	gf_sc_setup_root_visual(compositor, gf_sg_get_root_node(compositor->scene));
 
+	/*setup display before updating composite textures (some may require a valid openGL context)*/
+	gf_sc_recompute_ar(compositor, gf_sg_get_root_node(compositor->scene) );
+
 #ifndef GPAC_DISABLE_LOG
 	txtime = gf_sys_clock();
 #endif
 	/*update all composite textures*/
+	compositor->texture_inserted = 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);
@@ -2401,11 +2413,18 @@
 		/*signal graphics reset before updating*/
 		if (compositor->reset_graphics && txh->tx_io) gf_sc_texture_reset(txh);
 		txh->update_texture_fcnt(txh);
+		if (compositor->texture_inserted) {
+			compositor->texture_inserted = GF_FALSE;
+			count = gf_list_count(compositor->textures);
+			i = gf_list_find(compositor->textures, txh);
+		}
 	}
 
 	//it may happen that we have a reconfigure request at this stage, especially if updating one of the textures update
 	//forced a relayout - do it right away
 	if (compositor->msg_type) {
+		//reset AR recompute flag, it will be reset when msg is handled
+		compositor->recompute_ar = 0;
 		gf_sc_lock(compositor, 0);
 		return;
 	}
@@ -2422,14 +2441,7 @@
 	}
 
 	if (compositor->is_hidden) {
-#if 0
-		gf_sc_lock(compositor, 0);
-		if (compositor->no_regulation) return;
-		gf_sleep(compositor->frame_duration);
-		return;
-#else
 		compositor->frame_draw_type = 0;
-#endif
 	}
 
 	frame_drawn = (compositor->frame_draw_type==GF_SC_DRAW_FRAME) ? 1 : 0;
@@ -2486,9 +2498,9 @@
 
 			//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;		
+			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);
 		} else {
@@ -2533,25 +2545,25 @@
 	compositor->last_frame_time = gf_sys_clock();
 	end_time = compositor->last_frame_time - in_time;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI]\tCompositor Cycle Log\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", 
-		compositor->networks_time, 
-		compositor->decoders_time, 
-		compositor->frame_number, 
-		compositor->traverse_state->immediate_draw,
-		compositor->visual_config_time,
-		event_time, 
-		route_time, 
-		smil_timing_time, 
-		time_node_time, 
-		texture_time, 
-		time_spent_in_anim, 
-		compositor->traverse_setup_time,
-		compositor->traverse_and_direct_draw_time,
-		compositor->traverse_and_direct_draw_time - time_spent_in_anim,
-		compositor->indirect_draw_time,
-		traverse_time, 
-		flush_time, 
-		end_time));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI]\tCompositor Cycle Log\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n",
+	                                  compositor->networks_time,
+	                                  compositor->decoders_time,
+	                                  compositor->frame_number,
+	                                  compositor->traverse_state->immediate_draw,
+	                                  compositor->visual_config_time,
+	                                  event_time,
+	                                  route_time,
+	                                  smil_timing_time,
+	                                  time_node_time,
+	                                  texture_time,
+	                                  time_spent_in_anim,
+	                                  compositor->traverse_setup_time,
+	                                  compositor->traverse_and_direct_draw_time,
+	                                  compositor->traverse_and_direct_draw_time - time_spent_in_anim,
+	                                  compositor->indirect_draw_time,
+	                                  traverse_time,
+	                                  flush_time,
+	                                  end_time));
 
 	if (frame_drawn) {
 		compositor->current_frame = (compositor->current_frame+1) % GF_SR_FPS_COMPUTE_SIZE;
@@ -2561,24 +2573,15 @@
 	}
 	if (compositor->bench_mode && (frame_drawn || (has_timed_nodes&&all_tx_done) )) {
 		//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 += compositor->frame_duration;
+		compositor->scene_sampled_clock += frame_duration;
 	}
 	compositor->video_frame_pending=0;
 	gf_sc_lock(compositor, 0);
 
-#if 0
-	/*step mode on, pause and return*/
-	if (frame_drawn && compositor->step_mode) {
-		compositor->step_mode = 0;
-		if (compositor->term) gf_term_set_option(compositor->term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		return;
-	}
-#else
 	if (frame_drawn) compositor->step_mode = 0;
-#endif
 
 	/*let the owner decide*/
-	if (compositor->no_regulation) 
+	if (compositor->no_regulation)
 		return;
 
 	/*we are in bench mode, just release for a moment the composition, oherwise we will constantly lock the compositor wich may have impact on scene decoding*/
@@ -2587,12 +2590,12 @@
 		return;
 	}
 
-	//we have a pending frame, return asap - we could sleep until frames matures but this give weird regulation 
+	//we have a pending frame, return asap - we could sleep until frames matures but this give weird regulation
 	if (compositor->next_frame_delay != (u32) -1) {
 		if (compositor->next_frame_delay>end_time) compositor->next_frame_delay-=end_time;
 		else compositor->next_frame_delay=0;
 
-		compositor->next_frame_delay = MIN(compositor->next_frame_delay, 2*compositor->frame_duration);
+		compositor->next_frame_delay = MIN(compositor->next_frame_delay, 2*frame_duration);
 		if (compositor->next_frame_delay>2) {
 			u32 diff=0;
 			while (! compositor->msg_type && ! compositor->video_frame_pending) {
@@ -2608,15 +2611,15 @@
 		return;
 	}
 
-	if (end_time > compositor->frame_duration) {
+	if (end_time > frame_duration) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Compositor did not go to sleep\n"));
 		return;
 	}
 
 	/*compute sleep time till next frame*/
-	end_time %= compositor->frame_duration;
-	gf_sleep(compositor->frame_duration - end_time);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Compositor slept for %d ms\n", compositor->frame_duration - end_time));
+	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));
 }
 
 Bool gf_sc_visual_is_registered(GF_Compositor *compositor, GF_VisualManager *visual)
@@ -2657,7 +2660,7 @@
 
 	inline_root = gf_sg_get_root_node(subscene);
 	if (!inline_root) return;
-	
+
 	if (!gf_scene_is_over(subscene))
 		tr_state->subscene_not_over ++;
 
@@ -2681,16 +2684,16 @@
 			of bindable stacks and gives us free 2D/3D integration*/
 			if (tag==TAG_MPEG4_OrderedGroup) {
 				new_tag = TAG_MPEG4_Layer2D;
-			} else if ((tag==TAG_MPEG4_Group) 
+			} else if ((tag==TAG_MPEG4_Group)
 #ifndef GPAC_DISABLE_X3D
-				|| (tag==TAG_X3D_Group)
+			           || (tag==TAG_X3D_Group)
 #endif
-				) {
+			          ) {
 				new_tag = TAG_MPEG4_Layer3D;
 			}
 		}
 #if !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_3D)
-		/*if the inlined root node is a 3D one except Layer3D and we are not in a 3D context, insert 
+		/*if the inlined root node is a 3D one except Layer3D and we are not in a 3D context, insert
 		a Layer3D at the root*/
 		else if (!tr_state->visual->type_3d && ((tag==TAG_MPEG4_Group) || (tag==TAG_X3D_Group))) {
 			new_tag = TAG_MPEG4_Layer3D;
@@ -2733,12 +2736,14 @@
 	if (flip_coords)
 		gf_mx2d_add_scale(&transf, FIX_ONE, -FIX_ONE);
 
-	/*if scene size is given in the child document, scale to fit the entire vp*/
+	/*if scene size is given in the child document, scale to fit the entire vp unless our VP is the full output*/
 	if (w && h) {
-		Fixed scale_w = tr_state->vp_size.x/w;
-		Fixed scale_h = tr_state->vp_size.y/h;
-		vp_scale = MIN(scale_w, scale_h);
-		gf_mx2d_add_scale(&transf, vp_scale, vp_scale);
+		if ((compositor->scene_width != tr_state->vp_size.x) || (compositor->scene_height != tr_state->vp_size.y)) {
+			Fixed scale_w = tr_state->vp_size.x/w;
+			Fixed scale_h = tr_state->vp_size.y/h;
+			vp_scale = MIN(scale_w, scale_h);
+			gf_mx2d_add_scale(&transf, vp_scale, vp_scale);
+		}
 	}
 	if (flip_coords) {
 		gf_mx2d_add_translation(&transf, flip_coords * tr_state->vp_size.x/2, tr_state->vp_size.y/2);
@@ -2779,14 +2784,7 @@
 		/*copy over z scale*/
 		mx.m[10] = mx.m[5];
 		gf_mx_add_matrix(&tr_state->model_matrix, &mx);
-		if (tr_state->traversing_mode==TRAVERSE_SORT) {
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_matrix_add(tr_state->visual, mx.m);
-			gf_node_traverse(inline_root, rs);
-			visual_3d_matrix_pop(tr_state->visual);
-		} else {
-			gf_node_traverse(inline_root, rs);
-		}
+		gf_node_traverse(inline_root, rs);
 		gf_mx_copy(tr_state->model_matrix, mx_bck);
 
 	} else
@@ -2815,13 +2813,13 @@
 		gf_term_mouse_input(compositor->term, &evt.mouse);
 	}
 
-/*	if (!compositor->interaction_level || (compositor->interaction_level==GF_INTERACT_INPUT_SENSOR) ) {
-		if (!from_user) {
-			GF_USER_SENDEVENT(compositor->user, event);
+	/*	if (!compositor->interaction_level || (compositor->interaction_level==GF_INTERACT_INPUT_SENSOR) ) {
+			if (!from_user) {
+				GF_USER_SENDEVENT(compositor->user, event);
+			}
+			return 0;
 		}
-		return 0;
-	}
-*/
+	*/
 	gf_mx_p(compositor->mx);
 	ret = gf_sc_exec_event(compositor, event);
 	gf_sc_lock(compositor, GF_FALSE);
@@ -2837,7 +2835,7 @@
 
 	gf_sc_traverse_subscene_ex(compositor, inline_parent, subscene, rs);
 
-	while ( (subsg = gf_scene_enum_extra_scene(subscene, &i))) 
+	while ( (subsg = gf_scene_enum_extra_scene(subscene, &i)))
 		gf_sc_traverse_subscene_ex(compositor, inline_parent, subsg, rs);
 
 }
@@ -2850,42 +2848,48 @@
 	if (compositor->msg_type & GF_SR_IN_RECONFIG) {
 		if (event->type==GF_EVENT_VIDEO_SETUP) {
 			gf_sc_reset_graphics(compositor);
-			if (event->setup.back_buffer) 
+			if (event->setup.back_buffer)
 				compositor->recompute_ar = 1;
 		}
 		return GF_FALSE;
 	}
 	switch (event->type) {
+	case GF_EVENT_SHOWHIDE:
+	case GF_EVENT_SET_CAPTION:
 	case GF_EVENT_MOVE:
+		compositor->video_out->ProcessEvent(compositor->video_out, event);
+		break;
+
+	case GF_EVENT_MOVE_NOTIF:
 	case GF_EVENT_REFRESH:
 		if (!compositor->frame_draw_type) {
 			/*when refreshing the window in 3D or with overlays we redraw the scene */
-			if (compositor->last_had_overlays 
+			if (compositor->last_had_overlays
 #ifndef GPAC_DISABLE_3D
-				|| compositor->visual->type_3d
+			        || compositor->visual->type_3d
 #endif
-				) {
+			   ) {
 				gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 			}
 			/*reflush only*/
-			else 
+			else
 				gf_sc_next_frame_state(compositor, GF_SC_DRAW_FLUSH);
 		}
 		break;
 	case GF_EVENT_VIDEO_SETUP:
-		{
-			Bool locked = gf_mx_try_lock(compositor->mx);
-			if (event->setup.hw_reset)
-				gf_sc_reset_graphics(compositor);
-	
-			if (event->setup.back_buffer) 
-				compositor->recompute_ar = 1;
-			if (locked) gf_mx_v(compositor->mx);
-		}
-		break;
+	{
+		Bool locked = gf_mx_try_lock(compositor->mx);
+		if (event->setup.hw_reset)
+			gf_sc_reset_graphics(compositor);
+
+		if (event->setup.back_buffer)
+			compositor->recompute_ar = 1;
+		if (locked) gf_mx_v(compositor->mx);
+	}
+	break;
 	case GF_EVENT_SIZE:
 		/*user consummed the resize event, do nothing*/
-		if ( gf_term_send_event(compositor->term, event) ) 
+		if ( gf_term_send_event(compositor->term, event) )
 			return GF_TRUE;
 
 		/*not consummed and compositor "owns" the output window (created by the output module), resize*/
@@ -2901,8 +2905,7 @@
 				if (from_user) compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
 			} else {
 				/*remove pending resize notif*/
-				if (!compositor->new_width)
-					compositor->msg_type = 0;
+				compositor->msg_type &= ~GF_SR_CFG_SET_SIZE;
 			}
 			if (lock_ok) gf_sc_lock(compositor, GF_FALSE);
 		}
@@ -2913,36 +2916,36 @@
 	{
 		Bool ret;
 		switch (event->key.key_code) {
-		case GF_KEY_SHIFT: 
+		case GF_KEY_SHIFT:
 			if (event->type==GF_EVENT_KEYDOWN) {
-				compositor->key_states |= GF_KEY_MOD_SHIFT; 
+				compositor->key_states |= GF_KEY_MOD_SHIFT;
 			} else {
-				compositor->key_states &= ~GF_KEY_MOD_SHIFT; 
+				compositor->key_states &= ~GF_KEY_MOD_SHIFT;
 			}
 			break;
-		case GF_KEY_CONTROL: 
+		case GF_KEY_CONTROL:
 			if (event->type==GF_EVENT_KEYDOWN) {
-				compositor->key_states |= GF_KEY_MOD_CTRL; 
+				compositor->key_states |= GF_KEY_MOD_CTRL;
 			} else {
-				compositor->key_states &= ~GF_KEY_MOD_CTRL; 
+				compositor->key_states &= ~GF_KEY_MOD_CTRL;
 			}
 			break;
-		case GF_KEY_ALT: 
+		case GF_KEY_ALT:
 			if (event->type==GF_EVENT_KEYDOWN) {
 				compositor->key_states |= GF_KEY_MOD_ALT;
 			} else {
 				compositor->key_states &= ~GF_KEY_MOD_ALT;
 			}
 			break;
-		
-		}	
-	
+
+		}
+
 		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);
-		}			
+		}
 		ret += gf_sc_handle_event_intern(compositor, event, from_user);
 		return ret;
 	}
@@ -2953,14 +2956,10 @@
 
 		return gf_sc_handle_event_intern(compositor, event, from_user);
 	/*switch fullscreen off!!!*/
-	case GF_EVENT_SHOWHIDE:
+	case GF_EVENT_SHOWHIDE_NOTIF:
 		compositor->is_hidden = event->show.show_type ? GF_FALSE : GF_TRUE;
 		break;
 
-	case GF_EVENT_SET_CAPTION:
-		compositor->video_out->ProcessEvent(compositor->video_out, event);
-		break;
-
 	case GF_EVENT_MOUSEMOVE:
 		event->mouse.button = 0;
 	case GF_EVENT_MOUSEDOWN:
@@ -3000,6 +2999,10 @@
 	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);
 	}
@@ -3024,28 +3027,49 @@
 Bool gf_sc_script_action(GF_Compositor *compositor, u32 type, GF_Node *n, GF_JSAPIParam *param)
 {
 	switch (type) {
-	case GF_JSAPI_OP_GET_SCALE: param->val = compositor->zoom; return GF_TRUE;
-	case GF_JSAPI_OP_SET_SCALE: compositor_2d_set_user_transform(compositor, param->val, compositor->trans_x, compositor->trans_y, GF_FALSE); return GF_TRUE;
-	case GF_JSAPI_OP_GET_ROTATION: param->val = gf_divfix(180*compositor->rotation, GF_PI); return GF_TRUE;
-	case GF_JSAPI_OP_SET_ROTATION: compositor->rotation = gf_mulfix(GF_PI, param->val/180); compositor_2d_set_user_transform(compositor, compositor->zoom, compositor->trans_x, compositor->trans_y, GF_FALSE); return GF_TRUE;
-	case GF_JSAPI_OP_GET_TRANSLATE: param->pt.x = compositor->trans_x; param->pt.y = compositor->trans_y; return GF_TRUE;
-	case GF_JSAPI_OP_SET_TRANSLATE: compositor_2d_set_user_transform(compositor, compositor->zoom, param->pt.x, param->pt.y, GF_FALSE); return GF_TRUE;
+	case GF_JSAPI_OP_GET_SCALE:
+		param->val = compositor->zoom;
+		return GF_TRUE;
+	case GF_JSAPI_OP_SET_SCALE:
+		compositor_2d_set_user_transform(compositor, param->val, compositor->trans_x, compositor->trans_y, GF_FALSE);
+		return GF_TRUE;
+	case GF_JSAPI_OP_GET_ROTATION:
+		param->val = gf_divfix(180*compositor->rotation, GF_PI);
+		return GF_TRUE;
+	case GF_JSAPI_OP_SET_ROTATION:
+		compositor->rotation = gf_mulfix(GF_PI, param->val/180);
+		compositor_2d_set_user_transform(compositor, compositor->zoom, compositor->trans_x, compositor->trans_y, GF_FALSE);
+		return GF_TRUE;
+	case GF_JSAPI_OP_GET_TRANSLATE:
+		param->pt.x = compositor->trans_x;
+		param->pt.y = compositor->trans_y;
+		return GF_TRUE;
+	case GF_JSAPI_OP_SET_TRANSLATE:
+		compositor_2d_set_user_transform(compositor, compositor->zoom, param->pt.x, param->pt.y, GF_FALSE);
+		return GF_TRUE;
 	/*FIXME - better SMIL timelines support*/
-	case GF_JSAPI_OP_GET_TIME: param->time = gf_node_get_scene_time(n); return GF_TRUE;
-	case GF_JSAPI_OP_SET_TIME: /*seek_to(param->time);*/ return GF_FALSE;
+	case GF_JSAPI_OP_GET_TIME:
+		param->time = gf_node_get_scene_time(n);
+		return GF_TRUE;
+	case GF_JSAPI_OP_SET_TIME: /*seek_to(param->time);*/
+		return GF_FALSE;
 	/*FIXME - this will not work for inline docs, we will have to store the clipper at the <svg> level*/
-	case GF_JSAPI_OP_GET_VIEWPORT: 
+	case GF_JSAPI_OP_GET_VIEWPORT:
 #ifndef GPAC_DISABLE_SVG
 		if (compositor_svg_get_viewport(n, &param->rc)) return GF_TRUE;
 #endif
-		param->rc = gf_rect_center(compositor->traverse_state->vp_size.x, compositor->traverse_state->vp_size.y); 
+		param->rc = gf_rect_center(compositor->traverse_state->vp_size.x, compositor->traverse_state->vp_size.y);
 		if (!compositor->visual->center_coords) {
 			param->rc.x = 0;
 			param->rc.y = 0;
 		}
 		return GF_TRUE;
-	case GF_JSAPI_OP_SET_FOCUS: compositor->focus_node = param->node; return GF_TRUE;
-	case GF_JSAPI_OP_GET_FOCUS: param->node = compositor->focus_node; return GF_TRUE;
+	case GF_JSAPI_OP_SET_FOCUS:
+		compositor->focus_node = param->node;
+		return GF_TRUE;
+	case GF_JSAPI_OP_GET_FOCUS:
+		param->node = compositor->focus_node;
+		return GF_TRUE;
 
 	/*same routine: traverse tree from root to target, collecting both bounds and transform matrix*/
 	case GF_JSAPI_OP_GET_LOCAL_BBOX:
@@ -3092,7 +3116,7 @@
 		}
 		if (!tr_state.abort_bounds_traverse) param->bbox.is_set = GF_FALSE;
 	}
-		return GF_TRUE;
+	return GF_TRUE;
 	case GF_JSAPI_OP_LOAD_URL:
 	{
 #ifndef GPAC_DISABLE_VRML
@@ -3124,9 +3148,15 @@
 			u32 tag = gf_node_get_tag(n);
 			switch(tag) {
 #ifndef GPAC_DISABLE_SVG
-			case TAG_SVG_audio: svg_pause_audio(n, GF_TRUE); break;
-			case TAG_SVG_video: svg_pause_video(n, GF_TRUE); break;
-			case TAG_SVG_animation: svg_pause_animation(n, GF_TRUE); break;
+			case TAG_SVG_audio:
+				svg_pause_audio(n, GF_TRUE);
+				break;
+			case TAG_SVG_video:
+				svg_pause_video(n, GF_TRUE);
+				break;
+			case TAG_SVG_animation:
+				svg_pause_animation(n, GF_TRUE);
+				break;
 #endif
 			}
 		} else {
@@ -3134,21 +3164,27 @@
 		}
 		return GF_TRUE;
 	case GF_JSAPI_OP_RESUME_SVG:
-		{
-			u32 tag = gf_node_get_tag(n);
-			switch(tag) {
+	{
+		u32 tag = gf_node_get_tag(n);
+		switch(tag) {
 #ifndef GPAC_DISABLE_SVG
-			case TAG_SVG_audio: svg_pause_audio(n, GF_FALSE); break;
-			case TAG_SVG_video: svg_pause_video(n, GF_FALSE); break;
-			case TAG_SVG_animation: svg_pause_animation(n, GF_FALSE); break;
+		case TAG_SVG_audio:
+			svg_pause_audio(n, GF_FALSE);
+			break;
+		case TAG_SVG_video:
+			svg_pause_video(n, GF_FALSE);
+			break;
+		case TAG_SVG_animation:
+			svg_pause_animation(n, GF_FALSE);
+			break;
 #endif
-			}
 		}
-		return GF_TRUE;
-	case GF_JSAPI_OP_GET_DPI_X: 
+	}
+	return GF_TRUE;
+	case GF_JSAPI_OP_GET_DPI_X:
 		param->opt = compositor->video_out->dpi_x;
 		return GF_TRUE;
-	case GF_JSAPI_OP_GET_DPI_Y: 
+	case GF_JSAPI_OP_GET_DPI_Y:
 		param->opt = compositor->video_out->dpi_y;
 		return GF_TRUE;
 	}
@@ -3167,10 +3203,10 @@
 		r = tr_state->ray;
 		gf_mx_apply_ray(&mx, &r);
 		if (!compositor_get_2d_plane_intersection(&r, &pos)) return GF_FALSE;
-		if ( (pos.x < clip->x) || (pos.y > clip->y) 
-			|| (pos.x > clip->x + clip->width) || (pos.y < clip->y - clip->height) ) return GF_FALSE;
+		if ( (pos.x < clip->x) || (pos.y > clip->y)
+		        || (pos.x > clip->x + clip->width) || (pos.y < clip->y - clip->height) ) return GF_FALSE;
 
-	} else 
+	} else
 #endif
 	{
 		GF_Rect rc = *clip;
@@ -3179,8 +3215,8 @@
 		pt.x = tr_state->ray.orig.x;
 		pt.y = tr_state->ray.orig.y;
 
-		if ( (pt.x < rc.x) || (pt.y > rc.y) 
-			|| (pt.x > rc.x + rc.width) || (pt.y < rc.y - rc.height) ) return GF_FALSE;
+		if ( (pt.x < rc.x) || (pt.y > rc.y)
+		        || (pt.x > rc.x + rc.width) || (pt.y < rc.y - rc.height) ) return GF_FALSE;
 	}
 	return GF_TRUE;
 }
@@ -3298,6 +3334,27 @@
 	compositor->video_frame_pending = GF_TRUE;
 }
 
+void gf_sc_queue_event(GF_Compositor *compositor, GF_Event *evt)
+{
+	u32 i, count;
+	GF_QueuedEvent *qev;
+	gf_mx_p(compositor->evq_mx);
+
+	count = gf_list_count(compositor->event_queue);
+	for (i=0; i<count; i++) {
+		qev = gf_list_get(compositor->event_queue, i);
+		if (!qev->node && (qev->evt.type==evt->type)) {
+			qev->evt = *evt;
+			gf_mx_v(compositor->evq_mx);
+			return;
+		}
+	}
+	GF_SAFEALLOC(qev, GF_QueuedEvent);
+	qev->evt = *evt;
+	gf_list_add(compositor->event_queue, qev);
+	gf_mx_v(compositor->evq_mx);
+}
+
 void gf_sc_queue_dom_event(GF_Compositor *compositor, GF_Node *node, GF_DOM_Event *evt)
 {
 	u32 i, count;
@@ -3351,17 +3408,17 @@
 		Bool del = 0;
 		GF_QueuedEvent *qev = gf_list_get(evq, i);
 		if (qev->node) {
-			if (node && qev->node)
+			if (node == qev->node)
 				del = 1;
-			if (sg && (gf_node_get_graph(qev->node)==sg)) 
+			if (sg && (gf_node_get_graph(qev->node)==sg))
 				del = 1;
 		}
-		if (qev->sg==sg)
+		if (qev->sg && (qev->sg==sg))
 			del = 1;
-	    else if (qev->target && (qev->target->ptr_type == GF_DOM_EVENT_TARGET_NODE)) {
-			if (node && ((GF_Node *)qev->target->ptr==node)) 
+		else if (qev->target && (qev->target->ptr_type == GF_DOM_EVENT_TARGET_NODE)) {
+			if (node && ((GF_Node *)qev->target->ptr==node))
 				del = 1;
-			if (sg && (gf_node_get_graph((GF_Node *)qev->target->ptr)==sg)) 
+			if (sg && (gf_node_get_graph((GF_Node *)qev->target->ptr)==sg))
 				del = 1;
 		}

gpac-0.5.0.svn5178.tar.bz2/src/compositor/compositor_2d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/compositor_2d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -29,14 +29,14 @@
 #include "nodes_stacks.h"
 #include <gpac/options.h>
 #include <gpac/internal/terminal_dev.h>
+#include "texturing.h"
 
 #ifdef OPENGL_RASTER
 #include "gl_inc.h"
-#include "texturing.h"
 
 static void c2d_gl_fill_no_alpha(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color)
 {
-    return;
+	return;
 #if defined(GPAC_USE_OGL_ES)
 	GLfloat line[4];
 
@@ -64,7 +64,7 @@
 
 static void c2d_gl_fill_alpha(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color, u8 alpha)
 {
-    return;
+	return;
 #if defined(GPAC_USE_OGL_ES)
 	GLfloat line[4];
 
@@ -95,7 +95,7 @@
 
 static void c2d_gl_fill_rect(void *cbk, u32 x, u32 y, u32 width, u32 height, GF_Color color)
 {
-    return;
+	return;
 #if defined(GPAC_USE_OGL_ES)
 	GLfloat line[8];
 
@@ -138,26 +138,32 @@
 
 
 #ifndef GPAC_DISABLE_3D
-void compositor_2d_hybgl_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor)
+void compositor_2d_hybgl_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, Bool is_offscreen_clear)
 {
 	SFColor rgb;
+	Fixed alpha = INT2FIX( GF_COL_A(BackColor) )/255;
 	if (!visual->is_attached) return;
-	
+
 	if (!BackColor && !visual->offscreen) {
 		if (!visual->compositor->user || !(visual->compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT)) {
 			BackColor = visual->compositor->back_color & 0x00FFFFFF;
 		}
 	}
-	if (rc) {
+	if (is_offscreen_clear) {
 		visual->compositor->rasterizer->surface_clear(visual->raster_surface, rc, BackColor);
+		//if we clear the canvas with non-0 alpha, remember the area cleared in case we have to erase it later (overlapping bitmap)
+		if (GF_COL_A(BackColor)) {
+			ra_union_rect(&visual->hybgl_drawn, rc);
+		}
 	} else {
 		rgb.red = INT2FIX( GF_COL_R(BackColor) ) / 255;
 		rgb.green = INT2FIX( GF_COL_G(BackColor) )/255;
 		rgb.blue = INT2FIX( GF_COL_B(BackColor) )/255;
-		visual_3d_clear(visual, rgb , GF_COL_A(BackColor));
+		visual_3d_clear(visual, rgb , alpha);
 	}
 }
 
+
 void compositor_2d_hybgl_flush_video(GF_Compositor *compositor, GF_IRect *area)
 {
 	GF_TraverseState a_tr_state;
@@ -182,6 +188,8 @@
 		goto exit;
 
 	a_tr_state.visual = compositor->visual;
+	a_tr_state.camera = &compositor->visual->camera;
+	gf_mx_init(a_tr_state.model_matrix);
 
 	visual_3d_set_state(compositor->visual, V3D_STATE_LIGHT, 0);
 	visual_3d_enable_antialias(compositor->visual, 0);
@@ -224,7 +232,7 @@
 
 		visual_3d_mesh_paint(&a_tr_state, compositor->hybgl_mesh);
 		gf_sc_texture_disable(compositor->hybgl_txh);
-		
+
 		if (area) {
 			SFVec2f size;
 			size.x = INT2FIX(compositor->vp_width);
@@ -264,6 +272,7 @@
 	} else {
 		visual_3d_set_state(visual, V3D_STATE_BLEND, 0);
 	}
+#ifndef GPAC_DISABLE_VRML
 	/*ignore texture transform for bitmap*/
 	tr_state->mesh_num_textures = gf_sc_texture_enable(ctx->aspect.fill_texture, tr_state->appear ? ((M_Appearance *)tr_state->appear)->textureTransform : NULL);
 	if (tr_state->mesh_num_textures) {
@@ -283,6 +292,7 @@
 		tr_state->mesh_num_textures = 0;
 		return 1;
 	}
+#endif
 	return 0;
 }
 
@@ -317,7 +327,7 @@
 			gf_free(compositor->hybgl_txh->data);
 			compositor->hybgl_txh->data = NULL;
 		}
-		if (compositor->hybgl_txh->tx_io) 
+		if (compositor->hybgl_txh->tx_io)
 			gf_sc_texture_release(compositor->hybgl_txh);
 
 		gf_free(compositor->hybgl_txh);
@@ -335,12 +345,14 @@
 
 static GF_Err compositor_2d_setup_opengl(GF_VisualManager *visual)
 {
-	GF_Matrix mx;
 	Fixed hh, hw;
 	GF_Compositor *compositor = visual->compositor;
 	visual->is_attached = 1;
 
 	visual_3d_setup(visual);
+	visual->compositor->traverse_state->camera = &visual->camera;
+
+
 	glClear(GL_DEPTH_BUFFER_BIT);
 	glViewport(0, 0, compositor->vp_width, compositor->vp_height);
 
@@ -357,7 +369,7 @@
 	glDisable(GL_NORMALIZE);
 	glDisable(GL_DEPTH_TEST);
 	//glDepthFunc(GL_LEQUAL);
-	
+
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 	if (compositor->opengl_raster) {
@@ -368,22 +380,17 @@
 
 	hw = INT2FIX(compositor->vp_width)/2;
 	hh = INT2FIX(compositor->vp_height)/2;
-	gf_mx_ortho(&mx, -hw, hw, -hh, hh, 50, -50);
+	gf_mx_ortho(&visual->camera.projection, -hw, hw, -hh, hh, 50, -50);
+	visual_3d_projection_matrix_modified(visual);
 
-	visual_3d_set_matrix_mode(visual, V3D_MATRIX_PROJECTION);
-	visual_3d_matrix_load(visual, mx.m);
+	gf_mx_init(visual->camera.modelview);
 
-	visual_3d_set_matrix_mode(visual, V3D_MATRIX_MODELVIEW);
-	gf_mx_init(mx);
 #ifdef OPENGL_RASTER
 	if (compositor->opengl_raster) {
-		gf_mx_add_scale(&mx, 1, -1, 1);
-		gf_mx_add_translation(&mx, -hw, -hh, 0);
+		gf_mx_add_scale(&visual->camera.modelview, 1, -1, 1);
+		gf_mx_add_translation(&visual->camera.modelview, -hw, -hh, 0);
 	}
 #endif
-
-	visual_3d_matrix_load(visual, mx.m);
-
 	return GF_OK;
 }
 #endif
@@ -403,11 +410,11 @@
 		callbacks.fill_run_no_alpha = c2d_gl_fill_no_alpha;
 		callbacks.fill_rect = c2d_gl_fill_rect;
 
-		visual->DrawBitmap = compositor_2d_hybgl_draw_bitmap;
+		visual->DrawBitmap = c2d_gl_draw_bitmap;
 
 		e = compositor->rasterizer->surface_attach_to_callbacks(visual->raster_surface, &callbacks, compositor->vp_width, compositor->vp_height);
 		if (e) return e;
-		
+
 		return compositor_2d_setup_opengl(visual);
 	}
 #endif
@@ -423,11 +430,11 @@
 
 		if ((compositor->hybgl_txh->width != compositor->vp_width) || (compositor->hybgl_txh->height != compositor->vp_height)) {
 			SFVec2f size;
-			compositor->hybgl_txh->data = gf_realloc(compositor->hybgl_txh->data, 4*compositor->vp_width*compositor->vp_height);		
+			compositor->hybgl_txh->data = gf_realloc(compositor->hybgl_txh->data, 4*compositor->vp_width*compositor->vp_height);
 
-			if (compositor->hybgl_txh->tx_io) 
+			if (compositor->hybgl_txh->tx_io)
 				gf_sc_texture_release(compositor->hybgl_txh);
-		
+
 			compositor->hybgl_txh->width = compositor->vp_width;
 			compositor->hybgl_txh->height = compositor->vp_height;
 			compositor->hybgl_txh->stride = 4*compositor->vp_width;
@@ -456,11 +463,11 @@
 			memset(compositor->hybgl_txh->data, 0, 4*compositor->hybgl_txh->width*compositor->hybgl_txh->height);
 
 		e = compositor->rasterizer->surface_attach_to_buffer(visual->raster_surface, compositor->hybgl_txh->data,
-							compositor->hybgl_txh->width,
-							compositor->hybgl_txh->height,
-							0,
-							compositor->hybgl_txh->width * 4,
-							(GF_PixelFormat) GF_PIXEL_RGBA);
+		        compositor->hybgl_txh->width,
+		        compositor->hybgl_txh->height,
+		        0,
+		        compositor->hybgl_txh->width * 4,
+		        (GF_PixelFormat) GF_PIXEL_RGBA);
 		if (e) return e;
 		e = compositor_2d_setup_opengl(visual);
 		if (e) return e;
@@ -475,9 +482,9 @@
 
 	/*try from video memory handle (WIN32) if supported*/
 	if ((compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_HWND_HDC)
-		&& compositor->rasterizer->surface_attach_to_device
-		&& compositor->video_out->LockOSContext
-		) {
+	        && compositor->rasterizer->surface_attach_to_device
+	        && compositor->video_out->LockOSContext
+	   ) {
 		compositor->hw_context = compositor->video_out->LockOSContext(compositor->video_out, 1);
 		if (compositor->hw_context) {
 			e = compositor->rasterizer->surface_attach_to_device(visual->raster_surface, compositor->hw_context, compositor->vp_width, compositor->vp_height);
@@ -508,11 +515,11 @@
 		compositor->hw_locked = 1;
 
 		e = compositor->rasterizer->surface_attach_to_buffer(visual->raster_surface, compositor->hw_surface.video_buffer,
-							compositor->hw_surface.width,
-							compositor->hw_surface.height,
-							compositor->hw_surface.pitch_x,
-							compositor->hw_surface.pitch_y,
-							(GF_PixelFormat) compositor->hw_surface.pixel_format);
+		        compositor->hw_surface.width,
+		        compositor->hw_surface.height,
+		        compositor->hw_surface.pitch_x,
+		        compositor->hw_surface.pitch_y,
+		        (GF_PixelFormat) compositor->hw_surface.pixel_format);
 		if (!e) {
 			visual->is_attached = 1;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Video surface memory attached to raster - w=%d h=%d pitch_x=%d pitch_y=%d\n", compositor->hw_surface.width, compositor->hw_surface.height, compositor->hw_surface.pitch_x, compositor->hw_surface.pitch_y));
@@ -555,21 +562,21 @@
 #ifndef GPAC_DISABLE_LOGS
 static void log_blit_times(GF_TextureHandler *txh, u32 push_time)
 {
-    u32 ck;
-    if (!txh->stream) return;
-    push_time = gf_sys_clock() - push_time;
-    gf_mo_get_object_time(txh->stream, &ck);
-    if (ck>txh->last_frame_time) {
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Bliting frame (CTS %d) %d ms too late\n", txh->last_frame_time, ck - txh->last_frame_time ));
-    }
-    if (txh->nb_frames==100) {
-        txh->nb_frames = 0;
-        txh->upload_time = 0;
-    }
-    txh->nb_frames ++;
-    txh->upload_time += push_time;
-        
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[2D Blitter] At %d Blit texture (CTS %d) %d ms after due date - blit in %d ms - average push time %d ms\n", ck, txh->last_frame_time, ck - txh->last_frame_time, push_time, txh->upload_time / txh->nb_frames));
+	u32 ck;
+	if (!txh->stream) return;
+	push_time = gf_sys_clock() - push_time;
+	gf_mo_get_object_time(txh->stream, &ck);
+	if (ck>txh->last_frame_time) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Bliting frame (CTS %d) %d ms too late\n", txh->last_frame_time, ck - txh->last_frame_time ));
+	}
+	if (txh->nb_frames==100) {
+		txh->nb_frames = 0;
+		txh->upload_time = 0;
+	}
+	txh->nb_frames ++;
+	txh->upload_time += push_time;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[2D Blitter] At %d Blit texture (CTS %d) %d ms after due date - blit in %d ms - average push time %d ms\n", ck, txh->last_frame_time, ck - txh->last_frame_time, push_time, txh->upload_time / txh->nb_frames));
 }
 #endif
 
@@ -715,11 +722,11 @@
 	if (!txh->data) return GF_TRUE;
 
 	if (!visual->compositor->has_size_info && !(visual->compositor->msg_type & GF_SR_CFG_OVERRIDE_SIZE)
-		&& (visual->compositor->override_size_flags & 1)
-		&& !(visual->compositor->override_size_flags & 2)
-		) {
+	        && (visual->compositor->override_size_flags & 1)
+	        && !(visual->compositor->override_size_flags & 2)
+	   ) {
 		if ( (visual->compositor->scene_width < txh->width)
-			|| (visual->compositor->scene_height < txh->height)) {
+		        || (visual->compositor->scene_height < txh->height)) {
 			visual->compositor->scene_width = txh->width;
 			visual->compositor->scene_height = txh->height;
 			visual->compositor->msg_type |= GF_SR_CFG_OVERRIDE_SIZE;
@@ -728,7 +735,7 @@
 	}
 
 	if (!compositor_texture_rectangles(visual, txh, clip, unclip, &src_wnd, &dst_wnd, &use_blit, &has_scale)) return GF_TRUE;
-	
+
 	/*can we use hardware blitter ?*/
 	hw_caps = visual->compositor->video_out->hw_caps;
 	overlay_type = 0;
@@ -779,8 +786,8 @@
 		}
 		/*disable based on settings*/
 		if (!visual->compositor->enable_yuv_hw
-			|| (ctx->col_mat || (alpha!=0xFF) || !visual->compositor->video_out->Blit)
-			) {
+		        || (ctx->col_mat || (alpha!=0xFF) || !visual->compositor->video_out->Blit)
+		   ) {
 			use_soft_stretch = GF_TRUE;
 			overlay_type = 0;
 		}
@@ -864,7 +871,7 @@
 
 		o_rc.width = dst_wnd.w;
 		o_rc.height = dst_wnd.h;
-		visual->ClearSurface(visual, &o_rc, visual->compositor->video_out->overlay_color_key);
+		visual->ClearSurface(visual, &o_rc, visual->compositor->video_out->overlay_color_key, 0);
 		visual->has_overlays = GF_TRUE;
 		/*mark drawable as overlay*/
 		ctx->drawable->flags |= DRAWABLE_IS_OVERLAY;
@@ -899,10 +906,10 @@
 		push_time = gf_sys_clock();
 		e = visual->compositor->video_out->Blit(visual->compositor->video_out, &video_src, &src_wnd, &dst_wnd, 1);
 
-		if (!e) {            
+		if (!e) {
 #ifndef GPAC_DISABLE_LOG
-            log_blit_times(txh, push_time);
-#endif            
+			log_blit_times(txh, push_time);
+#endif
 			/*mark drawable as overlay*/
 			ctx->drawable->flags |= DRAWABLE_IS_OVERLAY;
 			visual->has_overlays = GF_TRUE;
@@ -940,7 +947,7 @@
 		}
 #ifndef GPAC_DISABLE_LOG
 		else {
-            log_blit_times(txh, push_time);
+			log_blit_times(txh, push_time);
 		}
 #endif
 	}
@@ -952,10 +959,10 @@
 		GF_VideoSurface backbuffer;
 		e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, GF_TRUE);
 		if (!e) {
-            u32 push_time = gf_sys_clock();
+			u32 push_time = gf_sys_clock();
 			gf_stretch_bits(&backbuffer, &video_src, &dst_wnd, &src_wnd, alpha, 0, col_key, ctx->col_mat);
 #ifndef GPAC_DISABLE_LOG
-            log_blit_times(txh, push_time);
+			log_blit_times(txh, push_time);
 #endif
 			e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, GF_FALSE);
 		} else {
@@ -972,7 +979,7 @@
 		}
 	}
 	visual->has_modif = GF_TRUE;
-//	if (is_attached) visual_2d_init_raster(visual);
+	if (is_attached) visual_2d_init_raster(visual);
 	return GF_TRUE;
 }
 
@@ -1022,8 +1029,8 @@
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_YUVA:
 	case GF_PIXEL_RGBS:
-	case GF_PIXEL_RGBAS:		
-	case GF_PIXEL_YV12_10:		
+	case GF_PIXEL_RGBAS:
+	case GF_PIXEL_YV12_10:
 		break;
 	case GF_PIXEL_YUVD:
 	case GF_PIXEL_RGBD:
@@ -1046,11 +1053,11 @@
 		if (visual->compositor->video_out->BlitTexture) {
 			if (! visual->compositor->video_out->BlitTexture(visual->compositor->video_out, ctx->aspect.fill_texture, &ctx->transform, &ctx->bi->clip, alpha, col_key
 #ifdef GF_SR_USE_DEPTH
-				, ctx->depth_offset, ctx->depth_gain
+			        , ctx->depth_offset, ctx->depth_gain
 #else
-				, 0, 0
+			        , 0, 0
 #endif
-				))
+			                                                ))
 				return GF_FALSE;
 		} else {
 			if (!compositor_2d_draw_bitmap_ex(visual, ctx->aspect.fill_texture, ctx, &ctx->bi->clip, &ctx->bi->unclip, alpha, col_key, tr_state, 0))
@@ -1072,12 +1079,12 @@
 				if (visual->compositor->video_out->BlitTexture) {
 					if (!visual->compositor->video_out->BlitTexture(visual->compositor->video_out, ctx->aspect.fill_texture, &ctx->transform, &ctx->bi->clip, alpha, col_key
 #ifdef GF_SR_USE_DEPTH
-						, ctx->depth_offset, ctx->depth_gain
+					        , ctx->depth_offset, ctx->depth_gain
 #else
-						, 0, 0
+					        , 0, 0
 #endif
-					))
-					return 0;
+					                                               ))
+						return 0;
 				} else if (!compositor_2d_draw_bitmap_ex(visual, ctx->aspect.fill_texture, ctx, &clip, &ctx->bi->unclip, alpha, col_key, tr_state, 0)) {
 					return 0;
 				}
@@ -1174,10 +1181,10 @@
 
 			scaleX = scaleY = FIX_ONE;
 		} else {
-/*
-			compositor->output_width = compositor->vp_width;
-			compositor->output_height = compositor->vp_height;
-*/
+			/*
+						compositor->output_width = compositor->vp_width;
+						compositor->output_height = compositor->vp_height;
+			*/
 			compositor->output_width = compositor->display_width;
 			compositor->output_height = compositor->display_height;
 			compositor->vp_width = compositor->display_width;
@@ -1218,12 +1225,12 @@
 	else if (old_vp_width != compositor->vp_width) changed=1;
 	else if (old_vp_height != compositor->vp_height) changed=1;
 	else if (compositor->is_opengl != evt.setup.opengl_mode) changed=1;
-	
+
 
 	if (changed) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor2D] Reconfiguring display size %d x %d - opengl %s - use %s memory\n", evt.setup.width, evt.setup.height,
-			(evt.setup.opengl_mode==2) ? "Offscreen" : (evt.setup.opengl_mode==1) ? "yes" : "no", evt.setup.system_memory ? "systems" : "video"
-			));
+		                                     (evt.setup.opengl_mode==2) ? "Offscreen" : (evt.setup.opengl_mode==1) ? "yes" : "no", evt.setup.system_memory ? "systems" : "video"
+		                                    ));
 
 		e = compositor->video_out->ProcessEvent(compositor->video_out, &evt);
 		if (e) {
@@ -1244,7 +1251,7 @@
 		}
 
 		compositor->is_opengl = evt.setup.opengl_mode;
-		compositor->was_system_memory = evt.setup.system_memory;		
+		compositor->was_system_memory = evt.setup.system_memory;
 	}
 	if (compositor->has_size_info) {
 		compositor->traverse_state->vp_size.x = INT2FIX(compositor->scene_width);
@@ -1409,7 +1416,7 @@
 			gf_mx2d_inverse(&mx2d);
 			gf_mx2d_apply_rect(&mx2d, &orig);
 		}
-		
+
 		if (clip.x < orig.x) {
 			clip.width -= (orig.x - clip.x);
 			clip.x = orig.x;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/compositor_3d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/compositor_3d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -118,7 +118,7 @@
 		return GF_OK;
 	}
 
-#if defined(GPAC_USE_TINYGL) 
+#if defined(GPAC_USE_TINYGL)
 	{
 		u32 bpp;
 		GF_VideoSurface bb;
@@ -150,12 +150,12 @@
 		}
 	}
 #endif
-	
+
 	return GF_OK;
 }
 
 
-GF_Camera *compositor_3d_get_camera(GF_Compositor *compositor) 
+GF_Camera *compositor_3d_get_camera(GF_Compositor *compositor)
 {
 #ifndef GPAC_DISABLE_VRML
 	if (compositor->active_layer) {
@@ -180,133 +180,82 @@
 void compositor_3d_draw_bitmap(Drawable *stack, DrawAspect2D *asp, GF_TraverseState *tr_state, Fixed width, Fixed height, Fixed bmp_scale_x, Fixed bmp_scale_y)
 {
 	u8 alpha;
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
-	Fixed x, y;
-	Fixed sx, sy;
-	char *data;
-	u32 format;
-#endif
 	GF_TextureHandler *txh;
 	GF_Compositor *compositor = tr_state->visual->compositor;
-	Bool use_texture = !compositor->bitmap_use_pixels;
 
-	if (!asp->fill_texture) 
+	if (!asp->fill_texture)
 		return;
 	txh = asp->fill_texture;
-	if (!txh || !txh->tx_io || !txh->width || !txh->height) 
+	if (!txh || !txh->tx_io || !txh->width || !txh->height)
 		return;
-	
+
 	if (((txh->pixelformat==GF_PIXEL_RGBD) || (txh->pixelformat==GF_PIXEL_YUVD))) {
 		if (compositor->depth_gl_type) {
 			if (txh->data && gf_sc_texture_convert(txh) )
 				visual_3d_point_sprite(tr_state->visual, stack, txh, tr_state);
 			return;
-		} else {
-			use_texture = 1;
 		}
-	}	
+	}
 
 	alpha = GF_COL_A(asp->fill_color);
 	/*THIS IS A HACK, will not work when setting filled=0, transparency and XLineProps*/
 	if (!alpha) alpha = GF_COL_A(asp->line_color);
 
-	/*texture is available in hw, use it - if blending, force using texture*/
-	if (use_texture || !gf_sc_texture_needs_reload(txh) || (alpha != 0xFF) 
-#ifdef GF_SR_USE_DEPTH
-		|| tr_state->depth_offset
-#endif
-		) {
-		visual_3d_set_state(tr_state->visual, V3D_STATE_LIGHT, 0);
-		visual_3d_enable_antialias(tr_state->visual, 0);
-		if (alpha && (alpha != 0xFF)) {
-			visual_3d_set_material_2d_argb(tr_state->visual, GF_COL_ARGB(alpha, 0xFF, 0xFF, 0xFF));
-			gf_sc_texture_set_blend_mode(txh, TX_MODULATE);
-		} else if (gf_sc_texture_is_transparent(txh)) {
-			gf_sc_texture_set_blend_mode(txh, TX_REPLACE);
-		} else {
-			visual_3d_set_state(tr_state->visual, V3D_STATE_BLEND, 0);
+	visual_3d_set_state(tr_state->visual, V3D_STATE_LIGHT, 0);
+	visual_3d_enable_antialias(tr_state->visual, 0);
+	if (alpha && (alpha != 0xFF)) {
+		visual_3d_set_material_2d_argb(tr_state->visual, GF_COL_ARGB(alpha, 0xFF, 0xFF, 0xFF));
+		gf_sc_texture_set_blend_mode(txh, TX_MODULATE);
+	} else if (gf_sc_texture_is_transparent(txh)) {
+		gf_sc_texture_set_blend_mode(txh, TX_REPLACE);
+	} else {
+		visual_3d_set_state(tr_state->visual, V3D_STATE_BLEND, 0);
+	}
+	/*ignore texture transform for bitmap*/
+	tr_state->mesh_num_textures = gf_sc_texture_enable(txh, NULL);
+	if (tr_state->mesh_num_textures) {
+		/*we must check the w & h passed are correct because of bitmap node initialization*/
+		if (width && height) {
+			if (!stack->mesh) {
+				SFVec2f size;
+				size.x = width;
+				size.y = height;
+
+				stack->mesh = new_mesh();
+				mesh_new_rectangle(stack->mesh, size, NULL, 0);
+			}
 		}
-		/*ignore texture transform for bitmap*/
- 		tr_state->mesh_num_textures = gf_sc_texture_enable(txh, NULL);
-		if (tr_state->mesh_num_textures) {
-			/*we must check the w & h passed are correct because of bitmap node initialization*/
-			if (width && height) {
-				if (!stack->mesh) {
-					SFVec2f size;
-					size.x = width;
-					size.y = height;
-
-					stack->mesh = new_mesh();
-					mesh_new_rectangle(stack->mesh, size, NULL, 0);
-				}
-			} 
-			if (stack->mesh) {
+		if (stack->mesh) {
 #ifdef GF_SR_USE_DEPTH
-				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);
-					if (disp_depth) {
-						if (!tr_state->pixel_metrics) disp_depth = gf_divfix(disp_depth, tr_state->min_hsize);
-						gf_mx_init(mx);
-						/*add recalibration by the scene*/
-						offset = tr_state->depth_offset;
-						if (tr_state->visual->depth_vp_range) {
-							offset = gf_divfix(offset, tr_state->visual->depth_vp_range/2);
-						}
-						gf_mx_add_translation(&mx, 0, 0, gf_mulfix(offset, disp_depth/2) );
-						
-						visual_3d_matrix_push(tr_state->visual);
-						visual_3d_matrix_add(tr_state->visual, mx.m);
-						visual_3d_mesh_paint(tr_state, stack->mesh);
-						visual_3d_matrix_pop(tr_state->visual);
-					} else {
-						visual_3d_mesh_paint(tr_state, stack->mesh);
+			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);
+				if (disp_depth) {
+					GF_Matrix bck_mx;
+					if (!tr_state->pixel_metrics) disp_depth = gf_divfix(disp_depth, tr_state->min_hsize);
+					gf_mx_init(mx);
+					/*add recalibration by the scene*/
+					offset = tr_state->depth_offset;
+					if (tr_state->visual->depth_vp_range) {
+						offset = gf_divfix(offset, tr_state->visual->depth_vp_range/2);
 					}
-				} else 
-#endif
-					visual_3d_mesh_paint(tr_state, stack->mesh);
-			}
- 			gf_sc_texture_disable(txh);
-			tr_state->mesh_num_textures = 0;
-			return;
-		}
-	}
-
-	/*otherwise use glDrawPixels*/
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
-	data = gf_sc_texture_get_data(txh, &format);
-	if (!data) return;
-
-	x = INT2FIX(txh->width) / -2;
-	y = INT2FIX(txh->height) / 2;
+					gf_mx_add_translation(&mx, 0, 0, gf_mulfix(offset, disp_depth/2) );
 
-	{
-	Fixed g[16];
-
-	sx = bmp_scale_x; if (sx<0) sx = FIX_ONE;
-	sy = bmp_scale_y; if (sy<0) sy = FIX_ONE;
-#ifndef GPAC_DISABLE_VRML
-	compositor_adjust_scale(txh->owner, &sx, &sy);
+					gf_mx_copy(bck_mx, tr_state->model_matrix);
+					gf_mx_add_matrix(&tr_state->model_matrix, &mx);
+					visual_3d_mesh_paint(tr_state, stack->mesh);
+					gf_mx_copy(tr_state->model_matrix, bck_mx);
+				} else {
+					visual_3d_mesh_paint(tr_state, stack->mesh);
+				}
+			} else
 #endif
-
-	/*add top level scale if any*/
-	sx = gf_mulfix(sx, compositor->scale_x);
-	sy = gf_mulfix(sy, compositor->scale_y);
-
-	/*get & apply current transform scale*/
-	visual_3d_matrix_get(tr_state->visual, V3D_MATRIX_MODELVIEW, g);
-
-	if (g[0]<0) g[0] *= -FIX_ONE;
-	if (g[5]<0) g[5] *= -FIX_ONE;
-	sx = gf_mulfix(sx, g[0]);
-	sy = gf_mulfix(sy, g[5]);
-	x = gf_mulfix(x, sx);
-	y = gf_mulfix(y, sy);
-
+				visual_3d_mesh_paint(tr_state, stack->mesh);
+		}
+		gf_sc_texture_disable(txh);
+		tr_state->mesh_num_textures = 0;
 	}
-	visual_3d_draw_image(tr_state->visual, x, y, txh->width, txh->height, format, data, sx, sy);
-#endif
 }

gpac-0.5.0.svn5178.tar.bz2/src/compositor/compositor_node_init.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/compositor_node_init.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -48,110 +48,184 @@
 {
 	switch (gf_node_get_tag(node)) {
 #ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_AnimationStream: compositor_init_animationstream(compositor, node); break;
-	case TAG_MPEG4_AudioBuffer: compositor_init_audiobuffer(compositor, node); break;
-	case TAG_MPEG4_AudioSource: compositor_init_audiosource(compositor, node); break;
-	case TAG_MPEG4_AudioClip: 
+	case TAG_MPEG4_AnimationStream:
+		compositor_init_animationstream(compositor, node);
+		break;
+	case TAG_MPEG4_AudioBuffer:
+		compositor_init_audiobuffer(compositor, node);
+		break;
+	case TAG_MPEG4_AudioSource:
+		compositor_init_audiosource(compositor, node);
+		break;
+	case TAG_MPEG4_AudioClip:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_AudioClip: 
+	case TAG_X3D_AudioClip:
 #endif
-		compositor_init_audioclip(compositor, node); break;
-	case TAG_MPEG4_TimeSensor: 
+		compositor_init_audioclip(compositor, node);
+		break;
+	case TAG_MPEG4_TimeSensor:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_TimeSensor: 
+	case TAG_X3D_TimeSensor:
 #endif
-		compositor_init_timesensor(compositor, node); break;
-	case TAG_MPEG4_ImageTexture: 
+		compositor_init_timesensor(compositor, node);
+		break;
+	case TAG_MPEG4_ImageTexture:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_ImageTexture: 
+	case TAG_X3D_ImageTexture:
 #endif
-	case TAG_MPEG4_CacheTexture: 
-		compositor_init_imagetexture(compositor, node); break;
+	case TAG_MPEG4_CacheTexture:
+		compositor_init_imagetexture(compositor, node);
+		break;
 
-	case TAG_MPEG4_PixelTexture: 
+	case TAG_MPEG4_PixelTexture:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_PixelTexture: 
+	case TAG_X3D_PixelTexture:
 #endif
-		compositor_init_pixeltexture(compositor, node); break;
-	case TAG_MPEG4_MovieTexture: 
+		compositor_init_pixeltexture(compositor, node);
+		break;
+	case TAG_MPEG4_MovieTexture:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_MovieTexture: 
+	case TAG_X3D_MovieTexture:
 #endif
-		compositor_init_movietexture(compositor, node); break;		
+		compositor_init_movietexture(compositor, node);
+		break;
+
+	case TAG_MPEG4_Background2D:
+		compositor_init_background2d(compositor, node);
+		break;
+	case TAG_MPEG4_Bitmap:
+		compositor_init_bitmap(compositor, node);
+		break;
+	case TAG_MPEG4_ColorTransform:
+		compositor_init_colortransform(compositor, node);
+		break;
+	case TAG_MPEG4_Circle:
+		compositor_init_circle(compositor, node);
+		break;
+	case TAG_MPEG4_Curve2D:
+		compositor_init_curve2d(compositor, node);
+		break;
+	case TAG_MPEG4_XCurve2D:
+		compositor_init_curve2d(compositor, node);
+		break;
+	case TAG_MPEG4_Ellipse:
+		compositor_init_ellipse(compositor, node);
+		break;
+	case TAG_MPEG4_OrderedGroup:
+		compositor_init_orderedgroup(compositor, node);
+		break;
+	case TAG_MPEG4_PointSet2D:
+		compositor_init_pointset2d(compositor, node);
+		break;
+	case TAG_MPEG4_Transform2D:
+		compositor_init_transform2d(compositor, node);
+		break;
+	case TAG_MPEG4_TransformMatrix2D:
+		compositor_init_transformmatrix2d(compositor, node);
+		break;
+	case TAG_MPEG4_LineProperties:
+		compositor_init_lineprops(compositor, node);
+		break;
+	case TAG_MPEG4_XLineProperties:
+		compositor_init_lineprops(compositor, node);
+		break;
+	case TAG_MPEG4_Viewport:
+		compositor_init_viewport(compositor, node);
+		break;
+
+	case TAG_MPEG4_IndexedLineSet2D:
+		compositor_init_indexed_line_set2d(compositor, node);
+		break;
+	case TAG_MPEG4_IndexedFaceSet2D:
+		compositor_init_indexed_face_set2d(compositor, node);
+		break;
 
-	case TAG_MPEG4_Background2D: compositor_init_background2d(compositor, node); break;
-	case TAG_MPEG4_Bitmap: compositor_init_bitmap(compositor, node); break;
-	case TAG_MPEG4_ColorTransform: compositor_init_colortransform(compositor, node); break;
-	case TAG_MPEG4_Circle: compositor_init_circle(compositor, node); break;
-	case TAG_MPEG4_Curve2D: compositor_init_curve2d(compositor, node); break;
-	case TAG_MPEG4_XCurve2D: compositor_init_curve2d(compositor, node); break;
-	case TAG_MPEG4_Ellipse: compositor_init_ellipse(compositor, node); break;
-	case TAG_MPEG4_OrderedGroup: compositor_init_orderedgroup(compositor, node); break;
-	case TAG_MPEG4_PointSet2D: compositor_init_pointset2d(compositor, node); break;
-	case TAG_MPEG4_Transform2D: compositor_init_transform2d(compositor, node); break;
-	case TAG_MPEG4_TransformMatrix2D: compositor_init_transformmatrix2d(compositor, node); break;
-	case TAG_MPEG4_LineProperties: compositor_init_lineprops(compositor, node); break;
-	case TAG_MPEG4_XLineProperties: compositor_init_lineprops(compositor, node); break;
-	case TAG_MPEG4_Viewport: compositor_init_viewport(compositor, node); break;
+	case TAG_MPEG4_Sound2D:
+		compositor_init_sound2d(compositor, node);
+		break;
 
-	case TAG_MPEG4_IndexedLineSet2D: compositor_init_indexed_line_set2d(compositor, node); break;
-	case TAG_MPEG4_IndexedFaceSet2D: compositor_init_indexed_face_set2d(compositor, node); break;
-		
-	case TAG_MPEG4_Sound2D: compositor_init_sound2d(compositor, node); break;
+	case TAG_MPEG4_LinearGradient:
+		compositor_init_linear_gradient(compositor, node);
+		break;
+	case TAG_MPEG4_RadialGradient:
+		compositor_init_radial_gradient(compositor, node);
+		break;
+
+	case TAG_MPEG4_CompositeTexture2D:
+		compositor_init_compositetexture2d(compositor, node);
+		break;
+	case TAG_MPEG4_MatteTexture:
+		compositor_init_mattetexture(compositor, node);
+		break;
 
-	case TAG_MPEG4_LinearGradient: compositor_init_linear_gradient(compositor, node); break;
-	case TAG_MPEG4_RadialGradient: compositor_init_radial_gradient(compositor, node); break;
+	case TAG_MPEG4_Form:
+		compositor_init_form(compositor, node);
+		break;
+	case TAG_MPEG4_Layer2D:
+		compositor_init_layer2d(compositor, node);
+		break;
+	case TAG_MPEG4_Layout:
+		compositor_init_layout(compositor, node);
+		break;
+	case TAG_MPEG4_PathLayout:
+		compositor_init_path_layout(compositor, node);
+		break;
 
-	case TAG_MPEG4_CompositeTexture2D: compositor_init_compositetexture2d(compositor, node); break;
-	case TAG_MPEG4_MatteTexture: compositor_init_mattetexture(compositor, node); break;
 
-	case TAG_MPEG4_Form: compositor_init_form(compositor, node); break;
-	case TAG_MPEG4_Layer2D: compositor_init_layer2d(compositor, node); break;
-	case TAG_MPEG4_Layout: compositor_init_layout(compositor, node); break;
-	case TAG_MPEG4_PathLayout: compositor_init_path_layout(compositor, node); break;
-		
-		
 	/*sensors*/
-	case TAG_MPEG4_Anchor: 
+	case TAG_MPEG4_Anchor:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Anchor: 
+	case TAG_X3D_Anchor:
 #endif
-		compositor_init_anchor(compositor, node); break;
-	case TAG_MPEG4_DiscSensor: compositor_init_disc_sensor(compositor, node); break;
-	case TAG_MPEG4_PlaneSensor2D: compositor_init_plane_sensor2d(compositor, node); break;
-	case TAG_MPEG4_ProximitySensor2D: compositor_init_proximity_sensor2d(compositor, node); break;
-	case TAG_MPEG4_TouchSensor: 
+		compositor_init_anchor(compositor, node);
+		break;
+	case TAG_MPEG4_DiscSensor:
+		compositor_init_disc_sensor(compositor, node);
+		break;
+	case TAG_MPEG4_PlaneSensor2D:
+		compositor_init_plane_sensor2d(compositor, node);
+		break;
+	case TAG_MPEG4_ProximitySensor2D:
+		compositor_init_proximity_sensor2d(compositor, node);
+		break;
+	case TAG_MPEG4_TouchSensor:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_TouchSensor: 
+	case TAG_X3D_TouchSensor:
 #endif
-		compositor_init_touch_sensor(compositor, node); break;
+		compositor_init_touch_sensor(compositor, node);
+		break;
 
-	case TAG_MPEG4_Group: 
+	case TAG_MPEG4_Group:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Group: 
+	case TAG_X3D_Group:
 #endif
-		compositor_init_group(compositor, node); break;
-	case TAG_MPEG4_Rectangle: 
+		compositor_init_group(compositor, node);
+		break;
+	case TAG_MPEG4_Rectangle:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Rectangle2D: 
+	case TAG_X3D_Rectangle2D:
 #endif
-		compositor_init_rectangle(compositor, node); break;
-	case TAG_MPEG4_Shape: 
+		compositor_init_rectangle(compositor, node);
+		break;
+	case TAG_MPEG4_Shape:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Shape: 
+	case TAG_X3D_Shape:
 #endif
-		compositor_init_shape(compositor, node); break;
-	case TAG_MPEG4_Switch: 
+		compositor_init_shape(compositor, node);
+		break;
+	case TAG_MPEG4_Switch:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Switch: 
+	case TAG_X3D_Switch:
 #endif
-		compositor_init_switch(compositor, node); break;
+		compositor_init_switch(compositor, node);
+		break;
 
-	case TAG_MPEG4_Text: 
+	case TAG_MPEG4_Text:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Text: 
+	case TAG_X3D_Text:
 #endif
-		compositor_init_text(compositor, node); break;
+		compositor_init_text(compositor, node);
+		break;
 
 #ifndef GPAC_DISABLE_3D
 	case TAG_MPEG4_Background:
@@ -316,7 +390,7 @@
 		break;
 
 	case TAG_MPEG4_Layer3D:
-		compositor_init_layer3d(compositor, node); 
+		compositor_init_layer3d(compositor, node);
 		break;
 	case TAG_MPEG4_CompositeTexture3D:
 		compositor_init_compositetexture3d(compositor, node);
@@ -328,82 +402,168 @@
 #endif
 
 
-	/*X3D nodes*/
+		/*X3D nodes*/
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_StaticGroup: compositor_init_static_group(compositor, node); break;
-	case TAG_X3D_Disk2D: compositor_init_disk2d(compositor, node); break;
-	case TAG_X3D_Arc2D: case TAG_X3D_ArcClose2D: compositor_init_arc2d(compositor, node); break;
-	case TAG_X3D_Polyline2D: compositor_init_polyline2d(compositor, node); break;
-	case TAG_X3D_TriangleSet2D: compositor_init_triangle_set2d(compositor, node); break;
+	case TAG_X3D_StaticGroup:
+		compositor_init_static_group(compositor, node);
+		break;
+	case TAG_X3D_Disk2D:
+		compositor_init_disk2d(compositor, node);
+		break;
+	case TAG_X3D_Arc2D:
+	case TAG_X3D_ArcClose2D:
+		compositor_init_arc2d(compositor, node);
+		break;
+	case TAG_X3D_Polyline2D:
+		compositor_init_polyline2d(compositor, node);
+		break;
+	case TAG_X3D_TriangleSet2D:
+		compositor_init_triangle_set2d(compositor, node);
+		break;
 
 #ifndef GPAC_DISABLE_3D
-	case TAG_X3D_Polypoint2D: compositor_init_polypoint2d(compositor, node); break;
-	case TAG_X3D_LineSet: compositor_init_lineset(compositor, node); break;
-	case TAG_X3D_TriangleSet: compositor_init_triangle_set(compositor, node); break;
-	case TAG_X3D_TriangleStripSet: compositor_init_triangle_strip_set(compositor, node); break;
-	case TAG_X3D_TriangleFanSet: compositor_init_triangle_fan_set(compositor, node); break;
-	case TAG_X3D_IndexedTriangleFanSet: compositor_init_indexed_triangle_fan_set(compositor, node); break;
-	case TAG_X3D_IndexedTriangleStripSet: compositor_init_indexed_triangle_strip_set(compositor, node); break;
-	case TAG_X3D_IndexedTriangleSet: compositor_init_indexed_triangle_set(compositor, node); break;
+	case TAG_X3D_Polypoint2D:
+		compositor_init_polypoint2d(compositor, node);
+		break;
+	case TAG_X3D_LineSet:
+		compositor_init_lineset(compositor, node);
+		break;
+	case TAG_X3D_TriangleSet:
+		compositor_init_triangle_set(compositor, node);
+		break;
+	case TAG_X3D_TriangleStripSet:
+		compositor_init_triangle_strip_set(compositor, node);
+		break;
+	case TAG_X3D_TriangleFanSet:
+		compositor_init_triangle_fan_set(compositor, node);
+		break;
+	case TAG_X3D_IndexedTriangleFanSet:
+		compositor_init_indexed_triangle_fan_set(compositor, node);
+		break;
+	case TAG_X3D_IndexedTriangleStripSet:
+		compositor_init_indexed_triangle_strip_set(compositor, node);
+		break;
+	case TAG_X3D_IndexedTriangleSet:
+		compositor_init_indexed_triangle_set(compositor, node);
+		break;
 #endif
 
 #endif /*GPAC_DISABLE_X3D*/
 
-	case TAG_ProtoNode: compositor_init_hardcoded_proto(compositor, node); break;
+	case TAG_ProtoNode:
+		compositor_init_hardcoded_proto(compositor, node);
+		break;
 
-	case TAG_MPEG4_SBVCAnimation:			
-		compositor_init_afx_node(compositor, node, & ((M_SBVCAnimation *)node)->url); 
+	case TAG_MPEG4_SBVCAnimation:
+		compositor_init_afx_node(compositor, node, & ((M_SBVCAnimation *)node)->url);
 		break;
-	case TAG_MPEG4_BitWrapper:			
-		compositor_init_afx_node(compositor, node, & ((M_BitWrapper *)node)->url); 
+	case TAG_MPEG4_BitWrapper:
+		compositor_init_afx_node(compositor, node, & ((M_BitWrapper *)node)->url);
 		break;
 
 #endif /*GPAC_DISABLE_VRML*/
 
 #ifndef GPAC_DISABLE_SVG
 	/* SVG Part */
-	case TAG_SVG_svg:				compositor_init_svg_svg(compositor, node); break;
-	case TAG_SVG_g:					compositor_init_svg_g(compositor, node); break;
-	case TAG_SVG_switch:			compositor_init_svg_switch(compositor, node); break;
-	case TAG_SVG_rect:				compositor_init_svg_rect(compositor, node); break;
-	case TAG_SVG_path:				compositor_init_svg_path(compositor, node); break;
-	case TAG_SVG_circle:			compositor_init_svg_circle(compositor, node); break;
-	case TAG_SVG_ellipse:			compositor_init_svg_ellipse(compositor, node); break;
-	case TAG_SVG_line:				compositor_init_svg_line(compositor, node); break;
-	case TAG_SVG_polyline:			compositor_init_svg_polyline(compositor, node); break;
-	case TAG_SVG_polygon:			compositor_init_svg_polygon(compositor, node); break;
-	case TAG_SVG_a:					compositor_init_svg_a(compositor, node); break;
-
-	case TAG_SVG_linearGradient:	compositor_init_svg_linearGradient(compositor, node); break;
-	case TAG_SVG_radialGradient:	compositor_init_svg_radialGradient(compositor, node); break;
-	case TAG_SVG_solidColor:		compositor_init_svg_solidColor(compositor, node); break;
-	case TAG_SVG_stop:				compositor_init_svg_stop(compositor, node); break;
-
-	case TAG_SVG_text:				compositor_init_svg_text(compositor, node); break;
-	case TAG_SVG_tspan:				compositor_init_svg_tspan(compositor, node); break;
-	case TAG_SVG_textArea:			compositor_init_svg_textarea(compositor, node); break;
-	case TAG_SVG_tbreak:			compositor_init_svg_tbreak(compositor, node); break;
-		
-	case TAG_SVG_image:				compositor_init_svg_image(compositor, node); break;
-	case TAG_SVG_video:				compositor_init_svg_video(compositor, node); break;
-	case TAG_SVG_audio:				compositor_init_svg_audio(compositor, node, 0); break;
+	case TAG_SVG_svg:
+		compositor_init_svg_svg(compositor, node);
+		break;
+	case TAG_SVG_g:
+		compositor_init_svg_g(compositor, node);
+		break;
+	case TAG_SVG_switch:
+		compositor_init_svg_switch(compositor, node);
+		break;
+	case TAG_SVG_rect:
+		compositor_init_svg_rect(compositor, node);
+		break;
+	case TAG_SVG_path:
+		compositor_init_svg_path(compositor, node);
+		break;
+	case TAG_SVG_circle:
+		compositor_init_svg_circle(compositor, node);
+		break;
+	case TAG_SVG_ellipse:
+		compositor_init_svg_ellipse(compositor, node);
+		break;
+	case TAG_SVG_line:
+		compositor_init_svg_line(compositor, node);
+		break;
+	case TAG_SVG_polyline:
+		compositor_init_svg_polyline(compositor, node);
+		break;
+	case TAG_SVG_polygon:
+		compositor_init_svg_polygon(compositor, node);
+		break;
+	case TAG_SVG_a:
+		compositor_init_svg_a(compositor, node);
+		break;
+
+	case TAG_SVG_linearGradient:
+		compositor_init_svg_linearGradient(compositor, node);
+		break;
+	case TAG_SVG_radialGradient:
+		compositor_init_svg_radialGradient(compositor, node);
+		break;
+	case TAG_SVG_solidColor:
+		compositor_init_svg_solidColor(compositor, node);
+		break;
+	case TAG_SVG_stop:
+		compositor_init_svg_stop(compositor, node);
+		break;
+
+	case TAG_SVG_text:
+		compositor_init_svg_text(compositor, node);
+		break;
+	case TAG_SVG_tspan:
+		compositor_init_svg_tspan(compositor, node);
+		break;
+	case TAG_SVG_textArea:
+		compositor_init_svg_textarea(compositor, node);
+		break;
+	case TAG_SVG_tbreak:
+		compositor_init_svg_tbreak(compositor, node);
+		break;
+
+	case TAG_SVG_image:
+		compositor_init_svg_image(compositor, node);
+		break;
+	case TAG_SVG_video:
+		compositor_init_svg_video(compositor, node);
+		break;
+	case TAG_SVG_audio:
+		compositor_init_svg_audio(compositor, node, 0);
+		break;
 
 	/*SVG font support - note that we initialize the font when parsing the font-face element, not the font element*/
-	case TAG_SVG_font_face:			compositor_init_svg_font(compositor, node); break;
+	case TAG_SVG_font_face:
+		compositor_init_svg_font(compositor, node);
+		break;
 	case TAG_SVG_missing_glyph:
 	case TAG_SVG_glyph:
-		compositor_init_svg_glyph(compositor, node); 
+		compositor_init_svg_glyph(compositor, node);
 		break;
 	case TAG_SVG_font_face_uri:
-		compositor_init_svg_font_face_uri(compositor, node); break;
+		compositor_init_svg_font_face_uri(compositor, node);
+		break;
 
-	case TAG_SVG_use:				compositor_init_svg_use(compositor, node); break;
-	case TAG_SVG_animation:			compositor_init_svg_animation(compositor, node); break;
-	case TAG_SVG_foreignObject:		compositor_init_svg_foreign_object(compositor, node); break;
+	case TAG_SVG_use:
+		compositor_init_svg_use(compositor, node);
+		break;
+	case TAG_SVG_animation:
+		compositor_init_svg_animation(compositor, node);
+		break;
+	case TAG_SVG_foreignObject:
+		compositor_init_svg_foreign_object(compositor, node);
+		break;
 
-	case TAG_SVG_filter:			compositor_init_svg_filter(compositor, node); break;
+	case TAG_SVG_filter:
+		compositor_init_svg_filter(compositor, node);
+		break;
 
-	case TAG_LSR_updates:			compositor_init_svg_updates(compositor, node); break;
+	case TAG_LSR_updates:
+		compositor_init_svg_updates(compositor, node);
+		break;
 #endif
 
 	default:
@@ -422,47 +582,66 @@
 	}
 	switch (gf_node_get_tag(byObj)) {
 #ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_AnimationStream: compositor_animationstream_modified(byObj); break;
-	case TAG_MPEG4_AudioBuffer: compositor_audiobuffer_modified(byObj); break;
-	case TAG_MPEG4_AudioSource: compositor_audiosource_modified(byObj); break;
-	case TAG_MPEG4_AudioClip: 
+	case TAG_MPEG4_AnimationStream:
+		compositor_animationstream_modified(byObj);
+		break;
+	case TAG_MPEG4_AudioBuffer:
+		compositor_audiobuffer_modified(byObj);
+		break;
+	case TAG_MPEG4_AudioSource:
+		compositor_audiosource_modified(byObj);
+		break;
+	case TAG_MPEG4_AudioClip:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_AudioClip: 
+	case TAG_X3D_AudioClip:
 #endif
-		compositor_audioclip_modified(byObj); break;
-	case TAG_MPEG4_TimeSensor: 
+		compositor_audioclip_modified(byObj);
+		break;
+	case TAG_MPEG4_TimeSensor:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_TimeSensor: 
+	case TAG_X3D_TimeSensor:
 #endif
-		compositor_timesensor_modified(byObj); break;
-	case TAG_MPEG4_ImageTexture: 
+		compositor_timesensor_modified(byObj);
+		break;
+	case TAG_MPEG4_ImageTexture:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_ImageTexture: 
+	case TAG_X3D_ImageTexture:
 #endif
-	case TAG_MPEG4_CacheTexture: 
-		compositor_imagetexture_modified(byObj); break;
+	case TAG_MPEG4_CacheTexture:
+		compositor_imagetexture_modified(byObj);
+		break;
 
-	case TAG_MPEG4_MovieTexture: 
+	case TAG_MPEG4_MovieTexture:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_MovieTexture: 
+	case TAG_X3D_MovieTexture:
 #endif
-		compositor_movietexture_modified(byObj); break;
+		compositor_movietexture_modified(byObj);
+		break;
 
-	case TAG_MPEG4_Background2D: compositor_background2d_modified(byObj); break;
+	case TAG_MPEG4_Background2D:
+		compositor_background2d_modified(byObj);
+		break;
 #ifndef GPAC_DISABLE_3D
 	case TAG_MPEG4_Background:
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Background:
 #endif
-		compositor_background_modified(byObj); break;
+		compositor_background_modified(byObj);
+		break;
 #endif
-	case TAG_MPEG4_Layout: compositor_layout_modified(compositor, byObj); break;
-	case TAG_MPEG4_EnvironmentTest: compositor_envtest_modified(byObj); break;
+	case TAG_MPEG4_Layout:
+		compositor_layout_modified(compositor, byObj);
+		break;
+	case TAG_MPEG4_EnvironmentTest:
+		compositor_envtest_modified(byObj);
+		break;
 
 #endif /*GPAC_DISABLE_VRML*/
 
 #ifndef GPAC_DISABLE_SVG
-	case TAG_SVG_video: compositor_svg_video_modified(compositor, byObj); break;
+	case TAG_SVG_video:
+		compositor_svg_video_modified(compositor, byObj);
+		break;
 #endif /*GPAC_DISABLE_SVG*/
 
 	default:

gpac-0.5.0.svn5178.tar.bz2/src/compositor/drawable.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/drawable.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -30,7 +30,7 @@
 
 
 /*default draw routine*/
-void drawable_draw(Drawable *drawable, GF_TraverseState *tr_state) 
+void drawable_draw(Drawable *drawable, GF_TraverseState *tr_state)
 {
 	visual_2d_texture_path(tr_state->visual, tr_state->ctx->drawable->path, tr_state->ctx, tr_state);
 	visual_2d_draw_path(tr_state->visual, tr_state->ctx->drawable->path, tr_state->ctx, NULL, NULL, tr_state);
@@ -45,13 +45,14 @@
 	StrikeInfo2D *si;
 	Fixed x, y;
 	u32 i, count;
+	GF_Node *appear = tr_state->override_appearance ? tr_state->override_appearance : tr_state->appear;
 	GF_Compositor *compositor = tr_state->visual->compositor;
 
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d) {
 		visual_3d_vrml_drawable_pick(drawable->node, tr_state, NULL, drawable);
 		return;
-	} 
+	}
 #endif
 	gf_mx2d_copy(inv_2d, tr_state->transform);
 	gf_mx2d_inverse(&inv_2d);
@@ -64,16 +65,16 @@
 
 	/*MPEG-4 picking is always on regardless of color properties*/
 	if (/*tr_state->ctx->aspect.fill_texture */
-		/* (tr_state->pick_type<PICK_FULL) */
-		/* GF_COL_A(asp.fill_color)*/
-		1) {
+	    /* (tr_state->pick_type<PICK_FULL) */
+	    /* GF_COL_A(asp.fill_color)*/
+	    1) {
 		if (gf_path_point_over(drawable->path, x, y)) {
 			goto picked;
 		}
 	}
 
 	if (asp.pen_props.width || asp.line_texture ) {
-		si = drawable_get_strikeinfo(tr_state->visual->compositor, drawable, &asp, tr_state->appear, NULL, 0, NULL);
+		si = drawable_get_strikeinfo(tr_state->visual->compositor, drawable, &asp, appear, NULL, 0, NULL);
 		if (si && si->outline && gf_path_point_over(si->outline, x, y)) {
 			goto picked;
 		}
@@ -91,14 +92,15 @@
 	gf_list_reset(compositor->hit_use_stack);
 	compositor->hit_node = drawable->node;
 	compositor->hit_use_dom_events = 0;
-	compositor->hit_normal.x = compositor->hit_normal.y = 0; compositor->hit_normal.z = FIX_ONE;
+	compositor->hit_normal.x = compositor->hit_normal.y = 0;
+	compositor->hit_normal.z = FIX_ONE;
 	compositor->hit_texcoords.x = gf_divfix(x - drawable->path->bbox.x, drawable->path->bbox.width);
 	compositor->hit_texcoords.y = FIX_ONE - gf_divfix(drawable->path->bbox.y - y, drawable->path->bbox.height);
 
 #ifndef GPAC_DISABLE_VRML
-	if (compositor_is_composite_texture(tr_state->appear)) {
-		compositor->hit_appear = tr_state->appear;
-	} else 
+	if (compositor_is_composite_texture(appear)) {
+		compositor->hit_appear = appear;
+	} else
 #endif
 	{
 		compositor->hit_appear = NULL;
@@ -160,7 +162,7 @@
 	dri = dr->dri;
 	while (dri) {
 		is_reg = compositor ? gf_sc_visual_is_registered(compositor, dri->visual) : 0;
-	
+
 		bi = dri->current_bounds;
 		while (bi) {
 			_cur = bi;
@@ -188,7 +190,7 @@
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 
 		/*check node isn't being tracked*/
-		if (compositor->grab_node==dr->node) 
+		if (compositor->grab_node==dr->node)
 			compositor->grab_node = NULL;
 
 		if (compositor->focus_node==dr->node) {
@@ -259,7 +261,7 @@
 		else ctx->drawable->dri = dri;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Allocating new bound info storage on visual %08x for drawable %s\n", visual, gf_node_get_class_name(ctx->drawable->node)));
 	}
-	
+
 	/*get available bound info slot*/
 	_prev = NULL;
 	bi = dri->current_bounds;
@@ -348,7 +350,7 @@
 
 	drawable->flags &= ~DRAWABLE_DRAWN_ON_VISUAL;
 	return was_drawn;
-}	
+}
 
 /*
 	return 1 if same bound is found in previous list (and remove it from the list)
@@ -359,7 +361,7 @@
 {
 	DRInfo *dri;
 	BoundInfo *bi;
-	
+
 	dri = ctx->drawable->dri;
 	while (dri) {
 		if (dri->visual == visual) break;
@@ -370,16 +372,16 @@
 	bi = dri->previous_bounds;
 	while (bi) {
 		if (
-			/*if 0, end of bounds used in the previous pass*/
-			bi->clip.width
-			/*we need the same Appearance || parent <use>*/
-			&& (bi->extra_check == ctx->appear) 
-			/*we need exact same cliper*/
-			&& (bi->clip.x==ctx->bi->clip.x) && (bi->clip.y==ctx->bi->clip.y)
-			&& (bi->clip.width==ctx->bi->clip.width) && (bi->clip.height==ctx->bi->clip.height)
-			/*only check x and y (if w or h have changed, object has changed -> bounds info has been reset*/
-			&& (bi->unclip.x==ctx->bi->unclip.x) && (bi->unclip.y==ctx->bi->unclip.y)
-			) {
+		    /*if 0, end of bounds used in the previous pass*/
+		    bi->clip.width
+		    /*we need the same Appearance || parent <use>*/
+		    && (bi->extra_check == ctx->appear)
+		    /*we need exact same cliper*/
+		    && (bi->clip.x==ctx->bi->clip.x) && (bi->clip.y==ctx->bi->clip.y)
+		    && (bi->clip.width==ctx->bi->clip.width) && (bi->clip.height==ctx->bi->clip.height)
+		    /*only check x and y (if w or h have changed, object has changed -> bounds info has been reset*/
+		    && (bi->unclip.x==ctx->bi->unclip.x) && (bi->unclip.y==ctx->bi->unclip.y)
+		) {
 			/*remove*/
 			bi->clip.width = 0;
 			return 1;
@@ -466,7 +468,7 @@
 		dri = dri->next;
 	}
 	if (drawn) {
-		ctx->drawable->flags |= DRAWABLE_DRAWN_ON_VISUAL; 
+		ctx->drawable->flags |= DRAWABLE_DRAWN_ON_VISUAL;
 		/*node has been modified, do not check bounds, just assumed it moved*/
 		if (ctx->drawable->flags & DRAWABLE_HAS_CHANGED) {
 			moved = 1;
@@ -475,7 +477,7 @@
 			moved = !drawable_has_same_bounds(ctx, visual);
 		}
 
-		if (need_redraw || moved) 
+		if (need_redraw || moved)
 			ctx->flags |= CTX_REDRAW_MASK;
 	}
 
@@ -505,6 +507,7 @@
 	M_Material2D *m = NULL;
 	M_LineProperties *LP;
 	M_XLineProperties *XLP;
+	GF_Node *appear = tr_state->override_appearance ? tr_state->override_appearance : tr_state->appear;
 	u32 ret = 0;
 
 	asp->pen_props.cap = GF_LINE_CAP_FLAT;
@@ -514,14 +517,14 @@
 	asp->line_color = 0xFFCCCCCC;
 	asp->pen_props.width = 0;
 
-	if (tr_state->appear == NULL) goto check_default;
+	if (appear == NULL) goto check_default;
 
-	if ( ((M_Appearance *) tr_state->appear)->texture ) {
-		asp->fill_texture = gf_sc_texture_get_handler( ((M_Appearance *) tr_state->appear)->texture );
+	if ( ((M_Appearance *) appear)->texture ) {
+		asp->fill_texture = gf_sc_texture_get_handler( ((M_Appearance *) appear)->texture );
 	}
 
 
-	m = (M_Material2D *) ((M_Appearance *)tr_state->appear)->material;
+	m = (M_Material2D *) ((M_Appearance *)appear)->material;
 	if ( m == NULL) {
 		asp->fill_color &= 0x00FFFFFF;
 		goto check_default;
@@ -533,20 +536,20 @@
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Material:
 #endif
-		{	
+	{
 		M_Material *mat = (M_Material *)m;
 		asp->pen_props.width = 0;
 		asp->fill_color = GF_COL_ARGB_FIXED(FIX_ONE, mat->diffuseColor.red, mat->diffuseColor.green, mat->diffuseColor.blue);
-		if (!tr_state->color_mat.identity) 
+		if (!tr_state->color_mat.identity)
 			asp->fill_color = gf_cmx_apply(&tr_state->color_mat, asp->fill_color);
 	}
-		return 0;
+	return 0;
 	default:
 		return 0;
 	}
 
 	asp->fill_color = GF_COL_ARGB_FIXED(FIX_ONE-m->transparency, m->emissiveColor.red, m->emissiveColor.green, m->emissiveColor.blue);
-	if (!tr_state->color_mat.identity) 
+	if (!tr_state->color_mat.identity)
 		asp->fill_color = gf_cmx_apply(&tr_state->color_mat, asp->fill_color);
 
 	asp->line_color = asp->fill_color;
@@ -590,7 +593,7 @@
 		asp->pen_props.width = 0;
 		return 0;
 	}
-	if (m->lineProps && drawable_lineprops_dirty(m->lineProps)) 
+	if (m->lineProps && drawable_lineprops_dirty(m->lineProps))
 		ret = CTX_APP_DIRTY;
 
 	if (LP) {
@@ -601,7 +604,7 @@
 			asp->line_color = gf_cmx_apply(&tr_state->color_mat, asp->line_color);
 		}
 		return ret;
-	} 
+	}
 
 	asp->pen_props.dash = (u8) XLP->lineStyle;
 	asp->line_color = GF_COL_ARGB_FIXED(FIX_ONE-XLP->transparency, XLP->lineColor.red, XLP->lineColor.green, XLP->lineColor.blue);
@@ -609,7 +612,7 @@
 	if (!tr_state->color_mat.identity) {
 		asp->line_color = gf_cmx_apply(&tr_state->color_mat, asp->line_color);
 	}
-	
+
 	asp->line_scale = XLP->isScalable ? FIX_ONE : 0;
 	asp->pen_props.align = XLP->isCenterAligned ? GF_PATH_LINE_CENTER : GF_PATH_LINE_INSIDE;
 	asp->pen_props.cap = (u8) XLP->lineCap;
@@ -642,12 +645,74 @@
 }
 
 
+static void check_texture_dirty(DrawableContext *ctx, Drawable *drawable, GF_TraverseState *tr_state)
+{
+#ifndef GPAC_DISABLE_3D
+	Bool texture_ready=0;
+#endif
+
+	/*Update texture info - draw even if texture not created (this may happen if the media is removed)*/
+	if (ctx->aspect.fill_texture) {
+		if (ctx->aspect.fill_texture->needs_refresh) {
+			ctx->flags |= CTX_TEXTURE_DIRTY;
+		}
+#ifndef GPAC_DISABLE_3D
+		//in autoGL mode, a texture is dirty only if transparent. If not, the area covered over the video doesn't need to be repainted if unchanged
+		//disable for color matrix as we don't yet handle them in GL
+		if (tr_state->visual->compositor->hybrid_opengl && !tr_state->visual->offscreen) {
+			u8 alpha = GF_COL_A(ctx->aspect.fill_color);
+			if (!alpha) alpha = GF_COL_A(ctx->aspect.line_color);
+
+			if (!ctx->aspect.fill_texture->transparent && (alpha==0xFF) && !ctx->aspect.fill_texture->compute_gradient_matrix && (drawable->flags & DRAWABLE_HYBGL_INIT)) {
+				ctx->flags |= CTX_HYBOGL_NO_CLEAR;
+			}
+			//otherwise, we need to redraw all object below, wether they changed ot not, because we have erased this part of the canvas
+			else {
+				ctx->flags |= CTX_TEXTURE_DIRTY;
+			}
+			//wait untill we have something to draw to decide that the texture is ready, otherwise we will not clear the canvas when texture is ready
+			if (ctx->aspect.fill_texture->compute_gradient_matrix || ctx->aspect.fill_texture->data)
+				texture_ready=1;
+		}
+#endif
+	}
+	//same as above
+	if (ctx->aspect.line_texture) {
+		if (ctx->aspect.line_texture->needs_refresh)
+			ctx->flags |= CTX_TEXTURE_DIRTY;
+
+#ifndef GPAC_DISABLE_3D
+		//in autoGL mode, a texture is dirty only if transparent. If not, the area covered over the video doesn't need to be repainted if unchanged
+		//disable for color matrix as we don't yet handle them in GL
+		if (tr_state->visual->compositor->hybrid_opengl && !tr_state->visual->offscreen) {
+			u8 alpha = GF_COL_A(ctx->aspect.line_color);
+			if (!ctx->aspect.line_texture->transparent && (alpha==0xFF) && !ctx->aspect.line_texture->compute_gradient_matrix && (drawable->flags & DRAWABLE_HYBGL_INIT))
+				ctx->flags |= CTX_HYBOGL_NO_CLEAR;
+			//otherwise, we need to redraw all object below, wether they changed ot not, bacause we have erased this part of the canvas
+			else
+				ctx->flags |= CTX_TEXTURE_DIRTY;
+
+			//wait untill we have something to draw to decide that the texture is ready, otherwise we will not clear the canvas when texture is ready
+			if (ctx->aspect.line_texture->compute_gradient_matrix || ctx->aspect.line_texture->data)
+				texture_ready=1;
+		}
+#endif
+	}
+
+#ifndef GPAC_DISABLE_3D
+	//from now on, we won't clear the canvas when updating this texture (unless transparent, cf above)
+	if (texture_ready)
+		drawable->flags |= DRAWABLE_HYBGL_INIT;
+#endif
+}
+
 #ifndef GPAC_DISABLE_VRML
 
 DrawableContext *drawable_init_context_mpeg4(Drawable *drawable, GF_TraverseState *tr_state)
 {
 	DrawableContext *ctx;
 	Bool skipFill;
+	GF_Node *appear;
 	assert(tr_state->visual);
 
 	/*switched-off geometry nodes are not drawn*/
@@ -662,14 +727,16 @@
 
 	ctx->drawable = drawable;
 
+	appear = tr_state->override_appearance ? tr_state->override_appearance : tr_state->appear;
+
 	/*usually set by colorTransform or changes in OrderedGroup*/
-	if (tr_state->invalidate_all) 
+	if (tr_state->invalidate_all)
 		ctx->flags |= CTX_APP_DIRTY;
 
 	ctx->aspect.fill_texture = NULL;
-	if (tr_state->appear) {
-		ctx->appear = tr_state->appear;
-		if (gf_node_dirty_get(tr_state->appear)) 
+	if (appear) {
+		ctx->appear = appear;
+		if (gf_node_dirty_get(appear))
 			ctx->flags |= CTX_APP_DIRTY;
 	}
 	/*todo cliper*/
@@ -685,56 +752,19 @@
 	ctx->aspect.fill_texture = NULL;
 	switch (gf_node_get_tag(ctx->drawable->node) ) {
 #ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_IndexedLineSet2D: 
+	case TAG_MPEG4_IndexedLineSet2D:
 		skipFill = 1;
 		break;
 #endif
 	default:
 		break;
 	}
-	
-	ctx->flags |= drawable_get_aspect_2d_mpeg4(drawable->node, &ctx->aspect, tr_state);
 
-	/*Update texture info - draw even if texture not created (this may happen if the media is removed)*/
-	if (ctx->aspect.fill_texture) {
-		if (ctx->aspect.fill_texture->needs_refresh) {
-			ctx->flags |= CTX_TEXTURE_DIRTY;
-		}
-#ifndef GPAC_DISABLE_3D
-		//in autoGL mode, a texture is dirty only if transparent. If not, the area covered over the video doesn't need to be repainted if unchanged 
-		//disable for color matrix as we don't yet handle them in GL
-		if (tr_state->visual->compositor->hybrid_opengl && !tr_state->visual->offscreen) {
-			u8 alpha = GF_COL_A(ctx->aspect.fill_color);
-			if (!alpha) alpha = GF_COL_A(ctx->aspect.line_color);
+	ctx->flags |= drawable_get_aspect_2d_mpeg4(drawable->node, &ctx->aspect, tr_state);
 
-			if (!ctx->aspect.fill_texture->transparent && (alpha==0xFF) && !ctx->aspect.fill_texture->compute_gradient_matrix)
-				ctx->flags |= CTX_HYBOGL_NO_CLEAR;
-			//if texture is transparent, we need to redraw all object below, wether they changed ot not, bacause we have erased this part of the canvas
-			else
-				ctx->flags |= CTX_TEXTURE_DIRTY;
-		}
-#endif
-	}
-	//same as above
-	if (ctx->aspect.line_texture) {
-		if (ctx->aspect.line_texture->needs_refresh) 
-			ctx->flags |= CTX_TEXTURE_DIRTY;
+	check_texture_dirty(ctx, drawable, tr_state);
 
-#ifndef GPAC_DISABLE_3D
-		//in autoGL mode, a texture is dirty only if transparent. If not, the area covered over the video doesn't need to be repainted if unchanged 
-		//disable for color matrix as we don't yet handle them in GL
-		if (tr_state->visual->compositor->hybrid_opengl && !tr_state->visual->offscreen) {
-			u8 alpha = GF_COL_A(ctx->aspect.line_color);
-			if (!ctx->aspect.line_texture->transparent && (alpha==0xFF) && !ctx->aspect.line_texture->compute_gradient_matrix)
-				ctx->flags |= CTX_HYBOGL_NO_CLEAR;
-			//if texture is transparent, we need to redraw all object below, wether they changed ot not, bacause we have erased this part of the canvas
-			else
-				ctx->flags |= CTX_TEXTURE_DIRTY;
-		}
-#endif
-	}
-
-	/*not clear in the spec: what happens when a transparent node is in form/layout ?? this may 
+	/*not clear in the spec: what happens when a transparent node is in form/layout ?? this may
 	completely break layout of children. We consider the node should be drawn*/
 	if (!tr_state->parent && check_transparent_skip(ctx, skipFill)) {
 		visual_2d_remove_last_context(tr_state->visual);
@@ -748,8 +778,8 @@
 		ctx->flags |= CTX_FLIPED_COORDS;
 
 #ifdef GF_SR_USE_DEPTH
-        ctx->depth_gain=tr_state->depth_gain;
-        ctx->depth_offset=tr_state->depth_offset;
+	ctx->depth_gain=tr_state->depth_gain;
+	ctx->depth_offset=tr_state->depth_offset;
 #endif
 
 	return ctx;
@@ -787,7 +817,7 @@
 		//GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Registering new drawn node %s on visual\n", gf_node_get_class_name(it->drawable->node)));
 		ctx->drawable->flags |= DRAWABLE_REGISTERED_WITH_VISUAL;
 	}
-	
+
 	/*we are in direct draw mode, draw ...*/
 	if (res) {
 		/*if over an overlay we cannot remove the context and cannot draw directly*/
@@ -804,7 +834,7 @@
 		} else {
 			drawable_draw(ctx->drawable, tr_state);
 		}
-		
+
 		tr_state->ctx = NULL;
 		tr_state->traversing_mode = TRAVERSE_SORT;
 	}
@@ -848,6 +878,7 @@
 #endif
 	Fixed pw;
 	GF_Rect unclip, store_orig_bounds;
+	GF_Node *appear = tr_state->override_appearance ? tr_state->override_appearance : tr_state->appear;
 
 
 	drawable_check_bounds(ctx, tr_state->visual);
@@ -857,7 +888,7 @@
 	} 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 );
+	//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);
 
@@ -865,7 +896,7 @@
 	if (ctx->aspect.pen_props.width) {
 		StrikeInfo2D *si = NULL;
 
-		if (!ctx->aspect.line_scale) 
+		if (!ctx->aspect.line_scale)
 			drawable_compute_line_scale(tr_state, &ctx->aspect);
 
 #if 0
@@ -879,7 +910,7 @@
 #endif
 
 		/*get strike info & outline for exact bounds compute. If failure use default offset*/
-		si = drawable_get_strikeinfo(tr_state->visual->compositor, ctx->drawable, &ctx->aspect, tr_state->appear, ctx->drawable->path, ctx->flags, NULL);
+		si = drawable_get_strikeinfo(tr_state->visual->compositor, ctx->drawable, &ctx->aspect, appear, ctx->drawable->path, ctx->flags, NULL);
 		if (si && si->outline) {
 			gf_path_get_bounds(si->outline, &ctx->bi->unclip);
 			gf_mx2d_apply_rect(&tr_state->transform, &ctx->bi->unclip);
@@ -917,7 +948,7 @@
 
 	/*remove if this is the last context*/
 #ifdef REMVE_UNUSED_CTX
-	if (can_remove && (tr_state->visual->cur_context == ctx)) 
+	if (can_remove && (tr_state->visual->cur_context == ctx))
 		tr_state->visual->cur_context->drawable = NULL;
 #endif
 }
@@ -938,13 +969,15 @@
 	GF_Matrix2D cur;
 	GF_Compositor *compositor = tr_state->visual->compositor;
 
+	if (compositor->disable_focus_highlight) return;
+
 	if (compositor->focus_node!=node) return;
 	/*if key navigator, don't draw a focus highlight*/
 	if (compositor->keynav_node) return;
 
 	if (compositor->focus_used) {
 		u32 count = gf_list_count(tr_state->use_stack);
-		if (!count || (gf_list_get(tr_state->use_stack, count-1)!=compositor->focus_used) ) 
+		if (!count || (gf_list_get(tr_state->use_stack, count-1)!=compositor->focus_used) )
 			return;
 	}
 
@@ -964,7 +997,7 @@
 			tr_state->bounds.x = tr_state->bounds.y = 0;
 
 			gf_sc_get_nodes_bounds(node, ((GF_ParentNode *)node)->children, tr_state, NULL);
-			
+
 			tr_state->traversing_mode = prev_mode;
 			gf_mx2d_copy(tr_state->transform, cur);
 			bounds = &tr_state->bounds;
@@ -1006,7 +1039,7 @@
 }
 
 
-void drawable_traverse_focus(GF_Node *node, void *rs, Bool is_destroy) 
+void drawable_traverse_focus(GF_Node *node, void *rs, Bool is_destroy)
 {
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 	if (is_destroy) return;
@@ -1081,7 +1114,7 @@
 #ifndef GPAC_DISABLE_3D
 	if (tr_state && !asp->line_scale) {
 		drawable_compute_line_scale(tr_state, asp);
-	} 
+	}
 #endif
 
 	/*picking*/
@@ -1108,9 +1141,9 @@
 #endif
 		/*apply scale whether scalable or not (if not scalable, scale is still needed for scalable zoom)*/
 		asp->pen_props.width = gf_mulfix(asp->pen_props.width, asp->line_scale);
-		if (asp->pen_props.dash != GF_DASH_STYLE_SVG) 
+		if (asp->pen_props.dash != GF_DASH_STYLE_SVG)
 			asp->pen_props.dash_offset = gf_mulfix(asp->pen_props.dash_offset, asp->pen_props.width);
-		
+
 		if (asp->pen_props.dash_set) {
 			for(i=0; i<asp->pen_props.dash_set->num_dash; i++) {
 				asp->pen_props.dash_set->dashes[i] = gf_mulfix(asp->pen_props.dash_set->dashes[i], asp->line_scale);
@@ -1176,8 +1209,8 @@
 	StrikeInfo2D *si, *cur, *prev;
 	u32 i;
 	LinePropStack *st;
-	if (!is_destroy) return; 
-		
+	if (!is_destroy) return;
+
 	st = (LinePropStack *)gf_node_get_private(n);
 	i = 0;
 
@@ -1204,9 +1237,9 @@
 			delete_strikeinfo2d(si);
 		}
 	}
-	
+
 	gf_free(st);
-	
+
 }
 
 void compositor_init_lineprops(GF_Compositor *compositor, GF_Node *node)
@@ -1238,10 +1271,10 @@
 	Fixed clamped_opacity = FIX_ONE;
 	Fixed clamped_solid_opacity = FIX_ONE;
 	Fixed clamped_fill_opacity = (props->fill_opacity->value < 0 ? 0 : (props->fill_opacity->value > FIX_ONE ? FIX_ONE : props->fill_opacity->value));
-	Fixed clamped_stroke_opacity = (props->stroke_opacity->value < 0 ? 0 : (props->stroke_opacity->value > FIX_ONE ? FIX_ONE : props->stroke_opacity->value));	
+	Fixed clamped_stroke_opacity = (props->stroke_opacity->value < 0 ? 0 : (props->stroke_opacity->value > FIX_ONE ? FIX_ONE : props->stroke_opacity->value));
 
 	if (props->opacity) {
-		clamped_opacity = (props->opacity->value < 0 ? 0 : (props->opacity->value > FIX_ONE ? FIX_ONE : props->opacity->value));	
+		clamped_opacity = (props->opacity->value < 0 ? 0 : (props->opacity->value > FIX_ONE ? FIX_ONE : props->opacity->value));
 		if (clamped_opacity!=FIX_ONE) {
 			clamped_fill_opacity = gf_mulfix(clamped_fill_opacity, clamped_opacity);
 			clamped_stroke_opacity = gf_mulfix(clamped_stroke_opacity, clamped_opacity);
@@ -1262,7 +1295,7 @@
 				gf_free(iri->string);
 				iri->string = NULL;
 			}
-		}		
+		}
 		/* If paint server not found, paint is equivalent to none */
 		if (props->fill->iri.type == XMLRI_ELEMENTID) {
 			asp->fill_color = GF_COL_ARGB_FIXED(clamped_opacity, 0, 0, 0);
@@ -1273,7 +1306,7 @@
 				gf_svg_flatten_attributes((SVG_Element*)props->fill->iri.target, &all_atts);
 
 				gf_node_traverse(props->fill->iri.target, tr_state);
-			
+
 				ret += compositor_svg_solid_color_dirty(tr_state->visual->compositor, props->fill->iri.target);
 
 				if (all_atts.solid_color) {
@@ -1285,13 +1318,13 @@
 					asp->fill_color = GF_COL_ARGB_FIXED(clamped_solid_opacity, all_atts.solid_color->color.red, all_atts.solid_color->color.green, all_atts.solid_color->color.blue);
 				}
 			}
-				break;
-			case TAG_SVG_linearGradient: 
-			case TAG_SVG_radialGradient: 
+			break;
+			case TAG_SVG_linearGradient:
+			case TAG_SVG_radialGradient:
 				asp->fill_texture = gf_sc_texture_get_handler((GF_Node *)props->fill->iri.target);
 				break;
 			/*FIXME*/
-			default: 
+			default:
 				break;
 			}
 		}
@@ -1305,7 +1338,7 @@
 			asp->fill_color |= ((u32) (clamped_fill_opacity*255) ) << 24;
 		}
 	}
-	if (!tr_state->color_mat.identity) 
+	if (!tr_state->color_mat.identity)
 		asp->fill_color = gf_cmx_apply(&tr_state->color_mat, asp->fill_color);
 
 	asp->line_color = 0;
@@ -1323,7 +1356,7 @@
 				gf_free(iri->string);
 				iri->string = NULL;
 			}
-		}		
+		}
 		/* Paint server not found, stroke is equivalent to none */
 		if (props->stroke->iri.type == XMLRI_ELEMENTID) {
 			switch (gf_node_get_tag((GF_Node *)props->stroke->iri.target)) {
@@ -1344,17 +1377,17 @@
 					asp->line_color = GF_COL_ARGB_FIXED(clamped_solid_opacity, all_atts.solid_color->color.red, all_atts.solid_color->color.green, all_atts.solid_color->color.blue);
 				}
 			}
-				break;
-			case TAG_SVG_linearGradient: 
-			case TAG_SVG_radialGradient: 
+			break;
+			case TAG_SVG_linearGradient:
+			case TAG_SVG_radialGradient:
 				asp->line_texture = gf_sc_texture_get_handler((GF_Node *)props->stroke->iri.target);
 				break;
-			default: 
+			default:
 				break;
 			}
 		}
 	} else if (props->stroke->type == SVG_PAINT_COLOR) {
-	if (props->stroke->color.type == SVG_COLOR_CURRENTCOLOR) {
+		if (props->stroke->color.type == SVG_COLOR_CURRENTCOLOR) {
 			asp->line_color = GF_COL_ARGB_FIXED(clamped_stroke_opacity, props->color->color.red, props->color->color.green, props->color->color.blue);
 		} else if (props->stroke->color.type == SVG_COLOR_RGBCOLOR) {
 			asp->line_color = GF_COL_ARGB_FIXED(clamped_stroke_opacity, props->stroke->color.red, props->stroke->color.green, props->stroke->color.blue);
@@ -1363,7 +1396,7 @@
 			asp->line_color |= ((u32) (clamped_stroke_opacity*255)) << 24;
 		}
 	}
-	if (!tr_state->color_mat.identity) 
+	if (!tr_state->color_mat.identity)
 		asp->line_color = gf_cmx_apply(&tr_state->color_mat, asp->line_color);
 
 	if (props->stroke_dasharray->type != SVG_STROKEDASHARRAY_NONE) {
@@ -1372,7 +1405,7 @@
 		asp->pen_props.dash_set = (GF_DashSettings *) &(props->stroke_dasharray->array);
 	}
 	asp->line_scale = (props->vector_effect && (*props->vector_effect == SVG_VECTOREFFECT_NONSCALINGSTROKE)) ? 0 : FIX_ONE;
-	
+
 	asp->pen_props.cap = (u8) *props->stroke_linecap;
 	asp->pen_props.join = (u8) *props->stroke_linejoin;
 	asp->pen_props.miterLimit = props->stroke_miterlimit->value;
@@ -1406,14 +1439,14 @@
 	/* gradients stops and solidcolor do not affect appearance directly */
 	return 0;
 #else
-	if (flags & 
-		(GF_SG_SVG_FILL_DIRTY | GF_SG_SVG_FILLOPACITY_DIRTY | GF_SG_SVG_FILLRULE_DIRTY
-		| GF_SG_SVG_STROKE_DIRTY | GF_SG_SVG_STROKEDASHARRAY_DIRTY
-		| GF_SG_SVG_STROKEDASHOFFSET_DIRTY | GF_SG_SVG_STROKELINECAP_DIRTY
-		| GF_SG_SVG_STROKELINEJOIN_DIRTY | GF_SG_SVG_STROKEMITERLIMIT_DIRTY
-		| GF_SG_SVG_STROKEOPACITY_DIRTY | GF_SG_SVG_STROKEWIDTH_DIRTY
-		| GF_SG_SVG_VECTOREFFECT_DIRTY) )
-			return 1;
+	if (flags &
+	        (GF_SG_SVG_FILL_DIRTY | GF_SG_SVG_FILLOPACITY_DIRTY | GF_SG_SVG_FILLRULE_DIRTY
+	         | GF_SG_SVG_STROKE_DIRTY | GF_SG_SVG_STROKEDASHARRAY_DIRTY
+	         | GF_SG_SVG_STROKEDASHOFFSET_DIRTY | GF_SG_SVG_STROKELINECAP_DIRTY
+	         | GF_SG_SVG_STROKELINEJOIN_DIRTY | GF_SG_SVG_STROKEMITERLIMIT_DIRTY
+	         | GF_SG_SVG_STROKEOPACITY_DIRTY | GF_SG_SVG_STROKEWIDTH_DIRTY
+	         | GF_SG_SVG_VECTOREFFECT_DIRTY) )
+		return 1;
 	return 0;
 #endif
 }
@@ -1423,6 +1456,11 @@
 	DrawableContext *ctx;
 	assert(tr_state->visual);
 
+	/*setup SVG based on override appearance node */
+	if (tr_state->override_appearance) {
+		return drawable_init_context_mpeg4(drawable, tr_state);
+	}
+
 	/*switched-off geometry nodes are not drawn*/
 	if (tr_state->switched_off) return NULL;
 
@@ -1438,14 +1476,14 @@
 		ctx->flags |= CTX_APP_DIRTY;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("Node %s dirty - invalidating\n", gf_node_get_log_name(drawable->node) ));
 	}
-	if (tr_state->svg_flags & (GF_SG_SVG_STROKEDASHARRAY_DIRTY | 
-				  GF_SG_SVG_STROKEDASHOFFSET_DIRTY |
-				  GF_SG_SVG_STROKELINECAP_DIRTY | 
-				  GF_SG_SVG_STROKELINEJOIN_DIRTY |
-				  GF_SG_SVG_STROKEMITERLIMIT_DIRTY | 
-				  GF_SG_SVG_STROKEWIDTH_DIRTY |
-				  GF_SG_SVG_VECTOREFFECT_DIRTY )) 
-						  ctx->flags |= CTX_SVG_OUTLINE_GEOMETRY_DIRTY;
+	if (tr_state->svg_flags & (GF_SG_SVG_STROKEDASHARRAY_DIRTY |
+	                           GF_SG_SVG_STROKEDASHOFFSET_DIRTY |
+	                           GF_SG_SVG_STROKELINECAP_DIRTY |
+	                           GF_SG_SVG_STROKELINEJOIN_DIRTY |
+	                           GF_SG_SVG_STROKEMITERLIMIT_DIRTY |
+	                           GF_SG_SVG_STROKEWIDTH_DIRTY |
+	                           GF_SG_SVG_VECTOREFFECT_DIRTY ))
+		ctx->flags |= CTX_SVG_OUTLINE_GEOMETRY_DIRTY;
 
 	ctx->aspect.fill_texture = NULL;
 
@@ -1454,7 +1492,7 @@
 		GF_SAFEALLOC(ctx->col_mat, GF_ColorMatrix);
 		gf_cmx_copy(ctx->col_mat, &tr_state->color_mat);
 	}
-	
+
 	switch (gf_node_get_tag(ctx->drawable->node) ) {
 	case TAG_SVG_image:
 	case TAG_SVG_video:
@@ -1478,9 +1516,7 @@
 		}
 	}
 
-	/*Update texture info - draw even if texture not created (this may happen if the media is removed)*/
-	if (ctx->aspect.fill_texture && ctx->aspect.fill_texture->needs_refresh)
-		ctx->flags |= CTX_TEXTURE_DIRTY;
+	check_texture_dirty(ctx, drawable, tr_state);
 
 	/*we are drawing on a centered coord surface, remember to flip the texture*/
 	if (tr_state->fliped_coords)
@@ -1488,8 +1524,8 @@
 
 
 #ifdef GF_SR_USE_DEPTH
-    ctx->depth_gain=tr_state->depth_gain;
-    ctx->depth_offset=tr_state->depth_offset;
+	ctx->depth_gain=tr_state->depth_gain;
+	ctx->depth_offset=tr_state->depth_offset;
 #endif
 
 	return ctx;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/drawable.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/drawable.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -39,7 +39,7 @@
 	GF_IRect clip;
 	/*uncliped bounds - needed to track moving objects fully contained in visual and for image bliting*/
 	GF_Rect unclip;
-	/* extra_check: 
+	/* extra_check:
 		for MPEG-4: pointer to appearance node (due to DEF/USE) in order to detect same bounds and appearance node change
 		for SVG: currently not used, should be needed for <use>
 	*/
@@ -65,14 +65,14 @@
 enum {
 	/*user defined flags*/
 
-	/*if flag set, the node callback function will be used to draw the node. Otherwise, 
+	/*if flag set, the node callback function will be used to draw the node. Otherwise,
 	high-level draw operations on the drawable & drawable context will be used*/
 	DRAWABLE_USE_TRAVERSE_DRAW = 1,
 
 	/*bounds tracker flags, INTERNAL TO RENDERER */
 
 	/*flag set by drawable_mark_modified during a TRAVERSE_SORT pass when geometry's node has been modified. This forces clearing of the node
-	and skips bounds checking. 
+	and skips bounds checking.
 	Flag is cleared by the compositor*/
 	DRAWABLE_HAS_CHANGED = 1<<1,
 	/*same flag as above except set when picking/getting bounds out of the main scene traversal routine (user event, script)*/
@@ -87,8 +87,11 @@
 	/*drawable is an overlay surface*/
 	DRAWABLE_IS_OVERLAY = 1<<5,
 
-	/**/
+	/*drawable has a cache texture*/
 	DRAWABLE_IS_CACHED = 1<<6,
+
+	/*drawable has been initialized for hybrid GL mode - used to perform the initial clear of the overlay graphics*/
+	DRAWABLE_HYBGL_INIT = 1<<7,
 };
 
 struct _drawable
@@ -146,7 +149,7 @@
 /*checks if the current object is the focused one, and insert the focus drawable at the current pos*/
 void drawable_check_focus_highlight(GF_Node *node, GF_TraverseState *tr_state, GF_Rect *orig_bounds);
 
-/*reset the highlight state (bounds) if associated with the current node. This is automatically called 
+/*reset the highlight state (bounds) if associated with the current node. This is automatically called
 whenever reseting a drawable but must be called when a grouping node is modified*/
 void drawable_reset_group_highlight(GF_TraverseState *tr_state, GF_Node *n);
 
@@ -255,13 +258,13 @@
 		for SVG: parent <use> node if any
 	*/
 	GF_Node *appear;
-	
+
 #ifdef GF_SR_USE_DEPTH
-    //local gain and offset
-    Fixed depth_gain, depth_offset;
+	//local gain and offset
+	Fixed depth_gain, depth_offset;
 #endif
-	
-};	
+
+};
 
 DrawableContext *NewDrawableContext();
 void DeleteDrawableContext(DrawableContext *);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/events.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/events.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -74,15 +74,15 @@
 	size_t len;
 	if (!compositor->edited_text) return;
 
-    /* if this is the final editing and there is text, 
-    we need to remove the caret from the text selection buffer */
+	/* if this is the final editing and there is text,
+	we need to remove the caret from the text selection buffer */
 	if (final_flush && compositor->sel_buffer_len) {
 		memmove(&compositor->sel_buffer[compositor->caret_pos], &compositor->sel_buffer[compositor->caret_pos+1], sizeof(u16)*(compositor->sel_buffer_len-compositor->caret_pos));
 		compositor->sel_buffer_len--;
 		compositor->sel_buffer[compositor->sel_buffer_len] = 0;
 	}
 
-    /* Recomputes the edited text */
+	/* Recomputes the edited text */
 	if (*compositor->edited_text) {
 		gf_free(*compositor->edited_text);
 		*compositor->edited_text = NULL;
@@ -108,8 +108,8 @@
 
 	gf_node_set_private(compositor->focus_highlight->node, NULL);
 
-    /* if this is the final flush, we free the selection buffer and edited text buffer 
-    and signal a text content change in the focus node */
+	/* if this is the final flush, we free the selection buffer and edited text buffer
+	and signal a text content change in the focus node */
 	if (final_flush) {
 		GF_FieldInfo info;
 		if (compositor->sel_buffer) gf_free(compositor->sel_buffer);
@@ -117,12 +117,14 @@
 		compositor->sel_buffer_len = compositor->sel_buffer_alloc = 0;
 		compositor->edited_text = NULL;
 
-		if (signal) {
+		if (compositor->focus_node && signal) {
 			memset(&info, 0, sizeof(GF_FieldInfo));
 			info.fieldIndex = (u32) -1;
 			if (compositor->focus_text_type>=3) {
 				gf_node_get_field(compositor->focus_node, 0, &info);
+#ifndef GPAC_DISABLE_VRML
 				gf_node_event_out(compositor->focus_node, 0);
+#endif
 			}
 			gf_node_changed(compositor->focus_node, &info);
 		}
@@ -247,132 +249,132 @@
 	} else
 #endif /*GPAC_DISABLE_VRML*/
 
-	{
+		if (compositor->focus_node) {
 #ifndef GPAC_DISABLE_SVG
-		GF_ChildNodeItem *child = ((GF_ParentNode *) compositor->focus_node)->children;
+			GF_ChildNodeItem *child = ((GF_ParentNode *) compositor->focus_node)->children;
+
+			while (child) {
+				switch (gf_node_get_tag(child->node)) {
+				case TAG_DOMText:
+					break;
+				default:
+					child = child->next;
+					continue;
+				}
+				compositor->dom_text_pos++;
+				if (!cmd_type) res = &((GF_DOMText *)child->node)->textContent;
+				else if (pos==compositor->dom_text_pos) {
+					if (append) {
+						u16 end;
+						const u16 *srcp;
+						size_t len;
+						GF_DOMText *cur, *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);
 
-		while (child) {
-			switch (gf_node_get_tag(child->node)) {
-			case TAG_DOMText:
-				break;
-			default:
-				child = child->next;
-				continue;
-			}
-			compositor->dom_text_pos++;
-			if (!cmd_type) res = &((GF_DOMText *)child->node)->textContent;
-			else if (pos==compositor->dom_text_pos) {
-				if (append) {
-					u16 end;
-					const u16 *srcp;
-					size_t len;
-					GF_DOMText *cur, *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);
-
-					gf_node_init(t);
-					gf_node_register(t, compositor->focus_node);
-
-					pos = gf_node_list_find_child(children, child->node);
-
-					/*we're only inserting a tbreak*/
-					if (!compositor->caret_pos) {
-						gf_node_list_insert_child(&children, t, pos);
-						res = &((GF_DOMText *)child->node)->textContent;
-					} else {
-						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);
-						gf_node_list_insert_child(&children, (GF_Node *)ntext, pos+2);
-						gf_node_register((GF_Node*)ntext, compositor->focus_node);
-
-						cur = (GF_DOMText*) child->node;
-
-						gf_free(cur->textContent);
-						end = compositor->sel_buffer[compositor->caret_pos];
-						compositor->sel_buffer[compositor->caret_pos] = 0;
-						len = gf_utf8_wcslen(compositor->sel_buffer);
-						cur->textContent = gf_malloc(sizeof(char)*(len+1));
-						srcp = compositor->sel_buffer;
-						len = gf_utf8_wcstombs(cur->textContent, len, &srcp);
-						cur->textContent[len] = 0;
-						compositor->sel_buffer[compositor->caret_pos] = end;
-
-						if (compositor->caret_pos+1<compositor->sel_buffer_len) {
-							len = gf_utf8_wcslen(compositor->sel_buffer + compositor->caret_pos + 1);
-							ntext->textContent = gf_malloc(sizeof(char)*(len+1));
-							srcp = compositor->sel_buffer + compositor->caret_pos + 1;
-							len = gf_utf8_wcstombs(ntext->textContent, len, &srcp);
-							ntext->textContent[len] = 0;
-						} else {
-							ntext->textContent = gf_strdup("");
-						}
-						res = &ntext->textContent;
-						compositor->dom_text_pos ++;
-						compositor->edited_text = NULL;
-					}
+						gf_node_register(t, compositor->focus_node);
 
-				} else {
-					if (delete_cr && child->next) {
-						GF_Node *tbreak = child->next->node;
-						GF_ChildNodeItem *children = ((GF_ParentNode *) compositor->focus_node)->children;
-						gf_node_list_del_child(&children, tbreak);
-						gf_node_unregister(tbreak, compositor->focus_node);
-						if (child->next && (gf_node_get_tag(child->next->node)==TAG_DOMText) ) {
-							GF_DOMText *n1 = (GF_DOMText *)child->node;
-							GF_DOMText *n2 = (GF_DOMText *)child->next->node;
-
-							if (compositor->edited_text) {
-								flush_text_node_edit(compositor, 1);
-							}
-							if (!n1->textContent) n1->textContent = gf_strdup("");
-							caret_pos = (u32) strlen(n1->textContent);
-							if (n2->textContent) {
-								n1->textContent = gf_realloc(n1->textContent, sizeof(char)*(strlen(n1->textContent)+strlen(n2->textContent)+1));
-								strcat(n1->textContent, n2->textContent);
+						pos = gf_node_list_find_child(children, child->node);
+
+						/*we're only inserting a tbreak*/
+						if (!compositor->caret_pos) {
+							gf_node_list_insert_child(&children, t, pos);
+							res = &((GF_DOMText *)child->node)->textContent;
+						} else {
+							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);
+							gf_node_list_insert_child(&children, (GF_Node *)ntext, pos+2);
+							gf_node_register((GF_Node*)ntext, compositor->focus_node);
+
+							cur = (GF_DOMText*) child->node;
+
+							gf_free(cur->textContent);
+							end = compositor->sel_buffer[compositor->caret_pos];
+							compositor->sel_buffer[compositor->caret_pos] = 0;
+							len = gf_utf8_wcslen(compositor->sel_buffer);
+							cur->textContent = gf_malloc(sizeof(char)*(len+1));
+							srcp = compositor->sel_buffer;
+							len = gf_utf8_wcstombs(cur->textContent, len, &srcp);
+							cur->textContent[len] = 0;
+							compositor->sel_buffer[compositor->caret_pos] = end;
+
+							if (compositor->caret_pos+1<compositor->sel_buffer_len) {
+								len = gf_utf8_wcslen(compositor->sel_buffer + compositor->caret_pos + 1);
+								ntext->textContent = gf_malloc(sizeof(char)*(len+1));
+								srcp = compositor->sel_buffer + compositor->caret_pos + 1;
+								len = gf_utf8_wcstombs(ntext->textContent, len, &srcp);
+								ntext->textContent[len] = 0;
+							} else {
+								ntext->textContent = gf_strdup("");
 							}
-							gf_node_list_del_child(&children, (GF_Node*)n2);
-							gf_node_unregister((GF_Node*)n2, compositor->focus_node);
+							res = &ntext->textContent;
+							compositor->dom_text_pos ++;
 							compositor->edited_text = NULL;
 						}
-					}
-					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;
+
+					} else {
+						if (delete_cr && child->next) {
+							GF_Node *tbreak = child->next->node;
+							GF_ChildNodeItem *children = ((GF_ParentNode *) compositor->focus_node)->children;
+							gf_node_list_del_child(&children, tbreak);
+							gf_node_unregister(tbreak, compositor->focus_node);
+							if (child->next && (gf_node_get_tag(child->next->node)==TAG_DOMText) ) {
+								GF_DOMText *n1 = (GF_DOMText *)child->node;
+								GF_DOMText *n2 = (GF_DOMText *)child->next->node;
+
+								if (compositor->edited_text) {
+									flush_text_node_edit(compositor, 1);
+								}
+								if (!n1->textContent) n1->textContent = gf_strdup("");
+								caret_pos = (u32) strlen(n1->textContent);
+								if (n2->textContent) {
+									n1->textContent = gf_realloc(n1->textContent, sizeof(char)*(strlen(n1->textContent)+strlen(n2->textContent)+1));
+									strcat(n1->textContent, n2->textContent);
+								}
+								gf_node_list_del_child(&children, (GF_Node*)n2);
+								gf_node_unregister((GF_Node*)n2, compositor->focus_node);
+								compositor->edited_text = NULL;
+							}
 						}
-						child = child->next;
+						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;
 				}
-*/
-				break;
+				child = child->next;
+				continue;
+			}
+			/*load of an empty text*/
+			if (!res && !cmd_type) {
+				GF_DOMText *t = gf_dom_add_text_node(compositor->focus_node, gf_strdup(""));
+				res = &t->textContent;
 			}
-			child = child->next;
-			continue;
-		}
-		/*load of an empty text*/
-		if (!res && !cmd_type) {
-			GF_DOMText *t = gf_dom_add_text_node(compositor->focus_node, gf_strdup(""));
-			res = &t->textContent;
-		}
 
-		if (!res) {
-			compositor->dom_text_pos = prev_pos;
-			return 0;
-		}
+			if (!res) {
+				compositor->dom_text_pos = prev_pos;
+				return 0;
+			}
 #endif
-	}
+		}
 
 	if (compositor->edited_text) {
 		flush_text_node_edit(compositor, 1);
 	}
 
-	if (*res) {
+	if (res && *res && strlen(*res) ) {
 		const char *src = *res;
 		compositor->sel_buffer_alloc = 2 + (u32) strlen(src);
 		compositor->sel_buffer = gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
@@ -414,13 +416,12 @@
 		load_text_node(compositor, 0);
 		return;
 	} else if (event->type==GF_EVENT_TEXTINPUT) {
-		switch (event->character.unicode_char) {
-		case '\r':
-		case '\n':
-		case '\t':
-		case '\b':
+		u32 unicode_char = event->character.unicode_char;
+		//filter all non-text symbols
+		if (unicode_char <= 31) {
 			return;
-		default:
+		}
+
 		{
 #ifndef GPAC_DISABLE_SVG
 			GF_DOM_Event evt;
@@ -431,7 +432,7 @@
 			evt.bubbles = 1;
 			evt.cancelable = 1;
 			evt.type = event->type;
-			evt.detail = event->character.unicode_char;
+			evt.detail = unicode_char;
 			target = compositor->focus_node;
 			if (!target) target = gf_sg_get_root_node(compositor->scene);
 			gf_dom_event_fire(target, &evt);
@@ -443,13 +444,11 @@
 				compositor->sel_buffer = gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
 			}
 			memmove(&compositor->sel_buffer[compositor->caret_pos+1], &compositor->sel_buffer[compositor->caret_pos], sizeof(u16)*(compositor->sel_buffer_len-compositor->caret_pos));
-			compositor->sel_buffer[compositor->caret_pos] = event->character.unicode_char;
+			compositor->sel_buffer[compositor->caret_pos] = unicode_char;
 			compositor->sel_buffer_len++;
 			compositor->caret_pos++;
 			compositor->sel_buffer[compositor->sel_buffer_len] = 0;
 #endif
-			break;
-		}
 		}
 	} else if (event->type==GF_EVENT_KEYDOWN) {
 		u32 prev_caret = compositor->caret_pos;
@@ -476,7 +475,7 @@
 			if (compositor->caret_pos+1<compositor->sel_buffer_len) {
 				if (event->key.flags & GF_KEY_MOD_CTRL) {
 					while ((compositor->caret_pos+1<compositor->sel_buffer_len)
-						&& (compositor->sel_buffer[compositor->caret_pos] != ' '))
+					        && (compositor->sel_buffer[compositor->caret_pos] != ' '))
 						compositor->caret_pos++;
 				} else {
 					compositor->caret_pos++;
@@ -542,12 +541,12 @@
 	flush_text_node_edit(compositor, is_end);
 }
 
-static void fireTermEvent(GF_Compositor * compositor, u32 eventType){
-        if (compositor->term){
-          GF_Event evt;
-          memset(&evt, 0, sizeof(GF_Event));
-	  evt.type = eventType;
-          gf_term_user_event(compositor->term, &evt);
+static void fireTermEvent(GF_Compositor * compositor, u32 eventType) {
+	if (compositor->term) {
+		GF_Event evt;
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = eventType;
+		gf_term_user_event(compositor->term, &evt);
 	}
 }
 
@@ -558,9 +557,9 @@
 #endif
 	u32 tag;
 	GF_Node *text = check_focus_node ? compositor->focus_node : compositor->hit_node;
-	if (!text){
-		 fireTermEvent(compositor, GF_EVENT_TEXT_EDITING_END);
-		 return 0;
+	if (!text) {
+		fireTermEvent(compositor, GF_EVENT_TEXT_EDITING_END);
+		return 0;
 	}
 	if (compositor->hit_node==compositor->focus_node) return compositor->focus_text_type ? 1 : 0;
 
@@ -569,9 +568,9 @@
 #ifndef GPAC_DISABLE_VRML
 	if ( (tag==TAG_MPEG4_Text)
 #ifndef GPAC_DISABLE_X3D
-		|| (tag==TAG_X3D_Text)
+	        || (tag==TAG_X3D_Text)
 #endif
-	) {
+	   ) {
 		M_FontStyle *fs = (M_FontStyle *) ((M_Text *)text)->fontStyle;
 		if (!fs || !fs->style.buffer) return 0;
 		if (strstr(fs->style.buffer, "editable") || strstr(fs->style.buffer, "EDITABLE")) {
@@ -654,8 +653,8 @@
 	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)
-		) {
+	        // && (gf_node_get_dom_event_filter(gf_sg_get_root_node(compositor->scene)) & GF_DOM_EVENT_MOUSE)
+	   ) {
 		Fixed X = compositor->hit_world_point.x;
 		Fixed Y = compositor->hit_world_point.y;
 		/*flip back to origin at top-left*/
@@ -726,11 +725,11 @@
 				evt.button = event->mouse.button;
 				evt.detail = compositor->num_clicks;
 				ret += gf_dom_event_fire_ex(compositor->grab_node, &evt, compositor->hit_use_stack);
-/*
-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) 
+				/*
+				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 ((compositor->grab_x == X) && (compositor->grab_y == Y))
 #endif
 				{
@@ -796,7 +795,7 @@
 		evt.detail = event->key.key_code;
 		evt.key_hw_code = event->key.hw_code;
 		target = compositor->focus_node;
-		
+
 		/*dirty hack to simulate browserback*/
 		if (event->key.key_code==GF_KEY_BACKSPACE && (event->key.flags & GF_KEY_MOD_CTRL)) {
 			event->key.key_code = GF_KEY_BROWSERBACK;
@@ -823,7 +822,7 @@
 		case '\r':
 		case '\n':
 		case '\t':
-		//case '\b':
+			//case '\b':
 			break;
 		default:
 			memset(&evt, 0, sizeof(GF_DOM_Event));
@@ -905,14 +904,14 @@
 		keynav = gf_scene_get_keynav(gf_node_get_graph(hs->sensor), hs->sensor);
 		if (keynav) gf_sc_change_key_navigator(compositor, keynav);
 
-		/*call the sensor LAST, as this may triger a destroy of the scene the sensor is in 
+		/*call the sensor LAST, as this may triger a destroy of the scene the sensor is in
 		this is only true for anchors, as other other sensors output events are queued as routes untill next pass*/
 		res += hs->OnUserEvent(hs, 1, 0, ev, compositor);
 		if ((stype == TAG_MPEG4_Anchor)
 #ifndef GPAC_DISABLE_X3D
-						|| (stype == TAG_X3D_Anchor) 
+		        || (stype == TAG_X3D_Anchor)
 #endif
-		) {
+		   ) {
 			/*subscene with active sensor has been deleted, we cannot continue process the sensors stack*/
 			if (count != gf_list_count(compositor->sensors))
 				break;
@@ -979,7 +978,9 @@
 			break;
 #endif
 
-		default: stype = GF_CURSOR_NORMAL; break;
+		default:
+			stype = GF_CURSOR_NORMAL;
+			break;
 		}
 		if ((stype != GF_CURSOR_NORMAL) || (compositor->sensor_type != stype)) {
 			GF_Event evt;
@@ -1161,11 +1162,20 @@
 	n=NULL;
 	gf_svg_flatten_attributes((SVG_Element *)compositor->focus_node, &atts);
 	switch (key_code) {
-	case GF_KEY_LEFT: focus = atts.nav_left; break;
-	case GF_KEY_RIGHT: focus = atts.nav_right; break;
-	case GF_KEY_UP: focus = atts.nav_up; break;
-	case GF_KEY_DOWN: focus = atts.nav_down; break;
-	default: return 0;
+	case GF_KEY_LEFT:
+		focus = atts.nav_left;
+		break;
+	case GF_KEY_RIGHT:
+		focus = atts.nav_right;
+		break;
+	case GF_KEY_UP:
+		focus = atts.nav_up;
+		break;
+	case GF_KEY_DOWN:
+		focus = atts.nav_down;
+		break;
+	default:
+		return 0;
 	}
 	if (!focus) return 0;
 
@@ -1260,7 +1270,7 @@
 	gf_node_set_cyclic_traverse_flag(elt, 0);\
 	return NULL;	\
 	}	\
-
+ 
 #ifndef GPAC_DISABLE_SVG
 static void rebuild_focus_ancestor(GF_Compositor *compositor, GF_Node *elt)
 {
@@ -1353,7 +1363,7 @@
 #ifndef GPAC_DISABLE_X3D
 		case TAG_X3D_Switch:
 #endif
-			{
+		{
 			s32 i, wc;
 			GF_ChildNodeItem *child;
 #ifndef GPAC_DISABLE_X3D
@@ -1412,7 +1422,7 @@
 				return elt;
 			}
 		}
-			break;
+		break;
 
 		case TAG_ProtoNode:
 			/*hardcoded proto acting as a grouping node*/
@@ -1687,7 +1697,8 @@
 		case TAG_X3D_Collision:
 		case TAG_X3D_LOD:
 #endif
-		case TAG_MPEG4_CompositeTexture2D: case TAG_MPEG4_CompositeTexture3D:
+		case TAG_MPEG4_CompositeTexture2D:
+		case TAG_MPEG4_CompositeTexture3D:
 			child = ((GF_ParentNode*)par)->children;
 			break;
 		case TAG_ProtoNode:
@@ -1695,8 +1706,8 @@
 			if (gf_node_proto_is_grouping(par)) {
 				GF_FieldInfo info;
 				if ((gf_node_get_field_by_name(par, "children", &info) == GF_OK)
-					&& (info.fieldType == GF_SG_VRML_MFNODE)
-				) {
+				        && (info.fieldType == GF_SG_VRML_MFNODE)
+				   ) {
 					child = *(GF_ChildNodeItem **) info.far_ptr;
 					break;
 				}
@@ -1916,10 +1927,18 @@
 					GF_Node *next_nav = NULL;
 #ifndef GPAC_DISABLE_VRML
 					switch (ev->key.key_code) {
-					case GF_KEY_UP: next_nav = ((M_KeyNavigator*)compositor->keynav_node)->up; break;
-					case GF_KEY_DOWN: next_nav = ((M_KeyNavigator*)compositor->keynav_node)->down; break;
-					case GF_KEY_LEFT: next_nav = ((M_KeyNavigator*)compositor->keynav_node)->left; break;
-					case GF_KEY_RIGHT: next_nav = ((M_KeyNavigator*)compositor->keynav_node)->right; break;
+					case GF_KEY_UP:
+						next_nav = ((M_KeyNavigator*)compositor->keynav_node)->up;
+						break;
+					case GF_KEY_DOWN:
+						next_nav = ((M_KeyNavigator*)compositor->keynav_node)->down;
+						break;
+					case GF_KEY_LEFT:
+						next_nav = ((M_KeyNavigator*)compositor->keynav_node)->left;
+						break;
+					case GF_KEY_RIGHT:
+						next_nav = ((M_KeyNavigator*)compositor->keynav_node)->right;
+						break;
 					}
 #endif
 					if (next_nav) {
@@ -1975,13 +1994,13 @@
 	}
 
 	/*process regular events except if navigation is grabbed*/
-    if ( (compositor->navigation_state<2) && (compositor->interaction_level & GF_INTERACT_NORMAL)) {
-        Bool res;
-        res = gf_sc_execute_event(compositor, compositor->traverse_state, evt, NULL);
-        if (res) {
-		    compositor->navigation_state = 0;
-		    ret = 1;
-        }
+	if ( (compositor->navigation_state<2) && (compositor->interaction_level & GF_INTERACT_NORMAL)) {
+		Bool res;
+		res = gf_sc_execute_event(compositor, compositor->traverse_state, evt, NULL);
+		if (res) {
+			compositor->navigation_state = 0;
+			ret = 1;
+		}
 	}
 	if (switch_coords) {
 		evt->mouse.x = x;
@@ -2002,9 +2021,9 @@
 	return ret;
 }
 
-#ifndef GPAC_DISABLE_VRML
 void gf_sc_change_key_navigator(GF_Compositor *sr, GF_Node *n)
 {
+#ifndef GPAC_DISABLE_VRML
 	GF_Node *par;
 	M_KeyNavigator *kn;
 
@@ -2013,21 +2032,21 @@
 	if (sr->keynav_node) {
 		kn = (M_KeyNavigator*)sr->keynav_node;
 		kn->focusSet = 0;
-		gf_node_event_out_str(sr->keynav_node, "focusSet");
+		gf_node_event_out(sr->keynav_node, 9/*"focusSet"*/);
 	}
 	sr->keynav_node = n;
 	kn = (M_KeyNavigator*)n;
 	if (n) {
 		kn->focusSet = 1;
-		gf_node_event_out_str(sr->keynav_node, "focusSet");
+		gf_node_event_out(sr->keynav_node, 9/*"focusSet"*/);
 	}
 
 	par = n ? kn->sensor : NULL;
 	if (par) par = gf_node_get_parent(par, 0);
 
 	gf_sc_focus_switch_ring(sr, 0, par, 1);
-}
 #endif
+}
 
 void gf_sc_key_navigator_del(GF_Compositor *sr, GF_Node *n)
 {

gpac-0.5.0.svn5178.tar.bz2/src/compositor/font_engine.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/font_engine.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
- *			
- *			Authors: Jean Le Feuvre 
+ *
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -167,7 +167,7 @@
 GF_Err gf_font_manager_unregister_font(GF_FontManager *fm, GF_Font *font)
 {
 	GF_Font *prev_font, *a_font;
-	
+
 	prev_font = NULL;
 	a_font = fm->font;
 	while (a_font) {
@@ -211,15 +211,15 @@
 			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");
-				if (opt) font_name = (char*)opt;
+			opt = gf_modules_get_option((GF_BaseInterface *)fm->reader, "FontEngine", "FontFixed");
+			if (opt) font_name = (char*)opt;
 		}
 
 		while (font) {
 			if (fm->wait_font_load && font->not_loaded && !check_only && !stricmp(font->name, font_name)) {
 				GF_Font *a_font = NULL;
 				if (font->get_alias) a_font = font->get_alias(font->udta);
-				if (!a_font || a_font->not_loaded) 
+				if (!a_font || a_font->not_loaded)
 					return font;
 			}
 			if ((check_only || !font->not_loaded) && font->name && !stricmp(font->name, font_name)) {
@@ -230,7 +230,7 @@
 				Bool ft_has_weight;
 
 				if (check_only) return font;
-				
+
 				ft_has_weight = (font->styles & GF_FONT_WEIGHT_MASK) ? 1 : 0;
 				if (font->styles == styles) {
 					the_font = font;
@@ -288,7 +288,7 @@
 				fm->reader->get_font_info(fm->reader, &the_font->name, &the_font->em_size, &the_font->ascent, &the_font->descent, &the_font->underline, &the_font->line_spacing, &the_font->max_advance_h, &the_font->max_advance_v);
 				the_font->styles = styles;
 				if (!the_font->name) the_font->name = gf_strdup(font_name);
-			
+
 				if (fm->font) {
 					font = fm->font;
 					while (font->next) font = font->next;
@@ -317,7 +317,7 @@
 		the_font = fm->default_font;
 	}
 	/*embeded font*/
-	if (the_font && !the_font->get_glyphs) 
+	if (the_font && !the_font->get_glyphs)
 		fm->reader->set_font(fm->reader, the_font->name, the_font->styles);
 
 	return the_font;
@@ -363,7 +363,7 @@
 			glyph = font->load_glyph(font->udta, name);
 		} else {
 			if (!fm->reader) return NULL;
-	//		fm->reader->set_font(fm->reader, font->name, font->styles);
+			//		fm->reader->set_font(fm->reader, font->name, font->styles);
 			glyph = fm->reader->load_glyph(fm->reader, name);
 		}
 	}
@@ -405,7 +405,7 @@
 		fm->id_buffer_size = len;
 		fm->id_buffer = gf_realloc(fm->id_buffer, sizeof(u32) * len);
 		if (!fm->id_buffer) return NULL;
-	
+
 		if (font->get_glyphs)
 			e = font->get_glyphs(font->udta, text, fm->id_buffer, &len, xml_lang, &is_rtl);
 		else
@@ -416,7 +416,7 @@
 	GF_SAFEALLOC(span, GF_TextSpan);
 	span->font = font;
 	span->font_size = font_size;
-	if (font->em_size) 
+	if (font->em_size)
 		span->font_scale = font_size / font->em_size;
 	span->x_scale = span->y_scale = FIX_ONE;
 //	span->lang = xml_lang;
@@ -436,12 +436,12 @@
 		span->rot = gf_malloc(sizeof(Fixed)*len);
 		memset(span->rot, 0, sizeof(Fixed)*len);
 	}
-	
+
 	for (i=0; i<len; i++) {
 		span->glyphs[i] = gf_font_get_glyph(fm, font, fm->id_buffer[i]);
 	}
 	span->user = user;
-	if (span->font->spans) 
+	if (span->font->spans)
 		gf_list_add(font->spans, span);
 	if (is_rtl) span->flags |= GF_TEXT_SPAN_RIGHT_TO_LEFT;
 	return span;
@@ -449,7 +449,7 @@
 
 
 
-typedef struct _span_internal 
+typedef struct _span_internal
 {
 	/*zoom when texture was computed*/
 	Fixed last_zoom;
@@ -528,7 +528,7 @@
 	}
 	span->bounds = gf_rect_center(0, 0);
 
-	for (i=0;i<span->nb_glyphs; i++) {
+	for (i=0; i<span->nb_glyphs; i++) {
 		Fixed g_width;
 		GF_Rect rc;
 
@@ -542,7 +542,7 @@
 		if (span->dy) {
 			if (span->dy[i] - descent < min_y) min_y = span->dy[i] - descent;
 			if (span->dy[i] + ascent > max_y) max_y = span->dy[i] + ascent;
-		} 
+		}
 		else if (span->glyphs[i]) {
 			Fixed size = span->glyphs[i]->height * span->font_scale;
 			if (size > max_y-min_y) max_y = size + min_y;
@@ -694,7 +694,7 @@
 	}
 	if ((gf_mulfix(scale, bounds.width)>max) || (gf_mulfix(scale, bounds.height)>max)) {
 		scale = MIN(gf_divfix(max, bounds.width), gf_divfix(max, bounds.height));
-	} 
+	}
 	else if ((gf_mulfix(scale, bounds.width)<min) || (gf_mulfix(scale, bounds.height)<min)) {
 		scale = MAX(gf_divfix(min, bounds.width), gf_divfix(min, bounds.height));
 	}
@@ -759,7 +759,7 @@
 	brush = raster->stencil_new(raster, GF_STENCIL_SOLID);
 	raster->stencil_set_brush_color(brush, 0xFF000000);
 
-	cx = bounds.x + bounds.width/2; 
+	cx = bounds.x + bounds.width/2;
 	cy = bounds.y - bounds.height/2;
 
 	gf_mx2d_init(mx);
@@ -865,7 +865,7 @@
 
 	if (text_hl && (fill_2d || !asp) ) {
 		/*reverse video: highlighting uses the text color, and text color is inverted (except alpha channel)
-		the ideal impl would be to use the background color for the text, but since the text may be 
+		the ideal impl would be to use the background color for the text, but since the text may be
 		displayed over anything non uniform this would require clipping the highlight rect with the text
 		which is too onerous (and not supported anyway) */
 		if (text_hl == 0x00FFFFFF) {
@@ -883,7 +883,7 @@
 					((M_Material *) ((M_Appearance *)  tr_state->appear)->material)->diffuseColor = rc;
 					visual_3d_setup_appearance(tr_state);
 					((M_Material *) ((M_Appearance *)  tr_state->appear)->material)->diffuseColor = c;
-				} else 
+				} else
 #endif /*GPAC_DISABLE_VRML*/
 				{
 					hl_color.red = hl_color.green = hl_color.blue = 0;
@@ -932,7 +932,8 @@
 		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) 
+
+				if (fill_2d)
 					visual_3d_set_material_2d_argb(tr_state->visual, asp->fill_color);
 				else
 					visual_3d_setup_appearance(tr_state);
@@ -1068,7 +1069,7 @@
 	gf_mx2d_copy(mx, ctx->transform);
 	sx = gf_mulfix(span->font_scale, span->x_scale);
 	diff = span->font_scale * span->font->underline;
-	if (span->flags & GF_TEXT_SPAN_FLIP) 
+	if (span->flags & GF_TEXT_SPAN_FLIP)
 		diff = sx * (span->font->descent - span->font->underline);
 	else
 		diff = sx * (- span->font->ascent + span->font->underline);
@@ -1092,7 +1093,7 @@
 }
 
 #if 0
-static u32 col_reverse_video(u32 col) 
+static u32 col_reverse_video(u32 col)
 {
 	u32 a, r, g, b;
 	a = GF_COL_A(col);
@@ -1108,7 +1109,7 @@
 	GF_Vec s, e;
 	GF_Rect rc;
 	GF_Compositor *compositor = tr_state->visual->compositor;
-	
+
 	e.x = compositor->end_sel.x;
 	e.y = compositor->end_sel.y;
 	e.z = 0;
@@ -1172,7 +1173,7 @@
 	}
 
 	color = compositor->text_sel_color;
-	
+
 	for (i=0; i<span->nb_glyphs; i++) {
 		GF_Rect g_rc;
 		Bool end_of_line = 0;
@@ -1184,7 +1185,7 @@
 		if (dx + advance/2 < rc->x) {
 			dx += advance;
 			continue;
-		} 
+		}
 
 		g_rc.height = ascent-descent;
 
@@ -1227,12 +1228,12 @@
 
 		if (!end_of_line && !gf_rect_overlaps(g_rc, *rc))
 			continue;
-/*
-		if (dy < rc.y-rc.height) {
-			if (!span->dx) break;
-			continue;
-		} 
-*/				
+		/*
+				if (dy < rc.y-rc.height) {
+					if (!span->dx) break;
+					continue;
+				}
+		*/
 		has_selection = 1;
 		if (ctx) {
 			g_rc.width+=2;
@@ -1287,7 +1288,7 @@
 	GF_TextSpan *span;
 	DrawableContext *ctx = tr_state->ctx;
 	GF_Rect rc;
-	
+
 	use_texture_text = 0;
 	if (force_texture_text || (compositor->texture_text_mode==GF_TEXTURE_TEXT_ALWAYS) ) {
 		use_texture_text = !ctx->aspect.fill_texture && !ctx->aspect.pen_props.width;
@@ -1296,13 +1297,13 @@
 	is_rv = 0;
 	if (hl_color) {
 		/*reverse video: highlighting uses the text color, and text color is inverted (except alpha channel)
-		the ideal impl would be to use the background color for the text, but since the text may be 
+		the ideal impl would be to use the background color for the text, but since the text may be
 		displayed over anything non uniform this would require clipping the highlight rect with the text
 		which is too onerous (and not supported anyway) */
 		if (hl_color==0x00FFFFFF) {
 			u32 a, r, g, b;
 			hl_color = tr_state->ctx->aspect.fill_color;
-			
+
 			a = GF_COL_A(tr_state->ctx->aspect.fill_color);
 			if (a) {
 				r = GF_COL_R(tr_state->ctx->aspect.fill_color);
@@ -1317,11 +1318,11 @@
 
 	count = gf_list_count(spans);
 	i=ctx->sub_path_index ? ctx->sub_path_index-1 : 0;
-	for(;i<count; i++) {
+	for(; i<count; i++) {
 		span = (GF_TextSpan *)gf_list_get(spans, i);
 		if (compositor->text_selection)
 			gf_font_spans_select(span, tr_state, ctx, (i+1<count) ? 1 : 0, (i==0)?1:0, &rc);
-		else if (hl_color) 
+		else if (hl_color)
 			visual_2d_fill_rect(tr_state->visual, ctx, &span->bounds, hl_color, 0, tr_state);
 
 		if (use_texture_text && span_setup_texture(compositor, span, 0, tr_state)) {
@@ -1352,7 +1353,7 @@
 		if (compositor->text_selection != tr_state->text_parent) return;
 		if (compositor->store_text_state==GF_SC_TSEL_FROZEN) return;
 	}
-	
+
 	/*TODO: pick the real glyph and not just the bounds of the text span*/
 	count = gf_list_count(spans);
 
@@ -1370,7 +1371,7 @@
 
 		x = local_pt.x;
 		y = local_pt.y;
-	} else 
+	} else
 #endif
 	{
 		gf_mx2d_copy(inv_2d, tr_state->transform);
@@ -1392,9 +1393,9 @@
 		span = (GF_TextSpan*)gf_list_get(spans, i);
 
 		if ((x>=span->bounds.x)
-			&& (y<=span->bounds.y) 
-			&& (x<=span->bounds.x+span->bounds.width) 
-			&& (y>=span->bounds.y-span->bounds.height)) {
+		        && (y<=span->bounds.y)
+		        && (x<=span->bounds.x+span->bounds.width)
+		        && (y>=span->bounds.y-span->bounds.height)) {
 		} else {
 			continue;
 		}
@@ -1461,7 +1462,7 @@
 	if (tr_state->visual->type_3d) {
 		gf_mx_copy(compositor->hit_world_to_local, tr_state->model_matrix);
 		gf_mx_copy(compositor->hit_local_to_world, inv_mx);
-	} else 
+	} else
 #endif
 	{
 		gf_mx_from_mx2d(&compositor->hit_world_to_local, &tr_state->transform);
@@ -1485,14 +1486,15 @@
 
 	compositor->hit_text = tr_state->text_parent;
 	compositor->hit_use_dom_events = use_dom_events;
-	compositor->hit_normal.x = compositor->hit_normal.y = 0; compositor->hit_normal.z = FIX_ONE;
+	compositor->hit_normal.x = compositor->hit_normal.y = 0;
+	compositor->hit_normal.z = FIX_ONE;
 	compositor->hit_texcoords.x = gf_divfix(x, node_bounds->width) + FIX_ONE/2;
 	compositor->hit_texcoords.y = gf_divfix(y, node_bounds->height) + FIX_ONE/2;
 
 #ifndef GPAC_DISABLE_VRML
 	if (compositor_is_composite_texture(tr_state->appear)) {
 		compositor->hit_appear = tr_state->appear;
-	} else 
+	} else
 #endif /*GPAC_DISABLE_VRML*/
 	{
 		compositor->hit_appear = NULL;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/gl_inc.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/gl_inc.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -100,7 +100,7 @@
 #define GLDECL(ret, funname, args)	\
 typedef ret (GLAPICAST proc_ ## funname)args;	\
 extern proc_ ## funname funname;	\
-
+ 
 #define GLDECL_STATIC(funname) proc_ ## funname funname = NULL
 
 #if defined GPAC_USE_TINYGL
@@ -109,18 +109,18 @@
 //no extensions with OpenGL ES
 #elif defined(WIN32) || defined (GPAC_CONFIG_WIN32)
 #define LOAD_GL_FUNCS
-#define GET_GLFUN(funname) funname = (proc_ ## funname) wglGetProcAddress(#funname) 
+#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)  
+#define GET_GLFUN(funname) funname = (proc_ ## funname) glutGetProcAddress(#funname)
 #else
 #define LOAD_GL_FUNCS
 extern void (*glXGetProcAddress(const GLubyte *procname))( void );
-#define GET_GLFUN(funname) funname = (proc_ ## funname) glXGetProcAddress(#funname) 
+#define GET_GLFUN(funname) funname = (proc_ ## funname) glXGetProcAddress(#funname)
 #endif
 
 
-#if !defined(GPAC_USE_OGL_ES) 
+#if !defined(GPAC_USE_OGL_ES)
 
 /*redefine all ext needed*/
 
@@ -174,6 +174,9 @@
 #define GL_DISTANCE_ATTENUATION_EXT         0x8129
 #endif
 
+#ifndef GL_CLAMP_TO_EDGE
+#define GL_CLAMP_TO_EDGE 0x812F
+#endif
 
 #ifndef GL_VERSION_1_3
 
@@ -468,6 +471,13 @@
 GLDECL(void, glUniformMatrix3x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) )
 GLDECL(void, glUniformMatrix4x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) )
 
+#ifndef GPAC_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
 
 
 #endif //GL_VERSION_2_0

gpac-0.5.0.svn5178.tar.bz2/src/compositor/hardcoded_protos.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/hardcoded_protos.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,14 +40,14 @@
 
 typedef struct
 {
-    GF_Node *geometry;
-    MFVec3f *spine;
-    Bool beginCap;
-    Bool endCap;
-    Fixed creaseAngle;
-    MFRotation *orientation;
-    MFVec2f *scale;
-    Bool txAlongSpine;
+	GF_Node *geometry;
+	MFVec3f *spine;
+	Bool beginCap;
+	Bool endCap;
+	Fixed creaseAngle;
+	MFRotation *orientation;
+	MFVec2f *scale;
+	Bool txAlongSpine;
 } PathExtrusion;
 
 static Bool PathExtrusion_GetNode(GF_Node *node, PathExtrusion *path_ext)
@@ -87,7 +87,7 @@
 	Drawable *stack_2d;
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 	Drawable3D *stack = (Drawable3D *)gf_node_get_private(node);
-	
+
 	if (is_destroy) {
 		drawable_3d_del(node);
 		return;
@@ -138,16 +138,16 @@
 /*PlanarExtrusion hardcoded proto*/
 typedef struct
 {
-    GF_Node *geometry;
-    GF_Node *spine;
-    Bool beginCap;
-    Bool endCap;
-    Fixed creaseAngle;
+	GF_Node *geometry;
+	GF_Node *spine;
+	Bool beginCap;
+	Bool endCap;
+	Fixed creaseAngle;
 	MFFloat *orientationKeys;
-    MFRotation *orientation;
+	MFRotation *orientation;
 	MFFloat *scaleKeys;
-    MFVec2f *scale;
-    Bool txAlongSpine;
+	MFVec2f *scale;
+	Bool txAlongSpine;
 } PlanarExtrusion;
 
 static Bool PlanarExtrusion_GetNode(GF_Node *node, PlanarExtrusion *path_ext)
@@ -259,7 +259,7 @@
 		for (i=0; i<spine->n_contours; i++) {
 			nb_pts = 1 + spine->contours[i] - cur;
 			spine_vec.vals = NULL;
-			gf_sg_vrml_mf_alloc(&spine_vec, GF_SG_VRML_MFVEC3F, nb_pts); 
+			gf_sg_vrml_mf_alloc(&spine_vec, GF_SG_VRML_MFVEC3F, nb_pts);
 			spine_len = 0;
 			for (j=cur; j<nb_pts; j++) {
 				spine_vec.vals[j].x = spine->points[j].x;
@@ -272,9 +272,9 @@
 			}
 			cur += nb_pts;
 			if (!plane_ext.orientation->count && !plane_ext.scale->count) {
-				mesh_extrude_path_ext(stack->mesh, geo, &spine_vec, plane_ext.creaseAngle, 
-					bounds.x, bounds.y-bounds.height, bounds.width, bounds.height, 
-					plane_ext.beginCap, plane_ext.endCap, NULL, NULL, plane_ext.txAlongSpine);
+				mesh_extrude_path_ext(stack->mesh, geo, &spine_vec, plane_ext.creaseAngle,
+				                      bounds.x, bounds.y-bounds.height, bounds.width, bounds.height,
+				                      plane_ext.beginCap, plane_ext.endCap, NULL, NULL, plane_ext.txAlongSpine);
 			}
 			/*interpolate orientation and scale along subpath line*/
 			else {
@@ -306,8 +306,8 @@
 							for (k=1; k<plane_ext.orientationKeys->count; k++) {
 								Fixed kDiff = plane_ext.orientationKeys->vals[k] - plane_ext.orientationKeys->vals[k-1];
 								if (!kDiff) continue;
-								if (frac < plane_ext.orientationKeys->vals[k-1]) continue; 
-								if (frac > plane_ext.orientationKeys->vals[k]) continue; 
+								if (frac < plane_ext.orientationKeys->vals[k-1]) continue;
+								if (frac > plane_ext.orientationKeys->vals[k]) continue;
 								frac = gf_divfix(frac - plane_ext.orientationKeys->vals[k-1], kDiff);
 								break;
 							}
@@ -323,8 +323,8 @@
 							for (k=1; k<plane_ext.scaleKeys->count; k++) {
 								Fixed kDiff = plane_ext.scaleKeys->vals[k] - plane_ext.scaleKeys->vals[k-1];
 								if (!kDiff) continue;
-								if (frac < plane_ext.scaleKeys->vals[k-1]) continue; 
-								if (frac > plane_ext.scaleKeys->vals[k]) continue; 
+								if (frac < plane_ext.scaleKeys->vals[k-1]) continue;
+								if (frac > plane_ext.scaleKeys->vals[k]) continue;
 								frac = gf_divfix(frac - plane_ext.scaleKeys->vals[k-1], kDiff);
 								break;
 							}
@@ -334,9 +334,9 @@
 					}
 				}
 
-				mesh_extrude_path_ext(stack->mesh, geo, &spine_vec, plane_ext.creaseAngle, 
-					bounds.x, bounds.y-bounds.height, bounds.width, bounds.height, 
-					plane_ext.beginCap, plane_ext.endCap, &ori, &scale, plane_ext.txAlongSpine);
+				mesh_extrude_path_ext(stack->mesh, geo, &spine_vec, plane_ext.creaseAngle,
+				                      bounds.x, bounds.y-bounds.height, bounds.width, bounds.height,
+				                      plane_ext.beginCap, plane_ext.endCap, &ori, &scale, plane_ext.txAlongSpine);
 
 				gf_sg_vrml_mf_reset(&ori, GF_SG_VRML_MFROTATION);
 				gf_sg_vrml_mf_reset(&scale, GF_SG_VRML_MFVEC2F);
@@ -367,7 +367,7 @@
 	BASE_NODE
 	CHILDREN
 
-    GF_Plane plane;
+	GF_Plane plane;
 } PlaneClipper;
 
 typedef struct
@@ -415,7 +415,9 @@
 	}
 
 	if (tr_state->traversing_mode == TRAVERSE_SORT) {
-		visual_3d_set_clip_plane(tr_state->visual, stack->pc.plane);
+		GF_Matrix mx;
+		gf_mx_copy(mx, tr_state->model_matrix);
+		visual_3d_set_clip_plane(tr_state->visual, stack->pc.plane, &mx, 0);
 		tr_state->num_clip_planes++;
 
 		group_3d_traverse((GF_Node*)&stack->pc, (GroupingNode*)stack, tr_state);
@@ -425,9 +427,9 @@
 		tr_state->clip_planes[tr_state->num_clip_planes] = stack->pc.plane;
 		gf_mx_apply_plane(&tr_state->model_matrix, &tr_state->clip_planes[tr_state->num_clip_planes]);
 		tr_state->num_clip_planes++;
-		
+
 		group_3d_traverse((GF_Node*)&stack->pc, (GroupingNode*)stack, tr_state);
-	
+
 		tr_state->num_clip_planes--;
 	}
 
@@ -533,7 +535,7 @@
 
 			tr_state->subscene_not_over = 0;
 			group_cache_traverse((GF_Node *)&stack->og, stack->cache, tr_state, stack->cache->force_recompute, 1, stack->detached ? 1 : 0);
-			
+
 			if (gf_node_dirty_get(node)) {
 				gf_node_dirty_clear(node, GF_SG_CHILD_DIRTY);
 			} else if ((stack->og.offscreen==2) && !stack->detached && !tr_state->subscene_not_over && stack->cache->txh.width && stack->cache->txh.height) {
@@ -590,7 +592,7 @@
 	BASE_NODE
 	CHILDREN
 
-    Fixed depth_gain, depth_offset;
+	Fixed depth_gain, depth_offset;
 
 } DepthGroup;
 
@@ -654,10 +656,10 @@
 	depth_gain = tr_state->depth_gain;
 	depth_offset = tr_state->depth_offset;
 
-    // new offset is multiplied by parent gain and added to parent offset
+	// new offset is multiplied by parent gain and added to parent offset
 	tr_state->depth_offset = gf_mulfix(stack->dg.depth_offset, tr_state->depth_gain) + tr_state->depth_offset;
 
-    // gain is multiplied by parent gain
+	// gain is multiplied by parent gain
 	tr_state->depth_gain = gf_mulfix(tr_state->depth_gain, stack->dg.depth_gain);
 #endif
 
@@ -669,20 +671,10 @@
 		gf_mx_init(mx);
 		mx.m[14] = gf_mulfix(stack->dg.depth_offset, tr_state->visual->compositor->depth_gl_scale);
 		gf_mx_add_matrix(&tr_state->model_matrix, &mx);
-
-		if (tr_state->traversing_mode == TRAVERSE_SORT) {
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_matrix_add(tr_state->visual, mx.m);
-
-			group_2d_traverse((GF_Node *)&stack->dg, (GroupingNode2D*)stack, tr_state);
-		
-			visual_3d_matrix_pop(tr_state->visual);
-		} else {
-			group_2d_traverse((GF_Node *)&stack->dg, (GroupingNode2D*)stack, tr_state);
-		}
+		group_2d_traverse((GF_Node *)&stack->dg, (GroupingNode2D*)stack, tr_state);
 		gf_mx_copy(tr_state->model_matrix, mx_bckup);
 
-	} else 
+	} else
 #endif
 	{
 
@@ -690,8 +682,8 @@
 	}
 
 #ifdef GF_SR_USE_DEPTH
-		tr_state->depth_gain = depth_gain;
-		tr_state->depth_offset = depth_offset;
+	tr_state->depth_gain = depth_gain;
+	tr_state->depth_offset = depth_offset;
 #endif
 }
 
@@ -706,7 +698,7 @@
 		stack->dg = dg;
 		gf_node_proto_set_grouping(node);
 	} else GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Unable to initialize depth group  \n"));
-        	
+
 }
 
 #ifdef GF_SR_USE_DEPTH
@@ -756,10 +748,10 @@
 {
 	BASE_NODE
 
-    GF_Node *point;
-    Fixed fineness;
-    MFInt32 type;
-    MFInt32 index;
+	GF_Node *point;
+	Fixed fineness;
+	MFInt32 type;
+	MFInt32 index;
 } IndexedCurve2D;
 
 static Bool IndexedCurve2D_GetNode(GF_Node *node, IndexedCurve2D *ic2d)
@@ -772,7 +764,7 @@
 	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
 	if (field.fieldType != GF_SG_VRML_SFNODE) return 0;
 	ic2d->point = * (GF_Node **) field.far_ptr;
-	
+
 	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
 	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
 	ic2d->fineness = *(SFFloat *) field.far_ptr;
@@ -796,7 +788,7 @@
 	IndexedCurve2D ic2d;
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 	Drawable *stack = (Drawable *)gf_node_get_private(node);
-	
+
 	if (is_destroy) {
 		drawable_node_del(node);
 		return;
@@ -909,22 +901,15 @@
 
 
 		if (tr_state->traversing_mode == TRAVERSE_SORT) {
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_PROJECTION);
-			visual_3d_matrix_load(tr_state->visual, tr_state->camera->projection.m);
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_MODELVIEW);
-			visual_3d_matrix_load(tr_state->visual, tr_state->camera->modelview.m);
-
 			visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
+			visual_3d_projection_matrix_modified(tr_state->visual);
 
 			gf_node_traverse_children((GF_Node *)&stack->untr, tr_state);
 
 			gf_mx_copy(tr_state->model_matrix, mx_model);
 			memcpy(tr_state->camera, &backup_cam, sizeof(GF_Camera));
 
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_PROJECTION);
-			visual_3d_matrix_load(tr_state->visual, tr_state->camera->projection.m);
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_MODELVIEW);
-			visual_3d_matrix_load(tr_state->visual, tr_state->camera->modelview.m);
+			visual_3d_projection_matrix_modified(tr_state->visual);
 
 			visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
 		} else if (tr_state->traversing_mode == TRAVERSE_PICK) {
@@ -943,11 +928,11 @@
 			gf_mx_copy(tr_state->model_matrix, mx_model);
 			memcpy(tr_state->camera, &backup_cam, sizeof(GF_Camera));
 			tr_state->ray = r;
-			
+
 			/*nothing picked, restore previous pick*/
-			if (!tr_state->visual->compositor->hit_square_dist) 
+			if (!tr_state->visual->compositor->hit_square_dist)
 				tr_state->visual->compositor->hit_square_dist = prev_dist;
-	
+
 		} else {
 			gf_node_traverse_children((GF_Node *)&stack->untr, tr_state);
 
@@ -955,7 +940,7 @@
 			memcpy(tr_state->camera, &backup_cam, sizeof(GF_Camera));
 		}
 
-	} else 
+	} else
 #endif
 	{
 		GF_Matrix2D mx2d_backup;
@@ -983,6 +968,177 @@
 	}
 }
 
+
+
+/*StyleGroup: overrides appearance of all children*/
+typedef struct
+{
+	BASE_NODE
+	CHILDREN
+
+	GF_Node *appearance;
+} StyleGroup;
+
+typedef struct
+{
+	GROUPING_MPEG4_STACK_2D
+	StyleGroup sg;
+} StyleGroupStack;
+
+static Bool StyleGroup_GetNode(GF_Node *node, StyleGroup *sg)
+{
+	GF_FieldInfo field;
+	memset(sg, 0, sizeof(StyleGroup));
+	sg->sgprivate = node->sgprivate;
+
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
+	if (field.fieldType != GF_SG_VRML_MFNODE) return 0;
+	sg->children = *(GF_ChildNodeItem **) field.far_ptr;
+
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
+	if (field.fieldType != GF_SG_VRML_SFNODE) return 0;
+	sg->appearance = *(GF_Node **)field.far_ptr;
+
+	return 1;
+}
+
+
+static void TraverseStyleGroup(GF_Node *node, void *rs, Bool is_destroy)
+{
+	Bool set = 0;
+	StyleGroupStack *stack = (StyleGroupStack *)gf_node_get_private(node);
+	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
+
+	if (is_destroy) {
+		gf_free(stack);
+		return;
+	}
+
+	if (tr_state->traversing_mode==TRAVERSE_SORT) {
+		if (gf_node_dirty_get(node) & GF_SG_NODE_DIRTY) {
+
+			gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
+			/*flag is not set for PROTO*/
+			gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, 0);
+		}
+	}
+	StyleGroup_GetNode(node, &stack->sg);
+
+	if (!tr_state->override_appearance) {
+		set = 1;
+		tr_state->override_appearance = stack->sg.appearance;
+	}
+	group_2d_traverse((GF_Node *)&stack->sg, (GroupingNode2D*)stack, tr_state);
+
+	if (set) {
+		tr_state->override_appearance = NULL;
+	}
+}
+
+void compositor_init_style_group(GF_Compositor *compositor, GF_Node *node)
+{
+	StyleGroup sg;
+	if (StyleGroup_GetNode(node, &sg)) {
+		StyleGroupStack *stack;
+		GF_SAFEALLOC(stack, StyleGroupStack);
+		gf_node_set_private(node, stack);
+		gf_node_set_callback_function(node, TraverseStyleGroup);
+		stack->sg = sg;
+		gf_node_proto_set_grouping(node);
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Unable to initialize style group\n"));
+	}
+}
+
+
+
+/*TestSensor: tests eventIn/eventOuts for hardcoded proto*/
+typedef struct
+{
+	BASE_NODE
+
+	Bool onTrigger;
+	Float value;
+} TestSensor;
+
+typedef struct
+{
+	TestSensor ts;
+} TestSensorStack;
+
+static Bool TestSensor_GetNode(GF_Node *node, TestSensor *ts)
+{
+	GF_FieldInfo field;
+	memset(ts, 0, sizeof(TestSensor));
+	ts->sgprivate = node->sgprivate;
+
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
+	if (field.fieldType != GF_SG_VRML_SFBOOL) return 0;
+	if (field.eventType != GF_SG_EVENT_IN) return 0;
+	ts->onTrigger = *(SFBool *)field.far_ptr;
+
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (field.eventType != GF_SG_EVENT_EXPOSED_FIELD) return 0;
+	ts->value = *(SFFloat *)field.far_ptr;
+
+	if (gf_node_get_field(node, 2, &field) != GF_OK) return 0;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (field.eventType != GF_SG_EVENT_OUT) return 0;
+
+	return 1;
+}
+
+
+static void TraverseTestSensor(GF_Node *node, void *rs, Bool is_destroy)
+{
+	TestSensorStack *stack = (TestSensorStack *)gf_node_get_private(node);
+
+	if (is_destroy) {
+		gf_free(stack);
+		return;
+	}
+}
+
+void TestSensor_OnTrigger(GF_Node *node, struct _route *route)
+{
+	GF_FieldInfo field;
+	Float value;
+	TestSensorStack *stack = (TestSensorStack *)gf_node_get_private(node);
+	TestSensor_GetNode(node, &stack->ts);
+
+	if (stack->ts.onTrigger) {
+		value = stack->ts.value;
+	} else {
+		value = 1-stack->ts.value;
+	}
+
+	gf_node_get_field(node, 2, &field);
+	*(SFFloat*)field.far_ptr = value;
+	gf_node_event_out(node, 2);
+}
+
+void compositor_init_test_sensor(GF_Compositor *compositor, GF_Node *node)
+{
+	TestSensor ts;
+	if (TestSensor_GetNode(node, &ts)) {
+		GF_Err e;
+		TestSensorStack *stack;
+		GF_SAFEALLOC(stack, TestSensorStack);
+		gf_node_set_private(node, stack);
+		gf_node_set_callback_function(node, TraverseTestSensor);
+		stack->ts = ts;
+
+		e = gf_node_set_proto_eventin_handler(node, 0, TestSensor_OnTrigger);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to initialize Proto TestSensor callback: %s\n", gf_error_to_string(e) ));
+		}
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Unable to initialize test sensor\n"));
+	}
+}
+
+
 /*hardcoded proto loading - this is mainly used for module development and testing...*/
 void compositor_init_hardcoded_proto(GF_Compositor *compositor, GF_Node *node)
 {
@@ -1026,7 +1182,7 @@
 		if (!strcmp(url, "urn:inet:gpac:builtin:DepthViewPoint")) {
 			compositor_init_depth_viewpoint(compositor, node);
 			return;
-		}		
+		}
 		if (!strcmp(url, "urn:inet:gpac:builtin:IndexedCurve2D")) {
 			compositor_init_idx_curve2d(compositor, node);
 			return;
@@ -1039,6 +1195,14 @@
 			compositor_init_hc_flashshape(compositor, node);
 			return;
 		}
+		if (!strcmp(url, "urn:inet:gpac:builtin:StyleGroup")) {
+			compositor_init_style_group(compositor, node);
+			return;
+		}
+		if (!strcmp(url, "urn:inet:gpac:builtin:TestSensor")) {
+			compositor_init_test_sensor(compositor, node);
+			return;
+		}
 
 		/*check proto modules*/
 		if (compositor->proto_modules) {

gpac-0.5.0.svn5178.tar.bz2/src/compositor/hc_flash_shape.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/hc_flash_shape.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -90,7 +90,7 @@
 	u32 wi, li, fi, ci, command, i, has_ci;
 	FSItem *fill_item, *line_item;
 	Fixed w;
-	SFVec2f cur, pt, ct1={0,0}, ct2, *pts;
+	SFVec2f cur, pt, ct1= {0,0}, ct2, *pts;
 	GF_Rect rc;
 	u32 line_col, fill_col;
 	Bool need_line, need_fill;
@@ -127,39 +127,39 @@
 
 	/*implicit commands: 0 1 2 3*/
 
-/*
-	if (widthIndex->count) {
-		w = (widthIndex->vals[wi]==-1) ? 0 : widths->vals[widthIndex->vals[wi]];
-		if (!w) {
-			need_line = 0;
-			line_item = NULL;
-		} else {
-			need_line = 1;
-			if (st->max_width<w) st->max_width = w;
+	/*
+		if (widthIndex->count) {
+			w = (widthIndex->vals[wi]==-1) ? 0 : widths->vals[widthIndex->vals[wi]];
+			if (!w) {
+				need_line = 0;
+				line_item = NULL;
+			} else {
+				need_line = 1;
+				if (st->max_width<w) st->max_width = w;
+			}
+			wi++;
 		}
-		wi++;
-	}
-	if (lineIndex->count) {
-		if (w) {
-			line_col = SFCOL_MAKE_ARGB(colors->vals[lineIndex->vals[li]]);
-			need_line = 1;
+		if (lineIndex->count) {
+			if (w) {
+				line_col = SFCOL_MAKE_ARGB(colors->vals[lineIndex->vals[li]]);
+				need_line = 1;
+			}
+			li++;
 		}
-		li++;
-	}
-	if (fillIndex->count) {
-		if (fillIndex->vals[fi]==-1) {
-			fill_col = 0;
-			fill_item = NULL;
-		} else {
-			fill_col = SFCOL_MAKE_ARGB(colors->vals[fillIndex->vals[fi]]);
-			need_fill = 1;
+		if (fillIndex->count) {
+			if (fillIndex->vals[fi]==-1) {
+				fill_col = 0;
+				fill_item = NULL;
+			} else {
+				fill_col = SFCOL_MAKE_ARGB(colors->vals[fillIndex->vals[fi]]);
+				need_fill = 1;
+			}
+			fi++;
 		}
-		fi++;
-	}
-	if (!coordIndex->count) return;
-	cur = coords->vals[coordIndex->vals[ci]];
-	ci++;
-*/
+		if (!coordIndex->count) return;
+		cur = coords->vals[coordIndex->vals[ci]];
+		ci++;
+	*/
 
 	for (command=0; command<com->count; command++) {
 		switch (com->vals[command]) {
@@ -167,7 +167,7 @@
 		case 0:
 			if (wi >= widthIndex->count) return;
 			w = (widthIndex->vals[wi]==-1) ? 0 : widths->vals[widthIndex->vals[wi]];
-			if (!w) 
+			if (!w)
 				line_item = NULL;
 			else {
 				need_line = 1;
@@ -354,7 +354,7 @@
 			break;
 		}
 	}
-	
+
 	/*compute bounds*/
 	st->bounds.width = st->bounds.height = 0;
 	for (i=0; i<gf_list_count(st->items); i++) {
@@ -438,7 +438,11 @@
 		if (tr_state->visual->type_3d) return;
 #endif
 		/*finalize*/
+#ifndef GPAC_DISABLE_VRML
 		ctx = drawable_init_context_mpeg4(st->drawable, tr_state);
+#else
+		ctx = NULL;
+#endif
 		if (!ctx) return;
 
 		/*force width to max width used for clipper compute*/

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mesh.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mesh.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -39,7 +39,7 @@
 #define HIGH_SPEED_RATIO	2
 
 
-/*size alloc for meshes doubles memory at each gf_realloc rather than using a fix-size increment 
+/*size alloc for meshes doubles memory at each gf_realloc rather than using a fix-size increment
  (this really speeds up large meshes constructing). Final memory usage is adjusted when updating mesh bounds
 */
 #define MESH_CHECK_VERTEX(m)		\
@@ -47,13 +47,13 @@
 		m->v_alloc *= 2;	\
 		m->vertices = (GF_Vertex *)gf_realloc(m->vertices, sizeof(GF_Vertex)*m->v_alloc);	\
 	}	\
-
+ 
 #define MESH_CHECK_IDX(m)		\
 	if (m->i_count == m->i_alloc) {	\
 		m->i_alloc *= 2;	\
 		m->indices = (IDX_TYPE*)gf_realloc(m->indices, sizeof(IDX_TYPE)*m->i_alloc);	\
 	}	\
-
+ 
 
 
 static void del_aabb_node(AABBNode *node)
@@ -137,8 +137,12 @@
 		if (My<v->y) My=v->y;
 		if (Mz<v->z) Mz=v->z;
 	}
-	mesh->bounds.min_edge.x = mx; mesh->bounds.min_edge.y = my; mesh->bounds.min_edge.z = mz;
-	mesh->bounds.max_edge.x = Mx; mesh->bounds.max_edge.y = My; mesh->bounds.max_edge.z = Mz;
+	mesh->bounds.min_edge.x = mx;
+	mesh->bounds.min_edge.y = my;
+	mesh->bounds.min_edge.z = mz;
+	mesh->bounds.max_edge.x = Mx;
+	mesh->bounds.max_edge.y = My;
+	mesh->bounds.max_edge.z = Mz;
 	gf_bbox_refresh(&mesh->bounds);
 }
 
@@ -173,11 +177,17 @@
 {
 	SFVec3f nor;
 	GF_Vertex res;
-	res.pos.x = x; res.pos.y = y; res.pos.z = z;
-	nor.x = nx; nor.y = ny; nor.z = nz; gf_vec_norm(&nor);
+	res.pos.x = x;
+	res.pos.y = y;
+	res.pos.z = z;
+	nor.x = nx;
+	nor.y = ny;
+	nor.z = nz;
+	gf_vec_norm(&nor);
 	MESH_SET_NORMAL(res, nor);
 
-	res.texcoords.x = u; res.texcoords.y = v;
+	res.texcoords.x = u;
+	res.texcoords.y = v;
 #ifdef MESH_USE_SFCOLOR
 	res.color.blue = res.color.red = res.color.green = res.color.alpha = FIX_ONE;
 #else
@@ -292,42 +302,52 @@
 	mesh_set_vertex(mesh, -hx, -hy, -hz,  0,  0, -FIX_ONE, FIX_ONE, 0);
 	mesh_set_vertex(mesh, -hx,  hy, -hz,  0,  0, -FIX_ONE, FIX_ONE, FIX_ONE);
 	mesh_set_vertex(mesh,  hx,  hy, -hz,  0,  0, -FIX_ONE, 0, FIX_ONE);
-	mesh_set_triangle(mesh, 0, 1, 2); mesh_set_triangle(mesh, 0, 2, 3);
+	mesh_set_triangle(mesh, 0, 1, 2);
+	mesh_set_triangle(mesh, 0, 2, 3);
 	/*top face*/
 	mesh_set_vertex(mesh, -hx,  hy,  hz,  0,  FIX_ONE,  0, 0, 0);
 	mesh_set_vertex(mesh,  hx,  hy,  hz,  0,  FIX_ONE,  0, FIX_ONE, 0);
 	mesh_set_vertex(mesh,  hx,  hy, -hz,  0,  FIX_ONE,  0, FIX_ONE, FIX_ONE);
 	mesh_set_vertex(mesh, -hx,  hy, -hz,  0,  FIX_ONE,  0, 0, FIX_ONE);
-	mesh_set_triangle(mesh, 4, 5, 6); mesh_set_triangle(mesh, 4, 6, 7);
+	mesh_set_triangle(mesh, 4, 5, 6);
+	mesh_set_triangle(mesh, 4, 6, 7);
 	/*front face*/
 	mesh_set_vertex(mesh, -hx, -hy,  hz,  0,  0,  FIX_ONE, 0, 0);
 	mesh_set_vertex(mesh,  hx, -hy,  hz,  0,  0,  FIX_ONE, FIX_ONE, 0);
 	mesh_set_vertex(mesh,  hx,  hy,  hz,  0,  0,  FIX_ONE, FIX_ONE, FIX_ONE);
 	mesh_set_vertex(mesh, -hx,  hy,  hz,  0,  0,  FIX_ONE, 0, FIX_ONE);
-	mesh_set_triangle(mesh, 8, 9, 10); mesh_set_triangle(mesh, 8, 10, 11);
+	mesh_set_triangle(mesh, 8, 9, 10);
+	mesh_set_triangle(mesh, 8, 10, 11);
 	/*left face*/
 	mesh_set_vertex(mesh, -hx, -hy, -hz, -FIX_ONE,  0,  0, 0, 0);
 	mesh_set_vertex(mesh, -hx, -hy,  hz, -FIX_ONE,  0,  0, FIX_ONE, 0);
 	mesh_set_vertex(mesh, -hx,  hy,  hz, -FIX_ONE,  0,  0, FIX_ONE, FIX_ONE);
 	mesh_set_vertex(mesh, -hx,  hy, -hz, -FIX_ONE,  0,  0, 0, FIX_ONE);
-	mesh_set_triangle(mesh, 12, 13, 14); mesh_set_triangle(mesh, 12, 14, 15);
+	mesh_set_triangle(mesh, 12, 13, 14);
+	mesh_set_triangle(mesh, 12, 14, 15);
 	/*bottom face*/
 	mesh_set_vertex(mesh, -hx, -hy, -hz,  0, -FIX_ONE,  0, 0, 0);
 	mesh_set_vertex(mesh,  hx, -hy, -hz,  0, -FIX_ONE,  0, FIX_ONE, 0);
 	mesh_set_vertex(mesh,  hx, -hy,  hz,  0, -FIX_ONE,  0, FIX_ONE, FIX_ONE);
 	mesh_set_vertex(mesh, -hx, -hy,  hz,  0, -FIX_ONE,  0, 0, FIX_ONE);
-	mesh_set_triangle(mesh, 16, 17, 18); mesh_set_triangle(mesh, 16, 18, 19);
+	mesh_set_triangle(mesh, 16, 17, 18);
+	mesh_set_triangle(mesh, 16, 18, 19);
 	/*right face*/
 	mesh_set_vertex(mesh,  hx, -hy,  hz,  FIX_ONE,  0,  0, 0, 0);
 	mesh_set_vertex(mesh,  hx, -hy, -hz,  FIX_ONE,  0,  0, FIX_ONE, 0);
 	mesh_set_vertex(mesh,  hx,  hy, -hz,  FIX_ONE,  0,  0, FIX_ONE, FIX_ONE);
 	mesh_set_vertex(mesh,  hx,  hy,  hz,  FIX_ONE,  0,  0, 0, FIX_ONE);
-	mesh_set_triangle(mesh, 20, 21, 22); mesh_set_triangle(mesh, 20, 22, 23);
+	mesh_set_triangle(mesh, 20, 21, 22);
+	mesh_set_triangle(mesh, 20, 22, 23);
 
 
-    mesh->flags |= MESH_IS_SOLID;
-	mesh->bounds.min_edge.x = -hx; mesh->bounds.min_edge.y = -hy; mesh->bounds.min_edge.z = -hz;
-	mesh->bounds.max_edge.x = hx; mesh->bounds.max_edge.y = hy; mesh->bounds.max_edge.z = hz;
+	mesh->flags |= MESH_IS_SOLID;
+	mesh->bounds.min_edge.x = -hx;
+	mesh->bounds.min_edge.y = -hy;
+	mesh->bounds.min_edge.z = -hz;
+	mesh->bounds.max_edge.x = hx;
+	mesh->bounds.max_edge.y = hy;
+	mesh->bounds.max_edge.z = hz;
 	gf_bbox_refresh(&mesh->bounds);
 	gf_mesh_build_aabbtree(mesh);
 }
@@ -350,11 +370,17 @@
 	mesh_set_point(mesh, s, s, s,  col);
 	mesh_set_point(mesh, -s, s, s,  col);
 
-	mesh_set_line(mesh, 0, 1); mesh_set_line(mesh, 1, 2); mesh_set_line(mesh, 2, 3); mesh_set_line(mesh, 3, 0);
-	mesh_set_line(mesh, 4, 5); mesh_set_line(mesh, 5, 6); mesh_set_line(mesh, 6, 7); mesh_set_line(mesh, 7, 4);
-	mesh_set_line(mesh, 0, 4); 
-	mesh_set_line(mesh, 1, 5); 
-	mesh_set_line(mesh, 2, 6); 
+	mesh_set_line(mesh, 0, 1);
+	mesh_set_line(mesh, 1, 2);
+	mesh_set_line(mesh, 2, 3);
+	mesh_set_line(mesh, 3, 0);
+	mesh_set_line(mesh, 4, 5);
+	mesh_set_line(mesh, 5, 6);
+	mesh_set_line(mesh, 6, 7);
+	mesh_set_line(mesh, 7, 4);
+	mesh_set_line(mesh, 0, 4);
+	mesh_set_line(mesh, 1, 5);
+	mesh_set_line(mesh, 2, 6);
 	mesh_set_line(mesh, 3, 7);
 	gf_bbox_refresh(&mesh->bounds);
 }
@@ -397,34 +423,34 @@
 		for (i=0; i<nfacets; ++i) {
 			/*top*/
 			mesh_set_vertex(mesh, coords[i].x, coords[i].y, coords[i].z,
-								coords[i].x, 0, coords[i].z, 
-								texcoords[i].x, FIX_ONE);
+			                coords[i].x, 0, coords[i].z,
+			                texcoords[i].x, FIX_ONE);
 
 			/*bottom*/
 			mesh_set_vertex(mesh, coords[i].x, -1*coords[i].y, coords[i].z,
-								coords[i].x, 0, coords[i].z, 
-								texcoords[i].x, 0);
+			                coords[i].x, 0, coords[i].z,
+			                texcoords[i].x, 0);
 
 
 			/*top circle is counterclockwise, reverse coords*/
 			if (i) {
-				mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-1, mesh->v_count-3); 
-				mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-2, mesh->v_count-1); 
+				mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-1, mesh->v_count-3);
+				mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-2, mesh->v_count-1);
 			}
 		}
 
 		/*top*/
 		mesh_set_vertex(mesh, coords[0].x, coords[0].y, coords[0].z,
-							coords[0].x, 0, coords[0].z, 
-							texcoords[0].x - FIX_ONE, FIX_ONE);
+		                coords[0].x, 0, coords[0].z,
+		                texcoords[0].x - FIX_ONE, FIX_ONE);
 
 		/*bottom*/
 		mesh_set_vertex(mesh, coords[0].x, -1*coords[0].y, coords[0].z,
-							coords[0].x, 0, coords[0].z, 
-							texcoords[0].x - FIX_ONE, 0);
+		                coords[0].x, 0, coords[0].z,
+		                texcoords[0].x - FIX_ONE, 0);
 
-		mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-1, mesh->v_count-3); 
-		mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-2, mesh->v_count-1); 
+		mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-1, mesh->v_count-3);
+		mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-2, mesh->v_count-1);
 	}
 
 	if (bottom) {
@@ -435,39 +461,39 @@
 		c_idx = mesh->v_count-1;
 		for (i=0; i<nfacets; ++i, angle += aincr) {
 			mesh_set_vertex(mesh, coords[i].x, -1*coords[i].y, coords[i].z,
-							0, -FIX_ONE, 0, 
-							(FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
+			                0, -FIX_ONE, 0,
+			                (FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
 			if (i) mesh_set_triangle(mesh, c_idx, mesh->v_count-2, mesh->v_count-1);
 		}
 
 		mesh_set_vertex(mesh, coords[0].x, -1*coords[0].y, coords[0].z,
-						0, -FIX_ONE, 0, 
-						(FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
+		                0, -FIX_ONE, 0,
+		                (FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
 		mesh_set_triangle(mesh, c_idx, mesh->v_count-2, mesh->v_count-1);
 	}
 
-    if (top) {
-        Fixed aincr = GF_2PI / nfacets;
-        Fixed angle = GF_PI + aincr;
+	if (top) {
+		Fixed aincr = GF_2PI / nfacets;
+		Fixed angle = GF_PI + aincr;
 
 		mesh_set_vertex(mesh, 0, height/2, 0, 0, FIX_ONE, 0, FIX_ONE/2, FIX_ONE/2);
-        c_idx = mesh->v_count-1;
-        for (i=nfacets; i>0; --i, angle += aincr) {
+		c_idx = mesh->v_count-1;
+		for (i=nfacets; i>0; --i, angle += aincr) {
 
 			mesh_set_vertex(mesh, coords[i - 1].x, coords[i - 1].y, coords[i - 1].z,
-							0, FIX_ONE, 0,
-							(FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
+			                0, FIX_ONE, 0,
+			                (FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
 			if (i) mesh_set_triangle(mesh, c_idx, mesh->v_count-2, mesh->v_count-1);
-        }
+		}
 		mesh_set_vertex(mesh, coords[nfacets - 1].x, coords[nfacets - 1].y, coords[nfacets - 1].z,
-						0, FIX_ONE, 0,
-						(FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
+		                0, FIX_ONE, 0,
+		                (FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
 		mesh_set_triangle(mesh, c_idx, mesh->v_count-2, mesh->v_count-1);
-    }
+	}
 	gf_free(texcoords);
 	gf_free(coords);
 
-    if (top && bottom && side) mesh->flags |= MESH_IS_SOLID;
+	if (top && bottom && side) mesh->flags |= MESH_IS_SOLID;
 
 	mesh->bounds.min_edge.x = mesh->bounds.min_edge.z = -radius;
 	mesh->bounds.max_edge.x = mesh->bounds.max_edge.z = radius;
@@ -481,18 +507,18 @@
 #define CONE_SUBDIV	24
 void mesh_new_cone(GF_Mesh *mesh, Fixed height, Fixed radius, Bool bottom, Bool side, Bool low_res)
 {
-    u32 nfacets, i, c_idx;
-    SFVec3f *coords;
+	u32 nfacets, i, c_idx;
+	SFVec3f *coords;
 	SFVec2f *texcoords;
 
 	mesh_reset(mesh);
-    if (!bottom && !side) return;
+	if (!bottom && !side) return;
 
-    nfacets = CONE_SUBDIV;
-    if (low_res) nfacets /= HIGH_SPEED_RATIO;
-    coords = (SFVec3f*)gf_malloc(sizeof(SFVec3f) * nfacets);
+	nfacets = CONE_SUBDIV;
+	if (low_res) nfacets /= HIGH_SPEED_RATIO;
+	coords = (SFVec3f*)gf_malloc(sizeof(SFVec3f) * nfacets);
 	texcoords = (SFVec2f*)gf_malloc(sizeof(SFVec2f) * nfacets);
-	
+
 	compute_cylinder(height, radius, nfacets, coords, texcoords);
 
 	if (side) {
@@ -500,26 +526,26 @@
 
 		for (i = 0; i < nfacets; ++i) {
 			/*top*/
-			mesh_set_vertex(mesh, 0, coords[i].y, 0, 
-							coords[i].x, Ny, coords[i].z,
-							texcoords[i].x, FIX_ONE);
+			mesh_set_vertex(mesh, 0, coords[i].y, 0,
+			                coords[i].x, Ny, coords[i].z,
+			                texcoords[i].x, FIX_ONE);
 
 			/*base*/
-			mesh_set_vertex(mesh, coords[i].x, -1*coords[i].y, coords[i].z, 
-							coords[i].x, Ny, coords[i].z,
-							texcoords[i].x, 0);
+			mesh_set_vertex(mesh, coords[i].x, -1*coords[i].y, coords[i].z,
+			                coords[i].x, Ny, coords[i].z,
+			                texcoords[i].x, 0);
 			if (i) {
-				mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-1, mesh->v_count-3); 
+				mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-1, mesh->v_count-3);
 			}
 		}
 		/*top*/
 		mesh_set_vertex(mesh, 0, coords[0].y, 0, coords[0].x, Ny, coords[0].z, texcoords[0].x - FIX_ONE, FIX_ONE);
 		/*base*/
-		mesh_set_vertex(mesh, coords[0].x, -1*coords[0].y, coords[0].z, 
-						coords[0].x, Ny, coords[0].z,
-						texcoords[0].x - FIX_ONE, 0);
+		mesh_set_vertex(mesh, coords[0].x, -1*coords[0].y, coords[0].z,
+		                coords[0].x, Ny, coords[0].z,
+		                texcoords[0].x - FIX_ONE, 0);
 
-		mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-1, mesh->v_count-3); 
+		mesh_set_triangle(mesh, mesh->v_count-4, mesh->v_count-1, mesh->v_count-3);
 	}
 
 	if (bottom) {
@@ -530,21 +556,21 @@
 		c_idx = mesh->v_count - 1;
 		for (i=0; i<nfacets; ++i, angle += aincr) {
 			mesh_set_vertex(mesh, coords[i].x, -1*coords[i].y, coords[i].z,
-									0, -FIX_ONE, 0,
-									(FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
+			                0, -FIX_ONE, 0,
+			                (FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
 
-			if (i) 
-				mesh_set_triangle(mesh, c_idx, mesh->v_count-2, mesh->v_count-1); 
+			if (i)
+				mesh_set_triangle(mesh, c_idx, mesh->v_count-2, mesh->v_count-1);
 		}
 		mesh_set_vertex(mesh, coords[0].x, -1*coords[0].y, coords[0].z,
-									0, -FIX_ONE, 0,
-									(FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
-		mesh_set_triangle(mesh, c_idx, mesh->v_count-2, mesh->v_count-1); 
+		                0, -FIX_ONE, 0,
+		                (FIX_ONE + gf_sin(angle))/2, FIX_ONE - (FIX_ONE + gf_cos(angle))/2);
+		mesh_set_triangle(mesh, c_idx, mesh->v_count-2, mesh->v_count-1);
 	}
 	gf_free(texcoords);
 	gf_free(coords);
 
-    if (bottom && side) mesh->flags |= MESH_IS_SOLID;
+	if (bottom && side) mesh->flags |= MESH_IS_SOLID;
 
 	mesh->bounds.min_edge.x = mesh->bounds.min_edge.z = -radius;
 	mesh->bounds.max_edge.x = mesh->bounds.max_edge.z = radius;
@@ -561,63 +587,63 @@
 	Fixed r, angle, x, y, z;
 	u32 i, j;
 
-    for (i=0; i<num_steps; i++) {
-        angle = (i * GF_PI / (num_steps-1) ) - GF_PI2;
-        y = gf_sin(angle);
-        r = gf_sqrt(FIX_ONE - gf_mulfix(y, y));
-        for (j = 0; j < num_steps; j++) {
-            angle = GF_2PI * j / num_steps - GF_PI2;
-            x = gf_mulfix(gf_cos(angle), r);
-            z = gf_mulfix(gf_sin(angle), r);
-            coords[i * num_steps + j].x = gf_mulfix(radius, x);
-            coords[i * num_steps + j].y = gf_mulfix(radius, y);
-            coords[i * num_steps + j].z = gf_mulfix(radius, z);
+	for (i=0; i<num_steps; i++) {
+		angle = (i * GF_PI / (num_steps-1) ) - GF_PI2;
+		y = gf_sin(angle);
+		r = gf_sqrt(FIX_ONE - gf_mulfix(y, y));
+		for (j = 0; j < num_steps; j++) {
+			angle = GF_2PI * j / num_steps - GF_PI2;
+			x = gf_mulfix(gf_cos(angle), r);
+			z = gf_mulfix(gf_sin(angle), r);
+			coords[i * num_steps + j].x = gf_mulfix(radius, x);
+			coords[i * num_steps + j].y = gf_mulfix(radius, y);
+			coords[i * num_steps + j].z = gf_mulfix(radius, z);
 			texcoords[i * num_steps + j].x = FIX_ONE - (j+1)*FIX_ONE/num_steps;
 			texcoords[i * num_steps + j].y = i*FIX_ONE/num_steps;
-        }
-    }
+		}
+	}
 }
 
-#define SPHERE_SUBDIV	12
+#define SPHERE_SUBDIV	24
 void mesh_new_sphere(GF_Mesh *mesh, Fixed radius, Bool low_res)
 {
 	u32 i, j, num_steps, npts;
 	SFVec3f *coords;
 	SFVec2f *texcoords;
-	
+
 	num_steps = SPHERE_SUBDIV;
 	if (low_res) num_steps /= 2;
-    npts = num_steps * num_steps;
+	npts = num_steps * num_steps;
 
 	coords = (SFVec3f*)gf_malloc(sizeof(SFVec3f)*npts);
 	texcoords = (SFVec2f*)gf_malloc(sizeof(SFVec2f)*npts);
 	compute_sphere(radius, coords, texcoords, num_steps);
 
-    for (i=0; i<num_steps-1; i++) {
-        u32 n = i * num_steps;
+	for (i=0; i<num_steps-1; i++) {
+		u32 n = i * num_steps;
 
-        for (j=0; j<num_steps; j++) {
-			mesh_set_vertex(mesh, coords[n + j + num_steps].x, coords[n + j + num_steps].y, coords[n + j + num_steps].z, 
-								coords[n + j + num_steps].x, coords[n + j + num_steps].y, coords[n + j + num_steps].z,
-								texcoords[n + j + num_steps].x, texcoords[n + j + num_steps].y);
+		for (j=0; j<num_steps; j++) {
+			mesh_set_vertex(mesh, coords[n + j + num_steps].x, coords[n + j + num_steps].y, coords[n + j + num_steps].z,
+			                coords[n + j + num_steps].x, coords[n + j + num_steps].y, coords[n + j + num_steps].z,
+			                texcoords[n + j + num_steps].x, texcoords[n + j + num_steps].y);
 
-			mesh_set_vertex(mesh, coords[n + j].x, coords[n + j].y, coords[n + j].z, 
-								coords[n + j].x, coords[n + j].y, coords[n + j].z,
-								texcoords[n + j].x, texcoords[n + j].y);
+			mesh_set_vertex(mesh, coords[n + j].x, coords[n + j].y, coords[n + j].z,
+			                coords[n + j].x, coords[n + j].y, coords[n + j].z,
+			                texcoords[n + j].x, texcoords[n + j].y);
 
 			if (j) {
 				mesh_set_triangle(mesh, mesh->v_count-3, mesh->v_count-4, mesh->v_count-2);
 				mesh_set_triangle(mesh, mesh->v_count-3, mesh->v_count-2, mesh->v_count-1);
 			}
 
-        }
-		mesh_set_vertex(mesh, coords[n + num_steps].x, coords[n + num_steps].y, coords[n + num_steps].z, 
-							coords[n + num_steps].x, coords[n + num_steps].y, coords[n  + num_steps].z,
-							0/*FIX_ONE*/, texcoords[n + num_steps].y);
-		mesh_set_vertex(mesh, coords[n].x, coords[n].y, coords[n].z, 
-							coords[n].x, coords[n].y, coords[n].z,
-							0/*FIX_ONE*/, texcoords[n].y);
- 		mesh_set_triangle(mesh, mesh->v_count-3, mesh->v_count-4, mesh->v_count-2);
+		}
+		mesh_set_vertex(mesh, coords[n + num_steps].x, coords[n + num_steps].y, coords[n + num_steps].z,
+		                coords[n + num_steps].x, coords[n + num_steps].y, coords[n  + num_steps].z,
+		                0/*FIX_ONE*/, texcoords[n + num_steps].y);
+		mesh_set_vertex(mesh, coords[n].x, coords[n].y, coords[n].z,
+		                coords[n].x, coords[n].y, coords[n].z,
+		                0/*FIX_ONE*/, texcoords[n].y);
+		mesh_set_triangle(mesh, mesh->v_count-3, mesh->v_count-4, mesh->v_count-2);
 		mesh_set_triangle(mesh, mesh->v_count-3, mesh->v_count-2, mesh->v_count-1);
 	}
 
@@ -652,12 +678,17 @@
 	mesh_set_vertex(mesh, x+size.x, y,  0,  0,  0,  FIX_ONE, FIX_ONE, tmax);
 	mesh_set_vertex(mesh, x,  y,  0,  0,  0,  FIX_ONE, 0, tmax);
 
-	mesh_set_triangle(mesh, 0, 1, 2); mesh_set_triangle(mesh, 0, 2, 3);
-	
+	mesh_set_triangle(mesh, 0, 1, 2);
+	mesh_set_triangle(mesh, 0, 2, 3);
+
 	mesh->flags |= MESH_IS_2D;
 
-	mesh->bounds.min_edge.x = x; mesh->bounds.min_edge.y = y-size.y; mesh->bounds.min_edge.z = 0;
-	mesh->bounds.max_edge.x = x+size.x; mesh->bounds.max_edge.y = y; mesh->bounds.max_edge.z = 0;
+	mesh->bounds.min_edge.x = x;
+	mesh->bounds.min_edge.y = y-size.y;
+	mesh->bounds.min_edge.z = 0;
+	mesh->bounds.max_edge.x = x+size.x;
+	mesh->bounds.max_edge.y = y;
+	mesh->bounds.max_edge.z = 0;
 	gf_bbox_refresh(&mesh->bounds);
 }
 
@@ -671,7 +702,7 @@
 	/*no begin/end draw since we always use generic 2D node drawing methods*/
 	end = GF_2PI;
 	step = end / ELLIPSE_SUBDIV;
-    if (low_res) step *= HIGH_SPEED_RATIO;
+	if (low_res) step *= HIGH_SPEED_RATIO;
 
 	mesh_reset(mesh);
 
@@ -681,18 +712,22 @@
 		cosa = gf_cos(cur);
 		sina = gf_sin(cur);
 
-		mesh_set_vertex(mesh, gf_mulfix(a_dia, cosa), gf_mulfix(b_dia, sina), 0, 
-								0, 0, FIX_ONE, 
-								(FIX_ONE + cosa)/2, (FIX_ONE + sina)/2);
+		mesh_set_vertex(mesh, gf_mulfix(a_dia, cosa), gf_mulfix(b_dia, sina), 0,
+		                0, 0, FIX_ONE,
+		                (FIX_ONE + cosa)/2, (FIX_ONE + sina)/2);
 
-		if (cur) mesh_set_triangle(mesh, 0, mesh->v_count-2, mesh->v_count-1); 
+		if (cur) mesh_set_triangle(mesh, 0, mesh->v_count-2, mesh->v_count-1);
 	}
 	mesh_set_vertex(mesh, a_dia, 0, 0, 0, 0, FIX_ONE, FIX_ONE, FIX_ONE/2);
-	mesh_set_triangle(mesh, 0, mesh->v_count-2, mesh->v_count-1); 
+	mesh_set_triangle(mesh, 0, mesh->v_count-2, mesh->v_count-1);
 
 	mesh->flags |= MESH_IS_2D;
-	mesh->bounds.min_edge.x = -a_dia; mesh->bounds.min_edge.y = -b_dia; mesh->bounds.min_edge.z = 0;
-	mesh->bounds.max_edge.x = a_dia; mesh->bounds.max_edge.y = b_dia; mesh->bounds.max_edge.z = 0;
+	mesh->bounds.min_edge.x = -a_dia;
+	mesh->bounds.min_edge.y = -b_dia;
+	mesh->bounds.min_edge.z = 0;
+	mesh->bounds.max_edge.x = a_dia;
+	mesh->bounds.max_edge.y = b_dia;
+	mesh->bounds.max_edge.z = 0;
 	gf_bbox_refresh(&mesh->bounds);
 }
 
@@ -739,8 +774,12 @@
 					mesh_set_triangle(mesh, 0, i, i+1);
 				}
 			}
-			mesh->bounds.min_edge.x = bounds.x; mesh->bounds.min_edge.y = bounds.y-bounds.height; mesh->bounds.min_edge.z = 0;
-			mesh->bounds.max_edge.x = bounds.x+bounds.width; mesh->bounds.max_edge.y = bounds.y; mesh->bounds.max_edge.z = 0;
+			mesh->bounds.min_edge.x = bounds.x;
+			mesh->bounds.min_edge.y = bounds.y-bounds.height;
+			mesh->bounds.min_edge.z = 0;
+			mesh->bounds.max_edge.x = bounds.x+bounds.width;
+			mesh->bounds.max_edge.y = bounds.y;
+			mesh->bounds.max_edge.z = 0;
 			gf_bbox_refresh(&mesh->bounds);
 			return;
 		default:
@@ -793,12 +832,12 @@
 	if (colorRGB && ((u32) index < colorRGB->color.count) ) COL_TO_RGBA(thecol, colorRGB->color.vals[index])	\
 	else if (colorRGBA && (u32) index < colorRGBA->color.count) thecol = colorRGBA->color.vals[index]; \
 	} \
-
+ 
 void mesh_new_ils(GF_Mesh *mesh, GF_Node *__coord, MFInt32 *coordIndex, GF_Node *__color, MFInt32 *colorIndex, Bool colorPerVertex, Bool do_close)
 {
 	u32 i, n, count, c_count, col_count;
 	u32 index;
-	u32 first_idx, last_idx; 
+	u32 first_idx, last_idx;
 	Bool move_to;
 	SFVec3f pt;
 	SFColorRGBA colRGBA;
@@ -824,7 +863,7 @@
 
 	count = coordIndex->count;
 	has_coord = count ? 1 : 0;
-	if (!has_coord) count = c_count; 
+	if (!has_coord) count = c_count;
 
 	if (!colorIndex->vals) colorIndex = coordIndex;
 	col_count = colorIndex->count ? colorIndex->count : c_count;
@@ -843,7 +882,7 @@
 #endif
 		{
 #ifndef GPAC_DISABLE_X3D
- 			colorRGBA = NULL;
+			colorRGBA = NULL;
 #endif
 			has_color = (colorRGB->color.count) ? 1 : 0;
 		}
@@ -952,7 +991,7 @@
 		if (gf_node_get_tag(__color)==TAG_X3D_ColorRGBA) {
 			colorRGB = NULL;
 			has_color = (colorRGBA->color.count) ? 1 : 0;
-		} else 
+		} else
 #endif
 		{
 #ifndef GPAC_DISABLE_X3D
@@ -1023,8 +1062,8 @@
 	pi->face_count++;
 }
 
-static GFINLINE SFVec3f smooth_face_normals(struct pt_info *pts, u32 nb_pts, struct face_info *faces, u32 nb_faces, 
-								   u32 pt_idx_in_face, u32 face_idx, Fixed creaseAngleCos)
+static GFINLINE SFVec3f smooth_face_normals(struct pt_info *pts, u32 nb_pts, struct face_info *faces, u32 nb_faces,
+        u32 pt_idx_in_face, u32 face_idx, Fixed creaseAngleCos)
 {
 	u32 i=0;
 	SFVec3f nor;
@@ -1050,12 +1089,12 @@
 		if (idx<array->count && (array->vals[idx]>=0) ) index = array->vals[idx];	\
 		else if (idx<c_count) index = idx;	\
 		else index = 0;	\
-
-void mesh_new_ifs_intern(GF_Mesh *mesh, GF_Node *__coord, MFInt32 *coordIndex, 
-							GF_Node *__color, MFInt32 *colorIndex, Bool colorPerVertex, 
-							GF_Node *__normal, MFInt32 *normalIndex, Bool normalPerVertex, 
-							GF_Node *__texCoords, MFInt32 *texCoordIndex,
-							Fixed creaseAngle)
+ 
+void mesh_new_ifs_intern(GF_Mesh *mesh, GF_Node *__coord, MFInt32 *coordIndex,
+                         GF_Node *__color, MFInt32 *colorIndex, Bool colorPerVertex,
+                         GF_Node *__normal, MFInt32 *normalIndex, Bool normalPerVertex,
+                         GF_Node *__texCoords, MFInt32 *texCoordIndex,
+                         Fixed creaseAngle)
 {
 	u32 i, n, count, c_count, nor_count;
 	u32 index;
@@ -1180,7 +1219,7 @@
 
 	count = coordIndex->count;
 	has_coord = count ? 1 : 0;
-	if (!has_coord) count = c_count; 
+	if (!has_coord) count = c_count;
 
 	smooth_normals = (!has_normal && coord && (creaseAngle > FIX_EPSILON)) ? 1 : 0;
 
@@ -1195,7 +1234,7 @@
 		/*don't forget last face*/
 		if (coordIndex->vals[count-1] != -1) face_count++;
 	}
-	
+
 	faces = (GF_Mesh**)gf_malloc(sizeof(GF_Mesh *)*face_count);
 	for (i=0; i<face_count; i++) {
 		faces[i] = new_mesh();
@@ -1203,7 +1242,7 @@
 	}
 	faces_info = NULL;
 	pts_info = NULL;
-	
+
 	/*alloc face & normals tables*/
 	if (smooth_normals) {
 		faces_info = (struct face_info*)gf_malloc(sizeof(struct face_info)*face_count);
@@ -1289,7 +1328,7 @@
 				else if (t_axis==1) tx.y = gf_divfix(v.y, bounds.y);
 				else if (t_axis==2) tx.y = gf_divfix(v.z, bounds.z);
 			}
-			
+
 			mesh_set_vertex_v(faces[cur_face], pt, nor, tx, colRGBA);
 		}
 	}
@@ -1303,10 +1342,12 @@
 			if (creaseAngle>GF_PI) cosCrease = -FIX_ONE;
 			else cosCrease = gf_cos(creaseAngle);
 
-			for (i=0; i<face_count; i++) { for (j=0; j<faces[i]->v_count; j++) {
-					SFVec3f n = smooth_face_normals(pts_info, c_count, faces_info, face_count, j, i, cosCrease); 
+			for (i=0; i<face_count; i++) {
+				for (j=0; j<faces[i]->v_count; j++) {
+					SFVec3f n = smooth_face_normals(pts_info, c_count, faces_info, face_count, j, i, cosCrease);
 					MESH_SET_NORMAL(faces[i]->vertices[j], n);
-			} } 
+				}
+			}
 
 			if (faces_info) {
 				for (i=0; i<face_count; i++) if (faces_info[i].idx) gf_free(faces_info[i].idx);
@@ -1318,14 +1359,14 @@
 			}
 			mesh->flags |= MESH_IS_SMOOTHED;
 		} else {
-			for (i=0; i<face_count; i++) { 
+			for (i=0; i<face_count; i++) {
 				SFVec3f v1, v2, n;
 				gf_vec_diff(v1, faces[i]->vertices[1].pos, faces[i]->vertices[0].pos);
 				gf_vec_diff(v2, faces[i]->vertices[2].pos, faces[i]->vertices[0].pos);
 				n = gf_vec_cross(v1, v2);
 				if (!n.x && !n.y && !n.z) n.z = FIX_ONE;
 				else gf_vec_norm(&n);
-				for (j=0; j<faces[i]->v_count; j++) 
+				for (j=0; j<faces[i]->v_count; j++)
 					MESH_SET_NORMAL(faces[i]->vertices[j], n);
 			}
 		}
@@ -1354,8 +1395,8 @@
 {
 	M_IndexedFaceSet2D *ifs2D = (M_IndexedFaceSet2D *)node;
 	mesh_new_ifs_intern(mesh, ifs2D->coord, &ifs2D->coordIndex,
-							ifs2D->color, &ifs2D->colorIndex, ifs2D->colorPerVertex,
-							NULL, NULL, 0, ifs2D->texCoord, &ifs2D->texCoordIndex, 0);
+	                    ifs2D->color, &ifs2D->colorIndex, ifs2D->colorPerVertex,
+	                    NULL, NULL, 0, ifs2D->texCoord, &ifs2D->texCoordIndex, 0);
 
 	mesh->flags |= MESH_IS_2D;
 }
@@ -1364,7 +1405,7 @@
 {
 	M_IndexedFaceSet *ifs = (M_IndexedFaceSet *)node;
 	mesh_new_ifs_intern(mesh, ifs->coord, &ifs->coordIndex, ifs->color, &ifs->colorIndex, ifs->colorPerVertex,
-						ifs->normal, &ifs->normalIndex, ifs->normalPerVertex, ifs->texCoord, &ifs->texCoordIndex, ifs->creaseAngle);
+	                    ifs->normal, &ifs->normalIndex, ifs->normalPerVertex, ifs->texCoord, &ifs->texCoordIndex, ifs->creaseAngle);
 
 	if (ifs->solid) mesh->flags |= MESH_IS_SOLID;
 	if (!ifs->ccw) mesh->flags |= MESH_IS_CW;
@@ -1401,7 +1442,7 @@
 		if (gf_node_get_tag(eg->color)==TAG_X3D_ColorRGBA) {
 			colorRGB = NULL;
 			has_color = colorRGBA->color.count ? 1 : 0;
-		} else 
+		} else
 #endif
 		{
 #ifndef GPAC_DISABLE_X3D
@@ -1449,8 +1490,10 @@
 				gf_vec_diff(v2, mesh->vertices[i+z1+1].pos, mesh->vertices[i+z0+1].pos);
 				n = gf_vec_cross(v1, v2);
 				gf_vec_norm(&n);
-				MESH_SET_NORMAL(mesh->vertices[i+z0], n); MESH_SET_NORMAL(mesh->vertices[i+z0+1], n);
-				MESH_SET_NORMAL(mesh->vertices[i+z1], n); MESH_SET_NORMAL(mesh->vertices[i+z1+1], n);
+				MESH_SET_NORMAL(mesh->vertices[i+z0], n);
+				MESH_SET_NORMAL(mesh->vertices[i+z0+1], n);
+				MESH_SET_NORMAL(mesh->vertices[i+z1], n);
+				MESH_SET_NORMAL(mesh->vertices[i+z1+1], n);
 			}
 		}
 		mesh->mesh_type = MESH_TRIANGLES;
@@ -1475,13 +1518,13 @@
 		for (i = 0; i < xDimension-1; i++) {
 			u32 k, l;
 			/*get face color*/
-            if (has_color && !eg->colorPerVertex) {
+			if (has_color && !eg->colorPerVertex) {
 				idx = i + j * (xDimension-1);
 #ifndef GPAC_DISABLE_X3D
 				MESH_GET_COL(rgba, idx);
 #endif
 				vx.color = MESH_MAKE_COL(rgba);
-            }
+			}
 			/*get face normal*/
 			if (has_normal && !eg->normalPerVertex) {
 				idx = i + j * (xDimension-1);
@@ -1556,8 +1599,10 @@
 					gf_vec_diff(v2, mesh->vertices[pt_idx+3].pos, mesh->vertices[pt_idx+1].pos);
 					n = gf_vec_cross(v1, v2);
 					gf_vec_norm(&n);
-					MESH_SET_NORMAL(mesh->vertices[pt_idx+0], n); MESH_SET_NORMAL(mesh->vertices[pt_idx+1], n);
-					MESH_SET_NORMAL(mesh->vertices[pt_idx+2], n); MESH_SET_NORMAL(mesh->vertices[pt_idx+3], n);
+					MESH_SET_NORMAL(mesh->vertices[pt_idx+0], n);
+					MESH_SET_NORMAL(mesh->vertices[pt_idx+1], n);
+					MESH_SET_NORMAL(mesh->vertices[pt_idx+2], n);
+					MESH_SET_NORMAL(mesh->vertices[pt_idx+3], n);
 				}
 				pt_idx+=4;
 			}
@@ -1571,10 +1616,12 @@
 		if (eg->creaseAngle>GF_PI) cosCrease = -FIX_ONE;
 		else cosCrease = gf_cos(eg->creaseAngle);
 
-		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); 
-			MESH_SET_NORMAL(faces[i]->vertices[j], n);
-		} } 
+		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);
+				MESH_SET_NORMAL(faces[i]->vertices[j], n);
+			}
+		}
 
 		if (faces_info) {
 			for (i=0; i<face_count; i++) if (faces_info[i].idx) gf_free(faces_info[i].idx);
@@ -1586,7 +1633,7 @@
 		}
 		mesh->flags |= MESH_IS_SMOOTHED;
 
-	
+
 		for (i=0; i<face_count; i++) {
 			if (faces[i]->v_count) {
 				u32 init_idx;
@@ -1639,9 +1686,9 @@
 			register_face_in_point(&pts_info[pidx], fidx);	\
 		} \
 	} \
+ 
 
-
-#define NEAR_ZERO(__x) (ABS(__x)<=FIX_EPSILON) 
+#define NEAR_ZERO(__x) (ABS(__x)<=FIX_EPSILON)
 
 static void mesh_extrude_path_intern(GF_Mesh *mesh, GF_Path *path, MFVec3f *thespine, Fixed creaseAngle, Fixed min_cx, Fixed min_cy, Fixed width_cx, Fixed width_cy, Bool begin_cap, Bool end_cap, MFRotation *spine_ori, MFVec2f *spine_scale, Bool tx_along_spine)
 {
@@ -1688,11 +1735,11 @@
 	begin_face = end_face = 0;
 	face_spines = face_count = (thespine->count-1)*faces_per_cross;
 	if (begin_cap) {
-		begin_face = face_count; 
+		begin_face = face_count;
 		face_count ++;
 	}
 	if (end_cap) {
-		end_face = face_count; 
+		end_face = face_count;
 		face_count ++;
 	}
 
@@ -1703,7 +1750,7 @@
 	for (i=0; i<face_count; i++) faces[i] = new_mesh();
 	faces_info = NULL;
 	pts_info = NULL;
-	
+
 	/*alloc face & normals tables*/
 	if (smooth_normals) {
 		faces_info = (struct face_info*)gf_malloc(sizeof(struct face_info)*face_count);
@@ -1712,7 +1759,7 @@
 		memset(pts_info, 0, sizeof(struct pt_info)*pt_count);
 	}
 
-	
+
 	spine = thespine->vals;
 	nb_spine = thespine->count;
 	SCPs = (SCP *)gf_malloc(sizeof(SCP) * nb_spine);
@@ -1720,7 +1767,7 @@
 	SCPi = (SCPInfo *) gf_malloc(sizeof(SCPInfo) * nb_spine);
 	memset(SCPi, 0, sizeof(SCPInfo) * nb_spine);
 
-	/*collect all # SCPs: 
+	/*collect all # SCPs:
 	1- if a spine has identical consecutive points with # orientation, these points use the same SCPs
 	2- if 2 segs of the spine are colinear, they also use the same SCP
 	*/
@@ -1744,7 +1791,7 @@
 		if (gf_vec_equal(SCPi[nb_scp-1].pt, spine[i])) {
 			SCPi[nb_scp-1].max_idx = i;
 			continue;
-		} 
+		}
 		/*last point in spine*/
 		if (i+1 == nb_spine) {
 			nb_scp++;
@@ -1770,9 +1817,15 @@
 
 	/*all colinear!!*/
 	if (nb_scp<=2) {
-		SCPi[0].xaxis.x = FIX_ONE; SCPi[0].xaxis.y = 0; SCPi[0].xaxis.z = 0;
-		SCPi[0].yaxis.x = 0; SCPi[0].yaxis.y = FIX_ONE; SCPi[0].yaxis.z = 0;
-		SCPi[0].zaxis.x = 0; SCPi[0].zaxis.y = 0; SCPi[0].zaxis.z = FIX_ONE;
+		SCPi[0].xaxis.x = FIX_ONE;
+		SCPi[0].xaxis.y = 0;
+		SCPi[0].xaxis.z = 0;
+		SCPi[0].yaxis.x = 0;
+		SCPi[0].yaxis.y = FIX_ONE;
+		SCPi[0].yaxis.z = 0;
+		SCPi[0].zaxis.x = 0;
+		SCPi[0].zaxis.y = 0;
+		SCPi[0].zaxis.z = FIX_ONE;
 		/*compute rotation from (0, 1, 0) to spine_vec*/
 		if (!check_first_spine_vec) {
 			Fixed alpha, gamma;
@@ -1838,7 +1891,7 @@
 			SCPs[i].yaxis = SCPi[0].yaxis;
 			SCPs[i].zaxis = SCPi[0].zaxis;
 		}
-	} 
+	}
 	/*not colinear*/
 	else {
 		assert(nb_scp<=nb_spine);
@@ -1876,7 +1929,9 @@
 		for (i=0; i<nb_scp; i++) {
 			/*compute X, norm vectors*/
 			SCPi[i].xaxis = gf_vec_cross(SCPi[i].yaxis, SCPi[i].zaxis);
-			gf_vec_norm(&SCPi[i].xaxis); gf_vec_norm(&SCPi[i].yaxis); gf_vec_norm(&SCPi[i].zaxis);
+			gf_vec_norm(&SCPi[i].xaxis);
+			gf_vec_norm(&SCPi[i].yaxis);
+			gf_vec_norm(&SCPi[i].zaxis);
 			/*assign SCPs*/
 			while (j<=SCPi[i].max_idx) {
 				SCPs[j].xaxis = SCPi[i].xaxis;
@@ -1891,7 +1946,8 @@
 	SCPbegin = SCPs[0];
 	SCPend = SCPs[nb_spine-1];
 
-	r.x = r.q = r.z = 0; r.y = FIX_ONE;
+	r.x = r.q = r.z = 0;
+	r.y = FIX_ONE;
 	scale.x = scale.y = FIX_ONE;
 
 	cur_spine = 0;
@@ -1909,7 +1965,9 @@
 
 			/*compute X*/
 			curSCP->xaxis = gf_vec_cross(curSCP->yaxis, curSCP->zaxis);
-			gf_vec_norm(&curSCP->xaxis); gf_vec_norm(&curSCP->yaxis); gf_vec_norm(&curSCP->zaxis);
+			gf_vec_norm(&curSCP->xaxis);
+			gf_vec_norm(&curSCP->yaxis);
+			gf_vec_norm(&curSCP->zaxis);
 
 			if (spine_ori && (i<spine_ori->count)) r = spine_ori->vals[i];
 			if (spine_scale && (i<spine_scale->count)) scale = spine_scale->vals[i];
@@ -1989,7 +2047,7 @@
 					/*previous face "below" face*/
 					if (k) REGISTER_POINT_FACE(k-1 + cur_face_in_cross + (i-1)*faces_per_cross);
 				}
-				
+
 				if (k+1<nb_pts) {
 					v1.z = 0;
 					v1.x = path->points[k+1+cur].x - path->points[k+cur].x;
@@ -2007,7 +2065,7 @@
 			cur_spine += gf_vec_len(v1);
 		}
 	}
-	
+
 	/*generate triangles & normals*/
 	for (i=0; i<face_spines; i++) {
 		mesh_set_triangle(faces[i], 0, 1, 3);
@@ -2151,10 +2209,12 @@
 		if (creaseAngle>GF_PI) cosCrease = -FIX_ONE;
 		else cosCrease = gf_cos(creaseAngle);
 
-		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); 
+		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);
 				MESH_SET_NORMAL(faces[i]->vertices[j], n);
-		} } 
+			}
+		}
 
 		if (faces_info) {
 			for (i=0; i<face_count; i++) if (faces_info[i].idx) gf_free(faces_info[i].idx);
@@ -2224,14 +2284,14 @@
 	gf_free(faces);
 	gf_free(SCPs);
 
-	/*FIXME: this is correct except we need to handle path cw/ccw - until then no possibility 
+	/*FIXME: this is correct except we need to handle path cw/ccw - until then no possibility
 	to get correct lighting*/
-/*
-	if (path->subpathlen && path->subpath[0]->closed && ((begin_face && end_face) || spine_closed)) 
-		mesh->flags |= MESH_IS_SOLID;
-	else 
-		mesh->flags &= ~MESH_IS_SOLID;
-*/
+	/*
+		if (path->subpathlen && path->subpath[0]->closed && ((begin_face && end_face) || spine_closed))
+			mesh->flags |= MESH_IS_SOLID;
+		else
+			mesh->flags &= ~MESH_IS_SOLID;
+	*/
 }
 
 void mesh_extrude_path_ext(GF_Mesh *mesh, GF_Path *path, MFVec3f *thespine, Fixed creaseAngle, Fixed min_cx, Fixed min_cy, Fixed width_cx, Fixed width_cy, Bool begin_cap, Bool end_cap, MFRotation *spine_ori, MFVec2f *spine_scale, Bool tx_along_spine)

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mesh_collide.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mesh_collide.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,7 +32,7 @@
 	AABB tree syntax&construction code is a quick extract from OPCODE (c) Pierre Terdiman, http://www.codercorner.com/Opcode.htm
 */
 
-typedef struct 
+typedef struct
 {
 	/*max tree depth, 0 is unlimited*/
 	u32 max_depth;
@@ -55,13 +55,20 @@
 		IDX_TYPE *idx = &mesh->indices[3*node->indices[i]];
 		for (j=0; j<3; j++) {
 			SFVec3f *v = &mesh->vertices[idx[j]].pos;
-			if (mx>v->x) mx=v->x; if (Mx<v->x) Mx=v->x;
-			if (my>v->y) my=v->y; if (My<v->y) My=v->y;
-			if (mz>v->z) mz=v->z; if (Mz<v->z) Mz=v->z;
+			if (mx>v->x) mx=v->x;
+			if (Mx<v->x) Mx=v->x;
+			if (my>v->y) my=v->y;
+			if (My<v->y) My=v->y;
+			if (mz>v->z) mz=v->z;
+			if (Mz<v->z) Mz=v->z;
 		}
 	}
-	node->min.x = mx; node->min.y = my; node->min.z = mz;
-	node->max.x = Mx; node->max.y = My; node->max.z = Mz;
+	node->min.x = mx;
+	node->min.y = my;
+	node->min.z = mz;
+	node->max.x = Mx;
+	node->max.y = My;
+	node->max.z = Mz;
 }
 
 static GFINLINE u32 gf_vec_main_axis(SFVec3f v)
@@ -125,7 +132,7 @@
 	if (node->nb_idx==1) return;
 	if (node->nb_idx <= aab_par->min_tri_limit) return;
 	if (aab_par->max_depth == aab_par->depth) {
-		aab_par->depth --; 
+		aab_par->depth --;
 		return;
 	}
 	do_split = 1;
@@ -141,11 +148,14 @@
 	else if (aab_par->split_type==AABB_BALANCED) {
 		Fixed res[3];
 		num_pos = aabb_split(mesh, node, 0);
-		res[0] = gf_divfix(INT2FIX(num_pos), INT2FIX(node->nb_idx)) - FIX_ONE/2; res[0] = gf_mulfix(res[0], res[0]);
+		res[0] = gf_divfix(INT2FIX(num_pos), INT2FIX(node->nb_idx)) - FIX_ONE/2;
+		res[0] = gf_mulfix(res[0], res[0]);
 		num_pos = aabb_split(mesh, node, 1);
-		res[1] = gf_divfix(INT2FIX(num_pos), INT2FIX(node->nb_idx)) - FIX_ONE/2; res[1] = gf_mulfix(res[1], res[1]);
+		res[1] = gf_divfix(INT2FIX(num_pos), INT2FIX(node->nb_idx)) - FIX_ONE/2;
+		res[1] = gf_mulfix(res[1], res[1]);
 		num_pos = aabb_split(mesh, node, 2);
-		res[2] = gf_divfix(INT2FIX(num_pos), INT2FIX(node->nb_idx)) - FIX_ONE/2; res[2] = gf_mulfix(res[2], res[2]);;
+		res[2] = gf_divfix(INT2FIX(num_pos), INT2FIX(node->nb_idx)) - FIX_ONE/2;
+		res[2] = gf_mulfix(res[2], res[2]);;
 
 		axis = 0;
 		if (res[1] < res[axis])	axis = 1;
@@ -289,14 +299,14 @@
 	/*check bbox intersection*/
 	inters = gf_ray_hit_box(ray, n->min, n->max, NULL);
 	if (!inters) return 0;
-	
+
 	if (n->pos) {
 		/*we really want to check all possible intersections to get the closest point on ray*/
 		Bool res = gf_mesh_aabb_ray_hit(mesh, n->pos, ray, closest, outPoint, outNormal, outTexCoords);
 		res += gf_mesh_aabb_ray_hit(mesh, n->neg, ray, closest, outPoint, outNormal, outTexCoords);
 		return res;
 
-	} 
+	}
 
 
 	inters_idx = 0;
@@ -307,9 +317,9 @@
 	for (i=0; i<n->nb_idx; i++) {
 		Fixed res;
 		IDX_TYPE *idx = &mesh->indices[3*n->indices[i]];
-		if (gf_ray_hit_triangle(ray, 
-					&mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
-					&res)) {
+		if (gf_ray_hit_triangle(ray,
+		                        &mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
+		                        &res)) {
 			if ((res>0) && (res<dist)) {
 				dist = res;
 				inters_idx = i;
@@ -337,9 +347,9 @@
 		}
 		if (outTexCoords) {
 			IDX_TYPE *idx = &mesh->indices[3*n->indices[inters_idx]];;
-			ray_hit_triangle_get_u_v(ray, 
-				&mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
-				&outTexCoords->x, &outTexCoords->y);
+			ray_hit_triangle_get_u_v(ray,
+			                         &mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
+			                         &outTexCoords->x, &outTexCoords->y);
 		}
 	}
 	return inters;
@@ -369,9 +379,9 @@
 	for (i=0; i<mesh->i_count; i+=3) {
 		Fixed res;
 		IDX_TYPE *idx = &mesh->indices[i];
-		if (gf_ray_hit_triangle(ray, 
-					&mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
-					&res)) {
+		if (gf_ray_hit_triangle(ray,
+		                        &mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
+		                        &res)) {
 			if ((res>0) && (res<closest)) {
 				closest = res;
 				inters_idx = i;
@@ -504,9 +514,9 @@
 		/*intersect inverse normal from position to face with face*/
 		r.dir = n;
 		gf_vec_rev(r.dir);
-		inters = mesh_collide_triangle(&r, 
-					&mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
-					&d);
+		inters = mesh_collide_triangle(&r,
+		                               &mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
+		                               &d);
 
 		if (inters) {
 			/*we're behind the face, get inverse normal*/
@@ -572,9 +582,9 @@
 		/*intersect inverse normal from position to face with face*/
 		r.dir = n;
 		gf_vec_rev(r.dir);
-		inters = mesh_collide_triangle(&r, 
-					&mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
-					&d);
+		inters = mesh_collide_triangle(&r,
+		                               &mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
+		                               &d);
 
 		if (inters) {
 			/*we're behind the face, get inverse normal*/

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mesh_tesselate.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mesh_tesselate.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -50,14 +50,18 @@
 	GLUtesselator *tess_obj;
 	GF_Mesh *mesh;
 
-	/*vertex indices: we cannot use a static array because reallocating the array will likely change memory 
+	/*vertex indices: we cannot use a static array because reallocating the array will likely change memory
 	address of indices, hence break triangulator*/
 	GF_List *vertex_index;
 } MeshTess;
 
-static void CALLBACK mesh_tess_begin(GLenum which) { assert(which==GL_TRIANGLES); }
+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_error(GLenum 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) { }
 
@@ -141,8 +145,8 @@
 	tess = gf_malloc(sizeof(MeshTess));
 	if (!tess) return;
 	memset(tess, 0, sizeof(MeshTess));
-    tess->tess_obj = gluNewTess();
-    if (!tess->tess_obj) {
+	tess->tess_obj = gluNewTess();
+	if (!tess->tess_obj) {
 		gf_free(tess);
 		return;
 	}
@@ -151,18 +155,18 @@
 	mesh_reset(mesh);
 	mesh->flags |= MESH_IS_2D;
 	if (outline_style==1) mesh->flags |= MESH_NO_TEXTURE;
-	
+
 	tess->mesh = mesh;
-    gluTessCallback(tess->tess_obj, GLU_TESS_VERTEX_DATA, (void (CALLBACK*)()) &mesh_tess_vertex);
-    gluTessCallback(tess->tess_obj, GLU_TESS_BEGIN, (void (CALLBACK*)()) &mesh_tess_begin);
-    gluTessCallback(tess->tess_obj, GLU_TESS_END, (void (CALLBACK*)()) &mesh_tess_end);
-    gluTessCallback(tess->tess_obj, GLU_TESS_COMBINE_DATA, (void (CALLBACK*)()) &mesh_tess_combine);
-    gluTessCallback(tess->tess_obj, GLU_TESS_ERROR, (void (CALLBACK*)()) &mesh_tess_error);
+	gluTessCallback(tess->tess_obj, GLU_TESS_VERTEX_DATA, (void (CALLBACK*)()) &mesh_tess_vertex);
+	gluTessCallback(tess->tess_obj, GLU_TESS_BEGIN, (void (CALLBACK*)()) &mesh_tess_begin);
+	gluTessCallback(tess->tess_obj, GLU_TESS_END, (void (CALLBACK*)()) &mesh_tess_end);
+	gluTessCallback(tess->tess_obj, GLU_TESS_COMBINE_DATA, (void (CALLBACK*)()) &mesh_tess_combine);
+	gluTessCallback(tess->tess_obj, GLU_TESS_ERROR, (void (CALLBACK*)()) &mesh_tess_error);
 	gluTessCallback(tess->tess_obj, GLU_EDGE_FLAG,(void (CALLBACK*)()) &mesh_tess_edgeflag);
 
 	if (path->flags & GF_PATH_FILL_ZERO_NONZERO) gluTessProperty(tess->tess_obj, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_NONZERO);
 
-    gluTessBeginPolygon(tess->tess_obj, tess);
+	gluTessBeginPolygon(tess->tess_obj, tess);
 	gluTessNormal(tess->tess_obj, 0, 0, 1);
 
 	gf_path_flatten(path);
@@ -197,7 +201,7 @@
 		cur+=nb_pts;
 	}
 
-    gluTessEndPolygon(tess->tess_obj);
+	gluTessEndPolygon(tess->tess_obj);
 
 	gluDeleteTess(tess->tess_obj);
 
@@ -229,7 +233,7 @@
 	if (!direction) { pt.x = - apt.pos.z; pt.y = apt.pos.y;	}	\
 	else if (direction==1) { pt.x = apt.pos.z; pt.y = apt.pos.x; }	\
 	else if (direction==2) { pt.x = apt.pos.x; pt.y = apt.pos.y; } \
-
+ 
 
 #define ConvCompare(delta)	\
     ( (delta.x > 0) ? -1 :		\
@@ -244,7 +248,7 @@
     GetPoint2D(pcur, pts[iread]); iread++;			\
     delta.x = pcur.x - pprev.x;					\
     delta.y = pcur.y - pprev.y;					\
-
+ 
 #define ConvCross(p, q) gf_mulfix(p.x,q.y) - gf_mulfix(p.y,q.x);
 
 #define ConvCheckTriple						\
@@ -265,7 +269,7 @@
     pSecond = pThird;		\
     dprev.x = dcur.x;		\
     dprev.y = dcur.y;							\
-
+ 
 u32 polygon_check_convexity(GF_Vertex *pts, u32 len, u32 direction)
 {
 	s32 curDir, thisDir = 0, dirChanges = 0, angleSign = 0;
@@ -280,46 +284,46 @@
 	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;
+	/* 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;
+	pSaveSecond = pSecond;
 	/*initial direction */
-    curDir = ConvCompare(dprev);
-    while ( iread < len) {
+	curDir = ConvCompare(dprev);
+	while ( iread < len) {
 		/* Get different point, break if no more points */
 		ConvGetPointDelta(dcur, pSecond, pThird );
 		if ( (dcur.x == 0) && (dcur.y == 0) ) continue;
 		/* Check current three points */
 		ConvCheckTriple;
-    }
+	}
 
-    /* Must check for direction changes from last vertex back to first */
+	/* Must check for direction changes from last vertex back to first */
 	/* Prepare for 'ConvexCheckTriple' */
 	GetPoint2D(pThird, pts[0]);
-    dcur.x = pThird.x - pSecond.x;
-    dcur.y = pThird.y - pSecond.y;
-    if ( ConvCompare(dcur) ) ConvCheckTriple;
+	dcur.x = pThird.x - pSecond.x;
+	dcur.y = pThird.y - pSecond.y;
+	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;
+	/* and check for direction changes back to second vertex */
+	dcur.x = pSaveSecond.x - pSecond.x;
+	dcur.y = pSaveSecond.y - pSecond.y;
 	/* Don't care about 'pThird' now */
-    ConvCheckTriple;			
+	ConvCheckTriple;
 
-    /* Decide on polygon type given accumulated status */
-    if ( dirChanges > 2 ) return GF_POLYGON_COMPLEX;
-    if ( angleSign > 0 ) return GF_POLYGON_CONVEX_CCW;
-    if ( angleSign < 0 ) return GF_POLYGON_CONVEX_CW;
-    return GF_POLYGON_CONVEX_LINE;
+	/* Decide on polygon type given accumulated status */
+	if ( dirChanges > 2 ) return GF_POLYGON_COMPLEX;
+	if ( angleSign > 0 ) return GF_POLYGON_CONVEX_CCW;
+	if ( angleSign < 0 ) return GF_POLYGON_CONVEX_CW;
+	return GF_POLYGON_CONVEX_LINE;
 }
 
 
 void TesselateFaceMesh(GF_Mesh *dest, GF_Mesh *orig)
 {
 	u32 poly_type, i, nb_pts, init_idx, direction;
-    Fixed max_nor_coord, c;
+	Fixed max_nor_coord, c;
 	SFVec3f nor;
 #ifdef GPAC_HAS_GLU
 	u32 *idx;
@@ -329,7 +333,8 @@
 
 	/*get normal*/
 	if (orig->flags & MESH_IS_2D) {
-		nor.x = nor.y = 0; nor.z = FIX_ONE;
+		nor.x = nor.y = 0;
+		nor.z = FIX_ONE;
 	} else {
 		MESH_GET_NORMAL(nor, orig->vertices[0]);
 	}
@@ -367,27 +372,27 @@
 	}
 
 #ifdef GPAC_HAS_GLU
-	
+
 	/*tesselate it*/
 	tess = gf_malloc(sizeof(MeshTess));
 	if (!tess) return;
 	memset(tess, 0, sizeof(MeshTess));
-    tess->tess_obj = gluNewTess();
-    if (!tess->tess_obj) {
+	tess->tess_obj = gluNewTess();
+	if (!tess->tess_obj) {
 		gf_free(tess);
 		return;
 	}
 	tess->vertex_index = gf_list_new();
 
 	tess->mesh = dest;
-    gluTessCallback(tess->tess_obj, GLU_TESS_VERTEX_DATA, (void (CALLBACK*)()) &mesh_tess_vertex);
-    gluTessCallback(tess->tess_obj, GLU_TESS_BEGIN, (void (CALLBACK*)()) &mesh_tess_begin);
-    gluTessCallback(tess->tess_obj, GLU_TESS_END, (void (CALLBACK*)()) &mesh_tess_end);
-    gluTessCallback(tess->tess_obj, GLU_TESS_COMBINE_DATA, (void (CALLBACK*)()) &mesh_tess_combine);
-    gluTessCallback(tess->tess_obj, GLU_TESS_ERROR, (void (CALLBACK*)()) &mesh_tess_error);
+	gluTessCallback(tess->tess_obj, GLU_TESS_VERTEX_DATA, (void (CALLBACK*)()) &mesh_tess_vertex);
+	gluTessCallback(tess->tess_obj, GLU_TESS_BEGIN, (void (CALLBACK*)()) &mesh_tess_begin);
+	gluTessCallback(tess->tess_obj, GLU_TESS_END, (void (CALLBACK*)()) &mesh_tess_end);
+	gluTessCallback(tess->tess_obj, GLU_TESS_COMBINE_DATA, (void (CALLBACK*)()) &mesh_tess_combine);
+	gluTessCallback(tess->tess_obj, GLU_TESS_ERROR, (void (CALLBACK*)()) &mesh_tess_error);
 	gluTessCallback(tess->tess_obj, GLU_EDGE_FLAG,(void (CALLBACK*)()) &mesh_tess_edgeflag);
 
-    gluTessBeginPolygon(tess->tess_obj, tess);
+	gluTessBeginPolygon(tess->tess_obj, tess);
 	gluTessBeginContour(tess->tess_obj);
 
 
@@ -404,7 +409,7 @@
 	}
 
 	gluTessEndContour(tess->tess_obj);
-    gluTessEndPolygon(tess->tess_obj);
+	gluTessEndPolygon(tess->tess_obj);
 	gluDeleteTess(tess->tess_obj);
 
 	while (gf_list_count(tess->vertex_index)) {
@@ -427,34 +432,34 @@
 	u32 *idx;
 	GLdouble vertex[3];
 	MeshTess *tess;
-	
+
 	/*tesselate it*/
 	tess = gf_malloc(sizeof(MeshTess));
 	if (!tess) return;
 	memset(tess, 0, sizeof(MeshTess));
-    tess->tess_obj = gluNewTess();
-    if (!tess->tess_obj) {
+	tess->tess_obj = gluNewTess();
+	if (!tess->tess_obj) {
 		gf_free(tess);
 		return;
 	}
 	tess->vertex_index = gf_list_new();
 
 	tess->mesh = dest;
-    gluTessCallback(tess->tess_obj, GLU_TESS_VERTEX_DATA, (void (CALLBACK*)()) &mesh_tess_vertex);
-    gluTessCallback(tess->tess_obj, GLU_TESS_BEGIN, (void (CALLBACK*)()) &mesh_tess_begin);
-    gluTessCallback(tess->tess_obj, GLU_TESS_END, (void (CALLBACK*)()) &mesh_tess_end);
-    gluTessCallback(tess->tess_obj, GLU_TESS_COMBINE_DATA, (void (CALLBACK*)()) &mesh_tess_combine);
-    gluTessCallback(tess->tess_obj, GLU_TESS_ERROR, (void (CALLBACK*)()) &mesh_tess_error);
+	gluTessCallback(tess->tess_obj, GLU_TESS_VERTEX_DATA, (void (CALLBACK*)()) &mesh_tess_vertex);
+	gluTessCallback(tess->tess_obj, GLU_TESS_BEGIN, (void (CALLBACK*)()) &mesh_tess_begin);
+	gluTessCallback(tess->tess_obj, GLU_TESS_END, (void (CALLBACK*)()) &mesh_tess_end);
+	gluTessCallback(tess->tess_obj, GLU_TESS_COMBINE_DATA, (void (CALLBACK*)()) &mesh_tess_combine);
+	gluTessCallback(tess->tess_obj, GLU_TESS_ERROR, (void (CALLBACK*)()) &mesh_tess_error);
 	gluTessCallback(tess->tess_obj, GLU_EDGE_FLAG,(void (CALLBACK*)()) &mesh_tess_edgeflag);
 
-    gluTessBeginPolygon(tess->tess_obj, tess);
+	gluTessBeginPolygon(tess->tess_obj, tess);
 	gluTessBeginContour(tess->tess_obj);
 
 
 	cur_pt_faces = 0;
 	cur_face = 0;
 	for (i=0; i<orig->v_count; i++) {
-		
+
 		if (i>= cur_pt_faces + ptsPerFaces[cur_face]) {
 			cur_pt_faces += ptsPerFaces[cur_face];
 			cur_face++;
@@ -475,7 +480,7 @@
 	}
 
 	gluTessEndContour(tess->tess_obj);
-    gluTessEndPolygon(tess->tess_obj);
+	gluTessEndPolygon(tess->tess_obj);
 	gluDeleteTess(tess->tess_obj);
 
 	while (gf_list_count(tess->vertex_index)) {

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_animstream.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_animstream.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -106,7 +106,7 @@
 {
 	animationstream_check_url(stack, as);
 	as->isActive = 1;
-	gf_node_event_out_str((GF_Node*)as, "isActive");
+	gf_node_event_out((GF_Node*)as, 6/*"isActive"*/);
 
 	gf_mo_play(stack->stream, 0, -1, 0);
 	gf_mo_set_speed(stack->stream, as->speed);
@@ -116,10 +116,10 @@
 {
 	if (as->isActive) {
 		as->isActive = 0;
-		gf_node_event_out_str((GF_Node*)as, "isActive");
+		gf_node_event_out((GF_Node*)as, 6/*"isActive"*/);
 	}
 	if (stack->stream) {
-		if (gf_mo_url_changed(stack->stream, &as->url)) 
+		if (gf_mo_url_changed(stack->stream, &as->url))
 			gf_mo_set_flag(stack->stream, GF_MO_DISPLAY_REMOVE, 1);
 		gf_mo_stop(stack->stream);
 	}
@@ -132,7 +132,7 @@
 	Double time;
 	M_AnimationStream *as = (M_AnimationStream *)st->udta;
 	AnimationStreamStack *stack = (AnimationStreamStack *)gf_node_get_private(st->udta);
-	
+
 	/*not active, store start time and speed*/
 	if ( ! as->isActive) {
 		stack->start_time = as->startTime;
@@ -142,7 +142,7 @@
 	if ((time < stack->start_time) || (stack->start_time < 0)) return;
 
 	if (animationstream_get_speed(stack, as) && as->isActive) {
-		//if stoptime is reached (>startTime) deactivate	
+		//if stoptime is reached (>startTime) deactivate
 		if ((as->stopTime > stack->start_time) && (time >= as->stopTime) ) {
 			animationstream_deactivate(stack, as);
 			return;
@@ -157,7 +157,7 @@
 	}
 
 	/*we're (about to be) active: VRML:
-	"A time-dependent node is inactive until its startTime is reached. When time now becomes greater than or 
+	"A time-dependent node is inactive until its startTime is reached. When time now becomes greater than or
 	equal to startTime, an isActive TRUE event is generated and the time-dependent node becomes active 	*/
 	if (!as->isActive && !st->needs_unregister) animationstream_activate(stack, as);
 }
@@ -170,10 +170,10 @@
 	st->compositor = compositor;
 	st->time_handle.UpdateTimeNode = animationstream_update_time;
 	st->time_handle.udta = node;
-	
+
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, animationstream_destroy);
-	
+
 	gf_sc_register_time_node(compositor, &st->time_handle);
 }
 
@@ -186,13 +186,13 @@
 	if (!st) return;
 
 	/*update state if we're active*/
-	if (as->isActive) 
+	if (as->isActive)
 		animationstream_update_time(&st->time_handle);
 
 	/*check URL change*/
 	animationstream_check_url(st, as);
 
-	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister) 
+	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister)
 		gf_sc_register_time_node(st->compositor, &st->time_handle);
 	else
 		st->time_handle.needs_unregister = 0;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_audio.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_audio.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -44,7 +44,7 @@
 		return;
 	}
 	ac->isActive = 1;
-	gf_node_event_out_str((GF_Node *)ac, "isActive");
+	gf_node_event_out((GF_Node *)ac, 7/*"isActive"*/);
 
 	gf_mo_set_speed(st->input.stream, st->input.speed);
 	/*traverse all graph to get parent audio group*/
@@ -55,7 +55,7 @@
 {
 	gf_sc_audio_stop(&st->input);
 	ac->isActive = 0;
-	gf_node_event_out_str((GF_Node *)ac, "isActive");
+	gf_node_event_out((GF_Node *)ac, 7/*"isActive"*/);
 
 	st->time_handle.needs_unregister = 1;
 }
@@ -90,7 +90,7 @@
 	}
 	if (st->set_duration && st->input.stream) {
 		ac->duration_changed = gf_mo_get_duration(st->input.stream);
-		gf_node_event_out_str(node, "duration_changed");
+		gf_node_event_out(node, 6/*"duration_changed"*/);
 		st->set_duration = 0;
 	}
 
@@ -111,7 +111,7 @@
 	}
 	time = gf_node_get_scene_time(tn->udta);
 	if ((time<st->start_time) || (st->start_time<0)) return;
-	
+
 	if (ac->isActive) {
 		if ( (ac->stopTime > st->start_time) && (time>=ac->stopTime)) {
 			audioclip_deactivate(st, ac);
@@ -165,7 +165,7 @@
 	}
 
 	/*make sure we are still registered*/
-	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister) 
+	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister)
 		gf_sc_register_time_node(st->input.compositor, &st->time_handle);
 	else
 		st->time_handle.needs_unregister = 0;
@@ -212,7 +212,7 @@
 		gf_free(st);
 		return;
 	}
-	
+
 
 	/*check end of stream*/
 	if (st->input.stream && st->input.stream_finished) {
@@ -243,7 +243,7 @@
 	}
 	time = gf_node_get_scene_time(tn->udta);
 	if ((time<st->start_time) || (st->start_time<0)) return;
-	
+
 	if (st->input.input_ifce.GetSpeed(st->input.input_ifce.callback) && st->is_active) {
 		if ( (as->stopTime > st->start_time) && (time>=as->stopTime)) {
 			audiosource_deactivate(st, as);
@@ -292,7 +292,7 @@
 	}
 
 	/*make sure we are still registered*/
-	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister) 
+	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister)
 		gf_sc_register_time_node(st->input.compositor, &st->time_handle);
 	else
 		st->time_handle.needs_unregister = 0;
@@ -337,7 +337,7 @@
 
 	if (is_destroy) {
 		gf_sc_audio_unregister(&st->output);
-		if (st->time_handle.is_registered) 
+		if (st->time_handle.is_registered)
 			gf_sc_unregister_time_node(st->output.compositor, &st->time_handle);
 
 		gf_mixer_del(st->am);
@@ -358,7 +358,7 @@
 
 	/*if no new inputs don't change mixer config*/
 	update_mixer = gf_list_count(st->new_inputs) ? 1 : 0;
-	
+
 	if (gf_mixer_get_src_count(st->am) == gf_list_count(st->new_inputs)) {
 		u32 count = gf_list_count(st->new_inputs);
 		update_mixer = 0;
@@ -386,7 +386,7 @@
 	tr_state->audio_parent = parent;
 
 	/*Note the audio buffer is ALWAYS registered untill destroyed since buffer filling shall happen even when inactive*/
-	if (!st->output.register_with_parent || !st->output.register_with_renderer) 
+	if (!st->output.register_with_parent || !st->output.register_with_renderer)
 		gf_sc_audio_register(&st->output, tr_state);
 
 	/*store mute flag*/
@@ -398,7 +398,7 @@
 static void audiobuffer_activate(AudioBufferStack *st, M_AudioBuffer *ab)
 {
 	ab->isActive = 1;
-	gf_node_event_out_str((GF_Node *)ab, "isActive");
+	gf_node_event_out((GF_Node *)ab, 17/*"isActive"*/);
 	/*rerender all graph to get parent audio group*/
 	gf_sc_invalidate(st->output.compositor, NULL);
 	st->done = 0;
@@ -408,7 +408,7 @@
 static void audiobuffer_deactivate(AudioBufferStack *st, M_AudioBuffer *ab)
 {
 	ab->isActive = 0;
-	gf_node_event_out_str((GF_Node *)ab, "isActive");
+	gf_node_event_out((GF_Node *)ab, 17/*"isActive"*/);
 	st->time_handle.needs_unregister = 1;
 }
 
@@ -423,7 +423,7 @@
 	}
 	time = gf_node_get_scene_time(tn->udta);
 	if ((time<st->start_time) || (st->start_time<0)) return;
-	
+
 	if (ab->isActive) {
 		if ( (ab->stopTime > st->start_time) && (time>=ab->stopTime)) {
 			audiobuffer_deactivate(st, ab);
@@ -598,11 +598,11 @@
 	if (!st) return;
 
 	//update state if we're active
-	if (ab->isActive) 
+	if (ab->isActive)
 		audiobuffer_update_time(&st->time_handle);
 
 	/*make sure we are still registered*/
-	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister) 
+	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister)
 		gf_sc_register_time_node(st->output.compositor, &st->time_handle);
 	else
 		st->time_handle.needs_unregister = 0;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_background.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_background.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -90,7 +90,7 @@
 
 	if (ptr->sky_mesh) mesh_free(ptr->sky_mesh);
 	if (ptr->ground_mesh) mesh_free(ptr->ground_mesh);
-	
+
 	gf_sg_vrml_mf_reset(&ptr->ground_ang, GF_SG_VRML_MFFLOAT);
 	gf_sg_vrml_mf_reset(&ptr->sky_ang, GF_SG_VRML_MFFLOAT);
 	gf_sg_vrml_mf_reset(&ptr->ground_col, GF_SG_VRML_MFCOLOR);
@@ -103,14 +103,14 @@
 	mesh_free(ptr->left_mesh);
 	mesh_free(ptr->right_mesh);
 
-	
+
 	gf_sc_texture_destroy(&ptr->txh_front);
 	gf_sc_texture_destroy(&ptr->txh_back);
 	gf_sc_texture_destroy(&ptr->txh_top);
 	gf_sc_texture_destroy(&ptr->txh_bottom);
 	gf_sc_texture_destroy(&ptr->txh_left);
 	gf_sc_texture_destroy(&ptr->txh_right);
-	
+
 	gf_free(ptr);
 }
 
@@ -142,14 +142,15 @@
 	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; vx.pos.y = FIX_ONE;
-	vx.normal.x = vx.normal.z = 0; 
+	vx.pos.x = vx.pos.z = 0;
+	vx.pos.y = FIX_ONE;
+	vx.normal.x = vx.normal.z = 0;
 	vx.normal.y = -MESH_NORMAL_UNIT;
 
 	mesh_set_vertex_vx(mesh, &vx);
 	last_idx = 0;
 	ang_idx = 0;
-	
+
 	pad = 1;
 	next_angle = first_angle = 0;
 	if (angles->count) {
@@ -163,13 +164,13 @@
 	if (ground_dome) {
 		step_div_h *= 2;
 		i=1;
-	} 
-	
+	}
+
 	for (; i<DOME_STEP_V; i++) {
 		if (ground_dome) {
-	        angle = first_angle + (i * (GF_PI2-first_angle) / DOME_STEP_V);
+			angle = first_angle + (i * (GF_PI2-first_angle) / DOME_STEP_V);
 		} else {
-	        angle = (i * GF_PI / DOME_STEP_V);
+			angle = (i * GF_PI / DOME_STEP_V);
 		}
 
 		/*switch cols*/
@@ -202,15 +203,15 @@
 		}
 		vx.color = MESH_MAKE_COL(fcol);
 
-        vx.pos.y = gf_sin(GF_PI2 - angle);
-        r = gf_sqrt(FIX_ONE - gf_mulfix(vx.pos.y, vx.pos.y));
-	
+		vx.pos.y = gf_sin(GF_PI2 - angle);
+		r = gf_sqrt(FIX_ONE - gf_mulfix(vx.pos.y, vx.pos.y));
+
 		new_idx = mesh->v_count;
-        for (j = 0; j < step_div_h; j++) {
+		for (j = 0; j < step_div_h; j++) {
 			SFVec3f n;
-            Fixed lon = 2 * GF_PI * j / step_div_h;
-            vx.pos.x = gf_mulfix(gf_sin(lon), r);
-            vx.pos.z = gf_mulfix(gf_cos(lon), r);
+			Fixed lon = 2 * GF_PI * j / step_div_h;
+			vx.pos.x = gf_mulfix(gf_sin(lon), r);
+			vx.pos.z = gf_mulfix(gf_cos(lon), r);
 			n = gf_vec_scale(vx.pos, FIX_ONE /*-FIX_ONE*/);
 			gf_vec_norm(&n);
 			MESH_SET_NORMAL(vx, n);
@@ -224,7 +225,7 @@
 					mesh_set_triangle(mesh, 0, new_idx+j, new_idx+j-1);
 				}
 			}
-        }
+		}
 		if (i>1) {
 			mesh_set_triangle(mesh, last_idx, new_idx, new_idx+step_div_h-1);
 			mesh_set_triangle(mesh, last_idx, new_idx+step_div_h-1, last_idx+step_div_h-1);
@@ -236,8 +237,9 @@
 
 	if (!ground_dome) {
 		new_idx = mesh->v_count;
-		vx.pos.x = vx.pos.z = 0; vx.pos.y = -FIX_ONE;
-		vx.normal.x = vx.normal.z = 0; 
+		vx.pos.x = vx.pos.z = 0;
+		vx.pos.y = -FIX_ONE;
+		vx.normal.x = vx.normal.z = 0;
 		vx.normal.y = MESH_NORMAL_UNIT;
 		mesh_set_vertex_vx(mesh, &vx);
 
@@ -283,7 +285,7 @@
 	st = (BackgroundStack *) gf_node_get_private(node);
 	compositor = (GF_Compositor*)st->compositor;
 
-	
+
 	/*may happen in get_bounds*/
 	if (!tr_state->backgrounds) return;
 
@@ -310,7 +312,13 @@
 		return;
 	}
 	if (!bck->isBound) return;
-	if (tr_state->traversing_mode != TRAVERSE_BINDABLE) return;
+
+	if (tr_state->traversing_mode != TRAVERSE_BINDABLE) {
+		if (tr_state->traversing_mode == TRAVERSE_SORT) {
+			gf_mx_copy(st->current_mx, tr_state->model_matrix);
+		}
+		return;
+	}
 
 	front_tx = back_gf_sc_texture_enabled(&bck->frontUrl, &st->txh_front);
 	back_tx = back_gf_sc_texture_enabled(&bck->backUrl, &st->txh_back);
@@ -333,7 +341,8 @@
 	}
 
 	/*undo translation*/
-	res.x = res.y = res.z = 0; res.q = FIX_ONE;
+	res.x = res.y = res.z = 0;
+	res.q = FIX_ONE;
 	gf_mx_apply_vec_4x4(&tr_state->camera->unprojection, &res);
 	assert(res.q);
 	res.x = gf_divfix(res.x, res.q);
@@ -345,11 +354,15 @@
 	visual_3d_set_background_state(tr_state->visual, 1);
 
 	if (has_sky) {
+		GF_Matrix bck_mx;
+		gf_mx_copy(bck_mx, tr_state->model_matrix);
+		gf_mx_copy(tr_state->model_matrix, st->current_mx);
+
 		if (!st->sky_mesh) {
 			st->sky_mesh = new_mesh();
 			back_build_dome(st->sky_mesh, &bck->skyAngle, &bck->skyColor, 0);
 		}
-		visual_3d_matrix_push(tr_state->visual);
+
 		gf_mx_init(mx);
 		gf_mx_add_translation(&mx, res.x, res.y, res.z);
 
@@ -362,17 +375,23 @@
 #endif
 		gf_mx_add_scale(&mx, scale, scale, scale);
 
-		visual_3d_matrix_add(tr_state->visual, mx.m);
+		gf_mx_add_matrix(&tr_state->model_matrix, &mx);
+
 		visual_3d_mesh_paint(tr_state, st->sky_mesh);
-		visual_3d_matrix_pop(tr_state->visual);
+
+		gf_mx_copy(tr_state->model_matrix, bck_mx);
 	}
 
 	if (has_ground) {
+		GF_Matrix bck_mx;
+		gf_mx_copy(bck_mx, tr_state->model_matrix);
+		gf_mx_copy(tr_state->model_matrix, st->current_mx);
+
 		if (!st->ground_mesh) {
 			st->ground_mesh = new_mesh();
 			back_build_dome(st->ground_mesh, &bck->groundAngle, &bck->groundColor, 1);
 		}
-		visual_3d_matrix_push(tr_state->visual);
+
 		gf_mx_init(mx);
 		gf_mx_add_translation(&mx, res.x, res.y, res.z);
 		/*cf above*/
@@ -382,13 +401,17 @@
 		scale = 85*tr_state->camera->z_far/100;
 #endif
 		gf_mx_add_scale(&mx, scale, -scale, scale);
-		visual_3d_matrix_add(tr_state->visual, mx.m);
+
+		gf_mx_add_matrix(&tr_state->model_matrix, &mx);
 		visual_3d_mesh_paint(tr_state, st->ground_mesh);
-		visual_3d_matrix_pop(tr_state->visual);
+		gf_mx_copy(tr_state->model_matrix, bck_mx);
 	}
 
 	if (front_tx || back_tx || left_tx || right_tx || top_tx || bottom_tx) {
-		visual_3d_matrix_push(tr_state->visual);
+		GF_Matrix bck_mx;
+		gf_mx_copy(bck_mx, tr_state->model_matrix);
+		gf_mx_copy(tr_state->model_matrix, st->current_mx);
+
 		gf_mx_init(mx);
 		gf_mx_add_translation(&mx, res.x, res.y, res.z);
 #ifdef GPAC_FIXED_POINT
@@ -397,10 +420,10 @@
 #else
 		gf_mx_add_scale(&mx, tr_state->camera->z_far, tr_state->camera->z_far, tr_state->camera->z_far);
 #endif
-		visual_3d_matrix_add(tr_state->visual, mx.m);
-
 		visual_3d_enable_antialias(tr_state->visual, 1);
 
+		gf_mx_add_matrix(&tr_state->model_matrix, &mx);
+
 		if (front_tx) back_draw_texture(tr_state, &st->txh_front, st->front_mesh);
 		if (back_tx) back_draw_texture(tr_state, &st->txh_back, st->back_mesh);
 		if (top_tx) back_draw_texture(tr_state, &st->txh_top, st->top_mesh);
@@ -408,7 +431,7 @@
 		if (left_tx) back_draw_texture(tr_state, &st->txh_left, st->left_mesh);
 		if (right_tx) back_draw_texture(tr_state, &st->txh_right, st->right_mesh);
 
-		visual_3d_matrix_pop(tr_state->visual);
+		gf_mx_copy(tr_state->model_matrix, bck_mx);
 	}
 
 	/*enable background state (turn off all quality options)*/
@@ -433,6 +456,7 @@
 	ptr->reg_stacks = gf_list_new();
 	((M_Background *)node)->on_set_bind = back_set_bind;
 
+	gf_mx_init(ptr->current_mx);
 
 	/*build texture cube*/
 	ptr->front_mesh = new_mesh();
@@ -440,7 +464,8 @@
 	mesh_set_vertex(ptr->front_mesh,  PLANE_HSIZE, -PLANE_HSIZE, -PLANE_HSIZE_LOW,  0,  0,  FIX_ONE, FIX_ONE, 0);
 	mesh_set_vertex(ptr->front_mesh,  PLANE_HSIZE,  PLANE_HSIZE, -PLANE_HSIZE_LOW,  0,  0,  FIX_ONE, FIX_ONE, FIX_ONE);
 	mesh_set_vertex(ptr->front_mesh, -PLANE_HSIZE,  PLANE_HSIZE, -PLANE_HSIZE_LOW,  0,  0,  FIX_ONE, 0, FIX_ONE);
-	mesh_set_triangle(ptr->front_mesh, 0, 1, 2); mesh_set_triangle(ptr->front_mesh, 0, 2, 3);
+	mesh_set_triangle(ptr->front_mesh, 0, 1, 2);
+	mesh_set_triangle(ptr->front_mesh, 0, 2, 3);
 	mesh_update_bounds(ptr->front_mesh);
 
 	ptr->back_mesh = new_mesh();
@@ -448,7 +473,8 @@
 	mesh_set_vertex(ptr->back_mesh,  PLANE_HSIZE, -PLANE_HSIZE,  PLANE_HSIZE_LOW,  0,  0,  -FIX_ONE, 0, 0);
 	mesh_set_vertex(ptr->back_mesh,  PLANE_HSIZE,  PLANE_HSIZE,  PLANE_HSIZE_LOW,  0,  0,  -FIX_ONE, 0, FIX_ONE);
 	mesh_set_vertex(ptr->back_mesh, -PLANE_HSIZE,  PLANE_HSIZE,  PLANE_HSIZE_LOW,  0,  0,  -FIX_ONE, FIX_ONE, FIX_ONE);
-	mesh_set_triangle(ptr->back_mesh, 0, 1, 2); mesh_set_triangle(ptr->back_mesh, 0, 2, 3);
+	mesh_set_triangle(ptr->back_mesh, 0, 1, 2);
+	mesh_set_triangle(ptr->back_mesh, 0, 2, 3);
 	mesh_update_bounds(ptr->back_mesh);
 
 	ptr->top_mesh = new_mesh();
@@ -456,7 +482,8 @@
 	mesh_set_vertex(ptr->top_mesh,  PLANE_HSIZE,  PLANE_HSIZE_LOW,  PLANE_HSIZE,  0,  -FIX_ONE,  0, 0, FIX_ONE);
 	mesh_set_vertex(ptr->top_mesh,  PLANE_HSIZE,  PLANE_HSIZE_LOW, -PLANE_HSIZE,  0,  -FIX_ONE,  0, FIX_ONE, FIX_ONE);
 	mesh_set_vertex(ptr->top_mesh, -PLANE_HSIZE,  PLANE_HSIZE_LOW, -PLANE_HSIZE,  0,  -FIX_ONE,  0, FIX_ONE, 0);
-	mesh_set_triangle(ptr->top_mesh, 0, 1, 2); mesh_set_triangle(ptr->top_mesh, 0, 2, 3);
+	mesh_set_triangle(ptr->top_mesh, 0, 1, 2);
+	mesh_set_triangle(ptr->top_mesh, 0, 2, 3);
 	mesh_update_bounds(ptr->top_mesh);
 
 	ptr->bottom_mesh = new_mesh();
@@ -464,7 +491,8 @@
 	mesh_set_vertex(ptr->bottom_mesh,  PLANE_HSIZE, -PLANE_HSIZE_LOW, -PLANE_HSIZE,  0, FIX_ONE,  0, FIX_ONE, 0);
 	mesh_set_vertex(ptr->bottom_mesh,  PLANE_HSIZE, -PLANE_HSIZE_LOW,  PLANE_HSIZE,  0, FIX_ONE,  0, 0, 0);
 	mesh_set_vertex(ptr->bottom_mesh, -PLANE_HSIZE, -PLANE_HSIZE_LOW,  PLANE_HSIZE,  0, FIX_ONE,  0, 0, FIX_ONE);
-	mesh_set_triangle(ptr->bottom_mesh, 0, 1, 2); mesh_set_triangle(ptr->bottom_mesh, 0, 2, 3);
+	mesh_set_triangle(ptr->bottom_mesh, 0, 1, 2);
+	mesh_set_triangle(ptr->bottom_mesh, 0, 2, 3);
 	mesh_update_bounds(ptr->bottom_mesh);
 
 	ptr->left_mesh = new_mesh();
@@ -472,7 +500,8 @@
 	mesh_set_vertex(ptr->left_mesh, -PLANE_HSIZE_LOW, -PLANE_HSIZE,  PLANE_HSIZE, FIX_ONE,  0,  0, 0, 0);
 	mesh_set_vertex(ptr->left_mesh, -PLANE_HSIZE_LOW,  PLANE_HSIZE,  PLANE_HSIZE, FIX_ONE,  0,  0, 0, FIX_ONE);
 	mesh_set_vertex(ptr->left_mesh, -PLANE_HSIZE_LOW,  PLANE_HSIZE, -PLANE_HSIZE, FIX_ONE,  0,  0, FIX_ONE, FIX_ONE);
-	mesh_set_triangle(ptr->left_mesh, 0, 1, 2); mesh_set_triangle(ptr->left_mesh, 0, 2, 3);
+	mesh_set_triangle(ptr->left_mesh, 0, 1, 2);
+	mesh_set_triangle(ptr->left_mesh, 0, 2, 3);
 	mesh_update_bounds(ptr->left_mesh);
 
 	ptr->right_mesh = new_mesh();
@@ -480,7 +509,8 @@
 	mesh_set_vertex(ptr->right_mesh,  PLANE_HSIZE_LOW, -PLANE_HSIZE, -PLANE_HSIZE, -FIX_ONE,  0,  0, 0, 0);
 	mesh_set_vertex(ptr->right_mesh,  PLANE_HSIZE_LOW,  PLANE_HSIZE, -PLANE_HSIZE, -FIX_ONE,  0,  0, 0, FIX_ONE);
 	mesh_set_vertex(ptr->right_mesh,  PLANE_HSIZE_LOW,  PLANE_HSIZE,  PLANE_HSIZE, -FIX_ONE,  0,  0, FIX_ONE, FIX_ONE);
-	mesh_set_triangle(ptr->right_mesh, 0, 1, 2); mesh_set_triangle(ptr->right_mesh, 0, 2, 3);
+	mesh_set_triangle(ptr->right_mesh, 0, 1, 2);
+	mesh_set_triangle(ptr->right_mesh, 0, 2, 3);
 	mesh_update_bounds(ptr->right_mesh);
 
 
@@ -509,8 +539,8 @@
 	if (!st) return;
 
 	if (!gf_sg_vrml_field_equal(&bck->skyColor, &st->sky_col, GF_SG_VRML_MFCOLOR)
-		|| !gf_sg_vrml_field_equal(&bck->skyAngle, &st->sky_ang, GF_SG_VRML_MFFLOAT)
-		) {
+	        || !gf_sg_vrml_field_equal(&bck->skyAngle, &st->sky_ang, GF_SG_VRML_MFFLOAT)
+	   ) {
 
 		if (st->sky_mesh) mesh_free(st->sky_mesh);
 		st->sky_mesh = NULL;
@@ -518,8 +548,8 @@
 		gf_sg_vrml_field_copy(&st->sky_ang, &bck->skyAngle, GF_SG_VRML_MFFLOAT);
 	}
 	if (!gf_sg_vrml_field_equal(&bck->groundColor, &st->ground_col, GF_SG_VRML_MFCOLOR)
-		|| !gf_sg_vrml_field_equal(&bck->groundAngle, &st->ground_ang, GF_SG_VRML_MFFLOAT)
-		) {
+	        || !gf_sg_vrml_field_equal(&bck->groundAngle, &st->ground_ang, GF_SG_VRML_MFFLOAT)
+	   ) {
 
 		if (st->ground_mesh) mesh_free(st->ground_mesh);
 		st->ground_mesh = NULL;
@@ -534,7 +564,7 @@
 	back_check_gf_sc_texture_change(&st->txh_left, &bck->leftUrl);
 	back_check_gf_sc_texture_change(&st->txh_right, &bck->rightUrl);
 
-	
+
 	gf_sc_invalidate(st->compositor, NULL);
 }

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_background2d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_background2d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -102,8 +102,9 @@
 
 static void DrawBackground2D_2D(DrawableContext *ctx, GF_TraverseState *tr_state)
 {
-	Bool clear_all = GF_TRUE;	
+	Bool clear_all = GF_TRUE;
 	u32 color;
+	Bool is_offscreen = GF_FALSE;
 	Background2DStack *stack;
 	if (!ctx || !ctx->drawable || !ctx->drawable->node) return;
 	stack = (Background2DStack *) gf_node_get_private(ctx->drawable->node);
@@ -118,10 +119,10 @@
 		if (!tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx, NULL)) {
 			/*set target rect*/
 			gf_path_reset(stack->drawable->path);
-			gf_path_add_rect_center(stack->drawable->path, 
-								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);
+			gf_path_add_rect_center(stack->drawable->path,
+			                        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);
 
 			/*draw texture*/
 			visual_2d_texture_path(tr_state->visual, stack->drawable->path, ctx, tr_state);
@@ -132,6 +133,7 @@
 		//in opengl auto mode we still have to clear the canvas
 		if (!tr_state->immediate_draw && !tr_state->visual->offscreen && tr_state->visual->compositor->hybrid_opengl) {
 			clear_all = GF_FALSE;
+			is_offscreen = GF_TRUE;
 			color &= 0x00FFFFFF;
 		} else
 #endif
@@ -143,17 +145,18 @@
 	if (clear_all && !tr_state->visual->offscreen && tr_state->visual->compositor->hybrid_opengl) {
 		if (ctx->flags & CTX_BACKROUND_NOT_LAYER) {
 			color &= 0x00FFFFFF;
-			tr_state->visual->ClearSurface(tr_state->visual, NULL, color);
-			clear_all = GF_FALSE;
+			compositor_2d_hybgl_clear_surface(tr_state->visual, NULL, color, GF_FALSE);
+			is_offscreen = GF_TRUE;
+			//we may need to clear the canvas for immediate mode
 		}
 	}
 #endif
 	/*direct drawing, draw without clippers */
 	if (tr_state->immediate_draw
-	) {
+	   ) {
 		/*directly clear with specified color*/
 		if (clear_all)
-			tr_state->visual->ClearSurface(tr_state->visual, &ctx->bi->clip, color);
+			tr_state->visual->ClearSurface(tr_state->visual, &ctx->bi->clip, color, is_offscreen);
 	} else {
 		u32 i;
 		GF_IRect clip;
@@ -165,7 +168,7 @@
 			clip = ctx->bi->clip;
 			gf_irect_intersect(&clip, &tr_state->visual->to_redraw.list[i].rect);
 			if (clip.width && clip.height) {
-				tr_state->visual->ClearSurface(tr_state->visual, &clip, color);
+				tr_state->visual->ClearSurface(tr_state->visual, &clip, color, is_offscreen);
 			}
 		}
 	}
@@ -190,32 +193,27 @@
 
 static void DrawBackground2D_3D(M_Background2D *bck, Background2DStack *st, GF_TraverseState *tr_state)
 {
-	GF_Matrix mx;
+	GF_Matrix mx, bck_mx, bck_mx_cam;
 	Bool use_texture;
 
 	use_texture = back_texture_enabled(bck, &st->txh);
 
 	visual_3d_set_background_state(tr_state->visual, 1);
 
-	visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_MODELVIEW);
-	visual_3d_matrix_push(tr_state->visual);
-
-/*	visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_TEXTURE);
-	gf_sc_texture_get_transform(&st->txh, NULL, &mx, 0);
-	visual_3d_matrix_load(tr_state->visual, mx.m);
-*/	
+	gf_mx_copy(bck_mx_cam, tr_state->camera->modelview);
+	gf_mx_copy(bck_mx, tr_state->model_matrix);
 
 	/*little opt: if we clear the main visual clear it entirely */
 	if (! tr_state->is_layer) {
 		visual_3d_clear(tr_state->visual, bck->backColor, FIX_ONE);
 		if (!use_texture) {
-			visual_3d_matrix_pop(tr_state->visual);
 			visual_3d_set_background_state(tr_state->visual, 0);
 			return;
 		}
 		/*we need a hack here because main vp is always traversed before main background, and in the case of a
 		2D viewport it modifies the modelview matrix, which we don't want ...*/
-		visual_3d_matrix_reset(tr_state->visual);
+		gf_mx_init(tr_state->model_matrix);
+		gf_mx_init(tr_state->camera->modelview);
 	}
 	if (!use_texture || (!tr_state->is_layer && st->txh.transparent) ) visual_3d_set_material_2d(tr_state->visual, bck->backColor, FIX_ONE);
 	if (use_texture) {
@@ -231,7 +229,8 @@
 		mesh_set_vertex(st->mesh,  B2D_PLANE_HSIZE, -B2D_PLANE_HSIZE, 0,  0,  0,  FIX_ONE, FIX_ONE, 0);
 		mesh_set_vertex(st->mesh,  B2D_PLANE_HSIZE,  B2D_PLANE_HSIZE, 0,  0,  0,  FIX_ONE, FIX_ONE, FIX_ONE);
 		mesh_set_vertex(st->mesh, -B2D_PLANE_HSIZE,  B2D_PLANE_HSIZE, 0,  0,  0,  FIX_ONE, 0, FIX_ONE);
-		mesh_set_triangle(st->mesh, 0, 1, 2); mesh_set_triangle(st->mesh, 0, 2, 3);
+		mesh_set_triangle(st->mesh, 0, 1, 2);
+		mesh_set_triangle(st->mesh, 0, 2, 3);
 		st->mesh->flags |= MESH_IS_2D;
 	}
 
@@ -239,7 +238,7 @@
 	if (tr_state->camera->is_3D) {
 		Fixed sx, sy;
 		/*reset matrix*/
-		visual_3d_matrix_reset(tr_state->visual);
+		gf_mx_init(tr_state->model_matrix);
 		sx = sy = 2 * gf_mulfix(gf_tan(tr_state->camera->fieldOfView/2), tr_state->camera->z_far);
 		if (tr_state->camera->width > tr_state->camera->height) {
 			sx = gf_muldiv(sx, tr_state->camera->width, tr_state->camera->height);
@@ -253,9 +252,9 @@
 		gf_mx_add_translation(&mx, 0, 0, -0.995f*tr_state->camera->z_far);
 #endif
 	} else {
-		gf_mx_add_scale(&mx, tr_state->bbox.max_edge.x - tr_state->bbox.min_edge.x, 
-							tr_state->bbox.max_edge.y - tr_state->bbox.min_edge.y,
-							FIX_ONE);
+		gf_mx_add_scale(&mx, tr_state->bbox.max_edge.x - tr_state->bbox.min_edge.x,
+		                tr_state->bbox.max_edge.y - tr_state->bbox.min_edge.y,
+		                FIX_ONE);
 		/*when in layer2D, DON'T MOVE BACKGROUND TO ZFAR*/
 		if (!tr_state->is_layer) {
 			Fixed tr;
@@ -268,14 +267,16 @@
 			gf_mx_add_translation(&mx, 0, 0, tr);
 		}
 	}
-	visual_3d_matrix_add(tr_state->visual, mx.m);
+	gf_mx_add_matrix(&tr_state->model_matrix, &mx);
 	visual_3d_mesh_paint(tr_state, st->mesh);
 	if (tr_state->mesh_num_textures) {
 		gf_sc_texture_disable(&st->txh);
 		tr_state->mesh_num_textures = 0;
 	}
 
-	visual_3d_matrix_pop(tr_state->visual);
+	gf_mx_copy(tr_state->model_matrix, bck_mx);
+	gf_mx_copy(tr_state->camera->modelview, bck_mx_cam);
+
 	visual_3d_set_background_state(tr_state->visual, 0);
 }
 #endif
@@ -295,7 +296,7 @@
 
 	bck = (M_Background2D *)node;
 
-	/*special case for background in Layer2D: the background is seen as a regular drawable, so 
+	/*special case for background in Layer2D: the background is seen as a regular drawable, so
 	RENDER_BINDABLE is not used*/
 	switch (tr_state->traversing_mode) {
 	case TRAVERSE_DRAW_2D:
@@ -345,19 +346,24 @@
 			status->ctx.aspect.fill_color = col;
 			stack->flags |= CTX_APP_DIRTY;
 		}
-	} 
+	}
 
 	if (back_use_texture(bck) ) {
-		if (stack->txh.tx_io && !(status->ctx.flags & CTX_APP_DIRTY) && stack->txh.needs_refresh) {
-			stack->flags |= CTX_TEXTURE_DIRTY;
-		}
 #ifndef GPAC_DISABLE_3D
-		if (stack->txh.compositor->hybrid_opengl && !tr_state->visual->offscreen) {
+		if (stack->txh.compositor->hybrid_opengl && !tr_state->visual->offscreen && stack->hybgl_init) {
 			stack->flags |= CTX_HYBOGL_NO_CLEAR;
 		}
+		stack->hybgl_init = 1;
 #endif
+		if (stack->txh.tx_io && !(status->ctx.flags & CTX_APP_DIRTY) && stack->txh.needs_refresh) {
+			stack->flags |= CTX_TEXTURE_DIRTY;
+		}
+	}
+	if (status->ctx.flags & CTX_BACKROUND_NOT_LAYER) {
+		status->ctx.flags = stack->flags | CTX_BACKROUND_NOT_LAYER;
+	} else {
+		status->ctx.flags = stack->flags;
 	}
-	status->ctx.flags = stack->flags;
 
 
 	if (tr_state->traversing_mode != TRAVERSE_BINDABLE) return;
@@ -401,7 +407,7 @@
 {
 	gf_sc_texture_update_frame(txh, 0);
 	/*restart texture if needed (movie background controled by MediaControl)*/
-	if (txh->stream_finished && gf_mo_get_loop(txh->stream, 0)) 
+	if (txh->stream_finished && gf_mo_get_loop(txh->stream, 0))
 		gf_sc_texture_restart(txh);
 }
 
@@ -444,7 +450,7 @@
 		return;
 	}
 	/*if not open and changed play*/
-	if (bck->url.count) 
+	if (bck->url.count)
 		gf_sc_texture_play(&st->txh, &bck->url);
 	gf_sc_invalidate(st->txh.compositor, NULL);
 }
@@ -454,7 +460,7 @@
 	if (node && (gf_node_get_tag(node) == TAG_MPEG4_Background2D)) {
 		Background2DStack *st;
 		if (!((M_Background2D *)node)->isBound) return 1;
-			
+
 		st = (Background2DStack *) gf_node_get_private(node);
 		if (st->txh.transparent) return 1;
 		return 0;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_bitmap.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_bitmap.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -56,9 +56,9 @@
 	/*bitmap not ready*/
 	if (!txh || !txh->width || !txh->height
 #ifndef GPAC_DISABLE_3D
-		|| (tr_state->visual->type_3d && !txh->tx_io) 
+	        || (tr_state->visual->type_3d && !txh->tx_io)
 #endif
-		) {
+	   ) {
 		if (notify_changes) gf_node_dirty_set(node, 0, 1);
 		return;
 	}
@@ -71,8 +71,10 @@
 	st->prev_tx_w = txh->width;
 	st->prev_tx_h = txh->height;
 
-	sx = bmp->scale.x; if (sx<0) sx = FIX_ONE;
-	sy = bmp->scale.y; if (sy<0) sy = FIX_ONE;
+	sx = bmp->scale.x;
+	if (sx<0) sx = FIX_ONE;
+	sy = bmp->scale.y;
+	if (sy<0) sy = FIX_ONE;
 
 	compositor_adjust_scale(txh->owner, &sx, &sy);
 
@@ -96,7 +98,7 @@
 
 	gf_node_dirty_clear(node, 0);
 
-	if ((st->size.x==size.x) && (st->size.y==size.y)) return; 
+	if ((st->size.x==size.x) && (st->size.y==size.y)) return;
 	st->size = size;
 
 	/*change in size*/
@@ -198,13 +200,13 @@
 		vrml_drawable_pick(st->graph, tr_state);
 		return;
 	case TRAVERSE_GET_BOUNDS:
-		Bitmap_BuildGraph(node, st, tr_state, &tr_state->bounds, 
+		Bitmap_BuildGraph(node, st, tr_state, &tr_state->bounds,
 #ifndef GPAC_DISABLE_3D
-			tr_state->visual->type_3d ? 1 : 0
+		                  tr_state->visual->type_3d ? 1 : 0
 #else
-		0
+		                  0
 #endif
-		);
+		                 );
 
 		return;
 	case TRAVERSE_SORT:
@@ -246,7 +248,7 @@
 				}
 				ctx->flags |= CTX_IS_TRANSPARENT;
 			}
-		} 
+		}
 		else if (!tr_state->color_mat.identity) {
 			ctx->flags |= CTX_IS_TRANSPARENT;
 		} else {
@@ -257,7 +259,7 @@
 		}
 	}
 
-	/*bounds are stored when building graph*/	
+	/*bounds are stored when building graph*/
 	drawable_finalize_sort(ctx, tr_state, &rc);
 }

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_composite.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_composite.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -157,42 +157,54 @@
 	case TAG_MPEG4_CompositeTexture3D:
 	{
 		M_CompositeTexture3D*c3d = (M_CompositeTexture3D*)n;
-		if (force_check || gf_node_dirty_get(c3d->background)) { gf_node_traverse(c3d->background, tr_state); ret = 1; }
+		if (force_check || gf_node_dirty_get(c3d->background)) {
+			gf_node_traverse(c3d->background, tr_state);
+			ret = 1;
+		}
 		btop = (GF_Node*)gf_list_get(tr_state->backgrounds, 0);
 		if (btop != c3d->background) {
 			gf_node_unregister(c3d->background, n);
 			gf_node_register(btop, n);
 			c3d->background = btop;
-			gf_node_event_out_str(n, "background");
+			gf_node_event_out(n, 5/*"background"*/);
+			ret = 1;
+		}
+		if (force_check || gf_node_dirty_get(c3d->viewpoint)) {
+			gf_node_traverse(c3d->viewpoint, tr_state);
 			ret = 1;
 		}
-		if (force_check || gf_node_dirty_get(c3d->viewpoint)) { gf_node_traverse(c3d->viewpoint, tr_state); ret = 1; }
 		btop = (GF_Node*)gf_list_get(tr_state->viewpoints, 0);
 		if (btop != c3d->viewpoint) {
 			gf_node_unregister(c3d->viewpoint, n);
 			gf_node_register(btop, n);
 			c3d->viewpoint = btop;
-			gf_node_event_out_str(n, "viewpoint");
+			gf_node_event_out(n, 8/*"viewpoint"*/);
 			ret = 1;
 		}
 
-		if (force_check || gf_node_dirty_get(c3d->fog)) { gf_node_traverse(c3d->fog, tr_state); ret = 1; }
+		if (force_check || gf_node_dirty_get(c3d->fog)) {
+			gf_node_traverse(c3d->fog, tr_state);
+			ret = 1;
+		}
 		btop = (GF_Node*)gf_list_get(tr_state->fogs, 0);
 		if (btop != c3d->fog) {
 			gf_node_unregister(c3d->fog, n);
 			gf_node_register(btop, n);
 			c3d->fog = btop;
-			gf_node_event_out_str(n, "fog");
+			gf_node_event_out(n, 6/*"fog"*/);
 			ret = 1;
 		}
 
-		if (force_check || gf_node_dirty_get(c3d->navigationInfo)) { gf_node_traverse(c3d->navigationInfo, tr_state); ret = 1; }
+		if (force_check || gf_node_dirty_get(c3d->navigationInfo)) {
+			gf_node_traverse(c3d->navigationInfo, tr_state);
+			ret = 1;
+		}
 		btop = (GF_Node*)gf_list_get(tr_state->navigations, 0);
 		if (btop != c3d->navigationInfo) {
 			gf_node_unregister(c3d->navigationInfo, n);
 			gf_node_register(btop, n);
 			c3d->navigationInfo = btop;
-			gf_node_event_out_str(n, "navigationInfo");
+			gf_node_event_out(n, 7/*"navigationInfo"*/);
 			ret = 1;
 		}
 		return ret;
@@ -201,23 +213,29 @@
 	case TAG_MPEG4_CompositeTexture2D:
 	{
 		M_CompositeTexture2D *c2d = (M_CompositeTexture2D*)n;
-		if (force_check || gf_node_dirty_get(c2d->background)) { gf_node_traverse(c2d->background, tr_state); ret = 1; }
+		if (force_check || gf_node_dirty_get(c2d->background)) {
+			gf_node_traverse(c2d->background, tr_state);
+			ret = 1;
+		}
 		btop = (GF_Node*)gf_list_get(tr_state->backgrounds, 0);
 		if (btop != c2d->background) {
 			gf_node_unregister(c2d->background, n);
 			gf_node_register(btop, n);
 			c2d->background = btop;
-			gf_node_event_out_str(n, "background");
+			gf_node_event_out(n, 5/*"background"*/);
 			ret = 1;
 		}
 
-		if (force_check || gf_node_dirty_get(c2d->viewport)) { gf_node_traverse(c2d->viewport, tr_state); ret = 1; }
+		if (force_check || gf_node_dirty_get(c2d->viewport)) {
+			gf_node_traverse(c2d->viewport, tr_state);
+			ret = 1;
+		}
 		btop = (GF_Node*)gf_list_get(tr_state->viewpoints, 0);
 		if (btop != c2d->viewport) {
 			gf_node_unregister(c2d->viewport, n);
 			gf_node_register(btop, n);
 			c2d->viewport = btop;
-			gf_node_event_out_str(n, "viewport");
+			gf_node_event_out(n, 6/*"viewport"*/);
 			ret = 1;
 		}
 
@@ -242,12 +260,12 @@
 	if (st->unsupported) return;
 
 
-/*
-	if (compositor->recompute_ar) {
-		gf_node_dirty_set(txh->owner, 0, 0);
-		return;
-	}
-*/
+	/*
+		if (compositor->recompute_ar) {
+			gf_node_dirty_set(txh->owner, 0, 0);
+			return;
+		}
+	*/
 	if (!compositor->rebuild_offscreen_textures && (!compositor->text_edit_changed || !st->visual->has_text_edit ) && !gf_node_dirty_get(txh->owner)) {
 		txh->needs_refresh = 0;
 		return;
@@ -338,9 +356,9 @@
 
 	/*rebuild stencil*/
 	if (!txh->tx_io
-		|| (w != (s32) txh->width) || ( h != (s32) txh->height)
-		|| (new_pixel_format != txh->pixelformat)
-		) {
+	        || (w != (s32) txh->width) || ( h != (s32) txh->height)
+	        || (new_pixel_format != txh->pixelformat)
+	   ) {
 
 		Bool needs_stencil = 1;
 		if (txh->tx_io) {
@@ -348,7 +366,7 @@
 			if (st->tgl_ctx) ostgl_delete_context(st->tgl_ctx);
 #endif
 			gf_sc_texture_release(txh);
-			if (txh->data) 
+			if (txh->data)
 				gf_free(txh->data);
 			txh->data = NULL;
 		}
@@ -356,9 +374,9 @@
 		/*we don't use rect ext because of no support for texture transforms*/
 		if (1
 #ifndef GPAC_DISABLE_3D
-			|| compositor->gl_caps.npot_texture
+		        || compositor->gl_caps.npot_texture
 #endif
-			) {
+		   ) {
 			st->txh.width = w;
 			st->txh.height = h;
 			st->sx = st->sy = FIX_ONE;
@@ -436,7 +454,7 @@
 		if (needs_stencil) {
 			txh->data = (char*)gf_malloc(sizeof(unsigned char) * txh->stride * txh->height);
 			memset(txh->data, 0, sizeof(unsigned char) * txh->stride * 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)*/
 			raster->stencil_set_texture(stencil, txh->data, txh->width, txh->height, txh->stride, txh->pixelformat, txh->pixelformat, 0);
@@ -487,7 +505,7 @@
 	txh->transparent = (st->visual->last_had_back==2) ? 0 : 1;
 
 
-	if (!compositor->edited_text && st->visual->has_text_edit) 
+	if (!compositor->edited_text && st->visual->has_text_edit)
 		st->visual->has_text_edit = 0;
 
 
@@ -662,8 +680,8 @@
 	stack = gf_node_get_private(ap->texture);
 	if (!stack->txh.tx_io) return 0;
 
-    tr_state = NULL;
-    children = NULL;
+	tr_state = NULL;
+	children = NULL;
 
 
 	if (!is_flush) {
@@ -674,8 +692,10 @@
 			/*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;
+			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*/
@@ -696,10 +716,10 @@
 #ifndef GPAC_DISABLE_3D
 		gf_mx_init(tr_state->model_matrix);
 #endif
-		/*collect sensors*/
+		/*collect sensors but not anchors*/
 		l = children = ((M_CompositeTexture2D*)ap->texture)->children;
 		while (l) {
-			GF_SensorHandler *hsens = compositor_mpeg4_get_sensor_handler(l->node);
+			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;
 		}
@@ -727,7 +747,7 @@
 	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) {
@@ -821,11 +841,11 @@
 	u32 tag;
 	if (!appear) return 0;
 	tag = gf_node_get_tag(appear);
-	if ((tag==TAG_MPEG4_Appearance) 
+	if ((tag==TAG_MPEG4_Appearance)
 #ifndef GPAC_DISABLE_X3D
-		|| (tag==TAG_X3D_Appearance)
+	        || (tag==TAG_X3D_Appearance)
 #endif
-	) {
+	   ) {
 		M_Appearance *ap = (M_Appearance *)appear;
 		if (!ap->texture) return 0;
 		switch (gf_node_get_tag(((M_Appearance *)appear)->texture)) {

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_form.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_form.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -324,7 +324,7 @@
 	}
 
 	/*check picking*/
-	if ((tr_state->traversing_mode==TRAVERSE_PICK) && !gf_sc_pick_in_clipper(tr_state, &st->clip)) 
+	if ((tr_state->traversing_mode==TRAVERSE_PICK) && !gf_sc_pick_in_clipper(tr_state, &st->clip))
 		return;
 
 #if !FORM_CLIPS
@@ -349,11 +349,11 @@
 		while ((cg = gf_list_enum(st->groups, &i))) {
 			parent_node_child_traverse(cg, tr_state);
 		}
-	
+
 		tr_state->visual->top_clipper = prev_clip;
 		if (had_clip) tr_state->clipper = prev_clipper;
 		tr_state->has_clip = had_clip;
-	} else 
+	} else
 #endif
 	{
 		i=0;
@@ -408,9 +408,9 @@
 		if (!i) {
 			form_get_group(st, group_idx[0])->final.x = st->clip.x + inter_space;
 		} else {
-			form_get_group(st, group_idx[i])->final.x = 
-				form_get_group(st, group_idx[i-1])->final.x + form_get_group(st, group_idx[i-1])->final.width 
-				+ inter_space;
+			form_get_group(st, group_idx[i])->final.x =
+			    form_get_group(st, group_idx[i-1])->final.x + form_get_group(st, group_idx[i-1])->final.width
+			    + inter_space;
 		}
 		fg_update_bounds(form_get_group(st, group_idx[i]));
 	}
@@ -433,8 +433,8 @@
 		inter_space /= (count-1);
 	} else {
 		inter_space = space;
-	}	
-	
+	}
+
 	k = count - 1;
 	if (space != -1) k += 1;
 	for (i=1; i<k; i++) {
@@ -454,7 +454,7 @@
 	tot_len = 0;
 	inter_space = st->clip.height;
 	len = 0;
-	for (i=0; i<count;i++) {
+	for (i=0; i<count; i++) {
 		if (group_idx[i] != 0) {
 			tot_len += form_get_group(st, group_idx[i])->final.height;
 			len++;
@@ -462,15 +462,15 @@
 	}
 	inter_space -= tot_len;
 	inter_space /= (len+1);
-				
+
 	for (i=0; i<count; i++) {
 		if (group_idx[i] == 0) continue;
 		if (!i) {
 			form_get_group(st, group_idx[0])->final.y = st->clip.y - inter_space;
 		} else {
 			form_get_group(st, group_idx[i])->final.y =
-				form_get_group(st, group_idx[i-1])->final.y - form_get_group(st, group_idx[i-1])->final.height -
-				inter_space;				
+			    form_get_group(st, group_idx[i-1])->final.y - form_get_group(st, group_idx[i-1])->final.height -
+			    inter_space;
 		}
 		fg_update_bounds(form_get_group(st, group_idx[i]));
 	}
@@ -493,8 +493,8 @@
 		for (i=1; i<count-1; i++) tot_len += form_get_group(st, group_idx[i])->final.height;
 		inter_space -= tot_len;
 		inter_space /= count-1;
-	}	
-	
+	}
+
 	k = count-1;
 	if (space > -1) k += 1;
 	for (i=1; i<k; i++) {
@@ -544,7 +544,7 @@
 	start = 0;
 	rc = &form_get_group(st, group_idx[0])->final;
 	max_x = rc->x + rc->width;
-	
+
 	if(space>-FIX_ONE) {
 		max_x -= space;
 		start = 1;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_geometry_2d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_geometry_2d.c Changed

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_geometry_3d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_geometry_3d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -304,12 +304,12 @@
 /*
 			NonLinearDeformer
 
-	NOTE: AFX spec is just hmm, well, hmm. NonLinearDeformer.extend interpretation differ from type to 
+	NOTE: AFX spec is just hmm, well, hmm. NonLinearDeformer.extend interpretation differ from type to
 	type within the spec, and between the spec and the ref soft. This is GPAC interpretation
 	* all params are specified with default transform axis (Z axis)
 	* NLD.type = 0 (taper):
 		* taping radius = NLD.param
-		* extend = N * [diff, perc] with 
+		* extend = N * [diff, perc] with
 			- diff : relative position along taper axis (for default, diff=0: z min, diff=1: z max)
 			- perc: mult ratio for base taper radius
 		extend works like key/keyValue for a scalar interpolator
@@ -317,7 +317,7 @@
 
 	* NLD.type = 1 (twister):
 		* twisting angle = NLD.param
-		* extend = N * [diff, perc] with 
+		* extend = N * [diff, perc] with
 			- diff : relative position along twister axis (for default, diff=0: z min, diff=1: z max)
 			- perc: mult ratio for base twister angle
 		extend works like key/keyValue for a scalar interpolator
@@ -325,14 +325,14 @@
 
 	* NLD.type = 2 (bender):
 		* bending curvature = NLD.param
-		* extend = N * [diff, perc] with 
+		* extend = N * [diff, perc] with
 			- diff : relative position along bender axis (for default, diff=0: z min, diff=1: z max)
 			- perc: mult ratio for base bender curvature
 		extend works like key/keyValue for a scalar interpolator
 		final curvature: c(z) = LinearInterp(extend[min key], extend[min key + 1]) * param
 
   Another pb of NLD is that the spec says nothing about object/axis alignment: should we center
-  the object at 0,0,0 (local coords) or not? the results are quite different. Here we don't 
+  the object at 0,0,0 (local coords) or not? the results are quite different. Here we don't
   recenter the object before transform
 */
 
@@ -345,7 +345,8 @@
 	/*compute rotation matrix from NLD axis to 0 0 1*/
 	v1 = nld->axis;
 	gf_vec_norm(&v1);
-	v2.x = v2.y = 0; v2.z = FIX_ONE;
+	v2.x = v2.y = 0;
+	v2.z = FIX_ONE;
 	if (gf_vec_equal(v1, v2)) return 0;
 
 	l1 = gf_vec_len(v1);
@@ -373,7 +374,7 @@
 		if (frac>=nld->extend.vals[i]) {
 			*f_min = nld->extend.vals[i];
 			*min = nld->extend.vals[i+1];
-		} 
+		}
 		if ((i+2<count) && (frac<=nld->extend.vals[i+2])) {
 			*f_max = nld->extend.vals[i+2];
 			*max = nld->extend.vals[i+3];
@@ -399,7 +400,7 @@
 
 	param = nld->param;
 	if (!param) param = 1;
-	
+
 	if (mesh->bounds.min_edge.z == mesh->bounds.max_edge.z) return;
 
 	z_min = FIX_MAX;
@@ -418,7 +419,7 @@
 		z_min = mesh->bounds.min_edge.z;
 		z_max = mesh->bounds.max_edge.z;
 	}
-	
+
 	for (i=0; i<mesh->v_count; i++) {
 		SFVec3f old = mesh->vertices[i].pos;
 		frac = gf_divfix(old.z - z_min, z_max - z_min);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_geometry_ifs2d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_geometry_ifs2d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -94,7 +94,7 @@
 	M_IndexedFaceSet2D *ifs2D = (M_IndexedFaceSet2D *)node;
 	M_Coordinate2D *coord = (M_Coordinate2D*) ifs2D->coord;
 	M_Color *color = (M_Color *) ifs2D->color;
-		
+
 	col.red = col.green = col.blue = 0;
 	/*simple case, no color specified*/
 	if (!ifs2D->color) {
@@ -134,7 +134,7 @@
 			gf_path_add_move_to(path, start.x, start.y);
 			i++;
 
-			while (ifs2D->coordIndex.vals[i] != -1) {	
+			while (ifs2D->coordIndex.vals[i] != -1) {
 				start = pts[ifs2D->coordIndex.vals[i]];
 				gf_path_add_line_to(path, start.x, start.y);
 				i++;
@@ -187,7 +187,7 @@
 		gf_path_add_move_to(path, start.x, start.y);
 		num_col = 1;
 		i+=1;
-		while (ifs2D->coordIndex.vals[i] != -1) {	
+		while (ifs2D->coordIndex.vals[i] != -1) {
 			end = pts[ifs2D->coordIndex.vals[i]];
 			gf_path_add_line_to(path, end.x, end.y);
 			i++;
@@ -229,7 +229,7 @@
 		raster->stencil_set_vertex_colors(grad, colors, num_col);
 
 		gf_free(colors);
-		
+
 		col_cen.blue /= num_col;
 		col_cen.green /= num_col;
 		col_cen.red /= num_col;
@@ -246,7 +246,7 @@
 
 		//goto next point
 		i++;
-		ind_col += num_col + 1;	
+		ind_col += num_col + 1;
 		if (i >= ci_count) break;
 		grad = raster->stencil_new(raster, GF_STENCIL_VERTEX_GRADIENT);
 		ctx->flags &= ~CTX_PATH_FILLED;
@@ -298,7 +298,7 @@
 			visual_3d_draw_2d_with_aspect(stack, tr_state, &asp);
 		}
 		return;
-	} 
+	}
 #endif
 	case TRAVERSE_PICK:
 		vrml_drawable_pick(stack, tr_state);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_geometry_ils2d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_geometry_ils2d.c Changed

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_gradients.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_gradients.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -58,15 +58,19 @@
 			gf_mx2d_add_rotation(mat, tr->center.x, tr->center.y, tr->rotationAngle);
 			gf_mx2d_add_translation(mat, tr->translation.x, tr->translation.y);
 		}
-			break;
+		break;
 		case TAG_MPEG4_TransformMatrix2D:
 		{
 			M_TransformMatrix2D *tm = (M_TransformMatrix2D*)transform;
 			gf_mx2d_init(*mat);
-			mat->m[0] = tm->mxx; mat->m[1] = tm->mxy; mat->m[2] = tm->tx;
-			mat->m[3] = tm->myx; mat->m[4] = tm->myy; mat->m[5] = tm->ty;
+			mat->m[0] = tm->mxx;
+			mat->m[1] = tm->mxy;
+			mat->m[2] = tm->tx;
+			mat->m[3] = tm->myx;
+			mat->m[4] = tm->myy;
+			mat->m[5] = tm->ty;
 		}
-			break;
+		break;
 		default:
 			break;
 		}
@@ -173,7 +177,7 @@
 
 	if (!(txh->flags & GF_SR_TEXTURE_GRAD_REGISTERED)) {
 		txh->flags |= GF_SR_TEXTURE_GRAD_REGISTERED;
-		if (gf_list_find(txh->compositor->textures, txh)<0) 
+		if (gf_list_find(txh->compositor->textures, txh)<0)
 			gf_list_insert(txh->compositor->textures, txh, 0);
 	}
 
@@ -189,7 +193,7 @@
 	end = lg->endPoint;
 
 	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);
 	if (!texture2D) return;
@@ -204,7 +208,7 @@
 		gf_free(st->tx_data);
 		st->tx_data = NULL;
 	}
-	
+
 	if (transparent) {
 		if (!st->tx_data) {
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
@@ -327,13 +331,13 @@
 	GF_SAFEALLOC(st, GradientStack);
 
 	/*!!! Gradients are textures but are not registered as textures with the compositor in order to avoid updating
-	too many textures each frame - gradients are only registered with the compositor when they are used in OpenGL, in order 
+	too many textures each frame - gradients are only registered with the compositor when they are used in OpenGL, in order
 	to release associated HW resource when no longer used*/
 	st->txh.owner = node;
 	st->txh.compositor = compositor;
 	st->txh.update_texture_fcnt = UpdateLinearGradient;
 	st->txh.compute_gradient_matrix = LG_ComputeMatrix;
-	
+
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, DestroyGradient);
 }
@@ -362,7 +366,7 @@
 
 	if (!(txh->flags & GF_SR_TEXTURE_GRAD_REGISTERED)) {
 		txh->flags |= GF_SR_TEXTURE_GRAD_REGISTERED;
-		if (gf_list_find(txh->compositor->textures, txh)<0) 
+		if (gf_list_find(txh->compositor->textures, txh)<0)
 			gf_list_insert(txh->compositor->textures, txh, 0);
 	}
 
@@ -375,7 +379,7 @@
 	if (rg->key.count != rg->keyValue.count) return;
 
 	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);
 	if (!texture2D) return;
@@ -390,7 +394,7 @@
 		gf_free(st->tx_data);
 		st->tx_data = NULL;
 	}
-	
+
 	if (transparent) {
 		if (!st->tx_data) {
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
@@ -591,7 +595,7 @@
 	GF_SAFEALLOC(st, GradientStack);
 
 	/*!!! Gradients are textures but are not registered as textures with the compositor in order to avoid updating
-	too many textures each frame - gradients are only registered with the compositor when they are used in OpenGL, in order 
+	too many textures each frame - gradients are only registered with the compositor when they are used in OpenGL, in order
 	to release associated HW resource when no longer used*/
 	st->txh.owner = node;
 	st->txh.compositor = compositor;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_grouping.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_grouping.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -53,11 +53,11 @@
 		but still mark the group as empty*/
 		group->bounds.width = 0;
 		/*special case for anchor which is a parent node acting as a sensor*/
-		if ((ntag==TAG_MPEG4_Anchor) 
+		if ((ntag==TAG_MPEG4_Anchor)
 #ifndef GPAC_DISABLE_X3D
-			|| (ntag==TAG_X3D_Anchor)
+		        || (ntag==TAG_X3D_Anchor)
 #endif
-		) {
+		   ) {
 			GF_SensorHandler *gf_sc_anchor_get_handler(GF_Node *n);
 
 			hsens = gf_sc_anchor_get_handler(node);
@@ -69,7 +69,7 @@
 		} else {
 			child = ((GF_ParentNode *)node)->children;
 			while (child) {
-				hsens = compositor_mpeg4_get_sensor_handler(child->node);
+				hsens = compositor_mpeg4_get_sensor_handler_ex(child->node, GF_TRUE);
 				if (hsens) {
 					if (!group->sensors) group->sensors = gf_list_new();
 					gf_list_add(group->sensors, hsens);
@@ -92,7 +92,7 @@
 
 	/*now here is the trick: ExternProtos may not be loaded at this point, in which case we can't
 	perform proper culling. Unloaded ExternProto signal themselves by invalidating their parent
-	graph to get a new traversal. We must therefore reset the CHILD_DIRTY flag before computing 
+	graph to get a new traversal. We must therefore reset the CHILD_DIRTY flag before computing
 	bounds otherwise we'll never re-invalidate the subgraph anymore*/
 	gf_node_dirty_clear(node, GF_SG_CHILD_DIRTY);
 
@@ -122,13 +122,13 @@
 		tr_state->bounds.width = tr_state->bounds.height = 0;
 #ifndef GPAC_DISABLE_3D
 		tr_state->bbox.is_set = 0;
-#endif		
+#endif
 		while (child) {
 			gf_node_traverse(child->node, tr_state);
 			if (tr_state->disable_cull) {
 				group->flags |= GROUP_SKIP_CULLING;
 				tr_state->disable_cull = 0;
-			} 
+			}
 			/*handle 3D nodes in 2D groups*/
 #ifndef GPAC_DISABLE_3D
 			if (tr_state->bbox.is_set) {
@@ -143,7 +143,7 @@
 
 		tr_state->bounds = group->bounds;
 
-		if (group->flags & GROUP_SKIP_CULLING) 
+		if (group->flags & GROUP_SKIP_CULLING)
 			tr_state->disable_cull = 1;
 		tr_state->text_split_mode = backup;
 	}
@@ -169,10 +169,10 @@
 			gf_node_traverse(child->node, tr_state);
 			child = child->next;
 #ifdef GF_SR_USE_VIDEO_CACHE
-			if (tr_state->cache_too_small) 
+			if (tr_state->cache_too_small)
 				cache_too_small++;
 #endif
-		} 
+		}
 
 		tr_state->invalidate_all = prev_inv;
 
@@ -180,7 +180,7 @@
 		if (cache_too_small) {
 			tr_state->cache_too_small = 1;
 		} else {
-			/*get the traversal time for each group*/	
+			/*get the traversal time for each group*/
 			traverse_time = gf_sys_clock() - traverse_time;
 			group->traverse_time += traverse_time;
 			/*record the traversal information and turn cache on if possible*/
@@ -195,7 +195,7 @@
 		while (child) {
 			gf_node_traverse(child->node, tr_state);
 			child = child->next;
-		} 
+		}
 
 	}
 
@@ -225,11 +225,11 @@
 		group->flags &= ~GROUP_HAS_SENSORS;
 		drawable_reset_group_highlight(tr_state, node);
 		/*special case for anchor which is a parent node acting as a sensor*/
-		if ((ntag==TAG_MPEG4_Anchor) 
+		if ((ntag==TAG_MPEG4_Anchor)
 #ifndef GPAC_DISABLE_X3D
-			|| (ntag==TAG_X3D_Anchor)
+		        || (ntag==TAG_X3D_Anchor)
 #endif
-		) {
+		   ) {
 			GF_SensorHandler *gf_sc_anchor_get_handler(GF_Node *n);
 
 			hsens = gf_sc_anchor_get_handler(node);
@@ -241,7 +241,7 @@
 		} else {
 			list = ((GF_ParentNode *)node)->children;
 			while (list) {
-				hsens = compositor_mpeg4_get_sensor_handler(list->node);
+				hsens = compositor_mpeg4_get_sensor_handler_ex(list->node, GF_TRUE);
 				if (hsens) {
 					if (!group->sensors) group->sensors = gf_list_new();
 					gf_list_add(group->sensors, hsens);
@@ -263,7 +263,7 @@
 
 	/*now here is the trick: ExternProtos may not be loaded at this point, in which case we can't
 	perform proper culling. Unloaded ExternProto signal themselves by invalidating their parent
-	graph to get a new traversal. We must therefore reset the CHILD_DIRTY flag before computing 
+	graph to get a new traversal. We must therefore reset the CHILD_DIRTY flag before computing
 	bounds otherwise we'll never re-invalidate the subgraph anymore*/
 	gf_node_dirty_clear(node, GF_SG_CHILD_DIRTY);
 
@@ -289,7 +289,7 @@
 		tr_state->bounds.width = tr_state->bounds.height = 0;
 #ifndef GPAC_DISABLE_3D
 		tr_state->bbox.is_set = 0;
-#endif		
+#endif
 		count = gf_node_list_get_count(list);
 		for (i=0; i<count; i++) {
 			child = gf_node_list_get_child(list, positions[i]);
@@ -297,7 +297,7 @@
 			if (tr_state->disable_cull) {
 				group->flags |= GROUP_SKIP_CULLING;
 				tr_state->disable_cull = 0;
-			} 
+			}
 			/*handle 3D nodes in 2D groups*/
 #ifndef GPAC_DISABLE_3D
 			if (tr_state->bbox.is_set) {
@@ -310,11 +310,11 @@
 		}
 		tr_state->bounds = group->bounds;
 
-		if (group->flags & GROUP_SKIP_CULLING) 
+		if (group->flags & GROUP_SKIP_CULLING)
 			tr_state->disable_cull = 1;
 		tr_state->text_split_mode = backup;
 
-	/*TRAVERSE_SORT */
+		/*TRAVERSE_SORT */
 	} else if (tr_state->traversing_mode==TRAVERSE_SORT) {
 		Bool prev_inv = tr_state->invalidate_all;
 #ifdef GF_SR_USE_VIDEO_CACHE
@@ -337,17 +337,17 @@
 			child = gf_node_list_get_child(list, positions[i]);
 			gf_node_traverse(child, tr_state);
 #ifdef GF_SR_USE_VIDEO_CACHE
-			if (tr_state->cache_too_small) 
+			if (tr_state->cache_too_small)
 				cache_too_small++;
 #endif
-		} 
+		}
 		tr_state->invalidate_all = prev_inv;
 
 #ifdef GF_SR_USE_VIDEO_CACHE
 		if (cache_too_small) {
 			tr_state->cache_too_small = 1;
 		} else {
-			/*get the traversal time for each group*/	
+			/*get the traversal time for each group*/
 			traverse_time = gf_sys_clock() - traverse_time;
 			group->traverse_time += traverse_time;
 			/*record the traversal information and turn cache on if possible*/
@@ -362,7 +362,7 @@
 		for (i=0; i<count; i++) {
 			child = gf_node_list_get_child(list, positions[i]);
 			gf_node_traverse(child, tr_state);
-		} 
+		}
 	}
 
 	if (sensor_backup) {
@@ -401,15 +401,15 @@
 static u32 get_light_type(GF_Node *n)
 {
 	switch (gf_node_get_tag(n)) {
-	case TAG_MPEG4_DirectionalLight: 
+	case TAG_MPEG4_DirectionalLight:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_DirectionalLight: 
+	case TAG_X3D_DirectionalLight:
 #endif
 		return 2;
 	case TAG_MPEG4_PointLight:
 	case TAG_MPEG4_SpotLight:
 		return 1;
-	default: 
+	default:
 		return 0;
 	}
 }
@@ -440,13 +440,13 @@
 			/*special case for anchor which is a parent node acting as a sensor*/
 			if ((ntag==TAG_MPEG4_Anchor)
 #ifndef GPAC_DISABLE_X3D
-				|| (ntag==TAG_X3D_Anchor)
+			        || (ntag==TAG_X3D_Anchor)
 #endif
-				) group->flags |= GROUP_HAS_SENSORS;
+			   ) group->flags |= GROUP_HAS_SENSORS;
 
 			l = ((GF_ParentNode*)node)->children;
 			while (l) {
-				hsens = compositor_mpeg4_get_sensor_handler(l->node);
+				hsens = compositor_mpeg4_get_sensor_handler_ex(l->node, GF_TRUE);
 				if (hsens) {
 					group->flags |= GROUP_HAS_SENSORS;
 					break;
@@ -460,7 +460,7 @@
 
 			/*now here is the trick: ExternProtos may not be loaded at this point, in which case we can't
 			perform proper culling. Unloaded ExternProto signal themselves by invalidating their parent
-			graph to get a new traversal. We must therefore reset the CHILD_DIRTY flag before computing 
+			graph to get a new traversal. We must therefore reset the CHILD_DIRTY flag before computing
 			bounds otherwise we'll never re-invalidate the subgraph anymore*/
 			gf_node_dirty_clear(node, GF_SG_CHILD_DIRTY);
 		}
@@ -477,16 +477,16 @@
 
 	mode_back=tr_state->cull_flag;
 	/*if culling not disabled*/
-	if (!(group->flags & GROUP_SKIP_CULLING) 
-		/*for geometry AND lights*/
-		&& (tr_state->traversing_mode==TRAVERSE_SORT) 
-		/*do cull*/
-		&& !visual_3d_node_cull(tr_state, &group->bbox, 0)) {
+	if (!(group->flags & GROUP_SKIP_CULLING)
+	        /*for geometry AND lights*/
+	        && (tr_state->traversing_mode==TRAVERSE_SORT)
+	        /*do cull*/
+	        && !visual_3d_node_cull(tr_state, &group->bbox, 0)) {
 
 		tr_state->cull_flag = mode_back;
 		return;
 	}
-	
+
 
 	/*picking: collect sensors*/
 	sensor_backup = NULL;
@@ -497,8 +497,8 @@
 
 		l = ((GF_ParentNode*)node)->children;
 		while (l) {
-			hsens = compositor_mpeg4_get_sensor_handler(l->node);
-			if (hsens && hsens->IsEnabled(l->node)) 
+			hsens = compositor_mpeg4_get_sensor_handler_ex(l->node, GF_TRUE);
+			if (hsens && hsens->IsEnabled(l->node))
 				gf_list_add(tr_state->vrml_sensors, hsens);
 
 			l = l->next;
@@ -539,7 +539,7 @@
 		}
 	}
 
-		
+
 	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) {
 		l = ((GF_ParentNode*)node)->children;
 		split_text_backup = tr_state->text_split_mode;
@@ -553,7 +553,7 @@
 			if (tr_state->disable_cull) {
 				group->flags |= GROUP_SKIP_CULLING;
 				tr_state->disable_cull = 0;
-			} 
+			}
 			/*handle 2D nodes in 3D groups*/
 			if (tr_state->bounds.width) {
 				gf_bbox_from_rect(&tr_state->bbox, &tr_state->bounds);
@@ -567,7 +567,7 @@
 			l = l->next;
 		}
 		tr_state->bbox = group->bbox;
-		if (group->flags & GROUP_SKIP_CULLING) 
+		if (group->flags & GROUP_SKIP_CULLING)
 			tr_state->disable_cull = 1;
 		tr_state->text_split_mode = split_text_backup;
 	} else {
@@ -577,7 +577,7 @@
 			l = l->next;
 		}
 
-		if (tr_state->traversing_mode==TRAVERSE_SORT) 
+		if (tr_state->traversing_mode==TRAVERSE_SORT)
 			drawable3d_check_focus_highlight(node, tr_state, NULL);
 	}
 	tr_state->cull_flag = mode_back;
@@ -681,16 +681,17 @@
 		u32 ntag = gf_node_get_tag(node);
 		group->flags &= ~GROUP_HAS_SENSORS;
 		/*special case for anchor which is a parent node acting as a sensor*/
-		if ((ntag==TAG_MPEG4_Anchor) 
+		if ((ntag==TAG_MPEG4_Anchor)
 #ifndef GPAC_DISABLE_X3D
-			|| (ntag==TAG_X3D_Anchor)
+		        || (ntag==TAG_X3D_Anchor)
 #endif
-		) {
+		   ) {
 			group->flags |= GROUP_HAS_SENSORS | GROUP_IS_ANCHOR;
 		} else {
 			l = ((GF_ParentNode *)node)->children;
 			while (l) {
-				if (compositor_mpeg4_is_sensor_node(l->node)) {
+				GF_SensorHandler *hsens = compositor_mpeg4_get_sensor_handler_ex(l->node, GF_TRUE);
+				if (hsens) {
 					group->flags |= GROUP_HAS_SENSORS;
 					break;
 				}
@@ -700,14 +701,14 @@
 
 		/*now here is the trick: ExternProtos may not be loaded at this point, in which case we can't
 		perform proper culling. Unloaded ExternProto signal themselves by invalidating their parent
-		graph to get a new traversal. We must therefore reset the CHILD_DIRTY flag before computing 
+		graph to get a new traversal. We must therefore reset the CHILD_DIRTY flag before computing
 		bounds otherwise we'll never re-invalidate the subgraph anymore*/
 		gf_node_dirty_clear(node, GF_SG_CHILD_DIRTY);
 	}
 	gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 
 	/*no culling in 2D*/
-	
+
 	/*picking: collect sensors*/
 	sensor_backup = NULL;
 	if ((tr_state->traversing_mode==TRAVERSE_PICK) && (group->flags & GROUP_HAS_SENSORS) ) {
@@ -720,7 +721,7 @@
 		/*add sensor(s) to traversing state*/
 		l = ((GF_ParentNode *)node)->children;
 		while (l) {
-			hsens = compositor_mpeg4_get_sensor_handler(l->node);
+			hsens = compositor_mpeg4_get_sensor_handler_ex(l->node, GF_TRUE);
 			if (hsens) gf_list_add(tr_state->vrml_sensors, hsens);
 			l = l->next;
 		}
@@ -733,14 +734,14 @@
 	tr_state->bounds.width = tr_state->bounds.height = 0;
 #ifndef GPAC_DISABLE_3D
 	tr_state->bbox.is_set = 0;
-#endif	
+#endif
 
 	l = ((GF_ParentNode *)node)->children;
 	while (l) {
 		parent_node_start_group(group, l->node, 0);
-		
+
 		tr_state->bounds.width = tr_state->bounds.height = 0;
-	
+
 		gf_node_traverse(l->node, tr_state);
 
 		/*handle 3D nodes in 2D groups*/
@@ -766,7 +767,7 @@
 void parent_node_child_traverse(ChildGroup *cg, GF_TraverseState *tr_state)
 {
 	Fixed dx, dy;
-		
+
 	dx = cg->final.x - cg->original.x + cg->scroll_x;
 	dy = cg->final.y - cg->original.y + cg->scroll_y;
 	tr_state->text_split_idx = cg->text_split_idx;
@@ -777,20 +778,9 @@
 
 		gf_mx_copy(mx_bckup, tr_state->model_matrix);
 		gf_mx_add_translation(&tr_state->model_matrix, dx, dy, 0);
-
-		if (tr_state->traversing_mode==TRAVERSE_SORT) {
-			GF_Matrix mx;
-			gf_mx_init(mx);
-			gf_mx_add_translation(&mx, dx, dy, 0);
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_matrix_add(tr_state->visual, mx.m);
-			gf_node_traverse(cg->child, tr_state);
-			visual_3d_matrix_pop(tr_state->visual);
-		} else {
-			gf_node_traverse(cg->child, tr_state);
-		}
+		gf_node_traverse(cg->child, tr_state);
 		gf_mx_copy(tr_state->model_matrix, mx_bckup);
-	} else 
+	} else
 #endif
 	{
 		GF_Matrix2D mx2d;
@@ -807,7 +797,7 @@
 void parent_node_child_traverse_matrix(ChildGroup *cg, GF_TraverseState *tr_state, GF_Matrix2D *mat2D)
 {
 	if (!mat2D) return;
-	
+
 	tr_state->text_split_idx = cg->text_split_idx;
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d) {
@@ -815,16 +805,9 @@
 		gf_mx_from_mx2d(&mx, mat2D);
 		gf_mx_copy(mx_bckup, tr_state->model_matrix);
 		gf_mx_add_matrix(&tr_state->model_matrix, &mx);
-		if (tr_state->traversing_mode==TRAVERSE_SORT) {
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_matrix_add(tr_state->visual, mx.m);
-			gf_node_traverse(cg->child, tr_state);
-			visual_3d_matrix_pop(tr_state->visual);
-		} else {
-			gf_node_traverse(cg->child, tr_state);
-		}
+		gf_node_traverse(cg->child, tr_state);
 		gf_mx_copy(tr_state->model_matrix, mx_bckup);
-	} else 
+	} else
 #endif
 	{
 		GF_Matrix2D mx2d;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_grouping.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_grouping.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -65,20 +65,20 @@
 	u32 cached_size;		\
 	/*number of objects in cache - for debug purposes only*/		\
 	u32 nb_objects;		\
-
+ 
 
 #else
 
 #define GROUPING_NODE_STACK_2D		\
 	u32 flags;						\
 	GF_Rect bounds;					\
-
+ 
 #endif
 
 #define GROUPING_MPEG4_STACK_2D		\
 	GROUPING_NODE_STACK_2D			\
 	GF_List *sensors;				\
-
+ 
 typedef struct _mpeg4_group2d
 {
 	GROUPING_MPEG4_STACK_2D
@@ -116,7 +116,7 @@
 #define GROUPING_NODE_STACK_3D	\
 	u32 flags;						\
 	GF_BBox bbox;				\
-
+ 
 typedef struct _parent_node_3d
 {
 	GROUPING_NODE_STACK_3D
@@ -138,14 +138,14 @@
 */
 
 
-typedef struct 
+typedef struct
 {
 	/*the associated child (can be a group or a shape)*/
 	GF_Node *child;
 
 	/*child bounds before and after placement*/
 	GF_Rect original, final;
-	
+
 	/*layout run-time scroll*/
 	Fixed scroll_x, scroll_y;
 
@@ -161,7 +161,7 @@
 #define PARENT_MPEG4_STACK_2D	\
 			GROUPING_MPEG4_STACK_2D	\
 			/*list of ChildGroup drawn (can be fully transparents) - used for post placement*/	\
-			GF_List *groups;	
+			GF_List *groups;
 
 
 typedef struct _parent_node_2d

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_grouping_2d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_grouping_2d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -43,7 +43,7 @@
 	s32 whichChoice;
 	GF_Node *child;
 	SwitchStack *st = (SwitchStack *)gf_node_get_private(node);
-	GF_TraverseState *tr_state; 
+	GF_TraverseState *tr_state;
 	tr_state = (GF_TraverseState *)rs;
 	children = NULL;
 
@@ -75,7 +75,7 @@
 			i=0;
 			l = children;
 			while (l) {
-	//			if ((s32) i!=whichChoice) gf_node_traverse(l->node, tr_state);
+				//			if ((s32) i!=whichChoice) gf_node_traverse(l->node, tr_state);
 				if ((s32) i == st->last_switch) gf_node_traverse(l->node, tr_state);
 				l = l->next;
 				i++;
@@ -103,7 +103,7 @@
 			child = (GF_Node*)gf_node_list_get_child(children, idx);
 			gf_node_traverse(child, tr_state);
 			return;
-		} else 
+		} else
 #endif //GPAC_DISABLE_3D
 		{
 			/*fallback to first view*/
@@ -141,33 +141,22 @@
 	/*note we don't clear dirty flag, this is done in traversing*/
 	if (stack->is_identity) {
 		group_2d_traverse(node, (GroupingNode2D *)stack, tr_state);
-	} 
+	}
 #ifndef GPAC_DISABLE_3D
 	else if (tr_state->visual->type_3d) {
 		GF_Matrix mx_bckup;
 		gf_mx_copy(mx_bckup, tr_state->model_matrix);
 
 		gf_mx_add_matrix_2d(&tr_state->model_matrix, &stack->mat);
-
-		if (tr_state->traversing_mode == TRAVERSE_SORT) {
-			GF_Matrix tmp;
-			gf_mx_from_mx2d(&tmp, &stack->mat);
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_matrix_add(tr_state->visual, tmp.m);
-			group_2d_traverse(node, (GroupingNode2D *)stack, tr_state);
-			visual_3d_matrix_pop(tr_state->visual);
-		} else {
-			group_2d_traverse(node, (GroupingNode2D *)stack, tr_state);
-		}
-
+		group_2d_traverse(node, (GroupingNode2D *)stack, tr_state);
 		gf_mx_copy(tr_state->model_matrix, mx_bckup);
-	} 
+	}
 #endif
 	else {
 		GF_Matrix2D bckup;
 		gf_mx2d_copy(bckup, tr_state->transform);
 		gf_mx2d_pre_multiply(&tr_state->transform, &stack->mat);
-		
+
 		group_2d_traverse(node, (GroupingNode2D *)stack, tr_state);
 
 		gf_mx2d_copy(tr_state->transform, bckup);
@@ -184,7 +173,7 @@
 	M_Transform2D *tr = (M_Transform2D *)node;
 	Transform2DStack *ptr = (Transform2DStack *)gf_node_get_private(node);
 	GF_TraverseState *tr_state;
-	
+
 	if (is_destroy) {
 		gf_sc_check_focus_upon_destroy(node);
 		group_2d_destroy(node, (GroupingNode2D*)ptr);
@@ -256,7 +245,7 @@
 		M_TransformMatrix2D *tr = (M_TransformMatrix2D*)node;
 		tr_mx2d_get_matrix(node, &ptr->mat);
 		if ((tr->mxx==FIX_ONE) && (tr->mxy==0) && (tr->tx==0)
-			&& (tr->myx==0) && (tr->myy==FIX_ONE) && (tr->ty==0) )
+		        && (tr->myx==0) && (tr->myy==FIX_ONE) && (tr->ty==0) )
 			ptr->is_identity = 1;
 		else
 			ptr->is_identity = 0;
@@ -308,18 +297,18 @@
 	prev_inv = tr_state->invalidate_all;
 	c_changed = 0;
 	if (gf_node_dirty_get(node) & GF_SG_NODE_DIRTY) {
-		gf_cmx_set(&ptr->cmat, 
-			tr->mrr , tr->mrg, tr->mrb, tr->mra, tr->tr, 
-			tr->mgr , tr->mgg, tr->mgb, tr->mga, tr->tg, 
-			tr->mbr, tr->mbg, tr->mbb, tr->mba, tr->tb, 
-			tr->mar, tr->mag, tr->mab, tr->maa, tr->ta); 
+		gf_cmx_set(&ptr->cmat,
+		           tr->mrr , tr->mrg, tr->mrb, tr->mra, tr->tr,
+		           tr->mgr , tr->mgg, tr->mgb, tr->mga, tr->tg,
+		           tr->mbr, tr->mbg, tr->mbb, tr->mba, tr->tb,
+		           tr->mar, tr->mag, tr->mab, tr->maa, tr->ta);
 		c_changed = 1;
 		gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 	}
 
-	if ((tr_state->traversing_mode==TRAVERSE_SORT) 
-		&& !tr->maa && !tr->mar && !tr->mag && !tr->mab && !tr->ta)
-		return; 
+	if ((tr_state->traversing_mode==TRAVERSE_SORT)
+	        && !tr->maa && !tr->mar && !tr->mag && !tr->mab && !tr->ta)
+		return;
 
 	/*if modified redraw all nodes*/
 	if (c_changed) tr_state->invalidate_all = 1;
@@ -412,7 +401,7 @@
 		stack->positions = (u32*)gf_malloc(sizeof(u32) * count);
 		for (i=0; i<count; i++) stack->positions[i] = priorities[i].position;
 		gf_free(priorities);
-		
+
 		tr_state->invalidate_all = 1;
 		gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 	}
@@ -423,7 +412,7 @@
 void compositor_init_orderedgroup(GF_Compositor *compositor, GF_Node *node)
 {
 	OrderedGroupStack *ptr;
-	GF_SAFEALLOC(ptr, OrderedGroupStack);	
+	GF_SAFEALLOC(ptr, OrderedGroupStack);
 	gf_node_set_private(node, ptr);
 	gf_node_set_callback_function(node, TraverseOrderedGroup);
 }

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_grouping_3d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_grouping_3d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -49,7 +49,7 @@
 void compositor_init_group(GF_Compositor *compositor, GF_Node *node)
 {
 	GroupingNode2D *ptr;
-	GF_SAFEALLOC(ptr, GroupingNode2D);	
+	GF_SAFEALLOC(ptr, GroupingNode2D);
 	gf_node_set_private(node, ptr);
 	gf_node_set_callback_function(node, TraverseGroup);
 }
@@ -128,7 +128,7 @@
 		}
 		if (tr_state->camera->collide_flags & CF_COLLISION) {
 			col->collideTime = gf_node_get_scene_time(node);
-			gf_node_event_out_str(node, "collideTime");
+			gf_node_event_out(node, 5/*"collideTime"*/);
 			/*if not closer restore*/
 			if (collide_flags && (last_dist<tr_state->camera->collide_dist)) {
 				tr_state->camera->collide_flags = collide_flags;
@@ -153,7 +153,7 @@
 {
 	GROUPING_NODE_STACK_3D
 
-		GF_Matrix mx;
+	GF_Matrix mx;
 	Bool has_scale;
 } TransformStack;
 
@@ -173,14 +173,6 @@
 	gf_node_set_private(node, st);
 }
 
-#define TRANS_PUSH_MX	\
-		if (tr_state->traversing_mode == TRAVERSE_SORT) {	\
-			visual_3d_matrix_push(tr_state->visual); \
-			visual_3d_matrix_add(tr_state->visual, st->mx.m);	\
-		}	\
-
-#define TRANS_POP_MX	if (tr_state->traversing_mode==TRAVERSE_SORT) visual_3d_matrix_pop(tr_state->visual);
-
 static void TraverseTransform(GF_Node *n, void *rs, Bool is_destroy)
 {
 	GF_Matrix gf_mx_bckup;
@@ -197,39 +189,34 @@
 	if (gf_node_dirty_get(n) & GF_SG_NODE_DIRTY) {
 		Bool scale_rot, recenter;
 		gf_mx_init(st->mx);
-		if (tr->translation.x || tr->translation.y || tr->translation.z) 
+		if (tr->translation.x || tr->translation.y || tr->translation.z)
 			gf_mx_add_translation(&st->mx, tr->translation.x, tr->translation.y, tr->translation.z);
 		recenter = (tr->center.x || tr->center.y || tr->center.z) ? 1 : 0;
-		if (recenter) 
+		if (recenter)
 			gf_mx_add_translation(&st->mx, tr->center.x, tr->center.y, tr->center.z);
 
 		if (tr->rotation.q) gf_mx_add_rotation(&st->mx, tr->rotation.q, tr->rotation.x, tr->rotation.y, tr->rotation.z);
 		scale_rot = (tr->scaleOrientation.q) ? 1 : 0;
-		if (scale_rot) 
+		if (scale_rot)
 			gf_mx_add_rotation(&st->mx, tr->scaleOrientation.q, tr->scaleOrientation.x, tr->scaleOrientation.y, tr->scaleOrientation.z);
-		if ((tr->scale.x != FIX_ONE) || (tr->scale.y != FIX_ONE) || (tr->scale.z != FIX_ONE)) 
+		if ((tr->scale.x != FIX_ONE) || (tr->scale.y != FIX_ONE) || (tr->scale.z != FIX_ONE))
 			gf_mx_add_scale(&st->mx, tr->scale.x, tr->scale.y, tr->scale.z);
-		if (scale_rot) 
+		if (scale_rot)
 			gf_mx_add_rotation(&st->mx, -tr->scaleOrientation.q, tr->scaleOrientation.x, tr->scaleOrientation.y, tr->scaleOrientation.z);
-		if (recenter) 
+		if (recenter)
 			gf_mx_add_translation(&st->mx, -tr->center.x, -tr->center.y, -tr->center.z);
 
 		st->has_scale = ((tr->scale.x != FIX_ONE) || (tr->scale.y != FIX_ONE) || (tr->scale.z != FIX_ONE)) ? 1 : 0;
-   	}
+	}
 
 	gf_mx_copy(gf_mx_bckup, tr_state->model_matrix);
 	gf_mx_add_matrix(&tr_state->model_matrix, &st->mx);
 
-	TRANS_PUSH_MX
-	
 	/*note we don't clear dirty flag, this is done in traversing*/
 	group_3d_traverse(n, (GroupingNode *) st, tr_state);
 
-	TRANS_POP_MX	
-
-	
 	gf_mx_copy(tr_state->model_matrix, gf_mx_bckup);
-	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) 
+	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS)
 		gf_mx_apply_bbox(&st->mx, &tr_state->bbox);
 }
 
@@ -293,7 +280,8 @@
 			gf_vec_add(user_pos, user_pos, tmp);
 			gf_vec_norm(&user_pos);
 
-			z.x = z.y = 0; z.z = FIX_ONE;
+			z.x = z.y = 0;
+			z.z = FIX_ONE;
 			d = -gf_vec_dot(axis, z);
 			tmp = gf_vec_scale(axis, d);
 			gf_vec_add(z, z, tmp);
@@ -302,7 +290,7 @@
 			cosw = gf_vec_dot(user_pos, z);
 			tmp = gf_vec_cross(user_pos, z);
 			sinw = gf_vec_len(tmp);
-			angle = gf_acos(cosw); 
+			angle = gf_acos(cosw);
 			gf_vec_norm(&tmp);
 			if ((sinw>0) && (gf_vec_dot(axis, tmp) > 0)) gf_vec_rev(axis);
 			gf_mx_add_rotation(&st->mx, angle, axis.x, axis.y, axis.z);
@@ -311,14 +299,10 @@
 
 	gf_mx_copy(gf_mx_bckup, tr_state->model_matrix);
 	gf_mx_add_matrix(&tr_state->model_matrix, &st->mx);
-	
-	TRANS_PUSH_MX
 
 	/*note we don't clear dirty flag, this is done in traversing*/
 	group_3d_traverse(n, (GroupingNode *) st, tr_state);
 
-	TRANS_POP_MX
-
 	gf_mx_copy(tr_state->model_matrix, gf_mx_bckup);
 
 	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) gf_mx_apply_bbox(&st->mx, &tr_state->bbox);
@@ -365,7 +349,7 @@
 
 	if (!children) return;
 	nb_children = gf_node_list_get_count(children);
-	
+
 	if (!tr_state->camera) {
 		do_all = 1;
 		which_child = 0;
@@ -393,7 +377,7 @@
 			do_all = 1;
 		}
 	}
-	
+
 	if (do_all) {
 		u32 i;
 		Bool prev_switch = tr_state->switched_off;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_layer_2d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_layer_2d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -50,19 +50,19 @@
 	l2d = (M_Layer2D *)n;
 	if (force_traverse) gf_node_traverse(l2d->background, tr_state);
 	btop = (GF_Node*)gf_list_get(tr_state->backgrounds, 0);
-	if (btop != l2d->background) { 
+	if (btop != l2d->background) {
 		gf_node_unregister(l2d->background, n);
-		gf_node_register(btop, n); 
+		gf_node_register(btop, n);
 		l2d->background = btop;
-		gf_node_event_out_str(n, "background");
+		gf_node_event_out(n, 4/*"background"*/);
 	}
 	if (force_traverse) gf_node_traverse(l2d->viewport, tr_state);
 	btop = (GF_Node*)gf_list_get(tr_state->viewpoints, 0);
-	if (btop != l2d->viewport) { 
+	if (btop != l2d->viewport) {
 		gf_node_unregister(l2d->viewport, n);
-		gf_node_register(btop, n); 
+		gf_node_register(btop, n);
 		l2d->viewport = btop;
-		gf_node_event_out_str(n, "viewport");
+		gf_node_event_out(n, 5/*"viewport"*/);
 	}
 }
 
@@ -71,23 +71,23 @@
 static void rect_intersect(GF_Rect *rc1, GF_Rect *rc2)
 {
 	if (! gf_rect_overlaps(*rc1, *rc2)) {
-		rc1->width = rc1->height = 0; 
+		rc1->width = rc1->height = 0;
 		return;
 	}
 	if (rc2->x > rc1->x) {
 		rc1->width -= rc2->x - rc1->x;
 		rc1->x = rc2->x;
-	} 
+	}
 	if (rc2->x + rc2->width < rc1->x + rc1->width) {
 		rc1->width = rc2->width + rc2->x - rc1->x;
-	} 
+	}
 	if (rc2->y < rc1->y) {
-		rc1->height -= rc1->y - rc2->y; 
+		rc1->height -= rc1->y - rc2->y;
 		rc1->y = rc2->y;
-	} 
+	}
 	if (rc2->y - rc2->height > rc1->y - rc1->height) {
 		rc1->height = rc1->y - rc2->y + rc2->height;
-	} 
+	}
 }
 #endif
 
@@ -109,11 +109,11 @@
 	GF_Rect prev_clipper;
 	Bool had_clip;
 #endif
-	
+
 	M_Layer2D *l = (M_Layer2D *)node;
 	Layer2DStack *st = (Layer2DStack *) gf_node_get_private(node);
 	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
-	
+
 	if (is_destroy) {
 		BindableStackDelete(st->backs);
 		BindableStackDelete(st->views);
@@ -155,7 +155,7 @@
 		st->clip = gf_rect_center(st->clip.width, st->clip.height);
 		st->bounds = st->clip;
 	}
-	
+
 	prev_vp = tr_state->vp_size;
 	tr_state->vp_size.x = st->clip.width;
 	tr_state->vp_size.y = st->clip.height;
@@ -167,12 +167,14 @@
 			gf_mx_copy(prev_layer_mx, tr_state->layer_matrix);
 			tr_state->layer_clipper = compositor_2d_update_clipper(tr_state, st->clip, &had_clip, &prev_clipper, 1);
 
-			visual_3d_matrix_push(tr_state->visual);
 			gf_mx_copy(mx3d, tr_state->model_matrix);
 
 			/*setup clipping*/
-			visual_3d_set_clipper_2d(tr_state->visual, tr_state->layer_clipper);
-			
+			if (had_clip) {
+				visual_3d_reset_clipper_2d(tr_state->visual);
+			}
+			visual_3d_set_clipper_2d(tr_state->visual, tr_state->layer_clipper, &mx3d, 0);
+
 			/*apply background BEFORE viewport*/
 			if (back) {
 				tr_state->traversing_mode = TRAVERSE_BINDABLE;
@@ -185,7 +187,6 @@
 				tr_state->traversing_mode = TRAVERSE_BINDABLE;
 				tr_state->bounds = st->clip;
 				gf_node_traverse(viewport, tr_state);
-				visual_3d_matrix_add(tr_state->visual, tr_state->model_matrix.m);
 			}
 
 
@@ -203,8 +204,6 @@
 			gf_list_del(tr_state->visual->alpha_nodes_to_draw);
 			tr_state->visual->alpha_nodes_to_draw = node_list_backup;
 
-			
-			visual_3d_matrix_pop(tr_state->visual);
 			gf_mx_copy(tr_state->model_matrix, mx3d);
 
 			visual_3d_reset_clipper_2d(tr_state->visual);
@@ -213,16 +212,16 @@
 			if (had_clip) {
 				tr_state->layer_clipper = prev_clipper;
 				gf_mx_copy(tr_state->layer_matrix, prev_layer_mx);
-				visual_3d_set_clipper_2d(tr_state->visual, tr_state->layer_clipper);
+				visual_3d_set_clipper_2d(tr_state->visual, tr_state->layer_clipper, &prev_layer_mx, 0);
 			}
-		} else 
+		} else
 #endif
 		{
 			gf_mx2d_copy(backup, tr_state->transform);
 
 			prev_clip = tr_state->visual->top_clipper;
 			rc = st->clip;
-			
+
 			/*get clipper in world coordinate*/
 			gf_mx2d_apply_rect(&tr_state->transform, &rc);
 
@@ -238,8 +237,10 @@
 #endif
 			}
 
-			rc.x -= FIX_ONE; rc.width += 2*FIX_ONE;
-			rc.y += FIX_ONE; rc.height += 2*FIX_ONE;
+			rc.x -= FIX_ONE;
+			rc.width += 2*FIX_ONE;
+			rc.y += FIX_ONE;
+			rc.height += 2*FIX_ONE;
 			tr_state->visual->top_clipper = gf_rect_pixelize(&rc);
 			gf_irect_intersect(&tr_state->visual->top_clipper, &prev_clip);
 			tr_state->traversing_mode = TRAVERSE_SORT;
@@ -295,11 +296,11 @@
 			gf_mx2d_copy(tr_state->transform, backup);
 		}
 		break;
-		
-		/*check picking - we must fall in our 2D clipper*/
+
+	/*check picking - we must fall in our 2D clipper*/
 	case TRAVERSE_PICK:
 		if (gf_sc_pick_in_clipper(tr_state, &st->clip)) {
-		
+
 #ifndef GPAC_DISABLE_3D
 			if (tr_state->visual->type_3d) {
 				/*apply viewport*/
@@ -314,7 +315,7 @@
 				} else {
 					group_2d_traverse(node, (GroupingNode2D *)st, tr_state);
 				}
-			} else 
+			} else
 #endif
 			{
 				if (viewport) {
@@ -328,7 +329,7 @@
 				} else {
 					group_2d_traverse(node, (GroupingNode2D *)st, tr_state);
 				}
-			}	
+			}
 		}
 		break;
 	case TRAVERSE_GET_BOUNDS:
@@ -353,7 +354,7 @@
 		break;
 #endif
 	}
-	
+
 	/*restore traversing state*/
 	tr_state->vp_size = prev_vp;
 	tr_state->backgrounds = oldb;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_layer_3d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_layer_3d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -97,35 +97,35 @@
 
 	if (force_traverse) gf_node_traverse(l3d->background, tr_state);
 	btop = (GF_Node*)gf_list_get(tr_state->backgrounds, 0);
-	if (btop != l3d->background) { 
+	if (btop != l3d->background) {
 		gf_node_unregister(l3d->background, n);
-		gf_node_register(btop, n); 
+		gf_node_register(btop, n);
 		l3d->background = btop;
-		gf_node_event_out_str(n, "background");
+		gf_node_event_out(n, 4/*"background"*/);
 	}
 	if (force_traverse) gf_node_traverse(l3d->viewpoint, tr_state);
 	btop = (GF_Node*)gf_list_get(tr_state->viewpoints, 0);
-	if (btop != l3d->viewpoint) { 
+	if (btop != l3d->viewpoint) {
 		gf_node_unregister(l3d->viewpoint, n);
-		gf_node_register(btop, n); 
+		gf_node_register(btop, n);
 		l3d->viewpoint = btop;
-		gf_node_event_out_str(n, "viewpoint");
+		gf_node_event_out(n, 7/*"viewpoint"*/);
 	}
 	if (force_traverse) gf_node_traverse(l3d->navigationInfo, tr_state);
 	btop = (GF_Node*)gf_list_get(tr_state->navigations, 0);
-	if (btop != l3d->navigationInfo) { 
+	if (btop != l3d->navigationInfo) {
 		gf_node_unregister(l3d->navigationInfo, n);
-		gf_node_register(btop, n); 
+		gf_node_register(btop, n);
 		l3d->navigationInfo = btop;
-		gf_node_event_out_str(n, "navigationInfo");
+		gf_node_event_out(n, 6/*"navigationInfo"*/);
 	}
 	if (force_traverse) gf_node_traverse(l3d->fog, tr_state);
 	btop = (GF_Node*)gf_list_get(tr_state->fogs, 0);
-	if (btop != l3d->fog) { 
+	if (btop != l3d->fog) {
 		gf_node_unregister(l3d->fog, n);
-		gf_node_register(btop, n); 
+		gf_node_register(btop, n);
 		l3d->fog = btop;
-		gf_node_event_out_str(n, "fog");
+		gf_node_event_out(n, 5/*"fog"*/);
 	}
 	tr_state->traversing_mode = mode;
 }
@@ -147,12 +147,12 @@
 	}
 #endif
 
-/*
-	if (tr_state->visual->compositor->recompute_ar) {
-		gf_node_dirty_set(node, 0, 0);
-		return 0;
-	}
-*/
+	/*
+		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
@@ -164,7 +164,7 @@
 	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)) 
+	if (!(compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA))
 		new_pixel_format = GF_PIXEL_RGB_24;
 #endif
 
@@ -174,7 +174,7 @@
 #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));
 
@@ -189,12 +189,12 @@
 	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)
-	) 
+	        && (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) {
@@ -217,10 +217,10 @@
 	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;
+		st->txh.stride = w * 4;
+		st->txh.transparent = 1;
 	}
 	else {
 		st->txh.stride = w * 3;
@@ -258,7 +258,7 @@
 #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);
@@ -282,7 +282,7 @@
 static void layer3d_draw_2d(GF_Node *node, GF_TraverseState *tr_state)
 {
 	DrawableContext *ctx = tr_state->ctx;
-	if (tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx, NULL)) 
+	if (tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx, NULL))
 		return;
 
 	visual_2d_texture_path(tr_state->visual, ctx->drawable->path, ctx, tr_state);
@@ -348,7 +348,7 @@
 	M_Layer3D *l = (M_Layer3D *)node;
 	Layer3DStack *st = (Layer3DStack *) gf_node_get_private(node);
 	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
-	
+
 	if (is_destroy) {
 		DestroyLayer3D(node);
 		return;
@@ -432,12 +432,12 @@
 	} else {
 		gf_mx2d_apply_rect(&tr_state->transform, &rc);
 
-/*		if (tr_state->visual->compositor->visual==tr_state->visual) {
-			gf_mx2d_init(mx2d_backup);
-			gf_mx2d_add_scale(&mx2d_backup, tr_state->visual->compositor->scale_x, tr_state->visual->compositor->scale_y);
-			gf_mx2d_apply_rect(&mx2d_backup, &rc);
-		}
-*/
+		/*		if (tr_state->visual->compositor->visual==tr_state->visual) {
+					gf_mx2d_init(mx2d_backup);
+					gf_mx2d_add_scale(&mx2d_backup, tr_state->visual->compositor->scale_x, tr_state->visual->compositor->scale_y);
+					gf_mx2d_apply_rect(&mx2d_backup, &rc);
+				}
+		*/
 		/*switch visual*/
 		tr_state->visual = st->visual;
 	}
@@ -451,6 +451,7 @@
 
 	/*drawing a layer means drawing all subelements as a whole (no depth sorting with parents)*/
 	if (tr_state->traversing_mode==TRAVERSE_SORT) {
+		u32 old_type_3d = tr_state->visual->type_3d;
 
 		if (gf_node_dirty_get(node)) changed = 1;
 		gf_node_dirty_clear(node, GF_SG_NODE_DIRTY|GF_SG_VRML_BINDABLE_DIRTY);
@@ -478,25 +479,14 @@
 			rc = st->vp;
 			/*setup GL*/
 			visual_3d_setup(tr_state->visual);
-
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_PROJECTION);
-			visual_3d_matrix_reset(tr_state->visual);
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_TEXTURE);
-			visual_3d_matrix_reset(tr_state->visual);
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_MODELVIEW);
-			visual_3d_matrix_reset(tr_state->visual);
-		} else {
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_PROJECTION);
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_TEXTURE);
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_MODELVIEW);
-			visual_3d_matrix_push(tr_state->visual);
 		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Layer3D] Redrawing\n"));
 
 		layer3d_setup_clip(st, tr_state, prev_cam ? 1 : 0, rc);
 
+		tr_state->visual->type_3d = 2;
+		visual_3d_clear_all_lights(tr_state->visual);
+
 		cur_lights = tr_state->visual->num_lights;
 		/*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
@@ -524,31 +514,28 @@
 		}
 
 		tr_state->traversing_mode = TRAVERSE_SORT;
+		tr_state->visual->type_3d = old_type_3d;
 
+		//reload previous projection matrix
 		if (prev_cam) {
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_PROJECTION);
-			visual_3d_matrix_pop(tr_state->visual);
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_TEXTURE);
-			visual_3d_matrix_pop(tr_state->visual);
-			visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_MODELVIEW);
-			visual_3d_matrix_pop(tr_state->visual);
+			visual_3d_projection_matrix_modified(tr_state->visual);
 		}
 
 
 		/*!! we were in a 2D mode, create drawable context!!*/
 		if (!prev_cam) {
 			DrawableContext *ctx;
-			
+
 			/*with TinyGL we draw directly to the offscreen buffer*/
 #ifndef GPAC_USE_TINYGL
 			gf_sc_copy_to_stencil(&st->txh);
 #else
-			if (st->txh.pixelformat==GF_PIXEL_RGBDS) 
-				gf_get_tinygl_depth(&st->txh); 
+			if (st->txh.pixelformat==GF_PIXEL_RGBDS)
+				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) ); 
+			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;
 
@@ -558,7 +545,7 @@
 			tr_state->visual = old_visual;
 			tr_state->layer3d = NULL;
 			tr_state->appear = NULL;
-		//	tr_state->camera = prev_cam;
+			//	tr_state->camera = prev_cam;
 
 			ctx = drawable_init_context_mpeg4(st->drawable, tr_state);
 			if (!ctx) return;
@@ -586,8 +573,8 @@
 		}
 
 		if (!prev_cam) gf_mx_from_mx2d(&tr_state->model_matrix, &tr_state->transform);
-		
-		if (!do_pick && !gf_list_count(tr_state->visual->compositor->sensors)) 
+
+		if (!do_pick && !gf_list_count(tr_state->visual->compositor->sensors))
 			do_pick = gf_sc_pick_in_clipper(tr_state, &st->clip);
 
 		if (!do_pick) goto l3d_exit;
@@ -611,15 +598,21 @@
 		visual_3d_setup_projection(tr_state, 1);
 		in_x = 2 * gf_divfix(start.x, st->visual->camera.width);
 		in_y = 2 * gf_divfix(start.y, st->visual->camera.height);
-					
-		res.x = in_x; res.y = in_y; res.z = -FIX_ONE; res.q = FIX_ONE;
+
+		res.x = in_x;
+		res.y = in_y;
+		res.z = -FIX_ONE;
+		res.q = FIX_ONE;
 		gf_mx_apply_vec_4x4(&st->visual->camera.unprojection, &res);
 		if (!res.q) goto l3d_exit;
 		start.x = gf_divfix(res.x, res.q);
 		start.y = gf_divfix(res.y, res.q);
 		start.z = gf_divfix(res.z, res.q);
 
-		res.x = in_x; res.y = in_y; res.z = FIX_ONE; res.q = FIX_ONE;
+		res.x = in_x;
+		res.y = in_y;
+		res.z = FIX_ONE;
+		res.q = FIX_ONE;
 		gf_mx_apply_vec_4x4(&st->visual->camera.unprojection, &res);
 		if (!res.q) goto l3d_exit;
 		end.x = gf_divfix(res.x, res.q);
@@ -627,10 +620,10 @@
 		end.z = gf_divfix(res.z, res.q);
 		tr_state->ray = gf_ray(start, end);
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Layer3D] Picking: cast ray\n\tOrigin %.4f %.4f %.4f - End %.4f %.4f %.4f\n\tDir %.4f %.4f %.4f\n", 
-			FIX2FLT(tr_state->ray.orig.x), FIX2FLT(tr_state->ray.orig.y), FIX2FLT(tr_state->ray.orig.z),
-			FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z),
-			FIX2FLT(tr_state->ray.dir.x), FIX2FLT(tr_state->ray.dir.y), FIX2FLT(tr_state->ray.dir.z)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Layer3D] Picking: cast ray\n\tOrigin %.4f %.4f %.4f - End %.4f %.4f %.4f\n\tDir %.4f %.4f %.4f\n",
+		                                      FIX2FLT(tr_state->ray.orig.x), FIX2FLT(tr_state->ray.orig.y), FIX2FLT(tr_state->ray.orig.z),
+		                                      FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z),
+		                                      FIX2FLT(tr_state->ray.dir.x), FIX2FLT(tr_state->ray.dir.y), FIX2FLT(tr_state->ray.dir.z)));
 
 		group_3d_traverse(node, (GroupingNode *)st, tr_state);
 		tr_state->ray = prev_r;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_layout.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_layout.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,7 +32,7 @@
 typedef struct
 {
 	PARENT_MPEG4_STACK_2D
-	
+
 	Bool is_scrolling;
 	u32 start_scroll_type;
 	Double start_time, pause_time;
@@ -43,6 +43,7 @@
 	/*for keyboard navigation*/
 	GF_SensorHandler hdl;
 	s32 key_scroll;
+	Bool keys_active;
 } LayoutStack;
 
 typedef struct
@@ -105,7 +106,7 @@
 	max_w = st->clip.width;
 	max_h = st->clip.height;
 	layout_reset_lines(st);
-	
+
 	count = gf_list_count(st->groups);
 	if (!count) return;
 
@@ -139,7 +140,7 @@
 						li->width -= prev_discard_width;
 						li->nb_children--;
 					}
-					if ((cg->text_type==1) && (i+1==count)) break; 
+					if ((cg->text_type==1) && (i+1==count)) break;
 
 					li = new_line_info(st);
 					li->first_child = i;
@@ -147,9 +148,9 @@
 						li->first_child++;
 						continue;
 					}
-				} 
+				}
 			}
-		
+
 			/*get ascent/descent for text or height for non-text*/
 			if (cg->ascent) {
 				if (li->ascent < cg->ascent) li->ascent = cg->ascent;
@@ -177,7 +178,7 @@
 	get_lines_info(st, l);
 	major = get_justify(l, 0);
 	minor = get_justify(l, 1);
-	
+
 	st->scroll_len = 0;
 	nbLines = gf_list_count(st->lines);
 	if (l->horizontal) {
@@ -197,9 +198,10 @@
 			if (!l->leftToRight) first += li->nb_children - 1;
 
 			if (!l->topToBottom && k) current_top += li->height;
-			
+
 			/*set major alignment (X) */
 			cg = (ChildGroup *)gf_list_get(st->groups, first);
+			if (!cg) continue;
 			switch (major) {
 			case L_END:
 				cg->final.x = st->clip.x + st->clip.width - li->width;
@@ -222,10 +224,10 @@
 						if ( (k+1==nbLines) || li->line_break) {
 							spacing = 0;
 						}
-					}					
+					}
 				}
 				break;
-			}          
+			}
 
 
 			/*for each in the run */
@@ -267,7 +269,7 @@
 				if (l->leftToRight && (i==li->first_child + li->nb_children))
 					break;
 				else if (!l->leftToRight && (i==li->first_child - 1))
-					break;		
+					break;
 			}
 			if (l->topToBottom) {
 				current_top -= gf_mulfix(l->spacing, li->height);
@@ -299,7 +301,7 @@
 
 		first = li->first_child;
 		if (!l->topToBottom) first += li->nb_children - 1;
-		
+
 		/*set major alignment (Y) */
 		cg = (ChildGroup *)gf_list_get(st->groups, first);
 		switch (major) {
@@ -320,7 +322,7 @@
 				if (spacing<0) spacing = 0;
 			}
 			break;
-		}          
+		}
 
 		/*for each in the run */
 		i = first;
@@ -352,7 +354,7 @@
 			if (l->topToBottom && (i==li->first_child + li->nb_children))
 				break;
 			else if (!l->topToBottom && (i==li->first_child - 1))
-				break;		
+				break;
 		}
 		if (l->leftToRight) {
 			current_left += gf_mulfix(l->spacing, li->width);
@@ -409,7 +411,7 @@
 			}
 			break;
 		}
-	} 
+	}
 	/*scroll-in only*/
 	else {
 		st->scroll_max = 0;
@@ -486,12 +488,12 @@
 
 		time = gf_node_get_scene_time((GF_Node *)l);
 
-	//	if (st->scale_scroll && (st->prev_rate!=st->scale_scroll)) st->start_scroll_type = 1;
+		//	if (st->scale_scroll && (st->prev_rate!=st->scale_scroll)) st->start_scroll_type = 1;
 
-		/*if scroll rate changed to previous non-zero value, this is a 
+		/*if scroll rate changed to previous non-zero value, this is a
 		scroll restart, don't re-update bounds*/
 		if ((st->start_scroll_type==2) && (st->prev_rate==st->scale_scroll)) st->start_scroll_type = 0;
-		
+
 		if (st->start_scroll_type) {
 			st->start_time = time;
 			st->is_scrolling = 1;
@@ -580,7 +582,7 @@
 		scrolled = scroll_diff;
 	}
 
-	if (do_scroll) 
+	if (do_scroll)
 		st->last_scroll = scrolled;
 	else
 		scrolled = st->last_scroll;
@@ -635,7 +637,7 @@
 		gf_free(st);
 		return;
 	}
-	
+
 	/*note we don't clear dirty flag, this is done in traversing*/
 	if (gf_node_dirty_get(node) & GF_SG_NODE_DIRTY) {
 
@@ -651,12 +653,12 @@
 		st->bounds = st->clip = gf_rect_center(st->clip.width, st->clip.height);
 
 		if (st->scale_scroll && !st->start_scroll_type) st->start_scroll_type = 1;
-	
+
 		drawable_reset_group_highlight(tr_state, node);
 	}
 
 	/*don't waste time traversing is pick ray not in clipper*/
-	if ((tr_state->traversing_mode==TRAVERSE_PICK) && !gf_sc_pick_in_clipper(tr_state, &st->clip)) 
+	if ((tr_state->traversing_mode==TRAVERSE_PICK) && !gf_sc_pick_in_clipper(tr_state, &st->clip))
 		goto layout_exit;
 
 	if ((tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) && !tr_state->for_node) {
@@ -668,7 +670,7 @@
 	}
 
 	recompute_layout = 0;
-	if (gf_node_dirty_get(node)) 
+	if (gf_node_dirty_get(node))
 		recompute_layout = 1;
 
 	/*setup clipping*/
@@ -707,7 +709,7 @@
 
 		/*apply justification*/
 		layout_justify(st, l);
-		
+
 		/*if scrolling, update bounds*/
 		if (l->scrollRate && st->is_scrolling) {
 			layout_setup_scroll_bounds(st, l);
@@ -766,21 +768,32 @@
 
 	switch (ev->key.key_code) {
 	case GF_KEY_LEFT:
+		if (!st->keys_active) return 0;
+
 		if (vertical) return 0;
 		st->key_scroll = -1;
 		break;
 	case GF_KEY_RIGHT:
+		if (!st->keys_active) return 0;
+
 		if (vertical) return 0;
 		st->key_scroll = +1;
 		break;
 	case GF_KEY_UP:
+		if (!st->keys_active) return 0;
+
 		if (!vertical) return 0;
 		st->key_scroll = +1;
 		break;
 	case GF_KEY_DOWN:
+		if (!st->keys_active) return 0;
+
 		if (!vertical) return 0;
 		st->key_scroll = -1;
 		break;
+	case GF_KEY_ENTER:
+		st->keys_active = !st->keys_active;
+		break;
 	default:
 		st->key_scroll = 0;
 		return 0;
@@ -816,7 +829,7 @@
 	/*if modif other than scrollrate restart scroll*/
 	if (st->scroll_rate == ((M_Layout*)node)->scrollRate) {
 		st->start_scroll_type = 1;
-	} 
+	}
 	/*if modif on scroll rate only, indicate continous restart*/
 	else if (((M_Layout*)node)->scrollRate) {
 		st->start_scroll_type = 2;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_lighting.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_lighting.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -44,7 +44,10 @@
 		gf_free(vis);
 		return;
 	}
-	if (!sl->on) return;
+	if (!sl->on) {
+		visual_3d_has_inactive_light(tr_state->visual);
+		return;
+	}
 
 	/*store local bounds for culling*/
 	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) {
@@ -64,14 +67,10 @@
 	else if (tr_state->traversing_mode == TRAVERSE_LIGHTING) {
 		Bool *visible = gf_node_get_private(n);
 		if (*visible) {
-
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_matrix_add(tr_state->visual, tr_state->model_matrix.m);
-			
-			visual_3d_add_spot_light(tr_state->visual, sl->ambientIntensity, sl->attenuation, sl->beamWidth, 
-						   sl->color, sl->cutOffAngle, sl->direction, sl->intensity, sl->location);
-			
-			visual_3d_matrix_pop(tr_state->visual);
+			visual_3d_add_spot_light(tr_state->visual, sl->ambientIntensity, sl->attenuation, sl->beamWidth,
+			                         sl->color, sl->cutOffAngle, sl->direction, sl->intensity, sl->location, &tr_state->model_matrix);
+		} else {
+			visual_3d_has_inactive_light(tr_state->visual);
 		}
 	}
 }
@@ -95,7 +94,10 @@
 		gf_free(vis);
 		return;
 	}
-	if (!pl->on) return;
+	if (!pl->on) {
+		visual_3d_has_inactive_light(tr_state->visual);
+		return;
+	}
 
 	/*store local bounds for culling*/
 	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) {
@@ -114,13 +116,10 @@
 	else if (tr_state->traversing_mode == TRAVERSE_LIGHTING) {
 		Bool *visible = gf_node_get_private(n);
 		if (*visible) {
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_matrix_add(tr_state->visual, tr_state->model_matrix.m);
-
-			visual_3d_add_point_light(tr_state->visual, pl->ambientIntensity, pl->attenuation, pl->color, 
-						pl->intensity, pl->location);
-
-			visual_3d_matrix_pop(tr_state->visual);
+			visual_3d_add_point_light(tr_state->visual, pl->ambientIntensity, pl->attenuation, pl->color,
+			                          pl->intensity, pl->location, &tr_state->model_matrix);
+		} else {
+			visual_3d_has_inactive_light(tr_state->visual);
 		}
 	}
 }
@@ -145,17 +144,21 @@
 		gf_free(stack);
 		return;
 	}
-	if (tr_state->switched_off || !dl->on) return;
+	if (tr_state->switched_off || !dl->on) {
+		visual_3d_has_inactive_light(tr_state->visual);
+		return;
+	}
 
 	/*1- DL only lights the parent group, no need for culling it*/
 	/*DL is set dynamically while traversing, the only mode that interest us is draw*/
 	if (tr_state->traversing_mode) return;
 
 	if (tr_state->local_light_on) {
-		*stack = visual_3d_add_directional_light(tr_state->visual, dl->ambientIntensity, dl->color, dl->intensity, dl->direction);
+		*stack = visual_3d_add_directional_light(tr_state->visual, dl->ambientIntensity, dl->color, dl->intensity, dl->direction, &tr_state->model_matrix);
 	} else {
 		if (*stack) visual_3d_remove_last_light(tr_state->visual);
 		*stack = 0;
+		visual_3d_has_inactive_light(tr_state->visual);
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_path_layout.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_path_layout.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,7 +32,7 @@
 typedef struct
 {
 	PARENT_MPEG4_STACK_2D
-	
+
 	GF_Node *last_geom;
 	GF_PathIterator *iter;
 } PathLayoutStack;
@@ -55,7 +55,7 @@
 	PathLayoutStack *gr = (PathLayoutStack*) gf_node_get_private(node);
 	M_PathLayout *pl = (M_PathLayout *)node;
 	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
-	
+
 	if (is_destroy) {
 		parent_node_predestroy((ParentNode2D *)gr);
 		if (gr->iter) gf_path_iterator_del(gr->iter);
@@ -63,12 +63,15 @@
 		return;
 	}
 	if (!pl->geometry) return;
-	
+
 	/*only low-level primitives allowed*/
 	switch (gf_node_get_tag((GF_Node *) pl->geometry)) {
-	case TAG_MPEG4_Rectangle: return;
-	case TAG_MPEG4_Circle: return;
-	case TAG_MPEG4_Ellipse: return;
+	case TAG_MPEG4_Rectangle:
+		return;
+	case TAG_MPEG4_Circle:
+		return;
+	case TAG_MPEG4_Ellipse:
+		return;
 	}
 
 	/*store traversing state*/
@@ -76,7 +79,7 @@
 	gf_mx_copy(mat, tr_state->model_matrix);
 	gf_mx_init(tr_state->model_matrix);
 #endif
-	
+
 	gf_mx2d_copy(mx2d, tr_state->transform);
 	gf_mx2d_init(tr_state->transform);
 
@@ -142,7 +145,7 @@
 	gf_mx2d_copy(tr_state->transform, mx2d);
 
 	count = gf_list_count(gr->groups);
-	
+
 	length = gf_path_iterator_get_length(gr->iter);
 	/*place all children*/
 	offset = gf_mulfix(length, pl->pathOffset);
@@ -197,22 +200,22 @@
 		switch (minor) {
 		/*top alignment*/
 		case 3:
-			if (cg->ascent) 
+			if (cg->ascent)
 				gf_mx2d_add_translation(&mx2d, 0, -1 * cg->ascent);
-			else 
+			else
 				gf_mx2d_add_translation(&mx2d, 0, -1 * cg->original.height / 2);
-			
+
 			break;
 		/*baseline*/
 		case 1:
 			/*move to bottom align if not text*/
-			if (!cg->ascent) 
+			if (!cg->ascent)
 				gf_mx2d_add_translation(&mx2d, 0, cg->original.height / 2);
 			break;
 		/*middle*/
 		case 2:
 			/*if text use (asc+desc) /2 as line height since glyph height differ*/
-			if (cg->ascent) 
+			if (cg->ascent)
 				gf_mx2d_add_translation(&mx2d, 0, cg->descent - (cg->ascent + cg->descent) / 2);
 			break;
 		/*bottomline alignment*/
@@ -222,7 +225,7 @@
 				gf_mx2d_add_translation(&mx2d, 0, cg->descent);
 			else
 				gf_mx2d_add_translation(&mx2d, 0, cg->original.height / 2);
-			
+
 			break;
 		}
 		res = gf_path_iterator_get_transform(gr->iter, offset, (Bool) (pl->wrapMode==2), &mx2d, 1, length_after_point);
@@ -257,7 +260,7 @@
 	}
 
 	/*undrawn nodes*/
-	for (;i<count; i++) {
+	for (; i<count; i++) {
 		cg = (ChildGroup*)gf_list_get(gr->groups, i);
 		parent_node_child_traverse_matrix(cg, (GF_TraverseState *)rs, NULL);
 	}

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_sensors.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_sensors.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -48,7 +48,7 @@
 		gf_list_del_item(compositor->previous_sensors, hdl);
 		if (compositor->interaction_sensors) compositor->interaction_sensors--;
 		while ( (visual=gf_list_enum(compositor->visuals, &i)) ) {
-			if (visual->offscreen) 
+			if (visual->offscreen)
 				compositor_compositetexture_sensor_delete(visual->offscreen, hdl);
 		}
 
@@ -165,9 +165,9 @@
 	if ((ev->type==GF_EVENT_MOUSEDOWN) && (ev->mouse.button==GF_MOUSE_LEFT)) st->active = 1;
 	else if ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER)) st->active = 1;
 	else if (st->active && (
-		/*mouse*/ ((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT))
-		|| /*mouse*/((ev->type==GF_EVENT_KEYUP) && (ev->key.key_code==GF_KEY_ENTER)) 
-	) ) {
+	             /*mouse*/ ((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT))
+	             || /*mouse*/((ev->type==GF_EVENT_KEYUP) && (ev->key.key_code==GF_KEY_ENTER))
+	         ) ) {
 		if (!is_cancel) anchor_activation(sh->sensor, st, compositor);
 	} else if (is_over && !st->over) {
 		st->over = 1;
@@ -233,7 +233,7 @@
 }
 
 
-typedef struct 
+typedef struct
 {
 	GF_SensorHandler hdl;
 	GF_Compositor *compositor;
@@ -262,19 +262,19 @@
 	Bool is_mouse = (ev->type<=GF_EVENT_MOUSEWHEEL) ? 1 : 0;
 	M_DiscSensor *ds = (M_DiscSensor *)sh->sensor;
 	DiscSensorStack *stack = (DiscSensorStack *) gf_node_get_private(sh->sensor);
-	
-	if (ds->isActive && 
-		(!ds->enabled 
-		|| /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT)) 
-		|| /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))) )
-	) ) {
+
+	if (ds->isActive &&
+	        (!ds->enabled
+	         || /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT))
+	         || /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))) )
+	        ) ) {
 		if (ds->autoOffset) {
 			ds->offset = ds->rotation_changed;
 			/*that's an exposedField*/
-			if (!is_cancel) gf_node_event_out_str(sh->sensor, "offset");
+			if (!is_cancel) gf_node_event_out(sh->sensor, 4/*"offset"*/);
 		}
 		ds->isActive = 0;
-		if (!is_cancel) gf_node_event_out_str(sh->sensor, "isActive");
+		if (!is_cancel) gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 		sh->grabbed = 0;
 		return is_cancel ? 0 : 1;
 	} else if (is_mouse) {
@@ -283,7 +283,7 @@
 			gf_mx_copy(stack->initial_matrix, compositor->hit_local_to_world);
 			stack->start_angle = gf_atan2(compositor->hit_local_point.y, compositor->hit_local_point.x);
 			ds->isActive = 1;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 			sh->grabbed = 1;
 			return 1;
 		}
@@ -294,7 +294,7 @@
 			loc_ray = compositor->hit_world_ray;
 			gf_mx_apply_ray(&stack->initial_matrix, &loc_ray);
 			compositor_get_2d_plane_intersection(&loc_ray, &res);
-		
+
 			rot = gf_atan2(res.y, res.x) - stack->start_angle + ds->offset;
 			if (ds->minAngle < ds->maxAngle) {
 				/*FIXME this doesn't work properly*/
@@ -302,17 +302,17 @@
 				if (rot > ds->maxAngle) rot = ds->maxAngle;
 			}
 			ds->rotation_changed = rot;
-			gf_node_event_out_str(sh->sensor, "rotation_changed");
-	   		ds->trackPoint_changed.x = res.x;
-	   		ds->trackPoint_changed.y = res.y;
-			gf_node_event_out_str(sh->sensor, "trackPoint_changed");
+			gf_node_event_out(sh->sensor, 6/*"rotation_changed"*/);
+			ds->trackPoint_changed.x = res.x;
+			ds->trackPoint_changed.y = res.y;
+			gf_node_event_out(sh->sensor, 7/*"trackPoint_changed"*/);
 			return 1;
 		}
 	} else {
 		if (!ds->isActive && is_over && (ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER)) {
 			ds->isActive = 1;
 			stack->start_angle = ds->offset;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 			return 1;
 		}
 		else if (ds->isActive && (ev->type==GF_EVENT_KEYDOWN)) {
@@ -320,18 +320,18 @@
 			Fixed diff = (ev->key.flags & GF_KEY_MOD_SHIFT) ? GF_PI/8 : GF_PI/64;
 			res = stack->start_angle;
 			switch (ev->key.key_code) {
-			case GF_KEY_LEFT: 
-			case GF_KEY_UP: 
-				res += -diff; 
+			case GF_KEY_LEFT:
+			case GF_KEY_UP:
+				res += -diff;
 				break;
-			case GF_KEY_RIGHT: 
-			case GF_KEY_DOWN: 
+			case GF_KEY_RIGHT:
+			case GF_KEY_DOWN:
 				res += diff;
 				break;
 			case GF_KEY_HOME:
 				res = ds->offset;
 				break;
-			default: 
+			default:
 				return 0;
 			}
 			if (ds->minAngle < ds->maxAngle) {
@@ -341,7 +341,7 @@
 			}
 			stack->start_angle = res;
 			ds->rotation_changed = res;
-			gf_node_event_out_str(sh->sensor, "rotation_changed");
+			gf_node_event_out(sh->sensor, 6/*"rotation_changed"*/);
 			return 1;
 		}
 	}
@@ -369,7 +369,7 @@
 }
 
 
-typedef struct 
+typedef struct
 {
 	SFVec2f start_drag;
 	GF_Matrix initial_matrix;
@@ -399,18 +399,18 @@
 	PS2DStack *stack = (PS2DStack *) gf_node_get_private(sh->sensor);
 
 
-	if (ps->isActive && 
-		(!ps->enabled
-		|| /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT)) 
-		|| /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))) )
-	) ) {
+	if (ps->isActive &&
+	        (!ps->enabled
+	         || /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT))
+	         || /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))) )
+	        ) ) {
 		if (ps->autoOffset) {
 			ps->offset = ps->translation_changed;
-			if (!is_cancel) gf_node_event_out_str(sh->sensor, "offset");
+			if (!is_cancel) gf_node_event_out(sh->sensor, 4/*"offset"*/);
 		}
 
 		ps->isActive = 0;
-		if (!is_cancel) gf_node_event_out_str(sh->sensor, "isActive");
+		if (!is_cancel) gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 		sh->grabbed = 0;
 		return is_cancel ? 0 : 1;
 	} else if (is_mouse) {
@@ -419,11 +419,11 @@
 			stack->start_drag.x = compositor->hit_local_point.x - ps->offset.x;
 			stack->start_drag.y = compositor->hit_local_point.y - ps->offset.y;
 			ps->isActive = 1;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 			sh->grabbed = 1;
 			/*fallthrough to fire mouse coords*/
 			//return 1;
-		} 
+		}
 		if (ps->isActive) {
 			SFVec3f res;
 			GF_Ray loc_ray;
@@ -434,7 +434,7 @@
 
 			ps->trackPoint_changed.x = res.x;
 			ps->trackPoint_changed.y = res.y;
-			gf_node_event_out_str(sh->sensor, "trackPoint_changed");
+			gf_node_event_out(sh->sensor, 6/*"trackPoint_changed"*/);
 
 			res.x -= stack->start_drag.x;
 			res.y -= stack->start_drag.y;
@@ -444,21 +444,21 @@
 				if (res.x > ps->maxPosition.x) res.x = ps->maxPosition.x;
 			}
 			if (ps->minPosition.y <= ps->maxPosition.y) {
-				if (res.y < ps->minPosition.y) 
+				if (res.y < ps->minPosition.y)
 					res.y = ps->minPosition.y;
-				if (res.y > ps->maxPosition.y) 
+				if (res.y > ps->maxPosition.y)
 					res.y = ps->maxPosition.y;
 			}
 			ps->translation_changed.x = res.x;
 			ps->translation_changed.y = res.y;
-			gf_node_event_out_str(sh->sensor, "translation_changed");
+			gf_node_event_out(sh->sensor, 7/*"translation_changed"*/);
 			return 1;
 		}
 	} else {
 		if (!ps->isActive && is_over && (ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER)) {
 			ps->isActive = 1;
 			stack->start_drag = ps->offset;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 			return 1;
 		}
 		else if (ps->isActive && (ev->type==GF_EVENT_KEYDOWN)) {
@@ -468,12 +468,22 @@
 				diff = gf_divfix(diff, INT2FIX(compositor->vp_width/2));
 			res = stack->start_drag;
 			switch (ev->key.key_code) {
-			case GF_KEY_LEFT: res.x += -diff; break;
-			case GF_KEY_RIGHT: res.x += diff; break;
-			case GF_KEY_UP: res.y += diff; break;
-			case GF_KEY_DOWN: res.y += -diff; break;
-			case GF_KEY_HOME: res = ps->offset; break;
-			default: 
+			case GF_KEY_LEFT:
+				res.x += -diff;
+				break;
+			case GF_KEY_RIGHT:
+				res.x += diff;
+				break;
+			case GF_KEY_UP:
+				res.y += diff;
+				break;
+			case GF_KEY_DOWN:
+				res.y += -diff;
+				break;
+			case GF_KEY_HOME:
+				res = ps->offset;
+				break;
+			default:
 				return 0;
 			}
 			/*clip*/
@@ -486,10 +496,10 @@
 				if (res.y > ps->maxPosition.y) res.y = ps->maxPosition.y;
 			}
 			ps->translation_changed = res;
-			gf_node_event_out_str(sh->sensor, "translation_changed");
+			gf_node_event_out(sh->sensor, 7/*"translation_changed"*/);
 			ps->trackPoint_changed.x = res.x + stack->start_drag.x;
 			ps->trackPoint_changed.y = res.y + stack->start_drag.y;
-			gf_node_event_out_str(sh->sensor, "trackPoint_changed");
+			gf_node_event_out(sh->sensor, 6/*"trackPoint_changed"*/);
 			stack->start_drag = res;
 			return 1;
 		}
@@ -518,7 +528,7 @@
 }
 
 
-typedef struct 
+typedef struct
 {
 	Double last_time;
 	GF_Compositor *compositor;
@@ -552,32 +562,32 @@
 {
 	M_ProximitySensor2D *ps = (M_ProximitySensor2D *)sh->sensor;
 	Prox2DStack *stack = (Prox2DStack *) gf_node_get_private(sh->sensor);
-	
+
 	assert(ps->enabled);
-	
+
 	if (is_over) {
 		stack->last_time = gf_node_get_scene_time(sh->sensor);
 		if (is_cancel) return 0;
 		if (prox2D_is_in_sensor(stack, ps, compositor->hit_local_point.x, compositor->hit_local_point.y)) {
 			ps->position_changed.x = compositor->hit_local_point.x;
 			ps->position_changed.y = compositor->hit_local_point.y;
-			gf_node_event_out_str(sh->sensor, "position_changed");
+			gf_node_event_out(sh->sensor, 4/*"position_changed"*/);
 
 			if (!ps->isActive) {
 				ps->isActive = 1;
-				gf_node_event_out_str(sh->sensor, "isActive");
+				gf_node_event_out(sh->sensor, 3/*"isActive"*/);
 				ps->enterTime = stack->last_time;
-				gf_node_event_out_str(sh->sensor, "enterTime");
+				gf_node_event_out(sh->sensor, 6/*"enterTime"*/);
 			}
 			return 1;
 		}
-	} 
+	}
 	/*either we're not over the shape or we're not in sensor*/
 	if (ps->isActive) {
 		ps->exitTime = stack->last_time;
-		gf_node_event_out_str(sh->sensor, "exitTime");
+		gf_node_event_out(sh->sensor, 7/*"exitTime"*/);
 		ps->isActive = 0;
-		gf_node_event_out_str(sh->sensor, "isActive");
+		gf_node_event_out(sh->sensor, 3/*"isActive"*/);
 		return 1;
 	}
 	return 0;
@@ -604,7 +614,7 @@
 	gf_node_set_callback_function(node, DestroyProximitySensor2D);
 }
 
-typedef struct 
+typedef struct
 {
 	GF_SensorHandler hdl;
 	Bool mouse_down;
@@ -629,7 +639,7 @@
 {
 	Bool is_mouse = (ev->type<=GF_EVENT_MOUSEWHEEL);
 	M_TouchSensor *ts = (M_TouchSensor *)sh->sensor;
-	
+
 	/*this is not specified in VRML, however we consider that a de-enabled sensor will not sent deactivation events*/
 	if (!ts->enabled) {
 		if (ts->isActive) {
@@ -641,42 +651,42 @@
 	/*isActive becomes false, send touch time*/
 	if (ts->isActive) {
 		if (
-			/*mouse*/ ((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT) ) 
-		|| /*keyboard*/ ((ev->type==GF_EVENT_KEYUP) && (ev->key.key_code==GF_KEY_ENTER) ) 
+		    /*mouse*/ ((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT) )
+		    || /*keyboard*/ ((ev->type==GF_EVENT_KEYUP) && (ev->key.key_code==GF_KEY_ENTER) )
 		) {
 			ts->touchTime = gf_node_get_scene_time(sh->sensor);
-			if (!is_cancel) gf_node_event_out_str(sh->sensor, "touchTime");
+			if (!is_cancel) gf_node_event_out(sh->sensor, 6/*"touchTime"*/);
 			ts->isActive = 0;
-			if (!is_cancel) gf_node_event_out_str(sh->sensor, "isActive");
+			if (!is_cancel) gf_node_event_out(sh->sensor, 4/*"isActive"*/);
 			sh->grabbed = 0;
-			return is_cancel ? 0 : 1; 
+			return is_cancel ? 0 : 1;
 		}
 	}
 	if (is_over != ts->isOver) {
 		ts->isOver = is_over;
-		if (!is_cancel) gf_node_event_out_str(sh->sensor, "isOver");
-		return is_cancel ? 0 : 1; 
+		if (!is_cancel) gf_node_event_out(sh->sensor, 5/*"isOver"*/);
+		return is_cancel ? 0 : 1;
 	}
 	if (!ts->isActive && is_over) {
-		if (/*mouse*/ ((ev->type==GF_EVENT_MOUSEDOWN) && (ev->mouse.button==GF_MOUSE_LEFT)) 
-			|| /*keyboard*/ ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER)) 
-		) {
+		if (/*mouse*/ ((ev->type==GF_EVENT_MOUSEDOWN) && (ev->mouse.button==GF_MOUSE_LEFT))
+		              || /*keyboard*/ ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))
+		   ) {
 			ts->isActive = 1;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 4/*"isActive"*/);
 			sh->grabbed = 1;
 			return 1;
 		}
 		if (ev->type==GF_EVENT_MOUSEUP) return 0;
 	}
-	if (is_over && is_mouse) {
-		/*THIS IS NOT CONFORMANT, the hitpoint should be in the touchsensor coordinate system, eg we 
+	if (is_over && is_mouse && (ev->type==GF_EVENT_MOUSEMOVE) ) {
+		/*THIS IS NOT CONFORMANT, the hitpoint should be in the touchsensor coordinate system, eg we
 		should store the matrix from TS -> shape and apply that ...*/
 		ts->hitPoint_changed = compositor->hit_local_point;
-		gf_node_event_out_str(sh->sensor, "hitPoint_changed");
+		gf_node_event_out(sh->sensor, 1/*"hitPoint_changed"*/);
 		ts->hitNormal_changed = compositor->hit_normal;
-		gf_node_event_out_str(sh->sensor, "hitNormal_changed");
+		gf_node_event_out(sh->sensor, 2/*"hitNormal_changed"*/);
 		ts->hitTexCoord_changed = compositor->hit_texcoords;
-		gf_node_event_out_str(sh->sensor, "hitTexCoord_changed");
+		gf_node_event_out(sh->sensor, 3/*"hitTexCoord_changed"*/);
 		return 1;
 	}
 	return 0;
@@ -734,22 +744,22 @@
 	if (dist.y<0) dist.y *= -1;
 	if (dist.z<0) dist.z *= -1;
 
-	if ((2*dist.x <= ps->size.x) 
-		&& (2*dist.y <= ps->size.y)
-		&& (2*dist.z <= ps->size.z) ) {
+	if ((2*dist.x <= ps->size.x)
+	        && (2*dist.y <= ps->size.y)
+	        && (2*dist.z <= ps->size.z) ) {
 
 		if (!ps->isActive) {
 			ps->isActive = 1;
-			gf_node_event_out_str(node, "isActive");
+			gf_node_event_out(node, 3/*"isActive"*/);
 			ps->enterTime = gf_node_get_scene_time(node);
-			gf_node_event_out_str(node, "enterTime");
+			gf_node_event_out(node, 6/*"enterTime"*/);
 		}
 		if ((ps->position_changed.x != user_pos.x)
-			|| (ps->position_changed.y != user_pos.y)
-			|| (ps->position_changed.z != user_pos.z) )
+		        || (ps->position_changed.y != user_pos.y)
+		        || (ps->position_changed.z != user_pos.z) )
 		{
 			ps->position_changed = user_pos;
-			gf_node_event_out_str(node, "position_changed");
+			gf_node_event_out(node, 4/*"position_changed"*/);
 		}
 		dist = tr_state->camera->target;
 		gf_mx_apply_vec(&mx, &dist);
@@ -757,17 +767,17 @@
 		gf_mx_apply_vec(&mx, &up);
 		ori = camera_get_orientation(user_pos, dist, tr_state->camera->up);
 		if ((ori.q != ps->orientation_changed.q)
-			|| (ori.x != ps->orientation_changed.x)
-			|| (ori.y != ps->orientation_changed.y)
-			|| (ori.z != ps->orientation_changed.z) ) {
+		        || (ori.x != ps->orientation_changed.x)
+		        || (ori.y != ps->orientation_changed.y)
+		        || (ori.z != ps->orientation_changed.z) ) {
 			ps->orientation_changed = ori;
-			gf_node_event_out_str(node, "orientation_changed");
+			gf_node_event_out(node, 5/*"orientation_changed"*/);
 		}
 	} else if (ps->isActive) {
 		ps->isActive = 0;
-		gf_node_event_out_str(node, "isActive");
+		gf_node_event_out(node, 3/*"isActive"*/);
 		ps->exitTime = gf_node_get_scene_time(node);
-		gf_node_event_out_str(node, "exitTime");
+		gf_node_event_out(node, 7/*"exitTime"*/);
 	}
 }
 
@@ -777,7 +787,7 @@
 }
 
 
-typedef struct 
+typedef struct
 {
 	SFVec3f start_drag;
 	GF_Plane tracker;
@@ -807,29 +817,30 @@
 	M_PlaneSensor *ps = (M_PlaneSensor *)sh->sensor;
 	PSStack *stack = (PSStack *) gf_node_get_private(sh->sensor);
 
-	
-	if (ps->isActive && 
-		( /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT)) 
-		|| /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))) )
-	) ) {
+
+	if (ps->isActive &&
+	        ( /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT))
+	                   || /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))) )
+	        ) ) {
 		if (ps->autoOffset) {
 			ps->offset = ps->translation_changed;
-			if (!is_cancel) gf_node_event_out_str(sh->sensor, "offset");
+			if (!is_cancel) gf_node_event_out(sh->sensor, 4/*"offset"*/);
 		}
 		ps->isActive = 0;
-		if (!is_cancel) gf_node_event_out_str(sh->sensor, "isActive");
+		if (!is_cancel) gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 		sh->grabbed = 0;
-		return is_cancel ? 0 : 1; 
+		return is_cancel ? 0 : 1;
 	}
 	/*mouse*/
 	else if (is_mouse) {
 		if (!ps->isActive && (ev->type==GF_EVENT_MOUSEDOWN) && (ev->mouse.button==GF_MOUSE_LEFT) ) {
 			gf_mx_copy(stack->initial_matrix, compositor->hit_local_to_world);
 			gf_vec_diff(stack->start_drag, compositor->hit_local_point, ps->offset);
-			stack->tracker.normal.x = stack->tracker.normal.y = 0; stack->tracker.normal.z = FIX_ONE;
+			stack->tracker.normal.x = stack->tracker.normal.y = 0;
+			stack->tracker.normal.z = FIX_ONE;
 			stack->tracker.d = - gf_vec_dot(stack->start_drag, stack->tracker.normal);
 			ps->isActive = 1;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 			sh->grabbed = 1;
 			return 1;
 		}
@@ -840,7 +851,7 @@
 			gf_mx_apply_ray(&stack->initial_matrix, &loc_ray);
 			gf_plane_intersect_line(&stack->tracker, &loc_ray.orig, &loc_ray.dir, &res);
 			ps->trackPoint_changed = res;
-			gf_node_event_out_str(sh->sensor, "trackPoint_changed");
+			gf_node_event_out(sh->sensor, 6/*"trackPoint_changed"*/);
 
 			gf_vec_diff(res, res, stack->start_drag);
 			/*clip*/
@@ -853,14 +864,14 @@
 				if (res.y > ps->maxPosition.y) res.y = ps->maxPosition.y;
 			}
 			ps->translation_changed = res;
-			gf_node_event_out_str(sh->sensor, "translation_changed");
+			gf_node_event_out(sh->sensor, 7/*"translation_changed"*/);
 			return 1;
 		}
 	} else {
 		if (!ps->isActive && is_over && (ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER)) {
 			ps->isActive = 1;
 			stack->start_drag = ps->offset;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 5/*"isActive"*/);
 			return 1;
 		}
 		else if (ps->isActive && (ev->type==GF_EVENT_KEYDOWN)) {
@@ -871,12 +882,22 @@
 
 			res = stack->start_drag;
 			switch (ev->key.key_code) {
-			case GF_KEY_LEFT: res.x -= diff; break;
-			case GF_KEY_RIGHT: res.x += diff; break;
-			case GF_KEY_UP: res.y += diff; break;
-			case GF_KEY_DOWN: res.y -= diff; break;
-			case GF_KEY_HOME: res = ps->offset; break;
-			default: 
+			case GF_KEY_LEFT:
+				res.x -= diff;
+				break;
+			case GF_KEY_RIGHT:
+				res.x += diff;
+				break;
+			case GF_KEY_UP:
+				res.y += diff;
+				break;
+			case GF_KEY_DOWN:
+				res.y -= diff;
+				break;
+			case GF_KEY_HOME:
+				res = ps->offset;
+				break;
+			default:
 				return 0;
 			}
 			/*clip*/
@@ -890,7 +911,7 @@
 			}
 			stack->start_drag = res;
 			ps->translation_changed = res;
-			gf_node_event_out_str(sh->sensor, "translation_changed");
+			gf_node_event_out(sh->sensor, 7/*"translation_changed"*/);
 			return 1;
 		}
 	}
@@ -917,7 +938,7 @@
 	gf_node_set_callback_function(node, DestroyPlaneSensor);
 }
 
-typedef struct 
+typedef struct
 {
 	GF_SensorHandler hdl;
 	GF_Compositor *compositor;
@@ -948,16 +969,16 @@
 	M_CylinderSensor *cs = (M_CylinderSensor *)sh->sensor;
 	CylinderSensorStack *st = (CylinderSensorStack *) gf_node_get_private(sh->sensor);
 
-	if (cs->isActive && (!cs->enabled 
-		|| /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT)) 
-		|| /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))))
-	) ) {
+	if (cs->isActive && (!cs->enabled
+	                     || /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT))
+	                     || /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))))
+	                    ) ) {
 		if (cs->autoOffset) {
 			cs->offset = cs->rotation_changed.q;
-			if (!is_cancel) gf_node_event_out_str(sh->sensor, "offset");
+			if (!is_cancel) gf_node_event_out(sh->sensor, 5/*"offset"*/);
 		}
 		cs->isActive = 0;
-		if (!is_cancel) gf_node_event_out_str(sh->sensor, "isActive");
+		if (!is_cancel) gf_node_event_out(sh->sensor, 6/*"isActive"*/);
 		sh->grabbed = 0;
 		return is_cancel ? 0 : 1;
 	}
@@ -979,7 +1000,7 @@
 			yaxis.x = yaxis.z = 0;
 			yaxis.y = FIX_ONE;
 			acute = gf_vec_dot(bearing, yaxis);
-			if (acute < -FIX_ONE) acute = -FIX_ONE; 
+			if (acute < -FIX_ONE) acute = -FIX_ONE;
 			else if (acute > FIX_ONE) acute = FIX_ONE;
 			acute = gf_acos(acute);
 			reva = ABS(GF_PI - acute);
@@ -988,7 +1009,8 @@
 
 			st->grab_start = compositor->hit_local_point;
 			/*cos we're lazy*/
-			st->yplane.d = 0; st->yplane.normal.x = st->yplane.normal.z = st->yplane.normal.y = 0;
+			st->yplane.d = 0;
+			st->yplane.normal.x = st->yplane.normal.z = st->yplane.normal.y = 0;
 			st->zplane = st->xplane = st->yplane;
 			st->xplane.normal.x = FIX_ONE;
 			st->yplane.normal.y = FIX_ONE;
@@ -999,7 +1021,7 @@
 			cs->rotation_changed.z = 0;
 
 			cs->isActive = 1;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 6/*"isActive"*/);
 			sh->grabbed = 1;
 			return 1;
 		}
@@ -1010,7 +1032,7 @@
 
 			if (is_over) {
 				cs->trackPoint_changed = compositor->hit_local_point;
-				gf_node_event_out_str(sh->sensor, "trackPoint_changed");
+				gf_node_event_out(sh->sensor, 8/*"trackPoint_changed"*/);
 			} else {
 				GF_Plane project_to;
 				r = compositor->hit_world_ray;
@@ -1027,14 +1049,18 @@
 				if (!gf_plane_intersect_line(&project_to, &r.orig, &r.dir, &compositor->hit_local_point)) return 0;
 			}
 
-  			dir1.x = compositor->hit_local_point.x; dir1.y = 0; dir1.z = compositor->hit_local_point.z;
+			dir1.x = compositor->hit_local_point.x;
+			dir1.y = 0;
+			dir1.z = compositor->hit_local_point.z;
 			if (st->disk_mode) {
 				radius = FIX_ONE;
 			} else {
 				radius = gf_vec_len(dir1);
 			}
 			gf_vec_norm(&dir1);
-       		dir2.x = st->grab_start.x; dir2.y = 0; dir2.z = st->grab_start.z;
+			dir2.x = st->grab_start.x;
+			dir2.y = 0;
+			dir2.z = st->grab_start.z;
 			gf_vec_norm(&dir2);
 			cx = gf_vec_cross(dir2, dir1);
 			gf_vec_norm(&cx);
@@ -1048,16 +1074,16 @@
 				else if (rot > cs->maxAngle) rot = cs->maxAngle;
 			}
 			cs->rotation_changed.q = rot;
-			gf_node_event_out_str(sh->sensor, "rotation_changed");
+			gf_node_event_out(sh->sensor, 7/*"rotation_changed"*/);
 			return 1;
-		} 
+		}
 	} else {
 		if (!cs->isActive && is_over && (ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER)) {
 			cs->isActive = 1;
 			cs->rotation_changed.q = cs->offset;
 			cs->rotation_changed.x = cs->rotation_changed.z = 0;
 			cs->rotation_changed.y = FIX_ONE;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 6/*"isActive"*/);
 			return 1;
 		}
 		else if (cs->isActive && (ev->type==GF_EVENT_KEYDOWN)) {
@@ -1066,10 +1092,17 @@
 
 			res = cs->rotation_changed.q;
 			switch (ev->key.key_code) {
-			case GF_KEY_LEFT: res -= diff; break;
-			case GF_KEY_RIGHT: res += diff; break;
-			case GF_KEY_HOME: res = cs->offset; break;
-			default: return 0;
+			case GF_KEY_LEFT:
+				res -= diff;
+				break;
+			case GF_KEY_RIGHT:
+				res += diff;
+				break;
+			case GF_KEY_HOME:
+				res = cs->offset;
+				break;
+			default:
+				return 0;
 			}
 			/*clip*/
 			if (cs->minAngle <= cs->maxAngle) {
@@ -1077,7 +1110,7 @@
 				if (res > cs->maxAngle) res = cs->maxAngle;
 			}
 			cs->rotation_changed.q = res;
-			gf_node_event_out_str(sh->sensor, "rotation_changed");
+			gf_node_event_out(sh->sensor, 7/*"rotation_changed"*/);
 			return 1;
 		}
 	}
@@ -1105,7 +1138,7 @@
 }
 
 
-typedef struct 
+typedef struct
 {
 	GF_SensorHandler hdl;
 	GF_Compositor *compositor;
@@ -1136,18 +1169,18 @@
 	SphereSensorStack *st = (SphereSensorStack *) gf_node_get_private(sh->sensor);
 
 
-	if (sphere->isActive && (!sphere->enabled 
-		|| /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT)) 
-		|| /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))))
-	) ) {
+	if (sphere->isActive && (!sphere->enabled
+	                         || /*mouse*/((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT))
+	                         || /*keyboar*/(!is_mouse && (!is_over|| ((ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER))))
+	                        ) ) {
 		if (sphere->autoOffset) {
 			sphere->offset = sphere->rotation_changed;
-			if (!is_cancel) gf_node_event_out_str(sh->sensor, "offset");
+			if (!is_cancel) gf_node_event_out(sh->sensor, 2/*"offset"*/);
 		}
 		sphere->isActive = 0;
-		if (!is_cancel) gf_node_event_out_str(sh->sensor, "isActive");
+		if (!is_cancel) gf_node_event_out(sh->sensor, 3/*"isActive"*/);
 		sh->grabbed = 0;
-		return is_cancel ? 0 : 1; 
+		return is_cancel ? 0 : 1;
 	}
 	else if (is_mouse) {
 		if (!sphere->isActive && (ev->type==GF_EVENT_MOUSEDOWN) && (ev->mouse.button==GF_MOUSE_LEFT)) {
@@ -1158,7 +1191,7 @@
 			st->grab_vec = gf_vec_scale(compositor->hit_local_point, gf_invfix(st->radius));
 
 			sphere->isActive = 1;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 3/*"isActive"*/);
 			sh->grabbed = 1;
 			return 1;
 		}
@@ -1169,7 +1202,7 @@
 			Fixed cl;
 			if (is_over) {
 				sphere->trackPoint_changed = compositor->hit_local_point;
-				gf_node_event_out_str(sh->sensor, "trackPoint_changed");
+				gf_node_event_out(sh->sensor, 5/*"trackPoint_changed"*/);
 			} else {
 				GF_Ray r;
 				r = compositor->hit_world_ray;
@@ -1191,21 +1224,23 @@
 			if (gf_vec_dot(st->grab_vec, vec) < 0) r.q += GF_PI / 2;
 
 			gf_vec_norm(&axis);
-			r.x = axis.x; r.y = axis.y; r.z = axis.z;
+			r.x = axis.x;
+			r.y = axis.y;
+			r.z = axis.z;
 			q1 = gf_quat_from_rotation(r);
 			if (sphere->autoOffset) {
 				q2 = gf_quat_from_rotation(sphere->offset);
 				q1 = gf_quat_multiply(&q1, &q2);
 			}
 			sphere->rotation_changed = gf_quat_to_rotation(&q1);
-			gf_node_event_out_str(sh->sensor, "rotation_changed");
+			gf_node_event_out(sh->sensor, 4/*"rotation_changed"*/);
 			return 1;
-		} 
+		}
 	} else {
 		if (!sphere->isActive && is_over && (ev->type==GF_EVENT_KEYDOWN) && (ev->key.key_code==GF_KEY_ENTER)) {
 			sphere->isActive = 1;
 			sphere->rotation_changed = sphere->offset;
-			gf_node_event_out_str(sh->sensor, "isActive");
+			gf_node_event_out(sh->sensor, 3/*"isActive"*/);
 			return 1;
 		}
 		else if (sphere->isActive && (ev->type==GF_EVENT_KEYDOWN)) {
@@ -1214,10 +1249,13 @@
 
 			res = sphere->rotation_changed;
 			switch (ev->key.key_code) {
-			case GF_KEY_LEFT: 
+			case GF_KEY_LEFT:
 				diff = -diff;
-			case GF_KEY_RIGHT: 
-				rot.x = 0; rot.y = FIX_ONE; rot.z = 0; rot.q = diff;
+			case GF_KEY_RIGHT:
+				rot.x = 0;
+				rot.y = FIX_ONE;
+				rot.z = 0;
+				rot.q = diff;
 				res = gf_quat_from_rotation(res);
 				rot = gf_quat_from_rotation(rot);
 				rot = gf_quat_multiply(&rot, &res);
@@ -1227,21 +1265,27 @@
 				diff = -diff;
 			case GF_KEY_UP:
 				if (ev->key.flags & GF_KEY_MOD_SHIFT) {
-					rot.x = 0; rot.z = FIX_ONE; 
+					rot.x = 0;
+					rot.z = FIX_ONE;
 				} else {
-					rot.x = FIX_ONE; rot.z = 0; 
+					rot.x = FIX_ONE;
+					rot.z = 0;
 				}
-				rot.y = 0; rot.q = diff;
+				rot.y = 0;
+				rot.q = diff;
 				res = gf_quat_from_rotation(res);
 				rot = gf_quat_from_rotation(rot);
 				rot = gf_quat_multiply(&rot, &res);
 				res = gf_quat_to_rotation(&rot);
 				break;
-			case GF_KEY_HOME: res = sphere->offset; break;
-			default: return 0;
+			case GF_KEY_HOME:
+				res = sphere->offset;
+				break;
+			default:
+				return 0;
 			}
 			sphere->rotation_changed = res;
-			gf_node_event_out_str(sh->sensor, "rotation_changed");
+			gf_node_event_out(sh->sensor, 4/*"rotation_changed"*/);
 			return 1;
 		}
 	}
@@ -1272,7 +1316,7 @@
 {
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 	M_VisibilitySensor *vs = (M_VisibilitySensor *)node;
-	
+
 	if (is_destroy || !vs->enabled) return;
 
 	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) {
@@ -1298,15 +1342,15 @@
 
 		if (visible && !vs->isActive) {
 			vs->isActive = 1;
-			gf_node_event_out_str(node, "isActive");
+			gf_node_event_out(node, 5/*"isActive"*/);
 			vs->enterTime = gf_node_get_scene_time(node);
-			gf_node_event_out_str(node, "enterTime");
+			gf_node_event_out(node, 3/*"enterTime"*/);
 		}
 		else if (!visible && vs->isActive) {
 			vs->isActive = 0;
-			gf_node_event_out_str(node, "isActive");
+			gf_node_event_out(node, 5/*"isActive"*/);
 			vs->exitTime = gf_node_get_scene_time(node);
-			gf_node_event_out_str(node, "exitTime");
+			gf_node_event_out(node, 4/*"exitTime"*/);
 		}
 	}
 }
@@ -1320,23 +1364,29 @@
 
 GF_SensorHandler *compositor_mpeg4_get_sensor_handler(GF_Node *n)
 {
+	return compositor_mpeg4_get_sensor_handler_ex(n, GF_FALSE);
+}
+GF_SensorHandler *compositor_mpeg4_get_sensor_handler_ex(GF_Node *n, Bool skip_anchors)
+{
 	GF_SensorHandler *hs;
 
 	switch (gf_node_get_tag(n)) {
 	/*anchor is not considered as a child sensor node when picking sensors*/
-	case TAG_MPEG4_Anchor: 
-		hs = gf_sc_anchor_get_handler(n); 
+	case TAG_MPEG4_Anchor:
+		if (skip_anchors) return NULL;
+		hs = gf_sc_anchor_get_handler(n);
 		break;
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Anchor: 
-		hs = gf_sc_anchor_get_handler(n); 
+	case TAG_X3D_Anchor:
+		if (skip_anchors) return NULL;
+		hs = gf_sc_anchor_get_handler(n);
 		break;
 #endif
-	case TAG_MPEG4_DiscSensor: 
-		hs = disc_sensor_get_handler(n); 
+	case TAG_MPEG4_DiscSensor:
+		hs = disc_sensor_get_handler(n);
 		break;
-	case TAG_MPEG4_PlaneSensor2D: 
-		hs = plane_sensor2d_get_handler(n); 
+	case TAG_MPEG4_PlaneSensor2D:
+		hs = plane_sensor2d_get_handler(n);
 		break;
 	case TAG_MPEG4_ProximitySensor2D:
 		hs = proximity_sensor2d_get_handler(n);
@@ -1350,28 +1400,29 @@
 		break;
 #endif
 #ifndef GPAC_DISABLE_3D
-	case TAG_MPEG4_CylinderSensor: 
+	case TAG_MPEG4_CylinderSensor:
 		hs = cylinder_sensor_get_handler(n);
 		break;
-	case TAG_MPEG4_PlaneSensor: 
+	case TAG_MPEG4_PlaneSensor:
 		hs = plane_sensor_get_handler(n);
 		break;
-	case TAG_MPEG4_SphereSensor: 
+	case TAG_MPEG4_SphereSensor:
 		hs = sphere_get_handler(n);
 		break;
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_CylinderSensor: 
+	case TAG_X3D_CylinderSensor:
 		hs = cylinder_sensor_get_handler(n);
 		break;
-	case TAG_X3D_PlaneSensor: 
+	case TAG_X3D_PlaneSensor:
 		hs = plane_sensor_get_handler(n);
 		break;
-	case TAG_X3D_SphereSensor: 
+	case TAG_X3D_SphereSensor:
 		hs = sphere_get_handler(n);
 		break;
 #endif
 #endif /*GPAC_DISABLE_3D*/
-	default: return NULL;
+	default:
+		return NULL;
 	}
 	if (hs && hs->IsEnabled(n)) return hs;
 	return NULL;
@@ -1492,25 +1543,25 @@
 
 	if (equal) {
 		envtest->valueEqual=(equal==1) ? 1 : 0;
-		gf_node_event_out_str(node, "valueEqual");
+		gf_node_event_out(node, 6/*"valueEqual"*/);
 	}
 	else if (smaller) {
 		envtest->valueSmaller=1;
-		gf_node_event_out_str(node, "valueSmaller");
+		gf_node_event_out(node, 7/*"valueSmaller"*/);
 	}
 	else if (larger) {
 		envtest->valueLarger=1;
-		gf_node_event_out_str(node, "valueLarger");
+		gf_node_event_out(node, 5/*"valueLarger"*/);
 	}
 	envtest->parameterValue.buffer = gf_strdup(par_value);
-	gf_node_event_out_str(node, "parameterValue");
+	gf_node_event_out(node, 8/*"parameterValue"*/);
 }
 
 void compositor_evaluate_envtests(GF_Compositor *compositor, u32 param_type)
 {
 	u32 i, count;
 	count = gf_list_count(compositor->env_tests);
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		GF_Node *envtest = gf_list_get(compositor->env_tests, i);
 		if (!((M_EnvironmentTest *)envtest)->evaluateOnChange) continue;
 
@@ -1531,7 +1582,7 @@
 		case 6:
 			if (param_type==2) envtest_evaluate(envtest, NULL);
 			break;
-		/*the rest are static events*/
+			/*the rest are static events*/
 		}
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_sound.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_sound.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,7 +42,7 @@
 	GF_TraverseState *tr_state = (GF_TraverseState*) rs;
 	M_Sound2D *snd = (M_Sound2D *)node;
 	Sound2DStack *st = (Sound2DStack *)gf_node_get_private(node);
-	
+
 	if (is_destroy) {
 		gf_free(st);
 		return;
@@ -54,12 +54,12 @@
 	st->pos.y = snd->location.y;
 	st->pos.z = 0;
 #ifndef GPAC_DISABLE_3D
-	if (tr_state->visual->type_3d) 
+	if (tr_state->visual->type_3d)
 		gf_mx_apply_vec(&tr_state->model_matrix, &st->pos);
 	else
 #endif
 		gf_mx2d_apply_coords(&tr_state->transform, &st->pos.x, &st->pos.y);
-	
+
 
 	tr_state->sound_holder = &st->snd_ifce;
 	gf_node_traverse((GF_Node *) snd->source, tr_state);
@@ -93,7 +93,7 @@
 #ifndef GPAC_DISABLE_3D
 
 static Fixed snd_compute_gain(Fixed min_b, Fixed min_f, Fixed max_b, Fixed max_f, SFVec3f pos)
-{	
+{
 	Fixed sqpos_x, sqpos_z;
 	Fixed y_pos, x_pos, dist_ellip, viewp_dist, dist_from_foci_min, dist_from_foci_max, d_min, d_max, sqb_min, sqb_max;
 	Fixed a_in = (min_f+min_b)/2;
@@ -114,7 +114,7 @@
 	sqpos_z = gf_mulfix(pos.z, pos.z);
 
 	dist_from_foci_min = gf_sqrt(sqpos_z + sqpos_x) + gf_sqrt( gf_mulfix(pos.z - dist_foci_min, pos.z - dist_foci_min) + sqpos_x);
-	dist_from_foci_max = gf_sqrt(sqpos_z + sqpos_x) + gf_sqrt( gf_mulfix(pos.z - dist_foci_max, pos.z - dist_foci_max) + sqpos_x);	
+	dist_from_foci_max = gf_sqrt(sqpos_z + sqpos_x) + gf_sqrt( gf_mulfix(pos.z - dist_foci_max, pos.z - dist_foci_max) + sqpos_x);
 	d_min = min_f+min_b;
 	d_max = max_f+max_b;
 	if(dist_from_foci_max > d_max) return 0;
@@ -210,7 +210,7 @@
 		mag = gf_vec_len(usr);
 		if (!mag) mag = FIX_ONE/10;
 		ang = gf_divfix(gf_vec_dot(snd_dir, usr), mag);
-	
+
 		usr.z = gf_mulfix(ang, mag);
 		usr.x = gf_sqrt(gf_mulfix(mag, mag) - gf_mulfix(usr.z, usr.z));
 		usr.y = 0;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_text.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_text.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -55,6 +55,7 @@
 	GF_List *spans;
 	GF_Rect bounds;
 	u32 texture_text_flag;
+	Bool is_dirty;
 	GF_Compositor *compositor;
 } TextStack;
 
@@ -86,7 +87,7 @@
 	if (fontSize <= 0) {
 		fontSize = INT2FIX(12);
 		if (!tr_state->pixel_metrics) fontSize = gf_divfix(fontSize, tr_state->visual->compositor->output_width);
-    }
+	}
 
 	styles = 0;
 	if (fs && fs->style.buffer) {
@@ -113,7 +114,7 @@
 	else {
 		start_y = st->ascent;
 	}
-	
+
 	st->bounds.width = st->bounds.x = st->bounds.height = 0;
 	idx = 0;
 	split_words = (tr_state->text_split_mode==1) ? 1 : 0;
@@ -138,9 +139,9 @@
 
 			/*we currently only split sentences at spaces*/
 			if (tspan->glyphs[j]->utf_name == (unsigned short) ' ') is_space = 1;
-			else if (tspan->glyphs[j]->utf_name == (unsigned short) '\n') 
+			else if (tspan->glyphs[j]->utf_name == (unsigned short) '\n')
 				is_space = 2;
-			if (split_words && (j+1!=len) && !is_space) 
+			if (split_words && (j+1!=len) && !is_space)
 				continue;
 
 			span = (GF_TextSpan*) gf_malloc(sizeof(GF_TextSpan));
@@ -213,7 +214,7 @@
 	if (fontSize <= 0) {
 		fontSize = INT2FIX(12);
 		if (!tr_state->pixel_metrics) fontSize = gf_divfix(fontSize, tr_state->visual->compositor->output_width);
-    }
+	}
 	horizontal = FSHORIZ;
 	start_x = start_y = 0;
 
@@ -254,7 +255,7 @@
 
 		tspan = gf_font_manager_create_span(ft_mgr, font, txt->string.vals[i], fontSize, 0, 0, 0, NULL, 0, styles, (GF_Node*)txt);
 		if (!tspan) continue;
-		
+
 		if (horizontal) tspan->flags |= GF_TEXT_SPAN_HORIZONTAL;
 
 		size = 0;
@@ -327,7 +328,7 @@
 	}
 	if (trim_tspan)	gf_font_manager_delete_span(ft_mgr, trim_tspan);
 
-	
+
 	max_scale = FIX_ONE;
 	if (horizontal) {
 		if ((maxExtent > 0) && (tot_width>maxExtent)) {
@@ -405,7 +406,7 @@
 			}
 		}
 	}
-			
+
 
 	/*major-justification*/
 	if (!strcmp(FSMAJOR, "MIDDLE") ) {
@@ -568,9 +569,9 @@
 		gf_node_dirty_clear(node, 0);
 		drawable_mark_modified(stack->graph, tr_state);
 	}
-	
+
 	if (tr_state->visual->compositor->edited_text && (tr_state->visual->compositor->focus_node==node)) {
-		drawable_mark_modified(stack->graph, tr_state);	
+		drawable_mark_modified(stack->graph, tr_state);
 		tr_state->visual->has_text_edit = 1;
 		if (!stack->bounds.width) stack->bounds.width = INT2FIX(1)/100;
 		if (!stack->bounds.height) stack->bounds.height = INT2FIX(1)/100;
@@ -596,6 +597,7 @@
 	if (!txt->string.count) return;
 
 	if (tr_state->text_split_mode) {
+		st->is_dirty = gf_node_dirty_get(n) ? 1 : 0;
 		gf_node_dirty_clear(n, 0);
 		text_clean_paths(tr_state->visual->compositor, st);
 		build_text_split(st, txt, tr_state);
@@ -649,12 +651,12 @@
 
 	/*if text selection mode, we must force redraw of the entire text span because we don't
 	if glyphs have been (un)selected*/
-	if (!tr_state->immediate_draw && 
-		/*text selection on*/
-		(tr_state->visual->compositor->text_selection 
-		/*text sel release*/
-		|| (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED)) 
-	) {
+	if (!tr_state->immediate_draw &&
+	        /*text selection on*/
+	        (tr_state->visual->compositor->text_selection
+	         /*text sel release*/
+	         || (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED))
+	   ) {
 		GF_TextSpan *span;
 		u32 i = 0;
 		Bool unselect = (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED) ? 1 : 0;
@@ -664,6 +666,8 @@
 				ctx->flags |= CTX_APP_DIRTY;
 			}
 		}
+	} else if (st->is_dirty) {
+		ctx->flags |= CTX_APP_DIRTY;
 	}
 
 	if (ctx->sub_path_index) {

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_textures.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_textures.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -38,8 +38,8 @@
 /*for cache texture decode and hash*/
 #include <gpac/avparse.h>
 #include <gpac/crypt.h>
-	
-	
+
+
 typedef struct
 {
 	GF_TextureHandler txh;
@@ -69,7 +69,7 @@
 static void movietexture_activate(MovieTextureStack *stack, M_MovieTexture *mt, Double scene_time)
 {
 	mt->isActive = 1;
-	gf_node_event_out_str((GF_Node*)mt, "isActive");
+	gf_node_event_out((GF_Node*)mt, 8/*"isActive"*/);
 	if (!stack->txh.is_open) {
 		scene_time -= mt->startTime;
 		gf_sc_texture_play_from_to(&stack->txh, &mt->url, scene_time, -1, gf_mo_get_loop(stack->txh.stream, mt->loop), 0);
@@ -81,7 +81,7 @@
 static void movietexture_deactivate(MovieTextureStack *stack, M_MovieTexture *mt)
 {
 	mt->isActive = 0;
-	gf_node_event_out_str((GF_Node*)mt, "isActive");
+	gf_node_event_out((GF_Node*)mt, 8/*"isActive"*/);
 	stack->time_handle.needs_unregister = 1;
 
 	if (stack->txh.is_open) {
@@ -92,7 +92,7 @@
 {
 	M_MovieTexture *txnode = (M_MovieTexture *) txh->owner;
 	MovieTextureStack *st = (MovieTextureStack *) gf_node_get_private(txh->owner);
-	
+
 	/*setup texture if needed*/
 	if (!txh->is_open) return;
 	if (!txnode->isActive && st->first_frame_fetched) return;
@@ -113,7 +113,7 @@
 	if (!st->first_frame_fetched && (txh->needs_refresh) ) {
 		st->first_frame_fetched = 1;
 		txnode->duration_changed = gf_mo_get_duration(txh->stream);
-		gf_node_event_out_str(txh->owner, "duration_changed");
+		gf_node_event_out(txh->owner, 7/*"duration_changed"*/);
 		/*stop stream if needed*/
 		if (!txnode->isActive && txh->is_open) {
 			gf_mo_pause(txh->stream);
@@ -133,7 +133,7 @@
 	Double time;
 	M_MovieTexture *mt = (M_MovieTexture *)st->udta;
 	MovieTextureStack *stack = (MovieTextureStack *)gf_node_get_private(st->udta);
-	
+
 	/*not active, store start time and speed*/
 	if ( ! mt->isActive) {
 		stack->start_time = mt->startTime;
@@ -141,10 +141,10 @@
 	time = gf_node_get_scene_time(st->udta);
 
 	if (time < stack->start_time ||
-		/*special case if we're getting active AFTER stoptime */
-		(!mt->isActive && (mt->stopTime > stack->start_time) && (time>=mt->stopTime))
+	        /*special case if we're getting active AFTER stoptime */
+	        (!mt->isActive && (mt->stopTime > stack->start_time) && (time>=mt->stopTime))
 //		|| (!stack->start_time && !stack->is_x3d && !mt->loop)
-		) {
+	   ) {
 		/*opens stream only at first access to fetch first frame*/
 		if (stack->fetch_first_frame) {
 			stack->fetch_first_frame = 0;
@@ -165,7 +165,7 @@
 	}
 
 	/*we're (about to be) active: VRML:
-	"A time-dependent node is inactive until its startTime is reached. When time now becomes greater than or 
+	"A time-dependent node is inactive until its startTime is reached. When time now becomes greater than or
 	equal to startTime, an isActive TRUE event is generated and the time-dependent node becomes active 	*/
 
 	if (! mt->isActive) movietexture_activate(stack, mt, time);
@@ -183,14 +183,14 @@
 	st->txh.flags = 0;
 	if (((M_MovieTexture*)node)->repeatS) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
 	if (((M_MovieTexture*)node)->repeatT) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
-	
+
 #ifndef GPAC_DISABLE_X3D
 	st->is_x3d = (gf_node_get_tag(node)==TAG_X3D_MovieTexture) ? 1 : 0;
 #endif
 
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, movietexture_destroy);
-	
+
 	gf_sc_register_time_node(compositor, &st->time_handle);
 }
 
@@ -210,7 +210,7 @@
 	if (gf_sc_texture_check_url_change(&st->txh, &mt->url)) {
 		if (st->txh.is_open) gf_sc_texture_stop(&st->txh);
 		if (mt->isActive) gf_sc_texture_play(&st->txh, &mt->url);
-	} 
+	}
 	/*update state if we're active*/
 	else if (mt->isActive) {
 		movietexture_update_time(&st->time_handle);
@@ -225,8 +225,8 @@
 {
 	if (is_destroy) {
 		GF_TextureHandler *txh = (GF_TextureHandler *) gf_node_get_private(node);
-		
-		/*cleanup cache if needed*/ 
+
+		/*cleanup cache if needed*/
 		if (gf_node_get_tag(node)==TAG_MPEG4_CacheTexture) {
 			char section[16];
 			const char *opt, *file;
@@ -266,18 +266,18 @@
 			gf_sc_texture_play(txh, &url);
 		}
 		gf_sc_texture_update_frame(txh, 0);
-		
+
 		if (
-			/*URL is present but not opened - redraw till fetch*/
-			/* (txh->stream && !txh->tx_io) && */ 
-			/*image has been updated*/
-			txh->needs_refresh) {
+		    /*URL is present but not opened - redraw till fetch*/
+		    /* (txh->stream && !txh->tx_io) && */
+		    /*image has been updated*/
+		    txh->needs_refresh) {
 			/*mark all subtrees using this image as dirty*/
 			gf_node_dirty_parents(txh->owner);
 			gf_sc_invalidate(txh->compositor, NULL);
 		}
 		return;
-	} 
+	}
 	/*cache texture case*/
 	else {
 		M_CacheTexture *ct = (M_CacheTexture *) txh->owner;
@@ -295,7 +295,7 @@
 					txh->needs_refresh = 1;
 					txh->stride = out_size / txh->height;
 				}
-			} 
+			}
 			/*BIFS decoded playback*/
 			else {
 				switch (ct->objectTypeIndication) {
@@ -463,7 +463,7 @@
 		return;
 	}
 	/*if not open and changed play*/
-	if (url.count) 
+	if (url.count)
 		gf_sc_texture_play(txh, &url);
 }
 
@@ -493,8 +493,8 @@
 	if (!gf_node_dirty_get(txh->owner)) return;
 	gf_node_dirty_clear(txh->owner, 0);
 
-	
-	/*pixel texture doesn not use any media object but has data in the content. 
+
+	/*pixel texture doesn not use any media object but has data in the content.
 	However we still use the same texture object, just be carefull not to use media funtcions*/
 	txh->transparent = 0;
 	stride = pt->image.width;
@@ -534,7 +534,7 @@
 		for (i=0; i<pt->image.height; i++) {
 			memcpy(st->pixels + i * stride, pt->image.pixels + i * stride, stride);
 		}
-	} 
+	}
 	/*revert pixel ordering...*/
 	else {
 		for (i=0; i<pt->image.height; i++) {

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_timesensor.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_timesensor.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -88,7 +88,7 @@
 		stack->start_time = TS->startTime;
 		stack->cycle_interval = TS->cycleInterval;
 	}
-	
+
 	currentTime = gf_node_get_scene_time(st->udta);
 	if (!TS->isActive) {
 		if (currentTime < stack->start_time) return;
@@ -144,7 +144,7 @@
 	}
 
 	/*we're (about to be) active: VRML:
-	"A time-dependent node is inactive until its startTime is reached. When time now becomes greater than or 
+	"A time-dependent node is inactive until its startTime is reached. When time now becomes greater than or
 	equal to startTime, an isActive TRUE event is generated and the time-dependent node becomes active 	*/
 
 	if (!TS->isActive) {
@@ -181,7 +181,7 @@
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, timesensor_destroy);
 	/*time sensor needs to be run only if def'ed, otherwise it doesn't impact scene*/
-	//if (gf_node_get_id(node)) 
+	//if (gf_node_get_id(node))
 	gf_sc_register_time_node(compositor, &st->time_handle);
 }

gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_viewport.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_viewport.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,14 +42,20 @@
 
 	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;return GF_OK;
-	case TAG_MPEG4_Viewpoint: 
+	case TAG_MPEG4_Viewport:
+		*outName = ((M_Viewport*)n)->description.buffer;
+		*is_bound = ((M_Viewport*)n)->isBound;
+		return GF_OK;
+	case TAG_MPEG4_Viewpoint:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Viewpoint: 
+	case TAG_X3D_Viewpoint:
 #endif
-		*outName = ((M_Viewpoint*)n)->description.buffer; *is_bound = ((M_Viewpoint*)n)->isBound; 
+		*outName = ((M_Viewpoint*)n)->description.buffer;
+		*is_bound = ((M_Viewpoint*)n)->isBound;
+		return GF_OK;
+	default:
+		*outName = NULL;
 		return GF_OK;
-	default: *outName = NULL; return GF_OK;
 	}
 #else
 	return GF_NOT_SUPPORTED;
@@ -73,22 +79,23 @@
 		Bindable_SetSetBind(n, !bind);
 		return GF_OK;
 	}
-	for (i=0; i<count;i++) {
+	for (i=0; i<count; i++) {
 		char *name = NULL;
 		n = (GF_Node*)gf_list_get(compositor->visual->view_stack, viewpoint_idx-1);
 		switch (gf_node_get_tag(n)) {
-		case TAG_MPEG4_Viewport: 
-			name = ((M_Viewport*)n)->description.buffer; 
+		case TAG_MPEG4_Viewport:
+			name = ((M_Viewport*)n)->description.buffer;
 			break;
-		case TAG_MPEG4_Viewpoint: 
-			name = ((M_Viewpoint*)n)->description.buffer; 
+		case TAG_MPEG4_Viewpoint:
+			name = ((M_Viewpoint*)n)->description.buffer;
 			break;
 #ifndef GPAC_DISABLE_X3D
-		case TAG_X3D_Viewpoint: 
-			name = ((M_Viewpoint*)n)->description.buffer; 
+		case TAG_X3D_Viewpoint:
+			name = ((M_Viewpoint*)n)->description.buffer;
 			break;
 #endif
-		default: break;
+		default:
+			break;
 		}
 		if (name && !stricmp(name, viewpoint_name)) {
 			Bool bind = Bindable_GetIsBound(n);
@@ -142,7 +149,7 @@
 	ViewStack *st = (ViewStack *) gf_node_get_private(node);
 	M_Viewport *vp = (M_Viewport *) node;
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
-	
+
 	if (is_destroy) {
 		DestroyViewStack(node);
 		return;
@@ -172,14 +179,14 @@
 	if (tr_state->traversing_mode != TRAVERSE_BINDABLE) return;
 	if (!vp->isBound) return;
 
-	if (gf_list_get(tr_state->viewpoints, 0) != vp) 
+	if (gf_list_get(tr_state->viewpoints, 0) != vp)
 		return;
 
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d) {
 		w = tr_state->bbox.max_edge.x - tr_state->bbox.min_edge.x;
 		h = tr_state->bbox.max_edge.y - tr_state->bbox.min_edge.y;
-	} else 
+	} else
 #endif
 	{
 		w = tr_state->bounds.width;
@@ -256,7 +263,7 @@
 			else if (vp->alignment.vals[1]==1) ty = h/2 - rc.height/2;
 		}
 	}
-	
+
 	gf_mx2d_init(mat);
 	if (tr_state->pixel_metrics) {
 		gf_mx2d_add_scale(&mat, sx, sy);
@@ -279,7 +286,7 @@
 		if (tr_state->is_layer) {
 			gf_mx_from_mx2d(&mx, &mat);
 			gf_mx_add_matrix(&tr_state->model_matrix, &mx);
-		} 
+		}
 		/*otherwise add to camera viewport matrix*/
 		else {
 			gf_mx_from_mx2d(&tr_state->camera->viewport, &mat);
@@ -310,7 +317,7 @@
 	GF_Compositor *rend = gf_sc_get_compositor(node);
 	ViewStack *st = (ViewStack *) gf_node_get_private(node);
 
-	if (!((M_Viewpoint*)node)->isBound ) 
+	if (!((M_Viewpoint*)node)->isBound )
 		st->prev_was_bound = 0;
 	Bindable_OnSetBind(node, st->reg_stacks, NULL);
 	gf_sc_invalidate(rend, NULL);
@@ -356,7 +363,7 @@
 	/*not evaluating vp, return*/
 	if (tr_state->traversing_mode != TRAVERSE_BINDABLE) {
 		/*store model matrix if changed - NOTE: we always have a 1-frame delay between VP used and real world...
-		we could remove this by pre-traversing the scene before applying vp, but that would mean 2 scene 
+		we could remove this by pre-traversing the scene before applying vp, but that would mean 2 scene
 		traversals*/
 		if ((tr_state->traversing_mode==TRAVERSE_SORT) || (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) ) {
 			if (!gf_mx_equal(&st->world_view_mx, &tr_state->model_matrix)) {
@@ -490,7 +497,7 @@
 	scale = gf_vec_len(end);
 
 	tr_state->camera->speed = gf_mulfix(scale, ni->speed);
-    tr_state->camera->visibility = gf_mulfix(scale, ni->visibilityLimit);
+	tr_state->camera->visibility = gf_mulfix(scale, ni->visibilityLimit);
 	if (ni->avatarSize.count) tr_state->camera->avatar_size.x = gf_mulfix(scale, ni->avatarSize.vals[0]);
 	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]);
@@ -499,7 +506,7 @@
 		u32 s = MAX(tr_state->visual->width, tr_state->visual->height);
 		s /= 2;
 //		tr_state->camera->speed = ni->speed;
-	    tr_state->camera->visibility *= s;
+		tr_state->camera->visibility *= s;
 		tr_state->camera->avatar_size.x *= s;
 		tr_state->camera->avatar_size.y *= s;
 		tr_state->camera->avatar_size.z *= s;
@@ -562,7 +569,7 @@
 	}
 	/*not evaluating, return*/
 	if (tr_state->traversing_mode != TRAVERSE_BINDABLE) {
-		if ((tr_state->traversing_mode==TRAVERSE_SORT) || (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) ) 
+		if ((tr_state->traversing_mode==TRAVERSE_SORT) || (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) )
 			gf_mx_copy(st->world_view_mx, tr_state->model_matrix);
 		return;
 	}
@@ -575,7 +582,8 @@
 	if (vp && vp->isBound) vp_st = (ViewStack *) gf_node_get_private((GF_Node *)vp);
 
 	start.x = start.y = start.z = 0;
-	end.x = end.y = 0; end.z = fog->visibilityRange;
+	end.x = end.y = 0;
+	end.z = fog->visibilityRange;
 	if (vp_st) {
 		gf_mx_apply_vec(&vp_st->world_view_mx, &start);
 		gf_mx_apply_vec(&vp_st->world_view_mx, &end);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/navigate.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/navigate.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -39,9 +39,9 @@
 
 #endif
 
-static void nav_set_zoom_trans_2d(GF_VisualManager *visual, Fixed zoom, Fixed dx, Fixed dy) 
+static void nav_set_zoom_trans_2d(GF_VisualManager *visual, Fixed zoom, Fixed dx, Fixed dy)
 {
-	compositor_2d_set_user_transform(visual->compositor, zoom, visual->compositor->trans_x + dx, visual->compositor->trans_y + dy, 0); 
+	compositor_2d_set_user_transform(visual->compositor, zoom, visual->compositor->trans_x + dx, visual->compositor->trans_y + dy, 0);
 #ifndef GPAC_DISABLE_3D
 	if (visual->type_3d) camera_changed(visual->compositor, &visual->camera);
 #endif
@@ -58,7 +58,7 @@
 	gf_mx_add_rotation(mx, angle, axis.x, axis.y, axis.z);
 	gf_mx_add_translation(mx, -axis_pt.x, -axis_pt.y, -axis_pt.z);
 }
-	
+
 static void view_orbit_x(GF_Compositor *compositor, GF_Camera *cam, Fixed dx)
 {
 	GF_Matrix mx;
@@ -182,7 +182,8 @@
 	Fixed oz;
 	if ((z>FIX_ONE) || (z<-FIX_ONE)) return;
 	oz = gf_divfix(cam->vp_fov, cam->fieldOfView);
-	if (oz<FIX_ONE) z/=4; oz += z;
+	if (oz<FIX_ONE) z/=4;
+	oz += z;
 	if (oz<=0) return;
 
 	cam->fieldOfView = gf_divfix(cam->vp_fov, oz);
@@ -242,7 +243,7 @@
 			return 1;
 		}
 	}
-		
+
 	diff = gf_vec_scale(camera_get_pos_dir(cam), dist);
 	gf_vec_add(pos, tr_state.bbox.center, diff);
 	diff = cam->position;
@@ -276,9 +277,9 @@
 	if (compositor->active_layer) {
 		cam = compositor_layer3d_get_camera(compositor->active_layer);
 #ifdef SCALE_NAV
-	is_pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(compositor->active_layer));
+		is_pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(compositor->active_layer));
 #endif
-	} 
+	}
 #endif
 
 	if (!cam) {
@@ -299,7 +300,7 @@
 		y = gf_divfix( INT2FIX(ev->mouse.y - (s32) compositor->visual->height/2), INT2FIX(compositor->visual->height));
 	}
 
-	dx = (x - compositor->grab_x); 
+	dx = (x - compositor->grab_x);
 	dy = (compositor->grab_y - y);
 
 #ifdef SCALE_NAV
@@ -343,7 +344,7 @@
 				camera_changed(compositor, cam);
 				return 1;
 			}
-		} 
+		}
 		/*right*/
 		else if (ev->mouse.button==GF_MOUSE_RIGHT) {
 			if (compositor->navigation_state && (cam->navigate_mode==GF_NAVIGATE_WALK)) {
@@ -476,7 +477,8 @@
 				return 1;
 			}
 			break;
-		case GF_KEY_LEFT: key_inv = -1;
+		case GF_KEY_LEFT:
+			key_inv = -1;
 		case GF_KEY_RIGHT:
 			if (keys & GF_KEY_MOD_ALT) {
 				if ( (keys & GF_KEY_MOD_SHIFT) && (compositor->visual->nb_views > 1) ) {
@@ -488,7 +490,7 @@
 					return 1;
 				}
 				return 0;
-			} 
+			}
 
 
 			switch (cam->navigate_mode) {
@@ -504,8 +506,12 @@
 				if (keys & GF_KEY_MOD_CTRL) view_translate_x(compositor, cam, key_inv * key_trans);
 				else view_orbit_x(compositor, cam, -key_inv * key_exam);
 				break;
-			case GF_NAVIGATE_GAME: view_translate_x(compositor, cam, key_inv * key_trans); break;
-			case GF_NAVIGATE_VR: view_pan_x(compositor, cam, -key_inv * key_pan); break;
+			case GF_NAVIGATE_GAME:
+				view_translate_x(compositor, cam, key_inv * key_trans);
+				break;
+			case GF_NAVIGATE_VR:
+				view_pan_x(compositor, cam, -key_inv * key_pan);
+				break;
 			/*walk/fly/pan*/
 			default:
 				if (keys & GF_KEY_MOD_CTRL) view_translate_x(compositor, cam, key_inv * key_trans);
@@ -513,7 +519,8 @@
 				break;
 			}
 			return 1;
-		case GF_KEY_DOWN: key_inv = -1;
+		case GF_KEY_DOWN:
+			key_inv = -1;
 		case GF_KEY_UP:
 			if (keys & GF_KEY_MOD_ALT) {
 				if ( (keys & GF_KEY_MOD_SHIFT) && (compositor->visual->nb_views > 1) ) {
@@ -524,7 +531,7 @@
 					return 1;
 				}
 				return 0;
-			} 
+			}
 			switch (cam->navigate_mode) {
 			case GF_NAVIGATE_SLIDE:
 				if (keys & GF_KEY_MOD_CTRL) view_translate_z(compositor, cam, key_inv * key_trans);
@@ -542,7 +549,9 @@
 				if (keys & GF_KEY_MOD_CTRL) view_translate_y(compositor, cam, key_inv * key_trans);
 				else view_pan_y(compositor, cam, key_inv * key_pan);
 				break;
-			case GF_NAVIGATE_GAME: view_translate_z(compositor, cam, key_inv * key_trans); break;
+			case GF_NAVIGATE_GAME:
+				view_translate_z(compositor, cam, key_inv * key_trans);
+				break;
 			case GF_NAVIGATE_VR:
 				if (keys & GF_KEY_MOD_CTRL) view_zoom(compositor, cam, key_inv * key_pan);
 				else view_pan_y(compositor, cam, key_inv * key_pan);
@@ -556,10 +565,16 @@
 			return 1;
 
 		case GF_KEY_PAGEDOWN:
-			if (keys & GF_KEY_MOD_CTRL) { view_zoom(compositor, cam, FIX_ONE/10); return 1; }
+			if (keys & GF_KEY_MOD_CTRL) {
+				view_zoom(compositor, cam, FIX_ONE/10);
+				return 1;
+			}
 			break;
 		case GF_KEY_PAGEUP:
-			if (keys & GF_KEY_MOD_CTRL) { view_zoom(compositor, cam, -FIX_ONE/10); return 1; }
+			if (keys & GF_KEY_MOD_CTRL) {
+				view_zoom(compositor, cam, -FIX_ONE/10);
+				return 1;
+			}
 			break;
 		}
 		break;
@@ -599,7 +614,10 @@
 	} else {
 		dy = y - visual->compositor->grab_y;
 	}
-	if (!is_pixel_metrics) { dx /= visual->width; dy /= visual->height; }
+	if (!is_pixel_metrics) {
+		dx /= visual->width;
+		dy /= visual->height;
+	}
 
 	key_inv = 1;
 	key_trans = INT2FIX(2);
@@ -612,7 +630,9 @@
 		key_trans*=4;
 	}
 
-	if (!is_pixel_metrics) { key_trans /= visual->width;}
+	if (!is_pixel_metrics) {
+		key_trans /= visual->width;
+	}
 
 	switch (ev->type) {
 	case GF_EVENT_MOUSEDOWN:
@@ -645,7 +665,7 @@
 			nav_set_zoom_trans_2d(visual, new_zoom, 0, 0);
 			return 1;
 		case GF_NAVIGATE_EXAMINE:
-			if (ev->mouse.wheel_pos>0) 
+			if (ev->mouse.wheel_pos>0)
 				visual->compositor->rotation += gf_asin( GF_PI / 10);
 			else
 				visual->compositor->rotation -= gf_asin( GF_PI / 10);
@@ -681,7 +701,7 @@
 			visual->compositor->rotation += gf_asin(sin);
 			nav_set_zoom_trans_2d(visual, zoom, 0, 0);
 		}
-			break;
+		break;
 		}
 		visual->compositor->grab_x = x;
 		visual->compositor->grab_y = y;
@@ -699,7 +719,8 @@
 				nav_set_zoom_trans_2d(visual, FIX_ONE, 0, 0);
 			}
 			return 1;
-		case GF_KEY_LEFT: key_inv = -1;
+		case GF_KEY_LEFT:
+			key_inv = -1;
 		case GF_KEY_RIGHT:
 			if (navigation_mode == GF_NAVIGATE_SLIDE) {
 				nav_set_zoom_trans_2d(visual, zoom, key_inv*key_trans, 0);
@@ -709,7 +730,8 @@
 				nav_set_zoom_trans_2d(visual, zoom, 0, 0);
 			}
 			return 1;
-		case GF_KEY_DOWN: key_inv = -1;
+		case GF_KEY_DOWN:
+			key_inv = -1;
 		case GF_KEY_UP:
 			if (navigation_mode == GF_NAVIGATE_SLIDE) {
 				if (keys & GF_KEY_MOD_CTRL) {
@@ -736,7 +758,7 @@
 {
 	if (!compositor->scene) return 0;
 #ifndef GPAC_DISABLE_3D
-	if ( (compositor->visual->type_3d>0) || compositor->active_layer) 
+	if ( (compositor->visual->type_3d>0) || compositor->active_layer)
 		return compositor_handle_navigation_3d(compositor, ev);
 #endif
 	return compositor_handle_navigation_2d(compositor->visual, ev);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/nodes_stacks.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/nodes_stacks.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -79,7 +79,7 @@
 /*for user-modif of viewport/viewpoint*/
 void Bindable_SetSetBind(GF_Node *bindable, Bool val);
 
-/*special user-modif of viewport/viewpoint: 
+/*special user-modif of viewport/viewpoint:
  if stack is not NULL, binding is only performed in this stack
  otherwise,  binding is performed on all stack*/
 void Bindable_SetSetBindEx(GF_Node *bindable, Bool val, GF_List *stack);
@@ -108,6 +108,7 @@
 #ifndef GPAC_DISABLE_3D
 	GF_Mesh *mesh;
 	GF_BBox prev_bounds;
+	Bool hybgl_init;
 #endif
 	u32 flags;
 } Background2DStack;
@@ -124,6 +125,7 @@
 
 	GF_Mesh *front_mesh, *back_mesh, *top_mesh, *bottom_mesh, *left_mesh, *right_mesh;
 	GF_TextureHandler txh_front, txh_back, txh_top, txh_bottom, txh_left, txh_right;
+	GF_Matrix current_mx;
 } BackgroundStack;
 #endif

gpac-0.5.0.svn5178.tar.bz2/src/compositor/offscreen_cache.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/offscreen_cache.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -36,12 +36,25 @@
 //#define CACHE_DEBUG_ALPHA
 //#define CACHE_DEBUG_CENTER
 
-void group_cache_draw(GroupCache *cache, GF_TraverseState *tr_state) 
+void group_cache_draw(GroupCache *cache, GF_TraverseState *tr_state)
 {
 	GF_TextureHandler *old_txh = tr_state->ctx->aspect.fill_texture;
 	/*switch the texture to our offscreen cache*/
 	tr_state->ctx->aspect.fill_texture = &cache->txh;
 
+
+#ifndef GPAC_DISABLE_3D
+	if (tr_state->traversing_mode == TRAVERSE_DRAW_3D) {
+		if (!cache->drawable->mesh) {
+			cache->drawable->mesh = new_mesh();
+		}
+		mesh_from_path(cache->drawable->mesh, cache->drawable->path);
+
+		visual_3d_draw_2d(cache->drawable, tr_state);
+		return;
+	}
+#endif
+
 	if (! tr_state->visual->DrawBitmap(tr_state->visual, tr_state, tr_state->ctx, NULL)) {
 		visual_2d_texture_path(tr_state->visual, cache->drawable->path, tr_state->ctx, tr_state);
 	}
@@ -82,7 +95,7 @@
 	cache->txh.pixelformat = for_gl ? GF_PIXEL_RGBA : GF_PIXEL_ARGB;
 	cache->txh.transparent = 1;
 
-	if (cache->txh.data) 
+	if (cache->txh.data)
 		gf_free(cache->txh.data);
 #ifdef CACHE_DEBUG_ALPHA
 	cache->txh.stride = pix_bounds->width * 3;
@@ -98,16 +111,16 @@
 	/*set a rectangle to the path
 	  Attention, we want to center the cached bitmap at the center of the screen (main visual), so we use
 	  the local coordinate to parameterize the path*/
-	gf_path_add_rect_center(cache->drawable->path, 
-		path_bounds->x + path_bounds->width/2,
-		path_bounds->y - path_bounds->height/2,
-		path_bounds->width, path_bounds->height);
+	gf_path_add_rect_center(cache->drawable->path,
+	                        path_bounds->x + path_bounds->width/2,
+	                        path_bounds->y - path_bounds->height/2,
+	                        path_bounds->width, path_bounds->height);
 }
 
 Bool group_cache_traverse(GF_Node *node, GroupCache *cache, GF_TraverseState *tr_state, Bool force_recompute, Bool is_mpeg4, Bool auto_fit_vp)
 {
 	GF_Matrix2D backup;
-	DrawableContext *group_ctx = NULL;	
+	DrawableContext *group_ctx = NULL;
 	GF_ChildNodeItem *l;
 
 	if (!cache) return 0;
@@ -148,7 +161,7 @@
 		tr_state->visual->type_3d = 0;
 #endif
 
-		/*step 2: collect the bounds of all children*/		
+		/*step 2: collect the bounds of all children*/
 		tr_state->traversing_mode = TRAVERSE_GET_BOUNDS;
 		cache_bounds.width = cache_bounds.height = 0;
 		l = ((GF_ParentNode*)node)->children;
@@ -220,12 +233,12 @@
 
 		/*attach the buffer to visual*/
 		r2d->surface_attach_to_buffer(offscreen_surface, cache->txh.data,
-										cache->txh.width, 
-										cache->txh.height,
-										0, 
-										cache->txh.stride, 
-										cache->txh.pixelformat);
-		
+		                              cache->txh.width,
+		                              cache->txh.height,
+		                              0,
+		                              cache->txh.stride,
+		                              cache->txh.pixelformat);
+
 
 		/*recompute the bounds with the final scaling used*/
 		scale_x = gf_divfix(INT2FIX(rc1.width), tr_state->bounds.width);
@@ -244,8 +257,8 @@
 		} else {
 			temp_y += cache_bounds.height;
 		}
-		gf_mx2d_add_translation(&tr_state->transform, temp_x, temp_y);		
-		
+		gf_mx2d_add_translation(&tr_state->transform, temp_x, temp_y);
+
 		/*override top clippers*/
 		rc1 = tr_state->visual->surf_rect;
 		rc2 = tr_state->visual->top_clipper;
@@ -274,9 +287,9 @@
 		child_ctx = group_ctx->next;
 		while (child_ctx && child_ctx->drawable) {
 			drawable_reset_bounds(child_ctx->drawable, tr_state->visual);
-			child_ctx->drawable = NULL;	
+			child_ctx->drawable = NULL;
 			child_ctx = child_ctx->next;
-		}	
+		}
 
 		/*and set ourselves as the last context on the main visual*/
 		tr_state->visual->cur_context = group_ctx;
@@ -294,7 +307,7 @@
 #endif
 		tr_state->visual->surf_rect = rc1;
 		tr_state->visual->top_clipper = rc2;
-		
+
 		/*update texture*/
 		cache->txh.transparent = 1;
 		cache->txh.flags |= GF_SR_TEXTURE_NO_GL_FLIP;
@@ -317,7 +330,7 @@
 	}
 	if (!group_ctx) return 0;
 	group_ctx->flags |= CTX_NO_ANTIALIAS;
-	if (cache->opacity != FIX_ONE) 
+	if (cache->opacity != FIX_ONE)
 		group_ctx->aspect.fill_color = GF_COL_ARGB_FIXED(cache->opacity, FIX_ONE, FIX_ONE, FIX_ONE);
 	else
 		group_ctx->aspect.fill_color = 0;
@@ -356,10 +369,10 @@
 		}
 		visual_3d_draw_from_context(group_ctx, tr_state);
 		group_ctx->drawable = NULL;
-	} else 
+	} else
 #endif
 		drawable_finalize_sort(group_ctx, tr_state, NULL);
-	
+
 #ifndef CACHE_DEBUG_CENTER
 	if (auto_fit_vp)
 #endif
@@ -395,18 +408,18 @@
 	tr_state->visual->compositor->video_cache_current_size += group->cached_size;
 	/*log the information*/
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE]\tAdding object %s\tObjects: %d\tSlope: %g\tSize: %d\tTime: %d\n",
-								gf_node_get_log_name(node),
-								group->nb_objects,	
-								FIX2FLT(group->priority),
-								group->cached_size,
-								group->traverse_time));
+	                                    gf_node_get_log_name(node),
+	                                    group->nb_objects,
+	                                    FIX2FLT(group->priority),
+	                                    group->cached_size,
+	                                    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->video_cache_current_size,
-								gf_list_count(tr_state->visual->compositor->cached_groups)
-								));
-}	
+	                                    tr_state->visual->compositor->video_cache_max_size,
+	                                    tr_state->visual->compositor->video_cache_current_size,
+	                                    gf_list_count(tr_state->visual->compositor->cached_groups)
+	                                   ));
+}
 
 
 static Bool gf_cache_remove_entry(GF_Compositor *compositor, GF_Node *node, GroupingNode2D *group)
@@ -433,7 +446,7 @@
 		/*the discarded bytes*/
 		bytes_remove = group->cached_size;
 	}
-	
+
 	/*indicates cache destruction for next frame*/
 	if (group->cache && (group->flags & GROUP_IS_CACHED)) {
 		group->flags &= ~GROUP_IS_CACHED;
@@ -447,17 +460,17 @@
 	compositor->video_cache_current_size -= bytes_remove;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Removing cache %s:\t Objects: %d\tSlope: %g\tBytes: %d\tTime: %d\n",
-										gf_node_get_log_name(node),
-										group->nb_objects,	
-										FIX2FLT(group->priority),
-										group->cached_size,
-										FIX2FLT(group->traverse_time)));
-	
+	                                    gf_node_get_log_name(node),
+	                                    group->nb_objects,
+	                                    FIX2FLT(group->priority),
+	                                    group->cached_size,
+	                                    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->video_cache_current_size,
-								gf_list_count(compositor->cached_groups)
-								));
+	                                    compositor->video_cache_max_size,
+	                                    compositor->video_cache_current_size,
+	                                    gf_list_count(compositor->cached_groups)
+	                                   ));
 	return 1;
 }
 
@@ -508,7 +521,7 @@
 		if (!cache_on) {
 			if (is_dirty) {
 				group->changed = 1;
-			} 
+			}
 			/*ask for stats again*/
 			else if (group->changed) {
 				group->changed = 0;
@@ -524,7 +537,7 @@
 					tr_state->visual->compositor->traverse_state->invalidate_all = 1;
 				/*force redraw*/
 				tr_state->visual->compositor->draw_next_frame = 1;
-			} 			
+			}
 			return 0;
 		}
 	}
@@ -559,9 +572,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->cache_tolerance))
 				zoom_changed = 1;
-			else if ((100+tr_state->visual->compositor->cache_tolerance)*scale <= 100*group->cache->scale) 
+			else if ((100+tr_state->visual->compositor->cache_tolerance)*scale <= 100*group->cache->scale)
 				zoom_changed = 1;
 			else
 				zoom_changed = 0;
@@ -628,7 +641,7 @@
 	while (ctx && ctx->drawable) {
 		//Fixed area;
 		u32 alpha_comp;
-		
+
 		/*get area and compute alpha/opaque coverage*/
 		alpha_comp = GF_COL_A(ctx->aspect.fill_color);
 
@@ -637,12 +650,12 @@
 		nb_objects++;
 
 		/*no alpha*/
-		if ((alpha_comp==0xFF) 
-			/*no transparent texture*/
-			&& (!ctx->aspect.fill_texture || !ctx->aspect.fill_texture->transparent)
-		) {
+		if ((alpha_comp==0xFF)
+		        /*no transparent texture*/
+		        && (!ctx->aspect.fill_texture || !ctx->aspect.fill_texture->transparent)
+		   ) {
 
-			ra_union_rect(&ra, &ctx->bi->clip);		
+			ra_union_rect(&ra, &ctx->bi->clip);
 		}
 		nb_segments += ctx->drawable->path->n_points;
 
@@ -650,31 +663,31 @@
 	}
 
 	if (
-		/*TEST 1: discard visually empty groups*/
-		(!group_bounds.width || !group_bounds.height) 
-		|| 
-		/*TEST 2: discard small groups*/
-		(nb_objects<MIN_OBJECTS_IN_CACHE) 
-		||	
-		/*TEST 3: low complexity group*/
-		(nb_segments && (nb_segments<10))
+	    /*TEST 1: discard visually empty groups*/
+	    (!group_bounds.width || !group_bounds.height)
+	    ||
+	    /*TEST 2: discard small groups*/
+	    (nb_objects<MIN_OBJECTS_IN_CACHE)
+	    ||
+	    /*TEST 3: low complexity group*/
+	    (nb_segments && (nb_segments<10))
 	) {
 		ra_del(&ra);
 		goto group_reject;
 	}
-	
+
 	ra_refresh(&ra);
 	opaque_pixels = 0;
 	for (i=0; i<ra.count; i++) {
 		opaque_pixels += ra.list[i].width * ra.list[i].height;
 	}
 	ra_del(&ra);
-	
+
 	/*get coverage in world coords*/
 	area_world = FIX2INT(group_bounds.width) * FIX2INT(group_bounds.height);
-	
+
 	/*TEST 4: discard low coverage groups in world coords (plenty of space wasted)
-		we consider that this % of the area is actually drawn - this is of course wrong, 
+		we consider that this % of the area is actually drawn - this is of course wrong,
 		we would need to compute each path coverage in local coords then get the ratio
 	*/
 	if (10*opaque_pixels < 7*area_world) goto group_reject;
@@ -695,7 +708,7 @@
 	/*compute the delta value for measuring the group importance for later discard
 		(avg_time - Tcache) / (size_cache - drawable_gain)
 	*/
-	group->priority = INT2FIX(nb_objects*1024*group->traverse_time) / cache_size / group->nb_stats_frame; 
+	group->priority = INT2FIX(nb_objects*1024*group->traverse_time) / cache_size / group->nb_stats_frame;
 	/*OK, group is a good candidate for caching*/
 	group->nb_objects = nb_objects;
 	group->cached_size = cache_size;
@@ -726,7 +739,7 @@
 
 group_reject:
 	group->nb_objects = nb_objects;
-	
+
 	if ((group->flags & GROUP_IS_CACHABLE) || group->cache) {
 		group->flags &= ~GROUP_IS_CACHABLE;
 
@@ -738,21 +751,21 @@
 		gf_list_del_item(tr_state->visual->compositor->cached_groups, group);
 		tr_state->visual->compositor->video_cache_current_size -= cache_size;
 	}
-	
+
 #if 0
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] REJECT %s\tObjects: %d\tSlope: %g\tBytes: %d\tTime: %d\n",
-										gf_node_get_log_name(node),
-										group->nb_objects,	
-										FIX2FLT(group->priority),
-										group->cached_size,
-										group->traverse_time
-										));
+	                                    gf_node_get_log_name(node),
+	                                    group->nb_objects,
+	                                    FIX2FLT(group->priority),
+	                                    group->cached_size,
+	                                    group->traverse_time
+	                                   ));
 
 	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->video_cache_current_size,
-								gf_list_count(tr_state->visual->compositor->cached_groups)
-								));
+	                                    tr_state->visual->compositor->video_cache_max_size,
+	                                    tr_state->visual->compositor->video_cache_current_size,
+	                                    gf_list_count(tr_state->visual->compositor->cached_groups)
+	                                   ));
 #endif
 	return 0;
 }
@@ -764,7 +777,7 @@
 	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 
+	/*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) {
 		group->traverse_time = 0;
@@ -773,7 +786,7 @@
 
 	if (group->nb_stats_frame < NUM_STATS_FRAMES) {
 		group->nb_stats_frame++;
-		tr_state->visual->compositor->draw_next_frame = 1; 
+		tr_state->visual->compositor->draw_next_frame = 1;
 		return;
 	}
 	if (group->nb_stats_frame > NUM_STATS_FRAMES) return;
@@ -807,7 +820,7 @@
 			gf_list_rem(compositor->cached_groups_queue, last_cache_idx);
 		}
 		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)	{
 			gf_cache_remove_entry(compositor, node, NULL);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/offscreen_cache.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/offscreen_cache.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -41,6 +41,7 @@
 	/*user scale (zoom and AR) of the group*/
 	Fixed scale;
 	SFVec2f orig_vp;
+
 } GroupCache;
 
 GroupCache *group_cache_new(GF_Compositor *compositor, GF_Node *node);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_base.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/svg_base.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -50,53 +50,38 @@
 {
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d && backup_matrix) {
-		GF_Matrix tmp;
 		Bool is_draw = (tr_state->traversing_mode==TRAVERSE_SORT) ? 1 : 0;
 		gf_mx_copy(*backup_matrix, tr_state->model_matrix);
 
-		if (is_draw) visual_3d_matrix_push(tr_state->visual);
-
 		if (atts->transform && atts->transform->is_ref) {
 			gf_mx_from_mx2d(&tr_state->model_matrix, &tr_state->vb_transform);
 			if (is_draw) {
-				GF_Matrix tmp;
-				gf_mx_init(tmp);
-				gf_mx_add_translation(&tmp, -tr_state->camera->width/2, tr_state->camera->height/2, 0);
-				gf_mx_add_scale(&tmp, FIX_ONE, -FIX_ONE, FIX_ONE);
-				gf_mx_add_matrix(&tmp, &tr_state->model_matrix);
-				visual_3d_matrix_load(tr_state->visual, tmp.m);
+				gf_mx_init(tr_state->model_matrix);
+				gf_mx_add_translation(&tr_state->model_matrix, -tr_state->camera->width/2, tr_state->camera->height/2, 0);
+				gf_mx_add_scale(&tr_state->model_matrix, FIX_ONE, -FIX_ONE, FIX_ONE);
+				gf_mx_add_matrix_2d(&tr_state->model_matrix, &tr_state->vb_transform);
 			}
 		}
 
 		if (atts->motionTransform) {
-			if (is_draw) {
-				gf_mx_from_mx2d(&tmp, atts->motionTransform);
-				visual_3d_matrix_add(tr_state->visual, tmp.m);
-			} else {
-				gf_mx_add_matrix_2d(&tr_state->model_matrix, atts->motionTransform);
-			}
+			gf_mx_add_matrix_2d(&tr_state->model_matrix, atts->motionTransform);
 		}
 
 		if (atts->transform) {
-			if (is_draw) {
-				gf_mx_from_mx2d(&tmp, &atts->transform->mat);
-				visual_3d_matrix_add(tr_state->visual, tmp.m);
-			} else {
-				gf_mx_add_matrix_2d(&tr_state->model_matrix, &atts->transform->mat);
-			}
+			gf_mx_add_matrix_2d(&tr_state->model_matrix, &atts->transform->mat);
 		}
 		return;
-	} 
+	}
 #endif
 	gf_mx2d_copy(*backup_matrix_2d, tr_state->transform);
 
-	if (atts->transform && atts->transform->is_ref) 
+	if (atts->transform && atts->transform->is_ref)
 		gf_mx2d_copy(tr_state->transform, tr_state->vb_transform);
 
-	if (atts->motionTransform) 
+	if (atts->motionTransform)
 		gf_mx2d_pre_multiply(&tr_state->transform, atts->motionTransform);
 
-	if (atts->transform) 
+	if (atts->transform)
 		gf_mx2d_pre_multiply(&tr_state->transform, &atts->transform->mat);
 
 }
@@ -105,17 +90,15 @@
 {
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d && backup_matrix) {
-		if (tr_state->traversing_mode==TRAVERSE_SORT) 
-			visual_3d_matrix_pop(tr_state->visual);
-		gf_mx_copy(tr_state->model_matrix, *backup_matrix);  
+		gf_mx_copy(tr_state->model_matrix, *backup_matrix);
 		return;
-	} 
+	}
 #endif
-	gf_mx2d_copy(tr_state->transform, *backup_matrix_2d);  
+	gf_mx2d_copy(tr_state->transform, *backup_matrix_2d);
 }
 
 #ifdef GPAC_UNUSED_FUNC
-static void gf_svg_apply_inheritance_no_inheritance(SVGAllAttributes *all_atts, SVGPropertiesPointers *render_svg_props) 
+static void gf_svg_apply_inheritance_no_inheritance(SVGAllAttributes *all_atts, SVGPropertiesPointers *render_svg_props)
 {
 #define CHECK_PROP(a, b) if (b) a = b;
 
@@ -124,7 +107,7 @@
 	CHECK_PROP(render_svg_props->fill, all_atts->fill);
 	CHECK_PROP(render_svg_props->fill_opacity, all_atts->fill_opacity);
 	CHECK_PROP(render_svg_props->fill_rule, all_atts->fill_rule);
-	CHECK_PROP(render_svg_props->solid_color, all_atts->solid_color);		
+	CHECK_PROP(render_svg_props->solid_color, all_atts->solid_color);
 	CHECK_PROP(render_svg_props->solid_opacity, all_atts->solid_opacity);
 	CHECK_PROP(render_svg_props->stop_color, all_atts->stop_color);
 	CHECK_PROP(render_svg_props->stop_opacity, all_atts->stop_opacity);
@@ -140,7 +123,10 @@
 }
 #endif /*GPAC_UNUSED_FUNC*/
 
-static const struct svg_11_feature { const char *name; Bool supported; } svg11_features[] = 
+static const struct svg_11_feature {
+	const char *name;
+	Bool supported;
+} svg11_features[] =
 {
 	{ "Animation", 1},
 	{ "AnimationEventsAttribute", 1},
@@ -193,46 +179,49 @@
 	{ "SVGDOM-dynamic", 0},
 	{ "SVGDOM-static", 0},
 };
-static const struct svg_12_feature { const char *name; Bool supported; } svg12_features[] = 
+static const struct svg_12_feature {
+	const char *name;
+	Bool supported;
+} svg12_features[] =
 {
-	{ "CoreAttribute", 1}, 
-	{ "NavigationAttribute", 1}, 
-	{ "Structure", 1}, 
-	{ "ConditionalProcessing", 1}, 
-	{ "ConditionalProcessingAttribute", 1}, 
-	{ "Image", 1}, 
-	{ "Prefetch", 1}, 
-	{ "Discard", 1}, 
-	{ "Shape", 1}, 
-	{ "Text", 1}, 
-	{ "PaintAttribute", 1}, 
-	{ "OpacityAttribute", 1}, 
-	{ "GraphicsAttribute", 1}, 
-	{ "Gradient", 1}, 
-	{ "SolidColor", 1}, 
-	{ "Hyperlinking", 1}, 
-	{ "XlinkAttribute", 1}, 
-	{ "ExternalResourcesRequired", 1}, 
-	{ "Scripting", 1}, 
-	{ "Handler", 1}, 
-	{ "Listener", 1}, 
-	{ "TimedAnimation", 1}, 
-	{ "Animation", 1}, 
-	{ "Audio", 1}, 
-	{ "Video", 1}, 
-	{ "Font", 1}, 
-	{ "Extensibility", 1}, 
-	{ "MediaAttribute", 1}, 
-	{ "TextFlow", 1}, 
-	{ "TransformedVideo", 1}, 
-	{ "ComposedVideo", 1}, 
-	{ "EditableTextAttribute", 1}, 
-
-	{ "SVG-static", 1}, 
-	{ "SVG-static-DOM", 1}, 
-	{ "SVG-animated", 1}, 
-	{ "SVG-all", 1}, 
-	{ "SVG-interactive", 1}, 
+	{ "CoreAttribute", 1},
+	{ "NavigationAttribute", 1},
+	{ "Structure", 1},
+	{ "ConditionalProcessing", 1},
+	{ "ConditionalProcessingAttribute", 1},
+	{ "Image", 1},
+	{ "Prefetch", 1},
+	{ "Discard", 1},
+	{ "Shape", 1},
+	{ "Text", 1},
+	{ "PaintAttribute", 1},
+	{ "OpacityAttribute", 1},
+	{ "GraphicsAttribute", 1},
+	{ "Gradient", 1},
+	{ "SolidColor", 1},
+	{ "Hyperlinking", 1},
+	{ "XlinkAttribute", 1},
+	{ "ExternalResourcesRequired", 1},
+	{ "Scripting", 1},
+	{ "Handler", 1},
+	{ "Listener", 1},
+	{ "TimedAnimation", 1},
+	{ "Animation", 1},
+	{ "Audio", 1},
+	{ "Video", 1},
+	{ "Font", 1},
+	{ "Extensibility", 1},
+	{ "MediaAttribute", 1},
+	{ "TextFlow", 1},
+	{ "TransformedVideo", 1},
+	{ "ComposedVideo", 1},
+	{ "EditableTextAttribute", 1},
+
+	{ "SVG-static", 1},
+	{ "SVG-static-DOM", 1},
+	{ "SVG-animated", 1},
+	{ "SVG-all", 1},
+	{ "SVG-interactive", 1},
 };
 
 
@@ -244,7 +233,7 @@
 
 	/*process required features*/
 	count = atts->requiredFeatures ? gf_list_count(*atts->requiredFeatures) : 0;
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		char *feat = NULL;
 		XMLRI *iri = gf_list_get(*atts->requiredFeatures, i);
 		if (!iri->string) continue;
@@ -314,14 +303,20 @@
 		found = 1;
 	}
 
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		char *lang = gf_list_get(*atts->systemLanguage, i);
 		/*3 char-code*/
 		if (strlen(lang)==3) {
-			if (!stricmp(lang, lang_3cc)) { found = 1; break; }
+			if (!stricmp(lang, lang_3cc)) {
+				found = 1;
+				break;
+			}
 		}
 		/*2 char-code, only check first 2 chars - TODO FIXME*/
-		else if (!strnicmp(lang, lang_2cc, 2)) { found = 1; break; }
+		else if (!strnicmp(lang, lang_2cc, 2)) {
+			found = 1;
+			break;
+		}
 	}
 	if (!found) return 0;
 
@@ -348,18 +343,18 @@
 				return 0;
 		}
 	}
-	
+
 	/*OK, we can render this one*/
 	return 1;
 }
 
-Bool compositor_svg_traverse_base(GF_Node *node, SVGAllAttributes *atts, GF_TraverseState *tr_state, 
-					 SVGPropertiesPointers *backup_props, u32 *backup_flags)
+Bool compositor_svg_traverse_base(GF_Node *node, SVGAllAttributes *atts, GF_TraverseState *tr_state,
+                                  SVGPropertiesPointers *backup_props, u32 *backup_flags)
 {
 	u32 inherited_flags_mask, flags;
 
-	if (atts->requiredFeatures || atts->requiredExtensions || atts->systemLanguage 
-	|| atts->requiredFonts || atts->requiredFormats) {
+	if (atts->requiredFeatures || atts->requiredExtensions || atts->systemLanguage
+	        || atts->requiredFonts || atts->requiredFormats) {
 		if (!compositor_svg_evaluate_conditional(tr_state->visual->compositor, atts))
 			return 0;
 	}
@@ -369,11 +364,11 @@
 
 #if 0
 	// applying inheritance and determining which group of properties are being inherited
-	inherited_flags_mask = gf_svg_apply_inheritance(atts, tr_state->svg_props);	
+	inherited_flags_mask = gf_svg_apply_inheritance(atts, tr_state->svg_props);
 	gf_svg_apply_animations(node, tr_state->svg_props); // including again inheritance if values are 'inherit'
 #else
 	/* animation (including possibly inheritance) then full inheritance */
-	gf_svg_apply_animations(node, tr_state->svg_props); 
+	gf_svg_apply_animations(node, tr_state->svg_props);
 	inherited_flags_mask = gf_svg_apply_inheritance(atts, tr_state->svg_props);
 //	gf_svg_apply_inheritance_no_inheritance(atts, tr_state->svg_props);
 //	inherited_flags_mask = 0xFFFFFFFF;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_filters.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/svg_filters.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -54,16 +54,30 @@
 		char *ptr = NULL;
 		/*FIXME: unused u32 tag = gf_node_get_tag(l->node);*/
 		GF_DOMAttribute *att = ((SVG_Element *)l->node)->attributes;
-		
+
 		while (att) {
 			switch (att->tag) {
-			case TAG_SVG_ATT_filter_transfer_type: type = *(u8*)att->data;  break;
-			case TAG_SVG_ATT_filter_table_values: table = *(GF_List **)att->data;  break;
-			case TAG_SVG_ATT_slope: slope = ((SVG_Number *)att->data)->value; break;
-			case TAG_SVG_ATT_filter_intercept: intercept = ((SVG_Number *)att->data)->value; break;
-			case TAG_SVG_ATT_filter_amplitude: amplitude = ((SVG_Number *)att->data)->value; break;
-			case TAG_SVG_ATT_filter_exponent: exponent = ((SVG_Number *)att->data)->value; break;
-			case TAG_SVG_ATT_offset: offset = ((SVG_Number *)att->data)->value; break;
+			case TAG_SVG_ATT_filter_transfer_type:
+				type = *(u8*)att->data;
+				break;
+			case TAG_SVG_ATT_filter_table_values:
+				table = *(GF_List **)att->data;
+				break;
+			case TAG_SVG_ATT_slope:
+				slope = ((SVG_Number *)att->data)->value;
+				break;
+			case TAG_SVG_ATT_filter_intercept:
+				intercept = ((SVG_Number *)att->data)->value;
+				break;
+			case TAG_SVG_ATT_filter_amplitude:
+				amplitude = ((SVG_Number *)att->data)->value;
+				break;
+			case TAG_SVG_ATT_filter_exponent:
+				exponent = ((SVG_Number *)att->data)->value;
+				break;
+			case TAG_SVG_ATT_offset:
+				offset = ((SVG_Number *)att->data)->value;
+				break;
 			}
 			att = att->next;
 		}
@@ -238,15 +252,15 @@
 	Warning, we want to center the cached bitmap at the center of the screen (main visual)*/
 	gf_path_reset(st->drawable->path);
 
-	gf_path_add_rect_center(st->drawable->path, 
-		bounds.x + bounds.width/2, 
-		bounds.y - bounds.height/2, 
-		bounds.width, 
-		bounds.height);
+	gf_path_add_rect_center(st->drawable->path,
+	                        bounds.x + bounds.width/2,
+	                        bounds.y - bounds.height/2,
+	                        bounds.width,
+	                        bounds.height);
 
 
 	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 = tr_state->visual->compositor->rasterizer->surface_new(tr_state->visual->compositor->rasterizer, tr_state->visual->center_coords);
 	tr_state->visual->raster_surface = offscreen_surface;
 
 	gf_mx2d_copy(backup, tr_state->transform);
@@ -254,11 +268,11 @@
 
 	/*attach the buffer to visual*/
 	tr_state->visual->compositor->rasterizer->surface_attach_to_buffer(offscreen_surface, st->txh.data,
-									st->txh.width, 
-									st->txh.height,
-									0, 
-									st->txh.stride, 
-									st->txh.pixelformat);
+	        st->txh.width,
+	        st->txh.height,
+	        0,
+	        st->txh.stride,
+	        st->txh.pixelformat);
 
 	prev_flags = tr_state->immediate_draw;
 	tr_state->immediate_draw = 1;
@@ -282,7 +296,7 @@
 		temp_x = -rc.x;
 		temp_y = rc.height - rc.y;
 	}
-	gf_mx2d_add_translation(&tr_state->transform, temp_x, temp_y);		
+	gf_mx2d_add_translation(&tr_state->transform, temp_x, temp_y);
 
 
 	rc1 = tr_state->visual->surf_rect;
@@ -310,9 +324,9 @@
 	child_ctx = ctx->next;
 	while (child_ctx && child_ctx->drawable) {
 		drawable_reset_bounds(child_ctx->drawable, tr_state->visual);
-		child_ctx->drawable = NULL;	
+		child_ctx->drawable = NULL;
 		child_ctx = child_ctx->next;
-	}	
+	}
 	tr_state->visual->cur_context = ctx;
 
 
@@ -333,7 +347,7 @@
 	st->txh.flags |= GF_SR_TEXTURE_NO_GL_FLIP;
 	gf_sc_texture_set_data(&st->txh);
 #ifndef GPAC_DISABLE_3D
-	if (tr_state->visual->type_3d) 
+	if (tr_state->visual->type_3d)
 		gf_sc_texture_push_image(&st->txh, 0, 0);
 	else
 #endif
@@ -378,7 +392,7 @@
 		visual_3d_draw_from_context(tr_state->ctx, tr_state);
 		ctx->drawable = NULL;
 		return;
-	} 
+	}
 #endif
 
 	/*we computed the texture in final screen coordinate, so use the identity matrix for the context*/

gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_font.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/svg_font.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2007-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -79,7 +79,7 @@
 
 	gl_idx = 0;
 	prev_c = 0;
-	for (i=0;i<len; i++) {
+	for (i=0; i<len; i++) {
 		SVG_GlyphStack *missing_glyph = NULL;
 		SVG_GlyphStack *st = NULL;
 		child = ((GF_ParentNode *) node)->children;
@@ -90,7 +90,7 @@
 			} else if (tag ==TAG_SVG_glyph) {
 				Bool glyph_ok = 0;
 				SVGAllAttributes atts;
-				
+
 				st = gf_node_get_private(child->node);
 				if (!st) {
 					child = child->next;
@@ -150,15 +150,15 @@
 		}
 		prev_c = glyph_buffer[i];
 
-		if (!st) 
+		if (!st)
 			st = missing_glyph;
 		glyph_buffer[gl_idx] = st ? st->glyph.ID : 0;
 		if (st && st->uni_len>1) i++;
-		
+
 		gl_idx++;
 	}
 	*io_glyph_buffer_size = /* len = */ gl_idx;
-	
+
 	return GF_OK;
 }
 
@@ -176,7 +176,7 @@
 		}
 		child = child->next;
 	}
-	
+
 	return NULL;
 }
 
@@ -264,25 +264,51 @@
 
 	if (atts.font_weight) {
 		switch(*atts.font_weight) {
-		case SVG_FONTWEIGHT_100: font->styles |= GF_FONT_WEIGHT_100; break;
-		case SVG_FONTWEIGHT_LIGHTER: font->styles |= GF_FONT_WEIGHT_LIGHTER; break;
-		case SVG_FONTWEIGHT_200: font->styles |= GF_FONT_WEIGHT_200; break;
-		case SVG_FONTWEIGHT_300: font->styles |= GF_FONT_WEIGHT_300; break;
-		case SVG_FONTWEIGHT_400: font->styles |= GF_FONT_WEIGHT_400; break;
-		case SVG_FONTWEIGHT_NORMAL: font->styles |= GF_FONT_WEIGHT_NORMAL; break;
-		case SVG_FONTWEIGHT_500: font->styles |= GF_FONT_WEIGHT_500; break;
-		case SVG_FONTWEIGHT_600: font->styles |= GF_FONT_WEIGHT_600; break;
-		case SVG_FONTWEIGHT_700: font->styles |= GF_FONT_WEIGHT_700; break;
-		case SVG_FONTWEIGHT_BOLD: font->styles |= GF_FONT_WEIGHT_BOLD; break;
-		case SVG_FONTWEIGHT_800: font->styles |= GF_FONT_WEIGHT_800; break;
-		case SVG_FONTWEIGHT_900: font->styles |= GF_FONT_WEIGHT_900; break;
-		case SVG_FONTWEIGHT_BOLDER: font->styles |= GF_FONT_WEIGHT_BOLDER; break;
+		case SVG_FONTWEIGHT_100:
+			font->styles |= GF_FONT_WEIGHT_100;
+			break;
+		case SVG_FONTWEIGHT_LIGHTER:
+			font->styles |= GF_FONT_WEIGHT_LIGHTER;
+			break;
+		case SVG_FONTWEIGHT_200:
+			font->styles |= GF_FONT_WEIGHT_200;
+			break;
+		case SVG_FONTWEIGHT_300:
+			font->styles |= GF_FONT_WEIGHT_300;
+			break;
+		case SVG_FONTWEIGHT_400:
+			font->styles |= GF_FONT_WEIGHT_400;
+			break;
+		case SVG_FONTWEIGHT_NORMAL:
+			font->styles |= GF_FONT_WEIGHT_NORMAL;
+			break;
+		case SVG_FONTWEIGHT_500:
+			font->styles |= GF_FONT_WEIGHT_500;
+			break;
+		case SVG_FONTWEIGHT_600:
+			font->styles |= GF_FONT_WEIGHT_600;
+			break;
+		case SVG_FONTWEIGHT_700:
+			font->styles |= GF_FONT_WEIGHT_700;
+			break;
+		case SVG_FONTWEIGHT_BOLD:
+			font->styles |= GF_FONT_WEIGHT_BOLD;
+			break;
+		case SVG_FONTWEIGHT_800:
+			font->styles |= GF_FONT_WEIGHT_800;
+			break;
+		case SVG_FONTWEIGHT_900:
+			font->styles |= GF_FONT_WEIGHT_900;
+			break;
+		case SVG_FONTWEIGHT_BOLDER:
+			font->styles |= GF_FONT_WEIGHT_BOLDER;
+			break;
 		}
 	}
 
 	gf_svg_flatten_attributes((SVG_Element*)node_font, &atts);
 	font->max_advance_h = atts.horiz_adv_x ? FIX2INT( gf_ceil(atts.horiz_adv_x->value) ) : 0;
-	
+
 	font->not_loaded = 1;
 
 	/*wait for onLoad event before activating the font, otherwise we may not have all the glyphs*/
@@ -293,7 +319,7 @@
 
 
 static void svg_traverse_glyph(GF_Node *node, void *rs, Bool is_destroy)
-{	
+{
 	if (is_destroy) {
 		GF_Font *font;
 		GF_Glyph *prev_glyph, *a_glyph;
@@ -370,7 +396,7 @@
 		st->glyph.height = FIX2INT( gf_ceil(rc.height) );
 	}
 	st->glyph.vert_advance = st->glyph.height;
-	if (!st->glyph.vert_advance) 
+	if (!st->glyph.vert_advance)
 		st->glyph.vert_advance = font->max_advance_v;
 
 	/*register glyph*/
@@ -419,7 +445,7 @@
 		if (!atts.xlink_href->target) 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) return 0;
 	font = gf_node_get_private(font_elt);
 	if (!font) return 0;
 	st->alias = font;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_geometry.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/svg_geometry.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -54,18 +54,18 @@
 		gf_path_get_bounds(drawable->path, &rc);
 	}
 	inside = ( (x >= rc.x) && (y <= rc.y) && (x <= rc.x + rc.width) && (y >= rc.y - rc.height) ) ? 1 : 0;
-	
+
 	if (ptr_evt==SVG_POINTEREVENTS_BOUNDINGBOX) return inside;
 
 	check_fill = check_stroke = check_over = check_outline = check_vis = 0;
 	/*
 	check_vis: if set, return FALSE when visible property is not "visible"
-	check_fill: 
+	check_fill:
 		if 1, checks whether point is over path,
-		if 2, checks if the path is painted (even with fill-opacity=0) before 
-	check_stroke: 
+		if 2, checks if the path is painted (even with fill-opacity=0) before
+	check_stroke:
 		if 1, checks whether point is over path outline,
-		if 2, checks if the path outline is painted (even with stroke-opacity=0) before 
+		if 2, checks if the path outline is painted (even with stroke-opacity=0) before
 	*/
 	switch (ptr_evt) {
 	case SVG_POINTEREVENTS_VISIBLE:
@@ -145,7 +145,7 @@
 			if (glyph_rc) return 1;
 			si = drawable_get_strikeinfo(tr_state->visual->compositor, drawable, asp, tr_state->appear, NULL, 0, NULL);
 			/*point is over outline*/
-			if (si && si->outline && gf_path_point_over(si->outline, x, y)) 
+			if (si && si->outline && gf_path_point_over(si->outline, x, y))
 				return 1;
 		}
 	}
@@ -166,7 +166,7 @@
 
 #ifndef GPAC_DISABLE_3D
 
-void svg_drawable_3d_pick(Drawable *drawable, GF_TraverseState *tr_state, DrawAspect2D *asp) 
+void svg_drawable_3d_pick(Drawable *drawable, GF_TraverseState *tr_state, DrawAspect2D *asp)
 {
 	SFVec3f local_pt, world_pt, vdiff;
 	SFVec3f hit_normal;
@@ -208,7 +208,8 @@
 
 	if (!node_is_over) return;
 
-	hit_normal.x = hit_normal.y = 0; hit_normal.z = FIX_ONE;
+	hit_normal.x = hit_normal.y = 0;
+	hit_normal.z = FIX_ONE;
 	text_coords.x = gf_divfix(local_pt.x, drawable->path->bbox.width) + FIX_ONE/2;
 	text_coords.y = gf_divfix(local_pt.y, drawable->path->bbox.height) + FIX_ONE/2;
 
@@ -256,7 +257,7 @@
 	compositor->hit_use_dom_events = 1;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[SVG Picking] node %s (def %s) is under mouse - hit %g %g %g\n", gf_node_get_class_name(drawable->node), gf_node_get_name(drawable->node),
-			FIX2FLT(world_pt.x), FIX2FLT(world_pt.y), FIX2FLT(world_pt.z)));
+	                                      FIX2FLT(world_pt.x), FIX2FLT(world_pt.y), FIX2FLT(world_pt.z)));
 }
 
 #endif
@@ -292,7 +293,7 @@
 		compositor_svg_restore_parent_transformation(tr_state, &backup_matrix, &mx_3d);
 		memcpy(tr_state->svg_props, &backup_props, sizeof(SVGPropertiesPointers));
 		return;
-	} 
+	}
 #endif
 	gf_mx2d_copy(inv_2d, tr_state->transform);
 	gf_mx2d_inverse(&inv_2d);
@@ -313,7 +314,8 @@
 
 		compositor->hit_node = drawable->node;
 		compositor->hit_use_dom_events = 1;
-		compositor->hit_normal.x = compositor->hit_normal.y = 0; compositor->hit_normal.z = FIX_ONE;
+		compositor->hit_normal.x = compositor->hit_normal.y = 0;
+		compositor->hit_normal.z = FIX_ONE;
 		compositor->hit_texcoords.x = gf_divfix(x, drawable->path->bbox.width) + FIX_ONE/2;
 		compositor->hit_texcoords.y = gf_divfix(y, drawable->path->bbox.height) + FIX_ONE/2;
 		svg_clone_use_stack(compositor, tr_state);
@@ -336,8 +338,8 @@
 }
 
 static void svg_drawable_traverse(GF_Node *node, void *rs, Bool is_destroy,
-							void (*rebuild_path)(GF_Node *, Drawable *, SVGAllAttributes *),
-							Bool is_svg_rect, Bool is_svg_path)
+                                  void (*rebuild_path)(GF_Node *, Drawable *, SVGAllAttributes *),
+                                  Bool is_svg_rect, Bool is_svg_path)
 {
 	GF_Matrix2D backup_matrix;
 	GF_Matrix mx_3d;
@@ -358,7 +360,7 @@
 	}
 	assert(tr_state->traversing_mode!=TRAVERSE_DRAW_2D);
 
-	
+
 	if (tr_state->traversing_mode==TRAVERSE_PICK) {
 		svg_drawable_pick(node, drawable, tr_state);
 		return;
@@ -368,7 +370,7 @@
 	gf_svg_flatten_attributes((SVG_Element *)node, &all_atts);
 	if (!compositor_svg_traverse_base(node, &all_atts, (GF_TraverseState *)rs, &backup_props, &backup_flags))
 		return;
-	
+
 	/* Recreates the path (i.e the shape) only if the node is dirty */
 	if (gf_node_dirty_get(node) & GF_SG_SVG_GEOMETRY_DIRTY) {
 		/*the rebuild function is responsible for cleaning the path*/
@@ -416,7 +418,7 @@
 		gf_node_dirty_clear(node, 0);
 
 		if (!compositor_svg_is_display_off(tr_state->svg_props) &&
-			( *(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN) ) {
+		        ( *(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN) ) {
 
 			compositor_svg_apply_local_transformation(tr_state, &all_atts, &backup_matrix, &mx_3d);
 
@@ -428,12 +430,12 @@
 					else if (ctx->transform.m[1] || ctx->transform.m[3]) {}
 					else {
 						ctx->flags &= ~CTX_IS_TRANSPARENT;
-						if (!ctx->aspect.pen_props.width) 
+						if (!ctx->aspect.pen_props.width)
 							ctx->flags |= CTX_NO_ANTIALIAS;
 					}
 				}
 
-				if (all_atts.pathLength && all_atts.pathLength->type==SVG_NUMBER_VALUE) 
+				if (all_atts.pathLength && all_atts.pathLength->type==SVG_NUMBER_VALUE)
 					ctx->aspect.pen_props.path_length = all_atts.pathLength->value;
 
 #ifndef GPAC_DISABLE_3D
@@ -444,7 +446,7 @@
 					}
 					visual_3d_draw_from_context(ctx, tr_state);
 					ctx->drawable = NULL;
-				} else 
+				} else
 #endif
 				{
 					drawable_finalize_sort(ctx, tr_state, NULL);
@@ -509,34 +511,38 @@
 		if (width-rx!=rx)
 			gf_path_add_line_to(stack->path, x+width-rx, y);
 
-		cx = x+width-rx; cy = y+ry;
+		cx = x+width-rx;
+		cy = y+ry;
 		svg_rect_add_arc(stack->path, x+width, y+ry, cx, cy, rx, ry);
-		
+
 		if (height-ry!=ry)
 			gf_path_add_line_to(stack->path, x+width, y+height-ry);
 
-		cx = x+width-rx; cy = y+height-ry;
+		cx = x+width-rx;
+		cy = y+height-ry;
 		svg_rect_add_arc(stack->path, x+width-rx, y+height, cx, cy, rx, ry);
-		
+
 		if (width-rx!=rx)
 			gf_path_add_line_to(stack->path, x+rx, y+height);
 
-		cx = x+rx; cy = y+height-ry;
+		cx = x+rx;
+		cy = y+height-ry;
 		svg_rect_add_arc(stack->path, x, y+height-ry, cx, cy, rx, ry);
-		
+
 		if (height-ry!=ry)
 			gf_path_add_line_to(stack->path, x, y+ry);
 
-		cx = x+rx; cy = y+ry;
+		cx = x+rx;
+		cy = y+ry;
 		svg_rect_add_arc(stack->path, x+rx, y, cx, cy, rx, ry);
 
 		gf_path_close(stack->path);
 	} else {
 		gf_path_add_move_to(stack->path, x, y);
-		gf_path_add_line_to(stack->path, x+width, y);		
-		gf_path_add_line_to(stack->path, x+width, y+height);		
-		gf_path_add_line_to(stack->path, x, y+height);		
-		gf_path_close(stack->path);		
+		gf_path_add_line_to(stack->path, x+width, y);
+		gf_path_add_line_to(stack->path, x+width, y+height);
+		gf_path_add_line_to(stack->path, x, y+height);
+		gf_path_close(stack->path);
 	}
 }
 
@@ -572,10 +578,10 @@
 static void svg_ellipse_rebuild(GF_Node *node, Drawable *stack, SVGAllAttributes *atts)
 {
 	drawable_reset_path(stack);
-	gf_path_add_ellipse(stack->path, (atts->cx ? atts->cx->value : 0), 
-								  (atts->cy ? atts->cy->value : 0), 
-								  (atts->rx ? 2*atts->rx->value : 0), 
-								  (atts->ry ? 2*atts->ry->value : 0));
+	gf_path_add_ellipse(stack->path, (atts->cx ? atts->cx->value : 0),
+	                    (atts->cy ? atts->cy->value : 0),
+	                    (atts->rx ? 2*atts->rx->value : 0),
+	                    (atts->ry ? 2*atts->ry->value : 0));
 }
 static void svg_traverse_ellipse(GF_Node *node, void *rs, Bool is_destroy)
 {
@@ -609,9 +615,9 @@
 {
 	u32 i, nbPoints;
 	drawable_reset_path(stack);
-	if (atts->points) 
+	if (atts->points)
 		nbPoints = gf_list_count(*atts->points);
-	else 
+	else
 		nbPoints = 0;
 
 	if (nbPoints) {
@@ -640,9 +646,9 @@
 {
 	u32 i, nbPoints;
 	drawable_reset_path(stack);
-	if (atts->points) 
+	if (atts->points)
 		nbPoints = gf_list_count(*atts->points);
-	else 
+	else
 		nbPoints = 0;
 
 	if (nbPoints) {

gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_grouping.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/svg_grouping.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,7 +40,7 @@
 #include "mpeg4_grouping.h"
 
 
-typedef struct 
+typedef struct
 {
 	Bool root_svg;
 	SVGPropertiesPointers *svg_props;
@@ -55,7 +55,7 @@
 } SVGsvgStack;
 
 
-static void svg_recompute_viewport_transformation(GF_Node *node, SVGsvgStack *stack, GF_TraverseState *tr_state, SVGAllAttributes *atts) 
+static void svg_recompute_viewport_transformation(GF_Node *node, SVGsvgStack *stack, GF_TraverseState *tr_state, SVGAllAttributes *atts)
 {
 	GF_Matrix2D mx;
 	SVG_ViewBox ext_vb, *vb;
@@ -64,7 +64,7 @@
 	Fixed parent_width, parent_height, doc_width, doc_height;
 
 	/*canvas size negociation has already been done when attaching the scene to the compositor*/
-	if (atts->width && (atts->width->type==SVG_NUMBER_PERCENTAGE) ) { 
+	if (atts->width && (atts->width->type==SVG_NUMBER_PERCENTAGE) ) {
 		parent_width = gf_mulfix(tr_state->vp_size.x, atts->width->value/100);
 		doc_width = 0;
 	} else if (!stack->root_svg) {
@@ -74,7 +74,7 @@
 		doc_width = atts->width ? atts->width->value : 0;
 	}
 
-	if (atts->height && (atts->height->type==SVG_NUMBER_PERCENTAGE) ) { 
+	if (atts->height && (atts->height->type==SVG_NUMBER_PERCENTAGE) ) {
 		parent_height = gf_mulfix(tr_state->vp_size.y, atts->height->value/100);
 		doc_height = 0;
 	} else if (!stack->root_svg) {
@@ -107,9 +107,9 @@
 				}
 				else if (!strncmp(frag_uri, "svgView(transform(", 18)) {
 					Bool ret = gf_svg_parse_transformlist(&mx, (char *) frag_uri+18);
-                    if (!ret) {
-                        GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error parsing SVG View transform component: %s\n", frag_uri+18));
-                    }
+					if (!ret) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error parsing SVG View transform component: %s\n", frag_uri+18));
+					}
 				}
 			}
 			/*fragID*/
@@ -170,7 +170,7 @@
 	if (tr_state->parent_anim_atts) {
 		if (tr_state->parent_anim_atts->preserveAspectRatio) {
 			if (tr_state->parent_anim_atts->preserveAspectRatio->defer) {
-				if (atts->preserveAspectRatio) 
+				if (atts->preserveAspectRatio)
 					par = *atts->preserveAspectRatio;
 			} else {
 				par = *tr_state->parent_anim_atts->preserveAspectRatio;
@@ -207,45 +207,45 @@
 	if (par.align==SVG_PRESERVEASPECTRATIO_NONE) {
 		stack->viewbox_mx.m[0] = gf_divfix(parent_width, vb->width);
 		stack->viewbox_mx.m[4] = gf_divfix(parent_height, vb->height);
-		stack->viewbox_mx.m[2] = - gf_muldiv(vb->x, parent_width, vb->width); 
-		stack->viewbox_mx.m[5] = - gf_muldiv(vb->y, parent_height, vb->height); 
+		stack->viewbox_mx.m[2] = - gf_muldiv(vb->x, parent_width, vb->width);
+		stack->viewbox_mx.m[5] = - gf_muldiv(vb->y, parent_height, vb->height);
 	} else {
 		Fixed dx, dy;
 		stack->viewbox_mx.m[0] = stack->viewbox_mx.m[4] = scale;
-		stack->viewbox_mx.m[2] = - gf_mulfix(vb->x, scale); 
-		stack->viewbox_mx.m[5] = - gf_mulfix(vb->y, scale); 
+		stack->viewbox_mx.m[2] = - gf_mulfix(vb->x, scale);
+		stack->viewbox_mx.m[5] = - gf_mulfix(vb->y, scale);
 
 		dx = dy = 0;
 		switch (par.align) {
 		case SVG_PRESERVEASPECTRATIO_XMINYMIN:
 			break;
 		case SVG_PRESERVEASPECTRATIO_XMIDYMIN:
-			dx = ( parent_width - vp_w) / 2; 
+			dx = ( parent_width - vp_w) / 2;
 			break;
 		case SVG_PRESERVEASPECTRATIO_XMAXYMIN:
-			dx = parent_width - vp_w; 
+			dx = parent_width - vp_w;
 			break;
 		case SVG_PRESERVEASPECTRATIO_XMINYMID:
-			dy = ( parent_height - vp_h) / 2; 
+			dy = ( parent_height - vp_h) / 2;
 			break;
 		case SVG_PRESERVEASPECTRATIO_XMIDYMID:
-			dx = ( parent_width  - vp_w) / 2; 
-			dy = ( parent_height - vp_h) / 2; 
+			dx = ( parent_width  - vp_w) / 2;
+			dy = ( parent_height - vp_h) / 2;
 			break;
 		case SVG_PRESERVEASPECTRATIO_XMAXYMID:
-			dx = parent_width  - vp_w; 
-			dy = ( parent_height - vp_h) / 2; 
+			dx = parent_width  - vp_w;
+			dy = ( parent_height - vp_h) / 2;
 			break;
 		case SVG_PRESERVEASPECTRATIO_XMINYMAX:
-			dy = parent_height - vp_h; 
+			dy = parent_height - vp_h;
 			break;
 		case SVG_PRESERVEASPECTRATIO_XMIDYMAX:
-			dx = (parent_width - vp_w) / 2; 
-			dy = parent_height - vp_h; 
+			dx = (parent_width - vp_w) / 2;
+			dy = parent_height - vp_h;
 			break;
 		case SVG_PRESERVEASPECTRATIO_XMAXYMAX:
-			dx = parent_width  - vp_w; 
-			dy = parent_height - vp_h; 
+			dx = parent_width  - vp_w;
+			dy = parent_height - vp_h;
 			break;
 		}
 		gf_mx2d_add_translation(&stack->viewbox_mx, dx, dy);
@@ -311,7 +311,7 @@
 		tr_state->svg_props = stack->svg_props;
 		if (!tr_state->svg_props) return;
 	}
-	
+
 	gf_svg_flatten_attributes((SVG_Element *)node, &all_atts);
 	if (!compositor_svg_traverse_base(node, &all_atts, tr_state, &backup_props, &backup_flags)) {
 		tr_state->svg_props = prev_props;
@@ -333,11 +333,11 @@
 
 #ifndef GPAC_DISABLE_3D
 	//commented to get rid of GCC warning
-        //if (tr_state->visual->type_3d)
-	  gf_mx_copy(bck_mx, tr_state->model_matrix);
-	 
+	//if (tr_state->visual->type_3d)
+	gf_mx_copy(bck_mx, tr_state->model_matrix);
+
 #endif
-	
+
 	invalidate_flag = tr_state->invalidate_all;
 
 	is_dirty = gf_node_dirty_get(node);
@@ -356,7 +356,7 @@
 
 	gf_mx2d_copy(tr_state->vb_transform, stack->viewbox_mx);
 
-	rootmost_svg = (stack->root_svg && !tr_state->parent_anim_atts) ? 1 : 0;	
+	rootmost_svg = (stack->root_svg && !tr_state->parent_anim_atts) ? 1 : 0;
 	if (tr_state->traversing_mode == TRAVERSE_SORT) {
 		SVG_Paint *vp_fill = NULL;
 		Fixed vp_opacity;
@@ -367,7 +367,7 @@
 		} else {
 			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 (vp_fill && (vp_fill->type != SVG_PAINT_NONE) && vp_opacity) {
 			Bool col_dirty = 0;
@@ -411,21 +411,13 @@
 	}
 
 
-	if (!stack->root_svg && (all_atts.x || all_atts.y)) 
+	if (!stack->root_svg && (all_atts.x || all_atts.y))
 		gf_mx2d_add_translation(&tr_state->vb_transform, all_atts.x->value, all_atts.y->value);
 
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d) {
-		if (tr_state->traversing_mode==TRAVERSE_SORT) {
-			GF_Matrix tmp;
-			visual_3d_matrix_push(tr_state->visual);
-
-			gf_mx_from_mx2d(&tmp, &tr_state->vb_transform);
-			visual_3d_matrix_add(tr_state->visual, tmp.m);
-		} else {
-			gf_mx_add_matrix_2d(&tr_state->model_matrix, &tr_state->vb_transform);
-		}
-	} else 
+		gf_mx_add_matrix_2d(&tr_state->model_matrix, &tr_state->vb_transform);
+	} else
 #endif
 	{
 		gf_mx2d_pre_multiply(&tr_state->transform, &tr_state->vb_transform);
@@ -435,7 +427,7 @@
 	prev_vp = tr_state->vp_size;
 	tr_state->vp_size = stack->vp;
 
-	/*the event may trigger scripts which may delete nodes / modify the scene. We therefore send the resize event 
+	/*the event may trigger scripts which may delete nodes / modify the scene. We therefore send the resize event
 	before traversing the scene*/
 	if (send_resize) {
 		GF_DOM_Event evt;
@@ -446,8 +438,8 @@
 	}
 	if ((stack->vp.x != prev_vp.x) || (stack->vp.y != prev_vp.y)) {
 		GF_Scene *scene = node->sgprivate->scenegraph->userpriv;
-		
-		if (scene) { 
+
+		if (scene) {
 			GF_DOM_Event evt;
 			memset(&evt, 0, sizeof(GF_DOM_Event));
 			evt.bubbles = 0;
@@ -471,11 +463,10 @@
 
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d) {
-		if (tr_state->traversing_mode==TRAVERSE_SORT) visual_3d_matrix_pop(tr_state->visual);
 		gf_mx_copy(tr_state->model_matrix, bck_mx);
 	}
 #endif
-	gf_mx2d_copy(tr_state->transform, backup_matrix);  
+	gf_mx2d_copy(tr_state->transform, backup_matrix);
 	gf_mx2d_copy(tr_state->vb_transform, vb_bck);
 	memcpy(tr_state->svg_props, &backup_props, styling_size);
 	tr_state->svg_flags = backup_flags;
@@ -505,7 +496,7 @@
 	gf_node_set_callback_function(node, svg_traverse_svg);
 }
 
-Bool compositor_svg_get_viewport(GF_Node *n, GF_Rect *rc) 
+Bool compositor_svg_get_viewport(GF_Node *n, GF_Rect *rc)
 {
 	SVGsvgStack *stack;
 	if (gf_node_get_tag(n) != TAG_SVG_svg) return 0;
@@ -550,7 +541,11 @@
 		return;
 	}
 	/*group cache traverse routine*/
-	else if (tr_state->traversing_mode == TRAVERSE_DRAW_2D) {
+	else if ((tr_state->traversing_mode == TRAVERSE_DRAW_2D)
+#ifndef GPAC_DISABLE_3D
+	         || (tr_state->traversing_mode == TRAVERSE_DRAW_3D)
+#endif
+	        ) {
 		SVGgStack *group = gf_node_get_private(node);
 		group_cache_draw(group->cache, tr_state);
 		return;
@@ -562,16 +557,16 @@
 		return;
 
 	if (compositor_svg_is_display_off(tr_state->svg_props)) {
-/*		u32 prev_flags = tr_state->switched_off;
-		tr_state->switched_off = 1;
-		compositor_svg_traverse_children(((SVG_Element *)node)->children, tr_state);
-		tr_state->switched_off = prev_flags;*/
+		/*		u32 prev_flags = tr_state->switched_off;
+				tr_state->switched_off = 1;
+				compositor_svg_traverse_children(((SVG_Element *)node)->children, tr_state);
+				tr_state->switched_off = prev_flags;*/
 
 		memcpy(tr_state->svg_props, &backup_props, styling_size);
 		tr_state->svg_flags = backup_flags;
 		return;
-	}	
-	
+	}
+
 	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, NULL);
@@ -582,7 +577,7 @@
 		Fixed opacity = FIX_ONE;
 		Bool clear = 0;
 		SVGgStack *group;
-		
+
 		if (!tr_state->in_svg_filter && all_atts.filter && all_atts.filter->iri.target) {
 			svg_draw_filter(all_atts.filter->iri.target, node, tr_state);
 			return;
@@ -614,7 +609,7 @@
 		tr_state->depth_gain = gf_mulfix(scale, dscale);
 #endif
 
-		if (opacity < FIX_ONE) {
+		if (!tr_state->override_appearance && (opacity < FIX_ONE)) {
 			if (!group->cache) {
 				group->cache = group_cache_new(tr_state->visual->compositor, node);
 				group->cache->force_recompute = 1;
@@ -648,14 +643,14 @@
 				while (child) {
 					gf_node_traverse(child->node, tr_state);
 					child = child->next;
-					if (tr_state->cache_too_small) 
+					if (tr_state->cache_too_small)
 						cache_too_small++;
 				}
 
 				if (cache_too_small) {
 					tr_state->cache_too_small = 1;
 				} else {
-					/*get the traversal time for each group*/	
+					/*get the traversal time for each group*/
 					traverse_time = gf_sys_clock() - traverse_time;
 					group->traverse_time += traverse_time;
 					/*record the traversal information and turn cache on if possible*/
@@ -675,7 +670,7 @@
 		tr_state->depth_offset = offset;
 #endif
 	} else {
-			compositor_svg_traverse_children(((SVG_Element *)node)->children, tr_state);
+		compositor_svg_traverse_children(((SVG_Element *)node)->children, tr_state);
 	}
 	compositor_svg_restore_parent_transformation(tr_state, &backup_matrix, &mx_3d);
 	memcpy(tr_state->svg_props, &backup_props, styling_size);
@@ -774,7 +769,7 @@
 		tr_state->svg_flags = backup_flags;
 		return;
 	}
-	
+
 	if (*selected_idx >= 0) {
 		compositor_svg_apply_local_transformation(tr_state, &all_atts, &backup_matrix, &mx_3d);
 		if (tr_state->traversing_mode == TRAVERSE_GET_BOUNDS) {
@@ -830,8 +825,8 @@
 		memcpy(tr_state->svg_props, &backup_props, styling_size);
 		tr_state->svg_flags = backup_flags;
 		return;
-	}	
-	
+	}
+
 	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, NULL);
@@ -872,7 +867,7 @@
 	compositor->trans_x = compositor->trans_y = 0;
 	compositor->rotation = 0;
 	compositor->zoom = FIX_ONE;
-	compositor_2d_set_user_transform(compositor, FIX_ONE, 0, 0, 0); 				
+	compositor_2d_set_user_transform(compositor, FIX_ONE, 0, 0, 0);
 	gf_sc_invalidate(compositor, NULL);
 }
 
@@ -896,7 +891,7 @@
 
 	if (event->type==GF_EVENT_MOUSEOVER) {
 		evt.type = GF_EVENT_NAVIGATE_INFO;
-		
+
 		if (all_atts.xlink_title) evt.navigate.to_url = *all_atts.xlink_title;
 		else if (all_atts.xlink_href->string) evt.navigate.to_url = all_atts.xlink_href->string;
 		else {
@@ -909,7 +904,7 @@
 	}
 
 	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);
 		if (evt.navigate.to_url) {
@@ -943,11 +938,11 @@
 	}
 	if (!all_atts.xlink_href->target) {
 		return;
-	} 
+	}
 	/*this is a time event*/
 	if (is_timing_target(all_atts.xlink_href->target)) {
 		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 {
 		svg_a_set_view(handler, compositor, gf_node_get_name(all_atts.xlink_href->target));
@@ -994,7 +989,7 @@
 {
 	GF_Matrix2D backup_matrix;
 	GF_Matrix mx_3d;
-  	GF_Matrix2D translate;
+	GF_Matrix2D translate;
 	SVGPropertiesPointers backup_props;
 	u32 backup_flags, dirty;
 	Bool is_fragment, parent_is_use;
@@ -1086,25 +1081,19 @@
 		if (!compositor_svg_is_display_off(tr_state->svg_props)) {
 			gf_node_traverse(used_node, tr_state);
 			gf_mx2d_apply_rect(&translate, &tr_state->bounds);
-		} 
+		}
 		compositor_svg_restore_parent_transformation(tr_state, &backup_matrix, &mx_3d);
 	}
 	/*SORT mode and visible, traverse*/
-	else if (!compositor_svg_is_display_off(tr_state->svg_props) 
-		&& (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN)) {
+	else if (!compositor_svg_is_display_off(tr_state->svg_props)
+	         && (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN)) {
 
 		compositor_svg_apply_local_transformation(tr_state, &all_atts, &backup_matrix, &mx_3d);
 
 #ifndef GPAC_DISABLE_3D
 		if (tr_state->visual->type_3d) {
 			gf_mx_add_matrix_2d(&tr_state->model_matrix, &translate);
-
-			if (tr_state->traversing_mode==TRAVERSE_SORT) {
-				GF_Matrix tmp;
-				gf_mx_from_mx2d(&tmp, &translate);
-				visual_3d_matrix_add(tr_state->visual, tmp.m);
-			}
-		} else 
+		} else
 #endif
 			gf_mx2d_pre_multiply(&tr_state->transform, &translate);
 
@@ -1115,7 +1104,7 @@
 		} else {
 			gf_sc_traverse_subscene(tr_state->visual->compositor, node, stack->inline_sg, tr_state);
 		}
-		compositor_svg_restore_parent_transformation(tr_state, &backup_matrix, &mx_3d);  
+		compositor_svg_restore_parent_transformation(tr_state, &backup_matrix, &mx_3d);
 
 	}
 	gf_list_rem_last(tr_state->use_stack);
@@ -1167,9 +1156,9 @@
 		if (stack->needs_play) {
 			gf_mo_play(stack->resource, clipBegin, clipEnd, 0);
 			stack->needs_play = 0;
-		} else {            
-            Bool primary = all_atts.gpac_useAsPrimary ? *all_atts.gpac_useAsPrimary : 1;
-            new_res = gf_mo_load_xlink_resource(node, primary, clipBegin, clipEnd);
+		} else {
+			Bool primary = all_atts.gpac_useAsPrimary ? *all_atts.gpac_useAsPrimary : 1;
+			new_res = gf_mo_load_xlink_resource(node, primary, clipBegin, clipEnd);
 			if (new_res != stack->resource) {
 				if (stack->resource) gf_mo_unload_xlink_resource(node, stack->resource);
 				if (all_atts.xlink_href) all_atts.xlink_href->target = NULL;
@@ -1237,7 +1226,7 @@
 	GF_IRect clip, prev_clip;
 	SVGAllAttributes *prev_vp_atts;
 	GF_TraverseState *tr_state = (GF_TraverseState*)rs;
-  	GF_Matrix2D translate;
+	GF_Matrix2D translate;
 	SVGPropertiesPointers *old_props;
 	SVGlinkStack *stack = gf_node_get_private(node);
 
@@ -1267,9 +1256,9 @@
 
 	if (!compositor_svg_traverse_base(node, &all_atts, tr_state, &backup_props, &backup_flags))
 		return;
-	
+
 	if (compositor_svg_is_display_off(tr_state->svg_props) ||
-		*(tr_state->svg_props->visibility) == SVG_VISIBILITY_HIDDEN) {
+	        *(tr_state->svg_props->visibility) == SVG_VISIBILITY_HIDDEN) {
 		goto end;
 	}
 
@@ -1282,20 +1271,14 @@
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d) {
 		gf_mx_add_matrix_2d(&tr_state->model_matrix, &translate);
-
-		if (tr_state->traversing_mode==TRAVERSE_SORT) {
-			GF_Matrix tmp;
-			gf_mx_from_mx2d(&tmp, &translate);
-			visual_3d_matrix_add(tr_state->visual, tmp.m);
-		}
-	} else 
+	} else
 #endif
 		gf_mx2d_pre_multiply(&tr_state->transform, &translate);
 
 	/*reset SVG props to reload a new inheritance context*/
 	old_props = tr_state->svg_props;
 	tr_state->svg_props = NULL;
-	
+
 	/*store this node's attribute to compute PAR/ViewBox of the child <svg>*/
 	prev_vp_atts = tr_state->parent_anim_atts;
 	tr_state->parent_anim_atts = &all_atts;
@@ -1340,7 +1323,7 @@
 	tr_state->parent_anim_atts = prev_vp_atts;
 	tr_state->vp_size = prev_vp;
 
-	compositor_svg_restore_parent_transformation(tr_state, &backup_matrix, &backup_matrix3d);  
+	compositor_svg_restore_parent_transformation(tr_state, &backup_matrix, &backup_matrix3d);
 
 end:
 	memcpy(tr_state->svg_props, &backup_props, sizeof(SVGPropertiesPointers));
@@ -1361,7 +1344,7 @@
 	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, 0);
 }
 
-void svg_pause_animation(GF_Node *n, Bool pause) 
+void svg_pause_animation(GF_Node *n, Bool pause)
 {
 	SVGlinkStack *st =  gf_node_get_private(n);
 	if (!st) return;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_media.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/svg_media.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -36,8 +36,8 @@
 typedef struct
 {
 	GF_TextureHandler txh;
-	Drawable *graph;
-	MFURL txurl;	
+	Drawable *drawable;
+	MFURL txurl;
 	Bool first_frame_fetched;
 	GF_Node *audio;
 	Bool audio_dirty;
@@ -93,11 +93,11 @@
 	Fixed rectx, recty, rectwidth, rectheight;
 	SVGAllAttributes atts;
 	SVG_PreserveAspectRatio pAR;
-	SVG_Element *e = (SVG_Element *)stack->graph->node;
+	SVG_Element *e = (SVG_Element *)stack->drawable->node;
 
 	gf_svg_flatten_attributes(e, &atts);
-	
-	tag = gf_node_get_tag(stack->graph->node);
+
+	tag = gf_node_get_tag(stack->drawable->node);
 	switch (tag) {
 	case TAG_SVG_image:
 	case TAG_SVG_video:
@@ -111,7 +111,7 @@
 	}
 
 	if (!width || !height) return;
-	
+
 	txheight = INT2FIX(stack->txh.height);
 	txwidth = INT2FIX(stack->txh.width);
 
@@ -134,7 +134,7 @@
 
 		if (pAR.align==SVG_PRESERVEASPECTRATIO_NONE) {
 			rectwidth = width;
-			rectheight = height;				
+			rectheight = height;
 			rectx = x+rectwidth/2;
 			recty = y+rectheight/2;
 		} else {
@@ -169,48 +169,48 @@
 			case SVG_PRESERVEASPECTRATIO_XMINYMIN:
 				break;
 			case SVG_PRESERVEASPECTRATIO_XMIDYMIN:
-				rectx += (width - rectwidth)/ 2; 
+				rectx += (width - rectwidth)/ 2;
 				break;
 			case SVG_PRESERVEASPECTRATIO_XMAXYMIN:
-				rectx += width - rectwidth; 
+				rectx += width - rectwidth;
 				break;
 			case SVG_PRESERVEASPECTRATIO_XMINYMID:
-				recty += (height - rectheight)/ 2; 
+				recty += (height - rectheight)/ 2;
 				break;
 			case SVG_PRESERVEASPECTRATIO_XMIDYMID:
-				rectx += (width - rectwidth)/ 2; 
-				recty += (height - rectheight) / 2; 
+				rectx += (width - rectwidth)/ 2;
+				recty += (height - rectheight) / 2;
 				break;
 			case SVG_PRESERVEASPECTRATIO_XMAXYMID:
-				rectx += width - rectwidth; 
-				recty += ( txheight - rectheight) / 2; 
+				rectx += width - rectwidth;
+				recty += ( txheight - rectheight) / 2;
 				break;
 			case SVG_PRESERVEASPECTRATIO_XMINYMAX:
-				recty += height - rectheight; 
+				recty += height - rectheight;
 				break;
 			case SVG_PRESERVEASPECTRATIO_XMIDYMAX:
-				rectx += (width - rectwidth)/ 2; 
-				recty += height - rectheight; 
+				rectx += (width - rectwidth)/ 2;
+				recty += height - rectheight;
 				break;
 			case SVG_PRESERVEASPECTRATIO_XMAXYMAX:
-				rectx += width  - rectwidth; 
-				recty += height - rectheight; 
+				rectx += width  - rectwidth;
+				recty += height - rectheight;
 				break;
 			}
 		}
 	}
 
 
-	gf_path_get_bounds(stack->graph->path, &rc);
-	drawable_reset_path(stack->graph);
-	gf_path_add_rect_center(stack->graph->path, rectx, recty, rectwidth, rectheight);
-	gf_path_get_bounds(stack->graph->path, &new_rc);
-	if (!gf_rect_equal(rc, new_rc)) 
-		drawable_mark_modified(stack->graph, tr_state);
+	gf_path_get_bounds(stack->drawable->path, &rc);
+	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))
+		drawable_mark_modified(stack->drawable, tr_state);
 	else if (stack->txh.flags & GF_SR_TEXTURE_PRIVATE_MEDIA)
-		drawable_mark_modified(stack->graph, tr_state);
+		drawable_mark_modified(stack->drawable, tr_state);
 
-	gf_node_dirty_clear(stack->graph->node, GF_SG_SVG_GEOMETRY_DIRTY);
+	gf_node_dirty_clear(stack->drawable->node, GF_SG_SVG_GEOMETRY_DIRTY);
 }
 
 static void svg_open_texture(SVG_video_stack *stack)
@@ -230,11 +230,11 @@
 	}
 	if (atts->syncBehavior) lock_scene = (*atts->syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? GF_TRUE : GF_FALSE;
 
-	gf_sc_texture_play_from_to(&stack->txh, &stack->txurl, 
-		atts->clipBegin ? (*atts->clipBegin) : 0.0,
-		atts->clipEnd ? (*atts->clipEnd) : -1.0,
-		GF_FALSE, 
-		lock_scene);
+	gf_sc_texture_play_from_to(&stack->txh, &stack->txurl,
+	                           atts->clipBegin ? (*atts->clipBegin) : 0.0,
+	                           atts->clipEnd ? (*atts->clipEnd) : -1.0,
+	                           GF_FALSE,
+	                           lock_scene);
 }
 
 static void svg_traverse_bitmap(GF_Node *node, void *rs, Bool is_destroy)
@@ -254,23 +254,32 @@
 		gf_sc_texture_destroy(&stack->txh);
 		gf_sg_mfurl_del(stack->txurl);
 
-		drawable_del(stack->graph);
+		drawable_del(stack->drawable);
 		if (stack->audio) {
 			gf_node_unregister(stack->audio, NULL);
 		}
 		gf_free(stack);
 		return;
-	} 
+	}
 
-	/*TRAVERSE_DRAW is NEVER called in 3D mode*/
 	if (tr_state->traversing_mode==TRAVERSE_DRAW_2D) {
 		SVG_Draw_bitmap(tr_state);
 		return;
 	}
 	else if (tr_state->traversing_mode==TRAVERSE_PICK) {
-		svg_drawable_pick(node, stack->graph, tr_state);
+		svg_drawable_pick(node, stack->drawable, tr_state);
 		return;
 	}
+#ifndef GPAC_DISABLE_3D
+	else if (tr_state->traversing_mode==TRAVERSE_DRAW_3D) {
+		if (!stack->drawable->mesh) {
+			stack->drawable->mesh = new_mesh();
+			mesh_from_path(stack->drawable->mesh, stack->drawable->path);
+		}
+		compositor_3d_draw_bitmap(stack->drawable, &tr_state->ctx->aspect, tr_state, 0, 0, FIX_ONE, FIX_ONE);
+		return;
+	}
+#endif
 
 	/*flatten attributes and apply animations + inheritance*/
 	gf_svg_flatten_attributes((SVG_Element *)node, &all_atts);
@@ -280,7 +289,7 @@
 	if (gf_node_dirty_get(node) & GF_SG_SVG_XLINK_HREF_DIRTY) {
 		gf_term_get_mfurl_from_xlink(node, &stack->txurl);
 		stack->txh.width = stack->txh.height = 0;
-		
+
 		/*remove associated audio if any*/
 		if (stack->audio) {
 			svg_audio_smil_evaluate_ex(NULL, 0, SMIL_TIMING_EVAL_REMOVE, stack->audio, stack->txh.owner);
@@ -288,7 +297,7 @@
 			stack->audio = NULL;
 		}
 		stack->audio_dirty = GF_TRUE;
-		
+
 		if (stack->txurl.count) svg_play_texture(stack, &all_atts);
 		gf_node_dirty_clear(node, GF_SG_SVG_XLINK_HREF_DIRTY);
 	}
@@ -299,12 +308,12 @@
 			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) {
 		if (!compositor_svg_is_display_off(tr_state->svg_props)) {
-			gf_path_get_bounds(stack->graph->path, &tr_state->bounds);
+			gf_path_get_bounds(stack->drawable->path, &tr_state->bounds);
 			compositor_svg_apply_local_transformation(tr_state, &all_atts, &backup_matrix, &mx_3d);
 
 			if (svg_video_get_transform_behavior(tr_state, &all_atts, &cx, &cy, &angle)) {
@@ -329,16 +338,16 @@
 
 			compositor_svg_apply_local_transformation(tr_state, &all_atts, &backup_matrix, &mx_3d);
 
-			ctx = drawable_init_context_svg(stack->graph, tr_state);
+			ctx = drawable_init_context_svg(stack->drawable, tr_state);
 			if (!ctx || !ctx->aspect.fill_texture ) return;
 
 			if (svg_video_get_transform_behavior(tr_state, &all_atts, &cx, &cy, &angle)) {
-				drawable_reset_path(stack->graph);
-				gf_path_add_rect_center(stack->graph->path, cx, cy, INT2FIX(stack->txh.width), INT2FIX(stack->txh.height));
+				drawable_reset_path(stack->drawable);
+				gf_path_add_rect_center(stack->drawable->path, cx, cy, INT2FIX(stack->txh.width), INT2FIX(stack->txh.height));
 
 				gf_mx2d_copy(mx_bck, tr_state->transform);
 				restore_mx = GF_TRUE;
-				
+
 				gf_mx2d_init(tr_state->transform);
 				gf_mx2d_add_rotation(&tr_state->transform, cx, cy, angle);
 			}
@@ -353,7 +362,7 @@
 				ctx->flags |= CTX_IS_TRANSPARENT;
 				ctx->flags &= ~CTX_NO_ANTIALIAS;
 			}
-			else if (ctx->aspect.fill_texture->transparent) 
+			else if (ctx->aspect.fill_texture->transparent)
 				ctx->flags |= CTX_IS_TRANSPARENT;
 			else if (tr_state->svg_props->opacity && (tr_state->svg_props->opacity->type==SVG_NUMBER_VALUE) && (tr_state->svg_props->opacity->value!=FIX_ONE)) {
 				ctx->flags = CTX_IS_TRANSPARENT;
@@ -362,13 +371,13 @@
 
 #ifndef GPAC_DISABLE_3D
 			if (tr_state->visual->type_3d) {
-				if (!stack->graph->mesh) {
-					stack->graph->mesh = new_mesh();
-					mesh_from_path(stack->graph->mesh, stack->graph->path);
+				if (!stack->drawable->mesh) {
+					stack->drawable->mesh = new_mesh();
+					mesh_from_path(stack->drawable->mesh, stack->drawable->path);
 				}
-				compositor_3d_draw_bitmap(stack->graph, &ctx->aspect, tr_state, 0, 0, FIX_ONE, FIX_ONE);
+				compositor_3d_draw_bitmap(stack->drawable, &ctx->aspect, tr_state, 0, 0, FIX_ONE, FIX_ONE);
 				ctx->drawable = NULL;
-			} else 
+			} else
 #endif
 			{
 				drawable_finalize_sort(ctx, tr_state, NULL);
@@ -389,7 +398,7 @@
 /*********************/
 
 static void SVG_Update_image(GF_TextureHandler *txh)
-{	
+{
 	MFURL *txurl = &(((SVG_video_stack *)gf_node_get_private(txh->owner))->txurl);
 
 	/*setup texture if needed*/
@@ -415,9 +424,9 @@
 {
 	SVG_video_stack *stack;
 	GF_SAFEALLOC(stack, SVG_video_stack)
-	stack->graph = drawable_new();
-	stack->graph->flags = DRAWABLE_USE_TRAVERSE_DRAW;
-	stack->graph->node = node;
+	stack->drawable = drawable_new();
+	stack->drawable->flags = DRAWABLE_USE_TRAVERSE_DRAW;
+	stack->drawable->node = node;
 
 	gf_sc_texture_setup(&stack->txh, compositor, node);
 	stack->txh.update_texture_fcnt = SVG_Update_image;
@@ -437,7 +446,7 @@
 {
 	GF_FieldInfo init_vis_info;
 	SVG_video_stack *stack = (SVG_video_stack *) gf_node_get_private(txh->owner);
-	
+
 	if (!txh->stream) {
 		svg_open_texture(stack);
 
@@ -455,10 +464,10 @@
 			if (init_vis == SVG_INITIALVISIBILTY_ALWAYS) {
 				svg_play_texture((SVG_video_stack*)stack, NULL);
 				gf_sc_invalidate(txh->compositor, NULL);
-			} 
+			}
 		}
 		return;
-	} 
+	}
 
 	/*when fetching the first frame disable resync*/
 	gf_sc_texture_update_frame(txh, GF_FALSE);
@@ -493,12 +502,12 @@
 			}
 		}
 	}
-	
-	/*we have no choice but retraversing the graph until we're inactive since the movie framerate and
+
+	/*we have no choice but retraversing the drawable until we're inactive since the movie framerate and
 	the compositor framerate are likely to be different */
-	if (!txh->stream_finished) 
-	if (txh->needs_refresh)
-		gf_sc_invalidate(txh->compositor, NULL);
+	if (!txh->stream_finished)
+		if (txh->needs_refresh)
+			gf_sc_invalidate(txh->compositor, NULL);
 
 	if (stack->stop_requested) {
 		stack->stop_requested = GF_FALSE;
@@ -512,12 +521,12 @@
 
 	switch (status) {
 	case SMIL_TIMING_EVAL_UPDATE:
-		if (!stack->txh.is_open) { 
+		if (!stack->txh.is_open) {
 			if (stack->txurl.count) {
 				svg_play_texture((SVG_video_stack*)stack, NULL);
 			}
 		}
-		else if (stack->txh.stream_finished && (gf_smil_get_media_duration(rti)<0) ) { 
+		else if (stack->txh.stream_finished && (gf_smil_get_media_duration(rti)<0) ) {
 			Double dur = gf_mo_get_duration(stack->txh.stream);
 			if (dur <= 0) {
 				dur = stack->txh.last_frame_time;
@@ -546,9 +555,9 @@
 {
 	SVG_video_stack *stack;
 	GF_SAFEALLOC(stack, SVG_video_stack)
-	stack->graph = drawable_new();
-	stack->graph->flags = DRAWABLE_USE_TRAVERSE_DRAW;
-	stack->graph->node = node;
+	stack->drawable = drawable_new();
+	stack->drawable->flags = DRAWABLE_USE_TRAVERSE_DRAW;
+	stack->drawable->node = node;
 
 	gf_sc_texture_setup(&stack->txh, compositor, node);
 	stack->txh.update_texture_fcnt = SVG_Update_video;
@@ -614,10 +623,10 @@
 	if (!audio) audio = gf_smil_get_element(rti);
 
 	stack = (SVG_audio_stack *)gf_node_get_private(audio);
-	
+
 	switch (status) {
 	case SMIL_TIMING_EVAL_UPDATE:
-		if (!stack->is_active && !stack->is_error) { 
+		if (!stack->is_active && !stack->is_error) {
 			if (stack->aurl.count) {
 				SVGAllAttributes atts;
 				Bool lock_timeline = GF_FALSE;
@@ -626,9 +635,9 @@
 				if (atts.syncBehavior) lock_timeline = (*atts.syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? GF_TRUE : GF_FALSE;
 
 				if (gf_sc_audio_open(&stack->input, &stack->aurl,
-						atts.clipBegin ? (*atts.clipBegin) : 0.0,
-						atts.clipEnd ? (*atts.clipEnd) : -1.0,
-						lock_timeline) == GF_OK) 
+				                     atts.clipBegin ? (*atts.clipBegin) : 0.0,
+				                     atts.clipEnd ? (*atts.clipEnd) : -1.0,
+				                     lock_timeline) == GF_OK)
 				{
 					gf_mo_set_speed(stack->input.stream, FIX_ONE);
 					stack->is_active = GF_TRUE;
@@ -637,7 +646,7 @@
 				}
 			}
 		}
-		else if (!slave_audio && stack->input.stream_finished && (gf_smil_get_media_duration(rti) < 0) ) { 
+		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);
@@ -647,7 +656,7 @@
 		}
 		break;
 	case SMIL_TIMING_EVAL_REPEAT:
-		if (stack->is_active) 
+		if (stack->is_active)
 			gf_sc_audio_restart(&stack->input);
 		break;
 	case SMIL_TIMING_EVAL_FREEZE:
@@ -704,11 +713,11 @@
 	if (gf_node_dirty_get(node) & GF_SG_SVG_XLINK_HREF_DIRTY) {
 		SVGAllAttributes atts;
 		Bool lock_timeline = GF_FALSE;
-		if (stack->is_active) 
+		if (stack->is_active)
 			gf_sc_audio_stop(&stack->input);
 
 		stack->is_error = GF_FALSE;
-		
+
 		gf_node_dirty_clear(node, GF_SG_SVG_XLINK_HREF_DIRTY);
 		gf_term_get_mfurl_from_xlink(node, &(stack->aurl));
 
@@ -716,11 +725,11 @@
 		if (atts.syncBehavior) lock_timeline = (*atts.syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? GF_TRUE : GF_FALSE;
 
 		if (stack->aurl.count && (gf_sc_audio_open(&stack->input, &stack->aurl,
-				atts.clipBegin ? (*atts.clipBegin) : 0.0,
-				atts.clipEnd ? (*atts.clipEnd) : -1.0,
-				lock_timeline) == GF_OK) 
+		                          atts.clipBegin ? (*atts.clipBegin) : 0.0,
+		                          atts.clipEnd ? (*atts.clipEnd) : -1.0,
+		                          lock_timeline) == GF_OK)
 
-		) {
+		   ) {
 			gf_mo_set_speed(stack->input.stream, FIX_ONE);
 			stack->is_active = GF_TRUE;
 		} else if (stack->is_active) {
@@ -732,9 +741,9 @@
 	/*store mute flag*/
 	stack->input.is_muted = GF_FALSE;
 	if (tr_state->switched_off
-		|| compositor_svg_is_display_off(props)
-		|| (*(props->visibility) == SVG_VISIBILITY_HIDDEN) ) {
-	
+	        || compositor_svg_is_display_off(props)
+	        || (*(props->visibility) == SVG_VISIBILITY_HIDDEN) ) {
+
 		stack->input.is_muted = GF_TRUE;
 	}
 
@@ -760,7 +769,7 @@
 	/*force first processing of xlink-href*/
 	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
 
-	if (!slaved_timing) 
+	if (!slaved_timing)
 		gf_smil_set_evaluation_callback(node, svg_audio_smil_evaluate);
 
 	gf_node_set_private(node, stack);
@@ -798,11 +807,11 @@
 
 	switch (status) {
 	case SMIL_TIMING_EVAL_UPDATE:
-		if (!stack->is_open) { 
+		if (!stack->is_open) {
 			if (stack->resource ) gf_mo_play(stack->resource, stack->clipBegin, stack->clipEnd, GF_FALSE);
 			stack->is_open = GF_TRUE;
 		}
-		else if (gf_mo_is_done(stack->resource) && (gf_smil_get_media_duration(rti)<0) ) { 
+		else if (gf_mo_is_done(stack->resource) && (gf_smil_get_media_duration(rti)<0) ) {
 			Double dur = gf_mo_get_duration(stack->resource);
 			gf_smil_set_media_duration(rti, dur);
 		}
@@ -838,7 +847,7 @@
 		}
 		gf_free(stack);
 		return;
-	} 
+	}
 
 	if (tr_state->traversing_mode!=TRAVERSE_SORT) return;
 
@@ -864,7 +873,7 @@
 
 			new_res = gf_mo_register(node, &url, lock_timeline, GF_FALSE);
 			gf_sg_mfurl_del(url);
-			
+
 			if (stack->resource!=new_res) {
 				if (stack->resource) {
 					gf_mo_stop(stack->resource);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_paint_servers.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/svg_paint_servers.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -125,16 +125,16 @@
 	compositor_svg_traverse_base(node, &all_atts, tr_state, &backup_props_1, &backup_flags_1);
 
 	if (real_traverse &&
-		! (tr_state->svg_flags & (GF_SG_SVG_STOPCOLOR_OR_OPACITY_DIRTY|GF_SG_SVG_COLOR_DIRTY)) 
-		&& !gf_node_dirty_get(node) 
-		&& !st->txh.needs_refresh) 
+	        ! (tr_state->svg_flags & (GF_SG_SVG_STOPCOLOR_OR_OPACITY_DIRTY|GF_SG_SVG_COLOR_DIRTY))
+	        && !gf_node_dirty_get(node)
+	        && !st->txh.needs_refresh)
 	{
 		memcpy(tr_state->svg_props, &backup_props_1, sizeof(SVGPropertiesPointers));
 		tr_state->svg_flags = backup_flags_1;
 		return;
 	}
 
-	/*for gradients we must traverse the gradient stops to trigger animations, even if the 
+	/*for gradients we must traverse the gradient stops to trigger animations, even if the
 	gradient is not marked as dirty*/
 	all_dirty = tr_state->svg_flags & (GF_SG_SVG_STOPCOLOR_OR_OPACITY_DIRTY|GF_SG_SVG_COLOR_DIRTY);
 	is_dirty = 0;
@@ -195,7 +195,7 @@
 
 			if (all_atts.offset) {
 				key = all_atts.offset->value;
-				if (all_atts.offset->type==SVG_NUMBER_PERCENTAGE) key/=100; 
+				if (all_atts.offset->type==SVG_NUMBER_PERCENTAGE) key/=100;
 			} else {
 				key=0;
 			}
@@ -356,7 +356,7 @@
 
 	if (!(txh->flags & GF_SR_TEXTURE_GRAD_REGISTERED)) {
 		txh->flags |= GF_SR_TEXTURE_GRAD_REGISTERED;
-		if (gf_list_find(txh->compositor->textures, txh)<0) 
+		if (gf_list_find(txh->compositor->textures, txh)<0)
 			gf_list_insert(txh->compositor->textures, txh, 0);
 	}
 
@@ -366,7 +366,7 @@
 	}
 	stencil = gf_sc_texture_get_stencil(txh);
 	if (!stencil) return;
-	
+
 	/*init our 2D graphics stuff*/
 	texture2D = raster->stencil_new(raster, GF_STENCIL_TEXTURE);
 	if (!texture2D) return;
@@ -378,7 +378,7 @@
 
 	transparent = st->txh.transparent;
 	if (st->txh.flags & GF_SR_TEXTURE_GRAD_NO_RGB) transparent = 1;
-	
+
 	if (transparent) {
 		if (!txh->data) {
 			txh->data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
@@ -517,7 +517,7 @@
 	/*gradient is a texture, only update the bounds*/
 	if (for_3d) {
 		GF_Rect rc;
-		if (!all_atts.gradientUnits || (*(SVG_GradientUnit*)all_atts.gradientUnits==SVG_GRADIENTUNITS_OBJECT)) 
+		if (!all_atts.gradientUnits || (*(SVG_GradientUnit*)all_atts.gradientUnits==SVG_GRADIENTUNITS_OBJECT))
 			return;
 
 		/*get gradient bounds in local coord system*/
@@ -527,7 +527,7 @@
 		return;
 	}
 
-	if (all_atts.gradientTransform) 
+	if (all_atts.gradientTransform)
 		gf_mx2d_copy(*mat, all_atts.gradientTransform->mat );
 
 	if (all_atts.x1) {
@@ -572,7 +572,7 @@
 	GF_SAFEALLOC(st, SVG_GradientStack);
 
 	/*!!! Gradients are textures but are not registered as textures with the compositor in order to avoid updating
-	too many textures each frame - gradients are only registered with the compositor when they are used in OpenGL, in order 
+	too many textures each frame - gradients are only registered with the compositor when they are used in OpenGL, in order
 	to release associated HW resource when no longer used*/
 	st->txh.owner = node;
 	st->txh.compositor = compositor;
@@ -622,7 +622,7 @@
 	/*gradient is a texture, only update the bounds*/
 	if (for_3d && bounds) {
 		GF_Rect rc;
-		if (!all_atts.gradientUnits || (*(SVG_GradientUnit*)all_atts.gradientUnits==SVG_GRADIENTUNITS_OBJECT)) 
+		if (!all_atts.gradientUnits || (*(SVG_GradientUnit*)all_atts.gradientUnits==SVG_GRADIENTUNITS_OBJECT))
 			return;
 
 		/*get gradient bounds in local coord system*/
@@ -634,9 +634,9 @@
 		return;
 	}
 
-	if (all_atts.gradientTransform) 
+	if (all_atts.gradientTransform)
 		gf_mx2d_copy(*mat, all_atts.gradientTransform->mat);
-	
+
 	if (all_atts.r) {
 		radius = all_atts.r->value;
 		if (all_atts.r->type==SVG_NUMBER_PERCENTAGE) radius /= 100;
@@ -673,8 +673,8 @@
 
 	/* 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) 
+	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);
@@ -690,7 +690,7 @@
 		/*move to local coord system - cf SVG spec*/
 		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);
 }
 
@@ -700,7 +700,7 @@
 	GF_SAFEALLOC(st, SVG_GradientStack);
 
 	/*!!! Gradients are textures but are not registered as textures with the compositor in order to avoid updating
-	too many textures each frame - gradients are only registered with the compositor when they are used in OpenGL, in order 
+	too many textures each frame - gradients are only registered with the compositor when they are used in OpenGL, in order
 	to release associated HW resource when no longer used*/
 	st->txh.owner = node;
 	st->txh.compositor = compositor;
@@ -730,7 +730,7 @@
 
 	gf_svg_flatten_attributes(elt, &all_atts);
 	compositor_svg_traverse_base(node, &all_atts, tr_state, &backup_props, &backup_flags);
-	
+
 	if (tr_state->traversing_mode == TRAVERSE_GET_BOUNDS) {
 		return;
 	} else {

gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_text.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/svg_text.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Cyril Concolato 
+ *			Authors: Cyril Concolato
  *			Copyright (c) Telecom ParisTech 2004-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -30,7 +30,7 @@
 #include "visual_manager.h"
 #include "nodes_stacks.h"
 
-typedef struct 
+typedef struct
 {
 	Drawable *drawable;
 	Fixed prev_size;
@@ -71,16 +71,16 @@
 		drawable_check_focus_highlight(ctx->drawable->node, tr_state, &st->bounds);
 		ctx->drawable = NULL;
 		return;
-	} 
+	}
 #endif
 	/*if text selection mode, we must force redraw of the entire text span because we don't
 	if glyphs have been (un)selected*/
-	if (!tr_state->immediate_draw && 
-		/*text selection on*/
-		(tr_state->visual->compositor->text_selection 
-		/*text sel release*/
-		|| (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED)) 
-	) {
+	if (!tr_state->immediate_draw &&
+	        /*text selection on*/
+	        (tr_state->visual->compositor->text_selection
+	         /*text sel release*/
+	         || (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED))
+	   ) {
 		GF_TextSpan *span;
 		u32 i = 0;
 		Bool unselect = (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED) ? 1 : 0;
@@ -106,23 +106,49 @@
 		styles = GF_FONT_OBLIQUE;
 		break;
 	}
-	if (*tr_state->svg_props->font_variant==SVG_FONTVARIANT_SMALLCAPS) 
+	if (*tr_state->svg_props->font_variant==SVG_FONTVARIANT_SMALLCAPS)
 		styles |= GF_FONT_SMALLCAPS;
 
 	switch(*tr_state->svg_props->font_weight) {
-	case SVG_FONTWEIGHT_100: styles |= GF_FONT_WEIGHT_100; break;
-	case SVG_FONTWEIGHT_LIGHTER: styles |= GF_FONT_WEIGHT_LIGHTER; break;
-	case SVG_FONTWEIGHT_200: styles |= GF_FONT_WEIGHT_200; break;
-	case SVG_FONTWEIGHT_300: styles |= GF_FONT_WEIGHT_300; break;
-	case SVG_FONTWEIGHT_400: styles |= GF_FONT_WEIGHT_400; break;
-	case SVG_FONTWEIGHT_NORMAL: styles |= GF_FONT_WEIGHT_NORMAL; break;
-	case SVG_FONTWEIGHT_500: styles |= GF_FONT_WEIGHT_500; break;
-	case SVG_FONTWEIGHT_600: styles |= GF_FONT_WEIGHT_600; break;
-	case SVG_FONTWEIGHT_700: styles |= GF_FONT_WEIGHT_700; break;
-	case SVG_FONTWEIGHT_BOLD: styles |= GF_FONT_WEIGHT_BOLD; break;
-	case SVG_FONTWEIGHT_800: styles |= GF_FONT_WEIGHT_800; break;
-	case SVG_FONTWEIGHT_900: styles |= GF_FONT_WEIGHT_900; break;
-	case SVG_FONTWEIGHT_BOLDER: styles |= GF_FONT_WEIGHT_BOLDER; break;
+	case SVG_FONTWEIGHT_100:
+		styles |= GF_FONT_WEIGHT_100;
+		break;
+	case SVG_FONTWEIGHT_LIGHTER:
+		styles |= GF_FONT_WEIGHT_LIGHTER;
+		break;
+	case SVG_FONTWEIGHT_200:
+		styles |= GF_FONT_WEIGHT_200;
+		break;
+	case SVG_FONTWEIGHT_300:
+		styles |= GF_FONT_WEIGHT_300;
+		break;
+	case SVG_FONTWEIGHT_400:
+		styles |= GF_FONT_WEIGHT_400;
+		break;
+	case SVG_FONTWEIGHT_NORMAL:
+		styles |= GF_FONT_WEIGHT_NORMAL;
+		break;
+	case SVG_FONTWEIGHT_500:
+		styles |= GF_FONT_WEIGHT_500;
+		break;
+	case SVG_FONTWEIGHT_600:
+		styles |= GF_FONT_WEIGHT_600;
+		break;
+	case SVG_FONTWEIGHT_700:
+		styles |= GF_FONT_WEIGHT_700;
+		break;
+	case SVG_FONTWEIGHT_BOLD:
+		styles |= GF_FONT_WEIGHT_BOLD;
+		break;
+	case SVG_FONTWEIGHT_800:
+		styles |= GF_FONT_WEIGHT_800;
+		break;
+	case SVG_FONTWEIGHT_900:
+		styles |= GF_FONT_WEIGHT_900;
+		break;
+	case SVG_FONTWEIGHT_BOLDER:
+		styles |= GF_FONT_WEIGHT_BOLDER;
+		break;
 	}
 
 	return styles;
@@ -159,7 +185,7 @@
 			nb_fonts++;
 			if (skip) a_font[len-skip] = ' ';
 		}
-		
+
 		if (sep) {
 			sep[0] = ',';
 			a_font = sep+1;
@@ -208,7 +234,7 @@
 	}
 }
 
-static GF_TextSpan *svg_get_text_span(GF_FontManager *fm, GF_Font *font, Fixed font_size, Bool x_offsets, Bool y_offsets, Bool rotate, SVGAllAttributes *atts, char *textContent, const char *lang, GF_TraverseState *tr_state) 
+static GF_TextSpan *svg_get_text_span(GF_FontManager *fm, GF_Font *font, Fixed font_size, Bool x_offsets, Bool y_offsets, Bool rotate, SVGAllAttributes *atts, char *textContent, const char *lang, GF_TraverseState *tr_state)
 {
 	GF_TextSpan *span = NULL;
 	char *dup_text;
@@ -219,7 +245,7 @@
 
 	len = (u32) strlen(textContent);
 	dup_text = gf_malloc(len+1);
-		
+
 	switch (tr_state->last_char_type) {
 	case 2:
 		prev = 0;
@@ -232,7 +258,7 @@
 	}
 	for (i = 0, j = 0; i < len; i++) {
 		if (textContent[i] == ' ') {
-			if (prev == ' ' && !preserve) { 
+			if (prev == ' ' && !preserve) {
 				/* ignore space */
 			} else {
 				dup_text[j] = textContent[i];
@@ -240,7 +266,7 @@
 				j++;
 			}
 		} else if (textContent[i] == '\t') {
-			if (prev == ' ' && !preserve) { 
+			if (prev == ' ' && !preserve) {
 				/* ignore space */
 			} else {
 				dup_text[j] = ' ';
@@ -248,9 +274,9 @@
 				j++;
 			}
 		} else if ((textContent[i] == '\n') ||
-				   (textContent[i] == '\r') 
-		) {
-			if (prev == ' ' && preserve) { 
+		           (textContent[i] == '\r')
+		          ) {
+			if (prev == ' ' && preserve) {
 				dup_text[j] = ' ';
 				prev = dup_text[j];
 				j++;
@@ -259,9 +285,9 @@
 				j++;
 			}
 		} else if (
-			(((u8) textContent[i] == 0xc2) && ((u8) textContent[i+1] == 0xa0)) 
+		    (((u8) textContent[i] == 0xc2) && ((u8) textContent[i+1] == 0xa0))
 		) {
-			if (prev == ' ' && !preserve) { 
+			if (prev == ' ' && !preserve) {
 				/* ignore space */
 			} else {
 				dup_text[j] = ' ';
@@ -339,7 +365,7 @@
 			st->last_glyph = last_glyph;
 			return;
 		}
-	}	
+	}
 	st = gf_malloc(sizeof(textArea_state));
 	st->first_glyph = first_glyph;
 	st->last_glyph = last_glyph;
@@ -394,7 +420,7 @@
 			tr_state->line_spacing = gf_mulfix(span->font_size, FLT2FIX(1.0) );
 		}
 		tr_state->text_end_y += tr_state->line_spacing;
-	} 
+	}
 
 	line_spacing = gf_mulfix(span->font_size, FLT2FIX(1.0) );
 
@@ -428,7 +454,7 @@
 				word_size += font->max_advance_h * span->font_scale;
 			}
 			i++;
-		} 
+		}
 
 		/* word doesn't fit on line, escape*/
 		if (!word_size && !last_char_size) break;
@@ -503,8 +529,8 @@
 	i=0;
 	//count_x, _y: number of x- (y-) position of characters to come in the text flow
 	while ( (i<span->nb_glyphs)
-		&& ( (tr_state->count_x>1) || (tr_state->count_y>1) )
-	) {
+	        && ( (tr_state->count_x>1) || (tr_state->count_y>1) )
+	      ) {
 		block_width = (span->glyphs[i] ? span->glyphs[i]->horiz_advance : font->max_advance_h) * span->font_scale;
 
 		//store width in tr_state->x_anchors
@@ -528,7 +554,7 @@
 		}
 		//if last indicated position, create a new item
 		if ((tr_state->count_x==1)||(tr_state->count_y==1)
-			|| !gf_list_count(tr_state->x_anchors) ) {
+		        || !gf_list_count(tr_state->x_anchors) ) {
 			entry = (Fixed*)gf_malloc(sizeof(Fixed));
 			*entry = block_width;
 
@@ -564,10 +590,10 @@
 	while (child) {
 		switch  (gf_node_get_tag(child->node)) {
 		case TAG_DOMText:
-			get_domtext_width(child->node, &atts, tr_state); 
+			get_domtext_width(child->node, &atts, tr_state);
 			break;
 		case TAG_SVG_tspan:
-			get_tspan_width(child->node, tr_state); 
+			get_tspan_width(child->node, tr_state);
 			break;
 		default:
 			break;
@@ -615,12 +641,12 @@
 
 	i=0;
 	/*
-	if character position is given in (x, y) attributes, use it. 
+	if character position is given in (x, y) attributes, use it.
 	Otherwise add text at tr_state->text_end_x.
-	*/		
+	*/
 	while ((i<span->nb_glyphs)
-		&& ( (tr_state->count_x>1) || (tr_state->count_y>1) )
-	) {
+	        && ( (tr_state->count_x>1) || (tr_state->count_y>1) )
+	      ) {
 		//get x and y positions
 		if (tr_state->count_x==0) {
 			x = tr_state->text_end_x;
@@ -636,7 +662,7 @@
 			y = yc->value;
 			(tr_state->count_y)--;
 		}
-		
+
 
 		/*apply x-anchor*/
 		ptr = (Fixed *)gf_list_get(tr_state->x_anchors, tr_state->chunk_index);
@@ -716,10 +742,10 @@
 	/*compute length of all text blocks*/
 	switch  (gf_node_get_tag(node)) {
 	case TAG_DOMText:
-		get_domtext_width(node, atts, tr_state); 
+		get_domtext_width(node, atts, tr_state);
 		break;
 	case TAG_SVG_tspan:
-		get_tspan_width(node, tr_state); 
+		get_tspan_width(node, tr_state);
 		break;
 	case TAG_SVG_switch:
 		is_switch = 1;
@@ -750,12 +776,12 @@
 	Bool is_switch = 0;
 	switch  (gf_node_get_tag(node)) {
 	case TAG_DOMText:
-		svg_traverse_domtext(node, atts, tr_state, spans, NULL); 
+		svg_traverse_domtext(node, atts, tr_state, spans, NULL);
 		break;
 	case TAG_SVG_tspan:
 		/*mark tspan as dirty to force rebuild*/
 		gf_node_dirty_set(node, 0, 0);
-		gf_node_traverse(node, tr_state); 
+		gf_node_traverse(node, tr_state);
 		break;
 	case TAG_SVG_switch:
 		is_switch = 1;
@@ -770,7 +796,7 @@
 					break;
 				}
 			} else if (gf_node_get_tag(child->node)==TAG_DOMText) {
-				svg_traverse_domtext(child->node, atts, tr_state, spans, node); 
+				svg_traverse_domtext(child->node, atts, tr_state, spans, node);
 			}
 			child = child->next;
 		}
@@ -839,7 +865,7 @@
 		while (child) {
 			switch  (gf_node_get_tag(child->node)) {
 			case TAG_SVG_tspan:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			}
 			child = child->next;
@@ -857,7 +883,7 @@
 
 	if (tr_state->traversing_mode==TRAVERSE_PICK) {
 		compositor_svg_apply_local_transformation(tr_state, &atts, &backup_matrix, &mx3d);
-		if (*tr_state->svg_props->pointer_events!=SVG_POINTEREVENTS_NONE) 
+		if (*tr_state->svg_props->pointer_events!=SVG_POINTEREVENTS_NONE)
 			gf_font_spans_pick(node, st->spans, tr_state, &st->bounds, 1, st->drawable);
 
 		/*and browse children*/
@@ -865,7 +891,7 @@
 		while (child) {
 			switch  (gf_node_get_tag(child->node)) {
 			case TAG_SVG_tspan:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			}
 			child = child->next;
@@ -888,12 +914,12 @@
 
 	compositor_svg_apply_local_transformation(tr_state, &atts, &backup_matrix, &mx3d);
 
-	if ( (st->prev_size != tr_state->svg_props->font_size->value) || 
-		 (st->prev_flags != *tr_state->svg_props->font_style) || 
-		 (st->prev_anchor != *tr_state->svg_props->text_anchor) ||
-		 (gf_node_dirty_get(node) & (GF_SG_SVG_GEOMETRY_DIRTY | GF_SG_CHILD_DIRTY) ) 
-		 || tr_state->visual->compositor->reset_fonts
-	) {
+	if ( (st->prev_size != tr_state->svg_props->font_size->value) ||
+	        (st->prev_flags != *tr_state->svg_props->font_style) ||
+	        (st->prev_anchor != *tr_state->svg_props->text_anchor) ||
+	        (gf_node_dirty_get(node) & (GF_SG_SVG_GEOMETRY_DIRTY | GF_SG_CHILD_DIRTY) )
+	        || tr_state->visual->compositor->reset_fonts
+	   ) {
 		u32 mode;
 		child = ((GF_ParentNode *) text)->children;
 
@@ -922,7 +948,7 @@
 
 		/*apply justification of all blocks*/
 		imax=gf_list_count(tr_state->x_anchors);
-		for (i=0;i<imax;i++){
+		for (i=0; i<imax; i++) {
 			lw=gf_list_get(tr_state->x_anchors, i);
 			svg_apply_text_anchor(tr_state, lw);
 		}
@@ -938,11 +964,11 @@
 		tr_state->chunk_index = 0;
 
 		/*initialize current text position*/
-		if (!tr_state->text_end_x){
+		if (!tr_state->text_end_x) {
 			SVG_Coordinate *xc = (atts.text_x ? (SVG_Coordinate *) gf_list_get(*atts.text_x, 0) : NULL);
 			tr_state->text_end_x = (xc ? xc->value : 0);
 		}
-		if (!tr_state->text_end_y){
+		if (!tr_state->text_end_y) {
 			SVG_Coordinate *yc = (atts.text_y ? (SVG_Coordinate *) gf_list_get(*atts.text_y, 0) : NULL);
 			tr_state->text_end_y = (yc ? yc->value : 0);
 		}
@@ -951,9 +977,9 @@
 		tr_state->text_x = atts.text_x;
 		tr_state->text_y = atts.text_y;
 		tr_state->text_rotate = atts.text_rotate;
-		
+
 		drawable_reset_path(st->drawable);
-		
+
 		/*switch to bounds mode, and recompute children*/
 		mode = tr_state->traversing_mode;
 		tr_state->traversing_mode = TRAVERSE_GET_BOUNDS;
@@ -978,18 +1004,18 @@
 		}
 		gf_list_del(tr_state->x_anchors);
 		tr_state->x_anchors = NULL;
-	
+
 		svg_update_bounds(st);
-	} 
+	}
 
 	if (tr_state->traversing_mode == TRAVERSE_GET_BOUNDS) {
 		if (!compositor_svg_is_display_off(tr_state->svg_props))
 			tr_state->bounds = st->bounds;
 
-	} else if ((tr_state->traversing_mode == TRAVERSE_SORT) 
-		&& !compositor_svg_is_display_off(tr_state->svg_props) 
-		&& (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN) 
-		) {
+	} else if ((tr_state->traversing_mode == TRAVERSE_SORT)
+	           && !compositor_svg_is_display_off(tr_state->svg_props)
+	           && (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN)
+	          ) {
 		ctx = drawable_init_context_svg(st->drawable, tr_state);
 		if (ctx) svg_finalize_sort(ctx, st, tr_state);
 
@@ -998,10 +1024,10 @@
 		while (child) {
 			switch  (gf_node_get_tag(child->node)) {
 			case TAG_SVG_tspan:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			case TAG_SVG_switch:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			}
 			child = child->next;
@@ -1030,7 +1056,7 @@
 
 
 static void svg_traverse_tspan(GF_Node *node, void *rs, Bool is_destroy)
-{	
+{
 	SVGPropertiesPointers backup_props;
 	u32 backup_flags;
 	GF_Matrix2D backup_matrix;
@@ -1060,7 +1086,7 @@
 		while (child) {
 			switch  (gf_node_get_tag(child->node)) {
 			case TAG_SVG_tspan:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			}
 			child = child->next;
@@ -1075,7 +1101,7 @@
 		return;
 
 	if (tr_state->traversing_mode==TRAVERSE_PICK) {
-		if (*tr_state->svg_props->pointer_events!=SVG_POINTEREVENTS_NONE) 
+		if (*tr_state->svg_props->pointer_events!=SVG_POINTEREVENTS_NONE)
 			gf_font_spans_pick(node, st->spans, tr_state, &st->bounds, 1, st->drawable);
 
 		/*and browse children*/
@@ -1083,7 +1109,7 @@
 		while (child) {
 			switch  (gf_node_get_tag(child->node)) {
 			case TAG_SVG_tspan:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			}
 			child = child->next;
@@ -1092,18 +1118,18 @@
 		tr_state->svg_flags = backup_flags;
 		return;
 	}
-	
+
 	compositor_svg_apply_local_transformation(tr_state, &atts, &backup_matrix, &mx3d);
 
-	if ( (st->prev_size != tr_state->svg_props->font_size->value) || 
-		 (st->prev_flags != *tr_state->svg_props->font_style) || 
-		 (st->prev_anchor != *tr_state->svg_props->text_anchor) ||
-		 (gf_node_dirty_get(node) & (GF_SG_SVG_GEOMETRY_DIRTY | GF_SG_CHILD_DIRTY) ) 
-	) {
+	if ( (st->prev_size != tr_state->svg_props->font_size->value) ||
+	        (st->prev_flags != *tr_state->svg_props->font_style) ||
+	        (st->prev_anchor != *tr_state->svg_props->text_anchor) ||
+	        (gf_node_dirty_get(node) & (GF_SG_SVG_GEOMETRY_DIRTY | GF_SG_CHILD_DIRTY) )
+	   ) {
 		u32 mode;
-		
+
 		/*tspan has been modified in the SORT stage, which means that an anim local to tspan has modified the node.
-		The result of the parent (text, textArea) will thus be wrong if we try to update the tspan. We therefore 
+		The result of the parent (text, textArea) will thus be wrong if we try to update the tspan. We therefore
 		keep the previous computed drawable, and invalidate the parent for next frame*/
 		if (tr_state->traversing_mode==TRAVERSE_SORT) {
 			gf_node_dirty_set(node, 0, 1);
@@ -1120,16 +1146,16 @@
 		while (child) {
 			switch  (gf_node_get_tag(child->node)) {
 			case TAG_DOMText:
-				svg_traverse_domtext(child->node, &atts, tr_state, st->spans, NULL); 
+				svg_traverse_domtext(child->node, &atts, tr_state, st->spans, NULL);
 				break;
 			case TAG_SVG_tspan:
 				gf_node_dirty_set(child->node, 0, 0);
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			case TAG_SVG_switch:
 			case TAG_SVG_a:
 			case TAG_SVG_tbreak:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			default:
 				break;
@@ -1144,12 +1170,12 @@
 		st->prev_anchor = *tr_state->svg_props->text_anchor;
 
 		svg_update_bounds(st);
-	} 
+	}
 skip_changes:
 
 	if (tr_state->traversing_mode == TRAVERSE_GET_BOUNDS) {
 		if (tr_state->refresh_children_bounds) {
-			if (tr_state->base_shift) 
+			if (tr_state->base_shift)
 				svg_text_area_shift_bounds(st, tr_state);
 			else
 				svg_update_bounds(st);
@@ -1159,7 +1185,7 @@
 				case TAG_SVG_tspan:
 				case TAG_SVG_switch:
 				case TAG_SVG_a:
-					gf_node_traverse(child->node, tr_state); 
+					gf_node_traverse(child->node, tr_state);
 					break;
 				default:
 					break;
@@ -1170,14 +1196,14 @@
 		if (!compositor_svg_is_display_off(tr_state->svg_props))
 			tr_state->bounds = st->bounds;
 
-	} 
+	}
 	else if (
-		(tr_state->traversing_mode == TRAVERSE_SORT) 
-		&& !compositor_svg_is_display_off(tr_state->svg_props) 
-		&& ( *(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN) 
+	    (tr_state->traversing_mode == TRAVERSE_SORT)
+	    && !compositor_svg_is_display_off(tr_state->svg_props)
+	    && ( *(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN)
 	) {
 		child = ((GF_ParentNode *) tspan)->children;
-		
+
 		ctx = drawable_init_context_svg(st->drawable, tr_state);
 		if (ctx) svg_finalize_sort(ctx, st, tr_state);
 
@@ -1186,7 +1212,7 @@
 			case TAG_SVG_tspan:
 			case TAG_SVG_switch:
 			case TAG_SVG_a:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			default:
 				break;
@@ -1214,7 +1240,7 @@
 
 
 static void svg_traverse_textArea(GF_Node *node, void *rs, Bool is_destroy)
-{	
+{
 	SVGPropertiesPointers backup_props;
 	u32 backup_flags;
 	GF_Matrix mx3d;
@@ -1247,7 +1273,7 @@
 			switch  (gf_node_get_tag(child->node)) {
 			case TAG_SVG_tspan:
 			case TAG_SVG_a:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			}
 			child = child->next;
@@ -1283,15 +1309,15 @@
 		tr_state->text_parent = NULL;
 		return;
 	}
-	
+
 	compositor_svg_apply_local_transformation(tr_state, &atts, &backup_matrix, &mx3d);
 
-	if ( (st->prev_size != tr_state->svg_props->font_size->value) || 
-		 (st->prev_flags != *tr_state->svg_props->font_style) || 
-		 (st->prev_anchor != *tr_state->svg_props->text_anchor) ||
-		 (gf_node_dirty_get(node) & (GF_SG_SVG_GEOMETRY_DIRTY | GF_SG_CHILD_DIRTY) ) 
-		 || tr_state->visual->compositor->reset_fonts
-	) {
+	if ( (st->prev_size != tr_state->svg_props->font_size->value) ||
+	        (st->prev_flags != *tr_state->svg_props->font_style) ||
+	        (st->prev_anchor != *tr_state->svg_props->text_anchor) ||
+	        (gf_node_dirty_get(node) & (GF_SG_SVG_GEOMETRY_DIRTY | GF_SG_CHILD_DIRTY) )
+	        || tr_state->visual->compositor->reset_fonts
+	   ) {
 		u32 mode;
 
 		child = ((GF_ParentNode *) text)->children;
@@ -1329,17 +1355,17 @@
 				c++;
 				switch  (gf_node_get_tag(child->node)) {
 				case TAG_DOMText:
-					svg_traverse_dom_text_area(child->node, &atts, tr_state, st->spans); 
+					svg_traverse_dom_text_area(child->node, &atts, tr_state, st->spans);
 					break;
 				case TAG_SVG_tspan:
 					/*mark tspan as dirty to force rebuild*/
 					gf_node_dirty_set(child->node, 0, 0);
-					gf_node_traverse(child->node, tr_state); 
+					gf_node_traverse(child->node, tr_state);
 					break;
 				case TAG_SVG_switch:
 				case TAG_SVG_a:
 				case TAG_SVG_tbreak:
-					gf_node_traverse(child->node, tr_state); 
+					gf_node_traverse(child->node, tr_state);
 					break;
 				default:
 					break;
@@ -1382,7 +1408,7 @@
 					tr_state->base_shift = remain;
 					svg_text_area_shift_bounds(st, tr_state);
 				}
-			} 
+			}
 
 			if (refresh_to_idx) {
 				tr_state->refresh_children_bounds=1;
@@ -1395,7 +1421,7 @@
 					case TAG_SVG_tspan:
 					case TAG_SVG_switch:
 					case TAG_SVG_a:
-						gf_node_traverse(child->node, tr_state); 
+						gf_node_traverse(child->node, tr_state);
 						break;
 					default:
 						break;
@@ -1410,19 +1436,19 @@
 			tr_state->refresh_children_bounds = prev_refresh;
 		}
 		svg_update_bounds(st);
-	} 
-	
+	}
+
 	if (tr_state->traversing_mode == TRAVERSE_GET_BOUNDS) {
 		if (!compositor_svg_is_display_off(tr_state->svg_props))
 			tr_state->bounds = st->bounds;
-	} else if ( (tr_state->traversing_mode == TRAVERSE_SORT) 
-			&& !compositor_svg_is_display_off(tr_state->svg_props) 
-			&& (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN) 
-		) {
+	} else if ( (tr_state->traversing_mode == TRAVERSE_SORT)
+	            && !compositor_svg_is_display_off(tr_state->svg_props)
+	            && (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN)
+	          ) {
 
 		ctx = drawable_init_context_svg(st->drawable, tr_state);
 		if (ctx) svg_finalize_sort(ctx, st, tr_state);
-		
+
 		child = ((GF_ParentNode *) text)->children;
 		while (child) {
 			switch  (gf_node_get_tag(child->node)) {
@@ -1431,7 +1457,7 @@
 			case TAG_SVG_tspan:
 			case TAG_SVG_switch:
 			case TAG_SVG_a:
-				gf_node_traverse(child->node, tr_state); 
+				gf_node_traverse(child->node, tr_state);
 				break;
 			default:
 				break;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/texturing.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/texturing.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,8 +40,10 @@
 	txh->owner = owner;
 	txh->compositor = compositor;
 	/*insert texture in reverse order, so that textures in sub documents/scenes are updated before parent ones*/
-	if (gf_list_find(compositor->textures, txh)<0) 
+	if (gf_list_find(compositor->textures, txh)<0) {
 		gf_list_insert(compositor->textures, txh, 0);
+		compositor->texture_inserted = GF_TRUE;
+	}
 	if (!txh->update_texture_fcnt) txh->update_texture_fcnt = update_texture_void;
 }
 
@@ -149,12 +151,12 @@
 static void setup_texture_object(GF_TextureHandler *txh, Bool private_media)
 {
 	if (!txh->tx_io) {
-        gf_sc_texture_allocate(txh);
+		gf_sc_texture_allocate(txh);
 		if (!txh->tx_io) return;
 
 		gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat, &txh->is_flipped);
-        
-        if (private_media) {
+
+		if (private_media) {
 			txh->transparent = 1;
 			txh->pixelformat = GF_PIXEL_ARGB;
 			txh->flags |= GF_SR_TEXTURE_PRIVATE_MEDIA;
@@ -205,6 +207,8 @@
 
 	if (!(gf_mo_get_flags(txh->stream) & GF_MO_IS_INIT)) {
 		needs_reload = 1;
+	} else if (size && txh->size && (size != txh->size)) {
+		needs_reload = 1;
 	}
 
 	if (needs_reload) {
@@ -241,8 +245,9 @@
 		}
 		return;
 	}
-	txh->needs_release = 1; 
+	txh->needs_release = 1;
 	txh->last_frame_time = ts;
+	txh->size = size;
 	if (txh->raw_memory) {
 		gf_mo_get_raw_image_planes(txh->stream, (u8 **) &txh->data, (u8 **) &txh->pU, (u8 **) &txh->pV);
 	}
@@ -289,17 +294,19 @@
 	if (!n) return NULL;
 	switch (gf_node_get_tag(n)) {
 #ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_ImageTexture: 
-	case TAG_MPEG4_CacheTexture: 
+	case TAG_MPEG4_ImageTexture:
+	case TAG_MPEG4_CacheTexture:
 		return it_get_texture(n);
-	case TAG_MPEG4_MovieTexture: return mt_get_texture(n);
-	case TAG_MPEG4_PixelTexture: return pt_get_texture(n);
+	case TAG_MPEG4_MovieTexture:
+		return mt_get_texture(n);
+	case TAG_MPEG4_PixelTexture:
+		return pt_get_texture(n);
 
-	case TAG_MPEG4_CompositeTexture2D: 
-	case TAG_MPEG4_CompositeTexture3D: 
+	case TAG_MPEG4_CompositeTexture2D:
+	case TAG_MPEG4_CompositeTexture3D:
 		return compositor_get_composite_texture(n);
-	case TAG_MPEG4_LinearGradient: 
-	case TAG_MPEG4_RadialGradient: 
+	case TAG_MPEG4_LinearGradient:
+	case TAG_MPEG4_RadialGradient:
 		return compositor_mpeg4_get_gradient_texture(n);
 
 	case TAG_MPEG4_MatteTexture:
@@ -311,21 +318,25 @@
 #endif /*GPAC_DISABLE_VRML*/
 
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_ImageTexture: return it_get_texture(n);
-	case TAG_X3D_MovieTexture: return mt_get_texture(n);
-	case TAG_X3D_PixelTexture: return pt_get_texture(n);
+	case TAG_X3D_ImageTexture:
+		return it_get_texture(n);
+	case TAG_X3D_MovieTexture:
+		return mt_get_texture(n);
+	case TAG_X3D_PixelTexture:
+		return pt_get_texture(n);
 #endif
 
 
 #ifndef GPAC_DISABLE_SVG
-	case TAG_SVG_linearGradient: 
-	case TAG_SVG_radialGradient: 
+	case TAG_SVG_linearGradient:
+	case TAG_SVG_radialGradient:
 		return compositor_svg_get_gradient_texture(n);
 	case TAG_SVG_image:
 	case TAG_SVG_video:
 		return compositor_svg_get_image_texture(n);
 #endif
 
-	default: return NULL;
+	default:
+		return NULL;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/compositor/texturing.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/texturing.h Changed

gpac-0.5.0.svn5178.tar.bz2/src/compositor/texturing_gl.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/texturing_gl.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -96,7 +96,7 @@
 #ifdef GF_SR_USE_DEPTH
 	char *depth_data;
 #endif
-	
+
 };
 
 GF_Err gf_sc_texture_allocate(GF_TextureHandler *txh)
@@ -138,6 +138,8 @@
 	}
 
 	if (txh->tx_io) {
+		gf_sc_lock(txh->compositor, 1);
+
 		if (txh->tx_io->tx_raster) {
 			txh->compositor->rasterizer->stencil_delete(txh->tx_io->tx_raster);
 			txh->tx_io->tx_raster = NULL;
@@ -148,7 +150,9 @@
 		} else {
 			gf_list_add(txh->compositor->textures_gc, txh->tx_io);
 		}
-		txh->tx_io=NULL;
+		txh->tx_io = NULL;
+
+		gf_sc_lock(txh->compositor, 0);
 	}
 }
 
@@ -298,14 +302,14 @@
 {
 	if (txh && txh->tx_io) {
 
-#ifndef GPAC_USE_OGL_ES 
+#ifndef GPAC_USE_OGL_ES
 		if (txh->tx_io->yuv_shader) {
 			glUseProgram(0);
 			txh->compositor->visual->current_texture_glsl_program = 0;
 			glActiveTexture(GL_TEXTURE0);
 			glBindTexture(txh->tx_io->gl_type, 0);
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[GL Texture] Texure drawn (CTS %d)\n", txh->last_frame_time));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[GL Texture] Texture drawn (CTS %d)\n", txh->last_frame_time));
 
 		}
 #endif
@@ -357,9 +361,9 @@
 	Bool is_pow2, use_rect, flip, use_yuv_shaders;
 	GF_Compositor *compositor = (GF_Compositor *)txh->compositor;
 
-	/*first setup, this will force recompute bounds in case used with bitmap - we could refine and only 
+	/*first setup, this will force recompute bounds in case used with bitmap - we could refine and only
 	invalidate for bitmaps only*/
-	if (txh->owner && (!txh->tx_io->rescale_width || !txh->tx_io->rescale_height)) 
+	if (txh->owner && (!txh->tx_io->rescale_width || !txh->tx_io->rescale_height))
 		gf_node_dirty_set(txh->owner, 0, 1);
 
 	txh->tx_io->rescale_width = gf_get_next_pow2(txh->width);
@@ -402,16 +406,16 @@
 		txh->tx_io->gl_format = GL_RGB;
 		txh->tx_io->nb_comp = 3;
 		break;
-    case GF_PIXEL_BGR_32:
-        txh->tx_io->gl_format = GL_RGBA;
-        txh->tx_io->nb_comp = 4;
-        break;
+	case GF_PIXEL_BGR_32:
+		txh->tx_io->gl_format = GL_RGBA;
+		txh->tx_io->nb_comp = 4;
+		break;
 	case GF_PIXEL_RGB_32:
 	case GF_PIXEL_RGBA:
 		txh->tx_io->gl_format = GL_RGBA;
 		txh->tx_io->nb_comp = 4;
 		break;
-#ifndef GPAC_USE_OGL_ES 
+#ifndef GPAC_USE_OGL_ES
 	case GF_PIXEL_ARGB:
 		if (!compositor->gl_caps.bgra_texture) return 0;
 		txh->tx_io->gl_format = GL_BGRA_EXT;
@@ -421,18 +425,18 @@
 	case GF_PIXEL_YV12:
 	case GF_PIXEL_YV12_10:
 	case GF_PIXEL_NV21:
-#ifndef GPAC_USE_OGL_ES 
-        if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->yuv_rect_glsl_program) ) {
-            use_yuv_shaders = 1;
-            break;
-        } else if (!compositor->disable_yuvgl && compositor->gl_caps.yuv_texture && !(txh->tx_io->flags & TX_MUST_SCALE) ) {
+#ifndef GPAC_USE_OGL_ES
+		if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->yuv_rect_glsl_program) ) {
+			use_yuv_shaders = 1;
+			break;
+		} else if (!compositor->disable_yuvgl && compositor->gl_caps.yuv_texture && !(txh->tx_io->flags & TX_MUST_SCALE) ) {
 			txh->tx_io->gl_format = compositor->gl_caps.yuv_texture;
 			txh->tx_io->nb_comp = 3;
 			txh->tx_io->gl_dtype = UNSIGNED_SHORT_8_8_MESA;
 			break;
 		}
 #endif
-		//fallthrough
+	//fallthrough
 	case GF_PIXEL_YUY2:
 	case GF_PIXEL_YUVD:
 		if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->yuv_rect_glsl_program) ) {
@@ -473,7 +477,7 @@
 		tx_id[2] = txh->tx_io->v_id;
 		nb_tx = 3;
 
-		if (txh->tx_io->flags & TX_IS_RECT) {
+		if (0 && txh->tx_io->flags & TX_IS_RECT) {
 			GLint loc;
 			glUseProgram(compositor->visual->yuv_rect_glsl_program);
 			loc = glGetUniformLocation(compositor->visual->yuv_rect_glsl_program, "width");
@@ -494,7 +498,7 @@
 		}
 	}
 #endif
-    
+
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
 	if (txh->compositor->gl_caps.pbo && txh->compositor->enable_pbo) {
 		u32 size = txh->stride*txh->height;
@@ -560,17 +564,18 @@
 #else
 
 #ifndef GPAC_USE_TINYGL
-		if (txh->tx_io->gl_type == GL_TEXTURE_2D) { 
+		if (txh->tx_io->gl_type == GL_TEXTURE_2D) {
 			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, (txh->flags & GF_SR_TEXTURE_REPEAT_S) ? GL_REPEAT : GL_CLAMP);
 			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, (txh->flags & GF_SR_TEXTURE_REPEAT_T) ? GL_REPEAT : GL_CLAMP);
 		} else
 #endif
-		{ 
-			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, GL_CLAMP);
-			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, GL_CLAMP);
+			//clamp to edge for NPOT textures
+		{
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 		}
 
-		if (txh->tx_io->gl_type == GL_TEXTURE_2D) { 
+		if (txh->tx_io->gl_type == GL_TEXTURE_2D) {
 			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MAG_FILTER, txh->compositor->high_speed ? GL_NEAREST : GL_LINEAR);
 			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MIN_FILTER, txh->compositor->high_speed ? GL_NEAREST : GL_LINEAR);
 		} else {
@@ -581,16 +586,16 @@
 
 		if (txh->tx_io->yuv_shader && (txh->pixelformat==GF_PIXEL_YV12_10)) {
 			//will never happen on GLES for now since we don't have GLES2 support yet ...
-#ifndef GPAC_USE_OGL_ES 
-		    glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+#ifndef GPAC_USE_OGL_ES
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
 			//we use 10 bits but GL will normalise using 16 bits, so we need to multiply the nomralized result by 2^6
 			glPixelTransferi(GL_RED_SCALE, 64);
 #endif
 		} else {
-#ifndef GPAC_USE_OGL_ES 
+#ifndef GPAC_USE_OGL_ES
 			glPixelTransferi(GL_RED_SCALE, 1);
 #endif
-		    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 		}
 		glDisable(txh->tx_io->gl_type);
 	}
@@ -626,7 +631,7 @@
 		v = p_v + (idx/2) * txh->stride/2;
 		dst = (u8 *) txh->tx_io->conv_data + 2*i*txh->stride;
 
-		for (j=0; j<txh->width/2;j++) {
+		for (j=0; j<txh->width/2; j++) {
 			*dst = *u;
 			dst++;
 			u++;
@@ -668,9 +673,9 @@
 	case GF_PIXEL_BGR_24:
 		bpp = 3;
 		break;
-    case GF_PIXEL_BGR_32:
-        bpp = 4;
-        break;
+	case GF_PIXEL_BGR_32:
+		bpp = 4;
+		break;
 	case GF_PIXEL_GREYSCALE:
 	case GF_PIXEL_ALPHAGREY:
 	case GF_PIXEL_RGB_24:
@@ -688,10 +693,10 @@
 			txh->tx_io->conv_data = gf_malloc(sizeof(char)*txh->stride*txh->height);
 			txh->tx_io->conv_format = txh->pixelformat;
 		}
-assert(txh->tx_io->conv_data );
-assert(txh->data );
-/*if texture is using RECT extension, flip image manually because
-		texture transforms are not supported in this case ...*/
+		assert(txh->tx_io->conv_data );
+		assert(txh->data );
+		/*if texture is using RECT extension, flip image manually because
+				texture transforms are not supported in this case ...*/
 		for (i=0; i<txh->height; i++) {
 			memcpy(txh->tx_io->conv_data + (txh->height - 1 - i) * txh->stride, txh->data + i*txh->stride, txh->stride);
 		}
@@ -760,14 +765,14 @@
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_I420:
 	case GF_PIXEL_BGR_24:
-    case GF_PIXEL_BGR_32:
-    	txh->tx_io->conv_format = dst.pixel_format = GF_PIXEL_RGB_24;
+	case GF_PIXEL_BGR_32:
+		txh->tx_io->conv_format = dst.pixel_format = GF_PIXEL_RGB_24;
 		/*stretch and flip*/
 		gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, !txh->is_flipped, NULL, NULL);
-        if ( !txh->is_flipped)
-            txh->flags |= GF_SR_TEXTURE_NO_GL_FLIP;
+		if ( !txh->is_flipped)
+			txh->flags |= GF_SR_TEXTURE_NO_GL_FLIP;
 		break;
-    case GF_PIXEL_YUVD:
+	case GF_PIXEL_YUVD:
 		if ((txh->compositor->depth_gl_type==GF_SC_DEPTH_GL_NONE) || (txh->compositor->depth_gl_type==GF_SC_DEPTH_GL_VBO)) {
 			src.pixel_format = GF_PIXEL_YV12;
 			txh->tx_io->conv_format = GF_PIXEL_RGB_24_DEPTH;
@@ -819,18 +824,18 @@
 {
 	Bool needs_stride;
 	if (txh->tx_io->gl_dtype==GL_UNSIGNED_SHORT) {
-		needs_stride = (stride != 2*w*txh->tx_io->nb_comp) ? GF_TRUE : GF_FALSE; 
+		needs_stride = (stride != 2*w*txh->tx_io->nb_comp) ? GF_TRUE : GF_FALSE;
 		if (needs_stride) stride /= 2;
 	} else {
-		needs_stride = (stride!=w*txh->tx_io->nb_comp) ? GF_TRUE : GF_FALSE; 
+		needs_stride = (stride!=w*txh->tx_io->nb_comp) ? GF_TRUE : GF_FALSE;
 	}
 
 #if !defined(GPAC_USE_OGL_ES)
-    if (needs_stride)
-        glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
+	if (needs_stride)
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
 #else
-    u32 i;
-    if (needs_stride) {
+	u32 i;
+	if (needs_stride) {
 #endif
 
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
@@ -839,37 +844,37 @@
 		glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, NULL);
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 	}
-	else 
+	else
 #endif
-	if (first_load) {
-		glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, data);
-	} else {
-		glTexSubImage2D(txh->tx_io->gl_type, 0, 0, 0, w, h, txh->tx_io->gl_format, txh->tx_io->gl_dtype, data);
-	}
+		if (first_load) {
+			glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, data);
+		} else {
+			glTexSubImage2D(txh->tx_io->gl_type, 0, 0, 0, w, h, txh->tx_io->gl_format, txh->tx_io->gl_dtype, data);
+		}
 
 #if !defined(GPAC_USE_OGL_ES)
-    if (needs_stride)
-        glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-    return;
+	if (needs_stride)
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+	return;
 #else
-	}
+}
 
-    if (!needs_stride)
-        return;
-
-    //no GL_UNPACK_ROW_LENGTH on GLES, push line by line ...
-    if (first_load) {
-        glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, NULL);
-    }
-    for (i=0; i<h; i++) {
-        u8 *ptr = data + i*stride;
-        glTexSubImage2D(txh->tx_io->gl_type, 0, 0, 0, w, 1, txh->tx_io->gl_format, txh->tx_io->gl_dtype, ptr);
-    }
+if (!needs_stride)
+	return;
+
+//no GL_UNPACK_ROW_LENGTH on GLES, push line by line ...
+if (first_load) {
+	glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, NULL);
+}
+for (i=0; i<h; i++) {
+	u8 *ptr = data + i*stride;
+	glTexSubImage2D(txh->tx_io->gl_type, 0, 0, 0, w, 1, txh->tx_io->gl_format, txh->tx_io->gl_dtype, ptr);
+}
 #endif
 }
 
 #endif
-    
+
 Bool gf_sc_texture_push_image(GF_TextureHandler *txh, Bool generate_mipmaps, Bool for2d)
 {
 #ifndef GPAC_DISABLE_3D
@@ -912,7 +917,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Texturing] Allocating OpenGL texture %d\n", txh->tx_io->id));
 	}
 	if (!txh->tx_io->gl_type) return 0;
-	
+
 	/*if data not yet ready don't push the texture*/
 	if (txh->data) {
 		/*convert image*/
@@ -969,7 +974,7 @@
 				pV = (u8 *) pU + txh->height*txh->stride/4;
 			}
 
-#ifndef GPAC_USE_OGL_ES 
+#ifndef GPAC_USE_OGL_ES
 			if (txh->pixelformat==GF_PIXEL_YV12_10) {
 				glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
 				//we use 10 bits but GL will normalise using 16 bits, so we need to multiply the nomralized result by 2^6
@@ -978,18 +983,18 @@
 #endif
 
 			push_time = gf_sys_clock();
-            
+
 			do_tex_image_2d(txh, tx_mode, first_load, pY, txh->stride, w, h, txh->tx_io->pbo_id);
-	GL_CHECK_ERR
+			GL_CHECK_ERR
 
 			glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
-            do_tex_image_2d(txh, tx_mode, first_load, pU, txh->stride/2, w/2, h/2, txh->tx_io->u_pbo_id);
-	GL_CHECK_ERR
-			
-            glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
-            do_tex_image_2d(txh, tx_mode, first_load, pV, txh->stride/2, w/2, h/2, txh->tx_io->v_pbo_id);
-	GL_CHECK_ERR
-            
+			do_tex_image_2d(txh, tx_mode, first_load, pU, txh->stride/2, w/2, h/2, txh->tx_io->u_pbo_id);
+			GL_CHECK_ERR
+
+			glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
+			do_tex_image_2d(txh, tx_mode, first_load, pV, txh->stride/2, w/2, h/2, txh->tx_io->v_pbo_id);
+			GL_CHECK_ERR
+
 			push_time = gf_sys_clock() - push_time;
 
 			if (txh->nb_frames==100) {
@@ -999,7 +1004,7 @@
 			txh->nb_frames ++;
 			txh->upload_time += push_time;
 
-#ifndef GPAC_USE_OGL_ES 
+#ifndef GPAC_USE_OGL_ES
 			if (txh->pixelformat==GF_PIXEL_YV12_10) {
 				glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 				glPixelTransferi(GL_RED_SCALE, 1);
@@ -1007,12 +1012,12 @@
 #endif
 
 #ifndef GPAC_DISABLE_LOGS
-		    gf_mo_get_object_time(txh->stream, &ck);
+			gf_mo_get_object_time(txh->stream, &ck);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[GL Texture] Texture (CTS %d) %d ms after due date - Pushed Y,U,V textures in %d ms - average push time %d ms (PBO enabled %s)\n", txh->last_frame_time, ck - txh->last_frame_time, push_time, txh->upload_time / txh->nb_frames, txh->tx_io->pbo_pushed ? "yes" : "no"));
 #endif
 			txh->tx_io->pbo_pushed = 0;
 		} else {
-            do_tex_image_2d(txh, tx_mode, first_load, (u8 *) data, txh->stride, w, h, txh->tx_io->pbo_id);
+			do_tex_image_2d(txh, tx_mode, first_load, (u8 *) data, txh->stride, w, h, txh->tx_io->pbo_id);
 			txh->tx_io->pbo_pushed = 0;
 		}
 	} else {
@@ -1020,7 +1025,7 @@
 #ifdef GPAC_HAS_GLU
 		if (!txh->compositor->disable_glu_scale) {
 			gluScaleImage(txh->tx_io->gl_format, txh->width, txh->height, txh->tx_io->gl_dtype, data, txh->tx_io->rescale_width, txh->tx_io->rescale_height, txh->tx_io->gl_dtype, txh->tx_io->scale_data);
-		} else 
+		} else
 #endif
 		{
 			/*it appears gluScaleImage is quite slow - use ourt own resampler which is not as nice but a but faster*/
@@ -1085,7 +1090,7 @@
 		glGenTextures(1, &txh->tx_io->id);
 		tx_setup_format(txh);
 	}
-	
+
 	tx_bind(txh);
 	glCopyTexImage2D(txh->tx_io->gl_type, 0, txh->tx_io->gl_format, 0, 0, txh->width, txh->height, 0);
 	glDisable(txh->tx_io->gl_type);
@@ -1108,44 +1113,44 @@
 		glReadPixels(0, 0, txh->width, txh->height, GL_RGBA, GL_UNSIGNED_BYTE, txh->data);
 	} else if (txh->pixelformat==GF_PIXEL_RGB_24) {
 		glReadPixels(0, 0, txh->width, txh->height, GL_RGB, GL_UNSIGNED_BYTE, txh->data);
-	} 
+	}
 #ifdef GF_SR_USE_DEPTH
 	else if (txh->pixelformat==GF_PIXEL_RGBDS) {
 		/*we'll work with one alpha bit (=shape). we'll take the heaviest weighted as this threshold*/
 		glReadPixels(0, 0, txh->width, txh->height, GL_RGBA, GL_UNSIGNED_BYTE, txh->data);
-	
+
 		/*NOTES on OpenGL's z-buffer perspective inversion:
 		 * option 1: extract float depth buffer, undoing depth perspective transform PIXEL per PIXEL and then
 		 * convert to byte (computationally costly)
-		 * 
+		 *
 		 * option 2: use gain and offset to make up an approximation of the linear z-buffer (the original)
 		 * it can be achieved by scaling the interval where the inflection point is located
 		 * i.e. z' = G*z - (G - 1), the offset so that z still belongs to [0..1]*
 		 */
-		
-		//glPixelTransferf(GL_DEPTH_SCALE, txh->compositor->OGLDepthGain); 
-		//glPixelTransferf(GL_DEPTH_BIAS, txh->compositor->OGLDepthOffset); 
-		
+
+		//glPixelTransferf(GL_DEPTH_SCALE, txh->compositor->OGLDepthGain);
+		//glPixelTransferf(GL_DEPTH_BIAS, txh->compositor->OGLDepthOffset);
+
 #ifndef GPAC_USE_OGL_ES
-		/*obtain depthmap*/ 
+		/*obtain depthmap*/
 		if (!txh->tx_io->depth_data) txh->tx_io->depth_data = (char*)gf_malloc(sizeof(char)*txh->width*txh->height);
 		glReadPixels(0, 0, txh->width, txh->height, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, txh->tx_io->depth_data);
-	    /*	depth = alpha & 0xfe 
+		/*	depth = alpha & 0xfe
 		    shape = plan alpha & 0x01 */
 
 		/*this corresponds to the RGBDS ordering*/
 		for (i=0; i<txh->height*txh->width; i++) {
 			u8 alpha;
-                        //inversion
-			u8 ds = (char) (255 - (int)txh->tx_io->depth_data[i]); 
+			//inversion
+			u8 ds = (char) (255 - (int)txh->tx_io->depth_data[i]);
 			/*get alpha*/
 			alpha = (txh->data[i*4 + 3]);
 
 			/* if heaviest-weighted alpha bit is set (>128) , turn on shape bit*/
 			//if (ds & 0x80) depth |= 0x01;
 			if (alpha & 0x80) ds = (ds >> 1) | 0x80;
-            else ds = 0x0;
-			txh->data[i*4+3] = ds; /*insert depth onto alpha*/ 
+			else ds = 0x0;
+			txh->data[i*4+3] = ds; /*insert depth onto alpha*/
 		}
 #endif
 
@@ -1161,7 +1166,7 @@
 		memcpy(txh->data + (txh->height - 1 - i) * txh->stride, tmp, txh->stride);
 	}
 	gf_free(tmp);
-                //dump depth and rgbds texture
+	//dump depth and rgbds texture
 
 }
 #else
@@ -1188,16 +1193,15 @@
 		ret = 1;
 	}
 
-	/*WATCHOUT: GL_TEXTURE_RECTANGLE coords are w, h not 1.0, 1.0*/
+	/*WATCHOUT: GL_TEXTURE_RECTANGLE coords are w, h not 1.0, 1.0 (but not with shaders, we do the txcoord conversion in the fragment shader*/
 	if (txh->tx_io->flags & TX_IS_RECT) {
-		if (!for_picking) {
+#ifndef GPAC_DISABLE_3D
+		if (!for_picking && !txh->tx_io->yuv_shader) {
 			gf_mx_add_scale(mx, INT2FIX(txh->width), INT2FIX(txh->height), FIX_ONE);
-//			gf_mx_add_translation(mx, 0, INT2FIX(txh->height), 0);
+			ret = 1;
 		}
-		/*disable any texture transforms when using RECT textures (no repeat) ??*/
-		/*tx_transform = NULL;*/
-		ret = 1;
-	} 
+#endif
+	}
 	else if (txh->tx_io->flags & TX_EMULE_POW2) {
 #ifndef GPAC_DISABLE_3D
 		gf_mx_add_scale(mx, txh->tx_io->conv_wscale, txh->tx_io->conv_hscale, FIX_ONE);
@@ -1217,14 +1221,15 @@
 			GF_Matrix2D mat;
 			M_TextureTransform *tt = (M_TextureTransform *)tx_transform;
 			gf_mx2d_init(mat);
-			/*1- translate*/
-			gf_mx2d_add_translation(&mat, tt->translation.x, tt->translation.y);
-			/*2- rotate*/
-			if (fabs(tt->rotation) > FIX_EPSILON) gf_mx2d_add_rotation(&mat, tt->center.x, tt->center.y, tt->rotation);
-			/*3- centered-scale*/
+
+			/*cf VRML spec:  Tc' = -C × S × R × C × T × Tc*/
 			gf_mx2d_add_translation(&mat, -tt->center.x, -tt->center.y);
 			gf_mx2d_add_scale(&mat, tt->scale.x, tt->scale.y);
+			if (fabs(tt->rotation) > FIX_EPSILON) gf_mx2d_add_rotation(&mat, tt->center.x, tt->center.y, tt->rotation);
 			gf_mx2d_add_translation(&mat, tt->center.x, tt->center.y);
+
+			gf_mx2d_add_translation(&mat, tt->translation.x, tt->translation.y);
+
 			if (ret) {
 				gf_mx_from_mx2d(&tmp, &mat);
 				gf_mx_add_matrix(mx, &tmp);
@@ -1233,13 +1238,15 @@
 			}
 			ret = 1;
 		}
-			break;
+		break;
 		case TAG_MPEG4_TransformMatrix2D:
 		{
 			M_TransformMatrix2D *tm = (M_TransformMatrix2D *)tx_transform;
 			memset(tmp.m, 0, sizeof(Fixed)*16);
-			tmp.m[0] = tm->mxx; tmp.m[4] = tm->mxy; /*0*/ tmp.m[12] = tm->tx;
-			tmp.m[1] = tm->myx; tmp.m[5] = tm->myy; /*0*/ tmp.m[13] = tm->ty;
+			tmp.m[0] = tm->mxx;
+			tmp.m[4] = tm->mxy; /*0*/ tmp.m[12] = tm->tx;
+			tmp.m[1] = tm->myx;
+			tmp.m[5] = tm->myy; /*0*/ tmp.m[13] = tm->ty;
 			/*rest is all 0 excep both diag*/
 			tmp.m[10] = tmp.m[15] = FIX_ONE;
 
@@ -1250,7 +1257,7 @@
 			}
 			ret = 1;
 		}
-			break;
+		break;
 		default:
 			break;
 		}
@@ -1274,12 +1281,12 @@
 	MFFloat coefficients;
 #endif
 	M_MatteTexture *matte = (M_MatteTexture *)n;
-	
+
 
 	b_surf = gf_sc_texture_get_handler(matte->surfaceB);
-	
+
 	if (!b_surf || !b_surf->tx_io) return 0;
-	glEnable(GL_BLEND);	
+	glEnable(GL_BLEND);
 	tx_set_image(b_surf, 0);
 
 #if defined(GPAC_USE_TINYGL) || defined(GPAC_USE_OGL_ES)
@@ -1287,7 +1294,7 @@
 	return 1;
 #else
 
-/*To remove: gcc 4.6 introduces this warning*/
+	/*To remove: gcc 4.6 introduces this warning*/
 #if __GNUC__ == 4 && __GNUC_MINOR__ >= 6
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Waddress"
@@ -1296,7 +1303,7 @@
 		tx_bind(b_surf);
 		return 1;
 	}
-/*To remove: gcc 4.6 introduces this warning*/
+	/*To remove: gcc 4.6 introduces this warning*/
 #if __GNUC__ == 4 && __GNUC_MINOR__ == 6
 #pragma GCC diagnostic pop
 #endif
@@ -1311,7 +1318,7 @@
 
 	action = (matte->operation).buffer;
 	glDisable(GL_TEXTURE_2D);
-	
+
 	/* SCALE */
 	if (! strcmp(action,"SCALE") || !strcmp(action,"BIAS") ) {
 		TexEnvType operand;
@@ -1324,7 +1331,7 @@
 		texture[1] = (u8) FIX2INT( 255 * coefficients.vals[1]);
 		texture[2] = (u8) FIX2INT( 255 * coefficients.vals[2]);
 		texture[3] = 255;
-		if (coefficients.count >= 4) 
+		if (coefficients.count >= 4)
 			texture[3] = (u8) FIX2INT( 255 * coefficients.vals[3]);
 
 		glActiveTexture(GL_TEXTURE0);
@@ -1362,11 +1369,11 @@
 	/* CROSS_FADE */
 	if (! strcmp(action,"CROSS_FADE")) {
 		tmp = FIX2INT(255 * matte->fraction);
-		texture[0] = (unsigned char) tmp;  
+		texture[0] = (unsigned char) tmp;
 		texture[1] = (unsigned char) tmp;
 		texture[2] = (unsigned char) tmp;
 		texture[3] = (unsigned char) 255;					// donne l'alpha de l'image de sortie
-		
+
 		glActiveTexture(GL_TEXTURE0);
 		if (!matte_hdl->tx_io->id) {
 			glGenTextures(1, &matte_hdl->tx_io->id);
@@ -1379,9 +1386,9 @@
 		GLTEXPARAM( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,GL_REPEAT );
 		GLTEXPARAM( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,GL_REPEAT );
 		glTexImage2D(GL_TEXTURE_2D,0,GL_RGBA,1,1,0,GL_RGBA,GL_UNSIGNED_BYTE,texture);
-		
+
 		/* fin de la g\E9n\E9ration de la texture donn\E9e par la fraction ! */
-		
+
 		/* m\E9lange effectif des textures ! } */
 		glActiveTexture(GL_TEXTURE1);
 		tx_bind(b_surf);
@@ -1398,9 +1405,9 @@
 			GLTEXENV(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
 			GLTEXENV(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE0  );
 			GLTEXENV(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
-		}	
+		}
 		return 3;
-	}	
+	}
 	/* end CROSS_FADE */
 
 	/*REVEAL */
@@ -1417,7 +1424,7 @@
 			glActiveTexture(GL_TEXTURE2);
 			tx_set_image(a_surf, 0);
 			tx_bind(a_surf);
-			
+
 			GLTEXENV(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
 			GLTEXENV(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
 			GLTEXENV(GL_TEXTURE_ENV, GL_SOURCE0_RGB , GL_TEXTURE0);
@@ -1426,7 +1433,7 @@
 			GLTEXENV(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
 			GLTEXENV(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE1);
 			GLTEXENV(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-			
+
 		}
 		return 3;
 	}
@@ -1454,7 +1461,7 @@
 	if (!strcmp(action,"REPLACE_ALPHA")) {
 		glActiveTexture(GL_TEXTURE0);
 		tx_bind(b_surf);
-		
+
 		if (alpha_surf) {
 			glEnable(GL_BLEND);
 			glActiveTexture(GL_TEXTURE1);
@@ -1618,16 +1625,16 @@
 	if (txh->matteTexture) {
 		u32 ret = gf_sc_texture_enable_matte_texture(txh->matteTexture);
 		if (!ret) return 0;
-		visual_3d_set_matrix_mode(compositor->visual, V3D_MATRIX_TEXTURE);
-		if (gf_sc_texture_get_transform(txh, tx_transform, &mx, 0)) 
-			visual_3d_matrix_load(compositor->visual, mx.m);
+
+		if (gf_sc_texture_get_transform(txh, tx_transform, &mx, 0))
+			visual_3d_set_texture_matrix(compositor->visual, &mx);
 		else
-			visual_3d_matrix_reset(compositor->visual);
-		visual_3d_set_matrix_mode(compositor->visual, V3D_MATRIX_MODELVIEW);
+			visual_3d_set_texture_matrix(compositor->visual, NULL);
+
 		return ret;
 	}
 #endif
-	if (!txh || !txh->tx_io) 
+	if (!txh || !txh->tx_io)
 		return 0;
 
 	if (txh->compute_gradient_matrix && gf_sc_texture_needs_reload(txh) ) {
@@ -1636,33 +1643,43 @@
 
 	tx_set_image(txh, 0);
 
-	visual_3d_set_matrix_mode(compositor->visual, V3D_MATRIX_TEXTURE);
 	if (bounds && txh->compute_gradient_matrix) {
 		GF_Matrix2D mx2d;
 		txh->compute_gradient_matrix(txh, bounds, &mx2d, 1);
 		gf_mx_from_mx2d(&mx, &mx2d);
-		visual_3d_matrix_load(compositor->visual, mx.m);
+		visual_3d_set_texture_matrix(compositor->visual, &mx);
 	}
 	else if (gf_sc_texture_get_transform(txh, tx_transform, &mx, 0)) {
-		visual_3d_matrix_load(compositor->visual, mx.m);
+		visual_3d_set_texture_matrix(compositor->visual, &mx);
 	} else {
-		visual_3d_matrix_reset(compositor->visual);
+		visual_3d_set_texture_matrix(compositor->visual, NULL);
 	}
-	visual_3d_set_matrix_mode(compositor->visual, V3D_MATRIX_MODELVIEW);
 
 	txh->flags |= GF_SR_TEXTURE_USED;
 
 #ifndef GPAC_USE_OGL_ES
 	if (txh->tx_io->yuv_shader) {
+		GLint loc;
 		/*use our program*/
 		Bool is_rect = txh->tx_io->flags & TX_IS_RECT;
 		compositor->visual->current_texture_glsl_program = is_rect ? compositor->visual->yuv_rect_glsl_program : compositor->visual->yuv_glsl_program;
-	GL_CHECK_ERR
+		GL_CHECK_ERR
 		glUseProgram(compositor->visual->current_texture_glsl_program);
-	GL_CHECK_ERR
+		GL_CHECK_ERR
 
 		glEnable(txh->tx_io->gl_type);
-		
+
+		loc = glGetUniformLocation(compositor->visual->current_texture_glsl_program, "width");
+		if (loc >=0) {
+			GLfloat w = (GLfloat) txh->width;
+			glUniform1f(loc, w);
+		}
+		loc = glGetUniformLocation(compositor->visual->current_texture_glsl_program, "height");
+		if (loc >= 0) {
+			GLfloat h = (GLfloat) txh->height;
+			glUniform1f(loc, h);
+		}
+
 		glActiveTexture(GL_TEXTURE2);
 		glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
 
@@ -1671,12 +1688,12 @@
 
 		glActiveTexture(GL_TEXTURE0 );
 		glBindTexture(txh->tx_io->gl_type, txh->tx_io->id);
-		
+
 		tx_bind_with_mode(txh, txh->transparent, txh->tx_io->blend_mode, 1);
 		glClientActiveTexture(GL_TEXTURE0);
-	} else 
+	} else
 #endif
-    {
+	{
 		tx_bind(txh);
 	}
 	return 1;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -145,9 +145,9 @@
 	while (ctx && ctx->drawable) {
 		/*remove visual registration flag*/
 		ctx->drawable->flags &= ~DRAWABLE_REGISTERED_WITH_VISUAL;
-		if (is_root_visual && (ctx->flags & CTX_HAS_APPEARANCE)) 
+		if (is_root_visual && (ctx->flags & CTX_HAS_APPEARANCE))
 			gf_node_dirty_reset(ctx->appear, 0);
-	
+
 #ifndef GPAC_DISABLE_3D
 		/*this may happen when switching a visual from 2D to 3D - discard context*/
 		if (visual->type_3d) ctx->drawable=NULL;
@@ -159,14 +159,14 @@
 	if (!is_root_visual) return;
 
 	/*reset all flags of all appearance nodes registered on all visuals but main one (done above)
-	this must be done once all visuals have been drawn, otherwise we won't detect the changes 
+	this must be done once all visuals have been drawn, otherwise we won't detect the changes
 	for nodes drawn on several visuals*/
 	count = gf_list_count(visual->compositor->visuals);
 	for (i=1; i<count; i++) {
 		GF_VisualManager *a_vis = gf_list_get(visual->compositor->visuals, i);
 		ctx = a_vis->context;
 		while (ctx && ctx->drawable) {
-			if (ctx->flags & CTX_HAS_APPEARANCE) 
+			if (ctx->flags & CTX_HAS_APPEARANCE)
 				gf_node_dirty_reset(ctx->appear, 0);
 
 			ctx->drawable = NULL;
@@ -208,9 +208,15 @@
 	size.x = size.y = -FIX_ONE;
 #ifndef GPAC_DISABLE_VRML
 	switch (gf_node_get_tag(self)) {
-	case TAG_MPEG4_Layer2D: size = ((M_Layer2D *)self)->size; break;
-	case TAG_MPEG4_Layer3D: size = ((M_Layer3D *)self)->size; break;
-	case TAG_MPEG4_Form: size = ((M_Form *)self)->size; break;
+	case TAG_MPEG4_Layer2D:
+		size = ((M_Layer2D *)self)->size;
+		break;
+	case TAG_MPEG4_Layer3D:
+		size = ((M_Layer3D *)self)->size;
+		break;
+	case TAG_MPEG4_Form:
+		size = ((M_Form *)self)->size;
+		break;
 	}
 #endif
 	if ((size.x>=0) && (size.y>=0)) {
@@ -231,7 +237,7 @@
 		tr_state->bounds = gf_rect_center(0,0);
 
 		/*we hit the target node*/
-		if (children->node == tr_state->for_node) 
+		if (children->node == tr_state->for_node)
 			tr_state->abort_bounds_traverse = 1;
 
 		gf_node_traverse(children->node, tr_state);
@@ -244,7 +250,7 @@
 		gf_mx2d_apply_rect(&tr_state->transform, &tr_state->bounds);
 		gf_rect_union(&rc, &tr_state->bounds);
 		children = children->next;
-		if (child_idx) 
+		if (child_idx)
 			break;
 	}
 
@@ -258,7 +264,7 @@
 				tr_state->bounds = gf_rect_center(0,0);
 
 				/*we hit the target node*/
-				if (iri == tr_state->for_node) 
+				if (iri == tr_state->for_node)
 					tr_state->abort_bounds_traverse = 1;
 
 				gf_node_traverse(iri, tr_state);
@@ -274,7 +280,7 @@
 		}
 	}
 #endif
-	
+
 	gf_mx2d_copy(tr_state->transform, cur_mx);
 	if (self != tr_state->for_node) {
 		gf_mx2d_apply_rect(&tr_state->transform, &rc);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,7 +35,7 @@
 #include "visual_manager_3d.h"
 
 
-enum 
+enum
 {
 	GF_3D_STEREO_NONE = 0,
 	GF_3D_STEREO_TOP,
@@ -54,7 +54,7 @@
 	GF_3D_STEREO_5VSP19,
 };
 
-enum 
+enum
 {
 	GF_3D_CAMERA_STRAIGHT = 0,
 	GF_3D_CAMERA_OFFAXIS,
@@ -96,7 +96,7 @@
 	GF_RectArray to_redraw;
 	u32 draw_node_index;
 
-	/*display list (list of drawable context). The first context with no drawable attached to 
+	/*display list (list of drawable context). The first context with no drawable attached to
 	it (ctx->drawable==NULL) marks the end of the display list*/
 	DrawableContext *context, *cur_context;
 
@@ -124,10 +124,11 @@
 
 	/*clear given rect or all visual if no rect specified - clear color depends on visual's type:
 		BackColor for background nodes
-		0x00000000 for composite, 
+		0x00000000 for composite,
 		compositor clear color otherwise
+		offscreen_clear is set to 1 when the clear targets the canvas buffer in hybrid GL mode
 	*/
-	void (*ClearSurface)(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor);
+	void (*ClearSurface)(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, Bool offscreen_clear);
 	/*draws specified texture as flat bitmap*/
 	Bool (*DrawBitmap)(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx, GF_ColorKey *col_key);
 
@@ -149,10 +150,10 @@
 
 #ifndef GPAC_DISABLE_3D
 	/*
-	 *	Visual Manager part for 3D drawing 
+	 *	Visual Manager part for 3D drawing
 	 */
 
-#if defined( _LP64 ) && 0 && defined(CONFIG_DARWIN_GL)
+#if defined( _LP64 ) && defined(CONFIG_DARWIN_GL)
 #define GF_SHADERID u64
 #else
 #define GF_SHADERID u32
@@ -193,13 +194,44 @@
 	GF_Mesh *autostereo_mesh;
 	GF_SHADERID autostereo_glsl_program;
 	GF_SHADERID autostereo_glsl_fragment;
-	
+
 	GF_SHADERID yuv_glsl_program;
 	GF_SHADERID yuv_glsl_fragment;
 	GF_SHADERID yuv_rect_glsl_program;
 	GF_SHADERID yuv_rect_glsl_fragment;
 
 	GF_SHADERID current_texture_glsl_program;
+
+
+	Bool has_material_2d;
+	SFColorRGBA mat_2d;
+
+	Bool has_material;
+	SFColorRGBA materials[4];
+	Float shininess;
+
+	Bool state_light_on, state_blend_on, state_color_on;
+
+	GF_ClipInfo clippers[GF_MAX_GL_CLIPS];
+
+	Bool has_tx_matrix;
+	GF_Matrix tx_matrix;
+
+	Bool needs_projection_matrix_reload;
+
+	GF_LightInfo lights[GF_MAX_GL_LIGHTS];
+	Bool has_inactive_lights;
+
+	Bool has_fog;
+	u32 fog_type;
+	SFColor fog_color;
+	Fixed fog_density, fog_visibility;
+
+
+	GF_SHADERID glsl_vertex;
+	GF_SHADERID glsl_fragment;
+	GF_SHADERID glsl_program;
+
 #endif
 
 #ifdef GF_SR_USE_DEPTH

gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_2d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager_2d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -44,30 +44,33 @@
 void gf_irect_intersect(GF_IRect *rc1, GF_IRect *rc2)
 {
 	if (! gf_irect_overlaps(rc1, rc2)) {
-		rc1->width = rc1->height = 0; 
+		rc1->width = rc1->height = 0;
 		return;
 	}
 	if (rc2->x > rc1->x) {
 		rc1->width -= rc2->x - rc1->x;
 		rc1->x = rc2->x;
-	} 
+	}
 	if (rc2->x + rc2->width < rc1->x + rc1->width) {
 		rc1->width = rc2->width + rc2->x - rc1->x;
-	} 
+	}
 	if (rc2->y < rc1->y) {
-		rc1->height -= rc1->y - rc2->y; 
+		rc1->height -= rc1->y - rc2->y;
 		rc1->y = rc2->y;
-	} 
+	}
 	if (rc2->y - rc2->height > rc1->y - rc1->height) {
 		rc1->height = rc1->y - rc2->y + rc2->height;
-	} 
+	}
 }
 
 
 GF_Rect gf_rect_ft(GF_IRect *rc)
 {
 	GF_Rect rcft;
-	rcft.x = INT2FIX(rc->x); rcft.y = INT2FIX(rc->y); rcft.width = INT2FIX(rc->width); rcft.height = INT2FIX(rc->height); 
+	rcft.x = INT2FIX(rc->x);
+	rcft.y = INT2FIX(rc->y);
+	rcft.width = INT2FIX(rc->width);
+	rcft.height = INT2FIX(rc->height);
 	return rcft;
 }
 
@@ -147,7 +150,7 @@
 		gf_free(it);
 		break;
 	}
-	
+
 	ctx = visual->context;
 	while (ctx && ctx->drawable) {
 		/*remove visual registration flag*/
@@ -228,6 +231,10 @@
 	}
 #endif
 
+#ifndef GPAC_DISABLE_3D
+	gf_mx_init(tr_state->model_matrix);
+#endif
+
 	visual->top_clipper = gf_rect_pixelize(&rc);
 	tr_state->clipper = rc;
 //	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Cliper setup - %d:%d@%dx%d\n", visual->top_clipper.x, visual->top_clipper.y, visual->top_clipper.width, visual->top_clipper.height));
@@ -243,7 +250,7 @@
 	M_Background2D *bck;
 #endif
 	u32 draw_mode;
-	
+
 	/*reset display list*/
 	visual->cur_context = visual->context;
 	if (visual->context) visual->context->drawable = NULL;
@@ -251,7 +258,7 @@
 	visual->has_overlays = 0;
 
 	visual_2d_setup_projection(visual, tr_state);
-	if (!visual->top_clipper.width || !visual->top_clipper.height) 
+	if (!visual->top_clipper.width || !visual->top_clipper.height)
 		return GF_OK;
 
 	tr_state->traversing_mode = TRAVERSE_SORT;
@@ -259,7 +266,7 @@
 
 	/*setup raster surface, brush and pen */
 	e = visual_2d_init_raster(visual);
-	if (e) 
+	if (e)
 		return e;
 
 	draw_mode = 0;
@@ -279,7 +286,7 @@
 		/*node was not drawn on this visual*/
 		if (!drawable_flush_bounds(it->drawable, visual, draw_mode)) {
 			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 */
 			drawable_reset_bounds(it->drawable, visual);
 
@@ -320,12 +327,12 @@
 			tr_state->traversing_mode = TRAVERSE_SORT;
 			ctx->flags &= ~CTX_BACKROUND_NOT_LAYER;
 		} else {
-			visual->ClearSurface(visual, NULL, 0);
+			visual->ClearSurface(visual, NULL, 0, 0);
 		}
 	} else
 #endif
 	{
-		visual->ClearSurface(visual, NULL, 0);
+		visual->ClearSurface(visual, NULL, 0, 0);
 	}
 	return GF_OK;
 }
@@ -333,7 +340,7 @@
 
 
 /*@rc2 fully contained in @rc1*/
-Bool gf_irect_inside(GF_IRect *rc1, GF_IRect *rc2) 
+Bool gf_irect_inside(GF_IRect *rc1, GF_IRect *rc2)
 {
 	if (!rc1->width || !rc1->height) return 0;
 	if ( (rc1->x <= rc2->x)  && (rc1->y >= rc2->y)  && (rc1->x + rc1->width >= rc2->x + rc2->width) && (rc1->y - rc1->height <= rc2->y - rc2->height) )
@@ -349,9 +356,12 @@
 #define ra_is_empty(ra) (!((ra)->count))
 
 /*adds @rc2 to @rc1 - the new @rc1 contains the old @rc1 and @rc2*/
-void gf_irect_union(GF_IRect *rc1, GF_IRect *rc2) 
+void gf_irect_union(GF_IRect *rc1, GF_IRect *rc2)
 {
-	if (!rc1->width || !rc1->height) {*rc1=*rc2; return;}
+	if (!rc1->width || !rc1->height) {
+		*rc1=*rc2;
+		return;
+	}
 
 	if (rc2->x < rc1->x) {
 		rc1->width += rc1->x - rc2->x;
@@ -367,19 +377,19 @@
 
 
 /*adds rectangle to the list performing union test*/
-void ra_union_rect(GF_RectArray *ra, GF_IRect *rc) 
+void ra_union_rect(GF_RectArray *ra, GF_IRect *rc)
 {
 	u32 i;
 
 	assert(rc->width && rc->height);
 
-	for (i=0; i<ra->count; i++) { 
-		if (gf_irect_overlaps(&ra->list[i].rect, rc)) { 
-			gf_irect_union(&ra->list[i].rect, rc); 
-			return; 
-		} 
+	for (i=0; i<ra->count; i++) {
+		if (gf_irect_overlaps(&ra->list[i].rect, rc)) {
+			gf_irect_union(&ra->list[i].rect, rc);
+			return;
+		}
 	}
-	ra_add(ra, rc); 
+	ra_add(ra, rc);
 }
 
 /*returns relation between rc1 and rc2:
@@ -406,6 +416,7 @@
 void ra_refresh(GF_RectArray *ra)
 {
 	u32 i, j, k;
+restart:
 	for (i=0; i<ra->count; i++) {
 		for (j=i+1; j<ra->count; j++) {
 			switch (gf_irect_relation(&ra->list[j].rect, &ra->list[i].rect)) {
@@ -417,7 +428,7 @@
 				/*current dirty rect is no longer opaque*/
 				ra->list[i].opaque_node_index = 0;
 #endif
-				/*FALLTHROUGH*/
+			/*FALLTHROUGH*/
 			/*first rectangle covers second, just remove*/
 			case 2:
 				/*remove rect*/
@@ -425,9 +436,9 @@
 				if (k) {
 					memmove(&ra->list[j], & ra->list[j+1], sizeof(GF_IRect)*k);
 				}
-				ra->count--; 
+				ra->count--;
 				if (ra->count>=2)
-					ra_refresh(ra);
+					goto restart;
 				return;
 			default:
 				break;
@@ -463,23 +474,23 @@
 		if ((*first_opaque==NULL) && needs_redraw) *first_opaque = ctx;
 	}
 
-	for (i=0; i<ra->count; i++) { 
+	for (i=0; i<ra->count; i++) {
 		if (needs_redraw) {
-			switch (gf_irect_relation(&ra->list[i].rect, rc)) { 
+			switch (gf_irect_relation(&ra->list[i].rect, rc)) {
 			/*context intersects an existing rectangle, merge them and remove opaque idx info*/
 			case 1:
-				gf_irect_union(&ra->list[i].rect, rc); 
+				gf_irect_union(&ra->list[i].rect, rc);
 #ifdef TRACK_OPAQUE_REGIONS
-				ra->list[i].opaque_node_index = 0; 
+				ra->list[i].opaque_node_index = 0;
 #endif
-				return 1; 
+				return 1;
 			/*context covers an existing rectangle, replace rect and add opaque idx info*/
 			case 2:
-				ra->list[i].rect= *rc; 
+				ra->list[i].rect= *rc;
 #ifdef TRACK_OPAQUE_REGIONS
-				ra->list[i].opaque_node_index = is_transparent ? 0 : ctx_idx; 
+				ra->list[i].opaque_node_index = is_transparent ? 0 : ctx_idx;
 #endif
-				return 1; 
+				return 1;
 			}
 		}
 #ifdef TRACK_OPAQUE_REGIONS
@@ -490,16 +501,16 @@
 			if (k) {
 				memmove(&ra->list[i], & ra->list[i+1], sizeof(GF_RectArrayEntry)*k);
 			}
-			ra->count--; 
+			ra->count--;
 			i--;
 		}
 #endif
 	}
 	/*not found, add rect*/
 	if (needs_redraw) {
-		ra_add(ra, rc); 
+		ra_add(ra, rc);
 #ifdef TRACK_OPAQUE_REGIONS
-		ra->list[ra->count-1].opaque_node_index = is_transparent ? 0 : ctx_idx; 
+		ra->list[ra->count-1].opaque_node_index = is_transparent ? 0 : ctx_idx;
 #endif
 	}
 	return 1;
@@ -513,31 +524,31 @@
 
 #ifdef TRACK_OPAQUE_REGIONS
 	u32 i;
-	for (i=0; i<ra->count; i++) { 
-		switch (gf_irect_relation(rc, &ra->list[i].rect)) { 
+	for (i=0; i<ra->count; i++) {
+		switch (gf_irect_relation(rc, &ra->list[i].rect)) {
 		/*dirty area intersects this dirty rectangle, merge them and remove opaque idx info*/
 		case 1:
-			gf_irect_union(&ra->list[i].rect, rc); 
-			ra->list[i].opaque_node_index = 0; 
-			return; 
+			gf_irect_union(&ra->list[i].rect, rc);
+			ra->list[i].opaque_node_index = 0;
+			return;
 		/*dirty area is covered by this dirty rectangle, nothing to do*/
 		case 2:
-			return; 
+			return;
 		}
 	}
 #endif
 	/*not found, add rect*/
-	ra_add(ra, rc); 
+	ra_add(ra, rc);
 #ifdef TRACK_OPAQUE_REGIONS
-	ra->list[ra->count-1].opaque_node_index = 0; 
+	ra->list[ra->count-1].opaque_node_index = 0;
 #endif
 
 #else
 
-	ra_add(ra, rc); 
+	ra_add(ra, rc);
 
 #ifdef TRACK_OPAQUE_REGIONS
-	ra->list[ra->count-1].opaque_node_index = 0; 
+	ra->list[ra->count-1].opaque_node_index = 0;
 #endif
 
 #endif
@@ -598,14 +609,14 @@
 			}
 			visual->last_had_back = (bck_ctx->aspect.fill_texture && !bck_ctx->aspect.fill_texture->transparent) ? 2 : 1;
 		}
-	} else 
+	} else
 #endif
-	if (visual->last_had_back) {
-		visual->last_had_back = 0;
-		if (redraw_all_on_background_change) redraw_all = 1;
-		else hyb_force_redraw = 1;
-	}
-	
+		if (visual->last_had_back) {
+			visual->last_had_back = 0;
+			if (redraw_all_on_background_change) redraw_all = 1;
+			else hyb_force_redraw = 1;
+		}
+
 	num_nodes = 0;
 	ctx = visual->context;
 	while (ctx && ctx->drawable) {
@@ -674,7 +685,7 @@
 		ra_refresh(&visual->to_redraw);
 
 		if (visual->compositor->debug_defer) {
-			visual->ClearSurface(visual, &visual->top_clipper, 0);
+			visual->ClearSurface(visual, &visual->top_clipper, 0, 0);
 		}
 	}
 
@@ -700,6 +711,7 @@
 	if (bck_ctx) {
 		drawable_check_bounds(bck_ctx, visual);
 		tr_state->ctx = bck_ctx;
+		tr_state->appear = NULL;
 		visual->draw_node_index = 0;
 
 		/*force clearing entire zone, not just viewport, when using color. If texture, we MUST
@@ -714,7 +726,7 @@
 		bck_ctx->flags |= CTX_BACKROUND_NOT_LAYER;
 		gf_node_traverse(bck_ctx->drawable->node, tr_state);
 		bck_ctx->flags &= ~CTX_BACKROUND_NOT_LAYER;
-	} else 
+	} else
 #endif /*GPAC_DISABLE_VRML*/
 	{
 		count = visual->to_redraw.count;
@@ -725,11 +737,13 @@
 			if (visual->to_redraw.list[k].opaque_node_index > 0) continue;
 #endif
 			rc = visual->to_redraw.list[k].rect;
-			visual->ClearSurface(visual, &rc, 0);
+			visual->ClearSurface(visual, &rc, 0, 0);
 		}
+#ifndef GPAC_DISABLE_3D
 		if (!count && hyb_force_redraw) {
-			visual->ClearSurface(visual, NULL, 0);
+			compositor_2d_hybgl_clear_surface(tr_state->visual, NULL, 0, GF_FALSE);
 		}
+#endif
 	}
 	if (!redraw_all && !has_clear) visual->has_modif=0;
 
@@ -746,7 +760,7 @@
 		}
 	}
 #endif
-	
+
 	visual->draw_node_index = 0;
 
 	ctx = visual->context;
@@ -842,7 +856,7 @@
 
 	gf_mx2d_copy(tr_state->transform, backup);
 	res = visual_2d_terminate_draw(visual, tr_state);
-	
+
 #ifndef GPAC_DISABLE_LOG
 	if (!tr_state->immediate_draw) {
 		visual->compositor->indirect_draw_time = gf_sys_clock() - time;
@@ -869,7 +883,7 @@
 	tr_state->ray.dir.x = 0;
 	tr_state->ray.dir.y = 0;
 	tr_state->ray.dir.z = -FIX_ONE;
-	
+
 	visual->compositor->hit_world_point = tr_state->ray.orig;
 	visual->compositor->hit_world_ray = tr_state->ray;
 	visual->compositor->hit_square_dist = 0;

gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_2d.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager_2d.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -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 gf_rect_equal(rc1, rc2) ((rc1.width == rc2.width) && (rc1.height == rc2.height) && (rc1.x == rc2.x)  && (rc1.y == rc2.y))
 
 //#define TRACK_OPAQUE_REGIONS
 
@@ -42,7 +42,7 @@
 #define RA_DEFAULT_STEP	10
 
 typedef struct
-{	
+{
 	GF_IRect rect;
 #ifdef TRACK_OPAQUE_REGIONS
 	/*list of nodes covering (no transparency) each rect, or 0 otherwise.*/
@@ -51,7 +51,7 @@
 } GF_RectArrayEntry;
 
 typedef struct
-{	
+{
 	GF_RectArrayEntry *list;
 	u32 count, alloc;
 } GF_RectArray;
@@ -94,7 +94,7 @@
 
 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);
+void visual_2d_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, Bool is_offscreen);
 
 /*gets a drawable context on this visual*/
 DrawableContext *visual_2d_get_drawable_context(GF_VisualManager *visual);
@@ -126,7 +126,7 @@
 
 
 /*video overlay context*/
-typedef struct _video_overlay 
+typedef struct _video_overlay
 {
 	struct _video_overlay *next;
 	GF_Window src, dst;
@@ -134,7 +134,7 @@
 	GF_RectArray ra;
 } GF_OverlayStack;
 
-/*check if the object is over an overlay. If so, adds its cliper to the list of rectangles to redraw for the overlay 
+/*check if the object is over an overlay. If so, adds its cliper to the list of rectangles to redraw for the overlay
 and returns 1 (in which case it shouldn't be drawn)*/
 Bool visual_2d_overlaps_overlay(GF_VisualManager *visual, DrawableContext *ctx, GF_TraverseState *tr_state);
 /*draw all partial overlays in software and all overlaping objects*/

gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_2d_draw.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager_2d_draw.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -44,7 +44,7 @@
 void visual_2d_release_raster(GF_VisualManager *visual)
 {
 	if (visual->raster_surface) {
-		if (visual->compositor->rasterizer->surface_flush) 
+		if (visual->compositor->rasterizer->surface_flush)
 			visual->compositor->rasterizer->surface_flush(visual->raster_surface);
 
 		visual->ReleaseSurfaceAccess(visual);
@@ -52,13 +52,13 @@
 }
 
 
-void visual_2d_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor)
+void visual_2d_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, Bool is_offscreen)
 {
 #ifdef SKIP_DRAW
 	return;
 #endif
 	if (!visual->is_attached) return;
-	
+
 	if (!BackColor && !visual->offscreen) {
 		if (!visual->compositor->user || !(visual->compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT)) {
 			BackColor = visual->compositor->back_color;
@@ -111,7 +111,7 @@
 
 			has_modif = GF_TRUE;
 		}
-	} 
+	}
 	/*indirect drawing, draw path in all dirty areas*/
 	else {
 		u32 i;
@@ -141,7 +141,7 @@
 	if (has_modif) {
 		visual->has_modif = 1;
 #ifndef GPAC_DISABLE_3D
-		if (!visual->offscreen && visual->compositor->hybrid_opengl && !is_erase) 
+		if (!visual->offscreen && visual->compositor->hybrid_opengl && !is_erase)
 			ra_union_rect(&visual->hybgl_drawn, &ctx->bi->clip);
 #endif
 	}
@@ -177,7 +177,7 @@
 static void visual_2d_get_texture_transform(GF_Node *__appear, GF_TextureHandler *txh, GF_Matrix2D *mat, Bool line_texture, Fixed final_width, Fixed final_height)
 {
 	u32 node_tag;
-	M_Appearance *appear;		
+	M_Appearance *appear;
 	GF_Node *txtrans = NULL;
 	gf_mx2d_init(*mat);
 
@@ -233,14 +233,14 @@
 	GF_Raster2D *raster = visual->compositor->rasterizer;
 
 	if (!txh) txh = ctx->aspect.fill_texture;
-	
+
 	gf_path_get_bounds(path, &rc);
 	if (!rc.width || !rc.height || !txh->tx_io) return;
 
 	if (orig_bounds) {
-		txh->compute_gradient_matrix(txh, orig_bounds, &g_mat, 0);	
+		txh->compute_gradient_matrix(txh, orig_bounds, &g_mat, 0);
 	} else {
-		txh->compute_gradient_matrix(txh, &rc, &g_mat, 0);	
+		txh->compute_gradient_matrix(txh, &rc, &g_mat, 0);
 	}
 	stencil = gf_sc_texture_get_stencil(txh);
 	if (!stencil) return;
@@ -258,11 +258,11 @@
 	if (orig_bounds) gf_mx2d_add_translation(&g_mat, (orig_bounds->x), (orig_bounds->y - orig_bounds->height));
 
 	gf_mx2d_add_matrix(&g_mat, &ctx->transform);
-	
+
 	raster->stencil_set_matrix(stencil, &g_mat);
 	raster->stencil_set_color_matrix(stencil, ctx->col_mat);
 
-	/*MPEG-4/VRML context or no fill info*/	
+	/*MPEG-4/VRML context or no fill info*/
 	if (ctx->flags & CTX_HAS_APPEARANCE || !ctx->aspect.fill_color)
 		raster->stencil_set_alpha(stencil, 0xFF);
 	else
@@ -300,18 +300,18 @@
 
 	/*get original bounds*/
 	orig_rc = *object_bounds;
-	
+
 	/*get scaling ratio so that active texture view is stretched to original bounds (std 2D shape texture mapping in MPEG4)*/
 	sS = gf_divfix(orig_rc.width, INT2FIX(txh->width));
 	sT = gf_divfix(orig_rc.height, INT2FIX(txh->height));
-	
+
 	gf_mx2d_init(gf_mx2d_txt);
 	gf_mx2d_add_scale(&gf_mx2d_txt, sS, sT);
 
 	/*move to bottom-left corner of bounds */
 	gf_mx2d_add_translation(&gf_mx2d_txt, (orig_rc.x), (orig_rc.y - orig_rc.height));
 
-	/*move to final coordinate system*/	
+	/*move to final coordinate system*/
 	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*/
@@ -351,7 +351,7 @@
 #ifndef GPAC_DISABLE_3D
 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_Matrix mx;
+	GF_Rect clipper;
 	u32 prev_mode = tr_state->traversing_mode;
 	u32 prev_type_3d = tr_state->visual->type_3d;
 
@@ -396,15 +396,10 @@
 						assert(nb_obj_left_on_canvas);
 						nb_obj_left_on_canvas--;
 					}
-				} 
+				}
 
 				//erase all part of the canvas below us
-				if (!tr_state->immediate_draw) {
-					visual_2d_draw_path_extended(visual, ctx->drawable->path, ctx, NULL, NULL, tr_state, NULL, NULL, GF_TRUE);
-					//this part of the canvas is now dirty for next pass !
-					if (!tr_state->immediate_draw) {
-					}
-				}
+				visual_2d_draw_path_extended(visual, ctx->drawable->path, ctx, NULL, NULL, tr_state, NULL, NULL, GF_TRUE);
 			}
 			ctx->bi->clip = rc;
 		}
@@ -423,20 +418,28 @@
 
 	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);
+	if (ctx->col_mat) gf_cmx_copy(&tr_state->color_mat, ctx->col_mat);//
 
 	tr_state->traversing_mode=TRAVERSE_DRAW_3D;
-	gf_mx_from_mx2d(&mx, &ctx->transform);
-	visual_3d_matrix_push(visual);
-	visual_3d_matrix_add(visual, mx.m);
+	gf_mx_from_mx2d(&tr_state->model_matrix, &ctx->transform);
+
+
+	clipper.x = INT2FIX(ctx->bi->clip.x);
+	clipper.y = INT2FIX(ctx->bi->clip.y);
+	clipper.width = INT2FIX(ctx->bi->clip.width);
+	clipper.height = INT2FIX(ctx->bi->clip.height);
+	visual_3d_set_clipper_2d(tr_state->visual, clipper, NULL, 1);
+
 	gf_node_allow_cyclic_traverse(ctx->drawable->node);
 	gf_node_traverse(ctx->drawable->node, tr_state);
-	visual_3d_matrix_pop(visual);
+
 	tr_state->visual->type_3d=prev_type_3d;
 	tr_state->traversing_mode=prev_mode;
 	if (ctx->col_mat) gf_cmx_init(&tr_state->color_mat);
 
 	ctx->flags |= CTX_PATH_FILLED;
+
+	visual_3d_reset_clipper_2d(tr_state->visual);
 }
 #endif
 
@@ -468,7 +471,7 @@
 		return;
 	}
 
-	
+
 #ifndef GPAC_DISABLE_3D
 	if (visual->compositor->hybrid_opengl) {
 		visual_2d_texture_path_opengl_auto(visual, path, txh, ctx, orig_bounds, ext_mx, tr_state);
@@ -484,9 +487,9 @@
 		if (!txh->width || !txh->height) {
 			gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat, &txh->is_flipped);
 			/*in case the node is an MPEG-4 bitmap, force stack rebuild at next frame */
-  			gf_node_dirty_set(ctx->drawable->node, GF_SG_NODE_DIRTY, 1);
+			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);
@@ -495,8 +498,8 @@
 				gf_sc_next_frame_state(visual->compositor, GF_SC_DRAW_FRAME);
 			}
 		}
-		
-			
+
+
 
 		return;
 	}
@@ -517,7 +520,7 @@
 	/*get scaling ratio so that active texture view is stretched to original bounds (std 2D shape texture mapping in MPEG4)*/
 	sS = orig_rc.width / txh->width;
 	sT = orig_rc.height / txh->height;
-	
+
 	gf_mx2d_init(mx_texture);
 	gf_mx2d_add_scale(&mx_texture, sS, sT);
 
@@ -535,7 +538,7 @@
 
 	if (ext_mx) gf_mx2d_add_matrix(&mx_texture, ext_mx);
 
-	/*move to final coordinate system (except background which is built directly in final coord system)*/	
+	/*move to final coordinate system (except background which is built directly in final coord system)*/
 	if (!(ctx->flags & CTX_IS_BACKGROUND) ) gf_mx2d_add_matrix(&mx_texture, &ctx->transform);
 
 	/*set path transform*/
@@ -568,7 +571,7 @@
 	raster->surface_set_path(visual->raster_surface, NULL);
 
 
-	
+
 	ctx->flags |= CTX_PATH_FILLED;
 }
 
@@ -608,7 +611,7 @@
 		return;
 	}
 
-	if (! (ctx->flags & CTX_IS_BACKGROUND) ) 
+	if (! (ctx->flags & CTX_IS_BACKGROUND) )
 		visual_2d_set_options(visual->compositor, visual->raster_surface, ctx->flags & CTX_IS_TEXT, ctx->flags & CTX_NO_ANTIALIAS);
 
 	dofill = dostrike = 0;
@@ -636,7 +639,7 @@
 #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);
-		} else 
+		} else
 #endif
 		{
 			/*push path*/
@@ -649,11 +652,11 @@
 	if (dostrike) {
 #if ADAPTATION_SIZE
 		if ((ctx->bi->clip.width<ADAPTATION_SIZE) && (ctx->bi->clip.height<ADAPTATION_SIZE)) {
-		} else 
+		} else
 #endif
 		{
 			StrikeInfo2D *si;
-			
+
 			if (!pen) {
 				pen = visual->raster_brush;
 				raster->stencil_set_brush_color(pen, ctx->aspect.line_color);
@@ -719,7 +722,7 @@
 	gf_path_add_line_to(path, rc->x+rc->width, rc->y);
 	gf_path_add_line_to(path, rc->x, rc->y);
 	gf_path_close(path);
-	
+
 
 	if (color) {
 		/*push path*/
@@ -736,7 +739,7 @@
 		pen.join = GF_LINE_JOIN_BEVEL;
 		pen.dash = GF_DASH_STYLE_DOT;
 		raster->stencil_set_brush_color(visual->raster_brush, strike_color);
-		outline = gf_path_get_outline(path,  pen);	
+		outline = gf_path_get_outline(path,  pen);
 		outline->flags &= ~GF_PATH_FILL_ZERO_NONZERO;
 		raster->surface_set_path(visual->raster_surface, outline);
 		visual_2d_fill_path(visual, ctx, visual->raster_brush, tr_state, 0);
@@ -790,7 +793,7 @@
 		pen.width = 2;
 		pen.align = GF_PATH_LINE_INSIDE;
 		pen.join = GF_LINE_JOIN_BEVEL;
-		outline = gf_path_get_outline(path, pen);	
+		outline = gf_path_get_outline(path, pen);
 		outline->flags &= ~GF_PATH_FILL_ZERO_NONZERO;
 
 		raster->surface_set_path(visual->raster_surface, outline);

gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_3d.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager_3d.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -63,6 +63,8 @@
 	GF_Matrix cur;
 	GF_Compositor *compositor = tr_state->visual->compositor;
 
+	if (compositor->disable_focus_highlight) return;
+
 	if (compositor->focus_node!=node) return;
 
 	hlight = compositor->focus_highlight;
@@ -86,7 +88,7 @@
 
 //		gf_sc_get_nodes_bounds(node, ((GF_ParentNode *)node)->children, tr_state, 1);
 		gf_node_traverse_children(node, tr_state);
-	
+
 		tr_state->traversing_mode = prev_mode;
 		gf_mx_copy(tr_state->model_matrix, cur);
 		bounds = &tr_state->bbox;
@@ -116,7 +118,7 @@
 	/*main visual, set AR*/
 	if (visual->compositor->visual==visual) {
 		if (tr_state->visual->compositor->has_size_info) {
-			tr_state->camera->vp.x = INT2FIX(tr_state->visual->compositor->vp_x); 
+			tr_state->camera->vp.x = INT2FIX(tr_state->visual->compositor->vp_x);
 			tr_state->camera->vp.y = INT2FIX(tr_state->visual->compositor->vp_y);
 			tr_state->camera->vp.width = INT2FIX(tr_state->visual->compositor->vp_width);
 			tr_state->camera->vp.height = INT2FIX(tr_state->visual->compositor->vp_height);
@@ -135,9 +137,9 @@
 			sh = INT2FIX(tr_state->visual->compositor->vp_height);
 			/*AR changed, rebuild camera*/
 
-			if (tr_state->visual->compositor->recompute_ar 
-				|| (sw!=tr_state->camera->vp.width) 
-				|| (sh!=tr_state->camera->vp.height)) { 
+			if (tr_state->visual->compositor->recompute_ar
+			        || (sw!=tr_state->camera->vp.width)
+			        || (sh!=tr_state->camera->vp.height)) {
 				tr_state->camera->width = tr_state->camera->vp.width = INT2FIX(tr_state->visual->compositor->vp_width);
 				tr_state->camera->height = tr_state->camera->vp.height = INT2FIX(tr_state->visual->compositor->vp_height);
 				tr_state->camera->flags |= CAM_IS_DIRTY;
@@ -176,36 +178,35 @@
 
 
 	/*update znear&zfar*/
-	tr_state->camera->z_near = tr_state->camera->avatar_size.x ; 
+	tr_state->camera->z_near = tr_state->camera->avatar_size.x ;
 
 	if (tr_state->camera->z_near<=0) tr_state->camera->z_near = FIX_ONE/2;
 	/*if pixel metrics, the default znear may be way too far and lead to weird navigation*/
 	else if (tr_state->camera->z_near>=FIX_ONE) tr_state->camera->z_near = FIX_ONE/2;
 	tr_state->camera->z_near /= 2;
-	tr_state->camera->z_far = tr_state->camera->visibility; 
+	tr_state->camera->z_far = tr_state->camera->visibility;
 
 	/*z_far is selected so that an object the size of the viewport measures
-	one pixel when located at the far plane. It can be found through the projection 
+	one pixel when located at the far plane. It can be found through the projection
 	transformation (projection matrix) of x and y
-		x transformation is: x'= (1/(ar*tg(fov/2)) )*x/z 
+		x transformation is: x'= (1/(ar*tg(fov/2)) )*x/z
 		y transformation is: y'=(1/(tg(fov/2)))*x/z
 
-	therefore when z=z_far and x=max(width/2, height/2), then 
+	therefore when z=z_far and x=max(width/2, height/2), then
 	x' = 1/max(vp_size.x, vp_size.y) (transformed OpenGL viewport measures one)
 
 	this yields z_far = max(vp_size.x, vp_size.y) * max(width/2, height/2) * max(1/(ar*tg(fov/2)), 1/tg(fov/2))
 		z_far = max(vp_size.x, vp_size.y) * max(width, height) / (2*min(1, ar)*tg(fov/2)) )
-	
+
 	to choose a z_far so that the size is more than one pixel, then z_far' = z_far/n_pixels*/
-	//if (tr_state->camera->z_far<=0) 
-	{
+	if (tr_state->camera->z_far<0) {
 		Fixed ar = gf_divfix(tr_state->vp_size.x, tr_state->vp_size.y);
 		if (ar>FIX_ONE) ar = FIX_ONE;
 		tr_state->camera->z_far = gf_muldiv(
-			MAX(tr_state->vp_size.x,tr_state->vp_size.y), 
-			MAX(tr_state->camera->width, tr_state->camera->height), 
-			gf_mulfix(ar*2, gf_tan(fieldOfView/2)) 
-		);
+		                              MAX(tr_state->vp_size.x,tr_state->vp_size.y),
+		                              MAX(tr_state->camera->width, tr_state->camera->height),
+		                              gf_mulfix(ar*2, gf_tan(fieldOfView/2))
+		                          );
 
 		/*fixed-point overflow*/
 		if (tr_state->camera->z_far <= tr_state->camera->z_near) {
@@ -224,14 +225,14 @@
 			gf_mx_apply_vec(&mx, &local_center);
 		}
 	}
-	/*default VP setup - this is undocumented in the spec. Default VP pos is (0, 0, 10) but not really nice 
+	/*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*/
 	else if (tr_state->pixel_metrics) {
 		position.z = gf_divfix(tr_state->camera->width, 2*gf_tan(fieldOfView/2) );
-	
+
 	}
 #ifdef GF_SR_USE_DEPTH
-    /* 3D world calibration for stereoscopic screen */
+	/* 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;
 
@@ -253,10 +254,10 @@
 			position.z = view_distance;
 
 			//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)); 
-		} 
+			//-> n=D- (dD)/(e+d)
+			tr_state->camera->z_near = view_distance -
+			                           gf_divfix( gf_mulfix(disparity,view_distance), (half_interocular_dist_pixel + disparity));
+		}
 		else if (tr_state->visual->compositor->display_depth) {
 			Fixed dist = INT2FIX(tr_state->visual->compositor->display_depth);
 			if (dist<0) dist = INT2FIX(tr_state->visual->height);
@@ -275,7 +276,7 @@
 		}
 	}
 #endif
-		
+
 	gf_vec_diff(d, position, local_center);
 	dist = gf_vec_len(d);
 
@@ -283,7 +284,7 @@
 		if (dist > tr_state->camera->z_far) tr_state->camera->z_far = 2*dist;
 
 		dist = 10 * tr_state->camera->avatar_size.x;
-		if ((dist<tr_state->camera->z_near) || (dist > tr_state->camera->z_far)) 
+		if ((dist<tr_state->camera->z_near) || (dist > tr_state->camera->z_far))
 			dist = (tr_state->camera->avatar_size.x + tr_state->camera->z_far) / 5;
 	}
 	tr_state->camera->vp_dist = dist;
@@ -311,46 +312,48 @@
 	if (Bindable_GetIsBound(bindable)) {
 		gf_node_traverse(bindable, tr_state);
 		tr_state->camera->had_viewpoint = 1;
-	} else 
+	} else
 #endif
-	if (tr_state->camera->had_viewpoint) {
-		u32 had_vp = tr_state->camera->had_viewpoint;
-		tr_state->camera->had_viewpoint = 0;
-		if (tr_state->camera->is_3D) {
-			SFVec3f pos, center;
-			SFRotation r;
-			Fixed fov = GF_PI/4;
+		if (tr_state->camera->had_viewpoint) {
+			u32 had_vp = tr_state->camera->had_viewpoint;
+			tr_state->camera->had_viewpoint = 0;
+			if (tr_state->camera->is_3D) {
+				SFVec3f pos, center;
+				SFRotation r;
+				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) {
-				/*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) );
+				/* 3D world calibration for stereoscopic screen */
+				if (tr_state->visual->compositor->auto_calibration && tr_state->visual->compositor->video_out->view_distance) {
+					/*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) );
 
-				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, view_distance);
+				}
 #endif
 
-			/*default viewpoint*/
-			pos.x = pos.y = 0; pos.z = INT2FIX(10);
-			center.x = center.y = center.z = 0;
-			r.q = r.x = r.z = 0; r.y = FIX_ONE;
-			/*this takes care of pixelMetrics*/
-			visual_3d_viewpoint_change(tr_state, NULL, 0, fov, pos, r, center);
-			/*initial vp compute, don't animate*/
-			if (had_vp == 2) {
-				camera_stop_anim(tr_state->camera);
-				camera_reset_viewpoint(tr_state->camera, 0);
-				/*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;
+				/*default viewpoint*/
+				pos.x = pos.y = 0;
+				pos.z = INT2FIX(10);
+				center.x = center.y = center.z = 0;
+				r.q = r.x = r.z = 0;
+				r.y = FIX_ONE;
+				/*this takes care of pixelMetrics*/
+				visual_3d_viewpoint_change(tr_state, NULL, 0, fov, pos, r, center);
+				/*initial vp compute, don't animate*/
+				if (had_vp == 2) {
+					camera_stop_anim(tr_state->camera);
+					camera_reset_viewpoint(tr_state->camera, 0);
+					/*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;
+					}
 				}
+			} else {
+				tr_state->camera->flags &= ~CAM_HAS_VIEWPORT;
+				tr_state->camera->flags |= CAM_IS_DIRTY;
 			}
-		} else {
-			tr_state->camera->flags &= ~CAM_HAS_VIEWPORT;
-			tr_state->camera->flags |= CAM_IS_DIRTY;
 		}
-	}
 
 	if (tr_state->visual->nb_views>1) {
 		s32 view_idx;
@@ -373,11 +376,10 @@
 		camera_update(tr_state->camera, &tr_state->transform, tr_state->visual->center_coords);
 	}
 
-	/*setup projection/modelview*/
-	visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_PROJECTION);
-	visual_3d_matrix_load(tr_state->visual, tr_state->camera->projection.m);
-	visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_MODELVIEW);
-	visual_3d_matrix_load(tr_state->visual, tr_state->camera->modelview.m);
+	/*setup projection (we do this to avoidloading the projection matrix for each draw operation in non-GL3/GLES2 modes
+		modelview will be loaded at each object
+	*/
+	visual_3d_projection_matrix_modified(tr_state->visual);
 	gf_mx_init(tr_state->model_matrix);
 
 	tr_state->traversing_mode = mode;
@@ -416,29 +418,29 @@
 		gf_node_traverse(bindable, tr_state);
 	}
 	/*clear if not in layer*/
-	else 
+	else
 #endif
-	if (!layer_type) {
-		SFColor col;
-		Fixed alpha = 0;
-		col.red = INT2FIX((tr_state->visual->compositor->back_color>>16)&0xFF) / 255;
-		col.green = INT2FIX((tr_state->visual->compositor->back_color>>8)&0xFF) / 255;
-		col.blue = INT2FIX((tr_state->visual->compositor->back_color)&0xFF) / 255;
-		/*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) ) {
-				alpha = 0;
+		if (!layer_type) {
+			SFColor col;
+			Fixed alpha = 0;
+			col.red = INT2FIX((tr_state->visual->compositor->back_color>>16)&0xFF) / 255;
+			col.green = INT2FIX((tr_state->visual->compositor->back_color>>8)&0xFF) / 255;
+			col.blue = INT2FIX((tr_state->visual->compositor->back_color)&0xFF) / 255;
+			/*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) ) {
+					alpha = 0;
+				}
 			}
+			visual_3d_clear(tr_state->visual, col, alpha);
 		}
-		visual_3d_clear(tr_state->visual, col, alpha);
-	}
 	tr_state->traversing_mode = mode;
 
 }
 
 /*in off-axis, projection matrix is not aligned with view axis, however we need to draw the background
-centered !! 
+centered !!
 In this case we draw the background before setting up the projection but after setting up scissor and Viewport*/
 static void visual_3d_draw_background_on_axis(GF_TraverseState *tr_state, u32 layer_type)
 {
@@ -447,18 +449,22 @@
 	Fixed ar = gf_divfix(cam->width, cam->height);
 
 	tr_state->visual->camera_layout = 0;
+	gf_mx_copy(proj, cam->projection);
+	gf_mx_copy(model, cam->modelview);
 
-	gf_mx_perspective(&proj, cam->fieldOfView, ar, cam->z_near, cam->z_far);
-	/*setup modelview*/
-	gf_mx_lookat(&model, cam->position, cam->target, cam->up);
+	gf_mx_perspective(&cam->projection, cam->fieldOfView, ar, cam->z_near, cam->z_far);
+	visual_3d_projection_matrix_modified(tr_state->visual);
 
-	visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_PROJECTION);
-	visual_3d_matrix_load(tr_state->visual, proj.m);
-	visual_3d_set_matrix_mode(tr_state->visual, V3D_MATRIX_MODELVIEW);
-	visual_3d_matrix_load(tr_state->visual, model.m);
+	/*setup modelview*/
+	gf_mx_lookat(&cam->modelview, cam->position, cam->target, cam->up);
 
 	visual_3d_draw_background(tr_state, layer_type);
+
 	tr_state->visual->camera_layout = GF_3D_CAMERA_OFFAXIS;
+	gf_mx_copy(cam->projection, proj);
+	gf_mx_copy(cam->modelview, model);
+
+
 }
 
 void visual_3d_init_draw(GF_TraverseState *tr_state, u32 layer_type)
@@ -476,45 +482,47 @@
 	if (Bindable_GetIsBound(bindable)) {
 		gf_node_traverse(bindable, tr_state);
 		tr_state->camera->had_nav_info = 1;
-	} else 
+	} else
 #endif
-	if (tr_state->camera->had_nav_info) {
-		/*if no navigation specified, use default VRML one*/
-		tr_state->camera->avatar_size.x = FLT2FIX(0.25f); tr_state->camera->avatar_size.y = FLT2FIX(1.6f); tr_state->camera->avatar_size.z = FLT2FIX(0.75f);
-		tr_state->camera->visibility = 0;
-		tr_state->camera->speed = FIX_ONE;
-		/*not specified in the spec, but by default we forbid navigation in layer*/
-		if (layer_type) {
-			tr_state->camera->navigation_flags = NAV_HEADLIGHT;
-			tr_state->camera->navigate_mode = GF_NAVIGATE_NONE;
-		} 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;
-				} 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;
-				}
-				
+		if (tr_state->camera->had_nav_info) {
+			/*if no navigation specified, use default VRML one*/
+			tr_state->camera->avatar_size.x = FLT2FIX(0.25f);
+			tr_state->camera->avatar_size.y = FLT2FIX(1.6f);
+			tr_state->camera->avatar_size.z = FLT2FIX(0.75f);
+			tr_state->camera->visibility = 0;
+			tr_state->camera->speed = FIX_ONE;
+			/*not specified in the spec, but by default we forbid navigation in layer*/
+			if (layer_type) {
+				tr_state->camera->navigation_flags = NAV_HEADLIGHT;
+				tr_state->camera->navigate_mode = GF_NAVIGATE_NONE;
+			} 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;
+					} 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)
-					tr_state->camera->navigate_mode = GF_NAVIGATE_NONE;
-*/
+					/*				if (tr_state->visual->compositor->display_depth)
+										tr_state->camera->navigate_mode = GF_NAVIGATE_NONE;
+					*/
 #endif
-			} else {
-				tr_state->camera->navigate_mode = GF_NAVIGATE_NONE;
+				} else {
+					tr_state->camera->navigate_mode = GF_NAVIGATE_NONE;
+				}
 			}
-		}
-		tr_state->camera->had_nav_info = 0;
+			tr_state->camera->had_nav_info = 0;
 
-		if (tr_state->pixel_metrics) {
-			tr_state->camera->visibility = gf_mulfix(tr_state->camera->visibility, tr_state->min_hsize);
-			tr_state->camera->avatar_size.x = gf_mulfix(tr_state->camera->avatar_size.x, tr_state->min_hsize);
-			tr_state->camera->avatar_size.y = gf_mulfix(tr_state->camera->avatar_size.y, tr_state->min_hsize);
-			tr_state->camera->avatar_size.z = gf_mulfix(tr_state->camera->avatar_size.z, tr_state->min_hsize);
+			if (tr_state->pixel_metrics) {
+				tr_state->camera->visibility = gf_mulfix(tr_state->camera->visibility, tr_state->min_hsize);
+				tr_state->camera->avatar_size.x = gf_mulfix(tr_state->camera->avatar_size.x, tr_state->min_hsize);
+				tr_state->camera->avatar_size.y = gf_mulfix(tr_state->camera->avatar_size.y, tr_state->min_hsize);
+				tr_state->camera->avatar_size.z = gf_mulfix(tr_state->camera->avatar_size.z, tr_state->min_hsize);
+			}
 		}
-	}
 
 	/*animate current camera - if returns TRUE draw next frame*/
 	if (camera_animate(tr_state->camera)) {
@@ -526,13 +534,10 @@
 	/*turn off depth buffer in 2D*/
 	visual_3d_enable_depth_buffer(tr_state->visual, tr_state->camera->is_3D);
 
-	/*set headlight if any*/
-	visual_3d_enable_headlight(tr_state->visual, (tr_state->camera->navigation_flags & NAV_HEADLIGHT) ? 1 : 0, tr_state->camera);
-
 	if (tr_state->visual->autostereo_type==GF_3D_STEREO_SIDE) {
 		GF_Rect orig_vp;
 		orig_vp = tr_state->camera->vp;
-		
+
 		tr_state->camera->vp.width = gf_divfix(tr_state->camera->vp.width, INT2FIX(tr_state->visual->nb_views));
 		tr_state->camera->vp.x += gf_mulfix(INT2FIX(tr_state->visual->current_view), tr_state->camera->vp.width);
 
@@ -550,7 +555,7 @@
 	} else if (tr_state->visual->autostereo_type==GF_3D_STEREO_TOP) {
 		GF_Rect orig_vp;
 		orig_vp = tr_state->camera->vp;
-		
+
 		tr_state->camera->vp.height = gf_divfix(tr_state->camera->vp.height, INT2FIX(tr_state->visual->nb_views));
 		tr_state->camera->vp.y += gf_mulfix(INT2FIX(tr_state->visual->current_view), tr_state->camera->vp.height);
 //		tr_state->camera->vp.y = orig_vp.height - tr_state->camera->vp.height - tr_state->camera->vp.y;
@@ -584,11 +589,18 @@
 			visual_3d_clear_depth(tr_state->visual);
 		}
 	}
+
 	/*regular background draw*/
 	if (!tr_state->camera->is_3D || tr_state->visual->camera_layout != GF_3D_CAMERA_OFFAXIS) {
 		visual_3d_draw_background(tr_state, layer_type);
 	}
 
+	/*set headlight if any*/
+	if (tr_state->visual->type_3d>1) {
+		visual_3d_enable_headlight(tr_state->visual, (tr_state->camera->navigation_flags & NAV_HEADLIGHT) ? 1 : 0, tr_state->camera);
+	}
+
+
 	visual_3d_set_scissor(tr_state->visual, NULL);
 }
 
@@ -597,7 +609,7 @@
 {
 	Bool is_mat3D;
 	Drawable3D *stack;
-	
+
 
 	is_mat3D = 0;
 #ifndef GPAC_DISABLE_VRML
@@ -660,20 +672,17 @@
 		tr_state->traversing_mode = TRAVERSE_DRAW_3D;
 		/*layout/form clipper, set it in world coords only*/
 		if (tr_state->has_clip) {
-			visual_3d_matrix_push(tr_state->visual);
-			visual_3d_matrix_reset(tr_state->visual);
-			visual_3d_set_clipper_2d(tr_state->visual, tr_state->clipper);
-			visual_3d_matrix_pop(tr_state->visual);
+			visual_3d_set_clipper_2d(tr_state->visual, tr_state->clipper, NULL, 0);
 		}
-		
+
 		gf_node_traverse(geometry, tr_state);
 
 		/*clear appearance flag once drawn in 3D - not doing so would prevent
-		dirty flag propagation in the tree, whcih would typically prevent redrawing 
+		dirty flag propagation in the tree, whcih would typically prevent redrawing
 		layers/offscreen groups when texture changes*/
 		if (tr_state->appear)
 			gf_node_dirty_clear(tr_state->appear, 0);
-		
+
 		/*back to SORT*/
 		tr_state->traversing_mode = TRAVERSE_SORT;
 
@@ -693,7 +702,7 @@
 
 	ctx->pixel_metrics = tr_state->pixel_metrics;
 	ctx->text_split_idx = tr_state->text_split_idx;
-	
+
 	i=0;
 	while ((ol = (DirectionalLightContext*)gf_list_enum(tr_state->local_lights, &i))) {
 		nl = (DirectionalLightContext*)gf_malloc(sizeof(DirectionalLightContext));
@@ -709,7 +718,7 @@
 
 	/*get bbox and and insert from further to closest*/
 	tr_state->bbox = drawable->mesh->bounds;
-		
+
 	gf_mx_apply_bbox(&ctx->model_matrix, &tr_state->bbox);
 	gf_mx_apply_bbox(&tr_state->camera->modelview, &tr_state->bbox);
 	ctx->zmax = tr_state->bbox.max_edge.z;
@@ -742,32 +751,29 @@
 		DirectionalLightContext *dl;
 		Drawable3DContext *ctx = (Drawable3DContext *)gf_list_get(visual->alpha_nodes_to_draw, idx);
 
-		visual_3d_matrix_push(visual);
-
 		/*apply directional lights*/
 		tr_state->local_light_on = 1;
 		i=0;
 		while ((dl = (DirectionalLightContext*)gf_list_enum(ctx->directional_lights, &i))) {
-			visual_3d_matrix_push(visual);
-			visual_3d_matrix_add(visual, dl->light_matrix.m);
+			GF_Matrix mx;
+			gf_mx_copy(mx, tr_state->model_matrix);
+
+			gf_mx_add_matrix(&tr_state->model_matrix, &dl->light_matrix);
 			gf_node_traverse(dl->dlight, tr_state);
-			visual_3d_matrix_pop(visual);
+
+			gf_mx_copy(tr_state->model_matrix, mx);
 		}
-		
+
 		/*clipper, set it in world coords only*/
 		if (ctx->has_clipper) {
-			visual_3d_matrix_push(visual);
-			visual_3d_matrix_reset(visual);
-			visual_3d_set_clipper_2d(visual, ctx->clipper);
-			visual_3d_matrix_pop(visual);
+			visual_3d_set_clipper_2d(visual, ctx->clipper, NULL, 0);
 		}
 
 		/*clip planes, set it in world coords only*/
 		for (i=0; i<ctx->num_clip_planes; i++)
-			visual_3d_set_clip_plane(visual, ctx->clip_planes[i]);
+			visual_3d_set_clip_plane(visual, ctx->clip_planes[i], NULL, 0);
 
 		/*restore traversing state*/
-		visual_3d_matrix_add(visual, ctx->model_matrix.m);
 		memcpy(&tr_state->model_matrix, &ctx->model_matrix, sizeof(GF_Matrix));
 		tr_state->color_mat.identity = ctx->color_mat.identity;
 		if (!tr_state->color_mat.identity) memcpy(&tr_state->color_mat, &ctx->color_mat, sizeof(GF_ColorMatrix));
@@ -783,7 +789,7 @@
 		gf_node_traverse(ctx->geometry, tr_state);
 
 		/*clear appearance flag once drawn in 3D - not doing so would prevent
-		dirty flag propagation in the tree, whcih would typically prevent redrawing 
+		dirty flag propagation in the tree, whcih would typically prevent redrawing
 		layers/offscreen groups when texture changes*/
 		if (tr_state->appear) {
 			gf_node_dirty_clear(tr_state->appear, 0);
@@ -801,8 +807,6 @@
 		if (ctx->has_clipper) visual_3d_reset_clipper_2d(visual);
 		for (i=0; i<ctx->num_clip_planes; i++) visual_3d_reset_clip_plane(visual);
 
-		visual_3d_matrix_pop(visual);
-
 		/*and destroy*/
 		gf_list_del(ctx->directional_lights);
 		gf_free(ctx);
@@ -820,7 +824,7 @@
 	visual_3d_init_draw(tr_state, 0);
 
 	/*main visual, handle collisions*/
-	if ((tr_state->visual==tr_state->visual->compositor->visual) && tr_state->camera->is_3D) 
+	if ((tr_state->visual==tr_state->visual->compositor->visual) && tr_state->camera->is_3D)
 		visual_3d_check_collisions(tr_state, NULL);
 
 #ifndef GPAC_DISABLE_VRML
@@ -835,7 +839,7 @@
 		tr_state->traversing_mode = TRAVERSE_LIGHTING;
 		gf_node_traverse(root_node, tr_state);
 	}
-	
+
 	/*sort graph*/
 	tr_state->traversing_mode = TRAVERSE_SORT;
 	gf_node_traverse(root_node, tr_state);
@@ -854,7 +858,7 @@
 #endif
 
 	visual_3d_setup(visual);
-	
+
 	/*setup our traversing state*/
 	visual_3d_setup_traversing_state(visual, tr_state);
 
@@ -867,16 +871,16 @@
 		}
 
 #ifndef GPAC_USE_OGL_ES
-		visual_3d_init_yuv_shader(visual);
+		visual_3d_init_shaders(visual);
 #endif
-		
+
 		for (visual->current_view=0; visual->current_view < visual->nb_views; visual->current_view++) {
 			GF_SceneGraph *sg;
 			u32 i;
 			visual_3d_draw_node(tr_state, root);
 
 			/*extra scene graphs*/
-			i=0; 
+			i=0;
 			while ((sg = (GF_SceneGraph*)gf_list_enum(visual->compositor->extra_scenes, &i))) {
 				tr_state->traversing_mode = TRAVERSE_SORT;
 				gf_sc_traverse_subscene(visual->compositor, root, sg, tr_state);
@@ -893,7 +897,7 @@
 		visual_3d_draw_node(tr_state, root);
 	}
 	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));
-	
+
 	return 1;
 }
 
@@ -936,7 +940,7 @@
 	gf_vec_diff(dir, tr_state->camera->position, tr_state->camera->last_pos);
 	pos_diff = gf_vec_len(dir);
 	gf_vec_norm(&dir);
-	
+
 	diff = 0;
 	go = 1;
 	tr_state->camera->last_had_col = 0;
@@ -952,8 +956,8 @@
 			diff += pos_diff;
 			go = 0;
 		}
-		n = gf_vec_scale(dir, diff);	
-		gf_vec_add(tr_state->camera->position, tr_state->camera->last_pos, n);	
+		n = gf_vec_scale(dir, diff);
+		gf_vec_add(tr_state->camera->position, tr_state->camera->last_pos, n);
 		if (!node_list) {
 			gf_node_traverse(gf_sg_get_root_node(tr_state->visual->compositor->scene), tr_state);
 		} else {
@@ -974,13 +978,13 @@
 			tr_state->camera->position = tr_state->camera->last_pos;
 			tr_state->camera->flags |= CAM_IS_DIRTY;
 		} else {
-			if ((tr_state->camera->jumping && fabs(diff)>tr_state->camera->dheight) 
-				|| (!tr_state->camera->jumping && (ABS(diff)>FIX_ONE/1000) )) {
+			if ((tr_state->camera->jumping && fabs(diff)>tr_state->camera->dheight)
+			        || (!tr_state->camera->jumping && (ABS(diff)>FIX_ONE/1000) )) {
 				tr_state->camera->last_had_ground = 1;
 				n = gf_vec_scale(tr_state->camera->up, -diff);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] Ground detected camera position: %g %g %g - offset: %g %g %g (dist %g)\n", 
-					FIX2FLT(tr_state->camera->position.x), FIX2FLT(tr_state->camera->position.y), FIX2FLT(tr_state->camera->position.z),
-					FIX2FLT(n.x), FIX2FLT(n.y), FIX2FLT(n.z), FIX2FLT(diff)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] Ground detected camera position: %g %g %g - offset: %g %g %g (dist %g)\n",
+				                                      FIX2FLT(tr_state->camera->position.x), FIX2FLT(tr_state->camera->position.y), FIX2FLT(tr_state->camera->position.z),
+				                                      FIX2FLT(n.x), FIX2FLT(n.y), FIX2FLT(n.z), FIX2FLT(diff)));
 
 				gf_vec_add(tr_state->camera->position, tr_state->camera->position, n);
 				gf_vec_add(tr_state->camera->target, tr_state->camera->target, n);
@@ -1016,9 +1020,9 @@
 				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);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] offseting camera: position: %g %g %g - offset: %g %g %g\n", 
-					FIX2FLT(tr_state->camera->position.x), FIX2FLT(tr_state->camera->position.y), FIX2FLT(tr_state->camera->position.z),
-					FIX2FLT(n.x), FIX2FLT(n.y), FIX2FLT(n.z)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] offseting camera: position: %g %g %g - offset: %g %g %g\n",
+				                                      FIX2FLT(tr_state->camera->position.x), FIX2FLT(tr_state->camera->position.y), FIX2FLT(tr_state->camera->position.z),
+				                                      FIX2FLT(n.x), FIX2FLT(n.y), FIX2FLT(n.z)));
 
 				gf_vec_add(tr_state->camera->position, tr_state->camera->position, n);
 				gf_vec_add(tr_state->camera->target, tr_state->camera->target, n);
@@ -1042,13 +1046,13 @@
 //#define DISABLE_VIEW_CULL
 
 #ifndef GPAC_DISABLE_LOG
-static const char *szPlaneNames [] = 
+static const char *szPlaneNames [] =
 {
 	"Near", "Far", "Left", "Right", "Bottom", "Top"
 };
 #endif
 
-Bool visual_3d_node_cull(GF_TraverseState *tr_state, GF_BBox *bbox, Bool skip_near) 
+Bool visual_3d_node_cull(GF_TraverseState *tr_state, GF_BBox *bbox, Bool skip_near)
 {
 #ifdef DISABLE_VIEW_CULL
 	tr_state->cull_flag = CULL_INSIDE;
@@ -1073,7 +1077,7 @@
 
 	/*get bbox sphere in world space*/
 	b = *bbox;
-	gf_mx_apply_bbox_sphere(&tr_state->model_matrix, &b);	
+	gf_mx_apply_bbox_sphere(&tr_state->model_matrix, &b);
 	cam = tr_state->camera;
 
 	/*if camera is inside bbox consider we intersect*/
@@ -1093,12 +1097,12 @@
 		}
 	}
 
-	/*second check: sphere vs frustum planes intersection, if any intersection is detected switch 
+	/*second check: sphere vs frustum planes intersection, if any intersection is detected switch
 	to n/p vertex check.*/
 	rad = b.radius;
 	irad = -b.radius;
 	do_sphere = 1;
-	
+
 	/*skip near/far tests in ortho mode, and near in 3D*/
 	i = (tr_state->camera->is_3D) ? (skip_near ? 1 : 0) : 2;
 	for (; i<6; i++) {
@@ -1130,7 +1134,7 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Culling] Node out (p-vertex test) plane %s - Distance %g\n", szPlaneNames[i], FIX2FLT(d) ));
 			return 0;
 		}
-		
+
 		/*check n-vertex: if not in plane, we're intersecting - don't check for near and far planes*/
 		if (i>1) {
 			d = gf_plane_get_distance(&cam->planes[i], &vertices[7-p_idx]);
@@ -1157,7 +1161,8 @@
 	visual_3d_setup_traversing_state(visual, tr_state);
 	visual_3d_setup_projection(tr_state, 0);
 
-	x = INT2FIX(ev->mouse.x); y = INT2FIX(ev->mouse.y);
+	x = INT2FIX(ev->mouse.x);
+	y = INT2FIX(ev->mouse.y);
 
 	/*if coordinate system is not centered, move to centered coord before applying camera transform
 	because the (un)projection matrices include this transform*/
@@ -1178,7 +1183,7 @@
 	start.z = visual->camera.z_near;
 	end.z = visual->camera.z_far;
 	if (!tr_state->camera->is_3D && !tr_state->pixel_metrics) {
-		start.x = end.x = gf_divfix(x, tr_state->min_hsize); 
+		start.x = end.x = gf_divfix(x, tr_state->min_hsize);
 		start.y = end.y = gf_divfix(y, tr_state->min_hsize);
 	} else {
 		start.x = end.x = x;
@@ -1188,27 +1193,37 @@
 	/*unproject to world coords*/
 	in_x = 2*x/ (s32) visual->width;
 	in_y = 2*y/ (s32) visual->height;
-	
-	res.x = in_x; res.y = in_y; res.z = -FIX_ONE; res.q = FIX_ONE;
+
+	res.x = in_x;
+	res.y = in_y;
+	res.z = -FIX_ONE;
+	res.q = FIX_ONE;
 	gf_mx_apply_vec_4x4(&visual->camera.unprojection, &res);
 	if (!res.q) return;
-	start.x = gf_divfix(res.x, res.q); start.y = gf_divfix(res.y, res.q); start.z = gf_divfix(res.z, res.q);
-
-	res.x = in_x; res.y = in_y; res.z = FIX_ONE; res.q = FIX_ONE;
+	start.x = gf_divfix(res.x, res.q);
+	start.y = gf_divfix(res.y, res.q);
+	start.z = gf_divfix(res.z, res.q);
+
+	res.x = in_x;
+	res.y = in_y;
+	res.z = FIX_ONE;
+	res.q = FIX_ONE;
 	gf_mx_apply_vec_4x4(&visual->camera.unprojection, &res);
 	if (!res.q) return;
-	end.x = gf_divfix(res.x, res.q); end.y = gf_divfix(res.y, res.q); end.z = gf_divfix(res.z, res.q);
+	end.x = gf_divfix(res.x, res.q);
+	end.y = gf_divfix(res.y, res.q);
+	end.z = gf_divfix(res.z, res.q);
 
 	tr_state->ray = gf_ray(start, end);
 	/*also update hit info world ray in case we have a grabbed sensor with mouse off*/
 	visual->compositor->hit_world_ray = tr_state->ray;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Picking] cast ray\n\tOrigin %.4f %.4f %.4f - End %.4f %.4f %.4f\n\tDir %.4f %.4f %.4f\n", 
-		FIX2FLT(tr_state->ray.orig.x), FIX2FLT(tr_state->ray.orig.y), FIX2FLT(tr_state->ray.orig.z),
-		FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z),
-		FIX2FLT(tr_state->ray.dir.x), FIX2FLT(tr_state->ray.dir.y), FIX2FLT(tr_state->ray.dir.z)));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Picking] cast ray\n\tOrigin %.4f %.4f %.4f - End %.4f %.4f %.4f\n\tDir %.4f %.4f %.4f\n",
+	                                      FIX2FLT(tr_state->ray.orig.x), FIX2FLT(tr_state->ray.orig.y), FIX2FLT(tr_state->ray.orig.z),
+	                                      FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z),
+	                                      FIX2FLT(tr_state->ray.dir.x), FIX2FLT(tr_state->ray.dir.y), FIX2FLT(tr_state->ray.dir.z)));
+
 
-	 
 
 	visual->compositor->hit_square_dist = 0;
 	visual->compositor->hit_node = NULL;
@@ -1227,7 +1242,7 @@
 
 
 #ifndef GPAC_DISABLE_VRML
-void visual_3d_vrml_drawable_pick(GF_Node *n, GF_TraverseState *tr_state, GF_Mesh *mesh, Drawable *drawable) 
+void visual_3d_vrml_drawable_pick(GF_Node *n, GF_TraverseState *tr_state, GF_Mesh *mesh, Drawable *drawable)
 {
 	SFVec3f local_pt, world_pt, vdiff;
 	SFVec3f hit_normal;
@@ -1247,7 +1262,7 @@
 
 	node_is_over = 0;
 	if (mesh) {
-		if (mesh->mesh_type!=MESH_TRIANGLES) 
+		if (mesh->mesh_type!=MESH_TRIANGLES)
 			return;
 		if (!visual_3d_node_cull(tr_state, &mesh->bounds, 0)) {
 			tr_state->cull_flag = cull_bckup;
@@ -1268,7 +1283,7 @@
 		gf_mx_apply_vec(&mx, &hit);
 		p.normal = r.dir;
 		p.d = -1 * gf_vec_dot(p.normal, hit);
-		if (mesh) 
+		if (mesh)
 			box = mesh->bounds;
 		else
 			gf_bbox_from_rect(&box, &drawable->path->bbox);
@@ -1283,7 +1298,8 @@
 		node_is_over = 0;
 		if (compositor_get_2d_plane_intersection(&r, &local_pt)) {
 			if (gf_path_point_over(drawable->path, local_pt.x, local_pt.y)) {
-				hit_normal.x = hit_normal.y = 0; hit_normal.z = FIX_ONE;
+				hit_normal.x = hit_normal.y = 0;
+				hit_normal.z = FIX_ONE;
 				text_coords.x = gf_divfix(local_pt.x, drawable->path->bbox.width) + FIX_ONE/2;
 				text_coords.y = gf_divfix(local_pt.y, drawable->path->bbox.height) + FIX_ONE/2;
 				node_is_over = 1;
@@ -1293,7 +1309,8 @@
 			if (asp.pen_props.width || asp.line_texture ) {
 				StrikeInfo2D *si = drawable_get_strikeinfo(tr_state->visual->compositor, drawable, &asp, tr_state->appear, NULL, 0, NULL);
 				if (si && si->outline && gf_path_point_over(si->outline, local_pt.x, local_pt.y)) {
-					hit_normal.x = hit_normal.y = 0; hit_normal.z = FIX_ONE;
+					hit_normal.x = hit_normal.y = 0;
+					hit_normal.z = FIX_ONE;
 					text_coords.x = gf_divfix(local_pt.x, si->outline->bbox.width) + FIX_ONE/2;
 					text_coords.y = gf_divfix(local_pt.y, si->outline->bbox.height) + FIX_ONE/2;
 					node_is_over = 1;
@@ -1346,7 +1363,7 @@
 	compositor->hit_node = n;
 	compositor->hit_use_dom_events = 0;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Picking] node %s (def %s) is under mouse - hit %g %g %g\n", gf_node_get_class_name(n), gf_node_get_name(n),
-			FIX2FLT(world_pt.x), FIX2FLT(world_pt.y), FIX2FLT(world_pt.z)));
+	                                      FIX2FLT(world_pt.x), FIX2FLT(world_pt.y), FIX2FLT(world_pt.z)));
 }
 
 
@@ -1417,16 +1434,16 @@
 			tr_state->camera->collide_point = collide_pt;
 
 #ifndef GPAC_DISABLE_LOG
-			if (gf_log_tool_level_on(GF_LOG_COMPOSE, GF_LOG_DEBUG)) { 				
+			if (gf_log_tool_level_on(GF_LOG_COMPOSE, GF_LOG_DEBUG)) {
 				gf_vec_diff(v1, pos, collide_pt);
 				gf_vec_norm(&v1);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] found at %g %g %g (WC) - dist (%g) - local normal %g %g %g\n", 
-					FIX2FLT(tr_state->camera->collide_point.x), FIX2FLT(tr_state->camera->collide_point.y), FIX2FLT(tr_state->camera->collide_point.z), 
-					FIX2FLT(dist), 
-					FIX2FLT(v1.x), FIX2FLT(v1.y), FIX2FLT(v1.z)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] found at %g %g %g (WC) - dist (%g) - local normal %g %g %g\n",
+				                                      FIX2FLT(tr_state->camera->collide_point.x), FIX2FLT(tr_state->camera->collide_point.y), FIX2FLT(tr_state->camera->collide_point.z),
+				                                      FIX2FLT(dist),
+				                                      FIX2FLT(v1.x), FIX2FLT(v1.y), FIX2FLT(v1.z)));
 			}
 #endif
-		} 
+		}
 		else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] Existing collision (dist %g) closer than current collsion (dist %g)\n", FIX2FLT(tr_state->camera->collide_dist), FIX2FLT(dist) ));
 		}
@@ -1449,15 +1466,15 @@
 				tr_state->camera->ground_dist = dist;
 				tr_state->camera->collide_flags |= CF_GRAVITY;
 				tr_state->camera->ground_point = collide_pt;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] Ground found at %g %g %g (WC) - dist %g - local normal %g %g %g\n", 
-					FIX2FLT(tr_state->camera->ground_point.x), FIX2FLT(tr_state->camera->ground_point.y), FIX2FLT(tr_state->camera->ground_point.z), 
-					FIX2FLT(dist), 
-					FIX2FLT(v1.x), FIX2FLT(v1.y), FIX2FLT(v1.z)));
-			} 
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] Ground found at %g %g %g (WC) - dist %g - local normal %g %g %g\n",
+				                                      FIX2FLT(tr_state->camera->ground_point.x), FIX2FLT(tr_state->camera->ground_point.y), FIX2FLT(tr_state->camera->ground_point.z),
+				                                      FIX2FLT(dist),
+				                                      FIX2FLT(v1.x), FIX2FLT(v1.y), FIX2FLT(v1.z)));
+			}
 			else {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Collision] Existing ground (dist %g) closer than current (dist %g)\n", FIX2FLT(tr_state->camera->ground_dist), FIX2FLT(dist)));
 			}
-		} 
+		}
 	}
 }
 
@@ -1493,10 +1510,10 @@
 {
 	if (asp->line_texture) {
 		GF_Node *txtrans = NULL;
-		if (tr_state->appear 
-			&& (gf_node_get_tag( ((M_Appearance *)tr_state->appear)->material) == TAG_MPEG4_Material2D) 
-			&& (gf_node_get_tag(((M_Material2D *) ((M_Appearance *)tr_state->appear)->material)->lineProps) == TAG_MPEG4_XLineProperties) 
-		) {
+		if (tr_state->appear
+		        && (gf_node_get_tag( ((M_Appearance *)tr_state->appear)->material) == TAG_MPEG4_Material2D)
+		        && (gf_node_get_tag(((M_Material2D *) ((M_Appearance *)tr_state->appear)->material)->lineProps) == TAG_MPEG4_XLineProperties)
+		   ) {
 			txtrans = ((M_XLineProperties *) ((M_Material2D *) ((M_Appearance *)tr_state->appear)->material)->lineProps)->textureTransform;
 		}
 
@@ -1531,9 +1548,13 @@
 	if (fill_txh || (GF_COL_A(asp->fill_color)) ) {
 		if (!st->mesh) return;
 
-		if (asp->fill_color) 
+		if (asp->fill_color)
 			visual_3d_set_material_2d_argb(tr_state->visual, asp->fill_color);
-		
+		else if (GF_COL_A(asp->line_color) && !(asp->line_color & 0x00FFFFFF)) {
+			u32 col = asp->line_color | 0x00FFFFFF;
+			visual_3d_set_material_2d_argb(tr_state->visual, col);
+		}
+
 		visual_3d_mesh_paint(tr_state, st->mesh);
 		/*reset texturing in case of line texture*/
 		if (tr_state->mesh_num_textures) {
@@ -1556,7 +1577,7 @@
 #ifdef GPAC_HAS_GLU
 		if (si->is_vectorial) {
 			gf_mesh_tesselate_path(si->mesh_outline, si->outline, asp->line_texture ? 2 : 1);
-		} else 
+		} else
 #endif
 			mesh_get_outline(si->mesh_outline, st->path);
 	}
@@ -1572,7 +1593,7 @@
 	if (asp->line_texture) {
 		gf_sc_texture_disable(asp->line_texture);
 		tr_state->mesh_num_textures = 0;
-	}		
+	}
 }
 
 #ifndef GPAC_DISABLE_VRML
@@ -1625,8 +1646,8 @@
 		/*use material2D to disable lighting (cf VRML specs)*/
 		visual_3d_set_material_2d(tr_state->visual, def, FIX_ONE);
 		return 1;
-	} 
-	
+	}
+
 	switch (gf_node_get_tag((GF_Node *)__mat)) {
 	case TAG_MPEG4_Material:
 #ifndef GPAC_DISABLE_X3D
@@ -1696,7 +1717,7 @@
 		vec[3] = spec_a;
 		visual_3d_set_material(tr_state->visual, V3D_MATERIAL_SPECULAR, vec);
 
-		
+
 		vec[0] = emi.red;
 		vec[1] = emi.green;
 		vec[2] = emi.blue;
@@ -1706,7 +1727,7 @@
 		visual_3d_set_shininess(tr_state->visual, mat->shininess);
 		if (diffuse_alpha) *diffuse_alpha = diff_a;
 	}
-		break;
+	break;
 	case TAG_MPEG4_Material2D:
 	{
 		SFColor emi;
@@ -1735,8 +1756,8 @@
 		/*regular mat 2D*/
 		visual_3d_set_state(tr_state->visual, V3D_STATE_LIGHT | V3D_STATE_COLOR, 0);
 		visual_3d_set_material_2d(tr_state->visual, emi, emi_a);
-	}	
-		break;
+	}
+	break;
 	default:
 		break;
 	}
@@ -1764,7 +1785,8 @@
 			switch (txh->pixelformat) {
 			/*override diffuse color with full intensity, but keep material alpha (cf VRML lighting)*/
 			case GF_PIXEL_RGB_24:
-				v[0] = v[1] = v[2] = FIX_ONE; v[3] = diffuse_alpha;
+				v[0] = v[1] = v[2] = FIX_ONE;
+				v[3] = diffuse_alpha;
 				visual_3d_set_material(tr_state->visual, V3D_MATERIAL_DIFFUSE, v);
 				break;
 			/*override diffuse color AND material alpha (cf VRML lighting)*/
@@ -1773,10 +1795,10 @@
 				visual_3d_set_material(tr_state->visual, V3D_MATERIAL_DIFFUSE, v);
 				tr_state->mesh_is_transparent = 1;
 				break;
-/*			case GF_PIXEL_GREYSCALE:
-				tr_state->mesh_num_textures = 2;
-				break;
-*/
+				/*			case GF_PIXEL_GREYSCALE:
+								tr_state->mesh_num_textures = 2;
+								break;
+				*/
 			}
 		}
 		return tr_state->mesh_num_textures;
@@ -1815,7 +1837,7 @@
 	} else if (visual_3d_setup_appearance(tr_state)) {
 		visual_3d_mesh_paint(tr_state, mesh);
 		visual_3d_disable_texture(tr_state);
-	
+
 #if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_DISABLE_X3D)
 		if (tr_state->appear && gf_node_get_tag(tr_state->appear)==TAG_X3D_Appearance) {
 			X_Appearance *ap = (X_Appearance *)tr_state->appear;
@@ -1826,6 +1848,205 @@
 	}
 }
 
+void visual_3d_projection_matrix_modified(GF_VisualManager *visual)
+{
+	visual->needs_projection_matrix_reload = 1;
+}
+
+void visual_3d_enable_headlight(GF_VisualManager *visual, Bool bOn, GF_Camera *cam)
+{
+	SFVec3f dir;
+	SFColor col;
+
+	if (!bOn) return;
+	//if we have lights in the scene don't turn the headlight on
+	if (visual->has_inactive_lights || visual->num_lights) return;
+
+	col.blue = col.red = col.green = FIX_ONE;
+	dir.x = dir.y = 0;
+	dir.z = -FIX_ONE;
+	if (cam->is_3D) dir = camera_get_target_dir(cam);
+
+	visual_3d_add_directional_light(visual, 0, col, FIX_ONE, dir, &cam->modelview);
+}
+
+void visual_3d_set_material_2d(GF_VisualManager *visual, SFColor col, Fixed alpha)
+{
+	visual->has_material_2d = alpha ? 1 : 0;
+	if (visual->has_material_2d) {
+		visual->mat_2d.red = col.red;
+		visual->mat_2d.green = col.green;
+		visual->mat_2d.blue = col.blue;
+		visual->mat_2d.alpha = alpha;
+	}
+
+}
+
+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;
+	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;
+		visual->mat_2d.blue = INT2FIX( GF_COL_B(col) ) / 255;
+		visual->mat_2d.alpha = INT2FIX( a ) / 255;;
+	}
+}
+
+void visual_3d_set_clipper_2d(GF_VisualManager *visual, GF_Rect clip, GF_Matrix *mx_at_clipper, Bool is_2d_clip)
+{
+	GF_Plane p;
+
+	if (visual->num_clips + 4 > visual->max_clips)
+		return;
+
+	p.normal.z = 0;
+	p.normal.y = 0;
+	p.normal.x = -FIX_ONE;
+	p.d = clip.x + clip.width;
+	visual_3d_set_clip_plane(visual, p, mx_at_clipper, is_2d_clip);
+
+	p.normal.x = FIX_ONE;
+	p.d = -clip.x;
+	visual_3d_set_clip_plane(visual, p, mx_at_clipper, is_2d_clip);
+
+	p.normal.x = 0;
+	p.normal.y = -FIX_ONE;
+	p.d = clip.y;
+	visual_3d_set_clip_plane(visual, p, mx_at_clipper, is_2d_clip);
+
+	p.normal.y = FIX_ONE;
+	p.d = clip.height - clip.y;
+	visual_3d_set_clip_plane(visual, p, mx_at_clipper, is_2d_clip);
+}
+
+void visual_3d_reset_clipper_2d(GF_VisualManager *visual)
+{
+	if (visual->num_clips < 4) return;
+	visual->num_clips -= 4;
+}
+
+void visual_3d_set_clip_plane(GF_VisualManager *visual, GF_Plane p, GF_Matrix *mx_at_clipper, Bool is_2d_clip)
+{
+	if (visual->num_clips==GF_MAX_GL_CLIPS) return;
+	gf_vec_norm(&p.normal);
+	visual->clippers[visual->num_clips].p = p;
+	visual->clippers[visual->num_clips].is_2d_clip = is_2d_clip;
+	visual->clippers[visual->num_clips].mx_clipper = mx_at_clipper;
+	visual->num_clips++;
+}
+
+void visual_3d_reset_clip_plane(GF_VisualManager *visual)
+{
+	if (!visual->num_clips) return;
+	visual->num_clips -= 1;
+}
+
+void visual_3d_set_material(GF_VisualManager *visual, u32 material_type, Fixed *rgba)
+{
+	visual->materials[material_type].red = rgba[0];
+	visual->materials[material_type].green = rgba[1];
+	visual->materials[material_type].blue = rgba[2];
+	visual->materials[material_type].alpha = rgba[3];
+
+	visual->has_material = 1;
+}
+
+void visual_3d_set_shininess(GF_VisualManager *visual, Fixed shininess)
+{
+	visual->shininess = shininess;
+}
+
+void visual_3d_set_state(GF_VisualManager *visual, u32 flag_mask, Bool setOn)
+{
+	if (flag_mask & V3D_STATE_LIGHT) visual->state_light_on = setOn;
+	if (flag_mask & V3D_STATE_BLEND) visual->state_blend_on = setOn;
+	if (flag_mask & V3D_STATE_COLOR) visual->state_color_on = setOn;
+}
+
+
+void visual_3d_set_texture_matrix(GF_VisualManager *visual, GF_Matrix *mx)
+{
+	visual->has_tx_matrix = mx ? 1 : 0;
+	if (mx) gf_mx_copy(visual->tx_matrix, *mx);
+}
+
+void visual_3d_has_inactive_light(GF_VisualManager *visual)
+{
+	visual->has_inactive_lights = GF_TRUE;
+}
+
+Bool visual_3d_add_point_light(GF_VisualManager *visual, Fixed ambientIntensity, SFVec3f attenuation, SFColor color, Fixed intensity, SFVec3f location, GF_Matrix *light_mx)
+{
+	if (visual->num_lights==visual->max_lights) return 0;
+	visual->lights[visual->num_lights].type = 2;
+	visual->lights[visual->num_lights].ambientIntensity = ambientIntensity;
+	visual->lights[visual->num_lights].attenuation = attenuation;
+	visual->lights[visual->num_lights].color = color;
+	visual->lights[visual->num_lights].intensity = intensity;
+	visual->lights[visual->num_lights].position = location;
+	memcpy(&visual->lights[visual->num_lights].light_mx, light_mx, sizeof(GF_Matrix) );
+	visual->num_lights++;
+	return 1;
+}
+
+Bool visual_3d_add_spot_light(GF_VisualManager *visual, Fixed ambientIntensity, SFVec3f attenuation, Fixed beamWidth,
+                              SFColor color, Fixed cutOffAngle, SFVec3f direction, Fixed intensity, SFVec3f location, GF_Matrix *light_mx)
+{
+	if (visual->num_lights==visual->max_lights) return 0;
+	visual->lights[visual->num_lights].type = 1;
+	visual->lights[visual->num_lights].ambientIntensity = ambientIntensity;
+	visual->lights[visual->num_lights].attenuation = attenuation;
+	visual->lights[visual->num_lights].beamWidth = beamWidth;
+	visual->lights[visual->num_lights].cutOffAngle = cutOffAngle;
+	visual->lights[visual->num_lights].color = color;
+	visual->lights[visual->num_lights].direction = direction;
+	visual->lights[visual->num_lights].intensity = intensity;
+	visual->lights[visual->num_lights].position = location;
+	memcpy(&visual->lights[visual->num_lights].light_mx, light_mx, sizeof(GF_Matrix) );
+	visual->num_lights++;
+	return 1;
+}
+
+Bool visual_3d_add_directional_light(GF_VisualManager *visual, Fixed ambientIntensity, SFColor color, Fixed intensity, SFVec3f direction, GF_Matrix *light_mx)
+{
+	if (visual->num_lights==visual->max_lights) return 0;
+	visual->lights[visual->num_lights].type = 0;
+	visual->lights[visual->num_lights].ambientIntensity = ambientIntensity;
+	visual->lights[visual->num_lights].color = color;
+	visual->lights[visual->num_lights].intensity = intensity;
+	visual->lights[visual->num_lights].direction = direction;
+	memcpy(&visual->lights[visual->num_lights].light_mx, light_mx, sizeof(GF_Matrix) );
+	visual->num_lights++;
+	return 1;
+}
+
+
+void visual_3d_remove_last_light(GF_VisualManager *visual)
+{
+	if (visual->num_lights) {
+		visual->num_lights--;
+	}
+}
+
+void visual_3d_clear_all_lights(GF_VisualManager *visual)
+{
+	visual->num_lights = 0;
+	visual->has_inactive_lights = GF_FALSE;
+}
 
+void visual_3d_set_fog(GF_VisualManager *visual, const char *type, SFColor color, Fixed density, Fixed visibility)
+{
+	visual->has_fog = GF_TRUE;
+	if (!type || !stricmp(type, "LINEAR")) visual->fog_type = 0;
+	else if (!stricmp(type, "EXPONENTIAL")) visual->fog_type = 1;
+	else if (!stricmp(type, "EXPONENTIAL2")) visual->fog_type = 2;
+
+	visual->fog_color = color;
+	visual->fog_density = density;
+	visual->fog_visibility = visibility;
+}
 
 #endif
+

gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_3d.h -> gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager_3d.h Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -30,9 +30,13 @@
 
 #ifndef GPAC_DISABLE_3D
 
- /*
- *	Visual 3D functions
- */
+
+#define GF_MAX_GL_CLIPS	12
+#define GF_MAX_GL_LIGHTS 12
+
+/*
+*	Visual 3D functions
+*/
 
 /*draw frame, performing collisions, camera displacement and drawing*/
 Bool visual_3d_draw_frame(GF_VisualManager *visual, GF_Node *root, GF_TraverseState *tr_state, Bool is_root_visual);
@@ -40,7 +44,7 @@
 /*traverse the scene and picks the node under the current ray, if any*/
 void visual_3d_pick_node(GF_VisualManager *visual, GF_TraverseState *tr_state, GF_Event *ev, GF_ChildNodeItem *children);
 
-/*checks a bounding box against the visual frustum. Returns true if box is visible, false otherwise. 
+/*checks a bounding box against the visual frustum. Returns true if box is visible, false otherwise.
 The cull_flag of the traversing state is updated to the box/frustum relation (in/out/intersect)*/
 Bool visual_3d_node_cull(GF_TraverseState *tr_state, GF_BBox *bbox, Bool skip_near);
 
@@ -74,7 +78,7 @@
 #endif
 
 
-/*sets 2D strike aspect 
+/*sets 2D strike aspect
 	- exported for text drawing*/
 void visual_3d_set_2d_strike(GF_TraverseState *tr_state, DrawAspect2D *asp);
 /*sets 3D material. Returns false is object is not visible due to appearance
@@ -83,7 +87,7 @@
 /*sets 3D texture. Returns true if a texture is found and successfully bound
 	- exported for text drawing*/
 Bool visual_3d_setup_texture(GF_TraverseState *tr_state, Fixed diffuse_alpha);
-/*disables texture 
+/*disables texture
 	- exported for text drawing*/
 void visual_3d_disable_texture(GF_TraverseState *tr_state);
 
@@ -91,8 +95,8 @@
 	- exported for Layer3D - try to harmonize*/
 void visual_3d_check_collisions(GF_TraverseState *tr_state, GF_ChildNodeItem *node_list);
 
-/*init drawing pass - exported for Layer3D 
-	@layer_type: 
+/*init drawing pass - exported for Layer3D
+	@layer_type:
 		0: not a layer
 		1: 3D layer in 3D context, depth clear but no color clear
 		2: 3D layer in 2D context (offscreen rendering), depth and color clear with alpha=0
@@ -103,7 +107,7 @@
 
 
 /*base 3D drawable*/
-typedef struct 
+typedef struct
 {
 	/*3D object for drawable if needed - ALLOCATED BY DEFAULT*/
 	GF_Mesh *mesh;
@@ -119,7 +123,7 @@
 
 void drawable3d_check_focus_highlight(GF_Node *node, GF_TraverseState *tr_state, GF_BBox *orig_bounds);
 
-typedef struct 
+typedef struct
 {
 	/*the directional light*/
 	GF_Node *dlight;
@@ -161,8 +165,29 @@
 #endif
 } Drawable3DContext;
 
+
+typedef struct
+{
+	//0: directional - 1: spot - 2: point
+	u32 type;
+	SFVec3f direction, position, attenuation;
+	Fixed ambientIntensity, intensity, beamWidth, cutOffAngle;
+	SFColor color;
+	GF_Matrix light_mx;
+} GF_LightInfo;
+
+
+typedef struct
+{
+	//0: directional - 1: spot - 2: point
+	GF_Plane p;
+	Bool is_2d_clip;
+	GF_Matrix *mx_clipper;
+} GF_ClipInfo;
+
+
 /*
-	till end of file: all 3D specific calls. 
+	till end of file: all 3D specific calls.
 */
 
 /*setup visual (hint & co)*/
@@ -194,25 +219,13 @@
 /*turns background state on/off. When on, all quality options are disabled in order to draw as fast as possible*/
 void visual_3d_set_background_state(GF_VisualManager *visual, Bool on);
 
-/*matrix mode types*/
-enum
-{
-	V3D_MATRIX_MODELVIEW,
-	V3D_MATRIX_PROJECTION,
-	V3D_MATRIX_TEXTURE,
-};
-/*set current matrix type*/
-void visual_3d_set_matrix_mode(GF_VisualManager *visual, u32 mat_type);
-/*push matrix stack*/
-void visual_3d_matrix_push(GF_VisualManager *visual);
-/*reset current matrix (identity)*/
-void visual_3d_matrix_reset(GF_VisualManager *visual);
-/*multiply current matrix with given matrix (16 coefs)*/
-void visual_3d_matrix_add(GF_VisualManager *visual, Fixed *mat);
-/*loads given matrix (16 coefs) as current one*/
-void visual_3d_matrix_load(GF_VisualManager *visual, Fixed *mat);
-/*pop matrix stack*/
-void visual_3d_matrix_pop(GF_VisualManager *visual);
+
+void visual_3d_set_texture_matrix(GF_VisualManager *visual, GF_Matrix *mx);
+//depending on platforms / GL rendering mode, the projection matrix is not loaded at each object Draw(). This function is used to notify a change
+//in the projection matrix to force a reload of the camera's projection
+void visual_3d_projection_matrix_modified(GF_VisualManager *visual);
+
+
 
 /*setup viewport (vp: top-left, width, height)*/
 void visual_3d_set_viewport(GF_VisualManager *visual, GF_Rect vp);
@@ -221,13 +234,20 @@
 
 /*setup rectangular cliper (clip: top-left, width, height)
 NOTE: 2D clippers can only be set from a 2D context, hence will always take the 4 first GL clip planes.
-In order to allow multiple Layer2D in Layer2D, THERE IS ALWAYS AT MOST ONE 2D CLIPPER USED AT ANY TIME, 
-it is the caller responsability to restore previous 2D clipers*/
-void visual_3d_set_clipper_2d(GF_VisualManager *visual, GF_Rect clip);
+In order to allow multiple Layer2D in Layer2D, THERE IS ALWAYS AT MOST ONE 2D CLIPPER USED AT ANY TIME,
+it is the caller responsability to restore previous 2D clipers
+
+the matrix is not copied, care should be taken to keep it unmodified until the cliper is reset (unless desired otherwise)
+if NULL, no specific clipping transform will be used*/
+void visual_3d_set_clipper_2d(GF_VisualManager *visual, GF_Rect clip, GF_Matrix *mx_at_clipper, Bool is_2d_clip);
 /*remove 2D clipper*/
 void visual_3d_reset_clipper_2d(GF_VisualManager *visual);
-/*set clipping plane*/
-void visual_3d_set_clip_plane(GF_VisualManager *visual, GF_Plane p);
+
+/*set clipping plane
+the matrix is not copied, care should be taken to keep it unmodified until the cliper is reset (unless desired otherwise)
+if NULL, no specific clipping transform will be used*/
+void visual_3d_set_clip_plane(GF_VisualManager *visual, GF_Plane p, GF_Matrix *mx_at_clipper, Bool is_2d_clip);
+
 /*reset last clipping plane set*/
 void visual_3d_reset_clip_plane(GF_VisualManager *visual);
 
@@ -239,9 +259,7 @@
 /*material types*/
 enum
 {
-	/*default material*/
-	V3D_MATERIAL_NONE,
-	V3D_MATERIAL_AMBIENT,
+	V3D_MATERIAL_AMBIENT=0,
 	V3D_MATERIAL_DIFFUSE,
 	V3D_MATERIAL_SPECULAR,
 	V3D_MATERIAL_EMISSIVE,
@@ -261,12 +279,15 @@
 /*disables all lights*/
 void visual_3d_clear_all_lights(GF_VisualManager *visual);
 /*insert spot light - returns 0 if too many lights*/
-Bool visual_3d_add_spot_light(GF_VisualManager *visual, Fixed ambientIntensity, SFVec3f attenuation, Fixed beamWidth, 
-					   SFColor color, Fixed cutOffAngle, SFVec3f direction, Fixed intensity, SFVec3f location);
+Bool visual_3d_add_spot_light(GF_VisualManager *visual, Fixed ambientIntensity, SFVec3f attenuation, Fixed beamWidth,
+                              SFColor color, Fixed cutOffAngle, SFVec3f direction, Fixed intensity, SFVec3f location, GF_Matrix *light_mx);
 /*insert point light - returns 0 if too many lights*/
-Bool visual_3d_add_point_light(GF_VisualManager *visual, Fixed ambientIntensity, SFVec3f attenuation, SFColor color, Fixed intensity, SFVec3f location);
+Bool visual_3d_add_point_light(GF_VisualManager *visual, Fixed ambientIntensity, SFVec3f attenuation, SFColor color, Fixed intensity, SFVec3f location, GF_Matrix *light_mx);
 /*insert directional light - returns 0 if too many lights*/
-Bool visual_3d_add_directional_light(GF_VisualManager *visual, Fixed ambientIntensity, SFColor color, Fixed intensity, SFVec3f direction);
+Bool visual_3d_add_directional_light(GF_VisualManager *visual, Fixed ambientIntensity, SFColor color, Fixed intensity, SFVec3f direction, GF_Matrix *light_mx);
+
+void visual_3d_has_inactive_light(GF_VisualManager *visual);
+
 /*set fog*/
 void visual_3d_set_fog(GF_VisualManager *visual, const char *type, SFColor color, Fixed density, Fixed visibility);
 /*fill given rect with given color (used for text hilighting only) - context shall not be altered*/
@@ -276,20 +297,8 @@
 
 /*non-oglES functions*/
 #ifndef GPAC_USE_OGL_ES
-
-/*draws image data:
-	pos_x, pos_y: top-left pos of image
-	width, height: size of image
-	pixelformat: image pixel format
-	data: image data
-	scale_x, scale_y: x & y scale
-*/
-void visual_3d_draw_image(GF_VisualManager *visual, Fixed pos_x, Fixed pos_y, u32 width, u32 height, u32 pixelformat, char *data, Fixed scale_x, Fixed scale_y);
-/*get matrix for the desired mode*/
-void visual_3d_matrix_get(GF_VisualManager *visual, u32 mat_type, Fixed *mat);
 /*X3D hatching*/
 void visual_3d_mesh_hatch(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 hatchStyle, SFColor hatchColor);
-
 #endif
 
 
@@ -299,7 +308,7 @@
 GF_Err visual_3d_init_autostereo(GF_VisualManager *visual);
 void visual_3d_end_auto_stereo_pass(GF_VisualManager *visual);
 
-void visual_3d_init_yuv_shader(GF_VisualManager *visual);
+void visual_3d_init_shaders(GF_VisualManager *visual);
 void visual_3d_reset_graphics(GF_VisualManager *visual);
 
 #endif /*GPAC_DISABLE_3D*/

gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_3d_gl.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager_3d_gl.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -137,6 +137,13 @@
 GLDECL_STATIC(glUniformMatrix3x4fv);
 GLDECL_STATIC(glUniformMatrix4x3fv);
 
+#ifndef GPAC_ANDROID
+GLDECL_STATIC(glEnableVertexAttribArray);
+GLDECL_STATIC(glDisableVertexAttribArray);
+GLDECL_STATIC(glVertexAttribPointer);
+GLDECL_STATIC(glVertexAttribIPointer);
+GLDECL_STATIC(glGetAttribLocation);
+#endif
 
 #endif //LOAD_GL_2_0
 
@@ -149,7 +156,7 @@
 #else
 	const char *ext = NULL;
 
-	if (compositor->visual->type_3d || compositor->hybrid_opengl) 
+	if (compositor->visual->type_3d || compositor->hybrid_opengl)
 		ext = (const char *) glGetString(GL_EXTENSIONS);
 
 	if (!ext) ext = gf_cfg_get_key(compositor->user->config, "Compositor", "OpenGLExtensions");
@@ -161,13 +168,13 @@
 
 	memset(&compositor->gl_caps, 0, sizeof(GLCaps));
 
-	if (CHECK_GL_EXT("GL_ARB_multisample") || CHECK_GL_EXT("GLX_ARB_multisample") || CHECK_GL_EXT("WGL_ARB_multisample")) 
+	if (CHECK_GL_EXT("GL_ARB_multisample") || CHECK_GL_EXT("GLX_ARB_multisample") || CHECK_GL_EXT("WGL_ARB_multisample"))
 		compositor->gl_caps.multisample = 1;
-	if (CHECK_GL_EXT("GL_ARB_texture_non_power_of_two")) 
+	if (CHECK_GL_EXT("GL_ARB_texture_non_power_of_two"))
 		compositor->gl_caps.npot_texture = 1;
-	if (CHECK_GL_EXT("GL_EXT_abgr")) 
+	if (CHECK_GL_EXT("GL_EXT_abgr"))
 		compositor->gl_caps.abgr_texture = 1;
-	if (CHECK_GL_EXT("GL_EXT_bgra")) 
+	if (CHECK_GL_EXT("GL_EXT_bgra"))
 		compositor->gl_caps.bgra_texture = 1;
 
 	if (CHECK_GL_EXT("GL_ARB_point_parameters")) {
@@ -192,7 +199,7 @@
 
 	/*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);
@@ -200,7 +207,7 @@
 	}
 	GET_GLFUN(glBlendEquation);
 #endif
-	
+
 #ifdef LOAD_GL_1_4
 	if (compositor->gl_caps.point_sprite) {
 		GET_GLFUN(glPointParameterf);
@@ -219,7 +226,7 @@
 	if (CHECK_GL_EXT("GL_ARB_pixel_buffer_object")) {
 		GET_GLFUN(glMapBuffer);
 		GET_GLFUN(glUnmapBuffer);
-		
+
 		compositor->gl_caps.pbo=1;
 	}
 #endif
@@ -229,7 +236,7 @@
 
 #ifdef LOAD_GL_2_0
 	GET_GLFUN(glCreateProgram);
-	
+
 	if (glCreateProgram != NULL) {
 		GET_GLFUN(glDeleteProgram);
 		GET_GLFUN(glLinkProgram);
@@ -270,6 +277,20 @@
 		GET_GLFUN(glUniformMatrix4x3fv);
 
 		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 = 0;
+		}
+#endif
+
+
 	} else {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] OpenGL shaders not supported\n"));
 	}
@@ -293,37 +314,16 @@
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
 
 
-
 static char *default_glsl_vertex = "\
 	varying vec3 gfNormal;\
-	varying vec3 gfView;\
 	varying vec2 TexCoord;\
 	void main(void)\
 	{\
-		gfView = vec3(gl_ModelViewMatrix * gl_Vertex);\
 		gfNormal = normalize(gl_NormalMatrix * gl_Normal);\
+		gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\
 		gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\
-		TexCoord = gl_MultiTexCoord0.st;\
-	}";
-
-#ifdef GPAC_UNUSED_FUNC
-static char *default_glsl_lighting = "\
-	varying vec3 gfNormal;\
-	varying vec3 gfView;\
-	varying vec2 TexCoord;\
-	void gpac_lighting (void)  \
-	{  \
-	   vec3 L = normalize(gl_LightSource[0].position.xyz - gfView);\
-	   vec3 E = normalize(-gfView); \
-	   vec3 R = normalize(-reflect(L,gfNormal));\
-	   vec4 Iamb = gl_FrontLightProduct[0].ambient;\
-	   vec4 Idiff = gl_FrontLightProduct[0].diffuse * max(dot(gfNormal,L), 0.0);\
-	   Idiff = clamp(Idiff, 0.0, 1.0);\
-	   vec4 Ispec = gl_FrontLightProduct[0].specular * pow(max(dot(R,E),0.0),0.3*gl_FrontMaterial.shininess);\
-	   Ispec = clamp(Ispec, 0.0, 1.0);\
-	   gl_FragColor = gl_FrontLightModelProduct.sceneColor + Iamb + Idiff + Ispec;\
+		TexCoord = vec2(gl_TextureMatrix[0] * gl_MultiTexCoord0);\
 	}";
-#endif /*GPAC_UNUSED_FUNC*/
 
 static char *glsl_view_anaglyph = "\
 	uniform sampler2D gfView1;\
@@ -419,7 +419,6 @@
 		vec2 texc;\n\
 		vec3 yuv, rgb;\n\
 		texc = TexCoord.st;\n\
-		texc.y = 1.0 - texc.y;\n\
 		yuv.x = texture2D(y_plane, texc).r;\n\
 		yuv.y = texture2D(u_plane, texc).r;\n\
 		yuv.z = texture2D(v_plane, texc).r;\n\
@@ -451,7 +450,6 @@
 		vec2 texc;\n\
 		vec3 yuv, rgb;\n\
 		texc = TexCoord.st;\n\
-		texc.y = 1.0 - texc.y;\n\
 		texc.x *= width;\n\
 		texc.y *= height;\n\
 		yuv.x = texture2DRect(y_plane, texc).r;\n\
@@ -483,7 +481,6 @@
 		vec2 texc;\n\
 		vec3 yuv, rgb;\n\
 		texc = TexCoord.st;\n\
-		texc.y = 1.0 - texc.y;\n\
 		texc.x *= width;\n\
 		texc.y *= height;\n\
 		yuv.x = texture2DRect(y_plane, texc).r;\n\
@@ -501,15 +498,15 @@
 
 Bool visual_3d_compile_shader(GF_SHADERID shader_id, const char *name, const char *source)
 {
-	GLint blen = 0;	
+	GLint blen = 0;
 	GLsizei slen = 0;
 	s32 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);       
+
+	glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH , &blen);
 	if (blen > 1) {
 		char* compiler_log = (char*) gf_malloc(blen);
 #ifdef CONFIG_DARWIN_GL
@@ -518,7 +515,7 @@
 		glGetInfoLogARB(shader_id, blen, &slen, compiler_log);
 #endif
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[GLSL] Failed to compile shader %s: %s\n", name, compiler_log));
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[GLSL] ***** faulty shader code ****\n%s\n**********************\n", source));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[GLSL] ***** faulty shader code ****\n%s\n**********************\n", source));
 		gf_free (compiler_log);
 		return 0;
 	}
@@ -554,10 +551,10 @@
 
 void visual_3d_init_stereo_shaders(GF_VisualManager *visual)
 {
-    if (!visual->compositor->gl_caps.has_shaders) return;
-    
+	if (!visual->compositor->gl_caps.has_shaders) return;
+
 	if (visual->autostereo_glsl_program) return;
-	
+
 	visual->autostereo_glsl_program = glCreateProgram();
 
 	if (!visual->base_glsl_vertex) {
@@ -589,26 +586,26 @@
 			visual->autostereo_glsl_fragment = visual_3d_shader_from_source_file(sOpt, GL_FRAGMENT_SHADER);
 		}
 	}
-		break;
+	break;
 	}
 
 	glAttachShader(visual->autostereo_glsl_program, visual->base_glsl_vertex);
 	glAttachShader(visual->autostereo_glsl_program, visual->autostereo_glsl_fragment);
-	glLinkProgram(visual->autostereo_glsl_program);  
+	glLinkProgram(visual->autostereo_glsl_program);
 }
 
 #define DEL_SHADER(_a) if (_a) { glDeleteShader(_a); _a = 0; }
 #define DEL_PROGRAM(_a) if (_a) { glDeleteProgram(_a); _a = 0; }
 
-void visual_3d_init_yuv_shader(GF_VisualManager *visual)
+static void visual_3d_init_yuv_shaders(GF_VisualManager *visual)
 {
 	u32 i;
 	GLint loc;
-    if (!visual->compositor->gl_caps.has_shaders) return;
+	if (!visual->compositor->gl_caps.has_shaders) return;
 
 	GL_CHECK_ERR
 	if (visual->yuv_glsl_program) return;
-	
+
 	visual->yuv_glsl_program = glCreateProgram();
 
 	if (!visual->base_glsl_vertex) {
@@ -621,10 +618,10 @@
 
 	glAttachShader(visual->yuv_glsl_program, visual->base_glsl_vertex);
 	glAttachShader(visual->yuv_glsl_program, visual->yuv_glsl_fragment);
-	glLinkProgram(visual->yuv_glsl_program);  
+	glLinkProgram(visual->yuv_glsl_program);
 
 	//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
-	glUseProgram(visual->yuv_glsl_program);  
+	glUseProgram(visual->yuv_glsl_program);
 	for (i=0; i<3; i++) {
 		const char *txname = (i==0) ? "y_plane" : (i==1) ? "u_plane" : "v_plane";
 		loc = glGetUniformLocation(visual->yuv_glsl_program, txname);
@@ -634,7 +631,7 @@
 		}
 		glUniform1i(loc, i);
 	}
-	glUseProgram(0);  
+	glUseProgram(0);
 
 	if (visual->compositor->gl_caps.rect_texture) {
 		Bool res;
@@ -670,10 +667,10 @@
 		if (visual->yuv_rect_glsl_program) {
 			glAttachShader(visual->yuv_rect_glsl_program, visual->base_glsl_vertex);
 			glAttachShader(visual->yuv_rect_glsl_program, visual->yuv_rect_glsl_fragment);
-			glLinkProgram(visual->yuv_rect_glsl_program);  
+			glLinkProgram(visual->yuv_rect_glsl_program);
 
 			//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
-			glUseProgram(visual->yuv_rect_glsl_program);  
+			glUseProgram(visual->yuv_rect_glsl_program);
 			for (i=0; i<3; i++) {
 				const char *txname = (i==0) ? "y_plane" : (i==1) ? "u_plane" : "v_plane";
 				loc = glGetUniformLocation(visual->yuv_rect_glsl_program, txname);
@@ -694,10 +691,29 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate width in YUV shader\n"));
 			}
 
-			glUseProgram(0);  
+			glUseProgram(0);
 		}
 	}
 }
+
+//todo ...
+static void visual_3d_init_generic_shaders(GF_VisualManager *visual)
+{
+	if (visual->glsl_program) return;
+
+}
+
+void visual_3d_init_shaders(GF_VisualManager *visual)
+{
+	if (!visual->compositor->gl_caps.has_shaders) return;
+
+	visual_3d_init_yuv_shaders(visual);
+	if (visual->compositor->shader_only_mode) {
+		visual_3d_init_generic_shaders(visual);
+	}
+
+}
+
 #endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
 
 
@@ -731,7 +747,7 @@
 	u32 bw, bh;
 	SFVec2f s;
 	if (visual->gl_textures) return GF_OK;
-	
+
 	visual->gl_textures = gf_malloc(sizeof(GLuint) * visual->nb_views);
 	glGenTextures(visual->nb_views, visual->gl_textures);
 
@@ -757,7 +773,6 @@
 	s.x = INT2FIX(bw);
 	s.y = INT2FIX(bh);
 	mesh_new_rectangle(visual->autostereo_mesh, s, NULL, 0);
-//	mesh_new_ellipse(visual->autostereo_mesh, s.x, s.y, 0);
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual3D] AutoStereo initialized - width %d height %d\n", visual->auto_stereo_width, visual->auto_stereo_height) );
 
@@ -786,11 +801,11 @@
 	glBindTexture(GL_TEXTURE_2D, visual->gl_textures[visual->current_view]);
 
 	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_CLAMP);
-	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP);	
+	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP);
 
-	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); 
+	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
 	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 
+	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
 	glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, visual->auto_stereo_width, visual->auto_stereo_height, 0);
@@ -845,10 +860,10 @@
 		glActiveTexture(GL_TEXTURE0 + i);
 
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);	
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); 
+		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); 
+		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
 
 		glBindTexture(GL_TEXTURE_2D, visual->gl_textures[i]);
 
@@ -936,8 +951,13 @@
 
 	glShadeModel(GL_SMOOTH);
 	glGetIntegerv(GL_MAX_LIGHTS, (GLint*)&visual->max_lights);
+	if (visual->max_lights>GF_MAX_GL_LIGHTS)
+		visual->max_lights=GF_MAX_GL_LIGHTS;
+
 #ifdef GL_MAX_CLIP_PLANES
 	glGetIntegerv(GL_MAX_CLIP_PLANES, (GLint*)&visual->max_clips);
+	if (visual->max_clips>GF_MAX_GL_CLIPS)
+		visual->max_clips=GF_MAX_GL_CLIPS;
 #endif
 
 	visual_3d_setup_quality(visual);
@@ -949,8 +969,9 @@
 	glDisable(GL_TEXTURE_2D);
 	glDisable(GL_CULL_FACE);
 	glDisable(GL_FOG);
+	visual->has_fog = GF_FALSE;
 	/*Note: we cannot enable/disable normalization on the fly, because we have no clue when the GL implementation
-	will actually compute the related fragments. Since a typical world always use scaling, we always turn normalization on 
+	will actually compute the related fragments. Since a typical world always use scaling, we always turn normalization on
 	to avoid tracking scale*/
 	glEnable(GL_NORMALIZE);
 
@@ -1000,21 +1021,6 @@
 	else glDisable(GL_DEPTH_TEST);
 }
 
-void visual_3d_enable_headlight(GF_VisualManager *visual, Bool bOn, GF_Camera *cam)
-{
-	SFVec3f dir;
-	SFColor col;
-	if (!bOn) return;
-
-	col.blue = col.red = col.green = FIX_ONE;
-	if (cam->is_3D) {
-		dir = camera_get_target_dir(cam);
-	} else {
-		dir.x = dir.y = 0; dir.z = FIX_ONE;
-	}
-	visual_3d_add_directional_light(visual, 0, col, FIX_ONE, dir);
-}
-
 void visual_3d_set_viewport(GF_VisualManager *visual, GF_Rect vp)
 {
 	glViewport(FIX2INT(vp.x), FIX2INT(vp.y), FIX2INT(vp.width), FIX2INT(vp.height));
@@ -1037,10 +1043,10 @@
 	glClear(GL_DEPTH_BUFFER_BIT);
 }
 
-void VS3D_DrawAABBNode(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 prim_type, GF_Plane *fplanes, u32 *p_indices, AABBNode *n)
+static void visual_3d_draw_aabb_node(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 prim_type, GF_Plane *fplanes, u32 *p_indices, AABBNode *n)
 {
 	u32 i;
-	
+
 	/*if not leaf do cull*/
 	if (n->pos) {
 		u32 p_idx, cull;
@@ -1051,16 +1057,22 @@
 		for (i=0; i<6; i++) {
 			p_idx = p_indices[i];
 			/*check p-vertex: if not in plane, we're out (since p-vertex is the closest point to the plane)*/
-			if (gf_plane_get_distance(&fplanes[i], &vertices[p_idx])<0) { cull = CULL_OUTSIDE; break; }
+			if (gf_plane_get_distance(&fplanes[i], &vertices[p_idx])<0) {
+				cull = CULL_OUTSIDE;
+				break;
+			}
 			/*check n-vertex: if not in plane, we're intersecting*/
-			if (gf_plane_get_distance(&fplanes[i], &vertices[7-p_idx])<0) { cull = CULL_INTERSECTS; break;}
+			if (gf_plane_get_distance(&fplanes[i], &vertices[7-p_idx])<0) {
+				cull = CULL_INTERSECTS;
+				break;
+			}
 		}
 
 		if (cull==CULL_OUTSIDE) return;
 
 		if (cull==CULL_INTERSECTS) {
-			VS3D_DrawAABBNode(tr_state, mesh, prim_type, fplanes, p_indices, n->pos);
-			VS3D_DrawAABBNode(tr_state, mesh, prim_type, fplanes, p_indices, n->neg);
+			visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_indices, n->pos);
+			visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_indices, n->neg);
 			return;
 		}
 	}
@@ -1078,1246 +1090,1382 @@
 	}
 }
 
-void VS3D_DrawMeshIntern(GF_TraverseState *tr_state, GF_Mesh *mesh)
+static void visual_3d_matrix_load(GF_VisualManager *visual, Fixed *mat)
 {
-	Bool has_col, has_tx, has_norm;
-	u32 prim_type;
-	GF_Compositor *compositor = tr_state->visual->compositor;
-	void *base_address = NULL;
-#if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_OGL_ES)
-	Float *color_array = NULL;
-	Float fix_scale = 1.0f;
-	fix_scale /= FIX_ONE;
+	if (!mat) {
+		glLoadIdentity();
+		return;
+	}
+#ifdef GPAC_USE_OGL_ES
+	glLoadMatrixx(mat);
+#elif defined(GPAC_FIXED_POINT)
+	Float _mat[16];
+	u32 i;
+	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
+	glLoadMatrixf(_mat);
+#else
+	glLoadMatrixf(mat);
 #endif
+}
 
-	has_col = has_tx = has_norm = 0;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Drawing mesh %p\n", mesh));
+static void visual_3d_matrix_add(GF_VisualManager *visual, Fixed *mat)
+{
+#ifdef GPAC_USE_OGL_ES
+	glMultMatrixx(mat);
+#elif defined(GPAC_FIXED_POINT)
+	u32 i;
+	Float _mat[16];
+	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
+	glMultMatrixf(_mat);
+#else
+	glMultMatrixf(mat);
+#endif
+}
 
 
-	if ((compositor->reset_graphics==2) && mesh->vbo) {
-		/*we lost OpenGL context at previous frame, recreate VBO*/
-		mesh->vbo = 0;
+static void visual_3d_update_matrices(GF_TraverseState *tr_state)
+{
+	if (tr_state->visual->needs_projection_matrix_reload) {
+		tr_state->visual->needs_projection_matrix_reload = 0;
+		glMatrixMode(GL_PROJECTION);
+		visual_3d_matrix_load(tr_state->visual, tr_state->camera->projection.m);
+		glMatrixMode(GL_MODELVIEW);
 	}
-	/*rebuild VBO for large ojects only (we basically filter quads out)*/
-	if ((mesh->v_count>4) && !mesh->vbo && compositor->gl_caps.vbo) {
-		glGenBuffers(1, &mesh->vbo);
-		if (mesh->vbo) {
-			glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
-			glBufferData(GL_ARRAY_BUFFER, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices, (mesh->vbo_dynamic) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
-			mesh->vbo_dirty = 0;
+
+	visual_3d_matrix_load(tr_state->visual, tr_state->camera->modelview.m);
+	visual_3d_matrix_add(tr_state->visual, tr_state->model_matrix.m);
+}
+
+
+static void visual_3d_set_clippers(GF_VisualManager *visual, GF_TraverseState *tr_state)
+{
+#ifdef GL_MAX_CLIP_PLANES
+	u32 i;
+	GF_Matrix inv_mx;
+
+	gf_mx_copy(inv_mx, tr_state->model_matrix);
+	gf_mx_inverse(&inv_mx);
+
+	for (i=0; i<visual->num_clips; i++) {
+		u32 idx = GL_CLIP_PLANE0 + i;
+#ifdef GPAC_USE_OGL_ES
+		Fixed g[4];
+#else
+		Double g[4];
+#endif
+		GF_Matrix mx;
+		GF_Plane p = visual->clippers[i].p;
+
+		if (visual->clippers[i].is_2d_clip) {
+			visual_3d_matrix_load(tr_state->visual, tr_state->camera->modelview.m);
+		} else {
+			gf_mx_copy(mx, inv_mx);
+			if (visual->clippers[i].mx_clipper != NULL) {
+				gf_mx_add_matrix(&mx, visual->clippers[i].mx_clipper);
+			}
+			gf_mx_apply_plane(&mx, &p);
+		}
+
+#ifdef GPAC_USE_OGL_ES
+		g[0] = p.normal.x;
+		g[1] = p.normal.y;
+		g[2] = p.normal.z;
+		g[3] = p.d;
+		glClipPlanex(idx, g);
+#else
+		g[0] = FIX2FLT(p.normal.x);
+		g[1] = FIX2FLT(p.normal.y);
+		g[2] = FIX2FLT(p.normal.z);
+		g[3] = FIX2FLT(p.d);
+		glClipPlane(idx, g);
+#endif
+		glEnable(idx);
+
+		if (visual->clippers[i].is_2d_clip) {
+			visual_3d_update_matrices(tr_state);
 		}
+
 	}
+#endif
 
-	if (mesh->vbo) {
-		base_address = NULL;
-		glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
-	} else {
-		base_address = & mesh->vertices[0].pos;
+}
+
+static void visual_3d_reset_clippers(GF_VisualManager *visual)
+{
+#ifdef GL_MAX_CLIP_PLANES
+	u32 i;
+	for (i=0; i<visual->num_clips; i++) {
+		glDisable(GL_CLIP_PLANE0 + i);
 	}
+#endif
+}
 
-	if (mesh->vbo_dirty) {
-		glBufferSubData(GL_ARRAY_BUFFER, 0, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices);
-		mesh->vbo_dirty = 0;
+
+void visual_3d_reset_lights(GF_VisualManager *visual)
+{
+	u32 i;
+	if (!visual->num_lights) return;
+	for (i=0; i<visual->num_lights; i++) {
+		glDisable(GL_LIGHT0 + i);
 	}
+	glDisable(GL_LIGHTING);
+}
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-#if defined(GPAC_USE_OGL_ES)
-	glVertexPointer(3, GL_FIXED, sizeof(GF_Vertex),  base_address);
-#elif defined(GPAC_FIXED_POINT)
-	/*scale modelview matrix*/
-	glPushMatrix();
-	glScalef(fix_scale, fix_scale, fix_scale);
-	glVertexPointer(3, GL_INT, sizeof(GF_Vertex), base_address);
+
+static void visual_3d_set_lights(GF_VisualManager *visual)
+{
+	u32 i;
+#ifdef GPAC_USE_OGL_ES
+	Fixed vals[4], exp;
 #else
-	glVertexPointer(3, GL_FLOAT, sizeof(GF_Vertex), base_address);
+	Float vals[4], intensity, cutOffAngle, beamWidth, ambientIntensity, exp;
 #endif
 
-	if (!tr_state->mesh_num_textures && (mesh->flags & MESH_HAS_COLOR)) {		
-		glEnable(GL_COLOR_MATERIAL);
-#if !defined (GPAC_USE_OGL_ES)
-		glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
-#endif
-		glEnableClientState(GL_COLOR_ARRAY);
-		has_col = 1;
+	if (!visual->num_lights) return;
 
-#if defined (GPAC_USE_OGL_ES)
+	for (i=0; i<visual->num_lights; i++) {
+		GF_LightInfo *li = &visual->lights[i];
+		GLint iLight = GL_LIGHT0 + i;
 
-		if (mesh->flags & MESH_HAS_ALPHA) {
-			glEnable(GL_BLEND);
-			tr_state->mesh_is_transparent = 1;
-		}
-#ifdef MESH_USE_SFCOLOR
-		/*glES only accepts full RGBA colors*/
-		glColorPointer(4, GL_FIXED, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
-#else
-		glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
-#endif	/*MESH_USE_SFCOLOR*/
+		visual_3d_matrix_load(visual, visual->camera.modelview.m);
+		visual_3d_matrix_add(visual, li->light_mx.m);
 
-#elif defined (GPAC_FIXED_POINT)
+		glEnable(iLight);
 
+		switch (li->type) {
+		//directionnal light
+		case 0:
+#ifdef GPAC_USE_OGL_ES
+			vals[0] = -li->direction.x;
+			vals[1] = -li->direction.y;
+			vals[2] = -li->direction.z;
+			vals[3] = 0;
+			glLightxv(iLight, GL_POSITION, vals);
+			vals[0] = gf_mulfix(li->color.red, li->intensity);
+			vals[1] = gf_mulfix(li->color.green, li->intensity);
+			vals[2] = gf_mulfix(li->color.blue, li->intensity);
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_DIFFUSE, vals);
+			glLightxv(iLight, GL_SPECULAR, vals);
+			vals[0] = gf_mulfix(li->color.red, li->ambientIntensity);
+			vals[1] = gf_mulfix(li->color.green, li->ambientIntensity);
+			vals[2] = gf_mulfix(li->color.blue, li->ambientIntensity);
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_AMBIENT, vals);
+
+			glLightx(iLight, GL_CONSTANT_ATTENUATION, FIX_ONE);
+			glLightx(iLight, GL_LINEAR_ATTENUATION, 0);
+			glLightx(iLight, GL_QUADRATIC_ATTENUATION, 0);
+			glLightx(iLight, GL_SPOT_CUTOFF, INT2FIX(180) );
+#else
+			ambientIntensity = FIX2FLT(li->ambientIntensity);
+			intensity = FIX2FLT(li->intensity);
+
+			vals[0] = -FIX2FLT(li->direction.x);
+			vals[1] = -FIX2FLT(li->direction.y);
+			vals[2] = -FIX2FLT(li->direction.z);
+			vals[3] = 0;
+			glLightfv(iLight, GL_POSITION, vals);
+			vals[0] = FIX2FLT(li->color.red)*intensity;
+			vals[1] = FIX2FLT(li->color.green)*intensity;
+			vals[2] = FIX2FLT(li->color.blue)*intensity;
+			vals[3] = 1;
+			glLightfv(iLight, GL_DIFFUSE, vals);
+			glLightfv(iLight, GL_SPECULAR, 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;
+			glLightfv(iLight, GL_AMBIENT, vals);
+
+			glLightf(iLight, GL_CONSTANT_ATTENUATION, 1.0f);
+			glLightf(iLight, GL_LINEAR_ATTENUATION, 0);
+			glLightf(iLight, GL_QUADRATIC_ATTENUATION, 0);
+			glLightf(iLight, GL_SPOT_CUTOFF, 180);
+#endif
+			break;
+
+
+		//spot light
+		case 1:
+#ifndef GPAC_USE_OGL_ES
+			ambientIntensity = FIX2FLT(li->ambientIntensity);
+			intensity = FIX2FLT(li->intensity);
+			cutOffAngle = FIX2FLT(li->cutOffAngle);
+			beamWidth = FIX2FLT(li->beamWidth);
+#endif
 
-#ifdef MESH_USE_SFCOLOR
-		/*this is a real pain: we cannot "scale" colors through openGL, and our components are 16.16 (32 bytes) ranging
-		from [0 to 65536] mapping to [0, 1.0], but openGL assumes for s32 a range from [-2^31 2^31] mapping to [0, 1.0]
-		we must thus rebuild a dedicated array...*/
-		if (mesh->flags & MESH_HAS_ALPHA) {
-			u32 i;
-			color_array = gf_malloc(sizeof(Float)*4*mesh->v_count);
-			for (i=0; i<mesh->v_count; i++) {
-				color_array[4*i] = FIX2FLT(mesh->vertices[i].color.red);
-				color_array[4*i+1] = FIX2FLT(mesh->vertices[i].color.green);
-				color_array[4*i+2] = FIX2FLT(mesh->vertices[i].color.blue);
-				color_array[4*i+3] = FIX2FLT(mesh->vertices[i].color.alpha);
-			}
-			glEnable(GL_BLEND);
-			glColorPointer(4, GL_FLOAT, 4*sizeof(Float), color_array);
-			tr_state->mesh_is_transparent = 1;
-		} else {
-			color_array = gf_malloc(sizeof(Float)*3*mesh->v_count);
-			for (i=0; i<mesh->v_count; i++) {
-				color_array[3*i] = FIX2FLT(mesh->vertices[i].color.red);
-				color_array[3*i+1] = FIX2FLT(mesh->vertices[i].color.green);
-				color_array[3*i+2] = FIX2FLT(mesh->vertices[i].color.blue);
+#ifdef GPAC_USE_OGL_ES
+			vals[0] = li->direction.x;
+			vals[1] = li->direction.y;
+			vals[2] = li->direction.z;
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_SPOT_DIRECTION, vals);
+			vals[0] = li->position.x;
+			vals[1] = li->position.y;
+			vals[2] = li->position.z;
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_POSITION, vals);
+			glLightx(iLight, GL_CONSTANT_ATTENUATION, li->attenuation.x ? li->attenuation.x : FIX_ONE);
+			glLightx(iLight, GL_LINEAR_ATTENUATION, li->attenuation.y);
+			glLightx(iLight, GL_QUADRATIC_ATTENUATION, li->attenuation.z);
+			vals[0] = gf_mulfix(li->color.red, li->intensity);
+			vals[1] = gf_mulfix(li->color.green, li->intensity);
+			vals[2] = gf_mulfix(li->color.blue, li->intensity);
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_DIFFUSE, vals);
+			glLightxv(iLight, GL_SPECULAR, vals);
+			vals[0] = gf_mulfix(li->color.red, li->ambientIntensity);
+			vals[1] = gf_mulfix(li->color.green, li->ambientIntensity);
+			vals[2] = gf_mulfix(li->color.blue, li->ambientIntensity);
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_AMBIENT, vals);
+
+			if (!li->beamWidth) exp = FIX_ONE;
+			else if (li->beamWidth > li->cutOffAngle) exp = 0;
+			else {
+				exp = FIX_ONE - gf_cos(li->beamWidth);
+				if (exp>FIX_ONE) exp = FIX_ONE;
 			}
-			glColorPointer(3, GL_FLOAT, 3*sizeof(Float), color_array);
-		}
+			glLightx(iLight, GL_SPOT_EXPONENT,  exp*128);
+			glLightx(iLight, GL_SPOT_CUTOFF, gf_divfix(180*li->cutOffAngle, GF_PI) );
 #else
-		glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
-#endif /*MESH_USE_SFCOLOR*/
+			vals[0] = FIX2FLT(li->direction.x);
+			vals[1] = FIX2FLT(li->direction.y);
+			vals[2] = FIX2FLT(li->direction.z);
+			vals[3] = 1;
+			glLightfv(iLight, GL_SPOT_DIRECTION, vals);
+			vals[0] = FIX2FLT(li->position.x);
+			vals[1] = FIX2FLT(li->position.y);
+			vals[2] = FIX2FLT(li->position.z);
+			vals[3] = 1;
+			glLightfv(iLight, GL_POSITION, vals);
+			glLightf(iLight, GL_CONSTANT_ATTENUATION, li->attenuation.x ? FIX2FLT(li->attenuation.x) : 1.0f);
+			glLightf(iLight, GL_LINEAR_ATTENUATION, FIX2FLT(li->attenuation.y));
+			glLightf(iLight, GL_QUADRATIC_ATTENUATION, FIX2FLT(li->attenuation.z));
+			vals[0] = FIX2FLT(li->color.red)*intensity;
+			vals[1] = FIX2FLT(li->color.green)*intensity;
+			vals[2] = FIX2FLT(li->color.blue)*intensity;
+			vals[3] = 1;
+			glLightfv(iLight, GL_DIFFUSE, vals);
+			glLightfv(iLight, GL_SPECULAR, 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;
+			glLightfv(iLight, GL_AMBIENT, vals);
+
+			//glLightf(iLight, GL_SPOT_EXPONENT, 0.5f * (beamWidth+0.001f) /*(Float) (0.5 * log(0.5) / log(cos(beamWidth)) ) */);
+			if (!beamWidth) exp = 1;
+			else if (beamWidth>cutOffAngle) exp = 0;
+			else {
+				exp = 1.0f - (Float) cos(beamWidth);
+				if (exp>1) exp = 1;
+			}
+			glLightf(iLight, GL_SPOT_EXPONENT,  exp*128);
+			glLightf(iLight, GL_SPOT_CUTOFF, 180*cutOffAngle/FIX2FLT(GF_PI));
+#endif
+			break;
 
-#else	
 
-#ifdef MESH_USE_SFCOLOR
-		if (mesh->flags & MESH_HAS_ALPHA) {
-			glEnable(GL_BLEND);
-			glColorPointer(4, GL_FLOAT, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
-			tr_state->mesh_is_transparent = 1;
-		} else {
-			glColorPointer(3, GL_FLOAT, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
-		}
+		//point light
+		case 2:
+#ifdef GPAC_USE_OGL_ES
+			vals[0] = li->position.x;
+			vals[1] = li->position.y;
+			vals[2] = li->position.z;
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_POSITION, vals);
+			glLightx(iLight, GL_CONSTANT_ATTENUATION, li->attenuation.x ? li->attenuation.x : FIX_ONE);
+			glLightx(iLight, GL_LINEAR_ATTENUATION, li->attenuation.y);
+			glLightx(iLight, GL_QUADRATIC_ATTENUATION, li->attenuation.z);
+			vals[0] = gf_mulfix(li->color.red, li->intensity);
+			vals[1] = gf_mulfix(li->color.green, li->intensity);
+			vals[2] = gf_mulfix(li->color.blue, li->intensity);
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_DIFFUSE, vals);
+			glLightxv(iLight, GL_SPECULAR, vals);
+			vals[0] = gf_mulfix(li->color.red, li->ambientIntensity);
+			vals[1] = gf_mulfix(li->color.green, li->ambientIntensity);
+			vals[2] = gf_mulfix(li->color.blue, li->ambientIntensity);
+			vals[3] = FIX_ONE;
+			glLightxv(iLight, GL_AMBIENT, vals);
+
+			glLightx(iLight, GL_SPOT_EXPONENT, 0);
+			glLightx(iLight, GL_SPOT_CUTOFF, INT2FIX(180) );
 #else
-		if (mesh->flags & MESH_HAS_ALPHA) {
-			glEnable(GL_BLEND);
-			tr_state->mesh_is_transparent = 1;
-			glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
-		} else {
-			glColorPointer(3, GL_UNSIGNED_BYTE, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
+			ambientIntensity = FIX2FLT(li->ambientIntensity);
+			intensity = FIX2FLT(li->intensity);
+
+			vals[0] = FIX2FLT(li->position.x);
+			vals[1] = FIX2FLT(li->position.y);
+			vals[2] = FIX2FLT(li->position.z);
+			vals[3] = 1;
+			glLightfv(iLight, GL_POSITION, vals);
+			glLightf(iLight, GL_CONSTANT_ATTENUATION, li->attenuation.x ? FIX2FLT(li->attenuation.x) : 1.0f);
+			glLightf(iLight, GL_LINEAR_ATTENUATION, FIX2FLT(li->attenuation.y));
+			glLightf(iLight, GL_QUADRATIC_ATTENUATION, FIX2FLT(li->attenuation.z));
+			vals[0] = FIX2FLT(li->color.red)*intensity;
+			vals[1] = FIX2FLT(li->color.green)*intensity;
+			vals[2] = FIX2FLT(li->color.blue)*intensity;
+			vals[3] = 1;
+			glLightfv(iLight, GL_DIFFUSE, vals);
+			glLightfv(iLight, GL_SPECULAR, 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;
+			glLightfv(iLight, GL_AMBIENT, vals);
+
+			glLightf(iLight, GL_SPOT_EXPONENT, 0);
+			glLightf(iLight, GL_SPOT_CUTOFF, 180);
+#endif
+			break;
 		}
-#endif /*MESH_USE_SFCOLOR*/
-
-#endif
 	}
 
-	if (tr_state->mesh_num_textures && !mesh->mesh_type && !(mesh->flags & MESH_NO_TEXTURE)) {
-		has_tx = 1;
-#if defined(GPAC_USE_OGL_ES)
-		glTexCoordPointer(2, GL_FIXED, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
-		glEnableClientState(GL_TEXTURE_COORD_ARRAY );
-#elif defined(GPAC_FIXED_POINT)
-		glMatrixMode(GL_TEXTURE);
-		glPushMatrix();
-		glScalef(fix_scale, fix_scale, fix_scale);
-		glMatrixMode(GL_MODELVIEW);
-		glTexCoordPointer(2, GL_INT, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
-		glEnableClientState(GL_TEXTURE_COORD_ARRAY );
-#else
+	glEnable(GL_LIGHTING);
+
+}
+
+void visual_3d_enable_fog(GF_VisualManager *visual)
+{
 
 #ifndef GPAC_USE_TINYGL
-		if (tr_state->mesh_num_textures>1) {
-			u32 i;
-			for (i=0; i<tr_state->mesh_num_textures; i++) {
-				glClientActiveTexture(GL_TEXTURE0 + i);
-				glTexCoordPointer(2, GL_FLOAT, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
-				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-			}
-		} else
-#endif //GPAC_USE_TINYGL
-		{
-			glTexCoordPointer(2, GL_FLOAT, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
-			glEnableClientState(GL_TEXTURE_COORD_ARRAY );
-		}
-#endif
-	}
 
-	if (mesh->mesh_type) {
 #ifdef GPAC_USE_OGL_ES
-		glNormal3x(0, 0, FIX_ONE);
+	Fixed vals[4];
+	glEnable(GL_FOG);
+	if (!visual->fog_type) glFogx(GL_FOG_MODE, GL_LINEAR);
+	else if (visual->fog_type==1) glFogx(GL_FOG_MODE, GL_EXP);
+	else if (visual->fog_type==2) glFogx(GL_FOG_MODE, GL_EXP2);
+	glFogx(GL_FOG_DENSITY, visual->fog_density);
+	glFogx(GL_FOG_START, 0);
+	glFogx(GL_FOG_END, visual->fog_visibility);
+	vals[0] = visual->fog_color.red;
+	vals[1] = visual->fog_color.green;
+	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);
 #else
-		glNormal3f(0, 0, 1.0f);
+	Float vals[4];
+	glEnable(GL_FOG);
+	if (!visual->fog_type) glFogi(GL_FOG_MODE, GL_LINEAR);
+	else if (visual->fog_type==1) glFogi(GL_FOG_MODE, GL_EXP);
+	else if (visual->fog_type==2) glFogi(GL_FOG_MODE, GL_EXP2);
+	glFogf(GL_FOG_DENSITY, FIX2FLT(visual->fog_density));
+	glFogf(GL_FOG_START, 0);
+	glFogf(GL_FOG_END, FIX2FLT(visual->fog_visibility));
+	vals[0] = FIX2FLT(visual->fog_color.red);
+	vals[1] = FIX2FLT(visual->fog_color.green);
+	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);
 #endif
-		glDisable(GL_CULL_FACE);
-		glDisable(GL_LIGHTING);
-		if (mesh->mesh_type==2) glDisable(GL_LINE_SMOOTH);
-		else glDisable(GL_POINT_SMOOTH);
 
-#if !defined(GPAC_USE_TINYGL) && !defined(GL_ES_CL_PROFILE)
-		glLineWidth(1.0f);
 #endif
-	
-	} else {
-		u32 normal_type = GL_FLOAT;
-		has_norm = 1;
-		glEnableClientState(GL_NORMAL_ARRAY );
-#ifdef MESH_USE_FIXED_NORMAL
 
-#if defined(GPAC_USE_OGL_ES)
-		normal_type = GL_FIXED;
-#elif defined(GPAC_FIXED_POINT)
-		normal_type = GL_INT;
-#else
-		normal_type = GL_FLOAT;
-#endif
+}
 
-#else /*MESH_USE_FIXED_NORMAL*/
-		/*normals are stored on signed bytes*/
-		normal_type = GL_BYTE;
-#endif
-		glNormalPointer(normal_type, sizeof(GF_Vertex), ((char *)base_address + MESH_NORMAL_OFFSET));
 
-		if (!mesh->mesh_type) {
-			if (compositor->backcull 
-				&& (!tr_state->mesh_is_transparent || (compositor->backcull ==GF_BACK_CULL_ALPHA) )
-				&& (mesh->flags & MESH_IS_SOLID)) {
-				glEnable(GL_CULL_FACE);
-				glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
-			} else {
-				glDisable(GL_CULL_FACE);
-			}
-		}
-	}
+static void visual_3d_do_draw_mesh(GF_TraverseState *tr_state, GF_Mesh *mesh)
+{
+	u32 prim_type;
+	GF_Matrix mx;
+	u32 i, p_idx[6];
+	GF_Plane fplanes[6];
+
 
 	switch (mesh->mesh_type) {
-	case MESH_LINESET: prim_type = GL_LINES; break;
-	case MESH_POINTSET: prim_type = GL_POINTS; break;
-	default: prim_type = GL_TRIANGLES; break;
+	case MESH_LINESET:
+		prim_type = GL_LINES;
+		break;
+	case MESH_POINTSET:
+		prim_type = GL_POINTS;
+		break;
+	default:
+		prim_type = GL_TRIANGLES;
+		break;
 	}
 
-#if 1
 	/*if inside or no aabb for the mesh draw vertex array*/
-	if (compositor->disable_gl_cull || (tr_state->cull_flag==CULL_INSIDE) || !mesh->aabb_root || !mesh->aabb_root->pos)	{
+	if (tr_state->visual->compositor->disable_gl_cull || (tr_state->cull_flag==CULL_INSIDE) || !mesh->aabb_root || !mesh->aabb_root->pos)	{
 #ifdef GPAC_USE_OGL_ES
 		glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_SHORT, mesh->indices);
 #else
 		glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_INT, mesh->indices);
 #endif
-	} else {
-		/*otherwise cull aabb against frustum - after some testing it appears (as usual) that there must 
-		be a compromise: we're slowing down the compositor here, however the gain is really appreciable for 
-		large meshes, especially terrains/elevation grids*/
 
-		/*first get transformed frustum in local space*/
-		GF_Matrix mx;
-		u32 i, p_idx[6];
-		GF_Plane fplanes[6];
-		gf_mx_copy(mx, tr_state->model_matrix);
-		gf_mx_inverse(&mx);
-		for (i=0; i<6; i++) {
-			fplanes[i] = tr_state->camera->planes[i];
-			gf_mx_apply_plane(&mx, &fplanes[i]);
-			p_idx[i] = gf_plane_get_p_vertex_idx(&fplanes[i]);
-		}
-		/*then recursively cull & draw AABB tree*/
-		VS3D_DrawAABBNode(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->pos);
-		VS3D_DrawAABBNode(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->neg);
+		return;
 	}
 
-#endif
-
-	glDisableClientState(GL_VERTEX_ARRAY);
-	if (has_col) glDisableClientState(GL_COLOR_ARRAY);
-	glDisable(GL_COLOR_MATERIAL);
-
-	if (has_tx) glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-	if (has_norm) glDisableClientState(GL_NORMAL_ARRAY);
-
-	if (mesh->vbo) 
-		glBindBuffer(GL_ARRAY_BUFFER, 0);
+	/*otherwise cull aabb against frustum - after some testing it appears (as usual) that there must
+	be a compromise: we're slowing down the compositor here, however the gain is really appreciable for
+	large meshes, especially terrains/elevation grids*/
 
-#if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_OGL_ES)
-	if (color_array) gf_free(color_array);
-	if (tr_state->mesh_num_textures && !mesh->mesh_type && !(mesh->flags & MESH_NO_TEXTURE)) {
-		glMatrixMode(GL_TEXTURE);
-		glPopMatrix();
-		glMatrixMode(GL_MODELVIEW);
+	/*first get transformed frustum in local space*/
+	gf_mx_copy(mx, tr_state->model_matrix);
+	gf_mx_inverse(&mx);
+	for (i=0; i<6; i++) {
+		fplanes[i] = tr_state->camera->planes[i];
+		gf_mx_apply_plane(&mx, &fplanes[i]);
+		p_idx[i] = gf_plane_get_p_vertex_idx(&fplanes[i]);
 	}
-	glPopMatrix();
-#endif
-	
-	if (tr_state->mesh_is_transparent) glDisable(GL_BLEND);
-	tr_state->mesh_is_transparent = 0;
+	/*then recursively cull & draw AABB tree*/
+	visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->pos);
+	visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->neg);
 }
 
-#ifdef GPAC_USE_OGL_ES
-u32 ogles_push_enable(u32 mask)
+#ifndef GPAC_ANDROID
+
+static GLint my_glGetUniformLocation(GF_SHADERID glsl_program, const char *uniform_name)
 {
-	u32 attrib = 0;
-#if !defined(__SYMBIAN32__) && !defined(GL_ES_CL_PROFILE)
-	if ((mask & GL_LIGHTING) && glIsEnabled(GL_LIGHTING) ) attrib |= GL_LIGHTING;
-	if ((mask & GL_BLEND) && glIsEnabled(GL_BLEND) ) attrib |= GL_BLEND;
-	if ((mask & GL_COLOR_MATERIAL) && glIsEnabled(GL_COLOR_MATERIAL) ) attrib |= GL_COLOR_MATERIAL;
-	if ((mask & GL_TEXTURE_2D) && glIsEnabled(GL_TEXTURE_2D) ) attrib |= GL_TEXTURE_2D;
-#endif
-	return attrib;
+	GLint loc = glGetUniformLocation(glsl_program, uniform_name);
+	if (loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Cannot find uniform \"%s\" in GLSL program\n", uniform_name));
+	}
+	return loc;
 }
-void ogles_pop_enable(u32 mask)
+
+static GLint my_glGetAttribLocation(GF_SHADERID glsl_program, const char *attrib_name)
 {
-#if !defined(__SYMBIAN32__) && !defined(GL_ES_CL_PROFILE)
-	if (mask & GL_LIGHTING) glEnable(GL_LIGHTING);
-	if (mask & GL_BLEND) glEnable(GL_BLEND);
-	if (mask & GL_COLOR_MATERIAL) glEnable(GL_COLOR_MATERIAL);
-	if (mask & GL_TEXTURE_2D) glEnable(GL_TEXTURE_2D);
-#endif
+	GLint loc = glGetAttribLocation(glsl_program, attrib_name);
+	if (loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Cannot find attrib \"%s\" in GLSL program\n", attrib_name));
+	}
+	return loc;
 }
-#endif
 
-/*note we don't perform any culling for normal drawing...*/
-void VS3D_DrawNormals(GF_TraverseState *tr_state, GF_Mesh *mesh)
+static void visual_3d_draw_mesh_shader_only(GF_TraverseState *tr_state, GF_Mesh *mesh, void *vertex_buffer_address)
 {
-#ifndef GPAC_USE_TINYGL
+	GF_VisualManager *visual = tr_state->visual;
+	GLint loc;
+	GF_Matrix mx;
+	GL_CHECK_ERR
+	glUseProgram(visual->glsl_program);
+	GL_CHECK_ERR
 
-	GF_Vec pt, end;
-	u32 i, j;
-	Fixed scale = mesh->bounds.radius / 4;
+	loc = my_glGetUniformLocation(visual->glsl_program, "gfModelViewMatrix");
+	if (loc<0) return;
+	gf_mx_copy(mx, tr_state->camera->modelview);
+	gf_mx_add_matrix(&mx, &tr_state->model_matrix);
+	glUniformMatrix4fv(loc, 1, GL_FALSE, mx.m);
+	GL_CHECK_ERR
 
-#ifdef GPAC_USE_OGL_ES
-	GF_Vec va[2];
-	u16 indices[2];
-	u32 attrib = ogles_push_enable(GL_LIGHTING | GL_BLEND | GL_COLOR_MATERIAL | GL_TEXTURE_2D);
-	glEnableClientState(GL_VERTEX_ARRAY);
-#else
-	glPushAttrib(GL_ENABLE_BIT);
-#endif
+	loc = my_glGetUniformLocation(visual->glsl_program, "gfProjectionMatrix");
+	if (loc<0) return;
+	glUniformMatrix4fv(loc, 1, GL_FALSE, tr_state->camera->projection.m);
+	GL_CHECK_ERR
 
-	glDisable(GL_LIGHTING | GL_BLEND | GL_COLOR_MATERIAL | GL_TEXTURE_2D);
-#ifdef GPAC_USE_OGL_ES
-	glColor4x(0, 0, 0, 1);
-#else
-	glColor3f(1, 1, 1);
-#endif
+	loc = my_glGetAttribLocation(visual->glsl_program, "gfVertex");
+	if (loc<0) return;
+	glVertexAttribPointer(loc, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), vertex_buffer_address);
+	glEnableVertexAttribArray(loc);
+	GL_CHECK_ERR
 
-	if (tr_state->visual->compositor->draw_normals==GF_NORMALS_VERTEX) {
-		IDX_TYPE *idx = mesh->indices;
-		for (i=0; i<mesh->i_count; i+=3) {
-			for (j=0; j<3; j++) {
-				pt = mesh->vertices[idx[j]].pos;
-				MESH_GET_NORMAL(end, mesh->vertices[idx[j]]);
-				end = gf_vec_scale(end, scale);
-				gf_vec_add(end, pt, end);
-#ifdef GPAC_USE_OGL_ES
-				va[0] = pt;
-				va[1] = end;
-				indices[0] = 0;
-				indices[1] = 1;
-				glVertexPointer(3, GL_FIXED, 0, va);
-				glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, indices);
-#else
-				glBegin(GL_LINES);
-				glVertex3f(FIX2FLT(pt.x), FIX2FLT(pt.y), FIX2FLT(pt.z));
-				glVertex3f(FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z));
-				glEnd();
-#endif
-			}
-			idx+=3;
-		}
-	} else {
-		IDX_TYPE *idx = mesh->indices;
-		for (i=0; i<mesh->i_count; i+=3) {
-			gf_vec_add(pt, mesh->vertices[idx[0]].pos, mesh->vertices[idx[1]].pos);
-			gf_vec_add(pt, pt, mesh->vertices[idx[2]].pos);
-			pt = gf_vec_scale(pt, FIX_ONE/3);
-			MESH_GET_NORMAL(end, mesh->vertices[idx[0]]);
-			end = gf_vec_scale(end, scale);
-			gf_vec_add(end, pt, end);
-#ifdef GPAC_USE_OGL_ES
-				va[0] = pt;
-				va[1] = end;
-				indices[0] = 0;
-				indices[1] = 1;
-				glVertexPointer(3, GL_FIXED, 0, va);
-				glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, indices);
-#else
-				glBegin(GL_LINES);
-				glVertex3f(FIX2FLT(pt.x), FIX2FLT(pt.y), FIX2FLT(pt.z));
-				glVertex3f(FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z));
-				glEnd();
-#endif
-			idx += 3;
-		}
+	if (visual->has_material_2d) {
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
+		if (loc>=0)
+			glUniform4fv(loc, 1, (GLfloat *) & visual->mat_2d);
+
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+		if (loc>=0)
+			glUniform1i(loc, 0);
 	}
-#ifdef GPAC_USE_OGL_ES
-	ogles_pop_enable(attrib);
-	glDisableClientState(GL_VERTEX_ARRAY);
-#else
-	glPopAttrib();
-#endif
 
-#endif	/*GPAC_USE_TINYGL*/
-}
+	if (visual->has_material) {
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfAmbientColor");
+		if (loc>=0)
+			glUniform4fv(loc, 1, (GLfloat *) & visual->materials[0] );
 
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfDiffuseColor");
+		if (loc>=0)
+			glUniform4fv(loc, 1, (GLfloat *) & visual->materials[1] );
 
-void VS3D_DrawAABBNodeBounds(GF_TraverseState *tr_state, AABBNode *node)
-{
-	if (node->pos) {
-		VS3D_DrawAABBNodeBounds(tr_state, node->pos);
-		VS3D_DrawAABBNodeBounds(tr_state, node->neg);
-	} else {
-		SFVec3f c, s;
-		gf_vec_diff(s, node->max, node->min);
-		c = gf_vec_scale(s, FIX_ONE/2);
-		gf_vec_add(c, node->min, c);
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfSpecularColor");
+		if (loc>=0)
+			glUniform4fv(loc, 1, (GLfloat *) & visual->materials[2] );
+
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
+		if (loc>=0)
+			glUniform4fv(loc, 1, (GLfloat *) & visual->materials[3] );
+
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfShininess");
+		if (loc>=0)
+			glUniform1f(loc, visual->shininess );
 
-		glPushMatrix();
-#ifdef GPAC_USE_OGL_ES
-		glTranslatex(c.x, c.y, c.z);
-		glScalex(s.x, s.y, s.z);
-#else
-		glTranslatef(FIX2FLT(c.x), FIX2FLT(c.y), FIX2FLT(c.z));
-		glScalef(FIX2FLT(s.x), FIX2FLT(s.y), FIX2FLT(s.z));
-#endif
-		VS3D_DrawMeshIntern(tr_state, tr_state->visual->compositor->unit_bbox);
-		glPopMatrix();
 	}
-}
 
-void visual_3d_draw_bbox(GF_TraverseState *tr_state, GF_BBox *box)
-{
-	SFVec3f c, s;
-#ifdef GPAC_USE_TINYGL
+	if (!visual->has_material_2d && visual->num_lights && !mesh->mesh_type) {
+		GF_Matrix normal_mx;
+		GF_Vec pt;
+		GF_LightInfo *li;
+		Float ambientIntensity, intensity;
+		Float vals[4];
 
-#elif defined(GPAC_USE_OGL_ES)
-	u32 atts = ogles_push_enable(GL_LIGHTING);
-#else
-	glPushAttrib(GL_ENABLE_BIT);
-#endif
-	gf_vec_diff(s, box->max_edge, box->min_edge);
-	c.x = box->min_edge.x + s.x/2;
-	c.y = box->min_edge.y + s.y/2;
-	c.z = box->min_edge.z + s.z/2;
+		gf_mx_copy(normal_mx, mx);
+		normal_mx.m[12] = normal_mx.m[13] = normal_mx.m[14] = 0;
+		gf_mx_inverse(&normal_mx);
+		normal_mx.m[12] = normal_mx.m[13] = normal_mx.m[14] = 0;
 
-	visual_3d_set_material_2d_argb(tr_state->visual, tr_state->visual->compositor->highlight_stroke);
-	glPushMatrix();
-	
-#ifdef GPAC_USE_OGL_ES
-	glTranslatex(c.x, c.y, c.z);
-	glScalex(s.x, s.y, s.z);
-#else
-	glTranslatef(FIX2FLT(c.x), FIX2FLT(c.y), FIX2FLT(c.z));
-	glScalef(FIX2FLT(s.x), FIX2FLT(s.y), FIX2FLT(s.z));
-//	glScalef(1.1f, 1.1f, 1.1f);
-#endif
-	VS3D_DrawMeshIntern(tr_state, tr_state->visual->compositor->unit_bbox);
-	glPopMatrix();
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfNormalMatrix");
+		//transpose the matrix when uploading
+		if (loc>=0)
+			glUniformMatrix4fv(loc, 1, GL_TRUE, normal_mx.m);
+		GL_CHECK_ERR
 
-#ifdef GPAC_USE_TINYGL
 
-#elif defined(GPAC_USE_OGL_ES)
-	ogles_pop_enable(atts);
+		loc = my_glGetAttribLocation(visual->glsl_program, "gfNormal");
+		if (loc>=0) {
+#ifdef MESH_USE_FIXED_NORMAL
+			glVertexAttribPointer(loc, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex),  ((char *)vertex_buffer_address + MESH_NORMAL_OFFSET) );
 #else
-	glPopAttrib();
+			glVertexAttribPointer(loc, 3, GL_BYTE, GL_TRUE, sizeof(GF_Vertex),  ((char *)vertex_buffer_address + MESH_NORMAL_OFFSET) );
 #endif
+			glEnableVertexAttribArray(loc);
+		}
+		GL_CHECK_ERR
+
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+		if (loc>=0)
+			glUniform1i(loc, 1);
+
+		li = &visual->lights[0];
+
+		//only one light for now
+		pt = li->direction;
+		gf_mx_copy(mx, tr_state->camera->modelview);
+		gf_mx_add_matrix(&mx, &li->light_mx);
+		gf_mx_apply_vec(&mx, &pt);
+		gf_vec_norm(&pt);
+		vals[0] = -FIX2FLT(pt.x);
+		vals[1] = -FIX2FLT(pt.y);
+		vals[2] = -FIX2FLT(pt.z);
+		vals[3] = 0;
+//		vals[0] = FIX2FLT(pt.x); vals[1] = FIX2FLT(pt.y); vals[2] = FIX2FLT(pt.z); vals[3] = 0;
+
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfLightPosition");
+		if (loc>=0)
+			glUniform4fv(loc, 1, vals);
+
+		ambientIntensity = FIX2FLT(li->ambientIntensity);
+		intensity = FIX2FLT(li->intensity);
+
+		vals[0] = FIX2FLT(li->color.red)*intensity;
+		vals[1] = FIX2FLT(li->color.green)*intensity;
+		vals[2] = FIX2FLT(li->color.blue)*intensity;
+		vals[3] = 1;
+		loc = my_glGetUniformLocation(visual->glsl_program, "gfLightDiffuse");
+		if (loc>=0) glUniform4fv(loc, 1, vals);
+		loc = my_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 = my_glGetUniformLocation(visual->glsl_program, "gfLightAmbiant");
+		if (loc>=0) glUniform4fv(loc, 1, vals);
+
+		if (visual->compositor->backcull
+		        && (!tr_state->mesh_is_transparent || (visual->compositor->backcull ==GF_BACK_CULL_ALPHA) )
+		        && (mesh->flags & MESH_IS_SOLID)) {
+			glEnable(GL_CULL_FACE);
+			glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
+		} else {
+			glDisable(GL_CULL_FACE);
+		}
+	}
+
+	visual_3d_do_draw_mesh(tr_state, mesh);
 
+	GL_CHECK_ERR
+	glUseProgram(0);
 }
-//#endif
 
+#endif //GPAC_ANDROID
 
-void VS3D_DrawMeshBoundingVolume(GF_TraverseState *tr_state, GF_Mesh *mesh)
+static void visual_3d_draw_mesh(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
-#ifndef GPAC_USE_TINYGL
-	if (mesh->aabb_root && (tr_state->visual->compositor->draw_bvol==GF_BOUNDS_AABB)) {
-#ifdef GPAC_USE_OGL_ES
-		u32 atts = ogles_push_enable(GL_LIGHTING);
-#else
-		glPushAttrib(GL_ENABLE_BIT);
-#endif
-		glDisable(GL_LIGHTING);
-		VS3D_DrawAABBNodeBounds(tr_state, mesh->aabb_root);
-#ifdef GPAC_USE_OGL_ES
-		ogles_pop_enable(atts);
-#else
-		glPopAttrib();
+	Bool has_col, has_tx, has_norm;
+	GF_VisualManager *visual = tr_state->visual;
+	GF_Compositor *compositor = tr_state->visual->compositor;
+	void *base_address = NULL;
+#if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_OGL_ES)
+	Float *color_array = NULL;
+	Float fix_scale = 1.0f;
+	fix_scale /= FIX_ONE;
 #endif
-	} else {
-		visual_3d_draw_bbox(tr_state, &mesh->bounds);
-	}
 
+	has_col = has_tx = has_norm = 0;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Drawing mesh %p\n", mesh));
 
-#endif /*GPAC_USE_TINYGL*/
-}
+	if ((compositor->reset_graphics==2) && mesh->vbo) {
+		/*we lost OpenGL context at previous frame, recreate VBO*/
+		mesh->vbo = 0;
+	}
+	/*rebuild VBO for large ojects only (we basically filter quads out)*/
+	if ((mesh->v_count>4) && !mesh->vbo && compositor->gl_caps.vbo) {
+		GL_CHECK_ERR
+		glGenBuffers(1, &mesh->vbo);
+		GL_CHECK_ERR
+		if (mesh->vbo) {
+			glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
+			GL_CHECK_ERR
+			glBufferData(GL_ARRAY_BUFFER, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices, (mesh->vbo_dynamic) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
+			GL_CHECK_ERR
+			mesh->vbo_dirty = 0;
+		}
+	}
 
-void visual_3d_mesh_paint(GF_TraverseState *tr_state, GF_Mesh *mesh)
-{
-	Bool mesh_drawn = 0;
-	if (tr_state->visual->compositor->wiremode != GF_WIREFRAME_ONLY) {
-		VS3D_DrawMeshIntern(tr_state, mesh);
-		mesh_drawn = 1;
+	if (mesh->vbo) {
+		base_address = NULL;
+		glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
+		GL_CHECK_ERR
+	} else {
+		base_address = & mesh->vertices[0].pos;
 	}
 
-	if (tr_state->visual->compositor->draw_normals) VS3D_DrawNormals(tr_state, mesh);
-	if (!mesh->mesh_type && (tr_state->visual->compositor->wiremode != GF_WIREFRAME_NONE)) {
-		glDisable(GL_LIGHTING);
-#ifdef GPAC_USE_OGL_ES
-		if (mesh_drawn) glColor4x(0, 0, 0, FIX_ONE);
-#else
-		if (mesh_drawn) glColor4f(0, 0, 0, 1.0f);
+	if (mesh->vbo_dirty) {
+		glBufferSubData(GL_ARRAY_BUFFER, 0, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices);
+		mesh->vbo_dirty = 0;
+	}
+
+#ifndef GPAC_ANDROID
+	if (visual->compositor->shader_only_mode) {
+		visual_3d_draw_mesh_shader_only(tr_state, mesh, base_address);
+		return;
+	}
 #endif
-		glEnableClientState(GL_VERTEX_ARRAY);
-#ifdef GPAC_USE_OGL_ES
-		glVertexPointer(3, GL_FIXED, sizeof(GF_Vertex),  &mesh->vertices[0].pos);
-		glDrawElements(GL_LINES, mesh->i_count, GL_UNSIGNED_SHORT, mesh->indices);
+
+	//set lights before pushing modelview matrix
+	visual_3d_set_lights(visual);
+
+	visual_3d_update_matrices(tr_state);
+
+	if (visual->has_fog) visual_3d_enable_fog(visual);
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+#if defined(GPAC_USE_OGL_ES)
+	glVertexPointer(3, GL_FIXED, sizeof(GF_Vertex),  base_address);
+#elif defined(GPAC_FIXED_POINT)
+	/*scale modelview matrix*/
+	glPushMatrix();
+	glScalef(fix_scale, fix_scale, fix_scale);
+	glVertexPointer(3, GL_INT, sizeof(GF_Vertex), base_address);
 #else
-		glVertexPointer(3, GL_FLOAT, sizeof(GF_Vertex),  &mesh->vertices[0].pos);
-		glDrawElements(GL_LINES, mesh->i_count, GL_UNSIGNED_INT, mesh->indices);
+	glVertexPointer(3, GL_FLOAT, sizeof(GF_Vertex), base_address);
 #endif
-		glDisableClientState(GL_VERTEX_ARRAY);
-	}
-	if (tr_state->visual->compositor->draw_bvol) VS3D_DrawMeshBoundingVolume(tr_state, mesh);
-}
-
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
 
 
-static GLubyte hatch_horiz[] = {
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff
-};
+	/*enable states*/
 
-static GLubyte hatch_vert[] = {
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
-};
 
-static GLubyte hatch_up[] = {
-	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
-	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
-	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
-	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
-	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
-	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
-	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
-	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
-	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
-	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
-	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
-	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
-	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
-	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
-	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
-	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03
-};
+	if (visual->state_color_on) glEnable(GL_COLOR_MATERIAL);
+	else glDisable(GL_COLOR_MATERIAL);
 
-static GLubyte hatch_down[] = {
-	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
-	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
-	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
-	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
-	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
-	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
-	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
-	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
-	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
-	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
-	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
-	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
-	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
-	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
-	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
-	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0
-};
+	if (visual->state_blend_on) glEnable(GL_BLEND);
 
-static GLubyte hatch_cross[] = {
-	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c
-};
 
-void visual_3d_mesh_hatch(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 hatchStyle, SFColor hatchColor)
-{
-	if (mesh->mesh_type) return;
+	if (visual->num_clips)
+		visual_3d_set_clippers(visual, tr_state);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(3, GL_FLOAT, sizeof(GF_Vertex),  &mesh->vertices[0].pos);
-	if (mesh->mesh_type || (mesh->flags & MESH_IS_2D)) {
-		glDisableClientState(GL_NORMAL_ARRAY);
-		if (mesh->mesh_type) glDisable(GL_LIGHTING);
-		glNormal3f(0, 0, 1.0f);
-		glDisable(GL_CULL_FACE);
-	} else {
-		glEnableClientState(GL_NORMAL_ARRAY );
-		glNormalPointer(GL_FLOAT, sizeof(GF_Vertex), &mesh->vertices[0].normal);
+	/*
+	*	Enable colors:
+	 if mat2d is set, use mat2d and no lighting
+	*/
+	if (visual->has_material_2d) {
+		glDisable(GL_LIGHTING);
 
-		if (!mesh->mesh_type) {
-			/*if mesh is transparent DON'T CULL*/
-			if (!tr_state->mesh_is_transparent && (mesh->flags & MESH_IS_SOLID)) {
-				glEnable(GL_CULL_FACE);
-				glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
+#if !defined(GPAC_USE_OGL_ES) && !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 {
-				glDisable(GL_CULL_FACE);
+				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);
 			}
+#ifdef GPAC_USE_OGL_ES
+			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));
+#else
+			glColor4f(visual->mat_2d.red, visual->mat_2d.green, visual->mat_2d.blue, visual->mat_2d.alpha);
+#endif
 		}
 	}
 
-	glEnable(GL_POLYGON_STIPPLE);
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	/*can't access ISO International Register of Graphical Items www site :)*/
-	switch (hatchStyle) {
-	case 5: glPolygonStipple(hatch_cross); break;
-	case 4: glPolygonStipple(hatch_up); break;
-	case 3: glPolygonStipple(hatch_down); break;
-	case 2: glPolygonStipple(hatch_vert); break;
-	case 1: glPolygonStipple(hatch_horiz); break;
-	default: glDisable(GL_POLYGON_STIPPLE); break;
+#if !defined(GPAC_USE_OGL_ES) && !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 );
+		}
 	}
-	glColor3f(FIX2FLT(hatchColor.red), FIX2FLT(hatchColor.green), FIX2FLT(hatchColor.blue));
-	glDrawElements(GL_TRIANGLES, mesh->i_count, GL_UNSIGNED_INT, mesh->indices);
-
-	glDisable(GL_POLYGON_STIPPLE);
-}
 #endif
 
-/*only used for ILS/ILS2D or IFS2D outline*/
-void visual_3d_mesh_strike(GF_TraverseState *tr_state, GF_Mesh *mesh, Fixed width, Fixed line_scale, u32 dash_style)
-{
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
-	u16 style;
-#endif
-	
-	if (mesh->mesh_type != MESH_LINESET) return;
-	if (line_scale) width = gf_mulfix(width, line_scale);
-	width/=2;
-#if !defined(GPAC_USE_TINYGL) && !defined(GL_ES_CL_PROFILE)
-	glLineWidth( FIX2FLT(width));
-#endif
 
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+	//setup material color
+	if (visual->has_material) {
+		u32 i;
+		GL_CHECK_ERR
+		for (i=0; i<4; i++) {
+			GLenum mode;
+			Fixed *rgba = (Fixed *) & visual->materials[i];
+#if defined(GPAC_USE_OGL_ES)
+			Fixed *_rgba = (Fixed *) rgba;
+#elif defined(GPAC_FIXED_POINT)
+			Float _rgba[4];
+			_rgba[0] = FIX2FLT(rgba[0]);
+			_rgba[1] = FIX2FLT(rgba[1]);
+			_rgba[2] = FIX2FLT(rgba[2]);
+			_rgba[3] = FIX2FLT(rgba[3]);
+#else
+			Float *_rgba = (Float *) rgba;
+#endif
+
+			switch (i) {
+			case 0:
+				mode = GL_AMBIENT;
+				break;
+			case 1:
+				mode = GL_DIFFUSE;
+				break;
+			case 2:
+				mode = GL_SPECULAR;
+				break;
+			default:
+				mode = GL_EMISSION;
+				break;
+			}
 
-	switch (dash_style) {
-	case GF_DASH_STYLE_DASH: style = 0x1F1F; break;
-	case GF_DASH_STYLE_DOT: style = 0x3333; break;
-	case GF_DASH_STYLE_DASH_DOT: style = 0x6767; break;
-	case GF_DASH_STYLE_DASH_DASH_DOT: style = 0x33CF; break;
-	case GF_DASH_STYLE_DASH_DOT_DOT: style = 0x330F; break;
-	default:
-		style = 0;
-		break;
+#ifdef GPAC_USE_OGL_ES
+			glMaterialxv(GL_FRONT_AND_BACK, mode, _rgba);
+#else
+			glMaterialfv(GL_FRONT_AND_BACK, mode, _rgba);
+#endif
+			GL_CHECK_ERR
+		}
+#ifdef GPAC_USE_OGL_ES
+		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
 	}
-	if (style) {
-		u32 factor = FIX2INT(width);
-		if (!factor) factor = 1;
-		glEnable(GL_LINE_STIPPLE);
-		glLineStipple(factor, style); 
-		visual_3d_mesh_paint(tr_state, mesh);
-		glDisable (GL_LINE_STIPPLE);
-	} else 
+
+	//otherwise setup mesh color
+	if (!tr_state->mesh_num_textures && (mesh->flags & MESH_HAS_COLOR)) {
+		glEnable(GL_COLOR_MATERIAL);
+#if !defined (GPAC_USE_OGL_ES)
+		glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 #endif
-		visual_3d_mesh_paint(tr_state, mesh);
-}
+		glEnableClientState(GL_COLOR_ARRAY);
+		has_col = 1;
 
-void visual_3d_set_material_2d(GF_VisualManager *visual, SFColor col, Fixed alpha)
-{
-	glDisable(GL_LIGHTING);
-	if (alpha != FIX_ONE) {
-		glEnable(GL_BLEND);
-		visual_3d_enable_antialias(visual, 0);
-	} else {
-		glDisable(GL_BLEND);
-		visual_3d_enable_antialias(visual, visual->compositor->antiAlias ? 1 : 0);
-	}
-#ifdef GPAC_USE_OGL_ES
-	glColor4x(col.red, col.green, col.blue, alpha);
+#if defined (GPAC_USE_OGL_ES)
+
+		if (mesh->flags & MESH_HAS_ALPHA) {
+			glEnable(GL_BLEND);
+			tr_state->mesh_is_transparent = 1;
+		}
+#ifdef MESH_USE_SFCOLOR
+		/*glES only accepts full RGBA colors*/
+		glColorPointer(4, GL_FIXED, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
+#else
+		glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
+#endif	/*MESH_USE_SFCOLOR*/
+
+#elif defined (GPAC_FIXED_POINT)
+
+
+#ifdef MESH_USE_SFCOLOR
+		/*this is a real pain: we cannot "scale" colors through openGL, and our components are 16.16 (32 bytes) ranging
+		from [0 to 65536] mapping to [0, 1.0], but openGL assumes for s32 a range from [-2^31 2^31] mapping to [0, 1.0]
+		we must thus rebuild a dedicated array...*/
+		if (mesh->flags & MESH_HAS_ALPHA) {
+			u32 i;
+			color_array = gf_malloc(sizeof(Float)*4*mesh->v_count);
+			for (i=0; i<mesh->v_count; i++) {
+				color_array[4*i] = FIX2FLT(mesh->vertices[i].color.red);
+				color_array[4*i+1] = FIX2FLT(mesh->vertices[i].color.green);
+				color_array[4*i+2] = FIX2FLT(mesh->vertices[i].color.blue);
+				color_array[4*i+3] = FIX2FLT(mesh->vertices[i].color.alpha);
+			}
+			glEnable(GL_BLEND);
+			glColorPointer(4, GL_FLOAT, 4*sizeof(Float), color_array);
+			tr_state->mesh_is_transparent = 1;
+		} else {
+			color_array = gf_malloc(sizeof(Float)*3*mesh->v_count);
+			for (i=0; i<mesh->v_count; i++) {
+				color_array[3*i] = FIX2FLT(mesh->vertices[i].color.red);
+				color_array[3*i+1] = FIX2FLT(mesh->vertices[i].color.green);
+				color_array[3*i+2] = FIX2FLT(mesh->vertices[i].color.blue);
+			}
+			glColorPointer(3, GL_FLOAT, 3*sizeof(Float), color_array);
+		}
+#else
+		glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
+#endif /*MESH_USE_SFCOLOR*/
+
+#else
+
+#ifdef MESH_USE_SFCOLOR
+		if (mesh->flags & MESH_HAS_ALPHA) {
+			glEnable(GL_BLEND);
+			glColorPointer(4, GL_FLOAT, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
+			tr_state->mesh_is_transparent = 1;
+		} else {
+			glColorPointer(3, GL_FLOAT, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
+		}
 #else
-	glColor4f(FIX2FLT(col.red), FIX2FLT(col.green), FIX2FLT(col.blue), FIX2FLT(alpha));
+		if (mesh->flags & MESH_HAS_ALPHA) {
+			glEnable(GL_BLEND);
+			tr_state->mesh_is_transparent = 1;
+			glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
+		} else {
+			glColorPointer(3, GL_UNSIGNED_BYTE, sizeof(GF_Vertex), ((char *)base_address + MESH_COLOR_OFFSET));
+		}
+#endif /*MESH_USE_SFCOLOR*/
+
 #endif
-}
+	}
 
-void visual_3d_set_material_2d_argb(GF_VisualManager *visual, u32 col)
-{
-	u32 a = GF_COL_A(col);
+	if (tr_state->mesh_num_textures && !mesh->mesh_type && !(mesh->flags & MESH_NO_TEXTURE)) {
+		has_tx = 1;
 
-#if !defined(GPAC_USE_OGL_ES) && !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"));
+		glMatrixMode(GL_TEXTURE);
+		if (visual->has_tx_matrix) {
+			visual_3d_matrix_load(visual, visual->tx_matrix.m);
 		} else {
-			GLfloat alpha = (GLfloat) a / 255.0f;
-			glUniform1f(loc, alpha);
+			glLoadIdentity();
+		}
+		glMatrixMode(GL_MODELVIEW);
+
+
+#if defined(GPAC_USE_OGL_ES)
+		glTexCoordPointer(2, GL_FIXED, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
+		glEnableClientState(GL_TEXTURE_COORD_ARRAY );
+#elif defined(GPAC_FIXED_POINT)
+		glMatrixMode(GL_TEXTURE);
+		glPushMatrix();
+		glScalef(fix_scale, fix_scale, fix_scale);
+		glMatrixMode(GL_MODELVIEW);
+		glTexCoordPointer(2, GL_INT, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
+		glEnableClientState(GL_TEXTURE_COORD_ARRAY );
+#else
+
+#ifndef GPAC_USE_TINYGL
+		if (tr_state->mesh_num_textures>1) {
+			u32 i;
+			for (i=0; i<tr_state->mesh_num_textures; i++) {
+				glClientActiveTexture(GL_TEXTURE0 + i);
+				glTexCoordPointer(2, GL_FLOAT, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
+				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			}
+		} else
+#endif //GPAC_USE_TINYGL
+		{
+			glTexCoordPointer(2, GL_FLOAT, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY );
 		}
-		return;
-	}
 #endif
-	glDisable(GL_LIGHTING);
-	if (a != 0xFF) {
-		glEnable(GL_BLEND);
-		visual_3d_enable_antialias(visual, 0);
-	} else {
-		glDisable(GL_BLEND);
-		visual_3d_enable_antialias(visual, visual->compositor->antiAlias ? 1 : 0);
 	}
+
+	if (mesh->mesh_type) {
 #ifdef GPAC_USE_OGL_ES
-	glColor4x(GF_COL_R(col)<<8, GF_COL_G(col)<<8, GF_COL_B(col)<<8, a<<8);
+		glNormal3x(0, 0, FIX_ONE);
 #else
-	glColor4f(GF_COL_R(col)/255.0f, GF_COL_G(col)/255.0f, GF_COL_B(col)/255.0f, a/255.0f);
+		glNormal3f(0, 0, 1.0f);
 #endif
-}
+		glDisable(GL_CULL_FACE);
+		glDisable(GL_LIGHTING);
+		if (mesh->mesh_type==2) glDisable(GL_LINE_SMOOTH);
+		else glDisable(GL_POINT_SMOOTH);
 
-void visual_3d_clear(GF_VisualManager *visual, SFColor color, Fixed alpha)
-{
-#ifdef GPAC_USE_OGL_ES
-	glClearColorx(color.red, color.green, color.blue, alpha);
-#else
-	glClearColor(FIX2FLT(color.red), FIX2FLT(color.green), FIX2FLT(color.blue), FIX2FLT(alpha));
+#if !defined(GPAC_USE_TINYGL) && !defined(GL_ES_CL_PROFILE)
+		glLineWidth(1.0f);
 #endif
-	glClear(GL_COLOR_BUFFER_BIT);
-}
 
+	} else {
+		u32 normal_type = GL_FLOAT;
+		has_norm = 1;
+		glEnableClientState(GL_NORMAL_ARRAY );
+#ifdef MESH_USE_FIXED_NORMAL
 
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+#if defined(GPAC_USE_OGL_ES)
+		normal_type = GL_FIXED;
+#elif defined(GPAC_FIXED_POINT)
+		normal_type = GL_INT;
+#else
+		normal_type = GL_FLOAT;
+#endif
 
-void visual_3d_draw_image(GF_VisualManager *visual, Fixed pos_x, Fixed pos_y, u32 width, u32 height, u32 pixelformat, char *data, Fixed scale_x, Fixed scale_y)
-{
-	u32 gl_format;
-	glPixelZoom(FIX2FLT(scale_x), FIX2FLT(scale_y));
+#else /*MESH_USE_FIXED_NORMAL*/
+		/*normals are stored on signed bytes*/
+		normal_type = GL_BYTE;
+#endif
+		glNormalPointer(normal_type, sizeof(GF_Vertex), ((char *)base_address + MESH_NORMAL_OFFSET));
 
-	gl_format = 0;
-	switch (pixelformat) {
-	case GF_PIXEL_RGB_24:
-		gl_format = GL_RGB;
-		break;
-	case GF_PIXEL_RGB_32:
-	case GF_PIXEL_RGBA:
-		gl_format = GL_RGBA;
-		break;
-	case GF_PIXEL_ARGB:
-		if (!visual->compositor->gl_caps.bgra_texture) return;
-		gl_format = GL_BGRA_EXT;
-		break;
-	default:
-		return;
+		if (!mesh->mesh_type) {
+			if (compositor->backcull
+			        && (!tr_state->mesh_is_transparent || (compositor->backcull ==GF_BACK_CULL_ALPHA) )
+			        && (mesh->flags & MESH_IS_SOLID)) {
+				glEnable(GL_CULL_FACE);
+				glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
+			} else {
+				glDisable(GL_CULL_FACE);
+			}
+		}
 	}
 
-	/*glRasterPos2f doesn't accept point outside the view volume (it invalidates all draw pixel, draw bitmap)
-	so we move to the center of the local coord system, draw a NULL bitmap with raster pos displacement*/
-	glRasterPos2f(0, 0);
-	glBitmap(0, 0, 0, 0, FIX2FLT(pos_x), -FIX2FLT(pos_y), NULL);
-	glDrawPixels(width, height, gl_format, GL_UNSIGNED_BYTE, data);
-	glBitmap(0, 0, 0, 0, -FIX2FLT(pos_x), FIX2FLT(pos_y), NULL);
+	visual_3d_do_draw_mesh(tr_state, mesh);
 
-}
+	glDisableClientState(GL_VERTEX_ARRAY);
+	if (has_col) glDisableClientState(GL_COLOR_ARRAY);
+	glDisable(GL_COLOR_MATERIAL);
 
+	if (has_tx) glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+	if (has_norm) glDisableClientState(GL_NORMAL_ARRAY);
 
-void visual_3d_matrix_get(GF_VisualManager *visual, u32 mat_type, Fixed *mat)
-{
-#ifdef GPAC_FIXED_POINT
-	u32 i = 0;
-#endif
-	Float _mat[16];
-	switch (mat_type) {
-	case V3D_MATRIX_MODELVIEW:
-		glGetFloatv(GL_MODELVIEW_MATRIX, _mat);
-		break;
-	case V3D_MATRIX_PROJECTION:
-		glGetFloatv(GL_PROJECTION_MATRIX, _mat);
-		break;
-	case V3D_MATRIX_TEXTURE:
-		glGetFloatv(GL_TEXTURE_MATRIX, _mat);
-		break;
+	if (mesh->vbo)
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+#if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_OGL_ES)
+	if (color_array) gf_free(color_array);
+	if (tr_state->mesh_num_textures && !mesh->mesh_type && !(mesh->flags & MESH_NO_TEXTURE)) {
+		glMatrixMode(GL_TEXTURE);
+		glPopMatrix();
+		glMatrixMode(GL_MODELVIEW);
 	}
-#ifdef GPAC_FIXED_POINT
-	for (i=0; i<16; i++) mat[i] = FLT2FIX(_mat[i]);
-#else
-	memcpy(mat, _mat, sizeof(Fixed)*16);
+	glPopMatrix();
 #endif
-}
 
-#endif
 
-void visual_3d_set_matrix_mode(GF_VisualManager *visual, u32 mat_type)
-{
-	switch (mat_type) {
-	case V3D_MATRIX_MODELVIEW:
-		glMatrixMode(GL_MODELVIEW);
-		break;
-	case V3D_MATRIX_PROJECTION:
-		glMatrixMode(GL_PROJECTION);
-		break;
-	case V3D_MATRIX_TEXTURE:
-		glMatrixMode(GL_TEXTURE);
-		break;
-	}
-}
+	visual_3d_reset_lights(visual);
 
-void visual_3d_matrix_reset(GF_VisualManager *visual)
-{
-	glLoadIdentity();
-}
-void visual_3d_matrix_push(GF_VisualManager *visual)
-{
-	glPushMatrix();
-}
-void visual_3d_matrix_add(GF_VisualManager *visual, Fixed *mat)
-{
-#ifdef GPAC_USE_OGL_ES
-	glMultMatrixx(mat);
-#elif defined(GPAC_FIXED_POINT)
-	u32 i;
-	Float _mat[16];
-	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
-	glMultMatrixf(_mat);
-#else
-	glMultMatrixf(mat);
-#endif
-}
+	glDisable(GL_COLOR_MATERIAL);
 
-void visual_3d_matrix_pop(GF_VisualManager *visual)
-{
-	glPopMatrix();
+	//reset all our states
+	if (visual->num_clips)
+		visual_3d_reset_clippers(visual);
+	visual->has_material_2d = 0;
+	visual->has_material = 0;
+	visual->state_color_on = 0;
+	if (tr_state->mesh_is_transparent) glDisable(GL_BLEND);
+	tr_state->mesh_is_transparent = 0;
 }
 
-void visual_3d_matrix_load(GF_VisualManager *visual, Fixed *mat)
+static void visual_3d_set_debug_color(u32 col)
 {
 #ifdef GPAC_USE_OGL_ES
-	glLoadMatrixx(mat);
-#elif defined(GPAC_FIXED_POINT)
-	Float _mat[16];
-	u32 i;
-	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
-	glLoadMatrixf(_mat);
+	glColor4x( (col ? GF_COL_R(col) : 255) , (col ? GF_COL_G(col) : 0) , (col ? GF_COL_B(col) : 255), 255);
 #else
-	glLoadMatrixf(mat);
+	glColor4f(col ? GF_COL_R(col)/255.0f : 1, col ? GF_COL_G(col)/255.0f : 0, col ? GF_COL_B(col)/255.0f : 1, 1);
 #endif
 }
 
 
-void visual_3d_set_clipper_2d(GF_VisualManager *visual, GF_Rect clip)
+/*note we don't perform any culling for normal drawing...*/
+static void visual_3d_draw_normals(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
-#ifdef GL_MAX_CLIP_PLANES
+#ifndef GPAC_USE_TINYGL
 
-#ifdef GPAC_USE_OGL_ES
+	GF_Vec pt, end;
+	u32 i, j;
+	Fixed scale = mesh->bounds.radius / 4;
 
-	Fixed g[4];
-	u32 cp;
-	visual_3d_reset_clipper_2d(visual);
-	if (visual->num_clips + 4 > visual->max_clips)  return;
-	cp = visual->num_clips;
-	g[2] = 0; g[1] = 0; 
-	g[3] = clip.x + clip.width; g[0] = -FIX_ONE; 
-	glClipPlanex(GL_CLIP_PLANE0 + cp, g); glEnable(GL_CLIP_PLANE0 + cp);
-	g[3] = -clip.x; g[0] = FIX_ONE;
-	glClipPlanex(GL_CLIP_PLANE0 + cp + 1, g); glEnable(GL_CLIP_PLANE0 + cp + 1);
-	g[0] = 0;
-	g[3] = clip.y; g[1] = -FIX_ONE; 
-	glClipPlanex(GL_CLIP_PLANE0 + cp + 2, g); glEnable(GL_CLIP_PLANE0 + cp + 2);
-	g[3] = clip.height - clip.y; g[1] = FIX_ONE; 
-	glClipPlanex(GL_CLIP_PLANE0 + cp + 3, g); glEnable(GL_CLIP_PLANE0 + cp + 3);
-	visual->num_clips += 4;
-#else
-	Double g[4];
-	u32 cp;
-	visual_3d_reset_clipper_2d(visual);
-	if (visual->num_clips + 4 > visual->max_clips) return;
-	cp = visual->num_clips;
-	g[2] = 0; 
-	g[1] = 0; 
-	g[3] = FIX2FLT(clip.x) + FIX2FLT(clip.width); g[0] = -1; 
-	glClipPlane(GL_CLIP_PLANE0 + cp, g); glEnable(GL_CLIP_PLANE0 + cp);
-	g[3] = -FIX2FLT(clip.x); g[0] = 1;
-	glClipPlane(GL_CLIP_PLANE0 + cp + 1, g); glEnable(GL_CLIP_PLANE0 + cp + 1);
-	g[0] = 0;
-	g[3] = FIX2FLT(clip.y); g[1] = -1; 
-	glClipPlane(GL_CLIP_PLANE0 + cp + 2, g); glEnable(GL_CLIP_PLANE0 + cp + 2);
-	g[3] = FIX2FLT(clip.height-clip.y); g[1] = 1; 
-	glClipPlane(GL_CLIP_PLANE0 + cp + 3, g); glEnable(GL_CLIP_PLANE0 + cp + 3);
-	visual->num_clips += 4;
+#ifdef GPAC_USE_OGL_ES
+	GF_Vec va[2];
+	u16 indices[2];
+	glEnableClientState(GL_VERTEX_ARRAY);
 #endif
 
-#endif
-}
+	visual_3d_set_debug_color(0);
 
-void visual_3d_reset_clipper_2d(GF_VisualManager *visual)
-{
-#ifdef GL_MAX_CLIP_PLANES
-	u32 cp;
-	if (visual->num_clips < 4) return;
-	cp = visual->num_clips - 4;
-	glDisable(GL_CLIP_PLANE0 + cp + 3);
-	glDisable(GL_CLIP_PLANE0 + cp + 2);
-	glDisable(GL_CLIP_PLANE0 + cp + 1);
-	glDisable(GL_CLIP_PLANE0 + cp);
-	visual->num_clips -= 4;
+	if (tr_state->visual->compositor->draw_normals==GF_NORMALS_VERTEX) {
+		IDX_TYPE *idx = mesh->indices;
+		for (i=0; i<mesh->i_count; i+=3) {
+			for (j=0; j<3; j++) {
+				pt = mesh->vertices[idx[j]].pos;
+				MESH_GET_NORMAL(end, mesh->vertices[idx[j]]);
+				end = gf_vec_scale(end, scale);
+				gf_vec_add(end, pt, end);
+#ifdef GPAC_USE_OGL_ES
+				va[0] = pt;
+				va[1] = end;
+				indices[0] = 0;
+				indices[1] = 1;
+				glVertexPointer(3, GL_FIXED, 0, va);
+				glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, indices);
+#else
+				glBegin(GL_LINES);
+				glVertex3f(FIX2FLT(pt.x), FIX2FLT(pt.y), FIX2FLT(pt.z));
+				glVertex3f(FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z));
+				glEnd();
 #endif
-}
-
-void visual_3d_set_clip_plane(GF_VisualManager *visual, GF_Plane p)
-{
-#ifdef GL_MAX_CLIP_PLANES
+			}
+			idx+=3;
+		}
+	} else {
+		IDX_TYPE *idx = mesh->indices;
+		for (i=0; i<mesh->i_count; i+=3) {
+			gf_vec_add(pt, mesh->vertices[idx[0]].pos, mesh->vertices[idx[1]].pos);
+			gf_vec_add(pt, pt, mesh->vertices[idx[2]].pos);
+			pt = gf_vec_scale(pt, FIX_ONE/3);
+			MESH_GET_NORMAL(end, mesh->vertices[idx[0]]);
+			end = gf_vec_scale(end, scale);
+			gf_vec_add(end, pt, end);
 
 #ifdef GPAC_USE_OGL_ES
-	Fixed g[4];
-	if (visual->num_clips + 1 > visual->max_clips) return;
-	gf_vec_norm(&p.normal);
-	g[0] = p.normal.x;
-	g[1] = p.normal.y;
-	g[2] = p.normal.z;
-	g[3] = p.d;
-	glClipPlanex(GL_CLIP_PLANE0 + visual->num_clips, g); 
+			va[0] = pt;
+			va[1] = end;
+			indices[0] = 0;
+			indices[1] = 1;
+			glVertexPointer(3, GL_FIXED, 0, va);
+			glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, indices);
 #else
-	Double g[4];
-	if (visual->num_clips + 1 > visual->max_clips) return;
-	gf_vec_norm(&p.normal);
-	g[0] = FIX2FLT(p.normal.x);
-	g[1] = FIX2FLT(p.normal.y);
-	g[2] = FIX2FLT(p.normal.z);
-	g[3] = FIX2FLT(p.d);
-	glClipPlane(GL_CLIP_PLANE0 + visual->num_clips, g); 
+			glBegin(GL_LINES);
+			glVertex3f(FIX2FLT(pt.x), FIX2FLT(pt.y), FIX2FLT(pt.z));
+			glVertex3f(FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z));
+			glEnd();
 #endif
-	glEnable(GL_CLIP_PLANE0 + visual->num_clips);
-	visual->num_clips++;
+			idx += 3;
+		}
+	}
+#ifdef GPAC_USE_OGL_ES
+	glDisableClientState(GL_VERTEX_ARRAY);
 #endif
 
+#endif	/*GPAC_USE_TINYGL*/
 }
 
-void visual_3d_reset_clip_plane(GF_VisualManager *visual)
-{
-#ifdef GL_MAX_CLIP_PLANES
-	if (!visual->num_clips) return;
-	glDisable(GL_CLIP_PLANE0 + visual->num_clips-1);
-	visual->num_clips -= 1;
-#endif
-}
 
-void visual_3d_set_material(GF_VisualManager *visual, u32 material_type, Fixed *rgba)
+void visual_3d_draw_aabb_nodeBounds(GF_TraverseState *tr_state, AABBNode *node)
 {
-	GLenum mode;
-#if defined(GPAC_USE_OGL_ES)
-	Fixed *_rgba = rgba;
-#elif defined(GPAC_FIXED_POINT)
-	Float _rgba[4];
-	_rgba[0] = FIX2FLT(rgba[0]); _rgba[1] = FIX2FLT(rgba[1]); _rgba[2] = FIX2FLT(rgba[2]); _rgba[3] = FIX2FLT(rgba[3]);
-#else
-	Float *_rgba = rgba;
-#endif
+	if (node->pos) {
+		visual_3d_draw_aabb_nodeBounds(tr_state, node->pos);
+		visual_3d_draw_aabb_nodeBounds(tr_state, node->neg);
+	} else {
+		GF_Matrix mx;
+		SFVec3f c, s;
+		gf_vec_diff(s, node->max, node->min);
+		c = gf_vec_scale(s, FIX_ONE/2);
+		gf_vec_add(c, node->min, c);
 
-	switch (material_type) {
-	case V3D_MATERIAL_AMBIENT: mode = GL_AMBIENT; break;
-	case V3D_MATERIAL_DIFFUSE: mode = GL_DIFFUSE; break;
-	case V3D_MATERIAL_SPECULAR: mode = GL_SPECULAR; break;
-	case V3D_MATERIAL_EMISSIVE: mode = GL_EMISSION; break;
+		gf_mx_copy(mx, tr_state->model_matrix);
+		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);
 
-	case V3D_MATERIAL_NONE:
-#ifdef GPAC_USE_OGL_ES
-		glColor4x(_rgba[0], _rgba[1], _rgba[2], _rgba[3]);
-#else
-		glColor4fv(_rgba);
-#endif
-		/*fall-through*/
-	default:
-		return;
+		visual_3d_draw_mesh(tr_state, tr_state->visual->compositor->unit_bbox);
+
+		gf_mx_copy(tr_state->model_matrix, mx);
 	}
-#ifdef GPAC_USE_OGL_ES
-	glMaterialxv(GL_FRONT_AND_BACK, mode, _rgba);
-#else
-	glMaterialfv(GL_FRONT_AND_BACK, mode, _rgba);
-#endif
 }
 
-void visual_3d_set_shininess(GF_VisualManager *visual, Fixed shininess)
+void visual_3d_draw_bbox_ex(GF_TraverseState *tr_state, GF_BBox *box, Bool is_debug)
 {
-#ifdef GPAC_USE_OGL_ES
-	glMaterialx(GL_FRONT_AND_BACK, GL_SHININESS, shininess * 128);
-#else
-	glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, FIX2FLT(shininess) * 128);
-#endif
+	GF_Matrix mx;
+	SFVec3f c, s;
+
+	if (! is_debug) {
+		visual_3d_set_debug_color(tr_state->visual->compositor->highlight_stroke);
+	}
+
+	gf_vec_diff(s, box->max_edge, box->min_edge);
+	c.x = box->min_edge.x + s.x/2;
+	c.y = box->min_edge.y + s.y/2;
+	c.z = box->min_edge.z + s.z/2;
+
+	gf_mx_copy(mx, tr_state->model_matrix);
+	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);
+	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);
 }
 
-void visual_3d_set_state(GF_VisualManager *visual, u32 flag_mask, Bool setOn)
+static void visual_3d_draw_bounds(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
-	if (setOn) {
-		if (flag_mask & V3D_STATE_LIGHT) glEnable(GL_LIGHTING);
-		if (flag_mask & V3D_STATE_BLEND) glEnable(GL_BLEND);
-		if (flag_mask & V3D_STATE_COLOR) glEnable(GL_COLOR_MATERIAL);
+	visual_3d_set_debug_color(0);
+
+	if (mesh->aabb_root && (tr_state->visual->compositor->draw_bvol==GF_BOUNDS_AABB)) {
+		visual_3d_draw_aabb_nodeBounds(tr_state, mesh->aabb_root);
 	} else {
-		if (flag_mask & V3D_STATE_LIGHT) 
-			glDisable(GL_LIGHTING);
-		if (flag_mask & V3D_STATE_BLEND) glDisable(GL_BLEND);
-#ifdef GPAC_USE_OGL_ES
-		if (flag_mask & V3D_STATE_COLOR) glDisable(GL_COLOR_MATERIAL);
-#else
-		if (flag_mask & V3D_STATE_COLOR) glDisable(GL_COLOR_MATERIAL | GL_COLOR_MATERIAL_FACE);
-#endif
+		visual_3d_draw_bbox_ex(tr_state, &mesh->bounds, 1);
 	}
 }
 
-Bool visual_3d_add_spot_light(GF_VisualManager *visual, Fixed _ambientIntensity, SFVec3f attenuation, Fixed _beamWidth, 
-					   SFColor color, Fixed _cutOffAngle, SFVec3f direction, Fixed _intensity, SFVec3f location)
+void visual_3d_mesh_paint(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
-#ifdef GPAC_USE_OGL_ES
-	Fixed vals[4], exp;
-#else
-	Float vals[4], intensity, cutOffAngle, beamWidth, ambientIntensity, exp;
-#endif
-	GLint iLight;
+	Bool mesh_drawn = 0;
+	if (tr_state->visual->compositor->wiremode != GF_WIREFRAME_ONLY) {
+		visual_3d_draw_mesh(tr_state, mesh);
+		mesh_drawn = 1;
+	}
 
-	if (!visual->num_lights) glEnable(GL_LIGHTING);
-	if (visual->num_lights==visual->max_lights) return 0;
-	iLight = GL_LIGHT0 + visual->num_lights;
-	visual->num_lights++;
-	glEnable(iLight);
+	if (tr_state->visual->compositor->draw_normals) {
+		if (!mesh_drawn) {
+			visual_3d_update_matrices(tr_state);
+			mesh_drawn=1;
+		}
+		visual_3d_draw_normals(tr_state, mesh);
+	}
 
-#ifndef GPAC_USE_OGL_ES
-	ambientIntensity = FIX2FLT(_ambientIntensity);
-	intensity = FIX2FLT(_intensity);
-	cutOffAngle = FIX2FLT(_cutOffAngle);
-	beamWidth = FIX2FLT(_beamWidth);
-#endif
+	if (!mesh->mesh_type && (tr_state->visual->compositor->wiremode != GF_WIREFRAME_NONE)) {
+		glDisable(GL_LIGHTING);
+		visual_3d_set_debug_color(0xFFFFFFFF);
 
-	/*in case...*/
-	gf_vec_norm(&direction);
+		if (!mesh_drawn)
+			visual_3d_update_matrices(tr_state);
 
-#ifdef GPAC_USE_OGL_ES
-	vals[0] = direction.x; vals[1] = direction.y; vals[2] = direction.z; vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_SPOT_DIRECTION, vals);
-	vals[0] = location.x; vals[1] = location.y; vals[2] = location.z; vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_POSITION, vals);
-	glLightx(iLight, GL_CONSTANT_ATTENUATION, attenuation.x ? attenuation.x : FIX_ONE);
-	glLightx(iLight, GL_LINEAR_ATTENUATION, attenuation.y);
-	glLightx(iLight, GL_QUADRATIC_ATTENUATION, attenuation.z);
-	vals[0] = gf_mulfix(color.red, _intensity); vals[1] = gf_mulfix(color.green, _intensity); vals[2] = gf_mulfix(color.blue, _intensity); vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_DIFFUSE, vals);
-	glLightxv(iLight, GL_SPECULAR, vals);
-	vals[0] = gf_mulfix(color.red, _ambientIntensity); vals[1] = gf_mulfix(color.green, _ambientIntensity); vals[2] = gf_mulfix(color.blue, _ambientIntensity); vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_AMBIENT, vals);
-
-	if (!_beamWidth) exp = FIX_ONE;
-	else if (_beamWidth>_cutOffAngle) exp = 0;
-	else {
-		exp = FIX_ONE - gf_cos(_beamWidth);
-		if (exp>FIX_ONE) exp = FIX_ONE;
-	}
-	glLightx(iLight, GL_SPOT_EXPONENT,  exp*128);
-	glLightx(iLight, GL_SPOT_CUTOFF, gf_divfix(180*_cutOffAngle, GF_PI) );
-#else
-	vals[0] = FIX2FLT(direction.x); vals[1] = FIX2FLT(direction.y); vals[2] = FIX2FLT(direction.z); vals[3] = 1;
-	glLightfv(iLight, GL_SPOT_DIRECTION, vals);
-	vals[0] = FIX2FLT(location.x); vals[1] = FIX2FLT(location.y); vals[2] = FIX2FLT(location.z); vals[3] = 1;
-	glLightfv(iLight, GL_POSITION, vals);
-	glLightf(iLight, GL_CONSTANT_ATTENUATION, attenuation.x ? FIX2FLT(attenuation.x) : 1.0f);
-	glLightf(iLight, GL_LINEAR_ATTENUATION, FIX2FLT(attenuation.y));
-	glLightf(iLight, GL_QUADRATIC_ATTENUATION, FIX2FLT(attenuation.z));
-	vals[0] = FIX2FLT(color.red)*intensity; vals[1] = FIX2FLT(color.green)*intensity; vals[2] = FIX2FLT(color.blue)*intensity; vals[3] = 1;
-	glLightfv(iLight, GL_DIFFUSE, vals);
-	glLightfv(iLight, GL_SPECULAR, vals);
-	vals[0] = FIX2FLT(color.red)*ambientIntensity; vals[1] = FIX2FLT(color.green)*ambientIntensity; vals[2] = FIX2FLT(color.blue)*ambientIntensity; vals[3] = 1;
-	glLightfv(iLight, GL_AMBIENT, vals);
-
-	//glLightf(iLight, GL_SPOT_EXPONENT, 0.5f * (beamWidth+0.001f) /*(Float) (0.5 * log(0.5) / log(cos(beamWidth)) ) */);
-	if (!beamWidth) exp = 1;
-	else if (beamWidth>cutOffAngle) exp = 0;
-	else {
-		exp = 1.0f - (Float) cos(beamWidth);
-		if (exp>1) exp = 1;
-	}
-	glLightf(iLight, GL_SPOT_EXPONENT,  exp*128);
-	glLightf(iLight, GL_SPOT_CUTOFF, 180*cutOffAngle/FIX2FLT(GF_PI));
-#endif
-	
-	return 1;
-}
 
-/*insert pointlight - returns 0 if too many lights*/
-Bool visual_3d_add_point_light(GF_VisualManager *visual, Fixed _ambientIntensity, SFVec3f attenuation, SFColor color, Fixed _intensity, SFVec3f location)
-{
+		glEnableClientState(GL_VERTEX_ARRAY);
 #ifdef GPAC_USE_OGL_ES
-	Fixed vals[4];
+		glVertexPointer(3, GL_FIXED, sizeof(GF_Vertex),  &mesh->vertices[0].pos);
+		glDrawElements(GL_LINES, mesh->i_count, GL_UNSIGNED_SHORT, mesh->indices);
 #else
-	Float vals[4], ambientIntensity, intensity;
+		glVertexPointer(3, GL_FLOAT, sizeof(GF_Vertex),  &mesh->vertices[0].pos);
+		glDrawElements(GL_LINES, mesh->i_count, GL_UNSIGNED_INT, mesh->indices);
 #endif
-	u32 iLight;
+		glDisableClientState(GL_VERTEX_ARRAY);
+	}
+	if (tr_state->visual->compositor->draw_bvol) visual_3d_draw_bounds(tr_state, mesh);
+}
 
-	if (!visual->num_lights) glEnable(GL_LIGHTING);
-	if (visual->num_lights==visual->max_lights) return 0;
-	iLight = GL_LIGHT0 + visual->num_lights;
-	visual->num_lights++;
-	glEnable(iLight);
+#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
 
-#ifdef GPAC_USE_OGL_ES
-	vals[0] = location.x; vals[1] = location.y; vals[2] = location.z; vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_POSITION, vals);
-	glLightx(iLight, GL_CONSTANT_ATTENUATION, attenuation.x ? attenuation.x : FIX_ONE);
-	glLightx(iLight, GL_LINEAR_ATTENUATION, attenuation.y);
-	glLightx(iLight, GL_QUADRATIC_ATTENUATION, attenuation.z);
-	vals[0] = gf_mulfix(color.red, _intensity); vals[1] = gf_mulfix(color.green, _intensity); vals[2] = gf_mulfix(color.blue, _intensity); vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_DIFFUSE, vals);
-	glLightxv(iLight, GL_SPECULAR, vals);
-	vals[0] = gf_mulfix(color.red, _ambientIntensity); vals[1] = gf_mulfix(color.green, _ambientIntensity); vals[2] = gf_mulfix(color.blue, _ambientIntensity); vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_AMBIENT, vals);
-
-	glLightx(iLight, GL_SPOT_EXPONENT, 0);
-	glLightx(iLight, GL_SPOT_CUTOFF, INT2FIX(180) );
-#else
-	ambientIntensity = FIX2FLT(_ambientIntensity);
-	intensity = FIX2FLT(_intensity);
 
-	vals[0] = FIX2FLT(location.x); vals[1] = FIX2FLT(location.y); vals[2] = FIX2FLT(location.z); vals[3] = 1;
-	glLightfv(iLight, GL_POSITION, vals);
+static GLubyte hatch_horiz[] = {
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff
+};
 
-	glLightf(iLight, GL_CONSTANT_ATTENUATION, attenuation.x ? FIX2FLT(attenuation.x) : 1.0f);
-	glLightf(iLight, GL_LINEAR_ATTENUATION, FIX2FLT(attenuation.y));
-	glLightf(iLight, GL_QUADRATIC_ATTENUATION, FIX2FLT(attenuation.z));
-	vals[0] = FIX2FLT(color.red)*intensity; vals[1] = FIX2FLT(color.green)*intensity; vals[2] = FIX2FLT(color.blue)*intensity; vals[3] = 1;
-	glLightfv(iLight, GL_DIFFUSE, vals);
-	glLightfv(iLight, GL_SPECULAR, vals);
-	vals[0] = FIX2FLT(color.red)*ambientIntensity; vals[1] = FIX2FLT(color.green)*ambientIntensity; vals[2] = FIX2FLT(color.blue)*ambientIntensity; vals[3] = 1;
-	glLightfv(iLight, GL_AMBIENT, vals);
+static GLubyte hatch_vert[] = {
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
+};
 
-	glLightf(iLight, GL_SPOT_EXPONENT, 0);
-	glLightf(iLight, GL_SPOT_CUTOFF, 180);
-#endif
-	return 1;
-}
+static GLubyte hatch_up[] = {
+	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x03, 0x03, 0x03, 0x03
+};
 
-Bool visual_3d_add_directional_light(GF_VisualManager *visual, Fixed _ambientIntensity, SFColor color, Fixed _intensity, SFVec3f direction)
-{
-#ifdef GPAC_USE_OGL_ES
-	Fixed vals[4];
-#else
-	Float vals[4], ambientIntensity, intensity;
-#endif
-	u32 iLight;
-	if (!visual->num_lights) glEnable(GL_LIGHTING);
-	if (visual->num_lights==visual->max_lights) return 0;
-	iLight = GL_LIGHT0 + visual->num_lights;
-	visual->num_lights++;
-	glEnable(iLight);
+static GLubyte hatch_down[] = {
+	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x03, 0x03, 0x03, 0x03, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x30, 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0xc0
+};
 
-	/*in case...*/
-	gf_vec_norm(&direction);
-#ifdef GPAC_USE_OGL_ES
-	vals[0] = -direction.x; vals[1] = -direction.y; vals[2] = -direction.z; vals[3] = 0;
-	glLightxv(iLight, GL_POSITION, vals);
-	vals[0] = gf_mulfix(color.red, _intensity); vals[1] = gf_mulfix(color.green, _intensity); vals[2] = gf_mulfix(color.blue, _intensity); vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_DIFFUSE, vals);
-	glLightxv(iLight, GL_SPECULAR, vals);
-	vals[0] = gf_mulfix(color.red, _ambientIntensity); vals[1] = gf_mulfix(color.green, _ambientIntensity); vals[2] = gf_mulfix(color.blue, _ambientIntensity); vals[3] = FIX_ONE;
-	glLightxv(iLight, GL_AMBIENT, vals);
-
-	glLightx(iLight, GL_CONSTANT_ATTENUATION, FIX_ONE);
-	glLightx(iLight, GL_LINEAR_ATTENUATION, 0);
-	glLightx(iLight, GL_QUADRATIC_ATTENUATION, 0);
-	glLightx(iLight, GL_SPOT_CUTOFF, INT2FIX(180) );
-#else
-	ambientIntensity = FIX2FLT(_ambientIntensity);
-	intensity = FIX2FLT(_intensity);
-
-	vals[0] = -FIX2FLT(direction.x); vals[1] = -FIX2FLT(direction.y); vals[2] = -FIX2FLT(direction.z); vals[3] = 0;
-	glLightfv(iLight, GL_POSITION, vals);
-	vals[0] = FIX2FLT(color.red)*intensity; vals[1] = FIX2FLT(color.green)*intensity; vals[2] = FIX2FLT(color.blue)*intensity; vals[3] = 1;
-	glLightfv(iLight, GL_DIFFUSE, vals);
-	glLightfv(iLight, GL_SPECULAR, vals);
-	vals[0] = FIX2FLT(color.red)*ambientIntensity; vals[1] = FIX2FLT(color.green)*ambientIntensity; vals[2] = FIX2FLT(color.blue)*ambientIntensity; vals[3] = 1;
-	glLightfv(iLight, GL_AMBIENT, vals);
-
-	glLightf(iLight, GL_CONSTANT_ATTENUATION, 1.0f);
-	glLightf(iLight, GL_LINEAR_ATTENUATION, 0);
-	glLightf(iLight, GL_QUADRATIC_ATTENUATION, 0);
-	glLightf(iLight, GL_SPOT_CUTOFF, 180);
-#endif
-	return 1;
-}
+static GLubyte hatch_cross[] = {
+	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c
+};
 
-void visual_3d_remove_last_light(GF_VisualManager *visual)
+void visual_3d_mesh_hatch(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 hatchStyle, SFColor hatchColor)
 {
-	if (visual->num_lights) {
-		glDisable(GL_LIGHT0+visual->num_lights-1);
-		visual->num_lights--;
+	if (mesh->mesh_type) return;
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glVertexPointer(3, GL_FLOAT, sizeof(GF_Vertex),  &mesh->vertices[0].pos);
+	if (mesh->mesh_type || (mesh->flags & MESH_IS_2D)) {
+		glDisableClientState(GL_NORMAL_ARRAY);
+		if (mesh->mesh_type) glDisable(GL_LIGHTING);
+		glNormal3f(0, 0, 1.0f);
+		glDisable(GL_CULL_FACE);
+	} else {
+		glEnableClientState(GL_NORMAL_ARRAY );
+		glNormalPointer(GL_FLOAT, sizeof(GF_Vertex), &mesh->vertices[0].normal);
+
+		if (!mesh->mesh_type) {
+			/*if mesh is transparent DON'T CULL*/
+			if (!tr_state->mesh_is_transparent && (mesh->flags & MESH_IS_SOLID)) {
+				glEnable(GL_CULL_FACE);
+				glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
+			} else {
+				glDisable(GL_CULL_FACE);
+			}
+		}
 	}
-}
 
-void visual_3d_clear_all_lights(GF_VisualManager *visual)
-{
-	u32 i;
-	for (i=visual->num_lights; i>0; i--) {
-		glDisable(GL_LIGHT0+i-1);
+	glEnable(GL_POLYGON_STIPPLE);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	/*can't access ISO International Register of Graphical Items www site :)*/
+	switch (hatchStyle) {
+	case 5:
+		glPolygonStipple(hatch_cross);
+		break;
+	case 4:
+		glPolygonStipple(hatch_up);
+		break;
+	case 3:
+		glPolygonStipple(hatch_down);
+		break;
+	case 2:
+		glPolygonStipple(hatch_vert);
+		break;
+	case 1:
+		glPolygonStipple(hatch_horiz);
+		break;
+	default:
+		glDisable(GL_POLYGON_STIPPLE);
+		break;
 	}
-	visual->num_lights = 0;
-	//glDisable(GL_LIGHTING);
+	glColor3f(FIX2FLT(hatchColor.red), FIX2FLT(hatchColor.green), FIX2FLT(hatchColor.blue));
+	glDrawElements(GL_TRIANGLES, mesh->i_count, GL_UNSIGNED_INT, mesh->indices);
+
+	glDisable(GL_POLYGON_STIPPLE);
 }
+#endif
 
-void visual_3d_set_fog(GF_VisualManager *visual, const char *type, SFColor color, Fixed density, Fixed visibility)
+/*only used for ILS/ILS2D or IFS2D outline*/
+void visual_3d_mesh_strike(GF_TraverseState *tr_state, GF_Mesh *mesh, Fixed width, Fixed line_scale, u32 dash_style)
 {
+#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+	u16 style;
+#endif
 
-#ifndef GPAC_USE_TINYGL
-
-#ifdef GPAC_USE_OGL_ES
-	Fixed vals[4];
-	glEnable(GL_FOG);
-	if (!type || !stricmp(type, "LINEAR")) glFogx(GL_FOG_MODE, GL_LINEAR);
-	else if (!stricmp(type, "EXPONENTIAL")) glFogx(GL_FOG_MODE, GL_EXP);
-	else if (!stricmp(type, "EXPONENTIAL2")) glFogx(GL_FOG_MODE, GL_EXP2);
-	glFogx(GL_FOG_DENSITY, density);
-	glFogx(GL_FOG_START, 0);
-	glFogx(GL_FOG_END, visibility);
-	vals[0] = color.red; vals[1] = color.green; vals[2] = color.blue; vals[3] = FIX_ONE;
-	glFogxv(GL_FOG_COLOR, vals);
-	glHint(GL_FOG_HINT, visual->compositor->high_speed ? GL_FASTEST : GL_NICEST);
-#else
-	Float vals[4];
-	glEnable(GL_FOG);
-	if (!type || !stricmp(type, "LINEAR")) glFogi(GL_FOG_MODE, GL_LINEAR);
-	else if (!stricmp(type, "EXPONENTIAL")) glFogi(GL_FOG_MODE, GL_EXP);
-	else if (!stricmp(type, "EXPONENTIAL2")) glFogi(GL_FOG_MODE, GL_EXP2);
-	glFogf(GL_FOG_DENSITY, FIX2FLT(density));
-	glFogf(GL_FOG_START, 0);
-	glFogf(GL_FOG_END, FIX2FLT(visibility));
-	vals[0] = FIX2FLT(color.red); vals[1] = FIX2FLT(color.green); vals[2] = FIX2FLT(color.blue); vals[3] = 1;
-	glFogfv(GL_FOG_COLOR, vals);
-	glHint(GL_FOG_HINT, visual->compositor->high_speed ? GL_FASTEST : GL_NICEST);
+	if (mesh->mesh_type != MESH_LINESET) return;
+	if (line_scale) width = gf_mulfix(width, line_scale);
+	width/=2;
+#if !defined(GPAC_USE_TINYGL) && !defined(GL_ES_CL_PROFILE)
+	glLineWidth( FIX2FLT(width));
 #endif
 
+#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+
+	switch (dash_style) {
+	case GF_DASH_STYLE_DASH:
+		style = 0x1F1F;
+		break;
+	case GF_DASH_STYLE_DOT:
+		style = 0x3333;
+		break;
+	case GF_DASH_STYLE_DASH_DOT:
+		style = 0x6767;
+		break;
+	case GF_DASH_STYLE_DASH_DASH_DOT:
+		style = 0x33CF;
+		break;
+	case GF_DASH_STYLE_DASH_DOT_DOT:
+		style = 0x330F;
+		break;
+	default:
+		style = 0;
+		break;
+	}
+	if (style) {
+		u32 factor = FIX2INT(width);
+		if (!factor) factor = 1;
+		glEnable(GL_LINE_STIPPLE);
+		glLineStipple(factor, style);
+		visual_3d_mesh_paint(tr_state, mesh);
+		glDisable (GL_LINE_STIPPLE);
+	} else
 #endif
+		visual_3d_mesh_paint(tr_state, mesh);
+}
 
+
+void visual_3d_clear(GF_VisualManager *visual, SFColor color, Fixed alpha)
+{
+#ifdef GPAC_USE_OGL_ES
+	glClearColorx(color.red, color.green, color.blue, alpha);
+#else
+	glClearColor(FIX2FLT(color.red), FIX2FLT(color.green), FIX2FLT(color.blue), FIX2FLT(alpha));
+#endif
+	glClear(GL_COLOR_BUFFER_BIT);
 }
 
+
 void visual_3d_fill_rect(GF_VisualManager *visual, GF_Rect rc, SFColorRGBA color)
 {
 	glDisable(GL_BLEND | GL_LIGHTING | GL_TEXTURE_2D);
@@ -2333,14 +2481,18 @@
 		indices[1] = 1;
 		indices[2] = 2;
 
-		v[0] = rc.x; v[1] = rc.y;
-		v[2] = rc.x+rc.width; v[3] = rc.y-rc.height;
-		v[4] = rc.x+rc.width; v[5] = rc.y;
+		v[0] = rc.x;
+		v[1] = rc.y;
+		v[2] = rc.x+rc.width;
+		v[3] = rc.y-rc.height;
+		v[4] = rc.x+rc.width;
+		v[5] = rc.y;
 		glEnableClientState(GL_VERTEX_ARRAY);
 		glVertexPointer(2, GL_FIXED, 0, v);
 		glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT, indices);
 
-		v[4] = rc.x; v[5] = rc.y-rc.height;
+		v[4] = rc.x;
+		v[5] = rc.y-rc.height;
 		glVertexPointer(2, GL_FIXED, 0, v);
 		glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT, indices);
 
@@ -2360,7 +2512,7 @@
 	glVertex3f(FIX2FLT(rc.x+rc.width), FIX2FLT(rc.y-rc.height), 0);
 	glVertex3f(FIX2FLT(rc.x+rc.width), FIX2FLT(rc.y), 0);
 	glEnd();
-	
+
 	glDisable(GL_COLOR_MATERIAL | GL_COLOR_MATERIAL_FACE);
 #endif
 
@@ -2381,32 +2533,42 @@
 
 	/*depthmap-only dump*/
 	if (depth_dump_mode==1) {
-
+		Float *depthp;
+		Float zFar, zNear;
 #ifdef GPAC_USE_OGL_ES
 		return GF_NOT_SUPPORTED;
 #else
 
 		fb->pitch_x = 0;
-		fb->pitch_y = compositor->vp_width; /* multiply by 4 if float depthbuffer */
+		fb->pitch_y = compositor->vp_width;
 
 		fb->video_buffer = (char*)gf_malloc(sizeof(char)* fb->pitch_y * fb->height);
+		//read as float
+		depthp = (Float*)gf_malloc(sizeof(Float)* fb->pitch_y * fb->height);
 		fb->pixel_format = GF_PIXEL_GREYSCALE;
 
 #ifndef GPAC_USE_TINYGL
-		//glPixelTransferf(GL_DEPTH_SCALE, FIX2FLT(compositor->OGLDepthGain) ); 
-		//glPixelTransferf(GL_DEPTH_BIAS, FIX2FLT(compositor->OGLDepthOffset) ); 
+		//glPixelTransferf(GL_DEPTH_SCALE, FIX2FLT(compositor->OGLDepthGain) );
+		//glPixelTransferf(GL_DEPTH_BIAS, FIX2FLT(compositor->OGLDepthOffset) );
 #endif
 
-		glReadPixels(compositor->vp_x, compositor->vp_y, fb->width, fb->height, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, fb->video_buffer); 
-                //inversion - to check
-		for (i=0; i<fb->height*fb->width; i++) 
-			fb->video_buffer[i] = (char)(255 - (int) fb->video_buffer[i]) ;
+		glReadPixels(compositor->vp_x, compositor->vp_y, fb->width, fb->height, GL_DEPTH_COMPONENT, GL_FLOAT, depthp);
+
+		//linearize z buffer, from 0 (zfar) to 1 (znear)
+		zFar = compositor->visual->camera.z_far;
+		zNear = compositor->visual->camera.z_near;
+		for (i=0; i<fb->height*fb->width; i++) {
+			Float res = ( (2.0f * zNear) / (zFar + zNear - depthp[i] * (zFar - zNear)) ) ;
+			fb->video_buffer[i] = (u8) ( 255.0 * (1.0 - res));
+		}
+
+		gf_free(depthp);
 
 #endif	/*GPAC_USE_OGL_ES*/
-	}	
+	}
 
 	/* RGBDS or RGBD dump*/
-	else if (depth_dump_mode==2 || depth_dump_mode==3){
+	else if (depth_dump_mode==2 || depth_dump_mode==3) {
 #ifdef GPAC_USE_OGL_ES
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor]: RGB+Depth format not implemented in OpenGL ES\n"));
 		return GF_NOT_SUPPORTED;
@@ -2422,14 +2584,14 @@
 #endif
 
 
-		
-#ifndef GPAC_USE_TINYGL	
-		
+
+#ifndef GPAC_USE_TINYGL
+
 		glReadPixels(0, 0, fb->width, fb->height, GL_RGBA, GL_UNSIGNED_BYTE, fb->video_buffer);
 
 		/*
-		glPixelTransferf(GL_DEPTH_SCALE, FIX2FLT(compositor->OGLDepthGain)); 
-		glPixelTransferf(GL_DEPTH_BIAS, FIX2FLT(compositor->OGLDepthOffset)); 
+		glPixelTransferf(GL_DEPTH_SCALE, FIX2FLT(compositor->OGLDepthGain));
+		glPixelTransferf(GL_DEPTH_BIAS, FIX2FLT(compositor->OGLDepthOffset));
 		*/
 
 		depth_data = (char*) gf_malloc(sizeof(char)*fb->width*fb->height);
@@ -2438,46 +2600,46 @@
 		if (depth_dump_mode==2) {
 			u32 i;
 			fb->pixel_format = GF_PIXEL_RGBDS;
-			
+
 			/*this corresponds to the RGBDS ordering*/
 			for (i=0; i<fb->height*fb->width; i++) {
 				u8 ds;
 				/* erase lowest-weighted depth bit */
-				u8 depth = depth_data[i] & 0xfe; 
+				u8 depth = depth_data[i] & 0xfe;
 				/*get alpha*/
 				ds = (fb->video_buffer[i*4 + 3]);
 				/* if heaviest-weighted alpha bit is set (>128) , turn on shape bit*/
 				if (ds & 0x80) depth |= 0x01;
-				fb->video_buffer[i*4+3] = depth; /*insert depth onto alpha*/ 
+				fb->video_buffer[i*4+3] = depth; /*insert depth onto alpha*/
 			}
-		/*this corresponds to RGBD ordering*/	
+			/*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++) 
+			for (i=0; i<fb->height*fb->width; i++)
 				fb->video_buffer[i*4+3] = depth_data[i];
 		}
 #else
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor]: RGB+Depth format not implemented in TinyGL\n"));
 		return GF_NOT_SUPPORTED;
 #endif
-		
+
 #endif /*GPAC_USE_OGL_ES*/
-		
-	} else if (compositor->user && (compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT)) {
+	} else { /*if (compositor->user && (compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT))*/
 		fb->pitch_x = 4;
 		fb->pitch_y = 4*compositor->vp_width;
 		fb->video_buffer = (char*)gf_malloc(sizeof(char) * fb->pitch_y * fb->height);
 		fb->pixel_format = GF_PIXEL_RGBA;
 
 		glReadPixels(compositor->vp_x, compositor->vp_y, fb->width, fb->height, GL_RGBA, GL_UNSIGNED_BYTE, fb->video_buffer);
-	} 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;
+		/*	} 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;
 
-		glReadPixels(compositor->vp_x, compositor->vp_y, fb->width, fb->height, GL_RGB, GL_UNSIGNED_BYTE, fb->video_buffer);
+				glReadPixels(compositor->vp_x, compositor->vp_y, fb->width, fb->height, GL_RGB, GL_UNSIGNED_BYTE, fb->video_buffer);
+		*/
 	}
 
 #ifndef GPAC_USE_TINYGL
@@ -2572,19 +2734,25 @@
 		inc = 1;
 		if (!tr_state->pixel_metrics) inc /= FIX2FLT(tr_state->min_hsize);
 		x = 0;
-		y = 1; y = gf_mulfix(y, INT2FIX(txh->height/2));
+		y = 1;
+		y = gf_mulfix(y, INT2FIX(txh->height/2));
 		if (!tr_state->pixel_metrics) y = gf_divfix(y, tr_state->min_hsize);
 
 		glBegin(GL_POINTS);
 		for (h=0; h<txh->height; h++) {
-			x = -1; x = gf_mulfix(x, INT2FIX(txh->width/2));
+			x = -1;
+			x = gf_mulfix(x, INT2FIX(txh->width/2));
 			if (!tr_state->pixel_metrics) x = gf_divfix(x, tr_state->min_hsize);
 			for (w=0; w<txh->width; w++) {
 				u8 *p = data + h*stride + w*4;
-				r = p[0]; r /= 255;
-				g = p[1]; g /= 255;
-				b = p[2]; b /= 255;
-				z = p[3]; z = z / 255;
+				r = p[0];
+				r /= 255;
+				g = p[1];
+				g /= 255;
+				b = p[2];
+				b /= 255;
+				z = p[3];
+				z = z / 255;
 
 				glColor4f(r, g, b, 1.0);
 				glVertex3f(FIX2FLT(x), FIX2FLT(y), FIX2FLT(-z)*60);
@@ -2622,13 +2790,15 @@
 		inc = 1;
 		if (!tr_state->pixel_metrics) inc /= FIX2FLT(tr_state->min_hsize);
 		x = 0;
-		y = 1; y = gf_mulfix(y, INT2FIX(txh->height/2));;
+		y = 1;
+		y = gf_mulfix(y, INT2FIX(txh->height/2));;
 		if (!tr_state->pixel_metrics) y = gf_divfix(y, tr_state->min_hsize);
 
 		in_strip = 0;
 		for (h=0; h<txh->height - 1; h++) {
 			u8 *src = data + h*stride;
-			x = -1; x = gf_mulfix(x, INT2FIX(txh->width/2));
+			x = -1;
+			x = gf_mulfix(x, INT2FIX(txh->width/2));
 			if (!tr_state->pixel_metrics) x  = gf_divfix(x, tr_state->min_hsize);
 
 			for (w=0; w<txh->width; w++) {
@@ -2637,7 +2807,7 @@
 				Float z1 = p1[3];
 				Float z2 = p2[3];
 				if (first_pass==1) {
-					if ((z1>delta) || (z2>delta)) 
+					if ((z1>delta) || (z2>delta))
 					{
 						if (0 && in_strip) {
 							glEnd();
@@ -2647,7 +2817,7 @@
 						continue;
 					}
 				} else if (first_pass==0) {
-					if ((z1<=delta) || (z2<=delta)) 
+					if ((z1<=delta) || (z2<=delta))
 					{
 						if (in_strip) {
 							glEnd();
@@ -2709,12 +2879,14 @@
 		inc = 1;
 		if (!tr_state->pixel_metrics) inc /= FIX2FLT(tr_state->min_hsize);
 		x = 0;
-		y = 1; y = gf_mulfix(y, FLT2FIX(txh->height/2));
+		y = 1;
+		y = gf_mulfix(y, FLT2FIX(txh->height/2));
 		if (!tr_state->pixel_metrics) y = gf_divfix(y, tr_state->min_hsize);
 
 		for (h=0; h<txh->height; h++) {
 			u32 idx_offset = h ? ((h-1)*txh->width) : 0;
-			x = -1; x = gf_mulfix(x, FLT2FIX(txh->width/2));
+			x = -1;
+			x = gf_mulfix(x, FLT2FIX(txh->width/2));
 			if (!tr_state->pixel_metrics) x = gf_divfix(x, tr_state->min_hsize);
 
 			for (w=0; w<txh->width; w++) {
@@ -2756,13 +2928,14 @@
 		stack->mesh->vbo_dirty = 1;
 	}
 	tr_state->mesh_num_textures = gf_sc_texture_enable(txh, ((M_Appearance *)tr_state->appear)->textureTransform);
-	VS3D_DrawMeshIntern(tr_state, stack->mesh);
+	visual_3d_draw_mesh(tr_state, stack->mesh);
 	visual_3d_disable_texture(tr_state);
 
 #endif //GPAC_USE_OGL_ES
 
 }
 
+
 #endif	/*GPAC_DISABLE_3D*/

gpac-0.5.0.svn5178.tar.bz2/src/compositor/x3d_geometry.c -> gpac-0.5.1.svn5491.tar.xz/src/compositor/x3d_geometry.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -264,9 +264,10 @@
 
 			stack->mesh = new_mesh();
 			stack->mesh->mesh_type = MESH_TRIANGLES;
-			col.red = col.green = col.blue = 0; col.alpha = FIX_ONE;
+			col.red = col.green = col.blue = 0;
+			col.alpha = FIX_ONE;
 			v1.color = MESH_MAKE_COL(col);
-			v1.normal.x = v1.normal.y = 0; 
+			v1.normal.x = v1.normal.y = 0;
 			v1.normal.z = MESH_NORMAL_UNIT;
 			v1.pos.z = 0;
 			v3 = v2 = v1;
@@ -330,7 +331,8 @@
 	X_Polypoint2D *p = (X_Polypoint2D *)node;
 
 	stack->mesh->mesh_type = MESH_POINTSET;
-	col.red = col.green = col.blue = 0; col.alpha = FIX_ONE;
+	col.red = col.green = col.blue = 0;
+	col.alpha = FIX_ONE;
 	for (i=0; i<p->point.count; i++) {
 		mesh_set_point(stack->mesh, p->point.vals[i].x, p->point.vals[i].y, 0, col);
 		mesh_set_index(stack->mesh, stack->mesh->v_count-1);
@@ -420,9 +422,9 @@
 	Bool rgba_col;
 	SFColorRGBA rgba;
 	X_Coordinate *c = (X_Coordinate *) _coords;
-	
+
 	mesh_reset(mesh);
-	
+
 	cols = NULL;
 	rgba_col = 0;
 	if (_color) {
@@ -481,13 +483,22 @@
 		}
 		if (txcoords) {
 			if (txcoords->count>idx) vx.texcoords = txcoords->vals[idx];
-		} 
+		}
 		/*X3D says nothing about default texture mapping here...*/
 		else if (!generate_tx) {
 			switch (i%3) {
-			case 2: vx.texcoords.x = FIX_ONE; vx.texcoords.y = 0; break;
-			case 1: vx.texcoords.x = FIX_ONE/2; vx.texcoords.y = FIX_ONE; break;
-			case 0: vx.texcoords.x = 0; vx.texcoords.y = 0; break;
+			case 2:
+				vx.texcoords.x = FIX_ONE;
+				vx.texcoords.y = 0;
+				break;
+			case 1:
+				vx.texcoords.x = FIX_ONE/2;
+				vx.texcoords.y = FIX_ONE;
+				break;
+			case 0:
+				vx.texcoords.x = 0;
+				vx.texcoords.y = 0;
+				break;
 			}
 		}
 		mesh_set_vertex_vx(mesh, &vx);
@@ -564,9 +575,9 @@
 	Bool rgba_col;
 	SFColorRGBA rgba;
 	X_Coordinate *c = (X_Coordinate *) _coords;
-	
+
 	mesh_reset(mesh);
-	
+
 	cols = NULL;
 	rgba_col = 0;
 	if (_color) {
@@ -630,13 +641,22 @@
 			}
 			if (txcoords) {
 				if (txcoords->count>idx) vx.texcoords = txcoords->vals[idx];
-			} 
+			}
 			/*X3D says nothing about default texture mapping here...*/
 			else if (!generate_tx) {
 				switch (idx%3) {
-				case 2: vx.texcoords.x = FIX_ONE; vx.texcoords.y = 0; break;
-				case 1: vx.texcoords.x = FIX_ONE/2; vx.texcoords.y = FIX_ONE; break;
-				case 0: vx.texcoords.x = 0; vx.texcoords.y = 0; break;
+				case 2:
+					vx.texcoords.x = FIX_ONE;
+					vx.texcoords.y = 0;
+					break;
+				case 1:
+					vx.texcoords.x = FIX_ONE/2;
+					vx.texcoords.y = FIX_ONE;
+					break;
+				case 0:
+					vx.texcoords.x = 0;
+					vx.texcoords.y = 0;
+					break;
 				}
 			}
 			if (i>2) {
@@ -690,7 +710,10 @@
 				SFVec3f n_0, n_1, n_2, n_avg;
 				u32 nb_face;
 				if (stripList->vals[strip] < 3) continue;
-				if (stripList->vals[strip] <= 3) { cur_face ++; continue; }
+				if (stripList->vals[strip] <= 3) {
+					cur_face ++;
+					continue;
+				}
 
 				/*first face normal*/
 				MESH_GET_NORMAL(n_0, mesh->vertices[mesh->indices[3*cur_face]]);
@@ -754,7 +777,8 @@
 
 	if (!itss->coord) return;
 
-	stripList.count = 0; stripList.vals = NULL;
+	stripList.count = 0;
+	stripList.vals = NULL;
 	nb_strips = 0;
 	for (i=0; i<itss->index.count; i++) {
 		if (itss->index.vals[i]==-1) {
@@ -809,7 +833,7 @@
 	SFColorRGBA rgba;
 	X_Coordinate *c = (X_Coordinate *) _coords;
 	mesh_reset(mesh);
-		
+
 	cols = NULL;
 	rgba_col = 0;
 	if (_color) {
@@ -873,13 +897,22 @@
 			}
 			if (txcoords) {
 				if (txcoords->count>idx) vx.texcoords = txcoords->vals[idx];
-			} 
+			}
 			/*X3D says nothing about default texture mapping here...*/
 			else if (!generate_tx) {
 				switch (idx%3) {
-				case 2: vx.texcoords.x = FIX_ONE; vx.texcoords.y = 0; break;
-				case 1: vx.texcoords.x = FIX_ONE/2; vx.texcoords.y = FIX_ONE; break;
-				case 0: vx.texcoords.x = 0; vx.texcoords.y = 0; break;
+				case 2:
+					vx.texcoords.x = FIX_ONE;
+					vx.texcoords.y = 0;
+					break;
+				case 1:
+					vx.texcoords.x = FIX_ONE/2;
+					vx.texcoords.y = FIX_ONE;
+					break;
+				case 0:
+					vx.texcoords.x = 0;
+					vx.texcoords.y = 0;
+					break;
 				}
 			}
 			mesh_set_vertex_vx(mesh, &vx);
@@ -888,7 +921,7 @@
 			if (indices) {
 				if (cur_idx>=indices->count) break;
 			} else if (cur_idx==c->point.count) break;
-			
+
 			if (i>1) {
 				mesh_set_vertex_vx(mesh, &mesh->vertices[start_idx]);
 				mesh_set_vertex_vx(mesh, &vx);
@@ -913,8 +946,11 @@
 				SFVec3f n_0, n_1, n_avg, n_tot;
 				u32 nb_face, start_face;
 				if (fanList->vals[fan] < 3) continue;
-				if (fanList->vals[fan] == 3) { cur_face++; continue; }
-	
+				if (fanList->vals[fan] == 3) {
+					cur_face++;
+					continue;
+				}
+
 				start_face = cur_face;
 
 				/*first face normal*/
@@ -970,7 +1006,8 @@
 	gf_node_dirty_clear(node, 0);
 	if (!itfs->coord) return;
 
-	fanList.count = 0; fanList.vals = NULL;
+	fanList.count = 0;
+	fanList.vals = NULL;
 	nb_fans = 0;
 	for (i=0; i<itfs->index.count; i++) {
 		if (itfs->index.vals[i]==-1) {

gpac-0.5.0.svn5178.tar.bz2/src/export.cpp -> gpac-0.5.1.svn5491.tar.xz/src/export.cpp Changed

@@ -1,25 +1,24 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
- *  This file is part of GPAC 
+ *  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
+ **  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,6 +41,9 @@
 #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_arg) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sleep) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mkdir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rmdir) )
@@ -267,7 +269,10 @@
 #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_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_diff_ms) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_utc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_parse_date) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_timezone) )
@@ -275,10 +280,12 @@
 #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) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_base64_decode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_base16_encode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_base16_decode) )
+#endif
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_bin128_parse) )
 
@@ -329,6 +336,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_reorder_bidi) )
 #endif
 
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_lang_get_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_lang_find) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_lang_get_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_lang_get_2cc) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_lang_get_3cc) )
+
+
+#ifndef GPAC_DISABLE_CORE_TOOLS
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_new_simple) )
@@ -369,6 +385,8 @@
 #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) )
@@ -396,6 +414,7 @@
 #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_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) )
@@ -403,8 +422,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_serialize) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_node_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_parse_string) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_root_nodes_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_root_idx) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_parse_bit_sequence) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_detach_root) )
+#endif
 
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_dom_get_key_name) )
@@ -520,6 +542,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_multiply) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_apply) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_apply_fixed) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_color_parse) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_color_get_name) )
+
 
 /*path2d.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_path_new) )
@@ -590,6 +615,7 @@
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_read) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_del) )
 
@@ -790,10 +816,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_composition_offset_shift) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_scalable_layer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_last_producer_time_box) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sync_table) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_current_tfdt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_adobe_protection_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_adobe_protection_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_group_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_tile_info) )
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sync_table) )
+#endif
 
 # ifndef GPAC_DISABLE_ISOM_DUMP
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump) )
@@ -843,6 +874,10 @@
 #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) )
@@ -924,6 +959,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_avc_config_update) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_avc_set_inband_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_svc_config_update) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_config_update) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_set_inband_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_shvc_config_update) )
@@ -954,7 +990,8 @@
 #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) )
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_setup_hint_track) )
@@ -989,7 +1026,7 @@
 #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_clone_pssh) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_start_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_close_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_traf_base_media_decode_time) )
@@ -1033,34 +1070,21 @@
 #endif /*GPAC_DISABLE_ISOM*/
 
 
-/*plugin_network.h exports*/
+/*service.h exports*/
 #ifndef GPAC_DISABLE_PLAYER
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_on_message) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_on_connect) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_on_disconnect) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_on_command) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_on_sl_packet) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_get_service_url) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_on_service_event) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_add_media) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_get_service_interface) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_register_mime_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_check_extension) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_download_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_download_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_download_update_stats) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_scene_update) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_process_step) )
-#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_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) )
@@ -1091,11 +1115,16 @@
 #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) )
+
+#ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_load_xlink_resource) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_unload_xlink_resource) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_scenegraph) )
 #endif
 
+#endif
+
 /*ietf.h exports*/
 #ifndef GPAC_DISABLE_STREAMING
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_nc_to_string) )
@@ -1232,6 +1261,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_import_chapters) )
 #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) )
@@ -1242,6 +1273,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_change_par) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_remove_non_rap) )
 #endif
 
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -1261,6 +1293,7 @@
 #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) )
 
 #endif //GPAC_DISABLE_HEVC
 
@@ -1303,10 +1336,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_get_next_header) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_get_next_header_mem) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_channel_cfg) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_write_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_write_config_bs) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_ac3_parser_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_eac3_parser_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ac3_get_channels) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ac3_get_bitrate) )
 #ifndef GPAC_DISABLE_OGG
@@ -1326,9 +1361,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_version) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_version_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_object_type_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_profile) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_profile_name) )
 
+#ifndef GPAC_DISABLE_AV_PARSERS
+#pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_profile) )
+#endif
+
 #if !defined(GPAC_DISABLE_MCRYPT) && !defined(GPAC_DISABLE_ISOM_WRITE)
 /*ismacryp.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_file) )
@@ -1623,6 +1661,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_get_class_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_field_is_sftime_offset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_instance_set_ised) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_set_proto_eventin_handler) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_script_field_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_script_field_get_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_script_load) )
@@ -1642,7 +1681,7 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_handle_dom_event_for_vrml) )
-#endif 
+#endif
 #endif
 
 #endif /*GPAC_DISABLE_VRML*/
@@ -1669,6 +1708,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_object_subscene_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_select_object) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_select_service) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_toggle_addons) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_object_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_download_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_channel_net_info) )
@@ -1687,7 +1728,7 @@
 #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_get_service_interface) )
+#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) )
@@ -1701,6 +1742,18 @@
 #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) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_process_step) )
+#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) )
 
 /*terminal_dev exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_new) )
@@ -1714,6 +1767,8 @@
 #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_odm_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_setup_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_disconnect) )
@@ -1722,8 +1777,8 @@
 #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) )
-//for Ivica
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_get_media_object_ex) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_scene_resume_live) )
 
 #endif
 
@@ -1759,6 +1814,7 @@
 #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) )
 
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_animation_get_scenegraph) )
@@ -1805,6 +1861,10 @@
 #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_pause_demux) )
+
 
 /* carousel.h */
 #ifdef GPAC_ENABLE_DSMCC
@@ -1819,6 +1879,7 @@
 #ifndef GPAC_DISABLE_MPEG2TS_MUX
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_del) )
+#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) )
@@ -1828,6 +1889,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_ts_clock) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_use_single_au_pes_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_set_initial_pcr) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_program_set_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_enable_sdt) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_program_find) )
 
 #endif /*GPAC_DISABLE_MPEG2TS_MUX*/
 /* M3U8 & MPD related functions */
@@ -1842,9 +1906,9 @@
 #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*/
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_socket) )
 
 /*laser.h exports*/
 #ifndef GPAC_DISABLE_LASER
@@ -1863,20 +1927,26 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_laser_encoder_get_rap) )
 #endif /*GPAC_DISABLE_LASER*/
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
 /*download.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_wget) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_wget_with_cache) )
+#endif
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*to be removed once TS fragmenter is moved to libgpac */
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_mpd_format_segment_name) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_get_rfc_6381_codec_name) )
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_fragment_file) )
 #endif
 #endif
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_segment_files) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_next_update_time) )
+#endif
 
 /* dvb_mpe.h */
 #ifdef GPAC_ENST_PRIVATE
@@ -1902,6 +1972,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_switch_quality) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_duration) )
+#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) )
@@ -1919,14 +1990,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_group_done) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_in_period_setup) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_seek) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_playback_start_range) )
 #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_buffering) )
+#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) )
@@ -1939,9 +2009,26 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_min_timeout_between_404) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_segment_expiration_threshold) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_user_buffer) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_speed) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_switching_probe_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_period_start) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_period_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_language) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_audio_channels) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_enum_descriptor) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_num_qualities) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_quality_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_automatic_switching) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_automatic_switching) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_select_quality) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_download_rate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_timeshift) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_timeshift_buffer_pos) )
+
+
 #endif
 
-#ifndef GPAC_DISABLE_VTT
+#ifndef GPAC_DISABLE_ISOM_WRITE
 #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) )

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtcp.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtcp.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -58,7 +58,7 @@
 	GF_Err e = GF_OK;
 
 	if (has_sr) *has_sr=0;
-	
+
 	//bad RTCP packet
 	if (pck_size < 4 ) return GF_NON_COMPLIANT_BITSTREAM;
 	bs = gf_bs_new(pck, pck_size, GF_BITSTREAM_READ);
@@ -74,7 +74,7 @@
 		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.Length = 1 + gf_bs_read_u16(bs);
 
 		//check pck size
 		if (pck_size < (u32) rtcp_hdr.Length * 4) {
@@ -86,20 +86,20 @@
 		pck_size -= rtcp_hdr.Length * 4;
 
 		/*we read the RTCP header*/
-		rtcp_hdr.Length -= 1;	
+		rtcp_hdr.Length -= 1;
 
 		//in all RTCP Compounds (>1 pck), the first RTCP report SHALL be SR or RR without padding
 		if (first) {
 			if ( ( (rtcp_hdr.PayloadType!=200) && (rtcp_hdr.PayloadType!=201) )
-				|| rtcp_hdr.Padding
-			) {
+			        || rtcp_hdr.Padding
+			   ) {
 				gf_bs_del(bs);
 				GF_LOG(GF_LOG_ERROR, 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;
 		}
-			
+
 		//specific extensions
 		switch (rtcp_hdr.PayloadType) {
 		//Sender report - we assume there's only one sender
@@ -134,16 +134,16 @@
 #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", 
-									ch->SenderSSRC,
-									ch->last_SR_rtp_time,
-									ch->total_pck,
-									ch->total_bytes,
-									ascTime
-				));
+				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",
+				                                 ch->SenderSSRC,
+				                                 ch->last_SR_rtp_time,
+				                                 ch->total_pck,
+				                                 ch->total_bytes,
+				                                 ascTime
+				                                ));
 			}
 #endif
-			
+
 			//common encoding for SR and RR
 			goto process_reports;
 
@@ -226,26 +226,26 @@
 				rtcp_hdr.Length -= 1;
 			}
 			break;
-/*
-		//APP packet
-		case 204:
+		/*
+				//APP packet
+				case 204:
 
 
-			//sender ssrc
-			sender_ssrc = gf_bs_read_u32(bs);
-			//ASCI 4 char type
-			gf_bs_read_u8(bs);
-			gf_bs_read_u8(bs);
-			gf_bs_read_u8(bs);
-			gf_bs_read_u8(bs);
-			
-			rtcp_hdr.Length -= 2;
-
-			//till endd of pck
-			gf_bs_read_data(bs, sdes_buffer, rtcp_hdr.Length*4);
-			rtcp_hdr.Length = 0;
-			break;
-*/
+					//sender ssrc
+					sender_ssrc = gf_bs_read_u32(bs);
+					//ASCI 4 char type
+					gf_bs_read_u8(bs);
+					gf_bs_read_u8(bs);
+					gf_bs_read_u8(bs);
+					gf_bs_read_u8(bs);
+
+					rtcp_hdr.Length -= 2;
+
+					//till endd of pck
+					gf_bs_read_data(bs, sdes_buffer, rtcp_hdr.Length*4);
+					rtcp_hdr.Length = 0;
+					break;
+		*/
 		default:
 			//read all till end
 			gf_bs_read_data(bs, sdes_buffer, rtcp_hdr.Length*4);
@@ -291,7 +291,7 @@
 	gf_bs_write_int(bs, 0, 1);
 	//count - only one for now in RR, 0 in sender mode
 	gf_bs_write_int(bs, !is_sr, 5);
-	//if we have sent stuff send an SR, otherwise an RR. We need to determine whether 
+	//if we have sent stuff send an SR, otherwise an RR. We need to determine whether
 	//we are active or not
 	//type
 	gf_bs_write_u8(bs, is_sr ? 200 : 201);
@@ -335,7 +335,7 @@
 	extended = ( (ch->num_sn_loops << 16) | ch->last_pck_sn);
 	expected = extended - ch->rtp_first_SN;
 	expect_diff = expected - ch->tot_num_pck_expected;
-	loss_diff = expect_diff - ch->last_num_pck_rcv;	
+	loss_diff = expect_diff - ch->last_num_pck_rcv;
 
 	if (!expect_diff || (loss_diff <= 0)) loss_diff = 0;
 	else loss_diff = (loss_diff<<8) / expect_diff;
@@ -350,7 +350,7 @@
 	//Extend sequence number
 	gf_bs_write_u32(bs, extended);
 
-	
+
 	//Jitter
 	//RTP specs annexe A.8
 	gf_bs_write_u32(bs, ( ch->Jitter >> 4));
@@ -370,14 +370,14 @@
 #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", 
-						ch->SSRC,
-						ch->Jitter >> 4,
-						extended,
-						expect_diff,
-						loss_diff,
-						ascTime
-		));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] RTCP-RR\t%d\t%d\t%d\t%d\t%d\t%s\n",
+		                                  ch->SSRC,
+		                                  ch->Jitter >> 4,
+		                                  extended,
+		                                  expect_diff,
+		                                  loss_diff,
+		                                  ascTime
+		                                 ));
 	}
 #endif
 
@@ -404,16 +404,16 @@
 		padd = 0;
 		length = length/4;
 	}
-	
+
 	//common part as usual
 	gf_bs_write_int(bs, 2, 2);
-	//notify padding? according to RFC1889 "In a compound RTCP packet, padding should 
-	//only be required on the last individual packet because the compound packet is 
-	//encrypted as a whole" -> we write it without notifying it (this is a bit messy in 
+	//notify padding? according to RFC1889 "In a compound RTCP packet, padding should
+	//only be required on the last individual packet because the compound packet is
+	//encrypted as a whole" -> we write it without notifying it (this is a bit messy in
 	//the spec IMO)
 	gf_bs_write_int(bs, 0, 1);
 	//report count is one
-	gf_bs_write_int(bs, 1, 5); 
+	gf_bs_write_int(bs, 1, 5);
 	//SDES pck type
 	gf_bs_write_u8(bs, 202);
 	//write length minus one
@@ -425,7 +425,7 @@
 	//CNAME type
 	gf_bs_write_u8(bs, 1);
 	//length and cname
-	gf_bs_write_u8(bs, (u32) strlen(ch->CName));	
+	gf_bs_write_u8(bs, (u32) strlen(ch->CName));
 	gf_bs_write_data(bs, ch->CName, (u32) strlen(ch->CName));
 
 	gf_bs_write_u8(bs, 0);
@@ -456,8 +456,8 @@
 
 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 (*RTP_TCPCallback)(void *cbk, char *pck, u32 pck_size),
+                       void *rtsp_cbk)
 {
 	GF_BitStream *bs;
 	u32 report_size;
@@ -486,7 +486,7 @@
 	if (ch->rtcp) {
 		e = gf_sk_send(ch->rtcp, report_buf, report_size);
 	} else {
-		if (RTP_TCPCallback) 
+		if (RTP_TCPCallback)
 			e = RTP_TCPCallback(rtsp_cbk, report_buf, report_size);
 		else
 			e = GF_BAD_PARAM;
@@ -496,9 +496,9 @@
 }
 
 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,
+                               GF_Err (*RTP_TCPCallback)(void *cbk, char *pck, u32 pck_size),
+                               void *rtsp_cbk)
 {
 	u32 Time, report_size;
 	GF_BitStream *bs;
@@ -507,7 +507,7 @@
 
 	/*skip first SR when acting as a receiver*/
 	if (!ch->forced_ntp_sec && ch->first_SR) return GF_OK;
-	Time = gf_rtp_get_report_time();	
+	Time = gf_rtp_get_report_time();
 	if ( Time < ch->next_report_time) return GF_OK;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -531,7 +531,7 @@
 	if (ch->rtcp) {
 		e = gf_sk_send(ch->rtcp, report_buf, report_size);
 	} else {
-		if (RTP_TCPCallback) 
+		if (RTP_TCPCallback)
 			e = RTP_TCPCallback(rtsp_cbk, report_buf, report_size);
 		else
 			e = GF_BAD_PARAM;
@@ -540,10 +540,14 @@
 	ch->rtcp_bytes_sent += report_size;
 
 	gf_free(report_buf);
-	
+
 	if (!e) {
 		//Update the channel record if no error - otherwise next RTCP will triger an RR
 		ch->last_num_pck_rcv = ch->last_num_pck_expected = ch->last_num_pck_loss = 0;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTCP] SSRC %d: sending RTCP report\n", ch->SSRC));
+	}
+	else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTCP] SSRC %d: error when sending RTCP report\n", ch->SSRC));
 	}
 	gf_rtp_get_next_report_time(ch);
 	return e;

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -83,10 +83,10 @@
 	ch->net_info.source = NULL;
 	memcpy(&ch->net_info, trans_info, sizeof(GF_RTSPTransport));
 
-	if (trans_info->destination) 
+	if (trans_info->destination)
 		ch->net_info.destination = gf_strdup(trans_info->destination);
 
-	if (trans_info->Profile) 
+	if (trans_info->Profile)
 		ch->net_info.Profile = gf_strdup(trans_info->Profile);
 
 	if (!ch->net_info.IsUnicast && trans_info->destination) {
@@ -180,27 +180,27 @@
 	ch->rtp_time = 0;
 
 	//create sockets for RTP/AVP profile only
-	if (ch->net_info.Profile && 
-		( !stricmp(ch->net_info.Profile, GF_RTSP_PROFILE_RTP_AVP) 
-		|| !stricmp(ch->net_info.Profile, "RTP/AVP/UDP")
-		|| !stricmp(ch->net_info.Profile, "RTP/SAVP")
-		)
-		) {
+	if (ch->net_info.Profile &&
+	        ( !stricmp(ch->net_info.Profile, GF_RTSP_PROFILE_RTP_AVP)
+	          || !stricmp(ch->net_info.Profile, "RTP/AVP/UDP")
+	          || !stricmp(ch->net_info.Profile, "RTP/SAVP")
+	        )
+	   ) {
 		//destination MUST be specified for unicast
 		if (IsSource && ch->net_info.IsUnicast && !ch->net_info.destination) return GF_BAD_PARAM;
 
-        /* forcing unicast when the address is not a multicast */
-        if (!ch->net_info.IsUnicast) {
-            if (IsSource){
-                if (ch->net_info.destination && !gf_sk_is_multicast_address(ch->net_info.destination)) {
-                    ch->net_info.IsUnicast = 1;
-                }
-            } else {
-                if (ch->net_info.source && !gf_sk_is_multicast_address(ch->net_info.source)) {
-                    ch->net_info.IsUnicast = 1;
-                }
-            } 
-        }
+		/* forcing unicast when the address is not a multicast */
+		if (!ch->net_info.IsUnicast) {
+			if (IsSource) {
+				if (ch->net_info.destination && !gf_sk_is_multicast_address(ch->net_info.destination)) {
+					ch->net_info.IsUnicast = 1;
+				}
+			} else {
+				if (ch->net_info.source && !gf_sk_is_multicast_address(ch->net_info.source)) {
+					ch->net_info.IsUnicast = 1;
+				}
+			}
+		}
 		//
 		//	RTP
 		//
@@ -224,7 +224,7 @@
 				if (e) return e;
 			}
 		} else {
-			//Bind to multicast (auto-join the group). 
+			//Bind to multicast (auto-join the group).
 			//we do not bind the socket if this is a source-only channel because some servers
 			//don't like that on local loop ...
 			e = gf_sk_setup_multicast(ch->rtp, ch->net_info.source, ch->net_info.port_first, ch->net_info.TTL, 0, local_ip);
@@ -237,7 +237,7 @@
 			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) {
@@ -270,7 +270,7 @@
 			if (e) return e;
 		}
 	}
-		
+
 	//format CNAME if not done yet
 	if (!ch->CName) {
 		//this is the real CName setup
@@ -288,14 +288,14 @@
 			ch->CName = gf_strdup(name);
 		}
 	}
-	
+
 
 #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"));
 	}
 #endif
-	
+
 	return GF_OK;
 }
 
@@ -343,10 +343,10 @@
 
 	e = gf_sk_receive(ch->rtp, buffer, buffer_size, 0, &res);
 	if (!res || e || (res < 12)) res = 0;
-    if (res){
-        ch->total_bytes+=res;
-        ch->total_pck++;
-    }
+	if (res) {
+		ch->total_bytes+=res;
+		ch->total_pck++;
+	}
 	//add the packet to our Queue if any
 	if (ch->po) {
 		if (res) {
@@ -365,7 +365,7 @@
 	if (ch->nat_keepalive_time_period) {
 		u32 now = gf_sys_clock();
 		if (res) {
-			ch->last_nat_keepalive_time = now; 
+			ch->last_nat_keepalive_time = now;
 		} else {
 			if (now - ch->last_nat_keepalive_time >= ch->nat_keepalive_time_period) {
 #if 0
@@ -454,11 +454,11 @@
 		ch->last_pck_sn = (u32) rtp_hdr->SequenceNumber-1;
 	}
 	/*this is a loop in SN - add it*/
-	if ( (ch->last_pck_sn + 1 > rtp_hdr->SequenceNumber) 
-		&& (rtp_hdr->SequenceNumber >= ch->last_pck_sn + MAX_RTP_SN/2)) {
+	if ( (ch->last_pck_sn + 1 > rtp_hdr->SequenceNumber)
+	        && (rtp_hdr->SequenceNumber >= ch->last_pck_sn + MAX_RTP_SN/2)) {
 		ch->num_sn_loops += 1;
 	}
-	
+
 	ntp = gf_rtp_channel_time(ch);
 	deviance = ntp - rtp_hdr->TimeStamp;
 	delta = deviance - ch->last_deviance;
@@ -472,7 +472,7 @@
 	CurrSeq = (u32) rtp_hdr->SequenceNumber;
 	ch->packet_loss = 0;
 	/*next sequential pck*/
-	if ( ( (LastSeq + 1) & 0xffff ) == CurrSeq ) {	
+	if ( ( (LastSeq + 1) & 0xffff ) == CurrSeq ) {
 		ch->last_num_pck_rcv += 1;
 		ch->last_num_pck_expected += 1;
 	}
@@ -500,17 +500,17 @@
 		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", 
-									ch->SenderSSRC,
-									rtp_hdr->SequenceNumber,
-									rtp_hdr->TimeStamp,
-									ntp,
-									delta,
-									ch->Jitter >> 4,
-									lost,
-									ch->total_pck,
-									ch->total_bytes
-				));
+		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",
+		                                  ch->SenderSSRC,
+		                                  rtp_hdr->SequenceNumber,
+		                                  rtp_hdr->TimeStamp,
+		                                  ntp,
+		                                  delta,
+		                                  ch->Jitter >> 4,
+		                                  lost,
+		                                  ch->total_pck,
+		                                  ch->total_bytes
+		                                 ));
 	}
 #endif
 
@@ -548,15 +548,15 @@
 
 	GF_BitStream *bs;
 
-	if (!ch || !rtp_hdr 
-		|| !ch->send_buffer 
-		|| !pck 
-		|| (rtp_hdr->CSRCCount && !rtp_hdr->CSRC) 
-		|| (rtp_hdr->CSRCCount > 15)) return GF_BAD_PARAM;
-	
+	if (!ch || !rtp_hdr
+	        || !ch->send_buffer
+	        || !pck
+	        || (rtp_hdr->CSRCCount && !rtp_hdr->CSRC)
+	        || (rtp_hdr->CSRCCount > 15)) return GF_BAD_PARAM;
+
 	if (rtp_hdr->CSRCCount) fast_send=0;
 
-	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;
@@ -586,7 +586,7 @@
 	if (fast_send) {
 		e = gf_sk_send(ch->rtp, hdr, pck_size+12);
 	} else {
-		memcpy(ch->send_buffer + Start, pck, pck_size);		
+		memcpy(ch->send_buffer + Start, pck, pck_size);
 		e = gf_sk_send(ch->rtp, ch->send_buffer, Start + pck_size);
 	}
 	if (e) return e;
@@ -719,12 +719,12 @@
 
 
 #if 0
-	"#RTP log format:\n"
-	"#RTP SenderSSRC RTP_TimeStamp RTP_SeqNum NTP@Recv Deviance Jitter NbLost NbTotPck NbTotBytes\n"
-	"#RTCP Sender reports log format:\n"
-	"#RTCP-SR SenderSSRC RTP_TimeStamp@NTP NbTotPck NbTotBytes NTP\n"
-	"#RTCP Receiver reports log format:\n"
-	"#RTCP-RR StreamSSRC Jitter ExtendedSeqNum ExpectDiff LossDiff NTP\n"
+"#RTP log format:\n"
+"#RTP SenderSSRC RTP_TimeStamp RTP_SeqNum NTP@Recv Deviance Jitter NbLost NbTotPck NbTotBytes\n"
+"#RTCP Sender reports log format:\n"
+"#RTCP-SR SenderSSRC RTP_TimeStamp@NTP NbTotPck NbTotBytes NTP\n"
+"#RTCP Receiver reports log format:\n"
+"#RTCP-RR StreamSSRC Jitter ExtendedSeqNum ExpectDiff LossDiff NTP\n"
 #endif
 
 GF_EXPORT
@@ -763,7 +763,7 @@
 GF_RTPReorder *gf_rtp_reorderer_new(u32 MaxCount, u32 MaxDelay)
 {
 	GF_RTPReorder *tmp;
-	
+
 	if (MaxCount <= 1 || !MaxDelay) return NULL;
 
 	GF_SAFEALLOC(tmp , GF_RTPReorder);
@@ -869,7 +869,7 @@
 
 		//are we in the bounds ??
 		if ( ( (u16) (cur->pck_seq_num + bounds) < (u16) (pck_seqnum + bounds) )
-			&& ( (u16) (pck_seqnum + bounds) < (u16) (cur->next->pck_seq_num + bounds)) ) {
+		        && ( (u16) (pck_seqnum + bounds) < (u16) (cur->next->pck_seq_num + bounds)) ) {
 
 			//insert
 			it->next = cur->next;
@@ -882,7 +882,7 @@
 		}
 		cur = cur->next;
 	}
-	
+
 
 discard:
 	gf_free(it->pck);
@@ -910,8 +910,8 @@
 
 	//check we have received the first packet
 	if ( po->head_seqnum && po->MaxCount
-		&& (po->MaxCount > po->Count) 
-		&& (po->in->pck_seq_num != po->head_seqnum)) 
+	        && (po->MaxCount > po->Count)
+	        && (po->in->pck_seq_num != po->head_seqnum))
 		return NULL;
 
 	//no entry
@@ -921,11 +921,11 @@
 	if ( (po->head_seqnum >= 0xf000 ) || (po->head_seqnum <= 0x1000) ) bounds = 0x2000;
 
 	//release the output if SN in order or maxCount reached
-	if (( (u16) (po->in->pck_seq_num + bounds + 1) == (u16) (po->in->next->pck_seq_num + bounds)) 
-		|| (po->MaxCount && (po->Count >= po->MaxCount)) ) {
+	if (( (u16) (po->in->pck_seq_num + bounds + 1) == (u16) (po->in->next->pck_seq_num + bounds))
+	        || (po->MaxCount && (po->Count >= po->MaxCount)) ) {
 
 #ifndef GPAC_DISABLE_LOG
-		if (po->in->pck_seq_num + 1 != po->in->next->pck_seq_num) 
+		if (po->in->pck_seq_num + 1 != po->in->next->pck_seq_num)
 			GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[rtp] WARNING Packet Loss: Sending %d out of the queue but next is %d\n", po->in->pck_seq_num, po->in->next->pck_seq_num ));
 #endif
 		goto send_it;

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_depacketizer.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp_depacketizer.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,16 +11,16 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
  */
 
 #include <gpac/internal/ietf_dev.h>
@@ -87,7 +87,7 @@
 		au_size = rtp->sl_map.ConstantSize;
 		/*not signaled, assume max one AU per packet*/
 		if (!au_size) au_size = size - pay_start;
-		
+
 		if ((!num_au && rtp->sl_map.auh_first_min_len) || (num_au && rtp->sl_map.auh_min_len)) {
 			/*ISMACryp*/
 			if (rtp->flags & GF_RTP_HAS_ISMACRYP) {
@@ -98,7 +98,7 @@
 					gf_bs_read_int(hdr_bs, 7);
 					au_hdr_size -= 8;
 				}
-				/*Note: ISMACryp ALWAYS indicates IV (BSO) and KEYIDX, even when sample is not encrypted. 
+				/*Note: ISMACryp ALWAYS indicates IV (BSO) and KEYIDX, even when sample is not encrypted.
 				This is quite a waste when using selective encryption....*/
 				if (!num_au) {
 					nbbits = 8*rtp->sl_map.IV_length;
@@ -197,7 +197,7 @@
 		rtp->sl_hdr.packetSequenceNumber += 1;
 
 		/*force indication of CTS whenever we have a new AU*/
-		
+
 		rtp->sl_hdr.compositionTimeStampFlag = (rtp->flags & GF_RTP_NEW_AU) ? 1 : 0;
 
 		/*locate VOP start code*/
@@ -219,7 +219,7 @@
 		rtp->on_sl_packet(rtp->udta, payload + pay_start, (u32) au_size, &rtp->sl_hdr, GF_OK);
 
 		rtp->sl_hdr.compositionTimeStampFlag = 0;
-		
+
 		if (rtp->flags & GF_RTP_HAS_ISMACRYP) rtp->sl_hdr.isma_BSO += au_size;
 
 		if (au_hdr_size < rtp->sl_map.auh_min_len) break;
@@ -285,7 +285,7 @@
 		payload += rtp->sl_hdr.accessUnitLength;
 		size -= rtp->sl_hdr.accessUnitLength;
 		rtp->sl_hdr.accessUnitLength = 0;
-		
+
 		/*if fragmented there shall not be other frames in the packet*/
 		if (!rtp->sl_hdr.accessUnitStartFlag) return;
 		if (!size) break;
@@ -494,7 +494,7 @@
 		if (type==1) {
 			/*flush any existing packet*/
 			gf_rtp_ttxt_flush(rtp, (u32) rtp->sl_hdr.compositionTimeStamp);
-			
+
 			/*bad ttu(1)*/
 			if (ttu_len<8) break;
 			rtp->sl_hdr.compositionTimeStamp = ts;
@@ -523,9 +523,9 @@
 			sidx = gf_bs_read_u8(bs);
 			gf_bs_read_u16(bs);/*complete text sample size, ignored*/
 			txt_size = size - 10;
-			
-			/*init - 3GPP/MPEG-4 spliting is IMHO stupid: 
-				- nb frag & cur frags are not needed: rtp reordering insures packet are in order, and 
+
+			/*init - 3GPP/MPEG-4 spliting is IMHO stupid:
+				- nb frag & cur frags are not needed: rtp reordering insures packet are in order, and
 			!!!we assume fragments are sent in order!!!
 				- any other TTU suffices to indicate end of text string (modifiers or != RTP TS)
 				- replacing these 8bits field with a 16 bit absolute character offset would add error recovery
@@ -596,9 +596,13 @@
 	nal_s = data_size-4;
 
 	if (rtp->flags & GF_RTP_AVC_USE_ANNEX_B) {
-		data[0] = data[1] = data[2] = 0; data[3] = 1;
+		data[0] = data[1] = data[2] = 0;
+		data[3] = 1;
 	} else {
-		data[0] = nal_s>>24; data[1] = nal_s>>16; data[2] = nal_s>>8; data[3] = nal_s&0xFF;
+		data[0] = nal_s>>24;
+		data[1] = nal_s>>16;
+		data[2] = nal_s>>8;
+		data[3] = nal_s&0xFF;
 	}
 	/*set F-bit since nal is corrupted*/
 	if (missed_end) data[4] |= 0x80;
@@ -650,10 +654,16 @@
 		rtp->sl_hdr.accessUnitEndFlag = 0;
 
 		if (rtp->flags & GF_RTP_AVC_USE_ANNEX_B) {
-			nalhdr[0] = 0; nalhdr[1] = 0; nalhdr[2] = 0; nalhdr[3] = 1;
+			nalhdr[0] = 0;
+			nalhdr[1] = 0;
+			nalhdr[2] = 0;
+			nalhdr[3] = 1;
 		} else {
 			/*signal NALU size on 4 bytes*/
-			nalhdr[0] = size>>24; nalhdr[1] = size>>16; nalhdr[2] = size>>8; nalhdr[3] = size&0xFF;
+			nalhdr[0] = size>>24;
+			nalhdr[1] = size>>16;
+			nalhdr[2] = size>>8;
+			nalhdr[3] = size&0xFF;
 		}
 		rtp->on_sl_packet(rtp->udta, nalhdr, 4, &rtp->sl_hdr, GF_OK);
 
@@ -670,7 +680,9 @@
 		u32 offset = 1;
 		while (offset<size) {
 			Bool send = 1;
-			u32 nal_size = (u8) payload[offset]; nal_size<<=8; nal_size |= (u8) payload[offset+1]; 
+			u32 nal_size = (u8) payload[offset];
+			nal_size<<=8;
+			nal_size |= (u8) payload[offset+1];
 			offset += 2;
 			if ((payload[offset] & 0x1F) == 5) {
 				rtp->sl_hdr.randomAccessPointFlag = 1;
@@ -681,9 +693,15 @@
 			if (send) {
 				/*signal NALU size on 4 bytes*/
 				if (rtp->flags & GF_RTP_AVC_USE_ANNEX_B) {
-					nalhdr[0] = 0; nalhdr[1] = 0; nalhdr[2] = 0; nalhdr[3] = 1;
+					nalhdr[0] = 0;
+					nalhdr[1] = 0;
+					nalhdr[2] = 0;
+					nalhdr[3] = 1;
 				} else {
-					nalhdr[0] = nal_size>>24; nalhdr[1] = nal_size>>16; nalhdr[2] = nal_size>>8; nalhdr[3] = nal_size&0xFF;
+					nalhdr[0] = nal_size>>24;
+					nalhdr[1] = nal_size>>16;
+					nalhdr[2] = nal_size>>8;
+					nalhdr[3] = nal_size&0xFF;
 				}
 				rtp->on_sl_packet(rtp->udta, nalhdr, 4, &rtp->sl_hdr, GF_OK);
 				rtp->sl_hdr.accessUnitStartFlag = 0;
@@ -741,7 +759,10 @@
 	rtp->inter_bs = NULL;
 	nal_s = data_size-4;
 
-	data[0] = nal_s>>24; data[1] = nal_s>>16; data[2] = nal_s>>8; data[3] = nal_s&0xFF;
+	data[0] = nal_s>>24;
+	data[1] = nal_s>>16;
+	data[2] = nal_s>>8;
+	data[3] = nal_s&0xFF;
 	/*set F-bit since nal is corrupted*/
 	if (missed_end) data[4] |= 0x80;
 
@@ -778,17 +799,22 @@
 		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*/
 	if (nal_type <= 40) {
+		/*FIXME: strict condition for randomAccessPointFlag because of decoder's issue*/
 		if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
+			//if ((nal_type>=GF_HEVC_NALU_SLICE_BLA_W_LP) && (nal_type<=GF_HEVC_NALU_SLICE_CRA)) {
 			rtp->sl_hdr.randomAccessPointFlag = 1;
 		}
 
 		rtp->sl_hdr.accessUnitEndFlag = 0;
 
 		/*signal NALU size on 4 bytes*/
-		nalu_size[0] = size>>24; nalu_size[1] = size>>16; nalu_size[2] = size>>8; nalu_size[3] = size&0xFF;
+		nalu_size[0] = size>>24;
+		nalu_size[1] = size>>16;
+		nalu_size[2] = size>>8;
+		nalu_size[3] = size&0xFF;
 		rtp->on_sl_packet(rtp->udta, nalu_size, 4, &rtp->sl_hdr, GF_OK);
 
 		rtp->sl_hdr.accessUnitStartFlag = 0;
@@ -803,15 +829,22 @@
 	else if (nal_type == 48) {
 		u32 offset = 2;
 		while (offset<size) {
-			u32 nal_size = (u8) payload[offset]; nal_size<<=8; nal_size |= (u8) payload[offset+1]; 
+			u32 nal_size = (u8) payload[offset];
+			nal_size<<=8;
+			nal_size |= (u8) payload[offset+1];
 			offset += 2;
 			nal_type = (payload[offset] & 0x7E) >> 1;
+			/*FIXME: strict condition for randomAccessPointFlag because of decoder's issue*/
 			if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
+				//if ((nal_type>=GF_HEVC_NALU_SLICE_BLA_W_LP) && (nal_type<=GF_HEVC_NALU_SLICE_CRA)) {
 				rtp->sl_hdr.randomAccessPointFlag = 1;
 			}
 
 			/*signal NALU size on 4 bytes*/
-			nalu_size[0] = nal_size>>24; nalu_size[1] = nal_size>>16; nalu_size[2] = nal_size>>8; nalu_size[3] = nal_size&0xFF;
+			nalu_size[0] = nal_size>>24;
+			nalu_size[1] = nal_size>>16;
+			nalu_size[2] = nal_size>>8;
+			nalu_size[3] = nal_size&0xFF;
 			rtp->on_sl_packet(rtp->udta, nalu_size, 4, &rtp->sl_hdr, GF_OK);
 
 			rtp->sl_hdr.accessUnitStartFlag = 0;
@@ -829,7 +862,9 @@
 		if (is_start) gf_rtp_hevc_flush(rtp, hdr, 1);
 
 		nal_type = payload[2] & 0x3F;
+		/*FIXME: strict condition for randomAccessPointFlag because of decoder's issue*/
 		if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
+			//if ((nal_type>=GF_HEVC_NALU_SLICE_BLA_W_LP) && (nal_type<=GF_HEVC_NALU_SLICE_CRA)) {
 			rtp->sl_hdr.randomAccessPointFlag = 1;
 		}
 
@@ -917,7 +952,7 @@
 			rtp->sl_hdr.accessUnitStartFlag = 0;
 			offset += du_size;
 		}
-			break;
+		break;
 		case 1:
 			if (rtp->inter_bs) gf_bs_del(rtp->inter_bs);
 
@@ -974,6 +1009,7 @@
 
 	if (!ft) {
 		GF_AC3Header hdr;
+		memset(&hdr, 0, sizeof(GF_AC3Header));
 		rtp->sl_hdr.accessUnitStartFlag = rtp->sl_hdr.accessUnitEndFlag = 1;
 		while (size) {
 			u32 offset;
@@ -1044,6 +1080,7 @@
 	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;
+	else if (!stricmp(map->payload_name, "H265-SHVC")) return GF_RTP_PAYT_SHVC;
 	else return 0;
 }
 
@@ -1072,7 +1109,7 @@
 		//decode the buffer - the string buffer is MSB hexadecimal
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		valS[2] = 0;
-		for (i=0; i<len;i+=2) {
+		for (i=0; i<len; i+=2) {
 			valS[0] = param_val[i];
 			valS[1] = param_val[i+1];
 			sscanf(valS, "%x", &val);
@@ -1084,7 +1121,7 @@
 		gf_bs_del(bs);
 	}
 	/*mpeg4-generic payload type items required*/
-	
+
 	/*constant size (size of all AUs) */
 	else if (!stricmp(param_name, "ConstantSize")) {
 		rtp->sl_map.ConstantSize = atoi(param_val);
@@ -1097,7 +1134,7 @@
 	else if (!stricmp(param_name, "ObjectType")) {
 		rtp->sl_map.ObjectTypeIndication = atoi(param_val);
 	}
-	else if (!stricmp(param_name, "StreamType")) 
+	else if (!stricmp(param_name, "StreamType"))
 		rtp->sl_map.StreamType = atoi(param_val);
 	else if (!stricmp(param_name, "mode")) {
 		strcpy(rtp->sl_map.mode, param_val);
@@ -1123,17 +1160,17 @@
 	else if (!stricmp(param_name, "AuxiliaryDataSizeLength")) rtp->sl_map.AuxiliaryDataSizeLength = atoi(param_val);
 
 	/*H264/AVC config - we only handle mode 0 and 1*/
-	else if (!stricmp(param_name, "packetization-mode")) 
+	else if (!stricmp(param_name, "packetization-mode"))
 		rtp->h264_pck_mode = 1;
 	/*AMR config*/
 	else if (!stricmp(param_name, "octet-align")) {
-		if (!stricmp(param_val, "1")) 
+		if (!stricmp(param_val, "1"))
 			rtp->flags |= GF_RTP_AMR_ALIGN;
 	} /*ISMACryp config*/
 	else if (!stricmp(param_name, "ISMACrypCryptoSuite")) {
-		if (!stricmp(param_val, "AES_CTR_128")) 
+		if (!stricmp(param_val, "AES_CTR_128"))
 			rtp->isma_scheme = GF_4CC('i','A','E','C');
-		else 
+		else
 			rtp->isma_scheme = 0;
 	}
 	else if (!stricmp(param_name, "ISMACrypSelectiveEncryption")) {
@@ -1142,16 +1179,16 @@
 		else
 			rtp->flags &= ~GF_RTP_ISMA_SEL_ENC;
 	}
-	else if (!stricmp(param_name, "ISMACrypIVLength")) 
+	else if (!stricmp(param_name, "ISMACrypIVLength"))
 		rtp->sl_map.IV_length = atoi(param_val);
-	else if (!stricmp(param_name, "ISMACrypDeltaIVLength")) 
+	else if (!stricmp(param_name, "ISMACrypDeltaIVLength"))
 		rtp->sl_map.IV_delta_length = atoi(param_val);
-	else if (!stricmp(param_name, "ISMACrypKeyIndicatorLength")) 
+	else if (!stricmp(param_name, "ISMACrypKeyIndicatorLength"))
 		rtp->sl_map.KI_length = atoi(param_val);
 	else if (!stricmp(param_name, "ISMACrypKeyIndicatorPerAU")) {
 		if (!stricmp(param_val, "1") || !stricmp(param_val, "true"))
 			rtp->flags |= GF_RTP_ISMA_HAS_KEY_IDX;
-		else 
+		else
 			rtp->flags &= ~GF_RTP_ISMA_HAS_KEY_IDX;
 	} else if (!stricmp(param_name, "ISMACrypKey")) {
 		rtp->key = gf_strdup(param_val);
@@ -1166,7 +1203,7 @@
 
 	/*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;
 
 
@@ -1186,7 +1223,7 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 	case GF_RTP_PAYT_LATM:
 	{
-		u32 AudioMuxVersion, AllStreamsSameTime, numSubFrames, numPrograms, numLayers;
+		u32 AudioMuxVersion, AllStreamsSameTime, numSubFrames, numPrograms, numLayers, ch_cfg;
 		GF_M4ADecSpecInfo cfg;
 		char *latm_dsi = rtp->sl_map.config;
 		GF_BitStream *bs = gf_bs_new(latm_dsi, rtp->sl_map.configSize, GF_BITSTREAM_READ);
@@ -1208,7 +1245,7 @@
 		} else {
 			cfg.base_sr = GF_M4ASampleRates[cfg.base_sr_index];
 		}
-		cfg.nb_chan = gf_bs_read_int(bs, 4);
+		ch_cfg = gf_bs_read_int(bs, 4);
 		if (cfg.base_object_type==5 || cfg.base_object_type==29) {
 			if (cfg.base_object_type==29) {
 				cfg.has_ps = 1;
@@ -1229,7 +1266,8 @@
 		/*write as regular AAC*/
 		gf_bs_write_int(bs, cfg.base_object_type, 5);
 		gf_bs_write_int(bs, cfg.base_sr_index, 4);
-		gf_bs_write_int(bs, cfg.nb_chan, 4);
+
+		gf_bs_write_int(bs, ch_cfg, 4);
 		gf_bs_align(bs);
 		gf_bs_get_content(bs, &rtp->sl_map.config, &rtp->sl_map.configSize);
 		gf_bs_del(bs);
@@ -1239,7 +1277,7 @@
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_latm;
 	}
-		break;
+	break;
 #endif
 	case GF_RTP_PAYT_MPEG4:
 		/*mark if AU header is present*/
@@ -1316,59 +1354,59 @@
 		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_4CC('s', 'a', 'm', 'r'));
-				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_4CC('s', 'a', 'w', 'b'));
-				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);
-			/*assign depacketizer*/
-			rtp->depacketize = gf_rtp_parse_amr;
+	{
+		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_4CC('s', 'a', 'm', 'r'));
+			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_4CC('s', 'a', 'w', 'b'));
+			gf_bs_write_u32(bs, 16000);
+			gf_bs_write_u16(bs, 1);
+			gf_bs_write_u16(bs, 320);
 		}
-		break;
+		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);
+		/*assign depacketizer*/
+		rtp->depacketize = gf_rtp_parse_amr;
+	}
+	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);
-			}
-
-			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_4CC('h', '2', '6', '3'));
-			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);
-			/*we signal RAPs*/
-			rtp->sl_map.RandomAccessIndication = 1;
-			/*assign depacketizer*/
-			rtp->depacketize = gf_rtp_parse_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);
 		}
-		break;
+
+		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_4CC('h', '2', '6', '3'));
+		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);
+		/*we signal RAPs*/
+		rtp->sl_map.RandomAccessIndication = 1;
+		/*assign depacketizer*/
+		rtp->depacketize = gf_rtp_parse_h263;
+	}
+	break;
 	case GF_RTP_PAYT_3GPP_TEXT:
 	{
 		char *tx3g, *a_tx3g;
@@ -1452,7 +1490,7 @@
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_ttxt;
 	}
-		break;
+	break;
 #ifndef GPAC_DISABLE_AV_PARSERS
 	case GF_RTP_PAYT_H264_AVC:
 	case GF_RTP_PAYT_H264_SVC:
@@ -1488,7 +1526,7 @@
 
 					b64size = (u32) strlen(nal_ptr);
 					b64_d = (char*)gf_malloc(sizeof(char)*b64size);
-					ret = gf_base64_decode(nal_ptr, b64size, b64_d, b64size); 
+					ret = gf_base64_decode(nal_ptr, b64size, b64_d, b64size);
 					b64_d[ret] = 0;
 
 					nalt = b64_d[0] & 0x1F;
@@ -1502,7 +1540,7 @@
 						} else {
 							gf_list_add(avcc->pictureParameterSets, sl);
 						}
-					} 
+					}
 					gf_free(b64_d);
 
 					if (sep) {
@@ -1518,9 +1556,10 @@
 		gf_odf_avc_cfg_del(avcc);
 	}
 		/*assign depacketizer*/
-		rtp->depacketize = gf_rtp_parse_h264;
-		break;
+	rtp->depacketize = gf_rtp_parse_h264;
+	break;
 	case GF_RTP_PAYT_HEVC:
+	case GF_RTP_PAYT_SHVC:
 #ifndef GPAC_DISABLE_HEVC
 	{
 		GF_SDP_FMTP *fmtp;
@@ -1567,7 +1606,7 @@
 
 					b64size = (u32) strlen(nal_ptr);
 					b64_d = (char*)gf_malloc(sizeof(char)*b64size);
-					ret = gf_base64_decode(nal_ptr, b64size, b64_d, b64size); 
+					ret = gf_base64_decode(nal_ptr, b64size, b64_d, b64size);
 					b64_d[ret] = 0;
 
 					sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
@@ -1592,11 +1631,11 @@
 		gf_odf_hevc_cfg_write(hevcc, &rtp->sl_map.config, &rtp->sl_map.configSize);
 		gf_odf_hevc_cfg_del(hevcc);
 	}
-		rtp->depacketize = gf_rtp_parse_hevc;
+	rtp->depacketize = gf_rtp_parse_hevc;
 #else
-		return GF_NOT_SUPPORTED;
+	return GF_NOT_SUPPORTED;
 #endif
-		break;
+	break;
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 	/*todo - rewrite DIMS config*/

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_packetizer.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp_packetizer.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -28,7 +28,7 @@
 #ifndef GPAC_DISABLE_STREAMING
 
 #include <gpac/constants.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 
 void InitSL_RTP(GF_SLConfig *slc);
 
@@ -37,12 +37,12 @@
 
 GF_EXPORT
 GP_RTPPacketizer *gf_rtp_builder_new(u32 rtp_payt, GF_SLConfig *slc, u32 flags,
-				void *cbk_obj, 
-				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 *cbk_obj,
+                                     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)
+                                    )
 {
 	GP_RTPPacketizer *tmp;
 	if (!rtp_payt || !cbk_obj | !OnPacketDone) return NULL;
@@ -69,7 +69,7 @@
 	tmp->sl_header.packetSequenceNumber = 1;
 
 	//we assume we start on a new AU
-	tmp->sl_header.accessUnitStartFlag = 1;	
+	tmp->sl_header.accessUnitStartFlag = 1;
 	return tmp;
 }
 
@@ -111,15 +111,16 @@
 		return gp_rtp_builder_do_qcelp(builder, data, data_size, IsAUEnd, FullAUSize);
 	case GF_RTP_PAYT_EVRC_SMV:
 		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); 
-	case GF_RTP_PAYT_3GPP_DIMS: 
-		return gp_rtp_builder_do_dims(builder, data, data_size, IsAUEnd, FullAUSize, duration); 
-	case GF_RTP_PAYT_AC3: 
-		return gp_rtp_builder_do_ac3(builder, data, data_size, IsAUEnd, FullAUSize); 
+	case GF_RTP_PAYT_LATM:
+		return gp_rtp_builder_do_latm(builder, data, data_size, IsAUEnd, FullAUSize, duration);
+	case GF_RTP_PAYT_3GPP_DIMS:
+		return gp_rtp_builder_do_dims(builder, data, data_size, IsAUEnd, FullAUSize, duration);
+	case GF_RTP_PAYT_AC3:
+		return gp_rtp_builder_do_ac3(builder, data, data_size, IsAUEnd, FullAUSize);
 	case GF_RTP_PAYT_HEVC:
-		return gp_rtp_builder_do_hevc(builder, data, data_size, IsAUEnd, FullAUSize); 
- 	default:
+	case GF_RTP_PAYT_SHVC:
+		return gp_rtp_builder_do_hevc(builder, data, data_size, IsAUEnd, FullAUSize);
+	default:
 		return GF_NOT_SUPPORTED;
 	}
 }
@@ -127,12 +128,12 @@
 
 //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 avgSize, u32 maxSize, 
-					   u32 avgTS, u32 maxDTS,
-					   u32 IV_length, u32 KI_length,
-					   char *pref_mode) 
+void gf_rtp_builder_init(GP_RTPPacketizer *builder, u8 PayloadType, u32 PathMTU, u32 max_ptime,
+                         u32 StreamType, u32 OTI, u32 PL_ID,
+                         u32 avgSize, u32 maxSize,
+                         u32 avgTS, u32 maxDTS,
+                         u32 IV_length, u32 KI_length,
+                         char *pref_mode)
 {
 	u32 k, ismacrypt_flags;
 
@@ -197,8 +198,8 @@
 		/*remove all MPEG-4 and ISMA flags */
 		builder->flags &= 0x07;
 	}
-		return;
-	case GF_RTP_PAYT_LATM: 
+	return;
+	case GF_RTP_PAYT_LATM:
 	case GF_RTP_PAYT_MPEG4:
 		break;
 	default:
@@ -206,7 +207,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_HEVC)) {
+			if ((OTI != GPAC_OTI_VIDEO_AVC) && (OTI != GPAC_OTI_VIDEO_SVC) && (OTI != GPAC_OTI_VIDEO_HEVC) && (OTI != GPAC_OTI_VIDEO_SHVC)) {
 				builder->flags &= ~GP_RTP_PCK_USE_MULTI;
 			}
 		}
@@ -214,7 +215,7 @@
 			builder->flags &= ~GP_RTP_PCK_USE_MULTI;
 		}
 		return;
-	} 
+	}
 
 	builder->slMap.IV_length = IV_length;
 	builder->slMap.KI_length = KI_length;
@@ -264,7 +265,7 @@
 	}
 
 	/*generic setup by flags*/
-	
+
 	/*size*/
 	if (builder->flags & GP_RTP_PCK_SIGNAL_SIZE) {
 		if (avgSize==maxSize) {
@@ -297,7 +298,7 @@
 		builder->slMap.CTSDeltaLength = 0;
 
 		/*DTS Delta depends on the video type*/
-		if ((builder->flags & GP_RTP_PCK_SIGNAL_TS) && maxDTS ) 
+		if ((builder->flags & GP_RTP_PCK_SIGNAL_TS) && maxDTS )
 			builder->slMap.DTSDeltaLength = gf_get_bit_size(maxDTS);
 		else
 			builder->slMap.DTSDeltaLength = 0;
@@ -345,8 +346,8 @@
 		/*compute CTS delta*/
 		builder->slMap.CTSDeltaLength = gf_get_bit_size(k*avgTS);
 
-		/*compute DTS delta. Delta is ALWAYS from the CTS of the same sample*/ 
-		if (maxDTS) 
+		/*compute DTS delta. Delta is ALWAYS from the CTS of the same sample*/
+		if (maxDTS)
 			builder->slMap.DTSDeltaLength = gf_get_bit_size(maxDTS);
 		else
 			builder->slMap.DTSDeltaLength = 0;
@@ -377,33 +378,33 @@
 	}
 	/*ISMACryp video mode*/
 	if ((builder->slMap.StreamType==GF_STREAM_VISUAL) && (builder->slMap.ObjectTypeIndication==GPAC_OTI_VIDEO_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*/
-		&& (builder->flags & GP_RTP_PCK_SIGNAL_TS) && !(builder->flags & GP_RTP_PCK_USE_MULTI)
-	) {
+	        && (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*/
+	        && (builder->flags & GP_RTP_PCK_SIGNAL_TS) && !(builder->flags & GP_RTP_PCK_USE_MULTI)
+	   ) {
 		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)
-		&& (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*/
-		&& (builder->flags & GP_RTP_PCK_SIGNAL_TS) && !(builder->flags & GP_RTP_PCK_USE_MULTI)
-	) {
+	         && (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*/
+	         && (builder->flags & GP_RTP_PCK_SIGNAL_TS) && !(builder->flags & GP_RTP_PCK_USE_MULTI)
+	        ) {
 		strcpy(builder->slMap.mode, "avc-video");
 	}
 
 	/*check if we use AU header or not*/
-	if (!builder->slMap.SizeLength 
-		&& !builder->slMap.IndexLength 
-		&& !builder->slMap.IndexDeltaLength
-		&& !builder->slMap.DTSDeltaLength  
-		&& !builder->slMap.CTSDeltaLength
-		&& !builder->slMap.RandomAccessIndication
-		&& !builder->slMap.IV_length
-		&& !builder->slMap.KI_length
-	) {
+	if (!builder->slMap.SizeLength
+	        && !builder->slMap.IndexLength
+	        && !builder->slMap.IndexDeltaLength
+	        && !builder->slMap.DTSDeltaLength
+	        && !builder->slMap.CTSDeltaLength
+	        && !builder->slMap.RandomAccessIndication
+	        && !builder->slMap.IV_length
+	        && !builder->slMap.KI_length
+	   ) {
 		builder->has_AU_header= 0;
 	} else {
 		builder->has_AU_header = 1;
@@ -420,9 +421,9 @@
 			builder->key_indicator = NULL;
 		}
 	} else if (!builder->key_indicator
-		||
-		memcmp(builder->key_indicator, key_indicator, sizeof(char)*builder->slMap.KI_length)
-	) {
+	           ||
+	           memcmp(builder->key_indicator, key_indicator, sizeof(char)*builder->slMap.KI_length)
+	          ) {
 		/*force flush if no provision for keyIndicator per AU*/
 		builder->force_flush = (builder->flags & GP_RTP_PCK_KEY_IDX_PER_AU) ? 0 : 1;
 
@@ -450,22 +451,22 @@
 			strcpy(szMediaName, "video");
 			/*ISMACryp video*/
 			if ( (flags & GP_RTP_PCK_SIGNAL_RAP) && rtpb->slMap.IV_length
-				&& !(flags & GP_RTP_PCK_SIGNAL_AU_IDX) && !(flags & GP_RTP_PCK_SIGNAL_SIZE)
-				&& (flags & GP_RTP_PCK_SIGNAL_TS) && !(flags & GP_RTP_PCK_USE_MULTI)
-				) 
+			        && !(flags & GP_RTP_PCK_SIGNAL_AU_IDX) && !(flags & GP_RTP_PCK_SIGNAL_SIZE)
+			        && (flags & GP_RTP_PCK_SIGNAL_TS) && !(flags & GP_RTP_PCK_USE_MULTI)
+			   )
 			{
 				strcpy(szPayloadName, "enc-mpeg4-generic");
 				return 1;
 			}
 			/*mpeg4-generic*/
-			if ( (flags & GP_RTP_PCK_SIGNAL_RAP) || (flags & GP_RTP_PCK_SIGNAL_AU_IDX) || (flags & GP_RTP_PCK_SIGNAL_SIZE) 
-				|| (flags & GP_RTP_PCK_SIGNAL_TS) || (flags & GP_RTP_PCK_USE_MULTI) ) {
+			if ( (flags & GP_RTP_PCK_SIGNAL_RAP) || (flags & GP_RTP_PCK_SIGNAL_AU_IDX) || (flags & GP_RTP_PCK_SIGNAL_SIZE)
+			        || (flags & GP_RTP_PCK_SIGNAL_TS) || (flags & GP_RTP_PCK_USE_MULTI) ) {
 				strcpy(szPayloadName, "mpeg4-generic");
 				return 1;
 			} else {
 				strcpy(szPayloadName, "MP4V-ES");
 				return 1;
-			} 
+			}
 		}
 		/*for all other types*/
 		if (rtpb->slMap.StreamType==GF_STREAM_AUDIO) strcpy(szMediaName, "audio");
@@ -511,17 +512,17 @@
 		/*header-free version*/
 		if (rtpb->auh_size<=1) strcat(szPayloadName, "0");
 		return 1;
-	case GF_RTP_PAYT_LATM: 
-		strcpy(szMediaName, "audio"); 
-		strcpy(szPayloadName, "MP4A-LATM"); 
-		return 1; 
-	case GF_RTP_PAYT_3GPP_DIMS: 
-		strcpy(szMediaName, "video"); 
-		strcpy(szPayloadName, "richmedia+xml"); 
-		return 1; 
-	case GF_RTP_PAYT_AC3: 
-		strcpy(szMediaName, "audio"); 
-		strcpy(szPayloadName, "ac3"); 
+	case GF_RTP_PAYT_LATM:
+		strcpy(szMediaName, "audio");
+		strcpy(szPayloadName, "MP4A-LATM");
+		return 1;
+	case GF_RTP_PAYT_3GPP_DIMS:
+		strcpy(szMediaName, "video");
+		strcpy(szPayloadName, "richmedia+xml");
+		return 1;
+	case GF_RTP_PAYT_AC3:
+		strcpy(szMediaName, "audio");
+		strcpy(szPayloadName, "ac3");
 		return 1;
 	case GF_RTP_PAYT_H264_SVC:
 		strcpy(szMediaName, "video");
@@ -531,6 +532,10 @@
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "H265");
 		return 1;
+	case GF_RTP_PAYT_SHVC:
+		strcpy(szMediaName, "video");
+		strcpy(szPayloadName, "H265-SHVC");
+		return 1;
 	default:
 		strcpy(szMediaName, "");
 		strcpy(szPayloadName, "");
@@ -548,17 +553,17 @@
 	Bool is_first = 1;
 
 	if ((builder->rtp_payt!=GF_RTP_PAYT_MPEG4) && (builder->rtp_payt!=GF_RTP_PAYT_LATM) ) return GF_BAD_PARAM;
-	
+
 #define SDP_ADD_INT(_name, _val) { if (!is_first) strcat(sdpLine, "; "); sprintf(buffer, "%s=%d", _name, _val); strcat(sdpLine, buffer); is_first = 0;}
 #define SDP_ADD_STR(_name, _val) { if (!is_first) strcat(sdpLine, "; "); sprintf(buffer, "%s=%s", _name, _val); strcat(sdpLine, buffer); is_first = 0;}
 
 	sprintf(sdpLine, "a=fmtp:%d ", builder->PayloadType);
-	
+
 	/*mandatory fields*/
 	if (builder->slMap.PL_ID) SDP_ADD_INT("profile-level-id", builder->slMap.PL_ID);
 
-	if (builder->rtp_payt == GF_RTP_PAYT_LATM) SDP_ADD_INT("cpresent", 0); 
-	
+	if (builder->rtp_payt == GF_RTP_PAYT_LATM) SDP_ADD_INT("cpresent", 0);
+
 	if (dsi && dsi_size) {
 		k = 0;
 		for (i=0; i<dsi_size; i++) {

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_pck_3gpp.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp_pck_3gpp.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -235,7 +235,7 @@
 			continue;
 		}
 		/*packet full or too long*/
-		if (builder->bytesInPacket + size > builder->Path_MTU) 
+		if (builder->bytesInPacket + size > builder->Path_MTU)
 			rtp_evrc_smv_flush(builder);
 
 		/*need new*/
@@ -290,7 +290,7 @@
 	u32 offset, size, max_size;
 
 	builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
-	
+
 	/*the H263 hinter doesn't perform inter-sample concatenation*/
 	if (!data) return GF_OK;
 
@@ -302,10 +302,10 @@
 	max_size = builder->Path_MTU - 2;
 
 	while(data_size > 0) {
-		if(data_size > max_size){
+		if(data_size > max_size) {
 			size = max_size;
 			builder->rtp_header.Marker = 0;
-		}else{
+		} else {
 			size = data_size;
 			builder->rtp_header.Marker = 1;
 		}
@@ -315,7 +315,7 @@
 		/*create new RTP Packet */
 		builder->rtp_header.SequenceNumber += 1;
 		builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
-		
+
 		bs = gf_bs_new(hdr, 2, GF_BITSTREAM_WRITE);
 		gf_bs_write_int(bs, 0, 5);
 		gf_bs_write_int(bs, Pbit, 1);
@@ -325,7 +325,7 @@
 		/*add header*/
 		builder->OnData(builder->cbk_obj, (char*) hdr, 2, 1);
 		/*add payload*/
-		if (builder->OnDataReference) 
+		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, size, offset);
 		else
 			builder->OnData(builder->cbk_obj, data + offset, size, 0);
@@ -344,7 +344,7 @@
 	char *hdr;
 	u32 samp_size, txt_size, pay_start, hdr_size, txt_done, cur_frag, nb_frag;
 	Bool is_utf_16 = 0;
-	
+
 	if (!data) {
 		/*flush packet*/
 		if (builder->bytesInPacket) {
@@ -354,7 +354,9 @@
 		return GF_OK;
 	}
 	/*cfg packet*/
-	txt_size = data[0]; txt_size <<= 8; txt_size |= (unsigned char) data[1];
+	txt_size = data[0];
+	txt_size <<= 8;
+	txt_size |= (unsigned char) data[1];
 	/*remove BOM*/
 	pay_start = 2;
 	if (txt_size>2) {
@@ -395,7 +397,7 @@
 		builder->OnData(builder->cbk_obj, (char *) hdr, hdr_size, 0);
 		builder->bytesInPacket += hdr_size;
 		gf_free(hdr);
-		
+
 		if (txt_size) {
 			if (builder->OnDataReference) {
 				builder->OnDataReference(builder->cbk_obj, samp_size, pay_start);
@@ -463,7 +465,7 @@
 		builder->OnData(builder->cbk_obj, (char *) hdr, hdr_size, 0);
 		builder->bytesInPacket += hdr_size;
 		gf_free(hdr);
-	
+
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, size, pay_start + txt_done);
 		} else {
@@ -471,7 +473,7 @@
 		}
 		builder->bytesInPacket += size;
 		cur_frag++;
-		
+
 		/*flush packet*/
 		if (cur_frag == nb_frag) {
 			txt_done = txt_size;
@@ -559,7 +561,7 @@
 		u32 du_offset = 0;
 		u32 hdr_offset = 0;
 		u32 orig_size, du_size;
-		
+
 		orig_size = du_size = 2+gf_bs_read_u16(bs);
 		/*if dims size is >0xFFFF, use our internal hack for large units*/
 		if (du_size==2) {
@@ -599,7 +601,7 @@
 				else frag_state = 2;
 
 				builder->rtp_header.Marker = 0;
-			} 
+			}
 			/*last fragment*/
 			else if (frag_state) {
 				size = du_size;
@@ -618,7 +620,7 @@
 			/*need a new packet*/
 			if (!builder->bytesInPacket) {
 				char dims_rtp_hdr[1];
-				
+
 				/*the unit is critical, increase counter (coded on 3 bits)*/
 				if (! (data[2+hdr_offset] & GF_DIMS_UNIT_P) && (frag_state <= 1) ) {
 					builder->last_au_sn++;
@@ -638,12 +640,12 @@
 			}
 
 			/*add payload*/
-			if (builder->OnDataReference) 
+			if (builder->OnDataReference)
 				builder->OnDataReference(builder->cbk_obj, size, offset+du_offset+size_offset);
 			else
 				builder->OnData(builder->cbk_obj, data+offset+du_offset+size_offset, size, 0);
 
-			/*if fragmentation, force packet flush even on last packet since aggregation unit do not 
+			/*if fragmentation, force packet flush even on last packet since aggregation unit do not
 			use the same packet format*/
 			if (frag_state) {
 				builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
@@ -692,21 +694,21 @@
 		gf_rtp_ac3_flush(builder);
 		return GF_OK;
 	}
-	
+
 	if (
-		/*AU does not fit*/
-		(builder->bytesInPacket + data_size > builder->Path_MTU)
-	||
-		/*aggregation is not enabled*/
-		!(builder->flags & GP_RTP_PCK_USE_MULTI)
-	||
-		/*max ptime is exceeded*/
-		(builder->max_ptime && ( (u32) builder->sl_header.compositionTimeStamp >= builder->rtp_header.TimeStamp + builder->max_ptime) )
+	    /*AU does not fit*/
+	    (builder->bytesInPacket + data_size > builder->Path_MTU)
+	    ||
+	    /*aggregation is not enabled*/
+	    !(builder->flags & GP_RTP_PCK_USE_MULTI)
+	    ||
+	    /*max ptime is exceeded*/
+	    (builder->max_ptime && ( (u32) builder->sl_header.compositionTimeStamp >= builder->rtp_header.TimeStamp + builder->max_ptime) )
 
 	) {
 		gf_rtp_ac3_flush(builder);
 	}
-	
+
 	/*fits*/
 	if (builder->bytesInPacket + data_size < builder->Path_MTU) {
 		/*need a new packet*/
@@ -721,7 +723,7 @@
 		}
 
 		/*add payload*/
-		if (builder->OnDataReference) 
+		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, data_size, 0);
 		else
 			builder->OnData(builder->cbk_obj, data, data_size, 0);
@@ -759,7 +761,7 @@
 		builder->OnData(builder->cbk_obj, hdr, 2, 1);
 
 		/*add payload*/
-		if (builder->OnDataReference) 
+		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, pck_size, offset);
 		else
 			builder->OnData(builder->cbk_obj, data+offset, pck_size, 0);

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_pck_mpeg12.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp_pck_mpeg12.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -90,7 +90,7 @@
 			builder->bytesInPacket = 2;
 		}
 		/*add reference*/
-		if (builder->OnDataReference) 
+		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, pck_size, offset);
 		else
 			gf_bs_write_data(builder->payload, data + offset, pck_size);
@@ -127,7 +127,7 @@
 	offset = 0;
 	have_seq = 0;
 
-    while (1) {
+	while (1) {
 		u32 oldoffset;
 		oldoffset = offset;
 		if (gf_mv12_next_start_code((unsigned char *) data + offset, data_size - offset, &offset, &startcode) < 0)
@@ -146,12 +146,12 @@
 	pic_type = (payload[1] >> 3) & 0x7;
 	/*first 6 bits (MBZ and T bit) not used*/
 	/*temp ref on 10 bits*/
-    mpv_hdr[0] = (payload[0] >> 6) & 0x3;
-    mpv_hdr[1] = (payload[0] << 2) | ((payload[1] >> 6) & 0x3);
-    mpv_hdr[2] = pic_type;
-    mpv_hdr[3] = 0;
+	mpv_hdr[0] = (payload[0] >> 6) & 0x3;
+	mpv_hdr[1] = (payload[0] << 2) | ((payload[1] >> 6) & 0x3);
+	mpv_hdr[2] = pic_type;
+	mpv_hdr[3] = 0;
 
-    if ((pic_type==2) || (pic_type== 3)) {
+	if ((pic_type==2) || (pic_type== 3)) {
 		mpv_hdr[3] = payload[3] << 5;
 		if ((payload[4] & 0x80) != 0) mpv_hdr[3] |= 0x10;
 		if (pic_type == 3) mpv_hdr[3] |= (payload[4] >> 3) & 0xf;
@@ -164,9 +164,9 @@
 	builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
 
 	buffer = data;
-    prev_slice = 0;
+	prev_slice = 0;
 	start_with_slice = (gf_mv12_next_slice_start((unsigned char *)buffer, offset, data_size, &next_slice) >= 0) ? 1 : 0;
-    offset = 0;
+	offset = 0;
 	slices_done = 0;
 	got_slice = start_with_slice;
 	first_slice = 1;
@@ -174,16 +174,16 @@
 	while (data_size > 0) {
 		Bool last_pck;
 		u32 len_to_write;
-		
+
 		if (data_size <= max_pck_size) {
 			len_to_write = data_size;
-			last_pck = 1; 
+			last_pck = 1;
 			prev_slice = 0;
 		} else {
 			got_slice = (!first_slice && !slices_done && (next_slice <= max_pck_size)) ? 1 : 0;
 			first_slice = 0;
 			last_pck = 0;
-			
+
 			while (!slices_done && (next_slice <= max_pck_size)) {
 				prev_slice = next_slice;
 				if (gf_mv12_next_slice_start((unsigned char *)buffer, next_slice + 4, data_size, &next_slice) >= 0) {
@@ -194,33 +194,33 @@
 			}
 			if (got_slice) len_to_write = prev_slice;
 			else len_to_write = MIN(max_pck_size, data_size);
-		} 
+		}
 
 		mpv_hdr[2] = pic_type;
-		
+
 		if (have_seq) {
 			mpv_hdr[2] |= 0x20;
 			have_seq = 0;
 		}
 		if (first_slice) mpv_hdr[2] |= 0x10;
-		
+
 		if (got_slice || last_pck) {
 			mpv_hdr[2] |= 0x08;
 			start_with_slice = 1;
 		} else {
 			start_with_slice = 0;
 		}
-		
+
 		builder->OnData(builder->cbk_obj, mpv_hdr, 4, 0);
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, len_to_write, offset);
 		} else {
 			builder->OnData(builder->cbk_obj, data + offset, len_to_write, 0);
 		}
-		
+
 		builder->rtp_header.Marker = last_pck ? 1 : 0;
 		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
-		
+
 		offset += len_to_write;
 		data_size -= len_to_write;
 		prev_slice = 0;
@@ -232,7 +232,7 @@
 			builder->rtp_header.SequenceNumber += 1;
 			builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
 		}
-    }
+	}
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_pck_mpeg4.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp_pck_mpeg4.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -107,7 +107,7 @@
 {
 	u32 nbBits = 0;
 	s32 delta;
-	
+
 	/*selective encryption*/
 	if (builder->flags & GP_RTP_PCK_SELECTIVE_ENCRYPTION) {
 		gf_bs_write_int(builder->pck_hdr, builder->is_encrypted, 1);
@@ -205,7 +205,7 @@
 GF_Err gp_rtp_builder_do_mpeg4(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	char *sl_buffer, *payl_buffer;
-	u32 sl_buffer_size, payl_buffer_size; 
+	u32 sl_buffer_size, payl_buffer_size;
 	u32 auh_size_tmp, bytesLeftInPacket, infoSize, pckSize;
 	u64 pos;
 	u8 flush_pck, no_split;
@@ -236,11 +236,11 @@
 			//we decide if we go with the same RTP TS serie or not
 			if (builder->payload) {
 				//don't store more than what we can (that is 2^slMap->CTSDelta - 1)
-				if ( (builder->flags & GP_RTP_PCK_SIGNAL_TS) 
-					&& (builder->sl_header.compositionTimeStamp - builder->rtp_header.TimeStamp >= (u32) ( 1 << builder->slMap.CTSDeltaLength) ) ) {
+				if ( (builder->flags & GP_RTP_PCK_SIGNAL_TS)
+				        && (builder->sl_header.compositionTimeStamp - builder->rtp_header.TimeStamp >= (u32) ( 1 << builder->slMap.CTSDeltaLength) ) ) {
 					goto flush_packet;
 				}
-				//don't split AU if # TS , start a new RTP pck 
+				//don't split AU if # TS , start a new RTP pck
 				if (builder->sl_header.compositionTimeStamp != builder->rtp_header.TimeStamp)
 					no_split = 1;
 			}
@@ -268,19 +268,19 @@
 			if (builder->has_AU_header) {
 				builder->auh_size = 16;
 				gf_bs_write_int(builder->pck_hdr, 0, 16);
-			}			
+			}
 			flush_pck = 0;
 			/*and create packet*/
 			builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
 		}
 
 		//make sure we are not interleaving too much - this should never happen actually
-		if (builder->slMap.IndexDeltaLength 
-			&& !builder->first_sl_in_rtp 
-			&& (builder->sl_header.AU_sequenceNumber - builder->last_au_sn >= (u32) 1<<builder->slMap.IndexDeltaLength)) {
+		if (builder->slMap.IndexDeltaLength
+		        && !builder->first_sl_in_rtp
+		        && (builder->sl_header.AU_sequenceNumber - builder->last_au_sn >= (u32) 1<<builder->slMap.IndexDeltaLength)) {
 			//we cannot write this packet here
 			goto flush_packet;
-		} 
+		}
 		/*check max ptime*/
 		if (builder->max_ptime && ( (u32) builder->sl_header.compositionTimeStamp >= builder->rtp_header.TimeStamp + builder->max_ptime) )
 			goto flush_packet;
@@ -299,7 +299,7 @@
 			builder->sl_header.accessUnitEndFlag = IsAUEnd;
 
 			builder->auh_size += auh_size_tmp;
-			
+
 			builder->sl_header.paddingFlag = builder->sl_header.paddingBits ? 1 : 0;
 		} else {
 
@@ -316,9 +316,9 @@
 		}
 
 		gf_rtp_build_au_hdr_write(builder, pckSize, builder->rtp_header.TimeStamp);
-		
+
 		//notify the user of our data structure
-		if (builder->OnDataReference) 
+		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, pckSize, data_size - bytesLeftInPacket);
 		else
 			gf_bs_write_data(builder->payload, data + (data_size - bytesLeftInPacket), pckSize);
@@ -355,11 +355,11 @@
 		/*no aux data yet*/
 		if (builder->slMap.AuxiliaryDataSizeLength)	{
 			//write RSLH after the MSLH
-			gf_bs_write_int(builder->pck_hdr, 0, builder->slMap.AuxiliaryDataSizeLength);			
-		}				
+			gf_bs_write_int(builder->pck_hdr, 0, builder->slMap.AuxiliaryDataSizeLength);
+		}
 		/*rewrite the size header*/
 		if (builder->has_AU_header) {
-			pos = gf_bs_get_position(builder->pck_hdr);		
+			pos = gf_bs_get_position(builder->pck_hdr);
 			gf_bs_seek(builder->pck_hdr, 0);
 			builder->auh_size -= 16;
 			gf_bs_write_int(builder->pck_hdr, builder->auh_size, 16);
@@ -374,7 +374,7 @@
 
 		payl_buffer = NULL;
 		payl_buffer_size = 0;
-		if (!builder->OnDataReference) 
+		if (!builder->OnDataReference)
 			gf_bs_get_content(builder->payload, &payl_buffer, &payl_buffer_size);
 
 		gf_bs_del(builder->payload);
@@ -454,7 +454,7 @@
 		Bool use_stap = 1;
 		/*if this is the AU end and no NALU in packet, go for single mode*/
 		if (IsAUEnd && !builder->bytesInPacket) use_stap = 0;
-		
+
 		if (use_stap) {
 			/*declare STAP-A NAL*/
 			if (!builder->bytesInPacket) {
@@ -470,7 +470,7 @@
 			builder->bytesInPacket += 2;
 		}
 		/*add data*/
-		if (builder->OnDataReference) 
+		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, nalu_size, 0);
 		else
 			builder->OnData(builder->cbk_obj, nalu, nalu_size, 0);
@@ -510,7 +510,7 @@
 			builder->OnData(builder->cbk_obj, (char *)shdr, 2, 0);
 
 			/*add data*/
-			if (builder->OnDataReference) 
+			if (builder->OnDataReference)
 				builder->OnDataReference(builder->cbk_obj, size, offset);
 			else
 				builder->OnData(builder->cbk_obj, nalu+offset, size, 0);
@@ -543,7 +543,7 @@
 	if (!nalu) do_flush = 1;
 	else if (builder->sl_header.accessUnitStartFlag) do_flush = 1;
 	/*we must NOT fragment a NALU*/
-	else if (builder->bytesInPacket + nalu_size + 4 >= builder->Path_MTU) do_flush = 2;
+	else if (builder->bytesInPacket + nalu_size + 4 >= builder->Path_MTU) do_flush = 2; //2 bytes PayloadHdr for AP + 2 bytes NAL size
 	/*aggregation is disabled*/
 	else if (! (builder->flags & GP_RTP_PCK_USE_MULTI) ) do_flush = 2;
 
@@ -571,10 +571,10 @@
 	/*at this point we're sure the NALU fits in current packet OR must be splitted*/
 	/*check that we should use single NALU packet mode or aggreation packets mode*/
 	if (builder->bytesInPacket+nalu_size+4 < builder->Path_MTU) {
-		Bool use_AP = 1;
+		Bool use_AP = (builder->flags & GP_RTP_PCK_USE_MULTI) ? 1 : 0;
 		/*if this is the AU end and no NALU in packet, go for single NALU packet mode*/
 		if (IsAUEnd && !builder->bytesInPacket) use_AP = 0;
-		
+
 		if (use_AP) {
 			char nal_s[2];
 			/*declare PayloadHdr for AP*/
@@ -610,7 +610,7 @@
 			builder->bytesInPacket += 2;
 		}
 		/*add data*/
-		if (builder->OnDataReference) 
+		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, nalu_size, 0);
 		else
 			builder->OnData(builder->cbk_obj, nalu, nalu_size, 0);
@@ -633,7 +633,7 @@
 		char payload_hdr[2];
 		char shdr;
 
-		assert(nalu_size>=builder->Path_MTU);
+		assert(nalu_size + 4 >=builder->Path_MTU);
 		assert(!builder->bytesInPacket);
 
 		/*FU payload doesn't have the NAL hdr (2 bytes*/
@@ -666,7 +666,7 @@
 			builder->OnData(builder->cbk_obj, &shdr, 1, 0);
 
 			/*add data*/
-			if (builder->OnDataReference) 
+			if (builder->OnDataReference)
 				builder->OnDataReference(builder->cbk_obj, size, offset);
 			else
 				builder->OnData(builder->cbk_obj, nalu+offset, size, 0);
@@ -693,76 +693,76 @@
 void latm_flush(GP_RTPPacketizer *builder)
 {
 	if (builder->bytesInPacket) {
-		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header); 
+		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
 		builder->bytesInPacket = 0;
 	}
-	builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp; 
+	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, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration)
 {
-	u32 size, latm_hdr_size, i, data_offset; 
-	Bool fragmented; 
-	unsigned char *latm_hdr; 
+	u32 size, latm_hdr_size, i, data_offset;
+	Bool fragmented;
+	unsigned char *latm_hdr;
 
 	if (!data) {
 		latm_flush(builder);
-		return GF_OK; 
+		return GF_OK;
 	}
-	
+
 	if ((builder->flags & GP_RTP_PCK_USE_MULTI) && builder->max_ptime) {
-		if ((u32) builder->sl_header.compositionTimeStamp + duration >= builder->rtp_header.TimeStamp + builder->max_ptime) 
+		if ((u32) builder->sl_header.compositionTimeStamp + duration >= builder->rtp_header.TimeStamp + builder->max_ptime)
 			latm_flush(builder);
 	}
 	/*compute max size for frame, flush current if this doesn't fit*/
-	latm_hdr_size = (data_size / 255) + 1; 
+	latm_hdr_size = (data_size / 255) + 1;
 	if (latm_hdr_size+data_size > builder->Path_MTU - builder->bytesInPacket) {
 		latm_flush(builder);
 	}
 
 	data_offset = 0;
 	fragmented = 0;
-	while (data_size > 0) { 
-		latm_hdr_size = (data_size / 255) + 1; 
+	while (data_size > 0) {
+		latm_hdr_size = (data_size / 255) + 1;
 		/*fragmenting*/
 		if (latm_hdr_size + data_size > builder->Path_MTU) {
 			assert(!builder->bytesInPacket);
 			fragmented = 1;
-			latm_hdr_size = (builder->Path_MTU / 255) + 1; 
-			size = builder->Path_MTU - latm_hdr_size; 
-			builder->rtp_header.Marker = 0; 
+			latm_hdr_size = (builder->Path_MTU / 255) + 1;
+			size = builder->Path_MTU - latm_hdr_size;
+			builder->rtp_header.Marker = 0;
 		}
 		/*last fragment or full AU*/
-		else { 
+		else {
 			fragmented = 0;
-			size = data_size; 
-			builder->rtp_header.Marker = 1; 
-		} 
-		data_size -= size; 
-		
-		/*create new RTP Packet if needed*/ 
+			size = data_size;
+			builder->rtp_header.Marker = 1;
+		}
+		data_size -= size;
+
+		/*create new RTP Packet if needed*/
 		if (!builder->bytesInPacket) {
-			builder->rtp_header.SequenceNumber += 1; 
-			builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp; 
-			builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header); 
+			builder->rtp_header.SequenceNumber += 1;
+			builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
+			builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
 		}
-	
-		/* compute AudioMuxUnit header */ 
-		latm_hdr_size = (size / 255) + 1; 
-		latm_hdr = (unsigned char *)gf_malloc( sizeof(char) * latm_hdr_size); 
-		for (i=0; i<latm_hdr_size-1; i++)  latm_hdr[i] = 255; 
-		latm_hdr[latm_hdr_size-1] = size % 255; 
-		
-		/*add LATM header IN ORDER in case we aggregate audioMuxElements in RTP*/ 
+
+		/* compute AudioMuxUnit header */
+		latm_hdr_size = (size / 255) + 1;
+		latm_hdr = (unsigned char *)gf_malloc( sizeof(char) * latm_hdr_size);
+		for (i=0; i<latm_hdr_size-1; i++)  latm_hdr[i] = 255;
+		latm_hdr[latm_hdr_size-1] = size % 255;
+
+		/*add LATM header IN ORDER in case we aggregate audioMuxElements in RTP*/
 		builder->OnData(builder->cbk_obj, (char*) latm_hdr, latm_hdr_size, 0);
 		builder->bytesInPacket += latm_hdr_size;
 		gf_free(latm_hdr);
-		
-		/*add payload*/ 
+
+		/*add payload*/
 		if (builder->OnDataReference) {
-			builder->OnDataReference(builder->cbk_obj, size, data_offset); 
-		} else 
-			builder->OnData(builder->cbk_obj, data, size, 0); 
+			builder->OnDataReference(builder->cbk_obj, size, data_offset);
+		} else
+			builder->OnData(builder->cbk_obj, data, size, 0);
 
 		builder->bytesInPacket += size;
 
@@ -770,12 +770,12 @@
 
 		/*fragmented AU, always flush packet*/
 		if (!builder->rtp_header.Marker) latm_flush(builder);
-	} 
+	}
 	/*if the AU has been fragmented or we don't use RTP aggregation, flush*/
 	if (! (builder->flags & GP_RTP_PCK_USE_MULTI) ) fragmented = 1;
 	if (fragmented) latm_flush(builder);
-	
-	return GF_OK; 
+
+	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_streamer.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp_streamer.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -37,7 +37,7 @@
 struct __rtp_streamer
 {
 	GP_RTPPacketizer *packetizer;
-	GF_RTPChannel *channel; 
+	GF_RTPChannel *channel;
 
 	/* The current packet being formed */
 	char *buffer;
@@ -57,7 +57,7 @@
 {
 	GF_RTPStreamer *rtp = cbk;
 	GF_Err e = gf_rtp_send_packet(rtp->channel, header, rtp->buffer+12, rtp->payload_len, 1);
-	
+
 #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)));
@@ -126,18 +126,18 @@
 		return res;
 	}
 	return GF_OK;
-} 
+}
 
 GF_EXPORT
-GF_RTPStreamer *gf_rtp_streamer_new_extended(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, 
-								 
-								 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
-								 )
+GF_RTPStreamer *gf_rtp_streamer_new_extended(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,
+
+        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
+                                            )
 {
 	GF_SLConfig slc;
 	GF_RTPStreamer *stream;
@@ -217,11 +217,11 @@
 					mpeg4mode = "CELP";
 					break;
 				}
-			} 
+			}
 #endif
 			break;
 
-			/*MPEG1/2 audio*/
+		/*MPEG1/2 audio*/
 		case GPAC_OTI_AUDIO_MPEG2_PART3:
 		case GPAC_OTI_AUDIO_MPEG1:
 			if (!is_crypted) {
@@ -307,17 +307,23 @@
 			rtp_type = GF_RTP_PAYT_HEVC;
 			PL_ID = 0x0F;
 			break;
+		/*SHVC*/
+		case GPAC_OTI_VIDEO_SHVC:
+			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+			rtp_type = GF_RTP_PAYT_SHVC;
+			PL_ID = 0x0F;
+			break;
 		}
 		break;
 
 	case GF_STREAM_SCENE:
 	case GF_STREAM_OD:
-        if (oti == GPAC_OTI_SCENE_DIMS) {
-            rtp_type = GF_RTP_PAYT_3GPP_DIMS;
-            has_mpeg4_mapping = 0;
-        } else {
-            rtp_type = GF_RTP_PAYT_MPEG4;
-        }
+		if (oti == GPAC_OTI_SCENE_DIMS) {
+			rtp_type = GF_RTP_PAYT_3GPP_DIMS;
+			has_mpeg4_mapping = 0;
+		} else {
+			rtp_type = GF_RTP_PAYT_MPEG4;
+		}
 		break;
 
 
@@ -364,7 +370,7 @@
 			oti = GPAC_OTI_VIDEO_AVC;
 			PL_ID = 0x0F;
 		}
-			break;
+		break;
 		case GF_ISOM_SUBTYPE_3GP_QCELP:
 			required_rate = 8000;
 			rtp_type = GF_RTP_PAYT_QCELP;
@@ -391,7 +397,7 @@
 
 	/*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;
@@ -439,19 +445,19 @@
 		slc.hasRandomAccessUnitsOnlyFlag = 1;
 	}
 
-	stream->packetizer = gf_rtp_builder_new(rtp_type, &slc, flags, 
-								stream, 
-								rtp_stream_on_new_packet, rtp_stream_on_packet_done, 
-								NULL, rtp_stream_on_data);
-	
+	stream->packetizer = gf_rtp_builder_new(rtp_type, &slc, flags,
+	                                        stream,
+	                                        rtp_stream_on_new_packet, rtp_stream_on_packet_done,
+	                                        NULL, rtp_stream_on_data);
+
 	if (!stream->packetizer) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP Packetizer] Failed to create packetizer\n"));
 		gf_free(stream);
 		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);
+	                    streamType, oti, PL_ID, MinSize, MaxSize, avgTS, maxDTSDelta, IV_length, KI_length, mpeg4mode);
 
 
 	if (force_dts_delta) stream->packetizer->slMap.DTSDeltaLength = force_dts_delta;
@@ -473,13 +479,13 @@
 
 
 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)
+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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+	                                    96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
 }
 
@@ -489,7 +495,7 @@
 	if (streamer) {
 		if (streamer->channel) gf_rtp_del(streamer->channel);
 		if (streamer->packetizer) gf_rtp_builder_del(streamer->packetizer);
-		if (streamer->buffer) gf_free(streamer->buffer);				
+		if (streamer->buffer) gf_free(streamer->buffer);
 		gf_free(streamer);
 	}
 }
@@ -540,8 +546,8 @@
 
 
 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, char *dsi, u32 dsi_len, GF_ISOFile *isofile, u32 isotrack, char *KMS_URI, u32 width, u32 height, char **out_sdp_buffer)
+{
 	u32 size;
 	u16 port;
 	char mediaName[30], payloadName[30];
@@ -555,9 +561,9 @@
 	sprintf(sdp, "m=%s %d RTP/%s %d\n", mediaName, 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 && (rtp->packetizer->rtp_payt != GF_RTP_PAYT_3GPP_DIMS)) {
 		sprintf(sdpLine, "a=mpeg4-esid:%d\n", ESID);
-		strcat(sdp, sdpLine);		
+		strcat(sdp, sdpLine);
 	}
 
 	if (width && height) {
@@ -569,7 +575,7 @@
 		sprintf(sdpLine, "a=framesize:%d %d-%d\n", rtp->packetizer->PayloadType, width, height);
 		strcat(sdp, sdpLine);
 	}
-		
+
 	strcpy(sdpLine, "");
 
 	/*AMR*/
@@ -617,7 +623,7 @@
 			strcat(sdpLine, "\n");
 		}
 	}
-	else if (rtp->packetizer->rtp_payt == GF_RTP_PAYT_HEVC) {
+	else if ((rtp->packetizer->rtp_payt == GF_RTP_PAYT_HEVC) || (rtp->packetizer->rtp_payt == GF_RTP_PAYT_SHVC)) {
 #ifndef GPAC_DISABLE_HEVC
 		GF_HEVCConfig *hevcc = dsi ? gf_odf_hevc_cfg_read(dsi, dsi_len, 0) : NULL;
 		if (hevcc) {
@@ -628,7 +634,7 @@
 			for (i = 0; i < count; i++) {
 				GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hevcc->param_array, i);
 				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
-					strcat(sdpLine, "; sprop-sps=");						
+					strcat(sdpLine, "; sprop-sps=");
 				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
 					strcat(sdpLine, "; sprop-pps=");
 				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
@@ -662,41 +668,41 @@
 			strcat(sdpLine, "\n");
 		}
 	}
-    /*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);
-        if (rtp->packetizer->flags & GP_RTP_DIMS_COMPRESSED) {
-            strcat(sdpLine, ";content-coding=deflate");
-        }
+	/*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);
+		if (rtp->packetizer->flags & GP_RTP_DIMS_COMPRESSED) {
+			strcat(sdpLine, ";content-coding=deflate");
+		}
 		strcat(sdpLine, "\n");
-    }
+	}
 	/*MPEG-4 Audio LATM*/
-	else if (rtp->packetizer->rtp_payt==GF_RTP_PAYT_LATM) { 
-		GF_BitStream *bs; 
-		char *config_bytes; 
-		u32 config_size; 
-
-		/* form config string */ 
-		bs = gf_bs_new(NULL, 32, GF_BITSTREAM_WRITE); 
-		gf_bs_write_int(bs, 0, 1); /* AudioMuxVersion */ 
-		gf_bs_write_int(bs, 1, 1); /* all streams same time */ 
-		gf_bs_write_int(bs, 0, 6); /* numSubFrames */ 
-		gf_bs_write_int(bs, 0, 4); /* numPrograms */ 
-		gf_bs_write_int(bs, 0, 3); /* numLayer */ 
+	else if (rtp->packetizer->rtp_payt==GF_RTP_PAYT_LATM) {
+		GF_BitStream *bs;
+		char *config_bytes;
+		u32 config_size;
+
+		/* form config string */
+		bs = gf_bs_new(NULL, 32, GF_BITSTREAM_WRITE);
+		gf_bs_write_int(bs, 0, 1); /* AudioMuxVersion */
+		gf_bs_write_int(bs, 1, 1); /* all streams same time */
+		gf_bs_write_int(bs, 0, 6); /* numSubFrames */
+		gf_bs_write_int(bs, 0, 4); /* numPrograms */
+		gf_bs_write_int(bs, 0, 3); /* numLayer */
 
 		/* audio-specific config  - PacketVideo patch: don't signal SBR and PS stuff, not allowed in LATM with audioMuxVersion=0*/
-		if (dsi) gf_bs_write_data(bs, dsi, MIN(dsi_len, 2) ); 
-
-		/* other data */ 
-		gf_bs_write_int(bs, 0, 3); /* frameLengthType */ 
-		gf_bs_write_int(bs, 0xff, 8); /* latmBufferFullness */ 
-		gf_bs_write_int(bs, 0, 1); /* otherDataPresent */ 
-		gf_bs_write_int(bs, 0, 1); /* crcCheckPresent */ 
-		gf_bs_get_content(bs, &config_bytes, &config_size); 
-		gf_bs_del(bs); 
-
-		gf_rtp_builder_format_sdp(rtp->packetizer, payloadName, sdpLine, config_bytes, config_size); 
-		gf_free(config_bytes); 
+		if (dsi) gf_bs_write_data(bs, dsi, MIN(dsi_len, 2) );
+
+		/* other data */
+		gf_bs_write_int(bs, 0, 3); /* frameLengthType */
+		gf_bs_write_int(bs, 0xff, 8); /* latmBufferFullness */
+		gf_bs_write_int(bs, 0, 1); /* otherDataPresent */
+		gf_bs_write_int(bs, 0, 1); /* crcCheckPresent */
+		gf_bs_get_content(bs, &config_bytes, &config_size);
+		gf_bs_del(bs);
+
+		gf_rtp_builder_format_sdp(rtp->packetizer, payloadName, sdpLine, config_bytes, config_size);
+		gf_free(config_bytes);
 		strcat(sdpLine, "\n");
 	}
 
@@ -713,10 +719,10 @@
 		strcat(*out_sdp_buffer, sdp);
 	}
 	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) 
+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;
@@ -729,7 +735,7 @@
 	{
 		sprintf(sdpLine, "a=depend:%d lay", payload_type[isotrack-1]);
 		strcat(sdp, sdpLine);
-		for (i = 0; i < (u32) count; i++) 
+		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]);
@@ -765,8 +771,8 @@
 	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");
-	
-    if (iod64) fprintf(tmp, "a=mpeg4-iod:\"data:application/mpeg4-iod;base64,%s\"\n", iod64);
+
+	if (iod64) fprintf(tmp, "a=mpeg4-iod:\"data:application/mpeg4-iod;base64,%s\"\n", iod64);
 
 	gf_f64_seek(tmp, 0, SEEK_END);
 	size = gf_f64_tell(tmp);
@@ -779,7 +785,7 @@
 }
 
 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, char *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);
 }

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtsp_command.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtsp_command.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -72,8 +72,8 @@
 
 	//this is for server only, set to OK by default
 	com->StatusCode = NC_RTSP_OK;
-	
-	
+
+
 	com->user_data = NULL;
 
 	com->Bandwidth = com->Blocksize = com->Content_Length = com->CSeq = 0;
@@ -106,8 +106,8 @@
 }
 
 
-GF_Err RTSP_WriteCommand(GF_RTSPSession *sess, GF_RTSPCommand *com, unsigned char *req_buffer, 
-						 unsigned char **out_buffer, u32 *out_size)
+GF_Err RTSP_WriteCommand(GF_RTSPSession *sess, GF_RTSPCommand *com, unsigned char *req_buffer,
+                         unsigned char **out_buffer, u32 *out_size)
 {
 	u32 i, cur_pos, size, count;
 	char *buffer, temp[50];
@@ -125,59 +125,59 @@
 
 	//then all headers
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Accept", com->Accept);
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Accept-Encoding", com->Accept_Encoding);	
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Accept-Language", com->Accept_Language);	
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Authorization", com->Authorization);	
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Accept-Encoding", com->Accept_Encoding);
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Accept-Language", com->Accept_Language);
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Authorization", com->Authorization);
 	if (com->Bandwidth) {
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Bandwidth: ");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Bandwidth: ");
 		RTSP_WRITE_INT(buffer, size, cur_pos, com->Bandwidth, 0);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 	if (com->Blocksize) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Blocksize: ");
 		RTSP_WRITE_INT(buffer, size, cur_pos, com->Blocksize, 0);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Cache-Control", com->Cache_Control);	
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Conference", com->Conference);	
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Cache-Control", com->Cache_Control);
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Conference", com->Conference);
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Connection", com->Connection);
 	//if we have a body write the content length
 	if (com->body) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Content-Length: ");
 		RTSP_WRITE_INT(buffer, size, cur_pos, (u32) strlen(com->body), 0);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 	//write the CSeq - use the SESSION CSeq
 	RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "CSeq: ");
 	RTSP_WRITE_INT(buffer, size, cur_pos, sess->CSeq, 0);
-	RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+	RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "From", com->From);	
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Proxy-Authorization", com->Proxy_Authorization);	
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Proxy-Require", com->Proxy_Require);	
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "From", com->From);
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Proxy-Authorization", com->Proxy_Authorization);
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Proxy-Require", com->Proxy_Require);
 
 	//Range, only NPT
 	if (com->Range && !com->Range->UseSMPTE) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Range: npt=");
 		RTSP_WRITE_FLOAT_WITHOUT_CHECK(buffer, size, cur_pos, com->Range->start);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "-");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "-");
 		if (com->Range->end > com->Range->start) {
 			RTSP_WRITE_FLOAT_WITHOUT_CHECK(buffer, size, cur_pos, com->Range->end);
 		}
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Referer", com->Referer);	
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Referer", com->Referer);
 	if (com->Scale != 0.0) {
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Scale: ");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Scale: ");
 		RTSP_WRITE_FLOAT_WITHOUT_CHECK(buffer, size, cur_pos, com->Scale);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Session", com->Session);	
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Session", com->Session);
 	if (com->Speed != 0.0) {
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Speed: ");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Speed: ");
 		RTSP_WRITE_FLOAT_WITHOUT_CHECK(buffer, size, cur_pos, com->Speed);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 
 	//transport info
@@ -243,14 +243,14 @@
 		//done with transport
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
-	RTSP_WRITE_HEADER(buffer, size, cur_pos, "User-Agent", com->User_Agent);	
+	RTSP_WRITE_HEADER(buffer, size, cur_pos, "User-Agent", com->User_Agent);
 
 	//eXtensions
 	count = gf_list_count(com->Xtensions);
 	for (i=0; i<count; i++) {
 		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);	
+		RTSP_WRITE_HEADER(buffer, size, cur_pos, att->Name, att->Value);
 	}
 
 	//the end of header
@@ -267,7 +267,7 @@
 
 
 //format a DESCRIBE, SETUP, PLAY or PAUSE on a session
-//YOUR COMMAND MUST BE FORMATTED ACCORDINGLY 
+//YOUR COMMAND MUST BE FORMATTED ACCORDINGLY
 //sCtrl contains a control string if needed, formating the REQUEST as server_url/service_name/sCtrl
 GF_EXPORT
 GF_Err gf_rtsp_send_command(GF_RTSPSession *sess, GF_RTSPCommand *com)
@@ -284,39 +284,39 @@
 
 	//NB: OPTIONS is not sent this way
 	if (strcmp(com->method, GF_RTSP_DESCRIBE)
-		&& strcmp(com->method, GF_RTSP_ANNOUNCE)
-		&& strcmp(com->method, GF_RTSP_GET_PARAMETER)
-		&& strcmp(com->method, GF_RTSP_SET_PARAMETER)
-		&& strcmp(com->method, GF_RTSP_SETUP)
-		&& 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_TEARDOWN)
-		&& strcmp(com->method, GF_RTSP_OPTIONS)
-
-		) return GF_BAD_PARAM;
+	        && strcmp(com->method, GF_RTSP_ANNOUNCE)
+	        && strcmp(com->method, GF_RTSP_GET_PARAMETER)
+	        && strcmp(com->method, GF_RTSP_SET_PARAMETER)
+	        && strcmp(com->method, GF_RTSP_SETUP)
+	        && 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_TEARDOWN)
+	        && strcmp(com->method, GF_RTSP_OPTIONS)
+
+	   ) return GF_BAD_PARAM;
 
 	//check the state machine
-	if (strcmp(com->method, GF_RTSP_PLAY) 
-		&& strcmp(com->method, GF_RTSP_PAUSE) 
-		&& strcmp(com->method, GF_RTSP_RECORD)
-		&& sess->RTSP_State != GF_RTSP_STATE_INIT) 
+	if (strcmp(com->method, GF_RTSP_PLAY)
+	        && strcmp(com->method, GF_RTSP_PAUSE)
+	        && strcmp(com->method, GF_RTSP_RECORD)
+	        && sess->RTSP_State != GF_RTSP_STATE_INIT)
 		return GF_SERVICE_ERROR;
 
 	//aggregation is ONLY for the same request - unclear in RFC2326 ...
 	//it is often mentioned "queued requests" at the server, like 3 PLAYS
 	//and a PAUSE ....
-	
+
 	/*
-	else if (sess->RTSP_State == GF_RTSP_STATE_WAIT_FOR_CONTROL 
+	else if (sess->RTSP_State == GF_RTSP_STATE_WAIT_FOR_CONTROL
 		&& strcmp(com->method, sess->RTSPLastRequest))
 		&& strcmp(com->method, GF_RTSP_OPTIONS))
 
 		return GF_BAD_PARAM;
-*/
+	*/
 
-	//OPTIONS must have a parameter string 
+	//OPTIONS must have a parameter string
 	if (!strcmp(com->method, GF_RTSP_OPTIONS) && !sCtrl) return GF_BAD_PARAM;
 
 
@@ -353,10 +353,10 @@
 
 	//Body on ANNOUNCE, GET_PARAMETER, SET_PARAMETER ONLY
 	body = NULL;
-	if (strcmp(com->method, GF_RTSP_ANNOUNCE) 
-		&& strcmp(com->method, GF_RTSP_GET_PARAMETER) 
-		&& strcmp(com->method, GF_RTSP_SET_PARAMETER) 
-		) {
+	if (strcmp(com->method, GF_RTSP_ANNOUNCE)
+	        && strcmp(com->method, GF_RTSP_GET_PARAMETER)
+	        && strcmp(com->method, GF_RTSP_SET_PARAMETER)
+	   ) {
 		//this is an error, but don't say anything
 		if (com->body) {
 			body = com->body;
@@ -468,7 +468,7 @@
 	Pos = gf_token_get(LineBuffer, Pos, " \t\r\n", ValBuf, 1024);
 	if (Pos <= 0) return GF_OK;
 	com->service_name = gf_strdup(ValBuf);
-	
+
 	//RTSP version
 	Pos = gf_token_get(LineBuffer, Pos, "\t\r\n", ValBuf, 1024);
 	if (Pos <= 0) return GF_OK;
@@ -478,7 +478,7 @@
 	}
 
 	com->StatusCode = NC_RTSP_OK;
-	
+
 	return gf_rtsp_parse_header(buffer + ret, Size - ret, BodyStart, com, NULL);
 }
 
@@ -517,7 +517,7 @@
 	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);
-	}	
+	}
 	//reset TCP buffer
 	sess->CurrentPos += BodyStart + com->Content_Length;
 
@@ -530,7 +530,7 @@
 	//dynamically, nor reset the session ourselves as we don't know the details of the session
 	//(eg TEARDOWN may keep resources up or not, ...)
 
-	//we also have the same pb for CSeq, as nothing forbids a server to buffer commands (and it 
+	//we also have the same pb for CSeq, as nothing forbids a server to buffer commands (and it
 	//happens during aggregation of PLAY/PAUSE with overlapping ranges)
 
 	//however store the last CSeq in case for client checking
@@ -539,7 +539,7 @@
 	}
 	//check we're in the right range
 	else {
-		if (sess->CSeq >= com->CSeq) 
+		if (sess->CSeq >= com->CSeq)
 			com->StatusCode = NC_RTSP_Header_Field_Not_Valid;
 		else
 			sess->CSeq = com->CSeq;
@@ -548,20 +548,20 @@
 	//
 	//if a connection closed is signal, check this is the good session
 	// and reset it (the client is no longer connected)
-	if (sess->last_session_id && com->Session && !strcmp(com->Session, sess->last_session_id) 
-		&& com->Connection && !stricmp(com->Connection, "Close")) {
+	if (sess->last_session_id && com->Session && !strcmp(com->Session, sess->last_session_id)
+	        && com->Connection && !stricmp(com->Connection, "Close")) {
 
 		gf_rtsp_session_reset(sess, 0);
 		//destroy the socket
 		if (sess->connection) gf_sk_del(sess->connection);
 		sess->connection = NULL;
-		
+
 		//destroy the http tunnel if any
 		if (sess->HasTunnel && sess->http) {
 			gf_sk_del(sess->http);
 			sess->http = NULL;
 		}
-	}	
+	}
 
 exit:
 	gf_mx_v(sess->mx);

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtsp_common.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtsp_common.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,7 +40,7 @@
 	while (1) {
 		//Locate header / body
 		if (!BodyStart) gf_rtsp_get_body_info(sess, &BodyStart, &body_size);
-		
+
 		if (BodyStart) {
 			//enough data
 			res = sess->CurrentSize - sess->CurrentPos;
@@ -73,11 +73,11 @@
 
 	//if found add the 2 "\r\n" and parse it
 	*body_start = start + 4;
-		
+
 	//get the content length
 	cl_str = strstr(buffer, "Content-Length: ");
 	if (!cl_str) cl_str = strstr(buffer, "Content-length: ");
-		
+
 	if (cl_str) {
 		cl_str += 16;
 		i = 0;
@@ -114,9 +114,9 @@
 	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->TCPBuffer + sess->CurrentSize,
+	                  RTSP_TCP_BUF_SIZE - sess->CurrentSize,
+	                  0, &res);
 
 	if (!e) {
 		sess->CurrentSize += res;
@@ -157,7 +157,7 @@
 
 	IsFirst = 1;
 	pos = 0;
-	while (1) {	
+	while (1) {
 		pos = gf_token_get(buffer, pos, " ;", buf, 100);
 		if (pos <= 0) break;
 		if (strstr(buf, "=")) {
@@ -166,7 +166,7 @@
 		} else {
 			strcpy(param_name, buf);
 		}
-		
+
 		//very first param is the profile
 		if (IsFirst) {
 			tmp->Profile = gf_strdup(param_name);
@@ -236,10 +236,10 @@
 		HeaderLine = 0;
 		LinePos = gf_token_get_line(buffer, LinePos, BufferSize, LineBuffer, 1024);
 		if (LinePos <= 0) return GF_REMOTE_SERVICE_ERROR;
-		
-		//extract field header and value. Warning: some params (transport, ..) may be on several lines 
+
+		//extract field header and value. Warning: some params (transport, ..) may be on several lines
 		Pos = gf_token_get(LineBuffer, 0, ":\r\n", temp, 400);
-		
+
 		//end of header
 		if (Pos <= 0) {
 			HeaderLine = 2;
@@ -298,9 +298,9 @@
 	switch (ErrCode) {
 	case NC_RTSP_Continue:
 		return "Continue";
-	case NC_RTSP_OK:	
+	case NC_RTSP_OK:
 		return "OK";
-	case NC_RTSP_Created:	
+	case NC_RTSP_Created:
 		return "Created";
 	case NC_RTSP_Low_on_Storage_Space:
 		return "Low on Storage Space";

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtsp_response.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtsp_response.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -98,7 +98,7 @@
 	rsp->Scale = rsp->Speed = 0.0;
 	if (rsp->Range) gf_free(rsp->Range);
 	rsp->Range = NULL;
-	
+
 	rsp->SessionTimeOut = 0;
 
 	while (gf_list_count(rsp->Transports)) {
@@ -126,7 +126,7 @@
 void gf_rtsp_response_del(GF_RTSPResponse *rsp)
 {
 	if (!rsp) return;
-	
+
 	gf_rtsp_response_reset(rsp);
 	gf_list_del(rsp->RTP_Infos);
 	gf_list_del(rsp->Xtensions);
@@ -142,12 +142,12 @@
 	GF_RTSPRange *rg;
 
 	if (!strstr(range_buf, "npt")) return NULL;
-	
+
 	GF_SAFEALLOC(rg, GF_RTSPRange);
 	if (sscanf(range_buf, "npt=%lf-%lf", &rg->start, &rg->end) != 2) {
 		rg->end = -1.0;
 		sscanf(range_buf, "npt=%lf-", &rg->start);
-	}	
+	}
 	return rg;
 }
 
@@ -166,8 +166,8 @@
 {
 	GF_RTSPTransport *tr;
 
-	if (!original) return NULL;	
-	
+	if (!original) return NULL;
+
 	tr = (GF_RTSPTransport*) gf_malloc(sizeof(GF_RTSPTransport));
 	memcpy(tr, original, sizeof(GF_RTSPTransport));
 	tr->destination = tr->source = tr->Profile = NULL;
@@ -210,36 +210,36 @@
 	else if (!stricmp(Header, "Cache-Control")) rsp->Cache_Control = gf_strdup(Value);
 	else if (!stricmp(Header, "Conference")) rsp->Conference = gf_strdup(Value);
 	else if (!stricmp(Header, "Connection")) rsp->Connection = gf_strdup(Value);
-	else if (!stricmp(Header, "Content-Base")) rsp->Content_Base = gf_strdup(Value);	
-	else if (!stricmp(Header, "Content-Encoding")) rsp->Content_Encoding = gf_strdup(Value);	
+	else if (!stricmp(Header, "Content-Base")) rsp->Content_Base = gf_strdup(Value);
+	else if (!stricmp(Header, "Content-Encoding")) rsp->Content_Encoding = gf_strdup(Value);
 	else if (!stricmp(Header, "Content-Length")) sscanf(Value, "%u", &rsp->Content_Length);
-	else if (!stricmp(Header, "Content-Language")) rsp->Content_Language = gf_strdup(Value);	
-	else if (!stricmp(Header, "Content-Location")) rsp->Content_Location = gf_strdup(Value);	
-	else if (!stricmp(Header, "Content-Type")) rsp->Content_Type = gf_strdup(Value);	
+	else if (!stricmp(Header, "Content-Language")) rsp->Content_Language = gf_strdup(Value);
+	else if (!stricmp(Header, "Content-Location")) rsp->Content_Location = gf_strdup(Value);
+	else if (!stricmp(Header, "Content-Type")) rsp->Content_Type = gf_strdup(Value);
 	else if (!stricmp(Header, "CSeq")) sscanf(Value, "%u", &rsp->CSeq);
-	else if (!stricmp(Header, "Date")) rsp->Date = gf_strdup(Value);	
-	else if (!stricmp(Header, "Expires")) rsp->Expires = gf_strdup(Value);	
-	else if (!stricmp(Header, "From")) rsp->From = gf_strdup(Value);	
-	else if (!stricmp(Header, "Host")) rsp->Host = gf_strdup(Value);	
-	else if (!stricmp(Header, "If-Match")) rsp->If_Match = gf_strdup(Value);	
-	else if (!stricmp(Header, "If-Modified-Since")) rsp->If_Modified_Since = gf_strdup(Value);	
-	else if (!stricmp(Header, "Last-Modified")) rsp->Last_Modified = gf_strdup(Value);	
-	else if (!stricmp(Header, "Location")) rsp->Location = gf_strdup(Value);	
-	else if (!stricmp(Header, "Proxy-Authenticate")) rsp->Proxy_Authenticate = gf_strdup(Value);	
-	else if (!stricmp(Header, "Proxy-Require")) rsp->Proxy_Require = gf_strdup(Value);	
-	else if (!stricmp(Header, "Public")) rsp->Public = gf_strdup(Value);	
-	else if (!stricmp(Header, "Referer")) rsp->Referer = gf_strdup(Value);	
-	else if (!stricmp(Header, "Require")) rsp->Require = gf_strdup(Value);	
-	else if (!stricmp(Header, "Retry-After")) rsp->Retry_After = gf_strdup(Value);	
+	else if (!stricmp(Header, "Date")) rsp->Date = gf_strdup(Value);
+	else if (!stricmp(Header, "Expires")) rsp->Expires = gf_strdup(Value);
+	else if (!stricmp(Header, "From")) rsp->From = gf_strdup(Value);
+	else if (!stricmp(Header, "Host")) rsp->Host = gf_strdup(Value);
+	else if (!stricmp(Header, "If-Match")) rsp->If_Match = gf_strdup(Value);
+	else if (!stricmp(Header, "If-Modified-Since")) rsp->If_Modified_Since = gf_strdup(Value);
+	else if (!stricmp(Header, "Last-Modified")) rsp->Last_Modified = gf_strdup(Value);
+	else if (!stricmp(Header, "Location")) rsp->Location = gf_strdup(Value);
+	else if (!stricmp(Header, "Proxy-Authenticate")) rsp->Proxy_Authenticate = gf_strdup(Value);
+	else if (!stricmp(Header, "Proxy-Require")) rsp->Proxy_Require = gf_strdup(Value);
+	else if (!stricmp(Header, "Public")) rsp->Public = gf_strdup(Value);
+	else if (!stricmp(Header, "Referer")) rsp->Referer = gf_strdup(Value);
+	else if (!stricmp(Header, "Require")) rsp->Require = gf_strdup(Value);
+	else if (!stricmp(Header, "Retry-After")) rsp->Retry_After = gf_strdup(Value);
 	else if (!stricmp(Header, "Scale")) sscanf(Value, "%lf", &rsp->Scale);
-	else if (!stricmp(Header, "Server")) rsp->Server = gf_strdup(Value);	
+	else if (!stricmp(Header, "Server")) rsp->Server = gf_strdup(Value);
 	else if (!stricmp(Header, "Speed")) sscanf(Value, "%lf", &rsp->Speed);
-	else if (!stricmp(Header, "Timestamp")) rsp->Timestamp = gf_strdup(Value);	
-	else if (!stricmp(Header, "Unsupported")) rsp->Unsupported = gf_strdup(Value);	
-	else if (!stricmp(Header, "User-Agent")) rsp->User_Agent = gf_strdup(Value);	
-	else if (!stricmp(Header, "Vary")) rsp->Vary = gf_strdup(Value);	
-	else if (!stricmp(Header, "Via")) rsp->Vary = gf_strdup(Value);	
-	else if (!stricmp(Header, "WWW_Authenticate")) rsp->Vary = gf_strdup(Value);	
+	else if (!stricmp(Header, "Timestamp")) rsp->Timestamp = gf_strdup(Value);
+	else if (!stricmp(Header, "Unsupported")) rsp->Unsupported = gf_strdup(Value);
+	else if (!stricmp(Header, "User-Agent")) rsp->User_Agent = gf_strdup(Value);
+	else if (!stricmp(Header, "Vary")) rsp->Vary = gf_strdup(Value);
+	else if (!stricmp(Header, "Via")) rsp->Vary = gf_strdup(Value);
+	else if (!stricmp(Header, "WWW_Authenticate")) rsp->Vary = gf_strdup(Value);
 	else if (!stricmp(Header, "Transport")) {
 		LinePos = 0;
 		while (1) {
@@ -274,7 +274,7 @@
 
 			GF_SAFEALLOC(info, GF_RTPInfo);
 			Pos = 0;
-			while (1) {	
+			while (1) {
 				Pos = gf_token_get(LineBuffer, Pos, " ;", buf, 1000);
 				if (Pos <= 0) break;
 				if (strstr(buf, "=")) {
@@ -325,17 +325,17 @@
 
 	//parse first line
 	ret = gf_token_get_line(buffer, 0, Size, LineBuffer, 1024);
-	if (ret < 0) 
+	if (ret < 0)
 		return GF_REMOTE_SERVICE_ERROR;
 	//RTSP/1.0
 	Pos = gf_token_get(LineBuffer, 0, " \t\r\n", ValBuf, 400);
-	if (Pos <= 0) 
+	if (Pos <= 0)
 		return GF_REMOTE_SERVICE_ERROR;
 	if (strcmp(ValBuf, GF_RTSP_VERSION))
 		return GF_SERVICE_ERROR;
 	//CODE
 	Pos = gf_token_get(LineBuffer, Pos, " \t\r\n", ValBuf, 400);
-	if (Pos <= 0) 
+	if (Pos <= 0)
 		return GF_REMOTE_SERVICE_ERROR;
 	rsp->ResponseCode = atoi(ValBuf);
 	//string info
@@ -368,7 +368,7 @@
 	GF_Err e;
 	Bool force_reset = 0;
 	u32 BodyStart, size;
-	
+
 	if (!sess || !rsp) return GF_BAD_PARAM;
 	gf_rtsp_response_reset(rsp);
 
@@ -378,12 +378,12 @@
 
 
 	e = gf_rtsp_check_connection(sess);
-	if (e) 
+	if (e)
 		goto exit;
 
 	//push data in our queue
 	e = gf_rtsp_fill_buffer(sess);
-	if (e) 
+	if (e)
 		goto exit;
 
 	//this is interleaved data
@@ -404,15 +404,15 @@
 	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);
-	}	
+	}
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSP] Got Response:\n%s\n", sess->TCPBuffer+sess->CurrentPos));
-	
+
 	//reset TCP buffer
 	sess->CurrentPos += BodyStart + rsp->Content_Length;
 
 	if (e) goto exit;
-	
+
 	//update RTSP aggreagation info
 	if (sess->NbPending) sess->NbPending -= 1;
 
@@ -467,14 +467,14 @@
 		//destroy the socket
 		if (sess->connection) gf_sk_del(sess->connection);
 		sess->connection = NULL;
-		
+
 		//destroy the http tunnel if any
 		if (sess->HasTunnel && sess->http) {
 			gf_sk_del(sess->http);
 			sess->http = NULL;
 		}
-	}	
-	
+	}
+
 	gf_mx_v(sess->mx);
 	return e;
 }
@@ -482,8 +482,8 @@
 
 
 
-GF_Err RTSP_WriteResponse(GF_RTSPSession *sess, GF_RTSPResponse *rsp, 
-						 unsigned char **out_buffer, u32 *out_size)
+GF_Err RTSP_WriteResponse(GF_RTSPSession *sess, GF_RTSPResponse *rsp,
+                          unsigned char **out_buffer, u32 *out_size)
 {
 	u32 i, cur_pos, size, count;
 	char *buffer, temp[50];
@@ -513,14 +513,14 @@
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Allow", rsp->Allow);
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Authorization", rsp->Authorization);
 	if (rsp->Bandwidth) {
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Bandwidth: ");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Bandwidth: ");
 		RTSP_WRITE_INT(buffer, size, cur_pos, rsp->Bandwidth, 0);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 	if (rsp->Blocksize) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Blocksize: ");
 		RTSP_WRITE_INT(buffer, size, cur_pos, rsp->Blocksize, 0);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Cache-Control", rsp->Cache_Control);
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Conference", rsp->Conference);
@@ -532,14 +532,14 @@
 	if (rsp->body) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Content-Length: ");
 		RTSP_WRITE_INT(buffer, size, cur_pos, (u32) strlen(rsp->body), 0);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Content-Location", rsp->Content_Location);
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Content-Type", rsp->Content_Type);
 	//write the CSeq - use the RESPONSE CSeq
 	RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "CSeq: ");
 	RTSP_WRITE_INT(buffer, size, cur_pos, rsp->CSeq, 0);
-	RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+	RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Date", rsp->Date);
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Expires", rsp->Expires);
@@ -557,11 +557,11 @@
 	if (rsp->Range && !rsp->Range->UseSMPTE) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Range: npt:");
 		RTSP_WRITE_FLOAT_WITHOUT_CHECK(buffer, size, cur_pos, rsp->Range->start);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "-");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "-");
 		if (rsp->Range->end > rsp->Range->start) {
 			RTSP_WRITE_FLOAT_WITHOUT_CHECK(buffer, size, cur_pos, rsp->Range->end);
 		}
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Referer", rsp->Referer);
@@ -577,7 +577,7 @@
 			//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);
-			
+
 			if (info->url) {
 				RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "url=");
 				RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, info->url);
@@ -590,18 +590,18 @@
 		}
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
-	
+
 	if (rsp->Scale != 0.0) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Scale: ");
 		RTSP_WRITE_FLOAT_WITHOUT_CHECK(buffer, size, cur_pos, rsp->Scale);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Server", rsp->Server);
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Session", rsp->Session);
 	if (rsp->Speed != 0.0) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Scale: ");
 		RTSP_WRITE_FLOAT_WITHOUT_CHECK(buffer, size, cur_pos, rsp->Speed);
-		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");	
+		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");
 	}
 	RTSP_WRITE_HEADER(buffer, size, cur_pos, "Timestamp", rsp->Timestamp);
 
@@ -680,7 +680,7 @@
 	for (i=0; i<count; i++) {
 		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);	
+		RTSP_WRITE_HEADER(buffer, size, cur_pos, att->Name, att->Value);
 	}
 	//end of header
 	RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n");

gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtsp_session.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/rtsp_session.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,7 +40,7 @@
 	strcpy(Server, "");
 	strcpy(Service, "");
 	*Port = *useTCP =0;
-	
+
 	if (!strchr(sURL, ':')) return GF_BAD_PARAM;
 
 	//extract the schema
@@ -54,12 +54,12 @@
 
 found:
 	schema[i] = 0;
-	if (stricmp(schema, "rtsp") && stricmp(schema, "rtspu")) return GF_URL_ERROR; 
+	if (stricmp(schema, "rtsp") && stricmp(schema, "rtspu")) return GF_URL_ERROR;
 	//check for user/pass - not allowed
-/*
-	test = strstr(sURL, "@");
-	if (test) return GF_NOT_SUPPORTED;
-*/
+	/*
+		test = strstr(sURL, "@");
+		if (test) return GF_NOT_SUPPORTED;
+	*/
 	test = strstr(sURL, "://");
 	if (!test) return GF_URL_ERROR;
 	test += 3;
@@ -115,7 +115,7 @@
 	GF_Err e;
 	u16 Port;
 	Bool UseTCP;
-	
+
 	if (!sURL) return NULL;
 
 	e = RTSP_UnpackURL(sURL, server, &Port, service, &UseTCP);
@@ -132,7 +132,7 @@
 	if (sess->Port == 80) {
 		sess->ConnectionType = GF_SOCK_TYPE_TCP;
 		sess->HasTunnel = 1;
-	}	
+	}
 
 	sess->Server = gf_strdup(server);
 	sess->Service = gf_strdup(service);
@@ -147,7 +147,7 @@
 void gf_rtsp_reset_aggregation(GF_RTSPSession *sess)
 {
 	if (!sess) return;
-	
+
 	gf_mx_p(sess->mx);
 	if (sess->RTSP_State == GF_RTSP_STATE_WAIT_FOR_CONTROL) {
 		strcpy(sess->RTSPLastRequest, "RESET");
@@ -190,7 +190,7 @@
 			sess->http = NULL;
 		}
 	}
-	
+
 	sess->RTSP_State = GF_RTSP_STATE_INIT;
 //	sess->CSeq = sess->NbPending = 0;
 	sess->InterID = (u8) -1;
@@ -224,7 +224,7 @@
 {
 	u32 state;
 	if (!sess) return GF_RTSP_STATE_INVALIDATED;
-	
+
 	gf_mx_p(sess->mx);
 	state = sess->RTSP_State;
 	gf_mx_v(sess->mx);
@@ -375,7 +375,7 @@
 	if (Size <= 4) return gf_rtsp_refill_buffer(sess);
 
 	//break if we get RTSP response on the wire
-	if (!strncmp(buffer, "RTSP", 4)) 
+	if (!strncmp(buffer, "RTSP", 4))
 		return GF_IP_NETWORK_EMPTY;
 
 	//new packet
@@ -414,7 +414,7 @@
 			sess->CurrentPos += Size;
 			assert(sess->CurrentPos <= sess->CurrentSize);
 		}
-	} 
+	}
 	/*end of packet*/
 	else if (sess->payloadSize - sess->pck_start <= Size) {
 //		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP over RTSP] Missed begining of packet (%d bytes) in stream %d\n", Size, sess->InterID));
@@ -465,7 +465,7 @@
 	sess->InterID = (u8) -1;
 	if (ResetChannels) RemoveTCPChannels(sess);
 	gf_mx_v(sess->mx);
-	
+
 	return GF_OK;
 }
 
@@ -526,8 +526,8 @@
 
 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 (*SignalData)(GF_RTSPSession *sess, void *chan, char *buffer, u32 bufferSize, Bool IsRTCP)
+                                      )
 {
 	if (!sess) return GF_BAD_PARAM;
 
@@ -582,7 +582,7 @@
 		temp = (num >> (i * 4)) & 0x0f;
 		sess->HTTP_Cookie[sess->CookieRadLen + i] = (u8) temp + sess->HTTP_Cookie[0];
 	}
-	sess->HTTP_Cookie[sess->CookieRadLen + i] = 0;	
+	sess->HTTP_Cookie[sess->CookieRadLen + i] = 0;
 }
 
 
@@ -606,16 +606,16 @@
 	pos += sprintf(buffer + pos, "x-sessioncookie: %s\r\n", sess->HTTP_Cookie);
 	pos += sprintf(buffer + pos, "Accept: application/x-rtsp-tunnelled\r\n" );
 	pos += sprintf(buffer + pos, "Pragma: no-cache\r\n" );
-	pos += sprintf(buffer + pos, "Cache-Control: no-cache\r\n\r\n" );	
-	
+	pos += sprintf(buffer + pos, "Cache-Control: no-cache\r\n\r\n" );
+
 	//	send it!
 	e = gf_sk_send_wait(sess->connection, buffer, (u32) strlen(buffer), HTTP_WAIT_SEC);
 	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);
 	if (e) return e;
-	
+
 	//get HTTP/1.0 200 OK
 	if (strncmp(buffer, HTTP_RSP_OK, strlen(HTTP_RSP_OK)))
 		return GF_REMOTE_SERVICE_ERROR;
@@ -625,7 +625,7 @@
 	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, sess->MobileIP)) return GF_IP_CONNECTION_FAILURE;
 
 	memset(buffer, 0, GF_RTSP_DEFAULT_BUFFER);
 	pos = 0;
@@ -634,13 +634,13 @@
 	pos += sprintf(buffer + pos, "x-sessioncookie: %s\r\n", sess->HTTP_Cookie);
 	pos += sprintf(buffer + pos, "Accept: application/x-rtsp-tunnelled\r\n");
 	pos += sprintf(buffer + pos, "Pragma: no-cache\r\n");
-	pos += sprintf(buffer + pos, "Cache-Control: no-cache\r\n");	
+	pos += sprintf(buffer + pos, "Cache-Control: no-cache\r\n");
 	pos += sprintf(buffer + pos, "Content-Length: 32767\r\n");
 	pos += sprintf(buffer + pos, "Expires: Sun. 9 Jan 1972 00:00:00 GMT\r\n\r\n");
- 
+
 	//	send it!
 	e = gf_sk_send_wait(sess->http, buffer, (u32) strlen(buffer), HTTP_WAIT_SEC);
-	
+
 	return e;
 }
 
@@ -661,8 +661,8 @@
 	char name[GF_MAX_IP_NAME_LEN];
 
 	if (!rtsp_listener) return NULL;
-	
-	
+
+
 	e = gf_sk_accept(rtsp_listener, &new_conn);
 	if (!new_conn || e) return NULL;
 
@@ -681,7 +681,7 @@
 		gf_sk_del(new_conn);
 		return NULL;
 	}
-	
+
 	//OK create a new session
 	GF_SAFEALLOC(sess, GF_RTSPSession);
 
@@ -690,7 +690,7 @@
 	sess->ConnectionType = fam;
 	gf_sk_get_host_name(name);
 	sess->Server = gf_strdup(name);
-	
+
 	sess->TCPChannels = gf_list_new();
 	return sess;
 }

gpac-0.5.0.svn5178.tar.bz2/src/ietf/sdp.c -> gpac-0.5.1.svn5491.tar.xz/src/ietf/sdp.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -275,7 +275,7 @@
 		gf_list_rem(media->RTPMaps, 0);
 	}
 	gf_list_del(media->RTPMaps);
-	
+
 	while (gf_list_count(media->Connections)) {
 		conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
 		gf_list_rem(media->Connections, 0);
@@ -360,7 +360,7 @@
 	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_list_rem(sdp->media_desc, 0);
@@ -416,7 +416,7 @@
 
 GF_EXPORT
 void gf_sdp_info_del(GF_SDPInfo *sdp)
-{	
+{
 	if (!sdp) return;
 	gf_sdp_info_reset(sdp);
 	gf_list_del(sdp->media_desc);
@@ -440,7 +440,7 @@
 	return 0;
 }
 
-//translate h || m || d in sec. Fractions are not allowed with this writing 
+//translate h || m || d in sec. Fractions are not allowed with this writing
 s32 SDP_MakeSeconds(char *buf)
 {
 	s32 sign;
@@ -453,16 +453,19 @@
 	memset(num, 0, 30);
 	test = strstr(buf, "d");
 	if (test) {
+		assert(strlen(buf)-strlen(test) < sizeof(num));
 		strncpy(num, buf, strlen(buf)-strlen(test));
 		return (atoi(num)*sign*86400);
 	}
 	test = strstr(buf, "h");
 	if (test) {
+		assert(strlen(buf)-strlen(test) < sizeof(num));
 		strncpy(num, buf, strlen(buf)-strlen(test));
 		return (atoi(num)*sign*3600);
 	}
 	test = strstr(buf, "m");
 	if (test) {
+		assert(strlen(buf)-strlen(test) < sizeof(num));
 		strncpy(num, buf, strlen(buf)-strlen(test));
 		return (atoi(num)*sign*60);
 	}
@@ -508,7 +511,7 @@
 			sdp->o_session_id = gf_strdup(comp);
 			pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 			sdp->o_version = gf_strdup(comp);
-			
+
 			pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 			sdp->o_net_type = gf_strdup(comp);
 
@@ -541,12 +544,12 @@
 		case 'c':
 			//if at session level, only 1 is allowed for all SDP
 			if (sdp->c_connection) break;
-			
+
 			conn = gf_sdp_conn_new();
 
 			pos = gf_token_get(LineBuf, 2, " \t\r\n", comp, 3000);
 			conn->net_type = gf_strdup(comp);
-			
+
 			pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 			conn->add_type = gf_strdup(comp);
 
@@ -568,9 +571,9 @@
 					conn->add_count = atoi(comp);
 				}
 			}
-			if (!media) 
+			if (!media)
 				sdp->c_connection = conn;
-			else 
+			else
 				gf_list_add(media->Connections, conn);
 
 			break;
@@ -645,12 +648,12 @@
 			break;
 		case 'm':
 			pos = gf_token_get(LineBuf, 2, " \t\r\n", comp, 3000);
-			if (strcmp(comp, "audio") 
-				&& strcmp(comp, "data") 
-				&& strcmp(comp, "control") 
-				&& strcmp(comp, "video") 
-				&& strcmp(comp, "text") 
-				&& strcmp(comp, "application")) {
+			if (strcmp(comp, "audio")
+			        && strcmp(comp, "data")
+			        && strcmp(comp, "control")
+			        && strcmp(comp, "video")
+			        && strcmp(comp, "text")
+			        && strcmp(comp, "application")) {
 				return GF_SERVICE_ERROR;
 			}
 			media = gf_sdp_media_new();
@@ -661,7 +664,7 @@
 			else if (!strcmp(comp, "data")) media->Type = 4;
 			else if (!strcmp(comp, "control")) media->Type = 5;
 			else media->Type = 0;
-			//port numbers			
+			//port numbers
 			gf_token_get(LineBuf, pos, " ", comp, 3000);
 			if (!strstr(comp, "/")) {
 				pos = gf_token_get(LineBuf, pos, " \r\n", comp, 3000);
@@ -683,7 +686,7 @@
 			break;
 		}
 	}
-	//finally rewrite the fmt_list for all media, and remove dynamic payloads 
+	//finally rewrite the fmt_list for all media, and remove dynamic payloads
 	//from the list
 	i=0;
 	while ((media = (GF_SDPMedia*)gf_list_enum(sdp->media_desc, &i))) {
@@ -745,7 +748,7 @@
 
 	//normative fields
 	//o=
-	if (!sdp->o_add_type || !sdp->o_address || !sdp->o_username || !sdp->o_session_id || !sdp->o_version) 
+	if (!sdp->o_add_type || !sdp->o_address || !sdp->o_username || !sdp->o_session_id || !sdp->o_version)
 		return GF_REMOTE_SERVICE_ERROR;
 	//s=
 	//commented for intermedia demos
@@ -753,7 +756,7 @@
 	//t=
 //	if () return GF_REMOTE_SERVICE_ERROR;
 	//c=
-	if (sdp->c_connection) { 
+	if (sdp->c_connection) {
 		e = SDP_CheckConnection(sdp->c_connection);
 		if (e) return e;
 		//multiple addresses are only for media desc
@@ -777,7 +780,7 @@
 		//too many connections specified
 		if (HasGlobalConnection && gf_list_count(media->Connections)) return GF_REMOTE_SERVICE_ERROR;
 
-		//check all connections, and make sure we don't have multiple addresses 
+		//check all connections, and make sure we don't have multiple addresses
 		//and multiple ports at the same time
 		count = gf_list_count(media->Connections);
 		if (count>1 && HasSeveralPorts) return GF_REMOTE_SERVICE_ERROR;
@@ -786,7 +789,7 @@
 			conn = (GF_SDPConnection*)gf_list_get(media->Connections, j);
 			e = SDP_CheckConnection(conn);
 			if (e) return e;
-			if ((conn->add_count >= 2) && HasSeveralPorts) return GF_REMOTE_SERVICE_ERROR; 
+			if ((conn->add_count >= 2) && HasSeveralPorts) return GF_REMOTE_SERVICE_ERROR;
 		}
 		//RTPMaps. 0 is tolerated, but if some are specified check them
 		j=0;
@@ -821,7 +824,7 @@
 	if (str) { \
 		SDP_WRITE_ALLOC_STR_WITHOUT_CHECK(str, space); \
 	}		\
-
+ 
 #define SDP_WRITE_ALLOC_INT(d, spa, sig)		\
 	if (sig < 0) { \
 		sprintf(temp, "%d", d);		\
@@ -1134,7 +1137,7 @@
 			SDP_WRITE_ALLOC_STR("a=quality:", 0);
 			SDP_WRITE_ALLOC_INT(media->Quality, 0, 0);
 			SDP_WRITE_ALLOC_STR("\r\n", 0);
-		}		
+		}
 		//the rest
 		j=0;
 		while ((att = (GF_X_Attribute*)gf_list_enum(media->Attributes, &j))) {
@@ -1154,6 +1157,6 @@
 	buf = (char *)gf_realloc(buf, pos);
 	*out_str_buf = buf;
 	return GF_OK;
-}	
+}
 
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/avc_ext.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/avc_ext.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -73,37 +73,15 @@
 		if (rewrite_start_codes) gf_bs_write_u32(bs, 1);
 		else gf_bs_write_int(bs, sl->size, 8*nal_unit_size_field);
 		gf_bs_write_data(bs, sl->data, sl->size);
-	}				
-}
-
-/* FIXME : unused function
-static void merge_nalus_list(GF_List  *src, GF_List *dst)
-{
-	u32 i, count = gf_list_count(src);
-	for (i=0; i<count; i++) {
-		void *p = gf_list_get(src, i);
-		if (p) gf_list_add(dst, p);
 	}
 }
 
 
-static void merge_nalus(GF_MPEGVisualSampleEntryBox *entry, GF_List *sps, GF_List *pps)
-{
-	if (entry->avc_config) {
-		merge_nalus_list(entry->avc_config->config->sequenceParameterSets, sps);
-		merge_nalus_list(entry->avc_config->config->sequenceParameterSetExtensions, sps);
-		merge_nalus_list(entry->avc_config->config->pictureParameterSets, pps);
-	}
-	if (entry->svc_config) {
-		merge_nalus_list(entry->svc_config->config->sequenceParameterSets, sps);
-		merge_nalus_list(entry->svc_config->config->pictureParameterSets, pps);
-	}
-}*/
-
-static GF_Err process_extractor(GF_ISOFile *file, u32 sampleNumber, u32 nal_size, u16 nal_hdr, u32 nal_unit_size_field, Bool is_hevc, Bool rewrite_ps, Bool rewrite_start_codes, GF_BitStream *src_bs, GF_BitStream *dst_bs, u32 extractor_mode)
+static GF_Err process_extractor(GF_ISOFile *file, GF_MediaBox *mdia, u32 sampleNumber, u32 nal_size, u16 nal_hdr, u32 nal_unit_size_field, Bool is_hevc, Bool rewrite_ps, Bool rewrite_start_codes, GF_BitStream *src_bs, GF_BitStream *dst_bs, u32 extractor_mode)
 {
 	GF_Err e;
-	u32 di, ref_track_ID, ref_track_num, data_offset, data_length, cur_extract_mode, ref_extract_mode, ref_nalu_size, nb_bytes_nalh;
+	u32 di, ref_track_index, ref_track_num, data_offset, data_length, cur_extract_mode, ref_extract_mode, ref_nalu_size, nb_bytes_nalh;
+	GF_TrackReferenceTypeBox *dpnd;
 	GF_ISOSample *ref_samp;
 	GF_BitStream *ref_bs;
 	GF_TrackBox *ref_trak;
@@ -116,13 +94,20 @@
 	switch (extractor_mode) {
 	case 0:
 		if (!is_hevc) gf_bs_read_int(src_bs, 24); //1 byte for HEVC , 3 bytes for AVC of NALUHeader in extractor
-		ref_track_ID = gf_bs_read_u8(src_bs);
+		ref_track_index = gf_bs_read_u8(src_bs);
 		sample_offset = (s8) gf_bs_read_int(src_bs, 8);
 		data_offset = gf_bs_read_int(src_bs, nal_unit_size_field*8);
 		data_length = gf_bs_read_int(src_bs, nal_unit_size_field*8);
 
-		ref_track_num = gf_isom_get_track_by_id(file, ref_track_ID);
-		if (!ref_track_num) return GF_ISOM_INVALID_FILE;
+		Track_FindRef(mdia->mediaTrack, GF_4CC('s','c','a','l'), &dpnd);
+		ref_track_num = 0;
+		if (dpnd && (ref_track_index<=dpnd->trackIDCount))
+			ref_track_num = gf_isom_get_track_by_id(file, dpnd->trackIDs[ref_track_index-1]);
+
+		if (!ref_track_num) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("ISOBMF: Extractor target track is not present in file - skipping.\n"));
+			return GF_OK;
+		}
 
 		cur_extract_mode = gf_isom_get_nalu_extract_mode(file, ref_track_num);
 
@@ -139,7 +124,7 @@
 
 		//fixeme - we assume that the sampleNumber in the refered track is the same as this sample number
 		//are there cases were this wouldn't be the case ?
-		if (sample_offset < -sample_offset) 
+		if (sample_offset < -sample_offset)
 			sample_offset = 0;
 
 		e = Media_GetSample(ref_trak->Media, sampleNumber + sample_offset, &ref_samp, &di, 0, NULL);
@@ -163,27 +148,29 @@
 		if (!data_length)
 			data_length = ref_samp->dataLength - data_offset;
 
-		assert(ref_samp->dataLength - data_offset >= data_length);
+		if (ref_samp->dataLength - data_offset >= data_length) {
 
-		while (data_length && gf_bs_available(ref_bs)) {
-			ref_nalu_size = gf_bs_read_int(ref_bs, 8*nal_unit_size_field);
-			assert(ref_nalu_size <= data_length);
-			
-			if (ref_nalu_size > max_size) {
-				buffer = (char*) gf_realloc(buffer, sizeof(char) * ref_nalu_size );
-				max_size = ref_nalu_size;
-			}			
-			gf_bs_read_data(ref_bs, buffer, ref_nalu_size);
+			while (data_length && gf_bs_available(ref_bs)) {
+				ref_nalu_size = gf_bs_read_int(ref_bs, 8*nal_unit_size_field);
+				assert(ref_nalu_size <= data_length);
 
-			if (rewrite_start_codes) 
-				gf_bs_write_u32(dst_bs, 1);
-			else
-				gf_bs_write_int(dst_bs, ref_nalu_size, 8*nal_unit_size_field);
+				if (ref_nalu_size > max_size) {
+					buffer = (char*) gf_realloc(buffer, sizeof(char) * ref_nalu_size );
+					max_size = ref_nalu_size;
+				}
+				gf_bs_read_data(ref_bs, buffer, ref_nalu_size);
 
-			gf_bs_write_data(dst_bs, buffer, ref_nalu_size);
-			data_length -= ref_nalu_size + nal_unit_size_field;
-		}
+				if (rewrite_start_codes)
+					gf_bs_write_u32(dst_bs, 1);
+				else
+					gf_bs_write_int(dst_bs, ref_nalu_size, 8*nal_unit_size_field);
 
+				gf_bs_write_data(dst_bs, buffer, ref_nalu_size);
+				data_length -= ref_nalu_size + nal_unit_size_field;
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF: Extractor size is larger than refered sample size - skipping.\n"));
+		}
 		gf_isom_sample_del(&ref_samp);
 		ref_samp = NULL;
 		gf_bs_del(ref_bs);
@@ -198,7 +185,7 @@
 	case 2:
 		buffer = (char*) gf_malloc( sizeof(char) * (nal_size - nb_bytes_nalh));
 		gf_bs_read_data(src_bs, buffer, nal_size - nb_bytes_nalh);
-		if (rewrite_start_codes) 
+		if (rewrite_start_codes)
 			gf_bs_write_u32(dst_bs, 1);
 		else
 			gf_bs_write_int(dst_bs, nal_size, 8*nal_unit_size_field);
@@ -211,22 +198,39 @@
 	return GF_OK;
 }
 
-static Bool is_sample_idr(GF_ISOSample *sample, GF_MPEGVisualSampleEntryBox *entry)
+/* returns the SAP type as defined in the 14496-12 specification */
+static SAPType sap_type_from_nal_type(u8 nal_type) {
+	switch (nal_type) {
+	case GF_HEVC_NALU_SLICE_CRA:
+		return SAP_TYPE_3;
+	case GF_HEVC_NALU_SLICE_IDR_N_LP:
+	case GF_HEVC_NALU_SLICE_BLA_N_LP:
+		return SAP_TYPE_1;
+	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+	case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+	case GF_HEVC_NALU_SLICE_BLA_W_LP:
+		return SAP_TYPE_2;
+	default:
+		return RAP_NO;
+	}
+}
+
+static SAPType is_sample_idr(GF_ISOSample *sample, GF_MPEGVisualSampleEntryBox *entry)
 {
-	Bool is_hevc = 0;
+	Bool is_hevc = GF_FALSE;
 	u32 nalu_size_field = 0;
 	GF_BitStream *bs;
-	if (entry->avc_config) nalu_size_field = entry->avc_config->config->nal_unit_size;
-	else if (entry->svc_config) nalu_size_field = entry->svc_config->config->nal_unit_size;
-	else if (entry->hevc_config) {
+	if (entry->avc_config && entry->avc_config->config) nalu_size_field = entry->avc_config->config->nal_unit_size;
+	else if (entry->svc_config && entry->svc_config->config) nalu_size_field = entry->svc_config->config->nal_unit_size;
+	else if (entry->hevc_config && entry->hevc_config->config) {
 		nalu_size_field = entry->hevc_config->config->nal_unit_size;
-		is_hevc = 1;
+		is_hevc = GF_TRUE;
 	}
-	else if (entry->shvc_config) {
+	else if (entry->shvc_config && entry->shvc_config->config) {
 		nalu_size_field = entry->shvc_config->config->nal_unit_size;
-		is_hevc = 1;
+		is_hevc = GF_TRUE;
 	}
-	if (!nalu_size_field) return 0;
+	if (!nalu_size_field) return RAP_NO;
 
 	bs = gf_bs_new(sample->data, sample->dataLength, GF_BITSTREAM_READ);
 	while (gf_bs_available(bs)) {
@@ -239,24 +243,28 @@
 			nal_type = (nal_hdr&0x7E00) >> 9;
 
 			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_SLICE_BLA_W_LP:
-			case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+			case GF_HEVC_NALU_SLICE_CRA:
+				gf_bs_del(bs);
+				return SAP_TYPE_3;
+			case GF_HEVC_NALU_SLICE_IDR_N_LP:
 			case GF_HEVC_NALU_SLICE_BLA_N_LP:
+				gf_bs_del(bs);
+				return SAP_TYPE_1;
 			case GF_HEVC_NALU_SLICE_IDR_W_DLP:
-			case GF_HEVC_NALU_SLICE_IDR_N_LP:
-			case GF_HEVC_NALU_SLICE_CRA:
+			case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+			case GF_HEVC_NALU_SLICE_BLA_W_LP:
 				gf_bs_del(bs);
-				return 1;
+				return SAP_TYPE_2;
 			case GF_HEVC_NALU_ACCESS_UNIT:
 			case GF_HEVC_NALU_FILLER_DATA:
 			case GF_HEVC_NALU_SEI_PREFIX:
+			case GF_HEVC_NALU_VID_PARAM:
+			case GF_HEVC_NALU_SEQ_PARAM:
+			case GF_HEVC_NALU_PIC_PARAM:
 				break;
 			default:
 				gf_bs_del(bs);
-				return 0;
+				return RAP_NO;
 			}
 			gf_bs_skip_bytes(bs, size - 2);
 #endif
@@ -265,26 +273,26 @@
 			nal_type = nal_hdr & 0x1F;
 
 			switch (nal_type) {
-			case GF_AVC_NALU_SEQ_PARAM:
-			case GF_AVC_NALU_PIC_PARAM:
-			case GF_AVC_NALU_SEQ_PARAM_EXT:
-			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-			case GF_AVC_NALU_IDR_SLICE:
+			/*			case GF_AVC_NALU_SEQ_PARAM:
+						case GF_AVC_NALU_PIC_PARAM:
+						case GF_AVC_NALU_SEQ_PARAM_EXT:
+						case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+		*/			case GF_AVC_NALU_IDR_SLICE:
 				gf_bs_del(bs);
-				return 1;
+				return SAP_TYPE_1;
 			case GF_AVC_NALU_ACCESS_UNIT:
 			case GF_AVC_NALU_FILLER_DATA:
 			case GF_AVC_NALU_SEI:
 				break;
 			default:
 				gf_bs_del(bs);
-				return 0;
+				return RAP_NO;
 			}
 			gf_bs_skip_bytes(bs, size - 2);
-		} 
+		}
 	}
 	gf_bs_del(bs);
-	return 0;
+	return RAP_NO;
 }
 
 static void nalu_merge_ps(GF_BitStream *ps_bs, Bool rewrite_start_codes, u32 nal_unit_size_field, GF_MPEGVisualSampleEntryBox *entry, Bool is_hevc)
@@ -323,7 +331,11 @@
 
 GF_Err gf_isom_nalu_sample_rewrite(GF_MediaBox *mdia, GF_ISOSample *sample, u32 sampleNumber, GF_MPEGVisualSampleEntryBox *entry)
 {
-	Bool is_hevc = 0;
+	Bool is_hevc = GF_FALSE;
+	//if only one sync given in the sample sync table, insert sps/pps/vps before cra/bla in hevc
+//	Bool check_cra_bla = (mdia->information->sampleTable->SyncSample && mdia->information->sampleTable->SyncSample->nb_entries>1) ? 0 : 1;
+	Bool check_cra_bla = 1;
+	Bool insert_nalu_delim = 1;
 	GF_Err e = GF_OK;
 	GF_ISOSample *ref_samp;
 	GF_BitStream *src_bs, *ref_bs, *dst_bs, *ps_bs;
@@ -334,25 +346,34 @@
 	u32 temporal_id = 0;
 	char *buffer;
 	GF_ISOFile *file = mdia->mediaTrack->moov->mov;
+	GF_TrackReferenceTypeBox *scal = NULL;
+	Track_FindRef(mdia->mediaTrack, GF_4CC('s','c','a','l'), &scal);
 
 	src_bs = ref_bs = dst_bs = ps_bs = NULL;
 	ref_samp = NULL;
 	buffer = NULL;
 	rewrite_ps = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ? 1 : 0;
-	if ( mdia->information->sampleTable->no_sync_found) {
-		sample->IsRAP = is_sample_idr(sample, entry);
+
+	if (sample->IsRAP < SAP_TYPE_2) {
+		if (mdia->information->sampleTable->no_sync_found || (!sample->IsRAP && check_cra_bla) ) {
+			sample->IsRAP = is_sample_idr(sample, entry);
+		}
 	}
 	if (!sample->IsRAP)
 		rewrite_ps = 0;
 
 	rewrite_start_codes = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG) ? 1 : 0;
 	insert_vdrd_code = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_VDRD_FLAG) ? 1 : 0;
-	if (!entry->svc_config) insert_vdrd_code = 0;
+	if (!entry->svc_config && !entry->shvc_config) insert_vdrd_code = 0;
 	extractor_mode = mdia->mediaTrack->extractor_mode&0x0000FFFF;
 
 	if (extractor_mode != GF_ISOM_NALU_EXTRACT_LAYER_ONLY)
 		insert_vdrd_code = 0;
 
+	//this is a compatible HEVC, don't insert VDRD, insert NALU delim
+	if (entry->shvc_config && entry->hevc_config)
+		insert_vdrd_code = 0;
+
 	if (extractor_mode == GF_ISOM_NALU_EXTRACT_INSPECT) {
 		if (!rewrite_ps && !rewrite_start_codes)
 			return GF_OK;
@@ -366,12 +387,12 @@
 
 	/*if shvc rewrite*/
 	else if (entry->shvc_config && entry->shvc_config->config)  {
-		is_hevc = 1;
+		is_hevc = GF_TRUE;
 		nal_unit_size_field = entry->shvc_config->config->nal_unit_size;
 	}
 
 	/*otherwise do nothing*/
-	else if (!rewrite_ps && !rewrite_start_codes) {
+	else if (!rewrite_ps && !rewrite_start_codes && !scal) {
 		return GF_OK;
 	}
 
@@ -379,7 +400,7 @@
 		if (entry->avc_config) nal_unit_size_field = entry->avc_config->config->nal_unit_size;
 		else if (entry->hevc_config || entry->shvc_config ) {
 			nal_unit_size_field = entry->shvc_config ? entry->shvc_config->config->nal_unit_size : entry->hevc_config->config->nal_unit_size;
-			is_hevc = 1;
+			is_hevc = GF_TRUE;
 		}
 	}
 
@@ -403,7 +424,7 @@
 			}
 		}
 		//AVC/HEVC base, insert NALU delim
-		else {
+		else if (insert_nalu_delim) {
 			gf_bs_write_int(dst_bs, 1, 32);
 			if (is_hevc) {
 #ifndef GPAC_DISABLE_HEVC
@@ -424,11 +445,9 @@
 	}
 
 	if (rewrite_ps) {
-		//in insepct mode or single-layer mode just use the xPS from this layer
+		//in inspect mode or single-layer mode just use the xPS from this layer
 		if (extractor_mode == GF_ISOM_NALU_EXTRACT_DEFAULT) {
 			u32 i;
-			GF_TrackReferenceTypeBox *scal = NULL;
-			Track_FindRef(mdia->mediaTrack, GF_4CC('s','c','a','l'), &scal);
 
 			if (scal) {
 				for (i=0; i<scal->trackIDCount; i++) {
@@ -447,7 +466,7 @@
 
 		if (is_hevc) {
 			/*little optimization if we are not asked to start codes: copy over the sample*/
-			if (!rewrite_start_codes && !entry->shvc_config) {
+			if (!rewrite_start_codes && !entry->shvc_config && !scal) {
 				if (ps_bs) {
 					u8 nal_type = (sample->data[nal_unit_size_field] & 0x7E) >> 1;
 					//temp fix - if we detect xPS in the begining of the sample do NOT copy the ps bitstream
@@ -478,7 +497,7 @@
 	}
 
 	/*little optimization if we are not asked to rewrite extractors or start codes: copy over the sample*/
-	if (!entry->svc_config && !entry->shvc_config && !rewrite_start_codes && !rewrite_ps) {
+	if (!scal && !rewrite_start_codes && !rewrite_ps) {
 		if (ps_bs)
 		{
 			gf_bs_transfer(dst_bs, ps_bs);
@@ -508,7 +527,7 @@
 		} else {
 			nal_hdr = gf_bs_read_u8(src_bs);
 			nal_type = nal_hdr & 0x1F;
-		} 
+		}
 
 		if (is_hevc) {
 			if (ps_bs) {
@@ -526,7 +545,7 @@
 			switch (nal_type) {
 			//extractor
 			case 49:
-				e = process_extractor(file, sampleNumber, nal_size, nal_hdr, nal_unit_size_field, GF_TRUE, rewrite_ps, rewrite_start_codes, src_bs, dst_bs, extractor_mode);
+				e = process_extractor(file, mdia, sampleNumber, nal_size, nal_hdr, nal_unit_size_field, GF_TRUE, rewrite_ps, rewrite_start_codes, src_bs, dst_bs, extractor_mode);
 				if (e) goto exit;
 				break;
 
@@ -536,10 +555,28 @@
 			case GF_HEVC_NALU_SLICE_STSA_R:
 				if (temporal_id < (nal_hdr & 0x7))
 					temporal_id = (nal_hdr & 0x7);
+
+			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:
+				//insert xPS before CRA/BLA
+				if (check_cra_bla && !sample->IsRAP) {
+					if (ref_samp) gf_isom_sample_del(&ref_samp);
+					if (src_bs) gf_bs_del(src_bs);
+					if (ref_bs) gf_bs_del(ref_bs);
+					if (dst_bs) gf_bs_del(dst_bs);
+					if (buffer) gf_free(buffer);
+
+					sample->IsRAP = sap_type_from_nal_type(nal_type);
+					return gf_isom_nalu_sample_rewrite(mdia, sample, sampleNumber, entry);
+				}
 			default:
 				/*rewrite nal*/
 				gf_bs_read_data(src_bs, buffer, nal_size-2);
-				if (rewrite_start_codes) 
+				if (rewrite_start_codes)
 					gf_bs_write_u32(dst_bs, 1);
 				else
 					gf_bs_write_int(dst_bs, nal_size, 8*nal_unit_size_field);
@@ -548,45 +585,45 @@
 				gf_bs_write_data(dst_bs, buffer, nal_size-2);
 			}
 #endif
-			
+
 			//done with HEVC
 			continue;
-		} 
-		
+		}
+
 		switch(nal_type) {
-			case GF_AVC_NALU_ACCESS_UNIT:
-				/*we already wrote this stuff*/
-				gf_bs_skip_bytes(src_bs, nal_size-1);
-				continue;		
-			//extractor
-			case 31:
-				e = process_extractor(file, sampleNumber, nal_size, nal_hdr, nal_unit_size_field, GF_FALSE, rewrite_ps, rewrite_start_codes, src_bs, dst_bs, extractor_mode);
-				if (e) goto exit;
-				break;
+		case GF_AVC_NALU_ACCESS_UNIT:
+			/*we already wrote this stuff*/
+			gf_bs_skip_bytes(src_bs, nal_size-1);
+			continue;
+		//extractor
+		case 31:
+			e = process_extractor(file, mdia, sampleNumber, nal_size, nal_hdr, nal_unit_size_field, GF_FALSE, rewrite_ps, rewrite_start_codes, src_bs, dst_bs, extractor_mode);
+			if (e) goto exit;
+			break;
 //			case GF_AVC_NALU_SEI:
-			case GF_AVC_NALU_SEQ_PARAM:
-			case GF_AVC_NALU_PIC_PARAM:
-			case GF_AVC_NALU_SEQ_PARAM_EXT:
-			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-				// we will rewrite the sps/pps if and only if there is no sps/pps in bistream
-				if (ps_bs) {
-					gf_bs_del(ps_bs);
-					ps_bs = NULL;
-				}
-			default:
-				if (ps_bs) {
-					gf_bs_transfer(dst_bs, ps_bs);
-					gf_bs_del(ps_bs);
-					ps_bs = NULL;
-				}
-				gf_bs_read_data(src_bs, buffer, nal_size-1);
-				if (rewrite_start_codes) 
-					gf_bs_write_u32(dst_bs, 1);
-				else
-					gf_bs_write_int(dst_bs, nal_size, 8*nal_unit_size_field);
+		case GF_AVC_NALU_SEQ_PARAM:
+		case GF_AVC_NALU_PIC_PARAM:
+		case GF_AVC_NALU_SEQ_PARAM_EXT:
+		case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+			// we will rewrite the sps/pps if and only if there is no sps/pps in bistream
+			if (ps_bs) {
+				gf_bs_del(ps_bs);
+				ps_bs = NULL;
+			}
+		default:
+			if (ps_bs) {
+				gf_bs_transfer(dst_bs, ps_bs);
+				gf_bs_del(ps_bs);
+				ps_bs = NULL;
+			}
+			gf_bs_read_data(src_bs, buffer, nal_size-1);
+			if (rewrite_start_codes)
+				gf_bs_write_u32(dst_bs, 1);
+			else
+				gf_bs_write_int(dst_bs, nal_size, 8*nal_unit_size_field);
 
-				gf_bs_write_u8(dst_bs, nal_hdr);
-				gf_bs_write_data(dst_bs, buffer, nal_size-1);
+			gf_bs_write_u8(dst_bs, nal_hdr);
+			gf_bs_write_data(dst_bs, buffer, nal_size-1);
 		}
 	}
 
@@ -616,7 +653,7 @@
 	u32 data_size;
 	GF_HEVCConfig *new_cfg;
 	GF_BitStream *bs;
-	
+
 	if (!cfg) return NULL;
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_odf_hevc_cfg_write_bs(cfg, bs);
@@ -678,7 +715,7 @@
 			gf_list_add(cfg_new->sequenceParameterSetExtensions, p2);
 		}
 	}
-	return cfg_new;	
+	return cfg_new;
 }
 
 static void merge_avc_config(GF_AVCConfig *dst_cfg, GF_AVCConfig *src_cfg)
@@ -697,7 +734,7 @@
 	gf_odf_avc_cfg_del(cfg);
 }
 
-void merge_hevc_config(GF_HEVCConfig *dst_cfg, GF_HEVCConfig *src_cfg)
+void merge_hevc_config(GF_HEVCConfig *dst_cfg, GF_HEVCConfig *src_cfg, Bool force_insert)
 {
 	GF_HEVCConfig *cfg = HEVC_DuplicateConfig(src_cfg);
 	//merge all xPS
@@ -722,7 +759,10 @@
 			while (gf_list_count(ar->nalus)) {
 				GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(ar->nalus, 0);
 				gf_list_rem(ar->nalus, 0);
-				gf_list_insert(ar_h->nalus, p, 0);
+				if (force_insert)
+					gf_list_insert(ar_h->nalus, p, 0);
+				else
+					gf_list_add(ar_h->nalus, p);
 			}
 
 		}
@@ -760,17 +800,17 @@
 
 		if (!an_entry) continue;
 
-		if (avc_cfg && an_entry->svc_config && an_entry->svc_config->config) 
+		if (avc_cfg && an_entry->svc_config && an_entry->svc_config->config)
 			merge_avc_config(avc_cfg, an_entry->svc_config->config);
-		
-		if (avc_cfg && an_entry->avc_config && an_entry->avc_config->config) 
+
+		if (avc_cfg && an_entry->avc_config && an_entry->avc_config->config)
 			merge_avc_config(avc_cfg, an_entry->avc_config->config);
 
-		if (hevc_cfg && an_entry->shvc_config && an_entry->shvc_config->config) 
-			merge_hevc_config(hevc_cfg, an_entry->shvc_config->config);
+		if (hevc_cfg && an_entry->shvc_config && an_entry->shvc_config->config)
+			merge_hevc_config(hevc_cfg, an_entry->shvc_config->config, GF_TRUE);
 
-		if (hevc_cfg && an_entry->hevc_config && an_entry->hevc_config->config) 
-			merge_hevc_config(hevc_cfg, an_entry->hevc_config->config);
+		if (hevc_cfg && an_entry->hevc_config && an_entry->hevc_config->config)
+			merge_hevc_config(hevc_cfg, an_entry->hevc_config->config, GF_TRUE);
 	}
 
 	if (hevc_cfg) hevc_cfg->is_shvc = 0;
@@ -794,13 +834,13 @@
 		avc->emul_esd->decoderConfig->maxBitrate = avc->bitrate->maxBitrate;
 	}
 	if (avc->descr) {
-		u32 i=0; 
+		u32 i=0;
 		GF_Descriptor *desc,*clone;
 		i=0;
 		while ((desc = (GF_Descriptor *)gf_list_enum(avc->descr->descriptors, &i))) {
 			clone = NULL;
 			gf_odf_desc_copy(desc, &clone);
-			if (gf_odf_desc_add_desc((GF_Descriptor *)avc->emul_esd, clone) != GF_OK) 
+			if (gf_odf_desc_add_desc((GF_Descriptor *)avc->emul_esd, clone) != GF_OK)
 				gf_odf_desc_del(clone);
 		}
 	}
@@ -837,7 +877,7 @@
 	hevc->emul_esd = gf_odf_desc_esd_new(2);
 	hevc->emul_esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 	hevc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
-	if (hevc->shvc_config && !hevc->hevc_config) 
+	if (hevc->shvc_config && !hevc->hevc_config)
 		hevc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SHVC;
 
 	if (hevc->bitrate) {
@@ -846,13 +886,13 @@
 		hevc->emul_esd->decoderConfig->maxBitrate = hevc->bitrate->maxBitrate;
 	}
 	if (hevc->descr) {
-		u32 i=0; 
+		u32 i=0;
 		GF_Descriptor *desc,*clone;
 		i=0;
 		while ((desc = (GF_Descriptor *)gf_list_enum(hevc->descr->descriptors, &i))) {
 			clone = NULL;
 			gf_odf_desc_copy(desc, &clone);
-			if (gf_odf_desc_add_desc((GF_Descriptor *)hevc->emul_esd, clone) != GF_OK) 
+			if (gf_odf_desc_add_desc((GF_Descriptor *)hevc->emul_esd, clone) != GF_OK)
 				gf_odf_desc_del(clone);
 		}
 	}
@@ -861,12 +901,14 @@
 		GF_HEVCConfig *hcfg = HEVC_DuplicateConfig(hevc->hevc_config ? hevc->hevc_config->config : hevc->shvc_config->config);
 
 		if (hevc->hevc_config && hevc->shvc_config) {
-			merge_hevc_config(hcfg, hevc->shvc_config->config);
+			//merge SHVC config to HEVC conf, so we add entry rather than insert
+			merge_hevc_config(hcfg, hevc->shvc_config->config, GF_FALSE);
 		}
 
 		if (mdia) merge_all_config(NULL, hcfg, mdia);
 
 		if (hcfg) {
+			hcfg->is_shvc = GF_FALSE;
 			gf_odf_hevc_cfg_write(hcfg, &hevc->emul_esd->decoderConfig->decoderSpecificInfo->data, &hevc->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
 			gf_odf_hevc_cfg_del(hcfg);
 		}
@@ -887,15 +929,24 @@
 	avc->bitrate->bufferSizeDB = esd->decoderConfig->bufferSizeDB;
 
 	if (gf_list_count(esd->IPIDataSet)
-		|| gf_list_count(esd->IPMPDescriptorPointers)
-		|| esd->langDesc
-		|| gf_list_count(esd->extensionDescriptors)
-		|| esd->ipiPtr || esd->qos || esd->RegDescriptor) {
+	        || gf_list_count(esd->IPMPDescriptorPointers)
+	        || esd->langDesc
+	        || gf_list_count(esd->extensionDescriptors)
+	        || esd->ipiPtr || esd->qos || esd->RegDescriptor) {
 
 		avc->descr = (GF_MPEG4ExtensionDescriptorsBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_M4DS);
-		if (esd->RegDescriptor) { gf_list_add(avc->descr->descriptors, esd->RegDescriptor); esd->RegDescriptor = NULL; }
-		if (esd->qos) { gf_list_add(avc->descr->descriptors, esd->qos); esd->qos = NULL; }
-		if (esd->ipiPtr) { gf_list_add(avc->descr->descriptors, esd->ipiPtr); esd->ipiPtr= NULL; }
+		if (esd->RegDescriptor) {
+			gf_list_add(avc->descr->descriptors, esd->RegDescriptor);
+			esd->RegDescriptor = NULL;
+		}
+		if (esd->qos) {
+			gf_list_add(avc->descr->descriptors, esd->qos);
+			esd->qos = NULL;
+		}
+		if (esd->ipiPtr) {
+			gf_list_add(avc->descr->descriptors, esd->ipiPtr);
+			esd->ipiPtr= NULL;
+		}
 
 		while (gf_list_count(esd->IPIDataSet)) {
 			GF_Descriptor *desc = (GF_Descriptor *)gf_list_get(esd->IPIDataSet, 0);
@@ -955,7 +1006,7 @@
 
 	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;
 
@@ -1035,7 +1086,7 @@
 		break;
 	/*AVCC removal and switch to avc3*/
 	case 3:
-		if (!entry->avc_config || !entry->avc_config->config) 
+		if (!entry->avc_config || !entry->avc_config->config)
 			return GF_BAD_PARAM;
 
 		if (entry->svc_config) {
@@ -1108,9 +1159,9 @@
 	}
 
 	if (entry->svc_config) {
-			gf_isom_box_del((GF_Box*)entry->svc_config);
-			entry->svc_config = NULL;
-		}
+		gf_isom_box_del((GF_Box*)entry->svc_config);
+		entry->svc_config = NULL;
+	}
 	AVC_RewriteESDescriptor(entry);
 	return GF_OK;
 }
@@ -1137,6 +1188,7 @@
 	case GF_ISOM_BOX_TYPE_SVC1:
 	case GF_ISOM_BOX_TYPE_HVC1:
 	case GF_ISOM_BOX_TYPE_HEV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		break;
 	default:
 		return GF_OK;
@@ -1157,7 +1209,7 @@
 
 	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;
 
@@ -1183,6 +1235,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_Err gf_isom_hevc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_HEVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -1192,7 +1245,7 @@
 
 	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;
 
@@ -1218,6 +1271,15 @@
 	return e;
 }
 
+enum
+{
+	GF_ISOM_HVCC_UPDATE = 0,
+	GF_ISOM_HVCC_SET_INBAND,
+	GF_ISOM_HVCC_SET_TILE,
+	GF_ISOM_HVCC_SET_SHVC,
+	GF_ISOM_HVCC_SET_SHVC_REM_HEVC,
+} HevcConfigUpdateType;
+
 static
 GF_Err gf_isom_hevc_config_update_ex(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, u32 operand_type)
 {
@@ -1239,26 +1301,34 @@
 	case GF_ISOM_BOX_TYPE_HEV2:
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		break;
 	default:
 		return GF_BAD_PARAM;
 	}
 
-	if (operand_type<=1) {
+
+	if (operand_type == GF_ISOM_HVCC_SET_TILE) {
+		if (!entry->hevc_config) entry->hevc_config = (GF_HEVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
+		if (entry->hevc_config->config) gf_odf_hevc_cfg_del(entry->hevc_config->config);
+		entry->hevc_config->config = NULL;
+		entry->type = GF_ISOM_BOX_TYPE_HVT1;
+	} else if (operand_type < GF_ISOM_HVCC_SET_SHVC) {
 		if (!entry->hevc_config) entry->hevc_config = (GF_HEVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
 
 		if (cfg) {
 			if (entry->hevc_config->config) gf_odf_hevc_cfg_del(entry->hevc_config->config);
 			entry->hevc_config->config = HEVC_DuplicateConfig(cfg);
-		} else {
-			operand_type=1;
+		} else if (operand_type != GF_ISOM_HVCC_SET_TILE) {
+			operand_type=GF_ISOM_HVCC_SET_INBAND;
 		}
 		array_incomplete = 0;
 		for (i=0; i<gf_list_count(entry->hevc_config->config->param_array); i++) {
 			GF_HEVCParamArray *ar = gf_list_get(entry->hevc_config->config->param_array, i);
-	
+
 			/*we want to force hev1*/
-			if (operand_type==1) ar->array_completeness = 0;
+			if (operand_type==GF_ISOM_HVCC_SET_INBAND)
+				ar->array_completeness = 0;
 
 			if (!ar->array_completeness) {
 				array_incomplete = 1;
@@ -1280,7 +1350,7 @@
 	} else {
 
 		/*SVCC replacement*/
-		if (operand_type==2) {
+		if (operand_type==GF_ISOM_HVCC_SET_SHVC) {
 			if (!cfg) return GF_BAD_PARAM;
 			if (!entry->shvc_config) entry->shvc_config = (GF_HEVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_SHCC);
 			if (entry->shvc_config->config) gf_odf_hevc_cfg_del(entry->shvc_config->config);
@@ -1288,7 +1358,7 @@
 			entry->type = GF_ISOM_BOX_TYPE_HVC1;
 		}
 		/*SVCC replacement and HEVC removal*/
-		else if (operand_type==3) {
+		else if (operand_type==GF_ISOM_HVCC_SET_SHVC_REM_HEVC) {
 			if (!cfg) {
 				if (entry->shvc_config) {
 					gf_isom_box_del((GF_Box*)entry->shvc_config);
@@ -1316,19 +1386,25 @@
 GF_EXPORT
 GF_Err gf_isom_hevc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg)
 {
-	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, 0);;
+	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, GF_ISOM_HVCC_UPDATE);
 }
 
 GF_EXPORT
 GF_Err gf_isom_hevc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
 {
-	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, NULL, 1);
+	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, NULL, GF_ISOM_HVCC_SET_INBAND);
 }
 
-GF_Err gf_isom_shvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, Bool is_add)
+GF_EXPORT
+GF_Err gf_isom_hevc_set_tile_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg)
+{
+	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, GF_ISOM_HVCC_SET_TILE);
+}
+
+GF_Err gf_isom_shvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, Bool is_additional)
 {
 	if (cfg) cfg->is_shvc = 1;
-	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, is_add ? 2 : 3);
+	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, is_additional ? GF_ISOM_HVCC_SET_SHVC : GF_ISOM_HVCC_SET_SHVC_REM_HEVC);
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -1392,7 +1468,7 @@
 	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_VISUAL) return GF_ISOM_AVCTYPE_NONE;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	type = entry->type;
-	
+
 	if (type == GF_ISOM_BOX_TYPE_ENCV) {
 		GF_ProtectionInfoBox *sinf = (GF_ProtectionInfoBox *) gf_list_get(entry->protections, 0);
 		if (sinf && sinf->original_format) type = sinf->original_format->data_format;
@@ -1425,7 +1501,7 @@
 	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_VISUAL) return GF_ISOM_HEVCTYPE_NONE;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	type = entry->type;
-	
+
 	if (type == GF_ISOM_BOX_TYPE_ENCV) {
 		GF_ProtectionInfoBox *sinf = (GF_ProtectionInfoBox *) gf_list_get(entry->protections, 0);
 		if (sinf && sinf->original_format) type = sinf->original_format->data_format;
@@ -1438,6 +1514,7 @@
 	case GF_ISOM_BOX_TYPE_HEV2:
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		break;
 	default:
 		return GF_ISOM_HEVCTYPE_NONE;
@@ -1769,11 +1846,11 @@
 	}
 	ptr->size += 7;
 	count = gf_list_count(ptr->config->sequenceParameterSets);
-	for (i=0; i<count; i++) 
+	for (i=0; i<count; i++)
 		ptr->size += 2 + ((GF_AVCConfigSlot *)gf_list_get(ptr->config->sequenceParameterSets, i))->size;
 
 	count = gf_list_count(ptr->config->pictureParameterSets);
-	for (i=0; i<count; i++) 
+	for (i=0; i<count; i++)
 		ptr->size += 2 + ((GF_AVCConfigSlot *)gf_list_get(ptr->config->pictureParameterSets, i))->size;
 
 	if (ptr->type==GF_ISOM_BOX_TYPE_AVCC) {
@@ -1784,7 +1861,7 @@
 		case 144:
 			ptr->size += 4;
 			count = ptr->config->sequenceParameterSetExtensions ?gf_list_count(ptr->config->sequenceParameterSetExtensions) : 0;
-			for (i=0; i<count; i++)	
+			for (i=0; i<count; i++)
 				ptr->size += 2 + ((GF_AVCConfigSlot *)gf_list_get(ptr->config->sequenceParameterSetExtensions, i))->size;
 			break;
 		}
@@ -1808,7 +1885,7 @@
 	GF_HEVCConfigurationBox *ptr = (GF_HEVCConfigurationBox *)s;
 
 	if (ptr->config) gf_odf_hevc_cfg_del(ptr->config);
-	
+
 	pos = gf_bs_get_position(bs);
 	ptr->config = gf_odf_hevc_cfg_read_bs(bs, (s->type == GF_ISOM_BOX_TYPE_HVCC) ? 0 : 1);
 	pos = gf_bs_get_position(bs) - pos ;

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_3gpp.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_code_3gpp.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -175,7 +175,7 @@
 		ptr->cfg.AMR_mode_change_period = gf_bs_read_u8(bs);
 		ptr->cfg.frames_per_sample = gf_bs_read_u8(bs);
 		break;
-	case GF_ISOM_BOX_TYPE_DEVC: 
+	case GF_ISOM_BOX_TYPE_DEVC:
 	case GF_ISOM_BOX_TYPE_DQCP:
 	case GF_ISOM_BOX_TYPE_DSMV:
 		ptr->cfg.frames_per_sample = gf_bs_read_u8(bs);
@@ -253,7 +253,7 @@
 	GF_FontTableBox *ptr = (GF_FontTableBox *)s;
 	if (ptr->fonts) {
 		u32 i;
-		for (i=0; i<ptr->entry_count; i++) 
+		for (i=0; i<ptr->entry_count; i++)
 			if (ptr->fonts[i].fontName) gf_free(ptr->fonts[i].fontName);
 		gf_free(ptr->fonts);
 	}
@@ -342,7 +342,7 @@
 void tx3g_del(GF_Box *s)
 {
 	GF_Tx3gSampleEntryBox *ptr = (GF_Tx3gSampleEntryBox*)s;
-	
+
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
 
 	if (ptr->font_table)
@@ -358,9 +358,12 @@
 	g = gf_bs_read_u8(bs);
 	b = gf_bs_read_u8(bs);
 	a = gf_bs_read_u8(bs);
-	col = a; col<<=8; 
-	col |= r; col<<=8; 
-	col |= g; col<<=8; 
+	col = a;
+	col<<=8;
+	col |= r;
+	col<<=8;
+	col |= g;
+	col<<=8;
 	col |= b;
 	return col;
 }
@@ -1015,7 +1018,7 @@
 	ptr->attributeListCount = (u32)ptr->size/4;
 	ptr->attributeList = gf_malloc(ptr->attributeListCount*sizeof(u32));
 	if (ptr->attributeList == NULL) return GF_OUT_OF_MEM;
-	
+
 	for (i=0; i< ptr->attributeListCount; i++) {
 		ptr->attributeList[i] = gf_bs_read_u32(bs);
 	}
@@ -1037,7 +1040,7 @@
 	GF_Err e;
 	u32 i;
 	GF_TrackSelectionBox *ptr = (GF_TrackSelectionBox *) s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs,ptr->switchGroup);
@@ -1045,7 +1048,7 @@
 	for (i = 0; i < ptr->attributeListCount; i++ ) {
 		gf_bs_write_u32(bs, ptr->attributeList[i]);
 	}
-	
+
 	return GF_OK;
 }
 
@@ -1091,7 +1094,7 @@
 	p->streamType = gf_bs_read_int(bs, 1);
 	p->containsRedundant = gf_bs_read_int(bs, 2);
 	s->size -= 3;
-	
+
 	i=0;
 	str[0]=0;
 	while (1) {
@@ -1220,15 +1223,15 @@
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_DIMC:
 		if (ptr->config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->config = (GF_DIMSSceneConfigBox*)a;
+			ptr->config = (GF_DIMSSceneConfigBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_DIST:
 		if (ptr->scripts) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->scripts = (GF_DIMSScriptTypesBox*)a;
+			ptr->scripts = (GF_DIMSScriptTypesBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
 		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->bitrate = (GF_MPEG4BitRateBox*)a;
+			ptr->bitrate = (GF_MPEG4BitRateBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
@@ -1276,19 +1279,19 @@
 	GF_DIMSSampleEntryBox *p = (GF_DIMSSampleEntryBox *)s;
 	if (e) return e;
 	s->size += 8;
-	
+
 	if (p->config) {
-		e = gf_isom_box_size((GF_Box *) p->config); 
+		e = gf_isom_box_size((GF_Box *) p->config);
 		if (e) return e;
 		p->size += p->config->size;
 	}
 	if (p->bitrate) {
-		e = gf_isom_box_size((GF_Box *) p->bitrate); 
+		e = gf_isom_box_size((GF_Box *) p->bitrate);
 		if (e) return e;
 		p->size += p->bitrate->size;
 	}
 	if (p->scripts) {
-		e = gf_isom_box_size((GF_Box *) p->scripts); 
+		e = gf_isom_box_size((GF_Box *) p->scripts);
 		if (e) return e;
 		p->size += p->scripts->size;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_adobe.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_code_adobe.c Changed

@@ -13,15 +13,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -101,7 +101,7 @@
 	}
 	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++) {
 		int j=0;
@@ -115,7 +115,7 @@
 		}
 		gf_list_insert(ptr->server_entry_table, gf_strdup(tmp_str), i);
 	}
-	
+
 	ptr->quality_entry_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->quality_entry_count; i++) {
 		int j=0;
@@ -153,7 +153,7 @@
 	}
 	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;
@@ -161,10 +161,10 @@
 		if (e) return e;
 		gf_list_insert(ptr->segment_run_table_entries, asrt, i);
 	}
-	
+
 	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;
 		e = gf_isom_parse_box((GF_Box **)&afrt, bs);
 		if (e) return e;
 		gf_list_insert(ptr->fragment_run_table_entries, afrt, i);
@@ -175,6 +175,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Box *abst_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeBootstrapInfoBox, GF_ISOM_BOX_TYPE_ABST);
@@ -187,6 +188,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+GF_EXPORT
 GF_Err abst_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
@@ -246,31 +248,31 @@
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err abst_Size(GF_Box *s)
 {
 	GF_Err e;
 	int i;
 	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
-	
+
 	e = gf_isom_full_box_get_size(s);
 	if (e) return e;
 
 	s->size += 25
-			+ (ptr->movie_identifier ? (strlen(ptr->movie_identifier) + 1) : 1)
-			+ 1;
+	           + (ptr->movie_identifier ? (strlen(ptr->movie_identifier) + 1) : 1)
+	           + 1;
 
 	for (i=0; i<ptr->server_entry_count; i++)
-			s->size += strlen(gf_list_get(ptr->server_entry_table, i)) + 1;
+		s->size += strlen(gf_list_get(ptr->server_entry_table, i)) + 1;
 
 	s->size += 1;
 
 	for (i=0; i<ptr->quality_entry_count; i++)
-			s->size += strlen(gf_list_get(ptr->quality_entry_table, i)) + 1;
+		s->size += strlen(gf_list_get(ptr->quality_entry_table, i)) + 1;
 
 	s->size += (ptr->drm_data ? (strlen(ptr->drm_data) + 1) : 1)
-			+ (ptr->meta_data ? (strlen(ptr->meta_data) + 1) : 1)
-			+ 1;
+	           + (ptr->meta_data ? (strlen(ptr->meta_data) + 1) : 1)
+	           + 1;
 
 	for (i=0; i<ptr->segment_run_table_count; i++) {
 		GF_Box *box = (GF_Box *)gf_list_get(ptr->segment_run_table_entries, i);
@@ -278,7 +280,7 @@
 		if (e) return e;
 		s->size += box->size;
 	}
-		
+
 	s->size += 1;
 	for (i=0; i<ptr->fragment_run_table_count; i++) {
 		GF_Box *box = (GF_Box *)gf_list_get(ptr->fragment_run_table_entries, i);
@@ -355,7 +357,7 @@
 			if (ptr->long_offsets) {
 				ae->afra_offset = gf_bs_read_u64(bs);
 				ae->offset_from_afra = gf_bs_read_u64(bs);
-			}else {
+			} else {
 				ae->afra_offset = gf_bs_read_u32(bs);
 				ae->offset_from_afra = gf_bs_read_u32(bs);
 			}
@@ -367,6 +369,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Box *afra_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeFragRandomAccessBox, GF_ISOM_BOX_TYPE_AFRA);
@@ -437,8 +440,8 @@
 	if (e) return e;
 
 	s->size += 9
-			+ ptr->entry_count * (ptr->long_offsets ? 16 : 12)
-			+ (ptr->global_entries ? 4 + ptr->global_entry_count * (4 + (ptr->long_offsets ? 16 : 8) + (ptr->long_ids ? 8 : 4)) : 0);
+	           + ptr->entry_count * (ptr->long_offsets ? 16 : 12)
+	           + (ptr->global_entries ? 4 + ptr->global_entry_count * (4 + (ptr->long_offsets ? 16 : 8) + (ptr->long_ids ? 8 : 4)) : 0);
 
 	return GF_OK;
 }
@@ -499,6 +502,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Box *asrt_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeSegmentRunTableBox, GF_ISOM_BOX_TYPE_ASRT);
@@ -615,6 +619,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Box *afrt_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeFragmentRunTableBox, GF_ISOM_BOX_TYPE_AFRT);

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_apple.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_code_apple.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2006-2012
  *				All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -82,7 +82,7 @@
 {
 	GF_Err e;
 //	GF_ItemListBox *ptr = (GF_ItemListBox *)s;
-	
+
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
 
@@ -139,7 +139,7 @@
 
 	tmp->data = (GF_DataBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_DATA);
 
-	if (tmp->data == NULL){
+	if (tmp->data == NULL) {
 		gf_free(tmp);
 		return NULL;
 	}
@@ -215,7 +215,7 @@
 		ptr->data[ptr->dataSize] = 0;
 		gf_bs_read_data(bs, ptr->data, ptr->dataSize);
 	}
-	
+
 	return GF_OK;
 }
 
@@ -238,7 +238,7 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_int(bs, ptr->reserved, 32);
-	if(ptr->data != NULL && ptr->dataSize > 0){
+	if(ptr->data != NULL && ptr->dataSize > 0) {
 		gf_bs_write_data(bs, ptr->data, ptr->dataSize);
 	}
 	return GF_OK;
@@ -251,7 +251,7 @@
 	e = gf_isom_full_box_get_size(s);
 	if (e) return e;
 	ptr->size += 4;
-	if(ptr->data != NULL && ptr->dataSize > 0){
+	if(ptr->data != NULL && ptr->dataSize > 0) {
 		ptr->size += ptr->dataSize;
 	}
 	return GF_OK;
@@ -271,7 +271,7 @@
 	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++){
+	for(i = 0; i < gf_list_count(map->other_boxes); i++) {
 		meta = (GF_MetaBox*)gf_list_get(map->other_boxes, i);
 
 		if(meta != NULL && meta->handler != NULL && meta->handler->handlerType == GF_ISOM_HANDLER_TYPE_MDIR) return meta;
@@ -290,14 +290,14 @@
 
 	if (!mov || !mov->moov) return NULL;
 
-	if (!mov->moov->udta){
+	if (!mov->moov->udta) {
 		e = moov_AddBox((GF_Box*)mov->moov, gf_isom_box_new(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++){
+	if (map) {
+		for(i = 0; i < gf_list_count(map->other_boxes); i++) {
 			meta = (GF_MetaBox*)gf_list_get(map->other_boxes, i);
 
 			if(meta != NULL && meta->handler != NULL && meta->handler->handlerType == GF_ISOM_HANDLER_TYPE_MDIR) return meta;
@@ -306,9 +306,9 @@
 
 	meta = (GF_MetaBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_META);
 
-	if(meta != NULL){
+	if(meta != NULL) {
 		meta->handler = (GF_HandlerBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_HDLR);
-		if(meta->handler == NULL){
+		if(meta->handler == NULL) {
 			gf_isom_box_del((GF_Box *)meta);
 			return NULL;
 		}

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_base.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_code_base.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -57,7 +57,7 @@
 
 GF_Box *co64_New()
 {
-	ISOM_DECL_BOX_ALLOC(GF_ChunkLargeOffsetBox, GF_ISOM_BOX_TYPE_CO64);	
+	ISOM_DECL_BOX_ALLOC(GF_ChunkLargeOffsetBox, GF_ISOM_BOX_TYPE_CO64);
 	gf_isom_full_box_init((GF_Box *)tmp);
 	return (GF_Box *)tmp;
 }
@@ -70,7 +70,7 @@
 	GF_Err e;
 	u32 i;
 	GF_ChunkLargeOffsetBox *ptr = (GF_ChunkLargeOffsetBox *) s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs, ptr->nb_entries);
@@ -107,7 +107,7 @@
 	ISOM_DECL_BOX_ALLOC(GF_ChapterListBox, GF_ISOM_BOX_TYPE_CHPL);
 	tmp->list = gf_list_new();
 	gf_isom_full_box_init((GF_Box *)tmp);
-    tmp->version = 1;
+	tmp->version = 1;
 	return (GF_Box *)tmp;
 }
 
@@ -153,7 +153,7 @@
 			ce->name = gf_strdup("");
 		}
 
-		for (i=0;i<count; i++) {
+		for (i=0; i<count; i++) {
 			GF_ChapterEntry *ace = (GF_ChapterEntry *) gf_list_get(ptr->list, i);
 			if (ace->start_time >= ce->start_time) {
 				gf_list_insert(ptr->list, ce, i);
@@ -186,7 +186,8 @@
 		GF_ChapterEntry *ce = (GF_ChapterEntry *)gf_list_get(ptr->list, i);
 		gf_bs_write_u64(bs, ce->start_time);
 		if (ce->name) {
-			len = (u32) strlen(ce->name); if (len>255) len = 255;
+			len = (u32) strlen(ce->name);
+			if (len>255) len = 255;
 			gf_bs_write_u8(bs, len);
 			gf_bs_write_data(bs, ce->name, len);
 		} else {
@@ -298,6 +299,89 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+void kind_del(GF_Box *s)
+{
+	GF_KindBox *ptr = (GF_KindBox *) s;
+	if (ptr == NULL) return;
+	if (ptr->schemeURI) gf_free(ptr->schemeURI);
+	if (ptr->value) gf_free(ptr->value);
+	gf_free(ptr);
+}
+
+GF_Err kind_Read(GF_Box *s,GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_KindBox *ptr = (GF_KindBox *)s;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	if (ptr->size) {
+		u32 bytesToRead = (u32) ptr->size;
+		char *data;
+		u32 schemeURIlen;
+		data = (char*)gf_malloc(bytesToRead * sizeof(char));
+		if (data == NULL) 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;
+			bytesToRead++;
+		}
+		ptr->schemeURI = gf_strdup(data);
+		schemeURIlen = (u32) strlen(data);
+		if (bytesToRead > schemeURIlen+1) {
+			/* read the value */
+			char *data_value = data + schemeURIlen +1;
+			ptr->value = gf_strdup(data_value);
+		}
+		gf_free(data);
+	}
+	return GF_OK;
+}
+
+GF_Box *kind_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_KindBox, GF_ISOM_BOX_TYPE_KIND);
+	gf_isom_full_box_init((GF_Box *)tmp);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err kind_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, (unsigned long)strlen(ptr->schemeURI) + 1);
+	if (ptr->value) {
+		gf_bs_write_data(bs, ptr->value, (unsigned long)strlen(ptr->value) + 1);
+	}
+	return GF_OK;
+}
+
+GF_Err kind_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_KindBox *ptr = (GF_KindBox *)s;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	ptr->size += strlen(ptr->schemeURI) + 1;
+	if (ptr->value) {
+		ptr->size += strlen(ptr->value) + 1;
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 void ctts_del(GF_Box *s)
 {
 	GF_CompositionOffsetBox *ptr = (GF_CompositionOffsetBox *)s;
@@ -313,7 +397,7 @@
 	u32 i;
 	u32 sampleCount;
 	GF_CompositionOffsetBox *ptr = (GF_CompositionOffsetBox *)s;
-	
+
 	e = gf_isom_full_box_read(s, bs);
 	if (e) return e;
 	ptr->nb_entries = gf_bs_read_u32(bs);
@@ -352,7 +436,7 @@
 	GF_Err e;
 	u32 i;
 	GF_CompositionOffsetBox *ptr = (GF_CompositionOffsetBox *)s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs, ptr->nb_entries);
@@ -432,7 +516,7 @@
 {
 	GF_Err e;
 	GF_CompositionToDecodeBox *ptr = (GF_CompositionToDecodeBox *)s;
-	
+
 	e = gf_isom_full_box_get_size(s);
 	if (e) return e;
 	ptr->size += 20;
@@ -483,7 +567,7 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	//the flag set indicates we have a string (WE HAVE TO for URLs)
-    if ( !(ptr->flags & 1)) {
+	if ( !(ptr->flags & 1)) {
 		if (ptr->location) {
 			gf_bs_write_data(bs, ptr->location, (u32)strlen(ptr->location) + 1);
 		}
@@ -495,7 +579,7 @@
 {
 	GF_Err e;
 	GF_DataEntryURLBox *ptr = (GF_DataEntryURLBox *)s;
-	
+
 	e = gf_isom_full_box_get_size(s);
 	if (e) return e;
 	if ( !(ptr->flags & 1)) {
@@ -586,7 +670,7 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	//the flag set indicates we have a string (WE HAVE TO for URLs)
-    if ( !(ptr->flags & 1)) {
+	if ( !(ptr->flags & 1)) {
 		//to check, the spec says: First name, then location
 		if (ptr->nameURN) {
 			gf_bs_write_data(bs, ptr->nameURN, (u32)strlen(ptr->nameURN) + 1);
@@ -627,6 +711,7 @@
 {
 	u32 bytesToRead;
 	GF_UnknownBox *ptr = (GF_UnknownBox *)s;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Ignoring %s box, not supported\n", gf_4cc_to_str(ptr->type) ));
 	if (ptr->size > 0xFFFFFFFF) return GF_ISOM_INVALID_FILE;
 	bytesToRead = (u32) (ptr->size);
 
@@ -656,7 +741,7 @@
 
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
-    if (ptr->data) {
+	if (ptr->data) {
 		gf_bs_write_data(bs, ptr->data, ptr->dataSize);
 	}
 	return GF_OK;
@@ -716,7 +801,7 @@
 
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
-    if (ptr->data) {
+	if (ptr->data) {
 		gf_bs_write_data(bs, ptr->data, ptr->dataSize);
 	}
 	return GF_OK;
@@ -751,12 +836,12 @@
 	case GF_ISOM_BOX_TYPE_DREF:
 		if (ptr->dref) ERROR_ON_DUPLICATED_BOX(a, ptr)
 
-		ptr->dref = (GF_DataReferenceBox *)a;
-		return GF_OK;		
+			ptr->dref = (GF_DataReferenceBox *)a;
+		return GF_OK;
 	default:
 		return gf_isom_box_add_default(s, a);
 	}
-	return GF_OK;		
+	return GF_OK;
 }
 
 GF_Err dinf_Read(GF_Box *s, GF_BitStream *bs)
@@ -828,11 +913,11 @@
 	GF_Err e;
 	//u32 count;
 	GF_DataReferenceBox *ptr = (GF_DataReferenceBox *)s;
-	
+
 	if (ptr == NULL) return GF_BAD_PARAM;
 	e = gf_isom_full_box_read(s, bs);
 	if (e) return e;
-	//count = 
+	//count =
 	gf_bs_read_u32(bs);
 	ptr->size -= 4;
 
@@ -895,7 +980,7 @@
 	} else {
 		return gf_isom_box_add_default(s, a);
 	}
-	return GF_OK;		
+	return GF_OK;
 }
 
 
@@ -918,7 +1003,7 @@
 	GF_EditBox *ptr = (GF_EditBox *)s;
 
 	//here we have a trick: if editList is empty, skip the box
-	if (gf_list_count(ptr->editList->entryList)) {
+	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);
@@ -933,7 +1018,7 @@
 	GF_EditBox *ptr = (GF_EditBox *)s;
 
 	//here we have a trick: if editList is empty, skip the box
-	if (! gf_list_count(ptr->editList->entryList)) {
+	if (!ptr->editList || ! gf_list_count(ptr->editList->entryList)) {
 		ptr->size = 0;
 	} else {
 		e = gf_isom_box_get_size(s);
@@ -976,7 +1061,7 @@
 	u32 nb_entries;
 	GF_EdtsEntry *p;
 	GF_EditListBox *ptr = (GF_EditListBox *)s;
-	
+
 	e = gf_isom_full_box_read(s, bs);
 	if (e) return e;
 	nb_entries = gf_bs_read_u32(bs);
@@ -1136,7 +1221,7 @@
 	char *enc_desc;
 	u32 descSize = 0;
 	GF_ESDBox *ptr = (GF_ESDBox *)s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	e = gf_odf_desc_write((GF_Descriptor *)ptr->desc, &enc_desc, &descSize);
@@ -1175,9 +1260,9 @@
 	GF_FreeSpaceBox *ptr = (GF_FreeSpaceBox *)s;
 
 	if (ptr->size > 0xFFFFFFFF) return GF_IO_ERR;
-	
+
 	bytesToRead = (u32) (ptr->size);
-	
+
 	if (bytesToRead) {
 		ptr->data = (char*)gf_malloc(bytesToRead * sizeof(char));
 		gf_bs_read_data(bs, ptr->data, bytesToRead);
@@ -1200,17 +1285,17 @@
 	GF_FreeSpaceBox *ptr = (GF_FreeSpaceBox *)s;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
-    if (ptr->dataSize)	{
-        if (ptr->data) {
-            gf_bs_write_data(bs, ptr->data, ptr->dataSize);
-        } else {
-            u32 i = 0;          
-            while (i<ptr->dataSize) {
-                gf_bs_write_u8(bs, 0);
-                i++;
-            }
-        }
-    }
+	if (ptr->dataSize)	{
+		if (ptr->data) {
+			gf_bs_write_data(bs, ptr->data, ptr->dataSize);
+		} else {
+			u32 i = 0;
+			while (i<ptr->dataSize) {
+				gf_bs_write_u8(bs, 0);
+				i++;
+			}
+		}
+	}
 	return GF_OK;
 }
 
@@ -1244,6 +1329,10 @@
 	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;
+	}
 	ptr->majorBrand = gf_bs_read_u32(bs);
 	ptr->minorVersion = gf_bs_read_u32(bs);
 	ptr->size -= 8;
@@ -1283,7 +1372,7 @@
 {
 	GF_Err e;
 	GF_FileTypeBox *ptr = (GF_FileTypeBox *)s;
-	
+
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
 	ptr->size += 8 + ptr->altCount * 4;
@@ -1317,7 +1406,7 @@
 {
 	GF_Err e;
 	GF_GenericSampleEntryBox *ptr = (GF_GenericSampleEntryBox *)s;
-	
+
 	//carefull we are not writing the box type but the entry type so switch for write
 	ptr->type = ptr->EntryType;
 	e = gf_isom_box_write_header(s, bs);
@@ -1366,7 +1455,7 @@
 {
 	GF_Err e;
 	GF_GenericVisualSampleEntryBox *ptr = (GF_GenericVisualSampleEntryBox *)s;
-	
+
 	//carefull we are not writing the box type but the entry type so switch for write
 	ptr->type = ptr->EntryType;
 	e = gf_isom_box_write_header(s, bs);
@@ -1417,7 +1506,7 @@
 {
 	GF_Err e;
 	GF_GenericAudioSampleEntryBox *ptr = (GF_GenericAudioSampleEntryBox *)s;
-	
+
 	//carefull we are not writing the box type but the entry type so switch for write
 	ptr->type = ptr->EntryType;
 	e = gf_isom_box_write_header(s, bs);
@@ -1570,7 +1659,7 @@
 //	GF_HintInfoBox *ptr = (GF_HintInfoBox *)s;
 	return gf_isom_box_get_size(s);
 }
-#endif /*GPAC_DISABLE_ISOM_WRITE*/	
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 void hmhd_del(GF_Box *s)
 {
@@ -1598,7 +1687,7 @@
 GF_Box *hmhd_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_HintMediaHeaderBox, GF_ISOM_BOX_TYPE_HMHD);
-	
+
 	gf_isom_full_box_init((GF_Box *)tmp);
 	return (GF_Box *)tmp;
 }
@@ -1610,7 +1699,7 @@
 {
 	GF_Err e;
 	GF_HintMediaHeaderBox *ptr = (GF_HintMediaHeaderBox *)s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_u16(bs, ptr->maxPDUSize);
@@ -1827,7 +1916,7 @@
 	//sdp text has no delimiter !!!
 	ptr->sdpText = (char*)gf_malloc(sizeof(char) * (length+1));
 	if (!ptr->sdpText) return GF_OUT_OF_MEM;
-	
+
 	gf_bs_read_data(bs, ptr->sdpText, length);
 	ptr->sdpText[length] = 0;
 	return GF_OK;
@@ -1889,7 +1978,7 @@
 	GF_Err e;
 	GF_TRPYBox *ptr = (GF_TRPYBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
-	
+
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_bs_write_u64(bs, ptr->nbBytes);
@@ -2623,7 +2712,7 @@
 {
 	GF_MediaDataBox *ptr = (GF_MediaDataBox *)s;
 	if (!s) return;
-	
+
 	if (ptr->data) gf_free(ptr->data);
 	gf_free(ptr);
 }
@@ -2669,7 +2758,7 @@
 	GF_MediaDataBox *ptr = (GF_MediaDataBox *)s;
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
-	
+
 	ptr->size += ptr->dataSize;
 	return GF_OK;
 }
@@ -2705,7 +2794,7 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Media header timescale is invalid (0) - defaulting to 90000\n" ));
 		ptr->timeScale = 90000;
 	}
-	
+
 	//our padding bit
 	gf_bs_read_int(bs, 1);
 	//the spec is unclear here, just says "the value 0 is interpreted as undetermined"
@@ -2747,7 +2836,7 @@
 	GF_MediaHeaderBox *ptr = (GF_MediaHeaderBox *)s;
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-    if (ptr->version == 1) {
+	if (ptr->version == 1) {
 		gf_bs_write_u64(bs, ptr->creationTime);
 		gf_bs_write_u64(bs, ptr->modificationTime);
 		gf_bs_write_u32(bs, ptr->timeScale);
@@ -2798,36 +2887,36 @@
 	GF_MediaBox *ptr = (GF_MediaBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_MDHD:
-	   if (ptr->mediaHeader) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		if (ptr->mediaHeader) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
+			ptr->mediaHeader = (GF_MediaHeaderBox *)a;
+		return GF_OK;
 
-	   ptr->mediaHeader = (GF_MediaHeaderBox *)a;
-	   return GF_OK;
-   
 	case GF_ISOM_BOX_TYPE_HDLR:
-	   if (ptr->handler) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		if (ptr->handler) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
+			ptr->handler = (GF_HandlerBox *)a;
+		return GF_OK;
 
-	   ptr->handler = (GF_HandlerBox *)a;
-	   return GF_OK;
-   
 	case GF_ISOM_BOX_TYPE_MINF:
-	   if (ptr->information) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		if (ptr->information) ERROR_ON_DUPLICATED_BOX(a, ptr)
 
-	   ptr->information = (GF_MediaInformationBox *)a;
-	   return GF_OK;
+			ptr->information = (GF_MediaInformationBox *)a;
+		return GF_OK;
 	default:
 		return gf_isom_box_add_default(s, a);
 	}
-	return GF_OK;		
+	return GF_OK;
 }
 
 
 GF_Err mdia_Read(GF_Box *s, GF_BitStream *bs)
-{	
+{
 	return gf_isom_read_box_list(s, bs, mdia_AddBox);
 }
 
 GF_Box *mdia_New()
-{   
+{
 	ISOM_DECL_BOX_ALLOC(GF_MediaBox, GF_ISOM_BOX_TYPE_MDIA);
 	return (GF_Box *)tmp;
 }
@@ -2868,7 +2957,7 @@
 		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;
@@ -2884,6 +2973,71 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+void elng_del(GF_Box *s)
+{
+	GF_ExtendedLanguageBox *ptr = (GF_ExtendedLanguageBox *)s;
+	if (ptr == NULL) return;
+	if (ptr->extended_language) gf_free(ptr->extended_language);
+	gf_free(ptr);
+}
+
+GF_Err elng_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ExtendedLanguageBox *ptr = (GF_ExtendedLanguageBox *)s;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+	if (ptr->size) {
+		ptr->extended_language = (char*)gf_malloc((u32) ptr->size);
+		if (ptr->extended_language == NULL) return GF_OUT_OF_MEM;
+		gf_bs_read_data(bs, ptr->extended_language, (u32) ptr->size);
+		/*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);
+			memcpy(str, ptr->extended_language, (u32) ptr->size);
+			str[ptr->size] = 0;
+			gf_free(ptr->extended_language);
+			ptr->extended_language = str;
+		}
+	}
+	return GF_OK;
+}
+
+GF_Box *elng_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_MediaBox, GF_ISOM_BOX_TYPE_ELNG);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err elng_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ExtendedLanguageBox *ptr = (GF_ExtendedLanguageBox *)s;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	if (ptr->extended_language) {
+		gf_bs_write_data(bs, ptr->extended_language, (u32)(strlen(ptr->extended_language)+1));
+	}
+	return GF_OK;
+}
+
+GF_Err elng_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_ExtendedLanguageBox *ptr = (GF_ExtendedLanguageBox *)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	ptr->size += 4;
+	if (ptr->extended_language) {
+		ptr->size += strlen(ptr->extended_language)+1;
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
@@ -2970,19 +3124,19 @@
 	case GF_ISOM_BOX_TYPE_GMHD:
 		if (ptr->InfoHeader) ERROR_ON_DUPLICATED_BOX(a, ptr)
 
-		ptr->InfoHeader = a;
+			ptr->InfoHeader = a;
 		return GF_OK;
-	
+
 	case GF_ISOM_BOX_TYPE_DINF:
 		if (ptr->dataInformation) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		
-		ptr->dataInformation = (GF_DataInformationBox *)a;
+
+			ptr->dataInformation = (GF_DataInformationBox *)a;
 		return GF_OK;
-		
+
 	case GF_ISOM_BOX_TYPE_STBL:
 		if (ptr->sampleTable ) ERROR_ON_DUPLICATED_BOX(a, ptr)
 
-		ptr->sampleTable = (GF_SampleTableBox *)a;
+			ptr->sampleTable = (GF_SampleTableBox *)a;
 		return GF_OK;
 	default:
 		return gf_isom_box_add_default(s, a);
@@ -3010,7 +3164,7 @@
 	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;
 
@@ -3018,12 +3172,12 @@
 	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);
@@ -3036,24 +3190,24 @@
 {
 	GF_Err e;
 	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
-	
+
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
 	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;
-	}	
+	}
 	return GF_OK;
 }
 
@@ -3079,7 +3233,7 @@
 	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);
@@ -3109,7 +3263,7 @@
 	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
@@ -3128,7 +3282,7 @@
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
 
-	
+
 	if (ptr->mfhd) {
 		e = gf_isom_box_size((GF_Box *) ptr->mfhd);
 		if (e) return e;
@@ -3167,37 +3321,37 @@
 	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);
 		}
 		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;
@@ -3226,7 +3380,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
@@ -3255,7 +3409,7 @@
 		e = gf_isom_box_write((GF_Box *) ptr->mvex, bs);
 		if (e) return e;
 	}
-#endif 
+#endif
 
 	e = gf_isom_box_array_write(s, ptr->trackList, bs);
 	if (e) return e;
@@ -3324,14 +3478,14 @@
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
 		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->esd = (GF_ESDBox *)a;
+			ptr->esd = (GF_ESDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
 		break;
 	case GF_4CC('w','a','v','e'):
 		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		/*HACK for QT files: get the esds box from the track*/
+			/*HACK for QT files: get the esds box from the track*/
 		{
 			GF_UnknownBox *wave = (GF_UnknownBox *)a;
 			u32 offset = 0;
@@ -3372,7 +3526,7 @@
 	e = gf_isom_read_box_list(s, bs, mp4a_AddBox);
 	if (!e) return GF_OK;
 
-	/*hack for some weird files (possibly recorded with live.com tools, needs further investigations)*/	
+	/*hack for some weird files (possibly recorded with live.com tools, needs further investigations)*/
 	ptr = (GF_MPEGAudioSampleEntryBox *)s;
 	gf_bs_seek(bs, pos);
 	data = (char*)gf_malloc(sizeof(char) * size);
@@ -3396,14 +3550,14 @@
 	return (GF_Box *)tmp;
 }
 
-GF_Box *enca_New() 
+GF_Box *enca_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MPEGAudioSampleEntryBox, GF_ISOM_BOX_TYPE_ENCA);
 	gf_isom_audio_sample_entry_init((GF_AudioSampleEntryBox*)tmp);
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err mp4a_Write(GF_Box *s, GF_BitStream *bs)
@@ -3454,7 +3608,7 @@
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
 		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->esd = (GF_ESDBox *)a;
+			ptr->esd = (GF_ESDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
@@ -3488,7 +3642,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err mp4s_Write(GF_Box *s, GF_BitStream *bs)
@@ -3509,7 +3663,7 @@
 {
 	GF_Err e;
 	GF_MPEGSampleEntryBox *ptr = (GF_MPEGSampleEntryBox *)s;
-	
+
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
 	ptr->size += 8;
@@ -3551,46 +3705,46 @@
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
 		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->esd = (GF_ESDBox *)a;
+			ptr->esd = (GF_ESDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
 		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_SHCC:
 		if (ptr->shvc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->shvc_config = (GF_HEVCConfigurationBox *)a;
+			ptr->shvc_config = (GF_HEVCConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
 		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
+			ptr->bitrate = (GF_MPEG4BitRateBox *)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;
 	case GF_ISOM_BOX_TYPE_UUID:
 		if (ptr->ipod_ext) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->ipod_ext = (GF_UnknownUUIDBox *)a;
+			ptr->ipod_ext = (GF_UnknownUUIDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_PASP:
 		if (ptr->pasp) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->pasp = (GF_PixelAspectRatioBox *)a;
+			ptr->pasp = (GF_PixelAspectRatioBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_RVCC:
 		if (ptr->rvcc) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->rvcc = (GF_RVCConfigurationBox *)a;
+			ptr->rvcc = (GF_RVCConfigurationBox *)a;
 		break;
 	default:
 		return gf_isom_box_add_default(s, a);
@@ -3609,7 +3763,8 @@
 	/*this is an AVC sample desc*/
 	if (mp4v->avc_config || mp4v->svc_config) AVC_RewriteESDescriptor(mp4v);
 	/*this is an HEVC sample desc*/
-	if (mp4v->hevc_config || mp4v->shvc_config) HEVC_RewriteESDescriptor(mp4v);
+	if (mp4v->hevc_config || mp4v->shvc_config || (mp4v->type==GF_ISOM_BOX_TYPE_HVT1))
+		HEVC_RewriteESDescriptor(mp4v);
 	return GF_OK;
 }
 
@@ -3697,7 +3852,7 @@
 		if (e) return e;
 		ptr->size += ptr->esd->size;
 	} else {
-		if (!ptr->avc_config && !ptr->svc_config && !ptr->hevc_config && !ptr->shvc_config) {
+		if (!ptr->avc_config && !ptr->svc_config && !ptr->hevc_config && !ptr->shvc_config && (ptr->type!=GF_ISOM_BOX_TYPE_HVT1) ) {
 			return GF_ISOM_INVALID_FILE;
 		}
 
@@ -3705,22 +3860,22 @@
 			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); 
+			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); 
+			e = gf_isom_box_size((GF_Box *) ptr->svc_config);
 			if (e) return e;
 			ptr->size += ptr->svc_config->size;
 		}
 
 		if (ptr->shvc_config && ptr->shvc_config->config) {
-			e = gf_isom_box_size((GF_Box *) ptr->shvc_config); 
+			e = gf_isom_box_size((GF_Box *) ptr->shvc_config);
 			if (e) return e;
 			ptr->size += ptr->shvc_config->size;
 		}
@@ -3766,6 +3921,7 @@
 	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);
 	gf_free(ptr);
 }
 
@@ -3773,10 +3929,12 @@
 GF_Err mvex_AddBox(GF_Box *s, GF_Box *a)
 {
 	GF_MovieExtendsBox *ptr = (GF_MovieExtendsBox *)s;
-	
+
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_TREX:
 		return gf_list_add(ptr->TrackExList, a);
+	case GF_ISOM_BOX_TYPE_TREP:
+		return gf_list_add(ptr->TrackExPropList, a);
 	case GF_ISOM_BOX_TYPE_MEHD:
 		if (ptr->mehd) break;
 		ptr->mehd = (GF_MovieExtendsHeaderBox*)a;
@@ -3784,7 +3942,7 @@
 	default:
 		return gf_isom_box_add_default(s, a);
 	}
-	return GF_OK;		
+	return GF_OK;
 }
 
 
@@ -3802,11 +3960,17 @@
 		gf_free(tmp);
 		return NULL;
 	}
+	tmp->TrackExPropList = gf_list_new();
+	if (!tmp->TrackExPropList) {
+		gf_list_del(tmp->TrackExList);
+		gf_free(tmp);
+		return NULL;
+	}
 	return (GF_Box *)tmp;
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
@@ -3821,7 +3985,9 @@
 		e = gf_isom_box_write((GF_Box *)ptr->mehd, bs);
 		if (e) return e;
 	}
-	return gf_isom_box_array_write(s, ptr->TrackExList, bs);
+	e = gf_isom_box_array_write(s, ptr->TrackExList, bs);
+	if (e) return e;
+	return gf_isom_box_array_write(s, ptr->TrackExPropList, bs);
 }
 
 GF_Err mvex_Size(GF_Box *s)
@@ -3835,7 +4001,9 @@
 		if (e) return e;
 		ptr->size += ptr->mehd->size;
 	}
-	return gf_isom_box_array_size(s, ptr->TrackExList);
+	e = gf_isom_box_array_size(s, ptr->TrackExList);
+	if (e) return e;
+	return gf_isom_box_array_size(s, ptr->TrackExPropList);
 }
 
 
@@ -3962,7 +4130,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err mvhd_Write(GF_Box *s, GF_BitStream *bs)
@@ -4043,7 +4211,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err nmhd_Write(GF_Box *s, GF_BitStream *bs)
@@ -4102,7 +4270,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err padb_Write(GF_Box *s, GF_BitStream *bs)
@@ -4114,7 +4282,7 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_int(bs, ptr->SampleCount, 32);
-	
+
 	for (i=0 ; i<ptr->SampleCount; i += 2) {
 		gf_bs_write_int(bs, 0, 1);
 		if (i+1 < ptr->SampleCount) {
@@ -4259,7 +4427,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err smhd_Write(GF_Box *s, GF_BitStream *bs)
@@ -4367,39 +4535,39 @@
 	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, 
+	//WARNING: AS THIS MAY CHANGE DYNAMICALLY DURING EDIT,
 	case GF_ISOM_BOX_TYPE_CO64:
 	case GF_ISOM_BOX_TYPE_STCO:
 		if (ptr->ChunkOffset) {
@@ -4409,25 +4577,25 @@
 		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_STSF:
 		if (ptr->Fragments) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->Fragments = (GF_SampleFragmentBox *)a;
+			ptr->Fragments = (GF_SampleFragmentBox *)a;
 		break;
-	
+
 	case GF_ISOM_BOX_TYPE_SUBS:
 		if (ptr->SubSamples) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->SubSamples = (GF_SubSampleInformationBox *)a;
+			ptr->SubSamples = (GF_SubSampleInformationBox *)a;
 		break;
 
 	case GF_ISOM_BOX_TYPE_SBGP:
@@ -4454,7 +4622,7 @@
 	case GF_ISOM_BOX_UUID_PSEC:
 		ptr->piff_psec = a;
 		return gf_isom_box_add_default((GF_Box *)ptr, a);
-	case GF_ISOM_BOX_TYPE_UUID: 
+	case GF_ISOM_BOX_TYPE_UUID:
 		if (((GF_UnknownUUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC) {
 			ptr->piff_psec = a;
 			return gf_isom_box_add_default((GF_Box *)ptr, a);
@@ -4480,14 +4648,14 @@
 		e = gf_isom_parse_box(&a, bs);
 		if (e) return e;
 		//we need to read the DegPriority in a different way...
-		if ((a->type == GF_ISOM_BOX_TYPE_STDP) || (a->type == GF_ISOM_BOX_TYPE_SDTP)) { 
+		if ((a->type == GF_ISOM_BOX_TYPE_STDP) || (a->type == GF_ISOM_BOX_TYPE_SDTP)) {
 			u64 s = a->size;
-/*
-			if (!ptr->SampleSize) {
-				gf_isom_box_del(a);
-				return GF_ISOM_INVALID_FILE;
-			}
-*/
+			/*
+						if (!ptr->SampleSize) {
+							gf_isom_box_del(a);
+							return GF_ISOM_INVALID_FILE;
+						}
+			*/
 			if (a->type == GF_ISOM_BOX_TYPE_STDP) {
 				if (ptr->SampleSize) ((GF_DegradationPriorityBox *)a)->nb_entries = ptr->SampleSize->sampleCount;
 				e = stdp_Read(a, bs);
@@ -4515,7 +4683,7 @@
 		e = stbl_AddBox(ptr, a);
 		if (e) return e;
 	}
-	if (!ptr->SyncSample) 
+	if (!ptr->SyncSample)
 		ptr->no_sync_found = 1;
 
 	return GF_OK;
@@ -4531,7 +4699,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stbl_Write(GF_Box *s, GF_BitStream *bs)
@@ -4643,7 +4811,7 @@
 		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;
@@ -4709,19 +4877,19 @@
 	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;
-	}	
+	}
 	return GF_OK;
 }
 
@@ -4767,7 +4935,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stco_Write(GF_Box *s, GF_BitStream *bs)
@@ -4835,7 +5003,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stdp_Write(GF_Box *s, GF_BitStream *bs)
@@ -4886,7 +5054,7 @@
 	ptr->alloc_size = 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);
 		ptr->entries[i].samplesPerChunk = gf_bs_read_u32(bs);
@@ -4911,13 +5079,13 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stsc_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
-	u32 i;	
+	u32 i;
 	GF_SampleToChunkBox *ptr = (GF_SampleToChunkBox *)s;
 
 	e = gf_isom_full_box_write(s, bs);
@@ -4973,6 +5141,7 @@
 	case GF_ISOM_BOX_TYPE_HEV1:
 	case GF_ISOM_BOX_TYPE_HVC2:
 	case GF_ISOM_BOX_TYPE_HEV2:
+	case GF_ISOM_BOX_TYPE_HVT1:
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
 	case GF_ISOM_BOX_TYPE_TX3G:
@@ -4980,14 +5149,16 @@
 	case GF_ISOM_BOX_TYPE_ENCT:
 	case GF_ISOM_BOX_TYPE_METX:
 	case GF_ISOM_BOX_TYPE_METT:
-	case GF_ISOM_BOX_TYPE_STSE:
+	case GF_ISOM_BOX_TYPE_STXT:
 	case GF_ISOM_BOX_TYPE_DIMS:
 	case GF_ISOM_BOX_TYPE_AC3:
 	case GF_ISOM_BOX_TYPE_LSR1:
 	case GF_ISOM_BOX_TYPE_WVTT:
 	case GF_ISOM_BOX_TYPE_STPP:
 	case GF_ISOM_BOX_TYPE_SBTT:
-	return gf_isom_box_add_default((GF_Box*)ptr, a);
+	case GF_ISOM_BOX_TYPE_ELNG:
+	case GF_ISOM_BOX_TYPE_MP3:
+		return gf_isom_box_add_default((GF_Box*)ptr, a);
 	/*for 3GP config, we must set the type*/
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
@@ -5046,7 +5217,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stsd_Write(GF_Box *s, GF_BitStream *bs)
@@ -5081,13 +5252,13 @@
 	GF_StsfEntry *pe;
 	GF_SampleFragmentBox *ptr = (GF_SampleFragmentBox *)s;
 	if (ptr == NULL) return;
-	
+
 	if (ptr->entryList) {
 		nb_entries = gf_list_count(ptr->entryList);
 		for ( i = 0; i < nb_entries; i++ ) {
 			pe = (GF_StsfEntry*)gf_list_get(ptr->entryList, i);
 			if (pe->fragmentSizes) gf_free(pe->fragmentSizes);
-			gf_free(pe);	
+			gf_free(pe);
 		}
 		gf_list_del(ptr->entryList);
 	}
@@ -5103,7 +5274,7 @@
 	u32 nb_entries;
 	GF_StsfEntry *p;
 	GF_SampleFragmentBox *ptr = (GF_SampleFragmentBox *)s;
-	
+
 	p = NULL;
 	if (!ptr) return GF_BAD_PARAM;
 	e = gf_isom_full_box_read(s, bs);
@@ -5144,7 +5315,7 @@
 
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stsf_Write(GF_Box *s, GF_BitStream *bs)
@@ -5154,16 +5325,16 @@
 	u32 nb_entries;
 	GF_StsfEntry *p;
 	GF_SampleFragmentBox *ptr = (GF_SampleFragmentBox *)s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-    nb_entries = gf_list_count(ptr->entryList);
+	nb_entries = gf_list_count(ptr->entryList);
 	gf_bs_write_u32(bs, nb_entries);
 	for ( i = 0; i < nb_entries; i++ ) {
 		p = (GF_StsfEntry*)gf_list_get(ptr->entryList, i);
 		gf_bs_write_u32(bs, p->SampleNumber);
 		gf_bs_write_u32(bs, p->fragmentCount);
-		for (j=0;j<p->fragmentCount;j++) {
+		for (j=0; j<p->fragmentCount; j++) {
 			gf_bs_write_u16(bs, p->fragmentSizes[j]);
 		}
 	}
@@ -5181,7 +5352,7 @@
 	if (e) return e;
 	nb_entries = gf_list_count(ptr->entryList);
 	ptr->size += 4;
-	for (i=0;i<nb_entries; i++) {
+	for (i=0; i<nb_entries; i++) {
 		p = (GF_StsfEntry *)gf_list_get(ptr->entryList, i);
 		ptr->size += 8 + 2*p->fragmentCount;
 	}
@@ -5239,7 +5410,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stsh_Write(GF_Box *s, GF_BitStream *bs)
@@ -5308,7 +5479,7 @@
 	return (GF_Box*)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stss_Write(GF_Box *s, GF_BitStream *bs)
@@ -5380,7 +5551,7 @@
 			if (!ptr->sampleCount) {
 				ptr->sampleSize = 16;
 				return GF_OK;
-			}			
+			}
 			estSize = (u32) (ptr->size) / ptr->sampleCount;
 			if (!estSize && ((ptr->sampleCount+1)/2 == (ptr->size)) ) {
 				ptr->sampleSize = 4;
@@ -5440,7 +5611,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stsz_Write(GF_Box *s, GF_BitStream *bs)
@@ -5448,7 +5619,7 @@
 	GF_Err e;
 	u32 i;
 	GF_SampleSizeBox *ptr = (GF_SampleSizeBox *)s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	//in both versions this is still valid
@@ -5542,7 +5713,7 @@
 		ptr->size += (4 * ptr->sampleCount);
 		return GF_OK;
 	}
-	
+
 	//make sure we are a compact table (no need to change the mem representation)
 	ptr->type = GF_ISOM_BOX_TYPE_STZ2;
 	ptr->sampleSize = fieldSize;
@@ -5589,7 +5760,7 @@
 		ptr->w_currentSampleNum += ptr->entries[i].sampleCount;
 		ptr->w_LastDTS += ptr->entries[i].sampleCount * ptr->entries[i].sampleDelta;
 #endif
-	
+
 		if (!ptr->entries[i].sampleDelta) {
 			if ((i+1<ptr->nb_entries) ) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Found stss entry with sample_delta=0 - forbidden ! Fixing to 1\n" ));
@@ -5614,7 +5785,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stts_Write(GF_Box *s, GF_BitStream *bs)
@@ -5622,11 +5793,11 @@
 	GF_Err e;
 	u32 i;
 	GF_TimeToSampleBox *ptr = (GF_TimeToSampleBox *)s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs, ptr->nb_entries);
-	for (i=0; i<ptr->nb_entries;i++) {
+	for (i=0; i<ptr->nb_entries; i++) {
 		gf_bs_write_u32(bs, ptr->entries[i].sampleCount);
 		gf_bs_write_u32(bs, ptr->entries[i].sampleDelta);
 	}
@@ -5660,11 +5831,11 @@
 {
 	GF_Err e;
 	GF_TrackFragmentHeaderBox *ptr = (GF_TrackFragmentHeaderBox *)s;
-	
+
 	e = gf_isom_full_box_read(s, bs);
 	if (e) return e;
-	
-		ptr->trackID = gf_bs_read_u32(bs);
+
+	ptr->trackID = gf_bs_read_u32(bs);
 
 	//The rest depends on the flags
 	if (ptr->flags & GF_ISOM_TRAF_BASE_OFFSET) {
@@ -5693,7 +5864,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
@@ -5789,7 +5960,7 @@
 	return GF_OK;
 }
 
-#endif /*GPAC_DISABLE_ISOM_WRITE*/	
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
 void tkhd_del(GF_Box *s)
@@ -5851,7 +6022,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err tkhd_Write(GF_Box *s, GF_BitStream *bs)
@@ -5934,34 +6105,34 @@
 GF_Err traf_AddBox(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;
+	case GF_ISOM_BOX_TYPE_TFDT:
+		if (ptr->tfdt) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->tfdt = (GF_TFBaseMediaDecodeTimeBox*) a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SUBS:
 		if (ptr->subs) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->subs = (GF_SubSampleInformationBox *)a;
+			ptr->subs = (GF_SubSampleInformationBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SBGP:
 		if (!ptr->sampleGroups) ptr->sampleGroups = gf_list_new();
 		gf_list_add(ptr->sampleGroups, a);
-		return GF_OK;		
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SGPD:
 		if (!ptr->sampleGroupsDescription) ptr->sampleGroupsDescription = gf_list_new();
 		gf_list_add(ptr->sampleGroupsDescription, a);
-		return GF_OK;		
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SAIZ:
 		if (!ptr->sai_sizes) ptr->sai_sizes = gf_list_new();
 		gf_list_add(ptr->sai_sizes, a);
@@ -5969,25 +6140,25 @@
 	case GF_ISOM_BOX_TYPE_SAIO:
 		if (!ptr->sai_offsets) ptr->sai_offsets = gf_list_new();
 		gf_list_add(ptr->sai_offsets, a);
-		return GF_OK;		
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_UUID:
 		if ( ((GF_UUIDBox *)a)->internal_4cc==GF_ISOM_BOX_UUID_PSEC) {
 			if (ptr->piff_sample_encryption) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->piff_sample_encryption = (GF_PIFFSampleEncryptionBox *)a;
+				ptr->piff_sample_encryption = (GF_PIFFSampleEncryptionBox *)a;
 			ptr->piff_sample_encryption->traf = ptr;
 			return GF_OK;
 		} else {
 			return gf_isom_box_add_default(s, a);
 		}
 	case GF_ISOM_BOX_TYPE_SENC:
-		if (ptr->sample_encryption) ERROR_ON_DUPLICATED_BOX(a, ptr) 
-		ptr->sample_encryption = (GF_SampleEncryptionBox *)a;
+		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;		
+	return GF_OK;
 }
 
 
@@ -6003,7 +6174,7 @@
 
 
 		//we need to read the DegPriority in a different way...
-		if ((a->type == GF_ISOM_BOX_TYPE_STDP) || (a->type == GF_ISOM_BOX_TYPE_SDTP)) { 
+		if ((a->type == GF_ISOM_BOX_TYPE_STDP) || (a->type == GF_ISOM_BOX_TYPE_SDTP)) {
 			u32 nb_samples=0, i=0;
 			u64 s = a->size;
 			for (i=0; i<gf_list_count(ptr->TrackRuns); i++) {
@@ -6041,7 +6212,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err traf_Write(GF_Box *s, GF_BitStream *bs)
@@ -6065,7 +6236,7 @@
 	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;
@@ -6163,7 +6334,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
- 
+
 
 void trak_del(GF_Box *s)
 {
@@ -6176,7 +6347,7 @@
 	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->name) gf_free(ptr->name);
 	gf_free(ptr);
 }
 
@@ -6189,6 +6360,12 @@
 	GF_UnknownBox *a;
 	u32 i;
 
+	if (!trak->Media->information->sampleTable->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);
+		return;
+	}
+
 	i=0;
 	while ((a = (GF_UnknownBox*)gf_list_enum(trak->Media->information->sampleTable->SampleDescription->other_boxes, &i))) {
 		switch (a->type) {
@@ -6208,7 +6385,7 @@
 		case GF_ISOM_BOX_TYPE_RTP_STSD:
 		case GF_ISOM_BOX_TYPE_METX:
 		case GF_ISOM_BOX_TYPE_METT:
-		case GF_ISOM_BOX_TYPE_STSE:
+		case GF_ISOM_BOX_TYPE_STXT:
 		case GF_ISOM_BOX_TYPE_AVC1:
 		case GF_ISOM_BOX_TYPE_AVC2:
 		case GF_ISOM_BOX_TYPE_AVC3:
@@ -6218,6 +6395,7 @@
 		case GF_ISOM_BOX_TYPE_HEV1:
 		case GF_ISOM_BOX_TYPE_HVC2:
 		case GF_ISOM_BOX_TYPE_HEV2:
+		case GF_ISOM_BOX_TYPE_HVT1:
 		case GF_ISOM_BOX_TYPE_SHC1:
 		case GF_ISOM_BOX_TYPE_SHV1:
 		case GF_ISOM_BOX_TYPE_TX3G:
@@ -6274,24 +6452,24 @@
 
 		default:
 			/*remove entry*/
-      if (a->data && a->size) {
-			  gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
-			  genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
-			  genm->size = a->size;
-			  bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
-			  gf_bs_read_data(bs, genm->reserved, 6);
-			  genm->dataReferenceIndex = gf_bs_read_u16(bs);
-			  genm->data_size = (u32) gf_bs_available(bs);
-			  if (genm->data_size) {
-				  genm->data = (char*)gf_malloc(sizeof(char) * genm->data_size);
-				  gf_bs_read_data(bs, genm->data, genm->data_size);
-			  }
-			  gf_bs_del(bs);
-			  genm->size = a->size;
-			  genm->EntryType = a->type;
-			  gf_isom_box_del((GF_Box *)a);
-			  gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genm, i-1);
-      }
+			if (a->data && a->size) {
+				gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
+				genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
+				genm->size = a->size;
+				bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
+				gf_bs_read_data(bs, genm->reserved, 6);
+				genm->dataReferenceIndex = gf_bs_read_u16(bs);
+				genm->data_size = (u32) gf_bs_available(bs);
+				if (genm->data_size) {
+					genm->data = (char*)gf_malloc(sizeof(char) * genm->data_size);
+					gf_bs_read_data(bs, genm->data, genm->data_size);
+				}
+				gf_bs_del(bs);
+				genm->size = a->size;
+				genm->EntryType = a->type;
+				gf_isom_box_del((GF_Box *)a);
+				gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genm, i-1);
+			}
 			break;
 		}
 
@@ -6306,27 +6484,27 @@
 	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;
 	default:
@@ -6362,7 +6540,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err trak_Write(GF_Box *s, GF_BitStream *bs)
@@ -6403,7 +6581,7 @@
 {
 	GF_Err e;
 	GF_TrackBox *ptr = (GF_TrackBox *)s;
-	
+
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
 
@@ -6468,7 +6646,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err tref_Write(GF_Box *s, GF_BitStream *bs)
@@ -6506,7 +6684,7 @@
 	ptr->trackIDCount = (u32) (bytesToRead) / sizeof(u32);
 	ptr->trackIDs = (u32 *) gf_malloc(ptr->trackIDCount * sizeof(u32));
 	if (!ptr->trackIDs) return GF_OUT_OF_MEM;
-	
+
 	for (i = 0; i < ptr->trackIDCount; i++) {
 		ptr->trackIDs[i] = gf_bs_read_u32(bs);
 	}
@@ -6543,7 +6721,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err reftype_Write(GF_Box *s, GF_BitStream *bs)
@@ -6614,7 +6792,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
@@ -6648,6 +6826,68 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+
+
+void trep_del(GF_Box *s)
+{
+	GF_TrackExtensionPropertiesBox *ptr = (GF_TrackExtensionPropertiesBox *)s;
+	if (ptr == NULL) return;
+	gf_free(ptr);
+}
+
+
+GF_Err trep_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_TrackExtensionPropertiesBox *ptr = (GF_TrackExtensionPropertiesBox *)s;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->trackID = gf_bs_read_u32(bs);
+	ptr->size-=4;
+
+	return gf_isom_read_box_list(s, bs, gf_isom_box_add_default);
+}
+
+GF_Box *trep_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_TrackExtensionPropertiesBox, GF_ISOM_BOX_TYPE_TREP);
+	tmp->other_boxes = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+
+GF_Err trep_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_TrackExtensionPropertiesBox *ptr = (GF_TrackExtensionPropertiesBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u32(bs, ptr->trackID);
+	return GF_OK;
+}
+
+GF_Err trep_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_TrackExtensionPropertiesBox *ptr = (GF_TrackExtensionPropertiesBox *)s;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	ptr->size += 4;
+	return GF_OK;
+}
+
+
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 
@@ -6659,7 +6899,7 @@
 	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_list_rem(ptr->entries, 0);
@@ -6676,12 +6916,12 @@
 	u32 i;
 	GF_TrunEntry *p;
 	GF_TrackFragmentRunBox *ptr = (GF_TrackFragmentRunBox *)s;
-	
+
 	e = gf_isom_full_box_read(s, bs);
 	if (e) return e;
 
 	//check this is a good file
-	if ((ptr->flags & GF_ISOM_TRUN_FIRST_FLAG) && (ptr->flags & GF_ISOM_TRUN_FLAGS)) 
+	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);
@@ -6717,12 +6957,16 @@
 			trun_size += 4;
 		}
 		if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) {
-			p->CTS_Offset = gf_bs_read_u32(bs);
+			if (ptr->version==0) {
+				p->CTS_Offset = (u32) gf_bs_read_u32(bs);
+			} else {
+				p->CTS_Offset = (s32) gf_bs_read_u32(bs);
+			}
 		}
 		gf_list_add(ptr->entries, p);
 		if (ptr->size<trun_size) return GF_ISOM_INVALID_FILE;
 		ptr->size-=trun_size;
-	}	
+	}
 	return GF_OK;
 }
 
@@ -6735,7 +6979,7 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
@@ -6776,9 +7020,13 @@
 			gf_bs_write_u32(bs, p->flags);
 		}
 		if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) {
-			gf_bs_write_u32(bs, p->CTS_Offset);
+			if (ptr->version==0) {
+				gf_bs_write_u32(bs, p->CTS_Offset);
+			} else {
+				gf_bs_write_u32(bs, (u32) p->CTS_Offset);
+			}
 		}
-	}	
+	}
 	return GF_OK;
 }
 
@@ -6790,7 +7038,7 @@
 
 	e = gf_isom_full_box_get_size(s);
 	if (e) return e;
-	
+
 	ptr->size += 4;
 	//The rest depends on the flags
 	if (ptr->flags & GF_ISOM_TRUN_DATA_OFFSET) ptr->size += 4;
@@ -6805,7 +7053,7 @@
 		if (ptr->flags & GF_ISOM_TRUN_FLAGS) ptr->size += 4;
 		if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) ptr->size += 4;
 	}
-	
+
 	return GF_OK;
 }
 
@@ -6814,7 +7062,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
- 
+
 
 void tsro_del(GF_Box *s)
 {
@@ -6902,9 +7150,9 @@
 		map = (GF_UserDataMap *) gf_malloc(sizeof(GF_UserDataMap));
 		if (map == NULL) return GF_OUT_OF_MEM;
 		memset(map, 0, sizeof(GF_UserDataMap));
-		
+
 		map->boxType = a->type;
-		if (a->type == GF_ISOM_BOX_TYPE_UUID) 
+		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) {
@@ -6953,7 +7201,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err udta_Write(GF_Box *s, GF_BitStream *bs)
@@ -6971,7 +7219,7 @@
 		//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);
 		if (e) return e;
-    }
+	}
 	return GF_OK;
 }
 
@@ -6981,7 +7229,7 @@
 	u32 i;
 	GF_UserDataMap *map;
 	GF_UserDataBox *ptr = (GF_UserDataBox *)s;
-	
+
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
 	i=0;
@@ -7024,14 +7272,14 @@
 }
 
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err vmhd_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_VideoMediaHeaderBox *ptr = (GF_VideoMediaHeaderBox *)s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_u64(bs, ptr->reserved);
@@ -7069,7 +7317,7 @@
 	return tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err void_Write(GF_Box *s, GF_BitStream *bs)
@@ -7126,7 +7374,7 @@
 	return GF_OK;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err pdin_Write(GF_Box *s, GF_BitStream *bs)
@@ -7191,7 +7439,7 @@
 	return GF_OK;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err sdtp_Write(GF_Box *s, GF_BitStream *bs)
@@ -7241,7 +7489,7 @@
 	return GF_OK;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err pasp_Write(GF_Box *s, GF_BitStream *bs)
@@ -7298,7 +7546,7 @@
 		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
 		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
+			ptr->bitrate = (GF_MPEG4BitRateBox *)a;
 		break;
 	default:
 		return gf_isom_box_add_default(s, a);
@@ -7355,7 +7603,7 @@
 	return gf_isom_read_box_list(s, bs, metx_AddBox);
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err metx_Write(GF_Box *s, GF_BitStream *bs)
@@ -7367,19 +7615,19 @@
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
 
-	if (ptr->content_encoding) 
+	if (ptr->content_encoding)
 		gf_bs_write_data(bs, ptr->content_encoding, (u32) strlen(ptr->content_encoding));
 	gf_bs_write_u8(bs, 0);
 
-	if (ptr->mime_type_or_namespace) 
+	if (ptr->mime_type_or_namespace)
 		gf_bs_write_data(bs, ptr->mime_type_or_namespace, (u32) strlen(ptr->mime_type_or_namespace));
 	gf_bs_write_u8(bs, 0);
-	
-	if (ptr->type == GF_ISOM_BOX_TYPE_METX) { 
-	    if (ptr->xml_schema_loc) 
-		    gf_bs_write_data(bs, ptr->xml_schema_loc, (u32) strlen(ptr->xml_schema_loc));
-	    gf_bs_write_u8(bs, 0);
-    }
+
+	if (ptr->type == GF_ISOM_BOX_TYPE_METX) {
+		if (ptr->xml_schema_loc)
+			gf_bs_write_data(bs, ptr->xml_schema_loc, (u32) strlen(ptr->xml_schema_loc));
+		gf_bs_write_u8(bs, 0);
+	}
 
 	if (ptr->bitrate) {
 		e = gf_isom_box_write((GF_Box *)ptr->bitrate, bs);
@@ -7402,10 +7650,10 @@
 		ptr->size += strlen(ptr->mime_type_or_namespace);
 	ptr->size++;
 	if (ptr->type == GF_ISOM_BOX_TYPE_METX) {
-        if (ptr->xml_schema_loc)
-		    ptr->size += strlen(ptr->xml_schema_loc);
-	    ptr->size++;
-    }
+		if (ptr->xml_schema_loc)
+			ptr->size += strlen(ptr->xml_schema_loc);
+		ptr->size++;
+	}
 
 	if (ptr->bitrate) {
 		e = gf_isom_box_size((GF_Box *)ptr->bitrate);
@@ -7418,15 +7666,15 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /* SimpleTextSampleEntry */
-GF_Box *stse_New()
+GF_Box *stxt_New()
 {
-	ISOM_DECL_BOX_ALLOC(GF_SimpleTextSampleEntryBox, GF_ISOM_BOX_TYPE_STSE);
+	ISOM_DECL_BOX_ALLOC(GF_SimpleTextSampleEntryBox, GF_ISOM_BOX_TYPE_STXT);
 	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
 	return (GF_Box *)tmp;
 }
 
 
-void stse_del(GF_Box *s)
+void stxt_del(GF_Box *s)
 {
 	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox*)s;
 	if (ptr == NULL) return;
@@ -7435,22 +7683,22 @@
 	if (ptr->content_encoding) gf_free(ptr->content_encoding);
 	if (ptr->mime_type) gf_free(ptr->mime_type);
 	if (ptr->bitrate) gf_isom_box_del((GF_Box *)ptr->bitrate);
-    if (ptr->config) gf_isom_box_del((GF_Box *)ptr->config);
+	if (ptr->config) gf_isom_box_del((GF_Box *)ptr->config);
 	gf_free(ptr);
 }
 
 
-GF_Err stse_AddBox(GF_Box *s, GF_Box *a)
+GF_Err stxt_AddBox(GF_Box *s, GF_Box *a)
 {
 	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_STTC:
 		if (ptr->config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->config =  (GF_StringBox *)a;
+			ptr->config =  (GF_StringBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
 		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
+			ptr->bitrate = (GF_MPEG4BitRateBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
@@ -7461,7 +7709,7 @@
 	return GF_OK;
 }
 
-GF_Err stse_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stxt_Read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 size, i;
 	char *str;
@@ -7496,13 +7744,13 @@
 
 	ptr->size = size;
 	gf_free(str);
-	return gf_isom_read_box_list(s, bs, stse_AddBox);
+	return gf_isom_read_box_list(s, bs, stxt_AddBox);
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stse_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stxt_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox *)s;
 	GF_Err e = gf_isom_box_write_header(s, bs);
@@ -7511,14 +7759,14 @@
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
 
-	if (ptr->content_encoding) 
+	if (ptr->content_encoding)
 		gf_bs_write_data(bs, ptr->content_encoding, (u32) strlen(ptr->content_encoding));
 	gf_bs_write_u8(bs, 0);
 
-	if (ptr->mime_type) 
+	if (ptr->mime_type)
 		gf_bs_write_data(bs, ptr->mime_type, (u32) strlen(ptr->mime_type));
 	gf_bs_write_u8(bs, 0);
-	
+
 	if (ptr->bitrate) {
 		e = gf_isom_box_write((GF_Box *)ptr->bitrate, bs);
 		if (e) return e;
@@ -7530,7 +7778,7 @@
 	return gf_isom_box_array_write(s, ptr->protections, bs);
 }
 
-GF_Err stse_Size(GF_Box *s)
+GF_Err stxt_Size(GF_Box *s)
 {
 	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox *)s;
 	GF_Err e = gf_isom_box_get_size(s);
@@ -7609,7 +7857,7 @@
 	return GF_OK;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err dac3_Write(GF_Box *s, GF_BitStream *bs)
@@ -7664,7 +7912,7 @@
 		s->size += 2;
 		for (i=0; i<ptr->cfg.nb_streams; i++) {
 			s->size += 3;
-			if (ptr->cfg.streams[i].nb_dep_sub) 
+			if (ptr->cfg.streams[i].nb_dep_sub)
 				s->size += 1;
 		}
 	} else {
@@ -7708,7 +7956,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err ac3_Write(GF_Box *s, GF_BitStream *bs)
@@ -7763,7 +8011,7 @@
 	return (GF_Box *)tmp;
 }
 
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err lsrc_Write(GF_Box *s, GF_BitStream *bs)
@@ -7808,15 +8056,15 @@
 	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_BTRT:
 		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
+			ptr->bitrate = (GF_MPEG4BitRateBox *)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);
@@ -7954,7 +8202,7 @@
 	GF_Err e;
 	u32 i;
 	GF_SegmentIndexBox *ptr = (GF_SegmentIndexBox*) s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 
@@ -8039,7 +8287,7 @@
 	GF_Err e;
 	u32 i;
 	GF_PcrInfoBox *ptr = (GF_PcrInfoBox*) s;
-	
+
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 
@@ -8064,7 +8312,7 @@
 
 	ptr->size += 4;
 	ptr->size += ptr->subsegment_count * 8;
-	
+
 	return GF_OK;
 }
 
@@ -8081,7 +8329,7 @@
 void subs_del(GF_Box *s)
 {
 	GF_SubSampleInformationBox *ptr = (GF_SubSampleInformationBox *)s;
-	if (ptr == NULL) return;	
+	if (ptr == NULL) return;
 
 	while (gf_list_count(ptr->Samples)) {
 		GF_SubSampleInfoEntry *pSamp;
@@ -8091,7 +8339,7 @@
 			pSubSamp = (GF_SubSampleEntry*) gf_list_get(pSamp->SubSamples, 0);
 			gf_free(pSubSamp);
 			gf_list_rem(pSamp->SubSamples, 0);
-		}		
+		}
 		gf_list_del(pSamp->SubSamples);
 		gf_free(pSamp);
 		gf_list_rem(ptr->Samples, 0);
@@ -8117,15 +8365,15 @@
 	if (e) return e;
 	entry_count = gf_list_count(ptr->Samples);
 	gf_bs_write_u32(bs, entry_count);
-	
+
 	for (i=0; i<entry_count; i++) {
 		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);
-		
+
 		for (j=0; j<subsample_count; j++) {
-			pSubSamp = (GF_SubSampleEntry*) gf_list_get(pSamp->SubSamples, j);	
+			pSubSamp = (GF_SubSampleEntry*) gf_list_get(pSamp->SubSamples, j);
 			if (ptr->version == 1) {
 				gf_bs_write_u32(bs, pSubSamp->subsample_size);
 			} else {
@@ -8147,7 +8395,7 @@
 	u32 entry_count, i;
 	u16 subsample_count;
 
-	// determine the size of the full box 
+	// determine the size of the full box
 	e = gf_isom_full_box_get_size(s);
 	if (e) return e;
 
@@ -8377,11 +8625,11 @@
 	u32 i;
 	GF_Err e;
 	GF_SampleGroupBox *p = (GF_SampleGroupBox*)s;
-	
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs, p->grouping_type);
-	if (p->version==1) 
+	if (p->version==1)
 		gf_bs_write_u32(bs, p->grouping_type_parameter);
 
 	gf_bs_write_u32(bs, p->entry_count);
@@ -8436,6 +8684,14 @@
 		*total_bytes = 20;
 		return ptr;
 	}
+	case GF_4CC( 't', 'r', 'i', 'f' ):
+	{
+		u32 flags = gf_bs_peek_bits(bs, 24, 0);
+		flags &= 0x0000FF;
+		if (flags & 0x20) entry_size=9;
+		else entry_size=11;
+		//fallthrough
+	}
 	default:
 	{
 		GF_DefaultSampleGroupDescriptionEntry *ptr;
@@ -8486,12 +8742,14 @@
 		gf_bs_write_data(bs, (char *)((GF_CENCSampleEncryptionGroupEntry *)entry)->KID, 16);
 		return;
 	default:
-		{
+	{
 		GF_DefaultSampleGroupDescriptionEntry *ptr = (GF_DefaultSampleGroupDescriptionEntry *)entry;
 		gf_bs_write_data(bs, (char *) ptr->data, ptr->length);
-		}
+	}
 	}
 }
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
 static u32 sgpd_size_entry(u32 grouping_type, void *entry)
 {
 	switch (grouping_type) {
@@ -8505,6 +8763,7 @@
 		return ((GF_DefaultSampleGroupDescriptionEntry *)entry)->length;
 	}
 }
+#endif
 
 GF_Box *sgpd_New()
 {
@@ -8536,11 +8795,15 @@
 
 	p->grouping_type = gf_bs_read_u32(bs);
 	p->size -= 4;
-	
+
 	if (p->version==1) {
 		p->default_length = gf_bs_read_u32(bs);
 		p->size -= 4;
 	}
+	if (p->version>=2) {
+		p->default_description_index = gf_bs_read_u32(bs);
+		p->size -= 4;
+	}
 	entry_count = gf_bs_read_u32(bs);
 	p->size -= 4;
 
@@ -8573,6 +8836,7 @@
 
 	gf_bs_write_u32(bs, p->grouping_type);
 	if (p->version==1) gf_bs_write_u32(bs, p->default_length);
+	if (p->version>=2) gf_bs_write_u32(bs, p->default_description_index);
 	gf_bs_write_u32(bs, gf_list_count(p->group_descriptions) );
 
 	for (i=0; i<gf_list_count(p->group_descriptions); i++) {
@@ -8595,6 +8859,7 @@
 	if (e) return e;
 	p->size += 8;
 	if (p->version==1) p->size += 4;
+	if (p->version>=2) p->size += 4;
 	p->default_length = 0;
 
 	for (i=0; i<gf_list_count(p->group_descriptions); i++) {
@@ -8652,7 +8917,7 @@
 	ISOM_DECL_BOX_ALLOC(GF_SampleAuxiliaryInfoSizeBox, GF_ISOM_BOX_TYPE_SAIZ);
 	return (GF_Box *)tmp;
 }
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err saiz_Write(GF_Box *s, GF_BitStream *bs)
@@ -8739,7 +9004,7 @@
 	ISOM_DECL_BOX_ALLOC(GF_SampleAuxiliaryInfoOffsetBox, GF_ISOM_BOX_TYPE_SAIO);
 	return (GF_Box *)tmp;
 }
- 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err saio_Write(GF_Box *s, GF_BitStream *bs)
@@ -8823,7 +9088,7 @@
 
 GF_Box *prft_New()
 {
-	ISOM_DECL_BOX_ALLOC(GF_ProducerReferenceTimeBox, GF_ISOM_BOX_TYPE_PRFT);	
+	ISOM_DECL_BOX_ALLOC(GF_ProducerReferenceTimeBox, GF_ISOM_BOX_TYPE_PRFT);
 	gf_isom_full_box_init((GF_Box *)tmp);
 	return (GF_Box *)tmp;
 }

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_drm.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_code_drm.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -48,19 +48,19 @@
 {
 	GF_ProtectionInfoBox *ptr = (GF_ProtectionInfoBox *)s;
 	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_FRMA: 
+	case GF_ISOM_BOX_TYPE_FRMA:
 		if (ptr->original_format) return GF_ISOM_INVALID_FILE;
-		ptr->original_format = (GF_OriginalFormatBox*)a; 
+		ptr->original_format = (GF_OriginalFormatBox*)a;
 		break;
-	case GF_ISOM_BOX_TYPE_SCHM: 
+	case GF_ISOM_BOX_TYPE_SCHM:
 		if (ptr->scheme_type) return GF_ISOM_INVALID_FILE;
-		ptr->scheme_type = (GF_SchemeTypeBox*)a; 
+		ptr->scheme_type = (GF_SchemeTypeBox*)a;
 		break;
-	case GF_ISOM_BOX_TYPE_SCHI: 
+	case GF_ISOM_BOX_TYPE_SCHI:
 		if (ptr->info) return GF_ISOM_INVALID_FILE;
-		ptr->info = (GF_SchemeInformationBox*)a; 
+		ptr->info = (GF_SchemeInformationBox*)a;
 		break;
-	default: 
+	default:
 		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
@@ -524,7 +524,7 @@
 		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));
 		gf_bs_read_data(bs, ptr->TextualHeaders, ptr->TextualHeadersLen);
@@ -548,7 +548,7 @@
 	gf_bs_write_u8(bs, ptr->EncryptionMethod);
 	gf_bs_write_u8(bs, ptr->PaddingScheme);
 	gf_bs_write_u64(bs, ptr->PlaintextLength);
-	
+
 	cid_len = ptr->ContentID ? (u32) strlen(ptr->ContentID) : 0;
 	gf_bs_write_u16(bs, cid_len);
 	ri_len = ptr->RightsIssuerURL ? (u32) strlen(ptr->RightsIssuerURL) : 0;
@@ -613,7 +613,7 @@
 	ptr->GroupID = gf_malloc(sizeof(char)*(gid_len+1));
 	gf_bs_read_data(bs, ptr->GroupID, gid_len);
 	ptr->GroupID[gid_len]=0;
-	
+
 	ptr->GroupKey = (char *)gf_malloc(sizeof(char)*ptr->GKLength);
 	gf_bs_read_data(bs, ptr->GroupKey, ptr->GKLength);
 	ptr->size -= gid_len+ptr->GKLength;
@@ -949,13 +949,13 @@
 	if (ptr->version > 0) {
 		u32 i;
 		gf_bs_write_u32(bs, ptr->KID_count);
-		for (i=0; i<ptr->KID_count; i++) 
+		for (i=0; i<ptr->KID_count; i++)
 			gf_bs_write_data(bs, (char *) ptr->KIDs[i], 16);
 	}
 	if (ptr->private_data) {
 		gf_bs_write_u32(bs, ptr->private_data_size);
 		gf_bs_write_data(bs, (char *) ptr->private_data, ptr->private_data_size);
-	} else 
+	} else
 		gf_bs_write_u32(bs, 0);
 	return GF_OK;
 }
@@ -1398,7 +1398,7 @@
 			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
 			if (! sai->IV_size) continue;
 			ptr->size += sai->IV_size;
-			if (ptr->flags & 0x00000002) 
+			if (ptr->flags & 0x00000002)
 				ptr->size += 2 + 6*sai->subsample_count;
 		}
 	}
@@ -1427,16 +1427,16 @@
 {
 	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
 	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_AHDR: 
+	case GF_ISOM_BOX_TYPE_AHDR:
 		if (ptr->header) return GF_ISOM_INVALID_FILE;
-		ptr->header = (GF_AdobeDRMHeaderBox *)a; 
+		ptr->header = (GF_AdobeDRMHeaderBox *)a;
 		break;
-	case GF_ISOM_BOX_TYPE_ADAF: 
+	case GF_ISOM_BOX_TYPE_ADAF:
 		if (ptr->au_format) return GF_ISOM_INVALID_FILE;
-		ptr->au_format = (GF_AdobeDRMAUFormatBox *)a; 
+		ptr->au_format = (GF_AdobeDRMAUFormatBox *)a;
 		break;
 
-	default: 
+	default:
 		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
@@ -1506,12 +1506,12 @@
 {
 	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
 	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_APRM: 
+	case GF_ISOM_BOX_TYPE_APRM:
 		if (ptr->std_enc_params) return GF_ISOM_INVALID_FILE;
-		ptr->std_enc_params = (GF_AdobeStdEncryptionParamsBox *)a; 
+		ptr->std_enc_params = (GF_AdobeStdEncryptionParamsBox *)a;
 		break;
 
-	default: 
+	default:
 		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
@@ -1574,16 +1574,16 @@
 {
 	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
 	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_AHDR: 
+	case GF_ISOM_BOX_TYPE_AHDR:
 		if (ptr->enc_info) return GF_ISOM_INVALID_FILE;
-		ptr->enc_info = (GF_AdobeEncryptionInfoBox *)a; 
+		ptr->enc_info = (GF_AdobeEncryptionInfoBox *)a;
 		break;
-	case GF_ISOM_BOX_TYPE_ADAF: 
+	case GF_ISOM_BOX_TYPE_ADAF:
 		if (ptr->key_info) return GF_ISOM_INVALID_FILE;
-		ptr->key_info = (GF_AdobeKeyInfoBox *)a; 
+		ptr->key_info = (GF_AdobeKeyInfoBox *)a;
 		break;
 
-	default: 
+	default:
 		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
@@ -1718,11 +1718,11 @@
 {
 	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
 	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_FLXS: 
+	case GF_ISOM_BOX_TYPE_FLXS:
 		if (ptr->params) return GF_ISOM_INVALID_FILE;
-		ptr->params = (GF_AdobeFlashAccessParamsBox *)a; 
+		ptr->params = (GF_AdobeFlashAccessParamsBox *)a;
 		break;
-	default: 
+	default:
 		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
@@ -1817,7 +1817,7 @@
 	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox*)s;
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
-	if (ptr->metadata) 
+	if (ptr->metadata)
 		ptr->size += strlen(ptr->metadata) + 1;
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_meta.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_code_meta.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -52,36 +52,36 @@
 {
 	GF_MetaBox *ptr = (GF_MetaBox *)s;
 	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_HDLR: 
+	case GF_ISOM_BOX_TYPE_HDLR:
 		if (ptr->handler) return GF_ISOM_INVALID_FILE;
-		ptr->handler = (GF_HandlerBox*)a; 
+		ptr->handler = (GF_HandlerBox*)a;
 		break;
-	case GF_ISOM_BOX_TYPE_PITM: 
+	case GF_ISOM_BOX_TYPE_PITM:
 		if (ptr->primary_resource) return GF_ISOM_INVALID_FILE;
-		ptr->primary_resource = (GF_PrimaryItemBox*)a; 
+		ptr->primary_resource = (GF_PrimaryItemBox*)a;
 		break;
-	case GF_ISOM_BOX_TYPE_DINF: 
+	case GF_ISOM_BOX_TYPE_DINF:
 		if (ptr->file_locations) return GF_ISOM_INVALID_FILE;
-		ptr->file_locations = (GF_DataInformationBox*)a; 
+		ptr->file_locations = (GF_DataInformationBox*)a;
 		break;
-	case GF_ISOM_BOX_TYPE_ILOC: 
+	case GF_ISOM_BOX_TYPE_ILOC:
 		if (ptr->item_locations) return GF_ISOM_INVALID_FILE;
-		ptr->item_locations = (GF_ItemLocationBox*)a; 
+		ptr->item_locations = (GF_ItemLocationBox*)a;
 		break;
-	case GF_ISOM_BOX_TYPE_IPRO: 
+	case GF_ISOM_BOX_TYPE_IPRO:
 		if (ptr->protections) return GF_ISOM_INVALID_FILE;
-		ptr->protections = (GF_ItemProtectionBox*)a; 
+		ptr->protections = (GF_ItemProtectionBox*)a;
 		break;
-	case GF_ISOM_BOX_TYPE_IINF: 
+	case GF_ISOM_BOX_TYPE_IINF:
 		if (ptr->item_infos) return GF_ISOM_INVALID_FILE;
-		ptr->item_infos = (GF_ItemInfoBox*)a; 
+		ptr->item_infos = (GF_ItemInfoBox*)a;
 		break;
 	//case ???: ptr->IPMP_control = (???*)a; break;
-	case GF_ISOM_BOX_TYPE_XML: 
-	case GF_ISOM_BOX_TYPE_BXML: 
-	case GF_ISOM_BOX_TYPE_ILST: 
-	default: 
-		return gf_isom_box_add_default(s, a); 
+	case GF_ISOM_BOX_TYPE_XML:
+	case GF_ISOM_BOX_TYPE_BXML:
+	case GF_ISOM_BOX_TYPE_ILST:
+	default:
+		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
@@ -296,22 +296,28 @@
 	return (GF_Box *)tmp;
 }
 
+void iloc_entry_del(GF_ItemLocationEntry *location)
+{
+	u32 j, extent_count;
+	extent_count = gf_list_count(location->extent_entries);
+	for (j = 0; j < extent_count; j++) {
+		GF_ItemExtentEntry *extent = (GF_ItemExtentEntry *)gf_list_get(location->extent_entries, j);
+		gf_free(extent);
+	}
+	gf_list_del(location->extent_entries);
+	gf_free(location);
+}
+
 void iloc_del(GF_Box *s)
 {
-	u32 i, j, item_count, extent_count;
+	u32 i, item_count;
 	GF_ItemLocationBox *ptr = (GF_ItemLocationBox *)s;
 	if (ptr == NULL) return;
 	item_count = gf_list_count(ptr->location_entries);
 	if (item_count) {
 		for (i = 0; i < item_count; i++) {
 			GF_ItemLocationEntry *location = (GF_ItemLocationEntry *)gf_list_get(ptr->location_entries, i);
-			extent_count = gf_list_count(location->extent_entries);
-			for (j = 0; j < extent_count; j++) {
-				GF_ItemExtentEntry *extent = (GF_ItemExtentEntry *)gf_list_get(location->extent_entries, j);
-				gf_free(extent);
-			}
-			gf_list_del(location->extent_entries);
-			gf_free(location);
+			iloc_entry_del(location);
 		}
 		gf_list_del(ptr->location_entries);
 	}
@@ -424,7 +430,7 @@
 	GF_Err e;
 	GF_PrimaryItemBox *ptr = (GF_PrimaryItemBox *)s;
 	e = gf_isom_full_box_read(s, bs);
-	if (e) return e;	
+	if (e) return e;
 	ptr->item_ID = gf_bs_read_u16(bs);
 	return GF_OK;
 }
@@ -478,9 +484,9 @@
 GF_Err ipro_AddBox(GF_Box *s, GF_Box *a)
 {
 	GF_ItemProtectionBox *ptr = (GF_ItemProtectionBox *)s;
-	if (a->type == GF_ISOM_BOX_TYPE_SINF) 
+	if (a->type == GF_ISOM_BOX_TYPE_SINF)
 		return gf_list_add(ptr->protection_information, a);
-	else 
+	else
 		return gf_isom_box_add_default(s, a);
 }
 GF_Err ipro_Read(GF_Box *s, GF_BitStream *bs)
@@ -560,7 +566,7 @@
 	if (ptr == NULL) return GF_BAD_PARAM;
 	e = gf_isom_full_box_read(s, bs);
 	if (e) return e;
-	
+
 	ptr->item_ID = gf_bs_read_u16(bs);
 	ptr->item_protection_index = gf_bs_read_u16(bs);
 	ptr->size -= 4;
@@ -569,7 +575,7 @@
 	if (buf_len != gf_bs_read_data(bs, buf, buf_len)) {
 		gf_free(buf);
 		return GF_ISOM_INVALID_FILE;
-	} 
+	}
 	string_len = 1;
 	string_start = 0;
 	for (i = 0; i < buf_len; i++) {
@@ -674,8 +680,8 @@
 		if (ptr->size<a->size) return GF_ISOM_INVALID_FILE;
 
 		if (a->type == GF_ISOM_BOX_TYPE_INFE)
-			gf_list_add(ptr->item_infos, a); 
-		else 
+			gf_list_add(ptr->item_infos, a);
+		else
 			gf_isom_box_del(a);
 		count --;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_dump.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_dump.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -32,9 +32,13 @@
 
 static GF_Err apple_tag_dump(GF_Box *a, FILE * trace);
 
-void NullBoxErr(FILE * trace)
+void NullBoxErr(FILE * trace, u32 box_4cc)
 {
-	fprintf(trace, "\n");
+	if (box_4cc) {
+		fprintf(trace, "\n", gf_4cc_to_str(box_4cc) );
+	} else {
+		fprintf(trace, "\n");
+	}
 }
 
 void BadTopBoxErr(GF_Box *a, FILE * trace)
@@ -81,12 +85,12 @@
 	return GF_OK;
 }
 
-GF_Err gf_box_dump(void *ptr, FILE * trace)
+GF_Err gf_box_dump_ex(void *ptr, FILE * trace, u32 box_4cc)
 {
 	GF_Box *a = (GF_Box *) ptr;
 
 	if (!a) {
-		NullBoxErr(trace);
+		NullBoxErr(trace, box_4cc);
 		return GF_OK;
 	}
 
@@ -127,6 +131,8 @@
 		return urn_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_CPRT:
 		return cprt_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_KIND:
+		return kind_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_HDLR:
 		return hdlr_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_IODS:
@@ -188,17 +194,19 @@
 		return tref_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_MDIA:
 		return mdia_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_ELNG:
+		return elng_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_CHPL:
 		return chpl_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_PDIN:
 		return dpin_dump(a, trace);
-	case GF_ISOM_BOX_TYPE_SBGP: 
+	case GF_ISOM_BOX_TYPE_SBGP:
 		return sbgp_dump(a, trace);
-	case GF_ISOM_BOX_TYPE_SGPD: 
+	case GF_ISOM_BOX_TYPE_SGPD:
 		return sgpd_dump(a, trace);
-	case GF_ISOM_BOX_TYPE_SAIZ: 
+	case GF_ISOM_BOX_TYPE_SAIZ:
 		return saiz_dump(a, trace);
-	case GF_ISOM_BOX_TYPE_SAIO: 
+	case GF_ISOM_BOX_TYPE_SAIO:
 		return saio_dump(a, trace);
 
 	case GF_ISOM_BOX_TYPE_RTP_STSD:
@@ -252,9 +260,9 @@
 	case GF_ISOM_BOX_TYPE_NAME:
 		return name_dump(a, trace);
 
-	case GF_ISOM_BOX_TYPE_FTYP: 
-	case GF_ISOM_BOX_TYPE_STYP: 
-        return ftyp_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_FTYP:
+	case GF_ISOM_BOX_TYPE_STYP:
+		return ftyp_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_PADB:
 		return padb_dump(a, trace);
 
@@ -265,6 +273,8 @@
 		return mehd_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_TREX:
 		return trex_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_TREP:
+		return trep_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_MOOF:
 		return moof_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_MFHD:
@@ -276,9 +286,9 @@
 	case GF_ISOM_BOX_TYPE_TRUN:
 		return trun_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_TFDT:
-		return tfdt_dump(a, trace);		
+		return tfdt_dump(a, trace);
 #endif
-	
+
 	case GF_ISOM_BOX_TYPE_SUBS:
 		return subs_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_RVCC:
@@ -304,34 +314,35 @@
 	case GF_ISOM_BOX_TYPE_D263:
 		return gppc_dump(a, trace);
 
-	case GF_ISOM_BOX_TYPE_AVCC: 
-	case GF_ISOM_BOX_TYPE_SVCC: 
+	case GF_ISOM_BOX_TYPE_AVCC:
+	case GF_ISOM_BOX_TYPE_SVCC:
 		return avcc_dump(a, trace);
-	case GF_ISOM_BOX_TYPE_HVCC: 
-	case GF_ISOM_BOX_TYPE_SHCC: 
+	case GF_ISOM_BOX_TYPE_HVCC:
+	case GF_ISOM_BOX_TYPE_SHCC:
 		return hvcc_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_BTRT:
 		return btrt_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_M4DS:
 		return m4ds_dump(a, trace);
-	case GF_ISOM_BOX_TYPE_AVC1: 
-	case GF_ISOM_BOX_TYPE_AVC2: 
+	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_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	case GF_ISOM_BOX_TYPE_SVC1:
+	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_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		return mp4v_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_PASP:
 		return pasp_dump(a, trace);
 
 	case GF_ISOM_BOX_TYPE_FTAB:
 		return ftab_dump(a, trace);
-	case GF_ISOM_BOX_TYPE_TX3G: 
+	case GF_ISOM_BOX_TYPE_TX3G:
 		return tx3g_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_TEXT:
 		return text_dump(a, trace);
@@ -483,17 +494,20 @@
 
 	case GF_ISOM_BOX_TYPE_UUID:
 		switch ( ((GF_UnknownUUIDBox *)a)->internal_4cc) {
-		case GF_ISOM_BOX_UUID_TENC: return piff_tenc_dump(a, trace);
-		case GF_ISOM_BOX_UUID_PSEC: return piff_psec_dump(a, trace);
-		case GF_ISOM_BOX_UUID_PSSH: return piff_pssh_dump(a, trace);
-		case GF_ISOM_BOX_UUID_TFRF: 
-		case GF_ISOM_BOX_UUID_TFXD: 
+		case GF_ISOM_BOX_UUID_TENC:
+			return piff_tenc_dump(a, trace);
+		case GF_ISOM_BOX_UUID_PSEC:
+			return piff_psec_dump(a, trace);
+		case GF_ISOM_BOX_UUID_PSSH:
+			return piff_pssh_dump(a, trace);
+		case GF_ISOM_BOX_UUID_TFRF:
+		case GF_ISOM_BOX_UUID_TFXD:
 		default:
 			return defa_dump(a, trace);
 		}
 #ifndef GPAC_DISABLE_TTXT
-	case GF_ISOM_BOX_TYPE_STSE:
-		return stse_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_STXT:
+		return stxt_dump(a, trace);
 
 	case GF_ISOM_BOX_TYPE_STTC:
 	case GF_ISOM_BOX_TYPE_VTTC:
@@ -501,6 +515,7 @@
 	case GF_ISOM_BOX_TYPE_IDEN:
 	case GF_ISOM_BOX_TYPE_STTG:
 	case GF_ISOM_BOX_TYPE_PAYL:
+	case GF_ISOM_BOX_TYPE_VTTA:
 		return boxstring_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_VTCU:
 		return vtcu_dump(a, trace);
@@ -515,7 +530,7 @@
 		return metx_dump(a, trace);
 #endif
 
-		/*Adobe's protection boxes*/
+	/*Adobe's protection boxes*/
 	case GF_ISOM_BOX_TYPE_ADKM:
 		return adkm_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_AHDR:
@@ -530,12 +545,18 @@
 		return akey_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_FLXS:
 		return flxs_dump(a, trace);
-			
-	default: 
+
+	default:
 		return defa_dump(a, trace);
 	}
 }
 
+
+GF_Err gf_box_dump(void *ptr, FILE * trace)
+{
+	return gf_box_dump_ex(ptr, trace, 0);
+}
+
 GF_Err gf_box_array_dump(GF_List *list, FILE * trace)
 {
 	u32 i;
@@ -553,7 +574,7 @@
 	if (ptr && ptr->other_boxes) {
 		gf_box_array_dump(ptr->other_boxes, trace);
 	}
-	if (name) 
+	if (name)
 		fprintf(trace, "</%s>\n", name);
 }
 
@@ -625,11 +646,21 @@
 	p->type = p->reference_type;
 
 	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_HINT: s = "Hint"; break;
-	case GF_ISOM_BOX_TYPE_DPND: s = "Stream"; break;
-	case GF_ISOM_BOX_TYPE_MPOD: s = "OD"; break;
-	case GF_ISOM_BOX_TYPE_SYNC: s = "Sync"; break;
-	case GF_ISOM_BOX_TYPE_CHAP: s = "Chapter"; break;
+	case GF_ISOM_BOX_TYPE_HINT:
+		s = "Hint";
+		break;
+	case GF_ISOM_BOX_TYPE_DPND:
+		s = "Stream";
+		break;
+	case GF_ISOM_BOX_TYPE_MPOD:
+		s = "OD";
+		break;
+	case GF_ISOM_BOX_TYPE_SYNC:
+		s = "Sync";
+		break;
+	case GF_ISOM_BOX_TYPE_CHAP:
+		s = "Chapter";
+		break;
 	default:
 		s = (char *) gf_4cc_to_str(a->type);
 		break;
@@ -677,7 +708,7 @@
 
 	if (p->iods) gf_box_dump(p->iods, trace);
 	if (p->meta) gf_box_dump(p->meta, trace);
-	gf_box_dump(p->mvhd, trace);
+	gf_box_dump_ex(p->mvhd, trace,GF_ISOM_BOX_TYPE_MVHD);
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (p->mvex) gf_box_dump(p->mvex, trace);
@@ -781,15 +812,15 @@
 	fprintf(trace, "<SampleTableBox>\n");
 	DumpBox(a, trace);
 
-	gf_box_dump(p->SampleDescription, trace);
-	gf_box_dump(p->TimeToSample, trace);
+	gf_box_dump_ex(p->SampleDescription, trace, GF_ISOM_BOX_TYPE_STSD);
+	gf_box_dump_ex(p->TimeToSample, trace, GF_ISOM_BOX_TYPE_STTS);
 	if (p->CompositionOffset) gf_box_dump(p->CompositionOffset, trace);
 	if (p->CompositionToDecode) gf_box_dump(p->CompositionToDecode, trace);
 	if (p->SyncSample) gf_box_dump(p->SyncSample, trace);
 	if (p->ShadowSync) gf_box_dump(p->ShadowSync, trace);
-	gf_box_dump(p->SampleToChunk, trace);
-	gf_box_dump(p->SampleSize, trace);
-	gf_box_dump(p->ChunkOffset, trace);
+	gf_box_dump_ex(p->SampleToChunk, trace, GF_ISOM_BOX_TYPE_STSC);
+	gf_box_dump_ex(p->SampleSize, trace, GF_ISOM_BOX_TYPE_STSZ);
+	gf_box_dump_ex(p->ChunkOffset, trace, GF_ISOM_BOX_TYPE_STCO);
 	if (p->DegradationPriority) gf_box_dump(p->DegradationPriority, trace);
 	if (p->SampleDep) gf_box_dump(p->SampleDep, trace);
 	if (p->PaddingBits) gf_box_dump(p->PaddingBits, trace);
@@ -812,7 +843,7 @@
 			gf_box_dump(saio, trace);
 		}
 	}
-	
+
 	gf_box_dump_done("SampleTableBox", a, trace);
 	return GF_OK;
 }
@@ -823,7 +854,7 @@
 	p = (GF_DataInformationBox *)a;
 	fprintf(trace, "<DataInformationBox>");
 	DumpBox(a, trace);
-	gf_box_dump(p->dref, trace);
+	gf_box_dump_ex(p->dref, trace, GF_ISOM_BOX_TYPE_DREF);
 	gf_box_dump_done("DataInformationBox", a, trace);
 	return GF_OK;
 }
@@ -878,6 +909,18 @@
 	return GF_OK;
 }
 
+GF_Err kind_dump(GF_Box *a, FILE * trace)
+{
+	GF_KindBox *p;
+
+	p = (GF_KindBox *)a;
+	fprintf(trace, "<KindBox schemeURI=\"%s\" value=\"%s\">\n", p->schemeURI, (p->value ? p->value : ""));
+	DumpBox(a, trace);
+	gf_full_box_dump(a, trace);
+	gf_box_dump_done("KindBox", a, trace);
+	return GF_OK;
+}
+
 
 static char *format_duration(u64 dur, u32 timescale, char *szDur)
 {
@@ -894,6 +937,15 @@
 	return szDur;
 }
 
+static void dump_escape_string(FILE * trace, char *name)
+{
+	u32 i, len = (u32) strlen(name);
+	for (i=0; i<len; i++) {
+		if (name[i]=='"') fprintf(trace, "&quot;");
+		else fputc(name[i], trace);
+	}
+}
+
 GF_Err chpl_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, count;
@@ -906,7 +958,9 @@
 	count = gf_list_count(p->list);
 	for (i=0; i<count; i++) {
 		GF_ChapterEntry *ce = (GF_ChapterEntry *)gf_list_get(p->list, i);
-		fprintf(trace, "<Chapter name=\"%s\" startTime=\"%s\" />\n", ce->name, format_duration(ce->start_time, 1000*10000, szDur));
+		fprintf(trace, "<Chapter name=\"");
+		dump_escape_string(trace, ce->name);
+		fprintf(trace, "\" startTime=\"%s\" />\n", format_duration(ce->start_time, 1000*10000, szDur));
 	}
 
 	gf_box_dump_done("ChapterListBox", a, trace);
@@ -1097,7 +1151,7 @@
 {
 	GF_GenericVisualSampleEntryBox *p = (GF_GenericVisualSampleEntryBox *)a;
 	fprintf(trace, "<VisualSampleDescriptionBox 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);
+	        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);
 	a->type = p->EntryType;
 	DumpBox(a, trace);
 	a->type = GF_ISOM_BOX_TYPE_GNRV;
@@ -1109,7 +1163,7 @@
 {
 	GF_GenericAudioSampleEntryBox *p = (GF_GenericAudioSampleEntryBox *)a;
 	fprintf(trace, "<AudioSampleDescriptionBox 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);
+	        p->dataReferenceIndex, p->version, p->revision, p->vendor, p->channel_count, p->bitspersample, p->samplerate_hi);
 	a->type = p->EntryType;
 	DumpBox(a, trace);
 	a->type = GF_ISOM_BOX_TYPE_GNRA;
@@ -1124,7 +1178,7 @@
 	p = (GF_EditBox *)a;
 	fprintf(trace, "<EditBox>\n");
 	DumpBox(a, trace);
-	gf_box_dump(p->editList, trace);
+	gf_box_dump_ex(p->editList, trace, GF_ISOM_BOX_TYPE_ELST);
 	gf_box_dump_done("EditBox", a, trace);
 	return GF_OK;
 }
@@ -1199,7 +1253,7 @@
 	gf_full_box_dump(a, trace);
 
 	nb_samples = 0;
-	for (i=0; i<p->nb_entries;i++) {
+	for (i=0; i<p->nb_entries; i++) {
 		fprintf(trace, "<CompositionOffsetEntry CompositionOffset=\"%d\" SampleCount=\"%d\"/>\n", p->entries[i].decodingOffset, p->entries[i].sampleCount);
 		nb_samples += p->entries[i].sampleCount;
 	}
@@ -1394,22 +1448,46 @@
 			u8 flag = p->sample_info[i];
 			fprintf(trace, "<SampleDependencyEntry ");
 			switch ( (flag >> 4) & 3) {
-			case 0: fprintf(trace, "dependsOnOther=\"unknown\" "); break;
-			case 1: fprintf(trace, "dependsOnOther=\"yes\" "); break;
-			case 2: fprintf(trace, "dependsOnOther=\"no\" "); break;
-			case 3: fprintf(trace, "dependsOnOther=\"!! RESERVED !!\" "); break;
+			case 0:
+				fprintf(trace, "dependsOnOther=\"unknown\" ");
+				break;
+			case 1:
+				fprintf(trace, "dependsOnOther=\"yes\" ");
+				break;
+			case 2:
+				fprintf(trace, "dependsOnOther=\"no\" ");
+				break;
+			case 3:
+				fprintf(trace, "dependsOnOther=\"!! RESERVED !!\" ");
+				break;
 			}
 			switch ( (flag >> 2) & 3) {
-			case 0: fprintf(trace, "dependedOn=\"unknown\" "); break;
-			case 1: fprintf(trace, "dependedOn=\"yes\" "); break;
-			case 2: fprintf(trace, "dependedOn=\"no\" "); break;
-			case 3: fprintf(trace, "dependedOn=\"!! RESERVED !!\" "); break;
+			case 0:
+				fprintf(trace, "dependedOn=\"unknown\" ");
+				break;
+			case 1:
+				fprintf(trace, "dependedOn=\"yes\" ");
+				break;
+			case 2:
+				fprintf(trace, "dependedOn=\"no\" ");
+				break;
+			case 3:
+				fprintf(trace, "dependedOn=\"!! RESERVED !!\" ");
+				break;
 			}
 			switch ( flag & 3) {
-			case 0: fprintf(trace, "hasRedundancy=\"unknown\" "); break;
-			case 1: fprintf(trace, "hasRedundancy=\"yes\" "); break;
-			case 2: fprintf(trace, "hasRedundancy=\"no\" "); break;
-			case 3: fprintf(trace, "hasRedundancy=\"!! RESERVED !!\" "); break;
+			case 0:
+				fprintf(trace, "hasRedundancy=\"unknown\" ");
+				break;
+			case 1:
+				fprintf(trace, "hasRedundancy=\"yes\" ");
+				break;
+			case 2:
+				fprintf(trace, "hasRedundancy=\"no\" ");
+				break;
+			case 3:
+				fprintf(trace, "hasRedundancy=\"!! RESERVED !!\" ");
+				break;
 			}
 			fprintf(trace, " />\n");
 		}
@@ -1468,9 +1546,9 @@
 	fprintf(trace, "<MediaInformationBox>\n");
 	DumpBox(a, trace);
 
-	gf_box_dump(p->InfoHeader, trace);
-	gf_box_dump(p->dataInformation, trace);
-	gf_box_dump(p->sampleTable, trace);
+	gf_box_dump_ex(p->InfoHeader, trace, GF_ISOM_BOX_TYPE_NMHD);
+	gf_box_dump_ex(p->dataInformation, trace, GF_ISOM_BOX_TYPE_DINF);
+	gf_box_dump_ex(p->sampleTable, trace, GF_ISOM_BOX_TYPE_STBL);
 	gf_box_dump_done("MediaInformationBox", a, trace);
 	return GF_OK;
 }
@@ -1482,7 +1560,7 @@
 	fprintf(trace, "<TrackHeaderBox ");
 
 	fprintf(trace, "CreationTime=\""LLD"\" ModificationTime=\""LLD"\" TrackID=\"%u\" Duration=\""LLD"\"",
-		LLD_CAST p->creationTime, LLD_CAST p->modificationTime, p->trackID, LLD_CAST p->duration);
+	        LLD_CAST p->creationTime, LLD_CAST p->modificationTime, p->trackID, LLD_CAST p->duration);
 
 	if (p->alternate_group) fprintf(trace, " AlternateGroupID=\"%d\"", p->alternate_group);
 	if (p->volume) {
@@ -1496,9 +1574,9 @@
 		fprintf(trace, "<Matrix m11=\"0x%.8x\" m12=\"0x%.8x\" m13=\"0x%.8x\" \
 								m21=\"0x%.8x\" m22=\"0x%.8x\" m23=\"0x%.8x\" \
 								m31=\"0x%.8x\" m32=\"0x%.8x\" m33=\"0x%.8x\"/>",
-								p->matrix[0], p->matrix[1], p->matrix[2],
-								p->matrix[3], p->matrix[4], p->matrix[5],
-								p->matrix[6], p->matrix[7], p->matrix[8]);
+		        p->matrix[0], p->matrix[1], p->matrix[2],
+		        p->matrix[3], p->matrix[4], p->matrix[5],
+		        p->matrix[6], p->matrix[7], p->matrix[8]);
 	}
 	DumpBox(a, trace);
 	gf_full_box_dump(a, trace);
@@ -1521,13 +1599,22 @@
 	GF_MediaBox *p = (GF_MediaBox *)a;
 	fprintf(trace, "<MediaBox>\n");
 	DumpBox(a, trace);
-	gf_box_dump(p->mediaHeader, trace);
-	gf_box_dump(p->handler, trace);
-	gf_box_dump(p->information, trace);
+	gf_box_dump_ex(p->mediaHeader, trace, GF_ISOM_BOX_TYPE_MDHD);
+	gf_box_dump_ex(p->handler, trace,GF_ISOM_BOX_TYPE_HDLR);
+	gf_box_dump_ex(p->information, trace, GF_ISOM_BOX_TYPE_MINF);
 	gf_box_dump_done("MediaBox", a, trace);
 	return GF_OK;
 }
 
+GF_Err elng_dump(GF_Box *a, FILE * trace)
+{
+	GF_ExtendedLanguageBox *p = (GF_ExtendedLanguageBox *)a;
+	fprintf(trace, "<ExtendedLanguageBox LanguageCode=\"%s\">\n", p->extended_language);
+	DumpBox(a, trace);
+	gf_box_dump_done("ExtendedLanguageBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err defa_dump(GF_Box *a, FILE * trace)
 {
 	fprintf(trace, "<UnknownBox>\n");
@@ -1548,7 +1635,7 @@
 	u32 i;
 
 	p = (GF_FileTypeBox *)a;
-    fprintf(trace, "<%s MajorBrand=\"%s\" MinorVersion=\"%d\">\n", (a->type == GF_ISOM_BOX_TYPE_FTYP ? "FileTypeBox" : "SegmentTypeBox"), gf_4cc_to_str(p->majorBrand), p->minorVersion);
+	fprintf(trace, "<%s MajorBrand=\"%s\" MinorVersion=\"%d\">\n", (a->type == GF_ISOM_BOX_TYPE_FTYP ? "FileTypeBox" : "SegmentTypeBox"), gf_4cc_to_str(p->majorBrand), p->minorVersion);
 	DumpBox(a, trace);
 
 	for (i=0; i<p->altCount; i++) {
@@ -1589,7 +1676,7 @@
 	for (i=0; i<count; i++) {
 		ent = (GF_StsfEntry *)gf_list_get(p->entryList, i);
 		fprintf(trace, "<SampleFragmentEntry SampleNumber=\"%d\" FragmentCount=\"%d\">\n", ent->SampleNumber, ent->fragmentCount);
-		for (j=0;j<ent->fragmentCount;j++) fprintf(trace, "<FragmentSizeEntry size=\"%d\"/>\n", ent->fragmentSizes[j]);
+		for (j=0; j<ent->fragmentCount; j++) fprintf(trace, "<FragmentSizeEntry size=\"%d\"/>\n", ent->fragmentSizes[j]);
 		fprintf(trace, "</SampleFragmentEntry>\n");
 	}
 
@@ -1603,12 +1690,24 @@
 	char *szName;
 	GF_3GPPAudioSampleEntryBox *p = (GF_3GPPAudioSampleEntryBox *)a;
 	switch (p->type) {
-	case GF_ISOM_SUBTYPE_3GP_AMR: szName = "AMRSampleDescription"; break;
-	case GF_ISOM_SUBTYPE_3GP_AMR_WB: szName = "AMR_WB_SampleDescription"; break;
-	case GF_ISOM_SUBTYPE_3GP_EVRC: szName = "EVRCSampleDescription"; break;
-	case GF_ISOM_SUBTYPE_3GP_QCELP: szName = "QCELPSampleDescription"; break;
-	case GF_ISOM_SUBTYPE_3GP_SMV: szName = "SMVSampleDescription"; break;
-	default: szName = "3GPAudioSampleDescription"; break;
+	case GF_ISOM_SUBTYPE_3GP_AMR:
+		szName = "AMRSampleDescription";
+		break;
+	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
+		szName = "AMR_WB_SampleDescription";
+		break;
+	case GF_ISOM_SUBTYPE_3GP_EVRC:
+		szName = "EVRCSampleDescription";
+		break;
+	case GF_ISOM_SUBTYPE_3GP_QCELP:
+		szName = "QCELPSampleDescription";
+		break;
+	case GF_ISOM_SUBTYPE_3GP_SMV:
+		szName = "SMVSampleDescription";
+		break;
+	default:
+		szName = "3GPAudioSampleDescription";
+		break;
 	}
 	fprintf(trace, "<%sBox", szName);
 	base_audio_entry_dump((GF_AudioSampleEntryBox *)p, trace);
@@ -1631,8 +1730,12 @@
 	GF_3GPPVisualSampleEntryBox *p = (GF_3GPPVisualSampleEntryBox *)a;
 
 	switch (p->type) {
-	case GF_ISOM_SUBTYPE_3GP_H263: szName = "H263SampleDescription"; break;
-	default: szName = "3GPVisualSampleDescription"; break;
+	case GF_ISOM_SUBTYPE_3GP_H263:
+		szName = "H263SampleDescription";
+		break;
+	default:
+		szName = "3GPVisualSampleDescription";
+		break;
 	}
 	fprintf(trace, "<%sBox", szName);
 	base_visual_entry_dump((GF_VisualSampleEntryBox *)p, trace);
@@ -1698,9 +1801,9 @@
 	fprintf(trace, "<%sConfigurationBox>\n", name);
 
 	fprintf(trace, "<%sDecoderConfigurationRecord configurationVersion=\"%d\" AVCProfileIndication=\"%d\" profile_compatibility=\"%d\" AVCLevelIndication=\"%d\" nal_unit_size=\"%d\"",
-					name, p->config->configurationVersion, p->config->AVCProfileIndication, p->config->profile_compatibility, p->config->AVCLevelIndication, p->config->nal_unit_size);
+	        name, 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) 
+	if (p->type==GF_ISOM_BOX_TYPE_SVCC)
 		fprintf(trace, " complete_representation=\"%d\"", p->config->complete_representation);
 
 	if (p->type==GF_ISOM_BOX_TYPE_AVCC) {
@@ -1773,7 +1876,7 @@
 	fprintf(trace, "parallelismType=\"%d\" ", p->config->parallelismType);
 
 	fprintf(trace, "chroma_format=\"%d\" luma_bit_depth=\"%d\" chroma_bit_depth=\"%d\" avgFrameRate=\"%d\" constantFrameRate=\"%d\" numTemporalLayers=\"%d\" temporalIdNested=\"%d\"",
-		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);
+	        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);
 
 	if (p->config->is_shvc) {
 		fprintf(trace, " completeRepresentation=\"%d\" nonHEVCBaseLayer=\"%d\" numLayers=\"%d\" scalabilityMask=\"0x%02X\" ", p->config->complete_representation, p->config->non_hevc_base_layer, p->config->num_layers, p->config->scalability_mask);
@@ -1869,7 +1972,7 @@
 		if (rec->style_flags & 4) fprintf(trace, "Underlined ");
 	}
 	fprintf(trace, "\" fontSize=\"%d\" ", rec->font_size);
-	gpp_dump_rgba8(trace, "text-color", rec->text_color);
+	gpp_dump_rgba8(trace, "textColor", rec->text_color);
 	fprintf(trace, "/>\n");
 }
 
@@ -1877,9 +1980,9 @@
 {
 	GF_Tx3gSampleEntryBox *p = (GF_Tx3gSampleEntryBox *)a;
 	fprintf(trace, "<Tx3gSampleEntryBox dataReferenceIndex=\"%d\" displayFlags=\"%x\" horizontal-justification=\"%d\" vertical-justification=\"%d\" ",
-			p->dataReferenceIndex, p->displayFlags, p->horizontal_justification, p->vertical_justification);
+	        p->dataReferenceIndex, p->displayFlags, p->horizontal_justification, p->vertical_justification);
 
-	gpp_dump_rgba8(trace, "background-color", p->back_color);
+	gpp_dump_rgba8(trace, "backgroundColor", p->back_color);
 	fprintf(trace, ">\n");
 	DumpBox(a, trace);
 
@@ -1889,7 +1992,7 @@
 	fprintf(trace, "<DefaultStyle>\n");
 	gpp_dump_style(trace, &p->default_style);
 	fprintf(trace, "</DefaultStyle>\n");
-	gf_box_dump(p->font_table, trace);
+	gf_box_dump_ex(p->font_table, trace, GF_ISOM_BOX_TYPE_FTAB);
 	gf_box_dump_done("Tx3gSampleEntryBox", a, trace);
 	return GF_OK;
 }
@@ -1898,11 +2001,11 @@
 {
 	GF_TextSampleEntryBox *p = (GF_TextSampleEntryBox *)a;
 	fprintf(trace, "<TextSampleEntryBox dataReferenceIndex=\"%d\" displayFlags=\"%x\" textJustification=\"%d\"  ",
-			p->dataReferenceIndex, p->displayFlags, p->textJustification);
+	        p->dataReferenceIndex, p->displayFlags, p->textJustification);
 	if (p->textName)
-		fprintf(trace, "textName=%s ", p->textName);
+		fprintf(trace, "textName=\"%s\" ", p->textName);
 	gpp_dump_rgb16(trace, "background-color", p->background_color);
-	gpp_dump_rgb16(trace, "foreground-color", p->foreground_color);
+	gpp_dump_rgb16(trace, " foreground-color", p->foreground_color);
 	fprintf(trace, ">\n");
 	DumpBox(a, trace);
 
@@ -2092,7 +2195,7 @@
 	DumpBox(a, trace);
 	gf_full_box_dump(a, trace);
 	count = gf_list_count(p->location_entries);
-	for (i=0;i<count;i++) {
+	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"\" />\n", ie->item_ID, ie->data_reference_index, LLD_CAST ie->base_offset);
@@ -2339,7 +2442,7 @@
 
 	p = (GF_HintSampleEntryBox *)a;
 	fprintf(trace, "<GenericHintSampleEntryBox EntrySubType=\"%s\" DataReferenceIndex=\"%d\" HintTrackVersion=\"%d\" LastCompatibleVersion=\"%d\" MaxPacketSize=\"%d\">\n",
-		gf_4cc_to_str(p->type), p->dataReferenceIndex, p->HintTrackVersion, p->LastCompatibleVersion, p->MaxPacketSize);
+	        gf_4cc_to_str(p->type), p->dataReferenceIndex, p->HintTrackVersion, p->LastCompatibleVersion, p->MaxPacketSize);
 
 	DumpBox(a, trace);
 	gf_box_array_dump(p->HintDataTable, trace);
@@ -2409,6 +2512,7 @@
 	DumpBox(a, trace);
 	if (p->mehd) gf_box_dump(p->mehd, trace);
 	gf_box_array_dump(p->TrackExList, trace);
+	gf_box_array_dump(p->TrackExPropList, trace);
 	gf_box_dump_done("MovieExtendsBox", a, trace);
 	return GF_OK;
 }
@@ -2452,6 +2556,16 @@
 	return GF_OK;
 }
 
+GF_Err trep_dump(GF_Box *a, FILE * trace)
+{
+	GF_TrackExtensionPropertiesBox *p = (GF_TrackExtensionPropertiesBox*)a;
+	fprintf(trace, "<TrackExtensionPropertiesBox TrackID=\"%d\">\n", p->trackID);
+	DumpBox(a, trace);
+	gf_full_box_dump(a, trace);
+	gf_box_dump_done("TrackExtensionPropertiesBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err moof_dump(GF_Box *a, FILE * trace)
 {
 	GF_MovieFragmentBox *p;
@@ -2503,8 +2617,8 @@
 static void frag_dump_sample_flags(FILE * trace, u32 flags)
 {
 	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_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));
 }
 
 
@@ -2610,12 +2724,12 @@
 		case 2:
 			s_p = (GF_SampleDTE *) p;
 			fprintf(trace, "<SampleDataEntry DataSize=\"%d\" SampleOffset=\"%d\" SampleNumber=\"%d\" TrackReference=\"%d\"/>\n",
-				s_p->dataLength, s_p->byteOffset, s_p->sampleNumber, s_p->trackRefIndex);
+			        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",
-				sd_p->dataLength, sd_p->byteOffset, sd_p->streamDescIndex, sd_p->trackRefIndex);
+			        sd_p->dataLength, sd_p->byteOffset, sd_p->streamDescIndex, sd_p->trackRefIndex);
 			break;
 		default:
 			fprintf(trace, "<UnknownTableEntry/>\n");
@@ -2672,10 +2786,10 @@
 		pck = (GF_RTPPacket *)gf_list_get(s->packetTable, i);
 
 		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);
+		        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",
-			pck->SequenceNumber, pck->R_bit, pck->B_bit, pck->relativeTransTime, gf_isom_hint_rtp_length(pck));
+		        pck->SequenceNumber, pck->R_bit, pck->B_bit, pck->relativeTransTime, gf_isom_hint_rtp_length(pck));
 
 
 		//TLV is made of Boxes
@@ -2788,8 +2902,8 @@
 	txt = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, 0);
 	switch (txt->type) {
 	case GF_ISOM_BOX_TYPE_TX3G:
-		break;
 	case GF_ISOM_BOX_TYPE_TEXT:
+		break;
 	case GF_ISOM_BOX_TYPE_STPP:
 	case GF_ISOM_BOX_TYPE_SBTT:
 	default:
@@ -2810,61 +2924,121 @@
 	for (i=0; i<nb_descs; i++) {
 		GF_Tx3gSampleEntryBox *txt = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
 
-		fprintf(dump, "<TextSampleDescription horizontalJustification=\"");
-		switch (txt->horizontal_justification) {
-		case 1: fprintf(dump, "center"); break;
-		case -1: fprintf(dump, "right"); break;
-		default: fprintf(dump, "left"); break;
-		}
-		fprintf(dump, "\" verticalJustification=\"");
-		switch (txt->vertical_justification) {
-		case 1: fprintf(dump, "center"); break;
-		case -1: fprintf(dump, "bottom"); break;
-		default: fprintf(dump, "top"); break;
-		}
-		fprintf(dump, "\" ");
-		gpp_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");
-		has_scroll = 0;
-		if (txt->displayFlags & GF_TXT_SCROLL_IN) {
-			has_scroll = 1;
-			if (txt->displayFlags & GF_TXT_SCROLL_OUT) fprintf(dump, " scroll=\"InOut\"");
-			else fprintf(dump, " scroll=\"In\"");
-		} else if (txt->displayFlags & GF_TXT_SCROLL_OUT) {
-			has_scroll = 1;
-			fprintf(dump, " scroll=\"Out\"");
+		if (txt->type==GF_ISOM_BOX_TYPE_TX3G) {
+			fprintf(dump, "<TextSampleDescription horizontalJustification=\"");
+			switch (txt->horizontal_justification) {
+			case 1:
+				fprintf(dump, "center");
+				break;
+			case -1:
+				fprintf(dump, "right");
+				break;
+			default:
+				fprintf(dump, "left");
+				break;
+			}
+			fprintf(dump, "\" verticalJustification=\"");
+			switch (txt->vertical_justification) {
+			case 1:
+				fprintf(dump, "center");
+				break;
+			case -1:
+				fprintf(dump, "bottom");
+				break;
+			default:
+				fprintf(dump, "top");
+				break;
+			}
+			fprintf(dump, "\" ");
+			gpp_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");
+			has_scroll = 0;
+			if (txt->displayFlags & GF_TXT_SCROLL_IN) {
+				has_scroll = 1;
+				if (txt->displayFlags & GF_TXT_SCROLL_OUT) fprintf(dump, " scroll=\"InOut\"");
+				else fprintf(dump, " scroll=\"In\"");
+			} else if (txt->displayFlags & GF_TXT_SCROLL_OUT) {
+				has_scroll = 1;
+				fprintf(dump, " scroll=\"Out\"");
+			} else {
+				fprintf(dump, " scroll=\"None\"");
+			}
+			if (has_scroll) {
+				u32 mode = (txt->displayFlags & GF_TXT_SCROLL_DIRECTION)>>7;
+				switch (mode) {
+				case GF_TXT_SCROLL_CREDITS:
+					fprintf(dump, " scrollMode=\"Credits\"");
+					break;
+				case GF_TXT_SCROLL_MARQUEE:
+					fprintf(dump, " scrollMode=\"Marquee\"");
+					break;
+				case GF_TXT_SCROLL_DOWN:
+					fprintf(dump, " scrollMode=\"Down\"");
+					break;
+				case GF_TXT_SCROLL_RIGHT:
+					fprintf(dump, " scrollMode=\"Right\"");
+					break;
+				default:
+					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);
+
+				}
+			}
+			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;
+			}
+			gpp_dump_box_nobox(dump, &txt->default_box);
+			gpp_dump_style_nobox(dump, &txt->default_style, NULL, 0);
+			fprintf(dump, "</TextSampleDescription>\n");
 		} else {
-			fprintf(dump, " scroll=\"None\"");
-		}
-		if (has_scroll) {
-			u32 mode = (txt->displayFlags & GF_TXT_SCROLL_DIRECTION)>>7;
-			switch (mode) {
-			case GF_TXT_SCROLL_CREDITS: fprintf(dump, " scrollMode=\"Credits\""); break;
-			case GF_TXT_SCROLL_MARQUEE: fprintf(dump, " scrollMode=\"Marquee\""); break;
-			case GF_TXT_SCROLL_DOWN: fprintf(dump, " scrollMode=\"Down\""); break;
-			case GF_TXT_SCROLL_RIGHT: fprintf(dump, " scrollMode=\"Right\""); break;
-			default: fprintf(dump, " scrollMode=\"Unknown\""); break;
+			GF_TextSampleEntryBox *text = (GF_TextSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
+			fprintf(dump, "<TextSampleDescription horizontalJustification=\"");
+			switch (text->textJustification) {
+			case 1:
+				fprintf(dump, "center");
+				break;
+			case -1:
+				fprintf(dump, "right");
+				break;
+			default:
+				fprintf(dump, "left");
+				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);
+			fprintf(dump, "\"");
+
+			gpp_dump_rgb16(dump, " backColor", text->background_color);
 
+			if ((text->default_box.bottom == text->default_box.top) || (text->default_box.right == text->default_box.left)) {
+				text->default_box.top = text->default_box.left = 0;
+				text->default_box.right = trak->Header->width / 65536;
+				text->default_box.bottom = trak->Header->height / 65536;
+			}
+
+			if (text->displayFlags & GF_TXT_SCROLL_IN) {
+				if (text->displayFlags & GF_TXT_SCROLL_OUT) fprintf(dump, " scroll=\"InOut\"");
+				else fprintf(dump, " scroll=\"In\"");
+			} else if (text->displayFlags & GF_TXT_SCROLL_OUT) {
+				fprintf(dump, " scroll=\"Out\"");
+			} else {
+				fprintf(dump, " scroll=\"None\"");
 			}
+			fprintf(dump, ">\n");
+
+			gpp_dump_box_nobox(dump, &text->default_box);
+			fprintf(dump, "</TextSampleDescription>\n");
 		}
-		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;
-		}
-		gpp_dump_box_nobox(dump, &txt->default_box);
-		gpp_dump_style_nobox(dump, &txt->default_style, NULL, 0);
-		fprintf(dump, "</TextSampleDescription>\n");
 	}
 	fprintf(dump, "</TextStreamHeader>\n");
 
@@ -2938,11 +3112,21 @@
 					}
 					else {
 						switch (utf16Line[j]) {
-						case '\'': fprintf(dump, "&apos;"); break;
-						case '\"': fprintf(dump, "&quot;"); break;
-						case '&': fprintf(dump, "&amp;"); break;
-						case '>': fprintf(dump, "&gt;"); break;
-						case '<': fprintf(dump, "&lt;"); break;
+						case '\'':
+							fprintf(dump, "&apos;");
+							break;
+						case '\"':
+							fprintf(dump, "&quot;");
+							break;
+						case '&':
+							fprintf(dump, "&amp;");
+							break;
+						case '>':
+							fprintf(dump, "&gt;");
+							break;
+						case '<':
+							fprintf(dump, "&lt;");
+							break;
 						default:
 							if (utf16Line[j] < 128) {
 								fprintf(dump, "%c", (u8) utf16Line[j]);
@@ -2988,7 +3172,7 @@
 				gpp_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 : "");
 			}
-				break;
+			break;
 			case GF_ISOM_BOX_TYPE_BLNK:
 				fprintf(dump, "<Blinking ");
 				gpp_print_char_offsets(dump, ((GF_TextBlinkBox *)a)->startcharoffset, ((GF_TextBlinkBox *)a)->endcharoffset, shift_offset, so_count);
@@ -3011,7 +3195,7 @@
 				}
 				fprintf(dump, "</Karaoke>\n");
 			}
-				break;
+			break;
 			}
 		}
 
@@ -3086,7 +3270,7 @@
 
 		if (!txt->len) {
 			fprintf(dump, "\n");
-		}else {
+		} else {
 			u32 styles, char_num, new_styles;
 			u16 utf16Line[10000];
 
@@ -3102,71 +3286,71 @@
 				len = (u32) res;
 				utf16Line[len] = 0;
 			}
-            char_num = 0;
-            styles = 0;
-            new_styles = txtd->default_style.style_flags;
-            for (j=0; j<len; j++) {
-                Bool is_new_line;
-
-                if (txt->styles) {
-                    new_styles = txtd->default_style.style_flags;
-                    for (k=0; k<txt->styles->entry_count; k++) {
-                        if (txt->styles->styles[k].startCharOffset>char_num) continue;
-                        if (txt->styles->styles[k].endCharOffset<char_num+1) continue;
-
-                        if (txt->styles->styles[k].style_flags & (GF_TXT_STYLE_ITALIC | GF_TXT_STYLE_BOLD | GF_TXT_STYLE_UNDERLINED)) {
-                            new_styles = txt->styles->styles[k].style_flags;
-                            break;
-                        }
-                    }
-                }
-                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_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "</b>");
-                    if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "</i>");
-                    if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "</u>");
-
-                    styles = new_styles;
-                }
-
-                /*not sure if styles must be reseted at line breaks in srt...*/
-                is_new_line = 0;
-                if ((utf16Line[j]=='\n') || (utf16Line[j]=='\r') ) {
-                    if ((utf16Line[j]=='\r') && (utf16Line[j+1]=='\n')) j++;
-                    fprintf(dump, "\n");
-                    is_new_line = 1;
-                }
-
-                if (!is_new_line) {
-                    size_t sl;
-                    char szChar[30];
-                    s16 swT[2], *swz;
-                    swT[0] = utf16Line[j];
-                    swT[1] = 0;
-                    swz= (s16 *)swT;
-                    sl = gf_utf8_wcstombs(szChar, 30, (const unsigned short **) &swz);
-                    if (sl == (size_t)-1) sl=0;
+			char_num = 0;
+			styles = 0;
+			new_styles = txtd->default_style.style_flags;
+			for (j=0; j<len; j++) {
+				Bool is_new_line;
+
+				if (txt->styles) {
+					new_styles = txtd->default_style.style_flags;
+					for (k=0; k<txt->styles->entry_count; k++) {
+						if (txt->styles->styles[k].startCharOffset>char_num) continue;
+						if (txt->styles->styles[k].endCharOffset<char_num+1) continue;
+
+						if (txt->styles->styles[k].style_flags & (GF_TXT_STYLE_ITALIC | GF_TXT_STYLE_BOLD | GF_TXT_STYLE_UNDERLINED)) {
+							new_styles = txt->styles->styles[k].style_flags;
+							break;
+						}
+					}
+				}
+				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_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "</b>");
+					if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "</i>");
+					if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "</u>");
+
+					styles = new_styles;
+				}
+
+				/*not sure if styles must be reseted at line breaks in srt...*/
+				is_new_line = 0;
+				if ((utf16Line[j]=='\n') || (utf16Line[j]=='\r') ) {
+					if ((utf16Line[j]=='\r') && (utf16Line[j+1]=='\n')) j++;
+					fprintf(dump, "\n");
+					is_new_line = 1;
+				}
+
+				if (!is_new_line) {
+					size_t sl;
+					char szChar[30];
+					s16 swT[2], *swz;
+					swT[0] = utf16Line[j];
+					swT[1] = 0;
+					swz= (s16 *)swT;
+					sl = gf_utf8_wcstombs(szChar, 30, (const unsigned short **) &swz);
+					if (sl == (size_t)-1) sl=0;
 					szChar[(u32) sl]=0;
-                    fprintf(dump, "%s", szChar);
-                }
-                char_num++;
-            }
-            new_styles = 0;
-            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_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "</b>");
-                if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "</i>");
-                if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "</u>");
-
-                styles = new_styles;
-            }
-            fprintf(dump, "\n");
+					fprintf(dump, "%s", szChar);
+				}
+				char_num++;
+			}
+			new_styles = 0;
+			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_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "</b>");
+				if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "</i>");
+				if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "</u>");
+
+				styles = new_styles;
+			}
+			fprintf(dump, "\n");
 		}
 		gf_isom_sample_del(&s);
 		gf_isom_delete_text_sample(txt);
@@ -3263,13 +3447,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_text_dump(GF_ISOFile *the_file, u32 track, FILE *dump, u32 dump_type)
+GF_Err gf_isom_text_dump(GF_ISOFile *the_file, u32 track, FILE *dump, GF_TextDumpType dump_type)
 {
 	switch (dump_type) {
-	case 2:
+	case GF_TEXTDUMPTYPE_SVG:
 		return gf_isom_dump_svg_track(the_file, track, dump);
-	case 1:
+	case GF_TEXTDUMPTYPE_SRT:
 		return gf_isom_dump_srt_track(the_file, track, dump);
+	case GF_TEXTDUMPTYPE_TTXT:
 	default:
 		return gf_isom_dump_ttxt_track(the_file, track, dump);
 	}
@@ -3284,9 +3469,9 @@
 	fprintf(trace, "<ProtectionInfoBox>\n");
 	DumpBox(a, trace);
 
-	gf_box_dump(p->original_format, trace);
-	gf_box_dump(p->scheme_type, trace);
-	gf_box_dump(p->info, trace);
+	gf_box_dump_ex(p->original_format, trace, GF_ISOM_BOX_TYPE_FRMA);
+	gf_box_dump_ex(p->scheme_type, trace, GF_ISOM_BOX_TYPE_SCHM);
+	gf_box_dump_ex(p->info, trace, GF_ISOM_BOX_TYPE_SCHI);
 	gf_box_dump_done("ProtectionInfoBox", a, trace);
 	return GF_OK;
 }
@@ -3442,30 +3627,75 @@
 	char *name = "Unknown";
 	GF_ListItemBox *itune = (GF_ListItemBox *)a;
 	switch (itune->type) {
-	case GF_ISOM_BOX_TYPE_0xA9NAM: name = "Name"; break;
-	case GF_ISOM_BOX_TYPE_0xA9CMT: name = "Comment"; break;
-	case GF_ISOM_BOX_TYPE_0xA9DAY: name = "Created"; break;
-	case GF_ISOM_BOX_TYPE_0xA9ART: name = "Artist"; break;
-	case GF_ISOM_BOX_TYPE_0xA9TRK: name = "Track"; break;
-	case GF_ISOM_BOX_TYPE_0xA9ALB: name = "Album"; break;
-	case GF_ISOM_BOX_TYPE_0xA9COM: name = "Compositor"; break;
-	case GF_ISOM_BOX_TYPE_0xA9WRT: name = "Writer"; break;
-	case GF_ISOM_BOX_TYPE_0xA9TOO: name = "Tool"; break;
-	case GF_ISOM_BOX_TYPE_0xA9CPY: name = "Copyright"; break;
-	case GF_ISOM_BOX_TYPE_0xA9DES: name = "Description"; break;
+	case GF_ISOM_BOX_TYPE_0xA9NAM:
+		name = "Name";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9CMT:
+		name = "Comment";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9DAY:
+		name = "Created";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9ART:
+		name = "Artist";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9TRK:
+		name = "Track";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9ALB:
+		name = "Album";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9COM:
+		name = "Compositor";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9WRT:
+		name = "Writer";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9TOO:
+		name = "Tool";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9CPY:
+		name = "Copyright";
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9DES:
+		name = "Description";
+		break;
 	case GF_ISOM_BOX_TYPE_0xA9GEN:
 	case GF_ISOM_BOX_TYPE_GNRE:
-		name = "Genre"; break;
-	case GF_ISOM_BOX_TYPE_aART: name = "AlbumArtist"; break;
-	case GF_ISOM_BOX_TYPE_PGAP: name = "Gapeless"; break;
-	case GF_ISOM_BOX_TYPE_DISK: name = "Disk"; break;
-	case GF_ISOM_BOX_TYPE_TRKN: name = "TrackNumber"; break;
-	case GF_ISOM_BOX_TYPE_TMPO: name = "Tempo"; break;
-	case GF_ISOM_BOX_TYPE_CPIL: name = "Compilation"; break;
-	case GF_ISOM_BOX_TYPE_COVR: name = "CoverArt"; no_dump = 1; break;
-	case GF_ISOM_BOX_TYPE_iTunesSpecificInfo: name = "iTunesSpecific"; no_dump = 1; break;
-	case GF_ISOM_BOX_TYPE_0xA9GRP: name = "Group"; break;
-	case GF_ISOM_ITUNE_ENCODER: name = "Encoder"; break;
+		name = "Genre";
+		break;
+	case GF_ISOM_BOX_TYPE_aART:
+		name = "AlbumArtist";
+		break;
+	case GF_ISOM_BOX_TYPE_PGAP:
+		name = "Gapeless";
+		break;
+	case GF_ISOM_BOX_TYPE_DISK:
+		name = "Disk";
+		break;
+	case GF_ISOM_BOX_TYPE_TRKN:
+		name = "TrackNumber";
+		break;
+	case GF_ISOM_BOX_TYPE_TMPO:
+		name = "Tempo";
+		break;
+	case GF_ISOM_BOX_TYPE_CPIL:
+		name = "Compilation";
+		break;
+	case GF_ISOM_BOX_TYPE_COVR:
+		name = "CoverArt";
+		no_dump = 1;
+		break;
+	case GF_ISOM_BOX_TYPE_iTunesSpecificInfo:
+		name = "iTunesSpecific";
+		no_dump = 1;
+		break;
+	case GF_ISOM_BOX_TYPE_0xA9GRP:
+		name = "Group";
+		break;
+	case GF_ISOM_ITUNE_ENCODER:
+		name = "Encoder";
+		break;
 	}
 	fprintf(trace, "<%sBox", name);
 	if (!no_dump) {
@@ -3522,7 +3752,7 @@
 	u32 i;
 	GF_AdobeBootstrapInfoBox *p = (GF_AdobeBootstrapInfoBox*)a;
 	fprintf(trace, "<AdobeBootstrapBox 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);
+	        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);
 	if (p->drm_data)
@@ -3569,7 +3799,7 @@
 	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",
-				gae->time, gae->segment, gae->fragment, gae->afra_offset, gae->offset_from_afra);
+		        gae->time, gae->segment, gae->fragment, gae->afra_offset, gae->offset_from_afra);
 	}
 
 	gf_box_dump_done("AdobeFragmentRandomAccessBox", a, trace);
@@ -3608,7 +3838,7 @@
 	fprintf(trace, "<AdobeSegmentRunTableBox>\n");
 	DumpBox(a, trace);
 	gf_full_box_dump(a, trace);
-	
+
 	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);
@@ -3666,7 +3896,7 @@
 {
 	GF_OMADRMCommonHeaderBox *ptr = (GF_OMADRMCommonHeaderBox *)a;
 	fprintf(trace, "<OMADRMCommonHeaderBox EncryptionMethod=\"%d\" PaddingScheme=\"%d\" PlaintextLength=\""LLD"\" ",
-						ptr->EncryptionMethod, ptr->PaddingScheme, ptr->PlaintextLength);
+	        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->TextualHeaders) {
@@ -3754,7 +3984,7 @@
 	u32 i;
 	GF_TrackSelectionBox *ptr = (GF_TrackSelectionBox *)a;
 	fprintf(trace, "<TrackSelectionBox switchGroup=\"%d\" criteria=\"", ptr->switchGroup);
-	for (i=0; i<ptr->attributeListCount;i++) {
+	for (i=0; i<ptr->attributeListCount; i++) {
 		if (i) fprintf(trace, ";");
 		fprintf(trace, "%s", gf_4cc_to_str(ptr->attributeList[i]));
 	}
@@ -3788,7 +4018,7 @@
 	return GF_OK;
 }
 
-GF_Err stse_dump(GF_Box *a, FILE * trace)
+GF_Err stxt_dump(GF_Box *a, FILE * trace)
 {
 	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox*)a;
 	const char *name = "SimpleTextSampleEntryBox";
@@ -3835,7 +4065,7 @@
 	GF_DIMSSceneConfigBox *p = (GF_DIMSSceneConfigBox *)a;
 
 	fprintf(trace, "<DIMSSceneConfigBox 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);
+	        p->profile, p->level, p->pathComponents, p->fullRequestHost, p->streamType, p->containsRedundant, p->textEncoding, p->contentEncoding);
 	DumpBox(a, trace);
 	gf_box_dump_done("DIMSSceneConfigBox", a, trace);
 	return GF_OK;
@@ -3851,7 +4081,7 @@
 		fprintf(trace, "<EC3SpecificBox 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);
+			        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);
 		}
 		a->type = GF_ISOM_BOX_TYPE_DEC3;
 		DumpBox(a, trace);
@@ -3859,7 +4089,7 @@
 		gf_box_dump_done("EC3SpecificBox", a, trace);
 	} else {
 		fprintf(trace, "<AC3SpecificBox 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);
+		        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);
 		DumpBox(a, trace);
 		gf_box_dump_done("AC3SpecificBox", a, trace);
 	}
@@ -3881,7 +4111,7 @@
 	DumpBox(a, trace);
 	if (p->is_ec3)
 		a->type = GF_ISOM_BOX_TYPE_AC3;
-	gf_box_dump(p->info, trace);
+	gf_box_dump_ex(p->info, trace, p->is_ec3 ? GF_ISOM_BOX_TYPE_DEC3 : GF_ISOM_BOX_TYPE_DAC3);
 	gf_box_dump_done(p->is_ec3 ? "EC3SampleEntryBox" : "AC3SampleEntryBox", a, trace);
 	return GF_OK;
 }
@@ -3918,7 +4148,7 @@
 	fprintf(trace, "<SegmentIndexBox reference_ID=\"%d\" timescale=\"%d\" earliest_presentation_time=\""LLD"\" first_offset=\""LLD"\">\n", p->reference_ID, p->timescale, p->earliest_presentation_time, p->first_offset);
 	DumpBox(a, trace);
 	gf_full_box_dump(a, trace);
-	
+
 	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);
 	}
@@ -3932,7 +4162,7 @@
 	GF_PcrInfoBox *p = (GF_PcrInfoBox *)a;
 	fprintf(trace, "<MPEG2TSPCRInfoBox subsegment_count=\"%d\">\n", p->subsegment_count);
 	DumpBox(a, trace);
-	
+
 	for (i=0; i<p->subsegment_count; i++) {
 		fprintf(trace, "<PCRInfo PCR=\""LLU"\" />\n", p->pcr_values[i]);
 	}
@@ -3962,11 +4192,11 @@
 		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);	
+			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);
 		}
 		fprintf(trace, "</SampleEntry>\n");
-	} 
+	}
 
 	gf_box_dump_done("SubSampleInformationBox", a, trace);
 	return GF_OK;
@@ -4025,6 +4255,7 @@
 
 	fprintf(trace, "<SampleGroupDescriptionBox 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");
 	DumpBox(a, trace);
 	gf_full_box_dump((GF_Box *)a, trace);
@@ -4044,6 +4275,18 @@
 			DumpDataHex(trace, (char *)((GF_CENCSampleEncryptionGroupEntry*)entry)->KID, 16);
 			fprintf(trace, "\"/>\n");
 			break;
+		case GF_4CC( 't', 'r', 'i', 'f' ):
+		{
+			u32 x,y,w,h, id, independent;
+			Bool full_frame;
+
+			gf_isom_parse_trif_info( (const char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data, ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length, &id, &independent, &full_frame, &x, &y, &w, &h);
+
+			fprintf(trace, "<TileRegionGroupEntry ID=\"%d\" independent=\"%d\"", id, independent);
+			if (!full_frame) fprintf(trace, " x=\"%d\" y=\"%d\"", x, y);
+			fprintf(trace, " w=\"%d\" h=\"%d\"/>\n", w, h);
+		}
+		break;
 		default:
 			fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"%d\" data=\"", ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
 			DumpData(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data,  ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
@@ -4062,7 +4305,7 @@
 
 	fprintf(trace, "<SampleAuxiliaryInfoSizeBox 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)) {	
+		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);
 		} else {
 			fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
@@ -4088,7 +4331,7 @@
 
 	fprintf(trace, "<SampleAuxiliaryInfoOffsetBox entry_count=\"%d\"", ptr->entry_count);
 	if (ptr->flags & 1) {
-		if (isalnum(ptr->aux_info_type>>24)) {	
+		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);
 		} else {
 			fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
@@ -4199,7 +4442,7 @@
 	}
 	fprintf(trace, ">\n");
 	DumpBox(a, trace);
-	
+
 	if (sample_count) {
 		for (i=0; i<sample_count; i++) {
 			GF_CENCSampleAuxInfo *cenc_sample = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
@@ -4211,7 +4454,7 @@
 				if (ptr->flags & 0x2) {
 					fprintf(trace, "\" SubsampleCount=\"%d\"", cenc_sample->subsample_count);
 					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);
 					}
@@ -4246,7 +4489,7 @@
 			if (ptr->flags & 0x2) {
 				fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
 				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);
 				}

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_funcs.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_funcs.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -61,15 +61,15 @@
 		sprintf(strChar, "%02X", (unsigned char) UUID[i]);
 		strcat(strUUID, strChar);
 	}
-	if (!strnicmp(strUUID, "8974dbce7be74c5184f97148f9882554", 32)) 
+	if (!strnicmp(strUUID, "8974dbce7be74c5184f97148f9882554", 32))
 		return GF_ISOM_BOX_UUID_TENC;
-	if (!strnicmp(strUUID, "D4807EF2CA3946958E5426CB9E46A79F", 32)) 
+	if (!strnicmp(strUUID, "D4807EF2CA3946958E5426CB9E46A79F", 32))
 		return GF_ISOM_BOX_UUID_TFRF;
-	if (!strnicmp(strUUID, "6D1D9B0542D544E680E2141DAFF757B2", 32)) 
+	if (!strnicmp(strUUID, "6D1D9B0542D544E680E2141DAFF757B2", 32))
 		return GF_ISOM_BOX_UUID_TFXD;
-	if (!strnicmp(strUUID, "A2394F525A9B4F14A2446C427C648DF4", 32)) 
+	if (!strnicmp(strUUID, "A2394F525A9B4F14A2446C427C648DF4", 32))
 		return GF_ISOM_BOX_UUID_PSEC;
-	if (!strnicmp(strUUID, "D08A4F1810F34A82B6C832D8ABA183D3", 32)) 
+	if (!strnicmp(strUUID, "D08A4F1810F34A82B6C832D8ABA183D3", 32))
 		return GF_ISOM_BOX_UUID_PSSH;
 	return 0;
 }
@@ -125,7 +125,7 @@
 		hdr_size += 16;
 		uuid_type = gf_isom_solve_uuid_box(uuid);
 	}
-	
+
 	//handle large box
 	if (size == 1) {
 		size = gf_bs_read_u64(bs);
@@ -154,7 +154,7 @@
 		((GF_UnknownUUIDBox *)newBox)->internal_4cc = uuid_type;
 	}
 
-	if (!newBox->type) newBox->type = type; 
+	if (!newBox->type) newBox->type = type;
 
 	end = gf_bs_available(bs);
 	if (size - hdr_size > end ) {
@@ -168,9 +168,9 @@
 		*outBox = newBox;
 		return GF_OK;
 	}
-	
+
 	newBox->size = size - hdr_size;
-	e = gf_isom_box_read(newBox, bs);	
+	e = gf_isom_box_read(newBox, bs);
 	newBox->size = size;
 	end = gf_bs_get_position(bs);
 
@@ -225,7 +225,7 @@
 	u32 count, i;
 	GF_Box *a;
 	if (!other_boxes) return;
-	count = gf_list_count(other_boxes); 
+	count = gf_list_count(other_boxes);
 	for (i = 0; i < count; i++) {
 		a = (GF_Box *)gf_list_get(other_boxes, i);
 		if (a) gf_isom_box_del(a);
@@ -237,7 +237,7 @@
 {
 	GF_Err e;
 	GF_Box *a = NULL;
-	
+
 	while (parent->size) {
 		e = gf_isom_parse_box_ex(&a, bs, parent_type);
 		if (e) {
@@ -305,15 +305,15 @@
 		char strUUID[32];
 
 		switch (((GF_UUIDBox*)ptr)->internal_4cc) {
-			case GF_ISOM_BOX_UUID_TENC:
-				memcpy(strUUID, "8974dbce7be74c5184f97148f9882554", 32);
-				break;
-			case GF_ISOM_BOX_UUID_PSEC:
-				memcpy(strUUID, "A2394F525A9B4F14A2446C427C648DF4", 32);
-				break;
-			case GF_ISOM_BOX_UUID_PSSH:
-				memcpy(strUUID, "D08A4F1810F34A82B6C832D8ABA183D3", 32);
-				break;
+		case GF_ISOM_BOX_UUID_TENC:
+			memcpy(strUUID, "8974dbce7be74c5184f97148f9882554", 32);
+			break;
+		case GF_ISOM_BOX_UUID_PSEC:
+			memcpy(strUUID, "A2394F525A9B4F14A2446C427C648DF4", 32);
+			break;
+		case GF_ISOM_BOX_UUID_PSSH:
+			memcpy(strUUID, "D08A4F1810F34A82B6C832D8ABA183D3", 32);
+			break;
 		}
 
 		for (i = 0; i < 16; i++) {
@@ -326,7 +326,7 @@
 
 		gf_bs_write_data(bs, uuid, 16);
 	}
-	if (ptr->size > 0xFFFFFFFF) 
+	if (ptr->size > 0xFFFFFFFF)
 		gf_bs_write_u64(bs, ptr->size);
 	return GF_OK;
 }
@@ -354,7 +354,10 @@
 		a = (GF_Box *)gf_list_get(list, i);
 		if (a) {
 			e = gf_isom_box_write(a, bs);
-			if (e) return e;
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF: Error %s writing box %s\n", gf_error_to_string(e), gf_4cc_to_str(a->type) ));
+				return e;
+			}
 		}
 	}
 	return GF_OK;
@@ -372,7 +375,10 @@
 		a = (GF_Box *)gf_list_get(list, i);
 		if (a) {
 			e = gf_isom_box_size(a);
-			if (e) return e;
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF: Error %s computing box %s size\n", gf_error_to_string(e), gf_4cc_to_str(a->type) ));
+				return e;
+			}
 			parent->size += a->size;
 		}
 	}
@@ -388,18 +394,26 @@
 	switch (boxType) {
 	case GF_ISOM_BOX_TYPE_REFT:
 		return reftype_New();
-	case GF_ISOM_BOX_TYPE_FREE: return free_New();
+	case GF_ISOM_BOX_TYPE_FREE:
+		return free_New();
 	case GF_ISOM_BOX_TYPE_SKIP:
 		a = free_New();
 		if (a) a->type = GF_ISOM_BOX_TYPE_SKIP;
 		return a;
-	case GF_ISOM_BOX_TYPE_MDAT: return mdat_New();
-	case GF_ISOM_BOX_TYPE_MOOV: return moov_New();
-	case GF_ISOM_BOX_TYPE_MVHD: return mvhd_New();
-	case GF_ISOM_BOX_TYPE_MDHD: return mdhd_New();
-	case GF_ISOM_BOX_TYPE_VMHD: return vmhd_New();
-	case GF_ISOM_BOX_TYPE_SMHD: return smhd_New();
-	case GF_ISOM_BOX_TYPE_HMHD: return hmhd_New();
+	case GF_ISOM_BOX_TYPE_MDAT:
+		return mdat_New();
+	case GF_ISOM_BOX_TYPE_MOOV:
+		return moov_New();
+	case GF_ISOM_BOX_TYPE_MVHD:
+		return mvhd_New();
+	case GF_ISOM_BOX_TYPE_MDHD:
+		return mdhd_New();
+	case GF_ISOM_BOX_TYPE_VMHD:
+		return vmhd_New();
+	case GF_ISOM_BOX_TYPE_SMHD:
+		return smhd_New();
+	case GF_ISOM_BOX_TYPE_HMHD:
+		return hmhd_New();
 	case GF_ISOM_BOX_TYPE_ODHD:
 	case GF_ISOM_BOX_TYPE_CRHD:
 	case GF_ISOM_BOX_TYPE_SDHD:
@@ -408,103 +422,185 @@
 		a = nmhd_New();
 		if (a) a->type = boxType;
 		return a;
-	case GF_ISOM_BOX_TYPE_STBL: return stbl_New();
-	case GF_ISOM_BOX_TYPE_DINF: return dinf_New();
-	case GF_ISOM_BOX_TYPE_URL: return url_New();
-	case GF_ISOM_BOX_TYPE_URN: return urn_New();
-	case GF_ISOM_BOX_TYPE_CPRT: return cprt_New();
-	case GF_ISOM_BOX_TYPE_CHPL: return chpl_New();
-	case GF_ISOM_BOX_TYPE_HDLR: return hdlr_New();
-	case GF_ISOM_BOX_TYPE_IODS: return iods_New();
-	case GF_ISOM_BOX_TYPE_TRAK: return trak_New();
-	case GF_ISOM_BOX_TYPE_MP4S: return mp4s_New();
-	case GF_ISOM_BOX_TYPE_MP4A: return mp4a_New();
-	case GF_ISOM_BOX_TYPE_GNRM: return gnrm_New();
-	case GF_ISOM_BOX_TYPE_GNRV: return gnrv_New();
-	case GF_ISOM_BOX_TYPE_GNRA: return gnra_New();
-	case GF_ISOM_BOX_TYPE_EDTS: return edts_New();
-	case GF_ISOM_BOX_TYPE_UDTA: return udta_New();
-	case GF_ISOM_BOX_TYPE_DREF: return dref_New();
-	case GF_ISOM_BOX_TYPE_STSD: return stsd_New();
-	case GF_ISOM_BOX_TYPE_STTS: return stts_New();
-	case GF_ISOM_BOX_TYPE_CTTS: return ctts_New();
-	case GF_ISOM_BOX_TYPE_CSLG: return cslg_New();
-	case GF_ISOM_BOX_TYPE_STSH: return stsh_New();
-	case GF_ISOM_BOX_TYPE_ELST: return elst_New();
-	case GF_ISOM_BOX_TYPE_STSC: return stsc_New();
+	case GF_ISOM_BOX_TYPE_STBL:
+		return stbl_New();
+	case GF_ISOM_BOX_TYPE_DINF:
+		return dinf_New();
+	case GF_ISOM_BOX_TYPE_URL:
+		return url_New();
+	case GF_ISOM_BOX_TYPE_URN:
+		return urn_New();
+	case GF_ISOM_BOX_TYPE_CPRT:
+		return cprt_New();
+	case GF_ISOM_BOX_TYPE_KIND:
+		return kind_New();
+	case GF_ISOM_BOX_TYPE_CHPL:
+		return chpl_New();
+	case GF_ISOM_BOX_TYPE_HDLR:
+		return hdlr_New();
+	case GF_ISOM_BOX_TYPE_IODS:
+		return iods_New();
+	case GF_ISOM_BOX_TYPE_TRAK:
+		return trak_New();
+	case GF_ISOM_BOX_TYPE_MP4S:
+		return mp4s_New();
+	case GF_ISOM_BOX_TYPE_MP4A:
+		return mp4a_New();
+	case GF_ISOM_BOX_TYPE_GNRM:
+		return gnrm_New();
+	case GF_ISOM_BOX_TYPE_GNRV:
+		return gnrv_New();
+	case GF_ISOM_BOX_TYPE_GNRA:
+		return gnra_New();
+	case GF_ISOM_BOX_TYPE_EDTS:
+		return edts_New();
+	case GF_ISOM_BOX_TYPE_UDTA:
+		return udta_New();
+	case GF_ISOM_BOX_TYPE_DREF:
+		return dref_New();
+	case GF_ISOM_BOX_TYPE_STSD:
+		return stsd_New();
+	case GF_ISOM_BOX_TYPE_STTS:
+		return stts_New();
+	case GF_ISOM_BOX_TYPE_CTTS:
+		return ctts_New();
+	case GF_ISOM_BOX_TYPE_CSLG:
+		return cslg_New();
+	case GF_ISOM_BOX_TYPE_STSH:
+		return stsh_New();
+	case GF_ISOM_BOX_TYPE_ELST:
+		return elst_New();
+	case GF_ISOM_BOX_TYPE_STSC:
+		return stsc_New();
 	case GF_ISOM_BOX_TYPE_STZ2:
 	case GF_ISOM_BOX_TYPE_STSZ:
 		a = stsz_New();
 		if (a) a->type = boxType;
 		return a;
-	case GF_ISOM_BOX_TYPE_STCO: return stco_New();
-	case GF_ISOM_BOX_TYPE_STSS: return stss_New();
-	case GF_ISOM_BOX_TYPE_STDP: return stdp_New();
-	case GF_ISOM_BOX_TYPE_SDTP: return sdtp_New();
-	case GF_ISOM_BOX_TYPE_CO64: return co64_New();
-	case GF_ISOM_BOX_TYPE_ESDS: return esds_New();
-	case GF_ISOM_BOX_TYPE_MINF: return minf_New();
-	case GF_ISOM_BOX_TYPE_TKHD: return tkhd_New();
-	case GF_ISOM_BOX_TYPE_TREF: return tref_New();
-	case GF_ISOM_BOX_TYPE_MDIA: return mdia_New();
-
-	case GF_ISOM_BOX_TYPE_FTYP: 
-	case GF_ISOM_BOX_TYPE_STYP: 
-        a = ftyp_New();
-        if (a) a->type = boxType;
-        return a;
-	case GF_ISOM_BOX_TYPE_PADB: return padb_New();
-	case GF_ISOM_BOX_TYPE_VOID: return void_New();
-	case GF_ISOM_BOX_TYPE_STSF: return stsf_New();
-	case GF_ISOM_BOX_TYPE_PDIN: return pdin_New();
-	case GF_ISOM_BOX_TYPE_SBGP: return sbgp_New();
-	case GF_ISOM_BOX_TYPE_SGPD: return sgpd_New();
-	case GF_ISOM_BOX_TYPE_SAIZ: return saiz_New();
-	case GF_ISOM_BOX_TYPE_SAIO: return saio_New();
-	case GF_ISOM_BOX_TYPE_PSSH: return pssh_New();
-	case GF_ISOM_BOX_TYPE_TENC: return tenc_New();
+	case GF_ISOM_BOX_TYPE_STCO:
+		return stco_New();
+	case GF_ISOM_BOX_TYPE_STSS:
+		return stss_New();
+	case GF_ISOM_BOX_TYPE_STDP:
+		return stdp_New();
+	case GF_ISOM_BOX_TYPE_SDTP:
+		return sdtp_New();
+	case GF_ISOM_BOX_TYPE_CO64:
+		return co64_New();
+	case GF_ISOM_BOX_TYPE_ESDS:
+		return esds_New();
+	case GF_ISOM_BOX_TYPE_MINF:
+		return minf_New();
+	case GF_ISOM_BOX_TYPE_TKHD:
+		return tkhd_New();
+	case GF_ISOM_BOX_TYPE_TREF:
+		return tref_New();
+	case GF_ISOM_BOX_TYPE_MDIA:
+		return mdia_New();
+	case GF_ISOM_BOX_TYPE_ELNG:
+		return elng_New();
+
+	case GF_ISOM_BOX_TYPE_FTYP:
+	case GF_ISOM_BOX_TYPE_STYP:
+		a = ftyp_New();
+		if (a) a->type = boxType;
+		return a;
+	case GF_ISOM_BOX_TYPE_PADB:
+		return padb_New();
+	case GF_ISOM_BOX_TYPE_VOID:
+		return void_New();
+	case GF_ISOM_BOX_TYPE_STSF:
+		return stsf_New();
+	case GF_ISOM_BOX_TYPE_PDIN:
+		return pdin_New();
+	case GF_ISOM_BOX_TYPE_SBGP:
+		return sbgp_New();
+	case GF_ISOM_BOX_TYPE_SGPD:
+		return sgpd_New();
+	case GF_ISOM_BOX_TYPE_SAIZ:
+		return saiz_New();
+	case GF_ISOM_BOX_TYPE_SAIO:
+		return saio_New();
+	case GF_ISOM_BOX_TYPE_PSSH:
+		return pssh_New();
+	case GF_ISOM_BOX_TYPE_TENC:
+		return tenc_New();
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 	case GF_ISOM_BOX_TYPE_RTP_STSD:
 		a = ghnt_New();
 		if (a) a->type = boxType;
 		return a;
-	case GF_ISOM_BOX_TYPE_RTPO: return rtpo_New();
-	case GF_ISOM_BOX_TYPE_HNTI: return hnti_New();
-	case GF_ISOM_BOX_TYPE_SDP: return sdp_New();
-	case GF_ISOM_BOX_TYPE_HINF: return hinf_New();
-	case GF_ISOM_BOX_TYPE_RELY: return rely_New();
-	case GF_ISOM_BOX_TYPE_TIMS: return tims_New();
-	case GF_ISOM_BOX_TYPE_TSRO: return tsro_New();
-	case GF_ISOM_BOX_TYPE_SNRO: return snro_New();
-	case GF_ISOM_BOX_TYPE_TRPY: return trpy_New();
-	case GF_ISOM_BOX_TYPE_NUMP: return nump_New();
-	case GF_ISOM_BOX_TYPE_TOTL: return totl_New();
-	case GF_ISOM_BOX_TYPE_NPCK: return npck_New();
-	case GF_ISOM_BOX_TYPE_TPYL: return tpyl_New();
-	case GF_ISOM_BOX_TYPE_TPAY: return tpay_New();
-	case GF_ISOM_BOX_TYPE_MAXR: return maxr_New();
-	case GF_ISOM_BOX_TYPE_DMED: return dmed_New();
-	case GF_ISOM_BOX_TYPE_DIMM: return dimm_New();
-	case GF_ISOM_BOX_TYPE_DREP: return drep_New();
-	case GF_ISOM_BOX_TYPE_TMIN: return tmin_New();
-	case GF_ISOM_BOX_TYPE_TMAX: return tmax_New();
-	case GF_ISOM_BOX_TYPE_PMAX: return pmax_New();
-	case GF_ISOM_BOX_TYPE_DMAX: return dmax_New();
-	case GF_ISOM_BOX_TYPE_PAYT: return payt_New();
-	case GF_ISOM_BOX_TYPE_NAME: return name_New();
+	case GF_ISOM_BOX_TYPE_RTPO:
+		return rtpo_New();
+	case GF_ISOM_BOX_TYPE_HNTI:
+		return hnti_New();
+	case GF_ISOM_BOX_TYPE_SDP:
+		return sdp_New();
+	case GF_ISOM_BOX_TYPE_HINF:
+		return hinf_New();
+	case GF_ISOM_BOX_TYPE_RELY:
+		return rely_New();
+	case GF_ISOM_BOX_TYPE_TIMS:
+		return tims_New();
+	case GF_ISOM_BOX_TYPE_TSRO:
+		return tsro_New();
+	case GF_ISOM_BOX_TYPE_SNRO:
+		return snro_New();
+	case GF_ISOM_BOX_TYPE_TRPY:
+		return trpy_New();
+	case GF_ISOM_BOX_TYPE_NUMP:
+		return nump_New();
+	case GF_ISOM_BOX_TYPE_TOTL:
+		return totl_New();
+	case GF_ISOM_BOX_TYPE_NPCK:
+		return npck_New();
+	case GF_ISOM_BOX_TYPE_TPYL:
+		return tpyl_New();
+	case GF_ISOM_BOX_TYPE_TPAY:
+		return tpay_New();
+	case GF_ISOM_BOX_TYPE_MAXR:
+		return maxr_New();
+	case GF_ISOM_BOX_TYPE_DMED:
+		return dmed_New();
+	case GF_ISOM_BOX_TYPE_DIMM:
+		return dimm_New();
+	case GF_ISOM_BOX_TYPE_DREP:
+		return drep_New();
+	case GF_ISOM_BOX_TYPE_TMIN:
+		return tmin_New();
+	case GF_ISOM_BOX_TYPE_TMAX:
+		return tmax_New();
+	case GF_ISOM_BOX_TYPE_PMAX:
+		return pmax_New();
+	case GF_ISOM_BOX_TYPE_DMAX:
+		return dmax_New();
+	case GF_ISOM_BOX_TYPE_PAYT:
+		return payt_New();
+	case GF_ISOM_BOX_TYPE_NAME:
+		return name_New();
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	case GF_ISOM_BOX_TYPE_MVEX: return mvex_New();
-	case GF_ISOM_BOX_TYPE_MEHD: return mehd_New();
-	case GF_ISOM_BOX_TYPE_TREX: return trex_New();
-	case GF_ISOM_BOX_TYPE_MOOF: return moof_New();
-	case GF_ISOM_BOX_TYPE_MFHD: return mfhd_New();
-	case GF_ISOM_BOX_TYPE_TRAF: return traf_New();
-	case GF_ISOM_BOX_TYPE_TFHD: return tfhd_New();
-	case GF_ISOM_BOX_TYPE_TRUN: return trun_New();
-#endif 
+	case GF_ISOM_BOX_TYPE_MVEX:
+		return mvex_New();
+	case GF_ISOM_BOX_TYPE_MEHD:
+		return mehd_New();
+	case GF_ISOM_BOX_TYPE_TREX:
+		return trex_New();
+	case GF_ISOM_BOX_TYPE_TREP:
+		return trep_New();
+	case GF_ISOM_BOX_TYPE_MOOF:
+		return moof_New();
+	case GF_ISOM_BOX_TYPE_MFHD:
+		return mfhd_New();
+	case GF_ISOM_BOX_TYPE_TRAF:
+		return traf_New();
+	case GF_ISOM_BOX_TYPE_TFHD:
+		return tfhd_New();
+	case GF_ISOM_BOX_TYPE_TRUN:
+		return trun_New();
+#endif
 
 	/*3GPP boxes*/
 	case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -513,31 +609,33 @@
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		return gppa_New(boxType);
-	case GF_ISOM_SUBTYPE_3GP_H263: 
+	case GF_ISOM_SUBTYPE_3GP_H263:
 		return gppv_New(boxType);
-	case GF_ISOM_BOX_TYPE_DAMR: 
-	case GF_ISOM_BOX_TYPE_DEVC: 
+	case GF_ISOM_BOX_TYPE_DAMR:
+	case GF_ISOM_BOX_TYPE_DEVC:
 	case GF_ISOM_BOX_TYPE_DQCP:
 	case GF_ISOM_BOX_TYPE_DSMV:
 	case GF_ISOM_BOX_TYPE_D263:
 		return gppc_New(boxType);
 
 	/*AVC boxes*/
-	case GF_ISOM_BOX_TYPE_AVCC: 
-	case GF_ISOM_BOX_TYPE_SVCC: 
+	case GF_ISOM_BOX_TYPE_AVCC:
+	case GF_ISOM_BOX_TYPE_SVCC:
 		a = avcc_New();
 		if (a) a->type = boxType;
 		return a;
-	case GF_ISOM_BOX_TYPE_HVCC: 
+	case GF_ISOM_BOX_TYPE_HVCC:
 	case GF_ISOM_BOX_TYPE_SHCC:
 		a = hvcc_New();
 		if (a) a->type = boxType;
 		return a;
 
-	case GF_ISOM_BOX_TYPE_BTRT: return btrt_New();
-	case GF_ISOM_BOX_TYPE_M4DS: return m4ds_New();
+	case GF_ISOM_BOX_TYPE_BTRT:
+		return btrt_New();
+	case GF_ISOM_BOX_TYPE_M4DS:
+		return m4ds_New();
 
-	case GF_ISOM_BOX_TYPE_MP4V: 
+	case GF_ISOM_BOX_TYPE_MP4V:
 	case GF_ISOM_BOX_TYPE_ENCV:
 	case GF_ISOM_BOX_TYPE_AVC1:
 	case GF_ISOM_BOX_TYPE_AVC2:
@@ -550,63 +648,101 @@
 	case GF_ISOM_BOX_TYPE_HEV2:
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		return mp4v_encv_avc_hevc_new(boxType);
 
 	/*3GPP streaming text*/
-	case GF_ISOM_BOX_TYPE_FTAB: return ftab_New();
-	case GF_ISOM_BOX_TYPE_TX3G: return tx3g_New();
-	case GF_ISOM_BOX_TYPE_TEXT: return text_New();
-	case GF_ISOM_BOX_TYPE_STYL: return styl_New();
-	case GF_ISOM_BOX_TYPE_HLIT: return hlit_New();
-	case GF_ISOM_BOX_TYPE_HCLR: return hclr_New();
-	case GF_ISOM_BOX_TYPE_KROK: return krok_New();
-	case GF_ISOM_BOX_TYPE_DLAY: return dlay_New();
-	case GF_ISOM_BOX_TYPE_HREF: return href_New();
-	case GF_ISOM_BOX_TYPE_TBOX: return tbox_New();
-	case GF_ISOM_BOX_TYPE_BLNK: return blnk_New();
-	case GF_ISOM_BOX_TYPE_TWRP: return twrp_New();
+	case GF_ISOM_BOX_TYPE_FTAB:
+		return ftab_New();
+	case GF_ISOM_BOX_TYPE_TX3G:
+		return tx3g_New();
+	case GF_ISOM_BOX_TYPE_TEXT:
+		return text_New();
+	case GF_ISOM_BOX_TYPE_STYL:
+		return styl_New();
+	case GF_ISOM_BOX_TYPE_HLIT:
+		return hlit_New();
+	case GF_ISOM_BOX_TYPE_HCLR:
+		return hclr_New();
+	case GF_ISOM_BOX_TYPE_KROK:
+		return krok_New();
+	case GF_ISOM_BOX_TYPE_DLAY:
+		return dlay_New();
+	case GF_ISOM_BOX_TYPE_HREF:
+		return href_New();
+	case GF_ISOM_BOX_TYPE_TBOX:
+		return tbox_New();
+	case GF_ISOM_BOX_TYPE_BLNK:
+		return blnk_New();
+	case GF_ISOM_BOX_TYPE_TWRP:
+		return twrp_New();
 
 	/* ISMA 1.0 Encryption and Authentication V 1.0 */
-	case GF_ISOM_BOX_TYPE_IKMS: return iKMS_New();
-	case GF_ISOM_BOX_TYPE_ISFM: return iSFM_New();
+	case GF_ISOM_BOX_TYPE_IKMS:
+		return iKMS_New();
+	case GF_ISOM_BOX_TYPE_ISFM:
+		return iSFM_New();
 
 	/* ISO FF extensions for MPEG-21 */
-	case GF_ISOM_BOX_TYPE_META: return meta_New();
-	case GF_ISOM_BOX_TYPE_XML: return xml_New();
-	case GF_ISOM_BOX_TYPE_BXML: return bxml_New();
-	case GF_ISOM_BOX_TYPE_ILOC: return iloc_New();
-	case GF_ISOM_BOX_TYPE_PITM: return pitm_New();
-	case GF_ISOM_BOX_TYPE_IPRO: return ipro_New();
-	case GF_ISOM_BOX_TYPE_INFE: return infe_New();
-	case GF_ISOM_BOX_TYPE_IINF: return iinf_New();
-	case GF_ISOM_BOX_TYPE_SINF: return sinf_New();
-	case GF_ISOM_BOX_TYPE_FRMA: return frma_New();
-	case GF_ISOM_BOX_TYPE_SCHM: return schm_New();
-	case GF_ISOM_BOX_TYPE_SCHI: return schi_New();
-	case GF_ISOM_BOX_TYPE_ENCA: return enca_New();
-	case GF_ISOM_BOX_TYPE_ENCS: return encs_New();
-
-	case GF_ISOM_BOX_TYPE_SENC: return senc_New();
-
-	case GF_ISOM_BOX_UUID_TENC: return piff_tenc_New();
-	case GF_ISOM_BOX_UUID_PSEC: return piff_psec_New();
-	case GF_ISOM_BOX_UUID_PSSH: return piff_pssh_New();
-	case GF_ISOM_BOX_UUID_TFRF: 
-	case GF_ISOM_BOX_UUID_TFXD: 
-	case GF_ISOM_BOX_TYPE_UUID: 
+	case GF_ISOM_BOX_TYPE_META:
+		return meta_New();
+	case GF_ISOM_BOX_TYPE_XML:
+		return xml_New();
+	case GF_ISOM_BOX_TYPE_BXML:
+		return bxml_New();
+	case GF_ISOM_BOX_TYPE_ILOC:
+		return iloc_New();
+	case GF_ISOM_BOX_TYPE_PITM:
+		return pitm_New();
+	case GF_ISOM_BOX_TYPE_IPRO:
+		return ipro_New();
+	case GF_ISOM_BOX_TYPE_INFE:
+		return infe_New();
+	case GF_ISOM_BOX_TYPE_IINF:
+		return iinf_New();
+	case GF_ISOM_BOX_TYPE_SINF:
+		return sinf_New();
+	case GF_ISOM_BOX_TYPE_FRMA:
+		return frma_New();
+	case GF_ISOM_BOX_TYPE_SCHM:
+		return schm_New();
+	case GF_ISOM_BOX_TYPE_SCHI:
+		return schi_New();
+	case GF_ISOM_BOX_TYPE_ENCA:
+		return enca_New();
+	case GF_ISOM_BOX_TYPE_ENCS:
+		return encs_New();
+
+	case GF_ISOM_BOX_TYPE_SENC:
+		return senc_New();
+
+	case GF_ISOM_BOX_UUID_TENC:
+		return piff_tenc_New();
+	case GF_ISOM_BOX_UUID_PSEC:
+		return piff_psec_New();
+	case GF_ISOM_BOX_UUID_PSSH:
+		return piff_pssh_New();
+	case GF_ISOM_BOX_UUID_TFRF:
+	case GF_ISOM_BOX_UUID_TFXD:
+	case GF_ISOM_BOX_TYPE_UUID:
 		return uuid_New();
 
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/* Adobe extensions */
-	case GF_ISOM_BOX_TYPE_ABST: return abst_New();
-	case GF_ISOM_BOX_TYPE_AFRA: return afra_New();
-	case GF_ISOM_BOX_TYPE_ASRT: return asrt_New();
-	case GF_ISOM_BOX_TYPE_AFRT: return afrt_New();
+	case GF_ISOM_BOX_TYPE_ABST:
+		return abst_New();
+	case GF_ISOM_BOX_TYPE_AFRA:
+		return afra_New();
+	case GF_ISOM_BOX_TYPE_ASRT:
+		return asrt_New();
+	case GF_ISOM_BOX_TYPE_AFRT:
+		return afrt_New();
 #endif
 
 	/* Apple extensions */
-	case GF_ISOM_BOX_TYPE_ILST: return ilst_New();
-	
+	case GF_ISOM_BOX_TYPE_ILST:
+		return ilst_New();
+
 	case GF_ISOM_BOX_TYPE_0xA9NAM:
 	case GF_ISOM_BOX_TYPE_0xA9CMT:
 	case GF_ISOM_BOX_TYPE_0xA9DAY:
@@ -631,74 +767,115 @@
 	case GF_ISOM_BOX_TYPE_COVR:
 		return ListItem_New(boxType);
 
-	case GF_ISOM_BOX_TYPE_DATA: return data_New();
-	
-	case GF_ISOM_BOX_TYPE_OHDR: return ohdr_New();
-	case GF_ISOM_BOX_TYPE_GRPI: return grpi_New();
-	case GF_ISOM_BOX_TYPE_MDRI: return mdri_New();
-	case GF_ISOM_BOX_TYPE_ODTT: return odtt_New();
-	case GF_ISOM_BOX_TYPE_ODRB: return odrb_New();
-	case GF_ISOM_BOX_TYPE_ODKM: return odkm_New();
-	case GF_ISOM_BOX_TYPE_ODAF: 
+	case GF_ISOM_BOX_TYPE_DATA:
+		return data_New();
+
+	case GF_ISOM_BOX_TYPE_OHDR:
+		return ohdr_New();
+	case GF_ISOM_BOX_TYPE_GRPI:
+		return grpi_New();
+	case GF_ISOM_BOX_TYPE_MDRI:
+		return mdri_New();
+	case GF_ISOM_BOX_TYPE_ODTT:
+		return odtt_New();
+	case GF_ISOM_BOX_TYPE_ODRB:
+		return odrb_New();
+	case GF_ISOM_BOX_TYPE_ODKM:
+		return odkm_New();
+	case GF_ISOM_BOX_TYPE_ODAF:
 		a = iSFM_New();
 		a->type = GF_ISOM_BOX_TYPE_ODAF;
 		return a;
 
-	case GF_ISOM_BOX_TYPE_PASP: return pasp_New();
-	case GF_ISOM_BOX_TYPE_TSEL: return tsel_New();
+	case GF_ISOM_BOX_TYPE_PASP:
+		return pasp_New();
+	case GF_ISOM_BOX_TYPE_TSEL:
+		return tsel_New();
 
-	case GF_ISOM_BOX_TYPE_DIMS: return dims_New();
-	case GF_ISOM_BOX_TYPE_DIMC: return dimC_New();
-	case GF_ISOM_BOX_TYPE_DIST: return diST_New();
+	case GF_ISOM_BOX_TYPE_DIMS:
+		return dims_New();
+	case GF_ISOM_BOX_TYPE_DIMC:
+		return dimC_New();
+	case GF_ISOM_BOX_TYPE_DIST:
+		return diST_New();
 
 	case GF_ISOM_BOX_TYPE_METX:
 	case GF_ISOM_BOX_TYPE_METT:
 		return metx_New(boxType);
 
-	case GF_ISOM_BOX_TYPE_AC3: 
-	case GF_ISOM_BOX_TYPE_EC3: 
+	case GF_ISOM_BOX_TYPE_AC3:
+	case GF_ISOM_BOX_TYPE_EC3:
 		return ac3_New(boxType);
-	case GF_ISOM_BOX_TYPE_DAC3: 
-	case GF_ISOM_BOX_TYPE_DEC3: 
+	case GF_ISOM_BOX_TYPE_DAC3:
+	case GF_ISOM_BOX_TYPE_DEC3:
 		return dac3_New(boxType);
-	
-	case GF_ISOM_BOX_TYPE_LSRC: return lsrc_New();
-	case GF_ISOM_BOX_TYPE_LSR1: return lsr1_New();
+
+	case GF_ISOM_BOX_TYPE_LSRC:
+		return lsrc_New();
+	case GF_ISOM_BOX_TYPE_LSR1:
+		return lsr1_New();
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	case GF_ISOM_BOX_TYPE_SIDX: return sidx_New();
-	case GF_ISOM_BOX_TYPE_SUBS: return subs_New();
-	case GF_ISOM_BOX_TYPE_TFDT: return tfdt_New();
-	case GF_ISOM_BOX_TYPE_PCRB: return pcrb_New();
+	case GF_ISOM_BOX_TYPE_SIDX:
+		return sidx_New();
+	case GF_ISOM_BOX_TYPE_SUBS:
+		return subs_New();
+	case GF_ISOM_BOX_TYPE_TFDT:
+		return tfdt_New();
+	case GF_ISOM_BOX_TYPE_PCRB:
+		return pcrb_New();
 #endif
-	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_New();
+	case GF_ISOM_BOX_TYPE_RVCC:
+		return rvcc_New();
 
-	case GF_ISOM_BOX_TYPE_PRFT: return prft_New();
+	case GF_ISOM_BOX_TYPE_PRFT:
+		return prft_New();
 
 #ifndef GPAC_DISABLE_TTXT
-	case GF_ISOM_BOX_TYPE_STSE:	return stse_New();
-	case GF_ISOM_BOX_TYPE_STTC: return boxstring_New(GF_ISOM_BOX_TYPE_STTC);
-
-	case GF_ISOM_BOX_TYPE_VTCU: return vtcu_New();
-	case GF_ISOM_BOX_TYPE_VTTE: return vtte_New();
-	case GF_ISOM_BOX_TYPE_VTTC: return boxstring_New(GF_ISOM_BOX_TYPE_VTTC);
-	case GF_ISOM_BOX_TYPE_CTIM: return boxstring_New(GF_ISOM_BOX_TYPE_CTIM);
-	case GF_ISOM_BOX_TYPE_IDEN: return boxstring_New(GF_ISOM_BOX_TYPE_IDEN);
-	case GF_ISOM_BOX_TYPE_STTG: return boxstring_New(GF_ISOM_BOX_TYPE_STTG);
-	case GF_ISOM_BOX_TYPE_PAYL: return boxstring_New(GF_ISOM_BOX_TYPE_PAYL);
-	case GF_ISOM_BOX_TYPE_WVTT: return wvtt_New();
-
-	case GF_ISOM_BOX_TYPE_STPP: return stpp_New();
-	case GF_ISOM_BOX_TYPE_SBTT: return metx_New(GF_ISOM_BOX_TYPE_SBTT);
+	case GF_ISOM_BOX_TYPE_STXT:
+		return stxt_New();
+	case GF_ISOM_BOX_TYPE_STTC:
+		return boxstring_New(GF_ISOM_BOX_TYPE_STTC);
+
+	case GF_ISOM_BOX_TYPE_VTCU:
+		return vtcu_New();
+	case GF_ISOM_BOX_TYPE_VTTE:
+		return vtte_New();
+	case GF_ISOM_BOX_TYPE_VTTC:
+		return boxstring_New(GF_ISOM_BOX_TYPE_VTTC);
+	case GF_ISOM_BOX_TYPE_CTIM:
+		return boxstring_New(GF_ISOM_BOX_TYPE_CTIM);
+	case GF_ISOM_BOX_TYPE_IDEN:
+		return boxstring_New(GF_ISOM_BOX_TYPE_IDEN);
+	case GF_ISOM_BOX_TYPE_STTG:
+		return boxstring_New(GF_ISOM_BOX_TYPE_STTG);
+	case GF_ISOM_BOX_TYPE_VTTA:
+		return boxstring_New(GF_ISOM_BOX_TYPE_VTTA);
+	case GF_ISOM_BOX_TYPE_PAYL:
+		return boxstring_New(GF_ISOM_BOX_TYPE_PAYL);
+	case GF_ISOM_BOX_TYPE_WVTT:
+		return wvtt_New();
+
+	case GF_ISOM_BOX_TYPE_STPP:
+		return stpp_New();
+	case GF_ISOM_BOX_TYPE_SBTT:
+		return metx_New(GF_ISOM_BOX_TYPE_SBTT);
 #endif //GPAC_DISABLE_TTXT
 
-	case GF_ISOM_BOX_TYPE_ADKM: return adkm_New();
-	case GF_ISOM_BOX_TYPE_AHDR: return ahdr_New();
-	case GF_ISOM_BOX_TYPE_APRM: return aprm_New();
-	case GF_ISOM_BOX_TYPE_AEIB: return aeib_New();
-	case GF_ISOM_BOX_TYPE_AKEY: return akey_New();
-	case GF_ISOM_BOX_TYPE_FLXS: return flxs_New();
-	case GF_ISOM_BOX_TYPE_ADAF: return adaf_New();
+	case GF_ISOM_BOX_TYPE_ADKM:
+		return adkm_New();
+	case GF_ISOM_BOX_TYPE_AHDR:
+		return ahdr_New();
+	case GF_ISOM_BOX_TYPE_APRM:
+		return aprm_New();
+	case GF_ISOM_BOX_TYPE_AEIB:
+		return aeib_New();
+	case GF_ISOM_BOX_TYPE_AKEY:
+		return akey_New();
+	case GF_ISOM_BOX_TYPE_FLXS:
+		return flxs_New();
+	case GF_ISOM_BOX_TYPE_ADAF:
+		return adaf_New();
 
 	default:
 		a = defa_New();
@@ -733,115 +910,294 @@
 	case GF_ISOM_BOX_TYPE_SKIP:
 		free_del(a);
 		return;
-	case GF_ISOM_BOX_TYPE_MDAT: mdat_del(a); return;
-	case GF_ISOM_BOX_TYPE_MOOV: moov_del(a); return;
-	case GF_ISOM_BOX_TYPE_MVHD: mvhd_del(a); return;
-	case GF_ISOM_BOX_TYPE_MDHD: mdhd_del(a); return;
-	case GF_ISOM_BOX_TYPE_VMHD: vmhd_del(a); return;
-	case GF_ISOM_BOX_TYPE_SMHD: smhd_del(a); return;
-	case GF_ISOM_BOX_TYPE_HMHD: hmhd_del(a); return;
+	case GF_ISOM_BOX_TYPE_MDAT:
+		mdat_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MOOV:
+		moov_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MVHD:
+		mvhd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MDHD:
+		mdhd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_VMHD:
+		vmhd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SMHD:
+		smhd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_HMHD:
+		hmhd_del(a);
+		return;
 	case GF_ISOM_BOX_TYPE_ODHD:
 	case GF_ISOM_BOX_TYPE_CRHD:
 	case GF_ISOM_BOX_TYPE_SDHD:
 	case GF_ISOM_BOX_TYPE_NMHD:
 		nmhd_del(a);
 		return;
-	case GF_ISOM_BOX_TYPE_STBL: stbl_del(a); return;
-	case GF_ISOM_BOX_TYPE_DINF: dinf_del(a); return;
-	case GF_ISOM_BOX_TYPE_URL: url_del(a); return;
-	case GF_ISOM_BOX_TYPE_URN: urn_del(a); return;
-	case GF_ISOM_BOX_TYPE_CHPL: chpl_del(a); return;
-	case GF_ISOM_BOX_TYPE_CPRT: cprt_del(a); return;
-	case GF_ISOM_BOX_TYPE_HDLR: hdlr_del(a); return;
-	case GF_ISOM_BOX_TYPE_IODS: iods_del(a); return;
-	case GF_ISOM_BOX_TYPE_TRAK: trak_del(a); return;
-	case GF_ISOM_BOX_TYPE_MP4S: mp4s_del(a); return;
-	case GF_4CC('2','6','4','b'): 
-	case GF_ISOM_BOX_TYPE_MP4V: 
-		mp4v_del(a); 
-		return;
-	case GF_ISOM_BOX_TYPE_MP4A: mp4a_del(a); return;
-	case GF_ISOM_BOX_TYPE_GNRM: gnrm_del(a); return;
-	case GF_ISOM_BOX_TYPE_GNRV: gnrv_del(a); return;
-	case GF_ISOM_BOX_TYPE_GNRA: gnra_del(a); return;
-	case GF_ISOM_BOX_TYPE_EDTS: edts_del(a); return;
-	case GF_ISOM_BOX_TYPE_UDTA: udta_del(a); return;
-	case GF_ISOM_BOX_TYPE_DREF: dref_del(a); return;
-	case GF_ISOM_BOX_TYPE_STSD: stsd_del(a); return;
-	case GF_ISOM_BOX_TYPE_STTS: stts_del(a); return;
-	case GF_ISOM_BOX_TYPE_CTTS: ctts_del(a); return;
-	case GF_ISOM_BOX_TYPE_CSLG: cslg_del(a); return;
-	case GF_ISOM_BOX_TYPE_STSH: stsh_del(a); return;
-	case GF_ISOM_BOX_TYPE_ELST: elst_del(a); return;
-	case GF_ISOM_BOX_TYPE_STSC: stsc_del(a); return;
+	case GF_ISOM_BOX_TYPE_STBL:
+		stbl_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DINF:
+		dinf_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_URL:
+		url_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_URN:
+		urn_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_CHPL:
+		chpl_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_CPRT:
+		cprt_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_KIND:
+		kind_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_HDLR:
+		hdlr_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_IODS:
+		iods_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TRAK:
+		trak_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MP4S:
+		mp4s_del(a);
+		return;
+	case GF_4CC('2','6','4','b'):
+	case GF_ISOM_BOX_TYPE_MP4V:
+		mp4v_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MP4A:
+		mp4a_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_GNRM:
+		gnrm_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_GNRV:
+		gnrv_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_GNRA:
+		gnra_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_EDTS:
+		edts_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_UDTA:
+		udta_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DREF:
+		dref_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STSD:
+		stsd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STTS:
+		stts_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_CTTS:
+		ctts_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_CSLG:
+		cslg_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STSH:
+		stsh_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ELST:
+		elst_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STSC:
+		stsc_del(a);
+		return;
 	case GF_ISOM_BOX_TYPE_STZ2:
 	case GF_ISOM_BOX_TYPE_STSZ:
 		stsz_del(a);
 		return;
-	case GF_ISOM_BOX_TYPE_STCO: stco_del(a); return;
-	case GF_ISOM_BOX_TYPE_STSS: stss_del(a); return;
-	case GF_ISOM_BOX_TYPE_STDP: stdp_del(a); return;
-	case GF_ISOM_BOX_TYPE_SDTP: sdtp_del(a); return;
-	case GF_ISOM_BOX_TYPE_CO64: co64_del(a); return;
-	case GF_ISOM_BOX_TYPE_ESDS: esds_del(a); return;
-	case GF_ISOM_BOX_TYPE_MINF: minf_del(a); return;
-	case GF_ISOM_BOX_TYPE_TKHD: tkhd_del(a); return;
-	case GF_ISOM_BOX_TYPE_TREF: tref_del(a); return;
-	case GF_ISOM_BOX_TYPE_MDIA: mdia_del(a); return;
-	case GF_ISOM_BOX_TYPE_FTYP: 
-	case GF_ISOM_BOX_TYPE_STYP: 
-        ftyp_del(a); 
-        return;
-	case GF_ISOM_BOX_TYPE_PADB: padb_del(a); return;
-	case GF_ISOM_BOX_TYPE_VOID: void_del(a); return;
-	case GF_ISOM_BOX_TYPE_STSF: stsf_del(a); return;
-	case GF_ISOM_BOX_TYPE_PDIN: pdin_del(a); return;
-	case GF_ISOM_BOX_TYPE_SBGP: sbgp_del(a); return;
-	case GF_ISOM_BOX_TYPE_SGPD: sgpd_del(a); return;
-	case GF_ISOM_BOX_TYPE_SAIZ: saiz_del(a); return;
-	case GF_ISOM_BOX_TYPE_SAIO: saio_del(a); return;
-	case GF_ISOM_BOX_TYPE_PSSH: pssh_del(a); return;
-	case GF_ISOM_BOX_TYPE_TENC: tenc_del(a); return;
+	case GF_ISOM_BOX_TYPE_STCO:
+		stco_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STSS:
+		stss_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STDP:
+		stdp_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SDTP:
+		sdtp_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_CO64:
+		co64_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ESDS:
+		esds_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MINF:
+		minf_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TKHD:
+		tkhd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TREF:
+		tref_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MDIA:
+		mdia_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ELNG:
+		elng_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_FTYP:
+	case GF_ISOM_BOX_TYPE_STYP:
+		ftyp_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_PADB:
+		padb_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_VOID:
+		void_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STSF:
+		stsf_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_PDIN:
+		pdin_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SBGP:
+		sbgp_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SGPD:
+		sgpd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SAIZ:
+		saiz_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SAIO:
+		saio_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_PSSH:
+		pssh_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TENC:
+		tenc_del(a);
+		return;
 
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	case GF_ISOM_BOX_TYPE_RTP_STSD: ghnt_del(a); return;
-	case GF_ISOM_BOX_TYPE_RTPO: rtpo_del(a); return;
-	case GF_ISOM_BOX_TYPE_HNTI: hnti_del(a); return;
-	case GF_ISOM_BOX_TYPE_SDP: sdp_del(a); return;
-	case GF_ISOM_BOX_TYPE_HINF: hinf_del(a); return;
-	case GF_ISOM_BOX_TYPE_RELY: rely_del(a); return;
-	case GF_ISOM_BOX_TYPE_TIMS: tims_del(a); return;
-	case GF_ISOM_BOX_TYPE_TSRO: tsro_del(a); return;
-	case GF_ISOM_BOX_TYPE_SNRO: snro_del(a); return;
-	case GF_ISOM_BOX_TYPE_TRPY: trpy_del(a); return;
-	case GF_ISOM_BOX_TYPE_NUMP: nump_del(a); return;
-	case GF_ISOM_BOX_TYPE_TOTL: totl_del(a); return;
-	case GF_ISOM_BOX_TYPE_NPCK: npck_del(a); return;
-	case GF_ISOM_BOX_TYPE_TPYL: tpyl_del(a); return;
-	case GF_ISOM_BOX_TYPE_TPAY: tpay_del(a); return;
-	case GF_ISOM_BOX_TYPE_MAXR: maxr_del(a); return;
-	case GF_ISOM_BOX_TYPE_DMED: dmed_del(a); return;
-	case GF_ISOM_BOX_TYPE_DIMM: dimm_del(a); return;
-	case GF_ISOM_BOX_TYPE_DREP: drep_del(a); return;
-	case GF_ISOM_BOX_TYPE_TMIN: tmin_del(a); return;
-	case GF_ISOM_BOX_TYPE_TMAX: tmax_del(a); return;
-	case GF_ISOM_BOX_TYPE_PMAX: pmax_del(a); return;
-	case GF_ISOM_BOX_TYPE_DMAX: dmax_del(a); return;
-	case GF_ISOM_BOX_TYPE_PAYT: payt_del(a); return;
-	case GF_ISOM_BOX_TYPE_NAME: name_del(a); return;
+	case GF_ISOM_BOX_TYPE_RTP_STSD:
+		ghnt_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_RTPO:
+		rtpo_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_HNTI:
+		hnti_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SDP:
+		sdp_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_HINF:
+		hinf_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_RELY:
+		rely_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TIMS:
+		tims_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TSRO:
+		tsro_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SNRO:
+		snro_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TRPY:
+		trpy_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_NUMP:
+		nump_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TOTL:
+		totl_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_NPCK:
+		npck_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TPYL:
+		tpyl_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TPAY:
+		tpay_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MAXR:
+		maxr_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DMED:
+		dmed_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DIMM:
+		dimm_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DREP:
+		drep_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TMIN:
+		tmin_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TMAX:
+		tmax_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_PMAX:
+		pmax_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DMAX:
+		dmax_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_PAYT:
+		payt_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_NAME:
+		name_del(a);
+		return;
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	case GF_ISOM_BOX_TYPE_MVEX: mvex_del(a); return;
-	case GF_ISOM_BOX_TYPE_MEHD: mehd_del(a); return;
-	case GF_ISOM_BOX_TYPE_TREX: trex_del(a); return;
-	case GF_ISOM_BOX_TYPE_MOOF: moof_del(a); return;
-	case GF_ISOM_BOX_TYPE_MFHD: mfhd_del(a); return;
-	case GF_ISOM_BOX_TYPE_TRAF: traf_del(a); return;
-	case GF_ISOM_BOX_TYPE_TFHD: tfhd_del(a); return;
-	case GF_ISOM_BOX_TYPE_TFDT: tfdt_del(a); return;
-	case GF_ISOM_BOX_TYPE_TRUN: trun_del(a); return;
+	case GF_ISOM_BOX_TYPE_MVEX:
+		mvex_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MEHD:
+		mehd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TREX:
+		trex_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TREP:
+		trep_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MOOF:
+		moof_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MFHD:
+		mfhd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TRAF:
+		traf_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TFHD:
+		tfhd_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TFDT:
+		tfdt_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TRUN:
+		trun_del(a);
+		return;
 #endif
 
 	case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -851,91 +1207,156 @@
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		gppa_del(a);
 		return;
-	case GF_ISOM_SUBTYPE_3GP_H263: gppv_del(a); return;
-	case GF_ISOM_BOX_TYPE_DAMR: 
-	case GF_ISOM_BOX_TYPE_DEVC: 
+	case GF_ISOM_SUBTYPE_3GP_H263:
+		gppv_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DAMR:
+	case GF_ISOM_BOX_TYPE_DEVC:
 	case GF_ISOM_BOX_TYPE_DQCP:
 	case GF_ISOM_BOX_TYPE_DSMV:
-	case GF_ISOM_BOX_TYPE_D263: 
-		gppc_del(a); return;
+	case GF_ISOM_BOX_TYPE_D263:
+		gppc_del(a);
+		return;
 
 	/*AVC boxes*/
-	case GF_ISOM_BOX_TYPE_AVCC: 
-	case GF_ISOM_BOX_TYPE_SVCC: 
-		avcc_del(a); return;
-	case GF_ISOM_BOX_TYPE_BTRT: btrt_del(a); return;
-	case GF_ISOM_BOX_TYPE_M4DS: m4ds_del(a); return;
-	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_AVCC:
+	case GF_ISOM_BOX_TYPE_SVCC:
+		avcc_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_BTRT:
+		btrt_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_M4DS:
+		m4ds_del(a);
+		return;
+	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_HVC1:
 	case GF_ISOM_BOX_TYPE_HEV1:
 	case GF_ISOM_BOX_TYPE_HVC2:
 	case GF_ISOM_BOX_TYPE_HEV2:
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
-		mp4v_del(a); return;
+	case GF_ISOM_BOX_TYPE_HVT1:
+		mp4v_del(a);
+		return;
 	case GF_ISOM_BOX_TYPE_HVCC:
 	case GF_ISOM_BOX_TYPE_SHCC:
-		hvcc_del(a); return;
+		hvcc_del(a);
+		return;
 
 	/*3GPP streaming text*/
-	case GF_ISOM_BOX_TYPE_FTAB: ftab_del(a); return;
-	case GF_ISOM_BOX_TYPE_TX3G: tx3g_del(a); return;
-	case GF_ISOM_BOX_TYPE_TEXT: text_del(a); return;
-	case GF_ISOM_BOX_TYPE_STYL: styl_del(a); return;
-	case GF_ISOM_BOX_TYPE_HLIT: hlit_del(a); return;
-	case GF_ISOM_BOX_TYPE_HCLR: hclr_del(a); return;
-	case GF_ISOM_BOX_TYPE_KROK: krok_del(a); return;
-	case GF_ISOM_BOX_TYPE_DLAY: dlay_del(a); return;
-	case GF_ISOM_BOX_TYPE_HREF: href_del(a); return;
-	case GF_ISOM_BOX_TYPE_TBOX: tbox_del(a); return;
-	case GF_ISOM_BOX_TYPE_BLNK: blnk_del(a); return;
-	case GF_ISOM_BOX_TYPE_TWRP: twrp_del(a); return;
+	case GF_ISOM_BOX_TYPE_FTAB:
+		ftab_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TX3G:
+		tx3g_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TEXT:
+		text_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STYL:
+		styl_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_HLIT:
+		hlit_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_HCLR:
+		hclr_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_KROK:
+		krok_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DLAY:
+		dlay_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_HREF:
+		href_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TBOX:
+		tbox_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_BLNK:
+		blnk_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TWRP:
+		twrp_del(a);
+		return;
 
 	/* ISMA 1.0 Encryption and Authentication V 1.0 */
-	case GF_ISOM_BOX_TYPE_IKMS:			iKMS_del(a); return;
-	case GF_ISOM_BOX_TYPE_ISFM:	iSFM_del(a); return;
+	case GF_ISOM_BOX_TYPE_IKMS:
+		iKMS_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ISFM:
+		iSFM_del(a);
+		return;
 
 	/* ISO FF extensions for MPEG-21 */
-	case GF_ISOM_BOX_TYPE_META: meta_del(a); return;
-	case GF_ISOM_BOX_TYPE_XML: xml_del(a); return;
-	case GF_ISOM_BOX_TYPE_BXML: bxml_del(a); return;
-	case GF_ISOM_BOX_TYPE_ILOC: iloc_del(a); return;
-	case GF_ISOM_BOX_TYPE_PITM: pitm_del(a); return;
-	case GF_ISOM_BOX_TYPE_IPRO: ipro_del(a); return;
-	case GF_ISOM_BOX_TYPE_INFE: infe_del(a); return;
-	case GF_ISOM_BOX_TYPE_IINF: iinf_del(a); return;
-	case GF_ISOM_BOX_TYPE_SINF:	sinf_del(a); return;
-	case GF_ISOM_BOX_TYPE_FRMA:	frma_del(a); return;
-	case GF_ISOM_BOX_TYPE_SCHM:		schm_del(a); return;
-	case GF_ISOM_BOX_TYPE_SCHI: schi_del(a); return;
-
-	case GF_ISOM_BOX_TYPE_ENCA: 
+	case GF_ISOM_BOX_TYPE_META:
+		meta_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_XML:
+		xml_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_BXML:
+		bxml_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ILOC:
+		iloc_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_PITM:
+		pitm_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_IPRO:
+		ipro_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_INFE:
+		infe_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_IINF:
+		iinf_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SINF:
+		sinf_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_FRMA:
+		frma_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SCHM:
+		schm_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SCHI:
+		schi_del(a);
+		return;
+
+	case GF_ISOM_BOX_TYPE_ENCA:
 	case GF_ISOM_BOX_TYPE_ENCV:
 	case GF_ISOM_BOX_TYPE_ENCS:
-		{
-			GF_ProtectionInfoBox *sinf = gf_list_get(((GF_SampleEntryBox *)a)->protections, 0);
-			a->type = sinf->original_format->data_format;
-			gf_isom_box_del(a); 
-		}
+	{
+		GF_ProtectionInfoBox *sinf = gf_list_get(((GF_SampleEntryBox *)a)->protections, 0);
+		a->type = sinf->original_format->data_format;
+		gf_isom_box_del(a);
+	}
+	return;
+	case GF_ISOM_BOX_TYPE_SENC:
+		senc_del(a);
 		return;
-	case GF_ISOM_BOX_TYPE_SENC: senc_del(a); return;
 	case GF_ISOM_BOX_TYPE_UUID:
 		switch (((GF_UnknownUUIDBox *)a)->internal_4cc) {
-		case GF_ISOM_BOX_UUID_TENC: 
+		case GF_ISOM_BOX_UUID_TENC:
 			piff_tenc_del(a);
-			return; 
-		case GF_ISOM_BOX_UUID_PSEC: 
+			return;
+		case GF_ISOM_BOX_UUID_PSEC:
 			piff_psec_del(a);
-			return; 
-		case GF_ISOM_BOX_UUID_PSSH: 
+			return;
+		case GF_ISOM_BOX_UUID_PSSH:
 			piff_pssh_del(a);
-			return; 
-		case GF_ISOM_BOX_UUID_TFRF: 
-		case GF_ISOM_BOX_UUID_TFXD: 
+			return;
+		case GF_ISOM_BOX_UUID_TFRF:
+		case GF_ISOM_BOX_UUID_TFXD:
 		default:
 			uuid_del(a);
 			return;
@@ -944,15 +1365,25 @@
 
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/* Adobe extensions */
-	case GF_ISOM_BOX_TYPE_ABST: abst_del(a); return;
-	case GF_ISOM_BOX_TYPE_AFRA: afra_del(a); return;
-	case GF_ISOM_BOX_TYPE_ASRT: asrt_del(a); return;
-	case GF_ISOM_BOX_TYPE_AFRT: afrt_del(a); return;
+	case GF_ISOM_BOX_TYPE_ABST:
+		abst_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_AFRA:
+		afra_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ASRT:
+		asrt_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_AFRT:
+		afrt_del(a);
+		return;
 #endif
 
 	/* Apple extensions */
-	case GF_ISOM_BOX_TYPE_ILST: ilst_del(a); return;
-	
+	case GF_ISOM_BOX_TYPE_ILST:
+		ilst_del(a);
+		return;
+
 	case GF_ISOM_BOX_TYPE_0xA9NAM:
 	case GF_ISOM_BOX_TYPE_0xA9CMT:
 	case GF_ISOM_BOX_TYPE_0xA9DAY:
@@ -978,66 +1409,141 @@
 		ListItem_del(a);
 		return;
 
-	case GF_ISOM_BOX_TYPE_DATA: data_del(a); return;
+	case GF_ISOM_BOX_TYPE_DATA:
+		data_del(a);
+		return;
 
-	case GF_ISOM_BOX_TYPE_OHDR: ohdr_del(a); return;
-	case GF_ISOM_BOX_TYPE_GRPI: grpi_del(a); return;
-	case GF_ISOM_BOX_TYPE_MDRI: mdri_del(a); return;
-	case GF_ISOM_BOX_TYPE_ODTT: odtt_del(a); return;
-	case GF_ISOM_BOX_TYPE_ODRB: odrb_del(a); return;
-	case GF_ISOM_BOX_TYPE_ODKM: odkm_del(a); return;
-	case GF_ISOM_BOX_TYPE_ODAF: iSFM_del(a); return;
+	case GF_ISOM_BOX_TYPE_OHDR:
+		ohdr_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_GRPI:
+		grpi_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_MDRI:
+		mdri_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ODTT:
+		odtt_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ODRB:
+		odrb_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ODKM:
+		odkm_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ODAF:
+		iSFM_del(a);
+		return;
 
-	case GF_ISOM_BOX_TYPE_PASP: pasp_del(a); return;
-	case GF_ISOM_BOX_TYPE_TSEL: tsel_del(a); return;
+	case GF_ISOM_BOX_TYPE_PASP:
+		pasp_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_TSEL:
+		tsel_del(a);
+		return;
 
 	case GF_ISOM_BOX_TYPE_METX:
 	case GF_ISOM_BOX_TYPE_METT:
 		metx_del(a);
 		return;
 
-	case GF_ISOM_BOX_TYPE_DIMS: dims_del(a); return;
-	case GF_ISOM_BOX_TYPE_DIMC: dimC_del(a); return;
-	case GF_ISOM_BOX_TYPE_DIST: diST_del(a); return;
+	case GF_ISOM_BOX_TYPE_DIMS:
+		dims_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DIMC:
+		dimC_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DIST:
+		diST_del(a);
+		return;
 
-	case GF_ISOM_BOX_TYPE_AC3: ac3_del(a); return;
-	case GF_ISOM_BOX_TYPE_DAC3: dac3_del(a); return;
+	case GF_ISOM_BOX_TYPE_AC3:
+		ac3_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_DAC3:
+		dac3_del(a);
+		return;
 
-	case GF_ISOM_BOX_TYPE_LSRC: lsrc_del(a); return;
-	case GF_ISOM_BOX_TYPE_LSR1: lsr1_del(a); return;
+	case GF_ISOM_BOX_TYPE_LSRC:
+		lsrc_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_LSR1:
+		lsr1_del(a);
+		return;
 
-	case GF_ISOM_BOX_TYPE_SIDX: sidx_del(a); return;
-	case GF_ISOM_BOX_TYPE_PCRB: pcrb_del(a); return;
-	case GF_ISOM_BOX_TYPE_SUBS: subs_del(a); return;
-	case GF_ISOM_BOX_TYPE_RVCC: rvcc_del(a); return;
+	case GF_ISOM_BOX_TYPE_SIDX:
+		sidx_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_PCRB:
+		pcrb_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SUBS:
+		subs_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_RVCC:
+		rvcc_del(a);
+		return;
 
-	case GF_ISOM_BOX_TYPE_PRFT: prft_del(a); return;
+	case GF_ISOM_BOX_TYPE_PRFT:
+		prft_del(a);
+		return;
 
 #ifndef GPAC_DISABLE_TTXT
-	case GF_ISOM_BOX_TYPE_STSE:	stse_del(a); return;
-	case GF_ISOM_BOX_TYPE_STTC: boxstring_del(a); return;
+	case GF_ISOM_BOX_TYPE_STXT:
+		stxt_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_STTC:
+		boxstring_del(a);
+		return;
 
-	case GF_ISOM_BOX_TYPE_VTCU: vtcu_del(a); return;
-	case GF_ISOM_BOX_TYPE_VTTE: vtte_del(a); return;
-	case GF_ISOM_BOX_TYPE_VTTC: boxstring_del(a); return;
-	case GF_ISOM_BOX_TYPE_CTIM: boxstring_del(a); return;
-	case GF_ISOM_BOX_TYPE_IDEN: boxstring_del(a); return;
-	case GF_ISOM_BOX_TYPE_STTG: boxstring_del(a); return;
-	case GF_ISOM_BOX_TYPE_PAYL: boxstring_del(a); return;
-	case GF_ISOM_BOX_TYPE_WVTT: wvtt_del(a); return;
+	case GF_ISOM_BOX_TYPE_VTCU:
+		vtcu_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_VTTE:
+		vtte_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_VTTC:
+	case GF_ISOM_BOX_TYPE_CTIM:
+	case GF_ISOM_BOX_TYPE_IDEN:
+	case GF_ISOM_BOX_TYPE_STTG:
+	case GF_ISOM_BOX_TYPE_VTTA:
+	case GF_ISOM_BOX_TYPE_PAYL:
+		boxstring_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_WVTT:
+		wvtt_del(a);
+		return;
 
-	case GF_ISOM_BOX_TYPE_STPP: stpp_del(a); return;
-	case GF_ISOM_BOX_TYPE_SBTT: metx_del(a); return;
+	case GF_ISOM_BOX_TYPE_STPP:
+		stpp_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_SBTT:
+		metx_del(a);
+		return;
 
 #endif // GPAC_DISABLE_TTXT
 
-	case GF_ISOM_BOX_TYPE_ADKM: adkm_del(a); return;
-	case GF_ISOM_BOX_TYPE_AHDR: ahdr_del(a); return;	
-	case GF_ISOM_BOX_TYPE_APRM: aprm_del(a); return;
-	case GF_ISOM_BOX_TYPE_AEIB: aeib_del(a); return;
-	case GF_ISOM_BOX_TYPE_AKEY: akey_del(a); return;
-	case GF_ISOM_BOX_TYPE_FLXS: flxs_del(a); return;
-	case GF_ISOM_BOX_TYPE_ADAF: adaf_del(a); return;
+	case GF_ISOM_BOX_TYPE_ADKM:
+		adkm_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_AHDR:
+		ahdr_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_APRM:
+		aprm_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_AEIB:
+		aeib_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_AKEY:
+		akey_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_FLXS:
+		flxs_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_ADAF:
+		adaf_del(a);
+		return;
 
 	default:
 		defa_del(a);
@@ -1054,108 +1560,197 @@
 	case GF_ISOM_BOX_TYPE_FREE:
 	case GF_ISOM_BOX_TYPE_SKIP:
 		return free_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MDAT: return mdat_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MOOV: return moov_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MVHD: return mvhd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MDHD: return mdhd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_VMHD: return vmhd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SMHD: return smhd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_HMHD: return hmhd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MDAT:
+		return mdat_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MOOV:
+		return moov_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MVHD:
+		return mvhd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MDHD:
+		return mdhd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_VMHD:
+		return vmhd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SMHD:
+		return smhd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_HMHD:
+		return hmhd_Read(a, bs);
 	case GF_ISOM_BOX_TYPE_ODHD:
 	case GF_ISOM_BOX_TYPE_CRHD:
 	case GF_ISOM_BOX_TYPE_SDHD:
 	case GF_ISOM_BOX_TYPE_NMHD:
 	case GF_ISOM_BOX_TYPE_STHD:
 		return nmhd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STBL: return stbl_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DINF: return dinf_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_URL: return url_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_URN: return urn_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_CPRT: return cprt_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_HDLR: return hdlr_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_IODS: return iods_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TRAK: return trak_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MP4S: return mp4s_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MP4V: return mp4v_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MP4A: return mp4a_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_EDTS: return edts_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_UDTA: return udta_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DREF: return dref_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STSD: return stsd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STTS: return stts_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_CTTS: return ctts_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_CSLG: return cslg_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STSH: return stsh_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ELST: return elst_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STSC: return stsc_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STBL:
+		return stbl_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DINF:
+		return dinf_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_URL:
+		return url_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_URN:
+		return urn_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_CPRT:
+		return cprt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_KIND:
+		return kind_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_HDLR:
+		return hdlr_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IODS:
+		return iods_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TRAK:
+		return trak_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MP4S:
+		return mp4s_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MP4V:
+		return mp4v_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MP4A:
+		return mp4a_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_EDTS:
+		return edts_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_UDTA:
+		return udta_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DREF:
+		return dref_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STSD:
+		return stsd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STTS:
+		return stts_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_CTTS:
+		return ctts_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_CSLG:
+		return cslg_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STSH:
+		return stsh_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ELST:
+		return elst_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STSC:
+		return stsc_Read(a, bs);
 	case GF_ISOM_BOX_TYPE_STZ2:
 	case GF_ISOM_BOX_TYPE_STSZ:
 		return stsz_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STCO: return stco_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STSS: return stss_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STDP: return stdp_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SDTP: return sdtp_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_CO64: return co64_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ESDS: return esds_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MINF: return minf_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TKHD: return tkhd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TREF: return tref_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MDIA: return mdia_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_CHPL: return chpl_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_FTYP: 
-	case GF_ISOM_BOX_TYPE_STYP: 
-        return ftyp_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PADB: return padb_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_VOID: return void_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STSF: return stsf_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PDIN: return pdin_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SBGP: return sbgp_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SGPD: return sgpd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SAIZ: return saiz_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SAIO: return saio_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PSSH: return pssh_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TENC: return tenc_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STCO:
+		return stco_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STSS:
+		return stss_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STDP:
+		return stdp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SDTP:
+		return sdtp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_CO64:
+		return co64_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ESDS:
+		return esds_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MINF:
+		return minf_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TKHD:
+		return tkhd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TREF:
+		return tref_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MDIA:
+		return mdia_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ELNG:
+		return elng_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_CHPL:
+		return chpl_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_FTYP:
+	case GF_ISOM_BOX_TYPE_STYP:
+		return ftyp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PADB:
+		return padb_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_VOID:
+		return void_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STSF:
+		return stsf_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PDIN:
+		return pdin_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SBGP:
+		return sbgp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SGPD:
+		return sgpd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SAIZ:
+		return saiz_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SAIO:
+		return saio_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PSSH:
+		return pssh_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TENC:
+		return tenc_Read(a, bs);
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	case GF_ISOM_BOX_TYPE_RTP_STSD: return ghnt_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_RTPO: return rtpo_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_HNTI: return hnti_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SDP: return sdp_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_HINF: return hinf_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_RELY: return rely_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TIMS: return tims_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TSRO: return tsro_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SNRO: return snro_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TRPY: return trpy_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_NUMP: return nump_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TOTL: return totl_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_NPCK: return npck_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TPYL: return tpyl_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TPAY: return tpay_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MAXR: return maxr_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DMED: return dmed_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DIMM: return dimm_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DREP: return drep_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TMIN: return tmin_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TMAX: return tmax_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PMAX: return pmax_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DMAX: return dmax_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PAYT: return payt_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_NAME: return name_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_RTP_STSD:
+		return ghnt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_RTPO:
+		return rtpo_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_HNTI:
+		return hnti_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SDP:
+		return sdp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_HINF:
+		return hinf_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_RELY:
+		return rely_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TIMS:
+		return tims_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TSRO:
+		return tsro_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SNRO:
+		return snro_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TRPY:
+		return trpy_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_NUMP:
+		return nump_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TOTL:
+		return totl_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_NPCK:
+		return npck_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TPYL:
+		return tpyl_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TPAY:
+		return tpay_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MAXR:
+		return maxr_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DMED:
+		return dmed_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DIMM:
+		return dimm_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DREP:
+		return drep_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TMIN:
+		return tmin_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TMAX:
+		return tmax_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PMAX:
+		return pmax_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DMAX:
+		return dmax_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PAYT:
+		return payt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_NAME:
+		return name_Read(a, bs);
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
-	
+
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	case GF_ISOM_BOX_TYPE_MVEX: return mvex_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MEHD: return mehd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TREX: return trex_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MOOF: return moof_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MFHD: return mfhd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TRAF: return traf_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TFHD: return tfhd_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TFDT: return tfdt_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TRUN: return trun_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MVEX:
+		return mvex_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MEHD:
+		return mehd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TREX:
+		return trex_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TREP:
+		return trep_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MOOF:
+		return moof_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MFHD:
+		return mfhd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TRAF:
+		return traf_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TFHD:
+		return tfhd_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TFDT:
+		return tfdt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TRUN:
+		return trun_Read(a, bs);
 #endif
-	
+
 
 	/*3GPP boxes*/
 	case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -1164,91 +1759,133 @@
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		return gppa_Read(a, bs);
-	case GF_ISOM_SUBTYPE_3GP_H263: return gppv_Read(a, bs);
+	case GF_ISOM_SUBTYPE_3GP_H263:
+		return gppv_Read(a, bs);
 	case GF_ISOM_BOX_TYPE_DAMR:
-	case GF_ISOM_BOX_TYPE_DEVC: 
+	case GF_ISOM_BOX_TYPE_DEVC:
 	case GF_ISOM_BOX_TYPE_DQCP:
 	case GF_ISOM_BOX_TYPE_DSMV:
 	case GF_ISOM_BOX_TYPE_D263:
 		return gppc_Read(a, bs);
 
-	case GF_ISOM_BOX_TYPE_AVCC: 
-	case GF_ISOM_BOX_TYPE_SVCC: 
+	case GF_ISOM_BOX_TYPE_AVCC:
+	case GF_ISOM_BOX_TYPE_SVCC:
 		return avcc_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_BTRT: return btrt_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_M4DS: return m4ds_Read(a, bs);
-	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_BTRT:
+		return btrt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_M4DS:
+		return m4ds_Read(a, bs);
+	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_HVC1:
 	case GF_ISOM_BOX_TYPE_HEV1:
 	case GF_ISOM_BOX_TYPE_HVC2:
 	case GF_ISOM_BOX_TYPE_HEV2:
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		return mp4v_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_HVCC: 
+	case GF_ISOM_BOX_TYPE_HVCC:
 	case GF_ISOM_BOX_TYPE_SHCC:
 		return hvcc_Read(a, bs);
 
 	/*3GPP streaming text*/
-	case GF_ISOM_BOX_TYPE_FTAB: return ftab_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TEXT: return text_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TX3G: return tx3g_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STYL: return styl_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_HLIT: return hlit_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_HCLR: return hclr_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_KROK: return krok_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DLAY: return dlay_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_HREF: return href_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TBOX: return tbox_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_BLNK: return blnk_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TWRP: return twrp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_FTAB:
+		return ftab_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TEXT:
+		return text_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TX3G:
+		return tx3g_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STYL:
+		return styl_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_HLIT:
+		return hlit_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_HCLR:
+		return hclr_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_KROK:
+		return krok_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DLAY:
+		return dlay_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_HREF:
+		return href_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TBOX:
+		return tbox_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_BLNK:
+		return blnk_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TWRP:
+		return twrp_Read(a, bs);
 
 	/* ISMA 1.0 Encryption and Authentication V 1.0 */
-	case GF_ISOM_BOX_TYPE_IKMS: return iKMS_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ISFM: return iSFM_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IKMS:
+		return iKMS_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ISFM:
+		return iSFM_Read(a, bs);
 
 	/* ISO FF extensions for MPEG-21 */
-	case GF_ISOM_BOX_TYPE_META: return meta_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_XML: return xml_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_BXML: return bxml_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ILOC: return iloc_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PITM: return pitm_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_IPRO: return ipro_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_INFE: return infe_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_IINF: return iinf_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SINF: return sinf_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_FRMA: return frma_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SCHM: return schm_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SCHI: return schi_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ENCA: return mp4a_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ENCV: return mp4v_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ENCS: return mp4s_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SENC: return senc_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_UUID: 
+	case GF_ISOM_BOX_TYPE_META:
+		return meta_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_XML:
+		return xml_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_BXML:
+		return bxml_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ILOC:
+		return iloc_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PITM:
+		return pitm_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IPRO:
+		return ipro_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_INFE:
+		return infe_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IINF:
+		return iinf_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SINF:
+		return sinf_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_FRMA:
+		return frma_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SCHM:
+		return schm_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SCHI:
+		return schi_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ENCA:
+		return mp4a_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ENCV:
+		return mp4v_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ENCS:
+		return mp4s_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SENC:
+		return senc_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_UUID:
 		switch (((GF_UnknownUUIDBox *)a)->internal_4cc) {
-		case GF_ISOM_BOX_UUID_TENC: return piff_tenc_Read(a, bs); 
-		case GF_ISOM_BOX_UUID_PSEC: return piff_psec_Read(a, bs);
-		case GF_ISOM_BOX_UUID_PSSH: return piff_pssh_Read(a, bs);
-		case GF_ISOM_BOX_UUID_TFRF: 
-		case GF_ISOM_BOX_UUID_TFXD: 
+		case GF_ISOM_BOX_UUID_TENC:
+			return piff_tenc_Read(a, bs);
+		case GF_ISOM_BOX_UUID_PSEC:
+			return piff_psec_Read(a, bs);
+		case GF_ISOM_BOX_UUID_PSSH:
+			return piff_pssh_Read(a, bs);
+		case GF_ISOM_BOX_UUID_TFRF:
+		case GF_ISOM_BOX_UUID_TFXD:
 		default:
 			return uuid_Read(a, bs);
 		}
 
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/* Adobe extensions */
-	case GF_ISOM_BOX_TYPE_ABST: return abst_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_AFRA: return afra_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ASRT: return asrt_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_AFRT: return afrt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ABST:
+		return abst_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_AFRA:
+		return afra_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ASRT:
+		return asrt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_AFRT:
+		return afrt_Read(a, bs);
 #endif
 
 	/* Apple extensions */
-	case GF_ISOM_BOX_TYPE_ILST: return ilst_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ILST:
+		return ilst_Read(a, bs);
 
 	case GF_ISOM_BOX_TYPE_0xA9NAM:
 	case GF_ISOM_BOX_TYPE_0xA9CMT:
@@ -1274,64 +1911,102 @@
 	case GF_ISOM_BOX_TYPE_COVR:
 		return ListItem_Read(a, bs);
 
-	case GF_ISOM_BOX_TYPE_DATA: return data_Read(a, bs);
-
-	case GF_ISOM_BOX_TYPE_OHDR: return ohdr_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_GRPI: return grpi_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_MDRI: return mdri_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ODTT: return odtt_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ODRB: return odrb_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ODKM: return odkm_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ODAF: return iSFM_Read(a, bs);
-
-	case GF_ISOM_BOX_TYPE_PASP: return pasp_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_TSEL: return tsel_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DATA:
+		return data_Read(a, bs);
+
+	case GF_ISOM_BOX_TYPE_OHDR:
+		return ohdr_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_GRPI:
+		return grpi_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_MDRI:
+		return mdri_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ODTT:
+		return odtt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ODRB:
+		return odrb_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ODKM:
+		return odkm_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ODAF:
+		return iSFM_Read(a, bs);
+
+	case GF_ISOM_BOX_TYPE_PASP:
+		return pasp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TSEL:
+		return tsel_Read(a, bs);
 
 	case GF_ISOM_BOX_TYPE_METX:
 	case GF_ISOM_BOX_TYPE_METT:
 		return metx_Read(a, bs);
 
-	case GF_ISOM_BOX_TYPE_DIMS: return dims_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DIMC: return dimC_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_DIST: return diST_Read(a, bs);
-
-	case GF_ISOM_BOX_TYPE_AC3: return ac3_Read(a, bs); 
-	case GF_ISOM_BOX_TYPE_DAC3: return dac3_Read(a, bs); 
-
-	case GF_ISOM_BOX_TYPE_LSRC: return lsrc_Read(a, bs); 
-	case GF_ISOM_BOX_TYPE_LSR1: return lsr1_Read(a, bs); 
-
-	case GF_ISOM_BOX_TYPE_SIDX: return sidx_Read(a, bs); 
-	case GF_ISOM_BOX_TYPE_SUBS: return subs_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PCRB: return pcrb_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PRFT: return prft_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DIMS:
+		return dims_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DIMC:
+		return dimC_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DIST:
+		return diST_Read(a, bs);
+
+	case GF_ISOM_BOX_TYPE_AC3:
+		return ac3_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_DAC3:
+		return dac3_Read(a, bs);
+
+	case GF_ISOM_BOX_TYPE_LSRC:
+		return lsrc_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_LSR1:
+		return lsr1_Read(a, bs);
+
+	case GF_ISOM_BOX_TYPE_SIDX:
+		return sidx_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SUBS:
+		return subs_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_RVCC:
+		return rvcc_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PCRB:
+		return pcrb_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PRFT:
+		return prft_Read(a, bs);
 
 #ifndef GPAC_DISABLE_TTXT
-	case GF_ISOM_BOX_TYPE_STSE:	return stse_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STTC: return boxstring_Read(a, bs);
-
-	case GF_ISOM_BOX_TYPE_VTCU: return vtcu_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_VTTE: return vtte_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_VTTC: return boxstring_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_CTIM: return boxstring_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_IDEN: return boxstring_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STTG: return boxstring_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_PAYL: return boxstring_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_WVTT: return wvtt_Read(a, bs);
-
-	case GF_ISOM_BOX_TYPE_STPP: return stpp_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_SBTT: return metx_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STXT:
+		return stxt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STTC:
+		return boxstring_Read(a, bs);
+
+	case GF_ISOM_BOX_TYPE_VTCU:
+		return vtcu_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_VTTE:
+		return vtte_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_VTTC:
+	case GF_ISOM_BOX_TYPE_CTIM:
+	case GF_ISOM_BOX_TYPE_IDEN:
+	case GF_ISOM_BOX_TYPE_STTG:
+	case GF_ISOM_BOX_TYPE_VTTA:
+	case GF_ISOM_BOX_TYPE_PAYL:
+		return boxstring_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_WVTT:
+		return wvtt_Read(a, bs);
+
+	case GF_ISOM_BOX_TYPE_STPP:
+		return stpp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_SBTT:
+		return metx_Read(a, bs);
 
 #endif // GPAC_DISABLE_TTXT
 
-	case GF_ISOM_BOX_TYPE_ADKM: return adkm_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_AHDR: return ahdr_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_APRM: return aprm_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_AEIB: return aeib_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_AKEY: return akey_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_FLXS: return flxs_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_ADAF: return adaf_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ADKM:
+		return adkm_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_AHDR:
+		return ahdr_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_APRM:
+		return aprm_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_AEIB:
+		return aeib_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_AKEY:
+		return akey_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_FLXS:
+		return flxs_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ADAF:
+		return adaf_Read(a, bs);
 
 	default:
 		return defa_Read(a, bs);
@@ -1348,110 +2023,202 @@
 	case GF_ISOM_BOX_TYPE_FREE:
 	case GF_ISOM_BOX_TYPE_SKIP:
 		return free_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MDAT: return mdat_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MOOV: return moov_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MVHD: return mvhd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MDHD: return mdhd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_VMHD: return vmhd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SMHD: return smhd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_HMHD: return hmhd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MDAT:
+		return mdat_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MOOV:
+		return moov_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MVHD:
+		return mvhd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MDHD:
+		return mdhd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_VMHD:
+		return vmhd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SMHD:
+		return smhd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_HMHD:
+		return hmhd_Write(a, bs);
 	case GF_ISOM_BOX_TYPE_ODHD:
 	case GF_ISOM_BOX_TYPE_CRHD:
 	case GF_ISOM_BOX_TYPE_SDHD:
 	case GF_ISOM_BOX_TYPE_NMHD:
 	case GF_ISOM_BOX_TYPE_STHD:
 		return nmhd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STBL: return stbl_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DINF: return dinf_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_URL: return url_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_URN: return urn_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_CHPL: return chpl_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_CPRT: return cprt_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_HDLR: return hdlr_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_IODS: return iods_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TRAK: return trak_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MP4S: return mp4s_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MP4V: return mp4v_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MP4A: return mp4a_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_GNRM: return gnrm_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_GNRV: return gnrv_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_GNRA: return gnra_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_EDTS: return edts_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_UDTA: return udta_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DREF: return dref_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STSD: return stsd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STTS: return stts_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_CTTS: return ctts_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_CSLG: return cslg_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STSH: return stsh_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ELST: return elst_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STSC: return stsc_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STBL:
+		return stbl_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DINF:
+		return dinf_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_URL:
+		return url_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_URN:
+		return urn_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_CHPL:
+		return chpl_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_CPRT:
+		return cprt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_KIND:
+		return kind_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_HDLR:
+		return hdlr_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IODS:
+		return iods_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TRAK:
+		return trak_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MP4S:
+		return mp4s_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MP4V:
+		return mp4v_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MP4A:
+		return mp4a_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_GNRM:
+		return gnrm_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_GNRV:
+		return gnrv_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_GNRA:
+		return gnra_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_EDTS:
+		return edts_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_UDTA:
+		return udta_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DREF:
+		return dref_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STSD:
+		return stsd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STTS:
+		return stts_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_CTTS:
+		return ctts_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_CSLG:
+		return cslg_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STSH:
+		return stsh_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ELST:
+		return elst_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STSC:
+		return stsc_Write(a, bs);
 	case GF_ISOM_BOX_TYPE_STZ2:
 	case GF_ISOM_BOX_TYPE_STSZ:
 		return stsz_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STCO: return stco_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STSS: return stss_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STDP: return stdp_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SDTP: return sdtp_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_CO64: return co64_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ESDS: return esds_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MINF: return minf_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TKHD: return tkhd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TREF: return tref_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MDIA: return mdia_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_FTYP: 
-	case GF_ISOM_BOX_TYPE_STYP: 
-        return ftyp_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_PADB: return padb_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_VOID: return void_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STSF: return stsf_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_PDIN: return pdin_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SBGP: return sbgp_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SGPD: return sgpd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SAIZ: return saiz_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SAIO: return saio_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_PSSH: return pssh_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TENC: return tenc_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STCO:
+		return stco_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STSS:
+		return stss_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STDP:
+		return stdp_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SDTP:
+		return sdtp_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_CO64:
+		return co64_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ESDS:
+		return esds_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MINF:
+		return minf_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TKHD:
+		return tkhd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TREF:
+		return tref_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MDIA:
+		return mdia_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ELNG:
+		return elng_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_FTYP:
+	case GF_ISOM_BOX_TYPE_STYP:
+		return ftyp_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PADB:
+		return padb_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_VOID:
+		return void_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STSF:
+		return stsf_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PDIN:
+		return pdin_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SBGP:
+		return sbgp_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SGPD:
+		return sgpd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SAIZ:
+		return saiz_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SAIO:
+		return saio_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PSSH:
+		return pssh_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TENC:
+		return tenc_Write(a, bs);
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	case GF_ISOM_BOX_TYPE_RTP_STSD: return ghnt_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_RTPO: return rtpo_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_HNTI: return hnti_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SDP: return sdp_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_HINF: return hinf_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_RELY: return rely_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TIMS: return tims_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TSRO: return tsro_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SNRO: return snro_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TRPY: return trpy_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_NUMP: return nump_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TOTL: return totl_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_NPCK: return npck_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TPYL: return tpyl_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TPAY: return tpay_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MAXR: return maxr_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DMED: return dmed_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DIMM: return dimm_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DREP: return drep_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TMIN: return tmin_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TMAX: return tmax_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_PMAX: return pmax_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DMAX: return dmax_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_PAYT: return payt_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_NAME: return name_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_RTP_STSD:
+		return ghnt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_RTPO:
+		return rtpo_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_HNTI:
+		return hnti_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SDP:
+		return sdp_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_HINF:
+		return hinf_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_RELY:
+		return rely_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TIMS:
+		return tims_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TSRO:
+		return tsro_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SNRO:
+		return snro_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TRPY:
+		return trpy_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_NUMP:
+		return nump_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TOTL:
+		return totl_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_NPCK:
+		return npck_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TPYL:
+		return tpyl_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TPAY:
+		return tpay_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MAXR:
+		return maxr_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DMED:
+		return dmed_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DIMM:
+		return dimm_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DREP:
+		return drep_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TMIN:
+		return tmin_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TMAX:
+		return tmax_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PMAX:
+		return pmax_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DMAX:
+		return dmax_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PAYT:
+		return payt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_NAME:
+		return name_Write(a, bs);
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	case GF_ISOM_BOX_TYPE_MVEX: return mvex_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MEHD: return mehd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TREX: return trex_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MOOF: return moof_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MFHD: return mfhd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TRAF: return traf_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TFHD: return tfhd_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TFDT: return tfdt_Write(a, bs); 
-	case GF_ISOM_BOX_TYPE_TRUN: return trun_Write(a, bs);
-#endif 
+	case GF_ISOM_BOX_TYPE_MVEX:
+		return mvex_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MEHD:
+		return mehd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TREX:
+		return trex_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TREP:
+		return trep_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MOOF:
+		return moof_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MFHD:
+		return mfhd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TRAF:
+		return traf_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TFHD:
+		return tfhd_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TFDT:
+		return tfdt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TRUN:
+		return trun_Write(a, bs);
+#endif
 
 	/*3GPP boxes*/
 	case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -1460,94 +2227,135 @@
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		return gppa_Write(a, bs);
-	case GF_ISOM_SUBTYPE_3GP_H263: 
+	case GF_ISOM_SUBTYPE_3GP_H263:
 		return gppv_Write(a, bs);
 	case GF_ISOM_BOX_TYPE_DAMR:
-	case GF_ISOM_BOX_TYPE_DEVC: 
+	case GF_ISOM_BOX_TYPE_DEVC:
 	case GF_ISOM_BOX_TYPE_DQCP:
 	case GF_ISOM_BOX_TYPE_DSMV:
 	case GF_ISOM_BOX_TYPE_D263:
 		return gppc_Write(a, bs);
 
-	case GF_ISOM_BOX_TYPE_AVCC: 
-	case GF_ISOM_BOX_TYPE_SVCC: 
+	case GF_ISOM_BOX_TYPE_AVCC:
+	case GF_ISOM_BOX_TYPE_SVCC:
 		return avcc_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_HVCC: 
+	case GF_ISOM_BOX_TYPE_HVCC:
 	case GF_ISOM_BOX_TYPE_SHCC:
 		return hvcc_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_BTRT: return btrt_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_M4DS: return m4ds_Write(a, bs);
-	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_BTRT:
+		return btrt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_M4DS:
+		return m4ds_Write(a, bs);
+	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_HVC1:
 	case GF_ISOM_BOX_TYPE_HEV1:
 	case GF_ISOM_BOX_TYPE_HVC2:
 	case GF_ISOM_BOX_TYPE_HEV2:
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		return mp4v_Write(a, bs);
 
 	/*3GPP streaming text*/
-	case GF_ISOM_BOX_TYPE_FTAB: return ftab_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TX3G:	return tx3g_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TEXT:	return text_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STYL: return styl_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_HLIT: return hlit_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_HCLR: return hclr_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_KROK: return krok_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DLAY: return dlay_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_HREF: return href_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TBOX: return tbox_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_BLNK: return blnk_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TWRP: return twrp_Write(a, bs);
-	
+	case GF_ISOM_BOX_TYPE_FTAB:
+		return ftab_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TX3G:
+		return tx3g_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TEXT:
+		return text_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STYL:
+		return styl_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_HLIT:
+		return hlit_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_HCLR:
+		return hclr_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_KROK:
+		return krok_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DLAY:
+		return dlay_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_HREF:
+		return href_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TBOX:
+		return tbox_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_BLNK:
+		return blnk_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TWRP:
+		return twrp_Write(a, bs);
+
 	/* ISMA 1.0 Encryption and Authentication V 1.0 */
-	case GF_ISOM_BOX_TYPE_IKMS: return iKMS_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ISFM: return iSFM_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IKMS:
+		return iKMS_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ISFM:
+		return iSFM_Write(a, bs);
 
 	/* ISO FF extensions for MPEG-21 */
-	case GF_ISOM_BOX_TYPE_META: return meta_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_XML: return xml_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_BXML: return bxml_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ILOC: return iloc_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_PITM: return pitm_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_IPRO: return ipro_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_INFE: return infe_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_IINF: return iinf_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SINF: return sinf_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_FRMA: return frma_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SCHM: return schm_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SCHI: return schi_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ENCA: return mp4a_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ENCV: return mp4v_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ENCS: return mp4s_Write(a, bs);
-
-	case GF_ISOM_BOX_TYPE_SENC: return senc_Write(a, bs);
-
-	case GF_ISOM_BOX_TYPE_UUID: 
+	case GF_ISOM_BOX_TYPE_META:
+		return meta_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_XML:
+		return xml_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_BXML:
+		return bxml_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ILOC:
+		return iloc_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PITM:
+		return pitm_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IPRO:
+		return ipro_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_INFE:
+		return infe_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IINF:
+		return iinf_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SINF:
+		return sinf_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_FRMA:
+		return frma_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SCHM:
+		return schm_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SCHI:
+		return schi_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ENCA:
+		return mp4a_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ENCV:
+		return mp4v_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ENCS:
+		return mp4s_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_SENC:
+		return senc_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_UUID:
 		switch ( ((GF_UnknownUUIDBox *)a)->internal_4cc) {
-		case GF_ISOM_BOX_UUID_TENC: return piff_tenc_Write(a, bs);
-		case GF_ISOM_BOX_UUID_PSEC: return piff_psec_Write(a, bs);
-		case GF_ISOM_BOX_UUID_PSSH: return piff_pssh_Write(a, bs);
-		case GF_ISOM_BOX_UUID_TFRF: 
-		case GF_ISOM_BOX_UUID_TFXD: 
+		case GF_ISOM_BOX_UUID_TENC:
+			return piff_tenc_Write(a, bs);
+		case GF_ISOM_BOX_UUID_PSEC:
+			return piff_psec_Write(a, bs);
+		case GF_ISOM_BOX_UUID_PSSH:
+			return piff_pssh_Write(a, bs);
+		case GF_ISOM_BOX_UUID_TFRF:
+		case GF_ISOM_BOX_UUID_TFXD:
 		default:
 			return uuid_Write(a, bs);
 		}
 
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/* Adobe extensions */
-	case GF_ISOM_BOX_TYPE_ABST: return abst_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_AFRA: return afra_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ASRT: return asrt_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_AFRT: return afrt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ABST:
+		return abst_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_AFRA:
+		return afra_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ASRT:
+		return asrt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_AFRT:
+		return afrt_Write(a, bs);
 #endif
 
 	/* Apple extensions */
-	case GF_ISOM_BOX_TYPE_ILST: return ilst_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ILST:
+		return ilst_Write(a, bs);
 
 	case GF_ISOM_BOX_TYPE_0xA9NAM:
 	case GF_ISOM_BOX_TYPE_0xA9CMT:
@@ -1573,62 +2381,99 @@
 	case GF_ISOM_BOX_TYPE_COVR:
 		return ListItem_Write(a, bs);
 
-	case GF_ISOM_BOX_TYPE_DATA: return data_Write(a, bs);
-
-	case GF_ISOM_BOX_TYPE_OHDR: return ohdr_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_GRPI: return grpi_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_MDRI: return mdri_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ODTT: return odtt_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ODRB: return odrb_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ODKM: return odkm_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ODAF: return iSFM_Write(a, bs);
-
-	case GF_ISOM_BOX_TYPE_PASP: return pasp_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_TSEL: return tsel_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DATA:
+		return data_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_OHDR:
+		return ohdr_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_GRPI:
+		return grpi_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_MDRI:
+		return mdri_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ODTT:
+		return odtt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ODRB:
+		return odrb_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ODKM:
+		return odkm_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ODAF:
+		return iSFM_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_PASP:
+		return pasp_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TSEL:
+		return tsel_Write(a, bs);
 
 	case GF_ISOM_BOX_TYPE_METX:
 	case GF_ISOM_BOX_TYPE_METT:
 		return metx_Write(a, bs);
 
-	case GF_ISOM_BOX_TYPE_DIMS: return dims_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DIMC: return dimC_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_DIST: return diST_Write(a, bs);
-
-	case GF_ISOM_BOX_TYPE_AC3: return ac3_Write(a, bs); 
-	case GF_ISOM_BOX_TYPE_DAC3: return dac3_Write(a, bs); 
-
-	case GF_ISOM_BOX_TYPE_LSRC: return lsrc_Write(a, bs); 
-	case GF_ISOM_BOX_TYPE_LSR1: return lsr1_Write(a, bs); 
-
-	case GF_ISOM_BOX_TYPE_SIDX: return sidx_Write(a, bs); 
-	case GF_ISOM_BOX_TYPE_PCRB: return pcrb_Write(a, bs); 
-	case GF_ISOM_BOX_TYPE_SUBS: return subs_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_Write(a, bs); 
+	case GF_ISOM_BOX_TYPE_DIMS:
+		return dims_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DIMC:
+		return dimC_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DIST:
+		return diST_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_AC3:
+		return ac3_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_DAC3:
+		return dac3_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_LSRC:
+		return lsrc_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_LSR1:
+		return lsr1_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_SIDX:
+		return sidx_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PCRB:
+		return pcrb_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SUBS:
+		return subs_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_RVCC:
+		return rvcc_Write(a, bs);
 
 #ifndef GPAC_DISABLE_TTXT
-	case GF_ISOM_BOX_TYPE_STSE: return stse_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STTC: return boxstring_Write(a, bs);
-
-	case GF_ISOM_BOX_TYPE_VTCU: return vtcu_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_VTTE: return vtte_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_VTTC: return boxstring_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_CTIM: return boxstring_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_IDEN: return boxstring_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STTG: return boxstring_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_PAYL: return boxstring_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_WVTT: return wvtt_Write(a, bs);
-
-	case GF_ISOM_BOX_TYPE_STPP: return stpp_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_SBTT: return metx_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STXT:
+		return stxt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STTC:
+		return boxstring_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_VTCU:
+		return vtcu_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_VTTE:
+		return vtte_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_VTTC:
+	case GF_ISOM_BOX_TYPE_CTIM:
+	case GF_ISOM_BOX_TYPE_IDEN:
+	case GF_ISOM_BOX_TYPE_STTG:
+	case GF_ISOM_BOX_TYPE_PAYL:
+	case GF_ISOM_BOX_TYPE_VTTA:
+		return boxstring_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_WVTT:
+		return wvtt_Write(a, bs);
+
+	case GF_ISOM_BOX_TYPE_STPP:
+		return stpp_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_SBTT:
+		return metx_Write(a, bs);
 #endif//GPAC_DISABLE_TTXT
 
-	case GF_ISOM_BOX_TYPE_ADKM: return adkm_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_AHDR: return ahdr_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_APRM: return aprm_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_AEIB: return aeib_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_AKEY: return akey_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_FLXS: return flxs_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_ADAF: return adaf_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ADKM:
+		return adkm_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_AHDR:
+		return ahdr_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_APRM:
+		return aprm_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_AEIB:
+		return aeib_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_AKEY:
+		return akey_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_FLXS:
+		return flxs_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ADAF:
+		return adaf_Write(a, bs);
 
 	default:
 		return defa_Write(a, bs);
@@ -1654,111 +2499,202 @@
 	case GF_ISOM_BOX_TYPE_FREE:
 	case GF_ISOM_BOX_TYPE_SKIP:
 		return free_Size(a);
-	case GF_ISOM_BOX_TYPE_MDAT: return mdat_Size(a);
-	case GF_ISOM_BOX_TYPE_MOOV: return moov_Size(a);
-	case GF_ISOM_BOX_TYPE_MVHD: return mvhd_Size(a);
-	case GF_ISOM_BOX_TYPE_MDHD: return mdhd_Size(a);
-	case GF_ISOM_BOX_TYPE_VMHD: return vmhd_Size(a);
-	case GF_ISOM_BOX_TYPE_SMHD: return smhd_Size(a);
-	case GF_ISOM_BOX_TYPE_HMHD: return hmhd_Size(a);
+	case GF_ISOM_BOX_TYPE_MDAT:
+		return mdat_Size(a);
+	case GF_ISOM_BOX_TYPE_MOOV:
+		return moov_Size(a);
+	case GF_ISOM_BOX_TYPE_MVHD:
+		return mvhd_Size(a);
+	case GF_ISOM_BOX_TYPE_MDHD:
+		return mdhd_Size(a);
+	case GF_ISOM_BOX_TYPE_VMHD:
+		return vmhd_Size(a);
+	case GF_ISOM_BOX_TYPE_SMHD:
+		return smhd_Size(a);
+	case GF_ISOM_BOX_TYPE_HMHD:
+		return hmhd_Size(a);
 	case GF_ISOM_BOX_TYPE_ODHD:
 	case GF_ISOM_BOX_TYPE_CRHD:
 	case GF_ISOM_BOX_TYPE_SDHD:
 	case GF_ISOM_BOX_TYPE_NMHD:
 	case GF_ISOM_BOX_TYPE_STHD:
 		return nmhd_Size(a);
-	case GF_ISOM_BOX_TYPE_STBL: return stbl_Size(a);
-	case GF_ISOM_BOX_TYPE_DINF: return dinf_Size(a);
-	case GF_ISOM_BOX_TYPE_URL: return url_Size(a);
-	case GF_ISOM_BOX_TYPE_URN: return urn_Size(a);
-	case GF_ISOM_BOX_TYPE_CHPL: return chpl_Size(a);
-	case GF_ISOM_BOX_TYPE_CPRT: return cprt_Size(a);
-	case GF_ISOM_BOX_TYPE_HDLR: return hdlr_Size(a);
-	case GF_ISOM_BOX_TYPE_IODS: return iods_Size(a);
-	case GF_ISOM_BOX_TYPE_TRAK: return trak_Size(a);
-	case GF_ISOM_BOX_TYPE_MP4S: return mp4s_Size(a);
-	case GF_ISOM_BOX_TYPE_MP4V: return mp4v_Size(a);
-	case GF_ISOM_BOX_TYPE_MP4A: return mp4a_Size(a);
-	case GF_ISOM_BOX_TYPE_GNRM: return gnrm_Size(a);
-	case GF_ISOM_BOX_TYPE_GNRV: return gnrv_Size(a);
-	case GF_ISOM_BOX_TYPE_GNRA: return gnra_Size(a);
-	case GF_ISOM_BOX_TYPE_EDTS: return edts_Size(a);
-	case GF_ISOM_BOX_TYPE_UDTA: return udta_Size(a);
-	case GF_ISOM_BOX_TYPE_DREF: return dref_Size(a);
-	case GF_ISOM_BOX_TYPE_STSD: return stsd_Size(a);
-	case GF_ISOM_BOX_TYPE_STTS: return stts_Size(a);
-	case GF_ISOM_BOX_TYPE_CTTS: return ctts_Size(a);
-	case GF_ISOM_BOX_TYPE_CSLG: return cslg_Size(a);
-	case GF_ISOM_BOX_TYPE_STSH: return stsh_Size(a);
-	case GF_ISOM_BOX_TYPE_ELST: return elst_Size(a);
-	case GF_ISOM_BOX_TYPE_STSC: return stsc_Size(a);
+	case GF_ISOM_BOX_TYPE_STBL:
+		return stbl_Size(a);
+	case GF_ISOM_BOX_TYPE_DINF:
+		return dinf_Size(a);
+	case GF_ISOM_BOX_TYPE_URL:
+		return url_Size(a);
+	case GF_ISOM_BOX_TYPE_URN:
+		return urn_Size(a);
+	case GF_ISOM_BOX_TYPE_CHPL:
+		return chpl_Size(a);
+	case GF_ISOM_BOX_TYPE_CPRT:
+		return cprt_Size(a);
+	case GF_ISOM_BOX_TYPE_KIND:
+		return kind_Size(a);
+	case GF_ISOM_BOX_TYPE_HDLR:
+		return hdlr_Size(a);
+	case GF_ISOM_BOX_TYPE_IODS:
+		return iods_Size(a);
+	case GF_ISOM_BOX_TYPE_TRAK:
+		return trak_Size(a);
+	case GF_ISOM_BOX_TYPE_MP4S:
+		return mp4s_Size(a);
+	case GF_ISOM_BOX_TYPE_MP4V:
+		return mp4v_Size(a);
+	case GF_ISOM_BOX_TYPE_MP4A:
+		return mp4a_Size(a);
+	case GF_ISOM_BOX_TYPE_GNRM:
+		return gnrm_Size(a);
+	case GF_ISOM_BOX_TYPE_GNRV:
+		return gnrv_Size(a);
+	case GF_ISOM_BOX_TYPE_GNRA:
+		return gnra_Size(a);
+	case GF_ISOM_BOX_TYPE_EDTS:
+		return edts_Size(a);
+	case GF_ISOM_BOX_TYPE_UDTA:
+		return udta_Size(a);
+	case GF_ISOM_BOX_TYPE_DREF:
+		return dref_Size(a);
+	case GF_ISOM_BOX_TYPE_STSD:
+		return stsd_Size(a);
+	case GF_ISOM_BOX_TYPE_STTS:
+		return stts_Size(a);
+	case GF_ISOM_BOX_TYPE_CTTS:
+		return ctts_Size(a);
+	case GF_ISOM_BOX_TYPE_CSLG:
+		return cslg_Size(a);
+	case GF_ISOM_BOX_TYPE_STSH:
+		return stsh_Size(a);
+	case GF_ISOM_BOX_TYPE_ELST:
+		return elst_Size(a);
+	case GF_ISOM_BOX_TYPE_STSC:
+		return stsc_Size(a);
 	case GF_ISOM_BOX_TYPE_STZ2:
 	case GF_ISOM_BOX_TYPE_STSZ:
 		return stsz_Size(a);
-	case GF_ISOM_BOX_TYPE_STCO: return stco_Size(a);
-	case GF_ISOM_BOX_TYPE_STSS: return stss_Size(a);
-	case GF_ISOM_BOX_TYPE_SDTP: return sdtp_Size(a);
-	case GF_ISOM_BOX_TYPE_CO64: return co64_Size(a);
-	case GF_ISOM_BOX_TYPE_ESDS: return esds_Size(a);
-	case GF_ISOM_BOX_TYPE_MINF: return minf_Size(a);
-	case GF_ISOM_BOX_TYPE_TKHD: return tkhd_Size(a);
-	case GF_ISOM_BOX_TYPE_TREF: return tref_Size(a);
-	case GF_ISOM_BOX_TYPE_MDIA: return mdia_Size(a);
-	case GF_ISOM_BOX_TYPE_FTYP: 
-	case GF_ISOM_BOX_TYPE_STYP: 
-        return ftyp_Size(a);
-	case GF_ISOM_BOX_TYPE_PADB: return padb_Size(a);
-	case GF_ISOM_BOX_TYPE_VOID: return void_Size(a);
-	case GF_ISOM_BOX_TYPE_STSF: return stsf_Size(a);
-	case GF_ISOM_BOX_TYPE_PDIN: return pdin_Size(a);
-	case GF_ISOM_BOX_TYPE_SBGP: return sbgp_Size(a);
-	case GF_ISOM_BOX_TYPE_SGPD: return sgpd_Size(a);
-	case GF_ISOM_BOX_TYPE_SAIZ: return saiz_Size(a);
-	case GF_ISOM_BOX_TYPE_SAIO: return saio_Size(a);
-	case GF_ISOM_BOX_TYPE_PSSH: return pssh_Size(a);
-	case GF_ISOM_BOX_TYPE_TENC: return tenc_Size(a);
+	case GF_ISOM_BOX_TYPE_STCO:
+		return stco_Size(a);
+	case GF_ISOM_BOX_TYPE_STSS:
+		return stss_Size(a);
+	case GF_ISOM_BOX_TYPE_SDTP:
+		return sdtp_Size(a);
+	case GF_ISOM_BOX_TYPE_CO64:
+		return co64_Size(a);
+	case GF_ISOM_BOX_TYPE_ESDS:
+		return esds_Size(a);
+	case GF_ISOM_BOX_TYPE_MINF:
+		return minf_Size(a);
+	case GF_ISOM_BOX_TYPE_TKHD:
+		return tkhd_Size(a);
+	case GF_ISOM_BOX_TYPE_TREF:
+		return tref_Size(a);
+	case GF_ISOM_BOX_TYPE_MDIA:
+		return mdia_Size(a);
+	case GF_ISOM_BOX_TYPE_ELNG:
+		return elng_Size(a);
+	case GF_ISOM_BOX_TYPE_FTYP:
+	case GF_ISOM_BOX_TYPE_STYP:
+		return ftyp_Size(a);
+	case GF_ISOM_BOX_TYPE_PADB:
+		return padb_Size(a);
+	case GF_ISOM_BOX_TYPE_VOID:
+		return void_Size(a);
+	case GF_ISOM_BOX_TYPE_STSF:
+		return stsf_Size(a);
+	case GF_ISOM_BOX_TYPE_PDIN:
+		return pdin_Size(a);
+	case GF_ISOM_BOX_TYPE_SBGP:
+		return sbgp_Size(a);
+	case GF_ISOM_BOX_TYPE_SGPD:
+		return sgpd_Size(a);
+	case GF_ISOM_BOX_TYPE_SAIZ:
+		return saiz_Size(a);
+	case GF_ISOM_BOX_TYPE_SAIO:
+		return saio_Size(a);
+	case GF_ISOM_BOX_TYPE_PSSH:
+		return pssh_Size(a);
+	case GF_ISOM_BOX_TYPE_TENC:
+		return tenc_Size(a);
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	case GF_ISOM_BOX_TYPE_RTP_STSD: return ghnt_Size(a);
-	case GF_ISOM_BOX_TYPE_RTPO: return rtpo_Size(a);
-	case GF_ISOM_BOX_TYPE_HNTI: return hnti_Size(a);
-	case GF_ISOM_BOX_TYPE_SDP: return sdp_Size(a);
-	case GF_ISOM_BOX_TYPE_HINF: return hinf_Size(a);
-	case GF_ISOM_BOX_TYPE_RELY: return rely_Size(a);
-	case GF_ISOM_BOX_TYPE_TIMS: return tims_Size(a);
-	case GF_ISOM_BOX_TYPE_TSRO: return tsro_Size(a);
-	case GF_ISOM_BOX_TYPE_SNRO: return snro_Size(a);
-	case GF_ISOM_BOX_TYPE_TRPY: return trpy_Size(a);
-	case GF_ISOM_BOX_TYPE_NUMP: return nump_Size(a);
-	case GF_ISOM_BOX_TYPE_TOTL: return totl_Size(a);
-	case GF_ISOM_BOX_TYPE_NPCK: return npck_Size(a);
-	case GF_ISOM_BOX_TYPE_TPYL: return tpyl_Size(a);
-	case GF_ISOM_BOX_TYPE_TPAY: return tpay_Size(a);
-	case GF_ISOM_BOX_TYPE_MAXR: return maxr_Size(a);
-	case GF_ISOM_BOX_TYPE_DMED: return dmed_Size(a);
-	case GF_ISOM_BOX_TYPE_DIMM: return dimm_Size(a);
-	case GF_ISOM_BOX_TYPE_DREP: return drep_Size(a);
-	case GF_ISOM_BOX_TYPE_TMIN: return tmin_Size(a);
-	case GF_ISOM_BOX_TYPE_TMAX: return tmax_Size(a);
-	case GF_ISOM_BOX_TYPE_PMAX: return pmax_Size(a);
-	case GF_ISOM_BOX_TYPE_DMAX: return dmax_Size(a);
-	case GF_ISOM_BOX_TYPE_PAYT: return payt_Size(a);
-	case GF_ISOM_BOX_TYPE_NAME: return name_Size(a);
+	case GF_ISOM_BOX_TYPE_RTP_STSD:
+		return ghnt_Size(a);
+	case GF_ISOM_BOX_TYPE_RTPO:
+		return rtpo_Size(a);
+	case GF_ISOM_BOX_TYPE_HNTI:
+		return hnti_Size(a);
+	case GF_ISOM_BOX_TYPE_SDP:
+		return sdp_Size(a);
+	case GF_ISOM_BOX_TYPE_HINF:
+		return hinf_Size(a);
+	case GF_ISOM_BOX_TYPE_RELY:
+		return rely_Size(a);
+	case GF_ISOM_BOX_TYPE_TIMS:
+		return tims_Size(a);
+	case GF_ISOM_BOX_TYPE_TSRO:
+		return tsro_Size(a);
+	case GF_ISOM_BOX_TYPE_SNRO:
+		return snro_Size(a);
+	case GF_ISOM_BOX_TYPE_TRPY:
+		return trpy_Size(a);
+	case GF_ISOM_BOX_TYPE_NUMP:
+		return nump_Size(a);
+	case GF_ISOM_BOX_TYPE_TOTL:
+		return totl_Size(a);
+	case GF_ISOM_BOX_TYPE_NPCK:
+		return npck_Size(a);
+	case GF_ISOM_BOX_TYPE_TPYL:
+		return tpyl_Size(a);
+	case GF_ISOM_BOX_TYPE_TPAY:
+		return tpay_Size(a);
+	case GF_ISOM_BOX_TYPE_MAXR:
+		return maxr_Size(a);
+	case GF_ISOM_BOX_TYPE_DMED:
+		return dmed_Size(a);
+	case GF_ISOM_BOX_TYPE_DIMM:
+		return dimm_Size(a);
+	case GF_ISOM_BOX_TYPE_DREP:
+		return drep_Size(a);
+	case GF_ISOM_BOX_TYPE_TMIN:
+		return tmin_Size(a);
+	case GF_ISOM_BOX_TYPE_TMAX:
+		return tmax_Size(a);
+	case GF_ISOM_BOX_TYPE_PMAX:
+		return pmax_Size(a);
+	case GF_ISOM_BOX_TYPE_DMAX:
+		return dmax_Size(a);
+	case GF_ISOM_BOX_TYPE_PAYT:
+		return payt_Size(a);
+	case GF_ISOM_BOX_TYPE_NAME:
+		return name_Size(a);
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	case GF_ISOM_BOX_TYPE_MVEX: return mvex_Size(a);
-	case GF_ISOM_BOX_TYPE_MEHD: return mehd_Size(a);
-	case GF_ISOM_BOX_TYPE_TREX: return trex_Size(a);
-	case GF_ISOM_BOX_TYPE_MOOF: return moof_Size(a);
-	case GF_ISOM_BOX_TYPE_MFHD: return mfhd_Size(a);
-	case GF_ISOM_BOX_TYPE_TRAF: return traf_Size(a);
-	case GF_ISOM_BOX_TYPE_TFHD: return tfhd_Size(a);
-	case GF_ISOM_BOX_TYPE_TFDT: return tfdt_Size(a);
-	case GF_ISOM_BOX_TYPE_TRUN: return trun_Size(a);
+	case GF_ISOM_BOX_TYPE_MVEX:
+		return mvex_Size(a);
+	case GF_ISOM_BOX_TYPE_MEHD:
+		return mehd_Size(a);
+	case GF_ISOM_BOX_TYPE_TREX:
+		return trex_Size(a);
+	case GF_ISOM_BOX_TYPE_TREP:
+		return trep_Size(a);
+	case GF_ISOM_BOX_TYPE_MOOF:
+		return moof_Size(a);
+	case GF_ISOM_BOX_TYPE_MFHD:
+		return mfhd_Size(a);
+	case GF_ISOM_BOX_TYPE_TRAF:
+		return traf_Size(a);
+	case GF_ISOM_BOX_TYPE_TFHD:
+		return tfhd_Size(a);
+	case GF_ISOM_BOX_TYPE_TFDT:
+		return tfdt_Size(a);
+	case GF_ISOM_BOX_TYPE_TRUN:
+		return trun_Size(a);
 #endif
-	
+
 	/*3GPP boxes*/
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
@@ -1766,91 +2702,133 @@
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		return gppa_Size(a);
-	case GF_ISOM_SUBTYPE_3GP_H263: return gppv_Size(a);
+	case GF_ISOM_SUBTYPE_3GP_H263:
+		return gppv_Size(a);
 	case GF_ISOM_BOX_TYPE_DAMR:
-	case GF_ISOM_BOX_TYPE_DEVC: 
+	case GF_ISOM_BOX_TYPE_DEVC:
 	case GF_ISOM_BOX_TYPE_DQCP:
 	case GF_ISOM_BOX_TYPE_DSMV:
 	case GF_ISOM_BOX_TYPE_D263:
 		return gppc_Size(a);
 
-	case GF_ISOM_BOX_TYPE_AVCC: 
-	case GF_ISOM_BOX_TYPE_SVCC: 
+	case GF_ISOM_BOX_TYPE_AVCC:
+	case GF_ISOM_BOX_TYPE_SVCC:
 		return avcc_Size(a);
-	case GF_ISOM_BOX_TYPE_HVCC: 
+	case GF_ISOM_BOX_TYPE_HVCC:
 	case GF_ISOM_BOX_TYPE_SHCC:
 		return hvcc_Size(a);
-	case GF_ISOM_BOX_TYPE_BTRT: return btrt_Size(a);
-	case GF_ISOM_BOX_TYPE_M4DS: return m4ds_Size(a);
-	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_BTRT:
+		return btrt_Size(a);
+	case GF_ISOM_BOX_TYPE_M4DS:
+		return m4ds_Size(a);
+	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_HVC1:
 	case GF_ISOM_BOX_TYPE_HEV1:
 	case GF_ISOM_BOX_TYPE_HVC2:
 	case GF_ISOM_BOX_TYPE_HEV2:
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		return mp4v_Size(a);
 
 	/*3GPP streaming text*/
-	case GF_ISOM_BOX_TYPE_FTAB: return ftab_Size(a);
-	case GF_ISOM_BOX_TYPE_TX3G: return tx3g_Size(a);
-	case GF_ISOM_BOX_TYPE_TEXT:	return text_Size(a);
-	case GF_ISOM_BOX_TYPE_STYL: return styl_Size(a);
-	case GF_ISOM_BOX_TYPE_HLIT: return hlit_Size(a);
-	case GF_ISOM_BOX_TYPE_HCLR: return hclr_Size(a);
-	case GF_ISOM_BOX_TYPE_KROK: return krok_Size(a);
-	case GF_ISOM_BOX_TYPE_DLAY: return dlay_Size(a);
-	case GF_ISOM_BOX_TYPE_HREF: return href_Size(a);
-	case GF_ISOM_BOX_TYPE_TBOX: return tbox_Size(a);
-	case GF_ISOM_BOX_TYPE_BLNK: return blnk_Size(a);
-	case GF_ISOM_BOX_TYPE_TWRP: return twrp_Size(a);
+	case GF_ISOM_BOX_TYPE_FTAB:
+		return ftab_Size(a);
+	case GF_ISOM_BOX_TYPE_TX3G:
+		return tx3g_Size(a);
+	case GF_ISOM_BOX_TYPE_TEXT:
+		return text_Size(a);
+	case GF_ISOM_BOX_TYPE_STYL:
+		return styl_Size(a);
+	case GF_ISOM_BOX_TYPE_HLIT:
+		return hlit_Size(a);
+	case GF_ISOM_BOX_TYPE_HCLR:
+		return hclr_Size(a);
+	case GF_ISOM_BOX_TYPE_KROK:
+		return krok_Size(a);
+	case GF_ISOM_BOX_TYPE_DLAY:
+		return dlay_Size(a);
+	case GF_ISOM_BOX_TYPE_HREF:
+		return href_Size(a);
+	case GF_ISOM_BOX_TYPE_TBOX:
+		return tbox_Size(a);
+	case GF_ISOM_BOX_TYPE_BLNK:
+		return blnk_Size(a);
+	case GF_ISOM_BOX_TYPE_TWRP:
+		return twrp_Size(a);
 
 	/* ISMA 1.0 Encryption and Authentication V 1.0 */
-	case GF_ISOM_BOX_TYPE_IKMS: return iKMS_Size(a);
-	case GF_ISOM_BOX_TYPE_ISFM: return iSFM_Size(a);
+	case GF_ISOM_BOX_TYPE_IKMS:
+		return iKMS_Size(a);
+	case GF_ISOM_BOX_TYPE_ISFM:
+		return iSFM_Size(a);
 
 	/* ISO FF extensions for MPEG-21 */
-	case GF_ISOM_BOX_TYPE_META: return meta_Size(a);
-	case GF_ISOM_BOX_TYPE_XML: return xml_Size(a);
-	case GF_ISOM_BOX_TYPE_BXML: return bxml_Size(a);
-	case GF_ISOM_BOX_TYPE_ILOC: return iloc_Size(a);
-	case GF_ISOM_BOX_TYPE_PITM: return pitm_Size(a);
-	case GF_ISOM_BOX_TYPE_IPRO: return ipro_Size(a);
-	case GF_ISOM_BOX_TYPE_INFE: return infe_Size(a);
-	case GF_ISOM_BOX_TYPE_IINF: return iinf_Size(a);
-	case GF_ISOM_BOX_TYPE_SINF: return sinf_Size(a);
-	case GF_ISOM_BOX_TYPE_FRMA: return frma_Size(a);
-	case GF_ISOM_BOX_TYPE_SCHM: return schm_Size(a);
-	case GF_ISOM_BOX_TYPE_SCHI: return schi_Size(a);
-	case GF_ISOM_BOX_TYPE_ENCA: return mp4a_Size(a);
-	case GF_ISOM_BOX_TYPE_ENCV: return mp4v_Size(a);
-	case GF_ISOM_BOX_TYPE_ENCS: return mp4s_Size(a);
-	case GF_ISOM_BOX_TYPE_SENC: return senc_Size(a);
+	case GF_ISOM_BOX_TYPE_META:
+		return meta_Size(a);
+	case GF_ISOM_BOX_TYPE_XML:
+		return xml_Size(a);
+	case GF_ISOM_BOX_TYPE_BXML:
+		return bxml_Size(a);
+	case GF_ISOM_BOX_TYPE_ILOC:
+		return iloc_Size(a);
+	case GF_ISOM_BOX_TYPE_PITM:
+		return pitm_Size(a);
+	case GF_ISOM_BOX_TYPE_IPRO:
+		return ipro_Size(a);
+	case GF_ISOM_BOX_TYPE_INFE:
+		return infe_Size(a);
+	case GF_ISOM_BOX_TYPE_IINF:
+		return iinf_Size(a);
+	case GF_ISOM_BOX_TYPE_SINF:
+		return sinf_Size(a);
+	case GF_ISOM_BOX_TYPE_FRMA:
+		return frma_Size(a);
+	case GF_ISOM_BOX_TYPE_SCHM:
+		return schm_Size(a);
+	case GF_ISOM_BOX_TYPE_SCHI:
+		return schi_Size(a);
+	case GF_ISOM_BOX_TYPE_ENCA:
+		return mp4a_Size(a);
+	case GF_ISOM_BOX_TYPE_ENCV:
+		return mp4v_Size(a);
+	case GF_ISOM_BOX_TYPE_ENCS:
+		return mp4s_Size(a);
+	case GF_ISOM_BOX_TYPE_SENC:
+		return senc_Size(a);
 	case GF_ISOM_BOX_TYPE_UUID:
 		switch ( ((GF_UnknownUUIDBox *)a)->internal_4cc) {
-		case GF_ISOM_BOX_UUID_TENC: return piff_tenc_Size(a);
-		case GF_ISOM_BOX_UUID_PSEC: return piff_psec_Size(a);
-		case GF_ISOM_BOX_UUID_PSSH: return piff_pssh_Size(a);
-		case GF_ISOM_BOX_UUID_TFRF: 
-		case GF_ISOM_BOX_UUID_TFXD: 
+		case GF_ISOM_BOX_UUID_TENC:
+			return piff_tenc_Size(a);
+		case GF_ISOM_BOX_UUID_PSEC:
+			return piff_psec_Size(a);
+		case GF_ISOM_BOX_UUID_PSSH:
+			return piff_pssh_Size(a);
+		case GF_ISOM_BOX_UUID_TFRF:
+		case GF_ISOM_BOX_UUID_TFXD:
 		default:
 			return uuid_Size(a);
 		}
 
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/* Adobe extensions */
-	case GF_ISOM_BOX_TYPE_ABST: return abst_Size(a);
-	case GF_ISOM_BOX_TYPE_AFRA: return afra_Size(a);
-	case GF_ISOM_BOX_TYPE_ASRT: return asrt_Size(a);
-	case GF_ISOM_BOX_TYPE_AFRT: return afrt_Size(a);
+	case GF_ISOM_BOX_TYPE_ABST:
+		return abst_Size(a);
+	case GF_ISOM_BOX_TYPE_AFRA:
+		return afra_Size(a);
+	case GF_ISOM_BOX_TYPE_ASRT:
+		return asrt_Size(a);
+	case GF_ISOM_BOX_TYPE_AFRT:
+		return afrt_Size(a);
 #endif
 
 	/* Apple extensions */
-	case GF_ISOM_BOX_TYPE_ILST: return ilst_Size(a);
+	case GF_ISOM_BOX_TYPE_ILST:
+		return ilst_Size(a);
 
 	case GF_ISOM_BOX_TYPE_0xA9NAM:
 	case GF_ISOM_BOX_TYPE_0xA9CMT:
@@ -1876,64 +2854,102 @@
 	case GF_ISOM_BOX_TYPE_COVR:
 		return ListItem_Size(a);
 
-	case GF_ISOM_BOX_TYPE_DATA: return data_Size(a);
-
-	case GF_ISOM_BOX_TYPE_OHDR: return ohdr_Size(a);
-	case GF_ISOM_BOX_TYPE_GRPI: return grpi_Size(a);
-	case GF_ISOM_BOX_TYPE_MDRI: return mdri_Size(a);
-	case GF_ISOM_BOX_TYPE_ODTT: return odtt_Size(a);
-	case GF_ISOM_BOX_TYPE_ODRB: return odrb_Size(a);
-	case GF_ISOM_BOX_TYPE_ODKM: return odkm_Size(a);
-	case GF_ISOM_BOX_TYPE_ODAF: return iSFM_Size(a);
-
-	case GF_ISOM_BOX_TYPE_PASP: return pasp_Size(a);
-	case GF_ISOM_BOX_TYPE_TSEL: return tsel_Size(a);
+	case GF_ISOM_BOX_TYPE_DATA:
+		return data_Size(a);
+
+	case GF_ISOM_BOX_TYPE_OHDR:
+		return ohdr_Size(a);
+	case GF_ISOM_BOX_TYPE_GRPI:
+		return grpi_Size(a);
+	case GF_ISOM_BOX_TYPE_MDRI:
+		return mdri_Size(a);
+	case GF_ISOM_BOX_TYPE_ODTT:
+		return odtt_Size(a);
+	case GF_ISOM_BOX_TYPE_ODRB:
+		return odrb_Size(a);
+	case GF_ISOM_BOX_TYPE_ODKM:
+		return odkm_Size(a);
+	case GF_ISOM_BOX_TYPE_ODAF:
+		return iSFM_Size(a);
+
+	case GF_ISOM_BOX_TYPE_PASP:
+		return pasp_Size(a);
+	case GF_ISOM_BOX_TYPE_TSEL:
+		return tsel_Size(a);
 
 	case GF_ISOM_BOX_TYPE_METX:
 	case GF_ISOM_BOX_TYPE_METT:
 		return metx_Size(a);
 
-	case GF_ISOM_BOX_TYPE_DIMS: return dims_Size(a);
-	case GF_ISOM_BOX_TYPE_DIMC: return dimC_Size(a);
-	case GF_ISOM_BOX_TYPE_DIST: return diST_Size(a);
-
-	case GF_ISOM_BOX_TYPE_AC3: return ac3_Size(a); 
-	case GF_ISOM_BOX_TYPE_DAC3: return dac3_Size(a); 
-
-	case GF_ISOM_BOX_TYPE_LSRC: return lsrc_Size(a); 
-	case GF_ISOM_BOX_TYPE_LSR1: return lsr1_Size(a); 
-
-	case GF_ISOM_BOX_TYPE_SIDX: return sidx_Size(a); 
-	case GF_ISOM_BOX_TYPE_PCRB: return pcrb_Size(a); 
-	case GF_ISOM_BOX_TYPE_SUBS: return subs_Size(a);
-	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_Size(a);
+	case GF_ISOM_BOX_TYPE_DIMS:
+		return dims_Size(a);
+	case GF_ISOM_BOX_TYPE_DIMC:
+		return dimC_Size(a);
+	case GF_ISOM_BOX_TYPE_DIST:
+		return diST_Size(a);
+
+	case GF_ISOM_BOX_TYPE_AC3:
+		return ac3_Size(a);
+	case GF_ISOM_BOX_TYPE_DAC3:
+		return dac3_Size(a);
+
+	case GF_ISOM_BOX_TYPE_LSRC:
+		return lsrc_Size(a);
+	case GF_ISOM_BOX_TYPE_LSR1:
+		return lsr1_Size(a);
+
+	case GF_ISOM_BOX_TYPE_SIDX:
+		return sidx_Size(a);
+	case GF_ISOM_BOX_TYPE_PCRB:
+		return pcrb_Size(a);
+	case GF_ISOM_BOX_TYPE_SUBS:
+		return subs_Size(a);
+	case GF_ISOM_BOX_TYPE_RVCC:
+		return rvcc_Size(a);
 
 #ifndef GPAC_DISABLE_TTXT
-	case GF_ISOM_BOX_TYPE_STSE: return stse_Size(a);
-	case GF_ISOM_BOX_TYPE_STTC: return boxstring_Size(a);
-
-	case GF_ISOM_BOX_TYPE_VTCU: return vtcu_Size(a);
-	case GF_ISOM_BOX_TYPE_VTTE: return vtte_Size(a);
-	case GF_ISOM_BOX_TYPE_VTTC: return boxstring_Size(a);
-	case GF_ISOM_BOX_TYPE_CTIM: return boxstring_Size(a);
-	case GF_ISOM_BOX_TYPE_IDEN: return boxstring_Size(a);
-	case GF_ISOM_BOX_TYPE_STTG: return boxstring_Size(a);
-	case GF_ISOM_BOX_TYPE_PAYL: return boxstring_Size(a);
-	case GF_ISOM_BOX_TYPE_WVTT: return wvtt_Size(a);
-
-	case GF_ISOM_BOX_TYPE_STPP: return stpp_Size(a);
-	case GF_ISOM_BOX_TYPE_SBTT: return metx_Size(a);
+	case GF_ISOM_BOX_TYPE_STXT:
+		return stxt_Size(a);
+	case GF_ISOM_BOX_TYPE_STTC:
+		return boxstring_Size(a);
+
+	case GF_ISOM_BOX_TYPE_VTCU:
+		return vtcu_Size(a);
+	case GF_ISOM_BOX_TYPE_VTTE:
+		return vtte_Size(a);
+	case GF_ISOM_BOX_TYPE_VTTC:
+	case GF_ISOM_BOX_TYPE_CTIM:
+	case GF_ISOM_BOX_TYPE_IDEN:
+	case GF_ISOM_BOX_TYPE_STTG:
+	case GF_ISOM_BOX_TYPE_PAYL:
+	case GF_ISOM_BOX_TYPE_VTTA:
+		return boxstring_Size(a);
+	case GF_ISOM_BOX_TYPE_WVTT:
+		return wvtt_Size(a);
+
+	case GF_ISOM_BOX_TYPE_STPP:
+		return stpp_Size(a);
+	case GF_ISOM_BOX_TYPE_SBTT:
+		return metx_Size(a);
 #endif // GPAC_DISABLE_TTXT
 
-	case GF_ISOM_BOX_TYPE_ADKM: return adkm_Size(a);
-	case GF_ISOM_BOX_TYPE_AHDR: return ahdr_Size(a);
-	case GF_ISOM_BOX_TYPE_APRM: return aprm_Size(a);
-	case GF_ISOM_BOX_TYPE_AEIB: return aeib_Size(a);
-	case GF_ISOM_BOX_TYPE_AKEY: return akey_Size(a);
-	case GF_ISOM_BOX_TYPE_FLXS: return flxs_Size(a);
-	case GF_ISOM_BOX_TYPE_ADAF: return adaf_Size(a);
+	case GF_ISOM_BOX_TYPE_ADKM:
+		return adkm_Size(a);
+	case GF_ISOM_BOX_TYPE_AHDR:
+		return ahdr_Size(a);
+	case GF_ISOM_BOX_TYPE_APRM:
+		return aprm_Size(a);
+	case GF_ISOM_BOX_TYPE_AEIB:
+		return aeib_Size(a);
+	case GF_ISOM_BOX_TYPE_AKEY:
+		return akey_Size(a);
+	case GF_ISOM_BOX_TYPE_FLXS:
+		return flxs_Size(a);
+	case GF_ISOM_BOX_TYPE_ADAF:
+		return adaf_Size(a);
 
-	default: return defa_Size(a);
+	default:
+		return defa_Size(a);
 	}
 }
 
@@ -1949,6 +2965,6 @@
 	return GF_OK;
 }
 
-#endif /*GPAC_DISABLE_ISOM_WRITE*/ 
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/data_map.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/data_map.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -38,12 +38,16 @@
 GF_EXPORT
 GF_Err gf_isom_set_output_buffering(GF_ISOFile *movie, u32 size)
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	if (!movie) {
 		default_write_buffering_size = size;
 		return GF_OK;
 	}
 	if (!movie->editFileMap) return GF_BAD_PARAM;
 	return gf_bs_set_output_buffering(movie->editFileMap->bs, size);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 
@@ -168,7 +172,7 @@
 
 	if (mode == GF_ISOM_DATA_MAP_READ_ONLY) {
 		mode = GF_ISOM_DATA_MAP_READ;
-		/*It seems win32 file mapping is reported in prog mem usage -> large increases of occupancy. Should not be a pb 
+		/*It seems win32 file mapping is reported in prog mem usage -> large increases of occupancy. Should not be a pb
 		but unless you want mapping, only regular IO will be used...*/
 #if 0
 		if (IsLargeFile(sPath)) {
@@ -255,9 +259,9 @@
 #else
 			//this should never be the case in an read-only MP4 file
 			return GF_BAD_PARAM;
-#endif		
+#endif
 		}
-	//else this is a URL (read mode only)
+		//else this is a URL (read mode only)
 	} else {
 		e = gf_isom_datamap_new(ent->location, mdia->mediaTrack->moov->mov->fileName, GF_ISOM_DATA_MAP_READ, & mdia->information->dataHandler);
 		if (e) return (e==GF_URL_ERROR) ? GF_ISOM_UNKNOWN_DATA_REF : e;
@@ -339,7 +343,7 @@
 	memset(tmp, 0, sizeof(GF_FileDataMap));
 	tmp->type = GF_ISOM_DATA_FILE;
 	tmp->mode = GF_ISOM_DATA_MAP_WRITE;
-	
+
 	if (!sPath) {
 		tmp->stream = gf_temp_file_new();
 	} else {
@@ -411,7 +415,7 @@
 		if (!tmp->stream) tmp->stream = gf_f64_open(sPath, "rb");
 		bs_mode = GF_BITSTREAM_READ;
 		break;
-	///we open the file in READ/WRITE mode, in case 
+	///we open the file in READ/WRITE mode, in case
 	case GF_ISOM_DATA_MAP_WRITE:
 		if (!strcmp(sPath, "std")) {
 			tmp->stream = stdout;
@@ -422,7 +426,7 @@
 		if (!tmp->stream) tmp->stream = gf_f64_open(sPath, "wb");
 		bs_mode = GF_BITSTREAM_WRITE;
 		break;
-	///we open the file in CAT mode, in case 
+	///we open the file in CAT mode, in case
 	case GF_ISOM_DATA_MAP_CAT:
 		if (!strcmp(sPath, "std")) {
 			tmp->stream = stdout;
@@ -572,24 +576,24 @@
 	if (!tmp) return NULL;
 	memset(tmp, 0, sizeof(GF_FileMappingDataMap));
 	tmp->type = GF_ISOM_DATA_FILE_MAPPING;
-	tmp->mode = mode;	
+	tmp->mode = mode;
 	tmp->name = gf_strdup(sPath);
 
 	//
-	//	Open the file 
+	//	Open the file
 	//
 #ifdef _WIN32_WCE
 	//convert to WIDE
 	CE_CharToWide((char *)sPath, sWPath);
 
 	fileH = CreateFileForMapping(sWPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
-						(FILE_ATTRIBUTE_READONLY | FILE_FLAG_RANDOM_ACCESS), NULL );
+	                             (FILE_ATTRIBUTE_READONLY | FILE_FLAG_RANDOM_ACCESS), NULL );
 #else
 	fileH = CreateFile(sPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
-						(FILE_ATTRIBUTE_READONLY | FILE_FLAG_RANDOM_ACCESS), NULL );
+	                   (FILE_ATTRIBUTE_READONLY | FILE_FLAG_RANDOM_ACCESS), NULL );
 #endif
 
-	
+
 	if (fileH == INVALID_HANDLE_VALUE) {
 		gf_free(tmp->name);
 		gf_free(tmp);
@@ -615,7 +619,7 @@
 		err = GetLastError();
 		return NULL;
 	}
-		
+
 	tmp->byte_map = MapViewOfFile(fileMapH, FILE_MAP_READ, 0, 0, 0);
 	if (tmp->byte_map == NULL) {
 		CloseHandle(fileMapH);
@@ -626,7 +630,7 @@
 	}
 
 	CloseHandle(fileH);
-	CloseHandle(fileMapH);		
+	CloseHandle(fileMapH);
 
 	//finaly open our bitstream (from buffer)
 	tmp->bs = gf_bs_new(tmp->byte_map, tmp->file_size, GF_BITSTREAM_READ);
@@ -659,9 +663,13 @@
 
 #else
 
-GF_DataMap *gf_isom_fmo_new(const char *sPath, u8 mode) { return gf_isom_fdm_new(sPath, mode); }
-void gf_isom_fmo_del(GF_FileMappingDataMap *ptr) { gf_isom_fdm_del((GF_FileDataMap *)ptr); }
-u32 gf_isom_fmo_get_data(GF_FileMappingDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset) 
+GF_DataMap *gf_isom_fmo_new(const char *sPath, u8 mode) {
+	return gf_isom_fdm_new(sPath, mode);
+}
+void gf_isom_fmo_del(GF_FileMappingDataMap *ptr) {
+	gf_isom_fdm_del((GF_FileDataMap *)ptr);
+}
+u32 gf_isom_fmo_get_data(GF_FileMappingDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset)
 {
 	return gf_isom_fdm_get_data((GF_FileDataMap *)ptr, buffer, bufferLength, fileOffset);
 }

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/drm_sample.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/drm_sample.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -52,9 +52,9 @@
 	if (!data || !dataLength) {
 		return gf_isom_ismacryp_new_sample();
 	}
-	
+
 	s = gf_isom_ismacryp_new_sample();
-		
+
 	/*empty sample*/
 	if (!data || !dataLength) return s;
 
@@ -106,7 +106,7 @@
 	if (s->flags & GF_ISOM_ISMA_USE_SEL_ENC) {
 		gf_bs_write_int(bs, (s->flags & GF_ISOM_ISMA_IS_ENCRYPTED) ? 1 : 0, 1);
 		gf_bs_write_int(bs, 0, 7);
-	} 
+	}
 	if (s->flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
 		if (s->IV_length) gf_bs_write_long_int(bs, (s64) s->IV, 8*s->IV_length);
 		if (s->KI_length) gf_bs_write_data(bs, (char*)s->key_indicator, s->KI_length);
@@ -206,7 +206,7 @@
 	if (!sinf) return 0;
 
 	/*non-encrypted or non-ISMA*/
-	if (!sinf->info || !sinf->info->ikms || !sinf->info->isfm ) 
+	if (!sinf->info || !sinf->info->ikms || !sinf->info->isfm )
 		return 0;
 
 	return 1;
@@ -225,7 +225,7 @@
 	if (!sinf) return 0;
 
 	/*non-encrypted or non-OMA*/
-	if (!sinf->info || !sinf->info->okms || !sinf->info->okms->hdr) 
+	if (!sinf->info || !sinf->info->okms || !sinf->info->okms->hdr)
 		return 0;
 
 	return 1;
@@ -237,7 +237,7 @@
 {
 	GF_TrackBox *trak;
 	GF_ProtectionInfoBox *sinf;
-	
+
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
@@ -273,12 +273,12 @@
 /*retrieves ISMACryp info for the given track & SDI*/
 GF_EXPORT
 GF_Err gf_isom_get_omadrm_info(GF_ISOFile *the_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)
+                               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)
 {
 	GF_TrackBox *trak;
 	GF_ProtectionInfoBox *sinf;
-	
+
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
@@ -325,7 +325,7 @@
 
 	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 || !sampleDescriptionIndex) return GF_BAD_PARAM;
 
@@ -355,7 +355,7 @@
 
 	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 || !sampleDescriptionIndex) return GF_BAD_PARAM;
 
@@ -375,8 +375,8 @@
 }
 
 
-static GF_Err gf_isom_set_protected_entry(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u8 version, u32 flags, 
-										  u32 scheme_type, u32 scheme_version, char *scheme_uri, Bool is_isma, GF_ProtectionInfoBox **out_sinf)
+static GF_Err gf_isom_set_protected_entry(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u8 version, u32 flags,
+        u32 scheme_type, u32 scheme_version, char *scheme_uri, Bool is_isma, GF_ProtectionInfoBox **out_sinf)
 {
 	u32 original_format;
 	GF_Err e;
@@ -407,20 +407,21 @@
 	/*special case for AVC1*/
 	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_AVC3:
+	case GF_ISOM_BOX_TYPE_AVC4:
 	case GF_ISOM_BOX_TYPE_SVC1:
-		if (is_isma) 
+		if (is_isma)
 			original_format = GF_4CC('2','6','4','b');
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	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_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
-		if (is_isma) 
+	case GF_ISOM_BOX_TYPE_HVT1:
+		if (is_isma)
 			original_format = GF_4CC('2','6','5','b');
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
@@ -428,7 +429,7 @@
 	case GF_ISOM_BOX_TYPE_LSR1:
 		sea->type = GF_ISOM_BOX_TYPE_ENCS;
 		break;
-	case GF_ISOM_BOX_TYPE_STSE:
+	case GF_ISOM_BOX_TYPE_STXT:
 	case GF_ISOM_BOX_TYPE_WVTT:
 	case GF_ISOM_BOX_TYPE_STPP:
 		sea->type = GF_ISOM_BOX_TYPE_ENCT;
@@ -436,7 +437,7 @@
 	default:
 		return GF_BAD_PARAM;
 	}
-	
+
 	sinf = (GF_ProtectionInfoBox *)sinf_New();
 	gf_list_add(sea->protections, sinf);
 
@@ -452,7 +453,7 @@
 
 	sinf->original_format = (GF_OriginalFormatBox *)frma_New();
 	sinf->original_format->data_format = original_format;
-	
+
 	//common to isma, cenc and oma
 	sinf->info = (GF_SchemeInformationBox *)schi_New();
 
@@ -460,9 +461,9 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_set_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type, 
-						   u32 scheme_version, char *scheme_uri, char *kms_URI,
-						   Bool selective_encryption, u32 KI_length, u32 IV_length)
+GF_Err gf_isom_set_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type,
+                                       u32 scheme_version, char *scheme_uri, char *kms_URI,
+                                       Bool selective_encryption, u32 KI_length, u32 IV_length)
 {
 	GF_Err e;
 	GF_ProtectionInfoBox *sinf;
@@ -487,8 +488,8 @@
 }
 
 GF_Err gf_isom_set_oma_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index,
-						   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)
+                                  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)
 {
 	GF_ProtectionInfoBox *sinf;
 	GF_Err e;
@@ -516,7 +517,7 @@
 	}
 	return GF_OK;
 }
-
+#endif // GPAC_DISABLE_ISOM_WRITE
 
 GF_EXPORT
 GF_Err gf_isom_get_original_format_type(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat)
@@ -555,7 +556,7 @@
 	if (!sinf) return GF_FALSE;
 
 	/*non-encrypted or non-CENC*/
-	if (!sinf->info || !sinf->info->tenc) 
+	if (!sinf->info || !sinf->info->tenc)
 		return GF_FALSE;
 
 	return GF_TRUE;
@@ -566,7 +567,7 @@
 {
 	GF_TrackBox *trak;
 	GF_ProtectionInfoBox *sinf;
-	
+
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
@@ -592,8 +593,10 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_set_cenc_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type, 
-						   u32 scheme_version, u32 default_IsEncrypted, u8 default_IV_size,	bin128 default_KID)
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err gf_isom_set_cenc_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type,
+                                   u32 scheme_version, u32 default_IsEncrypted, u8 default_IV_size,	bin128 default_KID)
 {
 	GF_Err e;
 	GF_ProtectionInfoBox *sinf;
@@ -735,7 +738,7 @@
 			gf_list_rem(stbl->other_boxes, i);
 			i--;
 		}
-		else if (a->type == GF_ISOM_BOX_TYPE_SENC){
+		else if (a->type == GF_ISOM_BOX_TYPE_SENC) {
 			senc_del(a);
 			gf_list_rem(stbl->other_boxes, i);
 			i--;
@@ -811,7 +814,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_PIFFSampleEncryptionBox * gf_isom_create_piff_psec_box(u8 version, u32 flags, u32 AlgorithmID, u8 IV_size, bin128 KID) 
+GF_PIFFSampleEncryptionBox * gf_isom_create_piff_psec_box(u8 version, u32 flags, u32 AlgorithmID, u8 IV_size, bin128 KID)
 {
 	GF_PIFFSampleEncryptionBox *psec;
 
@@ -830,7 +833,7 @@
 	return psec;
 }
 
-GF_SampleEncryptionBox * gf_isom_create_samp_enc_box(u8 version, u32 flags) 
+GF_SampleEncryptionBox * gf_isom_create_samp_enc_box(u8 version, u32 flags)
 {
 	GF_SampleEncryptionBox *senc;
 
@@ -844,7 +847,7 @@
 	return senc;
 }
 
-GF_Err gf_isom_cenc_allocate_storage(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u32 AlgorithmID, u8 IV_size, bin128 KID) 
+GF_Err gf_isom_cenc_allocate_storage(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u32 AlgorithmID, u8 IV_size, bin128 KID)
 {
 	GF_SampleTableBox *stbl;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -854,13 +857,13 @@
 	if (!stbl) return GF_BAD_PARAM;
 
 	switch (container_type) {
-	case GF_ISOM_BOX_UUID_PSEC: 
+	case GF_ISOM_BOX_UUID_PSEC:
 		if (stbl->piff_psec) return GF_OK;
 		stbl->piff_psec = (GF_Box *)gf_isom_create_piff_psec_box(1, 0, AlgorithmID, IV_size, KID);
 		//senc will be written and destroyed with the other boxes
 		return gf_isom_box_add_default((GF_Box *) stbl, stbl->piff_psec);
 
-	case GF_ISOM_BOX_TYPE_SENC: 
+	case GF_ISOM_BOX_TYPE_SENC:
 		if (stbl->senc) return GF_OK;
 		stbl->senc = (GF_Box *)gf_isom_create_samp_enc_box(0, 0);
 		//senc will be written and destroyed with the other boxes
@@ -877,7 +880,7 @@
 		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIZ);
 		senc->cenc_saiz->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
 		senc->cenc_saiz->aux_info_type_parameter = 0;
-		if (stbl) 
+		if (stbl)
 			stbl_AddBox(stbl, (GF_Box *)senc->cenc_saiz);
 		else
 			traf_AddBox((GF_Box*)traf, (GF_Box *)senc->cenc_saiz);
@@ -887,7 +890,7 @@
 		senc->cenc_saio->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
 		senc->cenc_saio->aux_info_type_parameter = 0;
 		senc->cenc_saio->entry_count = 1;
-		if (stbl) 
+		if (stbl)
 			stbl_AddBox(stbl, (GF_Box *)senc->cenc_saio);
 		else
 			traf_AddBox((GF_Box*)traf, (GF_Box *)senc->cenc_saio);
@@ -909,21 +912,21 @@
 	}
 }
 
-void gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u32 offset, u32 len) 
+void gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u32 offset, u32 len)
 {
 	u32  i;
 	if (!senc->cenc_saiz) {
 		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIZ);
 		senc->cenc_saiz->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
 		senc->cenc_saiz->aux_info_type_parameter = 0;
-		if (stbl) 
+		if (stbl)
 			stbl_AddBox(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->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
 		senc->cenc_saio->aux_info_type_parameter = 0;
-		if (stbl) 
+		if (stbl)
 			stbl_AddBox(stbl, (GF_Box *)senc->cenc_saio);
 	}
 
@@ -990,7 +993,7 @@
 			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);	
+		gf_bs_del(bs);
 	}
 
 	gf_list_add(senc->samp_aux_info, sai);
@@ -1015,7 +1018,7 @@
 	GF_List *sai_sizes, *sai_offsets;
 	Bool has_saiz, has_saio;
 	has_saiz = has_saio = GF_FALSE;
-	
+
 	if (stbl) {
 		sai_sizes = stbl->sai_sizes;
 		sai_offsets = stbl->sai_offsets;
@@ -1033,15 +1036,22 @@
 			break;
 		}
 	}
+	//assume CENC if we find a senc box - hack for some ultraviolet files :(
+	if (!has_saiz && traf && (traf->sample_encryption || traf->piff_sample_encryption) )
+		has_saiz = GF_TRUE;
 
 	for (i = 0; i < gf_list_count(sai_offsets); i++) {
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(sai_offsets, i);
 		if (saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
 			has_saio = GF_TRUE;
 			break;
-		}			
+		}
 	}
-	
+
+	//assume CENC if we find a senc box - hack for some ultraviolet files :(
+	if (!has_saio && traf && (traf->sample_encryption || traf->piff_sample_encryption) )
+		has_saio = GF_TRUE;
+
 	return (has_saiz && has_saio);
 }
 
@@ -1052,7 +1062,7 @@
 	u64 cur_position;
 	GF_Err e = GF_OK;
 	char *buffer;
-	
+
 	nb_saio = size = offset = prev_sai_size = 0;
 
 	for (i = 0; i < gf_list_count(mdia->information->sampleTable->sai_offsets); i++) {
@@ -1064,7 +1074,7 @@
 				offset = saio->offsets[sampleNumber-1];
 			nb_saio = saio->entry_count;
 			break;
-		}			
+		}
 	}
 
 	for (i = 0; i < gf_list_count(mdia->information->sampleTable->sai_sizes); i++) {
@@ -1085,7 +1095,7 @@
 	gf_bs_seek(mdia->information->dataHandler->bs, cur_position);
 
 	*sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
-	memset(*sai, 0, sizeof(GF_CENCSampleAuxInfo)); 
+	memset(*sai, 0, sizeof(GF_CENCSampleAuxInfo));
 	bs = gf_bs_new(buffer, size, GF_BITSTREAM_READ);
 	gf_bs_read_data(bs, (char *)(*sai)->IV, IV_size);
 	if (size > IV_size) {
@@ -1097,7 +1107,7 @@
 		}
 	}
 	gf_bs_del(bs);
-	
+
 	return e;
 }
 
@@ -1153,11 +1163,11 @@
 	a_sai = NULL;
 	switch (type) {
 	case GF_ISOM_BOX_UUID_PSEC:
-		if (a_box) 
+		if (a_box)
 			a_sai = (GF_CENCSampleAuxInfo *)gf_list_get(((GF_PIFFSampleEncryptionBox *)a_box)->samp_aux_info, sampleNumber-1);
 		break;
 	case GF_ISOM_BOX_TYPE_SENC:
-		if (a_box) 
+		if (a_box)
 			a_sai = (GF_CENCSampleAuxInfo *)gf_list_get(((GF_SampleEncryptionBox *)a_box)->samp_aux_info, sampleNumber-1);
 		break;
 	}
@@ -1175,7 +1185,7 @@
 	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) 
+void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID)
 {
 	GF_ProtectionInfoBox *sinf;
 
@@ -1192,7 +1202,7 @@
 		if (default_IV_size) *default_IV_size = sinf->info->tenc->IV_size;
 		if (default_KID) memmove(*default_KID, sinf->info->tenc->KID, 16);
 	}
-	
+
 }
 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)
@@ -1207,12 +1217,16 @@
 */
 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)
 {
-	GF_Err e;
 	GF_ProtectionInfoBox *sinf;
 
 	//setup generic protection
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	GF_Err e;
 	e = gf_isom_set_protected_entry(the_file, trackNumber, desc_index, 1, 0, scheme_type, scheme_version, NULL, GF_FALSE, &sinf);
 	if (e) return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 
 	sinf->info->adkm = (GF_AdobeDRMKeyManagementSystemBox *)adkm_New();
 
@@ -1260,7 +1274,7 @@
 	if (!sinf) return GF_FALSE;
 
 	/*non-encrypted or non-ADOBE*/
-	if (!sinf->info || !sinf->info->adkm) 
+	if (!sinf->info || !sinf->info->adkm)
 		return GF_FALSE;
 
 	return GF_TRUE;
@@ -1271,7 +1285,7 @@
 {
 	GF_TrackBox *trak;
 	GF_ProtectionInfoBox *sinf;
-	
+
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
@@ -1294,7 +1308,7 @@
 
 void gf_isom_ipmpx_remove_tool_list(GF_ISOFile *the_file)
 {
-		/*remove IPMPToolList if any*/	
+	/*remove IPMPToolList if any*/
 	if (the_file && the_file->moov && the_file->moov->iods && (the_file ->moov->iods->descriptor->tag == GF_ODF_ISOM_IOD_TAG) ) {
 		GF_IsomInitialObjectDescriptor *iod = (GF_IsomInitialObjectDescriptor *)the_file ->moov->iods->descriptor;
 		if (iod->IPMPToolList) gf_odf_desc_del((GF_Descriptor*) iod->IPMPToolList);

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/hint_track.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/hint_track.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -31,8 +31,8 @@
 {
 	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_HINT) return 0;
 	//QT doesn't specify any InfoHeader on HintTracks
-	if (trak->Media->information->InfoHeader 
-			&& trak->Media->information->InfoHeader->type != GF_ISOM_BOX_TYPE_HMHD) 
+	if (trak->Media->information->InfoHeader
+	        && trak->Media->information->InfoHeader->type != GF_ISOM_BOX_TYPE_HMHD)
 		return 0;
 
 	return 1;
@@ -65,7 +65,7 @@
 
 	offset = gf_isom_hint_sample_size(entry->hint_sample) - entry->hint_sample->dataLength;
 	count = gf_list_count(entry->hint_sample->packetTable);
-	
+
 	for (i=0; i<count; i++) {
 		pck = (GF_HintPacket *)gf_list_get(entry->hint_sample->packetTable, i);
 		if (offset && entry->hint_sample->dataLength) {
@@ -115,7 +115,7 @@
 	//store the HintTrack format for later use...
 	hmhd->subType = HintType;
 
-	
+
 	//hint tracks always have a tref and everything ...
 	if (!trak->References) {
 		if (!trak->References) {
@@ -153,13 +153,13 @@
 	e = udta_AddBox(udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HNTI));
 	if (e) return e;
 
-/*
-	//NAME
-	e = udta_AddBox(udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_NAME));
-	if (e) return e;
-	//HINF
-	return udta_AddBox(udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HINF));
-*/
+	/*
+		//NAME
+		e = udta_AddBox(udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_NAME));
+		if (e) return e;
+		//HINF
+		return udta_AddBox(udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HINF));
+	*/
 	return GF_OK;
 }
 
@@ -234,7 +234,7 @@
 
 	for (i=0; i< count; i++) {
 		ent = (GF_TSHintEntryBox *)gf_list_get(hdesc->HintDataTable, i);
-		if (ent->type == GF_ISOM_BOX_TYPE_TIMS) {			
+		if (ent->type == GF_ISOM_BOX_TYPE_TIMS) {
 			ent->timeScale = TimeScale;
 			return GF_OK;
 		}
@@ -263,7 +263,7 @@
 
 	for (i=0; i< count; i++) {
 		ent = (GF_TimeOffHintEntryBox *)gf_list_get(hdesc->HintDataTable, i);
-		if (ent->type == GF_ISOM_BOX_TYPE_TSRO) {			
+		if (ent->type == GF_ISOM_BOX_TYPE_TSRO) {
 			ent->TimeOffset = TimeOffset;
 			return GF_OK;
 		}
@@ -292,7 +292,7 @@
 
 	for (i=0; i< count; i++) {
 		ent = (GF_SeqOffHintEntryBox *)gf_list_get(hdesc->HintDataTable, i);
-		if (ent->type == GF_ISOM_BOX_TYPE_SNRO) {			
+		if (ent->type == GF_ISOM_BOX_TYPE_SNRO) {
 			ent->SeqOffset = SequenceNumberOffset;
 			return GF_OK;
 		}
@@ -343,7 +343,7 @@
 }
 
 //stores the hint sample in the file
-//set IsRandomAccessPoint if you want to indicate that this is a random access point 
+//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)
 {
@@ -364,8 +364,8 @@
 	//first of all, we need to adjust the offset for data referenced IN THIS hint sample
 	//and get some PckSize
 	e = AdjustHintInfo(entry, trak->Media->information->sampleTable->SampleSize->sampleCount + 1);
-	if (e) return e;	
-	
+	if (e) return e;
+
 	//ok, let's write the sample
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	e = gf_isom_hint_sample_write(entry->hint_sample, bs);
@@ -381,7 +381,7 @@
 	gf_bs_get_content(bs, &samp->data, &samp->dataLength);
 	gf_bs_del(bs);
 
-	//finally add the sample 
+	//finally add the sample
 	e = gf_isom_add_sample(the_file, trackNumber, trak->Media->information->sampleTable->currentEntryIndex, samp);
 	gf_isom_sample_del(&samp);
 
@@ -417,7 +417,7 @@
 }
 
 
-//adds a chunk of data (max 14 bytes) in the packet that is directly copied 
+//adds a chunk of data (max 14 bytes) in the packet that is directly copied
 //while streaming
 GF_Err gf_isom_hint_direct_data(GF_ISOFile *the_file, u32 trackNumber, char *data, u32 dataLength, u8 AtBegin)
 {
@@ -476,7 +476,7 @@
 
 	//we're getting data from another track
 	if (SourceTrackID != trak->Header->trackID) {
-		//get (or set) the track reference index 
+		//get (or set) the track reference index
 		e = Track_FindRef(trak, GF_ISOM_REF_HINT, &hint);
 		if (e) return e;
 		e = reftype_AddRefTrack(hint, SourceTrackID, &refIndex);
@@ -543,7 +543,7 @@
 	if (SourceTrackID == trak->Header->trackID) {
 		dte->trackRefIndex = (s8) -1;
 	} else {
-		//get (or set) the track reference index 
+		//get (or set) the track reference index
 		e = Track_FindRef(trak, GF_ISOM_REF_HINT, &hint);
 		if (e) return e;
 		e = reftype_AddRefTrack(hint, SourceTrackID, &refIndex);
@@ -556,11 +556,11 @@
 
 
 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)
+                                    u8 PackingBit,
+                                    u8 eXtensionBit,
+                                    u8 MarkerBit,
+                                    u8 disposable_packet,
+                                    u8 IsRepeatedPacket)
 {
 	GF_TrackBox *trak;
 	GF_HintSampleEntryBox *entry;
@@ -587,15 +587,15 @@
 	return GF_OK;
 }
 
-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)
+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)
 {
 	GF_TrackBox *trak;
 	GF_HintSampleEntryBox *entry;
@@ -624,8 +624,8 @@
 }
 
 
-//set 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 
+//set 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 be in a different order. Typically used for MPEG video with B-frames
 GF_Err gf_isom_rtp_packet_set_offset(GF_ISOFile *the_file, u32 trackNumber, s32 timeOffset)
 {
@@ -752,7 +752,7 @@
 	strcat(buf, "\r\n");
 	gf_free(sdp->sdpText);
 	ReorderSDP(buf, 0);
-	sdp->sdpText = buf;	
+	sdp->sdpText = buf;
 	return GF_OK;
 }
 
@@ -820,7 +820,7 @@
 	hnti = (GF_HintTrackInfoBox *)gf_list_get(map->other_boxes, 0);
 
 	if (!hnti->SDP) {
-		//we have to create it by hand, as we have a duplication of box type 
+		//we have to create it by hand, as we have a duplication of box type
 		//(GF_RTPSampleEntryBox and GF_RTPBox have the same type...)
 		rtp = (GF_RTPBox *) gf_malloc(sizeof(GF_RTPBox));
 		rtp->subType = GF_ISOM_BOX_TYPE_SDP;
@@ -842,7 +842,7 @@
 	strcat(buf, "\r\n");
 	gf_free(rtp->sdpText);
 	ReorderSDP(buf, 1);
-	rtp->sdpText = buf;	
+	rtp->sdpText = buf;
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/hinting.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/hinting.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -48,7 +48,7 @@
 void ghnt_del(GF_Box *s)
 {
 	GF_HintSampleEntryBox *ptr;
-	
+
 	ptr = (GF_HintSampleEntryBox *)s;
 	gf_isom_box_array_del(ptr->HintDataTable);
 	if (ptr->hint_sample) gf_isom_hint_sample_del(ptr->hint_sample);
@@ -102,7 +102,7 @@
 {
 	GF_Err e;
 	GF_HintSampleEntryBox *ptr = (GF_HintSampleEntryBox *)s;
-	
+
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
 	ptr->size += 16;
@@ -235,9 +235,9 @@
 GF_HintPacket *gf_isom_hint_pck_new(u8 HintType)
 {
 	switch (HintType) {
-	case GF_ISMO_HINT_RTP: 
+	case GF_ISMO_HINT_RTP:
 		return (GF_HintPacket *) gf_isom_hint_rtp_new();
-	default: 
+	default:
 		return NULL;
 	}
 }
@@ -394,16 +394,24 @@
 		Deletion of DataTable entries in the RTP sample
 ********************************************************************/
 void Del_EmptyDTE(GF_EmptyDTE *dte)
-{ gf_free(dte); }
+{
+	gf_free(dte);
+}
 
 void Del_ImmediateDTE(GF_ImmediateDTE *dte)
-{ gf_free(dte); }
+{
+	gf_free(dte);
+}
 
 void Del_SampleDTE(GF_SampleDTE *dte)
-{ gf_free(dte); }
+{
+	gf_free(dte);
+}
 
 void Del_StreamDescDTE(GF_StreamDescDTE *dte)
-{ gf_free(dte); }
+{
+	gf_free(dte);
+}
 
 //deletion of DTEs
 void DelDTE(GF_GenericDTE *dte)
@@ -561,7 +569,7 @@
 	default:
 		return GF_OK;
 	}
-	
+
 	sDTE = (GF_SampleDTE *)dte;
 	//we only adjust for intra HintTrack reference
 	if (sDTE->trackRefIndex != (s8) -1) return GF_OK;
@@ -621,10 +629,10 @@
 	ptr->B_bit = gf_bs_read_int(bs, 1);
 	ptr->R_bit = gf_bs_read_int(bs, 1);
 	count = gf_bs_read_u16(bs);
-	
+
 	//read the TLV
 	if (hasTLV) {
-		tempSize = 4;	//TLVsize includes its field length 
+		tempSize = 4;	//TLVsize includes its field length
 		TLVsize = gf_bs_read_u32(bs);
 		while (tempSize < TLVsize) {
 			e = gf_isom_parse_box(&a, bs);
@@ -858,7 +866,7 @@
 	hdc->samp = samp;
 	hdc->sample_num = sample_num;
 	hdc->trak = trak;
-	/*we insert all new samples, since they're more likely to be fetched next (except for audio 
+	/*we insert all new samples, since they're more likely to be fetched next (except for audio
 	interleaving and other multiplex)*/
 	gf_list_insert(hsamp->sample_cache, hdc, 0);
 	return samp;
@@ -926,21 +934,21 @@
 	ts = (u32) (entry->hint_sample->TransmissionTime + pck->relativeTransTime + entry->ts_offset + cts_off);
 	gf_bs_write_u32(bs, ts );
 	gf_bs_write_u32(bs, entry->ssrc);	/*SSRC*/
-	
+
 	/*then build all data*/
 	count = gf_list_count(pck->DataTable);
 	for (i=0; i<count; i++) {
 		GF_GenericDTE *dte = (GF_GenericDTE *)gf_list_get(pck->DataTable, i);
 		switch (dte->source) {
 		/*empty*/
-		case 0: 
+		case 0:
 			break;
 		/*immediate data*/
 		case 1:
 			gf_bs_write_data(bs, ((GF_ImmediateDTE *)dte)->data, ((GF_ImmediateDTE *)dte)->dataLength);
 			break;
 		/*sample data*/
-		case 2: 
+		case 2:
 		{
 			GF_ISOSample *samp;
 			GF_SampleDTE *sdte = (GF_SampleDTE *)dte;
@@ -963,9 +971,9 @@
 			}
 			gf_bs_write_data(bs, samp->data + sdte->byteOffset, sdte->dataLength);
 		}
-			break;
+		break;
 		/*sample desc data - currently NOT SUPPORTED !!!*/
-		case 3: 
+		case 3:
 			break;
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/isom_intern.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/isom_intern.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -43,7 +43,7 @@
 	u64 MaxDur;
 	GF_TrackFragmentBox *traf;
 	GF_TrackBox *trak;
-	
+
 	MaxDur = 0;
 
 	//we shall have a MOOV and its MVEX BEFORE any MOOF
@@ -52,7 +52,7 @@
 		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) 
+	//we will likely a-have R1(moofSN 1, 3, 5, 7) plus R2(moofSN 2, 4, 6, 8)
 	if (mov->NextMoofNumber && (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;
@@ -84,14 +84,14 @@
 
 		//update trak duration
 		SetTrackDuration(trak);
-		if (trak->Header->duration > MaxDur) 
+		if (trak->Header->duration > MaxDur)
 			MaxDur = trak->Header->duration;
 
 		trak->first_traf_merged = 1;
 	}
 
 	if (moof->other_boxes) {
-		GF_Box *a;	
+		GF_Box *a;
 		i = 0;
 		while ((a = (GF_Box *)gf_list_enum(moof->other_boxes, &i))) {
 			if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
@@ -173,9 +173,9 @@
 			/*set our pointer to the movie*/
 			mov->moov->mov = mov;
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-            if (mov->moov->mvex) mov->moov->mvex->mov = mov;
+			if (mov->moov->mvex) mov->moov->mvex->mov = mov;
 #endif
-            e = gf_list_add(mov->TopBoxes, a);
+			e = gf_list_add(mov->TopBoxes, a);
 			if (e) {
 				return e;
 			}
@@ -287,10 +287,10 @@
 			((GF_MovieFragmentBox *)a)->mov = mov;
 
 			totSize += a->size;
-            mov->moof = (GF_MovieFragmentBox *) a;
+			mov->moof = (GF_MovieFragmentBox *) a;
 			/*read & debug: store at root level*/
 			if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
-                u32 k;
+				u32 k;
 				gf_list_add(mov->TopBoxes, a);
 				/*also update pointers to trex for debug*/
 				if (mov->moov) {
@@ -329,13 +329,13 @@
 		{
 			GF_UnknownBox *box = (GF_UnknownBox*)a;
 			u8 *c = (u8 *) box->data;
-			if ((box->dataSize==4) 
-				&& (GF_4CC(c[0],c[1],c[2],c[3])==(u32)0x0D0A870A)) 
-				 mov->is_jp2 = 1;
+			if ((box->dataSize==4)
+			        && (GF_4CC(c[0],c[1],c[2],c[3])==(u32)0x0D0A870A))
+				mov->is_jp2 = 1;
 
 			gf_isom_box_del(a);
 		}
-			break;
+		break;
 
 		case GF_ISOM_BOX_TYPE_PRFT:
 			if (!(mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
@@ -346,7 +346,7 @@
 					mov->last_producer_ref_time = (GF_ProducerReferenceTimeBox *)a;
 				break;
 			}
-			//fallthrough
+		//fallthrough
 
 
 		default:
@@ -362,12 +362,12 @@
 	}
 
 	/*we need at least moov or meta*/
-	if (!mov->moov && !mov->meta 
+	if (!mov->moov && !mov->meta
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-        && !mov->moof && !mov->is_index_segment
+	        && !mov->moof && !mov->is_index_segment
 #endif
-        ) {
-			return GF_ISOM_INCOMPLETE_FILE;
+	   ) {
+		return GF_ISOM_INCOMPLETE_FILE;
 	}
 	/*we MUST have movie header*/
 	if (mov->moov && !mov->moov->mvhd) {
@@ -417,7 +417,7 @@
 		gf_free(mov);
 		return NULL;
 	}
-	
+
 	/*default storage mode is flat*/
 	mov->storageMode = GF_ISOM_STORE_FLAT;
 	return mov;
@@ -439,10 +439,10 @@
 		mov->openMode = GF_ISOM_OPEN_READ;
 		mov->es_id_default_sync = -1;
 		//for open, we do it the regular way and let the GF_DataMap assign the appropriate struct
-		//this can be FILE (the only one supported...) as well as remote 
+		//this can be FILE (the only one supported...) as well as remote
 		//(HTTP, ...),not suported yet
 		//the bitstream IS PART OF the GF_DataMap
-		//as this is read-only, use a FileMapping. this is the only place where 
+		//as this is read-only, use a FileMapping. this is the only place where
 		//we use file mapping
 		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_READ_ONLY, &mov->movieFileMap);
 		if (e) {
@@ -544,7 +544,7 @@
 	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, u32 trackID)
 {
 	u32 i, count;
 	GF_TrackBox *trak;
@@ -558,7 +558,7 @@
 	return NULL;
 }
 
-GF_TrackBox *gf_isom_get_track_from_original_id(GF_MovieBox *moov, u32 originalID, u32 originalFile) 
+GF_TrackBox *gf_isom_get_track_from_original_id(GF_MovieBox *moov, u32 originalID, u32 originalFile)
 {
 	u32 i, count;
 	GF_TrackBox *trak;
@@ -621,7 +621,7 @@
 		//check this is in our media time line
 		if ((*MediaTime > lastSampleTime)
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-			&& !trak->moov->mov->moof
+		        && !trak->moov->mov->moof
 #endif
 		   ) {
 			*MediaTime = lastSampleTime;
@@ -694,7 +694,7 @@
 		*useEdit = 2;
 		return GF_OK;
 	}
-	
+
 	/*WARNING: this can be "-1" when doing searchForward mode (to prevent jumping to next entry)*/
 	mtime = ent->mediaTime + movieTime - (time * trak->Media->mediaHeader->timeScale / trak->moov->mvhd->timeScale);
 	if (mtime<0) mtime = 0;
@@ -708,7 +708,7 @@
 	//we have to find a COMPOSITION time
 	e = findEntryForTime(stbl, (u32) *MediaTime, 1, &sampleNumber, &prevSampleNumber);
 	if (e) return e;
-	
+
 	//first case: our time is after the last sample DTS (it's a broken editList somehow)
 	//set the media time to the last sample
 	if (!sampleNumber && !prevSampleNumber) {
@@ -738,7 +738,7 @@
 	//and store the "time offset" of the desired sample in this segment
 	//this is weird, used to rebuild the timeStamp when reading from the track, not the
 	//media ...
-	*MediaOffset = firstDTS;	
+	*MediaOffset = firstDTS;
 #endif
 	return GF_OK;
 }
@@ -848,7 +848,7 @@
 		mov->fileName = gf_strdup(fileName);
 		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_WRITE, & mov->editFileMap);
 		if (e) goto err_exit;
-		
+
 		/*brand is set to ISOM by default - it may be touched until sample data is added to track*/
 		gf_isom_set_brand_info( (GF_ISOFile *) mov, GF_ISOM_BRAND_ISOM, 1);
 	} else {
@@ -868,7 +868,7 @@
 	//create an MDAT
 	mov->mdat = (GF_MediaDataBox *) mdat_New();
 	gf_list_add(mov->TopBoxes, mov->mdat);
-	
+
 	//default behaviour is capture mode, no interleaving (eg, no rewrite of mdat)
 	mov->storageMode = GF_ISOM_STORE_FLAT;
 	return mov;
@@ -917,8 +917,8 @@
 	for (i=0; i<count; i++) {
 		pSamp = (GF_SubSampleInfoEntry*) gf_list_get(sub_samples->Samples, i);
 		/*TODO - do we need to support insertion of subsample info ?*/
-		if (last_sample + pSamp->sample_delta > sampleNumber) return GF_NOT_SUPPORTED; 
-		if (last_sample + pSamp->sample_delta == sampleNumber) break; 
+		if (last_sample + pSamp->sample_delta > sampleNumber) return GF_NOT_SUPPORTED;
+		if (last_sample + pSamp->sample_delta == sampleNumber) break;
 		last_sample += pSamp->sample_delta;
 		pSamp = NULL;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/isom_read.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/isom_read.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -56,6 +56,7 @@
 	return the_file->openMode;
 }
 
+GF_EXPORT
 u64 gf_isom_get_file_size(GF_ISOFile *the_file)
 {
 	if (!the_file) return 0;
@@ -99,7 +100,7 @@
 		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 {
@@ -264,7 +265,7 @@
 		for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 			GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
 			/*delete any pending dataHandler of scalable enhancements*/
-			if (trak->Media->information->scalableDataHandler && (trak->Media->information->scalableDataHandler != movie->movieFileMap)) 
+			if (trak->Media->information->scalableDataHandler && (trak->Media->information->scalableDataHandler != movie->movieFileMap))
 				gf_isom_datamap_del(trak->Media->information->scalableDataHandler);
 		}
 	}
@@ -453,19 +454,19 @@
 Bool gf_isom_has_segment(GF_ISOFile *file, u32 *brand, u32 *version)
 {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-    u32 i;
-    GF_Box *a;
-    i = 0;
-    while (NULL != (a = gf_list_enum(file->TopBoxes, &i))) {
+	u32 i;
+	GF_Box *a;
+	i = 0;
+	while (NULL != (a = 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;
-    		*brand = styp->majorBrand;
-            *version = styp->minorVersion;
-            return 1;
-        }
+		if (a->type == GF_ISOM_BOX_TYPE_STYP) {
+			GF_SegmentTypeBox *styp = (GF_SegmentTypeBox *)a;
+			*brand = styp->majorBrand;
+			*version = styp->minorVersion;
+			return 1;
+		}
 #endif
-    }
+	}
 #endif
 	return 0;
 }
@@ -474,7 +475,7 @@
 u32 gf_isom_segment_get_fragment_count(GF_ISOFile *file)
 {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-    if (file) {
+	if (file) {
 		u32 i, count = 0;
 		for (i=0; i<gf_list_count(file->TopBoxes); i++) {
 			GF_Box *a = gf_list_get(file->TopBoxes, i);
@@ -504,7 +505,7 @@
 {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	GF_MovieFragmentBox *moof;
-    if (!file) return 0;
+	if (!file) return 0;
 	gf_list_count(file->TopBoxes);
 	moof = gf_isom_get_moof(file, moof_index);
 	return moof ? gf_list_count(moof->TrackList) : 0;
@@ -518,7 +519,7 @@
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	GF_MovieFragmentBox *moof;
 	GF_TrackFragmentBox *traf;
-    if (!file) return 0;
+	if (!file) return 0;
 	gf_list_count(file->TopBoxes);
 	moof = gf_isom_get_moof(file, moof_index);
 	traf = moof ? gf_list_get(moof->TrackList, traf_index-1) : NULL;
@@ -606,7 +607,7 @@
 	case GF_ODF_ISOM_OD_TAG:
 		inc_list = ((GF_IsomObjectDescriptor *)desc)->ES_ID_IncDescriptors;
 		break;
-		//files without IOD are possible !
+	//files without IOD are possible !
 	default:
 		return 0;
 	}
@@ -653,12 +654,90 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_media_language(GF_ISOFile *the_file, u32 trackNumber, char *three_char_code)
+GF_Err gf_isom_get_media_language(GF_ISOFile *the_file, u32 trackNumber, char **lang)
 {
+	u32 count;
+	Bool elng_found = GF_FALSE;
 	GF_TrackBox *trak;
+	if (!lang) {
+		return GF_BAD_PARAM;
+	}
+	*lang = NULL;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
-	memcpy(three_char_code, trak->Media->mediaHeader->packedLanguage, sizeof(char)*4);
+	count = gf_list_count(trak->Media->other_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);
+			if (box->type == GF_ISOM_BOX_TYPE_ELNG) {
+				elng_found = GF_TRUE;
+				*lang = gf_strdup(((GF_ExtendedLanguageBox *)box)->extended_language);
+				return GF_OK;
+			}
+		}
+	}
+	if (!elng_found) {
+		*lang = gf_strdup(trak->Media->mediaHeader->packedLanguage);
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_isom_get_track_kind_count(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_UserDataBox *udta;
+	GF_UserDataMap *map;
+	if (trackNumber) {
+		GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+		if (!trak) return 0;
+		if (!trak->udta) {
+			return 0;
+		}
+		udta = trak->udta;
+	} else {
+		return 0;
+	}
+	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_KIND, NULL);
+	if (!map) return 0;
+
+	return gf_list_count(map->other_boxes);
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_track_kind(GF_ISOFile *the_file, u32 trackNumber, u32 index, char **scheme, char **value)
+{
+	GF_Err e;
+	GF_UserDataBox *udta;
+	GF_UserDataMap *map;
+	GF_KindBox *kindBox;
+	if (!scheme || !value) {
+		return GF_BAD_PARAM;
+	}
+	*scheme = NULL;
+	*value = NULL;
+
+	if (trackNumber) {
+		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));
+			if (e) return e;
+		}
+		udta = trak->udta;
+	} else {
+		return GF_BAD_PARAM;
+	}
+	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);
+	if (!kindBox) return GF_BAD_PARAM;
+
+	*scheme = gf_strdup(kindBox->schemeURI);
+	if (kindBox->value) {
+		*value = gf_strdup(kindBox->value);
+	}
 	return GF_OK;
 }
 
@@ -1153,12 +1232,12 @@
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak || !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
+	       + trak->sample_count_at_seg_start
 #endif
-		;
+	       ;
 }
 
 u32 gf_isom_get_constant_sample_size(GF_ISOFile *the_file, u32 trackNumber)
@@ -1275,7 +1354,7 @@
 GF_EXPORT
 u8 gf_isom_get_sample_sync(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber)
 {
-	u8 is_rap;
+	SAPType is_rap;
 	GF_Err e;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !sampleNumber) return 0;
@@ -1456,7 +1535,7 @@
 	if (IsSync) {
 		//get the SyncNumber
 		e = Media_FindSyncSample(trak->Media->information->sampleTable,
-						sampleNumber, &syncNum, SearchMode);
+		                         sampleNumber, &syncNum, SearchMode);
 		if (e) return e;
 		if (syncNum) sampleNumber = syncNum;
 		syncNum = 0;
@@ -1466,7 +1545,7 @@
 	else if (SearchMode == GF_ISOM_SEARCH_SYNC_SHADOW) {
 		//get the SyncNumber
 		e = Media_FindSyncSample(trak->Media->information->sampleTable,
-						sampleNumber, &syncNum, GF_ISOM_SEARCH_SYNC_BACKWARD);
+		                         sampleNumber, &syncNum, GF_ISOM_SEARCH_SYNC_BACKWARD);
 		if (e) return e;
 	}
 
@@ -1487,7 +1566,7 @@
 		if ((sampleNumber < syncNum) || (!shadowSync)) {
 			sampleNumber = syncNum;
 		} else {
-		//otherwise, we have a better alternate sample in the shadowSync for this sample
+			//otherwise, we have a better alternate sample in the shadowSync for this sample
 			useShadow = 1;
 		}
 	}
@@ -1512,7 +1591,7 @@
 		shadow = gf_isom_get_sample(the_file, trackNumber, shadowSync, StreamDescriptionIndex);
 		//if no sample, the shadowSync is broken, return the sample
 		if (!shadow) return GF_OK;
-		(*sample)->IsRAP = 1;
+		(*sample)->IsRAP = RAP;
 		gf_free((*sample)->data);
 		(*sample)->dataLength = shadow->dataLength;
 		(*sample)->data = shadow->data;
@@ -1549,9 +1628,9 @@
 	}
 	else if ((movieTime * trak->moov->mvhd->timeScale > trak->Header->duration * trak->Media->mediaHeader->timeScale)
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-		&& !trak->dts_at_seg_start
+	         && !trak->dts_at_seg_start
 #endif
-		) {
+	        ) {
 		*sample = NULL;
 		if (sampleNumber) *sampleNumber = 0;
 		*StreamDescriptionIndex = 0;
@@ -1565,7 +1644,7 @@
 
 	e = GetMediaTime(trak, (SearchMode==GF_ISOM_SEARCH_SYNC_FORWARD) ? 1 : 0, movieTime, &mediaTime, &segStartTime, &mediaOffset, &useEdit, &nextMediaTime);
 	if (e) return e;
-	
+
 	/*here we check if we were playing or not and return no sample in normal search modes*/
 	if (useEdit && mediaOffset == -1) {
 		if ((SearchMode==GF_ISOM_SEARCH_FORWARD) || (SearchMode==GF_ISOM_SEARCH_BACKWARD)) {
@@ -1602,8 +1681,13 @@
 	//OK, we have a sample so fetch it
 	e = gf_isom_get_sample_for_media_time(the_file, trackNumber, mediaTime, StreamDescriptionIndex, SearchMode, sample, &sampNum);
 	if (e) {
-		if ((e==GF_EOS) && nextMediaTime) {
-			return gf_isom_get_sample_for_movie_time(the_file, trackNumber, nextMediaTime-1, StreamDescriptionIndex, SearchMode, sample, sampleNumber);
+		if (e==GF_EOS) {
+			//movie is fragmented and samples not yet received, return EOS
+			if (the_file->moov->mvex && !trak->Media->information->sampleTable->SampleSize->sampleCount)
+				return e;
+
+			if (nextMediaTime)
+				return gf_isom_get_sample_for_movie_time(the_file, trackNumber, nextMediaTime-1, StreamDescriptionIndex, SearchMode, sample, sampleNumber);
 		}
 		return e;
 	}
@@ -1715,9 +1799,9 @@
 	if (!trak) return GF_BAD_PARAM;
 
 	if (!trak->editBox ||
-		!trak->editBox->editList ||
-		(SegmentIndex > gf_list_count(trak->editBox->editList->entryList)) ||
-		!SegmentIndex)
+	        !trak->editBox->editList ||
+	        (SegmentIndex > gf_list_count(trak->editBox->editList->entryList)) ||
+	        !SegmentIndex)
 		return GF_BAD_PARAM;
 
 	elst = trak->editBox->editList;
@@ -1808,7 +1892,7 @@
 
 	//Padding info
 	return stbl_GetPaddingBits(trak->Media->information->sampleTable->PaddingBits,
-		sampleNumber, NbBits);
+	                           sampleNumber, NbBits);
 
 }
 
@@ -1947,7 +2031,7 @@
 				chunk_dur += dur;
 				stbl_GetSampleSize(trak->Media->information->sampleTable->SampleSize, k+sample_idx, &size);
 				chunk_size += size;
-				
+
 			}
 			if (dmin>chunk_dur) dmin = chunk_dur;
 			if (dmax<chunk_dur) dmax = chunk_dur;
@@ -1955,7 +2039,7 @@
 			if (smin>chunk_size) smin = chunk_size;
 			if (smax<chunk_size) smax = chunk_size;
 			savg += chunk_size;
-			
+
 			tot_chunks ++;
 			sample_idx += stsc->entries[i].samplesPerChunk;
 			if (i+1==stsc->nb_entries) break;
@@ -2002,8 +2086,8 @@
 
 GF_EXPORT
 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)
+                                     u32 *defaultDuration, u32 *defaultSize, u32 *defaultDescriptionIndex,
+                                     u32 *defaultRandomAccess, u8 *defaultPadding, u16 *defaultDegradationPriority)
 {
 	GF_TrackBox *trak;
 	GF_StscEntry *sc_ent;
@@ -2066,7 +2150,7 @@
 		//no sync table is ALL RAP
 		*defaultRandomAccess = stbl->SyncSample ? 0 : 1;
 		if (stbl->SyncSample
-			&& (stbl->SyncSample->nb_entries >= stbl->SampleSize->sampleCount/2)) {
+		        && (stbl->SyncSample->nb_entries >= stbl->SampleSize->sampleCount/2)) {
 			*defaultRandomAccess = 1;
 		}
 	}
@@ -2130,9 +2214,9 @@
 		Bool delete_map;
 		GF_DataMap *previous_movie_fileMap_address = movie->movieFileMap;
 		GF_Err e;
-		
+
 		e = gf_isom_datamap_new(new_location, NULL, GF_ISOM_DATA_MAP_READ_ONLY, &movie->movieFileMap);
- 		if (e) return e;
+		if (e) return e;
 
 		delete_map = (previous_movie_fileMap_address != NULL ? GF_TRUE: GF_FALSE);
 		for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
@@ -2160,13 +2244,13 @@
 }
 
 GF_EXPORT
-void gf_isom_set_single_moof_mode(GF_ISOFile *movie, Bool mode) 
+void gf_isom_set_single_moof_mode(GF_ISOFile *movie, Bool mode)
 {
 	movie->single_moof_mode = mode;
 }
 
 GF_EXPORT
-GF_Err gf_isom_reset_data_offset(GF_ISOFile *movie, u64 *top_box_start) 
+GF_Err gf_isom_reset_data_offset(GF_ISOFile *movie, u64 *top_box_start)
 {
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
@@ -2179,12 +2263,19 @@
 	return GF_OK;
 }
 
+#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_EXPORT
-GF_Err gf_isom_reset_tables(GF_ISOFile *movie, Bool reset_sample_count) 
+GF_Err gf_isom_reset_tables(GF_ISOFile *movie, Bool reset_sample_count)
 {
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-    u32 i;
+	u32 i;
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		GF_TrackBox *trak = (GF_TrackBox *)gf_list_get(movie->moov->trackList, i);
@@ -2201,13 +2292,7 @@
 				trak->dts_at_seg_start += dts + dur;
 			}
 		}
-#define RECREATE_BOX(_a, __cast)	\
-		if (_a) {	\
-			type = _a->type;\
-			gf_isom_box_del((GF_Box *)_a);\
-			_a = __cast gf_isom_box_new(type);\
-		}\
-
+ 
 		RECREATE_BOX(stbl->ChunkOffset, (GF_Box *));
 		RECREATE_BOX(stbl->CompositionOffset, (GF_CompositionOffsetBox *));
 		RECREATE_BOX(stbl->DegradationPriority, (GF_DegradationPriorityBox *));
@@ -2225,7 +2310,8 @@
 			trak->sample_count_at_seg_start = 0;
 #endif
 		}
-	}
+
+    }
 
 #endif
 	return GF_OK;
@@ -2259,10 +2345,25 @@
 		if (reset_tables) {
 			u32 type, dur;
 			u64 dts;
+			Bool scalable = has_scalable;
 			GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
-			if (has_scalable && !gf_isom_get_reference_count(movie, i+1, GF_ISOM_REF_SCAL))
-				base_track_sample_count = stbl->SampleSize->sampleCount;
-			trak->sample_count_at_seg_start += has_scalable ? base_track_sample_count : stbl->SampleSize->sampleCount;
+
+			if (scalable) {
+				//check if the base reference is in the file - if not, do not consider the track is scalable.
+				if (gf_isom_get_reference_count(movie, i+1, GF_ISOM_REF_BASE) > 0) {
+					u32 on_track=0;
+					GF_TrackBox *base;
+					gf_isom_get_reference(movie, i+1, GF_ISOM_REF_BASE, 1, &on_track);
+
+					base = gf_isom_get_track_from_file(movie, on_track);
+					if (!base) scalable = GF_FALSE;
+
+					base_track_sample_count = base->Media->information->sampleTable->SampleSize->sampleCount;
+				}
+			}
+
+			trak->sample_count_at_seg_start += base_track_sample_count ? base_track_sample_count : stbl->SampleSize->sampleCount;
+
 			if (trak->sample_count_at_seg_start) {
 				GF_Err e;
 				e = stbl_GetSampleDTS_and_Duration(stbl->TimeToSample, stbl->SampleSize->sampleCount, &dts, &dur);
@@ -2270,13 +2371,7 @@
 					trak->dts_at_seg_start += dts + dur;
 				}
 			}
-#define RECREATE_BOX(_a, __cast)	\
-		if (_a) {	\
-			type = _a->type;\
-			gf_isom_box_del((GF_Box *)_a);\
-			_a = __cast gf_isom_box_new(type);\
-		}\
-
+ 
 			RECREATE_BOX(stbl->ChunkOffset, (GF_Box *));
 			RECREATE_BOX(stbl->CompositionOffset, (GF_CompositionOffsetBox *));
 			RECREATE_BOX(stbl->DegradationPriority, (GF_DegradationPriorityBox *));
@@ -2287,10 +2382,11 @@
 			RECREATE_BOX(stbl->ShadowSync, (GF_ShadowSyncBox *));
 			RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
 			RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
-		}
+
+        }
 
 
-		j = 0;	
+		j = 0;
 		while ((a = (GF_Box *)gf_list_enum(movie->moov->other_boxes, &j))) {
 			if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
 				gf_isom_box_del(a);
@@ -2307,7 +2403,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_open_segment(GF_ISOFile *movie, const char *fileName, u64 start_range, u64 end_range, Bool is_scalable_segment)
+GF_Err gf_isom_open_segment(GF_ISOFile *movie, const char *fileName, u64 start_range, u64 end_range, u32 flags)
 {
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	return GF_NOT_SUPPORTED;
@@ -2316,6 +2412,8 @@
 	GF_Err e;
 	u32 i;
 	Bool segment_map_assigned = 0;
+	Bool is_scalable_segment = (flags & GF_ISOM_SEGMENT_SCALABLE_FLAG) ? 1 : 0;
+	Bool no_order_check = (flags & GF_ISOM_SEGMENT_NO_ORDER_FLAG) ? 1: 0;
 	GF_DataMap *tmp = NULL;
 	GF_DataMap *orig_file_map = NULL;
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
@@ -2341,10 +2439,10 @@
 	if (end_range > start_range) {
 		gf_bs_seek(movie->movieFileMap->bs, end_range+1);
 		gf_bs_truncate(movie->movieFileMap->bs);
-		gf_bs_seek(movie->movieFileMap->bs, start_range);	
+		gf_bs_seek(movie->movieFileMap->bs, start_range);
 		movie->current_top_box_start = start_range;
 	}
-	
+
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
 
@@ -2357,18 +2455,19 @@
 			trak->present_in_scalable_segment = 0;
 		}
 	}
+	if (no_order_check) movie->NextMoofNumber = 0;
 
 
 	//ok parse root boxes
 	e = gf_isom_parse_movie_boxes(movie, &MissingBytes, 1);
-	
-	if (!is_scalable_segment) 
+
+	if (!is_scalable_segment)
 		return e;
 
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
 		if (trak->present_in_scalable_segment) {
-			/*store the temp dataHandler into scalableDataHandler so that it will not be destroyed 
+			/*store the temp dataHandler into scalableDataHandler so that it will not be destroyed
 			if we append another representation - destruction of this data handler is done in release_segment*/
 			trak->Media->information->scalableDataHandler = tmp;
 			if (!segment_map_assigned) {
@@ -2392,7 +2491,7 @@
 #else
 	s32 max_ref;
 	u32 i, j, track_id;
-	
+
 	max_ref = 0;
 	track_id = 0;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
@@ -2538,16 +2637,17 @@
 	case GF_ISOM_SUBTYPE_3GP_H263:
 	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_AVC3:
+	case GF_ISOM_BOX_TYPE_AVC4:
 	case GF_ISOM_BOX_TYPE_SVC1:
 	case GF_ISOM_BOX_TYPE_GNRV:
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	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_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		*Width = ((GF_VisualSampleEntryBox*)entry)->Width;
 		*Height = ((GF_VisualSampleEntryBox*)entry)->Height;
 		return GF_OK;
@@ -2588,6 +2688,7 @@
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 	case GF_ISOM_BOX_TYPE_AC3:
+	case GF_ISOM_BOX_TYPE_GNRA:
 		if (SampleRate) (*SampleRate) = ((GF_AudioSampleEntryBox*)entry)->samplerate_hi;
 		if (Channels) (*Channels) = ((GF_AudioSampleEntryBox*)entry)->channel_count;
 		if (bitsPerSample) (*bitsPerSample) = (u8) ((GF_AudioSampleEntryBox*)entry)->bitspersample;
@@ -2622,16 +2723,17 @@
 	case GF_ISOM_SUBTYPE_3GP_H263:
 	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_AVC3:
+	case GF_ISOM_BOX_TYPE_AVC4:
 	case GF_ISOM_BOX_TYPE_SVC1:
 	case GF_ISOM_BOX_TYPE_GNRV:
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	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_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		*hSpacing = ((GF_VisualSampleEntryBox*)entry)->pasp ? ((GF_VisualSampleEntryBox*)entry)->pasp->hSpacing : 0;
 		*vSpacing = ((GF_VisualSampleEntryBox*)entry)->pasp ? ((GF_VisualSampleEntryBox*)entry)->pasp->vSpacing : 0;
 		return GF_OK;
@@ -2661,12 +2763,18 @@
 
 	iod = (GF_IsomInitialObjectDescriptor *)movie->moov->iods->descriptor;
 	switch (PL_Code) {
-	case GF_ISOM_PL_AUDIO: return iod->audio_profileAndLevel;
-	case GF_ISOM_PL_VISUAL: return iod->visual_profileAndLevel;
-	case GF_ISOM_PL_GRAPHICS: return iod->graphics_profileAndLevel;
-	case GF_ISOM_PL_SCENE: return iod->scene_profileAndLevel;
-	case GF_ISOM_PL_OD: return iod->OD_profileAndLevel;
-	case GF_ISOM_PL_INLINE: return iod->inlineProfileFlag;
+	case GF_ISOM_PL_AUDIO:
+		return iod->audio_profileAndLevel;
+	case GF_ISOM_PL_VISUAL:
+		return iod->visual_profileAndLevel;
+	case GF_ISOM_PL_GRAPHICS:
+		return iod->graphics_profileAndLevel;
+	case GF_ISOM_PL_SCENE:
+		return iod->scene_profileAndLevel;
+	case GF_ISOM_PL_OD:
+		return iod->OD_profileAndLevel;
+	case GF_ISOM_PL_INLINE:
+		return iod->inlineProfileFlag;
 	case GF_ISOM_PL_MPEGJ:
 	default:
 		return 0xFF;
@@ -2707,7 +2815,7 @@
 	stsz = tk->Media->information->sampleTable->SampleSize;
 	if (stsz->sampleSize) return stsz->sampleSize*stsz->sampleCount;
 	size = 0;
-	for (i=0; i<stsz->sampleCount;i++) size += stsz->sizes[i];
+	for (i=0; i<stsz->sampleCount; i++) size += stsz->sizes[i];
 	return size;
 }
 
@@ -2805,17 +2913,27 @@
 			case GF_ISOM_SUBTYPE_3GP_AMR_WB:
 				nb_amr++;
 				break;
-			case GF_ISOM_SUBTYPE_3GP_H263: nb_h263++; break;
-			case GF_ISOM_SUBTYPE_3GP_EVRC: nb_evrc++; break;
-			case GF_ISOM_SUBTYPE_3GP_QCELP: nb_qcelp++; break;
-			case GF_ISOM_SUBTYPE_3GP_SMV: nb_smv++; break;
+			case GF_ISOM_SUBTYPE_3GP_H263:
+				nb_h263++;
+				break;
+			case GF_ISOM_SUBTYPE_3GP_EVRC:
+				nb_evrc++;
+				break;
+			case GF_ISOM_SUBTYPE_3GP_QCELP:
+				nb_qcelp++;
+				break;
+			case GF_ISOM_SUBTYPE_3GP_SMV:
+				nb_smv++;
+				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: 
-				nb_avc++; 
+			case GF_ISOM_SUBTYPE_AVC2_H264:
+			case GF_ISOM_SUBTYPE_AVC3_H264:
+			case GF_ISOM_SUBTYPE_AVC4_H264:
+				nb_avc++;
+				break;
+			case GF_ISOM_SUBTYPE_SVC_H264:
+				nb_avc++;
 				break;
-			case GF_ISOM_SUBTYPE_SVC_H264: nb_avc++; break;
 			case GF_ISOM_SUBTYPE_MPEG4:
 			case GF_ISOM_SUBTYPE_MPEG4_CRYP:
 			{
@@ -2830,18 +2948,26 @@
 					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: 
-						nb_aac++; 
+					case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
+					case GPAC_OTI_AUDIO_AAC_MPEG4:
+						nb_aac++;
+						break;
+					case GPAC_OTI_AUDIO_MPEG2_PART3:
+					case GPAC_OTI_AUDIO_MPEG1:
+						nb_mp3++;
 						break;
-					case GPAC_OTI_AUDIO_MPEG2_PART3: 
-					case GPAC_OTI_AUDIO_MPEG1: 
-						nb_mp3++; 
+					case GPAC_OTI_AUDIO_EVRC_VOICE:
+						nb_evrc++;
+						break;
+					case GPAC_OTI_AUDIO_SMV_VOICE:
+						nb_smv++;
+						break;
+					case GPAC_OTI_AUDIO_13K_VOICE:
+						nb_qcelp++;
+						break;
+					default:
+						nb_a++;
 						break;
-					case GPAC_OTI_AUDIO_EVRC_VOICE: nb_evrc++; break;
-					case GPAC_OTI_AUDIO_SMV_VOICE: nb_smv++; break;
-					case GPAC_OTI_AUDIO_13K_VOICE: nb_qcelp++; break;
-					default: nb_a++; break;
 					}
 					break;
 				/*SHOULD NEVER HAPPEN - IF SO, BROKEN MPEG4 FILE*/
@@ -2851,7 +2977,7 @@
 				}
 				gf_odf_desc_del((GF_Descriptor *)dcd);
 			}
-				break;
+			break;
 			default:
 				if (mtype==GF_ISOM_MEDIA_VISUAL) nb_v++;
 				else nb_a++;
@@ -3075,18 +3201,19 @@
 	if (!entry ) return GF_BAD_PARAM;
 	switch (entry->type) {
 	case GF_ISOM_BOX_TYPE_MP4V:
-	case GF_ISOM_BOX_TYPE_AVC1: 
+	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_ENCV:
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	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_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -3159,9 +3286,9 @@
 				if (roll_distance) {
 					s32 max_roll = 0;
 					u32 j;
-					for (j=0; j<gf_list_count(sgdesc->group_descriptions);j++) {
+					for (j=0; j<gf_list_count(sgdesc->group_descriptions); j++) {
 						GF_RollRecoveryEntry *roll_entry = gf_list_get(sgdesc->group_descriptions, j);
-						if (max_roll < roll_entry->roll_distance) 
+						if (max_roll < roll_entry->roll_distance)
 							max_roll = roll_entry->roll_distance;
 					}
 					if (*roll_distance < max_roll) *roll_distance = max_roll;
@@ -3205,7 +3332,7 @@
 
 		switch (sgdesc->grouping_type) {
 		case GF_4CC('r','a','p',' '):
-			if (is_rap) *is_rap = 1;
+			if (is_rap) *is_rap = (group_desc_index-1) ? 1 : 0;
 			break;
 		case GF_4CC('r','o','l','l'):
 			if (has_roll) *has_roll = 1;
@@ -3219,6 +3346,49 @@
 	return GF_OK;
 }
 
+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)
+{
+
+	GF_TrackBox *trak;
+	u32 i, count;
+
+	if (default_index) *default_index = 0;
+	if (size) *size = 0;
+	if (data) *data = NULL;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !sample_description_index) return 0;
+	if (!trak->Media->information->sampleTable->sampleGroupsDescription) return 0;
+
+	count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
+	for (i=0; i<count; i++) {
+		GF_DefaultSampleGroupDescriptionEntry *entry;
+		GF_SampleGroupDescriptionBox *sgdesc = 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 (default_index) *default_index = sgdesc->default_description_index ;
+
+		if (!sample_description_index) return 0;
+
+		switch (grouping_type) {
+		case GF_4CC('r','a','p',' '):
+		case GF_4CC('r','o','l','l'):
+		case GF_4CC( 's', 'e', 'i', 'g' ):
+			return 1;
+		default:
+			entry = gf_list_get(sgdesc->group_descriptions, sample_description_index-1);
+			if (entry && data) *data = (char *) entry->data;
+			if (entry && size) *size = entry->length;
+			return 1;
+		}
+	}
+	return 0;
+}
+
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 //return the duration of the movie+fragments if known, 0 if error
 GF_EXPORT
@@ -3238,10 +3408,10 @@
 	GF_Box *b;
 	while ((b=gf_list_enum(movie->TopBoxes, &i))) {
 		if (segments_only) {
-			if (b->type==GF_ISOM_BOX_TYPE_SIDX) 
+			if (b->type==GF_ISOM_BOX_TYPE_SIDX)
 				nb_frags++;
 		} else {
-			if (b->type==GF_ISOM_BOX_TYPE_MOOF) 
+			if (b->type==GF_ISOM_BOX_TYPE_MOOF)
 				nb_frags++;
 		}
 	}
@@ -3256,7 +3426,7 @@
 	u64 def_duration, samp_dur;
 	GF_MovieFragmentBox *moof;
 	GF_TrackFragmentBox *traf;
-	
+
 	*nb_samples = 0;
 	*duration = 0;
 	while ((moof=gf_list_enum(movie->TopBoxes, &i))) {
@@ -3323,15 +3493,16 @@
 }
 
 GF_EXPORT
-Bool gf_isom_has_scalable_layer(GF_ISOFile *file) 
+Bool gf_isom_has_scalable_layer(GF_ISOFile *file)
 {
 	u32 count, i;
 	if (!file)
 		return GF_FALSE;
 	count = gf_isom_get_track_count(file);
 	for (i = 0; i < count; i++) {
-		if (gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_SCAL) > 0)
+		if (gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_SCAL) > 0) {
 			return GF_TRUE;
+		}
 	}
 	return GF_FALSE;
 }
@@ -3345,7 +3516,7 @@
 
 
 GF_EXPORT
-u32 gf_isom_get_pssh_count(GF_ISOFile *file) 
+u32 gf_isom_get_pssh_count(GF_ISOFile *file)
 {
 	u32 count=0;
 	u32 i=0;
@@ -3358,7 +3529,7 @@
 }
 
 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 *KID_count, const bin128 **KIDs, const u8 **private_data, u32 *private_data_size)
 {
 	u32 count=1;
 	u32 i=0;
@@ -3395,7 +3566,12 @@
 	if (IV_size) *IV_size = 0;
 	if (KID) memset(*KID, 0, 16);
 
-	stbl_GetSampleInfos(trak->Media->information->sampleTable, sample_number, &offset, &chunkNum, &descIndex, &edit);
+	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, &edit);
+	} else {
+		//this is dump mode of fragments, we haven't merged tables yet :(
+		descIndex = 1;
+	}
 	gf_isom_cenc_get_default_info_ex(trak, descIndex, IsEncrypted, IV_size, KID);
 
 
@@ -3405,7 +3581,7 @@
 		count = gf_list_count(trak->Media->information->sampleTable->sampleGroups);
 		for (i=0; i<count; i++) {
 			sample_group = gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
-			if (sample_group->grouping_type ==  GF_4CC( 's', 'e', 'i', 'g' )) 
+			if (sample_group->grouping_type ==  GF_4CC( 's', 'e', 'i', 'g' ))
 				break;
 			sample_group = NULL;
 		}
@@ -3428,10 +3604,10 @@
 		for (i=0; i<count; i++) {
 			group_desc_index = 0;
 			sample_group = gf_list_get(traf->sampleGroups, i);
-			if (sample_group->grouping_type ==  GF_4CC( 's', 'e', 'i', 'g' )) 
+			if (sample_group->grouping_type ==  GF_4CC( 's', 'e', 'i', 'g' ))
 				break;
 			sample_group = NULL;
-		} 
+		}
 		if (sample_group) {
 			first_sample_in_entry = 1;
 			for (j=0; j<sample_group->entry_count; j++) {
@@ -3520,5 +3696,33 @@
 #endif
 }
 
+void gf_isom_parse_trif_info(const char *data, u32 size, u32 *id, u32 *independent, Bool *full_frame, u32 *x, u32 *y, u32 *w, u32 *h)
+{
+	GF_BitStream *bs;
+	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	*id = gf_bs_read_u16(bs);
+	*independent = gf_bs_read_int(bs, 2);
+	*full_frame = gf_bs_read_int(bs, 1);
+	gf_bs_read_int(bs, 5);
+	*x = *full_frame ? 0 : gf_bs_read_u16(bs);
+	*y = *full_frame ? 0 : gf_bs_read_u16(bs);
+	*w = gf_bs_read_u16(bs);
+	*h = gf_bs_read_u16(bs);
+	gf_bs_del(bs);
+
+}
+
+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_frame, u32 *x, u32 *y, u32 *w, u32 *h)
+{
+	const char *data;
+	u32 size;
+
+	if (!gf_isom_get_sample_group_info(file, trackNumber, sample_description_index, GF_4CC('t','r','i','f'), default_sample_group_index, &data, &size))
+		return 0;
+	gf_isom_parse_trif_info(data, size, id, independent, full_frame, x, y, w, h);
+	return 1;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/isom_store.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/isom_store.c Changed

@@ -2,7 +2,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -12,15 +12,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -59,7 +59,7 @@
 	return gf_list_add(movie->TopBoxes, _free);
 }
 
-typedef struct 
+typedef struct
 {
 	/*the curent sample of this track*/
 	u32 sampleNumber;
@@ -137,7 +137,7 @@
 	trackCount = gf_list_count(movie->moov->trackList);
 	for (i = 0; i < trackCount; i++) {
 		trak = gf_isom_get_track(movie->moov, i+1);
-		
+
 		GF_SAFEALLOC(writer, TrackWriter);
 		if (!writer) goto exit;
 		writer->sampleNumber = 1;
@@ -158,12 +158,12 @@
 		if (Media_IsSelfContained(writer->mdia, 1)) mw->total_samples += trak->Media->information->sampleTable->SampleSize->sampleCount;
 		/*optimization for interleaving: put audio last (this can be overriden by priorities)*/
 		if (movie->storageMode != GF_ISOM_STORE_INTERLEAVED) {
-			gf_list_add(writers, writer);	
+			gf_list_add(writers, writer);
 		} else {
 			if (writer->mdia->information->InfoHeader && writer->mdia->information->InfoHeader->type == GF_ISOM_BOX_TYPE_SMHD) {
-				gf_list_add(writers, writer);	
+				gf_list_add(writers, writer);
 			} else {
-				gf_list_insert(writers, writer, 0);	
+				gf_list_insert(writers, writer, 0);
 			}
 		}
 	}
@@ -231,7 +231,7 @@
 							gf_isom_box_del((GF_Box *)co64);
 							return GF_OUT_OF_MEM;
 						}
-						//duplicate the table 
+						//duplicate the table
 						for (l = 0; l < co64->nb_entries; l++) {
 							co64->offsets[l] = (u64) stco->offsets[l];
 							if (l + 1 == k) co64->offsets[l] += offset;
@@ -253,7 +253,7 @@
 			}
 		}
 	}
-	
+
 	return GF_OK;
 
 }
@@ -292,7 +292,7 @@
 		e = gf_isom_box_size((GF_Box *)movie->moov);
 		if (e) return e;
 		e = gf_isom_box_write((GF_Box *)movie->moov, bs);
-		//and re-switch our table. We have to do it that way because it is 
+		//and re-switch our table. We have to do it that way because it is
 		//needed when the moov is written first
 		i=0;
 		while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
@@ -364,11 +364,11 @@
 	}
 	//get the payload...
 	bytes = gf_isom_datamap_get_data(map, mw->buffer, size, offset);
-	if (bytes != size) 
+	if (bytes != size)
 		return GF_IO_ERR;
 	//write it to our stream...
 	bytes = gf_bs_write_data(bs, mw->buffer, size);
-	if (bytes != size) 
+	if (bytes != size)
 		return GF_IO_ERR;
 
 	mw->nb_done++;
@@ -412,11 +412,11 @@
 		/*for self contained only*/
 		if (!iloc->data_reference_index) {
 			iloc->base_offset = baseOffset;
-	
+
 			/*new resource*/
 			if (iinf->full_path) {
 				FILE *src=NULL;
-				
+
 				if (!iinf->data_len) {
 					src = gf_f64_open(iinf->full_path, "rb");
 					if (!src) continue;
@@ -453,7 +453,7 @@
 					}
 				}
 				if (src) fclose(src);
-			} 
+			}
 			else if (gf_list_count(iloc->extent_entries)) {
 				u32 j;
 				j=0;
@@ -497,7 +497,7 @@
 	/*update offset & size length fields*/
 	if (baseOffset>0xFFFFFFFF) meta->item_locations->base_offset_size = 8;
 	else if (baseOffset) meta->item_locations->base_offset_size = 4;
-	
+
 	if (maxExtendSize>0xFFFFFFFF) meta->item_locations->length_size = 8;
 	else if (maxExtendSize) meta->item_locations->length_size = 4;
 
@@ -558,11 +558,11 @@
 			e = stbl_GetSampleSize(writer->mdia->information->sampleTable->SampleSize, writer->sampleNumber, &sampSize);
 			if (e) return e;
 
-			//update our chunks. 
+			//update our chunks.
 			force = 0;
 			if (movie->openMode == GF_ISOM_OPEN_WRITE) {
 				offset = sampOffset;
-				if (predOffset != offset) 
+				if (predOffset != offset)
 					force = 1;
 			}
 			//update our global offset...
@@ -633,14 +633,18 @@
 					begin += 12;
 				}
 				if (movie->brand) {
-					e = gf_isom_box_size((GF_Box *)movie->brand); if (e) goto exit;
-					e = gf_isom_box_write((GF_Box *)movie->brand, movie->editFileMap->bs); if (e) goto exit;
+					e = gf_isom_box_size((GF_Box *)movie->brand);
+					if (e) goto exit;
+					e = gf_isom_box_write((GF_Box *)movie->brand, movie->editFileMap->bs);
+					if (e) goto exit;
 					totSize += movie->brand->size;
 					begin += movie->brand->size;
 				}
 				if (movie->pdin) {
-					e = gf_isom_box_size((GF_Box *)movie->pdin); if (e) goto exit;
-					e = gf_isom_box_write((GF_Box *)movie->pdin, movie->editFileMap->bs); if (e) goto exit;
+					e = gf_isom_box_size((GF_Box *)movie->pdin);
+					if (e) goto exit;
+					e = gf_isom_box_write((GF_Box *)movie->pdin, movie->editFileMap->bs);
+					if (e) goto exit;
 					totSize += movie->pdin->size;
 					begin += movie->pdin->size;
 				}
@@ -747,11 +751,11 @@
 		goto exit;
 	}
 
-	//nope, we have to write the moov first. The pb is that 
+	//nope, we have to write the moov first. The pb is that
 	//1 - we don't know its size till the mdat is written
 	//2 - we don't know the ofset at which the mdat will start...
 	//3 - once the mdat is written, the chunkOffset table can have changed...
-	
+
 	if (movie->is_jp2) {
 		gf_bs_write_u32(bs, 12);
 		gf_bs_write_u32(bs, GF_4CC('j','P',' ',' '));
@@ -774,7 +778,7 @@
 	//note: this will set the size of the mdat
 	e = DoWrite(mw, writers, bs, 1, gf_bs_get_position(bs));
 	if (e) goto exit;
-	
+
 	firstSize = GetMoovAndMetaSize(movie, writers);
 	//offset = (firstSize > 0xFFFFFFFF ? firstSize + 8 : firstSize) + 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
 	offset = firstSize + 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
@@ -855,7 +859,7 @@
 	writeGroup = 1;
 	tracksDone = 0;
 
-	
+
 	//browse each groups
 	while (1) {
 		writeGroup = 1;
@@ -876,7 +880,7 @@
 				if (tmp->isDone || tmp->mdia->information->sampleTable->groupID != curGroupID) continue;
 
 				//OK, get the current sample in this track
-				stbl_GetSampleDTS(tmp->mdia->information->sampleTable->TimeToSample, tmp->sampleNumber, &DTS);				
+				stbl_GetSampleDTS(tmp->mdia->information->sampleTable->TimeToSample, tmp->sampleNumber, &DTS);
 				res = TStmp ? DTStmp * tmp->timeScale - DTS * TStmp : 0;
 				if (res < 0) continue;
 				if ((!res) && curTrackPriority <= tmp->mdia->information->sampleTable->trackPriority) continue;
@@ -903,7 +907,7 @@
 			if (e) return e;
 			e = stbl_GetSampleSize(curWriter->mdia->information->sampleTable->SampleSize, curWriter->sampleNumber, &sampSize);
 			if (e) return e;
-			
+
 			//do we actually write, or do we emulate ?
 			if (Emulation) {
 				//are we in the same track ??? If not, force a new chunk when adding this sample
@@ -922,7 +926,7 @@
 					if (curWriter->prev_offset != sampOffset) forceNewChunk = 1;
 					curWriter->prev_offset = sampOffset + sampSize;
 
-					//we have a DataRef, so use the offset idicated in sampleToChunk 
+					//we have a DataRef, so use the offset idicated in sampleToChunk
 					//and ChunkOffset tables...
 					e = stbl_SetChunkAndOffset(curWriter->mdia->information->sampleTable, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, sampOffset, 0);
 					if (e) return e;
@@ -1018,7 +1022,7 @@
 
 
 
-	if (movie->storageMode == GF_ISOM_STORE_TIGHT) 
+	if (movie->storageMode == GF_ISOM_STORE_TIGHT)
 		return DoFullInterleave(mw, writers, bs, Emulation, StartOffset);
 
 	e = GF_OK;
@@ -1048,7 +1052,7 @@
 			curWriter = NULL;
 			for (i=0 ; i < count; i++) {
 				tmp = (TrackWriter*)gf_list_get(writers, i);
-				
+
 				//is it done writing ?
 				if (tmp->isDone) continue;
 
@@ -1069,9 +1073,9 @@
 
 					//can this sample fit in our chunk ?
 					if ( ( (DTS - tmp->DTSprev) + tmp->chunkDur) *  movie->moov->mvhd->timeScale > movie->interleavingTime * tmp->timeScale
-						/*drfit check: reject sample if outside our check window*/
-						|| (drift_inter && chunkLastDTS && ( ((u64)tmp->DTSprev*chunkLastScale) > ((u64)chunkLastDTS*tmp->timeScale)) ) 
-						) {
+					        /*drfit check: reject sample if outside our check window*/
+					        || (drift_inter && chunkLastDTS && ( ((u64)tmp->DTSprev*chunkLastScale) > ((u64)chunkLastDTS*tmp->timeScale)) )
+					   ) {
 						//in case the sample is longer than InterleaveTime
 						if (!tmp->chunkDur) {
 							forceNewChunk = 1;
@@ -1085,7 +1089,7 @@
 					}
 					//OK, we can write this track
 					curWriter = tmp;
-					
+
 					//small check for first 2 samples (DTS = 0 :)
 					if (tmp->sampleNumber == 2 && !tmp->chunkDur) forceNewChunk = 0;
 
@@ -1096,7 +1100,7 @@
 					if (e) return e;
 					e = stbl_GetSampleSize(curWriter->mdia->information->sampleTable->SampleSize, curWriter->sampleNumber, &sampSize);
 					if (e) return e;
-					
+
 					//do we actually write, or do we emulate ?
 					if (Emulation) {
 						//update our offsets...
@@ -1109,7 +1113,7 @@
 							if (curWriter->prev_offset != sampOffset) forceNewChunk = 1;
 							curWriter->prev_offset = sampOffset + sampSize;
 
-							//we have a DataRef, so use the offset idicated in sampleToChunk 
+							//we have a DataRef, so use the offset idicated in sampleToChunk
 							//and ChunkOffset tables...
 							e = stbl_SetChunkAndOffset(curWriter->mdia->information->sampleTable, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, sampOffset, forceNewChunk);
 							if (e) return e;
@@ -1137,7 +1141,7 @@
 					chunkLastDTS = curWriter->DTSprev;
 					/*add one interleave window drift - since the "maxDTS" is the previously written one, we will
 					have the following cases:
-					- sample doesn't fit: post-pone and force new chunk 
+					- sample doesn't fit: post-pone and force new chunk
 					- sample time larger than previous chunk time + interleave: post-pone and force new chunk
 					- otherwise store and track becomes current reference
 
@@ -1287,7 +1291,7 @@
 
 		//OK, we need a new bitstream
 		stream = is_stdout ? stdout : gf_f64_open(movie->finalName, "w+b");
-		if (!stream) 
+		if (!stream)
 			return GF_IO_ERR;
 		bs = gf_bs_from_file(stream, GF_BITSTREAM_WRITE);
 		if (!bs) {
@@ -1315,7 +1319,7 @@
 			e = WriteFlat(&mw, 0, bs);
 			break;
 		}
-		
+
 		gf_bs_del(bs);
 		if (!is_stdout)
 			fclose(stream);

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/isom_write.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/isom_write.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -92,7 +92,7 @@
 {
 	GF_Descriptor *od;
 	GF_ObjectDescriptorBox *iods;
-	
+
 	//do we have an IOD ?? If not, create one.
 	if (moov->iods) return GF_OK;
 
@@ -119,7 +119,7 @@
 	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 (gf_isom_is_track_in_root_od(movie, trackNumber) == 1) return GF_OK;
@@ -236,7 +236,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_media_language(GF_ISOFile *movie, u32 trackNumber, char *three_char_code)
+GF_Err gf_isom_set_media_language(GF_ISOFile *movie, u32 trackNumber, char *code)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -244,7 +244,32 @@
 	if (!trak) return GF_BAD_PARAM;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	memcpy(trak->Media->mediaHeader->packedLanguage, three_char_code, sizeof(char)*3);
+	if (strlen(code) == 3) {
+		memcpy(trak->Media->mediaHeader->packedLanguage, code, sizeof(char)*3);
+	} else {
+		u32 i, count;
+		GF_ExtendedLanguageBox *elng;
+		elng = NULL;
+		count = gf_list_count(trak->Media->other_boxes);
+		for (i = 0; i < count; i++) {
+			GF_Box *box = (GF_Box *)gf_list_get(trak->Media->other_boxes, i);
+			if (box->type == GF_ISOM_BOX_TYPE_ELNG) {
+				elng = (GF_ExtendedLanguageBox *)box;
+				break;
+			}
+		}
+		if (!elng) {
+			elng = (GF_ExtendedLanguageBox *)elng_New();
+			if (!count) {
+				trak->Media->other_boxes = gf_list_new();
+			}
+			gf_list_add(trak->Media->other_boxes, elng);
+		}
+		if (elng->extended_language) {
+			gf_free(elng->extended_language);
+		}
+		elng->extended_language = gf_strdup(code);
+	}
 	if (!movie->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	return GF_OK;
@@ -325,7 +350,7 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	gf_isom_insert_moov(movie);
-	
+
 	movie->moov->mvhd->timeScale = timeScale;
 	movie->interleavingTime = timeScale;
 	return GF_OK;
@@ -473,7 +498,7 @@
 			return 0;
 		}
 	}
-	
+
 	//OK, now create a track...
 	trak = (GF_TrackBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRAK);
 	if (!trak) {
@@ -501,11 +526,13 @@
 	//OK, add this media to our track
 	mdia->mediaTrack = trak;
 
-	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;
+	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;
 
-	
+
 	//some default properties for Audio, Visual or private tracks
 	switch (MediaType) {
 	case GF_ISOM_MEDIA_VISUAL:
@@ -525,9 +552,10 @@
 	trak->Header->creationTime = trak->Header->modificationTime = now;
 
 	//OK, add our trak
-	e = moov_AddBox((GF_Box*)movie->moov, (GF_Box *)trak); if (e) goto err_exit;
+	e = moov_AddBox((GF_Box*)movie->moov, (GF_Box *)trak);
+	if (e) goto err_exit;
 	//set the new ID available
-	if (trakID+1> movie->moov->mvhd->nextTrackID) 
+	if (trakID+1> movie->moov->mvhd->nextTrackID)
 		movie->moov->mvhd->nextTrackID = trakID+1;
 
 	//and return our track number
@@ -544,11 +572,11 @@
 //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, 
-							   u32 *outDescriptionIndex)
+                                     u32 trackNumber,
+                                     GF_ESD *esd,
+                                     char *URLname,
+                                     char *URNname,
+                                     u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
 	GF_Err e;
@@ -557,11 +585,11 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media || 
-		!esd || !esd->decoderConfig || 
-		!esd->slConfig) return GF_BAD_PARAM;
+	if (!trak || !trak->Media ||
+	        !esd || !esd->decoderConfig ||
+	        !esd->slConfig) return GF_BAD_PARAM;
 
 	//get or create the data ref
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
@@ -703,7 +731,7 @@
 	if (e) return e;
 
 	data_offset = gf_isom_datamap_get_offset(trak->Media->information->dataHandler);
-	if (offset_times) sample->DTS += 1; 
+	if (offset_times) sample->DTS += 1;
 
 	/*REWRITE ANY OD STUFF*/
 	if (trak->Media->handler->handlerType == GF_ISOM_MEDIA_OD) {
@@ -717,7 +745,7 @@
 		if (!e) e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, sample->data, sample->dataLength);
 	}
 	if (e) return e;
-	if (offset_times) sample->DTS -= 1; 
+	if (offset_times) sample->DTS -= 1;
 
 	//OK, update duration
 	e = Media_SetDuration(trak);
@@ -800,7 +828,7 @@
 
 	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;
 
@@ -892,6 +920,7 @@
 }
 
 //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)
 {
 	GF_Err e;
@@ -926,6 +955,7 @@
 
 //update a sample data in the media. Note that the sample MUST exists,
 //that sample->data MUST be NULL and sample->dataLength must be NON NULL;
+GF_EXPORT
 GF_Err gf_isom_update_sample_reference(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, GF_ISOSample *sample, u64 data_offset)
 {
 	GF_Err e;
@@ -1011,7 +1041,7 @@
 	//remove padding
 	e = stbl_RemovePaddingBits(trak->Media->information->sampleTable, sampleNumber);
 	if (e) return e;
-	
+
 	return SetTrackDuration(trak);
 }
 
@@ -1028,8 +1058,8 @@
 
 	if (filename) {
 		//we don't allow file overwriting
-		if ( (movie->openMode == GF_ISOM_OPEN_EDIT) 
-			&& movie->fileName && !strcmp(filename, movie->fileName))
+		if ( (movie->openMode == GF_ISOM_OPEN_EDIT)
+		        && movie->fileName && !strcmp(filename, movie->fileName))
 			return GF_BAD_PARAM;
 		if (movie->finalName) gf_free(movie->finalName);
 		movie->finalName = gf_strdup(filename);
@@ -1049,10 +1079,10 @@
 	GF_ESD *esd;
 	GF_TrackReferenceBox *tref;
 	GF_TrackReferenceTypeBox *dpnd;
-	
+
 	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;
 
@@ -1070,19 +1100,19 @@
 	switch (desc->tag) {
 	case GF_ODF_IPI_PTR_TAG:
 		goto insertIPI;
-	
+
 	default:
 		return gf_odf_desc_add_desc((GF_Descriptor *)esd, desc);
 	}
 
-	
+
 insertIPI:
 	if (esd->ipiPtr) {
 		gf_odf_desc_del((GF_Descriptor *) esd->ipiPtr);
 		esd->ipiPtr = NULL;
 	}
 
-	ipiD = (GF_IPIPtr *) desc;	
+	ipiD = (GF_IPIPtr *) desc;
 	//find a tref
 	if (!trak->References) {
 		tref = (GF_TrackReferenceBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREF);
@@ -1187,17 +1217,25 @@
 	case GF_ISOM_BOX_TYPE_AVC3:
 	case GF_ISOM_BOX_TYPE_AVC4:
 	case GF_ISOM_BOX_TYPE_SVC1:
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	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_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		((GF_VisualSampleEntryBox*)entry)->Width = Width;
 		((GF_VisualSampleEntryBox*)entry)->Height = Height;
 		trak->Header->width = Width<<16;
 		trak->Header->height = Height<<16;
 		return GF_OK;
+	case GF_ISOM_BOX_TYPE_GNRV:
+		((GF_GenericVisualSampleEntryBox*)entry)->Width = Width;
+		((GF_GenericVisualSampleEntryBox*)entry)->Height = Height;
+		trak->Header->width = Width<<16;
+		trak->Header->height = Height<<16;
+		return GF_OK;
+
 	/*check BIFS*/
 	default:
 		if (trak->Media->handler->handlerType==GF_ISOM_MEDIA_SCENE) {
@@ -1240,12 +1278,13 @@
 	case GF_ISOM_BOX_TYPE_AVC3:
 	case GF_ISOM_BOX_TYPE_AVC4:
 	case GF_ISOM_BOX_TYPE_SVC1:
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	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_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -1367,7 +1406,7 @@
 	//get the prev entry to this startTime if any
 	i=0;
 	while ((ent = (GF_EdtsEntry *)gf_list_enum(elst->entryList, &i))) {
-		if ( (startTime <= EditTime) && (startTime + ent->segmentDuration > EditTime) ) 
+		if ( (startTime <= EditTime) && (startTime + ent->segmentDuration > EditTime) )
 			goto found;
 		startTime += ent->segmentDuration;
 	}
@@ -1379,11 +1418,11 @@
 		gf_list_add(elst->entryList, newEnt);
 		return SetTrackDuration(trak);
 	}
-	
+
 	startTime -= ent->segmentDuration;
 
 found:
-	
+
 	//if same time, we erase the current one...
 	if (startTime == EditTime) {
 		ent->segmentDuration = EditDuration;
@@ -1616,14 +1655,18 @@
 		}
 	}
 
-	//remove the track ref from any "tref" box in all tracks (except the one to delete ;)
+	//remove the track ref from any "tref" box in all tracks, except the one to delete
+	//note that we don't touch scal references, as we don't want to rewrite AVC/HEVC samples ...
 	i=0;
 	while ((trak = (GF_TrackBox *)gf_list_enum(movie->moov->trackList, &i))) {
 		if (trak == the_trak) continue;
 		if (! trak->References || ! gf_list_count(trak->References->other_boxes)) continue;
-		
+
 		j=0;
 		while ((tref = (GF_TrackReferenceTypeBox *)gf_list_enum(trak->References->other_boxes, &j))) {
+			if (tref->reference_type==GF_4CC('s','c','a','l'))
+				continue;
+
 			found = 0;
 			for (k=0; k<tref->trackIDCount; k++) {
 				if (tref->trackIDs[k] == the_trak->Header->trackID) found++;
@@ -1658,7 +1701,7 @@
 
 	//delete the track
 	gf_isom_box_del((GF_Box *)the_trak);
-	
+
 	/*update next track ID*/
 	movie->moov->mvhd->nextTrackID = 0;
 	i=0;
@@ -1677,7 +1720,7 @@
 	GF_CopyrightBox *ptr;
 	GF_UserDataMap *map;
 	u32 count, i;
-	
+
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
@@ -1690,7 +1733,7 @@
 		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);
@@ -1714,11 +1757,103 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_add_track_kind(GF_ISOFile *movie, u32 trackNumber, const char *schemeURI, const char *value)
+{
+	GF_Err e;
+	GF_KindBox *ptr;
+	GF_UserDataBox *udta;
+	GF_UserDataMap *map;
+	u32 i, count;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	gf_isom_insert_moov(movie);
+
+	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;
+		}
+		udta = trak->udta;
+	} else {
+		return GF_BAD_PARAM;
+	}
+
+	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_KIND, NULL);
+	if (map) {
+		count = gf_list_count(map->other_boxes);
+		for (i=0; i<count; i++) {
+			GF_Box *b = (GF_Box *)gf_list_get(map->other_boxes, i);
+			if (b->type == GF_ISOM_BOX_TYPE_KIND) {
+				GF_KindBox *kb = (GF_KindBox *)b;
+				if (!strcmp(kb->schemeURI, schemeURI) &&
+				        ((value && kb->value && !strcmp(value, kb->value)) || (!value && !kb->value))) {
+					// Already there
+					return GF_OK;
+				}
+			}
+		}
+	}
+
+	ptr = (GF_KindBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_KIND);
+	if (e) return e;
+
+	ptr->schemeURI = gf_strdup(schemeURI);
+	if (value) ptr->value = gf_strdup(value);
+	return udta_AddBox(udta, (GF_Box *) ptr);
+}
+
+GF_EXPORT
+GF_Err gf_isom_remove_track_kind(GF_ISOFile *movie, u32 trackNumber, const char *schemeURI, const char *value)
+{
+	GF_Err e;
+	GF_UserDataBox *udta;
+	GF_UserDataMap *map;
+	u32 i;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+	gf_isom_insert_moov(movie);
+
+	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;
+		}
+		udta = trak->udta;
+	} else {
+		return GF_OK;
+	}
+	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);
+			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);
+					i--;
+				}
+			}
+		}
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_isom_add_chapter(GF_ISOFile *movie, u32 trackNumber, u64 timestamp, char *name)
 {
 	GF_Err e;
 	GF_ChapterListBox *ptr;
-    u32 i, count;
+	u32 i, count;
 	GF_ChapterEntry *ce;
 	GF_UserDataBox *udta;
 	GF_UserDataMap *map;
@@ -1763,7 +1898,7 @@
 	ce->start_time = timestamp * 10000L;
 	ce->name = name ? gf_strdup(name) : NULL;
 
-	/*insert in order*/	
+	/*insert in order*/
 	count = gf_list_count(ptr->list);
 	for (i=0; i<count; i++) {
 		GF_ChapterEntry *ace = (GF_ChapterEntry *)gf_list_get(ptr->list, i);
@@ -1812,7 +1947,7 @@
 	if (!map) return GF_OK;
 	ptr = (GF_ChapterListBox*)gf_list_get(map->other_boxes, 0);
 	if (!ptr) return GF_OK;
-	
+
 	if (index) {
 		ce = (GF_ChapterEntry *)gf_list_get(ptr->list, index-1);
 		if (!ce) return GF_BAD_PARAM;
@@ -1841,7 +1976,7 @@
 	GF_CopyrightBox *ptr;
 	GF_UserDataMap *map;
 	u32 count;
-	
+
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	gf_isom_insert_moov(movie);
@@ -1886,7 +2021,7 @@
 		e = moov_AddBox((GF_Box*)movie->moov, gf_isom_box_new(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);
@@ -1934,7 +2069,7 @@
 
 
 
-//use a compact track version for sample size. This is not usually recommended 
+//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 *movie, u32 trackNumber, u8 CompactionOn)
@@ -1949,13 +2084,13 @@
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
-	
+
 	if (!trak->Media || !trak->Media->information
-		|| !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleSize)
+	        || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleSize)
 		return GF_ISOM_INVALID_FILE;
 
 	stsz = trak->Media->information->sampleTable->SampleSize;
-	
+
 	//switch to regular table
 	if (!CompactionOn) {
 		if (stsz->type == GF_ISOM_BOX_TYPE_STSZ) return GF_OK;
@@ -2005,7 +2140,7 @@
 	u32 i, *p;
 
 	if (!MajorBrand) return GF_BAD_PARAM;
-	
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (! (movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY)) {
 		GF_Err e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
@@ -2020,7 +2155,7 @@
 		movie->brand = (GF_FileTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_FTYP);
 		gf_list_add(movie->TopBoxes, movie->brand);
 	}
-	
+
 	movie->brand->majorBrand = MajorBrand;
 	movie->brand->minorVersion = MinorVersion;
 
@@ -2050,14 +2185,14 @@
 GF_Err gf_isom_modify_alternate_brand(GF_ISOFile *movie, u32 Brand, u8 AddIt)
 {
 	u32 i, k, *p;
-	
+
 	if (!Brand) return GF_BAD_PARAM;
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (! (movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY)) {
 		GF_Err e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 		if (e) return e;
-	
+
 		e = CheckNoData(movie);
 		if (e) return e;
 	}
@@ -2119,12 +2254,12 @@
 GF_Err gf_isom_reset_alt_brands(GF_ISOFile *movie)
 {
 	u32 *p;
-	
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (! (movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY)) {
 		GF_Err e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 		if (e) return e;
-		
+
 		e = CheckNoData(movie);
 		if (e) return e;
 	}
@@ -2153,7 +2288,7 @@
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || NbBits > 7) return GF_BAD_PARAM;
-	
+
 	//set Padding info
 	return stbl_SetPaddingBits(trak->Media->information->sampleTable, sampleNumber, NbBits);
 }
@@ -2171,7 +2306,7 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	if (UserDataType == GF_ISOM_BOX_TYPE_UUID) UserDataType = 0;
 	memset(t, 1, 16);
 
@@ -2198,7 +2333,7 @@
 	if (UserDataIndex > gf_list_count(map->other_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);
 
@@ -2223,7 +2358,7 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	if (UserDataType == GF_ISOM_BOX_TYPE_UUID) UserDataType = 0;
 	memset(t, 1, 16);
 
@@ -2263,7 +2398,7 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	if (UserDataType == GF_ISOM_BOX_TYPE_UUID) UserDataType = 0;
 
 	if (trackNumber) {
@@ -2350,7 +2485,7 @@
 	if (!orig->moov->iods || !orig->moov->iods->descriptor) return GF_OK;
 	if (orig->moov->iods->descriptor->tag != GF_ODF_ISOM_IOD_TAG) return GF_OK;
 
-	AddMovieIOD(dest->moov, 1);	
+	AddMovieIOD(dest->moov, 1);
 	gf_odf_desc_del((GF_Descriptor *)dest->moov->iods->descriptor);
 	gf_odf_desc_copy((GF_Descriptor *)orig->moov->iods->descriptor, (GF_Descriptor **)&dest->moov->iods->descriptor);
 	iod_d = (GF_IsomInitialObjectDescriptor *) dest->moov->iods->descriptor;
@@ -2398,7 +2533,7 @@
 	GF_Err e;
 	u32 i;
 	GF_Box *box;
-	
+
 	e = CanAccessMovie(dest_file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
@@ -2437,7 +2572,7 @@
 			dest_file->moov->mvex = NULL;
 		}
 
-		if (clone_tracks) { 
+		if (clone_tracks) {
 			for (i=0; i<gf_list_count(orig_file->moov->trackList); i++) {
 				GF_TrackBox *trak = gf_list_get( orig_file->moov->trackList, i);
 				if (!trak) continue;
@@ -2446,7 +2581,7 @@
 					if (e) return e;
 				}
 			}
-			if (iods) 
+			if (iods)
 				gf_isom_clone_box((GF_Box *)orig_file->moov->iods, (GF_Box **)dest_file->moov->iods);
 		} else {
 			dest_file->moov->mvhd->nextTrackID = 1;
@@ -2470,30 +2605,30 @@
 	i=0;
 	while ((box = (GF_Box*)gf_list_get(orig_file->TopBoxes, i++))) {
 		switch(box->type) {
-			case GF_ISOM_BOX_TYPE_MOOV:
-			case GF_ISOM_BOX_TYPE_META:
-			case GF_ISOM_BOX_TYPE_MDAT:
-			case GF_ISOM_BOX_TYPE_FTYP:
-			case GF_ISOM_BOX_TYPE_PDIN:
+		case GF_ISOM_BOX_TYPE_MOOV:
+		case GF_ISOM_BOX_TYPE_META:
+		case GF_ISOM_BOX_TYPE_MDAT:
+		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_PDIN:
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-			case GF_ISOM_BOX_TYPE_STYP:
-			case GF_ISOM_BOX_TYPE_SIDX:
-			case GF_ISOM_BOX_TYPE_MOOF:
+		case GF_ISOM_BOX_TYPE_STYP:
+		case GF_ISOM_BOX_TYPE_SIDX:
+		case GF_ISOM_BOX_TYPE_MOOF:
 #endif
-			case GF_4CC('j','P',' ',' '):
-				break;
-
-			case GF_ISOM_BOX_TYPE_PSSH:
-				if (!keep_pssh)
-					break;
+		case GF_4CC('j','P',' ',' '):
+			break;
 
-			default:
-				{
-					GF_Box *box2 = NULL;
-					gf_isom_clone_box(box, &box2);
-					gf_list_add(dest_file->TopBoxes, box2);
-				}
+		case GF_ISOM_BOX_TYPE_PSSH:
+			if (!keep_pssh)
 				break;
+
+		default:
+		{
+			GF_Box *box2 = NULL;
+			gf_isom_clone_box(box, &box2);
+			gf_list_add(dest_file->TopBoxes, box2);
+		}
+		break;
 		}
 	}
 
@@ -2513,7 +2648,7 @@
 	GF_Err e;
 	GF_SampleEntryBox *entry;
 	GF_SampleTableBox *stbl, *stbl_temp;
-	
+
 	e = CanAccessMovie(dest_file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	gf_isom_insert_moov(dest_file);
@@ -2529,6 +2664,8 @@
 	/*also clone sampleGroups description tables if any*/
 	stbl_temp->sampleGroupsDescription = stbl->sampleGroupsDescription;
 	trak->Media->information->sampleTable = stbl_temp;
+	/*clone CompositionToDecode table, we may remove it later*/
+	stbl_temp->CompositionToDecode = stbl->CompositionToDecode;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
@@ -2544,6 +2681,7 @@
 
 	stbl_temp->SampleDescription = NULL;
 	stbl_temp->sampleGroupsDescription = NULL;
+	stbl_temp->CompositionToDecode = NULL;
 	gf_isom_box_del((GF_Box *)stbl_temp);
 	if (e) return e;
 
@@ -2600,7 +2738,7 @@
 
 	*dest_track = gf_list_count(dest_file->moov->trackList);
 
-	if (dest_file->moov->mvhd->nextTrackID<= new_tk->Header->trackID) 
+	if (dest_file->moov->mvhd->nextTrackID<= new_tk->Header->trackID)
 		dest_file->moov->mvhd->nextTrackID = new_tk->Header->trackID+1;
 
 	return GF_OK;
@@ -2642,7 +2780,7 @@
 	GF_Box *entry;
 	GF_Err e;
 	u32 dataRefIndex;
-	
+
 	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
@@ -2683,12 +2821,12 @@
 	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
 	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
 
-	/*also clone track w/h info*/	
+	/*also clone track w/h info*/
 	if (gf_isom_get_media_type(the_file, trackNumber) == GF_ISOM_MEDIA_VISUAL) {
 		gf_isom_set_visual_info(the_file, trackNumber, (*outDescriptionIndex), ((GF_VisualSampleEntryBox*)entry)->Width, ((GF_VisualSampleEntryBox*)entry)->Height);
 	}
 	return e;
-	
+
 exit:
 	gf_isom_box_del(entry);
 	return e;
@@ -2703,7 +2841,7 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !udesc) return GF_BAD_PARAM;
 
@@ -2824,7 +2962,7 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !StreamDescriptionIndex) return GF_BAD_PARAM;
 
@@ -3025,7 +3163,7 @@
 			}
 		}
 	}
-	
+
 	/*and update IOD if any*/
 	if (movie->moov->iods && movie->moov->iods->descriptor) {
 		GF_ES_ID_Inc *inc;
@@ -3050,7 +3188,7 @@
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak)
 		return GF_BAD_PARAM;
-	if (!trak->References) 
+	if (!trak->References)
 		return GF_OK;
 
 	i=0;
@@ -3087,7 +3225,7 @@
 	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;
 	return GF_OK;
@@ -3247,7 +3385,7 @@
 			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);
+				for (k=0; k<len; k++) trak->name[k] = gf_bs_read_u8(bs);
 				trak->name[k] = 0;
 			}
 			gf_bs_del(bs);
@@ -3309,7 +3447,7 @@
 	GF_ESD *esd1, *esd2;
 	GF_Box *a;
 	Bool ret, need_memcmp;
-	
+
 	/*get orig sample desc and clone it*/
 	trak1 = gf_isom_get_track_from_file(f1, tk1);
 	if (!trak1 || !trak1->Media) return 0;
@@ -3352,6 +3490,8 @@
 			if (!esd1->decoderConfig->decoderSpecificInfo || !esd2->decoderConfig->decoderSpecificInfo) continue;
 			if (memcmp(esd1->decoderConfig->decoderSpecificInfo->data, esd2->decoderConfig->decoderSpecificInfo->data, sizeof(char)*esd1->decoderConfig->decoderSpecificInfo->dataLength)!=0) return 0;
 			break;
+		case GF_ISOM_BOX_TYPE_HVT1:
+			return 1;
 		case GF_ISOM_BOX_TYPE_AVC1:
 		case GF_ISOM_BOX_TYPE_AVC2:
 		case GF_ISOM_BOX_TYPE_AVC3:
@@ -3371,6 +3511,8 @@
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			if (avc1->hevc_config)
 				a = (GF_Box *) avc1->hevc_config;
+			else if (avc1->shvc_config)
+				a = (GF_Box *) avc1->shvc_config;
 			else if (avc1->svc_config)
 				a = (GF_Box *) avc1->svc_config;
 			else
@@ -3383,6 +3525,8 @@
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			if (avc2->hevc_config)
 				a = (GF_Box *) avc2->hevc_config;
+			else if (avc2->shvc_config)
+				a = (GF_Box *) avc2->shvc_config;
 			else if (avc2->svc_config)
 				a = (GF_Box *) avc2->svc_config;
 			else
@@ -3391,7 +3535,7 @@
 			gf_isom_box_write(a, bs);
 			gf_bs_get_content(bs, &data2, &data2_size);
 			gf_bs_del(bs);
-			
+
 			ret = 0;
 			if (data1_size == data2_size) {
 				ret = (memcmp(data1, data2, sizeof(char)*data1_size)==0) ? 1 : 0;
@@ -3400,60 +3544,60 @@
 			gf_free(data2);
 			return ret;
 		}
-			break;
+		break;
 		case GF_ISOM_BOX_TYPE_LSR1:
 		{
 			GF_LASeRSampleEntryBox *lsr1 = (GF_LASeRSampleEntryBox *)ent1;
 			GF_LASeRSampleEntryBox *lsr2 = (GF_LASeRSampleEntryBox *)ent2;
-			if (lsr1->lsr_config && lsr2->lsr_config 
-				&& lsr1->lsr_config->hdr && lsr2->lsr_config->hdr
-				&& (lsr1->lsr_config->hdr_size==lsr2->lsr_config->hdr_size)
-				&& !memcmp(lsr1->lsr_config->hdr, lsr2->lsr_config->hdr, lsr2->lsr_config->hdr_size)
-			) { 
+			if (lsr1->lsr_config && lsr2->lsr_config
+			        && lsr1->lsr_config->hdr && lsr2->lsr_config->hdr
+			        && (lsr1->lsr_config->hdr_size==lsr2->lsr_config->hdr_size)
+			        && !memcmp(lsr1->lsr_config->hdr, lsr2->lsr_config->hdr, lsr2->lsr_config->hdr_size)
+			   ) {
 				return 1;
 			}
 			return 0;
 		}
-			break;
+		break;
 		case GF_ISOM_BOX_TYPE_WVTT:
-			{
-				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))) {
-						return 1;
-				}
-				return 0;
+		{
+			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))) {
+				return 1;
 			}
-            break;
+			return 0;
+		}
+		break;
 		case GF_ISOM_BOX_TYPE_STPP:
-			{
-				GF_XMLSubtitleSampleEntryBox *stpp1 = (GF_XMLSubtitleSampleEntryBox *)ent1;
-				GF_XMLSubtitleSampleEntryBox *stpp2 = (GF_XMLSubtitleSampleEntryBox *)ent2;
-				if (stpp1->xmlnamespace && stpp2->xmlnamespace && !strcmp(stpp1->xmlnamespace, stpp2->xmlnamespace)) {
-						return 1;
-				}
-				return 0;
+		{
+			GF_XMLSubtitleSampleEntryBox *stpp1 = (GF_XMLSubtitleSampleEntryBox *)ent1;
+			GF_XMLSubtitleSampleEntryBox *stpp2 = (GF_XMLSubtitleSampleEntryBox *)ent2;
+			if (stpp1->xmlnamespace && stpp2->xmlnamespace && !strcmp(stpp1->xmlnamespace, stpp2->xmlnamespace)) {
+				return 1;
 			}
-            break;
+			return 0;
+		}
+		break;
 		case GF_ISOM_BOX_TYPE_SBTT:
-			{
-				return 0;
-			}
-            break;
-		case GF_ISOM_BOX_TYPE_STSE:
-			{
-				GF_SimpleTextSampleEntryBox *stse1 = (GF_SimpleTextSampleEntryBox *)ent1;
-				GF_SimpleTextSampleEntryBox *stse2 = (GF_SimpleTextSampleEntryBox *)ent2;
-				if (stse1->mime_type && stse2->mime_type && 
-					( (!stse1->config && !stse2->config) ||
-					  (stse1->config && stse2->config && stse1->config->string && stse2->config->string && 
-					    !strcmp(stse1->config->string, stse2->config->string)))) {
-						return 1;
-				}
-				return 0;
+		{
+			return 0;
+		}
+		break;
+		case GF_ISOM_BOX_TYPE_STXT:
+		{
+			GF_SimpleTextSampleEntryBox *stxt1 = (GF_SimpleTextSampleEntryBox *)ent1;
+			GF_SimpleTextSampleEntryBox *stxt2 = (GF_SimpleTextSampleEntryBox *)ent2;
+			if (stxt1->mime_type && stxt2->mime_type &&
+			        ( (!stxt1->config && !stxt2->config) ||
+			          (stxt1->config && stxt2->config && stxt1->config->string && stxt2->config->string &&
+			           !strcmp(stxt1->config->string, stxt2->config->string)))) {
+				return 1;
 			}
-            break;
+			return 0;
+		}
+		break;
 		}
 
 		if (sdesc_index1 && sdesc_index2) break;
@@ -3476,7 +3620,7 @@
 	gf_isom_box_write(a, bs);
 	gf_bs_get_content(bs, &data2, &data2_size);
 	gf_bs_del(bs);
-	
+
 	if (data1_size == data2_size) {
 		ret = (memcmp(data1, data2, sizeof(char)*data1_size)==0) ? 1 : 0;
 	}
@@ -3537,7 +3681,7 @@
 {
 	GF_TrackBox *trak;
 	GF_SampleTableBox *stbl;
-	u8 isRAP;
+	SAPType isRAP;
 	GF_Err e;
 
 	if (movie->openMode == GF_ISOM_OPEN_READ) return GF_ISOM_INVALID_MODE;
@@ -3733,7 +3877,7 @@
 		gf_f64_seek(f, 0, SEEK_END);
 		size = gf_f64_tell(f);
 		gf_f64_seek(f, 0, SEEK_SET);
-		if (3!=fread(BOM, sizeof(char), 3, f)){
+		if (3!=fread(BOM, sizeof(char), 3, f)) {
 			fclose(f);
 			return GF_CORRUPTED_DATA;
 		}
@@ -3764,18 +3908,30 @@
 				}
 				/*UTF8 2 bytes char */
 				else if ( (szOrig[i] & 0xe0) == 0xc0) {
-					szLine[j] = szOrig[i]; i++; j++;
+					szLine[j] = szOrig[i];
+					i++;
+					j++;
 				}
 				/*UTF8 3 bytes char */
 				else if ( (szOrig[i] & 0xf0) == 0xe0) {
-					szLine[j] = szOrig[i]; i++; j++;
-					szLine[j] = szOrig[i]; i++; j++;
+					szLine[j] = szOrig[i];
+					i++;
+					j++;
+					szLine[j] = szOrig[i];
+					i++;
+					j++;
 				}
 				/*UTF8 4 bytes char */
 				else if ( (szOrig[i] & 0xf8) == 0xf0) {
-					szLine[j] = szOrig[i]; i++; j++;
-					szLine[j] = szOrig[i]; i++; j++;
-					szLine[j] = szOrig[i]; i++; j++;
+					szLine[j] = szOrig[i];
+					i++;
+					j++;
+					szLine[j] = szOrig[i];
+					i++;
+					j++;
+					szLine[j] = szOrig[i];
+					i++;
+					j++;
 				}
 			}
 			szLine[j] = szOrig[i];
@@ -3871,7 +4027,7 @@
 		if (!movie) return GF_BAD_PARAM;
 		list = movie->moov->other_boxes;
 	}
-	
+
 	count = list ? gf_list_count(list) : 0;
 	for (i=0; i<count; i++) {
 		GF_UnknownUUIDBox *uuid = (GF_UnknownUUIDBox *)gf_list_get(list, i);
@@ -3906,7 +4062,7 @@
 		if (!movie->moov->other_boxes) movie->moov->other_boxes = gf_list_new();
 		list = movie->moov->other_boxes;
 	}
-	
+
 	GF_SAFEALLOC(uuid, GF_UnknownUUIDBox);
 	uuid->type = GF_ISOM_BOX_TYPE_UUID;
 	memcpy(uuid->uuid, UUID, sizeof(bin128));
@@ -3982,7 +4138,7 @@
 		info->data->dataSize = data_len;
 		info->data->data = (char*)gf_malloc(sizeof(char)*data_len);
 		memcpy(info->data->data , data, sizeof(char)*data_len);
-	} 
+	}
 	else if (data_len && (tag==GF_ISOM_ITUNE_GENRE)) {
 		info = (GF_ListItemBox *)gf_isom_box_new(btype);
 		if (info == NULL) return GF_OUT_OF_MEM;
@@ -4042,7 +4198,7 @@
 		} else {
 			alternateGroupID = trak->Header->alternate_group;
 		}
-	} 
+	}
 	if (!alternateGroupID) {
 		/*there is a function for this ....*/
 		if (trak->Header->alternate_group) return GF_BAD_PARAM;
@@ -4050,7 +4206,7 @@
 	}
 
 	if (is_switch_group) {
-		u32 i=0;		
+		u32 i=0;
 		while (i< gf_isom_get_track_count(movie) ) {
 			//locate first available ID
 			GF_TrackBox *a_trak = gf_isom_get_track_from_file(movie, i+1);
@@ -4068,7 +4224,7 @@
 								if (a_trak->Header->alternate_group != alternateGroupID) return GF_BAD_PARAM;
 							}
 						} else {
-							if (tsel->switchGroup && (tsel->switchGroup>=next_switch_group_id) ) 
+							if (tsel->switchGroup && (tsel->switchGroup>=next_switch_group_id) )
 								next_switch_group_id = tsel->switchGroup;
 						}
 					}
@@ -4080,7 +4236,7 @@
 		if (! *switchGroupID) *switchGroupID = next_switch_group_id+1;
 	}
 
-	
+
 	trak->Header->alternate_group = alternateGroupID;
 
 	tsel = NULL;
@@ -4141,7 +4297,7 @@
 
 	alternateGroupID = trak->Header->alternate_group;
 	if (reset_all_group) {
-		u32 i=0;		
+		u32 i=0;
 		while (i< gf_isom_get_track_count(movie) ) {
 			//locate first available ID
 			GF_TrackBox *a_trak = gf_isom_get_track_from_file(movie, i+1);
@@ -4158,7 +4314,7 @@
 GF_EXPORT
 GF_Err gf_isom_reset_switch_parameters(GF_ISOFile *movie)
 {
-	u32 i=0;		
+	u32 i=0;
 	while (i< gf_isom_get_track_count(movie) ) {
 		//locate first available ID
 		GF_TrackBox *a_trak = gf_isom_get_track_from_file(movie, i+1);
@@ -4177,14 +4333,14 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !mime_or_namespace)
 		return GF_BAD_PARAM;
 
 	if (trak->Media->handler->handlerType==GF_ISOM_MEDIA_META)
 		return GF_BAD_PARAM;
-	
+
 	//get or create the data ref
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
@@ -4217,11 +4373,11 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	trak = gf_isom_get_track_from_file(movie, track);
 	if (!trak || !trak->Media || !trak->Media->information->sampleTable)
 		return GF_BAD_PARAM;
-	
+
 	if (!trak->Media->information->sampleTable->SubSamples) {
 		trak->Media->information->sampleTable->SubSamples = (GF_SubSampleInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SUBS);
 		sub_samples = trak->Media->information->sampleTable->SubSamples;
@@ -4251,18 +4407,19 @@
 	if (!entry ) return GF_BAD_PARAM;
 	switch (entry->type) {
 	case GF_ISOM_BOX_TYPE_MP4V:
-	case GF_ISOM_BOX_TYPE_AVC1: 
+	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_ENCV:
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	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_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -4280,7 +4437,7 @@
 	if (!rvc_predefined) {
 		e = gf_isom_set_meta_type(movie, 0, track, GF_4CC('r','v','c','i'));
 		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, 1);
 		e = gf_isom_add_meta_item_memory(movie, 0, track, "rvcconfig.xml", 0, mime, NULL, data, size);
 		if (e) return e;
 		entry->rvcc->rvc_meta_idx = gf_isom_get_meta_item_count(movie, 0, track);
@@ -4370,15 +4527,11 @@
 }
 
 
-static GF_Err gf_isom_set_sample_group_info_ex(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 sample_number, u32 grouping_type, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
+static GF_SampleGroupDescriptionBox *get_sgdp(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 grouping_type)
 {
 	GF_List *groupList;
-	void *entry;
-	GF_SampleGroupDescriptionBox *sgdesc = NULL;
-	u32 i, count, entry_idx;
-
-	if (!stbl && !traf) return GF_BAD_PARAM;
-
+	GF_SampleGroupDescriptionBox *sgdesc=NULL;
+	u32 count, i;
 	/*look in stbl or traf for sample sampleGroupsDescription*/
 	if (traf) {
 		if (!traf->sampleGroupsDescription)
@@ -4401,6 +4554,21 @@
 		sgdesc->grouping_type = grouping_type;
 		gf_list_add(groupList, sgdesc);
 	}
+	return sgdesc;
+}
+
+static GF_Err gf_isom_set_sample_group_info_ex(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 sample_number, u32 grouping_type, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
+{
+	GF_List *groupList;
+	void *entry;
+	GF_SampleGroupDescriptionBox *sgdesc = NULL;
+	u32 i, entry_idx;
+
+	if (!stbl && !traf) return GF_BAD_PARAM;
+
+	sgdesc = get_sgdp(stbl, traf, grouping_type);
+	if (!sgdesc) return GF_OUT_OF_MEM;
+
 	entry = NULL;
 	for (i=0; i<gf_list_count(sgdesc->group_descriptions); i++) {
 		entry = gf_list_get(sgdesc->group_descriptions, i);
@@ -4445,6 +4613,69 @@
 	return gf_isom_set_sample_group_info_ex(trak->Media->information->sampleTable, NULL, sample_number, grouping_type, udta, sg_create_entry, sg_compare_entry);
 }
 
+
+GF_EXPORT
+GF_Err gf_isom_add_sample_group_info(GF_ISOFile *movie, u32 track, u32 grouping_type, void *data, u32 data_size, Bool is_default, u32 *sampleGroupDescriptionIndex)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_DefaultSampleGroupDescriptionEntry *entry;
+	GF_SampleGroupDescriptionBox *sgdesc = NULL;
+
+	if (sampleGroupDescriptionIndex) *sampleGroupDescriptionIndex = 0;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, track);
+	if (!trak) return GF_BAD_PARAM;
+
+
+	sgdesc = get_sgdp(trak->Media->information->sampleTable, NULL, grouping_type);
+	if (!sgdesc) return GF_OUT_OF_MEM;
+
+	GF_SAFEALLOC(entry, GF_DefaultSampleGroupDescriptionEntry);
+	if (!entry) return GF_OUT_OF_MEM;
+	entry->data = gf_malloc(sizeof(char) * data_size);
+	if (!entry->data) {
+		gf_free(entry);
+		return GF_OUT_OF_MEM;
+	}
+	entry->length = data_size;
+	memcpy(entry->data, data, sizeof(char) * data_size);
+	e = gf_list_add(sgdesc->group_descriptions, entry);
+	if (e) {
+		gf_free(entry->data);
+		gf_free(entry);
+		return e;
+	}
+
+	if (is_default) {
+		sgdesc->default_description_index = 1 + gf_list_find(sgdesc->group_descriptions, entry);
+		sgdesc->version = 2;
+	}
+	if (sampleGroupDescriptionIndex) *sampleGroupDescriptionIndex = 1 + gf_list_find(sgdesc->group_descriptions, entry);
+
+	return GF_OK;
+}
+
+GF_Err gf_isom_add_sample_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 sampleGroupDescriptionIndex)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_List *groupList;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, track);
+	if (!trak) return GF_BAD_PARAM;
+
+	if (!trak->Media->information->sampleTable->sampleGroups)
+		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, sampleGroupDescriptionIndex);
+}
+
 void *sg_rap_create_entry(void *udta)
 {
 	GF_VisualRandomAccessEntry *entry;
@@ -4523,7 +4754,7 @@
 GF_Err gf_isom_copy_sample_group_entry_to_traf(GF_TrackFragmentBox *traf, GF_SampleTableBox *stbl, u32 grouping_type, u32 sampleGroupDescriptionIndex, Bool sgpd_in_traf)
 {
 	if (sgpd_in_traf) {
-		void *entry = NULL; 
+		void *entry = NULL;
 		u32 i, count;
 		GF_SampleGroupDescriptionBox *sgdesc = NULL;
 		GF_BitStream *bs;
@@ -4541,35 +4772,35 @@
 		entry = gf_list_get(sgdesc->group_descriptions, sampleGroupDescriptionIndex-1);
 		if (!entry)
 			return GF_BAD_PARAM;
-		
+
 		switch (grouping_type) {
-			case GF_4CC( 'r', 'a', 'p', ' ' ):
-			{
-				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);
-				return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, udta, sg_rap_create_entry, sg_rap_compare_entry);
-			}
-			case GF_4CC( 'r', 'o', 'l', 'l' ): 
-			{
-				char udta[2];
-				bs = gf_bs_new(udta, 2*sizeof(char), GF_BITSTREAM_WRITE);
-				gf_bs_write_u16(bs, ((GF_RollRecoveryEntry *)entry)->roll_distance);
-				return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, udta, sg_roll_create_entry, sg_roll_compare_entry);
-			}
-			case GF_4CC( 's', 'e', 'i', 'g' ):
-			{
-				char udta[20];
-				bs = gf_bs_new(udta, 20*sizeof(char), GF_BITSTREAM_WRITE);
-				gf_bs_write_u24(bs, ((GF_CENCSampleEncryptionGroupEntry *)entry)->IsEncrypted);
-				gf_bs_write_u8(bs, ((GF_CENCSampleEncryptionGroupEntry *)entry)->IV_size);
-				gf_bs_write_data(bs, (char *) ((GF_CENCSampleEncryptionGroupEntry *)entry)->KID, 16);
-				gf_bs_del(bs);
-				return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, udta, sg_encryption_create_entry, sg_encryption_compare_entry);
-			}
-			default:
-				return GF_BAD_PARAM;
+		case GF_4CC( 'r', 'a', 'p', ' ' ):
+		{
+			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);
+			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, udta, sg_rap_create_entry, sg_rap_compare_entry);
+		}
+		case GF_4CC( 'r', 'o', 'l', 'l' ):
+		{
+			char udta[2];
+			bs = gf_bs_new(udta, 2*sizeof(char), GF_BITSTREAM_WRITE);
+			gf_bs_write_u16(bs, ((GF_RollRecoveryEntry *)entry)->roll_distance);
+			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, udta, sg_roll_create_entry, sg_roll_compare_entry);
+		}
+		case GF_4CC( 's', 'e', 'i', 'g' ):
+		{
+			char udta[20];
+			bs = gf_bs_new(udta, 20*sizeof(char), GF_BITSTREAM_WRITE);
+			gf_bs_write_u24(bs, ((GF_CENCSampleEncryptionGroupEntry *)entry)->IsEncrypted);
+			gf_bs_write_u8(bs, ((GF_CENCSampleEncryptionGroupEntry *)entry)->IV_size);
+			gf_bs_write_data(bs, (char *) ((GF_CENCSampleEncryptionGroupEntry *)entry)->KID, 16);
+			gf_bs_del(bs);
+			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, udta, sg_encryption_create_entry, sg_encryption_compare_entry);
+		}
+		default:
+			return GF_BAD_PARAM;
 		}
 	}
 
@@ -4604,7 +4835,7 @@
 	ctts = trak->Media->information->sampleTable->CompositionOffset;
 	shift = ctts->entries[0].decodingOffset;
 	leastCTTS = 0;
-	greatestCTTS = 0; 
+	greatestCTTS = 0;
 	for (i=0; i<ctts->nb_entries; i++) {
 		ctts->entries[i].decodingOffset -= shift;
 		if ((s32)ctts->entries[i].decodingOffset < leastCTTS)
@@ -4640,8 +4871,8 @@
 	GF_CompositionToDecodeBox *cslg;
 
 	ctts = trak->Media->information->sampleTable->CompositionOffset;
-	
-	if (!trak->Media->information->sampleTable->CompositionToDecode) 
+
+	if (!trak->Media->information->sampleTable->CompositionToDecode)
 	{
 		shift = 0;
 		for (i=0; i<ctts->nb_entries; i++) {
@@ -4711,6 +4942,82 @@
 	return GF_OK;
 }
 
+
+GF_Err gf_isom_copy_sample_info(GF_ISOFile *dst, u32 dst_track, GF_ISOFile *src, u32 src_track, u32 sampleNumber)
+{
+	u32 i, count;
+	GF_SubSampleInfoEntry *sub_sample;
+	GF_Err e;
+	GF_TrackBox *src_trak, *dst_trak;
+
+	src_trak = gf_isom_get_track_from_file(src, src_track);
+	if (!src_trak) return GF_BAD_PARAM;
+
+	dst_trak = gf_isom_get_track_from_file(dst, dst_track);
+	if (!dst_trak) return GF_BAD_PARAM;
+
+	/*modify depends flags*/
+	if (src_trak->Media->information->sampleTable->SampleDep) {
+		u32 dependsOn, dependedOn, redundant;
+
+		dependsOn = dependedOn = redundant = 0;
+
+		e = stbl_GetSampleDepType(src_trak->Media->information->sampleTable->SampleDep, sampleNumber, &dependsOn, &dependedOn, &redundant);
+		if (e) return e;
+
+		e = stbl_AppendDependencyType(dst_trak->Media->information->sampleTable, dependsOn, dependedOn, redundant);
+		if (e) return e;
+	}
+
+	/*copy subsample info if any*/
+	if ( gf_isom_sample_get_subsample_entry(src, src_track, sampleNumber, &sub_sample)) {
+
+		/*create subsample if needed*/
+		if (!dst_trak->Media->information->sampleTable->SubSamples) {
+			dst_trak->Media->information->sampleTable->SubSamples = (GF_SubSampleInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SUBS);
+			dst_trak->Media->information->sampleTable->SubSamples->version = 0;
+		}
+
+		count = gf_list_count(sub_sample->SubSamples);
+		for (i=0; i<count; i++) {
+			GF_SubSampleEntry *entry = gf_list_get(sub_sample->SubSamples, i);
+			e = gf_isom_add_subsample_info(dst_trak->Media->information->sampleTable->SubSamples, sampleNumber, entry->subsample_size, entry->subsample_priority, entry->reserved, entry->discardable);
+			if (e) return e;
+		}
+	}
+
+	/*copy sampleToGroup info if any*/
+	if (src_trak->Media->information->sampleTable->sampleGroups) {
+		count = gf_list_count(src_trak->Media->information->sampleTable->sampleGroups);
+		for (i=0; i<count; i++) {
+			GF_SampleGroupBox *sg;
+			u32 j;
+			u32 first_sample_in_entry, last_sample_in_entry;
+			first_sample_in_entry = 1;
+
+			sg = gf_list_get(src_trak->Media->information->sampleTable->sampleGroups, i);
+			for (j=0; j<sg->entry_count; j++) {
+				last_sample_in_entry = first_sample_in_entry + sg->sample_entries[j].sample_count - 1;
+				if ((sampleNumber<first_sample_in_entry) || (sampleNumber>last_sample_in_entry)) {
+					first_sample_in_entry = last_sample_in_entry+1;
+					continue;
+				}
+
+				if (!dst_trak->Media->information->sampleTable->sampleGroups)
+					dst_trak->Media->information->sampleTable->sampleGroups = gf_list_new();
+
+				/*found our sample, add it to trak->sampleGroups*/
+				e = gf_isom_add_sample_group_entry(dst_trak->Media->information->sampleTable->sampleGroups, sampleNumber, sg->grouping_type, sg->sample_entries[j].group_description_index);
+				if (e) return e;
+
+				break;
+			}
+		}
+	}
+	return GF_OK;
+}
+
+
 #endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/media.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/media.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -64,7 +64,7 @@
 		if (gf_list_count(mdia->information->sampleTable->SampleDescription->other_boxes)) {
 			(*sampleDescIndex) = 1;
 			return GF_OK;
-		}		
+		}
 		return GF_BAD_PARAM;
 	}
 	return stbl_GetSampleInfos(mdia->information->sampleTable, ( sampleNumber ? sampleNumber : prevSampleNumber), &offset, &num, sampleDescIndex, &isEdited);
@@ -79,7 +79,7 @@
 	(*out_esd)->decoderConfig->streamType = GF_STREAM_AUDIO;
 	/*official mapping to MPEG-4*/
 	switch (entry->type) {
-	case GF_ISOM_SUBTYPE_3GP_EVRC: 
+	case GF_ISOM_SUBTYPE_3GP_EVRC:
 		(*out_esd)->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_EVRC_VOICE;
 		return GF_OK;
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
@@ -125,7 +125,7 @@
 		gf_bs_get_content(bs, & (*out_esd)->decoderConfig->decoderSpecificInfo->data, & (*out_esd)->decoderConfig->decoderSpecificInfo->dataLength);
 		gf_bs_del(bs);
 	}
-		return GF_OK;
+	return GF_OK;
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		(*out_esd)->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_SMV_VOICE;
 		return GF_OK;
@@ -152,7 +152,7 @@
 	GF_MPEGSampleEntryBox *entry = NULL;
 	GF_ESDBox *ESDa;
 	GF_SampleDescriptionBox *stsd = mdia->information->sampleTable->SampleDescription;
-	
+
 	*out_esd = NULL;
 	if (!stsd || !stsd->other_boxes || !sampleDescIndex || (sampleDescIndex > gf_list_count(stsd->other_boxes)) )
 		return GF_BAD_PARAM;
@@ -175,21 +175,26 @@
 	case GF_ISOM_BOX_TYPE_AVC2:
 	case GF_ISOM_BOX_TYPE_AVC3:
 	case GF_ISOM_BOX_TYPE_AVC4:
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
+	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_HVT1:
 		esd = ((GF_MPEGVisualSampleEntryBox*) entry)->emul_esd;
 		break;
 	case GF_ISOM_BOX_TYPE_SVC1:
 		if ((mdia->mediaTrack->extractor_mode & 0x0000FFFF) != GF_ISOM_NALU_EXTRACT_INSPECT)
 			AVC_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*) entry, mdia);
+		else
+			AVC_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*) entry, NULL);
 		esd = ((GF_MPEGVisualSampleEntryBox*) entry)->emul_esd;
 		break;
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
 		if ((mdia->mediaTrack->extractor_mode & 0x0000FFFF) != GF_ISOM_NALU_EXTRACT_INSPECT)
 			HEVC_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*) entry, mdia);
+		else
+			HEVC_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*) entry, NULL);
 		esd = ((GF_MPEGVisualSampleEntryBox*) entry)->emul_esd;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4A:
@@ -212,48 +217,48 @@
 		else return GF_ISOM_INVALID_MEDIA;
 #ifndef GPAC_DISABLE_TTXT
 	case GF_ISOM_BOX_TYPE_WVTT:
-		{
-			GF_BitStream *bs;
-			esd =  gf_odf_desc_esd_new(2);
-			*out_esd = esd;
-			esd->decoderConfig->streamType = GF_STREAM_TEXT;
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_VTT_MP4;
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_u32(bs, entry->type);
-			boxstring_Write((GF_Box *)((GF_WebVTTSampleEntryBox*)entry)->config, bs);
-			gf_bs_get_content(bs, & esd->decoderConfig->decoderSpecificInfo->data, & esd->decoderConfig->decoderSpecificInfo->dataLength);
-			gf_bs_del(bs);
-		}
-		break;
+	{
+		GF_BitStream *bs;
+		esd =  gf_odf_desc_esd_new(2);
+		*out_esd = esd;
+		esd->decoderConfig->streamType = GF_STREAM_TEXT;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_VTT_MP4;
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		gf_bs_write_u32(bs, entry->type);
+		boxstring_Write((GF_Box *)((GF_WebVTTSampleEntryBox*)entry)->config, bs);
+		gf_bs_get_content(bs, & esd->decoderConfig->decoderSpecificInfo->data, & esd->decoderConfig->decoderSpecificInfo->dataLength);
+		gf_bs_del(bs);
+	}
+	break;
 	case GF_ISOM_BOX_TYPE_STPP:
-		{
-			/* TODO */
-		}
-		break;
+	{
+		/* TODO */
+	}
+	break;
 	case GF_ISOM_BOX_TYPE_SBTT:
-		{
-			/* TODO */
-		}
-		break;
-	case GF_ISOM_BOX_TYPE_STSE:
-		{
-			GF_BitStream *bs;
-			esd =  gf_odf_desc_esd_new(2);
-			*out_esd = esd;
-			esd->decoderConfig->streamType = GF_STREAM_TEXT;
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_SIMPLE_TEXT_MP4;
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_u32(bs, entry->type);
-			boxstring_Write((GF_Box *)((GF_SimpleTextSampleEntryBox*)entry)->config, bs);
-			gf_bs_get_content(bs, & esd->decoderConfig->decoderSpecificInfo->data, & esd->decoderConfig->decoderSpecificInfo->dataLength);
-			gf_bs_del(bs);
-		}
-		break;
+	{
+		/* TODO */
+	}
+	break;
+	case GF_ISOM_BOX_TYPE_STXT:
+	{
+		GF_BitStream *bs;
+		esd =  gf_odf_desc_esd_new(2);
+		*out_esd = esd;
+		esd->decoderConfig->streamType = GF_STREAM_TEXT;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_SIMPLE_TEXT_MP4;
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		gf_bs_write_u32(bs, entry->type);
+		boxstring_Write((GF_Box *)((GF_SimpleTextSampleEntryBox*)entry)->config, bs);
+		gf_bs_get_content(bs, & esd->decoderConfig->decoderSpecificInfo->data, & esd->decoderConfig->decoderSpecificInfo->dataLength);
+		gf_bs_del(bs);
+	}
+	break;
 #endif
 
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
-	case GF_ISOM_SUBTYPE_3GP_EVRC: 
+	case GF_ISOM_SUBTYPE_3GP_EVRC:
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		if (!true_desc_only) {
@@ -262,7 +267,7 @@
 			break;
 		} else return GF_ISOM_INVALID_MEDIA;
 
-	case GF_ISOM_SUBTYPE_3GP_H263: 
+	case GF_ISOM_SUBTYPE_3GP_H263:
 		if (true_desc_only) {
 			return GF_ISOM_INVALID_MEDIA;
 		} else {
@@ -280,7 +285,18 @@
 			break;
 		}
 
-	case GF_ISOM_SUBTYPE_LSR1: 
+	case GF_ISOM_SUBTYPE_MP3:
+		if (true_desc_only) {
+			return GF_ISOM_INVALID_MEDIA;
+		} else {
+			esd =  gf_odf_desc_esd_new(2);
+			*out_esd = esd;
+			esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
+			break;
+		}
+
+	case GF_ISOM_SUBTYPE_LSR1:
 		if (true_desc_only) {
 			return GF_ISOM_INVALID_MEDIA;
 		} else {
@@ -295,7 +311,8 @@
 			break;
 		}
 
-	default: return GF_ISOM_INVALID_MEDIA;
+	default:
+		return GF_ISOM_INVALID_MEDIA;
 	}
 
 	if (true_desc_only) {
@@ -331,8 +348,10 @@
 	u8 isEdited;
 	GF_SampleEntryBox *entry;
 
-	
+
 	if (!mdia || !mdia->information->sampleTable) return GF_BAD_PARAM;
+	if (!mdia->information->sampleTable->SampleSize)
+		return GF_ISOM_INVALID_FILE;
 
 	//OK, here we go....
 	if (sampleNumber > mdia->information->sampleTable->SampleSize->sampleCount) return GF_BAD_PARAM;
@@ -356,22 +375,22 @@
 		if (e) return e;
 	} else {
 		//if no SyncSample, all samples are sync (cf spec)
-		(*samp)->IsRAP = 1;
+		(*samp)->IsRAP = RAP;
 	}
 	/*overwrite sync sample with sample dep if any*/
 	if (mdia->information->sampleTable->SampleDep) {
 		u32 dependsOn, dependedOn, redundant;
 		e = stbl_GetSampleDepType(mdia->information->sampleTable->SampleDep, sampleNumber, &dependsOn, &dependedOn, &redundant);
 		if (!e) {
-			if (dependsOn==1) (*samp)->IsRAP = 0;
-			else if (dependsOn==2) (*samp)->IsRAP = 1;
+			if (dependsOn==1) (*samp)->IsRAP = RAP_NO;
+			else if (dependsOn==2) (*samp)->IsRAP = RAP;
 			/*if not depended upon and redundant, mark as carousel sample*/
-			if ((dependedOn==2) && (redundant==1)) (*samp)->IsRAP = 2;
+			if ((dependedOn==2) && (redundant==1)) (*samp)->IsRAP = RAP_REDUNDANT;
 			/*TODO FIXME - we must enhance the IsRAP semantics to carry disposable info ... */
 		}
 	}
 	/*get sync shadow*/
-	if (Media_IsSampleSyncShadow(mdia->information->sampleTable->ShadowSync, sampleNumber)) (*samp)->IsRAP = 2;
+	if (Media_IsSampleSyncShadow(mdia->information->sampleTable->ShadowSync, sampleNumber)) (*samp)->IsRAP = RAP_REDUNDANT;
 
 	//the data info
 	if (!sIDX && !no_data) return GF_BAD_PARAM;
@@ -385,10 +404,10 @@
 	e = Media_GetSampleDesc(mdia, *sIDX, &entry, &dataRefIndex);
 	if (e) return e;
 
-	// Open the data handler - check our mode, don't reopen in read only if this is 
-	//the same entry. In other modes we have no choice because the main data map is 
+	// Open the data handler - check our mode, don't reopen in read only if this is
+	//the same entry. In other modes we have no choice because the main data map is
 	//divided into the original and the edition files
-	if (mdia->mediaTrack->moov->mov->openMode == GF_ISOM_OPEN_READ) {	
+	if (mdia->mediaTrack->moov->mov->openMode == GF_ISOM_OPEN_READ) {
 		//same as last call in read mode
 		if (!mdia->information->dataHandler) {
 			e = gf_isom_datamap_open(mdia, dataRefIndex, isEdited);
@@ -405,19 +424,19 @@
 	if (no_data) return GF_OK;
 
 	/*and finally get the data, include padding if needed*/
- 	(*samp)->data = (char *) gf_malloc(sizeof(char) * ( (*samp)->dataLength + mdia->mediaTrack->padding_bytes) );
+	(*samp)->data = (char *) gf_malloc(sizeof(char) * ( (*samp)->dataLength + mdia->mediaTrack->padding_bytes) );
 	if (mdia->mediaTrack->padding_bytes)
 		memset((*samp)->data + (*samp)->dataLength, 0, sizeof(char) * mdia->mediaTrack->padding_bytes);
 
 	//check if we can get the sample (make sure we have enougth data...)
 	new_size = gf_bs_get_size(mdia->information->dataHandler->bs);
 	if (offset + (*samp)->dataLength > new_size) {
-		//always refresh the size to avoid wrong info on http/ftp 
+		//always refresh the size to avoid wrong info on http/ftp
 		new_size = gf_bs_get_refreshed_size(mdia->information->dataHandler->bs);
 		if (offset + (*samp)->dataLength > new_size) {
 			mdia->BytesMissing = offset + (*samp)->dataLength - new_size;
 			return GF_ISOM_INCOMPLETE_FILE;
-		}	
+		}
 	}
 
 	bytesRead = gf_isom_datamap_get_data(mdia->information->dataHandler, (*samp)->data, (*samp)->dataLength, offset);
@@ -432,16 +451,16 @@
 		if (e) return e;
 	}
 	/*FIXME: we don NOT rewrite sample if we have a encrypted track*/
-	else if (gf_isom_is_nalu_based_entry(mdia, entry) && 
-		!gf_isom_is_track_encrypted(mdia->mediaTrack->moov->mov, gf_isom_get_tracknum_from_id(mdia->mediaTrack->moov, mdia->mediaTrack->Header->trackID))
-	) {
+	else if (gf_isom_is_nalu_based_entry(mdia, entry) &&
+	         !gf_isom_is_track_encrypted(mdia->mediaTrack->moov->mov, gf_isom_get_tracknum_from_id(mdia->mediaTrack->moov, mdia->mediaTrack->Header->trackID))
+	        ) {
 		e = gf_isom_nalu_sample_rewrite(mdia, *samp, sampleNumber, (GF_MPEGVisualSampleEntryBox *)entry);
 		if (e) return e;
-	} 
-	else if (mdia->mediaTrack->moov->mov->convert_streaming_text 
-		&& ((mdia->handler->handlerType == GF_ISOM_MEDIA_TEXT) || (mdia->handler->handlerType == GF_ISOM_MEDIA_SUBT)) 
-		&& (entry->type == GF_ISOM_BOX_TYPE_TX3G || entry->type == GF_ISOM_BOX_TYPE_TEXT) 
-	) {
+	}
+	else if (mdia->mediaTrack->moov->mov->convert_streaming_text
+	         && ((mdia->handler->handlerType == GF_ISOM_MEDIA_TEXT) || (mdia->handler->handlerType == GF_ISOM_MEDIA_SUBT))
+	         && (entry->type == GF_ISOM_BOX_TYPE_TX3G || entry->type == GF_ISOM_BOX_TYPE_TEXT)
+	        ) {
 		u64 dur;
 		if (sampleNumber == mdia->information->sampleTable->SampleSize->sampleCount) {
 			dur = mdia->mediaHeader->duration - (*samp)->DTS;
@@ -468,7 +487,7 @@
 	entry = (GF_DataEntryURLBox*)gf_list_get(mdia->information->dataInformation->dref->other_boxes, dataEntryIndex - 1);
 	if (!entry) return GF_ISOM_INVALID_FILE;
 	if (entry->flags == 1) return GF_OK;
-	
+
 	//ok, not self contained, let's go for it...
 	//we don't know what's a URN yet
 	if (entry->type == GF_ISOM_BOX_TYPE_URN) return GF_NOT_SUPPORTED;
@@ -507,11 +526,11 @@
 //look for a sync sample from a given point in media time
 GF_Err Media_FindSyncSample(GF_SampleTableBox *stbl, u32 searchFromSample, u32 *sampleNumber, u8 mode)
 {
-	u8 isRAP;
+	SAPType isRAP;
 	u32 next, prev;
 	if (!stbl || !stbl->SyncSample) return GF_BAD_PARAM;
 
-	//set to current sample if we don't find a RAP		
+	//set to current sample if we don't find a RAP
 	*sampleNumber = searchFromSample;
 
 	//this is not the exact sample, but the prev move to next sample if enough samples....
@@ -588,9 +607,14 @@
 	GF_ESD *esd;
 	u64 DTS;
 	GF_SttsEntry *ent;
-	u32 nbSamp = trak->Media->information->sampleTable->SampleSize->sampleCount;
+	u32 nbSamp;
+
+	if (!trak->Media->information->sampleTable->SampleSize)
+		return GF_BAD_PARAM;
+	else
+		nbSamp = trak->Media->information->sampleTable->SampleSize->sampleCount;
 
-	//we need to check how many samples we have. 
+	//we need to check how many samples we have.
 	// == 1 -> last sample duration == default duration
 	// > 1 -> last sample duration == prev sample duration
 	switch (nbSamp) {
@@ -612,6 +636,7 @@
 		stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, nbSamp, &DTS);
 		ent = &trak->Media->information->sampleTable->TimeToSample->entries[trak->Media->information->sampleTable->TimeToSample->nb_entries-1];
 		trak->Media->mediaHeader->duration = DTS;
+		trak->Media->mediaHeader->duration += trak->dts_at_seg_start;
 
 #if 1
 		trak->Media->mediaHeader->duration += ent->sampleDelta;
@@ -665,9 +690,9 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-	
+
 GF_Err Media_CreateDataRef(GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex)
-{	
+{
 	GF_Err e;
 	GF_DataEntryURLBox *entry;
 
@@ -756,8 +781,8 @@
 
 	//The first non sync sample we see must create a syncTable
 	if (sample->IsRAP) {
-		//insert it only if we have a sync table
-		if (stbl->SyncSample) {
+		//insert it only if we have a sync table and if we have an IDR slice
+		if (stbl->SyncSample && (sample->IsRAP == RAP)) {
 			e = stbl_AddRAP(stbl->SyncSample, sampleNumber);
 			if (e) return e;
 		}
@@ -774,7 +799,7 @@
 			}
 		}
 	}
-	if (sample->IsRAP==2) {
+	if (sample->IsRAP==RAP_REDUNDANT) {
 		e = stbl_AddRedundant(stbl, sampleNumber);
 		if (e) return e;
 	}
@@ -838,7 +863,7 @@
 
 	if (!mdia || !sample || !sampleNumber || !mdia->mediaTrack->moov->mov->editFileMap)
 		return GF_BAD_PARAM;
-	
+
 	stbl = mdia->information->sampleTable;
 
 	if (!data_only) {

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/media_odf.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/media_odf.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,7 +34,7 @@
 	GF_ODCodec *ODdecode;
 	GF_ODCodec *ODencode;
 	GF_ODCom *com;
-	
+
 	//the commands we proceed
 	GF_ESDUpdate *esdU, *esdU2;
 	GF_ESDRemove *esdR, *esdR2;
@@ -92,7 +92,7 @@
 				}
 				e = gf_odf_desc_copy(desc, (GF_Descriptor **)&isom_od);
 				if (e) goto err_exit;
-					
+
 				//create our OD...
 				if (desc->tag == GF_ODF_ISOM_IOD_TAG) {
 					od = (GF_ObjectDescriptor *) gf_malloc(sizeof(GF_InitialObjectDescriptor));
@@ -115,7 +115,7 @@
 				isom_od->IPMP_Descriptors = NULL;
 				od->OCIDescriptors = isom_od->OCIDescriptors;
 				isom_od->OCIDescriptors = NULL;
-				
+
 				//init as IOD
 				if (isom_od->tag == GF_ODF_ISOM_IOD_TAG) {
 					((GF_InitialObjectDescriptor *)od)->audio_profileAndLevel = ((GF_IsomInitialObjectDescriptor *)isom_od)->audio_profileAndLevel;
@@ -127,10 +127,10 @@
 					((GF_InitialObjectDescriptor *)od)->IPMPToolList = ((GF_IsomInitialObjectDescriptor *)isom_od)->IPMPToolList;
 					((GF_IsomInitialObjectDescriptor *)isom_od)->IPMPToolList = NULL;
 				}
-				
+
 				//then rewrite the ESDesc
 				j=0;
-				while ((ref = (GF_ES_ID_Ref*)gf_list_enum(isom_od->ES_ID_RefDescriptors, &j))){
+				while ((ref = (GF_ES_ID_Ref*)gf_list_enum(isom_od->ES_ID_RefDescriptors, &j))) {
 					//if the ref index is not valid, skip this desc...
 					if (!mpod->trackIDs || gf_isom_get_track_from_id(mdia->mediaTrack->moov, mpod->trackIDs[ref->trackRef - 1]) == NULL) continue;
 					//OK, get the esd
@@ -324,7 +324,7 @@
 				//in OD stream only ref desc are accepted
 				isom_od->ES_ID_RefDescriptors = gf_list_new();
 				isom_od->ES_ID_IncDescriptors = NULL;
-	
+
 				//TO DO: check that a given sampleDescription exists
 				isom_od->extensionDescriptors = od->extensionDescriptors;
 				od->extensionDescriptors = NULL;
@@ -471,12 +471,13 @@
 			switch (desc->tag) {
 			case GF_ODF_OD_TAG:
 			case GF_ODF_IOD_TAG:
-				esd_list = ((GF_ObjectDescriptor *)desc)->ESDescriptors; break;
+				esd_list = ((GF_ObjectDescriptor *)desc)->ESDescriptors;
+				break;
 			default:
 				continue;
-			}	
+			}
 			j=0;
-			while ((esd = (GF_ESD*)gf_list_enum( esd_list, &j))){
+			while ((esd = (GF_ESD*)gf_list_enum( esd_list, &j))) {
 				if (esd->ESID==track_id) {
 					the_od_id = ((GF_IsomObjectDescriptor*)desc)->objectDescriptorID;
 					break;

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/meta.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/meta.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -83,7 +83,7 @@
 		}
 	}
 	if (!xml || !xml->xml || !xml->xml_length) return GF_BAD_PARAM;
-	
+
 	didfile = gf_f64_open(outName, "wb");
 	if (!didfile) return GF_IO_ERR;
 	gf_fwrite(xml->xml, xml->xml_length, 1, didfile);
@@ -125,10 +125,10 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_meta_item_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num, 
-							u32 *itemID, u32 *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_meta_item_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num,
+                                  u32 *itemID, 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_ItemInfoEntryBox *iinf;
 	u32 i, count;
@@ -137,7 +137,7 @@
 
 	iinf = (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, item_num-1);
 	if (!iinf) return GF_BAD_PARAM;
-	
+
 	if (itemID) (*itemID) = iinf->item_ID;
 	if (protection_idx) (*protection_idx) = iinf->item_protection_index;
 	if (item_name) (*item_name) = iinf->item_name;
@@ -165,9 +165,9 @@
 				GF_ItemExtentEntry *entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
 				if (!entry->extent_length
 #ifndef GPAC_DISABLE_ISOM_WRITE
-					&& !entry->original_extent_offset
+				        && !entry->original_extent_offset
 #endif
-					)
+				   )
 					*is_self_reference = 1;
 			}
 		}
@@ -204,7 +204,7 @@
 
 	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
 	if (!meta || !meta->item_infos || !meta->item_locations) return GF_BAD_PARAM;
-	
+
 	if (out_mime) *out_mime = NULL;
 
 	item_num = gf_isom_get_meta_item_by_id(file, root_meta, track_num, item_id);
@@ -212,7 +212,7 @@
 		GF_ItemInfoEntryBox *item_entry = (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, item_num-1);
 		item_name = item_entry->item_name;
 		if (out_mime) *out_mime = item_entry->content_type;
-	} 
+	}
 
 	location_entry = NULL;
 	count = gf_list_count(meta->item_locations->location_entries);
@@ -241,11 +241,11 @@
 	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);
-		if (!extent_entry->extent_length 
+		if (!extent_entry->extent_length
 #ifndef GPAC_DISABLE_ISOM_WRITE
-			&& !extent_entry->original_extent_offset
+		        && !extent_entry->original_extent_offset
 #endif
-			) return GF_BAD_PARAM;
+		   ) return GF_BAD_PARAM;
 	}
 
 	item_bs = NULL;
@@ -262,7 +262,7 @@
 		resource = gf_f64_open(szPath, "wb");
 		item_bs = gf_bs_from_file(resource, GF_BITSTREAM_WRITE);
 	}
-		
+
 	for (i=0; i<count; i++) {
 		char buf_cache[4096];
 		u64 remain;
@@ -282,7 +282,7 @@
 	}
 	if (resource) {
 		fclose(resource);
-	} 
+	}
 	gf_bs_del(item_bs);
 	return GF_OK;
 }
@@ -358,7 +358,7 @@
 		return GF_OK;
 	}
 
-	if (!meta->handler) 
+	if (!meta->handler)
 		meta->handler = (GF_HandlerBox *)hdlr_New();
 
 	if (meta->handler->nameUTF8) gf_free(meta->handler->nameUTF8);
@@ -530,7 +530,7 @@
 	}
 	memset(location_entry, 0, sizeof(GF_ItemLocationEntry));
 	location_entry->extent_entries = gf_list_new();
-		
+
 	/*Creates an mdat if it does not exist*/
 	if (!file->mdat) {
 		file->mdat = (GF_MediaDataBox *)mdat_New();
@@ -544,7 +544,7 @@
 		location_entry->item_ID = item_id;
 	} else {
 		location_entry->item_ID = lastItemID;
-	}	
+	}
 
 	if (!meta->item_infos) meta->item_infos = (GF_ItemInfoBox *) iinf_New();
 	e = gf_list_add(meta->item_infos->item_infos, infe);
@@ -667,7 +667,7 @@
 			if (iloc->data_reference_index) { }
 
 			gf_list_rem(meta->item_locations->location_entries, i);
-			gf_isom_box_del((GF_Box *)iloc);
+			iloc_entry_del(iloc);
 			break;
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/movie_fragments.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/movie_fragments.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,6 +40,17 @@
 	return NULL;
 }
 
+GF_TrackExtensionPropertiesBox *GetTrep(GF_MovieBox *moov, u32 TrackID)
+{
+	u32 i;
+	GF_TrackExtensionPropertiesBox *trep;
+	i=0;
+	while ((trep = (GF_TrackExtensionPropertiesBox*) gf_list_enum(moov->mvex->TrackExPropList, &i))) {
+		if (trep->trackID == TrackID) return trep;
+	}
+	return NULL;
+}
+
 GF_TrackFragmentBox *GetTraf(GF_ISOFile *mov, u32 TrackID)
 {
 	u32 i;
@@ -67,6 +78,7 @@
 	return GF_OK;
 }
 
+
 GF_EXPORT
 GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *movie, u32 media_segment_type)
 {
@@ -98,10 +110,36 @@
 		if (!movie->moov->mvex->mehd || !movie->moov->mvex->mehd->fragment_duration) {
 			//update durations
 			gf_isom_get_duration(movie);
-		} 
+		}
 
 		i=0;
 		while ((trex = (GF_TrackExtendsBox *)gf_list_enum(movie->moov->mvex->TrackExList, &i))) {
+			GF_TrackExtensionPropertiesBox *trep;
+			if (trex->type != GF_ISOM_BOX_TYPE_TREX) continue;
+			trep = GetTrep(movie->moov, trex->trackID);
+
+			if (!trep) {
+				trep = (GF_TrackExtensionPropertiesBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREP);
+				trep->trackID = trex->trackID;
+				gf_list_add(movie->moov->mvex->TrackExPropList, trep);
+			}
+
+			if (trex->track->Media->information->sampleTable->CompositionToDecode) {
+
+				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);
+					trex->track->Media->information->sampleTable->CompositionToDecode = NULL;
+				} else {
+					GF_CompositionToDecodeBox *cslg;
+
+					//clone it!
+					GF_SAFEALLOC(cslg, GF_CompositionToDecodeBox);
+					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);
+				}
+			}
+
 			if (movie->moov->mvex->mehd && movie->moov->mvex->mehd->fragment_duration) {
 				trex->track->Header->duration = 0;
 				Media_SetDuration(trex->track);
@@ -113,7 +151,7 @@
 		if (e) return e;
 	}
 
-	//make sure we do have all we need. If not this is not an error, just consider 
+	//make sure we do have all we need. If not this is not an error, just consider
 	//the file closed
 	if (!movie->moov->mvex || !gf_list_count(movie->moov->mvex->TrackExList)) return GF_OK;
 
@@ -123,7 +161,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-dependancies. The movie fragment spec
 		//is broken here, since it cannot allow dynamic insertion of new ESD and their
 		//dependancies
 	}
@@ -144,7 +182,7 @@
 	gf_isom_reset_alt_brands(movie);
 	/*
 		msdh: it's a media segment
-		sims: it's a media segment with an SSIX 
+		sims: it's a media segment with an SSIX
 		msix: it's a media segment with an index
 		lmsg: it's the last media segment
 	*/
@@ -152,13 +190,13 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_change_track_fragment_defaults(GF_ISOFile *movie, u32 TrackID, 
-							 u32 DefaultSampleDescriptionIndex,
-							 u32 DefaultSampleDuration,
-							 u32 DefaultSampleSize,
-							 u8 DefaultSampleIsSync,
-							 u8 DefaultSamplePadding,
-							 u16 DefaultDegradationPriority)
+GF_Err gf_isom_change_track_fragment_defaults(GF_ISOFile *movie, u32 TrackID,
+        u32 DefaultSampleDescriptionIndex,
+        u32 DefaultSampleDuration,
+        u32 DefaultSampleSize,
+        u8 DefaultSampleIsSync,
+        u8 DefaultSamplePadding,
+        u16 DefaultDegradationPriority)
 {
 	GF_MovieExtendsBox *mvex;
 	GF_TrackExtendsBox *trex;
@@ -186,13 +224,13 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_setup_track_fragment(GF_ISOFile *movie, u32 TrackID, 
-							 u32 DefaultSampleDescriptionIndex,
-							 u32 DefaultSampleDuration,
-							 u32 DefaultSampleSize,
-							 u8 DefaultSampleIsSync,
-							 u8 DefaultSamplePadding,
-							 u16 DefaultDegradationPriority)
+GF_Err gf_isom_setup_track_fragment(GF_ISOFile *movie, u32 TrackID,
+                                    u32 DefaultSampleDescriptionIndex,
+                                    u32 DefaultSampleDuration,
+                                    u32 DefaultSampleSize,
+                                    u8 DefaultSampleIsSync,
+                                    u8 DefaultSamplePadding,
+                                    u16 DefaultDegradationPriority)
 {
 	GF_MovieExtendsBox *mvex;
 	GF_TrackExtendsBox *trex;
@@ -385,13 +423,13 @@
 	u32 sampleCount, i, j, RunSize, UseDefaultSize, RunDur, UseDefaultDur, RunFlags, NeedFlags, UseDefaultFlag, UseCTS, count;
 	GF_TrackFragmentRunBox *trun;
 	GF_TrunEntry *ent, *first_ent;
-	
+
 	sampleCount = 0;
 
 #ifndef USE_BASE_DATA_OFFSET
 	if (movie->use_segments) {
 		traf->tfhd->flags = GF_ISOM_MOOF_BASE_OFFSET;
-	} else 
+	} else
 #endif
 	{
 		traf->tfhd->flags = GF_ISOM_TRAF_BASE_OFFSET;
@@ -434,7 +472,7 @@
 				first_ent = ent;
 				RunSize = ent->size;
 				RunDur = ent->Duration;
-			} 
+			}
 			//we may have one entry only ...
 			if (j || (count==1)) {
 				//flags are only after first entry
@@ -464,14 +502,14 @@
 			if (!UseDefaultSize) UseDefaultSize = 1;
 			else if (UseDefaultSize==2) RunSize = 0;
 		}
-		//we could check for single entry runs and set the default size in the tfhd but 
+		//we could check for single entry runs and set the default size in the tfhd but
 		//that's no bit saving...
 		else {
 			RunSize=0;
 		}
 
 		if (!RunSize) trun->flags |= GF_ISOM_TRUN_SIZE;
-		
+
 		//duration checking
 		if (RunDur && (traf->trex->def_sample_duration == RunDur)) {
 			if (!UseDefaultDur) UseDefaultDur = 2;
@@ -515,7 +553,7 @@
 		//CTS flag
 		if (UseCTS) trun->flags |= GF_ISOM_TRUN_CTS_OFFSET;
 
-		//run data offset if the offset indicated is 0 (first sample in this MDAT) don't 
+		//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;
 
@@ -539,17 +577,17 @@
 	GF_TrunEntry *ent;
 	GF_TrackFragmentBox *traf=NULL;
 	GF_TrackFragmentRunBox *trun;
+	sap_type = 0;
 	*sap_delta = 0;
-	*starts_with_sap = 0;
+	*starts_with_sap = GF_FALSE;
 	for (i=0; i<gf_list_count(moof->TrackList); i++) {
 		traf = gf_list_get(moof->TrackList, i);
 		if (traf->tfhd->trackID==refTrackID) break;
 		traf=NULL;
 	}
-	if (!traf) return 0;
+	if (!traf) return sap_type;
 	earliest_cts = 0;
 
-
 	/*first check if we have a roll/rap sample in this traf, and mark its sample count*/
 	sap_type = 0;
 	sap_sample_num = 0;
@@ -558,13 +596,12 @@
 	for (i=0; i<count; i++) {
 		GF_SampleGroupBox *sg;
 		u32 j, first_sample;
-		Bool rap_type = 0;
+		Bool rap_type = GF_FALSE;
 		sg = gf_list_get(traf->sampleGroups, i);
 
-
 		switch (sg->grouping_type) {
 		case GF_4CC('r','a','p',' '):
-			rap_type = 1;
+			rap_type = GF_TRUE;
 			break;
 		case GF_4CC('r','o','l','l'):
 			break;
@@ -579,7 +616,7 @@
 				continue;
 			}
 			if (!j) {
-				*starts_with_sap = 1;
+				*starts_with_sap = GF_TRUE;
 				sap_sample_num = 0;
 			}
 			if (!sap_sample_num || (sap_sample_num>first_sample)) {
@@ -601,7 +638,8 @@
 				if (!delta) earliest_cts = ent->CTS_Offset;
 				*sap_delta = delta + ent->CTS_Offset - ent->CTS_Offset;
 				*starts_with_sap = first;
-				return 1;
+				sap_type = ent->SAP_type;
+				return sap_type;
 			}
 		}
 		j=0;
@@ -611,7 +649,8 @@
 			if (GF_ISOM_GET_FRAG_SYNC(ent->flags)) {
 				*sap_delta = delta + ent->CTS_Offset - earliest_cts;
 				*starts_with_sap = first;
-				return 1;
+				sap_type = ent->SAP_type;
+				return sap_type;
 			}
 			/*we found our roll or rap sample*/
 			if (cur_sample==sap_sample_num) {
@@ -645,16 +684,16 @@
 	while ((trun = gf_list_enum(traf->TrackRuns, &i))) {
 		j=0;
 		while ((ent = gf_list_enum(trun->entries, &j))) {
-			if (ent->flags & GF_ISOM_TRAF_SAMPLE_DUR) 
+			if (ent->flags & GF_ISOM_TRAF_SAMPLE_DUR)
 				duration += ent->Duration;
-			else 
+			else
 				duration += traf->trex->def_sample_duration;
 		}
 	}
 	return duration;
 }
 
-u32 moof_get_earliest_cts(GF_MovieFragmentBox *moof, u32 refTrackID)
+static u32 moof_get_earliest_cts(GF_MovieFragmentBox *moof, u32 refTrackID)
 {
 	u32 i, j, cts, duration;
 	GF_TrunEntry *ent;
@@ -704,7 +743,7 @@
 		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
@@ -808,20 +847,20 @@
 	//4- Write moof
 	e = gf_isom_box_size((GF_Box *) movie->moof);
 	if (e) return e;
-	/*moof first, update traf headers - THIS WILL IMPACT THE MOOF SIZE IF WE 
+	/*moof first, update traf headers - THIS WILL IMPACT THE MOOF SIZE IF WE
 	DECIDE NOT TO USE THE DATA-OFFSET FLAG*/
-	if (movie->moof_first 
+	if (movie->moof_first
 #ifndef USE_BASE_DATA_OFFSET
-	&& !movie->use_segments
+	        && !movie->use_segments
 #endif
-	) {
+	   ) {
 		i=0;
 		while ((traf = (GF_TrackFragmentBox*)gf_list_enum(movie->moof->TrackList, &i))) {
 			/*offset increases by moof size*/
 			traf->tfhd->base_data_offset += movie->moof->size;
 			traf->tfhd->base_data_offset += data_offset_diff;
 		}
-	} 
+	}
 #ifndef USE_BASE_DATA_OFFSET
 	else if (movie->use_segments) {
 		if (offset != (movie->moof->size+8)) {
@@ -865,7 +904,7 @@
 	if (moof_size) *moof_size = (u32) movie->moof->size;
 
 	if (!movie->use_segments) {
-		gf_isom_box_del((GF_Box *) movie->moof);	
+		gf_isom_box_del((GF_Box *) movie->moof);
 		movie->moof = NULL;
 	}
 	return GF_OK;
@@ -954,7 +993,7 @@
 {
 	GF_BitStream *temp_bs = NULL;
 	GF_Err e;
-		
+
 	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;
 
@@ -1049,7 +1088,7 @@
 	GF_TrackBox *trak = NULL;
 	GF_Err e;
 	/*number of subsegment in this segment (eg nb references in the first SIDX found)*/
-	u32 nb_subsegs=0; 
+	u32 nb_subsegs=0;
 	/*number of subsegment per sidx (eg number of references of any sub-SIDX*/
 	u32 subseg_per_sidx;
 	/*number of fragments per subsegment*/
@@ -1104,7 +1143,7 @@
 	if (referenceTrackID) {
 		trak = gf_isom_get_track_from_id(movie->moov, referenceTrackID);
 	}
-	
+
 	if (subsegments_per_sidx < 0) {
 		referenceTrackID = 0;
 		subsegments_per_sidx = 0;
@@ -1117,7 +1156,7 @@
 	frags_per_subseg = 0;
 	subseg_per_sidx = 0;
 	frags_per_subsidx = 0;
-	
+
 	prev_earliest_cts = 0;
 
 	if (daisy_chain_sidx)
@@ -1156,9 +1195,9 @@
 			sidx->earliest_presentation_time = prev_earliest_cts;
 
 			/*if more subsegments requested than fragments available, make a single sidx*/
-			if ((s32) count <= subsegments_per_sidx) 
+			if ((s32) count <= subsegments_per_sidx)
 				subsegments_per_sidx = 0;
-			
+
 			if (daisy_chain_sidx && (subsegments_per_sidx<2))
 				subsegments_per_sidx = 2;
 
@@ -1177,7 +1216,7 @@
 			else if (daisy_chain_sidx) {
 				frags_per_subsidx = count/subsegments_per_sidx;
 				if (frags_per_subsidx * subsegments_per_sidx < count) frags_per_subsidx++;
-				
+
 				nb_subsegs = subsegments_per_sidx;
 
 				/*we consider that each fragment is a subsegment - this could be controled by another parameter*/
@@ -1186,12 +1225,12 @@
 				if (subseg_per_sidx * frags_per_subseg < frags_per_subsidx) subseg_per_sidx++;
 
 				sidx->nb_refs = subseg_per_sidx + 1;
-			} 
+			}
 			/*hierarchical SIDX*/
 			else {
 				frags_per_subsidx = count/subsegments_per_sidx;
 				if (frags_per_subsidx * subsegments_per_sidx < count) frags_per_subsidx++;
-				
+
 				nb_subsegs = subsegments_per_sidx;
 
 				/*we consider that each fragment is a subsegment - this could be controled by another parameter*/
@@ -1275,7 +1314,7 @@
 			sidx->refs = gf_malloc(sizeof(GF_SIDXReference)*sidx->nb_refs);
 			memset(sidx->refs, 0, sizeof(GF_SIDXReference)*sidx->nb_refs);
 
-			if (root_sidx) 
+			if (root_sidx)
 				root_sidx->refs[sidx_idx].reference_type = 1;
 
 			/*remember start of sidx*/
@@ -1347,7 +1386,7 @@
 				/*we are switching subsegment*/
 				frag_count--;
 
-				if (count==frags_per_subseg) {					
+				if (count==frags_per_subseg) {
 					count = 0;
 					first_frag_in_subseg = 1;
 					idx++;
@@ -1393,12 +1432,12 @@
 					cur_dur = 0;
 					count = 0;
 					idx=0;
-					if (movie->root_sidx) 
+					if (movie->root_sidx)
 						movie->root_sidx_index++;
 					sidx_idx++;
 				}
 			}
-		} 
+		}
 		gf_isom_box_del((GF_Box *) movie->moof);
 		movie->moof = NULL;
 	}
@@ -1418,7 +1457,7 @@
 			movie->root_sidx = NULL;
 		}
 		return GF_OK;
-	} 
+	}
 
 	if (sidx) {
 		assert(!root_sidx);
@@ -1464,7 +1503,7 @@
 
 	if ((root_sidx || sidx) && !daisy_chain_sidx) {
 		if (index_start_range) *index_start_range = sidx_start;
-		if (index_end_range) *index_end_range = sidx_end;
+		if (index_end_range) *index_end_range = sidx_end - 1;
 	}
 
 	if (movie->append_segment) {
@@ -1494,14 +1533,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_start_segment(GF_ISOFile *movie, char *SegName, Bool memory_mode)
+GF_Err gf_isom_start_segment(GF_ISOFile *movie, const char *SegName, Bool memory_mode)
 {
 	GF_Err e;
 	//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 (gf_list_count(movie->moof_list)) 
+	if (gf_list_count(movie->moof_list))
 		return GF_BAD_PARAM;
 
 	movie->segment_bs = NULL;
@@ -1547,12 +1586,12 @@
 	GF_TrackFragmentBox *traf;
 	GF_Err e;
 	//and only at setup
-	if (!movie || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) 
+	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;
 
 	count = gf_list_count(movie->moov->mvex->TrackExList);
-	if (!count) 
+	if (!count)
 		return GF_BAD_PARAM;
 
 	/*always force cached mode when writing movie segments*/
@@ -1564,13 +1603,13 @@
 		e = StoreFragment(movie, movie->use_segments ? 1 : 0, 0, NULL);
 		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);
 	movie->moof->mfhd->sequence_number = movie->NextMoofNumber;
 	movie->NextMoofNumber ++;
-	if (movie->use_segments) 
+	if (movie->use_segments)
 		gf_list_add(movie->moof_list, movie->moof);
 
 
@@ -1579,7 +1618,7 @@
 	/*prepare MDAT*/
 	gf_bs_write_u32(movie->editFileMap->bs, 0);
 	gf_bs_write_u32(movie->editFileMap->bs, GF_ISOM_BOX_TYPE_MDAT);
-	
+
 	//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);
@@ -1600,7 +1639,7 @@
 	GF_Box *a;
 	u32 i;
 	i = 0;
-	
+
 	while ((a = (GF_Box *)gf_list_enum(input->moov->other_boxes, &i))) {
 		if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
 			GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)pssh_New();
@@ -1631,8 +1670,8 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, u32 TrackID, GF_ISOSample *sample, u32 DescIndex, 
-								 u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding)
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, u32 TrackID, GF_ISOSample *sample, u32 DescIndex,
+                                   u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding)
 {
 	u32 count, buffer_size;
 	char *buffer;
@@ -1641,18 +1680,18 @@
 	GF_TrunEntry *ent;
 	GF_TrackFragmentBox *traf, *traf_2;
 	GF_TrackFragmentRunBox *trun;
-	if (!movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) || !sample) 
+	if (!movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) || !sample)
 		return GF_BAD_PARAM;
 
 	traf = GetTraf(movie, TrackID);
-	if (!traf) 
+	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;
 
 	pos = gf_bs_get_position(movie->editFileMap->bs);
 
-	
+
 	//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
@@ -1693,9 +1732,9 @@
 		//check data offset when no caching as trun entries shall ALWAYS be contiguous samples
 		if (!traf->DataCache && (movie->moof->fragment_offset + 8 + trun->data_offset + GetRunSize(trun) != pos) )
 			count = 0;
-		
+
 		//check I-frame detection
-		if (traf->tfhd->IFrameSwitching && sample->IsRAP) 
+		if (traf->tfhd->IFrameSwitching && sample->IsRAP)
 			count = 0;
 
 		if (traf->DataCache && (traf->DataCache==trun->sample_count) )
@@ -1720,7 +1759,7 @@
 		gf_list_add(traf->TrackRuns, trun);
 
 		//if we use data caching, create a bitstream
-		if (traf->DataCache) 
+		if (traf->DataCache)
 			trun->cache = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	}
 
@@ -1731,9 +1770,13 @@
 	ent->flags = GF_ISOM_FORMAT_FRAG_FLAGS(PaddingBits, sample->IsRAP, DegradationPriority);
 	if (sample->IsRAP) {
 		ent->flags |= GF_ISOM_GET_FRAG_DEPEND_FLAGS(0, 2, 0, (redundant_coding ? 1 : 0) );
+		ent->SAP_type = sample->IsRAP;
 	}
 	gf_list_add(trun->entries, ent);
-	
+
+	if (sample->CTS_Offset<0) {
+		trun->version = 1;
+	}
 	trun->sample_count += 1;
 
 	//rewrite OD frames
@@ -1940,7 +1983,7 @@
 			traf->subs = (GF_SubSampleInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SUBS);
 			traf->subs->version = 0;
 		}
-		
+
 
 		count = gf_list_count(sub_sample->SubSamples);
 		for (i=0; i<count; i++) {
@@ -1957,7 +2000,7 @@
 			u32 j;
 			u32 first_sample_in_entry, last_sample_in_entry;
 			first_sample_in_entry = 1;
-			
+
 			sg = gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
 			for (j=0; j<sg->entry_count; j++) {
 				last_sample_in_entry = first_sample_in_entry + sg->sample_entries[j].sample_count - 1;
@@ -1992,12 +2035,12 @@
 u32 gf_isom_is_fragmented(GF_ISOFile *movie)
 {
 	if (!movie || !movie->moov) return 0;
-    /* By default if the Moov has an mvex, the file is fragmented */
-    if (movie->moov->mvex) return 1;
-    /* deprecated old code */
+	/* 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;
+	return 0;
 }
 
 GF_EXPORT
@@ -2024,13 +2067,13 @@
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, u32 TrackID, 
-							 u32 DefaultSampleDescriptionIndex,
-							 u32 DefaultSampleDuration,
-							 u32 DefaultSampleSize,
-							 u8 DefaultSampleIsSync,
-							 u8 DefaultSamplePadding,
-							 u16 DefaultDegradationPriority)
+GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, u32 TrackID,
+                                    u32 DefaultSampleDescriptionIndex,
+                                    u32 DefaultSampleDuration,
+                                    u32 DefaultSampleSize,
+                                    u8 DefaultSampleIsSync,
+                                    u8 DefaultSamplePadding,
+                                    u16 DefaultDegradationPriority)
 {
 	return GF_NOT_SUPPORTED;
 }
@@ -2045,8 +2088,8 @@
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, GF_ISOSample *sample, u32 DescIndex, 
-								 u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redCoded)
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, GF_ISOSample *sample, u32 DescIndex,
+                                   u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redCoded)
 {
 	return GF_NOT_SUPPORTED;
 }

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/sample_descs.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/sample_descs.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -75,7 +75,7 @@
 {
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
-	
+
 	gf_bs_write_u16(bs, ptr->version);
 	gf_bs_write_u16(bs, ptr->revision);
 	gf_bs_write_u32(bs, ptr->vendor);
@@ -228,6 +228,29 @@
 	return res;
 }
 
+GF_EXPORT
+GF_Err gf_isom_stxt_info_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, char **mime, char **config)
+{
+	GF_TrackBox *trak;
+	GF_SimpleTextSampleEntryBox *entry;
+	*mime = NULL;
+	*config = NULL;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !StreamDescriptionIndex) return GF_BAD_PARAM;
+
+	entry = (GF_SimpleTextSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, StreamDescriptionIndex-1);
+	if (!entry || (entry->type!=GF_ISOM_BOX_TYPE_STXT)) return GF_BAD_PARAM;
+
+	if (entry->config) {
+		*config = entry->config->string;
+	}
+	if (entry->mime_type) {
+		*mime = entry->mime_type;
+	}
+	return GF_OK;
+}
+
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_EXPORT
@@ -240,7 +263,7 @@
 
 	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;
 
@@ -250,7 +273,7 @@
 		if (trak->Media->handler->handlerType!=GF_ISOM_MEDIA_AUDIO) return GF_BAD_PARAM;
 		cfg_type = GF_ISOM_BOX_TYPE_DAMR;
 		break;
-	case GF_ISOM_SUBTYPE_3GP_EVRC: 
+	case GF_ISOM_SUBTYPE_3GP_EVRC:
 		if (trak->Media->handler->handlerType!=GF_ISOM_MEDIA_AUDIO) return GF_BAD_PARAM;
 		cfg_type = GF_ISOM_BOX_TYPE_DEVC;
 		break;
@@ -266,7 +289,8 @@
 		if (trak->Media->handler->handlerType!=GF_ISOM_MEDIA_VISUAL) return GF_BAD_PARAM;
 		cfg_type = GF_ISOM_BOX_TYPE_D263;
 		break;
-	case 0: return GF_BAD_PARAM;
+	case 0:
+		return GF_BAD_PARAM;
 	default:
 		return GF_NOT_SUPPORTED;
 	}
@@ -301,7 +325,7 @@
 		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
 		*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
 	}
-		break;
+	break;
 	case GF_ISOM_SUBTYPE_3GP_H263:
 	{
 		GF_3GPPVisualSampleEntryBox *entry = (GF_3GPPVisualSampleEntryBox *) gf_isom_box_new(cfg->type);
@@ -316,7 +340,7 @@
 		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
 		*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
 	}
-		break;
+	break;
 	}
 	return e;
 }
@@ -330,7 +354,7 @@
 
 	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 || !param || !DescriptionIndex) return GF_BAD_PARAM;
 
@@ -366,7 +390,7 @@
 
 	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;
 
@@ -380,9 +404,15 @@
 	if (!the_file->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
-	entry = (GF_AC3SampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AC3);
-	if (!entry) return GF_OUT_OF_MEM;
-	entry->info = (GF_AC3ConfigBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DAC3);
+	if (cfg->is_ec3) {
+		entry = (GF_AC3SampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_EC3);
+		if (!entry) return GF_OUT_OF_MEM;
+		entry->info = (GF_AC3ConfigBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DEC3);
+	} else {
+		entry = (GF_AC3SampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AC3);
+		if (!entry) return GF_OUT_OF_MEM;
+		entry->info = (GF_AC3ConfigBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DAC3);
+	}
 	if (!entry->info) {
 		gf_isom_box_del((GF_Box *) entry);
 		return GF_OUT_OF_MEM;
@@ -437,7 +467,7 @@
 
 	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;
 
@@ -485,7 +515,7 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !desc || !DescriptionIndex) return GF_BAD_PARAM;
 
@@ -536,15 +566,24 @@
 	lsr->bitrate->bufferSizeDB = esd->decoderConfig->bufferSizeDB;
 
 	if (gf_list_count(esd->IPIDataSet)
-		|| gf_list_count(esd->IPMPDescriptorPointers)
-		|| esd->langDesc
-		|| gf_list_count(esd->extensionDescriptors)
-		|| esd->ipiPtr || esd->qos || esd->RegDescriptor) {
+	        || gf_list_count(esd->IPMPDescriptorPointers)
+	        || esd->langDesc
+	        || gf_list_count(esd->extensionDescriptors)
+	        || esd->ipiPtr || esd->qos || esd->RegDescriptor) {
 
 		lsr->descr = (GF_MPEG4ExtensionDescriptorsBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_M4DS);
-		if (esd->RegDescriptor) { gf_list_add(lsr->descr->descriptors, esd->RegDescriptor); esd->RegDescriptor = NULL; }
-		if (esd->qos) { gf_list_add(lsr->descr->descriptors, esd->qos); esd->qos = NULL; }
-		if (esd->ipiPtr) { gf_list_add(lsr->descr->descriptors, esd->ipiPtr); esd->ipiPtr= NULL; }
+		if (esd->RegDescriptor) {
+			gf_list_add(lsr->descr->descriptors, esd->RegDescriptor);
+			esd->RegDescriptor = NULL;
+		}
+		if (esd->qos) {
+			gf_list_add(lsr->descr->descriptors, esd->qos);
+			esd->qos = NULL;
+		}
+		if (esd->ipiPtr) {
+			gf_list_add(lsr->descr->descriptors, esd->ipiPtr);
+			esd->ipiPtr= NULL;
+		}
 
 		while (gf_list_count(esd->IPIDataSet)) {
 			GF_Descriptor *desc = (GF_Descriptor *)gf_list_get(esd->IPIDataSet, 0);

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/stbl_read.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/stbl_read.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -38,13 +38,13 @@
 	(*prevSampleNumber) = 0;
 
 	if (!stbl->CompositionOffset) useCTS = 0;
-	/*FIXME: CTS is ALWAYS disabled for now to make sure samples are fetched in 
+	/*FIXME: CTS is ALWAYS disabled for now to make sure samples are fetched in
 	decoding order. */
 	useCTS = 0;
 
 	//our cache
 	if (stbl->TimeToSample->r_FirstSampleInEntry &&
-		(DTS >= stbl->TimeToSample->r_CurrentDTS) ) {
+	        (DTS >= stbl->TimeToSample->r_CurrentDTS) ) {
 		//if we're using CTS, we don't really know whether we're in the good entry or not
 		//(eg, the real DTS of the sample could be in a previous entry
 		i = stbl->TimeToSample->r_currentEntryIndex;
@@ -107,7 +107,7 @@
 	if (curDTS + CTSOffset == DTS) {
 		(*sampleNumber) = curSampNum;
 	}
-	//if we match the exact DTS also select this sample 
+	//if we match the exact DTS also select this sample
 	else if (curDTS == DTS) {
 		(*sampleNumber) = curSampNum;
 	} else {
@@ -132,7 +132,7 @@
 		(*Size) = stsz->sampleSize;
 	} else if (stsz->sizes) {
 		(*Size) = stsz->sizes[SampleNumber - 1];
-	} 
+	}
 	return GF_OK;
 }
 
@@ -183,10 +183,10 @@
 	ent = NULL;
 	//use our cache
 	count = stts->nb_entries;
-	if (stts->r_FirstSampleInEntry 
-		&& (stts->r_FirstSampleInEntry <= SampleNumber)
-		//this is for read/write access
-		&& (stts->r_currentEntryIndex < count) ) {
+	if (stts->r_FirstSampleInEntry
+	        && (stts->r_FirstSampleInEntry <= SampleNumber)
+	        //this is for read/write access
+	        && (stts->r_currentEntryIndex < count) ) {
 
 		i = stts->r_currentEntryIndex;
 	} else {
@@ -203,7 +203,7 @@
 			j = SampleNumber - stts->r_FirstSampleInEntry;
 			goto found;
 		}
-			
+
 		//update our cache
 		stts->r_CurrentDTS += ent->sampleCount * ent->sampleDelta;
 		stts->r_currentEntryIndex += 1;
@@ -229,13 +229,13 @@
 	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, u8 *IsRAP, u32 *prevRAP, u32 *nextRAP)
+GF_Err stbl_GetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP)
 {
 	u32 i;
 	if (prevRAP) *prevRAP = 0;
 	if (nextRAP) *nextRAP = 0;
 
-	(*IsRAP) = 0;
+	(*IsRAP) = RAP_NO;
 	if (!stss || !SampleNumber) return GF_BAD_PARAM;
 
 	if (stss->r_LastSyncSample && (stss->r_LastSyncSample < SampleNumber) ) {
@@ -249,7 +249,7 @@
 			//update the cache
 			stss->r_LastSyncSample = SampleNumber;
 			stss->r_LastSampleIndex = i;
-			(*IsRAP) = 1;
+			(*IsRAP) = RAP;
 		}
 		else if (stss->sampleNumbers[i] > SampleNumber) {
 			if (nextRAP) *nextRAP = stss->sampleNumbers[i];
@@ -260,12 +260,12 @@
 	return GF_OK;
 }
 
-GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, u8 *IsRAP, u32 *prevRAP, u32 *nextRAP)
+GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP)
 {
 	u32 i, j, count, count2;
 	assert(prevRAP);
 	assert(nextRAP);
-	(*IsRAP) = 0;
+	(*IsRAP) = RAP_NO;
 
 	if (!stbl->sampleGroups || !stbl->sampleGroupsDescription) return GF_OK;
 
@@ -292,7 +292,7 @@
 			sgdp = NULL;
 		}
 		if (! sgdp) continue;
-			
+
 		first_sample_in_entry=1;
 		for (j=0; j<sg->entry_count; j++) {
 			u32 first_rap_in_entry, last_rap_in_entry;
@@ -329,17 +329,17 @@
 			if (nextRAP) {
 				*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)) {
-					(*IsRAP) = 1;
+					(*IsRAP) = RAP;
 					return GF_OK;
 				}
 			} else {
 				/*prevRAP or nextRAP matches SampleNumber, sample is RAP*/
 				if ((*prevRAP == SampleNumber) || (*nextRAP == SampleNumber)) {
-					(*IsRAP) = 1;
+					(*IsRAP) = RAP;
 					return GF_OK;
 				}
 			}
@@ -415,8 +415,8 @@
 
 	//check our cache
 	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];
@@ -439,7 +439,7 @@
 			//browse all the samples in this chunk
 			for (j = 0; j < ent->samplesPerChunk; j++) {
 				//ok, this is our sample
-				if (stbl->SampleToChunk->firstSampleInCurrentChunk + j == sampleNumber ) 
+				if (stbl->SampleToChunk->firstSampleInCurrentChunk + j == sampleNumber )
 					goto sample_found;
 			}
 			//nope, get to next chunk
@@ -539,7 +539,7 @@
 	if (!PadBits) return GF_BAD_PARAM;
 	*PadBits = 0;
 	if (!padb || !padb->padbits) return GF_OK;
-	//the spec says "should" not shall. return 0 padding 
+	//the spec says "should" not shall. return 0 padding
 	if (padb->SampleCount < SampleNumber) return GF_OK;
 	*PadBits = padb->padbits[SampleNumber-1];
 	return GF_OK;
@@ -573,7 +573,7 @@
 		stsf->r_currentEntryIndex = 0;
 	}
 	i = stsf->r_currentEntryIndex;
-	
+
 	count = gf_list_count(stsf->entryList);
 	for (; i<count; i++) {
 		ent = (GF_StsfEntry *)gf_list_get(stsf->entryList, i);

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/stbl_write.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/stbl_write.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -27,7 +27,7 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
-/*macro used for table gf_realloc - we allocate much more than needed in order to keep the number of 
+/*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);
 
@@ -242,7 +242,7 @@
 			sampNum ++;
 		}
 	}
-	
+
 	/*we will at most add 2 new entries (spliting of an existing one)*/
 	if (ctts->nb_entries+2>=ctts->alloc_size) {
 		ctts->alloc_size += 2;
@@ -265,7 +265,7 @@
 		}
 	}
 	gf_free(CTSs);
-	
+
 	/*we've inserted a sample, therefore the last sample (n) has now number n+1
 	we cannot use SampleCount because we have probably skipped some samples
 	(we're calling AddCTS only if the sample has a CTSOffset !!!)*/
@@ -309,7 +309,7 @@
 	ctts->entries = NULL;
 	ctts->nb_entries = 0;
 	ctts->alloc_size = 0;
-	for (i=0;i<count; i++) {
+	for (i=0; i<count; i++) {
 		for (j=0; j<packed[i].sampleCount; j++) {
 			if (ctts->nb_entries == ctts->alloc_size) {
 				ALLOC_INC(ctts->alloc_size);
@@ -474,7 +474,7 @@
 		sdtp->sample_info = (u8*) gf_realloc(sdtp->sample_info, sizeof(u8) * (sdtp->sampleCount+missed) );
 		memset(&sdtp->sample_info[sdtp->sampleCount], 0, sizeof(u8) * missed );
 		while (missed) {
-			u8 isRAP;
+			SAPType 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;
@@ -497,6 +497,29 @@
 	return GF_OK;
 }
 
+GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 dependsOn, u32 dependedOn, u32 redundant)
+{
+	GF_SampleDependencyTypeBox *sdtp;
+	u32 flags;
+	if (stbl->SampleDep == NULL) {
+		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SDTP);
+		if (!stbl->SampleDep) return GF_OUT_OF_MEM;
+	}
+	sdtp = stbl->SampleDep;
+
+	flags = 0;
+	flags |= dependsOn << 4;
+	flags |= dependedOn << 2;
+	flags |= redundant;
+
+
+	sdtp->sample_info = (u8*) gf_realloc(sdtp->sample_info, sizeof(u8) * (sdtp->sampleCount + 1));
+	if (!sdtp->sample_info) return GF_OUT_OF_MEM;
+	sdtp->sample_info[sdtp->sampleCount] = flags;
+	sdtp->sampleCount ++;
+	return GF_OK;
+}
+
 //this function is always called in INCREASING order of shadow sample numbers
 GF_Err stbl_AddShadow(GF_ShadowSyncBox *stsh, u32 sampleNumber, u32 shadowNumber)
 {
@@ -549,7 +572,7 @@
 			co64->offsets = (u64*)gf_malloc(sizeof(u64) * co64->nb_entries);
 			if (!co64->offsets) return GF_OUT_OF_MEM;
 			k = 0;
-			for (i=0;i<stco->nb_entries; i++) {
+			for (i=0; i<stco->nb_entries; i++) {
 				if (i + 1 == sampleNumber) {
 					co64->offsets[i] = offset;
 					k = 1;
@@ -643,7 +666,7 @@
 	//OK, now if we've inserted a chunk, update the sample to chunk info...
 	if (sampleNumber == stsc->nb_entries + 1) {
 		ent->nextChunk = stsc->nb_entries + 1;
-		if (stsc->nb_entries) 
+		if (stsc->nb_entries)
 			stsc->entries[stsc->nb_entries-1].nextChunk = ent->firstChunk;
 
 		stbl->SampleToChunk->currentIndex = stsc->nb_entries;
@@ -688,7 +711,7 @@
 			co64->alloc_size = co64->nb_entries;
 			co64->offsets = (u64*)gf_malloc(sizeof(u64)*co64->nb_entries);
 			if (!co64->offsets) return GF_OUT_OF_MEM;
-			for (i=0;i<co64->nb_entries; i++) {
+			for (i=0; i<co64->nb_entries; i++) {
 				co64->offsets[i] = (u64) ((GF_ChunkOffsetBox *)stbl->ChunkOffset)->offsets[i];
 			}
 			co64->offsets[ent->firstChunk - 1] = offset;
@@ -830,7 +853,7 @@
 
 	stts = stbl->TimeToSample;
 
-	//we're removing the only sample: empty the sample table 
+	//we're removing the only sample: empty the sample table
 	if (stbl->SampleSize->sampleCount == 1) {
 		stts->nb_entries = 0;
 		stts->r_FirstSampleInEntry = stts->r_currentEntryIndex = 0;
@@ -870,15 +893,19 @@
 		} else {
 			stts->entries[0].sampleDelta = (u32) DTSs[1] /*- DTS[0]==0 */;
 		}
-		for (i=0; i<stbl->SampleSize->sampleCount-1; i++) {
+		for (i=1; i<stbl->SampleSize->sampleCount-1; i++) {
 			if (i+1 == stbl->SampleSize->sampleCount-1) {
 				//and by default, our last sample has the same delta as the prev
-	//			stts->entries[j].sampleCount++;
+				//			stts->entries[j].sampleCount++;
 			} else if (DTSs[i+1] - DTSs[i] == stts->entries[j].sampleDelta) {
 				stts->entries[j].sampleCount += 1;
 			} else {
-				j++;
 				stts->nb_entries++;
+				if (j+1==stts->alloc_size) {
+					stts->alloc_size++;
+					stts->entries = gf_realloc(stts->entries, sizeof(GF_SttsEntry) * stts->alloc_size);
+				}
+				j++;
 				stts->entries[j].sampleCount = 1;
 				stts->entries[j].sampleDelta = (u32) (DTSs[i+1] - DTSs[i]);
 			}
@@ -1031,20 +1058,19 @@
 		stss->alloc_size = stss->nb_entries = 0;
 		return GF_OK;
 	}
-	//the real pain is that we may actually not have to change anything..
+
 	for (i=0; i<stss->nb_entries; i++) {
-		if (sampleNumber == stss->sampleNumbers[i]) goto found;
-	}
-	//nothing to do
-	return GF_OK;
+		//found the sample
+		if (sampleNumber == stss->sampleNumbers[i]) {
+			memmove(&stss->sampleNumbers[i], &stss->sampleNumbers[i+1], sizeof(u32)* (stss->nb_entries-i-1) );
+			stss->nb_entries--;
+		}
 
-found:
-	//a small opt: the sample numbers are in order...
-	i++;
-	for (;i<stss->nb_entries; i++) {
-		stss->sampleNumbers[i-1] = stss->sampleNumbers[i];
+		if (sampleNumber < stss->sampleNumbers[i]) {
+			assert(stss->sampleNumbers[i]);
+			stss->sampleNumbers[i]--;
+		}
 	}
-	stss->nb_entries -= 1;
 	return GF_OK;
 }
 
@@ -1141,7 +1167,7 @@
 			k++;
 		}
 	}
-	
+
 	stbl->PaddingBits->SampleCount -= 1;
 	gf_free(stbl->PaddingBits->padbits);
 	stbl->PaddingBits->padbits = p;
@@ -1154,7 +1180,7 @@
 	GF_Err e;
 	u32 i, count;
 	GF_StsfEntry *ent;
-	GF_SampleFragmentBox *stsf;		
+	GF_SampleFragmentBox *stsf;
 	stsf = stbl->Fragments;
 
 	if (!stsf) {
@@ -1242,7 +1268,7 @@
 {
 	u32 i;
 	if (!stsz || !stsz->sampleCount) return GF_BAD_PARAM;
-	
+
 	//we must realloc our table
 	if (stsz->sampleSize) {
 		stsz->sizes = (u32*)gf_malloc(sizeof(u32)*stsz->sampleCount);
@@ -1307,7 +1333,7 @@
 		memset(&stbl->SampleSize->sizes[stbl->SampleSize->sampleCount], 0, sizeof(u32) * (stbl->SampleSize->alloc_size - stbl->SampleSize->sampleCount) );
 
 		if (init_table) {
-			for (i=0; i<stbl->SampleSize->sampleCount;i++) 
+			for (i=0; i<stbl->SampleSize->sampleCount; i++)
 				stbl->SampleSize->sizes[i] = stbl->SampleSize->sampleSize;
 		}
 	}
@@ -1374,7 +1400,7 @@
 	if (stsc->nb_entries) {
 		ent = &stsc->entries[stsc->nb_entries-1];
 		//good we can use this one
-		if ( (ent->sampleDescriptionIndex == DescIndex) && (ent->samplesPerChunk==samplesInChunk)) 
+		if ( (ent->sampleDescriptionIndex == DescIndex) && (ent->samplesPerChunk==samplesInChunk))
 			return;
 
 		//set the next chunk btw ...
@@ -1410,7 +1436,7 @@
 		if (stbl->SampleSize->sampleCount > 1) {
 			stbl->SyncSample->sampleNumbers = (u32*)gf_malloc(sizeof(u32) * (stbl->SampleSize->sampleCount-1));
 			if (!stbl->SyncSample->sampleNumbers) return;
-			for (i=0; i<stbl->SampleSize->sampleCount-1; i++) 
+			for (i=0; i<stbl->SampleSize->sampleCount-1; i++)
 				stbl->SyncSample->sampleNumbers[i] = i+1;
 
 		}
@@ -1451,10 +1477,10 @@
 	GF_CompositionOffsetBox *ctts;
 
 	if (!stbl->CompositionOffset) stbl->CompositionOffset = (GF_CompositionOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CTTS);
-	
+
 	ctts = stbl->CompositionOffset;
 
-	if (ctts->nb_entries && (ctts->entries[ctts->nb_entries-1].decodingOffset == CTSOffset) ){
+	if (ctts->nb_entries && (ctts->entries[ctts->nb_entries-1].decodingOffset == CTSOffset) ) {
 		ctts->entries[ctts->nb_entries-1].sampleCount++;
 		return;
 	}
@@ -1571,7 +1597,7 @@
 	}
 	//close the list
 	if (ent) ent->nextChunk = 0;
-	
+
 
 	//done, remove our previous tables
 	gf_isom_box_del(stbl->ChunkOffset);
@@ -1652,7 +1678,7 @@
 
 //This function packs the offset after easy editing, eg samples
 //are re-arranged in chunks according to the chunkOffsets
-//NOTE: this has to be called once interleaving or whatever is done and 
+//NOTE: this has to be called once interleaving or whatever is done and
 //the final MDAT is written!!!
 GF_Err stbl_SetChunkAndOffset(GF_SampleTableBox *stbl, u32 sampleNumber, u32 StreamDescIndex, GF_SampleToChunkBox *the_stsc, GF_Box **the_stco, u64 data_offset, u8 forceNewChunk)
 {
@@ -1677,10 +1703,10 @@
 		newChunk = 1;
 	} else {
 		cur_ent = &the_stsc->entries[the_stsc->nb_entries - 1];
-	//3 - make sure we do not exceed the MaxSamplesPerChunk and we have the same descIndex
-		if (StreamDescIndex != cur_ent->sampleDescriptionIndex) 
+		//3 - make sure we do not exceed the MaxSamplesPerChunk and we have the same descIndex
+		if (StreamDescIndex != cur_ent->sampleDescriptionIndex)
 			newChunk = 1;
-		if (stbl->MaxSamplePerChunk && cur_ent->samplesPerChunk == stbl->MaxSamplePerChunk) 
+		if (stbl->MaxSamplePerChunk && cur_ent->samplesPerChunk == stbl->MaxSamplePerChunk)
 			newChunk = 1;
 	}
 
@@ -1695,8 +1721,8 @@
 	if (the_stsc->nb_entries > 1) {
 		ent = &the_stsc->entries[the_stsc->nb_entries - 2];
 		if ( (ent->sampleDescriptionIndex == cur_ent->sampleDescriptionIndex)
-			&& (ent->samplesPerChunk == cur_ent->samplesPerChunk)
-			) {
+		        && (ent->samplesPerChunk == cur_ent->samplesPerChunk)
+		   ) {
 			//OK, it's the same SampleToChunk, so delete it
 			ent->nextChunk = cur_ent->firstChunk;
 			the_stsc->nb_entries--;

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/track.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/track.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -88,7 +88,7 @@
 	if (e) return e;
 	//set the ID
 	esd->ESID = trackID;
-	
+
 	//find stream dependencies
 	e = Track_FindRef(trak, GF_ISOM_BOX_TYPE_DPND , &dpnd);
 	if (e) return e;
@@ -175,12 +175,14 @@
 	}
 
 	if ((trak->Media->mediaHeader->packedLanguage[0] != 'u')
-		|| (trak->Media->mediaHeader->packedLanguage[1] != 'n')
-		|| (trak->Media->mediaHeader->packedLanguage[2] != 'd') ) {
+	        || (trak->Media->mediaHeader->packedLanguage[1] != 'n')
+	        || (trak->Media->mediaHeader->packedLanguage[2] != 'd') ) {
 		if (!esd->langDesc) esd->langDesc = (GF_Language *) gf_odf_desc_new(GF_ODF_LANG_TAG);
 
-		esd->langDesc->langCode = trak->Media->mediaHeader->packedLanguage[0]; esd->langDesc->langCode <<= 8;
-		esd->langDesc->langCode |= trak->Media->mediaHeader->packedLanguage[1]; esd->langDesc->langCode <<= 8;
+		esd->langDesc->langCode = trak->Media->mediaHeader->packedLanguage[0];
+		esd->langDesc->langCode <<= 8;
+		esd->langDesc->langCode |= trak->Media->mediaHeader->packedLanguage[1];
+		esd->langDesc->langCode <<= 8;
 		esd->langDesc->langCode |= trak->Media->mediaHeader->packedLanguage[2];
 	}
 
@@ -239,7 +241,7 @@
 		return GF_OK;
 	}
 	//otherwise use the regular mapping
-	
+
 	//this is a desc for a media in the file, let's rewrite some param
 	esd->slConfig->timestampLength = 32;
 	esd->slConfig->timestampResolution = trak->Media->mediaHeader->timeScale;
@@ -249,7 +251,7 @@
 //	if (OCRTrack) esd->slConfig->OCRResolution = OCRTrack->Media->mediaHeader->timeScale;
 
 	stbl = trak->Media->information->sampleTable;
-	// a little optimization here: if all our samples are sync, 
+	// a little optimization here: if all our samples are sync,
 	//set the RAPOnly to true... for external users...
 	if (! stbl->SyncSample) {
 		if (moov->mvex && (esd->decoderConfig->streamType==GF_STREAM_VISUAL)) {
@@ -304,7 +306,7 @@
 
 	trak = gf_isom_get_track(moov, gf_isom_get_tracknum_from_id(moov, trackID));
 	if (!trak) return GF_ISOM_INVALID_FILE;
-	
+
 	e = Media_GetSampleDescIndex(trak->Media, CTS, &sampleDescIndex );
 	if (e) return e;
 	return GetESD(moov, trackID, sampleDescIndex, outESD);
@@ -330,7 +332,7 @@
 		}
 	}
 	*dpnd = NULL;
-	return GF_OK;	
+	return GF_OK;
 }
 
 Bool Track_IsMPEG4Stream(u32 HandlerType)
@@ -338,7 +340,7 @@
 	switch (HandlerType) {
 	case GF_ISOM_MEDIA_VISUAL:
 	case GF_ISOM_MEDIA_AUDIO:
-    case GF_ISOM_MEDIA_SUBPIC:
+	case GF_ISOM_MEDIA_SUBPIC:
 	case GF_ISOM_MEDIA_OD:
 	case GF_ISOM_MEDIA_OCR:
 	case GF_ISOM_MEDIA_SCENE:
@@ -374,7 +376,7 @@
 	if (!trak->moov->mvhd->timeScale || !trak->Media->mediaHeader->timeScale) return GF_ISOM_INVALID_FILE;
 	trackDuration = (trak->Media->mediaHeader->duration * trak->moov->mvhd->timeScale) / trak->Media->mediaHeader->timeScale;
 
-	//if we have an edit list, the duration is the sum of all the editList 
+	//if we have an edit list, the duration is the sum of all the editList
 	//entries' duration (always expressed in MovieTimeScale)
 	if (trak->editBox && trak->editBox->editList) {
 		trackDuration = 0;
@@ -398,10 +400,11 @@
 
 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;
 	char *buf1, *buf2;
 	u32 len1, len2;
-	Bool res = GF_FALSE;
 
 	if (!ptr1 || !ptr2)
 		return GF_FALSE;
@@ -422,7 +425,7 @@
 		sgpd_Write((GF_Box *)ptr2, bs2);
 	}
 	gf_bs_get_content(bs2, &buf2, &len2);
-	gf_bs_del(bs2);	
+	gf_bs_del(bs2);
 
 
 	if ((len1==len2) && !memcmp(buf1, buf2, len1))
@@ -430,7 +433,7 @@
 
 	gf_free(buf1);
 	gf_free(buf2);
-
+#endif
 	return res;
 }
 
@@ -453,8 +456,9 @@
 	void stbl_AppendRAP(GF_SampleTableBox *stbl, u8 isRap);
 	void stbl_AppendPadding(GF_SampleTableBox *stbl, u8 padding);
 	void stbl_AppendDegradation(GF_SampleTableBox *stbl, u16 DegradationPriority);
+	GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 dependsOn, u32 dependedOn, u32 redundant);
 
-    if (trak->Header->trackID != traf->tfhd->trackID) return GF_OK;
+	if (trak->Header->trackID != traf->tfhd->trackID) return GF_OK;
 
 	//setup all our defaults
 	DescIndex = (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_DESC) ? traf->tfhd->sample_desc_index : traf->trex->def_sample_desc_index;
@@ -471,7 +475,7 @@
 	/*in playback mode*/
 	if (traf->tfdt && is_first_merge) {
 #ifndef GPAC_DISABLE_LOG
-		if (trak->present_in_scalable_segment && trak->sample_count_at_seg_start && (trak->dts_at_seg_start != traf->tfdt->baseMediaDecodeTime)) {
+		if (trak->moov->mov->NextMoofNumber && trak->present_in_scalable_segment && trak->sample_count_at_seg_start && (trak->dts_at_seg_start != traf->tfdt->baseMediaDecodeTime)) {
 			s32 drift = (s32) ((s64) traf->tfdt->baseMediaDecodeTime - (s64)trak->dts_at_seg_start);
 			if (drift<0)  {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: TFDT timing "LLD" less than cumulated timing "LLD" - using tfdt\n", traf->tfdt->baseMediaDecodeTime, trak->dts_at_seg_start ));
@@ -486,12 +490,12 @@
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
 		//merge the run
-		for (j=0;j<trun->sample_count; j++) {
+		for (j=0; j<trun->sample_count; j++) {
 			ent = (GF_TrunEntry*)gf_list_get(trun->entries, j);
 			size = def_size;
 			duration = def_duration;
 			flags = def_flags;
-			
+
 			if (ent) {
 				if (trun->flags & GF_ISOM_TRUN_DURATION) duration = ent->Duration;
 				if (trun->flags & GF_ISOM_TRUN_SIZE) size = ent->size;
@@ -509,7 +513,7 @@
 			if (!j) {
 				data_offset = base_offset;
 				//aggregated offset if base-data-offset-present is not set AND if default-base-is-moof is not set
-				if (!(traf->tfhd->flags & GF_ISOM_TRAF_BASE_OFFSET) && !(traf->tfhd->flags & GF_ISOM_MOOF_BASE_OFFSET) ) 
+				if (!(traf->tfhd->flags & GF_ISOM_TRAF_BASE_OFFSET) && !(traf->tfhd->flags & GF_ISOM_MOOF_BASE_OFFSET) )
 					data_offset += chunk_size;
 
 				if (trun->flags & GF_ISOM_TRUN_DATA_OFFSET) {
@@ -524,16 +528,16 @@
 				}
 				stbl_AppendChunk(trak->Media->information->sampleTable, data_offset);
 				//then sampleToChunk
-				stbl_AppendSampleToChunk(trak->Media->information->sampleTable, 
-					DescIndex, trun->sample_count);
+				stbl_AppendSampleToChunk(trak->Media->information->sampleTable,
+				                         DescIndex, trun->sample_count);
 			}
 			chunk_size += size;
-			
+
 
 			//CTS
 			cts_offset = (trun->flags & GF_ISOM_TRUN_CTS_OFFSET) ? ent->CTS_Offset : 0;
 			stbl_AppendCTSOffset(trak->Media->information->sampleTable, cts_offset);
-			
+
 			//flags
 			sync = GF_ISOM_GET_FRAG_SYNC(flags);
 			if (trak->Media->information->sampleTable->no_sync_found && sync) {
@@ -544,6 +548,8 @@
 			if (pad) stbl_AppendPadding(trak->Media->information->sampleTable, pad);
 			degr = GF_ISOM_GET_FRAG_DEG(flags);
 			if (degr) stbl_AppendDegradation(trak->Media->information->sampleTable, degr);
+
+			stbl_AppendDependencyType(trak->Media->information->sampleTable, GF_ISOM_GET_FRAG_DEPENDS(flags), GF_ISOM_GET_FRAG_DEPENDED(flags), GF_ISOM_GET_FRAG_REDUNDANT(flags));
 		}
 	}
 	/*merge sample groups*/
@@ -612,7 +618,7 @@
 
 		groups = trak->Media->information->sampleTable->sampleGroups;
 		for (i=0; i<gf_list_count(traf->sampleGroups); i++) {
-			GF_SampleGroupBox *stbl_group = NULL; 
+			GF_SampleGroupBox *stbl_group = NULL;
 			GF_SampleGroupBox *frag_group = gf_list_get(traf->sampleGroups, i);
 
 
@@ -634,9 +640,9 @@
 				//adjust sgpd index: in traf index start at 0x1001
 				for (j = 0; j < frag_group->entry_count; j++)
 					frag_group->sample_entries[j].group_description_index &= 0x0FFFF;
-				if (frag_group->entry_count && stbl_group->entry_count && 
-					(frag_group->sample_entries[0].group_description_index==stbl_group->sample_entries[stbl_group->entry_count-1].group_description_index) 
-				) {
+				if (frag_group->entry_count && stbl_group->entry_count &&
+				        (frag_group->sample_entries[0].group_description_index==stbl_group->sample_entries[stbl_group->entry_count-1].group_description_index)
+				   ) {
 					stbl_group->sample_entries[stbl_group->entry_count - 1].sample_count += frag_group->sample_entries[0].sample_count;
 					if (frag_group->entry_count>1) {
 						stbl_group->sample_entries = gf_realloc(stbl_group->sample_entries, sizeof(GF_SampleGroupEntry) * (stbl_group->entry_count + frag_group->entry_count - 1));
@@ -679,7 +685,7 @@
 				if (!trak->Media->information->sampleTable->other_boxes) trak->Media->information->sampleTable->other_boxes = gf_list_new();
 				gf_list_add(trak->Media->information->sampleTable->other_boxes, senc);
 			}
-			
+
 			sais = traf->piff_sample_encryption->samp_aux_info;
 		}
 		else if (traf->sample_encryption) {
@@ -713,21 +719,23 @@
 
 			for (i = 0; i < gf_list_count(traf->sai_offsets); i++) {
 				saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(traf->sai_offsets, i);
-				if (saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
+				/*if we have only 1 sai_offsets, assume that its type is cenc*/
+				if ((saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) || (gf_list_count(traf->sai_offsets) == 1)) {
 					offset = saio->offsets[0] + moof_offset;
 					nb_saio = saio->entry_count;
 					break;
-				}			
+				}
 			}
 			for (i = 0; i < gf_list_count(traf->sai_sizes); i++) {
 				saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(traf->sai_sizes, i);
-				if (saiz->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
+				/*if we have only 1 sai_sizes, assume that its type is cenc*/
+				if ((saiz->aux_info_type == GF_4CC('c', 'e', 'n', 'c'))  || (gf_list_count(traf->sai_sizes) == 1)) {
 					break;
 				}
 			}
 			if (saiz) {
 				for (i = 0; i < saiz->sample_count; i++) {
-					if (nb_saio != 1) 
+					if (nb_saio != 1)
 						offset = saio->offsets[i] + moof_offset;
 					size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[i];
 
@@ -753,7 +761,7 @@
 					if (sai->subsample_count) senc->flags = 0x00000002;*/
 					gf_isom_cenc_merge_saiz_saio(senc, trak->Media->information->sampleTable, (u32)offset, size);
 					if (nb_saio == 1)
-						offset += size;				
+						offset += size;
 				}
 			}
 		} else if (sais) {
@@ -813,7 +821,7 @@
 			return GF_OK;
 		}
 	}
-	return GF_OK;	
+	return GF_OK;
 }
 
 GF_Err NewMedia(GF_MediaBox **mdia, u32 MediaType, u32 TimeScale)
@@ -928,15 +936,22 @@
 
 	//Create a data reference WITHOUT DATA ENTRY (we don't know anything yet about the media Data)
 	dref = (GF_DataReferenceBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DREF);
-	e = dinf_AddBox((GF_Box*)dinf, (GF_Box *)dref); if (e) goto err_exit;
-
-	e = minf_AddBox((GF_Box*)minf, (GF_Box *) mediaInfo); if (e) goto err_exit;
-	e = minf_AddBox((GF_Box*)minf, (GF_Box *) stbl); if (e) goto err_exit;
-	e = minf_AddBox((GF_Box*)minf, (GF_Box *) dinf); if (e) goto err_exit;
-
-	e = mdia_AddBox((GF_Box*)*mdia, (GF_Box *) mdhd); if (e) goto err_exit;
-	e = mdia_AddBox((GF_Box*)*mdia, (GF_Box *) minf); if (e) goto err_exit;
-	e = mdia_AddBox((GF_Box*)*mdia, (GF_Box *) hdlr); if (e) goto err_exit;
+	e = dinf_AddBox((GF_Box*)dinf, (GF_Box *)dref);
+	if (e) goto err_exit;
+
+	e = minf_AddBox((GF_Box*)minf, (GF_Box *) mediaInfo);
+	if (e) goto err_exit;
+	e = minf_AddBox((GF_Box*)minf, (GF_Box *) stbl);
+	if (e) goto err_exit;
+	e = minf_AddBox((GF_Box*)minf, (GF_Box *) dinf);
+	if (e) goto err_exit;
+
+	e = mdia_AddBox((GF_Box*)*mdia, (GF_Box *) mdhd);
+	if (e) goto err_exit;
+	e = mdia_AddBox((GF_Box*)*mdia, (GF_Box *) minf);
+	if (e) goto err_exit;
+	e = mdia_AddBox((GF_Box*)*mdia, (GF_Box *) hdlr);
+	if (e) goto err_exit;
 
 	return GF_OK;
 
@@ -967,7 +982,7 @@
 	if (!trak || !esd || (!outStreamIndex && !DataReferenceIndex) ) return GF_BAD_PARAM;
 	if (!Track_IsMPEG4Stream(trak->Media->handler->handlerType)) return GF_ISOM_INVALID_MEDIA;
 
-	
+
 	esd->ESID = 0;
 	//set SL to predefined if no url
 	if (esd->URLString == NULL) {
@@ -1084,12 +1099,13 @@
 		case GF_ISOM_BOX_TYPE_AVC3:
 		case GF_ISOM_BOX_TYPE_AVC4:
 		case GF_ISOM_BOX_TYPE_SVC1:
-		case GF_ISOM_BOX_TYPE_HVC1: 
-		case GF_ISOM_BOX_TYPE_HEV1: 
+		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_SHC1:
 		case GF_ISOM_BOX_TYPE_SHV1:
+		case GF_ISOM_BOX_TYPE_HVT1:
 			e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry, esd);
 			if (e) return e;
 			break;
@@ -1097,13 +1113,13 @@
 			e = LSR_UpdateESD((GF_LASeRSampleEntryBox*)entry, esd);
 			if (e) return e;
 			break;
-		case GF_ISOM_BOX_TYPE_STSE:
+		case GF_ISOM_BOX_TYPE_STXT:
 		case GF_ISOM_BOX_TYPE_WVTT:
 		case GF_ISOM_BOX_TYPE_STPP:
-            /* TODO */
-            assert(0);
+			/* TODO */
+			assert(0);
 			break;
-			
+
 		default:
 			//gf_odf_desc_del((GF_Descriptor *) esd);
 			break;
@@ -1120,7 +1136,7 @@
 		//OK, check the handler and create the entry
 		switch (trak->Media->handler->handlerType) {
 		case GF_ISOM_MEDIA_VISUAL:
-			if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)){
+			if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
 				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AVC1);
 				if (!entry_v) return GF_OUT_OF_MEM;
 				e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry_v, esd);
@@ -1128,7 +1144,7 @@
 				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_HVC1);
 				if (!entry_v) return GF_OUT_OF_MEM;
 				e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry_v, esd);
-				
+
 			} else {
 				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MP4V);
 				if (!entry_v) return GF_OUT_OF_MEM;

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/ttml.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/ttml.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -31,48 +31,49 @@
 
 #ifndef GPAC_DISABLE_TTML
 
-GF_Box *stpp_New() 
+GF_Box *stpp_New()
 {
-    ISOM_DECL_BOX_ALLOC(GF_XMLSubtitleSampleEntryBox, GF_ISOM_BOX_TYPE_STPP);
+	ISOM_DECL_BOX_ALLOC(GF_XMLSubtitleSampleEntryBox, GF_ISOM_BOX_TYPE_STPP);
 	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
-    return (GF_Box *)tmp;
+	return (GF_Box *)tmp;
 }
 
 void stpp_del(GF_Box *s)
 {
-    GF_XMLSubtitleSampleEntryBox *stpp= (GF_XMLSubtitleSampleEntryBox *)s;
+	GF_XMLSubtitleSampleEntryBox *stpp= (GF_XMLSubtitleSampleEntryBox *)s;
 	if (stpp == NULL) return;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
-    if (stpp->xmlnamespace) gf_free(stpp->xmlnamespace);
-    if (stpp->schema_location) gf_free(stpp->schema_location);
-    if (stpp->auxiliary_mime_types) gf_free(stpp->auxiliary_mime_types);
-    gf_free(s);
+	btrt_del((GF_Box*)stpp->bitrate);
+	if (stpp->xmlnamespace) gf_free(stpp->xmlnamespace);
+	if (stpp->schema_location) gf_free(stpp->schema_location);
+	if (stpp->auxiliary_mime_types) gf_free(stpp->auxiliary_mime_types);
+	gf_free(s);
 }
 
 static GF_Err stpp_Add(GF_Box *s, GF_Box *a)
 {
-    GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
-    switch(a->type) {
+	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
+	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_BTRT:
 		if (stpp->bitrate) ERROR_ON_DUPLICATED_BOX(a, s)
-		stpp->bitrate = (GF_MPEG4BitRateBox *)a;
+			stpp->bitrate = (GF_MPEG4BitRateBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(stpp->protections, a);
 		break;
-    default:
-        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 stpp_Read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 size, i;
 	char *str;
-    GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
-    gf_bs_read_data(bs, stpp->reserved, 6);
-    stpp->dataReferenceIndex = gf_bs_read_u16(bs);
+	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
+	gf_bs_read_data(bs, stpp->reserved, 6);
+	stpp->dataReferenceIndex = gf_bs_read_u16(bs);
 
 	size = (u32) stpp->size - 8;
 	str = (char *)gf_malloc(sizeof(char)*size);
@@ -109,26 +110,26 @@
 
 	stpp->size = size;
 	gf_free(str);
-    return gf_isom_read_box_list(s, bs, stpp_Add);
+	return gf_isom_read_box_list(s, bs, stpp_Add);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_Err stpp_Write(GF_Box *s, GF_BitStream *bs)
 {
-    GF_Err e;
-    GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
-    e = gf_isom_box_write_header(s, bs);
-    gf_bs_write_data(bs, stpp->reserved, 6);
-    gf_bs_write_u16(bs, stpp->dataReferenceIndex);
+	GF_Err e;
+	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
+	e = gf_isom_box_write_header(s, bs);
+	gf_bs_write_data(bs, stpp->reserved, 6);
+	gf_bs_write_u16(bs, stpp->dataReferenceIndex);
 
 	gf_bs_write_data(bs, stpp->xmlnamespace, (u32) strlen(stpp->xmlnamespace));
 	gf_bs_write_u8(bs, 0);
 
-	if (stpp->schema_location) 
+	if (stpp->schema_location)
 		gf_bs_write_data(bs, stpp->schema_location, (u32) strlen(stpp->schema_location));
 	gf_bs_write_u8(bs, 0);
 
-	if (stpp->auxiliary_mime_types) 
+	if (stpp->auxiliary_mime_types)
 		gf_bs_write_data(bs, stpp->auxiliary_mime_types, (u32) strlen(stpp->auxiliary_mime_types));
 	gf_bs_write_u8(bs, 0);
 
@@ -140,11 +141,11 @@
 
 GF_Err stpp_Size(GF_Box *s)
 {
-    GF_Err e;
-    GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
-    e = gf_isom_box_get_size(s);
-    if (e) return e;
-    s->size += 8; // reserved and dataReferenceIndex
+	GF_Err e;
+	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	s->size += 8; // reserved and dataReferenceIndex
 
 	stpp->size += strlen(stpp->xmlnamespace);
 	stpp->size++;
@@ -152,7 +153,7 @@
 	if (stpp->schema_location)
 		stpp->size += strlen(stpp->schema_location);
 	stpp->size++;
-	
+
 	if (stpp->auxiliary_mime_types)
 		stpp->size += strlen(stpp->auxiliary_mime_types);
 	stpp->size++;
@@ -172,7 +173,7 @@
 
 GF_Err stpp_dump(GF_Box *a, FILE * trace)
 {
-    GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)a;
+	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)a;
 	const char *name = "XMLSubtitleSampleEntryBox";
 
 	fprintf(trace, "<%s ", name);
@@ -191,10 +192,12 @@
 
 #endif /* GPAC_DISABLE_ISOM_DUMP */
 
-GF_Err gf_isom_update_xml_subtitle_description( GF_ISOFile                          *movie, 
-                                                u32                                 trackNumber, 
-                                                u32                                 descriptionIndex, 
-                                                GF_GenericSubtitleSampleDescriptor  *desc)
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err gf_isom_update_xml_subtitle_description( GF_ISOFile                          *movie,
+        u32                                 trackNumber,
+        u32                                 descriptionIndex,
+        GF_GenericSubtitleSampleDescriptor  *desc)
 {
 	GF_TrackBox *trak;
 	GF_Err      e;
@@ -202,7 +205,7 @@
 	if (!descriptionIndex || !desc) return GF_BAD_PARAM;
 	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;
 
@@ -219,12 +222,12 @@
 	return e;
 }
 
-GF_Err gf_isom_new_xml_subtitle_description(GF_ISOFile  *movie, 
-												u32         trackNumber, 
-                                                char        *xmlnamespace, 
-                                                char        *xml_schema_loc, 
-                                                char        *mimes, 
-                                                u32         *outDescriptionIndex)
+GF_Err gf_isom_new_xml_subtitle_description(GF_ISOFile  *movie,
+        u32         trackNumber,
+        char        *xmlnamespace,
+        char        *xml_schema_loc,
+        char        *mimes,
+        u32         *outDescriptionIndex)
 {
 	GF_TrackBox                 *trak;
 	GF_Err                      e;
@@ -235,7 +238,7 @@
 
 	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;
 
@@ -262,12 +265,13 @@
 	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
 
 	stpp->bitrate = (GF_MPEG4BitRateBox *)btrt_New();
-    stpp->xmlnamespace = gf_strdup(xmlnamespace);
-    stpp->schema_location = gf_strdup(xml_schema_loc);
-    stpp->auxiliary_mime_types = gf_strdup(mimes);
+	stpp->xmlnamespace = gf_strdup(xmlnamespace);
+	stpp->schema_location = gf_strdup(xml_schema_loc);
+	stpp->auxiliary_mime_types = gf_strdup(mimes);
 	return e;
 }
 
+#endif
 
 /* blindly adds text to a sample following 3GPP Timed Text style */
 GF_Err gf_isom_xml_subtitle_sample_add_text(GF_GenericSubtitleSample *samp, char *text_data, u32 text_len)
@@ -280,8 +284,8 @@
 	return GF_OK;
 }
 
-/* 
- * Writing the xml sample structure into a sample buffer 
+/*
+ * Writing the xml sample structure into a sample buffer
  * - putting the text or XML in the sample directly
  * - optionally handle secondary resources (TODO)
 */
@@ -294,7 +298,7 @@
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 	if (samp->len) gf_bs_write_data(bs, samp->text, samp->len);
-    else     gf_bs_write_data(bs, "", 1);
+	else     gf_bs_write_data(bs, "", 1);
 
 	res = gf_isom_sample_new();
 	if (!res) {
@@ -303,7 +307,7 @@
 	}
 	gf_bs_get_content(bs, &res->data, &res->dataLength);
 	gf_bs_del(bs);
-	res->IsRAP = 1;
+	res->IsRAP = RAP;
 	return res;
 }
 
@@ -335,17 +339,17 @@
 GF_GenericSubtitleSample *gf_isom_parse_xml_subtitle_sample(GF_BitStream *bs)
 {
 	GF_GenericSubtitleSample *s = gf_isom_new_xml_subtitle_sample();
-	
+
 	/*empty sample*/
 	if (!bs || !gf_bs_available(bs)) return s;
 
 	s->len = gf_bs_read_u16(bs);
 	if (s->len) {
-		/*2 extra bytes for UTF-16 term char just in case (we don't know if a BOM marker is present or 
+		/*2 extra bytes for UTF-16 term char just in case (we don't know if a BOM marker is present or
 		not since this may be a sample carried over RTP*/
 		s->text = (char *) gf_malloc(sizeof(char)*(s->len+2) );
-		s->text[s->len] = 0; 
-        s->text[s->len+1] = 0;
+		s->text[s->len] = 0;
+		s->text[s->len+1] = 0;
 		gf_bs_read_data(bs, s->text, s->len);
 	}
 	return s;
@@ -359,7 +363,7 @@
 	if (!data || !dataLength) {
 		return gf_isom_new_xml_subtitle_sample();
 	}
-	
+
 	bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
 	s = gf_isom_parse_xml_subtitle_sample(bs);
 	gf_bs_del(bs);

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/tx3g.c -> gpac-0.5.1.svn5491.tar.xz/src/isomedia/tx3g.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,7 +40,7 @@
 	if (!descriptionIndex || !desc) return GF_BAD_PARAM;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !desc->font_count) return GF_BAD_PARAM;
 
@@ -65,7 +65,7 @@
 	if (!movie->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
-	txt->back_color = desc->back_color; 
+	txt->back_color = desc->back_color;
 	txt->default_box = desc->default_pos;
 	txt->default_style = desc->default_style;
 	txt->displayFlags = desc->displayFlags;
@@ -92,7 +92,7 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !desc->font_count) return GF_BAD_PARAM;
 
@@ -119,7 +119,7 @@
 	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, txt);
 	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
 
-	txt->back_color = desc->back_color; 
+	txt->back_color = desc->back_color;
 	txt->default_box = desc->default_pos;
 	txt->default_style = desc->default_style;
 	txt->displayFlags = desc->displayFlags;
@@ -137,7 +137,7 @@
 }
 
 
-/*blindly adds text - note we don't rely on terminaison characters to handle utf8 and utf16 data 
+/*blindly adds text - note we don't rely on terminaison characters to handle utf8 and utf16 data
 in the same way. It is the user responsability to signal UTF16*/
 GF_Err gf_isom_text_add_text(GF_TextSample *samp, char *text_data, u32 text_len)
 {
@@ -196,9 +196,12 @@
 		samp->highlight_color = (GF_TextHighlightColorBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_HCLR);
 		if (!samp->highlight_color) return GF_OUT_OF_MEM;
 	}
-	samp->highlight_color->hil_color = a; samp->highlight_color->hil_color <<= 8;
-	samp->highlight_color->hil_color = r; samp->highlight_color->hil_color <<= 8;
-	samp->highlight_color->hil_color = g; samp->highlight_color->hil_color <<= 8;
+	samp->highlight_color->hil_color = a;
+	samp->highlight_color->hil_color <<= 8;
+	samp->highlight_color->hil_color = r;
+	samp->highlight_color->hil_color <<= 8;
+	samp->highlight_color->hil_color = g;
+	samp->highlight_color->hil_color <<= 8;
 	samp->highlight_color->hil_color = b;
 	return GF_OK;
 }
@@ -344,7 +347,7 @@
 	}
 	gf_bs_get_content(bs, &res->data, &res->dataLength);
 	gf_bs_del(bs);
-	res->IsRAP = 1;
+	res->IsRAP = RAP;
 	return res;
 }
 
@@ -361,7 +364,7 @@
 	if (!desc) return GF_BAD_PARAM;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return GF_BAD_PARAM;
-	
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !desc->font_count) return GF_BAD_PARAM;
 
@@ -454,16 +457,17 @@
 GF_TextSample *gf_isom_parse_texte_sample(GF_BitStream *bs)
 {
 	GF_TextSample *s = gf_isom_new_text_sample();
-	
+
 	/*empty sample*/
 	if (!bs || !gf_bs_available(bs)) return s;
 
 	s->len = gf_bs_read_u16(bs);
 	if (s->len) {
-		/*2 extra bytes for UTF-16 term char just in case (we don't know if a BOM marker is present or 
+		/*2 extra bytes for UTF-16 term char just in case (we don't know if a BOM marker is present or
 		not since this may be a sample carried over RTP*/
 		s->text = (char *) gf_malloc(sizeof(char)*(s->len+2) );
-		s->text[s->len] = 0; s->text[s->len+1] = 0;
+		s->text[s->len] = 0;
+		s->text[s->len+1] = 0;
 		gf_bs_read_data(bs, s->text, s->len);
 	}
 
@@ -528,7 +532,7 @@
 	if (!data || !dataLength) {
 		return gf_isom_new_text_sample();
 	}
-	
+
 	bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
 	s = gf_isom_parse_texte_sample(bs);
 	gf_bs_del(bs);
@@ -542,20 +546,24 @@
 
 static void gf_isom_write_tx3g(GF_Tx3gSampleEntryBox *a, GF_BitStream *bs, u32 sidx, u32 sidx_offset)
 {
-	u32 size, j;
+	u32 size, j, fount_count;
 	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);
 
-	
+
 	if (sidx_offset) gf_bs_write_u8(bs, sidx + sidx_offset);
 
 	/*SINCE WINCE HAS A READONLY VERSION OF MP4 WE MUST DO IT BY HAND*/
 	size = 8 + 18 + 8 + 12;
 	size += 8 + 2;
-	for (j=0; j<a->font_table->entry_count; j++) {
-		size += 3;
-		if (a->font_table->fonts[j].fontName) size += (u32) strlen(a->font_table->fonts[j].fontName);
+	fount_count = 0;
+	if (a->font_table) {
+		fount_count = a->font_table->entry_count;
+		for (j=0; j<fount_count; j++) {
+			size += 3;
+			if (a->font_table->fonts[j].fontName) size += (u32) strlen(a->font_table->fonts[j].fontName);
+		}
 	}
 	/*write TextSampleEntry box*/
 	gf_bs_write_u32(bs, size);
@@ -572,8 +580,9 @@
 	size -= (8 + 18 + 8 + 12);
 	gf_bs_write_u32(bs, size);
 	gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_FTAB);
-	gf_bs_write_u16(bs, a->font_table->entry_count);
-	for (j=0; j<a->font_table->entry_count; j++) {
+
+	gf_bs_write_u16(bs, fount_count);
+	for (j=0; j<fount_count; j++) {
 		gf_bs_write_u16(bs, a->font_table->fonts[j].fontID);
 		if (a->font_table->fonts[j].fontName) {
 			u32 len = (u32) strlen(a->font_table->fonts[j].fontName);
@@ -598,10 +607,10 @@
 	sampleDesc = mdia->information->sampleTable->SampleDescription->other_boxes;
 	count = gf_list_count(sampleDesc);
 	if (!count) return GF_ISOM_INVALID_MEDIA;
-	
+
 	esd = gf_odf_desc_esd_new(2);
 	esd->decoderConfig->streamType = GF_STREAM_TEXT;
-	esd->decoderConfig->objectTypeIndication = 0x08;
+	esd->decoderConfig->objectTypeIndication = GPAC_OTI_TEXT_MPEG4;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
@@ -645,9 +654,11 @@
 		/*which video shall we pick for MPEG-4, and how is the associations indicated in 3GP ???*/
 		gf_bs_write_u16(bs, 0);
 		gf_bs_write_u16(bs, 0);
-		trans = mdia->mediaTrack->Header->matrix[6]; trans >>= 16;
+		trans = mdia->mediaTrack->Header->matrix[6];
+		trans >>= 16;
 		gf_bs_write_u16(bs, trans);
-		trans = mdia->mediaTrack->Header->matrix[7]; trans >>= 16;
+		trans = mdia->mediaTrack->Header->matrix[7];
+		trans >>= 16;
 		gf_bs_write_u16(bs, trans);
 	}
 
@@ -704,14 +715,14 @@
 	GF_BitStream *bs;
 	GF_TrackBox *trak;
 	GF_Tx3gSampleEntryBox *a;
-	
+
 	trak = gf_isom_get_track_from_file(file, track);
 	if (!trak) return GF_BAD_PARAM;
 
 	a = (GF_Tx3gSampleEntryBox *) gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sidx-1);
 	if (!a) return GF_BAD_PARAM;
 	if ((a->type != GF_ISOM_BOX_TYPE_TX3G) && (a->type != GF_ISOM_BOX_TYPE_TEXT)) return GF_BAD_PARAM;
-	
+
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_isom_write_tx3g(a, bs, sidx, sidx_offset);
 	*tx3g = NULL;

gpac-0.5.0.svn5178.tar.bz2/src/laser/lsr_dec.c -> gpac-0.5.1.svn5491.tar.xz/src/laser/lsr_dec.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -26,7 +26,6 @@
 #include <gpac/internal/laser_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
 #include <gpac/bitstream.h>
-#include <gpac/math.h>
 #include <gpac/events.h>
 
 #ifndef GPAC_DISABLE_LASER
@@ -36,7 +35,7 @@
 	(_val) = gf_bs_read_int(_codec->bs, _nbBits);	\
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] %s\t\t%d\t\t%d\n", _str, _nbBits, _val)); \
 	}\
-
+ 
 
 static void lsr_read_group_content(GF_LASeRCodec *lsr, GF_Node *elt, Bool skip_object_content);
 static void lsr_read_group_content_post_init(GF_LASeRCodec *lsr, SVG_Element *elt, Bool skip_init);
@@ -146,7 +145,7 @@
 {
 	u32 i, count;
 	count = gf_list_count(codec->streamInfo);
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		LASeRStreamInfo *ptr = (LASeRStreamInfo *) gf_list_get(codec->streamInfo, i);
 		if (ptr->ESID==ESID) {
 			gf_free(ptr);
@@ -275,7 +274,10 @@
 	gf_bs_read_data(lsr->bs, *out_data, len);
 	*out_len = len;
 #else
-	while (len) { gf_bs_read_int(lsr->bs, 8); len--; }
+	while (len) {
+		gf_bs_read_int(lsr->bs, 8);
+		len--;
+	}
 #endif
 }
 
@@ -346,16 +348,16 @@
 			uint(nameSpaceIndexBits) nameSpaceIndex;
 			gf_bs_align(lsr->bs);
 			byte[skipLen - ((nameSpaceIndexBits+7)%8)] data;
-            break;
+			break;
 		default:
 			/*TODO - spec is wrong here (typo, "len" instead of "skipLen" )*/
 			gf_bs_skip_bytes(skipLen);
 			break;
-        }
+		}
 #endif
 		gf_bs_align(lsr->bs);
 		GF_LSR_READ_INT(lsr, val, 1, "hasMorePrivateData");
-    } while (val);
+	} while (val);
 }
 
 static void lsr_read_any_attribute(GF_LASeRCodec *lsr, GF_Node *node, Bool skippable)
@@ -365,7 +367,7 @@
 	if (val) {
 		do {
 			GF_LSR_READ_INT(lsr, val, lsr->info->cfg.extensionIDBits, "reserved");
-		    val = lsr_read_vluimsbf5(lsr, "len");//len in BITS
+			val = lsr_read_vluimsbf5(lsr, "len");//len in BITS
 			GF_LSR_READ_INT(lsr, val, val, "reserved_val");
 			GF_LSR_READ_INT(lsr, val, 1, "hasNextExtension");
 		} while (val);
@@ -496,7 +498,10 @@
 			(*str) [len] = 0;
 		}
 	} else {
-		while (len) { gf_bs_read_int(lsr->bs, 8); len--; }
+		while (len) {
+			gf_bs_read_int(lsr->bs, 8);
+			len--;
+		}
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] %s\t\t%d\t\t%s\n", name, 8*len, *str));
 }
@@ -590,7 +595,7 @@
 			gf_bs_read_data(lsr->bs, iri->string + len_rad + 1, len);
 			iri->string[len_rad + 1 + len] = 0;
 		}
-    }
+	}
 	GF_LSR_READ_INT(lsr, val, 1, "hasID");
 	if (val) lsr_read_codec_IDREF(lsr, iri, "idref");
 
@@ -621,9 +626,16 @@
 		case 0:
 			GF_LSR_READ_INT(lsr, val, 2, "choice");
 			switch (val) {
-			case 0: paint->type = SVG_PAINT_INHERIT; break;
-			case 1: paint->type = SVG_PAINT_COLOR; paint->color.type = SVG_COLOR_CURRENTCOLOR; break;
-			default: paint->type = SVG_PAINT_NONE; break;
+			case 0:
+				paint->type = SVG_PAINT_INHERIT;
+				break;
+			case 1:
+				paint->type = SVG_PAINT_COLOR;
+				paint->color.type = SVG_COLOR_CURRENTCOLOR;
+				break;
+			default:
+				paint->type = SVG_PAINT_NONE;
+				break;
 			}
 			break;
 		case 1:
@@ -643,7 +655,7 @@
 				paint->iri.target = iri.target;
 			}
 		}
-			break;
+		break;
 		case 2:
 		{
 			char *sysPaint=NULL;
@@ -654,7 +666,7 @@
 				gf_free(sysPaint);
 			}
 		}
-			break;
+		break;
 		case 3:
 			lsr_read_extension(lsr, name);
 			break;
@@ -681,7 +693,7 @@
 	if (!val) return;
 
 	name = NULL;
-    id = 1+lsr_read_vluimsbf5(lsr, "ID");
+	id = 1+lsr_read_vluimsbf5(lsr, "ID");
 	gf_node_set_id(n, id, name);
 
 	GF_LSR_READ_INT(lsr, val, 1, "reserved");
@@ -990,27 +1002,47 @@
 static u32 lsr_to_dom_key(u32 lsr_k)
 {
 	switch (lsr_k) {
-	case 0: return GF_KEY_STAR;
-	case 1: return GF_KEY_0;
-	case 2: return GF_KEY_1;
-	case 3: return GF_KEY_2;
-	case 4: return GF_KEY_3;
-	case 5: return GF_KEY_4;
-	case 6: return GF_KEY_5;
-	case 7: return GF_KEY_6;
-	case 8: return GF_KEY_7;
-	case 9: return GF_KEY_8;
-	case 10: return GF_KEY_9;
-	case 12: return GF_KEY_DOWN;
-	case 14: return GF_KEY_LEFT;
-	case 16: return GF_KEY_RIGHT;
-	case 20: return GF_KEY_UP;
+	case 0:
+		return GF_KEY_STAR;
+	case 1:
+		return GF_KEY_0;
+	case 2:
+		return GF_KEY_1;
+	case 3:
+		return GF_KEY_2;
+	case 4:
+		return GF_KEY_3;
+	case 5:
+		return GF_KEY_4;
+	case 6:
+		return GF_KEY_5;
+	case 7:
+		return GF_KEY_6;
+	case 8:
+		return GF_KEY_7;
+	case 9:
+		return GF_KEY_8;
+	case 10:
+		return GF_KEY_9;
+	case 12:
+		return GF_KEY_DOWN;
+	case 14:
+		return GF_KEY_LEFT;
+	case 16:
+		return GF_KEY_RIGHT;
+	case 20:
+		return GF_KEY_UP;
 	/*WHAT IS ANY_KEY (11) ??*/
-	case 13: return GF_KEY_ENTER;
-	case 15: return GF_KEY_ESCAPE;
-	case 17: return GF_KEY_NUMBER;
-	case 18: return GF_KEY_CELL_SOFT1;
-	case 19: return GF_KEY_CELL_SOFT2;
+	case 13:
+		return GF_KEY_ENTER;
+	case 15:
+		return GF_KEY_ESCAPE;
+	case 17:
+		return GF_KEY_NUMBER;
+	case 18:
+		return GF_KEY_CELL_SOFT1;
+	case 19:
+		return GF_KEY_CELL_SOFT2;
 	default:
 		/*use '*' by default ... */
 		return 0;
@@ -1050,39 +1082,105 @@
 		evtType->parameter = 0;
 		GF_LSR_READ_INT(lsr, flag, 6, "event");
 		switch (flag) {
-		case LSR_EVT_abort: evtType->type = GF_EVENT_ABORT; break;
-		case LSR_EVT_accessKey: evtType->type = GF_EVENT_KEYDOWN; break;
-		case LSR_EVT_activate: evtType->type = GF_EVENT_ACTIVATE; break;
-		case LSR_EVT_activatedEvent: evtType->type = GF_EVENT_ACTIVATED; break;
-		case LSR_EVT_beginEvent: evtType->type = GF_EVENT_BEGIN_EVENT; break;
-		case LSR_EVT_click: evtType->type = GF_EVENT_CLICK; break;
-		case LSR_EVT_deactivatedEvent: evtType->type = GF_EVENT_DEACTIVATED; break;
-		case LSR_EVT_endEvent: evtType->type = GF_EVENT_END_EVENT; break;
-		case LSR_EVT_error: evtType->type = GF_EVENT_ERROR; break;
-		case LSR_EVT_executionTime: evtType->type = GF_EVENT_EXECUTION_TIME; break;
-		case LSR_EVT_focusin: evtType->type = GF_EVENT_FOCUSIN; break;
-		case LSR_EVT_focusout: evtType->type = GF_EVENT_FOCUSOUT; break;
-		case LSR_EVT_keydown: evtType->type = GF_EVENT_KEYDOWN; break;
-		case LSR_EVT_keyup: evtType->type = GF_EVENT_KEYUP; break;
-		case LSR_EVT_load: evtType->type = GF_EVENT_LOAD; break;
-		case LSR_EVT_longAccessKey: evtType->type = GF_EVENT_LONGKEYPRESS; break;
-		case LSR_EVT_mousedown: evtType->type = GF_EVENT_MOUSEDOWN; break;
-		case LSR_EVT_mousemove: evtType->type = GF_EVENT_MOUSEMOVE; break;
-		case LSR_EVT_mouseout: evtType->type = GF_EVENT_MOUSEOUT; break;
-		case LSR_EVT_mouseover: evtType->type = GF_EVENT_MOUSEOVER; break;
-		case LSR_EVT_mouseup: evtType->type = GF_EVENT_MOUSEUP; break;
-		case LSR_EVT_pause: evtType->type = GF_EVENT_PAUSE; break;
-		case LSR_EVT_pausedEvent: evtType->type = GF_EVENT_PAUSED_EVENT; break;
-		case LSR_EVT_play: evtType->type = GF_EVENT_PLAY; break;
-		case LSR_EVT_repeatEvent: evtType->type = GF_EVENT_REPEAT_EVENT; break;
-		case LSR_EVT_repeatKey: evtType->type = GF_EVENT_REPEAT_KEY; break;
-		case LSR_EVT_resize: evtType->type = GF_EVENT_RESIZE; break;
-		case LSR_EVT_resumedEvent: evtType->type = GF_EVENT_RESUME_EVENT; break;
-		case LSR_EVT_scroll: evtType->type = GF_EVENT_SCROLL; break;
-		case LSR_EVT_shortAccessKey: evtType->type = GF_EVENT_SHORT_ACCESSKEY; break;
-		case LSR_EVT_textinput: evtType->type = GF_EVENT_TEXTINPUT; break;
-		case LSR_EVT_unload: evtType->type = GF_EVENT_UNLOAD; break;
-		case LSR_EVT_zoom: evtType->type = GF_EVENT_ZOOM; break;
+		case LSR_EVT_abort:
+			evtType->type = GF_EVENT_ABORT;
+			break;
+		case LSR_EVT_accessKey:
+			evtType->type = GF_EVENT_KEYDOWN;
+			break;
+		case LSR_EVT_activate:
+			evtType->type = GF_EVENT_ACTIVATE;
+			break;
+		case LSR_EVT_activatedEvent:
+			evtType->type = GF_EVENT_ACTIVATED;
+			break;
+		case LSR_EVT_beginEvent:
+			evtType->type = GF_EVENT_BEGIN_EVENT;
+			break;
+		case LSR_EVT_click:
+			evtType->type = GF_EVENT_CLICK;
+			break;
+		case LSR_EVT_deactivatedEvent:
+			evtType->type = GF_EVENT_DEACTIVATED;
+			break;
+		case LSR_EVT_endEvent:
+			evtType->type = GF_EVENT_END_EVENT;
+			break;
+		case LSR_EVT_error:
+			evtType->type = GF_EVENT_ERROR;
+			break;
+		case LSR_EVT_executionTime:
+			evtType->type = GF_EVENT_EXECUTION_TIME;
+			break;
+		case LSR_EVT_focusin:
+			evtType->type = GF_EVENT_FOCUSIN;
+			break;
+		case LSR_EVT_focusout:
+			evtType->type = GF_EVENT_FOCUSOUT;
+			break;
+		case LSR_EVT_keydown:
+			evtType->type = GF_EVENT_KEYDOWN;
+			break;
+		case LSR_EVT_keyup:
+			evtType->type = GF_EVENT_KEYUP;
+			break;
+		case LSR_EVT_load:
+			evtType->type = GF_EVENT_LOAD;
+			break;
+		case LSR_EVT_longAccessKey:
+			evtType->type = GF_EVENT_LONGKEYPRESS;
+			break;
+		case LSR_EVT_mousedown:
+			evtType->type = GF_EVENT_MOUSEDOWN;
+			break;
+		case LSR_EVT_mousemove:
+			evtType->type = GF_EVENT_MOUSEMOVE;
+			break;
+		case LSR_EVT_mouseout:
+			evtType->type = GF_EVENT_MOUSEOUT;
+			break;
+		case LSR_EVT_mouseover:
+			evtType->type = GF_EVENT_MOUSEOVER;
+			break;
+		case LSR_EVT_mouseup:
+			evtType->type = GF_EVENT_MOUSEUP;
+			break;
+		case LSR_EVT_pause:
+			evtType->type = GF_EVENT_PAUSE;
+			break;
+		case LSR_EVT_pausedEvent:
+			evtType->type = GF_EVENT_PAUSED_EVENT;
+			break;
+		case LSR_EVT_play:
+			evtType->type = GF_EVENT_PLAY;
+			break;
+		case LSR_EVT_repeatEvent:
+			evtType->type = GF_EVENT_REPEAT_EVENT;
+			break;
+		case LSR_EVT_repeatKey:
+			evtType->type = GF_EVENT_REPEAT_KEY;
+			break;
+		case LSR_EVT_resize:
+			evtType->type = GF_EVENT_RESIZE;
+			break;
+		case LSR_EVT_resumedEvent:
+			evtType->type = GF_EVENT_RESUME_EVENT;
+			break;
+		case LSR_EVT_scroll:
+			evtType->type = GF_EVENT_SCROLL;
+			break;
+		case LSR_EVT_shortAccessKey:
+			evtType->type = GF_EVENT_SHORT_ACCESSKEY;
+			break;
+		case LSR_EVT_textinput:
+			evtType->type = GF_EVENT_TEXTINPUT;
+			break;
+		case LSR_EVT_unload:
+			evtType->type = GF_EVENT_UNLOAD;
+			break;
+		case LSR_EVT_zoom:
+			evtType->type = GF_EVENT_ZOOM;
+			break;
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[LASeR] Undefined LASeR event %d\n", flag));
 			break;
@@ -1282,7 +1380,7 @@
 		case TAG_SVG_ATT_audio_level:
 			((SVG_Number*)info.far_ptr)->value = lsr_read_fixed_clamp(lsr, "audio-level");
 			break;
-	    case TAG_SVG_ATT_color:
+		case TAG_SVG_ATT_color:
 			lsr_read_paint(lsr, (SVG_Paint *)info.far_ptr, "color");
 			break;
 		case TAG_SVG_ATT_color_rendering:
@@ -1291,13 +1389,14 @@
 		case TAG_SVG_ATT_display:
 			GF_LSR_READ_INT(lsr, *(SVG_Display*)info.far_ptr, 5, "display");
 			break;
-	    case TAG_SVG_ATT_display_align:
-			GF_LSR_READ_INT(lsr, *(SVG_DisplayAlign*)info.far_ptr, 3, "display-align"); break;
+		case TAG_SVG_ATT_display_align:
+			GF_LSR_READ_INT(lsr, *(SVG_DisplayAlign*)info.far_ptr, 3, "display-align");
+			break;
 		case TAG_SVG_ATT_fill_opacity:
 			((SVG_Number*)info.far_ptr)->type = SVG_NUMBER_VALUE;
 			((SVG_Number*)info.far_ptr)->value = lsr_read_fixed_clamp(lsr, "fill-opacity");
 			break;
-	    case TAG_SVG_ATT_fill_rule:
+		case TAG_SVG_ATT_fill_rule:
 			GF_LSR_READ_INT(lsr, *(SVG_FillRule*)info.far_ptr, 2, "fill-rule");
 			break;
 		case TAG_SVG_ATT_image_rendering:
@@ -1306,20 +1405,20 @@
 		case TAG_SVG_ATT_line_increment:
 			lsr_read_line_increment_type(lsr, info.far_ptr, "line-increment");
 			break;
-	    case TAG_SVG_ATT_pointer_events:
+		case TAG_SVG_ATT_pointer_events:
 			GF_LSR_READ_INT(lsr, *(SVG_PointerEvents*)info.far_ptr, 4, "pointer-events");
 			break;
 		case TAG_SVG_ATT_shape_rendering:
 			GF_LSR_READ_INT(lsr, *(SVG_RenderingHint*)info.far_ptr, 3, "shape-rendering");
 			break;
-	    case TAG_SVG_ATT_solid_color:
+		case TAG_SVG_ATT_solid_color:
 			lsr_read_paint(lsr, info.far_ptr, "solid-color");
 			break;
 		case TAG_SVG_ATT_solid_opacity:
 			((SVG_Number*)info.far_ptr)->type = SVG_NUMBER_VALUE;
 			((SVG_Number*)info.far_ptr)->value = lsr_read_fixed_clamp(lsr, "solid-opacity");
 			break;
-	    case TAG_SVG_ATT_stop_color:
+		case TAG_SVG_ATT_stop_color:
 			lsr_read_paint(lsr, info.far_ptr, "stop-color");
 			break;
 		case TAG_SVG_ATT_stop_opacity:
@@ -1337,12 +1436,12 @@
 				da->type=SVG_STROKEDASHARRAY_ARRAY;
 				da->array.count = lsr_read_vluimsbf5(lsr, "len");
 				da->array.vals = (Fixed*)gf_malloc(sizeof(Fixed)*da->array.count);
-		        for (j=0; j<da->array.count; j++) {
-		            da->array.vals[j] = lsr_read_fixed_16_8(lsr, "dash");
+				for (j=0; j<da->array.count; j++) {
+					da->array.vals[j] = lsr_read_fixed_16_8(lsr, "dash");
 				}
 			}
 		}
-			break;
+		break;
 		case TAG_SVG_ATT_stroke_dashoffset:
 			lsr_read_fixed_16_8i(lsr, info.far_ptr, "dashOffset");
 			break;
@@ -1369,7 +1468,7 @@
 		case TAG_SVG_ATT_text_rendering:
 			GF_LSR_READ_INT(lsr, *(SVG_RenderingHint*)info.far_ptr, 3, "text-rendering");
 			break;
-	    case TAG_SVG_ATT_viewport_fill:
+		case TAG_SVG_ATT_viewport_fill:
 			lsr_read_paint(lsr, info.far_ptr, "viewport-fill");
 			break;
 		case TAG_SVG_ATT_viewport_fill_opacity:
@@ -1379,16 +1478,16 @@
 		case TAG_SVG_ATT_vector_effect:
 			GF_LSR_READ_INT(lsr, *(SVG_VectorEffect*)info.far_ptr, 4, "vector-effect");
 			break;
-	    case TAG_SVG_ATT_visibility:
+		case TAG_SVG_ATT_visibility:
 			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", 1);
 			break;
-	    case TAG_SVG_ATT_requiredFormats:
+		case TAG_SVG_ATT_requiredFormats:
 			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredFormats", 0);
 			break;
-	    case TAG_SVG_ATT_requiredFeatures:
+		case TAG_SVG_ATT_requiredFeatures:
 		{
 			u32 j, fcount = lsr_read_vluimsbf5(lsr, "count");
 			for (j=0; j<fcount; j++) {
@@ -1396,39 +1495,48 @@
 				GF_LSR_READ_INT(lsr, fval, 6, "feature");
 			}
 		}
-			break;
-	    case TAG_SVG_ATT_systemLanguage:
+		break;
+		case TAG_SVG_ATT_systemLanguage:
 			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "systemLanguage", 0);
 			break;
-	    case TAG_XML_ATT_base:
+		case TAG_XML_ATT_base:
 			lsr_read_byte_align_string(lsr, &((XMLRI*)info.far_ptr)->string, "xml:base");
 			((XMLRI*)info.far_ptr)->type = XMLRI_STRING;
 			break;
-	    case TAG_XML_ATT_lang:
+		case TAG_XML_ATT_lang:
 			lsr_read_byte_align_string(lsr, info.far_ptr, "xml:lang");
 			break;
-	    case TAG_XML_ATT_space:
+		case TAG_XML_ATT_space:
 			GF_LSR_READ_INT(lsr, *(XML_Space*)info.far_ptr, 1, "xml:space");
 			break;
 		/*focusable*/
 		case TAG_SVG_ATT_nav_next:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusNext"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusNext");
+			break;
 		case TAG_SVG_ATT_nav_up:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusNorth"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusNorth");
+			break;
 		case TAG_SVG_ATT_nav_up_left:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusNorthEast"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusNorthEast");
+			break;
 		case TAG_SVG_ATT_nav_up_right:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusNorthWest"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusNorthWest");
+			break;
 		case TAG_SVG_ATT_nav_prev:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusPrev"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusPrev");
+			break;
 		case TAG_SVG_ATT_nav_down:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusSouth"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusSouth");
+			break;
 		case TAG_SVG_ATT_nav_down_left:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusSouthEast"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusSouthEast");
+			break;
 		case TAG_SVG_ATT_nav_down_right:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusSouthWest"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusSouthWest");
+			break;
 		case TAG_SVG_ATT_nav_left:
-			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusEast"); break;
+			lsr_read_focus(lsr, (SVG_Focus*)info.far_ptr, "focusEast");
+			break;
 		case TAG_SVG_ATT_focusable:
 			/*wrong !!*/
 			GF_LSR_READ_INT(lsr, *(SVG_Focusable*)info.far_ptr, 2, "focusable");
@@ -1444,7 +1552,7 @@
 			assert(0);
 			break;
 
-     	case TAG_SVG_ATT_font_variant:
+		case TAG_SVG_ATT_font_variant:
 			GF_LSR_READ_INT(lsr, *(SVG_FontVariant*)info.far_ptr, 2, "font-variant");
 			break;
 		case TAG_SVG_ATT_font_family:
@@ -1461,7 +1569,7 @@
 				if (ft) ((SVG_FontFamily*)info.far_ptr)->value = gf_strdup(ft);
 			}
 		}
-			break;
+		break;
 		case TAG_SVG_ATT_font_size:
 			lsr_read_fixed_16_8i(lsr, info.far_ptr, "fontSize");
 			break;
@@ -1495,8 +1603,12 @@
 		case TAG_SVG_ATT_end:
 			lsr_read_smil_times(lsr, NULL, 0, info.far_ptr, "end", 0);
 			break;
-		case TAG_SVG_ATT_max: lsr_read_duration_ex(lsr, NULL, 0, info.far_ptr, "min", 0); break;
-		case TAG_SVG_ATT_min: lsr_read_duration_ex(lsr, NULL, 0, info.far_ptr, "min", 0); break;
+		case TAG_SVG_ATT_max:
+			lsr_read_duration_ex(lsr, NULL, 0, info.far_ptr, "min", 0);
+			break;
+		case TAG_SVG_ATT_min:
+			lsr_read_duration_ex(lsr, NULL, 0, info.far_ptr, "min", 0);
+			break;
 		}
 		if (lsr->last_error) break;
 	}
@@ -1619,7 +1731,7 @@
 			val->value = da;
 		}
 	}
-		break;
+	break;
 	case SVG_ViewBox_datatype:
 	{
 		SVG_ViewBox *vb;
@@ -1639,7 +1751,7 @@
 		gf_list_del(l);
 		val->value = vb;
 	}
-		break;
+	break;
 	case SVG_Coordinates_datatype:
 	{
 		SVG_Coordinates *coords;
@@ -1668,7 +1780,7 @@
 			val->value = coords;
 		}
 	}
-		break;
+	break;
 	case SVG_Motion_datatype:
 		if (coded_type==9) {
 			GF_Matrix2D *mat;
@@ -1712,7 +1824,7 @@
 				gf_list_insert(list, da, i);
 			}
 		}
-			break;
+		break;
 		case SVG_ViewBox_datatype:
 		{
 			SVG_ViewBox *vb;
@@ -1733,7 +1845,7 @@
 			gf_list_rem(list, i);
 			gf_list_insert(list, vb, i);
 		}
-			break;
+		break;
 		case SVG_Coordinates_datatype:
 		{
 			SVG_Coordinates *coords;
@@ -1755,7 +1867,7 @@
 			gf_list_rem(list, i);
 			gf_list_insert(list, coords, i);
 		}
-			break;
+		break;
 
 		case SVG_Motion_datatype:
 			if (coded_type==9) {
@@ -1996,12 +2108,12 @@
 	GF_LSR_READ_INT(lsr, escapeFlag, 1, "escapeFlag");
 	if (escapeFlag) GF_LSR_READ_INT(lsr, escape_val, 2, "escapeEnum");
 
-    switch (coded_type) {
-    case 0:
+	switch (coded_type) {
+	case 0:
 		string = NULL;
 		lsr_read_byte_align_string(lsr, &string, name);
 		return string;
-    case 1:
+	case 1:
 		num = (SVG_Number*)gf_malloc(sizeof(SVG_Number));
 		if (escapeFlag) {
 			num->type = escape_val;
@@ -2010,19 +2122,19 @@
 			num->value = lsr_read_fixed_16_8(lsr, name);
 		}
 		return num;
-    case 2:
+	case 2:
 	{
 		SVG_PathData *pd = (SVG_PathData *)gf_svg_create_attribute_value(SVG_PathData_datatype);
 		lsr_read_path_type(lsr, NULL, 0, pd, name);
 		return pd;
 	}
-    case 3:
+	case 3:
 	{
 		SVG_Points *pts = (SVG_Points *)gf_svg_create_attribute_value(SVG_Points_datatype);
 		lsr_read_point_sequence(lsr, *pts, name);
 		return pts;
 	}
-    case 4:
+	case 4:
 		num = (SVG_Number*)gf_malloc(sizeof(SVG_Number));
 		if (escapeFlag) {
 			num->type = escape_val;
@@ -2031,7 +2143,7 @@
 			num->value = lsr_read_fixed_clamp(lsr, name);
 		}
 		return num;
-    case 5:
+	case 5:
 		GF_SAFEALLOC(paint, SVG_Paint);
 		if (escapeFlag) {
 			paint->type = SVG_PAINT_INHERIT;
@@ -2039,50 +2151,50 @@
 			lsr_read_paint(lsr, paint, name);
 		}
 		return paint;
-    case 6:
+	case 6:
 		enum_val = (u8*)gf_malloc(sizeof(u8));
 		*enum_val = lsr_read_vluimsbf5(lsr, name);
 		return enum_val;
-    /*TODO check this is correct*/
+	/*TODO check this is correct*/
 	case 7:
 	{
 		GF_List *l = gf_list_new();
 		u32 i, count;
 		count = lsr_read_vluimsbf5(lsr, "count");
-        for (i=0; i<count; i++) {
+		for (i=0; i<count; i++) {
 			u8 *v = (u8 *)gf_malloc(sizeof(u8));
 			*v = lsr_read_vluimsbf5(lsr, "val");
 			gf_list_add(l, v);
-        }
+		}
 		return l;
 	}
-    /*TODO check this is correct*/
-    case 8: // floats
+	/*TODO check this is correct*/
+	case 8: // floats
 	{
 		GF_List *l = gf_list_new();
 		u32 i, count;
 		count = lsr_read_vluimsbf5(lsr, "count");
-        for (i=0; i<count; i++) {
+		for (i=0; i<count; i++) {
 			Fixed *v = (Fixed *)gf_malloc(sizeof(Fixed));
 			*v = lsr_read_fixed_16_8(lsr, "val");
 			gf_list_add(l, v);
-        }
+		}
 		return l;
 	}
 
 	/*point */
-    case 9:
+	case 9:
 		pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
 		GF_LSR_READ_INT(lsr, flag, lsr->coord_bits, "valX");
 		pt->x = lsr_translate_coords(lsr, flag, lsr->coord_bits);
 		GF_LSR_READ_INT(lsr, flag, lsr->coord_bits, "valY");
 		pt->y = lsr_translate_coords(lsr, flag, lsr->coord_bits);
 		return pt;
-    case 10:
+	case 10:
 		id_val = (u32*)gf_malloc(sizeof(u32));
 		*id_val = lsr_read_vluimsbf5(lsr, name);
 		return id_val;
-    case 11:
+	case 11:
 	{
 		SVG_FontFamily *ft;
 		u32 idx;
@@ -2097,14 +2209,14 @@
 		}
 		return ft;
 	}
-    case 12:
+	case 12:
 		GF_SAFEALLOC(iri, XMLRI);
 		lsr_read_any_uri(lsr, iri, name);
 		return iri;
-    default:
+	default:
 		lsr_read_extension(lsr, name);
-        break;
-    }
+		break;
+	}
 	return NULL;
 }
 
@@ -2145,11 +2257,20 @@
 		if (coded_type==8) {
 			GF_List *l = (GF_List *)val->value;
 			f = (Fixed*)gf_list_get(l, 0);
-			if (f) { p->angle = *f; gf_free(f); }
+			if (f) {
+				p->angle = *f;
+				gf_free(f);
+			}
 			f = (Fixed*)gf_list_get(l, 1);
-			if (f) { p->x = *f; gf_free(f); }
+			if (f) {
+				p->x = *f;
+				gf_free(f);
+			}
 			f = (Fixed*)gf_list_get(l, 2);
-			if (f) { p->y = *f; gf_free(f); }
+			if (f) {
+				p->y = *f;
+				gf_free(f);
+			}
 			gf_list_del(l);
 		} else {
 			p->angle = ((SVG_Number *)val->value)->value;
@@ -2164,9 +2285,15 @@
 			GF_List *l = (GF_List *)val->value;
 			GF_SAFEALLOC(pt , SVG_Point);
 			f = (Fixed*)gf_list_get(l, 0);
-			if (f) { pt->x = *f; gf_free(f); }
+			if (f) {
+				pt->x = *f;
+				gf_free(f);
+			}
 			f = (Fixed*)gf_list_get(l, 1);
-			if (f) { pt->y = *f; gf_free(f); }
+			if (f) {
+				pt->y = *f;
+				gf_free(f);
+			}
 			else pt->y = pt->x;
 			gf_list_del(l);
 			val->value = pt;
@@ -2220,7 +2347,7 @@
 	if (transform_type==SVG_TRANSFORM_TRANSLATE)
 		return;
 
-	for (i=0;i<count; i++) {
+	for (i=0; i<count; i++) {
 		void *a_val = gf_list_get(val->values, i);
 		switch (transform_type) {
 		case SVG_TRANSFORM_ROTATE:
@@ -2376,7 +2503,7 @@
 		}
 	}
 	count = lsr_read_vluimsbf5(lsr, "count");
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		Fixed *v = (Fixed *)gf_malloc(sizeof(Fixed));
 		*v = lsr_read_fixed_16_8(lsr, "val");
 		gf_list_add(*coords, v);
@@ -2396,19 +2523,19 @@
 	if (!count) return;
 	/*TODO golomb coding*/
 	GF_LSR_READ_INT(lsr, flag, 1, "flag");
-    if (!flag) {
-        if (count < 3) {
+	if (!flag) {
+		if (count < 3) {
 			u32 nb_bits, v;
 			GF_LSR_READ_INT(lsr, nb_bits, 5, "bits");
-            for (i=0; i<count; i++) {
+			for (i=0; i<count; i++) {
 				SVG_Point *pt = (SVG_Point *)gf_malloc(sizeof(SVG_Point));
 				gf_list_add(pts, pt);
 				GF_LSR_READ_INT(lsr, v, nb_bits, "x");
 				pt->x = lsr_translate_coords(lsr, v, nb_bits);
 				GF_LSR_READ_INT(lsr, v, nb_bits, "y");
 				pt->y = lsr_translate_coords(lsr, v, nb_bits);
-            }
-        } else {
+			}
+		} else {
 			u32 nb_dx, nb_dy, k;
 			Fixed x, y;
 			SVG_Point *pt = (SVG_Point *)gf_malloc(sizeof(SVG_Point));
@@ -2432,7 +2559,7 @@
 				pt->y = y + lsr_translate_coords(lsr, k, nb_dy);
 				y = pt->y;
 			}
-        }
+		}
 	}
 }
 static void lsr_read_path_type(GF_LASeRCodec *lsr, GF_Node *n, u32 tag, SVG_PathData *path, const char *name)
@@ -2554,9 +2681,9 @@
 		gf_free(v);
 	}
 
-    count = lsr_read_vluimsbf5(lsr, "nbOfTypes");
-    for (i=0; i<count; i++) {
-        type = (u8 *)gf_malloc(sizeof(u8));
+	count = lsr_read_vluimsbf5(lsr, "nbOfTypes");
+	for (i=0; i<count; i++) {
+		type = (u8 *)gf_malloc(sizeof(u8));
 		GF_LSR_READ_INT(lsr, c, 5, name);
 
 		switch (c) {
@@ -2594,7 +2721,7 @@
 			break;
 		}
 		gf_list_add(path->commands, type);
-    }
+	}
 #endif
 }
 
@@ -2690,7 +2817,7 @@
 	u32 i, count;
 	GF_LSR_READ_INT(lsr, count, 1, name);
 	if (!count) return;
-    count = lsr_read_vluimsbf5(lsr, "nb_coords");
+	count = lsr_read_vluimsbf5(lsr, "nb_coords");
 	if (!count) return;
 	if (count>1000000) {
 		lsr->last_error = GF_NON_COMPLIANT_BITSTREAM;
@@ -2741,9 +2868,14 @@
 		if (flag) {
 			GF_LSR_READ_INT(lsr, flag, 1, "script");
 			switch (flag) {
-			case 0: *(SVG_String*)info.far_ptr = gf_strdup("application/ecmascript"); break;
-			case 1: *(SVG_String*)info.far_ptr = gf_strdup("application/jar-archive"); break;
-			default: break;
+			case 0:
+				*(SVG_String*)info.far_ptr = gf_strdup("application/ecmascript");
+				break;
+			case 1:
+				*(SVG_String*)info.far_ptr = gf_strdup("application/jar-archive");
+				break;
+			default:
+				break;
 			}
 		} else {
 			lsr_read_byte_align_string(lsr, info.far_ptr, "type");
@@ -2760,14 +2892,28 @@
 	n->value = INT2FIX(val) / (1<<8);
 #endif
 	GF_LSR_READ_INT(lsr, val, 3, "units");
-    switch (val) {
-	case 1: n->type = SVG_NUMBER_IN; break;
-	case 2: n->type = SVG_NUMBER_CM; break;
-	case 3: n->type = SVG_NUMBER_MM; break;
-	case 4: n->type = SVG_NUMBER_PT; break;
-	case 5: n->type = SVG_NUMBER_PC; break;
-	case 6: n->type = SVG_NUMBER_PERCENTAGE; break;
-	default:  n->type = SVG_NUMBER_VALUE; break;
+	switch (val) {
+	case 1:
+		n->type = SVG_NUMBER_IN;
+		break;
+	case 2:
+		n->type = SVG_NUMBER_CM;
+		break;
+	case 3:
+		n->type = SVG_NUMBER_MM;
+		break;
+	case 4:
+		n->type = SVG_NUMBER_PT;
+		break;
+	case 5:
+		n->type = SVG_NUMBER_PC;
+		break;
+	case 6:
+		n->type = SVG_NUMBER_PERCENTAGE;
+		break;
+	default:
+		n->type = SVG_NUMBER_VALUE;
+		break;
 	}
 }
 
@@ -2815,16 +2961,36 @@
 	GF_LSR_READ_INT(lsr, par->defer, 1, "choice (defer)");
 	GF_LSR_READ_INT(lsr, flag, 4, "alignXandY");
 	switch (flag) {
-	case 1: par->align = SVG_PRESERVEASPECTRATIO_XMAXYMAX; break;
-	case 2: par->align = SVG_PRESERVEASPECTRATIO_XMAXYMID; break;
-	case 3: par->align = SVG_PRESERVEASPECTRATIO_XMAXYMIN; break;
-	case 4: par->align = SVG_PRESERVEASPECTRATIO_XMIDYMAX; break;
-	case 5: par->align = SVG_PRESERVEASPECTRATIO_XMIDYMID; break;
-	case 6: par->align = SVG_PRESERVEASPECTRATIO_XMIDYMIN; break;
-	case 7: par->align = SVG_PRESERVEASPECTRATIO_XMINYMAX; break;
-	case 8: par->align = SVG_PRESERVEASPECTRATIO_XMINYMID; break;
-	case 9: par->align = SVG_PRESERVEASPECTRATIO_XMINYMIN; break;
-	default: par->align = SVG_PRESERVEASPECTRATIO_NONE; break;
+	case 1:
+		par->align = SVG_PRESERVEASPECTRATIO_XMAXYMAX;
+		break;
+	case 2:
+		par->align = SVG_PRESERVEASPECTRATIO_XMAXYMID;
+		break;
+	case 3:
+		par->align = SVG_PRESERVEASPECTRATIO_XMAXYMIN;
+		break;
+	case 4:
+		par->align = SVG_PRESERVEASPECTRATIO_XMIDYMAX;
+		break;
+	case 5:
+		par->align = SVG_PRESERVEASPECTRATIO_XMIDYMID;
+		break;
+	case 6:
+		par->align = SVG_PRESERVEASPECTRATIO_XMIDYMIN;
+		break;
+	case 7:
+		par->align = SVG_PRESERVEASPECTRATIO_XMINYMAX;
+		break;
+	case 8:
+		par->align = SVG_PRESERVEASPECTRATIO_XMINYMID;
+		break;
+	case 9:
+		par->align = SVG_PRESERVEASPECTRATIO_XMINYMIN;
+		break;
+	default:
+		par->align = SVG_PRESERVEASPECTRATIO_NONE;
+		break;
 	}
 }
 
@@ -2964,11 +3130,21 @@
 	/*enumeration rotate{0} scale{1} skewX{2} skewY{3} translate{4}*/
 	GF_LSR_READ_INT(lsr, flag, 3, "rotscatra");
 	switch (flag) {
-	case 0: type = SVG_TRANSFORM_ROTATE; break;
-	case 1: type = SVG_TRANSFORM_SCALE; break;
-	case 2: type = SVG_TRANSFORM_SKEWX; break;
-	case 3: type = SVG_TRANSFORM_SKEWY; break;
-	case 4: type = SVG_TRANSFORM_TRANSLATE; break;
+	case 0:
+		type = SVG_TRANSFORM_ROTATE;
+		break;
+	case 1:
+		type = SVG_TRANSFORM_SCALE;
+		break;
+	case 2:
+		type = SVG_TRANSFORM_SKEWX;
+		break;
+	case 3:
+		type = SVG_TRANSFORM_SKEWY;
+		break;
+	case 4:
+		type = SVG_TRANSFORM_TRANSLATE;
+		break;
 	}
 	if (gf_node_get_attribute_by_tag(elt, TAG_SVG_ATT_transform_type, 1, 0, &info)==GF_OK) {
 		*(SVG_TransformType *)info.far_ptr = type;
@@ -3120,15 +3296,15 @@
 	lsr_read_coordinate_ptr(lsr, elt, TAG_SVG_ATT_y, 1, "y");
 
 	lsr_read_any_attribute(lsr, elt, 1);
-/*	TODO
-	bit(1) opt_group;
-	if(opt_group) {
-		vluimsbf5 occ1;
-		for(int t=0;t<occ1;t++) {
-			privateElementContainer child0[[t]];
+	/*	TODO
+		bit(1) opt_group;
+		if(opt_group) {
+			vluimsbf5 occ1;
+			for(int t=0;t<occ1;t++) {
+				privateElementContainer child0[[t]];
+			}
 		}
-	}
-*/
+	*/
 	GF_LSR_READ_INT(lsr, flag, 1, "opt_group");
 	return elt;
 }
@@ -3531,10 +3707,18 @@
 		lsr->last_error = gf_node_get_attribute_by_tag(elt, TAG_SVG_ATT_syncBehaviorDefault, 1, 0, &info);
 		GF_LSR_READ_INT(lsr, flag, 2, "syncBehaviorDefault");
 		switch (flag) {
-		case 0: *((SMIL_SyncBehavior*)info.far_ptr) = SMIL_SYNCBEHAVIOR_CANSLIP; break;
-		case 1: *((SMIL_SyncBehavior*)info.far_ptr) = SMIL_SYNCBEHAVIOR_INDEPENDENT; break;
-		case 3: *((SMIL_SyncBehavior*)info.far_ptr) = SMIL_SYNCBEHAVIOR_LOCKED; break;
-		default: *((SMIL_SyncBehavior*)info.far_ptr) = SMIL_SYNCBEHAVIOR_INHERIT; break;
+		case 0:
+			*((SMIL_SyncBehavior*)info.far_ptr) = SMIL_SYNCBEHAVIOR_CANSLIP;
+			break;
+		case 1:
+			*((SMIL_SyncBehavior*)info.far_ptr) = SMIL_SYNCBEHAVIOR_INDEPENDENT;
+			break;
+		case 3:
+			*((SMIL_SyncBehavior*)info.far_ptr) = SMIL_SYNCBEHAVIOR_LOCKED;
+			break;
+		default:
+			*((SMIL_SyncBehavior*)info.far_ptr) = SMIL_SYNCBEHAVIOR_INHERIT;
+			break;
 		}
 	}
 	GF_LSR_READ_INT(lsr, flag, 1, "hasSyncToleranceDefault");
@@ -3542,7 +3726,7 @@
 		lsr->last_error = gf_node_get_attribute_by_tag(elt, TAG_SVG_ATT_syncToleranceDefault, 1, 0, &info);
 		((SMIL_SyncTolerance*)info.far_ptr)->type = SMIL_SYNCTOLERANCE_VALUE;
 		GF_LSR_READ_INT(lsr, flag, 1, "choice");
-	    ((SMIL_SyncTolerance*)info.far_ptr)->value = lsr_read_vluimsbf5(lsr, "value");
+		((SMIL_SyncTolerance*)info.far_ptr)->value = lsr_read_vluimsbf5(lsr, "value");
 		((SMIL_SyncTolerance*)info.far_ptr)->value /= lsr->time_resolution;
 	}
 	GF_LSR_READ_INT(lsr, flag, 1, "hasTimelineBegin");
@@ -3835,61 +4019,171 @@
 	GF_LSR_READ_INT(lsr, ntype, 6, "ch4");
 	n = NULL;
 	switch (ntype) {
-	case LSR_SCENE_CONTENT_MODEL_a: n = lsr_read_a(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_animate: n = lsr_read_animate(lsr, parent, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_animateColor: n = lsr_read_animate(lsr, parent, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_animateMotion: n = lsr_read_animateMotion(lsr, parent); break;
-	case LSR_SCENE_CONTENT_MODEL_animateTransform: n = lsr_read_animateTransform(lsr, parent); break;
-	case LSR_SCENE_CONTENT_MODEL_audio: n = lsr_read_audio(lsr, parent); break;
-	case LSR_SCENE_CONTENT_MODEL_circle: n = lsr_read_circle(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_conditional: n = lsr_read_conditional(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_cursorManager: n = lsr_read_cursorManager(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_defs: n = lsr_read_defs(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_desc: n = lsr_read_data(lsr, TAG_SVG_desc); break;
-	case LSR_SCENE_CONTENT_MODEL_ellipse: n = lsr_read_ellipse(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_foreignObject: n = lsr_read_foreignObject(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_g: n = lsr_read_g(lsr, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_image: n = lsr_read_image(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_line: n = lsr_read_line(lsr, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_linearGradient: n = lsr_read_linearGradient(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_metadata: n = lsr_read_data(lsr, TAG_SVG_metadata); break;
-	case LSR_SCENE_CONTENT_MODEL_mpath: n = lsr_read_mpath(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_path: n = lsr_read_path(lsr, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_polygon: n = lsr_read_polygon(lsr, 0, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_polyline: n = lsr_read_polygon(lsr, 1, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_radialGradient: n = lsr_read_radialGradient(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_rect: n = lsr_read_rect(lsr, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_rectClip: n = lsr_read_rectClip(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_sameg: n = lsr_read_g(lsr, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_sameline: n = lsr_read_line(lsr, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_samepath: n = lsr_read_path(lsr, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_samepathfill: n = lsr_read_path(lsr, 2); break;
-	case LSR_SCENE_CONTENT_MODEL_samepolygon: n = lsr_read_polygon(lsr, 0, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_samepolygonfill: n = lsr_read_polygon(lsr, 0, 2); break;
-	case LSR_SCENE_CONTENT_MODEL_samepolygonstroke: n = lsr_read_polygon(lsr, 0, 3); break;
-	case LSR_SCENE_CONTENT_MODEL_samepolyline: n = lsr_read_polygon(lsr, 1, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_samepolylinefill: n = lsr_read_polygon(lsr, 1, 2); break;
-	case LSR_SCENE_CONTENT_MODEL_samepolylinestroke: n = lsr_read_polygon(lsr, 1, 3); break;
-	case LSR_SCENE_CONTENT_MODEL_samerect: n = lsr_read_rect(lsr, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_samerectfill: n = lsr_read_rect(lsr, 2); break;
-	case LSR_SCENE_CONTENT_MODEL_sametext: n = lsr_read_text(lsr, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_sametextfill: n = lsr_read_text(lsr, 2); break;
-	case LSR_SCENE_CONTENT_MODEL_sameuse: n = lsr_read_use(lsr, 1); break;
-	case LSR_SCENE_CONTENT_MODEL_script: n = lsr_read_script(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_selector: n = lsr_read_selector(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_set: n = lsr_read_set(lsr, parent); break;
-	case LSR_SCENE_CONTENT_MODEL_simpleLayout: n = lsr_read_simpleLayout(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_stop: n = lsr_read_stop(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_switch: n = lsr_read_switch(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_text: n = lsr_read_text(lsr, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_title: n = lsr_read_data(lsr, TAG_SVG_title); break;
-	case LSR_SCENE_CONTENT_MODEL_tspan: n = lsr_read_tspan(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_use: n = lsr_read_use(lsr, 0); break;
-	case LSR_SCENE_CONTENT_MODEL_video: n = lsr_read_video(lsr, parent); break;
-	case LSR_SCENE_CONTENT_MODEL_listener: n = lsr_read_listener(lsr, parent); break;
-	case LSR_SCENE_CONTENT_MODEL_element_any: lsr_read_extend_class(lsr, NULL, 0, "node"); break;
-	case LSR_SCENE_CONTENT_MODEL_privateContainer: lsr_read_private_element_container(lsr); break;
-	case LSR_SCENE_CONTENT_MODEL_textContent: lsr_read_text_content(lsr, (GF_Node*)parent); break;
+	case LSR_SCENE_CONTENT_MODEL_a:
+		n = lsr_read_a(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_animate:
+		n = lsr_read_animate(lsr, parent, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_animateColor:
+		n = lsr_read_animate(lsr, parent, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_animateMotion:
+		n = lsr_read_animateMotion(lsr, parent);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_animateTransform:
+		n = lsr_read_animateTransform(lsr, parent);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_audio:
+		n = lsr_read_audio(lsr, parent);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_circle:
+		n = lsr_read_circle(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_conditional:
+		n = lsr_read_conditional(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_cursorManager:
+		n = lsr_read_cursorManager(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_defs:
+		n = lsr_read_defs(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_desc:
+		n = lsr_read_data(lsr, TAG_SVG_desc);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_ellipse:
+		n = lsr_read_ellipse(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_foreignObject:
+		n = lsr_read_foreignObject(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_g:
+		n = lsr_read_g(lsr, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_image:
+		n = lsr_read_image(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_line:
+		n = lsr_read_line(lsr, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_linearGradient:
+		n = lsr_read_linearGradient(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_metadata:
+		n = lsr_read_data(lsr, TAG_SVG_metadata);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_mpath:
+		n = lsr_read_mpath(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_path:
+		n = lsr_read_path(lsr, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_polygon:
+		n = lsr_read_polygon(lsr, 0, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_polyline:
+		n = lsr_read_polygon(lsr, 1, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_radialGradient:
+		n = lsr_read_radialGradient(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_rect:
+		n = lsr_read_rect(lsr, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_rectClip:
+		n = lsr_read_rectClip(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_sameg:
+		n = lsr_read_g(lsr, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_sameline:
+		n = lsr_read_line(lsr, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samepath:
+		n = lsr_read_path(lsr, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samepathfill:
+		n = lsr_read_path(lsr, 2);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samepolygon:
+		n = lsr_read_polygon(lsr, 0, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samepolygonfill:
+		n = lsr_read_polygon(lsr, 0, 2);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samepolygonstroke:
+		n = lsr_read_polygon(lsr, 0, 3);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samepolyline:
+		n = lsr_read_polygon(lsr, 1, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samepolylinefill:
+		n = lsr_read_polygon(lsr, 1, 2);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samepolylinestroke:
+		n = lsr_read_polygon(lsr, 1, 3);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samerect:
+		n = lsr_read_rect(lsr, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_samerectfill:
+		n = lsr_read_rect(lsr, 2);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_sametext:
+		n = lsr_read_text(lsr, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_sametextfill:
+		n = lsr_read_text(lsr, 2);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_sameuse:
+		n = lsr_read_use(lsr, 1);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_script:
+		n = lsr_read_script(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_selector:
+		n = lsr_read_selector(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_set:
+		n = lsr_read_set(lsr, parent);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_simpleLayout:
+		n = lsr_read_simpleLayout(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_stop:
+		n = lsr_read_stop(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_switch:
+		n = lsr_read_switch(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_text:
+		n = lsr_read_text(lsr, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_title:
+		n = lsr_read_data(lsr, TAG_SVG_title);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_tspan:
+		n = lsr_read_tspan(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_use:
+		n = lsr_read_use(lsr, 0);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_video:
+		n = lsr_read_video(lsr, parent);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_listener:
+		n = lsr_read_listener(lsr, parent);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_element_any:
+		lsr_read_extend_class(lsr, NULL, 0, "node");
+		break;
+	case LSR_SCENE_CONTENT_MODEL_privateContainer:
+		lsr_read_private_element_container(lsr);
+		break;
+	case LSR_SCENE_CONTENT_MODEL_textContent:
+		lsr_read_text_content(lsr, (GF_Node*)parent);
+		break;
 	default:
 		break;
 	}
@@ -3911,9 +4205,11 @@
 		GF_LSR_READ_INT(lsr, flag, 3, "ch61");
 		switch (flag) {
 		case LSR_UPDATE_CONTENT_MODEL2_conditional:
-			n = lsr_read_conditional(lsr); break;
+			n = lsr_read_conditional(lsr);
+			break;
 		case LSR_UPDATE_CONTENT_MODEL2_cursorManager:
-			n = lsr_read_cursorManager(lsr); break;
+			n = lsr_read_cursorManager(lsr);
+			break;
 		case LSR_UPDATE_CONTENT_MODEL2_extend:
 			lsr_read_extend_class(lsr, NULL, 0, "extend");
 			return NULL;
@@ -3921,48 +4217,117 @@
 			lsr_read_private_element_container(lsr);
 			return NULL;
 		case LSR_UPDATE_CONTENT_MODEL2_rectClip:
-			n = lsr_read_rectClip(lsr); break;
+			n = lsr_read_rectClip(lsr);
+			break;
 		case LSR_UPDATE_CONTENT_MODEL2_simpleLayout:
-			n = lsr_read_simpleLayout(lsr); break;
+			n = lsr_read_simpleLayout(lsr);
+			break;
 		case LSR_UPDATE_CONTENT_MODEL2_selector:
-			n = lsr_read_selector(lsr); break;
+			n = lsr_read_selector(lsr);
+			break;
 		}
 	} else {
 		GF_LSR_READ_INT(lsr, flag, 6, "ch6");
 		switch(flag) {
-		case LSR_UPDATE_CONTENT_MODEL_a: n = lsr_read_a(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_animate: n = lsr_read_animate(lsr, parent, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_animateColor: n = lsr_read_animate(lsr, parent, 1); break;
-		case LSR_UPDATE_CONTENT_MODEL_animateMotion: n = lsr_read_animateMotion(lsr, parent); break;
-		case LSR_UPDATE_CONTENT_MODEL_animateTransform: n = lsr_read_animateTransform(lsr, parent); break;
-		case LSR_UPDATE_CONTENT_MODEL_audio: n = lsr_read_audio(lsr, parent); break;
-		case LSR_UPDATE_CONTENT_MODEL_circle: n = lsr_read_circle(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_defs: n = lsr_read_defs(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_desc: n = lsr_read_data(lsr, TAG_SVG_desc); break;
-		case LSR_UPDATE_CONTENT_MODEL_ellipse: n = lsr_read_ellipse(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_foreignObject: n = lsr_read_foreignObject(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_g: n = lsr_read_g(lsr, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_image: n = lsr_read_image(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_line: n = lsr_read_line(lsr, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_linearGradient: n = lsr_read_linearGradient(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_metadata: n = lsr_read_data(lsr, TAG_SVG_metadata); break;
-		case LSR_UPDATE_CONTENT_MODEL_mpath: n = lsr_read_mpath(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_path: n = lsr_read_path(lsr, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_polygon: n = lsr_read_polygon(lsr, 0, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_polyline: n = lsr_read_polygon(lsr, 1, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_radialGradient: n = lsr_read_radialGradient(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_rect: n = lsr_read_rect(lsr, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_script: n = lsr_read_script(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_set: n = lsr_read_set(lsr, parent); break;
-		case LSR_UPDATE_CONTENT_MODEL_stop: n = lsr_read_stop(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_svg: n = lsr_read_svg(lsr, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_switch: n = lsr_read_switch(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_text: n = lsr_read_text(lsr, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_title: n = lsr_read_data(lsr, TAG_SVG_title); break;
-		case LSR_UPDATE_CONTENT_MODEL_tspan: n = lsr_read_tspan(lsr); break;
-		case LSR_UPDATE_CONTENT_MODEL_use: n = lsr_read_use(lsr, 0); break;
-		case LSR_UPDATE_CONTENT_MODEL_video: n = lsr_read_video(lsr, parent); break;
-		case LSR_UPDATE_CONTENT_MODEL_listener: n = lsr_read_listener(lsr, parent); break;
+		case LSR_UPDATE_CONTENT_MODEL_a:
+			n = lsr_read_a(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_animate:
+			n = lsr_read_animate(lsr, parent, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_animateColor:
+			n = lsr_read_animate(lsr, parent, 1);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_animateMotion:
+			n = lsr_read_animateMotion(lsr, parent);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_animateTransform:
+			n = lsr_read_animateTransform(lsr, parent);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_audio:
+			n = lsr_read_audio(lsr, parent);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_circle:
+			n = lsr_read_circle(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_defs:
+			n = lsr_read_defs(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_desc:
+			n = lsr_read_data(lsr, TAG_SVG_desc);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_ellipse:
+			n = lsr_read_ellipse(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_foreignObject:
+			n = lsr_read_foreignObject(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_g:
+			n = lsr_read_g(lsr, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_image:
+			n = lsr_read_image(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_line:
+			n = lsr_read_line(lsr, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_linearGradient:
+			n = lsr_read_linearGradient(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_metadata:
+			n = lsr_read_data(lsr, TAG_SVG_metadata);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_mpath:
+			n = lsr_read_mpath(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_path:
+			n = lsr_read_path(lsr, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_polygon:
+			n = lsr_read_polygon(lsr, 0, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_polyline:
+			n = lsr_read_polygon(lsr, 1, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_radialGradient:
+			n = lsr_read_radialGradient(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_rect:
+			n = lsr_read_rect(lsr, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_script:
+			n = lsr_read_script(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_set:
+			n = lsr_read_set(lsr, parent);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_stop:
+			n = lsr_read_stop(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_svg:
+			n = lsr_read_svg(lsr, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_switch:
+			n = lsr_read_switch(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_text:
+			n = lsr_read_text(lsr, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_title:
+			n = lsr_read_data(lsr, TAG_SVG_title);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_tspan:
+			n = lsr_read_tspan(lsr);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_use:
+			n = lsr_read_use(lsr, 0);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_video:
+			n = lsr_read_video(lsr, parent);
+			break;
+		case LSR_UPDATE_CONTENT_MODEL_listener:
+			n = lsr_read_listener(lsr, parent);
+			break;
 		}
 	}
 	if (n && n->sgprivate->interact && n->sgprivate->interact->dom_evt) {
@@ -4040,35 +4405,35 @@
 	SVG_Point *pt;
 	SVG_Number num;
 
-    switch (fieldType) {
-    case SVG_Points_datatype/*ITYPE_point*/:
+	switch (fieldType) {
+	case SVG_Points_datatype/*ITYPE_point*/:
 		pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
-        lsr_read_coordinate(lsr, &num, 0, "coordX");
+		lsr_read_coordinate(lsr, &num, 0, "coordX");
 		pt->x = num.value;
-        lsr_read_coordinate(lsr, &num, 0, "coordY");
+		lsr_read_coordinate(lsr, &num, 0, "coordY");
 		pt->y = num.value;
-        return pt;
-    case SMIL_KeySplines_datatype/*ITYPE_float*/:
+		return pt;
+	case SMIL_KeySplines_datatype/*ITYPE_float*/:
 	case SVG_StrokeDashArray_datatype:
 	case SVG_ViewBox_datatype:
- 		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
+		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
 		*f_val = lsr_read_fixed_16_8(lsr, "floatValue");
-        return f_val;
-    case SMIL_KeyTimes_datatype/*ITYPE_keyTime*/:
+		return f_val;
+	case SMIL_KeyTimes_datatype/*ITYPE_keyTime*/:
 		f_val = lsr_read_fraction_12_item(lsr);
-        break;
-    case SMIL_KeyPoints_datatype/*ITYPE_0to1 - keyPoints*/:
+		break;
+	case SMIL_KeyPoints_datatype/*ITYPE_0to1 - keyPoints*/:
 		pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
 		pt->x = lsr_read_fixed_clamp(lsr, "valueX");
- 		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
+		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
 		pt->y = lsr_read_fixed_clamp(lsr, "valueY");
 		return pt;
-    case SMIL_Times_datatype/*ITYPE_smil_time*/:
+	case SMIL_Times_datatype/*ITYPE_smil_time*/:
 		return lsr_read_smil_time(lsr, node);
-    default:
-        lsr_read_extension(lsr, "privateData");
-        break;
-    }
+	default:
+		lsr_read_extension(lsr, "privateData");
+		break;
+	}
 	return NULL;
 }
 
@@ -4085,17 +4450,17 @@
 	case SVG_Paint_datatype:
 		lsr_read_paint(lsr, (SVG_Paint*)val, "val");
 		break;
-/*
-	case SVG_AudioLevel_datatype:
-		n = val;
-		GF_LSR_READ_INT(lsr, is_default, 1, "isDefaultValue");
-		if (is_default) n->type=SVG_NUMBER_INHERIT;
-		else {
-			n->type = SVG_NUMBER_VALUE;
-			n->value = lsr_read_fixed_clamp(lsr, "val");
-		}
-		break;
-*/
+	/*
+		case SVG_AudioLevel_datatype:
+			n = val;
+			GF_LSR_READ_INT(lsr, is_default, 1, "isDefaultValue");
+			if (is_default) n->type=SVG_NUMBER_INHERIT;
+			else {
+				n->type = SVG_NUMBER_VALUE;
+				n->value = lsr_read_fixed_clamp(lsr, "val");
+			}
+			break;
+	*/
 	case SVG_Transform_Scale_datatype:
 		((SVG_Point *)val)->x = lsr_read_fixed_16_8(lsr, "scale_x");
 		((SVG_Point *)val)->y = lsr_read_fixed_16_8(lsr, "scale_y");
@@ -4204,13 +4569,24 @@
 			vb->is_set = 1;
 			GF_LSR_READ_INT(lsr, count, 1, "escapeFlag");
 			count = lsr_read_vluimsbf5(lsr, "count");
-			if (count) { vb->x = lsr_read_fixed_16_8(lsr, "val"); count--; }
-			if (count) { vb->y = lsr_read_fixed_16_8(lsr, "val"); count--; }
-			if (count) { vb->width = lsr_read_fixed_16_8(lsr, "val"); count--; }
-			if (count) { vb->height = lsr_read_fixed_16_8(lsr, "val"); }
+			if (count) {
+				vb->x = lsr_read_fixed_16_8(lsr, "val");
+				count--;
+			}
+			if (count) {
+				vb->y = lsr_read_fixed_16_8(lsr, "val");
+				count--;
+			}
+			if (count) {
+				vb->width = lsr_read_fixed_16_8(lsr, "val");
+				count--;
+			}
+			if (count) {
+				vb->height = lsr_read_fixed_16_8(lsr, "val");
+			}
 		}
 	}
-		break;
+	break;
 	case XMLRI_datatype:
 	case SVG_Focus_datatype:
 		if ((att_tag==TAG_XLINK_ATT_href) || (att_tag==TAG_SVG_ATT_syncReference)) {
@@ -4283,8 +4659,8 @@
 			}
 		}
 	}
-		break;
-		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;
@@ -4503,13 +4879,19 @@
 				break;
 			/*matrix.translation, scale or rotate*/
 			case LSR_UPDATE_TYPE_SCALE:
-				info.far_ptr = (void *)&matrix_tmp; field_type = SVG_Transform_Scale_datatype; is_lsr_transform = 1;
+				info.far_ptr = (void *)&matrix_tmp;
+				field_type = SVG_Transform_Scale_datatype;
+				is_lsr_transform = 1;
 				break;
 			case LSR_UPDATE_TYPE_ROTATE:
-				info.far_ptr = (void *)&matrix_tmp_rot; field_type = SVG_Transform_Rotate_datatype; is_lsr_transform = 1;
+				info.far_ptr = (void *)&matrix_tmp_rot;
+				field_type = SVG_Transform_Rotate_datatype;
+				is_lsr_transform = 1;
 				break;
 			case LSR_UPDATE_TYPE_TRANSLATION:
-				info.far_ptr = (void *)&matrix_tmp; field_type = SVG_Transform_Translate_datatype; is_lsr_transform = 1;
+				info.far_ptr = (void *)&matrix_tmp;
+				field_type = SVG_Transform_Translate_datatype;
+				is_lsr_transform = 1;
 				break;
 			default:
 				fieldIndex = gf_lsr_anim_type_to_attribute(att_type);
@@ -4618,10 +5000,18 @@
 					case SVG_ViewBox_datatype:
 						v1 = (Fixed*)tmp;
 						switch (idx) {
-						case 0: ((SVG_ViewBox*)info.far_ptr)->x = *v1; break;
-						case 1: ((SVG_ViewBox*)info.far_ptr)->y = *v1; break;
-						case 2: ((SVG_ViewBox*)info.far_ptr)->width = *v1; break;
-						case 3: ((SVG_ViewBox*)info.far_ptr)->height = *v1; break;
+						case 0:
+							((SVG_ViewBox*)info.far_ptr)->x = *v1;
+							break;
+						case 1:
+							((SVG_ViewBox*)info.far_ptr)->y = *v1;
+							break;
+						case 2:
+							((SVG_ViewBox*)info.far_ptr)->width = *v1;
+							break;
+						case 3:
+							((SVG_ViewBox*)info.far_ptr)->height = *v1;
+							break;
 						}
 						gf_free(tmp);
 						gf_node_changed((GF_Node*)n, NULL);
@@ -5069,7 +5459,7 @@
 				}
 			}
 		}
-			break;
+		break;
 		default:
 			return (lsr->last_error = GF_NON_COMPLIANT_BITSTREAM);
 		}
@@ -5196,7 +5586,7 @@
 			}
 			GF_LSR_READ_INT(lsr, flag, 1, "hasAttrs");
 			if (flag) {
-		        u32 k, c2 = lsr_read_vluimsbf5(lsr, "nbAttrNames");
+				u32 k, c2 = lsr_read_vluimsbf5(lsr, "nbAttrNames");
 				for (k=0; k<c2; k++) {
 					if (!i) {
 						/* uint(privateDataIdentifierIndexBits) = */

gpac-0.5.0.svn5178.tar.bz2/src/laser/lsr_enc.c -> gpac-0.5.1.svn5491.tar.xz/src/laser/lsr_enc.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2005-2012
  *					All rights reserved
  *
@@ -26,7 +26,6 @@
 #include <gpac/internal/laser_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
 #include <gpac/bitstream.h>
-#include <gpac/math.h>
 
 #ifndef GPAC_DISABLE_LASER
 
@@ -38,7 +37,7 @@
 	gf_bs_write_int(_codec->bs, _val, _nbBits);	\
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] %s\t\t%d\t\t%d\n", _str, _nbBits, _val)); \
 	}\
-
+ 
 static void lsr_write_group_content(GF_LASeRCodec *lsr, SVG_Element *elt, Bool skip_object_content);
 static GF_Err lsr_write_command_list(GF_LASeRCodec *lsr, GF_List *comList, SVG_Element *script, Bool first_implicit);
 static GF_Err lsr_write_laser_unit(GF_LASeRCodec *lsr, GF_List *com_list, Bool reset_encoding_context);
@@ -516,7 +515,7 @@
 {
 	u32 i, count = gf_list_count(l1);
 	if (count != gf_list_count(l2)) return 0;
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		Fixed *v1 = (Fixed *)gf_list_get(l1, i);
 		Fixed *v2 = (Fixed *)gf_list_get(l2, i);
 		if (*v1 != *v2) return 0;
@@ -533,13 +532,13 @@
 		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 ()
-*/
+		/*
+				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 ()
+		*/
 	}
 }
 
@@ -568,11 +567,11 @@
 	u32 id = gf_node_get_id(n);
 	if (id) {
 		GF_LSR_WRITE_INT(lsr, 1, 1, "has_id");
-	    lsr_write_vluimsbf5(lsr, id-1, "ID");
+		lsr_write_vluimsbf5(lsr, id-1, "ID");
 #if TODO_LASER_EXTENSIONS
 		if (0) {
 			GF_LSR_WRITE_INT(lsr, 1, 1, "reserved");
-		    lsr_write_vluimsbf5(lsr, reserved_len, "len");
+			lsr_write_vluimsbf5(lsr, reserved_len, "len");
 			GF_LSR_WRITE_INT(lsr, 0, reserved_len, "reserved");
 		} else
 #endif
@@ -602,7 +601,7 @@
 		return (u32) res;
 	}
 	res += 1<<(nb_bits);
-	if (res<=max){
+	if (res<=max) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] nb_bits %d not large enough to encode negative number %g!\n", nb_bits, FIX2FLT(x) ));
 		res = max+1;
 	}
@@ -687,21 +686,36 @@
 u32 dom_to_lsr_key(u32 dom_k)
 {
 	switch (dom_k) {
-	case GF_KEY_STAR: return 0;
-	case GF_KEY_0: return 1;
-	case GF_KEY_1: return 2;
-	case GF_KEY_2: return 3;
-	case GF_KEY_3: return 4;
-	case GF_KEY_4: return 5;
-	case GF_KEY_5: return 6;
-	case GF_KEY_6: return 7;
-	case GF_KEY_7: return 8;
-	case GF_KEY_8: return 9;
-	case GF_KEY_9: return 10;
-	case GF_KEY_DOWN: return 12;
-	case GF_KEY_LEFT: return 14;
-	case GF_KEY_RIGHT: return 16;
-	case GF_KEY_UP: return 20;
+	case GF_KEY_STAR:
+		return 0;
+	case GF_KEY_0:
+		return 1;
+	case GF_KEY_1:
+		return 2;
+	case GF_KEY_2:
+		return 3;
+	case GF_KEY_3:
+		return 4;
+	case GF_KEY_4:
+		return 5;
+	case GF_KEY_5:
+		return 6;
+	case GF_KEY_6:
+		return 7;
+	case GF_KEY_7:
+		return 8;
+	case GF_KEY_8:
+		return 9;
+	case GF_KEY_9:
+		return 10;
+	case GF_KEY_DOWN:
+		return 12;
+	case GF_KEY_LEFT:
+		return 14;
+	case GF_KEY_RIGHT:
+		return 16;
+	case GF_KEY_UP:
+		return 20;
 	/*WHAT IS ANY_KEY (11) ??*/
 	case GF_KEY_ENTER:
 	case GF_KEY_EXECUTE:
@@ -754,76 +768,108 @@
 		GF_LSR_WRITE_INT(lsr, 1, 1, "choice");
 		switch (evtType) {
 		case GF_EVENT_ABORT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_abort, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_abort, 6, "event");
+			break;
 		case GF_EVENT_ACTIVATE:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_activate, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_activate, 6, "event");
+			break;
 		case GF_EVENT_ACTIVATED:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_activatedEvent, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_activatedEvent, 6, "event");
+			break;
 		case GF_EVENT_BEGIN:/*SPEC IS BROKEN, CANNOT ENCODE elt.begin !! */
 		case GF_EVENT_BEGIN_EVENT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_beginEvent, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_beginEvent, 6, "event");
+			break;
 		case GF_EVENT_CLICK:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_click, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_click, 6, "event");
+			break;
 		case GF_EVENT_DEACTIVATED:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_deactivatedEvent, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_deactivatedEvent, 6, "event");
+			break;
 		case GF_EVENT_END:/*SPEC IS BROKEN, CANNOT ENCODE elt.end !! */
 		case GF_EVENT_END_EVENT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_endEvent, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_endEvent, 6, "event");
+			break;
 		case GF_EVENT_ERROR:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_error, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_error, 6, "event");
+			break;
 		case GF_EVENT_EXECUTION_TIME:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_executionTime, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_executionTime, 6, "event");
+			break;
 		case GF_EVENT_FOCUSIN:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_focusin, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_focusin, 6, "event");
+			break;
 		case GF_EVENT_FOCUSOUT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_focusout, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_focusout, 6, "event");
+			break;
 		case GF_EVENT_KEYDOWN:
 			/*encode as accessKey() if param*/
 			GF_LSR_WRITE_INT(lsr, evtParam ? LSR_EVT_accessKey : LSR_EVT_keydown, 6, "event");
 			break;
 		case GF_EVENT_KEYUP:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_keyup, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_keyup, 6, "event");
+			break;
 		case GF_EVENT_LOAD:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_load, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_load, 6, "event");
+			break;
 		case GF_EVENT_LONGKEYPRESS:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_longAccessKey, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_longAccessKey, 6, "event");
+			break;
 		case GF_EVENT_MOUSEDOWN:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_mousedown, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_mousedown, 6, "event");
+			break;
 		case GF_EVENT_MOUSEMOVE:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_mousemove, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_mousemove, 6, "event");
+			break;
 		case GF_EVENT_MOUSEOUT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_mouseout, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_mouseout, 6, "event");
+			break;
 		case GF_EVENT_MOUSEOVER:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_mouseover, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_mouseover, 6, "event");
+			break;
 		case GF_EVENT_MOUSEUP:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_mouseup, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_mouseup, 6, "event");
+			break;
 		case GF_EVENT_PAUSE:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_pause, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_pause, 6, "event");
+			break;
 		case GF_EVENT_PAUSED_EVENT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_pausedEvent, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_pausedEvent, 6, "event");
+			break;
 		case GF_EVENT_PLAY:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_play, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_play, 6, "event");
+			break;
 		case GF_EVENT_REPEAT_EVENT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_repeatEvent, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_repeatEvent, 6, "event");
+			break;
 		case GF_EVENT_REPEAT_KEY:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_repeatKey, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_repeatKey, 6, "event");
+			break;
 		case GF_EVENT_RESIZE:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_resize, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_resize, 6, "event");
+			break;
 		case GF_EVENT_RESUME_EVENT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_resumedEvent, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_resumedEvent, 6, "event");
+			break;
 		case GF_EVENT_SCROLL:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_scroll, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_scroll, 6, "event");
+			break;
 		case GF_EVENT_SHORT_ACCESSKEY:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_shortAccessKey, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_shortAccessKey, 6, "event");
+			break;
 		case GF_EVENT_TEXTINPUT:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_textinput, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_textinput, 6, "event");
+			break;
 		case GF_EVENT_UNLOAD:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_unload, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_unload, 6, "event");
+			break;
 		case GF_EVENT_ZOOM:
-			GF_LSR_WRITE_INT(lsr, LSR_EVT_zoom, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, LSR_EVT_zoom, 6, "event");
+			break;
 		default:
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] Unsupported LASER event %d\n", evtType) );
-			GF_LSR_WRITE_INT(lsr, 0, 6, "event"); break;
+			GF_LSR_WRITE_INT(lsr, 0, 6, "event");
+			break;
 			return;
 		}
 		switch (evtType) {
@@ -1050,7 +1096,9 @@
 			u32 size, cur_bits;
 			u32 len = 2+3;
 			switch (att->tag) {
-			case TAG_SVG_ATT_syncMaster: len +=1; break;
+			case TAG_SVG_ATT_syncMaster:
+				len +=1;
+				break;
 			case TAG_SVG_ATT_requiredFonts:
 				len += 8 * (u32) strlen(*(SVG_String*)att->data);
 				/*get vluimsbf5 field size with one extra word (4 bits, enough to code string alignment)*/
@@ -1063,7 +1111,9 @@
 				}
 				is_string = 1;
 				break;
-			default: len +=2; break;
+			default:
+				len +=2;
+				break;
 			}
 			GF_LSR_WRITE_INT(lsr, 49, 6, "attributeRARE");
 			GF_LSR_WRITE_INT(lsr, 2, lsr->info->cfg.extensionIDBits, "extensionID");
@@ -1103,23 +1153,55 @@
 
 		GF_LSR_WRITE_INT(lsr, (u32)field_rare, 6, "attributeRARE");
 		switch (att->tag) {
-		case TAG_SVG_ATT__class: lsr_write_byte_align_string(lsr, *(SVG_String *)att->data, "class"); break;
+		case TAG_SVG_ATT__class:
+			lsr_write_byte_align_string(lsr, *(SVG_String *)att->data, "class");
+			break;
 
-		case TAG_SVG_ATT_audio_level: lsr_write_fixed_clamp(lsr, ((SVG_Number *) att->data)->value, "audio-level"); break;
-	    case TAG_SVG_ATT_color: lsr_write_paint(lsr, (SVG_Paint*) att->data, "color"); break;
-		case TAG_SVG_ATT_color_rendering: GF_LSR_WRITE_INT(lsr, *(SVG_RenderingHint*)att->data, 2, "color-rendering"); break;
-		case TAG_SVG_ATT_display: GF_LSR_WRITE_INT(lsr, *(SVG_Display*)att->data, 5, "display"); break;
-	    case TAG_SVG_ATT_display_align: GF_LSR_WRITE_INT(lsr, *(SVG_DisplayAlign*)att->data, 3, "display-align"); break;
-		case TAG_SVG_ATT_fill_opacity: lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "fill-opacity"); break;
-	    case TAG_SVG_ATT_fill_rule: GF_LSR_WRITE_INT(lsr, *(SVG_FillRule*)att->data, 2, "fill-rule"); break;
-		case TAG_SVG_ATT_image_rendering: GF_LSR_WRITE_INT(lsr, *(SVG_RenderingHint*)att->data, 2, "image-rendering"); break;
-		case TAG_SVG_ATT_line_increment: lsr_write_line_increment_type(lsr, (SVG_Number*)att->data, "lineIncrement"); break;
-	    case TAG_SVG_ATT_pointer_events: GF_LSR_WRITE_INT(lsr, *(SVG_PointerEvents*)att->data, 4, "pointer-events"); break;
-		case TAG_SVG_ATT_shape_rendering: GF_LSR_WRITE_INT(lsr, *(SVG_RenderingHint*)att->data, 3, "shape-rendering"); break;
-	    case TAG_SVG_ATT_solid_color: lsr_write_paint(lsr, (SVG_Paint*)att->data, "solid-color"); break;
-		case TAG_SVG_ATT_solid_opacity: lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "solid-opacity"); break;
-	    case TAG_SVG_ATT_stop_color: lsr_write_paint(lsr, (SVG_Paint*)att->data, "stop-color"); break;
-		case TAG_SVG_ATT_stop_opacity: lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "stop-opacity"); break;
+		case TAG_SVG_ATT_audio_level:
+			lsr_write_fixed_clamp(lsr, ((SVG_Number *) att->data)->value, "audio-level");
+			break;
+		case TAG_SVG_ATT_color:
+			lsr_write_paint(lsr, (SVG_Paint*) att->data, "color");
+			break;
+		case TAG_SVG_ATT_color_rendering:
+			GF_LSR_WRITE_INT(lsr, *(SVG_RenderingHint*)att->data, 2, "color-rendering");
+			break;
+		case TAG_SVG_ATT_display:
+			GF_LSR_WRITE_INT(lsr, *(SVG_Display*)att->data, 5, "display");
+			break;
+		case TAG_SVG_ATT_display_align:
+			GF_LSR_WRITE_INT(lsr, *(SVG_DisplayAlign*)att->data, 3, "display-align");
+			break;
+		case TAG_SVG_ATT_fill_opacity:
+			lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "fill-opacity");
+			break;
+		case TAG_SVG_ATT_fill_rule:
+			GF_LSR_WRITE_INT(lsr, *(SVG_FillRule*)att->data, 2, "fill-rule");
+			break;
+		case TAG_SVG_ATT_image_rendering:
+			GF_LSR_WRITE_INT(lsr, *(SVG_RenderingHint*)att->data, 2, "image-rendering");
+			break;
+		case TAG_SVG_ATT_line_increment:
+			lsr_write_line_increment_type(lsr, (SVG_Number*)att->data, "lineIncrement");
+			break;
+		case TAG_SVG_ATT_pointer_events:
+			GF_LSR_WRITE_INT(lsr, *(SVG_PointerEvents*)att->data, 4, "pointer-events");
+			break;
+		case TAG_SVG_ATT_shape_rendering:
+			GF_LSR_WRITE_INT(lsr, *(SVG_RenderingHint*)att->data, 3, "shape-rendering");
+			break;
+		case TAG_SVG_ATT_solid_color:
+			lsr_write_paint(lsr, (SVG_Paint*)att->data, "solid-color");
+			break;
+		case TAG_SVG_ATT_solid_opacity:
+			lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "solid-opacity");
+			break;
+		case TAG_SVG_ATT_stop_color:
+			lsr_write_paint(lsr, (SVG_Paint*)att->data, "stop-color");
+			break;
+		case TAG_SVG_ATT_stop_opacity:
+			lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "stop-opacity");
+			break;
 		case TAG_SVG_ATT_stroke_dasharray:
 		{
 			u32 j;
@@ -1129,29 +1211,56 @@
 			} else {
 				GF_LSR_WRITE_INT(lsr, 0, 1, "dashArray");
 				lsr_write_vluimsbf5(lsr, da->array.count, "len");
-		        for (j=0; j<da->array.count; j++) {
-		            lsr_write_fixed_16_8(lsr, da->array.vals[j], "dash");
+				for (j=0; j<da->array.count; j++) {
+					lsr_write_fixed_16_8(lsr, da->array.vals[j], "dash");
 				}
 			}
 		}
-			break;
+		break;
 		case TAG_SVG_ATT_stroke_dashoffset:
-			lsr_write_fixed_16_8i(lsr, (SVG_Number*)att->data, "dashOffset"); break;
+			lsr_write_fixed_16_8i(lsr, (SVG_Number*)att->data, "dashOffset");
+			break;
 
-		case TAG_SVG_ATT_stroke_linecap: GF_LSR_WRITE_INT(lsr, *(SVG_StrokeLineCap*)att->data, 2, "stroke-linecap"); break;
-		case TAG_SVG_ATT_stroke_linejoin: GF_LSR_WRITE_INT(lsr, *(SVG_StrokeLineJoin*)att->data, 2, "stroke-linejoin"); break;
-		case TAG_SVG_ATT_stroke_miterlimit: lsr_write_fixed_16_8i(lsr, (SVG_Number*)att->data, "miterLimit"); break;
-		case TAG_SVG_ATT_stroke_opacity: lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "stroke-opacity"); break;
-		case TAG_SVG_ATT_stroke_width: lsr_write_fixed_16_8i(lsr, (SVG_Number*)att->data, "strokeWidth"); break;
-		case TAG_SVG_ATT_text_anchor: GF_LSR_WRITE_INT(lsr, *(SVG_TextAnchor*)att->data, 2, "text-achor"); break;
-		case TAG_SVG_ATT_text_rendering: GF_LSR_WRITE_INT(lsr, *(SVG_RenderingHint*)att->data, 3, "text-rendering"); break;
-		case TAG_SVG_ATT_viewport_fill: lsr_write_paint(lsr, (SVG_Paint*)att->data, "viewport-fill"); break;
-		case TAG_SVG_ATT_viewport_fill_opacity: lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "viewport-fill-opacity"); break;
-		case TAG_SVG_ATT_vector_effect: GF_LSR_WRITE_INT(lsr, *(SVG_VectorEffect*)att->data, 4, "vector-effect"); break;
-	    case TAG_SVG_ATT_visibility: GF_LSR_WRITE_INT(lsr, *(SVG_PointerEvents*)att->data, 2, "visibility"); break;
-	    case TAG_SVG_ATT_requiredExtensions: lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredExtensions", 1); break;
-	    case TAG_SVG_ATT_requiredFormats: lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredFormats", 0); break;
-	    case TAG_SVG_ATT_requiredFeatures:
+		case TAG_SVG_ATT_stroke_linecap:
+			GF_LSR_WRITE_INT(lsr, *(SVG_StrokeLineCap*)att->data, 2, "stroke-linecap");
+			break;
+		case TAG_SVG_ATT_stroke_linejoin:
+			GF_LSR_WRITE_INT(lsr, *(SVG_StrokeLineJoin*)att->data, 2, "stroke-linejoin");
+			break;
+		case TAG_SVG_ATT_stroke_miterlimit:
+			lsr_write_fixed_16_8i(lsr, (SVG_Number*)att->data, "miterLimit");
+			break;
+		case TAG_SVG_ATT_stroke_opacity:
+			lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "stroke-opacity");
+			break;
+		case TAG_SVG_ATT_stroke_width:
+			lsr_write_fixed_16_8i(lsr, (SVG_Number*)att->data, "strokeWidth");
+			break;
+		case TAG_SVG_ATT_text_anchor:
+			GF_LSR_WRITE_INT(lsr, *(SVG_TextAnchor*)att->data, 2, "text-achor");
+			break;
+		case TAG_SVG_ATT_text_rendering:
+			GF_LSR_WRITE_INT(lsr, *(SVG_RenderingHint*)att->data, 3, "text-rendering");
+			break;
+		case TAG_SVG_ATT_viewport_fill:
+			lsr_write_paint(lsr, (SVG_Paint*)att->data, "viewport-fill");
+			break;
+		case TAG_SVG_ATT_viewport_fill_opacity:
+			lsr_write_fixed_clamp(lsr, ((SVG_Number *)att->data)->value, "viewport-fill-opacity");
+			break;
+		case TAG_SVG_ATT_vector_effect:
+			GF_LSR_WRITE_INT(lsr, *(SVG_VectorEffect*)att->data, 4, "vector-effect");
+			break;
+		case TAG_SVG_ATT_visibility:
+			GF_LSR_WRITE_INT(lsr, *(SVG_PointerEvents*)att->data, 2, "visibility");
+			break;
+		case TAG_SVG_ATT_requiredExtensions:
+			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredExtensions", 1);
+			break;
+		case TAG_SVG_ATT_requiredFormats:
+			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredFormats", 0);
+			break;
+		case TAG_SVG_ATT_requiredFeatures:
 		{
 			GF_List *l = *(GF_List **)att->data;
 			u32 j, tot_count, count = gf_list_count(l);
@@ -1163,67 +1272,197 @@
 				if (iri->type != XMLRI_STRING) continue;
 				ext = strchr(iri->string, '#');
 				if (!ext) continue;
-				if (!stricmp(ext, "Animation")) { vals[tot_count] = 0; tot_count++; }
-				else if (!stricmp(ext, "Audio")) { vals[tot_count] = 1; tot_count++; }
-				else if (!stricmp(ext, "ComposedVideo")) { vals[tot_count] = 2; tot_count++; }
-				else if (!stricmp(ext, "ConditionalProcessing")) { vals[tot_count] = 3; tot_count++; }
-				else if (!stricmp(ext, "ConditionalProcessingAttribute")) { vals[tot_count] = 4; tot_count++; }
-				else if (!stricmp(ext, "CoreAttribute")) { vals[tot_count] = 5; tot_count++; }
-				else if (!stricmp(ext, "Extensibility")) { vals[tot_count] = 6; tot_count++; }
-				else if (!stricmp(ext, "ExternalResourcesRequired")) { vals[tot_count] = 7; tot_count++; }
-				else if (!stricmp(ext, "Font")) { vals[tot_count] = 8; tot_count++; }
-				else if (!stricmp(ext, "Gradient")) { vals[tot_count] = 9; tot_count++; }
-				else if (!stricmp(ext, "GraphicsAttribute")) { vals[tot_count] = 10; tot_count++; }
-				else if (!stricmp(ext, "Handler")) { vals[tot_count] = 11; tot_count++; }
-				else if (!stricmp(ext, "Hyperlinking")) { vals[tot_count] = 12; tot_count++; }
-				else if (!stricmp(ext, "Image")) { vals[tot_count] = 13; tot_count++; }
-				else if (!stricmp(ext, "OpacityAttribute")) { vals[tot_count] = 14; tot_count++; }
-				else if (!stricmp(ext, "PaintAttribute")) { vals[tot_count] = 15; tot_count++; }
-				else if (!stricmp(ext, "Prefetch")) { vals[tot_count] = 16; tot_count++; }
-				else if (!stricmp(ext, "SVG")) { vals[tot_count] = 17; tot_count++; }
-				else if (!stricmp(ext, "SVG-animation")) { vals[tot_count] = 18; tot_count++; }
-				else if (!stricmp(ext, "SVG-dynamic")) { vals[tot_count] = 19; tot_count++; }
-				else if (!stricmp(ext, "SVG-static")) { vals[tot_count] = 20; tot_count++; }
-				else if (!stricmp(ext, "SVGDOM")) { vals[tot_count] = 21; tot_count++; }
-				else if (!stricmp(ext, "SVGDOM-animation")) { vals[tot_count] = 22; tot_count++; }
-				else if (!stricmp(ext, "SVGDOM-dynamic")) { vals[tot_count] = 23; tot_count++; }
-				else if (!stricmp(ext, "SVGDOM-static")) { vals[tot_count] = 24; tot_count++; }
-				else if (!stricmp(ext, "Script")) { vals[tot_count] = 25; tot_count++; }
-				else if (!stricmp(ext, "Shape")) { vals[tot_count] = 26; tot_count++; }
-				else if (!stricmp(ext, "SolidColor")) { vals[tot_count] = 27; tot_count++; }
-				else if (!stricmp(ext, "Structure")) { vals[tot_count] = 28; tot_count++; }
-				else if (!stricmp(ext, "Text")) { vals[tot_count] = 29; tot_count++; }
-				else if (!stricmp(ext, "TimedAnimation")) { vals[tot_count] = 30; tot_count++; }
-				else if (!stricmp(ext, "TransformedVideo")) { vals[tot_count] = 31; tot_count++; }
-				else if (!stricmp(ext, "Video")) { vals[tot_count] = 32; tot_count++; }
-				else if (!stricmp(ext, "XlinkAttribute")) { vals[tot_count] = 33; tot_count++; }
+				if (!stricmp(ext, "Animation")) {
+					vals[tot_count] = 0;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Audio")) {
+					vals[tot_count] = 1;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "ComposedVideo")) {
+					vals[tot_count] = 2;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "ConditionalProcessing")) {
+					vals[tot_count] = 3;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "ConditionalProcessingAttribute")) {
+					vals[tot_count] = 4;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "CoreAttribute")) {
+					vals[tot_count] = 5;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Extensibility")) {
+					vals[tot_count] = 6;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "ExternalResourcesRequired")) {
+					vals[tot_count] = 7;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Font")) {
+					vals[tot_count] = 8;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Gradient")) {
+					vals[tot_count] = 9;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "GraphicsAttribute")) {
+					vals[tot_count] = 10;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Handler")) {
+					vals[tot_count] = 11;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Hyperlinking")) {
+					vals[tot_count] = 12;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Image")) {
+					vals[tot_count] = 13;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "OpacityAttribute")) {
+					vals[tot_count] = 14;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "PaintAttribute")) {
+					vals[tot_count] = 15;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Prefetch")) {
+					vals[tot_count] = 16;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SVG")) {
+					vals[tot_count] = 17;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SVG-animation")) {
+					vals[tot_count] = 18;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SVG-dynamic")) {
+					vals[tot_count] = 19;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SVG-static")) {
+					vals[tot_count] = 20;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SVGDOM")) {
+					vals[tot_count] = 21;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SVGDOM-animation")) {
+					vals[tot_count] = 22;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SVGDOM-dynamic")) {
+					vals[tot_count] = 23;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SVGDOM-static")) {
+					vals[tot_count] = 24;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Script")) {
+					vals[tot_count] = 25;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Shape")) {
+					vals[tot_count] = 26;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "SolidColor")) {
+					vals[tot_count] = 27;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Structure")) {
+					vals[tot_count] = 28;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Text")) {
+					vals[tot_count] = 29;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "TimedAnimation")) {
+					vals[tot_count] = 30;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "TransformedVideo")) {
+					vals[tot_count] = 31;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "Video")) {
+					vals[tot_count] = 32;
+					tot_count++;
+				}
+				else if (!stricmp(ext, "XlinkAttribute")) {
+					vals[tot_count] = 33;
+					tot_count++;
+				}
 			}
 			lsr_write_vluimsbf5(lsr, tot_count, "len");
-	        for (j=0; j<tot_count; j++) {
+			for (j=0; j<tot_count; j++) {
 				GF_LSR_WRITE_INT(lsr, vals[j], 6, "feature");
 			}
 			gf_free(vals);
 		}
-			break;
+		break;
 
-	    case TAG_SVG_ATT_systemLanguage:
+		case TAG_SVG_ATT_systemLanguage:
 			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "systemLanguage", 0);
 			break;
-	    case TAG_XML_ATT_base: lsr_write_byte_align_string(lsr, ((XMLRI*)att->data)->string, "xml:base"); break;
-	    case TAG_XML_ATT_lang: lsr_write_byte_align_string(lsr, *(SVG_String *)att->data, "xml:lang"); break;
-	    case TAG_XML_ATT_space: GF_LSR_WRITE_INT(lsr, *(XML_Space *)att->data, 1, "xml:space"); break;
-		case TAG_SVG_ATT_nav_next: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusNext"); break;
-		case TAG_SVG_ATT_nav_up: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusNorth"); break;
-		case TAG_SVG_ATT_nav_up_left: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusNorthEast"); break;
-		case TAG_SVG_ATT_nav_up_right: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusNorthWest"); break;
-		case TAG_SVG_ATT_nav_prev: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusPrev"); break;
-		case TAG_SVG_ATT_nav_down: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusSouth"); break;
-		case TAG_SVG_ATT_nav_down_left: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusSouthEast"); break;
-		case TAG_SVG_ATT_nav_down_right: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusSouthWest"); break;
-		case TAG_SVG_ATT_nav_right: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusWest"); break;
-		case TAG_SVG_ATT_nav_left: lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusEast"); break;
+		case TAG_XML_ATT_base:
+			lsr_write_byte_align_string(lsr, ((XMLRI*)att->data)->string, "xml:base");
+			break;
+		case TAG_XML_ATT_lang:
+			lsr_write_byte_align_string(lsr, *(SVG_String *)att->data, "xml:lang");
+			break;
+		case TAG_XML_ATT_space:
+			GF_LSR_WRITE_INT(lsr, *(XML_Space *)att->data, 1, "xml:space");
+			break;
+		case TAG_SVG_ATT_nav_next:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusNext");
+			break;
+		case TAG_SVG_ATT_nav_up:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusNorth");
+			break;
+		case TAG_SVG_ATT_nav_up_left:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusNorthEast");
+			break;
+		case TAG_SVG_ATT_nav_up_right:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusNorthWest");
+			break;
+		case TAG_SVG_ATT_nav_prev:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusPrev");
+			break;
+		case TAG_SVG_ATT_nav_down:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusSouth");
+			break;
+		case TAG_SVG_ATT_nav_down_left:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusSouthEast");
+			break;
+		case TAG_SVG_ATT_nav_down_right:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusSouthWest");
+			break;
+		case TAG_SVG_ATT_nav_right:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusWest");
+			break;
+		case TAG_SVG_ATT_nav_left:
+			lsr_write_focus(lsr, (SVG_Focus*)att->data, "focusEast");
+			break;
 
-     	case TAG_SVG_ATT_font_variant: GF_LSR_WRITE_INT(lsr, *(SVG_FontVariant *)att->data, 2, "font-variant"); break;
+		case TAG_SVG_ATT_font_variant:
+			GF_LSR_WRITE_INT(lsr, *(SVG_FontVariant *)att->data, 2, "font-variant");
+			break;
 		case TAG_SVG_ATT_font_family:
 		{
 			s32 idx = lsr_get_font_index(lsr, (SVG_FontFamily*)att->data);
@@ -1234,23 +1473,49 @@
 				GF_LSR_WRITE_INT(lsr, idx, lsr->fontIndexBits, "fontIndex");
 			}
 		}
+		break;
+		case TAG_SVG_ATT_font_size:
+			lsr_write_fixed_16_8i(lsr, (SVG_Number*)att->data, "fontSize");
+			break;
+		case TAG_SVG_ATT_font_style:
+			GF_LSR_WRITE_INT(lsr, *((SVG_FontStyle *)att->data), 3, "fontStyle");
+			break;
+		case TAG_SVG_ATT_font_weight:
+			GF_LSR_WRITE_INT(lsr, *((SVG_FontWeight *)att->data), 4, "fontWeight");
 			break;
-		case TAG_SVG_ATT_font_size: lsr_write_fixed_16_8i(lsr, (SVG_Number*)att->data, "fontSize"); break;
-		case TAG_SVG_ATT_font_style: GF_LSR_WRITE_INT(lsr, *((SVG_FontStyle *)att->data), 3, "fontStyle"); break;
-		case TAG_SVG_ATT_font_weight: GF_LSR_WRITE_INT(lsr, *((SVG_FontWeight *)att->data), 4, "fontWeight"); break;
 
-		case TAG_XLINK_ATT_title: lsr_write_byte_align_string(lsr, *(SVG_String *)att->data, "xlink:title"); break;
+		case TAG_XLINK_ATT_title:
+			lsr_write_byte_align_string(lsr, *(SVG_String *)att->data, "xlink:title");
+			break;
 		/*TODO FIXME*/
-		case TAG_XLINK_ATT_type: GF_LSR_WRITE_INT(lsr, 0, 3, "xlink:type"); break;
-		case TAG_XLINK_ATT_role: lsr_write_any_uri(lsr, (XMLRI*)att->data, "xlink:role"); break;
-		case TAG_XLINK_ATT_arcrole: lsr_write_any_uri(lsr, (XMLRI*)att->data, "xlink:arcrole"); break;
+		case TAG_XLINK_ATT_type:
+			GF_LSR_WRITE_INT(lsr, 0, 3, "xlink:type");
+			break;
+		case TAG_XLINK_ATT_role:
+			lsr_write_any_uri(lsr, (XMLRI*)att->data, "xlink:role");
+			break;
+		case TAG_XLINK_ATT_arcrole:
+			lsr_write_any_uri(lsr, (XMLRI*)att->data, "xlink:arcrole");
+			break;
 		/*TODO FIXME*/
-		case TAG_XLINK_ATT_actuate: GF_LSR_WRITE_INT(lsr, 0, 2, "xlink:actuate"); break;
-		case TAG_XLINK_ATT_show: GF_LSR_WRITE_INT(lsr, 0, 3, "xlink:show"); break;
-		case TAG_SVG_ATT_end: lsr_write_smil_times(lsr, (GF_List **)att->data, "end", 0); break;
-		case TAG_SVG_ATT_min: lsr_write_duration_ex(lsr, (SMIL_Duration*)att->data, "min", 0); break;
-		case TAG_SVG_ATT_max: lsr_write_duration_ex(lsr, (SMIL_Duration*)att->data, "max", 0); break;
-		case TAG_SVG_ATT_transform: lsr_write_matrix(lsr, (SVG_Transform*)att->data); break;
+		case TAG_XLINK_ATT_actuate:
+			GF_LSR_WRITE_INT(lsr, 0, 2, "xlink:actuate");
+			break;
+		case TAG_XLINK_ATT_show:
+			GF_LSR_WRITE_INT(lsr, 0, 3, "xlink:show");
+			break;
+		case TAG_SVG_ATT_end:
+			lsr_write_smil_times(lsr, (GF_List **)att->data, "end", 0);
+			break;
+		case TAG_SVG_ATT_min:
+			lsr_write_duration_ex(lsr, (SMIL_Duration*)att->data, "min", 0);
+			break;
+		case TAG_SVG_ATT_max:
+			lsr_write_duration_ex(lsr, (SMIL_Duration*)att->data, "max", 0);
+			break;
+		case TAG_SVG_ATT_transform:
+			lsr_write_matrix(lsr, (SVG_Transform*)att->data);
+			break;
 
 		}
 		att = att->next;
@@ -1395,10 +1660,10 @@
 	case SVG_Points_datatype:
 		return 3;
 	/*all 0 - 1 types*/
-/*
-	case SVG_Opacity_datatype:
-		return 4;
-*/
+	/*
+		case SVG_Opacity_datatype:
+			return 4;
+	*/
 	case SVG_Paint_datatype:
 		return 5;
 	/*all enums (u8) types*/
@@ -1422,13 +1687,13 @@
 	case SVG_PlaybackOrder_datatype:
 	case SVG_TimelineBegin_datatype:
 		return 6;
-	/*all list-of-int types*/ //return 7;
+/*all list-of-int types*/ //return 7;
 	/*all list-of-float types*/
 	case SVG_StrokeDashArray_datatype:
 	case SVG_ViewBox_datatype:
 	case SVG_Coordinates_datatype:
 		return 8;
-	/*ID (u32) types*/ //return 10;
+/*ID (u32) types*/ //return 10;
 	case SVG_FontFamily_datatype:
 		return 11;
 	case XMLRI_datatype:
@@ -1437,8 +1702,10 @@
 		return 9;
 
 	/*ARG LOOKS LIKE THE SPEC IS BROKEN HERE*/
-	case SVG_Transform_Translate_datatype: return 9;
-	case SVG_Transform_Scale_datatype: return 8;
+	case SVG_Transform_Translate_datatype:
+		return 9;
+	case SVG_Transform_Scale_datatype:
+		return 8;
 	case SVG_Transform_Rotate_datatype:
 		if (vals) {
 			u32 i=0;
@@ -1451,10 +1718,12 @@
 			if (pt->x || pt->y) return 8;
 		}
 		return 1;
-	case SVG_Transform_SkewX_datatype: return 1;
-	case SVG_Transform_SkewY_datatype: return 1;
+	case SVG_Transform_SkewX_datatype:
+		return 1;
+	case SVG_Transform_SkewY_datatype:
+		return 1;
 	//case SVG_Transform_datatype: return;
-		/*FALL THROUH*/
+	/*FALL THROUH*/
 	default:
 		return 255;
 	}
@@ -1500,7 +1769,7 @@
 				GF_LSR_WRITE_INT(lsr, 0, 1, "escapeFlag");
 			}
 		}
-			break;
+		break;
 		}
 	} else if (svg_type==SVG_StrokeDashArray_datatype) {
 		SVG_StrokeDashArray *da = (SVG_StrokeDashArray *)val;
@@ -1514,9 +1783,11 @@
 		GF_LSR_WRITE_INT(lsr, 0, 1, "escapeFlag");
 	}
 
-    switch(lsr_type) {
-    case 0: lsr_write_byte_align_string(lsr, *(DOM_String *)val, name); break;
-    case 1:
+	switch(lsr_type) {
+	case 0:
+		lsr_write_byte_align_string(lsr, *(DOM_String *)val, name);
+		break;
+	case 1:
 		if (svg_type==SVG_Transform_Rotate_datatype) {
 			Fixed angle = ((SVG_Point_Angle *) val)->angle;
 			angle = gf_muldiv(angle, INT2FIX(180), GF_PI);
@@ -1527,14 +1798,28 @@
 			lsr_write_fixed_16_8(lsr, ((SVG_Number *) val)->value, name);
 		}
 		break;
-    case 12: lsr_write_any_uri(lsr, (XMLRI*)val, name); break;
-    case 2: lsr_write_path_type(lsr, (SVG_PathData*)val, name); break;
-    case 3: lsr_write_point_sequence(lsr, (GF_List **)val, name); break;
-    case 4: lsr_write_fixed_clamp(lsr, ((SVG_Number *) val)->value, name); break;
-    case 5: lsr_write_paint(lsr, (SVG_Paint*)val, name); break;
-    case 6: lsr_write_vluimsbf5(lsr, (u32) *(u8 *) val, name); break;
-    case 10: lsr_write_vluimsbf5(lsr, *(u32 *) val, name); break;
-    case 11:
+	case 12:
+		lsr_write_any_uri(lsr, (XMLRI*)val, name);
+		break;
+	case 2:
+		lsr_write_path_type(lsr, (SVG_PathData*)val, name);
+		break;
+	case 3:
+		lsr_write_point_sequence(lsr, (GF_List **)val, name);
+		break;
+	case 4:
+		lsr_write_fixed_clamp(lsr, ((SVG_Number *) val)->value, name);
+		break;
+	case 5:
+		lsr_write_paint(lsr, (SVG_Paint*)val, name);
+		break;
+	case 6:
+		lsr_write_vluimsbf5(lsr, (u32) *(u8 *) val, name);
+		break;
+	case 10:
+		lsr_write_vluimsbf5(lsr, *(u32 *) val, name);
+		break;
+	case 11:
 	{
 		s32 idx = lsr_get_font_index(lsr, (SVG_FontFamily*)val);
 		if (idx<0) {
@@ -1543,19 +1828,19 @@
 		}
 		lsr_write_vluimsbf5(lsr, idx, name);
 	}
-        break;
-    case 7:
+	break;
+	case 7:
 	{
 		GF_List *l = *(GF_List **)val;
 		u32 i, count = gf_list_count(l);
 		lsr_write_vluimsbf5(lsr, count, "count");
-        for (i=0; i<count; i++) {
+		for (i=0; i<count; i++) {
 			u8 *v = (u8 *)gf_list_get(l, i);
 			lsr_write_vluimsbf5(lsr, *v, "val");
-        }
+		}
 	}
-        break;
-    case 8: // floats
+	break;
+	case 8: // floats
 	{
 		u32 i, count;
 		if (svg_type==SVG_StrokeDashArray_datatype) {
@@ -1605,8 +1890,8 @@
 			}
 		}
 	}
-        break;
-    case 9: // point
+	break;
+	case 9: // point
 		if (svg_type==SVG_Motion_datatype) {
 			lsr_write_coordinate(lsr, ((GF_Matrix2D*)val)->m[2], 0, "valX");
 			lsr_write_coordinate(lsr, ((GF_Matrix2D*)val)->m[5], 0, "valY");
@@ -1614,11 +1899,11 @@
 			lsr_write_coordinate(lsr, ((SVG_Point *)val)->x, 0, "valX");
 			lsr_write_coordinate(lsr, ((SVG_Point *)val)->y, 0, "valY");
 		}
-        break;
-    default:
+		break;
+	default:
 		lsr_write_extension(lsr, NULL, 0, name);
-        break;
-    }
+		break;
+	}
 }
 
 static void lsr_write_anim_value(GF_LASeRCodec *lsr, SMIL_AnimateValue *val, const char *name)
@@ -1693,7 +1978,7 @@
 	}
 	GF_LSR_WRITE_INT(lsr, 1, 1, name);
 	lsr_write_vluimsbf5(lsr, count, "count");
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		Fixed *v = (Fixed *)gf_list_get(*l, i);
 		lsr_write_fixed_16_8(lsr, *v, "val");
 	}
@@ -1714,31 +1999,35 @@
 	if (!count) return;
 	/*TODO golomb coding*/
 	GF_LSR_WRITE_INT(lsr, 0, 1, "flag");
-    if (1) {
-        if (count < 3) {
+	if (1) {
+		if (count < 3) {
 			u32 nb_bits = 0;
 			for (i=0; i<count; i++) {
 				u32 k;
 				SVG_Point *pt = (SVG_Point *)gf_list_get(*pts, i);
-				k = lsr_get_bit_size(lsr, pt->x); if (k>nb_bits) nb_bits = k;
-				k = lsr_get_bit_size(lsr, pt->y); if (k>nb_bits) nb_bits = k;
+				k = lsr_get_bit_size(lsr, pt->x);
+				if (k>nb_bits) nb_bits = k;
+				k = lsr_get_bit_size(lsr, pt->y);
+				if (k>nb_bits) nb_bits = k;
 			}
 
 			GF_LSR_WRITE_INT(lsr, nb_bits, 5, "bits");
-            for (i=0; i<count; i++) {
+			for (i=0; i<count; i++) {
 				SVG_Point *pt = (SVG_Point *)gf_list_get(*pts, i);
 				u32 v = lsr_translate_coords(lsr, pt->x, nb_bits);
 				GF_LSR_WRITE_INT(lsr, v, nb_bits, "x");
 				v = lsr_translate_coords(lsr, pt->y, nb_bits);
 				GF_LSR_WRITE_INT(lsr, v, nb_bits, "y");
-            }
-        } else {
+			}
+		} else {
 			Fixed c_x, c_y;
 			u32 k, nb_dx, nb_dy;
 			SVG_Point *pt = (SVG_Point *)gf_list_get(*pts, 0);
 			nb_dx = 0;
-			k = lsr_get_bit_size(lsr, pt->x); if (k>nb_dx) nb_dx = k;
-			k = lsr_get_bit_size(lsr, pt->y); if (k>nb_dx) nb_dx = k;
+			k = lsr_get_bit_size(lsr, pt->x);
+			if (k>nb_dx) nb_dx = k;
+			k = lsr_get_bit_size(lsr, pt->y);
+			if (k>nb_dx) nb_dx = k;
 			GF_LSR_WRITE_INT(lsr, nb_dx, 5, "bits");
 			k = lsr_translate_coords(lsr, pt->x, nb_dx);
 			GF_LSR_WRITE_INT(lsr, k, nb_dx, "x");
@@ -1749,8 +2038,10 @@
 			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); if (k>nb_dx) nb_dx = k;
-				k = lsr_get_bit_size(lsr, pt->y - c_y); if (k>nb_dy) nb_dy = k;
+				k = lsr_get_bit_size(lsr, pt->x - c_x);
+				if (k>nb_dx) nb_dx = k;
+				k = lsr_get_bit_size(lsr, pt->y - c_y);
+				if (k>nb_dy) nb_dy = k;
 				c_x = pt->x;
 				c_y = pt->y;
 			}
@@ -1767,7 +2058,7 @@
 				c_x = pt->x;
 				c_y = pt->y;
 			}
-        }
+		}
 	}
 }
 static void lsr_write_path_type(GF_LASeRCodec *lsr, SVG_PathData *path, const char *name)
@@ -1843,11 +2134,11 @@
 	lsr_write_point_sequence(lsr, path->points, "seq");
 	/*initial move is not coded*/
 	count = gf_list_count(path->commands);
-    lsr_write_vluimsbf5(lsr, count, "nbOfTypes");
-    for (i; i<count; i++) {
-        u8 type = *(u8 *) gf_list_get(path->commands, i);
+	lsr_write_vluimsbf5(lsr, count, "nbOfTypes");
+	for (i; i<count; i++) {
+		u8 type = *(u8 *) gf_list_get(path->commands, i);
 		GF_LSR_WRITE_INT(lsr, type, 5, name);
-    }
+	}
 #endif
 }
 
@@ -1891,7 +2182,7 @@
 		GF_LSR_WRITE_INT(lsr, 0, 1, name);
 	} else {
 		GF_LSR_WRITE_INT(lsr, 1, 1, name);
-	    lsr_write_vluimsbf5(lsr, count, "nb_coords");
+		lsr_write_vluimsbf5(lsr, count, "nb_coords");
 		for (i=0; i<count; i++) {
 			SVG_Coordinate *c = (SVG_Coordinate *)gf_list_get(*coords, i);
 			u32 res = lsr_translate_coords(lsr, c->value, lsr->coord_bits);
@@ -1947,14 +2238,28 @@
 	s32 val = (s32) (n->value * (1<<8) );
 #endif
 	GF_LSR_WRITE_INT(lsr, val, 32, name);
-    switch (n->type) {
-	case SVG_NUMBER_IN: GF_LSR_WRITE_INT(lsr, 1, 3, "units"); break;
-	case SVG_NUMBER_CM: GF_LSR_WRITE_INT(lsr, 2, 3, "units"); break;
-	case SVG_NUMBER_MM: GF_LSR_WRITE_INT(lsr, 3, 3, "units"); break;
-	case SVG_NUMBER_PT: GF_LSR_WRITE_INT(lsr, 4, 3, "units"); break;
-	case SVG_NUMBER_PC: GF_LSR_WRITE_INT(lsr, 5, 3, "units"); break;
-	case SVG_NUMBER_PERCENTAGE: GF_LSR_WRITE_INT(lsr, 6, 3, "units"); break;
-	default: GF_LSR_WRITE_INT(lsr, 0, 3, "units"); break;
+	switch (n->type) {
+	case SVG_NUMBER_IN:
+		GF_LSR_WRITE_INT(lsr, 1, 3, "units");
+		break;
+	case SVG_NUMBER_CM:
+		GF_LSR_WRITE_INT(lsr, 2, 3, "units");
+		break;
+	case SVG_NUMBER_MM:
+		GF_LSR_WRITE_INT(lsr, 3, 3, "units");
+		break;
+	case SVG_NUMBER_PT:
+		GF_LSR_WRITE_INT(lsr, 4, 3, "units");
+		break;
+	case SVG_NUMBER_PC:
+		GF_LSR_WRITE_INT(lsr, 5, 3, "units");
+		break;
+	case SVG_NUMBER_PERCENTAGE:
+		GF_LSR_WRITE_INT(lsr, 6, 3, "units");
+		break;
+	default:
+		GF_LSR_WRITE_INT(lsr, 0, 3, "units");
+		break;
 	}
 }
 
@@ -1967,7 +2272,7 @@
 		GF_LSR_WRITE_INT(lsr, 1, 1, name);
 		GF_LSR_WRITE_INT(lsr, 0, 1, "isEnum");
 		GF_LSR_WRITE_INT(lsr, 0, 1, "sign");
-		lsr_write_vluimsbf5(lsr, (u32) (lsr->time_resolution* *clock), "val");
+		lsr_write_vluimsbf5(lsr, (u32) (lsr->time_resolution**clock), "val");
 	}
 }
 
@@ -1997,16 +2302,36 @@
 	GF_LSR_WRITE_INT(lsr, 0, 1, "choice (meetOrSlice)");
 	GF_LSR_WRITE_INT(lsr, preserveAspectRatio->defer ? 1 : 0, 1, "choice (defer)");
 	switch (preserveAspectRatio->align) {
-	case SVG_PRESERVEASPECTRATIO_XMAXYMAX: GF_LSR_WRITE_INT(lsr, 1, 4, "alignXandY"); break;
-	case SVG_PRESERVEASPECTRATIO_XMAXYMID: GF_LSR_WRITE_INT(lsr, 2, 4, "alignXandY"); break;
-	case SVG_PRESERVEASPECTRATIO_XMAXYMIN: GF_LSR_WRITE_INT(lsr, 3, 4, "alignXandY"); break;
-	case SVG_PRESERVEASPECTRATIO_XMIDYMAX: GF_LSR_WRITE_INT(lsr, 4, 4, "alignXandY"); break;
-	case SVG_PRESERVEASPECTRATIO_XMIDYMID: GF_LSR_WRITE_INT(lsr, 5, 4, "alignXandY"); break;
-	case SVG_PRESERVEASPECTRATIO_XMIDYMIN: GF_LSR_WRITE_INT(lsr, 6, 4, "alignXandY"); break;
-	case SVG_PRESERVEASPECTRATIO_XMINYMAX: GF_LSR_WRITE_INT(lsr, 7, 4, "alignXandY"); break;
-	case SVG_PRESERVEASPECTRATIO_XMINYMID: GF_LSR_WRITE_INT(lsr, 8, 4, "alignXandY"); break;
-	case SVG_PRESERVEASPECTRATIO_XMINYMIN: GF_LSR_WRITE_INT(lsr, 9, 4, "alignXandY"); break;
-	default: GF_LSR_WRITE_INT(lsr, 0, 4, "alignXandY"); break;
+	case SVG_PRESERVEASPECTRATIO_XMAXYMAX:
+		GF_LSR_WRITE_INT(lsr, 1, 4, "alignXandY");
+		break;
+	case SVG_PRESERVEASPECTRATIO_XMAXYMID:
+		GF_LSR_WRITE_INT(lsr, 2, 4, "alignXandY");
+		break;
+	case SVG_PRESERVEASPECTRATIO_XMAXYMIN:
+		GF_LSR_WRITE_INT(lsr, 3, 4, "alignXandY");
+		break;
+	case SVG_PRESERVEASPECTRATIO_XMIDYMAX:
+		GF_LSR_WRITE_INT(lsr, 4, 4, "alignXandY");
+		break;
+	case SVG_PRESERVEASPECTRATIO_XMIDYMID:
+		GF_LSR_WRITE_INT(lsr, 5, 4, "alignXandY");
+		break;
+	case SVG_PRESERVEASPECTRATIO_XMIDYMIN:
+		GF_LSR_WRITE_INT(lsr, 6, 4, "alignXandY");
+		break;
+	case SVG_PRESERVEASPECTRATIO_XMINYMAX:
+		GF_LSR_WRITE_INT(lsr, 7, 4, "alignXandY");
+		break;
+	case SVG_PRESERVEASPECTRATIO_XMINYMID:
+		GF_LSR_WRITE_INT(lsr, 8, 4, "alignXandY");
+		break;
+	case SVG_PRESERVEASPECTRATIO_XMINYMIN:
+		GF_LSR_WRITE_INT(lsr, 9, 4, "alignXandY");
+		break;
+	default:
+		GF_LSR_WRITE_INT(lsr, 0, 4, "alignXandY");
+		break;
 	}
 }
 
@@ -2117,11 +2442,21 @@
 	type = atts.transform_type ? *atts.transform_type : SVG_TRANSFORM_TRANSLATE;
 	/*enumeration rotate{0} scale{1} skewX{2} skewY{3} translate{4}*/
 	switch (type) {
-	case SVG_TRANSFORM_ROTATE: GF_LSR_WRITE_INT(lsr, 0, 3, "rotscatra"); break;
-	case SVG_TRANSFORM_SCALE: GF_LSR_WRITE_INT(lsr, 1, 3, "rotscatra"); break;
-	case SVG_TRANSFORM_SKEWX: GF_LSR_WRITE_INT(lsr, 2, 3, "rotscatra"); break;
-	case SVG_TRANSFORM_SKEWY: GF_LSR_WRITE_INT(lsr, 3, 3, "rotscatra"); break;
-	case SVG_TRANSFORM_TRANSLATE: GF_LSR_WRITE_INT(lsr, 4, 3, "rotscatra"); break;
+	case SVG_TRANSFORM_ROTATE:
+		GF_LSR_WRITE_INT(lsr, 0, 3, "rotscatra");
+		break;
+	case SVG_TRANSFORM_SCALE:
+		GF_LSR_WRITE_INT(lsr, 1, 3, "rotscatra");
+		break;
+	case SVG_TRANSFORM_SKEWX:
+		GF_LSR_WRITE_INT(lsr, 2, 3, "rotscatra");
+		break;
+	case SVG_TRANSFORM_SKEWY:
+		GF_LSR_WRITE_INT(lsr, 3, 3, "rotscatra");
+		break;
+	case SVG_TRANSFORM_TRANSLATE:
+		GF_LSR_WRITE_INT(lsr, 4, 3, "rotscatra");
+		break;
 	}
 
 	lsr_write_accumulate(lsr, atts.accumulate);
@@ -2271,15 +2606,15 @@
 	lsr_write_coordinate_ptr(lsr, atts.y, 1, "y");
 
 	lsr_write_any_attribute(lsr, elt, 1);
-/*	TODO
-	bit(1) opt_group;
-	if(opt_group) {
-		vluimsbf5 occ1;
-		for(int t=0;t<occ1;t++) {
-			privateElementContainer child0[[t]];
+	/*	TODO
+		bit(1) opt_group;
+		if(opt_group) {
+			vluimsbf5 occ1;
+			for(int t=0;t<occ1;t++) {
+				privateElementContainer child0[[t]];
+			}
 		}
-	}
-*/
+	*/
 	GF_LSR_WRITE_INT(lsr, 0, 1, "opt_group");
 }
 
@@ -2293,9 +2628,9 @@
 
 
 	if (!ommit_tag
-		&& lsr_elt_has_same_base(lsr, &atts, lsr->prev_g, &same_fill, NULL, 0)
-		&& same_fill
-		) {
+	        && lsr_elt_has_same_base(lsr, &atts, lsr->prev_g, &same_fill, NULL, 0)
+	        && same_fill
+	   ) {
 		/*samegType*/
 		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_sameg, 6, "ch4");
 		lsr_write_id(lsr, (GF_Node *) elt);
@@ -2349,8 +2684,8 @@
 	gf_svg_flatten_attributes(elt, &atts);
 
 	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_line, &same_fill, NULL, 0)
-		&& same_fill
-		) {
+	        && same_fill
+	   ) {
 		/*samelineType*/
 		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_sameline, 6, "ch4");
 		lsr_write_id(lsr, (GF_Node *) elt);
@@ -2452,7 +2787,7 @@
 	gf_svg_flatten_attributes(elt, &atts);
 
 	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_polygon, &same_fill, &same_stroke, 1)
-		) {
+	   ) {
 		if (same_fill && same_stroke) same_type = 1;
 		else if (same_fill) same_type = 3;
 		else if (same_stroke) same_type = 2;
@@ -2509,7 +2844,7 @@
 	gf_svg_flatten_attributes(elt, &atts);
 
 	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_rect, &same_fill, NULL, 0)
-		) {
+	   ) {
 		if (!same_fill) {
 			same_type = 2;
 			/*samerectfillType*/
@@ -2685,17 +3020,25 @@
 	GF_LSR_WRITE_INT(lsr, atts.syncBehaviorDefault ? 1 : 0, 1, "hasSyncBehavior");
 	if (atts.syncBehaviorDefault) {
 		switch (*atts.syncBehaviorDefault) {
-		case SMIL_SYNCBEHAVIOR_CANSLIP: GF_LSR_WRITE_INT(lsr, 0, 2, "syncBehavior"); break;
-		case SMIL_SYNCBEHAVIOR_INDEPENDENT: GF_LSR_WRITE_INT(lsr, 1, 2, "syncBehavior"); break;
-		case SMIL_SYNCBEHAVIOR_LOCKED: GF_LSR_WRITE_INT(lsr, 3, 2, "syncBehavior"); break;
-		default: GF_LSR_WRITE_INT(lsr, 2, 2, "syncBehavior"); break;
+		case SMIL_SYNCBEHAVIOR_CANSLIP:
+			GF_LSR_WRITE_INT(lsr, 0, 2, "syncBehavior");
+			break;
+		case SMIL_SYNCBEHAVIOR_INDEPENDENT:
+			GF_LSR_WRITE_INT(lsr, 1, 2, "syncBehavior");
+			break;
+		case SMIL_SYNCBEHAVIOR_LOCKED:
+			GF_LSR_WRITE_INT(lsr, 3, 2, "syncBehavior");
+			break;
+		default:
+			GF_LSR_WRITE_INT(lsr, 2, 2, "syncBehavior");
+			break;
 		}
 	}
 	GF_LSR_WRITE_INT(lsr, atts.syncToleranceDefault ? 1 : 0, 1, "hasSyncToleranceDefault");
 	if (atts.syncToleranceDefault) {
 		if (atts.syncToleranceDefault->type==SMIL_SYNCTOLERANCE_VALUE) {
 			GF_LSR_WRITE_INT(lsr, 0, 1, "choice");
-		    lsr_write_vluimsbf5(lsr, (u32) (atts.syncToleranceDefault->value*lsr->time_resolution), "value");
+			lsr_write_vluimsbf5(lsr, (u32) (atts.syncToleranceDefault->value*lsr->time_resolution), "value");
 		} else {
 			GF_LSR_WRITE_INT(lsr, 1, 1, "choice");
 		}
@@ -2795,8 +3138,8 @@
 	gf_svg_flatten_attributes(elt, &atts);
 
 	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_use, NULL, NULL, 0)
-		/*TODO check overflow*/
-	) {
+	        /*TODO check overflow*/
+	   ) {
 		is_same = 1;
 		/*sameuseType*/
 		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_sameuse, 6, "ch4");
@@ -2958,7 +3301,8 @@
 		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_circle, 6, "ch4");
 		lsr_write_circle(lsr, node);
 		break;
-	case TAG_LSR_cursorManager: GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_cursorManager, 6, "ch4");
+	case TAG_LSR_cursorManager:
+		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_cursorManager, 6, "ch4");
 		lsr_write_cursorManager(lsr, node);
 		break;
 	case TAG_SVG_defs:
@@ -3088,7 +3432,7 @@
 
 	default:
 #if 0
-	/*case extend*/
+		/*case extend*/
 		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_element_any, 6, "ch4");
 		lsr_write_extend_class(lsr, NULL, 0, node);
 		break;
@@ -3129,39 +3473,138 @@
 	} else {
 		GF_LSR_WRITE_INT(lsr, 0, 1, "ch4");
 		switch(tag) {
-		case TAG_SVG_a: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_a, 6, "ch6"); lsr_write_a(lsr, node); break;
-		case TAG_SVG_animate: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_animate, 6, "ch6"); lsr_write_animate(lsr, node, parent); break;
-		case TAG_SVG_animateColor: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_animateColor, 6, "ch6"); lsr_write_animate(lsr, node, parent); break;
-		case TAG_SVG_animateMotion: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_animateMotion, 6, "ch6"); lsr_write_animateMotion(lsr, node, parent); break;
-		case TAG_SVG_animateTransform: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_animateTransform, 6, "ch6"); lsr_write_animateTransform(lsr, node, parent); break;
-		case TAG_SVG_audio: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_audio, 6, "ch6"); lsr_write_audio(lsr, node); break;
-		case TAG_SVG_circle: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_circle, 6, "ch6"); lsr_write_circle(lsr, node); break;
-		case TAG_SVG_defs: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_defs, 6, "ch6"); lsr_write_defs(lsr, node); break;
-		case TAG_SVG_desc: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_desc, 6, "ch6"); lsr_write_data(lsr, node); break;
-		case TAG_SVG_ellipse: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_ellipse, 6, "ch6"); lsr_write_ellipse(lsr, node); break;
-		case TAG_SVG_foreignObject: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_foreignObject, 6, "ch6"); lsr_write_foreignObject(lsr, node); break;
-		case TAG_SVG_g: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_g, 6, "ch6"); lsr_write_g(lsr, node, 1); break;
-		case TAG_SVG_image: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_image, 6, "ch6"); lsr_write_image(lsr, node); break;
-		case TAG_SVG_line: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_line, 6, "ch6"); lsr_write_line(lsr, node, 1); break;
-		case TAG_SVG_linearGradient: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_linearGradient, 6, "ch6"); lsr_write_linearGradient(lsr, node); break;
-		case TAG_SVG_metadata: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_metadata, 6, "ch6"); lsr_write_data(lsr, node); break;
-		case TAG_SVG_mpath: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_mpath, 6, "ch6"); lsr_write_mpath(lsr, node); break;
-		case TAG_SVG_path: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_path, 6, "ch6"); lsr_write_path(lsr, node, 1); break;
-		case TAG_SVG_polygon: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_polygon, 6, "ch6"); lsr_write_polygon(lsr, node, 0, 1); break;
-		case TAG_SVG_polyline: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_polyline, 6, "ch6"); lsr_write_polygon(lsr, node, 1, 1); break;
-		case TAG_SVG_radialGradient: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_radialGradient, 6, "ch6"); lsr_write_radialGradient(lsr, node); break;
-		case TAG_SVG_rect: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_rect, 6, "ch6"); lsr_write_rect(lsr, node, 1); break;
-		case TAG_SVG_script: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_script, 6, "ch6"); lsr_write_script(lsr, node); break;
-		case TAG_SVG_set: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_set, 6, "ch6"); lsr_write_set(lsr, node, parent); break;
-		case TAG_SVG_stop: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_stop, 6, "ch6"); lsr_write_stop(lsr, node); break;
-		case TAG_SVG_svg: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_svg, 6, "ch6"); lsr_write_svg(lsr, node); break;
-		case TAG_SVG_switch: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_switch, 6, "ch6"); lsr_write_switch(lsr, node); break;
-		case TAG_SVG_text: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_text, 6, "ch6"); lsr_write_text(lsr, node, 1); break;
-		case TAG_SVG_title: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_title, 6, "ch6"); lsr_write_data(lsr, node); break;
-		case TAG_SVG_tspan: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_tspan, 6, "ch6"); lsr_write_tspan(lsr, node); break;
-		case TAG_SVG_use: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_use, 6, "ch6"); lsr_write_use(lsr, node, 1); break;
-		case TAG_SVG_video: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_video, 6, "ch6"); lsr_write_video(lsr, node); break;
-		case TAG_SVG_listener: GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_listener, 6, "ch6"); lsr_write_listener(lsr, node); break;
+		case TAG_SVG_a:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_a, 6, "ch6");
+			lsr_write_a(lsr, node);
+			break;
+		case TAG_SVG_animate:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_animate, 6, "ch6");
+			lsr_write_animate(lsr, node, parent);
+			break;
+		case TAG_SVG_animateColor:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_animateColor, 6, "ch6");
+			lsr_write_animate(lsr, node, parent);
+			break;
+		case TAG_SVG_animateMotion:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_animateMotion, 6, "ch6");
+			lsr_write_animateMotion(lsr, node, parent);
+			break;
+		case TAG_SVG_animateTransform:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_animateTransform, 6, "ch6");
+			lsr_write_animateTransform(lsr, node, parent);
+			break;
+		case TAG_SVG_audio:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_audio, 6, "ch6");
+			lsr_write_audio(lsr, node);
+			break;
+		case TAG_SVG_circle:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_circle, 6, "ch6");
+			lsr_write_circle(lsr, node);
+			break;
+		case TAG_SVG_defs:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_defs, 6, "ch6");
+			lsr_write_defs(lsr, node);
+			break;
+		case TAG_SVG_desc:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_desc, 6, "ch6");
+			lsr_write_data(lsr, node);
+			break;
+		case TAG_SVG_ellipse:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_ellipse, 6, "ch6");
+			lsr_write_ellipse(lsr, node);
+			break;
+		case TAG_SVG_foreignObject:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_foreignObject, 6, "ch6");
+			lsr_write_foreignObject(lsr, node);
+			break;
+		case TAG_SVG_g:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_g, 6, "ch6");
+			lsr_write_g(lsr, node, 1);
+			break;
+		case TAG_SVG_image:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_image, 6, "ch6");
+			lsr_write_image(lsr, node);
+			break;
+		case TAG_SVG_line:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_line, 6, "ch6");
+			lsr_write_line(lsr, node, 1);
+			break;
+		case TAG_SVG_linearGradient:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_linearGradient, 6, "ch6");
+			lsr_write_linearGradient(lsr, node);
+			break;
+		case TAG_SVG_metadata:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_metadata, 6, "ch6");
+			lsr_write_data(lsr, node);
+			break;
+		case TAG_SVG_mpath:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_mpath, 6, "ch6");
+			lsr_write_mpath(lsr, node);
+			break;
+		case TAG_SVG_path:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_path, 6, "ch6");
+			lsr_write_path(lsr, node, 1);
+			break;
+		case TAG_SVG_polygon:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_polygon, 6, "ch6");
+			lsr_write_polygon(lsr, node, 0, 1);
+			break;
+		case TAG_SVG_polyline:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_polyline, 6, "ch6");
+			lsr_write_polygon(lsr, node, 1, 1);
+			break;
+		case TAG_SVG_radialGradient:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_radialGradient, 6, "ch6");
+			lsr_write_radialGradient(lsr, node);
+			break;
+		case TAG_SVG_rect:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_rect, 6, "ch6");
+			lsr_write_rect(lsr, node, 1);
+			break;
+		case TAG_SVG_script:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_script, 6, "ch6");
+			lsr_write_script(lsr, node);
+			break;
+		case TAG_SVG_set:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_set, 6, "ch6");
+			lsr_write_set(lsr, node, parent);
+			break;
+		case TAG_SVG_stop:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_stop, 6, "ch6");
+			lsr_write_stop(lsr, node);
+			break;
+		case TAG_SVG_svg:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_svg, 6, "ch6");
+			lsr_write_svg(lsr, node);
+			break;
+		case TAG_SVG_switch:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_switch, 6, "ch6");
+			lsr_write_switch(lsr, node);
+			break;
+		case TAG_SVG_text:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_text, 6, "ch6");
+			lsr_write_text(lsr, node, 1);
+			break;
+		case TAG_SVG_title:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_title, 6, "ch6");
+			lsr_write_data(lsr, node);
+			break;
+		case TAG_SVG_tspan:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_tspan, 6, "ch6");
+			lsr_write_tspan(lsr, node);
+			break;
+		case TAG_SVG_use:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_use, 6, "ch6");
+			lsr_write_use(lsr, node, 1);
+			break;
+		case TAG_SVG_video:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_video, 6, "ch6");
+			lsr_write_video(lsr, node);
+			break;
+		case TAG_SVG_listener:
+			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_listener, 6, "ch6");
+			lsr_write_listener(lsr, node);
+			break;
 		}
 	}
 }
@@ -3207,25 +3650,25 @@
 			lsr_write_coordinate(lsr, pt->x, 0, "x");
 			lsr_write_coordinate(lsr, pt->y, 0, "y");
 		}
-			break;
+		break;
 		case SMIL_Times_datatype:/*smil_times*/
 		{
 			SMIL_Time *st = gf_list_get(*(GF_List **)val, 0);
 			lsr_write_smil_time(lsr, st);
 		}
-			break;
+		break;
 		case SMIL_KeyPoints_datatype:/*0to1*/
 		{
 			Fixed *f = gf_list_get(*(GF_List **)val, 0);
 			lsr_write_fixed_clamp(lsr, *f, "v");
 		}
-			break;
+		break;
 		case SMIL_KeySplines_datatype:/*float*/
 		{
 			Fixed *f = gf_list_get(*(GF_List **)val, 0);
 			lsr_write_fixed_16_8(lsr, *f, "v");
 		}
-			break;
+		break;
 		case SMIL_KeyTimes_datatype:/*keyTime*/
 		{
 			Fixed *v = gf_list_get(*(GF_List **)val, 0);
@@ -3238,7 +3681,7 @@
 				lsr_write_fixed_clamp(lsr, f, "timevalue");
 			}
 		}
-			break;
+		break;
 		case SVG_StrokeDashArray_datatype:/*float*/
 		case SVG_ViewBox_datatype:/*float*/
 			break;
@@ -3389,7 +3832,7 @@
 				}
 			}
 		}
-			break;
+		break;
 		case SVG_ViewBox_datatype:
 		{
 			SVG_ViewBox *b = (SVG_ViewBox *)val;
@@ -3401,7 +3844,7 @@
 			lsr_write_fixed_16_8(lsr, b->width, "width");
 			lsr_write_fixed_16_8(lsr, b->width, "height");
 		}
-			break;
+		break;
 		case SVG_FontFamily_datatype:
 		{
 			SVG_FontFamily *ff = (SVG_FontFamily *)val;
@@ -3416,7 +3859,7 @@
 				lsr_write_vluimsbf5(lsr, (u32) idx, "nb1");
 			}
 		}
-			break;
+		break;
 		default:
 			if ((fieldType>=SVG_FillRule_datatype) && (fieldType<=SVG_LAST_U8_PROPERTY)) {
 				u8 v = *(u8 *)val;
@@ -3651,7 +4094,7 @@
 			GF_LSR_WRITE_INT(lsr, (com->tag==GF_SG_LSR_ACTIVATE) ? 1 : 2, 2, "ch5");
 			lsr_write_codec_IDREF_Node(lsr, com->node, "ref");
 		}
-			break;
+		break;
 		default:
 			return GF_BAD_PARAM;
 		}
@@ -3754,7 +4197,7 @@
 				else if (!strcmp(an->name, "font-family")) check_anim_font = 1;
 			}
 		}
-			break;
+		break;
 		}
 		att = att->next;
 	}
@@ -3778,7 +4221,7 @@
 					else if (check_anim_col == 2) lsr_check_col_index(lsr, (SVG_Color*)gf_list_get(vals->values, i), NULL);
 				}
 			}
-				break;
+			break;
 			}
 			att = att->next;
 		}

gpac-0.5.0.svn5178.tar.bz2/src/laser/lsr_tables.c -> gpac-0.5.1.svn5491.tar.xz/src/laser/lsr_tables.c Changed

@@ -14,7 +14,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -36,140 +36,274 @@
 
 s32 gf_lsr_anim_type_from_attribute(u32 tag) {
 	switch(tag) {
-	case TAG_SVG_ATT_target: return 0;
-	case TAG_SVG_ATT_accumulate: return 1;
-	case TAG_SVG_ATT_additive: return 2;
-	case TAG_SVG_ATT_audio_level: return 3;
-	case TAG_SVG_ATT_bandwidth: return 4;
-	case TAG_SVG_ATT_begin: return 5;
-	case TAG_SVG_ATT_calcMode: return 6;
-	case TAG_LSR_ATT_children: return 7;
-	case TAG_SVG_ATT_choice: return 8;
-	case TAG_SVG_ATT_clipBegin: return 9;
-	case TAG_SVG_ATT_clipEnd: return 10;
-	case TAG_SVG_ATT_color: return 11;
-	case TAG_SVG_ATT_color_rendering: return 12;
-	case TAG_SVG_ATT_cx: return 13;
-	case TAG_SVG_ATT_cy: return 14;
-	case TAG_SVG_ATT_d: return 15;
-	case TAG_SVG_ATT_delta: return 16;
-	case TAG_SVG_ATT_display: return 17;
-	case TAG_SVG_ATT_display_align: return 18;
-	case TAG_SVG_ATT_dur: return 19;
-	case TAG_SVG_ATT_editable: return 20;
-	case TAG_LSR_ATT_enabled: return 21;
-	case TAG_SVG_ATT_end: return 22;
-	case TAG_XMLEV_ATT_event: return 23;
-	case TAG_SVG_ATT_externalResourcesRequired: return 24;
-	case TAG_SVG_ATT_fill: return 25;
-	case TAG_SVG_ATT_fill_opacity: return 26;
-	case TAG_SVG_ATT_fill_rule: return 27;
-	case TAG_SVG_ATT_focusable: return 28;
-	case TAG_SVG_ATT_font_family: return 29;
-	case TAG_SVG_ATT_font_size: return 30;
-	case TAG_SVG_ATT_font_style: return 31;
-	case TAG_SVG_ATT_font_variant: return 32;
-	case TAG_SVG_ATT_font_weight: return 33;
-	case TAG_SVG_ATT_fullscreen: return 34;
-	case TAG_SVG_ATT_gradientUnits: return 35;
-	case TAG_XMLEV_ATT_handler: return 36;
-	case TAG_SVG_ATT_height: return 37;
-	case TAG_SVG_ATT_image_rendering: return 38;
-	case TAG_SVG_ATT_keyPoints: return 39;
-	case TAG_SVG_ATT_keySplines: return 40;
-	case TAG_SVG_ATT_keyTimes: return 41;
-	case TAG_SVG_ATT_line_increment: return 42;
-	case TAG_XMLEV_ATT_target: return 43;
-	case TAG_SVG_ATT_mediaCharacterEncoding: return 44;
-	case TAG_SVG_ATT_mediaContentEncodings: return 45;
-	case TAG_SVG_ATT_mediaSize: return 46;
-	case TAG_SVG_ATT_mediaTime: return 47;
-	case TAG_SVG_ATT_nav_down: return 48;
-	case TAG_SVG_ATT_nav_down_left: return 49;
-	case TAG_SVG_ATT_nav_down_right: return 50;
-	case TAG_SVG_ATT_nav_left: return 51;
-	case TAG_SVG_ATT_nav_next: return 52;
-	case TAG_SVG_ATT_nav_prev: return 53;
-	case TAG_SVG_ATT_nav_right: return 54;
-	case TAG_SVG_ATT_nav_up: return 55;
-	case TAG_SVG_ATT_nav_up_left: return 56;
-	case TAG_SVG_ATT_nav_up_right: return 57;
-	case TAG_XMLEV_ATT_observer: return 58;
-	case TAG_SVG_ATT_offset: return 59;
-	case TAG_SVG_ATT_opacity: return 60;
-	case TAG_SVG_ATT_overflow: return 61;
-	case TAG_SVG_ATT_overlay: return 62;
-	case TAG_SVG_ATT_path: return 63;
-	case TAG_SVG_ATT_pathLength: return 64;
-	case TAG_SVG_ATT_pointer_events: return 65;
-	case TAG_SVG_ATT_points: return 66;
-	case TAG_SVG_ATT_preserveAspectRatio: return 67;
-	case TAG_SVG_ATT_r: return 68;
-	case TAG_SVG_ATT_repeatCount: return 69;
-	case TAG_SVG_ATT_repeatDur: return 70;
-	case TAG_SVG_ATT_requiredExtensions: return 71;
-	case TAG_SVG_ATT_requiredFeatures: return 72;
-	case TAG_SVG_ATT_requiredFormats: return 73;
-	case TAG_SVG_ATT_restart: return 74;
-	case TAG_SVG_ATT_rotate: return 75;
-	case TAG_LSR_ATT_rotation: return 76;
-	case TAG_SVG_ATT_rx: return 77;
-	case TAG_SVG_ATT_ry: return 78;
-	case TAG_LSR_ATT_scale: return 79;
-	case TAG_SVG_ATT_shape_rendering: return 80;
-	case TAG_SVG_ATT_size: return 81;
-	case TAG_SVG_ATT_solid_color: return 82;
-	case TAG_SVG_ATT_solid_opacity: return 83;
-	case TAG_SVG_ATT_stop_color: return 84;
-	case TAG_SVG_ATT_stop_opacity: return 85;
-	case TAG_SVG_ATT_stroke: return 86;
-	case TAG_SVG_ATT_stroke_dasharray: return 87;
-	case TAG_SVG_ATT_stroke_dashoffset: return 88;
-	case TAG_SVG_ATT_stroke_linecap: return 89;
-	case TAG_SVG_ATT_stroke_linejoin: return 90;
-	case TAG_SVG_ATT_stroke_miterlimit: return 91;
-	case TAG_SVG_ATT_stroke_opacity: return 92;
-	case TAG_SVG_ATT_stroke_width: return 93;
-	case TAG_LSR_ATT_svg_height: return 94;
-	case TAG_LSR_ATT_svg_width: return 95;
-	case TAG_SVG_ATT_syncBehavior: return 96;
-	case TAG_SVG_ATT_syncBehaviorDefault: return 97;
-	case TAG_SVG_ATT_syncReference: return 98;
-	case TAG_SVG_ATT_syncTolerance: return 99;
-	case TAG_SVG_ATT_syncToleranceDefault: return 100;
-	case TAG_SVG_ATT_systemLanguage: return 101;
-	case TAG_SVG_ATT_text_align: return 102;
-	case TAG_SVG_ATT_text_anchor: return 103;
-	case TAG_SVG_ATT_text_decoration: return 104;
-	case TAG_LSR_ATT_text_display: return 105;
-	case TAG_SVG_ATT_text_rendering: return 106;
-	case TAG_LSR_ATT_textContent: return 107;
-	case TAG_SVG_ATT_transform: return 108;
-	case TAG_SVG_ATT_transformBehavior: return 109;
-	case TAG_LSR_ATT_translation: return 110;
-	case TAG_SVG_ATT_vector_effect: return 111;
-	case TAG_SVG_ATT_viewBox: return 112;
-	case TAG_SVG_ATT_viewport_fill: return 113;
-	case TAG_SVG_ATT_viewport_fill_opacity: return 114;
-	case TAG_SVG_ATT_visibility: return 115;
-	case TAG_SVG_ATT_width: return 116;
-	case TAG_SVG_ATT_x: return 117;
-	case TAG_SVG_ATT_x1: return 118;
-	case TAG_SVG_ATT_x2: return 119;
-	case TAG_XLINK_ATT_actuate: return 120;
-	case TAG_XLINK_ATT_arcrole: return 121;
-	case TAG_XLINK_ATT_href: return 122;
-	case TAG_XLINK_ATT_role: return 123;
-	case TAG_XLINK_ATT_show: return 124;
-	case TAG_XLINK_ATT_title: return 125;
-	case TAG_XLINK_ATT_type: return 126;
-	case TAG_XML_ATT_base: return 127;
-	case TAG_XML_ATT_lang: return 128;
-	case TAG_SVG_ATT_y: return 129;
-	case TAG_SVG_ATT_y1: return 130;
-	case TAG_SVG_ATT_y2: return 131;
-	case TAG_SVG_ATT_zoomAndPan: return 132;
-	default: return -1;
+	case TAG_SVG_ATT_target:
+		return 0;
+	case TAG_SVG_ATT_accumulate:
+		return 1;
+	case TAG_SVG_ATT_additive:
+		return 2;
+	case TAG_SVG_ATT_audio_level:
+		return 3;
+	case TAG_SVG_ATT_bandwidth:
+		return 4;
+	case TAG_SVG_ATT_begin:
+		return 5;
+	case TAG_SVG_ATT_calcMode:
+		return 6;
+	case TAG_LSR_ATT_children:
+		return 7;
+	case TAG_SVG_ATT_choice:
+		return 8;
+	case TAG_SVG_ATT_clipBegin:
+		return 9;
+	case TAG_SVG_ATT_clipEnd:
+		return 10;
+	case TAG_SVG_ATT_color:
+		return 11;
+	case TAG_SVG_ATT_color_rendering:
+		return 12;
+	case TAG_SVG_ATT_cx:
+		return 13;
+	case TAG_SVG_ATT_cy:
+		return 14;
+	case TAG_SVG_ATT_d:
+		return 15;
+	case TAG_SVG_ATT_delta:
+		return 16;
+	case TAG_SVG_ATT_display:
+		return 17;
+	case TAG_SVG_ATT_display_align:
+		return 18;
+	case TAG_SVG_ATT_dur:
+		return 19;
+	case TAG_SVG_ATT_editable:
+		return 20;
+	case TAG_LSR_ATT_enabled:
+		return 21;
+	case TAG_SVG_ATT_end:
+		return 22;
+	case TAG_XMLEV_ATT_event:
+		return 23;
+	case TAG_SVG_ATT_externalResourcesRequired:
+		return 24;
+	case TAG_SVG_ATT_fill:
+		return 25;
+	case TAG_SVG_ATT_fill_opacity:
+		return 26;
+	case TAG_SVG_ATT_fill_rule:
+		return 27;
+	case TAG_SVG_ATT_focusable:
+		return 28;
+	case TAG_SVG_ATT_font_family:
+		return 29;
+	case TAG_SVG_ATT_font_size:
+		return 30;
+	case TAG_SVG_ATT_font_style:
+		return 31;
+	case TAG_SVG_ATT_font_variant:
+		return 32;
+	case TAG_SVG_ATT_font_weight:
+		return 33;
+	case TAG_SVG_ATT_fullscreen:
+		return 34;
+	case TAG_SVG_ATT_gradientUnits:
+		return 35;
+	case TAG_XMLEV_ATT_handler:
+		return 36;
+	case TAG_SVG_ATT_height:
+		return 37;
+	case TAG_SVG_ATT_image_rendering:
+		return 38;
+	case TAG_SVG_ATT_keyPoints:
+		return 39;
+	case TAG_SVG_ATT_keySplines:
+		return 40;
+	case TAG_SVG_ATT_keyTimes:
+		return 41;
+	case TAG_SVG_ATT_line_increment:
+		return 42;
+	case TAG_XMLEV_ATT_target:
+		return 43;
+	case TAG_SVG_ATT_mediaCharacterEncoding:
+		return 44;
+	case TAG_SVG_ATT_mediaContentEncodings:
+		return 45;
+	case TAG_SVG_ATT_mediaSize:
+		return 46;
+	case TAG_SVG_ATT_mediaTime:
+		return 47;
+	case TAG_SVG_ATT_nav_down:
+		return 48;
+	case TAG_SVG_ATT_nav_down_left:
+		return 49;
+	case TAG_SVG_ATT_nav_down_right:
+		return 50;
+	case TAG_SVG_ATT_nav_left:
+		return 51;
+	case TAG_SVG_ATT_nav_next:
+		return 52;
+	case TAG_SVG_ATT_nav_prev:
+		return 53;
+	case TAG_SVG_ATT_nav_right:
+		return 54;
+	case TAG_SVG_ATT_nav_up:
+		return 55;
+	case TAG_SVG_ATT_nav_up_left:
+		return 56;
+	case TAG_SVG_ATT_nav_up_right:
+		return 57;
+	case TAG_XMLEV_ATT_observer:
+		return 58;
+	case TAG_SVG_ATT_offset:
+		return 59;
+	case TAG_SVG_ATT_opacity:
+		return 60;
+	case TAG_SVG_ATT_overflow:
+		return 61;
+	case TAG_SVG_ATT_overlay:
+		return 62;
+	case TAG_SVG_ATT_path:
+		return 63;
+	case TAG_SVG_ATT_pathLength:
+		return 64;
+	case TAG_SVG_ATT_pointer_events:
+		return 65;
+	case TAG_SVG_ATT_points:
+		return 66;
+	case TAG_SVG_ATT_preserveAspectRatio:
+		return 67;
+	case TAG_SVG_ATT_r:
+		return 68;
+	case TAG_SVG_ATT_repeatCount:
+		return 69;
+	case TAG_SVG_ATT_repeatDur:
+		return 70;
+	case TAG_SVG_ATT_requiredExtensions:
+		return 71;
+	case TAG_SVG_ATT_requiredFeatures:
+		return 72;
+	case TAG_SVG_ATT_requiredFormats:
+		return 73;
+	case TAG_SVG_ATT_restart:
+		return 74;
+	case TAG_SVG_ATT_rotate:
+		return 75;
+	case TAG_LSR_ATT_rotation:
+		return 76;
+	case TAG_SVG_ATT_rx:
+		return 77;
+	case TAG_SVG_ATT_ry:
+		return 78;
+	case TAG_LSR_ATT_scale:
+		return 79;
+	case TAG_SVG_ATT_shape_rendering:
+		return 80;
+	case TAG_SVG_ATT_size:
+		return 81;
+	case TAG_SVG_ATT_solid_color:
+		return 82;
+	case TAG_SVG_ATT_solid_opacity:
+		return 83;
+	case TAG_SVG_ATT_stop_color:
+		return 84;
+	case TAG_SVG_ATT_stop_opacity:
+		return 85;
+	case TAG_SVG_ATT_stroke:
+		return 86;
+	case TAG_SVG_ATT_stroke_dasharray:
+		return 87;
+	case TAG_SVG_ATT_stroke_dashoffset:
+		return 88;
+	case TAG_SVG_ATT_stroke_linecap:
+		return 89;
+	case TAG_SVG_ATT_stroke_linejoin:
+		return 90;
+	case TAG_SVG_ATT_stroke_miterlimit:
+		return 91;
+	case TAG_SVG_ATT_stroke_opacity:
+		return 92;
+	case TAG_SVG_ATT_stroke_width:
+		return 93;
+	case TAG_LSR_ATT_svg_height:
+		return 94;
+	case TAG_LSR_ATT_svg_width:
+		return 95;
+	case TAG_SVG_ATT_syncBehavior:
+		return 96;
+	case TAG_SVG_ATT_syncBehaviorDefault:
+		return 97;
+	case TAG_SVG_ATT_syncReference:
+		return 98;
+	case TAG_SVG_ATT_syncTolerance:
+		return 99;
+	case TAG_SVG_ATT_syncToleranceDefault:
+		return 100;
+	case TAG_SVG_ATT_systemLanguage:
+		return 101;
+	case TAG_SVG_ATT_text_align:
+		return 102;
+	case TAG_SVG_ATT_text_anchor:
+		return 103;
+	case TAG_SVG_ATT_text_decoration:
+		return 104;
+	case TAG_LSR_ATT_text_display:
+		return 105;
+	case TAG_SVG_ATT_text_rendering:
+		return 106;
+	case TAG_LSR_ATT_textContent:
+		return 107;
+	case TAG_SVG_ATT_transform:
+		return 108;
+	case TAG_SVG_ATT_transformBehavior:
+		return 109;
+	case TAG_LSR_ATT_translation:
+		return 110;
+	case TAG_SVG_ATT_vector_effect:
+		return 111;
+	case TAG_SVG_ATT_viewBox:
+		return 112;
+	case TAG_SVG_ATT_viewport_fill:
+		return 113;
+	case TAG_SVG_ATT_viewport_fill_opacity:
+		return 114;
+	case TAG_SVG_ATT_visibility:
+		return 115;
+	case TAG_SVG_ATT_width:
+		return 116;
+	case TAG_SVG_ATT_x:
+		return 117;
+	case TAG_SVG_ATT_x1:
+		return 118;
+	case TAG_SVG_ATT_x2:
+		return 119;
+	case TAG_XLINK_ATT_actuate:
+		return 120;
+	case TAG_XLINK_ATT_arcrole:
+		return 121;
+	case TAG_XLINK_ATT_href:
+		return 122;
+	case TAG_XLINK_ATT_role:
+		return 123;
+	case TAG_XLINK_ATT_show:
+		return 124;
+	case TAG_XLINK_ATT_title:
+		return 125;
+	case TAG_XLINK_ATT_type:
+		return 126;
+	case TAG_XML_ATT_base:
+		return 127;
+	case TAG_XML_ATT_lang:
+		return 128;
+	case TAG_SVG_ATT_y:
+		return 129;
+	case TAG_SVG_ATT_y1:
+		return 130;
+	case TAG_SVG_ATT_y2:
+		return 131;
+	case TAG_SVG_ATT_zoomAndPan:
+		return 132;
+	default:
+		return -1;
 	}
 }
 
@@ -177,75 +311,144 @@
 
 s32 gf_lsr_rare_type_from_attribute(u32 tag) {
 	switch(tag) {
-	case TAG_SVG_ATT__class: return 0;
-	case TAG_SVG_ATT_audio_level: return 1;
-	case TAG_SVG_ATT_color: return 2;
-	case TAG_SVG_ATT_color_rendering: return 3;
-	case TAG_SVG_ATT_display: return 4;
-	case TAG_SVG_ATT_display_align: return 5;
-	case TAG_SVG_ATT_fill_opacity: return 6;
-	case TAG_SVG_ATT_fill_rule: return 7;
-	case TAG_SVG_ATT_image_rendering: return 8;
-	case TAG_SVG_ATT_line_increment: return 9;
-	case TAG_SVG_ATT_pointer_events: return 10;
-	case TAG_SVG_ATT_shape_rendering: return 11;
-	case TAG_SVG_ATT_solid_color: return 12;
-	case TAG_SVG_ATT_solid_opacity: return 13;
-	case TAG_SVG_ATT_stop_color: return 14;
-	case TAG_SVG_ATT_stop_opacity: return 15;
-	case TAG_SVG_ATT_stroke_dasharray: return 16;
-	case TAG_SVG_ATT_stroke_dashoffset: return 17;
-	case TAG_SVG_ATT_stroke_linecap: return 18;
-	case TAG_SVG_ATT_stroke_linejoin: return 19;
-	case TAG_SVG_ATT_stroke_miterlimit: return 20;
-	case TAG_SVG_ATT_stroke_opacity: return 21;
-	case TAG_SVG_ATT_stroke_width: return 22;
-	case TAG_SVG_ATT_text_anchor: return 23;
-	case TAG_SVG_ATT_text_rendering: return 24;
-	case TAG_SVG_ATT_viewport_fill: return 25;
-	case TAG_SVG_ATT_viewport_fill_opacity: return 26;
-	case TAG_SVG_ATT_vector_effect: return 27;
-	case TAG_SVG_ATT_visibility: return 28;
-	case TAG_SVG_ATT_requiredExtensions: return 29;
-	case TAG_SVG_ATT_requiredFeatures: return 30;
-	case TAG_SVG_ATT_requiredFormats: return 31;
-	case TAG_SVG_ATT_systemLanguage: return 32;
-	case TAG_XML_ATT_base: return 33;
-	case TAG_XML_ATT_lang: return 34;
-	case TAG_XML_ATT_space: return 35;
-	case TAG_SVG_ATT_nav_next: return 36;
-	case TAG_SVG_ATT_nav_up: return 37;
-	case TAG_SVG_ATT_nav_up_left: return 38;
-	case TAG_SVG_ATT_nav_up_right: return 39;
-	case TAG_SVG_ATT_nav_prev: return 40;
-	case TAG_SVG_ATT_nav_down: return 41;
-	case TAG_SVG_ATT_nav_down_left: return 42;
-	case TAG_SVG_ATT_nav_down_right: return 43;
-	case TAG_SVG_ATT_nav_left: return 44;
-	case TAG_SVG_ATT_focusable: return 45;
-	case TAG_SVG_ATT_nav_right: return 46;
-	case TAG_SVG_ATT_transform: return 47;
-	case TAG_SVG_ATT_text_decoration: return 48;
-	case TAG_SVG_ATT_syncMaster: return 49;
-	case TAG_SVG_ATT_focusHighlight: return 49;
-	case TAG_SVG_ATT_initialVisibility: return 49;
-	case TAG_SVG_ATT_fullscreen: return 49;
-	case TAG_SVG_ATT_requiredFonts: return 49;
-	case TAG_SVG_ATT_font_variant: return 50;
-	case TAG_SVG_ATT_font_family: return 51;
-	case TAG_SVG_ATT_font_size: return 52;
-	case TAG_SVG_ATT_font_style: return 53;
-	case TAG_SVG_ATT_font_weight: return 54;
-	case TAG_XLINK_ATT_title: return 55;
-	case TAG_XLINK_ATT_type: return 56;
-	case TAG_XLINK_ATT_role: return 57;
-	case TAG_XLINK_ATT_arcrole: return 58;
-	case TAG_XLINK_ATT_actuate: return 59;
-	case TAG_XLINK_ATT_show: return 60;
-	case TAG_SVG_ATT_end: return 61;
-	case TAG_SVG_ATT_max: return 62;
-	case TAG_SVG_ATT_min: return 63;
-	default: return -1;
+	case TAG_SVG_ATT__class:
+		return 0;
+	case TAG_SVG_ATT_audio_level:
+		return 1;
+	case TAG_SVG_ATT_color:
+		return 2;
+	case TAG_SVG_ATT_color_rendering:
+		return 3;
+	case TAG_SVG_ATT_display:
+		return 4;
+	case TAG_SVG_ATT_display_align:
+		return 5;
+	case TAG_SVG_ATT_fill_opacity:
+		return 6;
+	case TAG_SVG_ATT_fill_rule:
+		return 7;
+	case TAG_SVG_ATT_image_rendering:
+		return 8;
+	case TAG_SVG_ATT_line_increment:
+		return 9;
+	case TAG_SVG_ATT_pointer_events:
+		return 10;
+	case TAG_SVG_ATT_shape_rendering:
+		return 11;
+	case TAG_SVG_ATT_solid_color:
+		return 12;
+	case TAG_SVG_ATT_solid_opacity:
+		return 13;
+	case TAG_SVG_ATT_stop_color:
+		return 14;
+	case TAG_SVG_ATT_stop_opacity:
+		return 15;
+	case TAG_SVG_ATT_stroke_dasharray:
+		return 16;
+	case TAG_SVG_ATT_stroke_dashoffset:
+		return 17;
+	case TAG_SVG_ATT_stroke_linecap:
+		return 18;
+	case TAG_SVG_ATT_stroke_linejoin:
+		return 19;
+	case TAG_SVG_ATT_stroke_miterlimit:
+		return 20;
+	case TAG_SVG_ATT_stroke_opacity:
+		return 21;
+	case TAG_SVG_ATT_stroke_width:
+		return 22;
+	case TAG_SVG_ATT_text_anchor:
+		return 23;
+	case TAG_SVG_ATT_text_rendering:
+		return 24;
+	case TAG_SVG_ATT_viewport_fill:
+		return 25;
+	case TAG_SVG_ATT_viewport_fill_opacity:
+		return 26;
+	case TAG_SVG_ATT_vector_effect:
+		return 27;
+	case TAG_SVG_ATT_visibility:
+		return 28;
+	case TAG_SVG_ATT_requiredExtensions:
+		return 29;
+	case TAG_SVG_ATT_requiredFeatures:
+		return 30;
+	case TAG_SVG_ATT_requiredFormats:
+		return 31;
+	case TAG_SVG_ATT_systemLanguage:
+		return 32;
+	case TAG_XML_ATT_base:
+		return 33;
+	case TAG_XML_ATT_lang:
+		return 34;
+	case TAG_XML_ATT_space:
+		return 35;
+	case TAG_SVG_ATT_nav_next:
+		return 36;
+	case TAG_SVG_ATT_nav_up:
+		return 37;
+	case TAG_SVG_ATT_nav_up_left:
+		return 38;
+	case TAG_SVG_ATT_nav_up_right:
+		return 39;
+	case TAG_SVG_ATT_nav_prev:
+		return 40;
+	case TAG_SVG_ATT_nav_down:
+		return 41;
+	case TAG_SVG_ATT_nav_down_left:
+		return 42;
+	case TAG_SVG_ATT_nav_down_right:
+		return 43;
+	case TAG_SVG_ATT_nav_left:
+		return 44;
+	case TAG_SVG_ATT_focusable:
+		return 45;
+	case TAG_SVG_ATT_nav_right:
+		return 46;
+	case TAG_SVG_ATT_transform:
+		return 47;
+	case TAG_SVG_ATT_text_decoration:
+		return 48;
+	case TAG_SVG_ATT_syncMaster:
+		return 49;
+	case TAG_SVG_ATT_focusHighlight:
+		return 49;
+	case TAG_SVG_ATT_initialVisibility:
+		return 49;
+	case TAG_SVG_ATT_fullscreen:
+		return 49;
+	case TAG_SVG_ATT_requiredFonts:
+		return 49;
+	case TAG_SVG_ATT_font_variant:
+		return 50;
+	case TAG_SVG_ATT_font_family:
+		return 51;
+	case TAG_SVG_ATT_font_size:
+		return 52;
+	case TAG_SVG_ATT_font_style:
+		return 53;
+	case TAG_SVG_ATT_font_weight:
+		return 54;
+	case TAG_XLINK_ATT_title:
+		return 55;
+	case TAG_XLINK_ATT_type:
+		return 56;
+	case TAG_XLINK_ATT_role:
+		return 57;
+	case TAG_XLINK_ATT_arcrole:
+		return 58;
+	case TAG_XLINK_ATT_actuate:
+		return 59;
+	case TAG_XLINK_ATT_show:
+		return 60;
+	case TAG_SVG_ATT_end:
+		return 61;
+	case TAG_SVG_ATT_max:
+		return 62;
+	case TAG_SVG_ATT_min:
+		return 63;
+	default:
+		return -1;
 	}
 }
 
@@ -253,140 +456,274 @@
 
 s32 gf_lsr_anim_type_to_attribute(u32 tag) {
 	switch(tag) {
-	case 0: return TAG_SVG_ATT_target;
-	case 1: return TAG_SVG_ATT_accumulate;
-	case 2: return TAG_SVG_ATT_additive;
-	case 3: return TAG_SVG_ATT_audio_level;
-	case 4: return TAG_SVG_ATT_bandwidth;
-	case 5: return TAG_SVG_ATT_begin;
-	case 6: return TAG_SVG_ATT_calcMode;
-	case 7: return TAG_LSR_ATT_children;
-	case 8: return TAG_SVG_ATT_choice;
-	case 9: return TAG_SVG_ATT_clipBegin;
-	case 10: return TAG_SVG_ATT_clipEnd;
-	case 11: return TAG_SVG_ATT_color;
-	case 12: return TAG_SVG_ATT_color_rendering;
-	case 13: return TAG_SVG_ATT_cx;
-	case 14: return TAG_SVG_ATT_cy;
-	case 15: return TAG_SVG_ATT_d;
-	case 16: return TAG_SVG_ATT_delta;
-	case 17: return TAG_SVG_ATT_display;
-	case 18: return TAG_SVG_ATT_display_align;
-	case 19: return TAG_SVG_ATT_dur;
-	case 20: return TAG_SVG_ATT_editable;
-	case 21: return TAG_LSR_ATT_enabled;
-	case 22: return TAG_SVG_ATT_end;
-	case 23: return TAG_XMLEV_ATT_event;
-	case 24: return TAG_SVG_ATT_externalResourcesRequired;
-	case 25: return TAG_SVG_ATT_fill;
-	case 26: return TAG_SVG_ATT_fill_opacity;
-	case 27: return TAG_SVG_ATT_fill_rule;
-	case 28: return TAG_SVG_ATT_focusable;
-	case 29: return TAG_SVG_ATT_font_family;
-	case 30: return TAG_SVG_ATT_font_size;
-	case 31: return TAG_SVG_ATT_font_style;
-	case 32: return TAG_SVG_ATT_font_variant;
-	case 33: return TAG_SVG_ATT_font_weight;
-	case 34: return TAG_SVG_ATT_fullscreen;
-	case 35: return TAG_SVG_ATT_gradientUnits;
-	case 36: return TAG_XMLEV_ATT_handler;
-	case 37: return TAG_SVG_ATT_height;
-	case 38: return TAG_SVG_ATT_image_rendering;
-	case 39: return TAG_SVG_ATT_keyPoints;
-	case 40: return TAG_SVG_ATT_keySplines;
-	case 41: return TAG_SVG_ATT_keyTimes;
-	case 42: return TAG_SVG_ATT_line_increment;
-	case 43: return TAG_XMLEV_ATT_target;
-	case 44: return TAG_SVG_ATT_mediaCharacterEncoding;
-	case 45: return TAG_SVG_ATT_mediaContentEncodings;
-	case 46: return TAG_SVG_ATT_mediaSize;
-	case 47: return TAG_SVG_ATT_mediaTime;
-	case 48: return TAG_SVG_ATT_nav_down;
-	case 49: return TAG_SVG_ATT_nav_down_left;
-	case 50: return TAG_SVG_ATT_nav_down_right;
-	case 51: return TAG_SVG_ATT_nav_left;
-	case 52: return TAG_SVG_ATT_nav_next;
-	case 53: return TAG_SVG_ATT_nav_prev;
-	case 54: return TAG_SVG_ATT_nav_right;
-	case 55: return TAG_SVG_ATT_nav_up;
-	case 56: return TAG_SVG_ATT_nav_up_left;
-	case 57: return TAG_SVG_ATT_nav_up_right;
-	case 58: return TAG_XMLEV_ATT_observer;
-	case 59: return TAG_SVG_ATT_offset;
-	case 60: return TAG_SVG_ATT_opacity;
-	case 61: return TAG_SVG_ATT_overflow;
-	case 62: return TAG_SVG_ATT_overlay;
-	case 63: return TAG_SVG_ATT_path;
-	case 64: return TAG_SVG_ATT_pathLength;
-	case 65: return TAG_SVG_ATT_pointer_events;
-	case 66: return TAG_SVG_ATT_points;
-	case 67: return TAG_SVG_ATT_preserveAspectRatio;
-	case 68: return TAG_SVG_ATT_r;
-	case 69: return TAG_SVG_ATT_repeatCount;
-	case 70: return TAG_SVG_ATT_repeatDur;
-	case 71: return TAG_SVG_ATT_requiredExtensions;
-	case 72: return TAG_SVG_ATT_requiredFeatures;
-	case 73: return TAG_SVG_ATT_requiredFormats;
-	case 74: return TAG_SVG_ATT_restart;
-	case 75: return TAG_SVG_ATT_rotate;
-	case 76: return TAG_LSR_ATT_rotation;
-	case 77: return TAG_SVG_ATT_rx;
-	case 78: return TAG_SVG_ATT_ry;
-	case 79: return TAG_LSR_ATT_scale;
-	case 80: return TAG_SVG_ATT_shape_rendering;
-	case 81: return TAG_SVG_ATT_size;
-	case 82: return TAG_SVG_ATT_solid_color;
-	case 83: return TAG_SVG_ATT_solid_opacity;
-	case 84: return TAG_SVG_ATT_stop_color;
-	case 85: return TAG_SVG_ATT_stop_opacity;
-	case 86: return TAG_SVG_ATT_stroke;
-	case 87: return TAG_SVG_ATT_stroke_dasharray;
-	case 88: return TAG_SVG_ATT_stroke_dashoffset;
-	case 89: return TAG_SVG_ATT_stroke_linecap;
-	case 90: return TAG_SVG_ATT_stroke_linejoin;
-	case 91: return TAG_SVG_ATT_stroke_miterlimit;
-	case 92: return TAG_SVG_ATT_stroke_opacity;
-	case 93: return TAG_SVG_ATT_stroke_width;
-	case 94: return TAG_LSR_ATT_svg_height;
-	case 95: return TAG_LSR_ATT_svg_width;
-	case 96: return TAG_SVG_ATT_syncBehavior;
-	case 97: return TAG_SVG_ATT_syncBehaviorDefault;
-	case 98: return TAG_SVG_ATT_syncReference;
-	case 99: return TAG_SVG_ATT_syncTolerance;
-	case 100: return TAG_SVG_ATT_syncToleranceDefault;
-	case 101: return TAG_SVG_ATT_systemLanguage;
-	case 102: return TAG_SVG_ATT_text_align;
-	case 103: return TAG_SVG_ATT_text_anchor;
-	case 104: return TAG_SVG_ATT_text_decoration;
-	case 105: return TAG_LSR_ATT_text_display;
-	case 106: return TAG_SVG_ATT_text_rendering;
-	case 107: return TAG_LSR_ATT_textContent;
-	case 108: return TAG_SVG_ATT_transform;
-	case 109: return TAG_SVG_ATT_transformBehavior;
-	case 110: return TAG_LSR_ATT_translation;
-	case 111: return TAG_SVG_ATT_vector_effect;
-	case 112: return TAG_SVG_ATT_viewBox;
-	case 113: return TAG_SVG_ATT_viewport_fill;
-	case 114: return TAG_SVG_ATT_viewport_fill_opacity;
-	case 115: return TAG_SVG_ATT_visibility;
-	case 116: return TAG_SVG_ATT_width;
-	case 117: return TAG_SVG_ATT_x;
-	case 118: return TAG_SVG_ATT_x1;
-	case 119: return TAG_SVG_ATT_x2;
-	case 120: return TAG_XLINK_ATT_actuate;
-	case 121: return TAG_XLINK_ATT_arcrole;
-	case 122: return TAG_XLINK_ATT_href;
-	case 123: return TAG_XLINK_ATT_role;
-	case 124: return TAG_XLINK_ATT_show;
-	case 125: return TAG_XLINK_ATT_title;
-	case 126: return TAG_XLINK_ATT_type;
-	case 127: return TAG_XML_ATT_base;
-	case 128: return TAG_XML_ATT_lang;
-	case 129: return TAG_SVG_ATT_y;
-	case 130: return TAG_SVG_ATT_y1;
-	case 131: return TAG_SVG_ATT_y2;
-	case 132: return TAG_SVG_ATT_zoomAndPan;
-	default: return -1;
+	case 0:
+		return TAG_SVG_ATT_target;
+	case 1:
+		return TAG_SVG_ATT_accumulate;
+	case 2:
+		return TAG_SVG_ATT_additive;
+	case 3:
+		return TAG_SVG_ATT_audio_level;
+	case 4:
+		return TAG_SVG_ATT_bandwidth;
+	case 5:
+		return TAG_SVG_ATT_begin;
+	case 6:
+		return TAG_SVG_ATT_calcMode;
+	case 7:
+		return TAG_LSR_ATT_children;
+	case 8:
+		return TAG_SVG_ATT_choice;
+	case 9:
+		return TAG_SVG_ATT_clipBegin;
+	case 10:
+		return TAG_SVG_ATT_clipEnd;
+	case 11:
+		return TAG_SVG_ATT_color;
+	case 12:
+		return TAG_SVG_ATT_color_rendering;
+	case 13:
+		return TAG_SVG_ATT_cx;
+	case 14:
+		return TAG_SVG_ATT_cy;
+	case 15:
+		return TAG_SVG_ATT_d;
+	case 16:
+		return TAG_SVG_ATT_delta;
+	case 17:
+		return TAG_SVG_ATT_display;
+	case 18:
+		return TAG_SVG_ATT_display_align;
+	case 19:
+		return TAG_SVG_ATT_dur;
+	case 20:
+		return TAG_SVG_ATT_editable;
+	case 21:
+		return TAG_LSR_ATT_enabled;
+	case 22:
+		return TAG_SVG_ATT_end;
+	case 23:
+		return TAG_XMLEV_ATT_event;
+	case 24:
+		return TAG_SVG_ATT_externalResourcesRequired;
+	case 25:
+		return TAG_SVG_ATT_fill;
+	case 26:
+		return TAG_SVG_ATT_fill_opacity;
+	case 27:
+		return TAG_SVG_ATT_fill_rule;
+	case 28:
+		return TAG_SVG_ATT_focusable;
+	case 29:
+		return TAG_SVG_ATT_font_family;
+	case 30:
+		return TAG_SVG_ATT_font_size;
+	case 31:
+		return TAG_SVG_ATT_font_style;
+	case 32:
+		return TAG_SVG_ATT_font_variant;
+	case 33:
+		return TAG_SVG_ATT_font_weight;
+	case 34:
+		return TAG_SVG_ATT_fullscreen;
+	case 35:
+		return TAG_SVG_ATT_gradientUnits;
+	case 36:
+		return TAG_XMLEV_ATT_handler;
+	case 37:
+		return TAG_SVG_ATT_height;
+	case 38:
+		return TAG_SVG_ATT_image_rendering;
+	case 39:
+		return TAG_SVG_ATT_keyPoints;
+	case 40:
+		return TAG_SVG_ATT_keySplines;
+	case 41:
+		return TAG_SVG_ATT_keyTimes;
+	case 42:
+		return TAG_SVG_ATT_line_increment;
+	case 43:
+		return TAG_XMLEV_ATT_target;
+	case 44:
+		return TAG_SVG_ATT_mediaCharacterEncoding;
+	case 45:
+		return TAG_SVG_ATT_mediaContentEncodings;
+	case 46:
+		return TAG_SVG_ATT_mediaSize;
+	case 47:
+		return TAG_SVG_ATT_mediaTime;
+	case 48:
+		return TAG_SVG_ATT_nav_down;
+	case 49:
+		return TAG_SVG_ATT_nav_down_left;
+	case 50:
+		return TAG_SVG_ATT_nav_down_right;
+	case 51:
+		return TAG_SVG_ATT_nav_left;
+	case 52:
+		return TAG_SVG_ATT_nav_next;
+	case 53:
+		return TAG_SVG_ATT_nav_prev;
+	case 54:
+		return TAG_SVG_ATT_nav_right;
+	case 55:
+		return TAG_SVG_ATT_nav_up;
+	case 56:
+		return TAG_SVG_ATT_nav_up_left;
+	case 57:
+		return TAG_SVG_ATT_nav_up_right;
+	case 58:
+		return TAG_XMLEV_ATT_observer;
+	case 59:
+		return TAG_SVG_ATT_offset;
+	case 60:
+		return TAG_SVG_ATT_opacity;
+	case 61:
+		return TAG_SVG_ATT_overflow;
+	case 62:
+		return TAG_SVG_ATT_overlay;
+	case 63:
+		return TAG_SVG_ATT_path;
+	case 64:
+		return TAG_SVG_ATT_pathLength;
+	case 65:
+		return TAG_SVG_ATT_pointer_events;
+	case 66:
+		return TAG_SVG_ATT_points;
+	case 67:
+		return TAG_SVG_ATT_preserveAspectRatio;
+	case 68:
+		return TAG_SVG_ATT_r;
+	case 69:
+		return TAG_SVG_ATT_repeatCount;
+	case 70:
+		return TAG_SVG_ATT_repeatDur;
+	case 71:
+		return TAG_SVG_ATT_requiredExtensions;
+	case 72:
+		return TAG_SVG_ATT_requiredFeatures;
+	case 73:
+		return TAG_SVG_ATT_requiredFormats;
+	case 74:
+		return TAG_SVG_ATT_restart;
+	case 75:
+		return TAG_SVG_ATT_rotate;
+	case 76:
+		return TAG_LSR_ATT_rotation;
+	case 77:
+		return TAG_SVG_ATT_rx;
+	case 78:
+		return TAG_SVG_ATT_ry;
+	case 79:
+		return TAG_LSR_ATT_scale;
+	case 80:
+		return TAG_SVG_ATT_shape_rendering;
+	case 81:
+		return TAG_SVG_ATT_size;
+	case 82:
+		return TAG_SVG_ATT_solid_color;
+	case 83:
+		return TAG_SVG_ATT_solid_opacity;
+	case 84:
+		return TAG_SVG_ATT_stop_color;
+	case 85:
+		return TAG_SVG_ATT_stop_opacity;
+	case 86:
+		return TAG_SVG_ATT_stroke;
+	case 87:
+		return TAG_SVG_ATT_stroke_dasharray;
+	case 88:
+		return TAG_SVG_ATT_stroke_dashoffset;
+	case 89:
+		return TAG_SVG_ATT_stroke_linecap;
+	case 90:
+		return TAG_SVG_ATT_stroke_linejoin;
+	case 91:
+		return TAG_SVG_ATT_stroke_miterlimit;
+	case 92:
+		return TAG_SVG_ATT_stroke_opacity;
+	case 93:
+		return TAG_SVG_ATT_stroke_width;
+	case 94:
+		return TAG_LSR_ATT_svg_height;
+	case 95:
+		return TAG_LSR_ATT_svg_width;
+	case 96:
+		return TAG_SVG_ATT_syncBehavior;
+	case 97:
+		return TAG_SVG_ATT_syncBehaviorDefault;
+	case 98:
+		return TAG_SVG_ATT_syncReference;
+	case 99:
+		return TAG_SVG_ATT_syncTolerance;
+	case 100:
+		return TAG_SVG_ATT_syncToleranceDefault;
+	case 101:
+		return TAG_SVG_ATT_systemLanguage;
+	case 102:
+		return TAG_SVG_ATT_text_align;
+	case 103:
+		return TAG_SVG_ATT_text_anchor;
+	case 104:
+		return TAG_SVG_ATT_text_decoration;
+	case 105:
+		return TAG_LSR_ATT_text_display;
+	case 106:
+		return TAG_SVG_ATT_text_rendering;
+	case 107:
+		return TAG_LSR_ATT_textContent;
+	case 108:
+		return TAG_SVG_ATT_transform;
+	case 109:
+		return TAG_SVG_ATT_transformBehavior;
+	case 110:
+		return TAG_LSR_ATT_translation;
+	case 111:
+		return TAG_SVG_ATT_vector_effect;
+	case 112:
+		return TAG_SVG_ATT_viewBox;
+	case 113:
+		return TAG_SVG_ATT_viewport_fill;
+	case 114:
+		return TAG_SVG_ATT_viewport_fill_opacity;
+	case 115:
+		return TAG_SVG_ATT_visibility;
+	case 116:
+		return TAG_SVG_ATT_width;
+	case 117:
+		return TAG_SVG_ATT_x;
+	case 118:
+		return TAG_SVG_ATT_x1;
+	case 119:
+		return TAG_SVG_ATT_x2;
+	case 120:
+		return TAG_XLINK_ATT_actuate;
+	case 121:
+		return TAG_XLINK_ATT_arcrole;
+	case 122:
+		return TAG_XLINK_ATT_href;
+	case 123:
+		return TAG_XLINK_ATT_role;
+	case 124:
+		return TAG_XLINK_ATT_show;
+	case 125:
+		return TAG_XLINK_ATT_title;
+	case 126:
+		return TAG_XLINK_ATT_type;
+	case 127:
+		return TAG_XML_ATT_base;
+	case 128:
+		return TAG_XML_ATT_lang;
+	case 129:
+		return TAG_SVG_ATT_y;
+	case 130:
+		return TAG_SVG_ATT_y1;
+	case 131:
+		return TAG_SVG_ATT_y2;
+	case 132:
+		return TAG_SVG_ATT_zoomAndPan;
+	default:
+		return -1;
 	}
 }
 
@@ -394,70 +731,134 @@
 
 s32 gf_lsr_rare_type_to_attribute(u32 tag) {
 	switch(tag) {
-	case 0: return TAG_SVG_ATT__class;
-	case 1: return TAG_SVG_ATT_audio_level;
-	case 2: return TAG_SVG_ATT_color;
-	case 3: return TAG_SVG_ATT_color_rendering;
-	case 4: return TAG_SVG_ATT_display;
-	case 5: return TAG_SVG_ATT_display_align;
-	case 6: return TAG_SVG_ATT_fill_opacity;
-	case 7: return TAG_SVG_ATT_fill_rule;
-	case 8: return TAG_SVG_ATT_image_rendering;
-	case 9: return TAG_SVG_ATT_line_increment;
-	case 10: return TAG_SVG_ATT_pointer_events;
-	case 11: return TAG_SVG_ATT_shape_rendering;
-	case 12: return TAG_SVG_ATT_solid_color;
-	case 13: return TAG_SVG_ATT_solid_opacity;
-	case 14: return TAG_SVG_ATT_stop_color;
-	case 15: return TAG_SVG_ATT_stop_opacity;
-	case 16: return TAG_SVG_ATT_stroke_dasharray;
-	case 17: return TAG_SVG_ATT_stroke_dashoffset;
-	case 18: return TAG_SVG_ATT_stroke_linecap;
-	case 19: return TAG_SVG_ATT_stroke_linejoin;
-	case 20: return TAG_SVG_ATT_stroke_miterlimit;
-	case 21: return TAG_SVG_ATT_stroke_opacity;
-	case 22: return TAG_SVG_ATT_stroke_width;
-	case 23: return TAG_SVG_ATT_text_anchor;
-	case 24: return TAG_SVG_ATT_text_rendering;
-	case 25: return TAG_SVG_ATT_viewport_fill;
-	case 26: return TAG_SVG_ATT_viewport_fill_opacity;
-	case 27: return TAG_SVG_ATT_vector_effect;
-	case 28: return TAG_SVG_ATT_visibility;
-	case 29: return TAG_SVG_ATT_requiredExtensions;
-	case 30: return TAG_SVG_ATT_requiredFeatures;
-	case 31: return TAG_SVG_ATT_requiredFormats;
-	case 32: return TAG_SVG_ATT_systemLanguage;
-	case 33: return TAG_XML_ATT_base;
-	case 34: return TAG_XML_ATT_lang;
-	case 35: return TAG_XML_ATT_space;
-	case 36: return TAG_SVG_ATT_nav_next;
-	case 37: return TAG_SVG_ATT_nav_up;
-	case 38: return TAG_SVG_ATT_nav_up_left;
-	case 39: return TAG_SVG_ATT_nav_up_right;
-	case 40: return TAG_SVG_ATT_nav_prev;
-	case 41: return TAG_SVG_ATT_nav_down;
-	case 42: return TAG_SVG_ATT_nav_down_left;
-	case 43: return TAG_SVG_ATT_nav_down_right;
-	case 44: return TAG_SVG_ATT_nav_left;
-	case 45: return TAG_SVG_ATT_focusable;
-	case 46: return TAG_SVG_ATT_nav_right;
-	case 47: return TAG_SVG_ATT_transform;
-	case 48: return TAG_SVG_ATT_text_decoration;
-	case 50: return TAG_SVG_ATT_font_variant;
-	case 51: return TAG_SVG_ATT_font_family;
-	case 52: return TAG_SVG_ATT_font_size;
-	case 53: return TAG_SVG_ATT_font_style;
-	case 54: return TAG_SVG_ATT_font_weight;
-	case 55: return TAG_XLINK_ATT_title;
-	case 56: return TAG_XLINK_ATT_type;
-	case 57: return TAG_XLINK_ATT_role;
-	case 58: return TAG_XLINK_ATT_arcrole;
-	case 59: return TAG_XLINK_ATT_actuate;
-	case 60: return TAG_XLINK_ATT_show;
-	case 61: return TAG_SVG_ATT_end;
-	case 62: return TAG_SVG_ATT_max;
-	case 63: return TAG_SVG_ATT_min;
-	default: return -1;
+	case 0:
+		return TAG_SVG_ATT__class;
+	case 1:
+		return TAG_SVG_ATT_audio_level;
+	case 2:
+		return TAG_SVG_ATT_color;
+	case 3:
+		return TAG_SVG_ATT_color_rendering;
+	case 4:
+		return TAG_SVG_ATT_display;
+	case 5:
+		return TAG_SVG_ATT_display_align;
+	case 6:
+		return TAG_SVG_ATT_fill_opacity;
+	case 7:
+		return TAG_SVG_ATT_fill_rule;
+	case 8:
+		return TAG_SVG_ATT_image_rendering;
+	case 9:
+		return TAG_SVG_ATT_line_increment;
+	case 10:
+		return TAG_SVG_ATT_pointer_events;
+	case 11:
+		return TAG_SVG_ATT_shape_rendering;
+	case 12:
+		return TAG_SVG_ATT_solid_color;
+	case 13:
+		return TAG_SVG_ATT_solid_opacity;
+	case 14:
+		return TAG_SVG_ATT_stop_color;
+	case 15:
+		return TAG_SVG_ATT_stop_opacity;
+	case 16:
+		return TAG_SVG_ATT_stroke_dasharray;
+	case 17:
+		return TAG_SVG_ATT_stroke_dashoffset;
+	case 18:
+		return TAG_SVG_ATT_stroke_linecap;
+	case 19:
+		return TAG_SVG_ATT_stroke_linejoin;
+	case 20:
+		return TAG_SVG_ATT_stroke_miterlimit;
+	case 21:
+		return TAG_SVG_ATT_stroke_opacity;
+	case 22:
+		return TAG_SVG_ATT_stroke_width;
+	case 23:
+		return TAG_SVG_ATT_text_anchor;
+	case 24:
+		return TAG_SVG_ATT_text_rendering;
+	case 25:
+		return TAG_SVG_ATT_viewport_fill;
+	case 26:
+		return TAG_SVG_ATT_viewport_fill_opacity;
+	case 27:
+		return TAG_SVG_ATT_vector_effect;
+	case 28:
+		return TAG_SVG_ATT_visibility;
+	case 29:
+		return TAG_SVG_ATT_requiredExtensions;
+	case 30:
+		return TAG_SVG_ATT_requiredFeatures;
+	case 31:
+		return TAG_SVG_ATT_requiredFormats;
+	case 32:
+		return TAG_SVG_ATT_systemLanguage;
+	case 33:
+		return TAG_XML_ATT_base;
+	case 34:
+		return TAG_XML_ATT_lang;
+	case 35:
+		return TAG_XML_ATT_space;
+	case 36:
+		return TAG_SVG_ATT_nav_next;
+	case 37:
+		return TAG_SVG_ATT_nav_up;
+	case 38:
+		return TAG_SVG_ATT_nav_up_left;
+	case 39:
+		return TAG_SVG_ATT_nav_up_right;
+	case 40:
+		return TAG_SVG_ATT_nav_prev;
+	case 41:
+		return TAG_SVG_ATT_nav_down;
+	case 42:
+		return TAG_SVG_ATT_nav_down_left;
+	case 43:
+		return TAG_SVG_ATT_nav_down_right;
+	case 44:
+		return TAG_SVG_ATT_nav_left;
+	case 45:
+		return TAG_SVG_ATT_focusable;
+	case 46:
+		return TAG_SVG_ATT_nav_right;
+	case 47:
+		return TAG_SVG_ATT_transform;
+	case 48:
+		return TAG_SVG_ATT_text_decoration;
+	case 50:
+		return TAG_SVG_ATT_font_variant;
+	case 51:
+		return TAG_SVG_ATT_font_family;
+	case 52:
+		return TAG_SVG_ATT_font_size;
+	case 53:
+		return TAG_SVG_ATT_font_style;
+	case 54:
+		return TAG_SVG_ATT_font_weight;
+	case 55:
+		return TAG_XLINK_ATT_title;
+	case 56:
+		return TAG_XLINK_ATT_type;
+	case 57:
+		return TAG_XLINK_ATT_role;
+	case 58:
+		return TAG_XLINK_ATT_arcrole;
+	case 59:
+		return TAG_XLINK_ATT_actuate;
+	case 60:
+		return TAG_XLINK_ATT_show;
+	case 61:
+		return TAG_SVG_ATT_end;
+	case 62:
+		return TAG_SVG_ATT_max;
+	case 63:
+		return TAG_SVG_ATT_min;
+	default:
+		return -1;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/cbc.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/cbc.c Changed

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -32,47 +32,47 @@
 
 static GF_Err _init_mcrypt( void* _buf,void *key, int lenofkey, void *IV, int size)
 {
-    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
-/* For cbc */
+	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
+	/* For cbc */
 	buf->previous_ciphertext =
-	buf->previous_cipher = NULL;
+	    buf->previous_cipher = NULL;
 
 	buf->blocksize = size;
-		
+
 	buf->previous_ciphertext = gf_malloc( size);
 	buf->previous_cipher = gf_malloc( size);
-	
+
 	if (buf->previous_ciphertext==NULL ||
-		buf->previous_cipher==NULL) goto freeall;
-	
+	        buf->previous_cipher==NULL) goto freeall;
+
 	if (IV!=NULL) {
 		memcpy(buf->previous_ciphertext, IV, size);
 	} else {
-	        memset(buf->previous_ciphertext, 0, size);
+		memset(buf->previous_ciphertext, 0, size);
 	}
 
 	return GF_OK;
 
-	freeall:
-		if (buf->previous_ciphertext) gf_free(buf->previous_ciphertext);
-		if (buf->previous_cipher) gf_free(buf->previous_cipher);
-		return GF_OUT_OF_MEM;
+freeall:
+	if (buf->previous_ciphertext) gf_free(buf->previous_ciphertext);
+	if (buf->previous_cipher) gf_free(buf->previous_cipher);
+	return GF_OUT_OF_MEM;
 }
 
 static GF_Err _mcrypt_set_state( void* _buf, void *IV, int size)
 {
-/* For cbc */
-    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
+	/* For cbc */
+	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 
 	memcpy(buf->previous_ciphertext, IV, size);
 	memcpy(buf->previous_cipher, IV, size);
- 
+
 	return GF_OK;
 }
 
 static GF_Err _mcrypt_get_state( void* _buf, void *IV, int *size)
 {
-    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
+	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 	if (*size < buf->blocksize) {
 		*size = buf->blocksize;
 		return GF_BAD_PARAM;
@@ -86,21 +86,21 @@
 
 
 static void _end_mcrypt( void* _buf) {
-    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
+	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 	gf_free(buf->previous_ciphertext);
 	gf_free(buf->previous_cipher);
 }
 
 static GF_Err _mcrypt( void* _buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
 {
-    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
+	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 	u32 *fplain = plaintext;
 	u32 *plain;
-	int dblock, dlen, i, j; 
+	int dblock, dlen, i, j;
 	void (*_mcrypt_block_encrypt) (void *, void *);
 
 	_mcrypt_block_encrypt = func;
-	
+
 	dblock = blocksize / sizeof(u32);
 	dlen = len / blocksize;
 	for (j = 0; j < dlen ; j++) {
@@ -124,10 +124,10 @@
 
 static GF_Err _mdecrypt( void* _buf, void *ciphertext, int len, int blocksize,void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
 {
-    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
+	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 	u32 *cipher;
 	u32 *fcipher = ciphertext;
-	int i, j, dlen, dblock; 
+	int i, j, dlen, dblock;
 	void (*_mcrypt_block_decrypt) (void *, void *);
 
 	_mcrypt_block_decrypt = func2;

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/cfb.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/cfb.c Changed

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1998,1999,2000,2001,2002 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -32,28 +32,28 @@
 static GF_Err _init_mcrypt( CFB_BUFFER* buf, void *key, int lenofkey, void *IV, int size)
 {
 
-    buf->s_register = buf->enc_s_register = NULL;
-    
-    buf->blocksize = size;
-/* For cfb */
+	buf->s_register = buf->enc_s_register = NULL;
+
+	buf->blocksize = size;
+	/* For cfb */
 	buf->s_register=gf_malloc( size);
-    if (buf->s_register==NULL) goto freeall;
+	if (buf->s_register==NULL) goto freeall;
 
 	buf->enc_s_register=gf_malloc( size);
-    if (buf->enc_s_register==NULL) goto freeall;
+	if (buf->enc_s_register==NULL) goto freeall;
 
 	if (IV!=NULL) {
 		memcpy(buf->s_register, IV, size);
 	} else {
-		memset(buf->s_register, 0, size);	
+		memset(buf->s_register, 0, size);
 	}
-/* End cfb */
+	/* End cfb */
 	return GF_OK;
 
-	freeall:
-		if (buf->s_register) gf_free(buf->s_register);
-		if (buf->enc_s_register) gf_free(buf->enc_s_register);
-		return GF_OUT_OF_MEM;
+freeall:
+	if (buf->s_register) gf_free(buf->s_register);
+	if (buf->enc_s_register) gf_free(buf->enc_s_register);
+	return GF_OUT_OF_MEM;
 }
 
 
@@ -85,7 +85,7 @@
 }
 
 static GF_Err _mcrypt( CFB_BUFFER* buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{				/* plaintext is 1 u8 (8bit cfb) */
+{	/* plaintext is 1 u8 (8bit cfb) */
 	char *plain = plaintext;
 	int i, j;
 	void (*_mcrypt_block_encrypt) (void *, void *);
@@ -100,7 +100,7 @@
 
 		plain[j] ^= buf->enc_s_register[0];
 
-/* Shift the register */
+		/* Shift the register */
 		for (i = 0; i < (blocksize - 1); i++)
 			buf->s_register[i] = buf->s_register[i + 1];
 
@@ -113,7 +113,7 @@
 
 
 static GF_Err _mdecrypt( CFB_BUFFER* buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{				/* plaintext is 1 u8 (8bit ofb) */
+{	/* plaintext is 1 u8 (8bit ofb) */
 	char *plain = plaintext;
 	int i, j;
 	void (*_mcrypt_block_encrypt) (void *, void *);
@@ -126,7 +126,7 @@
 
 		_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
-/* Shift the register */
+		/* Shift the register */
 		for (i = 0; i < (blocksize - 1); i++)
 			buf->s_register[i] = buf->s_register[i + 1];

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/ctr.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/ctr.c Changed

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 2002 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -34,9 +34,9 @@
  * has been reached.
  */
 static void increase_counter( u8 *x, int x_size) {
-register int i, y=0;
+	register int i, y=0;
 
-	for (i=x_size-1;i>=0;i--) {
+	for (i=x_size-1; i>=0; i--) {
 		y = 0;
 		if ( x[i] == 0xff) {
 			x[i] = 0;
@@ -55,30 +55,30 @@
  */
 GF_Err _init_mcrypt( void *buf, void *key, int lenofkey, void *IV, int size)
 {
-    ((CTR_BUFFER* )buf)->c_counter = ((CTR_BUFFER* )buf)->enc_counter = NULL;
+	((CTR_BUFFER* )buf)->c_counter = ((CTR_BUFFER* )buf)->enc_counter = NULL;
 
-/* For ctr */
-    ((CTR_BUFFER* )buf)->c_counter_pos = 0;
-    ((CTR_BUFFER* )buf)->blocksize = size;
+	/* For ctr */
+	((CTR_BUFFER* )buf)->c_counter_pos = 0;
+	((CTR_BUFFER* )buf)->blocksize = size;
 
 	((CTR_BUFFER* )buf)->c_counter = (u8 *)gf_malloc(size);
-    if (((CTR_BUFFER* )buf)->c_counter==NULL) goto freeall;
+	if (((CTR_BUFFER* )buf)->c_counter==NULL) goto freeall;
 
 	((CTR_BUFFER* )buf)->enc_counter = (u8 *)gf_malloc(size);
-    if (((CTR_BUFFER* )buf)->enc_counter==NULL) goto freeall;
-    
-    if (IV!=NULL) {
-	memcpy(((CTR_BUFFER* )buf)->enc_counter, IV, size);
-	memcpy(((CTR_BUFFER* )buf)->c_counter, IV, size);
-    }
+	if (((CTR_BUFFER* )buf)->enc_counter==NULL) goto freeall;
+
+	if (IV!=NULL) {
+		memcpy(((CTR_BUFFER* )buf)->enc_counter, IV, size);
+		memcpy(((CTR_BUFFER* )buf)->c_counter, IV, size);
+	}
 
-/* End ctr */
+	/* End ctr */
 
 	return GF_OK;
-	freeall:
-		gf_free(((CTR_BUFFER* )buf)->c_counter);
-		gf_free(((CTR_BUFFER* )buf)->enc_counter);
-		return GF_OUT_OF_MEM;
+freeall:
+	gf_free(((CTR_BUFFER* )buf)->c_counter);
+	gf_free(((CTR_BUFFER* )buf)->enc_counter);
+	return GF_OUT_OF_MEM;
 }
 
 GF_Err _mcrypt_set_state(void *_buf, void *IV, int size)
@@ -112,7 +112,7 @@
 }
 
 static GFINLINE
-void xor_stuff( CTR_BUFFER *buf, void* akey, void (*func)(void*,void*), u8* plain,  int blocksize, int xor_size) 
+void xor_stuff( CTR_BUFFER *buf, void* akey, void (*func)(void*,void*), u8* plain,  int blocksize, int xor_size)
 {
 	void (*_mcrypt_block_encrypt) (void *, void *);
 
@@ -133,15 +133,15 @@
 			int size = blocksize - ((CTR_BUFFER* )buf)->c_counter_pos;
 
 			memxor( plain, &((CTR_BUFFER* )buf)->enc_counter[((CTR_BUFFER* )buf)->c_counter_pos],
-				size);
-		
+			        size);
+
 			increase_counter( ((CTR_BUFFER* )buf)->c_counter, blocksize);
 
 			memcpy( ((CTR_BUFFER* )buf)->enc_counter, ((CTR_BUFFER* )buf)->c_counter, blocksize);
 			_mcrypt_block_encrypt(akey, ((CTR_BUFFER* )buf)->enc_counter);
 
 			memxor( &plain[size], ((CTR_BUFFER* )buf)->enc_counter,
-				((CTR_BUFFER* )buf)->c_counter_pos);
+			        ((CTR_BUFFER* )buf)->c_counter_pos);
 
 			/* ((CTR_BUFFER* )buf)->c_counter_pos remains the same */
 
@@ -158,7 +158,7 @@
 			int min_size =  size < xor_size ? size: xor_size;
 
 			memxor( plain, &((CTR_BUFFER* )buf)->enc_counter[((CTR_BUFFER* )buf)->c_counter_pos],
-				min_size); 
+			        min_size);
 
 			((CTR_BUFFER* )buf)->c_counter_pos += min_size;
 
@@ -171,18 +171,18 @@
 			_mcrypt_block_encrypt(akey, ((CTR_BUFFER* )buf)->enc_counter);
 
 			memxor( &plain[min_size], ((CTR_BUFFER* )buf)->enc_counter,
-				xor_size - min_size);
+			        xor_size - min_size);
 
 			((CTR_BUFFER* )buf)->c_counter_pos = xor_size - min_size;
 
 		}
-	
+
 	}
 	return;
 }
 
 GF_Err _mcrypt(void * buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{				/* plaintext can be any size */
+{	/* plaintext can be any size */
 	u8 *plain;
 	int dlen, j=0;
 	int modlen;
@@ -195,7 +195,7 @@
 
 		plain += blocksize;
 
-/* Put the new register */
+		/* Put the new register */
 
 	}
 	modlen = len % blocksize;
@@ -208,13 +208,13 @@
 		xor_stuff( (CTR_BUFFER*)buf, akey, func, plain, blocksize, modlen);
 
 	}
-	
+
 	return GF_OK;
 }
 
 
 GF_Err _mdecrypt(void * buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{				/* plaintext can be any size */
+{	/* plaintext can be any size */
 	return _mcrypt( buf, plaintext, len, blocksize, akey, func, func2);
 }

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/des.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/des.c Changed

@@ -10,7 +10,7 @@
  *	char kn[16][8];
  */
 
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos 
+/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
  * All modifications are placed under the license of libmcrypt.
  */
 
@@ -29,7 +29,7 @@
 
 
 static void permute_ip(), permute_fp(), perminit_ip(), spinit(),
-perminit_fp();
+       perminit_fp();
 static u32 f();
 
 
@@ -109,52 +109,60 @@
 /* The (in)famous S-boxes */
 static char si[8][64] = {
 	/* S1 */
-	{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
-	 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
-	 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
-	 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13},
+	{	14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
+		0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
+		4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
+		15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13
+	},
 
 	/* S2 */
-	{15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
-	 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
-	 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
-	 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9},
+	{	15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
+		3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
+		0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
+		13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9
+	},
 
 	/* S3 */
-	{10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
-	 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
-	 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
-	 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12},
+	{	10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
+		13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
+		13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
+		1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12
+	},
 
 	/* S4 */
-	{7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
-	 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
-	 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
-	 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14},
+	{	7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
+		13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
+		10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
+		3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14
+	},
 
 	/* S5 */
-	{2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
-	 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
-	 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
-	 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3},
+	{	2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
+		14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
+		4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
+		11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3
+	},
 
 	/* S6 */
-	{12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
-	 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
-	 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
-	 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13},
+	{	12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
+		10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
+		9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
+		4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13
+	},
 
 	/* S7 */
-	{4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
-	 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
-	 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
-	 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12},
+	{	4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
+		13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
+		1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
+		6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12
+	},
 
 	/* S8 */
-	{13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
-	 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
-	 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
-	 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11},
+	{	13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
+		1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
+		7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
+		2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11
+	},
 
 };
 
@@ -215,15 +223,15 @@
 		l = pc1[j] - 1;	/* integer bit location  */
 		m = l & 07;	/* find bit              */
 		pc1m[j] = (user_key[l >> 3] &	/* find which key byte l is in */
-			   bytebit[m])	/* and which bit of that byte */
-		    ? 1 : 0;	/* and store 1-bit result */
+		           bytebit[m])	/* and which bit of that byte */
+		          ? 1 : 0;	/* and store 1-bit result */
 
 	}
 	for (i = 0; i < 16; i++) {	/* key chunk for each iteration */
 		for (j = 0; j < 56; j++)	/* rotate pc1 the right amount */
 			pcr[j] =
 			    pc1m[(l = j + totrot[i]) <
-				 (j < 28 ? 28 : 56) ? l : l - 28];
+			         (j < 28 ? 28 : 56) ? l : l - 28];
 		/* rotate left and right halves independently */
 		for (j = 0; j < 48; j++) {	/* select bits individually */
 			/* check bit that goes to kn[j] */
@@ -433,9 +441,9 @@
 
 #ifdef	TRACE
 	fprintf(stderr, "f(%08lx, %02x %02x %02x %02x %02x %02x %02x %02x) = ",
-	       r,
-	       subkey[0], subkey[1], subkey[2],
-	       subkey[3], subkey[4], subkey[5], subkey[6], subkey[7]);
+	        r,
+	        subkey[0], subkey[1], subkey[2],
+	        subkey[3], subkey[4], subkey[5], subkey[6], subkey[7]);
 #endif
 	/* Run E(R) ^ K through the combined S & P boxes.
 	 * This code takes advantage of a convenient regularity in
@@ -545,7 +553,7 @@
 			 */
 			rowcol =
 			    (i & 32) | ((i & 1) ? 16 : 0) | ((i >> 1) &
-							     0xf);
+			                                     0xf);
 			for (j = 0; j < 4; j++) {	/* For each output bit */
 				if (si[s][rowcol] & (8 >> j)) {
 					val |=
@@ -556,7 +564,7 @@
 
 #ifdef DEBUG
 			fprintf(stderr, "sp[%d][%2d] = %08lx\n", s, i,
-			       key->sp[s][i]);
+			        key->sp[s][i]);
 #endif
 		}
 	}
@@ -570,7 +578,7 @@
 	td->algo_name = "DES";
 	td->algo_version = 20010801;
 	td->num_key_sizes = 1;
-	td->key_sizes[0] = 8; 
+	td->key_sizes[0] = 8;
 	td->key_size = 8;
 	td->is_block_algo = 1;
 	td->algo_block_size = 8;

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/ecb.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/ecb.c Changed

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -27,8 +27,12 @@
 
 }
 
-static GF_Err _mcrypt_set_state( void* buf, void *IV, int size) { return GF_BAD_PARAM; }
-static GF_Err _mcrypt_get_state( void* buf, void *IV, int *size) { return GF_BAD_PARAM; }
+static GF_Err _mcrypt_set_state( void* buf, void *IV, int size) {
+	return GF_BAD_PARAM;
+}
+static GF_Err _mcrypt_get_state( void* buf, void *IV, int *size) {
+	return GF_BAD_PARAM;
+}
 
 static void _end_mcrypt (void* buf) {}
 
@@ -39,7 +43,7 @@
 	void (*_mcrypt_block_encrypt) (void *, void *);
 
 	_mcrypt_block_encrypt = func;
-	
+
 	for (j = 0; j < len / blocksize; j++) {
 		_mcrypt_block_encrypt(akey, &plain[j * blocksize]);
 	}
@@ -56,7 +60,7 @@
 	void (*_mcrypt_block_decrypt) (void *, void *);
 
 	_mcrypt_block_decrypt = func2;
-	
+
 	for (j = 0; j < len / blocksize; j++) {
 		_mcrypt_block_decrypt(akey, &cipher[j * blocksize]);
 	}

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/g_crypt.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/g_crypt.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -31,26 +31,65 @@
 
 static Bool gf_crypt_assign_algo(GF_Crypt *td, const char *algorithm)
 {
-	if (!stricmp(algorithm, "AES-128") || !stricmp(algorithm, "Rijndael-128")) { gf_crypt_register_rijndael_128(td); return 1; }
+	if (!stricmp(algorithm, "AES-128") || !stricmp(algorithm, "Rijndael-128")) {
+		gf_crypt_register_rijndael_128(td);
+		return 1;
+	}
 #ifndef GPAC_CRYPT_ISMA_ONLY
-	else if (!stricmp(algorithm, "AES-192") || !stricmp(algorithm, "Rijndael-192")) { gf_crypt_register_rijndael_192(td); return 1; }
-	else if (!stricmp(algorithm, "AES-256") || !stricmp(algorithm, "Rijndael-256")) { gf_crypt_register_rijndael_256(td); return 1; }
-	else if (!stricmp(algorithm, "DES")) { gf_crypt_register_des(td); return 1; }
-	else if (!stricmp(algorithm, "3DES")) { gf_crypt_register_3des(td); return 1; }
+	else if (!stricmp(algorithm, "AES-192") || !stricmp(algorithm, "Rijndael-192")) {
+		gf_crypt_register_rijndael_192(td);
+		return 1;
+	}
+	else if (!stricmp(algorithm, "AES-256") || !stricmp(algorithm, "Rijndael-256")) {
+		gf_crypt_register_rijndael_256(td);
+		return 1;
+	}
+	else if (!stricmp(algorithm, "DES")) {
+		gf_crypt_register_des(td);
+		return 1;
+	}
+	else if (!stricmp(algorithm, "3DES")) {
+		gf_crypt_register_3des(td);
+		return 1;
+	}
 #endif
 	return 0;
 }
 static Bool gf_crypt_assign_mode(GF_Crypt *td, const char *mode)
 {
-	if (!stricmp(mode, "CTR")) { gf_crypt_register_ctr(td); return 1; }
-	else if (!stricmp(mode, "CBC")) { gf_crypt_register_cbc(td); return 1; }
+	if (!stricmp(mode, "CTR")) {
+		gf_crypt_register_ctr(td);
+		return 1;
+	}
+	else if (!stricmp(mode, "CBC")) {
+		gf_crypt_register_cbc(td);
+		return 1;
+	}
 #ifndef GPAC_CRYPT_ISMA_ONLY
-	else if (!stricmp(mode, "CFB")) { gf_crypt_register_cfb(td); return 1; }
-	else if (!stricmp(mode, "ECB")) { gf_crypt_register_ecb(td); return 1; }
-	else if (!stricmp(mode, "nCFB")) { gf_crypt_register_ncfb(td); return 1; }
-	else if (!stricmp(mode, "nOFB")) { gf_crypt_register_nofb(td); return 1; }
-	else if (!stricmp(mode, "OFB")) { gf_crypt_register_ofb(td); return 1; }
-	else if (!stricmp(mode, "STREAM")) { gf_crypt_register_stream(td); return 1; }
+	else if (!stricmp(mode, "CFB")) {
+		gf_crypt_register_cfb(td);
+		return 1;
+	}
+	else if (!stricmp(mode, "ECB")) {
+		gf_crypt_register_ecb(td);
+		return 1;
+	}
+	else if (!stricmp(mode, "nCFB")) {
+		gf_crypt_register_ncfb(td);
+		return 1;
+	}
+	else if (!stricmp(mode, "nOFB")) {
+		gf_crypt_register_nofb(td);
+		return 1;
+	}
+	else if (!stricmp(mode, "OFB")) {
+		gf_crypt_register_ofb(td);
+		return 1;
+	}
+	else if (!stricmp(mode, "STREAM")) {
+		gf_crypt_register_stream(td);
+		return 1;
+	}
 #endif
 	return 0;
 }
@@ -59,11 +98,11 @@
 {
 	GF_Crypt *td;
 	if ((!algorithm || !mode) && !is_check) return NULL;
-	
+
 	GF_SAFEALLOC(td, GF_Crypt);
 	if (td==NULL) return NULL;
 
-	
+
 	if (algorithm && !gf_crypt_assign_algo(td, algorithm)) {
 		gf_free(td);
 		return NULL;
@@ -79,7 +118,7 @@
 		return NULL;
 	}
 	if (!td->_mcrypt || !td->_mdecrypt || !td->_mcrypt_set_state
-		|| !td->a_decrypt || !td->a_encrypt || !td->a_set_key)
+	        || !td->a_decrypt || !td->a_encrypt || !td->a_set_key)
 	{
 		gf_free(td);
 		return NULL;
@@ -137,7 +176,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_crypt_set_state(GF_Crypt *td, const void *iv, int size) 
+GF_Err gf_crypt_set_state(GF_Crypt *td, const void *iv, int size)
 {
 	if (!td) return GF_BAD_PARAM;
 	return td->_mcrypt_set_state(td->abuf, (void *) iv, size);
@@ -149,16 +188,20 @@
 	return td->_mcrypt_get_state(td->abuf, iv, size);
 }
 
-u32 gf_crypt_get_block_size(GF_Crypt *td) { return td ? td->algo_block_size : 0; }
+u32 gf_crypt_get_block_size(GF_Crypt *td) {
+	return td ? td->algo_block_size : 0;
+}
 
-u32 gf_crypt_get_iv_size(GF_Crypt *td) 
+u32 gf_crypt_get_iv_size(GF_Crypt *td)
 {
 	if (!td) return 0;
 	if (td->is_block_algo_mode) return td->algo_block_size;
 	return td->algo_IV_size;
 }
 
-u32 gf_crypt_get_key_size(GF_Crypt *td) { return td ? td->key_size : 0; }
+u32 gf_crypt_get_key_size(GF_Crypt *td) {
+	return td ? td->key_size : 0;
+}
 
 u32 gf_crypt_get_supported_key_sizes(GF_Crypt *td, u32 *key_sizes)
 {
@@ -168,14 +211,30 @@
 	return td->num_key_sizes;
 }
 
-Bool gf_crypt_is_block_algorithm(GF_Crypt *td) { return td ? td->is_block_algo : 0; }
-const char *gf_crypt_get_algorithm_name(GF_Crypt *td) { return td ? td->algo_name : NULL; }
-const char *gf_crypt_get_mode_name(GF_Crypt *td) { return td ? td->mode_name : NULL; }
-Bool gf_crypt_is_block_mode(GF_Crypt *td) { return td ? td->is_block_mode : 0; }
-Bool gf_crypt_mode_has_iv(GF_Crypt *td) { return td ? td->has_IV : 0; }
-Bool gf_crypt_is_block_algorithm_mode(GF_Crypt *td) { return td ? td->is_block_algo_mode : 0; }
-u32 gf_crypt_get_algorithm_version(GF_Crypt *td) { return td ? td->algo_version : 0; }
-u32 gf_crypt_get_mode_version(GF_Crypt *td) { return td ? td->mode_version : 0; }
+Bool gf_crypt_is_block_algorithm(GF_Crypt *td) {
+	return td ? td->is_block_algo : 0;
+}
+const char *gf_crypt_get_algorithm_name(GF_Crypt *td) {
+	return td ? td->algo_name : NULL;
+}
+const char *gf_crypt_get_mode_name(GF_Crypt *td) {
+	return td ? td->mode_name : NULL;
+}
+Bool gf_crypt_is_block_mode(GF_Crypt *td) {
+	return td ? td->is_block_mode : 0;
+}
+Bool gf_crypt_mode_has_iv(GF_Crypt *td) {
+	return td ? td->has_IV : 0;
+}
+Bool gf_crypt_is_block_algorithm_mode(GF_Crypt *td) {
+	return td ? td->is_block_algo_mode : 0;
+}
+u32 gf_crypt_get_algorithm_version(GF_Crypt *td) {
+	return td ? td->algo_version : 0;
+}
+u32 gf_crypt_get_mode_version(GF_Crypt *td) {
+	return td ? td->mode_version : 0;
+}
 
 
 
@@ -217,8 +276,8 @@
 	}
 
 	td->keyword_given = (char*)gf_malloc(sizeof(char)*gf_crypt_get_key_size(td));
-	if (td->keyword_given==NULL) return GF_OUT_OF_MEM; 
-	
+	if (td->keyword_given==NULL) return GF_OUT_OF_MEM;
+
 	memmove(td->keyword_given, key, lenofkey);
 
 	td->akey = (char*)gf_malloc(sizeof(char)*td->algo_size);

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/ncfb.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/ncfb.c Changed

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -32,17 +32,17 @@
 
 static GF_Err _init_mcrypt( nCFB_BUFFER* buf, void *key, int lenofkey, void *IV, int size)
 {
-    buf->enc_s_register = buf->s_register = NULL;
-    buf->s_register_pos = 0;
-    
-    buf->blocksize = size;
+	buf->enc_s_register = buf->s_register = NULL;
+	buf->s_register_pos = 0;
+
+	buf->blocksize = size;
 
-/* For cfb */
+	/* For cfb */
 	buf->enc_s_register=gf_malloc( size);
-    if (buf->enc_s_register==NULL) goto freeall;
-    
+	if (buf->enc_s_register==NULL) goto freeall;
+
 	buf->s_register=gf_malloc( size);
-    if (buf->s_register==NULL) goto freeall;
+	if (buf->s_register==NULL) goto freeall;
 
 	if (IV!=NULL) {
 		memcpy(buf->enc_s_register, IV, size);
@@ -52,13 +52,13 @@
 		memset(buf->s_register, 0, size);
 	}
 
-/* End ncfb */
+	/* End ncfb */
 
 	return GF_OK;
-	freeall:
-		if (buf->enc_s_register) gf_free(buf->enc_s_register);
-		if (buf->s_register) gf_free(buf->s_register);
-		return GF_BAD_PARAM;
+freeall:
+	if (buf->enc_s_register) gf_free(buf->enc_s_register);
+	if (buf->s_register) gf_free(buf->s_register);
+	return GF_BAD_PARAM;
 }
 
 static GF_Err _mcrypt_set_state( nCFB_BUFFER* buf, u8 *IV, int size)
@@ -102,7 +102,7 @@
 			memcpy(buf->enc_s_register, buf->s_register, blocksize);
 
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-			
+
 			memxor( plain, buf->enc_s_register, blocksize);
 
 			memcpy(buf->s_register, plain, blocksize);
@@ -111,17 +111,17 @@
 			int size = blocksize - buf->s_register_pos;
 
 			memxor( plain, &buf->enc_s_register[buf->s_register_pos],
-				size); 
-		
+			        size);
+
 			memcpy(buf->enc_s_register, buf->s_register, blocksize);
 
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
 			memxor( &plain[size], buf->enc_s_register,
-				buf->s_register_pos);
+			        buf->s_register_pos);
 
-			memcpy( &buf->s_register[size], 
-				plain, buf->s_register_pos);
+			memcpy( &buf->s_register[size],
+			        plain, buf->s_register_pos);
 
 			/* buf->s_register_pos remains the same */
 		}
@@ -130,7 +130,7 @@
 			memcpy(buf->enc_s_register, buf->s_register, blocksize);
 
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-			
+
 			memxor( plain, buf->enc_s_register, xor_size);
 
 			memcpy(buf->s_register, plain, xor_size);
@@ -141,7 +141,7 @@
 			int min_size =  size < xor_size ? size: xor_size;
 
 			memxor( plain, &buf->enc_s_register[buf->s_register_pos],
-				min_size);
+			        min_size);
 
 			memcpy( &buf->s_register[buf->s_register_pos], plain, min_size);
 
@@ -155,13 +155,13 @@
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
 			memxor( &plain[min_size], buf->s_register,
-				xor_size - min_size);
+			        xor_size - min_size);
 
 			buf->s_register_pos = xor_size - min_size;
 
 			memcpy(buf->s_register, plain, xor_size - min_size);
 		}
-	
+
 	}
 	return;
 }
@@ -181,7 +181,7 @@
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
 			memcpy(buf->s_register, cipher, blocksize);
-			
+
 			memxor( cipher, buf->enc_s_register, blocksize);
 
 
@@ -189,17 +189,17 @@
 			int size = blocksize - buf->s_register_pos;
 
 			memxor( cipher, &buf->enc_s_register[buf->s_register_pos],
-				size); 
-		
+			        size);
+
 			memcpy(buf->enc_s_register, buf->s_register, blocksize);
 
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
-			memcpy( &buf->s_register[size], 
-				cipher, buf->s_register_pos);
+			memcpy( &buf->s_register[size],
+			        cipher, buf->s_register_pos);
 
 			memxor( &cipher[size], buf->enc_s_register,
-				buf->s_register_pos);
+			        buf->s_register_pos);
 
 
 			/* buf->s_register_pos remains the same */
@@ -211,7 +211,7 @@
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
 			memcpy(buf->s_register, cipher, xor_size);
-			
+
 			memxor( cipher, buf->enc_s_register, xor_size);
 
 
@@ -221,7 +221,7 @@
 			int min_size =  size < xor_size ? size: xor_size;
 
 			memxor( cipher, &buf->enc_s_register[buf->s_register_pos],
-				min_size);
+			        min_size);
 
 			memcpy( &buf->s_register[buf->s_register_pos], cipher, min_size);
 
@@ -237,65 +237,65 @@
 			memcpy(buf->s_register, cipher, xor_size - min_size);
 
 			memxor( &cipher[min_size], buf->s_register,
-				xor_size - min_size);
+			        xor_size - min_size);
 
 			buf->s_register_pos = xor_size - min_size;
 
 		}
-	
+
 	}
 	return;
 }
 
 
 static GF_Err _mcrypt( nCFB_BUFFER* buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{				/* plaintext is n*blocksize bytes (nbit cfb) */
+{	/* plaintext is n*blocksize bytes (nbit cfb) */
 	u8* plain;
 	int dlen, j=0;
 	void (*_mcrypt_block_encrypt) (void *, void *);
 	int modlen;
-	
+
 	_mcrypt_block_encrypt = func;
 
 	dlen = len / blocksize;
 	plain = plaintext;
 	for (j = 0; j < dlen; j++) {
-		xor_stuff_en( buf, akey, func, plain, blocksize, blocksize); 
-		
+		xor_stuff_en( buf, akey, func, plain, blocksize, blocksize);
+
 		plain += blocksize;
 
 	}
 	modlen = len % blocksize;
 	if (modlen > 0) {
-		xor_stuff_en( buf, akey, func, plain, blocksize, modlen); 
+		xor_stuff_en( buf, akey, func, plain, blocksize, modlen);
 	}
-	
+
 	return GF_OK;
 }
 
 
 static GF_Err _mdecrypt( nCFB_BUFFER* buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{				/* plaintext is n*blocksize bytes (nbit cfb) */
+{	/* plaintext is n*blocksize bytes (nbit cfb) */
 	u8* plain;
 	int dlen, j=0;
 	void (*_mcrypt_block_encrypt) (void *, void *);
 	int modlen;
-	
+
 	_mcrypt_block_encrypt = func;
 
 	dlen = len / blocksize;
 	plain = plaintext;
 	for (j = 0; j < dlen; j++) {
-		xor_stuff_de( buf, akey, func, plain, blocksize, blocksize); 
-		
+		xor_stuff_de( buf, akey, func, plain, blocksize, blocksize);
+
 		plain += blocksize;
 
 	}
 	modlen = len % blocksize;
 	if (modlen > 0) {
-		xor_stuff_de( buf, akey, func, plain, blocksize, modlen); 
+		xor_stuff_de( buf, akey, func, plain, blocksize, modlen);
 	}
-	
+
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/nofb.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/nofb.c Changed

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -32,16 +32,16 @@
 
 static GF_Err _init_mcrypt( nOFB_BUFFER* buf, void *key, int lenofkey, void *IV, int size)
 {
-    buf->enc_s_register = buf->s_register = NULL;
-    buf->s_register_pos = 0;
+	buf->enc_s_register = buf->s_register = NULL;
+	buf->s_register_pos = 0;
 
-    buf->blocksize = size;    
-/* For ofb */
+	buf->blocksize = size;
+	/* For ofb */
 	buf->enc_s_register=gf_malloc( size);
-    if (buf->enc_s_register==NULL) goto freeall;
-    
+	if (buf->enc_s_register==NULL) goto freeall;
+
 	buf->s_register=gf_malloc( size);
-    if (buf->s_register==NULL) goto freeall;
+	if (buf->s_register==NULL) goto freeall;
 
 	if (IV!=NULL) {
 		memcpy(buf->enc_s_register, IV, size);
@@ -51,13 +51,13 @@
 		memset(buf->s_register, 0, size);
 	}
 
-/* End nofb */
+	/* End nofb */
 
 	return GF_OK;
-	freeall:
-		if (buf->enc_s_register) gf_free(buf->enc_s_register);
-		if (buf->s_register) gf_free(buf->s_register);
-		return GF_OUT_OF_MEM;
+freeall:
+	if (buf->enc_s_register) gf_free(buf->enc_s_register);
+	if (buf->s_register) gf_free(buf->s_register);
+	return GF_OUT_OF_MEM;
 }
 
 static GF_Err _mcrypt_set_state( nOFB_BUFFER* buf, u8 *IV, int size)
@@ -104,24 +104,24 @@
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
 			memcpy(buf->s_register, buf->enc_s_register, blocksize);
-			
+
 			memxor( plain, buf->enc_s_register, blocksize);
 
 		} else {
 			int size = blocksize - buf->s_register_pos;
 
 			memxor( plain, &buf->enc_s_register[buf->s_register_pos],
-				size); 
-		
+			        size);
+
 			memcpy(buf->enc_s_register, buf->s_register, blocksize);
 
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
-			memcpy( buf->s_register, 
-				buf->enc_s_register, blocksize);
+			memcpy( buf->s_register,
+			        buf->enc_s_register, blocksize);
 
 			memxor( &plain[size], buf->enc_s_register,
-				buf->s_register_pos);
+			        buf->s_register_pos);
 
 			/* buf->s_register_pos remains the same */
 		}
@@ -132,7 +132,7 @@
 			_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
 			memcpy(buf->s_register, buf->enc_s_register, blocksize);
-			
+
 			memxor( plain, buf->enc_s_register, xor_size);
 
 			buf->s_register_pos = xor_size;
@@ -141,7 +141,7 @@
 			int min_size =  size < xor_size ? size: xor_size;
 
 			memxor( plain, &buf->enc_s_register[buf->s_register_pos],
-				min_size);
+			        min_size);
 
 			buf->s_register_pos += min_size;
 
@@ -155,39 +155,39 @@
 			memcpy(buf->s_register, buf->enc_s_register, blocksize);
 
 			memxor( &plain[min_size], buf->s_register,
-				xor_size - min_size);
+			        xor_size - min_size);
 
 			buf->s_register_pos = xor_size - min_size;
 
 		}
-	
+
 	}
 	return;
 }
 
 
 static GF_Err _mcrypt( nOFB_BUFFER* buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{				/* plaintext is n*blocksize bytes (nbit cfb) */
+{	/* plaintext is n*blocksize bytes (nbit cfb) */
 	u8* plain;
 	int dlen, j=0;
 	void (*_mcrypt_block_encrypt) (void *, void *);
 	int modlen;
-	
+
 	_mcrypt_block_encrypt = func;
 
 	dlen = len / blocksize;
 	plain = plaintext;
 	for (j = 0; j < dlen; j++) {
-		xor_stuff( buf, akey, func, plain, blocksize, blocksize); 
-		
+		xor_stuff( buf, akey, func, plain, blocksize, blocksize);
+
 		plain += blocksize;
 
 	}
 	modlen = len % blocksize;
 	if (modlen > 0) {
-		xor_stuff( buf, akey, func, plain, blocksize, modlen); 
+		xor_stuff( buf, akey, func, plain, blocksize, modlen);
 	}
-	
+
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/ofb.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/ofb.c Changed

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1998,1999,2000,2001,2002 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -33,30 +33,30 @@
 static GF_Err _init_mcrypt( OFB_BUFFER* buf, void *key, int lenofkey, void *IV, int size)
 {
 
-    buf->s_register = buf->enc_s_register = NULL;
+	buf->s_register = buf->enc_s_register = NULL;
+
+	buf->blocksize = size;
 
-    buf->blocksize = size;
-    
-    /* For ofb */
+	/* For ofb */
 	buf->s_register=gf_malloc( size);
-    if (buf->s_register==NULL) goto freeall;
+	if (buf->s_register==NULL) goto freeall;
 
 	buf->enc_s_register=gf_malloc( size);
-    if (buf->enc_s_register==NULL) goto freeall;
+	if (buf->enc_s_register==NULL) goto freeall;
 
 	if (IV!=NULL) {
 		memcpy(buf->s_register, IV, size);
 	} else {
 		memset(buf->s_register, 0, size);
 	}
-/* End ofb */
+	/* End ofb */
 
 	return GF_OK;
 
-	freeall:
-		if (buf->s_register) gf_free(buf->s_register);
-		if (buf->enc_s_register) gf_free(buf->enc_s_register);
-		return GF_OUT_OF_MEM;
+freeall:
+	if (buf->s_register) gf_free(buf->s_register);
+	if (buf->enc_s_register) gf_free(buf->enc_s_register);
+	return GF_OUT_OF_MEM;
 }
 
 static GF_Err _mcrypt_get_state( OFB_BUFFER* buf, u8 *IV, int *size)
@@ -88,7 +88,7 @@
 
 
 static GF_Err _mcrypt( OFB_BUFFER* buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*) )
-{				/* plaintext is 1 u8 (8bit ofb) */
+{	/* plaintext is 1 u8 (8bit ofb) */
 	char *plain = plaintext;
 	int i, j;
 	void (*_mcrypt_block_encrypt) (void *, void *);
@@ -103,7 +103,7 @@
 
 		plain[j] ^= buf->enc_s_register[0];
 
-/* Shift the register */
+		/* Shift the register */
 		for (i = 0; i < (blocksize - 1); i++)
 			buf->s_register[i] = buf->s_register[i + 1];
 
@@ -116,7 +116,7 @@
 
 
 static GF_Err _mdecrypt( OFB_BUFFER* buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{				/* plaintext is 1 u8 (8bit ofb) */
+{	/* plaintext is 1 u8 (8bit ofb) */
 	char *plain = plaintext;
 	int i, j;
 	void (*_mcrypt_block_encrypt) (void *, void *);
@@ -129,7 +129,7 @@
 
 		_mcrypt_block_encrypt(akey, buf->enc_s_register);
 
-/* Shift the register */
+		/* Shift the register */
 		for (i = 0; i < (blocksize - 1); i++)
 			buf->s_register[i] = buf->s_register[i + 1];

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/rijndael-128.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/rijndael-128.c Changed

@@ -4,18 +4,18 @@
    Copyright (c) 1999 Mike Scott
    See rijndael documentation
 
-   Permission for free direct or derivative use is granted subject 
-   to compliance with any conditions that the originators of the 
-   algorithm place on its exploitation.  
+   Permission for free direct or derivative use is granted subject
+   to compliance with any conditions that the originators of the
+   algorithm place on its exploitation.
 
    Inspiration from Brian Gladman's implementation is acknowledged.
 
    Written for clarity, rather than speed.
-   Full implementation. 
+   Full implementation.
    Endian indifferent.
 */
 
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos 
+/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
  * All modifications are placed under the license of libmcrypt.
  */
 
@@ -58,14 +58,14 @@
 /* in "rijndael.h" */
 
 static u32 pack(u8 * b)
-{				/* pack bytes into a 32-bit Word */
+{	/* pack bytes into a 32-bit Word */
 	return ((u32) b[3] << 24) | ((u32) b[2] << 16) | ((u32)
-								b[1] << 8)
-	    | (u32) b[0];
+	        b[1] << 8)
+	       | (u32) b[0];
 }
 
 static void unpack(u32 a, u8 * b)
-{				/* unpack bytes from a word */
+{	/* unpack bytes from a word */
 	b[0] = (u8) a;
 	b[1] = (u8) (a >> 8);
 	b[2] = (u8) (a >> 16);
@@ -86,7 +86,7 @@
 }
 
 static u8 bmul(u8 x, u8 y)
-{				/* x.y= AntiLog(Log(x) + Log(y)) */
+{	/* x.y= AntiLog(Log(x) + Log(y)) */
 	if (x && y)
 		return ptab[(ltab[x] + ltab[y]) % 255];
 	else
@@ -105,17 +105,17 @@
 }
 
 static u8 product(u32 x, u32 y)
-{				/* dot product of two 4-u8 arrays */
+{	/* dot product of two 4-u8 arrays */
 	u8 xb[4], yb[4];
 	unpack(x, xb);
 	unpack(y, yb);
 	return bmul(xb[0], yb[0]) ^ bmul(xb[1], yb[1]) ^ bmul(xb[2],
-							      yb[2]) ^
-	    bmul(xb[3], yb[3]);
+	        yb[2]) ^
+	       bmul(xb[3], yb[3]);
 }
 
 static u32 InvMixCol(u32 x)
-{				/* matrix Multiplication */
+{	/* matrix Multiplication */
 	u32 y, m;
 	u8 b[4];
 
@@ -148,7 +148,7 @@
 }
 
 static void _mcrypt_rijndael_gentables(void)
-{				/* generate tables */
+{	/* generate tables */
 	int i;
 	u8 y, b[4];
 
@@ -198,7 +198,7 @@
 }
 
 static int _mcrypt_set_key(RI * rinst, u8 * key, int nk)
-{				/* blocksize=32*nb bits. Key=32*nk bits */
+{	/* blocksize=32*nb bits. Key=32*nk bits */
 	/* currently nb,bk = 4, 6 or 8          */
 	/* key comes as 4*rinst->Nk bytes              */
 	/* Key Scheduler. Create expanded encryption key */
@@ -254,32 +254,32 @@
 	for (j = rinst->Nk, k = 0; j < N; j += rinst->Nk, k++) {
 		rinst->fkey[j] =
 		    rinst->fkey[j -
-				rinst->Nk] ^ SubByte(ROTL24(rinst->
-							    fkey[j -
-								 1])) ^
+		                rinst->Nk] ^ SubByte(ROTL24(rinst->
+		                                     fkey[j -
+		                                             1])) ^
 		    rco[k];
 		if (rinst->Nk <= 6) {
 			for (i = 1; i < rinst->Nk && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 		} else {
 			for (i = 1; i < 4 && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 			if ((j + 4) < N)
 				rinst->fkey[j + 4] =
 				    rinst->fkey[j + 4 -
-						rinst->
-						Nk] ^ SubByte(rinst->
-							      fkey[j + 3]);
+				                rinst->
+				                Nk] ^ SubByte(rinst->
+				                              fkey[j + 3]);
 			for (i = 5; i < rinst->Nk && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 		}
 
@@ -317,32 +317,32 @@
 	x = a;
 	y = b;
 
-/* State alternates between a and b */
+	/* State alternates between a and b */
 	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
 
-/* if rinst->Nb is fixed - unroll this next 
-   loop and hard-code in the values of fi[]  */
+		/* if rinst->Nb is fixed - unroll this next
+		   loop and hard-code in the values of fi[]  */
 
 		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* deal with each 32-bit element of the State */
 			/* This is the time-critical bit */
 			y[j] = rinst->fkey[k++] ^ ftable[(u8) x[j]] ^
-			    ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
-			    ROTL16(ftable
-				   [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-			    ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
+			       ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
+			       ROTL16(ftable
+			              [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
+			       ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
 		}
 		t = x;
 		x = y;
 		y = t;		/* swap pointers */
 	}
 
-/* Last Round - unroll if possible */
+	/* Last Round - unroll if possible */
 	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
 		y[j] = rinst->fkey[k++] ^ (u32) fbsub[(u8) x[j]] ^
-		    ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
-		    ROTL16((u32)
-			   fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-		    ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
+		       ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
+		       ROTL16((u32)
+		              fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
+		       ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
 	}
 	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
 		unpack(y[i], &buff[j]);
@@ -364,31 +364,31 @@
 	x = a;
 	y = b;
 
-/* State alternates between a and b */
+	/* State alternates between a and b */
 	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
 
-/* if rinst->Nb is fixed - unroll this next 
-   loop and hard-code in the values of ri[]  */
+		/* if rinst->Nb is fixed - unroll this next
+		   loop and hard-code in the values of ri[]  */
 
 		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* This is the time-critical bit */
 			y[j] = rinst->rkey[k++] ^ rtable[(u8) x[j]] ^
-			    ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
-			    ROTL16(rtable
-				   [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-			    ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
+			       ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
+			       ROTL16(rtable
+			              [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
+			       ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
 		}
 		t = x;
 		x = y;
 		y = t;		/* swap pointers */
 	}
 
-/* Last Round - unroll if possible */
+	/* Last Round - unroll if possible */
 	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
 		y[j] = rinst->rkey[k++] ^ (u32) rbsub[(u8) x[j]] ^
-		    ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
-		    ROTL16((u32)
-			   rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-		    ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
+		       ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
+		       ROTL16((u32)
+		              rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
+		       ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
 	}
 	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
 		unpack(y[i], &buff[j]);
@@ -405,9 +405,9 @@
 	td->algo_name = "Rijndael-128";
 	td->algo_version = 20010801;
 	td->num_key_sizes = 3;
-	td->key_sizes[0] = 16; 
-	td->key_sizes[1] = 24; 
-	td->key_sizes[2] = 32; 
+	td->key_sizes[0] = 16;
+	td->key_sizes[1] = 24;
+	td->key_sizes[2] = 32;
 	td->key_size = 32;
 	td->is_block_algo = 1;
 	td->algo_block_size = 16;

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/rijndael-192.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/rijndael-192.c Changed

@@ -4,18 +4,18 @@
    Copyright (c) 1999 Mike Scott
    See rijndael documentation
 
-   Permission for free direct or derivative use is granted subject 
-   to compliance with any conditions that the originators of the 
-   algorithm place on its exploitation.  
+   Permission for free direct or derivative use is granted subject
+   to compliance with any conditions that the originators of the
+   algorithm place on its exploitation.
 
    Inspiration from Brian Gladman's implementation is acknowledged.
 
    Written for clarity, rather than speed.
-   Full implementation. 
+   Full implementation.
    Endian indifferent.
 */
 
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos 
+/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
  * All modifications are placed under the license of libmcrypt.
  */
 
@@ -61,14 +61,14 @@
 /* in "rijndael.h" */
 
 static u32 pack(u8 * b)
-{				/* pack bytes into a 32-bit Word */
+{	/* pack bytes into a 32-bit Word */
 	return ((u32) b[3] << 24) | ((u32) b[2] << 16) | ((u32)
-								b[1] << 8)
-	    | (u32) b[0];
+	        b[1] << 8)
+	       | (u32) b[0];
 }
 
 static void unpack(u32 a, u8 * b)
-{				/* unpack bytes from a word */
+{	/* unpack bytes from a word */
 	b[0] = (u8) a;
 	b[1] = (u8) (a >> 8);
 	b[2] = (u8) (a >> 16);
@@ -88,7 +88,7 @@
 }
 
 static u8 bmul(u8 x, u8 y)
-{				/* x.y= AntiLog(Log(x) + Log(y)) */
+{	/* x.y= AntiLog(Log(x) + Log(y)) */
 	if (x && y)
 		return ptab[(ltab[x] + ltab[y]) % 255];
 	else
@@ -107,17 +107,17 @@
 }
 
 static u8 product(u32 x, u32 y)
-{				/* dot product of two 4-u8 arrays */
+{	/* dot product of two 4-u8 arrays */
 	u8 xb[4], yb[4];
 	unpack(x, xb);
 	unpack(y, yb);
 	return bmul(xb[0], yb[0]) ^ bmul(xb[1], yb[1]) ^ bmul(xb[2],
-							      yb[2]) ^
-	    bmul(xb[3], yb[3]);
+	        yb[2]) ^
+	       bmul(xb[3], yb[3]);
 }
 
 static u32 InvMixCol(u32 x)
-{				/* matrix Multiplication */
+{	/* matrix Multiplication */
 	u32 y, m;
 	u8 b[4];
 
@@ -150,7 +150,7 @@
 }
 
 static void _mcrypt_rijndael_gentables(void)
-{				/* generate tables */
+{	/* generate tables */
 	int i;
 	u8 y, b[4];
 
@@ -200,7 +200,7 @@
 }
 
 static GF_Err _mcrypt_set_key(RI * rinst, u8 * key, int nk)
-{				/* blocksize=32*nb bits. Key=32*nk bits */
+{	/* blocksize=32*nb bits. Key=32*nk bits */
 	/* currently nb,bk = 4, 6 or 8          */
 	/* key comes as 4*rinst->Nk bytes              */
 	/* Key Scheduler. Create expanded encryption key */
@@ -254,32 +254,32 @@
 	for (j = rinst->Nk, k = 0; j < N; j += rinst->Nk, k++) {
 		rinst->fkey[j] =
 		    rinst->fkey[j -
-				rinst->Nk] ^ SubByte(ROTL24(rinst->
-							    fkey[j -
-								 1])) ^
+		                rinst->Nk] ^ SubByte(ROTL24(rinst->
+		                                     fkey[j -
+		                                             1])) ^
 		    rco[k];
 		if (rinst->Nk <= 6) {
 			for (i = 1; i < rinst->Nk && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 		} else {
 			for (i = 1; i < 4 && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 			if ((j + 4) < N)
 				rinst->fkey[j + 4] =
 				    rinst->fkey[j + 4 -
-						rinst->
-						Nk] ^ SubByte(rinst->
-							      fkey[j + 3]);
+				                rinst->
+				                Nk] ^ SubByte(rinst->
+				                              fkey[j + 3]);
 			for (i = 5; i < rinst->Nk && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 		}
 
@@ -317,32 +317,32 @@
 	x = a;
 	y = b;
 
-/* State alternates between a and b */
+	/* State alternates between a and b */
 	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
 
-/* if rinst->Nb is fixed - unroll this next 
-   loop and hard-code in the values of fi[]  */
+		/* if rinst->Nb is fixed - unroll this next
+		   loop and hard-code in the values of fi[]  */
 
 		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* deal with each 32-bit element of the State */
 			/* This is the time-critical bit */
 			y[j] = rinst->fkey[k++] ^ ftable[(u8) x[j]] ^
-			    ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
-			    ROTL16(ftable
-				   [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-			    ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
+			       ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
+			       ROTL16(ftable
+			              [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
+			       ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
 		}
 		t = x;
 		x = y;
 		y = t;		/* swap pointers */
 	}
 
-/* Last Round - unroll if possible */
+	/* Last Round - unroll if possible */
 	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
 		y[j] = rinst->fkey[k++] ^ (u32) fbsub[(u8) x[j]] ^
-		    ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
-		    ROTL16((u32)
-			   fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-		    ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
+		       ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
+		       ROTL16((u32)
+		              fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
+		       ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
 	}
 	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
 		unpack(y[i], &buff[j]);
@@ -364,31 +364,31 @@
 	x = a;
 	y = b;
 
-/* State alternates between a and b */
+	/* State alternates between a and b */
 	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
 
-/* if rinst->Nb is fixed - unroll this next 
-   loop and hard-code in the values of ri[]  */
+		/* if rinst->Nb is fixed - unroll this next
+		   loop and hard-code in the values of ri[]  */
 
 		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* This is the time-critical bit */
 			y[j] = rinst->rkey[k++] ^ rtable[(u8) x[j]] ^
-			    ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
-			    ROTL16(rtable
-				   [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-			    ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
+			       ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
+			       ROTL16(rtable
+			              [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
+			       ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
 		}
 		t = x;
 		x = y;
 		y = t;		/* swap pointers */
 	}
 
-/* Last Round - unroll if possible */
+	/* Last Round - unroll if possible */
 	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
 		y[j] = rinst->rkey[k++] ^ (u32) rbsub[(u8) x[j]] ^
-		    ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
-		    ROTL16((u32)
-			   rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-		    ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
+		       ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
+		       ROTL16((u32)
+		              rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
+		       ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
 	}
 	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
 		unpack(y[i], &buff[j]);
@@ -405,9 +405,9 @@
 	td->algo_name = "Rijndael-192";
 	td->algo_version = 20010801;
 	td->num_key_sizes = 3;
-	td->key_sizes[0] = 16; 
-	td->key_sizes[1] = 24; 
-	td->key_sizes[2] = 32; 
+	td->key_sizes[0] = 16;
+	td->key_sizes[1] = 24;
+	td->key_sizes[2] = 32;
 	td->key_size = 32;
 	td->is_block_algo = 1;
 	td->algo_block_size = 24;

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/rijndael-256.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/rijndael-256.c Changed

@@ -4,18 +4,18 @@
    Copyright (c) 1999 Mike Scott
    See rijndael documentation
 
-   Permission for free direct or derivative use is granted subject 
-   to compliance with any conditions that the originators of the 
-   algorithm place on its exploitation.  
+   Permission for free direct or derivative use is granted subject
+   to compliance with any conditions that the originators of the
+   algorithm place on its exploitation.
 
    Inspiration from Brian Gladman's implementation is acknowledged.
 
    Written for clarity, rather than speed.
-   Full implementation. 
+   Full implementation.
    Endian indifferent.
 */
 
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos 
+/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
  * All modifications are placed under the license of libmcrypt.
  */
 
@@ -60,14 +60,14 @@
 /* in "rijndael.h" */
 
 static u32 pack(u8 * b)
-{				/* pack bytes into a 32-bit Word */
+{	/* pack bytes into a 32-bit Word */
 	return ((u32) b[3] << 24) | ((u32) b[2] << 16) | ((u32)
-								b[1] << 8)
-	    | (u32) b[0];
+	        b[1] << 8)
+	       | (u32) b[0];
 }
 
 static void unpack(u32 a, u8 * b)
-{				/* unpack bytes from a word */
+{	/* unpack bytes from a word */
 	b[0] = (u8) a;
 	b[1] = (u8) (a >> 8);
 	b[2] = (u8) (a >> 16);
@@ -87,7 +87,7 @@
 }
 
 static u8 bmul(u8 x, u8 y)
-{				/* x.y= AntiLog(Log(x) + Log(y)) */
+{	/* x.y= AntiLog(Log(x) + Log(y)) */
 	if (x && y)
 		return ptab[(ltab[x] + ltab[y]) % 255];
 	else
@@ -106,17 +106,17 @@
 }
 
 static u8 product(u32 x, u32 y)
-{				/* dot product of two 4-u8 arrays */
+{	/* dot product of two 4-u8 arrays */
 	u8 xb[4], yb[4];
 	unpack(x, xb);
 	unpack(y, yb);
 	return bmul(xb[0], yb[0]) ^ bmul(xb[1], yb[1]) ^ bmul(xb[2],
-							      yb[2]) ^
-	    bmul(xb[3], yb[3]);
+	        yb[2]) ^
+	       bmul(xb[3], yb[3]);
 }
 
 static u32 InvMixCol(u32 x)
-{				/* matrix Multiplication */
+{	/* matrix Multiplication */
 	u32 y, m;
 	u8 b[4];
 
@@ -149,7 +149,7 @@
 }
 
 static void _mcrypt_rijndael_gentables(void)
-{				/* generate tables */
+{	/* generate tables */
 	int i;
 	u8 y, b[4];
 
@@ -199,7 +199,7 @@
 }
 
 static GF_Err _mcrypt_set_key(RI * rinst, u8 * key, int nk)
-{				/* blocksize=32*nb bits. Key=32*nk bits */
+{	/* blocksize=32*nb bits. Key=32*nk bits */
 	/* currently nb,bk = 4, 6 or 8          */
 	/* key comes as 4*rinst->Nk bytes              */
 	/* Key Scheduler. Create expanded encryption key */
@@ -253,32 +253,32 @@
 	for (j = rinst->Nk, k = 0; j < N; j += rinst->Nk, k++) {
 		rinst->fkey[j] =
 		    rinst->fkey[j -
-				rinst->Nk] ^ SubByte(ROTL24(rinst->
-							    fkey[j -
-								 1])) ^
+		                rinst->Nk] ^ SubByte(ROTL24(rinst->
+		                                     fkey[j -
+		                                             1])) ^
 		    rco[k];
 		if (rinst->Nk <= 6) {
 			for (i = 1; i < rinst->Nk && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 		} else {
 			for (i = 1; i < 4 && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 			if ((j + 4) < N)
 				rinst->fkey[j + 4] =
 				    rinst->fkey[j + 4 -
-						rinst->
-						Nk] ^ SubByte(rinst->
-							      fkey[j + 3]);
+				                rinst->
+				                Nk] ^ SubByte(rinst->
+				                              fkey[j + 3]);
 			for (i = 5; i < rinst->Nk && (i + j) < N; i++)
 				rinst->fkey[i + j] =
 				    rinst->fkey[i + j -
-						rinst->Nk] ^ rinst->
+				                rinst->Nk] ^ rinst->
 				    fkey[i + j - 1];
 		}
 
@@ -316,32 +316,32 @@
 	x = a;
 	y = b;
 
-/* State alternates between a and b */
+	/* State alternates between a and b */
 	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
 
-/* if rinst->Nb is fixed - unroll this next 
-   loop and hard-code in the values of fi[]  */
+		/* if rinst->Nb is fixed - unroll this next
+		   loop and hard-code in the values of fi[]  */
 
 		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* deal with each 32-bit element of the State */
 			/* This is the time-critical bit */
 			y[j] = rinst->fkey[k++] ^ ftable[(u8) x[j]] ^
-			    ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
-			    ROTL16(ftable
-				   [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-			    ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
+			       ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
+			       ROTL16(ftable
+			              [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
+			       ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
 		}
 		t = x;
 		x = y;
 		y = t;		/* swap pointers */
 	}
 
-/* Last Round - unroll if possible */
+	/* Last Round - unroll if possible */
 	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
 		y[j] = rinst->fkey[k++] ^ (u32) fbsub[(u8) x[j]] ^
-		    ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
-		    ROTL16((u32)
-			   fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-		    ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
+		       ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
+		       ROTL16((u32)
+		              fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
+		       ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
 	}
 	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
 		unpack(y[i], &buff[j]);
@@ -363,31 +363,31 @@
 	x = a;
 	y = b;
 
-/* State alternates between a and b */
+	/* State alternates between a and b */
 	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
 
-/* if rinst->Nb is fixed - unroll this next 
-   loop and hard-code in the values of ri[]  */
+		/* if rinst->Nb is fixed - unroll this next
+		   loop and hard-code in the values of ri[]  */
 
 		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* This is the time-critical bit */
 			y[j] = rinst->rkey[k++] ^ rtable[(u8) x[j]] ^
-			    ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
-			    ROTL16(rtable
-				   [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-			    ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
+			       ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
+			       ROTL16(rtable
+			              [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
+			       ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
 		}
 		t = x;
 		x = y;
 		y = t;		/* swap pointers */
 	}
 
-/* Last Round - unroll if possible */
+	/* Last Round - unroll if possible */
 	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
 		y[j] = rinst->rkey[k++] ^ (u32) rbsub[(u8) x[j]] ^
-		    ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
-		    ROTL16((u32)
-			   rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-		    ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
+		       ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
+		       ROTL16((u32)
+		              rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
+		       ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
 	}
 	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
 		unpack(y[i], &buff[j]);
@@ -404,9 +404,9 @@
 	td->algo_name = "Rijndael-256";
 	td->algo_version = 20010801;
 	td->num_key_sizes = 3;
-	td->key_sizes[0] = 16; 
-	td->key_sizes[1] = 24; 
-	td->key_sizes[2] = 32; 
+	td->key_sizes[0] = 16;
+	td->key_sizes[1] = 24;
+	td->key_sizes[2] = 32;
 	td->key_size = 32;
 	td->is_block_algo = 1;
 	td->algo_block_size = 32;

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/stream.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/stream.c Changed

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Library General Public License as published 
- * by the Free Software Foundation; either version 2 of the License, or 
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -21,10 +21,16 @@
 
 #if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
 
-static GF_Err _init_mcrypt( void* ign, void *key, int lenofkey, void *IV, int size) { return GF_OK; }
+static GF_Err _init_mcrypt( void* ign, void *key, int lenofkey, void *IV, int size) {
+	return GF_OK;
+}
 
-static GF_Err _mcrypt_set_state( void* buf, void *IV, int size) { return GF_BAD_PARAM; }
-static GF_Err _mcrypt_get_state( void* buf, void *IV, int *size) { return GF_BAD_PARAM; }
+static GF_Err _mcrypt_set_state( void* buf, void *IV, int size) {
+	return GF_BAD_PARAM;
+}
+static GF_Err _mcrypt_get_state( void* buf, void *IV, int *size) {
+	return GF_BAD_PARAM;
+}
 
 static void _end_mcrypt(void* ign) {}

gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/tripledes.c -> gpac-0.5.1.svn5491.tar.xz/src/mcrypt/tripledes.c Changed

@@ -12,7 +12,7 @@
  *	char kn[16][8];
  */
 
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos 
+/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
  * All modifications are placed under the license of libmcrypt.
  */
 
@@ -112,52 +112,60 @@
 /* The (in)famous S-boxes */
 static char si[8][64] = {
 	/* S1 */
-	{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
-	 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
-	 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
-	 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13},
+	{	14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
+		0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
+		4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
+		15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13
+	},
 
 	/* S2 */
-	{15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
-	 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
-	 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
-	 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9},
+	{	15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
+		3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
+		0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
+		13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9
+	},
 
 	/* S3 */
-	{10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
-	 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
-	 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
-	 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12},
+	{	10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
+		13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
+		13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
+		1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12
+	},
 
 	/* S4 */
-	{7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
-	 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
-	 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
-	 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14},
+	{	7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
+		13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
+		10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
+		3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14
+	},
 
 	/* S5 */
-	{2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
-	 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
-	 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
-	 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3},
+	{	2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
+		14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
+		4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
+		11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3
+	},
 
 	/* S6 */
-	{12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
-	 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
-	 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
-	 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13},
+	{	12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
+		10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
+		9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
+		4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13
+	},
 
 	/* S7 */
-	{4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
-	 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
-	 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
-	 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12},
+	{	4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
+		13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
+		1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
+		6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12
+	},
 
 	/* S8 */
-	{13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
-	 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
-	 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
-	 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11},
+	{	13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
+		1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
+		7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
+		2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11
+	},
 
 };
 
@@ -226,15 +234,15 @@
 		l = pc1[j] - 1;	/* integer bit location  */
 		m = l & 07;	/* find bit              */
 		pc1m[j] = (user_key1[l >> 3] &	/* find which key byte l is in */
-			   bytebit[m])	/* and which bit of that byte */
-		    ? 1 : 0;	/* and store 1-bit result */
+		           bytebit[m])	/* and which bit of that byte */
+		          ? 1 : 0;	/* and store 1-bit result */
 
 	}
 	for (i = 0; i < 16; i++) {	/* key chunk for each iteration */
 		for (j = 0; j < 56; j++)	/* rotate pc1 the right amount */
 			pcr[j] =
 			    pc1m[(l = j + totrot[i]) <
-				 (j < 28 ? 28 : 56) ? l : l - 28];
+			         (j < 28 ? 28 : 56) ? l : l - 28];
 		/* rotate left and right halves independently */
 		for (j = 0; j < 48; j++) {	/* select bits individually */
 			/* check bit that goes to kn[j] */
@@ -245,20 +253,20 @@
 			}
 		}
 	}
-/* DES 2 */
+	/* DES 2 */
 	for (j = 0; j < 56; j++) {	/* convert pc1 to bits of key */
 		l = pc1[j] - 1;	/* integer bit location  */
 		m = l & 07;	/* find bit              */
 		pc1m[j] = (user_key2[l >> 3] &	/* find which key byte l is in */
-			   bytebit[m])	/* and which bit of that byte */
-		    ? 1 : 0;	/* and store 1-bit result */
+		           bytebit[m])	/* and which bit of that byte */
+		          ? 1 : 0;	/* and store 1-bit result */
 
 	}
 	for (i = 0; i < 16; i++) {	/* key chunk for each iteration */
 		for (j = 0; j < 56; j++)	/* rotate pc1 the right amount */
 			pcr[j] =
 			    pc1m[(l = j + totrot[i]) <
-				 (j < 28 ? 28 : 56) ? l : l - 28];
+			         (j < 28 ? 28 : 56) ? l : l - 28];
 		/* rotate left and right halves independently */
 		for (j = 0; j < 48; j++) {	/* select bits individually */
 			/* check bit that goes to kn[j] */
@@ -269,20 +277,20 @@
 			}
 		}
 	}
-/* DES 3 */
+	/* DES 3 */
 	for (j = 0; j < 56; j++) {	/* convert pc1 to bits of key */
 		l = pc1[j] - 1;	/* integer bit location  */
 		m = l & 07;	/* find bit              */
 		pc1m[j] = (user_key3[l >> 3] &	/* find which key byte l is in */
-			   bytebit[m])	/* and which bit of that byte */
-		    ? 1 : 0;	/* and store 1-bit result */
+		           bytebit[m])	/* and which bit of that byte */
+		          ? 1 : 0;	/* and store 1-bit result */
 
 	}
 	for (i = 0; i < 16; i++) {	/* key chunk for each iteration */
 		for (j = 0; j < 56; j++)	/* rotate pc1 the right amount */
 			pcr[j] =
 			    pc1m[(l = j + totrot[i]) <
-				 (j < 28 ? 28 : 56) ? l : l - 28];
+			         (j < 28 ? 28 : 56) ? l : l - 28];
 		/* rotate left and right halves independently */
 		for (j = 0; j < 48; j++) {	/* select bits individually */
 			/* check bit that goes to kn[j] */
@@ -307,7 +315,7 @@
 	register char *knp;
 	u32 work[2];		/* Working data storage */
 
-/* DES 1 */
+	/* DES 1 */
 	permute(block, key->iperm, (char *) work);	/* Initial Permutation */
 #ifndef	WORDS_BIGENDIAN
 	left = byteswap32(work[0]);
@@ -355,7 +363,7 @@
 	knp += 8;
 	right ^= f(key, 0, left, knp);
 
-/* DES 2 */
+	/* DES 2 */
 
 	/* Do the 16 rounds in reverse order.
 	 * The rounds are numbered from 15 to 0. On even rounds
@@ -466,7 +474,7 @@
 	left = work[1];
 #endif
 
-/* DES 3 */
+	/* DES 3 */
 
 	/* Do the 16 rounds in reverse order.
 	 * The rounds are numbered from 15 to 0. On even rounds
@@ -507,7 +515,7 @@
 	left ^= f(key, 2, right, knp);
 
 
-/* DES 2*/
+	/* DES 2*/
 	/* Do the 16 rounds.
 	 * The rounds are numbered from 0 to 15. On even rounds
 	 * the right half is fed to f() and the result exclusive-ORs
@@ -546,7 +554,7 @@
 	knp += 8;
 	right ^= f(key, 1, left, knp);
 
-/* DES 1 */
+	/* DES 1 */
 	/* Do the 16 rounds in reverse order.
 	 * The rounds are numbered from 15 to 0. On even rounds
 	 * the right half is fed to f() and the result exclusive-ORs
@@ -630,7 +638,7 @@
 
 /* The nonlinear function f(r,k), the heart of DES */
 static u32 f(TRIPLEDES_KEY * key, int pos, register u32 r,
-		register char *subkey)
+             register char *subkey)
 {
 	register u32 *spp;
 	register u32 rval, rt;
@@ -638,9 +646,9 @@
 
 #ifdef	TRACE
 	fprintf(stderr, "f(%08lx, %02x %02x %02x %02x %02x %02x %02x %02x) = ",
-	       r,
-	       subkey[0], subkey[1], subkey[2],
-	       subkey[3], subkey[4], subkey[5], subkey[6], subkey[7]);
+	        r,
+	        subkey[0], subkey[1], subkey[2],
+	        subkey[3], subkey[4], subkey[5], subkey[6], subkey[7]);
 #endif
 	/* Run E(R) ^ K through the combined S & P boxes.
 	 * This code takes advantage of a convenient regularity in
@@ -729,7 +737,7 @@
 			 */
 			rowcol =
 			    (i & 32) | ((i & 1) ? 16 : 0) | ((i >> 1) &
-							     0xf);
+			                                     0xf);
 			for (j = 0; j < 4; j++) {	/* For each output bit */
 				if (si[s][rowcol] & (8 >> j)) {
 					val |=
@@ -749,7 +757,7 @@
 	td->algo_name = "3DES";
 	td->algo_version = 19991129;
 	td->num_key_sizes = 1;
-	td->key_sizes[0] = 24; 
+	td->key_sizes[0] = 24;
 	td->key_size = 24;
 	td->is_block_algo = 1;
 	td->algo_block_size = 8;

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/ait.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/ait.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -48,24 +48,24 @@
 }
 
 
-void on_ait_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+void on_ait_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
 {
 	GF_M2TS_SL_PCK *pck = (GF_M2TS_SL_PCK *)par;
 	char *data;
 	u32 u32_data_size;
 	u32 u32_table_id;
 
-	
+
 
 	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_SAFEALLOC(ait, GF_M2TS_AIT);			
+		if(!check_ait_already_received(ts->ChannelAppList,ait_carry->pid,data)) {
+			GF_SAFEALLOC(ait, GF_M2TS_AIT);
 			u32_data_size = pck->data_len;
-			u32_table_id = data[0];		
+			u32_table_id = data[0];
 			ait->pid = ait_carry->pid;
 			ait->service_id = ait_carry->service_id;
 			gf_m2ts_decode_ait(ait, data, u32_data_size, u32_table_id);
@@ -73,7 +73,7 @@
 			gf_ait_destroy(ait);
 			if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_AIT_FOUND, pck->stream);
 		}
-		
+
 	}
 }
 
@@ -91,49 +91,49 @@
 	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
 
 	ait->common_descriptors = gf_list_new();
-	if(ait->common_descriptors == NULL){
+	if(ait->common_descriptors == NULL) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Error during common_descriptors list initialization, abording processing \n"));
 		return GF_CORRUPTED_DATA;
 	}
 	ait->application_decoded = gf_list_new();
-	if(ait->application_decoded == NULL){
+	if(ait->application_decoded == NULL) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Error during application list initialization, abording processing \n"));
 		return GF_CORRUPTED_DATA;
 	}
 
-	ait->table_id = gf_bs_read_int(bs,8);	
+	ait->table_id = gf_bs_read_int(bs,8);
 	ait->section_syntax_indicator = gf_bs_read_int(bs,1);
 	gf_bs_read_int(bs,3);
-	ait->section_length = gf_bs_read_int(bs,12);	
-	if( (data[1] & 0x0C) != 0){
+	ait->section_length = gf_bs_read_int(bs,12);
+	if( (data[1] & 0x0C) != 0) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] section length is not correct abroding \n"));
-	}else if( ait->section_length > AIT_SECTION_LENGTH_MAX){
+	} else if( ait->section_length > AIT_SECTION_LENGTH_MAX) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] section length should not exceed 1021. Wrong section, abording processing \n"));
 	}
 	ait->test_application_flag = gf_bs_read_int(bs,1);
-	if(ait->test_application_flag == 1){
+	if(ait->test_application_flag == 1) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] test application flag is at 1. API transmitted for testing, abording processing \n"));
 		return GF_CORRUPTED_DATA;
 	}
-	ait->application_type = gf_bs_read_int(bs,15);	
-	if(ait->application_type != APPLICATION_TYPE_HTTP_APPLICATION){
+	ait->application_type = gf_bs_read_int(bs,15);
+	if(ait->application_type != APPLICATION_TYPE_HTTP_APPLICATION) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] application type should 0x10. Wrong section, abording processing \n"));
 		return GF_CORRUPTED_DATA;
 	}
 	gf_bs_read_int(bs,2);
 	ait->version_number = gf_bs_read_int(bs,5);
 
-	ait->current_next_indicator = gf_bs_read_int(bs,1);	
-	if(!ait->current_next_indicator){
+	ait->current_next_indicator = gf_bs_read_int(bs,1);
+	if(!ait->current_next_indicator) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] current next indicator should be at 1 \n"));
 		return GF_CORRUPTED_DATA;
 	}
 	ait->section_number = gf_bs_read_int(bs,8);
-	ait->last_section_number = gf_bs_read_int(bs,8);	
+	ait->last_section_number = gf_bs_read_int(bs,8);
 	gf_bs_read_int(bs,4);/* bit shifting */
-	ait->common_descriptors_length = gf_bs_read_int(bs,12);	
+	ait->common_descriptors_length = gf_bs_read_int(bs,12);
 	gf_bs_read_int(bs,(unsigned int)ait->common_descriptors_length/8);
-	gf_bs_read_int(bs,4);/* bit shifting */	
+	gf_bs_read_int(bs,4);/* bit shifting */
 	ait->application_loop_length = gf_bs_read_int(bs,12);
 
 	data_shift = (u32)(gf_bs_get_position(bs)) + ait->common_descriptors_length/8;
@@ -146,11 +146,11 @@
 		application->index_app_desc_id = 0;
 
 		/* application loop */
-		application->organisation_id = gf_bs_read_int(bs,32);	
+		application->organisation_id = gf_bs_read_int(bs,32);
 		application->application_id= gf_bs_read_int(bs,16);
 		application->application_control_code= gf_bs_read_int(bs,8);
 		gf_bs_read_int(bs,4);/* bit shifting */
-		application->application_descriptors_loop_length= gf_bs_read_int(bs,12);		
+		application->application_descriptors_loop_length= gf_bs_read_int(bs,12);
 
 		ait_app_data_shift += 9;
 		app_desc_data_shift = 0;
@@ -159,244 +159,244 @@
 		while (app_desc_data_shift< application->application_descriptors_loop_length) {
 			temp_descriptor_tag = gf_bs_read_int(bs,8);
 			switch (temp_descriptor_tag) {
-				case APPLICATION_DESCRIPTOR:
-					{
-						u64 pre_processing_pos;
-						u8 i;
-						GF_M2TS_APPLICATION_DESCRIPTOR *application_descriptor;
-						GF_SAFEALLOC(application_descriptor, GF_M2TS_APPLICATION_DESCRIPTOR);
-						application_descriptor->descriptor_tag = temp_descriptor_tag;
-						application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
-						application->index_app_desc_id++;
-						application_descriptor->descriptor_length = gf_bs_read_int(bs,8);
-						pre_processing_pos = gf_bs_get_position(bs);
-						application_descriptor->application_profiles_length = gf_bs_read_int(bs,8);
-						application_descriptor->application_profile = gf_bs_read_int(bs,16);
-						application_descriptor->version_major = gf_bs_read_int(bs,8);
-						application_descriptor->version_minor = gf_bs_read_int(bs,8);
-						application_descriptor->version_micro = gf_bs_read_int(bs,8);
-						application_descriptor->service_bound_flag = gf_bs_read_int(bs,1);
-						application_descriptor->visibility = gf_bs_read_int(bs,2);
-						gf_bs_read_int(bs,5); /*bit shift*/
-						application_descriptor->application_priority = gf_bs_read_int(bs,8);
-						if (nb_of_protocol > 0) {
-							for (i=0; i<nb_of_protocol; i++) {						
-								application_descriptor->transport_protocol_label[i] = gf_bs_read_int(bs,8);
-							}
-						} else {
-							application_descriptor->transport_protocol_label[0] = gf_bs_read_int(bs,8);
-						}
-						if (pre_processing_pos+application_descriptor->descriptor_length != gf_bs_get_position(bs) || application_descriptor->application_profile == 2 /* PVR feature */) {
-							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),application_descriptor->descriptor_length));
-							gf_free(application_descriptor);
-							return GF_CORRUPTED_DATA;
-						}
-						gf_list_add(application->application_descriptors,application_descriptor);
-						app_desc_data_shift += (2+ application_descriptor->descriptor_length);
-						break;
-					}
-				case APPLICATION_NAME_DESCRIPTOR:
-					{
-						u64 pre_processing_pos;
-						GF_M2TS_APPLICATION_NAME_DESCRIPTOR* name_descriptor;
-						GF_SAFEALLOC(name_descriptor, GF_M2TS_APPLICATION_NAME_DESCRIPTOR);
-						application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
-						application->index_app_desc_id++;
-						name_descriptor->descriptor_tag = temp_descriptor_tag;
-						name_descriptor->descriptor_length = gf_bs_read_int(bs,8);
-						pre_processing_pos = gf_bs_get_position(bs);
-						name_descriptor->ISO_639_language_code = gf_bs_read_int(bs,24);
-						name_descriptor->application_name_length = gf_bs_read_int(bs,8);
-						name_descriptor->application_name_char = (char*) gf_calloc(name_descriptor->application_name_length+1,sizeof(char));
-						gf_bs_read_data(bs,name_descriptor->application_name_char,name_descriptor->application_name_length);
-						name_descriptor->application_name_char[name_descriptor->application_name_length] = 0 ;
-						if (pre_processing_pos+name_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),name_descriptor->descriptor_length));
-							gf_free(name_descriptor->application_name_char);
-							gf_free(name_descriptor);
-							return GF_CORRUPTED_DATA;
-						}
-						gf_list_add(application->application_descriptors,name_descriptor);
-						app_desc_data_shift += (2+ name_descriptor->descriptor_length);
-						break;
+			case APPLICATION_DESCRIPTOR:
+			{
+				u64 pre_processing_pos;
+				u8 i;
+				GF_M2TS_APPLICATION_DESCRIPTOR *application_descriptor;
+				GF_SAFEALLOC(application_descriptor, GF_M2TS_APPLICATION_DESCRIPTOR);
+				application_descriptor->descriptor_tag = temp_descriptor_tag;
+				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
+				application->index_app_desc_id++;
+				application_descriptor->descriptor_length = gf_bs_read_int(bs,8);
+				pre_processing_pos = gf_bs_get_position(bs);
+				application_descriptor->application_profiles_length = gf_bs_read_int(bs,8);
+				application_descriptor->application_profile = gf_bs_read_int(bs,16);
+				application_descriptor->version_major = gf_bs_read_int(bs,8);
+				application_descriptor->version_minor = gf_bs_read_int(bs,8);
+				application_descriptor->version_micro = gf_bs_read_int(bs,8);
+				application_descriptor->service_bound_flag = gf_bs_read_int(bs,1);
+				application_descriptor->visibility = gf_bs_read_int(bs,2);
+				gf_bs_read_int(bs,5); /*bit shift*/
+				application_descriptor->application_priority = gf_bs_read_int(bs,8);
+				if (nb_of_protocol > 0) {
+					for (i=0; i<nb_of_protocol; i++) {
+						application_descriptor->transport_protocol_label[i] = gf_bs_read_int(bs,8);
 					}
-				case TRANSPORT_PROTOCOL_DESCRIPTOR:
-					{
-						u64 pre_processing_pos;
-						GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR* protocol_descriptor;
-						GF_SAFEALLOC(protocol_descriptor, GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR);
-						application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
-						application->index_app_desc_id++;
-						nb_of_protocol++;
-						protocol_descriptor->descriptor_tag = temp_descriptor_tag;
-						protocol_descriptor->descriptor_length = gf_bs_read_int(bs,8);
-						pre_processing_pos = gf_bs_get_position(bs);
-						protocol_descriptor->protocol_id = gf_bs_read_int(bs,16);
-						protocol_descriptor->transport_protocol_label = gf_bs_read_int(bs,8);
-						switch (protocol_descriptor->protocol_id) {
+				} else {
+					application_descriptor->transport_protocol_label[0] = gf_bs_read_int(bs,8);
+				}
+				if (pre_processing_pos+application_descriptor->descriptor_length != gf_bs_get_position(bs) || application_descriptor->application_profile == 2 /* PVR feature */) {
+					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),application_descriptor->descriptor_length));
+					gf_free(application_descriptor);
+					return GF_CORRUPTED_DATA;
+				}
+				gf_list_add(application->application_descriptors,application_descriptor);
+				app_desc_data_shift += (2+ application_descriptor->descriptor_length);
+				break;
+			}
+			case APPLICATION_NAME_DESCRIPTOR:
+			{
+				u64 pre_processing_pos;
+				GF_M2TS_APPLICATION_NAME_DESCRIPTOR* name_descriptor;
+				GF_SAFEALLOC(name_descriptor, GF_M2TS_APPLICATION_NAME_DESCRIPTOR);
+				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
+				application->index_app_desc_id++;
+				name_descriptor->descriptor_tag = temp_descriptor_tag;
+				name_descriptor->descriptor_length = gf_bs_read_int(bs,8);
+				pre_processing_pos = gf_bs_get_position(bs);
+				name_descriptor->ISO_639_language_code = gf_bs_read_int(bs,24);
+				name_descriptor->application_name_length = gf_bs_read_int(bs,8);
+				name_descriptor->application_name_char = (char*) gf_calloc(name_descriptor->application_name_length+1,sizeof(char));
+				gf_bs_read_data(bs,name_descriptor->application_name_char,name_descriptor->application_name_length);
+				name_descriptor->application_name_char[name_descriptor->application_name_length] = 0 ;
+				if (pre_processing_pos+name_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),name_descriptor->descriptor_length));
+					gf_free(name_descriptor->application_name_char);
+					gf_free(name_descriptor);
+					return GF_CORRUPTED_DATA;
+				}
+				gf_list_add(application->application_descriptors,name_descriptor);
+				app_desc_data_shift += (2+ name_descriptor->descriptor_length);
+				break;
+			}
+			case TRANSPORT_PROTOCOL_DESCRIPTOR:
+			{
+				u64 pre_processing_pos;
+				GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR* protocol_descriptor;
+				GF_SAFEALLOC(protocol_descriptor, GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR);
+				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
+				application->index_app_desc_id++;
+				nb_of_protocol++;
+				protocol_descriptor->descriptor_tag = temp_descriptor_tag;
+				protocol_descriptor->descriptor_length = gf_bs_read_int(bs,8);
+				pre_processing_pos = gf_bs_get_position(bs);
+				protocol_descriptor->protocol_id = gf_bs_read_int(bs,16);
+				protocol_descriptor->transport_protocol_label = gf_bs_read_int(bs,8);
+				switch (protocol_descriptor->protocol_id) {
 				case CAROUSEL:
-					{
-						GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte;
-						GF_SAFEALLOC(Carousel_selector_byte, GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE);
-						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) {
-							Carousel_selector_byte->original_network_id = gf_bs_read_int(bs,16);
-							Carousel_selector_byte->transport_stream_id = gf_bs_read_int(bs,16);
-							Carousel_selector_byte->service_id = gf_bs_read_int(bs,16);
-						}
-						Carousel_selector_byte->component_tag = gf_bs_read_int(bs,8);
-						protocol_descriptor->selector_byte = Carousel_selector_byte;
-						break;
+				{
+					GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte;
+					GF_SAFEALLOC(Carousel_selector_byte, GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE);
+					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) {
+						Carousel_selector_byte->original_network_id = gf_bs_read_int(bs,16);
+						Carousel_selector_byte->transport_stream_id = gf_bs_read_int(bs,16);
+						Carousel_selector_byte->service_id = gf_bs_read_int(bs,16);
 					}
+					Carousel_selector_byte->component_tag = gf_bs_read_int(bs,8);
+					protocol_descriptor->selector_byte = Carousel_selector_byte;
+					break;
+				}
 				case TRANSPORT_HTTP:
-					{					
-						u32 i;								
-						GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE* Transport_http_selector_byte;
-						GF_SAFEALLOC(Transport_http_selector_byte, GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE);					
-						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;
-						Transport_http_selector_byte->URL_extension_count = gf_bs_read_int(bs,8);
-						if (Transport_http_selector_byte->URL_extension_count) {
-							Transport_http_selector_byte->URL_extentions = (GF_M2TS_TRANSPORT_HTTP_URL_EXTENTION*) gf_calloc(Transport_http_selector_byte->URL_extension_count,sizeof(GF_M2TS_TRANSPORT_HTTP_URL_EXTENTION));
-							for (i=0; i < Transport_http_selector_byte->URL_extension_count;i++) {
-								Transport_http_selector_byte->URL_extentions[i].URL_extension_length = gf_bs_read_int(bs,8);
-								Transport_http_selector_byte->URL_extentions[i].URL_extension_byte = (char*)gf_calloc(Transport_http_selector_byte->URL_extentions[i].URL_extension_length+1,sizeof(char));
-								gf_bs_read_data(bs,Transport_http_selector_byte->URL_extentions[i].URL_extension_byte,(u32)(Transport_http_selector_byte->URL_extentions[i].URL_extension_length));
-								Transport_http_selector_byte->URL_extentions[i].URL_extension_byte[Transport_http_selector_byte->URL_extentions[i].URL_extension_length] = 0;
-							}
+				{
+					u32 i;
+					GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE* Transport_http_selector_byte;
+					GF_SAFEALLOC(Transport_http_selector_byte, GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE);
+					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;
+					Transport_http_selector_byte->URL_extension_count = gf_bs_read_int(bs,8);
+					if (Transport_http_selector_byte->URL_extension_count) {
+						Transport_http_selector_byte->URL_extentions = (GF_M2TS_TRANSPORT_HTTP_URL_EXTENTION*) gf_calloc(Transport_http_selector_byte->URL_extension_count,sizeof(GF_M2TS_TRANSPORT_HTTP_URL_EXTENTION));
+						for (i=0; i < Transport_http_selector_byte->URL_extension_count; i++) {
+							Transport_http_selector_byte->URL_extentions[i].URL_extension_length = gf_bs_read_int(bs,8);
+							Transport_http_selector_byte->URL_extentions[i].URL_extension_byte = (char*)gf_calloc(Transport_http_selector_byte->URL_extentions[i].URL_extension_length+1,sizeof(char));
+							gf_bs_read_data(bs,Transport_http_selector_byte->URL_extentions[i].URL_extension_byte,(u32)(Transport_http_selector_byte->URL_extentions[i].URL_extension_length));
+							Transport_http_selector_byte->URL_extentions[i].URL_extension_byte[Transport_http_selector_byte->URL_extentions[i].URL_extension_length] = 0;
 						}
-						protocol_descriptor->selector_byte = Transport_http_selector_byte;
-						break;
 					}
+					protocol_descriptor->selector_byte = Transport_http_selector_byte;
+					break;
+				}
 				default:
-					{
-						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Protocol ID %d unsupported, ignoring the selector byte \n",protocol_descriptor->protocol_id));
-					}
-						}
-						if (pre_processing_pos+protocol_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),protocol_descriptor->descriptor_length));
-							if (protocol_descriptor->protocol_id == CAROUSEL) {						
-								GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte = (GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE*) protocol_descriptor->selector_byte;								
-								gf_free(Carousel_selector_byte);								
-							} else if(protocol_descriptor->protocol_id ==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);
-								for(i = 0; i < Transport_http_selector_byte->URL_extension_count;i++){										
-									gf_free(Transport_http_selector_byte->URL_extentions[i].URL_extension_byte);
-								}
-								gf_free(Transport_http_selector_byte);						
-							}
-							gf_free(protocol_descriptor);
-							return GF_CORRUPTED_DATA;
-						}
-						gf_list_add(application->application_descriptors,protocol_descriptor);					
-						app_desc_data_shift += (2+ protocol_descriptor->descriptor_length);
-						break;
-					}
-				case SIMPLE_APPLICATION_LOCATION_DESCRIPTOR:
-					{
-						u64 pre_processing_pos;					
-						GF_M2TS_SIMPLE_APPLICATION_LOCATION* Simple_application_location;
-						GF_SAFEALLOC(Simple_application_location, GF_M2TS_SIMPLE_APPLICATION_LOCATION);
-						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;
-						Simple_application_location->descriptor_length = gf_bs_read_int(bs,8);
-						pre_processing_pos = gf_bs_get_position(bs);
-						Simple_application_location->initial_path_bytes = (char*)gf_calloc(Simple_application_location->descriptor_length+1,sizeof(char));
-						gf_bs_read_data(bs,Simple_application_location->initial_path_bytes ,(u32)(Simple_application_location->descriptor_length));
-						Simple_application_location->initial_path_bytes[Simple_application_location->descriptor_length] = 0;
-						if (pre_processing_pos+Simple_application_location->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),Simple_application_location->descriptor_length));
-							gf_free(Simple_application_location->initial_path_bytes);
-							gf_free(Simple_application_location);
-							return GF_CORRUPTED_DATA;
+				{
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Protocol ID %d unsupported, ignoring the selector byte \n",protocol_descriptor->protocol_id));
+				}
+				}
+				if (pre_processing_pos+protocol_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),protocol_descriptor->descriptor_length));
+					if (protocol_descriptor->protocol_id == CAROUSEL) {
+						GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte = (GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE*) protocol_descriptor->selector_byte;
+						gf_free(Carousel_selector_byte);
+					} else if(protocol_descriptor->protocol_id ==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);
+						for(i = 0; i < Transport_http_selector_byte->URL_extension_count; i++) {
+							gf_free(Transport_http_selector_byte->URL_extentions[i].URL_extension_byte);
 						}
-						gf_list_add(application->application_descriptors,Simple_application_location);
-						app_desc_data_shift += (2+ Simple_application_location->descriptor_length);
-						break;
+						gf_free(Transport_http_selector_byte);
 					}
-				case APPLICATION_USAGE_DESCRIPTOR:
-					{
-						u64 pre_processing_pos;
-						GF_M2TS_APPLICATION_USAGE* Application_usage;
-						GF_SAFEALLOC(Application_usage, GF_M2TS_APPLICATION_USAGE);
-						application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
-						application->index_app_desc_id++;
-						Application_usage->descriptor_tag = temp_descriptor_tag;
-						Application_usage->descriptor_length = gf_bs_read_int(bs,8);
-						pre_processing_pos = gf_bs_get_position(bs);
-						Application_usage->usage_type = gf_bs_read_int(bs,8);
-						if (pre_processing_pos+Application_usage->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),Application_usage->descriptor_length));
-							gf_free(Application_usage);
-							return GF_CORRUPTED_DATA;
+					gf_free(protocol_descriptor);
+					return GF_CORRUPTED_DATA;
+				}
+				gf_list_add(application->application_descriptors,protocol_descriptor);
+				app_desc_data_shift += (2+ protocol_descriptor->descriptor_length);
+				break;
+			}
+			case SIMPLE_APPLICATION_LOCATION_DESCRIPTOR:
+			{
+				u64 pre_processing_pos;
+				GF_M2TS_SIMPLE_APPLICATION_LOCATION* Simple_application_location;
+				GF_SAFEALLOC(Simple_application_location, GF_M2TS_SIMPLE_APPLICATION_LOCATION);
+				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;
+				Simple_application_location->descriptor_length = gf_bs_read_int(bs,8);
+				pre_processing_pos = gf_bs_get_position(bs);
+				Simple_application_location->initial_path_bytes = (char*)gf_calloc(Simple_application_location->descriptor_length+1,sizeof(char));
+				gf_bs_read_data(bs,Simple_application_location->initial_path_bytes ,(u32)(Simple_application_location->descriptor_length));
+				Simple_application_location->initial_path_bytes[Simple_application_location->descriptor_length] = 0;
+				if (pre_processing_pos+Simple_application_location->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),Simple_application_location->descriptor_length));
+					gf_free(Simple_application_location->initial_path_bytes);
+					gf_free(Simple_application_location);
+					return GF_CORRUPTED_DATA;
+				}
+				gf_list_add(application->application_descriptors,Simple_application_location);
+				app_desc_data_shift += (2+ Simple_application_location->descriptor_length);
+				break;
+			}
+			case APPLICATION_USAGE_DESCRIPTOR:
+			{
+				u64 pre_processing_pos;
+				GF_M2TS_APPLICATION_USAGE* Application_usage;
+				GF_SAFEALLOC(Application_usage, GF_M2TS_APPLICATION_USAGE);
+				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
+				application->index_app_desc_id++;
+				Application_usage->descriptor_tag = temp_descriptor_tag;
+				Application_usage->descriptor_length = gf_bs_read_int(bs,8);
+				pre_processing_pos = gf_bs_get_position(bs);
+				Application_usage->usage_type = gf_bs_read_int(bs,8);
+				if (pre_processing_pos+Application_usage->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),Application_usage->descriptor_length));
+					gf_free(Application_usage);
+					return GF_CORRUPTED_DATA;
+				}
+				gf_list_add(application->application_descriptors,Application_usage);
+				app_desc_data_shift += (2+ Application_usage->descriptor_length);
+				break;
+			}
+			case APPLICATION_BOUNDARY_DESCRIPTOR:
+			{
+				u64 pre_processing_pos;
+				u32 i;
+				GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR* boundary_descriptor;
+				GF_SAFEALLOC(boundary_descriptor, GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR);
+				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
+				application->index_app_desc_id++;
+				boundary_descriptor->descriptor_tag = temp_descriptor_tag;
+				boundary_descriptor->descriptor_length = gf_bs_read_int(bs,8);
+				pre_processing_pos = gf_bs_get_position(bs);
+				boundary_descriptor->boundary_extension_count = gf_bs_read_int(bs,8);
+				if (boundary_descriptor->boundary_extension_count > 0) {
+					boundary_descriptor->boundary_extension_info = (GF_M2TS_APPLICATION_BOUNDARY_EXTENSION_INFO*)gf_calloc(boundary_descriptor->boundary_extension_count,sizeof(GF_M2TS_APPLICATION_BOUNDARY_EXTENSION_INFO));
+					for (i=0; i<boundary_descriptor->boundary_extension_count; i++) {
+						boundary_descriptor->boundary_extension_info[i].boundary_extension_length = gf_bs_read_int(bs,8);
+						if (boundary_descriptor->boundary_extension_info[i].boundary_extension_length > 0) {
+							boundary_descriptor->boundary_extension_info[i].boundary_extension_byte = (char*)gf_calloc(boundary_descriptor->boundary_extension_info[i].boundary_extension_length+1,sizeof(char));
+							gf_bs_read_data(bs,boundary_descriptor->boundary_extension_info[i].boundary_extension_byte ,(u32)(boundary_descriptor->boundary_extension_info[i].boundary_extension_length));
+							boundary_descriptor->boundary_extension_info[i].boundary_extension_byte[boundary_descriptor->boundary_extension_info[i].boundary_extension_length] = 0;
 						}
-						gf_list_add(application->application_descriptors,Application_usage);
-						app_desc_data_shift += (2+ Application_usage->descriptor_length);
-						break;
 					}
-				case APPLICATION_BOUNDARY_DESCRIPTOR:
-					{
-						u64 pre_processing_pos;
+				}
+				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;
-						GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR* boundary_descriptor;
-						GF_SAFEALLOC(boundary_descriptor, GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR);
-						application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
-						application->index_app_desc_id++;
-						boundary_descriptor->descriptor_tag = temp_descriptor_tag;
-						boundary_descriptor->descriptor_length = gf_bs_read_int(bs,8);
-						pre_processing_pos = gf_bs_get_position(bs);
-						boundary_descriptor->boundary_extension_count = gf_bs_read_int(bs,8);
-						if (boundary_descriptor->boundary_extension_count > 0) {
-							boundary_descriptor->boundary_extension_info = (GF_M2TS_APPLICATION_BOUNDARY_EXTENSION_INFO*)gf_calloc(boundary_descriptor->boundary_extension_count,sizeof(GF_M2TS_APPLICATION_BOUNDARY_EXTENSION_INFO));
-							for (i=0;i<boundary_descriptor->boundary_extension_count;i++) {
-								boundary_descriptor->boundary_extension_info[i].boundary_extension_length = gf_bs_read_int(bs,8);
-								if (boundary_descriptor->boundary_extension_info[i].boundary_extension_length > 0) {
-									boundary_descriptor->boundary_extension_info[i].boundary_extension_byte = (char*)gf_calloc(boundary_descriptor->boundary_extension_info[i].boundary_extension_length+1,sizeof(char));
-									gf_bs_read_data(bs,boundary_descriptor->boundary_extension_info[i].boundary_extension_byte ,(u32)(boundary_descriptor->boundary_extension_info[i].boundary_extension_length));
-									boundary_descriptor->boundary_extension_info[i].boundary_extension_byte[boundary_descriptor->boundary_extension_info[i].boundary_extension_length] = 0;
-								}
-							}
-						}
-						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);
-									}
-								}
-								gf_free(boundary_descriptor->boundary_extension_info);
+						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);
 							}
-							gf_free(boundary_descriptor);
-							return GF_CORRUPTED_DATA;
 						}
-						gf_list_add(application->application_descriptors,boundary_descriptor);
-						app_desc_data_shift += (2+ boundary_descriptor->descriptor_length);
-						break;					
-					}
-				default:
-					{
-						u8 length;
-						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Descriptor tag %d unknown, ignoring the descriptor \n",temp_descriptor_tag));
-						/* get descriptor's length */
-						length = gf_bs_read_int(bs,8);
-						/* bit shifting (eq descriptor's length)*/
-						gf_bs_read_int(bs,8*length);					
+						gf_free(boundary_descriptor->boundary_extension_info);
 					}
+					gf_free(boundary_descriptor);
+					return GF_CORRUPTED_DATA;
+				}
+				gf_list_add(application->application_descriptors,boundary_descriptor);
+				app_desc_data_shift += (2+ boundary_descriptor->descriptor_length);
+				break;
+			}
+			default:
+			{
+				u8 length;
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Descriptor tag %d unknown, ignoring the descriptor \n",temp_descriptor_tag));
+				/* get descriptor's length */
+				length = gf_bs_read_int(bs,8);
+				/* bit shifting (eq descriptor's length)*/
+				gf_bs_read_int(bs,8*length);
+			}
 
 			}
 
 		}
-		ait_app_data_shift += application->application_descriptors_loop_length; 
-		gf_list_add(ait->application_decoded,application);		
+		ait_app_data_shift += application->application_descriptors_loop_length;
+		gf_list_add(ait->application_decoded,application);
 	}
 
 	data_shift +=ait->application_loop_length;
@@ -412,7 +412,7 @@
 	return GF_OK;
 }
 
-static void gf_m2ts_process_ait(GF_M2TS_Demuxer *ts, GF_M2TS_AIT* ait){
+static void gf_m2ts_process_ait(GF_M2TS_Demuxer *ts, GF_M2TS_AIT* ait) {
 
 	u32 nb_app_desc, k, desc_id, nb_of_app, j;
 	GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo;
@@ -424,9 +424,9 @@
 	j=0;
 
 	/* Link the AIT and the channel */
-	ChanAppInfo = gf_m2ts_get_channel_application_info(ts->ChannelAppList,ait->service_id);	
+	ChanAppInfo = gf_m2ts_get_channel_application_info(ts->ChannelAppList,ait->service_id);
 
-	if(!ChanAppInfo){
+	if(!ChanAppInfo) {
 		GF_SAFEALLOC(ChanAppInfo,GF_M2TS_CHANNEL_APPLICATION_INFO);
 		ChanAppInfo->service_id = ait->service_id;
 		ChanAppInfo->Application = gf_list_new();
@@ -437,12 +437,12 @@
 	ChanAppInfo->nb_application = nb_of_app;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[DSMCC] ChanAppInfo->nb_application %d \n",ChanAppInfo->nb_application));
-	
-	for(j=0 ; j<nb_of_app ; j++){
+
+	for(j=0 ; j<nb_of_app ; j++) {
 		GF_M2TS_AIT_APPLICATION* Application;
 		GF_M2TS_AIT_APPLICATION_DECODE* application_decoded;
 		GF_SAFEALLOC(Application,GF_M2TS_AIT_APPLICATION);
-		gf_list_add(ChanAppInfo->Application,Application);			
+		gf_list_add(ChanAppInfo->Application,Application);
 		Application->http_url = NULL;
 		Application->carousel_url = NULL;
 
@@ -453,96 +453,96 @@
 		Application->broadband = 0;
 		Application->broadcast = 0;
 		ChanAppInfo->version_number = ait->version_number;
-		
+
 		k=0;
-		for(k=0 ; k<nb_app_desc ; k++){
+		for(k=0 ; k<nb_app_desc ; k++) {
 			desc_id = application_decoded->application_descriptors_id[k];
-			switch(desc_id){
-							case APPLICATION_DESCRIPTOR:
-								{
-									GF_M2TS_APPLICATION_DESCRIPTOR* application_descriptor = (GF_M2TS_APPLICATION_DESCRIPTOR*)gf_list_get(application_decoded->application_descriptors,k);
-									Application->priority = application_descriptor->application_priority;
-									Application->application_profile = application_descriptor->application_profile;
-
-									break;
-								}
-							case APPLICATION_NAME_DESCRIPTOR:
-								{
-									GF_M2TS_APPLICATION_NAME_DESCRIPTOR* name_descriptor = (GF_M2TS_APPLICATION_NAME_DESCRIPTOR*)gf_list_get(application_decoded->application_descriptors,k);
-									Application->appli_name = gf_strdup(name_descriptor->application_name_char);
-									break;
-								}
-							case TRANSPORT_PROTOCOL_DESCRIPTOR:
-								{
-									GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR* protocol_descriptor = (GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR*)gf_list_get(application_decoded->application_descriptors,k);
-
-									switch(protocol_descriptor->protocol_id){
-										case CAROUSEL:
-											{									
-												GF_Err e;												
-												GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte = (GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE*)protocol_descriptor->selector_byte;
-												if(ts->process_dmscc){
-													GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord = gf_m2ts_get_dmscc_overlord(ts->dsmcc_controler,ait->service_id);
-													Application->broadcast = 1;
-													if(!dsmcc_overlord){
-														char app_url[1024], char_service_id[128];
-														
-														memset(&app_url,0,1024*sizeof(char));
-														memset(&char_service_id,0,128*sizeof(char));
-
-														dsmcc_overlord = gf_m2ts_init_dsmcc_overlord(ait->service_id);
-														dsmcc_overlord->application_id = Application->application_id;
-														sprintf(char_service_id,"%d",dsmcc_overlord->service_id);
-														dsmcc_overlord->root_dir = (char*)gf_calloc(strlen(ts->dsmcc_root_dir)+2+strlen(char_service_id),sizeof(char));
-														sprintf(dsmcc_overlord->root_dir,"%s%c%s",ts->dsmcc_root_dir,GF_PATH_SEPARATOR,char_service_id);
-														e = gf_mkdir(dsmcc_overlord->root_dir);
-														if(e){															
-															GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error during the creation of the directory %s \n",dsmcc_overlord->root_dir));
-															if(e == GF_BAD_PARAM){
-																gf_cleanup_dir(dsmcc_overlord->root_dir);
-															}
-														}
-														sprintf(app_url,"%s%cindex.html",dsmcc_overlord->root_dir,GF_PATH_SEPARATOR);
-														Application->carousel_url = gf_strdup(app_url);											
-														gf_list_add(ts->dsmcc_controler,dsmcc_overlord);
-													}
-												}
-												if(Carousel_selector_byte->remote_connection){
-													Application->carousel_pid = Carousel_selector_byte->service_id;
-												}
-												Application->component_tag = Carousel_selector_byte->component_tag;
-
-												break;
-											}
-										case TRANSPORT_HTTP:
-											{
-												GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE* Transport_http_selector_byte = (GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE*)protocol_descriptor->selector_byte;
-												url_base = Transport_http_selector_byte->URL_base_byte;
-												Application->broadband = 1;
-											}
-										default:
-											{
-											}
-									}
-									break;
-								}
-							case SIMPLE_APPLICATION_LOCATION_DESCRIPTOR:
-								{
-									GF_M2TS_SIMPLE_APPLICATION_LOCATION* Simple_application_location = (GF_M2TS_SIMPLE_APPLICATION_LOCATION*)gf_list_get(application_decoded->application_descriptors,k);
-									url_appli_path = Simple_application_location->initial_path_bytes;
-									break;
-								}
-							case APPLICATION_USAGE_DESCRIPTOR:
-								{
-									break;
-								}
-							default:
-								{
-									GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] Descriptor tag %d unknown, ignoring the descriptor \n",desc_id));
+			switch(desc_id) {
+			case APPLICATION_DESCRIPTOR:
+			{
+				GF_M2TS_APPLICATION_DESCRIPTOR* application_descriptor = (GF_M2TS_APPLICATION_DESCRIPTOR*)gf_list_get(application_decoded->application_descriptors,k);
+				Application->priority = application_descriptor->application_priority;
+				Application->application_profile = application_descriptor->application_profile;
+
+				break;
+			}
+			case APPLICATION_NAME_DESCRIPTOR:
+			{
+				GF_M2TS_APPLICATION_NAME_DESCRIPTOR* name_descriptor = (GF_M2TS_APPLICATION_NAME_DESCRIPTOR*)gf_list_get(application_decoded->application_descriptors,k);
+				Application->appli_name = gf_strdup(name_descriptor->application_name_char);
+				break;
+			}
+			case TRANSPORT_PROTOCOL_DESCRIPTOR:
+			{
+				GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR* protocol_descriptor = (GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR*)gf_list_get(application_decoded->application_descriptors,k);
+
+				switch(protocol_descriptor->protocol_id) {
+				case CAROUSEL:
+				{
+					GF_Err e;
+					GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte = (GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE*)protocol_descriptor->selector_byte;
+					if(ts->process_dmscc) {
+						GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord = gf_m2ts_get_dmscc_overlord(ts->dsmcc_controler,ait->service_id);
+						Application->broadcast = 1;
+						if(!dsmcc_overlord) {
+							char app_url[1024], char_service_id[128];
+
+							memset(&app_url,0,1024*sizeof(char));
+							memset(&char_service_id,0,128*sizeof(char));
+
+							dsmcc_overlord = gf_m2ts_init_dsmcc_overlord(ait->service_id);
+							dsmcc_overlord->application_id = Application->application_id;
+							sprintf(char_service_id,"%d",dsmcc_overlord->service_id);
+							dsmcc_overlord->root_dir = (char*)gf_calloc(strlen(ts->dsmcc_root_dir)+2+strlen(char_service_id),sizeof(char));
+							sprintf(dsmcc_overlord->root_dir,"%s%c%s",ts->dsmcc_root_dir,GF_PATH_SEPARATOR,char_service_id);
+							e = gf_mkdir(dsmcc_overlord->root_dir);
+							if(e) {
+								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error during the creation of the directory %s \n",dsmcc_overlord->root_dir));
+								if(e == GF_BAD_PARAM) {
+									gf_cleanup_dir(dsmcc_overlord->root_dir);
 								}
+							}
+							sprintf(app_url,"%s%cindex.html",dsmcc_overlord->root_dir,GF_PATH_SEPARATOR);
+							Application->carousel_url = gf_strdup(app_url);
+							gf_list_add(ts->dsmcc_controler,dsmcc_overlord);
+						}
+					}
+					if(Carousel_selector_byte->remote_connection) {
+						Application->carousel_pid = Carousel_selector_byte->service_id;
+					}
+					Application->component_tag = Carousel_selector_byte->component_tag;
+
+					break;
+				}
+				case TRANSPORT_HTTP:
+				{
+					GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE* Transport_http_selector_byte = (GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE*)protocol_descriptor->selector_byte;
+					url_base = Transport_http_selector_byte->URL_base_byte;
+					Application->broadband = 1;
+				}
+				default:
+				{
+				}
+				}
+				break;
+			}
+			case SIMPLE_APPLICATION_LOCATION_DESCRIPTOR:
+			{
+				GF_M2TS_SIMPLE_APPLICATION_LOCATION* Simple_application_location = (GF_M2TS_SIMPLE_APPLICATION_LOCATION*)gf_list_get(application_decoded->application_descriptors,k);
+				url_appli_path = Simple_application_location->initial_path_bytes;
+				break;
+			}
+			case APPLICATION_USAGE_DESCRIPTOR:
+			{
+				break;
+			}
+			default:
+			{
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] Descriptor tag %d unknown, ignoring the descriptor \n",desc_id));
+			}
 			}
 
-			if((url_base != NULL) && ( url_appli_path != NULL)){
+			if((url_base != NULL) && ( url_appli_path != NULL)) {
 				u32 url_length = (strlen(url_base)+strlen(url_appli_path));
 				Application->http_url = (char*)gf_calloc(url_length + 1,sizeof(char));
 				sprintf(Application->http_url,"%s%s",url_base,url_appli_path);
@@ -555,40 +555,40 @@
 
 		}
 	}
-	if(ts->process_dmscc){
+	if(ts->process_dmscc) {
 		GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord = gf_m2ts_get_dmscc_overlord(ts->dsmcc_controler,ait->service_id);
 
-		if(dsmcc_overlord && !gf_m2ts_is_dmscc_app(ChanAppInfo)){			
+		if(dsmcc_overlord && !gf_m2ts_is_dmscc_app(ChanAppInfo)) {
 			gf_cleanup_dir(dsmcc_overlord->root_dir);
-			gf_rmdir(dsmcc_overlord->root_dir);	
+			gf_rmdir(dsmcc_overlord->root_dir);
 			gf_m2ts_delete_dsmcc_overlord(dsmcc_overlord);
 
 		}
 	}
 }
 
-static Bool gf_m2ts_is_dmscc_app(GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo){
-	
+static Bool gf_m2ts_is_dmscc_app(GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo) {
+
 	u32 nb_app,i;
 
 	nb_app = gf_list_count(ChanAppInfo->Application);
-	for(i=0;i<nb_app;i++){
+	for(i=0; i<nb_app; i++) {
 		GF_M2TS_AIT_APPLICATION* Application = (GF_M2TS_AIT_APPLICATION*)gf_list_get(ChanAppInfo->Application,i);
-		if(Application->broadband){
+		if(Application->broadband) {
 			return 1;
 		}
 	}
 	return 0;
 }
 
-GF_M2TS_CHANNEL_APPLICATION_INFO* gf_m2ts_get_channel_application_info(GF_List* ChannelAppList, u32 ait_service_id){
+GF_M2TS_CHANNEL_APPLICATION_INFO* gf_m2ts_get_channel_application_info(GF_List* ChannelAppList, u32 ait_service_id) {
 	u32 i,nb_chanapp;
 
 	nb_chanapp = gf_list_count(ChannelAppList);
 
-	for(i = 0; i < nb_chanapp; i++){	
+	for(i = 0; i < nb_chanapp; i++) {
 		GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo = (GF_M2TS_CHANNEL_APPLICATION_INFO*)gf_list_get(ChannelAppList,i);
-		if(ChanAppInfo->service_id == ait_service_id){
+		if(ChanAppInfo->service_id == ait_service_id) {
 			return ChanAppInfo;
 		}
 	}
@@ -599,25 +599,25 @@
 
 static Bool check_ait_already_received(GF_List* ChannelAppList,u32 pid,char* data)
 {
-    u32 nb_of_ait;
+	u32 nb_of_ait;
 	u32 version_number;
 
 	nb_of_ait = 0;
 
 	nb_of_ait = gf_list_count(ChannelAppList);
 
-	if(nb_of_ait){
+	if(nb_of_ait) {
 		u32 i;
-		for(i = 0;i < nb_of_ait;i++){
+		for(i = 0; i < nb_of_ait; i++) {
 			GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo = (GF_M2TS_CHANNEL_APPLICATION_INFO*) gf_list_get(ChannelAppList,i);
-			if(ChanAppInfo->ait_pid == pid){
+			if(ChanAppInfo->ait_pid == pid) {
 				version_number = (data[5] &0x3E)>>1;
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] AIT ait_list_version number %d, ait->version_number %d \n",ChanAppInfo->version_number,version_number));
-				if(ChanAppInfo->version_number >= version_number){
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] AIT already received, abording processing \n"));	
+				if(ChanAppInfo->version_number >= version_number) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] AIT already received, abording processing \n"));
 					return 1;
-				}else{				
-					while(ChanAppInfo->nb_application != 0){
+				} else {
+					while(ChanAppInfo->nb_application != 0) {
 						GF_M2TS_AIT_APPLICATION* Application = gf_list_get(ChanAppInfo->Application,0);
 						gf_m2ts_free_ait_application(Application);
 						gf_list_rem(ChanAppInfo->Application,0);
@@ -628,7 +628,7 @@
 				}
 			}
 		}
-	}else{
+	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] No AIT received \n"));
 	}
 
@@ -639,20 +639,20 @@
 {
 	u32 common_descr_numb, app_numb;
 
-	/* delete de Elementary Stream part of the AIT structure */ 	
+	/* delete de Elementary Stream part of the AIT structure */
 	common_descr_numb = 0;
 	app_numb = 0;
 
-	/* delete the common descriptors */ 
+	/* delete the common descriptors */
 	common_descr_numb = gf_list_count(ait->common_descriptors);
-	while(common_descr_numb != 0){
+	while(common_descr_numb != 0) {
 		//TODO
 	};
 	gf_list_del(ait->common_descriptors);
 
 	/* delete the applications and their descriptors */
 	app_numb = gf_list_count(ait->application_decoded);
-	while(app_numb != 0){
+	while(app_numb != 0) {
 		GF_M2TS_AIT_APPLICATION_DECODE* application = gf_list_get(ait->application_decoded,0);
 		gf_ait_application_decode_destroy(application);
 		gf_list_rem(ait->application_decoded,0);
@@ -667,7 +667,7 @@
 
 	u32 app_desc_num,i,app_descr_index;
 
-	app_desc_num = app_descr_index = i = 0; 
+	app_desc_num = app_descr_index = i = 0;
 	app_desc_num = gf_list_count(application_decode->application_descriptors);
 
 	while (app_desc_num != 0) {
@@ -675,82 +675,82 @@
 		descr_tag = application_decode->application_descriptors_id[i];
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[DSMCC] descr_tag %d\n", descr_tag));
 		switch(descr_tag) {
-			case APPLICATION_DESCRIPTOR:
-				{
-					GF_M2TS_APPLICATION_DESCRIPTOR* application_descriptor = (GF_M2TS_APPLICATION_DESCRIPTOR*)gf_list_get(application_decode->application_descriptors,0);
-					gf_free(application_descriptor);  
-					break;
-				}
-			case APPLICATION_NAME_DESCRIPTOR:
-				{
-					GF_M2TS_APPLICATION_NAME_DESCRIPTOR* name_descriptor = (GF_M2TS_APPLICATION_NAME_DESCRIPTOR*)gf_list_get(application_decode->application_descriptors,0);
-					gf_free(name_descriptor->application_name_char);
-					gf_free(name_descriptor);
-					break;
-				}
-			case TRANSPORT_PROTOCOL_DESCRIPTOR:
-				{
-					GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR* protocol_descriptor = (GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR*)gf_list_get(application_decode->application_descriptors,0);  					
-					switch (protocol_descriptor->protocol_id) {
+		case APPLICATION_DESCRIPTOR:
+		{
+			GF_M2TS_APPLICATION_DESCRIPTOR* application_descriptor = (GF_M2TS_APPLICATION_DESCRIPTOR*)gf_list_get(application_decode->application_descriptors,0);
+			gf_free(application_descriptor);
+			break;
+		}
+		case APPLICATION_NAME_DESCRIPTOR:
+		{
+			GF_M2TS_APPLICATION_NAME_DESCRIPTOR* name_descriptor = (GF_M2TS_APPLICATION_NAME_DESCRIPTOR*)gf_list_get(application_decode->application_descriptors,0);
+			gf_free(name_descriptor->application_name_char);
+			gf_free(name_descriptor);
+			break;
+		}
+		case TRANSPORT_PROTOCOL_DESCRIPTOR:
+		{
+			GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR* protocol_descriptor = (GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR*)gf_list_get(application_decode->application_descriptors,0);
+			switch (protocol_descriptor->protocol_id) {
 			case CAROUSEL:
-				{
-					GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte = (GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE*)protocol_descriptor->selector_byte;
-					gf_free(Carousel_selector_byte);
-					break;
-				}
+			{
+				GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte = (GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE*)protocol_descriptor->selector_byte;
+				gf_free(Carousel_selector_byte);
+				break;
+			}
 			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) {
-						for (i=0; i < Transport_http_selector_byte->URL_extension_count;i++) { 										
-							gf_free(Transport_http_selector_byte->URL_extentions[i].URL_extension_byte);
-						}
-						gf_free(Transport_http_selector_byte->URL_extentions);
+			{
+				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) {
+					for (i=0; i < Transport_http_selector_byte->URL_extension_count; i++) {
+						gf_free(Transport_http_selector_byte->URL_extentions[i].URL_extension_byte);
 					}
-					gf_free(Transport_http_selector_byte);
-					break;
+					gf_free(Transport_http_selector_byte->URL_extentions);
 				}
+				gf_free(Transport_http_selector_byte);
+				break;
+			}
 			default:
-				{
-					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Protocol ID %d unsupported, ignoring the selector byte \n",protocol_descriptor->protocol_id));
-				}
-					}					
-					gf_free(protocol_descriptor);					
-					break;
-				}
-			case SIMPLE_APPLICATION_LOCATION_DESCRIPTOR:
-				{			
-					GF_M2TS_SIMPLE_APPLICATION_LOCATION* Simple_application_location = (GF_M2TS_SIMPLE_APPLICATION_LOCATION*)gf_list_get(application_decode->application_descriptors,0);
-					gf_free(Simple_application_location->initial_path_bytes);
-					gf_free(Simple_application_location);
-					break;
-				}
-			case APPLICATION_USAGE_DESCRIPTOR:
-				{
-					GF_M2TS_APPLICATION_USAGE* Application_usage = (GF_M2TS_APPLICATION_USAGE*)gf_list_get(application_decode->application_descriptors,0);
-					gf_free(Application_usage);
-					break;
-				}
-			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++) {
-							if (boundary_descriptor->boundary_extension_info[i].boundary_extension_length > 0) {
-								gf_free(boundary_descriptor->boundary_extension_info[i].boundary_extension_byte);
-							}							
-						}
-						gf_free(boundary_descriptor->boundary_extension_info);
+			{
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Protocol ID %d unsupported, ignoring the selector byte \n",protocol_descriptor->protocol_id));
+			}
+			}
+			gf_free(protocol_descriptor);
+			break;
+		}
+		case SIMPLE_APPLICATION_LOCATION_DESCRIPTOR:
+		{
+			GF_M2TS_SIMPLE_APPLICATION_LOCATION* Simple_application_location = (GF_M2TS_SIMPLE_APPLICATION_LOCATION*)gf_list_get(application_decode->application_descriptors,0);
+			gf_free(Simple_application_location->initial_path_bytes);
+			gf_free(Simple_application_location);
+			break;
+		}
+		case APPLICATION_USAGE_DESCRIPTOR:
+		{
+			GF_M2TS_APPLICATION_USAGE* Application_usage = (GF_M2TS_APPLICATION_USAGE*)gf_list_get(application_decode->application_descriptors,0);
+			gf_free(Application_usage);
+			break;
+		}
+		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++) {
+					if (boundary_descriptor->boundary_extension_info[i].boundary_extension_length > 0) {
+						gf_free(boundary_descriptor->boundary_extension_info[i].boundary_extension_byte);
 					}
-					gf_free(boundary_descriptor);
-					break;					
-				}
-			default:
-				{
 				}
+				gf_free(boundary_descriptor->boundary_extension_info);
+			}
+			gf_free(boundary_descriptor);
+			break;
+		}
+		default:
+		{
+		}
 		}
 		gf_list_rem(application_decode->application_descriptors,0);
 		app_desc_num = gf_list_count(application_decode->application_descriptors);
@@ -760,24 +760,24 @@
 	gf_free(application_decode);
 }
 
-static void gf_m2ts_free_ait_application(GF_M2TS_AIT_APPLICATION* Application){
+static void gf_m2ts_free_ait_application(GF_M2TS_AIT_APPLICATION* Application) {
 
-	if(Application->http_url){
+	if(Application->http_url) {
 		gf_free(Application->http_url);
 	}
-	if(Application->carousel_url){
+	if(Application->carousel_url) {
 		gf_free(Application->carousel_url);
 	}
 
-	if(Application->appli_name){
+	if(Application->appli_name) {
 		gf_free(Application->appli_name);
 	}
 	gf_free(Application);
 }
 
-void  gf_m2ts_delete_channel_application_info(GF_M2TS_CHANNEL_APPLICATION_INFO* ChannelApp){
+void  gf_m2ts_delete_channel_application_info(GF_M2TS_CHANNEL_APPLICATION_INFO* ChannelApp) {
 
-	while(gf_list_count(ChannelApp->Application)){
+	while(gf_list_count(ChannelApp->Application)) {
 		GF_M2TS_AIT_APPLICATION* Application = (GF_M2TS_AIT_APPLICATION*)gf_list_get(ChannelApp->Application,0);
 		gf_m2ts_free_ait_application(Application);
 		gf_list_rem(ChannelApp->Application,0);

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/av_parsers.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/av_parsers.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre, Romain Bouqueau, Cyril Concolato 
+ *			Authors: Jean Le Feuvre, Romain Bouqueau, Cyril Concolato
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -29,12 +29,14 @@
 
 #ifndef GPAC_DISABLE_OGG
 #include <gpac/internal/ogg.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 #endif
 
-static const struct { u32 w, h; } std_par[ ] =
+static const struct {
+	u32 w, h;
+} std_par[ ] =
 {
-	{ 4, 3}, {3, 2}, {16, 9}, {5, 3}, {5, 4}, {8, 5}, 
+	{ 4, 3}, {3, 2}, {16, 9}, {5, 3}, {5, 4}, {8, 5},
 	{0, 0},
 };
 
@@ -60,7 +62,7 @@
 	u32 res;
 	if (! *sample_dur) return;
 	res = *timescale / *sample_dur;
-	if (res * *sample_dur == *timescale) {
+	if (res **sample_dur == *timescale) {
 		*timescale = res;
 		*sample_dur = 1;
 	}
@@ -70,69 +72,132 @@
 const char *gf_m4v_get_profile_name(u8 video_pl)
 {
 	switch (video_pl) {
-	case 0x00: return "Reserved (0x00) Profile";
-	case 0x01: return "Simple Profile @ Level 1";
-	case 0x02: return "Simple Profile @ Level 2";
-	case 0x03: return "Simple Profile @ Level 3";
-	case 0x08: return "Simple Profile @ Level 0";
-	case 0x10: return "Simple Scalable Profile @ Level 0";
-	case 0x11: return "Simple Scalable Profile @ Level 1";
-	case 0x12: return "Simple Scalable Profile @ Level 2";
-	case 0x15: return "AVC/H264 Profile";
-	case 0x21: return "Core Profile @ Level 1";
-	case 0x22: return "Core Profile @ Level 2";
-	case 0x32: return "Main Profile @ Level 2";
-	case 0x33: return "Main Profile @ Level 3";
-	case 0x34: return "Main Profile @ Level 4";
-	case 0x42: return "N-bit Profile @ Level 2";
-	case 0x51: return "Scalable Texture Profile @ Level 1";
-	case 0x61: return "Simple Face Animation Profile @ Level 1";
-	case 0x62: return "Simple Face Animation Profile @ Level 2";
-	case 0x63: return "Simple FBA Profile @ Level 1";
-	case 0x64: return "Simple FBA Profile @ Level 2";
-	case 0x71: return "Basic Animated Texture Profile @ Level 1";
-	case 0x72: return "Basic Animated Texture Profile @ Level 2";
-	case 0x81: return "Hybrid Profile @ Level 1";
-	case 0x82: return "Hybrid Profile @ Level 2";
-	case 0x91: return "Advanced Real Time Simple Profile @ Level 1";
-	case 0x92: return "Advanced Real Time Simple Profile @ Level 2";
-	case 0x93: return "Advanced Real Time Simple Profile @ Level 3";
-	case 0x94: return "Advanced Real Time Simple Profile @ Level 4";
-	case 0xA1: return "Core Scalable Profile @ Level1";
-	case 0xA2: return "Core Scalable Profile @ Level2";
-	case 0xA3: return "Core Scalable Profile @ Level3";
-	case 0xB1: return "Advanced Coding Efficiency Profile @ Level 1";
-	case 0xB2: return "Advanced Coding Efficiency Profile @ Level 2";
-	case 0xB3: return "Advanced Coding Efficiency Profile @ Level 3";
-	case 0xB4: return "Advanced Coding Efficiency Profile @ Level 4";
-	case 0xC1: return "Advanced Core Profile @ Level 1";
-	case 0xC2: return "Advanced Core Profile @ Level 2";
-	case 0xD1: return "Advanced Scalable Texture @ Level1";
-	case 0xD2: return "Advanced Scalable Texture @ Level2";
-	case 0xE1: return "Simple Studio Profile @ Level 1";
-	case 0xE2: return "Simple Studio Profile @ Level 2";
-	case 0xE3: return "Simple Studio Profile @ Level 3";
-	case 0xE4: return "Simple Studio Profile @ Level 4";
-	case 0xE5: return "Core Studio Profile @ Level 1";
-	case 0xE6: return "Core Studio Profile @ Level 2";
-	case 0xE7: return "Core Studio Profile @ Level 3";
-	case 0xE8: return "Core Studio Profile @ Level 4";
-	case 0xF0: return "Advanced Simple Profile @ Level 0";
-	case 0xF1: return "Advanced Simple Profile @ Level 1";
-	case 0xF2: return "Advanced Simple Profile @ Level 2";
-	case 0xF3: return "Advanced Simple Profile @ Level 3";
-	case 0xF4: return "Advanced Simple Profile @ Level 4";
-	case 0xF5: return "Advanced Simple Profile @ Level 5";
-	case 0xF7: return "Advanced Simple Profile @ Level 3b";
-	case 0xF8: return "Fine Granularity Scalable Profile @ Level 0";
-	case 0xF9: return "Fine Granularity Scalable Profile @ Level 1";
-	case 0xFA: return "Fine Granularity Scalable Profile @ Level 2";
-	case 0xFB: return "Fine Granularity Scalable Profile @ Level 3";
-	case 0xFC: return "Fine Granularity Scalable Profile @ Level 4";
-	case 0xFD: return "Fine Granularity Scalable Profile @ Level 5";
-	case 0xFE: return "Not part of MPEG-4 Visual profiles";
-	case 0xFF: return "No visual capability required";
-	default: return "ISO Reserved Profile";
+	case 0x00:
+		return "Reserved (0x00) Profile";
+	case 0x01:
+		return "Simple Profile @ Level 1";
+	case 0x02:
+		return "Simple Profile @ Level 2";
+	case 0x03:
+		return "Simple Profile @ Level 3";
+	case 0x08:
+		return "Simple Profile @ Level 0";
+	case 0x10:
+		return "Simple Scalable Profile @ Level 0";
+	case 0x11:
+		return "Simple Scalable Profile @ Level 1";
+	case 0x12:
+		return "Simple Scalable Profile @ Level 2";
+	case 0x15:
+		return "AVC/H264 Profile";
+	case 0x21:
+		return "Core Profile @ Level 1";
+	case 0x22:
+		return "Core Profile @ Level 2";
+	case 0x32:
+		return "Main Profile @ Level 2";
+	case 0x33:
+		return "Main Profile @ Level 3";
+	case 0x34:
+		return "Main Profile @ Level 4";
+	case 0x42:
+		return "N-bit Profile @ Level 2";
+	case 0x51:
+		return "Scalable Texture Profile @ Level 1";
+	case 0x61:
+		return "Simple Face Animation Profile @ Level 1";
+	case 0x62:
+		return "Simple Face Animation Profile @ Level 2";
+	case 0x63:
+		return "Simple FBA Profile @ Level 1";
+	case 0x64:
+		return "Simple FBA Profile @ Level 2";
+	case 0x71:
+		return "Basic Animated Texture Profile @ Level 1";
+	case 0x72:
+		return "Basic Animated Texture Profile @ Level 2";
+	case 0x81:
+		return "Hybrid Profile @ Level 1";
+	case 0x82:
+		return "Hybrid Profile @ Level 2";
+	case 0x91:
+		return "Advanced Real Time Simple Profile @ Level 1";
+	case 0x92:
+		return "Advanced Real Time Simple Profile @ Level 2";
+	case 0x93:
+		return "Advanced Real Time Simple Profile @ Level 3";
+	case 0x94:
+		return "Advanced Real Time Simple Profile @ Level 4";
+	case 0xA1:
+		return "Core Scalable Profile @ Level1";
+	case 0xA2:
+		return "Core Scalable Profile @ Level2";
+	case 0xA3:
+		return "Core Scalable Profile @ Level3";
+	case 0xB1:
+		return "Advanced Coding Efficiency Profile @ Level 1";
+	case 0xB2:
+		return "Advanced Coding Efficiency Profile @ Level 2";
+	case 0xB3:
+		return "Advanced Coding Efficiency Profile @ Level 3";
+	case 0xB4:
+		return "Advanced Coding Efficiency Profile @ Level 4";
+	case 0xC1:
+		return "Advanced Core Profile @ Level 1";
+	case 0xC2:
+		return "Advanced Core Profile @ Level 2";
+	case 0xD1:
+		return "Advanced Scalable Texture @ Level1";
+	case 0xD2:
+		return "Advanced Scalable Texture @ Level2";
+	case 0xE1:
+		return "Simple Studio Profile @ Level 1";
+	case 0xE2:
+		return "Simple Studio Profile @ Level 2";
+	case 0xE3:
+		return "Simple Studio Profile @ Level 3";
+	case 0xE4:
+		return "Simple Studio Profile @ Level 4";
+	case 0xE5:
+		return "Core Studio Profile @ Level 1";
+	case 0xE6:
+		return "Core Studio Profile @ Level 2";
+	case 0xE7:
+		return "Core Studio Profile @ Level 3";
+	case 0xE8:
+		return "Core Studio Profile @ Level 4";
+	case 0xF0:
+		return "Advanced Simple Profile @ Level 0";
+	case 0xF1:
+		return "Advanced Simple Profile @ Level 1";
+	case 0xF2:
+		return "Advanced Simple Profile @ Level 2";
+	case 0xF3:
+		return "Advanced Simple Profile @ Level 3";
+	case 0xF4:
+		return "Advanced Simple Profile @ Level 4";
+	case 0xF5:
+		return "Advanced Simple Profile @ Level 5";
+	case 0xF7:
+		return "Advanced Simple Profile @ Level 3b";
+	case 0xF8:
+		return "Fine Granularity Scalable Profile @ Level 0";
+	case 0xF9:
+		return "Fine Granularity Scalable Profile @ Level 1";
+	case 0xFA:
+		return "Fine Granularity Scalable Profile @ Level 2";
+	case 0xFB:
+		return "Fine Granularity Scalable Profile @ Level 3";
+	case 0xFC:
+		return "Fine Granularity Scalable Profile @ Level 4";
+	case 0xFD:
+		return "Fine Granularity Scalable Profile @ Level 5";
+	case 0xFE:
+		return "Not part of MPEG-4 Visual profiles";
+	case 0xFF:
+		return "No visual capability required";
+	default:
+		return "ISO Reserved Profile";
 	}
 }
 
@@ -152,24 +217,24 @@
 
 s32 gf_mv12_next_start_code(unsigned char *pbuffer, u32 buflen, u32 *optr, u32 *scode)
 {
-  u32 value;
-  u32 offset;
+	u32 value;
+	u32 offset;
 
-  if (buflen < 4) return -1;
-  for (offset = 0; offset < buflen - 3; offset++, pbuffer++) {
+	if (buflen < 4) return -1;
+	for (offset = 0; offset < buflen - 3; offset++, pbuffer++) {
 #ifdef GPAC_BIG_ENDIAN
-	value = *(u32 *)pbuffer >> 8;
+		value = *(u32 *)pbuffer >> 8;
 #else
-	value = (pbuffer[0] << 16) | (pbuffer[1] << 8) | (pbuffer[2] << 0); 
+		value = (pbuffer[0] << 16) | (pbuffer[1] << 8) | (pbuffer[2] << 0);
 #endif
 
-	if (value == MPEG12_START_CODE_PREFIX) {
-	  *optr = offset;
-	  *scode = (value << 8) | pbuffer[3];
-	  return 0;
+		if (value == MPEG12_START_CODE_PREFIX) {
+			*optr = offset;
+			*scode = (value << 8) | pbuffer[3];
+			return 0;
+		}
 	}
-  }
-  return -1;
+	return -1;
 }
 
 s32 gf_mv12_next_slice_start(unsigned char *pbuffer, u32 startoffset, u32 buflen, u32 *slice_offset)
@@ -341,35 +406,73 @@
 			dsi->VideoPL = GPAC_OTI_VIDEO_MPEG1;
 			par = (p[3] >> 4) & 0xf;
 			switch (par) {
-			case 2: dsi->par_num = dsi->height/3; dsi->par_den = dsi->width/4; break;
-			case 3: dsi->par_num = dsi->height/9; dsi->par_den = dsi->width/16; break;
-			case 4: dsi->par_num = dsi->height/2; dsi->par_den = dsi->width/21; break;
-			default: dsi->par_den = dsi->par_num = 0; break;
+			case 2:
+				dsi->par_num = dsi->height/3;
+				dsi->par_den = dsi->width/4;
+				break;
+			case 3:
+				dsi->par_num = dsi->height/9;
+				dsi->par_den = dsi->width/16;
+				break;
+			case 4:
+				dsi->par_num = dsi->height/2;
+				dsi->par_den = dsi->width/21;
+				break;
+			default:
+				dsi->par_den = dsi->par_num = 0;
+				break;
 			}
 			switch (p[3] & 0xf) {
-			case 0: break;
-			case 1: dsi->fps = 24000.0/1001.0; break;
-			case 2: dsi->fps = 24.0; break;
-			case 3: dsi->fps = 25.0; break;
-			case 4: dsi->fps = 30000.0/1001.0; break;
-			case 5: dsi->fps = 30.0; break;
-			case 6: dsi->fps = 50.0; break;
-			case 7: dsi->fps = ((60.0*1000.0)/1001.0); break;
-			case 8: dsi->fps = 60.0; break;
-			case 9: dsi->fps = 1; break;
-			case 10: dsi->fps = 5; break;
-			case 11: dsi->fps = 10; break;
-			case 12: dsi->fps = 12; break;
-			case 13: dsi->fps = 15; break;
+			case 0:
+				break;
+			case 1:
+				dsi->fps = 24000.0/1001.0;
+				break;
+			case 2:
+				dsi->fps = 24.0;
+				break;
+			case 3:
+				dsi->fps = 25.0;
+				break;
+			case 4:
+				dsi->fps = 30000.0/1001.0;
+				break;
+			case 5:
+				dsi->fps = 30.0;
+				break;
+			case 6:
+				dsi->fps = 50.0;
+				break;
+			case 7:
+				dsi->fps = ((60.0*1000.0)/1001.0);
+				break;
+			case 8:
+				dsi->fps = 60.0;
+				break;
+			case 9:
+				dsi->fps = 1;
+				break;
+			case 10:
+				dsi->fps = 5;
+				break;
+			case 11:
+				dsi->fps = 10;
+				break;
+			case 12:
+				dsi->fps = 12;
+				break;
+			case 13:
+				dsi->fps = 15;
+				break;
 			}
 			break;
 		case M2V_EXT_START_CODE:
 			gf_bs_read_data(m4v->bs,  (char *) p, 4);
 			ext_type = ((p[0] >> 4) & 0xf);
 			if (ext_type == 1) {
-			  dsi->VideoPL = 0x65;
-			  dsi->height = ((p[1] & 0x1) << 13) | ((p[2] & 0x80) << 5) | (dsi->height & 0x0fff);
-			  dsi->width = (((p[2] >> 5) & 0x3) << 12) | (dsi->width & 0x0fff);
+				dsi->VideoPL = 0x65;
+				dsi->height = ((p[1] & 0x1) << 13) | ((p[2] & 0x80) << 5) | (dsi->height & 0x0fff);
+				dsi->width = (((p[2] >> 5) & 0x3) << 12) | (dsi->width & 0x0fff);
 			}
 			break;
 		case M2V_PIC_START_CODE:
@@ -389,7 +492,9 @@
 }
 
 
-static const struct { u32 w, h; } m4v_sar[6] = { { 0,   0 }, { 1,   1 }, { 12, 11 }, { 10, 11 }, { 16, 11 }, { 40, 33 } };
+static const struct {
+	u32 w, h;
+} m4v_sar[6] = { { 0,   0 }, { 1,   1 }, { 12, 11 }, { 10, 11 }, { 16, 11 }, { 40, 33 } };
 
 static u8 m4v_get_sar_idx(u32 w, u32 h)
 {
@@ -450,14 +555,14 @@
 			clock_rate = dsi->clock_rate-1;
 			if (clock_rate >= 65536) clock_rate = 65535;
 			if (clock_rate > 0) {
-				for (dsi->NumBitsTimeIncrement = 1; dsi->NumBitsTimeIncrement < 16; dsi->NumBitsTimeIncrement++)	{	
+				for (dsi->NumBitsTimeIncrement = 1; dsi->NumBitsTimeIncrement < 16; dsi->NumBitsTimeIncrement++)	{
 					if (clock_rate == 1) break;
 					clock_rate = (clock_rate >> 1);
 				}
 			} else {
 				/*fix from vivien for divX*/
 				dsi->NumBitsTimeIncrement = 1;
-			}			
+			}
 			/*fixed FPS stream*/
 			dsi->time_increment = 0;
 			if (gf_bs_read_int(m4v->bs, 1)) {
@@ -519,7 +624,7 @@
 
 	M4V_Reset(m4v, m4v->current_object_start);
 	go = 1;
-	
+
 	while (go) {
 		o_type = M4V_LoadObject(m4v);
 		switch (o_type) {
@@ -618,7 +723,7 @@
 			/*vop_time_inc*/
 			if (dsi.NumBitsTimeIncrement)
 				vop_inc = gf_bs_read_int(m4v->bs, dsi.NumBitsTimeIncrement);
-			
+
 			m4v->prev_tc_dec = m4v->tc_dec;
 			m4v->prev_tc_disp = m4v->tc_disp;
 			if (dsi.enh_layer || *frame_type!=2) {
@@ -735,7 +840,7 @@
 		u32 b = gf_bs_read_int(m4v->bs, 1);
 		gf_bs_write_int(mod, b, 1);
 	}
-	
+
 	gf_m4v_parser_del(m4v);
 	gf_free(*o_data);
 	gf_bs_get_content(mod, o_data, o_dataLen);
@@ -778,44 +883,82 @@
 const char *gf_m4a_object_type_name(u32 objectType)
 {
 	switch (objectType) {
-	case 0: return "MPEG-4 Audio Reserved";
-	case 1: return "MPEG-4 Audio AAC Main";
-	case 2: return "MPEG-4 Audio AAC LC";
-	case 3: return "MPEG-4 Audio AAC SSR";
-	case 4: return "MPEG-4 Audio AAC LTP";
-	case 5: return "MPEG-4 Audio SBR";
-	case 6: return "MPEG-4 Audio AAC Scalable";
-	case 7: return "MPEG-4 Audio TwinVQ";
-	case 8: return "MPEG-4 Audio CELP";
-	case 9: return "MPEG-4 Audio HVXC";
-	case 10: return "MPEG-4 Audio Reserved";
-	case 11: return "MPEG-4 Audio Reserved";
-	case 12: return "MPEG-4 Audio TTSI";
-	case 13: return "MPEG-4 Audio Main synthetic";
-	case 14: return "MPEG-4 Audio Wavetable synthesis";
-	case 15: return "MPEG-4 Audio General MIDI";
-	case 16: return "MPEG-4 Audio Algorithmic Synthesis and Audio FX";
-	case 17: return "MPEG-4 Audio ER AAC LC";
-	case 18: return "MPEG-4 Audio Reserved";
-	case 19: return "MPEG-4 Audio ER AAC LTP";
-	case 20: return "MPEG-4 Audio ER AAC scalable";
-	case 21: return "MPEG-4 Audio ER TwinVQ";
-	case 22: return "MPEG-4 Audio ER BSAC";
-	case 23: return "MPEG-4 Audio ER AAC LD";
-	case 24: return "MPEG-4 Audio ER CELP";
-	case 25: return "MPEG-4 Audio ER HVXC";
-	case 26: return "MPEG-4 Audio ER HILN";
-	case 27: return "MPEG-4 Audio ER Parametric";
-	case 28: return "MPEG-4 Audio SSC";
-	case 29: return "MPEG-4 Audio ParametricStereo";
-	case 30: return "MPEG-4 Audio Reserved";
-	case 31: return "MPEG-4 Audio Reserved";
-	case 32: return "MPEG-1 Audio Layer-1";
-	case 33: return "MPEG-1 Audio Layer-2";
-	case 34: return "MPEG-1 Audio Layer-3";
-	case 35: return "MPEG-4 Audio DST";
-	case 36: return "MPEG-4 Audio ALS";
-	default: return "MPEG-4 Audio Unknown";
+	case 0:
+		return "MPEG-4 Audio Reserved";
+	case 1:
+		return "MPEG-4 Audio AAC Main";
+	case 2:
+		return "MPEG-4 Audio AAC LC";
+	case 3:
+		return "MPEG-4 Audio AAC SSR";
+	case 4:
+		return "MPEG-4 Audio AAC LTP";
+	case 5:
+		return "MPEG-4 Audio SBR";
+	case 6:
+		return "MPEG-4 Audio AAC Scalable";
+	case 7:
+		return "MPEG-4 Audio TwinVQ";
+	case 8:
+		return "MPEG-4 Audio CELP";
+	case 9:
+		return "MPEG-4 Audio HVXC";
+	case 10:
+		return "MPEG-4 Audio Reserved";
+	case 11:
+		return "MPEG-4 Audio Reserved";
+	case 12:
+		return "MPEG-4 Audio TTSI";
+	case 13:
+		return "MPEG-4 Audio Main synthetic";
+	case 14:
+		return "MPEG-4 Audio Wavetable synthesis";
+	case 15:
+		return "MPEG-4 Audio General MIDI";
+	case 16:
+		return "MPEG-4 Audio Algorithmic Synthesis and Audio FX";
+	case 17:
+		return "MPEG-4 Audio ER AAC LC";
+	case 18:
+		return "MPEG-4 Audio Reserved";
+	case 19:
+		return "MPEG-4 Audio ER AAC LTP";
+	case 20:
+		return "MPEG-4 Audio ER AAC scalable";
+	case 21:
+		return "MPEG-4 Audio ER TwinVQ";
+	case 22:
+		return "MPEG-4 Audio ER BSAC";
+	case 23:
+		return "MPEG-4 Audio ER AAC LD";
+	case 24:
+		return "MPEG-4 Audio ER CELP";
+	case 25:
+		return "MPEG-4 Audio ER HVXC";
+	case 26:
+		return "MPEG-4 Audio ER HILN";
+	case 27:
+		return "MPEG-4 Audio ER Parametric";
+	case 28:
+		return "MPEG-4 Audio SSC";
+	case 29:
+		return "MPEG-4 Audio ParametricStereo";
+	case 30:
+		return "MPEG-4 Audio Reserved";
+	case 31:
+		return "MPEG-4 Audio Reserved";
+	case 32:
+		return "MPEG-1 Audio Layer-1";
+	case 33:
+		return "MPEG-1 Audio Layer-2";
+	case 34:
+		return "MPEG-1 Audio Layer-3";
+	case 35:
+		return "MPEG-4 Audio DST";
+	case 36:
+		return "MPEG-4 Audio ALS";
+	default:
+		return "MPEG-4 Audio Unknown";
 	}
 }
 
@@ -823,57 +966,108 @@
 const char *gf_m4a_get_profile_name(u8 audio_pl)
 {
 	switch (audio_pl) {
-	case 0x00: return "ISO Reserved (0x00)";
-	case 0x01: return "Main Audio Profile @ Level 1";
-	case 0x02: return "Main Audio Profile @ Level 2";
-	case 0x03: return "Main Audio Profile @ Level 3";
-	case 0x04: return "Main Audio Profile @ Level 4";
-	case 0x05: return "Scalable Audio Profile @ Level 1";
-	case 0x06: return "Scalable Audio Profile @ Level 2";
-	case 0x07: return "Scalable Audio Profile @ Level 3";
-	case 0x08: return "Scalable Audio Profile @ Level 4";
-	case 0x09: return "Speech Audio Profile @ Level 1";
-	case 0x0A: return "Speech Audio Profile @ Level 2";
-	case 0x0B: return "Synthetic Audio Profile @ Level 1";
-	case 0x0C: return "Synthetic Audio Profile @ Level 2";
-	case 0x0D: return "Synthetic Audio Profile @ Level 3";
-	case 0x0E: return "High Quality Audio Profile @ Level 1";
-	case 0x0F: return "High Quality Audio Profile @ Level 2";
-	case 0x10: return "High Quality Audio Profile @ Level 3";
-	case 0x11: return "High Quality Audio Profile @ Level 4";
-	case 0x12: return "High Quality Audio Profile @ Level 5";
-	case 0x13: return "High Quality Audio Profile @ Level 6";
-	case 0x14: return "High Quality Audio Profile @ Level 7";
-	case 0x15: return "High Quality Audio Profile @ Level 8";
-	case 0x16: return "Low Delay Audio Profile @ Level 1";
-	case 0x17: return "Low Delay Audio Profile @ Level 2";
-	case 0x18: return "Low Delay Audio Profile @ Level 3";
-	case 0x19: return "Low Delay Audio Profile @ Level 4";
-	case 0x1A: return "Low Delay Audio Profile @ Level 5";
-	case 0x1B: return "Low Delay Audio Profile @ Level 6";
-	case 0x1C: return "Low Delay Audio Profile @ Level 7";
-	case 0x1D: return "Low Delay Audio Profile @ Level 8";
-	case 0x1E: return "Natural Audio Profile @ Level 1";
-	case 0x1F: return "Natural Audio Profile @ Level 2";
-	case 0x20: return "Natural Audio Profile @ Level 3";
-	case 0x21: return "Natural Audio Profile @ Level 4";
-	case 0x22: return "Mobile Audio Internetworking Profile @ Level 1";
-	case 0x23: return "Mobile Audio Internetworking Profile @ Level 2";
-	case 0x24: return "Mobile Audio Internetworking Profile @ Level 3";
-	case 0x25: return "Mobile Audio Internetworking Profile @ Level 4";
-	case 0x26: return "Mobile Audio Internetworking Profile @ Level 5";
-	case 0x27: return "Mobile Audio Internetworking Profile @ Level 6";
-	case 0x28: return "AAC Profile @ Level 1";
-	case 0x29: return "AAC Profile @ Level 2";
-	case 0x2A: return "AAC Profile @ Level 4";
-	case 0x2B: return "AAC Profile @ Level 5";
-	case 0x2C: return "High Efficiency AAC Profile @ Level 2";
-	case 0x2D: return "High Efficiency AAC Profile @ Level 3";
-	case 0x2E: return "High Efficiency AAC Profile @ Level 4";
-	case 0x2F: return "High Efficiency AAC Profile @ Level 5";
-	case 0xFE: return "Not part of MPEG-4 audio profiles";
-	case 0xFF: return "No audio capability required";
-	default: return "ISO Reserved / User Private";
+	case 0x00:
+		return "ISO Reserved (0x00)";
+	case 0x01:
+		return "Main Audio Profile @ Level 1";
+	case 0x02:
+		return "Main Audio Profile @ Level 2";
+	case 0x03:
+		return "Main Audio Profile @ Level 3";
+	case 0x04:
+		return "Main Audio Profile @ Level 4";
+	case 0x05:
+		return "Scalable Audio Profile @ Level 1";
+	case 0x06:
+		return "Scalable Audio Profile @ Level 2";
+	case 0x07:
+		return "Scalable Audio Profile @ Level 3";
+	case 0x08:
+		return "Scalable Audio Profile @ Level 4";
+	case 0x09:
+		return "Speech Audio Profile @ Level 1";
+	case 0x0A:
+		return "Speech Audio Profile @ Level 2";
+	case 0x0B:
+		return "Synthetic Audio Profile @ Level 1";
+	case 0x0C:
+		return "Synthetic Audio Profile @ Level 2";
+	case 0x0D:
+		return "Synthetic Audio Profile @ Level 3";
+	case 0x0E:
+		return "High Quality Audio Profile @ Level 1";
+	case 0x0F:
+		return "High Quality Audio Profile @ Level 2";
+	case 0x10:
+		return "High Quality Audio Profile @ Level 3";
+	case 0x11:
+		return "High Quality Audio Profile @ Level 4";
+	case 0x12:
+		return "High Quality Audio Profile @ Level 5";
+	case 0x13:
+		return "High Quality Audio Profile @ Level 6";
+	case 0x14:
+		return "High Quality Audio Profile @ Level 7";
+	case 0x15:
+		return "High Quality Audio Profile @ Level 8";
+	case 0x16:
+		return "Low Delay Audio Profile @ Level 1";
+	case 0x17:
+		return "Low Delay Audio Profile @ Level 2";
+	case 0x18:
+		return "Low Delay Audio Profile @ Level 3";
+	case 0x19:
+		return "Low Delay Audio Profile @ Level 4";
+	case 0x1A:
+		return "Low Delay Audio Profile @ Level 5";
+	case 0x1B:
+		return "Low Delay Audio Profile @ Level 6";
+	case 0x1C:
+		return "Low Delay Audio Profile @ Level 7";
+	case 0x1D:
+		return "Low Delay Audio Profile @ Level 8";
+	case 0x1E:
+		return "Natural Audio Profile @ Level 1";
+	case 0x1F:
+		return "Natural Audio Profile @ Level 2";
+	case 0x20:
+		return "Natural Audio Profile @ Level 3";
+	case 0x21:
+		return "Natural Audio Profile @ Level 4";
+	case 0x22:
+		return "Mobile Audio Internetworking Profile @ Level 1";
+	case 0x23:
+		return "Mobile Audio Internetworking Profile @ Level 2";
+	case 0x24:
+		return "Mobile Audio Internetworking Profile @ Level 3";
+	case 0x25:
+		return "Mobile Audio Internetworking Profile @ Level 4";
+	case 0x26:
+		return "Mobile Audio Internetworking Profile @ Level 5";
+	case 0x27:
+		return "Mobile Audio Internetworking Profile @ Level 6";
+	case 0x28:
+		return "AAC Profile @ Level 1";
+	case 0x29:
+		return "AAC Profile @ Level 2";
+	case 0x2A:
+		return "AAC Profile @ Level 4";
+	case 0x2B:
+		return "AAC Profile @ Level 5";
+	case 0x2C:
+		return "High Efficiency AAC Profile @ Level 2";
+	case 0x2D:
+		return "High Efficiency AAC Profile @ Level 3";
+	case 0x2E:
+		return "High Efficiency AAC Profile @ Level 4";
+	case 0x2F:
+		return "High Efficiency AAC Profile @ Level 5";
+	case 0xFE:
+		return "Not part of MPEG-4 audio profiles";
+	case 0xFF:
+		return "No audio capability required";
+	default:
+		return "ISO Reserved / User Private";
 	}
 }
 
@@ -914,16 +1108,21 @@
 	} else {
 		cfg->base_sr = GF_M4ASampleRates[cfg->base_sr_index];
 	}
-	cfg->nb_chan = gf_bs_read_int(bs, 4);
-	/*this is 7+1 channels*/
-	if (cfg->nb_chan==7) cfg->nb_chan=8;
+	{
+		u32 nb_chan = gf_bs_read_int(bs, 4);
+		if (nb_chan == 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[M4A config] invalid value 0, setting default 2 instead.\n"));
+			nb_chan = 2;
+		}
+		cfg->nb_chan = GF_M4ANumChannels[nb_chan-1];
+	}
 
 	if (cfg->base_object_type==5 || cfg->base_object_type==29) {
 		if (cfg->base_object_type==29) {
 			cfg->has_ps = 1;
 			cfg->nb_chan = 1;
 		}
-		cfg->has_sbr = 1;
+		cfg->has_sbr = GF_TRUE;
 		cfg->sbr_sr_index = gf_bs_read_int(bs, 4);
 		if (cfg->sbr_sr_index == 0x0F) {
 			cfg->sbr_sr = gf_bs_read_int(bs, 24);
@@ -965,11 +1164,11 @@
 				gf_bs_read_int(bs, 5);
 				gf_bs_read_int(bs, 11);
 			}
-			if ((cfg->base_object_type == 17) 
-				|| (cfg->base_object_type == 19) 
-				|| (cfg->base_object_type == 20) 
-				|| (cfg->base_object_type == 23) 
-			) {
+			if ((cfg->base_object_type == 17)
+			        || (cfg->base_object_type == 19)
+			        || (cfg->base_object_type == 20)
+			        || (cfg->base_object_type == 23)
+			   ) {
 				gf_bs_read_int(bs, 1);
 				gf_bs_read_int(bs, 1);
 				gf_bs_read_int(bs, 1);
@@ -977,7 +1176,7 @@
 			ext_flag = gf_bs_read_int(bs, 1);
 		}
 	}
-		break;
+	break;
 	}
 	/*ER cfg*/
 	switch (cfg->base_object_type) {
@@ -999,7 +1198,7 @@
 			gf_bs_read_int(bs, 1);
 		}
 	}
-		break;
+	break;
 	}
 
 	if (size_known && (cfg->base_object_type != 5) && (cfg->base_object_type != 29) ) {
@@ -1055,6 +1254,16 @@
 }
 
 GF_EXPORT
+u32 gf_m4a_get_channel_cfg(u32 nb_chan)
+{
+	u32 i, count = sizeof(GF_M4ANumChannels)/sizeof(u32);
+	for (i=0; i<count; i++) {
+		if (GF_M4ANumChannels[i] == nb_chan) return i+1;
+	}
+	return 0;
+}
+
+GF_EXPORT
 GF_Err gf_m4a_write_config_bs(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg)
 {
 	if (!cfg->base_sr_index) {
@@ -1086,7 +1295,7 @@
 	if (cfg->nb_chan == 8) {
 		gf_bs_write_int(bs, 7, 4);
 	} else {
-		gf_bs_write_int(bs, cfg->nb_chan, 4);
+		gf_bs_write_int(bs, gf_m4a_get_channel_cfg( cfg->nb_chan) , 4);
 	}
 
 	if (cfg->base_object_type==5 || cfg->base_object_type==29) {
@@ -1127,7 +1336,7 @@
 			gf_bs_write_int(bs, 0, 3);
 		}
 	}
-		break;
+	break;
 	}
 	/*ER cfg - not supported*/
 
@@ -1163,7 +1372,7 @@
 GF_EXPORT
 u8 gf_mp3_version(u32 hdr)
 {
-	return ((hdr >> 19) & 0x3); 
+	return ((hdr >> 19) & 0x3);
 }
 
 GF_EXPORT
@@ -1171,11 +1380,16 @@
 {
 	u32 v = gf_mp3_version(hdr);
 	switch (v) {
-	case 0: return "MPEG-2.5";
-	case 1: return "Reserved";
-	case 2: return "MPEG-2";
-	case 3: return "MPEG-1";
-	default: return "Unknown";
+	case 0:
+		return "MPEG-2.5";
+	case 1:
+		return "Reserved";
+	case 2:
+		return "MPEG-2";
+	case 3:
+		return "MPEG-1";
+	default:
+		return "Unknown";
 	}
 }
 
@@ -1204,16 +1418,16 @@
 	u8 sampleRateIndex = (hdr >> 10) & 0x3;
 
 	switch (sampleRateIndex) {
-	case 0: 
-		res = 44100; 
+	case 0:
+		res = 44100;
 		break;
-	case 1: 
-		res = 48000; 
+	case 1:
+		res = 48000;
 		break;
-	case 2: 
-		res = 32000; 
+	case 2:
+		res = 32000;
 		break;
-	default: 
+	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[MPEG-1/2 Audio] Samplerate index not valid\n"));
 		return 0;
 	}
@@ -1259,19 +1473,24 @@
 
 static
 u32 const bitrate_table[5][15] = {
-  /* MPEG-1 */
-  { 0,  32000,  64000,  96000, 128000, 160000, 192000, 224000,  /* Layer I   */
-       256000, 288000, 320000, 352000, 384000, 416000, 448000 },
-  { 0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer II  */
-       128000, 160000, 192000, 224000, 256000, 320000, 384000 },
-  { 0,  32000,  40000,  48000,  56000,  64000,  80000,  96000,  /* Layer III */
-       112000, 128000, 160000, 192000, 224000, 256000, 320000 },
-
-  /* MPEG-2 LSF */
-  { 0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer I   */
-       128000, 144000, 160000, 176000, 192000, 224000, 256000 },
-  { 0,   8000,  16000,  24000,  32000,  40000,  48000,  56000,  /* Layers    */
-        64000,  80000,  96000, 112000, 128000, 144000, 160000 } /* II & III  */
+	/* MPEG-1 */
+	{	0,  32000,  64000,  96000, 128000, 160000, 192000, 224000,  /* Layer I   */
+		256000, 288000, 320000, 352000, 384000, 416000, 448000
+	},
+	{	0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer II  */
+		128000, 160000, 192000, 224000, 256000, 320000, 384000
+	},
+	{	0,  32000,  40000,  48000,  56000,  64000,  80000,  96000,  /* Layer III */
+		112000, 128000, 160000, 192000, 224000, 256000, 320000
+	},
+
+	/* MPEG-2 LSF */
+	{	0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer I   */
+		128000, 144000, 160000, 176000, 192000, 224000, 256000
+	},
+	{	0,   8000,  16000,  24000,  32000,  40000,  48000,  56000,  /* Layers    */
+		64000,  80000,  96000, 112000, 128000, 144000, 160000
+	} /* II & III  */
 };
 
 
@@ -1283,15 +1502,15 @@
 
 	if (bitRateIndex == 15) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[MPEG-1/2 Audio] Bitrate index not valid\n"));
-	    return 0;
+		return 0;
 	}
 
 	/*MPEG-1*/
 	if (version & 1)
-	    return bitrate_table[layer - 1][bitRateIndex];
+		return bitrate_table[layer - 1][bitRateIndex];
 	/*MPEG-2/2.5*/
 	else
-	    return bitrate_table[3 + (layer >> 1)][bitRateIndex];
+		return bitrate_table[3 + (layer >> 1)][bitRateIndex];
 }
 
 
@@ -1312,7 +1531,7 @@
 		frameSize = (( 12 * bitrate / samplerate) + pad) * 4;
 	} else {
 		u32 slots_per_frame = 144;
-	    if ((layer == 3) && !(version & 1)) slots_per_frame = 72;
+		if ((layer == 3) && !(version & 1)) slots_per_frame = 72;
 		frameSize = (slots_per_frame * bitrate / samplerate) + pad;
 	}
 	return (u16) frameSize;
@@ -1336,8 +1555,8 @@
 		}
 		if (state==2) {
 			if (((b & 0xF0) == 0) || ((b & 0xF0) == 0xF0) || ((b & 0x0C) == 0x0C)) {
-				if (bytes[1] == 0xFF) state = 1; 
-				else state = 0; 
+				if (bytes[1] == 0xFF) state = 1;
+				else state = 0;
 			} else {
 				bytes[state] = b;
 				state = 3;
@@ -1387,7 +1606,7 @@
 
 		if (state==3) {
 			u32 val;
-			bytes[state] = b; 
+			bytes[state] = b;
 			val = GF_4CC(bytes[0], bytes[1], bytes[2], bytes[3]);
 			if (gf_mp3_frame_size(val)) {
 				*pos = dropped;
@@ -1399,7 +1618,7 @@
 		if (state==2) {
 			if (((b & 0xF0) == 0) || ((b & 0xF0) == 0xF0) || ((b & 0x0C) == 0x0C)) {
 				if (bytes[1] == 0xFF) {
-					state = 1; 
+					state = 1;
 					dropped+=1;
 				} else {
 					state = 0;
@@ -1440,16 +1659,26 @@
 const char *gf_avc_get_profile_name(u8 video_prof)
 {
 	switch (video_prof) {
-	case 0x42: return "Baseline";
-	case 0x4D: return "Main";
-	case 0x53: return "Scalable Baseline";
-	case 0x56: return "Scalable High";
-	case 0x58: return "Extended";
-	case 0x64: return "High";
-	case 0x6E: return "High 10";
-	case 0x7A: return "High 4:2:2";
-	case 0x90: return "High 4:4:4";
-	default: return "Unknown";
+	case 0x42:
+		return "Baseline";
+	case 0x4D:
+		return "Main";
+	case 0x53:
+		return "Scalable Baseline";
+	case 0x56:
+		return "Scalable High";
+	case 0x58:
+		return "Extended";
+	case 0x64:
+		return "High";
+	case 0x6E:
+		return "High 10";
+	case 0x7A:
+		return "High 4:2:2";
+	case 0x90:
+		return "High 4:4:4";
+	default:
+		return "Unknown";
 	}
 }
 
@@ -1457,10 +1686,14 @@
 const char *gf_hevc_get_profile_name(u8 video_prof)
 {
 	switch (video_prof) {
-	case 0x01: return "Main";
-	case 0x02: return "Main 10";
-	case 0x03: return "Main Still Picture";
-	default: return "Unknown";
+	case 0x01:
+		return "Main";
+	case 0x02:
+		return "Main 10";
+	case 0x03:
+		return "Main Still Picture";
+	default:
+		return "Unknown";
 	}
 }
 
@@ -1468,21 +1701,21 @@
 
 
 static u8 avc_golomb_bits[256] = {
-	8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 
-	3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+	8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3,
+	3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0
 };
 
@@ -1507,7 +1740,7 @@
 	return gf_bs_read_int(bs, bits + 1) - 1;
 }
 
-static s32 bs_get_se(GF_BitStream *bs) 
+static s32 bs_get_se(GF_BitStream *bs)
 {
 	u32 v = bs_get_ue(bs);
 	if ((v & 0x1) == 0) return (s32) (0 - (v>>1));
@@ -1535,15 +1768,15 @@
 
 /*read that amount of data at each IO access rather than fetching byte by byte...*/
 #define AVC_CACHE_SIZE	4096
-GF_EXPORT
-u32 gf_media_nalu_next_start_code_bs(GF_BitStream *bs)
+
+static u32 gf_media_nalu_locate_start_code_bs(GF_BitStream *bs, Bool locate_trailing)
 {
 	u32 v, bpos;
 	char avc_cache[AVC_CACHE_SIZE];
 	u64 end, cache_start, load_size;
 	u64 start = gf_bs_get_position(bs);
 	if (start<3) return 0;
-	
+
 	load_size = 0;
 	bpos = 0;
 	cache_start = 0;
@@ -1561,6 +1794,10 @@
 		}
 		v = ( (v<<8) & 0xFFFFFF00) | ((u32) avc_cache[bpos]);
 		bpos++;
+		if (locate_trailing) {
+			if ( (v & 0x00FFFFFF) == 0x00000000) end = cache_start+bpos-3;
+		}
+
 		if (v == 0x00000001) end = cache_start+bpos-4;
 		else if ( (v & 0x00FFFFFF) == 0x00000001) end = cache_start+bpos-3;
 	}
@@ -1570,17 +1807,29 @@
 }
 
 GF_EXPORT
+u32 gf_media_nalu_next_start_code_bs(GF_BitStream *bs)
+{
+	return gf_media_nalu_locate_start_code_bs(bs, 0);
+}
+
+GF_EXPORT
+u32 gf_media_nalu_payload_end_bs(GF_BitStream *bs)
+{
+	return gf_media_nalu_locate_start_code_bs(bs, 1);
+}
+
+GF_EXPORT
 u32 gf_media_nalu_next_start_code(u8 *data, u32 data_len, u32 *sc_size)
 {
 	u32 v, bpos;
 	u32 end;
-	
+
 	bpos = 0;
 	end = 0;
 	v = 0xffffffff;
 	while (!end) {
 		/*refill cache*/
-		if (bpos == (u32) data_len) 
+		if (bpos == (u32) data_len)
 			break;
 
 		v = ( (v<<8) & 0xFFFFFF00) | ((u32) data[bpos]);
@@ -1600,20 +1849,20 @@
 	return (u32) (end);
 }
 
-Bool gf_media_avc_slice_is_intra(AVCState *avc) 
+Bool gf_media_avc_slice_is_intra(AVCState *avc)
 {
 	switch (avc->s_info.slice_type) {
-		case GF_AVC_TYPE_I:
-		case GF_AVC_TYPE2_I:
-		case GF_AVC_TYPE_SI:
-		case GF_AVC_TYPE2_SI:
-			return 1;
-		default:
-			return 0;
+	case GF_AVC_TYPE_I:
+	case GF_AVC_TYPE2_I:
+	case GF_AVC_TYPE_SI:
+	case GF_AVC_TYPE2_SI:
+		return 1;
+	default:
+		return 0;
 	}
 }
 
-Bool gf_media_avc_slice_is_IDR(AVCState *avc) 
+Bool gf_media_avc_slice_is_IDR(AVCState *avc)
 {
 	if (avc->sei.recovery_point.valid)
 	{
@@ -1625,7 +1874,9 @@
 	return gf_media_avc_slice_is_intra(avc);
 }
 
-static const struct { u32 w, h; } avc_sar[14] =
+static const struct {
+	u32 w, h;
+} avc_sar[14] =
 {
 	{ 0,   0 }, { 1,   1 }, { 12, 11 }, { 10, 11 },
 	{ 16, 11 }, { 40, 33 }, { 24, 11 }, { 20, 11 },
@@ -1664,7 +1915,7 @@
 {
 	u32 i = 0, emulation_bytes_count = 0;
 	u8 num_zero = 0;
-	
+
 	while (i < nal_size) {
 		/*ISO 14496-10: "Within the NAL unit, any four-byte sequence that starts with 0x000003
 		other than the following sequences shall not occur at any byte-aligned position:
@@ -1688,12 +1939,12 @@
 	return emulation_bytes_count;
 }
 
-static u32 avc_add_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size) 
-{ 
+static u32 avc_add_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size)
+{
 
 	u32 i = 0, emulation_bytes_count = 0;
 	u8 num_zero = 0;
-	
+
 	while (i < nal_size) {
 		/*ISO 14496-10: "Within the NAL unit, any four-byte sequence that starts with 0x000003
 		other than the following sequences shall not occur at any byte-aligned position:
@@ -1737,9 +1988,9 @@
 		  \96 0x00000303"
 		*/
 		if (num_zero == 2
-			&& buffer[i] == 0x03
-			&& i+1 < nal_size /*next byte is readable*/
-			&& buffer[i+1] < 0x04)
+		        && buffer[i] == 0x03
+		        && i+1 < nal_size /*next byte is readable*/
+		        && buffer[i+1] < 0x04)
 		{
 			/*emulation code found*/
 			num_zero = 0;
@@ -1760,26 +2011,26 @@
 #endif /*GPAC_UNUSED_FUNC*/
 
 /*nal_size is updated to allow better error detection*/
-static u32 avc_remove_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size) 
-{ 
+static u32 avc_remove_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size)
+{
 	u32 i = 0, emulation_bytes_count = 0;
-	u8 num_zero = 0; 
+	u8 num_zero = 0;
 
-	while (i < nal_size) 
-	{ 
-		/*ISO 14496-10: "Within the NAL unit, any four-byte sequence that starts with 0x000003 
-		  other than the following sequences shall not occur at any byte-aligned position: 
-		  0x00000300 
-		  0x00000301 
-		  0x00000302 
-		  0x00000303" 
-		*/ 
-		if (num_zero == 2 
-			&& buffer_src[i] == 0x03 
-			&& i+1 < nal_size /*next byte is readable*/ 
-			&& buffer_src[i+1] < 0x04) 
-		{ 
-			/*emulation code found*/ 
+	while (i < nal_size)
+	{
+		/*ISO 14496-10: "Within the NAL unit, any four-byte sequence that starts with 0x000003
+		  other than the following sequences shall not occur at any byte-aligned position:
+		  0x00000300
+		  0x00000301
+		  0x00000302
+		  0x00000303"
+		*/
+		if (num_zero == 2
+		        && buffer_src[i] == 0x03
+		        && i+1 < nal_size /*next byte is readable*/
+		        && buffer_src[i+1] < 0x04)
+		{
+			/*emulation code found*/
 			num_zero = 0;
 			emulation_bytes_count++;
 			i++;
@@ -1787,16 +2038,16 @@
 
 		buffer_dst[i-emulation_bytes_count] = buffer_src[i];
 
-		if (!buffer_src[i]) 
-			num_zero++; 
-		else 
-			num_zero = 0; 
-
-		i++; 
-	} 
-	
-	return nal_size-emulation_bytes_count; 
-} 
+		if (!buffer_src[i])
+			num_zero++;
+		else
+			num_zero = 0;
+
+		i++;
+	}
+
+	return nal_size-emulation_bytes_count;
+}
 
 GF_EXPORT
 s32 gf_media_avc_read_sps(const char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
@@ -1831,7 +2082,7 @@
 	level_idc = gf_bs_read_int(bs, 8);
 
 	/*SubsetSps is used to be sure that AVC SPS are not going to be scratched
-	by subset SPS. According to the SVC standard, subset SPS can have the same sps_id 
+	by subset SPS. According to the SVC standard, subset SPS can have the same sps_id
 	than its base layer, but it does not refer to the same SPS. */
 	sps_id = bs_get_ue(bs) + GF_SVC_SSPS_ID_SHIFT * subseq_sps;
 	if (sps_id >=32) {
@@ -1843,7 +2094,7 @@
 	sps = &avc->sps[sps_id];
 	sps->state |= subseq_sps ? AVC_SUBSPS_PARSED : AVC_SPS_PARSED;
 
-	/*High Profile and SVC*/	
+	/*High Profile and SVC*/
 	switch (profile_idc) {
 	case 100:
 	case 110:
@@ -1889,8 +2140,8 @@
 			}
 		}
 		break;
-	}	
-	
+	}
+
 	sps->profile_idc = profile_idc;
 	sps->level_idc = level_idc;
 	sps->prof_compat = pcomp;
@@ -1927,7 +2178,7 @@
 	if (!sps->frame_mbs_only_flag) gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 1); /*direct_8x8_inference_flag*/
 	cl = cr = ct = cb = 0;
-	if (gf_bs_read_int(bs, 1)) /*crop*/ {
+	if (gf_bs_read_int(bs, 1)) { /*crop*/
 		cl = bs_get_ue(bs); /*crop_left*/
 		cr = bs_get_ue(bs); /*crop_right*/
 		ct = bs_get_ue(bs); /*crop_top*/
@@ -1956,10 +2207,10 @@
 		if(gf_bs_read_int(bs, 1))		/* overscan_info_present_flag */
 			gf_bs_read_int(bs, 1);		/* overscan_appropriate_flag */
 
-		if (gf_bs_read_int(bs, 1)){		/* video_signal_type_present_flag */
+		if (gf_bs_read_int(bs, 1)) {		/* video_signal_type_present_flag */
 			gf_bs_read_int(bs, 3);		/* video_format */
 			gf_bs_read_int(bs, 1);		/* video_full_range_flag */
-			if (gf_bs_read_int(bs, 1)){ /* colour_description_present_flag */
+			if (gf_bs_read_int(bs, 1)) { /* colour_description_present_flag */
 				gf_bs_read_int(bs, 8);  /* colour_primaries */
 				gf_bs_read_int(bs, 8);  /* transfer_characteristics */
 				gf_bs_read_int(bs, 8);  /* matrix_coefficients */
@@ -2000,7 +2251,7 @@
 
 			/*inter_layer_deblocking_filter_control_present_flag=*/	gf_bs_read_int(bs, 1);
 			extended_spatial_scalability_idc = gf_bs_read_int(bs, 2);
-			if (ChromaArrayType == 1 || ChromaArrayType == 2) {		
+			if (ChromaArrayType == 1 || ChromaArrayType == 2) {
 				/*chroma_phase_x_plus1_flag*/ gf_bs_read_int(bs, 1);
 			}
 			if( ChromaArrayType  ==  1 ) {
@@ -2012,7 +2263,7 @@
 					/*seq_ref_layer_chroma_phase_y_plus1*/gf_bs_read_int(bs, 2);
 				}
 				/*seq_scaled_ref_layer_left_offset*/ bs_get_se(bs);
-				/*seq_scaled_ref_layer_top_offset*/bs_get_se(bs); 
+				/*seq_scaled_ref_layer_top_offset*/bs_get_se(bs);
 				/*seq_scaled_ref_layer_right_offset*/bs_get_se(bs);
 				/*seq_scaled_ref_layer_bottom_offset*/bs_get_se(bs);
 			}
@@ -2056,7 +2307,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] MVC not supported - skipping parsing end of Subset SPS\n"));
 			goto exit;
 		}
-	
+
 		if (gf_bs_read_int(bs, 1)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] skipping parsing end of Subset SPS (additional_extension2)\n"));
 			goto exit;
@@ -2095,7 +2346,7 @@
 		goto exit;
 	}
 	pps = &avc->pps[pps_id];
-   
+
 	if (!pps->status) pps->status = 1;
 	pps->sps_id = bs_get_ue(bs);
 	if (pps->sps_id >= 32) {
@@ -2118,7 +2369,7 @@
 	/*
 	if ((pps->ref_count[0] > 32) || (pps->ref_count[1] > 32)) goto exit;
 	*/
-	
+
 	/*pps->weighted_pred = */gf_bs_read_int(bs, 1);
 	/*pps->weighted_bipred_idc = */gf_bs_read_int(bs, 2);
 	/*pps->init_qp = */bs_get_se(bs) /*+ 26*/;
@@ -2145,7 +2396,7 @@
 	spse_data_without_emulation_bytes = gf_malloc(spse_size*sizeof(char));
 	spse_data_without_emulation_bytes_size = avc_remove_emulation_bytes(spse_data, spse_data_without_emulation_bytes, spse_size);
 	bs = gf_bs_new(spse_data_without_emulation_bytes, spse_data_without_emulation_bytes_size, GF_BITSTREAM_READ);
-	
+
 	/*nal header*/gf_bs_read_u8(bs);
 
 	sps_id = bs_get_ue(bs);
@@ -2171,7 +2422,7 @@
 	return 1;
 }
 
-static s32 avc_parse_slice(GF_BitStream *bs, AVCState *avc, Bool svc_idr_flag, AVCSliceInfo *si) 
+static s32 avc_parse_slice(GF_BitStream *bs, AVCState *avc, Bool svc_idr_flag, AVCSliceInfo *si)
 {
 	s32 pps_id;
 
@@ -2198,7 +2449,7 @@
 	}
 	if ((si->nal_unit_type==GF_AVC_NALU_IDR_SLICE) || svc_idr_flag)
 		si->idr_pic_id = bs_get_ue(bs);
-   
+
 	if (si->sps->poc_type==0) {
 		si->poc_lsb = gf_bs_read_int(bs, si->sps->log2_max_poc_lsb);
 		if (si->pps->pic_order_present && !si->field_pic_flag) {
@@ -2216,7 +2467,7 @@
 }
 
 
-static s32 svc_parse_slice(GF_BitStream *bs, AVCState *avc, AVCSliceInfo *si) 
+static s32 svc_parse_slice(GF_BitStream *bs, AVCState *avc, AVCSliceInfo *si)
 {
 	s32 pps_id;
 
@@ -2233,7 +2484,7 @@
 	if (!si->pps->slice_group_count)
 		return -2;
 	si->sps = &avc->sps[si->pps->sps_id + GF_SVC_SSPS_ID_SHIFT];
-	if (!si->sps->log2_max_frame_num) 
+	if (!si->sps->log2_max_frame_num)
 		return -2;
 
 	si->frame_num = gf_bs_read_int(bs, si->sps->log2_max_frame_num);
@@ -2247,10 +2498,10 @@
 	}
 	if (si->nal_unit_type == GF_AVC_NALU_IDR_SLICE || si ->NalHeader.idr_pic_flag)
 		si->idr_pic_id = bs_get_ue(bs);
-   
+
 	if (si->sps->poc_type==0) {
 		si->poc_lsb = gf_bs_read_int(bs, si->sps->log2_max_poc_lsb);
- 	if (si->pps->pic_order_present && !si->field_pic_flag) {
+		if (si->pps->pic_order_present && !si->field_pic_flag) {
 			si->delta_poc_bottom = bs_get_se(bs);
 		}
 	} else if ((si->sps->poc_type==1) && !si->sps->delta_pic_order_always_zero_flag) {
@@ -2265,7 +2516,7 @@
 }
 
 
-static s32 avc_parse_recovery_point_sei(GF_BitStream *bs, AVCState *avc) 
+static s32 avc_parse_recovery_point_sei(GF_BitStream *bs, AVCState *avc)
 {
 	AVCSeiRecoveryPoint *rp = &avc->sei.recovery_point;
 
@@ -2279,7 +2530,7 @@
 }
 
 /*for interpretation see ISO 14496-10 N.11084, table D-1*/
-static s32 avc_parse_pic_timing_sei(GF_BitStream *bs, AVCState *avc) 
+static s32 avc_parse_pic_timing_sei(GF_BitStream *bs, AVCState *avc)
 {
 	int i;
 	int sps_id = avc->sps_active_idx;
@@ -2365,18 +2616,18 @@
 		else
 			si->frame_num_offset = si->frame_num_offset_prev;
 	}
-	
+
 	/*ISO 14496-10 N.11084 8.2.1.1*/
 	if (si->sps->poc_type==0)
 	{
 		const u32 max_poc_lsb = 1 << (si->sps->log2_max_poc_lsb);
-		
+
 		/*ISO 14496-10 N.11084 eq (8-3)*/
 		if ((si->poc_lsb < si->poc_lsb_prev) &&
-		(si->poc_lsb_prev - si->poc_lsb >= max_poc_lsb / 2) )
+		        (si->poc_lsb_prev - si->poc_lsb >= max_poc_lsb / 2) )
 			si->poc_msb = si->poc_msb_prev + max_poc_lsb;
 		else if ((si->poc_lsb > si->poc_lsb_prev) &&
-		(si->poc_lsb - si->poc_lsb_prev > max_poc_lsb / 2))
+		         (si->poc_lsb - si->poc_lsb_prev > max_poc_lsb / 2))
 			si->poc_msb = si->poc_msb_prev - max_poc_lsb;
 		else
 			si->poc_msb = si->poc_msb_prev;
@@ -2392,7 +2643,7 @@
 			else
 				field_poc[1] = si->poc_msb + si->poc_lsb;
 		}
-	} 
+	}
 	/*ISO 14496-10 N.11084 8.2.1.2*/
 	else if (si->sps->poc_type==1)
 	{
@@ -2426,7 +2677,7 @@
 		field_poc[0] = expected_poc + si->delta_poc[0];
 		field_poc[1] = field_poc[0] + si->sps->offset_for_top_to_bottom_field;
 		if (pic_type == AVC_PIC_FRAME) field_poc[1] += si->delta_poc[1];
-	} 
+	}
 	/*ISO 14496-10 N.11084 8.2.1.3*/
 	else if (si->sps->poc_type== 2)
 	{
@@ -2462,7 +2713,7 @@
 	memcpy(&n_state, &avc->s_info, sizeof(AVCSliceInfo));
 	n_state.nal_unit_type = nal_hdr & 0x1F;
 	n_state.nal_ref_idc = (nal_hdr>>5) & 0x3;
-	
+
 	idr_flag = 0;
 	ret = 0;
 	switch (n_state.nal_unit_type) {
@@ -2481,7 +2732,7 @@
 			n_state.poc_lsb_prev = avc->s_info.poc_lsb;
 			n_state.poc_msb_prev = avc->s_info.poc_msb;
 		}
-		if (slice) 
+		if (slice)
 			avc_compute_poc(&n_state);
 
 		if (avc->s_info.poc != n_state.poc) {
@@ -2506,16 +2757,22 @@
 		if (ret<0) return ret;
 		ret = 0;
 		if (
-			((avc->s_info.nal_unit_type > GF_AVC_NALU_IDR_SLICE) || (avc->s_info.nal_unit_type < GF_AVC_NALU_NON_IDR_SLICE)) 
-			&& (avc->s_info.nal_unit_type != GF_AVC_NALU_SVC_SLICE)
+		    ((avc->s_info.nal_unit_type > GF_AVC_NALU_IDR_SLICE) || (avc->s_info.nal_unit_type < GF_AVC_NALU_NON_IDR_SLICE))
+		    && (avc->s_info.nal_unit_type != GF_AVC_NALU_SVC_SLICE)
 		) {
 			break;
 		}
-		if (avc->s_info.frame_num != n_state.frame_num) { ret = 1; break; }
+		if (avc->s_info.frame_num != n_state.frame_num) {
+			ret = 1;
+			break;
+		}
 
-		if (avc->s_info.field_pic_flag != n_state.field_pic_flag) { ret = 1; break; }
+		if (avc->s_info.field_pic_flag != n_state.field_pic_flag) {
+			ret = 1;
+			break;
+		}
 		if ((avc->s_info.nal_ref_idc != n_state.nal_ref_idc) &&
-			(!avc->s_info.nal_ref_idc || !n_state.nal_ref_idc)) {
+		        (!avc->s_info.nal_ref_idc || !n_state.nal_ref_idc)) {
 			ret = 1;
 			break;
 		}
@@ -2523,8 +2780,8 @@
 
 		if (avc->s_info.sps->poc_type == n_state.sps->poc_type) {
 			if (!avc->s_info.sps->poc_type) {
-				if (!n_state.bottom_field_flag && (avc->s_info.poc_lsb != n_state.poc_lsb)) { 
-					ret = 1; 
+				if (!n_state.bottom_field_flag && (avc->s_info.poc_lsb != n_state.poc_lsb)) {
+					ret = 1;
 					break;
 				}
 				if (avc->s_info.delta_poc_bottom != n_state.delta_poc_bottom) {
@@ -2566,10 +2823,10 @@
 			ret = 1;
 		else if ((nal_hdr & 0x1F) == GF_AVC_NALU_SEQ_PARAM && avc -> s_info .nal_unit_type == GF_AVC_NALU_SVC_SLICE)
 			ret = 1;
-		else 
+		else
 			ret = 0;
 		break;
-	} 
+	}
 
 	/* save _prev values */
 	if (ret && avc->s_info.sps) {
@@ -2641,26 +2898,26 @@
 			assert(start+psize+1 < nal_size+1);
 			prev = sei_without_emulation_bytes[start+psize+1];
 			sei_without_emulation_bytes[start+psize+1] = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[avc-h264] SEI user message %s\n", sei_without_emulation_bytes+start+16)); 
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[avc-h264] SEI user message %s\n", sei_without_emulation_bytes+start+16));
 			sei_without_emulation_bytes[start+psize+1] = prev;
 		}
-			break;
-		
+		break;
+
 		case 6: /*recovery point*/
-			{
-				GF_BitStream *rp_bs = gf_bs_new(sei_without_emulation_bytes + start, psize, GF_BITSTREAM_READ);
-				avc_parse_recovery_point_sei(rp_bs, avc);
-				gf_bs_del(rp_bs);
-			}
-			break;
+		{
+			GF_BitStream *rp_bs = gf_bs_new(sei_without_emulation_bytes + start, psize, GF_BITSTREAM_READ);
+			avc_parse_recovery_point_sei(rp_bs, avc);
+			gf_bs_del(rp_bs);
+		}
+		break;
 
 		case 1: /*pic_timing*/
-			{
-				GF_BitStream *pt_bs = gf_bs_new(sei_without_emulation_bytes + start, psize, GF_BITSTREAM_READ);
-				avc_parse_pic_timing_sei(pt_bs, avc);
-				gf_bs_del(pt_bs);
-			}
-			break;
+		{
+			GF_BitStream *pt_bs = gf_bs_new(sei_without_emulation_bytes + start, psize, GF_BITSTREAM_READ);
+			avc_parse_pic_timing_sei(pt_bs, avc);
+			gf_bs_del(pt_bs);
+		}
+		break;
 
 		case 0: /*buffering period*/
 		case 2: /*pan scan rect*/
@@ -2692,7 +2949,8 @@
 			var = psize;
 			while (var>=255) {
 				new_buffer[written] = (char) 0xff;
-				written++; var-=255;
+				written++;
+				var-=255;
 			}
 			new_buffer[written] = (char) var;
 			written++;
@@ -2886,7 +3144,7 @@
 	}
 	/*nal hdr*/ gf_bs_read_int(bs, 8);
 
-	*pps_id = bs_get_ue(bs);  
+	*pps_id = bs_get_ue(bs);
 	*sps_id = bs_get_ue(bs);
 
 exit:
@@ -2912,29 +3170,29 @@
 	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
 	case GF_HEVC_NALU_SLICE_IDR_N_LP:
 	case GF_HEVC_NALU_SLICE_CRA:
-		return 1;
+		return GF_TRUE;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
-Bool gf_media_hevc_slice_is_IDR(HEVCState *hevc) 
+Bool gf_media_hevc_slice_is_IDR(HEVCState *hevc)
 {
 	if (hevc->sei.recovery_point.valid)
 	{
 		hevc->sei.recovery_point.valid = 0;
-		return 1;
+		return GF_TRUE;
 	}
 	switch (hevc->s_info.nal_unit_type) {
 	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
 	case GF_HEVC_NALU_SLICE_IDR_N_LP:
-		return 1;
+		return GF_TRUE;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
-static Bool parse_short_term_ref_pic_set(GF_BitStream *bs, HEVC_SPS *sps, u32 idx_rps) 
+static Bool parse_short_term_ref_pic_set(GF_BitStream *bs, HEVC_SPS *sps, u32 idx_rps)
 {
 	u32 i;
 	Bool inter_ref_pic_set_prediction_flag = 0;
@@ -2948,7 +3206,7 @@
 		u32 delta_rps_sign;
 		u32 abs_delta_rps_minus1, nb_ref_pics;
 		s32 deltaRPS;
-	    u32 k = 0, k0 = 0, k1 = 0;
+		u32 k = 0, k0 = 0, k1 = 0;
 		if (idx_rps == sps->num_short_term_ref_pic_sets)
 			delta_idx_minus1 = bs_get_ue(bs);
 
@@ -2971,14 +3229,14 @@
 			}
 			if ((ref_idc==1) || (ref_idc== 2)) {
 				s32 deltaPOC = deltaRPS;
-				if (i < nb_ref_pics) 
+				if (i < nb_ref_pics)
 					deltaPOC += ref_ps->delta_poc[i];
-				
+
 				rps->delta_poc[k] = deltaPOC;
 
 				if (deltaPOC < 0)  k0++;
 				else k1++;
-				
+
 				k++;
 			}
 		}
@@ -3007,7 +3265,7 @@
 }
 
 #define PARSE_FULL_HEADER	0
-static s32 hevc_parse_slice_segment(GF_BitStream *bs, HEVCState *hevc, HEVCSliceInfo *si) 
+s32 hevc_parse_slice_segment(GF_BitStream *bs, HEVCState *hevc, HEVCSliceInfo *si)
 {
 #if PARSE_FULL_HEADER
 	u32 i, j;
@@ -3015,22 +3273,22 @@
 	HEVC_PPS *pps;
 	HEVC_SPS *sps;
 	s32 pps_id;
-	Bool RapPicFlag = 0;
-	Bool IDRPicFlag = 0;
-	
+	Bool RapPicFlag = GF_FALSE;
+	Bool IDRPicFlag = GF_FALSE;
+
 	si->first_slice_segment_in_pic_flag = gf_bs_read_int(bs, 1);
 
 	switch (si->nal_unit_type) {
 	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
 	case GF_HEVC_NALU_SLICE_IDR_N_LP:
-		IDRPicFlag = 1;
-		RapPicFlag = 1;
+		IDRPicFlag = GF_TRUE;
+		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 = 1;
+		RapPicFlag = GF_TRUE;
 		break;
 	}
 
@@ -3048,7 +3306,7 @@
 	if (!si->first_slice_segment_in_pic_flag && pps->dependent_slice_segments_enabled_flag) {
 		si->dependent_slice_segment_flag = gf_bs_read_int(bs, 1);
 	} else {
-		si->dependent_slice_segment_flag = 0;
+		si->dependent_slice_segment_flag = GF_FALSE;
 	}
 
 	if (!si->first_slice_segment_in_pic_flag) {
@@ -3056,12 +3314,12 @@
 	} else {
 		si->slice_segment_address = 0;
 	}
-	
+
 	if( !si->dependent_slice_segment_flag ) {
 #if PARSE_FULL_HEADER
 		Bool deblocking_filter_override_flag=0;
 		Bool slice_temporal_mvp_enabled_flag = 0;
-        Bool slice_sao_luma_flag=0;
+		Bool slice_sao_luma_flag=0;
 		Bool slice_sao_chroma_flag=0;
 		Bool slice_deblocking_filter_disabled_flag=0;
 #endif
@@ -3073,7 +3331,7 @@
 
 		if(pps->output_flag_present_flag)
 			/*pic_output_flag = */gf_bs_read_int(bs, 1);
-		
+
 		if (sps->separate_colour_plane_flag == 1)
 			/*colour_plane_id = */gf_bs_read_int(bs, 2);
 
@@ -3090,57 +3348,57 @@
 				Bool ret = parse_short_term_ref_pic_set(bs, sps, sps->num_short_term_ref_pic_sets );
 				if (!ret) return 0;
 			} else if( sps->num_short_term_ref_pic_sets > 1 ) {
-                u32 numbits = 0;
-                s32 short_term_ref_pic_set_idx;
-                while ( (u32) (1 << numbits) < sps->num_short_term_ref_pic_sets)
-                    numbits++;
-                if (numbits > 0)
-                    short_term_ref_pic_set_idx = gf_bs_read_int(bs, numbits);
-                else
-                    short_term_ref_pic_set_idx = 0;
+				u32 numbits = 0;
+				s32 short_term_ref_pic_set_idx;
+				while ( (u32) (1 << numbits) < sps->num_short_term_ref_pic_sets)
+					numbits++;
+				if (numbits > 0)
+					short_term_ref_pic_set_idx = gf_bs_read_int(bs, numbits);
+				else
+					short_term_ref_pic_set_idx = 0;
 			}
 			if (sps->long_term_ref_pics_present_flag ) {
 				u8 DeltaPocMsbCycleLt[32];
 				u32 num_long_term_sps = 0;
-	            u32 num_long_term_pics = 0;
+				u32 num_long_term_pics = 0;
 				if (sps->num_long_term_ref_pic_sps > 0 ) {
 					num_long_term_sps = bs_get_ue(bs);
 				}
 				num_long_term_pics = bs_get_ue(bs);
 
-                for (i = 0; i < num_long_term_sps + num_long_term_pics; i++ ) {
-                    if( i < num_long_term_sps ) {
-                        u8 lt_idx_sps = 0;
-                        if (sps->num_long_term_ref_pic_sps > 1)
-                            lt_idx_sps = gf_bs_read_int(bs, gf_get_bit_size(sps->num_long_term_ref_pic_sps) );
-                    } else {
-                        /*PocLsbLt[ i ] = */ gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
-                        /*UsedByCurrPicLt[ i ] = */ gf_bs_read_int(bs, 1);
-                    }
-                    if (/*delta_poc_msb_present_flag[ i ] = */ gf_bs_read_int(bs, 1) ) {
-                        if( i == 0 || i == num_long_term_sps )
-                            DeltaPocMsbCycleLt[i] = bs_get_ue(bs);
-                        else
-                            DeltaPocMsbCycleLt[i] = bs_get_ue(bs) + DeltaPocMsbCycleLt[i-1];
+				for (i = 0; i < num_long_term_sps + num_long_term_pics; i++ ) {
+					if( i < num_long_term_sps ) {
+						u8 lt_idx_sps = 0;
+						if (sps->num_long_term_ref_pic_sps > 1)
+							lt_idx_sps = gf_bs_read_int(bs, gf_get_bit_size(sps->num_long_term_ref_pic_sps) );
+					} else {
+						/*PocLsbLt[ i ] = */ gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
+						/*UsedByCurrPicLt[ i ] = */ gf_bs_read_int(bs, 1);
+					}
+					if (/*delta_poc_msb_present_flag[ i ] = */ gf_bs_read_int(bs, 1) ) {
+						if( i == 0 || i == num_long_term_sps )
+							DeltaPocMsbCycleLt[i] = bs_get_ue(bs);
+						else
+							DeltaPocMsbCycleLt[i] = bs_get_ue(bs) + DeltaPocMsbCycleLt[i-1];
 					}
-                }
+				}
 			}
-            if (sps->temporal_mvp_enable_flag)
-                slice_temporal_mvp_enabled_flag = gf_bs_read_int(bs, 1);
+			if (sps->temporal_mvp_enable_flag)
+				slice_temporal_mvp_enabled_flag = gf_bs_read_int(bs, 1);
 		}
-        if (sps->sample_adaptive_offset_enabled_flag) {
-            slice_sao_luma_flag = gf_bs_read_int(bs, 1);
+		if (sps->sample_adaptive_offset_enabled_flag) {
+			slice_sao_luma_flag = gf_bs_read_int(bs, 1);
 			slice_sao_chroma_flag = gf_bs_read_int(bs, 1);
-        }
+		}
 
 		if (si->slice_type == GF_HEVC_TYPE_P || si->slice_type == GF_HEVC_TYPE_B) {
-            //u32 NumPocTotalCurr;
+			//u32 NumPocTotalCurr;
 			u32 num_ref_idx_l0_active, num_ref_idx_l1_active;
 
 			num_ref_idx_l0_active = pps->num_ref_idx_l0_default_active;
 			num_ref_idx_l1_active = 0;
 			if (si->slice_type == GF_HEVC_TYPE_B)
-                num_ref_idx_l1_active = pps->num_ref_idx_l1_default_active;
+				num_ref_idx_l1_active = pps->num_ref_idx_l1_default_active;
 
 			if ( /*num_ref_idx_active_override_flag =*/gf_bs_read_int(bs, 1) ) {
 				num_ref_idx_l0_active = 1 + bs_get_ue(bs);
@@ -3149,7 +3407,7 @@
 			}
 
 //            if (pps->lists_modification_present_flag && NumPocTotalCurr > 1) {
-	            if (pps->lists_modification_present_flag ) {
+			if (pps->lists_modification_present_flag ) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[hehv] ref_pic_lists_modification( ) not implemented\n"));
 				return 0;
 			}
@@ -3163,17 +3421,17 @@
 				Bool collocated_from_l0_flag = 0;
 				if (si->slice_type == GF_HEVC_TYPE_B)
 					collocated_from_l0_flag = gf_bs_read_int(bs, 1);
-				
-				if ( (collocated_from_l0_flag && num_ref_idx_l0_active-1 > 0 ) 
-					|| ( !collocated_from_l0_flag && num_ref_idx_l1_active-1 > 0 )
-				) {
+
+				if ( (collocated_from_l0_flag && num_ref_idx_l0_active-1 > 0 )
+				        || ( !collocated_from_l0_flag && num_ref_idx_l1_active-1 > 0 )
+				   ) {
 					/*collocated_ref_idx=*/bs_get_ue(bs);
 				}
 			}
 
-			if ( (pps->weighted_pred_flag && si->slice_type == GF_HEVC_TYPE_P ) 
-				|| ( pps->weighted_bipred_flag && si->slice_type == GF_HEVC_TYPE_B) 
-			) {
+			if ( (pps->weighted_pred_flag && si->slice_type == GF_HEVC_TYPE_P )
+			        || ( pps->weighted_bipred_flag && si->slice_type == GF_HEVC_TYPE_B)
+			   ) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[hehv] pred_weight_table not implemented\n"));
 				return 0;
 			}
@@ -3196,8 +3454,8 @@
 			}
 		}
 		if( pps->loop_filter_across_slices_enabled_flag
-			&& ( slice_sao_luma_flag || slice_sao_chroma_flag || !slice_deblocking_filter_disabled_flag )
-		) {
+		        && ( slice_sao_luma_flag || slice_sao_chroma_flag || !slice_deblocking_filter_disabled_flag )
+		  ) {
 			/*slice_loop_filter_across_slices_enabled_flag = */gf_bs_read_int(bs, 1);
 		}
 	}
@@ -3206,22 +3464,22 @@
 	if (pps->tiles_enabled_flag || pps->entropy_coding_sync_enabled_flag ) {
 		u32 num_entry_point_offsets = bs_get_ue(bs);
 		if ( num_entry_point_offsets > 0) {
-            u32 offset = bs_get_ue(bs) + 1;
-            u32 segments = offset >> 4;
-            s32 remain = (offset & 15);
+			u32 offset = bs_get_ue(bs) + 1;
+			u32 segments = offset >> 4;
+			s32 remain = (offset & 15);
 
 			for (i=0; i<num_entry_point_offsets; i++) {
-                u32 res = 0;
-                for (j=0; j<segments; j++) {
-                    res <<= 16;
-                    res += gf_bs_read_int(bs, 16);
-                }
-                if (remain) {
-                    res <<= remain;
-                    res += gf_bs_read_int(bs, remain);
-                }
-                // entry_point_offset = val + 1; // +1; // +1 to get the size
-            }
+				u32 res = 0;
+				for (j=0; j<segments; j++) {
+					res <<= 16;
+					res += gf_bs_read_int(bs, 16);
+				}
+				if (remain) {
+					res <<= remain;
+					res += gf_bs_read_int(bs, remain);
+				}
+				// entry_point_offset = val + 1; // +1; // +1 to get the size
+			}
 		}
 	}
 #endif //PARSE_FULL_HEADER
@@ -3240,7 +3498,7 @@
 		si->poc_msb_prev = 0;
 		break;
 	}
-	
+
 	if ((si->poc_lsb < si->poc_lsb_prev) && (	si->poc_lsb_prev - si->poc_lsb >= max_poc_lsb / 2) )
 		si->poc_msb = si->poc_msb_prev + max_poc_lsb;
 	else if ((si->poc_lsb > si->poc_lsb_prev) && (si->poc_lsb - si->poc_lsb_prev > max_poc_lsb / 2))
@@ -3276,7 +3534,7 @@
 	}
 	ptl->level_idc = gf_bs_read_int(bs, 8);
 	for (i=0; i<MaxNumSubLayersMinus1; i++) {
-        ptl->sub_ptl[i].profile_present_flag = gf_bs_read_int(bs, 1);
+		ptl->sub_ptl[i].profile_present_flag = gf_bs_read_int(bs, 1);
 		ptl->sub_ptl[i].level_present_flag = gf_bs_read_int(bs, 1);
 	}
 	if (MaxNumSubLayersMinus1>0) {
@@ -3300,11 +3558,11 @@
 
 static u32 scalability_type_to_idx(HEVC_VPS *vps, u32 scalability_type)
 {
-    u32 idx = 0, type;
-    for (type=0; type < scalability_type; type++) {
-        idx += (vps->scalability_mask[type] ? 1 : 0 );
-    }
-    return idx;
+	u32 idx = 0, type;
+	for (type=0; type < scalability_type; type++) {
+		idx += (vps->scalability_mask[type] ? 1 : 0 );
+	}
+	return idx;
 }
 
 #define SHVC_VIEW_ORDER_INDEX  1
@@ -3313,26 +3571,26 @@
 static u32 shvc_get_scalability_id(HEVC_VPS *vps, u32 layer_id_in_vps, u32 scalability_type )
 {
 	u32 idx;
-    if (!vps->scalability_mask[scalability_type]) return 0;
+	if (!vps->scalability_mask[scalability_type]) return 0;
 	idx = scalability_type_to_idx(vps, scalability_type);
 	return vps->dimension_id[layer_id_in_vps][idx];
 }
 
 static u32 shvc_get_view_index(HEVC_VPS *vps, u32 id)
 {
-    return shvc_get_scalability_id(vps, vps->layer_id_in_vps[id], SHVC_VIEW_ORDER_INDEX);
+	return shvc_get_scalability_id(vps, vps->layer_id_in_vps[id], SHVC_VIEW_ORDER_INDEX);
 }
 
 static u32 shvc_get_num_views(HEVC_VPS *vps)
 {
-    u32 numViews = 1, i;
+	u32 numViews = 1, i;
 	for (i=0; i<vps->max_layers; i++ ) {
-        u32 layer_id = vps->layer_id_in_nuh[i];
-        if (i>0 && ( shvc_get_view_index( vps, layer_id) != shvc_get_scalability_id( vps, i-1, SHVC_VIEW_ORDER_INDEX) )) {
-            numViews++;
-        }
-    }
-    return numViews;
+		u32 layer_id = vps->layer_id_in_nuh[i];
+		if (i>0 && ( shvc_get_view_index( vps, layer_id) != shvc_get_scalability_id( vps, i-1, SHVC_VIEW_ORDER_INDEX) )) {
+			numViews++;
+		}
+	}
+	return numViews;
 }
 
 static void shvc_parse_rep_format(HEVC_RepFormat *fmt, GF_BitStream *bs)
@@ -3340,9 +3598,9 @@
 	u8 chroma_bitdepth_present_flag = gf_bs_read_int(bs, 1);
 	fmt->pic_width_luma_samples = gf_bs_read_int(bs, 16);
 	fmt->pic_height_luma_samples = gf_bs_read_int(bs, 16);
-    if (chroma_bitdepth_present_flag) {
+	if (chroma_bitdepth_present_flag) {
 		fmt->chroma_format_idc = gf_bs_read_int(bs, 2);
-		
+
 		if (fmt->chroma_format_idc == 3)
 			fmt->separate_colour_plane_flag = gf_bs_read_int(bs, 1);
 		fmt->bit_depth_luma = 1 + gf_bs_read_int(bs, 4);
@@ -3370,16 +3628,16 @@
 		dimension_id_len[i] = 1 + gf_bs_read_int(bs, 3);
 	}
 
-    vps->layer_id_in_nuh[0] = 0;
-    vps->layer_id_in_vps[0] = 0;
+	vps->layer_id_in_nuh[0] = 0;
+	vps->layer_id_in_vps[0] = 0;
 	vps_nuh_layer_id_present_flag = gf_bs_read_int(bs, 1);
 	for (i=1; i<vps->max_layers; i++) {
 		if (vps_nuh_layer_id_present_flag) {
 			vps->layer_id_in_nuh[i] = gf_bs_read_int(bs, 6);
 		} else {
-            vps->layer_id_in_nuh[i] = i;
+			vps->layer_id_in_nuh[i] = i;
 		}
-        vps->layer_id_in_vps[vps->layer_id_in_nuh[i]] = i;
+		vps->layer_id_in_vps[vps->layer_id_in_nuh[i]] = i;
 
 		if (!splitting_flag) {
 			for (j=0; j<NumScalabilityTypes; j++) {
@@ -3389,9 +3647,9 @@
 	}
 
 	view_id_len = gf_bs_read_int(bs, 4);
-    for( i = 0; i < shvc_get_num_views(vps); i++ ){
-        /*m_viewIdVal[i] = */ gf_bs_read_int(bs, view_id_len + 1);
-    }
+	for( i = 0; i < shvc_get_num_views(vps); i++ ) {
+		/*m_viewIdVal[i] = */ gf_bs_read_int(bs, view_id_len + 1);
+	}
 
 	for (i=1; i<vps->max_layers; i++) {
 		for (j=0; j<i; j++) {
@@ -3414,14 +3672,14 @@
 		}
 	}
 	/*all_ref_layers_active_flag*/gf_bs_read_int(bs, 1);
-	
+
 	vps_number_layer_sets = 1+gf_bs_read_int(bs, 10);
 	num_profile_tier_level = 1+gf_bs_read_int(bs, 6);
 
 	for (i=1; i < num_profile_tier_level; i++) {
 		Bool vps_profile_present_flag = gf_bs_read_int(bs, 1);
 		if (!vps_profile_present_flag) {
-            /*vps->profile_ref[i] = */gf_bs_read_int(bs, 6);
+			/*vps->profile_ref[i] = */gf_bs_read_int(bs, 6);
 		}
 		profile_tier_level(bs, vps_profile_present_flag, vps->max_sub_layers-1, &vps->ext_ptl[i-1] );
 	}
@@ -3430,22 +3688,22 @@
 		num_add_output_layer_sets = gf_bs_read_int(bs, 10)+1;
 		NumOutputLayerSets += num_add_output_layer_sets;
 	}
-	
+
 	/*default_one_target_output_layer_flag = 0;*/
 	if (NumOutputLayerSets > 1) {
 		/*default_one_target_output_layer_flag = */gf_bs_read_int(bs, 1);
 	}
 	vps->profile_level_tier_idx[0] = 0;
-	for (i=1; i<NumOutputLayerSets; i++) { 
+	for (i=1; i<NumOutputLayerSets; i++) {
 		u32 nb_bits;
 		if( i > vps->num_layer_sets - 1) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] VPS Extensions: not supported number of layers\n"));
-        }
-        nb_bits = 1;
-        while ((u32) (1 << nb_bits) < num_profile_tier_level) {
-            nb_bits++;
-        }
-        vps->profile_level_tier_idx[i] = gf_bs_read_int(bs, nb_bits);
+		}
+		nb_bits = 1;
+		while ((u32) (1 << nb_bits) < num_profile_tier_level) {
+			nb_bits++;
+		}
+		vps->profile_level_tier_idx[i] = gf_bs_read_int(bs, nb_bits);
 	}
 
 	if (vps->max_layers - 1 > 0 )
@@ -3455,23 +3713,23 @@
 	if (rep_format_idx_present_flag ) {
 		vps->num_rep_formats = 1 + gf_bs_read_int(bs, 8);
 	} else {
-        vps->num_rep_formats = vps->max_layers;
+		vps->num_rep_formats = vps->max_layers;
 	}
 	for (i=0; i<vps->num_rep_formats; i++) {
 		shvc_parse_rep_format(&vps->rep_formats[i], bs);
 	}
-    vps->rep_format_idx[0] = 0;
-    for (i=1; i<vps->max_layers; i++) {
-	    if (rep_format_idx_present_flag) {
+	vps->rep_format_idx[0] = 0;
+	for (i=1; i<vps->max_layers; i++) {
+		if (rep_format_idx_present_flag) {
 			if (vps->num_rep_formats > 1) {
 				vps->rep_format_idx[i] = gf_bs_read_int(bs, 8);
 			} else {
-				vps->rep_format_idx[i] = 0; 
+				vps->rep_format_idx[i] = 0;
 			}
 		} else {
-			vps->rep_format_idx[i] = i; 
+			vps->rep_format_idx[i] = i;
 		}
-    }    
+	}
 	//TODO - we don't use the rest ...
 
 }
@@ -3492,7 +3750,7 @@
 	data_without_emulation_bytes_size = avc_remove_emulation_bytes(data, data_without_emulation_bytes, size);
 	bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	if (!bs) goto exit;
-	
+
 	gf_bs_read_u16(bs);
 
 	vps_id = gf_bs_read_int(bs, 4);
@@ -3513,14 +3771,14 @@
 	profile_tier_level(bs, 1, vps->max_sub_layers-1, &vps->ptl);
 
 	vps_sub_layer_ordering_info_present_flag = gf_bs_read_int(bs, 1);
-	for (i=(vps_sub_layer_ordering_info_present_flag ? 0 : vps->max_sub_layers); i < vps->max_sub_layers; i++) {
+	for (i=(vps_sub_layer_ordering_info_present_flag ? 0 : vps->max_sub_layers - 1); i < vps->max_sub_layers; i++) {
 		/*vps_max_dec_pic_buffering_minus1[i] = */bs_get_ue(bs);
 		/*vps_max_num_reorder_pics[i] = */bs_get_ue(bs);
 		/*vps_max_latency_increase_plus1[i] = */bs_get_ue(bs);
 	}
 	vps->max_layer_id = gf_bs_read_int(bs, 6);
 	vps->num_layer_sets = bs_get_ue(bs) + 1;
-	for (i=1; i < vps->num_layer_sets; i++) { 
+	for (i=1; i < vps->num_layer_sets; i++) {
 		for (j=0; j <= vps->max_layer_id; j++) {
 			/*layer_id_included_flag[ i ][ j ]*/gf_bs_read_int(bs, 1);
 		}
@@ -3536,7 +3794,8 @@
 		for( i = 0; i < vps_num_hrd_parameters; i++ ) {
 			//Bool cprms_present_flag=1;
 			/*hrd_layer_set_idx[ i ] = */bs_get_ue(bs);
-			if (i>0) /*cprms_present_flag = */gf_bs_read_int(bs, 1) ;
+			if (i>0)
+				/*cprms_present_flag = */gf_bs_read_int(bs, 1) ;
 			// hevc_parse_hrd_parameters(cprms_present_flag, vps->max_sub_layers - 1);
 		}
 	}
@@ -3553,7 +3812,9 @@
 	return vps_id;
 }
 
-static const struct { u32 w, h; } hevc_sar[17] =
+static const struct {
+	u32 w, h;
+} hevc_sar[17] =
 {
 	{ 0,   0 }, { 1,   1 }, { 12, 11 }, { 10, 11 },
 	{ 16, 11 }, { 40, 33 }, { 24, 11 }, { 20, 11 },
@@ -3585,7 +3846,7 @@
 	data_without_emulation_bytes_size = avc_remove_emulation_bytes(data, data_without_emulation_bytes, size);
 	bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	if (!bs) goto exit;
-	
+
 	gf_bs_read_int(bs, 7);
 	layer_id = gf_bs_read_int(bs, 6);
 	/*temporal_id = */gf_bs_read_int(bs, 3);
@@ -3596,7 +3857,7 @@
 	}
 
 	memset(&ptl, 0, sizeof(ptl));
-    max_sub_layers_minus1 = 0;
+	max_sub_layers_minus1 = 0;
 	if (layer_id == 0) {
 		max_sub_layers_minus1 = gf_bs_read_int(bs, 3);
 		/*temporal_id_nesting_flag = */gf_bs_read_int(bs, 1);
@@ -3645,10 +3906,25 @@
 	}
 
 	if (gf_bs_read_int(bs, 1)) {
+		u32 SubWidthC, SubHeightC;
+		SubWidthC = SubHeightC = 1;
+		if (sps->chroma_format_idc==1) {
+			SubWidthC = SubHeightC = 2;
+		}
+		else if (sps->chroma_format_idc==2) {
+			SubWidthC = 2;
+			SubHeightC = 1;
+		} else {
+			SubWidthC = SubHeightC = 1;
+		}
+
 		sps->cw_left = bs_get_ue(bs);
 		sps->cw_right = bs_get_ue(bs);
 		sps->cw_top = bs_get_ue(bs);
 		sps->cw_bottom = bs_get_ue(bs);
+
+		sps->width -= SubWidthC * (sps->cw_left + sps->cw_right);
+		sps->height -= SubHeightC * (sps->cw_top + sps->cw_bottom);
 	}
 	if (layer_id == 0) {
 		sps->bit_depth_luma = 8 + bs_get_ue(bs);
@@ -3681,7 +3957,7 @@
 	{
 		depth++;
 	}
-	sps->max_CU_depth = log2_diff_max_min_luma_coding_block_size + depth; 
+	sps->max_CU_depth = log2_diff_max_min_luma_coding_block_size + depth;
 
 	nb_CTUs = ((sps->width + sps->max_CU_width -1) / sps->max_CU_width) * ((sps->height + sps->max_CU_height-1) / sps->max_CU_height);
 	sps->bitsSliceSegmentAddress = 0;
@@ -3690,7 +3966,7 @@
 	}
 
 	scaling_list_enable_flag = gf_bs_read_int(bs, 1);
-	if (scaling_list_enable_flag) { 
+	if (scaling_list_enable_flag) {
 		Bool sps_infer_scaling_list_flag = 0;
 		/*u8 sps_scaling_list_ref_layer_id = 0;*/
 		if (layer_id>0) {
@@ -3715,8 +3991,8 @@
 		/*pcm_loop_filter_disable_flag=*/gf_bs_read_int(bs, 1);
 	}
 	sps->num_short_term_ref_pic_sets = bs_get_ue(bs);
-	for (i=0;i<sps->num_short_term_ref_pic_sets; i++) {
-		Bool ret = parse_short_term_ref_pic_set(bs, sps, i); 
+	for (i=0; i<sps->num_short_term_ref_pic_sets; i++) {
+		Bool ret = parse_short_term_ref_pic_set(bs, sps, i);
 		/*cannot parse short_term_ref_pic_set, skip VUI parsing*/
 		if (!ret) goto exit;
 	}
@@ -3730,12 +4006,12 @@
 	sps->temporal_mvp_enable_flag = gf_bs_read_int(bs, 1);
 	/*strong_intra_smoothing_enable_flag*/gf_bs_read_int(bs, 1);
 
-	if (vui_flag_pos) 
+	if (vui_flag_pos)
 		*vui_flag_pos = (u32) gf_bs_get_bit_offset(bs);
 
 	/*fixme - move to latest syntax*/
 	if (layer_id>0) goto exit;
-	
+
 	if (/*vui_parameters_present_flag*/gf_bs_read_int(bs, 1)) {
 
 		sps->aspect_ratio_info_present_flag = gf_bs_read_int(bs, 1);
@@ -3840,14 +4116,14 @@
 	data_without_emulation_bytes_size = avc_remove_emulation_bytes(data, data_without_emulation_bytes, size);
 	bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	if (!bs) goto exit;
-	
+
 	gf_bs_read_u16(bs);
 
 	pps_id = bs_get_ue(bs);
 
 	if (pps_id>=64) goto exit;
 	pps = &hevc->pps[pps_id];
-   
+
 	if (!pps->state) {
 		pps->id = pps_id;
 		pps->state = 1;
@@ -3881,11 +4157,11 @@
 		pps->num_tile_rows = 1 + bs_get_ue(bs);
 		pps->uniform_spacing_flag = gf_bs_read_int(bs, 1);
 		if (!pps->uniform_spacing_flag ) {
-			for (i=0; i<pps->num_tile_columns; i++) {
+			for (i=0; i<pps->num_tile_columns-1; i++) {
 				pps->column_width[i] = 1 + bs_get_ue(bs);
 			}
-			for (i=0; i<pps->num_tile_rows; i++) {
-				pps->row_height[i] = bs_get_ue(bs);
+			for (i=0; i<pps->num_tile_rows-1; i++) {
+				pps->row_height[i] = 1+bs_get_ue(bs);
 			}
 		}
 		pps->loop_filter_across_tiles_enabled_flag = gf_bs_read_int(bs, 1);
@@ -3919,6 +4195,7 @@
 }
 
 
+GF_EXPORT
 s32 gf_media_hevc_parse_nalu(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
 {
 	u32 reserved;
@@ -3980,7 +4257,7 @@
 		if (ret<0) return ret;
 
 		hevc_compute_poc(&n_state);
-		
+
 		ret = 0;
 
 		if (hevc->s_info.poc != n_state.poc) {
@@ -3994,7 +4271,7 @@
 		return 0;
 	default:
 		break;
-	} 
+	}
 
 	/* save _prev values */
 	if (ret && hevc->s_info.sps) {
@@ -4036,7 +4313,7 @@
 	i=0;
 	spss = NULL;
 	while ((spss = (GF_HEVCParamArray *)gf_list_enum(hvcc->param_array, &i))) {
-		if (spss->type==GF_HEVC_NALU_SEQ_PARAM) 
+		if (spss->type==GF_HEVC_NALU_SEQ_PARAM)
 			break;
 		spss = NULL;
 	}
@@ -4187,35 +4464,36 @@
 		u8 b2 = gf_bs_read_u8(bs);
 		if ((b1 == 0x0b) && (b2==0x77)) {
 			gf_bs_seek(bs, pos-1);
-			return 1;
+			return GF_TRUE;
 		}
 		pos++;
+		b1 = b2;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static const u32 ac3_sizecod_to_bitrate[] = {
-  32000, 40000, 48000, 56000, 64000, 80000, 96000,
-  112000, 128000, 160000, 192000, 224000, 256000,
-  320000, 384000, 448000, 512000, 576000, 640000
+	32000, 40000, 48000, 56000, 64000, 80000, 96000,
+	112000, 128000, 160000, 192000, 224000, 256000,
+	320000, 384000, 448000, 512000, 576000, 640000
 };
 
 static const u32 ac3_sizecod2_to_framesize[] = {
-  96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672,
-  768, 960, 1152, 1344, 1536, 1728, 1920
+	96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672,
+	768, 960, 1152, 1344, 1536, 1728, 1920
 };
 
 static const u32 ac3_sizecod1_to_framesize[] = {
-  69, 87, 104, 121, 139, 174, 208, 243, 278, 348, 417, 487,
-  557, 696, 835, 975, 1114, 1253, 1393
+	69, 87, 104, 121, 139, 174, 208, 243, 278, 348, 417, 487,
+	557, 696, 835, 975, 1114, 1253, 1393
 };
 static const u32 ac3_sizecod0_to_framesize[] = {
-  64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 
-  512, 640, 768, 896, 1024, 1152, 1280
+	64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448,
+	512, 640, 768, 896, 1024, 1152, 1280
 };
 
 static const u32 ac3_mod_to_chans[] = {
-  2, 1, 2, 3, 3, 4, 4, 5
+	2, 1, 2, 3, 3, 4, 4, 5
 };
 
 GF_EXPORT
@@ -4234,77 +4512,39 @@
 
 Bool gf_ac3_parser(u8 *buf, u32 buflen, u32 *pos, GF_AC3Header *hdr, Bool full_parse)
 {
-	u32 fscod, frmsizecod, bsid, ac3_mod, freq, framesize;
-	if (buflen < 6) return 0;
+	GF_BitStream *bs;
+	Bool ret;
+
+	if (buflen < 6) return GF_FALSE;
 	(*pos) = AC3_FindSyncCode(buf, buflen);
-	if (*pos >= buflen) return 0;
+	if (*pos >= buflen) return GF_FALSE;
 
-	buf += (*pos);
-	fscod = (buf[4] >> 6) & 0x3;
-	frmsizecod = (buf[4] & 0x3f);
-	bsid = (buf[5] >> 3) & 0x1f;
-	ac3_mod = (buf[6] >> 5) & 0x7;
-	if (bsid >= 12) return 0;
-
-	if (full_parse && hdr) memset(hdr, 0, sizeof(GF_AC3Header));
-	
-	if (hdr) {
-		hdr->bitrate = ac3_sizecod_to_bitrate[frmsizecod / 2];
-		if (bsid > 8) hdr->bitrate = hdr->bitrate >> (bsid - 8);
-	}
-	switch (fscod) {
-	case 0:
-		freq = 48000;
-		framesize = ac3_sizecod0_to_framesize[frmsizecod / 2] * 2;
-		break;
-	case 1:
-		freq = 44100;
-		framesize = (ac3_sizecod1_to_framesize[frmsizecod / 2] + (frmsizecod & 0x1)) * 2;
-		break;
-	case 2:
-		freq = 32000;
-		framesize = ac3_sizecod2_to_framesize[frmsizecod / 2] * 2;
-		break;
-	default:
-		return 0;
-	}
-	if (hdr) {
-		u16 maskbit, b67;
-		hdr->sample_rate = freq;
-		hdr->framesize = framesize;
+	bs = gf_bs_new((const char*)(buf+*pos), buflen, GF_BITSTREAM_READ);
+	ret = gf_ac3_parser_bs(bs, hdr, full_parse);
+	gf_bs_del(bs);
 
-		hdr->channels = ac3_mod_to_chans[ac3_mod];
-		maskbit = 0x100;
-		if ((ac3_mod & 0x1) && (ac3_mod != 1)) maskbit >>= 2;
-		if (ac3_mod & 0x4) maskbit >>= 2;
-		if (ac3_mod == 0x2) maskbit += 2;
-		b67 = (buf[6] << 8) | buf[7];
-		if ((b67 & maskbit) != 0) hdr->channels += 1;
-	}
-	return 1;
+	return ret;
 }
 
-
 GF_EXPORT
 Bool gf_ac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse)
 {
-	u32 fscod, frmsizecod, bsid, ac3_mod, freq, framesize, bsmod;
+	u32 fscod, frmsizecod, bsid, ac3_mod, freq, framesize, bsmod, syncword;
 	u64 pos;
-	if (!hdr || (gf_bs_available(bs) < 6)) return 0;
-	if (!AC3_FindSyncCodeBS(bs)) return 0;
+	if (!hdr || (gf_bs_available(bs) < 6)) return GF_FALSE;
+	if (!AC3_FindSyncCodeBS(bs)) return GF_FALSE;
 
 	pos = gf_bs_get_position(bs);
-	gf_bs_read_u32(bs);
+
+	syncword = gf_bs_read_u16(bs);
+	assert (syncword == 0x0B77);
+	gf_bs_read_u16(bs); //crc1
 	fscod = gf_bs_read_int(bs, 2);
 	frmsizecod = gf_bs_read_int(bs, 6);
 	bsid = gf_bs_read_int(bs, 5);
 	bsmod = gf_bs_read_int(bs, 3);
 	ac3_mod = gf_bs_read_int(bs, 3);
 
-	if (bsid >= 12) return 0;
-
-	//memset(hdr, 0, sizeof(GF_AC3Header));
-	
 	hdr->bitrate = ac3_sizecod_to_bitrate[frmsizecod / 2];
 	if (bsid > 8) hdr->bitrate = hdr->bitrate >> (bsid - 8);
 
@@ -4322,7 +4562,7 @@
 		framesize = ac3_sizecod2_to_framesize[frmsizecod / 2] * 2;
 		break;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 	hdr->sample_rate = freq;
 	hdr->framesize = framesize;
@@ -4346,9 +4586,116 @@
 		hdr->lfon = 1;
 	}
 
+	gf_bs_seek(bs, pos);
+
+	return GF_TRUE;
+}
+
+GF_EXPORT
+Bool gf_eac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse)
+{
+	u32 fscod, bsid, ac3_mod, freq, framesize, syncword, substreamid, lfon, channels, numblkscod;
+	u64 pos;
+
+restart:
+	if (!hdr || (gf_bs_available(bs) < 6))
+		return GF_FALSE;
+	if (!AC3_FindSyncCodeBS(bs))
+		return GF_FALSE;
+
+	pos = gf_bs_get_position(bs);
+	framesize = 0;
+	numblkscod = 0;
+
+block:
+	syncword = gf_bs_read_u16(bs);
+	assert(syncword == 0x0B77);
+	gf_bs_read_int(bs, 2); //strmtyp
+	substreamid = gf_bs_read_int(bs, 3);
+	framesize += gf_bs_read_int(bs, 11);
+	fscod = gf_bs_read_int(bs, 2);
+	if (fscod == 0x3) {
+		fscod = gf_bs_read_int(bs, 2);
+		numblkscod += 6;
+	} else {
+		numblkscod += gf_bs_read_int(bs, 2);
+	}
+	assert(numblkscod <= 9);
+
+	if ((hdr->substreams >> substreamid) & 0x1) {
+		if (!substreamid) {
+			hdr->framesize = framesize;
+
+			if (numblkscod < 6) { //we need 6 blocks to make a sample
+				gf_bs_seek(bs, pos+2*framesize);
+				if ((gf_bs_available(bs) < 6) || !AC3_FindSyncCodeBS(bs))
+					return GF_FALSE;
+				goto block;
+			}
+
+			gf_bs_seek(bs, pos);
+			return GF_TRUE;
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[E-AC3] Detected sample in substream id=%u. Skipping.\n", substreamid));
+			gf_bs_seek(bs, pos+framesize);
+			goto restart;
+		}
+	}
+	hdr->substreams |= (1 << substreamid);
+
+	switch (fscod) {
+	case 0:
+		freq = 48000;
+		break;
+	case 1:
+		freq = 44100;
+		break;
+	case 2:
+		freq = 32000;
+		break;
+	default:
+		return GF_FALSE;
+	}
+
+	ac3_mod = gf_bs_read_int(bs, 3);
+	lfon = gf_bs_read_int(bs, 1);
+	bsid = gf_bs_read_int(bs, 5);
+	if (!substreamid && (bsid!=16/*E-AC3*/))
+		return GF_FALSE;
+
+	channels = ac3_mod_to_chans[ac3_mod];
+	if (lfon)
+		channels += 1;
+
+	if (substreamid) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[E-AC3] Detected additional %u channels in substream id=%u - may not be handled correctly. Skipping.\n", channels, substreamid));
+		gf_bs_seek(bs, pos+framesize);
+		goto restart;
+	} else {
+		hdr->bitrate = 0;
+		hdr->sample_rate = freq;
+		hdr->framesize = framesize;
+		hdr->lfon = lfon;
+		hdr->channels = channels;
+		if (full_parse) {
+			hdr->bsid = bsid;
+			hdr->bsmod = 0;
+			hdr->acmod = ac3_mod;
+			hdr->fscod = fscod;
+			hdr->brcode = 0;
+		}
+	}
+
+	if (numblkscod < 6) { //we need 6 blocks to make a sample
+		gf_bs_seek(bs, pos+2*framesize);
+		if ((gf_bs_available(bs) < 6) || !AC3_FindSyncCodeBS(bs))
+			return GF_FALSE;
+		goto block;
+	}
 
 	gf_bs_seek(bs, pos);
-	return 1;
+
+	return GF_TRUE;
 }
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
@@ -4367,12 +4714,12 @@
 		u32 acc=1;
 		u32 acc1=1;
 		u32 i;
-		for (i=0;i<dim;i++) {
+		for (i=0; i<dim; i++) {
 			acc*=vals;
 			acc1*=vals+1;
 		}
 		if(acc<=entries && acc1>entries) return (vals);
-		else { 
+		else {
 			if (acc>entries) vals--;
 			else vals++;
 		}
@@ -4391,7 +4738,7 @@
 
 static u32 ilog(u32 v)
 {
-	u32 ret=0; 
+	u32 ret=0;
 	if(v) --v;
 	while(v) {
 		ret++;
@@ -4421,7 +4768,10 @@
 	oggpack_readinit(&opb, (u8*)data, data_len);
 	pack_type = oggpack_read(&opb, 8);
 	i=0;
-	while (i<6) { szNAME[i] = oggpack_read(&opb, 8); i++;}
+	while (i<6) {
+		szNAME[i] = oggpack_read(&opb, 8);
+		i++;
+	}
 	szNAME[i] = 0;
 	if (strcmp(szNAME, "vorbis")) return vp->is_init = 0;
 
@@ -4474,7 +4824,7 @@
 					}
 				}
 			} else {
-				for (j=0; j<entries; j++) 
+				for (j=0; j<entries; j++)
 					oggpack_read(&opb, 5);
 			}
 		} else {
@@ -4486,7 +4836,8 @@
 			}
 		}
 		switch ((map_type=oggpack_read(&opb, 4))) {
-		case 0: break;
+		case 0:
+			break;
 		case 1:
 		case 2:
 			oggpack_read(&opb, 32);
@@ -4496,26 +4847,26 @@
 			if (map_type==1) qb = vorbis_book_maptype1_quantvals(entries, dim);
 			else if (map_type==2) qb = entries * dim;
 			else qb = 0;
-			for (j=0;j<qb;j++) oggpack_read(&opb, qq);
+			for (j=0; j<qb; j++) oggpack_read(&opb, qq);
 			break;
 		}
 	}
 	times = oggpack_read(&opb, 6)+1;
-	for (i=0;i<times;i++) oggpack_read(&opb, 16);
+	for (i=0; i<times; i++) oggpack_read(&opb, 16);
 	times = oggpack_read(&opb, 6)+1;
-	for (i=0;i<times;i++) {
+	for (i=0; i<times; i++) {
 		u32 type = oggpack_read(&opb, 16);
 		if (type) {
 			u32 *parts, *class_dims, count, rangebits;
 			u32 max_class = 0;
 			nb_part = oggpack_read(&opb, 5);
 			parts = (u32*)gf_malloc(sizeof(u32) * nb_part);
-			for (j=0;j<nb_part;j++) {
+			for (j=0; j<nb_part; j++) {
 				parts[j] = oggpack_read(&opb, 4);
 				if (max_class<parts[j]) max_class = parts[j];
 			}
 			class_dims = (u32*)gf_malloc(sizeof(u32) * (max_class+1));
-			for (j=0; j<max_class+1;j++) {
+			for (j=0; j<max_class+1; j++) {
 				u32 class_sub;
 				class_dims[j] = oggpack_read(&opb, 3) + 1;
 				class_sub = oggpack_read(&opb, 2);
@@ -4525,9 +4876,9 @@
 			oggpack_read(&opb, 2);
 			rangebits=oggpack_read(&opb, 4);
 			count = 0;
-			for (j=0,k=0;j<nb_part;j++) {
+			for (j=0,k=0; j<nb_part; j++) {
 				count+=class_dims[parts[j]];
-				for (;k<count;k++) oggpack_read(&opb, rangebits);
+				for (; k<count; k++) oggpack_read(&opb, rangebits);
 			}
 			gf_free(parts);
 			gf_free(class_dims);
@@ -4539,7 +4890,7 @@
 		}
 	}
 	times = oggpack_read(&opb, 6)+1;
-	for (i=0;i<times;i++) {
+	for (i=0; i<times; i++) {
 		u32 acc = 0;
 		oggpack_read(&opb, 16);/*type*/
 		oggpack_read(&opb, 24);
@@ -4547,12 +4898,12 @@
 		oggpack_read(&opb,24);
 		nb_part = oggpack_read(&opb, 6)+1;
 		oggpack_read(&opb, 8);
-		for (j=0; j<nb_part;j++) {
+		for (j=0; j<nb_part; j++) {
 			u32 cascade = oggpack_read(&opb, 3);
 			if (oggpack_read(&opb, 1)) cascade |= (oggpack_read(&opb, 5)<<3);
 			acc += icount(cascade);
 		}
-		for (j=0;j<acc;j++) oggpack_read(&opb, 8);
+		for (j=0; j<acc; j++) oggpack_read(&opb, 8);
 	}
 	times = oggpack_read(&opb, 6)+1;
 	for (i=0; i<times; i++) {
@@ -4561,7 +4912,7 @@
 		if (oggpack_read(&opb, 1)) sub_maps = oggpack_read(&opb, 4)+1;
 		if (oggpack_read(&opb, 1)) {
 			u32 nb_steps = oggpack_read(&opb, 8)+1;
-			for (j=0;j<nb_steps;j++) {
+			for (j=0; j<nb_steps; j++) {
 				oggpack_read(&opb, ilog(vp->channels));
 				oggpack_read(&opb, ilog(vp->channels));
 			}
@@ -4570,7 +4921,7 @@
 		if (sub_maps>1) {
 			for(j=0; j<vp->channels; j++) oggpack_read(&opb, 4);
 		}
-		for (j=0;j<sub_maps;j++) {
+		for (j=0; j<sub_maps; j++) {
 			oggpack_read(&opb, 8);
 			oggpack_read(&opb, 8);
 			oggpack_read(&opb, 8);

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/avilib.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/avilib.c Changed

@@ -66,32 +66,32 @@
 
 static u32 avi_read(FILE *fd, char *buf, u32 len)
 {
-   s32 n = 0;
-   u32 r = 0;
-
-   while (r < len) {
-      n = (u32) fread(buf + r, 1, len - r, fd);
-      if (n == 0) break;
-      if (n < 0) return r;
-      r += n;
-   }
+	s32 n = 0;
+	u32 r = 0;
+
+	while (r < len) {
+		n = (u32) fread(buf + r, 1, len - r, fd);
+		if (n == 0) break;
+		if (n < 0) return r;
+		r += n;
+	}
 
-   return r;
+	return r;
 }
 
 static u32 avi_write (FILE *fd, char *buf, u32 len)
 {
-   s32 n = 0;
-   u32 r = 0;
+	s32 n = 0;
+	u32 r = 0;
 
-   while (r < len) {
-      n = (u32) gf_fwrite (buf + r, 1, len - r, fd);
-      if (n < 0)
-         return n;
+	while (r < len) {
+		n = (u32) gf_fwrite (buf + r, 1, len - r, fd);
+		if (n < 0)
+			return n;
 
-      r += n;
-   }
-   return r;
+		r += n;
+	}
+	return r;
 }
 
 /* HEADERBYTES: The number of bytes to reserve for the header */
@@ -111,17 +111,17 @@
 
 static void long2str(unsigned char *dst, s32 n)
 {
-   dst[0] = (n    )&0xff;
-   dst[1] = (n>> 8)&0xff;
-   dst[2] = (n>>16)&0xff;
-   dst[3] = (n>>24)&0xff;
+	dst[0] = (n    )&0xff;
+	dst[1] = (n>> 8)&0xff;
+	dst[2] = (n>>16)&0xff;
+	dst[3] = (n>>24)&0xff;
 }
 
 #ifdef WORDS_BIGENDIAN
 static void short2str(unsigned char *dst, s32 n)
 {
-   dst[0] = (n    )&0xff;
-   dst[1] = (n>> 8)&0xff;
+	dst[0] = (n    )&0xff;
+	dst[1] = (n>> 8)&0xff;
 }
 #endif
 
@@ -130,38 +130,38 @@
 
 static u64 str2ullong(unsigned char *str)
 {
-   u64 r = (str[0] | (str[1]<<8) | (str[2]<<16) | (str[3]<<24));
-   u64 s = (str[4] | (str[5]<<8) | (str[6]<<16) | (str[7]<<24));
+	u64 r = (str[0] | (str[1]<<8) | (str[2]<<16) | (str[3]<<24));
+	u64 s = (str[4] | (str[5]<<8) | (str[6]<<16) | (str[7]<<24));
 #ifdef __GNUC__
-   return ((s<<32)&0xffffffff00000000ULL)|(r&0xffffffff);
+	return ((s<<32)&0xffffffff00000000ULL)|(r&0xffffffff);
 #else
-   return ((s<<32)&0xffffffff00000000)|(r&0xffffffff);
+	return ((s<<32)&0xffffffff00000000)|(r&0xffffffff);
 #endif
 }
 
 static u32 str2ulong(unsigned char *str)
 {
-   return ( str[0] | (str[1]<<8) | (str[2]<<16) | (str[3]<<24) );
+	return ( str[0] | (str[1]<<8) | (str[2]<<16) | (str[3]<<24) );
 }
 static u32 str2ushort(unsigned char *str)
 {
-   return ( str[0] | (str[1]<<8) );
+	return ( str[0] | (str[1]<<8) );
 }
 
 // bit 31 denotes a keyframe
 static u32 str2ulong_len (unsigned char *str)
 {
-   return str2ulong(str) & 0x7fffffff;
+	return str2ulong(str) & 0x7fffffff;
 }
 
 
 // if bit 31 is 0, its a keyframe
 static u32 str2ulong_key (unsigned char *str)
 {
-  u32 c = str2ulong(str);
-  c &= 0x80000000;
-  if (c == 0) return 0x10;
-  else return 0;
+	u32 c = str2ulong(str);
+	c &= 0x80000000;
+	if (c == 0) return 0x10;
+	else return 0;
 }
 
 /* Calculate audio sample size from number of bits and number of channels.
@@ -169,11 +169,11 @@
 
 static int avi_sampsize(avi_t *AVI, int j)
 {
-   int s;
-   s = ((AVI->track[j].a_bits+7)/8)*AVI->track[j].a_chans;
-   //   if(s==0) s=1; /* avoid possible zero divisions */
-   if(s<4) s=4; /* avoid possible zero divisions */
-   return s;
+	int s;
+	s = ((AVI->track[j].a_bits+7)/8)*AVI->track[j].a_chans;
+	//   if(s==0) s=1; /* avoid possible zero divisions */
+	if(s<4) s=4; /* avoid possible zero divisions */
+	return s;
 }
 
 /* Add a chunk (=tag and data) to the AVI file,
@@ -181,34 +181,34 @@
 
 static int avi_add_chunk(avi_t *AVI, unsigned char *tag, unsigned char *data, u32 length)
 {
-   unsigned char c[8];
-   char p=0;
+	unsigned char c[8];
+	char p=0;
 
-   /* Copy tag and length int c, so that we need only 1 write system call
-      for these two values */
+	/* Copy tag and length int c, so that we need only 1 write system call
+	   for these two values */
 
-   memcpy(c,tag,4);
-   long2str(c+4,length);
+	memcpy(c,tag,4);
+	long2str(c+4,length);
 
-   /* Output tag, length and data, restore previous position
-      if the write fails */
+	/* Output tag, length and data, restore previous position
+	   if the write fails */
 
-   if( avi_write(AVI->fdes,(char *)c,8) != 8 ||
-       avi_write(AVI->fdes,(char *)data,length) != length ||
-       avi_write(AVI->fdes,&p,length&1) != (length&1)) // if len is uneven, write a pad byte
-   {
-      gf_f64_seek(AVI->fdes,AVI->pos,SEEK_SET);
-      AVI_errno = AVI_ERR_WRITE;
-      return -1;
-   }
+	if( avi_write(AVI->fdes,(char *)c,8) != 8 ||
+	        avi_write(AVI->fdes,(char *)data,length) != length ||
+	        avi_write(AVI->fdes,&p,length&1) != (length&1)) // if len is uneven, write a pad byte
+	{
+		gf_f64_seek(AVI->fdes,AVI->pos,SEEK_SET);
+		AVI_errno = AVI_ERR_WRITE;
+		return -1;
+	}
 
-   /* Update file position */
+	/* Update file position */
 
-   AVI->pos += 8 + PAD_EVEN(length);
+	AVI->pos += 8 + PAD_EVEN(length);
 
-   //GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] pos=%lu %s\n", AVI->pos, tag));
+	//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] pos=%lu %s\n", AVI->pos, tag));
 
-   return 0;
+	return 0;
 }
 
 #define OUTD(n) long2str((unsigned char*) (ix00+bl),(s32)n); bl+=4
@@ -219,47 +219,47 @@
 // this does the physical writeout of the ix## structure
 static int avi_ixnn_entry(avi_t *AVI, avistdindex_chunk *ch, avisuperindex_entry *en)
 {
-    int bl;
+	int bl;
 	u32 k;
-    unsigned int max = ch->nEntriesInUse * sizeof (u32) * ch->wLongsPerEntry + 24; // header
-    char *ix00 = (char *)gf_malloc (max);
-    char dfcc[5];
-    memcpy (dfcc, ch->fcc, 4);
-    dfcc[4] = 0;
-
-    bl = 0;
-
-    if (en) {
-	en->qwOffset = AVI->pos;
-	en->dwSize = max;
-	//en->dwDuration = ch->nEntriesInUse -1; // NUMBER OF stream ticks == frames for video/samples for audio
-    }
+	unsigned int max = ch->nEntriesInUse * sizeof (u32) * ch->wLongsPerEntry + 24; // header
+	char *ix00 = (char *)gf_malloc (max);
+	char dfcc[5];
+	memcpy (dfcc, ch->fcc, 4);
+	dfcc[4] = 0;
+
+	bl = 0;
+
+	if (en) {
+		en->qwOffset = AVI->pos;
+		en->dwSize = max;
+		//en->dwDuration = ch->nEntriesInUse -1; // NUMBER OF stream ticks == frames for video/samples for audio
+	}
 
 #ifdef DEBUG_ODML
-    //GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML Write %s: Entries %ld size %d \n", dfcc, ch->nEntriesInUse, max));
+	//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML Write %s: Entries %ld size %d \n", dfcc, ch->nEntriesInUse, max));
 #endif
 
-    //OUTS(ch->fcc);
-    //OUTD(max);
-    OUTW(ch->wLongsPerEntry);
-    OUTC(ch->bIndexSubType);
-    OUTC(ch->bIndexType);
-    OUTD(ch->nEntriesInUse);
-    OUTS(ch->dwChunkId);
-    OUTD(ch->qwBaseOffset&0xffffffff);
-    OUTD((ch->qwBaseOffset>>32)&0xffffffff);
-    OUTD(ch->dwReserved3);
-
-    for (k = 0; k < ch->nEntriesInUse; k++) {
-	OUTD(ch->aIndex[k].dwOffset);
-	OUTD(ch->aIndex[k].dwSize);
+	//OUTS(ch->fcc);
+	//OUTD(max);
+	OUTW(ch->wLongsPerEntry);
+	OUTC(ch->bIndexSubType);
+	OUTC(ch->bIndexType);
+	OUTD(ch->nEntriesInUse);
+	OUTS(ch->dwChunkId);
+	OUTD(ch->qwBaseOffset&0xffffffff);
+	OUTD((ch->qwBaseOffset>>32)&0xffffffff);
+	OUTD(ch->dwReserved3);
+
+	for (k = 0; k < ch->nEntriesInUse; k++) {
+		OUTD(ch->aIndex[k].dwOffset);
+		OUTD(ch->aIndex[k].dwSize);
 
-    }
-    avi_add_chunk (AVI, (unsigned char*)ch->fcc, (unsigned char*)ix00, max);
+	}
+	avi_add_chunk (AVI, (unsigned char*)ch->fcc, (unsigned char*)ix00, max);
 
-    gf_free(ix00);
+	gf_free(ix00);
 
-    return 0;
+	return 0;
 }
 #undef OUTS
 #undef OUTW
@@ -269,329 +269,339 @@
 // inits a super index structure including its enclosed stdindex
 static int avi_init_super_index(avi_t *AVI, unsigned char *idxtag, avisuperindex_chunk **si)
 {
-    int k;
-
-    avisuperindex_chunk *sil = NULL;
-
-    if ((sil = (avisuperindex_chunk *) gf_malloc (sizeof (avisuperindex_chunk))) == NULL) {
-	AVI_errno = AVI_ERR_NO_MEM;
-	return -1;
-    }
-    memcpy (sil->fcc, "indx", 4);
-    sil->dwSize = 0; // size of this chunk
-    sil->wLongsPerEntry = 4;
-    sil->bIndexSubType = 0;
-    sil->bIndexType = AVI_INDEX_OF_INDEXES;
-    sil->nEntriesInUse = 0; // none are in use
-    memcpy (sil->dwChunkId, idxtag, 4);
-    memset (sil->dwReserved, 0, sizeof (sil->dwReserved));
-
-    // NR_IXNN_CHUNKS == allow 32 indices which means 32 GB files -- arbitrary
-    sil->aIndex = (avisuperindex_entry *) gf_malloc (sil->wLongsPerEntry * NR_IXNN_CHUNKS * sizeof (void*));
-    if (!sil->aIndex) {
-	AVI_errno = AVI_ERR_NO_MEM;
-	return -1;
-    }
-    memset (sil->aIndex, 0, sil->wLongsPerEntry * NR_IXNN_CHUNKS * sizeof (u32));
-
-    sil->stdindex = (avistdindex_chunk **)gf_malloc (NR_IXNN_CHUNKS * sizeof (avistdindex_chunk *));
-    if (!sil->stdindex) {
-	AVI_errno = AVI_ERR_NO_MEM;
-	return -1;
-    }
-    for (k = 0; k < NR_IXNN_CHUNKS; k++) {
-	sil->stdindex[k] = (avistdindex_chunk *) gf_malloc (sizeof (avistdindex_chunk));
-	// gets rewritten later
-	sil->stdindex[k]->qwBaseOffset = (u64)k * NEW_RIFF_THRES;
-	sil->stdindex[k]->aIndex = NULL;
-    }
-
-    *si = sil;
-
-    return 0;
+	int k;
+
+	avisuperindex_chunk *sil = NULL;
+
+	if ((sil = (avisuperindex_chunk *) gf_malloc (sizeof (avisuperindex_chunk))) == NULL) {
+		AVI_errno = AVI_ERR_NO_MEM;
+		return -1;
+	}
+	memcpy (sil->fcc, "indx", 4);
+	sil->dwSize = 0; // size of this chunk
+	sil->wLongsPerEntry = 4;
+	sil->bIndexSubType = 0;
+	sil->bIndexType = AVI_INDEX_OF_INDEXES;
+	sil->nEntriesInUse = 0; // none are in use
+	memcpy (sil->dwChunkId, idxtag, 4);
+	memset (sil->dwReserved, 0, sizeof (sil->dwReserved));
+
+	// NR_IXNN_CHUNKS == allow 32 indices which means 32 GB files -- arbitrary
+	sil->aIndex = (avisuperindex_entry *) gf_malloc (sil->wLongsPerEntry * NR_IXNN_CHUNKS * sizeof (void*));
+	if (!sil->aIndex) {
+		AVI_errno = AVI_ERR_NO_MEM;
+		return -1;
+	}
+	memset (sil->aIndex, 0, sil->wLongsPerEntry * NR_IXNN_CHUNKS * sizeof (u32));
+
+	sil->stdindex = (avistdindex_chunk **)gf_malloc (NR_IXNN_CHUNKS * sizeof (avistdindex_chunk *));
+	if (!sil->stdindex) {
+		AVI_errno = AVI_ERR_NO_MEM;
+		return -1;
+	}
+	for (k = 0; k < NR_IXNN_CHUNKS; k++) {
+		sil->stdindex[k] = (avistdindex_chunk *) gf_malloc (sizeof (avistdindex_chunk));
+		// gets rewritten later
+		sil->stdindex[k]->qwBaseOffset = (u64)k * NEW_RIFF_THRES;
+		sil->stdindex[k]->aIndex = NULL;
+	}
+
+	*si = sil;
+
+	return 0;
 }
 
 // fills an alloc'ed stdindex structure and mallocs some entries for the actual chunks
 static int avi_add_std_index(avi_t *AVI, unsigned char *idxtag, unsigned char *strtag,
-	avistdindex_chunk *stdil)
+                             avistdindex_chunk *stdil)
 {
 
-    memcpy (stdil->fcc, idxtag, 4);
-    stdil->dwSize = 4096;
-    stdil->wLongsPerEntry = 2; //sizeof(avistdindex_entry)/sizeof(u32);
-    stdil->bIndexSubType = 0;
-    stdil->bIndexType = AVI_INDEX_OF_CHUNKS;
-    stdil->nEntriesInUse = 0;
+	memcpy (stdil->fcc, idxtag, 4);
+	stdil->dwSize = 4096;
+	stdil->wLongsPerEntry = 2; //sizeof(avistdindex_entry)/sizeof(u32);
+	stdil->bIndexSubType = 0;
+	stdil->bIndexType = AVI_INDEX_OF_CHUNKS;
+	stdil->nEntriesInUse = 0;
 
-    // cp 00db ChunkId
-    memcpy(stdil->dwChunkId, strtag, 4);
+	// cp 00db ChunkId
+	memcpy(stdil->dwChunkId, strtag, 4);
 
-    //stdil->qwBaseOffset = AVI->video_superindex->aIndex[ cur_std_idx ]->qwOffset;
+	//stdil->qwBaseOffset = AVI->video_superindex->aIndex[ cur_std_idx ]->qwOffset;
 
-    stdil->aIndex = (avistdindex_entry *)gf_malloc(stdil->dwSize * sizeof (u32) * stdil->wLongsPerEntry);
+	stdil->aIndex = (avistdindex_entry *)gf_malloc(stdil->dwSize * sizeof (u32) * stdil->wLongsPerEntry);
 
-    if (!stdil->aIndex) {
-	AVI_errno = AVI_ERR_NO_MEM;
-	return -1;
-    }
+	if (!stdil->aIndex) {
+		AVI_errno = AVI_ERR_NO_MEM;
+		return -1;
+	}
 
 
-    return 0;
+	return 0;
 }
 
 static int avi_add_odml_index_entry_core(avi_t *AVI, long flags, u64 pos, unsigned long len, avistdindex_chunk *si)
 {
-    u32 cur_chunk_idx;
-    // put new chunk into index
-    si->nEntriesInUse++;
-    cur_chunk_idx = si->nEntriesInUse-1;
+	u32 cur_chunk_idx;
+	// put new chunk into index
+	si->nEntriesInUse++;
+	cur_chunk_idx = si->nEntriesInUse-1;
 
-    // need to fetch more memory
-    if (cur_chunk_idx >= si->dwSize) {
-	si->dwSize += 4096;
-	si->aIndex = (avistdindex_entry *)gf_realloc ( si->aIndex, si->dwSize * sizeof (u32) * si->wLongsPerEntry);
-    }
+	// need to fetch more memory
+	if (cur_chunk_idx >= si->dwSize) {
+		si->dwSize += 4096;
+		si->aIndex = (avistdindex_entry *)gf_realloc ( si->aIndex, si->dwSize * sizeof (u32) * si->wLongsPerEntry);
+	}
 
-    if(len>AVI->max_len) AVI->max_len=len;
+	if(len>AVI->max_len) AVI->max_len=len;
 
-    // if bit 31 is set, it is NOT a keyframe
-    if (flags != 0x10) {
-	len |= 0x80000000;
-    }
+	// if bit 31 is set, it is NOT a keyframe
+	if (flags != 0x10) {
+		len |= 0x80000000;
+	}
 
-    si->aIndex [ cur_chunk_idx ].dwSize = len;
-    si->aIndex [ cur_chunk_idx ].dwOffset = (u32) (pos - si->qwBaseOffset + 8);
+	si->aIndex [ cur_chunk_idx ].dwSize = len;
+	si->aIndex [ cur_chunk_idx ].dwOffset = (u32) (pos - si->qwBaseOffset + 8);
 
-    //GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML: POS: 0x%lX\n", si->aIndex [ cur_chunk_idx ].dwOffset));
+	//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML: POS: 0x%lX\n", si->aIndex [ cur_chunk_idx ].dwOffset));
 
-    return 0;
+	return 0;
 }
 
 static int avi_add_odml_index_entry(avi_t *AVI, unsigned char *tag, long flags, u64 pos, unsigned long len)
 {
-    char fcc[5];
+	char fcc[5];
 
-    int audio = (strchr ((char*)tag, 'w')?1:0);
-    int video = !audio;
+	int audio = (strchr ((char*)tag, 'w')?1:0);
+	int video = !audio;
 
-    unsigned int cur_std_idx;
-    u32 audtr;
-    s64 towrite = 0;
+	unsigned int cur_std_idx;
+	u32 audtr;
+	s64 towrite = 0;
 
-    if (video) {
+	if (video) {
 
-	if (!AVI->video_superindex) {
-	    if (avi_init_super_index(AVI, (unsigned char *)"ix00", &AVI->video_superindex) < 0) return -1;
-             AVI->video_superindex->nEntriesInUse++;
-	    cur_std_idx = AVI->video_superindex->nEntriesInUse-1;
+		if (!AVI->video_superindex) {
+			if (avi_init_super_index(AVI, (unsigned char *)"ix00", &AVI->video_superindex) < 0) return -1;
+			AVI->video_superindex->nEntriesInUse++;
+			cur_std_idx = AVI->video_superindex->nEntriesInUse-1;
 
-	    if (avi_add_std_index (AVI, (unsigned char *)"ix00", (unsigned char *)"00db", AVI->video_superindex->stdindex[ cur_std_idx ]) < 0)
-		return -1;
-	} // init
+			if (avi_add_std_index (AVI, (unsigned char *)"ix00", (unsigned char *)"00db", AVI->video_superindex->stdindex[ cur_std_idx ]) < 0)
+				return -1;
+		} // init
 
-    } // video
+	} // video
 
-    if (audio) {
+	if (audio) {
 
-	fcc[0] = 'i'; fcc[1] = 'x'; fcc[2] = tag[0]; fcc[3] = tag[1]; fcc[4] = '\0';
-	if (!AVI->track[AVI->aptr].audio_superindex) {
+		fcc[0] = 'i';
+		fcc[1] = 'x';
+		fcc[2] = tag[0];
+		fcc[3] = tag[1];
+		fcc[4] = '\0';
+		if (!AVI->track[AVI->aptr].audio_superindex) {
 
 #ifdef DEBUG_ODML
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML: fcc = %s\n", fcc));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML: fcc = %s\n", fcc));
 #endif
-	    if (avi_init_super_index(AVI, (unsigned char *)fcc, &AVI->track[AVI->aptr].audio_superindex) < 0) return -1;
+			if (avi_init_super_index(AVI, (unsigned char *)fcc, &AVI->track[AVI->aptr].audio_superindex) < 0) return -1;
 
 
-	    AVI->track[AVI->aptr].audio_superindex->nEntriesInUse++;
+			AVI->track[AVI->aptr].audio_superindex->nEntriesInUse++;
 
-	    sprintf(fcc, "ix%02d", AVI->aptr+1);
-	    if (avi_add_std_index (AVI, (unsigned char *)fcc, tag, AVI->track[AVI->aptr].audio_superindex->stdindex[
-			AVI->track[AVI->aptr].audio_superindex->nEntriesInUse - 1 ]) < 0
-	       ) return -1;
-	} // init
-
-    }
-
-    towrite = 0;
-    if (AVI->video_superindex) {
-
-	cur_std_idx = AVI->video_superindex->nEntriesInUse-1;
-	towrite += AVI->video_superindex->stdindex[cur_std_idx]->nEntriesInUse*8
-	    + 4+4+2+1+1+4+4+8+4;
-	if (cur_std_idx == 0) {
-	    towrite += AVI->n_idx*16 + 8;
-	    towrite += HEADERBYTES;
-	}
-    }
+			sprintf(fcc, "ix%02d", AVI->aptr+1);
+			if (avi_add_std_index (AVI, (unsigned char *)fcc, tag, AVI->track[AVI->aptr].audio_superindex->stdindex[
+			                           AVI->track[AVI->aptr].audio_superindex->nEntriesInUse - 1 ]) < 0
+			   ) return -1;
+		} // init
 
-    for (audtr=0; audtr<AVI->anum; audtr++) {
-	if (AVI->track[audtr].audio_superindex) {
-	    cur_std_idx = AVI->track[audtr].audio_superindex->nEntriesInUse-1;
-	    towrite += AVI->track[audtr].audio_superindex->stdindex[cur_std_idx]->nEntriesInUse*8
-		+ 4+4+2+1+1+4+4+8+4;
 	}
-    }
-    towrite += len + (len&1) + 8;
 
-    //GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML: towrite = 0x%llX = %"LLD"\n", towrite, towrite));
+	towrite = 0;
+	if (AVI->video_superindex) {
 
-    if (AVI->video_superindex &&
-	    (s64)(AVI->pos+towrite) > (s64)((s64)NEW_RIFF_THRES*AVI->video_superindex->nEntriesInUse)) {
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] Adding a new RIFF chunk: %d\n", AVI->video_superindex->nEntriesInUse));
-
-	// rotate ALL indices
-	AVI->video_superindex->nEntriesInUse++;
-	cur_std_idx = AVI->video_superindex->nEntriesInUse-1;
-
-	if (AVI->video_superindex->nEntriesInUse > NR_IXNN_CHUNKS) {
-	    GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] Internal error in avilib - redefine NR_IXNN_CHUNKS\n"));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] cur_std_idx=%d NR_IXNN_CHUNKS=%d"
-		    "POS=%"LLD" towrite=%"LLD"\n",
-		    cur_std_idx,NR_IXNN_CHUNKS, AVI->pos, towrite));
-	    return -1;
+		cur_std_idx = AVI->video_superindex->nEntriesInUse-1;
+		towrite += AVI->video_superindex->stdindex[cur_std_idx]->nEntriesInUse*8
+		           + 4+4+2+1+1+4+4+8+4;
+		if (cur_std_idx == 0) {
+			towrite += AVI->n_idx*16 + 8;
+			towrite += HEADERBYTES;
+		}
 	}
 
-	if (avi_add_std_index (AVI, (unsigned char *)"ix00", (unsigned char *)"00db", AVI->video_superindex->stdindex[ cur_std_idx ]) < 0)
-	    return -1;
-
-	for (audtr = 0; audtr < AVI->anum; audtr++) {
-	    char aud[5];
-	    if (!AVI->track[audtr].audio_superindex) {
-		// not initialized -> no index
-		continue;
-	    }
-	    AVI->track[audtr].audio_superindex->nEntriesInUse++;
-
-	    sprintf(fcc, "ix%02d", audtr+1);
-	    sprintf(aud, "0%01dwb", audtr+1);
-	    if (avi_add_std_index (AVI, (unsigned char *)fcc, (unsigned char *)aud, AVI->track[audtr].audio_superindex->stdindex[
-			AVI->track[audtr].audio_superindex->nEntriesInUse - 1 ]) < 0
-	       ) return -1;
+	for (audtr=0; audtr<AVI->anum; audtr++) {
+		if (AVI->track[audtr].audio_superindex) {
+			cur_std_idx = AVI->track[audtr].audio_superindex->nEntriesInUse-1;
+			towrite += AVI->track[audtr].audio_superindex->stdindex[cur_std_idx]->nEntriesInUse*8
+			           + 4+4+2+1+1+4+4+8+4;
+		}
 	}
+	towrite += len + (len&1) + 8;
 
-	// write the new riff;
-	if (cur_std_idx > 0) {
+	//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML: towrite = 0x%llX = %"LLD"\n", towrite, towrite));
 
-	    // dump the _previous_ == already finished index
-	    avi_ixnn_entry (AVI, AVI->video_superindex->stdindex[cur_std_idx - 1],
-		    &AVI->video_superindex->aIndex[cur_std_idx - 1]);
-	    AVI->video_superindex->aIndex[cur_std_idx - 1].dwDuration =
-		AVI->video_superindex->stdindex[cur_std_idx - 1]->nEntriesInUse - 1;
+	if (AVI->video_superindex &&
+	        (s64)(AVI->pos+towrite) > (s64)((s64)NEW_RIFF_THRES*AVI->video_superindex->nEntriesInUse)) {
 
-	    for (audtr = 0; audtr < AVI->anum; audtr++) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] Adding a new RIFF chunk: %d\n", AVI->video_superindex->nEntriesInUse));
 
-		if (!AVI->track[audtr].audio_superindex) {
-		    // not initialized -> no index
-		    continue;
-		}
-		avi_ixnn_entry (AVI, AVI->track[audtr].audio_superindex->stdindex[cur_std_idx - 1],
-			&AVI->track[audtr].audio_superindex->aIndex[cur_std_idx - 1]);
-
-		AVI->track[audtr].audio_superindex->aIndex[cur_std_idx - 1].dwDuration =
-		    AVI->track[audtr].audio_superindex->stdindex[cur_std_idx - 1]->nEntriesInUse - 1;
-		if (AVI->track[audtr].a_fmt == 0x1) {
-		    AVI->track[audtr].audio_superindex->aIndex[cur_std_idx - 1].dwDuration *=
-			AVI->track[audtr].a_bits*AVI->track[audtr].a_rate*AVI->track[audtr].a_chans/800;
+		// rotate ALL indices
+		AVI->video_superindex->nEntriesInUse++;
+		cur_std_idx = AVI->video_superindex->nEntriesInUse-1;
+
+		if (AVI->video_superindex->nEntriesInUse > NR_IXNN_CHUNKS) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] Internal error in avilib - redefine NR_IXNN_CHUNKS\n"));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] cur_std_idx=%d NR_IXNN_CHUNKS=%d"
+			                                        "POS=%"LLD" towrite=%"LLD"\n",
+			                                        cur_std_idx,NR_IXNN_CHUNKS, AVI->pos, towrite));
+			return -1;
 		}
-	    }
 
-	    // XXX: dump idx1 structure
-	    if (cur_std_idx == 1) {
-		avi_add_chunk(AVI, (unsigned char *)"idx1", (unsigned char *)AVI->idx, AVI->n_idx*16);
-		// qwBaseOffset will contain the start of the second riff chunk
-	    }
-	    // Fix the Offsets later at closing time
-	    avi_add_chunk(AVI, (unsigned char *)"RIFF", (unsigned char *)"AVIXLIST\0\0\0\0movi", 16);
+		if (avi_add_std_index (AVI, (unsigned char *)"ix00", (unsigned char *)"00db", AVI->video_superindex->stdindex[ cur_std_idx ]) < 0)
+			return -1;
+
+		for (audtr = 0; audtr < AVI->anum; audtr++) {
+			char aud[5];
+			if (!AVI->track[audtr].audio_superindex) {
+				// not initialized -> no index
+				continue;
+			}
+			AVI->track[audtr].audio_superindex->nEntriesInUse++;
+
+			sprintf(fcc, "ix%02d", audtr+1);
+			sprintf(aud, "0%01dwb", audtr+1);
+			if (avi_add_std_index (AVI, (unsigned char *)fcc, (unsigned char *)aud, AVI->track[audtr].audio_superindex->stdindex[
+			                           AVI->track[audtr].audio_superindex->nEntriesInUse - 1 ]) < 0
+			   ) return -1;
+		}
 
-	    AVI->video_superindex->stdindex[ cur_std_idx ]->qwBaseOffset = AVI->pos -16 -8;
+		// write the new riff;
+		if (cur_std_idx > 0) {
+
+			// dump the _previous_ == already finished index
+			avi_ixnn_entry (AVI, AVI->video_superindex->stdindex[cur_std_idx - 1],
+			                &AVI->video_superindex->aIndex[cur_std_idx - 1]);
+			AVI->video_superindex->aIndex[cur_std_idx - 1].dwDuration =
+			    AVI->video_superindex->stdindex[cur_std_idx - 1]->nEntriesInUse - 1;
+
+			for (audtr = 0; audtr < AVI->anum; audtr++) {
+
+				if (!AVI->track[audtr].audio_superindex) {
+					// not initialized -> no index
+					continue;
+				}
+				avi_ixnn_entry (AVI, AVI->track[audtr].audio_superindex->stdindex[cur_std_idx - 1],
+				                &AVI->track[audtr].audio_superindex->aIndex[cur_std_idx - 1]);
+
+				AVI->track[audtr].audio_superindex->aIndex[cur_std_idx - 1].dwDuration =
+				    AVI->track[audtr].audio_superindex->stdindex[cur_std_idx - 1]->nEntriesInUse - 1;
+				if (AVI->track[audtr].a_fmt == 0x1) {
+					AVI->track[audtr].audio_superindex->aIndex[cur_std_idx - 1].dwDuration *=
+					    AVI->track[audtr].a_bits*AVI->track[audtr].a_rate*AVI->track[audtr].a_chans/800;
+				}
+			}
+
+			// XXX: dump idx1 structure
+			if (cur_std_idx == 1) {
+				avi_add_chunk(AVI, (unsigned char *)"idx1", (unsigned char *)AVI->idx, AVI->n_idx*16);
+				// qwBaseOffset will contain the start of the second riff chunk
+			}
+			// Fix the Offsets later at closing time
+			avi_add_chunk(AVI, (unsigned char *)"RIFF", (unsigned char *)"AVIXLIST\0\0\0\0movi", 16);
+
+			AVI->video_superindex->stdindex[ cur_std_idx ]->qwBaseOffset = AVI->pos -16 -8;
 #ifdef DEBUG_ODML
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML: RIFF No.%02d at Offset 0x%llX\n", cur_std_idx, AVI->pos -16 -8));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML: RIFF No.%02d at Offset 0x%llX\n", cur_std_idx, AVI->pos -16 -8));
 #endif
 
-	    for (audtr = 0; audtr < AVI->anum; audtr++) {
-		if (AVI->track[audtr].audio_superindex)
-		    AVI->track[audtr].audio_superindex->stdindex[ cur_std_idx ]->qwBaseOffset =
-			AVI->pos -16 -8;
+			for (audtr = 0; audtr < AVI->anum; audtr++) {
+				if (AVI->track[audtr].audio_superindex)
+					AVI->track[audtr].audio_superindex->stdindex[ cur_std_idx ]->qwBaseOffset =
+					    AVI->pos -16 -8;
 
-	    }
+			}
 
-	    // now we can be sure
-	    AVI->is_opendml++;
-	}
+			// now we can be sure
+			AVI->is_opendml++;
+		}
 
-    }
+	}
 
 
-    if (video) {
-	avi_add_odml_index_entry_core(AVI, flags, AVI->pos, len,
-		AVI->video_superindex->stdindex[ AVI->video_superindex->nEntriesInUse-1 ]);
+	if (video) {
+		avi_add_odml_index_entry_core(AVI, flags, AVI->pos, len,
+		                              AVI->video_superindex->stdindex[ AVI->video_superindex->nEntriesInUse-1 ]);
 
-	AVI->total_frames++;
-    } // video
+		AVI->total_frames++;
+	} // video
 
-    if (audio) {
-	avi_add_odml_index_entry_core(AVI, flags, AVI->pos, len,
-		AVI->track[AVI->aptr].audio_superindex->stdindex[
-		        AVI->track[AVI->aptr].audio_superindex->nEntriesInUse-1 ]);
-    }
+	if (audio) {
+		avi_add_odml_index_entry_core(AVI, flags, AVI->pos, len,
+		                              AVI->track[AVI->aptr].audio_superindex->stdindex[
+		                                  AVI->track[AVI->aptr].audio_superindex->nEntriesInUse-1 ]);
+	}
 
 
-    return 0;
+	return 0;
 }
 
 // #undef NR_IXNN_CHUNKS
 
 static int avi_add_index_entry(avi_t *AVI, unsigned char *tag, long flags, u64 pos, u64 len)
 {
-   void *ptr;
+	void *ptr;
 
-   if(AVI->n_idx>=AVI->max_idx) {
-     ptr = gf_realloc((void *)AVI->idx,(AVI->max_idx+4096)*16);
+	if(AVI->n_idx>=AVI->max_idx) {
+		ptr = gf_realloc((void *)AVI->idx,(AVI->max_idx+4096)*16);
 
-     if(ptr == 0) {
-       AVI_errno = AVI_ERR_NO_MEM;
-       return -1;
-     }
-     AVI->max_idx += 4096;
-     AVI->idx = (unsigned char((*)[16]) ) ptr;
-   }
+		if(ptr == 0) {
+			AVI_errno = AVI_ERR_NO_MEM;
+			return -1;
+		}
+		AVI->max_idx += 4096;
+		AVI->idx = (unsigned char((*)[16]) ) ptr;
+	}
 
-   /* Add index entry */
+	/* Add index entry */
 
-   //   GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] INDEX %s %ld %lu %lu\n", tag, flags, pos, len));
+	//   GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] INDEX %s %ld %lu %lu\n", tag, flags, pos, len));
 
-   memcpy(AVI->idx[AVI->n_idx],tag,4);
-   long2str(AVI->idx[AVI->n_idx]+ 4,flags);
-   long2str(AVI->idx[AVI->n_idx]+ 8, (s32) pos);
-   long2str(AVI->idx[AVI->n_idx]+12, (s32) len);
+	memcpy(AVI->idx[AVI->n_idx],tag,4);
+	long2str(AVI->idx[AVI->n_idx]+ 4,flags);
+	long2str(AVI->idx[AVI->n_idx]+ 8, (s32) pos);
+	long2str(AVI->idx[AVI->n_idx]+12, (s32) len);
 
-   /* Update counter */
+	/* Update counter */
 
-   AVI->n_idx++;
+	AVI->n_idx++;
 
-   if(len>AVI->max_len) AVI->max_len=(u32) len;
+	if(len>AVI->max_len) AVI->max_len=(u32) len;
 
-   return 0;
+	return 0;
 }
 
 /* Returns 1 if more audio is in that video junk */
 int AVI_can_read_audio(avi_t *AVI)
 {
-   if(AVI->mode==AVI_MODE_WRITE) { return -1; }
-   if(!AVI->video_index)         { return -1; }
-   if(!AVI->track[AVI->aptr].audio_index)         { return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		return -1;
+	}
+	if(!AVI->video_index)         {
+		return -1;
+	}
+	if(!AVI->track[AVI->aptr].audio_index)         {
+		return -1;
+	}
 
-   // is it -1? the last ones got left out --tibit
-   //if (AVI->track[AVI->aptr].audio_posc>=AVI->track[AVI->aptr].audio_chunks-1) {
-   if (AVI->track[AVI->aptr].audio_posc>=AVI->track[AVI->aptr].audio_chunks) {
-       return 0;
-   }
+	// is it -1? the last ones got left out --tibit
+	//if (AVI->track[AVI->aptr].audio_posc>=AVI->track[AVI->aptr].audio_chunks-1) {
+	if (AVI->track[AVI->aptr].audio_posc>=AVI->track[AVI->aptr].audio_chunks) {
+		return 0;
+	}
 
-   if (AVI->video_pos >= AVI->video_frames) return 1;
+	if (AVI->video_pos >= AVI->video_frames) return 1;
 
-   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;
+	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;
 }
 /*
    AVI_open_output_file: Open an AVI File and write a bunch
@@ -603,96 +613,96 @@
 GF_EXPORT
 avi_t* AVI_open_output_file(char * filename)
 {
-   avi_t *AVI;
-   int i;
+	avi_t *AVI;
+	int i;
 
-   unsigned char AVI_header[HEADERBYTES];
+	unsigned char AVI_header[HEADERBYTES];
 
-   /* Allocate the avi_t struct and zero it */
+	/* Allocate the avi_t struct and zero it */
 
-   AVI = (avi_t *) gf_malloc(sizeof(avi_t));
-   if(AVI==0)
-   {
-      AVI_errno = AVI_ERR_NO_MEM;
-      return 0;
-   }
-   memset((void *)AVI,0,sizeof(avi_t));
-
-   AVI->fdes = gf_f64_open(filename, "w+b");
-   if (!AVI->fdes )
-   {
-      AVI_errno = AVI_ERR_OPEN;
-      gf_free(AVI);
-      return 0;
-   }
+	AVI = (avi_t *) gf_malloc(sizeof(avi_t));
+	if(AVI==0)
+	{
+		AVI_errno = AVI_ERR_NO_MEM;
+		return 0;
+	}
+	memset((void *)AVI,0,sizeof(avi_t));
+
+	AVI->fdes = gf_f64_open(filename, "w+b");
+	if (!AVI->fdes )
+	{
+		AVI_errno = AVI_ERR_OPEN;
+		gf_free(AVI);
+		return 0;
+	}
 
-   /* Write out HEADERBYTES bytes, the header will go here
-      when we are finished with writing */
-
-   for (i=0;i<HEADERBYTES;i++) AVI_header[i] = 0;
-   i = avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES);
-   if (i != HEADERBYTES)
-   {
-      fclose(AVI->fdes);
-      AVI_errno = AVI_ERR_WRITE;
-      gf_free(AVI);
-      return 0;
-   }
+	/* Write out HEADERBYTES bytes, the header will go here
+	   when we are finished with writing */
+
+	for (i=0; i<HEADERBYTES; i++) AVI_header[i] = 0;
+	i = avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES);
+	if (i != HEADERBYTES)
+	{
+		fclose(AVI->fdes);
+		AVI_errno = AVI_ERR_WRITE;
+		gf_free(AVI);
+		return 0;
+	}
 
-   AVI->pos  = HEADERBYTES;
-   AVI->mode = AVI_MODE_WRITE; /* open for writing */
+	AVI->pos  = HEADERBYTES;
+	AVI->mode = AVI_MODE_WRITE; /* open for writing */
 
-   //init
-   AVI->anum = 0;
-   AVI->aptr = 0;
+	//init
+	AVI->anum = 0;
+	AVI->aptr = 0;
 
-   return AVI;
+	return AVI;
 }
 
 GF_EXPORT
 void AVI_set_video(avi_t *AVI, int width, int height, double fps, char *compressor)
 {
-   /* may only be called if file is open for writing */
+	/* may only be called if file is open for writing */
 
-   if(AVI->mode==AVI_MODE_READ) return;
+	if(AVI->mode==AVI_MODE_READ) return;
 
-   AVI->width  = width;
-   AVI->height = height;
-   AVI->fps    = fps;
+	AVI->width  = width;
+	AVI->height = height;
+	AVI->fps    = fps;
 
-   if(strncmp(compressor, "RGB", 3)==0) {
-     memset(AVI->compressor, 0, 4);
-   } else {
-     memcpy(AVI->compressor,compressor,4);
-   }
+	if(strncmp(compressor, "RGB", 3)==0) {
+		memset(AVI->compressor, 0, 4);
+	} else {
+		memcpy(AVI->compressor,compressor,4);
+	}
 
-   AVI->compressor[4] = 0;
+	AVI->compressor[4] = 0;
 
-   avi_update_header(AVI);
+	avi_update_header(AVI);
 }
 
 void AVI_set_audio(avi_t *AVI, int channels, long rate, int bits, int format, long mp3rate)
 {
-   /* may only be called if file is open for writing */
+	/* may only be called if file is open for writing */
 
-   if(AVI->mode==AVI_MODE_READ) return;
+	if(AVI->mode==AVI_MODE_READ) return;
 
-   //inc audio tracks
-   AVI->aptr=AVI->anum;
-   ++AVI->anum;
+	//inc audio tracks
+	AVI->aptr=AVI->anum;
+	++AVI->anum;
 
-   if(AVI->anum > AVI_MAX_TRACKS) {
-     GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] error - only %d audio tracks supported\n", AVI_MAX_TRACKS));
-     exit(1);
-   }
+	if(AVI->anum > AVI_MAX_TRACKS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] error - only %d audio tracks supported\n", AVI_MAX_TRACKS));
+		exit(1);
+	}
 
-   AVI->track[AVI->aptr].a_chans = channels;
-   AVI->track[AVI->aptr].a_rate  = rate;
-   AVI->track[AVI->aptr].a_bits  = bits;
-   AVI->track[AVI->aptr].a_fmt   = format;
-   AVI->track[AVI->aptr].mp3rate = mp3rate;
+	AVI->track[AVI->aptr].a_chans = channels;
+	AVI->track[AVI->aptr].a_rate  = rate;
+	AVI->track[AVI->aptr].a_bits  = bits;
+	AVI->track[AVI->aptr].a_fmt   = format;
+	AVI->track[AVI->aptr].mp3rate = mp3rate;
 
-   avi_update_header(AVI);
+	avi_update_header(AVI);
 }
 
 #define OUT4CC(s) \
@@ -726,47 +736,47 @@
 //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 movi_len, hdrl_start, strl_start;
-   u32 j;
-   unsigned char AVI_header[HEADERBYTES];
-   u32 nhb;
-   unsigned long xd_size, xd_size_align2;
-
-   //assume max size
-   movi_len = AVI_MAX_LEN - HEADERBYTES + 4;
-
-   //assume index will be written
-   hasIndex=1;
-
-   if(AVI->fps < 0.001) {
-     frate=0;
-     ms_per_frame=0;
-   } else {
-     frate = (int) (FRAME_RATE_SCALE*AVI->fps + 0.5);
-     ms_per_frame=(int) (1000000/AVI->fps + 0.5);
-   }
+	int njunk, sampsize, hasIndex, ms_per_frame, frate, flag;
+	int movi_len, hdrl_start, strl_start;
+	u32 j;
+	unsigned char AVI_header[HEADERBYTES];
+	u32 nhb;
+	unsigned long xd_size, xd_size_align2;
+
+	//assume max size
+	movi_len = AVI_MAX_LEN - HEADERBYTES + 4;
+
+	//assume index will be written
+	hasIndex=1;
+
+	if(AVI->fps < 0.001) {
+		frate=0;
+		ms_per_frame=0;
+	} else {
+		frate = (int) (FRAME_RATE_SCALE*AVI->fps + 0.5);
+		ms_per_frame=(int) (1000000/AVI->fps + 0.5);
+	}
 
-   /* Prepare the file header */
+	/* Prepare the file header */
 
-   nhb = 0;
+	nhb = 0;
 
-   /* The RIFF header */
+	/* The RIFF header */
 
-   OUT4CC ("RIFF");
-   OUTLONG(movi_len);    // assume max size
-   OUT4CC ("AVI ");
+	OUT4CC ("RIFF");
+	OUTLONG(movi_len);    // assume max size
+	OUT4CC ("AVI ");
 
-   /* Start the header list */
+	/* Start the header list */
 
-   OUT4CC ("LIST");
-   OUTLONG(0);        /* Length of list in bytes, don't know yet */
-   hdrl_start = nhb;  /* Store start position */
-   OUT4CC ("hdrl");
+	OUT4CC ("LIST");
+	OUTLONG(0);        /* Length of list in bytes, don't know yet */
+	hdrl_start = nhb;  /* Store start position */
+	OUT4CC ("hdrl");
 
-   /* The main AVI header */
+	/* The main AVI header */
 
-   /* The Flags in AVI File header */
+	/* The Flags in AVI File header */
 
 #define AVIF_HASINDEX           0x00000010      /* Index at end of file */
 #define AVIF_MUSTUSEINDEX       0x00000020
@@ -775,199 +785,200 @@
 #define AVIF_WASCAPTUREFILE     0x00010000
 #define AVIF_COPYRIGHTED        0x00020000
 
-   OUT4CC ("avih");
-   OUTLONG(56);                 /* # of bytes to follow */
-   OUTLONG(ms_per_frame);       /* Microseconds per frame */
-   //ThOe ->0
-   //   OUTLONG(10000000);           /* MaxBytesPerSec, I hope this will never be used */
-   OUTLONG(0);
-   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;
-   OUTLONG(flag);               /* Flags */
-   OUTLONG(0);                  // no frames yet
-   OUTLONG(0);                  /* InitialFrames */
-
-   OUTLONG(AVI->anum+1);
-
-   OUTLONG(0);                  /* SuggestedBufferSize */
-   OUTLONG(AVI->width);         /* Width */
-   OUTLONG(AVI->height);        /* Height */
-                                /* MS calls the following 'reserved': */
-   OUTLONG(0);                  /* TimeScale:  Unit used to measure time */
-   OUTLONG(0);                  /* DataRate:   Data rate of playback     */
-   OUTLONG(0);                  /* StartTime:  Starting time of AVI data */
-   OUTLONG(0);                  /* DataLength: Size of AVI data chunk    */
-
-
-   /* Start the video stream list ---------------------------------- */
-
-   OUT4CC ("LIST");
-   OUTLONG(0);        /* Length of list in bytes, don't know yet */
-   strl_start = nhb;  /* Store start position */
-   OUT4CC ("strl");
-
-   /* The video stream header */
-
-   OUT4CC ("strh");
-   OUTLONG(56);                 /* # of bytes to follow */
-   OUT4CC ("vids");             /* Type */
-   OUT4CC (AVI->compressor);    /* Handler */
-   OUTLONG(0);                  /* Flags */
-   OUTLONG(0);                  /* Reserved, MS says: wPriority, wLanguage */
-   OUTLONG(0);                  /* InitialFrames */
-   OUTLONG(FRAME_RATE_SCALE);              /* Scale */
-   OUTLONG(frate);              /* Rate: Rate/Scale == samples/second */
-   OUTLONG(0);                  /* Start */
-   OUTLONG(0);                  // no frames yet
-   OUTLONG(0);                  /* SuggestedBufferSize */
-   OUTLONG(-1);                 /* Quality */
-   OUTLONG(0);                  /* SampleSize */
-   OUTLONG(0);                  /* Frame */
-   OUTLONG(0);                  /* Frame */
-   //   OUTLONG(0);                  /* Frame */
-   //OUTLONG(0);                  /* Frame */
-
-   /* The video stream format */
-
-   xd_size        = AVI->extradata_size;
-   xd_size_align2 = (AVI->extradata_size+1) & ~1;
-
-   OUT4CC ("strf");
-   OUTLONG(40 + xd_size_align2);/* # of bytes to follow */
-   OUTLONG(40 + xd_size);	/* Size */
-   OUTLONG(AVI->width);         /* Width */
-   OUTLONG(AVI->height);        /* Height */
-   OUTSHRT(1); OUTSHRT(24);     /* Planes, Count */
-   OUT4CC (AVI->compressor);    /* Compression */
-   // ThOe (*3)
-   OUTLONG(AVI->width*AVI->height*3);  /* SizeImage (in bytes?) */
-   OUTLONG(0);                  /* XPelsPerMeter */
-   OUTLONG(0);                  /* YPelsPerMeter */
-   OUTLONG(0);                  /* ClrUsed: Number of colors used */
-   OUTLONG(0);                  /* ClrImportant: Number of colors important */
-
-   // write extradata
-   if (xd_size > 0 && AVI->extradata) {
-      OUTMEM(AVI->extradata, xd_size);
-      if (xd_size != xd_size_align2) {
-         OUTCHR(0);
-      }
-   }
+	OUT4CC ("avih");
+	OUTLONG(56);                 /* # of bytes to follow */
+	OUTLONG(ms_per_frame);       /* Microseconds per frame */
+	//ThOe ->0
+	//   OUTLONG(10000000);           /* MaxBytesPerSec, I hope this will never be used */
+	OUTLONG(0);
+	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;
+	OUTLONG(flag);               /* Flags */
+	OUTLONG(0);                  // no frames yet
+	OUTLONG(0);                  /* InitialFrames */
+
+	OUTLONG(AVI->anum+1);
+
+	OUTLONG(0);                  /* SuggestedBufferSize */
+	OUTLONG(AVI->width);         /* Width */
+	OUTLONG(AVI->height);        /* Height */
+	/* MS calls the following 'reserved': */
+	OUTLONG(0);                  /* TimeScale:  Unit used to measure time */
+	OUTLONG(0);                  /* DataRate:   Data rate of playback     */
+	OUTLONG(0);                  /* StartTime:  Starting time of AVI data */
+	OUTLONG(0);                  /* DataLength: Size of AVI data chunk    */
+
+
+	/* Start the video stream list ---------------------------------- */
+
+	OUT4CC ("LIST");
+	OUTLONG(0);        /* Length of list in bytes, don't know yet */
+	strl_start = nhb;  /* Store start position */
+	OUT4CC ("strl");
+
+	/* The video stream header */
+
+	OUT4CC ("strh");
+	OUTLONG(56);                 /* # of bytes to follow */
+	OUT4CC ("vids");             /* Type */
+	OUT4CC (AVI->compressor);    /* Handler */
+	OUTLONG(0);                  /* Flags */
+	OUTLONG(0);                  /* Reserved, MS says: wPriority, wLanguage */
+	OUTLONG(0);                  /* InitialFrames */
+	OUTLONG(FRAME_RATE_SCALE);              /* Scale */
+	OUTLONG(frate);              /* Rate: Rate/Scale == samples/second */
+	OUTLONG(0);                  /* Start */
+	OUTLONG(0);                  // no frames yet
+	OUTLONG(0);                  /* SuggestedBufferSize */
+	OUTLONG(-1);                 /* Quality */
+	OUTLONG(0);                  /* SampleSize */
+	OUTLONG(0);                  /* Frame */
+	OUTLONG(0);                  /* Frame */
+	//   OUTLONG(0);                  /* Frame */
+	//OUTLONG(0);                  /* Frame */
+
+	/* The video stream format */
+
+	xd_size        = AVI->extradata_size;
+	xd_size_align2 = (AVI->extradata_size+1) & ~1;
+
+	OUT4CC ("strf");
+	OUTLONG(40 + xd_size_align2);/* # of bytes to follow */
+	OUTLONG(40 + xd_size);	/* Size */
+	OUTLONG(AVI->width);         /* Width */
+	OUTLONG(AVI->height);        /* Height */
+	OUTSHRT(1);
+	OUTSHRT(24);     /* Planes, Count */
+	OUT4CC (AVI->compressor);    /* Compression */
+	// ThOe (*3)
+	OUTLONG(AVI->width*AVI->height*3);  /* SizeImage (in bytes?) */
+	OUTLONG(0);                  /* XPelsPerMeter */
+	OUTLONG(0);                  /* YPelsPerMeter */
+	OUTLONG(0);                  /* ClrUsed: Number of colors used */
+	OUTLONG(0);                  /* ClrImportant: Number of colors important */
+
+	// write extradata
+	if (xd_size > 0 && AVI->extradata) {
+		OUTMEM(AVI->extradata, xd_size);
+		if (xd_size != xd_size_align2) {
+			OUTCHR(0);
+		}
+	}
 
-   /* Finish stream list, i.e. put number of bytes in the list to proper pos */
+	/* Finish stream list, i.e. put number of bytes in the list to proper pos */
 
-   long2str(AVI_header+strl_start-4,nhb-strl_start);
+	long2str(AVI_header+strl_start-4,nhb-strl_start);
 
 
-   /* Start the audio stream list ---------------------------------- */
+	/* Start the audio stream list ---------------------------------- */
 
-   for(j=0; j<AVI->anum; ++j) {
+	for(j=0; j<AVI->anum; ++j) {
 
-       sampsize = avi_sampsize(AVI, j);
+		sampsize = avi_sampsize(AVI, j);
 
-       OUT4CC ("LIST");
-       OUTLONG(0);        /* Length of list in bytes, don't know yet */
-       strl_start = nhb;  /* Store start position */
-       OUT4CC ("strl");
+		OUT4CC ("LIST");
+		OUTLONG(0);        /* Length of list in bytes, don't know yet */
+		strl_start = nhb;  /* Store start position */
+		OUT4CC ("strl");
 
-       /* The audio stream header */
+		/* The audio stream header */
 
-       OUT4CC ("strh");
-       OUTLONG(56);            /* # of bytes to follow */
-       OUT4CC ("auds");
+		OUT4CC ("strh");
+		OUTLONG(56);            /* # of bytes to follow */
+		OUT4CC ("auds");
 
-       // -----------
-       // ThOe
-       OUTLONG(0);             /* Format (Optionally) */
-       // -----------
+		// -----------
+		// ThOe
+		OUTLONG(0);             /* Format (Optionally) */
+		// -----------
 
-       OUTLONG(0);             /* Flags */
-       OUTLONG(0);             /* Reserved, MS says: wPriority, wLanguage */
-       OUTLONG(0);             /* InitialFrames */
+		OUTLONG(0);             /* Flags */
+		OUTLONG(0);             /* Reserved, MS says: wPriority, wLanguage */
+		OUTLONG(0);             /* InitialFrames */
 
-       // ThOe /4
-       OUTLONG(sampsize/4);      /* Scale */
-       OUTLONG(1000*AVI->track[j].mp3rate/8);
-       OUTLONG(0);             /* Start */
-       OUTLONG(4*AVI->track[j].audio_bytes/sampsize);   /* Length */
-       OUTLONG(0);             /* SuggestedBufferSize */
-       OUTLONG(-1);            /* Quality */
+		// ThOe /4
+		OUTLONG(sampsize/4);      /* Scale */
+		OUTLONG(1000*AVI->track[j].mp3rate/8);
+		OUTLONG(0);             /* Start */
+		OUTLONG(4*AVI->track[j].audio_bytes/sampsize);   /* Length */
+		OUTLONG(0);             /* SuggestedBufferSize */
+		OUTLONG(-1);            /* Quality */
 
-       // ThOe /4
-       OUTLONG(sampsize/4);    /* SampleSize */
+		// ThOe /4
+		OUTLONG(sampsize/4);    /* SampleSize */
 
-       OUTLONG(0);             /* Frame */
-       OUTLONG(0);             /* Frame */
-       //       OUTLONG(0);             /* Frame */
-       //OUTLONG(0);             /* Frame */
+		OUTLONG(0);             /* Frame */
+		OUTLONG(0);             /* Frame */
+		//       OUTLONG(0);             /* Frame */
+		//OUTLONG(0);             /* Frame */
 
-       /* The audio stream format */
+		/* The audio stream format */
 
-       OUT4CC ("strf");
-       OUTLONG(16);                   /* # of bytes to follow */
-       OUTSHRT(AVI->track[j].a_fmt);           /* Format */
-       OUTSHRT(AVI->track[j].a_chans);         /* Number of channels */
-       OUTLONG(AVI->track[j].a_rate);          /* SamplesPerSec */
-       // ThOe
-       OUTLONG(1000*AVI->track[j].mp3rate/8);
-       //ThOe (/4)
+		OUT4CC ("strf");
+		OUTLONG(16);                   /* # of bytes to follow */
+		OUTSHRT(AVI->track[j].a_fmt);           /* Format */
+		OUTSHRT(AVI->track[j].a_chans);         /* Number of channels */
+		OUTLONG(AVI->track[j].a_rate);          /* SamplesPerSec */
+		// ThOe
+		OUTLONG(1000*AVI->track[j].mp3rate/8);
+		//ThOe (/4)
 
-       OUTSHRT(sampsize/4);           /* BlockAlign */
+		OUTSHRT(sampsize/4);           /* BlockAlign */
 
 
-       OUTSHRT(AVI->track[j].a_bits);          /* BitsPerSample */
+		OUTSHRT(AVI->track[j].a_bits);          /* BitsPerSample */
 
-       /* Finish stream list, i.e. put number of bytes in the list to proper pos */
+		/* Finish stream list, i.e. put number of bytes in the list to proper pos */
 
-       long2str(AVI_header+strl_start-4,nhb-strl_start);
-   }
+		long2str(AVI_header+strl_start-4,nhb-strl_start);
+	}
 
-   /* Finish header list */
+	/* Finish header list */
 
-   long2str(AVI_header+hdrl_start-4,nhb-hdrl_start);
+	long2str(AVI_header+hdrl_start-4,nhb-hdrl_start);
 
 
-   /* Calculate the needed amount of junk bytes, output junk */
+	/* Calculate the needed amount of junk bytes, output junk */
 
-   njunk = HEADERBYTES - nhb - 8 - 12;
+	njunk = HEADERBYTES - nhb - 8 - 12;
 
-   /* Safety first: if njunk <= 0, somebody has played with
-      HEADERBYTES without knowing what (s)he did.
-      This is a fatal error */
+	/* Safety first: if njunk <= 0, somebody has played with
+	   HEADERBYTES without knowing what (s)he did.
+	   This is a fatal error */
 
-   if(njunk<=0)
-     {
-       GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] AVI_close_output_file: # of header bytes too small\n"));
-       exit(1);
-     }
+	if(njunk<=0)
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] AVI_close_output_file: # of header bytes too small\n"));
+		exit(1);
+	}
 
-   OUT4CC ("JUNK");
-   OUTLONG(njunk);
-   memset(AVI_header+nhb,0,njunk);
+	OUT4CC ("JUNK");
+	OUTLONG(njunk);
+	memset(AVI_header+nhb,0,njunk);
 
-   nhb += njunk;
+	nhb += njunk;
 
-   /* Start the movi list */
+	/* Start the movi list */
 
-   OUT4CC ("LIST");
-   OUTLONG(movi_len); /* Length of list in bytes */
-   OUT4CC ("movi");
+	OUT4CC ("LIST");
+	OUTLONG(movi_len); /* Length of list in bytes */
+	OUT4CC ("movi");
 
-   /* Output the header, truncate the file to the number of bytes
-      actually written, report an error if someting goes wrong */
+	/* Output the header, truncate the file to the number of bytes
+	   actually written, report an error if someting goes wrong */
 
-   if ( (gf_f64_seek(AVI->fdes, 0, SEEK_SET) ==(u64)-1) ||
-        avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES)!=HEADERBYTES ||
-	(gf_f64_seek(AVI->fdes,AVI->pos,SEEK_SET)==(u64)-1)
-	) {
-       AVI_errno = AVI_ERR_CLOSE;
-       return -1;
-     }
+	if ( (gf_f64_seek(AVI->fdes, 0, SEEK_SET) ==(u64)-1) ||
+	        avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES)!=HEADERBYTES ||
+	        (gf_f64_seek(AVI->fdes,AVI->pos,SEEK_SET)==(u64)-1)
+	   ) {
+		AVI_errno = AVI_ERR_CLOSE;
+		return -1;
+	}
 
-   return 0;
+	return 0;
 }
 
 
@@ -994,117 +1005,117 @@
 
 static int avi_close_output_file(avi_t *AVI)
 {
-   int ret, njunk, sampsize, hasIndex, ms_per_frame, frate, idxerror, flag;
-   u64 movi_len;
-   int hdrl_start, strl_start;
-   u32 j;
-   unsigned char AVI_header[HEADERBYTES];
-   long nhb;
-   unsigned long xd_size, xd_size_align2;
+	int ret, njunk, sampsize, hasIndex, ms_per_frame, frate, idxerror, flag;
+	u64 movi_len;
+	int hdrl_start, strl_start;
+	u32 j;
+	unsigned char AVI_header[HEADERBYTES];
+	long nhb;
+	unsigned long xd_size, xd_size_align2;
 
 #ifdef INFO_LIST
-   long info_len;
-   long id_len, real_id_len;
-   long info_start_pos;
+	long info_len;
+	long id_len, real_id_len;
+	long info_start_pos;
 //   time_t calptr;
 #endif
 
-   /* Calculate length of movi list */
+	/* Calculate length of movi list */
 
-   // dump the rest of the index
-   if (AVI->is_opendml) {
-       int cur_std_idx = AVI->video_superindex->nEntriesInUse-1;
-       u32 audtr;
+	// dump the rest of the index
+	if (AVI->is_opendml) {
+		int cur_std_idx = AVI->video_superindex->nEntriesInUse-1;
+		u32 audtr;
 
 #ifdef DEBUG_ODML
-       GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML dump the rest indices\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] ODML dump the rest indices\n"));
 #endif
-       avi_ixnn_entry (AVI, AVI->video_superindex->stdindex[cur_std_idx],
-	       &AVI->video_superindex->aIndex[cur_std_idx]);
-
-       AVI->video_superindex->aIndex[cur_std_idx].dwDuration =
-	   AVI->video_superindex->stdindex[cur_std_idx]->nEntriesInUse - 1;
-
-       for (audtr = 0; audtr < AVI->anum; audtr++) {
-	    if (!AVI->track[audtr].audio_superindex) {
-		// not initialized -> no index
-		continue;
-	    }
-	   avi_ixnn_entry (AVI, AVI->track[audtr].audio_superindex->stdindex[cur_std_idx],
-		   &AVI->track[audtr].audio_superindex->aIndex[cur_std_idx]);
-	   AVI->track[audtr].audio_superindex->aIndex[cur_std_idx].dwDuration =
-	       AVI->track[audtr].audio_superindex->stdindex[cur_std_idx]->nEntriesInUse - 1;
-	   if (AVI->track[audtr].a_fmt == 0x1) {
-	       AVI->track[audtr].audio_superindex->aIndex[cur_std_idx].dwDuration *=
-		   AVI->track[audtr].a_bits*AVI->track[audtr].a_rate*AVI->track[audtr].a_chans/800;
-	   }
-       }
-       // The AVI->video_superindex->nEntriesInUse contains the offset
-       AVI->video_superindex->stdindex[ cur_std_idx+1 ]->qwBaseOffset = AVI->pos;
-   }
+		avi_ixnn_entry (AVI, AVI->video_superindex->stdindex[cur_std_idx],
+		                &AVI->video_superindex->aIndex[cur_std_idx]);
+
+		AVI->video_superindex->aIndex[cur_std_idx].dwDuration =
+		    AVI->video_superindex->stdindex[cur_std_idx]->nEntriesInUse - 1;
+
+		for (audtr = 0; audtr < AVI->anum; audtr++) {
+			if (!AVI->track[audtr].audio_superindex) {
+				// not initialized -> no index
+				continue;
+			}
+			avi_ixnn_entry (AVI, AVI->track[audtr].audio_superindex->stdindex[cur_std_idx],
+			                &AVI->track[audtr].audio_superindex->aIndex[cur_std_idx]);
+			AVI->track[audtr].audio_superindex->aIndex[cur_std_idx].dwDuration =
+			    AVI->track[audtr].audio_superindex->stdindex[cur_std_idx]->nEntriesInUse - 1;
+			if (AVI->track[audtr].a_fmt == 0x1) {
+				AVI->track[audtr].audio_superindex->aIndex[cur_std_idx].dwDuration *=
+				    AVI->track[audtr].a_bits*AVI->track[audtr].a_rate*AVI->track[audtr].a_chans/800;
+			}
+		}
+		// 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 {
-       movi_len = AVI->pos - HEADERBYTES + 4;
-   }
+	if (AVI->is_opendml) {
+		// Correct!
+		movi_len = AVI->video_superindex->stdindex[ 1 ]->qwBaseOffset - HEADERBYTES+4 - AVI->n_idx*16 - 8;
+	} else {
+		movi_len = AVI->pos - HEADERBYTES + 4;
+	}
 
 
-   /* Try to ouput the index entries. This may fail e.g. if no space
-      is left on device. We will report this as an error, but we still
-      try to write the header correctly (so that the file still may be
-      readable in the most cases */
+	/* Try to ouput the index entries. This may fail e.g. if no space
+	   is left on device. We will report this as an error, but we still
+	   try to write the header correctly (so that the file still may be
+	   readable in the most cases */
 
-   idxerror = 0;
-   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);
-       hasIndex = (ret==0);
-       //GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] pos=%lu, index_len=%d\n", AVI->pos, hasIndex));
+	idxerror = 0;
+	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);
+		hasIndex = (ret==0);
+		//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] pos=%lu, index_len=%d\n", AVI->pos, hasIndex));
 
-       if(ret) {
-	   idxerror = 1;
-	   AVI_errno = AVI_ERR_WRITE_INDEX;
-       }
-   }
+		if(ret) {
+			idxerror = 1;
+			AVI_errno = AVI_ERR_WRITE_INDEX;
+		}
+	}
 
-   /* Calculate Microseconds per frame */
+	/* Calculate Microseconds per frame */
 
-   if(AVI->fps < 0.001) {
-     frate=0;
-     ms_per_frame=0;
-   } else {
-     frate = (int) (FRAME_RATE_SCALE*AVI->fps + 0.5);
-     ms_per_frame=(int) (1000000/AVI->fps + 0.5);
-   }
+	if(AVI->fps < 0.001) {
+		frate=0;
+		ms_per_frame=0;
+	} else {
+		frate = (int) (FRAME_RATE_SCALE*AVI->fps + 0.5);
+		ms_per_frame=(int) (1000000/AVI->fps + 0.5);
+	}
 
-   /* Prepare the file header */
+	/* Prepare the file header */
 
-   nhb = 0;
+	nhb = 0;
 
-   /* The RIFF header */
+	/* The RIFF header */
 
-   OUT4CC ("RIFF");
-   if (AVI->is_opendml) {
-       OUTLONG(AVI->video_superindex->stdindex[ 1 ]->qwBaseOffset - 8);    /* # of bytes to follow */
-   } else {
-       OUTLONG(AVI->pos - 8);    /* # of bytes to follow */
-   }
+	OUT4CC ("RIFF");
+	if (AVI->is_opendml) {
+		OUTLONG(AVI->video_superindex->stdindex[ 1 ]->qwBaseOffset - 8);    /* # of bytes to follow */
+	} else {
+		OUTLONG(AVI->pos - 8);    /* # of bytes to follow */
+	}
 
-   OUT4CC ("AVI ");
+	OUT4CC ("AVI ");
 
-   /* Start the header list */
+	/* Start the header list */
 
-   OUT4CC ("LIST");
-   OUTLONG(0);        /* Length of list in bytes, don't know yet */
-   hdrl_start = nhb;  /* Store start position */
-   OUT4CC ("hdrl");
+	OUT4CC ("LIST");
+	OUTLONG(0);        /* Length of list in bytes, don't know yet */
+	hdrl_start = nhb;  /* Store start position */
+	OUT4CC ("hdrl");
 
-   /* The main AVI header */
+	/* The main AVI header */
 
-   /* The Flags in AVI File header */
+	/* The Flags in AVI File header */
 
 #define AVIF_HASINDEX           0x00000010      /* Index at end of file */
 #define AVIF_MUSTUSEINDEX       0x00000020
@@ -1113,337 +1124,340 @@
 #define AVIF_WASCAPTUREFILE     0x00010000
 #define AVIF_COPYRIGHTED        0x00020000
 
-   OUT4CC ("avih");
-   OUTLONG(56);                 /* # of bytes to follow */
-   OUTLONG(ms_per_frame);       /* Microseconds per frame */
-   //ThOe ->0
-   //   OUTLONG(10000000);           /* MaxBytesPerSec, I hope this will never be used */
-   OUTLONG(0);
-   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;
-   OUTLONG(flag);               /* Flags */
-   OUTLONG(AVI->video_frames);  /* TotalFrames */
-   OUTLONG(0);                  /* InitialFrames */
-
-   OUTLONG(AVI->anum+1);
+	OUT4CC ("avih");
+	OUTLONG(56);                 /* # of bytes to follow */
+	OUTLONG(ms_per_frame);       /* Microseconds per frame */
+	//ThOe ->0
+	//   OUTLONG(10000000);           /* MaxBytesPerSec, I hope this will never be used */
+	OUTLONG(0);
+	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;
+	OUTLONG(flag);               /* Flags */
+	OUTLONG(AVI->video_frames);  /* TotalFrames */
+	OUTLONG(0);                  /* InitialFrames */
+
+	OUTLONG(AVI->anum+1);
 //   if (AVI->track[0].audio_bytes)
 //      { OUTLONG(2); }           /* Streams */
 //   else
 //      { OUTLONG(1); }           /* Streams */
 
-   OUTLONG(0);                  /* SuggestedBufferSize */
-   OUTLONG(AVI->width);         /* Width */
-   OUTLONG(AVI->height);        /* Height */
-                                /* MS calls the following 'reserved': */
-   OUTLONG(0);                  /* TimeScale:  Unit used to measure time */
-   OUTLONG(0);                  /* DataRate:   Data rate of playback     */
-   OUTLONG(0);                  /* StartTime:  Starting time of AVI data */
-   OUTLONG(0);                  /* DataLength: Size of AVI data chunk    */
-
-
-   /* Start the video stream list ---------------------------------- */
-
-   OUT4CC ("LIST");
-   OUTLONG(0);        /* Length of list in bytes, don't know yet */
-   strl_start = nhb;  /* Store start position */
-   OUT4CC ("strl");
-
-   /* The video stream header */
-
-   OUT4CC ("strh");
-   OUTLONG(56);                 /* # of bytes to follow */
-   OUT4CC ("vids");             /* Type */
-   OUT4CC (AVI->compressor);    /* Handler */
-   OUTLONG(0);                  /* Flags */
-   OUTLONG(0);                  /* Reserved, MS says: wPriority, wLanguage */
-   OUTLONG(0);                  /* InitialFrames */
-   OUTLONG(FRAME_RATE_SCALE);   /* Scale */
-   OUTLONG(frate);              /* Rate: Rate/Scale == samples/second */
-   OUTLONG(0);                  /* Start */
-   OUTLONG(AVI->video_frames);  /* Length */
-   OUTLONG(AVI->max_len);       /* SuggestedBufferSize */
-   OUTLONG(0);                  /* Quality */
-   OUTLONG(0);                  /* SampleSize */
-   OUTLONG(0);                  /* Frame */
-   OUTLONG(0);                  /* Frame */
-   //OUTLONG(0);                  /* Frame */
-   //OUTLONG(0);                  /* Frame */
-
-   /* The video stream format */
-
-   xd_size        = AVI->extradata_size;
-   xd_size_align2 = (AVI->extradata_size+1) & ~1;
-
-   OUT4CC ("strf");
-   OUTLONG(40 + xd_size_align2);/* # of bytes to follow */
-   OUTLONG(40 + xd_size);	/* Size */
-   OUTLONG(AVI->width);         /* Width */
-   OUTLONG(AVI->height);        /* Height */
-   OUTSHRT(1); OUTSHRT(24);     /* Planes, Count */
-   OUT4CC (AVI->compressor);    /* Compression */
-   // ThOe (*3)
-   OUTLONG(AVI->width*AVI->height*3);  /* SizeImage (in bytes?) */
-   OUTLONG(0);                  /* XPelsPerMeter */
-   OUTLONG(0);                  /* YPelsPerMeter */
-   OUTLONG(0);                  /* ClrUsed: Number of colors used */
-   OUTLONG(0);                  /* ClrImportant: Number of colors important */
-
-   // write extradata if present
-   if (xd_size > 0 && AVI->extradata) {
-      OUTMEM(AVI->extradata, xd_size);
-      if (xd_size != xd_size_align2) {
-         OUTCHR(0);
-      }
-   }
-
-   // dump index of indices for audio
-   if (AVI->is_opendml) {
-       u32 k;
-
-       OUT4CC(AVI->video_superindex->fcc);
-       OUTLONG(2+1+1+4+4+3*4 + AVI->video_superindex->nEntriesInUse * (8+4+4));
-       OUTSHRT(AVI->video_superindex->wLongsPerEntry);
-       OUTCHR(AVI->video_superindex->bIndexSubType);
-       OUTCHR(AVI->video_superindex->bIndexType);
-       OUTLONG(AVI->video_superindex->nEntriesInUse);
-       OUT4CC(AVI->video_superindex->dwChunkId);
-       OUTLONG(0);
-       OUTLONG(0);
-       OUTLONG(0);
-
-
-       for (k = 0; k < AVI->video_superindex->nEntriesInUse; k++) {
-	   u32 r = (u32) ((AVI->video_superindex->aIndex[k].qwOffset >> 32) & 0xffffffff);
-	   u32 s = (u32) ((AVI->video_superindex->aIndex[k].qwOffset) & 0xffffffff);
+	OUTLONG(0);                  /* SuggestedBufferSize */
+	OUTLONG(AVI->width);         /* Width */
+	OUTLONG(AVI->height);        /* Height */
+	/* MS calls the following 'reserved': */
+	OUTLONG(0);                  /* TimeScale:  Unit used to measure time */
+	OUTLONG(0);                  /* DataRate:   Data rate of playback     */
+	OUTLONG(0);                  /* StartTime:  Starting time of AVI data */
+	OUTLONG(0);                  /* DataLength: Size of AVI data chunk    */
+
+
+	/* Start the video stream list ---------------------------------- */
+
+	OUT4CC ("LIST");
+	OUTLONG(0);        /* Length of list in bytes, don't know yet */
+	strl_start = nhb;  /* Store start position */
+	OUT4CC ("strl");
+
+	/* The video stream header */
+
+	OUT4CC ("strh");
+	OUTLONG(56);                 /* # of bytes to follow */
+	OUT4CC ("vids");             /* Type */
+	OUT4CC (AVI->compressor);    /* Handler */
+	OUTLONG(0);                  /* Flags */
+	OUTLONG(0);                  /* Reserved, MS says: wPriority, wLanguage */
+	OUTLONG(0);                  /* InitialFrames */
+	OUTLONG(FRAME_RATE_SCALE);   /* Scale */
+	OUTLONG(frate);              /* Rate: Rate/Scale == samples/second */
+	OUTLONG(0);                  /* Start */
+	OUTLONG(AVI->video_frames);  /* Length */
+	OUTLONG(AVI->max_len);       /* SuggestedBufferSize */
+	OUTLONG(0);                  /* Quality */
+	OUTLONG(0);                  /* SampleSize */
+	OUTLONG(0);                  /* Frame */
+	OUTLONG(0);                  /* Frame */
+	//OUTLONG(0);                  /* Frame */
+	//OUTLONG(0);                  /* Frame */
+
+	/* The video stream format */
+
+	xd_size        = AVI->extradata_size;
+	xd_size_align2 = (AVI->extradata_size+1) & ~1;
+
+	OUT4CC ("strf");
+	OUTLONG(40 + xd_size_align2);/* # of bytes to follow */
+	OUTLONG(40 + xd_size);	/* Size */
+	OUTLONG(AVI->width);         /* Width */
+	OUTLONG(AVI->height);        /* Height */
+	OUTSHRT(1);
+	OUTSHRT(24);     /* Planes, Count */
+	OUT4CC (AVI->compressor);    /* Compression */
+	// ThOe (*3)
+	OUTLONG(AVI->width*AVI->height*3);  /* SizeImage (in bytes?) */
+	OUTLONG(0);                  /* XPelsPerMeter */
+	OUTLONG(0);                  /* YPelsPerMeter */
+	OUTLONG(0);                  /* ClrUsed: Number of colors used */
+	OUTLONG(0);                  /* ClrImportant: Number of colors important */
+
+	// write extradata if present
+	if (xd_size > 0 && AVI->extradata) {
+		OUTMEM(AVI->extradata, xd_size);
+		if (xd_size != xd_size_align2) {
+			OUTCHR(0);
+		}
+	}
 
-	   OUTLONG(s);
-	   OUTLONG(r);
-	   OUTLONG(AVI->video_superindex->aIndex[k].dwSize);
-	   OUTLONG(AVI->video_superindex->aIndex[k].dwDuration);
-       }
+	// dump index of indices for audio
+	if (AVI->is_opendml) {
+		u32 k;
+
+		OUT4CC(AVI->video_superindex->fcc);
+		OUTLONG(2+1+1+4+4+3*4 + AVI->video_superindex->nEntriesInUse * (8+4+4));
+		OUTSHRT(AVI->video_superindex->wLongsPerEntry);
+		OUTCHR(AVI->video_superindex->bIndexSubType);
+		OUTCHR(AVI->video_superindex->bIndexType);
+		OUTLONG(AVI->video_superindex->nEntriesInUse);
+		OUT4CC(AVI->video_superindex->dwChunkId);
+		OUTLONG(0);
+		OUTLONG(0);
+		OUTLONG(0);
+
+
+		for (k = 0; k < AVI->video_superindex->nEntriesInUse; k++) {
+			u32 r = (u32) ((AVI->video_superindex->aIndex[k].qwOffset >> 32) & 0xffffffff);
+			u32 s = (u32) ((AVI->video_superindex->aIndex[k].qwOffset) & 0xffffffff);
+
+			OUTLONG(s);
+			OUTLONG(r);
+			OUTLONG(AVI->video_superindex->aIndex[k].dwSize);
+			OUTLONG(AVI->video_superindex->aIndex[k].dwDuration);
+		}
 
-   }
+	}
 
-   /* Finish stream list, i.e. put number of bytes in the list to proper pos */
-
-   long2str(AVI_header+strl_start-4,nhb-strl_start);
-
-   /* Start the audio stream list ---------------------------------- */
-
-   for(j=0; j<AVI->anum; ++j) {
-
-     //if (AVI->track[j].a_chans && AVI->track[j].audio_bytes)
-       {
-	 unsigned long nBlockAlign = 0;
-	 unsigned long avgbsec = 0;
-	 unsigned long scalerate = 0;
-
-	 sampsize = avi_sampsize(AVI, j);
-	 sampsize = AVI->track[j].a_fmt==0x1?sampsize*4:sampsize;
-
-	 nBlockAlign = (AVI->track[j].a_rate<32000)?576:1152;
-	 /*
-	 GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] XXX sampsize (%d) block (%ld) rate (%ld) audio_bytes (%ld) mp3rate(%ld,%ld)\n",
-		 sampsize, nBlockAlign, AVI->track[j].a_rate,
-		 (long int)AVI->track[j].audio_bytes,
-		 1000*AVI->track[j].mp3rate/8, AVI->track[j].mp3rate));
-		 */
-
-	 if (AVI->track[j].a_fmt==0x1) {
-	     sampsize = (AVI->track[j].a_chans<2)?sampsize/2:sampsize;
-	     avgbsec = AVI->track[j].a_rate*sampsize/4;
-	     scalerate = AVI->track[j].a_rate*sampsize/4;
-	 } else  {
-	     avgbsec = 1000*AVI->track[j].mp3rate/8;
-	     scalerate = 1000*AVI->track[j].mp3rate/8;
-	 }
-
-	 OUT4CC ("LIST");
-	 OUTLONG(0);        /* Length of list in bytes, don't know yet */
-	 strl_start = nhb;  /* Store start position */
-	 OUT4CC ("strl");
-
-	 /* The audio stream header */
-
-	 OUT4CC ("strh");
-	 OUTLONG(56);            /* # of bytes to follow */
-	 OUT4CC ("auds");
-
-	 // -----------
-	 // ThOe
-	 OUTLONG(0);             /* Format (Optionally) */
-	   // -----------
-
-	 OUTLONG(0);             /* Flags */
-	 OUTLONG(0);             /* Reserved, MS says: wPriority, wLanguage */
-	 OUTLONG(0);             /* InitialFrames */
-
-	 // VBR
-	 if (AVI->track[j].a_fmt == 0x55 && AVI->track[j].a_vbr) {
-	     OUTLONG(nBlockAlign);                   /* Scale */
-	     OUTLONG(AVI->track[j].a_rate);          /* Rate */
-	     OUTLONG(0);                             /* Start */
-	     OUTLONG(AVI->track[j].audio_chunks);    /* Length */
-	     OUTLONG(0);                      /* SuggestedBufferSize */
-	     OUTLONG(0);                             /* Quality */
-	     OUTLONG(0);                             /* SampleSize */
-	     OUTLONG(0);                             /* Frame */
-	     OUTLONG(0);                             /* Frame */
-	 } else {
-	     OUTLONG(sampsize/4);                    /* Scale */
-	     OUTLONG(scalerate);  /* Rate */
-	     OUTLONG(0);                             /* Start */
-	     OUTLONG(4*AVI->track[j].audio_bytes/sampsize);   /* Length */
-	     OUTLONG(0);                             /* SuggestedBufferSize */
-	     OUTLONG(0xffffffff);                             /* Quality */
-	     OUTLONG(sampsize/4);                    /* SampleSize */
-	     OUTLONG(0);                             /* Frame */
-	     OUTLONG(0);                             /* Frame */
-	 }
-
-	 /* The audio stream format */
-
-	 OUT4CC ("strf");
-
-	 if (AVI->track[j].a_fmt == 0x55 && AVI->track[j].a_vbr) {
-
-	     OUTLONG(30);                            /* # of bytes to follow */ // mplayer writes 28
-	     OUTSHRT(AVI->track[j].a_fmt);           /* Format */                  // 2
-	     OUTSHRT(AVI->track[j].a_chans);         /* Number of channels */      // 2
-	     OUTLONG(AVI->track[j].a_rate);          /* SamplesPerSec */           // 4
-	     //ThOe/tibit
-	     OUTLONG(1000*AVI->track[j].mp3rate/8);  /* maybe we should write an avg. */ // 4
-	     OUTSHRT(nBlockAlign);                   /* BlockAlign */              // 2
-	     OUTSHRT(AVI->track[j].a_bits);          /* BitsPerSample */           // 2
-
-	     OUTSHRT(12);                           /* cbSize */                   // 2
-	     OUTSHRT(1);                            /* wID */                      // 2
-	     OUTLONG(2);                            /* fdwFlags */                 // 4
-	     OUTSHRT(nBlockAlign);                  /* nBlockSize */               // 2
-	     OUTSHRT(1);                            /* nFramesPerBlock */          // 2
-	     OUTSHRT(0);                            /* nCodecDelay */              // 2
-
-	 } else if (AVI->track[j].a_fmt == 0x55 && !AVI->track[j].a_vbr) {
-
-	     OUTLONG(30);                            /* # of bytes to follow */
-	     OUTSHRT(AVI->track[j].a_fmt);           /* Format */
-	     OUTSHRT(AVI->track[j].a_chans);         /* Number of channels */
-	     OUTLONG(AVI->track[j].a_rate);          /* SamplesPerSec */
-	     //ThOe/tibit
-	     OUTLONG(1000*AVI->track[j].mp3rate/8);
-	     OUTSHRT(sampsize/4);                    /* BlockAlign */
-	     OUTSHRT(AVI->track[j].a_bits);          /* BitsPerSample */
-
-	     OUTSHRT(12);                           /* cbSize */
-	     OUTSHRT(1);                            /* wID */
-	     OUTLONG(2);                            /* fdwFlags */
-	     OUTSHRT(nBlockAlign);                  /* nBlockSize */
-	     OUTSHRT(1);                            /* nFramesPerBlock */
-	     OUTSHRT(0);                            /* nCodecDelay */
-
-	 } else {
-
-	     OUTLONG(18);                   /* # of bytes to follow */
-	     OUTSHRT(AVI->track[j].a_fmt);           /* Format */
-	     OUTSHRT(AVI->track[j].a_chans);         /* Number of channels */
-	     OUTLONG(AVI->track[j].a_rate);          /* SamplesPerSec */
-	     //ThOe/tibit
-	     OUTLONG(avgbsec);  /* Avg bytes/sec */
-	     OUTSHRT(sampsize/4);                    /* BlockAlign */
-	     OUTSHRT(AVI->track[j].a_bits);          /* BitsPerSample */
-	     OUTSHRT(0);                           /* cbSize */
-
-	 }
-       }
-       if (AVI->is_opendml) {
-		   u32 k;
-
-	    if (!AVI->track[j].audio_superindex) {
-		// not initialized -> no index
-		continue;
-	    }
-
-	   OUT4CC(AVI->track[j].audio_superindex->fcc);    /* "indx" */
-	   OUTLONG(2+1+1+4+4+3*4 + AVI->track[j].audio_superindex->nEntriesInUse * (8+4+4));
-	   OUTSHRT(AVI->track[j].audio_superindex->wLongsPerEntry);
-	   OUTCHR(AVI->track[j].audio_superindex->bIndexSubType);
-	   OUTCHR(AVI->track[j].audio_superindex->bIndexType);
-	   OUTLONG(AVI->track[j].audio_superindex->nEntriesInUse);
-	   OUT4CC(AVI->track[j].audio_superindex->dwChunkId);
-	   OUTLONG(0); OUTLONG(0); OUTLONG(0);
-
-	   for (k = 0; k < AVI->track[j].audio_superindex->nEntriesInUse; k++) {
-	       u32 r = (u32) ((AVI->track[j].audio_superindex->aIndex[k].qwOffset >> 32) & 0xffffffff);
-	       u32 s = (u32) ((AVI->track[j].audio_superindex->aIndex[k].qwOffset) & 0xffffffff);
-
-	       /*
-	       GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] AUD[%d] NrEntries %d/%ld (%c%c%c%c) |0x%llX|%ld|%ld| \n",  j, k,
-	               AVI->track[j].audio_superindex->nEntriesInUse,
-		       AVI->track[j].audio_superindex->dwChunkId[0], AVI->track[j].audio_superindex->dwChunkId[1],
-		       AVI->track[j].audio_superindex->dwChunkId[2], AVI->track[j].audio_superindex->dwChunkId[3],
-		       AVI->track[j].audio_superindex->aIndex[k].qwOffset,
-		       AVI->track[j].audio_superindex->aIndex[k].dwSize,
-		       AVI->track[j].audio_superindex->aIndex[k].dwDuration
-		     ));
-		     */
-
-	       OUTLONG(s);
-	       OUTLONG(r);
-	       OUTLONG(AVI->track[j].audio_superindex->aIndex[k].dwSize);
-	       OUTLONG(AVI->track[j].audio_superindex->aIndex[k].dwDuration);
-	   }
-       }
-       /* Finish stream list, i.e. put number of bytes in the list to proper pos */
-       long2str(AVI_header+strl_start-4,nhb-strl_start);
-   }
+	/* Finish stream list, i.e. put number of bytes in the list to proper pos */
+
+	long2str(AVI_header+strl_start-4,nhb-strl_start);
+
+	/* Start the audio stream list ---------------------------------- */
+
+	for(j=0; j<AVI->anum; ++j) {
+
+		//if (AVI->track[j].a_chans && AVI->track[j].audio_bytes)
+		{
+			unsigned long nBlockAlign = 0;
+			unsigned long avgbsec = 0;
+			unsigned long scalerate = 0;
+
+			sampsize = avi_sampsize(AVI, j);
+			sampsize = AVI->track[j].a_fmt==0x1?sampsize*4:sampsize;
+
+			nBlockAlign = (AVI->track[j].a_rate<32000)?576:1152;
+			/*
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] XXX sampsize (%d) block (%ld) rate (%ld) audio_bytes (%ld) mp3rate(%ld,%ld)\n",
+			 sampsize, nBlockAlign, AVI->track[j].a_rate,
+			 (long int)AVI->track[j].audio_bytes,
+			 1000*AVI->track[j].mp3rate/8, AVI->track[j].mp3rate));
+			 */
+
+			if (AVI->track[j].a_fmt==0x1) {
+				sampsize = (AVI->track[j].a_chans<2)?sampsize/2:sampsize;
+				avgbsec = AVI->track[j].a_rate*sampsize/4;
+				scalerate = AVI->track[j].a_rate*sampsize/4;
+			} else  {
+				avgbsec = 1000*AVI->track[j].mp3rate/8;
+				scalerate = 1000*AVI->track[j].mp3rate/8;
+			}
+
+			OUT4CC ("LIST");
+			OUTLONG(0);        /* Length of list in bytes, don't know yet */
+			strl_start = nhb;  /* Store start position */
+			OUT4CC ("strl");
+
+			/* The audio stream header */
+
+			OUT4CC ("strh");
+			OUTLONG(56);            /* # of bytes to follow */
+			OUT4CC ("auds");
+
+			// -----------
+			// ThOe
+			OUTLONG(0);             /* Format (Optionally) */
+			// -----------
+
+			OUTLONG(0);             /* Flags */
+			OUTLONG(0);             /* Reserved, MS says: wPriority, wLanguage */
+			OUTLONG(0);             /* InitialFrames */
+
+			// VBR
+			if (AVI->track[j].a_fmt == 0x55 && AVI->track[j].a_vbr) {
+				OUTLONG(nBlockAlign);                   /* Scale */
+				OUTLONG(AVI->track[j].a_rate);          /* Rate */
+				OUTLONG(0);                             /* Start */
+				OUTLONG(AVI->track[j].audio_chunks);    /* Length */
+				OUTLONG(0);                      /* SuggestedBufferSize */
+				OUTLONG(0);                             /* Quality */
+				OUTLONG(0);                             /* SampleSize */
+				OUTLONG(0);                             /* Frame */
+				OUTLONG(0);                             /* Frame */
+			} else {
+				OUTLONG(sampsize/4);                    /* Scale */
+				OUTLONG(scalerate);  /* Rate */
+				OUTLONG(0);                             /* Start */
+				OUTLONG(4*AVI->track[j].audio_bytes/sampsize);   /* Length */
+				OUTLONG(0);                             /* SuggestedBufferSize */
+				OUTLONG(0xffffffff);                             /* Quality */
+				OUTLONG(sampsize/4);                    /* SampleSize */
+				OUTLONG(0);                             /* Frame */
+				OUTLONG(0);                             /* Frame */
+			}
+
+			/* The audio stream format */
+
+			OUT4CC ("strf");
+
+			if (AVI->track[j].a_fmt == 0x55 && AVI->track[j].a_vbr) {
+
+				OUTLONG(30);                            /* # of bytes to follow */ // mplayer writes 28
+				OUTSHRT(AVI->track[j].a_fmt);           /* Format */                  // 2
+				OUTSHRT(AVI->track[j].a_chans);         /* Number of channels */      // 2
+				OUTLONG(AVI->track[j].a_rate);          /* SamplesPerSec */           // 4
+				//ThOe/tibit
+				OUTLONG(1000*AVI->track[j].mp3rate/8);  /* maybe we should write an avg. */ // 4
+				OUTSHRT(nBlockAlign);                   /* BlockAlign */              // 2
+				OUTSHRT(AVI->track[j].a_bits);          /* BitsPerSample */           // 2
+
+				OUTSHRT(12);                           /* cbSize */                   // 2
+				OUTSHRT(1);                            /* wID */                      // 2
+				OUTLONG(2);                            /* fdwFlags */                 // 4
+				OUTSHRT(nBlockAlign);                  /* nBlockSize */               // 2
+				OUTSHRT(1);                            /* nFramesPerBlock */          // 2
+				OUTSHRT(0);                            /* nCodecDelay */              // 2
+
+			} else if (AVI->track[j].a_fmt == 0x55 && !AVI->track[j].a_vbr) {
+
+				OUTLONG(30);                            /* # of bytes to follow */
+				OUTSHRT(AVI->track[j].a_fmt);           /* Format */
+				OUTSHRT(AVI->track[j].a_chans);         /* Number of channels */
+				OUTLONG(AVI->track[j].a_rate);          /* SamplesPerSec */
+				//ThOe/tibit
+				OUTLONG(1000*AVI->track[j].mp3rate/8);
+				OUTSHRT(sampsize/4);                    /* BlockAlign */
+				OUTSHRT(AVI->track[j].a_bits);          /* BitsPerSample */
+
+				OUTSHRT(12);                           /* cbSize */
+				OUTSHRT(1);                            /* wID */
+				OUTLONG(2);                            /* fdwFlags */
+				OUTSHRT(nBlockAlign);                  /* nBlockSize */
+				OUTSHRT(1);                            /* nFramesPerBlock */
+				OUTSHRT(0);                            /* nCodecDelay */
+
+			} else {
+
+				OUTLONG(18);                   /* # of bytes to follow */
+				OUTSHRT(AVI->track[j].a_fmt);           /* Format */
+				OUTSHRT(AVI->track[j].a_chans);         /* Number of channels */
+				OUTLONG(AVI->track[j].a_rate);          /* SamplesPerSec */
+				//ThOe/tibit
+				OUTLONG(avgbsec);  /* Avg bytes/sec */
+				OUTSHRT(sampsize/4);                    /* BlockAlign */
+				OUTSHRT(AVI->track[j].a_bits);          /* BitsPerSample */
+				OUTSHRT(0);                           /* cbSize */
+
+			}
+		}
+		if (AVI->is_opendml) {
+			u32 k;
+
+			if (!AVI->track[j].audio_superindex) {
+				// not initialized -> no index
+				continue;
+			}
+
+			OUT4CC(AVI->track[j].audio_superindex->fcc);    /* "indx" */
+			OUTLONG(2+1+1+4+4+3*4 + AVI->track[j].audio_superindex->nEntriesInUse * (8+4+4));
+			OUTSHRT(AVI->track[j].audio_superindex->wLongsPerEntry);
+			OUTCHR(AVI->track[j].audio_superindex->bIndexSubType);
+			OUTCHR(AVI->track[j].audio_superindex->bIndexType);
+			OUTLONG(AVI->track[j].audio_superindex->nEntriesInUse);
+			OUT4CC(AVI->track[j].audio_superindex->dwChunkId);
+			OUTLONG(0);
+			OUTLONG(0);
+			OUTLONG(0);
+
+			for (k = 0; k < AVI->track[j].audio_superindex->nEntriesInUse; k++) {
+				u32 r = (u32) ((AVI->track[j].audio_superindex->aIndex[k].qwOffset >> 32) & 0xffffffff);
+				u32 s = (u32) ((AVI->track[j].audio_superindex->aIndex[k].qwOffset) & 0xffffffff);
+
+				/*
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] AUD[%d] NrEntries %d/%ld (%c%c%c%c) |0x%llX|%ld|%ld| \n",  j, k,
+				        AVI->track[j].audio_superindex->nEntriesInUse,
+				    AVI->track[j].audio_superindex->dwChunkId[0], AVI->track[j].audio_superindex->dwChunkId[1],
+				    AVI->track[j].audio_superindex->dwChunkId[2], AVI->track[j].audio_superindex->dwChunkId[3],
+				    AVI->track[j].audio_superindex->aIndex[k].qwOffset,
+				    AVI->track[j].audio_superindex->aIndex[k].dwSize,
+				    AVI->track[j].audio_superindex->aIndex[k].dwDuration
+				  ));
+				  */
+
+				OUTLONG(s);
+				OUTLONG(r);
+				OUTLONG(AVI->track[j].audio_superindex->aIndex[k].dwSize);
+				OUTLONG(AVI->track[j].audio_superindex->aIndex[k].dwDuration);
+			}
+		}
+		/* Finish stream list, i.e. put number of bytes in the list to proper pos */
+		long2str(AVI_header+strl_start-4,nhb-strl_start);
+	}
 
-   if (AVI->is_opendml) {
-       OUT4CC("LIST");
-       OUTLONG(16);
-       OUT4CC("odml");
-       OUT4CC("dmlh");
-       OUTLONG(4);
-       OUTLONG(AVI->total_frames);
-   }
+	if (AVI->is_opendml) {
+		OUT4CC("LIST");
+		OUTLONG(16);
+		OUT4CC("odml");
+		OUT4CC("dmlh");
+		OUTLONG(4);
+		OUTLONG(AVI->total_frames);
+	}
 
-   /* Finish header list */
+	/* Finish header list */
 
-   long2str(AVI_header+hdrl_start-4,nhb-hdrl_start);
+	long2str(AVI_header+hdrl_start-4,nhb-hdrl_start);
 
 
-   // add INFO list --- (0.6.0pre4)
+	// add INFO list --- (0.6.0pre4)
 
 #ifdef INFO_LIST
-   OUT4CC ("LIST");
+	OUT4CC ("LIST");
 
-   info_start_pos = nhb;
-   info_len = MAX_INFO_STRLEN + 12;
-   OUTLONG(info_len); // rewritten later
-   OUT4CC ("INFO");
+	info_start_pos = nhb;
+	info_len = MAX_INFO_STRLEN + 12;
+	OUTLONG(info_len); // rewritten later
+	OUT4CC ("INFO");
 
-   OUT4CC ("ISFT");
-   //OUTLONG(MAX_INFO_STRLEN);
-   memset(id_str, 0, MAX_INFO_STRLEN);
+	OUT4CC ("ISFT");
+	//OUTLONG(MAX_INFO_STRLEN);
+	memset(id_str, 0, MAX_INFO_STRLEN);
 
-   sprintf(id_str, "%s-%s", PACKAGE, VERSION);
-   real_id_len = id_len = (u32) strlen(id_str)+1;
-   if (id_len&1) id_len++;
+	sprintf(id_str, "%s-%s", PACKAGE, VERSION);
+	real_id_len = id_len = (u32) strlen(id_str)+1;
+	if (id_len&1) id_len++;
 
-   OUTLONG(real_id_len);
+	OUTLONG(real_id_len);
 
-   memset(AVI_header+nhb, 0, id_len);
-   memcpy(AVI_header+nhb, id_str, id_len);
-   nhb += id_len;
+	memset(AVI_header+nhb, 0, id_len);
+	memcpy(AVI_header+nhb, id_str, id_len);
+	nhb += id_len;
 
-   info_len = 0;
+	info_len = 0;
 
-   // write correct len
-   long2str(AVI_header+info_start_pos, info_len + id_len + 4+4+4);
+	// write correct len
+	long2str(AVI_header+info_start_pos, info_len + id_len + 4+4+4);
 
-   nhb += info_len;
+	nhb += info_len;
 
 //   OUT4CC ("ICMT");
 //   OUTLONG(MAX_INFO_STRLEN);
@@ -1455,72 +1469,72 @@
 //   nhb += MAX_INFO_STRLEN;
 #endif
 
-   // ----------------------------
+	// ----------------------------
 
-   /* Calculate the needed amount of junk bytes, output junk */
+	/* Calculate the needed amount of junk bytes, output junk */
 
-   njunk = HEADERBYTES - nhb - 8 - 12;
+	njunk = HEADERBYTES - nhb - 8 - 12;
 
-   /* Safety first: if njunk <= 0, somebody has played with
-      HEADERBYTES without knowing what (s)he did.
-      This is a fatal error */
+	/* Safety first: if njunk <= 0, somebody has played with
+	   HEADERBYTES without knowing what (s)he did.
+	   This is a fatal error */
 
-   if(njunk<=0)
-   {
-      GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] AVI_close_output_file: # of header bytes too small\n"));
-      exit(1);
-   }
+	if(njunk<=0)
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] AVI_close_output_file: # of header bytes too small\n"));
+		exit(1);
+	}
 
-   OUT4CC ("JUNK");
-   OUTLONG(njunk);
-   memset(AVI_header+nhb,0,njunk);
+	OUT4CC ("JUNK");
+	OUTLONG(njunk);
+	memset(AVI_header+nhb,0,njunk);
 
-   nhb += njunk;
+	nhb += njunk;
 
-   /* Start the movi list */
+	/* Start the movi list */
 
-   OUT4CC ("LIST");
-   OUTLONG(movi_len); /* Length of list in bytes */
-   OUT4CC ("movi");
+	OUT4CC ("LIST");
+	OUTLONG(movi_len); /* Length of list in bytes */
+	OUT4CC ("movi");
 
-   /* Output the header, truncate the file to the number of bytes
-      actually written, report an error if someting goes wrong */
+	/* Output the header, truncate the file to the number of bytes
+	   actually written, report an error if someting goes wrong */
 
-   if ( (gf_f64_seek(AVI->fdes,0,SEEK_SET)==(u64)-1) ||
-        avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES)!=HEADERBYTES
+	if ( (gf_f64_seek(AVI->fdes,0,SEEK_SET)==(u64)-1) ||
+	        avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES)!=HEADERBYTES
 //		|| ftruncate(AVI->fdes,AVI->pos)<0
-		)
-   {
-      AVI_errno = AVI_ERR_CLOSE;
-      return -1;
-   }
+	   )
+	{
+		AVI_errno = AVI_ERR_CLOSE;
+		return -1;
+	}
 
 
-   // Fix up the empty additional RIFF and LIST chunks
-   if (AVI->is_opendml) {
-		   u32 k;
-       char f[4];
-       u32 len;
-
-       for (k=1; k<AVI->video_superindex->nEntriesInUse; k++) {
-	    // the len of the RIFF Chunk
-	    gf_f64_seek(AVI->fdes, AVI->video_superindex->stdindex[k]->qwBaseOffset+4, SEEK_SET);
-	    len = (u32) (AVI->video_superindex->stdindex[k+1]->qwBaseOffset - AVI->video_superindex->stdindex[k]->qwBaseOffset - 8);
-	    long2str((unsigned char *)f, len);
-	    avi_write(AVI->fdes, f, 4);
-
-	    // len of the LIST/movi chunk
-	    gf_f64_seek(AVI->fdes, 8, SEEK_CUR);
-	    len -= 12;
-	    long2str((unsigned char *)f, len);
-	    avi_write(AVI->fdes, f, 4);
-       }
-   }
+	// Fix up the empty additional RIFF and LIST chunks
+	if (AVI->is_opendml) {
+		u32 k;
+		char f[4];
+		u32 len;
+
+		for (k=1; k<AVI->video_superindex->nEntriesInUse; k++) {
+			// the len of the RIFF Chunk
+			gf_f64_seek(AVI->fdes, AVI->video_superindex->stdindex[k]->qwBaseOffset+4, SEEK_SET);
+			len = (u32) (AVI->video_superindex->stdindex[k+1]->qwBaseOffset - AVI->video_superindex->stdindex[k]->qwBaseOffset - 8);
+			long2str((unsigned char *)f, len);
+			avi_write(AVI->fdes, f, 4);
+
+			// len of the LIST/movi chunk
+			gf_f64_seek(AVI->fdes, 8, SEEK_CUR);
+			len -= 12;
+			long2str((unsigned char *)f, len);
+			avi_write(AVI->fdes, f, 4);
+		}
+	}
 
 
-   if(idxerror) return -1;
+	if(idxerror) return -1;
 
-   return 0;
+	return 0;
 }
 
 /*
@@ -1535,165 +1549,177 @@
 
 static int avi_write_data(avi_t *AVI, char *data, unsigned long length, int audio, int keyframe)
 {
-   int n = 0;
+	int n = 0;
 
-   unsigned char astr[5];
+	unsigned char astr[5];
 
-   // transcode core itself checks for the size -- unneeded and
-   // does harm to xvid 2pass encodes where the first pass can get
-   // _very_ large -- tibit.
+	// transcode core itself checks for the size -- unneeded and
+	// does harm to xvid 2pass encodes where the first pass can get
+	// _very_ large -- tibit.
 
 #if 0
-   /* Check for maximum file length */
+	/* Check for maximum file length */
 
-   if ( (AVI->pos + 8 + length + 8 + (AVI->n_idx+1)*16) > AVI_MAX_LEN ) {
-     AVI_errno = AVI_ERR_SIZELIM;
-     return -1;
-   }
+	if ( (AVI->pos + 8 + length + 8 + (AVI->n_idx+1)*16) > AVI_MAX_LEN ) {
+		AVI_errno = AVI_ERR_SIZELIM;
+		return -1;
+	}
 #endif
 
-   /* Add index entry */
+	/* Add index entry */
 
-   //set tag for current audio track
-   sprintf((char *)astr, "0%1dwb", (int)(AVI->aptr+1));
+	//set tag for current audio track
+	sprintf((char *)astr, "0%1dwb", (int)(AVI->aptr+1));
 
-   if(audio) {
-     if (!AVI->is_opendml) n = avi_add_index_entry(AVI,astr,0x10,AVI->pos,length);
-     n += avi_add_odml_index_entry(AVI,astr,0x10,AVI->pos,length);
-   } else {
-     if (!AVI->is_opendml) n = avi_add_index_entry(AVI,(unsigned char *)"00db",((keyframe)?0x10:0x0),AVI->pos,length);
-     n += avi_add_odml_index_entry(AVI,(unsigned char *)"00db",((keyframe)?0x10:0x0),AVI->pos,length);
-   }
+	if(audio) {
+		if (!AVI->is_opendml) n = avi_add_index_entry(AVI,astr,0x10,AVI->pos,length);
+		n += avi_add_odml_index_entry(AVI,astr,0x10,AVI->pos,length);
+	} else {
+		if (!AVI->is_opendml) n = avi_add_index_entry(AVI,(unsigned char *)"00db",((keyframe)?0x10:0x0),AVI->pos,length);
+		n += avi_add_odml_index_entry(AVI,(unsigned char *)"00db",((keyframe)?0x10:0x0),AVI->pos,length);
+	}
 
-   if(n) return -1;
+	if(n) return -1;
 
-   /* Output tag and data */
+	/* Output tag and data */
 
-   if(audio)
-     n = avi_add_chunk(AVI,(unsigned char *)astr, (unsigned char *)data, length);
-   else
-     n = avi_add_chunk(AVI,(unsigned char *)"00db", (unsigned char *)data, length);
+	if(audio)
+		n = avi_add_chunk(AVI,(unsigned char *)astr, (unsigned char *)data, length);
+	else
+		n = avi_add_chunk(AVI,(unsigned char *)"00db", (unsigned char *)data, length);
 
-   if (n) return -1;
+	if (n) return -1;
 
-   return 0;
+	return 0;
 }
 
 GF_EXPORT
 int AVI_write_frame(avi_t *AVI, char *data, long bytes, int keyframe)
 {
-  s64 pos;
+	s64 pos;
 
-  if(AVI->mode==AVI_MODE_READ) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
+	if(AVI->mode==AVI_MODE_READ) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
 
-  pos = AVI->pos;
+	pos = AVI->pos;
 
-  if(avi_write_data(AVI,data,bytes,0,keyframe)) return -1;
+	if(avi_write_data(AVI,data,bytes,0,keyframe)) return -1;
 
-  AVI->last_pos = pos;
-  AVI->last_len = bytes;
-  AVI->video_frames++;
-  return 0;
+	AVI->last_pos = pos;
+	AVI->last_len = bytes;
+	AVI->video_frames++;
+	return 0;
 }
 
 int AVI_dup_frame(avi_t *AVI)
 {
-   if(AVI->mode==AVI_MODE_READ) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
+	if(AVI->mode==AVI_MODE_READ) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
 
-   if(AVI->last_pos==0) return 0; /* No previous real frame */
-   if(avi_add_index_entry(AVI,(unsigned char *)"00db",0x10,AVI->last_pos,AVI->last_len)) return -1;
-   AVI->video_frames++;
-   AVI->must_use_index = 1;
-   return 0;
+	if(AVI->last_pos==0) return 0; /* No previous real frame */
+	if(avi_add_index_entry(AVI,(unsigned char *)"00db",0x10,AVI->last_pos,AVI->last_len)) return -1;
+	AVI->video_frames++;
+	AVI->must_use_index = 1;
+	return 0;
 }
 
 int AVI_write_audio(avi_t *AVI, char *data, long bytes)
 {
-   if(AVI->mode==AVI_MODE_READ) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
+	if(AVI->mode==AVI_MODE_READ) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
 
-   if( avi_write_data(AVI,data,bytes,1,0) ) return -1;
-   AVI->track[AVI->aptr].audio_bytes += bytes;
-   AVI->track[AVI->aptr].audio_chunks++;
-   return 0;
+	if( avi_write_data(AVI,data,bytes,1,0) ) return -1;
+	AVI->track[AVI->aptr].audio_bytes += bytes;
+	AVI->track[AVI->aptr].audio_chunks++;
+	return 0;
 }
 
 
 int AVI_append_audio(avi_t *AVI, char *data, long bytes)
 {
 
-    // won't work for >2gb
-  long i, length, pos;
-  unsigned char c[4];
+	// won't work for >2gb
+	long i, length, pos;
+	unsigned char c[4];
 
-  if(AVI->mode==AVI_MODE_READ) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
+	if(AVI->mode==AVI_MODE_READ) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
 
-  // update last index entry:
+	// update last index entry:
 
-  --AVI->n_idx;
-  length = str2ulong(AVI->idx[AVI->n_idx]+12);
-  pos    = str2ulong(AVI->idx[AVI->n_idx]+8);
+	--AVI->n_idx;
+	length = str2ulong(AVI->idx[AVI->n_idx]+12);
+	pos    = str2ulong(AVI->idx[AVI->n_idx]+8);
 
-  //update;
-  long2str(AVI->idx[AVI->n_idx]+12,length+bytes);
+	//update;
+	long2str(AVI->idx[AVI->n_idx]+12,length+bytes);
 
-  ++AVI->n_idx;
+	++AVI->n_idx;
 
-  AVI->track[AVI->aptr].audio_bytes += bytes;
+	AVI->track[AVI->aptr].audio_bytes += bytes;
 
-  //update chunk header
-  gf_f64_seek(AVI->fdes, pos+4, SEEK_SET);
-  long2str(c, length+bytes);
-  avi_write(AVI->fdes, (char *)c, 4);
+	//update chunk header
+	gf_f64_seek(AVI->fdes, pos+4, SEEK_SET);
+	long2str(c, length+bytes);
+	avi_write(AVI->fdes, (char *)c, 4);
 
-  gf_f64_seek(AVI->fdes, pos+8+length, SEEK_SET);
+	gf_f64_seek(AVI->fdes, pos+8+length, SEEK_SET);
 
-  i=PAD_EVEN(length + bytes);
+	i=PAD_EVEN(length + bytes);
 
-  bytes = i - length;
-  avi_write(AVI->fdes, data, bytes);
-  AVI->pos = pos + 8 + i;
+	bytes = i - length;
+	avi_write(AVI->fdes, data, bytes);
+	AVI->pos = pos + 8 + i;
 
-  return 0;
+	return 0;
 }
 
 
 u64 AVI_bytes_remain(avi_t *AVI)
 {
-   if(AVI->mode==AVI_MODE_READ) return 0;
+	if(AVI->mode==AVI_MODE_READ) return 0;
 
-   return ( AVI_MAX_LEN - (AVI->pos + 8 + 16*AVI->n_idx));
+	return ( AVI_MAX_LEN - (AVI->pos + 8 + 16*AVI->n_idx));
 }
 
 u64 AVI_bytes_written(avi_t *AVI)
 {
-   if(AVI->mode==AVI_MODE_READ) return 0;
+	if(AVI->mode==AVI_MODE_READ) return 0;
 
-   return (AVI->pos + 8 + 16*AVI->n_idx);
+	return (AVI->pos + 8 + 16*AVI->n_idx);
 }
 
 int AVI_set_audio_track(avi_t *AVI, u32 track)
 {
 
-  if (track + 1 > AVI->anum) return(-1);
+	if (track + 1 > AVI->anum) return(-1);
 
-  //this info is not written to file anyway
-  AVI->aptr=track;
-  return 0;
+	//this info is not written to file anyway
+	AVI->aptr=track;
+	return 0;
 }
 
 int AVI_get_audio_track(avi_t *AVI)
 {
-    return(AVI->aptr);
+	return(AVI->aptr);
 }
 
 void AVI_set_audio_vbr(avi_t *AVI, long is_vbr)
 {
-    AVI->track[AVI->aptr].a_vbr = is_vbr;
+	AVI->track[AVI->aptr].a_vbr = is_vbr;
 }
 
 long AVI_get_audio_vbr(avi_t *AVI)
 {
-    return(AVI->track[AVI->aptr].a_vbr);
+	return(AVI->track[AVI->aptr].a_vbr);
 }
 
 
@@ -1706,54 +1732,54 @@
 GF_EXPORT
 int AVI_close(avi_t *AVI)
 {
-   int ret;
-   u32 j;
-
-   /* If the file was open for writing, the header and index still have
-      to be written */
-
-   if(AVI->mode == AVI_MODE_WRITE)
-      ret = avi_close_output_file(AVI);
-   else
-      ret = 0;
-
-   /* Even if there happened an error, we first clean up */
-
-   fclose(AVI->fdes);
-   if(AVI->idx) gf_free(AVI->idx);
-   if(AVI->video_index) gf_free(AVI->video_index);
-   if(AVI->video_superindex) {
-       if(AVI->video_superindex->aIndex) gf_free(AVI->video_superindex->aIndex);
-	   if (AVI->video_superindex->stdindex) {
-		   for (j=0; j < NR_IXNN_CHUNKS; j++) {
-			   if (AVI->video_superindex->stdindex[j]->aIndex)
-				   gf_free(AVI->video_superindex->stdindex[j]->aIndex);
-			   gf_free(AVI->video_superindex->stdindex[j]);
-		   }
-		   gf_free(AVI->video_superindex->stdindex);
-	   }
-	   gf_free(AVI->video_superindex);
-   }
+	int ret;
+	u32 j;
+
+	/* If the file was open for writing, the header and index still have
+	   to be written */
+
+	if(AVI->mode == AVI_MODE_WRITE)
+		ret = avi_close_output_file(AVI);
+	else
+		ret = 0;
+
+	/* Even if there happened an error, we first clean up */
+
+	fclose(AVI->fdes);
+	if(AVI->idx) gf_free(AVI->idx);
+	if(AVI->video_index) gf_free(AVI->video_index);
+	if(AVI->video_superindex) {
+		if(AVI->video_superindex->aIndex) gf_free(AVI->video_superindex->aIndex);
+		if (AVI->video_superindex->stdindex) {
+			for (j=0; j < NR_IXNN_CHUNKS; j++) {
+				if (AVI->video_superindex->stdindex[j]->aIndex)
+					gf_free(AVI->video_superindex->stdindex[j]->aIndex);
+				gf_free(AVI->video_superindex->stdindex[j]);
+			}
+			gf_free(AVI->video_superindex->stdindex);
+		}
+		gf_free(AVI->video_superindex);
+	}
 
-   for (j=0; j<AVI->anum; j++)
-   {
-       if(AVI->track[j].audio_index) gf_free(AVI->track[j].audio_index);
-       if(AVI->track[j].audio_superindex) {
-	   if(AVI->track[j].audio_superindex->aIndex) gf_free(AVI->track[j].audio_superindex->aIndex);
-	   gf_free(AVI->track[j].audio_superindex);
-       }
-   }
+	for (j=0; j<AVI->anum; j++)
+	{
+		if(AVI->track[j].audio_index) gf_free(AVI->track[j].audio_index);
+		if(AVI->track[j].audio_superindex) {
+			if(AVI->track[j].audio_superindex->aIndex) gf_free(AVI->track[j].audio_superindex->aIndex);
+			gf_free(AVI->track[j].audio_superindex);
+		}
+	}
 
-   if (AVI->bitmap_info_header)
-     gf_free(AVI->bitmap_info_header);
-   for (j = 0; j < AVI->anum; j++)
-     if (AVI->wave_format_ex[j])
-       gf_free(AVI->wave_format_ex[j]);
+	if (AVI->bitmap_info_header)
+		gf_free(AVI->bitmap_info_header);
+	for (j = 0; j < AVI->anum; j++)
+		if (AVI->wave_format_ex[j])
+			gf_free(AVI->wave_format_ex[j]);
 
-   gf_free(AVI);
-   AVI=NULL;
+	gf_free(AVI);
+	AVI=NULL;
 
-   return ret;
+	return ret;
 }
 
 
@@ -1767,1134 +1793,1237 @@
 
 avi_t *AVI_open_input_file(char *filename, int getIndex)
 {
-  avi_t *AVI=NULL;
+	avi_t *AVI=NULL;
 
-  /* Create avi_t structure */
+	/* Create avi_t structure */
 
-  AVI = (avi_t *) gf_malloc(sizeof(avi_t));
-  if(AVI==NULL)
-    {
-      AVI_errno = AVI_ERR_NO_MEM;
-      return 0;
-    }
-  memset((void *)AVI,0,sizeof(avi_t));
+	AVI = (avi_t *) gf_malloc(sizeof(avi_t));
+	if(AVI==NULL)
+	{
+		AVI_errno = AVI_ERR_NO_MEM;
+		return 0;
+	}
+	memset((void *)AVI,0,sizeof(avi_t));
 
-  AVI->mode = AVI_MODE_READ; /* open for reading */
+	AVI->mode = AVI_MODE_READ; /* open for reading */
 
-  /* Open the file */
+	/* Open the file */
 
-  AVI->fdes = gf_f64_open(filename,"rb");
-  if(!AVI->fdes )
-    {
-      AVI_errno = AVI_ERR_OPEN;
-      gf_free(AVI);
-      return 0;
-    }
+	AVI->fdes = gf_f64_open(filename,"rb");
+	if(!AVI->fdes )
+	{
+		AVI_errno = AVI_ERR_OPEN;
+		gf_free(AVI);
+		return 0;
+	}
 
-  AVI_errno = 0;
-  avi_parse_input_file(AVI, getIndex);
+	AVI_errno = 0;
+	avi_parse_input_file(AVI, getIndex);
 
-  if (AVI != NULL && !AVI_errno) {
-      AVI->aptr=0; //reset
-  }
+	if (AVI != NULL && !AVI_errno) {
+		AVI->aptr=0; //reset
+	}
 
-  if (AVI_errno) return NULL;
+	if (AVI_errno) return NULL;
 
-  return AVI;
+	return AVI;
 }
 
 avi_t *AVI_open_fd(FILE *fd, int getIndex)
 {
-  avi_t *AVI=NULL;
+	avi_t *AVI=NULL;
 
-  /* Create avi_t structure */
+	/* Create avi_t structure */
 
-  AVI = (avi_t *) gf_malloc(sizeof(avi_t));
-  if(AVI==NULL)
-    {
-      AVI_errno = AVI_ERR_NO_MEM;
-      return 0;
-    }
-  memset((void *)AVI,0,sizeof(avi_t));
+	AVI = (avi_t *) gf_malloc(sizeof(avi_t));
+	if(AVI==NULL)
+	{
+		AVI_errno = AVI_ERR_NO_MEM;
+		return 0;
+	}
+	memset((void *)AVI,0,sizeof(avi_t));
 
-  AVI->mode = AVI_MODE_READ; /* open for reading */
+	AVI->mode = AVI_MODE_READ; /* open for reading */
 
-  // file alread open
-  AVI->fdes = fd;
+	// file alread open
+	AVI->fdes = fd;
 
-  AVI_errno = 0;
-  avi_parse_input_file(AVI, getIndex);
+	AVI_errno = 0;
+	avi_parse_input_file(AVI, getIndex);
 
-  if (AVI != NULL && !AVI_errno) {
-      AVI->aptr=0; //reset
-  }
+	if (AVI != NULL && !AVI_errno) {
+		AVI->aptr=0; //reset
+	}
 
-  if (AVI_errno)
-      return AVI=NULL;
-  else
-      return AVI;
+	if (AVI_errno)
+		return AVI=NULL;
+	else
+		return AVI;
 }
 
 int avi_parse_input_file(avi_t *AVI, int getIndex)
 {
-  long i, rate, scale, idx_type;
-  s64 n;
-  unsigned char *hdrl_data;
-  u64 header_offset=0;
-  long hdrl_len=0;
-  long nvi, nai[AVI_MAX_TRACKS], ioff;
-  u64 tot[AVI_MAX_TRACKS];
-  u32 j;
-  int lasttag = 0;
-  int vids_strh_seen = 0;
-  int vids_strf_seen = 0;
-  int auds_strh_seen = 0;
-  //  int auds_strf_seen = 0;
-  int num_stream = 0;
-  char data[256];
-  s64 oldpos=-1, newpos=-1;
-
-  long 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( strnicmp(data  ,"RIFF",4) !=0 ||
-       strnicmp(data+8,"AVI ",4) !=0 ) ERR_EXIT(AVI_ERR_NO_AVI)
-
-   /* 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)
-   {
-      if( avi_read(AVI->fdes,data,8) != 8 ) break; /* We assume it's EOF */
-      newpos = gf_f64_tell(AVI->fdes);
-      if(oldpos==newpos) {
-	      /* This is a broken AVI stream... */
-	      return -1;
-      }
-      oldpos=newpos;
-
-      n = str2ulong((unsigned char *)data+4);
-      n = PAD_EVEN(n);
-
-      if(strnicmp(data,"LIST",4) == 0)
-      {
-         if( avi_read(AVI->fdes,data,4) != 4 ) ERR_EXIT(AVI_ERR_READ)
-         n -= 4;
-         if(strnicmp(data,"hdrl",4) == 0)
-         {
-            hdrl_len = (u32) n;
-            hdrl_data = (unsigned char *) gf_malloc((u32)n);
-            if(hdrl_data==0) ERR_EXIT(AVI_ERR_NO_MEM);
-
-            // offset of header
-
-            header_offset = gf_f64_tell(AVI->fdes);
-
-            if( avi_read(AVI->fdes,(char *)hdrl_data, (u32) n) != n ) ERR_EXIT(AVI_ERR_READ)
-         }
-         else if(strnicmp(data,"movi",4) == 0)
-         {
-            AVI->movi_start = gf_f64_tell(AVI->fdes);
-            if (gf_f64_seek(AVI->fdes,n,SEEK_CUR)==(u64)-1) break;
-         }
-         else
-            if (gf_f64_seek(AVI->fdes,n,SEEK_CUR)==(u64)-1) break;
-      }
-      else if(strnicmp(data,"idx1",4) == 0)
-      {
-         /* n must be a multiple of 16, but the reading does not
-            break if this is not the case */
-
-         AVI->n_idx = AVI->max_idx = (u32) (n/16);
-         AVI->idx = (unsigned  char((*)[16]) ) gf_malloc((u32)n);
-         if(AVI->idx==0) ERR_EXIT(AVI_ERR_NO_MEM)
-         if(avi_read(AVI->fdes, (char *) AVI->idx, (u32) n) != n ) {
-	     gf_free( AVI->idx); AVI->idx=NULL;
-	     AVI->n_idx = 0;
-	 }
-      }
-      else
-         gf_f64_seek(AVI->fdes,n,SEEK_CUR);
-   }
+	long i, rate, scale, idx_type;
+	s64 n;
+	unsigned char *hdrl_data;
+	u64 header_offset=0;
+	long hdrl_len=0;
+	long nvi, nai[AVI_MAX_TRACKS], ioff;
+	u64 tot[AVI_MAX_TRACKS];
+	u32 j;
+	int lasttag = 0;
+	int vids_strh_seen = 0;
+	int vids_strf_seen = 0;
+	int auds_strh_seen = 0;
+	//  int auds_strf_seen = 0;
+	int num_stream = 0;
+	char data[256];
+	s64 oldpos=-1, newpos=-1;
+
+	long 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( strnicmp(data  ,"RIFF",4) !=0 ||
+		        strnicmp(data+8,"AVI ",4) !=0 ) ERR_EXIT(AVI_ERR_NO_AVI)
+
+			/* 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)
+	{
+		if( avi_read(AVI->fdes,data,8) != 8 ) break; /* We assume it's EOF */
+		newpos = gf_f64_tell(AVI->fdes);
+		if(oldpos==newpos) {
+			/* This is a broken AVI stream... */
+			return -1;
+		}
+		oldpos=newpos;
+
+		n = str2ulong((unsigned char *)data+4);
+		n = PAD_EVEN(n);
+
+		if(strnicmp(data,"LIST",4) == 0)
+		{
+			if( avi_read(AVI->fdes,data,4) != 4 ) ERR_EXIT(AVI_ERR_READ)
+				n -= 4;
+			if(strnicmp(data,"hdrl",4) == 0)
+			{
+				hdrl_len = (u32) n;
+				hdrl_data = (unsigned char *) gf_malloc((u32)n);
+				if(hdrl_data==0) ERR_EXIT(AVI_ERR_NO_MEM);
+
+				// offset of header
+
+				header_offset = gf_f64_tell(AVI->fdes);
+
+				if( avi_read(AVI->fdes,(char *)hdrl_data, (u32) n) != n ) ERR_EXIT(AVI_ERR_READ)
+				}
+			else if(strnicmp(data,"movi",4) == 0)
+			{
+				AVI->movi_start = gf_f64_tell(AVI->fdes);
+				if (gf_f64_seek(AVI->fdes,n,SEEK_CUR)==(u64)-1) break;
+			}
+			else if (gf_f64_seek(AVI->fdes,n,SEEK_CUR)==(u64)-1) break;
+		}
+		else if(strnicmp(data,"idx1",4) == 0)
+		{
+			/* n must be a multiple of 16, but the reading does not
+			   break if this is not the case */
+
+			AVI->n_idx = AVI->max_idx = (u32) (n/16);
+			AVI->idx = (unsigned  char((*)[16]) ) gf_malloc((u32)n);
+			if(AVI->idx==0) ERR_EXIT(AVI_ERR_NO_MEM)
+				if(avi_read(AVI->fdes, (char *) AVI->idx, (u32) n) != n ) {
+					gf_free( AVI->idx);
+					AVI->idx=NULL;
+					AVI->n_idx = 0;
+				}
+		}
+		else
+			gf_f64_seek(AVI->fdes,n,SEEK_CUR);
+	}
 
-   if(!hdrl_data      ) ERR_EXIT(AVI_ERR_NO_HDRL)
-   if(!AVI->movi_start) ERR_EXIT(AVI_ERR_NO_MOVI)
+	if(!hdrl_data      ) ERR_EXIT(AVI_ERR_NO_HDRL)
+		if(!AVI->movi_start) ERR_EXIT(AVI_ERR_NO_MOVI)
 
-   /* Interpret the header list */
+			/* Interpret the header list */
 
-   for(i=0;i<hdrl_len;)
-   {
-      /* List tags are completly ignored */
+			for(i=0; i<hdrl_len;)
+			{
+				/* List tags are completly ignored */
 
 #ifdef DEBUG_ODML
-      GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] TAG %c%c%c%c\n", (hdrl_data+i)[0], (hdrl_data+i)[1], (hdrl_data+i)[2], (hdrl_data+i)[3]));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] TAG %c%c%c%c\n", (hdrl_data+i)[0], (hdrl_data+i)[1], (hdrl_data+i)[2], (hdrl_data+i)[3]));
 #endif
 
-      if(strnicmp((char *)hdrl_data+i,"LIST",4)==0) { i+= 12; continue; }
+				if(strnicmp((char *)hdrl_data+i,"LIST",4)==0) {
+					i+= 12;
+					continue;
+				}
 
-      n = str2ulong(hdrl_data+i+4);
-      n = PAD_EVEN(n);
+				n = str2ulong(hdrl_data+i+4);
+				n = PAD_EVEN(n);
 
 
-      /* Interpret the tag and its args */
+				/* Interpret the tag and its args */
 
-      if(strnicmp((char *)hdrl_data+i,"strh",4)==0)
-      {
-         i += 8;
+				if(strnicmp((char *)hdrl_data+i,"strh",4)==0)
+				{
+					i += 8;
 #ifdef DEBUG_ODML
-	 GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] TAG   %c%c%c%c\n", (hdrl_data+i)[0], (hdrl_data+i)[1], (hdrl_data+i)[2], (hdrl_data+i)[3]));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] TAG   %c%c%c%c\n", (hdrl_data+i)[0], (hdrl_data+i)[1], (hdrl_data+i)[2], (hdrl_data+i)[3]));
 #endif
-         if(strnicmp((char *)hdrl_data+i,"vids",4) == 0 && !vids_strh_seen)
-         {
-            memcpy(AVI->compressor,hdrl_data+i+4,4);
-            AVI->compressor[4] = 0;
-
-	    // ThOe
-	    AVI->v_codech_off = header_offset + i+4;
-
-            scale = str2ulong(hdrl_data+i+20);
-            rate  = str2ulong(hdrl_data+i+24);
-            if(scale!=0) AVI->fps = (double)rate/(double)scale;
-            AVI->video_frames = str2ulong(hdrl_data+i+32);
-            AVI->video_strn = num_stream;
-	    AVI->max_len = 0;
-            vids_strh_seen = 1;
-            lasttag = 1; /* vids */
-            memcpy(&AVI->video_stream_header, hdrl_data + i,
-                   sizeof(alAVISTREAMHEADER));
-         }
-         else if (strnicmp ((char *)hdrl_data+i,"auds",4) ==0 && ! auds_strh_seen)
-         {
-
-	   //inc audio tracks
-	   AVI->aptr=AVI->anum;
-	   ++AVI->anum;
-
-	   if(AVI->anum > AVI_MAX_TRACKS) {
-	     GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] error - only %d audio tracks supported\n", AVI_MAX_TRACKS));
-	     return(-1);
-	   }
-
-	   AVI->track[AVI->aptr].audio_bytes = str2ulong(hdrl_data+i+32)*avi_sampsize(AVI, 0);
-	   AVI->track[AVI->aptr].audio_strn = num_stream;
-
-	   // if samplesize==0 -> vbr
-	   AVI->track[AVI->aptr].a_vbr = !str2ulong(hdrl_data+i+44);
-
-	   AVI->track[AVI->aptr].padrate = str2ulong(hdrl_data+i+24);
-           memcpy(&AVI->stream_headers[AVI->aptr], hdrl_data + i,
-                   sizeof(alAVISTREAMHEADER));
-
-	   //	   auds_strh_seen = 1;
-	   lasttag = 2; /* auds */
-
-	   // ThOe
-	   AVI->track[AVI->aptr].a_codech_off = header_offset + i;
-
-         }
-         else if (strnicmp ((char*)hdrl_data+i,"iavs",4) ==0 && ! auds_strh_seen) {
-	     GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] AVILIB: error - DV AVI Type 1 no supported\n"));
-	     return (-1);
-	 }
-         else
-            lasttag = 0;
-         num_stream++;
-      }
-      else if(strnicmp((char*)hdrl_data+i,"dmlh",4) == 0) {
-	  AVI->total_frames = str2ulong(hdrl_data+i+8);
+					if(strnicmp((char *)hdrl_data+i,"vids",4) == 0 && !vids_strh_seen)
+					{
+						memcpy(AVI->compressor,hdrl_data+i+4,4);
+						AVI->compressor[4] = 0;
+
+						// ThOe
+						AVI->v_codech_off = header_offset + i+4;
+
+						scale = str2ulong(hdrl_data+i+20);
+						rate  = str2ulong(hdrl_data+i+24);
+						if(scale!=0) AVI->fps = (double)rate/(double)scale;
+						AVI->video_frames = str2ulong(hdrl_data+i+32);
+						AVI->video_strn = num_stream;
+						AVI->max_len = 0;
+						vids_strh_seen = 1;
+						lasttag = 1; /* vids */
+						memcpy(&AVI->video_stream_header, hdrl_data + i,
+						       sizeof(alAVISTREAMHEADER));
+					}
+					else if (strnicmp ((char *)hdrl_data+i,"auds",4) ==0 && ! auds_strh_seen)
+					{
+
+						//inc audio tracks
+						AVI->aptr=AVI->anum;
+						++AVI->anum;
+
+						if(AVI->anum > AVI_MAX_TRACKS) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] error - only %d audio tracks supported\n", AVI_MAX_TRACKS));
+							return(-1);
+						}
+
+						AVI->track[AVI->aptr].audio_bytes = str2ulong(hdrl_data+i+32)*avi_sampsize(AVI, 0);
+						AVI->track[AVI->aptr].audio_strn = num_stream;
+
+						// if samplesize==0 -> vbr
+						AVI->track[AVI->aptr].a_vbr = !str2ulong(hdrl_data+i+44);
+
+						AVI->track[AVI->aptr].padrate = str2ulong(hdrl_data+i+24);
+						memcpy(&AVI->stream_headers[AVI->aptr], hdrl_data + i,
+						       sizeof(alAVISTREAMHEADER));
+
+						//	   auds_strh_seen = 1;
+						lasttag = 2; /* auds */
+
+						// ThOe
+						AVI->track[AVI->aptr].a_codech_off = header_offset + i;
+
+					}
+					else if (strnicmp ((char*)hdrl_data+i,"iavs",4) ==0 && ! auds_strh_seen) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] AVILIB: error - DV AVI Type 1 no supported\n"));
+						return (-1);
+					}
+					else
+						lasttag = 0;
+					num_stream++;
+				}
+				else if(strnicmp((char*)hdrl_data+i,"dmlh",4) == 0) {
+					AVI->total_frames = str2ulong(hdrl_data+i+8);
 #ifdef DEBUG_ODML
-	 GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] real number of frames %d\n", AVI->total_frames));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] real number of frames %d\n", AVI->total_frames));
 #endif
-	 i += 8;
-      }
-      else if(strnicmp((char *)hdrl_data+i,"strf",4)==0)
-      {
-         i += 8;
-         if(lasttag == 1)
-         {
-            alBITMAPINFOHEADER bih;
-
-            memcpy(&bih, hdrl_data + i, sizeof(alBITMAPINFOHEADER));
-            AVI->bitmap_info_header = (alBITMAPINFOHEADER *)
-              gf_malloc(str2ulong((unsigned char *)&bih.bi_size));
-            if (AVI->bitmap_info_header != NULL)
-              memcpy(AVI->bitmap_info_header, hdrl_data + i,
-                     str2ulong((unsigned char *)&bih.bi_size));
-
-            AVI->width  = str2ulong(hdrl_data+i+4);
-            AVI->height = str2ulong(hdrl_data+i+8);
-                    vids_strf_seen = 1;
-	    //ThOe
-	    AVI->v_codecf_off = header_offset + i+16;
-
-	    memcpy(AVI->compressor2, hdrl_data+i+16, 4);
-            AVI->compressor2[4] = 0;
-
-         }
-         else if(lasttag == 2)
-         {
-            alWAVEFORMATEX *wfe;
-	    char *nwfe;
-            int wfes;
-
-            if ((u32) (hdrl_len - i) < sizeof(alWAVEFORMATEX))
-              wfes = hdrl_len - i;
-            else
-              wfes = sizeof(alWAVEFORMATEX);
-            wfe = (alWAVEFORMATEX *)gf_malloc(sizeof(alWAVEFORMATEX));
-            if (wfe != NULL) {
-              memset(wfe, 0, sizeof(alWAVEFORMATEX));
-	      memcpy(wfe, hdrl_data + i, wfes);
-	      if (str2ushort((unsigned char *)&wfe->cb_size) != 0) {
-		nwfe = (char *)
-                  gf_realloc(wfe, sizeof(alWAVEFORMATEX) +
-                          str2ushort((unsigned char *)&wfe->cb_size));
-		if (nwfe != 0) {
-		  s64 lpos = gf_f64_tell(AVI->fdes);
-		  gf_f64_seek(AVI->fdes, header_offset + i + sizeof(alWAVEFORMATEX),
-			SEEK_SET);
-		  wfe = (alWAVEFORMATEX *)nwfe;
-		  nwfe = &nwfe[sizeof(alWAVEFORMATEX)];
-		  avi_read(AVI->fdes, nwfe,
-                           str2ushort((unsigned char *)&wfe->cb_size));
-		  gf_f64_seek(AVI->fdes, lpos, SEEK_SET);
-		}
-	      }
-	      AVI->wave_format_ex[AVI->aptr] = wfe;
-	    }
-
-            AVI->track[AVI->aptr].a_fmt   = str2ushort(hdrl_data+i  );
-
-	    //ThOe
-	    AVI->track[AVI->aptr].a_codecf_off = header_offset + i;
-
-            AVI->track[AVI->aptr].a_chans = str2ushort(hdrl_data+i+2);
-            AVI->track[AVI->aptr].a_rate  = str2ulong (hdrl_data+i+4);
-	    //ThOe: read mp3bitrate
-	    AVI->track[AVI->aptr].mp3rate = 8*str2ulong(hdrl_data+i+8)/1000;
-	    //:ThOe
-            AVI->track[AVI->aptr].a_bits  = str2ushort(hdrl_data+i+14);
-	    //            auds_strf_seen = 1;
-         }
-      }
-      else if(strnicmp((char*)hdrl_data+i,"indx",4) == 0) {
-	 char *a;
-
-	 if(lasttag == 1) // V I D E O
-	 {
-
-	    a = (char*)hdrl_data+i;
-
-	    AVI->video_superindex = (avisuperindex_chunk *) gf_malloc (sizeof (avisuperindex_chunk));
-		memset(AVI->video_superindex, 0, sizeof (avisuperindex_chunk));
-	    memcpy (AVI->video_superindex->fcc, a, 4);             a += 4;
-	    AVI->video_superindex->dwSize = str2ulong((unsigned char *)a);          a += 4;
-	    AVI->video_superindex->wLongsPerEntry = str2ushort((unsigned char *)a); a += 2;
-	    AVI->video_superindex->bIndexSubType = *a;             a += 1;
-	    AVI->video_superindex->bIndexType = *a;                a += 1;
-	    AVI->video_superindex->nEntriesInUse = str2ulong((unsigned char *)a);   a += 4;
-	    memcpy (AVI->video_superindex->dwChunkId, a, 4);       a += 4;
-
-	    // 3 * reserved
-	    a += 4; a += 4; a += 4;
-
-	    if (AVI->video_superindex->bIndexSubType != 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] Invalid Header, bIndexSubType != 0\n"));
-		}
-
-	    AVI->video_superindex->aIndex = (avisuperindex_entry*)
-	       gf_malloc (AVI->video_superindex->wLongsPerEntry * AVI->video_superindex->nEntriesInUse * sizeof (u32));
-
-	    // position of ix## chunks
-	    for (j=0; j<AVI->video_superindex->nEntriesInUse; ++j) {
-	       AVI->video_superindex->aIndex[j].qwOffset = str2ullong ((unsigned char*)a);  a += 8;
-	       AVI->video_superindex->aIndex[j].dwSize = str2ulong ((unsigned char*)a);     a += 4;
-	       AVI->video_superindex->aIndex[j].dwDuration = str2ulong ((unsigned char*)a); a += 4;
+					i += 8;
+				}
+				else if(strnicmp((char *)hdrl_data+i,"strf",4)==0)
+				{
+					i += 8;
+					if(lasttag == 1)
+					{
+						alBITMAPINFOHEADER bih;
+
+						memcpy(&bih, hdrl_data + i, sizeof(alBITMAPINFOHEADER));
+						AVI->bitmap_info_header = (alBITMAPINFOHEADER *)
+						                          gf_malloc(str2ulong((unsigned char *)&bih.bi_size));
+						if (AVI->bitmap_info_header != NULL)
+							memcpy(AVI->bitmap_info_header, hdrl_data + i,
+							       str2ulong((unsigned char *)&bih.bi_size));
+
+						AVI->width  = str2ulong(hdrl_data+i+4);
+						AVI->height = str2ulong(hdrl_data+i+8);
+						vids_strf_seen = 1;
+						//ThOe
+						AVI->v_codecf_off = header_offset + i+16;
+
+						memcpy(AVI->compressor2, hdrl_data+i+16, 4);
+						AVI->compressor2[4] = 0;
+
+					}
+					else if(lasttag == 2)
+					{
+						alWAVEFORMATEX *wfe;
+						char *nwfe;
+						int wfes;
+
+						if ((u32) (hdrl_len - i) < sizeof(alWAVEFORMATEX))
+							wfes = hdrl_len - i;
+						else
+							wfes = sizeof(alWAVEFORMATEX);
+						wfe = (alWAVEFORMATEX *)gf_malloc(sizeof(alWAVEFORMATEX));
+						if (wfe != NULL) {
+							memset(wfe, 0, sizeof(alWAVEFORMATEX));
+							memcpy(wfe, hdrl_data + i, wfes);
+							if (str2ushort((unsigned char *)&wfe->cb_size) != 0) {
+								nwfe = (char *)
+								       gf_realloc(wfe, sizeof(alWAVEFORMATEX) +
+								                  str2ushort((unsigned char *)&wfe->cb_size));
+								if (nwfe != 0) {
+									s64 lpos = gf_f64_tell(AVI->fdes);
+									gf_f64_seek(AVI->fdes, header_offset + i + sizeof(alWAVEFORMATEX),
+									            SEEK_SET);
+									wfe = (alWAVEFORMATEX *)nwfe;
+									nwfe = &nwfe[sizeof(alWAVEFORMATEX)];
+									avi_read(AVI->fdes, nwfe,
+									         str2ushort((unsigned char *)&wfe->cb_size));
+									gf_f64_seek(AVI->fdes, lpos, SEEK_SET);
+								}
+							}
+							AVI->wave_format_ex[AVI->aptr] = wfe;
+						}
+
+						AVI->track[AVI->aptr].a_fmt   = str2ushort(hdrl_data+i  );
+
+						//ThOe
+						AVI->track[AVI->aptr].a_codecf_off = header_offset + i;
+
+						AVI->track[AVI->aptr].a_chans = str2ushort(hdrl_data+i+2);
+						AVI->track[AVI->aptr].a_rate  = str2ulong (hdrl_data+i+4);
+						//ThOe: read mp3bitrate
+						AVI->track[AVI->aptr].mp3rate = 8*str2ulong(hdrl_data+i+8)/1000;
+						//:ThOe
+						AVI->track[AVI->aptr].a_bits  = str2ushort(hdrl_data+i+14);
+						//            auds_strf_seen = 1;
+					}
+				}
+				else if(strnicmp((char*)hdrl_data+i,"indx",4) == 0) {
+					char *a;
+
+					if(lasttag == 1) // V I D E O
+					{
+
+						a = (char*)hdrl_data+i;
+
+						AVI->video_superindex = (avisuperindex_chunk *) gf_malloc (sizeof (avisuperindex_chunk));
+						memset(AVI->video_superindex, 0, sizeof (avisuperindex_chunk));
+						memcpy (AVI->video_superindex->fcc, a, 4);
+						a += 4;
+						AVI->video_superindex->dwSize = str2ulong((unsigned char *)a);
+						a += 4;
+						AVI->video_superindex->wLongsPerEntry = str2ushort((unsigned char *)a);
+						a += 2;
+						AVI->video_superindex->bIndexSubType = *a;
+						a += 1;
+						AVI->video_superindex->bIndexType = *a;
+						a += 1;
+						AVI->video_superindex->nEntriesInUse = str2ulong((unsigned char *)a);
+						a += 4;
+						memcpy (AVI->video_superindex->dwChunkId, a, 4);
+						a += 4;
+
+						// 3 * reserved
+						a += 4;
+						a += 4;
+						a += 4;
+
+						if (AVI->video_superindex->bIndexSubType != 0) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] Invalid Header, bIndexSubType != 0\n"));
+						}
+
+						AVI->video_superindex->aIndex = (avisuperindex_entry*)
+						                                gf_malloc (AVI->video_superindex->wLongsPerEntry * AVI->video_superindex->nEntriesInUse * sizeof (u32));
+
+						// position of ix## chunks
+						for (j=0; j<AVI->video_superindex->nEntriesInUse; ++j) {
+							AVI->video_superindex->aIndex[j].qwOffset = str2ullong ((unsigned char*)a);
+							a += 8;
+							AVI->video_superindex->aIndex[j].dwSize = str2ulong ((unsigned char*)a);
+							a += 4;
+							AVI->video_superindex->aIndex[j].dwDuration = str2ulong ((unsigned char*)a);
+							a += 4;
 
 #ifdef DEBUG_ODML
-	       GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d] 0x%llx 0x%lx %lu\n", j,
-		       (unsigned long long)AVI->video_superindex->aIndex[j].qwOffset,
-		       (unsigned long)AVI->video_superindex->aIndex[j].dwSize,
-		       (unsigned long)AVI->video_superindex->aIndex[j].dwDuration));
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d] 0x%llx 0x%lx %lu\n", j,
+							                                        (unsigned long long)AVI->video_superindex->aIndex[j].qwOffset,
+							                                        (unsigned long)AVI->video_superindex->aIndex[j].dwSize,
+							                                        (unsigned long)AVI->video_superindex->aIndex[j].dwDuration));
 #endif
-	    }
+						}
 
 
 #ifdef DEBUG_ODML
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] FOURCC \"%c%c%c%c\"\n", AVI->video_superindex->fcc[0], AVI->video_superindex->fcc[1],
-		                            AVI->video_superindex->fcc[2], AVI->video_superindex->fcc[3]));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] LEN \"%ld\"\n", (long)AVI->video_superindex->dwSize));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] wLongsPerEntry \"%d\"\n", AVI->video_superindex->wLongsPerEntry));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] bIndexSubType \"%d\"\n", AVI->video_superindex->bIndexSubType));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] bIndexType \"%d\"\n", AVI->video_superindex->bIndexType));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] nEntriesInUse \"%ld\"\n", (long)AVI->video_superindex->nEntriesInUse));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] dwChunkId \"%c%c%c%c\"\n", AVI->video_superindex->dwChunkId[0], AVI->video_superindex->dwChunkId[1],
-		                               AVI->video_superindex->dwChunkId[2], AVI->video_superindex->dwChunkId[3]));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] FOURCC \"%c%c%c%c\"\n", AVI->video_superindex->fcc[0], AVI->video_superindex->fcc[1],
+						                                        AVI->video_superindex->fcc[2], AVI->video_superindex->fcc[3]));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] LEN \"%ld\"\n", (long)AVI->video_superindex->dwSize));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] wLongsPerEntry \"%d\"\n", AVI->video_superindex->wLongsPerEntry));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] bIndexSubType \"%d\"\n", AVI->video_superindex->bIndexSubType));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] bIndexType \"%d\"\n", AVI->video_superindex->bIndexType));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] nEntriesInUse \"%ld\"\n", (long)AVI->video_superindex->nEntriesInUse));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] dwChunkId \"%c%c%c%c\"\n", AVI->video_superindex->dwChunkId[0], AVI->video_superindex->dwChunkId[1],
+						                                        AVI->video_superindex->dwChunkId[2], AVI->video_superindex->dwChunkId[3]));
 #endif
 
-	    AVI->is_opendml = 1;
-
-	 }
-         else if(lasttag == 2) // A U D I O
-         {
-
-	    a = (char*) hdrl_data+i;
-
-	    AVI->track[AVI->aptr].audio_superindex = (avisuperindex_chunk *) gf_malloc (sizeof (avisuperindex_chunk));
-	    memcpy (AVI->track[AVI->aptr].audio_superindex->fcc, a, 4);             a += 4;
-	    AVI->track[AVI->aptr].audio_superindex->dwSize = str2ulong((unsigned char*)a);          a += 4;
-	    AVI->track[AVI->aptr].audio_superindex->wLongsPerEntry = str2ushort((unsigned char*)a); a += 2;
-	    AVI->track[AVI->aptr].audio_superindex->bIndexSubType = *a;             a += 1;
-	    AVI->track[AVI->aptr].audio_superindex->bIndexType = *a;                a += 1;
-	    AVI->track[AVI->aptr].audio_superindex->nEntriesInUse = str2ulong((unsigned char*)a);   a += 4;
-	    memcpy (AVI->track[AVI->aptr].audio_superindex->dwChunkId, a, 4);       a += 4;
-
-	    // 3 * reserved
-	    a += 4; a += 4; a += 4;
-
-	    if (AVI->track[AVI->aptr].audio_superindex->bIndexSubType != 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] Invalid Header, bIndexSubType != 0\n"));
-		}
-
-	    AVI->track[AVI->aptr].audio_superindex->aIndex = (avisuperindex_entry*)
-	       gf_malloc (AVI->track[AVI->aptr].audio_superindex->wLongsPerEntry *
-		     AVI->track[AVI->aptr].audio_superindex->nEntriesInUse * sizeof (u32));
-
-	    // position of ix## chunks
-	    for (j=0; j<AVI->track[AVI->aptr].audio_superindex->nEntriesInUse; ++j) {
-	       AVI->track[AVI->aptr].audio_superindex->aIndex[j].qwOffset = str2ullong ((unsigned char*)a);  a += 8;
-	       AVI->track[AVI->aptr].audio_superindex->aIndex[j].dwSize = str2ulong ((unsigned char*)a);     a += 4;
-	       AVI->track[AVI->aptr].audio_superindex->aIndex[j].dwDuration = str2ulong ((unsigned char*)a); a += 4;
+						AVI->is_opendml = 1;
+
+					}
+					else if(lasttag == 2) // A U D I O
+					{
+
+						a = (char*) hdrl_data+i;
+
+						AVI->track[AVI->aptr].audio_superindex = (avisuperindex_chunk *) gf_malloc (sizeof (avisuperindex_chunk));
+						memcpy (AVI->track[AVI->aptr].audio_superindex->fcc, a, 4);
+						a += 4;
+						AVI->track[AVI->aptr].audio_superindex->dwSize = str2ulong((unsigned char*)a);
+						a += 4;
+						AVI->track[AVI->aptr].audio_superindex->wLongsPerEntry = str2ushort((unsigned char*)a);
+						a += 2;
+						AVI->track[AVI->aptr].audio_superindex->bIndexSubType = *a;
+						a += 1;
+						AVI->track[AVI->aptr].audio_superindex->bIndexType = *a;
+						a += 1;
+						AVI->track[AVI->aptr].audio_superindex->nEntriesInUse = str2ulong((unsigned char*)a);
+						a += 4;
+						memcpy (AVI->track[AVI->aptr].audio_superindex->dwChunkId, a, 4);
+						a += 4;
+
+						// 3 * reserved
+						a += 4;
+						a += 4;
+						a += 4;
+
+						if (AVI->track[AVI->aptr].audio_superindex->bIndexSubType != 0) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] Invalid Header, bIndexSubType != 0\n"));
+						}
+
+						AVI->track[AVI->aptr].audio_superindex->aIndex = (avisuperindex_entry*)
+						        gf_malloc (AVI->track[AVI->aptr].audio_superindex->wLongsPerEntry *
+						                   AVI->track[AVI->aptr].audio_superindex->nEntriesInUse * sizeof (u32));
+
+						// position of ix## chunks
+						for (j=0; j<AVI->track[AVI->aptr].audio_superindex->nEntriesInUse; ++j) {
+							AVI->track[AVI->aptr].audio_superindex->aIndex[j].qwOffset = str2ullong ((unsigned char*)a);
+							a += 8;
+							AVI->track[AVI->aptr].audio_superindex->aIndex[j].dwSize = str2ulong ((unsigned char*)a);
+							a += 4;
+							AVI->track[AVI->aptr].audio_superindex->aIndex[j].dwDuration = str2ulong ((unsigned char*)a);
+							a += 4;
 
 #ifdef DEBUG_ODML
-	       GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d] 0x%llx 0x%lx %lu\n", j,
-		       (unsigned long long)AVI->track[AVI->aptr].audio_superindex->aIndex[j].qwOffset,
-		       (unsigned long)AVI->track[AVI->aptr].audio_superindex->aIndex[j].dwSize,
-		       (unsigned long)AVI->track[AVI->aptr].audio_superindex->aIndex[j].dwDuration));
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d] 0x%llx 0x%lx %lu\n", j,
+							                                        (unsigned long long)AVI->track[AVI->aptr].audio_superindex->aIndex[j].qwOffset,
+							                                        (unsigned long)AVI->track[AVI->aptr].audio_superindex->aIndex[j].dwSize,
+							                                        (unsigned long)AVI->track[AVI->aptr].audio_superindex->aIndex[j].dwDuration));
 #endif
-	    }
+						}
 
 #ifdef DEBUG_ODML
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] FOURCC \"%.4s\"\n", AVI->track[AVI->aptr].audio_superindex->fcc));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] LEN \"%ld\"\n", (long)AVI->track[AVI->aptr].audio_superindex->dwSize));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] wLongsPerEntry \"%d\"\n", AVI->track[AVI->aptr].audio_superindex->wLongsPerEntry));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] bIndexSubType \"%d\"\n", AVI->track[AVI->aptr].audio_superindex->bIndexSubType));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] bIndexType \"%d\"\n", AVI->track[AVI->aptr].audio_superindex->bIndexType));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] nEntriesInUse \"%ld\"\n", (long)AVI->track[AVI->aptr].audio_superindex->nEntriesInUse));
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] dwChunkId \"%.4s\"\n", AVI->track[AVI->aptr].audio_superindex->dwChunkId[0]));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] FOURCC \"%.4s\"\n", AVI->track[AVI->aptr].audio_superindex->fcc));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] LEN \"%ld\"\n", (long)AVI->track[AVI->aptr].audio_superindex->dwSize));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] wLongsPerEntry \"%d\"\n", AVI->track[AVI->aptr].audio_superindex->wLongsPerEntry));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] bIndexSubType \"%d\"\n", AVI->track[AVI->aptr].audio_superindex->bIndexSubType));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] bIndexType \"%d\"\n", AVI->track[AVI->aptr].audio_superindex->bIndexType));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] nEntriesInUse \"%ld\"\n", (long)AVI->track[AVI->aptr].audio_superindex->nEntriesInUse));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] dwChunkId \"%.4s\"\n", AVI->track[AVI->aptr].audio_superindex->dwChunkId[0]));
 #endif
 
-	 }
-	 i += 8;
-      }
-      else if((strnicmp((char*)hdrl_data+i,"JUNK",4) == 0) ||
-              (strnicmp((char*)hdrl_data+i,"strn",4) == 0) ||
-              (strnicmp((char*)hdrl_data+i,"vprp",4) == 0)){
-	 i += 8;
-	 // do not reset lasttag
-      } else
-      {
-         i += 8;
-         lasttag = 0;
-      }
-      //GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] adding %ld bytes\n", (long int)n));
-
-      i += (u32) n;
-   }
-
-   gf_free(hdrl_data);
-
-   if(!vids_strh_seen || !vids_strf_seen) ERR_EXIT(AVI_ERR_NO_VIDS)
-
-   AVI->video_tag[0] = AVI->video_strn/10 + '0';
-   AVI->video_tag[1] = AVI->video_strn%10 + '0';
-   AVI->video_tag[2] = 'd';
-   AVI->video_tag[3] = 'b';
-
-   /* Audio tag is set to "99wb" if no audio present */
-   if(!AVI->track[0].a_chans) AVI->track[0].audio_strn = 99;
-
-   {
-     int i=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;
-     }
-   }
-
-   gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
-
-   if(!getIndex) return(0);
-
-   /* if the file has an idx1, check if this is relative
-      to the start of the file or to the start of the movi list */
-
-   idx_type = 0;
-
-   if(AVI->idx)
-   {
-      s64 pos, len;
-
-      /* Search the first videoframe in the idx1 and look where
-         it is in the file */
-
-      for(i=0;i<AVI->n_idx;i++)
-         if( strnicmp((char *)AVI->idx[i],(char *)AVI->video_tag,3)==0 ) break;
-      if(i>=AVI->n_idx) ERR_EXIT(AVI_ERR_NO_VIDS)
-
-      pos = str2ulong(AVI->idx[i]+ 8);
-      len = str2ulong(AVI->idx[i]+12);
-
-      gf_f64_seek(AVI->fdes,pos,SEEK_SET);
-      if(avi_read(AVI->fdes,data,8)!=8) ERR_EXIT(AVI_ERR_READ)
-      if( strnicmp(data,(char *)AVI->idx[i],4)==0 && str2ulong((unsigned char *)data+4)==len )
-      {
-         idx_type = 1; /* Index from start of file */
-      }
-      else
-      {
-         gf_f64_seek(AVI->fdes,pos+AVI->movi_start-4,SEEK_SET);
-         if(avi_read(AVI->fdes,data,8)!=8) ERR_EXIT(AVI_ERR_READ)
-         if( strnicmp(data,(char *)AVI->idx[i],4)==0 && str2ulong((unsigned char *)data+4)==len )
-         {
-            idx_type = 2; /* Index from start of movi list */
-         }
-      }
-      /* idx_type remains 0 if neither of the two tests above succeeds */
-   }
-
+					}
+					i += 8;
+				}
+				else if((strnicmp((char*)hdrl_data+i,"JUNK",4) == 0) ||
+				        (strnicmp((char*)hdrl_data+i,"strn",4) == 0) ||
+				        (strnicmp((char*)hdrl_data+i,"vprp",4) == 0)) {
+					i += 8;
+					// do not reset lasttag
+				} else
+				{
+					i += 8;
+					lasttag = 0;
+				}
+				//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] adding %ld bytes\n", (long int)n));
+
+				i += (u32) n;
+			}
+
+	gf_free(hdrl_data);
+
+	if(!vids_strh_seen || !vids_strf_seen) ERR_EXIT(AVI_ERR_NO_VIDS)
+
+		AVI->video_tag[0] = AVI->video_strn/10 + '0';
+	AVI->video_tag[1] = AVI->video_strn%10 + '0';
+	AVI->video_tag[2] = 'd';
+	AVI->video_tag[3] = 'b';
+
+	/* Audio tag is set to "99wb" if no audio present */
+	if(!AVI->track[0].a_chans) AVI->track[0].audio_strn = 99;
+
+	{
+		int i=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;
+		}
+	}
 
-   if(idx_type == 0 && !AVI->is_opendml && !AVI->total_frames)
-   {
-      /* we must search through the file to get the index */
+	gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
+
+	if(!getIndex) return(0);
+
+	/* if the file has an idx1, check if this is relative
+	   to the start of the file or to the start of the movi list */
+
+	idx_type = 0;
+
+	if(AVI->idx)
+	{
+		s64 pos, len;
+
+		/* Search the first videoframe in the idx1 and look where
+		   it is in the file */
+
+		for(i=0; i<AVI->n_idx; i++)
+			if( strnicmp((char *)AVI->idx[i],(char *)AVI->video_tag,3)==0 ) break;
+		if(i>=AVI->n_idx) ERR_EXIT(AVI_ERR_NO_VIDS)
+
+			pos = str2ulong(AVI->idx[i]+ 8);
+		len = str2ulong(AVI->idx[i]+12);
+
+		gf_f64_seek(AVI->fdes,pos,SEEK_SET);
+		if(avi_read(AVI->fdes,data,8)!=8) ERR_EXIT(AVI_ERR_READ)
+			if( strnicmp(data,(char *)AVI->idx[i],4)==0 && str2ulong((unsigned char *)data+4)==len )
+			{
+				idx_type = 1; /* Index from start of file */
+			}
+			else
+			{
+				gf_f64_seek(AVI->fdes,pos+AVI->movi_start-4,SEEK_SET);
+				if(avi_read(AVI->fdes,data,8)!=8) ERR_EXIT(AVI_ERR_READ)
+					if( strnicmp(data,(char *)AVI->idx[i],4)==0 && str2ulong((unsigned char *)data+4)==len )
+					{
+						idx_type = 2; /* Index from start of movi list */
+					}
+			}
+		/* idx_type remains 0 if neither of the two tests above succeeds */
+	}
 
-      gf_f64_seek(AVI->fdes, AVI->movi_start, SEEK_SET);
 
-      AVI->n_idx = 0;
+	if(idx_type == 0 && !AVI->is_opendml && !AVI->total_frames)
+	{
+		/* we must search through the file to get the index */
 
-      while(1)
-      {
-         if( avi_read(AVI->fdes,data,8) != 8 ) break;
-         n = str2ulong((unsigned char *)data+4);
+		gf_f64_seek(AVI->fdes, AVI->movi_start, SEEK_SET);
 
-         /* The movi list may contain sub-lists, ignore them */
+		AVI->n_idx = 0;
 
-         if(strnicmp(data,"LIST",4)==0)
-         {
-            gf_f64_seek(AVI->fdes,4,SEEK_CUR);
-            continue;
-         }
+		while(1)
+		{
+			if( avi_read(AVI->fdes,data,8) != 8 ) break;
+			n = str2ulong((unsigned char *)data+4);
 
-         /* Check if we got a tag ##db, ##dc or ##wb */
+			/* The movi list may contain sub-lists, ignore them */
 
-         if( ( (data[2]=='d' || data[2]=='D') &&
-               (data[3]=='b' || data[3]=='B' || data[3]=='c' || data[3]=='C') )
-	     || ( (data[2]=='w' || data[2]=='W') &&
-		  (data[3]=='b' || data[3]=='B') ) )
-	   {
-			 u64 __pos = gf_f64_tell(AVI->fdes) - 8;
-	   avi_add_index_entry(AVI,(unsigned char *)data,0,__pos,n);
-         }
+			if(strnicmp(data,"LIST",4)==0)
+			{
+				gf_f64_seek(AVI->fdes,4,SEEK_CUR);
+				continue;
+			}
 
-         gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
-      }
-      idx_type = 1;
-   }
+			/* Check if we got a tag ##db, ##dc or ##wb */
 
-   // ************************
-   // OPENDML
-   // ************************
+			if( ( (data[2]=='d' || data[2]=='D') &&
+			        (data[3]=='b' || data[3]=='B' || data[3]=='c' || data[3]=='C') )
+			        || ( (data[2]=='w' || data[2]=='W') &&
+			             (data[3]=='b' || data[3]=='B') ) )
+			{
+				u64 __pos = gf_f64_tell(AVI->fdes) - 8;
+				avi_add_index_entry(AVI,(unsigned char *)data,0,__pos,n);
+			}
 
-   // read extended index chunks
-   if (AVI->is_opendml) {
-      u64 offset = 0;
-      int hdrl_len = 4+4+2+1+1+4+4+8+4;
-      char *en, *chunk_start;
-      int k = 0;
-	  u32 audtr = 0;
-      u32 nrEntries = 0;
-
-      AVI->video_index = NULL;
+			gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
+		}
+		idx_type = 1;
+	}
 
-      nvi = 0;
-      for(audtr=0; audtr<AVI->anum; ++audtr) { nai[audtr] = 0; tot[audtr] = 0; }
+	// ************************
+	// OPENDML
+	// ************************
+
+	// read extended index chunks
+	if (AVI->is_opendml) {
+		u64 offset = 0;
+		int hdrl_len = 4+4+2+1+1+4+4+8+4;
+		char *en, *chunk_start;
+		int k = 0;
+		u32 audtr = 0;
+		u32 nrEntries = 0;
+
+		AVI->video_index = NULL;
+
+		nvi = 0;
+		for(audtr=0; audtr<AVI->anum; ++audtr) {
+			nai[audtr] = 0;
+			tot[audtr] = 0;
+		}
 
-      // ************************
-      // VIDEO
-      // ************************
+		// ************************
+		// VIDEO
+		// ************************
 
-      for (j=0; j<AVI->video_superindex->nEntriesInUse; j++) {
+		for (j=0; j<AVI->video_superindex->nEntriesInUse; j++) {
 
-	 // read from file
-	 chunk_start = en = (char*) gf_malloc ((u32) (AVI->video_superindex->aIndex[j].dwSize+hdrl_len) );
+			// read from file
+			chunk_start = en = (char*) gf_malloc ((u32) (AVI->video_superindex->aIndex[j].dwSize+hdrl_len) );
 
-	 if (gf_f64_seek(AVI->fdes, AVI->video_superindex->aIndex[j].qwOffset, SEEK_SET) == (u64)-1) {
-	    gf_free(chunk_start);
-	    continue;
-	 }
+			if (gf_f64_seek(AVI->fdes, AVI->video_superindex->aIndex[j].qwOffset, SEEK_SET) == (u64)-1) {
+				gf_free(chunk_start);
+				continue;
+			}
 
-	 if (avi_read(AVI->fdes, en, (u32) (AVI->video_superindex->aIndex[j].dwSize+hdrl_len) ) <= 0) {
-	    gf_free(chunk_start);
-	    continue;
-	 }
+			if (avi_read(AVI->fdes, en, (u32) (AVI->video_superindex->aIndex[j].dwSize+hdrl_len) ) <= 0) {
+				gf_free(chunk_start);
+				continue;
+			}
 
-	 nrEntries = str2ulong((unsigned char*)en + 12);
+			nrEntries = str2ulong((unsigned char*)en + 12);
 #ifdef DEBUG_ODML
-	 //GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d:0] Video nrEntries %ld\n", j, nrEntries));
+			//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d:0] Video nrEntries %ld\n", j, nrEntries));
 #endif
-	 offset = str2ullong((unsigned char*)en + 20);
-
-	 // skip header
-	 en += hdrl_len;
-	 nvi += nrEntries;
-	 AVI->video_index = (video_index_entry *) gf_realloc (AVI->video_index, nvi * sizeof (video_index_entry));
-	 if (!AVI->video_index) {
-		 GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] out of mem (size = %ld)\n", nvi * sizeof (video_index_entry)));
-		 exit(1);
-	 }
-
-	 while (k < nvi) {
-
-	    AVI->video_index[k].pos = offset + str2ulong((unsigned char*)en); en += 4;
-	    AVI->video_index[k].len = str2ulong_len((unsigned char*)en);
-	    AVI->video_index[k].key = str2ulong_key((unsigned char*)en); en += 4;
-
-	    // completely empty chunk
-	    if (AVI->video_index[k].pos-offset == 0 && AVI->video_index[k].len == 0) {
-		k--;
-		nvi--;
-	    }
+			offset = str2ullong((unsigned char*)en + 20);
+
+			// skip header
+			en += hdrl_len;
+			nvi += nrEntries;
+			AVI->video_index = (video_index_entry *) gf_realloc (AVI->video_index, nvi * sizeof (video_index_entry));
+			if (!AVI->video_index) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] out of mem (size = %ld)\n", nvi * sizeof (video_index_entry)));
+				exit(1);
+			}
+
+			while (k < nvi) {
+
+				AVI->video_index[k].pos = offset + str2ulong((unsigned char*)en);
+				en += 4;
+				AVI->video_index[k].len = str2ulong_len((unsigned char*)en);
+				AVI->video_index[k].key = str2ulong_key((unsigned char*)en);
+				en += 4;
+
+				// completely empty chunk
+				if (AVI->video_index[k].pos-offset == 0 && AVI->video_index[k].len == 0) {
+					k--;
+					nvi--;
+				}
 
 #ifdef DEBUG_ODML
-	    /*
-	    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d] POS 0x%llX len=%d key=%s offset (%llx) (%ld)\n", k,
-		  AVI->video_index[k].pos,
-		  (int)AVI->video_index[k].len,
-		  AVI->video_index[k].key?"yes":"no ", offset,
-		  AVI->video_superindex->aIndex[j].dwSize));
-		  */
+				/*
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d] POS 0x%llX len=%d key=%s offset (%llx) (%ld)\n", k,
+				  AVI->video_index[k].pos,
+				  (int)AVI->video_index[k].len,
+				  AVI->video_index[k].key?"yes":"no ", offset,
+				  AVI->video_superindex->aIndex[j].dwSize));
+				  */
 #endif
 
-	    k++;
-	 }
+				k++;
+			}
 
-	 gf_free(chunk_start);
-      }
+			gf_free(chunk_start);
+		}
 
-      AVI->video_frames = nvi;
-      // this should deal with broken 'rec ' odml files.
-      if (AVI->video_frames == 0) {
-	  AVI->is_opendml=0;
-	  goto multiple_riff;
-      }
+		AVI->video_frames = nvi;
+		// this should deal with broken 'rec ' odml files.
+		if (AVI->video_frames == 0) {
+			AVI->is_opendml=0;
+			goto multiple_riff;
+		}
 
-      // ************************
-      // AUDIO
-      // ************************
+		// ************************
+		// AUDIO
+		// ************************
 
-      for(audtr=0; audtr<AVI->anum; ++audtr) {
+		for(audtr=0; audtr<AVI->anum; ++audtr) {
 
-	 k = 0;
-	 if (!AVI->track[audtr].audio_superindex) {
-	       GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] (%s) cannot read audio index for track %d\n", __FILE__, audtr));
-	       continue;
-	 }
-	 for (j=0; j<AVI->track[audtr].audio_superindex->nEntriesInUse; j++) {
+			k = 0;
+			if (!AVI->track[audtr].audio_superindex) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] (%s) cannot read audio index for track %d\n", __FILE__, audtr));
+				continue;
+			}
+			for (j=0; j<AVI->track[audtr].audio_superindex->nEntriesInUse; j++) {
 
-	    // read from file
-	    chunk_start = en = (char*)gf_malloc ((u32) (AVI->track[audtr].audio_superindex->aIndex[j].dwSize+hdrl_len));
+				// read from file
+				chunk_start = en = (char*)gf_malloc ((u32) (AVI->track[audtr].audio_superindex->aIndex[j].dwSize+hdrl_len));
 
-	    if (gf_f64_seek(AVI->fdes, AVI->track[audtr].audio_superindex->aIndex[j].qwOffset, SEEK_SET) == (u64)-1) {
-	       gf_free(chunk_start);
-	       continue;
-	    }
+				if (gf_f64_seek(AVI->fdes, AVI->track[audtr].audio_superindex->aIndex[j].qwOffset, SEEK_SET) == (u64)-1) {
+					gf_free(chunk_start);
+					continue;
+				}
 
-	    if (avi_read(AVI->fdes, en, (u32) (AVI->track[audtr].audio_superindex->aIndex[j].dwSize+hdrl_len)) <= 0) {
-	       gf_free(chunk_start);
-	       continue;
-	    }
+				if (avi_read(AVI->fdes, en, (u32) (AVI->track[audtr].audio_superindex->aIndex[j].dwSize+hdrl_len)) <= 0) {
+					gf_free(chunk_start);
+					continue;
+				}
 
-	    nrEntries = str2ulong((unsigned char*)en + 12);
-	    //if (nrEntries > 50) nrEntries = 2; // XXX
+				nrEntries = str2ulong((unsigned char*)en + 12);
+				//if (nrEntries > 50) nrEntries = 2; // XXX
 #ifdef DEBUG_ODML
-	    //GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d:%d] Audio nrEntries %ld\n", j, audtr, nrEntries));
+				//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d:%d] Audio nrEntries %ld\n", j, audtr, nrEntries));
 #endif
-	    offset = str2ullong((unsigned char*)en + 20);
+				offset = str2ullong((unsigned char*)en + 20);
 
-	    // skip header
-	    en += hdrl_len;
-	    nai[audtr] += nrEntries;
-	    AVI->track[audtr].audio_index = (audio_index_entry *) gf_realloc (AVI->track[audtr].audio_index, nai[audtr] * sizeof (audio_index_entry));
+				// skip header
+				en += hdrl_len;
+				nai[audtr] += nrEntries;
+				AVI->track[audtr].audio_index = (audio_index_entry *) gf_realloc (AVI->track[audtr].audio_index, nai[audtr] * sizeof (audio_index_entry));
 
-	    while (k < nai[audtr]) {
+				while (k < nai[audtr]) {
 
-	       AVI->track[audtr].audio_index[k].pos = offset + str2ulong((unsigned char*)en); en += 4;
-	       AVI->track[audtr].audio_index[k].len = str2ulong_len((unsigned char*)en); en += 4;
-	       AVI->track[audtr].audio_index[k].tot = tot[audtr];
-	       tot[audtr] += AVI->track[audtr].audio_index[k].len;
+					AVI->track[audtr].audio_index[k].pos = offset + str2ulong((unsigned char*)en);
+					en += 4;
+					AVI->track[audtr].audio_index[k].len = str2ulong_len((unsigned char*)en);
+					en += 4;
+					AVI->track[audtr].audio_index[k].tot = tot[audtr];
+					tot[audtr] += AVI->track[audtr].audio_index[k].len;
 
 #ifdef DEBUG_ODML
-	       /*
-		  GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d:%d] POS 0x%llX len=%d offset (%llx) (%ld)\n", k, audtr,
-		  AVI->track[audtr].audio_index[k].pos,
-		  (int)AVI->track[audtr].audio_index[k].len,
-		  offset, AVI->track[audtr].audio_superindex->aIndex[j].dwSize));
-		  */
+					/*
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] [%d:%d] POS 0x%llX len=%d offset (%llx) (%ld)\n", k, audtr,
+					  AVI->track[audtr].audio_index[k].pos,
+					  (int)AVI->track[audtr].audio_index[k].len,
+					  offset, AVI->track[audtr].audio_superindex->aIndex[j].dwSize));
+					  */
 #endif
 
-	       ++k;
-	    }
+					++k;
+				}
 
-	    gf_free(chunk_start);
-	 }
+				gf_free(chunk_start);
+			}
 
-	 AVI->track[audtr].audio_chunks = nai[audtr];
-	 AVI->track[audtr].audio_bytes = tot[audtr];
-      }
-   } // is opendml
+			AVI->track[audtr].audio_chunks = nai[audtr];
+			AVI->track[audtr].audio_bytes = tot[audtr];
+		}
+	} // is opendml
 
-   else if (AVI->total_frames && !AVI->is_opendml && idx_type==0) {
+	else if (AVI->total_frames && !AVI->is_opendml && idx_type==0) {
 
-   // *********************
-   // MULTIPLE RIFF CHUNKS (and no index)
-   // *********************
+		// *********************
+		// MULTIPLE RIFF CHUNKS (and no index)
+		// *********************
 
 multiple_riff:
 
-      gf_f64_seek(AVI->fdes, AVI->movi_start, SEEK_SET);
-
-      AVI->n_idx = 0;
+		gf_f64_seek(AVI->fdes, AVI->movi_start, SEEK_SET);
 
-      GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] Reconstructing index..."));
+		AVI->n_idx = 0;
 
-      // Number of frames; only one audio track supported
-      nvi = AVI->video_frames = AVI->total_frames;
-      nai[0] = AVI->track[0].audio_chunks = AVI->total_frames;
-      for(j=1; j<AVI->anum; ++j) AVI->track[j].audio_chunks = 0;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] Reconstructing index..."));
 
-      AVI->video_index = (video_index_entry *) gf_malloc(nvi*sizeof(video_index_entry));
+		// Number of frames; only one audio track supported
+		nvi = AVI->video_frames = AVI->total_frames;
+		nai[0] = AVI->track[0].audio_chunks = AVI->total_frames;
+		for(j=1; j<AVI->anum; ++j) AVI->track[j].audio_chunks = 0;
 
-      if(AVI->video_index==0) ERR_EXIT(AVI_ERR_NO_MEM);
+		AVI->video_index = (video_index_entry *) gf_malloc(nvi*sizeof(video_index_entry));
 
-      for(j=0; j<AVI->anum; ++j) {
-	  if(AVI->track[j].audio_chunks) {
-	      AVI->track[j].audio_index = (audio_index_entry *) gf_malloc((nai[j]+1)*sizeof(audio_index_entry));
-	      memset(AVI->track[j].audio_index, 0, (nai[j]+1)*(sizeof(audio_index_entry)));
-	      if(AVI->track[j].audio_index==0) ERR_EXIT(AVI_ERR_NO_MEM);
-	  }
-      }
+		if(AVI->video_index==0) ERR_EXIT(AVI_ERR_NO_MEM);
 
-      nvi = 0;
-      for(j=0; j<AVI->anum; ++j) {nai[j] = 0; tot[j] = 0;}
-
-      aud_chunks = AVI->total_frames;
-
-      while(1)
-      {
-	 if (nvi >= AVI->total_frames) break;
-
-         if( avi_read(AVI->fdes,data,8) != 8 ) break;
-         n = str2ulong((unsigned char *)data+4);
+		for(j=0; j<AVI->anum; ++j) {
+			if(AVI->track[j].audio_chunks) {
+				AVI->track[j].audio_index = (audio_index_entry *) gf_malloc((nai[j]+1)*sizeof(audio_index_entry));
+				memset(AVI->track[j].audio_index, 0, (nai[j]+1)*(sizeof(audio_index_entry)));
+				if(AVI->track[j].audio_index==0) ERR_EXIT(AVI_ERR_NO_MEM);
+			}
+		}
 
+		nvi = 0;
+		for(j=0; j<AVI->anum; ++j) {
+			nai[j] = 0;
+			tot[j] = 0;
+		}
 
-	 j=0;
+		aud_chunks = AVI->total_frames;
 
-	 if (aud_chunks - nai[j] -1 <= 0) {
-	     aud_chunks += AVI->total_frames;
-	     AVI->track[j].audio_index = (audio_index_entry *)
-		 gf_realloc( AVI->track[j].audio_index, (aud_chunks+1)*sizeof(audio_index_entry));
-	     if (!AVI->track[j].audio_index) {
-		 GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] Internal error in avilib -- no mem\n"));
-		 AVI_errno = AVI_ERR_NO_MEM;
-		 return -1;
-	     }
-	 }
+		while(1)
+		{
+			if (nvi >= AVI->total_frames) break;
 
-         /* Check if we got a tag ##db, ##dc or ##wb */
+			if( avi_read(AVI->fdes,data,8) != 8 ) break;
+			n = str2ulong((unsigned char *)data+4);
 
-	 // VIDEO
-         if(
-	     (data[0]=='0' || data[1]=='0') &&
-	     (data[2]=='d' || data[2]=='D') &&
-             (data[3]=='b' || data[3]=='B' || data[3]=='c' || data[3]=='C') ) {
 
-	     AVI->video_index[nvi].key = 0x0;
-	     AVI->video_index[nvi].pos = gf_f64_tell(AVI->fdes);
-	     AVI->video_index[nvi].len = (u32) n;
+			j=0;
 
-	     /*
-	     GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] Frame %ld pos %"LLD" len %"LLD" key %ld\n",
-		     nvi, AVI->video_index[nvi].pos,  AVI->video_index[nvi].len, (long)AVI->video_index[nvi].key));
-		     */
-	     nvi++;
-	     gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
-	 }
+			if (aud_chunks - nai[j] -1 <= 0) {
+				aud_chunks += AVI->total_frames;
+				AVI->track[j].audio_index = (audio_index_entry *)
+				                            gf_realloc( AVI->track[j].audio_index, (aud_chunks+1)*sizeof(audio_index_entry));
+				if (!AVI->track[j].audio_index) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] Internal error in avilib -- no mem\n"));
+					AVI_errno = AVI_ERR_NO_MEM;
+					return -1;
+				}
+			}
 
-	 //AUDIO
-	 else if(
-		 (data[0]=='0' || data[1]=='1') &&
-		 (data[2]=='w' || data[2]=='W') &&
-	     (data[3]=='b' || data[3]=='B') ) {
+			/* Check if we got a tag ##db, ##dc or ##wb */
 
+			// VIDEO
+			if(
+			    (data[0]=='0' || data[1]=='0') &&
+			    (data[2]=='d' || data[2]=='D') &&
+			    (data[3]=='b' || data[3]=='B' || data[3]=='c' || data[3]=='C') ) {
 
-		AVI->track[j].audio_index[nai[j]].pos = gf_f64_tell(AVI->fdes);
-		AVI->track[j].audio_index[nai[j]].len = (u32) n;
-		AVI->track[j].audio_index[nai[j]].tot = tot[j];
-		tot[j] += AVI->track[j].audio_index[nai[j]].len;
-		nai[j]++;
+				AVI->video_index[nvi].key = 0x0;
+				AVI->video_index[nvi].pos = gf_f64_tell(AVI->fdes);
+				AVI->video_index[nvi].len = (u32) n;
 
-		gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
-	 }
-	 else {
-            gf_f64_seek(AVI->fdes,-4,SEEK_CUR);
-	 }
+				/*
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] Frame %ld pos %"LLD" len %"LLD" key %ld\n",
+				    nvi, AVI->video_index[nvi].pos,  AVI->video_index[nvi].len, (long)AVI->video_index[nvi].key));
+				    */
+				nvi++;
+				gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
+			}
 
-      }
-      if (nvi < AVI->total_frames) {
-	  GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[avilib] Uh? Some frames seems missing (%ld/%d)\n",
-		  nvi,  AVI->total_frames));
-      }
+			//AUDIO
+			else if(
+			    (data[0]=='0' || data[1]=='1') &&
+			    (data[2]=='w' || data[2]=='W') &&
+			    (data[3]=='b' || data[3]=='B') ) {
 
 
-      AVI->video_frames = nvi;
-      AVI->track[0].audio_chunks = nai[0];
+				AVI->track[j].audio_index[nai[j]].pos = gf_f64_tell(AVI->fdes);
+				AVI->track[j].audio_index[nai[j]].len = (u32) n;
+				AVI->track[j].audio_index[nai[j]].tot = tot[j];
+				tot[j] += AVI->track[j].audio_index[nai[j]].len;
+				nai[j]++;
 
-      for(j=0; j<AVI->anum; ++j) AVI->track[j].audio_bytes = tot[j];
-      idx_type = 1;
-      GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] done. nvi=%ld nai=%ld tot=%ld\n", nvi, nai[0], tot[0]));
+				gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
+			}
+			else {
+				gf_f64_seek(AVI->fdes,-4,SEEK_CUR);
+			}
 
-   } // total_frames but no indx chunk (xawtv does this)
+		}
+		if (nvi < AVI->total_frames) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[avilib] Uh? Some frames seems missing (%ld/%d)\n",
+			        nvi,  AVI->total_frames));
+		}
 
-   else
 
-   {
-   // ******************
-   // NO OPENDML
-   // ******************
+		AVI->video_frames = nvi;
+		AVI->track[0].audio_chunks = nai[0];
 
-   /* Now generate the video index and audio index arrays */
+		for(j=0; j<AVI->anum; ++j) AVI->track[j].audio_bytes = tot[j];
+		idx_type = 1;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] done. nvi=%ld nai=%ld tot=%ld\n", nvi, nai[0], tot[0]));
 
-   nvi = 0;
-   for(j=0; j<AVI->anum; ++j) nai[j] = 0;
+	} // total_frames but no indx chunk (xawtv does this)
 
-   for(i=0;i<AVI->n_idx;i++) {
+	else
 
-     if(strnicmp((char *)AVI->idx[i],AVI->video_tag,3) == 0) nvi++;
+	{
+		// ******************
+		// NO OPENDML
+		// ******************
 
-     for(j=0; j<AVI->anum; ++j) if(strnicmp((char *)AVI->idx[i], AVI->track[j].audio_tag,4) == 0) nai[j]++;
-   }
+		/* Now generate the video index and audio index arrays */
 
-   AVI->video_frames = nvi;
-   for(j=0; j<AVI->anum; ++j) AVI->track[j].audio_chunks = nai[j];
+		nvi = 0;
+		for(j=0; j<AVI->anum; ++j) nai[j] = 0;
 
+		for(i=0; i<AVI->n_idx; i++) {
 
-   if(AVI->video_frames==0) ERR_EXIT(AVI_ERR_NO_VIDS);
-   AVI->video_index = (video_index_entry *) gf_malloc(nvi*sizeof(video_index_entry));
-   if(AVI->video_index==0) ERR_EXIT(AVI_ERR_NO_MEM);
+			if(strnicmp((char *)AVI->idx[i],AVI->video_tag,3) == 0) nvi++;
 
-   for(j=0; j<AVI->anum; ++j) {
-       if(AVI->track[j].audio_chunks) {
-	   AVI->track[j].audio_index = (audio_index_entry *) gf_malloc((nai[j]+1)*sizeof(audio_index_entry));
-	   memset(AVI->track[j].audio_index, 0, (nai[j]+1)*(sizeof(audio_index_entry)));
-	   if(AVI->track[j].audio_index==0) ERR_EXIT(AVI_ERR_NO_MEM);
-       }
-   }
+			for(j=0; j<AVI->anum; ++j) if(strnicmp((char *)AVI->idx[i], AVI->track[j].audio_tag,4) == 0) nai[j]++;
+		}
 
-   nvi = 0;
-   for(j=0; j<AVI->anum; ++j) {nai[j] = 0; tot[j] = 0;}
+		AVI->video_frames = nvi;
+		for(j=0; j<AVI->anum; ++j) AVI->track[j].audio_chunks = nai[j];
 
-   ioff = idx_type == 1 ? 8 : (u32)AVI->movi_start+4;
 
-   for(i=0;i<AVI->n_idx;i++) {
+		if(AVI->video_frames==0) ERR_EXIT(AVI_ERR_NO_VIDS);
+		AVI->video_index = (video_index_entry *) gf_malloc(nvi*sizeof(video_index_entry));
+		if(AVI->video_index==0) ERR_EXIT(AVI_ERR_NO_MEM);
 
-     //video
-     if(strnicmp((char *)AVI->idx[i],AVI->video_tag,3) == 0) {
-       AVI->video_index[nvi].key = str2ulong(AVI->idx[i]+ 4);
-       AVI->video_index[nvi].pos = str2ulong(AVI->idx[i]+ 8)+ioff;
-       AVI->video_index[nvi].len = str2ulong(AVI->idx[i]+12);
-       nvi++;
-     }
+		for(j=0; j<AVI->anum; ++j) {
+			if(AVI->track[j].audio_chunks) {
+				AVI->track[j].audio_index = (audio_index_entry *) gf_malloc((nai[j]+1)*sizeof(audio_index_entry));
+				memset(AVI->track[j].audio_index, 0, (nai[j]+1)*(sizeof(audio_index_entry)));
+				if(AVI->track[j].audio_index==0) ERR_EXIT(AVI_ERR_NO_MEM);
+			}
+		}
 
-     //audio
-     for(j=0; j<AVI->anum; ++j) {
+		nvi = 0;
+		for(j=0; j<AVI->anum; ++j) {
+			nai[j] = 0;
+			tot[j] = 0;
+		}
 
-       if(strnicmp((char *)AVI->idx[i],AVI->track[j].audio_tag,4) == 0) {
-	 AVI->track[j].audio_index[nai[j]].pos = str2ulong(AVI->idx[i]+ 8)+ioff;
-	 AVI->track[j].audio_index[nai[j]].len = str2ulong(AVI->idx[i]+12);
-	 AVI->track[j].audio_index[nai[j]].tot = tot[j];
-	 tot[j] += AVI->track[j].audio_index[nai[j]].len;
-	 nai[j]++;
-       }
-     }
-   }
+		ioff = idx_type == 1 ? 8 : (u32)AVI->movi_start+4;
+
+		for(i=0; i<AVI->n_idx; i++) {
+
+			//video
+			if(strnicmp((char *)AVI->idx[i],AVI->video_tag,3) == 0) {
+				AVI->video_index[nvi].key = str2ulong(AVI->idx[i]+ 4);
+				AVI->video_index[nvi].pos = str2ulong(AVI->idx[i]+ 8)+ioff;
+				AVI->video_index[nvi].len = str2ulong(AVI->idx[i]+12);
+				nvi++;
+			}
+
+			//audio
+			for(j=0; j<AVI->anum; ++j) {
+
+				if(strnicmp((char *)AVI->idx[i],AVI->track[j].audio_tag,4) == 0) {
+					AVI->track[j].audio_index[nai[j]].pos = str2ulong(AVI->idx[i]+ 8)+ioff;
+					AVI->track[j].audio_index[nai[j]].len = str2ulong(AVI->idx[i]+12);
+					AVI->track[j].audio_index[nai[j]].tot = tot[j];
+					tot[j] += AVI->track[j].audio_index[nai[j]].len;
+					nai[j]++;
+				}
+			}
+		}
 
 
-   for(j=0; j<AVI->anum; ++j) AVI->track[j].audio_bytes = tot[j];
+		for(j=0; j<AVI->anum; ++j) AVI->track[j].audio_bytes = tot[j];
 
-   } // is no opendml
+	} // is no opendml
 
-   /* Reposition the file */
+	/* Reposition the file */
 
-   gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
-   AVI->video_pos = 0;
+	gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
+	AVI->video_pos = 0;
 
-   return(0);
+	return(0);
 }
 
 long AVI_video_frames(avi_t *AVI)
 {
-   return AVI->video_frames;
+	return AVI->video_frames;
 }
 int  AVI_video_width(avi_t *AVI)
 {
-   return AVI->width;
+	return AVI->width;
 }
 int  AVI_video_height(avi_t *AVI)
 {
-   return AVI->height;
+	return AVI->height;
 }
 double AVI_frame_rate(avi_t *AVI)
 {
-   return AVI->fps;
+	return AVI->fps;
 }
 char* AVI_video_compressor(avi_t *AVI)
 {
-   return AVI->compressor2;
+	return AVI->compressor2;
 }
 
 long AVI_max_video_chunk(avi_t *AVI)
 {
-   return AVI->max_len;
+	return AVI->max_len;
 }
 
 int AVI_audio_tracks(avi_t *AVI)
 {
-    return(AVI->anum);
+	return(AVI->anum);
 }
 
 int AVI_audio_channels(avi_t *AVI)
 {
-   return AVI->track[AVI->aptr].a_chans;
+	return AVI->track[AVI->aptr].a_chans;
 }
 
 long AVI_audio_mp3rate(avi_t *AVI)
 {
-   return AVI->track[AVI->aptr].mp3rate;
+	return AVI->track[AVI->aptr].mp3rate;
 }
 
 long AVI_audio_padrate(avi_t *AVI)
 {
-   return AVI->track[AVI->aptr].padrate;
+	return AVI->track[AVI->aptr].padrate;
 }
 
 int AVI_audio_bits(avi_t *AVI)
 {
-   return AVI->track[AVI->aptr].a_bits;
+	return AVI->track[AVI->aptr].a_bits;
 }
 
 int AVI_audio_format(avi_t *AVI)
 {
-   return AVI->track[AVI->aptr].a_fmt;
+	return AVI->track[AVI->aptr].a_fmt;
 }
 
 long AVI_audio_rate(avi_t *AVI)
 {
-   return AVI->track[AVI->aptr].a_rate;
+	return AVI->track[AVI->aptr].a_rate;
 }
 
 
 long AVI_frame_size(avi_t *AVI, long frame)
 {
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
-   if(!AVI->video_index)         { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
+	if(!AVI->video_index)         {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
 
-   if(frame < 0 || frame >= AVI->video_frames) return 0;
-   return (u32) (AVI->video_index[frame].len);
+	if(frame < 0 || frame >= AVI->video_frames) return 0;
+	return (u32) (AVI->video_index[frame].len);
 }
 
 long AVI_audio_size(avi_t *AVI, long frame)
 {
-  if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
-  if(!AVI->track[AVI->aptr].audio_index)         { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
+	if(!AVI->track[AVI->aptr].audio_index)         {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
 
-  if(frame < 0 || frame >= AVI->track[AVI->aptr].audio_chunks) return -1;
-  return (u32) (AVI->track[AVI->aptr].audio_index[frame].len);
+	if(frame < 0 || frame >= AVI->track[AVI->aptr].audio_chunks) return -1;
+	return (u32) (AVI->track[AVI->aptr].audio_index[frame].len);
 }
 
 u64 AVI_get_video_position(avi_t *AVI, long frame)
 {
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return (u64) -1; }
-   if(!AVI->video_index)         { AVI_errno = AVI_ERR_NO_IDX;   return (u64) -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return (u64) -1;
+	}
+	if(!AVI->video_index)         {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return (u64) -1;
+	}
 
-   if(frame < 0 || frame >= AVI->video_frames) return 0;
-   return(AVI->video_index[frame].pos);
+	if(frame < 0 || frame >= AVI->video_frames) return 0;
+	return(AVI->video_index[frame].pos);
 }
 
 
 int AVI_seek_start(avi_t *AVI)
 {
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
 
-   gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
-   AVI->video_pos = 0;
-   return 0;
+	gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
+	AVI->video_pos = 0;
+	return 0;
 }
 
 int AVI_set_video_position(avi_t *AVI, long frame)
 {
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
-   if(!AVI->video_index)         { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
+	if(!AVI->video_index)         {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
 
-   if (frame < 0 ) frame = 0;
-   AVI->video_pos = frame;
-   return 0;
+	if (frame < 0 ) frame = 0;
+	AVI->video_pos = frame;
+	return 0;
 }
 
 int AVI_set_audio_bitrate(avi_t *AVI, long bitrate)
 {
-   if(AVI->mode==AVI_MODE_READ) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
+	if(AVI->mode==AVI_MODE_READ) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
 
-   AVI->track[AVI->aptr].mp3rate = bitrate;
-   return 0;
+	AVI->track[AVI->aptr].mp3rate = bitrate;
+	return 0;
 }
 
 
 long AVI_read_frame(avi_t *AVI, char *vidbuf, int *keyframe)
 {
-   long n;
+	long n;
 
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
-   if(!AVI->video_index)         { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
+	if(!AVI->video_index)         {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
 
-   if(AVI->video_pos < 0 || AVI->video_pos >= AVI->video_frames) return -1;
-   n = (u32) AVI->video_index[AVI->video_pos].len;
+	if(AVI->video_pos < 0 || AVI->video_pos >= AVI->video_frames) return -1;
+	n = (u32) AVI->video_index[AVI->video_pos].len;
 
-   *keyframe = (AVI->video_index[AVI->video_pos].key==0x10) ? 1:0;
+	*keyframe = (AVI->video_index[AVI->video_pos].key==0x10) ? 1:0;
 
-   if (vidbuf == NULL) {
-     AVI->video_pos++;
-     return n;
-   }
+	if (vidbuf == NULL) {
+		AVI->video_pos++;
+		return n;
+	}
 
-   gf_f64_seek(AVI->fdes, AVI->video_index[AVI->video_pos].pos, SEEK_SET);
+	gf_f64_seek(AVI->fdes, AVI->video_index[AVI->video_pos].pos, SEEK_SET);
 
-   if (avi_read(AVI->fdes,vidbuf,n) != (u32) n)
-   {
-      AVI_errno = AVI_ERR_READ;
-      return -1;
-   }
+	if (avi_read(AVI->fdes,vidbuf,n) != (u32) n)
+	{
+		AVI_errno = AVI_ERR_READ;
+		return -1;
+	}
 
-   AVI->video_pos++;
+	AVI->video_pos++;
 
-   return n;
+	return n;
 }
 
 long AVI_get_audio_position_index(avi_t *AVI)
 {
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
-   if(!AVI->track[AVI->aptr].audio_index) { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
+	if(!AVI->track[AVI->aptr].audio_index) {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
 
-   return (AVI->track[AVI->aptr].audio_posc);
+	return (AVI->track[AVI->aptr].audio_posc);
 }
 
 int AVI_set_audio_position_index(avi_t *AVI, long indexpos)
 {
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
-   if(!AVI->track[AVI->aptr].audio_index)         { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
-   if(indexpos > AVI->track[AVI->aptr].audio_chunks)     { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
+	if(!AVI->track[AVI->aptr].audio_index)         {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
+	if(indexpos > AVI->track[AVI->aptr].audio_chunks)     {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
 
-   AVI->track[AVI->aptr].audio_posc = indexpos;
-   AVI->track[AVI->aptr].audio_posb = 0;
+	AVI->track[AVI->aptr].audio_posc = indexpos;
+	AVI->track[AVI->aptr].audio_posb = 0;
 
-   return 0;
+	return 0;
 }
 
 
 int AVI_set_audio_position(avi_t *AVI, long byte)
 {
-   long n0, n1, n;
+	long n0, n1, n;
 
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
-   if(!AVI->track[AVI->aptr].audio_index)         { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
+	if(!AVI->track[AVI->aptr].audio_index)         {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
 
-   if(byte < 0) byte = 0;
+	if(byte < 0) byte = 0;
 
-   /* Binary search in the audio chunks */
+	/* Binary search in the audio chunks */
 
-   n0 = 0;
-   n1 = AVI->track[AVI->aptr].audio_chunks;
+	n0 = 0;
+	n1 = AVI->track[AVI->aptr].audio_chunks;
 
-   while(n0<n1-1)
-   {
-      n = (n0+n1)/2;
-      if(AVI->track[AVI->aptr].audio_index[n].tot>(u32) byte)
-         n1 = n;
-      else
-         n0 = n;
-   }
+	while(n0<n1-1)
+	{
+		n = (n0+n1)/2;
+		if(AVI->track[AVI->aptr].audio_index[n].tot>(u32) byte)
+			n1 = n;
+		else
+			n0 = n;
+	}
 
-   AVI->track[AVI->aptr].audio_posc = n0;
-   AVI->track[AVI->aptr].audio_posb = (u32) (byte - AVI->track[AVI->aptr].audio_index[n0].tot);
+	AVI->track[AVI->aptr].audio_posc = n0;
+	AVI->track[AVI->aptr].audio_posb = (u32) (byte - AVI->track[AVI->aptr].audio_index[n0].tot);
 
-   return 0;
+	return 0;
 }
 
 long AVI_read_audio(avi_t *AVI, char *audbuf, long bytes, int *continuous)
 {
-   long nr, left, todo;
-   s64 pos;
+	long nr, left, todo;
+	s64 pos;
 
-   if(AVI->mode==AVI_MODE_WRITE) { AVI_errno = AVI_ERR_NOT_PERM; return -1; }
-   if(!AVI->track[AVI->aptr].audio_index)         { AVI_errno = AVI_ERR_NO_IDX;   return -1; }
+	if(AVI->mode==AVI_MODE_WRITE) {
+		AVI_errno = AVI_ERR_NOT_PERM;
+		return -1;
+	}
+	if(!AVI->track[AVI->aptr].audio_index)         {
+		AVI_errno = AVI_ERR_NO_IDX;
+		return -1;
+	}
 
-   nr = 0; /* total number of bytes read */
+	nr = 0; /* total number of bytes read */
 
-   if (bytes==0) {
-     AVI->track[AVI->aptr].audio_posc++;
-     AVI->track[AVI->aptr].audio_posb = 0;
-   }
+	if (bytes==0) {
+		AVI->track[AVI->aptr].audio_posc++;
+		AVI->track[AVI->aptr].audio_posb = 0;
+	}
 
-   *continuous = 1;
-   while(bytes>0)
-   {
-       s64 ret;
-      left = (long) (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;
-         AVI->track[AVI->aptr].audio_posc++;
-         AVI->track[AVI->aptr].audio_posb = 0;
-		 *continuous = 0;
-         continue;
-      }
-      if(bytes<left)
-         todo = bytes;
-      else
-         todo = left;
-      pos = AVI->track[AVI->aptr].audio_index[AVI->track[AVI->aptr].audio_posc].pos + AVI->track[AVI->aptr].audio_posb;
-      gf_f64_seek(AVI->fdes, pos, SEEK_SET);
-      if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != todo)
-      {
-	 GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] XXX pos = %"LLD", ret = %"LLD", todo = %ld\n", pos, ret, todo));
-         AVI_errno = AVI_ERR_READ;
-         return -1;
-      }
-      bytes -= todo;
-      nr    += todo;
-      AVI->track[AVI->aptr].audio_posb += todo;
-   }
+	*continuous = 1;
+	while(bytes>0)
+	{
+		s64 ret;
+		left = (long) (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;
+			AVI->track[AVI->aptr].audio_posc++;
+			AVI->track[AVI->aptr].audio_posb = 0;
+			*continuous = 0;
+			continue;
+		}
+		if(bytes<left)
+			todo = bytes;
+		else
+			todo = left;
+		pos = AVI->track[AVI->aptr].audio_index[AVI->track[AVI->aptr].audio_posc].pos + AVI->track[AVI->aptr].audio_posb;
+		gf_f64_seek(AVI->fdes, pos, SEEK_SET);
+		if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != todo)
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] XXX pos = %"LLD", ret = %"LLD", todo = %ld\n", pos, ret, todo));
+			AVI_errno = AVI_ERR_READ;
+			return -1;
+		}
+		bytes -= todo;
+		nr    += todo;
+		AVI->track[AVI->aptr].audio_posb += todo;
+	}
 
-   return nr;
+	return nr;
 }
 
 
@@ -2902,73 +3031,72 @@
                   without having an index of the file. */
 
 int AVI_read_data(avi_t *AVI, char *vidbuf, long max_vidbuf,
-                              char *audbuf, long max_audbuf,
-                              long *len)
+                  char *audbuf, long max_audbuf,
+                  long *len)
 {
 
-/*
- * Return codes:
- *
- *    1 = video data read
- *    2 = audio data read
- *    0 = reached EOF
- *   -1 = video buffer too small
- *   -2 = audio buffer too small
- */
+	/*
+	 * Return codes:
+	 *
+	 *    1 = video data read
+	 *    2 = audio data read
+	 *    0 = reached EOF
+	 *   -1 = video buffer too small
+	 *   -2 = audio buffer too small
+	 */
 
-   s64 n;
-   char data[8];
-
-   if(AVI->mode==AVI_MODE_WRITE) return 0;
-
-   while(1)
-   {
-      /* Read tag and length */
-
-      if( avi_read(AVI->fdes,data,8) != 8 ) return 0;
-
-      /* if we got a list tag, ignore it */
-
-      if(strnicmp(data,"LIST",4) == 0)
-      {
-         gf_f64_seek(AVI->fdes,4,SEEK_CUR);
-         continue;
-      }
-
-      n = PAD_EVEN(str2ulong((unsigned char *)data+4));
-
-      if(strnicmp(data,AVI->video_tag,3) == 0)
-      {
-         *len = (u32) n;
-         AVI->video_pos++;
-         if(n>max_vidbuf)
-         {
-            gf_f64_seek(AVI->fdes,n,SEEK_CUR);
-            return -1;
-         }
-         if(avi_read(AVI->fdes,vidbuf, (u32) n) != n ) return 0;
-         return 1;
-      }
-      else if(strnicmp(data,AVI->track[AVI->aptr].audio_tag,4) == 0)
-      {
-         *len = (u32) n;
-         if(n>max_audbuf)
-         {
-            gf_f64_seek(AVI->fdes,n,SEEK_CUR);
-            return -2;
-         }
-         if(avi_read(AVI->fdes,audbuf, (u32) n) != n ) return 0;
-         return 2;
-         break;
-      }
-      else
-         if(gf_f64_seek(AVI->fdes,n,SEEK_CUR) == (u64) -1)  return 0;
-   }
+	s64 n;
+	char data[8];
+
+	if(AVI->mode==AVI_MODE_WRITE) return 0;
+
+	while(1)
+	{
+		/* Read tag and length */
+
+		if( avi_read(AVI->fdes,data,8) != 8 ) return 0;
+
+		/* if we got a list tag, ignore it */
+
+		if(strnicmp(data,"LIST",4) == 0)
+		{
+			gf_f64_seek(AVI->fdes,4,SEEK_CUR);
+			continue;
+		}
+
+		n = PAD_EVEN(str2ulong((unsigned char *)data+4));
+
+		if(strnicmp(data,AVI->video_tag,3) == 0)
+		{
+			*len = (u32) n;
+			AVI->video_pos++;
+			if(n>max_vidbuf)
+			{
+				gf_f64_seek(AVI->fdes,n,SEEK_CUR);
+				return -1;
+			}
+			if(avi_read(AVI->fdes,vidbuf, (u32) n) != n ) return 0;
+			return 1;
+		}
+		else if(strnicmp(data,AVI->track[AVI->aptr].audio_tag,4) == 0)
+		{
+			*len = (u32) n;
+			if(n>max_audbuf)
+			{
+				gf_f64_seek(AVI->fdes,n,SEEK_CUR);
+				return -2;
+			}
+			if(avi_read(AVI->fdes,audbuf, (u32) n) != n ) return 0;
+			return 2;
+			break;
+		}
+		else if(gf_f64_seek(AVI->fdes,n,SEEK_CUR) == (u64) -1)  return 0;
+	}
 }
 
 u64 AVI_max_size(void)
 {
-  return((u64) AVI_MAX_LEN);
+	return((u64) AVI_MAX_LEN);
 }

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/dash_client.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/dash_client.c Changed

@@ -5,7 +5,7 @@
 *			Copyright (c) Telecom ParisTech 2010-
 *					All rights reserved
 *
-*  This file is part of GPAC / Adaptive HTTP Streaming 
+*  This file is part of GPAC / Adaptive HTTP Streaming
 *
 *  GPAC is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU Lesser General Public License as published by
@@ -39,6 +39,9 @@
 
 #ifndef GPAC_DISABLE_DASH_CLIENT
 
+/*ISO 639 languages*/
+#include <gpac/iso639.h>
+
 /*set to 1 if you want MPD to use SegmentTemplate if possible instead of SegmentList*/
 #define M3U8_TO_MPD_USE_TEMPLATE	0
 
@@ -83,7 +86,7 @@
 	/* number of time the MPD has been reloaded and last update time*/
 	u32 reload_count, last_update_time;
 	/*signature of last MPD*/
-	u8 lastMPDSignature[20];
+	u8 lastMPDSignature[GF_SHA1_DIGEST_SIZE];
 	/*mime type of media segments (m3u8)*/
 	char *mimeTypeForM3U8Segments;
 
@@ -91,10 +94,12 @@
 	u32 active_period_index;
 	u32 request_period_switch;
 
+	Bool next_period_checked;
+
 	u64 start_time_in_active_period;
 
 	Bool ignore_mpd_duration;
-	u32 initial_time_shift_percent;
+	u32 initial_time_shift_value;
 
 	/*list of groups in the active period*/
 	GF_List *groups;
@@ -108,15 +113,17 @@
 	GF_DASH_STATE dash_state;
 	Bool mpd_stop_request;
 	Bool in_period_setup;
-	
+
 	u32 nb_buffering;
 	u32 idle_interval;
 
 	s32 utc_drift_estimate;
 	s32 utc_shift;
-	/* TODO - handle playback status for SPEED/SEEK through SIDX */
-	Double playback_start_range;
-	Double start_range_in_segment_at_next_period;
+
+	Double start_range_period;
+
+	Double speed;
+	u32 probe_times_before_switch;
 
 	Bool force_mpd_update;
 
@@ -124,10 +131,12 @@
 
 	u32 min_timeout_between_404, segment_lost_after_ms;
 
+	u32 time_in_tsb, prev_time_in_tsb;
+	u32 tsb_exceeded;
 	s32 debug_group_index;
 };
 
-static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group);
+static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group, Double seek_to, Bool is_dynamic);
 
 
 typedef struct
@@ -204,10 +213,11 @@
 	segment_cache_entry *cached;
 
 	GF_DASHFileIOSession segment_download;
-
-	const char *segment_local_url;
+	//0: not set, 1: abort because group has been stoped - 2: abort because bandwidth was too low
+	u32 download_abort_type;
 	/*usually 0-0 (no range) but can be non-zero when playing local MPD/DASH sessions*/
-	u64 local_url_start_range, local_url_end_range;
+	u64 bs_switching_init_segment_url_start_range, bs_switching_init_segment_url_end_range;
+	char *bs_switching_init_segment_url;
 
 	u32 nb_segments_done;
 	u32 last_segment_time;
@@ -217,11 +227,11 @@
 	Bool buffering;
 	u32 maybe_end_of_stream;
 	u32 cache_duration;
-	u32 time_at_first_reload_required;	
+	u32 time_at_first_reload_required;
 	u32 force_representation_idx_plus_one;
 
 	Bool force_segment_switch;
-	Bool is_downloading, download_aborted;
+	Bool is_downloading;
 	Bool loop_detected;
 
 	u32 time_at_first_failure;
@@ -244,6 +254,8 @@
 	u32 current_timescale;
 
 	void *udta;
+
+	Bool has_pending_enhancement;
 };
 
 static const char *gf_dash_get_mime_type(GF_MPD_SubRepresentation *subrep, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set)
@@ -254,21 +266,21 @@
 	return NULL;
 }
 
-static void gf_dash_buffer_off(GF_DASH_Group *group) 
+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->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); 
+			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 = 0;
-	} 
+	}
 }
 
-static void gf_dash_buffer_on(GF_DASH_Group *group) 
+static void gf_dash_buffer_on(GF_DASH_Group *group)
 {
 	if (!group->dash->enable_buffering) return;
 
@@ -276,7 +288,7 @@
 		if (!group->dash->nb_buffering) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Starting session buffering\n"));
 		}
-		group->dash->nb_buffering++; 
+		group->dash->nb_buffering++;
 		group->buffering = 1;
 	}
 }
@@ -287,7 +299,7 @@
 
 	if (dash->mpd_dnload && dash->dash_io->get_utc_start_time)
 		utc = dash->dash_io->get_utc_start_time(dash->dash_io, dash->mpd_dnload);
-	if (!utc) 
+	if (!utc)
 		utc = gf_net_get_utc();
 	return utc;
 }
@@ -317,7 +329,7 @@
 }
 
 GF_EXPORT
-void gf_dash_get_buffer_info_buffering(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered)
+void gf_dash_get_buffer_info(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered)
 {
 	u32 nb_buffering = 0;
 	if (dash->nb_buffering) {
@@ -337,7 +349,7 @@
 				nb_buffering += gf_dash_group_count_rep_needed(group);
 			}
 		}
-		if (*media_buffered > *total_buffer) 
+		if (*media_buffered > *total_buffer)
 			*media_buffered  = *total_buffer;
 		*total_buffer /= nb_buffering;
 		*media_buffered /= nb_buffering;
@@ -349,7 +361,7 @@
 	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) 
+		if (group->cached[0].duration && group->nb_cached_segments>=group->max_buffer_segments)
 			gf_dash_buffer_off(group);
 	}
 }
@@ -381,28 +393,28 @@
 	u64 current_time, current_time_no_timeshift, availabilityStartTime;
 	u32 ast_diff, start_number;
 	Double ast_offset = 0;
-	
-	if (mpd->type==GF_MPD_TYPE_STATIC) 
+
+	if (mpd->type==GF_MPD_TYPE_STATIC)
 		return;
-	
+
 	/*M3U8 does not use NTP sync */
 	if (group->dash->is_m3u8)
 		return;
 
 	if (group->broken_timing )
 		return;
-		
-	
+
+
 	/*if no AST, do not use NTP sync */
 	if (! group->dash->mpd->availabilityStartTime) {
 		group->broken_timing = 1;
 		return;
 	}
 
-	//temp hack 
-	mpd->media_presentation_duration = 0;
-
-	if (!fetch_time) fetch_time = group->dash->mpd_fetch_time;
+	if (!fetch_time) {
+		u32 diff = gf_sys_clock() - group->dash->last_update_time;
+		fetch_time = group->dash->mpd_fetch_time + diff;
+	}
 	if (group->dash->estimate_utc_drift && !group->dash->utc_drift_estimate && group->dash->mpd_dnload && group->dash->dash_io->get_header_value) {
 		const char *val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "Server-UTC");
 		if (val) {
@@ -428,7 +440,7 @@
 #ifdef FORCE_DESYNC
 	availabilityStartTime -= FORCE_DESYNC;
 #endif
-	
+
 	ast_diff = (u32) (availabilityStartTime - group->dash->mpd->availabilityStartTime);
 	current_time = fetch_time;
 
@@ -450,11 +462,11 @@
 			}
 			else if (t1 && t2) {
 				t1->tm_year = t2->tm_year;
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in UTC clock: current time %d-%02d-%02dT%02d:%02d:%02dZ is less than AST %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,
-						 1900+t2->tm_year, t2->tm_mon+1, t2->tm_mday, t2->tm_hour, t2->tm_min, t2->tm_sec,
-						 (u32) (availabilityStartTime - current_time)
-				));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in UTC clock: current time %d-%02d-%02dT%02d:%02d:%02dZ is less than AST %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,
+				                                   1900+t2->tm_year, t2->tm_mon+1, t2->tm_mday, t2->tm_hour, t2->tm_min, t2->tm_sec,
+				                                   (u32) (availabilityStartTime - current_time)
+				                                  ));
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in UTC clock: could not retrieve time!\n"));
 			}
@@ -471,10 +483,10 @@
 			}
 		} else {
 			availabilityStartTime = current_time;
-			current_time = 0;	
+			current_time = 0;
 		}
 	}
-	else current_time -= availabilityStartTime;	
+	else current_time -= availabilityStartTime;
 
 	if (current_time < group->period->start) current_time = 0;
 	else current_time -= group->period->start;
@@ -484,7 +496,7 @@
 		s32 diff = (s32) current_time - (s32) (mpd->media_presentation_duration);
 		if (ABS(diff)>10) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Broken UTC timing in client or server - got Media URL is not set in segment list\n"));
-				
+
 		}
 		current_time = mpd->media_presentation_duration;
 	}
@@ -493,10 +505,15 @@
 	current_time_no_timeshift = current_time;
 	if ( ((s32) mpd->time_shift_buffer_depth>=0)) {
 
-		if (group->dash->initial_time_shift_percent) {
-			shift = mpd->time_shift_buffer_depth;
-			shift *= group->dash->initial_time_shift_percent;
-			shift /= 100;
+		if (group->dash->initial_time_shift_value) {
+			if (group->dash->initial_time_shift_value<=100) {
+				shift = mpd->time_shift_buffer_depth;
+				shift *= group->dash->initial_time_shift_value;
+				shift /= 100;
+			} else {
+				shift = (u32) group->dash->initial_time_shift_value;
+				if (shift > mpd->time_shift_buffer_depth) shift = mpd->time_shift_buffer_depth;
+			}
 
 			if (current_time < shift) current_time = 0;
 			else current_time -= shift;
@@ -507,6 +524,7 @@
 			else current_time -= shift;
 		}
 	}
+	group->dash->time_in_tsb = group->dash->prev_time_in_tsb = 0;
 
 	timeline = NULL;
 	timescale=1;
@@ -568,7 +586,7 @@
 			GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, i);
 
 			if (!i && (current_time_rescale + ent->duration < ent->start_time)) {
-				current_time_rescale = current_time_no_timeshift * timescale / 1000; 
+				current_time_rescale = current_time_no_timeshift * timescale / 1000;
 			}
 			timeline_duration += (1+ent->repeat_count)*ent->duration;
 
@@ -643,7 +661,7 @@
 
 			group->ast_at_init = availabilityStartTime - (u32) (ast_offset*1000);
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At current time "LLD" ms: Initializing Timeline: startNumber=%d segmentNumber=%d segmentDuration=%g sec offset in segment %g sec\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=%g sec offset in segment %g sec\n", current_time, start_number, shift, group->segment_duration, group->start_playback_range ? group->start_playback_range - shift*group->segment_duration : 0));
 		} else {
 			group->download_segment_index += start_number;
 			if (group->download_segment_index > group->start_number_at_last_ast) {
@@ -686,7 +704,7 @@
 	u32 i;
 	if (!mime)
 		return 0;
-	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i] ; i++){
+	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i] ; i++) {
 		if ( !stricmp(mime, GF_DASH_MPD_MIME_TYPES[i]))
 			return 1;
 	}
@@ -752,7 +770,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is %d kbps - no lower bitrate available ...\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
 		return GF_OK;
 	}
-	
+
 
 	//TODO - when do we start checking ?
 	if (time_since_start < 200) {
@@ -774,8 +792,8 @@
 
 	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is %d kbps - %d/%d in cache - killing connection and switching\n", set_idx, download_rate/1024, group->active_bitrate/1024, group->nb_cached_segments, group->max_cached_segments ));
 
+	group->download_abort_type = 2;
 	group->dash->dash_io->abort(group->dash->dash_io, group->segment_download);
-	group->download_aborted = GF_TRUE;
 
 	//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) ? 0 : 1;
@@ -791,13 +809,13 @@
 		//compute min bitrate needed to fetch the segement 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;
-		
+
 		target_rate = (u32) (download_rate * ratio);
-		
+
 		if (target_rate < group->min_representation_bitrate) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Download rate lower than min available rate ...\n"));
 			target_rate = group->min_representation_bitrate;
-			//don't force bandwidth switch, we won't have time to redownload the segment. 
+			//don't force bandwidth switch, we won't have time to redownload the segment.
 			group->force_switch_bandwidth = default_switch_mode;
 		} else {
 			group->force_switch_bandwidth = 1;
@@ -812,9 +830,9 @@
 /*!
 * Download a file with possible retry if GF_IP_CONNECTION_FAILURE|GF_IP_NETWORK_FAILURE
 * (I discovered that with my WIFI connection, I had many issues with BFM-TV downloads)
-* Similar to gf_term_download_new() and gf_dm_sess_process().
-* Parameters are identical to the ones of gf_term_download_new.
-* \see gf_term_download_new()
+* Similar to gf_service_download_new() and gf_dm_sess_process().
+* Parameters are identical to the ones of gf_service_download_new.
+* \see gf_service_download_new()
 */
 GF_Err gf_dash_download_resource(GF_DASHFileIO *dash_io, GF_DASHFileIOSession *sess, const char *url, u64 start_range, u64 end_range, u32 persistent_mode, GF_DASH_Group *group)
 {
@@ -831,7 +849,7 @@
 
 	if (! *sess) {
 		*sess = dash_io->create(dash_io, persistent_mode ? 1 : 0, url, group_idx);
-		if (!(*sess)){
+		if (!(*sess)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot try to download %s... OUT of memory ?\n", url));
 			return GF_OUT_OF_MEM;
 		}
@@ -866,7 +884,7 @@
 			return e;
 		}
 	}
-		assert(*sess);
+	assert(*sess);
 
 	/*issue HTTP GET for headers only*/
 	e = dash_io->init(dash_io, *sess);
@@ -874,15 +892,15 @@
 	if (e>=GF_OK) {
 		/*check mime type of the adaptation set if not provided*/
 		if (group) {
-			const char *mime = dash_io->get_mime(dash_io, *sess);
+			const char *mime = *sess ? dash_io->get_mime(dash_io, *sess) : NULL;
 			if (mime && !group->service_mime) {
 				group->service_mime = gf_strdup(mime);
-			} 
+			}
 			/*we allow servers to give us broken mim types for the representation served ...*/
 #if 0
 			else if (mime && stricmp(group->service_mime, mime)) {
 				GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-				if (! gf_dash_get_mime_type(NULL, rep, group->adaptation_set) ) 
+				if (! gf_dash_get_mime_type(NULL, rep, group->adaptation_set) )
 					rep->mime_type = gf_strdup(mime);
 				rep->disabled = 1;
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Disabling representation since mime does not match: expected %s, but had %s for %s!\n", group->service_mime, mime, url));
@@ -902,13 +920,17 @@
 				if (group->segment_download) dash_io->abort(dash_io, group->segment_download);
 				group->is_downloading = 1;
 				return GF_OK;
-			} 
+			}
 			group->segment_must_be_streamed = 0;
-		} 
+		}
 
 		/*we can download the file*/
 		e = dash_io->run(dash_io, *sess);
 	}
+	if (group && group->download_abort_type) {
+		group->is_downloading = 0;
+		return GF_IP_CONNECTION_CLOSED;
+	}
 	switch (e) {
 	case GF_IP_CONNECTION_FAILURE:
 	case GF_IP_NETWORK_FAILURE:
@@ -942,16 +964,48 @@
 	return e;
 }
 
-static void gf_dash_get_timeline_duration(GF_MPD_SegmentTimeline *timeline, u32 *nb_segments, Double *max_seg_duration)
+static void gf_dash_get_timeline_duration(GF_MPD *mpd, GF_MPD_Period *period, GF_MPD_SegmentTimeline *timeline, u32 timescale, u32 *nb_segments, Double *max_seg_duration)
 {
 	u32 i, count;
+	u64 period_duration, start_time, dur;
+	if (period->duration) {
+		period_duration = period->duration;
+	} else {
+		period_duration = mpd->media_presentation_duration - period->start;
+	}
+	period_duration *= timescale;
+	period_duration /= 1000;
 
 	*nb_segments = 0;
 	if (max_seg_duration) *max_seg_duration = 0;
+	start_time = 0;
+	dur = 0;
 	count = gf_list_count(timeline->entries);
 	for (i=0; i<count; i++) {
 		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, i);
-		*nb_segments += 1 + ent->repeat_count;
+		if ((s32)ent->repeat_count >=0) {
+			*nb_segments += 1 + ent->repeat_count;
+			if (ent->start_time) {
+				start_time = ent->start_time;
+				dur = (1 + ent->repeat_count) * ent->duration;
+			} else {
+				dur += (1 + ent->repeat_count) * ent->duration;
+			}
+		} else {
+			u32 nb_seg = 0;
+			if (i+1<count) {
+				GF_MPD_SegmentTimelineEntry *ent2 = gf_list_get(timeline->entries, i+1);
+				if (ent2->start_time>0) {
+					nb_seg = (u32) ( (ent2->start_time - start_time - dur) / ent->duration);
+					dur += nb_seg * ent->duration;
+				}
+			}
+			if (!nb_seg) {
+				nb_seg = (u32) ( (period_duration - start_time) / ent->duration );
+				dur += nb_seg * ent->duration;
+			}
+			*nb_segments += nb_seg;
+		}
 		if (max_seg_duration && (*max_seg_duration < ent->duration)) *max_seg_duration = ent->duration;
 	}
 }
@@ -989,10 +1043,10 @@
 		if (! timescale) timescale=1;
 
 		if (timeline) {
-			gf_dash_get_timeline_duration(timeline, nb_segments, max_seg_duration);
+			gf_dash_get_timeline_duration(mpd, period, timeline, timescale, nb_segments, max_seg_duration);
 			if (max_seg_duration) *max_seg_duration /= timescale;
 		} else {
-			if (segments) 
+			if (segments)
 				*nb_segments = gf_list_count(segments);
 			if (max_seg_duration) {
 				*max_seg_duration = (Double) duration;
@@ -1040,7 +1094,7 @@
 	}
 
 	if (timeline) {
-		gf_dash_get_timeline_duration(timeline, nb_segments, max_seg_duration);
+		gf_dash_get_timeline_duration(mpd, period, timeline, timescale, nb_segments, max_seg_duration);
 		if (max_seg_duration) *max_seg_duration /= timescale;
 	} else {
 		if (max_seg_duration) {
@@ -1048,7 +1102,17 @@
 			*max_seg_duration /= timescale;
 		}
 		mediaDuration = period->duration;
-		if (!mediaDuration) mediaDuration = mpd->media_presentation_duration;
+		if (!mediaDuration) {
+			u32 i, count = gf_list_count(mpd->periods);
+			Double start = 0;
+			for (i=0; i<count; i++) {
+				GF_MPD_Period *ap = gf_list_get(mpd->periods, i);
+				if (ap==period) break;
+				if (ap->start) start = ap->start;
+				start += ap->duration;
+			}
+			mediaDuration = mpd->media_presentation_duration - start;
+		}
 		if (mediaDuration && duration) {
 			Double nb_seg = (Double) mediaDuration;
 			/*duration is given in ms*/
@@ -1068,10 +1132,10 @@
 	idx = 0;
 	for (i=0; i<gf_list_count(timeline->entries); i++) {
 		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, i);
-		if (ent->start_time) start_time = ent->start_time;		
+		if (ent->start_time) start_time = ent->start_time;
 		for (k=0; k<ent->repeat_count+1; k++) {
 			if (idx==segment_index) {
-				if (segment_duration) 
+				if (segment_duration)
 					*segment_duration = ent->duration;
 				return start_time;
 			}
@@ -1082,6 +1146,7 @@
 	return start_time;
 }
 
+
 static u64 gf_dash_get_segment_start_time_with_timescale(GF_DASH_Group *group, u64 *segment_duration, u32 *scale)
 {
 	GF_MPD_Representation *rep;
@@ -1091,6 +1156,7 @@
 	u32 timescale;
 	s32 segment_index;
 	u64 duration;
+	GF_List *seglist = NULL;
 	GF_MPD_SegmentTimeline *timeline = NULL;
 	timescale = 0;
 	duration = 0;
@@ -1110,26 +1176,38 @@
 			if (period->segment_list->duration) duration = period->segment_list->duration;
 			if (period->segment_list->timescale) timescale = period->segment_list->timescale;
 			if (period->segment_list->segment_timeline) timeline = period->segment_list->segment_timeline;
+			if (gf_list_count(period->segment_list->segment_URLs)) seglist = period->segment_list->segment_URLs;
 		}
 		if (set->segment_list) {
 			if (set->segment_list->duration) duration = set->segment_list->duration;
 			if (set->segment_list->timescale) timescale = set->segment_list->timescale;
 			if (set->segment_list->segment_timeline) timeline = set->segment_list->segment_timeline;
+			if (gf_list_count(set->segment_list->segment_URLs)) seglist = set->segment_list->segment_URLs;
 		}
 		if (rep->segment_list) {
 			if (rep->segment_list->duration) duration = rep->segment_list->duration;
 			if (rep->segment_list->timescale) timescale = rep->segment_list->timescale;
-			if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
+			if (gf_list_count(rep->segment_list->segment_URLs)) seglist = rep->segment_list->segment_URLs;
 		}
 		if (! timescale) timescale=1;
 
 		if (timeline) {
 			start_time = gf_dash_segment_timeline_start(timeline, segment_index, &duration);
-		} else {
+		} else if (duration) {
 			start_time = segment_index * duration;
+		} else if (seglist && (segment_index>=0) ) {
+			u32 i;
+			start_time = 0;
+			for (i=0; i <= (u32) segment_index; i++) {
+				GF_MPD_SegmentURL *url = gf_list_get(seglist, i);
+				if (!url) break;
+				duration = url->duration;
+				if (i < (u32) segment_index)
+					start_time += url->duration;
+			}
 		}
-		if (segment_duration) *segment_duration = duration; 
-		if (scale) *scale = timescale; 
+		if (segment_duration) *segment_duration = duration;
+		if (scale) *scale = timescale;
 		return start_time;
 	}
 
@@ -1156,8 +1234,8 @@
 	} else {
 		start_time = segment_index * duration;
 	}
-	if (segment_duration) *segment_duration = duration; 
-	if (scale) *scale = timescale; 
+	if (segment_duration) *segment_duration = duration;
+	if (scale) *scale = timescale;
 	return start_time;
 }
 
@@ -1316,8 +1394,8 @@
 	if (!old_timeline && !new_timeline) return GF_OK;
 
 	prev_count = gf_list_count(old_timeline->entries);
-	
-	
+
+
 	if (group) {
 		group->current_start_time = gf_dash_get_segment_start_time_with_timescale(group, NULL, &group->current_timescale);
 	} else {
@@ -1326,15 +1404,15 @@
 			a_group->current_start_time = gf_dash_get_segment_start_time_with_timescale(a_group, NULL, &a_group->current_timescale);
 		}
 	}
-	
-	
+
+
 	first_new_entry  = gf_list_get(new_timeline->entries, 0);
 	idx = 0;
 	start_time=0;
 	while (1) {
 		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(old_timeline->entries, 0);
 		if (!ent) break;
-		if (ent->start_time) 
+		if (ent->start_time)
 			start_time = ent->start_time;
 		/*if starttime is equal or greater than first entry in new timeline, we're done*/
 		if (start_time >= first_new_entry->start_time)
@@ -1345,7 +1423,7 @@
 			ent->repeat_count--;
 		}
 		/*we will insert the first entry in the new timeline, make sure we have a start*/
-		if (!idx && !ent->start_time) 
+		if (!idx && !ent->start_time)
 			ent->start_time = start_time;
 
 		start_time += ent->duration * (1 + ent->repeat_count);
@@ -1450,7 +1528,7 @@
 	u32 group_idx, rep_idx, i, j;
 	u64 fetch_time=0;
 	GF_DOMParser *mpd_parser;
-	u8 signature[sizeof(dash->lastMPDSignature)];
+	u8 signature[GF_SHA1_DIGEST_SIZE];
 	GF_MPD_Period *period, *new_period;
 	const char *local_url;
 	char mime[128];
@@ -1481,7 +1559,7 @@
 			if (!strstr(dash->base_url, "://")) {
 				gf_free(dash->base_url);
 				dash->base_url = gf_strdup(purl);
-			} 
+			}
 			fetch_only = 1;
 		}
 	} else {
@@ -1543,13 +1621,13 @@
 	if (gf_sha1_file( local_url, signature)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] : cannot SHA1 file %s\n", local_url));
 		return GF_IO_ERR;
-	} 
+	}
 
-	if (! memcmp( signature, dash->lastMPDSignature, sizeof(dash->lastMPDSignature))) {
+	if (! memcmp( signature, dash->lastMPDSignature, GF_SHA1_DIGEST_SIZE)) {
 
 		dash->reload_count++;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] MPD file did not change for %d consecutive reloads\n", dash->reload_count));
-		/*if the MPD did not change, we should refresh "soon" but cannot wait a full refresh cycle in case of 
+		/*if the MPD did not change, we should refresh "soon" but cannot wait a full refresh cycle in case of
 		low latencies as we could miss a segment*/
 
 		if (dash->is_m3u8) {
@@ -1557,11 +1635,12 @@
 		} else {
 			dash->last_update_time = gf_sys_clock();
 		}
+		dash->mpd_fetch_time = fetch_time;
 		return GF_OK;
-	} 
+	}
 
 	dash->reload_count = 0;
-	memccpy(dash->lastMPDSignature, signature, sizeof(char), sizeof(dash->lastMPDSignature));
+	memcpy(dash->lastMPDSignature, signature, GF_SHA1_DIGEST_SIZE);
 
 	/* It means we have to reparse the file ... */
 	/* parse the MPD */
@@ -1811,7 +1890,7 @@
 		if (reset_segment_count) {
 			u32 nb_segs_in_mpd_period = (u32) (dash->mpd->minimum_update_period / (1000*seg_dur) );
 			group->nb_segments_in_rep = group->download_segment_index + nb_segs_in_mpd_period;
-		} 
+		}
 		/*check if number of segments are coherent ...*/
 		else if (!group->maybe_end_of_stream && new_mpd->minimum_update_period && new_mpd->media_presentation_duration) {
 			u32 nb_segs_in_mpd_period = (u32) (dash->mpd->minimum_update_period / (1000*seg_dur) );
@@ -1906,6 +1985,8 @@
 
 	if (timeshift == -1) timeshift = (s32) group->dash->mpd->time_shift_buffer_depth;
 	group->time_shift_buffer_depth = (u32) timeshift;
+
+	group->dash->dash_io->on_dash_event(group->dash->dash_io, GF_DASH_EVENT_QUALITY_SWITCH, gf_list_find(group->dash->groups, group), GF_OK);
 }
 
 static void gf_dash_switch_group_representation(GF_DashClient *mpd, GF_DASH_Group *group)
@@ -1922,7 +2003,7 @@
 	if (group->force_representation_idx_plus_one) {
 		rep_sel = gf_list_get(group->adaptation_set->representations, group->force_representation_idx_plus_one - 1);
 		group->force_representation_idx_plus_one = 0;
-	} 
+	}
 
 	if (!rep_sel) {
 		for (i=0; i<gf_list_count(group->adaptation_set->representations); i++) {
@@ -1994,6 +2075,7 @@
 	if (!group->timeline_setup) {
 		gf_dash_group_timeline_setup(mpd, group, 0);
 		group->timeline_setup = 1;
+		item_index = group->download_segment_index;
 	}
 
 	/*resolve base URLs from document base (download location) to representation (media)*/
@@ -2032,7 +2114,7 @@
 
 	/*single URL*/
 //	if (rep->segment_base || set->segment_base || period->segment_base) {
-	if (!rep->segment_list && !set->segment_list && !period->segment_list && !rep->segment_template && !set->segment_template && !period->segment_template) {	
+	if (!rep->segment_list && !set->segment_list && !period->segment_list && !rep->segment_template && !set->segment_template && !period->segment_template) {
 		GF_MPD_URL *res_url;
 		GF_MPD_SegmentBase *base_seg = NULL;
 		if (item_index > 0)
@@ -2082,7 +2164,7 @@
 	}
 
 	/*segmentList*/
-	if (rep->segment_list || set->segment_list || period->segment_list) {	
+	if (rep->segment_list || set->segment_list || period->segment_list) {
 		GF_MPD_URL *init_url, *index_url;
 		GF_MPD_SegmentURL *segment;
 		GF_List *segments = NULL;
@@ -2139,7 +2221,7 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Media URL is not set in segment list\n"));
 				return GF_SERVICE_ERROR;
 			}
-			if (item_index >= segment_count) {
+			if ((item_index >= segment_count) || ((s32) item_index < 0)) {
 				gf_free(url);
 				return GF_EOS;
 			}
@@ -2254,11 +2336,11 @@
 		}
 		second_sep[0] = 0;
 		format_tag = strchr(first_sep+1, '%');
-		
+
 		if (format_tag) {
 			strcpy(szPrintFormat, format_tag);
 			format_tag[0] = 0;
-			if (!strchr(format_tag, 'd') && !strchr(format_tag, 'i')  && !strchr(format_tag, 'u'))
+			if (!strchr(szPrintFormat, 'd') && !strchr(szPrintFormat, 'i')  && !strchr(szPrintFormat, 'u'))
 				strcat(szPrintFormat, "d");
 		} else {
 			strcpy(szPrintFormat, "%d");
@@ -2334,7 +2416,7 @@
 		/*look for next keyword - copy over remaining text if any*/
 		first_sep = strchr(second_sep+1, '$');
 		if (first_sep) first_sep[0] = 0;
-		if (strlen(second_sep+1)) 
+		if (strlen(second_sep+1))
 			strcat(solved_template, second_sep+1);
 		if (first_sep) first_sep[0] = '$';
 	}
@@ -2348,6 +2430,7 @@
 {
 	GF_Err e;
 	char *base_init_url;
+	char *init_segment_local_url;
 	GF_MPD_Representation *rep;
 	u64 start_range, end_range;
 	/* This variable is 0 if there is a initURL, the index of first segment downloaded otherwise */
@@ -2372,13 +2455,9 @@
 		return e;
 	}
 
-	/*no error and no init segment, go for media segment*/
+	/*no error and no init segment, go for media segment - this is needed for TS so that the set of media streams can be
+	declared to the player */
 	if (!base_init_url) {
-		//if no init segment don't download first segment
-#if 1
-		gf_mx_v(dash->dl_mutex);
-		return GF_OK;
-#else
 		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
 		if (e) {
 			gf_mx_v(dash->dl_mutex);
@@ -2386,7 +2465,6 @@
 			return e;
 		}
 		nb_segment_read = 1;
-#endif
 	} else if (!group->bitstream_switching) {
 		group->dont_delete_first_segment = 1;
 	}
@@ -2406,12 +2484,16 @@
 		}
 
 		group->download_segment_index += nb_segment_read;
-		group->segment_local_url = group->cached[0].cache;
-		group->local_url_start_range = start_range;
-		group->local_url_end_range = end_range;
-		rep->playback.cached_init_segment_url = gf_strdup(group->segment_local_url);
-		rep->playback.init_start_range = start_range;
-		rep->playback.init_end_range = end_range;
+		init_segment_local_url = group->cached[0].cache;
+		if (group->bitstream_switching) {
+			group->bs_switching_init_segment_url = gf_strdup(init_segment_local_url);
+			group->bs_switching_init_segment_url_start_range = start_range;
+			group->bs_switching_init_segment_url_end_range = end_range;
+		} else {
+			rep->playback.cached_init_segment_url = gf_strdup(init_segment_local_url);
+			rep->playback.init_start_range = start_range;
+			rep->playback.init_end_range = end_range;
+		}
 
 
 		/*finally download all init segments if any*/
@@ -2435,7 +2517,7 @@
 				}
 			}
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] First segment is %s \n", group->segment_local_url));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] First segment is %s \n", init_segment_local_url));
 		gf_mx_v(dash->dl_mutex);
 		gf_free(base_init_url);
 		return GF_OK;
@@ -2447,13 +2529,14 @@
 	e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), base_init_url, start_range, end_range, 1, group);
 
 	if ((e==GF_OK) && group->force_switch_bandwidth && !dash->auto_switch_count) {
+		gf_free(base_init_url);
 		gf_dash_switch_group_representation(dash, group);
 		gf_mx_v(dash->dl_mutex);
 		return gf_dash_download_init_segment(dash, group);
 	}
 
 
-	if (e == GF_URL_ERROR && !base_init_url) { /* We have a 404 and started with segments */
+	if (e == GF_URL_ERROR && !base_init_url && !group->download_abort_type) { /* We have a 404 and started with segments */
 		/* It is possible that the first segment has been deleted while we made the first request...
 		* so we try with the next segment on some M3U8 servers */
 
@@ -2470,6 +2553,14 @@
 		e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), base_init_url, 0, 0, 1, group);
 	} /* end of 404 */
 
+
+	if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
+		group->download_abort_type = 0;
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading init segment (seek ?)%s \n", base_init_url));
+		gf_free(base_init_url);
+		return GF_OK;
+	}
+
 	if (e!= GF_OK && !group->segment_must_be_streamed) {
 		dash->mpd_stop_request = 1;
 		gf_mx_v(dash->dl_mutex);
@@ -2496,7 +2587,7 @@
 		strcpy(mime, mime_type ? mime_type : "");
 		strlwr(mime);
 
-		if (dash->mimeTypeForM3U8Segments) 
+		if (dash->mimeTypeForM3U8Segments)
 			gf_free(dash->mimeTypeForM3U8Segments);
 		dash->mimeTypeForM3U8Segments = gf_strdup( mime );
 		mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
@@ -2524,34 +2615,41 @@
 		}
 
 		if (group->segment_must_be_streamed ) {
-			group->segment_local_url = dash->dash_io->get_url(dash->dash_io, group->segment_download);
+			init_segment_local_url = (char *) dash->dash_io->get_url(dash->dash_io, group->segment_download);
 			e = GF_OK;
 		} else {
-			group->segment_local_url = dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
+			init_segment_local_url = (char *) dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
 		}
 
-		if ((e!=GF_OK) || !group->segment_local_url) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error with initialization segment: download result:%s, cache file:%s\n", gf_error_to_string(e), group->segment_local_url));
+		if ((e!=GF_OK) || !init_segment_local_url) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error with initialization segment: download result:%s, cache file: %s\n", gf_error_to_string(e), init_segment_local_url ? init_segment_local_url : "UNKNOWN"));
 			dash->mpd_stop_request = 1;
 			gf_mx_v(dash->dl_mutex);
 			gf_free(base_init_url);
 			return GF_BAD_PARAM;
-		} 
+		}
 
 		assert(!group->nb_cached_segments);
-		group->cached[0].cache = gf_strdup(group->segment_local_url);
+		group->cached[0].cache = gf_strdup(init_segment_local_url);
 		group->cached[0].url = gf_strdup( dash->dash_io->get_url(dash->dash_io, group->segment_download) );
 		group->cached[0].representation_index = group->active_rep_index;
 		group->cached[0].duration = (u32) group->current_downloaded_segment_duration;
-		rep->playback.cached_init_segment_url = gf_strdup(group->segment_local_url);
-		rep->playback.init_start_range = 0;
-		rep->playback.init_end_range = 0;
+
+		if (group->bitstream_switching) {
+			group->bs_switching_init_segment_url = gf_strdup(init_segment_local_url);
+			group->bs_switching_init_segment_url_start_range = 0;
+			group->bs_switching_init_segment_url_end_range = 0;
+		} else {
+			rep->playback.cached_init_segment_url = gf_strdup(init_segment_local_url);
+			rep->playback.init_start_range = 0;
+			rep->playback.init_end_range = 0;
+		}
 
 		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", group->segment_local_url, group->cached[0].url ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Adding initialization segment %s to cache: %s\n", init_segment_local_url, group->cached[0].url ));
 		gf_mx_v(dash->dl_mutex);
 		gf_free(base_init_url);
 
@@ -2568,6 +2666,14 @@
 				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
 				if (!e && a_base_init_url) {
 					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), a_base_init_url, a_start, a_end, 1, group);
+
+					if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
+						group->download_abort_type = 0;
+						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading init segment (seek ?)%s \n", a_base_init_url));
+						gf_free(a_base_init_url);
+						return GF_OK;
+					}
+
 					if (e) {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retrieve initialization segment %s for representation: %s - discarding representation\n", a_base_init_url, gf_error_to_string(e) ));
 						a_rep->playback.disabled = 1;
@@ -2654,7 +2760,7 @@
 		gf_dash_group_reset(dash, group);
 
 		gf_free(group->cached);
-		if (group->service_mime) 
+		if (group->service_mime)
 			gf_free(group->service_mime);
 		gf_free(group);
 	}
@@ -2707,6 +2813,11 @@
 
 		if (found) continue;
 
+		if (! gf_list_count(set->representations)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Empty adaptation set found (ID %s) - ignoring\n", set->id));
+			continue;
+		}
+
 
 		GF_SAFEALLOC(group, GF_DASH_Group);
 		if (!group) return GF_OUT_OF_MEM;
@@ -2721,17 +2832,27 @@
 		for (j=0; j<gf_list_count(set->representations); j++) {
 			Double dur;
 			u32 nb_seg, k;
+			Bool cp_supported;
 			GF_MPD_Representation *rep = gf_list_get(set->representations, j);
 			gf_dash_get_segment_duration(rep, set, period, dash->mpd, &nb_seg, &dur);
 			if (dur>seg_dur) seg_dur = dur;
 
+			if (dash->dash_io->dash_codec_supported) {
+				Bool res = dash->dash_io->dash_codec_supported(dash->dash_io, rep->codecs, rep->width, rep->height, (rep->scan_type==GF_MPD_SCANTYPE_INTERLACED) ? 1 : 0, rep->framerate ? rep->framerate->num : 0, rep->framerate ? rep->framerate->den : 0, rep->samplerate);
+				if (!res) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation not supported by playback engine - ignoring\n"));
+					rep->playback.disabled = 1;
+					continue;
+				}
+			}
 			if (dash->max_width && dash->max_height) {
 				if ((rep->width>dash->max_width) || (rep->height>dash->max_height)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation size %dx%d exceeds max display size allowed %dx%d - ignoring\n", rep->width, rep->height, dash->max_width, dash->max_height));
 					rep->playback.disabled = 1;
 					continue;
 				}
 			}
-			if (rep->codecs && dash->max_bit_per_pixel) {
+			if (rep->codecs && (dash->max_bit_per_pixel > 8) ) {
 				char *vid_type = strstr(rep->codecs, "hvc");
 				if (!vid_type) vid_type = strstr(rep->codecs, "hev");
 				if (!vid_type) vid_type = strstr(rep->codecs, "avc");
@@ -2744,6 +2865,7 @@
 					//Main 10 !!
 					if (!strncmp(pidc, "2.", 2)) {
 						rep->playback.disabled = 1;
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation bit depth higher than max display bit depth - ignoring\n"));
 						continue;
 					}
 				}
@@ -2757,11 +2879,41 @@
 					//Main 10
 					if (prof==0x6E) {
 						rep->playback.disabled = 1;
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation bit depth higher than max display bit depth - ignoring\n"));
 						continue;
 					}
 				}
 			}
-	
+
+			for (k=0; k<gf_list_count(rep->essential_properties); k++) {
+				GF_MPD_Descriptor *mpd_desc = gf_list_get(rep->essential_properties, k);
+				//we don't know any defined scheme for now
+				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;
+			}
+			if (rep->playback.disabled) {
+				continue;
+			}
+
+			cp_supported = 1;
+			for (k=0; k<gf_list_count(rep->content_protection); k++) {
+				GF_MPD_Descriptor *mpd_desc = gf_list_get(rep->content_protection, k);
+				//we don't know any defined scheme for now
+				if (strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:mp4protection:2011")) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Representation with unrecognized ContentProtection %s\n", mpd_desc->scheme_id_uri));
+					cp_supported = 0;
+				} else {
+					cp_supported = 1;
+					break;
+				}
+			}
+			if (!cp_supported) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation with no supported ContentProtection\n"));
+				rep->playback.disabled = 1;
+				continue;
+			}
+
 			rep->playback.disabled = 0;
 			if (rep->width>set->max_width) {
 				set->max_width = rep->width;
@@ -2776,7 +2928,7 @@
 				GF_MPD_Representation *a_rep = gf_list_get(set->representations, k);
 				if (a_rep->dependency_id) {
 					char * tmp = strrchr(a_rep->dependency_id, ' ');
-					if (tmp) 
+					if (tmp)
 						tmp = tmp + 1;
 					else
 						tmp = a_rep->dependency_id;
@@ -2845,7 +2997,7 @@
 	u32 i, size, type;
 	GF_Err e;
 	u64 offset;
-	
+
 	prev_pos = gf_bs_get_position(bs);
 	gf_bs_seek(bs, sidx_offset);
 	size = gf_bs_read_u32(bs);
@@ -2858,7 +3010,7 @@
 	gf_bs_seek(bs, sidx_offset);
 
 	anchor_position = sidx_offset + size;
-	if (seperate_index) 
+	if (seperate_index)
 		anchor_position = 0;
 
 	e = gf_isom_parse_box((GF_Box **) &sidx, bs);
@@ -2879,7 +3031,7 @@
 			GF_SAFEALLOC(seg, GF_MPD_SegmentURL);
 			GF_SAFEALLOC(seg->media_range, GF_MPD_ByteRange);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Found media segment size %d - duration %d - start with SAP: %d - SAP type %d - SAP Deltat Time %d\n",
-				sidx->refs[i].reference_size, sidx->refs[i].subsegment_duration, sidx->refs[i].starts_with_SAP, sidx->refs[i].SAP_type, sidx->refs[i].SAP_delta_time));
+			                                   sidx->refs[i].reference_size, sidx->refs[i].subsegment_duration, sidx->refs[i].starts_with_SAP, sidx->refs[i].SAP_type, sidx->refs[i].SAP_delta_time));
 
 			seg->media_range->start_range = offset;
 			offset += sidx->refs[i].reference_size;
@@ -2904,7 +3056,7 @@
 		char *mem_address;
 		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
 			return GF_IO_ERR;
-		} 
+		}
 		bs = gf_bs_new(mem_address, size, GF_BITSTREAM_READ);
 	} else {
 		FILE *f = gf_f64_open(cache_name, "rb");
@@ -2943,8 +3095,8 @@
 		u8 *mem_address;
 		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
 			return GF_IO_ERR;
-		} 
-		if (offset+8 > size) 
+		}
+		if (offset+8 > size)
 			return GF_IO_ERR;
 		mem_address+=offset;
 		*box_size = GF_4CC(mem_address[0], mem_address[1], mem_address[2], mem_address[3]);
@@ -2969,11 +3121,11 @@
 static GF_Err gf_dash_setup_single_index_mode(GF_DASH_Group *group)
 {
 	u32 i;
-	GF_Err e;
+	GF_Err e = GF_OK;
 	char *init_url = NULL;
 	char *index_url = NULL;
 	GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, 0);
-	
+
 	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;
 
@@ -2995,7 +3147,7 @@
 		if (e) goto exit;
 
 
-		if (is_isom && (init_in_base || index_in_base)) {	
+		if (is_isom && (init_in_base || index_in_base)) {
 			if (!strstr(init_url, "://") || (!strnicmp(init_url, "file://", 7) || !strnicmp(init_url, "views://", 7)) ) {
 				GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
 				rep->segment_list->segment_URLs  =gf_list_new();
@@ -3041,8 +3193,8 @@
 							has_seen_sidx = 1;
 						else if (has_seen_sidx)
 							break;
-	
-	
+
+
 					}
 				}
 				if (e<0) goto exit;
@@ -3054,12 +3206,32 @@
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Done downloading init segment and SIDX\n"));
 
 				GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
-				rep->segment_list->segment_URLs  =gf_list_new();
+				rep->segment_list->segment_URLs = gf_list_new();
 
 				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
 				if (init_in_base) {
 					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
-					rep->segment_list->initialization_segment->sourceURL = gf_strdup(cache_name);
+					//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 szName[100];
+						char *mem_address;
+						if (sscanf(cache_name, "gmem://%d@%p", &rep->playback.init_segment_size, &mem_address) != 2) {
+							e = GF_IO_ERR;
+							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);
+
+						sprintf(szName, "gmem://%d@%p", rep->playback.init_segment_size, rep->playback.init_segment_data);
+						rep->segment_list->initialization_segment->sourceURL = gf_strdup(szName);
+						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);
+
+					} else {
+						rep->segment_list->initialization_segment->sourceURL = gf_strdup(cache_name);
+					}
+
 				}
 				if (index_in_base) {
 					sidx_file = (char *)cache_name;
@@ -3081,7 +3253,7 @@
 		}
 
 		/*reset all seg based stuff*/
-		if (rep->segment_base) { 
+		if (rep->segment_base) {
 			gf_mpd_segment_base_free(rep->segment_base);
 			rep->segment_base = NULL;
 		}
@@ -3091,7 +3263,7 @@
 		gf_free(init_url);
 		init_url = NULL;
 	}
-	if (group->adaptation_set->segment_base) { 
+	if (group->adaptation_set->segment_base) {
 		gf_mpd_segment_base_free(group->adaptation_set->segment_base);
 		group->adaptation_set->segment_base = NULL;
 	}
@@ -3103,10 +3275,119 @@
 	return e;
 }
 
+static void gf_dash_solve_period_xlink(GF_DashClient *dash, u32 period_idx)
+{
+	u32 count, i;
+	GF_Err e;
+	const char *local_url;
+	GF_DOMParser *parser;
+	GF_MPD *new_mpd;
+	GF_MPD_Period *period;
+
+	gf_mx_p(dash->dl_mutex);
+
+	period = gf_list_get(dash->mpd->periods, period_idx);
+	if (!period->xlink_href) {
+		gf_mx_v(dash->dl_mutex);
+		return;
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resolving period XLINK %s\n", period->xlink_href));
+
+	if (!strcmp(period->xlink_href, "urn:mpeg:dash:resolve-to-zero:2013")) {
+		//spec is not very clear here, I suppose it means "remove the element"
+		gf_list_rem(dash->mpd->periods, period_idx);
+		gf_mpd_period_free(period);
+		gf_mx_v(dash->dl_mutex);
+		return;
+	}
+
+	/*use non-persistent connection for MPD*/
+	e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), period->xlink_href, 0, 0, 0, NULL);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot download xlink periods: error %s\n", gf_error_to_string(e)));
+		gf_free(period->xlink_href);
+		period->xlink_href = NULL;
+		gf_mx_v(dash->dl_mutex);
+		return;
+	}
+
+	/*in case the session has been restarted, local_url may have been destroyed - get it back*/
+	local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
+
+	/* parse the MPD */
+	parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(parser, local_url, NULL, NULL);
+	if (e != GF_OK) {
+		gf_xml_dom_del(parser);
+		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->dl_mutex);
+		return;
+	}
+	new_mpd = gf_mpd_new();
+
+	count = gf_xml_dom_get_root_nodes_count(parser);
+	for (i=0; i<count; i++) {
+		GF_XMLNode *root = gf_xml_dom_get_root_idx(parser, i);
+		if (i) {
+			e = gf_mpd_complete_from_dom(root, new_mpd, period->xlink_href);
+		} else {
+			e = gf_mpd_init_from_dom(root, new_mpd, period->xlink_href);
+		}
+		if (e) break;
+	}
+	gf_xml_dom_del(parser);
+	if (e) {
+		gf_free(period->xlink_href);
+		period->xlink_href = NULL;
+		gf_mpd_del(new_mpd);
+		gf_mx_v(dash->dl_mutex);
+		return;
+	}
+
+	gf_list_rem(dash->mpd->periods, period_idx);
+	//insert all periods
+	while (gf_list_count(new_mpd->periods)) {
+		GF_MPD_Period *inserted_period = gf_list_get(new_mpd->periods, 0);
+		gf_list_rem(new_mpd->periods, 0);
+		//forbiden
+		if (inserted_period->xlink_href && inserted_period->xlink_actuate_on_load) {
+			gf_mpd_period_free(period);
+			continue;
+		}
+		gf_list_insert(dash->mpd->periods, inserted_period, period_idx);
+		period_idx++;
+	}
+	//this will do the garbage collection
+	gf_list_add(new_mpd->periods, period);
+
+	gf_mpd_del(new_mpd);
+
+	gf_mx_v(dash->dl_mutex);
+
+}
+
 static GF_Err gf_dash_setup_period(GF_DashClient *dash)
 {
 	GF_MPD_Period *period;
-	u32 rep_i, group_i, nb_groups_ok;
+	u32 rep_i, group_i, j, nb_groups_ok;
+	u32 retry = 10;
+
+	//solve xlink - if
+	while (retry) {
+		period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+		if (!period->xlink_href) break;
+		gf_dash_solve_period_xlink(dash, dash->active_period_index);
+		retry --;
+	}
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	if (period->xlink_href) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many xlink indirections on the same period - not supported\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
 	/*setup all groups*/
 	gf_dash_setup_groups(dash);
 
@@ -3116,6 +3397,8 @@
 		u32 active_rep, nb_rep;
 		const char *mime_type;
 		u32 nb_rep_ok = 0;
+		Bool disabled = 0;
+		Bool cp_supported = 0;
 		GF_DASH_Group *group = gf_list_get(dash->groups, group_i);
 
 		if ((dash->debug_group_index>=0) && (group_i != (u32) dash->debug_group_index)) {
@@ -3134,6 +3417,35 @@
 			continue;
 		}
 
+		for (j=0; j<gf_list_count(group->adaptation_set->essential_properties); j++) {
+			GF_MPD_Descriptor *mpd_desc = gf_list_get(group->adaptation_set->essential_properties, j);
+			//we don't know any defined scheme for now
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet with unrecognized EssentialProperty %s - ignoring because not supported\n", mpd_desc->scheme_id_uri));
+			disabled = 1;
+			break;
+		}
+		if (disabled) {
+			continue;
+		}
+
+		cp_supported = 1;
+		for (j=0; j<gf_list_count(group->adaptation_set->content_protection); j++) {
+			GF_MPD_Descriptor *mpd_desc = gf_list_get(group->adaptation_set->content_protection, j);
+			//we don't know any defined scheme for now
+			if (strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:mp4protection:2011")) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AdaptationSet with unrecognized ContentProtection %s\n", mpd_desc->scheme_id_uri));
+				cp_supported = 0;
+			} else {
+				cp_supported = 1;
+				break;
+			}
+		}
+		if (!cp_supported) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet with no supported ContentProtection - ignoring\n"));
+			continue;
+		}
+
+
 		/*translate from single-indexed file to SegmentList*/
 		gf_dash_setup_single_index_mode(group);
 
@@ -3158,7 +3470,7 @@
 					ok = !strnicmp(rep->codecs, rep_sel->codecs, strlen(rep_sel->codecs) );
 					if (sep) sep[0] = '.';
 					if (!ok) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Different codec types (%s vs %s) in same AdaptationSet - disabling %s\n", rep_sel->codecs, rep->codecs, rep->codecs));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Different codec types (%s vs %s) in same AdaptationSet\n", rep_sel->codecs, rep->codecs));
 						//rep->playback.disabled = 1;
 						//continue;
 					}
@@ -3198,7 +3510,7 @@
 		}
 		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
 			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_i);
-			if (!rep->playback.disabled) 
+			if (!rep->playback.disabled)
 				nb_rep_ok++;
 		}
 
@@ -3212,8 +3524,10 @@
 
 		gf_dash_set_group_representation(group, rep_sel);
 
-		if (dash->playback_start_range>=0) 
-			gf_dash_seek_group(dash, group);
+		//adjust seek
+		if (dash->start_range_period) {
+			gf_dash_seek_group(dash, group, dash->start_range_period, 0);
+		}
 
 		mime_type = gf_dash_get_mime_type(NULL, rep_sel, group->adaptation_set);
 
@@ -3224,21 +3538,22 @@
 
 		/* TODO: Generate segment names if urltemplates are used */
 		if (!rep_sel->segment_base && !rep_sel->segment_list && !rep_sel->segment_template
-			&& !group->adaptation_set->segment_base && !group->adaptation_set->segment_list && !group->adaptation_set->segment_template
-			&& !group->period->segment_base && !group->period->segment_list && !group->period->segment_template
-			&& !gf_list_count(rep_sel->base_URLs)
-			) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment URLs are not present for AdaptationSet - skipping\n"));
-				continue;
+		        && !group->adaptation_set->segment_base && !group->adaptation_set->segment_list && !group->adaptation_set->segment_template
+		        && !group->period->segment_base && !group->period->segment_list && !group->period->segment_template
+		        && !gf_list_count(rep_sel->base_URLs)
+		   ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment URLs are not present for AdaptationSet - skipping\n"));
+			continue;
 		}
 
 		group->selection = GF_DASH_GROUP_NOT_SELECTED;
 		nb_groups_ok++;
 	}
+	dash->start_range_period = 0;
 
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	
-	if (period->segment_base) { 
+
+	if (period->segment_base) {
 		gf_mpd_segment_base_free(period->segment_base);
 		period->segment_base = NULL;
 	}
@@ -3252,11 +3567,20 @@
 	return GF_OK;
 }
 
+static Bool gf_dash_is_seamless_period_switch(GF_DashClient *dash)
+{
+	return 0;
+}
+
 static void dash_do_rate_adaptation(GF_DashClient *dash, GF_DASH_Group *group, GF_MPD_Representation *rep)
 {
+	Double bitrate, time, speed;
+	u32 k, dl_rate;
+	Bool go_up = 0;
+	u32 nb_inter_rep = 0;
 	GF_MPD_Representation *new_rep;
 	u32 total_size, bytes_per_sec;
-	
+
 	if (group->dash->disable_switching) return;
 
 	total_size = dash->dash_io->get_total_size(dash->dash_io, group->segment_download);
@@ -3264,53 +3588,123 @@
 	group->last_segment_time = gf_sys_clock();
 
 	if (/*(!group->buffering || !group->min_bandwidth_selected) && */ total_size && bytes_per_sec && group->current_downloaded_segment_duration) {
-		Double bitrate, time;
-		u32 k, dl_rate;
-		Bool go_up = 0;
-		bitrate = 8*total_size;
-		bitrate /= group->current_downloaded_segment_duration;
-		time = total_size;
-		time /= bytes_per_sec;
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %d bytes in %g seconds - duration %g sec - Bandwidth (kbps): indicated %d - computed %d - download %d\n", total_size, time, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1000, (u32) bitrate, 8*bytes_per_sec/1000));
-
-		dl_rate = 8*bytes_per_sec;
-		if (rep->bandwidth < dl_rate) {
-			go_up = 1;
-		}
-		if (dl_rate < group->min_representation_bitrate)
-			dl_rate = group->min_representation_bitrate;
-
-		/*find best bandwidth that fits our bitrate*/
-		new_rep = NULL;
-		
-		for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
-			GF_MPD_Representation *arep = gf_list_get(group->adaptation_set->representations, k);
-			if (arep->playback.disabled) continue;
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %s %d bytes at %d bytes per seconds - skiping rate adaptation\n", dash->dash_io->get_url(dash->dash_io, group->segment_download), total_size, bytes_per_sec));
+		return;
+	}
 
-			if (dl_rate >= arep->bandwidth) {
-				if (!new_rep) new_rep = arep;
-				else if (go_up) {
-					/*try to switch to highest bitrate below availble download rate*/
-					if (arep->bandwidth > new_rep->bandwidth) {
-						new_rep = arep;
-					}
-				} else {
-					/*try to switch to highest bitrate below availble download rate*/
-					if (arep->bandwidth > new_rep->bandwidth) {
-						new_rep = arep;
+	bitrate = 8*total_size;
+	bitrate /= group->current_downloaded_segment_duration;
+	time = total_size;
+	time /= bytes_per_sec;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %s %d bytes in %g seconds - duration %g sec - Bandwidth (kbps): indicated %d - computed %d - download %d\n", dash->dash_io->get_url(dash->dash_io, group->segment_download), total_size, time, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1000, (u32) bitrate, 8*bytes_per_sec/1000));
+
+	//adjust the download rate according to the playback speed
+	speed = dash->speed;
+	if (speed<0) speed = -speed;
+	dl_rate = (u32)  (8*bytes_per_sec / speed);
+
+	if (rep->bandwidth < dl_rate) {
+		go_up = 1;
+	}
+	if (dl_rate < group->min_representation_bitrate)
+		dl_rate = group->min_representation_bitrate;
+
+	/*find best bandwidth that fits our bitrate*/
+	new_rep = NULL;
+
+	for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+		GF_MPD_Representation *arep = gf_list_get(group->adaptation_set->representations, k);
+		if (arep->playback.disabled) continue;
+
+		if (dl_rate >= arep->bandwidth) {
+			if (!new_rep) new_rep = arep;
+			else if (go_up) {
+				/*try to switch to highest bitrate below available download rate*/
+				if (arep->bandwidth > new_rep->bandwidth) {
+					if (new_rep->bandwidth > rep->bandwidth) {
+						nb_inter_rep ++;
 					}
+					new_rep = arep;
+				} else if (arep->bandwidth > rep->bandwidth) {
+					nb_inter_rep ++;
+				}
+			} else {
+				/*try to switch to highest bitrate below available download rate*/
+				if (arep->bandwidth > new_rep->bandwidth) {
+					new_rep = arep;
 				}
 			}
 		}
+	}
 
-		if (!dash->disable_switching && new_rep && (new_rep!=rep)) {
+	if (!dash->disable_switching && new_rep && (new_rep!=rep)) {
+		Bool do_switch = 1;
+		//if we're switching to the next upper bitrate (no intermediate bitrates), do not immediately switch
+		//but for a given number of segments - this avoids fluctuation in the quality
+		if (go_up && ! nb_inter_rep) {
+			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 {
+				do_switch = 0;
+			}
+		}
+		if (do_switch) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n\n[DASH] Download rate %d - switching representation %s from bandwidth %d bps to %d bps at UTC "LLU" ms\n\n", dl_rate, go_up ? "up" : "down", rep->bandwidth, new_rep->bandwidth, gf_net_get_utc() ));
 			gf_dash_set_group_representation(group, new_rep);
 		}
+
+		for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+			GF_MPD_Representation *arep = gf_list_get(group->adaptation_set->representations, k);
+			if (new_rep==arep) continue;
+			arep->playback.probe_switch_count = 0;
+		}
 	}
 }
 
+static void gf_dash_group_check_time(GF_DASH_Group *group)
+{
+	s64 check_time = (s64) gf_net_get_utc();
+	u32 nb_droped = 0;
+
+	while (1) {
+		u32 seg_dur_ms;
+		u64 seg_ast = gf_dash_get_segment_availability_start_time(group->dash->mpd, group, group->download_segment_index, &seg_dur_ms);
+
+		s64 now = check_time + (s64) seg_dur_ms;
+		if (now <= (s64) seg_ast) {
+			group->dash->tsb_exceeded = (u32) -1;
+			return;
+		}
+
+		now -= (s64) seg_ast;
+		if (now <= (s64) seg_dur_ms) {
+			group->dash->tsb_exceeded = (u32) -1;
+			return;
+		}
+		if (now>group->time_shift_buffer_depth) {
+			group->download_segment_index ++;
+			nb_droped ++;
+			group->dash->time_in_tsb = 0;
+			continue;
+		}
+
+		if (nb_droped > group->dash->tsb_exceeded) {
+			group->dash->tsb_exceeded = nb_droped;
+		}
+
+		now -= group->dash->user_buffer_ms;
+		if (now<0) return;
+		now /= 1000;
+		if (now>group->dash->time_in_tsb)
+			group->dash->time_in_tsb = (u32) now;
+		return;
+	}
+}
+
+
 static u32 dash_main_thread_proc(void *par)
 {
 	GF_Err e;
@@ -3428,10 +3822,15 @@
 
 				/*check if cache is not full*/
 				gf_mx_p(dash->dl_mutex);
+				dash->tsb_exceeded = 0;
+				dash->time_in_tsb = 0;
 				for (i=0; i<group_count; i++) {
 					GF_DASH_Group *group = gf_list_get(dash->groups, i);
 					if ((group->selection != GF_DASH_GROUP_SELECTED) || group->done) continue;
 					all_groups_done = 0;
+					if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
+						gf_dash_group_check_time(group);
+					}
 					if (group->nb_cached_segments<group->max_cached_segments) {
 						cache_full = 0;
 						break;
@@ -3439,19 +3838,44 @@
 				}
 				gf_mx_v(dash->dl_mutex);
 
+				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 (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) 
-						dash->active_period_index++;
+					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;
 				}
+
 				gf_sleep(30);
 			}
 		}
@@ -3465,8 +3889,8 @@
 		min_wait = 0;
 
 		/*for each selected groups*/
-		for (i=0; i<group_count; i++) {		
-            //commented out as we end up doing too many requets
+		for (i=0; i<group_count; i++) {
+			//commented out as we end up doing too many requets
 #if 0
 			Bool in_segment_avail_time=0;
 #endif
@@ -3476,7 +3900,7 @@
 			u32 clock_time;
 			Bool empty_file = GF_FALSE;
 			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-			
+
 			if (group->selection != GF_DASH_GROUP_SELECTED) {
 				if (group->nb_cached_segments) {
 					gf_dash_group_reset(dash, group);
@@ -3499,8 +3923,12 @@
 			if (group->nb_segments_in_rep && (group->download_segment_index >= (s32) group->nb_segments_in_rep)) {
 				u32 timer = gf_sys_clock() - dash->last_update_time;
 				Bool update_playlist = 0;
+
+				/* this period is done*/
+				if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
+				}
 				/* update of the playlist, only if indicated */
-				if (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period)) {
+				else if (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period)) {
 					update_playlist = 1;
 				}
 				/* if media_presentation_duration is 0 and we are in live, force a refresh (not in the spec but safety check*/
@@ -3517,32 +3945,40 @@
 					group_count = gf_list_count(dash->groups);
 					rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 				} else {
-					gf_sleep(16);
+					gf_sleep(1);
 				}
 				/* Now that the playlist is up to date, we can check again */
 				if (group->download_segment_index >= (s32) group->nb_segments_in_rep) {
 					/* if there is a specified update period, we redo the whole process */
 					if (dash->mpd->minimum_update_period || dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
-						if (! group->maybe_end_of_stream) {
+
+						if ((dash->mpd->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;
+							break;
+						}
+						else if (! group->maybe_end_of_stream) {
 							u32 now = gf_sys_clock();
 							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of segment list reached (%d segments but idx is %d), waiting for next MPD update\n", group->nb_segments_in_rep, group->download_segment_index));
 							if (group->nb_cached_segments)
 								continue;
-							
+
 							if (!group->time_at_first_reload_required) {
 								group->time_at_first_reload_required = now;
 								continue;
 							}
 							if (now - group->time_at_first_reload_required < group->cache_duration)
 								continue;
-						
-							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment list has not been updated for more than %d ms - assuming end of stream\n", now - group->time_at_first_reload_required));
+							if (dash->mpd->minimum_update_period && (now - group->time_at_first_reload_required < dash->mpd->minimum_update_period))
+								continue;
+
+							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;
 							break;
 						}
 					} 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 playlist reached... downloading remaining elements..."));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of period reached for group\n"));
 						group->done = 1;
 						break;
 					}
@@ -3577,7 +4013,7 @@
 					continue;
 				}
 
-				clock_time = gf_sys_clock();			
+				clock_time = gf_sys_clock();
 				to_wait = (s32) (segment_ast - now);
 
 				/*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 ...*/
@@ -3621,7 +4057,7 @@
 
 			/*local file*/
 			if (!strstr(new_base_seg_url, "://") || (!strnicmp(new_base_seg_url, "file://", 7) || !strnicmp(new_base_seg_url, "gmem://", 7)) ) {
-				resource_name = local_file_name = (char *) new_base_seg_url; 
+				resource_name = local_file_name = (char *) new_base_seg_url;
 				e = GF_OK;
 				/*do not erase local files*/
 				group->local_files = 1;
@@ -3643,6 +4079,15 @@
 					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), new_base_seg_url, 0, 0, 1, group);
 				}
 
+				if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
+					group->download_abort_type = 0;
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading segment (seek ?)%s \n", new_base_seg_url));
+					gf_free(new_base_seg_url);
+					new_base_seg_url = NULL;
+					continue;
+				}
+
+
 				/*TODO decide what is the best, fetch from another representation or ignore ...*/
 				if (e != GF_OK) {
 					clock_time = gf_sys_clock();
@@ -3658,7 +4103,14 @@
 						group->maybe_end_of_stream++;
 					} else if (group->segment_in_valid_range) {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - segment was lost at server/proxy side\n", new_base_seg_url, gf_error_to_string(e)));
-						group->download_segment_index++;
+						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;
+						}
 						group->segment_in_valid_range=0;
 					} else if (group->prev_segment_ok && !group->time_at_first_failure) {
 						if (!group->loop_detected) {
@@ -3681,11 +4133,18 @@
 							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"));
 							min_wait = 1000;
 							group->maybe_end_of_stream = 1;
-						} else 
+						} else
 #endif
 						{
 							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)));
-							group->download_segment_index++;
+							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_free(new_base_seg_url);
@@ -3699,7 +4158,7 @@
 					group->time_at_first_failure = 0;
 					group->nb_consecutive_fail = 0;
 				}
-				
+
 				if ((e==GF_OK) && group->force_switch_bandwidth) {
 					if (!dash->auto_switch_count) {
 						gf_dash_switch_group_representation(dash, group);
@@ -3721,18 +4180,19 @@
 
 				if (group->segment_must_be_streamed) local_file_name = dash->dash_io->get_url(dash->dash_io, group->segment_download);
 				else local_file_name = dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
-				
+
 				if (dash->dash_io->get_total_size(dash->dash_io, group->segment_download)==0) {
 					empty_file = GF_TRUE;
 				}
 				resource_name = dash->dash_io->get_url(dash->dash_io, group->segment_download);
 
-				if (!dash->auto_switch_count) 
+				if (!dash->auto_switch_count)
 					dash_do_rate_adaptation(dash, group, rep);
 			}
 
 			if (local_file_name && (e == GF_OK || group->segment_must_be_streamed )) {
 				gf_mx_p(dash->dl_mutex);
+
 				assert(group->nb_cached_segments<group->max_cached_segments);
 				assert( local_file_name );
 				if (! empty_file) {
@@ -3756,12 +4216,22 @@
 				}
 
 				/* download enhancement representation of this segment*/
-				if ((representation_index != group->force_max_rep_index) && rep->enhancement_rep_index_plus_one)
+				if ((representation_index != group->force_max_rep_index) && rep->enhancement_rep_index_plus_one) {
 					group->active_rep_index = rep->enhancement_rep_index_plus_one - 1;
+					group->has_pending_enhancement = GF_TRUE;
+				}
 				/* if we have downloaded all enhancement representations of this segment, restart from base representation and increase dowloaded segment index by 1*/
 				else {
 					if (group->base_rep_index_plus_one) group->active_rep_index = group->base_rep_index_plus_one - 1;
-					group->download_segment_index++;
+					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;
+					}
+					group->has_pending_enhancement = GF_FALSE;
 				}
 				if (dash->auto_switch_count) {
 					group->nb_segments_done++;
@@ -3770,10 +4240,13 @@
 						gf_dash_skip_disabled_representation(group, rep, GF_TRUE);
 					}
 				}
-				gf_mx_v(dash->dl_mutex);
 
+				//do not notify segments if there is a pending period switch - since these are decided by the user, we don't
+				//want to notify old segments
+				if (!dash->request_period_switch && !group->has_pending_enhancement)
+					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, group), GF_OK);
 
-				dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, group), GF_OK); 
+				gf_mx_v(dash->dl_mutex);
 
 			}
 			gf_free(new_base_seg_url);
@@ -3798,13 +4271,25 @@
 {
 	u32 i, count, cumul_start=0;
 	GF_MPD_Period *period;
+
+restart:
 	count = gf_list_count(dash->mpd->periods);
 	for (i = 0; i<count; i++) {
 		period = gf_list_get(dash->mpd->periods, i);
+
+		if (period->xlink_href) {
+			gf_dash_solve_period_xlink(dash, i);
+			goto restart;
+		}
+
 		if ((period->start > time) || (cumul_start > time)) {
 			break;
 		}
 		cumul_start+=period->duration;
+
+		if (time < cumul_start) {
+			break;
+		}
 	}
 	return (i>=1 ? (i-1) : 0);
 }
@@ -3847,22 +4332,37 @@
 
 
 
-Bool gf_dash_seek_periods(GF_DashClient *dash)
+static Bool gf_dash_seek_periods(GF_DashClient *dash, Double seek_time)
 {
 	Double start_time;
 	u32 i, period_idx;
-
+	u32 nb_retry = 10;
 	gf_mx_p(dash->dl_mutex);
 
-	dash->start_range_in_segment_at_next_period = 0;
+	dash->start_range_period = 0;
 	start_time = 0;
 	period_idx = 0;
-	for (i=0; i<=gf_list_count(dash->mpd->periods); i++) {
+	for (i=0; i<gf_list_count(dash->mpd->periods); i++) {
 		GF_MPD_Period *period = gf_list_get(dash->mpd->periods, i);
-		Double dur = period->duration;
+		Double dur;
+
+		if (period->xlink_href) {
+			gf_dash_solve_period_xlink(dash, i);
+			if (nb_retry) {
+				nb_retry --;
+				i--;
+				continue;
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Period still resolves to XLINK %s for more than 10 consecutive retry, ignoring it ...\n", period->xlink_href));
+			gf_free(period->xlink_href);
+			period->xlink_href = NULL;
+		} else {
+			nb_retry = 10;
+		}
+		dur = period->duration;
 		dur /= 1000;
-		if (dash->playback_start_range >= start_time) {
-			if ((i+1==gf_list_count(dash->mpd->periods)) || (dash->playback_start_range < start_time + dur) ) {
+		if (seek_time >= start_time) {
+			if ((i+1==gf_list_count(dash->mpd->periods)) || (seek_time < start_time + dur) ) {
 				period_idx = i;
 				break;
 			}
@@ -3870,63 +4370,66 @@
 		start_time += dur;
 	}
 	if (period_idx != dash->active_period_index) {
-		dash->playback_start_range -= start_time;
+		seek_time -= start_time;
 		dash->active_period_index = period_idx;
 		dash->request_period_switch = 2;
 
-		/*figure out default segment duration and substract from our start range request*/
-		if (dash->playback_start_range) {
-			Double duration;
-			u32 nb_segs;
-			GF_MPD_Period *period = gf_list_get(dash->mpd->periods, period_idx);
-			GF_MPD_AdaptationSet *set = gf_list_get(period->adaptation_sets, 0);
-			GF_MPD_Representation *rep = gf_list_get(set->representations, 0);
-
-			gf_dash_get_segment_duration(rep, set, period, dash->mpd, &nb_segs, &duration);
-
-			if (duration) {
-				while (dash->playback_start_range - dash->start_range_in_segment_at_next_period >= duration)
-					dash->start_range_in_segment_at_next_period += duration;
-			}
-
-		}
+		dash->start_range_period = seek_time;
 	}
 	gf_mx_v(dash->dl_mutex);
 
 	return dash->request_period_switch ? 1 : 0;
 }
 
-static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group)
+static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group, Double seek_to, Bool is_dynamic)
 {
 	Double seg_start;
-	u32 first_downloaded, last_downloaded, segment_idx;
+	u32 first_downloaded, last_downloaded, segment_idx, orig_idx;
 
 	group->force_segment_switch = 0;
-	if (!group->segment_duration) return;
+	if (!is_dynamic) {
 
-	/*figure out where to seek*/
-	segment_idx = 0;
-	seg_start = 0.0;
-	while (1) {
-		if ((dash->playback_start_range >= seg_start) && (dash->playback_start_range < seg_start + group->segment_duration)) 
-			break;
-		seg_start += group->segment_duration;
-		segment_idx++;
+		/*figure out where to seek*/
+		orig_idx = group->download_segment_index;
+		segment_idx = 0;
+		seg_start = 0.0;
+		while (1) {
+			Double dur = group->segment_duration;
+			if (!dur) {
+				group->download_segment_index = segment_idx;
+				//TODO this could be further optimized by directly querying the index for this start time ...
+				seg_start = gf_dash_get_segment_start_time(group, &dur);
+			}
+			if (!dur)
+				break;
+			if ((seek_to >= seg_start) && (seek_to < seg_start + dur))
+				break;
+			seg_start += dur;
+			segment_idx++;
+		}
+		group->download_segment_index = orig_idx;
+
+		/*remember to seek to given duration*/
+		group->start_playback_range = seek_to;
+
+		first_downloaded = last_downloaded = group->download_segment_index;
+		if (group->download_segment_index + 1 >= (s32) group->nb_cached_segments) {
+			first_downloaded = group->download_segment_index + 1 - group->nb_cached_segments;
+		}
+		/*we are seeking in our download range, just go on*/
+		if ((segment_idx >= first_downloaded) && (segment_idx<=last_downloaded)) return;
+
+		group->force_segment_switch = 1;
+		group->download_segment_index = segment_idx;
+	} else {
+		group->timeline_setup = 0;
+		group->start_number_at_last_ast = 0;
+		/*remember to adjust time in timeline steup*/
+		group->start_playback_range = seek_to;
 	}
-	/*todo - seek to given duration*/
-	dash->playback_start_range -= seg_start;
 
-	first_downloaded = last_downloaded = group->download_segment_index;
-	if (group->download_segment_index + 1 >= (s32) group->nb_cached_segments) {
-		first_downloaded = group->download_segment_index + 1 - group->nb_cached_segments;
-	}
-	/*we are seeking in our download range, just go on*/
-	if ((segment_idx >= first_downloaded) && (segment_idx<=last_downloaded)) return;
-
-	group->force_segment_switch = 1;
-	group->download_segment_index = segment_idx;
-	
-	if (group->segment_download) 
+
+	if (group->segment_download)
 		dash->dash_io->abort(dash->dash_io, group->segment_download);
 
 	if (group->urlToDeleteNext) {
@@ -3936,7 +4439,9 @@
 		gf_free(group->urlToDeleteNext);
 		group->urlToDeleteNext = NULL;
 	}
+
 	if (group->segment_download) {
+		dash->dash_io->abort(dash->dash_io, group->segment_download);
 		dash->dash_io->del(dash->dash_io, group->segment_download);
 		group->segment_download = NULL;
 	}
@@ -3949,9 +4454,10 @@
 		gf_free(group->cached[group->nb_cached_segments].url);
 		memset(&group->cached[group->nb_cached_segments], 0, sizeof(segment_cache_entry));
 	}
+	group->done = 0;
 }
 
-void gf_dash_seek_groups(GF_DashClient *dash)
+static void gf_dash_seek_groups(GF_DashClient *dash, Double seek_time, Bool is_dynamic)
 {
 	u32 i;
 
@@ -3964,12 +4470,13 @@
 			GF_MPD_Period *period = gf_list_get(dash->mpd->periods, dash->active_period_index-1);
 			dur += period->duration/1000.0;
 		}
-		dash->playback_start_range -= dur;
+		seek_time -= dur;
 	}
 	for (i=0; i<gf_list_count(dash->groups); i++) {
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
-		gf_dash_seek_group(dash, group);
+		gf_dash_seek_group(dash, group, seek_time, is_dynamic);
 	}
+
 	gf_mx_v(dash->dl_mutex);
 }
 
@@ -3982,7 +4489,10 @@
 	if (!sess) return GF_IO_ERR;
 	getter->session = sess;
 	e = dash->dash_io->init(dash->dash_io, sess);
-	if (e) return e;
+	if (e) {
+		dash->dash_io->del(dash->dash_io, sess);
+		return e;
+	}
 	return dash->dash_io->run(dash->dash_io, sess);
 }
 
@@ -4005,6 +4515,8 @@
 {
 	char local_path[GF_MAX_PATH];
 	const char *local_url;
+	char *sep_cgi = NULL;
+	char *sep_frag = NULL;
 	GF_Err e;
 	GF_MPD_Period *period;
 	GF_DOMParser *mpd_parser;
@@ -4012,11 +4524,14 @@
 
 	if (!dash || !manifest_url) return GF_BAD_PARAM;
 
-	memset( dash->lastMPDSignature, 0, sizeof(dash->last_update_time));
+	memset( dash->lastMPDSignature, 0, GF_SHA1_DIGEST_SIZE);
 	dash->reload_count = 0;
 
 	if (dash->base_url) gf_free(dash->base_url);
+	sep_cgi = strrchr(manifest_url, '?');
+	if (sep_cgi) sep_cgi[0] = 0;
 	dash->base_url = gf_strdup(manifest_url);
+	if (sep_cgi) sep_cgi[0] = '?';
 
 	dash->getter.udta = dash;
 	dash->getter.new_session = http_ifce_get;
@@ -4084,7 +4599,19 @@
 
 	if (is_local) {
 		FILE *f = fopen(local_url, "rt");
-		if (!f) return GF_URL_ERROR;
+		if (!f) {
+			sep_cgi = strrchr(local_url, '?');
+			if (sep_cgi) sep_cgi[0] = 0;
+			sep_frag = strrchr(local_url, '#');
+			if (sep_frag) sep_frag[0] = 0;
+
+			f = fopen(local_url, "rt");
+			if (!f) {
+				if (sep_cgi) sep_cgi[0] = '?';
+				if (sep_frag) sep_frag[0] = '#';
+				return GF_URL_ERROR;
+			}
+		}
 		fclose(f);
 	}
 	dash->mpd_fetch_time = dash_get_fetch_time(dash);
@@ -4116,6 +4643,10 @@
 	/* parse the MPD */
 	mpd_parser = gf_xml_dom_new();
 	e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
+
+	if (sep_cgi) sep_cgi[0] = '?';
+	if (sep_frag) sep_frag[0] = '#';
+
 	if (e != GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD parsing problem %s\n", gf_xml_dom_get_error(mpd_parser) ));
 		gf_xml_dom_del(mpd_parser);
@@ -4197,24 +4728,26 @@
 	GF_DashClient *dash;
 	GF_SAFEALLOC(dash, GF_DashClient);
 	dash->dash_io = dash_io;
-
+	dash->speed = 1.0;
+	//wait one segment to validate we have enough bandwidth
+	dash->probe_times_before_switch = 1;
 	dash->dash_thread = gf_th_new("MPD Segment Downloader Thread");
 	dash->dl_mutex = gf_mx_new("MPD Segment Downloader Mutex");
 	dash->mimeTypeForM3U8Segments = gf_strdup( "video/mp2t" );
 
 	dash->max_cache_duration = max_cache_duration;
 	dash->enable_buffering = enable_buffering;
-	dash->initial_time_shift_percent = initial_time_shift_percent;
-	if (initial_time_shift_percent>100) dash->initial_time_shift_percent = 100;
+	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->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;
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Client created\n"));
 	return dash;
 }
@@ -4225,7 +4758,7 @@
 	gf_dash_close(dash);
 
 	gf_th_del(dash->dash_thread);
-	gf_mx_del(dash->dl_mutex);	
+	gf_mx_del(dash->dl_mutex);
 
 	if (dash->mimeTypeForM3U8Segments) gf_free(dash->mimeTypeForM3U8Segments);
 	if (dash->base_url) gf_free(dash->base_url);
@@ -4245,6 +4778,12 @@
 	dash->estimate_utc_drift = estimate_utc_drift;
 }
 
+GF_EXPORT
+void gf_dash_set_switching_probe_count(GF_DashClient *dash, u32 switch_probe_count)
+{
+	dash->probe_times_before_switch = switch_probe_count;
+}
+
 
 GF_EXPORT
 u32 gf_dash_get_group_count(GF_DashClient *dash)
@@ -4296,6 +4835,7 @@
 	}
 }
 
+
 GF_EXPORT
 void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool immediate_switch)
 {
@@ -4344,6 +4884,8 @@
 				group->force_representation_idx_plus_one = switch_to_rep_idx;
 			else
 				group->force_max_rep_index = switch_to_rep_idx-1;
+
+
 			if (group->local_files || immediate_switch) {
 				u32 keep_seg_index = 0;
 				//keep all scalable enhancements of the first segment
@@ -4422,7 +4964,7 @@
 						group->active_rep_index = switch_to_rep_idx - 1;
 						group->download_segment_index--;
 					}
-					else {
+					else if (group->nb_cached_segments) {
 						/* we remove highest scalable enhancements of the dowloaded segments, and keep another segments*/
 						for (k = group->nb_cached_segments - 1; k > keep_seg_index; k--) {
 							if (group->cached[k].representation_index != current_idx)
@@ -4463,6 +5005,14 @@
 }
 
 GF_EXPORT
+u32 gf_dash_group_get_time_shift_buffer_depth(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return 0;
+	return group->time_shift_buffer_depth;
+}
+
+GF_EXPORT
 const char *gf_dash_get_url(GF_DashClient *dash)
 {
 	return dash->base_url;
@@ -4482,12 +5032,22 @@
 GF_EXPORT
 const char *gf_dash_group_get_segment_init_url(GF_DashClient *dash, u32 idx, u64 *start_range, u64 *end_range)
 {
+	GF_MPD_Representation *rep;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return NULL;
 
-	if (start_range) *start_range = group->local_url_start_range;
-	if (end_range) *end_range = group->local_url_end_range;		
-	return group->segment_local_url;
+	if (group->bs_switching_init_segment_url) {
+		if (start_range) *start_range = group->bs_switching_init_segment_url_start_range;
+		if (end_range) *end_range = group->bs_switching_init_segment_url_end_range;
+		return group->bs_switching_init_segment_url;
+	}
+
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	if (!rep) return NULL;
+
+	if (start_range) *start_range = rep->playback.init_start_range;
+	if (end_range) *end_range = rep->playback.init_end_range;
+	return rep->playback.cached_init_segment_url;
 }
 
 GF_EXPORT
@@ -4511,10 +5071,10 @@
 
 			/*either one Representation from group 0, if present,*/
 			if ((group->adaptation_set->group==0)
-				/*or the combination of at most one Representation from each non-zero group*/
-				|| (group->adaptation_set->group==agroup->adaptation_set->group) 
-				) {
-					agroup->selection = GF_DASH_GROUP_NOT_SELECTED;
+			        /*or the combination of at most one Representation from each non-zero group*/
+			        || (group->adaptation_set->group==agroup->adaptation_set->group)
+			   ) {
+				agroup->selection = GF_DASH_GROUP_NOT_SELECTED;
 			}
 		}
 	}
@@ -4525,47 +5085,113 @@
 }
 
 GF_EXPORT
-void gf_dash_groups_set_language(GF_DashClient *dash, const char *lang_3cc)
+void gf_dash_groups_set_language(GF_DashClient *dash, const char *lang_code_rfc_5646)
 {
-	u32 i;
-	if (!lang_3cc) return;
+	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->dl_mutex);
+
+	//first pass, check exact match
 	for (i=0; i<gf_list_count(dash->groups); i++) {
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		if (group->selection==GF_DASH_GROUP_NOT_SELECTABLE) continue;
-		if (group->adaptation_set->lang && !stricmp(group->adaptation_set->lang, lang_3cc)) {
+		if (!group->adaptation_set->lang) continue;
+
+		if (!stricmp(group->adaptation_set->lang, lang_code_rfc_5646)) {
 			gf_dash_group_select(dash, i, 1);
+			gf_list_add(groups_selected, group);
 		}
 	}
+
+	lang_idx = gf_lang_find(lang_code_rfc_5646);
+	if (lang_idx>=0) {
+		const char *n2cc = gf_lang_get_2cc(lang_idx);
+		const char *n3cc = gf_lang_get_3cc(lang_idx);
+
+		for (i=0; i<gf_list_count(dash->groups); i++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, i);
+			if (group->selection==GF_DASH_GROUP_NOT_SELECTABLE) continue;
+			if (!group->adaptation_set->lang) continue;
+			if (gf_list_find(groups_selected, group) >= 0) continue;
+
+			//check we didn't select one AS in this group in the previous pass or in this pass
+			if (group->adaptation_set->group>=0) {
+				u32 k;
+				Bool found = 0;
+				for (k=0; k<gf_list_count(groups_selected); k++) {
+					GF_DASH_Group *ag = gf_list_get(groups_selected, k);
+
+					if (ag->adaptation_set->group == group->adaptation_set->group) {
+						found = 1;
+						break;
+					}
+				}
+				if (found) continue;
+			}
+			//get the 2 or 3 land code
+			sep = strchr(group->adaptation_set->lang, '-');
+			if (sep) {
+				sep[0] = 0;
+			}
+			len = (u32) strlen(group->adaptation_set->lang);
+			//compare with what we found
+			if ( ((len==3) && !stricmp(group->adaptation_set->lang, n3cc))
+			        || ((len==2) && !stricmp(group->adaptation_set->lang, n2cc))
+			   ) {
+				gf_dash_group_select(dash, i, 1);
+				gf_list_add(groups_selected, group);
+			}
+
+			if (sep) sep[0] = '-';
+		}
+	}
+
+	gf_mx_v(dash->dl_mutex);
+
+	gf_list_del(groups_selected);
 }
 
 GF_EXPORT
-Bool gf_dash_is_running(GF_DashClient *dash) 
+Bool gf_dash_is_running(GF_DashClient *dash)
 {
 	return (dash->dash_state==GF_DASH_STATE_STOPPED) ? 0 : 1;
 }
 
 GF_EXPORT
-u32 gf_dash_get_period_switch_status(GF_DashClient *dash) 
+u32 gf_dash_get_period_switch_status(GF_DashClient *dash)
 {
 	return dash->request_period_switch;
 }
 GF_EXPORT
 void gf_dash_request_period_switch(GF_DashClient *dash)
 {
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Period switch has been requested\n"));
 	dash->request_period_switch = 1;
 }
 GF_EXPORT
-Bool gf_dash_in_last_period(GF_DashClient *dash) 
+Bool gf_dash_in_last_period(GF_DashClient *dash)
 {
 	return (dash->active_period_index+1 < gf_list_count(dash->mpd->periods)) ? 0 : 1;
 }
 GF_EXPORT
-Bool gf_dash_in_period_setup(GF_DashClient *dash) 
+Bool gf_dash_in_period_setup(GF_DashClient *dash)
 {
 	return dash->in_period_setup;
 }
 
 GF_EXPORT
+void gf_dash_set_speed(GF_DashClient *dash, Double speed)
+{
+	if (dash) dash->speed = speed ? speed : 1.0;
+}
+
+GF_EXPORT
 u32 gf_dash_group_get_max_segments_in_cache(GF_DashClient *dash, u32 idx)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
@@ -4607,7 +5233,7 @@
 
 discard_segment:
 	if (!group->nb_cached_segments) {
-		gf_mx_v(dash->dl_mutex);	
+		gf_mx_v(dash->dl_mutex);
 		return;
 	}
 	if (group->cached[0].cache) {
@@ -4657,8 +5283,13 @@
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (group) {
+		gf_mx_p(dash->dl_mutex);
 		group->done = done;
-		if (done && group->segment_download) dash->dash_io->abort(dash->dash_io, group->segment_download);
+		if (done && group->segment_download) {
+			group->download_abort_type = 1;
+			dash->dash_io->abort(dash->dash_io, group->segment_download);
+		}
+		gf_mx_v(dash->dl_mutex);
 	}
 }
 
@@ -4690,10 +5321,10 @@
 	if (switching_index) *switching_index = -1;
 	if (has_next_segment) *has_next_segment = GF_FALSE;
 
-	gf_mx_p(dash->dl_mutex);	
+	gf_mx_p(dash->dl_mutex);
 	group = gf_list_get(dash->groups, idx);
 	if (!group->nb_cached_segments) {
-		gf_mx_v(dash->dl_mutex);	
+		gf_mx_v(dash->dl_mutex);
 		return GF_BAD_PARAM;
 	}
 
@@ -4708,7 +5339,7 @@
 		if (rep->enhancement_rep_index_plus_one != group->cached[index+1].representation_index + 1) valid = GF_FALSE;
 
 		if (valid == GF_FALSE) {
-			gf_mx_v(dash->dl_mutex);	
+			gf_mx_v(dash->dl_mutex);
 			return GF_BAD_PARAM;
 		}
 		index ++;
@@ -4717,7 +5348,7 @@
 	assert(dependent_representation_index==0);
 
 	*url = group->cached[index].cache;
-	if (start_range) 
+	if (start_range)
 		*start_range = group->cached[index].start_range;
 	if (end_range)
 		*end_range = group->cached[index].end_range;
@@ -4738,13 +5369,13 @@
 
 	if (group->cached[index+1].cache) {
 		GF_MPD_Representation *rep;
-	
+
 		rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
 		if (rep->enhancement_rep_index_plus_one == group->cached[index+1].representation_index+1) {
-			if (has_next_segment) *has_next_segment = GF_TRUE;	
+			if (has_next_segment) *has_next_segment = GF_TRUE;
 		}
 	}
-	gf_mx_v(dash->dl_mutex);	
+	gf_mx_v(dash->dl_mutex);
 	return GF_OK;
 }
 
@@ -4758,10 +5389,10 @@
 	if (original_url) *original_url = NULL;
 	if (switching_index) *switching_index = -1;
 
-	gf_mx_p(dash->dl_mutex);	
+	gf_mx_p(dash->dl_mutex);
 	group = gf_list_get(dash->groups, idx);
 	if (!group) {
-		gf_mx_v(dash->dl_mutex);	
+		gf_mx_v(dash->dl_mutex);
 		return GF_BAD_PARAM;
 	}
 
@@ -4771,8 +5402,8 @@
 	}
 
 	*switched = GF_FALSE;
-	if (group->download_aborted) {
-		group->download_aborted = 0;
+	if (group->download_abort_type==2) {
+		group->download_abort_type = 0;
 		*switched = GF_TRUE;
 	}
 
@@ -4786,28 +5417,44 @@
 		if (switching_url)
 			*switching_url = rep->playback.cached_init_segment_url;
 	}
-	gf_mx_v(dash->dl_mutex);	
+	gf_mx_v(dash->dl_mutex);
 	return GF_OK;
 }
 
 GF_EXPORT
 void gf_dash_seek(GF_DashClient *dash, Double start_range)
 {
-	gf_mx_p(dash->dl_mutex);	
-	
-	dash->playback_start_range = start_range;
+	Bool is_dynamic = 0;
+	gf_mx_p(dash->dl_mutex);
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Seek request - playing from %g\n", start_range));
+
+	//are we live ? if so adjust start range
+	if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
+		u64 now, availabilityStartTime;
+		availabilityStartTime = dash->mpd->availabilityStartTime + dash->utc_shift;
+		if (dash->estimate_utc_drift) availabilityStartTime += dash->utc_drift_estimate;
+
+		now = dash->mpd_fetch_time + (gf_sys_clock() - dash->last_update_time) - availabilityStartTime;
+
+		if (dash->initial_time_shift_value<=100) {
+			now -= dash->mpd->time_shift_buffer_depth * dash->initial_time_shift_value / 100;
+		} else {
+			now -= dash->initial_time_shift_value;
+		}
+//		now += (u64) (start_range*1000);
+		start_range = (Double) now;
+		start_range /= 1000;
+
+		is_dynamic = 1;
+	}
+
 	/*first check if we seek to another period*/
-	if (! gf_dash_seek_periods(dash)) {
+	if (! gf_dash_seek_periods(dash, start_range)) {
 		/*if no, seek in group*/
-		gf_dash_seek_groups(dash);
+		gf_dash_seek_groups(dash, start_range, is_dynamic);
 	}
-	gf_mx_v(dash->dl_mutex);	
-}
-
-GF_EXPORT
-Double gf_dash_get_playback_start_range(GF_DashClient *dash)
-{
-	return dash->playback_start_range;
+	gf_mx_v(dash->dl_mutex);
 }
 
 GF_EXPORT
@@ -5042,7 +5689,7 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Loop in segment start numbers detected - old start %d new seg %d\n", start_number , latest_segment_number));
 				loop_detected = GF_TRUE;
 			}
-			//we are behind live 
+			//we are behind live
 			else if (nb_seg_diff<0) {
 				//we fall in the buffer of the sender, we liklely have a loss
 				if (nb_seg_diff + range_in >= 0) {
@@ -5063,7 +5710,7 @@
 				group = gf_list_get(dash->groups, i);
 				//force reinit of timeline for this group
 				group->start_number_at_last_ast = 0;
-				if (loop_detected) 
+				if (loop_detected)
 					group->loop_detected = GF_TRUE;
 			}
 			dash->force_mpd_update = GF_TRUE;
@@ -5071,7 +5718,7 @@
 		return GF_OK;
 	}
 
-	//TODO segment list adressing: 
+	//TODO segment list adressing:
 	return GF_OK;
 }
 
@@ -5099,6 +5746,239 @@
 	if (dash) dash->user_buffer_ms = buffer_time_ms;
 }
 
+/*returns active period start in ms*/
+GF_EXPORT
+u32 gf_dash_get_period_start(GF_DashClient *dash)
+{
+	u32 start;
+	u32 i;
+	GF_MPD_Period *period;
+	if (!dash || !dash->mpd) return 0;
+
+	start = 0;
+	for (i=0; i<=dash->active_period_index; i++) {
+		period = gf_list_get(dash->mpd->periods, i);
+		if (period->start) start = period->start;
+
+		if (i<dash->active_period_index) start += period->duration;
+	}
+	return start;
+}
+
+
+/*returns active period duration in ms*/
+GF_EXPORT
+u32 gf_dash_get_period_duration(GF_DashClient *dash)
+{
+	u32 start;
+	u32 i;
+	GF_MPD_Period *period = NULL;
+	if (!dash || !dash->mpd) return 0;
+
+	start = 0;
+	for (i=0; i<=dash->active_period_index; i++) {
+		period = gf_list_get(dash->mpd->periods, i);
+		if (period->start) start = period->start;
+		if (i<dash->active_period_index) start += period->duration;
+	}
+	if (!period) return 0;
+	if (period->duration) return period->duration;
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index+1);
+
+	if (!period) {
+		//infered from MPD duration
+		if (dash->mpd->media_presentation_duration) return dash->mpd->media_presentation_duration - start;
+		//duration is not known (live)
+		if (dash->mpd->type==GF_MPD_TYPE_STATIC) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Period duration is not computable: last period without duration and no MPD duration !\n"));
+		}
+		return 0;
+	}
+	if (!period->start) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Period duration is not computable, paeriod has no duration and next period has no start !\n"));
+		return 0;
+	}
+	return period->start - start;
+}
+
+GF_EXPORT
+const char *gf_dash_group_get_language(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return NULL;
+	return group->adaptation_set->lang;
+}
+
+GF_EXPORT
+u32 gf_dash_group_get_audio_channels(GF_DashClient *dash, u32 idx)
+{
+	GF_MPD_Descriptor *mpd_desc;
+	u32 i=0;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return 0;
+
+	while ((mpd_desc=gf_list_enum(group->adaptation_set->audio_channels, &i))) {
+		if (!strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:23003:3:audio_channel_configuration:2011")) {
+			return atoi(mpd_desc->value);
+		}
+	}
+	return 0;
+}
+
+GF_EXPORT
+u32 gf_dash_group_get_num_qualities(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return 0;
+	return gf_list_count(group->adaptation_set->representations);
+}
+
+GF_EXPORT
+GF_Err gf_dash_group_get_quality_info(GF_DashClient *dash, u32 idx, u32 quality_idx, GF_DASHQualityInfo *quality)
+{
+	GF_MPD_Fractional *sar;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	GF_MPD_Representation *rep;
+	if (!group || !quality) return GF_BAD_PARAM;
+	rep = gf_list_get(group->adaptation_set->representations, quality_idx);
+	if (!rep) return GF_BAD_PARAM;
+
+	memset(quality, 0, sizeof(GF_DASHQualityInfo));
+	quality->mime = rep->mime_type ? rep->mime_type : group->adaptation_set->mime_type;
+	quality->codec = rep->codecs ? rep->codecs : group->adaptation_set->codecs;
+	quality->disabled = rep->playback.disabled;
+	sar = rep->framerate ? rep->framerate : group->adaptation_set->framerate;
+	if (sar) {
+		quality->fps_den = sar->den;
+		quality->fps_num = sar->num;
+	}
+	quality->height = rep->height ? rep->height : group->adaptation_set->height;
+	quality->width = rep->width ? rep->width : group->adaptation_set->width;
+	quality->nb_channels = gf_dash_group_get_audio_channels(dash, idx);
+	sar = rep->sar ? rep->sar : group->adaptation_set->sar;
+	if (sar) {
+		quality->par_num = sar->num;
+		quality->par_den = sar->den;
+	}
+	quality->sample_rate = rep->samplerate ? rep->samplerate : group->adaptation_set->samplerate;
+	quality->bandwidth = rep->bandwidth;
+	quality->ID = rep->id;
+	quality->interlaced = (rep->scan_type == GF_MPD_SCANTYPE_INTERLACED) ? 1 : ( (group->adaptation_set->scan_type == GF_MPD_SCANTYPE_INTERLACED) ? 1 : 0);
+	quality->is_selected = (quality_idx==group->active_rep_index) ? 1 : 0;
+
+	return GF_OK;
+}
+
+
+static Bool gf_dash_group_enum_descriptor_list(GF_DashClient *dash, u32 idx, GF_List *descs, const char **desc_id, const char **desc_scheme, const char **desc_value)
+{
+	GF_MPD_Descriptor *mpd_desc;
+	if (idx>=gf_list_count(descs)) return 0;
+	mpd_desc = gf_list_get(descs, idx);
+	if (desc_value) *desc_value = mpd_desc->value;
+	if (desc_scheme) *desc_scheme = mpd_desc->scheme_id_uri;
+	if (desc_id) *desc_id = mpd_desc->id;
+	return 1;
+}
+
+GF_EXPORT
+Bool gf_dash_group_enum_descriptor(GF_DashClient *dash, u32 group_idx, GF_DashDescriptorType  desc_type, u32 desc_idx, const char **desc_id, const char **desc_scheme, const char **desc_value)
+{
+	GF_List *descs = NULL;
+	GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+	if (!group) return 0;
+	switch (desc_type) {
+	case GF_MPD_DESC_ACCESSIBILITY:
+		descs = group->adaptation_set->accessibility;
+		break;
+	case GF_MPD_DESC_AUDIOCONFIG:
+		descs = group->adaptation_set->audio_channels;
+		break;
+	case GF_MPD_DESC_CONTENT_PROTECTION:
+		descs = group->adaptation_set->content_protection;
+		break;
+	case GF_MPD_DESC_ESSENTIAL_PROPERTIES:
+		descs = group->adaptation_set->essential_properties;
+		break;
+	case GF_MPD_DESC_SUPPLEMENTAL_PROPERTIES:
+		descs = group->adaptation_set->supplemental_properties;
+		break;
+	case GF_MPD_DESC_FRAME_PACKING:
+		descs = group->adaptation_set->frame_packing;
+		break;
+	case GF_MPD_DESC_ROLE:
+		descs = group->adaptation_set->role;
+		break;
+	case GF_MPD_DESC_RATING:
+		descs = group->adaptation_set->rating;
+		break;
+	case GF_MPD_DESC_VIEWPOINT:
+		descs = group->adaptation_set->viewpoint;
+		break;
+	default:
+		return 0;
+	}
+	return gf_dash_group_enum_descriptor_list(dash, desc_idx, descs, desc_id, desc_scheme, desc_value);
+}
+
+GF_EXPORT
+Bool gf_dash_get_automatic_switching(GF_DashClient *dash)
+{
+	return (dash && dash->disable_switching) ? 0 : 1;
+}
+
+GF_EXPORT
+GF_Err gf_dash_set_automatic_switching(GF_DashClient *dash, Bool enable_switching)
+{
+	if (!dash) return GF_BAD_PARAM;
+	dash->disable_switching = !enable_switching;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dash_group_select_quality(GF_DashClient *dash, u32 idx, const char *ID)
+{
+	u32 i, count;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group || !ID) return GF_BAD_PARAM;
+
+	count = gf_list_count(group->adaptation_set->representations);
+	for (i=0; i<count; i++) {
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, i);
+		if (rep->id && !strcmp(rep->id, ID)) {
+			group->force_representation_idx_plus_one = i+1;
+			group->force_switch_bandwidth = 1;
+			return GF_OK;
+		}
+	}
+	return GF_BAD_PARAM;
+}
+
+
+
+GF_EXPORT
+u32 gf_dash_group_get_download_rate(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group || !group->segment_download) return 0;
+
+	return dash->dash_io->get_bytes_per_sec(dash->dash_io, group->segment_download);
+}
+
+
+GF_EXPORT
+GF_Err gf_dash_set_timeshift(GF_DashClient *dash, u32 ms_in_timeshift)
+{
+	if (!dash) return GF_BAD_PARAM;
+	dash->initial_time_shift_value = ms_in_timeshift;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_dash_get_timeshift_buffer_pos(GF_DashClient *dash)
+{
+	return dash ? dash->prev_time_in_tsb : 0;
+}
 
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/dash_segmenter.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/dash_segmenter.c Changed

@@ -35,6 +35,7 @@
 #endif
 #include <gpac/internal/isomedia_dev.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
@@ -54,8 +55,8 @@
 	/*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 szLang[5];
-};	
+	char *lang;
+};
 
 typedef struct
 {
@@ -91,6 +92,8 @@
 	u64 initial_tfdt;
 	Bool no_fragments_defaults;
 	Bool samplegroups_in_traf;
+	Bool single_traf_per_moof;
+	Bool content_protection_in_rep;
 } GF_DASHSegmenterOptions;
 
 struct _dash_segment_input
@@ -100,6 +103,14 @@
 	char periodID[100];
 	char xlink[100];
 	char role[100];
+	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[100];
@@ -128,13 +139,18 @@
 	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;
 
 	/*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;
 };
 
 
@@ -152,7 +168,7 @@
 				}	\
 			}	\
 			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 *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
 {
@@ -167,9 +183,9 @@
 	char tmp[100];
 	strcpy(segment_name, "");
 
-	if (seg_rad_name && (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$ID$") || strstr(seg_rad_name, "$Bandwidth$"))) 
+	if (seg_rad_name && (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$ID$") || strstr(seg_rad_name, "$Bandwidth$")))
 		needs_init = GF_FALSE;
-	
+
 	if (!seg_rad_name) {
 		strcpy(segment_name, output_file_name);
 	} else {
@@ -177,10 +193,10 @@
 		while (1) {
 			char c = seg_rad_name[char_template];
 			if (!c) break;
-			
-			if (!is_template && !is_init_template 
-				&& (!strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18) || !strnicmp(& seg_rad_name[char_template], "$ID$", 4))
-			) {
+
+			if (!is_template && !is_init_template
+			        && (!strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18) || !strnicmp(& seg_rad_name[char_template], "$ID$", 4))
+			   ) {
 				char_template+=18;
 				strcat(segment_name, rep_id);
 				needs_init=GF_FALSE;
@@ -230,7 +246,7 @@
 				char_template += (u32) strlen(seg_rad_name + char_template)+1;
 				if (sep) sep[0] = '$';
 			}
-			
+
 			else {
 				char_template+=1;
 				sprintf(tmp, "%c", c);
@@ -239,7 +255,7 @@
 		}
 	}
 
-	if (is_template && ! use_segment_timeline && !strstr(seg_rad_name, "$Number"))
+	if (is_template && ( ! use_segment_timeline || !strstr(seg_rad_name, "$Time")) && !strstr(seg_rad_name, "$Number"))
 		strcat(segment_name, "$Number$");
 
 	if (needs_init)
@@ -268,6 +284,7 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
+GF_EXPORT
 GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec)
 {
 	GF_ESD *esd;
@@ -345,9 +362,17 @@
 		gf_odf_avc_cfg_del(avcc);
 		return GF_OK;
 #ifndef GPAC_DISABLE_HEVC
-	case GF_4CC('h','v','c','1'):
-	case GF_4CC('h','e','v','1'):
+	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_SHC1:
+	case GF_ISOM_SUBTYPE_SHV1:
 		hvcc = gf_isom_hevc_config_get(movie, track, 1);
+		if (!hvcc) {
+			hvcc = gf_isom_shvc_config_get(movie, track, 1);
+		}
 		if (hvcc) {
 			u8 c;
 			char szTemp[40];
@@ -358,7 +383,7 @@
 			//profile idc encoded as a decimal number
 			sprintf(szTemp, "%d", hvcc->profile_idc);
 			strcat(szCodec, szTemp);
-			//general profile compatibility flags: hexa, bit-reversed 
+			//general profile compatibility flags: hexa, bit-reversed
 			{
 				u32 val = hvcc->general_profile_compatibility_flags;
 				u32 i, res = 0;
@@ -406,7 +431,7 @@
 					}
 				}
 			}
-		
+
 			gf_odf_hevc_cfg_del(hvcc);
 		} else {
 			sprintf(szCodec, "%s", gf_4cc_to_str(subtype));
@@ -436,8 +461,8 @@
 	u64 FragmentLength;
 	u32 OriginalTrack;
 	u32 finalSampleDescriptionIndex;
-	u32 TimeScale, MediaType, DefaultDuration, InitialTSOffset;
-	u64 last_sample_cts, next_sample_dts;
+	u32 TimeScale, MediaType, DefaultDuration;
+	u64 last_sample_cts, next_sample_dts, InitialTSOffset;
 	Bool all_sample_raps, splitable;
 	u32 split_sample_dts_shift;
 	s32 media_time_to_pres_time_shift;
@@ -460,13 +485,42 @@
 			break;
 		}
 	}
-	if (!found_sample) return 0;
+	//TRICK: if we don't found next RAP, return time of the last sample in track
+	if (!found_sample)
+		found_sample = sample_count;
 	samp = gf_isom_get_sample_info(input, track, found_sample, NULL, NULL);
 	time = samp->DTS;
 	gf_isom_sample_del(&samp);
 	return time;
 }
 
+static GF_Err gf_isom_write_content_protection(GF_ISOFile *input, FILE *mpd, u32 protected_track, u8 indent)
+{
+	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;
+		u8 i;
+		gf_isom_cenc_get_default_info(input, protected_track, 1, NULL, NULL, &default_KID);
+		for (i=0; i<indent; i++)
+			fprintf(mpd, " ");
+		fprintf(mpd, "<ContentProtection schemeIdUri=\"urn:mpeg:dash:mp4protection:2011\" value=\"%s\" cenc:default_KID=\"", gf_4cc_to_str(prot_scheme) );
+		/* Output canonical UIID form */
+		for (i=0; i<4; i++) fprintf(mpd, "%02x", default_KID[i]);
+		fprintf(mpd, "-");
+		for (i=4; i<6; i++) fprintf(mpd, "%02x", default_KID[i]);
+		fprintf(mpd, "-");
+		for (i=6; i<8; i++) fprintf(mpd, "%02x", default_KID[i]);
+		fprintf(mpd, "-");
+		for (i=8; i<10; i++) fprintf(mpd, "%02x", default_KID[i]);
+		fprintf(mpd, "-");
+		for (i=10; i<16; i++) fprintf(mpd, "%02x", default_KID[i]);
+		fprintf(mpd, "\"/>\n");
+	}
+	//todo for ISMA or OMA DRM
+
+	return GF_OK;
+}
+
 static GF_Err gf_media_isom_segment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec, GF_DASHSegmenterOptions *dash_cfg, GF_DashSegInput *dash_input, Bool first_in_set)
 {
 	u8 NbBits;
@@ -483,10 +537,10 @@
 	GF_ISOSample *sample, *next;
 	GF_List *fragmenters;
 	u64 MaxFragmentDuration, MaxSegmentDuration, SegmentDuration, maxFragDurationOverSegment;
-	u32 presentationTimeOffset = 0;
+	u64 presentationTimeOffset = 0;
 	Double segment_start_time, file_duration, period_duration, max_segment_duration;
-	u32 nb_segments, width, height, sample_rate, nb_channels, sar_w, sar_h, fps_num, fps_denum, startNumber, startNumberRewind;
-	char langCode[5];
+	u32 nb_segments, width, height, sample_rate, nb_channels, sar_w, sar_h, fps_num, fps_denum, startNumber;
+	char *langCode;
 	u32 index_start_range, index_end_range;
 	Bool force_switch_segment = GF_FALSE;
 	Bool switch_segment = GF_FALSE;
@@ -521,6 +575,7 @@
 	u32 *segments_info = NULL;
 	u32 nb_segments_info = 0;
 	u32 protected_track = 0;
+	u64 min_seg_dur, max_seg_dur, total_seg_dur;
 	Bool audio_only = GF_TRUE;
 	Bool is_bs_switching = GF_FALSE;
 	Bool use_url_template = dash_cfg->use_url_template;
@@ -542,7 +597,7 @@
 			is_bs_switching = 1;
 		}
 	}
-	
+
 	sprintf(RepSecName, "Representation_%s", dash_input ? dash_input->representationID : "");
 	sprintf(RepURLsSecName, "URLs_%s", dash_input ? dash_input->representationID : "");
 
@@ -550,7 +605,6 @@
 	file_duration = 0;
 
 	startNumber = 1;
-	startNumberRewind = 0;
 
 	//create output file
 	/*need to precompute bandwidth*/
@@ -571,29 +625,15 @@
 			store_dash_params=GF_TRUE;
 			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "ID", dash_input->representationID);
 		}
-		//we no longer support start number changes 
-#if 0
-		/*we are in time shift enabled mode so segments will get destroyed, set the start number to the current segment 
-		and restore presentationTimeOffset (cf below)*/
-		if (!store_dash_params && (dash_cfg->time_shift_depth >= 0)) {
-			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex");
-			sscanf(opt, "%u", &startNumber);
-
-			/*adjust the startNumber according to the timeShiftBuffer depth*/
-			if ((dash_cfg->time_shift_depth>0) && (startNumber>(u32)dash_cfg->time_shift_depth) ) {
-				startNumberRewind = dash_cfg->time_shift_depth;
-			}
-		}
-#endif
 	}
 
 	opt = dash_cfg->dash_ctx ? gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegment") : NULL;
 	if (opt) {
-		output = gf_isom_open(opt, GF_ISOM_OPEN_CAT_FRAGMENTS, NULL);
+		output = gf_isom_open(opt, GF_ISOM_OPEN_CAT_FRAGMENTS, dash_cfg->tmpdir);
 		dash_moov_setup = 1;
 	} else {
 		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
-		output = gf_isom_open(SegmentName, GF_ISOM_OPEN_WRITE, NULL);
+		output = gf_isom_open(SegmentName, GF_ISOM_OPEN_WRITE, dash_cfg->tmpdir);
 	}
 	if (!output) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOBMF DASH] Cannot open %s for writing\n", opt ? opt : SegmentName));
@@ -620,7 +660,7 @@
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "BitstreamSwitching");
 		if (opt && !strcmp(opt, "yes")) {
 			is_bs_switching = 1;
-			if (bs_switch_segment) 
+			if (bs_switch_segment)
 				gf_isom_delete(bs_switch_segment);
 			bs_switch_segment = output;
 			bs_switching_is_output = 1;
@@ -636,7 +676,7 @@
 		sprintf(szMPDTempLine, "    <SegmentTimeline>\n");
 		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 	}
-		
+
 	nb_sync = 0;
 	nb_samp = 0;
 	fragmenters = gf_list_new();
@@ -656,10 +696,10 @@
 
 	}
 
-	MaxFragmentDuration = (u32) (dash_cfg->dash_scale * max_duration_sec);	
+	MaxFragmentDuration = (u32) (dash_cfg->dash_scale * max_duration_sec);
 	MaxSegmentDuration = (u32) (dash_cfg->dash_scale * dash_cfg->segment_duration);
 
-	/*in single segment mode, only one big SIDX is written between the end of the moov and the first fragment. 
+	/*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 (dash_cfg->single_file_mode==1) {
@@ -671,20 +711,19 @@
 		seg_rad_name = NULL;
 	}
 
-	index_start_range = index_end_range = 0;	
+	index_start_range = index_end_range = 0;
 
 	tf = tfref = NULL;
 	file_duration = 0;
 	width = height = sample_rate = nb_channels = sar_w = sar_h = fps_num = fps_denum = 0;
-	langCode[0]=0;
-	langCode[4]=0;
+	langCode = NULL;
 	szCodecs[0] = 0;
 
 
 	mpd_timescale = nb_video = nb_audio = nb_text = nb_scene = 0;
 	//duplicates all tracks
 	for (i=0; i<gf_isom_get_track_count(input); i++) {
-		u32 _w, _h, _sr, _nb_ch, avctype;
+		u32 _w, _h, _sr, _nb_ch, vidtype;
 
 		u32 mtype = gf_isom_get_media_type(input, i+1);
 		if (mtype == GF_ISOM_MEDIA_HINT) continue;
@@ -701,7 +740,7 @@
 
 			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 wuold be in traf*/
+			/*remove sgpd in stbl; it would be in traf*/
 			if (dash_cfg->samplegroups_in_traf) {
 				GF_TrackBox *trak = (GF_TrackBox *)gf_isom_get_track_from_file(output, TrackNum);
 				if (!trak) continue;
@@ -713,7 +752,7 @@
 			}
 
 // Commenting it the code for Timed Text tracks, it may happen that we have only one long sample, fragmentation is useful
-#if 0 
+#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);
@@ -729,19 +768,30 @@
 		}
 
 		/*set extraction mode whether setup or not*/
-		avctype = gf_isom_get_avc_svc_type(input, i+1, 1);
-		if (avctype==GF_ISOM_AVCTYPE_AVC_ONLY) {
+		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 && dash_cfg->inband_param_set) 
+			if (!dash_input->trackNum && dash_cfg->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 (avctype > GF_ISOM_AVCTYPE_AVC_ONLY) {
+		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);
 		}
 
-		if (dash_cfg->inband_param_set && (gf_isom_get_media_subtype(input, i+1, 1)==GF_ISOM_SUBTYPE_HVC1)) {
-			gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+		vidtype = gf_isom_get_hevc_shvc_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 SHVC base*/
+			if (!dash_input->trackNum && dash_cfg->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);
 		}
 
 		if (mtype == GF_ISOM_MEDIA_VISUAL) nb_video++;
@@ -754,15 +804,15 @@
 
 		//setup fragmenters
 		if (! dash_moov_setup) {
-				//new initialization segment, setup fragmentation
+			//new initialization segment, setup fragmentation
 			gf_isom_get_fragment_defaults(input, i+1,
-										&defaultDuration, &defaultSize, &defaultDescriptionIndex, 
-										&defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+			                              &defaultDuration, &defaultSize, &defaultDescriptionIndex,
+			                              &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 			if (! dash_cfg->no_fragments_defaults) {
 				e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
-							defaultDescriptionIndex, defaultDuration,
-							defaultSize, (u8) defaultRandomAccess,
-							defaultPadding, defaultDegradationPriority);
+				                                 defaultDescriptionIndex, defaultDuration,
+				                                 defaultSize, (u8) defaultRandomAccess,
+				                                 defaultPadding, defaultDegradationPriority);
 
 			} else {
 				e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum), defaultDescriptionIndex, 0, 0, 0, 0, 0);
@@ -770,7 +820,7 @@
 			if (e) goto err_exit;
 		} else {
 			gf_isom_get_fragment_defaults(output, TrackNum,
-									 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+			                              &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 		}
 
 		gf_media_get_rfc_6381_codec_name(bs_switch_segment ? bs_switch_segment : input, i+1, szCodec);
@@ -816,7 +866,7 @@
 				/*get first edit*/
 				gf_isom_get_edit_segment(input, i+1, j+1, &EditTime, &SegDuration, &MediaTime, &EditMode);
 
-				if (EditMode==GF_ISOM_EDIT_NORMAL) 
+				if (EditMode==GF_ISOM_EDIT_NORMAL)
 					SegDuration = 0;
 
 				gf_isom_set_edit_segment(output, TrackNum, EditTime, SegDuration, MediaTime, EditMode);
@@ -855,25 +905,25 @@
 				/*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,
-											 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+					                                  &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 					if (e) goto err_exit;
 
 					e = gf_isom_change_track_fragment_defaults(output, tf->TrackID,
-											 defaultDescriptionIndex, defaultDuration, defaultSize, defaultRandomAccess, defaultPadding, defaultDegradationPriority);
+					        defaultDescriptionIndex, defaultDuration, defaultSize, defaultRandomAccess, defaultPadding, defaultDegradationPriority);
 					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); 
+				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, 
+				/*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, 1);
 				}
 
 				/*and search in new ones the new index*/
-				s_count = gf_isom_get_sample_description_count(bs_switch_segment, sample_descs_track); 
+				s_count = gf_isom_get_sample_description_count(bs_switch_segment, sample_descs_track);
 				if (s_count>1) {
 					u32 k;
 					/*remove all sample descs*/
@@ -891,7 +941,7 @@
 			char *opt, sKey[100];
 			sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
 			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
-			if (opt) tf->InitialTSOffset = atoi(opt);
+			if (opt) sscanf(opt, LLU, & tf->InitialTSOffset);
 
 			/*store presentationTimeOffset on the first rep*/
 			if (store_dash_params)
@@ -904,19 +954,24 @@
 		case GF_ISOM_MEDIA_SUBT:
 		case GF_ISOM_MEDIA_MPEG_SUBT:
 			tf->splitable = GF_TRUE;
-			gf_isom_get_media_language(input, i+1, langCode);
+			gf_isom_get_media_language(input, i+1, &langCode);
 		case GF_ISOM_MEDIA_VISUAL:
 		case GF_ISOM_MEDIA_SCENE:
 		case GF_ISOM_MEDIA_DIMS:
-			gf_isom_get_track_layout_info(input, i+1, &_w, &_h, NULL, NULL, NULL);
-			if (_w>width) width = _w;
-			if (_h>height) height = _h;
+			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:
 			gf_isom_get_audio_info(input, i+1, 1, &_sr, &_nb_ch, NULL);
 			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);
+			gf_isom_get_media_language(input, i+1, &langCode);
 			break;
 		}
 
@@ -1035,7 +1090,7 @@
 		for (i=0; i<count; i++) {
 			const char *key_name = gf_cfg_get_key_name(dash_cfg->dash_ctx, RepURLsSecName, i);
 			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepURLsSecName, key_name);
-			sprintf(szMPDTempLine, "     %s\n", opt);	
+			sprintf(szMPDTempLine, "     %s\n", opt);
 			gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 		}
 
@@ -1068,6 +1123,7 @@
 
 
 	max_segment_duration = 0;
+	min_seg_dur = max_seg_dur = total_seg_dur = 0;
 
 	while ( (count = gf_list_count(fragmenters)) ) {
 		Bool store_pssh = GF_FALSE;
@@ -1104,7 +1160,7 @@
 
 					if (!use_url_template) {
 						const char *name = gf_url_get_resource_name(SegmentName);
-						sprintf(szMPDTempLine, "     <SegmentURL media=\"%s\"/>\n", name );	
+						sprintf(szMPDTempLine, "     <SegmentURL media=\"%s\"/>\n", name );
 						gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 						if (dash_cfg->dash_ctx) {
 							char szKey[100], szVal[4046];
@@ -1122,7 +1178,7 @@
 
 			cur_seg++;
 			if (e) goto err_exit;
-		} 
+		}
 
 		maxFragDurationOverSegment=0;
 
@@ -1134,14 +1190,15 @@
 		} else {
 			e = gf_isom_start_fragment(output, 1);
 			if (e) goto err_exit;
-	
+
 
 			for (i=0; i<count; i++) {
 				tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 				if (tf->done) continue;
 
 				if (dash_cfg->initial_tfdt && (tf->TimeScale != dash_cfg->dash_scale)) {
-					Double scale = tf->TimeScale; scale /= dash_cfg->dash_scale;
+					Double scale = tf->TimeScale;
+					scale /= dash_cfg->dash_scale;
 					gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, (u64) (dash_cfg->initial_tfdt*scale) + tf->InitialTSOffset + tf->next_sample_dts);
 				} else {
 					gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tf->InitialTSOffset + tf->next_sample_dts);
@@ -1160,10 +1217,15 @@
 			u32 SAP_type = 0;
 
 			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-			if (tf == tfref) 
+			if (tf == tfref)
 				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 && dash_cfg->single_traf_per_moof && (i>0) ) {
+				e = gf_isom_start_fragment(output, 1);
+				if (e) goto err_exit;
+			}
 
 			//ok write samples
 			while (1) {
@@ -1185,9 +1247,9 @@
 						is_redundant_sample = GF_TRUE;
 					}
 
-					/*also get SAP type - this is not needed if sample is not NULL as SAP tye was computed for "next sample" in previous loop*/
+					/*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 = 1;
+						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);
@@ -1204,7 +1266,7 @@
 				if (next) {
 					defaultDuration = (u32) (next->DTS - sample->DTS);
 				} else {
- 					defaultDuration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack)- sample->DTS);
+					defaultDuration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack)- sample->DTS);
 				}
 
 				if (tf->splitable) {
@@ -1215,19 +1277,21 @@
 							split_sample_duration = defaultDuration;
 							defaultDuration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / dash_cfg->dash_scale - tf->FragmentLength);
 							split_sample_duration -= defaultDuration;
+							nb_samp++;
 						}
-					} else if (tfref /* tfref set to NULL after the last sample of tfref is processed */ 
-								/*&& next do not split if no next sample */
+					} else if (tfref /* tfref set to NULL after the last sample of tfref is processed */
+					           /*&& next do not split if no next sample */
 
-								/*next sample DTS */
+					           /*next sample DTS */
 //								&& ((tf->next_sample_dts /*+ 1 accuracy*/  ) * tfref_timescale < tfref->next_sample_dts * tf->TimeScale)
-								&& ((tf->next_sample_dts + defaultDuration) * tfref_timescale > tfref->next_sample_dts * tf->TimeScale)) {
+					           && ((tf->next_sample_dts + defaultDuration) * tfref_timescale > tfref->next_sample_dts * tf->TimeScale)) {
 						split_sample_duration = defaultDuration;
 						defaultDuration = (u32) ( (tfref->next_sample_dts * tf->TimeScale)/tfref_timescale - tf->next_sample_dts );
 						split_sample_duration -= defaultDuration;
 
 						/*since we split this sample we have to stop fragmenting afterwards*/
 						stop_frag = GF_TRUE;
+						nb_samp++;
 					}
 				}
 
@@ -1236,12 +1300,12 @@
 						first_sample_in_segment = GF_FALSE;
 						if (! SAP_type) segments_start_with_sap = GF_FALSE;
 					}
-					if (ref_track_first_dts > sample->DTS) 
+					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) 
+						if (split_sample_duration)
 							next_cts -= split_sample_duration;
 
 						if (ref_track_next_cts<next_cts) {
@@ -1262,8 +1326,8 @@
 					/*override descIndex with final index used in file*/
 					descIndex = tf->finalSampleDescriptionIndex;
 					e = gf_isom_fragment_add_sample(output, tf->TrackID, sample, descIndex,
-									 defaultDuration, NbBits, 0, is_redundant_sample);
-					if (e) 
+					                                defaultDuration, NbBits, 0, is_redundant_sample);
+					if (e)
 						goto err_exit;
 
 					e = gf_isom_fragment_add_sai(output, input, tf->TrackID, tf->SampleNum + 1);
@@ -1271,7 +1335,7 @@
 
 					/*copy subsample information*/
 					e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, dash_cfg->samplegroups_in_traf);
-					if (e) 
+					if (e)
 						goto err_exit;
 
 					gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
@@ -1295,7 +1359,7 @@
 				/*compute SAP type*/
 				if (sample) {
 					if (sample->IsRAP) {
-						SAP_type = 1;
+						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);
@@ -1326,9 +1390,9 @@
 							if (next_sap_time) {
 								u32 scaler;
 								/*this is the fragment duration from last sample added to next SAP*/
-								frag_dur += (u32) (next_sap_time - tf->next_sample_dts - next_dur) * dash_cfg->dash_scale / tf->TimeScale;
+								frag_dur += (s64) (next_sap_time - tf->next_sample_dts - next_dur) * dash_cfg->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) {
+								if (!tf->splitable && (SegmentDuration + frag_dur > MaxSegmentDuration)) {
 									split_at_rap = GF_TRUE;
 									/*force new segment*/
 									force_switch_segment = GF_TRUE;
@@ -1348,7 +1412,7 @@
 							if (tf->FragmentLength == defaultDuration) has_rap = 2;
 							else has_rap = 1;
 						}
-					} 
+					}
 				} else {
 					next_sample_rap = GF_FALSE;
 				}
@@ -1381,7 +1445,7 @@
 						tf->split_sample_dts_shift += defaultDuration;
 
 					//if (tf==tfref)
-						//last_ref_cts = tf->last_sample_cts;
+					//last_ref_cts = tf->last_sample_cts;
 
 					break;
 				}
@@ -1407,15 +1471,23 @@
 		}
 
 
+		//this is now disabled - we try to keep segment duration as constant and close to the requested duration as possible
+		//this code was producing much shorter segments in case segment duration was way greater than fragment duration
+		//this means we will typically end up with one shorter fragment at the end of the segment
+#if 0
 		/*next fragment will exceed segment length, abort fragment now (all samples RAPs)*/
 		if (tfref && tfref->all_sample_raps && (SegmentDuration + MaxFragmentDuration >= MaxSegmentDuration)) {
 			force_switch_segment = GF_TRUE;
 		}
+#endif
 
-		if (force_switch_segment || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap))) {
+		if (force_switch_segment || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap || tf->splitable))) {
 
-			if (mpd_timeline_bs) {
+			if (!min_seg_dur || (min_seg_dur>SegmentDuration)) min_seg_dur = SegmentDuration;
+			if (max_seg_dur < SegmentDuration) max_seg_dur = SegmentDuration;
+			total_seg_dur += SegmentDuration;
 
+			if (mpd_timeline_bs) {
 				if (previous_segment_duration == SegmentDuration) {
 					segment_timeline_repeat_count ++;
 				} else {
@@ -1436,15 +1508,15 @@
 					}
 					gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 					segment_timeline_repeat_count = 0;
-				}	
+				}
 			}
 
 			segment_start_time += SegmentDuration;
 			nb_segments++;
-			if (max_segment_duration * dash_cfg->dash_scale <= SegmentDuration) {
+			/*if (max_segment_duration * dash_cfg->dash_scale <= SegmentDuration) {
 				max_segment_duration = (Double) (s64) SegmentDuration;
 				max_segment_duration /= dash_cfg->dash_scale;
-			}
+			}*/
 			force_switch_segment = GF_FALSE;
 			switch_segment = GF_TRUE;
 			SegmentDuration = 0;
@@ -1455,7 +1527,6 @@
 
 			if (!simulation_pass) {
 				u64 idx_start_range, idx_end_range;
-					
 
 				gf_isom_close_segment(output, dash_cfg->subsegs_per_sidx, ref_track_id, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dash_cfg->daisy_chain_sidx, flush_all_samples ? GF_TRUE : GF_FALSE, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
 
@@ -1471,10 +1542,10 @@
 					file_size = gf_isom_get_file_size(output);
 					end_range = file_size - 1;
 					if (dash_cfg->single_file_mode!=1) {
-						sprintf(szMPDTempLine, "      <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);	
+						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);	
+							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);
@@ -1525,13 +1596,9 @@
 	if (!switch_segment) {
 		u64 idx_start_range, idx_end_range;
 
-		/*do not update on last segment, we're likely to have a different last GOP*/
-#if 0
-		if (max_segment_duration * dash_cfg->dash_scale <= SegmentDuration) {
-			max_segment_duration = (Double) (s64) SegmentDuration;
-			max_segment_duration /= dash_cfg->dash_scale;
-		}
-#endif
+		if (!min_seg_dur || (min_seg_dur>SegmentDuration)) min_seg_dur = SegmentDuration;
+		if (max_seg_dur < SegmentDuration) max_seg_dur = SegmentDuration;
+		total_seg_dur += SegmentDuration;
 
 		segment_start_time += SegmentDuration;
 
@@ -1589,10 +1656,22 @@
 		sprintf(szMPDTempLine, "    </SegmentTimeline>\n");
 		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 	}
+	else if (!dash_cfg->use_segment_timeline) {
+		if (dash_cfg->dash_ctx) {
+			max_segment_duration = max_duration_sec;
+		} else {
+			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 / dash_cfg->dash_scale, (Double) max_seg_dur / dash_cfg->dash_scale));
+			}
+			max_segment_duration = (Double) total_seg_dur;
+			max_segment_duration /= nb_segments * dash_cfg->dash_scale;
+		}
+	}
+
 
 	if (!bandwidth)
 		bandwidth = (u32) (file_size * 8 / file_duration);
-	
+
 	bandwidth += dash_input->dependency_bandwidth;
 	dash_input->bandwidth = bandwidth;
 
@@ -1601,8 +1680,8 @@
 		if (!dash_cfg->variable_seg_rad_name && first_in_set) {
 			const char *rad_name = gf_url_get_resource_name(seg_rad_name);
 			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, 0, 0, dash_cfg->use_segment_timeline);
-			fprintf(dash_cfg->mpd, "   <SegmentTemplate timescale=\"%d\" media=\"%s\" startNumber=\"%d\"", mpd_timeline_bs ? dash_cfg->dash_scale : mpd_timescale, SegmentName, startNumber - startNumberRewind);	
-			if (!mpd_timeline_bs) {
+			fprintf(dash_cfg->mpd, "   <SegmentTemplate timescale=\"%d\" media=\"%s\" startNumber=\"%d\"", mpd_timeline_bs ? dash_cfg->dash_scale : mpd_timescale, SegmentName, startNumber);
+			if (!dash_cfg->use_segment_timeline) {
 				if (!max_segment_duration)
 					max_segment_duration = dash_cfg->segment_duration;
 				fprintf(dash_cfg->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale));
@@ -1614,8 +1693,8 @@
 				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
 			}
 			fprintf(dash_cfg->mpd, " initialization=\"%s\"", SegmentName);
-			if (presentationTimeOffset) 
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+			if (presentationTimeOffset)
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 
 			if (mpd_timeline_bs) {
 				char *mpd_seg_info = NULL;
@@ -1631,10 +1710,13 @@
 			}
 		}
 		/*in BS switching we share the same IS for all reps, write the SegmentTemplate for the init segment*/
-		else if (is_bs_switching && first_in_set) {
-			fprintf(dash_cfg->mpd, "   <SegmentTemplate initialization=\"%s\"", bs_switching_segment_name);
-			if (presentationTimeOffset) 
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+		else if ((is_bs_switching || mpd_timeline_bs) && first_in_set ) {
+			fprintf(dash_cfg->mpd, "   <SegmentTemplate");
+			if (is_bs_switching) {
+				fprintf(dash_cfg->mpd, " initialization=\"%s\"", bs_switching_segment_name);
+				if (presentationTimeOffset)
+					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+			}
 
 			if (mpd_timeline_bs) {
 				char *mpd_seg_info = NULL;
@@ -1662,14 +1744,18 @@
 		fprintf(dash_cfg->mpd, "   </SegmentList>\n");
 	}
 
+	/* Write adaptation set content protection element */
+	if (protected_track && first_in_set && !dash_cfg->content_protection_in_rep) {
+		gf_isom_write_content_protection(input, dash_cfg->mpd, protected_track, 3);
+	}
 
 	fprintf(dash_cfg->mpd, "   <Representation ");
 	if (dash_input->representationID) fprintf(dash_cfg->mpd, "id=\"%s\"", dash_input->representationID);
 	else fprintf(dash_cfg->mpd, "id=\"%p\"", output);
-		
+
 	fprintf(dash_cfg->mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", audio_only ? "audio" : "video", szCodecs);
 	if (width && height) {
-		fprintf(dash_cfg->mpd, " width=\"%d\" height=\"%d\"", width, height);
+		fprintf(dash_cfg->mpd, " width=\"%u\" height=\"%u\"", width, height);
 
 		/*this is a video track*/
 		if (fps_num || fps_denum) {
@@ -1694,34 +1780,24 @@
 	//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(dash_cfg->mpd, " subsegmentStartsWithSAP=\"%d\"", max_sap_type);
 
-	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);	
+	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);
 	if (strlen(dash_input->dependencyID))
 		fprintf(dash_cfg->mpd, " dependencyId=\"%s\"", dash_input->dependencyID);
 	fprintf(dash_cfg->mpd, ">\n");
 
-	if (nb_channels && !is_bs_switching) 
-		fprintf(dash_cfg->mpd, "    <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels);
+	/* writing Representation level descriptors */
+	if (dash_input->nb_rep_descs) {
+		for (i=0; i<dash_input->nb_rep_descs; i++) {
+			fprintf(dash_cfg->mpd, "    %s\n", dash_input->rep_descs[i]);
+		}
+	}
 
+	if (nb_channels && !is_bs_switching)
+		fprintf(dash_cfg->mpd, "    <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels);
 
-	if (protected_track) {
-		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;
-			gf_isom_cenc_get_default_info(input, protected_track, 1, NULL, NULL, &default_KID);
-			fprintf(dash_cfg->mpd, "    <ContentProtection schemeIdUri=\"urn:mpeg:dash:mp4protection:2011\" value=\"%s\" cenc:default_KID=\"", gf_4cc_to_str(prot_scheme) );
-			/* Output canonical UIID form */
-			for (i=0; i<4; i++) fprintf(dash_cfg->mpd, "%02x", default_KID[i]);
-			fprintf(dash_cfg->mpd, "-");
-			for (i=4; i<6; i++) fprintf(dash_cfg->mpd, "%02x", default_KID[i]);
-			fprintf(dash_cfg->mpd, "-"); 
-			for (i=6; i<8; i++) fprintf(dash_cfg->mpd, "%02x", default_KID[i]);
-			fprintf(dash_cfg->mpd, "-");
-			for (i=8; i<10; i++) fprintf(dash_cfg->mpd, "%02x", default_KID[i]);
-			fprintf(dash_cfg->mpd, "-");
-			for (i=10; i<16; i++) fprintf(dash_cfg->mpd, "%02x", default_KID[i]);
-			fprintf(dash_cfg->mpd, "\"/>\n");
-		} 
-		//todo for ISMA or OMA DRM
+	/* Write content protection element in representation */
+	if (protected_track && dash_cfg->content_protection_in_rep) {
+		gf_isom_write_content_protection(input, dash_cfg->mpd, protected_track, 4);
 	}
 
 	if (dash_cfg->dash_ctx) {
@@ -1747,36 +1823,47 @@
 		if (dash_cfg->variable_seg_rad_name) {
 			const char *rad_name = gf_url_get_resource_name(seg_rad_name);
 			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, bandwidth, 0, dash_cfg->use_segment_timeline);
-			fprintf(dash_cfg->mpd, "    <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"%s\" startNumber=\"%d\"", mpd_timescale, (u32) (max_segment_duration * mpd_timescale), SegmentName, startNumber - startNumberRewind);	
+			fprintf(dash_cfg->mpd, "    <SegmentTemplate timescale=\"%d\" media=\"%s\" startNumber=\"%d\"", mpd_timescale, SegmentName, startNumber);
+			if (!dash_cfg->use_segment_timeline) {
+				if (!max_segment_duration)
+					max_segment_duration = dash_cfg->segment_duration;
+				fprintf(dash_cfg->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale));
+			}
 			if (!is_bs_switching) {
 				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
 				fprintf(dash_cfg->mpd, " initialization=\"%s\"", SegmentName);
 			}
-			if (presentationTimeOffset) 
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+			if (presentationTimeOffset)
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 			fprintf(dash_cfg->mpd, "/>\n");
 		}
 	} else if (dash_cfg->single_file_mode==1) {
-		fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );	
-		fprintf(dash_cfg->mpd, "    <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"", index_start_range, index_end_range);	
-		if (presentationTimeOffset) 
-			fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
-		fprintf(dash_cfg->mpd, "/>\n");	
+		fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );
+		fprintf(dash_cfg->mpd, "    <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"", index_start_range, index_end_range);
+		if (presentationTimeOffset)
+			fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+		if (!is_bs_switching) {
+			fprintf(dash_cfg->mpd, ">\n");
+			fprintf(dash_cfg->mpd, "      <Initialization range=\"%d-%d\"/>\n", 0, index_start_range-1);
+			fprintf(dash_cfg->mpd, "    </SegmentBase>\n");
+		} else {
+			fprintf(dash_cfg->mpd, "/>\n");
+		}
 	} else {
 		if (!seg_rad_name) {
-			fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );	
+			fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );
 		}
 		fprintf(dash_cfg->mpd, "    <SegmentList");
 		if (!mpd_timeline_bs) {
-			fprintf(dash_cfg->mpd, " timescale=\"%d\" duration=\"%d\"", mpd_timescale, (u32) (max_segment_duration * mpd_timescale));	
+			fprintf(dash_cfg->mpd, " timescale=\"%d\" duration=\"%d\"", mpd_timescale, (u32) (max_segment_duration * mpd_timescale));
 		}
 		if (presentationTimeOffset) {
-			fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+			fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 		}
-		fprintf(dash_cfg->mpd, ">\n");	
+		fprintf(dash_cfg->mpd, ">\n");
 		/*we are not in bitstreamSwitching mode*/
 		if (!is_bs_switching) {
-			fprintf(dash_cfg->mpd, "     <Initialization");	
+			fprintf(dash_cfg->mpd, "     <Initialization");
 			if (!seg_rad_name) {
 				fprintf(dash_cfg->mpd, " range=\"0-"LLD"\"", init_seg_size-1);
 			} else {
@@ -1847,7 +1934,10 @@
 	}
 
 err_exit:
-	if (fragmenters){
+	if (langCode) {
+		gf_free(langCode);
+	}
+	if (fragmenters) {
 		while (gf_list_count(fragmenters)) {
 			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
 			gf_free(tf);
@@ -1859,7 +1949,7 @@
 		if (e) gf_isom_delete(output);
 		else gf_isom_close(output);
 	}
-	if (!bs_switching_is_output && bs_switch_segment) 
+	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);
@@ -1885,12 +1975,12 @@
 		if (input->single_track_num && (input->single_track_num != i+1))
 			continue;
 
-		if (mtype == GF_ISOM_MEDIA_HINT) 
+		if (mtype == GF_ISOM_MEDIA_HINT)
 			continue;
-		
+
 		if (gf_isom_get_sample_count(in, i+1)<2)
 			continue;
-	
+
 		dur = (Double) gf_isom_get_track_duration(in, i+1);
 		dur /= gf_isom_get_timescale(in);
 		if (!dur) {
@@ -1901,20 +1991,20 @@
 
 		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 (mtype == GF_ISOM_MEDIA_VISUAL) {
 			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 2nd sample*/
 			input->components[input->nb_components].fps_denum = gf_isom_get_sample_duration(in, i+1, 2);
-
 		}
 		/*non-video tracks, get lang*/
 		else if (mtype == GF_ISOM_MEDIA_AUDIO) {
 			u8 bps;
 			gf_isom_get_audio_info(in, i+1, 1, &input->components[input->nb_components].sample_rate, &input->components[input->nb_components].channels, &bps);
 		}
-		gf_isom_get_media_language(in, i+1, input->components[input->nb_components].szLang);
 
 		input->nb_components++;
 	}
@@ -1925,36 +2015,54 @@
 {
 	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 valid_in_adaptation_set = 1;
-		Bool assign_to_group = 1;
+		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) 
+		if (dash_inputs[input_idx].period != dash_inputs[i].period)
 			continue;
-		
+
 		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
 			continue;
 
 		if (strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
 			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;
+
 		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 = 1;
+			Bool same_codec = GF_TRUE;
 			u32 track = gf_isom_get_track_by_id(in, gf_isom_get_track_id(set_file, j+1));
 
 			if (!track) {
-				valid_in_adaptation_set = 0;
-				assign_to_group = 0;
+				valid_in_adaptation_set = GF_FALSE;
+				assign_to_group = GF_FALSE;
 				break;
 			}
 
@@ -1967,48 +2075,52 @@
 
 			mtype = gf_isom_get_media_type(set_file, j+1);
 			if (mtype != gf_isom_get_media_type(in, track)) {
-				valid_in_adaptation_set = 0;
-				assign_to_group = 0;
+				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 = 0;
-			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_HVC1)
-				|| (msub_type==GF_ISOM_SUBTYPE_HEV1)
-				|| (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 = 1;
-					} else {
-						same_codec = 0;
-					}
-					if (dcd1) gf_odf_desc_del((GF_Descriptor *)dcd1);
-					if (dcd2) gf_odf_desc_del((GF_Descriptor *)dcd2);
+			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_HVC1)
+			        || (msub_type==GF_ISOM_SUBTYPE_HEV1)
+			        || (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 = 0;
+				valid_in_adaptation_set = GF_FALSE;
 				break;
 			}
 
 			if ((mtype!=GF_ISOM_MEDIA_VISUAL) && (mtype!=GF_ISOM_MEDIA_HINT)) {
-				char szLang1[4], szLang2[4];
-				szLang1[3] = szLang2[3] = 0;
-				gf_isom_get_media_language(set_file, j+1, szLang1);
-				gf_isom_get_media_language(in, track, szLang2);
-				if (stricmp(szLang1, szLang2)) {
-					valid_in_adaptation_set = 0;
+				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 (mtype==GF_ISOM_MEDIA_VISUAL) {
 				u32 w1, h1, w2, h2, sap_type;
@@ -2019,8 +2131,29 @@
 				gf_isom_get_track_layout_info(in, track, &w2, &h2, NULL, NULL, NULL);
 
 				if (h1*w2 != h2*w1) {
-					valid_in_adaptation_set = 0;
-					break;
+					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);
@@ -2056,9 +2189,17 @@
 	Bool use_avc3 = 0;
 	Bool use_hevc = 0;
 	Bool use_inband_param_set;
+	u32 probe_inband_param_set;
+	u32 first_track = 0;
 	Bool single_segment = (dash_opts->single_file_mode==1) ? 1 : 0;
-	GF_ISOFile *init_seg = gf_isom_open(szInitName, GF_ISOM_OPEN_WRITE, tmpdir);
+	GF_ISOFile *init_seg;
+
+
+	probe_inband_param_set = dash_opts->inband_param_set ? 1 : 0;
+
+restart_init:
 
+	init_seg = gf_isom_open(szInitName, GF_ISOM_OPEN_WRITE, tmpdir);
 	for (i=0; i<nb_dash_inputs; i++) {
 		u32 j;
 		GF_ISOFile *in;
@@ -2078,7 +2219,7 @@
 
 		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;
@@ -2105,7 +2246,7 @@
 					gf_isom_delete(in);
 					return e;
 				}
-
+retry_track:
 				/*if not the same sample desc we might need to clone it*/
 				if (! gf_isom_is_same_sample_description(in, j+1, 1, init_seg, track, 1)) {
 					u32 merge_mode = 1;
@@ -2114,29 +2255,34 @@
 					stype2 = gf_isom_get_media_subtype(init_seg, track, 1);
 					if (stype1 != stype2) merge_mode = 0;
 					switch (stype1) {
-						case GF_4CC( 'a', 'v', 'c', '1'):
-						case GF_4CC( 'a', 'v', 'c', '2'):
-							if (use_avc3) 
-								merge_mode = 2;
-							break;
-						case GF_4CC( 's', 'v', 'c', '1'):
-							break;
-						case GF_4CC( 'a', 'v', 'c', '3'):
-						case GF_4CC( 'a', 'v', 'c', '4'):
-							/*we don't want to clone SPS/PPS since they are already inside the samples*/
+					case GF_ISOM_SUBTYPE_AVC_H264:
+					case GF_ISOM_SUBTYPE_AVC2_H264:
+						if (use_avc3)
 							merge_mode = 2;
-							break;
-						case GF_4CC( 'h', 'v', 'c', '1'):
-							if (use_hevc) 
-								merge_mode = 2;
-							break;
-						case GF_4CC( 'h', 'e', 'v', '1'):
-							/*we don't want to clone SPS/PPS since they are already inside the samples*/
+						break;
+					case GF_ISOM_SUBTYPE_SVC_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:
+						if (use_hevc)
 							merge_mode = 2;
-							break;
-						default:
-							merge_mode = 0;
-							break;
+						break;
+					case GF_ISOM_SUBTYPE_HEV1:
+						/*we don't want to clone SPS/PPS since they are already inside the samples*/
+						merge_mode = 2;
+						break;
+					case GF_ISOM_SUBTYPE_SHC1:
+						break;
+					case GF_ISOM_SUBTYPE_SHV1:
+						merge_mode = 2;
+						break;
+					default:
+						merge_mode = 0;
+						break;
 					}
 					if (merge_mode==1) {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -2178,9 +2324,38 @@
 						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:
+							gf_isom_hevc_set_inband_config(init_seg, track, 1);
+							use_hevc = GF_TRUE;
+							gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
+							break;
+						case GF_ISOM_SUBTYPE_AVC_H264:
+						case GF_ISOM_SUBTYPE_AVC2_H264:
+						case GF_ISOM_SUBTYPE_SVC_H264:
+							gf_isom_avc_set_inband_config(init_seg, track, 1);
+							use_avc3 = GF_TRUE;
+							gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
+							break;
+						}
+						goto retry_track;
+					}
+
+
 					/*cannot merge, clone*/
-					if (merge_mode==0)
+					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 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess;
@@ -2190,31 +2365,46 @@
 				gf_isom_clone_track(in, j+1, init_seg, GF_FALSE, &track);
 
 				switch (gf_isom_get_media_subtype(in, j+1, 1)) {
-				case GF_4CC( 'a', 'v', 'c', '1'):
-				case GF_4CC( 'a', 'v', 'c', '2'):
-				case GF_4CC( 's', 'v', 'c', '1'):
-					if (use_inband_param_set) {
-						gf_isom_avc_set_inband_config(init_seg, track, 1);
-						use_avc3 = GF_TRUE;
+				case GF_ISOM_SUBTYPE_AVC_H264:
+				case GF_ISOM_SUBTYPE_AVC2_H264:
+				case GF_ISOM_SUBTYPE_SVC_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_4CC( 'h', 'v', 'c', '1'):
+				case GF_ISOM_SUBTYPE_HVC1:
+					//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:
+					probe_inband_param_set = 0;
+					break;
 				}
+				if (gf_isom_has_sync_points(in, j+1))
+					gf_isom_set_sync_table(init_seg, track);
 
 
-				gf_isom_get_fragment_defaults(in, j+1, &defaultDuration, &defaultSize, 
-										&defaultDescriptionIndex, &defaultRandomAccess, 
-										&defaultPadding, &defaultDegradationPriority);
+				gf_isom_get_fragment_defaults(in, j+1, &defaultDuration, &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, defaultDuration,
-							defaultSize, (u8) defaultRandomAccess,
-							defaultPadding, defaultDegradationPriority);
+				                                 defaultDescriptionIndex, defaultDuration,
+				                                 defaultSize, (u8) defaultRandomAccess,
+				                                 defaultPadding, defaultDegradationPriority);
 				if (e) break;
 			}
 		}
@@ -2251,6 +2441,15 @@
 		return GF_OK;
 	} else {
 		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 = 1;
+			}
+		}
 	}
 	return e;
 }
@@ -2262,6 +2461,7 @@
 	gf_isom_close(in);
 	return e;
 }
+
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 #ifndef GPAC_DISABLE_MPEG2TS
@@ -2285,7 +2485,7 @@
 		Bool valid_in_adaptation_set = GF_TRUE;
 		Bool assign_to_group = GF_TRUE;
 
-		if (dash_inputs[input_idx].period != dash_inputs[i].period) 
+		if (dash_inputs[input_idx].period != dash_inputs[i].period)
 			continue;
 
 		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
@@ -2300,14 +2500,14 @@
 		e = gf_media_import(&probe);
 		if (e) return e;
 
-		if (in.nb_progs != probe.nb_progs) valid_in_adaptation_set = 0;
-		if (in.nb_tracks != probe.nb_tracks) valid_in_adaptation_set = 0;
+		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++) {
+			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;
@@ -2387,8 +2587,9 @@
 		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)
-			strcpy(input->components[i].szLang, gf_4cc_to_str(in.tk_info[i].lang) );
+		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);
@@ -2408,7 +2609,7 @@
 	u64 file_size;
 	u32 bandwidth;
 	Bool has_seen_pat;
-	
+
 	u64 suspend_indexing;
 
 	/* For indexing the TS*/
@@ -2427,7 +2628,7 @@
 
 	u32 reference_pid;
 	GF_M2TS_PES *reference_stream;
-	
+
 	u32 nb_pes_in_segment;
 	/* earliest presentation time for the whole segment */
 	u64 first_PTS;
@@ -2503,8 +2704,8 @@
 
 } 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)
+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++;
@@ -2528,12 +2729,12 @@
 	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) 
+static void m2ts_sidx_flush_entry(GF_TSSegmenter *index_info)
 {
-	u32 end_offset, size, duration; 
+	u32 end_offset, size, duration;
 	Bool store_segment = 1;
 
-	if (index_info->suspend_indexing) 
+	if (index_info->suspend_indexing)
 		return;
 
 	if (index_info->skip_nb_segments) {
@@ -2547,7 +2748,7 @@
 		end_offset = index_info->last_pat_position;
 	} else {
 		/* split at PES header */
-		end_offset = index_info->last_offset; 
+		end_offset = index_info->last_offset;
 	}
 	size = (u32)(end_offset - index_info->base_offset);
 	duration = (u32)(index_info->last_PTS - index_info->base_PTS);
@@ -2563,14 +2764,14 @@
 			/* 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 */ 
+		/* 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, 0, size, duration, index_info->first_pes_sap, index_info->SAP_type, SAP_delta_time);
@@ -2583,10 +2784,10 @@
 		/* 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.: %.03f-%.03f / %.03f 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));
-			
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("           time-range adj.: %.03f-%.03f / %.03f 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;
@@ -2596,14 +2797,14 @@
 
 		/* Printing result */
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment:"));
-		//time-range:position-range: 
+		//time-range:position-range:
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" %.03f-%0.3f / %.03f 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));
+		                                        (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 @ %.03f sec. / %d bytes", (index_info->first_SAP_PTS - index_info->first_PTS)/90000.0, 
-				SAP_offset));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RAP @ %.03f 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)));
@@ -2641,7 +2842,7 @@
 	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;
 
@@ -2713,7 +2914,7 @@
 	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 
+		//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)
@@ -2726,9 +2927,9 @@
 	/* 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) 
+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;
@@ -2746,7 +2947,7 @@
 			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
 		}
 	}
-		break;
+	break;
 	case GF_M2TS_EVT_PMT_REPEAT:
 		if (ts_seg->has_seen_pat) {
 			u32 i, count;
@@ -2756,7 +2957,7 @@
 			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; 
+					GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
 					if (!pes->aud_sr && !pes->vid_w) {
 						done = 0;
 						break;
@@ -2789,7 +2990,7 @@
 	}
 }
 
-static void dash_m2ts_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+static void dash_m2ts_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
 {
 	GF_M2TS_Program *prog;
 	GF_M2TS_PES_PCK *pck;
@@ -2888,11 +3089,11 @@
 		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; 
+			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;
+			        && (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);
@@ -3041,7 +3242,7 @@
 #define NB_TSPCK_IO_BYTES 18800
 
 static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
-{	
+{
 	GF_TSSegmenter ts_seg;
 	Bool rewrite_input = 0;
 	u8 is_pes[GF_M2TS_MAX_STREAMS];
@@ -3050,7 +3251,7 @@
 	char szSectionName[100], szRepURLsSecName[100];
 	char szCodecs[100];
 	const char *opt;
-	u32 i, startNumberRewind;
+	u32 i;
 	GF_Err e;
 	u64 start, pcr_shift, next_pcr_shift;
 	Double cumulated_duration = 0;
@@ -3062,23 +3263,22 @@
 	/*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 = dash_cfg->segment_duration;
 	ts_seg.segment_at_rap = dash_cfg->segments_start_with_rap;
 
-	ts_seg.bandwidth = (u32) (ts_seg.file_size * 8 / dash_input->duration);	
+	ts_seg.bandwidth = (u32) (ts_seg.file_size * 8 / dash_input->duration);
 
 	/*create bitstreams*/
 
 	segment_index = 1;
-	startNumberRewind = 0;
 	ts_seg.index_file = NULL;
 	ts_seg.index_bs = NULL;
 	if (!dash_cfg->dash_ctx && (dash_cfg->use_url_template != 2)) {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		GF_SegmentTypeBox *styp;
 
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, szOutName, dash_input->representationID, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);	
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, szOutName, dash_input->representationID, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
 
 		ts_seg.index_file = gf_f64_open(IdxName, "wb");
 		if (!ts_seg.index_file) {
@@ -3100,7 +3300,7 @@
 #endif
 	}
 
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, basename, dash_input->representationID, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);	
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, basename, dash_input->representationID, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
 
 	ts_seg.PCR_DTS_initial_diff = (u64) -1;
 	ts_seg.subduration = (u32) (dash_cfg->subduration * 90000);
@@ -3156,7 +3356,7 @@
 	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, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, 0, 0, dash_cfg->use_segment_timeline);	
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, 0, 0, dash_cfg->use_segment_timeline);
 
 
 	memset(is_pes, 0, sizeof(u8)*GF_M2TS_MAX_STREAMS);
@@ -3183,12 +3383,6 @@
 			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "StartIndex");
 			if (opt) sscanf(opt, "%u", &segment_index);
 
-			/*adjust the startNumber according to the timeShiftBuffer depth*/
-			if ((dash_cfg->time_shift_depth>0) && (segment_index > (u32)dash_cfg->time_shift_depth) ) {
-				startNumberRewind = dash_cfg->time_shift_depth;
-			}
-
-
 			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "PCR90kOffset");
 			if (opt) sscanf(opt, LLU, &pcr_shift);
 
@@ -3200,11 +3394,11 @@
 	/*write segment template for all representations*/
 	if (first_in_set && dash_cfg->seg_rad_name && dash_cfg->use_url_template && !dash_cfg->variable_seg_rad_name) {
 		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-		fprintf(dash_cfg->mpd, "   <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index - startNumberRewind, SegName); 
+		fprintf(dash_cfg->mpd, "   <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index, SegName);
 		if (!dash_cfg->dash_ctx) {
 			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-			fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName); 
-		} 
+			fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName);
+		}
 		fprintf(dash_cfg->mpd, "/>\n");
 	}
 
@@ -3212,15 +3406,15 @@
 	fprintf(dash_cfg->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(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(dash_cfg->mpd, " width=\"%d\" height=\"%d\"", dash_input->components[i].width, dash_input->components[i].height);
+		if (dash_input->components[i].width && dash_input->components[i].height)
+			fprintf(dash_cfg->mpd, " width=\"%u\" height=\"%u\"", dash_input->components[i].width, dash_input->components[i].height);
 
-		if (dash_input->components[i].sample_rate) 
+		if (dash_input->components[i].sample_rate)
 			fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", dash_input->components[i].sample_rate);
 	}
 	if (strlen(szCodecs))
@@ -3230,6 +3424,12 @@
 	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);
 	fprintf(dash_cfg->mpd, ">\n");
 
+	/* writing Representation level descriptors */
+	if (dash_input->nb_rep_descs) {
+		for (i=0; i<dash_input->nb_rep_descs; i++) {
+			fprintf(dash_cfg->mpd, "    %s\n", dash_input->rep_descs[i]);
+		}
+	}
 
 	if (dash_cfg->single_file_mode==1) {
 		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
@@ -3245,30 +3445,30 @@
 		if (dash_cfg->seg_rad_name && dash_cfg->use_url_template) {
 			if (dash_cfg->variable_seg_rad_name) {
 				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-				fprintf(dash_cfg->mpd, "    <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index, SegName); 
+				fprintf(dash_cfg->mpd, "    <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index, SegName);
 				if (!dash_cfg->dash_ctx) {
 					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-					fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName); 
+					fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName);
 				}
 
-				if (dash_cfg->time_shift_depth>=0) 
-					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", ts_seg.sidx->earliest_presentation_time + pcr_shift); 
-				fprintf(dash_cfg->mpd, "/>\n"); 
+				if (dash_cfg->time_shift_depth>=0)
+					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", ts_seg.sidx->earliest_presentation_time + pcr_shift);
+				fprintf(dash_cfg->mpd, "/>\n");
 			} else if (dash_cfg->time_shift_depth>=0) {
-				fprintf(dash_cfg->mpd, "    <SegmentTemplate presentationTimeOffset=\""LLD"\"/>\n", ts_seg.sidx->earliest_presentation_time + pcr_shift); 
+				fprintf(dash_cfg->mpd, "    <SegmentTemplate presentationTimeOffset=\""LLD"\"/>\n", ts_seg.sidx->earliest_presentation_time + pcr_shift);
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH]: PTSOffset "LLD" - startNumber %d - time %g\n", ts_seg.sidx->earliest_presentation_time + pcr_shift, 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, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 			if (dash_cfg->single_file_mode)
 				fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n",SegName);
-			fprintf(dash_cfg->mpd, "    <SegmentList timescale=\"90000\" duration=\"%d\"", (u32) (90000*dash_cfg->segment_duration)); 
-			if (dash_cfg->time_shift_depth>=0) 
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", ts_seg.sidx->earliest_presentation_time + pcr_shift); 
-			fprintf(dash_cfg->mpd, ">\n"); 
+			fprintf(dash_cfg->mpd, "    <SegmentList timescale=\"90000\" duration=\"%d\"", (u32) (90000*dash_cfg->segment_duration));
+			if (dash_cfg->time_shift_depth>=0)
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", ts_seg.sidx->earliest_presentation_time + pcr_shift);
+			fprintf(dash_cfg->mpd, ">\n");
 
 			if (!dash_cfg->dash_ctx) {
-				fprintf(dash_cfg->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName); 
+				fprintf(dash_cfg->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
 			}
 		}
 
@@ -3281,7 +3481,7 @@
 			for (i=0; i<count; i++) {
 				const char *key_name = gf_cfg_get_key_name(dash_cfg->dash_ctx, szRepURLsSecName, i);
 				opt = gf_cfg_get_key(dash_cfg->dash_ctx, szRepURLsSecName, key_name);
-				fprintf(dash_cfg->mpd, "     %s\n", opt);	
+				fprintf(dash_cfg->mpd, "     %s\n", opt);
 			}
 		}
 
@@ -3307,7 +3507,7 @@
 
 				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, szOutName, dash_input->representationID, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 
-				/*warning - we may introduce repeated sequence number when concatenating files. We should use switching 
+				/*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 (dash_cfg->use_url_template != 2) {
 					dst = gf_f64_open(SegName, "wb");
@@ -3364,7 +3564,7 @@
 			}
 			fclose(src);
 			cumulated_duration = current_time;
-		}	
+		}
 		if (!dash_cfg->seg_rad_name || !dash_cfg->use_url_template) {
 			fprintf(dash_cfg->mpd, "    </SegmentList>\n");
 		}
@@ -3416,7 +3616,7 @@
 
 		sprintf(szOpt, LLU, ts_seg.suspend_indexing);
 		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "ByteOffset", ts_seg.suspend_indexing ? szOpt : NULL);
-		
+
 		sprintf(szOpt, LLD, ts_seg.duration_at_last_pass);
 		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "DurationAtLastPass", ts_seg.suspend_indexing ? szOpt : NULL);
 
@@ -3466,7 +3666,7 @@
 	GF_DashSegInput *dash_input = & dash_inputs[idx];
 	char *uri_frag = strchr(dash_input->file_name, '#');
 	FILE *t = gf_f64_open(dash_input->file_name, "rb");
-	
+
 	if (uri_frag) uri_frag[0] = 0;
 
 	t = gf_f64_open(dash_input->file_name, "rb");
@@ -3477,7 +3677,7 @@
 	if (gf_isom_probe_file(dash_input->file_name)) {
 		GF_ISOFile *file;
 		u32 nb_track, j, max_nb_deps, cur_idx, rep_idx;
-				
+
 		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;
@@ -3488,14 +3688,14 @@
 		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: let it be*/
+		/*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_has_scalable_layer(file)) {
 
 			if (uri_frag) {
 				u32 id = 0;
-				if (!strnicmp(uri_frag+1, "trackID=", 8)) 
+				if (!strnicmp(uri_frag+1, "trackID=", 8))
 					id = atoi(uri_frag+9);
-				else if (!strnicmp(uri_frag+1, "ID=", 3)) 
+				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") ? 1 : 0;
@@ -3524,10 +3724,13 @@
 
 		max_nb_deps = 0;
 		for (j = 0; j < nb_track; j++) {
+			//check scalability
 			if (gf_isom_get_media_type(file, j+1)==GF_ISOM_MEDIA_VISUAL) {
-				u32 count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_SCAL);
-				if (count)
+				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) {
 					max_nb_deps ++;
+				}
 			}
 		}
 		//scalable input file, realloc
@@ -3542,16 +3745,17 @@
 		rep_idx = 1;
 		cur_idx = idx+1;
 
+		//create dash inputs
 		for (j = 0; j < nb_track; j++) {
 			GF_DashSegInput *di;
-			u32 count, t, ref_track;
-			count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_SCAL);
-			/*base track, done above*/
+			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) {
 				dash_input->trackNum = j+1;
 				continue;
 			}
 
+
 			di = &dash_inputs [cur_idx];
 			*nb_dash_inputs += 1;
 			cur_idx++;
@@ -3564,18 +3768,36 @@
 
 			di->protection_scheme_type = gf_isom_is_media_encrypted(file, di->trackNum, 1);
 
-			/*dependencyID - FIXME - the delaration of dependency and new dash_input entries should be in DEDENDENCY ORDER*/
 			di->idx_representations = rep_idx;
 			rep_idx ++;
-			sprintf(di->dependencyID, "%s", dash_input->representationID); //base track
+
+			if (gf_isom_get_reference_count(file, di->trackNum, GF_ISOM_REF_TBAS)) {
+				u32 default_sample_group_index, id, independent;
+				Bool full_frame;
+				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);
+			}
+		}
+
+
+		/*dependencyID - FIXME - the delaration of dependency and new dash_input entries should be in DEDENDENCY ORDER*/
+		for (j = idx; j < *nb_dash_inputs; j++) {
+			GF_DashSegInput *di;
+			u32 count, t, ref_track;
+
+			di = &dash_inputs[j];
+			count = gf_isom_get_reference_count(file, di->trackNum, GF_ISOM_REF_SCAL);
+			if (!count) continue;
+
 			di->lower_layer_track = dash_input->trackNum;
-			for (t = 1; t < count; t++) {
-				gf_isom_get_reference(file, j+1, GF_ISOM_REF_SCAL, t+1, &ref_track);
-				if (j) strcat(di->dependencyID, " ");
+			strcpy(di->dependencyID, "");
+			for (t=0; t < count; t++) {
+				gf_isom_get_reference(file, di->trackNum, GF_ISOM_REF_SCAL, t+1, &ref_track);
+				if (t) strcat(di->dependencyID, " ");
 				strcat(di->dependencyID, gf_dash_get_representationID(dash_inputs, *nb_dash_inputs, di->file_name, ref_track));
 
 				di->lower_layer_track = ref_track;
-			}		
+			}
+
 		}
 		gf_isom_close(file);
 		return GF_OK;
@@ -3626,7 +3848,7 @@
 
 	gf_net_get_ntp(&sec, &frac);
 	sec += ast_shift_sec;
-	
+
 	fprintf(mpd, "<?xml version=\"1.0\"?>\n");
 	fprintf(mpd, "\n");
 
 	/*TODO what should we put for minBufferTime */
-	fprintf(mpd, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" minBufferTime=\"PT%fS\" type=\"%s\"", min_buffer, dash_dynamic ? "dynamic" : "static"); 
+	fprintf(mpd, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" minBufferTime=\"PT%fS\" type=\"%s\"", min_buffer, dash_dynamic ? "dynamic" : "static");
 	if (dash_dynamic) {
-		/*otherwise timeshift is infinite, use original availability start time*/
-		if ((s32)time_shift_depth<0) {
+		if (dash_ctx) {
+			//we only support profiles for which AST has to be the same
 			const char *opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
 			sscanf(opt, "%u", &sec);
 			sec += ast_shift_sec;
 		}
+
 #ifdef _WIN32_WCE
 		*(LONGLONG *) &filet = (sec - GF_NTP_SEC_1900_TO_1970) * 10000000 + TIMESPEC_TO_FILETIME_OFFSET;
 		FileTimeToSystemTime(&filet, &syst);
@@ -3677,7 +3900,7 @@
 			s = mpd_update_period - h*3600 - m*60;
 			fprintf(mpd, " minimumUpdatePeriod=\"PT%dH%dM%.2fS\"", h, m, s);
 		}
-		
+
 	} else {
 		h = (u32) (mpd_duration/3600);
 		m = (u32) (mpd_duration/60 - h*60);
@@ -3696,7 +3919,7 @@
 	} else if (profile==GF_DASH_PROFILE_AVC264_ONDEMAND) {
 		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011, http://dashif.org/guildelines/dash264\"");
 	} else {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:full:2011\"");	
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:full:2011\"");
 	}
 	if (use_cenc) {
 		fprintf(mpd, " xmlns:cenc=\"urn:mpeg:cenc:2013\"");
@@ -3707,13 +3930,13 @@
 
 	fprintf(mpd, ">\n");
 
-	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", moreInfoURL ? moreInfoURL : "http://gpac.sourceforge.net");	
-	if (title) 
+	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", moreInfoURL ? moreInfoURL : "http://gpac.sourceforge.net");
+	if (title)
 		fprintf(mpd, "  <Title>%s</Title>\n", title);
-	else 
+	else
 		fprintf(mpd, "  <Title>%s generated by GPAC</Title>\n", mpd_name);
 
-	if (source) 
+	if (source)
 		fprintf(mpd, "  <Source>%s</Source>\n", source);
 	if (copyright)
 		fprintf(mpd, "  <Copyright>%s</Copyright>\n", copyright);
@@ -3726,36 +3949,53 @@
 	return GF_OK;
 }
 
-static GF_Err write_period_header(FILE *mpd, const char *szID, Double period_start, Double period_duration, Bool dash_dynamic, const char *xlink)
+static GF_Err write_period_header(FILE *mpd, const char *szID, Double period_start, Double period_duration,
+                                  Bool dash_dynamic, const char *xlink,
+                                  GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 period_num)
 {
 	u32 h, m;
 	Double s;
+	u32 i,j;
 
 	fprintf(mpd, " <Period");
-	if (szID) 
+	if (szID && strlen(szID))
 		fprintf(mpd, " id=\"%s\"", szID);
-	
+
 	if (period_start || dash_dynamic) {
 		h = (u32) (period_start/3600);
 		m = (u32) (period_start/60 - h*60);
 		s = period_start - h*3600 - m*60;
-		fprintf(mpd, " start=\"PT%dH%dM%.2fS\"", h, m, s);	
+		fprintf(mpd, " start=\"PT%dH%dM%.2fS\"", h, m, s);
 	}
 	if (!dash_dynamic && period_duration) {
 		h = (u32) (period_duration/3600);
 		m = (u32) (period_duration/60 - h*60);
 		s = period_duration - h*3600 - m*60;
-		fprintf(mpd, " duration=\"PT%dH%dM%.2fS\"", h, m, s);	
+		fprintf(mpd, " duration=\"PT%dH%dM%.2fS\"", h, m, s);
 	}
 	if (xlink) {
-		fprintf(mpd, " xlink:href=\"%s\"", xlink);	
+		fprintf(mpd, " xlink:href=\"%s\"", xlink);
+	}
+	fprintf(mpd, ">\n");
+
+	/* writing Period level descriptors */
+	for (i=0; i< nb_dash_inputs; i++) {
+		if (dash_inputs[i].adaptation_set && (dash_inputs[i].period==period_num)) {
+			for (j = 0; j < dash_inputs[i].nb_p_descs; j++) {
+				fprintf(mpd, "  %s\n", dash_inputs[i].p_descs[j]);
+			}
+		}
 	}
-	fprintf(mpd, ">\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 *first_rep, Bool bitstream_switching_mode, u32 max_width, u32 max_height, char *szMaxFPS, char *szLang, const char *szInitSegment)
+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,
+                                      Bool bitstream_switching_mode, u32 max_width, u32 max_height, char *szMaxFPS, char *szLang, const char *szInitSegment)
 {
+	u32 i, j;
+	GF_DashSegInput *first_rep = &dash_inputs[first_rep_in_set];
 	fprintf(mpd, "  <AdaptationSet segmentAlignment=\"true\"");
 	if (bitstream_switching_mode) {
 		fprintf(mpd, " bitstreamSwitching=\"true\"");
@@ -3770,20 +4010,33 @@
 		gf_media_reduce_aspect_ratio(&max_width, &max_height);
 		fprintf(mpd, " par=\"%d:%d\"", max_width, max_height);
 	}
-	if (szLang && szLang[0]) {
+	if (szLang && strcmp(szLang, "und")) {
 		fprintf(mpd, " lang=\"%s\"", szLang);
 	}
 	/*this should be fixed to use info collected during segmentation process*/
-	if (profile==GF_DASH_PROFILE_ONDEMAND) 
+	if (profile==GF_DASH_PROFILE_ONDEMAND)
 		fprintf(mpd, " subsegmentStartsWithSAP=\"1\"");
 
 	if (!strcmp(first_rep->szMime, "video/mp2t"))
 		fprintf(mpd, " subsegmentAlignment=\"true\"");
 
 	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++) {
+				fprintf(mpd, "   %s\n", dash_inputs[i].as_c_descs[j]);
+			}
+		}
+	}
+
 	if (first_rep) {
-		u32 i;
+
+		/* writing AdaptationSet level descriptors specified only all inputs for that AdaptationSet*/
+		for (i=0; i<first_rep->nb_as_descs; i++) {
+			fprintf(mpd, "   %s\n", first_rep->as_descs[i]);
+		}
 
 		if (bitstream_switching_mode) {
 			for (i=0; i<first_rep->nb_components; i++) {
@@ -3797,16 +4050,15 @@
 		/*set role*/
 		if (strlen(first_rep->role)) {
 			if (!strcmp(first_rep->role, "caption") || !strcmp(first_rep->role, "subtitle") || !strcmp(first_rep->role, "main")
-				 || !strcmp(first_rep->role, "alternate") || !strcmp(first_rep->role, "supplementary") || !strcmp(first_rep->role, "commentary")
-				 || !strcmp(first_rep->role, "dub")
-			) {
+			        || !strcmp(first_rep->role, "alternate") || !strcmp(first_rep->role, "supplementary") || !strcmp(first_rep->role, "commentary")
+			        || !strcmp(first_rep->role, "dub")
+			   ) {
 				fprintf(mpd, "   <Role schemeIdUri=\"urn:mpeg:dash:role:2011\" value=\"%s\"/>\n", first_rep->role);
 			} else {
 				fprintf(mpd, "   <Role schemeIdUri=\"urn:gpac:dash:role:2013\" value=\"%s\"/>\n", first_rep->role);
 			}
 		}
 
-
 		if (first_rep->nb_components>1) {
 			for (i=0; i<first_rep->nb_components; i++) {
 				struct _dash_component *comp = &first_rep->components[i];
@@ -3829,17 +4081,17 @@
 					break;
 				}
 				/*if lang not specified at adaptationSet level, put it here*/
-				if ((!szLang || !szLang[0]) && comp->szLang[0]) {
-					fprintf(mpd, " lang=\"%s\"", comp->szLang);
+				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_url_get_resource_name( szInitSegment ));	
-			fprintf(mpd, "   </SegmentList>\n");	
+			fprintf(mpd, "   <SegmentList>\n");
+			fprintf(mpd, "    <Initialization sourceURL=\"%s\"/>\n", gf_url_get_resource_name( szInitSegment ));
+			fprintf(mpd, "   </SegmentList>\n");
 		}
 	}
 	return GF_OK;
@@ -3856,7 +4108,7 @@
 #endif
 
 	if (!dash_ctx) return GF_BAD_PARAM;
-	
+
 	opt = gf_cfg_get_key(dash_ctx, "DASH", "SessionType");
 	/*first run, init all options*/
 	if (!opt) {
@@ -3865,17 +4117,22 @@
 		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", (*dynamic==2) ? "dynamic-debug" : ( *dynamic ? "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 (! (*dynamic) && !strncmp(opt, "dynamic", 7)) {
+		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", "static");
 	} else {
 		*dynamic = 0;
 		if (!strcmp(opt, "dynamic")) *dynamic = 1;
 		else if (!strcmp(opt, "dynamic-debug")) *dynamic = 2;
+
 		opt = gf_cfg_get_key(dash_ctx, "DASH", "TimeShiftBufferDepth");
 		*timeShiftBufferDepth = atoi(opt);
 		gf_cfg_set_key(dash_ctx, "DASH", "StoreParams", "no");
 	}
 
 	gf_cfg_set_key(dash_ctx, "DASH", "PeriodSwitch", "no");
-	
+
 	gf_net_get_ntp(&sec, &frac);
 
 	if (first_run) {
@@ -3887,7 +4144,7 @@
 		gf_cfg_set_key(dash_ctx, "DASH", "GenerationNTP", szVal);
 		sprintf(szVal, "%u", frac);
 		gf_cfg_set_key(dash_ctx, "DASH", "GenerationNTPFraction", szVal);
-	
+
 		if (periodID)
 			gf_cfg_set_key(dash_ctx, "DASH", "PeriodID", periodID);
 	} else {
@@ -4014,7 +4271,7 @@
 			u32 j;
 			const char *fileName = gf_cfg_get_key_name(dash_ctx, "SegmentsStartTimes", i);
 			const char *MPDTime = gf_cfg_get_key(dash_ctx, "SegmentsStartTimes", fileName);
-			if (!fileName) 
+			if (!fileName)
 				break;
 
 			seg_time = atof(MPDTime);
@@ -4112,7 +4369,7 @@
 		if (!opt) continue;
 		if( !strnicmp(opt, "Representation_", 15) || !strcmp(opt, "SegmentsStartTimes")) {
 			gf_cfg_del_section(dash_ctx, opt);
-			count--; 
+			count--;
 			i--;
 		}
 	}
@@ -4120,16 +4377,16 @@
 
 /*dash segmenter*/
 GF_EXPORT
-GF_Err gf_dasher_segment_files(const char *mpdfile, GF_DashSegmenterInput *inputs, u32 nb_inputs, GF_DashProfile dash_profile, 
-							   const char *mpd_title, const char *mpd_source, const char *mpd_copyright,
-							   const char *mpd_moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls, 
-							   u32 use_url_template, Bool use_segment_timeline,  Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching, 
-							   Bool seg_at_rap, Double dash_duration, char *seg_name, char *seg_ext, u32 segment_marker_4cc,
-							   Double frag_duration, s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool frag_at_rap, const char *tmpdir,
-							   GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double subduration, Double min_buffer, 
-							   u32 ast_shift_sec, u32 dash_scale, Bool fragments_in_memory, u32 initial_moof_sn, u64 initial_tfdt, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf)
+GF_Err gf_dasher_segment_files(const char *mpdfile, GF_DashSegmenterInput *inputs, u32 nb_inputs, GF_DashProfile dash_profile,
+                               const char *mpd_title, const char *mpd_source, const char *mpd_copyright,
+                               const char *mpd_moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls,
+                               u32 use_url_template, Bool use_segment_timeline,  Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching,
+                               Bool seg_at_rap, Double dash_duration, char *seg_name, char *seg_ext, u32 segment_marker_4cc,
+                               Double frag_duration, s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool frag_at_rap, const char *tmpdir,
+                               GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double subduration, Double min_buffer,
+                               u32 ast_shift_sec, u32 dash_scale, Bool fragments_in_memory, u32 initial_moof_sn, u64 initial_tfdt, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf, Bool single_traf_per_moof)
 {
-	u32 i, j, segment_mode;
+	u32 i, j, k, segment_mode;
 	char *sep, szSegName[GF_MAX_PATH], szSolvedSegName[GF_MAX_PATH], szTempMPD[GF_MAX_PATH], szOpt[GF_MAX_PATH];
 	char szPeriodXML[GF_MAX_PATH];
 	const char *opt;
@@ -4144,6 +4401,7 @@
 	Bool none_supported = GF_TRUE;
 	Bool has_mpeg2 = GF_FALSE;
 	Bool has_role = GF_FALSE;
+	Bool content_protection_in_rep = GF_TRUE; /*if not in rep, then in the adptation set*/
 	Double presentation_duration = 0;
 	Double active_period_start = 0;
 	GF_Err e = GF_OK;
@@ -4162,11 +4420,11 @@
 			const char *opt = gf_cfg_get_key(dash_ctx, "DASH", "MaxSegmentDuration");
 			if (opt) {
 				Double seg_dur = atof(opt);
-/*
-				if (seg_dur != dash_duration) {
-					return GF_NOT_SUPPORTED;
-				}
-*/
+				/*
+								if (seg_dur != dash_duration) {
+									return GF_NOT_SUPPORTED;
+								}
+				*/
 				dash_duration = seg_dur;
 			} else {
 				char sOpt[100];
@@ -4198,6 +4456,26 @@
 		strcpy(dash_inputs[j].xlink, inputs[i].xlink);
 		if (strlen(dash_inputs[j].xlink)) uses_xlink = GF_TRUE;
 		strcpy(dash_inputs[j].role, inputs[i].role);
+		dash_inputs[j].nb_rep_descs = inputs[i].nb_rep_descs;
+		dash_inputs[j].rep_descs = (char **)gf_malloc(dash_inputs[j].nb_rep_descs*sizeof(char *));
+		for (k = 0; k < dash_inputs[j].nb_rep_descs; k++) {
+			dash_inputs[j].rep_descs[k] = inputs[i].rep_descs[k];
+		}
+		dash_inputs[j].nb_as_descs = inputs[i].nb_as_descs;
+		dash_inputs[j].as_descs = (char **)gf_malloc(dash_inputs[j].nb_as_descs*sizeof(char *));
+		for (k = 0; k < dash_inputs[j].nb_as_descs; k++) {
+			dash_inputs[j].as_descs[k] = inputs[i].as_descs[k];
+		}
+		dash_inputs[j].nb_as_c_descs = inputs[i].nb_as_c_descs;
+		dash_inputs[j].as_c_descs = (char **)gf_malloc(dash_inputs[j].nb_as_c_descs*sizeof(char *));
+		for (k = 0; k < dash_inputs[j].nb_as_c_descs; k++) {
+			dash_inputs[j].as_c_descs[k] = inputs[i].as_c_descs[k];
+		}
+		dash_inputs[j].nb_p_descs = inputs[i].nb_p_descs;
+		dash_inputs[j].p_descs = (char **)gf_malloc(dash_inputs[j].nb_p_descs*sizeof(char *));
+		for (k = 0; k < dash_inputs[j].nb_p_descs; k++) {
+			dash_inputs[j].p_descs[k] = inputs[i].p_descs[k];
+		}
 		dash_inputs[j].bandwidth = inputs[i].bandwidth;
 
 		if (strlen(inputs[i].role) && strcmp(inputs[i].role, "main"))
@@ -4206,7 +4484,8 @@
 		if (!strlen(dash_inputs[j].periodID)) {
 			max_period = 1;
 			dash_inputs[j].period = 1;
-			if (dash_dynamic) {
+			//assign ID if dynamic - if dash_ctx also assign ID since we could have moved from dynamic to static
+			if (dash_dynamic || dash_ctx) {
 				strcpy(dash_inputs[j].periodID, "GENID_DEF");
 			}
 		}
@@ -4222,7 +4501,7 @@
 		if (!strcmp(dash_inputs[j].szMime, "video/mp2t")) has_mpeg2 = 1;
 
 		j += 1+nb_diff;
- 	}
+	}
 	if (!j) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: no suitable file found for dashing.\n"));
 		e = GF_BAD_PARAM;
@@ -4240,7 +4519,7 @@
 	}
 
 	for (i=0; i<nb_dash_inputs; i++) {
-		if (dash_inputs[i].period) 
+		if (dash_inputs[i].period)
 			continue;
 		if (strlen(dash_inputs[i].periodID)) {
 			max_period++;
@@ -4263,7 +4542,7 @@
 		for (i=0; i<nb_dash_inputs; i++) {
 			/*this file does not belong to our current period*/
 			if (dash_inputs[i].period != cur_period+1) continue;
-			
+
 			/*this file already belongs to an adaptation set*/
 			if (dash_inputs[i].adaptation_set) continue;
 
@@ -4317,10 +4596,15 @@
 		break;
 	case GF_DASH_PROFILE_AVC264_LIVE:
 		seg_at_rap = 1;
+		no_fragments_defaults = 1;
 		use_url_template = 1;
 		single_segment = single_file = 0;
+		content_protection_in_rep = GF_FALSE;
 		break;
 	case GF_DASH_PROFILE_AVC264_ONDEMAND:
+		seg_at_rap = 1;
+		no_fragments_defaults = 1;
+		content_protection_in_rep = GF_FALSE;
 		if (seg_name) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment-name not allowed in DASH-AVC/264 onDemand profile.\n"));
 			e = GF_NOT_SUPPORTED;
@@ -4383,6 +4667,9 @@
 	dash_opts.memory_mode = fragments_in_memory;
 	dash_opts.pssh_moof = pssh_moof;
 	dash_opts.samplegroups_in_traf = samplegroups_in_traf;
+	dash_opts.single_traf_per_moof = single_traf_per_moof;
+	dash_opts.content_protection_in_rep = content_protection_in_rep;
+
 
 	dash_opts.segment_duration = dash_duration * 1000 / dash_scale;
 	dash_opts.subduration = subduration * 1000 / dash_scale;
@@ -4390,7 +4677,7 @@
 	dash_opts.initial_moof_sn = initial_moof_sn;
 	dash_opts.initial_tfdt = initial_tfdt;
 	dash_opts.no_fragments_defaults = no_fragments_defaults;
-	
+
 
 	for (cur_period=0; cur_period<max_period; cur_period++) {
 		u32 first_in_period = 0;
@@ -4448,9 +4735,9 @@
 			if (opt) last_period_dur = atof(opt);
 			presentation_duration += last_period_dur;
 
-			//we may have called the segmenter with the end of the previous active period and the start of the new one - locate the 
+			//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<nb_dash_inputs; i++) {
+			for (i=0; i<nb_dash_inputs; i++) {
 				char *p_id = dash_inputs[i].periodID;
 				if (!p_id) p_id = "";
 				if (!strcmp(p_id, prev_id)) {
@@ -4474,7 +4761,7 @@
 			if (! prev_period_not_done) {
 				sprintf(szOpt, "%g", presentation_duration - last_period_dur);
 				gf_cfg_set_key(dash_ctx, "PastPeriods", prev_id, szOpt);
-		
+
 				//update active period start
 				sprintf(szOpt, "%g", active_period_start);
 				gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
@@ -4505,7 +4792,7 @@
 
 	strcpy(szTempMPD, mpdfile);
 	if (dash_dynamic) strcat(szTempMPD, ".tmp");
-	
+
 	mpd = gf_f64_open(szTempMPD, "wt");
 	if (!mpd) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MPD] Cannot open MPD file %s for writing\n", szTempMPD));
@@ -4546,7 +4833,7 @@
 		const char *id=NULL;
 		const char *xlink = NULL;
 
-		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
+		/* Find period information for this period */
 		for (i=0; i< nb_dash_inputs; i++) {
 			if (dash_inputs[i].adaptation_set && (dash_inputs[i].period==cur_period+1)) {
 				period_duration = dash_inputs[i].period_duration;
@@ -4567,7 +4854,7 @@
 		period_mpd = gf_f64_open(szPeriodXML, "wb");
 		dash_opts.mpd = period_mpd;
 
-		e = write_period_header(period_mpd, id, 0.0, period_duration, dash_dynamic, NULL);
+		e = write_period_header(period_mpd, id, 0.0, period_duration, dash_dynamic, NULL, dash_inputs, nb_dash_inputs, cur_period+1);
 		if (e) goto exit;
 
 
@@ -4580,7 +4867,7 @@
 			u32 fps_num = 0;
 			u32 fps_denum = 0;
 			Bool use_bs_switching = bitstream_switching ? 1 : 0;
-			char szLang[4];
+			char *lang;
 			char szFPS[100];
 			Bool is_first_rep=0;
 			Bool skip_init_segment_creation = 0;
@@ -4635,7 +4922,7 @@
 			dash_opts.use_url_template = seg_name ? use_url_template : 0;
 
 			szFPS[0] = 0;
-			szLang[0] = 0;
+			lang = NULL;
 			/*compute some max defaults*/
 			for (i=0; i<nb_dash_inputs && !e; i++) {
 
@@ -4643,9 +4930,9 @@
 					continue;
 
 				for (j=0; j<dash_inputs[i].nb_components; j++) {
-					if (dash_inputs[i].components[j].width > max_width) 
+					if (dash_inputs[i].components[j].width > max_width)
 						max_width = dash_inputs[i].components[j].width;
-					if (dash_inputs[i].components[j].height > max_height) 
+					if (dash_inputs[i].components[j].height > max_height)
 						max_height = dash_inputs[i].components[j].height;
 
 					if (! fps_num || !fps_denum) {
@@ -4656,12 +4943,12 @@
 						fps_num = dash_inputs[i].components[j].fps_num;
 						fps_denum = dash_inputs[i].components[j].fps_denum;
 					}
-					
-					if (dash_inputs[i].components[j].szLang && dash_inputs[i].components[j].szLang[0] && strncmp(dash_inputs[i].components[j].szLang, dash_inputs[i].components[j].szLang, 3) ) {
-						if (szLang[0]) {
-							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] two languages in adaptation set: %s will be kept %s will be ignored\n", szLang, dash_inputs[i].components[j].szLang));
-						} else {
-							memcpy(szLang, dash_inputs[i].components[j].szLang, 4*sizeof(char));
+
+					if (dash_inputs[i].components[j].lang) {
+						if (lang && strcmp(lang, dash_inputs[i].components[j].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, dash_inputs[i].components[j].lang));
+						} else  if (!lang) {
+							lang = gf_strdup(dash_inputs[i].components[j].lang);
 						}
 					}
 				}
@@ -4669,13 +4956,13 @@
 
 			if (max_width && max_height) {
 				gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
-				if (fps_denum>1) 
+				if (fps_denum>1)
 					sprintf(szFPS, "%d/%d", fps_num, fps_denum);
 				else if (fps_num)
 					sprintf(szFPS, "%d", fps_num);
 			}
 
-			e = write_adaptation_header(period_mpd, dash_profile, use_url_template, segment_mode, &dash_inputs[first_rep_in_set], use_bs_switching, max_width, max_height, szFPS, szLang, szInit);
+			e = write_adaptation_header(period_mpd, dash_profile, use_url_template, segment_mode, dash_inputs, nb_dash_inputs, cur_period+1, cur_adaptation_set+1, first_rep_in_set, use_bs_switching, max_width, max_height, szFPS, lang, szInit);
 			if (e) goto exit;
 
 			is_first_rep = 1;
@@ -4691,7 +4978,8 @@
 				sep = strrchr(szOutName, '.');
 				if (sep) sep[0] = 0;
 
-				dash_opts.variable_seg_rad_name = 0;
+				/*in scalable case: seg_name is variable*/
+				dash_opts.variable_seg_rad_name = (nb_dash_inputs != nb_inputs) ? 1 : 0;
 				if (seg_name) {
 					if (strstr(seg_name, "%s")) {
 						sprintf(szSolvedSegName, seg_name, szOutName);
@@ -4707,8 +4995,8 @@
 					segment_name = szSolvedSegName;
 				}
 				if ((dash_inputs[i].trackNum || dash_inputs[i].single_track_num)
-					&& (!seg_name || (!strstr(seg_name, "$RepresentationID$") && !strstr(seg_name, "$ID$"))) 
-				) {
+				        && (!seg_name || (!strstr(seg_name, "$RepresentationID$") && !strstr(seg_name, "$ID$")))
+				   ) {
 					char tmp[10];
 					sprintf(tmp, "_track%d", dash_inputs[i].trackNum ? dash_inputs[i].trackNum : dash_inputs[i].single_track_num);
 					strcat(szOutName, tmp);
@@ -4748,7 +5036,7 @@
 		fclose(period_mpd);
 
 		if (xlink) {
-			write_period_header(mpd, id, 0.0, period_duration, dash_dynamic, xlink);
+			write_period_header(mpd, id, 0.0, period_duration, dash_dynamic, xlink, dash_inputs, nb_dash_inputs, cur_period+1);
 		} else {
 			dash_insert_period_xml(mpd, szPeriodXML);
 		}
@@ -4769,7 +5057,7 @@
 			sprintf(szOpt, "%g", active_period_start);
 			gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
 
-			purge_dash_context(dash_ctx);
+			if (dash_ctx) purge_dash_context(dash_ctx);
 		}
 	}
 	fprintf(mpd, "</MPD>");
@@ -4777,12 +5065,29 @@
 exit:
 	if (mpd) {
 		fclose(mpd);
-		if (!e && dash_dynamic)
-			gf_move_file(szTempMPD, mpdfile);
+		if (!e && dash_dynamic) {
+			gf_delete_file(mpdfile);
+			e = gf_move_file(szTempMPD, mpdfile);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[DASH] Error moving file %s to %s: %s\n", szTempMPD, mpdfile, gf_error_to_string(e) ));
+			}
+		}
+	}
+	for (i=0; i < nb_inputs; i++) {
+		if (dash_inputs[i].as_descs) gf_free(dash_inputs[i].as_descs);
+		if (dash_inputs[i].as_c_descs) gf_free(dash_inputs[i].as_c_descs);
+		if (dash_inputs[i].p_descs) gf_free(dash_inputs[i].p_descs);
+		if (dash_inputs[i].rep_descs) gf_free(dash_inputs[i].rep_descs);
+		for (j = 0; j < dash_inputs[i].nb_components; j++) {
+			if (dash_inputs[i].components[j].lang) {
+				gf_free(dash_inputs[i].components[j].lang);
+			}
+		}
 	}
 	gf_free(dash_inputs);
 	return e;
 }
 
+#endif /* GPAC_DISABLE_ISOM_WRITE */

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/dsmcc.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/dsmcc.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -78,24 +78,24 @@
 
 GF_M2TS_DSMCC_OVERLORD* gf_m2ts_init_dsmcc_overlord(u32 service_id) {
 	GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord;
-	GF_SAFEALLOC(dsmcc_overlord,GF_M2TS_DSMCC_OVERLORD);	
+	GF_SAFEALLOC(dsmcc_overlord,GF_M2TS_DSMCC_OVERLORD);
 	dsmcc_overlord->dsmcc_modules = gf_list_new();
 	dsmcc_overlord->service_id = service_id;
 	return dsmcc_overlord;
 }
 
-GF_M2TS_DSMCC_OVERLORD* gf_m2ts_get_dmscc_overlord(GF_List* Dsmcc_controller,u32 service_id) 
+GF_M2TS_DSMCC_OVERLORD* gf_m2ts_get_dmscc_overlord(GF_List* Dsmcc_controller,u32 service_id)
 {
 	u16 nb_dsmcc,i;
 
 	nb_dsmcc = gf_list_count(Dsmcc_controller);
 
-	if(!nb_dsmcc){
+	if(!nb_dsmcc) {
 		return NULL;
-	}else{
-		for(i =0;i<nb_dsmcc;i++){
+	} else {
+		for(i =0; i<nb_dsmcc; i++) {
 			GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord = (GF_M2TS_DSMCC_OVERLORD*)gf_list_get(Dsmcc_controller,i);
-			if(dsmcc_overlord->service_id == service_id){
+			if(dsmcc_overlord->service_id == service_id) {
 				return dsmcc_overlord;
 			}
 		}
@@ -103,7 +103,7 @@
 	return NULL;
 }
 
-void on_dsmcc_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+void on_dsmcc_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
 {
 	GF_M2TS_SL_PCK *pck = (GF_M2TS_SL_PCK *)par;
 	char *data;
@@ -118,7 +118,7 @@
 		GF_M2TS_DSMCC_SECTION* dsmcc;
 		data = pck->data;
 		u32_data_size = pck->data_len;
-		u32_table_id = data[0];	
+		u32_table_id = data[0];
 		GF_SAFEALLOC(dsmcc,GF_M2TS_DSMCC_SECTION);
 
 		e = gf_m2ts_process_dsmcc(dsmcc_overlord,dsmcc,data,u32_data_size,u32_table_id);
@@ -129,14 +129,14 @@
 
 GF_Err gf_m2ts_process_dsmcc(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,GF_M2TS_DSMCC_SECTION *dsmcc, char  *data, u32 data_size, u32 table_id)
 {
-	GF_BitStream *bs;	
+	GF_BitStream *bs;
 	u32 data_shift,reserved_test;
 
 	data_shift = 0;
 	//first_section = *first_section_received;
 	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
 
-	dsmcc->table_id = gf_bs_read_int(bs,8);	
+	dsmcc->table_id = gf_bs_read_int(bs,8);
 	dsmcc->section_syntax_indicator = gf_bs_read_int(bs,1);
 	dsmcc->private_indicator = gf_bs_read_int(bs,1);
 	reserved_test = gf_bs_read_int(bs,2);
@@ -155,12 +155,12 @@
 	gf_bs_read_int(bs,2);
 
 	dsmcc->version_number = gf_bs_read_int(bs,5);
-	if(dsmcc->version_number != 0 &&(dsmcc->table_id == GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA || dsmcc->table_id == GF_M2TS_TABLE_ID_DSM_CC_UN_MESSAGE)){
+	if(dsmcc->version_number != 0 &&(dsmcc->table_id == GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA || dsmcc->table_id == GF_M2TS_TABLE_ID_DSM_CC_UN_MESSAGE)) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Version number should be 0 for Encapsulated Data or UN Message, abording processing \n"));
 		return GF_CORRUPTED_DATA;
 	}
 
-	dsmcc->current_next_indicator = gf_bs_read_int(bs,1);	
+	dsmcc->current_next_indicator = gf_bs_read_int(bs,1);
 	if (!dsmcc->current_next_indicator) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] current next indicator should be at 1 \n"));
 		return GF_CORRUPTED_DATA;
@@ -171,36 +171,36 @@
 	return GF_CORRUPTED_DATA;
 	}
 	*first_section_received = 1;*/
-	dsmcc->last_section_number = gf_bs_read_int(bs,8);	
+	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:
-			{
-				data_shift = (u32)(gf_bs_get_position(bs));
-				break;
-			}
-		case GF_M2TS_TABLE_ID_DSM_CC_UN_MESSAGE:			
-		case GF_M2TS_TABLE_ID_DSM_CC_DOWNLOAD_DATA_MESSAGE:
-			{
-				data_shift = (u32)(gf_bs_get_position(bs));				
-				gf_m2ts_dsmcc_download_data(dsmcc_overlord,dsmcc,data,bs,&data_shift);				
-				break;
-			}
-		case GF_M2TS_TABLE_ID_DSM_CC_STREAM_DESCRIPTION:
-			{
-				data_shift = (u32)(gf_bs_get_position(bs));
-				break;
-			}
-		default:
-			{
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unknown DSMCC Section Type \n"));		
-				break;
-			}
+	case GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA:
+	{
+		data_shift = (u32)(gf_bs_get_position(bs));
+		break;
+	}
+	case GF_M2TS_TABLE_ID_DSM_CC_UN_MESSAGE:
+	case GF_M2TS_TABLE_ID_DSM_CC_DOWNLOAD_DATA_MESSAGE:
+	{
+		data_shift = (u32)(gf_bs_get_position(bs));
+		gf_m2ts_dsmcc_download_data(dsmcc_overlord,dsmcc,data,bs,&data_shift);
+		break;
+	}
+	case GF_M2TS_TABLE_ID_DSM_CC_STREAM_DESCRIPTION:
+	{
+		data_shift = (u32)(gf_bs_get_position(bs));
+		break;
+	}
+	default:
+	{
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unknown DSMCC Section Type \n"));
+		break;
+	}
 	}
 
 	if (dsmcc->section_syntax_indicator == 0) {
-		dsmcc->checksum = gf_bs_read_int(bs,32);	
+		dsmcc->checksum = gf_bs_read_int(bs,32);
 	} else {
 		dsmcc->CRC_32= gf_bs_read_int(bs,32);
 	}
@@ -232,214 +232,214 @@
 	switch (DataMessage->DownloadDataHeader.messageId)
 	{
 	case DOWNLOAD_INFO_REQUEST:
-		{
-			GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST*  DownloadInfoRequest;
-			GF_SAFEALLOC(DownloadInfoRequest,GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST);
-			DataMessage->dataMessagePayload = DownloadInfoRequest;
-
-			/* Payload */
-			DownloadInfoRequest->bufferSize = gf_bs_read_int(bs,32);
-			DownloadInfoRequest->maximumBlockSize = gf_bs_read_int(bs,16);
-			gf_m2ts_dsmcc_process_compatibility_descriptor(&DownloadInfoRequest->CompatibilityDescr,data,bs,data_shift);
-			DownloadInfoRequest->privateDataLength = gf_bs_read_int(bs,16);
-			DownloadInfoRequest->privateDataByte = (char*)gf_calloc(DownloadInfoRequest->privateDataLength,sizeof(char));
-			gf_bs_read_data(bs,DownloadInfoRequest->privateDataByte,(u32)(DownloadInfoRequest->privateDataLength));
-			break;
-		}
-	case DOWNLOAD_INFO_REPONSE_INDICATION:		
-		{
-			u32 i,nb_modules;
-			GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC* DownloadInfoIndication;
-			GF_SAFEALLOC(DownloadInfoIndication,GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC);
-			DataMessage->dataMessagePayload = DownloadInfoIndication;
-
-			/* Payload */
-			DownloadInfoIndication->downloadId = gf_bs_read_int(bs,32);
-			DownloadInfoIndication->blockSize = gf_bs_read_int(bs,16);
-			DownloadInfoIndication->windowSize = gf_bs_read_int(bs,8);
-			DownloadInfoIndication->ackPeriod = gf_bs_read_int(bs,8);
-			DownloadInfoIndication->tCDownloadWindow = gf_bs_read_int(bs,32);
-			DownloadInfoIndication->tCDownloadScenario = gf_bs_read_int(bs,32);
-
-			/* Compatibility Descr */
-			gf_m2ts_dsmcc_process_compatibility_descriptor(&DownloadInfoIndication->CompatibilityDescr,data,bs,data_shift);
-			DownloadInfoIndication->numberOfModules = gf_bs_read_int(bs,16);
-			/* Versioning of the DownloadInfoIndication is made by the field transactionId (here known as downloadId) */
-			if(DataMessage->DownloadDataHeader.downloadId > dsmcc_overlord->transactionId){
-				dsmcc_overlord->transactionId = DataMessage->DownloadDataHeader.downloadId;
-				nb_modules = gf_list_count(dsmcc_overlord->dsmcc_modules);
-				for(i = 0;i<DownloadInfoIndication->numberOfModules;i++){
-					DownloadInfoIndication->Modules.moduleId = gf_bs_read_int(bs,16);
-					DownloadInfoIndication->Modules.moduleSize = gf_bs_read_int(bs,32);
-					DownloadInfoIndication->Modules.moduleVersion = gf_bs_read_int(bs,8);
-					DownloadInfoIndication->Modules.moduleInfoLength = gf_bs_read_int(bs,8);				
-					DownloadInfoIndication->Modules.moduleInfoByte = (char*)gf_calloc(DownloadInfoIndication->Modules.moduleInfoLength,sizeof(char));
-					gf_bs_read_data(bs,DownloadInfoIndication->Modules.moduleInfoByte,(u32)(DownloadInfoIndication->Modules.moduleInfoLength));
-					if(!dsmcc_create_module_validation(&DownloadInfoIndication->Modules,DownloadInfoIndication->downloadId,dsmcc_overlord,nb_modules)){
-						/* Creation of the module */
-						GF_M2TS_DSMCC_MODULE*dsmcc_module = dsmcc_create_module(dsmcc_overlord,DownloadInfoIndication);
-						if(DownloadInfoIndication->Modules.moduleInfoLength){
-							GF_Err e;
-							e = dsmcc_get_biop_module_info(dsmcc_module,DownloadInfoIndication->Modules.moduleInfoByte,DownloadInfoIndication->Modules.moduleInfoLength);
-							if(e){
-								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in BIOP Module Info for module %d, abording the processing \n",dsmcc_module->moduleId));
-								gf_free(DownloadInfoIndication->Modules.moduleInfoByte);
-								DownloadInfoIndication->Modules.moduleInfoByte = NULL;
-								return GF_CORRUPTED_DATA;
-							}						
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST*  DownloadInfoRequest;
+		GF_SAFEALLOC(DownloadInfoRequest,GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST);
+		DataMessage->dataMessagePayload = DownloadInfoRequest;
+
+		/* Payload */
+		DownloadInfoRequest->bufferSize = gf_bs_read_int(bs,32);
+		DownloadInfoRequest->maximumBlockSize = gf_bs_read_int(bs,16);
+		gf_m2ts_dsmcc_process_compatibility_descriptor(&DownloadInfoRequest->CompatibilityDescr,data,bs,data_shift);
+		DownloadInfoRequest->privateDataLength = gf_bs_read_int(bs,16);
+		DownloadInfoRequest->privateDataByte = (char*)gf_calloc(DownloadInfoRequest->privateDataLength,sizeof(char));
+		gf_bs_read_data(bs,DownloadInfoRequest->privateDataByte,(u32)(DownloadInfoRequest->privateDataLength));
+		break;
+	}
+	case DOWNLOAD_INFO_REPONSE_INDICATION:
+	{
+		u32 i,nb_modules;
+		GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC* DownloadInfoIndication;
+		GF_SAFEALLOC(DownloadInfoIndication,GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC);
+		DataMessage->dataMessagePayload = DownloadInfoIndication;
+
+		/* Payload */
+		DownloadInfoIndication->downloadId = gf_bs_read_int(bs,32);
+		DownloadInfoIndication->blockSize = gf_bs_read_int(bs,16);
+		DownloadInfoIndication->windowSize = gf_bs_read_int(bs,8);
+		DownloadInfoIndication->ackPeriod = gf_bs_read_int(bs,8);
+		DownloadInfoIndication->tCDownloadWindow = gf_bs_read_int(bs,32);
+		DownloadInfoIndication->tCDownloadScenario = gf_bs_read_int(bs,32);
+
+		/* Compatibility Descr */
+		gf_m2ts_dsmcc_process_compatibility_descriptor(&DownloadInfoIndication->CompatibilityDescr,data,bs,data_shift);
+		DownloadInfoIndication->numberOfModules = gf_bs_read_int(bs,16);
+		/* Versioning of the DownloadInfoIndication is made by the field transactionId (here known as downloadId) */
+		if(DataMessage->DownloadDataHeader.downloadId > dsmcc_overlord->transactionId) {
+			dsmcc_overlord->transactionId = DataMessage->DownloadDataHeader.downloadId;
+			nb_modules = gf_list_count(dsmcc_overlord->dsmcc_modules);
+			for(i = 0; i<DownloadInfoIndication->numberOfModules; i++) {
+				DownloadInfoIndication->Modules.moduleId = gf_bs_read_int(bs,16);
+				DownloadInfoIndication->Modules.moduleSize = gf_bs_read_int(bs,32);
+				DownloadInfoIndication->Modules.moduleVersion = gf_bs_read_int(bs,8);
+				DownloadInfoIndication->Modules.moduleInfoLength = gf_bs_read_int(bs,8);
+				DownloadInfoIndication->Modules.moduleInfoByte = (char*)gf_calloc(DownloadInfoIndication->Modules.moduleInfoLength,sizeof(char));
+				gf_bs_read_data(bs,DownloadInfoIndication->Modules.moduleInfoByte,(u32)(DownloadInfoIndication->Modules.moduleInfoLength));
+				if(!dsmcc_create_module_validation(&DownloadInfoIndication->Modules,DownloadInfoIndication->downloadId,dsmcc_overlord,nb_modules)) {
+					/* Creation of the module */
+					GF_M2TS_DSMCC_MODULE*dsmcc_module = dsmcc_create_module(dsmcc_overlord,DownloadInfoIndication);
+					if(DownloadInfoIndication->Modules.moduleInfoLength) {
+						GF_Err e;
+						e = dsmcc_get_biop_module_info(dsmcc_module,DownloadInfoIndication->Modules.moduleInfoByte,DownloadInfoIndication->Modules.moduleInfoLength);
+						if(e) {
+							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in BIOP Module Info for module %d, abording the processing \n",dsmcc_module->moduleId));
+							gf_free(DownloadInfoIndication->Modules.moduleInfoByte);
+							DownloadInfoIndication->Modules.moduleInfoByte = NULL;
+							return GF_CORRUPTED_DATA;
 						}
 					}
-					gf_free(DownloadInfoIndication->Modules.moduleInfoByte);
-					DownloadInfoIndication->Modules.moduleInfoByte = NULL;
 				}
-				DownloadInfoIndication->privateDataLength = gf_bs_read_int(bs,16);    
-				DownloadInfoIndication->privateDataByte = (char*)gf_calloc(DownloadInfoIndication->privateDataLength,sizeof(char));
-				gf_bs_read_data(bs,DownloadInfoIndication->privateDataByte,(u32)(DownloadInfoIndication->privateDataLength));
+				gf_free(DownloadInfoIndication->Modules.moduleInfoByte);
+				DownloadInfoIndication->Modules.moduleInfoByte = NULL;
 			}
-			break;
+			DownloadInfoIndication->privateDataLength = gf_bs_read_int(bs,16);
+			DownloadInfoIndication->privateDataByte = (char*)gf_calloc(DownloadInfoIndication->privateDataLength,sizeof(char));
+			gf_bs_read_data(bs,DownloadInfoIndication->privateDataByte,(u32)(DownloadInfoIndication->privateDataLength));
 		}
+		break;
+	}
 	case DOWNLOAD_DATA_BLOCK:
-		{				
-			u32 modules_count, i;
-			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){
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Download Information Indicator has not been received yet, waiting before processing data block \n"));
-				break;
-			}
-
-
-			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){
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] DataHeader reserved slot does not have the correct value, abording the processing \n"));
-				return GF_CORRUPTED_DATA;
-			}
-			DownloadDataBlock->blockNumber = gf_bs_read_int(bs,16);
-				
-			for(i=0;i<modules_count;i++){
-				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"));
-						return GF_CORRUPTED_DATA;
-					}
-					DownloadDataBlock->blockDataByte = (char*)gf_calloc(DownloadDataBlock->dataBlocksize,sizeof(char));
-					*data_shift = (u32)(gf_bs_get_position(bs));
-					gf_bs_read_data(bs,DownloadDataBlock->blockDataByte,DownloadDataBlock->dataBlocksize);
-					memcpy(dsmcc_module->buffer+dsmcc_module->byte_sift,DownloadDataBlock->blockDataByte,DownloadDataBlock->dataBlocksize*sizeof(char));
-					dsmcc_module->byte_sift += DownloadDataBlock->dataBlocksize;									
-					dsmcc_module->last_section_number = dsmcc->last_section_number;
-					dsmcc_module->section_number++;
-					if(dsmcc_module->section_number == (dsmcc_module->last_section_number+1)){						
-						dsmcc_module_complete(dsmcc_overlord,dsmcc_module,i);						
-					}
-					break;
-				}
-			}				
-			
-			break;			
-		}		
-	case DOWNLOAD_DATA_REQUEST:
-		{
-			GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE* DownloadDataRequest;
-			GF_SAFEALLOC(DownloadDataRequest,GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE);
-			DataMessage->dataMessagePayload = DownloadDataRequest;	
-			DownloadDataRequest->moduleId = gf_bs_read_int(bs,16);
-			DownloadDataRequest->blockNumber = gf_bs_read_int(bs,16);
-			DownloadDataRequest->downloadReason  = gf_bs_read_int(bs,8);
+	{
+		u32 modules_count, i;
+		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) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Download Information Indicator has not been received yet, waiting before processing data block \n"));
 			break;
 		}
-	case DOWNLOAD_DATA_CANCEL:
 
-		{
-			GF_M2TS_DSMCC_DOWNLOAD_CANCEL* DownloadCancel;
-			GF_SAFEALLOC(DownloadCancel,GF_M2TS_DSMCC_DOWNLOAD_CANCEL);
-			DataMessage->dataMessagePayload = DownloadCancel;	
-			DownloadCancel->downloadId = gf_bs_read_int(bs,32);
-			DownloadCancel->moduleId = gf_bs_read_int(bs,16);
-			DownloadCancel->blockNumber = gf_bs_read_int(bs,16);
-			DownloadCancel->downloadCancelReason = gf_bs_read_int(bs,8);
-			DownloadCancel->reserved = gf_bs_read_int(bs,8);
-			DownloadCancel->privateDataLength = gf_bs_read_int(bs,16);
-			if(DownloadCancel->privateDataLength){
-				DownloadCancel->privateDataByte = (char*)gf_calloc(DownloadCancel->privateDataLength,sizeof(char));
-				gf_bs_read_data(bs,DownloadCancel->privateDataByte,(u32)(DownloadCancel->privateDataLength));
-			}
-			break;
 
+		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) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] DataHeader reserved slot does not have the correct value, abording the processing \n"));
+			return GF_CORRUPTED_DATA;
 		}
-	case DOWNLOAD_SERVER_INITIATE:
-		{
-			GF_Err e;
-			GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT* DownloadServerInit;
-			GF_SAFEALLOC(DownloadServerInit,GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT);
-			DataMessage->dataMessagePayload = DownloadServerInit;
-			gf_bs_read_data(bs,DownloadServerInit->serverId,20);			
-			gf_m2ts_dsmcc_process_compatibility_descriptor(&DownloadServerInit->CompatibilityDescr,data,bs,data_shift);
-			DownloadServerInit->privateDataLength = gf_bs_read_int(bs,16);
-			if(DownloadServerInit->privateDataLength){
-
-				u32 i;
-
-				GF_M2TS_DSMCC_SERVICE_GATEWAY_INFO* ServiceGateWayInfo;
-				GF_SAFEALLOC(ServiceGateWayInfo,GF_M2TS_DSMCC_SERVICE_GATEWAY_INFO);
-
-				/* IOR */
-				e = dsmcc_biop_get_ior(bs,&ServiceGateWayInfo->IOR);
-				if(e){
-					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Corrupted IOR, abording the processing \n"));
-					gf_free(ServiceGateWayInfo);
-					return GF_CORRUPTED_DATA;	
-				}
-				ServiceGateWayInfo->downloadTaps_count = gf_bs_read_int(bs,8);
-				ServiceGateWayInfo->Taps = (GF_M2TS_DSMCC_BIOP_TAPS*)gf_calloc(ServiceGateWayInfo->downloadTaps_count,sizeof(GF_M2TS_DSMCC_BIOP_TAPS));
-				for(i=0;i<ServiceGateWayInfo->downloadTaps_count;i++){
-					ServiceGateWayInfo->Taps[i].id = gf_bs_read_int(bs,16);					
-					ServiceGateWayInfo->Taps[i].use = gf_bs_read_int(bs,16);					
-					ServiceGateWayInfo->Taps[i].assocTag = gf_bs_read_int(bs,16);
-					ServiceGateWayInfo->Taps[i].selector_length = gf_bs_read_int(bs,8);					
-					ServiceGateWayInfo->Taps[i].selector_type = gf_bs_read_int(bs,16);					
-					ServiceGateWayInfo->Taps[i].transactionId = gf_bs_read_int(bs,32);
-					ServiceGateWayInfo->Taps[i].timeout = gf_bs_read_int(bs,32);
+		DownloadDataBlock->blockNumber = gf_bs_read_int(bs,16);
+
+		for(i=0; i<modules_count; i++) {
+			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"));
+					return GF_CORRUPTED_DATA;
 				}
-				ServiceGateWayInfo->serviceContextList_count = gf_bs_read_int(bs,8);
-				ServiceGateWayInfo->ServiceContext = (GF_M2TS_DSMCC_SERVICE_CONTEXT*)gf_calloc(ServiceGateWayInfo->serviceContextList_count,sizeof(GF_M2TS_DSMCC_SERVICE_CONTEXT));
-				dsmcc_biop_get_context(bs,ServiceGateWayInfo->ServiceContext,ServiceGateWayInfo->serviceContextList_count);
-				ServiceGateWayInfo->userInfoLength = gf_bs_read_int(bs,16);
-				if(ServiceGateWayInfo->userInfoLength != 0){
-					ServiceGateWayInfo->userInfo_data = (char*)gf_calloc(ServiceGateWayInfo->userInfoLength,sizeof(char));
-					gf_bs_read_data(bs,ServiceGateWayInfo->userInfo_data,(u32)(ServiceGateWayInfo->userInfoLength));
+				DownloadDataBlock->blockDataByte = (char*)gf_calloc(DownloadDataBlock->dataBlocksize,sizeof(char));
+				*data_shift = (u32)(gf_bs_get_position(bs));
+				gf_bs_read_data(bs,DownloadDataBlock->blockDataByte,DownloadDataBlock->dataBlocksize);
+				memcpy(dsmcc_module->buffer+dsmcc_module->byte_sift,DownloadDataBlock->blockDataByte,DownloadDataBlock->dataBlocksize*sizeof(char));
+				dsmcc_module->byte_sift += DownloadDataBlock->dataBlocksize;
+				dsmcc_module->last_section_number = dsmcc->last_section_number;
+				dsmcc_module->section_number++;
+				if(dsmcc_module->section_number == (dsmcc_module->last_section_number+1)) {
+					dsmcc_module_complete(dsmcc_overlord,dsmcc_module,i);
 				}
+				break;
+			}
+		}
 
-				if(!dsmcc_overlord->ServiceGateway && gf_list_count(ServiceGateWayInfo->IOR.taggedProfile)){
-					GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = (GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE*)gf_list_get(ServiceGateWayInfo->IOR.taggedProfile,0);
-					dsmcc_overlord->ServiceGateway = (GF_M2TS_DSMCC_SERVICE_GATEWAY*)gf_calloc(1,sizeof(GF_M2TS_DSMCC_SERVICE_GATEWAY));
-					dsmcc_overlord->ServiceGateway->downloadId = taggedProfile->BIOPProfileBody->ObjectLocation.carouselId;
-					dsmcc_overlord->ServiceGateway->moduleId = taggedProfile->BIOPProfileBody->ObjectLocation.moduleId;
-					dsmcc_overlord->ServiceGateway->service_id = dsmcc_overlord->service_id;
-					dsmcc_overlord->ServiceGateway->File = gf_list_new();
-					dsmcc_overlord->ServiceGateway->Dir = gf_list_new();
-				}
+		break;
+	}
+	case DOWNLOAD_DATA_REQUEST:
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE* DownloadDataRequest;
+		GF_SAFEALLOC(DownloadDataRequest,GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE);
+		DataMessage->dataMessagePayload = DownloadDataRequest;
+		DownloadDataRequest->moduleId = gf_bs_read_int(bs,16);
+		DownloadDataRequest->blockNumber = gf_bs_read_int(bs,16);
+		DownloadDataRequest->downloadReason  = gf_bs_read_int(bs,8);
+		break;
+	}
+	case DOWNLOAD_DATA_CANCEL:
+
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_CANCEL* DownloadCancel;
+		GF_SAFEALLOC(DownloadCancel,GF_M2TS_DSMCC_DOWNLOAD_CANCEL);
+		DataMessage->dataMessagePayload = DownloadCancel;
+		DownloadCancel->downloadId = gf_bs_read_int(bs,32);
+		DownloadCancel->moduleId = gf_bs_read_int(bs,16);
+		DownloadCancel->blockNumber = gf_bs_read_int(bs,16);
+		DownloadCancel->downloadCancelReason = gf_bs_read_int(bs,8);
+		DownloadCancel->reserved = gf_bs_read_int(bs,8);
+		DownloadCancel->privateDataLength = gf_bs_read_int(bs,16);
+		if(DownloadCancel->privateDataLength) {
+			DownloadCancel->privateDataByte = (char*)gf_calloc(DownloadCancel->privateDataLength,sizeof(char));
+			gf_bs_read_data(bs,DownloadCancel->privateDataByte,(u32)(DownloadCancel->privateDataLength));
+		}
+		break;
+
+	}
+	case DOWNLOAD_SERVER_INITIATE:
+	{
+		GF_Err e;
+		GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT* DownloadServerInit;
+		GF_SAFEALLOC(DownloadServerInit,GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT);
+		DataMessage->dataMessagePayload = DownloadServerInit;
+		gf_bs_read_data(bs,DownloadServerInit->serverId,20);
+		gf_m2ts_dsmcc_process_compatibility_descriptor(&DownloadServerInit->CompatibilityDescr,data,bs,data_shift);
+		DownloadServerInit->privateDataLength = gf_bs_read_int(bs,16);
+		if(DownloadServerInit->privateDataLength) {
+
+			u32 i;
+
+			GF_M2TS_DSMCC_SERVICE_GATEWAY_INFO* ServiceGateWayInfo;
+			GF_SAFEALLOC(ServiceGateWayInfo,GF_M2TS_DSMCC_SERVICE_GATEWAY_INFO);
+
+			/* IOR */
+			e = dsmcc_biop_get_ior(bs,&ServiceGateWayInfo->IOR);
+			if(e) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Corrupted IOR, abording the processing \n"));
+				gf_free(ServiceGateWayInfo);
+				return GF_CORRUPTED_DATA;
+			}
+			ServiceGateWayInfo->downloadTaps_count = gf_bs_read_int(bs,8);
+			ServiceGateWayInfo->Taps = (GF_M2TS_DSMCC_BIOP_TAPS*)gf_calloc(ServiceGateWayInfo->downloadTaps_count,sizeof(GF_M2TS_DSMCC_BIOP_TAPS));
+			for(i=0; i<ServiceGateWayInfo->downloadTaps_count; i++) {
+				ServiceGateWayInfo->Taps[i].id = gf_bs_read_int(bs,16);
+				ServiceGateWayInfo->Taps[i].use = gf_bs_read_int(bs,16);
+				ServiceGateWayInfo->Taps[i].assocTag = gf_bs_read_int(bs,16);
+				ServiceGateWayInfo->Taps[i].selector_length = gf_bs_read_int(bs,8);
+				ServiceGateWayInfo->Taps[i].selector_type = gf_bs_read_int(bs,16);
+				ServiceGateWayInfo->Taps[i].transactionId = gf_bs_read_int(bs,32);
+				ServiceGateWayInfo->Taps[i].timeout = gf_bs_read_int(bs,32);
+			}
+			ServiceGateWayInfo->serviceContextList_count = gf_bs_read_int(bs,8);
+			ServiceGateWayInfo->ServiceContext = (GF_M2TS_DSMCC_SERVICE_CONTEXT*)gf_calloc(ServiceGateWayInfo->serviceContextList_count,sizeof(GF_M2TS_DSMCC_SERVICE_CONTEXT));
+			dsmcc_biop_get_context(bs,ServiceGateWayInfo->ServiceContext,ServiceGateWayInfo->serviceContextList_count);
+			ServiceGateWayInfo->userInfoLength = gf_bs_read_int(bs,16);
+			if(ServiceGateWayInfo->userInfoLength != 0) {
+				ServiceGateWayInfo->userInfo_data = (char*)gf_calloc(ServiceGateWayInfo->userInfoLength,sizeof(char));
+				gf_bs_read_data(bs,ServiceGateWayInfo->userInfo_data,(u32)(ServiceGateWayInfo->userInfoLength));
 			}
 
-			break;
+			if(!dsmcc_overlord->ServiceGateway && gf_list_count(ServiceGateWayInfo->IOR.taggedProfile)) {
+				GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = (GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE*)gf_list_get(ServiceGateWayInfo->IOR.taggedProfile,0);
+				dsmcc_overlord->ServiceGateway = (GF_M2TS_DSMCC_SERVICE_GATEWAY*)gf_calloc(1,sizeof(GF_M2TS_DSMCC_SERVICE_GATEWAY));
+				dsmcc_overlord->ServiceGateway->downloadId = taggedProfile->BIOPProfileBody->ObjectLocation.carouselId;
+				dsmcc_overlord->ServiceGateway->moduleId = taggedProfile->BIOPProfileBody->ObjectLocation.moduleId;
+				dsmcc_overlord->ServiceGateway->service_id = dsmcc_overlord->service_id;
+				dsmcc_overlord->ServiceGateway->File = gf_list_new();
+				dsmcc_overlord->ServiceGateway->Dir = gf_list_new();
+			}
 		}
 
+		break;
+	}
+
 	default:
-		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unknown dataMessagePayload Type \n"));
-			break;
-		}
+	{
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unknown dataMessagePayload Type \n"));
+		break;
+	}
 	}
 
 	//dsmcc->DSMCC_Extension = DataMessage;
@@ -501,11 +501,11 @@
 
 	CompatibilityDesc->compatibilityDescriptorLength = gf_bs_read_int(bs,16);
 
-	if(CompatibilityDesc->compatibilityDescriptorLength){
+	if(CompatibilityDesc->compatibilityDescriptorLength) {
 		CompatibilityDesc->descriptorCount = gf_bs_read_int(bs,16);
-		if(CompatibilityDesc->descriptorCount){
+		if(CompatibilityDesc->descriptorCount) {
 			CompatibilityDesc->Descriptor = (GF_M2TS_DSMCC_DESCRIPTOR*)gf_calloc(CompatibilityDesc->descriptorCount,sizeof(GF_M2TS_DSMCC_DESCRIPTOR));
-			for(i=0;i<CompatibilityDesc->descriptorCount;i++){
+			for(i=0; i<CompatibilityDesc->descriptorCount; i++) {
 				CompatibilityDesc->Descriptor[i].descriptorType = gf_bs_read_int(bs,8);
 				CompatibilityDesc->Descriptor[i].descriptorLength = gf_bs_read_int(bs,8);
 				CompatibilityDesc->Descriptor[i].specifierType = gf_bs_read_int(bs,8);
@@ -513,12 +513,12 @@
 				CompatibilityDesc->Descriptor[i].model = gf_bs_read_int(bs,16);
 				CompatibilityDesc->Descriptor[i].version = gf_bs_read_int(bs,16);
 				CompatibilityDesc->Descriptor[i].subDescriptorCount = gf_bs_read_int(bs,8);
-				if(CompatibilityDesc->Descriptor[i].subDescriptorCount){
+				if(CompatibilityDesc->Descriptor[i].subDescriptorCount) {
 					CompatibilityDesc->Descriptor[i].SubDescriptor  = (GF_M2TS_DSMCC_SUBDESCRIPTOR*)gf_calloc(CompatibilityDesc->Descriptor[i].subDescriptorCount,sizeof(GF_M2TS_DSMCC_SUBDESCRIPTOR));
-					for(j=0;j>CompatibilityDesc->Descriptor[i].subDescriptorCount;j++){
+					for(j=0; j>CompatibilityDesc->Descriptor[i].subDescriptorCount; j++) {
 						CompatibilityDesc->Descriptor[i].SubDescriptor[j].subDescriptorType = gf_bs_read_int(bs,8);
 						CompatibilityDesc->Descriptor[i].SubDescriptor[j].subDescriptorLength = gf_bs_read_int(bs,8);
-						if(CompatibilityDesc->Descriptor[i].SubDescriptor[j].subDescriptorLength){
+						if(CompatibilityDesc->Descriptor[i].SubDescriptor[j].subDescriptorLength) {
 							CompatibilityDesc->Descriptor[i].SubDescriptor[j].additionalInformation = (char*)gf_calloc(CompatibilityDesc->Descriptor[i].SubDescriptor[j].subDescriptorLength,sizeof(char));
 							gf_bs_read_data(bs,CompatibilityDesc->Descriptor[i].SubDescriptor[j].additionalInformation,(u32)(CompatibilityDesc->Descriptor[i].SubDescriptor[j].subDescriptorLength));
 						}
@@ -530,7 +530,7 @@
 	}
 
 	*data_shift = (u32)(gf_bs_get_position(bs));
-	if(*data_shift != byte_shift+2+CompatibilityDesc->compatibilityDescriptorLength){
+	if(*data_shift != byte_shift+2+CompatibilityDesc->compatibilityDescriptorLength) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Descriptor length not respected, difference between %d and %d \n",(*data_shift - byte_shift),2+CompatibilityDesc->compatibilityDescriptorLength));
 		return GF_CORRUPTED_DATA;
 	}
@@ -538,7 +538,7 @@
 	return GF_OK;
 }
 
-static GF_Err dsmcc_create_module_validation(GF_M2TS_DSMCC_INFO_MODULES* InfoModules, u32 downloadId, GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,u32 nb_module){
+static GF_Err dsmcc_create_module_validation(GF_M2TS_DSMCC_INFO_MODULES* InfoModules, u32 downloadId, GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,u32 nb_module) {
 
 	u32 i;
 	for (i=0; i<nb_module; i++) {
@@ -575,7 +575,7 @@
 //					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Module already processed \n"));
 //					return GF_CORRUPTED_DATA;
 //				} else {
-//					return GF_OK;	
+//					return GF_OK;
 //				}
 //			}
 //		}
@@ -585,16 +585,16 @@
 
 static GF_Err dsmcc_download_data_validation(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK* DownloadDataBlock,GF_M2TS_DSMCC_MODULE* dsmcc_module,u32 downloadId)
 {
-	/* It checks if the module Id is eq to the SGW's module Id if Got_ServiceGateway is null (means that the SWG has not been processed yet 
+	/* It checks if the module Id is eq to the SGW's module Id if Got_ServiceGateway is null (means that the SWG has not been processed yet
 		If then Got_ServiceGateway = 1, all the module are processed */
-	if(dsmcc_overlord->ServiceGateway){
+	if(dsmcc_overlord->ServiceGateway) {
 		if ((dsmcc_overlord->Got_ServiceGateway || dsmcc_module->moduleId == dsmcc_overlord->ServiceGateway->moduleId)&&
-			((dsmcc_module->moduleId == DownloadDataBlock->moduleId) && (dsmcc_module->section_number == DownloadDataBlock->blockNumber) &&
-			(dsmcc_module->downloadId == downloadId) && (dsmcc_module->version_number == DownloadDataBlock->moduleVersion))){			
-				return GF_OK;
+		        ((dsmcc_module->moduleId == DownloadDataBlock->moduleId) && (dsmcc_module->section_number == DownloadDataBlock->blockNumber) &&
+		         (dsmcc_module->downloadId == downloadId) && (dsmcc_module->version_number == DownloadDataBlock->moduleVersion))) {
+			return GF_OK;
 		}
 	}
-	
+
 	return GF_CORRUPTED_DATA;
 }
 
@@ -608,16 +608,16 @@
 		GF_M2TS_DSMCC_PROCESSED dsmcc_process = dsmcc_overlord->processed[i];
 		if ((dsmcc_module->moduleId == dsmcc_process.moduleId) && dsmcc_module->version_number == dsmcc_process.version_number && dsmcc_module->downloadId == dsmcc_process.downloadId) {
 			/*process buffer*/
-			if(dsmcc_module->Gzip){
+			if(dsmcc_module->Gzip) {
 				u32 uncomp_size;
 				char* uncompressed_data;
 
 				gf_gz_decompress_payload(dsmcc_module->buffer,dsmcc_module->byte_sift,&uncompressed_data, &uncomp_size);
 				//dsmcc_process_biop_data(dsmcc_overlord,dsmcc_module,uncompressed_data,dsmcc_module->original_size);
-				
-				if(dsmcc_module->original_size == uncomp_size){
+
+				if(dsmcc_module->original_size == uncomp_size) {
 					e = dsmcc_process_biop_data(dsmcc_overlord,dsmcc_module,uncompressed_data,dsmcc_module->original_size);
-				}else{
+				} else {
 					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Buffer size is not equal to the module size. Flushing the data \n"));
 					gf_free(dsmcc_module->buffer);
 					dsmcc_module->buffer = NULL;
@@ -625,18 +625,18 @@
 					dsmcc_module->section_number = 0;
 					return GF_CORRUPTED_DATA;
 				}
-			}else{
-				e = dsmcc_process_biop_data(dsmcc_overlord,dsmcc_module,dsmcc_module->buffer,dsmcc_module->size);				
+			} else {
+				e = dsmcc_process_biop_data(dsmcc_overlord,dsmcc_module,dsmcc_module->buffer,dsmcc_module->size);
 			}
-			if(e){
-					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error during the processing of the module data. Flushing the data \n"));
-					gf_free(dsmcc_module->buffer);
-					dsmcc_module->buffer = NULL;
-					dsmcc_module->buffer = (char*)gf_calloc(dsmcc_module->size,sizeof(char));
-					dsmcc_module->section_number = 0;
-					return GF_CORRUPTED_DATA;
-			}else{
-				dsmcc_process.done = 1;			
+			if(e) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error during the processing of the module data. Flushing the data \n"));
+				gf_free(dsmcc_module->buffer);
+				dsmcc_module->buffer = NULL;
+				dsmcc_module->buffer = (char*)gf_calloc(dsmcc_module->size,sizeof(char));
+				dsmcc_module->section_number = 0;
+				return GF_CORRUPTED_DATA;
+			} else {
+				dsmcc_process.done = 1;
 				dsmcc_module_delete(dsmcc_module);
 				gf_list_rem(dsmcc_overlord->dsmcc_modules,moduleIndex);
 			}
@@ -650,7 +650,7 @@
 
 static GF_Err gf_m2ts_dsmcc_delete_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc)
 {
-	u32 i,j;	
+	u32 i,j;
 	if (CompatibilityDesc->compatibilityDescriptorLength) {
 		if (CompatibilityDesc->descriptorCount) {
 			for (i=0; i<CompatibilityDesc->descriptorCount; i++) {
@@ -670,8 +670,8 @@
 }
 
 static GF_Err gf_m2ts_dsmcc_delete_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader)
-{	
-	if (MessageHeader->adaptationLength > 0) {		
+{
+	if (MessageHeader->adaptationLength > 0) {
 		gf_free(MessageHeader->DsmccAdaptationHeader->adaptationDataByte);
 		gf_free(MessageHeader->DsmccAdaptationHeader);
 	}
@@ -680,76 +680,76 @@
 
 static GF_Err gf_m2ts_dsmcc_section_delete(GF_M2TS_DSMCC_SECTION *dsmcc)
 {
-	GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE* DataMessage = (GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE*)dsmcc->DSMCC_Extension;	
+	GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE* DataMessage = (GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE*)dsmcc->DSMCC_Extension;
 
-	if(!DataMessage){
+	if(!DataMessage) {
 		return GF_OK;
 	}
 
 	switch (DataMessage->DownloadDataHeader.messageId)
 	{
 	case DOWNLOAD_INFO_REQUEST:
-		{
-			GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST*  DownloadInfoRequest = (GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST*)DataMessage->dataMessagePayload;
-			if(DownloadInfoRequest->privateDataLength){
-				gf_free(DownloadInfoRequest->privateDataByte);
-			}
-			gf_free(DownloadInfoRequest);
-			break;
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST*  DownloadInfoRequest = (GF_M2TS_DSMCC_DOWNLOAD_INFO_REQUEST*)DataMessage->dataMessagePayload;
+		if(DownloadInfoRequest->privateDataLength) {
+			gf_free(DownloadInfoRequest->privateDataByte);
 		}
+		gf_free(DownloadInfoRequest);
+		break;
+	}
 	case DOWNLOAD_INFO_REPONSE_INDICATION:
-		{			
-			GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC* DownloadInfoIndication = (GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC*)DataMessage->dataMessagePayload;
-
-			/* Compatibility Descr */
-			gf_m2ts_dsmcc_delete_compatibility_descriptor(&DownloadInfoIndication->CompatibilityDescr);
-			
-			if (DownloadInfoIndication->privateDataLength) {
-				gf_free(DownloadInfoIndication->privateDataByte);
-			}
-			gf_free(DownloadInfoIndication);
-			break;
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC* DownloadInfoIndication = (GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC*)DataMessage->dataMessagePayload;
+
+		/* Compatibility Descr */
+		gf_m2ts_dsmcc_delete_compatibility_descriptor(&DownloadInfoIndication->CompatibilityDescr);
+
+		if (DownloadInfoIndication->privateDataLength) {
+			gf_free(DownloadInfoIndication->privateDataByte);
 		}
+		gf_free(DownloadInfoIndication);
+		break;
+	}
 	case DOWNLOAD_DATA_BLOCK:
-		{
-			GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK* DownloadDataBlock = (GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK*)DataMessage->dataMessagePayload;
-			if (DownloadDataBlock->dataBlocksize) {
-				gf_free(DownloadDataBlock->blockDataByte);
-			}
-			gf_free(DownloadDataBlock);
-			break;
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK* DownloadDataBlock = (GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK*)DataMessage->dataMessagePayload;
+		if (DownloadDataBlock->dataBlocksize) {
+			gf_free(DownloadDataBlock->blockDataByte);
 		}
+		gf_free(DownloadDataBlock);
+		break;
+	}
 	case DOWNLOAD_DATA_REQUEST:
-		{
-			GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE* DownloadDataRequest = (GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE*)DataMessage->dataMessagePayload;
-			gf_free(DownloadDataRequest);
-			break;
-		}
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE* DownloadDataRequest = (GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE*)DataMessage->dataMessagePayload;
+		gf_free(DownloadDataRequest);
+		break;
+	}
 	case DOWNLOAD_DATA_CANCEL:
-		{
-			GF_M2TS_DSMCC_DOWNLOAD_CANCEL* DownloadCancel = (GF_M2TS_DSMCC_DOWNLOAD_CANCEL*)DataMessage->dataMessagePayload;			
-			if (DownloadCancel->privateDataLength) {
-				gf_free(DownloadCancel->privateDataByte);
-			}
-			gf_free(DownloadCancel);
-			break;
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_CANCEL* DownloadCancel = (GF_M2TS_DSMCC_DOWNLOAD_CANCEL*)DataMessage->dataMessagePayload;
+		if (DownloadCancel->privateDataLength) {
+			gf_free(DownloadCancel->privateDataByte);
 		}
+		gf_free(DownloadCancel);
+		break;
+	}
 	case DOWNLOAD_SERVER_INITIATE:
-		{
-			GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT* DownloadServerInit = (GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT*)DataMessage->dataMessagePayload;
-			gf_m2ts_dsmcc_delete_compatibility_descriptor(&DownloadServerInit->CompatibilityDescr);
-			if (DownloadServerInit->privateDataLength) {
-				gf_free(DownloadServerInit->privateDataByte);
-			}
-			gf_free(DownloadServerInit);
-			break;
+	{
+		GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT* DownloadServerInit = (GF_M2TS_DSMCC_DOWNLOAD_SERVER_INIT*)DataMessage->dataMessagePayload;
+		gf_m2ts_dsmcc_delete_compatibility_descriptor(&DownloadServerInit->CompatibilityDescr);
+		if (DownloadServerInit->privateDataLength) {
+			gf_free(DownloadServerInit->privateDataByte);
 		}
+		gf_free(DownloadServerInit);
+		break;
+	}
 	default:
-		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unknown dataMessagePayload Type \n"));
-			break;
-		}
-	} 
+	{
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unknown dataMessagePayload Type \n"));
+		break;
+	}
+	}
 
 	/* Header */
 	gf_m2ts_dsmcc_delete_message_header(&DataMessage->DownloadDataHeader);
@@ -760,7 +760,7 @@
 }
 
 
-static GF_Err dsmcc_module_delete(GF_M2TS_DSMCC_MODULE* dsmcc_module){
+static GF_Err dsmcc_module_delete(GF_M2TS_DSMCC_MODULE* dsmcc_module) {
 
 	gf_free(dsmcc_module->buffer);
 	gf_free(dsmcc_module);
@@ -770,7 +770,7 @@
 
 /* BIOP MESSAGE */
 
-static GF_Err dsmcc_get_biop_module_info(GF_M2TS_DSMCC_MODULE* dsmcc_module,char* data,u8 data_size){
+static GF_Err dsmcc_get_biop_module_info(GF_M2TS_DSMCC_MODULE* dsmcc_module,char* data,u8 data_size) {
 
 	GF_M2TS_DSMCC_BIOP_MODULE_INFO* BIOP_ModuleInfo;
 	GF_BitStream *bs;
@@ -785,90 +785,90 @@
 	BIOP_ModuleInfo->blockTimeOut = gf_bs_read_int(bs,32);
 	BIOP_ModuleInfo->minBlockTime = gf_bs_read_int(bs,32);
 	BIOP_ModuleInfo->taps_count = gf_bs_read_int(bs,8);
-	if(!BIOP_ModuleInfo->taps_count){
+	if(!BIOP_ModuleInfo->taps_count) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Corrupted payload for BIOP Module Info \n"));
-		gf_list_del(BIOP_ModuleInfo->descriptor);	
+		gf_list_del(BIOP_ModuleInfo->descriptor);
 		gf_free(BIOP_ModuleInfo);
-		return GF_CORRUPTED_DATA;	
+		return GF_CORRUPTED_DATA;
 	}
 
 	BIOP_ModuleInfo->Taps = (GF_M2TS_DSMCC_BIOP_TAPS*)gf_calloc(BIOP_ModuleInfo->taps_count,sizeof(GF_M2TS_DSMCC_BIOP_TAPS));
-	for(i = 0; i < BIOP_ModuleInfo->taps_count; i++){
+	for(i = 0; i < BIOP_ModuleInfo->taps_count; i++) {
 		BIOP_ModuleInfo->Taps[i].id = gf_bs_read_int(bs,16);
 		BIOP_ModuleInfo->Taps[i].use = gf_bs_read_int(bs,16);
 		BIOP_ModuleInfo->Taps[i].assocTag = gf_bs_read_int(bs,16);
 		BIOP_ModuleInfo->Taps[i].selector_length = gf_bs_read_int(bs,8);
-		if(BIOP_ModuleInfo->Taps[i].selector_length){
+		if(BIOP_ModuleInfo->Taps[i].selector_length) {
 			BIOP_ModuleInfo->Taps[i].selector_data = (char*)gf_calloc(BIOP_ModuleInfo->Taps[i].selector_length,sizeof(char));
 			gf_bs_read_data(bs,BIOP_ModuleInfo->Taps[i].selector_data,(u8)(BIOP_ModuleInfo->Taps[i].selector_length));
 		}
-		if(i == 0 && (BIOP_ModuleInfo->Taps[i].id != 0x00 || BIOP_ModuleInfo->Taps[i].use != 0x17 || BIOP_ModuleInfo->Taps[i].selector_length != 0x00)){
+		if(i == 0 && (BIOP_ModuleInfo->Taps[i].id != 0x00 || BIOP_ModuleInfo->Taps[i].use != 0x17 || BIOP_ModuleInfo->Taps[i].selector_length != 0x00)) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Corrupted payload for BIOP Module Info \n"));
 			gf_free(BIOP_ModuleInfo->Taps);
 			gf_list_del(BIOP_ModuleInfo->descriptor);
 			gf_free(BIOP_ModuleInfo);
-			return GF_CORRUPTED_DATA;	
+			return GF_CORRUPTED_DATA;
 		}
 	}
 	BIOP_ModuleInfo->userInfoLength = gf_bs_read_int(bs,8);
-	if(BIOP_ModuleInfo->userInfoLength){
+	if(BIOP_ModuleInfo->userInfoLength) {
 
 		u32 nb_desc,j;
 		u8* descr_tag;
 
-		dsmcc_biop_descriptor(bs,BIOP_ModuleInfo->descriptor,(u32)(BIOP_ModuleInfo->userInfoLength));		
+		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){
+		while(j<nb_desc) {
 
 			/* get the descriptor tag */
 			descr_tag = (u8*)gf_list_get(BIOP_ModuleInfo->descriptor,j);
-			
-			switch(*descr_tag){
 
-				case CACHING_PRIORITY_DESCRIPTOR:
-					{
-						//GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR* CachingPriorityDescr = (GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR*)gf_list_get(BIOP_ModuleInfo->descriptor,j);						
-						break;					
-					}
-				case COMPRESSED_MODULE_DESCRIPTOR:
-					{
-						u8 comp_meth;
-						GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR* CompModuleDescr = (GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR*)gf_list_get(BIOP_ModuleInfo->descriptor,j);					
-						/*if CompModuleDescr->compression_method least significant nibble is eq to 0x08, the terminal shall support the Deflate compression algorithm (GZIP)*/
-						comp_meth = (CompModuleDescr->compression_method &0x0F);
-						if(comp_meth == 0x08){
-							dsmcc_module->Gzip = 1;
-						}						
-						dsmcc_module->original_size = CompModuleDescr->original_size;						
-						break;	
+			switch(*descr_tag) {
 
-					}
-				default:
-					{
-						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported descriptor Type \n"));
-						break;
-					}
-			}			
+			case CACHING_PRIORITY_DESCRIPTOR:
+			{
+				//GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR* CachingPriorityDescr = (GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR*)gf_list_get(BIOP_ModuleInfo->descriptor,j);
+				break;
+			}
+			case COMPRESSED_MODULE_DESCRIPTOR:
+			{
+				u8 comp_meth;
+				GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR* CompModuleDescr = (GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR*)gf_list_get(BIOP_ModuleInfo->descriptor,j);
+				/*if CompModuleDescr->compression_method least significant nibble is eq to 0x08, the terminal shall support the Deflate compression algorithm (GZIP)*/
+				comp_meth = (CompModuleDescr->compression_method &0x0F);
+				if(comp_meth == 0x08) {
+					dsmcc_module->Gzip = 1;
+				}
+				dsmcc_module->original_size = CompModuleDescr->original_size;
+				break;
+
+			}
+			default:
+			{
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported descriptor Type \n"));
+				break;
+			}
+			}
 			j++;
 		}
 	}
-		
+
 	dsmcc_free_biop_descriptor(BIOP_ModuleInfo->descriptor);
 
-	for(i = 0; i < BIOP_ModuleInfo->taps_count; i++){
-		if(BIOP_ModuleInfo->Taps[i].selector_length){
+	for(i = 0; i < BIOP_ModuleInfo->taps_count; i++) {
+		if(BIOP_ModuleInfo->Taps[i].selector_length) {
 			gf_free(BIOP_ModuleInfo->Taps[i].selector_data);
-		}		
+		}
 	}
 	gf_free(BIOP_ModuleInfo->Taps);
-	gf_free(BIOP_ModuleInfo);	
+	gf_free(BIOP_ModuleInfo);
 
 	return GF_OK;
 }
 
-static GF_Err dsmcc_process_biop_data(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,GF_M2TS_DSMCC_MODULE* dsmcc_module,char* data,u32 data_size){
+static GF_Err dsmcc_process_biop_data(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,GF_M2TS_DSMCC_MODULE* dsmcc_module,char* data,u32 data_size) {
 
 	GF_BitStream *bs;
 	GF_Err e;
@@ -884,54 +884,54 @@
 
 	byte_shift = (u32)(gf_bs_get_position(bs));
 
-	while(byte_shift < data_size){
+	while(byte_shift < data_size) {
 
 		BIOP_Header = dsmcc_process_biop_header(bs);
 
-		if(BIOP_Header){
-			if(!strcmp(BIOP_Header->objectKind_data,"fil")){
+		if(BIOP_Header) {
+			if(!strcmp(BIOP_Header->objectKind_data,"fil")) {
 				e = dsmcc_process_biop_file(bs,BIOP_Header,dsmcc_overlord,dsmcc_module->moduleId,dsmcc_module->downloadId);
-			}else if(!strcmp(BIOP_Header->objectKind_data,"dir")){
+			} else if(!strcmp(BIOP_Header->objectKind_data,"dir")) {
 				e = dsmcc_process_biop_directory(bs,BIOP_Header,dsmcc_overlord,0);
-			}else if(!strcmp(BIOP_Header->objectKind_data,"srg")){
+			} else if(!strcmp(BIOP_Header->objectKind_data,"srg")) {
 				e = dsmcc_process_biop_directory(bs,BIOP_Header,dsmcc_overlord,1);
-				if(e == GF_OK){
+				if(e == GF_OK) {
 					dsmcc_overlord->Got_ServiceGateway = 1;
 				}
-			}else if(!strcmp(BIOP_Header->objectKind_data,"str")){
+			} else if(!strcmp(BIOP_Header->objectKind_data,"str")) {
 				dsmcc_process_biop_stream_message(bs,BIOP_Header,ServiceGateway);
-			}else if(!strcmp(BIOP_Header->objectKind_data,"ste")){
+			} else if(!strcmp(BIOP_Header->objectKind_data,"ste")) {
 				dsmcc_process_biop_stream_event(bs,BIOP_Header,ServiceGateway);
-			}else{
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported BIOP Message, abording process \n"));				
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported BIOP Message, abording process \n"));
 			}
 		}
 		byte_shift = (u32)(gf_bs_get_position(bs));
-		if((e || !BIOP_Header) && (byte_shift < data_size)){
+		if((e || !BIOP_Header) && (byte_shift < data_size)) {
 			/* Error inside the data. Read next byte until a new "BIOP" is found or data_size is reached */
 			gf_bs_read_int(bs,8);
 			Error = 1;
 		}
-		if(BIOP_Header){
+		if(BIOP_Header) {
 			dsmcc_free_biop_header(BIOP_Header);
 		}
-		
+
 	}
 
-	if(Error){
+	if(Error) {
 		return GF_CORRUPTED_DATA;
 	}
 
 	return GF_OK;
 }
 
-static GF_M2TS_DSMCC_BIOP_HEADER* dsmcc_process_biop_header(GF_BitStream* bs){
-	
+static GF_M2TS_DSMCC_BIOP_HEADER* dsmcc_process_biop_header(GF_BitStream* bs) {
+
 	GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header;
 	GF_SAFEALLOC(BIOP_Header,GF_M2TS_DSMCC_BIOP_HEADER);
 
 	BIOP_Header->magic = gf_bs_read_int(bs,32);
-	if(BIOP_Header->magic != 0x42494F50){
+	if(BIOP_Header->magic != 0x42494F50) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Wrong BIOP Header, abording process \n"));
 		return NULL;
 	}
@@ -941,11 +941,11 @@
 	BIOP_Header->message_type = gf_bs_read_int(bs,8);
 	BIOP_Header->message_size = gf_bs_read_int(bs,32);
 	BIOP_Header->objectKey_length = gf_bs_read_int(bs,8);
-	if(BIOP_Header->objectKey_length){
+	if(BIOP_Header->objectKey_length) {
 		BIOP_Header->objectKey_data = gf_bs_read_int(bs,BIOP_Header->objectKey_length*8);
 	}
 	BIOP_Header->objectKind_length = gf_bs_read_int(bs,32);
-	if(BIOP_Header->objectKind_length){
+	if(BIOP_Header->objectKind_length) {
 		BIOP_Header->objectKind_data = (char*)gf_calloc(BIOP_Header->objectKind_length,sizeof(char));
 		gf_bs_read_data(bs,BIOP_Header->objectKind_data,(u32)(BIOP_Header->objectKind_length));
 	}
@@ -954,9 +954,9 @@
 	return BIOP_Header;
 }
 
-static GF_Err dsmcc_process_biop_file(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_OVERLORD*dsmcc_overlord,u16 moduleId,u32 downloadId){
+static GF_Err dsmcc_process_biop_file(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_OVERLORD*dsmcc_overlord,u16 moduleId,u32 downloadId) {
 
-	u32 nb_desc,descr_size;		
+	u32 nb_desc,descr_size;
 	GF_M2TS_DSMCC_BIOP_FILE* BIOP_File;
 	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway;
 	GF_M2TS_DSMCC_FILE* File;
@@ -967,73 +967,73 @@
 
 	ServiceGateway = dsmcc_overlord->ServiceGateway;
 
-	BIOP_File->Header = BIOP_Header;	
-	BIOP_File->ContentSize = gf_bs_read_int(bs,64);	
+	BIOP_File->Header = BIOP_Header;
+	BIOP_File->ContentSize = gf_bs_read_int(bs,64);
 
 	descr_size = BIOP_File->Header->objectInfo_length-8;
 
-	if(descr_size){
+	if(descr_size) {
 		dsmcc_biop_descriptor(bs,BIOP_File->descriptor,descr_size);
 	}
 
-	 gf_bs_read_int(bs,(u32)(descr_size));
+	gf_bs_read_int(bs,(u32)(descr_size));
 
 	nb_desc = gf_list_count(BIOP_File->descriptor);
 
-	while(nb_desc){
+	while(nb_desc) {
 
 		/* get the descriptor tag */
-		descr_tag = (u8*)gf_list_get(BIOP_File->descriptor,0);				
+		descr_tag = (u8*)gf_list_get(BIOP_File->descriptor,0);
 
-		switch(*descr_tag){
-				case CONTENT_TYPE_DESCRIPTOR:
-					{
-						//GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR* ContentTypeDescr = (GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR*)gf_list_get(BIOP_File->descriptor,0);						
-					}
-				default:
-					{
-						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported descriptor Type \n"));
-						break;
-					}
-		}		
+		switch(*descr_tag) {
+		case CONTENT_TYPE_DESCRIPTOR:
+		{
+			//GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR* ContentTypeDescr = (GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR*)gf_list_get(BIOP_File->descriptor,0);
+		}
+		default:
+		{
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported descriptor Type \n"));
+			break;
+		}
+		}
 		nb_desc--;
 	}
 
 	BIOP_File->serviceContextList_count = gf_bs_read_int(bs,8);
-	if(BIOP_File->serviceContextList_count){
+	if(BIOP_File->serviceContextList_count) {
 		BIOP_File->ServiceContext = (GF_M2TS_DSMCC_SERVICE_CONTEXT*)gf_calloc(BIOP_File->serviceContextList_count,sizeof(GF_M2TS_DSMCC_SERVICE_CONTEXT));
 		dsmcc_biop_get_context(bs,BIOP_File->ServiceContext,BIOP_File->serviceContextList_count);
 	}
 	BIOP_File->messageBody_length = gf_bs_read_int(bs,32);
 	BIOP_File->content_length = gf_bs_read_int(bs,32);
-	if(BIOP_File->content_length){
+	if(BIOP_File->content_length) {
 		BIOP_File->content_byte = (char*)gf_calloc(BIOP_File->content_length,sizeof(char));
 		gf_bs_read_data(bs,BIOP_File->content_byte,(u32)(BIOP_File->content_length));
 
 	}
 	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 = dsmcc_get_file(ServiceGateway->File,moduleId,downloadId,BIOP_File->Header->objectKey_data);
+	if(File) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Fichier: %s module_Id %d place :%d \n",File->Path,moduleId,File->objectKey_data));
 		pFile = fopen(File->Path,"wb");
-		if (pFile!=NULL){
-			gf_fwrite(BIOP_File->content_byte,1,BIOP_File->content_length ,pFile);			
+		if (pFile!=NULL) {
+			gf_fwrite(BIOP_File->content_byte,1,BIOP_File->content_length ,pFile);
 			fclose(pFile);
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Fichier créé \n\n"));
-			if(!strcmp(File->name,"index.html")){
+			if(!strcmp(File->name,"index.html")) {
 				dsmcc_overlord->get_index = 1;
 			}
 		}
-	}else{
+	} else {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[DSMCC] File vould not be created\n"));
 	}
 
-	dsmcc_free_biop_file(BIOP_File);	
+	dsmcc_free_biop_file(BIOP_File);
 
 	return GF_OK;
 }
 
-static GF_Err dsmcc_process_biop_directory(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_OVERLORD*dsmcc_overlord,Bool IsServiceGateway){
+static GF_Err dsmcc_process_biop_directory(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_OVERLORD*dsmcc_overlord,Bool IsServiceGateway) {
 
 	GF_M2TS_DSMCC_BIOP_DIRECTORY* BIOP_Directory;
 	GF_M2TS_DSMCC_DIR* Dir;
@@ -1046,25 +1046,25 @@
 
 	/* Get the Header */
 	BIOP_Directory->Header = BIOP_Header;
-	
-	if(BIOP_Directory->Header->objectInfo_length != 0x0){
+
+	if(BIOP_Directory->Header->objectInfo_length != 0x0) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] ObjectInfo_length value is not correct \n"));
 		return GF_CORRUPTED_DATA;
 	}
-	
-	if(IsServiceGateway){
-		/* create a "dir" struct with no parent */			
+
+	if(IsServiceGateway) {
+		/* create a "dir" struct with no parent */
 		Dir = (GF_M2TS_DSMCC_DIR*)ServiceGateway;
 		ServiceGateway->objectKey_data = BIOP_Directory->Header->objectKey_data;
-		ServiceGateway->parent = NULL;			
+		ServiceGateway->parent = NULL;
 		ServiceGateway->name = (char*)gf_strdup(dsmcc_overlord->root_dir);
-	}else{
+	} else {
 		/* get the dir related to the payload */
-		Dir = dsmcc_get_directory(ServiceGateway->Dir,BIOP_Directory->Header->objectKey_data);		
+		Dir = dsmcc_get_directory(ServiceGateway->Dir,BIOP_Directory->Header->objectKey_data);
 	}
 
 	BIOP_Directory->serviceContextList_count = gf_bs_read_int(bs,8);
-	if(BIOP_Directory->serviceContextList_count){
+	if(BIOP_Directory->serviceContextList_count) {
 		BIOP_Directory->ServiceContext = (GF_M2TS_DSMCC_SERVICE_CONTEXT*)gf_calloc(BIOP_Directory->serviceContextList_count,sizeof(GF_M2TS_DSMCC_SERVICE_CONTEXT));
 		dsmcc_biop_get_context(bs,BIOP_Directory->ServiceContext,BIOP_Directory->serviceContextList_count);
 	}
@@ -1073,44 +1073,44 @@
 	BIOP_Directory->Name = (GF_M2TS_DSMCC_BIOP_NAME*)gf_calloc(BIOP_Directory->bindings_count,sizeof(GF_M2TS_DSMCC_BIOP_NAME));
 
 	/* Get the linked files */
-	for(i = 0; i<BIOP_Directory->bindings_count;i++){
+	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);
 		BIOP_Directory->Name[i].id_length = gf_bs_read_int(bs,8);
-		if(BIOP_Directory->Name[i].id_length){
+		if(BIOP_Directory->Name[i].id_length) {
 			BIOP_Directory->Name[i].id_data = (char*)gf_calloc(BIOP_Directory->Name[i].id_length,sizeof(char));
 			gf_bs_read_data(bs,BIOP_Directory->Name[i].id_data,(u32)(BIOP_Directory->Name[i].id_length));
 		}
 		BIOP_Directory->Name[i].kind_length = gf_bs_read_int(bs,8);
-		if(BIOP_Directory->Name[i].kind_length > 0x04){
+		if(BIOP_Directory->Name[i].kind_length > 0x04) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] kind_length value is not valid\n"));
 			return GF_CORRUPTED_DATA;
 		}
-		if(BIOP_Directory->Name[i].kind_length){
+		if(BIOP_Directory->Name[i].kind_length) {
 			BIOP_Directory->Name[i].kind_data = (char*)gf_calloc(BIOP_Directory->Name[i].kind_length,sizeof(char));
 			gf_bs_read_data(bs,BIOP_Directory->Name[i].kind_data,(u32)(BIOP_Directory->Name[i].kind_length));
 		}
-	
+
 		BIOP_Directory->Name[i].BindingType = gf_bs_read_int(bs,8);
 		/* IOR */
 		e = dsmcc_biop_get_ior(bs,&BIOP_Directory->Name[i].IOR);
-		if(e){
+		if(e) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in IOR processing\n"));
 			return GF_CORRUPTED_DATA;
 		}
 
 		BIOP_Directory->Name[i].objectInfo_length = gf_bs_read_int(bs,16);
-		if(!strcmp(BIOP_Directory->Name[i].kind_data,"fil")){
+		if(!strcmp(BIOP_Directory->Name[i].kind_data,"fil")) {
 			BIOP_Directory->Name[i].ContentSize = gf_bs_read_int(bs,64);
 			descr_length = BIOP_Directory->Name[i].objectInfo_length - 8;
-		}else{
+		} else {
 			descr_length = BIOP_Directory->Name[i].objectInfo_length;
 		}
 
-		if(descr_length){
+		if(descr_length) {
 			BIOP_Directory->Name[i].descriptor = gf_list_new();
 			dsmcc_biop_descriptor(bs,BIOP_Directory->Name[i].descriptor,descr_length);
 		}
@@ -1119,68 +1119,68 @@
 
 		nb_desc = gf_list_count(BIOP_Directory->Name[i].descriptor);
 		j = 0;
-		while(j<nb_desc){
+		while(j<nb_desc) {
 			/* get the descriptor tag */
-			descr_tag = (u8*)gf_list_get(BIOP_Directory->Name[i].descriptor ,0);		
+			descr_tag = (u8*)gf_list_get(BIOP_Directory->Name[i].descriptor ,0);
 
-			switch(*descr_tag){
-					case CONTENT_TYPE_DESCRIPTOR:
-						{
-							//GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR* ContentTypeDescr = (GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR*)gf_list_get(BIOP_Directory->Name[i].descriptor ,j);						
-						}
-					default:
-						{
-							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported descriptor Type \n"));
-							break;
-						}
-			}				
+			switch(*descr_tag) {
+			case CONTENT_TYPE_DESCRIPTOR:
+			{
+				//GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR* ContentTypeDescr = (GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR*)gf_list_get(BIOP_Directory->Name[i].descriptor ,j);
+			}
+			default:
+			{
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported descriptor Type \n"));
+				break;
+			}
+			}
 			j++;
 		}
-			
-		if(!strcmp(BIOP_Directory->Name[i].kind_data,"dir")){
-			if(!dsmcc_check_element_validation(ServiceGateway->Dir,ServiceGateway->name,BIOP_Directory->Name[i])){
+
+		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_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);
 				Directory->name = (char*)gf_strdup(BIOP_Directory->Name[i].id_data);
 				Directory->File = gf_list_new();
 				Directory->objectKey_data = taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_data;
 				Directory->downloadId = taggedProfile->BIOPProfileBody->ObjectLocation.carouselId;
-				Directory->moduleId = taggedProfile->BIOPProfileBody->ObjectLocation.moduleId;			
+				Directory->moduleId = taggedProfile->BIOPProfileBody->ObjectLocation.moduleId;
 				Directory->parent = Dir;
 				Directory->Path = dsmcc_get_file_namepath(Dir,Directory->name);
 				e = gf_mkdir(Directory->Path);
-				if(e){
+				if(e) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error during the creation of the directory %s \n",Directory->Path));
 				}
 				gf_list_add(ServiceGateway->Dir,Directory);
 			}
-		}else if(!strcmp(BIOP_Directory->Name[i].kind_data,"fil")){
-			if(!dsmcc_check_element_validation(ServiceGateway->File,ServiceGateway->name,BIOP_Directory->Name[i])){
+		} else if(!strcmp(BIOP_Directory->Name[i].kind_data,"fil")) {
+			if(!dsmcc_check_element_validation(ServiceGateway->File,ServiceGateway->name,BIOP_Directory->Name[i])) {
 				GF_M2TS_DSMCC_FILE* File;
-				GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = (GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE*)gf_list_get(BIOP_Directory->Name[i].IOR.taggedProfile,0);					
+				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(File,GF_M2TS_DSMCC_FILE);
-				File->name = (char*)gf_strdup(BIOP_Directory->Name[i].id_data);					
+				File->name = (char*)gf_strdup(BIOP_Directory->Name[i].id_data);
 				File->objectKey_data = taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_data;
 				File->downloadId = taggedProfile->BIOPProfileBody->ObjectLocation.carouselId;
-				File->moduleId = taggedProfile->BIOPProfileBody->ObjectLocation.moduleId;						
+				File->moduleId = taggedProfile->BIOPProfileBody->ObjectLocation.moduleId;
 				File->parent = Dir;
 				File->Path = dsmcc_get_file_namepath(Dir,File->name);
 				gf_list_add(ServiceGateway->File,File);
 			}
-		}		
+		}
 	}
 	dsmcc_free_biop_directory(BIOP_Directory);
-	
+
 	return GF_OK;
 }
 
-static GF_Err dsmcc_process_biop_stream_event(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway){
+static GF_Err dsmcc_process_biop_stream_event(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway) {
 
-	u32 i;		
+	u32 i;
 	GF_M2TS_DSMCC_BIOP_STREAM_EVENT* BIOP_StreamEvent;
-	//GF_M2TS_DSMCC_FILE* File;	
+	//GF_M2TS_DSMCC_FILE* File;
 	u32 eventdata;
 
 	GF_SAFEALLOC(BIOP_StreamEvent,GF_M2TS_DSMCC_BIOP_STREAM_EVENT);
@@ -1190,7 +1190,7 @@
 	BIOP_StreamEvent->Header = BIOP_Header;
 	/* Get Info */
 	BIOP_StreamEvent->Info.aDescription_length = gf_bs_read_int(bs,8);
-	if(BIOP_StreamEvent->Info.aDescription_length){
+	if(BIOP_StreamEvent->Info.aDescription_length) {
 		BIOP_StreamEvent->Info.aDescription_bytes = (char*)gf_calloc(BIOP_StreamEvent->Info.aDescription_length,sizeof(char));
 		gf_bs_read_data(bs,BIOP_StreamEvent->Info.aDescription_bytes,(u8)(BIOP_StreamEvent->Info.aDescription_length));
 	}
@@ -1202,12 +1202,12 @@
 
 	/* Event List */
 	BIOP_StreamEvent->eventNames_count = gf_bs_read_int(bs,16);
-	if(BIOP_StreamEvent->eventNames_count){
+	if(BIOP_StreamEvent->eventNames_count) {
 		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++){
+		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;
-			if(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));
 			}
@@ -1218,28 +1218,28 @@
 	if (BIOP_StreamEvent->serviceContextList_count) {
 		BIOP_StreamEvent->ServiceContext = (GF_M2TS_DSMCC_SERVICE_CONTEXT*)gf_calloc(BIOP_StreamEvent->serviceContextList_count,sizeof(GF_M2TS_DSMCC_SERVICE_CONTEXT));
 		dsmcc_biop_get_context(bs,BIOP_StreamEvent->ServiceContext,BIOP_StreamEvent->serviceContextList_count);
-	}	
-			
+	}
+
 	BIOP_StreamEvent->messageBody_length = gf_bs_read_int(bs,32);
 	BIOP_StreamEvent->taps_count = gf_bs_read_int(bs,8);
 	BIOP_StreamEvent->Taps = (GF_M2TS_DSMCC_BIOP_TAPS*)gf_calloc(BIOP_StreamEvent->taps_count,sizeof(GF_M2TS_DSMCC_BIOP_TAPS));
-	for (i=0;i<BIOP_StreamEvent->taps_count;i++) {
-		BIOP_StreamEvent->Taps[i].id = gf_bs_read_int(bs,16);		
-		BIOP_StreamEvent->Taps[i].use = gf_bs_read_int(bs,16);		
+	for (i=0; i<BIOP_StreamEvent->taps_count; i++) {
+		BIOP_StreamEvent->Taps[i].id = gf_bs_read_int(bs,16);
+		BIOP_StreamEvent->Taps[i].use = gf_bs_read_int(bs,16);
 		BIOP_StreamEvent->Taps[i].assocTag = gf_bs_read_int(bs,16);
 		BIOP_StreamEvent->Taps[i].selector_length = gf_bs_read_int(bs,8);
-		if(BIOP_StreamEvent->Taps[i].selector_length != 0x00){
+		if(BIOP_StreamEvent->Taps[i].selector_length != 0x00) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Stream Event : selector_length has a wrong value, abording the processing \n"));
 			return GF_CORRUPTED_DATA;
-		}		
+		}
 	}
 	BIOP_StreamEvent->eventIds_count = gf_bs_read_int(bs,8);
-	if(BIOP_StreamEvent->eventIds_count != BIOP_StreamEvent->eventNames_count){
+	if(BIOP_StreamEvent->eventIds_count != BIOP_StreamEvent->eventNames_count) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Stream Event : eventIds_count has a wrong value, abording the processing \n"));
 		return GF_CORRUPTED_DATA;
-	}else if(BIOP_StreamEvent->eventIds_count){
+	} else if(BIOP_StreamEvent->eventIds_count) {
 		BIOP_StreamEvent->eventId = (u16*)gf_calloc(BIOP_StreamEvent->eventIds_count,sizeof(u16));
-		for(i =0;i<BIOP_StreamEvent->eventIds_count;i++){
+		for(i =0; i<BIOP_StreamEvent->eventIds_count; i++) {
 			BIOP_StreamEvent->eventId[i] = gf_bs_read_int(bs,16);
 		}
 	}
@@ -1249,9 +1249,9 @@
 	return GF_OK;
 }
 
-static GF_Err dsmcc_process_biop_stream_message(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway){
+static GF_Err dsmcc_process_biop_stream_message(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway) {
 
-	u32 i;		
+	u32 i;
 	GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage;
 
 	GF_SAFEALLOC(BIOP_StreamMessage,GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE);
@@ -1259,7 +1259,7 @@
 	BIOP_StreamMessage->Header = BIOP_Header;
 	/* Get Info */
 	BIOP_StreamMessage->Info.aDescription_length = gf_bs_read_int(bs,8);
-	if(BIOP_StreamMessage->Info.aDescription_length){
+	if(BIOP_StreamMessage->Info.aDescription_length) {
 		BIOP_StreamMessage->Info.aDescription_bytes = (char*)gf_calloc(BIOP_StreamMessage->Info.aDescription_length,sizeof(char));
 		gf_bs_read_data(bs,BIOP_StreamMessage->Info.aDescription_bytes,(u8)(BIOP_StreamMessage->Info.aDescription_length));
 	}
@@ -1268,25 +1268,25 @@
 	BIOP_StreamMessage->Info.audio = gf_bs_read_int(bs,8);
 	BIOP_StreamMessage->Info.video = gf_bs_read_int(bs,8);
 	BIOP_StreamMessage->Info.data = gf_bs_read_int(bs,8);
-	
+
 	BIOP_StreamMessage->serviceContextList_count = gf_bs_read_int(bs,8);
-	if(BIOP_StreamMessage->serviceContextList_count){
+	if(BIOP_StreamMessage->serviceContextList_count) {
 		BIOP_StreamMessage->ServiceContext = (GF_M2TS_DSMCC_SERVICE_CONTEXT*)gf_calloc(BIOP_StreamMessage->serviceContextList_count,sizeof(GF_M2TS_DSMCC_SERVICE_CONTEXT));
 		dsmcc_biop_get_context(bs,BIOP_StreamMessage->ServiceContext,BIOP_StreamMessage->serviceContextList_count);
 	}
-				
+
 	BIOP_StreamMessage->messageBody_length = gf_bs_read_int(bs,32);
 	BIOP_StreamMessage->taps_count = gf_bs_read_int(bs,8);
 	BIOP_StreamMessage->Taps = (GF_M2TS_DSMCC_BIOP_TAPS*)gf_calloc(BIOP_StreamMessage->taps_count,sizeof(GF_M2TS_DSMCC_BIOP_TAPS));
-	for(i=0;i<BIOP_StreamMessage->taps_count;i++){
-		BIOP_StreamMessage->Taps[i].id = gf_bs_read_int(bs,16);		
-		BIOP_StreamMessage->Taps[i].use = gf_bs_read_int(bs,16);		
+	for(i=0; i<BIOP_StreamMessage->taps_count; i++) {
+		BIOP_StreamMessage->Taps[i].id = gf_bs_read_int(bs,16);
+		BIOP_StreamMessage->Taps[i].use = gf_bs_read_int(bs,16);
 		BIOP_StreamMessage->Taps[i].assocTag = gf_bs_read_int(bs,16);
 		BIOP_StreamMessage->Taps[i].selector_length = gf_bs_read_int(bs,8);
-		if(BIOP_StreamMessage->Taps[i].selector_length != 0x00){
+		if(BIOP_StreamMessage->Taps[i].selector_length != 0x00) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Stream Event : selector_length has a wrong value, abording the processing \n"));
 			return GF_CORRUPTED_DATA;
-		}		
+		}
 	}
 
 	dsmcc_free_biop_stream_message(BIOP_StreamMessage);
@@ -1317,63 +1317,63 @@
 	return dsmcc_module;
 }
 
-static void dsmcc_biop_descriptor(GF_BitStream* bs,GF_List* list,u32 size){
+static void dsmcc_biop_descriptor(GF_BitStream* bs,GF_List* list,u32 size) {
 	u8 descr_tag;
 	u32 data_shift,start_pos;
 
 	start_pos = (u32)(gf_bs_get_position(bs));
-		data_shift = 0;
-
-	while(size > data_shift){
-	descr_tag = gf_bs_read_int(bs,8);			
-
-			switch(descr_tag){
-
-				case CACHING_PRIORITY_DESCRIPTOR:
-					{
-						GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR* CachingPriorityDescr;
-						GF_SAFEALLOC(CachingPriorityDescr,GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR);
-						CachingPriorityDescr->descriptor_tag = descr_tag;
-						CachingPriorityDescr->descriptor_length = gf_bs_read_int(bs,8);
-						CachingPriorityDescr->priority_value = gf_bs_read_int(bs,8);
-						CachingPriorityDescr->transparency_level = gf_bs_read_int(bs,8);
-						gf_list_add(list,CachingPriorityDescr);
-						break;					
-					}
-				case COMPRESSED_MODULE_DESCRIPTOR:
-					{
-						GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR* CompModuleDescr;
-						GF_SAFEALLOC(CompModuleDescr,GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR);
-						CompModuleDescr->descriptor_tag = descr_tag;
-						CompModuleDescr->descriptor_length = gf_bs_read_int(bs,8);
-						CompModuleDescr->compression_method = gf_bs_read_int(bs,8);
-						/* if CompModuleDescr->compression_method least significant nibble is eq to 0x08, the terminal shall support the Deflate compression algorithm (GZIP) */
-						CompModuleDescr->original_size = gf_bs_read_int(bs,32);				
-						gf_list_add(list,CompModuleDescr);
-						break;	
+	data_shift = 0;
 
-					}
-				case CONTENT_TYPE_DESCRIPTOR:
-					{
-						GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR* ContentTypeDescr;
-						GF_SAFEALLOC(ContentTypeDescr,GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR);
-						ContentTypeDescr->descriptor_tag = descr_tag;
-						ContentTypeDescr->descriptor_length = gf_bs_read_int(bs,8);
-						ContentTypeDescr->content_type_data_byte = (char*)gf_calloc(ContentTypeDescr->descriptor_length,sizeof(char));
-						gf_bs_read_data(bs,ContentTypeDescr->content_type_data_byte,(u32)(ContentTypeDescr->descriptor_length));
-						gf_list_add(list,ContentTypeDescr);
-					}
-				default:
-					{
-						u32 size;
-						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);
-						break;
-					}
-			}			
-			data_shift = (u32)(gf_bs_get_position(bs)) - start_pos;
+	while(size > data_shift) {
+		descr_tag = gf_bs_read_int(bs,8);
+
+		switch(descr_tag) {
+
+		case CACHING_PRIORITY_DESCRIPTOR:
+		{
+			GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR* CachingPriorityDescr;
+			GF_SAFEALLOC(CachingPriorityDescr,GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR);
+			CachingPriorityDescr->descriptor_tag = descr_tag;
+			CachingPriorityDescr->descriptor_length = gf_bs_read_int(bs,8);
+			CachingPriorityDescr->priority_value = gf_bs_read_int(bs,8);
+			CachingPriorityDescr->transparency_level = gf_bs_read_int(bs,8);
+			gf_list_add(list,CachingPriorityDescr);
+			break;
+		}
+		case COMPRESSED_MODULE_DESCRIPTOR:
+		{
+			GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR* CompModuleDescr;
+			GF_SAFEALLOC(CompModuleDescr,GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR);
+			CompModuleDescr->descriptor_tag = descr_tag;
+			CompModuleDescr->descriptor_length = gf_bs_read_int(bs,8);
+			CompModuleDescr->compression_method = gf_bs_read_int(bs,8);
+			/* if CompModuleDescr->compression_method least significant nibble is eq to 0x08, the terminal shall support the Deflate compression algorithm (GZIP) */
+			CompModuleDescr->original_size = gf_bs_read_int(bs,32);
+			gf_list_add(list,CompModuleDescr);
+			break;
+
+		}
+		case CONTENT_TYPE_DESCRIPTOR:
+		{
+			GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR* ContentTypeDescr;
+			GF_SAFEALLOC(ContentTypeDescr,GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR);
+			ContentTypeDescr->descriptor_tag = descr_tag;
+			ContentTypeDescr->descriptor_length = gf_bs_read_int(bs,8);
+			ContentTypeDescr->content_type_data_byte = (char*)gf_calloc(ContentTypeDescr->descriptor_length,sizeof(char));
+			gf_bs_read_data(bs,ContentTypeDescr->content_type_data_byte,(u32)(ContentTypeDescr->descriptor_length));
+			gf_list_add(list,ContentTypeDescr);
+		}
+		default:
+		{
+			u32 size;
+			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);
+			break;
+		}
+		}
+		data_shift = (u32)(gf_bs_get_position(bs)) - start_pos;
 	}
 }
 
@@ -1381,10 +1381,10 @@
 {
 	u32 i;
 
-	for(i=0;i<serviceContextList_count;i++){
-		Context[i].context_id = gf_bs_read_int(bs,32);					
-		Context[i].context_data_length = gf_bs_read_int(bs,16);	
-		if(Context[i].context_data_length != 0){
+	for(i=0; i<serviceContextList_count; i++) {
+		Context[i].context_id = gf_bs_read_int(bs,32);
+		Context[i].context_data_length = gf_bs_read_int(bs,16);
+		if(Context[i].context_data_length != 0) {
 			Context[i].context_data_byte = (char*)gf_calloc(Context[i].context_data_length ,sizeof(char));
 			gf_bs_read_data(bs,Context[i].context_data_byte,(u32)(Context[i].context_data_length ));
 		}
@@ -1397,161 +1397,161 @@
 	/* IOR */
 	left_lite_component = 0;
 	IOR->type_id_length = gf_bs_read_int(bs,32);
-	if(IOR->type_id_length > 0xA){		
+	if(IOR->type_id_length > 0xA) {
 		//return GF_CORRUPTED_DATA;
 	}
 	IOR->type_id_byte = (char*)gf_calloc(IOR->type_id_length,sizeof(char));
 	gf_bs_read_data(bs,IOR->type_id_byte,(u32)(IOR->type_id_length));
 	IOR->taggedProfiles_count = gf_bs_read_int(bs,32);
 	IOR->taggedProfile = gf_list_new();
-	for(i = 0; i < IOR->taggedProfiles_count;i++){
+	for(i = 0; i < IOR->taggedProfiles_count; i++) {
 		GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile;
 		GF_SAFEALLOC(taggedProfile,GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE);
 		gf_list_add(IOR->taggedProfile,taggedProfile);
 		taggedProfile->profileId_tag = gf_bs_read_int(bs,32);
 		taggedProfile->profile_data_length = gf_bs_read_int(bs,32);
 		taggedProfile->profile_data_byte_order = gf_bs_read_int(bs,8);
-		if(taggedProfile->profile_data_byte_order != 0x00){
+		if(taggedProfile->profile_data_byte_order != 0x00) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in IOR processing : profile data byte order has a wrong value, abording the processing \n"));
 			return GF_CORRUPTED_DATA;
 		}
 		taggedProfile->lite_component_count = gf_bs_read_int(bs,8);
 		left_lite_component = taggedProfile->lite_component_count;
-		switch(taggedProfile->profileId_tag){
-					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){
-								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Profile Body : component tag has a wrong value, abording the processing \n"));
-								return GF_CORRUPTED_DATA;
-							}
-							taggedProfile->BIOPProfileBody->ObjectLocation.component_data_length = gf_bs_read_int(bs,8);
-							taggedProfile->BIOPProfileBody->ObjectLocation.carouselId = gf_bs_read_int(bs,32);
-							taggedProfile->BIOPProfileBody->ObjectLocation.moduleId = gf_bs_read_int(bs,16);
-							taggedProfile->BIOPProfileBody->ObjectLocation.version_major = gf_bs_read_int(bs,8);
-							if(taggedProfile->BIOPProfileBody->ObjectLocation.version_major != 0x01){
-								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Profile Body : version major has a wrong value, abording the processing \n"));
-								return GF_CORRUPTED_DATA;
-							}
-							taggedProfile->BIOPProfileBody->ObjectLocation.version_minor = gf_bs_read_int(bs,8);
-							if(taggedProfile->BIOPProfileBody->ObjectLocation.version_minor != 0x00){
-								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Profile Body : version minor has a wrong value, abording the processing \n"));
-								return GF_CORRUPTED_DATA;
-							}
-							taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_length = gf_bs_read_int(bs,8);
-							if(taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_length){
-								taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_data = gf_bs_read_int(bs,taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_length*8);
-							}
-							/* ConnBinder */
-
-							taggedProfile->BIOPProfileBody->ConnBinder.componentId_tag = gf_bs_read_int(bs,32);
-							if(taggedProfile->BIOPProfileBody->ConnBinder.componentId_tag != 0x49534F40){
-								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : componentId tag has a wrong value, abording the processing \n"));
-								return GF_CORRUPTED_DATA;
-							}
-							taggedProfile->BIOPProfileBody->ConnBinder.component_data_length = gf_bs_read_int(bs,8);
-							taggedProfile->BIOPProfileBody->ConnBinder.taps_count = gf_bs_read_int(bs,8);
-							taggedProfile->BIOPProfileBody->ConnBinder.Taps = (GF_M2TS_DSMCC_BIOP_TAPS*)gf_calloc(taggedProfile->BIOPProfileBody->ConnBinder.taps_count,sizeof(GF_M2TS_DSMCC_BIOP_TAPS));
-							for(j=0;j<taggedProfile->BIOPProfileBody->ConnBinder.taps_count;j++){
-								taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].id = gf_bs_read_int(bs,16);
-								if(taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].id != 0x00){
-									GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : id has a wrong value, abording the processing \n"));
-									return GF_CORRUPTED_DATA;
-								}
-								taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].use = gf_bs_read_int(bs,16);
-								if(taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].use != 0x016){
-									GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : use has a wrong value, abording the processing \n"));
-									return GF_CORRUPTED_DATA;
-								}
-								taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].assocTag = gf_bs_read_int(bs,16);
-								taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].selector_length = gf_bs_read_int(bs,8);
-								if(taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].selector_length != 0x0A){
-									GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : selector_length has a wrong value, abording the processing \n"));
-									return GF_CORRUPTED_DATA;
-								}
-								taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].selector_type = gf_bs_read_int(bs,16);
-								if(taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].selector_type != 0x001){
-									GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : selector_type has a wrong value, abording the processing \n"));
-									return GF_CORRUPTED_DATA;
-								}
-								taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].transactionId = gf_bs_read_int(bs,32);
-								taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].timeout = gf_bs_read_int(bs,32);
-							}
-							if(taggedProfile->BIOPProfileBody->ConnBinder.component_data_length-18 != 0){
-								taggedProfile->BIOPProfileBody->ConnBinder.additional_tap_byte = (char*)gf_calloc(taggedProfile->BIOPProfileBody->ConnBinder.component_data_length-18,sizeof(char));
-								gf_bs_read_data(bs,taggedProfile->BIOPProfileBody->ConnBinder.additional_tap_byte,(u32)(taggedProfile->BIOPProfileBody->ConnBinder.component_data_length-18));
-							}
-							left_lite_component = left_lite_component - 2; 
-							break;
-						}
-					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){
-								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Service Location : component tag has a wrong value, abording the processing \n"));
-								return GF_CORRUPTED_DATA;
-							}
-							taggedProfile->ServiceLocation->component_data_length = gf_bs_read_int(bs,8);
-							taggedProfile->ServiceLocation->serviceDomain_length = gf_bs_read_int(bs,8);
-							if(taggedProfile->ServiceLocation->serviceDomain_length != 0x14){
-								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Service Location : Service Domain Length tag has a wrong value, abording the processing \n"));
-								return GF_CORRUPTED_DATA;
-							}
-							taggedProfile->ServiceLocation->serviceDomain_data.AFI = gf_bs_read_int(bs,8);
-							taggedProfile->ServiceLocation->serviceDomain_data.type = gf_bs_read_int(bs,8);
-							taggedProfile->ServiceLocation->serviceDomain_data.carouselId = gf_bs_read_int(bs,32);
-							taggedProfile->ServiceLocation->serviceDomain_data.specifierType = gf_bs_read_int(bs,8);
-							taggedProfile->ServiceLocation->serviceDomain_data.specifierData = gf_bs_read_int(bs,24);
-							taggedProfile->ServiceLocation->serviceDomain_data.transport_stream_id = gf_bs_read_int(bs,16);
-							taggedProfile->ServiceLocation->serviceDomain_data.original_network_id = gf_bs_read_int(bs,16);
-							taggedProfile->ServiceLocation->serviceDomain_data.service_id = gf_bs_read_int(bs,16);
-							taggedProfile->ServiceLocation->serviceDomain_data.reserved = gf_bs_read_int(bs,32);
-							if(taggedProfile->ServiceLocation->serviceDomain_data.reserved != 0xFFFFFFFF){
-								GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Service Domain Data : reserved has a wrong value, abording the processing \n"));
-								return GF_CORRUPTED_DATA;
-							}
-							taggedProfile->ServiceLocation->nameComponents_count = gf_bs_read_int(bs,32);
-							taggedProfile->ServiceLocation->NameComponent = (GF_M2TS_DSMCC_BIOP_NAME_COMPONENT*)gf_calloc(taggedProfile->ServiceLocation->nameComponents_count,sizeof(GF_M2TS_DSMCC_BIOP_NAME_COMPONENT));
-							for(j = 0; j < taggedProfile->ServiceLocation->nameComponents_count; j++){
-								taggedProfile->ServiceLocation->NameComponent[j].id_length = gf_bs_read_int(bs,32);
-								if(taggedProfile->ServiceLocation->NameComponent[j].id_length != 0){
-									taggedProfile->ServiceLocation->NameComponent[j].id_data = (char*)gf_calloc(taggedProfile->ServiceLocation->NameComponent[j].id_length,sizeof(char));
-									gf_bs_read_data(bs,taggedProfile->ServiceLocation->NameComponent[i].id_data,(u32)(taggedProfile->ServiceLocation->NameComponent[j].id_length));							
-								}
-								taggedProfile->ServiceLocation->NameComponent[j].kind_length = gf_bs_read_int(bs,32);
-								if(taggedProfile->ServiceLocation->NameComponent[j].kind_length != 0){
-									taggedProfile->ServiceLocation->NameComponent[j].kind_data = (char*)gf_calloc(taggedProfile->ServiceLocation->NameComponent[j].kind_length,sizeof(char));
-									gf_bs_read_data(bs,taggedProfile->ServiceLocation->NameComponent[j].kind_data,(u32)(taggedProfile->ServiceLocation->NameComponent[j].kind_length));
-								}
-							}
-							taggedProfile->ServiceLocation->initialContext_length = gf_bs_read_int(bs,8);
-							if(taggedProfile->ServiceLocation->initialContext_length != 0){
-								taggedProfile->ServiceLocation->InitialContext_data_byte = (char*)gf_calloc(taggedProfile->ServiceLocation->initialContext_length,sizeof(char));
-								gf_bs_read_data(bs,taggedProfile->ServiceLocation->InitialContext_data_byte,(u32)(taggedProfile->ServiceLocation->initialContext_length));
-							}
-							left_lite_component = left_lite_component - 1; 
-							break;
-						}
-					default:
-						{
-							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported Service gateway profile tag \n"));
-							break;
-						}
+		switch(taggedProfile->profileId_tag) {
+		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) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Profile Body : component tag has a wrong value, abording the processing \n"));
+				return GF_CORRUPTED_DATA;
+			}
+			taggedProfile->BIOPProfileBody->ObjectLocation.component_data_length = gf_bs_read_int(bs,8);
+			taggedProfile->BIOPProfileBody->ObjectLocation.carouselId = gf_bs_read_int(bs,32);
+			taggedProfile->BIOPProfileBody->ObjectLocation.moduleId = gf_bs_read_int(bs,16);
+			taggedProfile->BIOPProfileBody->ObjectLocation.version_major = gf_bs_read_int(bs,8);
+			if(taggedProfile->BIOPProfileBody->ObjectLocation.version_major != 0x01) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Profile Body : version major has a wrong value, abording the processing \n"));
+				return GF_CORRUPTED_DATA;
+			}
+			taggedProfile->BIOPProfileBody->ObjectLocation.version_minor = gf_bs_read_int(bs,8);
+			if(taggedProfile->BIOPProfileBody->ObjectLocation.version_minor != 0x00) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Profile Body : version minor has a wrong value, abording the processing \n"));
+				return GF_CORRUPTED_DATA;
+			}
+			taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_length = gf_bs_read_int(bs,8);
+			if(taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_length) {
+				taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_data = gf_bs_read_int(bs,taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_length*8);
+			}
+			/* ConnBinder */
+
+			taggedProfile->BIOPProfileBody->ConnBinder.componentId_tag = gf_bs_read_int(bs,32);
+			if(taggedProfile->BIOPProfileBody->ConnBinder.componentId_tag != 0x49534F40) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : componentId tag has a wrong value, abording the processing \n"));
+				return GF_CORRUPTED_DATA;
+			}
+			taggedProfile->BIOPProfileBody->ConnBinder.component_data_length = gf_bs_read_int(bs,8);
+			taggedProfile->BIOPProfileBody->ConnBinder.taps_count = gf_bs_read_int(bs,8);
+			taggedProfile->BIOPProfileBody->ConnBinder.Taps = (GF_M2TS_DSMCC_BIOP_TAPS*)gf_calloc(taggedProfile->BIOPProfileBody->ConnBinder.taps_count,sizeof(GF_M2TS_DSMCC_BIOP_TAPS));
+			for(j=0; j<taggedProfile->BIOPProfileBody->ConnBinder.taps_count; j++) {
+				taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].id = gf_bs_read_int(bs,16);
+				if(taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].id != 0x00) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : id has a wrong value, abording the processing \n"));
+					return GF_CORRUPTED_DATA;
+				}
+				taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].use = gf_bs_read_int(bs,16);
+				if(taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].use != 0x016) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : use has a wrong value, abording the processing \n"));
+					return GF_CORRUPTED_DATA;
+				}
+				taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].assocTag = gf_bs_read_int(bs,16);
+				taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].selector_length = gf_bs_read_int(bs,8);
+				if(taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].selector_length != 0x0A) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : selector_length has a wrong value, abording the processing \n"));
+					return GF_CORRUPTED_DATA;
+				}
+				taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].selector_type = gf_bs_read_int(bs,16);
+				if(taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].selector_type != 0x001) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in ConnBinder : selector_type has a wrong value, abording the processing \n"));
+					return GF_CORRUPTED_DATA;
+				}
+				taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].transactionId = gf_bs_read_int(bs,32);
+				taggedProfile->BIOPProfileBody->ConnBinder.Taps[i].timeout = gf_bs_read_int(bs,32);
+			}
+			if(taggedProfile->BIOPProfileBody->ConnBinder.component_data_length-18 != 0) {
+				taggedProfile->BIOPProfileBody->ConnBinder.additional_tap_byte = (char*)gf_calloc(taggedProfile->BIOPProfileBody->ConnBinder.component_data_length-18,sizeof(char));
+				gf_bs_read_data(bs,taggedProfile->BIOPProfileBody->ConnBinder.additional_tap_byte,(u32)(taggedProfile->BIOPProfileBody->ConnBinder.component_data_length-18));
+			}
+			left_lite_component = left_lite_component - 2;
+			break;
+		}
+		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) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Service Location : component tag has a wrong value, abording the processing \n"));
+				return GF_CORRUPTED_DATA;
+			}
+			taggedProfile->ServiceLocation->component_data_length = gf_bs_read_int(bs,8);
+			taggedProfile->ServiceLocation->serviceDomain_length = gf_bs_read_int(bs,8);
+			if(taggedProfile->ServiceLocation->serviceDomain_length != 0x14) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Service Location : Service Domain Length tag has a wrong value, abording the processing \n"));
+				return GF_CORRUPTED_DATA;
+			}
+			taggedProfile->ServiceLocation->serviceDomain_data.AFI = gf_bs_read_int(bs,8);
+			taggedProfile->ServiceLocation->serviceDomain_data.type = gf_bs_read_int(bs,8);
+			taggedProfile->ServiceLocation->serviceDomain_data.carouselId = gf_bs_read_int(bs,32);
+			taggedProfile->ServiceLocation->serviceDomain_data.specifierType = gf_bs_read_int(bs,8);
+			taggedProfile->ServiceLocation->serviceDomain_data.specifierData = gf_bs_read_int(bs,24);
+			taggedProfile->ServiceLocation->serviceDomain_data.transport_stream_id = gf_bs_read_int(bs,16);
+			taggedProfile->ServiceLocation->serviceDomain_data.original_network_id = gf_bs_read_int(bs,16);
+			taggedProfile->ServiceLocation->serviceDomain_data.service_id = gf_bs_read_int(bs,16);
+			taggedProfile->ServiceLocation->serviceDomain_data.reserved = gf_bs_read_int(bs,32);
+			if(taggedProfile->ServiceLocation->serviceDomain_data.reserved != 0xFFFFFFFF) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error in Service Domain Data : reserved has a wrong value, abording the processing \n"));
+				return GF_CORRUPTED_DATA;
+			}
+			taggedProfile->ServiceLocation->nameComponents_count = gf_bs_read_int(bs,32);
+			taggedProfile->ServiceLocation->NameComponent = (GF_M2TS_DSMCC_BIOP_NAME_COMPONENT*)gf_calloc(taggedProfile->ServiceLocation->nameComponents_count,sizeof(GF_M2TS_DSMCC_BIOP_NAME_COMPONENT));
+			for(j = 0; j < taggedProfile->ServiceLocation->nameComponents_count; j++) {
+				taggedProfile->ServiceLocation->NameComponent[j].id_length = gf_bs_read_int(bs,32);
+				if(taggedProfile->ServiceLocation->NameComponent[j].id_length != 0) {
+					taggedProfile->ServiceLocation->NameComponent[j].id_data = (char*)gf_calloc(taggedProfile->ServiceLocation->NameComponent[j].id_length,sizeof(char));
+					gf_bs_read_data(bs,taggedProfile->ServiceLocation->NameComponent[i].id_data,(u32)(taggedProfile->ServiceLocation->NameComponent[j].id_length));
+				}
+				taggedProfile->ServiceLocation->NameComponent[j].kind_length = gf_bs_read_int(bs,32);
+				if(taggedProfile->ServiceLocation->NameComponent[j].kind_length != 0) {
+					taggedProfile->ServiceLocation->NameComponent[j].kind_data = (char*)gf_calloc(taggedProfile->ServiceLocation->NameComponent[j].kind_length,sizeof(char));
+					gf_bs_read_data(bs,taggedProfile->ServiceLocation->NameComponent[j].kind_data,(u32)(taggedProfile->ServiceLocation->NameComponent[j].kind_length));
+				}
+			}
+			taggedProfile->ServiceLocation->initialContext_length = gf_bs_read_int(bs,8);
+			if(taggedProfile->ServiceLocation->initialContext_length != 0) {
+				taggedProfile->ServiceLocation->InitialContext_data_byte = (char*)gf_calloc(taggedProfile->ServiceLocation->initialContext_length,sizeof(char));
+				gf_bs_read_data(bs,taggedProfile->ServiceLocation->InitialContext_data_byte,(u32)(taggedProfile->ServiceLocation->initialContext_length));
+			}
+			left_lite_component = left_lite_component - 1;
+			break;
+		}
+		default:
+		{
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported Service gateway profile tag \n"));
+			break;
+		}
 		}
 		taggedProfile->LiteComponent = (GF_M2TS_DSMCC_BIOP_LITE_COMPONENT*)gf_calloc(left_lite_component,sizeof(GF_M2TS_DSMCC_BIOP_LITE_COMPONENT));
-		for(j = 0; j<left_lite_component ; j++){
-			taggedProfile->LiteComponent[j].componentId_tag = gf_bs_read_int(bs,32);						
+		for(j = 0; j<left_lite_component ; j++) {
+			taggedProfile->LiteComponent[j].componentId_tag = gf_bs_read_int(bs,32);
 			taggedProfile->LiteComponent[j].component_data_length = gf_bs_read_int(bs,8);
-			if(taggedProfile->LiteComponent[j].component_data_length != 0){
+			if(taggedProfile->LiteComponent[j].component_data_length != 0) {
 				taggedProfile->LiteComponent[j].component_data_byte = (char*)gf_calloc(taggedProfile->ServiceLocation->initialContext_length,sizeof(char));
 				gf_bs_read_data(bs,taggedProfile->LiteComponent[j].component_data_byte,(u32)(taggedProfile->LiteComponent[j].component_data_length));
- 			}
+			}
 		}
 
 	}
@@ -1562,35 +1562,35 @@
 {
 	u32 nb_elt,i;
 
-	GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = (GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE*)gf_list_get(Name.IOR.taggedProfile,0);	
+	GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = (GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE*)gf_list_get(Name.IOR.taggedProfile,0);
 	nb_elt = gf_list_count(List);
-			
-	for(i = 0; i < nb_elt;i++){
+
+	for(i = 0; i < nb_elt; i++) {
 		GF_M2TS_DSMCC_FILE* File = (GF_M2TS_DSMCC_FILE*)gf_list_get(List,i);
 		if(!strcmp(File->name,Name.id_data) && !strcmp(File->parent,Parent_name) &&
-			(File->objectKey_data == taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_data) && File->moduleId == taggedProfile->BIOPProfileBody->ObjectLocation.moduleId){
+		        (File->objectKey_data == taggedProfile->BIOPProfileBody->ObjectLocation.objectKey_data) && File->moduleId == taggedProfile->BIOPProfileBody->ObjectLocation.moduleId) {
 			/* File or Dir already received */
-				return GF_BAD_PARAM;
+			return GF_BAD_PARAM;
 		}
 	}
 
 	return GF_OK;
 }
 
-static GF_M2TS_DSMCC_DIR* dsmcc_get_directory(GF_List* List, u32 objectKey_data){
+static GF_M2TS_DSMCC_DIR* dsmcc_get_directory(GF_List* List, u32 objectKey_data) {
 	u32 nb_elt,i;
 
 	nb_elt = gf_list_count(List);
 
-	for(i = 0;i<nb_elt;i++){
+	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){
+		if(Dir->objectKey_data == objectKey_data) {
 			return Dir;
 		}
-		if(gf_list_count(Dir->Dir)){
+		if(gf_list_count(Dir->Dir)) {
 			TmpDir = dsmcc_get_directory(Dir->Dir,objectKey_data);
-			if(TmpDir){
+			if(TmpDir) {
 				return TmpDir;
 			}
 		}
@@ -1598,25 +1598,25 @@
 	return NULL;
 }
 
-static GF_M2TS_DSMCC_FILE* dsmcc_get_file(GF_List* ServiceGateway_List, u16 moduleId,u32 downloadId,u32 objectKey_data){
+static GF_M2TS_DSMCC_FILE* dsmcc_get_file(GF_List* ServiceGateway_List, u16 moduleId,u32 downloadId,u32 objectKey_data) {
 	u32 nb_elt,i;
 	nb_elt = gf_list_count(ServiceGateway_List);
-	for(i = 0;i<nb_elt;i++){		
+	for(i = 0; i<nb_elt; i++) {
 		GF_M2TS_DSMCC_FILE* File = (GF_M2TS_DSMCC_FILE*)gf_list_get(ServiceGateway_List,i);
-		if((File->objectKey_data == objectKey_data) && File->moduleId == moduleId && File->downloadId == downloadId){
+		if((File->objectKey_data == objectKey_data) && File->moduleId == moduleId && File->downloadId == downloadId) {
 			return File;
-		}		
+		}
 	}
 	return NULL;
 }
 
-static char* dsmcc_get_file_namepath(GF_M2TS_DSMCC_DIR* Dir,char* name){
+static char* dsmcc_get_file_namepath(GF_M2TS_DSMCC_DIR* Dir,char* name) {
 	char* Path;
 	GF_M2TS_DSMCC_DIR* directory = Dir;
 
 	Path = gf_calloc(512,sizeof(char));
 	sprintf(Path,"%s%c%s",directory->name,GF_PATH_SEPARATOR,name);
-	while(directory->parent != NULL){
+	while(directory->parent != NULL) {
 		GF_M2TS_DSMCC_DIR* tempdir;
 		char* tempPath = gf_strdup(Path);
 		tempdir = (GF_M2TS_DSMCC_DIR*)directory->parent;
@@ -1632,43 +1632,43 @@
 
 static void dsmcc_delete_module(GF_M2TS_DSMCC_MODULE* module)
 {
-	if(module->buffer){
+	if(module->buffer) {
 		gf_free(module->buffer);
 	}
 
 	gf_free(module);
 }
 
-static void dmscc_delete_file(GF_M2TS_DSMCC_FILE* File){
+static void dmscc_delete_file(GF_M2TS_DSMCC_FILE* File) {
 
-	if(File->name){
+	if(File->name) {
 		gf_free(File->name);
 	}
-	if(File->Path){
+	if(File->Path) {
 		gf_free(File->Path);
 	}
 }
 
-static void dmscc_delete_dir(GF_M2TS_DSMCC_DIR* Dir){
+static void dmscc_delete_dir(GF_M2TS_DSMCC_DIR* Dir) {
 
 	u32 nb_file, nb_dir,i;
 
-	if(Dir->name){
+	if(Dir->name) {
 		gf_free(Dir->name);
 	}
-	if(Dir->Path){
+	if(Dir->Path) {
 		gf_free(Dir->Path);
 	}
 
 	nb_file = gf_list_count(Dir->File);
-	for(i=0;i<nb_file;i++){
+	for(i=0; i<nb_file; i++) {
 		GF_M2TS_DSMCC_FILE* File = (GF_M2TS_DSMCC_FILE*)gf_list_get(Dir->File,i);
 		dmscc_delete_file(File);
 	}
 	gf_list_del(Dir->File);
 
 	nb_dir = gf_list_count(Dir->Dir);
-	for(i=0;i<nb_dir;i++){
+	for(i=0; i<nb_dir; i++) {
 		GF_M2TS_DSMCC_DIR* Sub_Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(Dir->Dir,i);
 		dmscc_delete_dir(Sub_Dir);
 	}
@@ -1676,22 +1676,22 @@
 	gf_free(Dir);
 }
 
-static void dmscc_delete_servicegateway(GF_M2TS_DSMCC_SERVICE_GATEWAY* Servicegateway){
+static void dmscc_delete_servicegateway(GF_M2TS_DSMCC_SERVICE_GATEWAY* Servicegateway) {
 
 	u32 nb_file, nb_dir,i;
 
-	if(Servicegateway->name){
+	if(Servicegateway->name) {
 		gf_free(Servicegateway->name);
 	}
 	nb_file = gf_list_count(Servicegateway->File);
-	for(i=0;i<nb_file;i++){
+	for(i=0; i<nb_file; i++) {
 		GF_M2TS_DSMCC_FILE* File = (GF_M2TS_DSMCC_FILE*)gf_list_get(Servicegateway->File,i);
 		dmscc_delete_file(File);
 	}
 	gf_list_del(Servicegateway->File);
 
 	nb_dir = gf_list_count(Servicegateway->Dir);
-	for(i=0;i<nb_dir;i++){
+	for(i=0; i<nb_dir; i++) {
 		GF_M2TS_DSMCC_DIR* Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(Servicegateway->Dir,i);
 		dmscc_delete_dir(Dir);
 	}
@@ -1699,39 +1699,39 @@
 	gf_free(Servicegateway);
 }
 
-void gf_m2ts_delete_dsmcc_overlord(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord) 
+void gf_m2ts_delete_dsmcc_overlord(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord)
 {
 	u16 nb_module,i;
 
 	nb_module = gf_list_count(dsmcc_overlord->dsmcc_modules);
-	for(i=0;i<nb_module;i++){
+	for(i=0; i<nb_module; i++) {
 		GF_M2TS_DSMCC_MODULE* module = (GF_M2TS_DSMCC_MODULE*)gf_list_get(dsmcc_overlord->dsmcc_modules,i);
 		dsmcc_delete_module(module);
 	}
 	gf_list_del(dsmcc_overlord->dsmcc_modules);
 
 	nb_module = gf_list_count(dsmcc_overlord->Unprocessed_module);
-	for(i=0;i<nb_module;i++){
+	for(i=0; i<nb_module; i++) {
 		GF_M2TS_DSMCC_MODULE* module = (GF_M2TS_DSMCC_MODULE*)gf_list_get(dsmcc_overlord->Unprocessed_module,i);
 		dsmcc_delete_module(module);
 	}
 	gf_list_del(dsmcc_overlord->dsmcc_modules);
 	dmscc_delete_servicegateway(dsmcc_overlord->ServiceGateway);
 
-	if(dsmcc_overlord->root_dir){
+	if(dsmcc_overlord->root_dir) {
 		gf_free(dsmcc_overlord->root_dir);
 	}
 
 	gf_free(dsmcc_overlord);
 }
 
-static void dsmcc_free_biop_header(GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header){	
+static void dsmcc_free_biop_header(GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header) {
 
-	gf_free(BIOP_Header->objectKind_data);	
+	gf_free(BIOP_Header->objectKind_data);
 	gf_free(BIOP_Header);
 }
 
-static void dsmcc_free_biop_directory(GF_M2TS_DSMCC_BIOP_DIRECTORY* BIOP_Directory){
+static void dsmcc_free_biop_directory(GF_M2TS_DSMCC_BIOP_DIRECTORY* BIOP_Directory) {
 
 	gf_free(BIOP_Directory->objectInfo_data);
 	dsmcc_free_biop_context(BIOP_Directory->ServiceContext,BIOP_Directory->serviceContextList_count);
@@ -1739,117 +1739,117 @@
 	gf_free(BIOP_Directory);
 }
 
-static void dsmcc_free_biop_file(GF_M2TS_DSMCC_BIOP_FILE* BIOP_File){
+static void dsmcc_free_biop_file(GF_M2TS_DSMCC_BIOP_FILE* BIOP_File) {
 
 	dsmcc_free_biop_descriptor(BIOP_File->descriptor);
-	dsmcc_free_biop_context(BIOP_File->ServiceContext,BIOP_File->serviceContextList_count);	
-	if(BIOP_File->content_length){
+	dsmcc_free_biop_context(BIOP_File->ServiceContext,BIOP_File->serviceContextList_count);
+	if(BIOP_File->content_length) {
 		gf_free(BIOP_File->content_byte);
 	}
 	gf_free(BIOP_File);
 }
 
-static void dsmcc_free_biop_stream_event(GF_M2TS_DSMCC_BIOP_STREAM_EVENT* BIOP_StreamEvent){
+static void dsmcc_free_biop_stream_event(GF_M2TS_DSMCC_BIOP_STREAM_EVENT* BIOP_StreamEvent) {
 
 	u32 i;
 
-	if(BIOP_StreamEvent->Info.aDescription_length){
+	if(BIOP_StreamEvent->Info.aDescription_length) {
 		gf_free(BIOP_StreamEvent->Info.aDescription_bytes);
 	}
 
-	if(BIOP_StreamEvent->objectInfo_byte){
+	if(BIOP_StreamEvent->objectInfo_byte) {
 		gf_free(BIOP_StreamEvent->objectInfo_byte);
 	}
-	
-	if(BIOP_StreamEvent->eventNames_count){	
-		for(i=0;i<BIOP_StreamEvent->eventNames_count;i++){			
-			if(BIOP_StreamEvent->EventList[i].eventName_length){
+
+	if(BIOP_StreamEvent->eventNames_count) {
+		for(i=0; i<BIOP_StreamEvent->eventNames_count; i++) {
+			if(BIOP_StreamEvent->EventList[i].eventName_length) {
 				gf_free(BIOP_StreamEvent->EventList[i].eventName_data_byte);
 			}
 		}
 		gf_free(BIOP_StreamEvent->EventList);
 	}
-	
-	if(BIOP_StreamEvent->taps_count){	
+
+	if(BIOP_StreamEvent->taps_count) {
 		gf_free(BIOP_StreamEvent->Taps);
 	}
 
 	dsmcc_free_biop_context(BIOP_StreamEvent->ServiceContext,BIOP_StreamEvent->serviceContextList_count);
-	
-	if(BIOP_StreamEvent->eventId){	
+
+	if(BIOP_StreamEvent->eventId) {
 		gf_free(BIOP_StreamEvent->eventId);
 	}
 }
 
-static void dsmcc_free_biop_stream_message(GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage){
+static void dsmcc_free_biop_stream_message(GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage) {
 
-	if(BIOP_StreamMessage->Info.aDescription_length){
+	if(BIOP_StreamMessage->Info.aDescription_length) {
 		gf_free(BIOP_StreamMessage->Info.aDescription_bytes);
 	}
-	
-	if(BIOP_StreamMessage->objectInfo_byte){
+
+	if(BIOP_StreamMessage->objectInfo_byte) {
 		gf_free(BIOP_StreamMessage->objectInfo_byte);
-	}	
-	
-	if(BIOP_StreamMessage->taps_count){	
+	}
+
+	if(BIOP_StreamMessage->taps_count) {
 		gf_free(BIOP_StreamMessage->Taps);
 	}
 
-	dsmcc_free_biop_context(BIOP_StreamMessage->ServiceContext,BIOP_StreamMessage->serviceContextList_count);	
+	dsmcc_free_biop_context(BIOP_StreamMessage->ServiceContext,BIOP_StreamMessage->serviceContextList_count);
 }
 
 static void dsmcc_free_biop_ior(GF_M2TS_DSMCC_IOR* IOR)
 {
 	u32 i,left_lite_component;
-	
-	if(IOR->type_id_length){		
+
+	if(IOR->type_id_length) {
 		gf_free(IOR->type_id_byte);
-	}	
-	for(i = 0; i < IOR->taggedProfiles_count;i++){
+	}
+	for(i = 0; i < IOR->taggedProfiles_count; i++) {
 		GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = gf_list_get(IOR->taggedProfile,0);
 		left_lite_component = taggedProfile->lite_component_count;
 
-		switch(taggedProfile->profileId_tag){				
-	
-					case TAG_BIOP:
-						{
-							/* Object Location */						
-							GF_SAFEALLOC(taggedProfile->BIOPProfileBody,GF_M2TS_DSMCC_BIOP_PROFILE_BODY);
-							
-							gf_free(taggedProfile->BIOPProfileBody->ConnBinder.Taps); 
-							if(taggedProfile->BIOPProfileBody->ConnBinder.component_data_length-18 != 0){
-								gf_free(taggedProfile->BIOPProfileBody->ConnBinder.additional_tap_byte);
-							}
-							gf_free(taggedProfile->BIOPProfileBody);
-							left_lite_component = left_lite_component - 2; 
-							break;
-						}
-					case TAG_LITE_OPTIONS:
-						{
-							/* Service Location */
-							u32 j;		
-							
-							for(j = 0; j < taggedProfile->ServiceLocation->nameComponents_count; j++){
-
-								if(taggedProfile->ServiceLocation->NameComponent[j].id_length != 0){
-									gf_free(taggedProfile->ServiceLocation->NameComponent[j].id_data); 
-								}								
-								if(taggedProfile->ServiceLocation->NameComponent[j].kind_length != 0){
-									gf_free(taggedProfile->ServiceLocation->NameComponent[j].kind_data);
-								}
-							}
-							gf_free(taggedProfile->ServiceLocation->NameComponent);
-				
-							if(taggedProfile->ServiceLocation->initialContext_length != 0){
-								gf_free(taggedProfile->ServiceLocation->InitialContext_data_byte);
-							}
-							left_lite_component = left_lite_component - 1; 
-							break;
-						}					
-		}
-
-		for(i = 0; i<left_lite_component ; i++){			
-			if(taggedProfile->LiteComponent[i].component_data_length != 0){
+		switch(taggedProfile->profileId_tag) {
+
+		case TAG_BIOP:
+		{
+			/* Object Location */
+			GF_SAFEALLOC(taggedProfile->BIOPProfileBody,GF_M2TS_DSMCC_BIOP_PROFILE_BODY);
+
+			gf_free(taggedProfile->BIOPProfileBody->ConnBinder.Taps);
+			if(taggedProfile->BIOPProfileBody->ConnBinder.component_data_length-18 != 0) {
+				gf_free(taggedProfile->BIOPProfileBody->ConnBinder.additional_tap_byte);
+			}
+			gf_free(taggedProfile->BIOPProfileBody);
+			left_lite_component = left_lite_component - 2;
+			break;
+		}
+		case TAG_LITE_OPTIONS:
+		{
+			/* Service Location */
+			u32 j;
+
+			for(j = 0; j < taggedProfile->ServiceLocation->nameComponents_count; j++) {
+
+				if(taggedProfile->ServiceLocation->NameComponent[j].id_length != 0) {
+					gf_free(taggedProfile->ServiceLocation->NameComponent[j].id_data);
+				}
+				if(taggedProfile->ServiceLocation->NameComponent[j].kind_length != 0) {
+					gf_free(taggedProfile->ServiceLocation->NameComponent[j].kind_data);
+				}
+			}
+			gf_free(taggedProfile->ServiceLocation->NameComponent);
+
+			if(taggedProfile->ServiceLocation->initialContext_length != 0) {
+				gf_free(taggedProfile->ServiceLocation->InitialContext_data_byte);
+			}
+			left_lite_component = left_lite_component - 1;
+			break;
+		}
+		}
+
+		for(i = 0; i<left_lite_component ; i++) {
+			if(taggedProfile->LiteComponent[i].component_data_length != 0) {
 				gf_free(taggedProfile->LiteComponent[i].component_data_byte);
 			}
 
@@ -1867,70 +1867,70 @@
 
 	while(gf_list_count(list)) {
 
-		descr_tag = (u8*)gf_list_get(list,0);		
+		descr_tag = (u8*)gf_list_get(list,0);
 
 		switch(*descr_tag) {
 
-				case CACHING_PRIORITY_DESCRIPTOR:
-					{
-						GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR* CachingPriorityDescr = (GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR*)gf_list_get(list,0);
-						gf_list_rem(list,0);
-						gf_free(CachingPriorityDescr);
-						break;					
-					}
-				case COMPRESSED_MODULE_DESCRIPTOR:
-					{						
-						GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR* CompModuleDescr = (GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR*)gf_list_get(list,0);
-						gf_list_rem(list,0);
-						gf_free(CompModuleDescr);
-						break;	
+		case CACHING_PRIORITY_DESCRIPTOR:
+		{
+			GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR* CachingPriorityDescr = (GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR*)gf_list_get(list,0);
+			gf_list_rem(list,0);
+			gf_free(CachingPriorityDescr);
+			break;
+		}
+		case COMPRESSED_MODULE_DESCRIPTOR:
+		{
+			GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR* CompModuleDescr = (GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR*)gf_list_get(list,0);
+			gf_list_rem(list,0);
+			gf_free(CompModuleDescr);
+			break;
 
-					}
-				case CONTENT_TYPE_DESCRIPTOR:
-					{			
-						GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR* ContentTypeDescr = (GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR*)gf_list_get(list,0);
-						gf_list_rem(list,0);
-						if(ContentTypeDescr->descriptor_length){
-							gf_free(ContentTypeDescr->content_type_data_byte);
-						}
-						gf_free(ContentTypeDescr);
-						break;
-					}
-				default:
-					{
+		}
+		case CONTENT_TYPE_DESCRIPTOR:
+		{
+			GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR* ContentTypeDescr = (GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR*)gf_list_get(list,0);
+			gf_list_rem(list,0);
+			if(ContentTypeDescr->descriptor_length) {
+				gf_free(ContentTypeDescr->content_type_data_byte);
+			}
+			gf_free(ContentTypeDescr);
+			break;
+		}
+		default:
+		{
 
-						break;
-					}				
-		}			
+			break;
+		}
+		}
 
 	}
 	gf_list_del(list);
 }
 
 
-static void dsmcc_free_biop_name(GF_M2TS_DSMCC_BIOP_NAME* Name, u32 nb_name){
+static void dsmcc_free_biop_name(GF_M2TS_DSMCC_BIOP_NAME* Name, u32 nb_name) {
 	u32 i;
 
-	for(i =0;i<nb_name;i++){
+	for(i =0; i<nb_name; i++) {
 
-		if(Name[i].id_length){
-			gf_free(Name[i].id_data);			
-		}		
-		if(Name[i].kind_length){
+		if(Name[i].id_length) {
+			gf_free(Name[i].id_data);
+		}
+		if(Name[i].kind_length) {
 			gf_free(Name[i].kind_data);
-		}			
+		}
 		/* IOR */
-		dsmcc_free_biop_ior(&Name[i].IOR);		
-		dsmcc_free_biop_descriptor(Name[i].descriptor);		
+		dsmcc_free_biop_ior(&Name[i].IOR);
+		dsmcc_free_biop_descriptor(Name[i].descriptor);
 	}
 }
 
-static void dsmcc_free_biop_context(GF_M2TS_DSMCC_SERVICE_CONTEXT* Context,u32 serviceContextList_count){
+static void dsmcc_free_biop_context(GF_M2TS_DSMCC_SERVICE_CONTEXT* Context,u32 serviceContextList_count) {
 	u32 i;
 
-	for(i=0;i<serviceContextList_count;i++){		
-		if(Context[i].context_data_length != 0){
-			gf_free(Context[i].context_data_byte);			
+	for(i=0; i<serviceContextList_count; i++) {
+		if(Context[i].context_data_length != 0) {
+			gf_free(Context[i].context_data_byte);
 		}
 	}
 	gf_free(Context);

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/dvb_mpe.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/dvb_mpe.c Changed

@@ -11,7 +11,7 @@
 static void empty_list(GF_List * list)
 {
 	void *obj;
-	while(gf_list_count(list)){
+	while(gf_list_count(list)) {
 		obj = gf_list_get(list,0);
 		gf_list_rem(list,0);
 		gf_free(obj);
@@ -20,7 +20,7 @@
 
 }
 
-static void on_dvb_mpe_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+static void on_dvb_mpe_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
 {
 	GF_M2TS_SL_PCK *pck = (GF_M2TS_SL_PCK *)par;
 	unsigned char *data;
@@ -31,7 +31,7 @@
 		data = pck->data;
 		u32_data_size = pck->data_len;
 		u32_table_id = data[0];
-	
+
 		switch(u32_table_id) {
 		case GF_M2TS_TABLE_ID_INT:
 			gf_m2ts_process_int(ts, (GF_M2TS_SECTION_ES *)pck->stream, data, u32_data_size, u32_table_id);
@@ -46,14 +46,14 @@
 			else {
 				//fprintf(stderr, "Time Slice Parameters for MPE-FEC have not been found yet \n");
 			}
-			break;				
+			break;
 		default:
 			return;
 		}
 	}
 }
 
-static void on_dvb_mpe_fec_frame(GF_M2TS_Demuxer *ts, MPE_FEC_FRAME *mff) 
+static void on_dvb_mpe_fec_frame(GF_M2TS_Demuxer *ts, MPE_FEC_FRAME *mff)
 {
 	if (ts->ip_platform != NULL) {
 		if(ts->dvb_h_demux == 0) {
@@ -80,11 +80,11 @@
 
 	if (!ip_platform) return;
 
-	if (ip_platform->ip_streams){
-		while(gf_list_count(ip_platform->ip_streams)){
-			ip_stream_buff=gf_list_get(ip_platform->ip_streams, 0);	
-	
-			while (gf_list_count(ip_stream_buff->targets)){
+	if (ip_platform->ip_streams) {
+		while(gf_list_count(ip_platform->ip_streams)) {
+			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);
 				gf_free(ip_targets);
 				gf_list_rem(ip_stream_buff->targets,0);
@@ -96,8 +96,8 @@
 		gf_list_del(ip_platform->ip_streams);
 	}
 	ip_platform->ip_streams = NULL;
-	if (ip_platform->socket_struct){
-		while(gf_list_count(ip_platform->socket_struct)){
+	if (ip_platform->socket_struct) {
+		while(gf_list_count(ip_platform->socket_struct)) {
 			GF_SOCK_ENTRY *socket_struct = gf_list_get(ip_platform->socket_struct, 0);
 			gf_free(socket_struct);
 			gf_list_rem(ip_platform->socket_struct,0);
@@ -105,7 +105,7 @@
 		gf_list_del(ip_platform->socket_struct);
 	}
 	ip_platform->socket_struct = NULL;
-	gf_free(ip_platform);			
+	gf_free(ip_platform);
 	ts->ip_platform = NULL;
 }
 
@@ -140,17 +140,17 @@
 {
 	u32 i;
 	for (i = 0; i < length; i ++) {
-		if (i%line_length == 0) { 
-			fprintf(stderr, "%2d: ", i/line_length); 
+		if (i%line_length == 0) {
+			fprintf(stderr, "%2d: ", i/line_length);
 		} else if (i%8 == 0) {
-			fprintf(stderr, " "); 
+			fprintf(stderr, " ");
 		}
 		fprintf(stderr, "%02x", data[i]);
-		if ((i+1)%line_length == 0) { 
-			fprintf(stderr, "\n"); 
+		if ((i+1)%line_length == 0) {
+			fprintf(stderr, "\n");
 		}
 	}
-	if (last_line) fprintf(stderr, "\n"); 
+	if (last_line) fprintf(stderr, "\n");
 }
 */
 
@@ -159,8 +159,8 @@
 	GF_M2TS_IP_Stream *ip_stream_buff;
 	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform;
 	u32 table_boundry_flag;
-	u32 frame_boundry_flag; 
-	u32 offset; 
+	u32 frame_boundry_flag;
+	u32 offset;
 	u32 i_streams,j;
 	u32 section_number, last_section_number;
 	s32 len_left = data_size;
@@ -170,16 +170,16 @@
 	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"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("CRC error in the MPE/MPE-FEC data \n"));
 	}
-	
+
 	/*get number of rows of mpe_fec_frame from descriptor*/
-	section_number = data[6];		
+	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);	
-	
+	//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) {
@@ -187,51 +187,51 @@
 			return;
 		}
 		/* send the IP data :
-		   Remove the first 12 bytes of header (from table id to end of real time parameters 
+		   Remove the first 12 bytes of header (from table id to end of real time parameters
 		   Remove also the last four 4 bytes of the section (CRC 32)
 		*/
-		gf_m2ts_mpe_send_datagram(ts, mpe->pid, data +12, data_size - (12+4));			
-		return; 
+		gf_m2ts_mpe_send_datagram(ts, mpe->pid, data +12, data_size - (12+4));
+		return;
 	}
 
 
 	/*get number of rows of mpe_fec_frame from descriptor*/
-	/* Real-Time Parameters */	
-  	//delta_t = (data[8]<<4)|(data[9]>>4);
+	/* Real-Time Parameters */
+	//delta_t = (data[8]<<4)|(data[9]>>4);
 	table_boundry_flag = (data[9] >> 3 )& 0x1;
-	frame_boundry_flag = (data[9] >> 2 )& 0x1; 
-		
+	frame_boundry_flag = (data[9] >> 2 )& 0x1;
+
 	offset = ((data[9] & 0x3)<< 16) | (data[10] << 8)| data[11];
 
 	/* Using MFF structure attached to the MPE Stream */
-	if(mpe->mff){ 					  
-		if(!mpe->mff->mpe_holes){
+	if(mpe->mff) {
+		if(!mpe->mff->mpe_holes) {
 			mpe->mff->mpe_holes = gf_list_new();
 		}
-	}else if(offset != 0){
+	} else if(offset != 0) {
 		/* If no MFF structure is attached to the MPE Stream, wait for a new IP Datagram before processing data */
-		 GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[IpdcEgine] buffer is not null, waiting for a new IP Datagram before processing data\n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[IpdcEgine] buffer is not null, waiting for a new IP Datagram before processing data\n"));
 		return;
-	}else{
-		GF_SAFEALLOC(mpe->mff,MPE_FEC_FRAME); 
-	 
+	} else {
+		GF_SAFEALLOC(mpe->mff,MPE_FEC_FRAME);
+
 		assert( ip_platform );
 		assert(ip_platform->ip_streams);
 		i_streams = gf_list_count(ip_platform->ip_streams);
-		for(j=0;j<i_streams;j++){			
+		for(j=0; j<i_streams; j++) {
 			ip_stream_buff=gf_list_get(ip_platform->ip_streams, j);
 
-			if(mpe->program->number == ip_stream_buff->location.service_id){
-				switch(ip_stream_buff->time_slice_fec.frame_size){
+			if(mpe->program->number == ip_stream_buff->location.service_id) {
+				switch(ip_stream_buff->time_slice_fec.frame_size) {
 				case 0:
-					mpe->mff->rows =256;					
+					mpe->mff->rows =256;
 					break;
 				case 1:
-					mpe->mff->rows =512;   				
+					mpe->mff->rows =512;
+					break;
+				case 2:
+					mpe->mff->rows =768;
 					break;
-				case 2:				
-					 mpe->mff->rows =768;   				
-					 break;
 				case 3:
 					mpe->mff->rows =1024;
 					break;
@@ -241,65 +241,65 @@
 				break;
 			}
 		}
-		/*initialize the mpe fec frame */		   
+		/*initialize the mpe fec frame */
 		if (init_frame(mpe->mff, mpe->mff->rows)) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("MFF initialization successed \n"));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("MFF initialization failed \n")); 
-			return; 
-		} 			
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("MFF initialization failed \n"));
+			return;
+		}
 	}
-	
+
 	//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) {		
+	mpe->mff->PID = mpe->pid;
+
+	while (len_left>0) {
 
 		switch (table_id) {
 		case GF_M2TS_TABLE_ID_DSM_CC_PRIVATE: /* MPE */
 			/* Sets the IP data in the Application Data Table
-			   Remove the first 12 bytes of header (from table id to end of real time parameters 
+			   Remove the first 12 bytes of header (from table id to end of real time parameters
 			   Remove also the last four 4 bytes of the section (CRC 32)*/
-			setIpDatagram( mpe->mff, offset, data +12, data_size-(12+4));			
-			len_left = 0; 
+			setIpDatagram( mpe->mff, offset, data +12, data_size-(12+4));
+			len_left = 0;
 			break;
 		case GF_M2TS_TABLE_ID_MPE_FEC:
-		/*	RS data is set by column, one column at a time */
+			/*	RS data is set by column, one column at a time */
 			//setColRS( mpe->mff, offset, data + 12, mpe->mff->rows);
 			len_left = 0;
 			//data += (mff->rows +12+4 );
 			break;
 		default:
-		//	fprintf(stderr, "Unknown table id %x \n", table_id );
-			len_left = 0; 
+			//	fprintf(stderr, "Unknown table id %x \n", table_id );
+			len_left = 0;
 		}
-		
-			if(table_boundry_flag == 1) /* end of reception of ADT data or RS data */{
-				if(table_id == 0x3E) /* end of ADT */{
-					 mpe->mff->ADT_done =1;
-					if(mpe->mff->current_offset_adt+1 !=  mpe->mff->capacity_total){
-						memset( mpe->mff->p_adt+mpe->mff->current_offset_adt,0, mpe->mff->capacity_total-( mpe->mff->current_offset_adt+1));
-					}
-				} 
-				/* end of RS should be catched below by frame_boundary_flag */		
+
+		if(table_boundry_flag == 1) { /* end of reception of ADT data or RS data */
+			if(table_id == 0x3E) { /* end of ADT */
+				mpe->mff->ADT_done =1;
+				if(mpe->mff->current_offset_adt+1 !=  mpe->mff->capacity_total) {
+					memset( mpe->mff->p_adt+mpe->mff->current_offset_adt,0, mpe->mff->capacity_total-( mpe->mff->current_offset_adt+1));
+				}
 			}
+			/* end of RS should be catched below by frame_boundary_flag */
+		}
 
-			if(frame_boundry_flag == 1){
-				if(table_id == 0x78){
-					if( mpe->mff->current_offset_rs+1 !=  mpe->mff->rows*64){
-						memset( mpe->mff->p_rs+ mpe->mff->current_offset_rs,0,( mpe->mff->rows*64)-( mpe->mff->current_offset_rs+1));
-					}
+		if(frame_boundry_flag == 1) {
+			if(table_id == 0x78) {
+				if( mpe->mff->current_offset_rs+1 !=  mpe->mff->rows*64) {
+					memset( mpe->mff->p_rs+ mpe->mff->current_offset_rs,0,( mpe->mff->rows*64)-( mpe->mff->current_offset_rs+1));
 				}
 			}
+		}
 
 	}
 
-	if (frame_boundry_flag && table_boundry_flag && mpe->mff->ADT_done ==1 ) {		
+	if (frame_boundry_flag && table_boundry_flag && mpe->mff->ADT_done ==1 ) {
 		//decode_fec(mpe->mff);
 		on_dvb_mpe_fec_frame(ts, mpe->mff);
-		resetMFF(mpe->mff); 
-		/*for each IP datagram reconstructed*/	
-	}	
+		resetMFF(mpe->mff);
+		/*for each IP datagram reconstructed*/
+	}
 
 }
 
@@ -317,30 +317,30 @@
 	ip_datagram = mff->p_adt;
 
 	GF_SAFEALLOC(ip_packet,GF_M2TS_IP_Packet);
-	
+
 
 	while(offset<mff->current_offset_adt)
 	{
 		/* Find the parts of the ADT which contain errors and skip them */
-		if((mff->p_error_adt+offset)[0] == 0x01010101){
-			i_holes = gf_list_count(mff->mpe_holes);			
-			for(i=0;i<i_holes;i++){
+		if((mff->p_error_adt+offset)[0] == 0x01010101) {
+			i_holes = gf_list_count(mff->mpe_holes);
+			for(i=0; i<i_holes; i++) {
 				mff_holes=gf_list_get(mff->mpe_holes, i);
-				if(mff_holes->offset == offset){
+				if(mff_holes->offset == offset) {
 					offset += mff_holes->length;
 					break;
 				}
-			}				
+			}
 		}
-					
-		 if(gf_m2ts_ipdatagram_reader(ip_datagram, ip_packet, offset)){
-		
-			
+
+		if(gf_m2ts_ipdatagram_reader(ip_datagram, ip_packet, offset)) {
+
+
 			/* update the offset */
 			//offset += ip_packet->u32_total_length;
 			offset += (ip_packet->u32_hdr_length*4) + ip_packet->u32_udp_data_size;
 
-		
+
 			/* 224.0.23.14 IP Bosstrap */
 			ip_adress_bootstrap[0]=224;
 			ip_adress_bootstrap[1]=0;
@@ -348,24 +348,24 @@
 			ip_adress_bootstrap[3]=14;
 			socket_simu(ip_packet,ts, 1);
 
-			if(ip_packet->u8_rx_adr[3] == 8){
-			 fprintf(stderr, "\n");
+			if(ip_packet->u8_rx_adr[3] == 8) {
+				fprintf(stderr, "\n");
 			}
 
 			/* compare the destination ip adress and the ESG Bootstrap adress */
 			Boostrap_ip = gf_m2ts_compare_ip(ip_packet->u8_rx_adr,ip_adress_bootstrap);
-			if(Boostrap_ip){
-				fprintf(stderr, "ESG Bootstrap found !\n");		
-			}		 
-		 }else{
-			 offset += (ip_packet->u32_total_length);
-		 }
-	
-		 if(ip_packet->data){
-				gf_free(ip_packet->data);
-		 }
-		 ip_packet->data = NULL;
-			
+			if(Boostrap_ip) {
+				fprintf(stderr, "ESG Bootstrap found !\n");
+			}
+		} else {
+			offset += (ip_packet->u32_total_length);
+		}
+
+		if(ip_packet->data) {
+			gf_free(ip_packet->data);
+		}
+		ip_packet->data = NULL;
+
 	}
 
 	//gf_memory_print();
@@ -373,7 +373,7 @@
 
 	empty_list(mff->mpe_holes);
 	gf_list_del(mff->mpe_holes);
-	mff->mpe_holes = NULL;   
+	mff->mpe_holes = NULL;
 	gf_m2ts_Delete_IpPacket(ip_packet);
 }
 
@@ -400,19 +400,19 @@
 	udp_data = data+(hdr_len*4);
 
 	ip_pck.u32_tx_udp_port = udp_data[0]<<8 | udp_data[1];
-	if(!ip_pck.u32_tx_udp_port){
+	if(!ip_pck.u32_tx_udp_port) {
 		return;
 	}
 	ip_pck.u32_rx_udp_port = udp_data[2]<<8 | udp_data[3];
-	if(!ip_pck.u32_rx_udp_port){
+	if(!ip_pck.u32_rx_udp_port) {
 		return;
 	}
 	ip_pck.u32_udp_data_size = udp_data[4]<<8 | udp_data[5];
-	if(ip_pck.u32_udp_data_size == 0){
+	if(ip_pck.u32_udp_data_size == 0) {
 		return;
 	}
 	ip_pck.u32_udp_chksm = udp_data[6]<<8 | udp_data[7];
-	
+
 	/*excluding UDP header*/
 	ip_pck.data = udp_data + 8;
 
@@ -450,20 +450,20 @@
 	memcpy(ip_packet->u8_rx_adr,(datagram+offset)+16,sizeof(ip_packet->u8_rx_adr));
 
 	ip_packet->u32_tx_udp_port = ((datagram+offset)+(ip_packet->u32_hdr_length*4))[0]<<8|((datagram+offset)+(ip_packet->u32_hdr_length*4))[1];
-	if(!ip_packet->u32_tx_udp_port){
+	if(!ip_packet->u32_tx_udp_port) {
 		return 0;
 	}
 	ip_packet->u32_rx_udp_port = ((datagram+offset)+(ip_packet->u32_hdr_length*4))[2]<<8|((datagram+offset)+(ip_packet->u32_hdr_length*4))[3];
-	if(!ip_packet->u32_rx_udp_port){
+	if(!ip_packet->u32_rx_udp_port) {
 		return 0;
 	}
 	ip_packet->u32_udp_data_size = ((datagram+offset)+(ip_packet->u32_hdr_length*4))[4]<<8|((datagram+offset)+(ip_packet->u32_hdr_length*4))[5];
-	if(ip_packet->u32_udp_data_size == 0){
+	if(ip_packet->u32_udp_data_size == 0) {
 		return 0;
 	}
 	ip_packet->u32_udp_chksm = ((datagram+offset)+(ip_packet->u32_hdr_length*4))[6]<<8|((datagram+offset)+(ip_packet->u32_hdr_length*4))[7];
-	
-	
+
+
 	ip_packet->data = gf_malloc((ip_packet->u32_udp_data_size-8)*sizeof(u8));
 	memcpy(ip_packet->data,datagram+offset+(ip_packet->u32_hdr_length*4)+8,(ip_packet->u32_udp_data_size-8)*sizeof(u8));
 	/*ip_packet->data = gf_malloc((ip_packet->u32_total_length-ip_packet->u32_hdr_length)*sizeof(char));
@@ -485,14 +485,14 @@
 	ip_packet->u32_frag_offset = 0;
 	ip_packet->u32_TTL = 0;
 	ip_packet->u32_protocol = 0;
-	ip_packet->u32_crc = 0;	
-	ip_packet->u32_tx_udp_port = 0;   
+	ip_packet->u32_crc = 0;
+	ip_packet->u32_tx_udp_port = 0;
 	ip_packet->u32_rx_udp_port = 0;
 	ip_packet->u32_udp_data_size = 0;
 	ip_packet->u32_udp_chksm = 0;
-	
-	if(ip_packet->data){
-	   gf_free(ip_packet->data);
+
+	if(ip_packet->data) {
+		gf_free(ip_packet->data);
 	}
 	gf_free(ip_packet);
 	ip_packet = NULL;
@@ -501,13 +501,13 @@
 
 
 void gf_m2ts_process_int(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *ip_table, unsigned char *data, u32 data_size, u32 table_id)
-{	
+{
 
-	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform ; 
+	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 ) 
+	//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();
@@ -529,13 +529,13 @@
 
 	s32  length,i;
 
-	
-	length = data_size ; 
 
-	data += 12 ; 
- 
+	length = data_size ;
+
+	data += 12 ;
+
 	assert( ip_platform);
-	i = dsmcc_pto_platform_descriptor_loop(ip_platform,data); 
+	i = dsmcc_pto_platform_descriptor_loop(ip_platform,data);
 	data   += i;
 	length -= i;
 
@@ -543,18 +543,18 @@
 		GF_M2TS_IP_Stream *ip_str;
 		GF_SAFEALLOC(ip_str,GF_M2TS_IP_Stream );
 
-		i = dsmcc_pto_descriptor_loop(ip_str,data); 
+		i = dsmcc_pto_descriptor_loop(ip_str,data);
 		data   += i;
 		length -= i;
 
- 		i = dsmcc_pto_descriptor_loop(ip_str,data); 
+		i = dsmcc_pto_descriptor_loop(ip_str,data);
 		data   += i;
 		length -= i;
 		assert( ip_platform->ip_streams );
 		gf_list_add(ip_platform->ip_streams, ip_str);
- 	}
- 	
-	return ; 
+	}
+
+	return ;
 }
 
 
@@ -562,58 +562,60 @@
 
 u32 dsmcc_pto_platform_descriptor_loop(GF_M2TS_IP_PLATFORM* ip_platform, u8 *data)
 {
-   u32 loop_length;
-   s32 length,i;
-
-
-   loop_length = ((data[0]) & 0xF ) | data[1];
-   length = loop_length;
-   data += 2;
-   while (length > 0) {
-	 assert( ip_platform);
-	 i   = platform_descriptorDSMCC_INT_UNT(ip_platform,data);
-	 data   += i;
-	 length -= i;	
-	 }
-  
-   return  (loop_length+2);
+	u32 loop_length;
+	s32 length,i;
+
+
+	loop_length = ((data[0]) & 0xF ) | data[1];
+	length = loop_length;
+	data += 2;
+	while (length > 0) {
+		assert( ip_platform);
+		i   = platform_descriptorDSMCC_INT_UNT(ip_platform,data);
+		data   += i;
+		length -= i;
+	}
+
+	return  (loop_length+2);
 }
 
 
 u32  platform_descriptorDSMCC_INT_UNT(GF_M2TS_IP_PLATFORM* ip_platform, u8 *data)
 
 {
-   u32 length;
-   u32 id;
+	u32 length;
+	u32 id;
 
 
-  id  =   data[0];
-  length = data[1]+2;
+	id  =   data[0];
+	length = data[1]+2;
 
-  switch (id) {
+	switch (id) {
 
-	 
-  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; 
 
-	 default: 
+	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;
+
+	default:
+		break;
+	}
 	return length;   // (descriptor total length)
 }
 
 void gf_ip_platform_descriptor(GF_M2TS_IP_PLATFORM* ip_platform,u8 * data)
 {
 	u32 length;
-	length = data[1];	
+	length = data[1];
 	assert( ip_platform );
 	/* allocation ofr the name of the platform */
 	ip_platform->name = gf_malloc(sizeof(char)*(length-3+1));
@@ -625,13 +627,13 @@
 void gf_ip_platform_provider_descriptor(GF_M2TS_IP_PLATFORM* ip_platform, u8 * data)
 {
 	u32 length;
-	length = data[1];	
+	length = data[1];
 	/* allocation of the name of the platform */
 	assert( ip_platform );
 	ip_platform->provider_name = gf_malloc(sizeof(char)*(length-3+1));
 	memcpy(ip_platform->provider_name, data+5, length-3);
 	ip_platform->provider_name[length-3] = 0;
-	return ;  
+	return ;
 }
 
 
@@ -639,81 +641,82 @@
 /* IP Stream Descriptors */
 u32 dsmcc_pto_descriptor_loop ( GF_M2TS_IP_Stream *ip_str,u8 *data)
 {
-   u32 loop_length;
-   s32 length,i;
-
-   loop_length = ((data[0]) & 0xF ) | data[1];
-
-   length = loop_length;
-	 data += 2;
-   while (length > 0) {
-	 i   = descriptorDSMCC_INT_UNT(ip_str,data);
-	 data   += i;
-	 length -= i;	
-	 }
-  
-   return  (loop_length+2);
+	u32 loop_length;
+	s32 length,i;
+
+	loop_length = ((data[0]) & 0xF ) | data[1];
+
+	length = loop_length;
+	data += 2;
+	while (length > 0) {
+		i   = descriptorDSMCC_INT_UNT(ip_str,data);
+		data   += i;
+		length -= i;
+	}
+
+	return  (loop_length+2);
 }
 
 
 u32  descriptorDSMCC_INT_UNT(GF_M2TS_IP_Stream *ip_str,u8 *data)
 
 {
-   u32 length;
-   u32 id;
-
-  id  = data[0];
-  length = data[1] +2;
-
-  switch (id) {
-
- 
-  case GF_M2TS_DVB_TARGET_IP_SLASH_DESCRIPTOR:
-	  {
-		 
-		  gf_m2ts_target_ip(ip_str,data);
-	  }
-	  break;
-
-  case GF_M2TS_DVB_TIME_SLICE_FEC_DESCRIPTOR:
-			 {
-				 descriptorTime_slice_fec_identifier(ip_str,data);
-			 }
-		break;
-  case GF_M2TS_DVB_STREAM_LOCATION_DESCRIPTOR:
-	  {
-		  descriptorLocation(ip_str , data);
-	  }break;
-	 default: 
+	u32 length;
+	u32 id;
+
+	id  = data[0];
+	length = data[1] +2;
+
+	switch (id) {
+
+
+	case GF_M2TS_DVB_TARGET_IP_SLASH_DESCRIPTOR:
+	{
+
+		gf_m2ts_target_ip(ip_str,data);
+	}
+	break;
+
+	case GF_M2TS_DVB_TIME_SLICE_FEC_DESCRIPTOR:
+	{
+		descriptorTime_slice_fec_identifier(ip_str,data);
+	}
 	break;
-  } 
+	case GF_M2TS_DVB_STREAM_LOCATION_DESCRIPTOR:
+	{
+		descriptorLocation(ip_str , data);
+	}
+	break;
+	default:
+		break;
+	}
 
 
-  return length;   // (descriptor total length)
+	return length;   // (descriptor total length)
 }
 
 void descriptorTime_slice_fec_identifier( GF_M2TS_IP_Stream *ip_str,u8 * data)
 {
 
 	ip_str->time_slice_fec.time_slicing = (data[2] >> 7) & 0x1;
-	ip_str->time_slice_fec.mpe_fec = (data[2] >> 5 ) & 0x3 ; 
-	ip_str->time_slice_fec.frame_size = data[2] & 0x7 ; 
-	ip_str->time_slice_fec.max_burst_duration = data[3]; 
-	ip_str->time_slice_fec.max_average_rate = (data[4]  >> 4) & 0xf ; 
-	ip_str->time_slice_fec.time_slice_fec_id = data[4] & 0xf; 
-	ip_str->time_slice_fec.id_selector = gf_malloc( data[1] - 3 ) ; 
+	ip_str->time_slice_fec.mpe_fec = (data[2] >> 5 ) & 0x3 ;
+	ip_str->time_slice_fec.frame_size = data[2] & 0x7 ;
+	ip_str->time_slice_fec.max_burst_duration = data[3];
+	ip_str->time_slice_fec.max_average_rate = (data[4]  >> 4) & 0xf ;
+	ip_str->time_slice_fec.time_slice_fec_id = data[4] & 0xf;
+	ip_str->time_slice_fec.id_selector = gf_malloc( data[1] - 3 ) ;
 	memcpy(ip_str->time_slice_fec.id_selector, data + 4, data[1]-3 );
-	return ; 
+	return ;
 }
 
 void descriptorLocation(GF_M2TS_IP_Stream *ip_str , u8 * data)
 {
 	ip_str->location.network_id = (data[2]<<8)|data[3];
-	ip_str->location.original_network_id =  (data[4]<<8)|data[5]; 
-	ip_str->location.transport_stream_id = (data[6]<<8)|data[7]; 
+	ip_str->location.original_network_id =  (data[4]<<8)|data[5];
+	ip_str->location.transport_stream_id = (data[6]<<8)|data[7];
 	ip_str->location.service_id = (data[8]<<8)|data[9];
 	ip_str->location.component_tag = data[10];
-	return;  
+	return;
 }
 
 void gf_m2ts_target_ip(GF_M2TS_IP_Stream* ip_str, u8 * data)
@@ -723,7 +726,7 @@
 	i=j=0;
 	ip_str->targets = gf_list_new();
 	length = data[1];
-	for(i=0;i<length;i= i+5)
+	for(i=0; i<length; i= i+5)
 	{
 		GF_M2TS_IP_Target* ip_data;
 		GF_SAFEALLOC(ip_data,GF_M2TS_IP_Target);
@@ -732,7 +735,7 @@
 		ip_data->address_mask = 0;
 		memcpy(ip_data->address, data+2+i, 4);
 		ip_data->slash_mask=data[2+i+4];
-		
+
 		gf_list_add(ip_str->targets,ip_data);
 	}
 
@@ -749,7 +752,7 @@
 	u32 i = 0;
 	u32 cols = 0;
 
-	cols = mff->col_adt; 
+	cols = mff->col_adt;
 	for ( i = 0; i < rows; i ++ ) {
 		/* read a row from ADT into buffer */
 		getRowFromADT(mff, i, adt_rs_en_buffer);
@@ -772,7 +775,7 @@
 	u8 linebuffer[255];
 
 	//fprintf(stderr, "Starting FEC decoding ...\n");
-	
+
 	data = gf_malloc((mff->rows*191)*sizeof(char));
 	memset(data,0,sizeof(data));
 
@@ -809,13 +812,13 @@
 			if(correct_errors_erasures (linebuffer, ML, nerasures,  erasures) == 0)
 			{
 				//fprintf(stderr, "Correction Error line %d \n", i);
-			}		
+			}
 
 			/* TODO: replace the current line in MFF */
-		} 
+		}
 
-	memcpy(data+offset,linebuffer,sizeof(data));
-	offset += 191;
+		memcpy(data+offset,linebuffer,sizeof(data));
+		offset += 191;
 	}
 	//fprintf(stderr, "FEC decoding done.\n");
 	memcpy(mff->p_adt,data,sizeof(data));
@@ -837,7 +840,7 @@
 	GF_M2TS_IP_Stream *ip_stream_buff;
 	GF_M2TS_IP_Target *ip_targets;
 	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform;
-	
+
 	assert( ts );
 	offset =0;
 	ip_datagram = mff->p_adt;
@@ -850,7 +853,7 @@
 		if((mff->p_error_adt+offset)[0] == 0x01010101)
 		{
 			i_holes = gf_list_count(mff->mpe_holes);
-			for(i=0;i<i_holes;i++)
+			for(i=0; i<i_holes; i++)
 			{
 				mff_holes=gf_list_get(mff->mpe_holes, i);
 				if(mff_holes->offset == offset)
@@ -859,12 +862,12 @@
 					break;
 				}
 			}
-				
+
 		}
-					
-		if(gf_m2ts_ipdatagram_reader(ip_datagram, ip_packet, offset)){
-		
-			
+
+		if(gf_m2ts_ipdatagram_reader(ip_datagram, ip_packet, offset)) {
+
+
 			/* update the offset */
 			//offset += ip_packet->u32_total_length;
 			offset += (ip_packet->u32_hdr_length*4) + ip_packet->u32_udp_data_size;
@@ -874,55 +877,56 @@
 
 				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++)
-				{				
-						ip_stream_buff=gf_list_get(ip_platform->ip_streams, k);					
+				for(k=0; k<i_streams; k++)
+				{
+					ip_stream_buff=gf_list_get(ip_platform->ip_streams, k);
 
-						if(ip_stream_buff == NULL || ip_stream_buff->stream_info_gathered ==1)
+					if(ip_stream_buff == NULL || ip_stream_buff->stream_info_gathered ==1)
 					{
 						break;
 					}
 					else
-					{			
+					{
 						i_targets = gf_list_count(ip_stream_buff->targets);
 						l=0;
-						for(j=0;j<i_targets;j++)
+						for(j=0; j<i_targets; j++)
 						{
 							ip_targets = gf_list_get(ip_stream_buff->targets, j);
-						
+
 							if(gf_m2ts_compare_ip(ip_packet->u8_rx_adr,ip_targets->address))
 							{
-								for(l=0;l<9;l++)
+								for(l=0; l<9; l++)
 								{
 									if(ip_targets->rx_port[l] == ip_packet->u32_rx_udp_port) goto next;
 									if(ip_targets->rx_port[l] ==0) break;
 								}
-									
-									ip_targets->rx_port[l] = ip_packet->u32_rx_udp_port;
-									ip_stream_buff->PID = mff->PID;
-									goto next;
-							
-																
+
+								ip_targets->rx_port[l] = ip_packet->u32_rx_udp_port;
+								ip_stream_buff->PID = mff->PID;
+								goto next;
+
+
 							}
-							
+
 						}
 					}
 				}
 			}
-		}else{
+		} else {
 
-			 offset += (ip_packet->u32_hdr_length*4) + ip_packet->u32_udp_data_size;
+			offset += (ip_packet->u32_hdr_length*4) + ip_packet->u32_udp_data_size;
 		}
-next :;
-	 
+next :
+		;
+
 	}
 	empty_list(mff->mpe_holes);
 	gf_list_del(mff->mpe_holes);
-	mff->mpe_holes = NULL;   
+	mff->mpe_holes = NULL;
 	gf_m2ts_Delete_IpPacket(ip_packet);
 
 }
@@ -946,19 +950,19 @@
 
 	assert(ip_platform->ip_streams);
 	i_streams = gf_list_count(ip_platform->ip_streams);
-	for(i=0;i<i_streams;i++)
+	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");	
+		fprintf(stderr, "Target IP Adress : \n");
 		/*Print the target IP adress  */
 		i_targets = gf_list_count(ip_stream_buff->targets);
-		for(j=0;j<i_targets;j++)
+		for(j=0; j<i_targets; j++)
 		{
 			ip_targets = gf_list_get(ip_stream_buff->targets, j);
-			
+
 			l=0;
-						
+
 			ip_adress = ip_targets->address;
 			fprintf(stderr, "%d.%d.%d.%d/%d ",ip_adress[0],ip_adress[1],ip_adress[2],ip_adress[3],ip_targets->slash_mask);
 			fprintf(stderr, "RX port :");
@@ -968,8 +972,8 @@
 				l++;
 			}
 			fprintf(stderr, "\n");
-			
-			
+
+
 		}
 
 		/*Print the time slice fec descriptor */
@@ -978,60 +982,64 @@
 		if(ip_stream_buff->time_slice_fec.time_slicing==0)
 		{
 			fprintf(stderr, " No Time Slicing \n");
-		}else 
+		} else
 		{
-				fprintf(stderr, " Time Slicing\n");
+			fprintf(stderr, " Time Slicing\n");
 		}
 
 		if(ip_stream_buff->time_slice_fec.mpe_fec==0)
 		{
 			fprintf(stderr, " No MPE FEC used \n");
-		}else 
+		} else
 		{
-				fprintf(stderr, " MPE FEC used \n");
+			fprintf(stderr, " 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");
-				}break;
-			case 1:
-				{
-					fprintf(stderr, " Frame size : 512 rows \n");
-					fprintf(stderr, " Max Burst Duration 1024 kbits\n");
-				}break;
-			case 2:
-				{
-					fprintf(stderr, " Frame size : 768 rows \n");
-					fprintf(stderr, " Max Burst Duration 1536 kbits\n");
-				}break;
-			case 3:
-				{
-					fprintf(stderr, " Frame size : 1024 rows \n");
-					fprintf(stderr, " 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);
+		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");
+		}
+		break;
+		case 1:
+		{
+			fprintf(stderr, " Frame size : 512 rows \n");
+			fprintf(stderr, " Max Burst Duration 1024 kbits\n");
+		}
+		break;
+		case 2:
+		{
+			fprintf(stderr, " Frame size : 768 rows \n");
+			fprintf(stderr, " Max Burst Duration 1536 kbits\n");
+		}
+		break;
+		case 3:
+		{
+			fprintf(stderr, " Frame size : 1024 rows \n");
+			fprintf(stderr, " Max Burst Duration 2048 kbits\n");
+		}
+		break;
+		default:
+			break;
+		}
 
-			/* Locayion descriptor */
+		fprintf(stderr, " Time Slice Fec ID : %x\n",ip_stream_buff->time_slice_fec.time_slice_fec_id);
 
-			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);		
+		/* 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
+	}
 
-			getchar(); // attendre l'appuie d'une touche
-	}		
-	
 
 
 }
@@ -1052,7 +1060,7 @@
 
 	ipv4_addr = GF_4CC(ip_packet->u8_rx_adr[0], ip_packet->u8_rx_adr[1], ip_packet->u8_rx_adr[2], ip_packet->u8_rx_adr[3]);
 	nb_socket_struct = gf_list_count(ts->ip_platform->socket_struct);
-	for(i=0;i<nb_socket_struct;i++) {
+	for(i=0; i<nb_socket_struct; i++) {
 		Sock_Struct = gf_list_get(ts->ip_platform->socket_struct,i);
 		if ((Sock_Struct->ipv4_addr==ipv4_addr)&& (Sock_Struct->port == (u16) ip_packet->u32_rx_udp_port)) {
 			if (Sock_Struct->bind_failure) return;
@@ -1077,12 +1085,12 @@
 			e = gf_sk_setup_multicast(Sock_Struct->sock, name, ip_packet->u32_rx_udp_port, 1/*TTL - FIXME this should be in a cfg file*/, 0, NULL/*FIXME this should be in a cfg file*/);
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Setting up multicast socket for MPE on %s:%d\n", name, ip_packet->u32_rx_udp_port ));
 		} else {
-			/* 
-				binding of the socket to send data to port 4600 on the local machine 
+			/*
+				binding of the socket to send data to port 4600 on the local machine
 				the first adress / port parameters are NULL or 0 because there are not needed for sending UDP datagrams
 				the second adress is "localhost" and the port is the destination port on localhost
 			*/
-			e = gf_sk_bind(Sock_Struct->sock, "127.0.0.1", ip_packet->u32_rx_udp_port,/*name*/"127.0.0.1", ip_packet->u32_rx_udp_port, 0); 
+			e = gf_sk_bind(Sock_Struct->sock, "127.0.0.1", ip_packet->u32_rx_udp_port,/*name*/"127.0.0.1", ip_packet->u32_rx_udp_port, 0);
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Setting up socket for MPE on 127.0.0.1:%d\n", ip_packet->u32_rx_udp_port ));
 		}
 
@@ -1098,7 +1106,7 @@
 	// ********************************************************
 
 	e = gf_sk_send(Sock_Struct->sock, ip_packet->data, ip_packet->u32_udp_data_size - 8);
-	if (e != GF_OK){ 
+	if (e != GF_OK) {
 		fprintf(stderr, "Error sending to \n");
 	}
 	if (yield) gf_sleep(10);
@@ -1115,54 +1123,54 @@
 {
 	assert (mff != NULL);
 	if (rows != 256 && rows != 512 && rows != 768 && rows != 1024) return 0;
-	mff->rows = rows ; 
+	mff->rows = rows ;
 	mff->col_adt = MPE_ADT_COLS;
-	mff->col_rs = MPE_RS_COLS; 	
-	mff->p_adt = (u8 *)gf_calloc(MPE_ADT_COLS*rows,sizeof(u8));	
+	mff->col_rs = MPE_RS_COLS;
+	mff->p_adt = (u8 *)gf_calloc(MPE_ADT_COLS*rows,sizeof(u8));
 	mff->p_rs = (u8 *)gf_calloc(MPE_RS_COLS*rows,sizeof(u8));
 
 
 	fprintf(stderr, "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)); 
+	mff->capacity_total = mff->col_adt*rows;
+	mff->p_error_adt = (u32 *)gf_calloc(mff->col_adt*rows,sizeof(u32));
 	mff->p_error_rs = (u32 *)gf_calloc(mff->col_rs*rows,sizeof(u32));
 	mff->current_offset_adt = 0;
 	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->mpe_holes = gf_list_new();
 	mff->initialized = 1;
 	return 1;
 }
 
-void resetMFF(MPE_FEC_FRAME * mff) 
+void resetMFF(MPE_FEC_FRAME * mff)
 {
 	mff->current_offset_adt = 0;
-	mff->current_offset_rs = 0; 
+	mff->current_offset_rs = 0;
 	memset(mff->p_error_adt, 0, mff->col_adt * mff->rows*sizeof(u32));
 	memset(mff->p_error_rs, 0, mff->col_rs * mff->rows*sizeof(u32));
-	memset(mff->p_adt, 0, MPE_ADT_COLS* mff->rows*sizeof(u8));	
+	memset(mff->p_adt, 0, MPE_ADT_COLS* mff->rows*sizeof(u8));
 	memset(mff->p_rs, 0, MPE_RS_COLS* mff->rows*sizeof(u8));
 	mff->ADT_done = 0;
 	mff->PID = 0;
-	if(mff->mpe_holes){
+	if(mff->mpe_holes) {
 		empty_list(mff->mpe_holes);
 		//gf_list_del(mff->mpe_holes);
 	}
-   
+
 }
 
 /* return a row of appplicatio data table*/
 void getRowFromADT(MPE_FEC_FRAME * mff, u32 index, u8* adt_row)
 {
 	u32 i = 0 ;
-	u32 base = 0; 
+	u32 base = 0;
 	//assert ( sizeof ( adt_row ) >= MPE_ADT_COLS );
 	for ( i = 0; i < mff->col_adt ; i ++ ) {
 		adt_row [ i ] = mff -> p_adt [ index + base ];
-		base += mff-> rows ; 
+		base += mff-> rows ;
 	}
 }
 
@@ -1170,44 +1178,44 @@
 void getRowFromRS (MPE_FEC_FRAME * mff, u32 index, u8* rs_row)
 {
 	u32 i = 0 ;
-	u32 base = 0; 
+	u32 base = 0;
 	assert (rs_row != NULL );
 	//assert (sizeof ( rs_row ) >= MPE_ADT_COLS );
 	for ( i = 0; i < mff->col_rs ; i ++ ) {
 		rs_row [ i ] = mff -> p_rs [ index + base ];
- 		base += mff -> rows ; 
+		base += mff -> rows ;
 	}
 }
 
 void setRowRS(MPE_FEC_FRAME *mff, u32 index, u8 *p_rs)
 {
-	u32 i = 0; 
-	u32 base = 0; 
+	u32 i = 0;
+	u32 base = 0;
 	assert ( p_rs != NULL );
 	//assert ( sizeof (p_rs ) >= MPE_RS_COLS ) ;
 	for ( i = 0; i < mff -> col_rs; i ++ ) {
 		mff -> p_rs [ base + index ] = p_rs [ i];
-		base += mff -> rows; 
+		base += mff -> rows;
 	}
 
 }
 void addPadding(MPE_FEC_FRAME *mff , u32 offset)
 {
-	u32 i = 0; 
+	u32 i = 0;
 	fprintf(stderr, "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 ; 
+		mff -> p_adt [i] = 0xff ;
 }
 #ifdef GPAC_UNUSED_FUNC
 static void print_bytes2(u8 * data, u32 length ) /*print_bytes2 */
 {
-	u32 i = 0; 
-	u32 row_num = 0; 
-	u32 k = 0; 
+	u32 i = 0;
+	u32 row_num = 0;
+	u32 k = 0;
 	for ( i = 0; i < length ; i ++ ) {
 		if (k == 0) {
-			fprintf(stderr, "%x0  : ", row_num); 
-			k = 0;  
+			fprintf(stderr, "%x0  : ", row_num);
+			k = 0;
 		}
 		fprintf(stderr, "%#x ", data[i]);
 		k++;
@@ -1224,9 +1232,9 @@
 void setIpDatagram(MPE_FEC_FRAME * mff, u32 offset, u8* dgram, u32 length )
 {
 	MPE_Error_Holes *mpe_error_holes;
-	
+
 	GF_SAFEALLOC(mpe_error_holes,MPE_Error_Holes);
-	
+
 
 	if (offset >= mff->capacity_total) {
 		fprintf(stderr, "Offset %d bigger than capacity %d \n", offset, mff->capacity_total );
@@ -1237,7 +1245,7 @@
 	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);
-			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);
 		}
@@ -1246,24 +1254,24 @@
 		mpe_error_holes->length = offset - mff->current_offset_adt;
 		gf_list_add(mff->mpe_holes,mpe_error_holes);
 		mff->current_offset_adt = offset  ; // update the offset
-	} 
-	
+	}
+
 	memcpy(mff->p_adt+mff->current_offset_adt,dgram, length);
 	mff->current_offset_adt = offset+length  ; // update the offset
-	
+
 }
 /*set RS data into mpe fec frame*/
-void setColRS( MPE_FEC_FRAME * mff, u32 offset, u8 * pds, u32 length ) 
+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 );
 		setErrorIndicator( mff->p_error_rs , mff->current_offset_rs , (offset - mff->current_offset_rs)*sizeof(u32));
-		mff->current_offset_rs = offset;	
-	} 
+		mff->current_offset_rs = offset;
+	}
 	assert(mff->rows == length);
 	memcpy(mff->p_rs + mff->current_offset_rs , pds, length*sizeof(u8) );
-	mff->current_offset_rs = offset + length ; 
-	
+	mff->current_offset_rs = offset + length ;
+
 }
 
 void getColRS(MPE_FEC_FRAME * mff, u32 offset, u8 * pds, u32 length)
@@ -1273,32 +1281,32 @@
 
 void getErrorPositions(MPE_FEC_FRAME *mff, u32 row, u32 * errPositions)
 {
-	u32 i = 0 ; 
-	u32 base = row; 
+	u32 i = 0 ;
+	u32 base = row;
 	/*get error from adt*/
 	for ( i = 0; i < mff->col_adt ; i ++ ) {
-		errPositions [i] = mff->p_error_adt[base ]; 
-		base += mff->rows; 
+		errPositions [i] = mff->p_error_adt[base ];
+		base += mff->rows;
 	}
-	base = row; 
+	base = row;
 	for ( i = mff->col_adt ; i < mff->col_adt + mff-> col_rs ; i ++ ) {
-		errPositions [i] = mff->p_error_rs [ base ]; 
-		base += mff->rows ; 
+		errPositions [i] = mff->p_error_rs [ base ];
+		base += mff->rows ;
 	}
 }
 
 u32  getErrasurePositions( MPE_FEC_FRAME *mff , u32 row, u32 *errasures)
 {
-	u32 i = 0; 
+	u32 i = 0;
 	u32 base = row;
-	u32 nb = 0; 
+	u32 nb = 0;
 	u32 k =0;
 	for ( i = 0  ; i <  mff-> col_rs ; i ++ ) {
 		if ( mff->p_error_rs[base] ==  1 ) {
-			errasures [k++] = mff->p_error_rs [ base ]; 
+			errasures [k++] = mff->p_error_rs [ base ];
 			nb ++;
 		}
-		base += mff->rows ; 
+		base += mff->rows ;
 	}
 	fprintf(stderr, " the erasure locations is:\n");
 	for ( i = 0; i < nb ; i ++ )

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/filestreamer.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/filestreamer.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre, Cyril Concolato 
+ *			Authors: Jean Le Feuvre, Cyril Concolato
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,21 +11,21 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #include <gpac/internal/media_dev.h>
 #include <gpac/constants.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 
 #if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_STREAMING)
 
@@ -56,7 +56,7 @@
 
 	/*loaded AU info*/
 	GF_ISOSample  *au;
-	u32 current_au;		
+	u32 current_au;
 	u32 sample_duration;
 	u32 sample_desc_index;
 	/*normalized DTS in micro-sec*/
@@ -76,7 +76,7 @@
 	Bool loop;
 	Bool force_mpeg4_generic;
 	/*timeline origin of our session (all tracks) in microseconds*/
-	u32 timelineOrigin; 
+	u32 timelineOrigin;
 	/*list of streams in session*/
 	GF_RTPTrack *stream;
 
@@ -91,8 +91,8 @@
 
 
 
-static GF_Err gf_isom_streamer_setup_sdp(GF_ISOMRTPStreamer *streamer, char*sdpfilename, char **out_sdp_buffer) 
-{	
+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];
@@ -157,7 +157,10 @@
 		char *dsi = NULL;
 		u32 w, h;
 		u32 dsi_len = 0;
-		GF_DecoderConfig *dcd = gf_isom_get_decoder_config(streamer->isom, track->track_num, 1);
+		GF_DecoderConfig *dcd;
+		//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;
@@ -170,7 +173,7 @@
 
 		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 */
+		/*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);
@@ -180,7 +183,7 @@
 		}
 
 		if (dcd) gf_odf_desc_del((GF_Descriptor *)dcd);
-		
+
 		track = track->next;
 	}
 	fprintf(sdp_out, "\n");
@@ -201,15 +204,15 @@
 
 	gf_free(payload_type);
 	return GF_OK;
-} 
+}
 
 GF_EXPORT
-GF_Err gf_isom_streamer_write_sdp(GF_ISOMRTPStreamer *streamer, char*sdpfilename) 
+GF_Err gf_isom_streamer_write_sdp(GF_ISOMRTPStreamer *streamer, char*sdpfilename)
 {
 	return gf_isom_streamer_setup_sdp(streamer, sdpfilename, NULL);
 }
 
-GF_Err gf_isom_streamer_get_sdp(GF_ISOMRTPStreamer *streamer, char **out_sdp_buffer) 
+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);
 }
@@ -236,7 +239,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_streamer_send_next_packet(GF_ISOMRTPStreamer *streamer, s32 send_ahead_delay, s32 max_sleep_time) 
+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;
@@ -245,7 +248,7 @@
 	u64 min_ts, dts, cts;
 
 	if (!streamer) return GF_BAD_PARAM;
-	
+
 	/*browse all sessions and locate most mature stream*/
 	to_send = NULL;
 	min_ts = (u64) -1;
@@ -297,7 +300,7 @@
 	/*no input data ...*/
 	if( !to_send) return GF_EOS;
 
-	
+
 	/*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)) {
@@ -318,8 +321,8 @@
 	min_ts /= 1000;
 
 	if (max_sleep_time) {
-		diff = ((u32) min_ts) - gf_sys_clock();	
-		if (diff>max_sleep_time) 
+		diff = ((u32) min_ts) - gf_sys_clock();
+		if (diff>max_sleep_time)
 			return GF_OK;
 	}
 
@@ -327,7 +330,7 @@
 	/*sleep until TS is mature*/
 	while (1) {
 		diff = ((u32) min_ts) - gf_sys_clock();
-		
+
 		if (diff > send_ahead_delay) {
 			gf_sleep(1);
 		} else {
@@ -371,12 +374,12 @@
 			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, au_start, au_end, to_send->current_au, duration, to_send->sample_desc_index);
+			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, 1, 1, to_send->current_au, duration, to_send->sample_desc_index);
+		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);
@@ -403,8 +406,8 @@
 	GF_Err e = GF_OK;
 	const char *opt = NULL;
 	/*GF_Config *configFile = NULL;	*/
-	u32 i, max_ptime, au_sn_len;	
-	u8 payt;			
+	u32 i, max_ptime, au_sn_len;
+	u8 payt;
 	GF_ISOFile *file;
 	GF_RTPTrack *track, *prev_track;
 	u16 first_port;
@@ -435,14 +438,14 @@
 
 	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;
@@ -493,10 +496,10 @@
 
 
 		switch (TrackMediaSubType) {
-		case GF_ISOM_SUBTYPE_MPEG4_CRYP: 
+		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;
@@ -511,7 +514,7 @@
 					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;
@@ -521,7 +524,7 @@
 				gf_odf_desc_del((GF_Descriptor*)esd);
 			}
 		}
-			break;
+		break;
 		case GF_ISOM_SUBTYPE_AVC_H264:
 		case GF_ISOM_SUBTYPE_AVC2_H264:
 		case GF_ISOM_SUBTYPE_AVC3_H264:
@@ -547,13 +550,14 @@
 			}
 			break;
 		}
-			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_SHC1:
 		{
-			GF_HEVCConfig *hevcc = NULL;
+			GF_HEVCConfig *hevcc = NULL, *shvcc = NULL;
 			hevcc = gf_isom_hevc_config_get(streamer->isom, track->track_num, 1);
 			if (hevcc) {
 				track->avc_nalu_size = hevcc->nal_unit_size;
@@ -561,16 +565,23 @@
 				streamType = GF_STREAM_VISUAL;
 				oti = GPAC_OTI_VIDEO_HEVC;
 			}
+			shvcc = gf_isom_shvc_config_get(streamer->isom, track->track_num, 1);
+			if (shvcc) {
+				track->avc_nalu_size = shvcc->nal_unit_size;
+				gf_odf_hevc_cfg_del(shvcc);
+				streamType = GF_STREAM_VISUAL;
+				oti = GPAC_OTI_VIDEO_SHVC;
+			}
 			flags |= GP_RTP_PCK_USE_MULTI;
 			break;
 		}
-			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);
 
@@ -580,17 +591,17 @@
 			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);
+		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;
@@ -615,10 +626,10 @@
 exit:
 	gf_free(streamer);
 	return NULL;
-} 
+}
 
 GF_EXPORT
-void gf_isom_streamer_del(GF_ISOMRTPStreamer *streamer) 
+void gf_isom_streamer_del(GF_ISOMRTPStreamer *streamer)
 {
 	GF_RTPTrack *track = streamer->stream;
 	while (track) {

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/gpac_ogg.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/gpac_ogg.c Changed

@@ -29,426 +29,427 @@
 #define BUFFER_INCREMENT 256
 
 static u32 mask[]=
-{0x00000000,0x00000001,0x00000003,0x00000007,0x0000000f,
- 0x0000001f,0x0000003f,0x0000007f,0x000000ff,0x000001ff,
- 0x000003ff,0x000007ff,0x00000fff,0x00001fff,0x00003fff,
- 0x00007fff,0x0000ffff,0x0001ffff,0x0003ffff,0x0007ffff,
- 0x000fffff,0x001fffff,0x003fffff,0x007fffff,0x00ffffff,
- 0x01ffffff,0x03ffffff,0x07ffffff,0x0fffffff,0x1fffffff,
- 0x3fffffff,0x7fffffff,0xffffffff };
+{	0x00000000,0x00000001,0x00000003,0x00000007,0x0000000f,
+	0x0000001f,0x0000003f,0x0000007f,0x000000ff,0x000001ff,
+	0x000003ff,0x000007ff,0x00000fff,0x00001fff,0x00003fff,
+	0x00007fff,0x0000ffff,0x0001ffff,0x0003ffff,0x0007ffff,
+	0x000fffff,0x001fffff,0x003fffff,0x007fffff,0x00ffffff,
+	0x01ffffff,0x03ffffff,0x07ffffff,0x0fffffff,0x1fffffff,
+	0x3fffffff,0x7fffffff,0xffffffff
+};
 
 static u32 mask8B[]=
 {0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff};
 
-void oggpack_writeinit(oggpack_buffer *b){
-  memset(b,0,sizeof(*b));
-  b->ptr = b->buffer = (unsigned char *)gf_malloc(BUFFER_INCREMENT);
-  b->buffer[0]='\0';
-  b->storage=BUFFER_INCREMENT;
+void oggpack_writeinit(oggpack_buffer *b) {
+	memset(b,0,sizeof(*b));
+	b->ptr = b->buffer = (unsigned char *)gf_malloc(BUFFER_INCREMENT);
+	b->buffer[0]='\0';
+	b->storage=BUFFER_INCREMENT;
 }
 
-void oggpackB_writeinit(oggpack_buffer *b){
-  oggpack_writeinit(b);
+void oggpackB_writeinit(oggpack_buffer *b) {
+	oggpack_writeinit(b);
 }
 
-void oggpack_writetrunc(oggpack_buffer *b,s32 bits){
-  s32 bytes=bits>>3;
-  bits-=bytes*8;
-  b->ptr=b->buffer+bytes;
-  b->endbit=bits;
-  b->endbyte=bytes;
-  *b->ptr&=mask[bits];
+void oggpack_writetrunc(oggpack_buffer *b,s32 bits) {
+	s32 bytes=bits>>3;
+	bits-=bytes*8;
+	b->ptr=b->buffer+bytes;
+	b->endbit=bits;
+	b->endbyte=bytes;
+	*b->ptr&=mask[bits];
 }
 
-void oggpackB_writetrunc(oggpack_buffer *b,s32 bits){
-  s32 bytes=bits>>3;
-  bits-=bytes*8;
-  b->ptr=b->buffer+bytes;
-  b->endbit=bits;
-  b->endbyte=bytes;
-  *b->ptr&=mask8B[bits];
+void oggpackB_writetrunc(oggpack_buffer *b,s32 bits) {
+	s32 bytes=bits>>3;
+	bits-=bytes*8;
+	b->ptr=b->buffer+bytes;
+	b->endbit=bits;
+	b->endbyte=bytes;
+	*b->ptr&=mask8B[bits];
 }
 
 /* Takes only up to 32 bits. */
-void oggpack_write(oggpack_buffer *b,u32 value,s32 bits){
-  if(b->endbyte+4>=b->storage){
-    b->buffer = (unsigned char *)gf_realloc(b->buffer,b->storage+BUFFER_INCREMENT);
-    b->storage+=BUFFER_INCREMENT;
-    b->ptr=b->buffer+b->endbyte;
-  }
-
-  value&=mask[bits]; 
-  bits+=b->endbit;
-
-  b->ptr[0]|=value<<b->endbit;  
-  
-  if(bits>=8){
-    b->ptr[1]=value>>(8-b->endbit);  
-    if(bits>=16){
-      b->ptr[2]=value>>(16-b->endbit);  
-      if(bits>=24){
-	b->ptr[3]=value>>(24-b->endbit);  
-	if(bits>=32){
-	  if(b->endbit)
-	    b->ptr[4]=value>>(32-b->endbit);
-	  else
-	    b->ptr[4]=0;
+void oggpack_write(oggpack_buffer *b,u32 value,s32 bits) {
+	if(b->endbyte+4>=b->storage) {
+		b->buffer = (unsigned char *)gf_realloc(b->buffer,b->storage+BUFFER_INCREMENT);
+		b->storage+=BUFFER_INCREMENT;
+		b->ptr=b->buffer+b->endbyte;
 	}
-      }
-    }
-  }
 
-  b->endbyte+=bits/8;
-  b->ptr+=bits/8;
-  b->endbit=bits&7;
+	value&=mask[bits];
+	bits+=b->endbit;
+
+	b->ptr[0]|=value<<b->endbit;
+
+	if(bits>=8) {
+		b->ptr[1]=value>>(8-b->endbit);
+		if(bits>=16) {
+			b->ptr[2]=value>>(16-b->endbit);
+			if(bits>=24) {
+				b->ptr[3]=value>>(24-b->endbit);
+				if(bits>=32) {
+					if(b->endbit)
+						b->ptr[4]=value>>(32-b->endbit);
+					else
+						b->ptr[4]=0;
+				}
+			}
+		}
+	}
+
+	b->endbyte+=bits/8;
+	b->ptr+=bits/8;
+	b->endbit=bits&7;
 }
 
 /* Takes only up to 32 bits. */
-void oggpackB_write(oggpack_buffer *b,u32 value,s32 bits){
-  if(b->endbyte+4>=b->storage){
-    b->buffer = (unsigned char *)gf_realloc(b->buffer,b->storage+BUFFER_INCREMENT);
-    b->storage+=BUFFER_INCREMENT;
-    b->ptr=b->buffer+b->endbyte;
-  }
-
-  value=(value&mask[bits])<<(32-bits); 
-  bits+=b->endbit;
-
-  b->ptr[0]|=value>>(24+b->endbit);  
-  
-  if(bits>=8){
-    b->ptr[1]=value>>(16+b->endbit);  
-    if(bits>=16){
-      b->ptr[2]=value>>(8+b->endbit);  
-      if(bits>=24){
-	b->ptr[3]=value>>(b->endbit);  
-	if(bits>=32){
-	  if(b->endbit)
-	    b->ptr[4]=value<<(8-b->endbit);
-	  else
-	    b->ptr[4]=0;
+void oggpackB_write(oggpack_buffer *b,u32 value,s32 bits) {
+	if(b->endbyte+4>=b->storage) {
+		b->buffer = (unsigned char *)gf_realloc(b->buffer,b->storage+BUFFER_INCREMENT);
+		b->storage+=BUFFER_INCREMENT;
+		b->ptr=b->buffer+b->endbyte;
 	}
-      }
-    }
-  }
 
-  b->endbyte+=bits/8;
-  b->ptr+=bits/8;
-  b->endbit=bits&7;
+	value=(value&mask[bits])<<(32-bits);
+	bits+=b->endbit;
+
+	b->ptr[0]|=value>>(24+b->endbit);
+
+	if(bits>=8) {
+		b->ptr[1]=value>>(16+b->endbit);
+		if(bits>=16) {
+			b->ptr[2]=value>>(8+b->endbit);
+			if(bits>=24) {
+				b->ptr[3]=value>>(b->endbit);
+				if(bits>=32) {
+					if(b->endbit)
+						b->ptr[4]=value<<(8-b->endbit);
+					else
+						b->ptr[4]=0;
+				}
+			}
+		}
+	}
+
+	b->endbyte+=bits/8;
+	b->ptr+=bits/8;
+	b->endbit=bits&7;
 }
 
-void oggpack_writealign(oggpack_buffer *b){
-  s32 bits=8-b->endbit;
-  if(bits<8)
-    oggpack_write(b,0,bits);
+void oggpack_writealign(oggpack_buffer *b) {
+	s32 bits=8-b->endbit;
+	if(bits<8)
+		oggpack_write(b,0,bits);
 }
 
-void oggpackB_writealign(oggpack_buffer *b){
-  s32 bits=8-b->endbit;
-  if(bits<8)
-    oggpackB_write(b,0,bits);
+void oggpackB_writealign(oggpack_buffer *b) {
+	s32 bits=8-b->endbit;
+	if(bits<8)
+		oggpackB_write(b,0,bits);
 }
 
 static void oggpack_writecopy_helper(oggpack_buffer *b,
-				     void *source,
-				     s32 bits,
-				     void (*w)(oggpack_buffer *,
-					       u32,
-					       s32),
-				     s32 msb){
-  unsigned char *ptr=(unsigned char *)source;
-
-  s32 bytes=bits/8;
-  bits-=bytes*8;
+                                     void *source,
+                                     s32 bits,
+                                     void (*w)(oggpack_buffer *,
+                                             u32,
+                                             s32),
+                                     s32 msb) {
+	unsigned char *ptr=(unsigned char *)source;
+
+	s32 bytes=bits/8;
+	bits-=bytes*8;
+
+	if(b->endbit) {
+		s32 i;
+		/* unaligned copy.  Do it the hard way. */
+		for(i=0; i<bytes; i++)
+			w(b,(u32)(ptr[i]),8);
+	} else {
+		/* aligned block copy */
+		if(b->endbyte+bytes+1>=b->storage) {
+			b->storage=b->endbyte+bytes+BUFFER_INCREMENT;
+			b->buffer = (unsigned char *)gf_realloc(b->buffer,b->storage);
+			b->ptr=b->buffer+b->endbyte;
+		}
+
+		memmove(b->ptr,source,bytes);
+		b->ptr+=bytes;
+		b->buffer+=bytes;
+		*b->ptr=0;
 
-  if(b->endbit){
-    s32 i;
-    /* unaligned copy.  Do it the hard way. */
-    for(i=0;i<bytes;i++)
-      w(b,(u32)(ptr[i]),8);    
-  }else{
-    /* aligned block copy */
-    if(b->endbyte+bytes+1>=b->storage){
-      b->storage=b->endbyte+bytes+BUFFER_INCREMENT;
-      b->buffer = (unsigned char *)gf_realloc(b->buffer,b->storage);
-      b->ptr=b->buffer+b->endbyte;
-    }
-
-    memmove(b->ptr,source,bytes);
-    b->ptr+=bytes;
-    b->buffer+=bytes;
-    *b->ptr=0;
-
-  }
-  if(bits){
-    if(msb)
-      w(b,(u32)(ptr[bytes]>>(8-bits)),bits);    
-    else
-      w(b,(u32)(ptr[bytes]),bits);    
-  }
+	}
+	if(bits) {
+		if(msb)
+			w(b,(u32)(ptr[bytes]>>(8-bits)),bits);
+		else
+			w(b,(u32)(ptr[bytes]),bits);
+	}
 }
 
-void oggpack_writecopy(oggpack_buffer *b,void *source,s32 bits){
-  oggpack_writecopy_helper(b,source,bits,oggpack_write,0);
+void oggpack_writecopy(oggpack_buffer *b,void *source,s32 bits) {
+	oggpack_writecopy_helper(b,source,bits,oggpack_write,0);
 }
 
-void oggpackB_writecopy(oggpack_buffer *b,void *source,s32 bits){
-  oggpack_writecopy_helper(b,source,bits,oggpackB_write,1);
+void oggpackB_writecopy(oggpack_buffer *b,void *source,s32 bits) {
+	oggpack_writecopy_helper(b,source,bits,oggpackB_write,1);
 }
 
-void oggpack_reset(oggpack_buffer *b){
-  b->ptr=b->buffer;
-  b->buffer[0]=0;
-  b->endbit=b->endbyte=0;
+void oggpack_reset(oggpack_buffer *b) {
+	b->ptr=b->buffer;
+	b->buffer[0]=0;
+	b->endbit=b->endbyte=0;
 }
 
-void oggpackB_reset(oggpack_buffer *b){
-  oggpack_reset(b);
+void oggpackB_reset(oggpack_buffer *b) {
+	oggpack_reset(b);
 }
 
-void oggpack_writeclear(oggpack_buffer *b){
-  gf_free(b->buffer);
-  memset(b,0,sizeof(*b));
+void oggpack_writeclear(oggpack_buffer *b) {
+	gf_free(b->buffer);
+	memset(b,0,sizeof(*b));
 }
 
-void oggpackB_writeclear(oggpack_buffer *b){
-  oggpack_writeclear(b);
+void oggpackB_writeclear(oggpack_buffer *b) {
+	oggpack_writeclear(b);
 }
 
-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 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 oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes) {
+	oggpack_readinit(b,buf,bytes);
 }
 
 /* Read in bits without advancing the bitptr; bits <= 32 */
-s32 oggpack_look(oggpack_buffer *b,s32 bits){
-  u32 ret;
-  u32 m=mask[bits];
-
-  bits+=b->endbit;
-
-  if(b->endbyte+4>=b->storage){
-    /* not the main path */
-    if(b->endbyte*8+bits>b->storage*8)return(-1);
-  }
-  
-  ret=b->ptr[0]>>b->endbit;
-  if(bits>8){
-    ret|=b->ptr[1]<<(8-b->endbit);  
-    if(bits>16){
-      ret|=b->ptr[2]<<(16-b->endbit);  
-      if(bits>24){
-	ret|=b->ptr[3]<<(24-b->endbit);  
-	if(bits>32 && b->endbit)
-	  ret|=b->ptr[4]<<(32-b->endbit);
-      }
-    }
-  }
-  return(m&ret);
+s32 oggpack_look(oggpack_buffer *b,s32 bits) {
+	u32 ret;
+	u32 m=mask[bits];
+
+	bits+=b->endbit;
+
+	if(b->endbyte+4>=b->storage) {
+		/* not the main path */
+		if(b->endbyte*8+bits>b->storage*8)return(-1);
+	}
+
+	ret=b->ptr[0]>>b->endbit;
+	if(bits>8) {
+		ret|=b->ptr[1]<<(8-b->endbit);
+		if(bits>16) {
+			ret|=b->ptr[2]<<(16-b->endbit);
+			if(bits>24) {
+				ret|=b->ptr[3]<<(24-b->endbit);
+				if(bits>32 && b->endbit)
+					ret|=b->ptr[4]<<(32-b->endbit);
+			}
+		}
+	}
+	return(m&ret);
 }
 
 /* Read in bits without advancing the bitptr; bits <= 32 */
-s32 oggpackB_look(oggpack_buffer *b,s32 bits){
-  u32 ret;
-  s32 m=32-bits;
+s32 oggpackB_look(oggpack_buffer *b,s32 bits) {
+	u32 ret;
+	s32 m=32-bits;
 
-  bits+=b->endbit;
+	bits+=b->endbit;
 
-  if(b->endbyte+4>=b->storage){
-    /* not the main path */
-    if(b->endbyte*8+bits>b->storage*8)return(-1);
-  }
-  
-  ret=b->ptr[0]<<(24+b->endbit);
-  if(bits>8){
-    ret|=b->ptr[1]<<(16+b->endbit);  
-    if(bits>16){
-      ret|=b->ptr[2]<<(8+b->endbit);  
-      if(bits>24){
-	ret|=b->ptr[3]<<(b->endbit);  
-	if(bits>32 && b->endbit)
-	  ret|=b->ptr[4]>>(8-b->endbit);
-      }
-    }
-  }
-  return (ret>>(m>>1))>>((m+1)>>1);
+	if(b->endbyte+4>=b->storage) {
+		/* not the main path */
+		if(b->endbyte*8+bits>b->storage*8)return(-1);
+	}
+
+	ret=b->ptr[0]<<(24+b->endbit);
+	if(bits>8) {
+		ret|=b->ptr[1]<<(16+b->endbit);
+		if(bits>16) {
+			ret|=b->ptr[2]<<(8+b->endbit);
+			if(bits>24) {
+				ret|=b->ptr[3]<<(b->endbit);
+				if(bits>32 && b->endbit)
+					ret|=b->ptr[4]>>(8-b->endbit);
+			}
+		}
+	}
+	return (ret>>(m>>1))>>((m+1)>>1);
 }
 
-s32 oggpack_look1(oggpack_buffer *b){
-  if(b->endbyte>=b->storage)return(-1);
-  return((b->ptr[0]>>b->endbit)&1);
+s32 oggpack_look1(oggpack_buffer *b) {
+	if(b->endbyte>=b->storage)return(-1);
+	return((b->ptr[0]>>b->endbit)&1);
 }
 
-s32 oggpackB_look1(oggpack_buffer *b){
-  if(b->endbyte>=b->storage)return(-1);
-  return((b->ptr[0]>>(7-b->endbit))&1);
+s32 oggpackB_look1(oggpack_buffer *b) {
+	if(b->endbyte>=b->storage)return(-1);
+	return((b->ptr[0]>>(7-b->endbit))&1);
 }
 
-void oggpack_adv(oggpack_buffer *b,s32 bits){
-  bits+=b->endbit;
-  b->ptr+=bits/8;
-  b->endbyte+=bits/8;
-  b->endbit=bits&7;
+void oggpack_adv(oggpack_buffer *b,s32 bits) {
+	bits+=b->endbit;
+	b->ptr+=bits/8;
+	b->endbyte+=bits/8;
+	b->endbit=bits&7;
 }
 
-void oggpackB_adv(oggpack_buffer *b,s32 bits){
-  oggpack_adv(b,bits);
+void oggpackB_adv(oggpack_buffer *b,s32 bits) {
+	oggpack_adv(b,bits);
 }
 
-void oggpack_adv1(oggpack_buffer *b){
-  if(++(b->endbit)>7){
-    b->endbit=0;
-    b->ptr++;
-    b->endbyte++;
-  }
+void oggpack_adv1(oggpack_buffer *b) {
+	if(++(b->endbit)>7) {
+		b->endbit=0;
+		b->ptr++;
+		b->endbyte++;
+	}
 }
 
-void oggpackB_adv1(oggpack_buffer *b){
-  oggpack_adv1(b);
+void oggpackB_adv1(oggpack_buffer *b) {
+	oggpack_adv1(b);
 }
 
 /* bits <= 32 */
-s32 oggpack_read(oggpack_buffer *b,s32 bits){
-  u32 ret;
-  u32 m=mask[bits];
-
-  bits+=b->endbit;
-
-  if(b->endbyte+4>=b->storage){
-    /* not the main path */
-    ret=(u32) (-1);
-    if(b->endbyte*8+bits>b->storage*8)goto overflow;
-  }
-  
-  ret=b->ptr[0]>>b->endbit;
-  if(bits>8){
-    ret|=b->ptr[1]<<(8-b->endbit);  
-    if(bits>16){
-      ret|=b->ptr[2]<<(16-b->endbit);  
-      if(bits>24){
-	ret|=b->ptr[3]<<(24-b->endbit);  
-	if(bits>32 && b->endbit){
-	  ret|=b->ptr[4]<<(32-b->endbit);
+s32 oggpack_read(oggpack_buffer *b,s32 bits) {
+	u32 ret;
+	u32 m=mask[bits];
+
+	bits+=b->endbit;
+
+	if(b->endbyte+4>=b->storage) {
+		/* not the main path */
+		ret=(u32) (-1);
+		if(b->endbyte*8+bits>b->storage*8)goto overflow;
 	}
-      }
-    }
-  }
-  ret&=m;
-  
- overflow:
 
-  b->ptr+=bits/8;
-  b->endbyte+=bits/8;
-  b->endbit=bits&7;
-  return(ret);
+	ret=b->ptr[0]>>b->endbit;
+	if(bits>8) {
+		ret|=b->ptr[1]<<(8-b->endbit);
+		if(bits>16) {
+			ret|=b->ptr[2]<<(16-b->endbit);
+			if(bits>24) {
+				ret|=b->ptr[3]<<(24-b->endbit);
+				if(bits>32 && b->endbit) {
+					ret|=b->ptr[4]<<(32-b->endbit);
+				}
+			}
+		}
+	}
+	ret&=m;
+
+overflow:
+
+	b->ptr+=bits/8;
+	b->endbyte+=bits/8;
+	b->endbit=bits&7;
+	return(ret);
 }
 
 /* bits <= 32 */
-s32 oggpackB_read(oggpack_buffer *b,s32 bits){
-  u32 ret;
-  s32 m=32-bits;
-  
-  bits+=b->endbit;
-
-  if(b->endbyte+4>=b->storage){
-    /* not the main path */
-    ret=(u32) (-1);
-    if(b->endbyte*8+bits>b->storage*8)goto overflow;
-  }
-  
-  ret=b->ptr[0]<<(24+b->endbit);
-  if(bits>8){
-    ret|=b->ptr[1]<<(16+b->endbit);  
-    if(bits>16){
-      ret|=b->ptr[2]<<(8+b->endbit);  
-      if(bits>24){
-	ret|=b->ptr[3]<<(b->endbit);  
-	if(bits>32 && b->endbit)
-	  ret|=b->ptr[4]>>(8-b->endbit);
-      }
-    }
-  }
-  ret=(ret>>(m>>1))>>((m+1)>>1);
-  
- overflow:
-
-  b->ptr+=bits/8;
-  b->endbyte+=bits/8;
-  b->endbit=bits&7;
-  return(ret);
-}
-
-s32 oggpack_read1(oggpack_buffer *b){
-  u32 ret;
-  
-  if(b->endbyte>=b->storage){
-    /* not the main path */
-    ret=(u32) (-1);
-    goto overflow;
-  }
-
-  ret=(b->ptr[0]>>b->endbit)&1;
-  
- overflow:
-
-  b->endbit++;
-  if(b->endbit>7){
-    b->endbit=0;
-    b->ptr++;
-    b->endbyte++;
-  }
-  return(ret);
-}
-
-s32 oggpackB_read1(oggpack_buffer *b){
-  u32 ret;
-  
-  if(b->endbyte>=b->storage){
-    /* not the main path */
-    ret=(u32) (-1);
-    goto overflow;
-  }
-
-  ret=(b->ptr[0]>>(7-b->endbit))&1;
-  
- overflow:
-
-  b->endbit++;
-  if(b->endbit>7){
-    b->endbit=0;
-    b->ptr++;
-    b->endbyte++;
-  }
-  return(ret);
-}
-
-s32 oggpack_bytes(oggpack_buffer *b){
-  return(b->endbyte+(b->endbit+7)/8);
-}
-
-s32 oggpack_bits(oggpack_buffer *b){
-  return(b->endbyte*8+b->endbit);
-}
-
-s32 oggpackB_bytes(oggpack_buffer *b){
-  return oggpack_bytes(b);
-}
-
-s32 oggpackB_bits(oggpack_buffer *b){
-  return oggpack_bits(b);
-}
-  
-unsigned char *oggpack_get_buffer(oggpack_buffer *b){
-  return(b->buffer);
-}
-
-unsigned char *oggpackB_get_buffer(oggpack_buffer *b){
-  return oggpack_get_buffer(b);
+s32 oggpackB_read(oggpack_buffer *b,s32 bits) {
+	u32 ret;
+	s32 m=32-bits;
+
+	bits+=b->endbit;
+
+	if(b->endbyte+4>=b->storage) {
+		/* not the main path */
+		ret=(u32) (-1);
+		if(b->endbyte*8+bits>b->storage*8)goto overflow;
+	}
+
+	ret=b->ptr[0]<<(24+b->endbit);
+	if(bits>8) {
+		ret|=b->ptr[1]<<(16+b->endbit);
+		if(bits>16) {
+			ret|=b->ptr[2]<<(8+b->endbit);
+			if(bits>24) {
+				ret|=b->ptr[3]<<(b->endbit);
+				if(bits>32 && b->endbit)
+					ret|=b->ptr[4]>>(8-b->endbit);
+			}
+		}
+	}
+	ret=(ret>>(m>>1))>>((m+1)>>1);
+
+overflow:
+
+	b->ptr+=bits/8;
+	b->endbyte+=bits/8;
+	b->endbit=bits&7;
+	return(ret);
+}
+
+s32 oggpack_read1(oggpack_buffer *b) {
+	u32 ret;
+
+	if(b->endbyte>=b->storage) {
+		/* not the main path */
+		ret=(u32) (-1);
+		goto overflow;
+	}
+
+	ret=(b->ptr[0]>>b->endbit)&1;
+
+overflow:
+
+	b->endbit++;
+	if(b->endbit>7) {
+		b->endbit=0;
+		b->ptr++;
+		b->endbyte++;
+	}
+	return(ret);
+}
+
+s32 oggpackB_read1(oggpack_buffer *b) {
+	u32 ret;
+
+	if(b->endbyte>=b->storage) {
+		/* not the main path */
+		ret=(u32) (-1);
+		goto overflow;
+	}
+
+	ret=(b->ptr[0]>>(7-b->endbit))&1;
+
+overflow:
+
+	b->endbit++;
+	if(b->endbit>7) {
+		b->endbit=0;
+		b->ptr++;
+		b->endbyte++;
+	}
+	return(ret);
+}
+
+s32 oggpack_bytes(oggpack_buffer *b) {
+	return(b->endbyte+(b->endbit+7)/8);
+}
+
+s32 oggpack_bits(oggpack_buffer *b) {
+	return(b->endbyte*8+b->endbit);
+}
+
+s32 oggpackB_bytes(oggpack_buffer *b) {
+	return oggpack_bytes(b);
+}
+
+s32 oggpackB_bits(oggpack_buffer *b) {
+	return oggpack_bits(b);
+}
+
+unsigned char *oggpack_get_buffer(oggpack_buffer *b) {
+	return(b->buffer);
+}
+
+unsigned char *oggpackB_get_buffer(oggpack_buffer *b) {
+	return oggpack_get_buffer(b);
 }
 
 
@@ -456,47 +457,47 @@
 
 /* A complete description of Ogg framing exists in docs/framing.html */
 
-s32 ogg_page_version(ogg_page *og){
-  return((s32)(og->header[4]));
+s32 ogg_page_version(ogg_page *og) {
+	return((s32)(og->header[4]));
 }
 
-s32 ogg_page_continued(ogg_page *og){
-  return((s32)(og->header[5]&0x01));
+s32 ogg_page_continued(ogg_page *og) {
+	return((s32)(og->header[5]&0x01));
 }
 
-s32 ogg_page_bos(ogg_page *og){
-  return((s32)(og->header[5]&0x02));
+s32 ogg_page_bos(ogg_page *og) {
+	return((s32)(og->header[5]&0x02));
 }
 
-s32 ogg_page_eos(ogg_page *og){
-  return((s32)(og->header[5]&0x04));
+s32 ogg_page_eos(ogg_page *og) {
+	return((s32)(og->header[5]&0x04));
 }
 
-s64 ogg_page_granulepos(ogg_page *og){
-  unsigned char *page=og->header;
-  s64 granulepos=page[13]&(0xff);
-  granulepos= (granulepos<<8)|(page[12]&0xff);
-  granulepos= (granulepos<<8)|(page[11]&0xff);
-  granulepos= (granulepos<<8)|(page[10]&0xff);
-  granulepos= (granulepos<<8)|(page[9]&0xff);
-  granulepos= (granulepos<<8)|(page[8]&0xff);
-  granulepos= (granulepos<<8)|(page[7]&0xff);
-  granulepos= (granulepos<<8)|(page[6]&0xff);
-  return(granulepos);
+s64 ogg_page_granulepos(ogg_page *og) {
+	unsigned char *page=og->header;
+	s64 granulepos=page[13]&(0xff);
+	granulepos= (granulepos<<8)|(page[12]&0xff);
+	granulepos= (granulepos<<8)|(page[11]&0xff);
+	granulepos= (granulepos<<8)|(page[10]&0xff);
+	granulepos= (granulepos<<8)|(page[9]&0xff);
+	granulepos= (granulepos<<8)|(page[8]&0xff);
+	granulepos= (granulepos<<8)|(page[7]&0xff);
+	granulepos= (granulepos<<8)|(page[6]&0xff);
+	return(granulepos);
 }
 
-s32 ogg_page_serialno(ogg_page *og){
-  return(og->header[14] |
-	 (og->header[15]<<8) |
-	 (og->header[16]<<16) |
-	 (og->header[17]<<24));
+s32 ogg_page_serialno(ogg_page *og) {
+	return(og->header[14] |
+	       (og->header[15]<<8) |
+	       (og->header[16]<<16) |
+	       (og->header[17]<<24));
 }
- 
-s32 ogg_page_pageno(ogg_page *og){
-  return(og->header[18] |
-	 (og->header[19]<<8) |
-	 (og->header[20]<<16) |
-	 (og->header[21]<<24));
+
+s32 ogg_page_pageno(ogg_page *og) {
+	return(og->header[18] |
+	       (og->header[19]<<8) |
+	       (og->header[20]<<16) |
+	       (og->header[21]<<24));
 }
 
 
@@ -508,21 +509,21 @@
 /* NOTE:
 If a page consists of a packet begun on a previous page, and a new
 packet begun (but not completed) on this page, the return will be:
-  ogg_page_packets(page)   ==1, 
+  ogg_page_packets(page)   ==1,
   ogg_page_continued(page) !=0
 
 If a page happens to be a single packet that was begun on a
 previous page, and spans to the next page (in the case of a three or
-more page packet), the return will be: 
-  ogg_page_packets(page)   ==0, 
+more page packet), the return will be:
+  ogg_page_packets(page)   ==0,
   ogg_page_continued(page) !=0
 */
 
-s32 ogg_page_packets(ogg_page *og){
-  s32 i,n=og->header[26],count=0;
-  for(i=0;i<n;i++)
-    if(og->header[27+i]<255)count++;
-  return(count);
+s32 ogg_page_packets(ogg_page *og) {
+	s32 i,n=og->header[26],count=0;
+	for(i=0; i<n; i++)
+		if(og->header[27+i]<255)count++;
+	return(count);
 }
 
 
@@ -530,220 +531,221 @@
 /* helper to initialize lookup for direct-table CRC (illustrative; we
    use the static init below) */
 
-static u32 _ogg_crc_entry(u32 index){
-  s32           i;
-  u32 r;
+static u32 _ogg_crc_entry(u32 index) {
+	s32           i;
+	u32 r;
 
-  r = index << 24;
-  for (i=0; i<8; i++)
-    if (r & 0x80000000UL)
-      r = (r << 1) ^ 0x04c11db7; /* The same as the ethernet generator
+	r = index << 24;
+	for (i=0; i<8; i++)
+		if (r & 0x80000000UL)
+			r = (r << 1) ^ 0x04c11db7; /* The same as the ethernet generator
 				    polynomial, although we use an
 				    unreflected alg and an init/final
 				    of 0, not 0xffffffff */
-    else
-       r<<=1;
- return (r & 0xffffffffUL);
+		else
+			r<<=1;
+	return (r & 0xffffffffUL);
 }
 #endif
 
-static u32 crc_lookup[256]={
-  0x00000000,0x04c11db7,0x09823b6e,0x0d4326d9,
-  0x130476dc,0x17c56b6b,0x1a864db2,0x1e475005,
-  0x2608edb8,0x22c9f00f,0x2f8ad6d6,0x2b4bcb61,
-  0x350c9b64,0x31cd86d3,0x3c8ea00a,0x384fbdbd,
-  0x4c11db70,0x48d0c6c7,0x4593e01e,0x4152fda9,
-  0x5f15adac,0x5bd4b01b,0x569796c2,0x52568b75,
-  0x6a1936c8,0x6ed82b7f,0x639b0da6,0x675a1011,
-  0x791d4014,0x7ddc5da3,0x709f7b7a,0x745e66cd,
-  0x9823b6e0,0x9ce2ab57,0x91a18d8e,0x95609039,
-  0x8b27c03c,0x8fe6dd8b,0x82a5fb52,0x8664e6e5,
-  0xbe2b5b58,0xbaea46ef,0xb7a96036,0xb3687d81,
-  0xad2f2d84,0xa9ee3033,0xa4ad16ea,0xa06c0b5d,
-  0xd4326d90,0xd0f37027,0xddb056fe,0xd9714b49,
-  0xc7361b4c,0xc3f706fb,0xceb42022,0xca753d95,
-  0xf23a8028,0xf6fb9d9f,0xfbb8bb46,0xff79a6f1,
-  0xe13ef6f4,0xe5ffeb43,0xe8bccd9a,0xec7dd02d,
-  0x34867077,0x30476dc0,0x3d044b19,0x39c556ae,
-  0x278206ab,0x23431b1c,0x2e003dc5,0x2ac12072,
-  0x128e9dcf,0x164f8078,0x1b0ca6a1,0x1fcdbb16,
-  0x018aeb13,0x054bf6a4,0x0808d07d,0x0cc9cdca,
-  0x7897ab07,0x7c56b6b0,0x71159069,0x75d48dde,
-  0x6b93dddb,0x6f52c06c,0x6211e6b5,0x66d0fb02,
-  0x5e9f46bf,0x5a5e5b08,0x571d7dd1,0x53dc6066,
-  0x4d9b3063,0x495a2dd4,0x44190b0d,0x40d816ba,
-  0xaca5c697,0xa864db20,0xa527fdf9,0xa1e6e04e,
-  0xbfa1b04b,0xbb60adfc,0xb6238b25,0xb2e29692,
-  0x8aad2b2f,0x8e6c3698,0x832f1041,0x87ee0df6,
-  0x99a95df3,0x9d684044,0x902b669d,0x94ea7b2a,
-  0xe0b41de7,0xe4750050,0xe9362689,0xedf73b3e,
-  0xf3b06b3b,0xf771768c,0xfa325055,0xfef34de2,
-  0xc6bcf05f,0xc27dede8,0xcf3ecb31,0xcbffd686,
-  0xd5b88683,0xd1799b34,0xdc3abded,0xd8fba05a,
-  0x690ce0ee,0x6dcdfd59,0x608edb80,0x644fc637,
-  0x7a089632,0x7ec98b85,0x738aad5c,0x774bb0eb,
-  0x4f040d56,0x4bc510e1,0x46863638,0x42472b8f,
-  0x5c007b8a,0x58c1663d,0x558240e4,0x51435d53,
-  0x251d3b9e,0x21dc2629,0x2c9f00f0,0x285e1d47,
-  0x36194d42,0x32d850f5,0x3f9b762c,0x3b5a6b9b,
-  0x0315d626,0x07d4cb91,0x0a97ed48,0x0e56f0ff,
-  0x1011a0fa,0x14d0bd4d,0x19939b94,0x1d528623,
-  0xf12f560e,0xf5ee4bb9,0xf8ad6d60,0xfc6c70d7,
-  0xe22b20d2,0xe6ea3d65,0xeba91bbc,0xef68060b,
-  0xd727bbb6,0xd3e6a601,0xdea580d8,0xda649d6f,
-  0xc423cd6a,0xc0e2d0dd,0xcda1f604,0xc960ebb3,
-  0xbd3e8d7e,0xb9ff90c9,0xb4bcb610,0xb07daba7,
-  0xae3afba2,0xaafbe615,0xa7b8c0cc,0xa379dd7b,
-  0x9b3660c6,0x9ff77d71,0x92b45ba8,0x9675461f,
-  0x8832161a,0x8cf30bad,0x81b02d74,0x857130c3,
-  0x5d8a9099,0x594b8d2e,0x5408abf7,0x50c9b640,
-  0x4e8ee645,0x4a4ffbf2,0x470cdd2b,0x43cdc09c,
-  0x7b827d21,0x7f436096,0x7200464f,0x76c15bf8,
-  0x68860bfd,0x6c47164a,0x61043093,0x65c52d24,
-  0x119b4be9,0x155a565e,0x18197087,0x1cd86d30,
-  0x029f3d35,0x065e2082,0x0b1d065b,0x0fdc1bec,
-  0x3793a651,0x3352bbe6,0x3e119d3f,0x3ad08088,
-  0x2497d08d,0x2056cd3a,0x2d15ebe3,0x29d4f654,
-  0xc5a92679,0xc1683bce,0xcc2b1d17,0xc8ea00a0,
-  0xd6ad50a5,0xd26c4d12,0xdf2f6bcb,0xdbee767c,
-  0xe3a1cbc1,0xe760d676,0xea23f0af,0xeee2ed18,
-  0xf0a5bd1d,0xf464a0aa,0xf9278673,0xfde69bc4,
-  0x89b8fd09,0x8d79e0be,0x803ac667,0x84fbdbd0,
-  0x9abc8bd5,0x9e7d9662,0x933eb0bb,0x97ffad0c,
-  0xafb010b1,0xab710d06,0xa6322bdf,0xa2f33668,
-  0xbcb4666d,0xb8757bda,0xb5365d03,0xb1f740b4};
+static u32 crc_lookup[256]= {
+	0x00000000,0x04c11db7,0x09823b6e,0x0d4326d9,
+	0x130476dc,0x17c56b6b,0x1a864db2,0x1e475005,
+	0x2608edb8,0x22c9f00f,0x2f8ad6d6,0x2b4bcb61,
+	0x350c9b64,0x31cd86d3,0x3c8ea00a,0x384fbdbd,
+	0x4c11db70,0x48d0c6c7,0x4593e01e,0x4152fda9,
+	0x5f15adac,0x5bd4b01b,0x569796c2,0x52568b75,
+	0x6a1936c8,0x6ed82b7f,0x639b0da6,0x675a1011,
+	0x791d4014,0x7ddc5da3,0x709f7b7a,0x745e66cd,
+	0x9823b6e0,0x9ce2ab57,0x91a18d8e,0x95609039,
+	0x8b27c03c,0x8fe6dd8b,0x82a5fb52,0x8664e6e5,
+	0xbe2b5b58,0xbaea46ef,0xb7a96036,0xb3687d81,
+	0xad2f2d84,0xa9ee3033,0xa4ad16ea,0xa06c0b5d,
+	0xd4326d90,0xd0f37027,0xddb056fe,0xd9714b49,
+	0xc7361b4c,0xc3f706fb,0xceb42022,0xca753d95,
+	0xf23a8028,0xf6fb9d9f,0xfbb8bb46,0xff79a6f1,
+	0xe13ef6f4,0xe5ffeb43,0xe8bccd9a,0xec7dd02d,
+	0x34867077,0x30476dc0,0x3d044b19,0x39c556ae,
+	0x278206ab,0x23431b1c,0x2e003dc5,0x2ac12072,
+	0x128e9dcf,0x164f8078,0x1b0ca6a1,0x1fcdbb16,
+	0x018aeb13,0x054bf6a4,0x0808d07d,0x0cc9cdca,
+	0x7897ab07,0x7c56b6b0,0x71159069,0x75d48dde,
+	0x6b93dddb,0x6f52c06c,0x6211e6b5,0x66d0fb02,
+	0x5e9f46bf,0x5a5e5b08,0x571d7dd1,0x53dc6066,
+	0x4d9b3063,0x495a2dd4,0x44190b0d,0x40d816ba,
+	0xaca5c697,0xa864db20,0xa527fdf9,0xa1e6e04e,
+	0xbfa1b04b,0xbb60adfc,0xb6238b25,0xb2e29692,
+	0x8aad2b2f,0x8e6c3698,0x832f1041,0x87ee0df6,
+	0x99a95df3,0x9d684044,0x902b669d,0x94ea7b2a,
+	0xe0b41de7,0xe4750050,0xe9362689,0xedf73b3e,
+	0xf3b06b3b,0xf771768c,0xfa325055,0xfef34de2,
+	0xc6bcf05f,0xc27dede8,0xcf3ecb31,0xcbffd686,
+	0xd5b88683,0xd1799b34,0xdc3abded,0xd8fba05a,
+	0x690ce0ee,0x6dcdfd59,0x608edb80,0x644fc637,
+	0x7a089632,0x7ec98b85,0x738aad5c,0x774bb0eb,
+	0x4f040d56,0x4bc510e1,0x46863638,0x42472b8f,
+	0x5c007b8a,0x58c1663d,0x558240e4,0x51435d53,
+	0x251d3b9e,0x21dc2629,0x2c9f00f0,0x285e1d47,
+	0x36194d42,0x32d850f5,0x3f9b762c,0x3b5a6b9b,
+	0x0315d626,0x07d4cb91,0x0a97ed48,0x0e56f0ff,
+	0x1011a0fa,0x14d0bd4d,0x19939b94,0x1d528623,
+	0xf12f560e,0xf5ee4bb9,0xf8ad6d60,0xfc6c70d7,
+	0xe22b20d2,0xe6ea3d65,0xeba91bbc,0xef68060b,
+	0xd727bbb6,0xd3e6a601,0xdea580d8,0xda649d6f,
+	0xc423cd6a,0xc0e2d0dd,0xcda1f604,0xc960ebb3,
+	0xbd3e8d7e,0xb9ff90c9,0xb4bcb610,0xb07daba7,
+	0xae3afba2,0xaafbe615,0xa7b8c0cc,0xa379dd7b,
+	0x9b3660c6,0x9ff77d71,0x92b45ba8,0x9675461f,
+	0x8832161a,0x8cf30bad,0x81b02d74,0x857130c3,
+	0x5d8a9099,0x594b8d2e,0x5408abf7,0x50c9b640,
+	0x4e8ee645,0x4a4ffbf2,0x470cdd2b,0x43cdc09c,
+	0x7b827d21,0x7f436096,0x7200464f,0x76c15bf8,
+	0x68860bfd,0x6c47164a,0x61043093,0x65c52d24,
+	0x119b4be9,0x155a565e,0x18197087,0x1cd86d30,
+	0x029f3d35,0x065e2082,0x0b1d065b,0x0fdc1bec,
+	0x3793a651,0x3352bbe6,0x3e119d3f,0x3ad08088,
+	0x2497d08d,0x2056cd3a,0x2d15ebe3,0x29d4f654,
+	0xc5a92679,0xc1683bce,0xcc2b1d17,0xc8ea00a0,
+	0xd6ad50a5,0xd26c4d12,0xdf2f6bcb,0xdbee767c,
+	0xe3a1cbc1,0xe760d676,0xea23f0af,0xeee2ed18,
+	0xf0a5bd1d,0xf464a0aa,0xf9278673,0xfde69bc4,
+	0x89b8fd09,0x8d79e0be,0x803ac667,0x84fbdbd0,
+	0x9abc8bd5,0x9e7d9662,0x933eb0bb,0x97ffad0c,
+	0xafb010b1,0xab710d06,0xa6322bdf,0xa2f33668,
+	0xbcb4666d,0xb8757bda,0xb5365d03,0xb1f740b4
+};
 
 /* init the encode/decode logical stream state */
 
-s32 ogg_stream_init(ogg_stream_state *os,s32 serialno){
-  if(os){
-    memset(os,0,sizeof(*os));
-    os->body_storage=16*1024;
-    os->body_data = (unsigned char *)gf_malloc(os->body_storage*sizeof(*os->body_data));
+s32 ogg_stream_init(ogg_stream_state *os,s32 serialno) {
+	if(os) {
+		memset(os,0,sizeof(*os));
+		os->body_storage=16*1024;
+		os->body_data = (unsigned char *)gf_malloc(os->body_storage*sizeof(*os->body_data));
 
-    os->lacing_storage=1024;
-    os->lacing_vals=(s32 *)gf_malloc(os->lacing_storage*sizeof(*os->lacing_vals));
-    os->granule_vals=(s64*)gf_malloc(os->lacing_storage*sizeof(*os->granule_vals));
+		os->lacing_storage=1024;
+		os->lacing_vals=(s32 *)gf_malloc(os->lacing_storage*sizeof(*os->lacing_vals));
+		os->granule_vals=(s64*)gf_malloc(os->lacing_storage*sizeof(*os->granule_vals));
 
-    os->serialno=serialno;
+		os->serialno=serialno;
 
-    return(0);
-  }
-  return(-1);
-} 
+		return(0);
+	}
+	return(-1);
+}
 
 /* _clear does not free os, only the non-flat storage within */
-s32 ogg_stream_clear(ogg_stream_state *os){
-  if(os){
-    if(os->body_data)gf_free(os->body_data);
-    if(os->lacing_vals)gf_free(os->lacing_vals);
-    if(os->granule_vals)gf_free(os->granule_vals);
-
-    memset(os,0,sizeof(*os));    
-  }
-  return(0);
-} 
-
-s32 ogg_stream_destroy(ogg_stream_state *os){
-  if(os){
-    ogg_stream_clear(os);
-    gf_free(os);
-  }
-  return(0);
-} 
+s32 ogg_stream_clear(ogg_stream_state *os) {
+	if(os) {
+		if(os->body_data)gf_free(os->body_data);
+		if(os->lacing_vals)gf_free(os->lacing_vals);
+		if(os->granule_vals)gf_free(os->granule_vals);
+
+		memset(os,0,sizeof(*os));
+	}
+	return(0);
+}
+
+s32 ogg_stream_destroy(ogg_stream_state *os) {
+	if(os) {
+		ogg_stream_clear(os);
+		gf_free(os);
+	}
+	return(0);
+}
 
 /* Helpers for ogg_stream_encode; this keeps the structure and
    what's happening fairly clear */
 
-static void _os_body_expand(ogg_stream_state *os,s32 needed){
-  if(os->body_storage<=os->body_fill+needed){
-    os->body_storage+=(needed+1024);
-    os->body_data = (unsigned char *)gf_realloc(os->body_data,os->body_storage*sizeof(*os->body_data));
-  }
+static void _os_body_expand(ogg_stream_state *os,s32 needed) {
+	if(os->body_storage<=os->body_fill+needed) {
+		os->body_storage+=(needed+1024);
+		os->body_data = (unsigned char *)gf_realloc(os->body_data,os->body_storage*sizeof(*os->body_data));
+	}
 }
 
-static void _os_lacing_expand(ogg_stream_state *os,s32 needed){
-  if(os->lacing_storage<=os->lacing_fill+needed){
-    os->lacing_storage+=(needed+32);
-    os->lacing_vals=(s32*)gf_realloc(os->lacing_vals,os->lacing_storage*sizeof(*os->lacing_vals));
-    os->granule_vals=(s64*)gf_realloc(os->granule_vals,os->lacing_storage*sizeof(*os->granule_vals));
-  }
+static void _os_lacing_expand(ogg_stream_state *os,s32 needed) {
+	if(os->lacing_storage<=os->lacing_fill+needed) {
+		os->lacing_storage+=(needed+32);
+		os->lacing_vals=(s32*)gf_realloc(os->lacing_vals,os->lacing_storage*sizeof(*os->lacing_vals));
+		os->granule_vals=(s64*)gf_realloc(os->granule_vals,os->lacing_storage*sizeof(*os->granule_vals));
+	}
 }
 
 /* checksum the page */
 /* Direct table CRC; note that this will be faster in the future if we
    perform the checksum silmultaneously with other copies */
 
-void ogg_page_checksum_set(ogg_page *og){
-  if(og){
-    u32 crc_reg=0;
-    s32 i;
-
-    /* safety; needed for API behavior, but not framing code */
-    og->header[22]=0;
-    og->header[23]=0;
-    og->header[24]=0;
-    og->header[25]=0;
-    
-    for(i=0;i<og->header_len;i++)
-      crc_reg=(crc_reg<<8)^crc_lookup[((crc_reg >> 24)&0xff)^og->header[i]];
-    for(i=0;i<og->body_len;i++)
-      crc_reg=(crc_reg<<8)^crc_lookup[((crc_reg >> 24)&0xff)^og->body[i]];
-    
-    og->header[22]=crc_reg&0xff;
-    og->header[23]=(crc_reg>>8)&0xff;
-    og->header[24]=(crc_reg>>16)&0xff;
-    og->header[25]=(crc_reg>>24)&0xff;
-  }
+void ogg_page_checksum_set(ogg_page *og) {
+	if(og) {
+		u32 crc_reg=0;
+		s32 i;
+
+		/* safety; needed for API behavior, but not framing code */
+		og->header[22]=0;
+		og->header[23]=0;
+		og->header[24]=0;
+		og->header[25]=0;
+
+		for(i=0; i<og->header_len; i++)
+			crc_reg=(crc_reg<<8)^crc_lookup[((crc_reg >> 24)&0xff)^og->header[i]];
+		for(i=0; i<og->body_len; i++)
+			crc_reg=(crc_reg<<8)^crc_lookup[((crc_reg >> 24)&0xff)^og->body[i]];
+
+		og->header[22]=crc_reg&0xff;
+		og->header[23]=(crc_reg>>8)&0xff;
+		og->header[24]=(crc_reg>>16)&0xff;
+		og->header[25]=(crc_reg>>24)&0xff;
+	}
 }
 
 /* submit data to the internal buffer of the framing engine */
-s32 ogg_stream_packetin(ogg_stream_state *os,ogg_packet *op){
-  s32 lacing_vals=op->bytes/255+1,i;
-
-  if(os->body_returned){
-    /* advance packet data according to the body_returned pointer. We
-       had to keep it around to return a pointer into the buffer last
-       call */
-    
-    os->body_fill-=os->body_returned;
-    if(os->body_fill)
-      memmove(os->body_data,os->body_data+os->body_returned,
-	      os->body_fill);
-    os->body_returned=0;
-  }
- 
-  /* make sure we have the buffer storage */
-  _os_body_expand(os,op->bytes);
-  _os_lacing_expand(os,lacing_vals);
-
-  /* Copy in the submitted packet.  Yes, the copy is a waste; this is
-     the liability of overly clean abstraction for the time being.  It
-     will actually be fairly easy to eliminate the extra copy in the
-     future */
-
-  memcpy(os->body_data+os->body_fill,op->packet,op->bytes);
-  os->body_fill+=op->bytes;
-
-  /* Store lacing vals for this packet */
-  for(i=0;i<lacing_vals-1;i++){
-    os->lacing_vals[os->lacing_fill+i]=255;
-    os->granule_vals[os->lacing_fill+i]=os->granulepos;
-  }
-  os->lacing_vals[os->lacing_fill+i]=(op->bytes)%255;
-  os->granulepos=os->granule_vals[os->lacing_fill+i]=op->granulepos;
-
-  /* flag the first segment as the beginning of the packet */
-  os->lacing_vals[os->lacing_fill]|= 0x100;
-
-  os->lacing_fill+=lacing_vals;
-
-  /* for the sake of completeness */
-  os->packetno++;
-
-  if(op->e_o_s)os->e_o_s=1;
-
-  return(0);
+s32 ogg_stream_packetin(ogg_stream_state *os,ogg_packet *op) {
+	s32 lacing_vals=op->bytes/255+1,i;
+
+	if(os->body_returned) {
+		/* advance packet data according to the body_returned pointer. We
+		   had to keep it around to return a pointer into the buffer last
+		   call */
+
+		os->body_fill-=os->body_returned;
+		if(os->body_fill)
+			memmove(os->body_data,os->body_data+os->body_returned,
+			        os->body_fill);
+		os->body_returned=0;
+	}
+
+	/* make sure we have the buffer storage */
+	_os_body_expand(os,op->bytes);
+	_os_lacing_expand(os,lacing_vals);
+
+	/* Copy in the submitted packet.  Yes, the copy is a waste; this is
+	   the liability of overly clean abstraction for the time being.  It
+	   will actually be fairly easy to eliminate the extra copy in the
+	   future */
+
+	memcpy(os->body_data+os->body_fill,op->packet,op->bytes);
+	os->body_fill+=op->bytes;
+
+	/* Store lacing vals for this packet */
+	for(i=0; i<lacing_vals-1; i++) {
+		os->lacing_vals[os->lacing_fill+i]=255;
+		os->granule_vals[os->lacing_fill+i]=os->granulepos;
+	}
+	os->lacing_vals[os->lacing_fill+i]=(op->bytes)%255;
+	os->granulepos=os->granule_vals[os->lacing_fill+i]=op->granulepos;
+
+	/* flag the first segment as the beginning of the packet */
+	os->lacing_vals[os->lacing_fill]|= 0x100;
+
+	os->lacing_fill+=lacing_vals;
+
+	/* for the sake of completeness */
+	os->packetno++;
+
+	if(op->e_o_s)os->e_o_s=1;
+
+	return(0);
 }
 
 /* This will flush remaining packets into a page (returning nonzero),
@@ -757,115 +759,115 @@
 
    since ogg_stream_flush will flush the last page in a stream even if
    it's undersized, you almost certainly want to use ogg_stream_pageout
-   (and *not* ogg_stream_flush) unless you specifically need to flush 
+   (and *not* ogg_stream_flush) unless you specifically need to flush
    an page regardless of size in the middle of a stream. */
 
-s32 ogg_stream_flush(ogg_stream_state *os,ogg_page *og){
-  s32 i;
-  s32 vals=0;
-  s32 maxvals=(os->lacing_fill>255?255:os->lacing_fill);
-  s32 bytes=0;
-  s32 acc=0;
-  s64 granule_pos=os->granule_vals[0];
-
-  if(maxvals==0)return(0);
-  
-  /* construct a page */
-  /* decide how many segments to include */
-  
-  /* If this is the initial header case, the first page must only include
-     the initial header packet */
-  if(os->b_o_s==0){  /* 'initial header page' case */
-    granule_pos=0;
-    for(vals=0;vals<maxvals;vals++){
-      if((os->lacing_vals[vals]&0x0ff)<255){
-	vals++;
-	break;
-      }
-    }
-  }else{
-    for(vals=0;vals<maxvals;vals++){
-      if(acc>4096)break;
-      acc+=os->lacing_vals[vals]&0x0ff;
-      granule_pos=os->granule_vals[vals];
-    }
-  }
-  
-  /* construct the header in temp storage */
-  memcpy(os->header,"OggS",4);
-  
-  /* stream structure version */
-  os->header[4]=0x00;
-  
-  /* continued packet flag? */
-  os->header[5]=0x00;
-  if((os->lacing_vals[0]&0x100)==0)os->header[5]|=0x01;
-  /* first page flag? */
-  if(os->b_o_s==0)os->header[5]|=0x02;
-  /* last page flag? */
-  if(os->e_o_s && os->lacing_fill==vals)os->header[5]|=0x04;
-  os->b_o_s=1;
-
-  /* 64 bits of PCM position */
-  for(i=6;i<14;i++){
-    os->header[i]=(u8) (granule_pos&0xff);
-    granule_pos>>=8;
-  }
-
-  /* 32 bits of stream serial number */
-  {
-    s32 serialno=os->serialno;
-    for(i=14;i<18;i++){
-      os->header[i]=(serialno&0xff);
-      serialno>>=8;
-    }
-  }
-
-  /* 32 bits of page counter (we have both counter and page header
-     because this val can roll over) */
-  if(os->pageno==-1)os->pageno=0; /* because someone called
+s32 ogg_stream_flush(ogg_stream_state *os,ogg_page *og) {
+	s32 i;
+	s32 vals=0;
+	s32 maxvals=(os->lacing_fill>255?255:os->lacing_fill);
+	s32 bytes=0;
+	s32 acc=0;
+	s64 granule_pos=os->granule_vals[0];
+
+	if(maxvals==0)return(0);
+
+	/* construct a page */
+	/* decide how many segments to include */
+
+	/* If this is the initial header case, the first page must only include
+	   the initial header packet */
+	if(os->b_o_s==0) { /* 'initial header page' case */
+		granule_pos=0;
+		for(vals=0; vals<maxvals; vals++) {
+			if((os->lacing_vals[vals]&0x0ff)<255) {
+				vals++;
+				break;
+			}
+		}
+	} else {
+		for(vals=0; vals<maxvals; vals++) {
+			if(acc>4096)break;
+			acc+=os->lacing_vals[vals]&0x0ff;
+			granule_pos=os->granule_vals[vals];
+		}
+	}
+
+	/* construct the header in temp storage */
+	memcpy(os->header,"OggS",4);
+
+	/* stream structure version */
+	os->header[4]=0x00;
+
+	/* continued packet flag? */
+	os->header[5]=0x00;
+	if((os->lacing_vals[0]&0x100)==0)os->header[5]|=0x01;
+	/* first page flag? */
+	if(os->b_o_s==0)os->header[5]|=0x02;
+	/* last page flag? */
+	if(os->e_o_s && os->lacing_fill==vals)os->header[5]|=0x04;
+	os->b_o_s=1;
+
+	/* 64 bits of PCM position */
+	for(i=6; i<14; i++) {
+		os->header[i]=(u8) (granule_pos&0xff);
+		granule_pos>>=8;
+	}
+
+	/* 32 bits of stream serial number */
+	{
+		s32 serialno=os->serialno;
+		for(i=14; i<18; i++) {
+			os->header[i]=(serialno&0xff);
+			serialno>>=8;
+		}
+	}
+
+	/* 32 bits of page counter (we have both counter and page header
+	   because this val can roll over) */
+	if(os->pageno==-1)os->pageno=0; /* because someone called
 				     stream_reset; this would be a
 				     strange thing to do in an
 				     encode stream, but it has
 				     plausible uses */
-  {
-    s32 pageno=os->pageno++;
-    for(i=18;i<22;i++){
-      os->header[i]=(pageno&0xff);
-      pageno>>=8;
-    }
-  }
-  
-  /* zero for computation; filled in later */
-  os->header[22]=0;
-  os->header[23]=0;
-  os->header[24]=0;
-  os->header[25]=0;
-  
-  /* segment table */
-  os->header[26]=vals&0xff;
-  for(i=0;i<vals;i++)
-    bytes+=os->header[i+27]=(os->lacing_vals[i]&0xff);
-  
-  /* set pointers in the ogg_page struct */
-  og->header=os->header;
-  og->header_len=os->header_fill=vals+27;
-  og->body=os->body_data+os->body_returned;
-  og->body_len=bytes;
-  
-  /* advance the lacing data and set the body_returned pointer */
-  
-  os->lacing_fill-=vals;
-  memmove(os->lacing_vals,os->lacing_vals+vals,os->lacing_fill*sizeof(*os->lacing_vals));
-  memmove(os->granule_vals,os->granule_vals+vals,os->lacing_fill*sizeof(*os->granule_vals));
-  os->body_returned+=bytes;
-  
-  /* calculate the checksum */
-  
-  ogg_page_checksum_set(og);
-
-  /* done */
-  return(1);
+	{
+		s32 pageno=os->pageno++;
+		for(i=18; i<22; i++) {
+			os->header[i]=(pageno&0xff);
+			pageno>>=8;
+		}
+	}
+
+	/* zero for computation; filled in later */
+	os->header[22]=0;
+	os->header[23]=0;
+	os->header[24]=0;
+	os->header[25]=0;
+
+	/* segment table */
+	os->header[26]=vals&0xff;
+	for(i=0; i<vals; i++)
+		bytes+=os->header[i+27]=(os->lacing_vals[i]&0xff);
+
+	/* set pointers in the ogg_page struct */
+	og->header=os->header;
+	og->header_len=os->header_fill=vals+27;
+	og->body=os->body_data+os->body_returned;
+	og->body_len=bytes;
+
+	/* advance the lacing data and set the body_returned pointer */
+
+	os->lacing_fill-=vals;
+	memmove(os->lacing_vals,os->lacing_vals+vals,os->lacing_fill*sizeof(*os->lacing_vals));
+	memmove(os->granule_vals,os->granule_vals+vals,os->lacing_fill*sizeof(*os->granule_vals));
+	os->body_returned+=bytes;
+
+	/* calculate the checksum */
+
+	ogg_page_checksum_set(og);
+
+	/* done */
+	return(1);
 }
 
 
@@ -873,22 +875,22 @@
 returned are to static buffers; do not free. The returned buffers are
 good only until the next call (using the same ogg_stream_state) */
 
-s32 ogg_stream_pageout(ogg_stream_state *os, ogg_page *og){
+s32 ogg_stream_pageout(ogg_stream_state *os, ogg_page *og) {
+
+	if((os->e_o_s&&os->lacing_fill) ||          /* 'were done, now flush' case */
+	        os->body_fill-os->body_returned > 4096 ||/* 'page nominal size' case */
+	        os->lacing_fill>=255 ||                  /* 'segment table full' case */
+	        (os->lacing_fill&&!os->b_o_s)) {         /* 'initial header page' case */
+
+		return(ogg_stream_flush(os,og));
+	}
 
-  if((os->e_o_s&&os->lacing_fill) ||          /* 'were done, now flush' case */
-     os->body_fill-os->body_returned > 4096 ||/* 'page nominal size' case */
-     os->lacing_fill>=255 ||                  /* 'segment table full' case */
-     (os->lacing_fill&&!os->b_o_s)){          /* 'initial header page' case */
-        
-    return(ogg_stream_flush(os,og));
-  }
-  
-  /* not enough data to construct a page and not end of stream */
-  return(0);
+	/* not enough data to construct a page and not end of stream */
+	return(0);
 }
 
-s32 ogg_stream_eos(ogg_stream_state *os){
-  return os->e_o_s;
+s32 ogg_stream_eos(ogg_stream_state *os) {
+	return os->e_o_s;
 }
 
 /* DECODING PRIMITIVES: packet streaming layer **********************/
@@ -908,59 +910,59 @@
    example code. */
 
 /* initialize the struct to a known state */
-s32 ogg_sync_init(ogg_sync_state *oy){
-  if(oy){
-    memset(oy,0,sizeof(*oy));
-  }
-  return(0);
+s32 ogg_sync_init(ogg_sync_state *oy) {
+	if(oy) {
+		memset(oy,0,sizeof(*oy));
+	}
+	return(0);
 }
 
 /* clear non-flat storage within */
-s32 ogg_sync_clear(ogg_sync_state *oy){
-  if(oy){
-    if(oy->data)gf_free(oy->data);
-    ogg_sync_init(oy);
-  }
-  return(0);
+s32 ogg_sync_clear(ogg_sync_state *oy) {
+	if(oy) {
+		if(oy->data)gf_free(oy->data);
+		ogg_sync_init(oy);
+	}
+	return(0);
 }
 
-s32 ogg_sync_destroy(ogg_sync_state *oy){
-  if(oy){
-    ogg_sync_clear(oy);
-    gf_free(oy);
-  }
-  return(0);
+s32 ogg_sync_destroy(ogg_sync_state *oy) {
+	if(oy) {
+		ogg_sync_clear(oy);
+		gf_free(oy);
+	}
+	return(0);
 }
 
-char *ogg_sync_buffer(ogg_sync_state *oy, s32 size){
+char *ogg_sync_buffer(ogg_sync_state *oy, s32 size) {
 
-  /* first, clear out any space that has been previously returned */
-  if(oy->returned){
-    oy->fill-=oy->returned;
-    if(oy->fill>0)
-      memmove(oy->data,oy->data+oy->returned,oy->fill);
-    oy->returned=0;
-  }
+	/* first, clear out any space that has been previously returned */
+	if(oy->returned) {
+		oy->fill-=oy->returned;
+		if(oy->fill>0)
+			memmove(oy->data,oy->data+oy->returned,oy->fill);
+		oy->returned=0;
+	}
 
-  if(size>oy->storage-oy->fill){
-    /* We need to extend the internal buffer */
-    s32 newsize=size+oy->fill+4096; /* an extra page to be nice */
+	if(size>oy->storage-oy->fill) {
+		/* We need to extend the internal buffer */
+		s32 newsize=size+oy->fill+4096; /* an extra page to be nice */
 
-    if(oy->data)
-      oy->data = (unsigned char *)gf_realloc(oy->data,newsize);
-    else
-      oy->data = (unsigned char *)gf_malloc(newsize);
-    oy->storage=newsize;
-  }
+		if(oy->data)
+			oy->data = (unsigned char *)gf_realloc(oy->data,newsize);
+		else
+			oy->data = (unsigned char *)gf_malloc(newsize);
+		oy->storage=newsize;
+	}
 
-  /* expose a segment at least as large as requested at the fill mark */
-  return((char *)oy->data+oy->fill);
+	/* expose a segment at least as large as requested at the fill mark */
+	return((char *)oy->data+oy->fill);
 }
 
-s32 ogg_sync_wrote(ogg_sync_state *oy, s32 bytes){
-  if(oy->fill+bytes>oy->storage)return(-1);
-  oy->fill+=bytes;
-  return(0);
+s32 ogg_sync_wrote(ogg_sync_state *oy, s32 bytes) {
+	if(oy->fill+bytes>oy->storage)return(-1);
+	oy->fill+=bytes;
+	return(0);
 }
 
 /* sync the stream.  This is meant to be useful for finding page
@@ -970,92 +972,92 @@
   -n) skipped n bytes
    0) page not ready; more data (no bytes skipped)
    n) page synced at current location; page length n bytes
-   
+
 */
 
-s32 ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){
-  unsigned char *page=oy->data+oy->returned;
-  unsigned char *next;
-  s32 bytes=oy->fill-oy->returned;
-  
-  if(oy->headerbytes==0){
-    s32 headerbytes,i;
-    if(bytes<27)return(0); /* not enough for a header */
-    
-    /* verify capture pattern */
-    if(memcmp(page,"OggS",4))goto sync_fail;
-    
-    headerbytes=page[26]+27;
-    if(bytes<headerbytes)return(0); /* not enough for header + seg table */
-    
-    /* count up body length in the segment table */
-    
-    for(i=0;i<page[26];i++)
-      oy->bodybytes+=page[27+i];
-    oy->headerbytes=headerbytes;
-  }
-  
-  if(oy->bodybytes+oy->headerbytes>bytes)return(0);
-  
-  /* The whole test page is buffered.  Verify the checksum */
-  {
-    /* Grab the checksum bytes, set the header field to zero */
-    char chksum[4];
-    ogg_page log;
-    
-    memcpy(chksum,page+22,4);
-    memset(page+22,0,4);
-    
-    /* set up a temp page struct and recompute the checksum */
-    log.header=page;
-    log.header_len=oy->headerbytes;
-    log.body=page+oy->headerbytes;
-    log.body_len=oy->bodybytes;
-    ogg_page_checksum_set(&log);
-    
-    /* Compare */
-    if(memcmp(chksum,page+22,4)){
-      /* D'oh.  Mismatch! Corrupt page (or miscapture and not a page
-	 at all) */
-      /* replace the computed checksum with the one actually read in */
-      memcpy(page+22,chksum,4);
-      
-      /* Bad checksum. Lose sync */
-      goto sync_fail;
-    }
-  }
-  
-  /* 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;
-      og->body=page+oy->headerbytes;
-      og->body_len=oy->bodybytes;
-    }
-
-    oy->unsynced=0;
-    oy->returned+=(bytes=oy->headerbytes+oy->bodybytes);
-    oy->headerbytes=0;
-    oy->bodybytes=0;
-    return(bytes);
-  }
-  
- sync_fail:
-  
-  oy->headerbytes=0;
-  oy->bodybytes=0;
-  
-  /* search for possible capture */
-  next = (unsigned char *)memchr(page+1,'O',bytes-1);
-  if(!next)
-    next=oy->data+oy->fill;
-
-  oy->returned = (s32) (next-oy->data);
-  return (s32) (-(next-page));
+s32 ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og) {
+	unsigned char *page=oy->data+oy->returned;
+	unsigned char *next;
+	s32 bytes=oy->fill-oy->returned;
+
+	if(oy->headerbytes==0) {
+		s32 headerbytes,i;
+		if(bytes<27)return(0); /* not enough for a header */
+
+		/* verify capture pattern */
+		if(memcmp(page,"OggS",4))goto sync_fail;
+
+		headerbytes=page[26]+27;
+		if(bytes<headerbytes)return(0); /* not enough for header + seg table */
+
+		/* count up body length in the segment table */
+
+		for(i=0; i<page[26]; i++)
+			oy->bodybytes+=page[27+i];
+		oy->headerbytes=headerbytes;
+	}
+
+	if(oy->bodybytes+oy->headerbytes>bytes)return(0);
+
+	/* The whole test page is buffered.  Verify the checksum */
+	{
+		/* Grab the checksum bytes, set the header field to zero */
+		char chksum[4];
+		ogg_page log;
+
+		memcpy(chksum,page+22,4);
+		memset(page+22,0,4);
+
+		/* set up a temp page struct and recompute the checksum */
+		log.header=page;
+		log.header_len=oy->headerbytes;
+		log.body=page+oy->headerbytes;
+		log.body_len=oy->bodybytes;
+		ogg_page_checksum_set(&log);
+
+		/* Compare */
+		if(memcmp(chksum,page+22,4)) {
+			/* D'oh.  Mismatch! Corrupt page (or miscapture and not a page
+			at all) */
+			/* replace the computed checksum with the one actually read in */
+			memcpy(page+22,chksum,4);
+
+			/* Bad checksum. Lose sync */
+			goto sync_fail;
+		}
+	}
+
+	/* 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;
+			og->body=page+oy->headerbytes;
+			og->body_len=oy->bodybytes;
+		}
+
+		oy->unsynced=0;
+		oy->returned+=(bytes=oy->headerbytes+oy->bodybytes);
+		oy->headerbytes=0;
+		oy->bodybytes=0;
+		return(bytes);
+	}
+
+sync_fail:
+
+	oy->headerbytes=0;
+	oy->bodybytes=0;
+
+	/* search for possible capture */
+	next = (unsigned char *)memchr(page+1,'O',bytes-1);
+	if(!next)
+		next=oy->data+oy->fill;
+
+	oy->returned = (s32) (next-oy->data);
+	return (s32) (-(next-page));
 }
 
 /* sync the stream and get a page.  Keep trying until we find a page.
@@ -1069,260 +1071,260 @@
    Returns pointers into buffered data; invalidated by next call to
    _stream, _clear, _init, or _buffer */
 
-s32 ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og){
+s32 ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og) {
 
-  /* all we need to do is verify a page at the head of the stream
-     buffer.  If it doesn't verify, we look for the next potential
-     frame */
+	/* all we need to do is verify a page at the head of the stream
+	   buffer.  If it doesn't verify, we look for the next potential
+	   frame */
 
-  while(1){
-    s32 ret=ogg_sync_pageseek(oy,og);
-    if(ret>0){
-      /* have a page */
-      return(1);
-    }
-    if(ret==0){
-      /* need more data */
-      return(0);
-    }
-    
-    /* head did not start a synced page... skipped some bytes */
-    if(!oy->unsynced){
-      oy->unsynced=1;
-      return(-1);
-    }
+	while(1) {
+		s32 ret=ogg_sync_pageseek(oy,og);
+		if(ret>0) {
+			/* have a page */
+			return(1);
+		}
+		if(ret==0) {
+			/* need more data */
+			return(0);
+		}
 
-    /* loop. keep looking */
+		/* head did not start a synced page... skipped some bytes */
+		if(!oy->unsynced) {
+			oy->unsynced=1;
+			return(-1);
+		}
 
-  }
+		/* loop. keep looking */
+
+	}
 }
 
 /* add the incoming page to the stream state; we decompose the page
    into packet segments here as well. */
 
-s32 ogg_stream_pagein(ogg_stream_state *os, ogg_page *og){
-  unsigned char *header=og->header;
-  unsigned char *body=og->body;
-  s32           bodysize=og->body_len;
-  s32            segptr=0;
-
-  s32 version=ogg_page_version(og);
-  s32 continued=ogg_page_continued(og);
-  s32 bos=ogg_page_bos(og);
-  s32 eos=ogg_page_eos(og);
-  s64 granulepos=ogg_page_granulepos(og);
-  s32 serialno=ogg_page_serialno(og);
-  s32 pageno=ogg_page_pageno(og);
-  s32 segments=header[26];
-  
-  /* clean up 'returned data' */
-  {
-    s32 lr=os->lacing_returned;
-    s32 br=os->body_returned;
-
-    /* body data */
-    if(br){
-      os->body_fill-=br;
-      if(os->body_fill)
-	memmove(os->body_data,os->body_data+br,os->body_fill);
-      os->body_returned=0;
-    }
-
-    if(lr){
-      /* segment table */
-      if(os->lacing_fill-lr){
-	memmove(os->lacing_vals,os->lacing_vals+lr,
-		(os->lacing_fill-lr)*sizeof(*os->lacing_vals));
-	memmove(os->granule_vals,os->granule_vals+lr,
-		(os->lacing_fill-lr)*sizeof(*os->granule_vals));
-      }
-      os->lacing_fill-=lr;
-      os->lacing_packet-=lr;
-      os->lacing_returned=0;
-    }
-  }
-
-  /* check the serial number */
-  if(serialno!=os->serialno)return(-1);
-  if(version>0)return(-1);
-
-  _os_lacing_expand(os,segments+1);
-
-  /* are we in sequence? */
-  if(pageno!=os->pageno){
-    s32 i;
-
-    /* unroll previous partial packet (if any) */
-    for(i=os->lacing_packet;i<os->lacing_fill;i++)
-      os->body_fill-=os->lacing_vals[i]&0xff;
-    os->lacing_fill=os->lacing_packet;
-
-    /* make a note of dropped data in segment table */
-    if(os->pageno!=-1){
-      os->lacing_vals[os->lacing_fill++]=0x400;
-      os->lacing_packet++;
-    }
-
-    /* are we a 'continued packet' page?  If so, we'll need to skip
-       some segments */
-    if(continued){
-      bos=0;
-      for(;segptr<segments;segptr++){
-	s32 val=header[27+segptr];
-	body+=val;
-	bodysize-=val;
-	if(val<255){
-	  segptr++;
-	  break;
+s32 ogg_stream_pagein(ogg_stream_state *os, ogg_page *og) {
+	unsigned char *header=og->header;
+	unsigned char *body=og->body;
+	s32           bodysize=og->body_len;
+	s32            segptr=0;
+
+	s32 version=ogg_page_version(og);
+	s32 continued=ogg_page_continued(og);
+	s32 bos=ogg_page_bos(og);
+	s32 eos=ogg_page_eos(og);
+	s64 granulepos=ogg_page_granulepos(og);
+	s32 serialno=ogg_page_serialno(og);
+	s32 pageno=ogg_page_pageno(og);
+	s32 segments=header[26];
+
+	/* clean up 'returned data' */
+	{
+		s32 lr=os->lacing_returned;
+		s32 br=os->body_returned;
+
+		/* body data */
+		if(br) {
+			os->body_fill-=br;
+			if(os->body_fill)
+				memmove(os->body_data,os->body_data+br,os->body_fill);
+			os->body_returned=0;
+		}
+
+		if(lr) {
+			/* segment table */
+			if(os->lacing_fill-lr) {
+				memmove(os->lacing_vals,os->lacing_vals+lr,
+				        (os->lacing_fill-lr)*sizeof(*os->lacing_vals));
+				memmove(os->granule_vals,os->granule_vals+lr,
+				        (os->lacing_fill-lr)*sizeof(*os->granule_vals));
+			}
+			os->lacing_fill-=lr;
+			os->lacing_packet-=lr;
+			os->lacing_returned=0;
+		}
+	}
+
+	/* check the serial number */
+	if(serialno!=os->serialno)return(-1);
+	if(version>0)return(-1);
+
+	_os_lacing_expand(os,segments+1);
+
+	/* are we in sequence? */
+	if(pageno!=os->pageno) {
+		s32 i;
+
+		/* unroll previous partial packet (if any) */
+		for(i=os->lacing_packet; i<os->lacing_fill; i++)
+			os->body_fill-=os->lacing_vals[i]&0xff;
+		os->lacing_fill=os->lacing_packet;
+
+		/* make a note of dropped data in segment table */
+		if(os->pageno!=-1) {
+			os->lacing_vals[os->lacing_fill++]=0x400;
+			os->lacing_packet++;
+		}
+
+		/* are we a 'continued packet' page?  If so, we'll need to skip
+		   some segments */
+		if(continued) {
+			bos=0;
+			for(; segptr<segments; segptr++) {
+				s32 val=header[27+segptr];
+				body+=val;
+				bodysize-=val;
+				if(val<255) {
+					segptr++;
+					break;
+				}
+			}
+		}
+	}
+
+	if(bodysize) {
+		_os_body_expand(os,bodysize);
+		memcpy(os->body_data+os->body_fill,body,bodysize);
+		os->body_fill+=bodysize;
 	}
-      }
-    }
-  }
-  
-  if(bodysize){
-    _os_body_expand(os,bodysize);
-    memcpy(os->body_data+os->body_fill,body,bodysize);
-    os->body_fill+=bodysize;
-  }
-
-  {
-    s32 saved=-1;
-    while(segptr<segments){
-      s32 val=header[27+segptr];
-      os->lacing_vals[os->lacing_fill]=val;
-      os->granule_vals[os->lacing_fill]=-1;
-      
-      if(bos){
-	os->lacing_vals[os->lacing_fill]|=0x100;
-	bos=0;
-      }
-      
-      if(val<255)saved=os->lacing_fill;
-      
-      os->lacing_fill++;
-      segptr++;
-      
-      if(val<255)os->lacing_packet=os->lacing_fill;
-    }
-  
-    /* set the granulepos on the last granuleval of the last full packet */
-    if(saved!=-1){
-      os->granule_vals[saved]=granulepos;
-    }
-
-  }
-
-  if(eos){
-    os->e_o_s=1;
-    if(os->lacing_fill>0)
-      os->lacing_vals[os->lacing_fill-1]|=0x200;
-  }
-
-  os->pageno=pageno+1;
-
-  return(0);
+
+	{
+		s32 saved=-1;
+		while(segptr<segments) {
+			s32 val=header[27+segptr];
+			os->lacing_vals[os->lacing_fill]=val;
+			os->granule_vals[os->lacing_fill]=-1;
+
+			if(bos) {
+				os->lacing_vals[os->lacing_fill]|=0x100;
+				bos=0;
+			}
+
+			if(val<255)saved=os->lacing_fill;
+
+			os->lacing_fill++;
+			segptr++;
+
+			if(val<255)os->lacing_packet=os->lacing_fill;
+		}
+
+		/* set the granulepos on the last granuleval of the last full packet */
+		if(saved!=-1) {
+			os->granule_vals[saved]=granulepos;
+		}
+
+	}
+
+	if(eos) {
+		os->e_o_s=1;
+		if(os->lacing_fill>0)
+			os->lacing_vals[os->lacing_fill-1]|=0x200;
+	}
+
+	os->pageno=pageno+1;
+
+	return(0);
 }
 
 /* clear things to an initial state.  Good to call, eg, before seeking */
-s32 ogg_sync_reset(ogg_sync_state *oy){
-  oy->fill=0;
-  oy->returned=0;
-  oy->unsynced=0;
-  oy->headerbytes=0;
-  oy->bodybytes=0;
-  return(0);
+s32 ogg_sync_reset(ogg_sync_state *oy) {
+	oy->fill=0;
+	oy->returned=0;
+	oy->unsynced=0;
+	oy->headerbytes=0;
+	oy->bodybytes=0;
+	return(0);
 }
 
-s32 ogg_stream_reset(ogg_stream_state *os){
-  os->body_fill=0;
-  os->body_returned=0;
+s32 ogg_stream_reset(ogg_stream_state *os) {
+	os->body_fill=0;
+	os->body_returned=0;
 
-  os->lacing_fill=0;
-  os->lacing_packet=0;
-  os->lacing_returned=0;
+	os->lacing_fill=0;
+	os->lacing_packet=0;
+	os->lacing_returned=0;
 
-  os->header_fill=0;
+	os->header_fill=0;
 
-  os->e_o_s=0;
-  os->b_o_s=0;
-  os->pageno=-1;
-  os->packetno=0;
-  os->granulepos=0;
+	os->e_o_s=0;
+	os->b_o_s=0;
+	os->pageno=-1;
+	os->packetno=0;
+	os->granulepos=0;
 
-  return(0);
+	return(0);
 }
 
-s32 ogg_stream_reset_serialno(ogg_stream_state *os,s32 serialno){
-  ogg_stream_reset(os);
-  os->serialno=serialno;
-  return(0);
+s32 ogg_stream_reset_serialno(ogg_stream_state *os,s32 serialno) {
+	ogg_stream_reset(os);
+	os->serialno=serialno;
+	return(0);
 }
 
-static s32 _packetout(ogg_stream_state *os,ogg_packet *op,s32 adv){
+static s32 _packetout(ogg_stream_state *os,ogg_packet *op,s32 adv) {
 
-  /* The last part of decode. We have the stream broken into packet
-     segments.  Now we need to group them into packets (or return the
-     out of sync markers) */
+	/* The last part of decode. We have the stream broken into packet
+	   segments.  Now we need to group them into packets (or return the
+	   out of sync markers) */
 
-  s32 ptr=os->lacing_returned;
+	s32 ptr=os->lacing_returned;
 
-  if(os->lacing_packet<=ptr)return(0);
+	if(os->lacing_packet<=ptr)return(0);
 
-  if(os->lacing_vals[ptr]&0x400){
-    /* we need to tell the codec there's a gap; it might need to
-       handle previous packet dependencies. */
-    os->lacing_returned++;
-    os->packetno++;
-    return(-1);
-  }
+	if(os->lacing_vals[ptr]&0x400) {
+		/* we need to tell the codec there's a gap; it might need to
+		   handle previous packet dependencies. */
+		os->lacing_returned++;
+		os->packetno++;
+		return(-1);
+	}
 
-  if(!op && !adv)return(1); /* just using peek as an inexpensive way
+	if(!op && !adv)return(1); /* just using peek as an inexpensive way
                                to ask if there's a whole packet
                                waiting */
 
-  /* Gather the whole packet. We'll have no holes or a partial packet */
-  {
-    s32 size=os->lacing_vals[ptr]&0xff;
-    s32 bytes=size;
-    s32 eos=os->lacing_vals[ptr]&0x200; /* last packet of the stream? */
-    s32 bos=os->lacing_vals[ptr]&0x100; /* first packet of the stream? */
-
-    while(size==255){
-      s32 val=os->lacing_vals[++ptr];
-      size=val&0xff;
-      if(val&0x200)eos=0x200;
-      bytes+=size;
-    }
-
-    if(op){
-      op->e_o_s=eos;
-      op->b_o_s=bos;
-      op->packet=os->body_data+os->body_returned;
-      op->packetno=os->packetno;
-      op->granulepos=os->granule_vals[ptr];
-      op->bytes=bytes;
-    }
-
-    if(adv){
-      os->body_returned+=bytes;
-      os->lacing_returned=ptr+1;
-      os->packetno++;
-    }
-  }
-  return(1);
+	/* Gather the whole packet. We'll have no holes or a partial packet */
+	{
+		s32 size=os->lacing_vals[ptr]&0xff;
+		s32 bytes=size;
+		s32 eos=os->lacing_vals[ptr]&0x200; /* last packet of the stream? */
+		s32 bos=os->lacing_vals[ptr]&0x100; /* first packet of the stream? */
+
+		while(size==255) {
+			s32 val=os->lacing_vals[++ptr];
+			size=val&0xff;
+			if(val&0x200)eos=0x200;
+			bytes+=size;
+		}
+
+		if(op) {
+			op->e_o_s=eos;
+			op->b_o_s=bos;
+			op->packet=os->body_data+os->body_returned;
+			op->packetno=os->packetno;
+			op->granulepos=os->granule_vals[ptr];
+			op->bytes=bytes;
+		}
+
+		if(adv) {
+			os->body_returned+=bytes;
+			os->lacing_returned=ptr+1;
+			os->packetno++;
+		}
+	}
+	return(1);
 }
 
-s32 ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op){
-  return _packetout(os,op,1);
+s32 ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op) {
+	return _packetout(os,op,1);
 }
 
-s32 ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op){
-  return _packetout(os,op,0);
+s32 ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op) {
+	return _packetout(os,op,0);
 }
 
 void ogg_packet_clear(ogg_packet *op) {
-  gf_free(op->packet);
-  memset(op, 0, sizeof(*op));
+	gf_free(op->packet);
+	memset(op, 0, sizeof(*op));
 }
 
 #endif /*GPAC_DISABLE_OGG*/

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/html5_media.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/html5_media.c Changed

@@ -42,12 +42,12 @@
 
 static GF_Err gf_html_timeranges_add_time(GF_HTML_MediaTimeRanges *timeranges, u64 time)
 {
-    u64 *t;
-    if (!timeranges) return GF_BAD_PARAM;
-    t = (u64 *)gf_malloc(sizeof(u64));
-    *t = time;
-    gf_list_add(timeranges->times, t);
-    return GF_OK;
+	u64 *t;
+	if (!timeranges) return GF_BAD_PARAM;
+	t = (u64 *)gf_malloc(sizeof(u64));
+	*t = time;
+	gf_list_add(timeranges->times, t);
+	return GF_OK;
 }
 
 GF_Err gf_html_timeranges_add_start(GF_HTML_MediaTimeRanges *timeranges, u64 start)
@@ -62,18 +62,18 @@
 
 void gf_html_timeranges_reset(GF_HTML_MediaTimeRanges *ranges)
 {
-    while (gf_list_count(ranges->times))
-    {
-        u64 *d = (u64 *)gf_list_get(ranges->times, 0);
-        gf_free(d);
-        gf_list_rem(ranges->times, 0);
-    }
+	while (gf_list_count(ranges->times))
+	{
+		u64 *d = (u64 *)gf_list_get(ranges->times, 0);
+		gf_free(d);
+		gf_list_rem(ranges->times, 0);
+	}
 }
 
 void gf_html_timeranges_del(GF_HTML_MediaTimeRanges *ranges)
 {
 	gf_html_timeranges_reset(ranges);
-    gf_list_del(ranges->times);
+	gf_list_del(ranges->times);
 	ranges->times = NULL;
 	gf_free(ranges);
 }
@@ -124,7 +124,7 @@
 	}
 	if (count_a == 0 && count_b == 0) {
 		return NULL;
-	} else if (count_a == 0) {		
+	} else if (count_a == 0) {
 		GF_HTML_MediaTimeRanges *tmp = a;
 		a = b;
 		b = tmp;
@@ -160,7 +160,7 @@
 					if (*endb*a->timescale <= *enda*b->timescale) { /* b is contained in a */
 						/* ignore b, move on to the next b */
 						j+=2;
-					} else { /* *endb > *enda, the overlap is only at the start of b */ 
+					} else { /* *endb > *enda, the overlap is only at the start of b */
 						/* update start of b */
 						*startb = (u64)((*starta * b->timescale)*1.0 / a->timescale);
 						/* ignore a, move on to the next a */
@@ -239,7 +239,7 @@
 							*starta = (u64)((*endb * a->timescale)*1.0 / b->timescale);
 							/* move on to the next b */
 							j+=2;
-						} else { /* *endb > *enda, the intersection ends at the end of a */ 
+						} else { /* *endb > *enda, the intersection ends at the end of a */
 							gf_list_add(intersection_ranges->times, enda);
 							/* update start of b */
 							*startb = (u64)((*enda * b->timescale)*1.0 / a->timescale);
@@ -271,83 +271,83 @@
 }
 
 GF_HTML_Track *html_media_add_new_track_to_list(GF_HTML_TrackList *tracklist,
-                                                       GF_HTML_TrackType type, const char *mime, Bool enable_or_selected,
-                                                       const char *id, const char *kind, const char *label, const char *lang)
+        GF_HTML_TrackType type, const char *mime, Bool enable_or_selected,
+        const char *id, const char *kind, const char *label, const char *lang)
 {
-    GF_HTML_Track *track;
-    track = gf_html_media_track_new(type, mime, enable_or_selected, id, kind, label, lang);
-    gf_list_add(tracklist->tracks, track);
-    return track;
+	GF_HTML_Track *track;
+	track = gf_html_media_track_new(type, mime, enable_or_selected, id, kind, label, lang);
+	gf_list_add(tracklist->tracks, track);
+	return track;
 }
 
 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);
-        if (!strcmp(id, track->id)) 
-        {
-            return 1;
-        }
-    }
-    return 0;
+	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);
+		if (!strcmp(id, track->id))
+		{
+			return 1;
+		}
+	}
+	return 0;
 }
 
 GF_HTML_Track *html_media_tracklist_get_track(GF_HTML_TrackList *tracklist, const char *id)
 {
-    GF_HTML_Track *track = NULL;
-    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);
-        if (!strcmp(id, track->id)) 
-        {
-            return track;
-        }
-    }
-    return NULL;
+	GF_HTML_Track *track = NULL;
+	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);
+		if (!strcmp(id, track->id))
+		{
+			return track;
+		}
+	}
+	return NULL;
 }
 
 void gf_html_tracklist_del(GF_HTML_TrackList *tlist)
 {
-    while (gf_list_count(tlist->tracks))
-    {
-        GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(tlist->tracks, 0);
-        gf_html_track_del(track);
-        gf_list_rem(tlist->tracks, 0);
-    }
-    gf_list_del(tlist->tracks);
+	while (gf_list_count(tlist->tracks))
+	{
+		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(tlist->tracks, 0);
+		gf_html_track_del(track);
+		gf_list_rem(tlist->tracks, 0);
+	}
+	gf_list_del(tlist->tracks);
 }
 
 GF_HTML_Track *gf_html_media_track_new(GF_HTML_TrackType type, const char *mime, Bool enable_or_selected,
                                        const char *id, const char *kind, const char *label, const char *lang)
 {
-    GF_HTML_Track *track;
-    GF_SAFEALLOC(track, GF_HTML_Track);
-    track->type     = type;
-    track->mime     = gf_strdup(mime);
-    track->id       = gf_strdup(id);
-    track->kind     = gf_strdup(kind);
-    track->label    = gf_strdup(label);
-    track->language = gf_strdup(lang);
-    track->enabled_or_selected = enable_or_selected;
-    /* TODO: empty MSE data */
-    return track;
+	GF_HTML_Track *track;
+	GF_SAFEALLOC(track, GF_HTML_Track);
+	track->type     = type;
+	track->mime     = gf_strdup(mime);
+	track->id       = gf_strdup(id);
+	track->kind     = gf_strdup(kind);
+	track->label    = gf_strdup(label);
+	track->language = gf_strdup(lang);
+	track->enabled_or_selected = enable_or_selected;
+	/* TODO: empty MSE data */
+	return track;
 }
 
 void gf_html_track_del(GF_HTML_Track *track)
 {
-    if (track->id)          gf_free(track->id);
-    if (track->kind)        gf_free(track->kind);
-    if (track->label)       gf_free(track->label);
-    if (track->language)    gf_free(track->language);
-    if (track->mime)        gf_free(track->mime);
+	if (track->id)          gf_free(track->id);
+	if (track->kind)        gf_free(track->kind);
+	if (track->label)       gf_free(track->label);
+	if (track->language)    gf_free(track->language);
+	if (track->mime)        gf_free(track->mime);
 
-    if (track->buffer_mutex) {
+	if (track->buffer_mutex) {
 		gf_mx_p(track->buffer_mutex);
 		while (gf_list_count(track->buffer))
 		{
@@ -366,55 +366,55 @@
 
 GF_HTML_MediaElement *gf_html_media_element_new(GF_Node *media_node, GF_HTML_MediaController *mc)
 {
-    GF_HTML_MediaElement *me;
-    GF_SAFEALLOC(me, GF_HTML_MediaElement);
-    me->node                    = media_node;
-    me->controller              = mc; 
-    me->audioTracks.tracks      = gf_list_new();
-    me->videoTracks.tracks      = gf_list_new();
-    me->textTracks.tracks       = gf_list_new();
-    me->buffered					= gf_html_timeranges_new(1);
-    me->played		            = gf_html_timeranges_new(1);
-    me->seekable					= gf_html_timeranges_new(1);
-    return me;
+	GF_HTML_MediaElement *me;
+	GF_SAFEALLOC(me, GF_HTML_MediaElement);
+	me->node                    = media_node;
+	me->controller              = mc;
+	me->audioTracks.tracks      = gf_list_new();
+	me->videoTracks.tracks      = gf_list_new();
+	me->textTracks.tracks       = gf_list_new();
+	me->buffered					= gf_html_timeranges_new(1);
+	me->played		            = gf_html_timeranges_new(1);
+	me->seekable					= gf_html_timeranges_new(1);
+	return me;
 }
 
 void gf_html_media_element_del(GF_HTML_MediaElement *me)
 {
-    if (me->startDate) gf_free(me->startDate);
-    if (me->currentSrc) gf_free(me->currentSrc);
-    gf_html_tracklist_del(&me->audioTracks);
-    gf_html_tracklist_del(&me->videoTracks);
-    gf_html_tracklist_del(&me->textTracks);
-    gf_html_timeranges_del(me->buffered);
-    gf_html_timeranges_del(me->seekable);
-    gf_html_timeranges_del(me->played);
-    gf_free(me);
+	if (me->startDate) gf_free(me->startDate);
+	if (me->currentSrc) gf_free(me->currentSrc);
+	gf_html_tracklist_del(&me->audioTracks);
+	gf_html_tracklist_del(&me->videoTracks);
+	gf_html_tracklist_del(&me->textTracks);
+	gf_html_timeranges_del(me->buffered);
+	gf_html_timeranges_del(me->seekable);
+	gf_html_timeranges_del(me->played);
+	gf_free(me);
 }
 
 GF_HTML_MediaController *gf_html_media_controller_new()
 {
-    GF_HTML_MediaController *mc;
-    GF_SAFEALLOC(mc, GF_HTML_MediaController);
-    mc->buffered          = gf_html_timeranges_new(1);
-    mc->played            = gf_html_timeranges_new(1);
-    mc->seekable          = gf_html_timeranges_new(1);
-    return mc;
+	GF_HTML_MediaController *mc;
+	GF_SAFEALLOC(mc, GF_HTML_MediaController);
+	mc->buffered          = gf_html_timeranges_new(1);
+	mc->played            = gf_html_timeranges_new(1);
+	mc->seekable          = gf_html_timeranges_new(1);
+	return mc;
 }
 
 void gf_html_mediacontroller_del(GF_HTML_MediaController *mc)
 {
-    u32 i, count;
-    /* removing the pointer to that controller from the media elements using it */
-    count = gf_list_count(mc->media_elements);
-    for (i = 0; i < count; i++) {
-        GF_HTML_MediaElement *me = (GF_HTML_MediaElement *)gf_list_get(mc->media_elements, i);
-        me->controller =  NULL;
-    }
-    gf_html_timeranges_del(mc->buffered);
-    gf_html_timeranges_del(mc->seekable);
-    gf_html_timeranges_del(mc->played);
-    gf_free(mc);
+	u32 i, count;
+	/* removing the pointer to that controller from the media elements using it */
+	count = gf_list_count(mc->media_elements);
+	for (i = 0; i < count; i++) {
+		GF_HTML_MediaElement *me = (GF_HTML_MediaElement *)gf_list_get(mc->media_elements, i);
+		me->controller =  NULL;
+	}
+	gf_html_timeranges_del(mc->buffered);
+	gf_html_timeranges_del(mc->seekable);
+	gf_html_timeranges_del(mc->played);
+	gf_free(mc);
 }
 
 #endif

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/html5_mse.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/html5_mse.c Changed

@@ -45,7 +45,7 @@
 }
 
 GF_EXPORT
-void gf_mse_mediasource_del(GF_HTML_MediaSource *ms, Bool del_js) 
+void gf_mse_mediasource_del(GF_HTML_MediaSource *ms, Bool del_js)
 {
 	if (ms) {
 		if (del_js) {
@@ -69,7 +69,7 @@
 			}
 			gf_list_del(ms->sourceBuffers.list);
 			/* all source buffer should have been deleted in the deletion of sourceBuffers */
-			gf_list_del(ms->activeSourceBuffers.list); 
+			gf_list_del(ms->activeSourceBuffers.list);
 			if (ms->blobURI) gf_free(ms->blobURI);
 			gf_free(ms->evt_target);
 			gf_free(ms);
@@ -77,49 +77,49 @@
 	}
 }
 
-void gf_mse_fire_event(GF_DOMEventTarget *target, GF_EventType event_type) 
+void gf_mse_fire_event(GF_DOMEventTarget *target, GF_EventType event_type)
 {
 	GF_SceneGraph *sg = NULL;
-    GF_DOM_Event  mse_event;
+	GF_DOM_Event  mse_event;
 	memset(&mse_event, 0, sizeof(GF_DOM_Event));
-    mse_event.type = event_type;
+	mse_event.type = event_type;
 	mse_event.target = target->ptr;
 	mse_event.target_type = target->ptr_type;
 	switch(target->ptr_type) {
 	case GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE:
-		{
-			GF_HTML_MediaSource *ms = (GF_HTML_MediaSource *)target->ptr;
-			sg = ms->sg;
-		}
-		break;
+	{
+		GF_HTML_MediaSource *ms = (GF_HTML_MediaSource *)target->ptr;
+		sg = ms->sg;
+	}
+	break;
 	case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST:
-		{
-			GF_HTML_SourceBufferList *list = (GF_HTML_SourceBufferList *)target->ptr;
-			sg = list->parent->sg;
-		}
-		break;
+	{
+		GF_HTML_SourceBufferList *list = (GF_HTML_SourceBufferList *)target->ptr;
+		sg = list->parent->sg;
+	}
+	break;
 	case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER:
-		{
-			GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)target->ptr;
-			sg = sb->mediasource->sg;
-		}
-		break;
+	{
+		GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)target->ptr;
+		sg = sb->mediasource->sg;
+	}
+	break;
 	default:
 		break;
 	}
 	assert(sg);
-    gf_sg_fire_dom_event(target, &mse_event, sg, NULL);
+	gf_sg_fire_dom_event(target, &mse_event, sg, NULL);
 }
 
 GF_EXPORT
-void gf_mse_mediasource_open(GF_HTML_MediaSource *ms, struct _mediaobj *mo) 
+void gf_mse_mediasource_open(GF_HTML_MediaSource *ms, struct _mediaobj *mo)
 {
 	if (!ms) return;
 	if (!mo) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[MSE] Cannot open media source without a media object\n"));
 		return;
 	}
-    ms->readyState = MEDIA_SOURCE_READYSTATE_OPEN;
+	ms->readyState = MEDIA_SOURCE_READYSTATE_OPEN;
 	/* getting the Scene Tree node attached to this media source */
 	ms->node = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(mo, 0));
 	ms->sg = gf_node_get_graph(ms->node);
@@ -130,7 +130,7 @@
 void gf_mse_mediasource_close(GF_HTML_MediaSource *ms)
 {
 	if (!ms) return;
-    ms->readyState = MEDIA_SOURCE_READYSTATE_CLOSED;
+	ms->readyState = MEDIA_SOURCE_READYSTATE_CLOSED;
 	gf_mse_fire_event(ms->evt_target, GF_EVENT_HTML_MSE_SOURCE_CLOSE);
 }
 
@@ -138,39 +138,39 @@
 void gf_mse_mediasource_end(GF_HTML_MediaSource *ms)
 {
 	if (!ms) return;
-    ms->readyState = MEDIA_SOURCE_READYSTATE_ENDED;
+	ms->readyState = MEDIA_SOURCE_READYSTATE_ENDED;
 	gf_mse_fire_event(ms->evt_target, GF_EVENT_HTML_MSE_SOURCE_ENDED);
 }
 
 GF_HTML_SourceBuffer *gf_mse_source_buffer_new(GF_HTML_MediaSource *mediasource)
 {
-    char name[256];
-    GF_HTML_SourceBuffer *source;
-    GF_SAFEALLOC(source, GF_HTML_SourceBuffer);
-    sprintf(name, "SourceBuffer_Thread_%p", source);
-    source->mediasource = mediasource;
-    source->buffered = gf_html_timeranges_new(1);
-    source->input_buffer = gf_list_new();
-    source->tracks = gf_list_new();
+	char name[256];
+	GF_HTML_SourceBuffer *source;
+	GF_SAFEALLOC(source, GF_HTML_SourceBuffer);
+	sprintf(name, "SourceBuffer_Thread_%p", source);
+	source->mediasource = mediasource;
+	source->buffered = gf_html_timeranges_new(1);
+	source->input_buffer = gf_list_new();
+	source->tracks = gf_list_new();
 	source->threads = gf_list_new();
-    source->parser_thread = gf_th_new(name);
-    source->remove_thread = gf_th_new(name);
-    source->append_mode = MEDIA_SOURCE_APPEND_MODE_SEGMENTS;
-    source->appendWindowStart = 0;
-    source->appendWindowEnd = GF_MAX_DOUBLE; 
+	source->parser_thread = gf_th_new(name);
+	source->remove_thread = gf_th_new(name);
+	source->append_mode = MEDIA_SOURCE_APPEND_MODE_SEGMENTS;
+	source->appendWindowStart = 0;
+	source->appendWindowEnd = GF_MAX_DOUBLE;
 	source->evt_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER, source);
 	source->timescale = 1;
-    return source;
+	return source;
 }
 
-void gf_mse_mediasource_add_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *sb) 
+void gf_mse_mediasource_add_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *sb)
 {
-    gf_list_add(ms->sourceBuffers.list, sb);
+	gf_list_add(ms->sourceBuffers.list, sb);
 	gf_mse_fire_event(ms->sourceBuffers.evt_target, GF_EVENT_HTML_MSE_ADD_SOURCE_BUFFER);
 }
 
-/* Not yet used 
-void gf_mse_add_active_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *sb) 
+/* Not yet used
+void gf_mse_add_active_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *sb)
 {
     gf_list_add(ms->activeSourceBuffers.list, sb);
 	gf_mse_fire_event(ms->activeSourceBuffers.evt_target, GF_EVENT_HTML_MSE_ADD_SOURCE_BUFFER);
@@ -197,21 +197,21 @@
 /* Deletes all unparsed data buffers from all tracks in the source buffer */
 static void gf_mse_source_buffer_reset_parser(GF_HTML_SourceBuffer *sb)
 {
-    u32 i, track_count;
-    track_count = gf_list_count(sb->tracks);
-
-    /* wait until all remaining entire AU are parsed and then flush the remaining bytes in the parser */
-
-    for (i = 0; i < track_count; i++) 
-    {
-        GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
-        track->last_dts_set     = GF_FALSE;
-        track->highest_pts_set  = GF_FALSE;
-        track->needs_rap        = GF_TRUE;
-    }
-    sb->group_end_timestamp_set = GF_FALSE;
-    gf_mse_reset_input_buffer(sb->input_buffer);
-    sb->append_state = MEDIA_SOURCE_APPEND_STATE_WAITING_FOR_SEGMENT;
+	u32 i, track_count;
+	track_count = gf_list_count(sb->tracks);
+
+	/* wait until all remaining entire AU are parsed and then flush the remaining bytes in the parser */
+
+	for (i = 0; i < track_count; i++)
+	{
+		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
+		track->last_dts_set     = GF_FALSE;
+		track->highest_pts_set  = GF_FALSE;
+		track->needs_rap        = GF_TRUE;
+	}
+	sb->group_end_timestamp_set = GF_FALSE;
+	gf_mse_reset_input_buffer(sb->input_buffer);
+	sb->append_state = MEDIA_SOURCE_APPEND_STATE_WAITING_FOR_SEGMENT;
 }
 
 GF_Err gf_mse_source_buffer_abort(GF_HTML_SourceBuffer *sb)
@@ -220,19 +220,19 @@
 		/* setting to false should stop the parsing thread */
 		sb->updating = GF_FALSE;
 		gf_mse_fire_event(sb->evt_target, GF_EVENT_HTML_MSE_UPDATE_ABORT);
-		gf_mse_fire_event(sb->evt_target, GF_EVENT_HTML_MSE_UPDATE_END);			
+		gf_mse_fire_event(sb->evt_target, GF_EVENT_HTML_MSE_UPDATE_END);
 	}
-    gf_mse_source_buffer_reset_parser(sb);
-    sb->appendWindowStart = 0;
-    sb->appendWindowEnd = GF_MAX_DOUBLE;
-    return GF_OK;
+	gf_mse_source_buffer_reset_parser(sb);
+	sb->appendWindowStart = 0;
+	sb->appendWindowEnd = GF_MAX_DOUBLE;
+	return GF_OK;
 }
 
 GF_Err gf_mse_remove_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *sb) {
 	s32 pos;
 	pos = gf_list_find(ms->sourceBuffers.list, sb);
 	if (pos < 0) {
-	    return GF_NOT_FOUND;
+		return GF_NOT_FOUND;
 	} else {
 		gf_mse_source_buffer_abort(sb);
 		/* TODO: update the audio/video/text tracks */
@@ -260,15 +260,15 @@
 
 void gf_mse_source_buffer_del(GF_HTML_SourceBuffer *sb)
 {
-    GF_HTML_TrackList tlist;
-    gf_html_timeranges_del(sb->buffered);
-    gf_mse_reset_input_buffer(sb->input_buffer);
-    gf_list_del(sb->input_buffer);
+	GF_HTML_TrackList tlist;
+	gf_html_timeranges_del(sb->buffered);
+	gf_mse_reset_input_buffer(sb->input_buffer);
+	gf_list_del(sb->input_buffer);
 
 	if (sb->prev_buffer) gf_arraybuffer_del((GF_HTML_ArrayBuffer *)sb->prev_buffer, GF_FALSE);
 
 	tlist.tracks = sb->tracks;
-    gf_html_tracklist_del(&tlist);
+	gf_html_tracklist_del(&tlist);
 	{
 		u32 i, count;
 		count = gf_list_count(sb->threads);
@@ -278,11 +278,11 @@
 		}
 		gf_list_del(sb->threads);
 	}
-    gf_th_del(sb->parser_thread);
-    gf_th_del(sb->remove_thread);
+	gf_th_del(sb->parser_thread);
+	gf_th_del(sb->remove_thread);
 
 	if (sb->service_desc) gf_odf_desc_del((GF_Descriptor *)sb->service_desc);
-    gf_free(sb);
+	gf_free(sb);
 
 }
 
@@ -301,121 +301,121 @@
 /*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)
 {
-    GF_InputService *parser = NULL;
+	GF_InputService *parser = NULL;
 
-    const char *sPlug;
-    if (mime) {
+	const char *sPlug;
+	if (mime) {
 		/* strip the 'codecs' and 'profile' parameters from the MIME type */
 		char *param = (char *)strchr(mime, ';');
 		if (param) {
 			*param = 0;
 		}
 
-        /* Check MIME type to start the right InputService */
-        sPlug = gf_cfg_get_key(sourcebuffer->mediasource->service->term->user->config, "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);
-        }
+		/* Check MIME type to start the right InputService */
+		sPlug = gf_cfg_get_key(sourcebuffer->mediasource->service->term->user->config, "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);
+		}
 
 		if (param) {
 			*param = ';';
 		}
-    }
-    if (parser) {
-        sourcebuffer->parser = parser;
-        parser->query_proxy = gf_mse_proxy;
-        parser->proxy_udta = sourcebuffer;
-        parser->proxy_type = GF_TRUE;
-        return GF_OK;
-    } else {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MSE] Error locating plugin for source - mime type %s\n", mime));
-        return GF_BAD_PARAM;
-    }
+	}
+	if (parser) {
+		sourcebuffer->parser = parser;
+		parser->query_proxy = gf_mse_proxy;
+		parser->proxy_udta = sourcebuffer;
+		parser->proxy_type = GF_TRUE;
+		return GF_OK;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MSE] Error locating plugin for source - mime type %s\n", mime));
+		return GF_BAD_PARAM;
+	}
 }
 
 /* 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)
 {
-    GF_HTML_Track *track;
-    GF_HTML_TrackType type;
-
-    track = NULL;
-    type = HTML_MEDIA_TRACK_TYPE_UNKNOWN;
-    if (esd->decoderConfig->streamType==GF_STREAM_VISUAL) {
-        type = HTML_MEDIA_TRACK_TYPE_VIDEO;
-    } else if (esd->decoderConfig->streamType==GF_STREAM_AUDIO) {
-        type = HTML_MEDIA_TRACK_TYPE_AUDIO;
-    } else {
-        /* TODO: Text tracks */
-    }
-
-    track = gf_html_media_track_new(type, "", GF_TRUE, "", "", "", "");
-    if (track) {
-        char mx_name[256];
-        track->bin_id = esd->ESID;
-        track->buffer = gf_list_new();
-        sprintf(mx_name, "track_mutex_%d", track->bin_id);
-        track->buffer_mutex = gf_mx_new(mx_name);
-        track->timescale = esd->slConfig->timestampResolution;
-        gf_list_add(sb->tracks, track);
-    }
-    return track;
+	GF_HTML_Track *track;
+	GF_HTML_TrackType type;
+
+	track = NULL;
+	type = HTML_MEDIA_TRACK_TYPE_UNKNOWN;
+	if (esd->decoderConfig->streamType==GF_STREAM_VISUAL) {
+		type = HTML_MEDIA_TRACK_TYPE_VIDEO;
+	} else if (esd->decoderConfig->streamType==GF_STREAM_AUDIO) {
+		type = HTML_MEDIA_TRACK_TYPE_AUDIO;
+	} else {
+		/* TODO: Text tracks */
+	}
+
+	track = gf_html_media_track_new(type, "", GF_TRUE, "", "", "", "");
+	if (track) {
+		char mx_name[256];
+		track->bin_id = esd->ESID;
+		track->buffer = gf_list_new();
+		sprintf(mx_name, "track_mutex_%d", track->bin_id);
+		track->buffer_mutex = gf_mx_new(mx_name);
+		track->timescale = esd->slConfig->timestampResolution;
+		gf_list_add(sb->tracks, track);
+	}
+	return track;
 }
 
-/* Creates the different tracks based on the demuxer parser information 
+/* Creates the different tracks based on the demuxer parser information
    Needs the parser to be setup and the initialization segment passed */
 static GF_Err gf_mse_source_buffer_setup_tracks(GF_HTML_SourceBuffer *sb)
 {
 	if (!sb || !sb->parser || !sb->parser_connected) return GF_BAD_PARAM;
-    sb->service_desc = (GF_ObjectDescriptor *)sb->parser->GetServiceDescriptor(sb->parser, GF_MEDIA_OBJECT_UNDEF, NULL);
-    if (sb->service_desc) {
-        u32 count;
-        count = gf_list_count(sb->service_desc->ESDescriptors);
-        if (count) {
-            u32 i;
-            for (i = 0; i < count; i++) {
-                GF_ESD *esd = (GF_ESD *)gf_list_get(sb->service_desc->ESDescriptors, i);
-                gf_mse_source_buffer_add_track(sb, esd);
-            }
-        }
-        return GF_OK;
-    } else {
-        return GF_BAD_PARAM;
-    }
+	sb->service_desc = (GF_ObjectDescriptor *)sb->parser->GetServiceDescriptor(sb->parser, GF_MEDIA_OBJECT_UNDEF, NULL);
+	if (sb->service_desc) {
+		u32 count;
+		count = gf_list_count(sb->service_desc->ESDescriptors);
+		if (count) {
+			u32 i;
+			for (i = 0; i < count; i++) {
+				GF_ESD *esd = (GF_ESD *)gf_list_get(sb->service_desc->ESDescriptors, i);
+				gf_mse_source_buffer_add_track(sb, esd);
+			}
+		}
+		return GF_OK;
+	} else {
+		return GF_BAD_PARAM;
+	}
 }
 
 /* Adds the ObjectDescriptor to the associated track (creating a new track if needed)
    Called in response to addmedia events received from the parser */
 static GF_Err gf_mse_source_buffer_store_track_desc(GF_HTML_SourceBuffer *sb, GF_ObjectDescriptor *od)
 {
-    u32 i;
-    u32 count;
-    GF_ESD *esd;
-    Bool found = GF_FALSE;
-    GF_HTML_Track *track;
-
-    esd = (GF_ESD *)gf_list_get(od->ESDescriptors, 0);
-    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 == esd->ESID) {
-            track->od = od;
-            found = GF_TRUE;
-            break;
-        }
-    }
-    if (!found) {
-        track = gf_mse_source_buffer_add_track(sb, esd);
-        if (track) {
-            track->od = od;
-        } else {
-            /* TODO: error */
-            return GF_BAD_PARAM;
-        }
-    } 
-    return GF_OK;
+	u32 i;
+	u32 count;
+	GF_ESD *esd;
+	Bool found = GF_FALSE;
+	GF_HTML_Track *track;
+
+	esd = (GF_ESD *)gf_list_get(od->ESDescriptors, 0);
+	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 == esd->ESID) {
+			track->od = od;
+			found = GF_TRUE;
+			break;
+		}
+	}
+	if (!found) {
+		track = gf_mse_source_buffer_add_track(sb, esd);
+		if (track) {
+			track->od = od;
+		} else {
+			/* TODO: error */
+			return GF_BAD_PARAM;
+		}
+	}
+	return GF_OK;
 }
 
 #define SECONDS_TO_TIMESCALE(s) ((s)*track->timescale)
@@ -454,15 +454,15 @@
 
 /* Traverses the list of Access Units already demuxed & parsed to update the buffered status */
 void gf_mse_source_buffer_update_buffered(GF_HTML_SourceBuffer *sb) {
-    u32 i;
-    u32 track_count;
+	u32 i;
+	u32 track_count;
 
-    track_count = gf_list_count(sb->tracks);
+	track_count = gf_list_count(sb->tracks);
 	gf_html_timeranges_reset(sb->buffered);
-    for (i = 0; i < track_count; i++) {
+	for (i = 0; i < track_count; i++) {
 		GF_HTML_MediaTimeRanges *track_ranges;
-        GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
-        gf_mx_p(track->buffer_mutex);
+		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
+		gf_mx_p(track->buffer_mutex);
 		track_ranges = gf_mse_timeranges_from_track_packets(track);
 		if (i != 0) {
 			GF_HTML_MediaTimeRanges *tmp;
@@ -478,13 +478,13 @@
 			sb->buffered->timescale = track_ranges->timescale;
 			gf_free(track_ranges);
 		}
-        gf_mx_v(track->buffer_mutex);
-    }
+		gf_mx_v(track->buffer_mutex);
+	}
 }
 
 void gf_mse_source_buffer_set_timestampOffset(GF_HTML_SourceBuffer *sb, double d) {
 	u32 i;
-    sb->timestampOffset = (s64)(d*sb->timescale);
+	sb->timestampOffset = (s64)(d*sb->timescale);
 	if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE) {
 		sb->group_start_timestamp_flag = GF_TRUE;
 		sb->group_start_timestamp = sb->timestampOffset;
@@ -512,58 +512,58 @@
 }
 
 void gf_mse_packet_del(GF_MSE_Packet *packet) {
-    gf_free(packet->data);
-    gf_free(packet);
+	gf_free(packet->data);
+	gf_free(packet);
 }
 
-static GF_MSE_Packet *gf_mse_find_overlapped_packet(GF_HTML_Track           *track, 
-                                                    GF_MSE_Packet           *packet)
+static GF_MSE_Packet *gf_mse_find_overlapped_packet(GF_HTML_Track           *track,
+        GF_MSE_Packet           *packet)
 {
-    u32     i;
-    u32     count;
-    Bool    found_previous;
-    
-    found_previous = GF_FALSE;
-    gf_mx_p(track->buffer_mutex);
-    count = gf_list_count(track->buffer);
-    for (i = 0; i < count; i++)
-    {
-        GF_MSE_Packet *p = (GF_MSE_Packet *)gf_list_get(track->buffer, i);
-        if (p->sl_header.compositionTimeStamp < packet->sl_header.compositionTimeStamp) {
-            found_previous = GF_TRUE;
-        }
-        if (found_previous == GF_TRUE && p->sl_header.compositionTimeStamp > packet->sl_header.compositionTimeStamp) {
-		    gf_mx_v(track->buffer_mutex);
-            return p;
-        }
-    }
-    gf_mx_v(track->buffer_mutex);
-    return NULL;
+	u32     i;
+	u32     count;
+	Bool    found_previous;
+
+	found_previous = GF_FALSE;
+	gf_mx_p(track->buffer_mutex);
+	count = gf_list_count(track->buffer);
+	for (i = 0; i < count; i++)
+	{
+		GF_MSE_Packet *p = (GF_MSE_Packet *)gf_list_get(track->buffer, i);
+		if (p->sl_header.compositionTimeStamp < packet->sl_header.compositionTimeStamp) {
+			found_previous = GF_TRUE;
+		}
+		if (found_previous == GF_TRUE && p->sl_header.compositionTimeStamp > packet->sl_header.compositionTimeStamp) {
+			gf_mx_v(track->buffer_mutex);
+			return p;
+		}
+	}
+	gf_mx_v(track->buffer_mutex);
+	return NULL;
 }
 
-static void gf_mse_remove_frames_from_to(GF_HTML_Track *track, 
-                                         u64           from,
-                                         u64           to)
+static void gf_mse_remove_frames_from_to(GF_HTML_Track *track,
+        u64           from,
+        u64           to)
 {
-    u32     i;
+	u32     i;
 
-    gf_mx_p(track->buffer_mutex);
+	gf_mx_p(track->buffer_mutex);
 	i = 0;
-    while (i < gf_list_count(track->buffer)) {
-        GF_MSE_Packet *frame = (GF_MSE_Packet *)gf_list_get(track->buffer, i);
+	while (i < gf_list_count(track->buffer)) {
+		GF_MSE_Packet *frame = (GF_MSE_Packet *)gf_list_get(track->buffer, i);
 		if (frame->sl_header.compositionTimeStamp >= to) {
 			break;
 		} else if (frame->sl_header.compositionTimeStamp >= from && frame->sl_header.compositionTimeStamp < to) {
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Removing frame with PTS %g s (%d frames remaining)\n", TIMESCALE_TO_SECONDS(frame->sl_header.compositionTimeStamp), gf_list_count(track->buffer)));
-            gf_list_rem(track->buffer, i);
-        } else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Removing frame with PTS %g s (%d frames remaining)\n", TIMESCALE_TO_SECONDS(frame->sl_header.compositionTimeStamp), gf_list_count(track->buffer)));
+			gf_list_rem(track->buffer, i);
+		} else {
 			i++;
 		}
-    }
-    gf_mx_v(track->buffer_mutex);
+	}
+	gf_mx_v(track->buffer_mutex);
 }
 
-static void gf_mse_track_buffer_add_packet(GF_HTML_Track *track, GF_MSE_Packet *frame) 
+static void gf_mse_track_buffer_add_packet(GF_HTML_Track *track, GF_MSE_Packet *frame)
 {
 	u32 i, count;
 	Bool inserted = GF_FALSE;
@@ -582,10 +582,10 @@
 				if (i > 0) {
 					GF_MSE_Packet *prev_frame =  (GF_MSE_Packet *)gf_list_get(track->buffer, i-1);
 					/* we update the frame duration if the newly inserted frame modifies it */
-					if (!prev_frame->sl_header.au_duration || 
-						prev_frame->sl_header.au_duration > frame->sl_header.decodingTimeStamp - prev_frame->sl_header.decodingTimeStamp) {
+					if (!prev_frame->sl_header.au_duration ||
+					        prev_frame->sl_header.au_duration > frame->sl_header.decodingTimeStamp - prev_frame->sl_header.decodingTimeStamp) {
 						prev_frame->sl_header.au_duration = (u32)(frame->sl_header.decodingTimeStamp - prev_frame->sl_header.decodingTimeStamp);
-					} 
+					}
 				}
 			}
 			inserted = GF_TRUE;
@@ -599,50 +599,50 @@
 		if (count > 1) {
 			GF_MSE_Packet *prev_frame =  (GF_MSE_Packet *)gf_list_get(track->buffer, count-2);
 			/* we update the frame duration if the newly inserted frame modifies it */
-			if (!prev_frame->sl_header.au_duration || 
-				prev_frame->sl_header.au_duration > frame->sl_header.decodingTimeStamp - prev_frame->sl_header.decodingTimeStamp) {
+			if (!prev_frame->sl_header.au_duration ||
+			        prev_frame->sl_header.au_duration > frame->sl_header.decodingTimeStamp - prev_frame->sl_header.decodingTimeStamp) {
 				prev_frame->sl_header.au_duration = (u32)(frame->sl_header.decodingTimeStamp - prev_frame->sl_header.decodingTimeStamp);
-			} 
+			}
 		}
 	}
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Adding frame with PTS %g s and duration %g s (%d frames in buffer)\n", TIMESCALE_TO_SECONDS(frame->sl_header.compositionTimeStamp), TIMESCALE_TO_SECONDS(frame->sl_header.au_duration), gf_list_count(track->buffer)));
-    gf_mx_v(track->buffer_mutex);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Adding frame with PTS %g s and duration %g s (%d frames in buffer)\n", TIMESCALE_TO_SECONDS(frame->sl_header.compositionTimeStamp), TIMESCALE_TO_SECONDS(frame->sl_header.au_duration), gf_list_count(track->buffer)));
+	gf_mx_v(track->buffer_mutex);
 }
 
-static GF_Err gf_mse_process_coded_frame(GF_HTML_SourceBuffer    *sb, 
-                                       GF_HTML_Track           *track, 
-                                       GF_MSE_Packet           *frame,
-									   Bool *stored)
+static GF_Err gf_mse_process_coded_frame(GF_HTML_SourceBuffer    *sb,
+        GF_HTML_Track           *track,
+        GF_MSE_Packet           *frame,
+        Bool *stored)
 {
 	s64 PTS_with_offset = frame->sl_header.compositionTimeStamp + frame->sl_header.timeStampOffset;
 	s64 DTS_with_offset = frame->sl_header.decodingTimeStamp + frame->sl_header.timeStampOffset;
 	*stored = GF_FALSE;
 
-    if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE && sb->group_start_timestamp_flag) {
+	if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE && sb->group_start_timestamp_flag) {
 		u32 i, count;
 		/* compute the new offset without taking care of the previous one, since this is a new coded frame group */
 		/* first adjust existing times to the new timescale */
 		gf_mse_source_buffer_set_timescale(sb, track->timescale);
-        sb->timestampOffset = (sb->group_start_timestamp - frame->sl_header.compositionTimeStamp);
+		sb->timestampOffset = (sb->group_start_timestamp - frame->sl_header.compositionTimeStamp);
 		track->timestampOffset = (sb->group_start_timestamp - frame->sl_header.compositionTimeStamp);
 		sb->group_end_timestamp = sb->group_start_timestamp;
 		count = gf_list_count(sb->tracks);
 		for (i = 0; i < count; i++) {
 			GF_HTML_Track *t = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
-			t->needs_rap = GF_TRUE; 
+			t->needs_rap = GF_TRUE;
 		}
 		sb->group_start_timestamp_flag = GF_FALSE;
-    }
+	}
 
-    if (track->timestampOffset != 0) {
+	if (track->timestampOffset != 0) {
 		frame->sl_header.timeStampOffset = track->timestampOffset;
 		PTS_with_offset = frame->sl_header.compositionTimeStamp + frame->sl_header.timeStampOffset;
 		DTS_with_offset = frame->sl_header.decodingTimeStamp + frame->sl_header.timeStampOffset;
-    }
+	}
 
-    if (track->last_dts_set) {
-        if (DTS_with_offset < (s64) track->last_dts ||
-			DTS_with_offset - track->last_dts > 2*track->last_dur) {
+	if (track->last_dts_set) {
+		if (DTS_with_offset < (s64) track->last_dts ||
+		        DTS_with_offset - track->last_dts > 2*track->last_dur) {
 			/* A discontinuity in the timestamps is detected, this triggers the start of a new coded frame group */
 			if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEGMENTS) {
 				/* the current group ends at the start of this frame */
@@ -664,115 +664,115 @@
 					t->last_dur = 0;
 					t->highest_pts_set = GF_FALSE;
 					t->highest_pts = 0;
-					t->needs_rap = GF_TRUE; 
+					t->needs_rap = GF_TRUE;
 				}
 			}
 			return gf_mse_process_coded_frame(sb, track, frame, stored);
-        }
-    }
-	
+		}
+	}
+
 	/* we only update the timestamps in the frame when we are sure the offset is the right one */
 	frame->sl_header.compositionTimeStamp += frame->sl_header.timeStampOffset;
 	frame->sl_header.decodingTimeStamp += frame->sl_header.timeStampOffset;
 	frame->sl_header.timeStampOffset = 0;
 
-    if (frame->sl_header.compositionTimeStamp < SECONDS_TO_TIMESCALE(sb->appendWindowStart)) {
-        track->needs_rap = GF_TRUE;
-        return GF_OK;
-    }
-
-    if (frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration > SECONDS_TO_TIMESCALE(sb->appendWindowEnd)) {
-        track->needs_rap = GF_TRUE;
-        return GF_OK;
-    }
-
-    if (track->needs_rap) {
-        if (!frame->sl_header.randomAccessPointFlag) {
-            return GF_OK;
-        }
-        track->needs_rap = GF_FALSE;
-    }
-
-    if (!track->last_dts_set) {
-        /* find a frame in the track buffer whose PTS is less than the current packet and whose PTS + dur is greater than the current packet */
-        GF_MSE_Packet           *overlapped_packet;
-        overlapped_packet = gf_mse_find_overlapped_packet(track, frame);
-        if (overlapped_packet) {
-            gf_mse_remove_frames_from_to(track, overlapped_packet->sl_header.compositionTimeStamp, 
-												overlapped_packet->sl_header.compositionTimeStamp + (u64)SECONDS_TO_TIMESCALE(0.000001));
-        }
-    } 
-
-    if (!track->highest_pts_set) {
-        /* this is the first time a frame is processed in the append sequence */
-        gf_mse_remove_frames_from_to(track, frame->sl_header.compositionTimeStamp, frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration);
-    } else if (track->highest_pts <= frame->sl_header.compositionTimeStamp) {
-        /* the highest pts has already been set in this append sequence, so we just need to remove frames from that point on, it's safe */
-        gf_mse_remove_frames_from_to(track, track->highest_pts, track->highest_pts + track->last_dur);
-    }
-
-    /* remove dependencies !! */
-
-    /* TODO: spliced frames */
+	if (frame->sl_header.compositionTimeStamp < SECONDS_TO_TIMESCALE(sb->appendWindowStart)) {
+		track->needs_rap = GF_TRUE;
+		return GF_OK;
+	}
+
+	if (frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration > SECONDS_TO_TIMESCALE(sb->appendWindowEnd)) {
+		track->needs_rap = GF_TRUE;
+		return GF_OK;
+	}
+
+	if (track->needs_rap) {
+		if (!frame->sl_header.randomAccessPointFlag) {
+			return GF_OK;
+		}
+		track->needs_rap = GF_FALSE;
+	}
+
+	if (!track->last_dts_set) {
+		/* find a frame in the track buffer whose PTS is less than the current packet and whose PTS + dur is greater than the current packet */
+		GF_MSE_Packet           *overlapped_packet;
+		overlapped_packet = gf_mse_find_overlapped_packet(track, frame);
+		if (overlapped_packet) {
+			gf_mse_remove_frames_from_to(track, overlapped_packet->sl_header.compositionTimeStamp,
+			                             overlapped_packet->sl_header.compositionTimeStamp + (u64)SECONDS_TO_TIMESCALE(0.000001));
+		}
+	}
+
+	if (!track->highest_pts_set) {
+		/* this is the first time a frame is processed in the append sequence */
+		gf_mse_remove_frames_from_to(track, frame->sl_header.compositionTimeStamp, frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration);
+	} else if (track->highest_pts <= frame->sl_header.compositionTimeStamp) {
+		/* the highest pts has already been set in this append sequence, so we just need to remove frames from that point on, it's safe */
+		gf_mse_remove_frames_from_to(track, track->highest_pts, track->highest_pts + track->last_dur);
+	}
+
+	/* remove dependencies !! */
+
+	/* TODO: spliced frames */
 
 	*stored = GF_TRUE;
 	/* adds the packet and update the previous frame duration */
 	gf_mse_track_buffer_add_packet(track, frame);
 
-    track->last_dts = frame->sl_header.decodingTimeStamp;
-    track->last_dts_set = GF_TRUE;
-    if (frame->sl_header.au_duration) {
+	track->last_dts = frame->sl_header.decodingTimeStamp;
+	track->last_dts_set = GF_TRUE;
+	if (frame->sl_header.au_duration) {
 		track->last_dur = frame->sl_header.au_duration;
 	} else {
 		/* assuming CFR - FIXME */
 		frame->sl_header.au_duration = track->last_dur;
 	}
 
-    if (!track->highest_pts_set || 
-		(frame->sl_header.compositionTimeStamp + track->last_dur) > track->highest_pts) {
-        track->highest_pts_set = GF_TRUE;
-        track->highest_pts = frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration;
-    }
+	if (!track->highest_pts_set ||
+	        (frame->sl_header.compositionTimeStamp + track->last_dur) > track->highest_pts) {
+		track->highest_pts_set = GF_TRUE;
+		track->highest_pts = frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration;
+	}
 
-    if (!sb->group_end_timestamp_set || (frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration > sb->group_end_timestamp)) {
+	if (!sb->group_end_timestamp_set || (frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration > sb->group_end_timestamp)) {
 		/* check if sb.timescale has to be adjusted first with gf_mse_source_buffer_set_timescale(sb, track->timescale);*/
-        sb->group_end_timestamp = frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration;
-        sb->group_end_timestamp_set = GF_TRUE;
-    }
+		sb->group_end_timestamp = frame->sl_header.compositionTimeStamp + frame->sl_header.au_duration;
+		sb->group_end_timestamp_set = GF_TRUE;
+	}
 
-    return GF_OK;
+	return GF_OK;
 }
 
-/* Thread run function: called as a result of an append buffer 
- * Parses/Demultiplexes media segments and places the parsed AU in the track buffers 
+/* Thread run function: called as a result of an append buffer
+ * Parses/Demultiplexes media segments and places the parsed AU in the track buffers
  *
  * \param par the GF_HTML_SourceBuffer object used for the append
  */
 u32 gf_mse_parse_segment(void *par)
 {
-    GF_MSE_Packet           *packet;
-    GF_HTML_Track           *track;
-    GF_HTML_SourceBuffer    *sb = (GF_HTML_SourceBuffer *)par;
-    u32                     i;
-    u32                     track_count;
+	GF_MSE_Packet           *packet;
+	GF_HTML_Track           *track;
+	GF_HTML_SourceBuffer    *sb = (GF_HTML_SourceBuffer *)par;
+	u32                     i;
+	u32                     track_count;
 
-    if (!sb->parser_connected) {
+	if (!sb->parser_connected) {
 		GF_HTML_ArrayBuffer *buffer = (GF_HTML_ArrayBuffer *)gf_list_get(sb->input_buffer, 0);
-		gf_list_rem(sb->input_buffer, 0);		   
+		gf_list_rem(sb->input_buffer, 0);
 		assert(buffer);
 		/* we expect an initialization segment to connect the service */
 		if (!buffer->is_init) {
 			/* TODO: set the media element decode error and run the end of stream algo */
 			goto exit;
 		}
-        sb->parser->ConnectService(sb->parser, sb->mediasource->service, buffer->url);
+		sb->parser->ConnectService(sb->parser, sb->mediasource->service, buffer->url);
 		sb->prev_buffer = buffer;
-    } else {
-        /* we expect a media segment */
+	} else {
+		/* we expect a media segment */
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Starting to fetch AUs from parser\n"));
 
 		/* For each track, ask the parser for all the Access Unit, until it is empty
-		 * AU are placed as GF_MSE_Packets in the track buffer 
+		 * AU are placed as GF_MSE_Packets in the track buffer
 		 */
 		track_count = gf_list_count(sb->tracks);
 		while (sb->updating) {
@@ -783,9 +783,9 @@
 				track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
 				GF_SAFEALLOC(packet, GF_MSE_Packet);
 				assert(track->channel);
-				e = sb->parser->ChannelGetSLP(sb->parser, track->channel, 
-											  &packet->data, &packet->size, &packet->sl_header, 
-											  &packet->is_compressed, &packet->status, &packet->is_new_data);
+				e = sb->parser->ChannelGetSLP(sb->parser, track->channel,
+				                              &packet->data, &packet->size, &packet->sl_header,
+				                              &packet->is_compressed, &packet->status, &packet->is_new_data);
 				assert(e == GF_OK);
 				if (packet->status == GF_OK && packet->is_new_data && packet->size) {
 					char *data;
@@ -811,10 +811,10 @@
 		}
 		/* reaching here, the parser does not have enough data to produce new AU */
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Done fetching AUs from parser\n"));
-    }
+	}
 exit:
 	gf_mse_source_buffer_set_update(sb, GF_FALSE);
-    return 0;
+	return 0;
 }
 
 
@@ -823,16 +823,16 @@
 	assert(sb->parser);
 	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->reference_count++;
+	buffer->url = (char *)gf_malloc(256);
+	sprintf(buffer->url, "gmem://%d@%p", buffer->length, buffer->data);
+	buffer->reference_count++;
 	buffer->is_init = (gf_isom_probe_file(buffer->url) == 2 ? GF_TRUE : GF_FALSE);
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Appending segment %s to SourceBuffer %p\n", buffer->url, sb));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Appending segment %s to SourceBuffer %p\n", buffer->url, sb));
 
-    gf_list_add(sb->input_buffer, buffer);
-    /* Call the parser (asynchronously) and return */
-    /* the updating attribute will be positioned back to 0 when the parser is done */
-	{ 
+	gf_list_add(sb->input_buffer, buffer);
+	/* Call the parser (asynchronously) and return */
+	/* the updating attribute will be positioned back to 0 when the parser is done */
+	{
 		GF_Thread *t = gf_th_new(NULL);
 		gf_list_add(sb->threads, t);
 		gf_th_run(t, gf_mse_parse_segment, sb);
@@ -843,47 +843,47 @@
    - Removes data in each track buffer until the next RAP is found */
 static u32 gf_mse_source_buffer_remove(void *par)
 {
-    GF_HTML_SourceBuffer    *sb = (GF_HTML_SourceBuffer *)par;
-    u32                     i;
-    u32                     j;
-    u32                     track_count;
-    u32                     frame_count;
-    u64                     end = 0;
+	GF_HTML_SourceBuffer    *sb = (GF_HTML_SourceBuffer *)par;
+	u32                     i;
+	u32                     j;
+	u32                     track_count;
+	u32                     frame_count;
+	u64                     end = 0;
 
 	gf_mse_source_buffer_set_update(sb, GF_TRUE);
 
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Removing media until next RAP\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Removing media until next RAP\n"));
 
-    track_count = gf_list_count(sb->tracks);
-    for (i = 0; i < track_count; i++) {
-        GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
+	track_count = gf_list_count(sb->tracks);
+	for (i = 0; i < track_count; i++) {
+		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
 		gf_mse_source_buffer_set_timescale(sb, track->timescale);
-        /* find the next random access point */
-        gf_mx_p(track->buffer_mutex);
-        frame_count = gf_list_count(track->buffer);
-        for (j = 0; j < frame_count; j++) {
-            GF_MSE_Packet *frame = (GF_MSE_Packet *)gf_list_get(track->buffer, j);
-            if (frame->sl_header.randomAccessPointFlag && 
-                frame->sl_header.compositionTimeStamp >= sb->remove_end) {
-                end = frame->sl_header.compositionTimeStamp;
-                break;
-            }
-        }
-        gf_mx_v(track->buffer_mutex);
+		/* find the next random access point */
+		gf_mx_p(track->buffer_mutex);
+		frame_count = gf_list_count(track->buffer);
+		for (j = 0; j < frame_count; j++) {
+			GF_MSE_Packet *frame = (GF_MSE_Packet *)gf_list_get(track->buffer, j);
+			if (frame->sl_header.randomAccessPointFlag &&
+			        frame->sl_header.compositionTimeStamp >= sb->remove_end) {
+				end = frame->sl_header.compositionTimeStamp;
+				break;
+			}
+		}
+		gf_mx_v(track->buffer_mutex);
 		if (!end) end = (u64)SECONDS_TO_TIMESCALE(sb->remove_end);
 
-        /* remove up to the next RAP found */
-        gf_mse_remove_frames_from_to(track, sb->remove_start, end);
-    }
+		/* remove up to the next RAP found */
+		gf_mse_remove_frames_from_to(track, sb->remove_start, end);
+	}
 	gf_mse_source_buffer_set_update(sb, GF_FALSE);
-    return 0;
+	return 0;
 }
 
 void gf_mse_remove(GF_HTML_SourceBuffer *sb, double start, double end)
 {
 	sb->remove_start = (u64)(start*sb->timescale);
 	sb->remove_end = (u64)(end*sb->timescale);
-	{ 
+	{
 		GF_Thread *t = gf_th_new(NULL);
 		gf_list_add(sb->threads, t);
 		gf_th_run(t, gf_mse_source_buffer_remove, sb);
@@ -893,112 +893,112 @@
 /* Callback functions used by a media parser when parsing events happens */
 GF_Err gf_mse_proxy(GF_InputService *parser, GF_NetworkCommand *command)
 {
-    if (!parser || !command || !parser->proxy_udta) {
-        return GF_BAD_PARAM;
-    } else {
-        GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)parser->proxy_udta;
-        switch (command->command_type) {
-        case GF_NET_SERVICE_QUERY_INIT_RANGE:
+	if (!parser || !command || !parser->proxy_udta) {
+		return GF_BAD_PARAM;
+	} else {
+		GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)parser->proxy_udta;
+		switch (command->command_type) {
+		case GF_NET_SERVICE_QUERY_INIT_RANGE:
 			break;
-        case GF_NET_SERVICE_QUERY_NEXT:
-            /* The parser is asking for the next media segment in the buffer,
-               check for the media time and give the right one */
-            {
-                GF_HTML_ArrayBuffer *buffer;
-                /* The input buffer should not be modified by append operations at the same time, no need to protect access */
-                buffer = (GF_HTML_ArrayBuffer *)gf_list_get(sb->input_buffer, 0);
-                if (buffer) {
-					command->url_query.discontinuity_type = 0;
-					command->url_query.current_download = GF_FALSE;
-					command->url_query.start_range = 0;
-					command->url_query.end_range = 0;
-					command->url_query.switch_start_range = 0;
-					command->url_query.switch_end_range = 0;
-					command->url_query.next_url_init_or_switch_segment = NULL;
-					if (buffer->is_init) { 
-						GF_HTML_ArrayBuffer *next = (GF_HTML_ArrayBuffer *)gf_list_get(sb->input_buffer, 1);
-						command->url_query.discontinuity_type = 1;
-						if (next) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Next segment to parse %s with init \n", next->url, buffer->url));
-							command->url_query.next_url = next->url;
-							command->url_query.next_url_init_or_switch_segment = buffer->url;
-							gf_list_rem(sb->input_buffer, 0);
-							gf_list_rem(sb->input_buffer, 0);
-						} else {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Only one init segment to parse %s, need to wait\n", buffer->url));
-							command->url_query.next_url = NULL;
-						}
-					} else {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Next segment to parse %s\n", buffer->url));
-						command->url_query.next_url = buffer->url;
+		case GF_NET_SERVICE_QUERY_NEXT:
+			/* The parser is asking for the next media segment in the buffer,
+			   check for the media time and give the right one */
+		{
+			GF_HTML_ArrayBuffer *buffer;
+			/* The input buffer should not be modified by append operations at the same time, no need to protect access */
+			buffer = (GF_HTML_ArrayBuffer *)gf_list_get(sb->input_buffer, 0);
+			if (buffer) {
+				command->url_query.discontinuity_type = 0;
+				command->url_query.current_download = GF_FALSE;
+				command->url_query.start_range = 0;
+				command->url_query.end_range = 0;
+				command->url_query.switch_start_range = 0;
+				command->url_query.switch_end_range = 0;
+				command->url_query.next_url_init_or_switch_segment = NULL;
+				if (buffer->is_init) {
+					GF_HTML_ArrayBuffer *next = (GF_HTML_ArrayBuffer *)gf_list_get(sb->input_buffer, 1);
+					command->url_query.discontinuity_type = 1;
+					if (next) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Next segment to parse %s with init \n", next->url, buffer->url));
+						command->url_query.next_url = next->url;
+						command->url_query.next_url_init_or_switch_segment = buffer->url;
+						gf_list_rem(sb->input_buffer, 0);
 						gf_list_rem(sb->input_buffer, 0);
+					} else {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Only one init segment to parse %s, need to wait\n", buffer->url));
+						command->url_query.next_url = NULL;
 					}
-                    sb->prev_buffer = buffer;
-                } else {
-                    command->url_query.next_url = NULL;
-                    command->url_query.discontinuity_type = 0;
-                }
-            }
-            break;
-        case GF_NET_SERVICE_STATUS_PROXY:
-            /* The parser is informing the proxy about its status changes:
-			    - new track found 
+				} else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Next segment to parse %s\n", buffer->url));
+					command->url_query.next_url = buffer->url;
+					gf_list_rem(sb->input_buffer, 0);
+				}
+				sb->prev_buffer = buffer;
+			} else {
+				command->url_query.next_url = NULL;
+				command->url_query.discontinuity_type = 0;
+			}
+		}
+		break;
+		case GF_NET_SERVICE_STATUS_PROXY:
+			/* The parser is informing the proxy about its status changes:
+			    - new track found
 				- all tracks parsed
 				- connect/disconnect
 				- */
-            if (command->status.is_add_media) {
-                if (command->status.desc) {
-                    gf_mse_source_buffer_store_track_desc(sb, (GF_ObjectDescriptor *)command->status.desc);
-                } else {
-                    /* this is the last add media, we can switch updating to false */
-                    /* the first init segment was correctly processed */
+			if (command->status.is_add_media) {
+				if (command->status.desc) {
+					gf_mse_source_buffer_store_track_desc(sb, (GF_ObjectDescriptor *)command->status.desc);
+				} else {
+					/* this is the last add media, we can switch updating to false */
+					/* the first init segment was correctly processed */
 					gf_mse_source_buffer_set_update(sb, GF_FALSE);
-                    /* TODO: set active tracks and send addsourcebuffer event */
-                    /* TODO: send media loadedmetadata event */
-                }
-                gf_term_add_media(sb->mediasource->service, command->status.desc, (command->status.desc ? GF_TRUE : GF_FALSE));
-            }
-            /* general connection/disconnection messages from the media parser (not track related) */
-            else if (!command->status.channel) { 
-                /* connection message */
-                if (!command->status.is_disconnect) {
-                    if (command->status.e == GF_OK) {
-                        /* nothing needs to be done. Setup is done with final add media */
-                        sb->parser_connected = GF_TRUE;
-                        sb->mediasource->durationType = DURATION_INFINITY;
-                        gf_mse_source_buffer_setup_tracks(sb);
-                    } else {
-                        /* wrong first init segment */
-                        /* TODO: fire an error event */
-                    }
-                    gf_term_on_connect(sb->mediasource->service, command->status.channel, command->status.e);
-                } else {
-                    gf_term_on_disconnect(sb->mediasource->service, command->status.channel, command->status.e);
-                }
-            }
-            /* channel (track related) specific connection/disconnection messages from the media parser */
-            else {
-                if (!command->status.is_disconnect) {
-                    gf_term_on_connect(sb->mediasource->service, command->status.channel, command->status.e);
-                } else {
-                    gf_term_on_disconnect(sb->mediasource->service, command->status.channel, command->status.e);
-                }
-            }
-            break;
-        default:
-            gf_term_on_command(sb->mediasource->service, command, GF_OK);
-            break;
-        }
-        return GF_OK;
-    }
+					/* TODO: set active tracks and send addsourcebuffer event */
+					/* TODO: send media loadedmetadata event */
+				}
+				gf_service_declare_media(sb->mediasource->service, command->status.desc, (command->status.desc ? GF_TRUE : GF_FALSE));
+			}
+			/* general connection/disconnection messages from the media parser (not track related) */
+			else if (!command->status.channel) {
+				/* connection message */
+				if (!command->status.is_disconnect) {
+					if (command->status.e == GF_OK) {
+						/* nothing needs to be done. Setup is done with final add media */
+						sb->parser_connected = GF_TRUE;
+						sb->mediasource->durationType = DURATION_INFINITY;
+						gf_mse_source_buffer_setup_tracks(sb);
+					} else {
+						/* wrong first init segment */
+						/* TODO: fire an error event */
+					}
+					gf_service_connect_ack(sb->mediasource->service, command->status.channel, command->status.e);
+				} else {
+					gf_service_disconnect_ack(sb->mediasource->service, command->status.channel, command->status.e);
+				}
+			}
+			/* channel (track related) specific connection/disconnection messages from the media parser */
+			else {
+				if (!command->status.is_disconnect) {
+					gf_service_connect_ack(sb->mediasource->service, command->status.channel, command->status.e);
+				} else {
+					gf_service_disconnect_ack(sb->mediasource->service, command->status.channel, command->status.e);
+				}
+			}
+			break;
+		default:
+			gf_service_command(sb->mediasource->service, command, GF_OK);
+			break;
+		}
+		return GF_OK;
+	}
 }
 
-/* Track Buffer Managment: 
+/* Track Buffer Managment:
  * - Access Units are parsed/demultiplexed from the SourceBuffer input buffer and placed into individual track buffers
  * - The parsing/demux is done in a separate thread (so access to the the track buffer is protected by a mutex)
  *
  * Track Buffer Length: number of Access Units */
-#define MSE_TRACK_BUFFER_LENGTH 1000 
+#define MSE_TRACK_BUFFER_LENGTH 1000
 
 /* When an Access Unit can be released, we check if it needs to be kept or not in the track buffer */
 GF_EXPORT
@@ -1023,9 +1023,9 @@
 /* Requests from the decoders to get the next Access Unit: we get it from the track buffer */
 GF_EXPORT
 GF_Err gf_mse_track_buffer_get_next_packet(GF_HTML_Track *track,
-											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 **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_Packet *packet;
 	u32 count;

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/img.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/img.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -127,11 +127,11 @@
 	else if ((b1==0x89) && (b2==0x50) && (b3==0x4E)) {
 		/*check for PNG sig*/
 		if ( (gf_bs_read_u8(bs) != 0x47) || (gf_bs_read_u8(bs) != 0x0D) || (gf_bs_read_u8(bs) != 0x0A)
-			|| (gf_bs_read_u8(bs) != 0x1A) || (gf_bs_read_u8(bs) != 0x0A) ) goto exit;
+		        || (gf_bs_read_u8(bs) != 0x1A) || (gf_bs_read_u8(bs) != 0x0A) ) goto exit;
 		gf_bs_read_u32(bs);
 		/*check for PNG IHDR*/
 		if ( (gf_bs_read_u8(bs) != 'I') || (gf_bs_read_u8(bs) != 'H')
-			|| (gf_bs_read_u8(bs) != 'D') || (gf_bs_read_u8(bs) != 'R')) goto exit;
+		        || (gf_bs_read_u8(bs) != 'D') || (gf_bs_read_u8(bs) != 'R')) goto exit;
 
 		*width = gf_bs_read_u32(bs);
 		*height = gf_bs_read_u32(bs);
@@ -141,7 +141,7 @@
 	size = gf_bs_read_u8(bs);
 	type = gf_bs_read_u32(bs);
 	if ( ((size==12) && (type==GF_4CC('j','P',' ',' ') ))
-		|| (type==GF_4CC('j','p','2','h') ) ) {
+	        || (type==GF_4CC('j','p','2','h') ) ) {
 
 		if (type==GF_4CC('j','p','2','h')) {
 			*OTI = GPAC_OTI_IMAGE_JPEG_2000;
@@ -188,7 +188,7 @@
 				}
 				goto exit;
 			}
-				break;
+			break;
 			default:
 				gf_bs_skip_bytes(bs, size-8);
 				break;
@@ -214,13 +214,13 @@
 typedef struct
 {
 	/*io manager*/
-    struct jpeg_source_mgr src;
+	struct jpeg_source_mgr src;
 
 	s32 skip;
 	struct jpeg_decompress_struct cinfo;
 } JPGCtx;
 
-static void gf_jpeg_output_message (j_common_ptr cinfo){
+static void gf_jpeg_output_message (j_common_ptr cinfo) {
 	char buffer[JMSG_LENGTH_MAX];
 	/* Create the message */
 	(*cinfo->err->format_message) (cinfo, buffer);
@@ -237,7 +237,9 @@
 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) { return 0; }
+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)
 {
@@ -287,7 +289,7 @@
 	jpx.src.term_source = gf_jpeg_stub;
 	jpx.skip = 0;
 	jpx.src.next_input_byte = (JOCTET *) jpg;
-        jpx.src.bytes_in_buffer = jpg_size;
+	jpx.src.bytes_in_buffer = jpg_size;
 	jpx.cinfo.src = (void *) &jpx.src;
 
 	/*read header*/
@@ -315,8 +317,8 @@
 		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_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;
 	}
@@ -340,15 +342,15 @@
 
 	/*read scanlines (the scan is not one line by one line so alloc a placeholder for block scaning) */
 	scan_line = gf_malloc(sizeof(char) * stride * jpx.cinfo.rec_outbuf_height);
-	for (i = 0; i<jpx.cinfo.rec_outbuf_height;i++) {
+	for (i = 0; i<jpx.cinfo.rec_outbuf_height; i++) {
 		lines[i] = scan_line + i * stride;
 	}
 	tmp = dst;
 	for (j=0; j< (s32) *height; j += jpx.cinfo.rec_outbuf_height) {
 		jpeg_read_scanlines(&jpx.cinfo, (unsigned char **) lines, jpx.cinfo.rec_outbuf_height);
-        scans = jpx.cinfo.rec_outbuf_height;
-        if (( (s32) *height - j) < scans) scans = *height - j;
-        ptr = scan_line;
+		scans = jpx.cinfo.rec_outbuf_height;
+		if (( (s32) *height - j) < scans) scans = *height - j;
+		ptr = scan_line;
 		/*for each line in the scan*/
 		for (k = 0; k < scans; k++) {
 			if (dst_nb_comp==(u32)jpx.cinfo.num_components) {
@@ -410,7 +412,7 @@
 }
 static void gf_png_user_error_fn(png_structp png_ptr,png_const_charp error_msg)
 {
- 	longjmp(png_jmpbuf(png_ptr), 1);
+	longjmp(png_jmpbuf(png_ptr), 1);
 }
 
 
@@ -425,7 +427,7 @@
 	png_bytep trans_alpha;
 	int num_trans;
 	png_color_16p trans_color;
- 
+
 	if ((png_size<8) || png_sig_cmp((png_bytep)png, 0, 8) ) return GF_NON_COMPLIANT_BITSTREAM;
 
 	udta.buffer = png;
@@ -465,8 +467,8 @@
 
 	switch (png_get_color_type(png_ptr, info_ptr)) {
 	case PNG_COLOR_TYPE_GRAY:
- 		*pixel_format = GF_PIXEL_GREYSCALE;
- 		break;
+		*pixel_format = GF_PIXEL_GREYSCALE;
+		break;
 	case PNG_COLOR_TYPE_GRAY_ALPHA:
 		*pixel_format = GF_PIXEL_ALPHAGREY;
 		break;
@@ -573,8 +575,8 @@
 	}
 
 	/* Set error handling.  REQUIRED if you aren't supplying your own
-    * error handling functions in the png_create_write_struct() call.
-    */
+	* error handling functions in the png_create_write_struct() call.
+	*/
 	if (setjmp(png_jmpbuf(png_ptr))) {
 		png_destroy_write_struct(&png_ptr, &info_ptr);
 		return GF_NON_COMPLIANT_BITSTREAM;
@@ -616,8 +618,8 @@
 	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.
-    */
+	* as appropriate to correctly scale the image.
+	*/
 	png_set_shift(png_ptr, &sig_bit);
 
 	/* pack pixels into bytes */
@@ -633,7 +635,7 @@
 		png_set_bgr(png_ptr);
 		break;
 	case GF_PIXEL_BGR_32:
-	   png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+		png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
 		break;
 	case GF_PIXEL_BGR_24:
 		png_set_bgr(png_ptr);
@@ -667,13 +669,13 @@
 	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_f64_open(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);
 	fclose(png);
@@ -704,12 +706,12 @@
 
 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_f64_open(png_filename, "rb");
-    if (!f) return GF_URL_ERROR;
+	u32 fsize, read, oti;
+	FILE *f;
+	char *data;
+	GF_Err e;
+	f = gf_f64_open(png_filename, "rb");
+	if (!f) return GF_URL_ERROR;
 
 	oti = 0;
 	if (!hint_oti || ! *hint_oti) {
@@ -718,30 +720,30 @@
 		if (!stricmp(ext, ".png")) oti = GPAC_OTI_IMAGE_PNG;
 		else if (!stricmp(ext, ".jpg") || !stricmp(ext, ".jpeg")) oti = GPAC_OTI_IMAGE_JPEG;
 	}
-    gf_f64_seek(f, 0, SEEK_END);
-    fsize = (u32)gf_f64_tell(f);
-    gf_f64_seek(f, 0, SEEK_SET);
-    data = gf_malloc(fsize);
-    read = (u32) fread(data, sizeof(char), fsize, f);
+	gf_f64_seek(f, 0, SEEK_END);
+	fsize = (u32)gf_f64_tell(f);
+	gf_f64_seek(f, 0, SEEK_SET);
+	data = gf_malloc(fsize);
+	read = (u32) fread(data, sizeof(char), fsize, f);
 	fclose( f );
-    if (read != fsize) return GF_IO_ERR;
+	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);    
+		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, NULL, dst_size, 0);    
+			return gf_img_jpeg_dec(data, fsize, width, height, pixel_format, NULL, 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);    
+		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);    
+			return gf_img_png_dec(data, fsize, width, height, pixel_format, *dst, dst_size);
 		}
 #endif
 	}

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/ismacryp.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/ismacryp.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -35,14 +35,14 @@
 
 #if !defined(GPAC_DISABLE_MCRYPT)
 
-typedef struct 
+typedef struct
 {
 	GF_List *tcis;
 	Bool has_common_key;
 	Bool in_text_header;
 	/*1: ISMACrypt - 2: CENC AES-CTR - 3: CENC AES-CBC*/
 	u32 crypt_type;
-} GF_CryptInfo; 
+} GF_CryptInfo;
 
 void isma_ea_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
 {
@@ -50,7 +50,7 @@
 	GF_TrackCryptInfo *tkc;
 	u32 i;
 	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
-	
+
 	if (!strcmp(node_name, "OMATextHeader")) {
 		info->in_text_header = 1;
 		return;
@@ -190,10 +190,10 @@
 		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_bin128_parse(att->value, tkc->KIDs[tkc->KID_count]);
 			}
@@ -300,7 +300,7 @@
 	Bool got_it;
 	FILE *kms;
 	strcpy(szPath, getenv("HOME"));
-	strcat(szPath , "/.kms_data"); 
+	strcat(szPath , "/.kms_data");
 	got_it = 0;
 	kms = gf_f64_open(szPath, "r");
 	while (kms && !feof(kms)) {
@@ -369,7 +369,7 @@
 	track = gf_isom_get_track_by_id(mp4, tci->trackID);
 	e = gf_isom_get_ismacryp_info(mp4, track, 1, &is_avc, NULL, NULL, NULL, NULL, &use_sel_enc, &IV_size, NULL);
 	is_avc = (is_avc==GF_4CC('2','6','4','b')) ? 1 : 0;
-		
+
 
 	mc = gf_crypt_open("AES-128", "CTR");
 	if (!mc) {
@@ -394,7 +394,7 @@
 	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); 
+		samp = gf_isom_get_sample(mp4, track, i+1, &si);
 		ismasamp = gf_isom_get_ismacryp_sample(mp4, track, samp, si);
 
 		gf_free(samp->data);
@@ -491,7 +491,7 @@
 		gf_isom_update_sample(mp4, i+1, 1, samp, 1);
 		gf_isom_sample_del(&samp);
 
-		/*remove IPMPToolList if any*/	
+		/*remove IPMPToolList if any*/
 		gf_isom_ipmpx_remove_tool_list(mp4);
 		break;
 	}
@@ -546,7 +546,7 @@
 	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)) ) {
+	        ((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;
 	}
@@ -593,21 +593,21 @@
 
 	/*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);	 
+		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);
+		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;
 
@@ -624,7 +624,7 @@
 	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); 
+		samp = gf_isom_get_sample(mp4, track, i+1, &di);
 
 		isamp = gf_isom_ismacryp_new_sample();
 		isamp->IV_length = IV_size;
@@ -660,7 +660,7 @@
 			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) 
+			if (samp->DTS + samp->CTS_Offset >= range_end)
 				isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
 			break;
 		case 0:
@@ -677,7 +677,8 @@
 			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[0] = d[1] = d[2] = 0;
+				d[3] = 1;
 				d += 4 + nal_size;
 				done += 4 + nal_size;
 			}
@@ -710,7 +711,7 @@
 	gf_crypt_close(mc);
 
 
-	/*format as IPMP(X) - note that the ISMACryp spec is broken since it always uses IPMPPointers to a 
+	/*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;
 
@@ -733,7 +734,8 @@
 		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->IPMP_ToolID[14] = 0x49;
+		ipmpd->IPMP_ToolID[15] = 0x53;
 		ipmpd->control_point = 1;
 		ipmpd->cp_sequence_code = 0x80;
 		/*format IPMPXData*/
@@ -773,7 +775,8 @@
 			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;
+			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);
 		}
@@ -825,7 +828,7 @@
 			block_count_portion +=  prev_block_count;
 		gf_bs_write_u64(bs, salt_portion);
 		gf_bs_write_u64(bs, block_count_portion);
-	}		
+	}
 
 	gf_crypt_set_state(mc, next_IV, 17);
 	/*decrypt remain bytes*/
@@ -841,7 +844,7 @@
 	}
 	else {
 		u32 j;
-		digest[0] = 0;				
+		digest[0] = 0;
 		for ( j=0; j<16; j++ ) {
 			t[2] = 0;
 			sprintf ( t, "%02X", (u8) next_IV[j+1] );
@@ -873,7 +876,7 @@
 	subsamples = gf_list_new();
 	if (!subsamples) {
 		e = GF_IO_ERR;
-		goto exit; 
+		goto exit;
 	}
 	while (gf_bs_available(pleintext_bs)) {
 		GF_CENCSubSampleEntry *entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
@@ -904,7 +907,7 @@
 			gf_crypt_encrypt(mc, buffer, samp->dataLength);
 			gf_bs_write_data(cyphertext_bs, buffer, samp->dataLength);
 
-			BSO += samp->dataLength;			
+			BSO += samp->dataLength;
 			entry->bytes_clear_data = 0;
 			entry->bytes_encrypted_data = samp->dataLength;
 		}
@@ -962,7 +965,7 @@
 	subsamples = gf_list_new();
 	if (!subsamples) {
 		e = GF_IO_ERR;
-		goto exit; 
+		goto exit;
 	}
 	while (gf_bs_available(pleintext_bs)) {
 		u32 ret;
@@ -1127,14 +1130,14 @@
 
 
 	count = gf_isom_get_sample_count(mp4, track);
-	
+
 	has_crypted_samp = GF_FALSE;
 	nb_samp_encrypted = 0;
 	/*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)) 
+
+	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);
@@ -1145,41 +1148,41 @@
 			e = GF_IO_ERR;
 			goto exit;
 		}
-		
+
 		switch (tci->sel_enc_type) {
-			case GF_CRYPT_SELENC_RAP:
-				if (!samp->IsRAP && !all_rap) {
-					e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, 0);
-					if (e) 
-						goto exit;
-					buf = NULL;
-
-					//already done: memset(tmp, 0, 16);
-					e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 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) {
-					e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, 0);
-					if (e) 
-						goto exit;
-					buf = NULL;
+		case GF_CRYPT_SELENC_RAP:
+			if (!samp->IsRAP && !all_rap) {
+				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, 0);
+				if (e)
+					goto exit;
+				buf = NULL;
+
+				//already done: memset(tmp, 0, 16);
+				e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 0, 0, NULL);
+				if (e) goto exit;
 
-					//alreaduy done: memset(tmp, 0, 16);
+				gf_isom_sample_del(&samp);
+				continue;
+			}
+			break;
+		case GF_CRYPT_SELENC_NON_RAP:
+			if (samp->IsRAP || all_rap) {
+				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, 0);
+				if (e)
+					goto exit;
+				buf = NULL;
 
-					e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 0, 0, NULL);
-					if (e) goto exit;
+				//alreaduy done: memset(tmp, 0, 16);
 
-					gf_isom_sample_del(&samp);
-					continue;
-				}
-				break;
-			default:
-				break;
+				e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 0, 0, NULL);
+				if (e) goto exit;
+
+				gf_isom_sample_del(&samp);
+				continue;
+			}
+			break;
+		default:
+			break;
 		}
 
 		/*generate initialization vector for the first sample in track ... */
@@ -1188,11 +1191,11 @@
 			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 
+			else
 				return GF_NOT_SUPPORTED;
 
 			e = gf_crypt_init(mc, tci->key, 16, IV);
@@ -1231,13 +1234,13 @@
 			gf_crypt_get_state(mc, IV, &IV_size);
 			gf_cenc_encrypt_sample_cbc(mc, samp, is_nalu_video, nalu_size_length, IV, tci->IV_size, &buf, &len, bytes_in_nalhr);
 		}
-		
+
 		gf_isom_update_sample(mp4, track, i+1, samp, 1);
 		gf_isom_sample_del(&samp);
 		samp = NULL;
 
 		e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, tci->IV_size, buf, len);
-		if (e) 
+		if (e)
 			goto exit;
 		gf_free(buf);
 		buf = NULL;
@@ -1377,40 +1380,53 @@
 			}
 		}
 
-		subsample_count = 0;
-		while (gf_bs_available(cyphertext_bs)) {
-			assert(subsample_count < sai->subsample_count);
+		//sub-sample encryption
+		if (sai->subsample_count) {
+			subsample_count = 0;
+			while (gf_bs_available(cyphertext_bs)) {
+				assert(subsample_count < sai->subsample_count);
 
-			/*read clear data and write it to pleintext 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(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
+				/*read clear data and write it to pleintext 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(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
 
-			/*now read encrypted data, decrypted it and write to pleintext 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);
-			gf_crypt_decrypt(mc, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
-			gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+				/*now read encrypted data, decrypted it and write to pleintext 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);
+				gf_crypt_decrypt(mc, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+				gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+
+				/*update IV for next subsample*/
+				if (tci->enc_type == 2) {
+					BSO += sai->subsamples[subsample_count].bytes_encrypted_data;
+					if (gf_bs_available(cyphertext_bs))
+						cenc_resync_IV(mc, (char *)sai->IV, BSO, tci->IV_size, GF_FALSE);
+				}
 
-			/*update IV for next subsample*/
-			if (tci->enc_type == 2) {
-				BSO += sai->subsamples[subsample_count].bytes_encrypted_data;
-				if (gf_bs_available(cyphertext_bs))
-					cenc_resync_IV(mc, (char *)sai->IV, BSO, tci->IV_size, GF_FALSE);
+				subsample_count++;
 			}
-
-			subsample_count++;
+		}
+		//full sample encryption
+		else {
+			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);
+			gf_crypt_decrypt(mc, buffer, samp->dataLength);
+			gf_bs_write_data(pleintext_bs, buffer, samp->dataLength);
 		}
 
 		gf_isom_cenc_samp_aux_info_del(sai);
 		sai = NULL;
-		
+
 		gf_bs_del(cyphertext_bs);
 		cyphertext_bs = NULL;
 		if (samp->data) {
@@ -1488,9 +1504,9 @@
 	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);	
+	count = gf_isom_get_sample_count(mp4, track);
 	has_crypted_samp = GF_FALSE;
-	if (! gf_isom_has_sync_points(mp4, track)) 
+	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);
@@ -1508,20 +1524,20 @@
 		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 && !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;
+		case GF_CRYPT_SELENC_RAP:
+			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) {
@@ -1721,7 +1737,7 @@
 			if (!a_tci->trackID) break;
 		}
 	}
-	
+
 	nb_tracks = gf_isom_get_track_count(mp4);
 	e = GF_OK;
 	for (i=0; i<nb_tracks; i++) {
@@ -1747,23 +1763,23 @@
 		}
 
 		switch (info->crypt_type) {
-			case 1:
-				gf_decrypt_track = gf_ismacryp_decrypt_track;
-				break;
-			case 2:
-				tci.enc_type = 2;
-				gf_decrypt_track = gf_cenc_decrypt_track;
-				break;
-			case 3:
-				tci.enc_type = 3;
-				gf_decrypt_track = gf_cenc_decrypt_track;
-				break;
-			case 4:
-				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;;
+		case 1:
+			gf_decrypt_track = gf_ismacryp_decrypt_track;
+			break;
+		case 2:
+			tci.enc_type = 2;
+			gf_decrypt_track = gf_cenc_decrypt_track;
+			break;
+		case 3:
+			tci.enc_type = 3;
+			gf_decrypt_track = gf_cenc_decrypt_track;
+			break;
+		case 4:
+			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)) {
@@ -1775,7 +1791,7 @@
 			}
 			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)){
+		} 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;
 		}
@@ -1826,7 +1842,7 @@
 		e = gf_isom_set_brand_info(mp4, GF_4CC('i','s','o','2'), 0x00000001);
 		if (!e) e = gf_isom_modify_alternate_brand(mp4, GF_4CC('o','d','c','f'), 0);
 	}
-	if ((info->crypt_type == 2) || (info->crypt_type == 3)) 
+	if ((info->crypt_type == 2) || (info->crypt_type == 3))
 		e = gf_isom_remove_pssh_box(mp4);
 	if (info) del_crypt_info(info);
 	return e;
@@ -1872,17 +1888,17 @@
 
 		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
 			if (!strcmp(att->name, "type")) {
-				if (!strcmp(att->value, "pssh")) 
+				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")) 
+				if (!strcmp(att->value, "data"))
 					cypherMode = 0;
-				else if (!strcmp(att->value, "all")) 
+				else if (!strcmp(att->value, "all"))
 					cypherMode = 1;
-				else if (!strcmp(att->value, "clear")) 
+				else if (!strcmp(att->value, "clear"))
 					cypherMode = 2;
 			} else if (!strcmp(att->name, "cypherKey")) {
 				gf_bin128_parse(att->value, cypherKey);
@@ -2019,7 +2035,7 @@
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Encryption type not sopported\n"));
 			return GF_NOT_SUPPORTED;;
-	}
+		}
 
 		/*default to FILE uri*/
 		if (!strlen(tci->KMS_URI)) strcpy(tci->KMS_URI, drm_file);

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/isom_hinter.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/isom_hinter.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre 
+ *			Authors: Jean Le Feuvre
  *			Copyright (c) Telecom ParisTech 2000-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -27,7 +27,7 @@
 #include <gpac/base_coding.h>
 #include <gpac/mpeg4_odf.h>
 #include <gpac/constants.h>
-#include <gpac/math.h>
+#include <gpac/maths.h>
 #include <gpac/ietf.h>
 
 #ifndef GPAC_DISABLE_ISOM
@@ -66,7 +66,7 @@
 
 		prevTS = samp->DTS+samp->CTS_Offset;
 		bw += 8*samp->dataLength;
-		
+
 		//get the CTS delta
 		if ((samp->CTS_Offset>=0) && ((u32)samp->CTS_Offset > *maxCTSDelta))
 			*maxCTSDelta = samp->CTS_Offset;
@@ -169,7 +169,7 @@
 	GF_RTPHinter *tkHint = (GF_RTPHinter *)cbk;
 	if (!tkHint || !tkHint->HintSample) return;
 	assert(header->TimeStamp == tkHint->RTPTime);
-	
+
 	disposable = 0;
 	if (tkHint->avc_nalu_size) {
 		disposable = tkHint->rtp_p->avc_non_idr ? 1 : 0;
@@ -190,8 +190,8 @@
 
 	/*add reference*/
 	gf_isom_hint_sample_data(tkHint->file, tkHint->HintTrack, tkHint->TrackID,
-			tkHint->CurrentSample, (u16) payload_size, offset_from_orig + tkHint->base_offset_in_sample, 
-			NULL, 0);
+	                         tkHint->CurrentSample, (u16) payload_size, offset_from_orig + tkHint->base_offset_in_sample,
+	                         NULL, 0);
 }
 
 void MP4T_OnData(void *cbk, char *data, u32 data_size, Bool is_header)
@@ -229,7 +229,7 @@
 		tkHint->RTPTime = header->TimeStamp;
 		tkHint->SampleIsRAP = tkHint->rtp_p->sl_config.hasRandomAccessUnitsOnlyFlag ? 1 : tkHint->rtp_p->sl_header.randomAccessPointFlag;
 	}
-	/*create an RTP Packet with the appropriated marker flag - note: the flags are temp ones, 
+	/*create an RTP Packet with the appropriated marker flag - note: the flags are temp ones,
 	they are set when the full packet is signaled (to handle multi AUs per RTP)*/
 	gf_isom_rtp_packet_begin(tkHint->file, tkHint->HintTrack, 0, 0, 0, header->Marker, header->PayloadType, 0, 0, header->SequenceNumber);
 	/*Add the delta TS to make sure RTP TS is indeed the CTS (sampling time)*/
@@ -238,9 +238,9 @@
 
 
 GF_EXPORT
-GF_RTPHinter *gf_hinter_track_new(GF_ISOFile *file, u32 TrackNum, 
-							u32 Path_MTU, u32 max_ptime, u32 default_rtp_rate, u32 flags, u8 PayloadID, 
-							Bool copy_media, u32 InterleaveGroupID, u8 InterleaveGroupPriority, GF_Err *e)
+GF_RTPHinter *gf_hinter_track_new(GF_ISOFile *file, u32 TrackNum,
+                                  u32 Path_MTU, u32 max_ptime, u32 default_rtp_rate, u32 flags, u8 PayloadID,
+                                  Bool copy_media, u32 InterleaveGroupID, u8 InterleaveGroupPriority, GF_Err *e)
 {
 
 	GF_SLConfig my_sl;
@@ -290,7 +290,7 @@
 	has_mpeg4_mapping = 1;
 	TrackMediaType = gf_isom_get_media_type(file, TrackNum);
 	TrackMediaSubType = gf_isom_get_media_subtype(file, TrackNum, 1);
-	
+
 	/*for max compatibility with QT*/
 	if (!default_rtp_rate) default_rtp_rate = 90000;
 
@@ -306,7 +306,7 @@
 
 		TrackMediaSubType = gf_isom_get_media_subtype(file, TrackNum, 1);
 		switch (TrackMediaSubType) {
-		case GF_ISOM_SUBTYPE_MPEG4_CRYP: 
+		case GF_ISOM_SUBTYPE_MPEG4_CRYP:
 			is_crypted = 1;
 		case GF_ISOM_SUBTYPE_MPEG4:
 			esd = gf_isom_get_esd(file, TrackNum, 1);
@@ -317,8 +317,8 @@
 				if (esd->URLString) hintType = 0;
 				/*AAC*/
 				if ((streamType==GF_STREAM_AUDIO) && esd->decoderConfig->decoderSpecificInfo
-				/*(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)) ) {
+				        /*(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)) ) {
 
 					u32 sample_rate;
 					GF_M4ADecSpecInfo a_cfg;
@@ -461,7 +461,7 @@
 			gf_odf_avc_cfg_del(avcc);
 			gf_odf_avc_cfg_del(svcc);
 		}
-			break;
+		break;
 		case GF_ISOM_SUBTYPE_HVC1:
 		case GF_ISOM_SUBTYPE_HEV1:
 		case GF_ISOM_SUBTYPE_HVC2:
@@ -470,7 +470,7 @@
 			GF_HEVCConfig *hevcc = NULL;
 			hevcc = gf_isom_hevc_config_get(file, TrackNum, 1);
 			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
-			hintType = GF_RTP_PAYT_HEVC;			
+			hintType = GF_RTP_PAYT_HEVC;
 			streamType = GF_STREAM_VISUAL;
 			avc_nalu_size = hevcc->nal_unit_size;
 			oti = GPAC_OTI_VIDEO_HEVC;
@@ -479,7 +479,7 @@
 			gf_odf_hevc_cfg_del(hevcc);
 			break;
 		}
-			break;
+		break;
 		case GF_ISOM_SUBTYPE_3GP_QCELP:
 			required_rate = 8000;
 			hintType = GF_RTP_PAYT_QCELP;
@@ -517,7 +517,7 @@
 	/*we only support self-contained files for hinting*/
 	gf_isom_get_data_reference(file, TrackNum, 1, &url, &urn);
 	if (url || urn) return NULL;
-	
+
 	*e = GF_OUT_OF_MEM;
 	GF_SAFEALLOC(tmp, GF_RTPHinter);
 	if (!tmp) return NULL;
@@ -587,15 +587,15 @@
 
 	// in case a different timescale was provided
 	tmp->OrigTimeScale = gf_isom_get_media_timescale(file, TrackNum);
-	tmp->rtp_p = gf_rtp_builder_new(hintType, &my_sl, flags, tmp, 
-								MP4T_OnNewPacket, MP4T_OnPacketDone, 
-								/*if copy, no data ref*/
-								copy_media ? NULL : MP4T_OnDataRef, 
-								MP4T_OnData);
+	tmp->rtp_p = gf_rtp_builder_new(hintType, &my_sl, flags, tmp,
+	                                MP4T_OnNewPacket, MP4T_OnPacketDone,
+	                                /*if copy, no data ref*/
+	                                copy_media ? NULL : MP4T_OnDataRef,
+	                                MP4T_OnData);
 
 	//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, oti, 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;
@@ -684,7 +684,7 @@
 	tkHint->TotalSample = gf_isom_get_sample_count(tkHint->file, tkHint->TrackNum);
 	ft = tkHint->rtp_p->sl_config.timestampResolution;
 	ft /= tkHint->OrigTimeScale;
-	
+
 	e = GF_OK;
 	for (i=0; i<tkHint->TotalSample; i++) {
 		samp = gf_isom_get_sample(tkHint->file, tkHint->TrackNum, i+1, &descIndex);
@@ -693,11 +693,11 @@
 		//setup SL
 		tkHint->CurrentSample = i + 1;
 
-		/*keep same AU indicator if sync shadow - TODO FIXME: this assumes shadows are placed interleaved with 
+		/*keep same AU indicator if sync shadow - TODO FIXME: this assumes shadows are placed interleaved with
 		the track content which is the case for GPAC scene carousel generation, but may not always be true*/
-		if (samp->IsRAP==2) {
+		if (samp->IsRAP==RAP_REDUNDANT) {
 			tkHint->rtp_p->sl_header.AU_sequenceNumber -= 1;
-			samp->IsRAP = 1;
+			samp->IsRAP = RAP;
 		}
 
 		ts = (u64) (ft * (s64) (samp->DTS+samp->CTS_Offset));
@@ -729,7 +729,7 @@
 		} else {
 			tkHint->rtp_p->sl_header.paddingBits = 0;
 		}
-		
+
 		duration = gf_isom_get_sample_duration(tkHint->file, tkHint->TrackNum, i+1);
 		ts = (u32) (ft * (s64) (duration));
 
@@ -817,7 +817,7 @@
 		count = write_nalu_config_array(sdpLine, avcc->pictureParameterSets);
 		if (count) strcat(sdpLine, ",");
 	}
-		
+
 	if (svcc) {
 		count = write_nalu_config_array(sdpLine, svcc->sequenceParameterSets);
 		if (count) strcat(sdpLine, ",");
@@ -929,41 +929,41 @@
 		gf_isom_sdp_add_track_line(tkHint->file, tkHint->HintTrack, sdpLine);
 	}
 	/*MPEG-4 Audio LATM*/
-	else if (tkHint->rtp_p->rtp_payt==GF_RTP_PAYT_LATM) { 
-		GF_BitStream *bs; 
-		char *config_bytes; 
-		u32 config_size; 
- 
-		/* form config string */ 
-		bs = gf_bs_new(NULL, 32, GF_BITSTREAM_WRITE); 
-		gf_bs_write_int(bs, 0, 1); /* AudioMuxVersion */ 
-		gf_bs_write_int(bs, 1, 1); /* all streams same time */ 
-		gf_bs_write_int(bs, 0, 6); /* numSubFrames */ 
-		gf_bs_write_int(bs, 0, 4); /* numPrograms */ 
-		gf_bs_write_int(bs, 0, 3); /* numLayer */ 
- 
-		/* audio-specific config */ 
-		esd = gf_isom_get_esd(tkHint->file, tkHint->TrackNum, 1); 
-		if (esd && esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo) { 
+	else if (tkHint->rtp_p->rtp_payt==GF_RTP_PAYT_LATM) {
+		GF_BitStream *bs;
+		char *config_bytes;
+		u32 config_size;
+
+		/* form config string */
+		bs = gf_bs_new(NULL, 32, GF_BITSTREAM_WRITE);
+		gf_bs_write_int(bs, 0, 1); /* AudioMuxVersion */
+		gf_bs_write_int(bs, 1, 1); /* all streams same time */
+		gf_bs_write_int(bs, 0, 6); /* numSubFrames */
+		gf_bs_write_int(bs, 0, 4); /* numPrograms */
+		gf_bs_write_int(bs, 0, 3); /* numLayer */
+
+		/* audio-specific config */
+		esd = gf_isom_get_esd(tkHint->file, tkHint->TrackNum, 1);
+		if (esd && esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo) {
 			/*PacketVideo patch: don't signal SBR and PS stuff, not allowed in LATM with audioMuxVersion=0*/
-			gf_bs_write_data(bs, esd->decoderConfig->decoderSpecificInfo->data, MIN(esd->decoderConfig->decoderSpecificInfo->dataLength, 2) ); 
-		} 
-		if (esd) gf_odf_desc_del((GF_Descriptor *)esd); 
- 
-		/* other data */ 
-		gf_bs_write_int(bs, 0, 3); /* frameLengthType */ 
-		gf_bs_write_int(bs, 0xff, 8); /* latmBufferFullness */ 
-		gf_bs_write_int(bs, 0, 1); /* otherDataPresent */ 
-		gf_bs_write_int(bs, 0, 1); /* crcCheckPresent */ 
-		gf_bs_get_content(bs, &config_bytes, &config_size); 
-		gf_bs_del(bs); 
- 
-		gf_rtp_builder_format_sdp(tkHint->rtp_p, payloadName, sdpLine, config_bytes, config_size); 
-		gf_isom_sdp_add_track_line(tkHint->file, tkHint->HintTrack, sdpLine); 
-		gf_free(config_bytes); 
+			gf_bs_write_data(bs, esd->decoderConfig->decoderSpecificInfo->data, MIN(esd->decoderConfig->decoderSpecificInfo->dataLength, 2) );
+		}
+		if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
+
+		/* other data */
+		gf_bs_write_int(bs, 0, 3); /* frameLengthType */
+		gf_bs_write_int(bs, 0xff, 8); /* latmBufferFullness */
+		gf_bs_write_int(bs, 0, 1); /* otherDataPresent */
+		gf_bs_write_int(bs, 0, 1); /* crcCheckPresent */
+		gf_bs_get_content(bs, &config_bytes, &config_size);
+		gf_bs_del(bs);
+
+		gf_rtp_builder_format_sdp(tkHint->rtp_p, payloadName, sdpLine, config_bytes, config_size);
+		gf_isom_sdp_add_track_line(tkHint->file, tkHint->HintTrack, sdpLine);
+		gf_free(config_bytes);
 	}
 	/*3GPP DIMS*/
-	else if (tkHint->rtp_p->rtp_payt==GF_RTP_PAYT_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);
@@ -1113,7 +1113,7 @@
 					InitSL_NULL(&slc);
 					slc.predefined = 0;
 					slc.hasRandomAccessUnitsOnlyFlag = 1;
-					slc.timeScale = slc.timestampResolution = gf_isom_get_media_timescale(file, odT);	
+					slc.timeScale = slc.timestampResolution = gf_isom_get_media_timescale(file, odT);
 					slc.OCRResolution = 1000;
 					slc.startCTS = samp->DTS+samp->CTS_Offset;
 					slc.startDTS = samp->DTS;
@@ -1138,7 +1138,7 @@
 			}
 			if (remove_ocr) esd->OCRESID = 0;
 			else if (esd->OCRESID == esd->ESID) esd->OCRESID = 0;
-			
+
 			//OK, add this to our IOD
 			gf_list_add(iod->ESDescriptors, esd);
 		}
@@ -1148,7 +1148,7 @@
 			samp = gf_isom_get_sample(file, sceneT, 1, &descIndex);
 			if (gf_hinter_can_embbed_data(samp->data, samp->dataLength, GF_STREAM_SCENE)) {
 
-				slc.timeScale = slc.timestampResolution = gf_isom_get_media_timescale(file, sceneT);	
+				slc.timeScale = slc.timestampResolution = gf_isom_get_media_timescale(file, sceneT);
 				slc.OCRResolution = 1000;
 				slc.startCTS = samp->DTS+samp->CTS_Offset;
 				slc.startDTS = samp->DTS;

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/isom_tools.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/isom_tools.c Changed

@@ -40,11 +40,11 @@
 	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 ((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);
@@ -97,10 +97,46 @@
 	}
 	return gf_isom_set_track_layout_info(file, track, tk_w<<16, tk_h<<16, 0, 0, 0);
 }
+
+GF_EXPORT
+GF_Err gf_media_remove_non_rap(GF_ISOFile *file, u32 track)
+{
+	GF_Err e;
+	u32 i, count, di;
+	u64 offset, dur, last_dts;
+	Bool all_raps = (gf_isom_has_sync_points(file, track)==0) ? 1 : 0;
+	if (all_raps) return GF_OK;
+
+	last_dts = 0;
+	dur = gf_isom_get_media_duration(file, track);
+
+	gf_isom_set_cts_packing(file, track, 1);
+
+	count = gf_isom_get_sample_count(file, track);
+	for (i=0; i<count; i++) {
+		GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, &di, &offset);
+		if (!samp) return gf_isom_last_error(file);
+
+		if (samp->IsRAP) {
+			last_dts = samp->DTS;
+			gf_isom_sample_del(&samp);
+			continue;
+		}
+		gf_isom_sample_del(&samp);
+		e = gf_isom_remove_sample(file, track, i+1);
+		if (e) return e;
+		i--;
+		count--;
+	}
+	gf_isom_set_cts_packing(file, track, 0);
+	gf_isom_set_last_sample_duration(file, track, (u32) (dur - last_dts) );
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_EXPORT
-GF_Err gf_media_get_file_hash(const char *file, u8 hash[20]) 
+GF_Err gf_media_get_file_hash(const char *file, u8 hash[20])
 {
 #ifdef GPAC_DISABLE_CORE_TOOLS
 	return GF_NOT_SUPPORTED;
@@ -417,7 +453,7 @@
 	gf_odf_codec_del(codec);
 	samp->CTS_Offset = 0;
 	samp->DTS = 0;
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 
 	/*create the OD track*/
 	odT = gf_isom_new_track(mp4file, odID, GF_ISOM_MEDIA_OD, gf_isom_get_timescale(mp4file));
@@ -494,7 +530,7 @@
 		break;
 	}
 
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 
 	gf_isom_add_sample(mp4file, bifsT, 1, samp);
 	samp->data = NULL;
@@ -566,18 +602,18 @@
 				nb_avc++;
 				break;
 			case GF_ISOM_SUBTYPE_MPEG4:
-				{
-					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)) {
-						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) ));
-						goto remove_track;
-					}
-					gf_odf_desc_del((GF_Descriptor *)esd);
+			{
+				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)) {
+					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) ));
+					goto remove_track;
 				}
-				break;
+				gf_odf_desc_del((GF_Descriptor *)esd);
+			}
+			break;
 			default:
 				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Video format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 				goto remove_track;
@@ -614,7 +650,7 @@
 				}
 				gf_odf_desc_del((GF_Descriptor *)esd);
 			}
-				break;
+			break;
 			default:
 				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Audio format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 				goto remove_track;
@@ -837,13 +873,38 @@
 		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_AC3_ENHANCED : GPAC_OTI_AUDIO_AC3;
+		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;
+	}
+
+
+	if ( (subtype == GF_4CC('j','p','e','g')) || (subtype == GF_4CC('p','n','g',' ')) ) {
+		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_4CC('j','p','e','g')) ? GPAC_OTI_IMAGE_JPEG : GPAC_OTI_IMAGE_PNG;
+		gf_odf_desc_del((GF_Descriptor*)esd->decoderConfig->decoderSpecificInfo);
+		esd->decoderConfig->decoderSpecificInfo = NULL;
+		return esd;
+	}
+
 	if (subtype == GF_ISOM_SUBTYPE_3GP_DIMS) {
 		GF_DIMSDescription dims;
 		esd = gf_odf_desc_esd_new(0);
@@ -1011,7 +1072,7 @@
 {
 	GF_AVCConfig *svccfg, *cfg;
 	u32 num_svc_track, num_sample, svc_track, dst_track, ref_trackID, ref_trackNum, max_id, di, width, height, size, nalu_size_length, i, j, t, max_size, num_pps, num_sps, num_subseq, NALUnitHeader, data_offset, data_length, count, timescale, cur_extract_mode;
-	GF_Err e; 
+	GF_Err e;
 	GF_AVCConfigSlot *slc, *sl;
 	AVCState avc;
 	s32 sps_id, pps_id;
@@ -1084,7 +1145,7 @@
 	num_svc_track = splitAll ? num_subseq : 1;
 	max_id = gf_isom_get_track_id_max(file);
 	di = 0;
-	
+
 	memset(&avc, 0, sizeof(AVCState));
 	avc.sps_active_idx = -1;
 	nalu_size_length = 8 * svccfg->nal_unit_size;
@@ -1194,12 +1255,12 @@
 
 	gf_isom_sample_del(&samp);
 	samp = NULL;
-	
+
 	for (t = 0; t < num_svc_track; t++)
 	{
 		e = GF_OK;
 		svc_track = gf_isom_new_track(file, t+1+max_id, GF_ISOM_MEDIA_VISUAL, timescale);
-		if (!svc_track) 
+		if (!svc_track)
 		{
 			e = gf_isom_last_error(file);
 			goto exit;
@@ -1309,7 +1370,7 @@
 	{
 		/*reset*/
 		memset(buffer, 0, max_size);
-		
+
 		samp = gf_isom_get_sample(file, track, i, &di);
 		if (!samp)
 		{
@@ -1383,44 +1444,25 @@
 				goto exit;
 			gf_bs_read_data(bs, buffer, size);
 			offset += size + nalu_size_length/8;
-					
+
 			switch (nal_type) {
-				case GF_AVC_NALU_PIC_PARAM:
-					pps_id = gf_media_avc_read_pps(buffer, size, &avc);;
-					j = 0;
-					dst_track = 0;
-					while (j < num_pps)
-					{
-						if (pps_id == pps[j])
-							break;
-						j++;
-					}
-					if ((j < num_pps) && (is_subseq_pps[j]))
-					{
-						if (splitAll)
-						{
-							for (t = 0; t < num_svc_track; t++)
-							{
-								if (sps[t] == avc.pps[pps_id].sps_id)
-								{
-									dst_track = t + 1;
-									break;
-								}
-							}
-						}
-						else
-							dst_track = 1;
-					}
-					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);
-					dst_track = 0;
+			case GF_AVC_NALU_PIC_PARAM:
+				pps_id = gf_media_avc_read_pps(buffer, size, &avc);;
+				j = 0;
+				dst_track = 0;
+				while (j < num_pps)
+				{
+					if (pps_id == pps[j])
+						break;
+					j++;
+				}
+				if ((j < num_pps) && (is_subseq_pps[j]))
+				{
 					if (splitAll)
 					{
 						for (t = 0; t < num_svc_track; t++)
 						{
-							if (sps[t] == sps_id)
+							if (sps[t] == avc.pps[pps_id].sps_id)
 							{
 								dst_track = t + 1;
 								break;
@@ -1429,27 +1471,46 @@
 					}
 					else
 						dst_track = 1;
-					dst_bs = sample_bs[dst_track];
-					break;
-				case GF_AVC_NALU_SVC_SLICE:
-					dst_track = 0;
-					if (splitAll)
+				}
+				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);
+				dst_track = 0;
+				if (splitAll)
+				{
+					for (t = 0; t < num_svc_track; t++)
 					{
-						for (t = 0; t < num_svc_track; t++)
+						if (sps[t] == sps_id)
 						{
-							if (sps[t] == (avc.s_info.pps)->sps_id)
-							{
-								dst_track = t + 1;
-								break;
-							}
+							dst_track = t + 1;
+							break;
 						}
 					}
-					else
-						dst_track = 1;
-					dst_bs = sample_bs[dst_track];
-					break;
-				default:
-					dst_bs = sample_bs[0];
+				}
+				else
+					dst_track = 1;
+				dst_bs = sample_bs[dst_track];
+				break;
+			case GF_AVC_NALU_SVC_SLICE:
+				dst_track = 0;
+				if (splitAll)
+				{
+					for (t = 0; t < num_svc_track; t++)
+					{
+						if (sps[t] == (avc.s_info.pps)->sps_id)
+						{
+							dst_track = t + 1;
+							break;
+						}
+					}
+				}
+				else
+					dst_track = 1;
+				dst_bs = sample_bs[dst_track];
+				break;
+			default:
+				dst_bs = sample_bs[0];
 			}
 
 			gf_bs_write_int(dst_bs, size, nalu_size_length);
@@ -1505,7 +1566,7 @@
 			gf_isom_set_edit_segment(file, t, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
 		}
 	}
-	
+
 	/*if this is a merged file*/
 	if (!is_splited)
 	{
@@ -1517,7 +1578,7 @@
 		else
 		{
 			s32 shift=0;
-			
+
 			for (i = 0; i < gf_list_count(svccfg->sequenceParameterSets); i++)
 			{
 				slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
@@ -1537,21 +1598,21 @@
 			}
 
 			for (j = 0; j < gf_list_count(svccfg->pictureParameterSets); j++)
+			{
+				slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
+				pps_id = gf_media_avc_read_pps(slc->data, slc->size, &avc);
+				if (pps_id < 0) {
+					e = GF_NON_COMPLIANT_BITSTREAM;
+					goto exit;
+				}
+				if (is_subseq_pps[j+shift])
 				{
-					slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
-					pps_id = gf_media_avc_read_pps(slc->data, slc->size, &avc);
-					if (pps_id < 0) {
-						e = GF_NON_COMPLIANT_BITSTREAM;
-						goto exit;
-					}
-					if (is_subseq_pps[j+shift])
-					{
-						gf_list_rem(svccfg->pictureParameterSets, j);
-						gf_free(slc->data);
-						gf_free(slc);
-						j--;
-					}
+					gf_list_rem(svccfg->pictureParameterSets, j);
+					gf_free(slc->data);
+					gf_free(slc);
+					j--;
 				}
+			}
 			e = gf_isom_svc_config_update(file, track, 1, svccfg, 0);
 			if (e)
 				goto exit;
@@ -1602,7 +1663,7 @@
 	u64 EditTime, SegmentDuration, MediaTime;
 	u8 EditMode, nal_type;
 	Bool first_sample;
-	u64 first_DTS, offset, dur; 
+	u64 first_DTS, offset, dur;
 	GF_AVCConfigSlot *slc, *sl;
 
 	e = GF_OK;
@@ -1616,12 +1677,12 @@
 	DQId = NULL;
 	list_track_sorted = cur_sample = max_sample = NULL;
 	DTS_offset = NULL;
-	
+
 	if (gf_isom_get_avc_svc_type(file, track, 1) == GF_ISOM_AVCTYPE_AVC_SVC)
 		goto exit;
 
 	num_track = gf_isom_get_track_count(file);
-	if (num_track == 1) 
+	if (num_track == 1)
 		goto exit;
 	gf_isom_get_reference(file, track, GF_ISOM_REF_BASE, 1, &ref_trackNum);
 	ref_trackID = gf_isom_get_track_id(file, ref_trackNum);
@@ -1630,7 +1691,7 @@
 		e = GF_ISOM_INVALID_MEDIA;
 		goto exit;
 	}
-	
+
 	list_track_sorted = (u32 *) gf_malloc(num_track * sizeof(u32));
 	DQId = (s32 *) gf_malloc(num_track * sizeof(s32));
 	count = 0;
@@ -1664,7 +1725,7 @@
 	gf_isom_set_track_enabled(file, merge_track, 1);
 	/*rewrite svccfg*/
 	svccfg = gf_odf_avc_cfg_new();
-	svccfg->complete_representation = 1; 
+	svccfg->complete_representation = 1;
 	/*rewrite visual info*/
 	if (!mergeAll)
 	{
@@ -1811,12 +1872,12 @@
 				if (size>max_size) {
 					buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
 					max_size = size;
-				}			
+				}
 				gf_bs_read_data(bs, buffer, size);
 				nal_type = buffer[0] & 0x1F;
 				/*skip extractor*/
 				if (nal_type == 31)
-					continue;			
+					continue;
 				/*copy to new bitstream*/
 				gf_bs_write_int(dst_bs, size, nalu_size_length);
 				gf_bs_write_data(dst_bs, buffer, size);
@@ -1827,7 +1888,7 @@
 			samp = NULL;
 			cur_sample[t]++;
 		}
-		
+
 		/*add sapmle to track*/
 		if (gf_bs_get_position(dst_bs))
 		{
@@ -1896,7 +1957,7 @@
 
 
 /* Split SHVC layers */
-static GF_HEVCParamArray *alloc_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type) 
+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;
@@ -1907,7 +1968,10 @@
 	GF_SAFEALLOC(ar, GF_HEVCParamArray);
 	ar->nalus = gf_list_new();
 	ar->type = type;
-	gf_list_add(hevc_cfg->param_array, ar);
+	if (ar->type == GF_HEVC_NALU_VID_PARAM)
+		gf_list_insert(hevc_cfg->param_array, ar, 0);
+	else
+		gf_list_add(hevc_cfg->param_array, ar);
 	return ar;
 }
 
@@ -1921,6 +1985,32 @@
 	u32 temporal_id;
 } SHVCTrackInfo;
 
+static GF_Err gf_isom_adjust_visual_info(GF_ISOFile *file, u32 track) {
+	u32 width, height, i, j;
+	GF_HEVCConfig *shvccfg;
+	HEVCState hevc;
+
+	shvccfg = gf_isom_shvc_config_get(file, track, 1);
+	if (!shvccfg) return GF_OK;
+
+	for (i = 0; i < gf_list_count(shvccfg->param_array); i++) {
+		GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(shvccfg->param_array, i);
+		for (j = 0; j < gf_list_count(ar->nalus); j++) {
+			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+			if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+				gf_hevc_get_sps_info_with_state(&hevc, sl->data, sl->size, NULL, &width, &height, NULL, NULL);
+			}
+			else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+				gf_media_hevc_read_vps(sl->data, sl->size, &hevc);
+			}
+		}
+	}
+
+	if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
+
+	return gf_isom_set_visual_info(file, track, 1, width, height);
+}
+
 GF_EXPORT
 GF_Err gf_media_split_shvc(GF_ISOFile *file, u32 track, Bool splitAll, Bool use_extractors)
 {
@@ -1955,7 +2045,7 @@
 			GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, j);
 //			u8 nal_type = (sl->data[0] & 0x7E) >> 1;
 			u8 layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
-			
+
 			//this should not happen
 			if (!layer_id) continue;
 
@@ -2029,10 +2119,13 @@
 		GF_BitStream *bs;
 		u32 di;
 		GF_ISOSample *sample;
-		u8 max_layer_id = 0;
-		
+		Bool is_irap, has_roll;
+		s32 roll_distance;
+		u8 cur_max_layer_id = 0;
+
 		sample = gf_isom_get_sample(file, track, i+1, &di);
-		
+		gf_isom_get_sample_rap_roll_info(file, track, i+1, &is_irap, &has_roll, &roll_distance);
+
 		bs = gf_bs_new(sample->data, sample->dataLength, GF_BITSTREAM_READ);
 		while (gf_bs_available(bs)) {
 			u8 orig_layer_id;
@@ -2044,8 +2137,9 @@
 
 			if (!splitAll) layer_id = 1;
 
-			if (max_layer_id < layer_id) 
-				max_layer_id = layer_id;
+			if (cur_max_layer_id < layer_id) {
+				cur_max_layer_id = layer_id;
+			}
 
 			if (!sti[layer_id].bs)
 				sti[layer_id].bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -2071,15 +2165,20 @@
 		}
 		gf_bs_del(bs);
 
+		if (cur_max_layer_id>max_layer_id) {
+			max_layer_id = cur_max_layer_id;
+		}
 
 		gf_free(sample->data);
 		sample->data = NULL;
 		sample->dataLength = 0;
-		//reset all samples on scalable layers
+		//reset all samples on all layers found - we may have layers not present in this sample, we still need to process these layers when extractors are used
 		for (j=0; j<=max_layer_id; j++) {
 			if (! sti[j].bs) {
-				sti[j].data_offset =  sti[j].data_size = 0;
-				continue;
+				if (!sti[j].track_num || !use_extractors) {
+					sti[j].data_offset =  sti[j].data_size = 0;
+					continue;
+				}
 			}
 
 			//clone track
@@ -2095,6 +2194,8 @@
 
 				gf_isom_set_nalu_extract_mode(file, sti[j].track_num, GF_ISOM_NALU_EXTRACT_INSPECT);
 
+				gf_isom_adjust_visual_info(file, sti[j].track_num);
+
 				//get lower layer
 				for (k=j; k>0; k--) {
 					if (sti[k-1].track_num) {
@@ -2104,7 +2205,7 @@
 					}
 				}
 
-				//add empty sample at DTS 0 
+				//add empty sample at DTS 0
 				if (sample->DTS ) {
 					u64 dts = sample->DTS;
 					s32 cts = sample->CTS_Offset;
@@ -2121,7 +2222,8 @@
 				//get all lower layers
 				for (k=0; k<j; k++) {
 					u8 trefidx;
-					if (!sti[k].data_size) continue;
+					if (!sti[k].data_size)
+						continue;
 					//extractor is 12 bytes
 					gf_bs_write_int(xbs, 2*shvccfg->nal_unit_size + 4, 8*shvccfg->nal_unit_size);
 					gf_bs_write_int(xbs, 0, 1);
@@ -2144,14 +2246,18 @@
 				//we wrote all our references, store offset for upper layers
 				sti[j].data_offset = sample->dataLength;
 				e = gf_isom_add_sample(file, sti[j].track_num, 1, sample);
-				if (e) goto exit;
+				if (e)
+					goto exit;
 				gf_free(sample->data);
+				sample->data = NULL;
 
 				//get real content, remember its size and add it to the new bs
-				gf_bs_get_content(sti[j].bs, &sample->data, &sample->dataLength);
-				e = gf_isom_append_sample_data(file, sti[j].track_num, sample->data, sample->dataLength);
-				if (e) goto exit;
-
+				if (sti[j].bs) {
+					gf_bs_get_content(sti[j].bs, &sample->data, &sample->dataLength);
+					e = gf_isom_append_sample_data(file, sti[j].track_num, sample->data, sample->dataLength);
+					if (e)
+						goto exit;
+				}
 
 			} else {
 				//get sample content
@@ -2166,15 +2272,26 @@
 				} else {
 					e = gf_isom_update_sample(file, sti[j].track_num, i+1, sample, 1);
 				}
-				if (e) goto exit;
+				if (e)
+					goto exit;
 			}
-			
+
 			gf_bs_del(sti[j].bs);
 			sti[j].bs = NULL;
-				
 
-			gf_free(sample->data);
-			sample->data = NULL;
+			if (sample->IsRAP>SAP_TYPE_1) {
+				if (is_irap) {
+					gf_isom_set_sample_rap_group(file, sti[j].track_num, i+1, 0);
+				}
+				else if (has_roll) {
+					gf_isom_set_sample_roll_group(file, sti[j].track_num, i+1, (s16) roll_distance);
+				}
+			}
+
+			if (sample->data) {
+				gf_free(sample->data);
+				sample->data = NULL;
+			}
 			sample->dataLength = 0;
 		}
 		gf_isom_sample_del(&sample);
@@ -2230,18 +2347,89 @@
 	return GF_OK;
 }
 
+
+static u32 hevc_get_tile_id(HEVCState *hevc, u32 *tile_x, u32 *tile_y, u32 *tile_width, u32 *tile_height)
+{
+	HEVCSliceInfo *si = &hevc->s_info;
+	u32 i, tbX, tbY, PicWidthInCtbsY, PicHeightInCtbsY, tileX, tileY, oX, oY, val;
+	PicWidthInCtbsY = si->sps->width / si->sps->max_CU_width;
+	PicHeightInCtbsY = si->sps->height / si->sps->max_CU_width;
+
+	tbX = si->slice_segment_address % PicWidthInCtbsY;
+	tbY = si->slice_segment_address / PicWidthInCtbsY;
+
+	tileX = tileY = 0;
+	oX = oY = 0;
+	for (i=0; i<si->pps->num_tile_columns; i++) {
+		if (si->pps->uniform_spacing_flag) {
+			if (i<si->pps->num_tile_columns-1) {
+				val = (i+1)*PicWidthInCtbsY / si->pps->num_tile_columns - (i)*PicWidthInCtbsY / si->pps->num_tile_columns;
+			} else {
+				val = (i)*PicWidthInCtbsY / si->pps->num_tile_columns - (i-1)*PicWidthInCtbsY / si->pps->num_tile_columns;
+			}
+		} else {
+			if (i<si->pps->num_tile_columns-1) {
+				val = si->pps->column_width[i];
+			} else {
+				val = (PicWidthInCtbsY - si->pps->column_width[i-1]);
+			}
+		}
+		*tile_x = oX;
+		*tile_width = val;
+
+		if (oX >= tbX) break;
+		oX += val;
+		tileX++;
+	}
+	for (i=0; i<si->pps->num_tile_rows; i++) {
+		if (si->pps->uniform_spacing_flag) {
+			if (i<si->pps->num_tile_rows-1) {
+				val = (i+1)*PicHeightInCtbsY / si->pps->num_tile_rows - (i)*PicHeightInCtbsY / si->pps->num_tile_rows;
+			} else {
+				val = (i)*PicHeightInCtbsY / si->pps->num_tile_rows - (i-1)*PicHeightInCtbsY / si->pps->num_tile_rows;
+			}
+		} else {
+			if (i<si->pps->num_tile_rows-1) {
+				val = si->pps->row_height[i];
+			} else {
+				val = (PicHeightInCtbsY - si->pps->row_height[i-1]);
+			}
+		}
+		*tile_y = oY;
+		*tile_height = val;
+
+		if (oY >= tbY) break;
+		oY += val;
+		tileY++;
+	}
+	*tile_x = *tile_x * si->sps->max_CU_width;
+	*tile_y = *tile_y * si->sps->max_CU_width;
+	*tile_width = *tile_width * si->sps->max_CU_width;
+	*tile_height = *tile_height * si->sps->max_CU_width;
+
+	return tileX + tileY * si->pps->num_tile_columns;
+}
+
+typedef struct
+{
+	u32 track, track_id;
+	u32 tx, ty, tw, th;
+	u32 data_offset;
+	GF_BitStream *sample_data;
+} HEVCTileImport;
+
 GF_EXPORT
 GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file)
 {
 #if defined(GPAC_DISABLE_HEVC) || defined(GPAC_DISABLE_AV_PARSERS)
 	return GF_NOT_SUPPORTED;
 #else
-	u32 i, j, cur_tile, count, stype, track, nb_tracks, di, nalu_size_length;
-	s32 pps_idx=-1;
+	u32 i, j, cur_tile, count, stype, track, nb_tracks, di, nalu_size_length, tx, ty, tw, th;
+	s32 pps_idx=-1, ret;
+	u8 trefidx;
 	GF_Err e;
-//	HEVCSliceInfo n_state;
 	HEVCState hevc;
-	u32 *tiles_track;
+	HEVCTileImport *tiles;
 	GF_HEVCConfig *hvcc;
 
 	track = 0;
@@ -2266,10 +2454,20 @@
 	count = gf_list_count(hvcc->param_array);
 	for (i=0; i<count; i++) {
 		GF_HEVCParamArray *ar = gf_list_get(hvcc->param_array, i);
-		if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-			GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, 0);
-			if (sl)
+		for (j=0; j < gf_list_count(ar->nalus); j++) {
+			GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, j);
+			if (!sl) continue;
+			switch (ar->type) {
+			case GF_HEVC_NALU_PIC_PARAM:
 				pps_idx = gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
+				break;
+			case GF_HEVC_NALU_SEQ_PARAM:
+				pps_idx = gf_media_hevc_read_sps(sl->data, sl->size, &hevc);
+				break;
+			case GF_HEVC_NALU_VID_PARAM:
+				pps_idx = gf_media_hevc_read_vps(sl->data, sl->size, &hevc);
+				break;
+			}
 		}
 	}
 	gf_odf_hevc_cfg_del(hvcc);
@@ -2277,20 +2475,27 @@
 
 	if (pps_idx==-1) return GF_BAD_PARAM;
 	if (! hevc.pps[pps_idx].tiles_enabled_flag) return GF_OK;
-
 	nb_tracks = hevc.pps[pps_idx].num_tile_columns * hevc.pps[pps_idx].num_tile_rows;
-	tiles_track = gf_malloc(sizeof(u32) * nb_tracks);
+	tiles = gf_malloc(sizeof(HEVCTileImport) * nb_tracks);
+
+	//first clone tracks
 	for (i=0; i<nb_tracks; i++) {
-		e = gf_isom_clone_track(file, track, file, 0, &tiles_track[i] );
+		e = gf_isom_clone_track(file, track, file, 0, &tiles[i].track );
 		if (e) goto err_exit;
-
-		gf_isom_set_track_reference(file, track, GF_4CC('d','o','n','d') , gf_isom_get_track_id(file, tiles_track[i]) );
+		tiles[i].track_id = gf_isom_get_track_id(file, tiles[i].track);
+		gf_isom_hevc_set_tile_config(file, tiles[i].track, 1, NULL);
+	}
+	//then setup track references (done in two pass otherwise we would clone the tref box ...)
+	for (i=0; i<nb_tracks; i++) {
+		gf_isom_set_track_reference(file, tiles[i].track, GF_ISOM_REF_TBAS, gf_isom_get_track_id(file, track) );
+		gf_isom_set_track_reference(file, track, GF_ISOM_REF_SCAL, tiles[i].track_id) ;
 	}
 
 	count = gf_isom_get_sample_count(file, track);
 	for (i=0; i<count; i++) {
 		u8 *data;
 		u32 size;
+		GF_BitStream *src_bs;
 		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		GF_ISOSample *sample = gf_isom_get_sample(file, track, i+1, &di);
 
@@ -2300,20 +2505,27 @@
 		sample->dataLength = 0;
 
 		for (j=0; j<nb_tracks; j++) {
-			e = gf_isom_add_sample(file, tiles_track[j], 1, sample);
-			if (e)
-				goto err_exit;
+			tiles[j].data_offset = 0;
+			tiles[j].sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			tiles[j].data_offset = 0;
 		}
+
 		sample->data = (char *) data;
 		cur_tile = 0;
 
 		while (size) {
+			u8 temporal_id, layer_id;
 			u8 nal_type = 0;
 			u32 nalu_size = 0;
 			for (j=0; j<nalu_size_length; j++) {
 				nalu_size = (nalu_size<<8) + data[j];
 			}
-			nal_type = (data[nalu_size_length] & 0x7E) >> 1;
+			src_bs = gf_bs_new((const char *) data + nalu_size_length, nalu_size, GF_BITSTREAM_READ);
+			ret = gf_media_hevc_parse_nalu(src_bs, &hevc, &nal_type, &temporal_id, &layer_id);
+			gf_bs_del(src_bs);
+			//error parsing NAL, set nal to fallback to regular import
+			if (ret<0) nal_type = GF_HEVC_NALU_VID_PARAM;
+
 			switch (nal_type) {
 			case GF_HEVC_NALU_SLICE_TRAIL_N:
 			case GF_HEVC_NALU_SLICE_TRAIL_R:
@@ -2329,11 +2541,37 @@
 			case GF_HEVC_NALU_SLICE_CRA:
 			case GF_HEVC_NALU_SLICE_RADL_R:
 			case GF_HEVC_NALU_SLICE_RASL_R:
-				//ret = hevc_parse_slice_segment(bs, hevc, &n_state);
-				e = gf_isom_append_sample_data(file, tiles_track[cur_tile], (char *) data, nalu_size + nalu_size_length);
+				tx = ty = tw = th = 0;
+				cur_tile = hevc_get_tile_id(&hevc, &tx, &ty, &tw, &th);
+				if (cur_tile>=nb_tracks) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC Tiles] Tile index %d is greater than number of tiles %d in PPS\n", cur_tile, nb_tracks));
+					e = GF_NON_COMPLIANT_BITSTREAM;
+				} else {
+					gf_bs_write_data(tiles[cur_tile].sample_data, (char *) data, nalu_size + nalu_size_length);
+					tiles[cur_tile].tx = tx;
+					tiles[cur_tile].ty = ty;
+					tiles[cur_tile].tw = tw;
+					tiles[cur_tile].th = th;
+				}
 				if (e)
 					goto err_exit;
-				cur_tile++;
+
+				//write extractor (12 = 2*nalu_size_length + 4 bytes)
+				gf_bs_write_int(bs, 2*nalu_size_length + 4, 8*nalu_size_length);
+				gf_bs_write_int(bs, 0, 1);
+				gf_bs_write_int(bs, 49, 6); //extractor
+				gf_bs_write_int(bs, layer_id, 6);
+				gf_bs_write_int(bs, temporal_id, 3);
+				//set ref track index
+				trefidx = (u8) gf_isom_has_track_reference(file, track, GF_ISOM_REF_SCAL, tiles[cur_tile].track_id);
+				gf_bs_write_int(bs, trefidx, 8);
+				// no sample offset
+				gf_bs_write_int(bs, 0, 8);
+				// data offset: we start from last NAL written in this sample in this tile track
+				gf_bs_write_int(bs, tiles[cur_tile].data_offset, 8*nalu_size_length);
+				gf_bs_write_int(bs, nalu_size + nalu_size_length, 8*nalu_size_length);
+				tiles[cur_tile].data_offset += nalu_size + nalu_size_length;
+
 				break;
 			default:
 				gf_bs_write_data(bs, (char *) data, nalu_size + nalu_size_length);
@@ -2348,11 +2586,56 @@
 
 		e = gf_isom_update_sample(file, track, i+1, sample, 1);
 		if (e) goto err_exit;
+
+		gf_free(sample->data);
+		sample->data = NULL;
+
+		for (j=0; j<nb_tracks; j++) {
+			sample->dataLength = 0;
+			gf_bs_get_content(tiles[j].sample_data, &sample->data, &sample->dataLength);
+			e = gf_isom_add_sample(file, tiles[j].track, 1, sample);
+			if (e) goto err_exit;
+			gf_bs_del(tiles[j].sample_data);
+			tiles[j].sample_data = NULL;
+			gf_free(sample->data);
+			sample->data = NULL;
+		}
+
 		gf_isom_sample_del(&sample);
+
 	}
 
+
+	for (i=0; i<nb_tracks; i++) {
+		char data[11];
+		u32 width, height;
+		s32 translation_x, translation_y;
+		s16 layer;
+		GF_BitStream *bs = gf_bs_new(data, 11, GF_BITSTREAM_WRITE);
+		gf_bs_write_u16(bs, tiles[i].track);
+		gf_bs_write_int(bs, 1, 2);
+		gf_bs_write_int(bs, 0, 1);//not full frame
+		gf_bs_write_int(bs, 0, 5);
+		gf_bs_write_u16(bs, tiles[i].tx);
+		gf_bs_write_u16(bs, tiles[i].ty);
+		gf_bs_write_u16(bs, tiles[i].tw);
+		gf_bs_write_u16(bs, tiles[i].th);
+		gf_bs_del(bs);
+
+		gf_isom_add_sample_group_info(file, tiles[i].track, GF_4CC('t','r','i','f'), data, 11, 1, &di);
+
+		gf_isom_set_visual_info(file, tiles[i].track, 1, tiles[i].tw, tiles[i].th);
+
+		gf_isom_get_track_layout_info(file, track, &width, &height, &translation_x, &translation_y, &layer);
+		gf_isom_set_track_layout_info(file, tiles[i].track, width<<16, height<<16, translation_x, translation_y, layer);
+	}
+
+
 err_exit:
-	gf_free(tiles_track);
+	gf_free(tiles);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMF] Couldnot split HEVC tiles into tracks: %s\n", gf_error_to_string(e) ));
+	}
 	return e;
 #endif
 }
@@ -2373,6 +2656,7 @@
 GF_EXPORT
 GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec)
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	u8 NbBits;
 	u32 i, TrackNum, descIndex, j, count;
 	u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess, nb_samp, nb_done;
@@ -2435,6 +2719,12 @@
 		e = gf_isom_clone_track(input, i+1, output, 0, &TrackNum);
 		if (e) goto err_exit;
 
+		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);
+		}
+
 		//if few samples don't fragment track
 		count = gf_isom_get_sample_count(input, i+1);
 		if (count<=2) {
@@ -2448,12 +2738,12 @@
 		//otherwise setup fragmented
 		else {
 			gf_isom_get_fragment_defaults(input, i+1,
-										 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+			                              &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);
+			                                 defaultDescriptionIndex, defaultDuration,
+			                                 defaultSize, (u8) defaultRandomAccess,
+			                                 defaultPadding, defaultDegradationPriority);
 			if (e) goto err_exit;
 
 			GF_SAFEALLOC(tf, GF_TrackFragmenter);
@@ -2526,7 +2816,7 @@
 
 				/*copy subsample information*/
 				e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, GF_FALSE);
-				if (e) 
+				if (e)
 					goto err_exit;
 
 				gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
@@ -2538,9 +2828,9 @@
 				tf->SampleNum += 1;
 
 				//end of track fragment or track
-				if ((tf->SampleNum==tf->SampleCount) || 
-                    /* TODO: should probably test the time position (not only duratino) to avoid drift */
-                    (tf->FragmentLength*1000 >= MaxFragmentDuration*tf->TimeScale)) {
+				if ((tf->SampleNum==tf->SampleCount) ||
+				        /* TODO: should probably test the time position (not only duratino) to avoid drift */
+				        (tf->FragmentLength*1000 >= MaxFragmentDuration*tf->TimeScale)) {
 					gf_isom_sample_del(&next);
 					sample = next = NULL;
 					tf->FragmentLength = 0;
@@ -2567,124 +2857,12 @@
 	else gf_isom_close(output);
 	gf_set_progress("ISO File Fragmenting", nb_samp, nb_samp);
 	return e;
-}
-
-
-GF_EXPORT
-GF_Err gf_media_split_tiles(GF_ISOFile *file)
-{
-#if defined(GPAC_DISABLE_HEVC) || defined(GPAC_DISABLE_AV_PARSERS)
-	return GF_NOT_SUPPORTED;
 #else
-	u32 i, j, count, stype, track, nb_tracks, di, nalu_size_length;
-	s32 pps_idx=-1;
-//	GF_Err e;
-//	HEVCSliceInfo n_state;
-	HEVCState hevc;
-	u32 *tiles_track;
-	GF_HEVCConfig *hvcc;
-
-	track = 0;
-	for (i=0; i<gf_isom_get_track_count(file); i++) {
-		stype = gf_isom_get_media_subtype(file, i+1, 1);
-		switch (stype) {
-		case GF_ISOM_SUBTYPE_HVC1:
-		case GF_ISOM_SUBTYPE_HEV1:
-
-			if (track) return GF_NOT_SUPPORTED;
-			track = i+1;
-			break;
-		default:
-			break;
-		}
-	}
-	if (!track) return GF_NOT_SUPPORTED;
-
-	hvcc = gf_isom_hevc_config_get(file, track, 1);
-	nalu_size_length = hvcc->nal_unit_size;
-
-	count = gf_list_count(hvcc->param_array);
-	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *ar = gf_list_get(hvcc->param_array, i);
-		if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-			GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, 0);
-			if (sl)
-				pps_idx = gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
-		}
-	}
-	gf_odf_hevc_cfg_del(hvcc);
-
-
-	if (pps_idx==-1) return GF_BAD_PARAM;
-	if (! hevc.pps[pps_idx].tiles_enabled_flag) return GF_OK;
-
-	nb_tracks = hevc.pps[pps_idx].num_tile_columns * hevc.pps[pps_idx].num_tile_rows;
-	tiles_track = gf_malloc(sizeof(u32) * nb_tracks);
-	for (i=0; i<nb_tracks; i++) {
-		gf_isom_clone_track(file, track, file, 0, &tiles_track[i] );
-	}
-
-	count = gf_isom_get_sample_count(file, track);
-	for (i=0; i<nb_tracks; i++) {
-		u8 *data;
-		u32 size;
-		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		GF_ISOSample *sample = gf_isom_get_sample(file, track, i+1, &di);
-
-	
-		data = (u8 *) sample->data;
-		size = sample->dataLength;
-		sample->data = NULL;
-		sample->dataLength = 0;
-
-		for (j=0; j<nb_tracks; j++) {
-			gf_isom_add_sample(file, tiles_track[i], 1, sample);
-		}
-
-		while (size) {
-			u8 nal_type = 0;
-			u32 nalu_size = 0;
-			for (j=0; j<nalu_size_length; j++) {
-				nalu_size = (nalu_size<<8) + data[j];
-			}
-			nal_type = (data[nalu_size_length] & 0x7E) >> 1;
-			switch (nal_type) {
-			case GF_HEVC_NALU_SLICE_TRAIL_N:
-			case GF_HEVC_NALU_SLICE_TRAIL_R:
-			case GF_HEVC_NALU_SLICE_TSA_N:
-			case GF_HEVC_NALU_SLICE_TSA_R:
-			case GF_HEVC_NALU_SLICE_STSA_N:
-			case GF_HEVC_NALU_SLICE_STSA_R:
-			case GF_HEVC_NALU_SLICE_BLA_W_LP:
-			case GF_HEVC_NALU_SLICE_BLA_W_DLP:
-			case GF_HEVC_NALU_SLICE_BLA_N_LP:
-			case GF_HEVC_NALU_SLICE_IDR_W_DLP:
-			case GF_HEVC_NALU_SLICE_IDR_N_LP:
-			case GF_HEVC_NALU_SLICE_CRA:
-			case GF_HEVC_NALU_SLICE_RADL_R:
-			case GF_HEVC_NALU_SLICE_RASL_R:
-				//ret = hevc_parse_slice_segment(bs, hevc, &n_state);
-				gf_isom_append_sample_data(file, track, (char *) data, nalu_size + nalu_size_length);
-				break;
-			default:
-				gf_bs_write_data(bs, (char *) data, nalu_size + nalu_size_length);
-				break;
-			}
-			data += nalu_size + nalu_size_length;
-			size -= nalu_size + nalu_size_length;
-		}
-		gf_free(data);
-		gf_bs_get_content(bs, &sample->data, &sample->dataLength);
-		gf_bs_del(bs);
-
-		gf_isom_update_sample(file, track, i+1, sample, 1);
-		gf_isom_sample_del(&sample);
-	}
+	return GF_NOT_SUPPORTED;
+#endif /* GPAC_DISABLE_ISOM_WRITE */
+}
 
-	return GF_OK;
-#endif //GPAC_DISABLE_HEVC
 
-}
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/m2ts_mux.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/m2ts_mux.c Changed

@@ -29,18 +29,16 @@
 
 #if !defined(GPAC_DISABLE_MPEG2TS_MUX)
 
-/*num ms between PCR*/
-#define PCR_UPDATE_MS	200
-/*90khz internal delay between two updates for instant bitrate compute per stream*/
+/*90khz internal delay between two updates for bitrate compute per stream */
 #define BITRATE_UPDATE_WINDOW	90000
-/* length of adaptation_field_length; */ 
+/* length of adaptation_field_length; */
 #define ADAPTATION_LENGTH_LENGTH 1
 /* discontinuty flag, random access flag ... */
-#define ADAPTATION_FLAGS_LENGTH 1 
-/* length of adaptation_extension_field_length; */ 
+#define ADAPTATION_FLAGS_LENGTH 1
+/* length of adaptation_extension_field_length; */
 #define ADAPTATION_EXTENSION_LENGTH_LENGTH 1
 /* AF des flags and co... */
-#define ADAPTATION_EXTENSION_FLAGS_LENGTH 1 
+#define ADAPTATION_EXTENSION_FLAGS_LENGTH 1
 /* length of encoded pcr */
 #define PCR_LENGTH 6
 
@@ -50,16 +48,19 @@
 	if (a->sec==b->sec) return (a->nanosec<b->nanosec) ? 1 : 0;
 	return 1;
 }
+static GFINLINE Bool gf_m2ts_time_equal(GF_M2TS_Time *a, GF_M2TS_Time *b) {
+	return ((a->sec==b->sec) && (a->nanosec == b->nanosec) );
+}
 static GFINLINE Bool gf_m2ts_time_less_or_equal(GF_M2TS_Time *a, GF_M2TS_Time *b) {
 	if (a->sec>b->sec) return 0;
 	if (a->sec==b->sec) return (a->nanosec>b->nanosec) ? 0 : 1;
 	return 1;
 }
 
-static GFINLINE void gf_m2ts_time_inc(GF_M2TS_Time *time, u32 delta_inc_num, u32 delta_inc_den)
+static GFINLINE void gf_m2ts_time_inc(GF_M2TS_Time *time, u64 delta_inc_num, u32 delta_inc_den)
 {
 	u64 n_sec;
-	u32 sec;
+	u64 sec;
 
 	/*couldn't compute bitrate - we need to have more info*/
 	if (!delta_inc_den) return;
@@ -67,7 +68,7 @@
 	sec = delta_inc_num / delta_inc_den;
 
 	if (sec) {
-		time->sec += sec;
+		time->sec += (u32) sec;
 		sec *= delta_inc_den;
 		delta_inc_num = delta_inc_num % sec;
 	}
@@ -82,13 +83,24 @@
 	}
 }
 
+static GFINLINE s32 gf_m2ts_time_diff_us(GF_M2TS_Time *a, GF_M2TS_Time *b)
+{
+	s32 drift = b->nanosec;
+	drift -= a->nanosec;
+	drift /= 1000;
+	if (a->sec != b->sec) {
+		drift += (b->sec - a->sec) * 1000000;
+	}
+	return drift;
+}
+
 /************************************
- * Section-related functions 
+ * Section-related functions
  ************************************/
 void gf_m2ts_mux_table_update(GF_M2TS_Mux_Stream *stream, u8 table_id, u16 table_id_extension,
-						   u8 *table_payload, u32 table_payload_length, 
-						   Bool use_syntax_indicator, Bool private_indicator,
-						   Bool use_checksum) 
+                              u8 *table_payload, u32 table_payload_length,
+                              Bool use_syntax_indicator, Bool private_indicator,
+                              Bool use_checksum)
 {
 	u32 overhead_size;
 	u32 offset;
@@ -136,11 +148,11 @@
 	case GF_M2TS_TABLE_ID_TDT:
 	case GF_M2TS_TABLE_ID_TOT:
 	case GF_M2TS_TABLE_ID_BAT:
-		maxSectionLength = 1024; 
+		maxSectionLength = 1024;
 		break;
 	case GF_M2TS_TABLE_ID_MPEG4_BIFS:
 	case GF_M2TS_TABLE_ID_MPEG4_OD:
-		maxSectionLength = 4096; 
+		maxSectionLength = 4096;
 		break;
 	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Cannot create sections for table id %d\n", stream->pid, table_id));
@@ -149,10 +161,10 @@
 
 	overhead_size = SECTION_HEADER_LENGTH;
 	if (use_syntax_indicator) overhead_size += SECTION_ADDITIONAL_HEADER_LENGTH + CRC_LENGTH;
-	
+
 	section_number = 0;
 	nb_sections = 1;
-	while (nb_sections*(maxSectionLength - overhead_size)<table_payload_length) nb_sections++; 
+	while (nb_sections*(maxSectionLength - overhead_size)<table_payload_length) nb_sections++;
 
 	switch (table_id) {
 	case GF_M2TS_TABLE_ID_PMT:
@@ -162,7 +174,7 @@
 	default:
 		break;
 	}
-	
+
 	prev_sec = NULL;
 	offset = 0;
 	while (offset < table_payload_length) {
@@ -181,10 +193,10 @@
 		/* first header (not included in section length */
 		gf_bs_write_int(bs,	table_id, 8);
 		gf_bs_write_int(bs,	use_syntax_indicator, 1);
-		gf_bs_write_int(bs,	private_indicator, 1); 
+		gf_bs_write_int(bs,	private_indicator, 1);
 		gf_bs_write_int(bs,	3, 2);  /* reserved bits are all set */
 		gf_bs_write_int(bs,	section->length - SECTION_HEADER_LENGTH, 12);
-	
+
 		if (use_syntax_indicator) {
 			/* second header */
 			gf_bs_write_int(bs,	table_id_extension, 16);
@@ -198,24 +210,24 @@
 
 		gf_bs_write_data(bs, (char *) table_payload + offset, section->length - overhead_size);
 		offset += section->length - overhead_size;
-	
+
 		if (use_syntax_indicator) {
 			/* place holder for CRC */
 			gf_bs_write_u32(bs, 0);
 		}
 
-		gf_bs_get_content(bs, (char**) &section->data, &section->length); 
+		gf_bs_get_content(bs, (char**) &section->data, &section->length);
 		gf_bs_del(bs);
 
 		if (use_syntax_indicator) {
 			u32 CRC;
-			CRC = gf_crc_32((char *) section->data,section->length-CRC_LENGTH); 
+			CRC = gf_crc_32((char *) section->data,section->length-CRC_LENGTH);
 			section->data[section->length-4] = (CRC >> 24) & 0xFF;
 			section->data[section->length-3] = (CRC >> 16) & 0xFF;
 			section->data[section->length-2] = (CRC >> 8) & 0xFF;
 			section->data[section->length-1] = CRC & 0xFF;
 		}
-	
+
 		if (prev_sec) prev_sec->next = section;
 		else table->section = section;
 		prev_sec = section;
@@ -230,9 +242,9 @@
 void gf_m2ts_mux_table_update_bitrate(GF_M2TS_Mux *mux, GF_M2TS_Mux_Stream *stream)
 {
 	GF_M2TS_Mux_Table *table;
-	
+
 	/*update PMT*/
-	if (stream->table_needs_update) 
+	if (stream->table_needs_update)
 		stream->process(mux, stream);
 
 	stream->bit_rate = 0;
@@ -260,9 +272,9 @@
 }
 
 void gf_m2ts_mux_table_update_mpeg4(GF_M2TS_Mux_Stream *stream, u8 table_id, u16 table_id_extension,
-						   char *table_payload, u32 table_payload_length, 
-						   Bool use_syntax_indicator, Bool private_indicator,
-						   Bool increment_version_number, Bool use_checksum) 
+                                    char *table_payload, u32 table_payload_length,
+                                    Bool use_syntax_indicator, Bool private_indicator,
+                                    Bool increment_version_number, Bool use_checksum)
 {
 	GF_SLHeader hdr;
 	u32 overhead_size;
@@ -307,7 +319,7 @@
 
 	overhead_size = SECTION_HEADER_LENGTH;
 	if (use_syntax_indicator) overhead_size += SECTION_ADDITIONAL_HEADER_LENGTH + CRC_LENGTH;
-	
+
 	section_number = 0;
 	nb_sections = 1;
 	hdr = stream->sl_header;
@@ -325,14 +337,14 @@
 			offset += maxSectionLength - overhead_size - sl_size;
 			nb_sections++;
 		}
-	}	
+	}
 	prev_sec = NULL;
 	offset = 0;
 	hdr = stream->sl_header;
 	while (offset < table_payload_length) {
 		u32 remain;
 		char *slhdr;
-		u32 slhdr_size;		
+		u32 slhdr_size;
 		GF_SAFEALLOC(section, GF_M2TS_Mux_Section);
 
 		hdr.accessUnitEndFlag = (section_number+1==nb_sections) ? stream->sl_header.accessUnitEndFlag : 0;
@@ -352,10 +364,10 @@
 		/* first header (not included in section length */
 		gf_bs_write_int(bs,	table_id, 8);
 		gf_bs_write_int(bs,	use_syntax_indicator, 1);
-		gf_bs_write_int(bs,	private_indicator, 1); 
+		gf_bs_write_int(bs,	private_indicator, 1);
 		gf_bs_write_int(bs,	3, 2);  /* reserved bits are all set */
 		gf_bs_write_int(bs,	section->length - SECTION_HEADER_LENGTH, 12);
-	
+
 		if (use_syntax_indicator) {
 			/* second header */
 			gf_bs_write_int(bs,	table_id_extension, 16);
@@ -373,24 +385,24 @@
 		/*write sl data*/
 		gf_bs_write_data(bs, (char *) table_payload + offset, sl_size);
 		offset += sl_size;
-	
+
 		if (use_syntax_indicator) {
 			/* place holder for CRC */
 			gf_bs_write_u32(bs, 0);
 		}
 
-		gf_bs_get_content(bs, (char**) &section->data, &section->length); 
+		gf_bs_get_content(bs, (char**) &section->data, &section->length);
 		gf_bs_del(bs);
 
 		if (use_syntax_indicator) {
 			u32 CRC;
-			CRC = gf_crc_32((char *) section->data,section->length-CRC_LENGTH); 
+			CRC = gf_crc_32((char *) section->data,section->length-CRC_LENGTH);
 			section->data[section->length-4] = (CRC >> 24) & 0xFF;
 			section->data[section->length-3] = (CRC >> 16) & 0xFF;
 			section->data[section->length-2] = (CRC >> 8) & 0xFF;
 			section->data[section->length-1] = CRC & 0xFF;
 		}
-	
+
 		if (prev_sec) prev_sec->next = section;
 		else table->section = section;
 		prev_sec = section;
@@ -405,11 +417,11 @@
 	/*MPEG-4 tables are input streams for the mux, the bitrate is updated when fetching AUs*/
 }
 
-static u32 gf_m2ts_add_adaptation(GF_M2TS_Mux_Program *prog, GF_BitStream *bs, u16 pid,  
-				   Bool has_pcr, u64 pcr_time, 
-				   Bool is_rap, 
-				   u32 padding_length,
-				   char *af_descriptors, u32 af_descriptors_size)
+static u32 gf_m2ts_add_adaptation(GF_M2TS_Mux_Program *prog, GF_BitStream *bs, u16 pid,
+                                  Bool has_pcr, u64 pcr_time,
+                                  Bool is_rap,
+                                  u32 padding_length,
+                                  char *af_descriptors, u32 af_descriptors_size)
 {
 	u32 adaptation_length;
 
@@ -424,7 +436,7 @@
 	gf_bs_write_int(bs,	0, 1);			// discontinuity indicator
 	gf_bs_write_int(bs,	is_rap, 1);		// random access indicator
 	gf_bs_write_int(bs,	0, 1);			// es priority indicator
-	gf_bs_write_int(bs,	has_pcr, 1);	// PCR_flag 
+	gf_bs_write_int(bs,	has_pcr, 1);	// PCR_flag
 	gf_bs_write_int(bs,	0, 1);			// OPCR flag
 	gf_bs_write_int(bs,	0, 1);			// splicing point flag
 	gf_bs_write_int(bs,	0, 1);			// transport private data flag
@@ -432,12 +444,12 @@
 	if (has_pcr) {
 		u64 PCR_base, PCR_ext;
 		PCR_base = pcr_time/300;
-		gf_bs_write_long_int(bs, PCR_base, 33); 
+		gf_bs_write_long_int(bs, PCR_base, 33);
 		gf_bs_write_int(bs,	0, 6); // reserved
 		PCR_ext = pcr_time - PCR_base*300;
 		gf_bs_write_long_int(bs, PCR_ext, 9);
 		if (prog->last_pcr > pcr_time) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Sending PCR "LLD" earlier than previous PCR "LLD" - drift %f sec\n", pid, pcr_time, prog->last_pcr, (prog->last_pcr - pcr_time) /27000000.0 ));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Sending PCR "LLD" earlier than previous PCR "LLD" - drift %f sec - discontinuity set\n", pid, pcr_time, prog->last_pcr, (prog->last_pcr - pcr_time) /27000000.0 ));
 		}
 		prog->last_pcr = pcr_time;
 
@@ -456,23 +468,30 @@
 		gf_bs_write_int(bs,	0, 1);			// piecewise_rate_flag
 		gf_bs_write_int(bs,	0, 1);			// seamless_splice_flag
 		gf_bs_write_int(bs,	0, 1);			// af_descriptor_not_present_flag
-		gf_bs_write_int(bs,	1, 4);			// reserved
-	
+		gf_bs_write_int(bs,	0xF, 4);			// reserved
+
 		gf_bs_write_data(bs, af_descriptors, af_descriptors_size);
 	}
 
 	gf_bs_write_byte(bs, 0xFF, padding_length); // stuffing byte
-	
+
 	return adaptation_length + ADAPTATION_LENGTH_LENGTH;
 }
 
+//#define USE_AF_STUFFING
+
 void gf_m2ts_mux_table_get_next_packet(GF_M2TS_Mux_Stream *stream, char *packet)
 {
 	GF_BitStream *bs;
 	GF_M2TS_Mux_Table *table;
 	GF_M2TS_Mux_Section *section;
-	u32 payload_length, padding_length;
-	u8 adaptation_field_control;
+	u32 payload_length, payload_start;
+	u8 adaptation_field_control = GF_M2TS_ADAPTATION_NONE;
+#ifndef USE_AF_STUFFING
+	u32 padded_bytes=0;
+#else
+	u32 padding_length = 0;
+#endif
 
 	stream->table_needs_send = 0;
 	table = stream->current_table;
@@ -482,7 +501,7 @@
 	assert(section);
 
 	bs = gf_bs_new(packet, 188, GF_BITSTREAM_WRITE);
-	
+
 	gf_bs_write_int(bs,	0x47, 8); // sync
 	gf_bs_write_int(bs,	0, 1);    // error indicator
 	if (stream->current_section_offset == 0) {
@@ -495,10 +514,13 @@
 	if (!stream->current_section_offset) payload_length = 183;
 	else payload_length = 184;
 
+	payload_start = payload_length;
+
 	if (section->length - stream->current_section_offset >= payload_length) {
-		padding_length = 0;
-		adaptation_field_control = GF_M2TS_ADAPTATION_NONE;
-	} else {		
+
+	} else  {
+		//stuffing using adaptation field - seems not well handled by some equipments ...
+#ifdef USE_AF_STUFFING
 		/* in all the following cases, we write an adaptation field */
 		adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
 		/* we need at least 2 bytes for adaptation field headers (no pcr) */
@@ -506,12 +528,18 @@
 		if (section->length - stream->current_section_offset >= payload_length) {
 			padding_length = 0;
 		} else {
-			padding_length = payload_length - section->length + stream->current_section_offset; 
+			padding_length = payload_length - section->length + stream->current_section_offset;
 			payload_length -= padding_length;
 		}
+#else
+		//stuffing according to annex C.3
+		padded_bytes = payload_length - section->length + stream->current_section_offset;
+		payload_length = section->length - stream->current_section_offset;
+#endif
 	}
+
 	assert(payload_length + stream->current_section_offset <= section->length);
-	
+
 	gf_bs_write_int(bs,	0, 1);    /*priority indicator*/
 	gf_bs_write_int(bs,	stream->pid, 13); /*pid*/
 	gf_bs_write_int(bs,	0, 2);    /*scrambling indicator*/
@@ -520,8 +548,10 @@
 	if (stream->continuity_counter < 15) stream->continuity_counter++;
 	else stream->continuity_counter=0;
 
+#ifdef USE_AF_STUFFING
 	if (adaptation_field_control != GF_M2TS_ADAPTATION_NONE)
 		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, 0, 0, 0, padding_length, NULL, 0);
+#endif
 
 	/*pointer field*/
 	if (!stream->current_section_offset) {
@@ -530,9 +560,12 @@
 	}
 	gf_bs_del(bs);
 
-	memcpy(packet+188-payload_length, section->data + stream->current_section_offset, payload_length);
+	memcpy(packet+188-payload_start, section->data + stream->current_section_offset, payload_length);
 	stream->current_section_offset += payload_length;
-	
+#ifndef USE_AF_STUFFING
+	if (padded_bytes) memset(packet+188-payload_start+payload_length, 0xFF, padded_bytes);
+#endif
+
 	if (stream->current_section_offset == section->length) {
 		stream->current_section_offset = 0;
 		stream->current_section = stream->current_section->next;
@@ -555,6 +588,63 @@
 }
 
 
+u32 gf_m2ts_stream_process_sdt(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
+{
+	if (stream->table_needs_update) { /* generate table payload */
+		GF_M2TS_Mux_Program *prog;
+		GF_BitStream *bs;
+		u8 *payload;
+		u32 size;
+
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		gf_bs_write_u16(bs, muxer->ts_id);
+		gf_bs_write_u8(bs, 0xFF);	//reserved future use
+
+		prog = muxer->programs;
+		while (prog) {
+			u32 len = 0;
+			gf_bs_write_u16(bs, prog->number);
+			gf_bs_write_int(bs, 0xFF, 6); //reserved future use
+			gf_bs_write_int(bs, 0, 1); //EIT_schedule_flag
+			gf_bs_write_int(bs, 0, 1); //EIT_present_following_flag
+			gf_bs_write_int(bs, 4, 3); //running status
+			gf_bs_write_int(bs, 0, 1); //free_CA_mode
+
+			if (prog->name) len += (u32) strlen(prog->name);
+			if (prog->provider) len += (u32) strlen(prog->provider);
+
+			if (len) {
+				len += 3;
+				gf_bs_write_int(bs, len + 2, 12);
+				gf_bs_write_u8(bs, GF_M2TS_DVB_SERVICE_DESCRIPTOR);
+				gf_bs_write_u8(bs, len);
+				gf_bs_write_u8(bs, 0x01);
+				len = prog->provider ? (u32) strlen(prog->provider) : 0;
+				gf_bs_write_u8(bs, len);
+				if (prog->provider) gf_bs_write_data(bs, prog->provider, len);
+
+				len = prog->name ? (u32) strlen(prog->name) : 0;
+				gf_bs_write_u8(bs, len);
+				if (prog->name) gf_bs_write_data(bs, prog->name, len);
+			} else {
+				gf_bs_write_int(bs, 0, 12);
+			}
+			prog = prog->next;
+		}
+		gf_bs_get_content(bs, (char**)&payload, &size);
+		gf_bs_del(bs);
+		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_SDT_ACTUAL, muxer->ts_id, payload, size, 1, 0, 0);
+		stream->table_needs_update = 0;
+		stream->table_needs_send = 1;
+		gf_free(payload);
+	}
+	if (stream->table_needs_send)
+		return 1;
+	if (stream->refresh_rate_ms)
+		return 1;
+	return 0;
+}
 
 u32 gf_m2ts_stream_process_pat(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
 {
@@ -579,9 +669,9 @@
 		stream->table_needs_send = 1;
 		gf_free(payload);
 	}
-	if (stream->table_needs_send) 
+	if (stream->table_needs_send)
 		return 1;
-	if (stream->refresh_rate_ms) 
+	if (stream->refresh_rate_ms)
 		return 1;
 	return 0;
 }
@@ -601,7 +691,7 @@
 		gf_bs_write_int(bs,	0x7, 3); // reserved
 		gf_bs_write_int(bs,	stream->program->pcr->pid, 13);
 		gf_bs_write_int(bs,	0xF, 4); // reserved
-	
+
 
 		if (stream->program->loop_descriptors) {
 			for (i=0; i<gf_list_count(stream->program->loop_descriptors); i++) {
@@ -630,39 +720,39 @@
 						break;
 					}
 					es_stream = es_stream->next;
- 				}
+				}
 			}
 
 			bs_iod = gf_bs_new(NULL,0,GF_BITSTREAM_WRITE);
 			gf_odf_write_descriptor(bs_iod, stream->program->iod);
-			gf_bs_get_content(bs_iod, &iod_data, &iod_data_len); 
+			gf_bs_get_content(bs_iod, &iod_data, &iod_data_len);
 			gf_bs_del(bs_iod);
 
 			len = iod_data_len + 4;
-			gf_bs_write_int(bs,	len + info_length, 12); // program info length 
-			
+			gf_bs_write_int(bs,	len + info_length, 12); // program info length
+
 			gf_bs_write_int(bs,	GF_M2TS_MPEG4_IOD_DESCRIPTOR, 8);
 			len = iod_data_len + 2;
 			gf_bs_write_int(bs,	len, 8);
-			
-			/* Scope_of_IOD_label : 
+
+			/* Scope_of_IOD_label :
 				0x10 iod unique a l'int�rieur de programme
 				0x11 iod unoque dans le flux ts */
-			gf_bs_write_int(bs,	2, 8);  
+			gf_bs_write_int(bs,	2, 8);
 
 			gf_bs_write_int(bs,	2, 8);  // IOD_label
-			
+
 			gf_bs_write_data(bs, iod_data, iod_data_len);
 			gf_free(iod_data);
-		}	
+		}
 
 		/*write all other descriptors*/
 		if (stream->program->loop_descriptors) {
 			for (i=0; i<gf_list_count(stream->program->loop_descriptors); i++) {
 				GF_M2TSDescriptor *desc = gf_list_get(stream->program->loop_descriptors, i);
-				gf_bs_write_int(bs,	desc->tag, 8);  
-				gf_bs_write_int(bs,	desc->data_len, 8);  
-				gf_bs_write_data(bs, desc->data, desc->data_len);  
+				gf_bs_write_int(bs,	desc->tag, 8);
+				gf_bs_write_int(bs,	desc->data_len, 8);
+				gf_bs_write_data(bs, desc->data, desc->data_len);
 			}
 		}
 
@@ -690,7 +780,7 @@
 			gf_bs_write_int(bs,	0x7, 3); // reserved
 			gf_bs_write_int(bs,	es->pid, 13);
 			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))
 				es_info_length += 4;
@@ -713,38 +803,38 @@
 			gf_bs_write_int(bs,	es_info_length, 12);
 
 			if (stream->program->iod && !(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,	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
 			}
 
 			if (has_lang) {
-				gf_bs_write_int(bs,	GF_M2TS_ISO_639_LANGUAGE_DESCRIPTOR, 8); 
-				gf_bs_write_int(bs,	3, 8); 
-				gf_bs_write_int(bs,	(es->ifce->lang>>24) & 0xFF, 8); 
-				gf_bs_write_int(bs,	(es->ifce->lang>>16) & 0xFF, 8); 
-				gf_bs_write_int(bs,	es->ifce->lang & 0xFF, 8); 
+				gf_bs_write_int(bs,	GF_M2TS_ISO_639_LANGUAGE_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	3, 8);
+				gf_bs_write_int(bs,	(es->ifce->lang>>24) & 0xFF, 8);
+				gf_bs_write_int(bs,	(es->ifce->lang>>16) & 0xFF, 8);
+				gf_bs_write_int(bs,	es->ifce->lang & 0xFF, 8);
 			}
 
 			switch (es->mpeg2_stream_type) {
 			case GF_M2TS_AUDIO_AC3:
-				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8); 
-				gf_bs_write_int(bs,	4, 8); 
-				gf_bs_write_int(bs,	'A', 8); 
-				gf_bs_write_int(bs,	'C', 8); 
-				gf_bs_write_int(bs,	'-', 8); 
-				gf_bs_write_int(bs,	'3', 8); 
+				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	4, 8);
+				gf_bs_write_int(bs,	'A', 8);
+				gf_bs_write_int(bs,	'C', 8);
+				gf_bs_write_int(bs,	'-', 8);
+				gf_bs_write_int(bs,	'3', 8);
 				break;
 			case GF_M2TS_VIDEO_VC1:
-				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8); 
-				gf_bs_write_int(bs,	4, 8); 
-				gf_bs_write_int(bs,	'V', 8); 
-				gf_bs_write_int(bs,	'C', 8); 
-				gf_bs_write_int(bs,	'-', 8); 
-				gf_bs_write_int(bs,	'1', 8); 
+				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	4, 8);
+				gf_bs_write_int(bs,	'V', 8);
+				gf_bs_write_int(bs,	'C', 8);
+				gf_bs_write_int(bs,	'-', 8);
+				gf_bs_write_int(bs,	'1', 8);
 				break;
 			case GF_M2TS_AUDIO_EC3:
-				gf_bs_write_int(bs,	GF_M2TS_DVB_EAC3_DESCRIPTOR, 8); 
+				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;
 			}
@@ -754,15 +844,15 @@
 				for (i=0; i<gf_list_count(es->loop_descriptors); i++)
 				{
 					GF_M2TSDescriptor *desc = (GF_M2TSDescriptor *)gf_list_get(es->loop_descriptors, i);
-					gf_bs_write_int(bs,	desc->tag, 8); 
-					gf_bs_write_int(bs,	desc->data_len, 8); 
+					gf_bs_write_int(bs,	desc->tag, 8);
+					gf_bs_write_int(bs,	desc->data_len, 8);
 					gf_bs_write_data(bs, desc->data, desc->data_len);
 				}
 			}
 
 			es = es->next;
 		}
-	
+
 		gf_bs_get_content(bs, (char**)&payload, &length);
 		gf_bs_del(bs);
 
@@ -773,9 +863,9 @@
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Updating PMT - Program Number %d - %d streams - size %d%s\n", stream->pid, stream->program->number, nb_streams, length, stream->program->iod ? " - MPEG-4 Systems detected":""));
 	}
-	if (stream->table_needs_send) 
+	if (stream->table_needs_send)
 		return 1;
-	if (stream->refresh_rate_ms) 
+	if (stream->refresh_rate_ms)
 		return 1;
 	return 0;
 }
@@ -789,7 +879,7 @@
 		*cts = (u64) (stream->ts_scale * (s64) *cts);
 		*dts = (u64) (stream->ts_scale * (s64) *dts);
 		if (duration) *duration = (u32) (stream->ts_scale * (u32) *duration);
-		
+
 	}
 	if (!stream->program->initial_ts_set) {
 		u32 nb_bits = (u32) (stream->program->mux->tot_pck_sent - stream->program->num_pck_at_pcr_init) * 1504;
@@ -846,8 +936,9 @@
 	gf_bs_del(bs);
 }
 
-u32 gf_m2ts_stream_process_stream(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
+static u32 gf_m2ts_stream_process_pes(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
 {
+	u64 time_inc;
 	Bool ret = 0;
 
 	if (stream->mpeg2_stream_type==GF_M2TS_SYSTEMS_MPEG4_SECTIONS) {
@@ -855,17 +946,16 @@
 		if (stream->table_needs_send)
 			return stream->scheduling_priority;
 		/*section is not completely sent yet or this is not the first section of the table*/
-		if (stream->current_section && (stream->current_section_offset || stream->current_section!=stream->current_table->section)) 
+		if (stream->current_section && (stream->current_section_offset || stream->current_section!=stream->current_table->section))
 			return stream->scheduling_priority;
 		if (stream->ifce->repeat_rate && stream->tables)
 			ret = stream->program->pcr_init_time ? stream->scheduling_priority : 0;
 	}
 	else if (stream->curr_pck.data_len && stream->pck_offset < stream->curr_pck.data_len) {
 		/*PES packet not completely sent yet*/
-		return stream->scheduling_priority + stream->pcr_priority;
+		return stream->scheduling_priority;
 	}
 
-	stream->pcr_priority = 0;
 	/*PULL mode*/
 	if (stream->ifce->caps & GF_ESI_AU_PULL_CAP) {
 		if (stream->curr_pck.data_len) {
@@ -885,9 +975,9 @@
 	} else {
 		GF_M2TS_Packet *curr_pck;
 
-		if (!stream->pck_first && (stream->ifce->caps & GF_ESI_STREAM_IS_OVER)) 
+		if (!stream->pck_first && (stream->ifce->caps & GF_ESI_STREAM_IS_OVER))
 			return ret;
-		
+
 		/*flush input pipe*/
 		if (stream->ifce->input_ctrl) stream->ifce->input_ctrl(stream->ifce, GF_ESI_INPUT_DATA_FLUSH, NULL);
 
@@ -923,15 +1013,15 @@
 		stream->curr_pck.dts = stream->curr_pck.cts;
 
 	/*initializing the PCR*/
-	if (!stream->program->pcr_init_time) {
+	if (!stream->program->pcr_init_time_set) {
 		if (stream==stream->program->pcr) {
 			if (stream->program->mux->init_pcr_value) {
-				stream->program->pcr_init_time = stream->program->mux->init_pcr_value;
+				stream->program->pcr_init_time = stream->program->mux->init_pcr_value-1;
 			} else {
 				while (!stream->program->pcr_init_time)
 					stream->program->pcr_init_time = gf_rand();
 			}
-
+			stream->program->pcr_init_time_set = 1;
 			stream->program->ts_time_at_pcr_init = muxer->time;
 			stream->program->num_pck_at_pcr_init = muxer->tot_pck_sent;
 
@@ -1006,7 +1096,7 @@
 		/*moving from PES to SL reallocates a new buffer, force discard even in pull mode*/
 		stream->discard_data = 1;
 	}
-		break;
+	break;
 	/*perform LATM encapsulation*/
 	case GF_M2TS_AUDIO_LATM_AAC:
 	{
@@ -1065,7 +1155,7 @@
 		/*since we reallocated the packet data buffer, force a discard in pull mode*/
 		stream->discard_data = 1;
 	}
-		break;
+	break;
 	/*perform ADTS encapsulation*/
 	case GF_M2TS_AUDIO_AAC:
 		if (stream->ifce->decoder_config) {
@@ -1101,15 +1191,15 @@
 		break;
 	case GF_M2TS_METADATA_PES:
 	case GF_M2TS_METADATA_ID3_HLS:
-		{
-			id3_tag_create(&stream->curr_pck.data, &stream->curr_pck.data_len);
-			stream->discard_data = 1;
-		}
-		break;
+	{
+		id3_tag_create(&stream->curr_pck.data, &stream->curr_pck.data_len);
+		stream->discard_data = 1;
+	}
+	break;
 	}
 
 	if (stream->start_pes_at_rap && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP)
-		) {
+	   ) {
 		stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PAT;
 		stream->program->mux->force_pat = GF_TRUE;
 	}
@@ -1120,18 +1210,27 @@
 
 	/*compute next interesting time in TS unit: this will be DTS of next packet*/
 	stream->time = stream->program->ts_time_at_pcr_init;
-	gf_m2ts_time_inc(&stream->time, (u32) stream->curr_pck.dts, 90000);
+	time_inc = stream->curr_pck.dts - stream->program->pcr_offset;
 
-	/*do we need to send a PCR*/
-	if (stream == stream->program->pcr) {
-		if (muxer->real_time) {
-			if (gf_sys_clock() > stream->program->last_sys_clock + PCR_UPDATE_MS)
-				stream->pcr_priority = 1;
+	//this is disabled nd controled through stream->program->pcr_offset
+#if 0
+	//CBR mux: how long does it take to send our data ?
+	if (stream->program->mux->fixed_rate) {
+		u32 nb_pck = 1 + (stream->curr_pck.data_len / 184);
+		u64 send_time = nb_pck * 135360000 /* 188 * 8 * 90000*/ / stream->program->mux->bit_rate;
+		//send_time += stream->max_send_delay;
+		if (send_time<time_inc) {
+			time_inc -= send_time;
 		} else {
-			if (!stream->program->last_dts || (stream->curr_pck.dts > stream->program->last_dts + PCR_UPDATE_MS*90))
-				stream->pcr_priority = 1;
+			time_inc = 0;
 		}
 	}
+#endif
+
+	gf_m2ts_time_inc(&stream->time, time_inc, 90000);
+
+	/*PCR injection is now decided when building TS packet*/
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Next data schedule for %d:%09d - mux time %d:%09d\n", stream->pid, stream->time.sec, stream->time.nanosec, muxer->time.sec, muxer->time.nanosec));
 
 	/*compute instant bitrate*/
@@ -1146,40 +1245,36 @@
 			u64 r = 8*stream->bytes_since_last_time;
 			r*=90000;
 			bitrate = (u32) (r / time_diff);
-			stream->bit_rate = bitrate;
+
+			if (stream->program->mux->fixed_rate || (stream->bit_rate < bitrate)) {
+				stream->bit_rate = bitrate;
+				stream->program->mux->needs_reconfig = 1;
+			}
 			stream->last_br_time = 0;
 			stream->bytes_since_last_time = 0;
 			stream->pes_since_last_time = 0;
-			stream->program->mux->needs_reconfig = 1;
-		}
-	} 
-
-	/* in live with no fixed target rate, we have to always compute the bitrate in case we have a peak (IDR), otherwise the mux time will increase too fast and we will send packets way too fast
-	this is not perfect, we may end up with a too high stream rate and the mux time will increase too slowly, hence packet will be late*/
-	if (stream->program->mux->real_time && !stream->program->mux->fixed_rate && stream->curr_pck.duration) {
-		u64 inst_rate;
-		inst_rate = 8*stream->curr_pck.data_len;
-		inst_rate *= 90000;
-		inst_rate /= stream->curr_pck.duration;
-		inst_rate /= 8;
-		if (inst_rate>stream->bit_rate)
-		{
-			stream->bit_rate = (u32) inst_rate;
-			stream->program->mux->needs_reconfig = 1;
 		}
 	}
 
 	stream->pes_since_last_time ++;
-	return stream->scheduling_priority + stream->pcr_priority;
+	return stream->scheduling_priority;
 }
 
-static GFINLINE u64 gf_m2ts_get_pcr(GF_M2TS_Mux_Program *program)
+static GFINLINE u64 gf_m2ts_get_pcr(GF_M2TS_Mux_Stream *stream)
 {
-	u32 nb_pck = (u32) (program->mux->tot_pck_sent - program->num_pck_at_pcr_init);
-	u64 pcr = 27000000;
-	pcr *= nb_pck*1504;
-	pcr /= program->mux->bit_rate;
-	pcr += program->pcr_init_time;
+	u64 pcr;
+	/*compute PCR*/
+	if (stream->program->mux->fixed_rate ) {
+		u32 nb_pck = (u32) (stream->program->mux->tot_pck_sent - stream->program->num_pck_at_pcr_init);
+		pcr = 27000000;
+		pcr *= nb_pck*1504;
+		pcr /= stream->program->mux->bit_rate;
+		pcr += stream->program->pcr_init_time;
+	}
+	/*in non-realtime mode with no fixed rate we only insert PCR based on DTS */
+	else {
+		pcr = (stream->curr_pck.dts - stream->program->pcr_offset) * 300;
+	}
 	return pcr;
 }
 
@@ -1187,9 +1282,11 @@
 {
 	Bool ignore_next=0;
 	stream->next_payload_size = 0;
+	stream->next_next_payload_size = 0;
+
 	stream->next_pck_flags = 0;
 	stream->copy_from_next_packets = 0;
-	
+
 	if (stream->program->mux->one_au_per_pes) return;
 
 	switch (stream->mpeg2_stream_type) {
@@ -1220,6 +1317,12 @@
 			stream->next_pck_cts = stream->pck_first->cts;
 			stream->next_pck_dts = stream->pck_first->dts;
 			stream->next_pck_flags = stream->pck_first->flags;
+
+			if (!stream->pck_first->next && stream->ifce->input_ctrl) stream->ifce->input_ctrl(stream->ifce, GF_ESI_INPUT_DATA_FLUSH, NULL);
+			if (stream->pck_first->next) {
+				stream->next_next_payload_size = stream->pck_first->next->data_len;
+			}
+
 		}
 	}
 	/*consider we don't have the next AU if:
@@ -1238,12 +1341,18 @@
 		stream->next_pck_cts = 0;
 		stream->next_pck_dts = 0;
 		stream->next_pck_flags = 0;
-	} 
+	}
 
 	if (stream->next_payload_size) {
 		stream->next_payload_size += stream->reframe_overhead;
+		if (stream->next_next_payload_size)
+			stream->next_next_payload_size += stream->reframe_overhead;
 
 		gf_m2ts_remap_timestamps_for_pes(stream, stream->next_pck_flags, &stream->next_pck_dts, &stream->next_pck_cts, NULL);
+
+
+		if (!(stream->next_pck_flags & GF_ESI_DATA_HAS_DTS))
+			stream->next_pck_dts = stream->next_pck_cts;
 	}
 }
 
@@ -1257,7 +1366,7 @@
 	/*if we have next payload ready, compute transmitted size*/
 	if (stream->next_payload_size) {
 		u32 pck_size = stream->curr_pck.data_len - stream->pck_offset;
-		u32 ts_bytes = payload_length;	
+		u32 ts_bytes = payload_length;
 
 		/*finish this AU*/
 		while (ts_bytes < pck_size) {
@@ -1279,8 +1388,11 @@
 			while (ts_bytes < pck_size + stream->next_payload_size) {
 				ts_bytes += 184;
 			}
-			/*don't end next AU in next PES if we don't want to start 2 AUs in one PES*/
-			if (stream->prevent_two_au_start_in_pes && (ts_bytes>pck_size + stream->next_payload_size)) {
+			/*don't end next AU in next PES if we don't want to start 2 AUs in one PES
+			if we don't have the N+2 AU size, don't try to pack it*/
+			if ((stream->prevent_two_au_start_in_pes && (ts_bytes>pck_size + stream->next_payload_size))
+			        || !stream->next_next_payload_size
+			   ) {
 				if (ts_bytes>184)
 					ts_bytes -= 184;
 				else
@@ -1309,8 +1421,8 @@
 			/*if what will remain after copying next AU is less than the minimum safety copy only copy next AU and
 			realign n+2 AU start with PES*/
 			if ((stream->copy_from_next_packets > stream->next_payload_size)
-				&& (stream->copy_from_next_packets - stream->next_payload_size < stream->min_bytes_copy_from_next)
-			) {
+			        && (stream->copy_from_next_packets - stream->next_payload_size < stream->min_bytes_copy_from_next)
+			   ) {
 				stream->copy_from_next_packets = stream->next_payload_size;
 			}
 		}
@@ -1362,9 +1474,9 @@
 	u64 t, dts, cts;
 	u32 pes_len;
 	Bool use_pts, use_dts;
-	
+
 	gf_bs_write_int(bs,	0x1, 24);//packet start code
-	gf_bs_write_u8(bs,	stream->mpeg2_stream_id);// stream id 
+	gf_bs_write_u8(bs,	stream->mpeg2_stream_id);// stream id
 
 	/*next AU start in current PES and current AU began in previous PES, use next AU timing*/
 	if (stream->pck_offset && stream->copy_from_next_packets) {
@@ -1392,14 +1504,14 @@
 
 	if (pes_len>0xFFFF) pes_len = 0;
 	gf_bs_write_int(bs, pes_len, 16); // pes packet length
-	
+
 	gf_bs_write_int(bs, 0x2, 2); // reserved
 	gf_bs_write_int(bs, 0x0, 2); // scrambling
 	gf_bs_write_int(bs, 0x0, 1); // priority
 	gf_bs_write_int(bs, stream->pck_offset ? 0 : 1, 1); // alignment indicator - we could also check start codes to see if we are aligned at slice/video packet level
 	gf_bs_write_int(bs, 0x0, 1); // copyright
 	gf_bs_write_int(bs, 0x0, 1); // original or copy
-	
+
 	gf_bs_write_int(bs, use_pts, 1);
 	gf_bs_write_int(bs, use_dts, 1);
 	gf_bs_write_int(bs, 0x0, 6); //6 flags = 0 (ESCR, ES_rate, DSM_trick, additional_copy, PES_CRC, PES_extension)
@@ -1431,7 +1543,7 @@
 		gf_bs_write_long_int(bs, t, 15);
 		gf_bs_write_int(bs, 1, 1); // marker bit
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Adding PES header at PCR "LLD" - has PTS %d ("LLU") - has DTS %d ("LLU") - Payload length %d\n", stream->pid, gf_m2ts_get_pcr(stream->program)/300, use_pts, cts, use_dts, dts, pes_len));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Adding PES header at PCR "LLD" - has PTS %d ("LLU") - has DTS %d ("LLU") - Payload length %d\n", stream->pid, gf_m2ts_get_pcr(stream)/300, use_pts, cts, use_dts, dts, pes_len));
 
 	return pes_len+4; // 4 = start code + stream_id
 }
@@ -1439,7 +1551,7 @@
 void gf_m2ts_mux_pes_get_next_packet(GF_M2TS_Mux_Stream *stream, char *packet)
 {
 	GF_BitStream *bs;
-	Bool needs_pcr, first_pass, is_rap=0;
+	Bool needs_pcr, first_pass;
 	u32 adaptation_field_control, payload_length, payload_to_copy, padding_length, hdr_len, pos, copy_next;
 
 	assert(stream->pid);
@@ -1447,6 +1559,7 @@
 
 	hdr_len = gf_m2ts_stream_get_pes_header_length(stream);
 
+	adaptation_field_control = GF_M2TS_ADAPTATION_NONE;
 	/*we may need two pass in case we first compute hdr len and TS payload size by considering
 	we concatenate next au start in this PES but finally couldn't do it when computing PES len
 	and AU alignment constraint of the stream*/
@@ -1457,34 +1570,57 @@
 				gf_m2ts_stream_update_data_following(stream);
 			hdr_len = gf_m2ts_stream_get_pes_header_length(stream);
 		}
-		
+
 		adaptation_field_control = GF_M2TS_ADAPTATION_NONE;
 		payload_length = 184 - hdr_len;
 		payload_to_copy = padding_length = 0;
-		is_rap = (hdr_len && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP)) ? GF_TRUE : GF_FALSE;
-		needs_pcr = (hdr_len && (stream == stream->program->pcr) && (stream->pcr_priority || is_rap) ) ? 1 : 0;
+		needs_pcr = 0;
 
-		/*if we forced inserting PAT/PMT before new RAP, also insert PCR here*/
-		if (stream->program->mux->force_pat_pmt_state == GF_SEG_BOUNDARY_FORCE_PCR) {
-			if (stream == stream->program->pcr) {
+		if (stream == stream->program->pcr) {
+			if (hdr_len)
+				needs_pcr = 1;
+			/*if we forced inserting PAT/PMT before new RAP, also insert PCR here*/
+			if (stream->program->mux->force_pat_pmt_state == GF_SEG_BOUNDARY_FORCE_PCR) {
 				stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_NONE;
 				needs_pcr = 1;
 			}
+
+			if (!needs_pcr && (stream->program->mux->real_time || stream->program->mux->fixed_rate) ) {
+				u64 clock;
+				u32 diff;
+				if (stream->program->mux->fixed_rate) {
+					clock = stream->program->mux->tot_pck_sent - stream->program->nb_pck_last_pcr;
+					clock *= 1504*1000000;
+					clock /= stream->program->mux->bit_rate;
+					if (clock >= (stream->program->mux->pcr_update_ms-5) *1000) {
+						needs_pcr = 1;
+					}
+				}
+
+				if (!needs_pcr && stream->program->mux->real_time) {
+					clock = gf_sys_clock_high_res();
+					diff = (u32) (clock - stream->program->sys_clock_at_last_pcr);
+
+					if (diff >= (stream->program->mux->pcr_update_ms-2) *1000) {
+						needs_pcr = 1;
+					}
+				}
+			}
 		}
 
- 		if (needs_pcr) {
+		if (needs_pcr) {
 			/*AF headers + PCR*/
 			payload_length -= 8;
 			adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
 		}
 		if (stream->curr_pck.mpeg2_af_descriptors) {
-			if (adaptation_field_control != GF_M2TS_ADAPTATION_AND_PAYLOAD) {
+			if (adaptation_field_control == GF_M2TS_ADAPTATION_NONE) {
 				payload_length -= 2; //AF header but no PCR
 				adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
 			}
-			payload_length -= 2 + stream->curr_pck.mpeg2_af_descriptors_size; //AF extension field and AF descriptor 
+			payload_length -= 2 + stream->curr_pck.mpeg2_af_descriptors_size; //AF extension field and AF descriptor
 		}
-		
+
 		if (hdr_len) {
 			assert(!stream->pes_data_remain);
 			if (! gf_m2ts_stream_compute_pes_length(stream, payload_length)) {
@@ -1510,7 +1646,7 @@
 	if (payload_to_copy >= payload_length) {
 		padding_length = 0;
 		payload_to_copy = payload_length;
-	} 
+	}
 	/*packet + next packet exceed payload length*/
 	else if (payload_to_copy + copy_next >= payload_length) {
 		padding_length = 0;
@@ -1519,8 +1655,10 @@
 	else {
 		/*AF headers*/
 		if (!needs_pcr) {
-			payload_length -= 2;
-			adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
+			if (adaptation_field_control == GF_M2TS_ADAPTATION_NONE) {
+				payload_length -= 2;
+				adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
+			}
 		}
 		/*cannot add adaptation field for this TS packet with this payload, we need to split in 2 TS packets*/
 		if (payload_length < payload_to_copy + copy_next) {
@@ -1529,18 +1667,29 @@
 			if (payload_to_copy > payload_length)
 				payload_to_copy = payload_length;
 		} else {
-			padding_length = payload_length - payload_to_copy - copy_next; 
+			padding_length = payload_length - payload_to_copy - copy_next;
 			payload_length -= padding_length;
 		}
 	}
 
+#ifndef GPAC_DISABLE_LOG
+	if (hdr_len && gf_log_tool_level_on(GF_LOG_DEBUG, GF_LOG_CONTAINER) ) {
+		u64 pcr = (s64) gf_m2ts_get_pcr(stream)/300;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Start sending PES: PID %d - %d bytes - DTS "LLD" PCR "LLD" (diff %d) - stream time %d:%09d - mux time %d:%09d (%d us ahead of mux time)\n",
+		                                        stream->pid, stream->curr_pck.data_len, stream->curr_pck.dts, pcr, (s64) stream->curr_pck.dts - (s64) pcr,
+		                                        stream->time.sec, stream->time.nanosec, stream->program->mux->time.sec, stream->program->mux->time.nanosec,
+		                                        gf_m2ts_time_diff_us(&stream->program->mux->time, &stream->time)
+		                                       ));
+	}
+#endif
+
 	gf_bs_write_int(bs,	0x47, 8); // sync byte
 	gf_bs_write_int(bs,	0, 1);    // error indicator
 	gf_bs_write_int(bs,	hdr_len ? 1 : 0, 1); // start ind
 	gf_bs_write_int(bs,	0, 1);	  // transport priority
 	gf_bs_write_int(bs,	stream->pid, 13); // pid
 	gf_bs_write_int(bs,	0, 2);    // scrambling
-	gf_bs_write_int(bs,	adaptation_field_control, 2);    // we do not use adaptation field for sections 
+	gf_bs_write_int(bs,	adaptation_field_control, 2);    // we do not use adaptation field for sections
 	gf_bs_write_int(bs,	stream->continuity_counter, 4);   // continuity counter
 	if (stream->continuity_counter < 15) stream->continuity_counter++;
 	else stream->continuity_counter=0;
@@ -1549,22 +1698,28 @@
 		Bool is_rap;
 		u64 pcr = 0;
 		if (needs_pcr) {
-			u32 now = gf_sys_clock();
-			/*compute PCR - we disabled real-time clock for now and only insert PCR based on DTS / CTS*/
-			if (0 && stream->program->mux->real_time) {
-				pcr = gf_m2ts_get_pcr(stream->program);
-			} else {
-				pcr = ( ((stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? stream->curr_pck.dts : stream->curr_pck.cts) - stream->program->pcr_offset) * 300;
-				if (pcr>stream->program->pcr_init_time) pcr -= stream->program->pcr_init_time;
-				else pcr = 0;
+			u64 now = gf_sys_clock_high_res();
+			pcr = gf_m2ts_get_pcr(stream);
+
+			if (stream->program->mux->real_time || stream->program->mux->fixed_rate) {
+				u64 clock;
+				u32 diff = (s32) (now - stream->program->sys_clock_at_last_pcr);
+				if (diff > 5000 + stream->program->mux->pcr_update_ms*1000 ) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sending PCR %d us too late (PCR send rate %d ms)\n", (u32) (diff - stream->program->mux->pcr_update_ms*1000), stream->program->mux->pcr_update_ms ));
+				}
+				clock = stream->program->mux->tot_pck_sent - stream->program->nb_pck_last_pcr;
+				clock *= 1504*1000000;
+				clock /= stream->program->mux->bit_rate;
+
+//				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] PCR diff %d us (PCR send rate %d ms) - accuracy %d us\n", (s32) diff , stream->program->mux->pcr_update_ms, (s32) clock));
 			}
 
-			//fprintf(stderr, "PCR Diff in ms %d - sys clock diff in ms %d - DTS diff %d\n", (u32) (pcr - stream->program->last_pcr) / 27000, now - stream->program->last_sys_clock, (stream->curr_pck.dts - stream->program->last_dts)/90);
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Inserted PCR "LLD" (%d @90kHz) at mux time %d:%09d\n", pcr, (u32) (pcr/300), stream->program->mux->time.sec, stream->program->mux->time.nanosec ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] PCR diff to STB in ms %d - sys clock diff in ms %d - DTS diff %d\n", (u32) (pcr - stream->program->last_pcr) / 27000, now - stream->program->sys_clock_at_last_pcr, (stream->curr_pck.dts - stream->program->last_dts)/90));
 
-			stream->program->last_sys_clock = now;
-			/*if stream does not use DTS, use CTS as base time for PCR*/
-			stream->program->last_dts = (stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? stream->curr_pck.dts : stream->curr_pck.cts;
-			stream->pcr_priority = 0;
+			stream->program->sys_clock_at_last_pcr = now;
+			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) ) ? 1 : 0;
 		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, needs_pcr, pcr, is_rap, padding_length, stream->curr_pck.mpeg2_af_descriptors, stream->curr_pck.mpeg2_af_descriptors_size);
@@ -1575,10 +1730,9 @@
 			stream->curr_pck.mpeg2_af_descriptors_size = 0;
 		}
 
-		if (padding_length) 
+		if (padding_length)
 			stream->program->mux->tot_pes_pad_bytes += padding_length;
 	}
-
 	if (hdr_len) gf_m2ts_stream_add_pes_header(bs, stream);
 
 	pos = (u32) gf_bs_get_position(bs);
@@ -1591,13 +1745,32 @@
 	stream->pes_data_remain -= payload_to_copy;
 
 	/*update stream time, including headers*/
-//	gf_m2ts_time_inc(&stream->time, payload_to_copy + pos - 4, stream->bit_rate);
-	
+	gf_m2ts_time_inc(&stream->time, 1504/*188*8*/, stream->program->mux->bit_rate);
+
 	if (stream->pck_offset == stream->curr_pck.data_len) {
+		u64 pcr = gf_m2ts_get_pcr(stream)/300;
 		if (stream->program->mux->real_time && !stream->program->mux->fixed_rate && gf_m2ts_time_less(&stream->time, &stream->program->mux->time) ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Done sending PES from PID %d TOO LATE: stream time %d:%d - mux time %d:%d (current mux rate %d) \n", stream->pid, stream->time.sec, stream->time.nanosec, stream->program->mux->time.sec, stream->program->mux->time.nanosec, stream->program->mux->bit_rate));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sent PES TOO LATE: PID %d - DTS "LLD" - PCR "LLD" - stream time %d:%09d - mux time %d:%09d - current mux rate %d\n",
+			                                       stream->pid, stream->curr_pck.dts, pcr,
+			                                       stream->time.sec, stream->time.nanosec, stream->program->mux->time.sec, stream->program->mux->time.nanosec,
+			                                       stream->program->mux->bit_rate
+			                                      ));
+		} else if (stream->curr_pck.dts < pcr) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sent PES %d us TOO LATE: PID %d - DTS "LLD" - size %d\n\tPCR "LLD" - stream time %d:%09d - mux time %d:%09d \n",
+			        (pcr - stream->curr_pck.dts)*100/9, stream->pid, stream->curr_pck.dts, stream->curr_pck.data_len, pcr,
+			        stream->time.sec, stream->time.nanosec, stream->program->mux->time.sec, stream->program->mux->time.nanosec
+			                                         ));
+		} else if (stream->curr_pck.cts < pcr) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sent PES %d us TOO LATE: PID %d - DTS "LLD" - size %d\n\tPCR "LLD" - stream time %d:%09d - mux time %d:%09d \n",
+			        pcr - stream->curr_pck.dts, stream->pid, stream->curr_pck.dts, stream->curr_pck.data_len, pcr,
+			        stream->time.sec, stream->time.nanosec, stream->program->mux->time.sec, stream->program->mux->time.nanosec
+			                                         ));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Done sending PES (%d bytes) from PID %d at stream time %d:%d (DTS "LLD" - PCR "LLD")\n", stream->curr_pck.data_len, stream->pid, stream->time.sec, stream->time.nanosec, stream->curr_pck.dts, gf_m2ts_get_pcr(stream->program)/300));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sent PES: PID %d - DTS "LLD" - PCR "LLD" - stream time %d:%09d - mux time %d:%09d \n",
+			                                       stream->pid, stream->curr_pck.dts, pcr,
+			                                       stream->time.sec, stream->time.nanosec, stream->program->mux->time.sec, stream->program->mux->time.nanosec
+			                                      ));
+
 		}
 
 		/*PES has been sent, discard internal buffer*/
@@ -1606,19 +1779,11 @@
 		stream->curr_pck.data_len = 0;
 		stream->pck_offset = 0;
 
-#ifndef GPAC_DISABLE_LOG
-		if (gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_INFO)
-			&& gf_m2ts_time_less(&stream->program->mux->time, &stream->time)
-		) {
-			s32 drift;
-			GF_M2TS_Time muxtime = stream->program->mux->time;
-			drift= stream->time.nanosec;
-			drift-=muxtime.nanosec;
-			drift/=1000;
-			if (muxtime.sec!=stream->time.sec) {
-				drift += (stream->time.sec - muxtime.sec)*1000000;
-			}
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] PES PID %d sent %d us too late\n", stream->pid, drift) );
+//#ifndef GPAC_DISABLE_LOG
+#if 0
+		if (gf_m2ts_time_less(&stream->program->mux->time, &stream->time) ) {
+			s32 drift = gf_m2ts_time_diff_us(&stream->program->mux->time, &stream->time);
+			GF_LOG( (drift>1000) ? GF_LOG_WARNING : GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] PES PID %d sent %d us too late\n", stream->pid, drift) );
 		}
 #endif
 
@@ -1634,7 +1799,7 @@
 				if (!res) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Not enough data to fill current PES (PID %d) - filling with 0xFF\n", stream->pid) );
 					memset(packet+pos, 0xFF, copy_next);
-					
+
 					if (stream->copy_from_next_packets > copy_next) {
 						stream->copy_from_next_packets -= copy_next;
 					} else {
@@ -1685,7 +1850,7 @@
 
 	GF_SAFEALLOC(stream, GF_M2TS_Mux_Stream);
 	stream->pid = pid;
-	stream->process = gf_m2ts_stream_process_stream;
+	stream->process = gf_m2ts_stream_process_pes;
 
 	return stream;
 }
@@ -1760,17 +1925,13 @@
 
 static u32 gf_m2ts_stream_get_pid(GF_M2TS_Mux_Program *program, u32 stream_id)
 {
-	GF_M2TS_Mux_Stream *st;
-
-	st = program->streams;
-
+	GF_M2TS_Mux_Stream *st = program->streams;
 	while (st)
 	{
 		if (st->ifce->stream_id == stream_id)
 			return st->pid;
 		st = st->next;
 	}
-
 	return 0;
 }
 
@@ -1903,17 +2064,17 @@
 			break;
 		case GPAC_OTI_VIDEO_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) 
+			/*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:
 			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) 
+			/*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;	
+			break;
 		case GPAC_OTI_VIDEO_HEVC:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_HEVC;
 			/*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)
@@ -2034,6 +2195,17 @@
 }
 
 GF_EXPORT
+GF_M2TS_Mux_Program *gf_m2ts_mux_program_find(GF_M2TS_Mux *muxer, u32 program_number)
+{
+	GF_M2TS_Mux_Program *program = muxer->programs;
+	while (program) {
+		if (program->number == program_number) return program;
+		program = program->next;
+	}
+	return NULL;
+}
+
+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)
 {
 	GF_M2TS_Mux_Program *program;
@@ -2062,6 +2234,18 @@
 }
 
 GF_EXPORT
+void gf_m2ts_mux_program_set_name(GF_M2TS_Mux_Program *program, const char *program_name, const char *provider_name)
+{
+	if (program->name) gf_free(program->name);
+	program->name = program_name ? gf_strdup(program_name) : NULL;
+
+	if (program->provider) gf_free(program->provider);
+	program->provider = provider_name ? gf_strdup(provider_name) : NULL;
+
+	if (program->mux->sdt) program->mux->sdt->table_needs_update = 1;
+}
+
+GF_EXPORT
 GF_M2TS_Mux *gf_m2ts_mux_new(u32 mux_rate, u32 pat_refresh_rate, Bool real_time)
 {
 	GF_BitStream *bs;
@@ -2087,9 +2271,29 @@
 	gf_bs_write_int(bs,	0, 4);
 	gf_bs_del(bs);
 	gf_rand_init(0);
+	muxer->pcr_update_ms = 100;
 	return muxer;
 }
 
+GF_EXPORT
+void gf_m2ts_mux_enable_sdt(GF_M2TS_Mux *mux, u32 refresh_rate_ms)
+{
+	if (!mux->sdt) {
+		mux->sdt = gf_m2ts_stream_new(GF_M2TS_PID_SDT_BAT_ST);
+		mux->sdt->process = gf_m2ts_stream_process_sdt;
+		mux->sdt->refresh_rate_ms = refresh_rate_ms;
+	}
+	mux->sdt->table_needs_update = 1;
+	return;
+}
+
+
+GF_EXPORT
+void gf_m2ts_mux_set_pcr_max_interval(GF_M2TS_Mux *muxer, u32 pcr_update_ms)
+{
+	if (muxer && (pcr_update_ms<=100)) muxer->pcr_update_ms = pcr_update_ms;
+}
+
 void gf_m2ts_mux_stream_del(GF_M2TS_Mux_Stream *st)
 {
 	while (st->tables) {
@@ -2140,6 +2344,8 @@
 		gf_list_del(prog->loop_descriptors);
 	}
 	gf_m2ts_mux_stream_del(prog->pmt);
+	if (prog->name) gf_free(prog->name);
+	if (prog->provider) gf_free(prog->provider);
 	gf_free(prog);
 }
 
@@ -2152,43 +2358,28 @@
 		mux->programs = p;
 	}
 	gf_m2ts_mux_stream_del(mux->pat);
+	if (mux->sdt) gf_m2ts_mux_stream_del(mux->sdt);
 	gf_free(mux);
 }
 
-void gf_m2ts_mux_update_bitrate(GF_M2TS_Mux *mux)
+GF_EXPORT
+void gf_m2ts_mux_update_config(GF_M2TS_Mux *mux, Bool reset_time)
 {
 	GF_M2TS_Mux_Program *prog;
-	if (!mux || mux->fixed_rate) return;
 
-	mux->bit_rate = 0;
 	gf_m2ts_mux_table_update_bitrate(mux, mux->pat);
-	mux->bit_rate += mux->pat->bit_rate;
-
-
-	prog = mux->programs;
-	while (prog) {
-		GF_M2TS_Mux_Stream *stream = prog->streams;
-		gf_m2ts_mux_table_update_bitrate(mux, prog->pmt);
-		mux->bit_rate += prog->pmt->bit_rate;
-		while (stream) {
-			mux->bit_rate += stream->bit_rate;
-			stream = stream->next;
-		}
-		prog = prog->next;
+	if (mux->sdt) {
+		gf_m2ts_mux_table_update_bitrate(mux, mux->sdt);
 	}
-}
-
-GF_EXPORT
-void gf_m2ts_mux_update_config(GF_M2TS_Mux *mux, Bool reset_time)
-{
-	GF_M2TS_Mux_Program *prog;
 
 	if (!mux->fixed_rate) {
 		mux->bit_rate = 0;
 
 		/*get PAT bitrate*/
-		gf_m2ts_mux_table_update_bitrate(mux, mux->pat);
 		mux->bit_rate += mux->pat->bit_rate;
+		if (mux->sdt) {
+			mux->bit_rate += mux->sdt->bit_rate;
+		}
 	}
 
 	prog = mux->programs;
@@ -2203,23 +2394,27 @@
 			stream = stream->next;
 		}
 		/*get PMT bitrate*/
+		gf_m2ts_mux_table_update_bitrate(mux, prog->pmt);
+
 		if (!mux->fixed_rate) {
-			gf_m2ts_mux_table_update_bitrate(mux, prog->pmt);
 			mux->bit_rate += prog->pmt->bit_rate;
 		}
+
 		prog = prog->next;
 	}
+
 	/*reset mux time*/
 	if (reset_time) {
 		mux->time.sec = mux->time.nanosec = 0;
 		mux->init_sys_time = 0;
 	}
+
 }
 
 GF_EXPORT
 u32 gf_m2ts_get_sys_clock(GF_M2TS_Mux *muxer)
 {
-	return gf_sys_clock() - muxer->init_sys_time;
+	return (u32) (gf_sys_clock_high_res() - muxer->init_sys_time)/1000;
 }
 
 GF_EXPORT
@@ -2243,7 +2438,7 @@
 GF_Err gf_m2ts_mux_set_initial_pcr(GF_M2TS_Mux *muxer, u64 init_pcr_value)
 {
 	if (!muxer) return GF_BAD_PARAM;
-	muxer->init_pcr_value = init_pcr_value;
+	muxer->init_pcr_value = 1 + init_pcr_value;
 	return GF_OK;
 }
 
@@ -2252,37 +2447,39 @@
 {
 	GF_M2TS_Mux_Program *program;
 	GF_M2TS_Mux_Stream *stream, *stream_to_process;
-	GF_M2TS_Time time;
-	u32 now, nb_streams, nb_streams_done;
+	GF_M2TS_Time time, max_time;
+	u32 nb_streams, nb_streams_done;
+	u64 now_us;
 	char *ret;
 	u32 res, highest_priority;
 	Bool flush_all_pes = 0;
+	Bool check_max_time = 0;
 
 	nb_streams = nb_streams_done = 0;
 	*status = GF_M2TS_STATE_IDLE;
 
-	now = gf_sys_clock();
+	now_us = gf_sys_clock_high_res();
 	if (muxer->real_time) {
 		if (!muxer->init_sys_time) {
 			//init TS time
 			muxer->time.sec = muxer->time.nanosec = 0;
-			gf_m2ts_time_inc(&muxer->time, (u32) muxer->init_pcr_value, 27000000);
-			muxer->init_sys_time = now;
+			gf_m2ts_time_inc(&muxer->time, (u32) (muxer->init_pcr_value ? muxer->init_pcr_value-1 : 0), 27000000);
+			muxer->init_sys_time = now_us;
 			muxer->init_ts_time = muxer->time;
 		} else {
-			u32 diff = now - muxer->init_sys_time;
+			u64 us_diff = now_us - muxer->init_sys_time;
 			GF_M2TS_Time now = muxer->init_ts_time;
-			gf_m2ts_time_inc(&now, diff, 1000);
+			gf_m2ts_time_inc(&now, us_diff, 1000000);
 			if (gf_m2ts_time_less(&now, &muxer->time)) {
 				if (usec_till_next) {
 					u32 diff = muxer->time.sec - now.sec;
 					diff *= 1000000;
 					if (now.nanosec <= muxer->time.nanosec) {
-						diff += (muxer->time.nanosec - now.nanosec) / 1000;				
+						diff += (muxer->time.nanosec - now.nanosec) / 1000;
 					} else {
 						assert(diff);
 						diff -= 1000000;
-						diff += (1000000000 + muxer->time.nanosec - now.nanosec) / 1000;				
+						diff += (1000000000 + muxer->time.nanosec - now.nanosec) / 1000;
 					}
 					*usec_till_next = diff;
 				}
@@ -2293,6 +2490,7 @@
 
 	stream_to_process = NULL;
 	time = muxer->time;
+	max_time.sec = max_time.nanosec = 0;
 
 	/*bitrate have changed*/
 	if (muxer->needs_reconfig) {
@@ -2334,6 +2532,16 @@
 			goto send_pck;
 		}
 
+		/*SDT*/
+		if (muxer->sdt && !muxer->force_pat_pmt_state) {
+			res = muxer->sdt->process(muxer, muxer->sdt);
+			if (res && gf_m2ts_time_less_or_equal(&muxer->sdt->time, &time) ) {
+				time = muxer->sdt->time;
+				stream_to_process = muxer->sdt;
+				goto send_pck;
+			}
+		}
+
 		/*PMT, for each program*/
 		program = muxer->programs;
 		while (program) {
@@ -2341,7 +2549,7 @@
 			if ((res && gf_m2ts_time_less_or_equal(&program->pmt->time, &time)) || (muxer->force_pat_pmt_state==GF_SEG_BOUNDARY_FORCE_PMT)) {
 				time = program->pmt->time;
 				stream_to_process = program->pmt;
-				if (muxer->force_pat_pmt_state==GF_SEG_BOUNDARY_FORCE_PMT) 
+				if (muxer->force_pat_pmt_state==GF_SEG_BOUNDARY_FORCE_PMT)
 					muxer->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PCR;
 				/*force sending the PMT regardless of other streams*/
 				goto send_pck;
@@ -2352,7 +2560,11 @@
 
 	/*if non-fixed rate, just pick the earliest data on all streams*/
 	if (!muxer->fixed_rate) {
-		time.sec = 0xFFFFFFFF;
+		if (!muxer->real_time) {
+			time.sec = 0xFFFFFFFF;
+		} else {
+			check_max_time = 1;
+		}
 	}
 
 #define FORCE_PCR_FIRST	0
@@ -2382,7 +2594,7 @@
 		stream = program->streams;
 		while (stream) {
 #if FORCE_PCR_FIRST
-			if (stream != program->pcr) 
+			if (stream != program->pcr)
 #endif
 			{
 				if (flush_all_pes && !stream->pes_data_remain) {
@@ -2396,9 +2608,9 @@
 				if (!flush_all_pes && muxer->force_pat)
 					return gf_m2ts_mux_process(muxer, status, usec_till_next);
 
-				if (res && gf_m2ts_time_less_or_equal(&stream->time, &time)) {
-					/*if same priority schedule the earliest data*/
-					if (res>=highest_priority) {
+				if (res) {
+					/*always schedule the earliest data*/
+					if (gf_m2ts_time_less(&stream->time, &time)) {
 						highest_priority = res;
 						time = stream->time;
 						stream_to_process = stream;
@@ -2406,10 +2618,23 @@
 						goto send_pck;
 #endif
 					}
+					else if (gf_m2ts_time_equal(&stream->time, &time)) {
+						/*if the same priority schedule base stream first*/
+						if ((res > highest_priority) || ((res == highest_priority) && !stream->ifce->depends_on_stream)) {
+							highest_priority = res;
+							time = stream->time;
+							stream_to_process = stream;
+#if FORCE_PCR_FIRST
+							goto send_pck;
+#endif
+						}
+					} else if (check_max_time && gf_m2ts_time_less(&max_time, &stream->time)) {
+						max_time = stream->time;
+					}
 				}
 			}
 			nb_streams++;
-			if ((stream->ifce->caps & GF_ESI_STREAM_IS_OVER) && (!res || stream->refresh_rate_ms) ) 
+			if ((stream->ifce->caps & GF_ESI_STREAM_IS_OVER) && (!res || stream->refresh_rate_ms) )
 				nb_streams_done ++;
 
 			stream = stream->next;
@@ -2428,7 +2653,7 @@
 		}
 		/* padding packets ?? */
 		if (muxer->fixed_rate) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Inserting empty packet at %d:%d\n", time.sec, time.nanosec));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Inserting empty packet at %d:%09d\n", time.sec, time.nanosec));
 			ret = muxer->null_pck;
 			muxer->tot_pad_sent++;
 		}
@@ -2443,45 +2668,39 @@
 		ret = muxer->dst_pck;
 		*status = GF_M2TS_STATE_DATA;
 
-#ifndef GPAC_DISABLE_LOG
-		if (gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG) 
-			&& muxer->fixed_rate 
-		) {
-			s32 drift;
-			drift= muxer->time.nanosec;
-			drift-=time.nanosec;
-			drift/=1000000;
-			if (muxer->time.sec!=time.sec) {
-				drift += (muxer->time.sec - time.sec)*1000;
-				assert(muxer->time.sec > time.sec);
-			}
-//			fprintf(stderr, "\nMux time - Packet PID %d time: %d ms\n", stream_to_process->pid, drift);
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Send %s from PID %d at %d:%09d - mux time %d:%09d\n", stream_to_process->tables ? "table" : "PES", stream_to_process->pid, time.sec, time.nanosec, muxer->time.sec, muxer->time.nanosec));
-#endif
-
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sending %s from PID %d at %d:%09d - mux time %d:%09d\n", stream_to_process->tables ? "table" : "PES", stream_to_process->pid, time.sec, time.nanosec, muxer->time.sec, muxer->time.nanosec));
 
-		if (nb_streams && (nb_streams==nb_streams_done)) 
+		if (nb_streams && (nb_streams==nb_streams_done))
 			*status = GF_M2TS_STATE_EOS;
 	}
 	if (ret) {
 		muxer->tot_pck_sent++;
 		/*increment time*/
-		if (muxer->fixed_rate || muxer->real_time) {
+		if (muxer->fixed_rate ) {
 			gf_m2ts_time_inc(&muxer->time, 1504/*188*8*/, muxer->bit_rate);
 		}
+		else if (muxer->real_time) {
+			u64 us_diff = gf_sys_clock_high_res() - muxer->init_sys_time;
+			muxer->time = muxer->init_ts_time;
+			gf_m2ts_time_inc(&muxer->time, us_diff, 1000000);
+		}
 		/*if a stream was found, use it*/
 		else if (stream_to_process) {
 			muxer->time = time;
 		}
 
 		muxer->pck_sent_over_br_window++;
-		if (now - muxer->last_br_time > 1000) {
+		if (now_us - muxer->last_br_time_us > 1000000) {
 			u64 size = 8*188*muxer->pck_sent_over_br_window;
-			muxer->average_birate_kbps = (u32) (size /(now - muxer->last_br_time));
-			muxer->last_br_time = now;
+			muxer->average_birate_kbps = (u32) (size*1000 / (now_us - muxer->last_br_time_us));
+			muxer->last_br_time_us = now_us;
 			muxer->pck_sent_over_br_window=0;
 		}
+	} else if (muxer->real_time && !muxer->fixed_rate) {
+//		u64 us_diff = gf_sys_clock_high_res() - muxer->init_sys_time;
+//		muxer->time = muxer->init_ts_time;
+//		gf_m2ts_time_inc(&muxer->time, us_diff, 1000000);
+		muxer->time = max_time;
 	}
 	return ret;
 }

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/m3u8.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/m3u8.c Changed

@@ -30,8 +30,7 @@
 #include <stdio.h>
 #include <gpac/network.h>
 
-/*#define MYLOG(xx) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, xx )*/
-#define MYLOG(xx)
+#define MYLOG(msg) GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, msg)
 
 
 #if defined(WIN32) || defined(_WIN32_WCE)
@@ -115,7 +114,7 @@
 }
 
 /*
-GF_Err playlist_del(Playlist * pl){
+static GF_Err playlist_del(Playlist * pl){
 GF_Err result = GF_OK;
 if (pl == NULL)
 return result;
@@ -238,13 +237,13 @@
 		return r;
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] PlayListElement[%p, title=%s, codecs=%s, duration=%d, bandwidth=%d, url=%s, type=%s]\n",
-		(void*)e,
-		e->title,
-		e->codecs,
-		e->durationInfo,
-		e->bandwidth,
-		e->url,
-		e->elementType == TYPE_STREAM ? "stream" : "playlist"));
+	                                   (void*)e,
+	                                   e->title,
+	                                   e->codecs,
+	                                   e->durationInfo,
+	                                   e->bandwidth,
+	                                   e->url,
+	                                   e->elementType == TYPE_STREAM ? "stream" : "playlist"));
 	if (TYPE_PLAYLIST == e->elementType) {
 		int sz;
 		assert( e->element.playlist.elements);
@@ -427,7 +426,7 @@
 		}
 		return ret;
 	}
-	ret = extractAttributes("#EXT-X-KEY:", line, 2);
+	ret = extractAttributes("#EXT-X-KEY:", line, 4);
 	if (ret) {
 		/* #EXT-X-KEY:METHOD=<method>[,URI="<URI>"] */
 		/* Not Supported for now */
@@ -564,14 +563,15 @@
 			continue;
 		if (currentLineNumber == 1) {
 			/* Playlist MUST start with #EXTM3U */
-/*			if (len < 7 || strncmp("#EXTM3U", currentLine, 7)!=0) {
-				fclose(f);
-				variant_playlist_del(pl);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Failed to parse M3U8 File, it should start with #EXTM3U, but was : %s\n", currentLine));
-				return GF_STREAM_NOT_FOUND;
-			}
-			continue;
-*/		}
+			/*			if (len < 7 || strncmp("#EXTM3U", currentLine, 7)!=0) {
+							fclose(f);
+							variant_playlist_del(pl);
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Failed to parse M3U8 File, it should start with #EXTM3U, but was : %s\n", currentLine));
+							return GF_STREAM_NOT_FOUND;
+						}
+						continue;
+			*/
+		}
 		if (currentLine[0] == '#') {
 			/* A comment or a directive */
 			if (strncmp("#EXT", currentLine, 4)==0) {
@@ -614,8 +614,8 @@
 				}
 				} else */ {
 					fullURL = gf_url_concatenate(baseURL, currentLine);
-			}
-			assert( fullURL );
+				}
+				assert( fullURL );
 			}
 			{
 				u32 count;
@@ -661,12 +661,12 @@
 						//assert( 0 );
 					}
 					currentPlayList = playlist_element_new(
-						TYPE_UNKNOWN,
-						fullURL,
-						attribs.title,
-						attribs.codecs,
-						attribs.durationInSeconds,
-						attribs.byteRangeStart, attribs.byteRangeEnd);
+					                      TYPE_UNKNOWN,
+					                      fullURL,
+					                      attribs.title,
+					                      attribs.codecs,
+					                      attribs.durationInSeconds,
+					                      attribs.byteRangeStart, attribs.byteRangeEnd);
 					if (currentPlayList == NULL) {
 						/* OUT of memory */
 						variant_playlist_del(*playlist);
@@ -689,12 +689,12 @@
 						PlaylistElement * subElement;
 						assert(baseURL);
 						currentPlayList = playlist_element_new(
-							TYPE_PLAYLIST,
-							baseURL,
-							attribs.title,
-							attribs.codecs,
-							attribs.durationInSeconds, 
-							attribs.byteRangeStart, attribs.byteRangeEnd);
+						                      TYPE_PLAYLIST,
+						                      baseURL,
+						                      attribs.title,
+						                      attribs.codecs,
+						                      attribs.durationInSeconds,
+						                      attribs.byteRangeStart, attribs.byteRangeEnd);
 						if (currentPlayList == NULL) {
 							/* OUT of memory */
 							variant_playlist_del(*playlist);
@@ -708,12 +708,12 @@
 						currentPlayList->title = NULL;
 						currentPlayList->codecs = NULL;
 						subElement = playlist_element_new(
-							TYPE_UNKNOWN,
-							fullURL,
-							attribs.title,
-							attribs.codecs,
-							attribs.durationInSeconds,
-							attribs.byteRangeStart, attribs.byteRangeEnd);
+						                 TYPE_UNKNOWN,
+						                 fullURL,
+						                 attribs.title,
+						                 attribs.codecs,
+						                 attribs.durationInSeconds,
+						                 attribs.byteRangeStart, attribs.byteRangeEnd);
 						if (subElement == NULL) {
 							variant_playlist_del(*playlist);
 							playlist_element_del(currentPlayList);
@@ -723,19 +723,19 @@
 						}
 						gf_list_add(currentPlayList->element.playlist.elements, subElement);
 						gf_list_add(program->bitrates, currentPlayList);
-						currentPlayList->element.playlist.computed_duration += subElement->durationInfo; 
+						currentPlayList->element.playlist.computed_duration += subElement->durationInfo;
 						assert( program );
 						assert( program->bitrates);
 						assert( currentPlayList);
 
 					} else {
 						PlaylistElement * subElement = playlist_element_new(
-							TYPE_UNKNOWN,
-							fullURL,
-							attribs.title,
-							attribs.codecs,
-							attribs.durationInSeconds,
-							attribs.byteRangeStart, attribs.byteRangeEnd);
+						                                   TYPE_UNKNOWN,
+						                                   fullURL,
+						                                   attribs.title,
+						                                   attribs.codecs,
+						                                   attribs.durationInSeconds,
+						                                   attribs.byteRangeStart, attribs.byteRangeEnd);
 						if (currentPlayList->elementType != TYPE_PLAYLIST) {
 							currentPlayList->elementType = TYPE_PLAYLIST;
 							if (!currentPlayList->element.playlist.elements)
@@ -749,7 +749,7 @@
 							return GF_OUT_OF_MEM;
 						}
 						gf_list_add(currentPlayList->element.playlist.elements, subElement);
-						currentPlayList->element.playlist.computed_duration += subElement->durationInfo; 
+						currentPlayList->element.playlist.computed_duration += subElement->durationInfo;
 					}
 				}
 
@@ -759,11 +759,11 @@
 					currentPlayList->element.playlist.target_duration = attribs.targetDurationInSeconds;
 					currentPlayList->durationInfo = attribs.targetDurationInSeconds;
 				}
-				if (attribs.durationInSeconds) {					
+				if (attribs.durationInSeconds) {
 					if (currentPlayList->durationInfo == 0) {
 						/* we set the playlist duration info as the duration of a segment, only if it's not set
-						   There are cases of playlist with the last segment with a duration different from the others 
-						   (example: Apple bipbop test)*/				  
+						   There are cases of playlist with the last segment with a duration different from the others
+						   (example: Apple bipbop test)*/
 						currentPlayList->durationInfo = attribs.durationInSeconds;
 					}
 				}
@@ -800,7 +800,7 @@
 		for (j=0; j<gf_list_count(prog->bitrates); j++) {
 			PlaylistElement *ple = gf_list_get(prog->bitrates, j);
 			if (ple->elementType==TYPE_PLAYLIST) {
-				if (ple->element.playlist.computed_duration > prog->computed_duration) 
+				if (ple->element.playlist.computed_duration > prog->computed_duration)
 					prog->computed_duration = ple->element.playlist.computed_duration;
 			}
 		}

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/media_export.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/media_export.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -131,7 +131,7 @@
 		gf_fwrite(og.header, 1, og.header_len, out);
 		gf_fwrite(og.body, 1, og.body_len, out);
 	}
-	
+
 	op.granulepos = -1;
 
 	count = gf_isom_get_sample_count(dumper->file, track);
@@ -179,7 +179,7 @@
 		gf_fwrite(og.header, 1, og.header_len, out);
 		gf_fwrite(og.body, 1, og.body_len, out);
 	}
-    ogg_stream_clear(&os);
+	ogg_stream_clear(&os);
 	if (szName) fclose(out);
 	return GF_OK;
 #endif
@@ -259,7 +259,7 @@
 	Bool is_stdout = GF_FALSE;
 	GF_BitStream *bs;
 	u32 track, i, di, count, m_type, m_stype, dsi_size, is_mj2k;
-    Bool is_wvtt = GF_FALSE;
+	Bool is_wvtt = GF_FALSE;
 
 	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
@@ -276,7 +276,7 @@
 	dsi = NULL;
 	udesc = NULL;
 	dcfg = NULL;
-	if ((m_stype==GF_ISOM_SUBTYPE_MPEG4) || (m_stype==GF_ISOM_SUBTYPE_MPEG4_CRYP)) 
+	if ((m_stype==GF_ISOM_SUBTYPE_MPEG4) || (m_stype==GF_ISOM_SUBTYPE_MPEG4_CRYP))
 		dcfg = gf_isom_get_decoder_config(dumper->file, track, 1);
 
 	strcpy(szName, dumper->out_name ? dumper->out_name : "");
@@ -345,25 +345,32 @@
 			}
 			break;
 		case GF_STREAM_SCENE:
-			strcpy(szEXT, ".bifs"); gf_export_message(dumper, GF_OK, "Dumping BIFS sample%s", szNum); 
+			strcpy(szEXT, ".bifs");
+			gf_export_message(dumper, GF_OK, "Dumping BIFS sample%s", szNum);
 			break;
 		case GF_STREAM_OD:
-			strcpy(szEXT, ".od"); gf_export_message(dumper, GF_OK, "Dumping OD sample%s", szNum); 
+			strcpy(szEXT, ".od");
+			gf_export_message(dumper, GF_OK, "Dumping OD sample%s", szNum);
 			break;
 		case GF_STREAM_MPEGJ:
-			strcpy(szEXT, ".mpj"); gf_export_message(dumper, GF_OK, "Dumping MPEG-J sample%s", szNum); 
+			strcpy(szEXT, ".mpj");
+			gf_export_message(dumper, GF_OK, "Dumping MPEG-J sample%s", szNum);
 			break;
 		case GF_STREAM_OCI:
-			strcpy(szEXT, ".oci"); gf_export_message(dumper, GF_OK, "Dumping OCI sample%s", szNum); 
+			strcpy(szEXT, ".oci");
+			gf_export_message(dumper, GF_OK, "Dumping OCI sample%s", szNum);
 			break;
 		case GF_STREAM_MPEG7:
-			strcpy(szEXT, ".mp7"); gf_export_message(dumper, GF_OK, "Dumping MPEG7 sample%s", szNum); 
+			strcpy(szEXT, ".mp7");
+			gf_export_message(dumper, GF_OK, "Dumping MPEG7 sample%s", szNum);
 			break;
 		case GF_STREAM_IPMP:
-			strcpy(szEXT, ".ipmp"); gf_export_message(dumper, GF_OK, "Dumping IPMP sample%s", szNum); 
+			strcpy(szEXT, ".ipmp");
+			gf_export_message(dumper, GF_OK, "Dumping IPMP sample%s", szNum);
 			break;
 		case GF_STREAM_TEXT:
-			strcpy(szEXT, ".tx3g"); gf_export_message(dumper, GF_OK, "Dumping 3GP Text sample%s", szNum); 
+			strcpy(szEXT, ".tx3g");
+			gf_export_message(dumper, GF_OK, "Dumping 3GP Text sample%s", szNum);
 			break;
 		default:
 			gf_odf_desc_del((GF_Descriptor *) dcfg);
@@ -382,20 +389,23 @@
 	} else if (m_stype==GF_ISOM_SUBTYPE_AC3) {
 		gf_export_message(dumper, GF_OK, "Extracting AC3 sample%s", szNum);
 		strcpy(szEXT, ".ac3");
+	} else if (m_stype==GF_ISOM_SUBTYPE_MP3) {
+		gf_export_message(dumper, GF_OK, "Extracting MP3 sample%s", szNum);
+		strcpy(szEXT, ".mp3");
 	} else if (m_stype==GF_4CC('x','d','v','b') ) {
 		gf_export_message(dumper, GF_OK, "Extracting MPEG-2 sample%s", szNum);
 		strcpy(szEXT, ".m2v");
-	} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264) 
-			|| (m_stype==GF_ISOM_SUBTYPE_AVC2_H264)
-			|| (m_stype==GF_ISOM_SUBTYPE_AVC3_H264)
-			|| (m_stype==GF_ISOM_SUBTYPE_AVC4_H264)
-			|| (m_stype==GF_ISOM_SUBTYPE_SVC_H264)
-		) {
+	} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264)
+	           || (m_stype==GF_ISOM_SUBTYPE_AVC2_H264)
+	           || (m_stype==GF_ISOM_SUBTYPE_AVC3_H264)
+	           || (m_stype==GF_ISOM_SUBTYPE_AVC4_H264)
+	           || (m_stype==GF_ISOM_SUBTYPE_SVC_H264)
+	          ) {
 		strcpy(szEXT, ".h264");
 		gf_export_message(dumper, GF_OK, "Dumping MPEG-4 AVC-H264 Visual sample%s", szNum);
-	} else if ((m_stype==GF_ISOM_SUBTYPE_HVC1) 
-			|| (m_stype==GF_ISOM_SUBTYPE_HEV1)
-		) {
+	} else if ((m_stype==GF_ISOM_SUBTYPE_HVC1)
+	           || (m_stype==GF_ISOM_SUBTYPE_HEV1)
+	          ) {
 		strcpy(szEXT, ".hvc");
 		gf_export_message(dumper, GF_OK, "Dumping MPEG-H HEVC Visual sample%s", szNum);
 	} else if (m_type==GF_ISOM_MEDIA_FLASH) {
@@ -404,8 +414,8 @@
 	} else if (m_stype==GF_ISOM_SUBTYPE_WVTT) {
 		gf_export_message(dumper, GF_OK, "Extracting WebVTT sample%s", szNum);
 		strcpy(szEXT, ".vtt");
-        is_wvtt = GF_TRUE;
-	} else if (m_stype==GF_ISOM_SUBTYPE_STSE) {
+		is_wvtt = GF_TRUE;
+	} else if (m_stype==GF_ISOM_SUBTYPE_STXT) {
 		gf_export_message(dumper, GF_OK, "Extracting Simple Text sample%s", szNum);
 		strcpy(szEXT, ".txt");
 	} else if (m_type==GF_ISOM_MEDIA_HINT) {
@@ -423,8 +433,12 @@
 		strcat(szEXT, gf_4cc_to_str(m_stype));
 		udesc = gf_isom_get_generic_sample_description(dumper->file, track, 1);
 		switch (m_type) {
-		case GF_ISOM_MEDIA_VISUAL: gf_export_message(dumper, GF_OK, "Extracting \'%s\' Video - Compressor %s", szEXT, udesc ? udesc->compressor_name: "Unknown"); break;
-		case GF_ISOM_MEDIA_AUDIO: gf_export_message(dumper, GF_OK, "Extracting \'%s\' Audio - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown"); break;
+		case GF_ISOM_MEDIA_VISUAL:
+			gf_export_message(dumper, GF_OK, "Extracting \'%s\' Video - Compressor %s", szEXT, udesc ? udesc->compressor_name: "Unknown");
+			break;
+		case GF_ISOM_MEDIA_AUDIO:
+			gf_export_message(dumper, GF_OK, "Extracting \'%s\' Audio - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown");
+			break;
 		default:
 			gf_export_message(dumper, GF_OK, "Extracting \'%s\' Track (type '%s') - Compressor %s sample%s", szEXT, gf_4cc_to_str(m_type), udesc ? udesc->compressor_name : "Unknown", szNum);
 			break;
@@ -451,27 +465,27 @@
 		}
 		out = is_stdout ? stdout : gf_f64_open(szName, "wb");
 		bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
-		if (is_mj2k) 
+		if (is_mj2k)
 			write_jp2_file(bs, samp->data, samp->dataLength, dsi, dsi_size);
 		else {
 #ifndef GPAC_DISABLE_TTXT
-            if (is_wvtt) {
-                GF_Err e;
-                e = gf_webvtt_dump_header(out, dumper->file, track, 1);
-                if (e == GF_OK) {
-                    GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample);
-                    u32 timescale = gf_isom_get_media_timescale(dumper->file, track);
-                    gf_webvtt_dump_iso_sample(out, timescale, samp);
-                }
-            } else 
+			if (is_wvtt) {
+				GF_Err e;
+				e = gf_webvtt_dump_header(out, dumper->file, track, 1);
+				if (e == GF_OK) {
+					GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample);
+					u32 timescale = gf_isom_get_media_timescale(dumper->file, track);
+					gf_webvtt_dump_iso_sample(out, timescale, samp);
+				}
+			} else
 #endif
-            {
-                gf_bs_write_data(bs, samp->data, samp->dataLength);
-            }
-        }
+			{
+				gf_bs_write_data(bs, samp->data, samp->dataLength);
+			}
+		}
 		gf_isom_sample_del(&samp);
 		gf_bs_del(bs);
-		
+
 		if (!is_stdout)
 			fclose(out);
 		if (dsi)
@@ -503,24 +517,24 @@
 		out = is_stdout ? stdout : gf_f64_open(szName, "wb");
 		bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
 		if (dsi) gf_bs_write_data(bs, dsi, dsi_size);
-		if (is_mj2k) 
+		if (is_mj2k)
 			write_jp2_file(bs, samp->data, samp->dataLength, dsi, dsi_size);
 		else {
 #ifndef GPAC_DISABLE_TTXT
-            if (is_wvtt) {
-                GF_Err e;
-                e = gf_webvtt_dump_header(out, dumper->file, track, 1);
-                if (e == GF_OK) {
-                    GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample);
-                    u32 timescale = gf_isom_get_media_timescale(dumper->file, track);
-                    gf_webvtt_dump_iso_sample(out, timescale, samp);
-                }
-            } else 
+			if (is_wvtt) {
+				GF_Err e;
+				e = gf_webvtt_dump_header(out, dumper->file, track, 1);
+				if (e == GF_OK) {
+					GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample);
+					u32 timescale = gf_isom_get_media_timescale(dumper->file, track);
+					gf_webvtt_dump_iso_sample(out, timescale, samp);
+				}
+			} else
 #endif
-            {
-                gf_bs_write_data(bs, samp->data, samp->dataLength);
-            }
-        }
+			{
+				gf_bs_write_data(bs, samp->data, samp->dataLength);
+			}
+		}
 		gf_isom_sample_del(&samp);
 		gf_set_progress("Media Export", i+1, count);
 		gf_bs_del(bs);
@@ -538,7 +552,7 @@
 	FILE			*fidx, *fsub;
 	u32				 width, height, i, count, di;
 	GF_ISOSample	*samp;
-	char			 lang[] = "\0\0\0\0";
+	char			 *lang = NULL;
 
 	/* Check decoder specific information (palette) size - should be 64 */
 	if (dsiSize != 64) {
@@ -597,8 +611,9 @@
 	fputs("# Language index in use\nlangidx: 0\n", fidx);
 
 	/* Write language header */
-	gf_isom_get_media_language(dumper->file, track, lang);
+	gf_isom_get_media_language(dumper->file, track, &lang);
 	fprintf(fidx, "id: %s, index: 0\n", vobsub_lang_id(lang));
+	gf_free(lang);
 
 	/* Retrieve sample count */
 	count = gf_isom_get_sample_count(dumper->file, track);
@@ -660,6 +675,26 @@
 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";
 
+#define DUMP_AVCPARAM(_params) \
+		count = gf_list_count(_params); \
+		for (i=0;i<count;i++) { \
+			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(_params, i); \
+			gf_bs_write_u32(bs, 1); \
+			gf_bs_write_data(bs, sl->data, sl->size); \
+		} \
+ 
+#define DUMP_HEVCPARAM(_params) \
+	count = gf_list_count(_params->param_array); \
+	for (i=0;i<count;i++) { \
+		u32 j; \
+		GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(_params->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_u32(bs, 1); \
+			gf_bs_write_data(bs, sl->data, sl->size); \
+		} \
+	} \
+ 
 
 GF_Err gf_media_export_native(GF_MediaExporter *dumper)
 {
@@ -676,14 +711,15 @@
 	GF_AVCConfig *avccfg, *svccfg;
 	GF_HEVCConfig *hevccfg, *shvccfg;
 	GF_M4ADecSpecInfo a_cfg;
+	char *stxtcfg;
 	GF_BitStream *bs;
 	u32 track, i, di, count, m_type, m_stype, dsi_size, qcp_type;
 	Bool is_ogg, has_qcp_pad, is_vobsub;
-	u32 aac_type, is_aac;
+	u32 aac_type, aac_mode;
 	char *dsi;
 	QCPRateTable rtable[8];
-	Bool is_stdout=0;
-    Bool is_webvtt = GF_FALSE;
+	Bool is_stdout = GF_FALSE;
+	Bool is_webvtt = GF_FALSE;
 
 	dsi_size = 0;
 	dsi = NULL;
@@ -691,7 +727,8 @@
 	avccfg = NULL;
 	svccfg = NULL;
 	shvccfg = NULL;
-	
+	stxtcfg = NULL;
+
 	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
 		return GF_BAD_PARAM;
@@ -699,21 +736,30 @@
 
 	m_type = gf_isom_get_media_type(dumper->file, track);
 	m_stype = gf_isom_get_media_subtype(dumper->file, track, 1);
-	has_qcp_pad = 0;
-	if (dumper->out_name && !strcmp(dumper->out_name, "std")) 
-		is_stdout = 1;
+	has_qcp_pad = GF_FALSE;
+	if (dumper->out_name && !strcmp(dumper->out_name, "std")) {
+		is_stdout = GF_TRUE;
+	}
 
-	is_aac = aac_type = 0;
+	aac_mode = aac_type = 0;
 	qcp_type = 0;
-	is_ogg = 0;
-	is_vobsub = 0;
+	is_ogg = GF_FALSE;
+	is_vobsub = GF_FALSE;
 	udesc = NULL;
-	dcfg = NULL;
-	if ((m_stype==GF_ISOM_SUBTYPE_MPEG4) || (m_stype==GF_ISOM_SUBTYPE_MPEG4_CRYP)) 
-		dcfg = gf_isom_get_decoder_config(dumper->file, track, 1);
 
-	add_ext = (dumper->out_name && strrchr(dumper->out_name , '.')==NULL) ? 1 : 0;
+	/* check if the output file name needs an extension or already has one */
+	add_ext = (dumper->out_name && strrchr(dumper->out_name , '.')==NULL) ? GF_TRUE : GF_FALSE;
 	strcpy(szName, dumper->out_name ? dumper->out_name : "");
+
+	/* Find the decoder configuration:
+	   - Check first if the stream is carried according to MPEG-4 Systems,
+	   i.e. using the Object Descriptor Framework, to get the Decoder Specific Info (dsi)
+	   - Or get it specifically depending on the media type
+	   */
+	dcfg = NULL;
+	if ((m_stype==GF_ISOM_SUBTYPE_MPEG4) || (m_stype==GF_ISOM_SUBTYPE_MPEG4_CRYP)) {
+		dcfg = gf_isom_get_decoder_config(dumper->file, track, 1);
+	}
 	if (dcfg) {
 		switch (dcfg->streamType) {
 		case GF_STREAM_VISUAL:
@@ -724,7 +770,7 @@
 					dcfg->decoderSpecificInfo->data = NULL;
 					dsi_size = dcfg->decoderSpecificInfo->dataLength;
 				}
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".cmp");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-4 Visual stream to cmp");
 				break;
@@ -732,7 +778,7 @@
 			case GPAC_OTI_VIDEO_SVC:
 				avccfg = gf_isom_avc_config_get(dumper->file, track, 1);
 				svccfg = gf_isom_svc_config_get(dumper->file, track, 1);
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".h264");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-4 AVC-H264 stream to h264");
 				break;
@@ -740,40 +786,40 @@
 			case GPAC_OTI_VIDEO_SHVC:
 				hevccfg = gf_isom_hevc_config_get(dumper->file, track, 1);
 				shvccfg = gf_isom_shvc_config_get(dumper->file, track, 1);
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".hvc");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-H HEVC stream to hevc");
 				break;
 			case GPAC_OTI_VIDEO_MPEG1:
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".m1v");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-1 Visual stream to m1v");
 				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: 
-				if (add_ext) 
+			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 (add_ext)
 					strcat(szName, ".m2v");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-2 Visual stream to m2v");
 				break;
 			case GPAC_OTI_IMAGE_JPEG:
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".jpg");
 				gf_export_message(dumper, GF_OK, "Extracting JPEG image");
 				break;
 			case GPAC_OTI_IMAGE_PNG:
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".png");
 				gf_export_message(dumper, GF_OK, "Extracting PNG image");
 				break;
 			case GPAC_OTI_MEDIA_OGG:
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".ogg");
 				gf_export_message(dumper, GF_OK, "Extracting Ogg video");
-				is_ogg = 1;
+				is_ogg = GF_TRUE;
 				break;
 			default:
 				gf_odf_desc_del((GF_Descriptor *) dcfg);
@@ -788,9 +834,9 @@
 				dsi = dcfg->decoderSpecificInfo->data;
 				dcfg->decoderSpecificInfo->data = NULL;
 				dsi_size = dcfg->decoderSpecificInfo->dataLength;
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".aac");
-				is_aac = 1;
+				aac_mode = 1;
 				aac_type = dcfg->objectTypeIndication - GPAC_OTI_AUDIO_AAC_MPEG2_MP;
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-2 AAC");
 				break;
@@ -803,26 +849,27 @@
 				dsi = dcfg->decoderSpecificInfo->data;
 				dcfg->decoderSpecificInfo->data = NULL;
 				dsi_size = dcfg->decoderSpecificInfo->dataLength;
-				is_aac = 2;
-				if (add_ext) 
+				aac_mode = 2;
+				if (add_ext)
 					strcat(szName, ".aac");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-4 AAC");
 				break;
 			case GPAC_OTI_AUDIO_MPEG2_PART3:
 			case GPAC_OTI_AUDIO_MPEG1:
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".mp3");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-1/2 Audio (MP3)");
 				break;
 			case GPAC_OTI_MEDIA_OGG:
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".ogg");
-				is_ogg = 1;
+				is_ogg = GF_TRUE;
 				gf_export_message(dumper, GF_OK, "Extracting Ogg audio");
 				break;
 			case GPAC_OTI_AUDIO_13K_VOICE:
-				if (add_ext) 
-					strcat(szName, ".qcp"); qcp_type = 1;
+				if (add_ext)
+					strcat(szName, ".qcp");
+				qcp_type = 1;
 				memcpy(GUID, QCP_QCELP_GUID_1, sizeof(char)*16);
 				gf_export_message(dumper, GF_OK, "Extracting QCELP-13K (QCP file)");
 				break;
@@ -836,15 +883,15 @@
 				memcpy(GUID, QCP_SMV_GUID, sizeof(char)*16);
 				if (dumper->flags & GF_EXPORT_PROBE_ONLY) dumper->flags |= GF_EXPORT_USE_QCP;
 				break;
-			case 0xD1: 
+			case 0xD1: /* OTI in the user private range already assigned to GPAC's internal GPAC_OTI_SCENE_SVG_GZ */
 				if (dcfg->decoderSpecificInfo && (dcfg->decoderSpecificInfo->dataLength==8)
-					&& !strnicmp(dcfg->decoderSpecificInfo->data, "pvmm", 4)) {
+				        && !strnicmp(dcfg->decoderSpecificInfo->data, "pvmm", 4)) {
 					qcp_type = 3;
 					memcpy(GUID, QCP_EVRC_GUID, sizeof(char)*16);
 					if (dumper->flags & GF_EXPORT_PROBE_ONLY) dumper->flags |= GF_EXPORT_USE_QCP;
 					break;
 				}
-				/*fall through*/
+			/*fall through*/
 			default:
 				gf_odf_desc_del((GF_Descriptor *) dcfg);
 				return gf_export_message(dumper, GF_NOT_SUPPORTED, "Unknown audio in track ID %d - use NHNT", dumper->trackID);
@@ -854,11 +901,11 @@
 			switch (dcfg->objectTypeIndication)
 			{
 			case GPAC_OTI_MEDIA_SUBPIC:
-				is_vobsub = 1;
+				is_vobsub = GF_TRUE;
 				dsi = dcfg->decoderSpecificInfo->data;
 				dcfg->decoderSpecificInfo->data = NULL;
 				dsi_size = dcfg->decoderSpecificInfo->dataLength;
-				if (add_ext) 
+				if (add_ext)
 					strcat(szName, ".idx");
 				gf_export_message(dumper, GF_OK, "Extracting NeroDigital VobSub subpicture stream");
 				break;
@@ -873,17 +920,19 @@
 		}
 		gf_odf_desc_del((GF_Descriptor *) dcfg);
 	} else {
+		/* Not using the MPEG-4 Descriptor Framework */
 		if (m_stype==GF_ISOM_SUBTYPE_3GP_AMR) {
-			if (add_ext) 
+			if (add_ext)
 				strcat(szName, ".amr");
 			gf_export_message(dumper, GF_OK, "Extracting AMR Audio");
 		} else if (m_stype==GF_ISOM_SUBTYPE_3GP_AMR_WB) {
-			if (add_ext) 
+			if (add_ext)
 				strcat(szName, ".awb");
 			gf_export_message(dumper, GF_OK, "Extracting AMR WideBand Audio");
 		} else if (m_stype==GF_ISOM_SUBTYPE_3GP_QCELP) {
-			if (add_ext) 
-				strcat(szName, ".qcp"); qcp_type = 1;
+			if (add_ext)
+				strcat(szName, ".qcp");
+			qcp_type = 1;
 			memcpy(GUID, QCP_QCELP_GUID_1, sizeof(char)*16);
 			gf_export_message(dumper, GF_OK, "Extracting QCELP-13K (QCP file)");
 		} else if (m_stype==GF_ISOM_SUBTYPE_3GP_EVRC) {
@@ -896,52 +945,79 @@
 			if (dumper->flags & GF_EXPORT_PROBE_ONLY) dumper->flags |= GF_EXPORT_USE_QCP;
 		} else if (m_stype==GF_ISOM_SUBTYPE_3GP_H263) {
 			gf_export_message(dumper, GF_OK, "Extracting H263 Video");
-			if (add_ext) 
+			if (add_ext)
 				strcat(szName, ".263");
 		} else if (m_stype==GF_4CC('x','d','v','b')) {
-			gf_export_message(dumper, GF_OK, "Extracting MPEG-2 Video");
-			if (add_ext) 
+			gf_export_message(dumper, GF_OK, "Extracting MPEG-2 Video (xdvb)");
+			if (add_ext)
 				strcat(szName, ".m2v");
 		} else if (m_stype==GF_ISOM_SUBTYPE_3GP_DIMS) {
-			return gf_media_export_nhml(dumper, 1);
-		} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264) 
-				|| (m_stype==GF_ISOM_SUBTYPE_AVC2_H264) 
-				|| (m_stype==GF_ISOM_SUBTYPE_AVC3_H264) 
-				|| (m_stype==GF_ISOM_SUBTYPE_AVC4_H264) 
-				|| (m_stype==GF_ISOM_SUBTYPE_SVC_H264)
-			) {
+			return gf_media_export_nhml(dumper, GF_TRUE);
+		} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264)
+		           || (m_stype==GF_ISOM_SUBTYPE_AVC2_H264)
+		           || (m_stype==GF_ISOM_SUBTYPE_AVC3_H264)
+		           || (m_stype==GF_ISOM_SUBTYPE_AVC4_H264)
+		           || (m_stype==GF_ISOM_SUBTYPE_SVC_H264)
+		          ) {
 			avccfg = gf_isom_avc_config_get(dumper->file, track, 1);
 			svccfg = gf_isom_svc_config_get(dumper->file, track, 1);
-			if (add_ext) 
+			if (add_ext)
 				strcat(szName, ".h264");
 			gf_export_message(dumper, GF_OK, "Extracting MPEG-4 AVC-H264 stream to h264");
-		} else if ((m_stype==GF_ISOM_SUBTYPE_HEV1) 
-				|| (m_stype==GF_ISOM_SUBTYPE_HVC1) 
-				|| (m_stype==GF_ISOM_SUBTYPE_HVC2) 
-				|| (m_stype==GF_ISOM_SUBTYPE_HEV2) 
-				|| (m_stype==GF_ISOM_SUBTYPE_SHC1) 
-				|| (m_stype==GF_ISOM_SUBTYPE_SHV1) 
-			) {
+		} else if ((m_stype==GF_ISOM_SUBTYPE_HEV1)
+		           || (m_stype==GF_ISOM_SUBTYPE_HVC1)
+		           || (m_stype==GF_ISOM_SUBTYPE_HVC2)
+		           || (m_stype==GF_ISOM_SUBTYPE_HEV2)
+		           || (m_stype==GF_ISOM_SUBTYPE_SHC1)
+		           || (m_stype==GF_ISOM_SUBTYPE_SHV1)
+		          ) {
 			hevccfg = gf_isom_hevc_config_get(dumper->file, track, 1);
 			shvccfg = gf_isom_shvc_config_get(dumper->file, track, 1);
-			if (add_ext) 
+			if (add_ext)
 				strcat(szName, ".hvc");
 			gf_export_message(dumper, GF_OK, "Extracting MPEG-H HEVC stream to hevc");
 		} else if (m_type==GF_ISOM_MEDIA_FLASH) {
 			gf_export_message(dumper, GF_OK, "Extracting Macromedia Flash Movie");
-			if (add_ext) 
+			if (add_ext)
 				strcat(szName, ".swf");
+		} else if (m_stype==GF_ISOM_SUBTYPE_MP3) {
+			gf_export_message(dumper, GF_OK, "Extracting MPEG-1/2 Audio");
+			if (add_ext)
+				strcat(szName, ".mp3");
 		} else if (m_stype==GF_ISOM_SUBTYPE_AC3) {
 			gf_export_message(dumper, GF_OK, "Extracting AC3 Audio");
-			if (add_ext) 
-				strcat(szName, ".ac3");
+			if (add_ext) {
+				GF_AC3Config *cfg = gf_isom_ac3_config_get(dumper->file, track, 1);
+				if (cfg->is_ec3)
+					strcat(szName, ".ec3");
+				else
+					strcat(szName, ".ac3");
+				gf_free(cfg);
+			}
 		} else if (m_stype==GF_ISOM_SUBTYPE_WVTT) {
 			gf_export_message(dumper, GF_OK, "Extracting WebVTT");
-            is_webvtt = GF_TRUE;
-			strcat(szName, ".vtt");
-		} else if (m_stype==GF_ISOM_SUBTYPE_STSE) {
-			gf_export_message(dumper, GF_OK, "Extracting Simple Text");
-			strcat(szName, ".txt");
+			is_webvtt = GF_TRUE;
+			if (add_ext)
+				strcat(szName, ".vtt");
+		} else if (m_stype==GF_ISOM_SUBTYPE_STXT) {
+			gf_export_message(dumper, GF_OK, "Extracting Simple Text Stream");
+			if (add_ext) {
+				char *mime;
+				if (gf_isom_stxt_info_get(dumper->file, track, 1, &mime, &stxtcfg) == GF_OK) {
+					if (mime && !strcmp(mime, "image/svg+xml")) {
+						strcat(szName, ".svg");
+					} else {
+						strcat(szName, ".txt");
+					}
+				} else {
+					strcat(szName, ".txt");
+				}
+			}
+		} else if (m_stype==GF_ISOM_SUBTYPE_STPP) {
+			gf_export_message(dumper, GF_OK, "Extracting XML Subtitles");
+			if (add_ext)
+				strcat(szName, ".xml");
+			return gf_export_message(dumper, GF_NOT_SUPPORTED, "XML Subtitles re-assembling is not supported yet.", dumper->trackID);
 		} else {
 			if (add_ext) {
 				strcat(szName, ".");
@@ -949,12 +1025,17 @@
 			}
 			udesc = gf_isom_get_generic_sample_description(dumper->file, track, 1);
 			if (udesc) {
-				dsi = udesc->extension_buf; udesc->extension_buf = NULL;
+				dsi = udesc->extension_buf;
+				udesc->extension_buf = NULL;
 				dsi_size = udesc->extension_buf_size;
 			}
 			switch (m_type) {
-			case GF_ISOM_MEDIA_VISUAL: gf_export_message(dumper, GF_OK, "Extracting \'%s\' Video - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown"); break;
-			case GF_ISOM_MEDIA_AUDIO: gf_export_message(dumper, GF_OK, "Extracting \'%s\' Audio - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown"); break;
+			case GF_ISOM_MEDIA_VISUAL:
+				gf_export_message(dumper, GF_OK, "Extracting \'%s\' Video - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown");
+				break;
+			case GF_ISOM_MEDIA_AUDIO:
+				gf_export_message(dumper, GF_OK, "Extracting \'%s\' Audio - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown");
+				break;
 			default:
 				gf_export_message(dumper, GF_OK, "Extracting \'%s\' Track (type '%s') - Compressor %s", szEXT, gf_4cc_to_str(m_type), udesc ? udesc->compressor_name : "Unknown");
 				break;
@@ -962,7 +1043,34 @@
 			if (udesc) gf_free(udesc);
 		}
 	}
+	if (qcp_type>1) {
+		if (dumper->flags & GF_EXPORT_USE_QCP) {
+			if (add_ext)
+				strcat(szName, ".qcp");
+			gf_export_message(dumper, GF_OK, "Extracting %s audio (QCP file)", (qcp_type==2) ? "SMV" : "EVRC");
+		} else if (qcp_type==2) {
+			if (add_ext)
+				strcat(szName, ".smv");
+			gf_export_message(dumper, GF_OK, "Extracting SMV audio");
+		} else {
+			if (add_ext)
+				strcat(szName, ".evc");
+			gf_export_message(dumper, GF_OK, "Extracting EVRC audio");
+		}
+	}
+	if (aac_mode) {
+		gf_m4a_get_config(dsi, dsi_size, &a_cfg);
+		if (aac_mode==2) aac_type = a_cfg.base_object_type - 1;
+		gf_free(dsi);
+		dsi = NULL;
+	}
+	if (dumper->flags & GF_EXPORT_SVC_LAYER) {
+		gf_isom_set_nalu_extract_mode(dumper->file, track, GF_ISOM_NALU_EXTRACT_LAYER_ONLY);
+	}
+	/* The stream can be extracted and we found its DSI or config (if any), and the file extension is set up */
+
 	if (dumper->flags & GF_EXPORT_PROBE_ONLY) {
+		/* We don't need to go further in this mode */
 		if (dsi) gf_free(dsi);
 		if (avccfg) gf_odf_avc_cfg_del(avccfg);
 		if (svccfg) gf_odf_avc_cfg_del(svccfg);
@@ -970,36 +1078,20 @@
 		if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
 		return GF_OK;
 	}
-	if (dumper->flags & GF_EXPORT_SVC_LAYER)
-		gf_isom_set_nalu_extract_mode(dumper->file, track, GF_ISOM_NALU_EXTRACT_LAYER_ONLY);
-
-	if (is_ogg) return gf_dump_to_ogg(dumper, is_stdout ? NULL : szName, track);
-
-	if (is_vobsub) return gf_dump_to_vobsub(dumper, szName, track, dsi, dsi_size);
 
+	if (is_ogg) {
+		return gf_dump_to_ogg(dumper, is_stdout ? NULL : szName, track);
+	}
+	if (is_vobsub) {
+		return gf_dump_to_vobsub(dumper, szName, track, dsi, dsi_size);
+	}
 	if (is_webvtt) {
 #ifndef GPAC_DISABLE_TTXT
-        GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, char *szName, u32 track, Bool merge);
-        return gf_webvtt_dump_iso_track(dumper, szName, track, (dumper->flags & GF_EXPORT_WEBVTT_NOMERGE? GF_FALSE : GF_TRUE));
+		GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, char *szName, u32 track, Bool merge);
+		return gf_webvtt_dump_iso_track(dumper, szName, track, (dumper->flags & GF_EXPORT_WEBVTT_NOMERGE? GF_FALSE : GF_TRUE));
 #else
-        return GF_NOT_SUPPORTED;
+		return GF_NOT_SUPPORTED;
 #endif
-    }
-
-    if (qcp_type>1) {
-		if (dumper->flags & GF_EXPORT_USE_QCP) {
-			if (add_ext) 
-				strcat(szName, ".qcp");
-			gf_export_message(dumper, GF_OK, "Extracting %s audio (QCP file)", (qcp_type==2) ? "SMV" : "EVRC");
-		} else if (qcp_type==2) {
-			if (add_ext) 
-				strcat(szName, ".smv");
-			gf_export_message(dumper, GF_OK, "Extracting SMV audio");
-		} else {
-			if (add_ext) 
-				strcat(szName, ".evc");
-			gf_export_message(dumper, GF_OK, "Extracting EVRC audio");
-		}
 	}
 
 	if (is_stdout) {
@@ -1018,38 +1110,14 @@
 		if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
+
+	/* Start writing the stream out */
 	bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
 
-	if (is_aac) {
-		gf_m4a_get_config(dsi, dsi_size, &a_cfg);
-		if (is_aac==2) aac_type = a_cfg.base_object_type - 1;
-		gf_free(dsi);
-		dsi = NULL;
-	}
 	if (dsi) {
 		gf_bs_write_data(bs, dsi, dsi_size);
 		gf_free(dsi);
 	}
-#define DUMP_AVCPARAM(_params) \
-		count = gf_list_count(_params); \
-		for (i=0;i<count;i++) { \
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(_params, i); \
-			gf_bs_write_u32(bs, 1); \
-			gf_bs_write_data(bs, sl->data, sl->size); \
-		} \
-
-#define DUMP_HEVCPARAM(_params) \
-	count = gf_list_count(_params->param_array); \
-	for (i=0;i<count;i++) { \
-		u32 j; \
-		GF_HEVCParamArray *ar = gf_list_get(_params->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_u32(bs, 1); \
-			gf_bs_write_data(bs, sl->data, sl->size); \
-		} \
-	} \
-
 
 	if (avccfg) {
 		DUMP_AVCPARAM(avccfg->sequenceParameterSets);
@@ -1061,8 +1129,7 @@
 	}
 
 	if (svccfg || shvccfg) {
-		if (!(dumper->flags & GF_EXPORT_SVC_LAYER))
-		{
+		if (!(dumper->flags & GF_EXPORT_SVC_LAYER)) {
 			GF_AVCConfig *cfg;
 			GF_HEVCConfig *hcfg;
 			u32 ref_track = 0, t;
@@ -1087,13 +1154,11 @@
 
 			// copy avcC and svcC from lower layer
 			countRef = gf_isom_get_reference_count(dumper->file, track, GF_ISOM_REF_SCAL);
-			if (countRef < 0)
-			{
+			if (countRef < 0) {
 				e = gf_isom_last_error(dumper->file);
 				goto exit;
 			}
-			for (t = 2; t <= (u32) countRef; t++) // referenceIndex 1 is the base layer
-			{
+			for (t = 2; t <= (u32) countRef; t++) { // referenceIndex 1 is the base layer
 				gf_isom_get_reference(dumper->file, track, GF_ISOM_REF_SCAL, t, &ref_track);
 				cfg = gf_isom_svc_config_get(dumper->file, ref_track, 1);
 				if (cfg) {
@@ -1120,19 +1185,25 @@
 	}
 
 
-	qcp_rates = NULL;
-	count = gf_isom_get_sample_count(dumper->file, track);
-	rt_cnt = 0;
-
-	if (m_stype==GF_ISOM_SUBTYPE_3GP_AMR) gf_bs_write_data(bs, "#!AMR\n", 6);
-	else if (m_stype==GF_ISOM_SUBTYPE_3GP_AMR_WB) gf_bs_write_data(bs, "#!AMR-WB\n", 9);
-	else if ((qcp_type>1) && !(dumper->flags & GF_EXPORT_USE_QCP)) {
+	if (m_stype==GF_ISOM_SUBTYPE_3GP_AMR) {
+		gf_bs_write_data(bs, "#!AMR\n", 6);
+	} else if (m_stype==GF_ISOM_SUBTYPE_3GP_AMR_WB) {
+		gf_bs_write_data(bs, "#!AMR-WB\n", 9);
+	} else if ((qcp_type>1) && !(dumper->flags & GF_EXPORT_USE_QCP)) {
 		if (qcp_type==2) gf_bs_write_data(bs, "#!SMV\n", 6);
 		else gf_bs_write_data(bs, "#!EVRC\n", 7);
 		qcp_type = 0;
+	} else if (m_stype==GF_ISOM_SUBTYPE_STXT) {
+		if (stxtcfg) {
+			gf_bs_write_data(bs, stxtcfg, (u32)strlen(stxtcfg));
+		}
 	}
 
+	count = gf_isom_get_sample_count(dumper->file, track);
+
 	/*QCP formatting*/
+	qcp_rates = NULL;
+	rt_cnt = 0;
 	if (qcp_type) {
 		GF_ISOSample *samp;
 		Bool needs_rate_octet;
@@ -1168,17 +1239,17 @@
 		}
 
 		/*check sample format - packetvideo doesn't include rate octet...*/
-		needs_rate_octet = 1;
+		needs_rate_octet = GF_TRUE;
 		samp = gf_isom_get_sample_info(dumper->file, track, 1, NULL, NULL);
 		for (i=0; i<rt_cnt; i++) {
 			if (qcp_rates[2*i+1]==samp->dataLength) {
-				needs_rate_octet = 0;
+				needs_rate_octet = GF_FALSE;
 				break;
 			}
 		}
 		gf_isom_sample_del(&samp);
 		if (needs_rate_octet) data_size += count;
-		has_qcp_pad = (data_size % 2) ? 1 : 0;
+		has_qcp_pad = (data_size % 2) ? GF_TRUE : GF_FALSE;
 
 		avg_rate = 8*data_size*sample_rate/count/block_size;
 		/*QLCM + fmt + vrat + data*/
@@ -1225,7 +1296,7 @@
 		qcp_type = needs_rate_octet ? 1 : 0;
 	}
 
-
+	/* Start exporting samples */
 	for (i=0; i<count; i++) {
 		GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, i+1, &di);
 		if (!samp) {
@@ -1244,7 +1315,7 @@
 			remain = samp->dataLength;
 			while (remain) {
 				nal_size = 0;
-				if (remain<nal_unit_size){
+				if (remain<nal_unit_size) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Sample %d (size %d): Corrupted NAL Unit: header size %d - bytes left %d\n", i+1, samp->dataLength, nal_unit_size, remain) );
 					break;
 				}
@@ -1265,9 +1336,9 @@
 			}
 		}
 		/*adts frame header*/
-		else if (is_aac) {
+		else if (aac_mode > 0) {
 			gf_bs_write_int(bs, 0xFFF, 12);/*sync*/
-			gf_bs_write_int(bs, (is_aac==1) ? 1 : 0, 1);/*mpeg2 aac*/
+			gf_bs_write_int(bs, (aac_mode==1) ? 1 : 0, 1);/*mpeg2 aac*/
 			gf_bs_write_int(bs, 0, 2); /*layer*/
 			gf_bs_write_int(bs, 1, 1); /* protection_absent*/
 			gf_bs_write_int(bs, aac_type, 2);
@@ -1289,7 +1360,9 @@
 				}
 			}
 		}
-		if (!avccfg && !svccfg && !hevccfg && !shvccfg &!is_webvtt) gf_bs_write_data(bs, samp->data, samp->dataLength);
+		if (!avccfg && !svccfg && !hevccfg && !shvccfg &!is_webvtt) {
+			gf_bs_write_data(bs, samp->data, samp->dataLength);
+		}
 		gf_isom_sample_del(&samp);
 		gf_set_progress("Media Export", i+1, count);
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
@@ -1301,7 +1374,7 @@
 	if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
 	if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
 	gf_bs_del(bs);
-	if (!is_stdout) 
+	if (!is_stdout)
 		fclose(out);
 	return e;
 #endif /*GPAC_DISABLE_AV_PARSERS*/
@@ -1315,7 +1388,7 @@
 	u32 max_size, tot_size, num_samples, i;
 	s32 size;
 	char *comp, *frame;
-	char szOutFile[1024];	
+	char szOutFile[1024];
 	avi_t *in;
 	FILE *fout;
 
@@ -1328,16 +1401,16 @@
 		Bool key;
 		comp = AVI_video_compressor(in);
 		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, "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*/
+		   ) {
 			sprintf(szOutFile, "%s.cmp", dumper->out_name);
 		} else if (!stricmp(comp, "VSSH") || strstr(comp, "264")) {
 			sprintf(szOutFile, "%s.h264", dumper->out_name);
@@ -1350,7 +1423,7 @@
 			is_stdout = 1;
 		else if (strrchr(dumper->out_name, '.')) {
 			strcpy(szOutFile, dumper->out_name);
-		} 
+		}
 
 		fout = is_stdout ? stdout : gf_f64_open(szOutFile, "wb");
 
@@ -1389,22 +1462,54 @@
 	AVI_set_audio_position(in, 0);
 
 	switch (in->track[in->aptr].a_fmt) {
-	case WAVE_FORMAT_PCM: comp = "pcm"; break;
-	case WAVE_FORMAT_ADPCM: comp = "adpcm"; break;
-	case WAVE_FORMAT_IBM_CVSD: comp = "cvsd"; break;
-	case WAVE_FORMAT_ALAW: comp = "alaw"; break;
-	case WAVE_FORMAT_MULAW: comp = "mulaw"; break;
-	case WAVE_FORMAT_OKI_ADPCM: comp = "oki_adpcm"; break;
-	case WAVE_FORMAT_DVI_ADPCM: comp = "dvi_adpcm"; break;
-	case WAVE_FORMAT_DIGISTD: comp = "digistd"; break;
-	case WAVE_FORMAT_YAMAHA_ADPCM: comp = "yam_adpcm"; break;
-	case WAVE_FORMAT_DSP_TRUESPEECH: comp = "truespeech"; break;
-	case WAVE_FORMAT_GSM610: comp = "gsm610"; break;
-	case IBM_FORMAT_MULAW: comp = "ibm_mulaw"; break;
-	case IBM_FORMAT_ALAW: comp = "ibm_alaw"; break;
-	case IBM_FORMAT_ADPCM: comp = "ibm_adpcm"; break;
-	case 0x55: comp = "mp3"; break;
-	default: comp = "raw"; break;
+	case WAVE_FORMAT_PCM:
+		comp = "pcm";
+		break;
+	case WAVE_FORMAT_ADPCM:
+		comp = "adpcm";
+		break;
+	case WAVE_FORMAT_IBM_CVSD:
+		comp = "cvsd";
+		break;
+	case WAVE_FORMAT_ALAW:
+		comp = "alaw";
+		break;
+	case WAVE_FORMAT_MULAW:
+		comp = "mulaw";
+		break;
+	case WAVE_FORMAT_OKI_ADPCM:
+		comp = "oki_adpcm";
+		break;
+	case WAVE_FORMAT_DVI_ADPCM:
+		comp = "dvi_adpcm";
+		break;
+	case WAVE_FORMAT_DIGISTD:
+		comp = "digistd";
+		break;
+	case WAVE_FORMAT_YAMAHA_ADPCM:
+		comp = "yam_adpcm";
+		break;
+	case WAVE_FORMAT_DSP_TRUESPEECH:
+		comp = "truespeech";
+		break;
+	case WAVE_FORMAT_GSM610:
+		comp = "gsm610";
+		break;
+	case IBM_FORMAT_MULAW:
+		comp = "ibm_mulaw";
+		break;
+	case IBM_FORMAT_ALAW:
+		comp = "ibm_alaw";
+		break;
+	case IBM_FORMAT_ADPCM:
+		comp = "ibm_adpcm";
+		break;
+	case 0x55:
+		comp = "mp3";
+		break;
+	default:
+		comp = "raw";
+		break;
 	}
 	sprintf(szOutFile, "%s.%s", dumper->out_name, comp);
 	gf_export_message(dumper, GF_OK, "Extracting AVI %s audio", comp);
@@ -1413,7 +1518,7 @@
 		is_stdout = 1;
 	} else if (strrchr(dumper->out_name, '.')) {
 		strcpy(szOutFile, dumper->out_name);
-	} 
+	}
 
 	fout = is_stdout ? stdout : gf_f64_open(szOutFile, "wb");
 	num_samples = 0;
@@ -1511,7 +1616,7 @@
 		GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, i+1, &di);
 		if (!samp) break;
 		gf_fwrite(samp->data, samp->dataLength, 1, out_med);
-		
+
 		/*dump nhnt info*/
 		gf_bs_write_u24(bs, samp->dataLength);
 		gf_bs_write_int(bs, samp->IsRAP, 1);
@@ -1610,7 +1715,7 @@
 	pos = 0;
 	rate = 0;
 	ts = gf_isom_get_media_timescale(infile, inTrackNum);
-	count = gf_isom_get_sample_count(infile, inTrackNum); 
+	count = gf_isom_get_sample_count(infile, inTrackNum);
 	for (i=0; i<count; i++) {
 		samp = gf_isom_get_sample(infile, inTrackNum, i+1, &di);
 		gf_isom_add_sample(outfile, newTk, descIndex, samp);
@@ -1631,13 +1736,13 @@
 
 	if (msubtype == GF_ISOM_SUBTYPE_MPEG4_CRYP) {
 		esd = gf_isom_get_esd(infile, inTrackNum, 1);
-	} else if ((msubtype == GF_ISOM_SUBTYPE_AVC_H264) 
-		|| (msubtype == GF_ISOM_SUBTYPE_AVC2_H264) 
-		|| (msubtype == GF_ISOM_SUBTYPE_AVC3_H264) 
-		|| (msubtype == GF_ISOM_SUBTYPE_AVC4_H264) 
-	) {
+	} else if ((msubtype == GF_ISOM_SUBTYPE_AVC_H264)
+	           || (msubtype == GF_ISOM_SUBTYPE_AVC2_H264)
+	           || (msubtype == GF_ISOM_SUBTYPE_AVC3_H264)
+	           || (msubtype == GF_ISOM_SUBTYPE_AVC4_H264)
+	          ) {
 		return gf_isom_set_pl_indication(outfile, GF_ISOM_PL_VISUAL, 0x0F);
-	} 
+	}
 	/*likely 3gp or any non-MPEG-4 isomedia file*/
 	else if (!esd) return gf_isom_remove_root_od(outfile);
 
@@ -1694,7 +1799,7 @@
 	default:
 		break;
 	}
-	if (iod) gf_odf_desc_del((GF_Descriptor *) iod);	
+	if (iod) gf_odf_desc_del((GF_Descriptor *) iod);
 	gf_odf_desc_del((GF_Descriptor *)esd);
 
 	if (AddToIOD) gf_isom_add_track_to_root_od(outfile, newTk);
@@ -1726,7 +1831,7 @@
 	}
 	if (strrchr(dumper->out_name, '.')) {
 		strcpy(szName, dumper->out_name);
-	} else {	
+	} else {
 		ext = (char *) gf_isom_get_filename(dumper->file);
 		if (ext) ext = strrchr(ext, '.');
 		sprintf(szName, "%s%s", dumper->out_name, ext ? ext : ".mp4");
@@ -1789,13 +1894,13 @@
 	esd = gf_isom_get_esd(dumper->file, track, 1);
 	if (!esd) return gf_export_message(dumper, GF_NON_COMPLIANT_BITSTREAM, "Invalid MPEG-4 stream in track ID %d", dumper->trackID);
 
-	if ((esd->decoderConfig->streamType!=GF_STREAM_VISUAL) || 
-	( (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_HEVC)
-		&& (esd->decoderConfig->objectTypeIndication!=GPAC_OTI_VIDEO_SHVC)
-	) ) {
+	if ((esd->decoderConfig->streamType!=GF_STREAM_VISUAL) ||
+	        ( (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_HEVC)
+	          && (esd->decoderConfig->objectTypeIndication!=GPAC_OTI_VIDEO_SHVC)
+	        ) ) {
 		gf_odf_desc_del((GF_Descriptor*)esd);
 		return gf_export_message(dumper, GF_NON_COMPLIANT_BITSTREAM, "Track ID %d is not MPEG-4 Visual - cannot extract to AVI", dumper->trackID);
 	}
@@ -1826,15 +1931,15 @@
 
 	frame_d = 0;
 	/*AVC - FIXME dump format is probably wrong...*/
-	if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)){
+	if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
 		gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
 		v4CC = "h264";
-	} 
+	}
 	/*HEVC - FIXME dump format is probably wrong...*/
-	else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SHVC)){
+	else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SHVC)) {
 		gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
 		v4CC = "hevc";
-	} 
+	}
 	/*MPEG4*/
 	else {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -1982,7 +2087,7 @@
 			if (mtype==GF_ISOM_MEDIA_VISUAL) {
 				fprintf(nhml, "codecVendor=\"%s\" codecVersion=\"%d\" codecRevision=\"%d\" ", gf_4cc_to_str(sdesc->vendor_code), sdesc->version, sdesc->revision);
 				fprintf(nhml, "width=\"%d\" height=\"%d\" compressorName=\"%s\" temporalQuality=\"%d\" spatialQuality=\"%d\" horizontalResolution=\"%d\" verticalResolution=\"%d\" bitDepth=\"%d\" ",
-					sdesc->width, sdesc->height, sdesc->compressor_name, sdesc->temporal_quality, sdesc->spatial_quality, sdesc->h_res, sdesc->v_res, sdesc->depth);
+				        sdesc->width, sdesc->height, sdesc->compressor_name, sdesc->temporal_quality, sdesc->spatial_quality, sdesc->h_res, sdesc->v_res, sdesc->depth);
 			} else if (mtype==GF_ISOM_MEDIA_AUDIO) {
 				fprintf(nhml, "codecVendor=\"%s\" codecVersion=\"%d\" codecRevision=\"%d\" ", gf_4cc_to_str(sdesc->vendor_code), sdesc->version, sdesc->revision);
 				fprintf(nhml, "sampleRate=\"%d\" numChannels=\"%d\" bitsPerSample=\"%d\" ", sdesc->samplerate, sdesc->nb_channels, sdesc->bits_per_sample);
@@ -2001,7 +2106,7 @@
 
 	if (gf_isom_is_track_in_root_od(dumper->file, track)) fprintf(nhml, "inRootOD=\"yes\" ");
 	fprintf(nhml, "trackID=\"%d\" ", dumper->trackID);
-	
+
 	uncompress = 0;
 
 	if (mstype == GF_ISOM_MEDIA_DIMS) {
@@ -2024,8 +2129,8 @@
 	} else {
 		fprintf(nhml, "baseMediaFile=\"%s\" ", szMedia);
 	}
-	
-	
+
+
 	fprintf(nhml, ">\n");
 
 
@@ -2046,7 +2151,7 @@
 				u16 size = gf_bs_read_u16(bs);
 				u8 flags = gf_bs_read_u8(bs);
 				u8 prev;
-				
+
 				if (pos+size+2>samp->dataLength)
 					break;
 
@@ -2103,7 +2208,7 @@
 					gf_fwrite(samp->data+pos+3, size-1, 1, nhml);
 				}
 				fprintf(nhml, "</DIMSUnit>\n");
-				
+
 				samp->data[pos+2+size] = prev;
 				gf_bs_skip_bytes(bs, size-1);
 			}
@@ -2112,8 +2217,8 @@
 		} else {
 			fprintf(nhml, "<NHNTSample DTS=\""LLU"\" dataLength=\"%d\" ", LLU_CAST samp->DTS, samp->dataLength);
 			if (full_dump || samp->CTS_Offset) fprintf(nhml, "CTSOffset=\"%u\" ", samp->CTS_Offset);
-			if (samp->IsRAP==1) fprintf(nhml, "isRAP=\"yes\" ");
-			else if (samp->IsRAP==2) fprintf(nhml, "isSyncShadow=\"yes\" ");
+			if (samp->IsRAP==RAP) fprintf(nhml, "isRAP=\"yes\" ");
+			else if (samp->IsRAP==RAP_REDUNDANT) fprintf(nhml, "isSyncShadow=\"yes\" ");
 			else if (full_dump) fprintf(nhml, "isRAP=\"no\" ");
 			if (full_dump) fprintf(nhml, "mediaOffset=\"%d\" ", pos);
 			fprintf(nhml, "/>\n");
@@ -2143,7 +2248,7 @@
 	u32 w, h;
 	u32 track, i, di, count, pos;
 	u32 mtype, mstype;
-	Bool isText; 
+	Bool isText;
 	char *mime = NULL;
 	Bool useBase64 = GF_FALSE;
 	u32 headerLength = 0;
@@ -2189,18 +2294,18 @@
 	fprintf(vtt, "WEBVTT Metadata track generated by GPAC MP4Box %s\n", GPAC_FULL_VERSION);
 	fprintf(vtt, "kind:metadata\n");
 	{
-		/* TODO: use BCP 47 strings */
-		char lang[4];
-		gf_isom_get_media_language(dumper->file, track, lang);
+		char *lang;
+		gf_isom_get_media_language(dumper->file, track, &lang);
 		fprintf(vtt, "language:%s\n", lang);
+		gf_free(lang);
 	}
 	{
 		const char *handler;
 		gf_isom_get_handler_name(dumper->file, track, &handler);
 		fprintf(vtt, "label: %s\n", handler);
-	}	
+	}
 	if (gf_isom_is_track_in_root_od(dumper->file, track)) fprintf(vtt, "inRootOD: yes\n");
-	fprintf(vtt, "trackID: %d\n", dumper->trackID);	
+	fprintf(vtt, "trackID: %d\n", dumper->trackID);
 	if (med) {
 		fprintf(vtt, "baseMediaFile: %s\n", szMedia);
 	}
@@ -2236,7 +2341,7 @@
 				if (mstype == GF_ISOM_SUBTYPE_WVTT) {
 					/* Warning: Just use -raw export */
 					mime = "text/vtt";
-				} else if (mstype == GF_ISOM_SUBTYPE_STSE) {
+				} else if (mstype == GF_ISOM_SUBTYPE_STXT) {
 					/* TODO: find the mime type from the ESD, assume SVG for now */
 					mime = "image/svg+xml";
 				} else if (mstype == GF_ISOM_SUBTYPE_STPP) {
@@ -2244,7 +2349,7 @@
 					mime = "application/ttml+xml";
 				}
 				if (dumper->flags & GF_EXPORT_WEBVTT_META_EMBEDDED) {
-					if (mstype == GF_ISOM_SUBTYPE_STSE) {
+					if (mstype == GF_ISOM_SUBTYPE_STXT) {
 						if (esd->decoderConfig->decoderSpecificInfo->dataLength) {
 							fprintf(vtt, "text-header: \n");
 							gf_webvtt_dump_header_boxed(vtt, esd->decoderConfig->decoderSpecificInfo->data+4, esd->decoderConfig->decoderSpecificInfo->dataLength, &headerLength);
@@ -2256,7 +2361,7 @@
 				}
 			} else
 #endif
-            {
+			{
 				char b64[200];
 				u32 size = gf_base64_encode(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, b64, 200);
 				useBase64 = GF_TRUE;
@@ -2331,8 +2436,8 @@
 				fprintf(vtt, "dataLength:%d ", samp->dataLength);
 			}
 			if (samp->CTS_Offset) fprintf(vtt, "CTS: "LLD"", samp->DTS+samp->CTS_Offset);
-			if (samp->IsRAP==1) fprintf(vtt, "isRAP:true ");
-			else if (samp->IsRAP==2) fprintf(vtt, "isSyncShadow: true ");
+			if (samp->IsRAP==RAP) fprintf(vtt, "isRAP:true ");
+			else if (samp->IsRAP==RAP_REDUNDANT) fprintf(vtt, "isSyncShadow: true ");
 			else fprintf(vtt, "isRAP:false ");
 			fprintf(vtt, "\n");
 		}
@@ -2401,21 +2506,21 @@
 
 	sprintf(szName, "%s.six", dumper->out_name);
 	szRootName = "stream";
-	
+
 	six = gf_f64_open(szName, "wt");
 	if (!six) {
 		fclose(media);
 		if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
-/*
-	mtype = gf_isom_get_media_type(dumper->file, track);
-	if (mtype==GF_ISOM_MEDIA_TEXT || mtype == GF_ISOM_MEDIA_SUBM || mtype == GF_ISOM_MEDIA_SUBT) {
-		isText = GF_TRUE;
-	} else {
-		isText = GF_FALSE;
-	}
-*/
+	/*
+		mtype = gf_isom_get_media_type(dumper->file, track);
+		if (mtype==GF_ISOM_MEDIA_TEXT || mtype == GF_ISOM_MEDIA_SUBM || mtype == GF_ISOM_MEDIA_SUBT) {
+			isText = GF_TRUE;
+		} else {
+			isText = GF_FALSE;
+		}
+	*/
 	mstype = gf_isom_get_media_subtype(dumper->file, track, 1);
 
 	/*write header*/
@@ -2427,14 +2532,14 @@
 	if (esd) {
 		if (esd->decoderConfig->decoderSpecificInfo  && esd->decoderConfig->decoderSpecificInfo->data) {
 #ifndef GPAC_DISABLE_TTXT
-			if (mstype == GF_ISOM_SUBTYPE_WVTT || mstype == GF_ISOM_SUBTYPE_STSE) {
-				gf_webvtt_dump_header_boxed(media, 
-											esd->decoderConfig->decoderSpecificInfo->data+4, 
-											esd->decoderConfig->decoderSpecificInfo->dataLength, 
-											&header_size);
+			if (mstype == GF_ISOM_SUBTYPE_WVTT || mstype == GF_ISOM_SUBTYPE_STXT) {
+				gf_webvtt_dump_header_boxed(media,
+				                            esd->decoderConfig->decoderSpecificInfo->data+4,
+				                            esd->decoderConfig->decoderSpecificInfo->dataLength,
+				                            &header_size);
 			} else
 #endif
-            {
+			{
 				gf_fwrite(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 1, media);
 				header_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
 			}
@@ -2460,8 +2565,8 @@
 		}
 
 		fprintf(six, "<unit time=\""LLU"\" ", LLU_CAST samp->DTS);
-		if (samp->IsRAP==1) fprintf(six, "rap=\"1\" ");
-		else if (samp->IsRAP==0) fprintf(six, "rap=\"0\" ");
+		if (samp->IsRAP==RAP) fprintf(six, "rap=\"1\" ");
+		else if (samp->IsRAP==RAP_NO) fprintf(six, "rap=\"0\" ");
 		fprintf(six, "range-begin=\"%d\" ", pos);
 		fprintf(six, "range-end=\"%d\" ", pos+samp->dataLength-1);
 		fprintf(six, "/>\n");
@@ -2478,7 +2583,7 @@
 
 }
 
-typedef struct 
+typedef struct
 {
 	u32 track_num, stream_id, last_sample, nb_samp;
 } SAFInfo;
@@ -2525,12 +2630,24 @@
 		} else {
 			char *mime = NULL;
 			switch (gf_isom_get_media_subtype(dumper->file, i+1, 1)) {
-			case GF_ISOM_SUBTYPE_3GP_H263: mime = "video/h263"; break;
-			case GF_ISOM_SUBTYPE_3GP_AMR: mime = "audio/amr"; break;
-			case GF_ISOM_SUBTYPE_3GP_AMR_WB: mime = "audio/amr-wb"; break;
-			case GF_ISOM_SUBTYPE_3GP_EVRC: mime = "audio/evrc"; break;
-			case GF_ISOM_SUBTYPE_3GP_QCELP: mime = "audio/qcelp"; break;
-			case GF_ISOM_SUBTYPE_3GP_SMV: mime = "audio/smv"; break;
+			case GF_ISOM_SUBTYPE_3GP_H263:
+				mime = "video/h263";
+				break;
+			case GF_ISOM_SUBTYPE_3GP_AMR:
+				mime = "audio/amr";
+				break;
+			case GF_ISOM_SUBTYPE_3GP_AMR_WB:
+				mime = "audio/amr-wb";
+				break;
+			case GF_ISOM_SUBTYPE_3GP_EVRC:
+				mime = "audio/evrc";
+				break;
+			case GF_ISOM_SUBTYPE_3GP_QCELP:
+				mime = "audio/qcelp";
+				break;
+			case GF_ISOM_SUBTYPE_3GP_SMV:
+				mime = "audio/smv";
+				break;
 			}
 			if (!mime) continue;
 			stream_id = gf_isom_get_track_id(dumper->file, i+1);
@@ -2566,7 +2683,7 @@
 			GF_ISOSample *samp;
 			if (safs[i].last_sample==safs[i].nb_samp) continue;
 			samp = gf_isom_get_sample(dumper->file, safs[i].track_num, safs[i].last_sample + 1, &di);
-			gf_saf_mux_add_au(mux, safs[i].stream_id, (u32) (samp->DTS+samp->CTS_Offset), samp->data, samp->dataLength, samp->IsRAP);
+			gf_saf_mux_add_au(mux, safs[i].stream_id, (u32) (samp->DTS+samp->CTS_Offset), samp->data, samp->dataLength, (samp->IsRAP==RAP) ? 1 : 0);
 			/*data is kept by muxer!!*/
 			gf_free(samp);
 			safs[i].last_sample++;
@@ -2580,7 +2697,7 @@
 		}
 		gf_set_progress("SAF Export", samp_done, tot_samp);
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
-	}	
+	}
 	gf_saf_mux_for_time(mux, (u32) -1, 1, &data, &size);
 	if (data) {
 		gf_fwrite(data, size, 1, saf_f);
@@ -2598,23 +2715,51 @@
 
 #ifndef GPAC_DISABLE_MPEG2TS
 
-void m2ts_export_check(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+void m2ts_export_check(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
 {
 //	if (evt_type == GF_M2TS_EVT_PAT_REPEAT) ts->user = NULL;
 	if (evt_type == GF_M2TS_EVT_PMT_REPEAT) ts->user = NULL;
 	else if (evt_type == GF_M2TS_EVT_PAT_FOUND) ts->segment_switch = 1;
 }
-void m2ts_export_dump(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+
+struct _ts_export
 {
+	FILE *dst;
+	Bool is_latm;
+};
+
+void m2ts_export_dump(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
+{
+	struct _ts_export *tsx = (struct _ts_export *) ts->user;
+
 	if (evt_type == GF_M2TS_EVT_PES_PCK) {
-		FILE *dst = (FILE*)ts->user;
 		GF_M2TS_PES_PCK *pck = (GF_M2TS_PES_PCK *)par;
-		gf_fwrite(pck->data, pck->data_len, 1, dst);
+
+		if (tsx->is_latm) {
+			GF_BitStream *bs = gf_bs_from_file(tsx->dst, 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*/
+
+			gf_bs_write_int(bs, pck->stream->aud_aac_obj_type - 1 , 2);
+
+			gf_bs_write_int(bs, pck->stream->aud_aac_sr_idx, 4);
+			gf_bs_write_int(bs, 0, 1);
+			gf_bs_write_int(bs, pck->stream->aud_nb_ch, 3);
+			gf_bs_write_int(bs, 0, 4);
+			gf_bs_write_int(bs, 7+pck->data_len, 13);
+			gf_bs_write_int(bs, 0x7FF, 11);
+			gf_bs_write_int(bs, 0, 2);
+
+			gf_bs_del(bs);
+		}
+		gf_fwrite(pck->data, pck->data_len, 1, tsx->dst);
 	}
 	else if (evt_type == GF_M2TS_EVT_SL_PCK) {
-		FILE *dst = (FILE*)ts->user;
 		GF_M2TS_SL_PCK *pck = (GF_M2TS_SL_PCK *)par;
-		gf_fwrite(pck->data + 5, pck->data_len - 5, 1, dst);
+		gf_fwrite(pck->data + 5, pck->data_len - 5, 1, tsx->dst);
 	}
 }
 
@@ -2626,10 +2771,11 @@
 	u64 size, fsize, fdone;
 	Bool is_stdout=0;
 	GF_M2TS_Demuxer *ts;
-	FILE *src, *dst;
+	FILE *src;
+	struct _ts_export tsx;
 
 	if (dumper->flags & GF_EXPORT_PROBE_ONLY) return GF_OK;
-	
+
 	src = gf_f64_open(dumper->in_name, "rb");
 	if (!src) return gf_export_message(dumper, GF_CODEC_NOT_FOUND, "Error opening %s", dumper->in_name);
 
@@ -2673,6 +2819,7 @@
 		return gf_export_message(dumper, GF_URL_ERROR, "Cannot find PID %d in transport stream", dumper->trackID);
 	}
 
+	tsx.is_latm = 0;
 	sprintf(szFile, "%s_pid%d", dumper->out_name ? dumper->out_name : "", stream->pid);
 	switch (stream->stream_type) {
 	case GF_M2TS_VIDEO_MPEG1:
@@ -2695,6 +2842,11 @@
 		strcat(szFile, ".aac");
 		gf_export_message(dumper, GF_OK, "Extracting MPEG-4 Audio stream to aac");
 		break;
+	case GF_M2TS_AUDIO_LATM_AAC:
+		strcat(szFile, ".aac");
+		tsx.is_latm = 1;
+		gf_export_message(dumper, GF_OK, "Extracting MPEG-4 Audio LATM stream to aac");
+		break;
 	case GF_M2TS_VIDEO_MPEG4:
 		strcat(szFile, ".cmp");
 		gf_export_message(dumper, GF_OK, "Extracting MPEG-4 Visual stream to cmp");
@@ -2724,8 +2876,8 @@
 	if (dumper->out_name && !strcmp(dumper->out_name, "std"))
 		is_stdout=1;
 
-	dst = is_stdout ? stdout : gf_f64_open(szFile, "wb");
-	if (!dst) {
+	tsx.dst = is_stdout ? stdout : gf_f64_open(szFile, "wb");
+	if (!tsx.dst) {
 		fclose(src);
 		gf_m2ts_demux_del(ts);
 		return gf_export_message(dumper, GF_IO_ERR, "Cannot open file %s for writing", szFile);
@@ -2734,7 +2886,7 @@
 	gf_m2ts_reset_parsers(ts);
 	gf_f64_seek(src, 0, SEEK_SET);
 	fdone = 0;
-	ts->user = dst;
+	ts->user = &tsx;
 	ts->on_event = m2ts_export_dump;
 	while (!feof(src)) {
 		size = fread(data, 1, 188, src);
@@ -2748,7 +2900,7 @@
 	gf_set_progress("MPEG-2 TS Extract", fsize, fsize);
 
 	if (!is_stdout)
-		fclose(dst);
+		fclose(tsx.dst);
 	fclose(src);
 	gf_m2ts_demux_del(ts);
 	return GF_OK;
@@ -2761,7 +2913,7 @@
 {
 	if (!dumper) return GF_BAD_PARAM;
 	if (!dumper->out_name && !(dumper->flags & GF_EXPORT_PROBE_ONLY)) return GF_BAD_PARAM;
-	
+
 	if (dumper->flags & GF_EXPORT_NATIVE) {
 #ifndef GPAC_DISABLE_MPEG2TS
 		if (dumper->in_name) {

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/media_import.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/media_import.c Changed

@@ -46,13 +46,13 @@
 GF_Err gf_import_message(GF_MediaImporter *import, GF_Err e, char *format, ...)
 {
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_AUTHOR, e ? GF_LOG_ERROR : GF_LOG_INFO)) {
+	if (gf_log_tool_level_on(GF_LOG_AUTHOR, e ? GF_LOG_WARNING : GF_LOG_INFO)) {
 		va_list args;
 		char szMsg[1024];
 		va_start(args, format);
 		vsprintf(szMsg, format, args);
 		va_end(args);
-		GF_LOG((u32) (e ? GF_LOG_ERROR : GF_LOG_INFO), GF_LOG_AUTHOR, ("%s\n", szMsg) );
+		GF_LOG((u32) (e ? GF_LOG_WARNING : GF_LOG_INFO), GF_LOG_AUTHOR, ("%s\n", szMsg) );
 	}
 #endif
 	return e;
@@ -70,8 +70,8 @@
 
 	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)
-	) {
+	        || (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);
@@ -118,7 +118,7 @@
 	esd->decoderConfig->avgBitrate = 0;
 	esd->decoderConfig->maxBitrate = 0;
 	rate = max_rate = avg_rate = time_wnd = 0;
-	
+
 	timescale = gf_isom_get_media_timescale(file, track);
 	count = gf_isom_get_sample_count(file, track);
 	for (i=0; i<count; i++) {
@@ -176,12 +176,15 @@
 	GF_BitStream *bs;
 	GF_Err e;
 	Bool destroy_esd;
-	u32 size, track, di, w, h, dsi_len, mtype;
+	u32 size, track, di, w, h, dsi_len, mtype, id;
 	GF_ISOSample *samp;
 	u8 OTI;
 	char *dsi, *data;
 	FILE *src;
+	Bool import_mpeg4 = 0;
 
+	if (import->flags & GF_IMPORT_FORCE_MPEG4) import_mpeg4 = 1;
+	else if (import->esd)  import_mpeg4 = 1;
 
 	src = gf_f64_open(import->in_name, "rb");
 	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
@@ -195,7 +198,8 @@
 
 	/*get image size*/
 	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
-	gf_img_parse(bs, &OTI, &mtype, &w, &h, &dsi, &dsi_len);
+	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) {
@@ -225,46 +229,79 @@
 
 	e = GF_OK;
 	destroy_esd = 0;
-	if (!import->esd) {
-		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = 1;
-	}
-	/*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 = 0;
+	if (import_mpeg4) {
+
+		if (!import->esd) {
+			import->esd = gf_odf_desc_esd_new(2);
+			destroy_esd = 1;
+		}
+		/*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, import->esd->ESID);
+	if (mult_desc_allowed)
+		track = gf_isom_get_track_by_id(import->dest, id);
 	if (!track)
-		track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_VISUAL, 1000);
+		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->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;
+	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_4CC('j', 'p', 'e', 'g');
+			break;
+		case GPAC_OTI_IMAGE_PNG:
+			udesc.codec_tag = GF_4CC('p', 'n', 'g', ' ');
+			break;
+		case GPAC_OTI_IMAGE_JPEG_2000:
+			udesc.codec_tag = GF_4CC('j', 'p', '2', 'k');
+			break;
+		}
+		udesc.width = w;
+		udesc.height = h;
+		udesc.v_res = 72;
+		udesc.h_res = 72;
+		udesc.depth = 24;
+		memcpy(udesc.compressor_name, "\4JPEG", 5);
+
+		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 = 1;
+	samp->IsRAP = RAP;
 	samp->dataLength = size;
 	if (import->initial_time_offset) samp->DTS = (u64) (import->initial_time_offset*1000);
 
@@ -287,6 +324,9 @@
 	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);
@@ -357,7 +397,7 @@
 
 
 	track = 0;
-	if (mult_desc_allowed) 
+	if (mult_desc_allowed)
 		track = gf_isom_get_track_by_id(import->dest, import->esd->ESID);
 	if (!track)
 		track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_SCENE, 1000);
@@ -373,7 +413,7 @@
 	if (e) goto exit;
 	//gf_isom_set_visual_info(import->dest, track, di, w, h);
 	samp = gf_isom_sample_new();
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 	samp->dataLength = size;
 	if (import->initial_time_offset) samp->DTS = (u64) (import->initial_time_offset*1000);
 
@@ -415,6 +455,7 @@
 	GF_Err e;
 	u16 sr;
 	u32 nb_chan;
+	Bool force_mpeg4 = 0;
 	FILE *in;
 	u32 hdr, size, max_size, track, di;
 	u64 done, tot_size, offset, duration;
@@ -452,7 +493,12 @@
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(2);
 		destroy_esd = 1;
+	} else {
+		force_mpeg4 = 1;
 	}
+	if (import->flags & GF_IMPORT_FORCE_MPEG4)
+		force_mpeg4 = 1;
+
 	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*/
@@ -475,7 +521,17 @@
 	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;
-	gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
+
+	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_4CC('.', 'm', 'p', '3');
+		memcpy(udesc.compressor_name, "\3MP3", 4);
+		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);
 
 	gf_f64_seek(in, 0, SEEK_END);
@@ -484,7 +540,7 @@
 
 	e = GF_OK;
 	samp = gf_isom_sample_new();
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 
 	duration = import->duration;
 	duration *= sr;
@@ -639,7 +695,7 @@
 				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++) {
+					for (j=0; j<=num_lay; j++) {
 						u32 frameLengthType;
 						Bool same_cfg = 0;
 						if (i || j) same_cfg = gf_bs_read_int(bs, 1);
@@ -780,10 +836,10 @@
 	e = GF_OK;
 	/*add first sample*/
 	samp = gf_isom_sample_new();
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 	samp->dataLength = nbbytes;
 	samp->data = (char *) aac_buf;
-	
+
 	e = gf_isom_add_sample(import->dest, track, di, samp);
 	if (e) goto exit;
 	samp->DTS+=dts_inc;
@@ -899,7 +955,7 @@
 		}
 	}
 
-	if (import->flags & GF_IMPORT_OVSBR) 
+	if (import->flags & GF_IMPORT_OVSBR)
 		timescale = 2*sr;
 
 	if (import->flags & GF_IMPORT_PS_EXPLICIT) {
@@ -925,7 +981,7 @@
 	memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
 	acfg.base_object_type = hdr.profile;
 	acfg.base_sr = sr;
-	acfg.nb_chan = hdr.nb_ch;
+	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 = 1;
@@ -953,7 +1009,7 @@
 		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);
@@ -1003,13 +1059,13 @@
 
 	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==0x40) ? "MPEG-4" : "MPEG-2",
-		hdr.nb_ch,
-		(hdr.nb_ch>1) ? "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) {
@@ -1025,7 +1081,7 @@
 	e = GF_OK;
 	/*add first sample*/
 	samp = gf_isom_sample_new();
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 	max_size = samp->dataLength = hdr.frame_size;
 	samp->data = (char*)gf_malloc(sizeof(char)*hdr.frame_size);
 	offset = gf_bs_get_position(bs);
@@ -1087,6 +1143,37 @@
 #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)
@@ -1257,7 +1344,7 @@
 			}
 			/*policy is to keep non coded frame (constant frame rate), add*/
 		}
-		samp->IsRAP = 0;
+		samp->IsRAP = RAP_NO;
 
 		if (ftype==2) {
 			b_frames++;
@@ -1272,7 +1359,7 @@
 			}
 		} else {
 			if (ftype==0) {
-				samp->IsRAP = 1;
+				samp->IsRAP = RAP;
 				nbI++;
 			} else {
 				nbP++;
@@ -1316,6 +1403,11 @@
 	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, 0);
+
+
+		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) {
@@ -1430,18 +1522,18 @@
 
 	/*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*/
-		) {
+	        || !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*/
+	   ) {
 		e = GF_OK;
 	}
 	else if (!stricmp(comp, "DIV3") || !stricmp(comp, "DIV4")) {
@@ -1608,7 +1700,7 @@
 					else is_packed = 1;
 					nb_f++;
 
-					samp->IsRAP = 0;
+					samp->IsRAP = RAP_NO;
 
 					if (ftype==2) {
 						b_frames ++;
@@ -1623,7 +1715,7 @@
 						}
 					} else {
 						if (!ftype) {
-							samp->IsRAP = 1;
+							samp->IsRAP = RAP;
 							nbI++;
 						} else {
 							nbP++;
@@ -1678,6 +1770,10 @@
 		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, 0);
+
+		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) {
@@ -1840,11 +1936,11 @@
 		size = 4 + 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, splited input audio frame found");
+			gf_import_message(import, GF_IO_ERR, "Cannot use media references, splitted input audio frame found");
 			e = GF_IO_ERR;
 			goto exit;
 		}
-		samp->IsRAP = 1;
+		samp->IsRAP = RAP;
 		samp->data = frame;
 		samp->dataLength = size;
 		if (import->flags & GF_IMPORT_USE_DATAREF) {
@@ -1893,7 +1989,7 @@
 	s32 trans_x, trans_y;
 	s16 layer;
 	u8 bps;
-	char lang[4];
+	char *lang;
 	const char *orig_name = gf_url_get_resource_name(gf_isom_get_filename(import->orig));
 	Bool sbr, ps;
 	GF_ISOSample *samp;
@@ -1911,9 +2007,11 @@
 			} else if (import->tk_info[i].type == GF_ISOM_MEDIA_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[3] = 0;
-			gf_isom_get_media_language(import->orig, i+1, lang);
-			import->tk_info[i].lang = GF_4CC(' ', lang[0], lang[1], lang[2]);
+			lang = NULL;
+			gf_isom_get_media_language(import->orig, i+1, &lang);
+			if (lang) {
+				import->tk_info[i].lang = GF_4CC(' ', lang[0], lang[1], lang[2]);
+			}
 			import->nb_tracks ++;
 		}
 		return GF_OK;
@@ -2021,7 +2119,7 @@
 			gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - Audio (SR %d - %d channels)", orig_name, trackID, sr, ch);
 		}
 	}
-		break;
+	break;
 	case GF_ISOM_MEDIA_SUBPIC:
 		gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - VobSub (size %d x %d)", orig_name, trackID, w, h);
 		break;
@@ -2033,7 +2131,7 @@
 		strcpy(szT, gf_4cc_to_str(mtype));
 		gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - media type \"%s:%s\"", orig_name, trackID, szT, gf_4cc_to_str(mstype));
 	}
-		break;
+	break;
 	}
 
 	//this may happen with fragmented files
@@ -2085,7 +2183,12 @@
 		}
 		sampDTS = samp->DTS;
 		gf_isom_sample_del(&samp);
+
+		gf_isom_copy_sample_info(import->dest, track, import->orig, track_in, i+1);
+
 		gf_set_progress("Importing ISO File", i+1, num_samples);
+
+
 		if (duration && (sampDTS > duration) ) break;
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 		if (e)
@@ -2203,10 +2306,18 @@
 			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_4CC('M','P','G','A'); break;
-			case MPEG_AUDIO_AC3: import->tk_info[import->nb_tracks].media_type = GF_4CC('A','C','3',' '); break;
-			case MPEG_AUDIO_LPCM: import->tk_info[import->nb_tracks].media_type = GF_4CC('L','P','C','M'); break;
-			default: import->tk_info[import->nb_tracks].media_type = GF_4CC('U','N','K',' '); break;
+			case MPEG_AUDIO_MPEG:
+				import->tk_info[import->nb_tracks].media_type = GF_4CC('M','P','G','A');
+				break;
+			case MPEG_AUDIO_AC3:
+				import->tk_info[import->nb_tracks].media_type = GF_4CC('A','C','3',' ');
+				break;
+			case MPEG_AUDIO_LPCM:
+				import->tk_info[import->nb_tracks].media_type = GF_4CC('L','P','C','M');
+				break;
+			default:
+				import->tk_info[import->nb_tracks].media_type = GF_4CC('U','N','K',' ');
+				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);
@@ -2284,7 +2395,7 @@
 		samp->data = buf;
 		samp->dataLength = buf_len;
 		samp->DTS = (u64)dts_inc*(frames-1);
-		samp->IsRAP = (ftype==1) ? 1 : 0;
+		samp->IsRAP = (ftype==1) ? RAP : RAP_NO;
 		samp->CTS_Offset = 0;
 		e = gf_isom_add_sample(import->dest, track, di, samp);
 		samp->data = NULL;
@@ -2304,6 +2415,9 @@
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 	}
 	gf_isom_set_cts_packing(import->dest, track, 0);
+	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);
 
 	MP4T_RecomputeBitRate(import->dest, track);
@@ -2404,7 +2518,7 @@
 	duration = (u64) ((Double)import->duration/1000.0 * sr);
 
 	samp = gf_isom_sample_new();
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 	samp->DTS = 0;
 
 	file_size = mpeg2ps_get_ps_size(ps);
@@ -2499,9 +2613,9 @@
 		import->esd->decoderConfig->decoderSpecificInfo->dataLength = (u32) gf_f64_tell(info);
 		import->esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char) * import->esd->decoderConfig->decoderSpecificInfo->dataLength);
 		gf_f64_seek(info, 0, SEEK_SET);
-		if (0==fread(import->esd->decoderConfig->decoderSpecificInfo->data, 1, import->esd->decoderConfig->decoderSpecificInfo->dataLength, info)){
+		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"));
+			       ("[NHML import] Failed to read dataLength\n"));
 		}
 		fclose(info);
 	}
@@ -2646,7 +2760,7 @@
 				max_size = samp->dataLength;
 			}
 			gf_f64_seek(mdia, offset, SEEK_SET);
-			if (0==fread( samp->data, 1, samp->dataLength, mdia)){
+			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) {
@@ -2804,7 +2918,7 @@
 		samp->data = (char*)gf_realloc(samp->data, sizeof(char)*samp->dataLength);
 	}
 	gf_f64_seek(xml, breaker.from_pos, SEEK_SET);
-	if (0==fread(samp->data, 1, samp->dataLength, xml)){
+	if (0==fread(samp->data, 1, samp->dataLength, xml)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Failed to read samp->dataLength\n"));
 	}
 
@@ -2896,7 +3010,7 @@
 	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)
@@ -2979,81 +3093,81 @@
 	i=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")) strcpy(szMedia, att->value);
-		else if (!stricmp(att->name, "specificInfoFile")) strcpy(szInfo, att->value);
-		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")) ? 1 : 0;
-		else if (!stricmp(att->name, "gzipDictionary")) {
-			u64 d_size;
-			if (stricmp(att->value, "self")) {
-				FILE *d = gf_f64_open(att->value, "rb");
-				if (!d) {
-					gf_import_message(import, GF_IO_ERR, "Cannot open dictionary file %s", att->value);
-					continue;
-				}
-				gf_f64_seek(d, 0, SEEK_END);
-				d_size = gf_f64_tell(d);
-				dictionary = (char*)gf_malloc(sizeof(char)*(size_t)(d_size+1));
-				gf_f64_seek(d, 0, SEEK_SET);
-				d_size = fread(dictionary, sizeof(char), (size_t)d_size, d);
-				dictionary[d_size]=0;
+			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]);
 			}
-			use_dict = 1;
-		}
+			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")) strcpy(szMedia, att->value);
+											else if (!stricmp(att->name, "specificInfoFile")) strcpy(szInfo, att->value);
+											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")) ? 1 : 0;
+													else if (!stricmp(att->name, "gzipDictionary")) {
+														u64 d_size;
+														if (stricmp(att->value, "self")) {
+															FILE *d = gf_f64_open(att->value, "rb");
+															if (!d) {
+																gf_import_message(import, GF_IO_ERR, "Cannot open dictionary file %s", att->value);
+																continue;
+															}
+															gf_f64_seek(d, 0, SEEK_END);
+															d_size = gf_f64_tell(d);
+															dictionary = (char*)gf_malloc(sizeof(char)*(size_t)(d_size+1));
+															gf_f64_seek(d, 0, SEEK_SET);
+															d_size = fread(dictionary, sizeof(char), (size_t)d_size, d);
+															dictionary[d_size]=0;
+														}
+														use_dict = 1;
+													}
 		/*unknow 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 = 1;
-		else if (!stricmp(att->name, "stream_type") && !stricmp(att->value, "secondary")) dims.streamType = 0;
-		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")) dims.textEncoding = att->value;
-		else if (!stricmp(att->name, "content_encoding")) {
-			if (!strcmp(att->value, "deflate")) {
-				dims.contentEncoding = att->value;
-				do_compress = 1;
-			}
-		}
-		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.contentEncoding = att->value;
-		else if (!stricmp(att->name, "xml_schema_location")) dims.xml_schema_loc = att->value;
+													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 = 1;
+																								else if (!stricmp(att->name, "stream_type") && !stricmp(att->value, "secondary")) dims.streamType = 0;
+																								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")) dims.textEncoding = att->value;
+																								else if (!stricmp(att->name, "content_encoding")) {
+																									if (!strcmp(att->value, "deflate")) {
+																										dims.contentEncoding = att->value;
+																										do_compress = 1;
+																									}
+																								}
+																								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.contentEncoding = att->value;
+																								else if (!stricmp(att->name, "xml_schema_location")) dims.xml_schema_loc = att->value;
 
 	}
 	if (sdesc.samplerate && !timescale) timescale = sdesc.samplerate;
@@ -3122,7 +3236,9 @@
 
 
 		switch (import->esd->decoderConfig->streamType) {
-		case GF_STREAM_SCENE: mtype = GF_ISOM_MEDIA_SCENE; break;
+		case GF_STREAM_SCENE:
+			mtype = GF_ISOM_MEDIA_SCENE;
+			break;
 		case GF_STREAM_VISUAL:
 			mtype = GF_ISOM_MEDIA_VISUAL;
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -3144,18 +3260,35 @@
 			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;
+		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;
+		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; }
+		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;
 
@@ -3163,27 +3296,36 @@
 
 	} 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; }
+		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) {
+	} else if (mtype == GF_ISOM_MEDIA_MPEG_SUBT) {
 		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_xml_subtitle_description(import->dest, track, 
-                                                 (char *)dims.contentEncoding, (char *)dims.xml_schema_loc, (char *)dims.mime_type, 
-                                                 &di);
+		if (!track) {
+			e = gf_isom_last_error(import->dest);
+			goto exit;
+		}
+		e = gf_isom_new_xml_subtitle_description(import->dest, track,
+		        (char *)dims.contentEncoding, (char *)dims.xml_schema_loc, (char *)dims.mime_type,
+		        &di);
 		if (e) goto exit;
 
-    } else {
+	} else {
 		char szT[5];
 		sdesc.extension_buf = specInfo;
 		sdesc.extension_buf_size = specInfoSize;
 		if (!sdesc.vendor_code) sdesc.vendor_code = GF_4CC('G', 'P', 'A', 'C');
 
 		track = gf_isom_new_track(import->dest, tkID, mtype, timescale);
-		if (!track) { e = gf_isom_last_error(import->dest); goto exit; }
+		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;
@@ -3222,7 +3364,7 @@
 	}
 	media_done = 0;
 
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 	i=0;
 	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
 		u32 j, dims_flags;
@@ -3255,9 +3397,9 @@
 			}
 			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")) ? 1 : 0;
+				samp->IsRAP = (!stricmp(att->value, "yes")) ? RAP : RAP_NO;
 			}
-			else if (!stricmp(att->name, "isSyncShadow")) samp->IsRAP = !stricmp(att->value, "yes") ? 2 : 0;
+			else if (!stricmp(att->name, "isSyncShadow")) samp->IsRAP = !stricmp(att->value, "yes") ? RAP_REDUNDANT : RAP_NO;
 			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")) strcpy(szMediaTemp, att->value);
@@ -3268,7 +3410,7 @@
 				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 = 1;
+				samp->IsRAP = RAP;
 			}
 			else if (!stricmp(att->name, "is-redundant") && !stricmp(att->value, "yes"))
 				dims_flags |= GF_DIMS_UNIT_I;
@@ -3281,7 +3423,7 @@
 			else if (!stricmp(att->name, "duration") )
 				sscanf(att->value, ""LLU, &sample_duration);
 		}
-		if (samp->IsRAP==1)
+		if (samp->IsRAP==RAP)
 			dims_flags |= GF_DIMS_UNIT_M;
 		if (!count && samp->DTS) samp->DTS = 0;
 
@@ -3332,7 +3474,7 @@
 			if (samp->data) gf_free(samp->data );
 			samp->data = 0;
 			samp->dataLength = 0;
-			e = gf_xml_parse_bit_sequence(node, &samp->data, &samp->dataLength);	
+			e = gf_xml_parse_bit_sequence(node, &samp->data, &samp->dataLength);
 			max_size = samp->dataLength;
 		} else {
 			Bool close = 0;
@@ -3367,7 +3509,7 @@
 				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);
-				if (samp->dataLength != fread( samp->data+3, sizeof(char), samp->dataLength, f)){
+				if (samp->dataLength != fread( samp->data+3, sizeof(char), samp->dataLength, f)) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHML import dims] Failed to fully read samp->dataLength\n"));
 				}
 				gf_bs_del(bs);
@@ -3381,7 +3523,7 @@
 					samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
 					max_size = samp->dataLength;
 				}
-				if (samp->dataLength != fread( samp->data, sizeof(char), samp->dataLength, f)){
+				if (samp->dataLength != fread( samp->data, sizeof(char), samp->dataLength, f)) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHML import dims] Failed to fully read samp->dataLength\n"));
 				}
 			}
@@ -3416,7 +3558,7 @@
 		}
 
 
-		if ((samp->IsRAP==2) && !is_dims) {
+		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);
@@ -3424,9 +3566,9 @@
 			e = gf_isom_add_sample(import->dest, track, di, samp);
 		}
 		if (e) goto exit;
-		samp->IsRAP = 0;
+		samp->IsRAP = RAP_NO;
 		samp->CTS_Offset = 0;
-		if (sample_duration) 
+		if (sample_duration)
 			samp->DTS += sample_duration;
 		else
 			samp->DTS += dts_inc;
@@ -3491,10 +3633,10 @@
 	oti = mtype = 0;
 	sample_rate = 8000;
 	block_size = 160;
-	if (6 > fread(magic, sizeof(char), 20, mdia)){
+	if (6 > fread(magic, sizeof(char), 20, mdia)) {
 		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");
@@ -3536,9 +3678,24 @@
 	}
 	else {
 		char *ext = strrchr(import->in_name, '.');
-		if (ext && !stricmp(ext, ".amr")) { mtype = GF_ISOM_SUBTYPE_3GP_AMR; update_gpp_cfg = 1; 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";}
+		if (ext && !stricmp(ext, ".amr")) {
+			mtype = GF_ISOM_SUBTYPE_3GP_AMR;
+			update_gpp_cfg = 1;
+			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 {
 			fclose(mdia);
 			return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Corrupted AMR/SMV/EVRC file header");
@@ -3594,7 +3751,7 @@
 
 	samp = gf_isom_sample_new();
 	samp->data = (char*)gf_malloc(sizeof(char) * 200);
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 	offset = gf_f64_tell(mdia);
 	gf_f64_seek(mdia, 0, SEEK_END);
 	media_size = gf_f64_tell(mdia) - offset;
@@ -3638,7 +3795,7 @@
 			break;
 		}
 
-		if (samp->dataLength){
+		if (samp->dataLength) {
 			readen = (u32) fread( samp->data + 1, sizeof(char), samp->dataLength, mdia);
 			assert(readen == samp->dataLength);
 		}
@@ -3860,7 +4017,7 @@
 
 	samp = gf_isom_sample_new();
 	samp->data = (char*)gf_malloc(sizeof(char) * 200);
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 	max_size = 200;
 	offset = gf_f64_tell(mdia);
 	gf_f64_seek(mdia, 0, SEEK_END);
@@ -3887,7 +4044,10 @@
 					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;}
+						if (rtable[i].rate_idx==idx) {
+							size = rtable[i].pck_size;
+							break;
+						}
 					}
 					samp->dataLength = size+1;
 				} else {
@@ -3997,12 +4157,29 @@
 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;
+	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;
 	}
 }
 
@@ -4103,7 +4280,7 @@
 		}
 		gf_bs_read_data(bs, samp_data, samp->dataLength);
 		/*we ignore pict number and import at const FPS*/
-		samp->IsRAP = (samp_data[4]&0x02) ? 0 : 1;
+		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);
@@ -4139,11 +4316,11 @@
 {
 	u32 i, count, di, remain, msize;
 	char *buffer;
-	
+
 	msize = 4096;
 	buffer = (char*)gf_malloc(sizeof(char)*msize);
 	count = gf_isom_get_sample_count(file, track);
-	for (i=0; i<count;i++) {
+	for (i=0; i<count; i++) {
 		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);
@@ -4189,7 +4366,7 @@
 	GF_AVCConfig *avccfg, *svccfg, *dstcfg;
 	GF_BitStream *bs;
 	GF_BitStream *sample_data;
-	Bool flush_sample, sample_is_rap, sample_has_islice, first_nal, slice_is_ref, has_cts_offset, detect_fps, is_paff, set_subsamples, slice_force_ref;
+	Bool flush_sample, sample_is_rap, sample_has_islice, 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;
@@ -4302,7 +4479,12 @@
 
 	while (gf_bs_available(bs)) {
 		u8 nal_hdr, skip_nal, is_subseq, add_sps;
-		nal_size = gf_media_nalu_next_start_code_bs(bs);
+		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);
@@ -4319,8 +4501,9 @@
 		is_subseq = 0;
 		skip_nal = 0;
 		copy_size = flush_sample = 0;
+		is_islice = 0;
 
-		if (nal_type == GF_AVC_NALU_SVC_SUBSEQ_PARAM || nal_type == GF_AVC_NALU_SVC_PREFIX_NALU || nal_type == GF_AVC_NALU_SVC_SLICE){
+		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 = 1;
 		}
 
@@ -4396,12 +4579,12 @@
 				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 && avc.sps[idx].vui.fixed_frame_rate_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)
-					) {
+				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}; */
+					/* 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);
@@ -4416,7 +4599,11 @@
 					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 = 0;
+					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);
@@ -4480,7 +4667,7 @@
 				memcpy(slc->data, buffer, sizeof(char)*slc->size);
 				dstcfg = (import->flags & GF_IMPORT_SVC_EXPLICIT) ? svccfg : avccfg;
 
-				/* by default, we put all PPS in the base AVC layer, 
+				/* 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 = avccfg;
 
@@ -4506,13 +4693,27 @@
 			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++; 
-					sample_has_islice = 1;
+				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 = 1;
+					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;
-				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;
@@ -4533,32 +4734,41 @@
 			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_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) {
-				skip_nal = 0;
-				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;
+		{
+			u32 i;
+			for (i = 0; i < gf_list_count(avccfg->pictureParameterSets); i ++) {
+				slc = 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) {
+			skip_nal = 0;
+			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);
@@ -4596,10 +4806,10 @@
 		if (flush_sample && sample_data) {
 			GF_ISOSample *samp = gf_isom_sample_new();
 			samp->DTS = (u64)dts_inc*cur_samp;
-			samp->IsRAP = sample_is_rap;
+			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 = 1;
+					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"));
@@ -4622,8 +4832,8 @@
 					nb_subs = gf_isom_sample_has_subsamples(import->dest, track, cur_samp+1);
 					if (nb_subs) {
 						/* fetch size, priority, reserved and discardable info for last subsample */
-						gf_isom_sample_get_subsample(import->dest, track, cur_samp+1, nb_subs, &size, &priority, &reserved, &discardable); 
-					
+						gf_isom_sample_get_subsample(import->dest, track, cur_samp+1, nb_subs, &size, &priority, &reserved, &discardable);
+
 						/*remove last subsample entry!*/
 						gf_isom_add_subsample(import->dest, track, cur_samp+1, 0, 0, 0, 0);
 					}
@@ -4650,12 +4860,12 @@
 			cur_samp++;
 
 			/*write sampleGroups info*/
-			if (!samp->IsRAP && (sei_recovery_frame_count>=0)) {
+			if (!samp->IsRAP && ( (sei_recovery_frame_count>=0) || sample_has_islice) ) {
 				/*generic GDR*/
-				if (sei_recovery_frame_count) {
+				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_has_islice) {
 					if (!use_opengop_gdr) use_opengop_gdr = 2;
@@ -4676,6 +4886,9 @@
 		}
 
 		if (copy_size) {
+			if (is_islice)
+				sample_has_islice = 1;
+
 			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;
@@ -4728,7 +4941,7 @@
 
 				// 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, copy_size+size_length/8, prio, res, 1);
 				}
@@ -4766,7 +4979,7 @@
 					is_paff = 1;
 
 				slice_is_ref = (avc.s_info.nal_unit_type==GF_AVC_NALU_IDR_SLICE);
-				if (slice_is_ref) 
+				if (slice_is_ref)
 					nb_idr++;
 				slice_force_ref = 0;
 
@@ -4789,7 +5002,7 @@
 							}
 						}
 						avc.sei.recovery_point.valid = 0;
-						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0)) 
+						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0))
 							slice_force_ref = 1;
 					}
 					sample_is_rap = gf_media_avc_slice_is_IDR(&avc);
@@ -4826,7 +5039,7 @@
 				}
 				/*forced ref slice*/
 				else if (slice_force_ref) {
-					ref_frame = cur_samp+1;	
+					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;
 				}
@@ -4866,9 +5079,9 @@
 		gf_bs_align(bs);
 		nal_end = gf_bs_get_position(bs);
 		assert(nal_start <= nal_end);
-		assert(nal_end <= nal_start + nal_size);
-		if (nal_end != nal_start + nal_size)
-			gf_bs_seek(bs, nal_start + nal_size);
+		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;
@@ -4887,14 +5100,14 @@
 		}
 		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;
+		samp->IsRAP = sample_is_rap ? RAP : RAP_NO;
 		if (!sample_is_rap && sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC)) {
-			samp->IsRAP = 1;
+			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;
@@ -4912,7 +5125,7 @@
 	/*recompute all CTS offsets*/
 	if (has_cts_offset) {
 		u32 i, last_cts_samp;
-		u64 last_dts, max_cts;
+		u64 last_dts, max_cts, min_cts;
 		if (!poc_diff) poc_diff = 1;
 		/*no b-frame references, no need to cope with negative poc*/
 		if (!max_total_delay) {
@@ -4923,6 +5136,7 @@
 		min_poc *= -1;
 		last_dts = 0;
 		max_cts = 0;
+		min_cts = (u64) -1;
 		last_cts_samp = 0;
 
 		for (i=0; i<cur_samp; i++) {
@@ -4954,6 +5168,10 @@
 				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) {
@@ -4981,6 +5199,14 @@
 		}
 		/*and repack table*/
 		gf_isom_set_cts_packing(import->dest, track, 0);
+
+		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);
 	}
@@ -4994,7 +5220,7 @@
 	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, 1);
+			gf_isom_svc_config_update(import->dest, track, 1, svccfg, 1);
 		}
 	} else {
 		gf_isom_svc_config_update(import->dest, track, 1, svccfg, 0);
@@ -5011,10 +5237,10 @@
 		u32 i;
 		if (nb_sp || nb_si) {
 			gf_import_message(import, GF_OK, "AVC Import results: %d samples - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
-				cur_samp, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
+			                  cur_samp, 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 - Slices: %d I %d P %d B - %d SEI - %d IDR",
-				cur_samp, nb_i, nb_p, nb_b, nb_sei, nb_idr);
+			                  cur_samp, nb_i, nb_p, nb_b, nb_sei, nb_idr);
 		}
 
 		for (i=0; i<gf_list_count(svccfg->sequenceParameterSets); i++) {
@@ -5057,7 +5283,7 @@
 }
 
 #ifndef GPAC_DISABLE_HEVC
-static GF_HEVCParamArray *get_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type) 
+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++) {
@@ -5070,11 +5296,14 @@
 
 static void hevc_set_parall_type(GF_HEVCConfig *hevc_cfg)
 {
-	u32 use_tiles, use_wpp, nb_pps;
+	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);
-	u32 i, count = gf_list_count(ar->nalus);
-	
+	if (!ar)
+		return;
+
+	count = gf_list_count(ar->nalus);
+
 	memset(&hevc, 0, sizeof(HEVCState));
 	hevc.sps_active_idx = -1;
 
@@ -5082,7 +5311,6 @@
 	use_wpp = 0;
 	nb_pps = 0;
 
-
 	for (i=0; i<count; i++) {
 		HEVC_PPS *pps;
 		GF_AVCConfigSlot *slc = gf_list_get(ar->nalus, i);
@@ -5123,7 +5351,7 @@
 	GF_HEVCParamArray *spss, *ppss, *vpss;
 	GF_BitStream *bs;
 	GF_BitStream *sample_data;
-	Bool flush_sample, flush_next_sample, is_empty_sample, sample_is_rap, sample_has_islice, first_nal, slice_is_ref, has_cts_offset, is_paff, set_subsamples, slice_force_ref;
+	Bool flush_sample, flush_next_sample, is_empty_sample, sample_is_rap, sample_has_islice, 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;
@@ -5157,7 +5385,7 @@
 		} else {
 			/*fps is forced by the caller*/
 			detect_fps = GF_FALSE;
-		}	
+		}
 	}
 	get_video_timing(FPS, &timescale, &dts_inc);
 
@@ -5240,9 +5468,14 @@
 		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 = 0;
-		nal_size = gf_media_nalu_next_start_code_bs(bs);
+		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);
@@ -5259,13 +5492,15 @@
 		if (layer_id && (import->flags & GF_IMPORT_SVC_NONE)) {
 			goto next_nal;
 		}
-		
+
+		is_islice = 0;
+
 		prev_cfg = dst_cfg;
 		//todo check layer type, for now only scalable (not 3D etc) ...
 		if (import->flags & GF_IMPORT_SVC_EXPLICIT) {
 			dst_cfg = shvc_cfg;
 			force_shvc = 1;
-		} else 
+		} else
 			dst_cfg = layer_id ? shvc_cfg : hevc_cfg;
 
 		if (prev_cfg != dst_cfg) {
@@ -5399,10 +5634,10 @@
 				gf_list_add(spss->nalus, slc);
 
 				/*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)
-					) {
+				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;
@@ -5455,7 +5690,7 @@
 			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();
@@ -5489,7 +5724,7 @@
 		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_RASL_R:
 		case GF_HEVC_NALU_SLICE_RADL_N:
 		case GF_HEVC_NALU_SLICE_RASL_N:
 		case GF_HEVC_NALU_SLICE_TRAIL_N:
@@ -5503,20 +5738,25 @@
 		case GF_HEVC_NALU_SLICE_IDR_N_LP:
 		case GF_HEVC_NALU_SLICE_CRA:
 			is_slice = 1;
-/*			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 ((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 = 1;
 				switch (hevc.s_info.slice_type) {
-				case GF_HEVC_TYPE_P: nb_p++; break;
-				case GF_HEVC_TYPE_I: nb_i++; 
-					sample_has_islice = 1;
+				case GF_HEVC_TYPE_P:
+					nb_p++;
+					break;
+				case GF_HEVC_TYPE_I:
+					nb_i++;
+					is_islice = 1;
+					break;
+				case GF_HEVC_TYPE_B:
+					nb_b++;
 					break;
-				case GF_HEVC_TYPE_B: nb_b++; break;
 				}
 			}
 			break;
@@ -5542,10 +5782,10 @@
 		if (flush_sample && sample_data) {
 			GF_ISOSample *samp = gf_isom_sample_new();
 			samp->DTS = (u64)dts_inc*cur_samp;
-			samp->IsRAP = sample_is_rap;
+			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 = 1;
+					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"));
@@ -5566,12 +5806,12 @@
 			cur_samp++;
 
 			/*write sampleGroups info*/
-			if (!samp->IsRAP && (sei_recovery_frame_count>=0)) {
+			if (!samp->IsRAP && ((sei_recovery_frame_count>=0) || sample_has_islice) ) {
 				/*generic GDR*/
-				if (sei_recovery_frame_count) {
+				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_has_islice) {
 					if (!use_opengop_gdr) use_opengop_gdr = 2;
@@ -5593,6 +5833,9 @@
 		}
 
 		if (copy_size) {
+			if (is_islice)
+				sample_has_islice = 1;
+
 			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;
@@ -5644,7 +5887,7 @@
 			//fixme with latest SHVC syntax
 			if (!layer_id && is_slice) {
 				slice_is_ref = gf_media_hevc_slice_is_IDR(&hevc);
-				if (slice_is_ref) 
+				if (slice_is_ref)
 					nb_idr++;
 				slice_force_ref = 0;
 
@@ -5667,7 +5910,7 @@
 							}
 						}
 						hevc.sei.recovery_point.valid = 0;
-						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0)) 
+						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0))
 							slice_force_ref = 1;
 					}
 					sample_is_rap = gf_media_hevc_slice_is_IDR(&hevc);
@@ -5704,7 +5947,7 @@
 				}
 				/*forced ref slice*/
 				else if (slice_force_ref) {
-					ref_frame = cur_samp+1;	
+					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;
 				}
@@ -5745,9 +5988,9 @@
 		gf_bs_align(bs);
 		nal_end = gf_bs_get_position(bs);
 		assert(nal_start <= nal_end);
-		assert(nal_end <= nal_start + nal_size);
-		if (nal_end != nal_start + nal_size)
-			gf_bs_seek(bs, nal_start + nal_size);
+		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;
@@ -5766,14 +6009,14 @@
 		}
 		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;
+		samp->IsRAP = sample_is_rap ? RAP : RAP_NO;
 		if (!sample_is_rap && sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC)) {
-			samp->IsRAP = 1;
+			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;
@@ -5791,7 +6034,7 @@
 	/*recompute all CTS offsets*/
 	if (has_cts_offset) {
 		u32 last_cts_samp;
-		u64 last_dts, max_cts;
+		u64 last_dts, max_cts, min_cts;
 		if (!poc_diff) poc_diff = 1;
 		/*no b-frame references, no need to cope with negative poc*/
 		if (!max_total_delay) {
@@ -5802,6 +6045,7 @@
 		min_poc *= -1;
 		last_dts = 0;
 		max_cts = 0;
+		min_cts = (u64) -1;
 		last_cts_samp = 0;
 
 		for (i=0; i<cur_samp; i++) {
@@ -5833,6 +6077,10 @@
 				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) {
@@ -5860,6 +6108,13 @@
 		}
 		/*and repack table*/
 		gf_isom_set_cts_packing(import->dest, track, 0);
+
+		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);
 	}
@@ -5871,7 +6126,7 @@
 
 	shvc_cfg->num_layers = 0;
 	for (i=1; i<64; i++) {
-		if (layer_ids[i]) 
+		if (layer_ids[i])
 			shvc_cfg->num_layers ++;
 	}
 
@@ -5906,10 +6161,10 @@
 	} else {
 		if (nb_sp || nb_si) {
 			gf_import_message(import, GF_OK, "HEVC Import results: %d samples - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
-				cur_samp, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
+			                  cur_samp, 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 - Slices: %d I %d P %d B - %d SEI - %d IDR",
-				cur_samp, nb_i, nb_p, nb_b, nb_sei, nb_idr);
+			                  cur_samp, nb_i, nb_p, nb_b, nb_sei, nb_idr);
 		}
 
 		if (max_total_delay>1) {
@@ -6214,7 +6469,7 @@
 			flag = oggpackB_read(&opb, 1);
 			if (flag==0) {
 				/*add packet*/
-				samp->IsRAP = oggpackB_read(&opb, 1) ? 0 : 1;
+				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);
@@ -6293,7 +6548,7 @@
 	tot_size = gf_f64_tell(f_in);
 	gf_f64_seek(f_in, 0, SEEK_SET);
 
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	samp = gf_isom_sample_new();
 	/*avoids gcc warnings*/
 	track = num_headers = 0;
@@ -6396,7 +6651,7 @@
 			if (!block_size) continue;
 
 			/*add packet*/
-			samp->IsRAP = 1;
+			samp->IsRAP = RAP;
 			samp->data = (char *)oggpacket.packet;
 			samp->dataLength = oggpacket.bytes;
 			e = gf_isom_add_sample(import->dest, track, di, samp);
@@ -6460,20 +6715,43 @@
 	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;
+	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;
+	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;
+	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);
@@ -6494,7 +6772,7 @@
 	assert(gf_f64_tell(src) < 1<<31);
 	samp->dataLength = (u32) gf_f64_tell(src);
 	gf_f64_seek(src, 0, SEEK_SET);
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 	samp->data = (char *)gf_malloc(sizeof(char)*samp->dataLength);
 	readen = (u32) fread(samp->data, sizeof(char), samp->dataLength, src);
 	assert( readen == samp->dataLength );
@@ -6571,35 +6849,58 @@
 			else if (st==GF_STREAM_VISUAL) {
 				mtype = GF_ISOM_MEDIA_VISUAL;
 				switch (oti) {
-				case GPAC_OTI_VIDEO_AVC: 
+				case GPAC_OTI_VIDEO_AVC:
 				case GPAC_OTI_VIDEO_SVC:
-					name = "AVC/H264 Video"; 
+					name = "AVC/H264 Video";
 					stype = GF_4CC('H','2','6','4');
 					break;
-				case GPAC_OTI_VIDEO_HEVC: 
+				case GPAC_OTI_VIDEO_HEVC:
 				case GPAC_OTI_VIDEO_SHVC:
-					name = "HEVC Video"; 
+					name = "HEVC Video";
 					stype = GF_4CC('H','E','V','C');
 					break;
-				case GPAC_OTI_VIDEO_MPEG4_PART2: name = "MPEG-4 Video"; stype = GF_4CC('M','P','4','V'); break;
-				case GPAC_OTI_VIDEO_MPEG1: name = "MPEG-1 Video"; stype = GF_4CC('M','P','1','V'); 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_4CC('M','P','2','V'); break;
-				case GPAC_OTI_IMAGE_JPEG: name = "JPEG Image"; stype = GF_4CC('J','P','E','G'); break;
-				case GPAC_OTI_IMAGE_PNG: name = "PNG Image"; stype = GF_4CC('P','N','G',' '); break;
+				case GPAC_OTI_VIDEO_MPEG4_PART2:
+					name = "MPEG-4 Video";
+					stype = GF_4CC('M','P','4','V');
+					break;
+				case GPAC_OTI_VIDEO_MPEG1:
+					name = "MPEG-1 Video";
+					stype = GF_4CC('M','P','1','V');
+					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_4CC('M','P','2','V');
+					break;
+				case GPAC_OTI_IMAGE_JPEG:
+					name = "JPEG Image";
+					stype = GF_4CC('J','P','E','G');
+					break;
+				case GPAC_OTI_IMAGE_PNG:
+					name = "PNG Image";
+					stype = GF_4CC('P','N','G',' ');
+					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_4CC('M','P','2','A'); break;
-				case GPAC_OTI_AUDIO_MPEG1: name = "MPEG-1 Audio"; stype = GF_4CC('M','P','1','A'); break;
-				case GPAC_OTI_AUDIO_AAC_MPEG4: name = "MPEG-4 Audio"; stype = GF_4CC('M','P','4','A'); break;
+				case GPAC_OTI_AUDIO_MPEG2_PART3:
+					name = "MPEG-2 Audio";
+					stype = GF_4CC('M','P','2','A');
+					break;
+				case GPAC_OTI_AUDIO_MPEG1:
+					name = "MPEG-1 Audio";
+					stype = GF_4CC('M','P','1','A');
+					break;
+				case GPAC_OTI_AUDIO_AAC_MPEG4:
+					name = "MPEG-4 Audio";
+					stype = GF_4CC('M','P','4','A');
+					break;
 				}
 			}
 
@@ -6608,7 +6909,10 @@
 				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 (import->tk_info[i].track_num==stream_id) {
+						found = 1;
+						break;
+					}
 				}
 				if (!found) {
 					import->tk_info[import->nb_tracks].media_type = stype;
@@ -6663,7 +6967,7 @@
 			GF_ISOSample *samp = gf_isom_sample_new();
 			samp->dataLength = au_size;
 			samp->DTS = cts;
-			samp->IsRAP = is_rap;
+			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 {
@@ -6722,7 +7026,7 @@
 /* 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)
+        struct __track_import_info* tk_info)
 {
 	if (esd && tk_info) {
 		switch (esd->decoderConfig->streamType) {
@@ -6780,7 +7084,7 @@
 		}
 		if (es == NULL) continue;
 
-		if (esd->decoderConfig->streamType==GF_STREAM_OD) 
+		if (esd->decoderConfig->streamType==GF_STREAM_OD)
 			es->flags |= GF_M2TS_ES_IS_MPEG4_OD;
 
 
@@ -6862,6 +7166,8 @@
 		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);
@@ -6901,9 +7207,9 @@
 	}
 	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, 1);
 	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) ));
@@ -6962,12 +7268,12 @@
 	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->trackID)
-			import->flags |= GF_IMPORT_DO_ABORT;
-*/
+		/*		if (!ts->has_4on2 && (import->flags & GF_IMPORT_PROBE_ONLY) && !import->trackID)
+					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"); 
+		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:
@@ -6975,7 +7281,6 @@
 
 		if (import->flags & GF_IMPORT_PROBE_ONLY) {
 			import->probe_duration = ((GF_M2TS_PES_PCK *) par)->PTS;
-			//import->flags |= GF_IMPORT_DO_ABORT;
 		}
 		break;
 
@@ -7092,7 +7397,7 @@
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_audio++;
-					break;					
+					break;
 				case GF_M2TS_SYSTEMS_MPEG4_PES:
 				case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
 					if (es->stream_type == GF_M2TS_SYSTEMS_MPEG4_PES) {
@@ -7118,7 +7423,7 @@
 					import->nb_tracks++;
 					break;
 				default:
-					gf_import_message(import, GF_OK, "[MPEG-2 TS] Ignoring stream of type %d", es->stream_type); 
+					gf_import_message(import, GF_OK, "[MPEG-2 TS] Ignoring stream of type %d", es->stream_type);
 				}
 			}
 		} else {
@@ -7172,28 +7477,29 @@
 			switch (es->stream_type) {
 			case GF_M2TS_VIDEO_MPEG1:
 				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_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;
+				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; 
+				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; 
+				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_SHVC:
 				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_VISUAL; 
+				stype = GF_STREAM_VISUAL;
 				oti = GPAC_OTI_VIDEO_HEVC;
 #ifndef GPAC_DISABLE_HEVC
 				tsimp->hevccfg = gf_odf_hevc_cfg_new();
@@ -7201,24 +7507,24 @@
 				break;
 			case GF_M2TS_VIDEO_SVC:
 				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_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; 
+				stype = GF_STREAM_AUDIO;
 				oti = GPAC_OTI_AUDIO_MPEG1;
 				break;
 			case GF_M2TS_AUDIO_MPEG2:
 				mtype = GF_ISOM_MEDIA_AUDIO;
-				stype = GF_STREAM_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; 
+				stype = GF_STREAM_AUDIO;
 				oti = GPAC_OTI_AUDIO_AAC_MPEG4;
 				break;
 			case GF_M2TS_SYSTEMS_MPEG4_PES:
@@ -7250,491 +7556,512 @@
 		}
 		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_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]);
-							}
+	{
+		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);
 						}
-						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");
-							}
+						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_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++;
-								}
+					}
+					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");
 						}
-
-						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++;
+					}
+					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++;
 						}
+					}
 
-						/*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 (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;
 			}
+			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 = 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 = 0;
-				u32 nal_type = pck->data[4] & 0x1F;
-
-				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(pck->data+4, pck->data_len-4, &tsimp->avc, is_subseq, NULL);
+		/* 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 = pck->stream->first_dts;
 
-					add_sps = 0;
-					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 = 1;
-							}
-						} 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 = 1;
-							}
+				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 = 0;
+			u32 nal_type = pck->data[4] & 0x1F;
+
+			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(pck->data+4, pck->data_len-4, &tsimp->avc, is_subseq, NULL);
+
+				add_sps = 0;
+				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 = 1;
 						}
-						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;
-							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 (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;
+					} 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 = 1;
 						}
 					}
-					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 (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;
 						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);
-					}
-					/*else discard because of invalid PPS*/
-					return;
-				/*remove*/
-				case GF_AVC_NALU_ACCESS_UNIT:
-					tsimp->force_next_au_start = 1;
-					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->avc.sps_active_idx != -1) {
-						idx = gf_media_avc_reformat_sei(pck->data+4, pck->data_len-4, &tsimp->avc);
-						if (idx>0) pck->data_len = idx+4;
+						gf_list_add(tsimp->avccfg->sequenceParameterSets, slc);
+
+						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;
 					}
-					break;
 				}
-
-				if (tsimp->force_next_au_start) {
-					is_au_start = 1;
-					tsimp->force_next_au_start = 0;
+				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;
+					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);
 				}
+				/*else discard because of invalid PPS*/
+				return;
+			/*remove*/
+			case GF_AVC_NALU_ACCESS_UNIT:
+				tsimp->force_next_au_start = 1;
+				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->avc.sps_active_idx != -1) {
+					idx = gf_media_avc_reformat_sei(pck->data+4, pck->data_len-4, &tsimp->avc);
+					if (idx>0) pck->data_len = idx+4;
+				}
+				break;
 			}
 
-			/*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->force_next_au_start) {
+				is_au_start = 1;
+				tsimp->force_next_au_start = 0;
+			}
+		}
+
+		/*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 = 0;
-				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 = 0;
-					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 = 1;
-							}
-						} 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 = 1;
-							}
+		else if (tsimp->hevccfg && !pck->data[0] && !pck->data[1]) {
+			s32 idx;
+			Bool add_sps, is_subseq = 0;
+			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 = 0;
+				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 = 1;
 						}
-						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(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;
+					} 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 = 1;
 						}
 					}
-					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(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
-					}
-					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;
+					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(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;
 					}
-					return;
-				/*remove*/
-				case GF_HEVC_NALU_ACCESS_UNIT:
-					tsimp->force_next_au_start = 1;
-					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:
-/*TODO					if (tsimp->avc.sps_active_idx != -1) {
-						idx = gf_media_avc_reformat_sei(pck->data+4, pck->data_len-4, &tsimp->avc);
-						if (idx>0) pck->data_len = idx+4;
-					}
-*/
-					break;
 				}
-
-				if (tsimp->force_next_au_start) {
-					is_au_start = 1;
-					tsimp->force_next_au_start = 0;
+				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(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
 				}
+				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(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+				}
+				return;
+			/*remove*/
+			case GF_HEVC_NALU_ACCESS_UNIT:
+				tsimp->force_next_au_start = 1;
+				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:
+				/*TODO					if (tsimp->avc.sps_active_idx != -1) {
+										idx = gf_media_avc_reformat_sei(pck->data+4, pck->data_len-4, &tsimp->avc);
+										if (idx>0) pck->data_len = idx+4;
+									}
+				*/
+				break;
 			}
-#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 begining of sample data\n"));
-						e = GF_OK;
-					} 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 (tsimp->force_next_au_start) {
+				is_au_start = 1;
+				tsimp->force_next_au_start = 0;
+			}
+		}
+#endif //GPAC_DISABLE_HEVC
 
-				if (pck->flags & GF_M2TS_PES_PCK_RAP) {
-					e = gf_isom_set_sample_rap(import->dest, tsimp->track);
+		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 begining of sample data\n"));
+					e = GF_OK;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error appending sample data\n"));
 				}
-				return;
 			}
+			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++;
 
-			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;
-				}
-				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);
-					tsimp->stream_setup = 1;
-				}
-				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);
-
-					tsimp->stream_setup = 1;
-				}
+			if (pck->flags & GF_M2TS_PES_PCK_RAP) {
+				e = gf_isom_set_sample_rap(import->dest, tsimp->track);
 			}
+			return;
+		}
 
-			if (samp->DTS >= pck->stream->first_dts) {
-				samp->DTS -= pck->stream->first_dts;
-				samp->IsRAP = (pck->flags & GF_M2TS_PES_PCK_RAP) ? 1 : 0;
-				samp->data = pck->data;
-				samp->dataLength = pck->data_len;
+		samp = gf_isom_sample_new();
+		samp->DTS = pck->DTS;
+		samp->CTS_Offset = (u32) (pck->PTS - samp->DTS);
 
-				if (samp->DTS && (samp->DTS==tsimp->last_dts)) {
-					e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
-				} else {
+		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;
+			}
+			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);
+				tsimp->stream_setup = 1;
+			}
+			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);
 
-					if (tsimp->avccfg || tsimp->hevccfg) m2ts_rewrite_nalu_sample(import, tsimp);
+				tsimp->stream_setup = 1;
+			}
+		}
 
-					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 (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->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;
+			if (samp->DTS && (samp->DTS==tsimp->last_dts)) {
+				e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
 			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] negative time sample - skipping\n"));
+
+				if (tsimp->avccfg || tsimp->hevccfg) m2ts_rewrite_nalu_sample(import, tsimp);
+
+				e = gf_isom_add_sample(import->dest, tsimp->track, 1, samp);
 			}
-			samp->data = NULL;
-			gf_isom_sample_del(&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;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] negative time sample - skipping\n"));
 		}
-		break;
+		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;
+	{
+		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 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_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);
+		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);
+							/* 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);
 				}
-
+				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 (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 (pes->vid_h || pes->aud_sr) import->flags |= GF_IMPORT_DO_ABORT;
 			}
+			return;
+		}
 
-			if (sl_pck->stream->pid != import->trackID) 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, 0);
-			}
+		/* 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, 0);
+		}
 
-			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 (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"));
+			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;
+						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;
 					}
 				} 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->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));
+					}
+				}
 
-						if (!hdr.compositionTimeStampFlag) {
-							hdr.compositionTimeStamp = sl_pck->stream->program->first_dts;
-							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;
-						}
-					} 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: 1;
-
-						/*fix for some DMB streams where TSs are not coded*/
-						if ((tsimp->last_dts == 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;
+				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;
 
-					} 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;
-						}
+					/*fix for some DMB streams where TSs are not coded*/
+					if ((tsimp->last_dts == 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;
+
+				} 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;
 					}
-					samp->data = NULL;
-					gf_isom_sample_del(&samp);
 				}
+				samp->data = NULL;
+				gf_isom_sample_del(&samp);
 			}
 		}
-		break;
+	}
+	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)
 {
@@ -7743,7 +8070,7 @@
 	char data[188];
 	GF_TSImport tsimp;
 	u64 fsize, done;
-	u32 size;
+	u32 size, i;
 	Bool do_import = 1;
 	FILE *mts;
 	char progress[1000];
@@ -7792,10 +8119,20 @@
 		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);
-  		fclose(mts);
+		gf_m2ts_demux_del(ts);
+		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));
 
@@ -7805,11 +8142,11 @@
 
 	if (!(import->flags & GF_IMPORT_PROBE_ONLY)) {
 		es = (GF_M2TS_ES *)ts->ess[import->trackID];
-  		if (!es) {
-  			gf_m2ts_demux_del(ts);
-  			fclose(mts);
-  			return gf_import_message(import, GF_BAD_PARAM, "Unknown PID %d", import->trackID);
-  		}
+		if (!es) {
+			gf_m2ts_demux_del(ts);
+			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;
@@ -7841,7 +8178,7 @@
 		if (tsimp.track) {
 			MP4T_RecomputeBitRate(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) ){
+			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;
@@ -8035,10 +8372,10 @@
 		}
 
 		if (*(u32*)&buf[0x00] != 0xba010000		   ||
-			*(u32*)&buf[0x0e] != 0xbd010000		   ||
-			!(buf[0x15] & 0x80)				   ||
-			(buf[0x17] & 0xf0) != 0x20			   ||
-			(buf[buf[0x16] + 0x17] & 0xe0) != 0x20)
+		        *(u32*)&buf[0x0e] != 0xbd010000		   ||
+		        !(buf[0x15] & 0x80)				   ||
+		        (buf[0x17] & 0xf0) != 0x20			   ||
+		        (buf[buf[0x16] + 0x17] & 0xe0) != 0x20)
 		{
 			gf_import_message(import, GF_CORRUPTED_DATA, "Corrupted data found in file %s", filename);
 			continue;
@@ -8087,7 +8424,7 @@
 		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;
@@ -8137,7 +8474,7 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-GF_Err gf_import_ac3(GF_MediaImporter *import)
+GF_Err gf_import_ac3(GF_MediaImporter *import, Bool is_EAC3)
 {
 	GF_AC3Header hdr;
 	GF_AC3Config cfg;
@@ -8150,15 +8487,22 @@
 	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_f64_open(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);
 
-	if (!gf_ac3_parser_bs(bs, &hdr, 1)) {
-		gf_bs_del(bs);
-		fclose(in);
-		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio isn't AC3 audio");
+	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);
+			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;
 
@@ -8185,13 +8529,13 @@
 	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 = GPAC_OTI_AUDIO_AC3;
+	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, "AC3 import - sample rate %d - %d%s channel%s", sr, hdr.lfon ? (nb_chan-1) : nb_chan, hdr.lfon?".1":"", (nb_chan>1) ? "s" : "");
+	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) {
@@ -8204,7 +8548,7 @@
 	if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
 	import->esd->decoderConfig->decoderSpecificInfo = NULL;
 
-	cfg.is_ec3 = 0;
+	cfg.is_ec3 = is_EAC3;
 	cfg.nb_streams = 1;
 	cfg.brcode = hdr.brcode;
 	cfg.streams[0].acmod = hdr.acmod;
@@ -8221,7 +8565,7 @@
 
 	e = GF_OK;
 	samp = gf_isom_sample_new();
-	samp->IsRAP = 1;
+	samp->IsRAP = RAP;
 
 	duration = import->duration;
 	duration *= sr;
@@ -8229,9 +8573,11 @@
 
 	max_size = 0;
 	done = 0;
-	while (gf_ac3_parser_bs(bs, &hdr, 0)) {
-		samp->dataLength = hdr.framesize;
-
+	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) );
@@ -8244,14 +8590,17 @@
 			gf_bs_read_data(bs, samp->data, samp->dataLength);
 			e = gf_isom_add_sample(import->dest, track, di, samp);
 		}
-		if (e) goto exit;
+		if (e)
+			goto exit;
 
 		gf_set_progress("Importing AC3", done, tot_size);
 
 		samp->DTS += 1536;
-		done += samp->dataLength;
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
+		done = gf_bs_get_position(bs);
+		if (duration && (samp->DTS > duration))
+			break;
+		if (import->flags & GF_IMPORT_DO_ABORT)
+			break;
 	}
 	MP4T_RecomputeBitRate(import->dest, track);
 	gf_set_progress("Importing AC3", tot_size, tot_size);
@@ -8262,6 +8611,7 @@
 		import->esd = NULL;
 	}
 	if (samp) gf_isom_sample_del(&samp);
+	gf_bs_del(bs);
 	fclose(in);
 	return e;
 }
@@ -8282,19 +8632,19 @@
 	if (!f) return GF_URL_ERROR;
 
 	readen = (u32) fread(line, 1, 4, f);
-	if (readen < 4){
+	if (readen < 4) {
 		e = GF_URL_ERROR;
 		goto err_exit;
 	}
 	offset = 0;
 	if ((line[0]==(char)(0xFF)) && (line[1]==(char)(0xFE))) {
-		if (!line[2] && !line[3]){
+		if (!line[2] && !line[3]) {
 			e = GF_NOT_SUPPORTED;
 			goto err_exit;
 		}
 		offset = 2;
 	} else if ((line[0]==(char)(0xFE)) && (line[1]==(char)(0xFF))) {
-		if (!line[2] && !line[3]){
+		if (!line[2] && !line[3]) {
 			e = GF_NOT_SUPPORTED;
 			goto err_exit;
 		}
@@ -8354,7 +8704,7 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[Chapter import] Guessed video frame rate %g (%u:%u)\n", import->video_fps, ts, inc));
 			break;
 		}
-		if (!import->video_fps) 
+		if (!import->video_fps)
 			import->video_fps = 25;
 	}
 
@@ -8369,7 +8719,10 @@
 			u32 len = (u32) strlen(line);
 			if (!len) break;
 			switch (line[len-1]) {
-			case '\n': case '\t': case '\r': case ' ':
+			case '\n':
+			case '\t':
+			case '\r':
+			case ' ':
 				line[len-1] = 0;
 				continue;
 			}
@@ -8388,13 +8741,19 @@
 			ts = nb_fr;
 			ts *= 1000;
 			ts = (u64) (((s64) ts ) / import->video_fps);
-			sL = strchr(sL, ','); strcpy(szTitle, sL+1); sL = strrchr(szTitle, ')'); if (sL) sL[0] = 0;
+			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);
 			ts = nb_s;
 			ts *= 1000;
-			sL = strchr(sL, ','); strcpy(szTitle, sL+1); sL = strrchr(szTitle, ')'); if (sL) sL[0] = 0;
+			sL = strchr(sL, ',');
+			strcpy(szTitle, sL+1);
+			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);
@@ -8403,7 +8762,9 @@
 			sL = strchr(sL, ',');
 			if (sL) sL = strchr(sL+1, ',');
 			if (sL) sL = strchr(sL+1, ',');
-			strcpy(szTitle, sL+1); sL = strrchr(szTitle, ')'); if (sL) sL[0] = 0;
+			strcpy(szTitle, sL+1);
+			sL = strrchr(szTitle, ')');
+			if (sL) sL[0] = 0;
 		}
 		/*regular or SMPTE time codes*/
 		else if ((strlen(sL)>=8) && (sL[2]==':') && (sL[5]==':')) {
@@ -8569,9 +8930,9 @@
 #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")
-		) {
+	        || !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);
@@ -8581,11 +8942,11 @@
 #ifndef GPAC_DISABLE_MPEG2TS
 	/*MPEG-2 TS*/
 	if (!strnicmp(ext, ".ts", 3) || !strnicmp(ext, ".m2t", 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")
-		) {
+	        || !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);
 	}
 #endif
@@ -8608,16 +8969,18 @@
 		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)
-		|| !stricmp(fmt, "AVC") || !stricmp(fmt, "H264") )
+	        || !strnicmp(ext, ".h26L", 5) || !strnicmp(ext, ".26l", 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, ".shvc", 5)
-		|| !stricmp(fmt, "HEVC") || !stricmp(fmt, "SHVC") || !stricmp(fmt, "H265") )
+	        || !stricmp(fmt, "HEVC") || !stricmp(fmt, "SHVC") || !stricmp(fmt, "H265") )
 		return gf_import_hevc(importer);
-	/*AC3*/
+	/*AC3 and E-AC3*/
 	if (!strnicmp(ext, ".ac3", 4) || !stricmp(fmt, "AC3") )
-		return gf_import_ac3(importer);
+		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
 
 	/*NHNT*/
@@ -8631,7 +8994,7 @@
 		return gf_import_still_image(importer, 1);
 	/*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") )
+	        || !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") )
@@ -8641,11 +9004,11 @@
 		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")) {
+	        || !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);
+		return gf_import_timed_text(importer);
 #else
-			return GF_NOT_SUPPORTED;
+		return GF_NOT_SUPPORTED;
 #endif
 	}
 	/*VobSub*/

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/mpd.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/mpd.c Changed

@@ -176,7 +176,7 @@
 	u32 i;
 	GF_Err e;
 	GF_XMLAttribute *att;
-	GF_MPD_BaseURL *url; 
+	GF_MPD_BaseURL *url;
 	GF_SAFEALLOC(url, GF_MPD_BaseURL);
 	if (! url) return GF_OUT_OF_MEM;
 	e = gf_list_add(container, url);
@@ -277,7 +277,7 @@
 		else if (!strcmp(att->name, "timeShiftBufferDepth")) seg->time_shift_buffer_depth = gf_mpd_parse_duration(att->value);
 	}
 
-	if (mpd->type == GF_MPD_TYPE_STATIC) 
+	if (mpd->type == GF_MPD_TYPE_STATIC)
 		seg->time_shift_buffer_depth = 0;
 
 	i = 0;
@@ -302,18 +302,18 @@
 	while ( (child = gf_list_enum(root->content, &i))) {
 		if (!gf_mpd_valid_child(mpd, child)) continue;
 		if (!strcmp(child->name, "S")) {
-			GF_MPD_SegmentTimelineEntry *segent;
-			GF_SAFEALLOC(segent, GF_MPD_SegmentTimelineEntry);
-			gf_list_add(seg->entries, segent);
+			GF_MPD_SegmentTimelineEntry *seg_tl_ent;
+			GF_SAFEALLOC(seg_tl_ent, GF_MPD_SegmentTimelineEntry);
+			gf_list_add(seg->entries, seg_tl_ent);
 
 			j = 0;
 			while ( (att = gf_list_enum(child->attributes, &j)) ) {
-				if (!strcmp(att->name, "t")) 
-					segent->start_time = gf_mpd_parse_long_int(att->value);
-				else if (!strcmp(att->name, "d")) 
-					segent->duration = gf_mpd_parse_int(att->value);
-				else if (!strcmp(att->name, "r")) 
-					segent->repeat_count = gf_mpd_parse_int(att->value);
+				if (!strcmp(att->name, "t"))
+					seg_tl_ent->start_time = gf_mpd_parse_long_int(att->value);
+				else if (!strcmp(att->name, "d"))
+					seg_tl_ent->duration = gf_mpd_parse_int(att->value);
+				else if (!strcmp(att->name, "r"))
+					seg_tl_ent->repeat_count = (u32) gf_mpd_parse_int(att->value);
 			}
 		}
 	}
@@ -432,6 +432,17 @@
 
 static GF_Err gf_mpd_parse_descriptor(GF_List *container, GF_XMLNode *root)
 {
+	GF_XMLAttribute *att;
+	GF_MPD_Descriptor *mpd_desc;
+	u32 i = 0;
+
+	GF_SAFEALLOC(mpd_desc, GF_MPD_Descriptor);
+	while ( (att = gf_list_enum(root->attributes, &i)) ) {
+		if (!strcmp(att->name, "schemeIdUri")) mpd_desc->scheme_id_uri = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "value")) mpd_desc->value = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "id")) mpd_desc->id = gf_mpd_parse_string(att->value);
+	}
+	gf_list_add(container, mpd_desc);
 	return GF_OK;
 }
 
@@ -441,7 +452,7 @@
 	GF_XMLNode *child;
 	u32 i = 0;
 
-	/*setup some default*/	
+	/*setup some default*/
 	com->max_playout_rate = 1.0;
 
 	while ( (att = gf_list_enum(root->attributes, &i)) ) {
@@ -471,13 +482,19 @@
 	while ( (child = gf_list_enum(root->content, &i))) {
 		if (!gf_mpd_valid_child(mpd, child)) continue;
 		if (!strcmp(child->name, "FramePacking")) {
-			gf_mpd_parse_content_component(com->frame_packing, child);
+			gf_mpd_parse_descriptor(com->frame_packing, child);
 		}
 		else if (!strcmp(child->name, "AudioChannelConfiguration")) {
-			gf_mpd_parse_content_component(com->audio_channels, child);
+			gf_mpd_parse_descriptor(com->audio_channels, child);
 		}
 		else if (!strcmp(child->name, "ContentProtection")) {
-			gf_mpd_parse_content_component(com->content_protection, child);
+			gf_mpd_parse_descriptor(com->content_protection, child);
+		}
+		else if (!strcmp(child->name, "EssentialProperty")) {
+			gf_mpd_parse_descriptor(com->essential_properties, child);
+		}
+		else if (!strcmp(child->name, "SupplementalProperty")) {
+			gf_mpd_parse_descriptor(com->supplemental_properties, child);
 		}
 	}
 }
@@ -486,6 +503,8 @@
 {
 	com->audio_channels = gf_list_new();
 	com->content_protection = gf_list_new();
+	com->essential_properties = gf_list_new();
+	com->supplemental_properties = gf_list_new();
 	com->frame_packing = gf_list_new();
 }
 static GF_Err gf_mpd_parse_representation(GF_MPD *mpd, GF_List *container, GF_XMLNode *root)
@@ -531,10 +550,10 @@
 			rep->segment_template = gf_mpd_parse_segment_template(mpd, child);
 		}
 		else if (!strcmp(child->name, "SubRepresentation")) {
-/*TODO
-			e = gf_mpd_parse_subrepresentation(rep->sub_representations, child);
-			if (e) return e;
-*/
+			/*TODO
+						e = gf_mpd_parse_subrepresentation(rep->sub_representations, child);
+						if (e) return e;
+			*/
 		}
 	}
 	return GF_OK;
@@ -790,8 +809,11 @@
 }
 void gf_mpd_descriptor_free(void *item)
 {
-	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] descriptor not implemented\n"));
-	gf_free(item);
+	GF_MPD_Descriptor *mpd_desc = (GF_MPD_Descriptor*) item;
+	if (mpd_desc->id) gf_free(mpd_desc->id);
+	if (mpd_desc->scheme_id_uri) gf_free(mpd_desc->scheme_id_uri);
+	if (mpd_desc->value) gf_free(mpd_desc->value);
+	gf_free(mpd_desc);
 }
 
 void gf_mpd_content_component_free(void *item)
@@ -811,6 +833,8 @@
 	gf_mpd_del_list(ptr->frame_packing, gf_mpd_descriptor_free, 0);
 	gf_mpd_del_list(ptr->audio_channels, gf_mpd_descriptor_free, 0);
 	gf_mpd_del_list(ptr->content_protection, gf_mpd_descriptor_free, 0);
+	gf_mpd_del_list(ptr->essential_properties, gf_mpd_descriptor_free, 0);
+	gf_mpd_del_list(ptr->supplemental_properties, gf_mpd_descriptor_free, 0);
 }
 
 void gf_mpd_representation_free(void *_item)
@@ -822,6 +846,7 @@
 	if (ptr->media_stream_structure_id) gf_free(ptr->media_stream_structure_id);
 
 	if (ptr->playback.cached_init_segment_url) gf_free(ptr->playback.cached_init_segment_url);
+	if (ptr->playback.init_segment_data) gf_free(ptr->playback.init_segment_data);
 
 	gf_mpd_del_list(ptr->base_URLs, gf_mpd_base_url_free, 0);
 	gf_mpd_del_list(ptr->sub_representations, NULL/*TODO*/, 0);
@@ -851,6 +876,7 @@
 	gf_mpd_del_list(ptr->representations, gf_mpd_representation_free, 0);
 	gf_free(ptr);
 }
+
 void gf_mpd_period_free(void *_item)
 {
 	GF_MPD_Period *ptr = (GF_MPD_Period *)_item;
@@ -879,8 +905,9 @@
 	gf_free(mpd);
 }
 
+
 GF_EXPORT
-GF_Err gf_mpd_init_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *default_base_url)
+GF_Err gf_mpd_complete_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *default_base_url)
 {
 	GF_Err e;
 	Bool ns_ok = 0;
@@ -890,18 +917,6 @@
 
 	if (!root || !mpd) return GF_BAD_PARAM;
 
-	assert( !mpd->periods );
-	mpd->periods = gf_list_new();
-	mpd->program_infos = gf_list_new();
-	mpd->base_URLs = gf_list_new();
-	mpd->locations = gf_list_new();
-	mpd->metrics = gf_list_new();
-	/*setup some defaults*/
-	mpd->type = GF_MPD_TYPE_STATIC;
-	/*infinite by default*/
-	mpd->time_shift_buffer_depth = (u32) -1;
-
-	mpd->xml_namespace = NULL;
 	att_index = 0;
 	child_index = gf_list_count(root->attributes);
 	for (att_index = 0 ; att_index < child_index; att_index++) {
@@ -916,7 +931,7 @@
 		else if (!strncmp(att->name, "xmlns:", 6)) {
 			if (root->ns && !strcmp(att->name+6, root->ns) && (!strcmp(att->value, "urn:mpeg:dash:schema:mpd:2011") || !strcmp(att->value, "urn:mpeg:DASH:schema:MPD:2011")) ) {
 				ns_ok = 1;
-				mpd->xml_namespace = root->ns;
+				if (!mpd->xml_namespace) mpd->xml_namespace = root->ns;
 				break;
 			}
 		}
@@ -926,13 +941,17 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Wrong namespace found for DASH MPD - cannot parse\n"));
 	}
 
+	if (!strcmp(root->name, "Period")) {
+		return gf_mpd_parse_period(mpd, root);
+	}
+
 	att_index = 0;
 	for (att_index = 0 ; att_index < child_index; att_index++) {
 		att = gf_list_get(root->attributes, att_index);
 		if (!att) {
 			continue;
-		} 
-		
+		}
+
 		if (!strcmp(att->name, "id")) {
 			mpd->ID = gf_mpd_parse_string(att->value);
 		} else if (!strcmp(att->name, "profiles")) {
@@ -962,7 +981,7 @@
 			mpd->max_subsegment_duration = gf_mpd_parse_duration(att->value);
 		}
 	}
-	if (mpd->type == GF_MPD_TYPE_STATIC) 
+	if (mpd->type == GF_MPD_TYPE_STATIC)
 		mpd->minimum_update_period = mpd->time_shift_buffer_depth = 0;
 
 	child_index = 0;
@@ -993,10 +1012,32 @@
 	return GF_OK;
 }
 
+
+GF_EXPORT
+GF_Err gf_mpd_init_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *default_base_url)
+{
+	if (!root || !mpd) return GF_BAD_PARAM;
+
+	assert( !mpd->periods );
+	mpd->periods = gf_list_new();
+	mpd->program_infos = gf_list_new();
+	mpd->base_URLs = gf_list_new();
+	mpd->locations = gf_list_new();
+	mpd->metrics = gf_list_new();
+	/*setup some defaults*/
+	mpd->type = GF_MPD_TYPE_STATIC;
+	/*infinite by default*/
+	mpd->time_shift_buffer_depth = (u32) -1;
+
+	mpd->xml_namespace = NULL;
+
+	return gf_mpd_complete_from_dom(root, mpd, default_base_url);
+}
+
 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)
+                      const char *mpd_file,
+                      u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, GF_FileDownload *getter)
 {
 	GF_Err e;
 	char *sep, *template_base, *template_ext;
@@ -1017,7 +1058,7 @@
 		pl = NULL;
 		return e;
 	}
-	if (mpd_file == NULL){
+	if (mpd_file == NULL) {
 		gf_delete_file(m3u8_file);
 		mpd_file = m3u8_file;
 	}
@@ -1034,7 +1075,7 @@
 			u32 k;
 			char *suburl;
 
-			if (!pe->url ) 
+			if (!pe->url )
 				continue;
 
 			/*filter out duplicated entries (seen on M6 m3u8)*/
@@ -1051,7 +1092,7 @@
 			suburl = NULL;
 
 			/*not HLS*/
-			if ( !strstr(pe->url, ".m3u8")) 
+			if ( !strstr(pe->url, ".m3u8"))
 				continue;
 
 			if (strcmp(base_url, pe->url))
@@ -1074,7 +1115,7 @@
 				getter->del_session(getter);
 
 #if 0
-				GF_DownloadSession *sess = gf_term_download_new(service, suburl, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL);
+				GF_DownloadSession *sess = gf_service_download_new(service, suburl, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL);
 				if (!sess) {
 					gf_free(suburl);
 					break;
@@ -1083,7 +1124,7 @@
 				if (e==GF_OK) {
 					e = parse_sub_playlist(gf_dm_sess_get_cache_name(sess), &pl, suburl, prog, pe);
 				}
-				gf_term_download_del(sess);
+				gf_service_download_del(sess);
 #endif
 				gf_free(suburl);
 			} else { /* for use in MP4Box */
@@ -1130,7 +1171,7 @@
 
 	assert( mpd_file );
 	fmpd = gf_f64_open(mpd_file, "wt");
-	if (!fmpd){
+	if (!fmpd) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD Generator] Cannot write to temp file %s!\n", mpd_file));
 		variant_playlist_del(pl);
 		return GF_IO_ERR;
@@ -1175,7 +1216,7 @@
 		count2 = gf_list_count(prog->bitrates);
 		for (j = 0; j<count2; j++) {
 			pe = gf_list_get(prog->bitrates, j);
-			if (pe->elementType != TYPE_PLAYLIST) 
+			if (pe->elementType != TYPE_PLAYLIST)
 				continue;
 
 			count3 = gf_list_count(pe->element.playlist.elements);
@@ -1217,7 +1258,7 @@
 				for (k=0; k<count3; k++) {
 					char szURL[GF_MAX_PATH], *sub_url;
 					elt = gf_list_get(pe->element.playlist.elements, k);
-					
+
 					if (template_width==2) sprintf(szURL, "%s%02d%s", template_base, template_idx_start + k, template_ext);
 					else if (template_width==3) sprintf(szURL, "%s%03d%s", template_base, template_idx_start + k, template_ext);
 					else if (template_width==4) sprintf(szURL, "%s%04d%s", template_base, template_idx_start + k, template_ext);
@@ -1282,7 +1323,7 @@
 		if (import.nb_tracks>1) {
 			for (k=0; k<import.nb_tracks; k++) {
 				fprintf(fmpd, "   <ContentComponent id=\"%d\"", import.tk_info[k].track_num);
-				if (import.tk_info[k].lang) 
+				if (import.tk_info[k].lang)
 					fprintf(fmpd, " lang=\"%s\"", gf_4cc_to_str(import.tk_info[k].lang));
 				switch (import.tk_info[k].type) {
 				case GF_ISOM_MEDIA_VISUAL:
@@ -1317,7 +1358,7 @@
 			Bool is_aac = 0;
 			char *byte_range_media_file = NULL;
 			pe = gf_list_get(prog->bitrates, j);
-			
+
 			if (pe->elementType == TYPE_STREAM) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 Stream\n"));
 			} else if (pe->elementType != TYPE_PLAYLIST) {
@@ -1346,7 +1387,7 @@
 			if (elt && strstr(elt->url, ".aac"))
 				is_aac = 1;
 
-			if (is_aac) 
+			if (is_aac)
 				fprintf(fmpd, "");
 				continue;
 			}
@@ -1493,7 +1534,7 @@
 			fprintf(fmpd, "   </Representation>\n");
 			gf_free(base_url);
 
-			if (is_aac) 
+			if (is_aac)
 				fprintf(fmpd, " -->\n");
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/mpeg2_ps.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/mpeg2_ps.c Changed

@@ -3,19 +3,19 @@
  * 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 MPEG4IP.
- * 
+ *
  * The Initial Developer of the Original Code is Cisco Systems Inc.
  * Portions created by Cisco Systems Inc. are
  * Copyright (C) Cisco Systems Inc. 2004.  All Rights Reserved.
- * 
- * Contributor(s): 
+ *
+ * Contributor(s):
  *		Bill May wmay@cisco.com
  */
 
@@ -30,25 +30,28 @@
 static GFINLINE u16 convert16 (u8 *p)
 {
 #ifdef GPAC_BIG_ENDIAN
-  return *(u16 *)p;
+	return *(u16 *)p;
 #else
-  u16 val = p[0];
-  val <<= 8;
-  return (val | p[1]);
+	u16 val = p[0];
+	val <<= 8;
+	return (val | p[1]);
 #endif
 }
 
 static GFINLINE u32 convert32 (u8 *p)
 {
 #ifdef GPAC_BIG_ENDIAN
-  return *(u32 *)p;
+	return *(u32 *)p;
 #else
-  u32 val;
-  val = p[0]; val <<= 8;
-  val |= p[1]; val <<= 8;
-  val |= p[2]; val <<= 8;
-  val |= p[3];
-  return val;
+	u32 val;
+	val = p[0];
+	val <<= 8;
+	val |= p[1];
+	val <<= 8;
+	val |= p[2];
+	val <<= 8;
+	val |= p[3];
+	return val;
 #endif
 }
 
@@ -59,63 +62,63 @@
  */
 typedef struct mpeg2ps_ts_t
 {
-  Bool have_pts;
-  Bool have_dts;
-  u64 pts;
-  u64 dts;
+	Bool have_pts;
+	Bool have_dts;
+	u64 pts;
+	u64 dts;
 } mpeg2ps_ts_t;
 
 typedef struct mpeg2ps_record_pes_t
 {
-  struct mpeg2ps_record_pes_t *next_rec;
-  u64 dts;
-  u64 location;
+	struct mpeg2ps_record_pes_t *next_rec;
+	u64 dts;
+	u64 location;
 } mpeg2ps_record_pes_t;
 
 /*
  * information about reading a stream
  */
-typedef struct mpeg2ps_stream_t 
-{
-  mpeg2ps_record_pes_t *record_first, *record_last;
-  FILE *m_fd;
-  Bool is_video;
-  u8 m_stream_id;    // program stream id
-  u8 m_substream_id; // substream, for program stream id == 0xbd
-
-  mpeg2ps_ts_t next_pes_ts, frame_ts;
-  u32 frames_since_last_ts;
-  u64 last_ts;
-
-  Bool have_frame_loaded;
-  /*
-   * pes_buffer processing.  this contains the raw elementary stream data
-   */
-  u8 *pes_buffer;
-  u32 pes_buffer_size;
-  u32 pes_buffer_size_max;
-  u32 pes_buffer_on;
-  u32 frame_len;
-  u32 pict_header_offset; // for mpeg video
-
-  // timing information and locations.
-  s64 first_pes_loc;
-  u64 start_dts;
-  Bool first_pes_has_dts;
-  s64    end_dts_loc;
-  u64 end_dts;
-  // audio stuff
-  u32 freq;
-  u32 channels;
-  u32 bitrate;
-  u32 samples_per_frame;
-  u32 layer;
-  // video stuff
-  u32 h, w, par;
-  Double frame_rate;
-  s32 have_mpeg2;
-  Double bit_rate;
-  u64 ticks_per_frame;
+typedef struct mpeg2ps_stream_t
+{
+	mpeg2ps_record_pes_t *record_first, *record_last;
+	FILE *m_fd;
+	Bool is_video;
+	u8 m_stream_id;    // program stream id
+	u8 m_substream_id; // substream, for program stream id == 0xbd
+
+	mpeg2ps_ts_t next_pes_ts, frame_ts;
+	u32 frames_since_last_ts;
+	u64 last_ts;
+
+	Bool have_frame_loaded;
+	/*
+	 * pes_buffer processing.  this contains the raw elementary stream data
+	 */
+	u8 *pes_buffer;
+	u32 pes_buffer_size;
+	u32 pes_buffer_size_max;
+	u32 pes_buffer_on;
+	u32 frame_len;
+	u32 pict_header_offset; // for mpeg video
+
+	// timing information and locations.
+	s64 first_pes_loc;
+	u64 start_dts;
+	Bool first_pes_has_dts;
+	s64    end_dts_loc;
+	u64 end_dts;
+	// audio stuff
+	u32 freq;
+	u32 channels;
+	u32 bitrate;
+	u32 samples_per_frame;
+	u32 layer;
+	// video stuff
+	u32 h, w, par;
+	Double frame_rate;
+	s32 have_mpeg2;
+	Double bit_rate;
+	u64 ticks_per_frame;
 
 } mpeg2ps_stream_t;
 
@@ -124,15 +127,15 @@
  * information
  */
 struct mpeg2ps_ {
-  mpeg2ps_stream_t *video_streams[16];
-  mpeg2ps_stream_t *audio_streams[32];
-  char *filename;
-  FILE *fd;
-  u64 first_dts;
-  u32 audio_cnt, video_cnt;
-  s64 end_loc;
-  u64 max_dts;
-  u64 max_time;  // time is in msec.
+	mpeg2ps_stream_t *video_streams[16];
+	mpeg2ps_stream_t *audio_streams[32];
+	char *filename;
+	FILE *fd;
+	u64 first_dts;
+	u32 audio_cnt, video_cnt;
+	s64 end_loc;
+	u64 max_dts;
+	u64 max_time;  // time is in msec.
 };
 
 /*************************************************************************
@@ -140,7 +143,7 @@
  *************************************************************************/
 static FILE *file_open (const char *name)
 {
-  return gf_f64_open(name, "rb");
+	return gf_f64_open(name, "rb");
 }
 
 static Bool file_okay (FILE *fd)
@@ -150,21 +153,21 @@
 
 static void file_close (FILE *fd)
 {
-  fclose(fd);
+	fclose(fd);
 }
 
 static Bool file_read_bytes(FILE *fd,
-			     u8 *buffer, 
-			     u32 len)
+                            u8 *buffer,
+                            u32 len)
 {
-  u32 readval = (u32) fread(buffer, 1, len, fd);
-  return readval == len;
+	u32 readval = (u32) fread(buffer, 1, len, fd);
+	return readval == len;
 }
 
 // note: len could be negative.
 static void file_skip_bytes (FILE *fd, s32 len)
 {
-  gf_f64_seek(fd, len, SEEK_CUR);
+	gf_f64_seek(fd, len, SEEK_CUR);
 }
 
 #define file_location(__f) gf_f64_tell(__f)
@@ -172,224 +175,238 @@
 
 static u64 file_size(FILE *fd)
 {
-  u64 ret;
-  gf_f64_seek(fd, 0, SEEK_END);
-  ret = gf_f64_tell(fd);
-  gf_f64_seek(fd, 0, SEEK_SET);
-  return ret;
+	u64 ret;
+	gf_f64_seek(fd, 0, SEEK_END);
+	ret = gf_f64_tell(fd);
+	gf_f64_seek(fd, 0, SEEK_SET);
+	return ret;
 }
 
 static mpeg2ps_record_pes_t *create_record (s64 loc, u64 ts)
 {
-  mpeg2ps_record_pes_t *ret;
-  GF_SAFEALLOC(ret, mpeg2ps_record_pes_t);
+	mpeg2ps_record_pes_t *ret;
+	GF_SAFEALLOC(ret, mpeg2ps_record_pes_t);
 
-  ret->next_rec = NULL;
-  ret->dts = ts;
-  ret->location = loc;
-  return ret;
+	ret->next_rec = NULL;
+	ret->dts = ts;
+	ret->location = loc;
+	return ret;
 }
 
 #define MPEG2PS_RECORD_TIME ((u64) (5 * 90000))
 void mpeg2ps_record_pts (mpeg2ps_stream_t *sptr, s64 location, mpeg2ps_ts_t *pTs)
 {
-  u64 ts;
-  mpeg2ps_record_pes_t *p, *q;
-  if (sptr->is_video) {
-    if (pTs->have_dts == 0) return;
-    ts = pTs->dts;
-  } else {
-    if (pTs->have_pts == 0) return;
-    ts = pTs->pts;
-  }
-
-  if (sptr->record_first == NULL) {
-    sptr->record_first = sptr->record_last = create_record(location, ts);
-    return;
-  } 
-  if (ts > sptr->record_last->dts) {
-    if (ts < MPEG2PS_RECORD_TIME + sptr->record_last->dts) return;
-    sptr->record_last->next_rec = create_record(location, ts);
-	sptr->record_last = sptr->record_last->next_rec;
-    return;
-  }
-  if (ts < sptr->record_first->dts) {
-    if (ts < MPEG2PS_RECORD_TIME + sptr->record_first->dts) return;
-    p = create_record(location, ts);
-    p->next_rec = sptr->record_first;
-    sptr->record_first = p;
-    return;
-  }
-  p = sptr->record_first;
-  q = p->next_rec;
-
-  while (q != NULL && q->dts < ts) {
-    p = q;
-    q = q->next_rec;
-  }
-  if (p->dts + MPEG2PS_RECORD_TIME <= ts &&
-      ts + MPEG2PS_RECORD_TIME <= q->dts) {
-    p->next_rec = create_record(location, ts);
-    p->next_rec->next_rec = q;
-  }
+	u64 ts;
+	mpeg2ps_record_pes_t *p, *q;
+	if (sptr->is_video) {
+		if (pTs->have_dts == 0) return;
+		ts = pTs->dts;
+	} else {
+		if (pTs->have_pts == 0) return;
+		ts = pTs->pts;
+	}
+
+	if (sptr->record_first == NULL) {
+		sptr->record_first = sptr->record_last = create_record(location, ts);
+		return;
+	}
+	if (ts > sptr->record_last->dts) {
+		if (ts < MPEG2PS_RECORD_TIME + sptr->record_last->dts) return;
+		sptr->record_last->next_rec = create_record(location, ts);
+		sptr->record_last = sptr->record_last->next_rec;
+		return;
+	}
+	if (ts < sptr->record_first->dts) {
+		if (ts < MPEG2PS_RECORD_TIME + sptr->record_first->dts) return;
+		p = create_record(location, ts);
+		p->next_rec = sptr->record_first;
+		sptr->record_first = p;
+		return;
+	}
+	p = sptr->record_first;
+	q = p->next_rec;
+
+	while (q != NULL && q->dts < ts) {
+		p = q;
+		q = q->next_rec;
+	}
+	if (p->dts + MPEG2PS_RECORD_TIME <= ts &&
+	        ts + MPEG2PS_RECORD_TIME <= q->dts) {
+		p->next_rec = create_record(location, ts);
+		p->next_rec->next_rec = q;
+	}
 }
 static Double mpeg12_frame_rate_table[16] =
 {
-  0.0,   /* Pad */
-  24000.0/1001.0,       /* Official frame rates */
-  24.0,
-  25.0,
-  30000.0/1001.0,
-  30.0,
-  50.0,
-  ((60.0*1000.0)/1001.0),
-  60.0,
-
-  1,                    /* Unofficial economy rates */
-  5, 
-  10,
-  12,
-  15,
-  0,
-  0,
+	0.0,   /* Pad */
+	24000.0/1001.0,       /* Official frame rates */
+	24.0,
+	25.0,
+	30000.0/1001.0,
+	30.0,
+	50.0,
+	((60.0*1000.0)/1001.0),
+	60.0,
+
+	1,                    /* Unofficial economy rates */
+	5,
+	10,
+	12,
+	15,
+	0,
+	0,
 };
 
 #define SEQ_ID 1
-int MPEG12_ParseSeqHdr(unsigned char *pbuffer, u32 buflen, s32 *have_mpeg2, u32 *height, u32 *width, 
-								  Double *frame_rate, Double *bitrate, u32 *aspect_ratio)
-{
-  u32 aspect_code;
-  u32 framerate_code;
-  u32 bitrate_int;
-  u32 bitrate_ext;
-  u32 scode, ix;
-  s32 found = -1;
-  *have_mpeg2 = 0;
-  buflen -= 6;
-  bitrate_int = 0;
-  for (ix = 0; ix < buflen; ix++, pbuffer++) {
-    scode = (pbuffer[0] << 24) | (pbuffer[1] << 16) | (pbuffer[2] << 8) | 
-      pbuffer[3];
-
-    if (scode == MPEG12_SEQUENCE_START_CODE) {
-      pbuffer += sizeof(u32);
-      *width = (pbuffer[0]);
-      *width <<= 4;
-      *width |= ((pbuffer[1] >> 4) &0xf);
-      *height = (pbuffer[1] & 0xf);
-      *height <<= 8;
-      *height |= pbuffer[2];
-      aspect_code = (pbuffer[3] >> 4) & 0xf;
-      if (aspect_ratio != NULL) {
-		  u32 par = 0;
-			switch (aspect_code) {
-			default: *aspect_ratio = 0; break;
-			case 2: par = 4; par<<=16; par |= 3; break;
-			case 3: par = 16; par<<=16; par |= 9; break;
-			case 4: par = 2; par<<=16; par |= 21; break;
+int MPEG12_ParseSeqHdr(unsigned char *pbuffer, u32 buflen, s32 *have_mpeg2, u32 *height, u32 *width,
+                       Double *frame_rate, Double *bitrate, u32 *aspect_ratio)
+{
+	u32 aspect_code;
+	u32 framerate_code;
+	u32 bitrate_int;
+	u32 bitrate_ext;
+	u32 scode, ix;
+	s32 found = -1;
+	*have_mpeg2 = 0;
+	buflen -= 6;
+	bitrate_int = 0;
+	for (ix = 0; ix < buflen; ix++, pbuffer++) {
+		scode = (pbuffer[0] << 24) | (pbuffer[1] << 16) | (pbuffer[2] << 8) |
+		        pbuffer[3];
+
+		if (scode == MPEG12_SEQUENCE_START_CODE) {
+			pbuffer += sizeof(u32);
+			*width = (pbuffer[0]);
+			*width <<= 4;
+			*width |= ((pbuffer[1] >> 4) &0xf);
+			*height = (pbuffer[1] & 0xf);
+			*height <<= 8;
+			*height |= pbuffer[2];
+			aspect_code = (pbuffer[3] >> 4) & 0xf;
+			if (aspect_ratio != NULL) {
+				u32 par = 0;
+				switch (aspect_code) {
+				default:
+					*aspect_ratio = 0;
+					break;
+				case 2:
+					par = 4;
+					par<<=16;
+					par |= 3;
+					break;
+				case 3:
+					par = 16;
+					par<<=16;
+					par |= 9;
+					break;
+				case 4:
+					par = 2;
+					par<<=16;
+					par |= 21;
+					break;
+				}
+				*aspect_ratio = par;
 			}
-			*aspect_ratio = par;
-      }
-	  
-	
-      framerate_code = pbuffer[3] & 0xf;
-      *frame_rate = mpeg12_frame_rate_table[framerate_code];
-      // 18 bits
-      bitrate_int = (pbuffer[4] << 10) | 
-	(pbuffer[5] << 2) | 
-	((pbuffer[6] >> 6) & 0x3);
-      *bitrate = bitrate_int;
-      *bitrate *= 400.0;
-      ix += sizeof(u32) + 7;
-      pbuffer += 7;
-      found = 0;
-    } else if (found == 0) {
-      if (scode == MPEG12_EXT_START_CODE) {
-	pbuffer += sizeof(u32);
-	ix += sizeof(u32);
-	switch ((pbuffer[0] >> 4) & 0xf) {
-	case SEQ_ID:
-	  *have_mpeg2 = 1;
-	  *height = ((pbuffer[1] & 0x1) << 13) | 
-	    ((pbuffer[2] & 0x80) << 5) |
-	    (*height & 0x0fff);
-	  *width = (((pbuffer[2] >> 5) & 0x3) << 12) | (*width & 0x0fff);
-	  bitrate_ext = (pbuffer[2] & 0x1f) << 7;
-	  bitrate_ext |= (pbuffer[3] >> 1) & 0x7f;
-	  bitrate_int |= (bitrate_ext << 18);
-	  *bitrate = bitrate_int;
-	  *bitrate *= 400.0;
-	  break;
-	default:
-	  break;
-	}
-	pbuffer++;
-	ix++;
-      } else if (scode == MPEG12_PICTURE_START_CODE) {
+
+
+			framerate_code = pbuffer[3] & 0xf;
+			*frame_rate = mpeg12_frame_rate_table[framerate_code];
+			// 18 bits
+			bitrate_int = (pbuffer[4] << 10) |
+			              (pbuffer[5] << 2) |
+			              ((pbuffer[6] >> 6) & 0x3);
+			*bitrate = bitrate_int;
+			*bitrate *= 400.0;
+			ix += sizeof(u32) + 7;
+			pbuffer += 7;
+			found = 0;
+		} else if (found == 0) {
+			if (scode == MPEG12_EXT_START_CODE) {
+				pbuffer += sizeof(u32);
+				ix += sizeof(u32);
+				switch ((pbuffer[0] >> 4) & 0xf) {
+				case SEQ_ID:
+					*have_mpeg2 = 1;
+					*height = ((pbuffer[1] & 0x1) << 13) |
+					          ((pbuffer[2] & 0x80) << 5) |
+					          (*height & 0x0fff);
+					*width = (((pbuffer[2] >> 5) & 0x3) << 12) | (*width & 0x0fff);
+					bitrate_ext = (pbuffer[2] & 0x1f) << 7;
+					bitrate_ext |= (pbuffer[3] >> 1) & 0x7f;
+					bitrate_int |= (bitrate_ext << 18);
+					*bitrate = bitrate_int;
+					*bitrate *= 400.0;
+					break;
+				default:
+					break;
+				}
+				pbuffer++;
+				ix++;
+			} else if (scode == MPEG12_PICTURE_START_CODE) {
+				return found;
+			}
+		}
+	}
 	return found;
-      }
-    }
-  }
-  return found;
 }
 
 
 s32 MPEG12_PictHdrType (unsigned char *pbuffer)
 {
-  pbuffer += sizeof(u32);
-  return ((pbuffer[1] >> 3) & 0x7);
+	pbuffer += sizeof(u32);
+	return ((pbuffer[1] >> 3) & 0x7);
 }
 
 u16 MPEG12_PictHdrTempRef(unsigned char *pbuffer)
 {
-  pbuffer += sizeof(u32);
-  return ((pbuffer[0] << 2) | ((pbuffer[1] >> 6) & 0x3));
+	pbuffer += sizeof(u32);
+	return ((pbuffer[0] << 2) | ((pbuffer[1] >> 6) & 0x3));
 }
 
 
 static u64 read_pts (u8 *pak)
 {
-  u64 pts;
-  u16 temp;
-  
-  pts = ((pak[0] >> 1) & 0x7);
-  pts <<= 15;
-  temp = convert16(&pak[1]) >> 1;
-  pts |= temp;
-  pts <<= 15;
-  temp = convert16(&pak[3]) >> 1;
-  pts |= temp;
-  return pts;
+	u64 pts;
+	u16 temp;
+
+	pts = ((pak[0] >> 1) & 0x7);
+	pts <<= 15;
+	temp = convert16(&pak[1]) >> 1;
+	pts |= temp;
+	pts <<= 15;
+	temp = convert16(&pak[3]) >> 1;
+	pts |= temp;
+	return pts;
 }
 
 
 static mpeg2ps_stream_t *mpeg2ps_stream_create (u8 stream_id,
-						u8 substream)
-{
-  mpeg2ps_stream_t *ptr;
-  GF_SAFEALLOC(ptr, mpeg2ps_stream_t);
-  ptr->m_stream_id = stream_id;
-  ptr->m_substream_id = substream;
-  ptr->is_video = stream_id >= 0xe0;
-  ptr->pes_buffer = (u8 *)gf_malloc(4*4096);
-  ptr->pes_buffer_size_max = 4 * 4096;
-  return ptr;
+        u8 substream)
+{
+	mpeg2ps_stream_t *ptr;
+	GF_SAFEALLOC(ptr, mpeg2ps_stream_t);
+	ptr->m_stream_id = stream_id;
+	ptr->m_substream_id = substream;
+	ptr->is_video = stream_id >= 0xe0;
+	ptr->pes_buffer = (u8 *)gf_malloc(4*4096);
+	ptr->pes_buffer_size_max = 4 * 4096;
+	return ptr;
 }
 
 static void mpeg2ps_stream_destroy (mpeg2ps_stream_t *sptr)
 {
-  mpeg2ps_record_pes_t *p;
-  while (sptr->record_first != NULL) {
-    p = sptr->record_first;
-    sptr->record_first = p->next_rec;
-    gf_free(p);
-  }
-  if (sptr->m_fd != FDNULL) {
-    file_close(sptr->m_fd);
-    sptr->m_fd = FDNULL;
-  }
-  if (sptr->pes_buffer) gf_free(sptr->pes_buffer);
-  gf_free(sptr);
+	mpeg2ps_record_pes_t *p;
+	while (sptr->record_first != NULL) {
+		p = sptr->record_first;
+		sptr->record_first = p->next_rec;
+		gf_free(p);
+	}
+	if (sptr->m_fd != FDNULL) {
+		file_close(sptr->m_fd);
+		sptr->m_fd = FDNULL;
+	}
+	if (sptr->pes_buffer) gf_free(sptr->pes_buffer);
+	gf_free(sptr);
 }
 
 
@@ -397,118 +414,118 @@
  * adv_past_pack_hdr - read the pack header, advance past it
  * we don't do anything with the data
  */
-static void adv_past_pack_hdr (FILE *fd, 
-			       u8 *pak,
-			       u32 read_from_start)
-{
-  u8 stuffed;
-  u8 readbyte;
-  u8 val;
-  if (read_from_start < 5) {
-    file_skip_bytes(fd, 5 - read_from_start);
-    file_read_bytes(fd, &readbyte, 1);
-    val = readbyte;
-  } else {
-    val = pak[4];
-  }
-    
-  // we've read 6 bytes
-  if ((val & 0xc0) != 0x40) {
-    // mpeg1
-    file_skip_bytes(fd, 12 - read_from_start); // skip 6 more bytes
-    return;
-  }
-  file_skip_bytes(fd, 13 - read_from_start);
-  file_read_bytes(fd, &readbyte, 1);
-  stuffed = readbyte & 0x7;
-  file_skip_bytes(fd, stuffed);
+static void adv_past_pack_hdr (FILE *fd,
+                               u8 *pak,
+                               u32 read_from_start)
+{
+	u8 stuffed;
+	u8 readbyte;
+	u8 val;
+	if (read_from_start < 5) {
+		file_skip_bytes(fd, 5 - read_from_start);
+		file_read_bytes(fd, &readbyte, 1);
+		val = readbyte;
+	} else {
+		val = pak[4];
+	}
+
+	// we've read 6 bytes
+	if ((val & 0xc0) != 0x40) {
+		// mpeg1
+		file_skip_bytes(fd, 12 - read_from_start); // skip 6 more bytes
+		return;
+	}
+	file_skip_bytes(fd, 13 - read_from_start);
+	file_read_bytes(fd, &readbyte, 1);
+	stuffed = readbyte & 0x7;
+	file_skip_bytes(fd, stuffed);
 }
 
 /*
  * find_pack_start
- * look for the pack start code in the file - read 512 bytes at a time, 
+ * look for the pack start code in the file - read 512 bytes at a time,
  * searching for that code.
  * Note: we may also be okay looking for >= 00 00 01 bb
  */
-static Bool find_pack_start (FILE *fd, 
-			     u8 *saved,
-			     u32 len)
-{
-  u8 buffer[512];
-  u32 buffer_on = 0, new_offset, scode;
-  memcpy(buffer, saved, len);
-  if (file_read_bytes(fd, buffer + len, sizeof(buffer) - len) == 0) {
-    return 0;
-  }
-  while (1) {
-    if (gf_mv12_next_start_code(buffer + buffer_on,
-				 sizeof(buffer) - buffer_on, 
-				 &new_offset, 
-				 &scode) >= 0) {
-      buffer_on += new_offset;
-      if (scode == MPEG2_PS_PACKSTART) {
-	file_skip_bytes(fd, buffer_on - 512); // go back to header
-	return 1;
-      }
-      buffer_on += 1;
-    } else {
-      len = 0;
-      if (buffer[sizeof(buffer) - 3] == 0 &&
-	  buffer[sizeof(buffer) - 2] == 0 &&
-	  buffer[sizeof(buffer) - 1] == 1) {
-	buffer[0] = 0;
-	buffer[1] = 0;
-	buffer[2] = 1;
-	len = 3;
-      } else if (*(u16 *)(buffer + sizeof(buffer) - 2) == 0) {
-	buffer[0] = 0;
-	buffer[1] = 0;
-	len = 2;
-      } else if (buffer[sizeof(buffer) - 1] == 0) {
-	buffer[0] = 0;
-	len = 1;
-      }
-      if (file_read_bytes(fd, buffer + len, sizeof(buffer) - len) == 0) {
+static Bool find_pack_start (FILE *fd,
+                             u8 *saved,
+                             u32 len)
+{
+	u8 buffer[512];
+	u32 buffer_on = 0, new_offset, scode;
+	memcpy(buffer, saved, len);
+	if (file_read_bytes(fd, buffer + len, sizeof(buffer) - len) == 0) {
+		return 0;
+	}
+	while (1) {
+		if (gf_mv12_next_start_code(buffer + buffer_on,
+		                            sizeof(buffer) - buffer_on,
+		                            &new_offset,
+		                            &scode) >= 0) {
+			buffer_on += new_offset;
+			if (scode == MPEG2_PS_PACKSTART) {
+				file_skip_bytes(fd, buffer_on - 512); // go back to header
+				return 1;
+			}
+			buffer_on += 1;
+		} else {
+			len = 0;
+			if (buffer[sizeof(buffer) - 3] == 0 &&
+			        buffer[sizeof(buffer) - 2] == 0 &&
+			        buffer[sizeof(buffer) - 1] == 1) {
+				buffer[0] = 0;
+				buffer[1] = 0;
+				buffer[2] = 1;
+				len = 3;
+			} else if (*(u16 *)(buffer + sizeof(buffer) - 2) == 0) {
+				buffer[0] = 0;
+				buffer[1] = 0;
+				len = 2;
+			} else if (buffer[sizeof(buffer) - 1] == 0) {
+				buffer[0] = 0;
+				len = 1;
+			}
+			if (file_read_bytes(fd, buffer + len, sizeof(buffer) - len) == 0) {
+				return 0;
+			}
+			buffer_on = 0;
+		}
+	}
 	return 0;
-      }
-      buffer_on = 0;
-    }
-  }
-  return 0;
 }
 
 /*
- * copy_bytes_to_pes_buffer - read pes_len bytes into the buffer, 
+ * copy_bytes_to_pes_buffer - read pes_len bytes into the buffer,
  * adjusting it if we need it
  */
-static void copy_bytes_to_pes_buffer (mpeg2ps_stream_t *sptr, 
-			       u16 pes_len)
-{
-  u32 to_move;
-
-  if (sptr->pes_buffer_size + pes_len > sptr->pes_buffer_size_max) {
-    // if no room in the buffer, we'll move it - otherwise, just fill
-    // note - we might want a better strategy about moving the buffer - 
-    // right now, we might be moving a number of bytes if we have a large
-    // followed by large frame.
-    to_move = sptr->pes_buffer_size - sptr->pes_buffer_on;
-    memmove(sptr->pes_buffer,
-	    sptr->pes_buffer + sptr->pes_buffer_on,
-	    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);
-      sptr->pes_buffer_size_max = to_move + pes_len + 2048;
-    }
-  }
-  file_read_bytes(sptr->m_fd, sptr->pes_buffer + sptr->pes_buffer_size, pes_len);
-  sptr->pes_buffer_size += pes_len;
+static void copy_bytes_to_pes_buffer (mpeg2ps_stream_t *sptr,
+                                      u16 pes_len)
+{
+	u32 to_move;
+
+	if (sptr->pes_buffer_size + pes_len > sptr->pes_buffer_size_max) {
+		// if no room in the buffer, we'll move it - otherwise, just fill
+		// note - we might want a better strategy about moving the buffer -
+		// right now, we might be moving a number of bytes if we have a large
+		// followed by large frame.
+		to_move = sptr->pes_buffer_size - sptr->pes_buffer_on;
+		memmove(sptr->pes_buffer,
+		        sptr->pes_buffer + sptr->pes_buffer_on,
+		        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);
+			sptr->pes_buffer_size_max = to_move + pes_len + 2048;
+		}
+	}
+	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);
+	fprintf(stderr, "copying %u bytes - on %u size %u\n",
+	        pes_len, sptr->pes_buffer_on, sptr->pes_buffer_size);
 #endif
 }
 
@@ -519,50 +536,50 @@
  * 00 00 01 and the next byte > 0xbb.
  * We return the pes len to read, and the "next byte"
  */
-static Bool read_to_next_pes_header (FILE *fd, 
-				     u8 *stream_id,
-				     u16 *pes_len)
-{
-  u32 hdr;
-  u8 local[6];
-
-  while (1) {
-    // read the pes header
-    if (file_read_bytes(fd, local, 6) == 0) {
-      return 0;
-    }
-
-    hdr = convert32(local);
-    // if we're not a 00 00 01, read until we get the next pack start
-    // we might want to also read until next PES - look into that.
-    if (((hdr & MPEG2_PS_START_MASK) != MPEG2_PS_START) ||
-	(hdr < MPEG2_PS_END)) {
-      if (find_pack_start(fd, local, 6) == 0) {
-	return 0;
-      }
-      continue;
-    }
-    if (hdr == MPEG2_PS_PACKSTART) {
-      // pack start code - we can skip down
-      adv_past_pack_hdr(fd, local, 6);
-      continue;
-    }
-    if (hdr == MPEG2_PS_END) {
-      file_skip_bytes(fd, -2);
-      continue;
-    }
-
-    // we should have a valid stream and pes_len here...
-    *stream_id = hdr & 0xff;
-    *pes_len = convert16(local + 4);
+static Bool read_to_next_pes_header (FILE *fd,
+                                     u8 *stream_id,
+                                     u16 *pes_len)
+{
+	u32 hdr;
+	u8 local[6];
+
+	while (1) {
+		// read the pes header
+		if (file_read_bytes(fd, local, 6) == 0) {
+			return 0;
+		}
+
+		hdr = convert32(local);
+		// if we're not a 00 00 01, read until we get the next pack start
+		// we might want to also read until next PES - look into that.
+		if (((hdr & MPEG2_PS_START_MASK) != MPEG2_PS_START) ||
+		        (hdr < MPEG2_PS_END)) {
+			if (find_pack_start(fd, local, 6) == 0) {
+				return 0;
+			}
+			continue;
+		}
+		if (hdr == MPEG2_PS_PACKSTART) {
+			// pack start code - we can skip down
+			adv_past_pack_hdr(fd, local, 6);
+			continue;
+		}
+		if (hdr == MPEG2_PS_END) {
+			file_skip_bytes(fd, -2);
+			continue;
+		}
+
+		// 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);
+		fprintf(stderr, "loc: "X64" %x len %u\n", file_location(fd) - 6,
+		        local[3],
+		        *pes_len);
 #endif
-    return 1;
-  }
-  return 0;
+		return 1;
+	}
+	return 0;
 }
 
 /*
@@ -570,173 +587,173 @@
  * this should read past the pes header for the audio and video streams
  * it will store the timestamps if it reads them
  */
-static Bool read_pes_header_data (FILE *fd, 
-				  u16 orig_pes_len,
-				  u16 *pes_left,
-				  Bool *have_ts,
-				  mpeg2ps_ts_t *ts)
-{
-  u16 pes_len = orig_pes_len;
-  u8 local[10];
-  u32 hdr_len;
-
-  ts->have_pts = 0;
-  ts->have_dts = 0;
-  *have_ts = 0;
-  if (file_read_bytes(fd, local, 1) == 0) {
-    return 0;
-  }
-  pes_len--; // remove this first byte from length
-  while (*local == 0xff) {
-    if (file_read_bytes(fd, local, 1) == 0) {
-      return 0;
-    }
-    pes_len--;
-    if (pes_len == 0) {
-      *pes_left = 0;
-      return 1;
-    }
-  }
-  if ((*local & 0xc0) == 0x40) { 
-    // buffer scale & size
-    file_skip_bytes(fd, 1);
-    if (file_read_bytes(fd, local, 1) == 0) {
-      return 0;
-    }
-    pes_len -= 2;
-  }
-
-  if ((*local & 0xf0) == 0x20) {
-    // mpeg-1 with pts
-    if (file_read_bytes(fd, local + 1, 4) == 0) {
-      return 0;
-    }
-    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) {
-    // have mpeg 1 pts and dts
-    if (file_read_bytes(fd, local + 1, 9) == 0) {
-      return 0;
-    }
-    ts->have_pts = 1;
-    ts->have_dts = 1;
-    *have_ts = 1;
-    ts->pts = read_pts(local);
-    ts->dts = read_pts(local + 5);
-    pes_len -= 9;
-  } else if ((*local & 0xc0) == 0x80) {
-    // mpeg2 pes header  - we're pointing at the flags field now
-    if (file_read_bytes(fd, local + 1, 2) == 0) {
-      return 0;
-    }
-    hdr_len = local[2];
-    pes_len -= hdr_len + 2; // first byte removed already
-    if ((local[1] & 0xc0) == 0x80) {
-      // just pts
-      ts->have_pts = 1;
-      file_read_bytes(fd, local, 5);
-      ts->pts = ts->dts = read_pts(local);
-      *have_ts = 1;
-      hdr_len -= 5;
-    } else if ((local[1] & 0xc0) == 0xc0) {
-      // pts and dts
-      ts->have_pts = 1;
-      ts->have_dts = 1;
-      *have_ts = 1;
-      file_read_bytes(fd, local, 10);
-      ts->pts = read_pts(local);
-      ts->dts = read_pts(local  + 5);    
-      hdr_len -= 10;
-    }
-    file_skip_bytes(fd, hdr_len);
-  } else if (*local != 0xf) {
-    file_skip_bytes(fd, pes_len);
-    pes_len = 0;
-  } 
-  *pes_left = pes_len;
-  return 1;
+static Bool read_pes_header_data (FILE *fd,
+                                  u16 orig_pes_len,
+                                  u16 *pes_left,
+                                  Bool *have_ts,
+                                  mpeg2ps_ts_t *ts)
+{
+	u16 pes_len = orig_pes_len;
+	u8 local[10];
+	u32 hdr_len;
+
+	ts->have_pts = 0;
+	ts->have_dts = 0;
+	*have_ts = 0;
+	if (file_read_bytes(fd, local, 1) == 0) {
+		return 0;
+	}
+	pes_len--; // remove this first byte from length
+	while (*local == 0xff) {
+		if (file_read_bytes(fd, local, 1) == 0) {
+			return 0;
+		}
+		pes_len--;
+		if (pes_len == 0) {
+			*pes_left = 0;
+			return 1;
+		}
+	}
+	if ((*local & 0xc0) == 0x40) {
+		// buffer scale & size
+		file_skip_bytes(fd, 1);
+		if (file_read_bytes(fd, local, 1) == 0) {
+			return 0;
+		}
+		pes_len -= 2;
+	}
+
+	if ((*local & 0xf0) == 0x20) {
+		// mpeg-1 with pts
+		if (file_read_bytes(fd, local + 1, 4) == 0) {
+			return 0;
+		}
+		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) {
+		// have mpeg 1 pts and dts
+		if (file_read_bytes(fd, local + 1, 9) == 0) {
+			return 0;
+		}
+		ts->have_pts = 1;
+		ts->have_dts = 1;
+		*have_ts = 1;
+		ts->pts = read_pts(local);
+		ts->dts = read_pts(local + 5);
+		pes_len -= 9;
+	} else if ((*local & 0xc0) == 0x80) {
+		// mpeg2 pes header  - we're pointing at the flags field now
+		if (file_read_bytes(fd, local + 1, 2) == 0) {
+			return 0;
+		}
+		hdr_len = local[2];
+		pes_len -= hdr_len + 2; // first byte removed already
+		if ((local[1] & 0xc0) == 0x80) {
+			// just pts
+			ts->have_pts = 1;
+			file_read_bytes(fd, local, 5);
+			ts->pts = ts->dts = read_pts(local);
+			*have_ts = 1;
+			hdr_len -= 5;
+		} else if ((local[1] & 0xc0) == 0xc0) {
+			// pts and dts
+			ts->have_pts = 1;
+			ts->have_dts = 1;
+			*have_ts = 1;
+			file_read_bytes(fd, local, 10);
+			ts->pts = read_pts(local);
+			ts->dts = read_pts(local  + 5);
+			hdr_len -= 10;
+		}
+		file_skip_bytes(fd, hdr_len);
+	} else if (*local != 0xf) {
+		file_skip_bytes(fd, pes_len);
+		pes_len = 0;
+	}
+	*pes_left = pes_len;
+	return 1;
 }
 
-static Bool search_for_next_pes_header (mpeg2ps_stream_t *sptr, 
-					u16 *pes_len,
-					Bool *have_ts, 
-					s64 *found_loc)
-{
-  u8 stream_id;
-  u8 local;
-  s64 loc;
-  while (1) {
-    // this will read until we find the next pes.  We don't know if the
-    // stream matches - this will read over pack headers
-    if (read_to_next_pes_header(sptr->m_fd, &stream_id, pes_len) == 0) {
-      return 0;
-    }
-
-    if (stream_id != sptr->m_stream_id) {
-      file_skip_bytes(sptr->m_fd, *pes_len);
-      continue;
-    }
-    loc = file_location(sptr->m_fd) - 6; 
-    // advance past header, reading pts
-    if (read_pes_header_data(sptr->m_fd, 
-			     *pes_len, 
-			     pes_len, 
-			     have_ts, 
-			     &sptr->next_pes_ts) == 0) {
-      return 0;
-    }
-
-    // If we're looking at a private stream, make sure that the sub-stream
-    // matches.
-    if (sptr->m_stream_id == 0xbd) {
-      // ac3 or pcm
-      file_read_bytes(sptr->m_fd, &local, 1);
-      *pes_len -= 1;
-      if (local != sptr->m_substream_id) {
-	file_skip_bytes(sptr->m_fd, *pes_len);
-	continue; // skip to the next one
-      }
-      *pes_len -= 3;
-      file_skip_bytes(sptr->m_fd, 3); // 4 bytes - we don't need now...
-      // we need more here...
-    }
-    if (have_ts) {
-      mpeg2ps_record_pts(sptr, loc, &sptr->next_pes_ts);
-    }
-    if (found_loc != NULL) *found_loc = loc;
-    return 1;
-  }
-  return 0;
+static Bool search_for_next_pes_header (mpeg2ps_stream_t *sptr,
+                                        u16 *pes_len,
+                                        Bool *have_ts,
+                                        s64 *found_loc)
+{
+	u8 stream_id;
+	u8 local;
+	s64 loc;
+	while (1) {
+		// this will read until we find the next pes.  We don't know if the
+		// stream matches - this will read over pack headers
+		if (read_to_next_pes_header(sptr->m_fd, &stream_id, pes_len) == 0) {
+			return 0;
+		}
+
+		if (stream_id != sptr->m_stream_id) {
+			file_skip_bytes(sptr->m_fd, *pes_len);
+			continue;
+		}
+		loc = file_location(sptr->m_fd) - 6;
+		// advance past header, reading pts
+		if (read_pes_header_data(sptr->m_fd,
+		                         *pes_len,
+		                         pes_len,
+		                         have_ts,
+		                         &sptr->next_pes_ts) == 0) {
+			return 0;
+		}
+
+		// If we're looking at a private stream, make sure that the sub-stream
+		// matches.
+		if (sptr->m_stream_id == 0xbd) {
+			// ac3 or pcm
+			file_read_bytes(sptr->m_fd, &local, 1);
+			*pes_len -= 1;
+			if (local != sptr->m_substream_id) {
+				file_skip_bytes(sptr->m_fd, *pes_len);
+				continue; // skip to the next one
+			}
+			*pes_len -= 3;
+			file_skip_bytes(sptr->m_fd, 3); // 4 bytes - we don't need now...
+			// we need more here...
+		}
+		if (have_ts) {
+			mpeg2ps_record_pts(sptr, loc, &sptr->next_pes_ts);
+		}
+		if (found_loc != NULL) *found_loc = loc;
+		return 1;
+	}
+	return 0;
 }
 
 /*
- * mpeg2ps_stream_read_next_pes_buffer - for the given stream, 
+ * mpeg2ps_stream_read_next_pes_buffer - for the given stream,
  * go forward in the file until the next PES for the stream is read.  Read
  * the header (pts, dts), and read the data into the pes_buffer pointer
  */
 static Bool mpeg2ps_stream_read_next_pes_buffer (mpeg2ps_stream_t *sptr)
 {
-  u16 pes_len;
-  Bool have_ts;
+	u16 pes_len;
+	Bool have_ts;
 
-  if (search_for_next_pes_header(sptr, &pes_len, &have_ts, NULL) == 0) {
-    return 0;
-  }
+	if (search_for_next_pes_header(sptr, &pes_len, &have_ts, NULL) == 0) {
+		return 0;
+	}
 
-  copy_bytes_to_pes_buffer(sptr, pes_len);
+	copy_bytes_to_pes_buffer(sptr, pes_len);
 
-  return 1;
+	return 1;
 }
 
 
 /***************************************************************************
  * Frame reading routine.  For each stream, the fd's should be different.
  * we will read from the pes stream, and save it in the stream's pes buffer.
- * This will give us raw data that we can search through for frame headers, 
- * and the like.  We shouldn't read more than we need - when we need to read, 
+ * This will give us raw data that we can search through for frame headers,
+ * and the like.  We shouldn't read more than we need - when we need to read,
  * we'll put the whole next pes buffer in the buffer
  *
  * Audio routines are of the format:
@@ -748,206 +765,207 @@
  *   look for start header (GOP, SEQ, Picture)
  *   look for pict header
  *   look for next start (END, GOP, SEQ, Picture)
- *   
+ *
  ***************************************************************************/
 #define IS_MPEG_START(a) ((a) == 0xb3 || (a) == 0x00 || (a) == 0xb8)
 
-static Bool 
+static Bool
 mpeg2ps_stream_find_mpeg_video_frame (mpeg2ps_stream_t *sptr)
 {
-  u32 offset, scode;
-  Bool have_pict;
-  Bool started_new_pes = 0;
-  u32 start;
-  /*
-   * First thing - determine if we have enough bytes to read the header.
-   * if we do, we have the correct timestamp.  If not, we read the new
-   * pes, so we'd want to use the timestamp we read.
-   */
-  sptr->frame_ts = sptr->next_pes_ts; 
-  if (sptr->pes_buffer_size <= sptr->pes_buffer_on + 4) {
-    if (sptr->pes_buffer_size != sptr->pes_buffer_on)
-      started_new_pes = 1;
-    if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
-      return 0;
-    }
-  }
-  while (gf_mv12_next_start_code(sptr->pes_buffer + sptr->pes_buffer_on, 
-				  sptr->pes_buffer_size - sptr->pes_buffer_on,
-				  &offset,
-				  &scode) < 0 ||
-	 (!IS_MPEG_START(scode & 0xff))) {
-    if (sptr->pes_buffer_size > 3)
-      sptr->pes_buffer_on = sptr->pes_buffer_size - 3;
-    else {
-      sptr->pes_buffer_on = sptr->pes_buffer_size;
-      started_new_pes = 1;
-    }
-    if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
-      return 0;
-    }
-  }
-  sptr->pes_buffer_on += offset;
-  if (offset == 0 && started_new_pes) {
-    // nothing...  we've copied the timestamp already.
-  } else {
-    // we found the new start, but we pulled in a new pes header before
-    // starting.  So, we want to use the header that we read.
-    sptr->frame_ts = sptr->next_pes_ts; // set timestamp after searching
-    // clear timestamp indication
-    sptr->next_pes_ts.have_pts = sptr->next_pes_ts.have_dts = 0;
-  }
+	u32 offset, scode;
+	Bool have_pict;
+	Bool started_new_pes = 0;
+	u32 start;
+	/*
+	 * First thing - determine if we have enough bytes to read the header.
+	 * if we do, we have the correct timestamp.  If not, we read the new
+	 * pes, so we'd want to use the timestamp we read.
+	 */
+	sptr->frame_ts = sptr->next_pes_ts;
+	if (sptr->pes_buffer_size <= sptr->pes_buffer_on + 4) {
+		if (sptr->pes_buffer_size != sptr->pes_buffer_on)
+			started_new_pes = 1;
+		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+			return 0;
+		}
+	}
+	while (gf_mv12_next_start_code(sptr->pes_buffer + sptr->pes_buffer_on,
+	                               sptr->pes_buffer_size - sptr->pes_buffer_on,
+	                               &offset,
+	                               &scode) < 0 ||
+	        (!IS_MPEG_START(scode & 0xff))) {
+		if (sptr->pes_buffer_size > 3)
+			sptr->pes_buffer_on = sptr->pes_buffer_size - 3;
+		else {
+			sptr->pes_buffer_on = sptr->pes_buffer_size;
+			started_new_pes = 1;
+		}
+		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+			return 0;
+		}
+	}
+	sptr->pes_buffer_on += offset;
+	if (offset == 0 && started_new_pes) {
+		// nothing...  we've copied the timestamp already.
+	} else {
+		// we found the new start, but we pulled in a new pes header before
+		// starting.  So, we want to use the header that we read.
+		sptr->frame_ts = sptr->next_pes_ts; // set timestamp after searching
+		// 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);
+	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;
-    have_pict = 1;
-  } else have_pict = 0;
-
-  start = 4 + sptr->pes_buffer_on;
-  while (1) {
-    
-    if (gf_mv12_next_start_code(sptr->pes_buffer + start, 
-				 sptr->pes_buffer_size - start,
-				 &offset,
-				 &scode) < 0) {
-      start = sptr->pes_buffer_size - 3;
-      start -= sptr->pes_buffer_on;
-      sptr->pict_header_offset -= sptr->pes_buffer_on;
-      if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
-	return 0;
-      }
-      start += sptr->pes_buffer_on;
-      sptr->pict_header_offset += sptr->pes_buffer_on;
-    } else {
+	if (scode == MPEG12_PICTURE_START_CODE) {
+		sptr->pict_header_offset = sptr->pes_buffer_on;
+		have_pict = 1;
+	} else have_pict = 0;
+
+	start = 4 + sptr->pes_buffer_on;
+	while (1) {
+
+		if (gf_mv12_next_start_code(sptr->pes_buffer + start,
+		                            sptr->pes_buffer_size - start,
+		                            &offset,
+		                            &scode) < 0) {
+			start = sptr->pes_buffer_size - 3;
+			start -= sptr->pes_buffer_on;
+			sptr->pict_header_offset -= sptr->pes_buffer_on;
+			if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+				return 0;
+			}
+			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);
+			fprintf(stderr, "2header %x at %d\n", scode, start);
 #endif
 
-      start += offset;
-      if (have_pict == 0) {
-	if (scode == MPEG12_PICTURE_START_CODE) {
-	  have_pict = 1;
-	  sptr->pict_header_offset = start;
-	}
-      } else {
-	if (IS_MPEG_START(scode & 0xff) ||
-	    scode == MPEG12_SEQUENCE_END_START_CODE) {
-	  sptr->frame_len = start - sptr->pes_buffer_on;
-	  sptr->have_frame_loaded = 1;
-	  return 1;
-	}
-      }
-      start += 4;
-    }
-  }
-  return 0;
+			start += offset;
+			if (have_pict == 0) {
+				if (scode == MPEG12_PICTURE_START_CODE) {
+					have_pict = 1;
+					sptr->pict_header_offset = start;
+				}
+			} else {
+				if (IS_MPEG_START(scode & 0xff) ||
+				        scode == MPEG12_SEQUENCE_END_START_CODE) {
+					sptr->frame_len = start - sptr->pes_buffer_on;
+					sptr->have_frame_loaded = 1;
+					return 1;
+				}
+			}
+			start += 4;
+		}
+	}
+	return 0;
 }
 
 static Bool mpeg2ps_stream_find_ac3_frame (mpeg2ps_stream_t *sptr)
 {
-  u32 diff;
-  GF_AC3Header hdr;
-  Bool started_new_pes = 0;
-  sptr->frame_ts = sptr->next_pes_ts; // set timestamp after searching
-  if (sptr->pes_buffer_size <= sptr->pes_buffer_on + 6) {
-    if (sptr->pes_buffer_size != sptr->pes_buffer_on)
-      started_new_pes = 1;
-    if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
-      return 0;
-    }
-  }
-  while (gf_ac3_parser(sptr->pes_buffer + sptr->pes_buffer_on,
-			      sptr->pes_buffer_size - sptr->pes_buffer_on,
-			       &diff, 
-			      &hdr, 0) <= 0) {
-    // don't have frame
-    if (sptr->pes_buffer_size > 6) {
-      sptr->pes_buffer_on = sptr->pes_buffer_size - 6;
-      started_new_pes = 1;
-    } else {
-      sptr->pes_buffer_on = sptr->pes_buffer_size;
-    }
-    if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
-      return 0;
-    }
-  }
-  sptr->frame_len = hdr.framesize;
-  sptr->pes_buffer_on += diff;
-  if (diff == 0 && started_new_pes) {
-    // we might have a new PTS - but it's not here
-  } else {
-    sptr->frame_ts = sptr->next_pes_ts;
-    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) {
+	u32 diff;
+	Bool started_new_pes = 0;
+	GF_AC3Header hdr;
+	memset(&hdr, 0, sizeof(GF_AC3Header));
+	sptr->frame_ts = sptr->next_pes_ts; // set timestamp after searching
+	if (sptr->pes_buffer_size <= sptr->pes_buffer_on + 6) {
+		if (sptr->pes_buffer_size != sptr->pes_buffer_on)
+			started_new_pes = 1;
+		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+			return 0;
+		}
+	}
+	while (gf_ac3_parser(sptr->pes_buffer + sptr->pes_buffer_on,
+	                     sptr->pes_buffer_size - sptr->pes_buffer_on,
+	                     &diff,
+	                     &hdr, 0) <= 0) {
+		// don't have frame
+		if (sptr->pes_buffer_size > 6) {
+			sptr->pes_buffer_on = sptr->pes_buffer_size - 6;
+			started_new_pes = 1;
+		} else {
+			sptr->pes_buffer_on = sptr->pes_buffer_size;
+		}
+		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+			return 0;
+		}
+	}
+	sptr->frame_len = hdr.framesize;
+	sptr->pes_buffer_on += diff;
+	if (diff == 0 && started_new_pes) {
+		// we might have a new PTS - but it's not here
+	} else {
+		sptr->frame_ts = sptr->next_pes_ts;
+		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);
+		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;
-    }
-  }
-  sptr->have_frame_loaded = 1;
-  return 1;
+		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+			return 0;
+		}
+	}
+	sptr->have_frame_loaded = 1;
+	return 1;
 }
 
 static Bool mpeg2ps_stream_find_mp3_frame (mpeg2ps_stream_t *sptr)
 {
-  u32 diff, hdr;
-  Bool started_new_pes = 0;
-
-  sptr->frame_ts = sptr->next_pes_ts;
-  if (sptr->pes_buffer_size <= sptr->pes_buffer_on + 4) {
-    if (sptr->pes_buffer_size != sptr->pes_buffer_on)
-      started_new_pes = 1;
-    if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
-      return 0;
-    }
-  }
-  while ((hdr=gf_mp3_get_next_header_mem((char*)sptr->pes_buffer + sptr->pes_buffer_on,
-			sptr->pes_buffer_size - sptr->pes_buffer_on,
-			&diff) ) == 0) {
-    // don't have frame
-    if (sptr->pes_buffer_size > 3) {
-      if (sptr->pes_buffer_on != sptr->pes_buffer_size) {
-	sptr->pes_buffer_on = sptr->pes_buffer_size - 3;
-      }
-      started_new_pes = 1; // we have left over bytes...
-    } else {
-      sptr->pes_buffer_on = sptr->pes_buffer_size;
-    }
-    if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
-      return 0;
-    }
-  }
-  // have frame.
-  sptr->frame_len = gf_mp3_frame_size(hdr);
-  sptr->pes_buffer_on += diff;
-  if (diff == 0 && started_new_pes) {
-
-  } else {
-    sptr->frame_ts = sptr->next_pes_ts;
-    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) {
+	u32 diff, hdr;
+	Bool started_new_pes = 0;
+
+	sptr->frame_ts = sptr->next_pes_ts;
+	if (sptr->pes_buffer_size <= sptr->pes_buffer_on + 4) {
+		if (sptr->pes_buffer_size != sptr->pes_buffer_on)
+			started_new_pes = 1;
+		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+			return 0;
+		}
+	}
+	while ((hdr=gf_mp3_get_next_header_mem((char*)sptr->pes_buffer + sptr->pes_buffer_on,
+	                                       sptr->pes_buffer_size - sptr->pes_buffer_on,
+	                                       &diff) ) == 0) {
+		// don't have frame
+		if (sptr->pes_buffer_size > 3) {
+			if (sptr->pes_buffer_on != sptr->pes_buffer_size) {
+				sptr->pes_buffer_on = sptr->pes_buffer_size - 3;
+			}
+			started_new_pes = 1; // we have left over bytes...
+		} else {
+			sptr->pes_buffer_on = sptr->pes_buffer_size;
+		}
+		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+			return 0;
+		}
+	}
+	// have frame.
+	sptr->frame_len = gf_mp3_frame_size(hdr);
+	sptr->pes_buffer_on += diff;
+	if (diff == 0 && started_new_pes) {
+
+	} else {
+		sptr->frame_ts = sptr->next_pes_ts;
+		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);
+		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;
-    }
-  }
-  sptr->have_frame_loaded = 1;
-  return 1;
+		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
+			return 0;
+		}
+	}
+	sptr->have_frame_loaded = 1;
+	return 1;
 }
 
 /*
@@ -955,102 +973,103 @@
  * advance_pointers is 0 when we want to use the data
  */
 static Bool mpeg2ps_stream_read_frame (mpeg2ps_stream_t *sptr,
-				       u8 **buffer, 
-				       u32 *buflen,
-				       Bool advance_pointers)
-{
-  //  Bool done = 0;
-  if (sptr->is_video) {
-    if (mpeg2ps_stream_find_mpeg_video_frame(sptr)) {
-      *buffer = sptr->pes_buffer + sptr->pes_buffer_on;
-      *buflen = sptr->frame_len;
-      if (advance_pointers) {
-	sptr->pes_buffer_on += sptr->frame_len;
-      }
-      return 1;
-    }
-    return 0;
-  } else if (sptr->m_stream_id == 0xbd) {
-    // would need to handle LPCM here
-    if (mpeg2ps_stream_find_ac3_frame(sptr)) {
-      *buffer = sptr->pes_buffer + sptr->pes_buffer_on;
-      *buflen = sptr->frame_len;
-      if (advance_pointers)
-	sptr->pes_buffer_on += sptr->frame_len;
-      return 1;
-    }
-    return 0;
-  } else if (mpeg2ps_stream_find_mp3_frame(sptr)) {
-    *buffer = sptr->pes_buffer + sptr->pes_buffer_on;
-    *buflen = sptr->frame_len;
-    if (advance_pointers)
-      sptr->pes_buffer_on += sptr->frame_len;
-    return 1;
-  }
-  return 0;
+                                       u8 **buffer,
+                                       u32 *buflen,
+                                       Bool advance_pointers)
+{
+	//  Bool done = 0;
+	if (sptr->is_video) {
+		if (mpeg2ps_stream_find_mpeg_video_frame(sptr)) {
+			*buffer = sptr->pes_buffer + sptr->pes_buffer_on;
+			*buflen = sptr->frame_len;
+			if (advance_pointers) {
+				sptr->pes_buffer_on += sptr->frame_len;
+			}
+			return 1;
+		}
+		return 0;
+	} else if (sptr->m_stream_id == 0xbd) {
+		// would need to handle LPCM here
+		if (mpeg2ps_stream_find_ac3_frame(sptr)) {
+			*buffer = sptr->pes_buffer + sptr->pes_buffer_on;
+			*buflen = sptr->frame_len;
+			if (advance_pointers)
+				sptr->pes_buffer_on += sptr->frame_len;
+			return 1;
+		}
+		return 0;
+	} else if (mpeg2ps_stream_find_mp3_frame(sptr)) {
+		*buffer = sptr->pes_buffer + sptr->pes_buffer_on;
+		*buflen = sptr->frame_len;
+		if (advance_pointers)
+			sptr->pes_buffer_on += sptr->frame_len;
+		return 1;
+	}
+	return 0;
 }
 
 /*
  * get_info_from_frame - we have a frame, get the info from it.
  */
-static void get_info_from_frame (mpeg2ps_stream_t *sptr, 
-				 u8 *buffer, 
-				 u32 buflen)
-{
-  if (sptr->is_video) {
-    if (MPEG12_ParseSeqHdr(buffer, buflen,
-			       &sptr->have_mpeg2,
-			       &sptr->h,
-			       &sptr->w,
-			       &sptr->frame_rate,
-			       &sptr->bit_rate,
-			       &sptr->par) < 0) {
-      sptr->m_stream_id = 0;
-      sptr->m_fd = FDNULL;
-    }
-    sptr->ticks_per_frame = (u64)(90000.0 / sptr->frame_rate);
-    return;
-  }
-
-  if (sptr->m_stream_id >= 0xc0) {
-    // mpeg audio
-    u32 hdr = GF_4CC(buffer[0],buffer[1],buffer[2],buffer[3]);
-
-    sptr->channels = gf_mp3_num_channels(hdr);
-    sptr->freq = gf_mp3_sampling_rate(hdr);
-    sptr->samples_per_frame = gf_mp3_window_size(hdr);
-    sptr->bitrate = gf_mp3_bit_rate(hdr) * 1000; // give bps, not kbps
-    sptr->layer = gf_mp3_layer(hdr);
-  } else if (sptr->m_stream_id == 0xbd) {
-    if (sptr->m_substream_id >= 0xa0) {
-      // PCM - ???
-    } else if (sptr->m_substream_id >= 0x80) {
-		u32 pos;
-		GF_AC3Header hdr;
-      gf_ac3_parser(buffer, buflen, &pos, &hdr, 0);
-	  sptr->bitrate = hdr.bitrate;
-	  sptr->freq = hdr.sample_rate;
-	  sptr->channels = hdr.channels;
-      sptr->samples_per_frame = 256 * 6;
-    } else {
-      return;
-    }
-  } else {
-    return;
-  }
+static void get_info_from_frame (mpeg2ps_stream_t *sptr,
+                                 u8 *buffer,
+                                 u32 buflen)
+{
+	if (sptr->is_video) {
+		if (MPEG12_ParseSeqHdr(buffer, buflen,
+		                       &sptr->have_mpeg2,
+		                       &sptr->h,
+		                       &sptr->w,
+		                       &sptr->frame_rate,
+		                       &sptr->bit_rate,
+		                       &sptr->par) < 0) {
+			sptr->m_stream_id = 0;
+			sptr->m_fd = FDNULL;
+		}
+		sptr->ticks_per_frame = (u64)(90000.0 / sptr->frame_rate);
+		return;
+	}
+
+	if (sptr->m_stream_id >= 0xc0) {
+		// mpeg audio
+		u32 hdr = GF_4CC(buffer[0],buffer[1],buffer[2],buffer[3]);
+
+		sptr->channels = gf_mp3_num_channels(hdr);
+		sptr->freq = gf_mp3_sampling_rate(hdr);
+		sptr->samples_per_frame = gf_mp3_window_size(hdr);
+		sptr->bitrate = gf_mp3_bit_rate(hdr) * 1000; // give bps, not kbps
+		sptr->layer = gf_mp3_layer(hdr);
+	} else if (sptr->m_stream_id == 0xbd) {
+		if (sptr->m_substream_id >= 0xa0) {
+			// PCM - ???
+		} else if (sptr->m_substream_id >= 0x80) {
+			u32 pos;
+			GF_AC3Header hdr;
+			memset(&hdr, 0, sizeof(GF_AC3Header));
+			gf_ac3_parser(buffer, buflen, &pos, &hdr, 0);
+			sptr->bitrate = hdr.bitrate;
+			sptr->freq = hdr.sample_rate;
+			sptr->channels = hdr.channels;
+			sptr->samples_per_frame = 256 * 6;
+		} else {
+			return;
+		}
+	} else {
+		return;
+	}
 }
 
 /*
- * clear_stream_buffer - called when we seek to clear out any data in 
+ * clear_stream_buffer - called when we seek to clear out any data in
  * the buffers
  */
 static void clear_stream_buffer (mpeg2ps_stream_t *sptr)
 {
-  sptr->pes_buffer_on = sptr->pes_buffer_size = 0;
-  sptr->frame_len = 0;
-  sptr->have_frame_loaded = 0;
-  sptr->next_pes_ts.have_dts = sptr->next_pes_ts.have_pts = 0;
-  sptr->frame_ts.have_dts = sptr->frame_ts.have_pts = 0;
+	sptr->pes_buffer_on = sptr->pes_buffer_size = 0;
+	sptr->frame_len = 0;
+	sptr->have_frame_loaded = 0;
+	sptr->next_pes_ts.have_dts = sptr->next_pes_ts.have_pts = 0;
+	sptr->frame_ts.have_dts = sptr->frame_ts.have_pts = 0;
 }
 
 /*
@@ -1058,101 +1077,101 @@
  * frames_since_last_ts.
  */
 static u64 convert_ts (mpeg2ps_stream_t *sptr,
-			    mpeg2ps_ts_type_t ts_type,
-			    u64 ts,
-			    u64 base_ts,
-			    u32 frames_since_ts)
-{
-  u64 ret, calc;
-  ret = ts - base_ts;
-  if (sptr->is_video) {
-    // video
-    ret += frames_since_ts * sptr->ticks_per_frame;
-  } else {
-    // audio
-    calc = (frames_since_ts * 90000 * sptr->samples_per_frame) / sptr->freq;
-    ret += calc;
-  }
-  if (ts_type == TS_MSEC)
-    ret /= (u64) (90); // * 1000 / 90000
-
-  return ret;
+                       mpeg2ps_ts_type_t ts_type,
+                       u64 ts,
+                       u64 base_ts,
+                       u32 frames_since_ts)
+{
+	u64 ret, calc;
+	ret = ts - base_ts;
+	if (sptr->is_video) {
+		// video
+		ret += frames_since_ts * sptr->ticks_per_frame;
+	} else {
+		// audio
+		calc = (frames_since_ts * 90000 * sptr->samples_per_frame) / sptr->freq;
+		ret += calc;
+	}
+	if (ts_type == TS_MSEC)
+		ret /= (u64) (90); // * 1000 / 90000
+
+	return ret;
 }
 
 /*
  * find_stream_from_id - given the stream, get the sptr.
- * only used in inital set up, really.  APIs use index into 
+ * only used in inital set up, really.  APIs use index into
  * video_streams and audio_streams arrays.
  */
-static mpeg2ps_stream_t *find_stream_from_id (mpeg2ps_t *ps, 
-					      u8 stream_id, 
-					      u8 substream)
-{
-  u8 ix;
-  if (stream_id >= 0xe0) {
-    for (ix = 0; ix < ps->video_cnt; ix++) {
-      if (ps->video_streams[ix]->m_stream_id == stream_id) {
-	return ps->video_streams[ix];
-      }
-    }
-  } else {
-    for (ix = 0; ix < ps->audio_cnt; ix++) {
-      if (ps->audio_streams[ix]->m_stream_id == stream_id &&
-	  (stream_id != 0xbd ||
-	   substream == ps->audio_streams[ix]->m_substream_id)) {
-	return ps->audio_streams[ix];
-      }
-    }
-  }
-  return NULL;
+static mpeg2ps_stream_t *find_stream_from_id (mpeg2ps_t *ps,
+        u8 stream_id,
+        u8 substream)
+{
+	u8 ix;
+	if (stream_id >= 0xe0) {
+		for (ix = 0; ix < ps->video_cnt; ix++) {
+			if (ps->video_streams[ix]->m_stream_id == stream_id) {
+				return ps->video_streams[ix];
+			}
+		}
+	} else {
+		for (ix = 0; ix < ps->audio_cnt; ix++) {
+			if (ps->audio_streams[ix]->m_stream_id == stream_id &&
+			        (stream_id != 0xbd ||
+			         substream == ps->audio_streams[ix]->m_substream_id)) {
+				return ps->audio_streams[ix];
+			}
+		}
+	}
+	return NULL;
 }
 
 /*
  * add_stream - add a new stream
  */
 static Bool add_stream (mpeg2ps_t *ps,
-			u8 stream_id,
-			u8 substream,
-			s64 first_loc,
-			mpeg2ps_ts_t *ts)
-{
-  mpeg2ps_stream_t *sptr;
-  
-  sptr = find_stream_from_id(ps, stream_id, substream);
-  if (sptr != NULL) return 0;
-
-  // need to add
-
-  sptr = mpeg2ps_stream_create(stream_id, substream);
-  sptr->first_pes_loc = first_loc;
-  if (ts == NULL ||
-      (ts->have_dts == 0 && ts->have_pts == 0)) {
-    sptr->first_pes_has_dts = 0;
-  } else {
-    sptr->start_dts = ts->have_dts ? ts->dts : ts->pts;
-    sptr->first_pes_has_dts = 1;
-  }
-  if (sptr->is_video) {
-    // can't be more than 16 - e0 to ef...
-    ps->video_streams[ps->video_cnt] = sptr;
-    ps->video_cnt++;
-  } else {
-    if (ps->audio_cnt >= 32) {
-      mpeg2ps_stream_destroy(sptr);
-      return 0;
-    }
-    ps->audio_streams[ps->audio_cnt] = sptr;
-    ps->audio_cnt++;
-  }
-  return 1;
+                        u8 stream_id,
+                        u8 substream,
+                        s64 first_loc,
+                        mpeg2ps_ts_t *ts)
+{
+	mpeg2ps_stream_t *sptr;
+
+	sptr = find_stream_from_id(ps, stream_id, substream);
+	if (sptr != NULL) return 0;
+
+	// need to add
+
+	sptr = mpeg2ps_stream_create(stream_id, substream);
+	sptr->first_pes_loc = first_loc;
+	if (ts == NULL ||
+	        (ts->have_dts == 0 && ts->have_pts == 0)) {
+		sptr->first_pes_has_dts = 0;
+	} else {
+		sptr->start_dts = ts->have_dts ? ts->dts : ts->pts;
+		sptr->first_pes_has_dts = 1;
+	}
+	if (sptr->is_video) {
+		// can't be more than 16 - e0 to ef...
+		ps->video_streams[ps->video_cnt] = sptr;
+		ps->video_cnt++;
+	} else {
+		if (ps->audio_cnt >= 32) {
+			mpeg2ps_stream_destroy(sptr);
+			return 0;
+		}
+		ps->audio_streams[ps->audio_cnt] = sptr;
+		ps->audio_cnt++;
+	}
+	return 1;
 }
 
-static void check_fd_for_stream (mpeg2ps_t *ps, 
-			  mpeg2ps_stream_t *sptr)
+static void check_fd_for_stream (mpeg2ps_t *ps,
+                                 mpeg2ps_stream_t *sptr)
 {
-  if (sptr->m_fd != FDNULL) return;
+	if (sptr->m_fd != FDNULL) return;
 
-  sptr->m_fd = file_open(ps->filename);
+	sptr->m_fd = file_open(ps->filename);
 }
 
 /*
@@ -1163,17 +1182,17 @@
  */
 static void advance_frame (mpeg2ps_stream_t *sptr)
 {
-  sptr->pes_buffer_on += sptr->frame_len;
-  sptr->have_frame_loaded = 0;
-  if (sptr->frame_ts.have_dts || sptr->frame_ts.have_pts) {
-    if (sptr->frame_ts.have_dts) 
-      sptr->last_ts = sptr->frame_ts.dts;
-    else
-      sptr->last_ts = sptr->frame_ts.pts;
-    sptr->frames_since_last_ts = 0;
-  } else {
-    sptr->frames_since_last_ts++;
-  }
+	sptr->pes_buffer_on += sptr->frame_len;
+	sptr->have_frame_loaded = 0;
+	if (sptr->frame_ts.have_dts || sptr->frame_ts.have_pts) {
+		if (sptr->frame_ts.have_dts)
+			sptr->last_ts = sptr->frame_ts.dts;
+		else
+			sptr->last_ts = sptr->frame_ts.pts;
+		sptr->frames_since_last_ts = 0;
+	} else {
+		sptr->frames_since_last_ts++;
+	}
 }
 /*
  * get_info_for_all_streams - loop through found streams - read an
@@ -1181,69 +1200,69 @@
  */
 static void get_info_for_all_streams (mpeg2ps_t *ps)
 {
-  u8 stream_ix, max_ix, av;
-  mpeg2ps_stream_t *sptr;
-  u8 *buffer;
-  u32 buflen;
+	u8 stream_ix, max_ix, av;
+	mpeg2ps_stream_t *sptr;
+	u8 *buffer;
+	u32 buflen;
 
 	file_seek_to(ps->fd, 0);
 
-  // av will be 0 for video streams, 1 for audio streams
-  // av is just so I don't have to dup a lot of code that does the
-  // same thing.
-  for (av = 0; av < 2; av++) {
-    if (av == 0) max_ix = ps->video_cnt;
-    else max_ix = ps->audio_cnt;
-    for (stream_ix = 0; stream_ix < max_ix; stream_ix++) {
-      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
-      // start reading or seeking).  Use the one from the ps.
-      sptr->m_fd = ps->fd; // for now
-      clear_stream_buffer(sptr);
-      if (mpeg2ps_stream_read_frame(sptr,
-				    &buffer, 
-				    &buflen,
-				    0) == 0) {
-	sptr->m_stream_id = 0;
-	sptr->m_fd = FDNULL;
-	continue;
-      }
-      get_info_from_frame(sptr, buffer, buflen);
-      // here - if (sptr->first_pes_has_dts == 0) should be processed
-      if (sptr->first_pes_has_dts == 0) {
-	u32 frames_from_beg = 0;
-	Bool have_frame;
-	do {
-	  advance_frame(sptr);
-	  have_frame = 
-	    mpeg2ps_stream_read_frame(sptr, &buffer, &buflen, 0);
-	  frames_from_beg++;
-	} while (have_frame && 
-		 sptr->frame_ts.have_dts == 0 && 
-		 sptr->frame_ts.have_pts == 0 && 
-		 frames_from_beg < 1000);
-	if (have_frame == 0 ||
-	    (sptr->frame_ts.have_dts == 0 &&
-	     sptr->frame_ts.have_pts == 0)) {
-	} else {
-	  sptr->start_dts = sptr->frame_ts.have_dts ? sptr->frame_ts.dts : 
-	    sptr->frame_ts.pts;
-	  if (sptr->is_video) {
-	    sptr->start_dts -= frames_from_beg * sptr->ticks_per_frame;
-	  } else {
-	    u64 conv;
-	    conv = sptr->samples_per_frame * 90000;
-	    conv /= (u64)sptr->freq;
-	    sptr->start_dts -= conv;
-	  }
-	}
-      }
-      clear_stream_buffer(sptr);
-      sptr->m_fd = FDNULL;
-    }
-  }
+	// av will be 0 for video streams, 1 for audio streams
+	// av is just so I don't have to dup a lot of code that does the
+	// same thing.
+	for (av = 0; av < 2; av++) {
+		if (av == 0) max_ix = ps->video_cnt;
+		else max_ix = ps->audio_cnt;
+		for (stream_ix = 0; stream_ix < max_ix; stream_ix++) {
+			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
+			// start reading or seeking).  Use the one from the ps.
+			sptr->m_fd = ps->fd; // for now
+			clear_stream_buffer(sptr);
+			if (mpeg2ps_stream_read_frame(sptr,
+			                              &buffer,
+			                              &buflen,
+			                              0) == 0) {
+				sptr->m_stream_id = 0;
+				sptr->m_fd = FDNULL;
+				continue;
+			}
+			get_info_from_frame(sptr, buffer, buflen);
+			// here - if (sptr->first_pes_has_dts == 0) should be processed
+			if (sptr->first_pes_has_dts == 0) {
+				u32 frames_from_beg = 0;
+				Bool have_frame;
+				do {
+					advance_frame(sptr);
+					have_frame =
+					    mpeg2ps_stream_read_frame(sptr, &buffer, &buflen, 0);
+					frames_from_beg++;
+				} while (have_frame &&
+				         sptr->frame_ts.have_dts == 0 &&
+				         sptr->frame_ts.have_pts == 0 &&
+				         frames_from_beg < 1000);
+				if (have_frame == 0 ||
+				        (sptr->frame_ts.have_dts == 0 &&
+				         sptr->frame_ts.have_pts == 0)) {
+				} else {
+					sptr->start_dts = sptr->frame_ts.have_dts ? sptr->frame_ts.dts :
+					                  sptr->frame_ts.pts;
+					if (sptr->is_video) {
+						sptr->start_dts -= frames_from_beg * sptr->ticks_per_frame;
+					} else {
+						u64 conv;
+						conv = sptr->samples_per_frame * 90000;
+						conv /= (u64)sptr->freq;
+						sptr->start_dts -= conv;
+					}
+				}
+			}
+			clear_stream_buffer(sptr);
+			sptr->m_fd = FDNULL;
+		}
+	}
 }
 
 /*
@@ -1252,209 +1271,209 @@
  */
 static void mpeg2ps_scan_file (mpeg2ps_t *ps)
 {
-  u8 stream_id, stream_ix, substream, av_ix, max_cnt;
-  u16 pes_len, pes_left;
-  mpeg2ps_ts_t ts;
-  s64 loc, first_video_loc = 0, first_audio_loc = 0;
-  s64 check, orig_check;
-  mpeg2ps_stream_t *sptr;
-  Bool valid_stream;
-  u8 *buffer;
-  u32 buflen;
-  Bool have_ts;
-
-  ps->end_loc = file_size(ps->fd);
-  orig_check = check = MAX(ps->end_loc / 50, 200 * 1024);
-
-  /*
-   * This part reads and finds the streams.  We check up until we
-   * find audio and video plus a little, with a max of either 200K or
-   * the file size / 50
-   */
-  loc = 0;
-  while (read_to_next_pes_header(ps->fd, &stream_id, &pes_len) && 
-	 loc < check) {
-    pes_left = pes_len;
-    if (stream_id >= 0xbd && stream_id < 0xf0) {
-      loc = file_location(ps->fd) - 6;
-      if (read_pes_header_data(ps->fd, 
-			       pes_len, 
-			       &pes_left, 
-			       &have_ts, 
-			       &ts) == 0) {
-	return;
-      }
-      valid_stream = 0;
-      substream = 0;
-      if (stream_id == 0xbd) {
-	if (file_read_bytes(ps->fd, &substream, 1) == 0) {
-	  return;
-	}
-	pes_left--; // remove byte we just read
-	if ((substream >= 0x80 && substream < 0x90) ||
-	    (substream >= 0xa0 && substream < 0xb0)){
-	  valid_stream = 1;
-	}
-      } else if (stream_id >= 0xc0 &&
-		 stream_id <= 0xef) {
-	// audio and video
-	valid_stream = 1;
-      }
-      if (valid_stream) {
-	if (add_stream(ps, stream_id, substream, loc, &ts)) {
-	  // added
-	  if (stream_id >= 0xe0) {
-	    if (ps->video_cnt == 1) {
-	      first_video_loc = loc;
-	    }
-	  } else if (ps->audio_cnt == 1) {
-	    first_audio_loc = loc;
-	  }
-	  if (ps->audio_cnt > 0 && ps->video_cnt > 0) {
-	    s64 diff;
-	    if (first_audio_loc > first_video_loc) 
-	      diff = first_audio_loc - first_video_loc;
-	    else 
-	      diff = first_video_loc - first_audio_loc;
-	    diff *= 2;
-	    diff += first_video_loc;
-	    if (diff < check) {
-	      check = diff;
-	    }
-	  }
-	}
-      }
-    }
-    file_skip_bytes(ps->fd, pes_left);
-  }
-  if (ps->video_cnt == 0 && ps->audio_cnt == 0) {
-    return;
-  }
-  /*
-   * 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)) {
-    loc = file_location(ps->fd) - 6;
-    if (stream_id == 0xbd || (stream_id >= 0xc0 && stream_id < 0xf0)) {
-      if (read_pes_header_data(ps->fd, 
-			       pes_len, 
-			       &pes_left, 
-			       &have_ts, 
-			       &ts) == 0) {
-	return;
-      }
-      if (stream_id == 0xbd) {
-	if (file_read_bytes(ps->fd, &substream, 1) == 0) {
-	  return;
-	}
-	pes_left--; // remove byte we just read
-	if (!((substream >= 0x80 && substream < 0x90) ||
-	      (substream >= 0xa0 && substream < 0xb0))) {
-	  file_skip_bytes(ps->fd, pes_left);
-	  continue;
-	}
-      } else {
-	substream = 0;
-      }
-      sptr = find_stream_from_id(ps, stream_id, substream);
-      if (sptr == NULL) {
-	add_stream(ps, stream_id, substream, 0, NULL);
-	sptr = find_stream_from_id(ps, stream_id, substream);
-      }
-      if (sptr != NULL && have_ts) {
-	sptr->end_dts = ts.have_dts ? ts.dts : ts.pts;
-	sptr->end_dts_loc = loc;
-      }
+	u8 stream_id, stream_ix, substream, av_ix, max_cnt;
+	u16 pes_len, pes_left;
+	mpeg2ps_ts_t ts;
+	s64 loc, first_video_loc = 0, first_audio_loc = 0;
+	s64 check, orig_check;
+	mpeg2ps_stream_t *sptr;
+	Bool valid_stream;
+	u8 *buffer;
+	u32 buflen;
+	Bool have_ts;
+
+	ps->end_loc = file_size(ps->fd);
+	orig_check = check = MAX(ps->end_loc / 50, 200 * 1024);
+
+	/*
+	 * This part reads and finds the streams.  We check up until we
+	 * find audio and video plus a little, with a max of either 200K or
+	 * the file size / 50
+	 */
+	loc = 0;
+	while (read_to_next_pes_header(ps->fd, &stream_id, &pes_len) &&
+	        loc < check) {
+		pes_left = pes_len;
+		if (stream_id >= 0xbd && stream_id < 0xf0) {
+			loc = file_location(ps->fd) - 6;
+			if (read_pes_header_data(ps->fd,
+			                         pes_len,
+			                         &pes_left,
+			                         &have_ts,
+			                         &ts) == 0) {
+				return;
+			}
+			valid_stream = 0;
+			substream = 0;
+			if (stream_id == 0xbd) {
+				if (file_read_bytes(ps->fd, &substream, 1) == 0) {
+					return;
+				}
+				pes_left--; // remove byte we just read
+				if ((substream >= 0x80 && substream < 0x90) ||
+				        (substream >= 0xa0 && substream < 0xb0)) {
+					valid_stream = 1;
+				}
+			} else if (stream_id >= 0xc0 &&
+			           stream_id <= 0xef) {
+				// audio and video
+				valid_stream = 1;
+			}
+			if (valid_stream) {
+				if (add_stream(ps, stream_id, substream, loc, &ts)) {
+					// added
+					if (stream_id >= 0xe0) {
+						if (ps->video_cnt == 1) {
+							first_video_loc = loc;
+						}
+					} else if (ps->audio_cnt == 1) {
+						first_audio_loc = loc;
+					}
+					if (ps->audio_cnt > 0 && ps->video_cnt > 0) {
+						s64 diff;
+						if (first_audio_loc > first_video_loc)
+							diff = first_audio_loc - first_video_loc;
+						else
+							diff = first_video_loc - first_audio_loc;
+						diff *= 2;
+						diff += first_video_loc;
+						if (diff < check) {
+							check = diff;
+						}
+					}
+				}
+			}
+		}
+		file_skip_bytes(ps->fd, pes_left);
+	}
+	if (ps->video_cnt == 0 && ps->audio_cnt == 0) {
+		return;
+	}
+	/*
+	 * 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)) {
+		loc = file_location(ps->fd) - 6;
+		if (stream_id == 0xbd || (stream_id >= 0xc0 && stream_id < 0xf0)) {
+			if (read_pes_header_data(ps->fd,
+			                         pes_len,
+			                         &pes_left,
+			                         &have_ts,
+			                         &ts) == 0) {
+				return;
+			}
+			if (stream_id == 0xbd) {
+				if (file_read_bytes(ps->fd, &substream, 1) == 0) {
+					return;
+				}
+				pes_left--; // remove byte we just read
+				if (!((substream >= 0x80 && substream < 0x90) ||
+				        (substream >= 0xa0 && substream < 0xb0))) {
+					file_skip_bytes(ps->fd, pes_left);
+					continue;
+				}
+			} else {
+				substream = 0;
+			}
+			sptr = find_stream_from_id(ps, stream_id, substream);
+			if (sptr == NULL) {
+				add_stream(ps, stream_id, substream, 0, NULL);
+				sptr = find_stream_from_id(ps, stream_id, substream);
+			}
+			if (sptr != NULL && have_ts) {
+				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");
+			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);
-    }
-  }
-
-  /*
-   * Now, get the info for all streams, so we can use it again
-   * we could do this before the above, I suppose
-   */
-  get_info_for_all_streams(ps);
-
-  ps->first_dts = (u64) -1;
-
-  /*
-   * we need to find the earliest start pts - we use that to calc
-   * the rest of the timing, so we're 0 based.
-   */
-  for (av_ix = 0; av_ix < 2; av_ix++) {
-    if (av_ix == 0) max_cnt = ps->video_cnt;
-    else max_cnt = ps->audio_cnt;
-
-    for (stream_ix = 0; stream_ix < max_cnt; stream_ix++) {
-      sptr = av_ix == 0 ? ps->video_streams[stream_ix] :
-	ps->audio_streams[stream_ix];
-      if (sptr != NULL && sptr->start_dts < ps->first_dts) {
-	ps->first_dts = sptr->start_dts;
-      }
-    }
-  }
-
-  /*
-   * Now, for each thread, we'll start at the last pts location, and
-   * read the number of frames.  This will give us a max time
-   */
-  for (av_ix = 0; av_ix < 2; av_ix++) {
-    if (av_ix == 0) max_cnt = ps->video_cnt;
-    else max_cnt = ps->audio_cnt;
-    for (stream_ix = 0; stream_ix < max_cnt; stream_ix++) {
-      u32 frame_cnt_since_last;
-	  sptr = av_ix == 0 ? ps->video_streams[stream_ix] :
-	ps->audio_streams[stream_ix];
-      
-      // pick up here - find the final time...
-      if (sptr->end_dts_loc != 0) {
-	file_seek_to(ps->fd, sptr->end_dts_loc);
-	sptr->m_fd = ps->fd;
-	frame_cnt_since_last = 0;
-	clear_stream_buffer(sptr);
-	while (mpeg2ps_stream_read_frame(sptr,
-					 &buffer, 
-					 &buflen,
-					 1)) {
-	  frame_cnt_since_last++;
-	}
-	sptr->m_fd = FDNULL;
-	clear_stream_buffer(sptr);
-	ps->max_time = MAX(ps->max_time, 
-			   convert_ts(sptr, 
-				      TS_MSEC,
-				      sptr->end_dts,
-				      ps->first_dts, 
-				      frame_cnt_since_last));
-      }
-    }
-  }
-
-  ps->max_dts = (ps->max_time * 90) + ps->first_dts;
-  file_seek_to(ps->fd, 0);
+			file_skip_bytes(ps->fd, pes_left);
+		}
+	}
+
+	/*
+	 * Now, get the info for all streams, so we can use it again
+	 * we could do this before the above, I suppose
+	 */
+	get_info_for_all_streams(ps);
+
+	ps->first_dts = (u64) -1;
+
+	/*
+	 * we need to find the earliest start pts - we use that to calc
+	 * the rest of the timing, so we're 0 based.
+	 */
+	for (av_ix = 0; av_ix < 2; av_ix++) {
+		if (av_ix == 0) max_cnt = ps->video_cnt;
+		else max_cnt = ps->audio_cnt;
+
+		for (stream_ix = 0; stream_ix < max_cnt; stream_ix++) {
+			sptr = av_ix == 0 ? ps->video_streams[stream_ix] :
+			       ps->audio_streams[stream_ix];
+			if (sptr != NULL && sptr->start_dts < ps->first_dts) {
+				ps->first_dts = sptr->start_dts;
+			}
+		}
+	}
+
+	/*
+	 * Now, for each thread, we'll start at the last pts location, and
+	 * read the number of frames.  This will give us a max time
+	 */
+	for (av_ix = 0; av_ix < 2; av_ix++) {
+		if (av_ix == 0) max_cnt = ps->video_cnt;
+		else max_cnt = ps->audio_cnt;
+		for (stream_ix = 0; stream_ix < max_cnt; stream_ix++) {
+			u32 frame_cnt_since_last;
+			sptr = av_ix == 0 ? ps->video_streams[stream_ix] :
+			       ps->audio_streams[stream_ix];
+
+			// pick up here - find the final time...
+			if (sptr->end_dts_loc != 0) {
+				file_seek_to(ps->fd, sptr->end_dts_loc);
+				sptr->m_fd = ps->fd;
+				frame_cnt_since_last = 0;
+				clear_stream_buffer(sptr);
+				while (mpeg2ps_stream_read_frame(sptr,
+				                                 &buffer,
+				                                 &buflen,
+				                                 1)) {
+					frame_cnt_since_last++;
+				}
+				sptr->m_fd = FDNULL;
+				clear_stream_buffer(sptr);
+				ps->max_time = MAX(ps->max_time,
+				                   convert_ts(sptr,
+				                              TS_MSEC,
+				                              sptr->end_dts,
+				                              ps->first_dts,
+				                              frame_cnt_since_last));
+			}
+		}
+	}
+
+	ps->max_dts = (ps->max_time * 90) + ps->first_dts;
+	file_seek_to(ps->fd, 0);
 }
 
 /*************************************************************************
  * API routines
  *************************************************************************/
-u64 mpeg2ps_get_max_time_msec (mpeg2ps_t *ps) 
+u64 mpeg2ps_get_max_time_msec (mpeg2ps_t *ps)
 {
-  return ps->max_time;
+	return ps->max_time;
 }
 
 u32 mpeg2ps_get_video_stream_count (mpeg2ps_t *ps)
 {
-  return ps->video_cnt;
+	return ps->video_cnt;
 }
 
 #define NUM_ELEMENTS_IN_ARRAY(name) ((sizeof((name))) / (sizeof(*(name))))
@@ -1462,184 +1481,187 @@
 // routine to check stream number passed.
 static Bool invalid_video_streamno (mpeg2ps_t *ps, u32 streamno)
 {
-  if (streamno >= NUM_ELEMENTS_IN_ARRAY(ps->video_streams)) return 1;
-  if (ps->video_streams[streamno] == NULL) return 1;
-  return 0;
+	if (streamno >= NUM_ELEMENTS_IN_ARRAY(ps->video_streams)) return 1;
+	if (ps->video_streams[streamno] == NULL) return 1;
+	return 0;
 }
 
 const char *mpeg2ps_get_video_stream_name (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_video_streamno(ps, streamno)) {
-    return 0;
-  }
-  if (ps->video_streams[streamno]->have_mpeg2) {
-    return "Mpeg-2";
-  }
-  return "Mpeg-1";
+	if (invalid_video_streamno(ps, streamno)) {
+		return 0;
+	}
+	if (ps->video_streams[streamno]->have_mpeg2) {
+		return "Mpeg-2";
+	}
+	return "Mpeg-1";
 }
 
-mpeg2ps_video_type_t mpeg2ps_get_video_stream_type (mpeg2ps_t *ps, 
-						    u32 streamno)
+mpeg2ps_video_type_t mpeg2ps_get_video_stream_type (mpeg2ps_t *ps,
+        u32 streamno)
 {
-  if (invalid_video_streamno(ps, streamno)) {
-    return MPEG_VIDEO_UNKNOWN;
-  }
-  return ps->video_streams[streamno]->have_mpeg2 ? MPEG_VIDEO_MPEG2 : MPEG_VIDEO_MPEG1;
+	if (invalid_video_streamno(ps, streamno)) {
+		return MPEG_VIDEO_UNKNOWN;
+	}
+	return ps->video_streams[streamno]->have_mpeg2 ? MPEG_VIDEO_MPEG2 : MPEG_VIDEO_MPEG1;
 }
 
 u32 mpeg2ps_get_video_stream_width (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_video_streamno(ps, streamno)) {
-    return 0;
-  }
-  return ps->video_streams[streamno]->w;
+	if (invalid_video_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->video_streams[streamno]->w;
 }
 
 u32 mpeg2ps_get_video_stream_height (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_video_streamno(ps, streamno)) {
-    return 0;
-  }
-  return ps->video_streams[streamno]->h;
+	if (invalid_video_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->video_streams[streamno]->h;
 }
 
 u32 mpeg2ps_get_video_stream_aspect_ratio (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_video_streamno(ps, streamno)) {
-    return 0;
-  }
-  return ps->video_streams[streamno]->par;
+	if (invalid_video_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->video_streams[streamno]->par;
 }
 
 Double mpeg2ps_get_video_stream_bitrate (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_video_streamno(ps, streamno)) {
-    return 0;
-  }
-  return ps->video_streams[streamno]->bit_rate;
+	if (invalid_video_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->video_streams[streamno]->bit_rate;
 }
 
 Double mpeg2ps_get_video_stream_framerate (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_video_streamno(ps, streamno)) {
-    return 0;
-  }
-  return ps->video_streams[streamno]->frame_rate;
+	if (invalid_video_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->video_streams[streamno]->frame_rate;
 }
 
 static Bool invalid_audio_streamno (mpeg2ps_t *ps, u32 streamno)
 {
-  if (streamno >= NUM_ELEMENTS_IN_ARRAY(ps->audio_streams)) return 1;
-  if (ps->audio_streams[streamno] == NULL) return 1;
-  return 0;
+	if (streamno >= NUM_ELEMENTS_IN_ARRAY(ps->audio_streams)) return 1;
+	if (ps->audio_streams[streamno] == NULL) return 1;
+	return 0;
 }
 
 u32 mpeg2ps_get_audio_stream_count (mpeg2ps_t *ps)
 {
-  return ps->audio_cnt;
+	return ps->audio_cnt;
 }
 
-const char *mpeg2ps_get_audio_stream_name (mpeg2ps_t *ps, 
-					   u32 streamno)
-{
-  if (invalid_audio_streamno(ps, streamno)) {
-    return "none";
-  }
-  if (ps->audio_streams[streamno]->m_stream_id >= 0xc0) {
-    switch (ps->audio_streams[streamno]->layer) {
-    case 1: return "MP1";
-    case 2: return "MP2";
-    case 3: return "MP3";
-    }
-    return "unknown mpeg layer";
-  }
-  if (ps->audio_streams[streamno]->m_substream_id >= 0x80 &&
-      ps->audio_streams[streamno]->m_substream_id < 0x90)
-    return "AC3";
-
-  return "LPCM";
+const char *mpeg2ps_get_audio_stream_name (mpeg2ps_t *ps,
+        u32 streamno)
+{
+	if (invalid_audio_streamno(ps, streamno)) {
+		return "none";
+	}
+	if (ps->audio_streams[streamno]->m_stream_id >= 0xc0) {
+		switch (ps->audio_streams[streamno]->layer) {
+		case 1:
+			return "MP1";
+		case 2:
+			return "MP2";
+		case 3:
+			return "MP3";
+		}
+		return "unknown mpeg layer";
+	}
+	if (ps->audio_streams[streamno]->m_substream_id >= 0x80 &&
+	        ps->audio_streams[streamno]->m_substream_id < 0x90)
+		return "AC3";
+
+	return "LPCM";
 }
 
-mpeg2ps_audio_type_t mpeg2ps_get_audio_stream_type (mpeg2ps_t *ps, 
-						    u32 streamno)
+mpeg2ps_audio_type_t mpeg2ps_get_audio_stream_type (mpeg2ps_t *ps,
+        u32 streamno)
 {
-  if (invalid_audio_streamno(ps, streamno)) {
-    return MPEG_AUDIO_UNKNOWN;
-  }
-  if (ps->audio_streams[streamno]->m_stream_id >= 0xc0) {
-    return MPEG_AUDIO_MPEG;
-  }
-  if (ps->audio_streams[streamno]->m_substream_id >= 0x80 &&
-      ps->audio_streams[streamno]->m_substream_id < 0x90)
-    return MPEG_AUDIO_AC3;
+	if (invalid_audio_streamno(ps, streamno)) {
+		return MPEG_AUDIO_UNKNOWN;
+	}
+	if (ps->audio_streams[streamno]->m_stream_id >= 0xc0) {
+		return MPEG_AUDIO_MPEG;
+	}
+	if (ps->audio_streams[streamno]->m_substream_id >= 0x80 &&
+	        ps->audio_streams[streamno]->m_substream_id < 0x90)
+		return MPEG_AUDIO_AC3;
 
-  return MPEG_AUDIO_LPCM;
+	return MPEG_AUDIO_LPCM;
 }
 
 u32 mpeg2ps_get_audio_stream_sample_freq (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_audio_streamno(ps, streamno)) {
-    return 0;
-  }
-  return ps->audio_streams[streamno]->freq;
+	if (invalid_audio_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->audio_streams[streamno]->freq;
 }
 
 u32 mpeg2ps_get_audio_stream_channels (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_audio_streamno(ps, streamno)) {
-    return 0;
-  }
-  return ps->audio_streams[streamno]->channels;
+	if (invalid_audio_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->audio_streams[streamno]->channels;
 }
 
 u32 mpeg2ps_get_audio_stream_bitrate (mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_audio_streamno(ps, streamno)) {
-    return 0;
-  }
-  return ps->audio_streams[streamno]->bitrate;
+	if (invalid_audio_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->audio_streams[streamno]->bitrate;
 }
 
 mpeg2ps_t *mpeg2ps_init (const char *filename)
 {
-  mpeg2ps_t *ps;
-  GF_SAFEALLOC(ps, mpeg2ps_t);
-
-  if (ps == NULL) {
-    return NULL;
-  }
-  memset(ps, 0, sizeof(*ps));
-  ps->fd = file_open(filename);
-  if (file_okay(ps->fd) == 0) {
-    gf_free(ps);
-    return NULL;
-  }
-  
-  ps->filename = gf_strdup(filename);
-  mpeg2ps_scan_file(ps);
-  if (ps->video_cnt == 0 && ps->audio_cnt == 0) {
-    mpeg2ps_close(ps);
-    return NULL;
-  }
-  return ps;
+	mpeg2ps_t *ps;
+	GF_SAFEALLOC(ps, mpeg2ps_t);
+
+	if (ps == NULL) {
+		return NULL;
+	}
+	memset(ps, 0, sizeof(*ps));
+	ps->fd = file_open(filename);
+	if (file_okay(ps->fd) == 0) {
+		gf_free(ps);
+		return NULL;
+	}
+
+	ps->filename = gf_strdup(filename);
+	mpeg2ps_scan_file(ps);
+	if (ps->video_cnt == 0 && ps->audio_cnt == 0) {
+		mpeg2ps_close(ps);
+		return NULL;
+	}
+	return ps;
 }
 
 void mpeg2ps_close (mpeg2ps_t *ps)
 {
-  u32 ix;
-  if (ps == NULL) return;
-  for (ix = 0; ix < ps->video_cnt; ix++) {
-    mpeg2ps_stream_destroy(ps->video_streams[ix]);
-    ps->video_streams[ix] = NULL;
-  }
-  for (ix = 0; ix < ps->audio_cnt; ix++) {
-    mpeg2ps_stream_destroy(ps->audio_streams[ix]);
-    ps->audio_streams[ix] = NULL;
-  }
-
-  if (ps->filename) gf_free(ps->filename);
-  if (ps->fd) file_close(ps->fd);
-  gf_free(ps);
+	u32 ix;
+	if (ps == NULL) return;
+	for (ix = 0; ix < ps->video_cnt; ix++) {
+		mpeg2ps_stream_destroy(ps->video_streams[ix]);
+		ps->video_streams[ix] = NULL;
+	}
+	for (ix = 0; ix < ps->audio_cnt; ix++) {
+		mpeg2ps_stream_destroy(ps->audio_streams[ix]);
+		ps->audio_streams[ix] = NULL;
+	}
+
+	if (ps->filename) gf_free(ps->filename);
+	if (ps->fd) file_close(ps->fd);
+	gf_free(ps);
 }
 
 /*
@@ -1653,106 +1675,106 @@
  * than 1 time, if needed, without changing any variables, such as
  * frames_since_last_ts, which gets updated in advance_frame
  */
-static u64 stream_convert_frame_ts_to_msec (mpeg2ps_stream_t *sptr, 
-						 mpeg2ps_ts_type_t ts_type,
-						 u64 base_dts,
-						 u32 *freq_ts)
-{
-  u64 calc_ts;
-  u32 frames_since_last = 0;
-  u64 freq_conv;
-
-  calc_ts = sptr->last_ts;
-  if (sptr->frame_ts.have_dts) calc_ts = sptr->frame_ts.dts;
-  else if (sptr->frame_ts.have_pts) calc_ts = sptr->frame_ts.dts;
-  else frames_since_last = sptr->frames_since_last_ts + 1;
-
-  if (freq_ts != NULL) {
-    freq_conv = calc_ts - base_dts;
-    freq_conv *= sptr->freq;
-    freq_conv /= 90000;
-    freq_conv += frames_since_last * sptr->samples_per_frame;
-    *freq_ts = (u32) (freq_conv & 0xffffffff);
-  }
-  return convert_ts(sptr, ts_type, calc_ts, base_dts, frames_since_last);
+static u64 stream_convert_frame_ts_to_msec (mpeg2ps_stream_t *sptr,
+        mpeg2ps_ts_type_t ts_type,
+        u64 base_dts,
+        u32 *freq_ts)
+{
+	u64 calc_ts;
+	u32 frames_since_last = 0;
+	u64 freq_conv;
+
+	calc_ts = sptr->last_ts;
+	if (sptr->frame_ts.have_dts) calc_ts = sptr->frame_ts.dts;
+	else if (sptr->frame_ts.have_pts) calc_ts = sptr->frame_ts.dts;
+	else frames_since_last = sptr->frames_since_last_ts + 1;
+
+	if (freq_ts != NULL) {
+		freq_conv = calc_ts - base_dts;
+		freq_conv *= sptr->freq;
+		freq_conv /= 90000;
+		freq_conv += frames_since_last * sptr->samples_per_frame;
+		*freq_ts = (u32) (freq_conv & 0xffffffff);
+	}
+	return convert_ts(sptr, ts_type, calc_ts, base_dts, frames_since_last);
 }
 
 /*
  * mpeg2ps_get_video_frame - gets the next frame
- */    
+ */
 Bool mpeg2ps_get_video_frame(mpeg2ps_t *ps, u32 streamno,
-			     u8 **buffer, 
-			     u32 *buflen,
-			     u8 *frame_type,
-			     mpeg2ps_ts_type_t ts_type,
-			     u64 *timestamp)
-{
-  mpeg2ps_stream_t *sptr;
-  if (invalid_video_streamno(ps, streamno)) return 0;
-
-  sptr = ps->video_streams[streamno];
-  check_fd_for_stream(ps, sptr);
-
-  if (sptr->have_frame_loaded == 0) {
-    // if we don't have the frame in the buffer (like after a seek), 
-    // read the next frame
-    if (mpeg2ps_stream_find_mpeg_video_frame(sptr) == 0) {
-      return 0;
-    }
-  }
-  *buffer = sptr->pes_buffer + sptr->pes_buffer_on;
-  *buflen = sptr->frame_len;
-  // determine frame type
-  if (frame_type != NULL) {
-    *frame_type = MPEG12_PictHdrType(sptr->pes_buffer + 
-					 sptr->pict_header_offset);
-  }
-
-  // and the timestamp
-  if (timestamp != NULL) {
-    *timestamp = stream_convert_frame_ts_to_msec(sptr, ts_type, 
-						 ps->first_dts, NULL);
-  }
-
-  // finally, indicate that we read this frame - get ready for the next one.
-  advance_frame(sptr);
-
-  return 1;
+                             u8 **buffer,
+                             u32 *buflen,
+                             u8 *frame_type,
+                             mpeg2ps_ts_type_t ts_type,
+                             u64 *timestamp)
+{
+	mpeg2ps_stream_t *sptr;
+	if (invalid_video_streamno(ps, streamno)) return 0;
+
+	sptr = ps->video_streams[streamno];
+	check_fd_for_stream(ps, sptr);
+
+	if (sptr->have_frame_loaded == 0) {
+		// if we don't have the frame in the buffer (like after a seek),
+		// read the next frame
+		if (mpeg2ps_stream_find_mpeg_video_frame(sptr) == 0) {
+			return 0;
+		}
+	}
+	*buffer = sptr->pes_buffer + sptr->pes_buffer_on;
+	*buflen = sptr->frame_len;
+	// determine frame type
+	if (frame_type != NULL) {
+		*frame_type = MPEG12_PictHdrType(sptr->pes_buffer +
+		                                 sptr->pict_header_offset);
+	}
+
+	// and the timestamp
+	if (timestamp != NULL) {
+		*timestamp = stream_convert_frame_ts_to_msec(sptr, ts_type,
+		             ps->first_dts, NULL);
+	}
+
+	// finally, indicate that we read this frame - get ready for the next one.
+	advance_frame(sptr);
+
+	return 1;
 }
 
 
-// see above comments      
+// see above comments
 Bool mpeg2ps_get_audio_frame(mpeg2ps_t *ps, u32 streamno,
-			     u8 **buffer, 
-			     u32 *buflen,
-			     mpeg2ps_ts_type_t ts_type,
-			     u32 *freq_timestamp,
-			     u64 *timestamp)
-{
-  mpeg2ps_stream_t *sptr;
-  u64 ts;
-  if (invalid_audio_streamno(ps, streamno)) return 0;
-
-  sptr = ps->audio_streams[streamno];
-  check_fd_for_stream(ps, sptr);
-
-  if (sptr->have_frame_loaded == 0) {
-    if (mpeg2ps_stream_read_frame(sptr, buffer, buflen, 0) == 0) 
-      return 0;
-  } 
-  
-  if (timestamp != NULL || freq_timestamp != NULL) {
-    ts = stream_convert_frame_ts_to_msec(sptr, 
-					 ts_type,
-					 ps->first_dts,
-					 freq_timestamp);
-    if (timestamp != NULL) {
-      *timestamp = ts;
-    }
-  }
-
-  advance_frame(sptr);
-  return 1;
+                             u8 **buffer,
+                             u32 *buflen,
+                             mpeg2ps_ts_type_t ts_type,
+                             u32 *freq_timestamp,
+                             u64 *timestamp)
+{
+	mpeg2ps_stream_t *sptr;
+	u64 ts;
+	if (invalid_audio_streamno(ps, streamno)) return 0;
+
+	sptr = ps->audio_streams[streamno];
+	check_fd_for_stream(ps, sptr);
+
+	if (sptr->have_frame_loaded == 0) {
+		if (mpeg2ps_stream_read_frame(sptr, buffer, buflen, 0) == 0)
+			return 0;
+	}
+
+	if (timestamp != NULL || freq_timestamp != NULL) {
+		ts = stream_convert_frame_ts_to_msec(sptr,
+		                                     ts_type,
+		                                     ps->first_dts,
+		                                     freq_timestamp);
+		if (timestamp != NULL) {
+			*timestamp = ts;
+		}
+	}
+
+	advance_frame(sptr);
+	return 1;
 }
 
 u64 mpeg2ps_get_ps_size(mpeg2ps_t *ps)
@@ -1761,13 +1783,13 @@
 }
 s64 mpeg2ps_get_video_pos(mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_video_streamno(ps, streamno)) return 0;
-  return gf_f64_tell(ps->video_streams[streamno]->m_fd);
+	if (invalid_video_streamno(ps, streamno)) return 0;
+	return gf_f64_tell(ps->video_streams[streamno]->m_fd);
 }
 s64 mpeg2ps_get_audio_pos(mpeg2ps_t *ps, u32 streamno)
 {
-  if (invalid_audio_streamno(ps, streamno)) return 0;
-  return gf_f64_tell(ps->audio_streams[streamno]->m_fd);
+	if (invalid_audio_streamno(ps, streamno)) return 0;
+	return gf_f64_tell(ps->audio_streams[streamno]->m_fd);
 }
 
 #endif /*GPAC_DISABLE_MPEG2PS*/

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/mpeg2_ps.h -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/mpeg2_ps.h Changed

@@ -3,19 +3,19 @@
  * 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 MPEG4IP.
- * 
+ *
  * The Initial Developer of the Original Code is Cisco Systems Inc.
  * Portions created by Cisco Systems Inc. are
  * Copyright (C) Cisco Systems Inc. 2004.  All Rights Reserved.
- * 
- * Contributor(s): 
+ *
+ * Contributor(s):
  *		Bill May wmay@cisco.com
  */
 
@@ -51,155 +51,155 @@
 typedef struct mpeg2ps_ mpeg2ps_t;
 
 typedef enum {
-  TS_MSEC, 
-  TS_90000,
+	TS_MSEC,
+	TS_90000,
 } mpeg2ps_ts_type_t;
 
 typedef enum {
-  MPEG_AUDIO_MPEG = 0,
-  MPEG_AUDIO_AC3 = 1,
-  MPEG_AUDIO_LPCM = 2,
-  MPEG_AUDIO_UNKNOWN = 3
+	MPEG_AUDIO_MPEG = 0,
+	MPEG_AUDIO_AC3 = 1,
+	MPEG_AUDIO_LPCM = 2,
+	MPEG_AUDIO_UNKNOWN = 3
 } mpeg2ps_audio_type_t;
 
 typedef enum {
-  MPEG_VIDEO_MPEG1 = 0,
-  MPEG_VIDEO_MPEG2 = 1,
-  MPEG_VIDEO_UNKNOWN = 2
+	MPEG_VIDEO_MPEG1 = 0,
+	MPEG_VIDEO_MPEG2 = 1,
+	MPEG_VIDEO_UNKNOWN = 2
 } mpeg2ps_video_type_t;
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" {
 #endif
-  /*
-   * Interface routines for library.
-   */
-  /*
-   * mpeg2ps_init() - use to start.  It will scan file for all streams
-   * returns handle to use with rest of calls
-   */
-  mpeg2ps_t *mpeg2ps_init(const char *filename);
-
-  /*
-   * mpeg2ps_close - clean up - should be called after mpeg2ps_init
-   */
-  void mpeg2ps_close(mpeg2ps_t *ps);
-
-  /*
-   * mpeg2ps_get_max_time_msec - returns the max time of the longest stream
-   */
-  u64 mpeg2ps_get_max_time_msec(mpeg2ps_t *ps);
-  /*
-   * video stream functions
-   */
-  /*
-   * 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
-   */
-  mpeg2ps_video_type_t mpeg2ps_get_video_stream_type(mpeg2ps_t *ps, 
-						     u32 streamno);
-  /*
-   * these functions should be fairly self explanatory
-   */
-  u32 mpeg2ps_get_video_stream_width(mpeg2ps_t *ps, u32 streamno);
-  u32 mpeg2ps_get_video_stream_height(mpeg2ps_t *ps, u32 streamno);
-  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);
-
-  /*
-   * mpeg2ps_get_video_frame - get the next video frame
-   * returns false at end of stream
-   * Inputs:
-   *  ps - handle from above
-   *  streamno - stream to read
-   *  buffer - returns pointer to data.  Do not free
-   *  buflen - frame length will be stored
-   *  frame_type - if pointer given, frame type I-1, P-2, B-3 will be returned
-   *  msec_timestamp - if pointer, time in msec since start will be given (dts)
-   */
-  Bool mpeg2ps_get_video_frame(mpeg2ps_t *ps, 
-			       u32 streamno,
-			       u8 **buffer, 
-			       u32 *buflen,
-			       u8 *frame_type,
-			       mpeg2ps_ts_type_t ts_type,
-			       u64 *timestamp);
-  Bool mpeg2ps_seek_video_frame(mpeg2ps_t *ps, u32 streamno, 
-				u64 msec_timestamp);
-
-  /*
-   * audio stream functions
-   */
-  /*
-   * mpeg2ps_get_audio_stream_count - returns count of video streams in file
-   */
-  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);
-  /*
-   * these functions should be fairly self explanatory
-   */
-  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);
-
-  /*
-   * mpeg2ps_get_audio_frame - get the next audio frame
-   * returns false at end of stream
-   * Inputs:
-   *  ps - handle from above
-   *  streamno - stream to read
-   *  buffer - returns pointer to data.  Do not free
-   *  buflen - frame length will be stored
-   *  freq_timestamp - will return conversion of timestamp in units of 
-   *                   sample_frequency.
-   *  msec_timestamp - if pointer, time in msec since start will be given (dts)
-   */
-  Bool mpeg2ps_get_audio_frame(mpeg2ps_t *ps, 
-			       u32 streamno,
-			       u8 **buffer, 
-			       u32 *buflen,
-			       mpeg2ps_ts_type_t ts_type,
-			       u32 *freq_timestamp,
-			       u64 *msec_timestamp);
-  Bool mpeg2ps_seek_audio_frame(mpeg2ps_t *ps, u32 streamno, 
-				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);
+/*
+ * Interface routines for library.
+ */
+/*
+ * mpeg2ps_init() - use to start.  It will scan file for all streams
+ * returns handle to use with rest of calls
+ */
+mpeg2ps_t *mpeg2ps_init(const char *filename);
+
+/*
+ * mpeg2ps_close - clean up - should be called after mpeg2ps_init
+ */
+void mpeg2ps_close(mpeg2ps_t *ps);
+
+/*
+ * mpeg2ps_get_max_time_msec - returns the max time of the longest stream
+ */
+u64 mpeg2ps_get_max_time_msec(mpeg2ps_t *ps);
+/*
+ * video stream functions
+ */
+/*
+ * 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
+ */
+mpeg2ps_video_type_t mpeg2ps_get_video_stream_type(mpeg2ps_t *ps,
+        u32 streamno);
+/*
+ * these functions should be fairly self explanatory
+ */
+u32 mpeg2ps_get_video_stream_width(mpeg2ps_t *ps, u32 streamno);
+u32 mpeg2ps_get_video_stream_height(mpeg2ps_t *ps, u32 streamno);
+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);
+
+/*
+ * mpeg2ps_get_video_frame - get the next video frame
+ * returns false at end of stream
+ * Inputs:
+ *  ps - handle from above
+ *  streamno - stream to read
+ *  buffer - returns pointer to data.  Do not free
+ *  buflen - frame length will be stored
+ *  frame_type - if pointer given, frame type I-1, P-2, B-3 will be returned
+ *  msec_timestamp - if pointer, time in msec since start will be given (dts)
+ */
+Bool mpeg2ps_get_video_frame(mpeg2ps_t *ps,
+                             u32 streamno,
+                             u8 **buffer,
+                             u32 *buflen,
+                             u8 *frame_type,
+                             mpeg2ps_ts_type_t ts_type,
+                             u64 *timestamp);
+Bool mpeg2ps_seek_video_frame(mpeg2ps_t *ps, u32 streamno,
+                              u64 msec_timestamp);
+
+/*
+ * audio stream functions
+ */
+/*
+ * mpeg2ps_get_audio_stream_count - returns count of video streams in file
+ */
+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);
+/*
+ * these functions should be fairly self explanatory
+ */
+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);
+
+/*
+ * mpeg2ps_get_audio_frame - get the next audio frame
+ * returns false at end of stream
+ * Inputs:
+ *  ps - handle from above
+ *  streamno - stream to read
+ *  buffer - returns pointer to data.  Do not free
+ *  buflen - frame length will be stored
+ *  freq_timestamp - will return conversion of timestamp in units of
+ *                   sample_frequency.
+ *  msec_timestamp - if pointer, time in msec since start will be given (dts)
+ */
+Bool mpeg2ps_get_audio_frame(mpeg2ps_t *ps,
+                             u32 streamno,
+                             u8 **buffer,
+                             u32 *buflen,
+                             mpeg2ps_ts_type_t ts_type,
+                             u32 *freq_timestamp,
+                             u64 *msec_timestamp);
+Bool mpeg2ps_seek_audio_frame(mpeg2ps_t *ps, u32 streamno,
+                              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,
-				 va_list ap);
+                                 const char *lib,
+                                 const char *fmt,
+                                 va_list ap);
 
-  void mpeg2ps_set_loglevel(int loglevel);
-  void mpeg2ps_set_error_func(error_msg_func_t func);
+void mpeg2ps_set_loglevel(int loglevel);
+void mpeg2ps_set_error_func(error_msg_func_t func);
 
 
 #endif /*GPAC_DISABLE_MPEG2PS*/

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/mpegts.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/mpegts.c Changed

@@ -58,30 +58,51 @@
 const char *gf_m2ts_get_stream_name(u32 streamType)
 {
 	switch (streamType) {
-	case GF_M2TS_VIDEO_MPEG1: return "MPEG-1 Video";
-	case GF_M2TS_VIDEO_MPEG2: return "MPEG-2 Video";
-	case GF_M2TS_AUDIO_MPEG1: return "MPEG-1 Audio";
-	case GF_M2TS_AUDIO_MPEG2: return "MPEG-2 Audio";
-	case GF_M2TS_PRIVATE_SECTION: return "Private Section";
-	case GF_M2TS_PRIVATE_DATA: return "Private Data";
-	case GF_M2TS_AUDIO_AAC: return "AAC Audio";
-	case GF_M2TS_VIDEO_MPEG4: return "MPEG-4 Video";
-	case GF_M2TS_VIDEO_H264: return "MPEG-4/H264 Video";
-	case GF_M2TS_VIDEO_SVC: return "H264-SVC Video";
-	case GF_M2TS_VIDEO_HEVC: return "HEVC Video";
-	case GF_M2TS_VIDEO_SHVC: return "SHVC Video";
-
-	case GF_M2TS_AUDIO_AC3: return "Dolby AC3 Audio";
-	case GF_M2TS_AUDIO_DTS: return "Dolby DTS Audio";
-	case GF_M2TS_SUBTITLE_DVB: return "DVB Subtitle";
-	case GF_M2TS_SYSTEMS_MPEG4_PES: return "MPEG-4 SL (PES)";
-	case GF_M2TS_SYSTEMS_MPEG4_SECTIONS: return "MPEG-4 SL (Section)";
-	case GF_M2TS_MPE_SECTIONS: return "MPE (Section)";
+	case GF_M2TS_VIDEO_MPEG1:
+		return "MPEG-1 Video";
+	case GF_M2TS_VIDEO_MPEG2:
+		return "MPEG-2 Video";
+	case GF_M2TS_AUDIO_MPEG1:
+		return "MPEG-1 Audio";
+	case GF_M2TS_AUDIO_MPEG2:
+		return "MPEG-2 Audio";
+	case GF_M2TS_PRIVATE_SECTION:
+		return "Private Section";
+	case GF_M2TS_PRIVATE_DATA:
+		return "Private Data";
+	case GF_M2TS_AUDIO_AAC:
+		return "AAC Audio";
+	case GF_M2TS_VIDEO_MPEG4:
+		return "MPEG-4 Video";
+	case GF_M2TS_VIDEO_H264:
+		return "MPEG-4/H264 Video";
+	case GF_M2TS_VIDEO_SVC:
+		return "H264-SVC Video";
+	case GF_M2TS_VIDEO_HEVC:
+		return "HEVC Video";
+	case GF_M2TS_VIDEO_SHVC:
+		return "SHVC Video";
+
+	case GF_M2TS_AUDIO_AC3:
+		return "Dolby AC3 Audio";
+	case GF_M2TS_AUDIO_DTS:
+		return "Dolby DTS Audio";
+	case GF_M2TS_SUBTITLE_DVB:
+		return "DVB Subtitle";
+	case GF_M2TS_SYSTEMS_MPEG4_PES:
+		return "MPEG-4 SL (PES)";
+	case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
+		return "MPEG-4 SL (Section)";
+	case GF_M2TS_MPE_SECTIONS:
+		return "MPE (Section)";
+
+	case GF_M2TS_METADATA_PES:
+		return "Metadata (PES)";
+	case GF_M2TS_METADATA_ID3_HLS:
+		return "ID3/HLS Metadata (PES)";
 
-	case GF_M2TS_METADATA_PES: return "Metadata (PES)";
-	case GF_M2TS_METADATA_ID3_HLS: return "ID3/HLS Metadata (PES)";
-
-	default: return "Unknown";
+	default:
+		return "Unknown";
 	}
 }
 
@@ -109,7 +130,7 @@
 			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) {
+		} 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);
@@ -126,7 +147,7 @@
 			ts->pcr_pid = pcr_pid;
 			ts->nb_pck_at_pcr = ts->nb_pck;
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] Estimated duration based on instant bitrate: %g\n", ts->duration));
+			GF_LOG(GF_LOG_INFO, 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;
@@ -170,6 +191,7 @@
 	pes->prev_PTS = 0;
 	pes->reframe = NULL;
 	pes->cc = -1;
+	pes->temi_tc_desc_len = 0;
 	return 0;
 }
 
@@ -187,7 +209,7 @@
 	u8 *au_start = NULL;
 	GF_M2TS_PES_PCK pck;
 
-	if (!same_pts) 
+	if (!same_pts)
 		force_new_au = 1;
 
 	/*dispatch frame*/
@@ -243,7 +265,7 @@
 			sc_pos=1;
 		} else {
 
-			if (start_code_found==2) {
+			if (!full_au_pes_mode && (start_code_found==2)) {
 				pck.data = (char *)data-1;
 				pck.data[0]=0;
 				pck.data_len = sc_pos+1;
@@ -272,23 +294,31 @@
 					}
 				}
 #endif
-				/*check AU start type*/
-				if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) {
+				/*check AU start type - if this is an SHVC 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 
+						//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 (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;
+							}
 						}
 
 						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));
+							//						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;
@@ -310,7 +340,7 @@
 						pck.flags |= GF_M2TS_PES_PCK_RAP;
 					}
 					prev_is_au_delim=0;
-				} 
+				}
 				else
 #endif //GPAC_DISABLE_HEVC
 				{
@@ -342,20 +372,28 @@
 				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 
+						//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 (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;
+							}
 						}
 
 						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));
+							//						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;
@@ -395,7 +433,7 @@
 	/*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);
@@ -404,12 +442,25 @@
 		}
 
 		/*if not enough data to locate start code, store it*/
-		if (data_len < min_size ) 
+		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);
@@ -443,7 +494,7 @@
 					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) {
@@ -516,22 +567,38 @@
 					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;
+					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;
+						pes->vid_par = 0;
+						den = num = 0;
+						break;
 					}
 					if (den)
-						pes->vid_par = ((pes->vid_h/den)<<16) | (pes->vid_w/num); break;
+						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;
+					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;
 					}
 				}
 			}
@@ -559,10 +626,10 @@
 	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*/
@@ -572,7 +639,7 @@
 	pck.PTS = PTS;
 	pck.flags = 0;
 
-	if (pes->frame_state && ((pes->frame_state==data_len) || ((data[pes->frame_state]==0xFF) && ((data[pes->frame_state+1] & 0xF0) == 0xF0)))) {
+	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;
@@ -597,8 +664,11 @@
 			continue;
 		}
 
+		if (garbage_bytes) {
+			garbage_bytes = 0;
+		}
 		/*flush any pending data*/
-		if (start < sc_pos) {
+		else if (start < sc_pos) {
 			/*dispatch frame*/
 			pck.stream = pes;
 			pck.DTS = PTS;
@@ -657,15 +727,25 @@
 			pck.stream = pes;
 			memset(&cfg, 0, sizeof(GF_M4ADecSpecInfo));
 			cfg.base_object_type = hdr.profile;
-			pes->aud_sr = cfg.base_sr = GF_M4ASampleRates[hdr.sr_idx];
+			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_obj_type = hdr.profile;
+			pes->aud_aac_obj_type = hdr.profile;
 		}
 
 		/*dispatch frame*/
@@ -693,8 +773,8 @@
 
 		if (first && pes->prev_PTS) {
 			pes->prev_PTS = 0;
-		} 
-		/*update PTS in case we don't get any update*/			
+		}
+		/*update PTS in case we don't get any update*/
 		else if (pes->aud_sr) {
 			size = 1024*90000/pes->aud_sr;
 			PTS += size;
@@ -716,9 +796,20 @@
 	/*dispatch frame*/
 	pck.stream = pes;
 	pck.DTS = pes->DTS;
-	pck.PTS = pes->PTS;	
+	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;
@@ -732,14 +823,51 @@
 
 		/*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);
 
@@ -760,7 +888,7 @@
 				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++) {
+					for (j=0; j<=num_lay; j++) {
 						GF_M4ADecSpecInfo cfg;
 						u32 frameLengthType;
 						Bool same_cfg = 0;
@@ -772,9 +900,10 @@
 
 							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_obj_type = cfg.base_object_type;
+								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);
@@ -827,17 +956,23 @@
 			pck.data_len = size;
 
 			ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-
-			/*update PTS in case we don't get any update*/
-			size = 1024*90000/pes->aud_sr;
-			pes->PTS += size;
 		}
 		gf_bs_del(bs);
 
-		/*parse amux*/
+		//trash dispatched AU, including 3 bytes header
 		sc_pos += amux_len+3;
-		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;
 
+		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;
@@ -861,7 +996,12 @@
 	/*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) ) {
-		remain = pos;
+		//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) {
@@ -1017,7 +1157,7 @@
 	if (*pos+msg_len>*size) {
 		*size = *pos+msg_len-*size+256;
 		*buffer = (char *)gf_realloc(*buffer, *size);
-	}		
+	}
 	strncpy((*buffer)+(*pos), msg, msg_len);
 	*pos += msg_len;
 }
@@ -1027,10 +1167,10 @@
 	u32 size;
 	u32 pos = 0;
 	/* ID3VVFFFFSIZE = 13bytes
-         * ID3 string
+	     * ID3 string
 	 * VV = Version
-         * F = Flags
-         * SIZE = 32bits size with first Most Significant bit set to 0 -> 28 bits
+	     * 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') {
@@ -1133,7 +1273,7 @@
 
 Bool gf_m2ts_crc32_check(char *data, u32 len)
 {
-    u32 crc = gf_crc_32(data, 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]);
 	return (crc==crc_val) ? GF_TRUE : GF_FALSE;
 }
@@ -1143,8 +1283,8 @@
 {
 	GF_M2TS_SectionFilter *sec;
 	GF_SAFEALLOC(sec, GF_M2TS_SectionFilter);
-	if (!sec){
-                GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] gf_m2ts_section_filter_new : OUT OF MEMORY\n"));
+	if (!sec) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] gf_m2ts_section_filter_new : OUT OF MEMORY\n"));
 		return NULL;
 	}
 	sec->cc = -1;
@@ -1184,6 +1324,8 @@
 	}
 	sf->cc = -1;
 	sf->length = sf->received = 0;
+	sf->demux_restarted = 1;
+
 }
 static void gf_m2ts_section_filter_del(GF_M2TS_SectionFilter *sf)
 {
@@ -1214,6 +1356,8 @@
 		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 (es->slcfg) gf_free(es->slcfg);
 	gf_free(es);
@@ -1230,6 +1374,17 @@
 	}
 }
 
+GF_EXPORT
+GF_M2TS_SDT *gf_m2ts_get_sdt_info(GF_M2TS_Demuxer *ts, u32 program_id)
+{
+	u32 i;
+	for (i=0; i<gf_list_count(ts->SDTs); i++) {
+		GF_M2TS_SDT *sdt = (GF_M2TS_SDT *)gf_list_get(ts->SDTs, i);
+		if (sdt->service_id==program_id) return sdt;
+	}
+	return NULL;
+}
+
 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
@@ -1238,11 +1393,11 @@
 		if (sec->section) gf_free(sec->section);
 		sec->section = NULL;
 		sec->length = sec->received = 0;
-		return; 
+		return;
 	}
 
 	if (!sec->process_section) {
-		if ((ts->on_event && (sec->section[0]==GF_M2TS_TABLE_ID_AIT)) ) {				
+		if ((ts->on_event && (sec->section[0]==GF_M2TS_TABLE_ID_AIT)) ) {
 #ifdef GPAC_ENABLE_DSMCC
 			GF_M2TS_SL_PCK pck;
 			pck.data_len = sec->length;
@@ -1252,14 +1407,14 @@
 			on_ait_section(ts, GF_M2TS_EVT_AIT_FOUND, &pck);
 #endif
 		} else if ((ts->on_event && (sec->section[0]==GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA	|| sec->section[0]==GF_M2TS_TABLE_ID_DSM_CC_UN_MESSAGE ||
-			sec->section[0]==GF_M2TS_TABLE_ID_DSM_CC_DOWNLOAD_DATA_MESSAGE || sec->section[0]==GF_M2TS_TABLE_ID_DSM_CC_STREAM_DESCRIPTION || sec->section[0]==GF_M2TS_TABLE_ID_DSM_CC_PRIVATE)) ) {				
+		                             sec->section[0]==GF_M2TS_TABLE_ID_DSM_CC_DOWNLOAD_DATA_MESSAGE || sec->section[0]==GF_M2TS_TABLE_ID_DSM_CC_STREAM_DESCRIPTION || sec->section[0]==GF_M2TS_TABLE_ID_DSM_CC_PRIVATE)) ) {
 
 #ifdef GPAC_ENABLE_DSMCC
 			GF_M2TS_SL_PCK pck;
 			pck.data_len = sec->length;
 			pck.data = sec->section;
 			pck.stream = (GF_M2TS_ES *)ses;
-			on_dsmcc_section(ts,GF_M2TS_EVT_DSMCC_FOUND,&pck); 
+			on_dsmcc_section(ts,GF_M2TS_EVT_DSMCC_FOUND,&pck);
 			//ts->on_event(ts, GF_M2TS_EVT_DSMCC_FOUND, &pck);
 #endif
 		}
@@ -1270,7 +1425,7 @@
 			pck.data = sec->section;
 			pck.stream = (GF_M2TS_ES *)ses;
 			ts->on_mpe_event(ts, GF_M2TS_EVT_DVB_MPE, &pck);
-		} 
+		}
 #endif
 		else if (ts->on_event) {
 			GF_M2TS_SL_PCK pck;
@@ -1297,19 +1452,19 @@
 
 		if (ts->on_event) {
 			switch (table_id) {
-				case GF_M2TS_TABLE_ID_PAT:
-				case GF_M2TS_TABLE_ID_SDT_ACTUAL:
-				case GF_M2TS_TABLE_ID_PMT:
-				case GF_M2TS_TABLE_ID_NIT_ACTUAL:
-				case GF_M2TS_TABLE_ID_TDT:
-				case GF_M2TS_TABLE_ID_TOT:
-				{
-					GF_M2TS_SL_PCK pck;
-					pck.data_len = sec->length;
-					pck.data = sec->section;
-					pck.stream = (GF_M2TS_ES *)ses;
-					ts->on_event(ts, GF_M2TS_EVT_DVB_GENERAL, &pck);
-				}
+			case GF_M2TS_TABLE_ID_PAT:
+			case GF_M2TS_TABLE_ID_SDT_ACTUAL:
+			case GF_M2TS_TABLE_ID_PMT:
+			case GF_M2TS_TABLE_ID_NIT_ACTUAL:
+			case GF_M2TS_TABLE_ID_TDT:
+			case GF_M2TS_TABLE_ID_TOT:
+			{
+				GF_M2TS_SL_PCK pck;
+				pck.data_len = sec->length;
+				pck.data = sec->section;
+				pck.stream = (GF_M2TS_ES *)ses;
+				ts->on_event(ts, GF_M2TS_EVT_DVB_GENERAL, &pck);
+			}
 			}
 		}
 
@@ -1341,36 +1496,40 @@
 		}
 
 		if (has_syntax_indicator) {
-			/*remove crc32*/
-			sec->length -= 4;
-			if (gf_m2ts_crc32_check((char *)data, sec->length)) {
-				s32 cur_sec_num;
-				t->version_number = (data[5] >> 1) & 0x1f;
-				if (t->last_section_number && t->section_number && (t->version_number != t->last_version_number)) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] table transmission interrupted: previous table (v=%d) %d/%d sections - new table (v=%d) %d/%d sections\n", t->last_version_number, t->section_number, t->last_section_number, t->version_number, data[6] + 1, data[7] + 1) );
-					gf_m2ts_reset_sections(t->sections);
-					t->section_number = 0;
-				}
+			if (sec->length < 4) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] corrupted section length %d less than CRC \n", sec->length));
+			} else {
+				/*remove crc32*/
+				sec->length -= 4;
+				if (gf_m2ts_crc32_check((char *)data, sec->length)) {
+					s32 cur_sec_num;
+					t->version_number = (data[5] >> 1) & 0x1f;
+					if (t->last_section_number && t->section_number && (t->version_number != t->last_version_number)) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] table transmission interrupted: previous table (v=%d) %d/%d sections - new table (v=%d) %d/%d sections\n", t->last_version_number, t->section_number, t->last_section_number, t->version_number, data[6] + 1, data[7] + 1) );
+						gf_m2ts_reset_sections(t->sections);
+						t->section_number = 0;
+					}
 
-				t->current_next_indicator = (data[5] & 0x1) ? 1 : 0;
-				/*add one to section numbers to detect if we missed or not the first section in the table*/
-				cur_sec_num = data[6] + 1;
-				t->last_section_number = data[7] + 1;
-				section_start = 8;
-				/*we missed something*/
-				if (!sec->process_individual && t->section_number + 1 != cur_sec_num) {
-					/* TODO - Check how to handle sections when the first complete section does
-					   not have its sec num 0 */
-					section_valid = 0;
-					if (t->is_init) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] corrupted table (lost section %d)\n", cur_sec_num ? cur_sec_num-1 : 31) );
+					t->current_next_indicator = (data[5] & 0x1) ? 1 : 0;
+					/*add one to section numbers to detect if we missed or not the first section in the table*/
+					cur_sec_num = data[6] + 1;
+					t->last_section_number = data[7] + 1;
+					section_start = 8;
+					/*we missed something*/
+					if (!sec->process_individual && t->section_number + 1 != cur_sec_num) {
+						/* TODO - Check how to handle sections when the first complete section does
+						   not have its sec num 0 */
+						section_valid = 0;
+						if (t->is_init) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] corrupted table (lost section %d)\n", cur_sec_num ? cur_sec_num-1 : 31) );
+						}
+					} else {
+						section_valid = 1;
+						t->section_number = cur_sec_num;
 					}
 				} else {
-					section_valid = 1;
-					t->section_number = cur_sec_num;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] corrupted section (CRC32 failed)\n"));
 				}
-			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] corrupted section (CRC32 failed)\n"));
 			}
 		} else {
 			section_valid = 1;
@@ -1567,94 +1726,93 @@
 
 static void gf_m2ts_process_sdt(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)
 {
-	 u32 pos, evt_type;
-	 u32 nb_sections;
-	 u32 data_size;
-	 unsigned char *data;
-	 GF_M2TS_Section *section;
-
-	 /*wait for the last section */
-	 if (!(status&GF_M2TS_TABLE_END)) return;
-
-	 /*skip if already received*/
-	 if (status&GF_M2TS_TABLE_REPEAT) {
-	         if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_SDT_REPEAT, NULL);
-	         return;
-	 }
-
-	 if (table_id != GF_M2TS_TABLE_ID_SDT_ACTUAL) {
-	         gf_m2ts_reset_sdt(ts);
-	         return;
-	 }
-
-	 gf_m2ts_reset_sdt(ts);
-
-	 nb_sections = gf_list_count(sections);
-	 if (nb_sections > 1) {
-	         GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] SDT on multiple sections not supported\n"));
-	 }
-
-	 section = (GF_M2TS_Section *)gf_list_get(sections, 0);
-	 data = section->data;
-	 data_size = section->data_size;
-
-	 //orig_net_id = (data[0] << 8) | data[1];
-	 pos = 3;
-	 while (pos < data_size) {
-	         GF_M2TS_SDT *sdt;
-	         u32 descs_size, d_pos, ulen;
-
-	         GF_SAFEALLOC(sdt, GF_M2TS_SDT);
-	         gf_list_add(ts->SDTs, sdt);
-
-	         sdt->service_id = (data[pos]<<8) + data[pos+1];
-	         sdt->EIT_schedule = (data[pos+2] & 0x2) ? 1 : 0;
-	         sdt->EIT_present_following = (data[pos+2] & 0x1);
-	         sdt->running_status = (data[pos+3]>>5) & 0x7;
-	         sdt->free_CA_mode = (data[pos+3]>>4) & 0x1;
-	         descs_size = ((data[pos+3]&0xf)<<8) | data[pos+4];
-	         pos += 5;
-
-	         d_pos = 0;
-	         while (d_pos < descs_size) {
-	                 u8 d_tag = data[pos+d_pos];
-	                 u8 d_len = data[pos+d_pos+1];
-
-	                 switch (d_tag) {
-	                 case GF_M2TS_DVB_SERVICE_DESCRIPTOR:
-	                         if (sdt->provider) gf_free(sdt->provider);
-	                         sdt->provider = NULL;
-	                         if (sdt->service) gf_free(sdt->service);
-	                         sdt->service = NULL;
-
-	                         d_pos+=2;
-	                         sdt->service_type = data[pos+d_pos];
-	                         ulen = data[pos+d_pos+1];
-	                         d_pos += 2;
-	                         sdt->provider = (char*)gf_malloc(sizeof(char)*(ulen+1));
-	                         memcpy(sdt->provider, data+pos+d_pos, sizeof(char)*ulen);
-	                         sdt->provider[ulen] = 0;
-	                         d_pos += ulen;
-
-	                         ulen = data[pos+d_pos];
-	                         d_pos += 1;
-	                         sdt->service = (char*)gf_malloc(sizeof(char)*(ulen+1));
-	                         memcpy(sdt->service, data+pos+d_pos, sizeof(char)*ulen);
-	                         sdt->service[ulen] = 0;
-	                         d_pos += ulen;
-	                         break;
-
-	                 default:
-	                         GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] Skipping descriptor (0x%x) not supported\n", d_tag));
-	                         d_pos += d_len;
-	                         if (d_len == 0) d_pos = descs_size;
-	                         break;
-	                 }
-	         }
-	         pos += descs_size;
-	 }
-	 evt_type = GF_M2TS_EVT_SDT_FOUND;
-	 if (ts->on_event) ts->on_event(ts, evt_type, NULL);
+	u32 pos, evt_type;
+	u32 nb_sections;
+	u32 data_size;
+	unsigned char *data;
+	GF_M2TS_Section *section;
+
+	/*wait for the last section */
+	if (!(status&GF_M2TS_TABLE_END)) return;
+
+	/*skip if already received*/
+	if (status&GF_M2TS_TABLE_REPEAT) {
+		if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_SDT_REPEAT, NULL);
+		return;
+	}
+
+	if (table_id != GF_M2TS_TABLE_ID_SDT_ACTUAL) {
+		return;
+	}
+
+	gf_m2ts_reset_sdt(ts);
+
+	nb_sections = gf_list_count(sections);
+	if (nb_sections > 1) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] SDT on multiple sections not supported\n"));
+	}
+
+	section = (GF_M2TS_Section *)gf_list_get(sections, 0);
+	data = section->data;
+	data_size = section->data_size;
+
+	//orig_net_id = (data[0] << 8) | data[1];
+	pos = 3;
+	while (pos < data_size) {
+		GF_M2TS_SDT *sdt;
+		u32 descs_size, d_pos, ulen;
+
+		GF_SAFEALLOC(sdt, GF_M2TS_SDT);
+		gf_list_add(ts->SDTs, sdt);
+
+		sdt->service_id = (data[pos]<<8) + data[pos+1];
+		sdt->EIT_schedule = (data[pos+2] & 0x2) ? 1 : 0;
+		sdt->EIT_present_following = (data[pos+2] & 0x1);
+		sdt->running_status = (data[pos+3]>>5) & 0x7;
+		sdt->free_CA_mode = (data[pos+3]>>4) & 0x1;
+		descs_size = ((data[pos+3]&0xf)<<8) | data[pos+4];
+		pos += 5;
+
+		d_pos = 0;
+		while (d_pos < descs_size) {
+			u8 d_tag = data[pos+d_pos];
+			u8 d_len = data[pos+d_pos+1];
+
+			switch (d_tag) {
+			case GF_M2TS_DVB_SERVICE_DESCRIPTOR:
+				if (sdt->provider) gf_free(sdt->provider);
+				sdt->provider = NULL;
+				if (sdt->service) gf_free(sdt->service);
+				sdt->service = NULL;
+
+				d_pos+=2;
+				sdt->service_type = data[pos+d_pos];
+				ulen = data[pos+d_pos+1];
+				d_pos += 2;
+				sdt->provider = (char*)gf_malloc(sizeof(char)*(ulen+1));
+				memcpy(sdt->provider, data+pos+d_pos, sizeof(char)*ulen);
+				sdt->provider[ulen] = 0;
+				d_pos += ulen;
+
+				ulen = data[pos+d_pos];
+				d_pos += 1;
+				sdt->service = (char*)gf_malloc(sizeof(char)*(ulen+1));
+				memcpy(sdt->service, data+pos+d_pos, sizeof(char)*ulen);
+				sdt->service[ulen] = 0;
+				d_pos += ulen;
+				break;
+
+			default:
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Skipping descriptor (0x%x) not supported\n", d_tag));
+				d_pos += d_len;
+				if (d_len == 0) d_pos = descs_size;
+				break;
+			}
+		}
+		pos += descs_size;
+	}
+	evt_type = GF_M2TS_EVT_SDT_FOUND;
+	if (ts->on_event) ts->on_event(ts, evt_type, NULL);
 }
 
 static void gf_m2ts_process_mpeg4section(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)
@@ -1690,14 +1848,14 @@
 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);
-    *day = (u32)(date - 14956 - (u32)(yp * 365.25) - (u32)(mp * 30.6001));
-    if (mp == 14 || mp == 15) k = 1;
-    else k = 0;
-    *year = yp + k + 1900;
-    *month = mp - 1 - k*12;
+	u32 yp, mp, k;
+	yp = (u32)((date - 15078.2)/365.25);
+	mp = (u32)((date - 14956.1 - (u32)(yp * 365.25))/30.6001);
+	*day = (u32)(date - 14956 - (u32)(yp * 365.25) - (u32)(mp * 30.6001));
+	if (mp == 14 || mp == 15) k = 1;
+	else k = 0;
+	*year = yp + k + 1900;
+	*month = mp - 1 - k*12;
 	assert(*year>=1900 && *year<=2100 && *month && *month<=12 && *day && *day<=31);
 }
 
@@ -1715,15 +1873,15 @@
 		return;
 
 	switch (table_id) {
-		case GF_M2TS_TABLE_ID_TDT:
-			table_name = "TDT";
-			break;
-		case GF_M2TS_TABLE_ID_TOT:
-			table_name = "TOT";
-			break;
-		default:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Unimplemented table_id %u for PID %u\n", table_id, GF_M2TS_PID_TDT_TOT_ST));
-			return;
+	case GF_M2TS_TABLE_ID_TDT:
+		table_name = "TDT";
+		break;
+	case GF_M2TS_TABLE_ID_TOT:
+		table_name = "TOT";
+		break;
+	default:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Unimplemented table_id %u for PID %u\n", table_id, GF_M2TS_PID_TDT_TOT_ST));
+		return;
 	}
 
 	nb_sections = gf_list_count(sections);
@@ -1748,63 +1906,63 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Stream UTC time is %u/%02u/%02u %02u:%02u:%02u\n", time_table->year, time_table->month, time_table->day, time_table->hour, time_table->minute, time_table->second));
 
 	switch (table_id) {
-		case GF_M2TS_TABLE_ID_TDT:
-			if (ts->TDT_time) gf_free(ts->TDT_time);
-			ts->TDT_time = time_table;
-			if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_TDT, time_table);
-			break;
-		case GF_M2TS_TABLE_ID_TOT:
+	case GF_M2TS_TABLE_ID_TDT:
+		if (ts->TDT_time) gf_free(ts->TDT_time);
+		ts->TDT_time = time_table;
+		if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_TDT, time_table);
+		break;
+	case GF_M2TS_TABLE_ID_TOT:
 #if 0
-			{
-				u32 pos, loop_len;
-				loop_len = ((data[5]&0x0f) << 8) | (data[6] & 0xff);
-				data += 7;
-				pos = 0;
-				while (pos < loop_len) {
-					u8 tag = data[pos];
-					pos += 2;
-					if (tag == GF_M2TS_DVB_LOCAL_TIME_OFFSET_DESCRIPTOR) {
-						char tmp_time[10];
-						u16 offset_hours, offset_minutes;
-						now->country_code[0] = data[pos];
-						now->country_code[1] = data[pos+1];
-						now->country_code[2] = data[pos+2];
-						now->country_region_id = data[pos+3]>>2;
-
-						sprintf(tmp_time, "%02x", data[pos+4]);
-						offset_hours = atoi(tmp_time);
-						sprintf(tmp_time, "%02x", data[pos+5]);
-						offset_minutes = atoi(tmp_time);
-						now->local_time_offset_seconds = (offset_hours * 60 + offset_minutes) * 60;
-						if (data[pos+3] & 1) now->local_time_offset_seconds *= -1;
-
-						dvb_decode_mjd_to_unix_time(data+pos+6, &now->unix_next_toc);
-
-						sprintf(tmp_time, "%02x", data[pos+11]);
-						offset_hours = atoi(tmp_time);
-						sprintf(tmp_time, "%02x", data[pos+12]);
-						offset_minutes = atoi(tmp_time);
-						now->next_time_offset_seconds = (offset_hours * 60 + offset_minutes) * 60;
-						if (data[pos+3] & 1) now->next_time_offset_seconds *= -1;
-						pos+= 13;
-					}
-				}
-				/*TODO: check lengths are ok*/
-				if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_TOT, time_table);
-			}
-#endif
-			/*check CRC32*/
-			if (!gf_m2ts_crc32_check(ts->tdt_tot->section, ts->tdt_tot->length-4)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] corrupted %s table (CRC32 failed)\n", table_name));
-				goto error_exit;
-			}
-			if (ts->TDT_time) gf_free(ts->TDT_time);
-			ts->TDT_time = time_table;
-			if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_TOT, time_table);
-			break;
-		default:
-			assert(0);
-			goto error_exit;
+	{
+		u32 pos, loop_len;
+		loop_len = ((data[5]&0x0f) << 8) | (data[6] & 0xff);
+		data += 7;
+		pos = 0;
+		while (pos < loop_len) {
+			u8 tag = data[pos];
+			pos += 2;
+			if (tag == GF_M2TS_DVB_LOCAL_TIME_OFFSET_DESCRIPTOR) {
+				char tmp_time[10];
+				u16 offset_hours, offset_minutes;
+				now->country_code[0] = data[pos];
+				now->country_code[1] = data[pos+1];
+				now->country_code[2] = data[pos+2];
+				now->country_region_id = data[pos+3]>>2;
+
+				sprintf(tmp_time, "%02x", data[pos+4]);
+				offset_hours = atoi(tmp_time);
+				sprintf(tmp_time, "%02x", data[pos+5]);
+				offset_minutes = atoi(tmp_time);
+				now->local_time_offset_seconds = (offset_hours * 60 + offset_minutes) * 60;
+				if (data[pos+3] & 1) now->local_time_offset_seconds *= -1;
+
+				dvb_decode_mjd_to_unix_time(data+pos+6, &now->unix_next_toc);
+
+				sprintf(tmp_time, "%02x", data[pos+11]);
+				offset_hours = atoi(tmp_time);
+				sprintf(tmp_time, "%02x", data[pos+12]);
+				offset_minutes = atoi(tmp_time);
+				now->next_time_offset_seconds = (offset_hours * 60 + offset_minutes) * 60;
+				if (data[pos+3] & 1) now->next_time_offset_seconds *= -1;
+				pos+= 13;
+			}
+		}
+		/*TODO: check lengths are ok*/
+		if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_TOT, time_table);
+	}
+#endif
+		/*check CRC32*/
+	if (!gf_m2ts_crc32_check(ts->tdt_tot->section, ts->tdt_tot->length-4)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] corrupted %s table (CRC32 failed)\n", table_name));
+		goto error_exit;
+	}
+	if (ts->TDT_time) gf_free(ts->TDT_time);
+	ts->TDT_time = time_table;
+	if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_TOT, time_table);
+	break;
+	default:
+		assert(0);
+		goto error_exit;
 	}
 
 	return; /*success*/
@@ -1830,7 +1988,7 @@
 	if (d->format == 0xFF) {
 		d->format_identifier = gf_bs_read_u32(bs);
 		size += 4;
-	} 
+	}
 	d->service_id = gf_bs_read_u8(bs);
 	d->locator_record_flag = (gf_bs_read_int(bs, 1) ? GF_TRUE : GF_FALSE);
 	d->carriage_flag = (enum metadata_carriage)gf_bs_read_int(bs, 2);
@@ -1853,7 +2011,7 @@
 	}
 	if (length-size > 0) {
 		d->data_size = length-size;
-		d->data = (char *)gf_malloc(d->data_size); 
+		d->data = (char *)gf_malloc(d->data_size);
 		gf_bs_read_data(bs, d->data, d->data_size);
 	}
 	return d;
@@ -1884,7 +2042,7 @@
 	if (d->format == 0xFF) {
 		d->format_identifier = gf_bs_read_u32(bs);
 		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);
@@ -1944,6 +2102,10 @@
 		return;
 	}
 
+	if (pmt->sec->demux_restarted) {
+		pmt->sec->demux_restarted = 0;
+		return;
+	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PMT Found or updated\n"));
 
 	nb_sections = gf_list_count(sections);
@@ -1987,9 +2149,9 @@
 				metapd = gf_m2ts_read_metadata_pointer_descriptor(metadatapd_bs, len);
 				gf_bs_del(metadatapd_bs);
 				if (metapd->application_format_identifier == GF_4CC('I', 'D', '3', ' ') &&
-					metapd->format_identifier == GF_4CC('I', 'D', '3', ' ') && 
-					metapd->carriage_flag == METADATA_CARRIAGE_SAME_TS) {
-						/*HLS ID3 Metadata */
+				        metapd->format_identifier == GF_4CC('I', 'D', '3', ' ') &&
+				        metapd->carriage_flag == METADATA_CARRIAGE_SAME_TS) {
+					/*HLS ID3 Metadata */
 					pmt->program->metadata_pointer_descriptor = metapd;
 				} else {
 					/* don't know what to do with it for now, delete */
@@ -2008,15 +2170,15 @@
 	data += 4 + info_length;
 	data_size -= 4 + info_length;
 	pos = 0;
-	
+
 	/* count de number of program related PMT received */
-	for(i=0;i<gf_list_count(ts->programs);i++){
-	  GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
-	  if(prog->pmt_pid == pmt->pid){		
-		break;
-	  }
+	for(i=0; i<gf_list_count(ts->programs); i++) {
+		GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
+		if(prog->pmt_pid == pmt->pid) {
+			break;
+		}
 	}
-	
+
 
 	while (pos<data_size) {
 		GF_M2TS_PES *pes = NULL;
@@ -2032,7 +2194,7 @@
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("stream_type :%d \n",stream_type));
 		switch (stream_type) {
-			
+
 		/* PES */
 		case GF_M2TS_VIDEO_MPEG1:
 		case GF_M2TS_VIDEO_MPEG2:
@@ -2055,7 +2217,7 @@
 			GF_SAFEALLOC(pes, GF_M2TS_PES);
 			pes->cc = -1;
 			pes->flags = GF_M2TS_ES_IS_PES;
-			if (inherit_pcr) 
+			if (inherit_pcr)
 				pes->flags |= GF_M2TS_INHERIT_PCR;
 			es = (GF_M2TS_ES *)pes;
 			break;
@@ -2087,16 +2249,16 @@
 		case GF_M2TS_13818_6_ANNEX_B:
 		case GF_M2TS_13818_6_ANNEX_C:
 		case GF_M2TS_13818_6_ANNEX_D:
-		case GF_M2TS_PRIVATE_SECTION:			
+		case GF_M2TS_PRIVATE_SECTION:
 			GF_SAFEALLOC(ses, GF_M2TS_SECTION_ES);
 			es = (GF_M2TS_ES *)ses;
 			es->flags |= GF_M2TS_ES_IS_SECTION;
 			es->pid = pid;
 			es->service_id = pmt->program->number;
-			if(stream_type == GF_M2TS_PRIVATE_SECTION){
+			if(stream_type == GF_M2TS_PRIVATE_SECTION) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("AIT section found on pid %d\n", pid));
-			}else{
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("stream type DSM CC user private section: pid = %d \n", pid));		
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("stream type DSM CC user private section: pid = %d \n", pid));
 			}
 			/* NULL means: trigger the call to on_event with DVB_GENERAL type and the raw section as payload */
 			ses->sec = gf_m2ts_section_filter_new(NULL, 1);
@@ -2162,13 +2324,13 @@
 					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);
-						}
-					 }
-					break;
+				{
+					u32 id = data[2]<<8 | data[3];
+					if ((id == 0xB) && ses && !ses->sec) {
+						ses->sec = gf_m2ts_section_filter_new(NULL, 1);
+					}
+				}
+				break;
 				case GF_M2TS_DVB_SUBTITLING_DESCRIPTOR:
 					pes->sub.language[0] = data[2];
 					pes->sub.language[1] = data[3];
@@ -2180,11 +2342,11 @@
 					es->stream_type = GF_M2TS_DVB_SUBTITLE;
 					break;
 				case GF_M2TS_DVB_STREAM_IDENTIFIER_DESCRIPTOR:
-					{
-						es->component_tag = data[2];
-						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Component Tag: %d on Program %d\n", es->component_tag, es->program->number));
-					}
-					break;
+				{
+					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;
@@ -2192,27 +2354,29 @@
 					es->stream_type = GF_M2TS_DVB_VBI;
 					break;
 				case GF_M2TS_HIERARCHY_DESCRIPTOR:
-					if (pes)
-						pes->depends_on_pid = (data[4] & 0x3F) + es->program->pmt_pid;
+					if (pes) {
+						//u8 hierarchy_layer_idx = (data[3] & 0x3F);
+						pes->depends_on_pid = (data[4] & 0x3F);
+					}
 					break;
 				case GF_M2TS_METADATA_DESCRIPTOR:
-					{
-						GF_BitStream *metadatad_bs;
-						GF_M2TS_MetadataDescriptor *metad;
-						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_4CC('I', 'D', '3', ' ') &&
-							metad->format_identifier == GF_4CC('I', 'D', '3', ' ')) {
-							/*HLS ID3 Metadata */
-							pes->metadata_descriptor = metad;
-							pes->stream_type = GF_M2TS_METADATA_ID3_HLS;
-						} else {
-							/* don't know what to do with it for now, delete */
-							gf_m2ts_metadata_descriptor_del(metad);
-						}
-					}					
-					break;
+				{
+					GF_BitStream *metadatad_bs;
+					GF_M2TS_MetadataDescriptor *metad;
+					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_4CC('I', 'D', '3', ' ') &&
+					        metad->format_identifier == GF_4CC('I', 'D', '3', ' ')) {
+						/*HLS ID3 Metadata */
+						pes->metadata_descriptor = metad;
+						pes->stream_type = GF_M2TS_METADATA_ID3_HLS;
+					} else {
+						/* don't know what to do with it for now, delete */
+						gf_m2ts_metadata_descriptor_del(metad);
+					}
+				}
+				break;
 
 				default:
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] skipping descriptor (0x%x) not supported\n", tag));
@@ -2223,7 +2387,7 @@
 			data += len+2;
 			pos += len+2;
 			if (desc_len < len+2) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PMT es descriptor size for PID %d\n", pes->pid ) );
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PMT es descriptor size for PID %d\n", es->pid ) );
 				break;
 			}
 			desc_len-=len+2;
@@ -2237,35 +2401,61 @@
 
 		if (!es) continue;
 
-		/*watchout for pmt update - FIXME this likely won't work in most cases*/
 		if (ts->ess[pid]) {
-			GF_M2TS_ES *o_es = ts->ess[es->pid];
+			//this is component reuse across programs, overwrite the previously declared stream ...
+			if (status & GF_M2TS_TABLE_FOUND) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d reused across programs %d and %d, not completely supported\n", pid, ts->ess[pid]->program->number, es->program->number ) );
+
+				//add stream to program but don't reassign the pid table until the stream is playing (>GF_M2TS_PES_FRAMING_SKIP)
+				gf_list_add(pmt->program->streams, es);
+				if (!(es->flags & GF_M2TS_ES_IS_SECTION) ) gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
 
-			if ((o_es->stream_type == es->stream_type)
-				&& ((o_es->flags & GF_M2TS_ES_STATIC_FLAGS_MASK) == (es->flags & GF_M2TS_ES_STATIC_FLAGS_MASK))
-				&& (o_es->mpeg4_es_id == es->mpeg4_es_id)
-				&& ((o_es->flags & GF_M2TS_ES_IS_SECTION) || ((GF_M2TS_PES *)o_es)->lang == ((GF_M2TS_PES *)es)->lang)
-			) {
-				gf_free(es);
+				nb_es++;
+				//skip assignment below
 				es = NULL;
-			} else {
-				gf_m2ts_es_del(o_es, ts);
-				ts->ess[es->pid] = NULL;
+			}
+			/*watchout for pmt update - FIXME this likely won't work in most cases*/
+			else {
+
+				GF_M2TS_ES *o_es = ts->ess[es->pid];
+
+				if ((o_es->stream_type == es->stream_type)
+				        && ((o_es->flags & GF_M2TS_ES_STATIC_FLAGS_MASK) == (es->flags & GF_M2TS_ES_STATIC_FLAGS_MASK))
+				        && (o_es->mpeg4_es_id == es->mpeg4_es_id)
+				        && ((o_es->flags & GF_M2TS_ES_IS_SECTION) || ((GF_M2TS_PES *)o_es)->lang == ((GF_M2TS_PES *)es)->lang)
+				   ) {
+					gf_free(es);
+					es = NULL;
+				} else {
+					gf_m2ts_es_del(o_es, ts);
+					ts->ess[es->pid] = NULL;
+				}
 			}
 		}
 
 		if (es) {
 			ts->ess[es->pid] = es;
 			gf_list_add(pmt->program->streams, es);
-
 			if (!(es->flags & GF_M2TS_ES_IS_SECTION) ) gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
 
 			nb_es++;
 		}
 	}
 
-	
-	if (nb_es) {		
+
+	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 = (GF_M2TS_PES *)gf_list_get(pmt->program->streams, i);
+			GF_M2TS_PES *es = (GF_M2TS_PES *)gf_list_get(pmt->program->streams, i);
+			if ( !(es->flags & GF_M2TS_ES_IS_PES)) continue;
+			if (!es->depends_on_pid) continue;
+
+			an_es =  (GF_M2TS_PES *)gf_list_get(pmt->program->streams, es->depends_on_pid);
+			if (an_es) es->depends_on_pid = an_es->pid;
+		}
+
 		evt_type = (status&GF_M2TS_TABLE_FOUND) ? GF_M2TS_EVT_PMT_FOUND : GF_M2TS_EVT_PMT_UPDATE;
 		if (ts->on_event) ts->on_event(ts, evt_type, pmt->program);
 	} else {
@@ -2284,7 +2474,7 @@
 	u32 data_size;
 	unsigned char *data;
 	GF_M2TS_Section *section;
-	
+
 	nb_pat++;
 
 	/*wait for the last section */
@@ -2300,24 +2490,27 @@
 	if (nb_sections > 1) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("PAT on multiple sections not supported\n"));
 	}
-	
+
 	section = (GF_M2TS_Section *)gf_list_get(sections, 0);
 	data = section->data;
 	data_size = section->data_size;
 
 	if (!(status&GF_M2TS_TABLE_UPDATE) && gf_list_count(ts->programs)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Multiple different PAT on single TS found, ignoring new PAT declaration (table id %d - extended table id %d)\n", table_id, ex_table_id));
+		if (ts->pat->demux_restarted) {
+			ts->pat->demux_restarted = 0;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Multiple different PAT on single TS found, ignoring new PAT declaration (table id %d - extended table id %d)\n", table_id, ex_table_id));
+		}
 		return;
 	}
-
-	nb_progs = data_size / 4;	
+	nb_progs = data_size / 4;
 
 	for (i=0; i<nb_progs; i++) {
 		u16 number, pid;
 		number = (data[0]<<8) | data[1];
 		pid = (data[2]&0x1f)<<8 | data[3];
 		data += 4;
-		if (number==0) {			
+		if (number==0) {
 			if (!ts->nit) {
 				ts->nit = gf_m2ts_section_filter_new(gf_m2ts_process_nit, 0);
 			}
@@ -2326,6 +2519,7 @@
 			prog->streams = gf_list_new();
 			prog->pmt_pid = pid;
 			prog->number = number;
+			prog->ts = ts;
 			gf_list_add(ts->programs, prog);
 			GF_SAFEALLOC(pmt, GF_M2TS_SECTION_ES);
 			pmt->flags = GF_M2TS_ES_IS_SECTION;
@@ -2338,21 +2532,21 @@
 	}
 
 	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) ts->on_event(ts, evt_type, NULL);
 }
 
 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)
 {
 	u32 evt_type;
-/*
-	GF_M2TS_Program *prog;
-	GF_M2TS_SECTION_ES *pmt;
-	u32 i, nb_progs;
-	u32 nb_sections;
-	u32 data_size;
-	unsigned char *data;
-	GF_M2TS_Section *section;
-*/
+	/*
+		GF_M2TS_Program *prog;
+		GF_M2TS_SECTION_ES *pmt;
+		u32 i, nb_progs;
+		u32 nb_sections;
+		u32 data_size;
+		unsigned char *data;
+		GF_M2TS_Section *section;
+	*/
 
 	/*wait for the last section */
 	if (!(status&GF_M2TS_TABLE_END)) return;
@@ -2362,43 +2556,43 @@
 		if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_CAT_REPEAT, NULL);
 		return;
 	}
-/*
-	nb_sections = gf_list_count(sections);
-	if (nb_sections > 1) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("CAT on multiple sections not supported\n"));
-	}
-
-	section = (GF_M2TS_Section *)gf_list_get(sections, 0);
-	data = section->data;
-	data_size = section->data_size;
-
-	nb_progs = data_size / 4;
-
-	for (i=0; i<nb_progs; i++) {
-		u16 number, pid;
-		number = (data[0]<<8) | data[1];
-		pid = (data[2]&0x1f)<<8 | data[3];
-		data += 4;
-		if (number==0) {
-			if (!ts->nit) {
-				ts->nit = gf_m2ts_section_filter_new(gf_m2ts_process_nit, 0);
+	/*
+		nb_sections = gf_list_count(sections);
+		if (nb_sections > 1) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("CAT on multiple sections not supported\n"));
+		}
+
+		section = (GF_M2TS_Section *)gf_list_get(sections, 0);
+		data = section->data;
+		data_size = section->data_size;
+
+		nb_progs = data_size / 4;
+
+		for (i=0; i<nb_progs; i++) {
+			u16 number, pid;
+			number = (data[0]<<8) | data[1];
+			pid = (data[2]&0x1f)<<8 | data[3];
+			data += 4;
+			if (number==0) {
+				if (!ts->nit) {
+					ts->nit = gf_m2ts_section_filter_new(gf_m2ts_process_nit, 0);
+				}
+			} else {
+				GF_SAFEALLOC(prog, GF_M2TS_Program);
+				prog->streams = gf_list_new();
+				prog->pmt_pid = pid;
+				prog->number = number;
+				gf_list_add(ts->programs, prog);
+				GF_SAFEALLOC(pmt, GF_M2TS_SECTION_ES);
+				pmt->flags = GF_M2TS_ES_IS_SECTION;
+				gf_list_add(prog->streams, pmt);
+				pmt->pid = prog->pmt_pid;
+				pmt->program = prog;
+				ts->ess[pmt->pid] = (GF_M2TS_ES *)pmt;
+				pmt->sec = gf_m2ts_section_filter_new(gf_m2ts_process_pmt, 0);
 			}
-		} else {
-			GF_SAFEALLOC(prog, GF_M2TS_Program);
-			prog->streams = gf_list_new();
-			prog->pmt_pid = pid;
-			prog->number = number;
-			gf_list_add(ts->programs, prog);
-			GF_SAFEALLOC(pmt, GF_M2TS_SECTION_ES);
-			pmt->flags = GF_M2TS_ES_IS_SECTION;
-			gf_list_add(prog->streams, pmt);
-			pmt->pid = prog->pmt_pid;
-			pmt->program = prog;
-			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_CAT_UPDATE : GF_M2TS_EVT_CAT_FOUND;
 	if (ts->on_event) ts->on_event(ts, evt_type, NULL);
@@ -2406,14 +2600,14 @@
 
 u64 gf_m2ts_get_pts(unsigned char *data)
 {
-    u64 pts;
-    u32 val;
-    pts = (u64)((data[0] >> 1) & 0x07) << 30;
-    val = (data[1] << 8) | data[2];
-    pts |= (u64)(val >> 1) << 15;
-    val = (data[3] << 8) | data[4];
-    pts |= (u64)(val >> 1);
-    return pts;
+	u64 pts;
+	u32 val;
+	pts = (u64)((data[0] >> 1) & 0x07) << 30;
+	val = (data[1] << 8) | data[2];
+	pts |= (u64)(val >> 1) << 15;
+	val = (data[3] << 8) | data[4];
+	pts |= (u64)(val >> 1);
+	return pts;
 }
 
 void gf_m2ts_pes_header(GF_M2TS_PES *pes, unsigned char *data, u32 data_size, GF_M2TS_PESHeader *pesh)
@@ -2426,26 +2620,26 @@
 
 	pesh->id = data[0];
 	pesh->pck_len = (data[1]<<8) | data[2];
-/*
-	2bits
-	scrambling_control		= gf_bs_read_int(bs,2);
-	priority				= gf_bs_read_int(bs,1);
-*/
+	/*
+		2bits
+		scrambling_control		= gf_bs_read_int(bs,2);
+		priority				= gf_bs_read_int(bs,1);
+	*/
 	pesh->data_alignment = (data[3] & 0x4) ? 1 : 0;
-/*
-	copyright				= gf_bs_read_int(bs,1);
-	original				= gf_bs_read_int(bs,1);
-*/
+	/*
+		copyright				= gf_bs_read_int(bs,1);
+		original				= gf_bs_read_int(bs,1);
+	*/
 	has_pts = (data[4]&0x80);
 	has_dts = has_pts ? (data[4]&0x40) : 0;
-/*
-	ESCR_flag				= gf_bs_read_int(bs,1);
-	ES_rate_flag			= gf_bs_read_int(bs,1);
-	DSM_flag				= gf_bs_read_int(bs,1);
-	additional_copy_flag	= gf_bs_read_int(bs,1);
-	prev_crc_flag			= gf_bs_read_int(bs,1);
-	extension_flag			= gf_bs_read_int(bs,1);
-*/
+	/*
+		ESCR_flag				= gf_bs_read_int(bs,1);
+		ES_rate_flag			= gf_bs_read_int(bs,1);
+		DSM_flag				= gf_bs_read_int(bs,1);
+		additional_copy_flag	= gf_bs_read_int(bs,1);
+		prev_crc_flag			= gf_bs_read_int(bs,1);
+		extension_flag			= gf_bs_read_int(bs,1);
+	*/
 
 	pesh->hdr_data_len = data[5];
 
@@ -2469,26 +2663,54 @@
 	}
 }
 
-static void gf_m2ts_flush_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes)
+static void gf_m2ts_flush_temi(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes)
+{
+	GF_M2TS_TemiTimecodeDescriptor temi_tc;
+	GF_BitStream *bs = gf_bs_new(pes->temi_tc_desc, pes->temi_tc_desc_len, GF_BITSTREAM_READ);
+	u32 has_timestamp = gf_bs_read_int(bs, 2);
+	/*u32 has_ntp = */gf_bs_read_int(bs, 1);
+	/*u32 has_ptp = */gf_bs_read_int(bs, 1);
+	/*u32 has_timecode = */gf_bs_read_int(bs, 2);
+
+	memset(&temi_tc, 0, sizeof(GF_M2TS_TemiTimecodeDescriptor));
+	temi_tc.force_reload = gf_bs_read_int(bs, 1);
+	temi_tc.is_paused = gf_bs_read_int(bs, 1);
+	temi_tc.is_discontinuity = gf_bs_read_int(bs, 1);
+	gf_bs_read_int(bs, 7);
+	temi_tc.timeline_id = gf_bs_read_int(bs, 8);
+	if (has_timestamp) {
+		temi_tc.media_timescale = gf_bs_read_u32(bs);
+		if (has_timestamp==2)
+			temi_tc.media_timestamp = gf_bs_read_u64(bs);
+		else
+			temi_tc.media_timestamp = gf_bs_read_u32(bs);
+	}
+	temi_tc.pes_pts = pes->PTS;
+	gf_bs_del(bs);
+	pes->temi_tc_desc_len = 0;
+	ts->on_event(ts, GF_M2TS_EVT_TEMI_TIMECODE, &temi_tc);
+}
+
+void gf_m2ts_flush_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes)
 {
 	GF_M2TS_PESHeader pesh;
 
 	/*we need at least a full, valid start code !!*/
 	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;
-        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) 
-		) {
+		u32 stream_id = pes->pck_data[3] | 0x100;
+		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)
+		   ) {
 			Bool same_pts = 0;
 
 			/*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;
@@ -2521,7 +2743,8 @@
 				{
 					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) {
+					}
+					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) );
 					}
 				}
@@ -2558,11 +2781,17 @@
 				}
 				//copy over the remaining of previous PES payload before start of this PES payload
 				if (pes->prev_data_len) {
-					assert(pes->prev_data_len < len);
-					offset = len - pes->prev_data_len;
-					memcpy(pes->pck_data + offset, pes->prev_data, pes->prev_data_len);
+					if (pes->prev_data_len < len) {
+						offset = len - pes->prev_data_len;
+						memcpy(pes->pck_data + offset, pes->prev_data, pes->prev_data_len);
+					} else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES reassembly buffer overflow (%d bytes not processed from previous PES) - discarding prev data\n", pes->pid, pes->prev_data_len ));
+					}
 				}
 
+				if (pes->temi_tc_desc_len)
+					gf_m2ts_flush_temi(ts, pes);
+
 				if (! ts->start_range)
 					remain = pes->reframe(ts, pes, same_pts, pes->pck_data+offset, pes->pck_data_len-offset, &pesh);
 
@@ -2593,13 +2822,14 @@
 	Bool disc=0;
 	Bool flush_pes = 0;
 
-	/*duplicated packet, NOT A DISCONTINUITY, we should discard the packet - however we may encounter this configuration in DASH at segment boundaries. 
+	/*duplicated packet, NOT A DISCONTINUITY, we should discard the packet - however we may encounter this configuration in DASH at segment boundaries.
 	If payload start is set, ignore duplication*/
 	if (hdr->continuity_counter==pes->cc) {
 		if (!hdr->payload_start || (hdr->adaptation_field!=3) ) return;
 	} else {
 		expect_cc = (pes->cc<0) ? hdr->continuity_counter : (pes->cc + 1) & 0xf;
-		if (expect_cc != hdr->continuity_counter) disc = 1;
+		if (expect_cc != hdr->continuity_counter)
+			disc = 1;
 	}
 	pes->cc = hdr->continuity_counter;
 
@@ -2608,7 +2838,7 @@
 			pes->flags &= ~GF_M2TS_ES_IGNORE_NEXT_DISCONTINUITY;
 			disc = 0;
 		}
-			disc = 0;
+		disc = 0;
 		if (disc) {
 			if (hdr->payload_start) {
 				if (pes->pck_data_len) {
@@ -2660,7 +2890,7 @@
 		return;
 	}
 	/*reassemble*/
-	if (pes->pck_data_len + data_size > pes->pck_alloc_len ){
+	if (pes->pck_data_len + data_size > pes->pck_alloc_len ) {
 		pes->pck_alloc_len = pes->pck_data_len + data_size;
 		pes->pck_data = (u8*)gf_realloc(pes->pck_data, pes->pck_alloc_len);
 	}
@@ -2692,7 +2922,7 @@
 	paf->adaptation_field_extension_flag = (data[0] & 0x1) ? 1 : 0;
 
 	af_extension = data + 1;
-	if (paf->PCR_flag == 1){
+	if (paf->PCR_flag == 1) {
 		u32 base = (data[1] << 24) | (data[2] << 16) | (data[3] << 8) | data[4];
 		u64 PCR = (u64) base;
 		paf->PCR_base = (PCR << 1) | (data[5] >> 7);
@@ -2720,23 +2950,38 @@
 		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 fopund\n", pid));
+			return;
+		}
 		afext_bytes-=1;
 		if (ltw_flag) {
 			af_extension += 2;
+			if (!afext_bytes<2) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension fopund\n", pid));
+				return;
+			}
 			afext_bytes-=2;
 		}
 		if (pwr_flag) {
 			af_extension += 3;
+			if (!afext_bytes<3) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension fopund\n", pid));
+				return;
+			}
 			afext_bytes-=3;
 		}
 		if (seamless_flag) {
 			af_extension += 3;
+			if (!afext_bytes<3) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension fopund\n", pid));
+				return;
+			}
 			afext_bytes-=3;
 		}
 
 		if (! af_desc_not_present) {
 			while (afext_bytes) {
-				char URL[255];
 				GF_BitStream *bs;
 				char *desc;
 				u8 desc_tag = af_extension[0];
@@ -2751,40 +2996,51 @@
 				switch (desc_tag) {
 				case GF_M2TS_AFDESC_LOCATION_DESCRIPTOR:
 				{
-					//u32 timeline_id;
-					Bool external_url, use_base_temi_url;
-					/*Bool force_reload = */gf_bs_read_int(bs, 1);
-					/*Bool is_announcement = */gf_bs_read_int(bs, 1); 
-					/*Bool splicing_flag = */gf_bs_read_int(bs, 1);
-					external_url = gf_bs_read_int(bs, 1);
+					Bool use_base_temi_url;
+					char URL[255];
+					GF_M2TS_TemiLocationDescriptor temi_loc;
+					memset(&temi_loc, 0, sizeof(GF_M2TS_TemiLocationDescriptor) );
+					temi_loc.reload_external = gf_bs_read_int(bs, 1);
+					temi_loc.is_announce = gf_bs_read_int(bs, 1);
+					temi_loc.is_splicing = gf_bs_read_int(bs, 1);
 					use_base_temi_url = gf_bs_read_int(bs, 1);
-					gf_bs_read_int(bs, 3); //reserved 
-					/*timeline_id = */gf_bs_read_int(bs, 8); 
-					if (!external_url) {
-						if (!use_base_temi_url) {
-							char *_url = URL;
-							u8 scheme = gf_bs_read_int(bs, 8);
-							u8 url_len = gf_bs_read_int(bs, 8);
-							switch (scheme) {
-							case 1:
-								strcpy(URL, "http://");
-								_url = URL+7;
-								break;
-							case 2:
-								strcpy(URL, "https://");
-								_url = URL+8;
-								break;
-							}
-							gf_bs_read_data(bs, _url, url_len);
-							_url[url_len] = 0;
+					gf_bs_read_int(bs, 5); //reserved
+					temi_loc.timeline_id = gf_bs_read_int(bs, 7);
+					if (!use_base_temi_url) {
+						char *_url = URL;
+						u8 scheme = gf_bs_read_int(bs, 8);
+						u8 url_len = gf_bs_read_int(bs, 8);
+						switch (scheme) {
+						case 1:
+							strcpy(URL, "http://");
+							_url = URL+7;
+							break;
+						case 2:
+							strcpy(URL, "https://");
+							_url = URL+8;
+							break;
 						}
+						gf_bs_read_data(bs, _url, url_len);
+						_url[url_len] = 0;
 					}
+					temi_loc.external_URL = URL;
+
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d AF Location descriptor found - URL %s\n", pid, URL));
+					if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_TEMI_LOCATION, &temi_loc);
 				}
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d AF Location descriptor found - URL %s\n", pid, URL));
-					break;
+				break;
 				case GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR:
+					if (ts->ess[pid] && (ts->ess[pid]->flags & GF_M2TS_ES_IS_PES)) {
+						GF_M2TS_PES *pes = (GF_M2TS_PES *) ts->ess[pid];
+						if (pes->temi_tc_desc_alloc_size < desc_len) {
+							pes->temi_tc_desc = gf_realloc(pes->temi_tc_desc, desc_len);
+							pes->temi_tc_desc_alloc_size = desc_len;
+						}
+						memcpy(pes->temi_tc_desc, desc, desc_len);
+						pes->temi_tc_desc_len = desc_len;
 
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d AF Timeline descriptor found\n", pid));
+						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d AF Timeline descriptor found\n", pid));
+					}
 					break;
 				}
 				gf_bs_del(bs);
@@ -2824,9 +3080,14 @@
 		return;
 	}
 //#if DEBUG_TS_PACKET
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Packet PID %d\n", hdr.pid));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Packet PID %d CC %d Encrypted %d\n", hdr.pid, hdr.continuity_counter, hdr.scrambling_ctrl));
 //#endif
 
+	if (hdr.scrambling_ctrl) {
+		//TODO add decyphering
+		return;
+	}
+
 	paf = NULL;
 	payload_size = 184;
 	pos = 4;
@@ -2860,7 +3121,7 @@
 		gf_m2ts_get_adaptation_field(ts, paf, data+5, af_size, hdr.pid);
 		payload_size = 0;
 		/*no payload and no PCR, return*/
-		if (! paf->PCR_flag) 
+		if (! paf->PCR_flag)
 			return;
 		break;
 	/*reserved*/
@@ -2883,7 +3144,7 @@
 		if (paf && paf->PCR_flag) {
 			if (!es) {
 				u32 i, j;
-				for(i=0;i<gf_list_count(ts->programs);i++){
+				for(i=0; i<gf_list_count(ts->programs); i++) {
 					GF_M2TS_Program *program = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
 					if(program->pcr_pid != hdr.pid) continue;
 					for (j=0; j<gf_list_count(program->streams); j++) {
@@ -2896,7 +3157,7 @@
 					break;
 				}
 				es = ts->ess[hdr.pid];
-			} 
+			}
 			if (es) {
 				GF_M2TS_PES_PCK pck;
 				memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
@@ -2905,9 +3166,13 @@
 				es->program->last_pcr_value_pck_number = ts->pck_number;
 				es->program->last_pcr_value = paf->PCR_base * 300 + paf->PCR_ext;
 				if (!es->program->last_pcr_value) es->program->last_pcr_value =  1;
+
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PCR found "LLU" ("LLU" at 90kHz) - PCR diff is %d us\n", es->program->last_pcr_value, es->program->last_pcr_value/300, (u32) (es->program->last_pcr_value - es->program->before_last_pcr_value)/27 ));
+
 				pck.PTS = es->program->last_pcr_value;
 				pck.stream = (GF_M2TS_PES *)es;
-				if (paf->discontinuity_indicator) pck.flags = GF_M2TS_PES_PCK_DISCONTINUITY;
+				if (paf->discontinuity_indicator)
+					pck.flags = GF_M2TS_PES_PCK_DISCONTINUITY;
 				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);
@@ -2993,7 +3258,7 @@
 			}
 			return GF_OK;
 		}
-		/*process*/		
+		/*process*/
 		gf_m2ts_process_packet(ts, (unsigned char *)ts->buffer+pos);
 		pos += 188;
 	}
@@ -3069,7 +3334,10 @@
 			pes->pes_len = pes->pes_end_packet_number = pes->pes_start_packet_number = 0;
 			if (pes->buf) gf_free(pes->buf);
 			pes->buf = NULL;
-			pes->buf_len = 0;
+			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;
+
 			pes->before_last_pcr_value = pes->before_last_pcr_value_pck_number = 0;
 			pes->last_pcr_value = pes->last_pcr_value_pck_number = 0;
 			if (pes->program->pcr_pid==pes->pid) {
@@ -3095,6 +3363,25 @@
 }
 
 GF_EXPORT
+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)
+				return GF_M2TS_PES_FRAMING_DEFAULT;
+
+		}
+		return GF_M2TS_PES_FRAMING_SKIP_NO_RESET;
+	}
+
+	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;
+}
+
+GF_EXPORT
 GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, u32 mode)
 {
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Setting pes framing mode of PID %d to %d\n", pes->pid, mode) );
@@ -3112,6 +3399,16 @@
 
 	if (pes->pid==pes->program->pmt_pid) return GF_BAD_PARAM;
 
+	//if component reuse, disable previous pes
+	if ((mode > GF_M2TS_PES_FRAMING_SKIP) && (pes->program->ts->ess[pes->pid] != (GF_M2TS_ES *) pes)) {
+		GF_M2TS_PES *o_pes = (GF_M2TS_PES *) pes->program->ts->ess[pes->pid];
+		if (o_pes->flags & GF_M2TS_ES_IS_PES)
+			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) );
+		pes->program->ts->ess[pes->pid] = (GF_M2TS_ES *) pes;
+	}
+
 	switch (mode) {
 	case GF_M2TS_PES_FRAMING_RAW:
 		pes->reframe = gf_m2ts_reframe_default;
@@ -3189,7 +3486,7 @@
 #endif
 
 	ts->requested_progs = gf_list_new();
-	ts->requested_pids = 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();
@@ -3198,7 +3495,7 @@
 }
 
 GF_EXPORT
-void gf_m2ts_demux_dmscc_init(GF_M2TS_Demuxer *ts){
+void gf_m2ts_demux_dmscc_init(GF_M2TS_Demuxer *ts) {
 
 	char* temp_dir;
 	u32 length;
@@ -3206,17 +3503,17 @@
 
 	ts->dsmcc_controler = gf_list_new();
 	ts->process_dmscc = 1;
-	
-	temp_dir = gf_get_default_cache_directory();														
+
+	temp_dir = gf_get_default_cache_directory();
 	length = (u32) strlen(temp_dir);
-	if(temp_dir[length-1] == GF_PATH_SEPARATOR){
+	if(temp_dir[length-1] == GF_PATH_SEPARATOR) {
 		temp_dir[length-1] = 0;
 	}
 
 	ts->dsmcc_root_dir = (char*)gf_calloc(strlen(temp_dir)+strlen("CarouselData")+2,sizeof(char));
 	sprintf(ts->dsmcc_root_dir,"%s%cCarouselData",temp_dir,GF_PATH_SEPARATOR);
 	e = gf_mkdir(ts->dsmcc_root_dir);
-	if(e){
+	if(e) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error during the creation of the directory %s \n",ts->dsmcc_root_dir));
 	}
 
@@ -3254,25 +3551,25 @@
 	if (ts->TDT_time) gf_free(ts->TDT_time);
 	gf_m2ts_reset_sdt(ts);
 	if (ts->tdt_tot)
-	gf_list_del(ts->SDTs);
+		gf_list_del(ts->SDTs);
 
 #ifdef GPAC_ENABLE_MPE
 	gf_dvb_mpe_shutdown(ts);
 #endif
 
-	if(gf_list_count(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_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_rmdir(dsmcc_overlord->root_dir);
 		gf_m2ts_delete_dsmcc_overlord(dsmcc_overlord);
-		if(ts->dsmcc_root_dir){
+		if(ts->dsmcc_root_dir) {
 			gf_free(ts->dsmcc_root_dir);
 		}
 #endif
 	}
 
-	while(gf_list_count(ts->ChannelAppList)){
+	while(gf_list_count(ts->ChannelAppList)) {
 #ifdef GPAC_ENABLE_DSMCC
 		GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo = (GF_M2TS_CHANNEL_APPLICATION_INFO*)gf_list_get(ts->ChannelAppList,0);
 		gf_m2ts_delete_channel_application_info(ChanAppInfo);
@@ -3293,6 +3590,8 @@
 
 	if (ts->th)
 		gf_th_del(ts->th);
+
+	if (ts->socket_url) gf_free(ts->socket_url);
 	gf_free(ts);
 }
 
@@ -3303,6 +3602,11 @@
 #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)
@@ -3320,8 +3624,8 @@
 		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) 
+		}
+		if (refresh_type==0)
 			ts->pos_in_stream = 0;
 
 		//resume where we left
@@ -3331,10 +3635,10 @@
 		remain = (size % 188);
 		size -= remain;
 
-		/*process chunk*/			
+		/*process chunk*/
 		e = gf_m2ts_process_data(ts, mem_address, size);
 
-		if (refresh_type==2) 
+		if (refresh_type==2)
 			ts->pos_in_stream = 0;
 		else
 			ts->pos_in_stream += size;
@@ -3343,7 +3647,7 @@
 		char data[188000];
 
 		f = gf_f64_open(fileName, "rb");
-	
+
 		if (!f) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", fileName));
 			return GF_URL_ERROR;
@@ -3364,8 +3668,8 @@
 			u32 to_read = 188000;
 			Bool done = 0;
 			u64 avail = gf_bs_available(bs);
-			
-			if (avail < 188) 
+
+			if (avail < 188)
 				break;
 
 			if (end_byterange && (read + to_read > end_byterange)) {
@@ -3393,7 +3697,7 @@
 		} else {
 			ts->pos_in_stream = gf_bs_get_position(bs);
 		}
-	
+
 		gf_bs_del(bs);
 		fclose(f);
 
@@ -3405,7 +3709,7 @@
 				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]);
-				} 
+				}
 			}
 		}
 	}
@@ -3426,159 +3730,176 @@
 	GF_M2TS_Demuxer *ts = _p;
 
 	gf_m2ts_reset_parsers(ts);
-	
+
+	//recreate the socket if needed
+	if (ts->socket_url && !ts->sock) {
+		gf_m2ts_get_socket(ts->socket_url, ts->network_type, UDP_BUFFER_SIZE, &ts->sock);
+	}
+
 #ifdef GPAC_HAS_LINUX_DVB
 	if (ts->tuner) {
+		s32 ts_size;
 		// in case of DVB
 		while (ts->run_state) {
-			s32 ts_size = read(ts->tuner->ts_fd, dvbts, DVB_BUFFER_SIZE);
+			if (ts->paused) {
+				gf_sleep(1);
+				continue;
+			}
+
+			ts_size = read(ts->tuner->ts_fd, dvbts, DVB_BUFFER_SIZE);
 			if (ts_size>0) gf_m2ts_process_data(ts, dvbts, (u32) ts_size);
 		}
 	} else
 #endif
-	if (ts->sock) {
+		if (ts->sock) {
 #ifndef GPAC_DISABLE_STREAMING
-		u16 seq_num;
-		GF_RTPReorder *ch = NULL;
+			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_f64_open(ts->record_to, "wb");
-		
-		first_run = 1;
-		is_rtp = 0;
-		while (ts->run_state) {
-			size = 0;
-			/*m2ts chunks by chunks*/
-			e = gf_sk_receive(ts->sock, data, UDP_BUFFER_SIZE, 0, &size);
-			if (!size || e) {
-				nb_empty++;
-				if (nb_empty==1000) {
+			u32 nb_empty=0;
+			Bool first_run, is_rtp;
+			FILE *record_to = NULL;
+			if (ts->record_to)
+				record_to = gf_f64_open(ts->record_to, "wb");
+
+			first_run = 1;
+			is_rtp = 0;
+			while (ts->run_state) {
+				if (ts->paused) {
 					gf_sleep(1);
-					nb_empty=0;
+					continue;
 				}
-				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;
+				size = 0;
+				/*m2ts chunks by chunks*/
+				e = gf_sk_receive(ts->sock, data, 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);
+						ch = gf_rtp_reorderer_new(100, 500);
 #endif
+					}
 				}
-			}
-			/*process chunk*/
-			if (is_rtp) {
+				/*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);
-				}
+					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);
+					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);
+				} else {
+					gf_m2ts_process_data(ts, data, size);
+					if (record_to)
+						fwrite(data, size, 1, record_to);
+				}
 			}
-		}
-		if (record_to)
-			fclose(record_to);
+			if (record_to)
+				fclose(record_to);
 
 #ifndef GPAC_DISABLE_STREAMING
-		if (ch)
-			gf_rtp_reorderer_del(ch);
+			if (ch)
+				gf_rtp_reorderer_del(ch);
 #endif
 
-	} 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->sock) 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);
+			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);
 
-		while (ts->run_state && gf_bs_available(ts_bs) && !ts->force_file_refresh) {
+			gf_bs_seek(ts_bs, 0);
 
-			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;
+			while (ts->run_state && gf_bs_available(ts_bs) && !ts->force_file_refresh) {
 
-				if (pos>=ts->file_size) {
-					pos = 0;
+				if (ts->paused) {
+					gf_sleep(1);
+					continue;
 				}
-				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"));
+				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);
+				}
 			}
-			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++;
-
-			//gf_sleep(0);
-			/*if asked to regulate, wait until we get a play request*/
-			while (ts->run_state && !ts->nb_playing && (ts->file_regulate==1)) {
-				gf_sleep(50);
-				continue;
-			}
+			ts->force_file_refresh = 0;
 
-            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;
+			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"));
@@ -3587,6 +3908,7 @@
 	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)
 {
@@ -3609,7 +3931,7 @@
 	url += 3;
 
 	*out_socket = gf_sk_new(sock_type);
-	if (! (*out_socket) ) { 
+	if (! (*out_socket) ) {
 		return GF_IO_ERR;
 	}
 
@@ -3649,6 +3971,9 @@
 	e = gf_m2ts_get_socket(url, ts->network_type, 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);
 
@@ -3663,7 +3988,7 @@
 	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];
+	     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;
@@ -3759,16 +4084,16 @@
 	sprintf(dvr_name, "/dev/dvb/adapter%d/dvr0", adapter_num);
 
 	// Open frontend
-	if((front1 = open(frontend_name,O_RDWR|O_NONBLOCK)) < 0){
+	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;
+		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){
+	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;
+		return GF_IO_ERR;
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Demux %s opened.\n", demux_name));
 	}
@@ -3783,8 +4108,8 @@
 	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;
+	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
@@ -3792,13 +4117,13 @@
 	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;
+	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;
 	}
-  /* 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;
 }
 
@@ -3885,9 +4210,9 @@
 			ts->ts_data_chunk = mem_address;
 		} else {
 
-			ts->file = gf_f64_open(url, "rb"); 
+			ts->file = gf_f64_open(url, "rb");
 			if (!ts->file) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] Could not open TS file: %s\n", url));		
+				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);
@@ -3900,7 +4225,6 @@
 
 	/* reinitialization for seek */
 	ts->end_range = ts->start_range = 0;
-	ts->nb_playing = 0;	
 	return  gf_m2ts_demuxer_play(ts);
 
 }
@@ -3910,17 +4234,15 @@
 {
 	char szURL[2048];
 	char *frag;
-	
-	ts->file_regulate = 0;
 	ts->duration = 0;
 
-    if(loop == 1){
-      ts->loop_demux = 1;
-      GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Loop Mode activated \n"));
-    }
+	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);
+		return gf_m2ts_demuxer_setup_file(ts, NULL);
 	}
 
 	strcpy(szURL, url);
@@ -3928,9 +4250,9 @@
 	if (frag) frag[0] = 0;
 
 	if (!strnicmp(url, "udp://", 6)
-		|| !strnicmp(url, "mpegts-udp://", 13)
-		|| !strnicmp(url, "mpegts-tcp://", 13)
-		) {
+	        || !strnicmp(url, "mpegts-udp://", 13)
+	        || !strnicmp(url, "mpegts-tcp://", 13)
+	   ) {
 		return gf_m2ts_demuxer_setup_live(ts, (char *) szURL);
 	}
 #ifdef GPAC_HAS_LINUX_DVB
@@ -3939,7 +4261,7 @@
 	}
 #endif
 	else {
-	  return gf_m2ts_demuxer_setup_file(ts, (char *) szURL);
+		return gf_m2ts_demuxer_setup_file(ts, (char *) szURL);
 	}
 
 	return GF_NOT_SUPPORTED;
@@ -3966,15 +4288,16 @@
 }
 
 GF_EXPORT
-GF_Err gf_m2ts_demuxer_play(GF_M2TS_Demuxer *ts){
+GF_Err gf_m2ts_demuxer_play(GF_M2TS_Demuxer *ts)
+{
 
 	/*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){
+	if(ts->th) {
 		/*start playing for tune-in*/
 		return gf_th_run(ts->th, gf_m2ts_demuxer_run, ts);
-	}else{
+	} else {
 		return gf_m2ts_demuxer_run(ts);
 	}
 
@@ -3992,7 +4315,7 @@
 		u8 *mem_address;
 		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
 			return GF_FALSE;
-		} 
+		}
 		while (size>188 && count) {
 			if (mem_address[0] != 0x47)
 				return 0;
@@ -4012,7 +4335,7 @@
 		}
 		if (buf[0] != 0x47)
 			break;
-		if (read<188) 
+		if (read<188)
 			count = 0;
 		else count--;
 	}
@@ -4038,7 +4361,7 @@
 	if (_TS < (u64) -ts_shift) _TS = pcr_mod + _TS + ts_shift; \
 	else _TS = _TS + ts_shift; \
 	while (_TS > pcr_mod) _TS -= pcr_mod; \
-
+ 
 
 GF_Err gf_m2ts_restamp(char *buffer, u32 size, s64 ts_shift, u8 *is_pes)
 {
@@ -4123,7 +4446,7 @@
 		} else {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS Restamp] PID %4d: Wrong PES not beginning with start code\n", pid));
 		}
-		done+=188;	
+		done+=188;
 	}
 	return GF_OK;
 }

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/reedsolomon.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/reedsolomon.c Changed

@@ -1,18 +1,18 @@
 /*****************************
- * 
+ *
  *
  * Multiplication and Arithmetic on Galois Field GF(256)
  *
  * From Mee, Daniel, "Magnetic Recording, Volume III", Ch. 5 by Patel.
- * 
+ *
  * (c) 1991 Henry Minsky
  *
  *
  ******************************/
- 
- 
-#include <stdio.h>  
-#include <ctype.h>  
+
+
+#include <stdio.h>
+#include <ctype.h>
 #include <gpac/tools.h>
 #include <gpac/internal/reedsolomon.h>
 
@@ -23,7 +23,7 @@
  * of degree 8 and cycle length 255. (Ch 5, pp. 275, Magnetic Recording)
  * The high order 1 bit is implicit */
 /* x^8 + x^4 + x^3 + x^2 + 1 */
-#define PPOLY 0x1D 
+#define PPOLY 0x1D
 
 
 int gexp[512];
@@ -35,63 +35,63 @@
 
 void
 init_galois_tables (void)
-{	
-  /* initialize the table of powers of alpha */
-  init_exp_table();
+{
+	/* initialize the table of powers of alpha */
+	init_exp_table();
 }
 
 
 static void
 init_exp_table (void)
 {
-  int i, z;
-  int pinit,p1,p2,p3,p4,p5,p6,p7,p8;
-
-  pinit = p2 = p3 = p4 = p5 = p6 = p7 = p8 = 0;
-  p1 = 1;
-	
-  gexp[0] = 1;
-  gexp[255] = gexp[0];
-  glog[0] = 0;			/* shouldn't log[0] be an error? */
-	
-  for (i = 1; i < 256; i++) {
-    pinit = p8;
-    p8 = p7;
-    p7 = p6;
-    p6 = p5;
-    p5 = p4 ^ pinit;
-    p4 = p3 ^ pinit;
-    p3 = p2 ^ pinit;
-    p2 = p1;
-    p1 = pinit;
-    gexp[i] = p1 + p2*2 + p3*4 + p4*8 + p5*16 + p6*32 + p7*64 + p8*128;
-    gexp[i+255] = gexp[i];
-  }
-	
-  for (i = 1; i < 256; i++) {
-    for (z = 0; z < 256; z++) {
-      if (gexp[z] == i) {
-	glog[i] = z;
-	break;
-      }
-    }
-  }
+	int i, z;
+	int pinit,p1,p2,p3,p4,p5,p6,p7,p8;
+
+	pinit = p2 = p3 = p4 = p5 = p6 = p7 = p8 = 0;
+	p1 = 1;
+
+	gexp[0] = 1;
+	gexp[255] = gexp[0];
+	glog[0] = 0;			/* shouldn't log[0] be an error? */
+
+	for (i = 1; i < 256; i++) {
+		pinit = p8;
+		p8 = p7;
+		p7 = p6;
+		p6 = p5;
+		p5 = p4 ^ pinit;
+		p4 = p3 ^ pinit;
+		p3 = p2 ^ pinit;
+		p2 = p1;
+		p1 = pinit;
+		gexp[i] = p1 + p2*2 + p3*4 + p4*8 + p5*16 + p6*32 + p7*64 + p8*128;
+		gexp[i+255] = gexp[i];
+	}
+
+	for (i = 1; i < 256; i++) {
+		for (z = 0; z < 256; z++) {
+			if (gexp[z] == i) {
+				glog[i] = z;
+				break;
+			}
+		}
+	}
 }
 
 /* multiplication using logarithms */
 int gmult(int a, int b)
 {
-  int i,j;
-  if (a==0 || b == 0) return (0);
-  i = glog[a];
-  j = glog[b];
-  return (gexp[i+j]);
+	int i,j;
+	if (a==0 || b == 0) return (0);
+	i = glog[a];
+	j = glog[b];
+	return (gexp[i+j]);
 }
-		
 
-int ginv (int elt) 
-{ 
-  return (gexp[255-glog[elt]]);
+
+int ginv (int elt)
+{
+	return (gexp[255-glog[elt]]);
 }
 
 
@@ -135,65 +135,66 @@
 /* From  Cain, Clark, "Error-Correction Coding For Digital Communications", pp. 216. */
 void
 Modified_Berlekamp_Massey (void)
-{	
-  int n, L, L2, k, d, i;
-  int psi[MAXDEG], psi2[MAXDEG], D[MAXDEG];
-  int gamma[MAXDEG];
-	
-  /* initialize Gamma, the erasure locator polynomial */
-  init_gamma(gamma);
-
-  /* initialize to z */
-  copy_poly(D, gamma);
-  mul_z_poly(D);
-	
-  copy_poly(psi, gamma);	
-  k = -1; L = NErasures;
-	
-  for (n = NErasures; n < NPAR; n++) {
-	
-    d = compute_discrepancy(psi, synBytes, L, n);
-		
-    if (d != 0) {
-		
-      /* psi2 = psi - d*D */
-      for (i = 0; i < MAXDEG; i++) psi2[i] = psi[i] ^ gmult(d, D[i]);
-		
-		
-      if (L < (n-k)) {
-	L2 = n-k;
-	k = n-L;
-	/* D = scale_poly(ginv(d), psi); */
-	for (i = 0; i < MAXDEG; i++) D[i] = gmult(psi[i], ginv(d));
-	L = L2;
-      }
-			
-      /* psi = psi2 */
-      for (i = 0; i < MAXDEG; i++) psi[i] = psi2[i];
-    }
-		
-    mul_z_poly(D);
-  }
-	
-  for(i = 0; i < MAXDEG; i++) Lambda[i] = psi[i];
-  compute_modified_omega();
-
-	
+{
+	int n, L, L2, k, d, i;
+	int psi[MAXDEG], psi2[MAXDEG], D[MAXDEG];
+	int gamma[MAXDEG];
+
+	/* initialize Gamma, the erasure locator polynomial */
+	init_gamma(gamma);
+
+	/* initialize to z */
+	copy_poly(D, gamma);
+	mul_z_poly(D);
+
+	copy_poly(psi, gamma);
+	k = -1;
+	L = NErasures;
+
+	for (n = NErasures; n < NPAR; n++) {
+
+		d = compute_discrepancy(psi, synBytes, L, n);
+
+		if (d != 0) {
+
+			/* psi2 = psi - d*D */
+			for (i = 0; i < MAXDEG; i++) psi2[i] = psi[i] ^ gmult(d, D[i]);
+
+
+			if (L < (n-k)) {
+				L2 = n-k;
+				k = n-L;
+				/* D = scale_poly(ginv(d), psi); */
+				for (i = 0; i < MAXDEG; i++) D[i] = gmult(psi[i], ginv(d));
+				L = L2;
+			}
+
+			/* psi = psi2 */
+			for (i = 0; i < MAXDEG; i++) psi[i] = psi2[i];
+		}
+
+		mul_z_poly(D);
+	}
+
+	for(i = 0; i < MAXDEG; i++) Lambda[i] = psi[i];
+	compute_modified_omega();
+
+
 }
 
 /* given Psi (called Lambda in Modified_Berlekamp_Massey) and synBytes,
-   compute the combined erasure/error evaluator polynomial as 
+   compute the combined erasure/error evaluator polynomial as
    Psi*S mod z^4
   */
 void
 compute_modified_omega ()
 {
-  int i;
-  int product[MAXDEG*2];
-	
-  mult_polys(product, Lambda, synBytes);	
-  zero_poly(Omega);
-  for(i = 0; i < NPAR; i++) Omega[i] = product[i];
+	int i;
+	int product[MAXDEG*2];
+
+	mult_polys(product, Lambda, synBytes);
+	zero_poly(Omega);
+	for(i = 0; i < NPAR; i++) Omega[i] = product[i];
 
 }
 
@@ -201,374 +202,375 @@
 void
 mult_polys (int dst[], int p1[], int p2[])
 {
-  int i, j;
-  int tmp1[MAXDEG*2];
-	
-  for (i=0; i < (MAXDEG*2); i++) dst[i] = 0;
-	
-  for (i = 0; i < MAXDEG; i++) {
-    for(j=MAXDEG; j<(MAXDEG*2); j++) tmp1[j]=0;
-		
-    /* scale tmp1 by p1[i] */
-    for(j=0; j<MAXDEG; j++) tmp1[j]=gmult(p2[j], p1[i]);
-    /* and mult (shift) tmp1 right by i */
-    for (j = (MAXDEG*2)-1; j >= i; j--) tmp1[j] = tmp1[j-i];
-    for (j = 0; j < i; j++) tmp1[j] = 0;
-		
-    /* add into partial product */
-    for(j=0; j < (MAXDEG*2); j++) dst[j] ^= tmp1[j];
-  }
+	int i, j;
+	int tmp1[MAXDEG*2];
+
+	for (i=0; i < (MAXDEG*2); i++) dst[i] = 0;
+
+	for (i = 0; i < MAXDEG; i++) {
+		for(j=MAXDEG; j<(MAXDEG*2); j++) tmp1[j]=0;
+
+		/* scale tmp1 by p1[i] */
+		for(j=0; j<MAXDEG; j++) tmp1[j]=gmult(p2[j], p1[i]);
+		/* and mult (shift) tmp1 right by i */
+		for (j = (MAXDEG*2)-1; j >= i; j--) tmp1[j] = tmp1[j-i];
+		for (j = 0; j < i; j++) tmp1[j] = 0;
+
+		/* add into partial product */
+		for(j=0; j < (MAXDEG*2); j++) dst[j] ^= tmp1[j];
+	}
 }
 
 
-	
+
 /* gamma = product (1-z*a^Ij) for erasure locs Ij */
 void
 init_gamma (int gamma[])
 {
-  int e, tmp[MAXDEG];
-	
-  zero_poly(gamma);
-  zero_poly(tmp);
-  gamma[0] = 1;
-	
-  for (e = 0; e < NErasures; e++) {
-    copy_poly(tmp, gamma);
-    scale_poly(gexp[ErasureLocs[e]], tmp);
-    mul_z_poly(tmp);
-    add_polys(gamma, tmp);
-  }
+	int e, tmp[MAXDEG];
+
+	zero_poly(gamma);
+	zero_poly(tmp);
+	gamma[0] = 1;
+
+	for (e = 0; e < NErasures; e++) {
+		copy_poly(tmp, gamma);
+		scale_poly(gexp[ErasureLocs[e]], tmp);
+		mul_z_poly(tmp);
+		add_polys(gamma, tmp);
+	}
 }
-	
-	
-	
-void 
+
+
+
+void
 compute_next_omega (int d, int A[], int dst[], int src[])
 {
-  int i;
-  for ( i = 0; i < MAXDEG;  i++) {
-    dst[i] = src[i] ^ gmult(d, A[i]);
-  }
+	int i;
+	for ( i = 0; i < MAXDEG;  i++) {
+		dst[i] = src[i] ^ gmult(d, A[i]);
+	}
 }
-	
+
 
 
 int
 compute_discrepancy (int lambda[], int S[], int L, int n)
 {
-  int i, sum=0;
-	
-  for (i = 0; i <= L; i++) 
-    sum ^= gmult(lambda[i], S[n-i]);
-  return (sum);
+	int i, sum=0;
+
+	for (i = 0; i <= L; i++)
+		sum ^= gmult(lambda[i], S[n-i]);
+	return (sum);
 }
 
 /********** polynomial arithmetic *******************/
 
-void add_polys (int dst[], int src[]) 
+void add_polys (int dst[], int src[])
 {
-  int i;
-  for (i = 0; i < MAXDEG; i++) dst[i] ^= src[i];
+	int i;
+	for (i = 0; i < MAXDEG; i++) dst[i] ^= src[i];
 }
 
-void copy_poly (int dst[], int src[]) 
+void copy_poly (int dst[], int src[])
 {
-  int i;
-  for (i = 0; i < MAXDEG; i++) dst[i] = src[i];
+	int i;
+	for (i = 0; i < MAXDEG; i++) dst[i] = src[i];
 }
 
-void scale_poly (int k, int poly[]) 
-{	
-  int i;
-  for (i = 0; i < MAXDEG; i++) poly[i] = gmult(k, poly[i]);
+void scale_poly (int k, int poly[])
+{
+	int i;
+	for (i = 0; i < MAXDEG; i++) poly[i] = gmult(k, poly[i]);
 }
 
 
-void zero_poly (int poly[]) 
+void zero_poly (int poly[])
 {
-  int i;
-  for (i = 0; i < MAXDEG; i++) poly[i] = 0;
+	int i;
+	for (i = 0; i < MAXDEG; i++) poly[i] = 0;
 }
 
 
 /* multiply by z, i.e., shift right by 1 */
 static void mul_z_poly (int src[])
 {
-  int i;
-  for (i = MAXDEG-1; i > 0; i--) src[i] = src[i-1];
-  src[0] = 0;
+	int i;
+	for (i = MAXDEG-1; i > 0; i--) src[i] = src[i-1];
+	src[0] = 0;
 }
 
 
 /* Finds all the roots of an error-locator polynomial with coefficients
- * Lambda[j] by evaluating Lambda at successive values of alpha. 
- * 
+ * Lambda[j] by evaluating Lambda at successive values of alpha.
+ *
  * This can be tested with the decoder's equations case.
  */
 
 
-void 
+void
 Find_Roots (void)
 {
-  int sum, r, k;	
-  NErrors = 0;
-  
-  for (r = 1; r < 256; r++) {
-    sum = 0;
-    /* evaluate lambda at r */
-    for (k = 0; k < NPAR+1; k++) {
-      sum ^= gmult(gexp[(k*r)%255], Lambda[k]);
-    }
-    if (sum == 0) 
-      { 
-	ErrorLocs[NErrors] = (255-r); NErrors++; 
-	if (RS_DEBUG) fprintf(stderr, "Root found at r = %d, (255-r) = %d\n", r, (255-r));
-      }
-  }
+	int sum, r, k;
+	NErrors = 0;
+
+	for (r = 1; r < 256; r++) {
+		sum = 0;
+		/* evaluate lambda at r */
+		for (k = 0; k < NPAR+1; k++) {
+			sum ^= gmult(gexp[(k*r)%255], Lambda[k]);
+		}
+		if (sum == 0)
+		{
+			ErrorLocs[NErrors] = (255-r);
+			NErrors++;
+			if (RS_DEBUG) fprintf(stderr, "Root found at r = %d, (255-r) = %d\n", r, (255-r));
+		}
+	}
 }
 
-/* Combined Erasure And Error Magnitude Computation 
- * 
+/* Combined Erasure And Error Magnitude Computation
+ *
  * Pass in the codeword, its size in bytes, as well as
  * an array of any known erasure locations, along the number
  * of these erasures.
- * 
+ *
  * Evaluate Omega(actually Psi)/Lambda' at the roots
- * alpha^(-i) for error locs i. 
+ * alpha^(-i) for error locs i.
  *
  * Returns 1 if everything ok, or 0 if an out-of-bounds error is found
  *
  */
 
 int
-correct_errors_erasures (unsigned char codeword[], 
-			 int csize,
-			 int nerasures,
-			 int erasures[])
+correct_errors_erasures (unsigned char codeword[],
+                         int csize,
+                         int nerasures,
+                         int erasures[])
 {
-  int r, i, j, err;
-
-  /* If you want to take advantage of erasure correction, be sure to
-     set NErasures and ErasureLocs[] with the locations of erasures. 
-     */
-  NErasures = nerasures;
-  for (i = 0; i < NErasures; i++) ErasureLocs[i] = erasures[i];
-
-  Modified_Berlekamp_Massey();
-  Find_Roots();
-  
-
-  if ((NErrors <= NPAR) && NErrors > 0) { 
-
-    /* first check for illegal error locs */
-    for (r = 0; r < NErrors; r++) {
-      if (ErrorLocs[r] >= csize) {
-	if (RS_DEBUG) fprintf(stderr, "Error loc i=%d outside of codeword length %d\n", i, csize);
-	return(0);
-      }
-    }
-
-    for (r = 0; r < NErrors; r++) {
-      int num, denom;
-      i = ErrorLocs[r];
-      /* evaluate Omega at alpha^(-i) */
-
-      num = 0;
-      for (j = 0; j < MAXDEG; j++) 
-	num ^= gmult(Omega[j], gexp[((255-i)*j)%255]);
-      
-      /* evaluate Lambda' (derivative) at alpha^(-i) ; all odd powers disappear */
-      denom = 0;
-      for (j = 1; j < MAXDEG; j += 2) {
-	denom ^= gmult(Lambda[j], gexp[((255-i)*(j-1)) % 255]);
-      }
-      
-      err = gmult(num, ginv(denom));
-      if (RS_DEBUG) fprintf(stderr, "Error magnitude %#x at loc %d\n", err, csize-i);
-      
-      codeword[csize-i-1] ^= err;
-    }
-    return(1);
-  }
-  else {
-    if (RS_DEBUG && NErrors) fprintf(stderr, "Uncorrectable codeword\n");
-    return(0);
-  }
+	int r, i, j, err;
+
+	/* If you want to take advantage of erasure correction, be sure to
+	   set NErasures and ErasureLocs[] with the locations of erasures.
+	   */
+	NErasures = nerasures;
+	for (i = 0; i < NErasures; i++) ErasureLocs[i] = erasures[i];
+
+	Modified_Berlekamp_Massey();
+	Find_Roots();
+
+
+	if ((NErrors <= NPAR) && NErrors > 0) {
+
+		/* first check for illegal error locs */
+		for (r = 0; r < NErrors; r++) {
+			if (ErrorLocs[r] >= csize) {
+				if (RS_DEBUG) fprintf(stderr, "Error loc i=%d outside of codeword length %d\n", i, csize);
+				return(0);
+			}
+		}
+
+		for (r = 0; r < NErrors; r++) {
+			int num, denom;
+			i = ErrorLocs[r];
+			/* evaluate Omega at alpha^(-i) */
+
+			num = 0;
+			for (j = 0; j < MAXDEG; j++)
+				num ^= gmult(Omega[j], gexp[((255-i)*j)%255]);
+
+			/* evaluate Lambda' (derivative) at alpha^(-i) ; all odd powers disappear */
+			denom = 0;
+			for (j = 1; j < MAXDEG; j += 2) {
+				denom ^= gmult(Lambda[j], gexp[((255-i)*(j-1)) % 255]);
+			}
+
+			err = gmult(num, ginv(denom));
+			if (RS_DEBUG) fprintf(stderr, "Error magnitude %#x at loc %d\n", err, csize-i);
+
+			codeword[csize-i-1] ^= err;
+		}
+		return(1);
+	}
+	else {
+		if (RS_DEBUG && NErrors) fprintf(stderr, "Uncorrectable codeword\n");
+		return(0);
+	}
 }
 
 
 
- /*  
-  * Reed Solomon Encoder/Decoder  
-  * 
-  * (c) Henry Minsky (hqm@ua.com), Universal Access 1991-1995 
-  */  
-   
- /* Encoder parity bytes */  
- int pBytes[MAXDEG];  
-   
- /* Decoder syndrome bytes */  
- int synBytes[MAXDEG];  
-   
- /* generator polynomial */  
- int genPoly[MAXDEG*2];  
-   
- int RS_DEBUG = FALSE;  
-   
- static void  
- compute_genpoly (int nbytes, int genpoly[]);  
-   
- /* Initialize lookup tables, polynomials, etc. */  
- void  
- initialize_ecc ()  
- {  
-   /* Initialize the galois field arithmetic tables */  
-     init_galois_tables();  
-   
-     /* Compute the encoder generator polynomial */  
-     compute_genpoly(NPAR, genPoly);  
- }  
-   
- void  
- zero_fill_from (unsigned char buf[], int from, int to)  
- {  
-   int i;  
-   for (i = from; i < to; i++) buf[i] = 0;  
- }  
-   
- /* debugging routines */  
- void  
- print_parity (void)  
- {   
-   int i;  
-   fprintf(stderr, "Parity Bytes: ");  
-   for (i = 0; i < NPAR; i++)   
-     fprintf(stderr, "[%d]:%x, ",i,pBytes[i]);  
-   fprintf(stderr, "\n");  
- }  
-   
-   
- void  
- print_syndrome (void)  
- {   
-   int i;  
-   fprintf(stderr, "Syndrome Bytes: ");  
-   for (i = 0; i < NPAR; i++)   
-     fprintf(stderr, "[%d]:%x, ",i,synBytes[i]);  
-   fprintf(stderr, "\n");  
- }  
-   
- /* Append the parity bytes onto the end of the message */  
- void  
- build_codeword (unsigned char msg[], int nbytes, unsigned char dst[])  
- {  
-   int i;  
-       
-   for (i = 0; i < nbytes; i++) dst[i] = msg[i];  
-       
-   for (i = 0; i < NPAR; i++) {  
-     dst[i+nbytes] = pBytes[NPAR-1-i];  
-   }  
- }  
-       
- /********************************************************** 
-  * Reed Solomon Decoder  
-  * 
-  * Computes the syndrome of a codeword. Puts the results 
-  * into the synBytes[] array. 
-  */  
-    
- void  
- decode_data(unsigned char data[], int nbytes)  
- {  
-   int i, j, sum;  
-   for (j = 0; j < NPAR;  j++) {  
-     sum = 0;  
-     for (i = 0; i < nbytes; i++) {  
-       sum = data[i] ^ gmult(gexp[j+1], sum);  
-     }  
-     synBytes[j]  = sum;  
-   }  
- }  
-   
-   
- /* Check if the syndrome is zero */  
- int  
- check_syndrome (void)  
- {  
-   int i, nz = 0;  
-   for (i =0 ; i < NPAR; i++) {  
-     if (synBytes[i] != 0) nz = 1;  
-   }  
-   return nz;  
- }  
-   
-   
- void  
- debug_check_syndrome (void)  
- {     
-   int i;  
-       
-   for (i = 0; i < 3; i++) {  
-     fprintf(stderr, " inv log S[%d]/S[%d] = %d\n", i, i+1,   
-        glog[gmult(synBytes[i], ginv(synBytes[i+1]))]);  
-   }  
- }  
-   
-   
- /* Create a generator polynomial for an n byte RS code.  
-  * The coefficients are returned in the genPoly arg. 
-  * Make sure that the genPoly array which is passed in is  
-  * at least n+1 bytes long. 
-  */  
-   
- static void  
- compute_genpoly (int nbytes, int genpoly[])  
- {  
-   int i, tp[256], tp1[256];  
-       
-   /* multiply (x + a^n) for n = 1 to nbytes */  
-   
-   zero_poly(tp1);  
-   tp1[0] = 1;  
-   
-   for (i = 1; i <= nbytes; i++) {  
-     zero_poly(tp);  
-     tp[0] = gexp[i];        /* set up x+a^n */  
-     tp[1] = 1;  
-         
-     mult_polys(genpoly, tp, tp1);  
-     copy_poly(tp1, genpoly);  
-   }  
- }  
-   
- /* Simulate a LFSR with generator polynomial for n byte RS code.  
-  * Pass in a pointer to the data array, and amount of data.  
-  * 
-  * The parity bytes are deposited into pBytes[], and the whole message 
-  * and parity are copied to dest to make a codeword. 
-  *  
-  */  
-   
- void  
- encode_data (unsigned char msg[], int nbytes, unsigned char dst[])  
- {  
-   int i, LFSR[NPAR+1],dbyte, j;  
-       
-   for(i=0; i < NPAR+1; i++) LFSR[i]=0;  
-   
-   for (i = 0; i < nbytes; i++) {  
-     dbyte = msg[i] ^ LFSR[NPAR-1];  
-     for (j = NPAR-1; j > 0; j--) {  
-       LFSR[j] = LFSR[j-1] ^ gmult(genPoly[j], dbyte);  
-     }  
-     LFSR[0] = gmult(genPoly[0], dbyte);  
-   }  
-   
-   for (i = 0; i < NPAR; i++)   
-     pBytes[i] = LFSR[i];  
-       
-   build_codeword(msg, nbytes, dst);  
- }
-
- #endif //GPAC_ENABLE_MPE
+/*
+ * Reed Solomon Encoder/Decoder
+ *
+ * (c) Henry Minsky (hqm@ua.com), Universal Access 1991-1995
+ */
+
+/* Encoder parity bytes */
+int pBytes[MAXDEG];
+
+/* Decoder syndrome bytes */
+int synBytes[MAXDEG];
+
+/* generator polynomial */
+int genPoly[MAXDEG*2];
+
+int RS_DEBUG = FALSE;
+
+static void
+compute_genpoly (int nbytes, int genpoly[]);
+
+/* Initialize lookup tables, polynomials, etc. */
+void
+initialize_ecc ()
+{
+	/* Initialize the galois field arithmetic tables */
+	init_galois_tables();
+
+	/* Compute the encoder generator polynomial */
+	compute_genpoly(NPAR, genPoly);
+}
+
+void
+zero_fill_from (unsigned char buf[], int from, int to)
+{
+	int i;
+	for (i = from; i < to; i++) buf[i] = 0;
+}
+
+/* debugging routines */
+void
+print_parity (void)
+{
+	int i;
+	fprintf(stderr, "Parity Bytes: ");
+	for (i = 0; i < NPAR; i++)
+		fprintf(stderr, "[%d]:%x, ",i,pBytes[i]);
+	fprintf(stderr, "\n");
+}
+
+
+void
+print_syndrome (void)
+{
+	int i;
+	fprintf(stderr, "Syndrome Bytes: ");
+	for (i = 0; i < NPAR; i++)
+		fprintf(stderr, "[%d]:%x, ",i,synBytes[i]);
+	fprintf(stderr, "\n");
+}
+
+/* Append the parity bytes onto the end of the message */
+void
+build_codeword (unsigned char msg[], int nbytes, unsigned char dst[])
+{
+	int i;
+
+	for (i = 0; i < nbytes; i++) dst[i] = msg[i];
+
+	for (i = 0; i < NPAR; i++) {
+		dst[i+nbytes] = pBytes[NPAR-1-i];
+	}
+}
+
+/**********************************************************
+ * Reed Solomon Decoder
+ *
+ * Computes the syndrome of a codeword. Puts the results
+ * into the synBytes[] array.
+ */
+
+void
+decode_data(unsigned char data[], int nbytes)
+{
+	int i, j, sum;
+	for (j = 0; j < NPAR;  j++) {
+		sum = 0;
+		for (i = 0; i < nbytes; i++) {
+			sum = data[i] ^ gmult(gexp[j+1], sum);
+		}
+		synBytes[j]  = sum;
+	}
+}
+
+
+/* Check if the syndrome is zero */
+int
+check_syndrome (void)
+{
+	int i, nz = 0;
+	for (i =0 ; i < NPAR; i++) {
+		if (synBytes[i] != 0) nz = 1;
+	}
+	return nz;
+}
+
+
+void
+debug_check_syndrome (void)
+{
+	int i;
+
+	for (i = 0; i < 3; i++) {
+		fprintf(stderr, " inv log S[%d]/S[%d] = %d\n", i, i+1,
+		        glog[gmult(synBytes[i], ginv(synBytes[i+1]))]);
+	}
+}
+
+
+/* Create a generator polynomial for an n byte RS code.
+ * The coefficients are returned in the genPoly arg.
+ * Make sure that the genPoly array which is passed in is
+ * at least n+1 bytes long.
+ */
+
+static void
+compute_genpoly (int nbytes, int genpoly[])
+{
+	int i, tp[256], tp1[256];
+
+	/* multiply (x + a^n) for n = 1 to nbytes */
+
+	zero_poly(tp1);
+	tp1[0] = 1;
+
+	for (i = 1; i <= nbytes; i++) {
+		zero_poly(tp);
+		tp[0] = gexp[i];        /* set up x+a^n */
+		tp[1] = 1;
+
+		mult_polys(genpoly, tp, tp1);
+		copy_poly(tp1, genpoly);
+	}
+}
+
+/* Simulate a LFSR with generator polynomial for n byte RS code.
+ * Pass in a pointer to the data array, and amount of data.
+ *
+ * The parity bytes are deposited into pBytes[], and the whole message
+ * and parity are copied to dest to make a codeword.
+ *
+ */
+
+void
+encode_data (unsigned char msg[], int nbytes, unsigned char dst[])
+{
+	int i, LFSR[NPAR+1],dbyte, j;
+
+	for(i=0; i < NPAR+1; i++) LFSR[i]=0;
+
+	for (i = 0; i < nbytes; i++) {
+		dbyte = msg[i] ^ LFSR[NPAR-1];
+		for (j = NPAR-1; j > 0; j--) {
+			LFSR[j] = LFSR[j-1] ^ gmult(genPoly[j], dbyte);
+		}
+		LFSR[0] = gmult(genPoly[0], dbyte);
+	}
+
+	for (i = 0; i < NPAR; i++)
+		pBytes[i] = LFSR[i];
+
+	build_codeword(msg, nbytes, dst);
+}
+
+#endif //GPAC_ENABLE_MPE

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/saf.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/saf.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -198,7 +198,7 @@
 
 	*out_data = NULL;
 	*out_size = 0;
-	
+
 	gf_mx_p(mux->mx);
 	if (!force_end_of_session && (mux->state!=1)) {
 		gf_mx_v(mux->mx);
@@ -234,7 +234,7 @@
 			u32 len = (u32) strlen(str->remote_url);
 			gf_bs_write_u16(payload, len);
 			gf_bs_write_data(payload, str->remote_url, len);
-		} 
+		}
 		if (str->dsi) {
 			gf_bs_write_data(payload, str->dsi, str->dsi_len);
 		}
@@ -251,7 +251,7 @@
 		gf_bs_write_int(bs, dlen, 16);
 		gf_bs_write_data(bs, data, dlen);
 		gf_free(data);
-		
+
 		/*mark as signaled*/
 		str->state |= 1;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/text_import.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/text_import.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -29,6 +29,7 @@
 #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>
 
@@ -41,9 +42,9 @@
 	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,
+	GF_TEXT_IMPORT_WEBVTT,
+	GF_TEXT_IMPORT_TTML,
+	GF_TEXT_IMPORT_SWF_SVG,
 };
 
 #define REM_TRAIL_MARKS(__str, __sep) while (1) {	\
@@ -53,7 +54,7 @@
 		if (strchr(__sep, __str[_len])) __str[_len] = 0;	\
 		else break;	\
 	}	\
-
+ 
 
 s32 gf_text_get_utf_type(FILE *in_src)
 {
@@ -68,7 +69,7 @@
 		if (!BOM[2] && !BOM[3]) return -1;
 		gf_f64_seek(in_src, 2, SEEK_SET);
 		return 3;
-	} 
+	}
 	if ((BOM[0]==0xFE) && (BOM[1]==0xFF)) {
 		/*UTF32 not supported*/
 		if (!BOM[2] && !BOM[3]) return -1;
@@ -115,7 +116,7 @@
 		else if (!strnicmp(ext, ".ttml", 5)) *fmt = GF_TEXT_IMPORT_TTML;
 		ext = strstr(szLine, "?>");
 		if (ext) ext += 2;
-		if (!ext[0]){
+		if (!ext[0]) {
 			if (!fgets(szLine, 2048, test))
 				szLine[0] = '\0';
 		}
@@ -124,8 +125,8 @@
 		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_WEBVTT;
+	else if (strstr(szLine, " --> ") )
 		*fmt = GF_TEXT_IMPORT_SRT; /* might want to change the default to WebVTT */
 
 	fclose(test);
@@ -189,7 +190,7 @@
 	unsigned short *sptr;
 
 	memset(szLine, 0, sizeof(char)*lineSize);
-	sOK = fgets(szLine, lineSize, txt_in); 
+	sOK = fgets(szLine, lineSize, txt_in);
 	if (!sOK) return NULL;
 	if (unicode_type<=1) {
 		j=0;
@@ -204,18 +205,30 @@
 				}
 				/*UTF8 2 bytes char*/
 				else if ( (szLine[i] & 0xe0) == 0xc0) {
-					szLineConv[j] = szLine[i]; i++; j++;
-				} 
+					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++; 
-				} 
+					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++; 
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
 				} else {
 					i+=1;
 					continue;
@@ -249,7 +262,7 @@
 	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); 
+	if (unicode_type==3) fgetc(txt_in);
 	return sOK;
 }
 
@@ -266,9 +279,9 @@
 	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;
+	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;
+	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;
@@ -305,7 +318,7 @@
 		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) {
@@ -388,6 +401,8 @@
 	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;
@@ -404,46 +419,46 @@
 		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 (!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*prev_end)/1000);
-						s->IsRAP = 1;
+						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;
 					}
-					gf_isom_sample_del(&s);
+					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_f64_tell(srt_in), file_size);
+					if (duration && (end >= duration)) break;
 				}
-
-				s = gf_isom_text_to_sample(samp);
-				if (state<=2) {
-					s->DTS = (u64) ((timescale*start)/1000);
-					s->IsRAP = 1;
-					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_f64_tell(srt_in), file_size);
-				if (duration && (end >= duration)) break;
+				state = 0;
+				if (!sOK) break;
+				continue;
 			}
-			state = 0;
-			if (!sOK) break;
-			continue;
-		}
 
 		switch (state) {
 		case 0:
@@ -479,11 +494,11 @@
 				nb_samp++;
 			}
 			rec.style_flags = 0;
-			state = 2;			
+			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;			
+				state = 3;
 			}
 			break;
 
@@ -500,18 +515,71 @@
 			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;
+				if (_len == (size_t) -1) {
+					e = gf_import_message(import, GF_CORRUPTED_DATA, "Invalid UTF data (line %d)", curLine);
+					goto exit;
+				}
+				len = (u32) _len;
 			}
 			char_line = 0;
 			i=j=0;
 			rem_styles = 0;
+			rem_color = 0;
 			while (i<len) {
-				/*start of new style*/
+				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);
@@ -519,52 +587,77 @@
 						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; 
+					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; 
+					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; 
+					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+=3;
+					i += style_nb_chars;
 					continue;
 				}
 
 				/*end of prev style*/
-				if ( (uniLine[i]=='<') && (uniLine[i+1]=='/') && (uniLine[i+3]=='>')) {
+				if (style_def_type==2)  {
 					switch (uniLine[i+2]) {
-					case 'b': case 'B': 
-						rem_styles |= GF_TXT_STYLE_BOLD; 
+					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; 
+					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; 
+					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+=4;
+					i+=style_nb_chars;
 					continue;
 				}
 				/*store style*/
@@ -575,6 +668,8 @@
 					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];
@@ -618,40 +713,40 @@
 	return e;
 }
 
-/* Structure used to pass importer and track data to the parsers without exposing the GF_MediaImporter structure 
+/* 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_MediaImporter *import;
+	u32 timescale;
+	u32 track;
+	u32 descriptionIndex;
 } GF_ISOFlusher;
 
 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);
+	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);
+	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 = 1;
-        gf_isom_add_sample(flusher->import->dest, flusher->track, flusher->descriptionIndex, s);
-        gf_isom_sample_del(&s);
-    }
-    gf_webvtt_sample_del(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)
@@ -688,7 +783,7 @@
 		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)	{
@@ -722,96 +817,533 @@
 		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;
+	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;
 }
 
-static GF_Err gf_text_import_ttml(GF_MediaImporter *import)
+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, *body_node = NULL;
+	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &idx))) {
+		if (!strcmp(node->name, "body")) {
+			*sample_list_node = node;
+			body_num = gf_list_count(node->content);
+			while (body_num--) {
+				body_node = (GF_XMLNode*)gf_list_get(node->content, 0);
+				assert(gf_list_find(node->content, body_node) == 0);
+				gf_list_rem(node->content, 0);
+				gf_xml_dom_node_del(body_node);
+			}
+			return;
+		}
+	}
+}
+
+static GF_Err gf_text_import_ebu_ttd(GF_MediaImporter *import, GF_DOMParser *parser, GF_XMLNode *root)
 {
 	GF_Err e;
+	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, *xmlns;
+	Bool has_body;
+
+	samp_text = NULL;
+	xmlns = NULL;
+	root_working_copy = NULL;
+	parser_working_copy = NULL;
 	e = GF_OK;
 
+	/*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 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, "http://www.w3.org/ns/ttml")) {
+				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, "http://www.w3.org/ns/ttml");
+				goto exit;
+			}
+			xmlns = att->name;
+		} 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 if (!strcmp(att->name, "ttp:timeBase") && strcmp(att->value, "media")) {
+			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, "media");
+			goto exit;
+		} else if (!strcmp(att->name, "xmlns:ttp") && strcmp(att->value, "http://www.w3.org/ns/ttml#parameter")) {
+			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, "http://www.w3.org/ns/ttml#parameter");
+			goto exit;
+		} else if (!strcmp(att->name, "xmlns:tts") && strcmp(att->value, "http://www.w3.org/ns/ttml#styling")) {
+			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, "http://www.w3.org/ns/ttml#styling");
+			goto exit;
+		}
+	}
+
+	/*** 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 (!strcmp(node->name, "head")) {
+			GF_XMLNode *head_node;
+			u32 head_idx = 0;
+			while ( (head_node = (GF_XMLNode*)gf_list_enum(node->content, &head_idx))) {
+				if (!strcmp(head_node->name, "styling")) {
+					GF_XMLNode *styling_node;
+					u32 styling_idx;
+					if (has_styling) {
+						e = gf_import_message(import, GF_BAD_PARAM, "TTML: 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 (!strcmp(styling_node->name, "style")) {
+							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: missing \"styling\" element. Abort.\n");
+		goto exit;
+	}
+	if (!has_style) {
+		e = gf_import_message(import, GF_BAD_PARAM, "TTML: 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, xmlns, NULL, NULL, &desc_idx);
+#endif
+	if (e != GF_OK) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML: 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;
+		}
+
+		if (!strcmp(node->name, "body")) {
+			GF_XMLNode *body_node;
+			u32 body_idx = 0;
+
+			if (has_body) {
+				e = gf_import_message(import, GF_BAD_PARAM, "TTML: 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))) {
+				if (!strcmp(body_node->name, "div")) {
+					GF_XMLNode *div_node;
+					u32 div_idx = 0;
+					while ( (div_node = (GF_XMLNode*)gf_list_enum(body_node->content, &div_idx))) {
+						if (!strcmp(div_node->name, "p")) {
+							GF_XMLNode *p_node;
+							GF_XMLAttribute *p_att;
+							u32 p_idx = 0, h, m, s, 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 (!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 (!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;
+									}
+								}
+								if ((ts_begin != -1) && (ts_end != -1) && !samp_text) {
+									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))) {
+								if (!strcmp(p_node->name, "span")) {
+									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) {
+												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 (!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;
+											}
+										}
+										if ((ts_begin != -1) && (ts_end != -1) && !samp_text) {
+											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) 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*/
+								} 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) goto exit;
+								gf_isom_sample_del(&s);
+								nb_samples++;
+
+								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 (!has_body) {
+		e = gf_import_message(import, GF_BAD_PARAM, "TTML: 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_set_progress("Importing TTML", nb_samples, nb_samples);
+
+exit:
+	gf_free(samp_text);
+	gf_xml_dom_del(parser_working_copy);
+	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 EBU-TTD*/
+	if (!strcmp(root->name, "tt")) {
+		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_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 {
+		GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("TTML file not recognized: found \"%s\" as root, \"%s\" expected\n", root->name, "tt"));
+		e = GF_BAD_PARAM;
+	}
+
+	gf_xml_dom_del(parser);
 	return e;
 }
 
 /* SimpleText Text tracks -related functions */
 GF_SimpleTextSampleEntryBox *gf_isom_get_simpletext_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex)
 {
-    GF_SimpleTextSampleEntryBox *stse;
-    GF_TrackBox *trak;
-    GF_Err e;
-
-    if (!descriptionIndex) return NULL;
-
-    e = CanAccessMovie(movie, GF_ISOM_OPEN_READ);
-    if (e) return NULL;
-    
-    trak = gf_isom_get_track_from_file(movie, trackNumber);
-    if (!trak || !trak->Media) return NULL;
-
-    switch (trak->Media->handler->handlerType) {
-    case GF_ISOM_MEDIA_TEXT:
-        break;
-    default:
-        return NULL;
-    }
-
-    stse = (GF_SimpleTextSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
-    if (!stse) return NULL;
-    return stse;
+	GF_SimpleTextSampleEntryBox *stxt;
+	GF_TrackBox *trak;
+	GF_Err e;
+
+	if (!descriptionIndex) return NULL;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_READ);
+	if (e) return NULL;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return NULL;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return NULL;
+	}
+
+	stxt = (GF_SimpleTextSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
+	if (!stxt) return NULL;
+	return stxt;
 }
 
 GF_Box *boxstring_new_with_data(u32 type, const char *string);
 
 GF_Err gf_isom_update_simpletext_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config)
 {
-    GF_Err e;
-    GF_SimpleTextSampleEntryBox *stse;
-    GF_TrackBox *trak;
-
-    e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-    if (e) return GF_BAD_PARAM;
-    
-    trak = gf_isom_get_track_from_file(movie, trackNumber);
-    if (!trak || !trak->Media) return GF_BAD_PARAM;
-
-    switch (trak->Media->handler->handlerType) {
-    case GF_ISOM_MEDIA_TEXT:
-        break;
-    default:
-        return GF_BAD_PARAM;
-    }
-
-    stse = (GF_SimpleTextSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
-    if (!stse) {
+	GF_Err e;
+	GF_SimpleTextSampleEntryBox *stxt;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return GF_BAD_PARAM;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	stxt = (GF_SimpleTextSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
+	if (!stxt) {
 		return GF_BAD_PARAM;
 	} else {
-		switch (stse->type) {
-		case GF_ISOM_BOX_TYPE_STSE:
+		switch (stxt->type) {
+		case GF_ISOM_BOX_TYPE_STXT:
 			break;
 		default:
 			return GF_BAD_PARAM;
@@ -819,48 +1351,48 @@
 		if (!movie->keep_utc)
 			trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
-		stse->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_STTC, config);
+		stxt->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_STTC, config);
 		return GF_OK;
-    } 
+	}
 }
 
-GF_Err gf_isom_new_simpletext_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, 
-										  const char *content_encoding, const char *mime, u32 *outDescriptionIndex)
+GF_Err gf_isom_new_simpletext_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname,
+        const char *content_encoding, const char *mime, u32 *outDescriptionIndex)
 {
-    GF_TrackBox *trak;
-    GF_Err e;
-    u32 dataRefIndex;
-    GF_SimpleTextSampleEntryBox *stse;
-
-    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;
-
-    switch (trak->Media->handler->handlerType) {
-    case GF_ISOM_MEDIA_TEXT:
-        break;
-    default:
-        return GF_BAD_PARAM;
-    }
-
-    //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(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-        if (e) return e;
-    }
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_SimpleTextSampleEntryBox *stxt;
+
+	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;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	//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(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
 	if (!movie->keep_utc)
-	    trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-    stse = (GF_SimpleTextSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSE);
-    stse->dataReferenceIndex = dataRefIndex;
-	stse->mime_type = gf_strdup(mime);
-    gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, stse);
-    if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
-    return e;
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	stxt = (GF_SimpleTextSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STXT);
+	stxt->dataReferenceIndex = dataRefIndex;
+	stxt->mime_type = gf_strdup(mime);
+	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, stxt);
+	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	return e;
 }
 
 
@@ -883,7 +1415,7 @@
 	if (s) {
 		gf_bs_get_content(bs, &s->data, &s->dataLength);
 		s->DTS = (u64) (flusher->timescale*timestamp/1000);
-		s->IsRAP = isRap;
+		s->IsRAP = isRap ? RAP : RAP_NO;
 		gf_isom_add_sample(flusher->import->dest, flusher->track, flusher->descriptionIndex, s);
 		gf_isom_sample_del(&s);
 	} else {
@@ -893,11 +1425,15 @@
 	return e;
 }
 
-static GF_Err swf_svg_add_iso_header(void *user, const char *data, u32 length)
+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;
-	return gf_isom_update_simpletext_description(flusher->import->dest, flusher->track, flusher->descriptionIndex , data);
+	if (isHeader) {
+		return gf_isom_update_simpletext_description(flusher->import->dest, flusher->track, flusher->descriptionIndex , data);
+	} else {
+		return GF_OK;
+	}
 }
 
 GF_EXPORT
@@ -941,7 +1477,7 @@
 		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)	{
@@ -979,7 +1515,7 @@
 		gf_isom_set_track_layout_info(import->dest,	track, w<<16, h<<16, 0,	0, 0);
 
 		gf_isom_new_simpletext_description(import->dest, track,	NULL, NULL,	NULL, NULL, mime, &descIndex);
-		
+
 		gf_import_message(import, GF_OK, "SWF import (as text - type: %s)", import->streamFormat);
 	}
 	gf_text_import_set_language(import, track);
@@ -994,8 +1530,8 @@
 	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"))) {
 		e = swf_to_svg_init(read, import->swf_flags, import->swf_flatten_angle);
-	} else /*if (import->streamFormat && !strcmp(import->streamFormat, "BIFS"))*/ {
-        e = swf_to_bifs_init(read);
+	} else { /*if (import->streamFormat && !strcmp(import->streamFormat, "BIFS"))*/
+		e = swf_to_bifs_init(read);
 	}
 	if (e) {
 		goto exit;
@@ -1016,7 +1552,7 @@
 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."));
+	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;
 }
 
@@ -1040,7 +1576,7 @@
 	gf_f64_seek(sub_in, 0, SEEK_END);
 	file_size = gf_f64_tell(sub_in);
 	gf_f64_seek(sub_in, 0, SEEK_SET);
-	
+
 	unicode_type = gf_text_get_utf_type(sub_in);
 	if (unicode_type<0) {
 		fclose(sub_in);
@@ -1070,7 +1606,7 @@
 		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) {
@@ -1165,7 +1701,7 @@
 		REM_TRAIL_MARKS(szLine, "\r\n\t ")
 
 		line++;
-		len = (u32) strlen(szLine); 
+		len = (u32) strlen(szLine);
 		if (!len) continue;
 
 		i=0;
@@ -1173,7 +1709,10 @@
 			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++; }
+		while (szLine[i+1] && szLine[i+1]!='}') {
+			szTime[i] = szLine[i+1];
+			i++;
+		}
 		szTime[i] = 0;
 		start = atoi(szTime);
 		if (start<end) {
@@ -1186,7 +1725,10 @@
 			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++; }
+		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;
@@ -1201,7 +1743,7 @@
 		if (start && first_samp) {
 			s = gf_isom_text_to_sample(samp);
 			s->DTS = 0;
-			s->IsRAP = 1;
+			s->IsRAP = RAP;
 			gf_isom_add_sample(import->dest, track, 1, s);
 			gf_isom_sample_del(&s);
 			first_samp = GF_FALSE;
@@ -1238,7 +1780,7 @@
 		gf_set_progress("Importing SUB", gf_f64_tell(sub_in), file_size);
 		if (duration && (end >= duration)) break;
 	}
-	gf_isom_delete_text_sample(samp);	
+	gf_isom_delete_text_sample(samp);
 	/*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*/
@@ -1258,7 +1800,7 @@
 		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)
 {
@@ -1267,9 +1809,12 @@
 	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 = (a&0xFF);
+	res<<=8;
+	res |= (r&0xFF);
+	res<<=8;
+	res |= (g&0xFF);
+	res<<=8;
 	res |= (b&0xFF);
 	return res;
 }
@@ -1310,54 +1855,6 @@
 	}
 }
 
-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 ttxt_import_progress(void *cbk, u64 cur_samp, u64 count)
 {
 	gf_set_progress("TTXT Loading", cur_samp, count);
@@ -1405,7 +1902,7 @@
 		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 = 0x08;
+		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);
@@ -1420,7 +1917,10 @@
 
 	i=0;
 	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &i))) {
-		if (node->type) { nb_children--; continue; }
+		if (node->type) {
+			nb_children--;
+			continue;
+		}
 
 		if (!strcmp(node->name, "TextStreamHeader")) {
 			GF_XMLNode *sdesc;
@@ -1442,7 +1942,7 @@
 				else if (!strcmp(att->name, "trefID")) tref_id = atoi(att->value);
 			}
 
-			if (tref_id) 
+			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);
@@ -1710,11 +2210,14 @@
 		gf_import_message(import, GF_OK, "Warning: color badly formatted");
 	}
 	v = (u32) (a*255/100);
-	res = (v&0xFF); res<<=8;
+	res = (v&0xFF);
+	res<<=8;
 	v = (u32) (r*255/100);
-	res |= (v&0xFF); res<<=8;
+	res |= (v&0xFF);
+	res<<=8;
 	v = (u32) (g*255/100);
-	res |= (v&0xFF); res<<=8;
+	res |= (v&0xFF);
+	res<<=8;
 	v = (u32) (b*255/100);
 	res |= (v&0xFF);
 	return res;
@@ -1744,7 +2247,7 @@
 		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)
@@ -1793,7 +2296,8 @@
 		else if (!strcmp(att->name, "transform")) {
 			Float fx, fy;
 			sscanf(att->value, "translate(%f,%f)", &fx, &fy);
-			tx = (u32) fx; ty = (u32) fy;
+			tx = (u32) fx;
+			ty = (u32) fy;
 		}
 	}
 
@@ -1812,7 +2316,7 @@
 		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 = 0x08;
+		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;
@@ -1979,7 +2483,7 @@
 				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;
@@ -2030,10 +2534,10 @@
 						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) { 
+								if (styles[m].startCharOffset==styleID) {
 									st = styles[m];
-									break; 
-								} 
+									break;
+								}
 							}
 							st.startCharOffset = nb_chars;
 							st.endCharOffset = nb_chars + txt_len;
@@ -2045,16 +2549,16 @@
 						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, "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)
-						}
+								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")) {
@@ -2063,9 +2567,9 @@
 						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);
+								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);
@@ -2087,8 +2591,8 @@
 							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);
+									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);
 						}
@@ -2103,7 +2607,7 @@
 
 			s = gf_isom_text_to_sample(samp);
 			gf_isom_delete_text_sample(samp);
-			s->IsRAP = isRAP;
+			s->IsRAP = isRAP ? RAP : RAP_NO;
 			s->DTS = DTS;
 			gf_isom_add_sample(import->dest, track, descIndex, s);
 			gf_isom_sample_del(&s);
@@ -2142,14 +2646,22 @@
 		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);
-	case GF_TEXT_IMPORT_WEBVTT: return gf_text_import_webvtt(import);
-	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;
+	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);
+	case GF_TEXT_IMPORT_WEBVTT:
+		return gf_text_import_webvtt(import);
+	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;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/vobsub.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/vobsub.c Changed

@@ -10,15 +10,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,144 +34,144 @@
 
 static lang_type lang_table[] =
 {
-{"--", "und" },
-{"aa", "aar" },
-{"ab", "abk" },
-{"af", "afr" },
-{"am", "amh" },
-{"ar", "ara" },
-{"as", "ast" },
-{"ay", "aym" },
-{"az", "aze" },
-{"ba", "bak" },
-{"be", "bel" },
-{"bg", "bul" },
-{"bh", "bih" },
-{"bi", "bis" },
-{"bn", "ben" },
-{"bo", "bod" }, // was "tib" (Tibetan)
-{"br", "bre" },
-{"ca", "cat" },
-{"cc", "und" },
-{"co", "cos" },
-{"cs", "ces" }, // was "cze" (Czech)
-{"cy", "cym" }, // was "wel" (Welsh)
-{"da", "dan" },
-{"de", "deu" }, // was "ger" (German)
-{"dz", "dzo" },
-{"el", "ell" }, // was "gre" (Greek, Modern (1453-))
-{"en", "eng" },
-{"eo", "epo" },
-{"es", "spa" },
-{"et", "est" },
-{"eu", "eus" }, // was "baq" (Basque)
-{"fa", "fas" }, // was "per" (Persian)
-{"fi", "fin" },
-{"fj", "fij" },
-{"fo", "fao" },
-{"fr", "fra" }, // was "fre" (French)
-{"fy", "fry" },
-{"ga", "gle" },
-{"gl", "glg" },
-{"gn", "grn" },
-{"gu", "guj" },
-{"ha", "hau" },
-{"he", "heb" },
-{"hi", "hin" },
-{"hr", "scr" },
-{"hu", "hun" },
-{"hy", "hye" }, // was "arm" (Armenian)
-{"ia", "ina" },
-{"id", "ind" },
-{"ik", "ipk" },
-{"is", "isl" }, // was "ice" (Icelandic)
-{"it", "ita" },
-{"iu", "iku" },
-{"ja", "jpn" },
-{"jv", "jav" },
-{"ka", "kat" }, // was "geo" (Georgian)
-{"kk", "kaz" },
-{"kl", "kal" },
-{"km", "khm" },
-{"kn", "kan" },
-{"ko", "kor" },
-{"ks", "kas" },
-{"ku", "kur" },
-{"ky", "kir" },
-{"la", "lat" },
-{"ln", "lin" },
-{"lo", "lao" },
-{"lt", "lit" },
-{"lv", "lav" },
-{"mg", "mlg" },
-{"mi", "mri" }, // was "mao" (Maori)
-{"mk", "mkd" }, // was "mac" (Macedonian)
-{"ml", "mlt" },
-{"mn", "mon" },
-{"mo", "mol" },
-{"mr", "mar" },
-{"ms", "msa" }, // was "may" (Malay)
-{"my", "mya" }, // was "bur" (Burmese)
-{"na", "nau" },
-{"ne", "nep" },
-{"nl", "nld" }, // was "dut" (Dutch; Flemish)
-{"no", "nor" },
-{"oc", "oci" },
-{"om", "orm" },
-{"or", "ori" },
-{"pa", "pan" },
-{"pl", "pol" },
-{"ps", "pus" },
-{"pt", "por" },
-{"qu", "que" },
-{"rm", "roh" },
-{"rn", "run" },
-{"ro", "ron" }, // was "rum" (Romanian; Moldavian; Moldovan)
-{"ru", "rus" },
-{"rw", "kin" },
-{"sa", "san" },
-{"sd", "snd" },
-{"sg", "sag" },
-{"sh", "scr" },
-{"si", "sin" },
-{"sk", "slk" }, // was "slo" (Slovak)
-{"sl", "slv" },
-{"sm", "smo" },
-{"sn", "sna" },
-{"so", "som" },
-{"sq", "sqi" }, // was "alb" (Albanian)
-{"sr", "srp" },
-{"ss", "ssw" },
-{"st", "sot" },
-{"su", "sun" },
-{"sv", "swe" },
-{"sw", "swa" },
-{"ta", "tam" },
-{"te", "tel" },
-{"tg", "tgk" },
-{"th", "tha" },
-{"ti", "tir" },
-{"tk", "tuk" },
-{"tl", "tgl" },
-{"tn", "tsn" },
-{"to", "tog" },
-{"tr", "tur" },
-{"ts", "tso" },
-{"tt", "tat" },
-{"tw", "twi" },
-{"ug", "uig" },
-{"uk", "ukr" },
-{"ur", "urd" },
-{"uz", "uzb" },
-{"vi", "vie" },
-{"vo", "vol" },
-{"wo", "wol" },
-{"xh", "xho" },
-{"yi", "yid" },
-{"yo", "yor" },
-{"za", "zha" },
-{"zh", "zho" }, // was "chi" (Chinese)
-{"zu", "zul" }
+	{"--", "und" },
+	{"aa", "aar" },
+	{"ab", "abk" },
+	{"af", "afr" },
+	{"am", "amh" },
+	{"ar", "ara" },
+	{"as", "ast" },
+	{"ay", "aym" },
+	{"az", "aze" },
+	{"ba", "bak" },
+	{"be", "bel" },
+	{"bg", "bul" },
+	{"bh", "bih" },
+	{"bi", "bis" },
+	{"bn", "ben" },
+	{"bo", "bod" }, // was "tib" (Tibetan)
+	{"br", "bre" },
+	{"ca", "cat" },
+	{"cc", "und" },
+	{"co", "cos" },
+	{"cs", "ces" }, // was "cze" (Czech)
+	{"cy", "cym" }, // was "wel" (Welsh)
+	{"da", "dan" },
+	{"de", "deu" }, // was "ger" (German)
+	{"dz", "dzo" },
+	{"el", "ell" }, // was "gre" (Greek, Modern (1453-))
+	{"en", "eng" },
+	{"eo", "epo" },
+	{"es", "spa" },
+	{"et", "est" },
+	{"eu", "eus" }, // was "baq" (Basque)
+	{"fa", "fas" }, // was "per" (Persian)
+	{"fi", "fin" },
+	{"fj", "fij" },
+	{"fo", "fao" },
+	{"fr", "fra" }, // was "fre" (French)
+	{"fy", "fry" },
+	{"ga", "gle" },
+	{"gl", "glg" },
+	{"gn", "grn" },
+	{"gu", "guj" },
+	{"ha", "hau" },
+	{"he", "heb" },
+	{"hi", "hin" },
+	{"hr", "scr" },
+	{"hu", "hun" },
+	{"hy", "hye" }, // was "arm" (Armenian)
+	{"ia", "ina" },
+	{"id", "ind" },
+	{"ik", "ipk" },
+	{"is", "isl" }, // was "ice" (Icelandic)
+	{"it", "ita" },
+	{"iu", "iku" },
+	{"ja", "jpn" },
+	{"jv", "jav" },
+	{"ka", "kat" }, // was "geo" (Georgian)
+	{"kk", "kaz" },
+	{"kl", "kal" },
+	{"km", "khm" },
+	{"kn", "kan" },
+	{"ko", "kor" },
+	{"ks", "kas" },
+	{"ku", "kur" },
+	{"ky", "kir" },
+	{"la", "lat" },
+	{"ln", "lin" },
+	{"lo", "lao" },
+	{"lt", "lit" },
+	{"lv", "lav" },
+	{"mg", "mlg" },
+	{"mi", "mri" }, // was "mao" (Maori)
+	{"mk", "mkd" }, // was "mac" (Macedonian)
+	{"ml", "mlt" },
+	{"mn", "mon" },
+	{"mo", "mol" },
+	{"mr", "mar" },
+	{"ms", "msa" }, // was "may" (Malay)
+	{"my", "mya" }, // was "bur" (Burmese)
+	{"na", "nau" },
+	{"ne", "nep" },
+	{"nl", "nld" }, // was "dut" (Dutch; Flemish)
+	{"no", "nor" },
+	{"oc", "oci" },
+	{"om", "orm" },
+	{"or", "ori" },
+	{"pa", "pan" },
+	{"pl", "pol" },
+	{"ps", "pus" },
+	{"pt", "por" },
+	{"qu", "que" },
+	{"rm", "roh" },
+	{"rn", "run" },
+	{"ro", "ron" }, // was "rum" (Romanian; Moldavian; Moldovan)
+	{"ru", "rus" },
+	{"rw", "kin" },
+	{"sa", "san" },
+	{"sd", "snd" },
+	{"sg", "sag" },
+	{"sh", "scr" },
+	{"si", "sin" },
+	{"sk", "slk" }, // was "slo" (Slovak)
+	{"sl", "slv" },
+	{"sm", "smo" },
+	{"sn", "sna" },
+	{"so", "som" },
+	{"sq", "sqi" }, // was "alb" (Albanian)
+	{"sr", "srp" },
+	{"ss", "ssw" },
+	{"st", "sot" },
+	{"su", "sun" },
+	{"sv", "swe" },
+	{"sw", "swa" },
+	{"ta", "tam" },
+	{"te", "tel" },
+	{"tg", "tgk" },
+	{"th", "tha" },
+	{"ti", "tir" },
+	{"tk", "tuk" },
+	{"tl", "tgl" },
+	{"tn", "tsn" },
+	{"to", "tog" },
+	{"tr", "tur" },
+	{"ts", "tso" },
+	{"tt", "tat" },
+	{"tw", "twi" },
+	{"ug", "uig" },
+	{"uk", "ukr" },
+	{"ur", "urd" },
+	{"uz", "uzb" },
+	{"vi", "vie" },
+	{"vo", "vol" },
+	{"wo", "wol" },
+	{"xh", "xho" },
+	{"yi", "yid" },
+	{"yo", "yor" },
+	{"za", "zha" },
+	{"zh", "zho" }, // was "chi" (Chinese)
+	{"zu", "zul" }
 };
 
 
@@ -312,10 +312,10 @@
 			u8  palette[16][4];
 
 			if (sscanf(str, "%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x",
-				(u32 *) &palette[0], (u32 *) &palette[1], (u32 *) &palette[2], (u32 *) &palette[3],
-				(u32 *) &palette[4], (u32 *) &palette[5], (u32 *) &palette[6], (u32 *) &palette[7],
-				(u32 *) &palette[8], (u32 *) &palette[9], (u32 *) &palette[10], (u32 *) &palette[11],
-				(u32 *) &palette[12],(u32 *) &palette[13],(u32 *) &palette[14], (u32 *) &palette[15]) != 16)
+			           (u32 *) &palette[0], (u32 *) &palette[1], (u32 *) &palette[2], (u32 *) &palette[3],
+			           (u32 *) &palette[4], (u32 *) &palette[5], (u32 *) &palette[6], (u32 *) &palette[7],
+			           (u32 *) &palette[8], (u32 *) &palette[9], (u32 *) &palette[10], (u32 *) &palette[11],
+			           (u32 *) &palette[12],(u32 *) &palette[13],(u32 *) &palette[14], (u32 *) &palette[15]) != 16)
 			{
 				error = 1;
 				continue;
@@ -502,14 +502,30 @@
 			cmd = data[i++];
 			switch (cmd)
 			{
-			case 0x00: len = 0; break;
-			case 0x01: len = 0; break;
-			case 0x02: len = 0; break;
-			case 0x03: len = 2; break;
-			case 0x04: len = 2; break;
-			case 0x05: len = 6; break;
-			case 0x06: len = 4; break;
-			default:   len = 0; break;
+			case 0x00:
+				len = 0;
+				break;
+			case 0x01:
+				len = 0;
+				break;
+			case 0x02:
+				len = 0;
+				break;
+			case 0x03:
+				len = 2;
+				break;
+			case 0x04:
+				len = 2;
+				break;
+			case 0x05:
+				len = 6;
+				break;
+			case 0x06:
+				len = 4;
+				break;
+			default:
+				len = 0;
+				break;
 			}
 
 			if (i + len > psize) {
@@ -540,7 +556,7 @@
 {
 	u8	buf[0x800], ptsbuf[5];
 	u8	*p;
-	int	put_pts = 1; 
+	int	put_pts = 1;
 
 	/* Build PTS buffer */
 	ptsbuf[0] = (u8)(((pts >> 29) & 0x0e) | 0x21);

gpac-0.5.0.svn5178.tar.bz2/src/media_tools/webvtt.c -> gpac-0.5.1.svn5491.tar.xz/src/media_tools/webvtt.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,9 +32,9 @@
 
 struct _webvtt_sample
 {
-    u64 start;
-    u64 end;
-    GF_List *cues;
+	u64 start;
+	u64 end;
+	GF_List *cues;
 };
 
 
@@ -42,304 +42,314 @@
 
 typedef struct
 {
-    GF_ISOM_BOX
-    GF_StringBox *id;
-    GF_StringBox *time;
-    GF_StringBox *settings;
-    GF_StringBox *payload;
+	GF_ISOM_BOX
+	GF_StringBox *id;
+	GF_StringBox *time;
+	GF_StringBox *settings;
+	GF_StringBox *payload;
 } GF_VTTCueBox;
 
 GF_Box *boxstring_New(u32 type) {
-    ISOM_DECL_BOX_ALLOC(GF_StringBox, type);
-    return (GF_Box *)tmp;
+	ISOM_DECL_BOX_ALLOC(GF_StringBox, type);
+	return (GF_Box *)tmp;
 }
 
 GF_Box *boxstring_new_with_data(u32 type, const char *string) {
-    ISOM_DECL_BOX_ALLOC(GF_StringBox, type);
-    if (string) tmp->string = gf_strdup(string);
-    return (GF_Box *)tmp;
+	ISOM_DECL_BOX_ALLOC(GF_StringBox, type);
+	if (string) tmp->string = gf_strdup(string);
+	return (GF_Box *)tmp;
 }
 
-GF_Box *vtcu_New() 
+GF_Box *vtcu_New()
 {
-    ISOM_DECL_BOX_ALLOC(GF_VTTCueBox, GF_ISOM_BOX_TYPE_VTCU);
-    return (GF_Box *)tmp;
+	ISOM_DECL_BOX_ALLOC(GF_VTTCueBox, GF_ISOM_BOX_TYPE_VTCU);
+	return (GF_Box *)tmp;
 }
 
 GF_Box *vtte_New() {
-    ISOM_DECL_BOX_ALLOC(GF_Box, GF_ISOM_BOX_TYPE_VTTE);
-    return (GF_Box *)tmp;
+	ISOM_DECL_BOX_ALLOC(GF_Box, GF_ISOM_BOX_TYPE_VTTE);
+	return (GF_Box *)tmp;
 }
 
-GF_Box *wvtt_New() 
+GF_Box *wvtt_New()
 {
-    ISOM_DECL_BOX_ALLOC(GF_WebVTTSampleEntryBox, GF_ISOM_BOX_TYPE_WVTT);
-    return (GF_Box *)tmp;
+	ISOM_DECL_BOX_ALLOC(GF_WebVTTSampleEntryBox, GF_ISOM_BOX_TYPE_WVTT);
+	return (GF_Box *)tmp;
 }
 
 void boxstring_del(GF_Box *s)
 {
-    GF_StringBox *box = (GF_StringBox *)s;
-    if (box->string) gf_free(box->string);
-    gf_free(box);
+	GF_StringBox *box = (GF_StringBox *)s;
+	if (box->string) gf_free(box->string);
+	gf_free(box);
 }
 
-void vtcu_del(GF_Box *s) 
+void vtcu_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);
+	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)
 {
-    gf_free(s);
+	gf_free(s);
 }
 
 void wvtt_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_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_StringBox *box = (GF_StringBox *)s;
-    box->string = (char *)gf_malloc((u32)(s->size+1));
-    gf_bs_read_data(bs, box->string, (u32)(s->size));
-    box->string[(u32)(s->size)] = 0;
-    return GF_OK;
+	GF_StringBox *box = (GF_StringBox *)s;
+	box->string = (char *)gf_malloc((u32)(s->size+1));
+	gf_bs_read_data(bs, box->string, (u32)(s->size));
+	box->string[(u32)(s->size)] = 0;
+	return GF_OK;
 }
 
 static GF_Err vtcu_Add(GF_Box *s, GF_Box *box)
 {
-    GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
-    switch(box->type) {
-    case GF_ISOM_BOX_TYPE_CTIM: 
-        cuebox->time = (GF_StringBox *)box;
-        break;
-    case GF_ISOM_BOX_TYPE_IDEN: 
-        cuebox->id = (GF_StringBox *)box;
-        break;
-    case GF_ISOM_BOX_TYPE_STTG: 
-        cuebox->settings = (GF_StringBox *)box;
-        break;
-    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_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
+	switch(box->type) {
+	case GF_ISOM_BOX_TYPE_CTIM:
+		cuebox->time = (GF_StringBox *)box;
+		break;
+	case GF_ISOM_BOX_TYPE_IDEN:
+		cuebox->id = (GF_StringBox *)box;
+		break;
+	case GF_ISOM_BOX_TYPE_STTG:
+		cuebox->settings = (GF_StringBox *)box;
+		break;
+	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)
 {
-    return gf_isom_read_box_list(s, bs, vtcu_Add);
+	return gf_isom_read_box_list(s, bs, vtcu_Add);
 }
 
 GF_Err vtte_Read(GF_Box *s, GF_BitStream *bs)
 {
-    return gf_isom_read_box_list(s, bs, gf_isom_box_add_default);
+	return gf_isom_read_box_list(s, bs, gf_isom_box_add_default);
 }
 
 static GF_Err wvtt_Add(GF_Box *s, GF_Box *box)
 {
-    GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
-    switch(box->type) {
-    case GF_ISOM_BOX_TYPE_VTTC: 
-        wvtt->config = (GF_StringBox *)box;
-        break;
-    default:
-        return gf_isom_box_add_default(s, box);
-    }
-    return GF_OK;
+	GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
+	switch(box->type) {
+	case GF_ISOM_BOX_TYPE_VTTC:
+		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_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
-    gf_bs_read_data(bs, wvtt->reserved, 6);
-    wvtt->dataReferenceIndex = gf_bs_read_u16(bs);
-    wvtt->size -= 8;
-    return gf_isom_read_box_list(s, bs, wvtt_Add);
+	GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
+	gf_bs_read_data(bs, wvtt->reserved, 6);
+	wvtt->dataReferenceIndex = gf_bs_read_u16(bs);
+	wvtt->size -= 8;
+	return gf_isom_read_box_list(s, bs, wvtt_Add);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_Err boxstring_Write(GF_Box *s, GF_BitStream *bs)
 {
-    GF_Err e;
-    GF_StringBox *box = (GF_StringBox *)s;
-    e = gf_isom_box_write_header(s, bs);
-    if (e) return e;
-    if (box->string) {
-        gf_bs_write_data(bs, box->string, (u32)(box->size-8));
-    }
-    return e;
+	GF_Err e;
+	GF_StringBox *box = (GF_StringBox *)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	if (box->string) {
+		gf_bs_write_data(bs, box->string, (u32)(box->size-8));
+	}
+	return e;
 }
 
 GF_Err vtcu_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->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;
+	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;
 }
 
 GF_Err vtte_Write(GF_Box *s, GF_BitStream *bs)
 {
-    GF_Err e;
-    e = gf_isom_box_write_header(s, bs);
-    return e;
+	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 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);
+	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;
+	if (wvtt->config) gf_isom_box_write((GF_Box *)wvtt->config, bs);
+	return e;
 }
 
 GF_Err boxstring_Size(GF_Box *s)
 {
-    GF_Err e;
-    GF_StringBox *box = (GF_StringBox *)s;
-    e = gf_isom_box_get_size(s);
-    if (e) return e;
-    
-    box->size += strlen(box->string);
-    return GF_OK;
+	GF_Err e;
+	GF_StringBox *box = (GF_StringBox *)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+
+	box->size += strlen(box->string);
+	return GF_OK;
 }
 
 GF_Err vtcu_Size(GF_Box *s)
 {
-    GF_Err e;
-    GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
-    e = gf_isom_box_get_size(s);
-    if (e) return e;
-    if (cuebox->id) {
-        e = gf_isom_box_size((GF_Box *)cuebox->id);
-        if (e) return e;
-        cuebox->size += cuebox->id->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;
-    }
-    return GF_OK;
+	GF_Err e;
+	GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	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;
+	}
+	return GF_OK;
 }
 
 GF_Err vtte_Size(GF_Box *s)
 {
-    return gf_isom_box_get_size(s);
+	return gf_isom_box_get_size(s);
 }
 
 GF_Err wvtt_Size(GF_Box *s)
 {
-    GF_Err e;
-    GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
-    e = gf_isom_box_get_size(s);
-    if (e) return e;
-    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;
-    }
-    return e;
+	GF_Err e;
+	GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	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;
+	}
+	return e;
 }
 
 static GF_Err webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue)
 {
-    GF_Err e;
-    GF_VTTCueBox *cuebox;
-    if (!cue) return GF_OK;
-
-    cuebox = (GF_VTTCueBox *)vtcu_New(); 
-    if (cue->id) {
-        cuebox->id = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_IDEN, cue->id);
-    }
-    if (cue->settings) {
-        cuebox->settings = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_STTG, cue->settings);
-    }
-    if (cue->text) {
-        cuebox->payload = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_PAYL, cue->text);
-    }
+	GF_Err e;
+	GF_VTTCueBox *cuebox;
+	if (!cue) return GF_OK;
 
-    e = gf_isom_box_size((GF_Box *)cuebox);
-    if (!e) e = gf_isom_box_write((GF_Box *)cuebox, bs);
+	cuebox = (GF_VTTCueBox *)vtcu_New();
+	if (cue->id) {
+		cuebox->id = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_IDEN, cue->id);
+	}
+	if (cue->settings) {
+		cuebox->settings = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_STTG, cue->settings);
+	}
+	if (cue->text) {
+		cuebox->payload = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_PAYL, cue->text);
+	}
+	/* TODO: check if a time box should be written */
+	e = gf_isom_box_size((GF_Box *)cuebox);
+	if (!e) e = gf_isom_box_write((GF_Box *)cuebox, bs);
 
-    gf_isom_box_del((GF_Box *)cuebox);
-    return e;
+	gf_isom_box_del((GF_Box *)cuebox);
+	return e;
 }
 
 GF_ISOSample *gf_isom_webvtt_to_sample(void *s)
 {
-    GF_Err e = GF_OK;
-    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)) {
-        i=0;
-        while ((cue = (GF_WebVTTCue *)gf_list_enum(samp->cues, &i))) {
-            e = webvtt_write_cue(bs, cue);
-            if (e) break;
-        }
-        if (e) {
-            gf_bs_del(bs);
-            return NULL;
-        }
-    } else {
-        GF_Box *cuebox = (GF_Box *)vtte_New();
-        e = gf_isom_box_size((GF_Box *)cuebox);
-        if (!e) e = gf_isom_box_write((GF_Box *)cuebox, bs);
-        gf_isom_box_del((GF_Box *)cuebox);
-        if (e) {
-            gf_bs_del(bs);
-            return NULL;
-        }
-    }
-    res = gf_isom_sample_new();
-    if (!res) {
-        gf_bs_del(bs);
-        return NULL;
-    }
-    gf_bs_get_content(bs, &res->data, &res->dataLength);
-    gf_bs_del(bs);
-    res->IsRAP = 1;
-    return res;
+	GF_Err e = GF_OK;
+	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)) {
+		i=0;
+		while ((cue = (GF_WebVTTCue *)gf_list_enum(samp->cues, &i))) {
+			e = webvtt_write_cue(bs, cue);
+			if (e) break;
+		}
+		if (e) {
+			gf_bs_del(bs);
+			return NULL;
+		}
+	} else {
+		GF_Box *cuebox = (GF_Box *)vtte_New();
+		e = gf_isom_box_size((GF_Box *)cuebox);
+		if (!e) e = gf_isom_box_write((GF_Box *)cuebox, bs);
+		gf_isom_box_del((GF_Box *)cuebox);
+		if (e) {
+			gf_bs_del(bs);
+			return NULL;
+		}
+	}
+	res = gf_isom_sample_new();
+	if (!res) {
+		gf_bs_del(bs);
+		return NULL;
+	}
+	gf_bs_get_content(bs, &res->data, &res->dataLength);
+	gf_bs_del(bs);
+	res->IsRAP = RAP;
+	return res;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
@@ -349,179 +359,184 @@
 
 GF_Err boxstring_dump(GF_Box *a, FILE * trace)
 {
-    GF_StringBox *sbox = (GF_StringBox *)a;
-    fprintf(trace, "<StringBox string=\"%s\">\n", sbox->string);
-    DumpBox(a, trace);
-    gf_box_dump_done("StringBox", a, trace);
-    return GF_OK;
+	GF_StringBox *sbox = (GF_StringBox *)a;
+	fprintf(trace, "<StringBox string=\"%s\">\n", sbox->string);
+	DumpBox(a, trace);
+	gf_box_dump_done("StringBox", a, trace);
+	return GF_OK;
 }
 
 GF_Err vtcu_dump(GF_Box *a, FILE * trace)
 {
-    GF_VTTCueBox *cuebox = (GF_VTTCueBox *)a;
-    fprintf(trace, "<WebVTTCueBox>\n");
-    DumpBox(a, trace);
-    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);
-    gf_box_dump_done("WebVTTCueBox", a, trace);
-    return GF_OK;
-}
-
-GF_Err vtte_dump(GF_Box *a, FILE * trace) 
+	GF_VTTCueBox *cuebox = (GF_VTTCueBox *)a;
+	fprintf(trace, "<WebVTTCueBox>\n");
+	DumpBox(a, trace);
+	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_box_dump_done("WebVTTCueBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err vtte_dump(GF_Box *a, FILE * trace)
 {
-    fprintf(trace, "<WebVTTEmptyCueBox>\n");
-    DumpBox(a, trace);
-    gf_box_dump_done("WebVTTEmptyCueBox", a, trace);
-    return GF_OK;
+	fprintf(trace, "<WebVTTEmptyCueBox>\n");
+	DumpBox(a, trace);
+	gf_box_dump_done("WebVTTEmptyCueBox", a, trace);
+	return GF_OK;
 }
 
 GF_Err wvtt_dump(GF_Box *a, FILE * trace)
 {
-    GF_WebVTTSampleEntryBox *cuebox = (GF_WebVTTSampleEntryBox *)a;
-    fprintf(trace, "<WebVTTSampleEntryBox>\n");
-    DumpBox(a, trace);
-    if (cuebox->config) boxstring_dump((GF_Box *)cuebox->config, trace);
-    gf_box_dump_done("WebVTTSampleEntryBox", a, trace);
-    return GF_OK;
+	GF_WebVTTSampleEntryBox *cuebox = (GF_WebVTTSampleEntryBox *)a;
+	fprintf(trace, "<WebVTTSampleEntryBox>\n");
+	DumpBox(a, trace);
+	if (cuebox->config) boxstring_dump((GF_Box *)cuebox->config, trace);
+	gf_box_dump_done("WebVTTSampleEntryBox", a, trace);
+	return GF_OK;
 }
 #endif /* GPAC_DISABLE_ISOM_DUMP */
 
 GF_WebVTTSampleEntryBox *gf_webvtt_isom_get_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex)
 {
-    GF_WebVTTSampleEntryBox *wvtt;
-    GF_TrackBox *trak;
-    GF_Err e;
-
-    if (!descriptionIndex) return NULL;
-
-    e = CanAccessMovie(movie, GF_ISOM_OPEN_READ);
-    if (e) return NULL;
-    
-    trak = gf_isom_get_track_from_file(movie, trackNumber);
-    if (!trak || !trak->Media) return NULL;
-
-    switch (trak->Media->handler->handlerType) {
-    case GF_ISOM_MEDIA_TEXT:
-        break;
-    default:
-        return NULL;
-    }
-
-    wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
-    if (!wvtt) return NULL;
-    switch (wvtt->type) {
-    case GF_ISOM_BOX_TYPE_WVTT:
-        break;
-    default:
-        return NULL;
-    }
-    return wvtt;
+	GF_WebVTTSampleEntryBox *wvtt;
+	GF_TrackBox *trak;
+
+	if (!descriptionIndex) return NULL;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return NULL;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return NULL;
+	}
+
+	wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
+	if (!wvtt) return NULL;
+	switch (wvtt->type) {
+	case GF_ISOM_BOX_TYPE_WVTT:
+		break;
+	default:
+		return NULL;
+	}
+	return wvtt;
 }
 
 GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config)
 {
-    GF_Err e;
-    GF_WebVTTSampleEntryBox *wvtt;
-    GF_TrackBox *trak;
-
-    e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-    if (e) return GF_BAD_PARAM;
-    
-    trak = gf_isom_get_track_from_file(movie, trackNumber);
-    if (!trak || !trak->Media) return GF_BAD_PARAM;
-
-    switch (trak->Media->handler->handlerType) {
-    case GF_ISOM_MEDIA_TEXT:
-        break;
-    default:
-        return GF_BAD_PARAM;
-    }
-
-    wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
-    if (!wvtt) return GF_BAD_PARAM;
-    switch (wvtt->type) {
-    case GF_ISOM_BOX_TYPE_WVTT:
-        break;
-    default:
-        return GF_BAD_PARAM;
-    }
-    if (wvtt) {
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	GF_Err e;
+	GF_WebVTTSampleEntryBox *wvtt;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return GF_BAD_PARAM;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
+	if (!wvtt) return GF_BAD_PARAM;
+	switch (wvtt->type) {
+	case GF_ISOM_BOX_TYPE_WVTT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+	if (wvtt) {
 		if (!movie->keep_utc)
-	        trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+			trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
-        wvtt->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_VTTC, config);
-    } else {
-        e = GF_BAD_PARAM;
-    }
-    return e;
+		wvtt->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_VTTC, config);
+	} else {
+		e = GF_BAD_PARAM;
+	}
+	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 GF_Err gf_isom_new_webvtt_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex)
 {
-    GF_TrackBox *trak;
-    GF_Err e;
-    u32 dataRefIndex;
-    GF_WebVTTSampleEntryBox *wvtt;
-
-    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;
-
-    switch (trak->Media->handler->handlerType) {
-    case GF_ISOM_MEDIA_TEXT:
-        break;
-    default:
-        return GF_BAD_PARAM;
-    }
-
-    //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(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-        if (e) return e;
-    }
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_WebVTTSampleEntryBox *wvtt;
+
+	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;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	//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(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
 	if (!movie->keep_utc)
-	    trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
-    wvtt = (GF_WebVTTSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_WVTT);
-    wvtt->dataReferenceIndex = dataRefIndex;
-    gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, wvtt);
-    if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
-    return e;
+	wvtt = (GF_WebVTTSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_WVTT);
+	wvtt->dataReferenceIndex = dataRefIndex;
+	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, wvtt);
+	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 #endif /*GPAC_DISABLE_ISOM*/
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 typedef enum {
-    WEBVTT_PARSER_STATE_WAITING_SIGNATURE,
-    WEBVTT_PARSER_STATE_WAITING_HEADER,
-    WEBVTT_PARSER_STATE_WAITING_CUE,
-    WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP,
-    WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD
+	WEBVTT_PARSER_STATE_WAITING_SIGNATURE,
+	WEBVTT_PARSER_STATE_WAITING_HEADER,
+	WEBVTT_PARSER_STATE_WAITING_CUE,
+	WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP,
+	WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD
 } GF_WebVTTParserState;
 
 struct _webvtt_parser {
-    GF_WebVTTParserState state;
-    Bool is_srt;
-
-    /* List of non-overlapping GF_WebVTTSample */
-    GF_List              *samples;
-
-    FILE                 *vtt_in;
-    u64                  file_size;
-    s32                  unicode_type;
-
-    u64                  last_duration;
-    void *user;
-    GF_Err (*report_message)(void *, GF_Err, char *, const char *);
-    void (*on_header_parsed)(void *, const char *);
-    void (*on_sample_parsed)(void *, GF_WebVTTSample *);
-    void (*on_cue_read)(void *, GF_WebVTTCue *);
+	GF_WebVTTParserState state;
+	Bool is_srt;
+
+	/* List of non-overlapping GF_WebVTTSample */
+	GF_List              *samples;
+
+	FILE                 *vtt_in;
+	u64                  file_size;
+	s32                  unicode_type;
+
+	u64                  last_duration;
+	void *user;
+	GF_Err (*report_message)(void *, GF_Err, char *, const char *);
+	void (*on_header_parsed)(void *, const char *);
+	void (*on_sample_parsed)(void *, GF_WebVTTSample *);
+	void (*on_cue_read)(void *, GF_WebVTTCue *);
 };
 
 /* mark the overlapped cue in the previous sample as split */
@@ -529,329 +544,333 @@
 /* adjust the end of the overlapped cue in the previous sample */
 static GF_WebVTTCue *gf_webvtt_cue_split_at(GF_WebVTTCue *cue, GF_WebVTTTimestamp *time)
 {
-    GF_WebVTTCue *dup_cue;
+	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);
-    dup_cue->split          = GF_TRUE;
-    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 : ""));
+	GF_SAFEALLOC(dup_cue, GF_WebVTTCue);
+	dup_cue->split          = GF_TRUE;
+	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 : ""));
 
-    cue->end = *time;
-    return dup_cue;
+	cue->end = *time;
+	return dup_cue;
 }
 
 static GF_Err gf_webvtt_cue_add_property(GF_WebVTTCue *cue, GF_WebVTTCuePropertyType type, char *text_data, u32 text_len)
 {
-    char **prop = NULL;
-    u32 len;
-    if (!cue) return GF_BAD_PARAM;
-    if (!text_len) return GF_OK;
-    switch(type)
-    {
-    case WEBVTT_ID:
-        prop = &cue->id;
-        break;
-    case WEBVTT_SETTINGS:
-        prop = &cue->settings;
-        break;
-    case WEBVTT_PAYLOAD:
-        prop = &cue->text;
-        break;
-    case WEBVTT_TIME:
-        prop = &cue->time;
-        break;
-    }
-    if (*prop) {
-        len = (u32) strlen(*prop);
-        *prop = (char*)gf_realloc(*prop, sizeof(char) * (len + text_len + 1) );
-        strcpy(*prop + len, text_data);
-    } else {
-        len = 0;
-        *prop = gf_strdup(text_data);
-    }
-    return GF_OK;
+	char **prop = NULL;
+	u32 len;
+	if (!cue) return GF_BAD_PARAM;
+	if (!text_len) return GF_OK;
+	switch(type)
+	{
+	case WEBVTT_ID:
+		prop = &cue->id;
+		break;
+	case WEBVTT_SETTINGS:
+		prop = &cue->settings;
+		break;
+	case WEBVTT_PAYLOAD:
+		prop = &cue->text;
+		break;
+	case WEBVTT_POSTCUE_TEXT:
+		prop = &cue->post_text;
+		break;
+	case WEBVTT_PRECUE_TEXT:
+		prop = &cue->pre_text;
+		break;
+	}
+	if (*prop) {
+		len = (u32) strlen(*prop);
+		*prop = (char*)gf_realloc(*prop, sizeof(char) * (len + text_len + 1) );
+		strcpy(*prop + len, text_data);
+	} else {
+		len = 0;
+		*prop = gf_strdup(text_data);
+	}
+	return GF_OK;
 }
 
 static GF_WebVTTCue *gf_webvtt_cue_new()
 {
-    GF_WebVTTCue *cue;
-    GF_SAFEALLOC(cue, GF_WebVTTCue);
-    return cue;
+	GF_WebVTTCue *cue;
+	GF_SAFEALLOC(cue, GF_WebVTTCue);
+	return cue;
 }
 
 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->time)      gf_free(cue->time);
-        if (cue->text)      gf_free(cue->text);
-        gf_free(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);
+	}
 }
 
 static GF_WebVTTSample *gf_webvtt_sample_new()
 {
-    GF_WebVTTSample *samp;
-    GF_SAFEALLOC(samp, GF_WebVTTSample);
-    if (!samp) return NULL;
-    samp->cues = gf_list_new();
-    return samp;
+	GF_WebVTTSample *samp;
+	GF_SAFEALLOC(samp, GF_WebVTTSample);
+	if (!samp) return NULL;
+	samp->cues = gf_list_new();
+	return samp;
 }
 
 u64 gf_webvtt_sample_get_start(GF_WebVTTSample * samp)
 {
-    return samp->start;
+	return samp->start;
 }
 
 void gf_webvtt_sample_del(GF_WebVTTSample * samp)
 {
-    while (gf_list_count(samp->cues)) {
-        GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(samp->cues, 0);
-        gf_list_rem(samp->cues, 0);
-        gf_webvtt_cue_del(cue);
-    }
-    gf_list_del(samp->cues);
-    gf_free(samp);
+	while (gf_list_count(samp->cues)) {
+		GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(samp->cues, 0);
+		gf_list_rem(samp->cues, 0);
+		gf_webvtt_cue_del(cue);
+	}
+	gf_list_del(samp->cues);
+	gf_free(samp);
 }
 
 GF_WebVTTParser *gf_webvtt_parser_new()
 {
-    GF_WebVTTParser *parser;
-    GF_SAFEALLOC(parser, GF_WebVTTParser);
-    parser->samples = gf_list_new();
-    return parser;
+	GF_WebVTTParser *parser;
+	GF_SAFEALLOC(parser, GF_WebVTTParser);
+	parser->samples = gf_list_new();
+	return parser;
 }
 
 extern s32 gf_text_get_utf_type(FILE *in_src);
 
-GF_Err gf_webvtt_parser_init(GF_WebVTTParser *parser, const char *input_file, 
-                                    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_init(GF_WebVTTParser *parser, const char *input_file,
+                             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_f64_open(input_file, "rt");
-        gf_f64_seek(parser->vtt_in, 0, SEEK_END);
-        parser->file_size = gf_f64_tell(parser->vtt_in);
-        gf_f64_seek(parser->vtt_in, 0, SEEK_SET);
-
-        parser->unicode_type = gf_text_get_utf_type(parser->vtt_in);
-        if (parser->unicode_type<0) {
-            fclose(parser->vtt_in);
-            return GF_NOT_SUPPORTED;
-        }
-
-        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;
-    }
-    return GF_BAD_PARAM;
+	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_f64_open(input_file, "rt");
+		gf_f64_seek(parser->vtt_in, 0, SEEK_END);
+		parser->file_size = gf_f64_tell(parser->vtt_in);
+		gf_f64_seek(parser->vtt_in, 0, SEEK_SET);
+
+		parser->unicode_type = gf_text_get_utf_type(parser->vtt_in);
+		if (parser->unicode_type<0) {
+			fclose(parser->vtt_in);
+			return GF_NOT_SUPPORTED;
+		}
+
+		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;
+	}
+	return GF_BAD_PARAM;
 }
 
 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) 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) {
+		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) 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;
+	}
 }
 
 void gf_webvtt_parser_del(GF_WebVTTParser *parser)
 {
-    if (parser) {
-        gf_webvtt_parser_reset(parser);
-        gf_list_del(parser->samples);
-        gf_free(parser);
-    }
+	if (parser) {
+		gf_webvtt_parser_reset(parser);
+		gf_list_del(parser->samples);
+		gf_free(parser);
+	}
 }
 
 u64 gf_webvtt_parser_last_duration(GF_WebVTTParser *parser)
 {
-    if (parser) {
-        return parser->last_duration;
-    } else {
-        return 0;
-    }
+	if (parser) {
+		return parser->last_duration;
+	} else {
+		return 0;
+	}
 }
 
 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;
+	return (ts->hour == 0 && ts->min == 0 && ts->sec == 0 && ts->ms == 0) ? GF_TRUE : GF_FALSE;
 }
 
 void gf_webvtt_timestamp_set(GF_WebVTTTimestamp *ts, u64 value)
 {
-    u64 tmp;
-    tmp = value;
-    ts->hour = (u32)(tmp/(3600*1000));
-    tmp -= ts->hour*3600*1000;
-    ts->min  = (u32)(tmp/(60*1000));
-    tmp -= ts->min*60*1000;
-    ts->sec  = (u32)(tmp/1000);
-    tmp -= ts->sec*1000;
-    ts->ms   = (u32)tmp;
+	u64 tmp;
+	tmp = value;
+	ts->hour = (u32)(tmp/(3600*1000));
+	tmp -= ts->hour*3600*1000;
+	ts->min  = (u32)(tmp/(60*1000));
+	tmp -= ts->min*60*1000;
+	ts->sec  = (u32)(tmp/1000);
+	tmp -= ts->sec*1000;
+	ts->ms   = (u32)tmp;
 }
 
 u64 gf_webvtt_timestamp_get(GF_WebVTTTimestamp *ts)
 {
-    return (3600*ts->hour + 60*ts->min + ts->sec)*1000 + ts->ms;
+	return (3600*ts->hour + 60*ts->min + ts->sec)*1000 + ts->ms;
 }
 
 void gf_webvtt_timestamp_dump(GF_WebVTTTimestamp *ts, FILE *dump, Bool dump_hour)
 {
-    if (dump_hour || ts->hour != 0) {
-        fprintf(dump, "%02u:", ts->hour);
-    }
+	if (dump_hour || ts->hour != 0) {
+		fprintf(dump, "%02u:", ts->hour);
+	}
 
-    fprintf(dump, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
+	fprintf(dump, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
 }
 
 static GF_Err gf_webvtt_add_cue_to_samples(GF_WebVTTParser *parser, GF_List *samples, GF_WebVTTCue *cue)
 {
-    s32 i;
-    u64 cue_start;
-    u64 cue_end;
-    u64 sample_end;
-
-    sample_end = 0;
-    cue_start = gf_webvtt_timestamp_get(&cue->start);
-    cue_end   = gf_webvtt_timestamp_get(&cue->end);
-    /* samples in the samples list are contiguous: sample(n)->start == sample(n-1)->end */
-    for (i = 0; i < (s32)gf_list_count(samples); i++) {
-        GF_WebVTTSample *sample;
-        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)
-        {
-            /* 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) 
-        {
-            /* 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)
-        {
-            /* flush the current sample */
-            gf_list_del_item(samples, sample);
-            parser->on_sample_parsed(parser->user, sample);
-            sample = NULL;
-            i--;
-            /* process the cue with next sample (if any) or create a new sample */
-            continue;
-        }
-        else if (cue_start >= sample->start) 
-        {
-            u32 j;
-            if (cue_start > sample->start) {
-                /* create a new sample, insert it after the current one */
-                GF_WebVTTSample *new_sample = gf_webvtt_sample_new();
-                new_sample->start = cue_start;
-                new_sample->end = sample->end;
-                gf_list_insert(samples, new_sample, i+1);
-                /* split the cues from the old sample into the new one */
-                for (j = 0; j < gf_list_count(sample->cues); j++) {
-                    GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, j);
-                    GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(old_cue, &cue->start);
-                    gf_list_add(new_sample->cues, new_cue);
-                }
-                /* adjust the end of the old sample and flush it */
-                sample->end = cue_start;
-                gf_list_del_item(samples, sample);
-                parser->on_sample_parsed(parser->user, sample);
-                sample = NULL;
-                i--;
-                /* process the cue again with this new sample */
-                continue;
-            }
-            if (cue_end > sample->end) {
-                /* the cue is longer than the sample, we split the cue, add one part to the current sample
-                and reevaluate with the last part of the cue */
-                GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, 0);
-                GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(cue, &old_cue->end);
-                gf_list_add(sample->cues, cue);
-                cue = new_cue;
-                cue_start = sample->end;
-                /* cue_end unchanged */
-                /* process the remaining part of the cue (i.e. the new cue) with the other samples */
-                continue;
-            } else { /* cue_end < sample->end */
-                GF_WebVTTSample *new_sample = gf_webvtt_sample_new();
-                new_sample->start = cue_end;
-                new_sample->end   = sample->end;
-                gf_list_insert(samples, new_sample, i+1);
-                for (j = 0; j < gf_list_count(sample->cues); j++) {
-                    GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, j);
-                    GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(old_cue, &cue->end);
-                    gf_list_add(new_sample->cues, new_cue);
-                }
-                gf_list_add(sample->cues, cue);
-                sample->end = new_sample->start;
-                /* done with this cue */
-                return GF_OK;
-            }
-        }
-    }
-    /* (a part of) the cue remains (was not overlapping) */
-    if (cue_start > sample_end) {
-        /* if the new cue start is greater than the last sample end, 
-            create an empty sample to fill the gap, flush it */
-        GF_WebVTTSample *esample = gf_webvtt_sample_new();
-        esample->start = sample_end;
-        esample->end   = cue_start;
-        parser->on_sample_parsed(parser->user, esample);
-    }
-    /* if the cue has not been added to a sample, create a new sample for it */
-    {
-        GF_WebVTTSample *sample;
-        sample = gf_webvtt_sample_new();
-        gf_list_add(samples, sample);
-        sample->start = cue_start;
-        sample->end = cue_end;
-        gf_list_add(sample->cues, cue);
-    }
-    return GF_OK;
+	s32 i;
+	u64 cue_start;
+	u64 cue_end;
+	u64 sample_end;
+
+	sample_end = 0;
+	cue_start = gf_webvtt_timestamp_get(&cue->start);
+	cue_end   = gf_webvtt_timestamp_get(&cue->end);
+	/* samples in the samples list are contiguous: sample(n)->start == sample(n-1)->end */
+	for (i = 0; i < (s32)gf_list_count(samples); i++) {
+		GF_WebVTTSample *sample;
+		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)
+		{
+			/* 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)
+		{
+			/* 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)
+		{
+			/* flush the current sample */
+			gf_list_del_item(samples, sample);
+			parser->on_sample_parsed(parser->user, sample);
+			sample = NULL;
+			i--;
+			/* process the cue with next sample (if any) or create a new sample */
+			continue;
+		}
+		else if (cue_start >= sample->start)
+		{
+			u32 j;
+			if (cue_start > sample->start) {
+				/* create a new sample, insert it after the current one */
+				GF_WebVTTSample *new_sample = gf_webvtt_sample_new();
+				new_sample->start = cue_start;
+				new_sample->end = sample->end;
+				gf_list_insert(samples, new_sample, i+1);
+				/* split the cues from the old sample into the new one */
+				for (j = 0; j < gf_list_count(sample->cues); j++) {
+					GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, j);
+					GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(old_cue, &cue->start);
+					gf_list_add(new_sample->cues, new_cue);
+				}
+				/* adjust the end of the old sample and flush it */
+				sample->end = cue_start;
+				gf_list_del_item(samples, sample);
+				parser->on_sample_parsed(parser->user, sample);
+				sample = NULL;
+				i--;
+				/* process the cue again with this new sample */
+				continue;
+			}
+			if (cue_end > sample->end) {
+				/* the cue is longer than the sample, we split the cue, add one part to the current sample
+				and reevaluate with the last part of the cue */
+				GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, 0);
+				GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(cue, &old_cue->end);
+				gf_list_add(sample->cues, cue);
+				cue = new_cue;
+				cue_start = sample->end;
+				/* cue_end unchanged */
+				/* process the remaining part of the cue (i.e. the new cue) with the other samples */
+				continue;
+			} else { /* cue_end < sample->end */
+				GF_WebVTTSample *new_sample = gf_webvtt_sample_new();
+				new_sample->start = cue_end;
+				new_sample->end   = sample->end;
+				gf_list_insert(samples, new_sample, i+1);
+				for (j = 0; j < gf_list_count(sample->cues); j++) {
+					GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, j);
+					GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(old_cue, &cue->end);
+					gf_list_add(new_sample->cues, new_cue);
+				}
+				gf_list_add(sample->cues, cue);
+				sample->end = new_sample->start;
+				/* done with this cue */
+				return GF_OK;
+			}
+		}
+	}
+	/* (a part of) the cue remains (was not overlapping) */
+	if (cue_start > sample_end) {
+		/* if the new cue start is greater than the last sample end,
+		    create an empty sample to fill the gap, flush it */
+		GF_WebVTTSample *esample = gf_webvtt_sample_new();
+		esample->start = sample_end;
+		esample->end   = cue_start;
+		parser->on_sample_parsed(parser->user, esample);
+	}
+	/* if the cue has not been added to a sample, create a new sample for it */
+	{
+		GF_WebVTTSample *sample;
+		sample = gf_webvtt_sample_new();
+		gf_list_add(samples, sample);
+		sample->start = cue_start;
+		sample->end = cue_end;
+		gf_list_add(sample->cues, cue);
+	}
+	return GF_OK;
 }
 
 #define REM_TRAIL_MARKS(__str, __sep) while (1) {	\
@@ -866,81 +885,81 @@
 
 extern char *gf_text_get_utf8_line(char *szLine, u32 lineSize, FILE *txt_in, s32 unicode_type);
 
-GF_Err gf_webvtt_parse_timestamp(GF_WebVTTParser *parser, GF_WebVTTTimestamp *ts, const char *line) 
+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;
-    if (!ts || !line) return GF_BAD_PARAM;
-    len = (u32) strlen(line);
-    if (!len) return GF_BAD_PARAM;
-    pos = 0;
-    if (!(line[pos] >= '0' && line[pos] <= '9')) return GF_BAD_PARAM;
-    value1 = 0;
-    while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
-        value1 = value1*10 + (line[pos]-'0');
-        pos++;
-    }
-    if (pos>2 || value1>59) { 
-        is_hour = GF_TRUE; 
-    }
-    if (pos == len || line[pos] != ':') {
-        return GF_BAD_PARAM;
-    } else {
-        pos++;
-    }
-    value2 = 0;
-    pos2 = 0;
-    while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
-        value2 = value2*10 + (line[pos]-'0');
-        pos++;
-        pos2++;
-        if (pos2 > 2) return GF_BAD_PARAM;
-    }
-    if (is_hour || (pos < len && line[pos] == ':')) {
-        if (pos == len || line[pos] != ':') {
-            return GF_BAD_PARAM;
-        } else {
-            pos++;
-            pos2 = 0;
-            value3 = 0;
-            while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
-                value3 = value3*10 + (line[pos]-'0');
-                pos++;
-                pos2++;
-                if (pos2 > 2) return GF_BAD_PARAM;
-            }
-        }
-    } else {
-        value3 = value2;
-        value2 = value1;
-        value1 = 0;
-    }
-    /* checking SRT syntax for timestamp with , */
-    if (pos == len || (!parser->is_srt && line[pos] != '.') || (parser->is_srt && line[pos] != ',')) {
-        return GF_BAD_PARAM;
-    } else {
-        pos++;
-    }
-    pos2 = 0;
-    value4 = 0;
-    while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
-        value4 = value4*10 + (line[pos]-'0');
-        pos++;
-        pos2++;
-        if (pos2 > 4) return GF_BAD_PARAM;
-    }
-    if (value2>59 || value3 > 59) return GF_BAD_PARAM;
-    ts->hour = value1;
-    ts->min = value2;
-    ts->sec = value3;
-    ts->ms = value4;
-    return GF_OK;
+	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;
+	pos = 0;
+	if (!(line[pos] >= '0' && line[pos] <= '9')) return GF_BAD_PARAM;
+	value1 = 0;
+	while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
+		value1 = value1*10 + (line[pos]-'0');
+		pos++;
+	}
+	if (pos>2 || value1>59) {
+		is_hour = GF_TRUE;
+	}
+	if (pos == len || line[pos] != ':') {
+		return GF_BAD_PARAM;
+	} else {
+		pos++;
+	}
+	value2 = 0;
+	pos2 = 0;
+	while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
+		value2 = value2*10 + (line[pos]-'0');
+		pos++;
+		pos2++;
+		if (pos2 > 2) return GF_BAD_PARAM;
+	}
+	if (is_hour || (pos < len && line[pos] == ':')) {
+		if (pos == len || line[pos] != ':') {
+			return GF_BAD_PARAM;
+		} else {
+			pos++;
+			pos2 = 0;
+			value3 = 0;
+			while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
+				value3 = value3*10 + (line[pos]-'0');
+				pos++;
+				pos2++;
+				if (pos2 > 2) return GF_BAD_PARAM;
+			}
+		}
+	} else {
+		value3 = value2;
+		value2 = value1;
+		value1 = 0;
+	}
+	/* checking SRT syntax for timestamp with , */
+	if (pos == len || (!parser->is_srt && line[pos] != '.') || (parser->is_srt && line[pos] != ',')) {
+		return GF_BAD_PARAM;
+	} else {
+		pos++;
+	}
+	pos2 = 0;
+	value4 = 0;
+	while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
+		value4 = value4*10 + (line[pos]-'0');
+		pos++;
+		pos2++;
+		if (pos2 > 4) return GF_BAD_PARAM;
+	}
+	if (value2>59 || value3 > 59) return GF_BAD_PARAM;
+	ts->hour = value1;
+	ts->min = value2;
+	ts->sec = value3;
+	ts->ms = value4;
+	return GF_OK;
 }
 
 #define SKIP_WHITESPACE \
@@ -949,302 +968,316 @@
 
 GF_Err gf_webvtt_parser_parse_timings_settings(GF_WebVTTParser *parser, GF_WebVTTCue *cue, char *line, u32 len)
 {
-    GF_Err  e;
-    char *timestamp_string;
-    u32 pos;
-    e = GF_OK;
-    pos = 0;
-    if (!cue || !line || !len) return GF_BAD_PARAM;
-    SKIP_WHITESPACE
-    timestamp_string = line + pos;
-    while (pos < len && line[pos] != ' ' && line[pos] != '\t') pos++;
-    if (pos == len) {
-        e = GF_CORRUPTED_DATA;
-        parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
-        return e;
-    }
-    line[pos] = 0;
-    e = gf_webvtt_parse_timestamp(parser, &cue->start, timestamp_string);
-    if (e) {
-        parser->report_message(parser->user, e, "Bad VTT timestamp formatting %s", timestamp_string);
-        return e;
-    }
-    line[pos] = ' ';
-    SKIP_WHITESPACE
-    if (pos == len) {
-        e = GF_CORRUPTED_DATA;
-        parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
-        return e;
-    }
-    if ( (pos+2)>= len || line[pos] != '-' || line[pos+1] != '-' || line[pos+2] != '>') {
-        e = GF_CORRUPTED_DATA;
-        parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
-        return e;
-    } else {
-        pos += 3;
-        SKIP_WHITESPACE
-        if (pos == len) {
-            e = GF_CORRUPTED_DATA;
-            parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
-            return e;
-        }
-        timestamp_string = line + pos;
-        while (pos < len && line[pos] != ' ' && line[pos] != '\t') pos++;
-        if (pos < len) {
-            line[pos] = 0;
-        }
-        e = gf_webvtt_parse_timestamp(parser, &cue->end, timestamp_string);
-        if (e) {
-            parser->report_message(parser->user, e, "Bad VTT timestamp formatting %s", timestamp_string);
-            return e;
-        }
-        if (pos < len) {
-            line[pos] = ' ';
-        }
-        SKIP_WHITESPACE
-        if (pos < len) {
-            char *settings = line + pos;
-            e = gf_webvtt_cue_add_property(cue, WEBVTT_SETTINGS, settings, (u32) strlen(settings));
-        }
-    }
-    return e;
+	GF_Err  e;
+	char *timestamp_string;
+	u32 pos;
+	e = GF_OK;
+	pos = 0;
+	if (!cue || !line || !len) return GF_BAD_PARAM;
+	SKIP_WHITESPACE
+	timestamp_string = line + pos;
+	while (pos < len && line[pos] != ' ' && line[pos] != '\t') pos++;
+	if (pos == len) {
+		e = GF_CORRUPTED_DATA;
+		parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
+		return e;
+	}
+	line[pos] = 0;
+	e = gf_webvtt_parse_timestamp(parser, &cue->start, timestamp_string);
+	if (e) {
+		parser->report_message(parser->user, e, "Bad VTT timestamp formatting %s", timestamp_string);
+		return e;
+	}
+	line[pos] = ' ';
+	SKIP_WHITESPACE
+	if (pos == len) {
+		e = GF_CORRUPTED_DATA;
+		parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
+		return e;
+	}
+	if ( (pos+2)>= len || line[pos] != '-' || line[pos+1] != '-' || line[pos+2] != '>') {
+		e = GF_CORRUPTED_DATA;
+		parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
+		return e;
+	} else {
+		pos += 3;
+		SKIP_WHITESPACE
+		if (pos == len) {
+			e = GF_CORRUPTED_DATA;
+			parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
+			return e;
+		}
+		timestamp_string = line + pos;
+		while (pos < len && line[pos] != ' ' && line[pos] != '\t') pos++;
+		if (pos < len) {
+			line[pos] = 0;
+		}
+		e = gf_webvtt_parse_timestamp(parser, &cue->end, timestamp_string);
+		if (e) {
+			parser->report_message(parser->user, e, "Bad VTT timestamp formatting %s", timestamp_string);
+			return e;
+		}
+		if (pos < len) {
+			line[pos] = ' ';
+		}
+		SKIP_WHITESPACE
+		if (pos < len) {
+			char *settings = line + pos;
+			e = gf_webvtt_cue_add_property(cue, WEBVTT_SETTINGS, settings, (u32) strlen(settings));
+		}
+	}
+	return e;
 }
 
 GF_Err gf_webvtt_parser_parse(GF_WebVTTParser *parser, u32 duration)
 {
-    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;
-
-    if (!parser) return GF_BAD_PARAM;
-    if (parser->is_srt) {
-        parser->on_header_parsed(parser->user, gf_strdup("WEBVTT\n"));
-    }
-    while (do_parse) {
-        sOK = gf_text_get_utf8_line(szLine, 2048, parser->vtt_in, parser->unicode_type);
-        REM_TRAIL_MARKS(szLine, "\r\n")
-        len = (u32) strlen(szLine);
-        switch (parser->state) {
-        case WEBVTT_PARSER_STATE_WAITING_SIGNATURE:
-            if (!sOK || len < 6 || strnicmp(szLine, "WEBVTT", 6) || (len > 6 && szLine[6] != ' ' && szLine[6] != '\t')) {
-                e = GF_CORRUPTED_DATA;
-                parser->report_message(parser->user, e, "Bad WEBVTT file signature %s", szLine);
-                goto exit;
-            } else {
-                if (had_marks) { szLine[len] = '\n'; len++; }
-                header = gf_strdup(szLine);
-                header_len = len;
-                parser->state = WEBVTT_PARSER_STATE_WAITING_HEADER;
-            }
-            break; /* proceed to next line */
-        case WEBVTT_PARSER_STATE_WAITING_HEADER:
-            if (prevLine) {
-                u32 prev_len = (u32) strlen(prevLine);
-                header = (char *)gf_realloc(header, header_len + prev_len + 1);
-                strcpy(header+header_len,prevLine); 
-                header_len += prev_len;
-                gf_free(prevLine);
-                prevLine = NULL;
-            }
-            if (sOK && len) {
-                if (strstr(szLine, "-->")) {
-                    parser->on_header_parsed(parser->user, header);
-                    /* continue to the next state without breaking */
-                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP;
-                    /* no break, continue to the next state*/
-                } else {
-                    if (had_marks) { szLine[len] = '\n'; len++; }
-                    prevLine = gf_strdup(szLine);
-                    break; /* proceed to next line */
-                }
-            } else {
-                parser->on_header_parsed(parser->user, header);
-                if (!sOK) {
-                    /* end of file, parsing is done */
-                    do_parse = GF_FALSE;
-                    break;
-                } else {
-                    /* empty line means end of header */
-                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
-                    /* no break, continue to the next state*/
-                }
-            }
-        case WEBVTT_PARSER_STATE_WAITING_CUE:
-            if (sOK && len) {
-                if (strstr(szLine, "-->")) {
-                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP;
-                    /* continue to the next state without breaking */
-                } else {
-                    /* discard the previous line */
-                    /* should we do something with it ? callback ?*/
-                    if (prevLine) {
-                        gf_free(prevLine);
-                        prevLine = NULL;
-                    }
-                    /* save this new line */
-                    if (had_marks) { szLine[len] = '\n'; len++; }
-                    prevLine = gf_strdup(szLine);
-                    /* stay in the same state */
-                    break;
-                }
-            } else {
-                /* discard the previous line */
-                /* should we do something with it ? callback ?*/
-                if (prevLine) {
-                    gf_free(prevLine);
-                    prevLine = NULL;
-                }
-                if (!sOK) {
-                    do_parse = GF_FALSE;
-                    break;
-                } else {
-                    /* remove empty lines and stay in the same state */
-                    break;
-                }
-            }
-        case WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP:
-            if (sOK && len) {
-                if (cue == NULL) {
-                    cue   = gf_webvtt_cue_new();
-                }
-                if (prevLine) {
-                    gf_webvtt_cue_add_property(cue, WEBVTT_ID, prevLine, (u32) strlen(prevLine));
-                    gf_free(prevLine);
-                    prevLine = NULL;
-                }
-                e = gf_webvtt_parser_parse_timings_settings(parser, cue, szLine, len);
-                if (e) {
-                    if (cue) gf_webvtt_cue_del(cue);
-                    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);
-                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD;
-                }
-            } else {
-                /* not possible */
-                assert(0);
-            }
-            break;
-        case WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD:
-            if (sOK && len) {
-                if (had_marks) { szLine[len] = '\n'; len++; }
-                gf_webvtt_cue_add_property(cue, WEBVTT_PAYLOAD, szLine, len);
-                /* remain in the same state as a cue payload can have multiple lines */
-                break;
-            } else {
-                /* end of the current cue */
-                gf_webvtt_add_cue_to_samples(parser, parser->samples, cue);
-                cue = NULL;
-
-                gf_set_progress("Importing WebVTT", gf_f64_tell(parser->vtt_in), parser->file_size);
-                if ((duration && (end >= duration)) || !sOK) {
-                    do_parse = GF_FALSE;
-                    break;
-                } else {
-                    /* empty line, move to next cue */
-                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
-                    break;
-                }
-            }
-        }
-        if (duration && (start >= duration)) { 
-            do_parse = GF_FALSE; 
-            break;
-        }
-    }
-
-
-    /* no more cues to come, flush everything */
-    if (cue) {
-        gf_webvtt_add_cue_to_samples(parser, parser->samples, cue);
-        cue = NULL;
-    }
-    while (gf_list_count(parser->samples) > 0) {
-        GF_WebVTTSample *sample = (GF_WebVTTSample *)gf_list_get(parser->samples, 0);
-        parser->last_duration = sample->end - sample->start;
-        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;
+	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;
+
+	if (!parser) return GF_BAD_PARAM;
+	if (parser->is_srt) {
+		parser->on_header_parsed(parser->user, gf_strdup("WEBVTT\n"));
+	}
+	while (do_parse) {
+		sOK = gf_text_get_utf8_line(szLine, 2048, parser->vtt_in, parser->unicode_type);
+		REM_TRAIL_MARKS(szLine, "\r\n")
+		len = (u32) strlen(szLine);
+		switch (parser->state) {
+		case WEBVTT_PARSER_STATE_WAITING_SIGNATURE:
+			if (!sOK || len < 6 || strnicmp(szLine, "WEBVTT", 6) || (len > 6 && szLine[6] != ' ' && szLine[6] != '\t')) {
+				e = GF_CORRUPTED_DATA;
+				parser->report_message(parser->user, e, "Bad WEBVTT file signature %s", szLine);
+				goto exit;
+			} else {
+				if (had_marks) {
+					szLine[len] = '\n';
+					len++;
+				}
+				header = gf_strdup(szLine);
+				header_len = len;
+				parser->state = WEBVTT_PARSER_STATE_WAITING_HEADER;
+			}
+			break; /* proceed to next line */
+		case WEBVTT_PARSER_STATE_WAITING_HEADER:
+			if (prevLine) {
+				u32 prev_len = (u32) strlen(prevLine);
+				header = (char *)gf_realloc(header, header_len + prev_len + 1);
+				strcpy(header+header_len,prevLine);
+				header_len += prev_len;
+				gf_free(prevLine);
+				prevLine = NULL;
+			}
+			if (sOK && len) {
+				if (strstr(szLine, "-->")) {
+					parser->on_header_parsed(parser->user, header);
+					/* continue to the next state without breaking */
+					parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP;
+					/* no break, continue to the next state*/
+				} else {
+					if (had_marks) {
+						szLine[len] = '\n';
+						len++;
+					}
+					prevLine = gf_strdup(szLine);
+					break; /* proceed to next line */
+				}
+			} else {
+				parser->on_header_parsed(parser->user, header);
+				if (!sOK) {
+					/* end of file, parsing is done */
+					do_parse = GF_FALSE;
+					break;
+				} else {
+					/* empty line means end of header */
+					parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
+					/* no break, continue to the next state*/
+				}
+			}
+		case WEBVTT_PARSER_STATE_WAITING_CUE:
+			if (sOK && len) {
+				if (strstr(szLine, "-->")) {
+					parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP;
+					/* continue to the next state without breaking */
+				} else {
+					/* discard the previous line */
+					/* should we do something with it ? callback ?*/
+					if (prevLine) {
+						gf_free(prevLine);
+						prevLine = NULL;
+					}
+					/* save this new line */
+					if (had_marks) {
+						szLine[len] = '\n';
+						len++;
+					}
+					prevLine = gf_strdup(szLine);
+					/* stay in the same state */
+					break;
+				}
+			} else {
+				/* discard the previous line */
+				/* should we do something with it ? callback ?*/
+				if (prevLine) {
+					gf_free(prevLine);
+					prevLine = NULL;
+				}
+				if (!sOK) {
+					do_parse = GF_FALSE;
+					break;
+				} else {
+					/* remove empty lines and stay in the same state */
+					break;
+				}
+			}
+		case WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP:
+			if (sOK && len) {
+				if (cue == NULL) {
+					cue   = gf_webvtt_cue_new();
+				}
+				if (prevLine) {
+					gf_webvtt_cue_add_property(cue, WEBVTT_ID, prevLine, (u32) strlen(prevLine));
+					gf_free(prevLine);
+					prevLine = NULL;
+				}
+				e = gf_webvtt_parser_parse_timings_settings(parser, cue, szLine, len);
+				if (e) {
+					if (cue) gf_webvtt_cue_del(cue);
+					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);
+					parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD;
+				}
+			} else {
+				/* not possible */
+				assert(0);
+			}
+			break;
+		case WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD:
+			if (sOK && len) {
+				if (had_marks) {
+					szLine[len] = '\n';
+					len++;
+				}
+				gf_webvtt_cue_add_property(cue, WEBVTT_PAYLOAD, szLine, len);
+				/* remain in the same state as a cue payload can have multiple lines */
+				break;
+			} else {
+				/* end of the current cue */
+				gf_webvtt_add_cue_to_samples(parser, parser->samples, cue);
+				cue = NULL;
+
+				gf_set_progress("Importing WebVTT", gf_f64_tell(parser->vtt_in), parser->file_size);
+				if ((duration && (end >= duration)) || !sOK) {
+					do_parse = GF_FALSE;
+					break;
+				} else {
+					/* empty line, move to next cue */
+					parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
+					break;
+				}
+			}
+		}
+		if (duration && (start >= duration)) {
+			do_parse = GF_FALSE;
+			break;
+		}
+	}
+
+
+	/* no more cues to come, flush everything */
+	if (cue) {
+		gf_webvtt_add_cue_to_samples(parser, parser->samples, cue);
+		cue = NULL;
+	}
+	while (gf_list_count(parser->samples) > 0) {
+		GF_WebVTTSample *sample = (GF_WebVTTSample *)gf_list_get(parser->samples, 0);
+		parser->last_duration = sample->end - sample->start;
+		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;
 exit:
-    if (cue) gf_webvtt_cue_del(cue);
-    if (prevLine) gf_free(prevLine);
-    if (header) gf_free(header);
-    return e;
+	if (cue) gf_webvtt_cue_del(cue);
+	if (prevLine) gf_free(prevLine);
+	if (header) gf_free(header);
+	return e;
 }
 
 GF_Err gf_webvtt_dump_header_boxed(FILE *dump, const char *data, u32 dataLength, u32 *dumpedLength)
 {
 	GF_Err e;
 	GF_Box *box;
-    GF_StringBox *config;
+	GF_StringBox *config;
 	GF_BitStream *bs;
 	*dumpedLength = 0;
 	bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
 	e = gf_isom_parse_box(&box, bs);
-    if (!box || (box->type != GF_ISOM_BOX_TYPE_VTTC && box->type != GF_ISOM_BOX_TYPE_STTC)) return GF_BAD_PARAM;
+	if (!box || (box->type != GF_ISOM_BOX_TYPE_VTTC && box->type != GF_ISOM_BOX_TYPE_STTC)) return GF_BAD_PARAM;
 	config = (GF_StringBox *)box;
-    if (config->string) {
+	if (config->string) {
 		fprintf(dump, "%s", config->string);
 		*dumpedLength = (u32)strlen(config->string)+1;
-	} 
+	}
 	gf_bs_del(bs);
 	gf_isom_box_del(box);
-    return e;
+	return e;
 }
 
 GF_Err gf_webvtt_dump_header(FILE *dump, GF_ISOFile *file, u32 track, u32 index)
 {
-    GF_WebVTTSampleEntryBox *wvtt;
-    wvtt = gf_webvtt_isom_get_description(file, track, index);
-    if (!wvtt) return GF_BAD_PARAM;
-    fprintf(dump, "%s\n", wvtt->config->string);
-    return GF_OK;
+	GF_WebVTTSampleEntryBox *wvtt;
+	wvtt = gf_webvtt_isom_get_description(file, track, index);
+	if (!wvtt) return GF_BAD_PARAM;
+	fprintf(dump, "%s\n\n", wvtt->config->string);
+	return GF_OK;
 }
 
 GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample)
 {
-    GF_Err e;
-    GF_BitStream *bs;
-
-    bs = gf_bs_new(iso_sample->data, iso_sample->dataLength, GF_BITSTREAM_READ);
-    while(gf_bs_available(bs))
-    {
-        GF_Box *box;
-        GF_WebVTTTimestamp ts;
-        e = gf_isom_parse_box(&box, bs);
-        if (e) return e;
-        if (box->type == GF_ISOM_BOX_TYPE_VTCU) {
-            GF_VTTCueBox *cuebox = (GF_VTTCueBox *)box;
-            if (cuebox->id) 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");
-        } 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_isom_box_del(box);
-    }
-    gf_bs_del(bs);
-    return GF_OK;
+	GF_Err e;
+	GF_BitStream *bs;
+
+	bs = gf_bs_new(iso_sample->data, iso_sample->dataLength, GF_BITSTREAM_READ);
+	while(gf_bs_available(bs))
+	{
+		GF_Box *box;
+		GF_WebVTTTimestamp ts;
+		e = gf_isom_parse_box(&box, bs);
+		if (e) return e;
+		if (box->type == GF_ISOM_BOX_TYPE_VTCU) {
+			GF_VTTCueBox *cuebox = (GF_VTTCueBox *)box;
+			if (cuebox->id) 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");
+		} 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");
+		} else if (box->type == GF_ISOM_BOX_TYPE_VTTA) {
+			fprintf(dump, "%s\n\n", ((GF_StringBox *)box)->string);
+		}
+		gf_isom_box_del(box);
+	}
+	gf_bs_del(bs);
+	return GF_OK;
 }
 
 GF_EXPORT
@@ -1256,241 +1289,273 @@
 GF_EXPORT
 GF_List *gf_webvtt_parse_cues_from_data(const char *data, u32 dataLength, u64 start)
 {
-    GF_List         *cues;
-    GF_WebVTTCue    *cue;
-    GF_VTTCueBox    *cuebox;
-    GF_BitStream    *bs;
-    cues = gf_list_new();
-    bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
-    while(gf_bs_available(bs))
-    {
-        GF_Err  e;
-        GF_Box  *box;
-        e = gf_isom_parse_box(&box, bs);
-        if (e) return NULL;
-        if (box->type == GF_ISOM_BOX_TYPE_VTCU) {
-            cuebox = (GF_VTTCueBox *)box;
-            cue   = gf_webvtt_cue_new();
-            gf_list_add(cues, cue);
-            gf_webvtt_timestamp_set(&cue->start, start);
-            if (cuebox->id) {
-                gf_webvtt_cue_add_property(cue, WEBVTT_ID, cuebox->id->string, (u32) strlen(cuebox->id->string));
-            }
-            if (cuebox->settings) {
-                gf_webvtt_cue_add_property(cue, WEBVTT_SETTINGS, cuebox->settings->string, (u32) strlen(cuebox->settings->string));
-            }
-            if (cuebox->payload) {
-                gf_webvtt_cue_add_property(cue, WEBVTT_PAYLOAD, cuebox->payload->string, (u32) strlen(cuebox->payload->string));
-            }
-        }
-        gf_isom_box_del(box);
-    }
-    gf_bs_del(bs);
-    return cues;
+	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);
+	while(gf_bs_available(bs))
+	{
+		GF_Err  e;
+		GF_Box  *box;
+		e = gf_isom_parse_box(&box, bs);
+		if (e) return NULL;
+		if (box->type == GF_ISOM_BOX_TYPE_VTCU) {
+			cuebox = (GF_VTTCueBox *)box;
+			cue   = gf_webvtt_cue_new();
+			if (pre_text) {
+				gf_webvtt_cue_add_property(cue, WEBVTT_PRECUE_TEXT, pre_text, (u32) strlen(pre_text));
+				gf_free(pre_text);
+				pre_text = NULL;
+			}
+			gf_list_add(cues, cue);
+			gf_webvtt_timestamp_set(&cue->start, start);
+			if (cuebox->id) {
+				gf_webvtt_cue_add_property(cue, WEBVTT_ID, cuebox->id->string, (u32) strlen(cuebox->id->string));
+			}
+			if (cuebox->settings) {
+				gf_webvtt_cue_add_property(cue, WEBVTT_SETTINGS, cuebox->settings->string, (u32) strlen(cuebox->settings->string));
+			}
+			if (cuebox->payload) {
+				gf_webvtt_cue_add_property(cue, WEBVTT_PAYLOAD, cuebox->payload->string, (u32) strlen(cuebox->payload->string));
+			}
+		} else if (box->type == GF_ISOM_BOX_TYPE_VTTA) {
+			GF_StringBox *sbox = (GF_StringBox *)box;
+			if (cue) {
+				gf_webvtt_cue_add_property(cue, WEBVTT_POSTCUE_TEXT, sbox->string, (u32) strlen(sbox->string));
+			} else {
+				pre_text = gf_strdup(sbox->string);
+			}
+		}
+		gf_isom_box_del(box);
+	}
+	gf_bs_del(bs);
+	return cues;
 }
 
 GF_Err gf_webvtt_merge_cues(GF_WebVTTParser *parser, u64 start, GF_List *cues)
 {
-    GF_WebVTTSample *wsample;
-    GF_WebVTTSample *prev_wsample;
-    Bool            has_continuation_cue = GF_FALSE;
-
-    assert(gf_list_count(parser->samples) <= 1);
-
-    wsample = gf_webvtt_sample_new();
-    wsample->start = start;
-
-    prev_wsample = (GF_WebVTTSample *)gf_list_last(parser->samples);
-    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);
-            /* add the cue to the current sample */
-            gf_list_add(wsample->cues, cue);
-            /* update with the previous sample */
-            if (prev_wsample) {
-                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);
-                    gf_list_rem(prev_wsample->cues, 0);
-                    if (
-                        ((!cue->id && !old_cue->id) || (old_cue->id && cue->id && !strcmp(old_cue->id, cue->id))) &&
-                        ((!cue->settings && !old_cue->settings) || (old_cue->settings && cue->settings && !strcmp(old_cue->settings, cue->settings))) &&
-                        ((!cue->text && !old_cue->text) || (old_cue->text && cue->text && !strcmp(old_cue->text, cue->text)))
-                        ) {
-                        /* if it is the same cue, update its start with the initial start */
-                        cue->start = old_cue->start;
-                        has_continuation_cue = GF_TRUE;
-                        found = GF_TRUE;
-                        /* delete the old cue */
-                        gf_webvtt_cue_del(old_cue);
-                    } else {
-                        /* finalize the end cue time */
-                        if (gf_webvtt_timestamp_is_zero(&old_cue->end)) {
-                                gf_webvtt_timestamp_set(&old_cue->end, wsample->start);
-                        }
-                        /* transfer the cue */
-                        if (!has_continuation_cue) {
-                            /* the cue can be safely serialized while keeping the order */
-                            parser->on_cue_read(parser->user, old_cue);
-                        } else {
-                            /* keep the cue in the current sample to respect cue start ordering */
-                            gf_list_add(wsample->cues, old_cue);
-                        }
-                    }
-                }
-            }
-        }
-    }   
-    /* No cue in the current sample */
-    if (prev_wsample) {
-        while (gf_list_count(prev_wsample->cues)) {
-            GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(prev_wsample->cues, 0);
-            gf_list_rem(prev_wsample->cues, 0);
-            /* finalize the end cue time */
-            if (gf_webvtt_timestamp_is_zero(&cue->end)) {
-                gf_webvtt_timestamp_set(&cue->end, wsample->start);
-            }
-            /* transfer the cue */
-            if (!has_continuation_cue) {
-                /* the cue can be safely serialized while keeping the order */
-                parser->on_cue_read(parser->user, cue);
-            } else {
-                /* keep the cue in the current sample to respect cue start ordering */
-                gf_list_add(wsample->cues, cue);
-            }
-        }
-        gf_webvtt_sample_del(prev_wsample);
-        gf_list_rem_last(parser->samples);
-        prev_wsample = NULL;
-    } else {
-        /* nothing to do */
-    }
-    if (gf_list_count(wsample->cues)) {
-        gf_list_add(parser->samples, wsample);
-    } else {
-        gf_webvtt_sample_del(wsample);
-    }
-    return GF_OK;
+	GF_WebVTTSample *wsample;
+	GF_WebVTTSample *prev_wsample;
+	Bool            has_continuation_cue = GF_FALSE;
+
+	assert(gf_list_count(parser->samples) <= 1);
+
+	wsample = gf_webvtt_sample_new();
+	wsample->start = start;
+
+	prev_wsample = (GF_WebVTTSample *)gf_list_last(parser->samples);
+	while (gf_list_count(cues)) {
+		GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
+		gf_list_rem(cues, 0);
+		/* add the cue to the current sample */
+		gf_list_add(wsample->cues, cue);
+		/* update with the previous sample */
+		if (prev_wsample) {
+			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);
+				gf_list_rem(prev_wsample->cues, 0);
+				if (
+				    ((!cue->id && !old_cue->id) || (old_cue->id && cue->id && !strcmp(old_cue->id, cue->id))) &&
+				    ((!cue->settings && !old_cue->settings) || (old_cue->settings && cue->settings && !strcmp(old_cue->settings, cue->settings))) &&
+				    ((!cue->text && !old_cue->text) || (old_cue->text && cue->text && !strcmp(old_cue->text, cue->text)))
+				) {
+					/* if it is the same cue, update its start with the initial start */
+					cue->start = old_cue->start;
+					has_continuation_cue = GF_TRUE;
+					found = GF_TRUE;
+					if (old_cue->pre_text) {
+						cue->pre_text = old_cue->pre_text;
+						old_cue->pre_text = NULL;
+					}
+					if (old_cue->post_text) {
+						cue->post_text = old_cue->post_text;
+						old_cue->post_text = NULL;
+					}
+					/* delete the old cue */
+					gf_webvtt_cue_del(old_cue);
+				} else {
+					/* finalize the end cue time */
+					if (gf_webvtt_timestamp_is_zero(&old_cue->end)) {
+						gf_webvtt_timestamp_set(&old_cue->end, wsample->start);
+					}
+					/* transfer the cue */
+					if (!has_continuation_cue) {
+						/* the cue can be safely serialized while keeping the order */
+						parser->on_cue_read(parser->user, old_cue);
+					} else {
+						/* keep the cue in the current sample to respect cue start ordering */
+						gf_list_add(wsample->cues, old_cue);
+					}
+				}
+			}
+		}
+	}
+	/* No cue in the current sample */
+	if (prev_wsample) {
+		while (gf_list_count(prev_wsample->cues)) {
+			GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(prev_wsample->cues, 0);
+			gf_list_rem(prev_wsample->cues, 0);
+			/* finalize the end cue time */
+			if (gf_webvtt_timestamp_is_zero(&cue->end)) {
+				gf_webvtt_timestamp_set(&cue->end, wsample->start);
+			}
+			/* transfer the cue */
+			if (!has_continuation_cue) {
+				/* the cue can be safely serialized while keeping the order */
+				parser->on_cue_read(parser->user, cue);
+			} else {
+				/* keep the cue in the current sample to respect cue start ordering */
+				gf_list_add(wsample->cues, cue);
+			}
+		}
+		gf_webvtt_sample_del(prev_wsample);
+		gf_list_rem_last(parser->samples);
+		prev_wsample = NULL;
+	} else {
+		/* nothing to do */
+	}
+	if (gf_list_count(wsample->cues)) {
+		gf_list_add(parser->samples, wsample);
+	} else {
+		gf_webvtt_sample_del(wsample);
+	}
+	return GF_OK;
 }
 
 GF_Err gf_webvtt_parse_iso_sample(GF_WebVTTParser *parser, u32 timescale, GF_ISOSample *iso_sample, Bool merge)
 {
-    if (merge) {
-        u64             start;
-        GF_List         *cues;
-        start = (iso_sample->DTS * 1000) / timescale;
-        cues = gf_webvtt_parse_iso_cues(iso_sample, start);
-        gf_webvtt_merge_cues(parser, start, cues);
-        gf_list_del(cues);
-    } else {
-        gf_webvtt_dump_iso_sample((FILE *)parser->user, timescale, iso_sample);
-    }
-
-    return GF_OK;
+	if (merge) {
+		u64             start;
+		GF_List         *cues;
+		start = (iso_sample->DTS * 1000) / timescale;
+		cues = gf_webvtt_parse_iso_cues(iso_sample, start);
+		gf_webvtt_merge_cues(parser, start, cues);
+		gf_list_del(cues);
+	} else {
+		gf_webvtt_dump_iso_sample((FILE *)parser->user, timescale, iso_sample);
+	}
+
+	return GF_OK;
 }
 #endif //GPAC_DISABLE_MEDIA_IMPORT
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 static GF_Err gf_webvtt_parser_dump_finalize(GF_WebVTTParser *parser, u64 duration)
 {
-    GF_WebVTTSample *sample;
-    assert(gf_list_count(parser->samples) <= 1);
-    sample = (GF_WebVTTSample *)gf_list_get(parser->samples, 0);
-    if (sample) {
-        while (gf_list_count(sample->cues)) {
-            GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(sample->cues, 0);
-            gf_list_rem(sample->cues, 0);
-            if (gf_webvtt_timestamp_is_zero(&cue->end)) {
-                    gf_webvtt_timestamp_set(&cue->end, duration);
-            }
-            parser->on_cue_read(parser->user, cue);
-        }
-        gf_webvtt_sample_del(sample);
-        gf_list_rem(parser->samples, 0);
-    }
-    return GF_OK;
+	GF_WebVTTSample *sample;
+	assert(gf_list_count(parser->samples) <= 1);
+	sample = (GF_WebVTTSample *)gf_list_get(parser->samples, 0);
+	if (sample) {
+		while (gf_list_count(sample->cues)) {
+			GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(sample->cues, 0);
+			gf_list_rem(sample->cues, 0);
+			if (gf_webvtt_timestamp_is_zero(&cue->end)) {
+				gf_webvtt_timestamp_set(&cue->end, duration);
+			}
+			parser->on_cue_read(parser->user, cue);
+		}
+		gf_webvtt_sample_del(sample);
+		gf_list_rem(parser->samples, 0);
+	}
+	return GF_OK;
 }
 
 static void gf_webvtt_dump_cue(void *user, GF_WebVTTCue *cue)
 {
-    FILE *dump = (FILE *)user;
-    if (!cue || !dump) return;
-    if (cue->id) fprintf(dump, "%s", cue->id);
-    if (cue->start.hour || cue->end.hour) {
-        gf_webvtt_timestamp_dump(&cue->start, dump, GF_TRUE);
-        fprintf(dump, " --> ");
-        gf_webvtt_timestamp_dump(&cue->end, dump, GF_TRUE);
-    } else {
-        gf_webvtt_timestamp_dump(&cue->start, dump, GF_FALSE);
-        fprintf(dump, " --> ");
-        gf_webvtt_timestamp_dump(&cue->end, dump, GF_FALSE);
-    }
-    if (cue->settings) {
-        fprintf(dump, " %s", cue->settings);
-    }
-    fprintf(dump, "\n");
-    if (cue->text) fprintf(dump, "%s", cue->text);
-    fprintf(dump, "\n");
+	FILE *dump = (FILE *)user;
+	if (!cue || !dump) return;
+	if (cue->pre_text) {
+		fprintf(dump, "%s", cue->pre_text);
+		fprintf(dump, "\n");
+		fprintf(dump, "\n");
+	}
+	if (cue->id) 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_webvtt_timestamp_dump(&cue->end, dump, GF_TRUE);
+	} else {
+		gf_webvtt_timestamp_dump(&cue->start, dump, GF_FALSE);
+		fprintf(dump, " --> ");
+		gf_webvtt_timestamp_dump(&cue->end, dump, GF_FALSE);
+	}
+	if (cue->settings) {
+		fprintf(dump, " %s", cue->settings);
+	}
+	fprintf(dump, "\n");
+	if (cue->text) fprintf(dump, "%s", cue->text);
+	fprintf(dump, "\n");
+	fprintf(dump, "\n");
+	if (cue->post_text) {
+		fprintf(dump, "%s", cue->post_text);
+		fprintf(dump, "\n");
+		fprintf(dump, "\n");
+	}
 }
 
 static GF_Err gf_webvtt_dump_cues(FILE *dump, GF_List *cues)
 {
-    u32 i;
-    for (i = 0; i < gf_list_count(cues); i++) {
-        GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, i);
-        gf_webvtt_dump_cue(dump, cue);
-    }
-    return GF_OK;
+	u32 i;
+	for (i = 0; i < gf_list_count(cues); i++) {
+		GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, i);
+		gf_webvtt_dump_cue(dump, cue);
+	}
+	return GF_OK;
 }
 
 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);
-    return gf_webvtt_dump_cues(dump, samp->cues);
+	fprintf(stdout, "NOTE New WebVTT Sample ("LLD"-"LLD")\n\n", samp->start, samp->end);
+	return gf_webvtt_dump_cues(dump, samp->cues);
 }
 
 GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, char *szName, u32 track, Bool merge)
 {
-    GF_Err  e;
-    u32     i;
-    u32     count;
-    u32     timescale;
-    FILE    *out;
-    u32     di;
-    u64     duration;
-    GF_WebVTTParser *parser;
-
-    out = szName ? gf_f64_open(szName, "wt") : 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();
-    parser->user = out;
-    parser->on_cue_read = gf_webvtt_dump_cue;
-
-    e = gf_webvtt_dump_header(out, dumper->file, track, 1);
-    if (e) goto exit;
-
-    timescale = gf_isom_get_media_timescale(dumper->file, track);
-
-    count = gf_isom_get_sample_count(dumper->file, track);
-    for (i=0; i<count; i++) {
-        GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, i+1, &di);
-        if (!samp) {
-            e = gf_isom_last_error(dumper->file);
-            goto exit;
-        }
-        e = gf_webvtt_parse_iso_sample(parser, timescale, samp, merge);
-        if (e) goto exit;
-        //gf_webvtt_dump_iso_sample(out, timescale, samp);
-    }
-    duration = gf_isom_get_media_duration(dumper->file, track);
-    gf_webvtt_parser_dump_finalize(parser, duration);
+	GF_Err  e;
+	u32     i;
+	u32     count;
+	u32     timescale;
+	FILE    *out;
+	u32     di;
+	u64     duration;
+	GF_WebVTTParser *parser;
+
+	out = szName ? gf_f64_open(szName, "wt") : 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();
+	parser->user = out;
+	parser->on_cue_read = gf_webvtt_dump_cue;
+
+	e = gf_webvtt_dump_header(out, dumper->file, track, 1);
+	if (e) goto exit;
+
+	timescale = gf_isom_get_media_timescale(dumper->file, track);
+
+	count = gf_isom_get_sample_count(dumper->file, track);
+	for (i=0; i<count; i++) {
+		GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, i+1, &di);
+		if (!samp) {
+			e = gf_isom_last_error(dumper->file);
+			goto exit;
+		}
+		e = gf_webvtt_parse_iso_sample(parser, timescale, samp, merge);
+		if (e) goto exit;
+		//gf_webvtt_dump_iso_sample(out, timescale, samp);
+	}
+	duration = gf_isom_get_media_duration(dumper->file, track);
+	gf_webvtt_parser_dump_finalize(parser, duration);
 
 exit:
-    gf_webvtt_parser_del(parser);
-    if (szName) fclose(out);
-    return e;
+	gf_webvtt_parser_del(parser);
+	if (szName) fclose(out);
+	return e;
 }
 
 #endif //GPAC_DISABLE_ISOM_DUMP

gpac-0.5.0.svn5178.tar.bz2/src/odf/desc_private.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/desc_private.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -146,7 +146,7 @@
 	default:
 		//ISO Reserved
 		if ( (tag >= GF_ODF_ISO_RES_BEGIN_TAG) &&
-			(tag <= GF_ODF_ISO_RES_END_TAG) ) {
+		        (tag <= GF_ODF_ISO_RES_END_TAG) ) {
 			return NULL;
 		}
 		desc = gf_odf_new_default();
@@ -345,7 +345,7 @@
 		return gf_odf_read_smpte_camera(bs, (GF_SMPTECamera *)desc, DescSize);
 	case GF_ODF_SCI_TAG:
 		return gf_odf_read_sup_cid(bs, (GF_SCIDesc *)desc, DescSize);
-		
+
 	case GF_ODF_IPMP_TL_TAG:
 		return gf_odf_read_ipmp_tool_list(bs, (GF_IPMP_ToolList *)desc, DescSize);
 	case GF_ODF_IPMP_TOOL_TAG:
@@ -370,13 +370,13 @@
 GF_Err gf_odf_size_descriptor(GF_Descriptor *desc, u32 *outSize)
 {
 	switch(desc->tag) {
-	case GF_ODF_IOD_TAG : 
+	case GF_ODF_IOD_TAG :
 		return gf_odf_size_iod((GF_InitialObjectDescriptor *)desc, outSize);
-	case GF_ODF_ESD_TAG : 
+	case GF_ODF_ESD_TAG :
 		return gf_odf_size_esd((GF_ESD *)desc, outSize);
-	case GF_ODF_DCD_TAG : 
+	case GF_ODF_DCD_TAG :
 		return gf_odf_size_dcd((GF_DecoderConfig *)desc, outSize);
-	case GF_ODF_SLC_TAG : 
+	case GF_ODF_SLC_TAG :
 		return gf_odf_size_slc((GF_SLConfig *)desc, outSize);
 
 	case GF_ODF_OD_TAG:
@@ -396,7 +396,7 @@
 		return gf_odf_size_mediatime((GF_MediaTime *) desc, outSize);
 	case GF_ODF_MUXINFO_TAG:
 		return gf_odf_size_muxinfo((GF_MuxInfo *) desc, outSize);
-		
+
 	case GF_ODF_AUX_VIDEO_DATA:
 		return gf_odf_size_auxvid((GF_AuxVideoDescriptor *)desc, outSize);
 
@@ -469,13 +469,13 @@
 GF_Err gf_odf_write_descriptor(GF_BitStream *bs, GF_Descriptor *desc)
 {
 	switch(desc->tag) {
-	case GF_ODF_IOD_TAG : 
+	case GF_ODF_IOD_TAG :
 		return gf_odf_write_iod(bs, (GF_InitialObjectDescriptor *)desc);
-	case GF_ODF_ESD_TAG : 
+	case GF_ODF_ESD_TAG :
 		return gf_odf_write_esd(bs, (GF_ESD *)desc);
-	case GF_ODF_DCD_TAG : 
+	case GF_ODF_DCD_TAG :
 		return gf_odf_write_dcd(bs, (GF_DecoderConfig *)desc);
-	case GF_ODF_SLC_TAG : 
+	case GF_ODF_SLC_TAG :
 		return gf_odf_write_slc(bs, (GF_SLConfig *)desc);
 	case GF_ODF_ESD_INC_TAG:
 		return gf_odf_write_esd_inc(bs, (GF_ES_ID_Inc *)desc);
@@ -586,8 +586,8 @@
 		return gf_odf_new_ipmp_remove();
 
 	default:
-		if ( (tag >= GF_ODF_COM_ISO_BEGIN_TAG) && 
-			( tag <= GF_ODF_COM_ISO_END_TAG) ) {
+		if ( (tag >= GF_ODF_COM_ISO_BEGIN_TAG) &&
+		        ( tag <= GF_ODF_COM_ISO_END_TAG) ) {
 			return NULL;
 		}
 		com = gf_odf_new_base_command();
@@ -643,7 +643,7 @@
 	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);	
+		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);
 	}
@@ -698,7 +698,7 @@
 		return gf_odf_write_ipmp_update(bs, (GF_IPMPUpdate *)com);
 	case GF_ODF_IPMP_REMOVE_TAG:
 		return gf_odf_write_ipmp_remove(bs, (GF_IPMPRemove *)com);
-	
+
 	default:
 		return gf_odf_write_base_command(bs, (GF_BaseODCom *)com);
 	}

gpac-0.5.0.svn5178.tar.bz2/src/odf/descriptors.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/descriptors.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,20 +34,34 @@
 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";
+	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";
 	}
 }
 
@@ -101,7 +115,7 @@
 	//tag
 	tag = (u8) gf_bs_read_int(bs, 8);
 	sizeHeader = 1;
-	
+
 	//size
 	size = 0;
 	do {
@@ -119,7 +133,7 @@
 		*desc = NULL;
 		*desc_size = sizeHeader;
 		if ( (tag >= GF_ODF_ISO_RES_BEGIN_TAG) &&
-			(tag <= GF_ODF_ISO_RES_END_TAG) ) {
+		        (tag <= GF_ODF_ISO_RES_END_TAG) ) {
 			return GF_ODF_FORBIDDEN_DESCRIPTOR;
 		}
 		else if (!tag || (tag == 0xFF)) {
@@ -145,7 +159,7 @@
 		}
 	}
 
-	//little trick to handle lazy bitstreams that encode 
+	//little trick to handle lazy bitstreams that encode
 	//SizeOfInstance on a fix number of bytes
 	//This nb of bytes is added in Read methods
 	*desc_size += sizeHeader - gf_odf_size_field_size(*desc_size);
@@ -182,16 +196,16 @@
 	unsigned char vals[4];
 
 	if (!tag ) return GF_BAD_PARAM;
-	
+
 	length = size;
 	vals[3] = (unsigned char) (length & 0x7f);
 	length >>= 7;
-	vals[2] = (unsigned char) ((length & 0x7f) | 0x80); 
+	vals[2] = (unsigned char) ((length & 0x7f) | 0x80);
 	length >>= 7;
-	vals[1] = (unsigned char) ((length & 0x7f) | 0x80); 
+	vals[1] = (unsigned char) ((length & 0x7f) | 0x80);
 	length >>= 7;
 	vals[0] = (unsigned char) ((length & 0x7f) | 0x80);
-	
+
 	gf_bs_write_int(bs, tag, 8);
 	if (size < 0x00000080) {
 		gf_bs_write_int(bs, vals[3], 8);
@@ -246,7 +260,7 @@
 		if (tmp) {
 			e = gf_odf_write_descriptor(bs, tmp);
 			if (e) return e;
-		} 
+		}
 	}
 	return GF_OK;
 }
@@ -264,7 +278,7 @@
 		if (tmp && (tmp->tag==only_tag) ) {
 			e = gf_odf_write_descriptor(bs, tmp);
 			if (e) return e;
-		} 
+		}
 	}
 	return GF_OK;
 }
@@ -292,13 +306,16 @@
 	unsigned char vals[4];
 
 	if (!data || !data_len) return;
-	
+
 	length = data_len;
-	vals[3] = (unsigned char) (length & 0x7f); length >>= 7;
-	vals[2] = (unsigned char) ((length & 0x7f) | 0x80); length >>= 7;
-	vals[1] = (unsigned char) ((length & 0x7f) | 0x80); length >>= 7;
+	vals[3] = (unsigned char) (length & 0x7f);
+	length >>= 7;
+	vals[2] = (unsigned char) ((length & 0x7f) | 0x80);
+	length >>= 7;
+	vals[1] = (unsigned char) ((length & 0x7f) | 0x80);
+	length >>= 7;
 	vals[0] = (unsigned char) ((length & 0x7f) | 0x80);
-	
+
 	if (data_len < 0x00000080) {
 		gf_bs_write_int(bs, vals[3], 8);
 	} else if (data_len < 0x00004000) {
@@ -334,14 +351,14 @@
 
 	if (!dsi || !dsi->data || !dsi->dataLength ) {
 		/* Hack for T-DMB non compliant streams (OnTimeTek ?) */
-		cfg = (GF_BIFSConfig *) gf_odf_desc_new(GF_ODF_BIFS_CFG_TAG);	
+		cfg = (GF_BIFSConfig *) gf_odf_desc_new(GF_ODF_BIFS_CFG_TAG);
 		cfg->pixelMetrics = 1;
 		cfg->version = 1;
 		return cfg;
 	}
 	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
-	
-	cfg = (GF_BIFSConfig *) gf_odf_desc_new(GF_ODF_BIFS_CFG_TAG);	
+
+	cfg = (GF_BIFSConfig *) gf_odf_desc_new(GF_ODF_BIFS_CFG_TAG);
 	if (oti==2) {
 		/*3D Mesh Coding*/
 		gf_bs_read_int(bs, 1);
@@ -351,7 +368,7 @@
 	cfg->nodeIDbits = gf_bs_read_int(bs, 5);
 	cfg->routeIDbits = gf_bs_read_int(bs, 5);
 	if (oti==2) cfg->protoIDbits = gf_bs_read_int(bs, 5);
-	
+
 	cmd_stream = gf_bs_read_int(bs, 1);
 	if (!cmd_stream) {
 		cfg->elementaryMasks = gf_list_new();
@@ -393,10 +410,10 @@
 	cfg->tag = GF_ODF_LASER_CFG_TAG;
 	cfg->profile = gf_bs_read_int(bs, 8);
 	cfg->level = gf_bs_read_int(bs, 8);
-	/*cfg->reserved = */gf_bs_read_int(bs, 3);	
-	cfg->pointsCodec = gf_bs_read_int(bs, 2);	
-	cfg->pathComponents = gf_bs_read_int(bs, 4);	
-	cfg->fullRequestHost = gf_bs_read_int(bs, 1);	
+	/*cfg->reserved = */gf_bs_read_int(bs, 3);
+	cfg->pointsCodec = gf_bs_read_int(bs, 2);
+	cfg->pathComponents = gf_bs_read_int(bs, 4);
+	cfg->fullRequestHost = gf_bs_read_int(bs, 1);
 	if (gf_bs_read_int(bs, 1)) cfg->time_resolution = gf_bs_read_int(bs, 16);
 	else cfg->time_resolution = 1000;
 	cfg->colorComponentBits = 1 + gf_bs_read_int(bs, 4);
@@ -434,7 +451,7 @@
 	GF_BitStream *bs;
 	if (!dsi || !dsi->data || !dsi->dataLength || !cfg) return GF_BAD_PARAM;
 	memset(cfg, 0, sizeof(GF_UIConfig));
-	cfg->tag = GF_ODF_UI_CFG_TAG;	
+	cfg->tag = GF_ODF_UI_CFG_TAG;
 	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
 	len = gf_bs_read_int(bs, 8);
 	cfg->deviceName = (char*)gf_malloc(sizeof(char) * (len+1));
@@ -649,7 +666,7 @@
 GF_Err gf_odf_del_tx3g(GF_TextSampleDescriptor *sd)
 {
 	u32 i;
-	for (i=0; i<sd->font_count; i++) 
+	for (i=0; i<sd->font_count; i++)
 		if (sd->fonts[i].fontName) gf_free(sd->fonts[i].fontName);
 	gf_free(sd->fonts);
 	gf_free(sd);
@@ -681,7 +698,7 @@
 	}
 	bck = desc->sample_descriptions;
 	memset(desc, 0, sizeof(GF_TextConfig));
-	desc->tag = GF_ODF_TEXT_CFG_TAG;	
+	desc->tag = GF_ODF_TEXT_CFG_TAG;
 	desc->sample_descriptions = bck;
 }
 
@@ -783,7 +800,7 @@
 		cfg->horiz_offset = gf_bs_read_int(bs, 16);
 		cfg->vert_offset = gf_bs_read_int(bs, 16);
 	}
-	
+
 #ifndef GPAC_DISABLE_ISOM
 exit:
 #endif
@@ -896,7 +913,7 @@
 	*outSize = 0;
 	*outData = NULL;
 	e = gf_odf_hevc_cfg_write_bs(cfg, bs);
-	if (e==GF_OK) 
+	if (e==GF_OK)
 		gf_bs_get_content(bs, outData, outSize);
 
 	gf_bs_del(bs);
@@ -955,7 +972,7 @@
 		GF_SAFEALLOC(ar, GF_HEVCParamArray);
 		ar->nalus = gf_list_new();
 		gf_list_add(cfg->param_array, ar);
-		
+
 		ar->array_completeness = gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 1);
 		ar->type = gf_bs_read_int(bs, 6);
@@ -1041,16 +1058,16 @@
 		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) 
+			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";
-			}
-			return "LASeR Scene Description";
+		{
+			GF_LASERConfig l_cfg;
+			gf_odf_get_laser_config(esd->decoderConfig->decoderSpecificInfo, &l_cfg);
+			if (! l_cfg.newSceneIndicator ) return "LASeR Scene Segment Description";
+		}
+		return "LASeR Scene Description";
 		case GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE:
 			return "MPEG-4 Synthesized Texture";
 		case GPAC_OTI_SCENE_SAF:
@@ -1118,17 +1135,17 @@
 		case GPAC_OTI_AUDIO_MPEG1:
 			return "MPEG-1 Audio";
 		case GPAC_OTI_AUDIO_AAC_MPEG4:
-			{
+		{
 #ifdef GPAC_DISABLE_AV_PARSERS
-				return "MPEG-4 AAC";
+			return "MPEG-4 AAC";
 #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);
+			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);
 #endif
-			}
-			break;
+		}
+		break;
 		case GPAC_OTI_MEDIA_FFMPEG:
 			return "GPAC FFMPEG Private Audio";
 		case GPAC_OTI_AUDIO_EVRC_VOICE:
@@ -1137,7 +1154,7 @@
 			return "SMV Voice";
 		case GPAC_OTI_AUDIO_AC3:
 			return "AC-3 audio";
-		case GPAC_OTI_AUDIO_AC3_ENHANCED:
+		case GPAC_OTI_AUDIO_EAC3:
 			return "Enhanced AC-3 Audio";
 		case GPAC_OTI_AUDIO_DRA:
 			return "DRA Audio";
@@ -1175,30 +1192,30 @@
 	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";
+		{
+			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:

gpac-0.5.0.svn5178.tar.bz2/src/odf/ipmpx_code.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/ipmpx_code.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -34,7 +34,7 @@
 	memset(__ptr, 0, sizeof(__stname));	\
 	((GF_IPMPX_Data *)__ptr)->tag = __tag;	\
 	((GF_IPMPX_Data *)__ptr)->Version = 0x01;	\
-
+ 
 
 #define GF_IPMPX_DELETE_ARRAY(__ar) if (__ar) { if (__ar->data) gf_free(__ar->data); gf_free(__ar); }
 
@@ -51,10 +51,13 @@
 	unsigned char vals[4];
 	u32 length = size;
 
-	vals[3] = (unsigned char) (length & 0x7f); length >>= 7;
-	vals[2] = (unsigned char) ((length & 0x7f) | 0x80); length >>= 7;
-	vals[1] = (unsigned char) ((length & 0x7f) | 0x80); length >>= 7;
-	vals[0] = (unsigned char) ((length & 0x7f) | 0x80); 
+	vals[3] = (unsigned char) (length & 0x7f);
+	length >>= 7;
+	vals[2] = (unsigned char) ((length & 0x7f) | 0x80);
+	length >>= 7;
+	vals[1] = (unsigned char) ((length & 0x7f) | 0x80);
+	length >>= 7;
+	vals[0] = (unsigned char) ((length & 0x7f) | 0x80);
 	if (size < 0x00000080) {
 		gf_bs_write_int(bs, vals[3], 8);
 	} else if (size < 0x00004000) {
@@ -69,7 +72,7 @@
 		gf_bs_write_int(bs, vals[1], 8);
 		gf_bs_write_int(bs, vals[2], 8);
 		gf_bs_write_int(bs, vals[3], 8);
-	} 
+	}
 }
 
 GF_IPMPX_ByteArray *GF_IPMPX_GetByteArray(GF_BitStream *bs)
@@ -111,20 +114,20 @@
 	if (!auth) return;
 	switch (auth->tag) {
 	case GF_IPMPX_AUTH_AlgorithmDescr_Tag:
-		{
-			GF_IPMPX_AUTH_AlgorithmDescriptor *p = (GF_IPMPX_AUTH_AlgorithmDescriptor *)auth;
-			GF_IPMPX_DELETE_ARRAY(p->specAlgoID);
-			GF_IPMPX_DELETE_ARRAY(p->OpaqueData);
-			gf_free(p);
-		}
-		break;
+	{
+		GF_IPMPX_AUTH_AlgorithmDescriptor *p = (GF_IPMPX_AUTH_AlgorithmDescriptor *)auth;
+		GF_IPMPX_DELETE_ARRAY(p->specAlgoID);
+		GF_IPMPX_DELETE_ARRAY(p->OpaqueData);
+		gf_free(p);
+	}
+	break;
 	case GF_IPMPX_AUTH_KeyDescr_Tag:
-		{
-			GF_IPMPX_AUTH_KeyDescriptor *p = (GF_IPMPX_AUTH_KeyDescriptor *)auth;
-			if (p->keyBody) gf_free(p->keyBody);
-			gf_free(p);
-		}
-		break;
+	{
+		GF_IPMPX_AUTH_KeyDescriptor *p = (GF_IPMPX_AUTH_KeyDescriptor *)auth;
+		if (p->keyBody) gf_free(p->keyBody);
+		gf_free(p);
+	}
+	break;
 	}
 }
 
@@ -134,20 +137,20 @@
 	if (!auth) return 0;
 	switch (auth->tag) {
 	case GF_IPMPX_AUTH_AlgorithmDescr_Tag:
-		{
-			GF_IPMPX_AUTH_AlgorithmDescriptor *p = (GF_IPMPX_AUTH_AlgorithmDescriptor *)auth;
-			size = 1 + (p->specAlgoID ? GF_IPMPX_GetByteArraySize(p->specAlgoID) : 2);
-			size += GF_IPMPX_GetByteArraySize(p->OpaqueData);
-			return size;
-		}
-		break;
+	{
+		GF_IPMPX_AUTH_AlgorithmDescriptor *p = (GF_IPMPX_AUTH_AlgorithmDescriptor *)auth;
+		size = 1 + (p->specAlgoID ? GF_IPMPX_GetByteArraySize(p->specAlgoID) : 2);
+		size += GF_IPMPX_GetByteArraySize(p->OpaqueData);
+		return size;
+	}
+	break;
 	case GF_IPMPX_AUTH_KeyDescr_Tag:
-		{
-			GF_IPMPX_AUTH_KeyDescriptor *p = (GF_IPMPX_AUTH_KeyDescriptor *)auth;
-			size = p->keyBodyLength;
-			return size;
-		}
-		break;
+	{
+		GF_IPMPX_AUTH_KeyDescriptor *p = (GF_IPMPX_AUTH_KeyDescriptor *)auth;
+		size = p->keyBodyLength;
+		return size;
+	}
+	break;
 	default:
 		return 0;
 	}
@@ -173,25 +176,25 @@
 
 	switch (auth->tag) {
 	case GF_IPMPX_AUTH_AlgorithmDescr_Tag:
-		{
-			GF_IPMPX_AUTH_AlgorithmDescriptor *p = (GF_IPMPX_AUTH_AlgorithmDescriptor *)auth;
-			gf_bs_write_int(bs, p->specAlgoID ? 0 : 1, 1);
-			gf_bs_write_int(bs, 0, 7);
-			if (p->specAlgoID) {
-				GF_IPMPX_WriteByteArray(bs, p->specAlgoID);
-			} else {
-				gf_bs_write_int(bs, p->regAlgoID, 16);
-			}
-			GF_IPMPX_WriteByteArray(bs, p->OpaqueData);
+	{
+		GF_IPMPX_AUTH_AlgorithmDescriptor *p = (GF_IPMPX_AUTH_AlgorithmDescriptor *)auth;
+		gf_bs_write_int(bs, p->specAlgoID ? 0 : 1, 1);
+		gf_bs_write_int(bs, 0, 7);
+		if (p->specAlgoID) {
+			GF_IPMPX_WriteByteArray(bs, p->specAlgoID);
+		} else {
+			gf_bs_write_int(bs, p->regAlgoID, 16);
 		}
-		break;
+		GF_IPMPX_WriteByteArray(bs, p->OpaqueData);
+	}
+	break;
 	case GF_IPMPX_AUTH_KeyDescr_Tag:
-		{
-			GF_IPMPX_AUTH_KeyDescriptor *p = (GF_IPMPX_AUTH_KeyDescriptor *)auth;
-			/*tag*/
-			gf_bs_write_data(bs, p->keyBody, p->keyBodyLength);
-		}
-		break;
+	{
+		GF_IPMPX_AUTH_KeyDescriptor *p = (GF_IPMPX_AUTH_KeyDescriptor *)auth;
+		/*tag*/
+		gf_bs_write_data(bs, p->keyBody, p->keyBodyLength);
+	}
+	break;
 	default:
 		break;
 	}
@@ -214,37 +217,37 @@
 
 	switch (tag) {
 	case GF_IPMPX_AUTH_KeyDescr_Tag:
-		{
-			GF_IPMPX_AUTH_KeyDescriptor *p;
-			GF_SAFEALLOC(p, GF_IPMPX_AUTH_KeyDescriptor);
-			if (!p) return GF_OUT_OF_MEM;
-			p->tag = tag;
-			p->keyBodyLength = size;
-			p->keyBody = (char*)gf_malloc(sizeof(char)*size);
-			gf_bs_read_data(bs, p->keyBody, size);
-			*auth = (GF_IPMPX_Authentication *)p;
-			return GF_OK;
-		}
-		break;
+	{
+		GF_IPMPX_AUTH_KeyDescriptor *p;
+		GF_SAFEALLOC(p, GF_IPMPX_AUTH_KeyDescriptor);
+		if (!p) return GF_OUT_OF_MEM;
+		p->tag = tag;
+		p->keyBodyLength = size;
+		p->keyBody = (char*)gf_malloc(sizeof(char)*size);
+		gf_bs_read_data(bs, p->keyBody, size);
+		*auth = (GF_IPMPX_Authentication *)p;
+		return GF_OK;
+	}
+	break;
 	case GF_IPMPX_AUTH_AlgorithmDescr_Tag:
-		{
-			Bool isReg;
-			GF_IPMPX_AUTH_AlgorithmDescriptor *p;
-			GF_SAFEALLOC(p, GF_IPMPX_AUTH_AlgorithmDescriptor);
-			if (!p) return GF_OUT_OF_MEM;
-			p->tag = tag;
-			isReg = gf_bs_read_int(bs, 1);
-			gf_bs_read_int(bs, 7);
-			if (isReg) {
-				p->regAlgoID = gf_bs_read_int(bs, 16);
-			} else {
-				p->specAlgoID = GF_IPMPX_GetByteArray(bs);
-			}
-			p->OpaqueData = GF_IPMPX_GetByteArray(bs);
-			*auth = (GF_IPMPX_Authentication *)p;
-			return GF_OK;
+	{
+		Bool isReg;
+		GF_IPMPX_AUTH_AlgorithmDescriptor *p;
+		GF_SAFEALLOC(p, GF_IPMPX_AUTH_AlgorithmDescriptor);
+		if (!p) return GF_OUT_OF_MEM;
+		p->tag = tag;
+		isReg = gf_bs_read_int(bs, 1);
+		gf_bs_read_int(bs, 7);
+		if (isReg) {
+			p->regAlgoID = gf_bs_read_int(bs, 16);
+		} else {
+			p->specAlgoID = GF_IPMPX_GetByteArray(bs);
 		}
-		break;
+		p->OpaqueData = GF_IPMPX_GetByteArray(bs);
+		*auth = (GF_IPMPX_Authentication *)p;
+		return GF_OK;
+	}
+	break;
 	default:
 		break;
 	}
@@ -355,7 +358,7 @@
 static void delete_algo_list(GF_List *algos)
 {
 	u32 i;
-	for (i=0;i<gf_list_count(algos); i++) {
+	for (i=0; i<gf_list_count(algos); i++) {
 		GF_IPMPX_Authentication *ip_auth = (GF_IPMPX_Authentication *)gf_list_get(algos, i);
 		GF_IPMPX_AUTH_Delete(ip_auth);
 	}
@@ -385,7 +388,7 @@
 	u32 i, count;
 	Bool requestNegotiation, successNegotiation, inclAuthenticationData, inclAuthCodes;
 	GF_IPMPX_MutualAuthentication *p = (GF_IPMPX_MutualAuthentication *)_p;
-	
+
 	requestNegotiation = gf_bs_read_int(bs, 1);
 	successNegotiation = gf_bs_read_int(bs, 1);
 	p->failedNegotiation =  gf_bs_read_int(bs, 1);
@@ -462,7 +465,7 @@
 		}
 	}
 	if (p->AuthenticationData) size += GF_IPMPX_GetByteArraySize(p->AuthenticationData);
-	
+
 	count = gf_list_count(p->certificates);
 	if (count || p->opaque || p->publicKey) {
 		size += 1;
@@ -520,7 +523,7 @@
 		}
 	}
 	if (p->AuthenticationData) GF_IPMPX_WriteByteArray(bs, p->AuthenticationData);
-	
+
 	count = gf_list_count(p->certificates);
 	if (count || p->opaque || p->publicKey) {
 		/*type 1*/
@@ -618,7 +621,7 @@
 	u32 size, i, j;
 	GF_IPMPX_TrustSecurityMetadata *p = (GF_IPMPX_TrustSecurityMetadata *)_p;
 	size = 2;
-	for (i=0;i<gf_list_count(p->TrustedTools); i++) {
+	for (i=0; i<gf_list_count(p->TrustedTools); i++) {
 		GF_IPMPX_TrustedTool *tt = (GF_IPMPX_TrustedTool *)gf_list_get(p->TrustedTools, i);
 		size += 23;
 		for (j=0; j<gf_list_count(tt->trustSpecifications); j++) {
@@ -637,7 +640,7 @@
 
 	c1 = gf_list_count(p->TrustedTools);
 	gf_bs_write_int(bs, c1, 16);
-	for (i=0;i<c1; i++) {
+	for (i=0; i<c1; i++) {
 		GF_IPMPX_TrustedTool *tt = (GF_IPMPX_TrustedTool *)gf_list_get(p->TrustedTools, i);
 		gf_bs_write_data(bs, (char*)tt->toolID, 16);
 		gf_bs_write_data(bs, (char*)tt->AuditDate, 5);
@@ -1064,7 +1067,7 @@
 	p->scope = gf_bs_read_int(bs, 3);
 	gf_bs_read_int(bs, 5);
 	p->eventTypeCount = gf_bs_read_int(bs, 8);
-	for (i=0;i<p->eventTypeCount; i++) p->eventType[i] = gf_bs_read_int(bs, 8);
+	for (i=0; i<p->eventTypeCount; i++) p->eventType[i] = gf_bs_read_int(bs, 8);
 	return GF_OK;
 }
 static u32 SizeGF_IPMPX_AddToolNotificationListener(GF_IPMPX_Data *_p)
@@ -1079,7 +1082,7 @@
 	gf_bs_write_int(bs, p->scope, 3);
 	gf_bs_write_int(bs, 0, 5);
 	gf_bs_write_int(bs, p->eventTypeCount, 8);
-	for (i=0;i<p->eventTypeCount; i++) gf_bs_write_int(bs, p->eventType[i], 8);
+	for (i=0; i<p->eventTypeCount; i++) gf_bs_write_int(bs, p->eventType[i], 8);
 	return GF_OK;
 }
 static GF_IPMPX_Data *NewGF_IPMPX_RemoveToolNotificationListener()
@@ -1097,7 +1100,7 @@
 	u32 i;
 	GF_IPMPX_RemoveToolNotificationListener*p = (GF_IPMPX_RemoveToolNotificationListener*)_p;
 	p->eventTypeCount = gf_bs_read_int(bs, 8);
-	for (i=0;i<p->eventTypeCount; i++) p->eventType[i] = gf_bs_read_int(bs, 8);
+	for (i=0; i<p->eventTypeCount; i++) p->eventType[i] = gf_bs_read_int(bs, 8);
 	return GF_OK;
 }
 static u32 SizeGF_IPMPX_RemoveToolNotificationListener(GF_IPMPX_Data *_p)
@@ -1110,7 +1113,7 @@
 	u32 i;
 	GF_IPMPX_RemoveToolNotificationListener*p = (GF_IPMPX_RemoveToolNotificationListener*)_p;
 	gf_bs_write_int(bs, p->eventTypeCount, 8);
-	for (i=0;i<p->eventTypeCount; i++) gf_bs_write_int(bs, p->eventType[i], 8);
+	for (i=0; i<p->eventTypeCount; i++) gf_bs_write_int(bs, p->eventType[i], 8);
 	return GF_OK;
 }
 
@@ -1695,26 +1698,45 @@
 {
 	switch (tag) {
 	case GF_IPMPX_RIGHTS_DATA_TAG:
-	case GF_IPMPX_OPAQUE_DATA_TAG: return NewGF_IPMPX_OpaqueData(tag);
-	case GF_IPMPX_KEY_DATA_TAG: return NewGF_IPMPX_KeyData();
-	case GF_IPMPX_SECURE_CONTAINER_TAG: return NewGF_IPMPX_SecureContainer();
-	case GF_IPMPX_ADD_TOOL_LISTENER_TAG: return NewGF_IPMPX_AddToolNotificationListener();
-	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG: return NewGF_IPMPX_RemoveToolNotificationListener();
-	case GF_IPMPX_INIT_AUTHENTICATION_TAG: return NewGF_IPMPX_InitAuthentication();
-	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG: return NewGF_IPMPX_MutualAuthentication();
-	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG: return NewGF_IPMPX_ParametricDescription();
-	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG: return NewGF_IPMPX_ToolParamCapabilitiesQuery();
-	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG: return NewGF_IPMPX_ToolParamCapabilitiesResponse();
-	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG: return NewGF_IPMPX_GetToolsResponse();
-	case GF_IPMPX_GET_TOOL_CONTEXT_TAG: return NewGF_IPMPX_GetToolContext();
-	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG: return NewGF_IPMPX_GetToolContextResponse();
-	case GF_IPMPX_CONNECT_TOOL_TAG: return NewGF_IPMPX_ConnectTool();
-	case GF_IPMPX_DISCONNECT_TOOL_TAG: return NewGF_IPMPX_DisconnectTool();
-	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG: return NewGF_IPMPX_NotifyToolEvent();
-	case GF_IPMPX_CAN_PROCESS_TAG: return NewGF_IPMPX_CanProcess();
-	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG: return NewGF_IPMPX_TrustSecurityMetadata();
-	case GF_IPMPX_ISMACRYP_TAG: return NewGF_IPMPX_ISMACryp();
-	case GF_IPMPX_GET_TOOLS_TAG: 
+	case GF_IPMPX_OPAQUE_DATA_TAG:
+		return NewGF_IPMPX_OpaqueData(tag);
+	case GF_IPMPX_KEY_DATA_TAG:
+		return NewGF_IPMPX_KeyData();
+	case GF_IPMPX_SECURE_CONTAINER_TAG:
+		return NewGF_IPMPX_SecureContainer();
+	case GF_IPMPX_ADD_TOOL_LISTENER_TAG:
+		return NewGF_IPMPX_AddToolNotificationListener();
+	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG:
+		return NewGF_IPMPX_RemoveToolNotificationListener();
+	case GF_IPMPX_INIT_AUTHENTICATION_TAG:
+		return NewGF_IPMPX_InitAuthentication();
+	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG:
+		return NewGF_IPMPX_MutualAuthentication();
+	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG:
+		return NewGF_IPMPX_ParametricDescription();
+	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG:
+		return NewGF_IPMPX_ToolParamCapabilitiesQuery();
+	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG:
+		return NewGF_IPMPX_ToolParamCapabilitiesResponse();
+	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG:
+		return NewGF_IPMPX_GetToolsResponse();
+	case GF_IPMPX_GET_TOOL_CONTEXT_TAG:
+		return NewGF_IPMPX_GetToolContext();
+	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG:
+		return NewGF_IPMPX_GetToolContextResponse();
+	case GF_IPMPX_CONNECT_TOOL_TAG:
+		return NewGF_IPMPX_ConnectTool();
+	case GF_IPMPX_DISCONNECT_TOOL_TAG:
+		return NewGF_IPMPX_DisconnectTool();
+	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG:
+		return NewGF_IPMPX_NotifyToolEvent();
+	case GF_IPMPX_CAN_PROCESS_TAG:
+		return NewGF_IPMPX_CanProcess();
+	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG:
+		return NewGF_IPMPX_TrustSecurityMetadata();
+	case GF_IPMPX_ISMACRYP_TAG:
+		return NewGF_IPMPX_ISMACryp();
+	case GF_IPMPX_GET_TOOLS_TAG:
 	{
 		GF_IPMPX_Data *p;
 		GF_IPMPX_DATA_ALLOC(p, GF_IPMPX_Data, GF_IPMPX_GET_TOOLS_TAG);
@@ -1733,13 +1755,15 @@
 		GF_IPMPX_DATA_ALLOC(p, GF_IPMPX_TrustSpecification, GF_IPMPX_TRUST_SPECIFICATION_TAG);
 		return (GF_IPMPX_Data *)p;
 	}
-	case GF_IPMPX_TOOL_API_CONFIG_TAG: return NewGF_IPMPX_ToolAPI_Config();
-	case GF_IPMPX_SEL_DEC_INIT_TAG: return NewGF_IPMPX_SelectiveDecryptionInit();
-	case GF_IPMPX_AUDIO_WM_INIT_TAG: 
-	case GF_IPMPX_VIDEO_WM_INIT_TAG: 
+	case GF_IPMPX_TOOL_API_CONFIG_TAG:
+		return NewGF_IPMPX_ToolAPI_Config();
+	case GF_IPMPX_SEL_DEC_INIT_TAG:
+		return NewGF_IPMPX_SelectiveDecryptionInit();
+	case GF_IPMPX_AUDIO_WM_INIT_TAG:
+	case GF_IPMPX_VIDEO_WM_INIT_TAG:
 		return NewGF_IPMPX_WatermarkingInit(tag);
-	case GF_IPMPX_AUDIO_WM_SEND_TAG: 
-	case GF_IPMPX_VIDEO_WM_SEND_TAG: 
+	case GF_IPMPX_AUDIO_WM_SEND_TAG:
+	case GF_IPMPX_VIDEO_WM_SEND_TAG:
 		return NewGF_IPMPX_SendWatermark(tag);
 
 	case GF_IPMPX_ALGORITHM_DESCRIPTOR_TAG:
@@ -1784,11 +1808,12 @@
 		return (GF_IPMPX_Data *) p;
 	}
 
-/*	
-	case GF_IPMPX_USER_QUERY_TAG: return NewGF_IPMPX_UserQuery();
-	case GF_IPMPX_USER_RESPONSE_TAG: return NewGF_IPMPX_UserQueryResponse();
-*/
-	default: return NULL;
+	/*
+		case GF_IPMPX_USER_QUERY_TAG: return NewGF_IPMPX_UserQuery();
+		case GF_IPMPX_USER_RESPONSE_TAG: return NewGF_IPMPX_UserQueryResponse();
+	*/
+	default:
+		return NULL;
 	}
 
 }
@@ -1798,38 +1823,82 @@
 	if (!_p) return;
 	switch (_p->tag) {
 	case GF_IPMPX_RIGHTS_DATA_TAG:
-	case GF_IPMPX_OPAQUE_DATA_TAG: DelGF_IPMPX_OpaqueData(_p); return;
-	case GF_IPMPX_KEY_DATA_TAG: DelGF_IPMPX_KeyData(_p); return;
-	case GF_IPMPX_SECURE_CONTAINER_TAG: DelGF_IPMPX_SecureContainer(_p); return;
-	case GF_IPMPX_ADD_TOOL_LISTENER_TAG: DelGF_IPMPX_AddToolNotificationListener(_p); return;
-	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG: DelGF_IPMPX_RemoveToolNotificationListener(_p); return;
-	case GF_IPMPX_INIT_AUTHENTICATION_TAG: DelGF_IPMPX_InitAuthentication(_p); return;
-	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG: DelGF_IPMPX_MutualAuthentication(_p); return;
-	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG: DelGF_IPMPX_ParametricDescription(_p); return;
-	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG: DelGF_IPMPX_ToolParamCapabilitiesQuery(_p); return;
-	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG: DelGF_IPMPX_ToolParamCapabilitiesResponse(_p); return;
-	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG: DelGF_IPMPX_GetToolsResponse(_p); return;
-	case GF_IPMPX_GET_TOOL_CONTEXT_TAG: DelGF_IPMPX_GetToolContext(_p); return;
-	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG: DelGF_IPMPX_GetToolContextResponse(_p); return;
-	case GF_IPMPX_CONNECT_TOOL_TAG: DelGF_IPMPX_ConnectTool(_p); return;
-	case GF_IPMPX_DISCONNECT_TOOL_TAG: DelGF_IPMPX_DisconnectTool(_p); return;
-	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG: DelGF_IPMPX_NotifyToolEvent(_p); return;
-	case GF_IPMPX_CAN_PROCESS_TAG: DelGF_IPMPX_CanProcess(_p); return;
-	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG: DelGF_IPMPX_TrustSecurityMetadata(_p); return;
-	case GF_IPMPX_TOOL_API_CONFIG_TAG: DelGF_IPMPX_ToolAPI_Config(_p); return;
-	case GF_IPMPX_ISMACRYP_TAG: DelGF_IPMPX_ISMACryp(_p); return;
-	case GF_IPMPX_SEL_DEC_INIT_TAG: DelGF_IPMPX_SelectiveDecryptionInit(_p); return;
-	case GF_IPMPX_AUDIO_WM_INIT_TAG: 
-	case GF_IPMPX_VIDEO_WM_INIT_TAG: 
-		DelGF_IPMPX_WatermarkingInit(_p); return;
-	case GF_IPMPX_AUDIO_WM_SEND_TAG: 
-	case GF_IPMPX_VIDEO_WM_SEND_TAG: 
-		DelGF_IPMPX_SendWatermark(_p); return;
+	case GF_IPMPX_OPAQUE_DATA_TAG:
+		DelGF_IPMPX_OpaqueData(_p);
+		return;
+	case GF_IPMPX_KEY_DATA_TAG:
+		DelGF_IPMPX_KeyData(_p);
+		return;
+	case GF_IPMPX_SECURE_CONTAINER_TAG:
+		DelGF_IPMPX_SecureContainer(_p);
+		return;
+	case GF_IPMPX_ADD_TOOL_LISTENER_TAG:
+		DelGF_IPMPX_AddToolNotificationListener(_p);
+		return;
+	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG:
+		DelGF_IPMPX_RemoveToolNotificationListener(_p);
+		return;
+	case GF_IPMPX_INIT_AUTHENTICATION_TAG:
+		DelGF_IPMPX_InitAuthentication(_p);
+		return;
+	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG:
+		DelGF_IPMPX_MutualAuthentication(_p);
+		return;
+	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG:
+		DelGF_IPMPX_ParametricDescription(_p);
+		return;
+	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG:
+		DelGF_IPMPX_ToolParamCapabilitiesQuery(_p);
+		return;
+	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG:
+		DelGF_IPMPX_ToolParamCapabilitiesResponse(_p);
+		return;
+	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG:
+		DelGF_IPMPX_GetToolsResponse(_p);
+		return;
+	case GF_IPMPX_GET_TOOL_CONTEXT_TAG:
+		DelGF_IPMPX_GetToolContext(_p);
+		return;
+	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG:
+		DelGF_IPMPX_GetToolContextResponse(_p);
+		return;
+	case GF_IPMPX_CONNECT_TOOL_TAG:
+		DelGF_IPMPX_ConnectTool(_p);
+		return;
+	case GF_IPMPX_DISCONNECT_TOOL_TAG:
+		DelGF_IPMPX_DisconnectTool(_p);
+		return;
+	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG:
+		DelGF_IPMPX_NotifyToolEvent(_p);
+		return;
+	case GF_IPMPX_CAN_PROCESS_TAG:
+		DelGF_IPMPX_CanProcess(_p);
+		return;
+	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG:
+		DelGF_IPMPX_TrustSecurityMetadata(_p);
+		return;
+	case GF_IPMPX_TOOL_API_CONFIG_TAG:
+		DelGF_IPMPX_ToolAPI_Config(_p);
+		return;
+	case GF_IPMPX_ISMACRYP_TAG:
+		DelGF_IPMPX_ISMACryp(_p);
+		return;
+	case GF_IPMPX_SEL_DEC_INIT_TAG:
+		DelGF_IPMPX_SelectiveDecryptionInit(_p);
+		return;
+	case GF_IPMPX_AUDIO_WM_INIT_TAG:
+	case GF_IPMPX_VIDEO_WM_INIT_TAG:
+		DelGF_IPMPX_WatermarkingInit(_p);
+		return;
+	case GF_IPMPX_AUDIO_WM_SEND_TAG:
+	case GF_IPMPX_VIDEO_WM_SEND_TAG:
+		DelGF_IPMPX_SendWatermark(_p);
+		return;
 
-/*
-	case GF_IPMPX_USER_QUERY_TAG: DelGF_IPMPX_UserQuery(_p); return;
-	case GF_IPMPX_USER_RESPONSE_TAG: DelGF_IPMPX_UserQueryResponse(_p); return;
-*/
+	/*
+		case GF_IPMPX_USER_QUERY_TAG: DelGF_IPMPX_UserQuery(_p); return;
+		case GF_IPMPX_USER_RESPONSE_TAG: DelGF_IPMPX_UserQueryResponse(_p); return;
+	*/
 	case GF_IPMPX_TRUSTED_TOOL_TAG:
 	{
 		GF_IPMPX_TrustedTool *p = (GF_IPMPX_TrustedTool *)_p;
@@ -1886,7 +1955,7 @@
 	}
 
 	case GF_IPMPX_GET_TOOLS_TAG:
-	default: 
+	default:
 		gf_free(_p);
 		return;
 	}
@@ -1896,40 +1965,63 @@
 {
 	switch (_p->tag) {
 	case GF_IPMPX_RIGHTS_DATA_TAG:
-	case GF_IPMPX_OPAQUE_DATA_TAG: return ReadGF_IPMPX_OpaqueData(bs, _p, read);
-	case GF_IPMPX_KEY_DATA_TAG: return ReadGF_IPMPX_KeyData(bs, _p, read);
-	case GF_IPMPX_SECURE_CONTAINER_TAG: return ReadGF_IPMPX_SecureContainer(bs, _p, read);
-	case GF_IPMPX_ADD_TOOL_LISTENER_TAG: return ReadGF_IPMPX_AddToolNotificationListener(bs, _p, read);
-	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG: return ReadGF_IPMPX_RemoveToolNotificationListener(bs, _p, read);
-	case GF_IPMPX_INIT_AUTHENTICATION_TAG: return ReadGF_IPMPX_InitAuthentication(bs, _p, read);
-	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG: return ReadGF_IPMPX_MutualAuthentication(bs, _p, read);
-	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG: return ReadGF_IPMPX_ParametricDescription(bs, _p, read);
-	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG: return ReadGF_IPMPX_ToolParamCapabilitiesQuery(bs, _p, read);
-	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG: return ReadGF_IPMPX_ToolParamCapabilitiesResponse(bs, _p, read);
-	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG: return ReadGF_IPMPX_GetToolsResponse(bs, _p, read);
-	case GF_IPMPX_GET_TOOL_CONTEXT_TAG: return ReadGF_IPMPX_GetToolContext(bs, _p, read);
-	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG: return ReadGF_IPMPX_GetToolContextResponse(bs, _p, read);
-	case GF_IPMPX_CONNECT_TOOL_TAG: return ReadGF_IPMPX_ConnectTool(bs, _p, read);
-	case GF_IPMPX_DISCONNECT_TOOL_TAG: return ReadGF_IPMPX_DisconnectTool(bs, _p, read);
-	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG: return ReadGF_IPMPX_NotifyToolEvent(bs, _p, read);
-	case GF_IPMPX_CAN_PROCESS_TAG: return ReadGF_IPMPX_CanProcess(bs, _p, read);
-	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG: return ReadGF_IPMPX_TrustSecurityMetadata(bs, _p, read);
-	case GF_IPMPX_TOOL_API_CONFIG_TAG: return ReadGF_IPMPX_ToolAPI_Config(bs, _p, read);
-	case GF_IPMPX_ISMACRYP_TAG: return ReadGF_IPMPX_ISMACryp(bs, _p, read);
-	case GF_IPMPX_SEL_DEC_INIT_TAG: return ReadGF_IPMPX_SelectiveDecryptionInit(bs, _p, read);
-	case GF_IPMPX_AUDIO_WM_INIT_TAG: 
-	case GF_IPMPX_VIDEO_WM_INIT_TAG: 
+	case GF_IPMPX_OPAQUE_DATA_TAG:
+		return ReadGF_IPMPX_OpaqueData(bs, _p, read);
+	case GF_IPMPX_KEY_DATA_TAG:
+		return ReadGF_IPMPX_KeyData(bs, _p, read);
+	case GF_IPMPX_SECURE_CONTAINER_TAG:
+		return ReadGF_IPMPX_SecureContainer(bs, _p, read);
+	case GF_IPMPX_ADD_TOOL_LISTENER_TAG:
+		return ReadGF_IPMPX_AddToolNotificationListener(bs, _p, read);
+	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG:
+		return ReadGF_IPMPX_RemoveToolNotificationListener(bs, _p, read);
+	case GF_IPMPX_INIT_AUTHENTICATION_TAG:
+		return ReadGF_IPMPX_InitAuthentication(bs, _p, read);
+	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG:
+		return ReadGF_IPMPX_MutualAuthentication(bs, _p, read);
+	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG:
+		return ReadGF_IPMPX_ParametricDescription(bs, _p, read);
+	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG:
+		return ReadGF_IPMPX_ToolParamCapabilitiesQuery(bs, _p, read);
+	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG:
+		return ReadGF_IPMPX_ToolParamCapabilitiesResponse(bs, _p, read);
+	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG:
+		return ReadGF_IPMPX_GetToolsResponse(bs, _p, read);
+	case GF_IPMPX_GET_TOOL_CONTEXT_TAG:
+		return ReadGF_IPMPX_GetToolContext(bs, _p, read);
+	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG:
+		return ReadGF_IPMPX_GetToolContextResponse(bs, _p, read);
+	case GF_IPMPX_CONNECT_TOOL_TAG:
+		return ReadGF_IPMPX_ConnectTool(bs, _p, read);
+	case GF_IPMPX_DISCONNECT_TOOL_TAG:
+		return ReadGF_IPMPX_DisconnectTool(bs, _p, read);
+	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG:
+		return ReadGF_IPMPX_NotifyToolEvent(bs, _p, read);
+	case GF_IPMPX_CAN_PROCESS_TAG:
+		return ReadGF_IPMPX_CanProcess(bs, _p, read);
+	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG:
+		return ReadGF_IPMPX_TrustSecurityMetadata(bs, _p, read);
+	case GF_IPMPX_TOOL_API_CONFIG_TAG:
+		return ReadGF_IPMPX_ToolAPI_Config(bs, _p, read);
+	case GF_IPMPX_ISMACRYP_TAG:
+		return ReadGF_IPMPX_ISMACryp(bs, _p, read);
+	case GF_IPMPX_SEL_DEC_INIT_TAG:
+		return ReadGF_IPMPX_SelectiveDecryptionInit(bs, _p, read);
+	case GF_IPMPX_AUDIO_WM_INIT_TAG:
+	case GF_IPMPX_VIDEO_WM_INIT_TAG:
 		return ReadGF_IPMPX_WatermarkingInit(bs, _p, read);
-	case GF_IPMPX_AUDIO_WM_SEND_TAG: 
-	case GF_IPMPX_VIDEO_WM_SEND_TAG: 
+	case GF_IPMPX_AUDIO_WM_SEND_TAG:
+	case GF_IPMPX_VIDEO_WM_SEND_TAG:
 		return ReadGF_IPMPX_SendWatermark(bs, _p, read);
 
-/*
-	case GF_IPMPX_USER_QUERY_TAG: return ReadGF_IPMPX_UserQuery(bs, _p, read);
-	case GF_IPMPX_USER_RESPONSE_TAG: return ReadGF_IPMPX_UserQueryResponse(bs, _p, read);
-*/
-	case GF_IPMPX_GET_TOOLS_TAG: return GF_OK;
-	default: return GF_BAD_PARAM;
+	/*
+		case GF_IPMPX_USER_QUERY_TAG: return ReadGF_IPMPX_UserQuery(bs, _p, read);
+		case GF_IPMPX_USER_RESPONSE_TAG: return ReadGF_IPMPX_UserQueryResponse(bs, _p, read);
+	*/
+	case GF_IPMPX_GET_TOOLS_TAG:
+		return GF_OK;
+	default:
+		return GF_BAD_PARAM;
 	}
 }
 
@@ -1937,40 +2029,63 @@
 {
 	switch (_p->tag) {
 	case GF_IPMPX_RIGHTS_DATA_TAG:
-	case GF_IPMPX_OPAQUE_DATA_TAG: return SizeGF_IPMPX_OpaqueData(_p);
-	case GF_IPMPX_KEY_DATA_TAG: return SizeGF_IPMPX_KeyData(_p);
-	case GF_IPMPX_SECURE_CONTAINER_TAG: return SizeGF_IPMPX_SecureContainer(_p);
-	case GF_IPMPX_ADD_TOOL_LISTENER_TAG: return SizeGF_IPMPX_AddToolNotificationListener(_p);
-	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG: return SizeGF_IPMPX_RemoveToolNotificationListener(_p);
-	case GF_IPMPX_INIT_AUTHENTICATION_TAG: return SizeGF_IPMPX_InitAuthentication(_p);
-	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG: return SizeGF_IPMPX_MutualAuthentication(_p);
-	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG: return SizeGF_IPMPX_ParametricDescription(_p);
-	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG: return SizeGF_IPMPX_ToolParamCapabilitiesQuery(_p);
-	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG: return SizeGF_IPMPX_ToolParamCapabilitiesResponse(_p);
-	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG: return SizeGF_IPMPX_GetToolsResponse(_p);
-	case GF_IPMPX_GET_TOOL_CONTEXT_TAG: return SizeGF_IPMPX_GetToolContext(_p);
-	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG: return SizeGF_IPMPX_GetToolContextResponse(_p);
-	case GF_IPMPX_CONNECT_TOOL_TAG: return SizeGF_IPMPX_ConnectTool(_p);
-	case GF_IPMPX_DISCONNECT_TOOL_TAG: return SizeGF_IPMPX_DisconnectTool(_p);
-	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG: return SizeGF_IPMPX_NotifyToolEvent(_p);
-	case GF_IPMPX_CAN_PROCESS_TAG: return SizeGF_IPMPX_CanProcess(_p);
-	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG: return SizeGF_IPMPX_TrustSecurityMetadata(_p);
-	case GF_IPMPX_TOOL_API_CONFIG_TAG: return SizeGF_IPMPX_ToolAPI_Config(_p);
-	case GF_IPMPX_ISMACRYP_TAG: return SizeGF_IPMPX_ISMACryp(_p);
-	case GF_IPMPX_SEL_DEC_INIT_TAG: return SizeGF_IPMPX_SelectiveDecryptionInit(_p);
-	case GF_IPMPX_AUDIO_WM_INIT_TAG: 
-	case GF_IPMPX_VIDEO_WM_INIT_TAG: 
+	case GF_IPMPX_OPAQUE_DATA_TAG:
+		return SizeGF_IPMPX_OpaqueData(_p);
+	case GF_IPMPX_KEY_DATA_TAG:
+		return SizeGF_IPMPX_KeyData(_p);
+	case GF_IPMPX_SECURE_CONTAINER_TAG:
+		return SizeGF_IPMPX_SecureContainer(_p);
+	case GF_IPMPX_ADD_TOOL_LISTENER_TAG:
+		return SizeGF_IPMPX_AddToolNotificationListener(_p);
+	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG:
+		return SizeGF_IPMPX_RemoveToolNotificationListener(_p);
+	case GF_IPMPX_INIT_AUTHENTICATION_TAG:
+		return SizeGF_IPMPX_InitAuthentication(_p);
+	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG:
+		return SizeGF_IPMPX_MutualAuthentication(_p);
+	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG:
+		return SizeGF_IPMPX_ParametricDescription(_p);
+	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG:
+		return SizeGF_IPMPX_ToolParamCapabilitiesQuery(_p);
+	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG:
+		return SizeGF_IPMPX_ToolParamCapabilitiesResponse(_p);
+	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG:
+		return SizeGF_IPMPX_GetToolsResponse(_p);
+	case GF_IPMPX_GET_TOOL_CONTEXT_TAG:
+		return SizeGF_IPMPX_GetToolContext(_p);
+	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG:
+		return SizeGF_IPMPX_GetToolContextResponse(_p);
+	case GF_IPMPX_CONNECT_TOOL_TAG:
+		return SizeGF_IPMPX_ConnectTool(_p);
+	case GF_IPMPX_DISCONNECT_TOOL_TAG:
+		return SizeGF_IPMPX_DisconnectTool(_p);
+	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG:
+		return SizeGF_IPMPX_NotifyToolEvent(_p);
+	case GF_IPMPX_CAN_PROCESS_TAG:
+		return SizeGF_IPMPX_CanProcess(_p);
+	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG:
+		return SizeGF_IPMPX_TrustSecurityMetadata(_p);
+	case GF_IPMPX_TOOL_API_CONFIG_TAG:
+		return SizeGF_IPMPX_ToolAPI_Config(_p);
+	case GF_IPMPX_ISMACRYP_TAG:
+		return SizeGF_IPMPX_ISMACryp(_p);
+	case GF_IPMPX_SEL_DEC_INIT_TAG:
+		return SizeGF_IPMPX_SelectiveDecryptionInit(_p);
+	case GF_IPMPX_AUDIO_WM_INIT_TAG:
+	case GF_IPMPX_VIDEO_WM_INIT_TAG:
 		return SizeGF_IPMPX_WatermarkingInit(_p);
-	case GF_IPMPX_AUDIO_WM_SEND_TAG: 
-	case GF_IPMPX_VIDEO_WM_SEND_TAG: 
+	case GF_IPMPX_AUDIO_WM_SEND_TAG:
+	case GF_IPMPX_VIDEO_WM_SEND_TAG:
 		return SizeGF_IPMPX_SendWatermark(_p);
 
-/*
-	case GF_IPMPX_USER_QUERY_TAG: return SizeGF_IPMPX_UserQuery(_p);
-	case GF_IPMPX_USER_RESPONSE_TAG: return SizeGF_IPMPX_UserQueryResponse(_p);
-*/
-	case GF_IPMPX_GET_TOOLS_TAG: return 0;
-	default: return GF_BAD_PARAM;
+	/*
+		case GF_IPMPX_USER_QUERY_TAG: return SizeGF_IPMPX_UserQuery(_p);
+		case GF_IPMPX_USER_RESPONSE_TAG: return SizeGF_IPMPX_UserQueryResponse(_p);
+	*/
+	case GF_IPMPX_GET_TOOLS_TAG:
+		return 0;
+	default:
+		return GF_BAD_PARAM;
 	}
 }
 
@@ -1982,40 +2097,63 @@
 	if (e) return e;
 	switch (_p->tag) {
 	case GF_IPMPX_RIGHTS_DATA_TAG:
-	case GF_IPMPX_OPAQUE_DATA_TAG: return WriteGF_IPMPX_OpaqueData(bs, _p);
-	case GF_IPMPX_KEY_DATA_TAG: return WriteGF_IPMPX_KeyData(bs, _p);
-	case GF_IPMPX_SECURE_CONTAINER_TAG: return WriteGF_IPMPX_SecureContainer(bs, _p);
-	case GF_IPMPX_ADD_TOOL_LISTENER_TAG: return WriteGF_IPMPX_AddToolNotificationListener(bs, _p);
-	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG: return WriteGF_IPMPX_RemoveToolNotificationListener(bs, _p);
-	case GF_IPMPX_INIT_AUTHENTICATION_TAG: return WriteGF_IPMPX_InitAuthentication(bs, _p);
-	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG: return WriteGF_IPMPX_MutualAuthentication(bs, _p);
-	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG: return WriteGF_IPMPX_ParametricDescription(bs, _p);
-	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG: return WriteGF_IPMPX_ToolParamCapabilitiesQuery(bs, _p);
-	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG: return WriteGF_IPMPX_ToolParamCapabilitiesResponse(bs, _p);
-	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG: return WriteGF_IPMPX_GetToolsResponse(bs, _p);
-	case GF_IPMPX_GET_TOOL_CONTEXT_TAG: return WriteGF_IPMPX_GetToolContext(bs, _p);
-	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG: return WriteGF_IPMPX_GetToolContextResponse(bs, _p);
-	case GF_IPMPX_CONNECT_TOOL_TAG: return WriteGF_IPMPX_ConnectTool(bs, _p);
-	case GF_IPMPX_DISCONNECT_TOOL_TAG: return WriteGF_IPMPX_DisconnectTool(bs, _p);
-	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG: return WriteGF_IPMPX_NotifyToolEvent(bs, _p);
-	case GF_IPMPX_CAN_PROCESS_TAG: return WriteGF_IPMPX_CanProcess(bs, _p);
-	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG: return WriteGF_IPMPX_TrustSecurityMetadata(bs, _p);
-	case GF_IPMPX_TOOL_API_CONFIG_TAG: return WriteGF_IPMPX_ToolAPI_Config(bs, _p);
-	case GF_IPMPX_ISMACRYP_TAG: return WriteGF_IPMPX_ISMACryp(bs, _p);
-	case GF_IPMPX_SEL_DEC_INIT_TAG: return WriteGF_IPMPX_SelectiveDecryptionInit(bs, _p);
-	case GF_IPMPX_AUDIO_WM_INIT_TAG: 
-	case GF_IPMPX_VIDEO_WM_INIT_TAG: 
+	case GF_IPMPX_OPAQUE_DATA_TAG:
+		return WriteGF_IPMPX_OpaqueData(bs, _p);
+	case GF_IPMPX_KEY_DATA_TAG:
+		return WriteGF_IPMPX_KeyData(bs, _p);
+	case GF_IPMPX_SECURE_CONTAINER_TAG:
+		return WriteGF_IPMPX_SecureContainer(bs, _p);
+	case GF_IPMPX_ADD_TOOL_LISTENER_TAG:
+		return WriteGF_IPMPX_AddToolNotificationListener(bs, _p);
+	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG:
+		return WriteGF_IPMPX_RemoveToolNotificationListener(bs, _p);
+	case GF_IPMPX_INIT_AUTHENTICATION_TAG:
+		return WriteGF_IPMPX_InitAuthentication(bs, _p);
+	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG:
+		return WriteGF_IPMPX_MutualAuthentication(bs, _p);
+	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG:
+		return WriteGF_IPMPX_ParametricDescription(bs, _p);
+	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG:
+		return WriteGF_IPMPX_ToolParamCapabilitiesQuery(bs, _p);
+	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG:
+		return WriteGF_IPMPX_ToolParamCapabilitiesResponse(bs, _p);
+	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG:
+		return WriteGF_IPMPX_GetToolsResponse(bs, _p);
+	case GF_IPMPX_GET_TOOL_CONTEXT_TAG:
+		return WriteGF_IPMPX_GetToolContext(bs, _p);
+	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG:
+		return WriteGF_IPMPX_GetToolContextResponse(bs, _p);
+	case GF_IPMPX_CONNECT_TOOL_TAG:
+		return WriteGF_IPMPX_ConnectTool(bs, _p);
+	case GF_IPMPX_DISCONNECT_TOOL_TAG:
+		return WriteGF_IPMPX_DisconnectTool(bs, _p);
+	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG:
+		return WriteGF_IPMPX_NotifyToolEvent(bs, _p);
+	case GF_IPMPX_CAN_PROCESS_TAG:
+		return WriteGF_IPMPX_CanProcess(bs, _p);
+	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG:
+		return WriteGF_IPMPX_TrustSecurityMetadata(bs, _p);
+	case GF_IPMPX_TOOL_API_CONFIG_TAG:
+		return WriteGF_IPMPX_ToolAPI_Config(bs, _p);
+	case GF_IPMPX_ISMACRYP_TAG:
+		return WriteGF_IPMPX_ISMACryp(bs, _p);
+	case GF_IPMPX_SEL_DEC_INIT_TAG:
+		return WriteGF_IPMPX_SelectiveDecryptionInit(bs, _p);
+	case GF_IPMPX_AUDIO_WM_INIT_TAG:
+	case GF_IPMPX_VIDEO_WM_INIT_TAG:
 		return WriteGF_IPMPX_WatermarkingInit(bs, _p);
-	case GF_IPMPX_AUDIO_WM_SEND_TAG: 
-	case GF_IPMPX_VIDEO_WM_SEND_TAG: 
+	case GF_IPMPX_AUDIO_WM_SEND_TAG:
+	case GF_IPMPX_VIDEO_WM_SEND_TAG:
 		return WriteGF_IPMPX_SendWatermark(bs, _p);
 
-/*
-	case GF_IPMPX_USER_QUERY_TAG: return WriteGF_IPMPX_UserQuery(bs, _p);
-	case GF_IPMPX_USER_RESPONSE_TAG: return WriteGF_IPMPX_UserQueryResponse(bs, _p);
-*/
-	case GF_IPMPX_GET_TOOLS_TAG: return GF_OK;
-	default: return GF_BAD_PARAM;
+	/*
+		case GF_IPMPX_USER_QUERY_TAG: return WriteGF_IPMPX_UserQuery(bs, _p);
+		case GF_IPMPX_USER_RESPONSE_TAG: return WriteGF_IPMPX_UserQueryResponse(bs, _p);
+	*/
+	case GF_IPMPX_GET_TOOLS_TAG:
+		return GF_OK;
+	default:
+		return GF_BAD_PARAM;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/odf/ipmpx_dump.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/ipmpx_dump.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -36,7 +36,7 @@
 		for (z=0; z<indent; z++) ind_buf[z] = ' '; \
 		ind_buf[z] = 0; \
 	} \
-
+ 
 
 static void StartList(FILE *trace, const char *name, u32 indent, Bool XMTDump)
 {
@@ -240,7 +240,7 @@
 		if (XMTDump) EndAttributes(trace, 1, 0);
 		else EndElement(trace, "", indent, 0);
 	}
-		break;
+	break;
 	case GF_IPMPX_AUTH_AlgorithmDescr_Tag:
 	{
 		GF_IPMPX_AUTH_AlgorithmDescriptor *p = (GF_IPMPX_AUTH_AlgorithmDescriptor *)ipa;
@@ -255,7 +255,7 @@
 
 		EndElement(trace, "IPMP_AlgorithmDescriptor", indent, XMTDump);
 	}
-		break;
+	break;
 	}
 }
 
@@ -410,7 +410,7 @@
 	}
 	indent--;
 	EndList(trace, "candidateAlgorithms", indent, XMTDump);
-	
+
 	StartList(trace, "agreedAlgorithms", indent, XMTDump);
 	count = gf_list_count(p->agreedAlgorithms);
 	indent++;
@@ -774,7 +774,7 @@
 				DumpInt(trace, "keySize", sb->keySize, indent, XMTDump);
 			}
 			EndAttributes(trace, XMTDump, 1);
-			if (sb->Stream_Cipher_Specific_Init_Info) 
+			if (sb->Stream_Cipher_Specific_Init_Info)
 				gf_ipmpx_dump_ByteArray(sb->Stream_Cipher_Specific_Init_Info, "StreamCipher", trace, indent, XMTDump);
 
 			indent--;
@@ -797,7 +797,7 @@
 			DumpInt(trace, "buf", sf->buf, indent, XMTDump);
 			if (sf->mappingTable) DumpData_16(trace, "mappingTable", sf->mappingTable, sf->mappingTableSize, indent, XMTDump);
 			EndAttributes(trace, XMTDump, 1);
-			if (sf->shuffleSpecificInfo) 
+			if (sf->shuffleSpecificInfo)
 				gf_ipmpx_dump_ByteArray(sf->shuffleSpecificInfo, "shuffleSpecificInfo", trace, indent, XMTDump);
 
 			indent--;
@@ -832,40 +832,63 @@
 {
 	switch (_p->tag) {
 	case GF_IPMPX_RIGHTS_DATA_TAG:
-	case GF_IPMPX_OPAQUE_DATA_TAG: return gf_ipmpx_dump_OpaqueData(_p, trace, indent, XMTDump);
-	case GF_IPMPX_KEY_DATA_TAG: return gf_ipmpx_dump_KeyData(_p, trace, indent, XMTDump);
-	case GF_IPMPX_SECURE_CONTAINER_TAG: return gf_ipmpx_dump_SecureContainer(_p, trace, indent, XMTDump);
-	case GF_IPMPX_INIT_AUTHENTICATION_TAG: return gf_ipmpx_dump_InitAuthentication(_p, trace, indent, XMTDump);
-	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG: return gf_ipmpx_dump_TrustSecurityMetadata(_p, trace, indent, XMTDump);
-	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG: return gf_ipmpx_dump_MutualAuthentication(_p, trace, indent, XMTDump);
-	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG: return gf_ipmpx_dump_GetToolsResponse(_p, trace, indent, XMTDump);
-	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG: return gf_ipmpx_dump_ParametricDescription(_p, trace, indent, XMTDump);
-	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG: return gf_ipmpx_dump_ToolParamCapabilitiesQuery(_p, trace, indent, XMTDump);
-	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG: return gf_ipmpx_dump_ToolParamCapabilitiesResponse(_p, trace, indent, XMTDump);
-	case GF_IPMPX_GET_TOOL_CONTEXT_TAG: return gf_ipmpx_dump_GetToolContext(_p, trace, indent, XMTDump);
-	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG: return gf_ipmpx_dump_GetToolContextResponse(_p, trace, indent, XMTDump);
-	case GF_IPMPX_CONNECT_TOOL_TAG: return gf_ipmpx_dump_ConnectTool(_p, trace, indent, XMTDump);
-	case GF_IPMPX_DISCONNECT_TOOL_TAG: return gf_ipmpx_dump_DisconnectTool(_p, trace, indent, XMTDump);
-	case GF_IPMPX_ADD_TOOL_LISTENER_TAG: return gf_ipmpx_dump_AddToolNotificationListener(_p, trace, indent, XMTDump);
-	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG: return gf_ipmpx_dump_RemoveToolNotificationListener(_p, trace, indent, XMTDump);
-	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG: return gf_ipmpx_dump_NotifyToolEvent(_p, trace, indent, XMTDump);
-	case GF_IPMPX_CAN_PROCESS_TAG: return gf_ipmpx_dump_CanProcess(_p, trace, indent, XMTDump);
-	case GF_IPMPX_ISMACRYP_TAG: return gf_ipmpx_dump_ISMACryp(_p, trace, indent, XMTDump);
-	case GF_IPMPX_TOOL_API_CONFIG_TAG: return gf_ipmpx_dump_ToolAPI_Config(_p, trace, indent, XMTDump);
-	case GF_IPMPX_AUDIO_WM_INIT_TAG: 
-	case GF_IPMPX_VIDEO_WM_INIT_TAG: 
+	case GF_IPMPX_OPAQUE_DATA_TAG:
+		return gf_ipmpx_dump_OpaqueData(_p, trace, indent, XMTDump);
+	case GF_IPMPX_KEY_DATA_TAG:
+		return gf_ipmpx_dump_KeyData(_p, trace, indent, XMTDump);
+	case GF_IPMPX_SECURE_CONTAINER_TAG:
+		return gf_ipmpx_dump_SecureContainer(_p, trace, indent, XMTDump);
+	case GF_IPMPX_INIT_AUTHENTICATION_TAG:
+		return gf_ipmpx_dump_InitAuthentication(_p, trace, indent, XMTDump);
+	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG:
+		return gf_ipmpx_dump_TrustSecurityMetadata(_p, trace, indent, XMTDump);
+	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG:
+		return gf_ipmpx_dump_MutualAuthentication(_p, trace, indent, XMTDump);
+	case GF_IPMPX_GET_TOOLS_RESPONSE_TAG:
+		return gf_ipmpx_dump_GetToolsResponse(_p, trace, indent, XMTDump);
+	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG:
+		return gf_ipmpx_dump_ParametricDescription(_p, trace, indent, XMTDump);
+	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG:
+		return gf_ipmpx_dump_ToolParamCapabilitiesQuery(_p, trace, indent, XMTDump);
+	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG:
+		return gf_ipmpx_dump_ToolParamCapabilitiesResponse(_p, trace, indent, XMTDump);
+	case GF_IPMPX_GET_TOOL_CONTEXT_TAG:
+		return gf_ipmpx_dump_GetToolContext(_p, trace, indent, XMTDump);
+	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG:
+		return gf_ipmpx_dump_GetToolContextResponse(_p, trace, indent, XMTDump);
+	case GF_IPMPX_CONNECT_TOOL_TAG:
+		return gf_ipmpx_dump_ConnectTool(_p, trace, indent, XMTDump);
+	case GF_IPMPX_DISCONNECT_TOOL_TAG:
+		return gf_ipmpx_dump_DisconnectTool(_p, trace, indent, XMTDump);
+	case GF_IPMPX_ADD_TOOL_LISTENER_TAG:
+		return gf_ipmpx_dump_AddToolNotificationListener(_p, trace, indent, XMTDump);
+	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG:
+		return gf_ipmpx_dump_RemoveToolNotificationListener(_p, trace, indent, XMTDump);
+	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG:
+		return gf_ipmpx_dump_NotifyToolEvent(_p, trace, indent, XMTDump);
+	case GF_IPMPX_CAN_PROCESS_TAG:
+		return gf_ipmpx_dump_CanProcess(_p, trace, indent, XMTDump);
+	case GF_IPMPX_ISMACRYP_TAG:
+		return gf_ipmpx_dump_ISMACryp(_p, trace, indent, XMTDump);
+	case GF_IPMPX_TOOL_API_CONFIG_TAG:
+		return gf_ipmpx_dump_ToolAPI_Config(_p, trace, indent, XMTDump);
+	case GF_IPMPX_AUDIO_WM_INIT_TAG:
+	case GF_IPMPX_VIDEO_WM_INIT_TAG:
 		return gf_ipmpx_dump_WatermarkingInit(_p, trace, indent, XMTDump);
-	case GF_IPMPX_AUDIO_WM_SEND_TAG: 
-	case GF_IPMPX_VIDEO_WM_SEND_TAG: 
+	case GF_IPMPX_AUDIO_WM_SEND_TAG:
+	case GF_IPMPX_VIDEO_WM_SEND_TAG:
 		return gf_ipmpx_dump_SendWatermark(_p, trace, indent, XMTDump);
-	case GF_IPMPX_SEL_DEC_INIT_TAG: return gf_ipmpx_dump_SelectiveDecryptionInit(_p, trace, indent, XMTDump);
-
-/*
-	case GF_IPMPX_USER_QUERY_TAG: return gf_ipmpx_dump_UserQuery(_p, trace, indent, XMTDump);
-	case GF_IPMPX_USER_RESPONSE_TAG: return gf_ipmpx_dump_UserQueryResponse(_p, trace, indent, XMTDump);
-*/
-	case GF_IPMPX_GET_TOOLS_TAG: return GF_BAD_PARAM;
-	default: return GF_BAD_PARAM;
+	case GF_IPMPX_SEL_DEC_INIT_TAG:
+		return gf_ipmpx_dump_SelectiveDecryptionInit(_p, trace, indent, XMTDump);
+
+	/*
+		case GF_IPMPX_USER_QUERY_TAG: return gf_ipmpx_dump_UserQuery(_p, trace, indent, XMTDump);
+		case GF_IPMPX_USER_RESPONSE_TAG: return gf_ipmpx_dump_UserQueryResponse(_p, trace, indent, XMTDump);
+	*/
+	case GF_IPMPX_GET_TOOLS_TAG:
+		return GF_BAD_PARAM;
+	default:
+		return GF_BAD_PARAM;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/odf/ipmpx_parse.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/ipmpx_parse.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -98,7 +98,7 @@
 		if (!stricmp(fieldName, "candidateAlgorithms") || !stricmp(fieldName, "agreedAlgorithms")) return GF_ODF_FT_IPMPX_LIST;
 		else if (!stricmp(fieldName, "certificates")) return GF_ODF_FT_IPMPX_BA_LIST;
 		else if (!stricmp(fieldName, "publicKey") || !stricmp(fieldName, "trustData")) return GF_ODF_FT_IPMPX;
-		else if (!stricmp(fieldName, "authCodes") || !stricmp(fieldName, "opaque") || !stricmp(fieldName, "AuthenticationData")) 
+		else if (!stricmp(fieldName, "authCodes") || !stricmp(fieldName, "opaque") || !stricmp(fieldName, "AuthenticationData"))
 			return GF_ODF_FT_IPMPX_BA;
 		break;
 	case GF_IPMPX_ALGORITHM_DESCRIPTOR_TAG:
@@ -111,7 +111,7 @@
 		if (!stricmp(fieldName, "descriptionComment")) return GF_ODF_FT_IPMPX_BA;
 		else if (!stricmp(fieldName, "descriptions")) return GF_ODF_FT_IPMPX_LIST;
 		break;
-	case GF_IPMPX_PARAM_DESCRIPTOR_ITEM_TAG: 
+	case GF_IPMPX_PARAM_DESCRIPTOR_ITEM_TAG:
 		/*all is IPMPX data*/
 		return GF_ODF_FT_IPMPX_BA;
 	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG:
@@ -241,7 +241,10 @@
 	j=0;
 	for (i=0; i<len; i++) {
 		switch (val[i]) {
-		case '\'': case '\"': case ',': case ' ':
+		case '\'':
+		case '\"':
+		case ',':
+		case ' ':
 			break;
 		default:
 			szVal[j] = val[i];
@@ -251,8 +254,14 @@
 		}
 		if (j) {
 			szVal[j] = 0;
-			if (!strnicmp(szVal, "0x", 2)) { sscanf(szVal, "%x", &v); eventType[*eventTypeCount] = v; }
-			else { sscanf(szVal, "%u", &v); eventType[*eventTypeCount] = v; }
+			if (!strnicmp(szVal, "0x", 2)) {
+				sscanf(szVal, "%x", &v);
+				eventType[*eventTypeCount] = v;
+			}
+			else {
+				sscanf(szVal, "%u", &v);
+				eventType[*eventTypeCount] = v;
+			}
 			j=0;
 			(*eventTypeCount) += 1;
 			if (*eventTypeCount == 9) return GF_OK;
@@ -272,7 +281,10 @@
 	count = j = 0;
 	for (i=0; i<len; i++) {
 		switch (val[i]) {
-		case '\'': case '\"': case ',': case ' ':
+		case '\'':
+		case '\"':
+		case ',':
+		case ' ':
 			break;
 		default:
 			szVal[j] = val[i];
@@ -282,8 +294,14 @@
 		}
 		if (j) {
 			szVal[j] = 0;
-			if (!strnicmp(szVal, "0x", 2)) { sscanf(szVal, "%x", &v); data[count] = v; }
-			else { sscanf(szVal, "%u", &v); data[count] = v; }
+			if (!strnicmp(szVal, "0x", 2)) {
+				sscanf(szVal, "%x", &v);
+				data[count] = v;
+			}
+			else {
+				sscanf(szVal, "%u", &v);
+				data[count] = v;
+			}
 			j=0;
 			count += 1;
 			if (count == alloc) {
@@ -329,189 +347,213 @@
 			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, "expireDTS")) GET_U32(p->expireDTS)
+					else if (!stricmp(fieldName, "expirePacketID")) GET_U32(p->expirePacketID)
+					}
+	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;
-		if (!stricmp(fieldName, "toolID")) { GF_IPMPX_ParseBin128(val, &p->toolID); ret = 1; }
-		else if (!stricmp(fieldName, "AuditDate")) { GF_IPMPX_ParseDate(val, &p->AuditDate); ret = 1; }
+		if (!stricmp(fieldName, "toolID")) {
+			GF_IPMPX_ParseBin128(val, &p->toolID);
+			ret = 1;
+		}
+		else if (!stricmp(fieldName, "AuditDate")) {
+			GF_IPMPX_ParseDate(val, &p->AuditDate);
+			ret = 1;
+		}
 	}
-		break;
+	break;
 	case GF_IPMPX_TRUST_SPECIFICATION_TAG:
 	{
 		GF_IPMPX_TrustSpecification *p = (GF_IPMPX_TrustSpecification*)_p;
-		if (!stricmp(fieldName, "startDate")) { GF_IPMPX_ParseDate(val, &p->startDate); ret = 1; }
+		if (!stricmp(fieldName, "startDate")) {
+			GF_IPMPX_ParseDate(val, &p->startDate);
+			ret = 1;
+		}
 		else if (!stricmp(fieldName, "attackerProfile")) GET_U8(p->attackerProfile)
-		else if (!stricmp(fieldName, "trustedDuration")) GET_U32(p->trustedDuration)
-	}
-		break;
+			else if (!stricmp(fieldName, "trustedDuration")) GET_U32(p->trustedDuration)
+			}
+	break;
 	case GF_IPMPX_ALGORITHM_DESCRIPTOR_TAG:
 	{
 		GF_IPMPX_AUTH_AlgorithmDescriptor *p = (GF_IPMPX_AUTH_AlgorithmDescriptor *)_p;
 		if (!stricmp(fieldName, "regAlgoID")) GET_U16(p->regAlgoID)
-	}
-		break;
+		}
+	break;
 	case GF_IPMPX_KEY_DESCRIPTOR_TAG:
 	{
 		GF_IPMPX_AUTH_KeyDescriptor *p = (GF_IPMPX_AUTH_KeyDescriptor *)_p;
 		if (!stricmp(fieldName, "keyBody")) {
 			u32 s;
 			GF_IPMPX_ParseBinData(val, &p->keyBody, &s);
-			p->keyBodyLength = s; 
+			p->keyBodyLength = s;
 			ret = 1;
 		}
 	}
-		break;
+	break;
 	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG:
 	{
 		GF_IPMPX_ParametricDescription*p = (GF_IPMPX_ParametricDescription*)_p;
 		if (!stricmp(fieldName, "majorVersion")) GET_U8(p->majorVersion)
-		else if (!stricmp(fieldName, "minorVersion")) GET_U8(p->minorVersion)
-	}
-		break;
+			else if (!stricmp(fieldName, "minorVersion")) GET_U8(p->minorVersion)
+			}
+	break;
 	case GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG:
 	{
 		GF_IPMPX_ToolParamCapabilitiesResponse*p = (GF_IPMPX_ToolParamCapabilitiesResponse*)_p;
 		if (!stricmp(fieldName, "capabilitiesSupported")) GET_BOOL(p->capabilitiesSupported)
-	}
-		break;
+		}
+	break;
 	case GF_IPMPX_DISCONNECT_TOOL_TAG:
 	{
 		GF_IPMPX_DisconnectTool*p = (GF_IPMPX_DisconnectTool*)_p;
 		if (!stricmp(fieldName, "IPMP_ToolContextID")) GET_U16(p->IPMP_ToolContextID)
-	}
-		break;
+		}
+	break;
 	case GF_IPMPX_GET_TOOL_CONTEXT_TAG:
 	{
 		GF_IPMPX_GetToolContext*p = (GF_IPMPX_GetToolContext*)_p;
 		if (!stricmp(fieldName, "scope")) GET_U8(p->scope)
-		else if (!stricmp(fieldName, "IPMP_DescriptorIDEx")) GET_U16(p->IPMP_DescriptorIDEx)
-	}
-		break;
+			else if (!stricmp(fieldName, "IPMP_DescriptorIDEx")) GET_U16(p->IPMP_DescriptorIDEx)
+			}
+	break;
 	case GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG:
 	{
 		GF_IPMPX_GetToolContextResponse*p = (GF_IPMPX_GetToolContextResponse*)_p;
 		if (!stricmp(fieldName, "OD_ID")) GET_U16(p->OD_ID)
-		else if (!stricmp(fieldName, "ESD_ID")) GET_U16(p->ESD_ID)
-		else if (!stricmp(fieldName, "IPMP_ToolContextID")) GET_U16(p->IPMP_ToolContextID)
-	}
-		break;
+			else if (!stricmp(fieldName, "ESD_ID")) GET_U16(p->ESD_ID)
+				else if (!stricmp(fieldName, "IPMP_ToolContextID")) GET_U16(p->IPMP_ToolContextID)
+				}
+	break;
 	case GF_IPMPX_ADD_TOOL_LISTENER_TAG:
 	{
 		GF_IPMPX_AddToolNotificationListener*p = (GF_IPMPX_AddToolNotificationListener*)_p;
 		if (!stricmp(fieldName, "eventType")) return GF_IPMPX_ParseEventType(val, p->eventType, &p->eventTypeCount);
 		else if (!stricmp(fieldName, "scope")) GET_U8(p->scope)
-	}
-		break;
+		}
+	break;
 	case GF_IPMPX_REMOVE_TOOL_LISTENER_TAG:
 	{
 		GF_IPMPX_RemoveToolNotificationListener*p = (GF_IPMPX_RemoveToolNotificationListener*)_p;
 		if (!stricmp(fieldName, "eventType")) return GF_IPMPX_ParseEventType(val, p->eventType, &p->eventTypeCount);
 	}
-		break;
+	break;
 	case GF_IPMPX_NOTIFY_TOOL_EVENT_TAG:
 	{
 		GF_IPMPX_NotifyToolEvent*p = (GF_IPMPX_NotifyToolEvent*)_p;
 		if (!stricmp(fieldName, "OD_ID")) GET_U16(p->OD_ID)
-		else if (!stricmp(fieldName, "ESD_ID")) GET_U16(p->ESD_ID)
-		else if (!stricmp(fieldName, "IPMP_ToolContextID")) GET_U16(p->IPMP_ToolContextID)
-		else if (!stricmp(fieldName, "eventType")) GET_U8(p->eventType)
-	}
-		break;
+			else if (!stricmp(fieldName, "ESD_ID")) GET_U16(p->ESD_ID)
+				else if (!stricmp(fieldName, "IPMP_ToolContextID")) GET_U16(p->IPMP_ToolContextID)
+					else if (!stricmp(fieldName, "eventType")) GET_U8(p->eventType)
+					}
+	break;
 	case GF_IPMPX_CAN_PROCESS_TAG:
 	{
 		GF_IPMPX_CanProcess*p = (GF_IPMPX_CanProcess*)_p;
 		if (!stricmp(fieldName, "canProcess")) GET_BOOL(p->canProcess)
-	}
-		break;
+		}
+	break;
 	case GF_IPMPX_TOOL_API_CONFIG_TAG:
 	{
 		GF_IPMPX_ToolAPI_Config*p = (GF_IPMPX_ToolAPI_Config*)_p;
 		if (!stricmp(fieldName, "Instantiation_API_ID")) GET_U32(p->Instantiation_API_ID)
-		else if (!stricmp(fieldName, "Messaging_API_ID")) GET_U32(p->Messaging_API_ID)
-	}
-		break;
+			else if (!stricmp(fieldName, "Messaging_API_ID")) GET_U32(p->Messaging_API_ID)
+			}
+	break;
 	case GF_IPMPX_AUDIO_WM_INIT_TAG:
 	case GF_IPMPX_VIDEO_WM_INIT_TAG:
 	{
 		GF_IPMPX_WatermarkingInit *p = (GF_IPMPX_WatermarkingInit*)_p;
 		if (!stricmp(fieldName, "inputFormat")) GET_U8(p->inputFormat)
-		else if (!stricmp(fieldName, "requiredOp")) GET_U8(p->requiredOp)
-		else if (!stricmp(fieldName, "nChannels")) GET_U8(p->nChannels)
-		else if (!stricmp(fieldName, "bitPerSample")) GET_U8(p->bitPerSample)
-		else if (!stricmp(fieldName, "frequency")) GET_U32(p->frequency)
-		else if (!stricmp(fieldName, "frame_horizontal_size")) GET_U16(p->frame_horizontal_size)
-		else if (!stricmp(fieldName, "frame_vertical_size")) GET_U16(p->frame_vertical_size)
-		else if (!stricmp(fieldName, "chroma_format")) GET_U8(p->chroma_format)
-		else if (!stricmp(fieldName, "wmPayload")) { ret=1; GF_IPMPX_ParseBinData(val, &p->wmPayload, &p->wmPayloadLen); }
-		else if (!stricmp(fieldName, "opaqueData")) { ret=1; GF_IPMPX_ParseBinData(val, &p->opaqueData, &p->opaqueDataSize); }
-		else if (!stricmp(fieldName, "wmRecipientId")) GET_U16(p->wmRecipientId)
-	}
-		break;
+			else if (!stricmp(fieldName, "requiredOp")) GET_U8(p->requiredOp)
+				else if (!stricmp(fieldName, "nChannels")) GET_U8(p->nChannels)
+					else if (!stricmp(fieldName, "bitPerSample")) GET_U8(p->bitPerSample)
+						else if (!stricmp(fieldName, "frequency")) GET_U32(p->frequency)
+							else if (!stricmp(fieldName, "frame_horizontal_size")) GET_U16(p->frame_horizontal_size)
+								else if (!stricmp(fieldName, "frame_vertical_size")) GET_U16(p->frame_vertical_size)
+									else if (!stricmp(fieldName, "chroma_format")) GET_U8(p->chroma_format)
+										else if (!stricmp(fieldName, "wmPayload")) {
+											ret=1;
+											GF_IPMPX_ParseBinData(val, &p->wmPayload, &p->wmPayloadLen);
+										}
+										else if (!stricmp(fieldName, "opaqueData")) {
+											ret=1;
+											GF_IPMPX_ParseBinData(val, &p->opaqueData, &p->opaqueDataSize);
+										}
+										else if (!stricmp(fieldName, "wmRecipientId")) GET_U16(p->wmRecipientId)
+										}
+	break;
 	case GF_IPMPX_AUDIO_WM_SEND_TAG:
 	case GF_IPMPX_VIDEO_WM_SEND_TAG:
 	{
 		GF_IPMPX_SendWatermark *p = (GF_IPMPX_SendWatermark*)_p;
 		if (!stricmp(fieldName, "wm_status")) GET_U8(p->wm_status)
-		else if (!stricmp(fieldName, "compression_status")) GET_U8(p->compression_status)
-	}
-		break;
+			else if (!stricmp(fieldName, "compression_status")) GET_U8(p->compression_status)
+			}
+	break;
 	case GF_IPMPX_SEL_DEC_INIT_TAG:
 	{
 		GF_IPMPX_SelectiveDecryptionInit*p = (GF_IPMPX_SelectiveDecryptionInit*)_p;
 		if (!stricmp(fieldName, "mediaTypeExtension")) GET_U8(p->mediaTypeExtension)
-		else if (!stricmp(fieldName, "mediaTypeExtension")) GET_U8(p->mediaTypeExtension)
-		else if (!stricmp(fieldName, "mediaTypeIndication")) GET_U8(p->mediaTypeIndication)
-		else if (!stricmp(fieldName, "profileLevelIndication")) GET_U8(p->profileLevelIndication)
-		else if (!stricmp(fieldName, "compliance")) GET_U8(p->compliance)
-		else if (!stricmp(fieldName, "RLE_Data")) { ret=1; gf_ipmpx_data_parse_16(val, &p->RLE_Data, &p->RLE_DataLength); }
-	}
-		break;
+			else if (!stricmp(fieldName, "mediaTypeExtension")) GET_U8(p->mediaTypeExtension)
+				else if (!stricmp(fieldName, "mediaTypeIndication")) GET_U8(p->mediaTypeIndication)
+					else if (!stricmp(fieldName, "profileLevelIndication")) GET_U8(p->profileLevelIndication)
+						else if (!stricmp(fieldName, "compliance")) GET_U8(p->compliance)
+							else if (!stricmp(fieldName, "RLE_Data")) {
+								ret=1;
+								gf_ipmpx_data_parse_16(val, &p->RLE_Data, &p->RLE_DataLength);
+							}
+	}
+	break;
 	case GF_IPMPX_SEL_ENC_BUFFER_TAG:
 	{
 		GF_IPMPX_SelEncBuffer*p = (GF_IPMPX_SelEncBuffer*)_p;
-		if (!stricmp(fieldName, "cipher_Id")) { GF_IPMPX_ParseBin128(val, &p->cipher_Id); ret = 1; }
+		if (!stricmp(fieldName, "cipher_Id")) {
+			GF_IPMPX_ParseBin128(val, &p->cipher_Id);
+			ret = 1;
+		}
 		else if (!stricmp(fieldName, "syncBoundary")) GET_U8(p->syncBoundary)
-		else if (!stricmp(fieldName, "mode")) GET_U8(p->mode)
-		else if (!stricmp(fieldName, "blockSize")) GET_U16(p->blockSize)
-		else if (!stricmp(fieldName, "keySize")) GET_U16(p->keySize)
-	}
-		break;
+			else if (!stricmp(fieldName, "mode")) GET_U8(p->mode)
+				else if (!stricmp(fieldName, "blockSize")) GET_U16(p->blockSize)
+					else if (!stricmp(fieldName, "keySize")) GET_U16(p->keySize)
+					}
+	break;
 	case GF_IPMPX_SEL_ENC_FIELD_TAG:
 	{
 		GF_IPMPX_SelEncField*p = (GF_IPMPX_SelEncField*)_p;
 		if (!stricmp(fieldName, "field_Id")) GET_U8(p->field_Id)
-		else if (!stricmp(fieldName, "field_Scope")) GET_U8(p->field_Scope)
-		else if (!stricmp(fieldName, "buf")) GET_U8(p->buf)
-		else if (!stricmp(fieldName, "mappingTable")) { ret=1; gf_ipmpx_data_parse_16(val, &p->mappingTable, &p->mappingTableSize); }
-	}
-		break;
+			else if (!stricmp(fieldName, "field_Scope")) GET_U8(p->field_Scope)
+				else if (!stricmp(fieldName, "buf")) GET_U8(p->buf)
+					else if (!stricmp(fieldName, "mappingTable")) {
+						ret=1;
+						gf_ipmpx_data_parse_16(val, &p->mappingTable, &p->mappingTableSize);
+					}
+	}
+	break;
 	case GF_IPMPX_ISMACRYP_TAG:
 	{
 		GF_IPMPX_ISMACryp*p = (GF_IPMPX_ISMACryp*)_p;
 		if (!stricmp(fieldName, "crypto_suite")) GET_U8(p->cryptoSuite)
-		else if (!stricmp(fieldName, "IV_length")) GET_U8(p->IV_length)
-		else if (!stricmp(fieldName, "selective_encryption")) GET_BOOL(p->use_selective_encryption)
-		else if (!stricmp(fieldName, "key_indicator_length")) GET_U8(p->key_indicator_length)
-	}
-		break;
+			else if (!stricmp(fieldName, "IV_length")) GET_U8(p->IV_length)
+				else if (!stricmp(fieldName, "selective_encryption")) GET_BOOL(p->use_selective_encryption)
+					else if (!stricmp(fieldName, "key_indicator_length")) GET_U8(p->key_indicator_length)
+					}
+	break;
 	}
 	return ret ? GF_OK : GF_BAD_PARAM;
 }
@@ -526,7 +568,7 @@
 		p->protectedMsg = sp;
 		return GF_OK;
 	}
-		break;
+	break;
 	case GF_IPMPX_TRUST_SECURITY_METADATA_TAG:
 	{
 		GF_IPMPX_TrustSecurityMetadata *p = (GF_IPMPX_TrustSecurityMetadata*)_p;
@@ -534,7 +576,7 @@
 		gf_list_add(p->TrustedTools, sp);
 		return GF_OK;
 	}
-		break;
+	break;
 	case GF_IPMPX_TRUSTED_TOOL_TAG:
 	{
 		GF_IPMPX_TrustedTool *p = (GF_IPMPX_TrustedTool *)_p;
@@ -542,7 +584,7 @@
 		gf_list_add(p->trustSpecifications, sp);
 		return GF_OK;
 	}
-		break;
+	break;
 	case GF_IPMPX_MUTUAL_AUTHENTICATION_TAG:
 	{
 		GF_IPMPX_MutualAuthentication *p = (GF_IPMPX_MutualAuthentication *)_p;
@@ -571,7 +613,7 @@
 			return GF_BAD_PARAM;
 		}
 	}
-		break;
+	break;
 	case GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG:
 	{
 		GF_IPMPX_ParametricDescription*p = (GF_IPMPX_ParametricDescription*)_p;
@@ -579,7 +621,7 @@
 		if (!stricmp(fieldName, "descriptions")) return gf_list_add(p->descriptions, sp);
 		else return GF_BAD_PARAM;
 	}
-		break;
+	break;
 	case GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG:
 	{
 		GF_IPMPX_ToolParamCapabilitiesQuery*p = (GF_IPMPX_ToolParamCapabilitiesQuery*)_p;
@@ -589,7 +631,7 @@
 		p->description = (GF_IPMPX_ParametricDescription*)sp;
 		return GF_OK;
 	}
-		break;
+	break;
 	case GF_IPMPX_SEL_DEC_INIT_TAG:
 	{
 		GF_IPMPX_SelectiveDecryptionInit*p = (GF_IPMPX_SelectiveDecryptionInit*)_p;
@@ -598,7 +640,7 @@
 		else if (sp->tag==GF_IPMPX_SEL_ENC_FIELD_TAG) return gf_list_add(p->SelEncFields, sp);
 		else return GF_BAD_PARAM;
 	}
-		break;
+	break;
 	}
 	return GF_BAD_PARAM;
 }

gpac-0.5.0.svn5178.tar.bz2/src/odf/oci_codec.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/oci_codec.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -50,7 +50,7 @@
 	GF_List *OCIDescriptors;
 };
 
-struct __tag_oci_codec 
+struct __tag_oci_codec
 {
 	//events
 	GF_List *OCIEvents;
@@ -85,7 +85,7 @@
 		gf_odf_delete_descriptor(desc);
 	}
 	gf_list_del(event->OCIDescriptors);
-	gf_free(event);	
+	gf_free(event);
 }
 
 GF_EXPORT
@@ -127,7 +127,7 @@
 {
 	if (!event || !oci_desc) return GF_BAD_PARAM;
 	if (!OCI_IsOCIDesc(oci_desc)) return GF_ODF_INVALID_DESCRIPTOR;
-	
+
 	gf_list_add(event->OCIDescriptors, oci_desc);
 	return GF_OK;
 }
@@ -143,7 +143,7 @@
 GF_EXPORT
 GF_Err gf_oci_event_get_start_time(OCIEvent *event, u8 *Hours, u8 *Minutes, u8 *Seconds, u8 *HundredSeconds, u8 *IsAbsoluteTime)
 {
-	if (!event || !Hours || !Minutes || !Seconds || !HundredSeconds || !IsAbsoluteTime) 
+	if (!event || !Hours || !Minutes || !Seconds || !HundredSeconds || !IsAbsoluteTime)
 		return GF_BAD_PARAM;
 
 	*IsAbsoluteTime = event->AbsoluteTimeFlag;
@@ -157,7 +157,7 @@
 GF_EXPORT
 GF_Err gf_oci_event_get_duration(OCIEvent *event, u8 *Hours, u8 *Minutes, u8 *Seconds, u8 *HundredSeconds)
 {
-	if (!event || !Hours || !Minutes || !Seconds || !HundredSeconds) 
+	if (!event || !Hours || !Minutes || !Seconds || !HundredSeconds)
 		return GF_BAD_PARAM;
 
 	*Hours = event->duration[0];
@@ -232,16 +232,16 @@
 	unsigned char vals[4];
 
 	if (!bs || !size) return GF_BAD_PARAM;
-	
+
 	length = size;
 	vals[3] = (unsigned char) (length & 0x7f);
 	length >>= 7;
-	vals[2] = (unsigned char) ((length & 0x7f) | 0x80); 
+	vals[2] = (unsigned char) ((length & 0x7f) | 0x80);
 	length >>= 7;
-	vals[1] = (unsigned char) ((length & 0x7f) | 0x80); 
+	vals[1] = (unsigned char) ((length & 0x7f) | 0x80);
 	length >>= 7;
 	vals[0] = (unsigned char) ((length & 0x7f) | 0x80);
-	
+
 	if (size < 0x00000080) {
 		gf_bs_write_int(bs, vals[3], 8);
 	} else if (size < 0x00004000) {
@@ -269,7 +269,7 @@
 	u32 i, size, desc_size;
 	GF_Err e;
 	OCIEvent *ev;
-	
+
 	if (!codec || !codec->Mode || *outAU) return GF_BAD_PARAM;
 
 	bs = NULL;
@@ -300,7 +300,7 @@
 		gf_bs_write_int(bs, ev->AbsoluteTimeFlag, 1);
 		gf_bs_write_data(bs, ev->StartingTime, 4);
 		gf_bs_write_data(bs, ev->duration, 4);
-		
+
 		e = gf_odf_write_descriptor_list(bs, ev->OCIDescriptors);
 		gf_oci_event_del(ev);
 		if (e) goto err_exit;
@@ -330,7 +330,7 @@
 	OCIEvent *ev;
 	GF_BitStream *bs;
 	u32 size, hdrS, desc_size, tot_size, tmp_size, val;
-	GF_Descriptor *tmp;	
+	GF_Descriptor *tmp;
 	GF_Err e;
 
 	//must be decoder
@@ -346,7 +346,7 @@
 			e = GF_OUT_OF_MEM;
 			goto err_exit;
 		}
-		
+
 
 		//FIX IM1
 		gf_bs_read_int(bs, 8);
@@ -359,7 +359,7 @@
 			size <<= 7;
 			size |= val & 0x7F;
 		} while ( val & 0x80 );
-		
+
 		//parse event vars
 		ev->EventID = gf_bs_read_int(bs, 15);
 		ev->AbsoluteTimeFlag = gf_bs_read_int(bs, 1);
@@ -380,7 +380,7 @@
 			gf_list_add(ev->OCIDescriptors, tmp);
 			desc_size += tmp_size + gf_odf_size_field_size(tmp_size);
 		}
-		
+
 		if (desc_size != size - 10) {
 			e = GF_CORRUPTED_DATA;
 			goto err_exit;

gpac-0.5.0.svn5178.tar.bz2/src/odf/odf_code.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/odf_code.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -98,7 +98,7 @@
 	if (!string) {
 		gf_bs_write_int(bs, 0, 8);
 		return GF_OK;
-	}		
+	}
 	len = (u32) strlen(string);
 	if (len > 255) {
 		gf_bs_write_int(bs, 0, 8);
@@ -225,7 +225,7 @@
 
 	default:
 		if ( (desc->tag >= GF_ODF_EXT_BEGIN_TAG) &&
-			(desc->tag <= GF_ODF_EXT_END_TAG) ) {
+		        (desc->tag <= GF_ODF_EXT_END_TAG) ) {
 			return gf_list_add(esd->extensionDescriptors, desc);
 		}
 		gf_odf_delete_descriptor(desc);
@@ -250,7 +250,7 @@
 	ocrflag = gf_bs_read_int(bs, 1);
 	esd->streamPriority = gf_bs_read_int(bs, 5);
 	nbBytes += 3;
-	
+
 	if (streamdependflag) {
 		esd->dependsOnESID = gf_bs_read_int(bs, 16);
 		nbBytes += 2;
@@ -283,7 +283,7 @@
 		e = AddDescriptorToESD(esd, tmp);
 		if (e) return e;
 		nbBytes += tmp_size + gf_odf_size_field_size(tmp_size);
-		
+
 		//apple fix
 		if (!tmp_size) nbBytes = DescSize;
 
@@ -321,12 +321,12 @@
 		*outSize += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
 	if (esd->ipiPtr) {
-		e = gf_odf_size_descriptor((GF_Descriptor *) esd->ipiPtr, &tmpSize);	
+		e = gf_odf_size_descriptor((GF_Descriptor *) esd->ipiPtr, &tmpSize);
 		if (e) return e;
 		*outSize += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
 	if (esd->langDesc) {
-		e = gf_odf_size_descriptor((GF_Descriptor *) esd->langDesc, &tmpSize);	
+		e = gf_odf_size_descriptor((GF_Descriptor *) esd->langDesc, &tmpSize);
 		if (e) return e;
 		*outSize += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
@@ -336,12 +336,12 @@
 	e = gf_odf_size_descriptor_list(esd->IPMPDescriptorPointers, outSize);
 	if (e) return e;
 	if (esd->qos) {
-		e = gf_odf_size_descriptor((GF_Descriptor *) esd->qos, &tmpSize);	
+		e = gf_odf_size_descriptor((GF_Descriptor *) esd->qos, &tmpSize);
 		if (e) return e;
 		*outSize += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
 	if (esd->RegDescriptor) {
-		e = gf_odf_size_descriptor((GF_Descriptor *) esd->RegDescriptor, &tmpSize);	
+		e = gf_odf_size_descriptor((GF_Descriptor *) esd->RegDescriptor, &tmpSize);
 		if (e) return e;
 		*outSize += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
@@ -455,7 +455,7 @@
 	/*IPMPX*/
 	case GF_ODF_IPMP_TAG:
 		return gf_list_add(iod->IPMP_Descriptors, desc);
-	
+
 	/*IPMPX*/
 	case GF_ODF_IPMP_TL_TAG:
 		if (iod->IPMPToolList) gf_odf_desc_del((GF_Descriptor *)iod->IPMPToolList);
@@ -482,7 +482,7 @@
 	iod->inlineProfileFlag = gf_bs_read_int(bs, 1);
 	/*reserved = */gf_bs_read_int(bs, 4);
 	nbBytes += 2;
-	
+
 	if (urlflag) {
 		e = gf_odf_read_url_string(bs, & iod->URLString, &read);
 		if (e) return e;
@@ -532,7 +532,7 @@
 	if (e) return e;
 	if (iod->IPMPToolList) {
 		u32 tmpSize;
-		e = gf_odf_size_descriptor((GF_Descriptor *) iod->IPMPToolList, &tmpSize);	
+		e = gf_odf_size_descriptor((GF_Descriptor *) iod->IPMPToolList, &tmpSize);
 		if (e) return e;
 		*outSize += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
@@ -549,7 +549,7 @@
 	if (e) return e;
 	e = gf_odf_write_base_descriptor(bs, iod->tag, size);
 	if (e) return e;
-	
+
 	gf_bs_write_int(bs, iod->objectDescriptorID, 10);
 	gf_bs_write_int(bs, iod->URLString != NULL ? 1 : 0, 1);
 	gf_bs_write_int(bs, iod->inlineProfileFlag, 1);
@@ -621,13 +621,13 @@
 
 	//check if we can handle ContentClassif tags
 	if ( (desc->tag >= GF_ODF_OCI_BEGIN_TAG) &&
-		(desc->tag <= GF_ODF_OCI_END_TAG) ) {
+	        (desc->tag <= GF_ODF_OCI_END_TAG) ) {
 		return gf_list_add(od->OCIDescriptors, desc);
 	}
 
 	//or extensions
 	if ( (desc->tag >= GF_ODF_EXT_BEGIN_TAG) &&
-		(desc->tag <= GF_ODF_EXT_END_TAG) ) {
+	        (desc->tag <= GF_ODF_EXT_END_TAG) ) {
 		return gf_list_add(od->extensionDescriptors, desc);
 	}
 
@@ -658,7 +658,7 @@
 	urlflag = gf_bs_read_int(bs, 1);
 	/*reserved = */gf_bs_read_int(bs, 5);
 	nbBytes += 2;
-	
+
 	if (urlflag) {
 		u32 read;
 		e = gf_odf_read_url_string(bs, & od->URLString, &read);
@@ -708,7 +708,7 @@
 	if (e) return e;
 	e = gf_odf_write_base_descriptor(bs, od->tag, size);
 	if (e) return e;
-	
+
 	gf_bs_write_int(bs, od->objectDescriptorID, 10);
 	gf_bs_write_int(bs, od->URLString != NULL ? 1 : 0, 1);
 	gf_bs_write_int(bs, 31, 5);		//reserved: 0b1111.1 == 31
@@ -822,7 +822,7 @@
 	iod->inlineProfileFlag = gf_bs_read_int(bs, 1);
 	/*reserved = */gf_bs_read_int(bs, 4);
 	nbBytes += 2;
-	
+
 	if (urlflag) {
 		u32 read;
 		e = gf_odf_read_url_string(bs, & iod->URLString, &read);
@@ -871,7 +871,7 @@
 	}
 	if (iod->IPMPToolList) {
 		u32 tmpSize;
-		e = gf_odf_size_descriptor((GF_Descriptor *) iod->IPMPToolList, &tmpSize);	
+		e = gf_odf_size_descriptor((GF_Descriptor *) iod->IPMPToolList, &tmpSize);
 		if (e) return e;
 		*outSize += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
@@ -888,7 +888,7 @@
 	if (e) return e;
 	e = gf_odf_write_base_descriptor(bs, iod->tag, size);
 	if (e) return e;
-	
+
 	gf_bs_write_int(bs, iod->objectDescriptorID, 10);
 	gf_bs_write_int(bs, iod->URLString != NULL ? 1 : 0, 1);
 	gf_bs_write_int(bs, iod->inlineProfileFlag, 1);
@@ -964,13 +964,13 @@
 
 	//check if we can handle ContentClassif tags
 	if ( (desc->tag >= GF_ODF_OCI_BEGIN_TAG) &&
-		(desc->tag <= GF_ODF_OCI_END_TAG) ) {
+	        (desc->tag <= GF_ODF_OCI_END_TAG) ) {
 		return gf_list_add(od->OCIDescriptors, desc);
 	}
 
 	//or extension ...
 	if ( (desc->tag >= GF_ODF_EXT_BEGIN_TAG) &&
-		(desc->tag <= GF_ODF_EXT_END_TAG) ) {
+	        (desc->tag <= GF_ODF_EXT_END_TAG) ) {
 		return gf_list_add(od->extensionDescriptors, desc);
 	}
 
@@ -1009,7 +1009,7 @@
 	urlflag = gf_bs_read_int(bs, 1);
 	/*reserved = */gf_bs_read_int(bs, 5);
 	nbBytes += 2;
-	
+
 	if (urlflag) {
 		u32 read;
 		e = gf_odf_read_url_string(bs, & od->URLString, &read);
@@ -1061,7 +1061,7 @@
 	if (e) return e;
 	e = gf_odf_write_base_descriptor(bs, od->tag, size);
 	if (e) return e;
-	
+
 	gf_bs_write_int(bs, od->objectDescriptorID, 10);
 	gf_bs_write_int(bs, od->URLString != NULL ? 1 : 0, 1);
 	gf_bs_write_int(bs, 31, 5);		//reserved: 0b1111.1 == 31
@@ -1369,7 +1369,7 @@
 	if (e) return e;
 	e = gf_odf_write_base_descriptor(bs, esd_ref->tag, size);
 	if (e) return e;
-	
+
 	gf_bs_write_int(bs, esd_ref->trackRef, 16);
 	return GF_OK;
 }
@@ -1944,7 +1944,7 @@
 	}
 	return GF_OK;
 }
-	
+
 
 GF_Descriptor *gf_odf_new_ci()
 {
@@ -2010,7 +2010,7 @@
 	*outSize = 1;
 	if (cid->contentTypeFlag) *outSize += 1;
 
-	if (cid->contentIdentifierFlag) 
+	if (cid->contentIdentifierFlag)
 		*outSize += (u32) strlen((const char*)cid->contentIdentifier) - 1 - cid->contentTypeFlag;
 	return GF_OK;
 }
@@ -2114,7 +2114,7 @@
 		description = (GF_ETD_ItemText*)gf_malloc(sizeof(GF_ETD_ItemText));
 		if (! description) return GF_OUT_OF_MEM;
 		description->text = NULL;
-		e = OD_ReadUTF8String(bs, & description->text, etd->isUTF8, &len); 
+		e = OD_ReadUTF8String(bs, & description->text, etd->isUTF8, &len);
 		if (e) return e;
 		e = gf_list_add(etd->itemDescriptionList, description);
 		if (e) return e;
@@ -2180,13 +2180,13 @@
 	}
 	len = 255;
 	lentmp = nonLen;
-	if (lentmp < 255) { 
+	if (lentmp < 255) {
 		len = lentmp;
 	}
 	while (len == 255) {
 		*outSize += 1;
 		lentmp -= 255;
-		if (lentmp < 255) { 
+		if (lentmp < 255) {
 			len = lentmp;
 		}
 	}
@@ -2426,7 +2426,7 @@
 		nbBytes += size;
 		ipmp->opaque_data[size] = 0;
 		ipmp->opaque_data_size = size;
-		
+
 	}
 	/*data*/
 	else {
@@ -2716,7 +2716,7 @@
 	u32 i;
 	GF_OCICreator_item *tmp;
 	if (!ocn) return GF_BAD_PARAM;
-	
+
 	i=0;
 	while ((tmp = (GF_OCICreator_item *)gf_list_enum(ocn->OCICreators, &i))) {
 		if (tmp->OCICreatorName) gf_free(tmp->OCICreatorName);
@@ -2870,7 +2870,7 @@
 	rd->ratingCriteria = gf_bs_read_int(bs, 16);
 	rd->infoLength = DescSize - 6;
 	nbBytes += 6;
-	
+
 	rd->ratingInfo = (char*)gf_malloc(rd->infoLength);
 	if (! rd->ratingInfo) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, rd->ratingInfo, rd->infoLength);
@@ -3051,7 +3051,7 @@
 GF_Err gf_odf_del_smpte_camera(GF_SMPTECamera *cpd)
 {
 	u32 i;
-	GF_SmpteParam *tmp; 
+	GF_SmpteParam *tmp;
 	if (!cpd) return GF_BAD_PARAM;
 
 	i=0;
@@ -3207,7 +3207,7 @@
 	u32 tmpSize;
 	u32 nbBytes = 0;
 	if (! ipmptl) return GF_BAD_PARAM;
-	
+
 	while (nbBytes < DescSize) {
 		GF_Descriptor *tmp = NULL;
 		e = gf_odf_parse_descriptor(bs, &tmp, &tmpSize);
@@ -3281,7 +3281,7 @@
 		}
 	}
 	if (nbBytes>DescSize) return GF_ODF_INVALID_DESCRIPTOR;
-	
+
 	if (is_param) { }
 
 	if (nbBytes<DescSize) {
@@ -3331,7 +3331,7 @@
 	if (ipmpt->num_alternate) {
 		u32 i;
 		gf_bs_write_int(bs, ipmpt->num_alternate, 8);
-		for (i=0;i<ipmpt->num_alternate; i++) gf_bs_write_data(bs, (char*)ipmpt->specificToolID[i], 16);
+		for (i=0; i<ipmpt->num_alternate; i++) gf_bs_write_data(bs, (char*)ipmpt->specificToolID[i], 16);
 	}
 	if (ipmpt->tool_url) gf_ipmpx_write_array(bs, ipmpt->tool_url, (u32) strlen(ipmpt->tool_url));
 	return GF_OK;

gpac-0.5.0.svn5178.tar.bz2/src/odf/odf_codec.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/odf_codec.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -37,7 +37,7 @@
 
 	comList = gf_list_new();
 	if (!comList) return NULL;
-	
+
 	codec = (GF_ODCodec *) gf_malloc(sizeof(GF_ODCodec));
 	if (!codec) {
 		gf_list_del(comList);
@@ -84,7 +84,7 @@
 	u32 i;
 
 	if (!codec) return GF_BAD_PARAM;
-	
+
 	//check our bitstream: if existing, this means the previous encoded AU was not retrieved
 	//we DON'T allow that
 	if (codec->bs) return GF_BAD_PARAM;
@@ -94,7 +94,8 @@
 	/*encode each command*/
 	i = 0;
 	while ((com = (GF_ODCom *)gf_list_enum(codec->CommandList, &i))) {
-		e = gf_odf_write_command(codec->bs, com); if (e) goto err_exit;
+		e = gf_odf_write_command(codec->bs, com);
+		if (e) goto err_exit;
 		//don't forget OD Commands are aligned...
 		gf_bs_align(codec->bs);
 	}
@@ -145,10 +146,10 @@
 
 	//the bitStream should not be here
 	if (codec->bs) return GF_BAD_PARAM;
-	
+
 	codec->bs = gf_bs_new(au, (u64) au_length, (unsigned char)GF_BITSTREAM_READ);
 	if (!codec->bs) return GF_OUT_OF_MEM;
-	return GF_OK;	
+	return GF_OK;
 }
 
 
@@ -163,7 +164,8 @@
 
 	bufSize = (u32) gf_bs_available(codec->bs);
 	while (size < bufSize) {
-		e =	gf_odf_parse_command(codec->bs, &com, &comSize); if (e) goto err_exit;
+		e =	gf_odf_parse_command(codec->bs, &com, &comSize);
+		if (e) goto err_exit;
 		gf_list_add(codec->CommandList, com);
 		size += comSize + gf_odf_size_field_size(comSize);
 		//OD Commands are aligned
@@ -286,7 +288,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(char *raw_desc, u32 descSize, GF_Descriptor **outDesc)
 {
 	GF_Err e;
 	u32 size;
@@ -301,13 +303,13 @@
 	e = gf_odf_parse_descriptor(bs, outDesc, &size);
 	//the size dosn't have the header in it
 	size += gf_odf_size_field_size(size);
-/*
-	if (size != descSize) {
-		if (*outDesc) gf_odf_delete_descriptor(*outDesc);
-		*outDesc = NULL;
-		e = GF_ODF_INVALID_DESCRIPTOR;
-	}
-*/
+	/*
+		if (size != descSize) {
+			if (*outDesc) gf_odf_delete_descriptor(*outDesc);
+			*outDesc = NULL;
+			e = GF_ODF_INVALID_DESCRIPTOR;
+		}
+	*/
 
 	gf_bs_del(bs);
 	return e;
@@ -346,7 +348,7 @@
 {
 	u32 descSize;
 	GF_Err e;
-	
+
 	if (!desc) return GF_BAD_PARAM;
 	//get the descriptor length
 	e = gf_odf_size_descriptor(desc, &descSize);
@@ -357,14 +359,14 @@
 
 }
 
-//this is usefull to duplicate on the fly a descriptor (mainly for authoring purposes) 
+//this is usefull to duplicate on the fly a descriptor (mainly for authoring purposes)
 GF_EXPORT
 GF_Err gf_odf_desc_copy(GF_Descriptor *inDesc, GF_Descriptor **outDesc)
 {
 	GF_Err e;
 	char *desc;
 	u32 size;
-	
+
 	//warning: here we get some data allocated
 	e = gf_odf_desc_write(inDesc, &desc, &size);
 	if (e) return e;
@@ -391,7 +393,7 @@
 	GF_Err AddDescriptorToESD(GF_ESD *esd, GF_Descriptor *desc);
 	GF_Err AddDescriptorToIsomIOD(GF_IsomInitialObjectDescriptor *iod, GF_Descriptor *desc);
 	GF_Err AddDescriptorToIsomOD(GF_IsomObjectDescriptor *od, GF_Descriptor *desc);
-	
+
 	if (!parentDesc || !newDesc) return GF_BAD_PARAM;
 
 	switch (parentDesc->tag) {
@@ -404,11 +406,11 @@
 		return AddDescriptorToESD((GF_ESD *)parentDesc, newDesc);
 	case GF_ODF_DCD_TAG:
 		dcd = (GF_DecoderConfig *)parentDesc;
-		if ((newDesc->tag == GF_ODF_DSI_TAG) 
-			|| (newDesc->tag == GF_ODF_BIFS_CFG_TAG)
-			|| (newDesc->tag == GF_ODF_UI_CFG_TAG)
-			|| (newDesc->tag == GF_ODF_TEXT_CFG_TAG)
-			) {
+		if ((newDesc->tag == GF_ODF_DSI_TAG)
+		        || (newDesc->tag == GF_ODF_BIFS_CFG_TAG)
+		        || (newDesc->tag == GF_ODF_UI_CFG_TAG)
+		        || (newDesc->tag == GF_ODF_TEXT_CFG_TAG)
+		   ) {
 			if (dcd->decoderSpecificInfo) return GF_ODF_FORBIDDEN_DESCRIPTOR;
 			dcd->decoderSpecificInfo = (GF_DefaultDescriptor *) newDesc;
 			return GF_OK;
@@ -449,9 +451,9 @@
 
 
 /*****************************************************************************************
-		Since IPMP V2, we introduce a new set of functions to read / write a list of 
+		Since IPMP V2, we introduce a new set of functions to read / write a list of
 	descriptors that have no containers (a bit like an OD command, but for descriptors)
-		This is usefull for IPMPv2 DecoderSpecificInfo which contains a set of 
+		This is usefull for IPMPv2 DecoderSpecificInfo which contains a set of
 	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
@@ -472,7 +474,7 @@
 
 	size = 0;
 	while (size < raw_size) {
-		e =	gf_odf_parse_descriptor(bs, &desc, &desc_size); 
+		e =	gf_odf_parse_descriptor(bs, &desc, &desc_size);
 		if (e) goto exit;
 		gf_list_add(descList, desc);
 		size += desc_size + gf_odf_size_field_size(desc_size);
@@ -541,7 +543,8 @@
 					for (j=0; j<odR->NbODs; j++) {
 						if (od->objectDescriptorID==odR->OD_ID[j]) {
 							gf_list_rem(odU->objectDescriptors, k);
-							k--; count--;
+							k--;
+							count--;
 							gf_odf_desc_del((GF_Descriptor *)od);
 							break;
 						}
@@ -591,7 +594,7 @@
 			for (j=0; j<count2; j++) {
 				GF_ObjectDescriptor *od2 = (GF_ObjectDescriptor *)gf_list_get(odU_o->objectDescriptors, j);
 				if (od2->objectDescriptorID==od->objectDescriptorID) {
-					found = 1; 
+					found = 1;
 					break;
 				}
 			}

gpac-0.5.0.svn5178.tar.bz2/src/odf/odf_command.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/odf_command.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -40,7 +40,7 @@
 	//tag
 	tag = gf_bs_read_int(bs, 8);
 	sizeHeader = 1;
-	
+
 	//size
 	size = 0;
 	do {
@@ -60,7 +60,7 @@
 	newCom->tag = tag;
 
 	err = gf_odf_read_command(bs, newCom, *com_size);
-	//little trick to handle lazy bitstreams that encode 
+	//little trick to handle lazy bitstreams that encode
 	//SizeOfInstance on a fix number of bytes
 	//This nb of bytes is added in Read methods
 	*com_size += sizeHeader - gf_odf_size_field_size(*com_size);
@@ -158,7 +158,7 @@
 {
 	u32 size;
 	if (!odRem) return GF_BAD_PARAM;
-	
+
 	size = 10 * odRem->NbODs;
 	*outSize = 0;
 	*outSize = size/8;
@@ -191,7 +191,7 @@
 {
 	GF_ODUpdate *newCom = (GF_ODUpdate *) gf_malloc(sizeof(GF_ODUpdate));
 	if (!newCom) return NULL;
-	
+
 	newCom->objectDescriptors = gf_list_new();
 	if (! newCom->objectDescriptors) {
 		gf_free(newCom);
@@ -297,7 +297,7 @@
 {
 	GF_ESDUpdate *newCom = (GF_ESDUpdate *) gf_malloc(sizeof(GF_ESDUpdate));
 	if (!newCom) return NULL;
-	
+
 	newCom->ESDescriptors = gf_list_new();
 	if (! newCom->ESDescriptors) {
 		gf_free(newCom);
@@ -356,8 +356,8 @@
 		if (e) return e;
 		nbBits += ( tmpSize + gf_odf_size_field_size(tmpSize) ) * 8;
 		//our com is aligned, so nbBits is between (gf_odf_size_command-1)*8 and gf_odf_size_command*8
-		if ( ( (nbBits >(gf_odf_size_command-1)*8) && (nbBits <= gf_odf_size_command * 8)) 
-			|| (nbBits > gf_odf_size_command*8) ) {	//this one is a security break
+		if ( ( (nbBits >(gf_odf_size_command-1)*8) && (nbBits <= gf_odf_size_command * 8))
+		        || (nbBits > gf_odf_size_command*8) ) {	//this one is a security break
 			break;
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/src/odf/odf_dump.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/odf_dump.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -39,7 +39,7 @@
 		for (z=0; z<indent; z++) ind_buf[z] = ' '; \
 		ind_buf[z] = 0; \
 	} \
-
+ 
 GF_EXPORT
 GF_Err gf_odf_dump_com(void *p, FILE *trace, u32 indent, Bool XMTDump)
 {
@@ -217,7 +217,7 @@
 	}
 }
 
-/*special element open for XML only, appends "<eltName " - used because XMT-A OD representations use lots of 
+/*special element open for XML only, appends "<eltName " - used because XMT-A OD representations use lots of
 subdescs not present in BT*/
 static void StartSubElement(FILE *trace, const char *eltName, u32 indent, Bool XMTDump)
 {
@@ -227,7 +227,7 @@
 		fprintf(trace, "%s<%s ", ind_buf, eltName);
 	}
 }
-/*special close for XML only, appends "/>" - used because XMT-A OD representations use lots of 
+/*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)
 {
@@ -244,7 +244,7 @@
 	char ind_buf[OD_MAX_TREE];
 	OD_FORMAT_INDENT(ind_buf, indent);
 	if (!XMTDump) {
-		if (IsList) 
+		if (IsList)
 			fprintf(trace, "%s%s [\n", ind_buf, attName);
 		else
 			fprintf(trace, "%s%s ", ind_buf, attName);
@@ -410,7 +410,7 @@
 		if (desc->tag == tag_only) num_desc++;
 	}
 	if (!num_desc) return GF_OK;
-	
+
 	StartElement(trace, ListName, indent, XMTDump, 1);
 	indent++;
 	OD_FORMAT_INDENT(ind_buf, indent);
@@ -460,7 +460,7 @@
 		DumpString(trace, "URLstring", iod->URLString, indent, XMTDump);
 		EndSubElement(trace, indent, XMTDump);
 	}
-		
+
 	if (XMTDump) {
 		StartElement(trace, "Descr", indent, XMTDump, 1);
 		indent++;
@@ -478,7 +478,7 @@
 		gf_odf_dump_desc(iod->IPMPToolList, trace, indent + (XMTDump ? 1 : 0), XMTDump);
 		EndElement(trace, "toolListDescr" , indent, XMTDump, 0);
 	}
-	
+
 	if (XMTDump) {
 		indent--;
 		EndElement(trace, "Descr", indent, XMTDump, 1);
@@ -512,7 +512,7 @@
 			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);
@@ -539,7 +539,7 @@
 		StartElement(trace, "slConfigDescr" , indent, XMTDump, 0);
 		gf_odf_dump_desc(esd->slConfig, trace, indent + (XMTDump ? 1 : 0), XMTDump);
 		EndElement(trace, "slConfigDescr" , indent, XMTDump, 0);
-	}else{
+	} else {
 		StartElement(trace, "slConfigDescr" , indent, XMTDump, 0);
 		StartDescDump(trace, "SLConfigDescriptor", indent, XMTDump);
 		EndAttributes(trace, indent, XMTDump);
@@ -605,7 +605,7 @@
 	u32 i, count;
 	StartDescDump(trace, (dsi->version==1) ? "BIFSConfig" : "BIFSv2Config", indent, XMTDump);
 	indent++;
-	
+
 	if (dsi->version==2) {
 		DumpBool(trace, "use3DMeshCoding", 0, indent, XMTDump);
 		DumpBool(trace, "usePredictiveMFField", 0, indent, XMTDump);
@@ -678,7 +678,7 @@
 
 	StartDescDump(trace, (oti==1) ? "BIFSConfig" : "BIFSv2Config", indent, XMTDump);
 	indent++;
-	
+
 	if (oti==2) {
 		DumpBool(trace, "use3DMeshCoding", gf_bs_read_int(bs, 1), indent, XMTDump);
 		DumpBool(trace, "usePredictiveMFField", gf_bs_read_int(bs, 1), indent, XMTDump);
@@ -686,7 +686,7 @@
 	DumpInt(trace, "nodeIDbits", gf_bs_read_int(bs, 5), indent, XMTDump);
 	DumpInt(trace, "routeIDbits", gf_bs_read_int(bs, 5), indent, XMTDump);
 
-	if (oti==2) 
+	if (oti==2)
 		DumpInt(trace, "protoIDbits", gf_bs_read_int(bs, 5), indent, XMTDump);
 
 	flag = gf_bs_read_int(bs, 1);
@@ -735,9 +735,9 @@
 
 GF_Err gf_odf_dump_laser_cfg(GF_LASERConfig *dsi, FILE *trace, u32 indent, Bool XMTDump)
 {
-	fprintf(trace, "<lsr:LASeRHeader profile=\"%s\" pointsCodec=\"%s\"", 
-		dsi->profile ? "mini" : "full",
-		dsi->pointsCodec ? "Unknown" : "ExpGolombPointsCodec");
+	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\"");
@@ -774,7 +774,7 @@
 	StartElement(trace, "SampleDescriptions", indent, XMTDump, 1);
 	indent++;
 	OD_FORMAT_INDENT(ind_buf, indent);
-	
+
 	count = gf_list_count(desc->sample_descriptions);
 	for (i=0; i<count; i++) {
 		char szStyles[1024];
@@ -836,7 +836,7 @@
 	StartDescDump(trace, "UIConfig" , indent, XMTDump);
 	indent++;
 	DumpString(trace, "deviceName", uid->deviceName, indent, XMTDump);
-	
+
 	if (!stricmp(devName, "StringSensor") && uid->termChar) {
 		devName[0] = uid->termChar;
 		devName[1] = 0;
@@ -895,7 +895,7 @@
 	for (i=0; i<len; i++) devName[i] = gf_bs_read_int(bs, 8);
 	devName[i] = 0;
 	DumpString(trace, "deviceName", devName, indent, XMTDump);
-	
+
 	if (!stricmp(devName, "StringSensor") && gf_bs_available(bs)) {
 		devName[0] = gf_bs_read_int(bs, 8);
 		devName[1] = 0;
@@ -1175,15 +1175,15 @@
 	DumpBool(trace, "isUTF8", etd->isUTF8, indent, XMTDump);
 	DumpString(trace, "nonItemText", etd->NonItemText, indent, XMTDump);
 	EndAttributes(trace, indent, XMTDump);
-	
+
 	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);
-		StartSubElement(trace, "item", indent, XMTDump);	
+		StartSubElement(trace, "item", indent, XMTDump);
 		DumpString(trace, "description", it1->text, indent, XMTDump);
 		DumpString(trace, "text", it2->text, indent, XMTDump);
-		EndSubElement(trace, indent, XMTDump);	
+		EndSubElement(trace, indent, XMTDump);
 	}
 	indent--;
 	EndDescDump(trace, "ExpandedTextualDescriptor", indent, XMTDump);
@@ -1268,8 +1268,8 @@
 		DumpInt(trace, "IPMP_DescriptorID", ipmpd->IPMP_DescriptorID, indent, XMTDump);
 	}
 	indent--;
-	if (XMTDump) 
-		EndSubElement(trace, indent, XMTDump);	
+	if (XMTDump)
+		EndSubElement(trace, indent, XMTDump);
 	else
 		EndDescDump(trace, "IPMP_DescriptorPointer", indent, XMTDump);
 	return GF_OK;
@@ -1308,7 +1308,7 @@
 	sLan[3] = 0;
 	DumpString(trace, "languageCode", sLan, indent, XMTDump);
 	indent--;
-	EndSubElement(trace, indent, XMTDump);	
+	EndSubElement(trace, indent, XMTDump);
 	if (!XMTDump) EndDescDump(trace, "LanguageDescriptor", indent, XMTDump);
 	return GF_OK;
 }
@@ -1329,7 +1329,7 @@
 	DumpInt(trace, "dref", ld->dref, indent, XMTDump);
 	DumpInt(trace, "wref", ld->wref, indent, XMTDump);
 	indent--;
-	EndSubElement(trace, indent, XMTDump);	
+	EndSubElement(trace, indent, XMTDump);
 	if (!XMTDump) EndDescDump(trace, "LanguageDescriptor", indent, XMTDump);
 	return GF_OK;
 }
@@ -1337,7 +1337,7 @@
 GF_Err gf_odf_dump_isom_iod(GF_IsomInitialObjectDescriptor *iod, FILE *trace, u32 indent, Bool XMTDump)
 {
 
-	
+
 	StartDescDump(trace, "MP4InitialObjectDescriptor", indent, XMTDump);
 	indent++;
 
@@ -1372,7 +1372,7 @@
 		DumpString(trace, "URLstring", iod->URLString, indent, XMTDump);
 		EndSubElement(trace, indent, XMTDump);
 	}
-		
+
 	if (XMTDump) {
 		StartElement(trace, "Descr", indent, XMTDump, 1);
 		indent++;
@@ -1394,7 +1394,7 @@
 		gf_odf_dump_desc(iod->IPMPToolList, trace, indent + (XMTDump ? 1 : 0), XMTDump);
 		EndElement(trace, "toolListDescr" , indent, XMTDump, 0);
 	}
-	
+
 	if (XMTDump) {
 		indent--;
 		EndElement(trace, "Descr", indent, XMTDump, 1);
@@ -1423,7 +1423,7 @@
 		DumpString(trace, "URLstring", od->URLString, indent, XMTDump);
 		EndSubElement(trace, indent, XMTDump);
 	}
-		
+
 	if (XMTDump) {
 		StartElement(trace, "Descr", indent, XMTDump, 1);
 		indent++;
@@ -1435,7 +1435,7 @@
 	DumpDescListFilter(od->IPMP_Descriptors, trace, indent, "ipmpDescr", XMTDump, GF_ODF_IPMP_TAG);
 
 	DumpDescList(od->extensionDescriptors, trace, indent, "extDescr", XMTDump, 0);
-	
+
 	if (XMTDump) {
 		indent--;
 		EndElement(trace, "Descr", indent, XMTDump, 1);
@@ -1464,7 +1464,7 @@
 		DumpString(trace, "URLstring", od->URLString, indent, XMTDump);
 		EndSubElement(trace, indent, XMTDump);
 	}
-		
+
 	if (XMTDump) {
 		StartElement(trace, "Descr", indent, XMTDump, 1);
 		indent++;
@@ -1479,7 +1479,7 @@
 	DumpDescListFilter(od->IPMP_Descriptors, trace, indent, "ipmpDescrPtr", XMTDump, GF_ODF_IPMP_PTR_TAG);
 	DumpDescListFilter(od->IPMP_Descriptors, trace, indent, "ipmpDescr", XMTDump, GF_ODF_IPMP_TAG);
 	DumpDescList(od->extensionDescriptors, trace, indent, "extDescr", XMTDump, 0);
-	
+
 	if (XMTDump) {
 		indent--;
 		EndElement(trace, "Descr", indent, XMTDump, 1);
@@ -1643,7 +1643,7 @@
 	indent++;
 	DumpInt(trace, "cameraID", cpd->cameraID, indent, XMTDump);
 	EndAttributes(trace, indent, XMTDump);
-	
+
 	i=0;
 	while ((p = (GF_SmpteParam *)gf_list_enum(cpd->ParamList, &i))) {
 		StartSubElement(trace, "parameter", indent, XMTDump);
@@ -1677,7 +1677,7 @@
 	DumpDouble(trace, "duration", sd->Duration, indent, XMTDump);
 	DumpString(trace, "name", sd->SegmentName, indent, XMTDump);
 	indent--;
-	if (XMTDump) 
+	if (XMTDump)
 		EndSubElement(trace, indent, XMTDump);
 	else
 		EndDescDump(trace, "SegmentDescriptor", indent, XMTDump);
@@ -1715,7 +1715,7 @@
 
 		if (mi->textNode) DumpString(trace, "textNode", mi->textNode, indent, 0);
 		if (mi->fontNode) DumpString(trace, "fontNode", mi->fontNode, indent, 0);
-		
+
 		indent--;
 		EndDescDump(trace, "MuxInfo", indent, 0);
 		return GF_OK;
@@ -1947,7 +1947,7 @@
 	StartAttribute(trace, "duration", indent, XMTDump);
 	fprintf(trace, "%d:%d:%d:%d", H, M, S, hS);
 	EndAttribute(trace, indent, XMTDump);
-	
+
 	StartElement(trace, "OCIDescr", indent, XMTDump, 1);
 	for (i=0; i<gf_oci_event_get_desc_count(ev); i++) {
 		desc = gf_oci_event_get_desc(ev, i);

gpac-0.5.0.svn5178.tar.bz2/src/odf/odf_parse.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/odf_parse.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -170,7 +170,7 @@
 	*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){
+	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));
 	}
 	fclose(f);
@@ -222,30 +222,48 @@
 		}
 		else if (!stricmp(fieldName, "includeInlineProfileLevelFlag")) {
 			GET_BOOL(iod->inlineProfileFlag)
-			if (!ret) { iod->inlineProfileFlag = 0; ret = 1; }
+			if (!ret) {
+				iod->inlineProfileFlag = 0;
+				ret = 1;
+			}
 		}
 		else if (!stricmp(fieldName, "ODProfileLevelIndication")) {
 			GET_U8(iod->OD_profileAndLevel)
-			if (!ret) { iod->OD_profileAndLevel = 0xFE; ret = 1; }
+			if (!ret) {
+				iod->OD_profileAndLevel = 0xFE;
+				ret = 1;
+			}
 		}
 		else if (!stricmp(fieldName, "sceneProfileLevelIndication")) {
 			GET_U8(iod->scene_profileAndLevel)
-			if (!ret) { iod->scene_profileAndLevel = 0xFE; ret = 1; }
+			if (!ret) {
+				iod->scene_profileAndLevel = 0xFE;
+				ret = 1;
+			}
 		}
 		else if (!stricmp(fieldName, "audioProfileLevelIndication")) {
 			GET_U8(iod->audio_profileAndLevel)
-			if (!ret) { iod->audio_profileAndLevel = 0xFE; ret = 1; }
+			if (!ret) {
+				iod->audio_profileAndLevel = 0xFE;
+				ret = 1;
+			}
 		}
 		else if (!stricmp(fieldName, "visualProfileLevelIndication")) {
 			GET_U8(iod->visual_profileAndLevel)
-			if (!ret) { iod->visual_profileAndLevel = 0xFE; ret = 1; }
+			if (!ret) {
+				iod->visual_profileAndLevel = 0xFE;
+				ret = 1;
+			}
 		}
 		else if (!stricmp(fieldName, "graphicsProfileLevelIndication")) {
 			GET_U8(iod->graphics_profileAndLevel)
-			if (!ret) { iod->graphics_profileAndLevel = 0xFE; ret = 1; }
+			if (!ret) {
+				iod->graphics_profileAndLevel = 0xFE;
+				ret = 1;
+			}
 		}
 	}
-		break;
+	break;
 	case GF_ODF_OD_TAG:
 	{
 		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) desc;
@@ -255,7 +273,7 @@
 			ret = 1;
 		}
 	}
-		break;
+	break;
 	case GF_ODF_DCD_TAG:
 	{
 		GF_DecoderConfig *dcd = (GF_DecoderConfig *)desc;
@@ -263,47 +281,128 @@
 			GET_U8(dcd->objectTypeIndication)
 			/*XMT may use string*/
 			if (!ret) {
-				if (!stricmp(val, "MPEG4Systems1")) { dcd->objectTypeIndication = 0x01; ret = 1; }
-				else if (!stricmp(val, "MPEG4Systems2")) { dcd->objectTypeIndication = 0x02; ret = 1; }
-				else if (!stricmp(val, "MPEG4Visual")) { dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG4_PART2; ret = 1; }
-				else if (!stricmp(val, "MPEG4Audio")) { dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4; ret = 1; }
-				else if (!stricmp(val, "MPEG2VisualSimple")) { dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SIMPLE; ret = 1; }
-				else if (!stricmp(val, "MPEG2VisualMain")) { dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_MAIN; ret = 1; }
-				else if (!stricmp(val, "MPEG2VisualSNR")) { dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SNR; ret = 1; }
-				else if (!stricmp(val, "MPEG2VisualSpatial")) { dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SPATIAL; ret = 1; }
-				else if (!stricmp(val, "MPEG2VisualHigh")) { dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_HIGH; ret = 1; }
-				else if (!stricmp(val, "MPEG2Visual422")) { dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_422; ret = 1; }
-				else if (!stricmp(val, "MPEG2AudioMain")) { dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_MP; ret = 1; }
-				else if (!stricmp(val, "MPEG2AudioLowComplexity")) { dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_LCP; ret = 1; }
-				else if (!stricmp(val, "MPEG2AudioScaleableSamplingRate")) { dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_SSRP; ret = 1; }
-				else if (!stricmp(val, "MPEG2AudioPart3")) { dcd->objectTypeIndication = GPAC_OTI_AUDIO_MPEG2_PART3; ret = 1; }
-				else if (!stricmp(val, "MPEG1Visual")) { dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1; ret = 1; }
-				else if (!stricmp(val, "MPEG1Audio")) { dcd->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1; ret = 1; }
-				else if (!stricmp(val, "JPEG")) { dcd->objectTypeIndication = GPAC_OTI_IMAGE_JPEG; ret = 1; }
-				else if (!stricmp(val, "PNG")) { dcd->objectTypeIndication = GPAC_OTI_IMAGE_PNG; ret = 1; }
+				if (!stricmp(val, "MPEG4Systems1")) {
+					dcd->objectTypeIndication = GPAC_OTI_OD_V1;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG4Systems2")) {
+					dcd->objectTypeIndication = GPAC_OTI_SCENE_BIFS_V2;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG4Visual")) {
+					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG4_PART2;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG4Audio")) {
+					dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2VisualSimple")) {
+					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SIMPLE;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2VisualMain")) {
+					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_MAIN;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2VisualSNR")) {
+					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SNR;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2VisualSpatial")) {
+					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SPATIAL;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2VisualHigh")) {
+					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_HIGH;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2Visual422")) {
+					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_422;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2AudioMain")) {
+					dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_MP;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2AudioLowComplexity")) {
+					dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_LCP;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2AudioScaleableSamplingRate")) {
+					dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_SSRP;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG2AudioPart3")) {
+					dcd->objectTypeIndication = GPAC_OTI_AUDIO_MPEG2_PART3;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG1Visual")) {
+					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
+					ret = 1;
+				}
+				else if (!stricmp(val, "MPEG1Audio")) {
+					dcd->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
+					ret = 1;
+				}
+				else if (!stricmp(val, "JPEG")) {
+					dcd->objectTypeIndication = GPAC_OTI_IMAGE_JPEG;
+					ret = 1;
+				}
+				else if (!stricmp(val, "PNG")) {
+					dcd->objectTypeIndication = GPAC_OTI_IMAGE_PNG;
+					ret = 1;
+				}
 			}
 		}
 		else if (!stricmp(fieldName, "streamType")) {
 			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; ret = 1; }
+				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;
+					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, "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;
+	break;
 	case GF_ODF_ESD_TAG:
 	{
 		GF_ESD *esd = (GF_ESD *)desc;
@@ -311,55 +410,55 @@
 			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;
+	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;
-	}	
-		break;
+			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;
+	}
+	break;
 	case GF_ODF_ELEM_MASK_TAG:
 	{
 		GF_ElementaryMask* em = (GF_ElementaryMask*)desc;
@@ -370,7 +469,7 @@
 		}
 		else if (!stricmp(fieldName, "numDynFields")) ret = 1;
 	}
-		break;
+	break;
 	case GF_ODF_BIFS_CFG_TAG:
 	{
 		GF_BIFSConfig *bcd = (GF_BIFSConfig*)desc;
@@ -378,49 +477,63 @@
 		if (!stricmp(fieldName, "nodeIDbits")) ret += sscanf(val, "%hu", &bcd->nodeIDbits);
 		else if (!stricmp(fieldName, "routeIDbits")) ret += sscanf(val, "%hu", &bcd->routeIDbits);
 		else if (!stricmp(fieldName, "protoIDbits")) ret += sscanf(val, "%hu", &bcd->protoIDbits);
-		else if (!stricmp(fieldName, "isCommandStream")) { /*GET_BOOL(bcd->isCommandStream)*/ ret = 1; }
+		else if (!stricmp(fieldName, "isCommandStream")) {
+			/*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)
-	}
-		break;
+			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;
+	break;
 	case GF_ODF_DSI_TAG:
 	{
 		GF_DefaultDescriptor *dsi = (GF_DefaultDescriptor*)desc;
@@ -448,176 +561,182 @@
 			}
 		}
 	}
-		break;
+	break;
 	case GF_ODF_SEGMENT_TAG:
 	{
 		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)
-	}
-		break;
+			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)) {
+							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);
+						}
+					}
 	}
-		break;
+	break;
 	case GF_ODF_ESD_INC_TAG:
 	{
 		GF_ES_ID_Inc *inc = (GF_ES_ID_Inc *)desc;
 		if (!stricmp(fieldName, "trackID")) ret += sscanf(val, "%u", &inc->trackID);
 	}
-		break;
+	break;
 	case GF_ODF_ESD_REF_TAG:
 	{
 		GF_ES_ID_Ref *inc = (GF_ES_ID_Ref *)desc;
 		if (!stricmp(fieldName, "trackID")) ret += sscanf(val, "%hu", &inc->trackRef);
 	}
-		break;
+	break;
 	case GF_ODF_TEXT_CFG_TAG:
 	{
 		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 = 1;
-		}
-		else if (!stricmp(fieldName, "video_height")) {
-			GET_U32(txt->video_height)
-			txt->has_vid_info = 1;
-		}
-		else if (!stricmp(fieldName, "horizontal_offset")) {
-			GET_S16(txt->horiz_offset)
-			txt->has_vid_info = 1;
-		}
-		else if (!stricmp(fieldName, "vertical_offset")) {
-			GET_S32(txt->vert_offset)
-			txt->has_vid_info = 1;
-		}
+			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 = 1;
+									}
+									else if (!stricmp(fieldName, "video_height")) {
+										GET_U32(txt->video_height)
+										txt->has_vid_info = 1;
+									}
+									else if (!stricmp(fieldName, "horizontal_offset")) {
+										GET_S16(txt->horiz_offset)
+										txt->has_vid_info = 1;
+									}
+									else if (!stricmp(fieldName, "vertical_offset")) {
+										GET_S32(txt->vert_offset)
+										txt->has_vid_info = 1;
+									}
 	}
-		break;
+	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 = 0;
-				if (!stricmp(fieldName, "fontID") && sd->fonts[sd->font_count-1].fontID) realloc_fonts = 1;
-				else if (!stricmp(fieldName, "fontName") && sd->fonts[sd->font_count-1].fontName) realloc_fonts = 1;
-				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 = 0;
+															if (!stricmp(fieldName, "fontID") && sd->fonts[sd->font_count-1].fontID) realloc_fonts = 1;
+															else if (!stricmp(fieldName, "fontName") && sd->fonts[sd->font_count-1].fontName) realloc_fonts = 1;
+															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;
+													}
 	}
-		break;
+	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)
-	}
-		break;
+			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)
+						}
+	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;
+	break;
 	case GF_ODF_LANG_TAG:
-		{
-			GF_Language *ld = (GF_Language *)desc;
-			if (!stricmp(fieldName, "languageCode")) {
-				u32 li, l = (u32) strlen(val);
-				ld->langCode = 0;
-				for (li = 0; li < l; li++) {
-					/* Warning: sensitive to big endian, little endian */
-					ld->langCode |= (val[li] << (l-li-1)*8);
-				}
-				ret++;
+	{
+		GF_Language *ld = (GF_Language *)desc;
+		if (!stricmp(fieldName, "languageCode")) {
+			u32 li, l = (u32) strlen(val);
+			ld->langCode = 0;
+			for (li = 0; li < l; li++) {
+				/* Warning: sensitive to big endian, little endian */
+				ld->langCode |= (val[li] << (l-li-1)*8);
 			}
+			ret++;
 		}
-		break;
+	}
+	break;
 	case GF_ODF_AUX_VIDEO_DATA:
 	{
 		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)
-	}
-		break;
+			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)
+										}
+	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); }
+		if (!stricmp(fieldName, "IPMP_ToolID")) {
+			ret = 1;
+			OD_ParseBin128(val, &it->IPMP_ToolID);
+		}
 		else if (!stricmp(fieldName, "ToolURL"))  GET_STRING(it->tool_url)
-	}
-		break;
+		}
+	break;
 	}
 
 	return ret ? GF_OK : GF_BAD_PARAM;
@@ -655,7 +774,7 @@
 				continue;
 			}
 			if (pos>0) {
-		
+
 				nb_phonems ++;
 				/*would be nicer with a phone book & use indexes*/
 				if (!stricmp(szItem, "vcl")) {

gpac-0.5.0.svn5178.tar.bz2/src/odf/qos.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/qos.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -122,7 +122,7 @@
 {
 	GF_Err e;
 	if (!bs || !qos) return GF_BAD_PARAM;
-	
+
 	e = gf_odf_size_qos_qual(qos);
 	if (e) return e;
 	e = gf_odf_write_base_descriptor(bs, qos->tag, qos->size);
@@ -365,7 +365,7 @@
 	nbBytes += 1;
 
 	if (qos->predefined) {
-		if (nbBytes != DescSize) return GF_ODF_INVALID_DESCRIPTOR;		
+		if (nbBytes != DescSize) return GF_ODF_INVALID_DESCRIPTOR;
 		return GF_OK;
 	}
 
@@ -394,9 +394,9 @@
 	GF_QoS_Default *tmp;
 
 	if (!qos) return GF_BAD_PARAM;
-	
+
 	*outSize = 1;
-	
+
 	i=0;
 	while ((tmp = (GF_QoS_Default *)gf_list_enum(qos->QoS_Qualifiers, &i))) {
 		e = gf_odf_size_qos_qual(tmp);

gpac-0.5.0.svn5178.tar.bz2/src/odf/slc.c -> gpac-0.5.1.svn5491.tar.xz/src/odf/slc.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -130,18 +130,18 @@
 	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)
+	        &&  !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;
@@ -167,7 +167,7 @@
 {
 	GF_Err e;
 	u32 nbBytes = 0;
-	
+
 	if (!sl) return GF_BAD_PARAM;
 
 	//APPLE fix
@@ -207,7 +207,7 @@
 
 		sl->OCRLength = gf_bs_read_int(bs, 8);
 		if (sl->OCRLength > 64) return GF_ODF_INVALID_DESCRIPTOR;
-		
+
 		sl->AULength = gf_bs_read_int(bs, 8);
 		if (sl->AULength > 32) return GF_ODF_INVALID_DESCRIPTOR;
 
@@ -217,7 +217,7 @@
 		if (sl->AUSeqNumLength > 16) return GF_ODF_INVALID_DESCRIPTOR;
 		sl->packetSeqNumLength = gf_bs_read_int(bs, 5);
 		if (sl->packetSeqNumLength > 16) return GF_ODF_INVALID_DESCRIPTOR;
-	
+
 		/*reserved = */gf_bs_read_int(bs, 2);
 		nbBytes += 15;
 	}
@@ -233,7 +233,7 @@
 		sl->startCTS = gf_bs_read_long_int(bs, sl->timestampLength);
 		nbBytes += GetTSbytesLen(sl);
 	}
-	
+
 	if (DescSize != nbBytes) return GF_ODF_INVALID_DESCRIPTOR;
 	return GF_OK;
 }
@@ -297,7 +297,7 @@
 		gf_bs_write_long_int(bs, sl->startDTS, sl->timestampLength);
 		gf_bs_write_long_int(bs, sl->startCTS, sl->timestampLength);
 	}
-	
+
 	return GF_OK;
 }
 
@@ -305,12 +305,12 @@
 /*allocates and writes the SL-PDU (Header + PDU) given the SLConfig and the GF_SLHeader
 for this PDU. AUs must be split in PDUs by another process if needed (packetizer).*/
 GF_EXPORT
-void gf_sl_packetize(GF_SLConfig* slConfig, 
-				  GF_SLHeader *Header, 
-				  char *PDU, 
-				  u32 size,
-				  char **outPacket,
-				  u32 *OutSize)
+void gf_sl_packetize(GF_SLConfig* slConfig,
+                     GF_SLHeader *Header,
+                     char *PDU,
+                     u32 size,
+                     char **outPacket,
+                     u32 *OutSize)
 {
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	*OutSize = 0;
@@ -438,8 +438,8 @@
 				Header->compositionTimeStampFlag = gf_bs_read_int(bs, 1);
 			}
 			if (slConfig->instantBitrateLength > 0) Header->instantBitrateFlag = gf_bs_read_int(bs, 1);
-			if (Header->decodingTimeStampFlag) Header->decodingTimeStamp = gf_bs_read_long_int(bs, slConfig->timestampLength); 
-			if (Header->compositionTimeStampFlag) Header->compositionTimeStamp = gf_bs_read_long_int(bs, slConfig->timestampLength); 
+			if (Header->decodingTimeStampFlag) Header->decodingTimeStamp = gf_bs_read_long_int(bs, slConfig->timestampLength);
+			if (Header->compositionTimeStampFlag) Header->compositionTimeStamp = gf_bs_read_long_int(bs, slConfig->timestampLength);
 			if (slConfig->AULength > 0) Header->accessUnitLength = gf_bs_read_int(bs, slConfig->AULength);
 			if (Header->instantBitrateFlag) Header->instantBitrate = gf_bs_read_int(bs, slConfig->instantBitrateLength);
 		}

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/encode_isom.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/encode_isom.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -53,7 +53,7 @@
 
 static void gf_sm_finalize_mux(GF_ISOFile *mp4, GF_ESD *src, u32 offset_ts)
 {
-#if !defined (GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE) 
+#if !defined (GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)
 	u32 track, mts, ts;
 	GF_MuxInfo *mux = gf_sm_get_mux_info(src);
 	if (!mux && !offset_ts) return;
@@ -75,7 +75,7 @@
 	if (mux) {
 		if (mux->GroupID) gf_isom_set_track_group(mp4, track, mux->GroupID);
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
-		if (mux->import_flags & GF_IMPORT_USE_COMPACT_SIZE) 
+		if (mux->import_flags & GF_IMPORT_USE_COMPACT_SIZE)
 			gf_isom_use_compact_size(mp4, track, 1);
 #endif
 	}
@@ -186,7 +186,7 @@
 	/*special streams*/
 	if (src->decoderConfig) {
 		/*InputSensor*/
-		if (src->decoderConfig->decoderSpecificInfo && (src->decoderConfig->decoderSpecificInfo->tag == GF_ODF_UI_CFG_TAG)) 
+		if (src->decoderConfig->decoderSpecificInfo && (src->decoderConfig->decoderSpecificInfo->tag == GF_ODF_UI_CFG_TAG))
 			src->decoderConfig->streamType = GF_STREAM_INTERACT;
 		if (src->decoderConfig->streamType == GF_STREAM_INTERACT) return gf_sm_import_ui_stream(mp4, src, 0);
 	}
@@ -202,7 +202,7 @@
 		src->slConfig->predefined = 2;
 		e = gf_isom_new_mpeg4_description(mp4, track, src, NULL, NULL, &di);
 		if (e) return e;
-		if (mux && mux->duration) 
+		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);
 		return e;
 	}
@@ -229,7 +229,7 @@
 
 	memset(&import, 0, sizeof(GF_MediaImporter));
 	strcpy(szName, mux->file_name);
-	ext = strrchr(szName, '.');	
+	ext = strrchr(szName, '.');
 
 	/*get track types for AVI*/
 	if (ext && !strnicmp(ext, ".avi", 4)) {
@@ -291,9 +291,9 @@
 	GF_Err e;
 	GF_MuxInfo *mux = gf_sm_get_mux_info(esd);
 	if (!mux || !mux->file_name) return GF_OK;
-	
+
 	if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo
-		&& (esd->decoderConfig->decoderSpecificInfo->tag==GF_ODF_TEXT_CFG_TAG)) return GF_OK;
+	        && (esd->decoderConfig->decoderSpecificInfo->tag==GF_ODF_TEXT_CFG_TAG)) return GF_OK;
 
 	e = GF_OK;
 	/*SRT/SUB BIFS import if text node unspecified*/
@@ -334,7 +334,7 @@
 						}
 					}
 				}
-					break;
+				break;
 				case GF_ODF_ESD_UPDATE_TAG:
 				{
 					GF_ESD *imp_esd;
@@ -345,7 +345,7 @@
 						if (e != GF_OK) return e;
 					}
 				}
-					break;
+				break;
 				}
 			}
 		}
@@ -386,7 +386,7 @@
 						}
 					}
 				}
-					break;
+				break;
 				case GF_ODF_ESD_UPDATE_TAG:
 				{
 					GF_ESD *imp_esd;
@@ -396,7 +396,7 @@
 						if (imp_esd->ESID == ES_ID) return imp_esd;
 					}
 				}
-					break;
+				break;
 				}
 			}
 		}
@@ -497,7 +497,7 @@
 		return GF_NOT_SUPPORTED;
 #endif
 	}
-	
+
 	if (scene_type==1) {
 #ifndef GPAC_DISABLE_LASER
 		lsr_enc = gf_laser_encoder_new(ctx->scene_graph);
@@ -560,7 +560,7 @@
 				if ((com->tag == GF_SG_SCENE_REPLACE) && !com->node && !gf_list_count(com->new_proto_list))
 					au = NULL;
 			}
-		} 
+		}
 
 		/*sanity check: remove first command if it is REPLACE SCENE BY NULL*/
 		if (au && !au->timing && !au->timing_sec && (gf_list_count(au->commands) > 1)) {
@@ -597,7 +597,7 @@
 			esd->ESID = sc ? sc->ESID : 1;
 			esd->decoderConfig->streamType = GF_STREAM_SCENE;
 		}
-		
+
 		if (!esd->slConfig) esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 		if (sc && sc->timeScale) esd->slConfig->timestampResolution = sc->timeScale;
 		if (!esd->slConfig->timestampResolution) esd->slConfig->timestampResolution = 1000;
@@ -660,9 +660,9 @@
 			gf_bifs_encoder_get_config(bifs_enc, esd->ESID, &data, &data_len);
 			esd->decoderConfig->decoderSpecificInfo->data = data;
 			esd->decoderConfig->decoderSpecificInfo->dataLength = data_len;
-			esd->decoderConfig->objectTypeIndication = gf_bifs_encoder_get_version(bifs_enc, esd->ESID);		
+			esd->decoderConfig->objectTypeIndication = gf_bifs_encoder_get_version(bifs_enc, esd->ESID);
 #endif
-		} 
+		}
 		/*LASeR setup*/
 #ifndef GPAC_DISABLE_LASER
 		if (scene_type==1) {
@@ -696,7 +696,7 @@
 
 			esd->decoderConfig->decoderSpecificInfo->data = data;
 			esd->decoderConfig->decoderSpecificInfo->dataLength = data_len;
-			esd->decoderConfig->objectTypeIndication = 0x09;
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_LASER;
 		}
 #endif
 		/*create stream description*/
@@ -710,8 +710,8 @@
 
 		if (!sc) {
 			samp = gf_isom_sample_new();
-			samp->IsRAP = 1;
-		
+			samp->IsRAP = RAP;
+
 #ifndef GPAC_DISABLE_BIFS_ENC
 			if (bifs_enc)
 				e = gf_bifs_encoder_get_rap(bifs_enc, &samp->data, &samp->dataLength);
@@ -788,9 +788,9 @@
 					if (lsr_enc)
 						e = gf_laser_encoder_get_rap(lsr_enc, &rap_sample->data, &rap_sample->dataLength);
 #endif
-				
+
 					rap_sample->DTS = last_rap + rap_delay;
-					rap_sample->IsRAP = 1;
+					rap_sample->IsRAP = RAP;
 					last_rap = rap_sample->DTS;
 
 
@@ -807,7 +807,7 @@
 				}
 
 				/*apply commands */
-				if (samp->DTS > last_rap + rap_delay) { 
+				if (samp->DTS > last_rap + rap_delay) {
 					e = gf_sg_command_apply_list(ctx->scene_graph, au->commands, 0);
 				}
 			}
@@ -817,7 +817,7 @@
 				if (samp->DTS - last_rap > rap_delay) {
 					GF_ISOSample *car_samp = gf_isom_sample_new();
 					u64 r_dts = samp->DTS;
-				
+
 					/*then get RAP*/
 #ifndef GPAC_DISABLE_BIFS_ENC
 					if (bifs_enc)
@@ -828,7 +828,7 @@
 					if (lsr_enc)
 						e = gf_laser_encoder_get_rap(lsr_enc, &car_samp->data, &car_samp->dataLength);
 #endif
-					car_samp->IsRAP = 2;					
+					car_samp->IsRAP = RAP_REDUNDANT;
 					while (1) {
 						car_samp->DTS = last_rap+rap_delay;
 						if (car_samp->DTS==prev_dts) car_samp->DTS++;
@@ -856,7 +856,7 @@
 				rate = 0;
 				time_slice = samp->DTS;
 			}
-					
+
 			prev_dts = samp->DTS;
 			gf_isom_sample_del(&samp);
 			if (e) goto exit;
@@ -885,7 +885,7 @@
 
 				samp = gf_isom_sample_new();
 				last_rap = samp->DTS = au->timing - init_offset;
-				samp->IsRAP = 1;
+				samp->IsRAP = RAP;
 				/*RAP generation*/
 #ifndef GPAC_DISABLE_BIFS_ENC
 				if (bifs_enc)
@@ -974,7 +974,7 @@
 	delete_desc = 0;
 
 	i=0;
-	while ((sc = (GF_StreamContext*)gf_list_enum(ctx->streams, &i))){
+	while ((sc = (GF_StreamContext*)gf_list_enum(ctx->streams, &i))) {
 		if (sc->streamType != GF_STREAM_OD) continue;
 
 		delete_desc = 0;
@@ -984,7 +984,7 @@
 			is_in_iod = 0;
 			j=0;
 			while ((esd = (GF_ESD*)gf_list_enum(iod->ESDescriptors, &j))) {
-				if (esd->decoderConfig->streamType != GF_STREAM_OD){
+				if (esd->decoderConfig->streamType != GF_STREAM_OD) {
 					esd = NULL;
 					continue;
 				}
@@ -1000,7 +1000,7 @@
 			delete_desc = 1;
 			esd = gf_odf_desc_esd_new(2);
 			esd->ESID = sc->ESID;
-			esd->decoderConfig->objectTypeIndication = 1;
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_OD_V1;
 			esd->decoderConfig->streamType = GF_STREAM_OD;
 		}
 
@@ -1010,7 +1010,7 @@
 		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 = 1;
+		if (!esd->decoderConfig->objectTypeIndication) esd->decoderConfig->objectTypeIndication = GPAC_OTI_OD_V1;
 		gf_isom_set_track_enabled(mp4, track, 1);
 		/*no DSI required*/
 		/*create stream description*/
@@ -1024,7 +1024,7 @@
 			rap_codec = gf_odf_codec_new();
 			rap_delay = opts->rap_freq * esd->slConfig->timestampResolution / 1000;
 		}
-		
+
 
 		dur = avg_rate = 0;
 		esd->decoderConfig->bufferSizeDB = 0;
@@ -1067,7 +1067,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==GPAC_OTI_SCENE_AFX)
 										break;
 									continue;
 								case GF_STREAM_OD:
@@ -1102,7 +1102,7 @@
 						}
 					}
 				}
-					break;
+				break;
 				case GF_ODF_ESD_UPDATE_TAG:
 				{
 					GF_ESD *imp_esd;
@@ -1134,7 +1134,7 @@
 						}
 					}
 				}
-					break;
+				break;
 				}
 
 				/*add to codec*/
@@ -1164,7 +1164,7 @@
 				while (samp->DTS >= rap_delay + last_rap) {
 					GF_ISOSample *rap_sample = gf_isom_sample_new();
 					rap_sample->DTS = last_rap + rap_delay;
-					rap_sample->IsRAP = 1;
+					rap_sample->IsRAP = RAP;
 
 					if (samp->DTS == last_rap + rap_delay) {
 						GF_ODCom *com;
@@ -1228,7 +1228,7 @@
 				samp->dataLength = 0;
 				e = gf_odf_codec_get_au(rap_codec, &samp->data, &samp->dataLength);
 				if (e) goto err_exit;
-				samp->IsRAP = 1;
+				samp->IsRAP = RAP;
 				e = gf_isom_add_sample_shadow(mp4, track, samp);
 				if (e) goto err_exit;
 
@@ -1263,7 +1263,7 @@
 			if (last_not_shadow && rap_shadow) {
 				samp = gf_isom_sample_new();
 				samp->DTS = last_not_shadow;
-				samp->IsRAP = 1;
+				samp->IsRAP = RAP;
 				e = gf_odf_codec_encode(rap_codec, 2);
 				if (!e) e = gf_odf_codec_get_au(rap_codec, &samp->data, &samp->dataLength);
 				if (!e) e = gf_isom_add_sample_shadow(mp4, track, samp);
@@ -1276,7 +1276,7 @@
 		}
 	}
 	e = gf_isom_set_pl_indication(mp4, GF_ISOM_PL_OD, 1);
-	
+
 err_exit:
 	if (codec) gf_odf_codec_del(codec);
 	if (rap_codec) gf_odf_codec_del(rap_codec);

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/loader_bt.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/loader_bt.c Changed

@@ -26,12 +26,14 @@
 #include <gpac/scene_manager.h>
 #include <gpac/utf.h>
 #include <gpac/constants.h>
+#include <gpac/network.h>
 #include <gpac/internal/bifs_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
 
 #include <gpac/nodes_x3d.h>
 /*for key codes...*/
 #include <gpac/user.h>
+#include <gpac/color.h>
 
 
 #if !defined(GPAC_DISABLE_LOADER_BT) && !defined(GPAC_DISABLE_ZLIB)
@@ -180,11 +182,18 @@
 				c2 = gzgetc(parser->gz_in);
 				/*Little-endian order*/
 				if (parser->unicode_type==2) {
-					if (c2) { wchar = c2; wchar <<=8; wchar |= c1; }
+					if (c2) {
+						wchar = c2;
+						wchar <<=8;
+						wchar |= c1;
+					}
 					else wchar = c1;
 				} else {
 					wchar = c1;
-					if (c2) { wchar <<= 8; wchar |= c2;}
+					if (c2) {
+						wchar <<= 8;
+						wchar |= c2;
+					}
 				}
 				*dst = wchar;
 				if (wchar=='\r') is_ret = 1;
@@ -228,7 +237,7 @@
 			}
 		} else {
 			if ((gzgets(parser->gz_in, parser->line_buffer, BT_LINE_SIZE) == NULL)
-				|| (!strlen(parser->line_buffer) && gzeof(parser->gz_in))) {
+			        || (!strlen(parser->line_buffer) && gzeof(parser->gz_in))) {
 				parser->done = 1;
 				return;
 			}
@@ -282,7 +291,7 @@
 		while ((parser->line_buffer[parser->line_pos]==' ') || (parser->line_buffer[parser->line_pos]=='\t'))
 			parser->line_pos++;
 		if ( (parser->line_buffer[parser->line_pos]=='#')
-			|| ( (parser->line_buffer[parser->line_pos]=='/') && (parser->line_buffer[parser->line_pos+1]=='/')) ) {
+		        || ( (parser->line_buffer[parser->line_pos]=='/') && (parser->line_buffer[parser->line_pos+1]=='/')) ) {
 
 			if (parser->line==1) {
 				if (strstr(parser->line_buffer, "VRML")) {
@@ -467,7 +476,7 @@
 			res = (char*)gf_realloc(res, sizeof(char) * (size+500+1));	\
 			size += 500;	\
 		}	\
-
+ 
 	res = (char*)gf_malloc(sizeof(char) * 500);
 	size = 500;
 	while (parser->line_buffer[parser->line_pos]==' ') parser->line_pos++;
@@ -505,23 +514,35 @@
 				}
 				/*UTF8 2 bytes char*/
 				else if ( (c & 0xe0) == 0xc0) {
-					res[i] = parser->line_buffer[parser->line_pos]; parser->line_pos++; i++;
+					res[i] = parser->line_buffer[parser->line_pos];
+					parser->line_pos++;
+					i++;
 					BT_STR_CHECK_ALLOC
 				}
 				/*UTF8 3 bytes char*/
 				else if ( (c & 0xf0) == 0xe0) {
-					res[i] = parser->line_buffer[parser->line_pos]; parser->line_pos++; i++;
+					res[i] = parser->line_buffer[parser->line_pos];
+					parser->line_pos++;
+					i++;
 					BT_STR_CHECK_ALLOC
-					res[i] = parser->line_buffer[parser->line_pos]; parser->line_pos++; i++;
+					res[i] = parser->line_buffer[parser->line_pos];
+					parser->line_pos++;
+					i++;
 					BT_STR_CHECK_ALLOC
 				}
 				/*UTF8 4 bytes char*/
 				else if ( (c & 0xf8) == 0xf0) {
-					res[i] = parser->line_buffer[parser->line_pos]; parser->line_pos++; i++;
+					res[i] = parser->line_buffer[parser->line_pos];
+					parser->line_pos++;
+					i++;
 					BT_STR_CHECK_ALLOC
-					res[i] = parser->line_buffer[parser->line_pos]; parser->line_pos++; i++;
+					res[i] = parser->line_buffer[parser->line_pos];
+					parser->line_pos++;
+					i++;
 					BT_STR_CHECK_ALLOC
-					res[i] = parser->line_buffer[parser->line_pos]; parser->line_pos++; i++;
+					res[i] = parser->line_buffer[parser->line_pos];
+					parser->line_pos++;
+					i++;
 					BT_STR_CHECK_ALLOC
 				}
 			}
@@ -658,28 +679,27 @@
 GF_Err gf_bt_parse_color(GF_BTParser *parser, const char *name, SFColor *col)
 {
 	Float f;
+	u32 val;
 	char *str = gf_bt_get_next(parser, 0);
 	if (!str) return parser->last_error = GF_IO_ERR;
 	if (gf_bt_check_externproto_field(parser, str)) return GF_OK;
 
-	/*HTML code*/
-	if (str[0]=='$') {
-		u32 val;
-		sscanf(str+1, "%x", &val);
-		col->red = INT2FIX((val>>16) & 0xFF) / 255;
-		col->green = INT2FIX((val>>8) & 0xFF) / 255;
-		col->blue = INT2FIX(val & 0xFF) / 255;
+	if (sscanf(str, "%f", &f) == 1) {
+		col->red = FLT2FIX(f);
+		/*many VRML files use ',' separator*/
+		gf_bt_check_code(parser, ',');
+		gf_bt_parse_float(parser, name, & col->green);
+		gf_bt_check_code(parser, ',');
+		gf_bt_parse_float(parser, name, & col->blue);
 		return parser->last_error;
 	}
-	if (sscanf(str, "%f", &f) != 1) {
-		return gf_bt_report(parser, GF_BAD_PARAM, "%s: Number expected", name);
-	}
-	col->red = FLT2FIX(f);
-	/*many VRML files use ',' separator*/
-	gf_bt_check_code(parser, ',');
-	gf_bt_parse_float(parser, name, & col->green);
-	gf_bt_check_code(parser, ',');
-	gf_bt_parse_float(parser, name, & col->blue);
+	val = gf_color_parse(str);
+	if (!val) {
+		return gf_bt_report(parser, GF_BAD_PARAM, "%s: Number or name expected", name);
+	}
+	col->red = INT2FIX((val>>16) & 0xFF) / 255;
+	col->green = INT2FIX((val>>8) & 0xFF) / 255;
+	col->blue = INT2FIX(val & 0xFF) / 255;
 	return parser->last_error;
 }
 
@@ -773,7 +793,7 @@
 			gf_bt_check_time_offset(parser, node, &inf);
 		}
 	}
-		break;
+	break;
 	}
 }
 
@@ -881,7 +901,7 @@
 			goto err;
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_SFURL:
 	{
 		u8 delim = 0;
@@ -921,7 +941,7 @@
 			((SFURL *)info->far_ptr)->OD_ID = val;
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_SFCOMMANDBUFFER:
 	{
 		SFCommandBuffer *cb = (SFCommandBuffer *)info->far_ptr;
@@ -934,7 +954,7 @@
 			parser->cur_com = prev_com;
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_SFIMAGE:
 	{
 		u32 i, size, v;
@@ -979,7 +999,7 @@
 			}
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_SFSCRIPT:
 	{
 		SFScript *sc = (SFScript *) info->far_ptr;
@@ -988,7 +1008,7 @@
 		}
 		sc->script_text = (char*)gf_bt_get_string(parser, '\"');
 	}
-		break;
+	break;
 	case GF_SG_VRML_SFATTRREF:
 	{
 		SFAttrRef *ar = (SFAttrRef*) info->far_ptr;
@@ -1007,7 +1027,7 @@
 		}
 
 	}
-		break;
+	break;
 	default:
 		parser->last_error = GF_NOT_SUPPORTED;
 		break;
@@ -1113,12 +1133,12 @@
 				return ID;
 			}
 		}
-	} 
+	}
 
 	ID = gf_bt_get_next_node_id(parser);
 	if (n) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[BT Parsing] (line %d) Binary ID %d already assigned to %s - keeping internal ID %d", parser->line, gf_node_get_name(n), ID));
-	} 
+	}
 	return ID;
 }
 
@@ -1180,7 +1200,7 @@
 	if (parser->is_wrl && !(parser->load->flags & GF_SM_LOAD_MPEG4_STRICT)) {
 #ifndef GPAC_DISABLE_X3D
 		tag = gf_node_x3d_type_by_class_name(node_name);
-		if (!tag) 
+		if (!tag)
 #endif
 			tag = gf_node_mpeg4_type_by_class_name(node_name);
 		if (tag) return tag;
@@ -1293,11 +1313,11 @@
 		if (!parser->parsing_proto) init_node = 1;
 	}
 	is_script = 0;
-	if ((tag==TAG_MPEG4_Script) 
+	if ((tag==TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		|| (tag==TAG_X3D_Script)
+	        || (tag==TAG_X3D_Script)
 #endif
-		)
+	   )
 		is_script = 1;
 
 	if (!node) {
@@ -1394,14 +1414,14 @@
 						str = "children";
 						parser->last_error = gf_node_get_field_by_name(node, str, &info);
 					}
-					else 
+					else
 #endif
-					if (!strcmp(str, "collide")) {
-						SFBool b;
-						gf_bt_parse_bool(parser, "enabled", &b);
-						parser->last_error = GF_OK;
-						continue;
-					}
+						if (!strcmp(str, "collide")) {
+							SFBool b;
+							gf_bt_parse_bool(parser, "enabled", &b);
+							parser->last_error = GF_OK;
+							continue;
+						}
 				}
 			}
 
@@ -1481,7 +1501,7 @@
 					if (single_child) break;
 				}
 			}
-				break;
+			break;
 			default:
 				if (gf_sg_vrml_is_sf_field(info.fieldType)) {
 					gf_bt_sffield(parser, &info, node);
@@ -2035,7 +2055,7 @@
 	com = NULL;
 	pos = -2;
 	/*REPLACE commands*/
- 	if (!strcmp(str, "REPLACE")) {
+	if (!strcmp(str, "REPLACE")) {
 		str = gf_bt_get_next(parser, 1);
 		if (!strcmp(str, "ROUTE")) {
 			str = gf_bt_get_next(parser, 0);
@@ -2147,7 +2167,7 @@
 					gf_node_list_add_child_last(& inf->node_list, newnode, &last);
 				}
 			}
-				break;
+			break;
 			default:
 				inf->field_ptr = gf_sg_vrml_field_pointer_new(info.fieldType);
 				info.far_ptr = inf->field_ptr;
@@ -2181,7 +2201,7 @@
 			if (!gf_bt_check_ndt(parser, &info, newnode, n)) goto err;
 			inf->new_node = newnode;
 			inf->field_ptr = &inf->new_node;
- 			break;
+			break;
 		default:
 			info.fieldType = inf->fieldType;
 			info.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
@@ -2194,13 +2214,13 @@
 		return parser->last_error;
 	}
 	/*XREPLACE commands*/
- 	if (!strcmp(str, "XREPLACE")) {
+	if (!strcmp(str, "XREPLACE")) {
 		u32 j;
 		Bool force_sf=0;
 		char csep;
 		GF_Node *targetNode, *idxNode, *childNode, *fromNode;
 		GF_FieldInfo targetField, idxField, childField, fromField;
-		
+
 		targetNode = idxNode = childNode = fromNode = NULL;
 		str = gf_bt_get_next(parser, 1);
 		/*get source node*/
@@ -2230,7 +2250,7 @@
 					/*get idx node*/
 					idxNode = gf_bt_peek_node(parser, str);
 					if (!idxNode) return gf_bt_report(parser, GF_BAD_PARAM, "%s: unknown node", field);
-					if (!gf_bt_check_code(parser, '.')) 
+					if (!gf_bt_check_code(parser, '.'))
 						return gf_bt_report(parser, GF_BAD_PARAM, "XREPLACE: '.' expected");
 
 					/*get idx field*/
@@ -2242,7 +2262,7 @@
 				}
 			}
 			gf_bt_check_code(parser, ']');
-		
+
 			/*check if we have a child node*/
 			if (gf_bt_check_code(parser, '.')) {
 				s32 apos = pos;
@@ -2365,7 +2385,7 @@
 					gf_node_list_add_child_last(& inf->node_list, newnode, &last);
 				}
 			}
-				break;
+			break;
 			default:
 				inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
 				info.far_ptr = inf->field_ptr;
@@ -2597,7 +2617,7 @@
 					gf_node_list_add_child_last( & inf->node_list, newnode, &last);
 				}
 			}
-				break;
+			break;
 			default:
 				info.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
 				if (gf_sg_vrml_is_sf_field(info.fieldType)) {
@@ -2936,7 +2956,7 @@
 				}
 			}
 			break;
-			/*IPMPX*/
+		/*IPMPX*/
 		case GF_ODF_FT_IPMPX:
 			if(desc->tag!=GF_ODF_IPMP_TOOL_TAG) {
 				gf_bt_report(parser, GF_BAD_PARAM, "IPMPX_Data only allowed in GF_IPMP_Tool");
@@ -3043,7 +3063,7 @@
 	} else if (desc->tag==GF_ODF_MUXINFO_TAG) {
 		GF_MuxInfo *mi = (GF_MuxInfo *)desc;
 		if (mi->file_name) {
-			char *res_name = gf_url_concatenate(parser->load->fileName, mi->file_name);
+			char *res_name = gf_url_concatenate(parser->load->fileName, (const char *) mi->file_name);
 			if (res_name) {
 				gf_free(mi->file_name);
 				mi->file_name = res_name;
@@ -3066,7 +3086,7 @@
 			GF_ODUpdate *odU;
 			if (!gf_bt_check_code(parser, '[')) {
 				gf_bt_report(parser, GF_BAD_PARAM, "[ expected");
- 				return;
+				return;
 			}
 			odU = (GF_ODUpdate *) gf_odf_com_new(GF_ODF_OD_UPDATE_TAG);
 			gf_list_add(parser->od_au->commands, odU);
@@ -3089,7 +3109,7 @@
 			str = gf_bt_get_next(parser, 0);
 			if (strcmp(str, "IN")) {
 				gf_bt_report(parser, GF_BAD_PARAM, "IN expected got %s", str);
- 				return;
+				return;
 			}
 			esdU = (GF_ESDUpdate *) gf_odf_com_new(GF_ODF_ESD_UPDATE_TAG);
 			parser->last_error = gf_bt_parse_int(parser, "OD_ID", (SFInt32*)&val);
@@ -3101,11 +3121,11 @@
 				str = gf_bt_get_next(parser, 0);
 				if (strcmp(str, "esDescr")) {
 					gf_bt_report(parser, GF_BAD_PARAM, "esDescr expected got %s", str);
- 					return;
+					return;
 				}
 				if (!gf_bt_check_code(parser, '[')) {
 					gf_bt_report(parser, GF_BAD_PARAM, "[ expected");
- 					return;
+					return;
 				}
 			}
 
@@ -3127,7 +3147,7 @@
 			GF_IPMPUpdate *ipU;
 			if (!gf_bt_check_code(parser, '[')) {
 				gf_bt_report(parser, GF_BAD_PARAM, "[ expected");
- 				return;
+				return;
 			}
 			ipU = (GF_IPMPUpdate *) gf_odf_com_new(GF_ODF_IPMP_UPDATE_TAG);
 			gf_list_add(parser->od_au->commands, ipU);
@@ -3154,7 +3174,7 @@
 			GF_ODRemove *odR;
 			if (!gf_bt_check_code(parser, '[')) {
 				gf_bt_report(parser, GF_BAD_PARAM, "[ expected");
- 				return;
+				return;
 			}
 			odR = (GF_ODRemove *) gf_odf_com_new(GF_ODF_OD_REMOVE_TAG);
 			gf_list_add(parser->od_au->commands, odR);
@@ -3176,14 +3196,14 @@
 			str = gf_bt_get_next(parser, 0);
 			if (strcmp(str, "FROM")) {
 				gf_bt_report(parser, GF_BAD_PARAM, "FROM expected got %s", str);
- 				return;
+				return;
 			}
 			gf_bt_parse_int(parser, "ODID", (SFInt32*)&odid);
 			if (parser->last_error) return;
 
 			if (!gf_bt_check_code(parser, '[')) {
 				gf_bt_report(parser, GF_BAD_PARAM, "[ expected");
- 				return;
+				return;
 			}
 			esdR = (GF_ESDRemove *) gf_odf_com_new(GF_ODF_ESD_REMOVE_TAG);
 			esdR->ODID = odid;
@@ -3217,7 +3237,7 @@
 
 	vrml_root_node = NULL;
 	has_id = 0;
-	
+
 	if (init_com)
 		parser->in_com = 0 ;
 
@@ -3369,10 +3389,10 @@
 		}
 		/*BIFS commands*/
 		else if (!strcmp(str, "REPLACE") || !strcmp(str, "INSERT") || !strcmp(str, "APPEND") || !strcmp(str, "DELETE")
-			/*BIFS extended commands*/
-			|| !strcmp(str, "GLOBALQP") || !strcmp(str, "MULTIPLEREPLACE") || !strcmp(str, "MULTIPLEINDREPLACE") || !strcmp(str, "XDELETE") || !strcmp(str, "DELETEPROTO") || !strcmp(str, "INSERTPROTO") 
-			|| !strcmp(str, "XREPLACE") 
-			) {
+		         /*BIFS extended commands*/
+		         || !strcmp(str, "GLOBALQP") || !strcmp(str, "MULTIPLEREPLACE") || !strcmp(str, "MULTIPLEINDREPLACE") || !strcmp(str, "XDELETE") || !strcmp(str, "DELETEPROTO") || !strcmp(str, "INSERTPROTO")
+		         || !strcmp(str, "XREPLACE")
+		        ) {
 			Bool is_base_stream = parser->stream_id ? 0 : 1;
 
 			if (!parser->stream_id) parser->stream_id = parser->base_bifs_id;
@@ -3400,12 +3420,12 @@
 		}
 		/*implicit BIFS command on SFTopNodes only*/
 		else if (!strcmp(str, "OrderedGroup")
-			|| !strcmp(str, "Group")
-			|| !strcmp(str, "Layer2D")
-			|| !strcmp(str, "Layer3D")
-			 /* VRML parsing: all nodes are allowed*/
-			|| parser->is_wrl
-			)
+		         || !strcmp(str, "Group")
+		         || !strcmp(str, "Layer2D")
+		         || !strcmp(str, "Layer3D")
+		         /* VRML parsing: all nodes are allowed*/
+		         || parser->is_wrl
+		        )
 		{
 
 			node = gf_bt_sf_node(parser, str, vrml_root_node, has_id ? szDEFName : NULL);
@@ -3465,9 +3485,9 @@
 	GF_Err e;
 	unsigned char BOM[5];
 	GF_BTParser *parser = load->loader_priv;
-	
+
 	parser->last_error = GF_OK;
-	
+
 	if (load->fileName) {
 		FILE *test = gf_f64_open(load->fileName, "rb");
 		if (!test) return GF_URL_ERROR;
@@ -3493,7 +3513,7 @@
 			parser->initialized = 0;
 			return GF_OK;
 		}
-		strncpy((char *) BOM, str, 5); 
+		strncpy((char *) BOM, str, 5);
 	}
 
 	/*0: no unicode, 1: UTF-16BE, 2: UTF-16LE*/
@@ -3519,13 +3539,13 @@
 		if (parser->gz_in) gzseek(parser->gz_in, 3, SEEK_CUR);
 	}
 	parser->initialized = 1;
-	
+
 	if ( load->fileName )
 	{
 		sep = strrchr(load->fileName, '.');
 		if (sep && !strnicmp(sep, ".wrl", 4)) parser->is_wrl = 1;
 	}
-	
+
 	if (input_only) return GF_OK;
 
 	/*initalize default streams in the context*/
@@ -3540,9 +3560,14 @@
 		i=0;
 		while ((sc = (GF_StreamContext*)gf_list_enum(load->ctx->streams, &i))) {
 			switch (sc->streamType) {
-			case GF_STREAM_SCENE: if (!parser->bifs_es) parser->bifs_es = sc; break;
-			case GF_STREAM_OD: if (!parser->od_es) parser->od_es = sc; break;
-			default: break;
+			case GF_STREAM_SCENE:
+				if (!parser->bifs_es) parser->bifs_es = sc;
+				break;
+			case GF_STREAM_OD:
+				if (!parser->od_es) parser->od_es = sc;
+				break;
+			default:
+				break;
 			}
 		}
 		/*need at least one scene stream*/

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/loader_isom.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/loader_isom.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -57,8 +57,8 @@
 					break;
 				case GF_STREAM_SCENE:
 					if ((esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_AFX) &&
-						(esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE) 
-					) {
+					        (esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE)
+					   ) {
 						import = 0;
 					}
 					break;
@@ -75,7 +75,7 @@
 					mi->duration = (u32) (dur * 1000);
 					import = 0;
 				}
-					break;
+				break;
 				default:
 					break;
 				}
@@ -103,8 +103,8 @@
 				break;
 			case GF_STREAM_SCENE:
 				if ((esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_AFX) &&
-					(esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE) 
-				) {
+				        (esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE)
+				   ) {
 					import = 0;
 				}
 				break;
@@ -121,7 +121,7 @@
 				mi->duration = (u32) (dur * 1000);
 				import = 0;
 			}
-				break;
+			break;
 			default:
 				break;
 			}
@@ -210,8 +210,8 @@
 
 
 		if ((esd->decoderConfig->objectTypeIndication == GPAC_OTI_SCENE_AFX) ||
-			(esd->decoderConfig->objectTypeIndication == GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE) 
-		) {
+		        (esd->decoderConfig->objectTypeIndication == GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE)
+		   ) {
 			nb_samp += gf_isom_get_sample_count(load->isom, i+1);
 			continue;
 		}
@@ -226,7 +226,7 @@
 #ifndef GPAC_DISABLE_BIFS
 			/*BIFS*/
 			if (esd->decoderConfig->objectTypeIndication<=2) {
-				if (!esd->dependsOnESID && nbBifs && !i) 
+				if (!esd->dependsOnESID && nbBifs && !i)
 					mp4_report(load, GF_OK, "several scene namespaces used or improper scene dependencies in file - import may be incorrect");
 				if (!esd->decoderConfig->decoderSpecificInfo) {
 					/* Hack for T-DMB non compliant streams */
@@ -242,7 +242,7 @@
 #ifndef GPAC_DISABLE_LASER
 			/*LASER*/
 			if (esd->decoderConfig->objectTypeIndication==0x09) {
-				if (!esd->dependsOnESID && nbBifs && !i) 
+				if (!esd->dependsOnESID && nbBifs && !i)
 					mp4_report(load, GF_OK, "several scene namespaces used or improper scene dependencies in file - import may be incorrect");
 				e = gf_laser_decoder_configure_stream(lsr_dec, esd->ESID, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 				if (e) goto exit;
@@ -271,15 +271,15 @@
 			}
 			samp->DTS += init_offset;
 
-			au = gf_sm_stream_au_new(sc, samp->DTS, ((Double)(s64) samp->DTS) / sc->timeScale, samp->IsRAP);
+			au = gf_sm_stream_au_new(sc, samp->DTS, ((Double)(s64) samp->DTS) / sc->timeScale, (samp->IsRAP==RAP) ? 1 : 0);
 
 			if (esd->decoderConfig->streamType==GF_STREAM_SCENE) {
 #ifndef GPAC_DISABLE_BIFS
-				if (esd->decoderConfig->objectTypeIndication<=2) 
+				if (esd->decoderConfig->objectTypeIndication<=2)
 					e = gf_bifs_decode_command_list(bifs_dec, esd->ESID, samp->data, samp->dataLength, au->commands);
 #endif
 #ifndef GPAC_DISABLE_LASER
-				if (esd->decoderConfig->objectTypeIndication==0x09) 
+				if (esd->decoderConfig->objectTypeIndication==0x09)
 					e = gf_laser_decode_command_list(lsr_dec, esd->ESID, samp->data, samp->dataLength, au->commands);
 #endif
 			} else {
@@ -350,7 +350,7 @@
 		gf_odf_desc_del((GF_Descriptor *) load->ctx->root_od);
 		load->ctx->root_od = NULL;
 	}
-	
+
 	esd = NULL;
 
 	/*get root scene stream*/

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/loader_qt.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/loader_qt.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -166,7 +166,7 @@
 		mi->delete_file = 1;
 		sprintf(szName, "%s_img%d.jpg", load->fileName, esd->ESID);
 		mi->file_name = gf_strdup(szName);
-		
+
 		gf_list_add(od->ESDescriptors, esd);
 		gf_list_add(odU->objectDescriptors, od);

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/loader_svg.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/loader_svg.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -54,7 +54,7 @@
 	GF_Err last_error;
 	GF_SAXParser *sax_parser;
 	u32 has_root;
-	
+
 	/* stack of SVG nodes*/
 	GF_List *node_stack;
 
@@ -70,7 +70,7 @@
 	GF_AUContext *laser_au;
 	GF_Command *command;
 
-    /*SAF AU maps to OD AU and is used for each new media declaration*/
+	/*SAF AU maps to OD AU and is used for each new media declaration*/
 	GF_AUContext *saf_au;
 	GF_StreamContext *saf_es;
 
@@ -113,8 +113,8 @@
 {
 	/*top of parsed sub-tree*/
 	SVG_Element *node;
-	/*the current element is animation that cannot be parsed completely 
-	  upon reception of start tag of element but for which we may be able 
+	/*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;
 	/*depth of unknown elements being skipped*/
@@ -152,9 +152,9 @@
 
 	/*notify MediaEvent*/
 	if (parser->load && parser->load->is) {
-		parser->load->is->on_media_event(parser->load->is, GF_EVENT_MEDIA_PROGRESS); 
+		parser->load->is->on_media_event(parser->load->is, GF_EVENT_MEDIA_PROGRESS);
 		if (done == total) {
-			parser->load->is->on_media_event(parser->load->is, GF_EVENT_MEDIA_LOAD_DONE); 
+			parser->load->is->on_media_event(parser->load->is, GF_EVENT_MEDIA_LOAD_DONE);
 		}
 	}
 	gf_set_progress("SVG (Dynamic Attribute List) Parsing", done, total);
@@ -211,7 +211,7 @@
 static void svg_process_media_href(GF_SVG_Parser *parser, GF_Node *elt, XMLRI *iri)
 {
 	u32 tag = gf_node_get_tag(elt);
-	
+
 	if ((tag==TAG_SVG_image) || (tag==TAG_SVG_video) || (tag==TAG_SVG_audio)) {
 		SVG_SAFExternalStream *st = svg_saf_get_stream(parser, 0, iri->string+1);
 		if (st) {
@@ -356,11 +356,11 @@
 	u8 anim_value_type = 0;
 
 	if (anim->resolve_stage==0) {
-		/* Stage 0: parsing the animation attribute values 
+		/* Stage 0: parsing the animation attribute values
 					for that we need to resolve the target first */
 
 		/* if we don't have a target, try to get it */
-		if (!anim->target) 
+		if (!anim->target)
 			anim->target = (SVG_Element *) gf_sg_find_node_by_name(sg, anim->target_id + 1);
 
 		/* if now we have a target, create the xlink:href attribute on the animation element and set it to the found target */
@@ -405,7 +405,7 @@
 		else if (gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, 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 
+			/*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;
@@ -451,23 +451,23 @@
 			/* now that we have a target, if there is a to value to parse, create the attribute and parse it */
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_to, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->to, anim_value_type);
-			if (anim_value_type==XMLRI_datatype) 
+			if (anim_value_type==XMLRI_datatype)
 				svg_post_process_href(parser, (XMLRI*)((SMIL_AnimateValue *)info.far_ptr)->value);
-		} 
+		}
 		if (anim->from) {
 			/* now that we have a target, if there is a from value to parse, create the attribute and parse it */
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_from, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->from, anim_value_type);
-			if (anim_value_type==XMLRI_datatype) 
+			if (anim_value_type==XMLRI_datatype)
 				svg_post_process_href(parser, (XMLRI*)((SMIL_AnimateValue *)info.far_ptr)->value);
-		} 
+		}
 		if (anim->by) {
 			/* now that we have a target, if there is a by value to parse, create the attribute and parse it */
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_by, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->by, anim_value_type);
-			if (anim_value_type==XMLRI_datatype) 
+			if (anim_value_type==XMLRI_datatype)
 				svg_post_process_href(parser, (XMLRI*)((SMIL_AnimateValue *)info.far_ptr)->value);
-		} 
+		}
 		if (anim->values) {
 			/* now that we have a target, if there is a 'values' value to parse, create the attribute and parse it */
 			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_values, GF_TRUE, GF_FALSE, &info);
@@ -487,7 +487,7 @@
 	}
 
 	if (anim->resolve_stage == 1) {
-		/* Stage 1: parsing the begin values 
+		/* Stage 1: parsing the begin values
 					we go into the next stage only if at least one begin value is resolved */
 		gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_begin, GF_TRUE, GF_FALSE, &info);
 		if (gf_svg_resolve_smil_times((GF_Node *)anim->animation_elt, anim->target, *(GF_List **)info.far_ptr, GF_FALSE, nodeID)) {
@@ -509,7 +509,7 @@
 	} else {
 		return GF_FALSE;
 	}
-	
+
 }
 
 static void svg_resolved_refs(GF_SVG_Parser *parser, GF_SceneGraph *sg, const char *nodeID)
@@ -588,7 +588,7 @@
 	u32 svg_w, svg_h;
 	svg_w = svg_h = 0;
 	if (!gf_node_get_attribute_by_tag((GF_Node *)root_svg, TAG_SVG_ATT_width, GF_FALSE, GF_FALSE, &width_info)
-		&& !gf_node_get_attribute_by_tag((GF_Node *)root_svg, TAG_SVG_ATT_height, GF_FALSE, GF_FALSE, &height_info)) {
+	        && !gf_node_get_attribute_by_tag((GF_Node *)root_svg, TAG_SVG_ATT_height, GF_FALSE, GF_FALSE, &height_info)) {
 		SVG_Length * w = (SVG_Length *)width_info.far_ptr;
 		SVG_Length * h = (SVG_Length *)height_info.far_ptr;
 		if (w->type == SVG_NUMBER_VALUE) svg_w = FIX2INT(w->value);
@@ -625,7 +625,7 @@
 	const char *ev_event, *ev_observer;
 	SVG_DeferedAnimation *anim = NULL;
 	char *ID = NULL;
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[SVG Parsing] Parsing node %s\n", name));
 
 	*has_ns = GF_FALSE;
@@ -667,7 +667,7 @@
 			return NULL;
 		}
 	}
-	
+
 	/* Translates the node type (called name) from a String into a unique numeric identifier in GPAC */
 	tag = xmlns ? gf_xml_get_element_tag(name, xmlns) : TAG_UndefinedNode;
 	if (tag == TAG_UndefinedNode) {
@@ -684,7 +684,7 @@
 	has_id = GF_FALSE;
 	count = gf_list_count(parser->peeked_nodes);
 	if (count && ID) {
-		for (i=0; i<count;i++) {
+		for (i=0; i<count; i++) {
 			GF_Node *n = (GF_Node *)gf_list_get(parser->peeked_nodes, i);
 			const char *n_id = gf_node_get_name(n);
 			if (n_id && !strcmp(n_id, ID)) {
@@ -733,7 +733,7 @@
 			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_DeferedAnimation 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);
 		/*default anim target is parent node*/
@@ -768,7 +768,7 @@
 		char *att_name = NULL;
 		if (!att->value || !strlen(att->value)) continue;
 
-		/* first determine in which namespace is the attribute and store the result in ns, 
+		/* first determine in which namespace is the attribute and store the result in ns,
 		then shift the char buffer to point to the local name of the attribute*/
 		ns = xmlns;
 		att_name = strchr(att->name, ':');
@@ -792,7 +792,7 @@
 		if (!stricmp(att_name, "style")) {
 			gf_svg_parse_style((GF_Node *)elt, att->value);
 			continue;
-		} 
+		}
 
 		/* Some attributes of the animation elements cannot be parsed (into typed values) until the type of value is known,
 		   we defer the parsing and store them temporarily as strings */
@@ -821,9 +821,9 @@
 
 		/* Special case for xlink:href attributes */
 		if ((ns == GF_XMLNS_XLINK) && !stricmp(att_name, "href") ) {
-			
+
 			if (gf_svg_is_animation_tag(tag)) {
-				/* For xlink:href in animation elements, 
+				/* For xlink:href in animation elements,
 				we try to locate the target of the xlink:href to determine the type of values to be animated */
 				assert(anim);
 				anim->target_id = gf_strdup(att->value);
@@ -844,24 +844,24 @@
 					/* extract data URL and store as file */
 					svg_post_process_href(parser, iri);
 					continue;
-				} 
+				}
 			}
-		} 
+		}
 
 		/* For the XML Event handler element, we need to defer the parsing of some attributes */
 		if ((tag == TAG_SVG_handler) && (ns == GF_XMLNS_XMLEV)) {
 			if (!stricmp(att_name, "event") ) {
 				ev_event = att->value;
 				continue;
-			} 
+			}
 			if (!stricmp(att_name, "observer") ) {
 				ev_observer = att->value;
 				continue;
-			} 
+			}
 		}
 
 		/*laser specific stuff*/
-		if (ns == GF_XMLNS_LASER) { 
+		if (ns == GF_XMLNS_LASER) {
 			/* CHECK: we should probably check the namespace of the attribute here */
 			if (!stricmp(att_name, "scale") ) {
 				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_SVG_ATT_transform, GF_TRUE, GF_TRUE, &info)==GF_OK) {
@@ -871,7 +871,7 @@
 					gf_mx2d_add_scale(&mat->mat, pt.x, pt.y);
 					continue;
 				}
-			} 
+			}
 			if (!stricmp(att_name, "translation") ) {
 				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_SVG_ATT_transform, GF_TRUE, GF_TRUE, &info)==GF_OK) {
 					SVG_Point pt;
@@ -880,10 +880,10 @@
 					gf_mx2d_add_translation(&mat->mat, pt.x, pt.y);
 					continue;
 				}
-			} 
+			}
 		}
 
-		/* For all attributes of the form 'on...', like 'onclick' we create a listener for the event on the current element, 
+		/* For all attributes of the form 'on...', like 'onclick' we create a listener for the event on the current element,
 		   we connect the listener to a handler that contains the code in the 'on...' attribute. */
 		/* CHECK: we should probably check the namespace of the attribute and of the element here */
 		if (!strncmp(att_name, "on", 2)) {
@@ -893,9 +893,9 @@
 				gf_dom_add_text_node((GF_Node *)handler, gf_strdup(att->value) );
 				gf_node_init((GF_Node *)handler);
 				continue;
-			} 
+			}
 			svg_report(parser, GF_OK, "Skipping unknown event handler %s on node %s", att->name, name);
-		} 
+		}
 
 		/* end of special cases of attributes */
 
@@ -908,8 +908,8 @@
 				continue;
 			}
 			if (info.fieldType == SVG_ID_datatype) {
-				/*"when both 'id' and 'xml:id'  are specified on the same element but with different values, 
-				the SVGElement::id field must return either of the values but should give precedence to 
+				/*"when both 'id' and 'xml:id'  are specified on the same element but with different values,
+				the SVGElement::id field must return either of the values but should give precedence to
 				the 'xml:id'  attribute."*/
 				if (!node_name || (info.fieldIndex == TAG_XML_ATT_id)) {
 					node_name = *(SVG_ID *)info.far_ptr;
@@ -922,10 +922,10 @@
 			} else {
 				switch (info.fieldIndex) {
 				case TAG_SVG_ATT_syncMaster:
-				case TAG_SVG_ATT_focusHighlight: 
-				case TAG_SVG_ATT_initialVisibility: 
-				case TAG_SVG_ATT_fullscreen: 
-				case TAG_SVG_ATT_requiredFonts: 
+				case TAG_SVG_ATT_focusHighlight:
+				case TAG_SVG_ATT_initialVisibility:
+				case TAG_SVG_ATT_fullscreen:
+				case TAG_SVG_ATT_requiredFonts:
 					/*switch LASeR Configuration to v2 because these attributes are not part of v1*/
 					svg_lsr_set_v2(parser);
 					break;
@@ -933,7 +933,7 @@
 			}
 #endif
 			continue;
-		} 
+		}
 
 		/* all other attributes (??? failed to be created) should fall in this category */
 		svg_report(parser, GF_OK, "Skipping attribute %s on node %s", att->name, name);
@@ -946,7 +946,7 @@
 		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 
+		/*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(node, (GF_Node*)listener );
 		gf_node_register((GF_Node*)listener, NULL);
@@ -969,9 +969,9 @@
 			gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
 			((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, 
+		/* 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 */
-		if ( ((XMLRI *)info.far_ptr)->target) 
+		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);
@@ -991,12 +991,12 @@
 	if (anim) {
 		/*FIXME - we need to parse from/to/values but not initialize the stack*/
 //		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);
-			} else {
-				gf_list_add(parser->defered_animations, anim);
-			}
+		needs_init = GF_FALSE;
+		if (svg_parse_animation(parser, parser->load->scene_graph, anim, NULL, 0)) {
+			svg_delete_defered_anim(anim, NULL);
+		} else {
+			gf_list_add(parser->defered_animations, anim);
+		}
 //		} else {
 //			svg_delete_defered_anim(anim, NULL);
 //		}
@@ -1174,11 +1174,11 @@
 			info.fieldType = gf_xml_get_attribute_type(info.fieldIndex);
 
 #ifndef GPAC_DISABLE_LASER
-/*
-			if (gf_lsr_anim_type_from_attribute(info.fieldIndex)<0) {
-				return svg_report(parser, GF_BAD_PARAM, "Attribute %s of element %s is not updatable\n", atAtt, gf_node_get_class_name(parser->command->node));
-			}
-*/
+			/*
+						if (gf_lsr_anim_type_from_attribute(info.fieldIndex)<0) {
+							return svg_report(parser, GF_BAD_PARAM, "Attribute %s of element %s is not updatable\n", atAtt, gf_node_get_class_name(parser->command->node));
+						}
+			*/
 #endif /*GPAC_DISABLE_LASER*/
 		}
 
@@ -1291,7 +1291,7 @@
 	u32 i;
 	if (!strcmp(name, "LASeRHeader")) {
 		GF_LASERConfig *lsrc = (GF_LASERConfig *) gf_odf_desc_new(GF_ODF_LASER_CFG_TAG);
-		for (i=0; i<nb_attributes;i++) {
+		for (i=0; i<nb_attributes; i++) {
 			GF_XMLAttribute *att = (GF_XMLAttribute *) &attributes[i];
 			if (!strcmp(att->name, "profile")) lsrc->profile = !strcmp(att->value, "full") ? 1 : 0;
 			else if (!strcmp(att->name, "level")) lsrc->level = atoi(att->value);
@@ -1310,7 +1310,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 = 0x09;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_LASER;
 		esd->slConfig->timestampResolution = lsrc->time_resolution ? lsrc->time_resolution : 1000;
 		return esd;
 	}
@@ -1338,23 +1338,23 @@
 		parent = NULL;
 	}
 
-    /* If the loader was created with the DIMS type and this is the root element, restore the stream and AU 
+	/* If the loader was created with the DIMS type and this is the root element, restore the stream and AU
 	context - in DIMS? we only have one stream an dcommands are stacked in the last AU of the stream*/
-    if (!parent && (parser->load->type == GF_SM_LOAD_DIMS) && parser->load->ctx) {
+	if (!parent && (parser->load->type == GF_SM_LOAD_DIMS) && parser->load->ctx) {
 
 		/*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->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, 
+			   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);
 		} else {
 			parser->laser_es = gf_list_get(parser->load->ctx->streams, 0);
 			parser->laser_au = gf_list_last(parser->laser_es->AUs);
 		}
-    } 
+	}
 
 	/*saf setup*/
 	if ((!parent && (parser->load->type!=GF_SM_LOAD_SVG)) || cond) {
@@ -1381,20 +1381,20 @@
 			time = 0;
 			rap =  GF_FALSE;
 			if (!gf_list_count(parser->laser_es->AUs)) rap = GF_TRUE;
-			for (i=0; i<nb_attributes;i++) {
+			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") ? GF_TRUE : GF_FALSE;
 			}
 			/*create new laser unit*/
 			parser->laser_au = gf_sm_stream_au_new(parser->laser_es, time, 0, rap);
-			return;			
+			return;
 		}
 
 		if (!strcmp(name, "StreamHeader") || !strcmp(name, "RemoteStreamHeader")
-			/*SAF & SAFML are just a pain ...*/
-			|| !strcmp(name, "mediaHeader") || !strcmp(name, "imageHeader")
-		) {
+		        /*SAF & SAFML are just a pain ...*/
+		        || !strcmp(name, "mediaHeader") || !strcmp(name, "imageHeader")
+		   ) {
 			char *url = NULL;
 			char *src = NULL;
 			const char *ID = NULL;
@@ -1416,11 +1416,11 @@
 			time = 0;
 			ts_res = 1000;
 			OTI = ST = 0;
-			for (i=0; i<nb_attributes;i++) {
+			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, "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, "streamType")) ST = atoi(att->value);
@@ -1487,7 +1487,7 @@
 			SVG_SAFExternalStream*st;
 			u32 i, rap, time, offset, length;
 			rap = time = offset = length = 0;
-			for (i=0; i<nb_attributes;i++) {
+			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, "source")) src = att->value;
@@ -1516,7 +1516,7 @@
 			char *id = NULL;
 			u32 i;
 			SVG_SAFExternalStream*st;
-			for (i=0; i<nb_attributes;i++) {
+			for (i=0; i<nb_attributes; i++) {
 				GF_XMLAttribute *att = (GF_XMLAttribute *) &attributes[i];
 				if (!strcmp(att->name, "ref")) id = att->value;
 			}
@@ -1550,7 +1550,7 @@
 			GF_Err e;
 			parser->command = gf_sg_command_new(parser->load->scene_graph, com_type);
 
-			/*this is likely a conditional start - update unknown depth level*/	
+			/*this is likely a conditional start - update unknown depth level*/
 			top = (SVG_NodeStack*)gf_list_last(parser->node_stack);
 			if (top) {
 				top->unknown_depth ++;
@@ -1593,7 +1593,7 @@
 	if (!parent && !parser->command && (parser->load->flags & GF_SM_LOAD_CONTEXT_STREAMING)) {
 		gf_sg_reset(parser->load->scene_graph);
 		parser->has_root = 0;
-	} 
+	}
 
 	/*something not supported happened (bad command name, bad root, ...) */
 	if ((parser->has_root==1) && !parent && !parser->command)
@@ -1614,10 +1614,10 @@
 	stack->has_ns = has_ns;
 	gf_list_add(parser->node_stack, stack);
 
-	if ( (gf_node_get_tag((GF_Node *)elt) == TAG_SVG_svg) && 
-		(!parser->has_root || (parser->command && !parser->command->node) )
-	) {
-		
+	if ( (gf_node_get_tag((GF_Node *)elt) == TAG_SVG_svg) &&
+	        (!parser->has_root || (parser->command && !parser->command->node) )
+	   ) {
+
 		if (!parser->has_root) svg_init_root_element(parser, elt);
 		if (parser->command) parser->command->node = (GF_Node*)elt;
 	} else if (!parent && parser->has_root && parser->command) {
@@ -1643,7 +1643,7 @@
 		} else {
 			assert(parser->command->tag==GF_SG_LSR_NEW_SCENE);
 			assert(gf_node_get_tag((GF_Node *)elt) == TAG_SVG_svg);
-			if(!parser->command->node) 
+			if(!parser->command->node)
 				parser->command->node = (GF_Node *)elt;
 		}
 	} else if (!parser->has_root ) {
@@ -1686,14 +1686,14 @@
 		/*error*/
 		return;
 	}
-	
+
 #ifdef SKIP_UNKNOWN_NODES
 	ns = parser->current_ns;
-	if (name_space) 
-		ns = gf_sg_get_namespace_code(parser->load->scene_graph, (char *) name_space);  
+	if (name_space)
+		ns = gf_sg_get_namespace_code(parser->load->scene_graph, (char *) name_space);
 
 	/*only remove created nodes ... */
-	if (gf_xml_get_element_tag(name, ns) != TAG_UndefinedNode) 
+	if (gf_xml_get_element_tag(name, ns) != TAG_UndefinedNode)
 #endif
 	{
 		const char *the_name;
@@ -1722,28 +1722,28 @@
 		if (parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK) {
 			switch (node->sgprivate->tag) {
 			case TAG_SVG_animateMotion:
-				/* 
-				try to init animateMotion once all children have been parsed 
-				to make sure we get the mpath child if any, however, we are still not sure 
-				if the target is known. We can force initialisation 
-				because mpath children (if any have been parsed) 
+				/*
+				try to init animateMotion once all children have been parsed
+				to make sure we get the mpath child if any, however, we are still not sure
+				if the target is known. We can force initialisation
+				because mpath children (if any have been parsed)
 				*/
-				{
-				   u32 i, count;
-				   SVG_DeferedAnimation *anim = NULL;
-				   count = gf_list_count(parser->defered_animations);
-				   for (i = 0; i < count; i++) {
-					   anim = gf_list_get(parser->defered_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);
-					   }
-				   }
+			{
+				u32 i, count;
+				SVG_DeferedAnimation *anim = NULL;
+				count = gf_list_count(parser->defered_animations);
+				for (i = 0; i < count; i++) {
+					anim = gf_list_get(parser->defered_animations, i);
+					if (anim->animation_elt == node) break;
+					else anim = NULL;
 				}
-				break;
+				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);
+					}
+				}
+			}
+			break;
 			case TAG_SVG_script:
 			case TAG_SVG_handler:
 				/*init script once text script is loaded*/
@@ -1803,7 +1803,7 @@
 
 		field = (GF_CommandField *)gf_list_get(parser->command->command_fields, 0);
 		if (parser->command->tag == GF_SG_LSR_NEW_SCENE || parser->command->tag == GF_SG_LSR_ADD) return;
-		
+
 		if (!field || field->field_ptr) return;
 
 		if (field->new_node) {
@@ -1853,7 +1853,7 @@
 			}
 		}
 	}
-		break;
+	break;
 	}
 
 	if (!skip_text) {
@@ -1962,8 +1962,11 @@
 		i=0;
 		while ((sc = (GF_StreamContext*)gf_list_enum(load->ctx->streams, &i))) {
 			switch (sc->streamType) {
-			case GF_STREAM_SCENE: if (!parser->laser_es) parser->laser_es = sc; break;
-			default: break;
+			case GF_STREAM_SCENE:
+				if (!parser->laser_es) parser->laser_es = sc;
+				break;
+			default:
+				break;
 			}
 		}
 		/*need at least one scene stream - FIXME - accept SVG as root? */
@@ -1973,10 +1976,10 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[Parser] %s Scene Parsing: %s\n", ((load->type==GF_SM_LOAD_SVG) ? "SVG" : ((load->type==GF_SM_LOAD_XSR) ? "LASeR" : "DIMS")), load->fileName));
 	}
 
-	if (str_data) 
+	if (str_data)
 		return gf_xml_sax_parse(parser->sax_parser, str_data);
-	
-	return GF_OK;	
+
+	return GF_OK;
 }
 
 
@@ -2008,7 +2011,7 @@
 	SVG_SAFExternalStream *st;
 	GF_SVG_Parser *parser = (GF_SVG_Parser *)load->loader_priv;
 	if (!parser) return;
-	
+
 	gf_sm_svg_flush_state(parser);
 
 	gf_list_del(parser->node_stack);
@@ -2082,7 +2085,7 @@
 	ctx.type = GF_SM_LOAD_SVG;
 
 	e = gf_sm_load_initialize_svg(&ctx, node_str, GF_TRUE);
-	
+
 	parser = (GF_SVG_Parser *)ctx.loader_priv;
 	node = parser->fragment_root;
 
@@ -2091,7 +2094,7 @@
 		parser->fragment_root=NULL;
 		load_svg_done(&ctx);
 		return NULL;
-	} 
+	}
 
 	/*don't register*/
 	if (node) node->sgprivate->num_instances--;

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/loader_xmt.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/loader_xmt.c Changed

@@ -11,21 +11,22 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  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/network.h>
 #include <gpac/xml.h>
 #include <gpac/internal/bifs_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
@@ -67,7 +68,7 @@
 
 
 typedef struct
-{	
+{
 	/*1: XMT-A, 2: X3D, 3: XMT-O (not supported yet) */
 	u32 doc_type;
 	/*0: not init, 1: header, 2: body*/
@@ -78,7 +79,7 @@
 	GF_Err last_error;
 	GF_SAXParser *sax_parser;
 	XMTNodeStack *x3d_root;
-	
+
 	/* stack of nodes for SAX parsing*/
 	GF_List *nodes;
 	/* stack of descriptors for SAX parsing*/
@@ -155,7 +156,7 @@
 {
 	gf_set_progress("XMT Parsing", done, total);
 }
-static Bool xmt_esid_available(GF_XMTParser *parser, u16 ESID) 
+static Bool xmt_esid_available(GF_XMTParser *parser, u16 ESID)
 {
 	u32 i;
 	XMT_ESDLink *esdl;
@@ -166,7 +167,7 @@
 	return 1;
 }
 
-static char *xmt_get_es_name(GF_XMTParser *parser, u16 ESID) 
+static char *xmt_get_es_name(GF_XMTParser *parser, u16 ESID)
 {
 	u32 i;
 	XMT_ESDLink *esdl;
@@ -201,9 +202,9 @@
 	for (i=0; i<count; i++) {
 		odl = (XMT_ODLink*)gf_list_get(parser->od_links, i);
 		if ( (ID && (odl->ID == ID))
-			|| (odl->od == od)
-			|| (odl->desc_name && name && !strcmp(odl->desc_name, name))
-		) {
+		        || (odl->od == od)
+		        || (odl->desc_name && name && !strcmp(odl->desc_name, name))
+		   ) {
 			if (!odl->od) odl->od = od;
 			if (!odl->desc_name && name) odl->desc_name = gf_strdup(name);
 			if (!od->objectDescriptorID) {
@@ -211,7 +212,7 @@
 			} else if (ID && (od->objectDescriptorID != ID)) {
 				xmt_report(parser, GF_BAD_PARAM, "Conflicting OD IDs %d vs %d\n", ID, od->objectDescriptorID);
 			}
-			
+
 			for (j=i+1; j<count; j++) {
 				XMT_ODLink *l2 = (XMT_ODLink*)gf_list_get(parser->od_links, j);
 				if (l2->od == od) {
@@ -260,13 +261,13 @@
 	i = url->count - 1;
 	url->vals[i].OD_ID = 0;
 	url->vals->OD_ID = ID;
-	
+
 	i=0;
 	while ((odl = (XMT_ODLink*)gf_list_enum(parser->od_links, &i))) {
 		if ( (name && odl->desc_name && !strcmp(odl->desc_name, name))
-			|| (ID && odl->od && odl->od->objectDescriptorID==ID)
-			|| (ID && (odl->ID==ID))
-			) {
+		        || (ID && odl->od && odl->od->objectDescriptorID==ID)
+		        || (ID && (odl->ID==ID))
+		   ) {
 			if (url && (gf_list_find(odl->mf_urls, url)<0) ) gf_list_add(odl->mf_urls, url);
 			return;
 		}
@@ -405,7 +406,7 @@
 	gf_list_add(parser->esd_links, esdl);
 	return esdl->ESID;
 }
-static Bool xmt_odid_available(GF_XMTParser *parser, u16 ODID) 
+static Bool xmt_odid_available(GF_XMTParser *parser, u16 ODID)
 {
 	u32 i;
 	XMT_ODLink *l;
@@ -452,7 +453,7 @@
 
 		esdl->esd->OCRESID = 0;
 		if (!esdl->OCR_Name) continue;
-		
+
 		use_old_fmt = 0;
 		ocr_id = atoi(esdl->OCR_Name);
 		sprintf(szTest, "%d", ocr_id);
@@ -485,7 +486,7 @@
 
 		esdl->esd->dependsOnESID = 0;
 		if (!esdl->Depends_Name) continue;
-		
+
 		use_old_fmt = 0;
 		dep_id = atoi(esdl->Depends_Name);
 		sprintf(szTest, "%d", dep_id);
@@ -561,7 +562,7 @@
 			if (l->ID) {
 				if (l->desc_name) {
 					xmt_report(parser, GF_OK, "WARNING: OD \"%s\" (ID %d) not assigned", l->desc_name, l->ID);
-				} else{
+				} else {
 					xmt_report(parser, GF_OK, "WARNING: OD ID %d not assigned", l->ID);
 				}
 			}
@@ -601,7 +602,7 @@
 	GF_SceneGraph *sc = parser->load->scene_graph;
 	if (parser->parsing_proto) sc = gf_sg_proto_get_graph(parser->parsing_proto);
 	ID = gf_sg_get_next_available_node_id(sc);
-	if (parser->load->ctx && (ID>parser->load->ctx->max_node_id)) 
+	if (parser->load->ctx && (ID>parser->load->ctx->max_node_id))
 		parser->load->ctx->max_node_id = ID;
 	return ID;
 }
@@ -626,7 +627,7 @@
 				return ID;
 			}
 		}
-	} 
+	}
 	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));
@@ -634,14 +635,14 @@
 	return ID;
 }
 
-static u32 xmt_get_node_tag(GF_XMTParser *parser, const char *node_name) 
+static u32 xmt_get_node_tag(GF_XMTParser *parser, const char *node_name)
 {
 	u32 tag;
 	/*if VRML and allowing non MPEG4 nodes, use X3D*/
 	if ((parser->doc_type==2) && !(parser->load->flags & GF_SM_LOAD_MPEG4_STRICT)) {
 #ifndef GPAC_DISABLE_X3D
 		tag = gf_node_x3d_type_by_class_name(node_name);
-		if (!tag) 
+		if (!tag)
 #endif
 			tag = gf_node_mpeg4_type_by_class_name(node_name);
 	} else {
@@ -764,7 +765,7 @@
 		return len+1;
 	}
 
-	/*now this is the REAL pain: 
+	/*now this is the REAL pain:
 		X3D allows '"String1" "String2"' and therefore '"String &quot;test&quot;"'
 		XMT allows '&quot;String1&quot; &quot;String2&quot;' and therefore '&quot;String \&quot;test\&quot;&quot;'
 	thus translating the string from xml to UTF may screw up the separators !! We need to identify them
@@ -804,7 +805,7 @@
 	}
 	value[k] = 0;
 	len = (u32) strlen(sep) + i;
-	
+
 	if (val->buffer) gf_free(val->buffer);
 	val->buffer = NULL;
 	if (strlen(value)) val->buffer = gf_strdup(value);
@@ -870,7 +871,7 @@
 {
 	if (!(parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK)) return;
 	if (gf_node_get_tag(n) != TAG_ProtoNode) {
-		if (!stricmp(info->name, "startTime") || !stricmp(info->name, "stopTime")) 
+		if (!stricmp(info->name, "startTime") || !stricmp(info->name, "stopTime"))
 			xmt_offset_time(parser, (Double *)info->far_ptr);
 	} else if (gf_sg_proto_field_is_sftime_offset(n, info)) {
 		xmt_offset_time(parser, (Double *)info->far_ptr);
@@ -882,46 +883,46 @@
 	u32 res = 0;
 	switch (info->fieldType) {
 	case GF_SG_VRML_SFINT32:
-		res = xmt_parse_int(parser, info->name, (SFInt32 *)info->far_ptr, a_value); 
+		res = xmt_parse_int(parser, info->name, (SFInt32 *)info->far_ptr, a_value);
 		break;
 	case GF_SG_VRML_SFBOOL:
-		res = xmt_parse_bool(parser, info->name, (SFBool *)info->far_ptr, a_value); 
+		res = xmt_parse_bool(parser, info->name, (SFBool *)info->far_ptr, a_value);
 		break;
 	case GF_SG_VRML_SFFLOAT:
-		res = xmt_parse_float(parser, info->name, (SFFloat *)info->far_ptr, a_value); 
+		res = xmt_parse_float(parser, info->name, (SFFloat *)info->far_ptr, a_value);
 		break;
 	case GF_SG_VRML_SFTIME:
-		res = xmt_parse_time(parser, info->name, (SFTime *)info->far_ptr, a_value); 
+		res = xmt_parse_time(parser, info->name, (SFTime *)info->far_ptr, a_value);
 		xmt_check_time_offset(parser, n, info);
 		break;
 	case GF_SG_VRML_SFCOLOR:
-		res = xmt_parse_float(parser, info->name, & ((SFColor *)info->far_ptr)->red, a_value); 
-		res += xmt_parse_float(parser, info->name, & ((SFColor *)info->far_ptr)->green, a_value + res); 
-		res += xmt_parse_float(parser, info->name, & ((SFColor *)info->far_ptr)->blue, a_value + res); 
+		res = xmt_parse_float(parser, info->name, & ((SFColor *)info->far_ptr)->red, a_value);
+		res += xmt_parse_float(parser, info->name, & ((SFColor *)info->far_ptr)->green, a_value + res);
+		res += xmt_parse_float(parser, info->name, & ((SFColor *)info->far_ptr)->blue, a_value + res);
 		break;
 	case GF_SG_VRML_SFVEC2F:
-		res = xmt_parse_float(parser, info->name, & ((SFVec2f *)info->far_ptr)->x, a_value); 
-		res += xmt_parse_float(parser, info->name, & ((SFVec2f *)info->far_ptr)->y, a_value + res); 
+		res = xmt_parse_float(parser, info->name, & ((SFVec2f *)info->far_ptr)->x, a_value);
+		res += xmt_parse_float(parser, info->name, & ((SFVec2f *)info->far_ptr)->y, a_value + res);
 		break;
 	case GF_SG_VRML_SFVEC3F:
-		res = xmt_parse_float(parser, info->name, & ((SFVec3f *)info->far_ptr)->x, a_value); 
-		res += xmt_parse_float(parser, info->name, & ((SFVec3f *)info->far_ptr)->y, a_value + res); 
-		res += xmt_parse_float(parser, info->name, & ((SFVec3f *)info->far_ptr)->z, a_value + res); 
+		res = xmt_parse_float(parser, info->name, & ((SFVec3f *)info->far_ptr)->x, a_value);
+		res += xmt_parse_float(parser, info->name, & ((SFVec3f *)info->far_ptr)->y, a_value + res);
+		res += xmt_parse_float(parser, info->name, & ((SFVec3f *)info->far_ptr)->z, a_value + res);
 		break;
 	case GF_SG_VRML_SFROTATION:
-		res = xmt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->x, a_value); 
-		res += xmt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->y, a_value + res); 
-		res += xmt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->z, a_value + res); 
-		res += xmt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->q, a_value + res); 
+		res = xmt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->x, a_value);
+		res += xmt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->y, a_value + res);
+		res += xmt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->z, a_value + res);
+		res += xmt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->q, a_value + res);
 		break;
 	case GF_SG_VRML_SFSTRING:
-		res = xmt_parse_string(parser, info->name, (SFString*)info->far_ptr, 0, a_value); 
+		res = xmt_parse_string(parser, info->name, (SFString*)info->far_ptr, 0, a_value);
 		if (n && (n->sgprivate->tag==TAG_MPEG4_BitWrapper)) {
 			gf_sm_update_bitwrapper_buffer(n, parser->load->fileName);
 		}
 		break;
 	case GF_SG_VRML_SFSCRIPT:
-		res = xmt_parse_script(parser, info->name, (SFScript *)info->far_ptr, 0, a_value); 
+		res = xmt_parse_script(parser, info->name, (SFScript *)info->far_ptr, 0, a_value);
 		break;
 	case GF_SG_VRML_SFCOMMANDBUFFER:
 	{
@@ -933,7 +934,7 @@
 		}
 		parser->command_buffer = cb;
 	}
-		break;
+	break;
 
 	case GF_SG_VRML_SFIMAGE:
 	{
@@ -983,7 +984,7 @@
 			a_value += i;
 		}
 	}
-		break;
+	break;
 
 	default:
 		parser->last_error = GF_NOT_SUPPORTED;
@@ -1012,11 +1013,11 @@
 		/*special case for MF type based on string (MFString, MFURL and MFScript), we need to take care
 		of all possible forms of XML multi string encoding*/
 		if (sfInfo.fieldType == GF_SG_VRML_SFSTRING) {
-			res = xmt_parse_string(parser, info->name, (SFString*)sfInfo.far_ptr, 1, value); 
+			res = xmt_parse_string(parser, info->name, (SFString*)sfInfo.far_ptr, 1, value);
 		} else if (sfInfo.fieldType == GF_SG_VRML_SFURL) {
-			res = xmt_parse_url(parser, info->name, (MFURL *)info->far_ptr, n, 1, value); 
+			res = xmt_parse_url(parser, info->name, (MFURL *)info->far_ptr, n, 1, value);
 		} else if (sfInfo.fieldType == GF_SG_VRML_SFSCRIPT) {
-			res = xmt_parse_script(parser, info->name, (SFScript*)sfInfo.far_ptr, 1, value); 
+			res = xmt_parse_script(parser, info->name, (SFScript*)sfInfo.far_ptr, 1, value);
 		} else {
 			res = xmt_parse_sf_field(parser, &sfInfo, n, value);
 		}
@@ -1039,13 +1040,13 @@
 	return 0;
 }
 
-static u32 xmt_get_route(GF_XMTParser *parser, char *name, Bool del_com) 
+static u32 xmt_get_route(GF_XMTParser *parser, char *name, Bool del_com)
 {
 	u32 i;
 	GF_Command *com;
 	GF_Route *r = gf_sg_route_find_by_name(parser->load->scene_graph, name);
 	if (r) return r->ID;
-	i=0; 
+	i=0;
 	while ((com = (GF_Command *)gf_list_enum(parser->inserted_routes, &i))) {
 		if (com->def_name && !strcmp(com->def_name, name)) {
 			if (del_com) gf_list_rem(parser->inserted_routes, i);
@@ -1074,7 +1075,7 @@
 	if (parser->parsing_proto) sc = gf_sg_proto_get_graph(parser->parsing_proto);
 
 	ID = gf_sg_get_next_available_route_id(sc);
-	if (parser->load->ctx && (ID>parser->load->ctx->max_route_id)) 
+	if (parser->load->ctx && (ID>parser->load->ctx->max_route_id))
 		parser->load->ctx->max_route_id = ID;
 	return ID;
 }
@@ -1226,7 +1227,7 @@
 			xmt_check_time_offset(parser, node, &inf);
 		}
 	}
-		break;
+	break;
 	}
 }
 
@@ -1309,9 +1310,9 @@
 	for (i=0; i<nb_attributes; i++) {
 		GF_XMLAttribute *att = (GF_XMLAttribute *)&attributes[i];
 		if (!att->value || !strlen(att->value)) continue;
-		if (!strcmp(att->name, "name")) fieldName = att->value; 
-		else if (!strcmp(att->name, "type")) fieldType = xmt_get_ft_by_name(att->value); 
-		else if (!strcmp(att->name, "vrml97Hint") || !strcmp(att->name, "accessType")) eventType = xmt_get_script_et_by_name(att->value); 
+		if (!strcmp(att->name, "name")) fieldName = att->value;
+		else if (!strcmp(att->name, "type")) fieldType = xmt_get_ft_by_name(att->value);
+		else if (!strcmp(att->name, "vrml97Hint") || !strcmp(att->name, "accessType")) eventType = xmt_get_script_et_by_name(att->value);
 		else if (strstr(att->name, "value") || strstr(att->name, "Value")) val = att->value;
 	}
 	scfield = gf_sg_script_field_new(node, eventType, fieldType, fieldName);
@@ -1336,7 +1337,7 @@
 	GF_SceneGraph *sc = parser->load->scene_graph;
 	if (parser->parsing_proto) sc = gf_sg_proto_get_graph(parser->parsing_proto);
 	ID = gf_sg_get_next_available_proto_id(sc);
-	if (parser->load->ctx && (ID>parser->load->ctx->max_node_id)) 
+	if (parser->load->ctx && (ID>parser->load->ctx->max_node_id))
 		parser->load->ctx->max_proto_id = ID;
 	return ID;
 }
@@ -1353,8 +1354,8 @@
 	for (i=0; i<nb_attributes; i++) {
 		GF_XMLAttribute *att = (GF_XMLAttribute *)&attributes[i];
 		if (!att->value || !strlen(att->value)) continue;
-		if (!strcmp(att->name, "name")) szName = att->value; 
-		else if (!strcmp(att->name, "protoID")) ID = atoi(att->value); 
+		if (!strcmp(att->name, "name")) szName = att->value;
+		else if (!strcmp(att->name, "protoID")) ID = atoi(att->value);
 		else if (!strcmp(att->name, "locations")) extURL = att->value;
 		else if (!strcmp(att->name, "url")) extURL = att->value;
 	}
@@ -1437,11 +1438,11 @@
 		}
 		return NULL;
 	}
-	if (parent && parent->node && ((parent->node->sgprivate->tag==TAG_MPEG4_Script) 
+	if (parent && parent->node && ((parent->node->sgprivate->tag==TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		|| (parent->node->sgprivate->tag==TAG_X3D_Script)
+	                               || (parent->node->sgprivate->tag==TAG_X3D_Script)
 #endif
-		) ) {
+	                              ) ) {
 		is_script = 1;
 		if (!strcmp(name, "field")) {
 			xmt_parse_script_field(parser, parent->node, attributes, nb_attributes);
@@ -1458,9 +1459,9 @@
 	}
 	/*proto parsing*/
 	if (parser->parsing_proto) {
-		if (!strcmp(name, "IS")) 
+		if (!strcmp(name, "IS"))
 			return NULL;
-		
+
 		if (!strcmp(name, "field")) {
 			char *fieldName = NULL;
 			char *value = NULL;
@@ -1486,7 +1487,7 @@
 				}
 			} else if (gf_sg_vrml_get_sf_type(fType) != GF_SG_VRML_SFNODE) {
 				/*value not specified for exter proto*/
-			} 
+			}
 			/*SF/MFNode proto field: push node stack with container info but no parent*/
 			else {
 				XMTNodeStack *pf_stack;
@@ -1496,12 +1497,12 @@
 			}
 			return NULL;
 		}
-		
+
 		/*X3D style*/
-		if (!strcmp(name, "ProtoInterface") || !strcmp(name, "ProtoBody")) 
+		if (!strcmp(name, "ProtoInterface") || !strcmp(name, "ProtoBody"))
 			return NULL;
 		/*XMT1 decl for SFNode proto fields*/
-		if (parser->proto_field && (!strcmp(name, "node") || !strcmp(name, "nodes")) ) 
+		if (parser->proto_field && (!strcmp(name, "node") || !strcmp(name, "nodes")) )
 			return NULL;
 		/*anim & QP info */
 		if (parser->proto_field  && !strcmp(name, "InterfaceCodingParameters")) {
@@ -1514,11 +1515,11 @@
 				if (!att->value || !strlen(att->value)) continue;
 				if (!strcmp(att->name, "quantCategory")) qp_type = xmt_get_protofield_qp_type(att->value);
 				else if (!strcmp(att->name, "nbBits")) nbBits = atoi(att->value);
-				else if (!strncmp(att->name, "position3DM", 11) || !strncmp(att->name, "position2DM", 11)  
-					|| !strncmp(att->name, "drawOrderM", 10) || !strncmp(att->name, "colorM", 6) 
-					|| !strncmp(att->name, "textureCoordinateM", 18) || !strncmp(att->name, "angleM", 6) 
-					|| !strncmp(att->name, "scaleM", 6) || !strncmp(att->name, "keyM", 4) || !strncmp(att->name, "sizeM", 5) 
-					) {
+				else if (!strncmp(att->name, "position3DM", 11) || !strncmp(att->name, "position2DM", 11)
+				         || !strncmp(att->name, "drawOrderM", 10) || !strncmp(att->name, "colorM", 6)
+				         || !strncmp(att->name, "textureCoordinateM", 18) || !strncmp(att->name, "angleM", 6)
+				         || !strncmp(att->name, "scaleM", 6) || !strncmp(att->name, "keyM", 4) || !strncmp(att->name, "sizeM", 5)
+				        ) {
 					hasMinMax = 1;
 					if (strstr(att->name, "Min")) xmt_parse_float(parser, att->name, &ftMin, att->value);
 					else xmt_parse_float(parser, att->name, &ftMax, att->value);
@@ -1560,11 +1561,11 @@
 			}
 			if ( (e = gf_node_get_field_by_name(last->node, atField, &nfield)) != GF_OK) {
 				u32 l_tag = gf_node_get_tag(last->node);
-				if ((l_tag!=TAG_MPEG4_Script) 
+				if ((l_tag!=TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-					&& (l_tag!=TAG_X3D_Script)
+				        && (l_tag!=TAG_X3D_Script)
 #endif
-					) {
+				   ) {
 					xmt_report(parser, e, "connect: %s not an field of node %s", atField, gf_node_get_class_name(last->node) );
 					return NULL;
 				}
@@ -1624,7 +1625,7 @@
 	if (parent && parent->node && (parent->node->sgprivate->tag == TAG_ProtoNode) && (!strcmp(name, "node") || !strcmp(name, "nodes")) ) {
 		return NULL;
 	}
-	
+
 	ID = 0;
 	def_name = NULL;
 	tag = 0;
@@ -1651,7 +1652,7 @@
 			else if (!strcmp(att->name, "USE")) {
 				node = xmt_find_node(parser, att->value);
 				e = GF_OK;
-				if (!node) 
+				if (!node)
 					e = xmt_report(parser, GF_BAD_PARAM, "Warning: Cannot find node %s referenced in USE - skipping", att->value);
 
 				if (e) return NULL;
@@ -1662,7 +1663,7 @@
 		}
 	} else {
 		tag = xmt_get_node_tag(parser, name);
-	
+
 		if (!tag) {
 			/*XMT-A weird syntax*/
 			if (parent) {
@@ -1724,7 +1725,7 @@
 	parser->current_node_tag = tag;
 
 	if (parent) container = parent->container_field;
-	else { 
+	else {
 		container.far_ptr = NULL;
 		container.fieldIndex = 0;
 		container.fieldType = 0;
@@ -1764,7 +1765,7 @@
 			def_node = xmt_find_node(parser, att->value);
 
 			e = GF_OK;
-			if (!def_node) 
+			if (!def_node)
 				e = xmt_report(parser, GF_BAD_PARAM, "Warning: Cannot find node %s referenced in USE - skipping", att->value);
 			else if (tag != gf_node_get_tag(def_node)) {
 				xmt_report(parser, GF_OK, "Warning: Node type %s doesn't match type %s of node %s", gf_node_get_class_name(node), gf_node_get_class_name(def_node), att->value);
@@ -1793,7 +1794,7 @@
 		}
 		/*ignored ones*/
 		else if (!strcmp(att->name, "bboxCenter") || !strcmp(att->name, "bboxSize")) {
-		}		
+		}
 		/*all other fields*/
 		else {
 			e = gf_node_get_field_by_name(node, att->name, &info);
@@ -1814,7 +1815,7 @@
 	if (is_script) {
 		u32 last_field = gf_node_get_field_count(parent->node);
 		gf_node_get_field(parent->node, last_field-1, &container);
-	} 
+	}
 
 	if (parent) {
 		if (!container.far_ptr) {
@@ -1841,7 +1842,7 @@
 		assert(parent->node);
 		gf_node_changed(parent->node, NULL);
 	}
-		
+
 	if (!parser->parsing_proto && (tag || proto) )
 		gf_node_init(node);
 
@@ -1917,7 +1918,7 @@
 		else if (!strcmp(att->name, "OCR_ES_ID")) ocr_ref = att->value;
 		else if (!strcmp(att->name, "dependsOn_ES_ID")) dep_ref = att->value;
 		else if ((desc->tag==GF_ODF_MUXINFO_TAG) && (!stricmp(att->name, "fileName") || !stricmp(att->name, "url"))) {
-			char *res_name = gf_url_concatenate(parser->load->fileName, att->value);
+			char *res_name = gf_url_concatenate(parser->load->fileName, (const char *)att->value);
 			e = gf_odf_set_field(desc, att->name, res_name ? res_name : att->value);
 			if (e) xmt_report(parser, e, "Warning: %s not a valid attribute for descriptor %s", att->name, name);
 			if (res_name)
@@ -1928,7 +1929,7 @@
 		}
 	}
 	if (binaryID || xmt_desc_name) {
-		if ((tag == GF_ODF_IOD_TAG) || (tag == GF_ODF_OD_TAG)) 
+		if ((tag == GF_ODF_IOD_TAG) || (tag == GF_ODF_OD_TAG))
 			xmt_new_od_link(parser, (GF_ObjectDescriptor *)desc, xmt_desc_name, binaryID);
 		else if (tag == GF_ODF_ESD_TAG) {
 			xmt_new_esd_link(parser, (GF_ESD *) desc, xmt_desc_name, binaryID);
@@ -2217,9 +2218,9 @@
 			au_is_rap = 1;
 			gf_list_reset(parser->def_nodes);
 		}
-		else if (!strcmp(name, "Insert")) 
+		else if (!strcmp(name, "Insert"))
 			tag = GF_SG_ROUTE_INSERT;
-		
+
 		if (extended) {
 			if (!strcmp(extended, "globalQuant")) {
 				tag = GF_SG_GLOBAL_QUANTIZER;
@@ -2353,10 +2354,10 @@
 							field->fieldType = GF_SG_VRML_MFNODE;
 						} else {
 							field->fieldType = GF_SG_VRML_SFNODE;
-						} 
+						}
 						parser->state = XMT_STATE_ELEMENTS;
 					}
-				}	
+				}
 			} else if (tag==GF_SG_NODE_INSERT) {
 				field = gf_sg_command_field_new(parser->command);
 				field->fieldType = GF_SG_VRML_SFNODE;
@@ -2402,8 +2403,8 @@
 
 	/*OD commands*/
 	if (!strcmp(name, "ObjectDescriptorUpdate") || !strcmp(name, "ObjectDescriptorRemove")
-			|| !strcmp(name, "ES_DescriptorUpdate") || !strcmp(name, "ES_DescriptorRemove")
-			|| !strcmp(name, "IPMP_DescriptorUpdate") || !strcmp(name, "IPMP_DescriptorRemove") ) {
+	        || !strcmp(name, "ES_DescriptorUpdate") || !strcmp(name, "ES_DescriptorRemove")
+	        || !strcmp(name, "IPMP_DescriptorUpdate") || !strcmp(name, "IPMP_DescriptorRemove") ) {
 		u32 stream_id;
 		u8 tag = 0;
 		GF_StreamContext *stream;
@@ -2447,7 +2448,7 @@
 		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);
-	
+
 		if (tag == GF_ODF_ESD_REMOVE_TAG) {
 			char *sep;
 			GF_ESDRemove *esdR = (GF_ESDRemove *) parser->od_command ;
@@ -2498,7 +2499,7 @@
 
 	if (parser->last_error) {
 		gf_xml_sax_suspend(parser->sax_parser, 1);
-		if (parser->command_buffer) 
+		if (parser->command_buffer)
 			parser->command_buffer->buffer = NULL;
 		return;
 	}
@@ -2540,13 +2541,13 @@
 	}
 	if (parser->state==XMT_STATE_END) {
 		if (!strcmp(name, "head")) {
-			 parser->state = XMT_STATE_HEAD;
+			parser->state = XMT_STATE_HEAD;
 		} else {
 			parser->state = XMT_STATE_COMMANDS;
 		}
 	}
 
-	/*scene content*/	
+	/*scene content*/
 	if (parser->state==XMT_STATE_BODY) {
 		/*XMT-A body*/
 		if ((parser->doc_type == 1) && !strcmp(name, "Body")) parser->state = XMT_STATE_COMMANDS;
@@ -2626,7 +2627,7 @@
 
 			if ((parser->doc_type==1) && (parser->state==XMT_STATE_HEAD) && parser->load->ctx && !parser->load->ctx->root_od) {
 				parser->load->ctx->root_od = (GF_ObjectDescriptor *)desc;
-			} 
+			}
 			else if (!parser->od_command) {
 				xmt_report(parser, GF_OK, "Warning: descriptor %s defined outside scene scope - skipping", name);
 				gf_odf_desc_del(desc);
@@ -2712,8 +2713,8 @@
 			}
 			/*end OD command*/
 			else if (!strcmp(name, "ObjectDescriptorUpdate") || !strcmp(name, "ObjectDescriptorRemove")
-					|| !strcmp(name, "ES_DescriptorUpdate") || !strcmp(name, "ES_DescriptorRemove")
-					|| !strcmp(name, "IPMP_DescriptorUpdate") || !strcmp(name, "IPMP_DescriptorRemove") ) {
+			         || !strcmp(name, "ES_DescriptorUpdate") || !strcmp(name, "ES_DescriptorRemove")
+			         || !strcmp(name, "IPMP_DescriptorUpdate") || !strcmp(name, "IPMP_DescriptorRemove") ) {
 				parser->od_command = NULL;
 			}
 
@@ -2873,7 +2874,7 @@
 					break;
 
 				}
-			} 
+			}
 			/*X3D*/
 			else if (parser->doc_type == 2) {
 				if (parser->parsing_proto) {
@@ -2904,11 +2905,11 @@
 		if (parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK) {
 			/*load scripts*/
 			if (!parser->parsing_proto) {
-				if ((tag==TAG_MPEG4_Script) 
+				if ((tag==TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-					|| (tag==TAG_X3D_Script) 
+				        || (tag==TAG_X3D_Script)
 #endif
-				) {
+				   ) {
 					/*it may happen that the script uses itself as a field (not sure this is compliant since this
 					implies a cyclic structure, but happens in some X3D conformance seq)*/
 					if (!top || (top->node != node)) {
@@ -3000,18 +3001,18 @@
 
 	/*restore context - note that base layer are ALWAYS declared BEFORE enhancement layers with gpac parsers*/
 	i=0;
-	while ((sc = (GF_StreamContext*)gf_list_enum(load->ctx->streams, &i))){
+	while ((sc = (GF_StreamContext*)gf_list_enum(load->ctx->streams, &i))) {
 		switch (sc->streamType) {
 		case GF_STREAM_SCENE:
 		case GF_STREAM_PRIVATE_SCENE:
-			if (!parser->scene_es) 
-				parser->scene_es = sc; 
+			if (!parser->scene_es)
+				parser->scene_es = sc;
 			break;
-		case GF_STREAM_OD: 
-			if (!parser->od_es) 
-				parser->od_es = sc; 
+		case GF_STREAM_OD:
+			if (!parser->od_es)
+				parser->od_es = sc;
 			break;
-		default: 
+		default:
 			break;
 		}
 	}

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/scene_dump.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/scene_dump.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -52,8 +52,8 @@
 	FILE *trace;
 	u32 indent;
 	char *filename;
-	
-	u32 dump_mode;
+
+	GF_SceneDumpFormat dump_mode;
 	u16 CurrentESID;
 	u8 ind_char;
 	Bool XMLDump, X3DDump, LSRDump;
@@ -81,7 +81,7 @@
 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, char indent_char, u32 dump_mode)
+GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *_rad_name, char indent_char, GF_SceneDumpFormat dump_mode)
 {
 	GF_SceneDumper *tmp;
 	if (!graph) return NULL;
@@ -92,12 +92,14 @@
 
 #ifndef GPAC_DISABLE_SVG
 	if ((graph->RootNode && (graph->RootNode->sgprivate->tag>=GF_NODE_RANGE_LAST_VRML) )
-	|| (dump_mode==GF_SM_DUMP_LASER) || (dump_mode==GF_SM_DUMP_SVG)) {
-		tmp->XMLDump = 1;
-		if (dump_mode==GF_SM_DUMP_LASER) tmp->LSRDump = 1;
+	        || (dump_mode==GF_SM_DUMP_LASER) || (dump_mode==GF_SM_DUMP_SVG)) {
+		tmp->XMLDump = GF_TRUE;
+		if (dump_mode==GF_SM_DUMP_LASER) {
+			tmp->LSRDump = GF_TRUE;
+		}
 		if (_rad_name) {
 			const char* ext_name = tmp->LSRDump ? ".xsr" : ".svg";
-			tmp->filename = gf_malloc(strlen(_rad_name ? _rad_name : "") + strlen(ext_name) + 1);
+			tmp->filename = (char *)gf_malloc(strlen(_rad_name ? _rad_name : "") + strlen(ext_name) + 1);
 			strcpy(tmp->filename, _rad_name ? _rad_name : "");
 			strcat(tmp->filename, ext_name);
 			tmp->trace = gf_f64_open(tmp->filename, "wt");
@@ -108,7 +110,7 @@
 		} else {
 			tmp->trace = stdout;
 		}
-	} else 
+	} else
 #endif
 	{
 
@@ -130,13 +132,27 @@
 		if (_rad_name) {
 			const char* ext_name;
 			switch (dump_mode) {
-			case GF_SM_DUMP_X3D_XML:  ext_name = ".x3d";  tmp->XMLDump = 1; tmp->X3DDump = 1; break;
-			case GF_SM_DUMP_XMTA:     ext_name = ".xmt";  tmp->XMLDump = 1; break;
-			case GF_SM_DUMP_X3D_VRML: ext_name = ".x3dv"; tmp->X3DDump = 1; break;
-			case GF_SM_DUMP_VRML:     ext_name = ".wrl"; break;
-			default:                  ext_name = ".bt";  break;
+			case GF_SM_DUMP_X3D_XML:
+				ext_name = ".x3d";
+				tmp->XMLDump = GF_TRUE;
+				tmp->X3DDump = GF_TRUE;
+				break;
+			case GF_SM_DUMP_XMTA:
+				ext_name = ".xmt";
+				tmp->XMLDump = GF_TRUE;
+				break;
+			case GF_SM_DUMP_X3D_VRML:
+				ext_name = ".x3dv";
+				tmp->X3DDump = GF_TRUE;
+				break;
+			case GF_SM_DUMP_VRML:
+				ext_name = ".wrl";
+				break;
+			default:
+				ext_name = ".bt";
+				break;
 			}
-			tmp->filename = gf_malloc(strlen(_rad_name ? _rad_name : "") + strlen(ext_name) + 1);
+			tmp->filename = (char *)gf_malloc(strlen(_rad_name ? _rad_name : "") + strlen(ext_name) + 1);
 			strcpy(tmp->filename, _rad_name ? _rad_name : "");
 			strcat(tmp->filename, ext_name);
 			tmp->trace = gf_f64_open(tmp->filename, "wt");
@@ -147,10 +163,18 @@
 		} else {
 			tmp->trace = stdout;
 			switch (dump_mode) {
-			case GF_SM_DUMP_X3D_XML: tmp->XMLDump = 1; tmp->X3DDump = 1; break;
-			case GF_SM_DUMP_XMTA: tmp->XMLDump = 1; break;
-			case GF_SM_DUMP_X3D_VRML: tmp->X3DDump = 1; break;
-			default: break;
+			case GF_SM_DUMP_X3D_XML:
+				tmp->XMLDump = GF_TRUE;
+				tmp->X3DDump = GF_TRUE;
+				break;
+			case GF_SM_DUMP_XMTA:
+				tmp->XMLDump = GF_TRUE;
+				break;
+			case GF_SM_DUMP_X3D_VRML:
+				tmp->X3DDump = GF_TRUE;
+				break;
+			default:
+				break;
 			}
 		}
 	}
@@ -198,11 +222,11 @@
 	if (sdump->XMLDump) {
 		fprintf(sdump->trace, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 		if (sdump->dump_mode==GF_SM_DUMP_XML) return;
-		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"
-		);
+		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"
+		       );
 	}
 	if (sdump->dump_mode==GF_SM_DUMP_SVG) return;
 	if (sdump->LSRDump) {
@@ -374,7 +398,7 @@
 	if (!sdump->trace) return;
 	DUMP_IND(sdump);
 	if (!sdump->XMLDump) {
-		if (name) 
+		if (name)
 			fprintf(sdump->trace, "%s [\n", name);
 		else
 			fprintf(sdump->trace, "[\n");
@@ -410,34 +434,34 @@
 		for (i=0; i<len; i++) {
 			//if (uniLine[i] == (u16) '\"') fprintf(sdump->trace, "\\");
 			switch (uniLine[i]) {
-			case '\'': 
-				if (escape_xml) fprintf(sdump->trace, "&apos;"); 
-				else fprintf(sdump->trace, "'"); 
-				break;
-			case '\"': 
-				if (escape_xml) fprintf(sdump->trace, "&quot;"); 
-				else fprintf(sdump->trace, "\""); 
+			case '\'':
+				if (escape_xml) fprintf(sdump->trace, "&apos;");
+				else fprintf(sdump->trace, "'");
+				break;
+			case '\"':
+				if (escape_xml) fprintf(sdump->trace, "&quot;");
+				else fprintf(sdump->trace, "\"");
 				break;
-			case '&': 
-				fprintf(sdump->trace, "&amp;"); 
+			case '&':
+				fprintf(sdump->trace, "&amp;");
 				break;
-			case '>': 
-				fprintf(sdump->trace, "&gt;"); 
+			case '>':
+				fprintf(sdump->trace, "&gt;");
 				break;
-			case '<': 
-				fprintf(sdump->trace, "&lt;"); 
+			case '<':
+				fprintf(sdump->trace, "&lt;");
 				break;
 			case '\r':
 			case '\n':
-			  /* Does nothing : fprintf(sdump->trace, "");, fflush instead ?*/
-			  break;
+				/* Does nothing : fprintf(sdump->trace, "");, fflush instead ?*/
+				break;
 			default:
-			  if (uniLine[i]<128) {
-				fprintf(sdump->trace, "%c", (u8) uniLine[i]);
-			  } else {
-				fprintf(sdump->trace, "&#%d;", uniLine[i]);
-			  }
-			  break;
+				if (uniLine[i]<128) {
+					fprintf(sdump->trace, "%c", (u8) uniLine[i]);
+				} else {
+					fprintf(sdump->trace, "&#%d;", uniLine[i]);
+				}
+				break;
 			}
 		}
 	}
@@ -453,7 +477,7 @@
 	if (!sdump->trace) return;
 	/*FIXME - optimize id/name fetch*/
 	node_name = gf_node_get_name_and_id(node, &id);
-	if (node_name) 
+	if (node_name)
 		fprintf(sdump->trace, "%s", node_name);
 	else
 		fprintf(sdump->trace, "N%d", id - 1);
@@ -465,7 +489,10 @@
 	u32 i;
 	GF_Command *com;
 	r = gf_sg_route_find(sdump->sg, ID);
-	if (r) { (*outName) = r->name; return 1; }
+	if (r) {
+		(*outName) = r->name;
+		return 1;
+	}
 
 	i=0;
 	while ((com = (GF_Command *)gf_list_enum(sdump->inserted_routes, &i))) {
@@ -494,7 +521,7 @@
 	if (!sdump->trace) return;
 	if (!rName) scene_dump_vrml_find_route_name(sdump, routeID, (const char **) &rName);
 
-	if (rName) 
+	if (rName)
 		fprintf(sdump->trace, "%s", rName);
 	else
 		fprintf(sdump->trace, "R%d", routeID - 1);
@@ -551,7 +578,7 @@
 			fprintf(sdump->trace, ".%s", pinfo.name);
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_SFSCRIPT:
 	{
 		size_t _len;
@@ -575,16 +602,22 @@
 #endif
 				} else {
 					switch (uniLine[i]) {
-					case '&': fprintf(sdump->trace, "&amp;"); break;
-					case '<': fprintf(sdump->trace, "&lt;"); break;
-					case '>': fprintf(sdump->trace, "&gt;"); break;
-					case '\'': 
-					case '"': 
+					case '&':
+						fprintf(sdump->trace, "&amp;");
+						break;
+					case '<':
+						fprintf(sdump->trace, "&lt;");
+						break;
+					case '>':
+						fprintf(sdump->trace, "&gt;");
+						break;
+					case '\'':
+					case '"':
 						fprintf(sdump->trace, "&apos;");
 						break;
 					case 0:
 						break;
-					/*FIXME: how the heck can we preserve newlines and spaces of JavaScript in 
+					/*FIXME: how the heck can we preserve newlines and spaces of JavaScript in
 					an XML attribute in any viewer ? */
 					default:
 						if (uniLine[i]<128) {
@@ -595,13 +628,13 @@
 						break;
 					}
 				}
-			} 
+			}
 			if (!sdump->XMLDump) fprintf(sdump->trace, "\"\n");
 		}
 		gf_free(uniLine);
 		DUMP_IND(sdump);
 	}
-		break;
+	break;
 
 	case GF_SG_VRML_SFSTRING:
 	{
@@ -652,7 +685,7 @@
 			fprintf(sdump->trace, "\"");
 		}
 	}
-		break;
+	break;
 
 	case GF_SG_VRML_SFURL:
 		if (((SFURL *)ptr)->url) {
@@ -735,9 +768,9 @@
 		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");
@@ -795,7 +828,7 @@
 	switch (field.fieldType) {
 	case GF_SG_VRML_SFNODE:
 		assert ( *(GF_Node **)field.far_ptr);
-		
+
 		if (sdump->XMLDump) {
 			if (!sdump->X3DDump) {
 				StartElement(sdump, (char *) field.name);
@@ -806,7 +839,7 @@
 			StartAttribute(sdump, field.name);
 		}
 		gf_dump_vrml_node(sdump, *(GF_Node **)field.far_ptr, 0, NULL);
-		
+
 		if (sdump->XMLDump) {
 			if (!sdump->X3DDump) {
 				sdump->indent--;
@@ -854,7 +887,7 @@
 		sdump->indent--;
 		EndElement(sdump, (char *) field.name, 1);
 	}
-		return;
+	return;
 
 	case GF_SG_VRML_MFATTRREF:
 		if (sdump->XMLDump) {
@@ -877,7 +910,7 @@
 			sdump->indent--;
 			EndElement(sdump, (char *) field.name, 1);
 			return;
-		} 
+		}
 		break;
 	}
 
@@ -912,7 +945,7 @@
 			gf_dump_vrml_sffield(sdump, sf_type, slot_ptr, 1, node);
 		}
 		if (!sdump->XMLDump) fprintf(sdump->trace, "]");
-		
+
 		if (sdump->XMLDump && sdump->X3DDump) {
 			switch (sf_type) {
 			case GF_SG_VRML_SFSTRING:
@@ -933,55 +966,99 @@
 static const char *GetXMTFieldTypeName(u32 fieldType)
 {
 	switch (fieldType) {
-	case GF_SG_VRML_SFBOOL: return "Boolean";
-	case GF_SG_VRML_SFINT32: return "Integer";
-	case GF_SG_VRML_SFCOLOR: return "Color";
-	case GF_SG_VRML_SFVEC2F: return "Vector2";
-	case GF_SG_VRML_SFIMAGE: return "Image";
-	case GF_SG_VRML_SFTIME: return "Time";
-	case GF_SG_VRML_SFFLOAT: return "Float";
-	case GF_SG_VRML_SFVEC3F: return "Vector3";
-	case GF_SG_VRML_SFROTATION: return "Rotation";
-	case GF_SG_VRML_SFSTRING: return "String";
-	case GF_SG_VRML_SFNODE: return "Node";
-	case GF_SG_VRML_MFBOOL: return "Booleans";
-	case GF_SG_VRML_MFINT32: return "Integers";
-	case GF_SG_VRML_MFCOLOR: return "Colors";
-	case GF_SG_VRML_MFVEC2F: return "Vector2Array";
-	case GF_SG_VRML_MFIMAGE: return "Images";
-	case GF_SG_VRML_MFTIME: return "Times";
-	case GF_SG_VRML_MFFLOAT: return "Floats";
-	case GF_SG_VRML_MFVEC3F: return "Vector3Array";
-	case GF_SG_VRML_MFROTATION: return "Rotations";
-	case GF_SG_VRML_MFSTRING: return "Strings";
-	case GF_SG_VRML_MFNODE: return "Nodes";
-	default: return "unknown";
+	case GF_SG_VRML_SFBOOL:
+		return "Boolean";
+	case GF_SG_VRML_SFINT32:
+		return "Integer";
+	case GF_SG_VRML_SFCOLOR:
+		return "Color";
+	case GF_SG_VRML_SFVEC2F:
+		return "Vector2";
+	case GF_SG_VRML_SFIMAGE:
+		return "Image";
+	case GF_SG_VRML_SFTIME:
+		return "Time";
+	case GF_SG_VRML_SFFLOAT:
+		return "Float";
+	case GF_SG_VRML_SFVEC3F:
+		return "Vector3";
+	case GF_SG_VRML_SFROTATION:
+		return "Rotation";
+	case GF_SG_VRML_SFSTRING:
+		return "String";
+	case GF_SG_VRML_SFNODE:
+		return "Node";
+	case GF_SG_VRML_MFBOOL:
+		return "Booleans";
+	case GF_SG_VRML_MFINT32:
+		return "Integers";
+	case GF_SG_VRML_MFCOLOR:
+		return "Colors";
+	case GF_SG_VRML_MFVEC2F:
+		return "Vector2Array";
+	case GF_SG_VRML_MFIMAGE:
+		return "Images";
+	case GF_SG_VRML_MFTIME:
+		return "Times";
+	case GF_SG_VRML_MFFLOAT:
+		return "Floats";
+	case GF_SG_VRML_MFVEC3F:
+		return "Vector3Array";
+	case GF_SG_VRML_MFROTATION:
+		return "Rotations";
+	case GF_SG_VRML_MFSTRING:
+		return "Strings";
+	case GF_SG_VRML_MFNODE:
+		return "Nodes";
+	default:
+		return "unknown";
 	}
 }
 static const char *GetXMTFieldTypeValueName(u32 fieldType)
 {
 	switch (fieldType) {
-	case GF_SG_VRML_SFBOOL: return "booleanValue";
-	case GF_SG_VRML_SFINT32: return "intValue";
-	case GF_SG_VRML_SFCOLOR: return "colorValue";
-	case GF_SG_VRML_SFVEC2F: return "vector2Value";
-	case GF_SG_VRML_SFIMAGE: return "imageValue";
-	case GF_SG_VRML_SFTIME: return "timeValue";
-	case GF_SG_VRML_SFFLOAT: return "floatValue";
-	case GF_SG_VRML_SFVEC3F: return "vector3Value";
-	case GF_SG_VRML_SFROTATION: return "rotationValue";
-	case GF_SG_VRML_SFSTRING: return "stringValue";
-	case GF_SG_VRML_MFBOOL: return "booleanArrayValue";
-	case GF_SG_VRML_MFINT32: return "intArrayValue";
-	case GF_SG_VRML_MFCOLOR: return "colorArrayValue";
-	case GF_SG_VRML_MFVEC2F: return "vector2ArrayValue";
-	case GF_SG_VRML_MFIMAGE: return "imageArrayValue";
-	case GF_SG_VRML_MFTIME: return "timeArrayValue";
-	case GF_SG_VRML_MFFLOAT: return "floatArrayValue";
-	case GF_SG_VRML_MFVEC3F: return "vector3ArrayValue";
-	case GF_SG_VRML_MFROTATION: return "rotationArrayValue";
-	case GF_SG_VRML_MFSTRING: return "stringArrayValue";
-	default: return "unknown";
+	case GF_SG_VRML_SFBOOL:
+		return "booleanValue";
+	case GF_SG_VRML_SFINT32:
+		return "intValue";
+	case GF_SG_VRML_SFCOLOR:
+		return "colorValue";
+	case GF_SG_VRML_SFVEC2F:
+		return "vector2Value";
+	case GF_SG_VRML_SFIMAGE:
+		return "imageValue";
+	case GF_SG_VRML_SFTIME:
+		return "timeValue";
+	case GF_SG_VRML_SFFLOAT:
+		return "floatValue";
+	case GF_SG_VRML_SFVEC3F:
+		return "vector3Value";
+	case GF_SG_VRML_SFROTATION:
+		return "rotationValue";
+	case GF_SG_VRML_SFSTRING:
+		return "stringValue";
+	case GF_SG_VRML_MFBOOL:
+		return "booleanArrayValue";
+	case GF_SG_VRML_MFINT32:
+		return "intArrayValue";
+	case GF_SG_VRML_MFCOLOR:
+		return "colorArrayValue";
+	case GF_SG_VRML_MFVEC2F:
+		return "vector2ArrayValue";
+	case GF_SG_VRML_MFIMAGE:
+		return "imageArrayValue";
+	case GF_SG_VRML_MFTIME:
+		return "timeArrayValue";
+	case GF_SG_VRML_MFFLOAT:
+		return "floatArrayValue";
+	case GF_SG_VRML_MFVEC3F:
+		return "vector3ArrayValue";
+	case GF_SG_VRML_MFROTATION:
+		return "rotationArrayValue";
+	case GF_SG_VRML_MFSTRING:
+		return "stringArrayValue";
+	default:
+		return "unknown";
 	}
 }
 
@@ -989,22 +1066,37 @@
 {
 	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";
+	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";
+	default:
+		return "unknown";
 	}
 }
 
@@ -1020,10 +1112,10 @@
 		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));
+				        field.name, gf_sg_vrml_get_field_type_by_name(field.fieldType), gf_sg_vrml_get_event_type_name(field.eventType, 1));
 			} else {
 				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));
+				        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)) {
@@ -1109,10 +1201,10 @@
 		} 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));
+				        field.name, gf_sg_vrml_get_field_type_by_name(field.fieldType), gf_sg_vrml_get_event_type_name(field.eventType, 1));
 			} else {
 				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));
+				        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)) {
@@ -1221,7 +1313,7 @@
 	}
 }
 
-static GF_Route *gf_dump_vrml_get_IS(GF_SceneDumper *sdump, GF_Node *node, GF_FieldInfo *field) 
+static GF_Route *gf_dump_vrml_get_IS(GF_SceneDumper *sdump, GF_Node *node, GF_FieldInfo *field)
 {
 	u32 i;
 	GF_Route *r;
@@ -1251,7 +1343,7 @@
 		pfield.fieldIndex = r->FromField.fieldIndex;
 		gf_sg_proto_get_field(sdump->current_proto, NULL, &pfield);
 	}
-	
+
 	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));
@@ -1313,7 +1405,7 @@
 	char *name;
 	GF_Node *base;
 	GF_FieldInfo field, base_field;
-	
+
 	if (!node) {
 		fprintf(sdump->trace, "NULL");
 		return;
@@ -1402,10 +1494,10 @@
 	}
 
 	if (base) gf_node_register(base, NULL);
-	
+
 	hasISed = 0;
 	to_dump = sub_el = 0;
-	for (i=0;i<count; i++) {
+	for (i=0; i<count; i++) {
 		if (isScript) {
 			/*dyn script fields are complex types*/
 			def_fields[i] = (i>2) ? 2 : 1;
@@ -1462,7 +1554,7 @@
 				sub_el++;
 			}
 		}
-			break;
+		break;
 		case GF_SG_VRML_MFATTRREF:
 		{
 			MFAttrRef *p = (MFAttrRef*)field.far_ptr;
@@ -1472,7 +1564,7 @@
 				sub_el++;
 			}
 		}
-			break;
+		break;
 		default:
 			if (isScript) {
 				to_dump++;
@@ -1543,7 +1635,7 @@
 	}
 
 	sdump->indent ++;
-	for (i=0;i<count; i++) {
+	for (i=0; i<count; i++) {
 		switch (def_fields[i]) {
 		/*regular field*/
 		case 1:
@@ -1577,7 +1669,7 @@
 
 	if (isScript) sub_el = 1;
 	EndElementHeader(sdump, sub_el ? 1 : 0);
-	
+
 	if (sub_el) {
 		/*dump all normal IS elements for XMT*/
 		if (hasISed && sdump->XMLDump) {
@@ -1585,7 +1677,7 @@
 			EndElementHeader(sdump, 1);
 			sdump->indent++;
 		}
-		for (i=0;i<count; i++) {
+		for (i=0; i<count; i++) {
 			if (def_fields[i]==3) {
 				gf_node_get_field(node, i, &field);
 				gf_dump_vrml_IS_field(sdump, node, field, isScript, 1);
@@ -1596,7 +1688,7 @@
 			EndElement(sdump, "IS", 1);
 		}
 		/*dump all sub elements and complex IS*/
-		for (i=0;i<count; i++) {
+		for (i=0; i<count; i++) {
 			switch (def_fields[i]) {
 			case 2:
 				gf_node_get_field(node, i, &field);
@@ -1611,7 +1703,7 @@
 					/*X3D script metadata, NOT DYN*/
 					if ((i==3) && (node->sgprivate->tag==TAG_X3D_Script) ) {
 						if (*((GF_Node **)field.far_ptr)) gf_dump_vrml_field(sdump, node, field);
-					} else 
+					} else
 #endif
 					{
 						gf_dump_vrml_dyn_field(sdump, node, field, 0);
@@ -1630,7 +1722,7 @@
 	if (isScript && !sdump->XMLDump) {
 		gf_node_get_field(node, 0, &field);
 		gf_dump_vrml_field(sdump, node, field);
-	} 
+	}
 
 	sdump->indent --;
 	if (!sdump->XMLDump && !in_list) {
@@ -1703,7 +1795,7 @@
 		fprintf(sdump->trace, "<Replace extended=\"fields\" atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
 		fprintf(sdump->trace, "\">\n");
-		
+
 		sdump->indent++;
 		i=0;
 		while ((inf = (GF_CommandField *) gf_list_enum(com->command_fields, &i))) {
@@ -1722,7 +1814,7 @@
 			}
 		}
 		sdump->indent--;
-		
+
 		DUMP_IND(sdump);
 		fprintf(sdump->trace, "</Replace>\n");
 	} else {
@@ -1786,7 +1878,9 @@
 		scene_dump_vrml_id(sdump, com->node);
 		fprintf(sdump->trace, "\" position=\"%s\">", posname);
 	} else {
-		if (inf->pos==-1) { fprintf(sdump->trace, "APPEND TO "); }
+		if (inf->pos==-1) {
+			fprintf(sdump->trace, "APPEND TO ");
+		}
 		else fprintf(sdump->trace, "INSERT AT ");
 		scene_dump_vrml_id(sdump, com->node);
 		fprintf(sdump->trace, ".children");
@@ -1860,14 +1954,16 @@
 		scene_dump_vrml_id(sdump, com->node);
 		fprintf(sdump->trace, "\" atField=\"%s\" position=\"%s\"", field.name, posname);
 	} else {
-		if (inf->pos==-1) { fprintf(sdump->trace, "APPEND TO "); }
+		if (inf->pos==-1) {
+			fprintf(sdump->trace, "APPEND TO ");
+		}
 		else 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, " ");
 	}
-	
+
 	memcpy(&sffield, &field, sizeof(GF_FieldInfo));
 	sffield.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
 
@@ -2012,27 +2108,27 @@
 		else fprintf(sdump->trace, "\n");
 		break;
 	case GF_SG_VRML_MFNODE:
-		{
-			GF_ChildNodeItem *tmp;
-			if (sdump->XMLDump) {
-				fprintf(sdump->trace, ">");
-			} else {
-				fprintf(sdump->trace, " [\n");
-			}
-			sdump->indent++;
-			tmp = inf->node_list;
-			while (tmp) {
-				gf_dump_vrml_node(sdump, tmp->node, 1, NULL);
-				tmp = tmp->next;
-			}
-			sdump->indent--;
-			if (sdump->XMLDump) {
-				fprintf(sdump->trace, "</Replace>");
-			} else {
-				EndList(sdump, NULL);
-			}
+	{
+		GF_ChildNodeItem *tmp;
+		if (sdump->XMLDump) {
+			fprintf(sdump->trace, ">");
+		} else {
+			fprintf(sdump->trace, " [\n");
 		}
-		break;
+		sdump->indent++;
+		tmp = inf->node_list;
+		while (tmp) {
+			gf_dump_vrml_node(sdump, tmp->node, 1, NULL);
+			tmp = tmp->next;
+		}
+		sdump->indent--;
+		if (sdump->XMLDump) {
+			fprintf(sdump->trace, "</Replace>");
+		} else {
+			EndList(sdump, NULL);
+		}
+	}
+	break;
 	case GF_SG_VRML_SFCOMMANDBUFFER:
 		if (sdump->XMLDump) {
 			SFCommandBuffer *cb = (SFCommandBuffer*)inf->field_ptr;
@@ -2156,7 +2252,7 @@
 		fprintf(sdump->trace, "<Replace atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
 		fprintf(sdump->trace, "\" atField=\"%s\"", field.name);
-		
+
 		if (toNode) {
 			fprintf(sdump->trace, " atIndexNode=\"");
 			scene_dump_vrml_id(sdump, toNode);
@@ -2183,12 +2279,12 @@
 
 			field.fieldType = cfield.fieldType;
 		}
-	
+
 		if (com->fromNodeID) {
 			target = gf_sg_find_node(com->in_scene, com->fromNodeID);
 			if (!target) return GF_NON_COMPLIANT_BITSTREAM;
 			e = gf_node_get_field(target, com->fromFieldIndex, &idxField);
-			
+
 			fprintf(sdump->trace, " fromNode=\"");
 			scene_dump_vrml_id(sdump, target);
 			fprintf(sdump->trace, "\" fromField=\"%s\">\n", idxField.name);
@@ -2279,9 +2375,9 @@
 		r->is_setup = 1;
 	}
 	if (!r->FromNode || !r->ToNode) return GF_BAD_PARAM;
-	
+
 	if (sdump->XMLDump || !dump_type) DUMP_IND(sdump);
-	
+
 	node_name = gf_node_get_name_and_id(r->FromNode, &id);
 	if (node_name) {
 		const char *to_name;
@@ -2342,7 +2438,7 @@
 	i=0;
 	while ((proto = (GF_Proto*)gf_list_enum(protoList, &i))) {
 		sdump->current_proto = proto;
-	
+
 		DUMP_IND(sdump);
 		if (!sdump->XMLDump) {
 			fprintf(sdump->trace, proto->ExternProto.count ? "EXTERNPROTO " : "PROTO ");
@@ -2370,11 +2466,11 @@
 			field.name = pf->FieldName;
 			field.NDTtype = NDT_SFWorldNode;
 			field.on_event_in = NULL;
-			
+
 			gf_dump_vrml_dyn_field(sdump, NULL, field, pf->QP_Type ? 1 : 0);
 
 			if (!pf->QP_Type) continue;
-			
+
 			/*dump interface coding - BT/TXT extensions, not supported by any other tool*/
 			sdump->indent++;
 			DUMP_IND(sdump);
@@ -2413,7 +2509,7 @@
 			}
 
 		}
-		
+
 		sdump->indent--;
 		DUMP_IND(sdump);
 		if (!sdump->XMLDump) {
@@ -2435,7 +2531,7 @@
 		sdump->indent++;
 
 		if (sdump->XMLDump && sdump->X3DDump) fprintf(sdump->trace, "<ProtoBody>\n");
-		
+
 		e = DumpProtos(sdump, proto->sub_graph->protos);
 		if (e) return e;
 
@@ -2625,7 +2721,7 @@
 	}
 	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) 
+	if (f->fieldIndex>0)
 		fprintf(sdump->trace, "attributeName=\"children\" ");
 
 	fprintf(sdump->trace, ">");
@@ -2689,10 +2785,10 @@
 	char szID[1024];
 	char *lsrns = sd_get_lsr_namespace(com->in_scene);
 	DUMP_IND(sdump);
-	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)
-		);
+	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) );
 
@@ -2776,22 +2872,42 @@
 		switch (com->tag) {
 #ifndef GPAC_DISABLE_VRML
 		/*insert commands*/
-		case GF_SG_NODE_INSERT: e = DumpNodeInsert(sdump, com); break;
-		case GF_SG_INDEXED_INSERT: e = DumpIndexInsert(sdump, com); break;
+		case GF_SG_NODE_INSERT:
+			e = DumpNodeInsert(sdump, com);
+			break;
+		case GF_SG_INDEXED_INSERT:
+			e = DumpIndexInsert(sdump, com);
+			break;
 		case GF_SG_ROUTE_INSERT:
 			e = DumpRouteInsert(sdump, com, has_scene_replace);
 			if (remain) remain--;
 			break;
 		/*delete commands*/
-		case GF_SG_NODE_DELETE: e = DumpNodeDelete(sdump, com); break;
-		case GF_SG_INDEXED_DELETE: e = DumpIndexDelete(sdump, com); break;
-		case GF_SG_ROUTE_DELETE: e = DumpRouteDelete(sdump, com); break;
+		case GF_SG_NODE_DELETE:
+			e = DumpNodeDelete(sdump, com);
+			break;
+		case GF_SG_INDEXED_DELETE:
+			e = DumpIndexDelete(sdump, com);
+			break;
+		case GF_SG_ROUTE_DELETE:
+			e = DumpRouteDelete(sdump, com);
+			break;
 		/*replace commands*/
-		case GF_SG_NODE_REPLACE: e = DumpNodeReplace(sdump, com); break;
-		case GF_SG_FIELD_REPLACE: e = DumpFieldReplace(sdump, com); break;
-		case GF_SG_INDEXED_REPLACE: e = DumpIndexReplace(sdump, com); break;
-		case GF_SG_ROUTE_REPLACE: e = DumpRouteReplace(sdump, com); break;
-		case GF_SG_XREPLACE: e = DumpXReplace(sdump, com); break;			
+		case GF_SG_NODE_REPLACE:
+			e = DumpNodeReplace(sdump, com);
+			break;
+		case GF_SG_FIELD_REPLACE:
+			e = DumpFieldReplace(sdump, com);
+			break;
+		case GF_SG_INDEXED_REPLACE:
+			e = DumpIndexReplace(sdump, com);
+			break;
+		case GF_SG_ROUTE_REPLACE:
+			e = DumpRouteReplace(sdump, com);
+			break;
+		case GF_SG_XREPLACE:
+			e = DumpXReplace(sdump, com);
+			break;
 		case GF_SG_SCENE_REPLACE:
 			/*we don't support replace scene in conditional*/
 			assert(!sdump->current_com_list);
@@ -2802,7 +2918,9 @@
 			remain = count - i - 1;
 			break;
 		/*extended commands*/
-		case GF_SG_PROTO_INSERT: e = DumpProtoInsert(sdump, com); break;
+		case GF_SG_PROTO_INSERT:
+			e = DumpProtoInsert(sdump, com);
+			break;
 		case GF_SG_PROTO_DELETE_ALL:
 			DUMP_IND(sdump);
 			if (sdump->XMLDump) {
@@ -2832,29 +2950,55 @@
 			}
 			e = GF_OK;
 		}
+		break;
+		case GF_SG_GLOBAL_QUANTIZER:
+			e = DumpGlobalQP(sdump, com);
+			break;
+		case GF_SG_MULTIPLE_REPLACE:
+			e = DumpMultipleReplace(sdump, com);
+			break;
+		case GF_SG_MULTIPLE_INDEXED_REPLACE:
+			e = DumpMultipleIndexedReplace(sdump, com);
+			break;
+		case GF_SG_NODE_DELETE_EX:
+			e = DumpNodeDelete(sdump, com);
 			break;
-		case GF_SG_GLOBAL_QUANTIZER: e = DumpGlobalQP(sdump, com); break;
-		case GF_SG_MULTIPLE_REPLACE: e = DumpMultipleReplace(sdump, com); break;
-		case GF_SG_MULTIPLE_INDEXED_REPLACE: e = DumpMultipleIndexedReplace(sdump, com); break;
-		case GF_SG_NODE_DELETE_EX: e = DumpNodeDelete(sdump, com); break;
 
 #endif
 
 
 #ifndef GPAC_DISABLE_SVG
 		/*laser commands*/
-		case GF_SG_LSR_NEW_SCENE: e = DumpLSRNewScene(sdump, com); break;
-		case GF_SG_LSR_ADD: e = DumpLSRAddReplaceInsert(sdump, com); break;
-		case GF_SG_LSR_CLEAN: e = DumpLSRClean(sdump, com); break;
-		case GF_SG_LSR_REPLACE: e = DumpLSRAddReplaceInsert(sdump, com); break;
-		case GF_SG_LSR_DELETE: e = DumpLSRDelete(sdump, com); break;
-		case GF_SG_LSR_INSERT: e = DumpLSRAddReplaceInsert(sdump, com); break;
-		case GF_SG_LSR_RESTORE: e = DumpLSRRestore(sdump, com); break;
-		case GF_SG_LSR_SAVE: e = DumpLSRSave(sdump, com); break;
-		case GF_SG_LSR_SEND_EVENT: e = DumpLSRSendEvent(sdump, com); break;
+		case GF_SG_LSR_NEW_SCENE:
+			e = DumpLSRNewScene(sdump, com);
+			break;
+		case GF_SG_LSR_ADD:
+			e = DumpLSRAddReplaceInsert(sdump, com);
+			break;
+		case GF_SG_LSR_CLEAN:
+			e = DumpLSRClean(sdump, com);
+			break;
+		case GF_SG_LSR_REPLACE:
+			e = DumpLSRAddReplaceInsert(sdump, com);
+			break;
+		case GF_SG_LSR_DELETE:
+			e = DumpLSRDelete(sdump, com);
+			break;
+		case GF_SG_LSR_INSERT:
+			e = DumpLSRAddReplaceInsert(sdump, com);
+			break;
+		case GF_SG_LSR_RESTORE:
+			e = DumpLSRRestore(sdump, com);
+			break;
+		case GF_SG_LSR_SAVE:
+			e = DumpLSRSave(sdump, com);
+			break;
+		case GF_SG_LSR_SEND_EVENT:
+			e = DumpLSRSendEvent(sdump, com);
+			break;
 		case GF_SG_LSR_ACTIVATE:
 		case GF_SG_LSR_DEACTIVATE:
-			e = DumpLSRActivate(sdump, com); 
+			e = DumpLSRActivate(sdump, com);
 			break;
 #endif
 		}
@@ -2909,7 +3053,7 @@
 		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 (((XMLRI*)info.far_ptr)->target && !gf_node_get_id(((XMLRI*)info.far_ptr)->target) ) 
+				if (((XMLRI*)info.far_ptr)->target && !gf_node_get_id(((XMLRI*)info.far_ptr)->target) )
 					return;
 			}
 			break;
@@ -2921,10 +3065,10 @@
 		case TAG_DOMText:
 		{
 			GF_DOMText *txt = (GF_DOMText *)n;
-			if (txt->textContent) {				
+			if (txt->textContent) {
 				if ((txt->type==GF_DOM_TEXT_CDATA) ||
-					(parent->sgprivate->tag == TAG_SVG_script) ||
-					(parent->sgprivate->tag == TAG_SVG_handler)) {
+				        (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, "]]>");
@@ -2933,7 +3077,7 @@
 				}
 			}
 		}
-			return;
+		return;
 		}
 	}
 
@@ -2954,8 +3098,8 @@
 		if (att->data_type==SVG_ID_datatype) {
 			att = att->next;
 			continue;
-		} 
-		
+		}
+
 		info.fieldIndex = att->tag;
 		info.fieldType = att->data_type;
 		if (att->tag==TAG_DOM_ATT_any) {
@@ -2995,7 +3139,7 @@
 		attValue = gf_svg_dump_attribute((GF_Node*)svg, &info);
 		if (/*strcmp(info.name, "xmlns") &&*/ (info.fieldType = (u32) strlen(attValue)))
 			fprintf(sdump->trace, " %s=\"%s\"", info.name, attValue);
-		
+
 		if (attValue) gf_free(attValue);
 
 		fflush(sdump->trace);
@@ -3019,7 +3163,7 @@
 				gf_sm_dump_command_list(sdump, up->updates, sdump->indent, 0);
 			} else if (up->data) {
 				fprintf(sdump->trace, "\n");
-			} 
+			}
 		}
 		sdump->indent--;
 		DUMP_IND(sdump);
@@ -3086,11 +3230,11 @@
 			if (mux && mux->file_name) fprintf(dumper->trace, " source=\"%s\"", mux->file_name);
 			fprintf(dumper->trace, "/>\n");
 		}
-		
+
 
 	}
 	fprintf(dumper->trace, "</saf:mediaUnit>\n");
-}	
+}
 
 static GF_Err SD_DumpDOMElement(GF_SceneDumper *sdump, GF_DOMFullNode *node)
 {
@@ -3159,7 +3303,7 @@
 
 
 	tag = sdump->sg->RootNode->sgprivate->tag;
-	
+
 	if (tag<=GF_NODE_RANGE_LAST_X3D) {
 		gf_dump_setup(sdump, NULL);
 
@@ -3199,7 +3343,7 @@
 			EndElement(sdump, "Scene", 1);
 		}
 #endif /*GPAC_DISABLE_VRML*/
-	
+
 		gf_dump_finalize(sdump, NULL);
 		return GF_OK;
 	}
@@ -3232,7 +3376,7 @@
 
 	/*
 		this happens when converting from bt to xmt
-		NOTE: Comment is wrong? this happens when just loading BT 
+		NOTE: Comment is wrong? this happens when just loading BT
 	*/
 	if (!au->timing_sec) {
 		au->timing_sec = (Double) (s64) au->timing;
@@ -3248,16 +3392,16 @@
 
 	autime = au->timing + au->owner->imp_exp_time;
 	has_base = 0;
-	i=0; 
+	i=0;
 	while ((ptr = (GF_AUContext*)gf_list_enum(sample_list, &i))) {
 		time = ptr->timing + ptr->owner->imp_exp_time;
 		if (
-			/*time ordered*/
-			(time > autime) 
-			/*set bifs first for first AU*/
-			|| (!has_base && (time == autime) && (ptr->owner->streamType < au->owner->streamType) )
-			/*set OD first for laser*/
-			|| (lsr_dump && (au->owner->streamType==GF_STREAM_OD))
+		    /*time ordered*/
+		    (time > autime)
+		    /*set bifs first for first AU*/
+		    || (!has_base && (time == autime) && (ptr->owner->streamType < au->owner->streamType) )
+		    /*set OD first for laser*/
+		    || (lsr_dump && (au->owner->streamType==GF_STREAM_OD))
 		) {
 			gf_list_insert(sample_list, au, i-1);
 			return;
@@ -3271,7 +3415,7 @@
 
 
 GF_EXPORT
-GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, u32 dump_mode)
+GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, GF_SceneDumpFormat dump_mode)
 {
 	GF_Err e;
 	GF_List *sample_list;
@@ -3306,7 +3450,7 @@
 		default:
 			continue;
 		}
-		
+
 		j=0;
 		while ((au = (GF_AUContext*)gf_list_enum(sc->AUs, &j))) {
 			ReorderAUContext(sample_list, au, dumper->LSRDump);
@@ -3347,13 +3491,13 @@
 		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->owner->streamType==GF_STREAM_OD && num_od) || (au->owner->streamType==GF_STREAM_SCENE && num_scene)) {
 					fprintf(dumper->trace, "IN %d ", au->owner->ESID);
-				} 
+				}
 				fprintf(dumper->trace, "{\n");
 				indent++;
 			}
@@ -3365,7 +3509,7 @@
 				} else {
 #ifndef GPAC_DISABLE_OD_DUMP
 					e = gf_odf_dump_com_list(au->commands, dumper->trace, indent+1, 0);
-#endif				
+#endif
 				}
 				break;
 			case GF_STREAM_SCENE:
@@ -3380,7 +3524,7 @@
 				indent--;
 				fprintf(dumper->trace, "}\n\n");
 			}
-		} 
+		}
 		else {
 			if (dumper->LSRDump) {
 				if (time != au->timing_sec) {
@@ -3416,14 +3560,14 @@
 				break;
 			case GF_STREAM_SCENE:
 				if (gf_list_count(au->commands)) {
-					if (dumper->LSRDump) 
+					if (dumper->LSRDump)
 						gf_sm_dump_saf_hdr(dumper, "sceneUnit", au->timing, au->flags & GF_SM_AU_RAP);
 
 					e = gf_sm_dump_command_list(dumper, au->commands, indent+1, first_bifs);
 					first_bifs = 0;
 					no_root_found = 0;
-					
-					if (dumper->LSRDump) 
+
+					if (dumper->LSRDump)
 						fprintf(dumper->trace, "</saf:sceneUnit>\n");
 				}
 				break;

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/scene_engine.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/scene_engine.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -52,7 +52,7 @@
 	GF_SceneManager	*ctx;
 	GF_SceneLoader loader;
 	void *calling_object;
-	Bool owns_context;	
+	Bool owns_context;
 #ifndef GPAC_DISABLE_BIFS_ENC
 	GF_BifsEncoder *bifsenc;
 #endif
@@ -62,11 +62,11 @@
 
 	u32 start_time;
 
-    char *dump_path;
+	char *dump_path;
 
-	Bool embed_resources;    
-    Bool dump_rap;
-    Bool first_dims_sent;
+	Bool embed_resources;
+	Bool dump_rap;
+	Bool first_dims_sent;
 };
 
 #ifndef GPAC_DISABLE_BIFS_ENC
@@ -133,12 +133,12 @@
 	esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
 	esd->decoderConfig->decoderSpecificInfo->data = data;
 	esd->decoderConfig->decoderSpecificInfo->dataLength = data_len;
-		
+
 	sc->dec_cfg = gf_malloc(sizeof(char)*data_len);
 	memcpy(sc->dec_cfg, data, data_len);
 	sc->dec_cfg_len = data_len;
 
-	esd->decoderConfig->objectTypeIndication = gf_bifs_encoder_get_version(seng->bifsenc, esd->ESID);		
+	esd->decoderConfig->objectTypeIndication = gf_bifs_encoder_get_version(seng->bifsenc, esd->ESID);
 
 	return GF_OK;
 }
@@ -176,7 +176,7 @@
 	esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
 	esd->decoderConfig->decoderSpecificInfo->data = data;
 	esd->decoderConfig->decoderSpecificInfo->dataLength = data_len;
-		
+
 	sc->dec_cfg = (char*)gf_malloc(sizeof(char)*data_len);
 	memcpy(sc->dec_cfg, data, data_len);
 	sc->dec_cfg_len = data_len;
@@ -214,7 +214,7 @@
 			esd->decoderConfig->streamType = GF_STREAM_SCENE;
 			esd->decoderConfig->objectTypeIndication = sc->objectType;
 			gf_list_add(iod->ESDescriptors, esd);
-		
+
 			if (!sc->timeScale) sc->timeScale = 1000;
 			esd->slConfig->timestampResolution = sc->timeScale;
 		}
@@ -236,7 +236,7 @@
 		if (!sc->timeScale) sc->timeScale = esd->slConfig->timestampResolution;
 
 
-		if (sc->streamType == GF_STREAM_SCENE) {	
+		if (sc->streamType == GF_STREAM_SCENE) {
 			switch (sc->objectType) {
 #ifndef GPAC_DISABLE_BIFS_ENC
 			case GPAC_OTI_SCENE_BIFS:
@@ -251,12 +251,12 @@
 				break;
 #endif
 			case GPAC_OTI_SCENE_DIMS:
-				/* Nothing to be done here */			
+				/* Nothing to be done here */
 				break;
 			default:
 				e = GF_NOT_SUPPORTED;
 				break;
-			}	
+			}
 			if (e) return e;
 		}
 	}
@@ -317,30 +317,30 @@
 	compress_dims = 1;
 
 #ifdef DUMP_DIMS_LOG_WITH_TIME
-start:    
+start:
 #endif
-	
+
 	if (commands && gf_list_count(commands)) {
-        sprintf(rad_name, "%s%c%s%s", cache_dir, GF_PATH_SEPARATOR, dump_name, "_update");
+		sprintf(rad_name, "%s%c%s%s", cache_dir, GF_PATH_SEPARATOR, dump_name, "_update");
 	} else {
 #ifndef DUMP_DIMS_LOG_WITH_TIME
 		sprintf(rad_name, "%s%c%s%s", cache_dir, GF_PATH_SEPARATOR, "rap_", dump_name);
 #else
-        char date_str[100], time_str[100];
-        time_t now;
-        struct tm *tm_tot;
-        now = time(NULL);        
-        tm_tot = localtime(&now);
-        strftime(date_str, 100, "%Yy%mm%dd", tm_tot);
-		strftime(time_str, 100, "%Hh%Mm%Ss", tm_tot);            
-        sprintf(rad_name, "%s%c%s-%s-%s%s", cache_dir, GF_PATH_SEPARATOR, date_str, time_str, "rap_", dump_name);
+		char date_str[100], time_str[100];
+		time_t now;
+		struct tm *tm_tot;
+		now = time(NULL);
+		tm_tot = localtime(&now);
+		strftime(date_str, 100, "%Yy%mm%dd", tm_tot);
+		strftime(time_str, 100, "%Hh%Mm%Ss", tm_tot);
+		sprintf(rad_name, "%s%c%s-%s-%s%s", cache_dir, GF_PATH_SEPARATOR, date_str, time_str, "rap_", dump_name);
 #endif
 	}
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
 	dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, ' ', GF_SM_DUMP_SVG);
 	if (!dumper) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name)); 
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name));
 		e = GF_IO_ERR;
 		goto exit;
 	}
@@ -353,46 +353,46 @@
 	}
 	gf_sm_dumper_del(dumper);
 
-    if(seng->dump_rap){
-        GF_SceneDumper *dumper = NULL;
-                 
-        sprintf(rad_name, "%s%c%s%s", cache_dir, GF_PATH_SEPARATOR, "rap_", dump_name);
-
-        dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, ' ', GF_SM_DUMP_SVG);
-	    if (!dumper) {
-		    GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name)); 
-		    e = GF_IO_ERR;
-		    goto exit;
-        }
-        e = gf_sm_dump_graph(dumper, 0, 0);
-        gf_sm_dumper_del(dumper);
-    }
+	if(seng->dump_rap) {
+		GF_SceneDumper *dumper = NULL;
+
+		sprintf(rad_name, "%s%c%s%s", cache_dir, GF_PATH_SEPARATOR, "rap_", dump_name);
+
+		dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, ' ', GF_SM_DUMP_SVG);
+		if (!dumper) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name));
+			e = GF_IO_ERR;
+			goto exit;
+		}
+		e = gf_sm_dump_graph(dumper, 0, 0);
+		gf_sm_dumper_del(dumper);
+	}
 
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot dump DIMS Commands\n")); 
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot dump DIMS Commands\n"));
 		goto exit;
 	}
 #endif
 
 #ifdef DUMP_DIMS_LOG_WITH_TIME
-    if (do_dump_with_time) {
-        do_dump_with_time = 0;
-        goto start;        
-    }
+	if (do_dump_with_time) {
+		do_dump_with_time = 0;
+		goto start;
+	}
 #endif
-	
+
 	sprintf(file_name, "%s.svg", rad_name);
 	file = gf_f64_open(file_name, "rb");
 	if (!file) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot open SVG dump file %s\n", file_name)); 
+		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_f64_seek(file, 0, SEEK_END);
 	fsize = gf_f64_tell(file);
-	
+
 	if (fsize == 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] SVG dump %s is empty\n", file_name)); 
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] SVG dump %s is empty\n", file_name));
 		goto exit;
 	}
 
@@ -401,11 +401,11 @@
 	gf_f64_seek(file, 0, SEEK_SET);
 	fsize = fread(buffer, sizeof(char), (size_t)fsize, file);
 	fclose(file);
-    file = NULL;
+	file = NULL;
 
 	/* Then, set DIMS unit header - TODO: notify redundant units*/
 	dims_header = 0;
-    if (commands && gf_list_count(commands)) {
+	if (commands && gf_list_count(commands)) {
 		dims_header = GF_DIMS_UNIT_P; /* streamer->all_non_rap_critical ? 0 : GF_DIMS_UNIT_P;*/
 	} else {
 		/*redundant RAP with complete scene*/
@@ -415,12 +415,12 @@
 	/* Then, if compression is asked, we do it */
 	buffer_len = (u32)fsize;
 	assert(fsize < 1<<31);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[SceneEngine] Sending DIMS data - sizes: raw (%d)", buffer_len)); 
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[SceneEngine] Sending DIMS data - sizes: raw (%d)", buffer_len));
 	if (compress_dims) {
 #ifndef GPAC_DISABLE_ZLIB
 		dims_header |= GF_DIMS_UNIT_C;
 		e = gf_gz_compress_payload(&buffer, buffer_len, &buffer_len);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("/ compressed (%d)", buffer_len)); 
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_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."));
@@ -428,18 +428,18 @@
 		goto exit;
 #endif
 	}
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n")); 
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
 
 	/* Then,  prepare the DIMS data using a bitstream instead of direct manipulation for endianness
-           The new bitstream size should be:
-		the size of the (compressed) data 
+	       The new bitstream size should be:
+		the size of the (compressed) data
 		+ 1 bytes for the header
 		+ 2 bytes for the size
 		+ 4 bytes if the size is greater than 65535
 	 */
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE); 
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	if (buffer_len > 65535) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[SceneEngine] Warning: DIMS Unit size too big !!!\n")); 
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[SceneEngine] Warning: DIMS Unit size too big !!!\n"));
 		gf_bs_write_u16(bs, 0); /* internal GPAC hack to indicate that the size is larger than 65535 */
 		gf_bs_write_u32(bs, buffer_len+1);
 	} else {
@@ -535,7 +535,7 @@
 	e = GF_OK;
 
 	nb_streams = gf_list_count(seng->ctx->streams);
-	for (i=0; i<nb_streams;i++) {
+	for (i=0; i<nb_streams; i++) {
 		GF_StreamContext *sc = gf_list_get(seng->ctx->streams, i);
 		if (sc->streamType != GF_STREAM_SCENE) continue;
 
@@ -564,7 +564,7 @@
 				break;
 #endif
 			case GPAC_OTI_SCENE_DIMS:
-                e = gf_seng_encode_dims_au(seng, sc->ESID, au->commands, &data, &size);
+				e = gf_seng_encode_dims_au(seng, sc->ESID, au->commands, &data, &size);
 				break;
 
 			default:
@@ -589,8 +589,8 @@
 GF_EXPORT
 GF_Err gf_seng_dump_rap_on(GF_SceneEngine *seng, Bool dump_rap)
 {
-    seng->dump_rap = dump_rap;
-    return 0;
+	seng->dump_rap = dump_rap;
+	return 0;
 }
 
 GF_EXPORT
@@ -635,16 +635,16 @@
 #endif
 }
 
-static GF_AUContext *gf_seng_create_new_au(GF_StreamContext *sc, u32 time) 
+static GF_AUContext *gf_seng_create_new_au(GF_StreamContext *sc, u32 time)
 {
-    GF_AUContext *new_au, *last_au;
-    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"));
-        time++;
-    }
-    new_au = gf_sm_stream_au_new(sc, time, 0, 0);
-    return new_au;
+	GF_AUContext *new_au, *last_au;
+	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"));
+		time++;
+	}
+	new_au = gf_sm_stream_au_new(sc, time, 0, 0);
+	return new_au;
 }
 
 GF_EXPORT
@@ -653,7 +653,7 @@
 	GF_StreamContext *sc;
 	u32 i;
 	GF_Err e;
-	
+
 	i = 0;
 	while ((sc = (GF_StreamContext*)gf_list_enum(seng->ctx->streams, &i))) {
 		sc->current_au_count = gf_list_count(sc->AUs);
@@ -661,7 +661,7 @@
 	}
 	seng->loader.flags |= GF_SM_LOAD_CONTEXT_READY;
 	seng->loader.force_es_id = ESID;
-    
+
 	/* 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) {
@@ -675,7 +675,7 @@
 	while ((sc = (GF_StreamContext*)gf_list_enum(seng->ctx->streams, &i))) {
 		sc->disable_aggregation = 0;
 	}
-	e = gf_sm_live_encode_scene_au(seng, callback, 0); 
+	e = gf_sm_live_encode_scene_au(seng, callback, 0);
 exit:
 	return e;
 }
@@ -687,71 +687,71 @@
 	GF_Err e;
 	u32	size;
 	char *data;
-    GF_StreamContext *sc;
+	GF_StreamContext *sc;
 	u32	i, nb_streams;
-    GF_AUContext *new_au;
+	GF_AUContext *new_au;
 
 	if (!callback) return GF_BAD_PARAM;
-    if (!commands || !gf_list_count(commands)) return GF_BAD_PARAM;
+	if (!commands || !gf_list_count(commands)) return GF_BAD_PARAM;
 
 	e = GF_OK;
-    
-    /* if the ESID is not provided we try to use the first scene stream */
-    sc = NULL;
-    nb_streams = gf_list_count(seng->ctx->streams);
-    for (i=0; i<nb_streams;i++) {
-	    GF_StreamContext *tmp_sc = gf_list_get(seng->ctx->streams, i);
-	    if (tmp_sc->streamType != GF_STREAM_SCENE) continue;
-        sc = tmp_sc;
-        if (!ESID) break;
-        else if (sc->ESID == ESID) break;
-    }
-    if (!sc) return GF_BAD_PARAM;
-    /* We need to create an empty AU for the parser to correctly parse a LASeR Command without SceneUnit */
+
+	/* if the ESID is not provided we try to use the first scene stream */
+	sc = NULL;
+	nb_streams = gf_list_count(seng->ctx->streams);
+	for (i=0; i<nb_streams; i++) {
+		GF_StreamContext *tmp_sc = gf_list_get(seng->ctx->streams, i);
+		if (tmp_sc->streamType != GF_STREAM_SCENE) continue;
+		sc = tmp_sc;
+		if (!ESID) break;
+		else if (sc->ESID == ESID) break;
+	}
+	if (!sc) return GF_BAD_PARAM;
+	/* We need to create an empty AU for the parser to correctly parse a LASeR Command without SceneUnit */
 	new_au = gf_seng_create_new_au(sc, time);
 
 	if (disable_aggregation) new_au->flags = GF_SM_AU_NOT_AGGREGATED;
 
 
-	
+
 	/* Removing the commands from the input list to avoid destruction
-       and setting the RAP flag */
-    while (gf_list_count(commands)) {
-        GF_Command *com = gf_list_get(commands, 0);
-        gf_list_rem(commands, 0);
-        switch (com->tag) {
-            case GF_SG_SCENE_REPLACE:
-            case GF_SG_LSR_NEW_SCENE:
-				new_au->flags |= GF_SM_AU_RAP;
-                break;
-        }
-        gf_list_add(new_au->commands, com);
-    }
-
-    data = NULL;
+	   and setting the RAP flag */
+	while (gf_list_count(commands)) {
+		GF_Command *com = gf_list_get(commands, 0);
+		gf_list_rem(commands, 0);
+		switch (com->tag) {
+		case GF_SG_SCENE_REPLACE:
+		case GF_SG_LSR_NEW_SCENE:
+			new_au->flags |= GF_SM_AU_RAP;
+			break;
+		}
+		gf_list_add(new_au->commands, com);
+	}
+
+	data = NULL;
 	size = 0;
 
-    switch(sc->objectType) {
+	switch(sc->objectType) {
 #ifndef GPAC_DISABLE_BIFS_ENC
-		case GPAC_OTI_SCENE_BIFS:
-		case GPAC_OTI_SCENE_BIFS_V2:
-			e = gf_bifs_encode_au(seng->bifsenc, ESID, new_au->commands, &data, &size);
-			break;
+	case GPAC_OTI_SCENE_BIFS:
+	case GPAC_OTI_SCENE_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:
-			e = gf_laser_encode_au(seng->lsrenc, ESID, new_au->commands, 0, &data, &size);
-			break;
+	case GPAC_OTI_SCENE_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);
-			break;
-		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("Cannot encode commands for Scene OTI %x\n", sc->objectType));
-			break;
-    }
-    callback(seng->calling_object, ESID, data, size, 0);
+	case GPAC_OTI_SCENE_DIMS:
+		e = gf_seng_encode_dims_au(seng, ESID, new_au->commands, &data, &size);
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("Cannot encode commands for Scene OTI %x\n", sc->objectType));
+		break;
+	}
+	callback(seng->calling_object, ESID, data, size, 0);
 	gf_free(data);
 	return e;
 }
@@ -799,7 +799,7 @@
 		sc->disable_aggregation = 0;
 	}
 
-	e = gf_sm_live_encode_scene_au(seng, callback, 0); 
+	e = gf_sm_live_encode_scene_au(seng, callback, 0);
 	if (e) goto exit;
 exit:
 	return e;
@@ -813,7 +813,7 @@
 		return GF_BAD_PARAM;
 	}
 	return gf_sm_live_encode_scene_au(seng, callback, 1);
-} 
+}
 
 GF_EXPORT
 void gf_seng_terminate(GF_SceneEngine *seng)
@@ -836,7 +836,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, char ** const config, u32 *config_len, u32 *streamType, u32 *objectType, u32 *timeScale)
 {
 	GF_StreamContext *sc = gf_list_get(seng->ctx->streams, idx);
 	if (!sc || !ESID || !config || !config_len) return GF_BAD_PARAM;
@@ -923,12 +923,12 @@
 	seng->sg = gf_sg_new();
 	gf_sg_set_node_callback(seng->sg, gf_seng_on_node_modified);
 	gf_sg_set_private(seng->sg, seng);
-    seng->dump_path = dump_path;
+	seng->dump_path = dump_path;
 	seng->ctx = gf_sm_new(seng->sg);
 	seng->owns_context = 1;
 	memset(&(seng->loader), 0, sizeof(GF_SceneLoader));
 	seng->loader.ctx = seng->ctx;
-    seng->loader.type = load_type;
+	seng->loader.type = load_type;
 	/*since we're encoding in BIFS we must get MPEG-4 nodes only*/
 	seng->loader.flags = GF_SM_LOAD_MPEG4_STRICT;
 	if (embed_resources) seng->loader.flags |= GF_SM_LOAD_EMBEDS_RES;
@@ -965,7 +965,7 @@
 	if (!seng) return NULL;
 
 	seng->calling_object = calling_object;
-    seng->dump_path = dump_path;
+	seng->dump_path = dump_path;
 	/*Step 1: create context and load input*/
 	seng->sg = ctx->scene_graph;
 	seng->ctx = ctx;
@@ -995,27 +995,27 @@
 	if (!seng) return NULL;
 
 	seng->calling_object = calling_object;
-    seng->dump_path = dump_path;
-    /*Step 1: create context and load input*/
+	seng->dump_path = dump_path;
+	/*Step 1: create context and load input*/
 	seng->sg = gf_sg_new();
 	seng->ctx = gf_sm_new(seng->sg);
 	seng->owns_context = 1;
 	memset(& seng->loader, 0, sizeof(GF_SceneLoader));
 	seng->loader.ctx = seng->ctx;
-    seng->loader.type = load_type;
+	seng->loader.type = load_type;
 	/*since we're encoding in BIFS we must get MPEG-4 nodes only*/
 	seng->loader.flags = GF_SM_LOAD_MPEG4_STRICT;
 
-    /* assign a loader type only if it was not requested (e.g. DIMS should not be overriden by SVG) */
-    if (!seng->loader.type) {
-        if (inputContext[0] == '<') {
-		    if (strstr(inputContext, "<svg ")) seng->loader.type = GF_SM_LOAD_SVG;
-		    else if (strstr(inputContext, "<saf ")) seng->loader.type = GF_SM_LOAD_XSR;
-		    else if (strstr(inputContext, "XMT-A") || strstr(inputContext, "X3D")) seng->loader.type = GF_SM_LOAD_XMTA;
-	    } else {
-		    seng->loader.type = GF_SM_LOAD_BT;
-	    }
-    }
+	/* assign a loader type only if it was not requested (e.g. DIMS should not be overriden by SVG) */
+	if (!seng->loader.type) {
+		if (inputContext[0] == '<') {
+			if (strstr(inputContext, "<svg ")) seng->loader.type = GF_SM_LOAD_SVG;
+			else if (strstr(inputContext, "<saf ")) seng->loader.type = GF_SM_LOAD_XSR;
+			else if (strstr(inputContext, "XMT-A") || strstr(inputContext, "X3D")) seng->loader.type = GF_SM_LOAD_XMTA;
+		} else {
+			seng->loader.type = GF_SM_LOAD_BT;
+		}
+	}
 	e = gf_sm_load_string(&seng->loader, inputContext, 0);
 
 	if (e) {
@@ -1050,7 +1050,7 @@
 GF_Err gf_seng_get_stream_carousel_info(GF_SceneEngine *seng, u16 ESID, u32 *carousel_period, u16 *aggregate_on_es_id)
 {
 	u32 i=0;
-    GF_StreamContext *sc;
+	GF_StreamContext *sc;
 
 	if (carousel_period) *carousel_period = (u32) -1;
 	if (aggregate_on_es_id) *aggregate_on_es_id = 0;
@@ -1062,14 +1062,14 @@
 			return GF_OK;
 		}
 	}
-    return GF_OK;
+	return GF_OK;
 }
 
 GF_EXPORT
 char *gf_seng_get_base64_iod(GF_SceneEngine *seng)
 {
 	u32 size, size64;
-    char *buffer, *buf64;
+	char *buffer, *buf64;
 	u32 i=0;
 	GF_StreamContext*sc = NULL;
 
@@ -1081,12 +1081,12 @@
 	}
 	if (!sc) return NULL;
 
-    size = 0;
-    gf_odf_desc_write((GF_Descriptor *) seng->ctx->root_od, &buffer, &size);
-    buf64 = gf_malloc(size*2);
-    size64 = gf_base64_encode( buffer, size, buf64, size*2);
-    buf64[size64] = 0;
-    gf_free(buffer);
+	size = 0;
+	gf_odf_desc_write((GF_Descriptor *) seng->ctx->root_od, &buffer, &size);
+	buf64 = gf_malloc(size*2);
+	size64 = gf_base64_encode( buffer, size, buf64, size*2);
+	buf64[size64] = 0;
+	gf_free(buffer);
 	return buf64;
 }

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/scene_manager.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/scene_manager.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -36,7 +36,7 @@
 GF_SceneManager *gf_sm_new(GF_SceneGraph *graph)
 {
 	GF_SceneManager *tmp;
-	
+
 	if (!graph) return NULL;
 	GF_SAFEALLOC(tmp, GF_SceneManager);
 	tmp->streams = gf_list_new();
@@ -57,12 +57,12 @@
 		/*if no ESID/OTI specified this is a base layer (default stream created by parsers)
 		if ESID/OTI specified this is a stream already setup
 		*/
-		if ( tmp->ESID==ES_ID ){
+		if ( tmp->ESID==ES_ID ) {
 			//tmp->objectType = objectType;
 			return tmp;
 		}
 	}
-	
+
 	GF_SAFEALLOC(tmp, GF_StreamContext);
 	tmp->AUs = gf_list_new();
 	tmp->ESID = ES_ID;
@@ -174,29 +174,29 @@
 {
 	u32 i;
 	GF_AUContext *tmp;
-    u64 tmp_timing;
-
-    tmp_timing = timing ? timing : (u64) (time_sec*1000);
-    if (stream->imp_exp_time >= tmp_timing) {
-	    /*look for existing AU*/
-	    i=0;
-	    while ((tmp = (GF_AUContext *)gf_list_enum(stream->AUs, &i))) {
-		    if (timing && (tmp->timing==timing)) return tmp;
-		    else if (time_sec && (tmp->timing_sec == time_sec)) return tmp;
-		    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->commands = gf_list_new();
-			    if (isRap) tmp->flags = GF_SM_AU_RAP;
-			    tmp->timing = timing;
-			    tmp->timing_sec = time_sec;
-			    tmp->owner = stream;
-			    gf_list_insert(stream->AUs, tmp, i-1);
-			    return tmp;
-		    }
-	    }
-    } 
+	u64 tmp_timing;
+
+	tmp_timing = timing ? timing : (u64) (time_sec*1000);
+	if (stream->imp_exp_time >= tmp_timing) {
+		/*look for existing AU*/
+		i=0;
+		while ((tmp = (GF_AUContext *)gf_list_enum(stream->AUs, &i))) {
+			if (timing && (tmp->timing==timing)) return tmp;
+			else if (time_sec && (tmp->timing_sec == time_sec)) return tmp;
+			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->commands = gf_list_new();
+				if (isRap) tmp->flags = GF_SM_AU_RAP;
+				tmp->timing = timing;
+				tmp->timing_sec = time_sec;
+				tmp->owner = stream;
+				gf_list_insert(stream->AUs, tmp, i-1);
+				return tmp;
+			}
+		}
+	}
 	GF_SAFEALLOC(tmp, GF_AUContext);
 	tmp->commands = gf_list_new();
 	if (isRap) tmp->flags = GF_SM_AU_RAP;
@@ -205,12 +205,13 @@
 	tmp->owner = stream;
 	if (stream->disable_aggregation) tmp->flags |= GF_SM_AU_NOT_AGGREGATED;
 	gf_list_add(stream->AUs, tmp);
-    stream->imp_exp_time = tmp_timing;
+	stream->imp_exp_time = tmp_timing;
 	return tmp;
 }
 
 static Bool node_in_commands_subtree(GF_Node *node, GF_List *commands)
 {
+#ifndef GPAC_DISABLE_VRML
 	u32 i, j, count, nb_fields;
 
 	count = gf_list_count(commands);
@@ -246,11 +247,13 @@
 			}
 		}
 	}
+#endif
 	return 0;
 }
 
 static u32 store_or_aggregate(GF_StreamContext *sc, GF_Command *com, GF_List *commands, Bool *has_modif)
 {
+#ifndef GPAC_DISABLE_VRML
 	u32 i, count, j, nb_fields;
 	GF_CommandField *field, *check_field;
 
@@ -276,7 +279,9 @@
 				/*we may aggregate an indexed insertion and a replace one*/
 				if (check_index) {
 					if (check->tag == GF_SG_INDEXED_REPLACE) {}
-					else if (check->tag == GF_SG_INDEXED_INSERT) { original_is_index = 1; }
+					else if (check->tag == GF_SG_INDEXED_INSERT) {
+						original_is_index = 1;
+					}
 					else {
 						break;
 					}
@@ -343,6 +348,7 @@
 	}
 	/*the command modifies another stream than associated current carousel stream, we have to store it.*/
 	if (has_modif) *has_modif=1;
+#endif
 	return 1;
 }
 
@@ -350,7 +356,7 @@
 {
 	u32 i, count;
 	count = gf_list_count(ctx->streams);
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		GF_StreamContext *sc = gf_list_get(ctx->streams, i);
 		if (sc->ESID==ESID) return sc;
 	}
@@ -371,19 +377,19 @@
 	e = GF_OK;
 
 #if DEBUG_RAP
-    com_count = 0;
+	com_count = 0;
 	stream_count = gf_list_count(ctx->streams);
-    for (i=0; i<stream_count; i++) {
+	for (i=0; i<stream_count; i++) {
 		GF_StreamContext *sc = (GF_StreamContext *)gf_list_get(ctx->streams, i);
 		if (sc->streamType == GF_STREAM_SCENE) {
-	        au_count = gf_list_count(sc->AUs);
-            for (j=0; j<au_count; j++) {
+			au_count = gf_list_count(sc->AUs);
+			for (j=0; j<au_count; j++) {
 				au = (GF_AUContext *)gf_list_get(sc->AUs, j);
-                com_count += gf_list_count(au->commands);
-            }
-        }
-    }
-    GF_LOG(GF_LOG_INFO, GF_LOG_SCENE, ("[SceneManager] Making RAP with %d commands\n", com_count));
+				com_count += gf_list_count(au->commands);
+			}
+		}
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_SCENE, ("[SceneManager] Making RAP with %d commands\n", com_count));
 #endif
 
 	stream_count = gf_list_count(ctx->streams);
@@ -418,7 +424,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->objectType == GPAC_OTI_SCENE_DIMS) base_stream_found = 1;
 
 			/*apply all commands - this will also apply the SceneReplace*/
 			while (gf_list_count(sc->AUs)) {
@@ -452,7 +458,7 @@
 					/*if stream doesn't carry a carousel or carries the base carousel (scene replace), always apply the command*/
 					if (base_stream_found || !sc->aggregate_on_esid) {
 						store = 0;
-					} 
+					}
 					/*otherwise, check wether the command should be kept in this stream as is, or can be aggregated on this stream*/
 					else {
 						switch (com->tag) {
@@ -469,14 +475,14 @@
 						case GF_SG_LSR_SAVE:
 						case GF_SG_LSR_SEND_EVENT:
 						case GF_SG_LSR_CLEAN:
-						/*todo check in which category to put these commands*/
+							/*todo check in which category to put these commands*/
 //						case GF_SG_LSR_ACTIVATE:
 //						case GF_SG_LSR_DEACTIVATE:
 							store = 1;
 							break;
-						/*other commands: 
+						/*other commands:
 							!!! we need to know if the target node of the command has been inserted in this stream !!!
-						
+
 						This is a tedious task, for now we will consider the following cases:
 							- locate a similar command in the stored list: remove the similar one and aggregate on stream
 							- by default all AUs are stored if the stream is in aggregate mode - we should fix that by checking insertion points:
@@ -526,8 +532,8 @@
 				case GPAC_OTI_SCENE_LASER:
 					com = gf_sg_command_new(ctx->scene_graph, GF_SG_LSR_NEW_SCENE);
 					break;
-                case GPAC_OTI_SCENE_DIMS:
-                    /* We do not create a new command, empty AU is enough in DIMS*/
+				case GPAC_OTI_SCENE_DIMS:
+				/* We do not create a new command, empty AU is enough in DIMS*/
 				default:
 					com = NULL;
 					break;
@@ -539,7 +545,7 @@
 					gf_list_del(com->new_proto_list);
 					com->new_proto_list = ctx->scene_graph->protos;
 					ctx->scene_graph->protos = NULL;
-					/*indicate the command is the aggregated scene graph, so that PROTOs and ROUTEs 
+					/*indicate the command is the aggregated scene graph, so that PROTOs and ROUTEs
 					are taken from the scenegraph when encoding*/
 					com->aggregated = 1;
 					gf_list_add(au->commands, com);
@@ -564,7 +570,7 @@
 
 #ifndef GPAC_DISABLE_LOADER_BT
 GF_Err gf_sm_load_init_bt(GF_SceneLoader *load);
-#endif 
+#endif
 
 #ifndef GPAC_DISABLE_LOADER_XMT
 GF_Err gf_sm_load_init_xmt(GF_SceneLoader *load);
@@ -614,25 +620,25 @@
 	GF_Err e = GF_NOT_SUPPORTED;
 	char *ext, szExt[50];
 	/*we need at least a scene graph*/
-	if (!load || (!load->ctx && !load->scene_graph) 
+	if (!load || (!load->ctx && !load->scene_graph)
 #ifndef GPAC_DISABLE_ISOM
-		|| (!load->fileName && !load->isom && !(load->flags & GF_SM_LOAD_FOR_PLAYBACK) )
+	        || (!load->fileName && !load->isom && !(load->flags & GF_SM_LOAD_FOR_PLAYBACK) )
 #endif
-		) return GF_BAD_PARAM;
+	   ) return GF_BAD_PARAM;
 
 	if (!load->type) {
 #ifndef GPAC_DISABLE_ISOM
 		if (load->isom) {
 			load->type = GF_SM_LOAD_MP4;
-		} else 
+		} else
 #endif
 		{
-			ext = strrchr(load->fileName, '.');
+			ext = (char *)strrchr(load->fileName, '.');
 			if (!ext) return GF_NOT_SUPPORTED;
 			if (!stricmp(ext, ".gz")) {
 				char *anext;
 				ext[0] = 0;
-				anext = strrchr(load->fileName, '.');
+				anext = (char *)strrchr(load->fileName, '.');
 				ext[0] = '.';
 				ext = anext;
 			}
@@ -669,7 +675,7 @@
 
 	switch (load->type) {
 #ifndef GPAC_DISABLE_LOADER_BT
-	case GF_SM_LOAD_BT: 
+	case GF_SM_LOAD_BT:
 	case GF_SM_LOAD_VRML:
 	case GF_SM_LOAD_X3DV:
 		return gf_sm_load_init_bt(load);
@@ -687,7 +693,7 @@
 	case GF_SM_LOAD_DIMS:
 		return gf_sm_load_init_svg(load);
 
-	case GF_SM_LOAD_XBL: 
+	case GF_SM_LOAD_XBL:
 		e = gf_sm_load_init_xbl(load);
 
 		load->process = gf_sm_load_run_xbl;;
@@ -696,7 +702,7 @@
 #endif
 
 #ifndef GPAC_DISABLE_SWF_IMPORT
-	case GF_SM_LOAD_SWF: 
+	case GF_SM_LOAD_SWF:
 		return gf_sm_load_init_swf(load);
 #endif
 
@@ -706,7 +712,7 @@
 #endif
 
 #ifndef GPAC_DISABLE_QTVR
-	case GF_SM_LOAD_QT: 
+	case GF_SM_LOAD_QT:
 		return gf_sm_load_init_qt(load);
 #endif
 
@@ -740,7 +746,7 @@
 {
 	u32 data_size = 0;
 	char *data = NULL;
-	char *buffer; 
+	char *buffer;
 	M_BitWrapper *bw = (M_BitWrapper *)node;
 
 	if (!bw->buffer.buffer) return;
@@ -769,11 +775,11 @@
 			base_64 = strstr(bw->buffer.buffer, ";base64") ? 1 : 0;
 			if (sep) buffer = sep+1;
 		}
-			
+
 		if (base_64) {
 			data_size = 2 * (u32) strlen(buffer);
 			data = (char*)gf_malloc(sizeof(char)*data_size);
-			if (data) 
+			if (data)
 				data_size = gf_base64_decode(buffer, (u32) strlen(buffer), data, data_size);
 		} else {
 			u32 i, c;

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/scene_stats.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/scene_stats.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -142,7 +142,7 @@
 
 	if (fracv) {
 		frac_res = 1;
-		while ((fracv << frac_res) & 0x0000FFFF) 
+		while ((fracv << frac_res) & 0x0000FFFF)
 			frac_res++;
 	} else {
 		frac_res = 0;
@@ -170,7 +170,7 @@
 	if (stat->min_2d.y > val->y) stat->min_2d.y = val->y;
 	StatFixed(stat, val->x, 0);
 	StatFixed(stat, val->y, 0);
-}	
+}
 
 static void StatSFVec2f(GF_SceneStatistics *stat, SFVec2f *val)
 {
@@ -179,7 +179,7 @@
 	if (stat->max_2d.y < val->y) stat->max_2d.y = val->y;
 	if (stat->min_2d.x > val->x) stat->min_2d.x = val->x;
 	if (stat->min_2d.y > val->y) stat->min_2d.y = val->y;
-}	
+}
 
 static void StatSFVec3f(GF_SceneStatistics *stat, SFVec3f *val)
 {
@@ -230,7 +230,7 @@
 			stat->count_2d ++;
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFVEC3F:
 	{
 		MFVec3f *mf3d = (MFVec3f *)field->far_ptr;
@@ -239,7 +239,7 @@
 			stat->count_3d ++;
 		}
 	}
-		break;
+	break;
 	}
 }
 
@@ -264,71 +264,71 @@
 
 	switch (field->fieldType) {
 	case SVG_PathData_datatype:
-		{
+	{
 #if USE_GF_PATH
-			SVG_PathData *d = (SVG_PathData *)field->far_ptr;
-			for (i=0; i<d->n_points; i++) {
-				StatSVGPoint(stat, &(d->points[i]));
-				stat->count_2d ++;
-			}		
+		SVG_PathData *d = (SVG_PathData *)field->far_ptr;
+		for (i=0; i<d->n_points; i++) {
+			StatSVGPoint(stat, &(d->points[i]));
+			stat->count_2d ++;
+		}
 #else
-			SVG_PathData *d = (SVG_PathData *)field->far_ptr;
-			for (i=0; i<gf_list_count(d->points); i++) {
-				SVG_Point *p = (SVG_Point *)gf_list_get(d->points, i);
-				StatSVGPoint(stat, (SFVec2f *)p);
-				stat->count_2d ++;
-			}
-#endif
+		SVG_PathData *d = (SVG_PathData *)field->far_ptr;
+		for (i=0; i<gf_list_count(d->points); i++) {
+			SVG_Point *p = (SVG_Point *)gf_list_get(d->points, i);
+			StatSVGPoint(stat, (SFVec2f *)p);
+			stat->count_2d ++;
 		}
-		break;
+#endif
+	}
+	break;
 	case SVG_ViewBox_datatype:
-		{
-			SVG_ViewBox *vB = (SVG_ViewBox *)field->far_ptr;
-			StatFixed(stat, vB->x, 0);
-			StatFixed(stat, vB->y, 0);
-			StatFixed(stat, vB->width, 0);
-			StatFixed(stat, vB->height, 0);
-		}
-		break;
+	{
+		SVG_ViewBox *vB = (SVG_ViewBox *)field->far_ptr;
+		StatFixed(stat, vB->x, 0);
+		StatFixed(stat, vB->y, 0);
+		StatFixed(stat, vB->width, 0);
+		StatFixed(stat, vB->height, 0);
+	}
+	break;
 	case SVG_Points_datatype:
 	case SVG_Coordinates_datatype:
-		{
-			GF_List *points = *((GF_List **)field->far_ptr);
-			for (i=0; i<gf_list_count(points); i++) {
-				SVG_Point *p = (SVG_Point *)gf_list_get(points, i);
-				StatSVGPoint(stat, (SFVec2f *)p);
-				stat->count_2d ++;
-			}
+	{
+		GF_List *points = *((GF_List **)field->far_ptr);
+		for (i=0; i<gf_list_count(points); i++) {
+			SVG_Point *p = (SVG_Point *)gf_list_get(points, i);
+			StatSVGPoint(stat, (SFVec2f *)p);
+			stat->count_2d ++;
 		}
-		break;
+	}
+	break;
 	case SVG_Transform_datatype:
-		{
-			GF_Matrix2D *mx = &((SVG_Transform *)field->far_ptr)->mat;
-			if (!gf_mx2d_is_identity(*mx) && !(!mx->m[0] && !mx->m[1] && !mx->m[3] && !mx->m[4])) {
-				StatFixed(stat, mx->m[0], 1);
-				StatFixed(stat, mx->m[1], 1);
-				StatFixed(stat, mx->m[3], 1);
-				StatFixed(stat, mx->m[4], 1);				
-				StatFixed(stat, mx->m[2], 0);
-				StatFixed(stat, mx->m[5], 0);
-			} 
+	{
+		GF_Matrix2D *mx = &((SVG_Transform *)field->far_ptr)->mat;
+		if (!gf_mx2d_is_identity(*mx) && !(!mx->m[0] && !mx->m[1] && !mx->m[3] && !mx->m[4])) {
+			StatFixed(stat, mx->m[0], 1);
+			StatFixed(stat, mx->m[1], 1);
+			StatFixed(stat, mx->m[3], 1);
+			StatFixed(stat, mx->m[4], 1);
+			StatFixed(stat, mx->m[2], 0);
+			StatFixed(stat, mx->m[5], 0);
 		}
-		break;
+	}
+	break;
 	case SVG_Motion_datatype:
-		{
-			GF_Matrix2D *mx = (GF_Matrix2D *)field->far_ptr;
-			if (!gf_mx2d_is_identity(*mx) && !(!mx->m[0] && !mx->m[1] && !mx->m[3] && !mx->m[4])) {
-				StatFixed(stat, mx->m[0], 1);
-				StatFixed(stat, mx->m[1], 1);
-				StatFixed(stat, mx->m[3], 1);
-				StatFixed(stat, mx->m[4], 1);				
-				StatFixed(stat, mx->m[2], 0);
-				StatFixed(stat, mx->m[5], 0);
-			} 
+	{
+		GF_Matrix2D *mx = (GF_Matrix2D *)field->far_ptr;
+		if (!gf_mx2d_is_identity(*mx) && !(!mx->m[0] && !mx->m[1] && !mx->m[3] && !mx->m[4])) {
+			StatFixed(stat, mx->m[0], 1);
+			StatFixed(stat, mx->m[1], 1);
+			StatFixed(stat, mx->m[3], 1);
+			StatFixed(stat, mx->m[4], 1);
+			StatFixed(stat, mx->m[2], 0);
+			StatFixed(stat, mx->m[5], 0);
 		}
-		break;
+	}
+	break;
 	case SVG_Length_datatype:
-	case SVG_Coordinate_datatype: 
+	case SVG_Coordinate_datatype:
 		StatFixed(stat, ((SVG_Number *)field->far_ptr)->value, 0);
 		break;
 	}
@@ -355,7 +355,7 @@
 }
 
 
-Bool StatIsUSE(GF_StatManager *st, GF_Node *n) 
+Bool StatIsUSE(GF_StatManager *st, GF_Node *n)
 {
 	u32 i;
 	GF_Node *ptr;
@@ -396,7 +396,7 @@
 			field.far_ptr = atts->data;
 			field.fieldType = atts->data_type;
 			field.fieldIndex = atts->tag;
-			field.name = NULL; 
+			field.name = NULL;
 			StatSVGAttribute(st->stats, &field);
 
 			atts = atts->next;
@@ -405,46 +405,46 @@
 			StatNodeGraph(st, list->node);
 			list = list->next;
 		}
-	} else 
+	} else
 #endif
-	if (n->sgprivate->tag == TAG_DOMText) {
-	} else if (n->sgprivate->tag == TAG_DOMFullNode) {
-	} 
+		if (n->sgprivate->tag == TAG_DOMText) {
+		} else if (n->sgprivate->tag == TAG_DOMFullNode) {
+		}
 #ifndef GPAC_DISABLE_VRML
-	else if (n->sgprivate->tag<= GF_NODE_RANGE_LAST_X3D) {
-		GF_Node *child;
-		GF_ChildNodeItem *list;
-		u32 i, count;
-		GF_FieldInfo clone_field;
-
-		count = gf_node_get_field_count(n);
-	
-		for (i=0; i<count; i++) {
-			gf_node_get_field(n, i, &field);
-			if (field.eventType==GF_SG_EVENT_IN) continue;
-			if (field.eventType==GF_SG_EVENT_OUT) continue;
-
-			switch (field.fieldType) {
-			case GF_SG_VRML_SFNODE:
-				child = *((GF_Node **)field.far_ptr);
-				StatNodeGraph(st, child);
-				break;
-			case GF_SG_VRML_MFNODE:
-				list = *((GF_ChildNodeItem **)field.far_ptr);
-				while (list) {
-					StatNodeGraph(st, list->node);
-					list = list->next;
-				}
-				break;
-			default:
-				gf_node_get_field(clone, i, &clone_field);
-				if (!gf_sg_vrml_field_equal(clone_field.far_ptr, field.far_ptr, field.fieldType)) {
-					StatField(st->stats, &field);
+		else if (n->sgprivate->tag<= GF_NODE_RANGE_LAST_X3D) {
+			GF_Node *child;
+			GF_ChildNodeItem *list;
+			u32 i, count;
+			GF_FieldInfo clone_field;
+
+			count = gf_node_get_field_count(n);
+
+			for (i=0; i<count; i++) {
+				gf_node_get_field(n, i, &field);
+				if (field.eventType==GF_SG_EVENT_IN) continue;
+				if (field.eventType==GF_SG_EVENT_OUT) continue;
+
+				switch (field.fieldType) {
+				case GF_SG_VRML_SFNODE:
+					child = *((GF_Node **)field.far_ptr);
+					StatNodeGraph(st, child);
+					break;
+				case GF_SG_VRML_MFNODE:
+					list = *((GF_ChildNodeItem **)field.far_ptr);
+					while (list) {
+						StatNodeGraph(st, list->node);
+						list = list->next;
+					}
+					break;
+				default:
+					gf_node_get_field(clone, i, &clone_field);
+					if (!gf_sg_vrml_field_equal(clone_field.far_ptr, field.far_ptr, field.fieldType)) {
+						StatField(st->stats, &field);
+					}
+					break;
 				}
-				break;
 			}
 		}
-	}
 #endif
 
 	gf_node_unregister(clone, NULL);
@@ -461,7 +461,7 @@
 	GF_Err e;
 	GF_ChildNodeItem *list;
 	GF_CommandField *inf = NULL;
-	if (gf_list_count(com->command_fields)) 
+	if (gf_list_count(com->command_fields))
 		inf = (GF_CommandField*)gf_list_get(com->command_fields, 0);
 
 	if (!com || !stat) return GF_BAD_PARAM;
@@ -574,7 +574,7 @@
 		while ((sc = (GF_StreamContext*)gf_list_enum(sm->streams, &i))) {
 			GF_AUContext *au;
 			if (sc->streamType != GF_STREAM_SCENE) continue;
-			
+
 			if (!stat->stats->base_layer)
 				stat->stats->base_layer = sc;

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/swf_bifs.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/swf_bifs.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/nodes_mpeg4.h>
@@ -586,7 +586,7 @@
 		gf_sg_vrml_mf_append(&dest->point, GF_SG_VRML_MFVEC2F, &ptr);
 		*((SFVec2f *)ptr) = pt;
 	}
-	
+
 	i = 0;
 	if (tomerge->type.vals[0] == 0) i=1;
 	pt_idx = 1;
@@ -669,7 +669,7 @@
 			c->point.vals = gf_realloc(c->point.vals, sizeof(SFVec2f)*c->point.count);
 			c->point.vals[j] = srec->path->pts[i];
 		}
-		srec->path->idx[i] = j; 
+		srec->path->idx[i] = j;
 	}
 }
 
@@ -690,10 +690,10 @@
 
 		/*empty shape - for fonts, not a mistake, that's likelly space char*/
 		if (!shape) {
-			if (!parent_font) 
+			if (!parent_font)
 				return GF_OK;
 			n = s2b_new_node(read, TAG_MPEG4_Shape);
-		} 
+		}
 		/*direct match, no top group*/
 		else if (last_sub_shape && (gf_list_count(shape->fill_left) + gf_list_count(shape->lines)<=1)) {
 			Bool is_fill = 1;
@@ -898,7 +898,7 @@
 			gf_free(str_w);
 
 			gl = (M_Shape *) s2b_new_node(read, TAG_MPEG4_Shape);
-			gl->appearance = s2b_get_appearance(read, (GF_Node *) gl, gr->col, 0, 0);				
+			gl->appearance = s2b_get_appearance(read, (GF_Node *) gl, gr->col, 0, 0);
 			gl->geometry = (GF_Node *) t;
 			gf_node_register(gl->geometry, (GF_Node *) gl);
 			gf_node_insert_child((GF_Node *) par, (GF_Node *)gl, -1);
@@ -1010,23 +1010,23 @@
 	gf_sg_vrml_mf_append(&f->justify, GF_SG_VRML_MFSTRING, (void**)&ptr);
 	switch (text->align) {
 	case 0:
-		((SFString*)ptr)->buffer = gf_strdup("BEGIN"); 
+		((SFString*)ptr)->buffer = gf_strdup("BEGIN");
 		break;
 	case 1:
-		((SFString*)ptr)->buffer = gf_strdup("END"); 
+		((SFString*)ptr)->buffer = gf_strdup("END");
 		break;
 	case 3:
-		((SFString*)ptr)->buffer = gf_strdup("JUSTIFY"); 
+		((SFString*)ptr)->buffer = gf_strdup("JUSTIFY");
 		break;
 	default:
-		((SFString*)ptr)->buffer = gf_strdup("MIDDLE"); 
+		((SFString*)ptr)->buffer = gf_strdup("MIDDLE");
 		break;
 	}
 
 	strcpy(styles, "");
 	if (!text->read_only) strcat(styles, "EDITABLE");
 	if (text->password) strcat(styles, "PASSWORD");
-	
+
 	if (f->style.buffer) gf_free(f->style.buffer);
 	f->style.buffer = gf_strdup(styles);
 
@@ -1055,25 +1055,25 @@
 
 
 	txt = (M_Shape *) s2b_new_node(read, TAG_MPEG4_Shape);
-	txt->appearance = s2b_get_appearance(read, (GF_Node *) txt, text->color, 0, 0);				
+	txt->appearance = s2b_get_appearance(read, (GF_Node *) txt, text->color, 0, 0);
 	txt->geometry = (GF_Node *) t;
 	gf_node_register(txt->geometry, (GF_Node *) txt);
 
-	if (layout) {		
+	if (layout) {
 		gf_sg_vrml_mf_reset(&layout->justify, GF_SG_VRML_MFSTRING);
 		gf_sg_vrml_mf_append(&layout->justify, GF_SG_VRML_MFSTRING, NULL);
 		switch (text->align) {
 		case 0:
-			layout->justify.vals[0] = gf_strdup("BEGIN"); 
+			layout->justify.vals[0] = gf_strdup("BEGIN");
 			break;
 		case 1:
-			layout->justify.vals[0] = gf_strdup("END"); 
+			layout->justify.vals[0] = gf_strdup("END");
 			break;
 		case 3:
-			layout->justify.vals[0] = gf_strdup("JUSTIFY"); 
+			layout->justify.vals[0] = gf_strdup("JUSTIFY");
 			break;
 		default:
-			layout->justify.vals[0] = gf_strdup("MIDDLE"); 
+			layout->justify.vals[0] = gf_strdup("MIDDLE");
 			break;
 		}
 		if (text->multiline || text->word_wrap) layout->wrap = 1;
@@ -1086,7 +1086,7 @@
 	} else {
 		gf_node_insert_child((GF_Node *) tr, (GF_Node *)txt, -1);
 		gf_node_register((GF_Node *) txt, (GF_Node *) tr);
-	} 
+	}
 	if (tr) {
 		char szDEF[1024];
 		u32 ID;
@@ -1109,7 +1109,7 @@
 	GF_Command *com;
 	GF_CommandField *f;
 	GF_Node *empty;
-	
+
 	return;
 
 	empty = gf_sg_find_node_by_name(read->load->scene_graph, "Shape0");
@@ -1163,7 +1163,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 = 1;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
 		esd->slConfig->timestampResolution = read->bifs_es->timeScale;
 		esd->ESID = 1;
 		gf_list_add(read->load->ctx->root_od->ESDescriptors, esd);
@@ -1185,7 +1185,7 @@
 	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 = 1;
+	esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
 	esd->slConfig->timestampResolution = read->od_es->timeScale = read->bifs_es->timeScale;
 	esd->ESID = 2;
 	esd->OCRESID = 1;
@@ -1253,7 +1253,7 @@
 	/*always depends on main scene*/
 	esd->dependsOnESID = 1;
 	esd->decoderConfig->streamType = GF_STREAM_SCENE;
-	esd->decoderConfig->objectTypeIndication = 1;
+	esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
 	esd->slConfig->timestampResolution = read->bifs_es->timeScale;
 	gf_odf_desc_del((GF_Descriptor *) esd->decoderConfig->decoderSpecificInfo);
 	esd->decoderConfig->decoderSpecificInfo = NULL;
@@ -1417,7 +1417,7 @@
 		/*if sprite always have the media active but controled by its mediaControl*/
 		if (read->current_sprite_id) {
 			((M_AudioClip*)n)->startTime = 0;
-		} 
+		}
 		/*otherwise start the media at the first soundstream block*/
 		else {
 			((M_AudioClip*)n)->startTime = snd->frame_delay_ms/1000.0;
@@ -1453,7 +1453,7 @@
 	GF_Node *n, *par;
 	GF_FieldInfo info;
 	char szDEF[100];
-	
+
 	e = swf_init_od(read, 0);
 	if (e) return e;
 
@@ -1587,7 +1587,7 @@
 	f->pos = pos;
 	f->fieldIndex = info.fieldIndex;
 
-	if (insert) 
+	if (insert)
 		gf_list_insert(dst, com, 0);
 	else
 		gf_list_add(dst, com);
@@ -1690,7 +1690,7 @@
 	f->pos = depth;
 	f->fieldIndex = 2;	/*children index*/
 	f->new_node = par;
-	gf_node_register(f->new_node, com->node);
+	gf_node_register(f->new_node, NULL);
 	gf_list_add(read->bifs_au->commands, com);
 
 	if (ID==prev_id) return GF_OK;
@@ -1735,7 +1735,7 @@
 	f->pos = depth;
 	f->fieldIndex = 2;	/*children index*/
 	f->new_node = gf_sg_find_node_by_name(read->load->scene_graph, "Shape0");
-	gf_node_register(f->new_node, com->node);
+	gf_node_register(f->new_node, NULL);
 	gf_list_add(read->bifs_au->commands, com);
 	/*check if this is a sprite*/
 	if (ID)
@@ -1773,7 +1773,7 @@
 	*/
 	is_rap = (read->current_sprite_id || (read->flags & GF_SM_SWF_SPLIT_TIMELINE)) ? 1 : 0;
 #else
-	/*"The contents of the second frame are the cumulative effect of performing all the control tag operations from 
+	/*"The contents of the second frame are the cumulative effect of performing all the control tag operations from
 	the beginning of the file to the second ShowFrame tag, and so on"
 	using RAP=0 forces reprocessing of previous frames when seeking/jumping*/
 	is_rap = 0;
@@ -1788,10 +1788,10 @@
 			read->bifs_dict_au = gf_sm_stream_au_new(read->bifs_dict_es, ts, 0, 0);
 		}
 		/*if wait_frame is specified, aggregate all dictionary commands until frame is reached*/
-		if (read->wait_frame && read->wait_frame<=read->current_frame) 
+		if (read->wait_frame && read->wait_frame<=read->current_frame)
 			read->wait_frame = 0;
 	}
-	
+
 	return GF_OK;
 }
 
@@ -1799,14 +1799,14 @@
 static GF_Node *s2b_button_add_child(SWFReader *read, GF_Node *button, u32 tag, char *def_name, s32 pos)
 {
 	GF_Node *n = s2b_new_node(read, tag);
-	
+
 	if (def_name) {
 		u32 ID;
 		read->load->ctx->max_node_id++;
 		ID = read->load->ctx->max_node_id;
 		gf_node_set_id((GF_Node *)n, ID, def_name);
 	}
-	
+
 	gf_node_insert_child((GF_Node *)button, (GF_Node *)n, pos);
 	gf_node_register((GF_Node *) n, (GF_Node *) button);
 	return n;
@@ -1850,7 +1850,7 @@
 	gf_node_set_id((GF_Node *)btn_root, ID, szName);
 
 	n = s2b_button_add_child(read, btn_root, TAG_MPEG4_ColorTransform, NULL, -1);
-	((M_ColorTransform*)n)->maa = ((M_ColorTransform*)n)->mab = ((M_ColorTransform*)n)->mar = ((M_ColorTransform*)n)->mag = ((M_ColorTransform*)n)->ta = 0; 
+	((M_ColorTransform*)n)->maa = ((M_ColorTransform*)n)->mab = ((M_ColorTransform*)n)->mar = ((M_ColorTransform*)n)->mag = ((M_ColorTransform*)n)->ta = 0;
 
 	/*locate hit buttons and add them to the color transform*/
 	for (i=0; i<btn->count; i++) {
@@ -1973,7 +1973,7 @@
 {
 	u32 i, count;
 
-	swf_bifs_end_of_clip(read);	
+	swf_bifs_end_of_clip(read);
 
 	while (gf_list_count(read->buttons)) {
 		S2BBtnRec *btnrec = gf_list_get(read->buttons, 0);
@@ -1982,7 +1982,7 @@
 	}
 
 	count = gf_list_count(read->fonts);
-	for (i=0;i<count; i++) {
+	for (i=0; i<count; i++) {
 		SWFFont *ft = (SWFFont *)gf_list_get(read->fonts, i);
 		while (gf_list_count(ft->glyphs)) {
 			GF_Node *gl = (GF_Node *)gf_list_get(ft->glyphs, 0);
@@ -2024,8 +2024,10 @@
 		break;
 	case GF_SWF_AS3_GET_URL:
 		n = gf_sg_find_node_by_name(read->load->scene_graph, "MOVIE_URL");
-		sfurl.OD_ID = 0; sfurl.url = act->url;
-		url.count = 1; url.vals = &sfurl;
+		sfurl.OD_ID = 0;
+		sfurl.url = act->url;
+		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;
@@ -2111,13 +2113,13 @@
 	gf_node_set_id(n, 1, "BACKGROUND");
 	gf_node_insert_child(read->root, n, -1);
 	gf_node_register(n, read->root);
-	
+
 	/*movie anchor*/
 	n = s2b_new_node(read, TAG_MPEG4_Anchor);
 	gf_node_set_id(n, 2, "MOVIE_URL");
 	gf_node_insert_child(read->root, n, -1);
 	gf_node_register(n, read->root);
-	
+
 	/*dictionary*/
 	n = s2b_new_node(read, TAG_MPEG4_Switch);
 	gf_node_set_id(n, 3, "DICTIONARY");
@@ -2163,7 +2165,7 @@
 		url->url = gf_strdup("urn:inet:gpac:builtin:IndexedCurve2D");
 
 		gf_sg_proto_field_new(proto, GF_SG_VRML_SFNODE, GF_SG_EVENT_EXPOSED_FIELD, "coord");
-		
+
 		pfield = gf_sg_proto_field_new(proto, GF_SG_VRML_SFFLOAT, GF_SG_EVENT_EXPOSED_FIELD, "fineness");
 		gf_sg_proto_field_get_field(pfield, &info);
 		*((SFFloat*)info.far_ptr) = FIX_ONE/2;
@@ -2172,7 +2174,7 @@
 		ftMin = 0;
 		ftMax = 15*FIX_ONE;
 		gf_bifs_proto_field_set_aq_info(pfield, 13, 1, GF_SG_VRML_SFINT32, &ftMin, &ftMax, 4);
-		
+
 		pfield = gf_sg_proto_field_new(proto, GF_SG_VRML_MFINT32, GF_SG_EVENT_EXPOSED_FIELD, "coordIndex");
 		ftMin = 0;
 		ftMax = FIX_MAX;
@@ -2201,7 +2203,7 @@
 	esd->ESID = esd->OCRESID = 3;
 	esd->dependsOnESID = 1;
 	esd->decoderConfig->streamType = GF_STREAM_SCENE;
-	esd->decoderConfig->objectTypeIndication = 1;
+	esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
 	esd->slConfig->timestampResolution = read->bifs_es->timeScale;
 	gf_odf_desc_del((GF_Descriptor *) esd->decoderConfig->decoderSpecificInfo);
 	esd->decoderConfig->decoderSpecificInfo = NULL;
@@ -2250,10 +2252,4 @@
 
 #endif /*GPAC_DISABLE_SWF_IMPORT*/
 
-#else
-GF_Err swf_to_bifs_init(SWFReader *read)
-{
-	return GF_NOT_SUPPORTED;
-}
-
 #endif /*GPAC_DISABLE_VRML*/

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/swf_parse.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/swf_parse.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -141,7 +141,7 @@
 	u32 i;
 	if (!nbBits)return 0;
 	r = -1 * (s32) swf_read_int(read, 1);
-	for (i=1; i<nbBits; i++){
+	for (i=1; i<nbBits; i++) {
 		r <<= 1;
 		r |= swf_read_int(read, 1);
 	}
@@ -178,9 +178,12 @@
 {
 	u32 val, res;
 	val = swf_read_int(read, 32);
-	res = (val&0xFF); res <<=8;
-	res |= ((val>>8)&0xFF); res<<=8;
-	res |= ((val>>16)&0xFF); res<<=8;
+	res = (val&0xFF);
+	res <<=8;
+	res |= ((val>>8)&0xFF);
+	res<<=8;
+	res |= ((val>>16)&0xFF);
+	res<<=8;
 	res|= ((val>>24)&0xFF);
 	return res;
 }
@@ -189,7 +192,8 @@
 {
 	u16 val, res;
 	val = swf_read_int(read, 16);
-	res = (val&0xFF); res <<=8;
+	res = (val&0xFF);
+	res <<=8;
 	res |= ((val>>8)&0xFF);
 	return res;
 }
@@ -200,7 +204,7 @@
 	u8 v1;
 	v1 = swf_read_int(read, 8);
 	val = swf_read_sint(read, 8);
-	val = (val<<8)&0xFF00; 
+	val = (val<<8)&0xFF00;
 	val |= (v1&0xFF);
 	return val;
 }
@@ -209,8 +213,10 @@
 {
 	u32 res;
 	res = 0xFF00;
-	res |= swf_read_int(read, 8); res<<=8;
-	res |= swf_read_int(read, 8); res<<=8;
+	res |= swf_read_int(read, 8);
+	res<<=8;
+	res |= swf_read_int(read, 8);
+	res<<=8;
 	res |= swf_read_int(read, 8);
 	return res;
 }
@@ -218,8 +224,10 @@
 static u32 swf_get_argb(SWFReader *read)
 {
 	u32 res, al;
-	res = swf_read_int(read, 8); res<<=8;
-	res |= swf_read_int(read, 8); res<<=8;
+	res = swf_read_int(read, 8);
+	res<<=8;
+	res |= swf_read_int(read, 8);
+	res<<=8;
 	res |= swf_read_int(read, 8);
 	al = swf_read_int(read, 8);
 	return ((al<<24) | res);
@@ -234,7 +242,7 @@
 	mat->m[0] = mat->m[4] = FIX_ONE;
 
 	bits_read = swf_align(read);
-	
+
 	flag = swf_read_int(read, 1);
 	bits_read += 1;
 	if (flag) {
@@ -300,14 +308,14 @@
 		cmat->m[19] = FLT2FIX( swf_read_sint(read, nbbits) * SWF_COLOR_SCALE );
 	}
 	cmat->identity = 0;
-	if ((cmat->m[0] == cmat->m[6]) 
-		&& (cmat->m[0] == cmat->m[12])
-		&& (cmat->m[0] == cmat->m[18])
-		&& (cmat->m[0] == FIX_ONE)
-		&& (cmat->m[4] == cmat->m[9])
-		&& (cmat->m[4] == cmat->m[14])
-		&& (cmat->m[4] == cmat->m[19])
-		&& (cmat->m[4] == 0))
+	if ((cmat->m[0] == cmat->m[6])
+	        && (cmat->m[0] == cmat->m[12])
+	        && (cmat->m[0] == cmat->m[18])
+	        && (cmat->m[0] == FIX_ONE)
+	        && (cmat->m[4] == cmat->m[9])
+	        && (cmat->m[4] == cmat->m[14])
+	        && (cmat->m[4] == cmat->m[19])
+	        && (cmat->m[4] == 0))
 		cmat->identity = 1;
 }
 
@@ -363,7 +371,7 @@
 {
 	u32 i, j, count;
 	SWFShapeRec *style;
-	
+
 	swf_align(read);
 
 	/*get fill styles*/
@@ -427,7 +435,7 @@
 				} else {
 					style->solid_col = 0xFF;
 				}
-			} 
+			}
 			/*bitmap fill*/
 			else if (style->type & 0x40) {
 				style->img_id = swf_get_16(read);
@@ -437,7 +445,7 @@
 					style->solid_col = 0xFF00FFFF;
 				}
 				swf_get_matrix(read, &style->mat);
-			} 
+			}
 			/*solid fill*/
 			else {
 				if (revision==2) style->solid_col = swf_get_argb(read);
@@ -643,7 +651,7 @@
 		j=i+1;
 		for (j=i+1; j < gf_list_count(paths); j++) {
 			np = (SWFPath*)gf_list_get(paths, j);
-	
+
 			/*check if any next subpath ends at the same place we're starting*/
 			if ((np->pts[np->nbPts-1].x == p->pts[0].x) && (np->pts[np->nbPts-1].y == p->pts[0].y)) {
 				u32 k;
@@ -794,15 +802,15 @@
 }
 
 /*
-	Notes on SWF->BIFS conversion - some ideas taken from libswfdec 
+	Notes on SWF->BIFS conversion - some ideas taken from libswfdec
 	A single fillStyle has 2 associated path, one used for left fill, one for right fill
 	This is then a 4 step process:
 	1- blindly parse swf shape, and add point/lines to the proper left/right path
 	2- for each fillStyles, revert the right path so that it becomes a left path
 	3- concatenate left and right paths
 	4- resort all subelements of the final path, making sure moveTo introduced by the SWF coding (due to style changes)
-	are removed. 
-		Ex: if path is 
+	are removed.
+		Ex: if path is
 			A->C, B->A, C->B = moveTo(A), lineTo(C), moveTo(B), lineTo (A), moveTo(C), lineTo(B)
 		we restort and remove unneeded moves to get
 			A->C->B = moveTo(A), lineTo(C), lineTo(B), lineTo(A)
@@ -922,7 +930,7 @@
 			if (set_fill0) fill0 = swf_read_int(read, bits_fill);
 			if (set_fill1) fill1 = swf_read_int(read, bits_fill);
 			if (set_strike) strike = swf_read_int(read, bits_line);
-			/*looks like newStyle does not append styles but define a new set - old styles can no 
+			/*looks like newStyle does not append styles but define a new set - old styles can no
 			longer be referenced*/
 			if (new_style) {
 				/*flush current shape record into BIFS*/
@@ -967,7 +975,7 @@
 				end.y = FLT2FIX( y * SWF_TWIP_SCALE );
 				/*curveTo*/
 				comType = 2;
-			} 
+			}
 			/*straight line*/
 			else {
 				nbBits = 2 + swf_read_int(read, 4);
@@ -1043,7 +1051,7 @@
 
 	memset(&tmp->mat, 0, sizeof(GF_Matrix2D));
 	tmp->mat.m[0] = tmp->mat.m[4] = FIX_ONE;
-	
+
 	memset(&tmp->cmat, 0, sizeof(GF_ColorMatrix));
 	tmp->cmat.m[0] = tmp->cmat.m[6] = tmp->cmat.m[12] = tmp->cmat.m[18] = FIX_ONE;
 	tmp->cmat.identity = 1;
@@ -1088,13 +1096,13 @@
 
 			switch (action_code) {
 			/* SWF 3 Action Model */
-			case 0x81: /* goto frame */ 
+			case 0x81: /* goto frame */
 				assert (length == 2);
 				act.type = GF_SWF_AS3_GOTO_FRAME;
 				act.frame_number = swf_get_16(read);
 				read->action(read, &act);
 				break;
-			case 0x83: /* get URL */ 
+			case 0x83: /* get URL */
 				act.type = GF_SWF_AS3_GET_URL;
 				act.url = swf_get_string(read);
 				act.target = swf_get_string(read);
@@ -1102,34 +1110,40 @@
 				gf_free(act.url);
 				gf_free(act.target);
 				break;
-			 /* next frame */ 
-			case 0x04: DO_ACT(GF_SWF_AS3_NEXT_FRAME)
-			/* previous frame */ 
-			case 0x05: DO_ACT(GF_SWF_AS3_PREV_FRAME)
-			/* play */ 
-			case 0x06: DO_ACT(GF_SWF_AS3_PLAY)
-			/* stop */ 
-			case 0x07: DO_ACT(GF_SWF_AS3_STOP)
-			/* toggle quality */ 
-			case 0x08: DO_ACT(GF_SWF_AS3_TOGGLE_QUALITY)
-			/* stop sounds*/ 
-			case 0x09: DO_ACT(GF_SWF_AS3_STOP_SOUNDS)
-			/* wait for frame */ 
-			case 0x8A: 
+			/* next frame */
+			case 0x04:
+				DO_ACT(GF_SWF_AS3_NEXT_FRAME)
+			/* previous frame */
+			case 0x05:
+				DO_ACT(GF_SWF_AS3_PREV_FRAME)
+			/* play */
+			case 0x06:
+				DO_ACT(GF_SWF_AS3_PLAY)
+			/* stop */
+			case 0x07:
+				DO_ACT(GF_SWF_AS3_STOP)
+			/* toggle quality */
+			case 0x08:
+				DO_ACT(GF_SWF_AS3_TOGGLE_QUALITY)
+			/* stop sounds*/
+			case 0x09:
+				DO_ACT(GF_SWF_AS3_STOP_SOUNDS)
+			/* wait for frame */
+			case 0x8A:
 				assert (length == 3);
 				act.type = GF_SWF_AS3_WAIT_FOR_FRAME;
 				act.frame_number = swf_get_16(read);
 				skip_actions = swf_read_int(read, 8);
 				if (read->action(read, &act)) skip_actions = 0;
 				break;
-			/* set target */ 
+			/* set target */
 			case 0x8B:
 				act.type = GF_SWF_AS3_SET_TARGET;
 				act.target = swf_get_string(read);
 				read->action(read, &act);
 				gf_free(act.target);
 				break;
-			/* goto label */ 
+			/* goto label */
 			case 0x8C:
 				act.type = GF_SWF_AS3_GOTO_LABEL;
 				act.target = swf_get_string(read);
@@ -1146,7 +1160,7 @@
 	}
 #undef DO_ACT
 
-	return GF_OK; 
+	return GF_OK;
 }
 
 static GF_Err swf_def_button(SWFReader *read, u32 revision)
@@ -1191,7 +1205,7 @@
 			has_actions = swf_get_16(read);
 			mask = 0;
 			for (i=0; i<8; i++) {
-				if (swf_read_int(read, 1)) 
+				if (swf_read_int(read, 1))
 					mask |= 1<<i;
 			}
 			key = swf_read_int(read, 7);
@@ -1230,7 +1244,7 @@
 	Bool had_depth;
 	/*SWF flags*/
 	Bool has_clip_actions, has_clip, has_name, has_ratio, has_cmat, has_mat, has_id, has_move;
-	
+
 	name = NULL;
 	clip_depth = 0;
 	ID = 0;
@@ -1350,11 +1364,11 @@
 
 	/*store in display list*/
 	ds = swf_get_depth_entry(read, depth, 1);
-	e = read->place_obj(read, depth, shape_id, ds->char_id, type, 
-						has_mat ? &mat : NULL, 
-						has_cmat ? &cmat : NULL,
-						swf_mat_is_identity(&ds->mat) ? NULL : &ds->mat,
-						ds->cmat.identity ? NULL : &ds->cmat);
+	e = read->place_obj(read, depth, shape_id, ds->char_id, type,
+	                    has_mat ? &mat : NULL,
+	                    has_cmat ? &cmat : NULL,
+	                    swf_mat_is_identity(&ds->mat) ? NULL : &ds->mat,
+	                    ds->cmat.identity ? NULL : &ds->cmat);
 
 	/*remember matrices*/
 	memcpy(&ds->mat, &mat, sizeof(GF_Matrix2D));
@@ -1410,7 +1424,7 @@
 		count = swf_get_16(read);
 		ft->nbGlyphs = count / 2;
 		offset_table = (u32*)gf_malloc(sizeof(u32) * ft->nbGlyphs);
-	    offset_table[0] = 0;
+		offset_table[0] = 0;
 		for (i=1; i<ft->nbGlyphs; i++) offset_table[i] = swf_get_16(read);
 
 		for (i=0; i<ft->nbGlyphs; i++) {
@@ -1449,7 +1463,7 @@
 				else offset_table[i] = swf_get_16(read);
 			}
 		}
-			
+
 		if (wide_offset) {
 			code_offset = swf_get_32(read);
 		} else {
@@ -1512,7 +1526,7 @@
 	SWFFont *ft;
 	Bool wide_chars;
 	u32 i, count;
-	
+
 	i = swf_get_16(read);
 	ft = swf_find_font(read, i);
 	if (!ft) {
@@ -1606,7 +1620,7 @@
 			has_col = swf_read_int(read, 1);
 			has_y_off = swf_read_int(read, 1);
 			has_x_off = swf_read_int(read, 1);
-			
+
 			/*end of rec*/
 			if (!has_font && !has_col && !has_y_off && !has_x_off) break;
 			if (has_font) fontID = swf_get_16(read);
@@ -1671,7 +1685,7 @@
 	/*reserved*/swf_read_int(read, 1);
 	txt.html = swf_read_int(read, 1);
 	txt.outlines = swf_read_int(read, 1);
-	
+
 	if (has_font) {
 		txt.fontID = swf_get_16(read);
 		txt.font_height = FLT2FIX( swf_get_16(read) * SWF_TWIP_SCALE );
@@ -1829,7 +1843,7 @@
 	u32 sync_flags;
 	u32 in_point, out_point;
 	u32 nb_loops;
-} SoundInfo; 
+} SoundInfo;
 
 static SoundInfo swf_skip_soundinfo(SWFReader *read)
 {
@@ -1898,7 +1912,7 @@
 		swf_report(read, GF_BAD_PARAM, "More than one sound stream for current timeline!!");
 		return swf_func_skip(read);
 	}
-	
+
 	GF_SAFEALLOC(snd, SWFSound);
 
 	/*rec_mix = */swf_read_int(read, 8);
@@ -1963,7 +1977,7 @@
 		/*error at setup*/
 		if (!read->sound_stream->output) {
 			read->sound_stream->output = gf_f64_open(read->sound_stream->szFileName, "wb");
-			if (!read->sound_stream->output) 
+			if (!read->sound_stream->output)
 				return swf_func_skip(read);
 		}
 		/*store TS of first AU*/
@@ -2029,7 +2043,7 @@
 	u32 skip = 0;
 	u32 AlphaPlaneSize = 0;
 	u32 size = read->size;
-	
+
 	ID = swf_get_16(read);
 	size -= 2;
 	if (version==3) {
@@ -2045,7 +2059,7 @@
 	} else {
 		sprintf(szName, "swf_jpeg_%d.jpg", ID);
 	}
-	
+
 	if (version!=3)
 		file = gf_f64_open(szName, "wb");
 
@@ -2063,10 +2077,10 @@
 	} else {
 		u32 i;
 		for (i=0; i<size; i++) {
-			if ((i+4<size) 
-				&& (buf[i]==0xFF) && (buf[i+1]==0xD9)
-				&& (buf[i+2]==0xFF) && (buf[i+3]==0xD8)
-			) {
+			if ((i+4<size)
+			        && (buf[i]==0xFF) && (buf[i+1]==0xD9)
+			        && (buf[i+2]==0xFF) && (buf[i+3]==0xD8)
+			   ) {
 				memmove(buf+i, buf+i+4, sizeof(char)*(size-i-4));
 				size -= 4;
 				break;
@@ -2122,11 +2136,11 @@
 		osize = w*h*4;
 		buf = gf_realloc(buf, sizeof(char)*osize);
 		gf_img_png_enc(raw, w, h, h*4, GF_PIXEL_RGBA, (char *)buf, &osize);
-		
+
 		file = gf_f64_open(szName, "wb");
 		gf_fwrite(buf, 1, osize, file);
 		fclose(file);
-		
+
 		gf_free(raw);
 #endif //GPAC_DISABLE_AV_PARSERS
 	}
@@ -2139,59 +2153,112 @@
 static const char *swf_get_tag_name(u32 tag)
 {
 	switch (tag) {
-	case SWF_END: return "End";
-	case SWF_SHOWFRAME: return "ShowFrame";
-	case SWF_DEFINESHAPE: return "DefineShape";
-	case SWF_FREECHARACTER: return "FreeCharacter";
-	case SWF_PLACEOBJECT: return "PlaceObject";
-	case SWF_REMOVEOBJECT: return "RemoveObject";
-	case SWF_DEFINEBITSJPEG: return "DefineBitsJPEG";
-	case SWF_DEFINEBUTTON: return "DefineButton";
-	case SWF_JPEGTABLES: return "JPEGTables";
-	case SWF_SETBACKGROUNDCOLOR: return "SetBackgroundColor";
-	case SWF_DEFINEFONT: return "DefineFont";
-	case SWF_DEFINETEXT: return "DefineText";
-	case SWF_DOACTION: return "DoAction";
-	case SWF_DEFINEFONTINFO: return "DefineFontInfo";
-	case SWF_DEFINESOUND: return "DefineSound";
-	case SWF_STARTSOUND: return "StartSound";
-	case SWF_DEFINEBUTTONSOUND: return "DefineButtonSound";
-	case SWF_SOUNDSTREAMHEAD: return "SoundStreamHead";
-	case SWF_SOUNDSTREAMBLOCK: return "SoundStreamBlock";
-	case SWF_DEFINEBITSLOSSLESS: return "DefineBitsLossless";
-	case SWF_DEFINEBITSJPEG2: return "DefineBitsJPEG2";
-	case SWF_DEFINESHAPE2: return "DefineShape2";
-	case SWF_DEFINEBUTTONCXFORM: return "DefineButtonCXForm";
-	case SWF_PROTECT: return "Protect";
-	case SWF_PLACEOBJECT2: return "PlaceObject2";
-	case SWF_REMOVEOBJECT2: return "RemoveObject2";
-	case SWF_DEFINESHAPE3: return "DefineShape3";
-	case SWF_DEFINETEXT2: return "DefineText2";
-	case SWF_DEFINEBUTTON2: return "DefineButton2";
-	case SWF_DEFINEBITSJPEG3: return "DefineBitsJPEG3";
-	case SWF_DEFINEBITSLOSSLESS2: return "DefineBitsLossless2";
-	case SWF_DEFINEEDITTEXT: return "DefineEditText";
-	case SWF_DEFINEMOVIE: return "DefineMovie";
-	case SWF_DEFINESPRITE: return "DefineSprite";
-	case SWF_NAMECHARACTER: return "NameCharacter";
-	case SWF_SERIALNUMBER: return "SerialNumber";
-	case SWF_GENERATORTEXT: return "GeneratorText";
-	case SWF_FRAMELABEL: return "FrameLabel";
-	case SWF_SOUNDSTREAMHEAD2: return "SoundStreamHead2";
-	case SWF_DEFINEMORPHSHAPE: return "DefineMorphShape";
-	case SWF_DEFINEFONT2: return "DefineFont2";
-	case SWF_TEMPLATECOMMAND: return "TemplateCommand";
-	case SWF_GENERATOR3: return "Generator3";
-	case SWF_EXTERNALFONT: return "ExternalFont";
-	case SWF_EXPORTASSETS: return "ExportAssets";
-	case SWF_IMPORTASSETS: return "ImportAssets";
-	case SWF_ENABLEDEBUGGER: return "EnableDebugger";
-	case SWF_MX0: return "MX0";
-	case SWF_MX1: return "MX1";
-	case SWF_MX2: return "MX2";
-	case SWF_MX3: return "MX3";
-	case SWF_MX4: return "MX4";
-	default: return "UnknownTag";
+	case SWF_END:
+		return "End";
+	case SWF_SHOWFRAME:
+		return "ShowFrame";
+	case SWF_DEFINESHAPE:
+		return "DefineShape";
+	case SWF_FREECHARACTER:
+		return "FreeCharacter";
+	case SWF_PLACEOBJECT:
+		return "PlaceObject";
+	case SWF_REMOVEOBJECT:
+		return "RemoveObject";
+	case SWF_DEFINEBITSJPEG:
+		return "DefineBitsJPEG";
+	case SWF_DEFINEBUTTON:
+		return "DefineButton";
+	case SWF_JPEGTABLES:
+		return "JPEGTables";
+	case SWF_SETBACKGROUNDCOLOR:
+		return "SetBackgroundColor";
+	case SWF_DEFINEFONT:
+		return "DefineFont";
+	case SWF_DEFINETEXT:
+		return "DefineText";
+	case SWF_DOACTION:
+		return "DoAction";
+	case SWF_DEFINEFONTINFO:
+		return "DefineFontInfo";
+	case SWF_DEFINESOUND:
+		return "DefineSound";
+	case SWF_STARTSOUND:
+		return "StartSound";
+	case SWF_DEFINEBUTTONSOUND:
+		return "DefineButtonSound";
+	case SWF_SOUNDSTREAMHEAD:
+		return "SoundStreamHead";
+	case SWF_SOUNDSTREAMBLOCK:
+		return "SoundStreamBlock";
+	case SWF_DEFINEBITSLOSSLESS:
+		return "DefineBitsLossless";
+	case SWF_DEFINEBITSJPEG2:
+		return "DefineBitsJPEG2";
+	case SWF_DEFINESHAPE2:
+		return "DefineShape2";
+	case SWF_DEFINEBUTTONCXFORM:
+		return "DefineButtonCXForm";
+	case SWF_PROTECT:
+		return "Protect";
+	case SWF_PLACEOBJECT2:
+		return "PlaceObject2";
+	case SWF_REMOVEOBJECT2:
+		return "RemoveObject2";
+	case SWF_DEFINESHAPE3:
+		return "DefineShape3";
+	case SWF_DEFINETEXT2:
+		return "DefineText2";
+	case SWF_DEFINEBUTTON2:
+		return "DefineButton2";
+	case SWF_DEFINEBITSJPEG3:
+		return "DefineBitsJPEG3";
+	case SWF_DEFINEBITSLOSSLESS2:
+		return "DefineBitsLossless2";
+	case SWF_DEFINEEDITTEXT:
+		return "DefineEditText";
+	case SWF_DEFINEMOVIE:
+		return "DefineMovie";
+	case SWF_DEFINESPRITE:
+		return "DefineSprite";
+	case SWF_NAMECHARACTER:
+		return "NameCharacter";
+	case SWF_SERIALNUMBER:
+		return "SerialNumber";
+	case SWF_GENERATORTEXT:
+		return "GeneratorText";
+	case SWF_FRAMELABEL:
+		return "FrameLabel";
+	case SWF_SOUNDSTREAMHEAD2:
+		return "SoundStreamHead2";
+	case SWF_DEFINEMORPHSHAPE:
+		return "DefineMorphShape";
+	case SWF_DEFINEFONT2:
+		return "DefineFont2";
+	case SWF_TEMPLATECOMMAND:
+		return "TemplateCommand";
+	case SWF_GENERATOR3:
+		return "Generator3";
+	case SWF_EXTERNALFONT:
+		return "ExternalFont";
+	case SWF_EXPORTASSETS:
+		return "ExportAssets";
+	case SWF_IMPORTASSETS:
+		return "ImportAssets";
+	case SWF_ENABLEDEBUGGER:
+		return "EnableDebugger";
+	case SWF_MX0:
+		return "MX0";
+	case SWF_MX1:
+		return "MX1";
+	case SWF_MX2:
+		return "MX2";
+	case SWF_MX3:
+		return "MX3";
+	case SWF_MX4:
+		return "MX4";
+	default:
+		return "UnknownTag";
 	}
 }
 
@@ -2204,50 +2271,78 @@
 static GF_Err swf_process_tag(SWFReader *read)
 {
 	switch (read->tag) {
-	case SWF_END: return GF_OK; 
-	case SWF_PROTECT: return GF_OK;
-	case SWF_SETBACKGROUNDCOLOR: return swf_set_backcol(read);
-	case SWF_DEFINESHAPE: return swf_parse_shape_def(read, NULL, 0);
-	case SWF_DEFINESHAPE2: return swf_parse_shape_def(read, NULL, 1);
-	case SWF_DEFINESHAPE3: return swf_parse_shape_def(read, NULL, 2);
-	case SWF_PLACEOBJECT: return swf_place_obj(read, 0);
-	case SWF_PLACEOBJECT2: return swf_place_obj(read, 1);
-	case SWF_REMOVEOBJECT: return swf_remove_obj(read, 0);
-	case SWF_REMOVEOBJECT2: return swf_remove_obj(read, 1);
-	case SWF_SHOWFRAME: return swf_show_frame(read);
-	case SWF_DEFINEFONT: return swf_def_font(read, 0);
-	case SWF_DEFINEFONT2: return swf_def_font(read, 1);
-	case SWF_DEFINEFONTINFO: return swf_def_font_info(read);
-	case SWF_DEFINETEXT: return swf_def_text(read, 0);
-	case SWF_DEFINETEXT2: return swf_def_text(read, 1);
-	case SWF_DEFINEEDITTEXT: return swf_def_edit_text(read);
-	case SWF_DEFINESPRITE: return swf_def_sprite(read);
+	case SWF_END:
+		return GF_OK;
+	case SWF_PROTECT:
+		return GF_OK;
+	case SWF_SETBACKGROUNDCOLOR:
+		return swf_set_backcol(read);
+	case SWF_DEFINESHAPE:
+		return swf_parse_shape_def(read, NULL, 0);
+	case SWF_DEFINESHAPE2:
+		return swf_parse_shape_def(read, NULL, 1);
+	case SWF_DEFINESHAPE3:
+		return swf_parse_shape_def(read, NULL, 2);
+	case SWF_PLACEOBJECT:
+		return swf_place_obj(read, 0);
+	case SWF_PLACEOBJECT2:
+		return swf_place_obj(read, 1);
+	case SWF_REMOVEOBJECT:
+		return swf_remove_obj(read, 0);
+	case SWF_REMOVEOBJECT2:
+		return swf_remove_obj(read, 1);
+	case SWF_SHOWFRAME:
+		return swf_show_frame(read);
+	case SWF_DEFINEFONT:
+		return swf_def_font(read, 0);
+	case SWF_DEFINEFONT2:
+		return swf_def_font(read, 1);
+	case SWF_DEFINEFONTINFO:
+		return swf_def_font_info(read);
+	case SWF_DEFINETEXT:
+		return swf_def_text(read, 0);
+	case SWF_DEFINETEXT2:
+		return swf_def_text(read, 1);
+	case SWF_DEFINEEDITTEXT:
+		return swf_def_edit_text(read);
+	case SWF_DEFINESPRITE:
+		return swf_def_sprite(read);
 	/*no revision needed*/
-	case SWF_SOUNDSTREAMHEAD: 
+	case SWF_SOUNDSTREAMHEAD:
 	case SWF_SOUNDSTREAMHEAD2:
 		return swf_soundstream_hdr(read);
-	case SWF_DEFINESOUND: return swf_def_sound(read);
-	case SWF_STARTSOUND: return swf_start_sound(read);
-	case SWF_SOUNDSTREAMBLOCK: return swf_soundstream_block(read);
-
-	case SWF_DEFINEBUTTON: return swf_def_button(read, 0);
-	case SWF_DEFINEBUTTON2: return swf_def_button(read, 1);
+	case SWF_DEFINESOUND:
+		return swf_def_sound(read);
+	case SWF_STARTSOUND:
+		return swf_start_sound(read);
+	case SWF_SOUNDSTREAMBLOCK:
+		return swf_soundstream_block(read);
+
+	case SWF_DEFINEBUTTON:
+		return swf_def_button(read, 0);
+	case SWF_DEFINEBUTTON2:
+		return swf_def_button(read, 1);
 //	case SWF_DEFINEBUTTONSOUND:
 	case SWF_DOACTION:
 		return swf_actions(read, 0, 0);
-	case SWF_FRAMELABEL: 
-		{
-			char *framelabel = swf_get_string(read);
-			gf_free(framelabel);
-			return GF_OK;
-		}
+	case SWF_FRAMELABEL:
+	{
+		char *framelabel = swf_get_string(read);
+		gf_free(framelabel);
+		return GF_OK;
+	}
 
-	case SWF_JPEGTABLES: return swf_def_hdr_jpeg(read);
-	case SWF_DEFINEBITSJPEG: return swf_def_bits_jpeg(read, 1);
-	case SWF_DEFINEBITSJPEG2: return swf_def_bits_jpeg(read, 2);
-	case SWF_DEFINEBITSJPEG3: return swf_def_bits_jpeg(read, 3);
+	case SWF_JPEGTABLES:
+		return swf_def_hdr_jpeg(read);
+	case SWF_DEFINEBITSJPEG:
+		return swf_def_bits_jpeg(read, 1);
+	case SWF_DEFINEBITSJPEG2:
+		return swf_def_bits_jpeg(read, 2);
+	case SWF_DEFINEBITSJPEG3:
+		return swf_def_bits_jpeg(read, 3);
 
-	default: return swf_unknown_tag(read);
+	default:
+		return swf_unknown_tag(read);
 	}
 }
 
@@ -2345,7 +2440,7 @@
 
 	if (e==GF_EOS) e = GF_OK;
 	if (!e) {
-		if (read->flat_limit != 0) 
+		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);
 
 		if (read->no_as && read->has_interact) swf_report(read, GF_OK, "ActionScripts and interactions have been removed");
@@ -2362,7 +2457,8 @@
 	gf_bs_del(read->bs);
 	if (read->mem) gf_free(read->mem);
 
-	read->finalize(read);
+	if (read->finalize)
+		read->finalize(read);
 
 	while (gf_list_count(read->display_list)) {
 		DispShape *s = (DispShape *)gf_list_get(read->display_list, 0);
@@ -2439,9 +2535,9 @@
 	return read;
 }
 
-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))
+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))
 {
 	if (!read) return GF_BAD_PARAM;
 	read->user = user;
@@ -2474,11 +2570,11 @@
 	swf_get_rec(read, &rc);
 	read->width = rc.w;
 	read->height = rc.h;
-	
+
 	swf_align(read);
 	read->frame_rate = swf_get_16(read)>>8;
 	read->frame_count = swf_get_16(read);
-	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("SWF Import - Scene Size %gx%g - %d frames @ %d FPS", read->width, read->height, read->frame_count, read->frame_rate));
+	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("SWF Import - Scene Size %gx%g - %d frames @ %d FPS\n", read->width, read->height, read->frame_count, read->frame_rate));
 	return GF_OK;
 }
 
@@ -2506,11 +2602,25 @@
 		read->no_as = 1;
 	}
 
-    if (!(load->swf_import_flags & GF_SM_SWF_USE_SVG)) {
-        e = swf_to_bifs_init(read);
-    } else {
-        e = swf_to_svg_init(read, read->flags, load->swf_flatten_limit);
-    }
+	if (!(load->swf_import_flags & GF_SM_SWF_USE_SVG)) {
+		e = swf_to_bifs_init(read);
+	} else {
+		char svgFileName[GF_MAX_PATH];
+		FILE *svgFile;
+		if (load->svgOutFile) {
+			if (load->localPath) {
+				sprintf(svgFileName, "%s%c%s.svg", load->localPath, GF_PATH_SEPARATOR, load->svgOutFile);
+			} else {
+				sprintf(svgFileName, "%s.svg", load->svgOutFile);
+			}
+			svgFile = gf_f64_open(svgFileName, "wt");
+			if (!svgFile) return GF_BAD_PARAM;
+		} 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);
+	}
 	if (e) goto exit;
 
 	/*parse all tags*/

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/swf_svg.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/swf_svg.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/utf.h>
@@ -38,9 +38,9 @@
 
 typedef struct _swf_svg_sample
 {
-    u64 start;
-    u64 end;
-    char *data;
+	u64 start;
+	u64 end;
+	char *data;
 } GF_SWF_SVG_Sample;
 
 static void swf_svg_print(SWFReader *read, const char *format, ...) {
@@ -70,18 +70,18 @@
 
 static void swf_svg_print_color(SWFReader *read, u32 ARGB)
 {
-    SFColor val;
-    val.red = INT2FIX((ARGB>>16)&0xFF) / 255*100;
-    val.green = INT2FIX((ARGB>>8)&0xFF) / 255*100;
-    val.blue = INT2FIX((ARGB)&0xFF) / 255*100;
-    swf_svg_print(read, "rgb(%g%%,%g%%,%g%%)", FIX2FLT(val.red), FIX2FLT(val.green), FIX2FLT(val.blue));
+	SFColor val;
+	val.red = INT2FIX((ARGB>>16)&0xFF) / 255*100;
+	val.green = INT2FIX((ARGB>>8)&0xFF) / 255*100;
+	val.blue = INT2FIX((ARGB)&0xFF) / 255*100;
+	swf_svg_print(read, "rgb(%g%%,%g%%,%g%%)", FIX2FLT(val.red), FIX2FLT(val.green), FIX2FLT(val.blue));
 }
 
 static void swf_svg_print_alpha(SWFReader *read, u32 ARGB)
 {
-    Fixed alpha;
-    alpha = INT2FIX((ARGB>>24)&0xFF)/255;
-    swf_svg_print(read, "%g", FIX2FLT(alpha));
+	Fixed alpha;
+	alpha = INT2FIX((ARGB>>24)&0xFF)/255;
+	swf_svg_print(read, "%g", FIX2FLT(alpha));
 }
 
 static void swg_svg_print_shape_record_to_fill_stroke(SWFReader *read, SWFShapeRec *srec, Bool is_fill)
@@ -91,253 +91,253 @@
 		switch (srec->type) {
 		/*solid/alpha fill*/
 		case 0x00:
-            swf_svg_print(read, "fill=\"");
-            swf_svg_print_color(read, srec->solid_col);
-            swf_svg_print(read, "\" ");
-            swf_svg_print(read, "fill-opacity=\"");
-            swf_svg_print_alpha(read, srec->solid_col);
-            swf_svg_print(read, "\" ");
+			swf_svg_print(read, "fill=\"");
+			swf_svg_print_color(read, srec->solid_col);
+			swf_svg_print(read, "\" ");
+			swf_svg_print(read, "fill-opacity=\"");
+			swf_svg_print_alpha(read, srec->solid_col);
+			swf_svg_print(read, "\" ");
 			break;
 		case 0x10:
 		case 0x12:
-			//if (read->flags & GF_SM_SWF_NO_GRADIENT) {
-			//	u32 col = srec->grad_col[srec->nbGrad/2];
-			//	col |= 0xFF000000;
-			//	n->appearance = s2b_get_appearance(read, (GF_Node *) n, col, 0, 0);
-			//} else {
-			//	n->appearance = s2b_get_gradient(read, (GF_Node *) n, shape, srec);
-			//}
-			//break;
+		//if (read->flags & GF_SM_SWF_NO_GRADIENT) {
+		//	u32 col = srec->grad_col[srec->nbGrad/2];
+		//	col |= 0xFF000000;
+		//	n->appearance = s2b_get_appearance(read, (GF_Node *) n, col, 0, 0);
+		//} else {
+		//	n->appearance = s2b_get_gradient(read, (GF_Node *) n, shape, srec);
+		//}
+		//break;
 		case 0x40:
 		case 0x41:
 		case 0x42:
 		case 0x43:
-			//n->appearance = s2b_get_bitmap(read, (GF_Node *) n, shape, srec);
-			//break;
+		//n->appearance = s2b_get_bitmap(read, (GF_Node *) n, shape, srec);
+		//break;
 		default:
 			swf_report(read, GF_NOT_SUPPORTED, "fill_style %x not supported", srec->type);
 			break;
 		}
 	} else {
-        swf_svg_print(read, "fill=\"none\" ");
-        swf_svg_print(read, "stroke=\"");
-        swf_svg_print_color(read, srec->solid_col);
-        swf_svg_print(read, "\" ");
-        swf_svg_print(read, "stroke-opacity=\"");
-        swf_svg_print_alpha(read, srec->solid_col);
-        swf_svg_print(read, "\" ");
-        swf_svg_print(read, "stroke-width=\"%g\" ", FIX2FLT(srec->width));
+		swf_svg_print(read, "fill=\"none\" ");
+		swf_svg_print(read, "stroke=\"");
+		swf_svg_print_color(read, srec->solid_col);
+		swf_svg_print(read, "\" ");
+		swf_svg_print(read, "stroke-opacity=\"");
+		swf_svg_print_alpha(read, srec->solid_col);
+		swf_svg_print(read, "\" ");
+		swf_svg_print(read, "stroke-width=\"%g\" ", FIX2FLT(srec->width));
 	}
 }
 
-static void swf_svg_print_shape_record_to_path_d(SWFReader *read, SWFShapeRec *srec) 
+static void swf_svg_print_shape_record_to_path_d(SWFReader *read, SWFShapeRec *srec)
 {
-    u32     pt_idx;
-    u32     i;
-
-    pt_idx = 0;
-    for (i=0; i<srec->path->nbType; i++) {
-        switch (srec->path->types[i]) {
-        /*moveTo*/
-        case 0:
-            swf_svg_print(read, "M%g,%g", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
-            pt_idx++;
-            break;
-        /*lineTo*/
-        case 1:
-            swf_svg_print(read, "L%g,%g", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
-            pt_idx++;
-            break;
-        /*curveTo*/
-        case 2:
-            swf_svg_print(read, "Q%g,%g", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
-            pt_idx++;
-            swf_svg_print(read, ",%g,%g", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
-            pt_idx++;
-            break;
-        }
-    }
+	u32     pt_idx;
+	u32     i;
+
+	pt_idx = 0;
+	for (i=0; i<srec->path->nbType; i++) {
+		switch (srec->path->types[i]) {
+		/*moveTo*/
+		case 0:
+			swf_svg_print(read, "M%g,%g", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
+			pt_idx++;
+			break;
+		/*lineTo*/
+		case 1:
+			swf_svg_print(read, "L%g,%g", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
+			pt_idx++;
+			break;
+		/*curveTo*/
+		case 2:
+			swf_svg_print(read, "Q%g,%g", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
+			pt_idx++;
+			swf_svg_print(read, ",%g,%g", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
+			pt_idx++;
+			break;
+		}
+	}
 }
 
 static void swf_svg_print_matrix(SWFReader *read, GF_Matrix2D *mat)
 {
-    if (!gf_mx2d_is_identity(*mat))
-    {
-        GF_Point2D  scale;
-        GF_Point2D  translate;
-        Fixed       rotate;
-        if( gf_mx2d_decompose(mat, &scale, &rotate, &translate)) 
-        {
-            swf_svg_print(read, "transform=\"");
-            if (translate.x != 0 || translate.y != 0)
-            {
-                swf_svg_print(read, "translate(%g, %g) ", FIX2FLT(translate.x), FIX2FLT(translate.y));
-            }
-            if (rotate != 0)
-            {
-                swf_svg_print(read, "rotate(%g) ", FIX2FLT(rotate));
-            }
-            if (scale.x != FIX_ONE || scale.y != FIX_ONE)
-            {
-                swf_svg_print(read, "scale(%g, %g) ", FIX2FLT(scale.x), FIX2FLT(scale.y));
-            }
-            swf_svg_print(read, "\" ");
-        } 
-        else 
-        {
-            swf_svg_print(read, "transform=\"matrix(%g,%g,%g,%g,%g,%g)\" ", FIX2FLT(mat->m[0]), FIX2FLT(mat->m[3]), FIX2FLT(mat->m[1]), FIX2FLT(mat->m[4]), FIX2FLT(mat->m[2]), FIX2FLT(mat->m[5]) );
-        }
-    }
+	if (!gf_mx2d_is_identity(*mat))
+	{
+		GF_Point2D  scale;
+		GF_Point2D  translate;
+		Fixed       rotate;
+		if( gf_mx2d_decompose(mat, &scale, &rotate, &translate))
+		{
+			swf_svg_print(read, "transform=\"");
+			if (translate.x != 0 || translate.y != 0)
+			{
+				swf_svg_print(read, "translate(%g, %g) ", FIX2FLT(translate.x), FIX2FLT(translate.y));
+			}
+			if (rotate != 0)
+			{
+				swf_svg_print(read, "rotate(%g) ", FIX2FLT(rotate));
+			}
+			if (scale.x != FIX_ONE || scale.y != FIX_ONE)
+			{
+				swf_svg_print(read, "scale(%g, %g) ", FIX2FLT(scale.x), FIX2FLT(scale.y));
+			}
+			swf_svg_print(read, "\" ");
+		}
+		else
+		{
+			swf_svg_print(read, "transform=\"matrix(%g,%g,%g,%g,%g,%g)\" ", FIX2FLT(mat->m[0]), FIX2FLT(mat->m[3]), FIX2FLT(mat->m[1]), FIX2FLT(mat->m[4]), FIX2FLT(mat->m[2]), FIX2FLT(mat->m[5]) );
+		}
+	}
 }
 
 /*translates Flash to SVG shapes*/
 static GF_Err swf_svg_define_shape(SWFReader *read, SWFShape *shape, SWFFont *parent_font, Bool last_sub_shape)
 {
-    u32 i;
-    SWFShapeRec *srec;
-
-    if (parent_font && (read->flags & GF_SM_SWF_NO_FONT)) 
-    {
-        return GF_OK;
-    }
-
-    if (!read->svg_shape_started) 
-    {
-        swf_svg_print(read, "<defs>\n");
-        if (!parent_font)
-        {
-            swf_svg_print(read, "<g id=\"S%d\" >\n", shape->ID);
-        }
-        else
-        {
-            char    szGlyphId[256];
-            sprintf(szGlyphId, "Font%d_Glyph%d", parent_font->fontID, gf_list_count(parent_font->glyphs));
-            swf_svg_print(read, "<g id=\"%s\" >\n", szGlyphId);
-            gf_list_add(parent_font->glyphs, szGlyphId);
-        }
-    }
+	u32 i;
+	SWFShapeRec *srec;
+
+	if (parent_font && (read->flags & GF_SM_SWF_NO_FONT))
+	{
+		return GF_OK;
+	}
+
+	if (!read->svg_shape_started)
+	{
+		swf_svg_print(read, "<defs>\n");
+		if (!parent_font)
+		{
+			swf_svg_print(read, "<g id=\"S%d\" >\n", shape->ID);
+		}
+		else
+		{
+			char    szGlyphId[256];
+			sprintf(szGlyphId, "Font%d_Glyph%d", parent_font->fontID, gf_list_count(parent_font->glyphs));
+			swf_svg_print(read, "<g id=\"%s\" >\n", szGlyphId);
+			gf_list_add(parent_font->glyphs, szGlyphId);
+		}
+	}
 	read->empty_frame = GF_FALSE;
-    read->svg_shape_started = GF_TRUE;
-
-    i=0;
-    while ((srec = (SWFShapeRec*)gf_list_enum(shape->fill_left, &i))) {
-        swf_svg_print(read, "<path d=\"");
-        swf_svg_print_shape_record_to_path_d(read, srec);
-        swf_svg_print(read, "\" ");
-        swg_svg_print_shape_record_to_fill_stroke(read, srec, 1);
-        swf_svg_print(read, "/>\n");
-    }
-    i=0;
-    while ((srec = (SWFShapeRec*)gf_list_enum(shape->lines, &i))) {
-        swf_svg_print(read, "<path d=\"");
-        swf_svg_print_shape_record_to_path_d(read, srec);
-        swf_svg_print(read, "\" ");
-        swg_svg_print_shape_record_to_fill_stroke(read, srec, 0);
-        swf_svg_print(read, "/>\n");
-    }
-
-    if (last_sub_shape) 
-    {
-        read->svg_shape_started = GF_FALSE;
-        swf_svg_print(read, "</g>\n");
-        swf_svg_print(read, "</defs>\n");
-    }
-    return GF_OK;
+	read->svg_shape_started = GF_TRUE;
+
+	i=0;
+	while ((srec = (SWFShapeRec*)gf_list_enum(shape->fill_left, &i))) {
+		swf_svg_print(read, "<path d=\"");
+		swf_svg_print_shape_record_to_path_d(read, srec);
+		swf_svg_print(read, "\" ");
+		swg_svg_print_shape_record_to_fill_stroke(read, srec, 1);
+		swf_svg_print(read, "/>\n");
+	}
+	i=0;
+	while ((srec = (SWFShapeRec*)gf_list_enum(shape->lines, &i))) {
+		swf_svg_print(read, "<path d=\"");
+		swf_svg_print_shape_record_to_path_d(read, srec);
+		swf_svg_print(read, "\" ");
+		swg_svg_print_shape_record_to_fill_stroke(read, srec, 0);
+		swf_svg_print(read, "/>\n");
+	}
+
+	if (last_sub_shape)
+	{
+		read->svg_shape_started = GF_FALSE;
+		swf_svg_print(read, "</g>\n");
+		swf_svg_print(read, "</defs>\n");
+	}
+	return GF_OK;
 }
 
 static GF_Err swf_svg_define_text(SWFReader *read, SWFText *text)
 {
-    Bool            use_text;
-    u32             i;
-    u32             j;
-    SWFGlyphRec     *gr;
-    SWFFont         *ft;
-
-    use_text = (read->flags & GF_SM_SWF_NO_FONT) ? 1 : 0;
-
-    swf_svg_print(read, "<defs>\n");
-    swf_svg_print(read, "<g id=\"S%d\" ", text->ID);
-    swf_svg_print_matrix(read, &text->mat);
-    swf_svg_print(read, ">\n");
-
-    i=0;
-    while ((gr = (SWFGlyphRec*)gf_list_enum(text->text, &i))) 
-    {
-        ft = NULL;
-        if (use_text) {
-            ft = swf_find_font(read, gr->fontID);
-            if (!ft->glyph_codes) {
-                use_text = 0;
-                swf_report(read, GF_BAD_PARAM, "Font glyphs are not defined, cannot reference extern font - Forcing glyph embedding");
-            }
-        }
-        if (use_text) {
-            /*restore back the font height in pixels (it's currently in SWF glyph design units)*/
-            swf_svg_print(read, "<text ");
-            swf_svg_print(read, "x=\"%g \" ", FIX2FLT(gr->orig_x));
-            swf_svg_print(read, "y=\"%g \" ", FIX2FLT(gr->orig_y));
-            swf_svg_print(read, "font-size=\"%d\" ", (u32)(gr->fontSize * SWF_TWIP_SCALE));
-            if (ft->fontName)
-            {
-                swf_svg_print(read, "font-family=\"%s\" ", ft->fontName);
-            }
-            if (ft->is_italic) 
-            {
-                swf_svg_print(read, "font-style=\"italic\" ");
-            }
-            if (ft->is_bold) 
-            {
-                swf_svg_print(read, "font-weight=\"bold\" ");
-            }
-            swf_svg_print(read, ">");
-            /*convert to UTF-8*/
-            {
+	Bool            use_text;
+	u32             i;
+	u32             j;
+	SWFGlyphRec     *gr;
+	SWFFont         *ft;
+
+	use_text = (read->flags & GF_SM_SWF_NO_FONT) ? 1 : 0;
+
+	swf_svg_print(read, "<defs>\n");
+	swf_svg_print(read, "<g id=\"S%d\" ", text->ID);
+	swf_svg_print_matrix(read, &text->mat);
+	swf_svg_print(read, ">\n");
+
+	i=0;
+	while ((gr = (SWFGlyphRec*)gf_list_enum(text->text, &i)))
+	{
+		ft = NULL;
+		if (use_text) {
+			ft = swf_find_font(read, gr->fontID);
+			if (!ft->glyph_codes) {
+				use_text = 0;
+				swf_report(read, GF_BAD_PARAM, "Font glyphs are not defined, cannot reference extern font - Forcing glyph embedding");
+			}
+		}
+		if (use_text) {
+			/*restore back the font height in pixels (it's currently in SWF glyph design units)*/
+			swf_svg_print(read, "<text ");
+			swf_svg_print(read, "x=\"%g \" ", FIX2FLT(gr->orig_x));
+			swf_svg_print(read, "y=\"%g \" ", FIX2FLT(gr->orig_y));
+			swf_svg_print(read, "font-size=\"%d\" ", (u32)(gr->fontSize * SWF_TWIP_SCALE));
+			if (ft->fontName)
+			{
+				swf_svg_print(read, "font-family=\"%s\" ", ft->fontName);
+			}
+			if (ft->is_italic)
+			{
+				swf_svg_print(read, "font-style=\"italic\" ");
+			}
+			if (ft->is_bold)
+			{
+				swf_svg_print(read, "font-weight=\"bold\" ");
+			}
+			swf_svg_print(read, ">");
+			/*convert to UTF-8*/
+			{
 				size_t _len;
-                u16     *str_w;
-                u16     *widestr;
-                char    *str;
-
-                str_w = (u16*)gf_malloc(sizeof(u16) * (gr->nbGlyphs+1));
-                for (j=0; j<gr->nbGlyphs; j++) 
-                {
-                    str_w[j] = ft->glyph_codes[gr->indexes[j]];
-                }
-                str_w[j] = 0;
-                str = (char*)gf_malloc(sizeof(char) * (gr->nbGlyphs+2));
-                widestr = str_w;
-                _len = gf_utf8_wcstombs(str, sizeof(u8) * (gr->nbGlyphs+1), (const unsigned short **) &widestr);
-                if (_len != (size_t) -1) {
-                    str[(u32) _len] = 0;
-                    swf_svg_print(read, "%s", str);
-                }
-            }
-            swf_svg_print(read, "</text>\n");
-        }
-        else
-        {
-            /*convert glyphs*/
-            Fixed       dx;
-            swf_svg_print(read, "<g tranform=\"scale(1,-1) ");
-            swf_svg_print(read, "translate(%g, %g)\" >\n", FIX2FLT(gr->orig_x), FIX2FLT(gr->orig_y));
-
-            dx = 0;
-            for (j=0; j<gr->nbGlyphs; j++) 
-            {
-                swf_svg_print(read, "<use xlink:href=\"#Font%d_Glyph%d\" transform=\"translate(%g)\" />\n", gr->fontID, gr->indexes[j], FIX2FLT(gf_divfix(dx, FLT2FIX(gr->fontSize * SWF_TEXT_SCALE))));
-                dx += gr->dx[j];
-            }
-            swf_svg_print(read, "</g>\n");
-        }
-    }
+				u16     *str_w;
+				u16     *widestr;
+				char    *str;
+
+				str_w = (u16*)gf_malloc(sizeof(u16) * (gr->nbGlyphs+1));
+				for (j=0; j<gr->nbGlyphs; j++)
+				{
+					str_w[j] = ft->glyph_codes[gr->indexes[j]];
+				}
+				str_w[j] = 0;
+				str = (char*)gf_malloc(sizeof(char) * (gr->nbGlyphs+2));
+				widestr = str_w;
+				_len = gf_utf8_wcstombs(str, sizeof(u8) * (gr->nbGlyphs+1), (const unsigned short **) &widestr);
+				if (_len != (size_t) -1) {
+					str[(u32) _len] = 0;
+					swf_svg_print(read, "%s", str);
+				}
+			}
+			swf_svg_print(read, "</text>\n");
+		}
+		else
+		{
+			/*convert glyphs*/
+			Fixed       dx;
+			swf_svg_print(read, "<g tranform=\"scale(1,-1) ");
+			swf_svg_print(read, "translate(%g, %g)\" >\n", FIX2FLT(gr->orig_x), FIX2FLT(gr->orig_y));
+
+			dx = 0;
+			for (j=0; j<gr->nbGlyphs; j++)
+			{
+				swf_svg_print(read, "<use xlink:href=\"#Font%d_Glyph%d\" transform=\"translate(%g)\" />\n", gr->fontID, gr->indexes[j], FIX2FLT(gf_divfix(dx, FLT2FIX(gr->fontSize * SWF_TEXT_SCALE))));
+				dx += gr->dx[j];
+			}
+			swf_svg_print(read, "</g>\n");
+		}
+	}
 	read->empty_frame = GF_FALSE;
-    swf_svg_print(read, "</g>\n");
-    swf_svg_print(read, "</defs>\n");
-    return GF_OK;
+	swf_svg_print(read, "</g>\n");
+	swf_svg_print(read, "</defs>\n");
+	return GF_OK;
 }
 
 static GF_Err swf_svg_define_edit_text(SWFReader *read, SWFEditText *text)
 {
-    return GF_OK;
+	return GF_OK;
 }
 
 #if 0
@@ -349,98 +349,98 @@
 
 static Bool swf_svg_allocate_depth(SWFReader *read, u32 depth)
 {
-    return GF_FALSE;
+	return GF_FALSE;
 }
 
 static GF_Err swf_svg_define_sprite(SWFReader *read, u32 nb_frames)
 {
-    return GF_OK;
+	return GF_OK;
 }
 
 static GF_Err swf_svg_setup_sound(SWFReader *read, SWFSound *snd, Bool soundstream_first_block)
 {
-    return GF_OK;
+	return GF_OK;
 }
 
 static GF_Err swf_svg_setup_image(SWFReader *read, u32 ID, char *fileName)
 {
-    swf_svg_print(read, "<defs>\n");
-    swf_svg_print(read, "<image id=\"S%d\" xlink:href=\"\"/>", ID, fileName);
-    swf_svg_print(read, "</defs>\n");
-    return GF_OK;
+	swf_svg_print(read, "<defs>\n");
+	swf_svg_print(read, "<image id=\"S%d\" xlink:href=\"\"/>", ID, fileName);
+	swf_svg_print(read, "</defs>\n");
+	return GF_OK;
 }
 
 static GF_Err swf_svg_set_backcol(SWFReader *read, u32 xrgb)
 {
 
-    //rgb.red = INT2FIX((xrgb>>16) & 0xFF) / 255;
-    //rgb.green = INT2FIX((xrgb>>8) & 0xFF) / 255;
-    //rgb.blue = INT2FIX((xrgb) & 0xFF) / 255;
-    return GF_OK;
+	//rgb.red = INT2FIX((xrgb>>16) & 0xFF) / 255;
+	//rgb.green = INT2FIX((xrgb>>8) & 0xFF) / 255;
+	//rgb.blue = INT2FIX((xrgb) & 0xFF) / 255;
+	return GF_OK;
 }
 
 static GF_Err swf_svg_start_sound(SWFReader *read, SWFSound *snd, Bool stop)
 {
-    return GF_OK;
+	return GF_OK;
 }
 
 static GF_Err swf_svg_place_obj(SWFReader *read, u32 depth, u32 ID, u32 prev_id, u32 type, GF_Matrix2D *mat, GF_ColorMatrix *cmat, GF_Matrix2D *prev_mat, GF_ColorMatrix *prev_cmat)
 {
 	read->empty_frame = GF_FALSE;
-    return GF_OK;
+	return GF_OK;
 }
 
 static GF_Err swf_svg_remove_obj(SWFReader *read, u32 depth, u32 ID)
 {
 	read->empty_frame = GF_FALSE;
-    return GF_OK;
+	return GF_OK;
 }
 
 static GF_Err swf_svg_show_frame(SWFReader *read)
 {
-    u32     i;
-    u32     len;
-    GF_List *sdl = gf_list_new(); // sorted display list
-
-    /* sorting the display list because SVG/CSS z-index is not well supported */
-    while (gf_list_count(read->display_list))
-    {
-        Bool        inserted = GF_FALSE;
-        DispShape   *s;
-
-        s = (DispShape *)gf_list_get(read->display_list, 0);
-        gf_list_rem(read->display_list, 0);
-        
-        for (i = 0; i < gf_list_count(sdl); i++)
-        {
-            DispShape *s2 = (DispShape *)gf_list_get(sdl, i);
-            if (s->depth < s2->depth) 
-            {
-                gf_list_insert(sdl, s, i);
-                inserted = GF_TRUE;
-                break;
-            }
-        }
-        if (!inserted)
-        {
-            gf_list_add(sdl, s);
-        }
-    }
-    gf_list_del(read->display_list);
-    read->display_list = sdl;
-
-    /* dumping the display list */
-    len = gf_list_count(read->display_list);
-    for (i=0; i<len; i++)
-    {
-        DispShape   *s;
-        s = (DispShape *)gf_list_get(read->display_list, i);
-        swf_svg_print(read, "<use xlink:href=\"#S%d\" ", s->char_id);
-        //swf_svg_print(read, "z-index=\"%d\" ", s->depth);
-        swf_svg_print_matrix(read, &s->mat);
-        swf_svg_print(read, "/>\n");
+	u32     i;
+	u32     len;
+	GF_List *sdl = gf_list_new(); // sorted display list
+
+	/* sorting the display list because SVG/CSS z-index is not well supported */
+	while (gf_list_count(read->display_list))
+	{
+		Bool        inserted = GF_FALSE;
+		DispShape   *s;
+
+		s = (DispShape *)gf_list_get(read->display_list, 0);
+		gf_list_rem(read->display_list, 0);
+
+		for (i = 0; i < gf_list_count(sdl); i++)
+		{
+			DispShape *s2 = (DispShape *)gf_list_get(sdl, i);
+			if (s->depth < s2->depth)
+			{
+				gf_list_insert(sdl, s, i);
+				inserted = GF_TRUE;
+				break;
+			}
+		}
+		if (!inserted)
+		{
+			gf_list_add(sdl, s);
+		}
+	}
+	gf_list_del(read->display_list);
+	read->display_list = sdl;
+
+	/* dumping the display list */
+	len = gf_list_count(read->display_list);
+	for (i=0; i<len; i++)
+	{
+		DispShape   *s;
+		s = (DispShape *)gf_list_get(read->display_list, i);
+		swf_svg_print(read, "<use xlink:href=\"#S%d\" ", s->char_id);
+		//swf_svg_print(read, "z-index=\"%d\" ", s->depth);
+		swf_svg_print_matrix(read, &s->mat);
+		swf_svg_print(read, "/>\n");
 		read->empty_frame = GF_FALSE;
-    }
+	}
 	if (!read->empty_frame) {
 		read->print_frame_header = GF_TRUE;
 		read->frame_header_offset = 0;
@@ -463,43 +463,48 @@
 	read->svg_data_size = 0;
 
 	read->empty_frame = GF_TRUE;
-    return GF_OK;
+	return GF_OK;
 }
 
 static void swf_svg_finalize(SWFReader *read)
 {
+	swf_svg_print(read, "</svg>\n");
+	read->add_header(read->user, read->svg_data, read->svg_data_size, GF_FALSE);
+	gf_free(read->svg_data);
+	read->svg_data = NULL;
+	read->svg_data_size = 0;
 }
 
 static GF_Err swf_svg_define_button(SWFReader *read, SWF_Button *btn)
 {
-    return GF_OK;
+	return GF_OK;
 }
 
-Bool swf_svg_action(SWFReader *read, SWFAction *act)
+static Bool swf_svg_action(SWFReader *read, SWFAction *act)
 {
-    return GF_TRUE;
+	return GF_TRUE;
 }
 
 GF_Err swf_to_svg_init(SWFReader *read, u32 swf_flags, Float swf_flatten_angle)
 {
 	if (!read->user) return GF_BAD_PARAM;
 
-    /*init callbacks*/
-    read->show_frame = swf_svg_show_frame;
-    read->allocate_depth = swf_svg_allocate_depth;
-    read->place_obj = swf_svg_place_obj;
-    read->remove_obj = swf_svg_remove_obj;
-    read->define_shape = swf_svg_define_shape;
-    read->define_sprite = swf_svg_define_sprite;
-    read->set_backcol = swf_svg_set_backcol;
-    read->define_button = swf_svg_define_button;
-    read->define_text = swf_svg_define_text;
-    read->define_edit_text = swf_svg_define_edit_text;
-    read->setup_sound = swf_svg_setup_sound;
-    read->start_sound = swf_svg_start_sound;
-    read->setup_image = swf_svg_setup_image;
-    read->action = swf_svg_action;
-    read->finalize = swf_svg_finalize;
+	/*init callbacks*/
+	read->show_frame = swf_svg_show_frame;
+	read->allocate_depth = swf_svg_allocate_depth;
+	read->place_obj = swf_svg_place_obj;
+	read->remove_obj = swf_svg_remove_obj;
+	read->define_shape = swf_svg_define_shape;
+	read->define_sprite = swf_svg_define_sprite;
+	read->set_backcol = swf_svg_set_backcol;
+	read->define_button = swf_svg_define_button;
+	read->define_text = swf_svg_define_text;
+	read->define_edit_text = swf_svg_define_edit_text;
+	read->setup_sound = swf_svg_setup_sound;
+	read->start_sound = swf_svg_start_sound;
+	read->setup_image = swf_svg_setup_image;
+	read->action = swf_svg_action;
+	read->finalize = swf_svg_finalize;
 
 	read->flags = swf_flags;
 	read->flat_limit = FLT2FIX(swf_flatten_angle);
@@ -516,7 +521,7 @@
 	read->print_stream_header = GF_FALSE;
 
 	/* update sample description */
-	read->add_header(read->user, read->svg_data, read->svg_data_size);
+	read->add_header(read->user, read->svg_data, read->svg_data_size, GF_TRUE);
 	gf_free(read->svg_data);
 	read->svg_data = NULL;
 	read->svg_data_size = 0;
@@ -524,12 +529,31 @@
 	return GF_OK;
 }
 
-#endif /*GPAC_DISABLE_SWF_IMPORT*/
+GF_Err swf_svg_write_text_sample(void *user, const char *data, u32 length, u64 timestamp, Bool isRap)
+{
+	FILE *svgFile = (FILE *)user;
+	u32  lengthWritten;
 
-#else
-GF_Err swf_to_svg_init(SWFReader *read, u32 swf_flags, Float swf_flatten_angle)
+	lengthWritten = (u32)fwrite(data, 1, length, svgFile);
+	if (length != lengthWritten) {
+		return GF_BAD_PARAM;
+	} else {
+		return GF_OK;
+	}
+}
+
+GF_Err swf_svg_write_text_header(void *user, const char *data, u32 length, Bool isHeader)
 {
-    return GF_NOT_SUPPORTED;
+	FILE *svgFile = (FILE *)user;
+	u32  lengthWritten;
+
+	lengthWritten = (u32)fwrite(data, 1, length, svgFile);
+	if (length != lengthWritten) {
+		return GF_BAD_PARAM;
+	} else {
+		return GF_OK;
+	}
 }
+#endif /*GPAC_DISABLE_SWF_IMPORT*/
 
 #endif /*GPAC_DISABLE_VRML*/

gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/text_to_bifs.c -> gpac-0.5.1.svn5491.tar.xz/src/scene_manager/text_to_bifs.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -47,7 +47,7 @@
 		if (strchr(__sep, __str[_len])) __str[_len] = 0;	\
 		else break;	\
 	}	\
-
+ 
 
 static GF_Err gf_text_guess_format(char *filename, u32 *fmt)
 {
@@ -72,7 +72,7 @@
 		if (!strnicmp(ext, ".ttxt", 5)) *fmt = GF_TEXT_IMPORT_TTXT;
 		ext = strstr(szLine, "?>");
 		if (ext) ext += 2;
-		if (!ext[0]){
+		if (!ext[0]) {
 			if (!fgets(szLine, 2048, test))
 				szLine[0] = '\0';
 		}
@@ -155,7 +155,7 @@
 	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 = 1;
+	src->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
 
 	e = GF_OK;
 	state = end = 0;
@@ -170,55 +170,55 @@
 
 		if (sOK) REM_TRAIL_MARKS(szLine, "\r\n\t ")
 
-		if (!sOK || !strlen(szLine)) {
-			state = 0;
-			if (au) {
-				/*if italic or underscore do it*/
-				if (font && (italic || underlined || bold)) {
-					com = gf_sg_command_new(ctx->scene_graph, GF_SG_FIELD_REPLACE);
-					com->node = font;
-					gf_node_register(font, NULL);
-					inf = gf_sg_command_field_new(com);
-					inf->fieldIndex = style.fieldIndex;
-					inf->fieldType = style.fieldType;
-					inf->field_ptr = gf_sg_vrml_field_pointer_new(style.fieldType);
-					sfstr = (SFString *)inf->field_ptr;
-					if (bold && italic && underlined) sfstr->buffer = gf_strdup("BOLDITALIC UNDERLINED");
-					else if (italic && underlined) sfstr->buffer = gf_strdup("ITALIC UNDERLINED");
-					else if (bold && underlined) sfstr->buffer = gf_strdup("BOLD UNDERLINED");
-					else if (underlined) sfstr->buffer = gf_strdup("UNDERLINED");
-					else if (bold && italic) sfstr->buffer = gf_strdup("BOLDITALIC");
-					else if (bold) sfstr->buffer = gf_strdup("BOLD");
-					else sfstr->buffer = gf_strdup("ITALIC");
-					gf_list_add(au->commands, com);
-				}
+			if (!sOK || !strlen(szLine)) {
+				state = 0;
+				if (au) {
+					/*if italic or underscore do it*/
+					if (font && (italic || underlined || bold)) {
+						com = gf_sg_command_new(ctx->scene_graph, GF_SG_FIELD_REPLACE);
+						com->node = font;
+						gf_node_register(font, NULL);
+						inf = gf_sg_command_field_new(com);
+						inf->fieldIndex = style.fieldIndex;
+						inf->fieldType = style.fieldType;
+						inf->field_ptr = gf_sg_vrml_field_pointer_new(style.fieldType);
+						sfstr = (SFString *)inf->field_ptr;
+						if (bold && italic && underlined) sfstr->buffer = gf_strdup("BOLDITALIC UNDERLINED");
+						else if (italic && underlined) sfstr->buffer = gf_strdup("ITALIC UNDERLINED");
+						else if (bold && underlined) sfstr->buffer = gf_strdup("BOLD UNDERLINED");
+						else if (underlined) sfstr->buffer = gf_strdup("UNDERLINED");
+						else if (bold && italic) sfstr->buffer = gf_strdup("BOLDITALIC");
+						else if (bold) sfstr->buffer = gf_strdup("BOLD");
+						else sfstr->buffer = gf_strdup("ITALIC");
+						gf_list_add(au->commands, com);
+					}
 
-				au = gf_sm_stream_au_new(srt, end, 0, 1);
-				com = gf_sg_command_new(ctx->scene_graph, GF_SG_FIELD_REPLACE);
-				com->node = text;
-				gf_node_register(text, NULL);
-				inf = gf_sg_command_field_new(com);
-				inf->fieldIndex = string.fieldIndex;
-				inf->fieldType = string.fieldType;
-				inf->field_ptr = gf_sg_vrml_field_pointer_new(string.fieldType);
-				gf_list_add(au->commands, com);
-				/*reset font styles so that all AUs are true random access*/
-				if (font) {
+					au = gf_sm_stream_au_new(srt, end, 0, 1);
 					com = gf_sg_command_new(ctx->scene_graph, GF_SG_FIELD_REPLACE);
-					com->node = font;
-					gf_node_register(font, NULL);
+					com->node = text;
+					gf_node_register(text, NULL);
 					inf = gf_sg_command_field_new(com);
-					inf->fieldIndex = style.fieldIndex;
-					inf->fieldType = style.fieldType;
-					inf->field_ptr = gf_sg_vrml_field_pointer_new(style.fieldType);
+					inf->fieldIndex = string.fieldIndex;
+					inf->fieldType = string.fieldType;
+					inf->field_ptr = gf_sg_vrml_field_pointer_new(string.fieldType);
 					gf_list_add(au->commands, com);
+					/*reset font styles so that all AUs are true random access*/
+					if (font) {
+						com = gf_sg_command_new(ctx->scene_graph, GF_SG_FIELD_REPLACE);
+						com->node = font;
+						gf_node_register(font, NULL);
+						inf = gf_sg_command_field_new(com);
+						inf->fieldIndex = style.fieldIndex;
+						inf->fieldType = style.fieldType;
+						inf->field_ptr = gf_sg_vrml_field_pointer_new(style.fieldType);
+						gf_list_add(au->commands, com);
+					}
+					au = NULL;
 				}
-				au = NULL;
+				inf = NULL;
+				if (!sOK) break;
+				continue;
 			}
-			inf = NULL;
-			if (!sOK) break;
-			continue;
-		}
 
 		switch (state) {
 		case 0:
@@ -262,7 +262,7 @@
 
 			au = gf_sm_stream_au_new(srt, start, 0, 1);
 			com = NULL;
-			state = 2;			
+			state = 2;
 			italic = underlined = bold = 0;
 			break;
 
@@ -311,7 +311,7 @@
 						szText[len] = 0xc0 | ( (ptr[i] >> 6) & 0x3 );
 						len++;
 						ptr[i] &= 0xbf;
-					} 
+					}
 					/*we only handle UTF8 chars on 2 bytes (eg first byte is 0b110xxxxx)*/
 					else if ((ptr[i] & 0xe0) == 0xc0) {
 						szText[len] = ptr[i];
@@ -408,7 +408,7 @@
 	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 = 1;
+	src->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
 
 	e = GF_OK;
 	start = end = 0;
@@ -424,7 +424,7 @@
 		REM_TRAIL_MARKS(szLine, "\r\n\t ")
 
 		line++;
-		len = (u32) strlen(szLine); 
+		len = (u32) strlen(szLine);
 		if (!len) continue;
 
 		i=0;
@@ -433,7 +433,10 @@
 			e = GF_NON_COMPLIANT_BITSTREAM;
 			break;
 		}
-		while (szLine[i+1] && szLine[i+1]!='}') { szTime[i] = szLine[i+1]; i++; }
+		while (szLine[i+1] && szLine[i+1]!='}') {
+			szTime[i] = szLine[i+1];
+			i++;
+		}
 		szTime[i] = 0;
 		start = atoi(szTime);
 		if (start<end) {
@@ -447,7 +450,10 @@
 			e = GF_NON_COMPLIANT_BITSTREAM;
 			break;
 		}
-		while (szLine[i+1+j] && szLine[i+1+j]!='}') { szTime[i] = szLine[i+1+j]; i++; }
+		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;

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/base_scenegraph.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/base_scenegraph.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -125,7 +125,7 @@
 
 GF_EXPORT
 void gf_sg_del(GF_SceneGraph *sg)
-{	
+{
 	if (!sg) return;
 
 #ifndef GPAC_DISABLE_VRML
@@ -208,7 +208,7 @@
 			while (list) {
 				if (list->node->sgprivate->scenegraph==sg) {
 					gf_node_unregister(list->node, node);
-				
+
 					if (prev) prev->next = list->next;
 					else *(GF_ChildNodeItem **) info.far_ptr = list->next;
 					cur = list;
@@ -251,7 +251,7 @@
 							while (list) {
 								if (list->node->sgprivate->scenegraph==sg) {
 									gf_node_unregister(list->node, node);
-								
+
 									if (prev) prev->next = list->next;
 									else f->node_list = list->next;
 									cur = list;
@@ -381,11 +381,11 @@
 	while (reg_node) {
 		Bool ignore = 0;
 		GF_Node *node = reg_node->node;
-		if (!node 
+		if (!node
 #ifndef GPAC_DISABLE_VRML
-			|| (node==sg->global_qp) 
+		        || (node==sg->global_qp)
 #endif
-		) {
+		   ) {
 			reg_node = reg_node->next;
 			continue;
 		}
@@ -393,41 +393,41 @@
 		/*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;
+			GF_ParentList *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;
+				/*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 (ignore) {
+				node->sgprivate->parents = nlist;
+				continue;
 			}
-			gf_free(nlist);
-			nlist = next;
-		}
-		if (ignore) {
-			node->sgprivate->parents = nlist;
-			continue;
-		}
 
-		node->sgprivate->parents = NULL;
+			node->sgprivate->parents = NULL;
 		}
 		//sg->node_registry[i-1] = NULL;
 		count = get_num_id_nodes(sg);
@@ -587,7 +587,7 @@
 	NodeIDedItem *reg_node = sg->id_node;
 	if (reg_node && (reg_node->node==node)) {
 		sg->id_node = reg_node->next;
-		if (sg->id_node_last==reg_node) 
+		if (sg->id_node_last==reg_node)
 			sg->id_node_last = reg_node->next;
 		if (reg_node->NodeName) gf_free(reg_node->NodeName);
 		gf_free(reg_node);
@@ -667,7 +667,7 @@
 	/*unregister the instance*/
 	assert(pNode->sgprivate->num_instances);
 	pNode->sgprivate->num_instances -= 1;
-	
+
 	/*this is just an instance removed*/
 	if (pNode->sgprivate->num_instances) {
 #ifdef GPAC_HAS_SPIDERMONKEY
@@ -678,7 +678,7 @@
 #endif
 		return GF_OK;
 	}
-	
+
 	assert(pNode->sgprivate->parents==NULL);
 
 	if (pSG) {
@@ -800,7 +800,7 @@
 				goto exit;
 			}
 			break;
-			/*not a node, continue*/
+		/*not a node, continue*/
 		default:
 			continue;
 		}
@@ -821,7 +821,7 @@
 		break;
 	}
 #endif
-	
+
 	gf_node_changed(FromNode, &field);
 }
 
@@ -840,7 +840,7 @@
 				i--;
 				count--;
 			}
-		} 
+		}
 	}
 }
 
@@ -898,7 +898,7 @@
 #ifndef GPAC_DISABLE_VRML
 	replace_proto = 0;
 	if (node->sgprivate->scenegraph->pOwningProto
-		&& (gf_list_find(node->sgprivate->scenegraph->pOwningProto->node_code, node)>=0)) {
+	        && (gf_list_find(node->sgprivate->scenegraph->pOwningProto->node_code, node)>=0)) {
 		replace_proto = 1;
 	}
 #endif
@@ -977,7 +977,7 @@
 GF_EXPORT
 GF_Err gf_node_set_id(GF_Node *p, u32 ID, const char *name)
 {
-	GF_SceneGraph *pSG; 
+	GF_SceneGraph *pSG;
 	if (!ID || !p || !p->sgprivate->scenegraph) return GF_BAD_PARAM;
 
 	pSG = p->sgprivate->scenegraph;
@@ -990,7 +990,7 @@
 	if (!(p->sgprivate->flags & GF_NODE_IS_DEF) ) {
 		p->sgprivate->flags |= GF_NODE_IS_DEF;
 		insert_node_def(pSG, p, ID, name);
-	} 
+	}
 	/*reassigning ID, remove node def*/
 	else {
 		char *_name = gf_strdup(name);
@@ -1004,7 +1004,7 @@
 GF_EXPORT
 GF_Err gf_node_remove_id(GF_Node *p)
 {
-	GF_SceneGraph *pSG; 
+	GF_SceneGraph *pSG;
 	if (!p) return GF_BAD_PARAM;
 
 	pSG = p->sgprivate->scenegraph;
@@ -1018,7 +1018,7 @@
 		remove_node_id(pSG, p);
 		p->sgprivate->flags &= ~GF_NODE_IS_DEF;
 		return GF_OK;
-	} 
+	}
 	return GF_BAD_PARAM;
 }
 
@@ -1030,7 +1030,7 @@
 
 	if (node->sgprivate->flags & GF_NODE_IS_DEACTIVATED) return;
 
-	if (node->sgprivate->UserCallback) { 
+	if (node->sgprivate->UserCallback) {
 #ifdef GF_CYCLIC_TRAVERSE_ON
 		if (node->sgprivate->flags & GF_NODE_IN_TRAVERSE) return;
 		node->sgprivate->flags |= GF_NODE_IN_TRAVERSE;
@@ -1168,7 +1168,7 @@
 
 
 GF_EXPORT
-u32 gf_sg_get_next_available_node_id(GF_SceneGraph *sg) 
+u32 gf_sg_get_next_available_node_id(GF_SceneGraph *sg)
 {
 	u32 ID;
 	NodeIDedItem *reg_node;
@@ -1218,7 +1218,7 @@
 u32 gf_node_get_id(GF_Node*p)
 {
 	NodeIDedItem *reg_node;
-	GF_SceneGraph *sg; 
+	GF_SceneGraph *sg;
 	assert(p);
 	if (!(p->sgprivate->flags & GF_NODE_IS_DEF)) return 0;
 	sg = p->sgprivate->scenegraph;
@@ -1238,7 +1238,7 @@
 GF_EXPORT
 const char *gf_node_get_name(GF_Node*p)
 {
-	GF_SceneGraph *sg; 
+	GF_SceneGraph *sg;
 	NodeIDedItem *reg_node;
 	if (!p || !(p->sgprivate->flags & GF_NODE_IS_DEF)) return NULL;
 
@@ -1259,7 +1259,7 @@
 GF_EXPORT
 const char *gf_node_get_name_and_id(GF_Node*p, u32 *id)
 {
-	GF_SceneGraph *sg; 
+	GF_SceneGraph *sg;
 	NodeIDedItem *reg_node;
 	assert(p);
 	if (!(p->sgprivate->flags & GF_NODE_IS_DEF)) {
@@ -1328,11 +1328,11 @@
 {
 	GF_ChildNodeItem *child, *cur, *prev;
 	u32 cur_pos = 0;
-	
+
 	assert(pos != (u32) -1);
 
 	child = *list;
-	
+
 	cur = (GF_ChildNodeItem*) gf_malloc(sizeof(GF_ChildNodeItem));
 	if (!cur) return GF_OUT_OF_MEM;
 	cur->node = n;
@@ -1356,6 +1356,34 @@
 }
 
 GF_EXPORT
+GF_Err gf_node_list_append_child(GF_ChildNodeItem **list, GF_ChildNodeItem **last_child, GF_Node *n)
+{
+	GF_ChildNodeItem *child, *cur;
+
+	child = *list;
+
+	cur = (GF_ChildNodeItem*) gf_malloc(sizeof(GF_ChildNodeItem));
+	if (!cur) return GF_OUT_OF_MEM;
+	cur->node = n;
+	cur->next = NULL;
+
+	if (!child) {
+		*list = cur;
+		*last_child = cur;
+	} else {
+		if (! *last_child) {
+			while (child->next) {
+				child = child->next;
+			}
+			*last_child = child;
+		}
+		(*last_child)->next = cur;
+		*last_child = cur;
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Node *gf_node_list_get_child(GF_ChildNodeItem *list, s32 pos)
 {
 	s32 cur_pos = 0;
@@ -1386,7 +1414,7 @@
 	GF_ChildNodeItem *child, *cur;
 
 	child = *list;
-	
+
 	cur = (GF_ChildNodeItem*) gf_malloc(sizeof(GF_ChildNodeItem));
 	if (!cur) return GF_OUT_OF_MEM;
 	cur->node = n;
@@ -1407,7 +1435,7 @@
 	GF_ChildNodeItem *child, *cur;
 
 	child = *list;
-	
+
 	cur = (GF_ChildNodeItem*) gf_malloc(sizeof(GF_ChildNodeItem));
 	if (!cur) return GF_OUT_OF_MEM;
 	cur->node = n;
@@ -1424,7 +1452,7 @@
 		}
 	} else {
 		*list = cur;
-		if (last_child) 
+		if (last_child)
 			*last_child = *list;
 	}
 	return GF_OK;
@@ -1442,7 +1470,7 @@
 		gf_free(child);
 		return 1;
 	}
-	
+
 	while (child->next) {
 		if (child->next->node!=n) {
 			child = child->next;
@@ -1471,7 +1499,7 @@
 		gf_free(child);
 		return ret;
 	}
-	
+
 	while (child->next) {
 		if (cur_pos+1 != pos) {
 			child = child->next;
@@ -1510,7 +1538,7 @@
 	if (!node) return;
 
 	if (node->sgprivate->UserCallback) node->sgprivate->UserCallback(node, NULL, 1);
-	
+
 	if (node->sgprivate->scenegraph && node->sgprivate->scenegraph->NodeCallback)
 		node->sgprivate->scenegraph->NodeCallback(node->sgprivate->scenegraph->userpriv, GF_SG_CALLBACK_NODE_DESTROY, node, NULL);
 
@@ -1547,7 +1575,10 @@
 {
 	u32 count = 0;
 	GF_ParentList *nlist = node->sgprivate->parents;
-	while (nlist) { count++; nlist = nlist->next; }
+	while (nlist) {
+		count++;
+		nlist = nlist->next;
+	}
 	return count;
 }
 
@@ -1559,11 +1590,14 @@
 	/*break cyclic graphs*/
 	if (node->sgprivate->scenegraph->RootNode==node) return NULL;
 #ifndef GPAC_DISABLE_VRML
-	if (node->sgprivate->scenegraph->pOwningProto && node->sgprivate->scenegraph->pOwningProto->RenderingNode==node) 
+	if (node->sgprivate->scenegraph->pOwningProto && node->sgprivate->scenegraph->pOwningProto->RenderingNode==node)
 		return NULL;
 #endif
 	if (!nlist) return NULL;
-	while (idx) { nlist = nlist->next; idx--;}
+	while (idx) {
+		nlist = nlist->next;
+		idx--;
+	}
 	return nlist ? nlist->node : NULL;
 }
 
@@ -1572,7 +1606,7 @@
 	u32 i, count;
 	GF_FieldInfo info;
 	if (!node) return;
-	
+
 	node->sgprivate->flags &= GF_NODE_INTERNAL_FLAGS;
 	if (node->sgprivate->tag>=GF_NODE_RANGE_LAST_VRML) {
 		GF_ChildNodeItem *child = ((GF_ParentNode*)node)->children;
@@ -1601,7 +1635,7 @@
 	GF_ParentList *nlist;
 #if defined GPAC_ANDROID
 	if ( !node || !node->sgprivate )
-	return;	
+		return;
 #else
 	if (!node) return;
 #endif
@@ -1647,7 +1681,7 @@
 void gf_node_dirty_set(GF_Node *node, u32 flags, Bool and_dirty_parents)
 {
 	if (!node) return;
-	
+
 	if (flags) node->sgprivate->flags |= (flags & (~GF_NODE_INTERNAL_FLAGS) );
 	else node->sgprivate->flags |= GF_SG_NODE_DIRTY;
 
@@ -1684,8 +1718,10 @@
 		node->sgprivate->flags &= GF_NODE_INTERNAL_FLAGS;
 		if (reset_children) {
 			dirty_children(node);
+#ifndef GPAC_DISABLE_VRML
 		} else if (node->sgprivate->tag==TAG_MPEG4_Appearance) {
 			gf_node_dirty_reset( ((M_Appearance*)node)->material, 1);
+#endif
 		}
 	}
 }
@@ -1766,8 +1802,8 @@
 #ifndef GPAC_DISABLE_SVG
 	/* we should avoid dispatching a DOMSubtreeModified event on insertion of time values in begin/end fields
 	   because this retriggers begin/end events and reinsertion */
-	if ((field == NULL || ((field->fieldIndex != TAG_SVG_ATT_begin) && (field->fieldIndex != TAG_SVG_ATT_end))) && 
-		node->sgprivate->tag >= GF_NODE_RANGE_FIRST_SVG && node->sgprivate->tag <= GF_NODE_RANGE_LAST_SVG) {		
+	if ((field == NULL || ((field->fieldIndex != TAG_SVG_ATT_begin) && (field->fieldIndex != TAG_SVG_ATT_end))) &&
+	        node->sgprivate->tag >= GF_NODE_RANGE_FIRST_SVG && node->sgprivate->tag <= GF_NODE_RANGE_LAST_SVG) {
 		GF_DOM_Event evt;
 		evt.type = GF_EVENT_TREE_MODIFIED;
 		evt.bubbles = 0;
@@ -1785,7 +1821,7 @@
 		if (t->textContent) gf_free(t->textContent);
 		gf_sg_parent_reset(node);
 		gf_node_free(node);
-	} 
+	}
 	else if (node->sgprivate->tag==TAG_DOMUpdates) {
 		u32 i, count;
 		GF_DOMUpdates *up = (GF_DOMUpdates *)node;
@@ -1798,7 +1834,7 @@
 		gf_list_del(up->updates);
 		gf_sg_parent_reset(node);
 		gf_node_free(node);
-	} 
+	}
 	else if (node->sgprivate->tag == TAG_DOMFullNode) {
 		GF_DOMFullNode *n = (GF_DOMFullNode *)node;
 #ifndef GPAC_DISABLE_SVG
@@ -1871,7 +1907,7 @@
 GF_EXPORT
 u32 gf_sg_node_get_tag_by_class_name(const char *name, u32 ns)
 {
-	u32 tag;
+	u32 tag = TAG_UndefinedNode;
 
 	/* TODO: handle name spaces */
 #ifndef GPAC_DISABLE_VRML
@@ -1879,7 +1915,7 @@
 	if (tag) return tag;
 
 #ifndef GPAC_DISABLE_X3D
-	tag = gf_node_x3d_type_by_class_name(name);	
+	tag = gf_node_x3d_type_by_class_name(name);
 	if (tag) return tag;
 #endif
 
@@ -1890,7 +1926,7 @@
 	if (tag != TAG_UndefinedNode) return tag;
 #endif
 
-	return 	TAG_UndefinedNode;
+	return 	tag;
 }
 
 GF_EXPORT
@@ -1954,11 +1990,11 @@
 	if (node->sgprivate->tag==TAG_UndefinedNode) return GF_BAD_PARAM;
 #ifndef GPAC_DISABLE_VRML
 	else if (node->sgprivate->tag == TAG_ProtoNode) return gf_sg_proto_get_field(NULL, node, info);
-	else if ((node->sgprivate->tag == TAG_MPEG4_Script) 
+	else if ((node->sgprivate->tag == TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		|| (node->sgprivate->tag == TAG_X3D_Script) 
+	         || (node->sgprivate->tag == TAG_X3D_Script)
 #endif
-		)
+	        )
 		return gf_sg_script_get_field(node, info);
 	else if (node->sgprivate->tag <= GF_NODE_RANGE_LAST_MPEG4) return gf_sg_mpeg4_node_get_field(node, info);
 #ifndef GPAC_DISABLE_X3D
@@ -1983,7 +2019,7 @@
 	assert(node);
 	count = gf_node_get_field_count(node);
 	memset(field, 0, sizeof(GF_FieldInfo));
-	for (i=0; i<count;i++) {
+	for (i=0; i<count; i++) {
 		gf_node_get_field(node, i, field);
 		if (!strcmp(field->name, name)) return GF_OK;
 	}
@@ -2000,11 +2036,11 @@
 	else if (node->sgprivate->tag == TAG_ProtoNode) {
 		res = gf_sg_proto_get_field_index_by_name(NULL, node, name);
 	}
-	else if ((node->sgprivate->tag == TAG_MPEG4_Script) 
+	else if ((node->sgprivate->tag == TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		|| (node->sgprivate->tag == TAG_X3D_Script) 
+	         || (node->sgprivate->tag == TAG_X3D_Script)
 #endif
-		) {
+	        ) {
 		return gf_node_get_field_by_name_enum(node, name, field);
 	}
 	else if (node->sgprivate->tag <= GF_NODE_RANGE_LAST_MPEG4) res = gf_sg_mpeg4_node_get_field_index_by_name(node, name);
@@ -2020,9 +2056,9 @@
 	return gf_node_get_field(node, (u32) res, field);
 }
 
-	
+
 static char log_node_name[2+16+1];
-const char *gf_node_get_log_name(GF_Node *anim) 
+const char *gf_node_get_log_name(GF_Node *anim)
 {
 	const char *name = gf_node_get_name(anim);
 	if (name) return name;
@@ -2042,7 +2078,7 @@
 	GF_ChildNodeItem *item;
 	if (node->sgprivate->tag<GF_NODE_FIRST_DOM_NODE_TAG) return GF_BAD_PARAM;
 	if (! (node->sgprivate->flags & GF_NODE_IS_DEACTIVATED)) {
-		
+
 		node->sgprivate->flags |= GF_NODE_IS_DEACTIVATED;
 
 		/*deactivate anmiations*/
@@ -2137,7 +2173,7 @@
 	return NULL;
 }
 
-u32 gf_xml_get_namespace_id(char *name)
+GF_NamespaceType gf_xml_get_namespace_id(char *name)
 {
 	if (!strcmp(name, "http://www.w3.org/XML/1998/namespace")) return GF_XMLNS_XML;
 	else if (!strcmp(name, "http://www.w3.org/2001/xml-events")) return GF_XMLNS_XMLEV;
@@ -2176,9 +2212,9 @@
 	for (i=0; i<count; i++) {
 		Bool ok=0;
 		GF_XMLNS *ns = gf_list_get(sg->ns, i);
-		if (!q_name && !ns->qname) 
+		if (!q_name && !ns->qname)
 			ok = 1;
-		else if (q_name && ns->qname && !strcmp(ns->qname, q_name) ) 
+		else if (q_name && ns->qname && !strcmp(ns->qname, q_name) )
 			ok = 1;
 
 		if (ok && ns->name && !strcmp(ns->name, ns_name)) {
@@ -2199,10 +2235,10 @@
 	count = sg->ns ? gf_list_count(sg->ns) : 0;
 	for (i=0; i<count; i++) {
 		ns = gf_list_get(sg->ns, i);
-		if (!ns->qname && !qname) 
+		if (!ns->qname && !qname)
 			return ns->xmlns_id;
-		
-		if (ns->qname && qname && !strcmp(ns->qname, qname)) 
+
+		if (ns->qname && qname && !strcmp(ns->qname, qname))
 			return ns->xmlns_id;
 	}
 	if (qname) {
@@ -2219,22 +2255,22 @@
 	count = sg->ns ? gf_list_count(sg->ns) : 0;
 	for (i=0; i<count; i++) {
 		ns = gf_list_get(sg->ns, i);
-		if (ns->name && name && !strcmp(ns->name, name)) 
+		if (ns->name && name && !strcmp(ns->name, name))
 			return ns->xmlns_id;
-		if (!ns->name && !name) 
+		if (!ns->name && !name)
 			return ns->xmlns_id;
 	}
 	return GF_XMLNS_UNDEFINED;
 }
 
-const char *gf_sg_get_namespace_qname(GF_SceneGraph *sg, u32 xmlns_id)
+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);
-		if (ns->xmlns_id == xmlns_id) 
+		if (ns->xmlns_id == xmlns_id)
 			return ns->qname;
 	}
 	if (xmlns_id==GF_XMLNS_XML) return "xml";
@@ -2242,14 +2278,14 @@
 }
 
 
-const char *gf_sg_get_namespace(GF_SceneGraph *sg, u32 xmlns_id)
+const char *gf_sg_get_namespace(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);
-		if (ns->xmlns_id == xmlns_id) 
+		if (ns->xmlns_id == xmlns_id)
 			return ns->name;
 	}
 	return NULL;
@@ -2296,7 +2332,7 @@
 	if (newNode) {
 		child->node = newNode;
 #ifndef GPAC_DISABLE_VRML
-		if (tag==TAG_MPEG4_ColorTransform) 
+		if (tag==TAG_MPEG4_ColorTransform)
 			node->sgprivate->flags |= GF_SG_VRML_COLOR_DIRTY;
 #endif
 	} else {
@@ -2315,7 +2351,7 @@
 	GF_FieldInfo info;
 	if (!node) return 0;
 	if (node==target) return 1;
-	
+
 	if (node->sgprivate->tag>=GF_NODE_RANGE_LAST_VRML) {
 		GF_ChildNodeItem *child = ((GF_ParentNode*)node)->children;
 		while (child) {

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/commands.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/commands.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -131,11 +131,11 @@
 	/*and propagate eventIn if any*/
 	if (field->on_event_in) {
 		field->on_event_in(node, NULL);
-	} 
+	}
 #ifndef GPAC_DISABLE_VRML
 	else if ((field->eventType==GF_SG_EVENT_IN) && (gf_node_get_tag(node) == TAG_MPEG4_Script)) {
 		gf_sg_script_event_in(node, field);
-	} 
+	}
 	else {
 		/*Notify eventOut in all cases to handle protos*/
 		gf_node_event_out(node, field->fieldIndex);
@@ -164,13 +164,13 @@
 GF_Err gf_sg_command_apply(GF_SceneGraph *graph, GF_Command *com, Double time_offset)
 {
 	GF_Err e;
-	GF_CommandField *inf;
 #ifndef GPAC_DISABLE_VRML
+	GF_CommandField *inf;
 	GF_FieldInfo field;
 	void *slot_ptr;
 	GF_Node *def;
-#endif
 	GF_Node *node;
+#endif
 
 	if (!com || !graph) return GF_BAD_PARAM;
 
@@ -183,7 +183,7 @@
 		/*unregister root*/
 		gf_node_unregister(graph->RootNode, NULL);
 		/*remove all protos and routes*/
-		while (gf_list_count(graph->routes_to_activate)) 
+		while (gf_list_count(graph->routes_to_activate))
 			gf_list_rem(graph->routes_to_activate, 0);
 
 		if (!com->aggregated) {
@@ -287,13 +287,13 @@
 				/*clone command list*/
 				sg = gf_node_get_graph(com->node);
 				count = gf_list_count(cb_src->commandList);
-				for (i=0; i<count;i++) {
+				for (i=0; i<count; i++) {
 					GF_Command *sub_com = (GF_Command *)gf_list_get(cb_src->commandList, i);
 					GF_Command *new_com = gf_sg_vrml_command_clone(sub_com, sg, 0);
 					gf_list_add(cb_dst->commandList, new_com);
 				}
 			}
-				break;
+			break;
 
 			default:
 				/*this is a regular field, reset it and clone - we cannot switch pointers since the
@@ -303,7 +303,7 @@
 				}
 				if (e) return e;
 				gf_sg_vrml_field_copy(field.far_ptr, inf->field_ptr, field.fieldType);
-				
+
 				if ((field.fieldType==GF_SG_VRML_SFTIME) && !strstr(field.name, "media"))
 					*(SFTime *)field.far_ptr = *(SFTime *)field.far_ptr + time_offset;
 				break;
@@ -470,16 +470,16 @@
 		}
 		return GF_OK;
 	case GF_SG_PROTO_DELETE:
-		{
-			u32 i;
-			for (i=0; i<com->del_proto_list_size; i++) {
-				/*note this will check for unregistered protos, but since IDs are unique we are sure we will 
-				not destroy an unregistered one*/
-				GF_Proto *proto = gf_sg_find_proto(graph, com->del_proto_list[i], NULL);
-				if (proto) gf_sg_proto_del(proto);
-			}
+	{
+		u32 i;
+		for (i=0; i<com->del_proto_list_size; i++) {
+			/*note this will check for unregistered protos, but since IDs are unique we are sure we will
+			not destroy an unregistered one*/
+			GF_Proto *proto = gf_sg_find_proto(graph, com->del_proto_list[i], NULL);
+			if (proto) gf_sg_proto_del(proto);
 		}
-		return GF_OK;
+	}
+	return GF_OK;
 	case GF_SG_PROTO_DELETE_ALL:
 		/*destroy all proto*/
 		while (gf_list_count(graph->protos)) {
@@ -492,7 +492,7 @@
 		return GF_OK;
 	case GF_SG_XREPLACE:
 	{
-		s32 pos = -2; 
+		s32 pos = -2;
 		GF_Node *target = NULL;
 		GF_ChildNodeItem *list, *cur, *prev;
 		GF_FieldInfo value;
@@ -509,7 +509,7 @@
 				if (com->toNodeID) {
 					GF_Node *idxNode = gf_sg_find_node(graph, com->toNodeID);
 					if (!idxNode) return GF_SG_UNKNOWN_NODE;
-				
+
 					if (gf_node_get_field(idxNode, com->toFieldIndex, &idxField) != GF_OK) return GF_OK;
 					pos = 0;
 					switch (idxField.fieldType) {
@@ -610,7 +610,7 @@
 				}
 				if (e) return e;
 				gf_sg_vrml_field_clone(field.far_ptr, value.far_ptr, field.fieldType, graph);
-				
+
 				if ((field.fieldType==GF_SG_VRML_SFTIME) && !strstr(field.name, "media"))
 					*(SFTime *)field.far_ptr = *(SFTime *)field.far_ptr + time_offset;
 				break;
@@ -618,7 +618,7 @@
 		}
 		SG_CheckFieldChange(target, &field);
 	}
-		return GF_OK;
+	return GF_OK;
 	/*only used by BIFS*/
 	case GF_SG_GLOBAL_QUANTIZER:
 		return GF_OK;
@@ -653,7 +653,7 @@
 		inf = (GF_CommandField*)gf_list_get(com->command_fields, 0);
 		if (!com->node || !inf) return GF_NON_COMPLIANT_BITSTREAM;
 		if (inf->new_node) {
-			if (inf->pos<0) 
+			if (inf->pos<0)
 				gf_node_list_add_child(& ((SVG_Element *)com->node)->children, inf->new_node);
 			else
 				gf_node_list_insert_child(& ((SVG_Element *)com->node)->children, inf->new_node, inf->pos);
@@ -724,7 +724,7 @@
 				GF_Matrix2D *dest;
 				gf_node_get_field_by_name(com->node, "transform", &a);
 				dest = (GF_Matrix2D*)a.far_ptr;
-				
+
 				if (com->tag==GF_SG_LSR_REPLACE) {
 					if (gf_mx2d_decompose(dest, &scale, &rotate, &translate)) {
 						gf_mx2d_init(*dest);
@@ -749,7 +749,7 @@
 					char *str = *(SVG_String*)inf->field_ptr;
 
 					if (com->tag == GF_SG_LSR_REPLACE) {
-						GF_DOMText *t = ((SVG_Element*)com->node)->children ? (GF_DOMText*) ((SVG_Element*)com->node)->children->node :NULL; 
+						GF_DOMText *t = ((SVG_Element*)com->node)->children ? (GF_DOMText*) ((SVG_Element*)com->node)->children->node :NULL;
 						if (t && (t->sgprivate->tag==TAG_DOMText)) {
 							if (t->textContent) gf_free(t->textContent);
 							t->textContent = NULL;
@@ -761,10 +761,10 @@
 					/*signal node modif*/
 					gf_node_changed(com->node, NULL);
 				}
-				else if ((inf->fieldIndex==TAG_LSR_ATT_scale) 
-					|| (inf->fieldIndex==TAG_LSR_ATT_translation)
-					|| (inf->fieldIndex==TAG_LSR_ATT_rotation)
-				) {
+				else if ((inf->fieldIndex==TAG_LSR_ATT_scale)
+				         || (inf->fieldIndex==TAG_LSR_ATT_translation)
+				         || (inf->fieldIndex==TAG_LSR_ATT_rotation)
+				        ) {
 					SVG_Transform *mx;
 					gf_node_get_attribute_by_tag(com->node, TAG_SVG_ATT_transform, 1, 0, &a);
 					mx = a.far_ptr;
@@ -814,7 +814,7 @@
 				char *str = *(SVG_String*)inf->field_ptr;
 
 				if (com->tag == GF_SG_LSR_REPLACE) {
-					GF_DOMText *t = ((SVG_Element*)com->node)->children ? (GF_DOMText*) ((SVG_Element*)com->node)->children->node :NULL; 
+					GF_DOMText *t = ((SVG_Element*)com->node)->children ? (GF_DOMText*) ((SVG_Element*)com->node)->children->node :NULL;
 					if (t && (t->sgprivate->tag==TAG_DOMText)) {
 						if (t->textContent) gf_free(t->textContent);
 						t->textContent = NULL;
@@ -854,7 +854,7 @@
 		evt.clientY = com->send_event_y;
 		gf_dom_event_fire(com->node, &evt);
 	}
-		break;
+	break;
 #endif
 
 	default:
@@ -905,7 +905,7 @@
 {
 	u32 i, count;
 	GF_Command *dest;
-	
+
 	/*FIXME - to do*/
 	if (gf_list_count(com->new_proto_list)) return NULL;
 	dest = gf_sg_command_new(inGraph, com->tag);

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/dom_events.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/dom_events.c Changed

@@ -15,7 +15,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -100,14 +100,14 @@
 
 u32 gf_node_get_dom_event_filter(GF_Node *node)
 {
-    if (node) {
-        return node->sgprivate->scenegraph->dom_evt_filter;
-    } else {
-        return 0;
-    }
+	if (node) {
+		return node->sgprivate->scenegraph->dom_evt_filter;
+	} else {
+		return 0;
+	}
 }
 
-/* Associate a listener node and a event target node 
+/* 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
 */
@@ -140,8 +140,8 @@
 	if (!node || !listener) return GF_BAD_PARAM;
 	if (listener->sgprivate->tag!=TAG_SVG_listener)
 		return GF_BAD_PARAM;
-	
-	if (!node->sgprivate->interact) 
+
+	if (!node->sgprivate->interact)
 		GF_SAFEALLOC(node->sgprivate->interact, struct _node_interactive_ext);
 
 	if (!node->sgprivate->interact->dom_evt) {
@@ -167,7 +167,7 @@
 	return GF_OK;
 }
 
-GF_Err gf_dom_event_remove_listener_from_parent(GF_DOMEventTarget *event_target, GF_Node *listener) 
+GF_Err gf_dom_event_remove_listener_from_parent(GF_DOMEventTarget *event_target, GF_Node *listener)
 {
 	if (!event_target) return GF_BAD_PARAM;
 	if (event_target->ptr_type == GF_DOM_EVENT_TARGET_NODE) {
@@ -188,7 +188,7 @@
 	return GF_OK;
 }
 
-void gf_dom_event_remove_all_listeners(GF_DOMEventTarget *event_target) 
+void gf_dom_event_remove_all_listeners(GF_DOMEventTarget *event_target)
 {
 	while (gf_list_count(event_target->listeners)) {
 		GF_Node *n = (GF_Node *)gf_list_get(event_target->listeners, 0);
@@ -297,8 +297,8 @@
 
 			if ((iri->type==XMLRI_STRING) && iri->string && !strnicmp(iri->string, "javascript:", 11)) {
 #ifdef GPAC_HAS_SPIDERMONKEY
-			if (listen->sgprivate->scenegraph->svg_js) 
-				listen->sgprivate->scenegraph->svg_js->handler_execute(listen, event, observer, iri->string + 11);
+				if (listen->sgprivate->scenegraph->svg_js)
+					listen->sgprivate->scenegraph->svg_js->handler_execute(listen, event, observer, iri->string + 11);
 #endif
 				return;
 			}
@@ -310,7 +310,7 @@
 			return;
 		}
 	}
-		break;
+	break;
 	default:
 		return;
 	}
@@ -338,7 +338,7 @@
 		handler->handle_event(hdl_node, event, observer);
 #endif
 	}
-		break;
+	break;
 	case TAG_LSR_conditional:
 		if ( ((SVG_Element*)hdl_node)->children)
 			gf_node_traverse(((SVG_Element*)hdl_node)->children->node, NULL);
@@ -350,7 +350,7 @@
 		act.type = GF_EVENT_ACTIVATE;
 		gf_dom_event_fire((GF_Node *)hdl_node, &act);
 	}
-		break;
+	break;
 	default:
 		return;
 	}
@@ -360,94 +360,94 @@
 Bool gf_sg_fire_dom_event(GF_DOMEventTarget *et, GF_DOM_Event *event, GF_SceneGraph *sg, GF_Node *n)
 {
 	if (et) {
-        if (et->ptr_type==GF_DOM_EVENT_TARGET_NODE || 
-			et->ptr_type == GF_DOM_EVENT_TARGET_DOCUMENT || 
-			et->ptr_type == GF_DOM_EVENT_TARGET_XHR ||
-			et->ptr_type == GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE || 
-			et->ptr_type == GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER || 
-			et->ptr_type == GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST ) {
-		    GF_Node *observer = NULL;
-		    u32 i, count, post_count;
-            if (et->ptr_type==GF_DOM_EVENT_TARGET_NODE) {
-                observer = (GF_Node *)et->ptr;
-            }
-		    count = gf_list_count(et->listeners);
-		    for (i=0; i<count; i++) {
-			    XMLEV_Event *listened_event;
-			    GF_Node *listen = (GF_Node *)gf_list_get(et->listeners, i);
-
-			    switch (listen->sgprivate->tag) {
-			    case TAG_SVG_listener:
-			    {
-				    SVGAllAttributes atts;
-				    gf_svg_flatten_attributes((SVG_Element*)listen, &atts);
-				    listened_event = atts.event;
-				    if (!listened_event) continue;
-
-				    if (atts.propagate && (*atts.propagate==XMLEVENT_PROPAGATE_STOP))
-					    event->event_phase |= GF_DOM_EVENT_PHASE_CANCEL;
-				    if (atts.defaultAction && (*atts.defaultAction==XMLEVENT_DEFAULTACTION_CANCEL))
-					    event->event_phase |= GF_DOM_EVENT_PHASE_PREVENT;
-			    }
-				    break;
-			    default:
-				    continue;
-			    }
-			    if (listened_event->type <= GF_EVENT_MOUSEMOVE) event->has_ui_events=1;
-			    if (listened_event->type != event->type) continue;
-			    if (listened_event->parameter && (listened_event->parameter != event->detail)) continue;
-			    event->currentTarget = et;
-			    event->consumed	++;
-
-			    /*load event cannot bubble and can only be called once (on load :) ), remove it
-			    to release some resources*/
-			    if (event->type==GF_EVENT_LOAD) {
-				    dom_event_process(listen, event, observer);
-				    /*delete listener*/
-				    //gf_dom_listener_del(listen, et);
-			    } else if (n) {
-				    assert(n->sgprivate->num_instances);
-				    /*protect node*/
-				    n->sgprivate->num_instances++;
-				    /*exec event*/
-				    dom_event_process(listen, event, observer);
-				    /*the event has destroyed ourselves, abort propagation
-				    THIS IS NOT DOM compliant, the event should propagate on the original target+ancestors path*/
-				    if (n->sgprivate->num_instances==1) {
-					    /*unprotect node event*/
-					    gf_node_unregister(n, NULL);
-					    return GF_FALSE;
-				    }
-				    n->sgprivate->num_instances--;
-			    } else {
-				    dom_event_process(listen, event, observer);
-			    }
-			    /*canceled*/
-			    if (event->event_phase & GF_DOM_EVENT_PHASE_CANCEL_ALL) {
-				    gf_dom_listener_process_add(sg);
-				    return GF_FALSE;
-			    }
-
-			    /*if listeners have been removed, update count*/
-			    post_count = gf_list_count(et->listeners);
-			    if (post_count < count) {
-				    s32 pos = gf_list_find(et->listeners, listen);
-				    if (pos>=0) i = pos;
-				    /*FIXME this is not going to work in all cases...*/
-				    else i--;
-				    count = post_count;
-			    }
-		    }
-		    /*propagation stopped*/
-		    if (event->event_phase & (GF_DOM_EVENT_PHASE_CANCEL|GF_DOM_EVENT_PHASE_CANCEL_ALL) ) {
-			    gf_dom_listener_process_add(sg);
-			    return GF_FALSE;
-		    }
+		if (et->ptr_type==GF_DOM_EVENT_TARGET_NODE ||
+		        et->ptr_type == GF_DOM_EVENT_TARGET_DOCUMENT ||
+		        et->ptr_type == GF_DOM_EVENT_TARGET_XHR ||
+		        et->ptr_type == GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE ||
+		        et->ptr_type == GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER ||
+		        et->ptr_type == GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST ) {
+			GF_Node *observer = NULL;
+			u32 i, count, post_count;
+			if (et->ptr_type==GF_DOM_EVENT_TARGET_NODE) {
+				observer = (GF_Node *)et->ptr;
+			}
+			count = gf_list_count(et->listeners);
+			for (i=0; i<count; i++) {
+				XMLEV_Event *listened_event;
+				GF_Node *listen = (GF_Node *)gf_list_get(et->listeners, i);
+
+				switch (listen->sgprivate->tag) {
+				case TAG_SVG_listener:
+				{
+					SVGAllAttributes atts;
+					gf_svg_flatten_attributes((SVG_Element*)listen, &atts);
+					listened_event = atts.event;
+					if (!listened_event) continue;
+
+					if (atts.propagate && (*atts.propagate==XMLEVENT_PROPAGATE_STOP))
+						event->event_phase |= GF_DOM_EVENT_PHASE_CANCEL;
+					if (atts.defaultAction && (*atts.defaultAction==XMLEVENT_DEFAULTACTION_CANCEL))
+						event->event_phase |= GF_DOM_EVENT_PHASE_PREVENT;
+				}
+				break;
+				default:
+					continue;
+				}
+				if (listened_event->type <= GF_EVENT_MOUSEMOVE) event->has_ui_events=1;
+				if (listened_event->type != event->type) continue;
+				if (listened_event->parameter && (listened_event->parameter != event->detail)) continue;
+				event->currentTarget = et;
+				event->consumed	++;
+
+				/*load event cannot bubble and can only be called once (on load :) ), remove it
+				to release some resources*/
+				if (event->type==GF_EVENT_LOAD) {
+					dom_event_process(listen, event, observer);
+					/*delete listener*/
+					//gf_dom_listener_del(listen, et);
+				} else if (n) {
+					assert(n->sgprivate->num_instances);
+					/*protect node*/
+					n->sgprivate->num_instances++;
+					/*exec event*/
+					dom_event_process(listen, event, observer);
+					/*the event has destroyed ourselves, abort propagation
+					THIS IS NOT DOM compliant, the event should propagate on the original target+ancestors path*/
+					if (n->sgprivate->num_instances==1) {
+						/*unprotect node event*/
+						gf_node_unregister(n, NULL);
+						return GF_FALSE;
+					}
+					n->sgprivate->num_instances--;
+				} else {
+					dom_event_process(listen, event, observer);
+				}
+				/*canceled*/
+				if (event->event_phase & GF_DOM_EVENT_PHASE_CANCEL_ALL) {
+					gf_dom_listener_process_add(sg);
+					return GF_FALSE;
+				}
+
+				/*if listeners have been removed, update count*/
+				post_count = gf_list_count(et->listeners);
+				if (post_count < count) {
+					s32 pos = gf_list_find(et->listeners, listen);
+					if (pos>=0) i = pos;
+					/*FIXME this is not going to work in all cases...*/
+					else i--;
+					count = post_count;
+				}
+			}
+			/*propagation stopped*/
+			if (event->event_phase & (GF_DOM_EVENT_PHASE_CANCEL|GF_DOM_EVENT_PHASE_CANCEL_ALL) ) {
+				gf_dom_listener_process_add(sg);
+				return GF_FALSE;
+			}
 		}
-	    gf_dom_listener_process_add(sg);
-	    /*if the current target is a node, we can bubble*/
-	    return n ? GF_TRUE : GF_FALSE;
-    } else {
+		gf_dom_listener_process_add(sg);
+		/*if the current target is a node, we can bubble*/
+		return n ? GF_TRUE : GF_FALSE;
+	} else {
 		/* if the node does not have a event target, probably a parent will have, so let's bubble */
 		return GF_TRUE;
 	}
@@ -458,13 +458,13 @@
 	GF_Node *parent;
 
 	if (!node || node->sgprivate->scenegraph->abort_bubbling) return;
-	
+
 
 	/*get the node's parent*/
 	parent = gf_node_get_parent(node, 0);
 
 	if (!parent) {
-	/*top of the graph, use Document*/
+		/*top of the graph, use Document*/
 		if (node->sgprivate->scenegraph->RootNode==node)
 			gf_sg_fire_dom_event(node->sgprivate->scenegraph->dom_evt, event, node->sgprivate->scenegraph, NULL);
 		return;
@@ -615,7 +615,7 @@
 		gf_node_register((GF_Node *)handler, (GF_Node *) listener);
 		gf_node_list_add_child_last(& ((GF_ParentNode *)listener)->children, (GF_Node*)handler, &last);
 	}
-	
+
 	gf_node_get_attribute_by_tag((GF_Node*)listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 	((XMLEV_Event *)info.far_ptr)->type = event_type;
 	((XMLEV_Event *)info.far_ptr)->parameter = event_parameter;
@@ -625,7 +625,7 @@
 
 	gf_node_get_attribute_by_tag((GF_Node*)listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
 	((XMLRI *)info.far_ptr)->target = node;
-	
+
 	gf_node_dom_listener_add((GF_Node *) node, (GF_Node *) listener);
 
 	if (out_listener) *out_listener = (GF_Node *) listener;
@@ -636,7 +636,7 @@
 }
 
 GF_EXPORT
-GF_DOMHandler *gf_dom_listener_build(GF_Node *node, u32 event_type, u32 event_parameter)
+GF_DOMHandler *gf_dom_listener_build(GF_Node *node, GF_EventType event_type, u32 event_parameter)
 {
 	return gf_dom_listener_build_ex(node, event_type, event_parameter, NULL, NULL);
 }
@@ -670,7 +670,7 @@
 		}
 		/*only handle event if coming from the watched element*/
 		if (proto->element) {
-			if ((evt->currentTarget->ptr_type!=GF_DOM_EVENT_TARGET_NODE) || (proto->element!= (GF_Node*)evt->currentTarget->ptr)) 
+			if ((evt->currentTarget->ptr_type!=GF_DOM_EVENT_TARGET_NODE) || (proto->element!= (GF_Node*)evt->currentTarget->ptr))
 				continue;
 		}
 
@@ -745,25 +745,25 @@
 		} else if (t->event.type==GF_EVENT_REPEAT) {
 			t->event.type=GF_EVENT_REPEAT_EVENT;
 			t->is_absolute_event = GF_TRUE;
-		} 
+		}
 
 		/*create a new listener*/
 		hdl = gf_dom_listener_build_ex(t->element, t->event.type, t->event.parameter, NULL, &t->listener);
 
-		/*register the listener so that we can handle cyclic references: 
+		/*register the listener so that we can handle cyclic references:
 			- If the anim node gets destroyed, the listener is removed through the SMIL_Time reference
 			- If the target gets destroyed, the listener is removed through the regular way
 		*/
 		if (t->listener)
 			gf_node_register(t->listener, NULL);
-		
+
 		if (hdl) {
 			((SVG_handlerElement *)hdl)->handle_event = is_begin ? gf_smil_handle_event_begin : gf_smil_handle_event_end;
 		}
 		else {
 			continue;
 		}
-		/*We don't want to insert the implicit listener in the DOM. However remember 
+		/*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);
@@ -868,7 +868,7 @@
 	return update;
 }
 
-void gf_dom_event_dump_listeners(GF_Node *n, FILE *f) 
+void gf_dom_event_dump_listeners(GF_Node *n, FILE *f)
 {
 	u32		i;
 	u32		count;
@@ -889,9 +889,9 @@
 				hdl = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
 				if (!hdl) continue;
 				/*this handler was declared in the graph*/
-				if (hdl->sgprivate->parents 
-					&& (hdl->sgprivate->parents->next || (hdl->sgprivate->parents->node != listener))
-				)
+				if (hdl->sgprivate->parents
+				        && (hdl->sgprivate->parents->next || (hdl->sgprivate->parents->node != listener))
+				   )
 					continue;
 
 				txt = hdl->children ? (GF_DOMText*)hdl->children->node : NULL;
@@ -904,24 +904,24 @@
 	}
 }
 
-GF_DOMEventTarget *gf_dom_event_target_new(GF_DOMEventTargetType type, void *obj) 
+GF_DOMEventTarget *gf_dom_event_target_new(GF_DOMEventTargetType type, void *obj)
 {
-    GF_DOMEventTarget *target;
-    GF_SAFEALLOC(target, GF_DOMEventTarget);
-    target->ptr_type = type;
+	GF_DOMEventTarget *target;
+	GF_SAFEALLOC(target, GF_DOMEventTarget);
+	target->ptr_type = type;
 	target->listeners = gf_list_new();
-    target->ptr = obj;
-    return target;
+	target->ptr = obj;
+	return target;
 }
 
-void gf_dom_event_target_del(GF_DOMEventTarget *target) 
+void gf_dom_event_target_del(GF_DOMEventTarget *target)
 {
-    assert(gf_list_count(target->listeners) == 0);
+	assert(gf_list_count(target->listeners) == 0);
 	gf_list_del(target->listeners);
 	gf_free(target);
 }
 
-GF_DOMEventTarget *gf_dom_event_get_target_from_node(GF_Node *n) 
+GF_DOMEventTarget *gf_dom_event_get_target_from_node(GF_Node *n)
 {
 	GF_DOMEventTarget *target = NULL;
 	//GF_HTML_MediaElement *me = html_media_element_get_from_node(c, n);

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/dom_smjs.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/dom_smjs.c Changed

@@ -125,9 +125,9 @@
 
 	GF_JSClass storageClass;
 
-    GF_JSClass htmlMediaElementClass;
+	GF_JSClass htmlMediaElementClass;
 
-    void *(*get_element_class)(GF_Node *n);
+	void *(*get_element_class)(GF_Node *n);
 	void *(*get_document_class)(GF_SceneGraph *n);
 	GF_List *handlers;
 } GF_DOMRuntime;
@@ -217,7 +217,7 @@
 	EVENT_JSPROPERTY_TYPEARG					= -23,
 	EVENT_JSPROPERTY_LOADED						= -24,
 	EVENT_JSPROPERTY_TOTAL						= -25,
-	EVENT_JSPROPERTY_BUFFERLEVELVALID			= -26,
+	EVENT_JSPROPERTY_BUFFER_ON					= -26,
 	EVENT_JSPROPERTY_BUFFERLEVEL				= -27,
 	EVENT_JSPROPERTY_BUFFERREMAININGTIME		= -28,
 	EVENT_JSPROPERTY_STATUS						= -29,
@@ -232,6 +232,7 @@
 	EVENT_JSPROPERTY_TYPE3D						= -38,
 	EVENT_JSPROPERTY_ERROR						= -39,
 	EVENT_JSPROPERTY_DYNAMIC_SCENE				= -40,
+	EVENT_JSPROPERTY_URL							= -41,
 } GF_DOMEventJSProperty;
 
 typedef enum {
@@ -417,10 +418,10 @@
 	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->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->js_binding) {
 		GF_SAFEALLOC(n->sgprivate->interact->js_binding, struct _node_js_binding);
@@ -562,25 +563,25 @@
 
 static DECL_FINALIZE(dom_nodelist_finalize)
 
-	DOMNodeList *nl;
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->domNodeListClass, NULL) )
-		return;
+DOMNodeList *nl;
+if (!GF_JS_InstanceOf(c, obj, &dom_rt->domNodeListClass, NULL) )
+	return;
 
-	nl = (DOMNodeList *) SMJS_GET_PRIVATE(c, obj);
-	if (!nl) 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);
-		}
+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);
+}
+gf_free(nl);
 }
 
 static JSBool SMJS_FUNCTION(dom_nodelist_item)
@@ -610,42 +611,42 @@
 
 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);
+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;
+if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 
-	switch (SMJS_ID_TO_INT(id)) {
-	case NODELIST_JSPROPERTY_LENGTH:
-		*vp = INT_TO_JSVAL( count );
+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;
-	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;
+}
+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;
+/*avoids gcc warning*/
+if (!obj) obj=NULL;
+if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
+/*no write prop*/
+return JS_TRUE;
 }
 
 
@@ -672,8 +673,8 @@
 	}
 }
 
-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)
+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);
@@ -686,14 +687,14 @@
 		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);
@@ -737,9 +738,9 @@
 	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) {
+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;
@@ -799,7 +800,7 @@
 }
 
 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)
+                                JSContext *c, char *callback, jsval funval, JSObject *evt_handler)
 {
 	GF_FieldInfo info;
 	GF_Node *listener;
@@ -811,7 +812,7 @@
 
 	/*!!! create the handler in the scene owning the script context !!! */
 	{
-		/* removed in harmonisation with XHR, was it really needed ? 
+		/* 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);
@@ -868,8 +869,8 @@
 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_Node *listener = NULL;
+	GF_EventType evtType = GF_EVENT_UNKNOWN;
 	GF_SceneGraph *sg = NULL;
 	char *callback = NULL;
 	jsval funval = JSVAL_NULL;
@@ -885,7 +886,7 @@
 	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);	
+	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);
@@ -899,8 +900,8 @@
 	}
 
 err_exit:
-   if (callback) SMJS_FREE(c, callback);
-   return JS_TRUE;
+	if (callback) SMJS_FREE(c, callback);
+	return JS_TRUE;
 }
 
 
@@ -928,7 +929,7 @@
 	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);	
+	sg_js_get_event_target(c, obj, evtType, vrml_node, &sg, &target, &node);
 	if (!sg || !target) return JS_TRUE;
 
 	/*flush all pending add_listener*/
@@ -951,9 +952,9 @@
 		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;
+			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
@@ -984,16 +985,16 @@
 /*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;
+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);
+SMJS_SET_PRIVATE(c, obj, NULL);
+gf_list_del_item(n->sgprivate->scenegraph->objects, obj);
 
-	dom_js_pre_destroy(c, n->sgprivate->scenegraph, n);
-	dom_unregister_node(n);
+dom_js_pre_destroy(c, n->sgprivate->scenegraph, n);
+dom_unregister_node(n);
 }
 
 static Bool check_dom_parents(JSContext *c, GF_Node *n, GF_Node *parent)
@@ -1056,7 +1057,7 @@
 			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) {
@@ -1200,7 +1201,7 @@
 	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);
@@ -1333,173 +1334,173 @@
 
 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;
-	}
+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;
+/*not supported*/
+if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 
-	tag = n ? gf_node_get_tag(n) : 0;
-	par = (GF_ParentNode*)n;
+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:
+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 (!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);
+	}
+	/*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) {
-			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);
+			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_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_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;
+	}
+	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;
 			}
-			if (last) *vp = dom_element_construct(c, last);
+			child = child->next;
 		}
-		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;
-
+		if (last) *vp = dom_element_construct(c, last);
 	}
-	/*not supported*/
 	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)
@@ -1515,41 +1516,41 @@
 
 static SMJS_FUNC_PROP_SET( dom_node_setProperty)
 
-	u32 tag;
-	GF_Node *n;
+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;
+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;
+if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 
-	tag = n ? gf_node_get_tag(n) : 0;
+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;
+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);
 	}
-	/*not supported*/
+	/*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;
 }
 
 
@@ -1559,87 +1560,87 @@
 fortunately a sg cannot be created like that...*/
 DECL_FINALIZE(dom_document_finalize)
 
-	GF_SceneGraph *sg = dom_get_doc(c, obj);
-
-	sg = (GF_SceneGraph*) SMJS_GET_PRIVATE(c, obj);
-	/*the JS proto of the svgClass or a destroyed object*/
-	if (!sg) return;
+GF_SceneGraph *sg = dom_get_doc(c, obj);
 
-	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);
-		}
+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;
+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;
-	}
+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;
+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;
+}
+return JS_TRUE;
 }
 
 static JSBool SMJS_FUNCTION(xml_document_create_element)
@@ -1792,28 +1793,28 @@
 /*dom3 element*/
 DECL_FINALIZE( dom_element_finalize)
 
-	dom_node_finalize(c, obj);
+dom_node_finalize(c, obj);
 }
 
-static SMJS_FUNC_PROP_GET( dom_element_getProperty) 
+static SMJS_FUNC_PROP_GET( dom_element_getProperty)
 
-	u32 prop_id;
-	GF_Node *n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
+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;
-	}
+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)
 {
@@ -2009,7 +2010,7 @@
 	/*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++) {
+	for (i=0; i<count; i++) {
 		GF_FieldInfo info;
 		GF_DOMText *text;
 		GF_Node *listen = gf_dom_listener_get(n, i);
@@ -2017,7 +2018,7 @@
 		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 
+		/* 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);
@@ -2067,7 +2068,7 @@
 		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 
+			/*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;
@@ -2092,12 +2093,24 @@
 		}
 
 		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;
+		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;
 		}
@@ -2112,7 +2125,7 @@
 				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);
@@ -2165,7 +2178,7 @@
 	if (!n) return JS_TRUE;
 	if ((argc < 2)) return JS_TRUE;
 
-	if (!JSVAL_CHECK_STRING(argv[0])) 
+	if (!JSVAL_CHECK_STRING(argv[0]))
 		return JS_TRUE;
 
 	idx = 1;
@@ -2173,7 +2186,7 @@
 	/*NS version*/
 	if (argc==3) {
 		char *sep;
-		if (!JSVAL_CHECK_STRING(argv[1])) 
+		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);
@@ -2204,7 +2217,7 @@
 	} else {
 		goto exit;
 	}
-	if (!name || !val) 
+	if (!name || !val)
 		goto exit;
 
 
@@ -2265,7 +2278,7 @@
 	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;
 }
@@ -2310,53 +2323,53 @@
 
 /*dom3 character/text/comment*/
 
-static SMJS_FUNC_PROP_GET( dom_text_getProperty) 
+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;
-	}
+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*/
+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)
@@ -2386,177 +2399,191 @@
 
 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 );
+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;
-		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;
+		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_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:
-			if (!evt->media_event) return JS_TRUE;
-			*vp = INT_TO_JSVAL( evt->media_event->loaded_size);
-			return JS_TRUE;
-		case EVENT_JSPROPERTY_TOTAL:
-			if (!evt->media_event) return JS_TRUE;
-			*vp = INT_TO_JSVAL( evt->media_event->total_size);
-			return JS_TRUE;
-		case EVENT_JSPROPERTY_BUFFERLEVELVALID:
-			if (!evt->media_event) return JS_TRUE;
-			*vp = BOOLEAN_TO_JSVAL( evt->media_event->bufferValid ? JS_TRUE : JS_FALSE);
-			return JS_TRUE;
-		case EVENT_JSPROPERTY_BUFFERLEVEL:
-			if (!evt->media_event) return JS_TRUE;
-			*vp = INT_TO_JSVAL( evt->media_event->level);
-			return JS_TRUE;
-		case EVENT_JSPROPERTY_BUFFERREMAININGTIME:
-			if (!evt->media_event) return JS_TRUE;
-			*vp = JS_MAKE_DOUBLE(c, evt->media_event->remaining_time);
-			return JS_TRUE;
-		case EVENT_JSPROPERTY_STATUS:
-			if (!evt->media_event) return JS_TRUE;
-			*vp = INT_TO_JSVAL( evt->media_event->status);
-			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 ? 1 : 0); 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 ? 1 : 0);
+		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;
-		}
+	default:
+		return JS_TRUE;
 	}
-	return JS_TRUE;
+}
+return JS_TRUE;
 }
 
 /************************************************************
@@ -2645,7 +2672,7 @@
 	GF_DownloadSession *sess;
 	char *data;
 	u32 size;
-	JSObject *arraybuffer; 
+	JSObject *arraybuffer;
 	GF_Err ret_code;
 	u32 html_status;
 	char *statusText;
@@ -2715,43 +2742,43 @@
 			}
 			/*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")
-				) {
+			        || !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") ) {
+			        || !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;
@@ -2815,8 +2842,14 @@
 
 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; }
+	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);
 
@@ -2857,23 +2890,23 @@
 
 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);
-	}
+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)
 {
@@ -2886,6 +2919,15 @@
 	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;
@@ -2906,7 +2948,7 @@
 	GF_SceneGraph *scene;
 	GF_Node *n;
 	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);
@@ -2949,13 +2991,13 @@
 	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") ) {
+	        && 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*/
@@ -3093,7 +3135,7 @@
 
 #define USE_PROGRESSIVE_SAX	0
 
-static void xml_http_terminate(XMLHTTPContext *ctx, GF_Err error) 
+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) {
@@ -3129,14 +3171,14 @@
 
 	/*make sure we can grab JS and the session is not destroyed*/
 	while (ctx->sess) {
-		if (gf_sg_try_lock_javascript(ctx->c) ){
+		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 (!ctx->sess && !ctx->isFile) {
 		if (locked)
 			gf_sg_lock_javascript(ctx->c, GF_FALSE);
 		return;
@@ -3202,18 +3244,18 @@
 		/*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/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) {
@@ -3261,7 +3303,7 @@
 	GF_NETIO_Parameter par;
 	u64 fsize;
 	FILE *responseFile;
-		
+
 	/*opera-style local host*/
 	if (!strnicmp(ctx->url, "file://localhost", 16)) responseFile = gf_f64_open(ctx->url+16, "rb");
 	/*regular-style local host*/
@@ -3283,17 +3325,17 @@
 
 	par.msg_type = GF_NETIO_WAIT_FOR_REPLY;
 	xml_http_on_data(ctx, &par);
-		
+
 	gf_f64_seek(responseFile, 0, SEEK_END);
 	fsize = gf_f64_tell(responseFile);
 	gf_f64_seek(responseFile, 0, SEEK_SET);
-		
+
 	ctx->data = (char *)gf_malloc(sizeof(char)*(size_t)(fsize+1));
 	fsize = fread(ctx->data, sizeof(char), (size_t)fsize, responseFile);
 	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";
@@ -3316,7 +3358,7 @@
 
 	memset(&par, 0, sizeof(GF_NETIO_Parameter));
 	par.msg_type = GF_NETIO_DATA_TRANSFERED;
-	xml_http_on_data(ctx, &par);			
+	xml_http_on_data(ctx, &par);
 
 	if (!ctx->async) {
 		xml_http_terminate(ctx, GF_OK);
@@ -3366,17 +3408,17 @@
 
 	if (!strncmp(ctx->url, "http://", 7)) {
 		u32 flags;
-		
+
 		flags = ctx->async ? 0 : 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);			
+		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)*/
@@ -3523,191 +3565,191 @@
 
 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;
+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;
-            }
+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;
-		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");
+		}
+		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_CACHETYPE_NONE:
-				s = JS_NewStringCopyZ(c, "none");
+			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_CACHETYPE_MEMORY:
-				s = JS_NewStringCopyZ(c, "memory");
+			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;
 			}
-			*vp = STRING_TO_JSVAL(s);
-			return JS_TRUE;
-		default:
-			return JS_TRUE;
+		} 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();
+}
+return SMJS_CALL_PROP_STUB();
 }
 
 JSBool gf_set_js_eventhandler(JSContext *c, jsval vp, jsval *callbackfuncval) {
@@ -3734,231 +3776,231 @@
 
 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;
+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;
+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;
 	}
-	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;
+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;
-					}
+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;
+			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;
 			}
-			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;
+			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;
 			}
-			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;
+			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;
 			}
-			*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;
+			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();
+}
+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;
+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;
+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 (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;
 			}
-			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;
+			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) );
+			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;
+		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;
-		}
+	/*all other properties are read-only*/
+	default:
+		break;
 	}
-	SMJS_FREE(c, str);
-	return JS_TRUE;
+}
+SMJS_FREE(c, str);
+return JS_TRUE;
 }
 
 Bool dcci_prop_lookup(GF_DOMFullNode *n, char *ns, char *name, Bool deep, Bool first)
@@ -4075,23 +4117,23 @@
 
 static SMJS_FUNC_PROP_GET( storage_getProperty)
 
-	/*avoids gcc warning*/
+/*avoids gcc warning*/
 #ifndef GPAC_CONFIG_DARWIN
-    if (!id) id=0;
+if (!id) id=0;
 #endif
-    if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
-	*vp = JSVAL_VOID;
-	return JS_TRUE;
+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*/
+/*avoids gcc warning*/
 #ifndef GPAC_CONFIG_DARWIN
-    if (!id) id=0;
+if (!id) id=0;
 #endif
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
-	return JS_TRUE;
+if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
+return JS_TRUE;
 }
 
 static JSBool SMJS_FUNCTION(storage_constructor)
@@ -4104,13 +4146,13 @@
 
 static DECL_FINALIZE( storage_finalize)
 
-	/*avoids GCC warning*/
-	if (!c) c=NULL;
+/*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 );
+	JS_DefineObject(c, parent_obj, name, &dom_rt->storageClass._class, 0, 0 );
 }
 
 void dom_js_load(GF_SceneGraph *scene, JSContext *c, JSObject *global)
@@ -4353,7 +4395,7 @@
 			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("bufferLevelValid",	EVENT_JSPROPERTY_BUFFERLEVELVALID,  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),
@@ -4370,6 +4412,7 @@
 			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),
 		};
@@ -4441,7 +4484,6 @@
 			SMJS_FUNCTION_SPEC("wait",					xml_http_wait, 0),
 			/*eventTarget interface*/
 			JS_DOM3_EVENT_TARGET_INTERFACE
-			/*todo - addEventListener and removeEventListener*/
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		GF_JS_InitClass(c, global, NULL, &dom_rt->xmlHTTPRequestClass, xml_http_constructor, 0, xmlHTTPRequestClassProps, xmlHTTPRequestClassFuncs, xmlHTTPRequestStaticClassProps, 0);
@@ -4504,9 +4546,9 @@
 {
 	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->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);
@@ -4581,10 +4623,18 @@
 {
 	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; }
+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) )
 {

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/html5_media_smjs.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/html5_media_smjs.c Changed

@@ -53,7 +53,7 @@
 
 /***********************************************************
  *
- * DOM generic functions being used 
+ * DOM generic functions being used
  *
  ***********************************************************/
 #ifdef USE_FFDEV_15
@@ -82,74 +82,74 @@
 /* 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
+	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 
+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
+	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
+	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
+	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; \
@@ -171,7 +171,7 @@
 {
 	GF_TextureHandler txh;
 	struct _drawable *graph;
-	MFURL txurl;	
+	MFURL txurl;
 	Bool first_frame_fetched;
 	GF_Node *audio;
 	Bool audio_dirty;
@@ -194,44 +194,47 @@
  */
 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;
+	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;
-    }
-    track->_this = track_obj;
-    SMJS_SET_PRIVATE(c, track->_this, track);
+	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
@@ -254,51 +257,51 @@
 
 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->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->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->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->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->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->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->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);
+	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 
- * 
+/* 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 
+ * \param me the HTMLMediaElement to update
  */
 static void html_media_element_populate_tracks(JSContext *c, GF_HTML_MediaElement *me)
 {
-    GF_HTML_Track *track;
+	GF_HTML_Track *track;
 	GF_MediaObject *mo;
-    GF_ClientService *service;
-    GF_Scene *scene;
-    u32 i, count;
+	GF_ClientService *service;
+	GF_Scene *scene;
+	u32 i, count;
 
 	if (!me || !me->node) {
 		return;
@@ -311,50 +314,50 @@
 	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;
-            }
-        }
-    }
+	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
@@ -363,18 +366,18 @@
  * 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 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;
+	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) {
+	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);
@@ -382,16 +385,16 @@
 			me = (GF_HTML_MediaElement *)SMJS_GET_PRIVATE(c, me_obj);
 		}
 	}
-    return me;
+	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))
-    {
+	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);
@@ -401,99 +404,99 @@
 		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 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 {
+	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 {
+	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 {
+	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;
-    }
+	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 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);
-    }
+	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 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);
+	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 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
@@ -501,7 +504,7 @@
 void gf_html_media_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg) {
 	if (!sg || !target) return;
 	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
-		GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, 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;
@@ -512,643 +515,643 @@
 }
 
 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);
+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;
+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;
+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);
-	}
+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;
+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);
-	}
+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;
+	GF_DOMMediaEvent media_event;
+	u32 min_time;
+	u32 min_buffer;
+	if (!mo) return;
 
 	if (!mo->odm) {
-        *readyState = HAVE_NOTHING;
-        *networkState = NETWORK_EMPTY;
+		*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;
-        }
-    }
+	}
+
+	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;
+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;
+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) ||
+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 );
+{
+	if (!SMJS_ID_IS_INT(id)) {
 		return JS_TRUE;
-    } else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
 	}
+	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;
+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);
-	}
+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;
+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;
+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;
+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;
+	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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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);
-	}
+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;
+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);
-	}
+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;
+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);
-	}
+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;
+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);
-	}
+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;
+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);
-	}
+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;
-    }
+	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;
+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);
-	}
+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;
+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);
-	}
+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 ) );
+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 ) );
 	}
-    return JS_TRUE;
+	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);
-	}
+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;
+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;
+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;
+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;
+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);
+	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;
+	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);
+	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;
+	return JS_TRUE;
 }
 
 static Bool html_is_track_list(JSContext *c, JSObject *obj) {
@@ -1159,284 +1162,284 @@
 }
 
 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);
-		}
+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);
+		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
+	SMJS_OBJ
+	SMJS_ARGS
 	if (html_is_track_list(c, obj)) {
 		GF_HTML_TrackList *tracklist;
 		GF_HTML_Track *track;
-	    char *str;	
+		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;
+			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);
+		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);
+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);
-	}
+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;
+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 {
-        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		*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);
-	}
+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;
+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 {
-        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		*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);
-	}
+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;
+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 {
-        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		*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);
-	}
+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;
-        }
+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;
-	} else {
-        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
 	}
+	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;
-        }
+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;
-	} else {
-        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
 	}
+	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;
-        }
+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;
-	} else {
-        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
 	}
+	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;
-            }
-        }
+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;
-	} else {
-        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
 	}
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
 }
 
 static JSBool SMJS_FUNCTION(html_media_event_add_listener)
@@ -1459,258 +1462,258 @@
 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) {
+	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),
+	/* 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);
-    }
+				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*/

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/html5_mse_smjs.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/html5_mse_smjs.c Changed

@@ -39,26 +39,26 @@
 
 #define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
 
-typedef enum 
+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,
+	/* 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;
@@ -72,12 +72,12 @@
 
 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;
+	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) {
@@ -103,11 +103,11 @@
 
 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);
+	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>
@@ -115,72 +115,72 @@
 
 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])) {
+	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);
+	}
+	mime = SMJS_CHARS(c, argv[0]);
+	sg = mediasource_get_scenegraph(c);
 	assert(sg);
-	if (!strlen(mime)) { 
+	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_SET_RVAL(BOOLEAN_TO_JSVAL(isSupported ? JS_TRUE : JS_FALSE));
 	SMJS_FREE(c, mime);
-    return JS_TRUE;
+	return JS_TRUE;
 }
 
 static JSBool SMJS_FUNCTION(mediasource_addSourceBuffer)
 {
-    SMJS_OBJ
-    SMJS_ARGS
-    GF_HTML_SourceBuffer    *sb;
-    GF_HTML_MediaSource     *ms;
-    const char              *mime;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_HTML_SourceBuffer    *sb;
+	GF_HTML_MediaSource     *ms;
+	const char              *mime;
 	GF_Err					e;
 	u32						exception = 0;
 
 	e = GF_OK;
-    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])) 
-    {
+	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
 		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-    }
-    mime = SMJS_CHARS(c, argv[0]);
-    if (!strlen(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]);
+	if (!strlen(mime))     {
 		exception = GF_DOM_EXC_INVALID_ACCESS_ERR;
 		goto exit;
-    }
-    ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+	}
+	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);
-    /* 
+	}
+	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);
+	sb = gf_mse_source_buffer_new(ms);
 	assert(sb);
-    e = gf_mse_source_buffer_load_parser(sb, mime);
+	e = gf_mse_source_buffer_load_parser(sb, mime);
 	if (e == GF_OK) {
-	    gf_mse_mediasource_add_source_buffer(ms, sb);
+		gf_mse_mediasource_add_source_buffer(ms, sb);
 		mediasource_sourceBuffer_initjs(c, obj, sb);
 		SMJS_SET_RVAL( OBJECT_TO_JSVAL(sb->_this) );
 	} else {
@@ -188,7 +188,7 @@
 		exception = GF_DOM_EXC_NOT_SUPPORTED_ERR;
 	}
 exit:
-	if (mime) { 
+	if (mime) {
 		SMJS_FREE(c, (void *)mime);
 	}
 	if (exception) {
@@ -200,49 +200,49 @@
 
 static JSBool SMJS_FUNCTION(mediasource_removeSourceBuffer)
 {
-    SMJS_OBJ
-    SMJS_ARGS
-    GF_HTML_MediaSource *ms;
+	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 (!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);
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
 	}
-    if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
+	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);
+	}
+	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);
+		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;
+	return JS_TRUE;
 }
 
 static JSBool SMJS_FUNCTION(mediasource_endOfStream)
 {
-    SMJS_OBJ
-    SMJS_ARGS
-    GF_HTML_MediaSource *ms;
+	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 (!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);
+		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);
@@ -253,194 +253,194 @@
 			return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
 		}
 	}
-    if (argc > 0)  {
+	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]);
+		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;
+	return JS_TRUE;
 }
 
 static JSBool SMJS_FUNCTION(media_source_constructor)
 {
-    GF_HTML_MediaSource *p;
-    SMJS_OBJ_CONSTRUCTOR(&html_media_rt->mediaSourceClass)
+	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;
+	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 = 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->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);
+	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;
+	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);
+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;
+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;
+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;
+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;
+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) {
+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 {
-        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);
-				}
+	} 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 */
-				}
+		}
+		{
+			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;
+}
+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;
-			}
-
+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;
+
+	}
+}
+return JS_TRUE;
 
 }
 
@@ -484,343 +484,343 @@
 
 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) {
+	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])) {
+	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) ) 
-    {
+	}
+	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)
-    {
+	}
+	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: handle buffer full flag case */
 	/* TODO: run the coded frame eviction algo */
-    gf_mse_source_buffer_append_arraybuffer(sb, ab);
-    return JS_TRUE;
+	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;
+	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) {
+	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) {
+	}
+	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;
+	}
+	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) {
+	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;
+	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;
+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;
-    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;
-    }
+char *smode = NULL;
+GF_HTML_MediaSource_AppendMode mode;
+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);
-    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;
+	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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+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;
+	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 (length > 0) {
-        ab->data = data;
-        ab->length = length;
-    }
-    ab->reference_count = 0;
-    return ab;
+	GF_HTML_ArrayBuffer *ab = NULL;
+	GF_SAFEALLOC(ab, GF_HTML_ArrayBuffer);
+	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;
+	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) 
+void gf_arraybuffer_del(GF_HTML_ArrayBuffer *buffer, Bool del_js)
 {
-    if (buffer) {
-        if (del_js && buffer->_this) {
+	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); 
+			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);
+			/* 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);
-        }
-    }
+			gf_free(buffer);
+		}
+	}
 }
 
 static JSBool SMJS_FUNCTION(arraybuffer_constructor)
 {
-    SMJS_ARGS
-    u32 length = 0;
-    SMJS_OBJ_CONSTRUCTOR(&html_media_rt->arrayBufferClass)
+	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;
+	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;
+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);
+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)
@@ -838,109 +838,109 @@
 static JSBool SMJS_FUNCTION(mse_event_dispatch)
 {
 	/* TODO */
-    return JS_TRUE;
+	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"));
-        }
-    }
+	/* 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"));
+		}
+	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/mpeg4_animators.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/mpeg4_animators.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -128,8 +128,8 @@
 		break;
 	}
 	nurbs->p = nurbs->nknots - nurbs->npoints - 1;
-	if ((nurbs->p<=0) || (nurbs->p >= nurbs->nknots -1) 
-		|| ((nurbs->nweights>0) && (nurbs->npoints != nurbs->nweights)) ) {
+	if ((nurbs->p<=0) || (nurbs->p >= nurbs->nknots -1)
+	        || ((nurbs->nweights>0) && (nurbs->npoints != nurbs->nweights)) ) {
 		nurbs->valid = 0;
 	} else {
 		nurbs->valid = 1;
@@ -151,7 +151,7 @@
 		nurbs->left[i] = t - nurbs->knots[span+1-i];
 		nurbs->right[i] = nurbs->knots[span+i]-t;
 		saved = 0;
-		
+
 		for(j=0; j<i; j++) {
 			temp = gf_divfix(nurbs->n[j], nurbs->right[j+1] + nurbs->left[i-j]);
 			nurbs->n[j] = saved + gf_mulfix(nurbs->right[j+1], temp);
@@ -172,18 +172,18 @@
 	span--;
 	return span;
 #else
-	s32 low, high, mid;	
+	s32 low, high, mid;
 	if (u == nurbs->knots[nurbs->npoints]) return nurbs->npoints - 1;
-	low = nurbs->p; 
-	high = nurbs->npoints; 
+	low = nurbs->p;
+	high = nurbs->npoints;
 	mid = (low + high)/2;
-	
+
 	while (u < nurbs->knots[mid] || u >= nurbs->knots[mid+1]) {
-		if (u < nurbs->knots[mid]) high = mid; 
+		if (u < nurbs->knots[mid]) high = mid;
 		else low = mid;
 		mid = (low + high)/2;
-	}	
-	return (mid); 
+	}
+	return (mid);
 
 #endif
 }
@@ -196,7 +196,7 @@
 	tmp.x = tmp.y = tmp.z = 0;
 	res = tmp;
 	w=0;
-	for(i=0; i<=nurbs->p;i++) {
+	for(i=0; i<=nurbs->p; i++) {
 		tmp = pts[span - nurbs->p + i];
 		if (nurbs->nweights>0) {
 			wi = nurbs->weights[span - nurbs->p + i];
@@ -224,7 +224,7 @@
 	tmp.x = tmp.y = 0;
 	res = tmp;
 	w=0;
-	for(i=0; i<=nurbs->p;i++) {
+	for(i=0; i<=nurbs->p; i++) {
 		tmp = pts[span - nurbs->p + i];
 		if (nurbs->nweights>0) {
 			wi = nurbs->weights[span - nurbs->p + i];
@@ -252,7 +252,7 @@
 	u32 i;
 	res = tmp = 0;
 	w=0;
-	for(i=0; i<=nurbs->p;i++) {
+	for(i=0; i<=nurbs->p; i++) {
 		tmp = vals[span - nurbs->p + i];
 		if (nurbs->nweights>0) {
 			wi = nurbs->weights[span - nurbs->p + i];
@@ -340,7 +340,7 @@
 			d.z = pa->keyValue.vals[i+1].z - pa->keyValue.vals[i].z;
 			stack->length += gf_vec_len(d);
 		}
-	} 
+	}
 	Animator_Update(stack, pa->keyValueType, pa->keyValue.count, &pa->keySpline, pa->weight.count, pa->weight.vals);
 }
 static void PA_SetFraction(GF_Node *node, GF_Route *route)
@@ -368,8 +368,14 @@
 		switch (stack->anim_type) {
 		case ANIM_DEFAULT:
 			if (nbKeys != nbVals) return;
-			if (frac<pa->key.vals[0]) { i=0; frac = 0; }
-			else if (frac>pa->key.vals[nbKeys-1]) { i=nbVals-2; frac = FIX_ONE; }
+			if (frac<pa->key.vals[0]) {
+				i=0;
+				frac = 0;
+			}
+			else if (frac>pa->key.vals[nbKeys-1]) {
+				i=nbVals-2;
+				frac = FIX_ONE;
+			}
 			else {
 				for (i=0; i<nbKeys-1; i++) {
 					if ((frac>=pa->key.vals[i]) && (frac<pa->key.vals[i+1])) break;
@@ -436,7 +442,7 @@
 		/*nothing to do for this one here*/
 		case ANIM_DEFAULT:
 		/*not supported - use frac as is*/
-		case ANIM_PACED: 
+		case ANIM_PACED:
 		default:
 			break;
 		}
@@ -446,7 +452,7 @@
 		pa->value_changed = anurbs_get_vec3f(&stack->anurbs, i, pa->keyValue.vals);
 		break;
 	/*not supported*/
-	case ANIM_SPLINE: 
+	case ANIM_SPLINE:
 	default:
 		return;
 	}
@@ -454,7 +460,7 @@
 	pa->value_changed.x += pa->offset.x;
 	pa->value_changed.y += pa->offset.y;
 	pa->value_changed.z += pa->offset.z;
-	gf_node_event_out_str(node, "value_changed");
+	gf_node_event_out(node, 12/*"value_changed"*/);
 }
 
 void PA_Modified(GF_Node *node, GF_FieldInfo *field)
@@ -463,15 +469,15 @@
 	M_PositionAnimator *pa = (M_PositionAnimator *)node;
 
 	if ( /*all fields impacting cached path len / nurbs*/
-		(field->far_ptr == &pa->keyValue) 
-		|| (field->far_ptr == &pa->keyValueType) 
-		|| (field->far_ptr == &pa->key) 
-		|| (field->far_ptr == &pa->keyType) 
-		|| (field->far_ptr == &pa->keySpline) 
-		|| (field->far_ptr == &pa->weight) 
-		|| (field->far_ptr == &pa->key) 
-		
-		) stack->is_dirty = 1;
+	    (field->far_ptr == &pa->keyValue)
+	    || (field->far_ptr == &pa->keyValueType)
+	    || (field->far_ptr == &pa->key)
+	    || (field->far_ptr == &pa->keyType)
+	    || (field->far_ptr == &pa->keySpline)
+	    || (field->far_ptr == &pa->weight)
+	    || (field->far_ptr == &pa->key)
+
+	) stack->is_dirty = 1;
 }
 void PA_Init(GF_Node *n)
 {
@@ -500,7 +506,7 @@
 			dy = pa->keyValue.vals[i+1].y - pa->keyValue.vals[i].y;
 			stack->length += gf_sqrt(gf_mulfix(dx, dx) + gf_mulfix(dy, dy));
 		}
-	} 
+	}
 	Animator_Update(stack, pa->keyValueType, pa->keyValue.count, &pa->keySpline, pa->weight.count, pa->weight.vals);
 }
 static void PA2D_SetFraction(GF_Node *node, GF_Route *route)
@@ -528,8 +534,14 @@
 		switch (stack->anim_type) {
 		case ANIM_DEFAULT:
 			if (nbKeys != nbVals) return;
-			if (frac<=pa->key.vals[0]) { i=0; frac = 0; }
-			else if (frac>=pa->key.vals[nbKeys-1]) { i=nbVals-2; frac=FIX_ONE; }
+			if (frac<=pa->key.vals[0]) {
+				i=0;
+				frac = 0;
+			}
+			else if (frac>=pa->key.vals[nbKeys-1]) {
+				i=nbVals-2;
+				frac=FIX_ONE;
+			}
 			else {
 				for (i=0; i<nbKeys-1; i++) {
 					if ((frac>=pa->key.vals[i]) && (frac<pa->key.vals[i+1])) break;
@@ -594,7 +606,7 @@
 		/*nothing to do for this one here*/
 		case ANIM_DEFAULT:
 		/*not supported - use frac as is*/
-		case ANIM_PACED: 
+		case ANIM_PACED:
 		default:
 			break;
 		}
@@ -604,14 +616,14 @@
 		pa->value_changed = anurbs_get_vec2f(&stack->anurbs, i, pa->keyValue.vals);
 		break;
 	/*not supported*/
-	case ANIM_SPLINE: 
+	case ANIM_SPLINE:
 	default:
 		return;
 	}
 
 	pa->value_changed.x += pa->offset.x;
 	pa->value_changed.y += pa->offset.y;
-	gf_node_event_out_str(node, "value_changed");
+	gf_node_event_out(node, 12/*"value_changed"*/);
 }
 
 void PA2D_Modified(GF_Node *node, GF_FieldInfo *field)
@@ -620,15 +632,15 @@
 	M_PositionAnimator2D *pa = (M_PositionAnimator2D *)node;
 
 	if ( /*all fields impacting cached path len / nurbs*/
-		(field->far_ptr == &pa->keyValue) 
-		|| (field->far_ptr == &pa->keyValueType) 
-		|| (field->far_ptr == &pa->key) 
-		|| (field->far_ptr == &pa->keyType) 
-		|| (field->far_ptr == &pa->keySpline) 
-		|| (field->far_ptr == &pa->weight) 
-		|| (field->far_ptr == &pa->key) 
-		
-		) stack->is_dirty = 1;
+	    (field->far_ptr == &pa->keyValue)
+	    || (field->far_ptr == &pa->keyValueType)
+	    || (field->far_ptr == &pa->key)
+	    || (field->far_ptr == &pa->keyType)
+	    || (field->far_ptr == &pa->keySpline)
+	    || (field->far_ptr == &pa->weight)
+	    || (field->far_ptr == &pa->key)
+
+	) stack->is_dirty = 1;
 }
 void PA2D_Init(GF_Node *n)
 {
@@ -656,7 +668,7 @@
 			len = sa->keyValue.vals[i+1] - sa->keyValue.vals[i];
 			stack->length += ABS(len);
 		}
-	} 
+	}
 	Animator_Update(stack, sa->keyValueType, sa->keyValue.count, &sa->keySpline, sa->weight.count, sa->weight.vals);
 }
 
@@ -684,8 +696,14 @@
 		switch (stack->anim_type) {
 		case ANIM_DEFAULT:
 			if (nbKeys != nbVals) return;
-			if (frac<sa->key.vals[0]) { i=0; frac = 0; }
-			else if (frac>sa->key.vals[nbKeys-1]) { i=nbVals-2; frac=FIX_ONE; }
+			if (frac<sa->key.vals[0]) {
+				i=0;
+				frac = 0;
+			}
+			else if (frac>sa->key.vals[nbKeys-1]) {
+				i=nbVals-2;
+				frac=FIX_ONE;
+			}
 			else {
 				for (i=0; i<nbKeys-1; i++) {
 					if ((frac>=sa->key.vals[i]) && (frac<sa->key.vals[i+1])) break;
@@ -746,7 +764,7 @@
 		/*nothing to do for this one here*/
 		case ANIM_DEFAULT:
 		/*not supported - use frac as is*/
-		case ANIM_PACED: 
+		case ANIM_PACED:
 		default:
 			break;
 		}
@@ -756,13 +774,13 @@
 		sa->value_changed = anurbs_get_float(&stack->anurbs, i, sa->keyValue.vals);
 		break;
 	/*not supported*/
-	case ANIM_SPLINE: 
+	case ANIM_SPLINE:
 	default:
 		return;
 	}
 
 	sa->value_changed += sa->offset;
-	gf_node_event_out_str(node, "value_changed");
+	gf_node_event_out(node, 10/*"value_changed"*/);
 }
 
 void SA_Modified(GF_Node *node, GF_FieldInfo *field)
@@ -771,15 +789,15 @@
 	M_ScalarAnimator *sa = (M_ScalarAnimator *)node;
 
 	if ( /*all fields impacting cached path len / nurbs*/
-		(field->far_ptr == &sa->keyValue) 
-		|| (field->far_ptr == &sa->keyValueType) 
-		|| (field->far_ptr == &sa->key) 
-		|| (field->far_ptr == &sa->keyType) 
-		|| (field->far_ptr == &sa->keySpline) 
-		|| (field->far_ptr == &sa->weight) 
-		|| (field->far_ptr == &sa->key) 
-		
-		) stack->is_dirty = 1;
+	    (field->far_ptr == &sa->keyValue)
+	    || (field->far_ptr == &sa->keyValueType)
+	    || (field->far_ptr == &sa->key)
+	    || (field->far_ptr == &sa->keyType)
+	    || (field->far_ptr == &sa->keySpline)
+	    || (field->far_ptr == &sa->weight)
+	    || (field->far_ptr == &sa->key)
+
+	) stack->is_dirty = 1;
 }
 
 void SA_Init(GF_Node *n)

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/mpeg4_nodes.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/mpeg4_nodes.c Changed

@@ -15,7 +15,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -47,7 +47,7 @@
 	gf_sg_sfstring_del(p->description);
 	gf_sg_mfstring_del(p->parameter);
 	gf_sg_mfurl_del(p->url);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -58,10 +58,14 @@
 static u32 Anchor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -150,7 +154,7 @@
 	if (!strcmp("url", name)) return 5;
 	if (!strcmp("activate", name)) return 6;
 	return -1;
-	}
+}
 static Bool Anchor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -193,10 +197,14 @@
 static u32 AnimationStream_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 7;
 	}
@@ -282,7 +290,7 @@
 	if (!strcmp("duration_changed", name)) return 5;
 	if (!strcmp("isActive", name)) return 6;
 	return -1;
-	}
+}
 static Bool AnimationStream_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -321,9 +329,9 @@
 static void Appearance_Del(GF_Node *node)
 {
 	M_Appearance *p = (M_Appearance *) node;
-	gf_node_unregister((GF_Node *) p->material, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->texture, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->textureTransform, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->material, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->texture, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->textureTransform, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -334,10 +342,14 @@
 static u32 Appearance_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 3;
 	}
@@ -395,7 +407,7 @@
 	if (!strcmp("texture", name)) return 1;
 	if (!strcmp("textureTransform", name)) return 2;
 	return -1;
-	}
+}
 static Bool Appearance_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -425,7 +437,7 @@
 static void AudioBuffer_Del(GF_Node *node)
 {
 	M_AudioBuffer *p = (M_AudioBuffer *) node;
-	gf_node_unregister_children((GF_Node *) p, p->children);	
+	gf_node_unregister_children((GF_Node *) p, p->children);
 	gf_sg_mfint32_del(p->phaseGroup);
 	gf_node_free((GF_Node *) p);
 }
@@ -438,10 +450,14 @@
 static u32 AudioBuffer_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 10;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 10;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 10;
 	}
@@ -549,7 +565,7 @@
 	if (!strcmp("duration_changed", name)) return 8;
 	if (!strcmp("isActive", name)) return 9;
 	return -1;
-	}
+}
 static Bool AudioBuffer_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -631,10 +647,14 @@
 static u32 AudioClip_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 8;
 	}
@@ -727,7 +747,7 @@
 	if (!strcmp("duration_changed", name)) return 6;
 	if (!strcmp("isActive", name)) return 7;
 	return -1;
-	}
+}
 static Bool AudioClip_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -767,7 +787,7 @@
 {
 	M_AudioDelay *p = (M_AudioDelay *) node;
 	gf_sg_mfint32_del(p->phaseGroup);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -778,10 +798,14 @@
 static u32 AudioDelay_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -862,7 +886,7 @@
 	if (!strcmp("numChan", name)) return 4;
 	if (!strcmp("phaseGroup", name)) return 5;
 	return -1;
-	}
+}
 static Bool AudioDelay_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -913,7 +937,7 @@
 	gf_sg_sfstring_del(p->score);
 	gf_sg_mffloat_del(p->params);
 	gf_sg_mfint32_del(p->phaseGroup);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -925,10 +949,14 @@
 static u32 AudioFX_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 8;
 	}
@@ -1026,7 +1054,7 @@
 	if (!strcmp("numChan", name)) return 6;
 	if (!strcmp("phaseGroup", name)) return 7;
 	return -1;
-	}
+}
 static Bool AudioFX_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -1080,7 +1108,7 @@
 	M_AudioMix *p = (M_AudioMix *) node;
 	gf_sg_mffloat_del(p->matrix);
 	gf_sg_mfint32_del(p->phaseGroup);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -1092,10 +1120,14 @@
 static u32 AudioMix_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 7;
 	}
@@ -1186,7 +1218,7 @@
 	if (!strcmp("numChan", name)) return 5;
 	if (!strcmp("phaseGroup", name)) return 6;
 	return -1;
-	}
+}
 static Bool AudioMix_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -1248,7 +1280,7 @@
 	M_AudioSource *p = (M_AudioSource *) node;
 	gf_sg_mfurl_del(p->url);
 	gf_sg_mfint32_del(p->phaseGroup);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -1260,10 +1292,14 @@
 static u32 AudioSource_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 10;
 	}
@@ -1375,7 +1411,7 @@
 	if (!strcmp("numChan", name)) return 8;
 	if (!strcmp("phaseGroup", name)) return 9;
 	return -1;
-	}
+}
 static Bool AudioSource_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -1439,7 +1475,7 @@
 	M_AudioSwitch *p = (M_AudioSwitch *) node;
 	gf_sg_mfint32_del(p->whichChoice);
 	gf_sg_mfint32_del(p->phaseGroup);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -1450,10 +1486,14 @@
 static u32 AudioSwitch_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -1534,7 +1574,7 @@
 	if (!strcmp("numChan", name)) return 4;
 	if (!strcmp("phaseGroup", name)) return 5;
 	return -1;
-	}
+}
 static Bool AudioSwitch_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -1608,10 +1648,14 @@
 static u32 Background_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 11;
-	case GF_SG_FIELD_CODING_DEF: return 10;
-	case GF_SG_FIELD_CODING_OUT: return 11;
-	case GF_SG_FIELD_CODING_DYN: return 4;
+	case GF_SG_FIELD_CODING_IN:
+		return 11;
+	case GF_SG_FIELD_CODING_DEF:
+		return 10;
+	case GF_SG_FIELD_CODING_OUT:
+		return 11;
+	case GF_SG_FIELD_CODING_DYN:
+		return 4;
 	default:
 		return 12;
 	}
@@ -1733,7 +1777,7 @@
 	if (!strcmp("skyColor", name)) return 10;
 	if (!strcmp("isBound", name)) return 11;
 	return -1;
-	}
+}
 static Bool Background_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -1804,10 +1848,14 @@
 static u32 Background2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 4;
 	}
@@ -1873,7 +1921,7 @@
 	if (!strcmp("url", name)) return 2;
 	if (!strcmp("isBound", name)) return 3;
 	return -1;
-	}
+}
 static Bool Background2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -1912,7 +1960,7 @@
 static void Billboard_Del(GF_Node *node)
 {
 	M_Billboard *p = (M_Billboard *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -1924,10 +1972,14 @@
 static u32 Billboard_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 4;
 	}
@@ -1997,7 +2049,7 @@
 	if (!strcmp("children", name)) return 2;
 	if (!strcmp("axisOfRotation", name)) return 3;
 	return -1;
-	}
+}
 static Bool Billboard_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -2046,10 +2098,14 @@
 static u32 Bitmap_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -2093,7 +2149,7 @@
 {
 	if (!strcmp("scale", name)) return 0;
 	return -1;
-	}
+}
 static Bool Bitmap_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -2139,10 +2195,14 @@
 static u32 Box_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 1;
 	}
@@ -2177,7 +2237,7 @@
 {
 	if (!strcmp("size", name)) return 0;
 	return -1;
-	}
+}
 static Bool Box_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -2227,10 +2287,14 @@
 static u32 Circle_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -2274,7 +2338,7 @@
 {
 	if (!strcmp("radius", name)) return 0;
 	return -1;
-	}
+}
 static Bool Circle_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -2311,8 +2375,8 @@
 static void Collision_Del(GF_Node *node)
 {
 	M_Collision *p = (M_Collision *) node;
-	gf_node_unregister((GF_Node *) p->proxy, (GF_Node *) p);	
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->proxy, (GF_Node *) p);
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -2323,10 +2387,14 @@
 static u32 Collision_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -2408,7 +2476,7 @@
 	if (!strcmp("proxy", name)) return 4;
 	if (!strcmp("collideTime", name)) return 5;
 	return -1;
-	}
+}
 static Bool Collision_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -2452,10 +2520,14 @@
 static u32 Color_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -2499,7 +2571,7 @@
 {
 	if (!strcmp("color", name)) return 0;
 	return -1;
-	}
+}
 static Bool Color_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -2547,10 +2619,14 @@
 static u32 ColorInterpolator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -2613,7 +2689,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool ColorInterpolator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -2655,9 +2731,9 @@
 static void CompositeTexture2D_Del(GF_Node *node)
 {
 	M_CompositeTexture2D *p = (M_CompositeTexture2D *) node;
-	gf_node_unregister((GF_Node *) p->background, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->viewport, (GF_Node *) p);	
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->background, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->viewport, (GF_Node *) p);
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -2668,10 +2744,14 @@
 static u32 CompositeTexture2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -2768,7 +2848,7 @@
 	if (!strcmp("viewport", name)) return 6;
 	if (!strcmp("repeatSandT", name)) return 7;
 	return -1;
-	}
+}
 static Bool CompositeTexture2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -2823,11 +2903,11 @@
 static void CompositeTexture3D_Del(GF_Node *node)
 {
 	M_CompositeTexture3D *p = (M_CompositeTexture3D *) node;
-	gf_node_unregister((GF_Node *) p->background, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->fog, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->navigationInfo, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->viewpoint, (GF_Node *) p);	
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->background, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->fog, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->navigationInfo, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->viewpoint, (GF_Node *) p);
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -2838,10 +2918,14 @@
 static u32 CompositeTexture3D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 9;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 9;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 11;
 	}
@@ -2961,7 +3045,7 @@
 	if (!strcmp("repeatS", name)) return 9;
 	if (!strcmp("repeatT", name)) return 10;
 	return -1;
-	}
+}
 static Bool CompositeTexture3D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3021,10 +3105,14 @@
 static u32 Conditional_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -3088,7 +3176,7 @@
 	if (!strcmp("buffer", name)) return 2;
 	if (!strcmp("isActive", name)) return 3;
 	return -1;
-	}
+}
 static Bool Conditional_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3105,7 +3193,7 @@
 	GF_SAFEALLOC(p, M_Conditional);
 	if(!p) return NULL;
 	gf_node_setup((GF_Node *)p, TAG_MPEG4_Conditional);
-	p->buffer.commandList = gf_list_new();	
+	p->buffer.commandList = gf_list_new();
 
 	/*default field values*/
 	return (GF_Node *)p;
@@ -3127,10 +3215,14 @@
 static u32 Cone_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -3186,7 +3278,7 @@
 	if (!strcmp("side", name)) return 2;
 	if (!strcmp("bottom", name)) return 3;
 	return -1;
-	}
+}
 static Bool Cone_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3244,10 +3336,14 @@
 static u32 Coordinate_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -3291,7 +3387,7 @@
 {
 	if (!strcmp("point", name)) return 0;
 	return -1;
-	}
+}
 static Bool Coordinate_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3339,10 +3435,14 @@
 static u32 Coordinate2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -3386,7 +3486,7 @@
 {
 	if (!strcmp("point", name)) return 0;
 	return -1;
-	}
+}
 static Bool Coordinate2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3435,10 +3535,14 @@
 static u32 CoordinateInterpolator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -3501,7 +3605,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool CoordinateInterpolator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3556,10 +3660,14 @@
 static u32 CoordinateInterpolator2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -3622,7 +3730,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool CoordinateInterpolator2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3664,7 +3772,7 @@
 static void Curve2D_Del(GF_Node *node)
 {
 	M_Curve2D *p = (M_Curve2D *) node;
-	gf_node_unregister((GF_Node *) p->point, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->point, (GF_Node *) p);
 	gf_sg_mfint32_del(p->type);
 	gf_node_free((GF_Node *) p);
 }
@@ -3677,10 +3785,14 @@
 static u32 Curve2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 3;
 	}
@@ -3739,7 +3851,7 @@
 	if (!strcmp("fineness", name)) return 1;
 	if (!strcmp("type", name)) return 2;
 	return -1;
-	}
+}
 static Bool Curve2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3791,10 +3903,14 @@
 static u32 Cylinder_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 5;
 	}
@@ -3857,7 +3973,7 @@
 	if (!strcmp("side", name)) return 3;
 	if (!strcmp("top", name)) return 4;
 	return -1;
-	}
+}
 static Bool Cylinder_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -3914,10 +4030,14 @@
 static u32 CylinderSensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 9;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 9;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 9;
 	}
@@ -4014,7 +4134,7 @@
 	if (!strcmp("rotation_changed", name)) return 7;
 	if (!strcmp("trackPoint_changed", name)) return 8;
 	return -1;
-	}
+}
 static Bool CylinderSensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -4085,10 +4205,14 @@
 static u32 DirectionalLight_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 4;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 4;
 	default:
 		return 5;
 	}
@@ -4160,7 +4284,7 @@
 	if (!strcmp("intensity", name)) return 3;
 	if (!strcmp("on", name)) return 4;
 	return -1;
-	}
+}
 static Bool DirectionalLight_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -4231,10 +4355,14 @@
 static u32 DiscSensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -4324,7 +4452,7 @@
 	if (!strcmp("rotation_changed", name)) return 6;
 	if (!strcmp("trackPoint_changed", name)) return 7;
 	return -1;
-	}
+}
 static Bool DiscSensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -4378,9 +4506,9 @@
 {
 	M_ElevationGrid *p = (M_ElevationGrid *) node;
 	gf_sg_mffloat_del(p->set_height);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);
 	gf_sg_mffloat_del(p->height);
 	gf_node_free((GF_Node *) p);
 }
@@ -4392,10 +4520,14 @@
 static u32 ElevationGrid_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 13;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 13;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 14;
 	}
@@ -4531,7 +4663,7 @@
 	if (!strcmp("zDimension", name)) return 12;
 	if (!strcmp("zSpacing", name)) return 13;
 	return -1;
-	}
+}
 static Bool ElevationGrid_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -4616,10 +4748,14 @@
 static u32 Expression_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -4695,7 +4831,7 @@
 	if (!strcmp("init_face", name)) return 4;
 	if (!strcmp("expression_def", name)) return 5;
 	return -1;
-	}
+}
 static Bool Expression_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -4774,10 +4910,14 @@
 static u32 Extrusion_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 10;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 10;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 14;
 	}
@@ -4910,7 +5050,7 @@
 	if (!strcmp("solid", name)) return 12;
 	if (!strcmp("spine", name)) return 13;
 	return -1;
-	}
+}
 static Bool Extrusion_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -5006,11 +5146,11 @@
 static void Face_Del(GF_Node *node)
 {
 	M_Face *p = (M_Face *) node;
-	gf_node_unregister((GF_Node *) p->fap, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->fdp, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->fit, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->ttsSource, (GF_Node *) p);	
-	gf_node_unregister_children((GF_Node *) p, p->renderedFace);	
+	gf_node_unregister((GF_Node *) p->fap, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->fdp, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->fit, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->ttsSource, (GF_Node *) p);
+	gf_node_unregister_children((GF_Node *) p, p->renderedFace);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -5021,10 +5161,14 @@
 static u32 Face_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 5;
 	}
@@ -5098,7 +5242,7 @@
 	if (!strcmp("ttsSource", name)) return 3;
 	if (!strcmp("renderedFace", name)) return 4;
 	return -1;
-	}
+}
 static Bool Face_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -5128,7 +5272,7 @@
 static void FaceDefMesh_Del(GF_Node *node)
 {
 	M_FaceDefMesh *p = (M_FaceDefMesh *) node;
-	gf_node_unregister((GF_Node *) p->faceSceneGraphNode, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->faceSceneGraphNode, (GF_Node *) p);
 	gf_sg_mfint32_del(p->intervalBorders);
 	gf_sg_mfint32_del(p->coordIndex);
 	gf_sg_mfvec3f_del(p->displacements);
@@ -5140,10 +5284,14 @@
 static u32 FaceDefMesh_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -5200,7 +5348,7 @@
 	if (!strcmp("coordIndex", name)) return 2;
 	if (!strcmp("displacements", name)) return 3;
 	return -1;
-	}
+}
 static Bool FaceDefMesh_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -5242,8 +5390,8 @@
 static void FaceDefTables_Del(GF_Node *node)
 {
 	M_FaceDefTables *p = (M_FaceDefTables *) node;
-	gf_node_unregister_children((GF_Node *) p, p->faceDefMesh);	
-	gf_node_unregister_children((GF_Node *) p, p->faceDefTransform);	
+	gf_node_unregister_children((GF_Node *) p, p->faceDefMesh);
+	gf_node_unregister_children((GF_Node *) p, p->faceDefTransform);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -5254,10 +5402,14 @@
 static u32 FaceDefTables_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -5321,7 +5473,7 @@
 	if (!strcmp("faceDefMesh", name)) return 2;
 	if (!strcmp("faceDefTransform", name)) return 3;
 	return -1;
-	}
+}
 static Bool FaceDefTables_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -5367,7 +5519,7 @@
 static void FaceDefTransform_Del(GF_Node *node)
 {
 	M_FaceDefTransform *p = (M_FaceDefTransform *) node;
-	gf_node_unregister((GF_Node *) p->faceSceneGraphNode, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->faceSceneGraphNode, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -5376,10 +5528,14 @@
 static u32 FaceDefTransform_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 5;
 	}
@@ -5443,7 +5599,7 @@
 	if (!strcmp("scaleDef", name)) return 3;
 	if (!strcmp("translationDef", name)) return 4;
 	return -1;
-	}
+}
 static Bool FaceDefTransform_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -5498,8 +5654,8 @@
 static void FAP_Del(GF_Node *node)
 {
 	M_FAP *p = (M_FAP *) node;
-	gf_node_unregister((GF_Node *) p->viseme, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->expression, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->viseme, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->expression, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -5510,10 +5666,14 @@
 static u32 FAP_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 68;
-	case GF_SG_FIELD_CODING_DEF: return 68;
-	case GF_SG_FIELD_CODING_OUT: return 68;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 68;
+	case GF_SG_FIELD_CODING_DEF:
+		return 68;
+	case GF_SG_FIELD_CODING_OUT:
+		return 68;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 68;
 	}
@@ -6025,7 +6185,7 @@
 	if (!strcmp("pull_l_ear", name)) return 66;
 	if (!strcmp("pull_r_ear", name)) return 67;
 	return -1;
-	}
+}
 static Bool FAP_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -6517,10 +6677,10 @@
 static void FDP_Del(GF_Node *node)
 {
 	M_FDP *p = (M_FDP *) node;
-	gf_node_unregister((GF_Node *) p->featurePointsCoord, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->textureCoord, (GF_Node *) p);	
-	gf_node_unregister_children((GF_Node *) p, p->faceDefTables);	
-	gf_node_unregister_children((GF_Node *) p, p->faceSceneGraph);	
+	gf_node_unregister((GF_Node *) p->featurePointsCoord, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->textureCoord, (GF_Node *) p);
+	gf_node_unregister_children((GF_Node *) p, p->faceDefTables);
+	gf_node_unregister_children((GF_Node *) p, p->faceSceneGraph);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -6531,10 +6691,14 @@
 static u32 FDP_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 5;
 	}
@@ -6607,7 +6771,7 @@
 	if (!strcmp("faceSceneGraph", name)) return 3;
 	if (!strcmp("useOrthoTexture", name)) return 4;
 	return -1;
-	}
+}
 static Bool FDP_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -6656,10 +6820,14 @@
 static u32 FIT_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 9;
-	case GF_SG_FIELD_CODING_OUT: return 9;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 9;
+	case GF_SG_FIELD_CODING_OUT:
+		return 9;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 9;
 	}
@@ -6756,7 +6924,7 @@
 	if (!strcmp("numeratorCoefs", name)) return 7;
 	if (!strcmp("denominatorCoefs", name)) return 8;
 	return -1;
-	}
+}
 static Bool FIT_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -6847,10 +7015,14 @@
 static u32 Fog_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 5;
 	}
@@ -6923,7 +7095,7 @@
 	if (!strcmp("set_bind", name)) return 3;
 	if (!strcmp("isBound", name)) return 4;
 	return -1;
-	}
+}
 static Bool Fog_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -6985,10 +7157,14 @@
 static u32 FontStyle_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 9;
-	case GF_SG_FIELD_CODING_OUT: return 9;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 9;
+	case GF_SG_FIELD_CODING_OUT:
+		return 9;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 9;
 	}
@@ -7085,7 +7261,7 @@
 	if (!strcmp("style", name)) return 7;
 	if (!strcmp("topToBottom", name)) return 8;
 	return -1;
-	}
+}
 static Bool FontStyle_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -7145,7 +7321,7 @@
 	gf_sg_mfint32_del(p->groups);
 	gf_sg_mfstring_del(p->constraints);
 	gf_sg_mfint32_del(p->groupsIndex);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -7157,10 +7333,14 @@
 static u32 Form_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 7;
 	}
@@ -7251,7 +7431,7 @@
 	if (!strcmp("constraints", name)) return 5;
 	if (!strcmp("groupsIndex", name)) return 6;
 	return -1;
-	}
+}
 static Bool Form_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -7304,7 +7484,7 @@
 static void Group_Del(GF_Node *node)
 {
 	M_Group *p = (M_Group *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -7315,10 +7495,14 @@
 static u32 Group_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 3;
 	}
@@ -7378,7 +7562,7 @@
 	if (!strcmp("removeChildren", name)) return 1;
 	if (!strcmp("children", name)) return 2;
 	return -1;
-	}
+}
 static Bool Group_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -7420,10 +7604,14 @@
 static u32 ImageTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 3;
 	}
@@ -7478,7 +7666,7 @@
 	if (!strcmp("repeatS", name)) return 1;
 	if (!strcmp("repeatT", name)) return 2;
 	return -1;
-	}
+}
 static Bool ImageTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -7514,10 +7702,10 @@
 	gf_sg_mfint32_del(p->set_coordIndex);
 	gf_sg_mfint32_del(p->set_normalIndex);
 	gf_sg_mfint32_del(p->set_texCoordIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mfint32_del(p->coordIndex);
 	gf_sg_mfint32_del(p->normalIndex);
@@ -7532,10 +7720,14 @@
 static u32 IndexedFaceSet_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 14;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 14;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 18;
 	}
@@ -7703,7 +7895,7 @@
 	if (!strcmp("solid", name)) return 16;
 	if (!strcmp("texCoordIndex", name)) return 17;
 	return -1;
-	}
+}
 static Bool IndexedFaceSet_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -7772,9 +7964,9 @@
 	gf_sg_mfint32_del(p->set_colorIndex);
 	gf_sg_mfint32_del(p->set_coordIndex);
 	gf_sg_mfint32_del(p->set_texCoordIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mfint32_del(p->coordIndex);
 	gf_sg_mfint32_del(p->texCoordIndex);
@@ -7788,10 +7980,14 @@
 static u32 IndexedFaceSet2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 11;
 	}
@@ -7908,7 +8104,7 @@
 	if (!strcmp("coordIndex", name)) return 9;
 	if (!strcmp("texCoordIndex", name)) return 10;
 	return -1;
-	}
+}
 static Bool IndexedFaceSet2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -7960,8 +8156,8 @@
 	M_IndexedLineSet *p = (M_IndexedLineSet *) node;
 	gf_sg_mfint32_del(p->set_colorIndex);
 	gf_sg_mfint32_del(p->set_coordIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mfint32_del(p->coordIndex);
 	gf_node_free((GF_Node *) p);
@@ -7974,10 +8170,14 @@
 static u32 IndexedLineSet_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -8064,7 +8264,7 @@
 	if (!strcmp("colorPerVertex", name)) return 5;
 	if (!strcmp("coordIndex", name)) return 6;
 	return -1;
-	}
+}
 static Bool IndexedLineSet_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -8109,8 +8309,8 @@
 	M_IndexedLineSet2D *p = (M_IndexedLineSet2D *) node;
 	gf_sg_mfint32_del(p->set_colorIndex);
 	gf_sg_mfint32_del(p->set_coordIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mfint32_del(p->coordIndex);
 	gf_node_free((GF_Node *) p);
@@ -8123,10 +8323,14 @@
 static u32 IndexedLineSet2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -8213,7 +8417,7 @@
 	if (!strcmp("colorPerVertex", name)) return 5;
 	if (!strcmp("coordIndex", name)) return 6;
 	return -1;
-	}
+}
 static Bool IndexedLineSet2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -8267,10 +8471,14 @@
 static u32 Inline_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 1;
 	}
@@ -8311,7 +8519,7 @@
 {
 	if (!strcmp("url", name)) return 0;
 	return -1;
-	}
+}
 static Bool Inline_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -8341,7 +8549,7 @@
 static void LOD_Del(GF_Node *node)
 {
 	M_LOD *p = (M_LOD *) node;
-	gf_node_unregister_children((GF_Node *) p, p->level);	
+	gf_node_unregister_children((GF_Node *) p, p->level);
 	gf_sg_mffloat_del(p->range);
 	gf_node_free((GF_Node *) p);
 }
@@ -8353,10 +8561,14 @@
 static u32 LOD_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 3;
 	}
@@ -8412,7 +8624,7 @@
 	if (!strcmp("center", name)) return 1;
 	if (!strcmp("range", name)) return 2;
 	return -1;
-	}
+}
 static Bool LOD_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -8457,9 +8669,9 @@
 static void Layer2D_Del(GF_Node *node)
 {
 	M_Layer2D *p = (M_Layer2D *) node;
-	gf_node_unregister((GF_Node *) p->background, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->viewport, (GF_Node *) p);	
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->background, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->viewport, (GF_Node *) p);
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -8471,10 +8683,14 @@
 static u32 Layer2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 6;
 	}
@@ -8560,7 +8776,7 @@
 	if (!strcmp("background", name)) return 4;
 	if (!strcmp("viewport", name)) return 5;
 	return -1;
-	}
+}
 static Bool Layer2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -8599,11 +8815,11 @@
 static void Layer3D_Del(GF_Node *node)
 {
 	M_Layer3D *p = (M_Layer3D *) node;
-	gf_node_unregister((GF_Node *) p->background, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->fog, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->navigationInfo, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->viewpoint, (GF_Node *) p);	
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->background, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->fog, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->navigationInfo, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->viewpoint, (GF_Node *) p);
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -8615,10 +8831,14 @@
 static u32 Layer3D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 8;
 	}
@@ -8720,7 +8940,7 @@
 	if (!strcmp("navigationInfo", name)) return 6;
 	if (!strcmp("viewpoint", name)) return 7;
 	return -1;
-	}
+}
 static Bool Layer3D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -8760,7 +8980,7 @@
 {
 	M_Layout *p = (M_Layout *) node;
 	gf_sg_mfstring_del(p->justify);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -8772,10 +8992,14 @@
 static u32 Layout_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 15;
-	case GF_SG_FIELD_CODING_DEF: return 13;
-	case GF_SG_FIELD_CODING_OUT: return 13;
-	case GF_SG_FIELD_CODING_DYN: return 3;
+	case GF_SG_FIELD_CODING_IN:
+		return 15;
+	case GF_SG_FIELD_CODING_DEF:
+		return 13;
+	case GF_SG_FIELD_CODING_OUT:
+		return 13;
+	case GF_SG_FIELD_CODING_DYN:
+		return 3;
 	default:
 		return 15;
 	}
@@ -8922,7 +9146,7 @@
 	if (!strcmp("scrollRate", name)) return 13;
 	if (!strcmp("scrollMode", name)) return 14;
 	return -1;
-	}
+}
 static Bool Layout_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -9002,10 +9226,14 @@
 static u32 LineProperties_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 3;
 	}
@@ -9063,7 +9291,7 @@
 	if (!strcmp("lineStyle", name)) return 1;
 	if (!strcmp("width", name)) return 2;
 	return -1;
-	}
+}
 static Bool LineProperties_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -9129,10 +9357,14 @@
 static u32 ListeningPoint_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 7;
 	}
@@ -9219,7 +9451,7 @@
 	if (!strcmp("bindTime", name)) return 5;
 	if (!strcmp("isBound", name)) return 6;
 	return -1;
-	}
+}
 static Bool ListeningPoint_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -9278,10 +9510,14 @@
 static u32 Material_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 6;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 6;
 	default:
 		return 6;
 	}
@@ -9360,7 +9596,7 @@
 	if (!strcmp("specularColor", name)) return 4;
 	if (!strcmp("transparency", name)) return 5;
 	return -1;
-	}
+}
 static Bool Material_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -9438,7 +9674,7 @@
 static void Material2D_Del(GF_Node *node)
 {
 	M_Material2D *p = (M_Material2D *) node;
-	gf_node_unregister((GF_Node *) p->lineProps, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->lineProps, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -9450,10 +9686,14 @@
 static u32 Material2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 4;
 	}
@@ -9519,7 +9759,7 @@
 	if (!strcmp("lineProps", name)) return 2;
 	if (!strcmp("transparency", name)) return 3;
 	return -1;
-	}
+}
 static Bool Material2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -9577,10 +9817,14 @@
 static u32 MovieTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 9;
 	}
@@ -9680,7 +9924,7 @@
 	if (!strcmp("duration_changed", name)) return 7;
 	if (!strcmp("isActive", name)) return 8;
 	return -1;
-	}
+}
 static Bool MovieTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -9734,10 +9978,14 @@
 static u32 NavigationInfo_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 7;
 	}
@@ -9824,7 +10072,7 @@
 	if (!strcmp("visibilityLimit", name)) return 5;
 	if (!strcmp("isBound", name)) return 6;
 	return -1;
-	}
+}
 static Bool NavigationInfo_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -9898,10 +10146,14 @@
 static u32 Normal_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -9945,7 +10197,7 @@
 {
 	if (!strcmp("vector", name)) return 0;
 	return -1;
-	}
+}
 static Bool Normal_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -9992,10 +10244,14 @@
 static u32 NormalInterpolator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -10058,7 +10314,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool NormalInterpolator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -10101,7 +10357,7 @@
 {
 	M_OrderedGroup *p = (M_OrderedGroup *) node;
 	gf_sg_mffloat_del(p->order);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -10112,10 +10368,14 @@
 static u32 OrderedGroup_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -10182,7 +10442,7 @@
 	if (!strcmp("children", name)) return 2;
 	if (!strcmp("order", name)) return 3;
 	return -1;
-	}
+}
 static Bool OrderedGroup_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -10231,10 +10491,14 @@
 static u32 OrientationInterpolator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -10297,7 +10561,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool OrientationInterpolator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -10350,10 +10614,14 @@
 static u32 PixelTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 3;
 	}
@@ -10408,7 +10676,7 @@
 	if (!strcmp("repeatS", name)) return 1;
 	if (!strcmp("repeatT", name)) return 2;
 	return -1;
-	}
+}
 static Bool PixelTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -10454,10 +10722,14 @@
 static u32 PlaneSensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -10547,7 +10819,7 @@
 	if (!strcmp("trackPoint_changed", name)) return 6;
 	if (!strcmp("translation_changed", name)) return 7;
 	return -1;
-	}
+}
 static Bool PlaneSensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -10614,10 +10886,14 @@
 static u32 PlaneSensor2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -10707,7 +10983,7 @@
 	if (!strcmp("trackPoint_changed", name)) return 6;
 	if (!strcmp("translation_changed", name)) return 7;
 	return -1;
-	}
+}
 static Bool PlaneSensor2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -10774,10 +11050,14 @@
 static u32 PointLight_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 6;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 6;
 	default:
 		return 7;
 	}
@@ -10863,7 +11143,7 @@
 	if (!strcmp("on", name)) return 5;
 	if (!strcmp("radius", name)) return 6;
 	return -1;
-	}
+}
 static Bool PointLight_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -10942,8 +11222,8 @@
 static void PointSet_Del(GF_Node *node)
 {
 	M_PointSet *p = (M_PointSet *) node;
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -10954,10 +11234,14 @@
 static u32 PointSet_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -11007,7 +11291,7 @@
 	if (!strcmp("color", name)) return 0;
 	if (!strcmp("coord", name)) return 1;
 	return -1;
-	}
+}
 static Bool PointSet_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -11037,8 +11321,8 @@
 static void PointSet2D_Del(GF_Node *node)
 {
 	M_PointSet2D *p = (M_PointSet2D *) node;
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -11049,10 +11333,14 @@
 static u32 PointSet2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -11102,7 +11390,7 @@
 	if (!strcmp("color", name)) return 0;
 	if (!strcmp("coord", name)) return 1;
 	return -1;
-	}
+}
 static Bool PointSet2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -11144,10 +11432,14 @@
 static u32 PositionInterpolator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -11210,7 +11502,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool PositionInterpolator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -11264,10 +11556,14 @@
 static u32 PositionInterpolator2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -11330,7 +11626,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool PositionInterpolator2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -11382,10 +11678,14 @@
 static u32 ProximitySensor2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -11475,7 +11775,7 @@
 	if (!strcmp("enterTime", name)) return 6;
 	if (!strcmp("exitTime", name)) return 7;
 	return -1;
-	}
+}
 static Bool ProximitySensor2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -11532,10 +11832,14 @@
 static u32 ProximitySensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -11625,7 +11929,7 @@
 	if (!strcmp("enterTime", name)) return 6;
 	if (!strcmp("exitTime", name)) return 7;
 	return -1;
-	}
+}
 static Bool ProximitySensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -11682,10 +11986,14 @@
 static u32 QuantizationParameter_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 40;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 40;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 40;
 	}
@@ -11993,7 +12301,7 @@
 	if (!strcmp("sizeNbBits", name)) return 38;
 	if (!strcmp("useEfficientCoding", name)) return 39;
 	return -1;
-	}
+}
 static Bool QuantizationParameter_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -12251,10 +12559,14 @@
 static u32 Rectangle_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -12298,7 +12610,7 @@
 {
 	if (!strcmp("size", name)) return 0;
 	return -1;
-	}
+}
 static Bool Rectangle_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -12348,10 +12660,14 @@
 static u32 ScalarInterpolator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -12414,7 +12730,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool ScalarInterpolator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -12467,10 +12783,14 @@
 static u32 Script_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 3;
 	}
@@ -12525,7 +12845,7 @@
 	if (!strcmp("directOutput", name)) return 1;
 	if (!strcmp("mustEvaluate", name)) return 2;
 	return -1;
-	}
+}
 static Bool Script_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -12555,8 +12875,8 @@
 static void Shape_Del(GF_Node *node)
 {
 	M_Shape *p = (M_Shape *) node;
-	gf_node_unregister((GF_Node *) p->appearance, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->appearance, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -12567,10 +12887,14 @@
 static u32 Shape_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -12620,7 +12944,7 @@
 	if (!strcmp("appearance", name)) return 0;
 	if (!strcmp("geometry", name)) return 1;
 	return -1;
-	}
+}
 static Bool Shape_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -12650,7 +12974,7 @@
 static void Sound_Del(GF_Node *node)
 {
 	M_Sound *p = (M_Sound *) node;
-	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -12662,10 +12986,14 @@
 static u32 Sound_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 10;
-	case GF_SG_FIELD_CODING_OUT: return 9;
-	case GF_SG_FIELD_CODING_DYN: return 6;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 10;
+	case GF_SG_FIELD_CODING_OUT:
+		return 9;
+	case GF_SG_FIELD_CODING_DYN:
+		return 6;
 	default:
 		return 10;
 	}
@@ -12773,7 +13101,7 @@
 	if (!strcmp("source", name)) return 8;
 	if (!strcmp("spatialize", name)) return 9;
 	return -1;
-	}
+}
 static Bool Sound_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -12864,7 +13192,7 @@
 static void Sound2D_Del(GF_Node *node)
 {
 	M_Sound2D *p = (M_Sound2D *) node;
-	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -12876,10 +13204,14 @@
 static u32 Sound2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 4;
 	}
@@ -12945,7 +13277,7 @@
 	if (!strcmp("source", name)) return 2;
 	if (!strcmp("spatialize", name)) return 3;
 	return -1;
-	}
+}
 static Bool Sound2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -12999,10 +13331,14 @@
 static u32 Sphere_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 1;
 	}
@@ -13037,7 +13373,7 @@
 {
 	if (!strcmp("radius", name)) return 0;
 	return -1;
-	}
+}
 static Bool Sphere_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -13084,10 +13420,14 @@
 static u32 SphereSensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -13163,7 +13503,7 @@
 	if (!strcmp("rotation_changed", name)) return 4;
 	if (!strcmp("trackPoint_changed", name)) return 5;
 	return -1;
-	}
+}
 static Bool SphereSensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -13216,10 +13556,14 @@
 static u32 SpotLight_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 10;
-	case GF_SG_FIELD_CODING_DEF: return 10;
-	case GF_SG_FIELD_CODING_OUT: return 10;
-	case GF_SG_FIELD_CODING_DYN: return 9;
+	case GF_SG_FIELD_CODING_IN:
+		return 10;
+	case GF_SG_FIELD_CODING_DEF:
+		return 10;
+	case GF_SG_FIELD_CODING_OUT:
+		return 10;
+	case GF_SG_FIELD_CODING_DYN:
+		return 9;
 	default:
 		return 10;
 	}
@@ -13326,7 +13670,7 @@
 	if (!strcmp("on", name)) return 8;
 	if (!strcmp("radius", name)) return 9;
 	return -1;
-	}
+}
 static Bool SpotLight_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -13428,7 +13772,7 @@
 static void Switch_Del(GF_Node *node)
 {
 	M_Switch *p = (M_Switch *) node;
-	gf_node_unregister_children((GF_Node *) p, p->choice);	
+	gf_node_unregister_children((GF_Node *) p, p->choice);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -13439,10 +13783,14 @@
 static u32 Switch_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -13491,7 +13839,7 @@
 	if (!strcmp("choice", name)) return 0;
 	if (!strcmp("whichChoice", name)) return 1;
 	return -1;
-	}
+}
 static Bool Switch_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -13539,10 +13887,14 @@
 static u32 TermCap_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 3;
 	}
@@ -13598,7 +13950,7 @@
 	if (!strcmp("capability", name)) return 1;
 	if (!strcmp("value", name)) return 2;
 	return -1;
-	}
+}
 static Bool TermCap_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -13645,7 +13997,7 @@
 	M_Text *p = (M_Text *) node;
 	gf_sg_mfstring_del(p->string);
 	gf_sg_mffloat_del(p->length);
-	gf_node_unregister((GF_Node *) p->fontStyle, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->fontStyle, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -13657,10 +14009,14 @@
 static u32 Text_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 4;
 	}
@@ -13726,7 +14082,7 @@
 	if (!strcmp("fontStyle", name)) return 2;
 	if (!strcmp("maxExtent", name)) return 3;
 	return -1;
-	}
+}
 static Bool Text_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -13781,10 +14137,14 @@
 static u32 TextureCoordinate_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -13828,7 +14188,7 @@
 {
 	if (!strcmp("point", name)) return 0;
 	return -1;
-	}
+}
 static Bool TextureCoordinate_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -13875,10 +14235,14 @@
 static u32 TextureTransform_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 4;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 4;
 	default:
 		return 4;
 	}
@@ -13943,7 +14307,7 @@
 	if (!strcmp("scale", name)) return 2;
 	if (!strcmp("translation", name)) return 3;
 	return -1;
-	}
+}
 static Bool TextureTransform_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -14014,10 +14378,14 @@
 static u32 TimeSensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 9;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 9;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 9;
 	}
@@ -14114,7 +14482,7 @@
 	if (!strcmp("isActive", name)) return 7;
 	if (!strcmp("time", name)) return 8;
 	return -1;
-	}
+}
 static Bool TimeSensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -14158,10 +14526,14 @@
 static u32 TouchSensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -14244,7 +14616,7 @@
 	if (!strcmp("isOver", name)) return 5;
 	if (!strcmp("touchTime", name)) return 6;
 	return -1;
-	}
+}
 static Bool TouchSensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -14275,7 +14647,7 @@
 static void Transform_Del(GF_Node *node)
 {
 	M_Transform *p = (M_Transform *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -14287,10 +14659,14 @@
 static u32 Transform_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 5;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 5;
 	default:
 		return 8;
 	}
@@ -14388,7 +14764,7 @@
 	if (!strcmp("scaleOrientation", name)) return 6;
 	if (!strcmp("translation", name)) return 7;
 	return -1;
-	}
+}
 static Bool Transform_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -14462,7 +14838,7 @@
 static void Transform2D_Del(GF_Node *node)
 {
 	M_Transform2D *p = (M_Transform2D *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -14474,10 +14850,14 @@
 static u32 Transform2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 5;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 5;
 	default:
 		return 8;
 	}
@@ -14575,7 +14955,7 @@
 	if (!strcmp("scaleOrientation", name)) return 6;
 	if (!strcmp("translation", name)) return 7;
 	return -1;
-	}
+}
 static Bool Transform2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -14670,10 +15050,14 @@
 static u32 Valuator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 25;
-	case GF_SG_FIELD_CODING_DEF: return 9;
-	case GF_SG_FIELD_CODING_OUT: return 25;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 25;
+	case GF_SG_FIELD_CODING_DEF:
+		return 9;
+	case GF_SG_FIELD_CODING_OUT:
+		return 25;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 41;
 	}
@@ -15010,7 +15394,7 @@
 	if (!strcmp("Offset4", name)) return 39;
 	if (!strcmp("Sum", name)) return 40;
 	return -1;
-	}
+}
 static Bool Valuator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -15108,10 +15492,14 @@
 static u32 Viewpoint_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 3;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 3;
 	default:
 		return 8;
 	}
@@ -15205,7 +15593,7 @@
 	if (!strcmp("bindTime", name)) return 6;
 	if (!strcmp("isBound", name)) return 7;
 	return -1;
-	}
+}
 static Bool Viewpoint_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -15271,10 +15659,14 @@
 static u32 VisibilitySensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 6;
 	}
@@ -15353,7 +15745,7 @@
 	if (!strcmp("exitTime", name)) return 4;
 	if (!strcmp("isActive", name)) return 5;
 	return -1;
-	}
+}
 static Bool VisibilitySensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -15412,10 +15804,14 @@
 static u32 Viseme_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -15477,7 +15873,7 @@
 	if (!strcmp("viseme_blend", name)) return 2;
 	if (!strcmp("viseme_def", name)) return 3;
 	return -1;
-	}
+}
 static Bool Viseme_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -15541,10 +15937,14 @@
 static u32 WorldInfo_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -15586,7 +15986,7 @@
 	if (!strcmp("info", name)) return 0;
 	if (!strcmp("title", name)) return 1;
 	return -1;
-	}
+}
 static Bool WorldInfo_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -15631,10 +16031,14 @@
 static u32 AcousticMaterial_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 10;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 6;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 10;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 6;
 	default:
 		return 10;
 	}
@@ -15741,7 +16145,7 @@
 	if (!strcmp("refFrequency", name)) return 8;
 	if (!strcmp("transFrequency", name)) return 9;
 	return -1;
-	}
+}
 static Bool AcousticMaterial_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -15868,10 +16272,14 @@
 static u32 AcousticScene_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 6;
 	}
@@ -15950,7 +16358,7 @@
 	if (!strcmp("reverbLevel", name)) return 4;
 	if (!strcmp("reverbDelay", name)) return 5;
 	return -1;
-	}
+}
 static Bool AcousticScene_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -16044,10 +16452,14 @@
 static u32 ApplicationWindow_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 7;
 	}
@@ -16133,7 +16545,7 @@
 	if (!strcmp("url", name)) return 5;
 	if (!strcmp("size", name)) return 6;
 	return -1;
-	}
+}
 static Bool ApplicationWindow_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -16195,10 +16607,14 @@
 static u32 BAP_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 296;
-	case GF_SG_FIELD_CODING_DEF: return 296;
-	case GF_SG_FIELD_CODING_OUT: return 296;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 296;
+	case GF_SG_FIELD_CODING_DEF:
+		return 296;
+	case GF_SG_FIELD_CODING_OUT:
+		return 296;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 296;
 	}
@@ -18304,7 +18720,7 @@
 	if (!strcmp("extensionBap295", name)) return 294;
 	if (!strcmp("extensionBap296", name)) return 295;
 	return -1;
-	}
+}
 static Bool BAP_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -20406,8 +20822,8 @@
 static void BDP_Del(GF_Node *node)
 {
 	M_BDP *p = (M_BDP *) node;
-	gf_node_unregister_children((GF_Node *) p, p->bodyDefTables);	
-	gf_node_unregister_children((GF_Node *) p, p->bodySceneGraph);	
+	gf_node_unregister_children((GF_Node *) p, p->bodyDefTables);
+	gf_node_unregister_children((GF_Node *) p, p->bodySceneGraph);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -20418,10 +20834,14 @@
 static u32 BDP_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -20471,7 +20891,7 @@
 	if (!strcmp("bodyDefTables", name)) return 0;
 	if (!strcmp("bodySceneGraph", name)) return 1;
 	return -1;
-	}
+}
 static Bool BDP_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -20501,9 +20921,9 @@
 static void Body_Del(GF_Node *node)
 {
 	M_Body *p = (M_Body *) node;
-	gf_node_unregister((GF_Node *) p->bdp, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->bap, (GF_Node *) p);	
-	gf_node_unregister_children((GF_Node *) p, p->renderedBody);	
+	gf_node_unregister((GF_Node *) p->bdp, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->bap, (GF_Node *) p);
+	gf_node_unregister_children((GF_Node *) p, p->renderedBody);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -20514,10 +20934,14 @@
 static u32 Body_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 3;
 	}
@@ -20575,7 +20999,7 @@
 	if (!strcmp("bap", name)) return 1;
 	if (!strcmp("renderedBody", name)) return 2;
 	return -1;
-	}
+}
 static Bool Body_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -20620,10 +21044,14 @@
 static u32 BodyDefTable_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -20699,7 +21127,7 @@
 	if (!strcmp("displacements", name)) return 4;
 	if (!strcmp("numInterpolateKeys", name)) return 5;
 	return -1;
-	}
+}
 static Bool BodyDefTable_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -20769,10 +21197,14 @@
 static u32 BodySegmentConnectionHint_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -20834,7 +21266,7 @@
 	if (!strcmp("firstVertexIdList", name)) return 2;
 	if (!strcmp("secondVertexIdList", name)) return 3;
 	return -1;
-	}
+}
 static Bool BodySegmentConnectionHint_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -20876,8 +21308,8 @@
 static void DirectiveSound_Del(GF_Node *node)
 {
 	M_DirectiveSound *p = (M_DirectiveSound *) node;
-	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->perceptualParameters, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->perceptualParameters, (GF_Node *) p);
 	gf_sg_mffloat_del(p->directivity);
 	gf_sg_mffloat_del(p->angles);
 	gf_sg_mffloat_del(p->frequency);
@@ -20892,10 +21324,14 @@
 static u32 DirectiveSound_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 13;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 3;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 13;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 3;
 	default:
 		return 13;
 	}
@@ -21025,7 +21461,7 @@
 	if (!strcmp("distance", name)) return 11;
 	if (!strcmp("useAirabs", name)) return 12;
 	return -1;
-	}
+}
 static Bool DirectiveSound_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -21130,10 +21566,14 @@
 static u32 Hierarchical3DMesh_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -21196,7 +21636,7 @@
 	if (!strcmp("url", name)) return 2;
 	if (!strcmp("doneLoading", name)) return 3;
 	return -1;
-	}
+}
 static Bool Hierarchical3DMesh_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -21250,10 +21690,14 @@
 static u32 MaterialKey_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 4;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 4;
 	default:
 		return 6;
 	}
@@ -21332,7 +21776,7 @@
 	if (!strcmp("highThreshold", name)) return 4;
 	if (!strcmp("transparency", name)) return 5;
 	return -1;
-	}
+}
 static Bool MaterialKey_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -21408,10 +21852,14 @@
 static u32 PerceptualParameters_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 19;
-	case GF_SG_FIELD_CODING_DEF: return 19;
-	case GF_SG_FIELD_CODING_OUT: return 19;
-	case GF_SG_FIELD_CODING_DYN: return 15;
+	case GF_SG_FIELD_CODING_IN:
+		return 19;
+	case GF_SG_FIELD_CODING_DEF:
+		return 19;
+	case GF_SG_FIELD_CODING_OUT:
+		return 19;
+	case GF_SG_FIELD_CODING_DYN:
+		return 15;
 	default:
 		return 19;
 	}
@@ -21581,7 +22029,7 @@
 	if (!strcmp("timeLimit3", name)) return 17;
 	if (!strcmp("modalDensity", name)) return 18;
 	return -1;
-	}
+}
 static Bool PerceptualParameters_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -21757,7 +22205,7 @@
 	gf_sg_mfurl_del(p->url);
 	gf_sg_mfint32_del(p->stretchMode);
 	gf_sg_mfint32_del(p->shrinkMode);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -21769,10 +22217,14 @@
 static u32 TemporalTransform_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 12;
-	case GF_SG_FIELD_CODING_DEF: return 10;
-	case GF_SG_FIELD_CODING_OUT: return 11;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 12;
+	case GF_SG_FIELD_CODING_DEF:
+		return 10;
+	case GF_SG_FIELD_CODING_OUT:
+		return 11;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 13;
 	}
@@ -21905,7 +22357,7 @@
 	if (!strcmp("maxDelay", name)) return 11;
 	if (!strcmp("actualDuration", name)) return 12;
 	return -1;
-	}
+}
 static Bool TemporalTransform_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -21975,7 +22427,7 @@
 {
 	M_TemporalGroup *p = (M_TemporalGroup *) node;
 	gf_sg_mffloat_del(p->priority);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -21986,10 +22438,14 @@
 static u32 TemporalGroup_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 9;
 	}
@@ -22091,7 +22547,7 @@
 	if (!strcmp("isActive", name)) return 7;
 	if (!strcmp("activeChild", name)) return 8;
 	return -1;
-	}
+}
 static Bool TemporalGroup_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -22141,10 +22597,14 @@
 static u32 ServerCommand_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -22207,7 +22667,7 @@
 	if (!strcmp("url", name)) return 2;
 	if (!strcmp("command", name)) return 3;
 	return -1;
-	}
+}
 static Bool ServerCommand_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -22249,10 +22709,14 @@
 static u32 InputSensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -22314,7 +22778,7 @@
 	if (!strcmp("url", name)) return 2;
 	if (!strcmp("eventTime", name)) return 3;
 	return -1;
-	}
+}
 static Bool InputSensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -22331,7 +22795,7 @@
 	GF_SAFEALLOC(p, M_InputSensor);
 	if(!p) return NULL;
 	gf_node_setup((GF_Node *)p, TAG_MPEG4_InputSensor);
-	p->buffer.commandList = gf_list_new();	
+	p->buffer.commandList = gf_list_new();
 
 	/*default field values*/
 	p->enabled = 1;
@@ -22346,9 +22810,9 @@
 static void MatteTexture_Del(GF_Node *node)
 {
 	M_MatteTexture *p = (M_MatteTexture *) node;
-	gf_node_unregister((GF_Node *) p->surfaceA, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->surfaceB, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->alphaSurface, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->surfaceA, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->surfaceB, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->alphaSurface, (GF_Node *) p);
 	gf_sg_sfstring_del(p->operation);
 	gf_sg_mffloat_del(p->parameter);
 	gf_node_free((GF_Node *) p);
@@ -22361,10 +22825,14 @@
 static u32 MatteTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -22450,7 +22918,7 @@
 	if (!strcmp("fraction", name)) return 5;
 	if (!strcmp("parameter", name)) return 6;
 	return -1;
-	}
+}
 static Bool MatteTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -22495,10 +22963,14 @@
 static u32 MediaBuffer_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -22574,7 +23046,7 @@
 	if (!strcmp("isBuffered", name)) return 4;
 	if (!strcmp("enabled", name)) return 5;
 	return -1;
-	}
+}
 static Bool MediaBuffer_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -22619,10 +23091,14 @@
 static u32 MediaControl_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 9;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 9;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 9;
 	}
@@ -22719,7 +23195,7 @@
 	if (!strcmp("enabled", name)) return 7;
 	if (!strcmp("isPreRolled", name)) return 8;
 	return -1;
-	}
+}
 static Bool MediaControl_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -22766,10 +23242,14 @@
 static u32 MediaSensor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -22845,7 +23325,7 @@
 	if (!strcmp("isActive", name)) return 4;
 	if (!strcmp("info", name)) return 5;
 	return -1;
-	}
+}
 static Bool MediaSensor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -22875,7 +23355,7 @@
 static void BitWrapper_Del(GF_Node *node)
 {
 	M_BitWrapper *p = (M_BitWrapper *) node;
-	gf_node_unregister((GF_Node *) p->node, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->node, (GF_Node *) p);
 	gf_sg_mfurl_del(p->url);
 	gf_sg_sfstring_del(p->buffer);
 	gf_node_free((GF_Node *) p);
@@ -22886,10 +23366,14 @@
 static u32 BitWrapper_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -22946,7 +23430,7 @@
 	if (!strcmp("url", name)) return 2;
 	if (!strcmp("buffer", name)) return 3;
 	return -1;
-	}
+}
 static Bool BitWrapper_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -22990,10 +23474,14 @@
 static u32 CoordinateInterpolator4D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -23056,7 +23544,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool CoordinateInterpolator4D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -23098,7 +23586,7 @@
 static void DepthImage_Del(GF_Node *node)
 {
 	M_DepthImage *p = (M_DepthImage *) node;
-	gf_node_unregister((GF_Node *) p->diTexture, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->diTexture, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -23107,10 +23595,14 @@
 static u32 DepthImage_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -23188,7 +23680,7 @@
 	if (!strcmp("orthographic", name)) return 5;
 	if (!strcmp("position", name)) return 6;
 	return -1;
-	}
+}
 static Bool DepthImage_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -23234,7 +23726,7 @@
 	gf_sg_mffloat_del(p->uKnot);
 	gf_sg_mffloat_del(p->vKnot);
 	gf_sg_mffloat_del(p->wKnot);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -23246,10 +23738,14 @@
 static u32 FFD_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 11;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 11;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 13;
 	}
@@ -23382,7 +23878,7 @@
 	if (!strcmp("wKnot", name)) return 11;
 	if (!strcmp("wOrder", name)) return 12;
 	return -1;
-	}
+}
 static Bool FFD_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -23480,10 +23976,14 @@
 static u32 Implicit_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 5;
 	}
@@ -23555,7 +24055,7 @@
 	if (!strcmp("dual", name)) return 3;
 	if (!strcmp("solid", name)) return 4;
 	return -1;
-	}
+}
 static Bool Implicit_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -23600,10 +24100,10 @@
 static void XXLFM_Appearance_Del(GF_Node *node)
 {
 	M_XXLFM_Appearance *p = (M_XXLFM_Appearance *) node;
-	gf_node_unregister((GF_Node *) p->blendList, (GF_Node *) p);	
-	gf_node_unregister_children((GF_Node *) p, p->lightMapList);	
-	gf_node_unregister_children((GF_Node *) p, p->tileList);	
-	gf_node_unregister((GF_Node *) p->vertexFrameList, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->blendList, (GF_Node *) p);
+	gf_node_unregister_children((GF_Node *) p, p->lightMapList);
+	gf_node_unregister_children((GF_Node *) p, p->tileList);
+	gf_node_unregister((GF_Node *) p->vertexFrameList, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -23614,10 +24114,14 @@
 static u32 XXLFM_Appearance_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -23683,7 +24187,7 @@
 	if (!strcmp("tileList", name)) return 2;
 	if (!strcmp("vertexFrameList", name)) return 3;
 	return -1;
-	}
+}
 static Bool XXLFM_Appearance_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -23725,10 +24229,14 @@
 static u32 XXLFM_BlendList_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -23776,7 +24284,7 @@
 	if (!strcmp("blendMode", name)) return 0;
 	if (!strcmp("lightMapIndex", name)) return 1;
 	return -1;
-	}
+}
 static Bool XXLFM_BlendList_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -23829,10 +24337,14 @@
 static u32 XXLFM_FrameList_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -23880,7 +24392,7 @@
 	if (!strcmp("index", name)) return 0;
 	if (!strcmp("frame", name)) return 1;
 	return -1;
-	}
+}
 static Bool XXLFM_FrameList_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -23934,8 +24446,8 @@
 static void XXLFM_LightMap_Del(GF_Node *node)
 {
 	M_XXLFM_LightMap *p = (M_XXLFM_LightMap *) node;
-	gf_node_unregister((GF_Node *) p->surfaceMapList, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->viewMapList, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->surfaceMapList, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->viewMapList, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -23946,10 +24458,14 @@
 static u32 XXLFM_LightMap_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 5;
 	}
@@ -24020,7 +24536,7 @@
 	if (!strcmp("surfaceMapList", name)) return 3;
 	if (!strcmp("viewMapList", name)) return 4;
 	return -1;
-	}
+}
 static Bool XXLFM_LightMap_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -24077,7 +24593,7 @@
 {
 	M_XXLFM_SurfaceMapList *p = (M_XXLFM_SurfaceMapList *) node;
 	gf_sg_mfint32_del(p->tileIndex);
-	gf_node_unregister((GF_Node *) p->triangleCoordinate, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->triangleCoordinate, (GF_Node *) p);
 	gf_sg_mfint32_del(p->triangleIndex);
 	gf_sg_mfint32_del(p->viewMapIndex);
 	gf_node_free((GF_Node *) p);
@@ -24090,10 +24606,14 @@
 static u32 XXLFM_SurfaceMapList_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -24156,7 +24676,7 @@
 	if (!strcmp("triangleIndex", name)) return 2;
 	if (!strcmp("viewMapIndex", name)) return 3;
 	return -1;
-	}
+}
 static Bool XXLFM_SurfaceMapList_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -24198,8 +24718,8 @@
 static void XXLFM_ViewMapList_Del(GF_Node *node)
 {
 	M_XXLFM_ViewMapList *p = (M_XXLFM_ViewMapList *) node;
-	gf_node_unregister((GF_Node *) p->textureOrigin, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->textureSize, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->textureOrigin, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->textureSize, (GF_Node *) p);
 	gf_sg_mfint32_del(p->tileIndex);
 	gf_sg_mfint32_del(p->vertexIndex);
 	gf_node_free((GF_Node *) p);
@@ -24212,10 +24732,14 @@
 static u32 XXLFM_ViewMapList_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -24279,7 +24803,7 @@
 	if (!strcmp("tileIndex", name)) return 2;
 	if (!strcmp("vertexIndex", name)) return 3;
 	return -1;
-	}
+}
 static Bool XXLFM_ViewMapList_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -24321,13 +24845,13 @@
 	gf_sg_mfint32_del(p->set_coordIndex);
 	gf_sg_mfint32_del(p->set_normalIndex);
 	gf_sg_mfint32_del(p->set_texCoordIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->gridCoord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->gridCoord, (GF_Node *) p);
 	gf_sg_mfint32_del(p->nLevels);
-	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);
 	gf_sg_mfint32_del(p->nSlices);
-	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);
 	gf_sg_mffloat_del(p->vertexOffset);
 	gf_sg_mfint32_del(p->vertexLink);
 	gf_sg_mfint32_del(p->colorIndex);
@@ -24346,10 +24870,14 @@
 static u32 MeshGrid_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 16;
-	case GF_SG_FIELD_CODING_DEF: return 17;
-	case GF_SG_FIELD_CODING_OUT: return 14;
-	case GF_SG_FIELD_CODING_DYN: return 6;
+	case GF_SG_FIELD_CODING_IN:
+		return 16;
+	case GF_SG_FIELD_CODING_DEF:
+		return 17;
+	case GF_SG_FIELD_CODING_OUT:
+		return 14;
+	case GF_SG_FIELD_CODING_DYN:
+		return 6;
 	default:
 		return 23;
 	}
@@ -24556,7 +25084,7 @@
 	if (!strcmp("isLoading", name)) return 21;
 	if (!strcmp("nVertices", name)) return 22;
 	return -1;
-	}
+}
 static Bool MeshGrid_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -24657,7 +25185,7 @@
 {
 	M_NonLinearDeformer *p = (M_NonLinearDeformer *) node;
 	gf_sg_mffloat_del(p->extend);
-	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -24668,10 +25196,14 @@
 static u32 NonLinearDeformer_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 5;
 	}
@@ -24741,7 +25273,7 @@
 	if (!strcmp("param", name)) return 3;
 	if (!strcmp("type", name)) return 4;
 	return -1;
-	}
+}
 static Bool NonLinearDeformer_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -24777,7 +25309,7 @@
 {
 	M_NurbsCurve *p = (M_NurbsCurve *) node;
 	gf_sg_mfint32_del(p->set_colorIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
 	gf_sg_mfvec4f_del(p->controlPoint);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mffloat_del(p->knot);
@@ -24792,10 +25324,14 @@
 static u32 NurbsCurve_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 8;
 	}
@@ -24890,7 +25426,7 @@
 	if (!strcmp("knot", name)) return 6;
 	if (!strcmp("order", name)) return 7;
 	return -1;
-	}
+}
 static Bool NurbsCurve_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -24941,7 +25477,7 @@
 {
 	M_NurbsCurve2D *p = (M_NurbsCurve2D *) node;
 	gf_sg_mfint32_del(p->set_colorIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
 	gf_sg_mfvec3f_del(p->controlPoint);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mffloat_del(p->knot);
@@ -24956,10 +25492,14 @@
 static u32 NurbsCurve2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 8;
 	}
@@ -25054,7 +25594,7 @@
 	if (!strcmp("knot", name)) return 6;
 	if (!strcmp("order", name)) return 7;
 	return -1;
-	}
+}
 static Bool NurbsCurve2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -25106,9 +25646,9 @@
 	M_NurbsSurface *p = (M_NurbsSurface *) node;
 	gf_sg_mfint32_del(p->set_colorIndex);
 	gf_sg_mfint32_del(p->set_texColorIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
 	gf_sg_mfvec4f_del(p->controlPoint);
-	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mfint32_del(p->texColorIndex);
 	gf_sg_mffloat_del(p->uKnot);
@@ -25124,10 +25664,14 @@
 static u32 NurbsSurface_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 16;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 16;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 18;
 	}
@@ -25294,7 +25838,7 @@
 	if (!strcmp("vKnot", name)) return 16;
 	if (!strcmp("vOrder", name)) return 17;
 	return -1;
-	}
+}
 static Bool NurbsSurface_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -25375,7 +25919,7 @@
 static void OctreeImage_Del(GF_Node *node)
 {
 	M_OctreeImage *p = (M_OctreeImage *) node;
-	gf_node_unregister_children((GF_Node *) p, p->images);	
+	gf_node_unregister_children((GF_Node *) p, p->images);
 	gf_sg_mfint32_del(p->octree);
 	gf_sg_mfint32_del(p->voxelImageIndex);
 	gf_node_free((GF_Node *) p);
@@ -25386,10 +25930,14 @@
 static u32 OctreeImage_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -25446,7 +25994,7 @@
 	if (!strcmp("octreeResolution", name)) return 2;
 	if (!strcmp("voxelImageIndex", name)) return 3;
 	return -1;
-	}
+}
 static Bool OctreeImage_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -25491,9 +26039,9 @@
 static void XXParticles_Del(GF_Node *node)
 {
 	M_XXParticles *p = (M_XXParticles *) node;
-	gf_node_unregister_children((GF_Node *) p, p->influences);	
-	gf_node_unregister((GF_Node *) p->init, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->primitive, (GF_Node *) p);	
+	gf_node_unregister_children((GF_Node *) p, p->influences);
+	gf_node_unregister((GF_Node *) p->init, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->primitive, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -25504,10 +26052,14 @@
 static u32 XXParticles_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 25;
-	case GF_SG_FIELD_CODING_DEF: return 25;
-	case GF_SG_FIELD_CODING_OUT: return 25;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 25;
+	case GF_SG_FIELD_CODING_DEF:
+		return 25;
+	case GF_SG_FIELD_CODING_OUT:
+		return 25;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 25;
 	}
@@ -25719,7 +26271,7 @@
 	if (!strcmp("particleRadiusRate", name)) return 23;
 	if (!strcmp("particleRadiusVariation", name)) return 24;
 	return -1;
-	}
+}
 static Bool XXParticles_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -25795,10 +26347,14 @@
 static u32 XXParticleInitBox_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -25846,7 +26402,7 @@
 	if (!strcmp("falloff", name)) return 0;
 	if (!strcmp("size", name)) return 1;
 	return -1;
-	}
+}
 static Bool XXParticleInitBox_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -25890,10 +26446,14 @@
 static u32 XXPlanarObstacle_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -25955,7 +26515,7 @@
 	if (!strcmp("reflection", name)) return 2;
 	if (!strcmp("absorption", name)) return 3;
 	return -1;
-	}
+}
 static Bool XXPlanarObstacle_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -26003,10 +26563,14 @@
 static u32 XXPointAttractor_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -26068,7 +26632,7 @@
 	if (!strcmp("position", name)) return 2;
 	if (!strcmp("rate", name)) return 3;
 	return -1;
-	}
+}
 static Bool XXPointAttractor_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -26114,10 +26678,14 @@
 static u32 PointTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 5;
 	}
@@ -26180,7 +26748,7 @@
 	if (!strcmp("height", name)) return 3;
 	if (!strcmp("width", name)) return 4;
 	return -1;
-	}
+}
 static Bool PointTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -26235,10 +26803,14 @@
 static u32 PositionAnimator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 10;
-	case GF_SG_FIELD_CODING_DEF: return 9;
-	case GF_SG_FIELD_CODING_OUT: return 12;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 10;
+	case GF_SG_FIELD_CODING_DEF:
+		return 9;
+	case GF_SG_FIELD_CODING_OUT:
+		return 12;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 13;
 	}
@@ -26364,7 +26936,7 @@
 	if (!strcmp("rotation_changed", name)) return 11;
 	if (!strcmp("value_changed", name)) return 12;
 	return -1;
-	}
+}
 static Bool PositionAnimator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -26443,10 +27015,14 @@
 static u32 PositionAnimator2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 10;
-	case GF_SG_FIELD_CODING_DEF: return 9;
-	case GF_SG_FIELD_CODING_OUT: return 12;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 10;
+	case GF_SG_FIELD_CODING_DEF:
+		return 9;
+	case GF_SG_FIELD_CODING_OUT:
+		return 12;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 13;
 	}
@@ -26572,7 +27148,7 @@
 	if (!strcmp("rotation_changed", name)) return 11;
 	if (!strcmp("value_changed", name)) return 12;
 	return -1;
-	}
+}
 static Bool PositionAnimator2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -26649,10 +27225,14 @@
 static u32 PositionInterpolator4D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -26715,7 +27295,7 @@
 	if (!strcmp("keyValue", name)) return 2;
 	if (!strcmp("value_changed", name)) return 3;
 	return -1;
-	}
+}
 static Bool PositionInterpolator4D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -26775,10 +27355,14 @@
 static u32 ProceduralTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 19;
-	case GF_SG_FIELD_CODING_DEF: return 19;
-	case GF_SG_FIELD_CODING_OUT: return 20;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 19;
+	case GF_SG_FIELD_CODING_DEF:
+		return 19;
+	case GF_SG_FIELD_CODING_OUT:
+		return 20;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 20;
 	}
@@ -26952,7 +27536,7 @@
 	if (!strcmp("width", name)) return 18;
 	if (!strcmp("image_changed", name)) return 19;
 	return -1;
-	}
+}
 static Bool ProceduralTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -27141,10 +27725,14 @@
 static u32 Quadric_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 10;
-	case GF_SG_FIELD_CODING_DEF: return 10;
-	case GF_SG_FIELD_CODING_OUT: return 10;
-	case GF_SG_FIELD_CODING_DYN: return 7;
+	case GF_SG_FIELD_CODING_IN:
+		return 10;
+	case GF_SG_FIELD_CODING_DEF:
+		return 10;
+	case GF_SG_FIELD_CODING_OUT:
+		return 10;
+	case GF_SG_FIELD_CODING_DYN:
+		return 7;
 	default:
 		return 10;
 	}
@@ -27251,7 +27839,7 @@
 	if (!strcmp("P5", name)) return 8;
 	if (!strcmp("solid", name)) return 9;
 	return -1;
-	}
+}
 static Bool Quadric_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -27361,7 +27949,7 @@
 	gf_sg_mffloat_del(p->sectionPosition);
 	gf_sg_mfint32_del(p->skinCoordIndex);
 	gf_sg_mffloat_del(p->skinCoordWeight);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -27373,10 +27961,14 @@
 static u32 SBBone_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 24;
-	case GF_SG_FIELD_CODING_DEF: return 22;
-	case GF_SG_FIELD_CODING_OUT: return 22;
-	case GF_SG_FIELD_CODING_DYN: return 6;
+	case GF_SG_FIELD_CODING_IN:
+		return 24;
+	case GF_SG_FIELD_CODING_DEF:
+		return 22;
+	case GF_SG_FIELD_CODING_OUT:
+		return 22;
+	case GF_SG_FIELD_CODING_DYN:
+		return 6;
 	default:
 		return 24;
 	}
@@ -27586,7 +28178,7 @@
 	if (!strcmp("skinCoordWeight", name)) return 22;
 	if (!strcmp("translation", name)) return 23;
 	return -1;
-	}
+}
 static Bool SBBone_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -27697,7 +28289,7 @@
 static void SBMuscle_Del(GF_Node *node)
 {
 	M_SBMuscle *p = (M_SBMuscle *) node;
-	gf_node_unregister((GF_Node *) p->muscleCurve, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->muscleCurve, (GF_Node *) p);
 	gf_sg_mfint32_del(p->skinCoordIndex);
 	gf_sg_mffloat_del(p->skinCoordWeight);
 	gf_node_free((GF_Node *) p);
@@ -27711,10 +28303,14 @@
 static u32 SBMuscle_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 6;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 6;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 6;
 	}
@@ -27794,7 +28390,7 @@
 	if (!strcmp("skinCoordIndex", name)) return 4;
 	if (!strcmp("skinCoordWeight", name)) return 5;
 	return -1;
-	}
+}
 static Bool SBMuscle_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -27853,7 +28449,7 @@
 	M_SBSegment *p = (M_SBSegment *) node;
 	gf_sg_mfvec3f_del(p->momentsOfInertia);
 	gf_sg_sfstring_del(p->name);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -27865,10 +28461,14 @@
 static u32 SBSegment_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 7;
 	}
@@ -27959,7 +28559,7 @@
 	if (!strcmp("momentsOfInertia", name)) return 5;
 	if (!strcmp("name", name)) return 6;
 	return -1;
-	}
+}
 static Bool SBSegment_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -28010,7 +28610,7 @@
 {
 	M_SBSite *p = (M_SBSite *) node;
 	gf_sg_sfstring_del(p->name);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -28022,10 +28622,14 @@
 static u32 SBSite_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 5;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 5;
 	default:
 		return 9;
 	}
@@ -28130,7 +28734,7 @@
 	if (!strcmp("scaleOrientation", name)) return 7;
 	if (!strcmp("translation", name)) return 8;
 	return -1;
-	}
+}
 static Bool SBSite_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -28198,16 +28802,16 @@
 static void SBSkinnedModel_Del(GF_Node *node)
 {
 	M_SBSkinnedModel *p = (M_SBSkinnedModel *) node;
-	gf_node_unregister_children((GF_Node *) p, p->bones);	
-	gf_node_unregister_children((GF_Node *) p, p->muscles);	
+	gf_node_unregister_children((GF_Node *) p, p->bones);
+	gf_node_unregister_children((GF_Node *) p, p->muscles);
 	gf_sg_sfstring_del(p->name);
-	gf_node_unregister_children((GF_Node *) p, p->segments);	
-	gf_node_unregister_children((GF_Node *) p, p->sites);	
-	gf_node_unregister_children((GF_Node *) p, p->skeleton);	
-	gf_node_unregister_children((GF_Node *) p, p->skin);	
-	gf_node_unregister((GF_Node *) p->skinCoord, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->skinNormal, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->weighsComputationSkinCoord, (GF_Node *) p);	
+	gf_node_unregister_children((GF_Node *) p, p->segments);
+	gf_node_unregister_children((GF_Node *) p, p->sites);
+	gf_node_unregister_children((GF_Node *) p, p->skeleton);
+	gf_node_unregister_children((GF_Node *) p, p->skin);
+	gf_node_unregister((GF_Node *) p->skinCoord, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->skinNormal, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->weighsComputationSkinCoord, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -28219,10 +28823,14 @@
 static u32 SBSkinnedModel_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 15;
-	case GF_SG_FIELD_CODING_DEF: return 15;
-	case GF_SG_FIELD_CODING_OUT: return 15;
-	case GF_SG_FIELD_CODING_DYN: return 5;
+	case GF_SG_FIELD_CODING_IN:
+		return 15;
+	case GF_SG_FIELD_CODING_DEF:
+		return 15;
+	case GF_SG_FIELD_CODING_OUT:
+		return 15;
+	case GF_SG_FIELD_CODING_DYN:
+		return 5;
 	default:
 		return 15;
 	}
@@ -28373,7 +28981,7 @@
 	if (!strcmp("translation", name)) return 13;
 	if (!strcmp("weighsComputationSkinCoord", name)) return 14;
 	return -1;
-	}
+}
 static Bool SBSkinnedModel_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -28441,7 +29049,7 @@
 {
 	M_SBVCAnimation *p = (M_SBVCAnimation *) node;
 	gf_sg_mfurl_del(p->url);
-	gf_node_unregister_children((GF_Node *) p, p->virtualCharacters);	
+	gf_node_unregister_children((GF_Node *) p, p->virtualCharacters);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -28452,10 +29060,14 @@
 static u32 SBVCAnimation_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -28504,7 +29116,7 @@
 	if (!strcmp("url", name)) return 0;
 	if (!strcmp("virtualCharacters", name)) return 1;
 	return -1;
-	}
+}
 static Bool SBVCAnimation_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -28548,10 +29160,14 @@
 static u32 ScalarAnimator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 10;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 10;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 11;
 	}
@@ -28663,7 +29279,7 @@
 	if (!strcmp("endValue", name)) return 9;
 	if (!strcmp("value_changed", name)) return 10;
 	return -1;
-	}
+}
 static Bool ScalarAnimator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -28720,8 +29336,8 @@
 static void SimpleTexture_Del(GF_Node *node)
 {
 	M_SimpleTexture *p = (M_SimpleTexture *) node;
-	gf_node_unregister((GF_Node *) p->depth, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->texture, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->depth, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->texture, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -28730,10 +29346,14 @@
 static u32 SimpleTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -28777,7 +29397,7 @@
 	if (!strcmp("depth", name)) return 0;
 	if (!strcmp("texture", name)) return 1;
 	return -1;
-	}
+}
 static Bool SimpleTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -28808,7 +29428,7 @@
 {
 	M_SolidRep *p = (M_SolidRep *) node;
 	gf_sg_mfint32_del(p->densityList);
-	gf_node_unregister((GF_Node *) p->solidTree, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->solidTree, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -28820,10 +29440,14 @@
 static u32 SolidRep_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 3;
 	}
@@ -28882,7 +29506,7 @@
 	if (!strcmp("densityList", name)) return 1;
 	if (!strcmp("solidTree", name)) return 2;
 	return -1;
-	}
+}
 static Bool SolidRep_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -28928,10 +29552,10 @@
 	gf_sg_mfint32_del(p->set_creaseVertexIndex);
 	gf_sg_mfint32_del(p->set_dartVertexIndex);
 	gf_sg_mfint32_del(p->set_texCoordIndex);
-	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);	
-	gf_node_unregister_children((GF_Node *) p, p->sectors);	
+	gf_node_unregister((GF_Node *) p->color, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->coord, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->texCoord, (GF_Node *) p);
+	gf_node_unregister_children((GF_Node *) p, p->sectors);
 	gf_sg_mfint32_del(p->invisibleEdgeIndex);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mfint32_del(p->coordIndex);
@@ -28950,10 +29574,14 @@
 static u32 SubdivisionSurface_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 14;
-	case GF_SG_FIELD_CODING_DEF: return 19;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 14;
+	case GF_SG_FIELD_CODING_DEF:
+		return 19;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 26;
 	}
@@ -29180,7 +29808,7 @@
 	if (!strcmp("solid", name)) return 24;
 	if (!strcmp("texCoordIndex", name)) return 25;
 	return -1;
-	}
+}
 static Bool SubdivisionSurface_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -29241,10 +29869,14 @@
 static u32 SubdivSurfaceSector_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -29327,7 +29959,7 @@
 	if (!strcmp("faceIndex", name)) return 5;
 	if (!strcmp("vertexIndex", name)) return 6;
 	return -1;
-	}
+}
 static Bool SubdivSurfaceSector_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -29403,7 +30035,7 @@
 static void WaveletSubdivisionSurface_Del(GF_Node *node)
 {
 	M_WaveletSubdivisionSurface *p = (M_WaveletSubdivisionSurface *) node;
-	gf_node_unregister((GF_Node *) p->baseMesh, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->baseMesh, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -29414,10 +30046,14 @@
 static u32 WaveletSubdivisionSurface_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -29480,7 +30116,7 @@
 	if (!strcmp("frequency", name)) return 2;
 	if (!strcmp("quality", name)) return 3;
 	return -1;
-	}
+}
 static Bool WaveletSubdivisionSurface_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -29513,9 +30149,9 @@
 static void Clipper2D_Del(GF_Node *node)
 {
 	M_Clipper2D *p = (M_Clipper2D *) node;
-	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->transform, (GF_Node *) p);	
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->transform, (GF_Node *) p);
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -29526,10 +30162,14 @@
 static u32 Clipper2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -29619,7 +30259,7 @@
 	if (!strcmp("transform", name)) return 5;
 	if (!strcmp("XOR", name)) return 6;
 	return -1;
-	}
+}
 static Bool Clipper2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -29651,7 +30291,7 @@
 static void ColorTransform_Del(GF_Node *node)
 {
 	M_ColorTransform *p = (M_ColorTransform *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -29663,10 +30303,14 @@
 static u32 ColorTransform_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 23;
-	case GF_SG_FIELD_CODING_DEF: return 21;
-	case GF_SG_FIELD_CODING_OUT: return 21;
-	case GF_SG_FIELD_CODING_DYN: return 20;
+	case GF_SG_FIELD_CODING_IN:
+		return 23;
+	case GF_SG_FIELD_CODING_DEF:
+		return 21;
+	case GF_SG_FIELD_CODING_OUT:
+		return 21;
+	case GF_SG_FIELD_CODING_DYN:
+		return 20;
 	default:
 		return 23;
 	}
@@ -29869,7 +30513,7 @@
 	if (!strcmp("maa", name)) return 21;
 	if (!strcmp("ta", name)) return 22;
 	return -1;
-	}
+}
 static Bool ColorTransform_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -30051,10 +30695,14 @@
 static u32 Ellipse_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 1;
 	}
@@ -30098,7 +30746,7 @@
 {
 	if (!strcmp("radius", name)) return 0;
 	return -1;
-	}
+}
 static Bool Ellipse_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -30139,7 +30787,7 @@
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfcolor_del(p->keyValue);
 	gf_sg_mffloat_del(p->opacity);
-	gf_node_unregister((GF_Node *) p->transform, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->transform, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -30151,10 +30799,14 @@
 static u32 LinearGradient_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 7;
 	}
@@ -30241,7 +30893,7 @@
 	if (!strcmp("startPoint", name)) return 5;
 	if (!strcmp("transform", name)) return 6;
 	return -1;
-	}
+}
 static Bool LinearGradient_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -30316,9 +30968,9 @@
 static void PathLayout_Del(GF_Node *node)
 {
 	M_PathLayout *p = (M_PathLayout *) node;
-	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);
 	gf_sg_mfint32_del(p->alignment);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -30330,10 +30982,14 @@
 static u32 PathLayout_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 10;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 10;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 10;
 	}
@@ -30446,7 +31102,7 @@
 	if (!strcmp("wrapMode", name)) return 8;
 	if (!strcmp("splitText", name)) return 9;
 	return -1;
-	}
+}
 static Bool PathLayout_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -30513,7 +31169,7 @@
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfcolor_del(p->keyValue);
 	gf_sg_mffloat_del(p->opacity);
-	gf_node_unregister((GF_Node *) p->transform, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->transform, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -30525,10 +31181,14 @@
 static u32 RadialGradient_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 3;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 3;
 	default:
 		return 8;
 	}
@@ -30622,7 +31282,7 @@
 	if (!strcmp("spreadMethod", name)) return 6;
 	if (!strcmp("transform", name)) return 7;
 	return -1;
-	}
+}
 static Bool RadialGradient_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -30718,10 +31378,14 @@
 static u32 SynthesizedTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 9;
-	case GF_SG_FIELD_CODING_OUT: return 11;
-	case GF_SG_FIELD_CODING_DYN: return 3;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 9;
+	case GF_SG_FIELD_CODING_OUT:
+		return 11;
+	case GF_SG_FIELD_CODING_DYN:
+		return 3;
 	default:
 		return 11;
 	}
@@ -30835,7 +31499,7 @@
 	if (!strcmp("duration_changed", name)) return 9;
 	if (!strcmp("isActive", name)) return 10;
 	return -1;
-	}
+}
 static Bool SynthesizedTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -30902,7 +31566,7 @@
 static void TransformMatrix2D_Del(GF_Node *node)
 {
 	M_TransformMatrix2D *p = (M_TransformMatrix2D *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -30914,10 +31578,14 @@
 static u32 TransformMatrix2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 6;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 6;
 	default:
 		return 9;
 	}
@@ -31022,7 +31690,7 @@
 	if (!strcmp("myy", name)) return 7;
 	if (!strcmp("ty", name)) return 8;
 	return -1;
-	}
+}
 static Bool TransformMatrix2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -31108,10 +31776,14 @@
 static u32 Viewport_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 6;
-	case GF_SG_FIELD_CODING_DEF: return 6;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 3;
+	case GF_SG_FIELD_CODING_IN:
+		return 6;
+	case GF_SG_FIELD_CODING_DEF:
+		return 6;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 3;
 	default:
 		return 9;
 	}
@@ -31212,7 +31884,7 @@
 	if (!strcmp("bindTime", name)) return 7;
 	if (!strcmp("isBound", name)) return 8;
 	return -1;
-	}
+}
 static Bool Viewport_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -31283,7 +31955,7 @@
 static void XCurve2D_Del(GF_Node *node)
 {
 	M_XCurve2D *p = (M_XCurve2D *) node;
-	gf_node_unregister((GF_Node *) p->point, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->point, (GF_Node *) p);
 	gf_sg_mfint32_del(p->type);
 	gf_node_free((GF_Node *) p);
 }
@@ -31296,10 +31968,14 @@
 static u32 XCurve2D_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 3;
-	case GF_SG_FIELD_CODING_OUT: return 3;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 3;
+	case GF_SG_FIELD_CODING_OUT:
+		return 3;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 3;
 	}
@@ -31358,7 +32034,7 @@
 	if (!strcmp("fineness", name)) return 1;
 	if (!strcmp("type", name)) return 2;
 	return -1;
-	}
+}
 static Bool XCurve2D_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -31421,10 +32097,14 @@
 static u32 XFontStyle_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 17;
-	case GF_SG_FIELD_CODING_DEF: return 17;
-	case GF_SG_FIELD_CODING_OUT: return 17;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 17;
+	case GF_SG_FIELD_CODING_DEF:
+		return 17;
+	case GF_SG_FIELD_CODING_OUT:
+		return 17;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 17;
 	}
@@ -31577,7 +32257,7 @@
 	if (!strcmp("featureLength", name)) return 15;
 	if (!strcmp("featureValue", name)) return 16;
 	return -1;
-	}
+}
 static Bool XFontStyle_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -31646,8 +32326,8 @@
 {
 	M_XLineProperties *p = (M_XLineProperties *) node;
 	gf_sg_mffloat_del(p->dashes);
-	gf_node_unregister((GF_Node *) p->texture, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->textureTransform, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->texture, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->textureTransform, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -31659,10 +32339,14 @@
 static u32 XLineProperties_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 13;
-	case GF_SG_FIELD_CODING_DEF: return 13;
-	case GF_SG_FIELD_CODING_OUT: return 13;
-	case GF_SG_FIELD_CODING_DYN: return 5;
+	case GF_SG_FIELD_CODING_IN:
+		return 13;
+	case GF_SG_FIELD_CODING_DEF:
+		return 13;
+	case GF_SG_FIELD_CODING_OUT:
+		return 13;
+	case GF_SG_FIELD_CODING_DYN:
+		return 5;
 	default:
 		return 13;
 	}
@@ -31792,7 +32476,7 @@
 	if (!strcmp("texture", name)) return 11;
 	if (!strcmp("textureTransform", name)) return 12;
 	return -1;
-	}
+}
 static Bool XLineProperties_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -31892,7 +32576,7 @@
 {
 	M_AdvancedAudioBuffer *p = (M_AdvancedAudioBuffer *) node;
 	gf_sg_mfint32_del(p->phaseGroup);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -31904,10 +32588,14 @@
 static u32 AdvancedAudioBuffer_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 14;
-	case GF_SG_FIELD_CODING_DEF: return 14;
-	case GF_SG_FIELD_CODING_OUT: return 14;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 14;
+	case GF_SG_FIELD_CODING_DEF:
+		return 14;
+	case GF_SG_FIELD_CODING_OUT:
+		return 14;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 18;
 	}
@@ -32075,7 +32763,7 @@
 	if (!strcmp("duration_changed", name)) return 16;
 	if (!strcmp("isActive", name)) return 17;
 	return -1;
-	}
+}
 static Bool AdvancedAudioBuffer_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -32202,7 +32890,7 @@
 	gf_sg_mfint32_del(p->ambComponentIndex);
 	gf_sg_mffloat_del(p->ambBackwardMatrix);
 	gf_sg_mfint32_del(p->ambSoundfieldResolution);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -32213,10 +32901,14 @@
 static u32 AudioChannelConfig_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 21;
-	case GF_SG_FIELD_CODING_DEF: return 20;
-	case GF_SG_FIELD_CODING_OUT: return 19;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 21;
+	case GF_SG_FIELD_CODING_DEF:
+		return 20;
+	case GF_SG_FIELD_CODING_OUT:
+		return 19;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 22;
 	}
@@ -32409,7 +33101,7 @@
 	if (!strcmp("ambSoundfieldResolution", name)) return 20;
 	if (!strcmp("numChannel", name)) return 21;
 	return -1;
-	}
+}
 static Bool AudioChannelConfig_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -32543,7 +33235,7 @@
 static void DepthImageV2_Del(GF_Node *node)
 {
 	M_DepthImageV2 *p = (M_DepthImageV2 *) node;
-	gf_node_unregister((GF_Node *) p->diTexture, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->diTexture, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -32552,10 +33244,14 @@
 static u32 DepthImageV2_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -32640,7 +33336,7 @@
 	if (!strcmp("position", name)) return 6;
 	if (!strcmp("splatMinMax", name)) return 7;
 	return -1;
-	}
+}
 static Bool DepthImageV2_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -32684,8 +33380,8 @@
 static void MorphShape_Del(GF_Node *node)
 {
 	M_MorphShape *p = (M_MorphShape *) node;
-	gf_node_unregister((GF_Node *) p->baseShape, (GF_Node *) p);	
-	gf_node_unregister_children((GF_Node *) p, p->targetShapes);	
+	gf_node_unregister((GF_Node *) p->baseShape, (GF_Node *) p);
+	gf_node_unregister_children((GF_Node *) p, p->targetShapes);
 	gf_sg_mffloat_del(p->weights);
 	gf_node_free((GF_Node *) p);
 }
@@ -32697,10 +33393,14 @@
 static u32 MorphShape_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 4;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 4;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -32764,7 +33464,7 @@
 	if (!strcmp("targetShapes", name)) return 2;
 	if (!strcmp("weights", name)) return 3;
 	return -1;
-	}
+}
 static Bool MorphShape_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -32805,7 +33505,7 @@
 	gf_sg_mfint32_del(p->function);
 	gf_sg_mfint32_del(p->mode);
 	gf_sg_mfint32_del(p->source);
-	gf_node_unregister_children((GF_Node *) p, p->texture);	
+	gf_node_unregister_children((GF_Node *) p, p->texture);
 	gf_sg_mfvec3f_del(p->cameraVector);
 	gf_node_free((GF_Node *) p);
 }
@@ -32817,10 +33517,14 @@
 static u32 MultiTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -32911,7 +33615,7 @@
 	if (!strcmp("cameraVector", name)) return 6;
 	if (!strcmp("transparent", name)) return 7;
 	return -1;
-	}
+}
 static Bool MultiTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -32947,7 +33651,7 @@
 	M_PointTextureV2 *p = (M_PointTextureV2 *) node;
 	gf_sg_mfcolor_del(p->color);
 	gf_sg_mfint32_del(p->depth);
-	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);
 	gf_sg_mfvec3f_del(p->splatU);
 	gf_sg_mfvec3f_del(p->splatV);
 	gf_node_free((GF_Node *) p);
@@ -32958,10 +33662,14 @@
 static u32 PointTextureV2_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -33046,7 +33754,7 @@
 	if (!strcmp("splatV", name)) return 6;
 	if (!strcmp("width", name)) return 7;
 	return -1;
-	}
+}
 static Bool PointTextureV2_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -33100,7 +33808,7 @@
 	M_SBVCAnimationV2 *p = (M_SBVCAnimationV2 *) node;
 	gf_sg_mfint32_del(p->activeUrlIndex);
 	gf_sg_mfurl_del(p->url);
-	gf_node_unregister_children((GF_Node *) p, p->virtualCharacters);	
+	gf_node_unregister_children((GF_Node *) p, p->virtualCharacters);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -33112,10 +33820,14 @@
 static u32 SBVCAnimationV2_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 10;
-	case GF_SG_FIELD_CODING_DYN: return 2;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 10;
+	case GF_SG_FIELD_CODING_DYN:
+		return 2;
 	default:
 		return 10;
 	}
@@ -33223,7 +33935,7 @@
 	if (!strcmp("duration_changed", name)) return 8;
 	if (!strcmp("isActive", name)) return 9;
 	return -1;
-	}
+}
 static Bool SBVCAnimationV2_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -33269,11 +33981,11 @@
 static void SimpleTextureV2_Del(GF_Node *node)
 {
 	M_SimpleTextureV2 *p = (M_SimpleTextureV2 *) node;
-	gf_node_unregister((GF_Node *) p->depth, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->splatU, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->splatV, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->texture, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->depth, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->normal, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->splatU, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->splatV, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->texture, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -33282,10 +33994,14 @@
 static u32 SimpleTextureV2_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 5;
 	}
@@ -33353,7 +34069,7 @@
 	if (!strcmp("splatV", name)) return 3;
 	if (!strcmp("texture", name)) return 4;
 	return -1;
-	}
+}
 static Bool SimpleTextureV2_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -33383,7 +34099,7 @@
 static void SurroundingSound_Del(GF_Node *node)
 {
 	M_SurroundingSound *p = (M_SurroundingSound *) node;
-	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -33395,10 +34111,14 @@
 static u32 SurroundingSound_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 3;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 3;
 	default:
 		return 7;
 	}
@@ -33485,7 +34205,7 @@
 	if (!strcmp("orientation", name)) return 5;
 	if (!strcmp("isTransformable", name)) return 6;
 	return -1;
-	}
+}
 static Bool SurroundingSound_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -33550,7 +34270,7 @@
 static void Transform3DAudio_Del(GF_Node *node)
 {
 	M_Transform3DAudio *p = (M_Transform3DAudio *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -33562,10 +34282,14 @@
 static u32 Transform3DAudio_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 7;
-	case GF_SG_FIELD_CODING_OUT: return 7;
-	case GF_SG_FIELD_CODING_DYN: return 5;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 7;
+	case GF_SG_FIELD_CODING_OUT:
+		return 7;
+	case GF_SG_FIELD_CODING_DYN:
+		return 5;
 	default:
 		return 9;
 	}
@@ -33670,7 +34394,7 @@
 	if (!strcmp("thirdTranslationCoordinate", name)) return 7;
 	if (!strcmp("coordinateTransform", name)) return 8;
 	return -1;
-	}
+}
 static Bool Transform3DAudio_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -33750,8 +34474,8 @@
 static void WideSound_Del(GF_Node *node)
 {
 	M_WideSound *p = (M_WideSound *) node;
-	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->perceptualParameters, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->source, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->perceptualParameters, (GF_Node *) p);
 	gf_sg_mffloat_del(p->size);
 	gf_node_free((GF_Node *) p);
 }
@@ -33764,10 +34488,14 @@
 static u32 WideSound_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 12;
-	case GF_SG_FIELD_CODING_DEF: return 15;
-	case GF_SG_FIELD_CODING_OUT: return 12;
-	case GF_SG_FIELD_CODING_DYN: return 3;
+	case GF_SG_FIELD_CODING_IN:
+		return 12;
+	case GF_SG_FIELD_CODING_DEF:
+		return 15;
+	case GF_SG_FIELD_CODING_OUT:
+		return 12;
+	case GF_SG_FIELD_CODING_DYN:
+		return 3;
 	default:
 		return 15;
 	}
@@ -33911,7 +34639,7 @@
 	if (!strcmp("distance", name)) return 13;
 	if (!strcmp("useAirabs", name)) return 14;
 	return -1;
-	}
+}
 static Bool WideSound_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -34001,8 +34729,8 @@
 static void ScoreShape_Del(GF_Node *node)
 {
 	M_ScoreShape *p = (M_ScoreShape *) node;
-	gf_node_unregister((GF_Node *) p->score, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->score, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->geometry, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -34013,10 +34741,14 @@
 static u32 ScoreShape_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -34066,7 +34798,7 @@
 	if (!strcmp("score", name)) return 0;
 	if (!strcmp("geometry", name)) return 1;
 	return -1;
-	}
+}
 static Bool ScoreShape_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -34121,10 +34853,14 @@
 static u32 MusicScore_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 21;
-	case GF_SG_FIELD_CODING_DEF: return 16;
-	case GF_SG_FIELD_CODING_OUT: return 26;
-	case GF_SG_FIELD_CODING_DYN: return 1;
+	case GF_SG_FIELD_CODING_IN:
+		return 21;
+	case GF_SG_FIELD_CODING_DEF:
+		return 16;
+	case GF_SG_FIELD_CODING_OUT:
+		return 26;
+	case GF_SG_FIELD_CODING_DYN:
+		return 1;
 	default:
 		return 31;
 	}
@@ -34383,7 +35119,7 @@
 	if (!strcmp("numMeasures", name)) return 29;
 	if (!strcmp("partNames", name)) return 30;
 	return -1;
-	}
+}
 static Bool MusicScore_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -34428,7 +35164,7 @@
 static void FootPrintSetNode_Del(GF_Node *node)
 {
 	M_FootPrintSetNode *p = (M_FootPrintSetNode *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -34439,10 +35175,14 @@
 static u32 FootPrintSetNode_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 1;
-	case GF_SG_FIELD_CODING_DEF: return 1;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 1;
+	case GF_SG_FIELD_CODING_DEF:
+		return 1;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 1;
 	}
@@ -34484,7 +35224,7 @@
 {
 	if (!strcmp("children", name)) return 0;
 	return -1;
-	}
+}
 static Bool FootPrintSetNode_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -34515,7 +35255,7 @@
 static void FootPrintNode_Del(GF_Node *node)
 {
 	M_FootPrintNode *p = (M_FootPrintNode *) node;
-	gf_node_unregister((GF_Node *) p->footprint, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->footprint, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -34526,10 +35266,14 @@
 static u32 FootPrintNode_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 2;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 2;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 2;
 	}
@@ -34578,7 +35322,7 @@
 	if (!strcmp("index", name)) return 0;
 	if (!strcmp("footprint", name)) return 1;
 	return -1;
-	}
+}
 static Bool FootPrintNode_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -34609,10 +35353,10 @@
 static void BuildingPartNode_Del(GF_Node *node)
 {
 	M_BuildingPartNode *p = (M_BuildingPartNode *) node;
-	gf_node_unregister((GF_Node *) p->footprint, (GF_Node *) p);	
-	gf_node_unregister_children((GF_Node *) p, p->alternativeGeometry);	
-	gf_node_unregister_children((GF_Node *) p, p->roofs);	
-	gf_node_unregister_children((GF_Node *) p, p->facades);	
+	gf_node_unregister((GF_Node *) p->footprint, (GF_Node *) p);
+	gf_node_unregister_children((GF_Node *) p, p->alternativeGeometry);
+	gf_node_unregister_children((GF_Node *) p, p->roofs);
+	gf_node_unregister_children((GF_Node *) p, p->facades);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -34623,10 +35367,14 @@
 static u32 BuildingPartNode_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 8;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 8;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -34720,7 +35468,7 @@
 	if (!strcmp("roofs", name)) return 6;
 	if (!strcmp("facades", name)) return 7;
 	return -1;
-	}
+}
 static Bool BuildingPartNode_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -34766,10 +35514,14 @@
 static u32 RoofNode_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 12;
-	case GF_SG_FIELD_CODING_DEF: return 12;
-	case GF_SG_FIELD_CODING_OUT: return 12;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 12;
+	case GF_SG_FIELD_CODING_DEF:
+		return 12;
+	case GF_SG_FIELD_CODING_OUT:
+		return 12;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 12;
 	}
@@ -34887,7 +35639,7 @@
 	if (!strcmp("TextureYPosition", name)) return 10;
 	if (!strcmp("TextureRotation", name)) return 11;
 	return -1;
-	}
+}
 static Bool RoofNode_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -34933,7 +35685,7 @@
 	gf_sg_sfurl_del(p->FacadePrimitive);
 	gf_sg_mfint32_del(p->NbFacadeCellsByStorey);
 	gf_sg_mffloat_del(p->StoreyHeight);
-	gf_node_unregister_children((GF_Node *) p, p->FacadeCellsArray);	
+	gf_node_unregister_children((GF_Node *) p, p->FacadeCellsArray);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -34944,10 +35696,14 @@
 static u32 FacadeNode_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 13;
-	case GF_SG_FIELD_CODING_DEF: return 13;
-	case GF_SG_FIELD_CODING_OUT: return 13;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 13;
+	case GF_SG_FIELD_CODING_DEF:
+		return 13;
+	case GF_SG_FIELD_CODING_OUT:
+		return 13;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 13;
 	}
@@ -35073,7 +35829,7 @@
 	if (!strcmp("StoreyHeight", name)) return 11;
 	if (!strcmp("FacadeCellsArray", name)) return 12;
 	return -1;
-	}
+}
 static Bool FacadeNode_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -35117,7 +35873,7 @@
 static void Shadow_Del(GF_Node *node)
 {
 	M_Shadow *p = (M_Shadow *) node;
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -35128,10 +35884,14 @@
 static u32 Shadow_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 7;
-	case GF_SG_FIELD_CODING_DEF: return 5;
-	case GF_SG_FIELD_CODING_OUT: return 5;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 7;
+	case GF_SG_FIELD_CODING_DEF:
+		return 5;
+	case GF_SG_FIELD_CODING_OUT:
+		return 5;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 7;
 	}
@@ -35219,7 +35979,7 @@
 	if (!strcmp("receive", name)) return 5;
 	if (!strcmp("penumbra", name)) return 6;
 	return -1;
-	}
+}
 static Bool Shadow_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -35267,10 +36027,14 @@
 static u32 CacheTexture_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 0;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 0;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 0;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 8;
 	}
@@ -35354,7 +36118,7 @@
 	if (!strcmp("repeatS", name)) return 6;
 	if (!strcmp("repeatT", name)) return 7;
 	return -1;
-	}
+}
 static Bool CacheTexture_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -35400,10 +36164,14 @@
 static u32 EnvironmentTest_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 5;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 8;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 5;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 8;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 9;
 	}
@@ -35501,7 +36269,7 @@
 	if (!strcmp("valueSmaller", name)) return 7;
 	if (!strcmp("parameterValue", name)) return 8;
 	return -1;
-	}
+}
 static Bool EnvironmentTest_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -35534,13 +36302,13 @@
 static void KeyNavigator_Del(GF_Node *node)
 {
 	M_KeyNavigator *p = (M_KeyNavigator *) node;
-	gf_node_unregister((GF_Node *) p->sensor, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->left, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->right, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->up, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->down, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->select, (GF_Node *) p);	
-	gf_node_unregister((GF_Node *) p->quit, (GF_Node *) p);	
+	gf_node_unregister((GF_Node *) p->sensor, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->left, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->right, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->up, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->down, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->select, (GF_Node *) p);
+	gf_node_unregister((GF_Node *) p->quit, (GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -35551,10 +36319,14 @@
 static u32 KeyNavigator_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 9;
-	case GF_SG_FIELD_CODING_DEF: return 8;
-	case GF_SG_FIELD_CODING_OUT: return 9;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 9;
+	case GF_SG_FIELD_CODING_DEF:
+		return 8;
+	case GF_SG_FIELD_CODING_OUT:
+		return 9;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 10;
 	}
@@ -35666,7 +36438,7 @@
 	if (!strcmp("step", name)) return 8;
 	if (!strcmp("focusSet", name)) return 9;
 	return -1;
-	}
+}
 static Bool KeyNavigator_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -35698,7 +36470,7 @@
 {
 	M_SpacePartition *p = (M_SpacePartition *) node;
 	gf_sg_sfurl_del(p->SPStream);
-	gf_sg_vrml_parent_destroy((GF_Node *) p);	
+	gf_sg_vrml_parent_destroy((GF_Node *) p);
 	gf_node_free((GF_Node *) p);
 }
 
@@ -35709,10 +36481,14 @@
 static u32 SpacePartition_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 4;
-	case GF_SG_FIELD_CODING_DEF: return 2;
-	case GF_SG_FIELD_CODING_OUT: return 2;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 4;
+	case GF_SG_FIELD_CODING_DEF:
+		return 2;
+	case GF_SG_FIELD_CODING_OUT:
+		return 2;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 4;
 	}
@@ -35779,7 +36555,7 @@
 	if (!strcmp("children", name)) return 2;
 	if (!strcmp("SPStream", name)) return 3;
 	return -1;
-	}
+}
 static Bool SpacePartition_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -35821,10 +36597,14 @@
 static u32 Storage_get_field_count(GF_Node *node, u8 IndexMode)
 {
 	switch(IndexMode) {
-	case GF_SG_FIELD_CODING_IN: return 3;
-	case GF_SG_FIELD_CODING_DEF: return 4;
-	case GF_SG_FIELD_CODING_OUT: return 1;
-	case GF_SG_FIELD_CODING_DYN: return 0;
+	case GF_SG_FIELD_CODING_IN:
+		return 3;
+	case GF_SG_FIELD_CODING_DEF:
+		return 4;
+	case GF_SG_FIELD_CODING_OUT:
+		return 1;
+	case GF_SG_FIELD_CODING_DYN:
+		return 0;
 	default:
 		return 6;
 	}
@@ -35902,7 +36682,7 @@
 	if (!strcmp("name", name)) return 4;
 	if (!strcmp("storageList", name)) return 5;
 	return -1;
-	}
+}
 static Bool Storage_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -36729,395 +37509,590 @@
 {
 	switch (node->sgprivate->tag) {
 	case TAG_MPEG4_Anchor:
-		Anchor_Del(node); return;
+		Anchor_Del(node);
+		return;
 	case TAG_MPEG4_AnimationStream:
-		AnimationStream_Del(node); return;
+		AnimationStream_Del(node);
+		return;
 	case TAG_MPEG4_Appearance:
-		Appearance_Del(node); return;
+		Appearance_Del(node);
+		return;
 	case TAG_MPEG4_AudioBuffer:
-		AudioBuffer_Del(node); return;
+		AudioBuffer_Del(node);
+		return;
 	case TAG_MPEG4_AudioClip:
-		AudioClip_Del(node); return;
+		AudioClip_Del(node);
+		return;
 	case TAG_MPEG4_AudioDelay:
-		AudioDelay_Del(node); return;
+		AudioDelay_Del(node);
+		return;
 	case TAG_MPEG4_AudioFX:
-		AudioFX_Del(node); return;
+		AudioFX_Del(node);
+		return;
 	case TAG_MPEG4_AudioMix:
-		AudioMix_Del(node); return;
+		AudioMix_Del(node);
+		return;
 	case TAG_MPEG4_AudioSource:
-		AudioSource_Del(node); return;
+		AudioSource_Del(node);
+		return;
 	case TAG_MPEG4_AudioSwitch:
-		AudioSwitch_Del(node); return;
+		AudioSwitch_Del(node);
+		return;
 	case TAG_MPEG4_Background:
-		Background_Del(node); return;
+		Background_Del(node);
+		return;
 	case TAG_MPEG4_Background2D:
-		Background2D_Del(node); return;
+		Background2D_Del(node);
+		return;
 	case TAG_MPEG4_Billboard:
-		Billboard_Del(node); return;
+		Billboard_Del(node);
+		return;
 	case TAG_MPEG4_Bitmap:
-		Bitmap_Del(node); return;
+		Bitmap_Del(node);
+		return;
 	case TAG_MPEG4_Box:
-		Box_Del(node); return;
+		Box_Del(node);
+		return;
 	case TAG_MPEG4_Circle:
-		Circle_Del(node); return;
+		Circle_Del(node);
+		return;
 	case TAG_MPEG4_Collision:
-		Collision_Del(node); return;
+		Collision_Del(node);
+		return;
 	case TAG_MPEG4_Color:
-		Color_Del(node); return;
+		Color_Del(node);
+		return;
 	case TAG_MPEG4_ColorInterpolator:
-		ColorInterpolator_Del(node); return;
+		ColorInterpolator_Del(node);
+		return;
 	case TAG_MPEG4_CompositeTexture2D:
-		CompositeTexture2D_Del(node); return;
+		CompositeTexture2D_Del(node);
+		return;
 	case TAG_MPEG4_CompositeTexture3D:
-		CompositeTexture3D_Del(node); return;
+		CompositeTexture3D_Del(node);
+		return;
 	case TAG_MPEG4_Conditional:
-		Conditional_Del(node); return;
+		Conditional_Del(node);
+		return;
 	case TAG_MPEG4_Cone:
-		Cone_Del(node); return;
+		Cone_Del(node);
+		return;
 	case TAG_MPEG4_Coordinate:
-		Coordinate_Del(node); return;
+		Coordinate_Del(node);
+		return;
 	case TAG_MPEG4_Coordinate2D:
-		Coordinate2D_Del(node); return;
+		Coordinate2D_Del(node);
+		return;
 	case TAG_MPEG4_CoordinateInterpolator:
-		CoordinateInterpolator_Del(node); return;
+		CoordinateInterpolator_Del(node);
+		return;
 	case TAG_MPEG4_CoordinateInterpolator2D:
-		CoordinateInterpolator2D_Del(node); return;
+		CoordinateInterpolator2D_Del(node);
+		return;
 	case TAG_MPEG4_Curve2D:
-		Curve2D_Del(node); return;
+		Curve2D_Del(node);
+		return;
 	case TAG_MPEG4_Cylinder:
-		Cylinder_Del(node); return;
+		Cylinder_Del(node);
+		return;
 	case TAG_MPEG4_CylinderSensor:
-		CylinderSensor_Del(node); return;
+		CylinderSensor_Del(node);
+		return;
 	case TAG_MPEG4_DirectionalLight:
-		DirectionalLight_Del(node); return;
+		DirectionalLight_Del(node);
+		return;
 	case TAG_MPEG4_DiscSensor:
-		DiscSensor_Del(node); return;
+		DiscSensor_Del(node);
+		return;
 	case TAG_MPEG4_ElevationGrid:
-		ElevationGrid_Del(node); return;
+		ElevationGrid_Del(node);
+		return;
 	case TAG_MPEG4_Expression:
-		Expression_Del(node); return;
+		Expression_Del(node);
+		return;
 	case TAG_MPEG4_Extrusion:
-		Extrusion_Del(node); return;
+		Extrusion_Del(node);
+		return;
 	case TAG_MPEG4_Face:
-		Face_Del(node); return;
+		Face_Del(node);
+		return;
 	case TAG_MPEG4_FaceDefMesh:
-		FaceDefMesh_Del(node); return;
+		FaceDefMesh_Del(node);
+		return;
 	case TAG_MPEG4_FaceDefTables:
-		FaceDefTables_Del(node); return;
+		FaceDefTables_Del(node);
+		return;
 	case TAG_MPEG4_FaceDefTransform:
-		FaceDefTransform_Del(node); return;
+		FaceDefTransform_Del(node);
+		return;
 	case TAG_MPEG4_FAP:
-		FAP_Del(node); return;
+		FAP_Del(node);
+		return;
 	case TAG_MPEG4_FDP:
-		FDP_Del(node); return;
+		FDP_Del(node);
+		return;
 	case TAG_MPEG4_FIT:
-		FIT_Del(node); return;
+		FIT_Del(node);
+		return;
 	case TAG_MPEG4_Fog:
-		Fog_Del(node); return;
+		Fog_Del(node);
+		return;
 	case TAG_MPEG4_FontStyle:
-		FontStyle_Del(node); return;
+		FontStyle_Del(node);
+		return;
 	case TAG_MPEG4_Form:
-		Form_Del(node); return;
+		Form_Del(node);
+		return;
 	case TAG_MPEG4_Group:
-		Group_Del(node); return;
+		Group_Del(node);
+		return;
 	case TAG_MPEG4_ImageTexture:
-		ImageTexture_Del(node); return;
+		ImageTexture_Del(node);
+		return;
 	case TAG_MPEG4_IndexedFaceSet:
-		IndexedFaceSet_Del(node); return;
+		IndexedFaceSet_Del(node);
+		return;
 	case TAG_MPEG4_IndexedFaceSet2D:
-		IndexedFaceSet2D_Del(node); return;
+		IndexedFaceSet2D_Del(node);
+		return;
 	case TAG_MPEG4_IndexedLineSet:
-		IndexedLineSet_Del(node); return;
+		IndexedLineSet_Del(node);
+		return;
 	case TAG_MPEG4_IndexedLineSet2D:
-		IndexedLineSet2D_Del(node); return;
+		IndexedLineSet2D_Del(node);
+		return;
 	case TAG_MPEG4_Inline:
-		Inline_Del(node); return;
+		Inline_Del(node);
+		return;
 	case TAG_MPEG4_LOD:
-		LOD_Del(node); return;
+		LOD_Del(node);
+		return;
 	case TAG_MPEG4_Layer2D:
-		Layer2D_Del(node); return;
+		Layer2D_Del(node);
+		return;
 	case TAG_MPEG4_Layer3D:
-		Layer3D_Del(node); return;
+		Layer3D_Del(node);
+		return;
 	case TAG_MPEG4_Layout:
-		Layout_Del(node); return;
+		Layout_Del(node);
+		return;
 	case TAG_MPEG4_LineProperties:
-		LineProperties_Del(node); return;
+		LineProperties_Del(node);
+		return;
 	case TAG_MPEG4_ListeningPoint:
-		ListeningPoint_Del(node); return;
+		ListeningPoint_Del(node);
+		return;
 	case TAG_MPEG4_Material:
-		Material_Del(node); return;
+		Material_Del(node);
+		return;
 	case TAG_MPEG4_Material2D:
-		Material2D_Del(node); return;
+		Material2D_Del(node);
+		return;
 	case TAG_MPEG4_MovieTexture:
-		MovieTexture_Del(node); return;
+		MovieTexture_Del(node);
+		return;
 	case TAG_MPEG4_NavigationInfo:
-		NavigationInfo_Del(node); return;
+		NavigationInfo_Del(node);
+		return;
 	case TAG_MPEG4_Normal:
-		Normal_Del(node); return;
+		Normal_Del(node);
+		return;
 	case TAG_MPEG4_NormalInterpolator:
-		NormalInterpolator_Del(node); return;
+		NormalInterpolator_Del(node);
+		return;
 	case TAG_MPEG4_OrderedGroup:
-		OrderedGroup_Del(node); return;
+		OrderedGroup_Del(node);
+		return;
 	case TAG_MPEG4_OrientationInterpolator:
-		OrientationInterpolator_Del(node); return;
+		OrientationInterpolator_Del(node);
+		return;
 	case TAG_MPEG4_PixelTexture:
-		PixelTexture_Del(node); return;
+		PixelTexture_Del(node);
+		return;
 	case TAG_MPEG4_PlaneSensor:
-		PlaneSensor_Del(node); return;
+		PlaneSensor_Del(node);
+		return;
 	case TAG_MPEG4_PlaneSensor2D:
-		PlaneSensor2D_Del(node); return;
+		PlaneSensor2D_Del(node);
+		return;
 	case TAG_MPEG4_PointLight:
-		PointLight_Del(node); return;
+		PointLight_Del(node);
+		return;
 	case TAG_MPEG4_PointSet:
-		PointSet_Del(node); return;
+		PointSet_Del(node);
+		return;
 	case TAG_MPEG4_PointSet2D:
-		PointSet2D_Del(node); return;
+		PointSet2D_Del(node);
+		return;
 	case TAG_MPEG4_PositionInterpolator:
-		PositionInterpolator_Del(node); return;
+		PositionInterpolator_Del(node);
+		return;
 	case TAG_MPEG4_PositionInterpolator2D:
-		PositionInterpolator2D_Del(node); return;
+		PositionInterpolator2D_Del(node);
+		return;
 	case TAG_MPEG4_ProximitySensor2D:
-		ProximitySensor2D_Del(node); return;
+		ProximitySensor2D_Del(node);
+		return;
 	case TAG_MPEG4_ProximitySensor:
-		ProximitySensor_Del(node); return;
+		ProximitySensor_Del(node);
+		return;
 	case TAG_MPEG4_QuantizationParameter:
-		QuantizationParameter_Del(node); return;
+		QuantizationParameter_Del(node);
+		return;
 	case TAG_MPEG4_Rectangle:
-		Rectangle_Del(node); return;
+		Rectangle_Del(node);
+		return;
 	case TAG_MPEG4_ScalarInterpolator:
-		ScalarInterpolator_Del(node); return;
+		ScalarInterpolator_Del(node);
+		return;
 	case TAG_MPEG4_Script:
-		Script_Del(node); return;
+		Script_Del(node);
+		return;
 	case TAG_MPEG4_Shape:
-		Shape_Del(node); return;
+		Shape_Del(node);
+		return;
 	case TAG_MPEG4_Sound:
-		Sound_Del(node); return;
+		Sound_Del(node);
+		return;
 	case TAG_MPEG4_Sound2D:
-		Sound2D_Del(node); return;
+		Sound2D_Del(node);
+		return;
 	case TAG_MPEG4_Sphere:
-		Sphere_Del(node); return;
+		Sphere_Del(node);
+		return;
 	case TAG_MPEG4_SphereSensor:
-		SphereSensor_Del(node); return;
+		SphereSensor_Del(node);
+		return;
 	case TAG_MPEG4_SpotLight:
-		SpotLight_Del(node); return;
+		SpotLight_Del(node);
+		return;
 	case TAG_MPEG4_Switch:
-		Switch_Del(node); return;
+		Switch_Del(node);
+		return;
 	case TAG_MPEG4_TermCap:
-		TermCap_Del(node); return;
+		TermCap_Del(node);
+		return;
 	case TAG_MPEG4_Text:
-		Text_Del(node); return;
+		Text_Del(node);
+		return;
 	case TAG_MPEG4_TextureCoordinate:
-		TextureCoordinate_Del(node); return;
+		TextureCoordinate_Del(node);
+		return;
 	case TAG_MPEG4_TextureTransform:
-		TextureTransform_Del(node); return;
+		TextureTransform_Del(node);
+		return;
 	case TAG_MPEG4_TimeSensor:
-		TimeSensor_Del(node); return;
+		TimeSensor_Del(node);
+		return;
 	case TAG_MPEG4_TouchSensor:
-		TouchSensor_Del(node); return;
+		TouchSensor_Del(node);
+		return;
 	case TAG_MPEG4_Transform:
-		Transform_Del(node); return;
+		Transform_Del(node);
+		return;
 	case TAG_MPEG4_Transform2D:
-		Transform2D_Del(node); return;
+		Transform2D_Del(node);
+		return;
 	case TAG_MPEG4_Valuator:
-		Valuator_Del(node); return;
+		Valuator_Del(node);
+		return;
 	case TAG_MPEG4_Viewpoint:
-		Viewpoint_Del(node); return;
+		Viewpoint_Del(node);
+		return;
 	case TAG_MPEG4_VisibilitySensor:
-		VisibilitySensor_Del(node); return;
+		VisibilitySensor_Del(node);
+		return;
 	case TAG_MPEG4_Viseme:
-		Viseme_Del(node); return;
+		Viseme_Del(node);
+		return;
 	case TAG_MPEG4_WorldInfo:
-		WorldInfo_Del(node); return;
+		WorldInfo_Del(node);
+		return;
 	case TAG_MPEG4_AcousticMaterial:
-		AcousticMaterial_Del(node); return;
+		AcousticMaterial_Del(node);
+		return;
 	case TAG_MPEG4_AcousticScene:
-		AcousticScene_Del(node); return;
+		AcousticScene_Del(node);
+		return;
 	case TAG_MPEG4_ApplicationWindow:
-		ApplicationWindow_Del(node); return;
+		ApplicationWindow_Del(node);
+		return;
 	case TAG_MPEG4_BAP:
-		BAP_Del(node); return;
+		BAP_Del(node);
+		return;
 	case TAG_MPEG4_BDP:
-		BDP_Del(node); return;
+		BDP_Del(node);
+		return;
 	case TAG_MPEG4_Body:
-		Body_Del(node); return;
+		Body_Del(node);
+		return;
 	case TAG_MPEG4_BodyDefTable:
-		BodyDefTable_Del(node); return;
+		BodyDefTable_Del(node);
+		return;
 	case TAG_MPEG4_BodySegmentConnectionHint:
-		BodySegmentConnectionHint_Del(node); return;
+		BodySegmentConnectionHint_Del(node);
+		return;
 	case TAG_MPEG4_DirectiveSound:
-		DirectiveSound_Del(node); return;
+		DirectiveSound_Del(node);
+		return;
 	case TAG_MPEG4_Hierarchical3DMesh:
-		Hierarchical3DMesh_Del(node); return;
+		Hierarchical3DMesh_Del(node);
+		return;
 	case TAG_MPEG4_MaterialKey:
-		MaterialKey_Del(node); return;
+		MaterialKey_Del(node);
+		return;
 	case TAG_MPEG4_PerceptualParameters:
-		PerceptualParameters_Del(node); return;
+		PerceptualParameters_Del(node);
+		return;
 	case TAG_MPEG4_TemporalTransform:
-		TemporalTransform_Del(node); return;
+		TemporalTransform_Del(node);
+		return;
 	case TAG_MPEG4_TemporalGroup:
-		TemporalGroup_Del(node); return;
+		TemporalGroup_Del(node);
+		return;
 	case TAG_MPEG4_ServerCommand:
-		ServerCommand_Del(node); return;
+		ServerCommand_Del(node);
+		return;
 	case TAG_MPEG4_InputSensor:
-		InputSensor_Del(node); return;
+		InputSensor_Del(node);
+		return;
 	case TAG_MPEG4_MatteTexture:
-		MatteTexture_Del(node); return;
+		MatteTexture_Del(node);
+		return;
 	case TAG_MPEG4_MediaBuffer:
-		MediaBuffer_Del(node); return;
+		MediaBuffer_Del(node);
+		return;
 	case TAG_MPEG4_MediaControl:
-		MediaControl_Del(node); return;
+		MediaControl_Del(node);
+		return;
 	case TAG_MPEG4_MediaSensor:
-		MediaSensor_Del(node); return;
+		MediaSensor_Del(node);
+		return;
 	case TAG_MPEG4_BitWrapper:
-		BitWrapper_Del(node); return;
+		BitWrapper_Del(node);
+		return;
 	case TAG_MPEG4_CoordinateInterpolator4D:
-		CoordinateInterpolator4D_Del(node); return;
+		CoordinateInterpolator4D_Del(node);
+		return;
 	case TAG_MPEG4_DepthImage:
-		DepthImage_Del(node); return;
+		DepthImage_Del(node);
+		return;
 	case TAG_MPEG4_FFD:
-		FFD_Del(node); return;
+		FFD_Del(node);
+		return;
 	case TAG_MPEG4_Implicit:
-		Implicit_Del(node); return;
+		Implicit_Del(node);
+		return;
 	case TAG_MPEG4_XXLFM_Appearance:
-		XXLFM_Appearance_Del(node); return;
+		XXLFM_Appearance_Del(node);
+		return;
 	case TAG_MPEG4_XXLFM_BlendList:
-		XXLFM_BlendList_Del(node); return;
+		XXLFM_BlendList_Del(node);
+		return;
 	case TAG_MPEG4_XXLFM_FrameList:
-		XXLFM_FrameList_Del(node); return;
+		XXLFM_FrameList_Del(node);
+		return;
 	case TAG_MPEG4_XXLFM_LightMap:
-		XXLFM_LightMap_Del(node); return;
+		XXLFM_LightMap_Del(node);
+		return;
 	case TAG_MPEG4_XXLFM_SurfaceMapList:
-		XXLFM_SurfaceMapList_Del(node); return;
+		XXLFM_SurfaceMapList_Del(node);
+		return;
 	case TAG_MPEG4_XXLFM_ViewMapList:
-		XXLFM_ViewMapList_Del(node); return;
+		XXLFM_ViewMapList_Del(node);
+		return;
 	case TAG_MPEG4_MeshGrid:
-		MeshGrid_Del(node); return;
+		MeshGrid_Del(node);
+		return;
 	case TAG_MPEG4_NonLinearDeformer:
-		NonLinearDeformer_Del(node); return;
+		NonLinearDeformer_Del(node);
+		return;
 	case TAG_MPEG4_NurbsCurve:
-		NurbsCurve_Del(node); return;
+		NurbsCurve_Del(node);
+		return;
 	case TAG_MPEG4_NurbsCurve2D:
-		NurbsCurve2D_Del(node); return;
+		NurbsCurve2D_Del(node);
+		return;
 	case TAG_MPEG4_NurbsSurface:
-		NurbsSurface_Del(node); return;
+		NurbsSurface_Del(node);
+		return;
 	case TAG_MPEG4_OctreeImage:
-		OctreeImage_Del(node); return;
+		OctreeImage_Del(node);
+		return;
 	case TAG_MPEG4_XXParticles:
-		XXParticles_Del(node); return;
+		XXParticles_Del(node);
+		return;
 	case TAG_MPEG4_XXParticleInitBox:
-		XXParticleInitBox_Del(node); return;
+		XXParticleInitBox_Del(node);
+		return;
 	case TAG_MPEG4_XXPlanarObstacle:
-		XXPlanarObstacle_Del(node); return;
+		XXPlanarObstacle_Del(node);
+		return;
 	case TAG_MPEG4_XXPointAttractor:
-		XXPointAttractor_Del(node); return;
+		XXPointAttractor_Del(node);
+		return;
 	case TAG_MPEG4_PointTexture:
-		PointTexture_Del(node); return;
+		PointTexture_Del(node);
+		return;
 	case TAG_MPEG4_PositionAnimator:
-		PositionAnimator_Del(node); return;
+		PositionAnimator_Del(node);
+		return;
 	case TAG_MPEG4_PositionAnimator2D:
-		PositionAnimator2D_Del(node); return;
+		PositionAnimator2D_Del(node);
+		return;
 	case TAG_MPEG4_PositionInterpolator4D:
-		PositionInterpolator4D_Del(node); return;
+		PositionInterpolator4D_Del(node);
+		return;
 	case TAG_MPEG4_ProceduralTexture:
-		ProceduralTexture_Del(node); return;
+		ProceduralTexture_Del(node);
+		return;
 	case TAG_MPEG4_Quadric:
-		Quadric_Del(node); return;
+		Quadric_Del(node);
+		return;
 	case TAG_MPEG4_SBBone:
-		SBBone_Del(node); return;
+		SBBone_Del(node);
+		return;
 	case TAG_MPEG4_SBMuscle:
-		SBMuscle_Del(node); return;
+		SBMuscle_Del(node);
+		return;
 	case TAG_MPEG4_SBSegment:
-		SBSegment_Del(node); return;
+		SBSegment_Del(node);
+		return;
 	case TAG_MPEG4_SBSite:
-		SBSite_Del(node); return;
+		SBSite_Del(node);
+		return;
 	case TAG_MPEG4_SBSkinnedModel:
-		SBSkinnedModel_Del(node); return;
+		SBSkinnedModel_Del(node);
+		return;
 	case TAG_MPEG4_SBVCAnimation:
-		SBVCAnimation_Del(node); return;
+		SBVCAnimation_Del(node);
+		return;
 	case TAG_MPEG4_ScalarAnimator:
-		ScalarAnimator_Del(node); return;
+		ScalarAnimator_Del(node);
+		return;
 	case TAG_MPEG4_SimpleTexture:
-		SimpleTexture_Del(node); return;
+		SimpleTexture_Del(node);
+		return;
 	case TAG_MPEG4_SolidRep:
-		SolidRep_Del(node); return;
+		SolidRep_Del(node);
+		return;
 	case TAG_MPEG4_SubdivisionSurface:
-		SubdivisionSurface_Del(node); return;
+		SubdivisionSurface_Del(node);
+		return;
 	case TAG_MPEG4_SubdivSurfaceSector:
-		SubdivSurfaceSector_Del(node); return;
+		SubdivSurfaceSector_Del(node);
+		return;
 	case TAG_MPEG4_WaveletSubdivisionSurface:
-		WaveletSubdivisionSurface_Del(node); return;
+		WaveletSubdivisionSurface_Del(node);
+		return;
 	case TAG_MPEG4_Clipper2D:
-		Clipper2D_Del(node); return;
+		Clipper2D_Del(node);
+		return;
 	case TAG_MPEG4_ColorTransform:
-		ColorTransform_Del(node); return;
+		ColorTransform_Del(node);
+		return;
 	case TAG_MPEG4_Ellipse:
-		Ellipse_Del(node); return;
+		Ellipse_Del(node);
+		return;
 	case TAG_MPEG4_LinearGradient:
-		LinearGradient_Del(node); return;
+		LinearGradient_Del(node);
+		return;
 	case TAG_MPEG4_PathLayout:
-		PathLayout_Del(node); return;
+		PathLayout_Del(node);
+		return;
 	case TAG_MPEG4_RadialGradient:
-		RadialGradient_Del(node); return;
+		RadialGradient_Del(node);
+		return;
 	case TAG_MPEG4_SynthesizedTexture:
-		SynthesizedTexture_Del(node); return;
+		SynthesizedTexture_Del(node);
+		return;
 	case TAG_MPEG4_TransformMatrix2D:
-		TransformMatrix2D_Del(node); return;
+		TransformMatrix2D_Del(node);
+		return;
 	case TAG_MPEG4_Viewport:
-		Viewport_Del(node); return;
+		Viewport_Del(node);
+		return;
 	case TAG_MPEG4_XCurve2D:
-		XCurve2D_Del(node); return;
+		XCurve2D_Del(node);
+		return;
 	case TAG_MPEG4_XFontStyle:
-		XFontStyle_Del(node); return;
+		XFontStyle_Del(node);
+		return;
 	case TAG_MPEG4_XLineProperties:
-		XLineProperties_Del(node); return;
+		XLineProperties_Del(node);
+		return;
 	case TAG_MPEG4_AdvancedAudioBuffer:
-		AdvancedAudioBuffer_Del(node); return;
+		AdvancedAudioBuffer_Del(node);
+		return;
 	case TAG_MPEG4_AudioChannelConfig:
-		AudioChannelConfig_Del(node); return;
+		AudioChannelConfig_Del(node);
+		return;
 	case TAG_MPEG4_DepthImageV2:
-		DepthImageV2_Del(node); return;
+		DepthImageV2_Del(node);
+		return;
 	case TAG_MPEG4_MorphShape:
-		MorphShape_Del(node); return;
+		MorphShape_Del(node);
+		return;
 	case TAG_MPEG4_MultiTexture:
-		MultiTexture_Del(node); return;
+		MultiTexture_Del(node);
+		return;
 	case TAG_MPEG4_PointTextureV2:
-		PointTextureV2_Del(node); return;
+		PointTextureV2_Del(node);
+		return;
 	case TAG_MPEG4_SBVCAnimationV2:
-		SBVCAnimationV2_Del(node); return;
+		SBVCAnimationV2_Del(node);
+		return;
 	case TAG_MPEG4_SimpleTextureV2:
-		SimpleTextureV2_Del(node); return;
+		SimpleTextureV2_Del(node);
+		return;
 	case TAG_MPEG4_SurroundingSound:
-		SurroundingSound_Del(node); return;
+		SurroundingSound_Del(node);
+		return;
 	case TAG_MPEG4_Transform3DAudio:
-		Transform3DAudio_Del(node); return;
+		Transform3DAudio_Del(node);
+		return;
 	case TAG_MPEG4_WideSound:
-		WideSound_Del(node); return;
+		WideSound_Del(node);
+		return;
 	case TAG_MPEG4_ScoreShape:
-		ScoreShape_Del(node); return;
+		ScoreShape_Del(node);
+		return;
 	case TAG_MPEG4_MusicScore:
-		MusicScore_Del(node); return;
+		MusicScore_Del(node);
+		return;
 	case TAG_MPEG4_FootPrintSetNode:
-		FootPrintSetNode_Del(node); return;
+		FootPrintSetNode_Del(node);
+		return;
 	case TAG_MPEG4_FootPrintNode:
-		FootPrintNode_Del(node); return;
+		FootPrintNode_Del(node);
+		return;
 	case TAG_MPEG4_BuildingPartNode:
-		BuildingPartNode_Del(node); return;
+		BuildingPartNode_Del(node);
+		return;
 	case TAG_MPEG4_RoofNode:
-		RoofNode_Del(node); return;
+		RoofNode_Del(node);
+		return;
 	case TAG_MPEG4_FacadeNode:
-		FacadeNode_Del(node); return;
+		FacadeNode_Del(node);
+		return;
 	case TAG_MPEG4_Shadow:
-		Shadow_Del(node); return;
+		Shadow_Del(node);
+		return;
 	case TAG_MPEG4_CacheTexture:
-		CacheTexture_Del(node); return;
+		CacheTexture_Del(node);
+		return;
 	case TAG_MPEG4_EnvironmentTest:
-		EnvironmentTest_Del(node); return;
+		EnvironmentTest_Del(node);
+		return;
 	case TAG_MPEG4_KeyNavigator:
-		KeyNavigator_Del(node); return;
+		KeyNavigator_Del(node);
+		return;
 	case TAG_MPEG4_SpacePartition:
-		SpacePartition_Del(node); return;
+		SpacePartition_Del(node);
+		return;
 	case TAG_MPEG4_Storage:
-		Storage_Del(node); return;
+		Storage_Del(node);
+		return;
 	default:
 		return;
 	}
@@ -37126,201 +38101,396 @@
 u32 gf_sg_mpeg4_node_get_field_count(GF_Node *node, u8 code_mode)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_MPEG4_Anchor:return Anchor_get_field_count(node, code_mode);
-	case TAG_MPEG4_AnimationStream:return AnimationStream_get_field_count(node, code_mode);
-	case TAG_MPEG4_Appearance:return Appearance_get_field_count(node, code_mode);
-	case TAG_MPEG4_AudioBuffer:return AudioBuffer_get_field_count(node, code_mode);
-	case TAG_MPEG4_AudioClip:return AudioClip_get_field_count(node, code_mode);
-	case TAG_MPEG4_AudioDelay:return AudioDelay_get_field_count(node, code_mode);
-	case TAG_MPEG4_AudioFX:return AudioFX_get_field_count(node, code_mode);
-	case TAG_MPEG4_AudioMix:return AudioMix_get_field_count(node, code_mode);
-	case TAG_MPEG4_AudioSource:return AudioSource_get_field_count(node, code_mode);
-	case TAG_MPEG4_AudioSwitch:return AudioSwitch_get_field_count(node, code_mode);
-	case TAG_MPEG4_Background:return Background_get_field_count(node, code_mode);
-	case TAG_MPEG4_Background2D:return Background2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Billboard:return Billboard_get_field_count(node, code_mode);
-	case TAG_MPEG4_Bitmap:return Bitmap_get_field_count(node, code_mode);
-	case TAG_MPEG4_Box:return Box_get_field_count(node, code_mode);
-	case TAG_MPEG4_Circle:return Circle_get_field_count(node, code_mode);
-	case TAG_MPEG4_Collision:return Collision_get_field_count(node, code_mode);
-	case TAG_MPEG4_Color:return Color_get_field_count(node, code_mode);
-	case TAG_MPEG4_ColorInterpolator:return ColorInterpolator_get_field_count(node, code_mode);
-	case TAG_MPEG4_CompositeTexture2D:return CompositeTexture2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_CompositeTexture3D:return CompositeTexture3D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Conditional:return Conditional_get_field_count(node, code_mode);
-	case TAG_MPEG4_Cone:return Cone_get_field_count(node, code_mode);
-	case TAG_MPEG4_Coordinate:return Coordinate_get_field_count(node, code_mode);
-	case TAG_MPEG4_Coordinate2D:return Coordinate2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_CoordinateInterpolator:return CoordinateInterpolator_get_field_count(node, code_mode);
-	case TAG_MPEG4_CoordinateInterpolator2D:return CoordinateInterpolator2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Curve2D:return Curve2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Cylinder:return Cylinder_get_field_count(node, code_mode);
-	case TAG_MPEG4_CylinderSensor:return CylinderSensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_DirectionalLight:return DirectionalLight_get_field_count(node, code_mode);
-	case TAG_MPEG4_DiscSensor:return DiscSensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_ElevationGrid:return ElevationGrid_get_field_count(node, code_mode);
-	case TAG_MPEG4_Expression:return Expression_get_field_count(node, code_mode);
-	case TAG_MPEG4_Extrusion:return Extrusion_get_field_count(node, code_mode);
-	case TAG_MPEG4_Face:return Face_get_field_count(node, code_mode);
-	case TAG_MPEG4_FaceDefMesh:return FaceDefMesh_get_field_count(node, code_mode);
-	case TAG_MPEG4_FaceDefTables:return FaceDefTables_get_field_count(node, code_mode);
-	case TAG_MPEG4_FaceDefTransform:return FaceDefTransform_get_field_count(node, code_mode);
-	case TAG_MPEG4_FAP:return FAP_get_field_count(node, code_mode);
-	case TAG_MPEG4_FDP:return FDP_get_field_count(node, code_mode);
-	case TAG_MPEG4_FIT:return FIT_get_field_count(node, code_mode);
-	case TAG_MPEG4_Fog:return Fog_get_field_count(node, code_mode);
-	case TAG_MPEG4_FontStyle:return FontStyle_get_field_count(node, code_mode);
-	case TAG_MPEG4_Form:return Form_get_field_count(node, code_mode);
-	case TAG_MPEG4_Group:return Group_get_field_count(node, code_mode);
-	case TAG_MPEG4_ImageTexture:return ImageTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_IndexedFaceSet:return IndexedFaceSet_get_field_count(node, code_mode);
-	case TAG_MPEG4_IndexedFaceSet2D:return IndexedFaceSet2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_IndexedLineSet:return IndexedLineSet_get_field_count(node, code_mode);
-	case TAG_MPEG4_IndexedLineSet2D:return IndexedLineSet2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Inline:return Inline_get_field_count(node, code_mode);
-	case TAG_MPEG4_LOD:return LOD_get_field_count(node, code_mode);
-	case TAG_MPEG4_Layer2D:return Layer2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Layer3D:return Layer3D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Layout:return Layout_get_field_count(node, code_mode);
-	case TAG_MPEG4_LineProperties:return LineProperties_get_field_count(node, code_mode);
-	case TAG_MPEG4_ListeningPoint:return ListeningPoint_get_field_count(node, code_mode);
-	case TAG_MPEG4_Material:return Material_get_field_count(node, code_mode);
-	case TAG_MPEG4_Material2D:return Material2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_MovieTexture:return MovieTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_NavigationInfo:return NavigationInfo_get_field_count(node, code_mode);
-	case TAG_MPEG4_Normal:return Normal_get_field_count(node, code_mode);
-	case TAG_MPEG4_NormalInterpolator:return NormalInterpolator_get_field_count(node, code_mode);
-	case TAG_MPEG4_OrderedGroup:return OrderedGroup_get_field_count(node, code_mode);
-	case TAG_MPEG4_OrientationInterpolator:return OrientationInterpolator_get_field_count(node, code_mode);
-	case TAG_MPEG4_PixelTexture:return PixelTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_PlaneSensor:return PlaneSensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_PlaneSensor2D:return PlaneSensor2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_PointLight:return PointLight_get_field_count(node, code_mode);
-	case TAG_MPEG4_PointSet:return PointSet_get_field_count(node, code_mode);
-	case TAG_MPEG4_PointSet2D:return PointSet2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_PositionInterpolator:return PositionInterpolator_get_field_count(node, code_mode);
-	case TAG_MPEG4_PositionInterpolator2D:return PositionInterpolator2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_ProximitySensor2D:return ProximitySensor2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_ProximitySensor:return ProximitySensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_QuantizationParameter:return QuantizationParameter_get_field_count(node, code_mode);
-	case TAG_MPEG4_Rectangle:return Rectangle_get_field_count(node, code_mode);
-	case TAG_MPEG4_ScalarInterpolator:return ScalarInterpolator_get_field_count(node, code_mode);
-	case TAG_MPEG4_Script:return Script_get_field_count(node, code_mode);
-	case TAG_MPEG4_Shape:return Shape_get_field_count(node, code_mode);
-	case TAG_MPEG4_Sound:return Sound_get_field_count(node, code_mode);
-	case TAG_MPEG4_Sound2D:return Sound2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Sphere:return Sphere_get_field_count(node, code_mode);
-	case TAG_MPEG4_SphereSensor:return SphereSensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_SpotLight:return SpotLight_get_field_count(node, code_mode);
-	case TAG_MPEG4_Switch:return Switch_get_field_count(node, code_mode);
-	case TAG_MPEG4_TermCap:return TermCap_get_field_count(node, code_mode);
-	case TAG_MPEG4_Text:return Text_get_field_count(node, code_mode);
-	case TAG_MPEG4_TextureCoordinate:return TextureCoordinate_get_field_count(node, code_mode);
-	case TAG_MPEG4_TextureTransform:return TextureTransform_get_field_count(node, code_mode);
-	case TAG_MPEG4_TimeSensor:return TimeSensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_TouchSensor:return TouchSensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_Transform:return Transform_get_field_count(node, code_mode);
-	case TAG_MPEG4_Transform2D:return Transform2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Valuator:return Valuator_get_field_count(node, code_mode);
-	case TAG_MPEG4_Viewpoint:return Viewpoint_get_field_count(node, code_mode);
-	case TAG_MPEG4_VisibilitySensor:return VisibilitySensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_Viseme:return Viseme_get_field_count(node, code_mode);
-	case TAG_MPEG4_WorldInfo:return WorldInfo_get_field_count(node, code_mode);
-	case TAG_MPEG4_AcousticMaterial:return AcousticMaterial_get_field_count(node, code_mode);
-	case TAG_MPEG4_AcousticScene:return AcousticScene_get_field_count(node, code_mode);
-	case TAG_MPEG4_ApplicationWindow:return ApplicationWindow_get_field_count(node, code_mode);
-	case TAG_MPEG4_BAP:return BAP_get_field_count(node, code_mode);
-	case TAG_MPEG4_BDP:return BDP_get_field_count(node, code_mode);
-	case TAG_MPEG4_Body:return Body_get_field_count(node, code_mode);
-	case TAG_MPEG4_BodyDefTable:return BodyDefTable_get_field_count(node, code_mode);
-	case TAG_MPEG4_BodySegmentConnectionHint:return BodySegmentConnectionHint_get_field_count(node, code_mode);
-	case TAG_MPEG4_DirectiveSound:return DirectiveSound_get_field_count(node, code_mode);
-	case TAG_MPEG4_Hierarchical3DMesh:return Hierarchical3DMesh_get_field_count(node, code_mode);
-	case TAG_MPEG4_MaterialKey:return MaterialKey_get_field_count(node, code_mode);
-	case TAG_MPEG4_PerceptualParameters:return PerceptualParameters_get_field_count(node, code_mode);
-	case TAG_MPEG4_TemporalTransform:return TemporalTransform_get_field_count(node, code_mode);
-	case TAG_MPEG4_TemporalGroup:return TemporalGroup_get_field_count(node, code_mode);
-	case TAG_MPEG4_ServerCommand:return ServerCommand_get_field_count(node, code_mode);
-	case TAG_MPEG4_InputSensor:return InputSensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_MatteTexture:return MatteTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_MediaBuffer:return MediaBuffer_get_field_count(node, code_mode);
-	case TAG_MPEG4_MediaControl:return MediaControl_get_field_count(node, code_mode);
-	case TAG_MPEG4_MediaSensor:return MediaSensor_get_field_count(node, code_mode);
-	case TAG_MPEG4_BitWrapper:return BitWrapper_get_field_count(node, code_mode);
-	case TAG_MPEG4_CoordinateInterpolator4D:return CoordinateInterpolator4D_get_field_count(node, code_mode);
-	case TAG_MPEG4_DepthImage:return DepthImage_get_field_count(node, code_mode);
-	case TAG_MPEG4_FFD:return FFD_get_field_count(node, code_mode);
-	case TAG_MPEG4_Implicit:return Implicit_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXLFM_Appearance:return XXLFM_Appearance_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXLFM_BlendList:return XXLFM_BlendList_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXLFM_FrameList:return XXLFM_FrameList_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXLFM_LightMap:return XXLFM_LightMap_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXLFM_SurfaceMapList:return XXLFM_SurfaceMapList_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXLFM_ViewMapList:return XXLFM_ViewMapList_get_field_count(node, code_mode);
-	case TAG_MPEG4_MeshGrid:return MeshGrid_get_field_count(node, code_mode);
-	case TAG_MPEG4_NonLinearDeformer:return NonLinearDeformer_get_field_count(node, code_mode);
-	case TAG_MPEG4_NurbsCurve:return NurbsCurve_get_field_count(node, code_mode);
-	case TAG_MPEG4_NurbsCurve2D:return NurbsCurve2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_NurbsSurface:return NurbsSurface_get_field_count(node, code_mode);
-	case TAG_MPEG4_OctreeImage:return OctreeImage_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXParticles:return XXParticles_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXParticleInitBox:return XXParticleInitBox_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXPlanarObstacle:return XXPlanarObstacle_get_field_count(node, code_mode);
-	case TAG_MPEG4_XXPointAttractor:return XXPointAttractor_get_field_count(node, code_mode);
-	case TAG_MPEG4_PointTexture:return PointTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_PositionAnimator:return PositionAnimator_get_field_count(node, code_mode);
-	case TAG_MPEG4_PositionAnimator2D:return PositionAnimator2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_PositionInterpolator4D:return PositionInterpolator4D_get_field_count(node, code_mode);
-	case TAG_MPEG4_ProceduralTexture:return ProceduralTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_Quadric:return Quadric_get_field_count(node, code_mode);
-	case TAG_MPEG4_SBBone:return SBBone_get_field_count(node, code_mode);
-	case TAG_MPEG4_SBMuscle:return SBMuscle_get_field_count(node, code_mode);
-	case TAG_MPEG4_SBSegment:return SBSegment_get_field_count(node, code_mode);
-	case TAG_MPEG4_SBSite:return SBSite_get_field_count(node, code_mode);
-	case TAG_MPEG4_SBSkinnedModel:return SBSkinnedModel_get_field_count(node, code_mode);
-	case TAG_MPEG4_SBVCAnimation:return SBVCAnimation_get_field_count(node, code_mode);
-	case TAG_MPEG4_ScalarAnimator:return ScalarAnimator_get_field_count(node, code_mode);
-	case TAG_MPEG4_SimpleTexture:return SimpleTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_SolidRep:return SolidRep_get_field_count(node, code_mode);
-	case TAG_MPEG4_SubdivisionSurface:return SubdivisionSurface_get_field_count(node, code_mode);
-	case TAG_MPEG4_SubdivSurfaceSector:return SubdivSurfaceSector_get_field_count(node, code_mode);
-	case TAG_MPEG4_WaveletSubdivisionSurface:return WaveletSubdivisionSurface_get_field_count(node, code_mode);
-	case TAG_MPEG4_Clipper2D:return Clipper2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_ColorTransform:return ColorTransform_get_field_count(node, code_mode);
-	case TAG_MPEG4_Ellipse:return Ellipse_get_field_count(node, code_mode);
-	case TAG_MPEG4_LinearGradient:return LinearGradient_get_field_count(node, code_mode);
-	case TAG_MPEG4_PathLayout:return PathLayout_get_field_count(node, code_mode);
-	case TAG_MPEG4_RadialGradient:return RadialGradient_get_field_count(node, code_mode);
-	case TAG_MPEG4_SynthesizedTexture:return SynthesizedTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_TransformMatrix2D:return TransformMatrix2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_Viewport:return Viewport_get_field_count(node, code_mode);
-	case TAG_MPEG4_XCurve2D:return XCurve2D_get_field_count(node, code_mode);
-	case TAG_MPEG4_XFontStyle:return XFontStyle_get_field_count(node, code_mode);
-	case TAG_MPEG4_XLineProperties:return XLineProperties_get_field_count(node, code_mode);
-	case TAG_MPEG4_AdvancedAudioBuffer:return AdvancedAudioBuffer_get_field_count(node, code_mode);
-	case TAG_MPEG4_AudioChannelConfig:return AudioChannelConfig_get_field_count(node, code_mode);
-	case TAG_MPEG4_DepthImageV2:return DepthImageV2_get_field_count(node, code_mode);
-	case TAG_MPEG4_MorphShape:return MorphShape_get_field_count(node, code_mode);
-	case TAG_MPEG4_MultiTexture:return MultiTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_PointTextureV2:return PointTextureV2_get_field_count(node, code_mode);
-	case TAG_MPEG4_SBVCAnimationV2:return SBVCAnimationV2_get_field_count(node, code_mode);
-	case TAG_MPEG4_SimpleTextureV2:return SimpleTextureV2_get_field_count(node, code_mode);
-	case TAG_MPEG4_SurroundingSound:return SurroundingSound_get_field_count(node, code_mode);
-	case TAG_MPEG4_Transform3DAudio:return Transform3DAudio_get_field_count(node, code_mode);
-	case TAG_MPEG4_WideSound:return WideSound_get_field_count(node, code_mode);
-	case TAG_MPEG4_ScoreShape:return ScoreShape_get_field_count(node, code_mode);
-	case TAG_MPEG4_MusicScore:return MusicScore_get_field_count(node, code_mode);
-	case TAG_MPEG4_FootPrintSetNode:return FootPrintSetNode_get_field_count(node, code_mode);
-	case TAG_MPEG4_FootPrintNode:return FootPrintNode_get_field_count(node, code_mode);
-	case TAG_MPEG4_BuildingPartNode:return BuildingPartNode_get_field_count(node, code_mode);
-	case TAG_MPEG4_RoofNode:return RoofNode_get_field_count(node, code_mode);
-	case TAG_MPEG4_FacadeNode:return FacadeNode_get_field_count(node, code_mode);
-	case TAG_MPEG4_Shadow:return Shadow_get_field_count(node, code_mode);
-	case TAG_MPEG4_CacheTexture:return CacheTexture_get_field_count(node, code_mode);
-	case TAG_MPEG4_EnvironmentTest:return EnvironmentTest_get_field_count(node, code_mode);
-	case TAG_MPEG4_KeyNavigator:return KeyNavigator_get_field_count(node, code_mode);
-	case TAG_MPEG4_SpacePartition:return SpacePartition_get_field_count(node, code_mode);
-	case TAG_MPEG4_Storage:return Storage_get_field_count(node, code_mode);
+	case TAG_MPEG4_Anchor:
+		return Anchor_get_field_count(node, code_mode);
+	case TAG_MPEG4_AnimationStream:
+		return AnimationStream_get_field_count(node, code_mode);
+	case TAG_MPEG4_Appearance:
+		return Appearance_get_field_count(node, code_mode);
+	case TAG_MPEG4_AudioBuffer:
+		return AudioBuffer_get_field_count(node, code_mode);
+	case TAG_MPEG4_AudioClip:
+		return AudioClip_get_field_count(node, code_mode);
+	case TAG_MPEG4_AudioDelay:
+		return AudioDelay_get_field_count(node, code_mode);
+	case TAG_MPEG4_AudioFX:
+		return AudioFX_get_field_count(node, code_mode);
+	case TAG_MPEG4_AudioMix:
+		return AudioMix_get_field_count(node, code_mode);
+	case TAG_MPEG4_AudioSource:
+		return AudioSource_get_field_count(node, code_mode);
+	case TAG_MPEG4_AudioSwitch:
+		return AudioSwitch_get_field_count(node, code_mode);
+	case TAG_MPEG4_Background:
+		return Background_get_field_count(node, code_mode);
+	case TAG_MPEG4_Background2D:
+		return Background2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Billboard:
+		return Billboard_get_field_count(node, code_mode);
+	case TAG_MPEG4_Bitmap:
+		return Bitmap_get_field_count(node, code_mode);
+	case TAG_MPEG4_Box:
+		return Box_get_field_count(node, code_mode);
+	case TAG_MPEG4_Circle:
+		return Circle_get_field_count(node, code_mode);
+	case TAG_MPEG4_Collision:
+		return Collision_get_field_count(node, code_mode);
+	case TAG_MPEG4_Color:
+		return Color_get_field_count(node, code_mode);
+	case TAG_MPEG4_ColorInterpolator:
+		return ColorInterpolator_get_field_count(node, code_mode);
+	case TAG_MPEG4_CompositeTexture2D:
+		return CompositeTexture2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_CompositeTexture3D:
+		return CompositeTexture3D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Conditional:
+		return Conditional_get_field_count(node, code_mode);
+	case TAG_MPEG4_Cone:
+		return Cone_get_field_count(node, code_mode);
+	case TAG_MPEG4_Coordinate:
+		return Coordinate_get_field_count(node, code_mode);
+	case TAG_MPEG4_Coordinate2D:
+		return Coordinate2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_CoordinateInterpolator:
+		return CoordinateInterpolator_get_field_count(node, code_mode);
+	case TAG_MPEG4_CoordinateInterpolator2D:
+		return CoordinateInterpolator2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Curve2D:
+		return Curve2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Cylinder:
+		return Cylinder_get_field_count(node, code_mode);
+	case TAG_MPEG4_CylinderSensor:
+		return CylinderSensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_DirectionalLight:
+		return DirectionalLight_get_field_count(node, code_mode);
+	case TAG_MPEG4_DiscSensor:
+		return DiscSensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_ElevationGrid:
+		return ElevationGrid_get_field_count(node, code_mode);
+	case TAG_MPEG4_Expression:
+		return Expression_get_field_count(node, code_mode);
+	case TAG_MPEG4_Extrusion:
+		return Extrusion_get_field_count(node, code_mode);
+	case TAG_MPEG4_Face:
+		return Face_get_field_count(node, code_mode);
+	case TAG_MPEG4_FaceDefMesh:
+		return FaceDefMesh_get_field_count(node, code_mode);
+	case TAG_MPEG4_FaceDefTables:
+		return FaceDefTables_get_field_count(node, code_mode);
+	case TAG_MPEG4_FaceDefTransform:
+		return FaceDefTransform_get_field_count(node, code_mode);
+	case TAG_MPEG4_FAP:
+		return FAP_get_field_count(node, code_mode);
+	case TAG_MPEG4_FDP:
+		return FDP_get_field_count(node, code_mode);
+	case TAG_MPEG4_FIT:
+		return FIT_get_field_count(node, code_mode);
+	case TAG_MPEG4_Fog:
+		return Fog_get_field_count(node, code_mode);
+	case TAG_MPEG4_FontStyle:
+		return FontStyle_get_field_count(node, code_mode);
+	case TAG_MPEG4_Form:
+		return Form_get_field_count(node, code_mode);
+	case TAG_MPEG4_Group:
+		return Group_get_field_count(node, code_mode);
+	case TAG_MPEG4_ImageTexture:
+		return ImageTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_IndexedFaceSet:
+		return IndexedFaceSet_get_field_count(node, code_mode);
+	case TAG_MPEG4_IndexedFaceSet2D:
+		return IndexedFaceSet2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_IndexedLineSet:
+		return IndexedLineSet_get_field_count(node, code_mode);
+	case TAG_MPEG4_IndexedLineSet2D:
+		return IndexedLineSet2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Inline:
+		return Inline_get_field_count(node, code_mode);
+	case TAG_MPEG4_LOD:
+		return LOD_get_field_count(node, code_mode);
+	case TAG_MPEG4_Layer2D:
+		return Layer2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Layer3D:
+		return Layer3D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Layout:
+		return Layout_get_field_count(node, code_mode);
+	case TAG_MPEG4_LineProperties:
+		return LineProperties_get_field_count(node, code_mode);
+	case TAG_MPEG4_ListeningPoint:
+		return ListeningPoint_get_field_count(node, code_mode);
+	case TAG_MPEG4_Material:
+		return Material_get_field_count(node, code_mode);
+	case TAG_MPEG4_Material2D:
+		return Material2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_MovieTexture:
+		return MovieTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_NavigationInfo:
+		return NavigationInfo_get_field_count(node, code_mode);
+	case TAG_MPEG4_Normal:
+		return Normal_get_field_count(node, code_mode);
+	case TAG_MPEG4_NormalInterpolator:
+		return NormalInterpolator_get_field_count(node, code_mode);
+	case TAG_MPEG4_OrderedGroup:
+		return OrderedGroup_get_field_count(node, code_mode);
+	case TAG_MPEG4_OrientationInterpolator:
+		return OrientationInterpolator_get_field_count(node, code_mode);
+	case TAG_MPEG4_PixelTexture:
+		return PixelTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_PlaneSensor:
+		return PlaneSensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_PlaneSensor2D:
+		return PlaneSensor2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_PointLight:
+		return PointLight_get_field_count(node, code_mode);
+	case TAG_MPEG4_PointSet:
+		return PointSet_get_field_count(node, code_mode);
+	case TAG_MPEG4_PointSet2D:
+		return PointSet2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_PositionInterpolator:
+		return PositionInterpolator_get_field_count(node, code_mode);
+	case TAG_MPEG4_PositionInterpolator2D:
+		return PositionInterpolator2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_ProximitySensor2D:
+		return ProximitySensor2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_ProximitySensor:
+		return ProximitySensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_QuantizationParameter:
+		return QuantizationParameter_get_field_count(node, code_mode);
+	case TAG_MPEG4_Rectangle:
+		return Rectangle_get_field_count(node, code_mode);
+	case TAG_MPEG4_ScalarInterpolator:
+		return ScalarInterpolator_get_field_count(node, code_mode);
+	case TAG_MPEG4_Script:
+		return Script_get_field_count(node, code_mode);
+	case TAG_MPEG4_Shape:
+		return Shape_get_field_count(node, code_mode);
+	case TAG_MPEG4_Sound:
+		return Sound_get_field_count(node, code_mode);
+	case TAG_MPEG4_Sound2D:
+		return Sound2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Sphere:
+		return Sphere_get_field_count(node, code_mode);
+	case TAG_MPEG4_SphereSensor:
+		return SphereSensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_SpotLight:
+		return SpotLight_get_field_count(node, code_mode);
+	case TAG_MPEG4_Switch:
+		return Switch_get_field_count(node, code_mode);
+	case TAG_MPEG4_TermCap:
+		return TermCap_get_field_count(node, code_mode);
+	case TAG_MPEG4_Text:
+		return Text_get_field_count(node, code_mode);
+	case TAG_MPEG4_TextureCoordinate:
+		return TextureCoordinate_get_field_count(node, code_mode);
+	case TAG_MPEG4_TextureTransform:
+		return TextureTransform_get_field_count(node, code_mode);
+	case TAG_MPEG4_TimeSensor:
+		return TimeSensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_TouchSensor:
+		return TouchSensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_Transform:
+		return Transform_get_field_count(node, code_mode);
+	case TAG_MPEG4_Transform2D:
+		return Transform2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Valuator:
+		return Valuator_get_field_count(node, code_mode);
+	case TAG_MPEG4_Viewpoint:
+		return Viewpoint_get_field_count(node, code_mode);
+	case TAG_MPEG4_VisibilitySensor:
+		return VisibilitySensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_Viseme:
+		return Viseme_get_field_count(node, code_mode);
+	case TAG_MPEG4_WorldInfo:
+		return WorldInfo_get_field_count(node, code_mode);
+	case TAG_MPEG4_AcousticMaterial:
+		return AcousticMaterial_get_field_count(node, code_mode);
+	case TAG_MPEG4_AcousticScene:
+		return AcousticScene_get_field_count(node, code_mode);
+	case TAG_MPEG4_ApplicationWindow:
+		return ApplicationWindow_get_field_count(node, code_mode);
+	case TAG_MPEG4_BAP:
+		return BAP_get_field_count(node, code_mode);
+	case TAG_MPEG4_BDP:
+		return BDP_get_field_count(node, code_mode);
+	case TAG_MPEG4_Body:
+		return Body_get_field_count(node, code_mode);
+	case TAG_MPEG4_BodyDefTable:
+		return BodyDefTable_get_field_count(node, code_mode);
+	case TAG_MPEG4_BodySegmentConnectionHint:
+		return BodySegmentConnectionHint_get_field_count(node, code_mode);
+	case TAG_MPEG4_DirectiveSound:
+		return DirectiveSound_get_field_count(node, code_mode);
+	case TAG_MPEG4_Hierarchical3DMesh:
+		return Hierarchical3DMesh_get_field_count(node, code_mode);
+	case TAG_MPEG4_MaterialKey:
+		return MaterialKey_get_field_count(node, code_mode);
+	case TAG_MPEG4_PerceptualParameters:
+		return PerceptualParameters_get_field_count(node, code_mode);
+	case TAG_MPEG4_TemporalTransform:
+		return TemporalTransform_get_field_count(node, code_mode);
+	case TAG_MPEG4_TemporalGroup:
+		return TemporalGroup_get_field_count(node, code_mode);
+	case TAG_MPEG4_ServerCommand:
+		return ServerCommand_get_field_count(node, code_mode);
+	case TAG_MPEG4_InputSensor:
+		return InputSensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_MatteTexture:
+		return MatteTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_MediaBuffer:
+		return MediaBuffer_get_field_count(node, code_mode);
+	case TAG_MPEG4_MediaControl:
+		return MediaControl_get_field_count(node, code_mode);
+	case TAG_MPEG4_MediaSensor:
+		return MediaSensor_get_field_count(node, code_mode);
+	case TAG_MPEG4_BitWrapper:
+		return BitWrapper_get_field_count(node, code_mode);
+	case TAG_MPEG4_CoordinateInterpolator4D:
+		return CoordinateInterpolator4D_get_field_count(node, code_mode);
+	case TAG_MPEG4_DepthImage:
+		return DepthImage_get_field_count(node, code_mode);
+	case TAG_MPEG4_FFD:
+		return FFD_get_field_count(node, code_mode);
+	case TAG_MPEG4_Implicit:
+		return Implicit_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXLFM_Appearance:
+		return XXLFM_Appearance_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXLFM_BlendList:
+		return XXLFM_BlendList_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXLFM_FrameList:
+		return XXLFM_FrameList_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXLFM_LightMap:
+		return XXLFM_LightMap_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXLFM_SurfaceMapList:
+		return XXLFM_SurfaceMapList_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXLFM_ViewMapList:
+		return XXLFM_ViewMapList_get_field_count(node, code_mode);
+	case TAG_MPEG4_MeshGrid:
+		return MeshGrid_get_field_count(node, code_mode);
+	case TAG_MPEG4_NonLinearDeformer:
+		return NonLinearDeformer_get_field_count(node, code_mode);
+	case TAG_MPEG4_NurbsCurve:
+		return NurbsCurve_get_field_count(node, code_mode);
+	case TAG_MPEG4_NurbsCurve2D:
+		return NurbsCurve2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_NurbsSurface:
+		return NurbsSurface_get_field_count(node, code_mode);
+	case TAG_MPEG4_OctreeImage:
+		return OctreeImage_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXParticles:
+		return XXParticles_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXParticleInitBox:
+		return XXParticleInitBox_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXPlanarObstacle:
+		return XXPlanarObstacle_get_field_count(node, code_mode);
+	case TAG_MPEG4_XXPointAttractor:
+		return XXPointAttractor_get_field_count(node, code_mode);
+	case TAG_MPEG4_PointTexture:
+		return PointTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_PositionAnimator:
+		return PositionAnimator_get_field_count(node, code_mode);
+	case TAG_MPEG4_PositionAnimator2D:
+		return PositionAnimator2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_PositionInterpolator4D:
+		return PositionInterpolator4D_get_field_count(node, code_mode);
+	case TAG_MPEG4_ProceduralTexture:
+		return ProceduralTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_Quadric:
+		return Quadric_get_field_count(node, code_mode);
+	case TAG_MPEG4_SBBone:
+		return SBBone_get_field_count(node, code_mode);
+	case TAG_MPEG4_SBMuscle:
+		return SBMuscle_get_field_count(node, code_mode);
+	case TAG_MPEG4_SBSegment:
+		return SBSegment_get_field_count(node, code_mode);
+	case TAG_MPEG4_SBSite:
+		return SBSite_get_field_count(node, code_mode);
+	case TAG_MPEG4_SBSkinnedModel:
+		return SBSkinnedModel_get_field_count(node, code_mode);
+	case TAG_MPEG4_SBVCAnimation:
+		return SBVCAnimation_get_field_count(node, code_mode);
+	case TAG_MPEG4_ScalarAnimator:
+		return ScalarAnimator_get_field_count(node, code_mode);
+	case TAG_MPEG4_SimpleTexture:
+		return SimpleTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_SolidRep:
+		return SolidRep_get_field_count(node, code_mode);
+	case TAG_MPEG4_SubdivisionSurface:
+		return SubdivisionSurface_get_field_count(node, code_mode);
+	case TAG_MPEG4_SubdivSurfaceSector:
+		return SubdivSurfaceSector_get_field_count(node, code_mode);
+	case TAG_MPEG4_WaveletSubdivisionSurface:
+		return WaveletSubdivisionSurface_get_field_count(node, code_mode);
+	case TAG_MPEG4_Clipper2D:
+		return Clipper2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_ColorTransform:
+		return ColorTransform_get_field_count(node, code_mode);
+	case TAG_MPEG4_Ellipse:
+		return Ellipse_get_field_count(node, code_mode);
+	case TAG_MPEG4_LinearGradient:
+		return LinearGradient_get_field_count(node, code_mode);
+	case TAG_MPEG4_PathLayout:
+		return PathLayout_get_field_count(node, code_mode);
+	case TAG_MPEG4_RadialGradient:
+		return RadialGradient_get_field_count(node, code_mode);
+	case TAG_MPEG4_SynthesizedTexture:
+		return SynthesizedTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_TransformMatrix2D:
+		return TransformMatrix2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_Viewport:
+		return Viewport_get_field_count(node, code_mode);
+	case TAG_MPEG4_XCurve2D:
+		return XCurve2D_get_field_count(node, code_mode);
+	case TAG_MPEG4_XFontStyle:
+		return XFontStyle_get_field_count(node, code_mode);
+	case TAG_MPEG4_XLineProperties:
+		return XLineProperties_get_field_count(node, code_mode);
+	case TAG_MPEG4_AdvancedAudioBuffer:
+		return AdvancedAudioBuffer_get_field_count(node, code_mode);
+	case TAG_MPEG4_AudioChannelConfig:
+		return AudioChannelConfig_get_field_count(node, code_mode);
+	case TAG_MPEG4_DepthImageV2:
+		return DepthImageV2_get_field_count(node, code_mode);
+	case TAG_MPEG4_MorphShape:
+		return MorphShape_get_field_count(node, code_mode);
+	case TAG_MPEG4_MultiTexture:
+		return MultiTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_PointTextureV2:
+		return PointTextureV2_get_field_count(node, code_mode);
+	case TAG_MPEG4_SBVCAnimationV2:
+		return SBVCAnimationV2_get_field_count(node, code_mode);
+	case TAG_MPEG4_SimpleTextureV2:
+		return SimpleTextureV2_get_field_count(node, code_mode);
+	case TAG_MPEG4_SurroundingSound:
+		return SurroundingSound_get_field_count(node, code_mode);
+	case TAG_MPEG4_Transform3DAudio:
+		return Transform3DAudio_get_field_count(node, code_mode);
+	case TAG_MPEG4_WideSound:
+		return WideSound_get_field_count(node, code_mode);
+	case TAG_MPEG4_ScoreShape:
+		return ScoreShape_get_field_count(node, code_mode);
+	case TAG_MPEG4_MusicScore:
+		return MusicScore_get_field_count(node, code_mode);
+	case TAG_MPEG4_FootPrintSetNode:
+		return FootPrintSetNode_get_field_count(node, code_mode);
+	case TAG_MPEG4_FootPrintNode:
+		return FootPrintNode_get_field_count(node, code_mode);
+	case TAG_MPEG4_BuildingPartNode:
+		return BuildingPartNode_get_field_count(node, code_mode);
+	case TAG_MPEG4_RoofNode:
+		return RoofNode_get_field_count(node, code_mode);
+	case TAG_MPEG4_FacadeNode:
+		return FacadeNode_get_field_count(node, code_mode);
+	case TAG_MPEG4_Shadow:
+		return Shadow_get_field_count(node, code_mode);
+	case TAG_MPEG4_CacheTexture:
+		return CacheTexture_get_field_count(node, code_mode);
+	case TAG_MPEG4_EnvironmentTest:
+		return EnvironmentTest_get_field_count(node, code_mode);
+	case TAG_MPEG4_KeyNavigator:
+		return KeyNavigator_get_field_count(node, code_mode);
+	case TAG_MPEG4_SpacePartition:
+		return SpacePartition_get_field_count(node, code_mode);
+	case TAG_MPEG4_Storage:
+		return Storage_get_field_count(node, code_mode);
 	default:
 		return 0;
 	}
@@ -37329,201 +38499,396 @@
 GF_Err gf_sg_mpeg4_node_get_field(GF_Node *node, GF_FieldInfo *field)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_MPEG4_Anchor: return Anchor_get_field(node, field);
-	case TAG_MPEG4_AnimationStream: return AnimationStream_get_field(node, field);
-	case TAG_MPEG4_Appearance: return Appearance_get_field(node, field);
-	case TAG_MPEG4_AudioBuffer: return AudioBuffer_get_field(node, field);
-	case TAG_MPEG4_AudioClip: return AudioClip_get_field(node, field);
-	case TAG_MPEG4_AudioDelay: return AudioDelay_get_field(node, field);
-	case TAG_MPEG4_AudioFX: return AudioFX_get_field(node, field);
-	case TAG_MPEG4_AudioMix: return AudioMix_get_field(node, field);
-	case TAG_MPEG4_AudioSource: return AudioSource_get_field(node, field);
-	case TAG_MPEG4_AudioSwitch: return AudioSwitch_get_field(node, field);
-	case TAG_MPEG4_Background: return Background_get_field(node, field);
-	case TAG_MPEG4_Background2D: return Background2D_get_field(node, field);
-	case TAG_MPEG4_Billboard: return Billboard_get_field(node, field);
-	case TAG_MPEG4_Bitmap: return Bitmap_get_field(node, field);
-	case TAG_MPEG4_Box: return Box_get_field(node, field);
-	case TAG_MPEG4_Circle: return Circle_get_field(node, field);
-	case TAG_MPEG4_Collision: return Collision_get_field(node, field);
-	case TAG_MPEG4_Color: return Color_get_field(node, field);
-	case TAG_MPEG4_ColorInterpolator: return ColorInterpolator_get_field(node, field);
-	case TAG_MPEG4_CompositeTexture2D: return CompositeTexture2D_get_field(node, field);
-	case TAG_MPEG4_CompositeTexture3D: return CompositeTexture3D_get_field(node, field);
-	case TAG_MPEG4_Conditional: return Conditional_get_field(node, field);
-	case TAG_MPEG4_Cone: return Cone_get_field(node, field);
-	case TAG_MPEG4_Coordinate: return Coordinate_get_field(node, field);
-	case TAG_MPEG4_Coordinate2D: return Coordinate2D_get_field(node, field);
-	case TAG_MPEG4_CoordinateInterpolator: return CoordinateInterpolator_get_field(node, field);
-	case TAG_MPEG4_CoordinateInterpolator2D: return CoordinateInterpolator2D_get_field(node, field);
-	case TAG_MPEG4_Curve2D: return Curve2D_get_field(node, field);
-	case TAG_MPEG4_Cylinder: return Cylinder_get_field(node, field);
-	case TAG_MPEG4_CylinderSensor: return CylinderSensor_get_field(node, field);
-	case TAG_MPEG4_DirectionalLight: return DirectionalLight_get_field(node, field);
-	case TAG_MPEG4_DiscSensor: return DiscSensor_get_field(node, field);
-	case TAG_MPEG4_ElevationGrid: return ElevationGrid_get_field(node, field);
-	case TAG_MPEG4_Expression: return Expression_get_field(node, field);
-	case TAG_MPEG4_Extrusion: return Extrusion_get_field(node, field);
-	case TAG_MPEG4_Face: return Face_get_field(node, field);
-	case TAG_MPEG4_FaceDefMesh: return FaceDefMesh_get_field(node, field);
-	case TAG_MPEG4_FaceDefTables: return FaceDefTables_get_field(node, field);
-	case TAG_MPEG4_FaceDefTransform: return FaceDefTransform_get_field(node, field);
-	case TAG_MPEG4_FAP: return FAP_get_field(node, field);
-	case TAG_MPEG4_FDP: return FDP_get_field(node, field);
-	case TAG_MPEG4_FIT: return FIT_get_field(node, field);
-	case TAG_MPEG4_Fog: return Fog_get_field(node, field);
-	case TAG_MPEG4_FontStyle: return FontStyle_get_field(node, field);
-	case TAG_MPEG4_Form: return Form_get_field(node, field);
-	case TAG_MPEG4_Group: return Group_get_field(node, field);
-	case TAG_MPEG4_ImageTexture: return ImageTexture_get_field(node, field);
-	case TAG_MPEG4_IndexedFaceSet: return IndexedFaceSet_get_field(node, field);
-	case TAG_MPEG4_IndexedFaceSet2D: return IndexedFaceSet2D_get_field(node, field);
-	case TAG_MPEG4_IndexedLineSet: return IndexedLineSet_get_field(node, field);
-	case TAG_MPEG4_IndexedLineSet2D: return IndexedLineSet2D_get_field(node, field);
-	case TAG_MPEG4_Inline: return Inline_get_field(node, field);
-	case TAG_MPEG4_LOD: return LOD_get_field(node, field);
-	case TAG_MPEG4_Layer2D: return Layer2D_get_field(node, field);
-	case TAG_MPEG4_Layer3D: return Layer3D_get_field(node, field);
-	case TAG_MPEG4_Layout: return Layout_get_field(node, field);
-	case TAG_MPEG4_LineProperties: return LineProperties_get_field(node, field);
-	case TAG_MPEG4_ListeningPoint: return ListeningPoint_get_field(node, field);
-	case TAG_MPEG4_Material: return Material_get_field(node, field);
-	case TAG_MPEG4_Material2D: return Material2D_get_field(node, field);
-	case TAG_MPEG4_MovieTexture: return MovieTexture_get_field(node, field);
-	case TAG_MPEG4_NavigationInfo: return NavigationInfo_get_field(node, field);
-	case TAG_MPEG4_Normal: return Normal_get_field(node, field);
-	case TAG_MPEG4_NormalInterpolator: return NormalInterpolator_get_field(node, field);
-	case TAG_MPEG4_OrderedGroup: return OrderedGroup_get_field(node, field);
-	case TAG_MPEG4_OrientationInterpolator: return OrientationInterpolator_get_field(node, field);
-	case TAG_MPEG4_PixelTexture: return PixelTexture_get_field(node, field);
-	case TAG_MPEG4_PlaneSensor: return PlaneSensor_get_field(node, field);
-	case TAG_MPEG4_PlaneSensor2D: return PlaneSensor2D_get_field(node, field);
-	case TAG_MPEG4_PointLight: return PointLight_get_field(node, field);
-	case TAG_MPEG4_PointSet: return PointSet_get_field(node, field);
-	case TAG_MPEG4_PointSet2D: return PointSet2D_get_field(node, field);
-	case TAG_MPEG4_PositionInterpolator: return PositionInterpolator_get_field(node, field);
-	case TAG_MPEG4_PositionInterpolator2D: return PositionInterpolator2D_get_field(node, field);
-	case TAG_MPEG4_ProximitySensor2D: return ProximitySensor2D_get_field(node, field);
-	case TAG_MPEG4_ProximitySensor: return ProximitySensor_get_field(node, field);
-	case TAG_MPEG4_QuantizationParameter: return QuantizationParameter_get_field(node, field);
-	case TAG_MPEG4_Rectangle: return Rectangle_get_field(node, field);
-	case TAG_MPEG4_ScalarInterpolator: return ScalarInterpolator_get_field(node, field);
-	case TAG_MPEG4_Script: return Script_get_field(node, field);
-	case TAG_MPEG4_Shape: return Shape_get_field(node, field);
-	case TAG_MPEG4_Sound: return Sound_get_field(node, field);
-	case TAG_MPEG4_Sound2D: return Sound2D_get_field(node, field);
-	case TAG_MPEG4_Sphere: return Sphere_get_field(node, field);
-	case TAG_MPEG4_SphereSensor: return SphereSensor_get_field(node, field);
-	case TAG_MPEG4_SpotLight: return SpotLight_get_field(node, field);
-	case TAG_MPEG4_Switch: return Switch_get_field(node, field);
-	case TAG_MPEG4_TermCap: return TermCap_get_field(node, field);
-	case TAG_MPEG4_Text: return Text_get_field(node, field);
-	case TAG_MPEG4_TextureCoordinate: return TextureCoordinate_get_field(node, field);
-	case TAG_MPEG4_TextureTransform: return TextureTransform_get_field(node, field);
-	case TAG_MPEG4_TimeSensor: return TimeSensor_get_field(node, field);
-	case TAG_MPEG4_TouchSensor: return TouchSensor_get_field(node, field);
-	case TAG_MPEG4_Transform: return Transform_get_field(node, field);
-	case TAG_MPEG4_Transform2D: return Transform2D_get_field(node, field);
-	case TAG_MPEG4_Valuator: return Valuator_get_field(node, field);
-	case TAG_MPEG4_Viewpoint: return Viewpoint_get_field(node, field);
-	case TAG_MPEG4_VisibilitySensor: return VisibilitySensor_get_field(node, field);
-	case TAG_MPEG4_Viseme: return Viseme_get_field(node, field);
-	case TAG_MPEG4_WorldInfo: return WorldInfo_get_field(node, field);
-	case TAG_MPEG4_AcousticMaterial: return AcousticMaterial_get_field(node, field);
-	case TAG_MPEG4_AcousticScene: return AcousticScene_get_field(node, field);
-	case TAG_MPEG4_ApplicationWindow: return ApplicationWindow_get_field(node, field);
-	case TAG_MPEG4_BAP: return BAP_get_field(node, field);
-	case TAG_MPEG4_BDP: return BDP_get_field(node, field);
-	case TAG_MPEG4_Body: return Body_get_field(node, field);
-	case TAG_MPEG4_BodyDefTable: return BodyDefTable_get_field(node, field);
-	case TAG_MPEG4_BodySegmentConnectionHint: return BodySegmentConnectionHint_get_field(node, field);
-	case TAG_MPEG4_DirectiveSound: return DirectiveSound_get_field(node, field);
-	case TAG_MPEG4_Hierarchical3DMesh: return Hierarchical3DMesh_get_field(node, field);
-	case TAG_MPEG4_MaterialKey: return MaterialKey_get_field(node, field);
-	case TAG_MPEG4_PerceptualParameters: return PerceptualParameters_get_field(node, field);
-	case TAG_MPEG4_TemporalTransform: return TemporalTransform_get_field(node, field);
-	case TAG_MPEG4_TemporalGroup: return TemporalGroup_get_field(node, field);
-	case TAG_MPEG4_ServerCommand: return ServerCommand_get_field(node, field);
-	case TAG_MPEG4_InputSensor: return InputSensor_get_field(node, field);
-	case TAG_MPEG4_MatteTexture: return MatteTexture_get_field(node, field);
-	case TAG_MPEG4_MediaBuffer: return MediaBuffer_get_field(node, field);
-	case TAG_MPEG4_MediaControl: return MediaControl_get_field(node, field);
-	case TAG_MPEG4_MediaSensor: return MediaSensor_get_field(node, field);
-	case TAG_MPEG4_BitWrapper: return BitWrapper_get_field(node, field);
-	case TAG_MPEG4_CoordinateInterpolator4D: return CoordinateInterpolator4D_get_field(node, field);
-	case TAG_MPEG4_DepthImage: return DepthImage_get_field(node, field);
-	case TAG_MPEG4_FFD: return FFD_get_field(node, field);
-	case TAG_MPEG4_Implicit: return Implicit_get_field(node, field);
-	case TAG_MPEG4_XXLFM_Appearance: return XXLFM_Appearance_get_field(node, field);
-	case TAG_MPEG4_XXLFM_BlendList: return XXLFM_BlendList_get_field(node, field);
-	case TAG_MPEG4_XXLFM_FrameList: return XXLFM_FrameList_get_field(node, field);
-	case TAG_MPEG4_XXLFM_LightMap: return XXLFM_LightMap_get_field(node, field);
-	case TAG_MPEG4_XXLFM_SurfaceMapList: return XXLFM_SurfaceMapList_get_field(node, field);
-	case TAG_MPEG4_XXLFM_ViewMapList: return XXLFM_ViewMapList_get_field(node, field);
-	case TAG_MPEG4_MeshGrid: return MeshGrid_get_field(node, field);
-	case TAG_MPEG4_NonLinearDeformer: return NonLinearDeformer_get_field(node, field);
-	case TAG_MPEG4_NurbsCurve: return NurbsCurve_get_field(node, field);
-	case TAG_MPEG4_NurbsCurve2D: return NurbsCurve2D_get_field(node, field);
-	case TAG_MPEG4_NurbsSurface: return NurbsSurface_get_field(node, field);
-	case TAG_MPEG4_OctreeImage: return OctreeImage_get_field(node, field);
-	case TAG_MPEG4_XXParticles: return XXParticles_get_field(node, field);
-	case TAG_MPEG4_XXParticleInitBox: return XXParticleInitBox_get_field(node, field);
-	case TAG_MPEG4_XXPlanarObstacle: return XXPlanarObstacle_get_field(node, field);
-	case TAG_MPEG4_XXPointAttractor: return XXPointAttractor_get_field(node, field);
-	case TAG_MPEG4_PointTexture: return PointTexture_get_field(node, field);
-	case TAG_MPEG4_PositionAnimator: return PositionAnimator_get_field(node, field);
-	case TAG_MPEG4_PositionAnimator2D: return PositionAnimator2D_get_field(node, field);
-	case TAG_MPEG4_PositionInterpolator4D: return PositionInterpolator4D_get_field(node, field);
-	case TAG_MPEG4_ProceduralTexture: return ProceduralTexture_get_field(node, field);
-	case TAG_MPEG4_Quadric: return Quadric_get_field(node, field);
-	case TAG_MPEG4_SBBone: return SBBone_get_field(node, field);
-	case TAG_MPEG4_SBMuscle: return SBMuscle_get_field(node, field);
-	case TAG_MPEG4_SBSegment: return SBSegment_get_field(node, field);
-	case TAG_MPEG4_SBSite: return SBSite_get_field(node, field);
-	case TAG_MPEG4_SBSkinnedModel: return SBSkinnedModel_get_field(node, field);
-	case TAG_MPEG4_SBVCAnimation: return SBVCAnimation_get_field(node, field);
-	case TAG_MPEG4_ScalarAnimator: return ScalarAnimator_get_field(node, field);
-	case TAG_MPEG4_SimpleTexture: return SimpleTexture_get_field(node, field);
-	case TAG_MPEG4_SolidRep: return SolidRep_get_field(node, field);
-	case TAG_MPEG4_SubdivisionSurface: return SubdivisionSurface_get_field(node, field);
-	case TAG_MPEG4_SubdivSurfaceSector: return SubdivSurfaceSector_get_field(node, field);
-	case TAG_MPEG4_WaveletSubdivisionSurface: return WaveletSubdivisionSurface_get_field(node, field);
-	case TAG_MPEG4_Clipper2D: return Clipper2D_get_field(node, field);
-	case TAG_MPEG4_ColorTransform: return ColorTransform_get_field(node, field);
-	case TAG_MPEG4_Ellipse: return Ellipse_get_field(node, field);
-	case TAG_MPEG4_LinearGradient: return LinearGradient_get_field(node, field);
-	case TAG_MPEG4_PathLayout: return PathLayout_get_field(node, field);
-	case TAG_MPEG4_RadialGradient: return RadialGradient_get_field(node, field);
-	case TAG_MPEG4_SynthesizedTexture: return SynthesizedTexture_get_field(node, field);
-	case TAG_MPEG4_TransformMatrix2D: return TransformMatrix2D_get_field(node, field);
-	case TAG_MPEG4_Viewport: return Viewport_get_field(node, field);
-	case TAG_MPEG4_XCurve2D: return XCurve2D_get_field(node, field);
-	case TAG_MPEG4_XFontStyle: return XFontStyle_get_field(node, field);
-	case TAG_MPEG4_XLineProperties: return XLineProperties_get_field(node, field);
-	case TAG_MPEG4_AdvancedAudioBuffer: return AdvancedAudioBuffer_get_field(node, field);
-	case TAG_MPEG4_AudioChannelConfig: return AudioChannelConfig_get_field(node, field);
-	case TAG_MPEG4_DepthImageV2: return DepthImageV2_get_field(node, field);
-	case TAG_MPEG4_MorphShape: return MorphShape_get_field(node, field);
-	case TAG_MPEG4_MultiTexture: return MultiTexture_get_field(node, field);
-	case TAG_MPEG4_PointTextureV2: return PointTextureV2_get_field(node, field);
-	case TAG_MPEG4_SBVCAnimationV2: return SBVCAnimationV2_get_field(node, field);
-	case TAG_MPEG4_SimpleTextureV2: return SimpleTextureV2_get_field(node, field);
-	case TAG_MPEG4_SurroundingSound: return SurroundingSound_get_field(node, field);
-	case TAG_MPEG4_Transform3DAudio: return Transform3DAudio_get_field(node, field);
-	case TAG_MPEG4_WideSound: return WideSound_get_field(node, field);
-	case TAG_MPEG4_ScoreShape: return ScoreShape_get_field(node, field);
-	case TAG_MPEG4_MusicScore: return MusicScore_get_field(node, field);
-	case TAG_MPEG4_FootPrintSetNode: return FootPrintSetNode_get_field(node, field);
-	case TAG_MPEG4_FootPrintNode: return FootPrintNode_get_field(node, field);
-	case TAG_MPEG4_BuildingPartNode: return BuildingPartNode_get_field(node, field);
-	case TAG_MPEG4_RoofNode: return RoofNode_get_field(node, field);
-	case TAG_MPEG4_FacadeNode: return FacadeNode_get_field(node, field);
-	case TAG_MPEG4_Shadow: return Shadow_get_field(node, field);
-	case TAG_MPEG4_CacheTexture: return CacheTexture_get_field(node, field);
-	case TAG_MPEG4_EnvironmentTest: return EnvironmentTest_get_field(node, field);
-	case TAG_MPEG4_KeyNavigator: return KeyNavigator_get_field(node, field);
-	case TAG_MPEG4_SpacePartition: return SpacePartition_get_field(node, field);
-	case TAG_MPEG4_Storage: return Storage_get_field(node, field);
+	case TAG_MPEG4_Anchor:
+		return Anchor_get_field(node, field);
+	case TAG_MPEG4_AnimationStream:
+		return AnimationStream_get_field(node, field);
+	case TAG_MPEG4_Appearance:
+		return Appearance_get_field(node, field);
+	case TAG_MPEG4_AudioBuffer:
+		return AudioBuffer_get_field(node, field);
+	case TAG_MPEG4_AudioClip:
+		return AudioClip_get_field(node, field);
+	case TAG_MPEG4_AudioDelay:
+		return AudioDelay_get_field(node, field);
+	case TAG_MPEG4_AudioFX:
+		return AudioFX_get_field(node, field);
+	case TAG_MPEG4_AudioMix:
+		return AudioMix_get_field(node, field);
+	case TAG_MPEG4_AudioSource:
+		return AudioSource_get_field(node, field);
+	case TAG_MPEG4_AudioSwitch:
+		return AudioSwitch_get_field(node, field);
+	case TAG_MPEG4_Background:
+		return Background_get_field(node, field);
+	case TAG_MPEG4_Background2D:
+		return Background2D_get_field(node, field);
+	case TAG_MPEG4_Billboard:
+		return Billboard_get_field(node, field);
+	case TAG_MPEG4_Bitmap:
+		return Bitmap_get_field(node, field);
+	case TAG_MPEG4_Box:
+		return Box_get_field(node, field);
+	case TAG_MPEG4_Circle:
+		return Circle_get_field(node, field);
+	case TAG_MPEG4_Collision:
+		return Collision_get_field(node, field);
+	case TAG_MPEG4_Color:
+		return Color_get_field(node, field);
+	case TAG_MPEG4_ColorInterpolator:
+		return ColorInterpolator_get_field(node, field);
+	case TAG_MPEG4_CompositeTexture2D:
+		return CompositeTexture2D_get_field(node, field);
+	case TAG_MPEG4_CompositeTexture3D:
+		return CompositeTexture3D_get_field(node, field);
+	case TAG_MPEG4_Conditional:
+		return Conditional_get_field(node, field);
+	case TAG_MPEG4_Cone:
+		return Cone_get_field(node, field);
+	case TAG_MPEG4_Coordinate:
+		return Coordinate_get_field(node, field);
+	case TAG_MPEG4_Coordinate2D:
+		return Coordinate2D_get_field(node, field);
+	case TAG_MPEG4_CoordinateInterpolator:
+		return CoordinateInterpolator_get_field(node, field);
+	case TAG_MPEG4_CoordinateInterpolator2D:
+		return CoordinateInterpolator2D_get_field(node, field);
+	case TAG_MPEG4_Curve2D:
+		return Curve2D_get_field(node, field);
+	case TAG_MPEG4_Cylinder:
+		return Cylinder_get_field(node, field);
+	case TAG_MPEG4_CylinderSensor:
+		return CylinderSensor_get_field(node, field);
+	case TAG_MPEG4_DirectionalLight:
+		return DirectionalLight_get_field(node, field);
+	case TAG_MPEG4_DiscSensor:
+		return DiscSensor_get_field(node, field);
+	case TAG_MPEG4_ElevationGrid:
+		return ElevationGrid_get_field(node, field);
+	case TAG_MPEG4_Expression:
+		return Expression_get_field(node, field);
+	case TAG_MPEG4_Extrusion:
+		return Extrusion_get_field(node, field);
+	case TAG_MPEG4_Face:
+		return Face_get_field(node, field);
+	case TAG_MPEG4_FaceDefMesh:
+		return FaceDefMesh_get_field(node, field);
+	case TAG_MPEG4_FaceDefTables:
+		return FaceDefTables_get_field(node, field);
+	case TAG_MPEG4_FaceDefTransform:
+		return FaceDefTransform_get_field(node, field);
+	case TAG_MPEG4_FAP:
+		return FAP_get_field(node, field);
+	case TAG_MPEG4_FDP:
+		return FDP_get_field(node, field);
+	case TAG_MPEG4_FIT:
+		return FIT_get_field(node, field);
+	case TAG_MPEG4_Fog:
+		return Fog_get_field(node, field);
+	case TAG_MPEG4_FontStyle:
+		return FontStyle_get_field(node, field);
+	case TAG_MPEG4_Form:
+		return Form_get_field(node, field);
+	case TAG_MPEG4_Group:
+		return Group_get_field(node, field);
+	case TAG_MPEG4_ImageTexture:
+		return ImageTexture_get_field(node, field);
+	case TAG_MPEG4_IndexedFaceSet:
+		return IndexedFaceSet_get_field(node, field);
+	case TAG_MPEG4_IndexedFaceSet2D:
+		return IndexedFaceSet2D_get_field(node, field);
+	case TAG_MPEG4_IndexedLineSet:
+		return IndexedLineSet_get_field(node, field);
+	case TAG_MPEG4_IndexedLineSet2D:
+		return IndexedLineSet2D_get_field(node, field);
+	case TAG_MPEG4_Inline:
+		return Inline_get_field(node, field);
+	case TAG_MPEG4_LOD:
+		return LOD_get_field(node, field);
+	case TAG_MPEG4_Layer2D:
+		return Layer2D_get_field(node, field);
+	case TAG_MPEG4_Layer3D:
+		return Layer3D_get_field(node, field);
+	case TAG_MPEG4_Layout:
+		return Layout_get_field(node, field);
+	case TAG_MPEG4_LineProperties:
+		return LineProperties_get_field(node, field);
+	case TAG_MPEG4_ListeningPoint:
+		return ListeningPoint_get_field(node, field);
+	case TAG_MPEG4_Material:
+		return Material_get_field(node, field);
+	case TAG_MPEG4_Material2D:
+		return Material2D_get_field(node, field);
+	case TAG_MPEG4_MovieTexture:
+		return MovieTexture_get_field(node, field);
+	case TAG_MPEG4_NavigationInfo:
+		return NavigationInfo_get_field(node, field);
+	case TAG_MPEG4_Normal:
+		return Normal_get_field(node, field);
+	case TAG_MPEG4_NormalInterpolator:
+		return NormalInterpolator_get_field(node, field);
+	case TAG_MPEG4_OrderedGroup:
+		return OrderedGroup_get_field(node, field);
+	case TAG_MPEG4_OrientationInterpolator:
+		return OrientationInterpolator_get_field(node, field);
+	case TAG_MPEG4_PixelTexture:
+		return PixelTexture_get_field(node, field);
+	case TAG_MPEG4_PlaneSensor:
+		return PlaneSensor_get_field(node, field);
+	case TAG_MPEG4_PlaneSensor2D:
+		return PlaneSensor2D_get_field(node, field);
+	case TAG_MPEG4_PointLight:
+		return PointLight_get_field(node, field);
+	case TAG_MPEG4_PointSet:
+		return PointSet_get_field(node, field);
+	case TAG_MPEG4_PointSet2D:
+		return PointSet2D_get_field(node, field);
+	case TAG_MPEG4_PositionInterpolator:
+		return PositionInterpolator_get_field(node, field);
+	case TAG_MPEG4_PositionInterpolator2D:
+		return PositionInterpolator2D_get_field(node, field);
+	case TAG_MPEG4_ProximitySensor2D:
+		return ProximitySensor2D_get_field(node, field);
+	case TAG_MPEG4_ProximitySensor:
+		return ProximitySensor_get_field(node, field);
+	case TAG_MPEG4_QuantizationParameter:
+		return QuantizationParameter_get_field(node, field);
+	case TAG_MPEG4_Rectangle:
+		return Rectangle_get_field(node, field);
+	case TAG_MPEG4_ScalarInterpolator:
+		return ScalarInterpolator_get_field(node, field);
+	case TAG_MPEG4_Script:
+		return Script_get_field(node, field);
+	case TAG_MPEG4_Shape:
+		return Shape_get_field(node, field);
+	case TAG_MPEG4_Sound:
+		return Sound_get_field(node, field);
+	case TAG_MPEG4_Sound2D:
+		return Sound2D_get_field(node, field);
+	case TAG_MPEG4_Sphere:
+		return Sphere_get_field(node, field);
+	case TAG_MPEG4_SphereSensor:
+		return SphereSensor_get_field(node, field);
+	case TAG_MPEG4_SpotLight:
+		return SpotLight_get_field(node, field);
+	case TAG_MPEG4_Switch:
+		return Switch_get_field(node, field);
+	case TAG_MPEG4_TermCap:
+		return TermCap_get_field(node, field);
+	case TAG_MPEG4_Text:
+		return Text_get_field(node, field);
+	case TAG_MPEG4_TextureCoordinate:
+		return TextureCoordinate_get_field(node, field);
+	case TAG_MPEG4_TextureTransform:
+		return TextureTransform_get_field(node, field);
+	case TAG_MPEG4_TimeSensor:
+		return TimeSensor_get_field(node, field);
+	case TAG_MPEG4_TouchSensor:
+		return TouchSensor_get_field(node, field);
+	case TAG_MPEG4_Transform:
+		return Transform_get_field(node, field);
+	case TAG_MPEG4_Transform2D:
+		return Transform2D_get_field(node, field);
+	case TAG_MPEG4_Valuator:
+		return Valuator_get_field(node, field);
+	case TAG_MPEG4_Viewpoint:
+		return Viewpoint_get_field(node, field);
+	case TAG_MPEG4_VisibilitySensor:
+		return VisibilitySensor_get_field(node, field);
+	case TAG_MPEG4_Viseme:
+		return Viseme_get_field(node, field);
+	case TAG_MPEG4_WorldInfo:
+		return WorldInfo_get_field(node, field);
+	case TAG_MPEG4_AcousticMaterial:
+		return AcousticMaterial_get_field(node, field);
+	case TAG_MPEG4_AcousticScene:
+		return AcousticScene_get_field(node, field);
+	case TAG_MPEG4_ApplicationWindow:
+		return ApplicationWindow_get_field(node, field);
+	case TAG_MPEG4_BAP:
+		return BAP_get_field(node, field);
+	case TAG_MPEG4_BDP:
+		return BDP_get_field(node, field);
+	case TAG_MPEG4_Body:
+		return Body_get_field(node, field);
+	case TAG_MPEG4_BodyDefTable:
+		return BodyDefTable_get_field(node, field);
+	case TAG_MPEG4_BodySegmentConnectionHint:
+		return BodySegmentConnectionHint_get_field(node, field);
+	case TAG_MPEG4_DirectiveSound:
+		return DirectiveSound_get_field(node, field);
+	case TAG_MPEG4_Hierarchical3DMesh:
+		return Hierarchical3DMesh_get_field(node, field);
+	case TAG_MPEG4_MaterialKey:
+		return MaterialKey_get_field(node, field);
+	case TAG_MPEG4_PerceptualParameters:
+		return PerceptualParameters_get_field(node, field);
+	case TAG_MPEG4_TemporalTransform:
+		return TemporalTransform_get_field(node, field);
+	case TAG_MPEG4_TemporalGroup:
+		return TemporalGroup_get_field(node, field);
+	case TAG_MPEG4_ServerCommand:
+		return ServerCommand_get_field(node, field);
+	case TAG_MPEG4_InputSensor:
+		return InputSensor_get_field(node, field);
+	case TAG_MPEG4_MatteTexture:
+		return MatteTexture_get_field(node, field);
+	case TAG_MPEG4_MediaBuffer:
+		return MediaBuffer_get_field(node, field);
+	case TAG_MPEG4_MediaControl:
+		return MediaControl_get_field(node, field);
+	case TAG_MPEG4_MediaSensor:
+		return MediaSensor_get_field(node, field);
+	case TAG_MPEG4_BitWrapper:
+		return BitWrapper_get_field(node, field);
+	case TAG_MPEG4_CoordinateInterpolator4D:
+		return CoordinateInterpolator4D_get_field(node, field);
+	case TAG_MPEG4_DepthImage:
+		return DepthImage_get_field(node, field);
+	case TAG_MPEG4_FFD:
+		return FFD_get_field(node, field);
+	case TAG_MPEG4_Implicit:
+		return Implicit_get_field(node, field);
+	case TAG_MPEG4_XXLFM_Appearance:
+		return XXLFM_Appearance_get_field(node, field);
+	case TAG_MPEG4_XXLFM_BlendList:
+		return XXLFM_BlendList_get_field(node, field);
+	case TAG_MPEG4_XXLFM_FrameList:
+		return XXLFM_FrameList_get_field(node, field);
+	case TAG_MPEG4_XXLFM_LightMap:
+		return XXLFM_LightMap_get_field(node, field);
+	case TAG_MPEG4_XXLFM_SurfaceMapList:
+		return XXLFM_SurfaceMapList_get_field(node, field);
+	case TAG_MPEG4_XXLFM_ViewMapList:
+		return XXLFM_ViewMapList_get_field(node, field);
+	case TAG_MPEG4_MeshGrid:
+		return MeshGrid_get_field(node, field);
+	case TAG_MPEG4_NonLinearDeformer:
+		return NonLinearDeformer_get_field(node, field);
+	case TAG_MPEG4_NurbsCurve:
+		return NurbsCurve_get_field(node, field);
+	case TAG_MPEG4_NurbsCurve2D:
+		return NurbsCurve2D_get_field(node, field);
+	case TAG_MPEG4_NurbsSurface:
+		return NurbsSurface_get_field(node, field);
+	case TAG_MPEG4_OctreeImage:
+		return OctreeImage_get_field(node, field);
+	case TAG_MPEG4_XXParticles:
+		return XXParticles_get_field(node, field);
+	case TAG_MPEG4_XXParticleInitBox:
+		return XXParticleInitBox_get_field(node, field);
+	case TAG_MPEG4_XXPlanarObstacle:
+		return XXPlanarObstacle_get_field(node, field);
+	case TAG_MPEG4_XXPointAttractor:
+		return XXPointAttractor_get_field(node, field);
+	case TAG_MPEG4_PointTexture:
+		return PointTexture_get_field(node, field);
+	case TAG_MPEG4_PositionAnimator:
+		return PositionAnimator_get_field(node, field);
+	case TAG_MPEG4_PositionAnimator2D:
+		return PositionAnimator2D_get_field(node, field);
+	case TAG_MPEG4_PositionInterpolator4D:
+		return PositionInterpolator4D_get_field(node, field);
+	case TAG_MPEG4_ProceduralTexture:
+		return ProceduralTexture_get_field(node, field);
+	case TAG_MPEG4_Quadric:
+		return Quadric_get_field(node, field);
+	case TAG_MPEG4_SBBone:
+		return SBBone_get_field(node, field);
+	case TAG_MPEG4_SBMuscle:
+		return SBMuscle_get_field(node, field);
+	case TAG_MPEG4_SBSegment:
+		return SBSegment_get_field(node, field);
+	case TAG_MPEG4_SBSite:
+		return SBSite_get_field(node, field);
+	case TAG_MPEG4_SBSkinnedModel:
+		return SBSkinnedModel_get_field(node, field);
+	case TAG_MPEG4_SBVCAnimation:
+		return SBVCAnimation_get_field(node, field);
+	case TAG_MPEG4_ScalarAnimator:
+		return ScalarAnimator_get_field(node, field);
+	case TAG_MPEG4_SimpleTexture:
+		return SimpleTexture_get_field(node, field);
+	case TAG_MPEG4_SolidRep:
+		return SolidRep_get_field(node, field);
+	case TAG_MPEG4_SubdivisionSurface:
+		return SubdivisionSurface_get_field(node, field);
+	case TAG_MPEG4_SubdivSurfaceSector:
+		return SubdivSurfaceSector_get_field(node, field);
+	case TAG_MPEG4_WaveletSubdivisionSurface:
+		return WaveletSubdivisionSurface_get_field(node, field);
+	case TAG_MPEG4_Clipper2D:
+		return Clipper2D_get_field(node, field);
+	case TAG_MPEG4_ColorTransform:
+		return ColorTransform_get_field(node, field);
+	case TAG_MPEG4_Ellipse:
+		return Ellipse_get_field(node, field);
+	case TAG_MPEG4_LinearGradient:
+		return LinearGradient_get_field(node, field);
+	case TAG_MPEG4_PathLayout:
+		return PathLayout_get_field(node, field);
+	case TAG_MPEG4_RadialGradient:
+		return RadialGradient_get_field(node, field);
+	case TAG_MPEG4_SynthesizedTexture:
+		return SynthesizedTexture_get_field(node, field);
+	case TAG_MPEG4_TransformMatrix2D:
+		return TransformMatrix2D_get_field(node, field);
+	case TAG_MPEG4_Viewport:
+		return Viewport_get_field(node, field);
+	case TAG_MPEG4_XCurve2D:
+		return XCurve2D_get_field(node, field);
+	case TAG_MPEG4_XFontStyle:
+		return XFontStyle_get_field(node, field);
+	case TAG_MPEG4_XLineProperties:
+		return XLineProperties_get_field(node, field);
+	case TAG_MPEG4_AdvancedAudioBuffer:
+		return AdvancedAudioBuffer_get_field(node, field);
+	case TAG_MPEG4_AudioChannelConfig:
+		return AudioChannelConfig_get_field(node, field);
+	case TAG_MPEG4_DepthImageV2:
+		return DepthImageV2_get_field(node, field);
+	case TAG_MPEG4_MorphShape:
+		return MorphShape_get_field(node, field);
+	case TAG_MPEG4_MultiTexture:
+		return MultiTexture_get_field(node, field);
+	case TAG_MPEG4_PointTextureV2:
+		return PointTextureV2_get_field(node, field);
+	case TAG_MPEG4_SBVCAnimationV2:
+		return SBVCAnimationV2_get_field(node, field);
+	case TAG_MPEG4_SimpleTextureV2:
+		return SimpleTextureV2_get_field(node, field);
+	case TAG_MPEG4_SurroundingSound:
+		return SurroundingSound_get_field(node, field);
+	case TAG_MPEG4_Transform3DAudio:
+		return Transform3DAudio_get_field(node, field);
+	case TAG_MPEG4_WideSound:
+		return WideSound_get_field(node, field);
+	case TAG_MPEG4_ScoreShape:
+		return ScoreShape_get_field(node, field);
+	case TAG_MPEG4_MusicScore:
+		return MusicScore_get_field(node, field);
+	case TAG_MPEG4_FootPrintSetNode:
+		return FootPrintSetNode_get_field(node, field);
+	case TAG_MPEG4_FootPrintNode:
+		return FootPrintNode_get_field(node, field);
+	case TAG_MPEG4_BuildingPartNode:
+		return BuildingPartNode_get_field(node, field);
+	case TAG_MPEG4_RoofNode:
+		return RoofNode_get_field(node, field);
+	case TAG_MPEG4_FacadeNode:
+		return FacadeNode_get_field(node, field);
+	case TAG_MPEG4_Shadow:
+		return Shadow_get_field(node, field);
+	case TAG_MPEG4_CacheTexture:
+		return CacheTexture_get_field(node, field);
+	case TAG_MPEG4_EnvironmentTest:
+		return EnvironmentTest_get_field(node, field);
+	case TAG_MPEG4_KeyNavigator:
+		return KeyNavigator_get_field(node, field);
+	case TAG_MPEG4_SpacePartition:
+		return SpacePartition_get_field(node, field);
+	case TAG_MPEG4_Storage:
+		return Storage_get_field(node, field);
 	default:
 		return GF_BAD_PARAM;
 	}
@@ -37532,201 +38897,396 @@
 GF_Err gf_sg_mpeg4_node_get_field_index(GF_Node *node, u32 inField, u8 code_mode, u32 *fieldIndex)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_MPEG4_Anchor: return Anchor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AnimationStream: return AnimationStream_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Appearance: return Appearance_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AudioBuffer: return AudioBuffer_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AudioClip: return AudioClip_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AudioDelay: return AudioDelay_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AudioFX: return AudioFX_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AudioMix: return AudioMix_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AudioSource: return AudioSource_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AudioSwitch: return AudioSwitch_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Background: return Background_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Background2D: return Background2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Billboard: return Billboard_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Bitmap: return Bitmap_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Box: return Box_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Circle: return Circle_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Collision: return Collision_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Color: return Color_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ColorInterpolator: return ColorInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_CompositeTexture2D: return CompositeTexture2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_CompositeTexture3D: return CompositeTexture3D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Conditional: return Conditional_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Cone: return Cone_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Coordinate: return Coordinate_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Coordinate2D: return Coordinate2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_CoordinateInterpolator: return CoordinateInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_CoordinateInterpolator2D: return CoordinateInterpolator2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Curve2D: return Curve2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Cylinder: return Cylinder_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_CylinderSensor: return CylinderSensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_DirectionalLight: return DirectionalLight_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_DiscSensor: return DiscSensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ElevationGrid: return ElevationGrid_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Expression: return Expression_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Extrusion: return Extrusion_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Face: return Face_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FaceDefMesh: return FaceDefMesh_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FaceDefTables: return FaceDefTables_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FaceDefTransform: return FaceDefTransform_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FAP: return FAP_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FDP: return FDP_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FIT: return FIT_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Fog: return Fog_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FontStyle: return FontStyle_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Form: return Form_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Group: return Group_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ImageTexture: return ImageTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_IndexedFaceSet: return IndexedFaceSet_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_IndexedFaceSet2D: return IndexedFaceSet2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_IndexedLineSet: return IndexedLineSet_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_IndexedLineSet2D: return IndexedLineSet2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Inline: return Inline_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_LOD: return LOD_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Layer2D: return Layer2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Layer3D: return Layer3D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Layout: return Layout_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_LineProperties: return LineProperties_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ListeningPoint: return ListeningPoint_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Material: return Material_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Material2D: return Material2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MovieTexture: return MovieTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_NavigationInfo: return NavigationInfo_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Normal: return Normal_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_NormalInterpolator: return NormalInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_OrderedGroup: return OrderedGroup_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_OrientationInterpolator: return OrientationInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PixelTexture: return PixelTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PlaneSensor: return PlaneSensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PlaneSensor2D: return PlaneSensor2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PointLight: return PointLight_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PointSet: return PointSet_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PointSet2D: return PointSet2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PositionInterpolator: return PositionInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PositionInterpolator2D: return PositionInterpolator2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ProximitySensor2D: return ProximitySensor2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ProximitySensor: return ProximitySensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_QuantizationParameter: return QuantizationParameter_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Rectangle: return Rectangle_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ScalarInterpolator: return ScalarInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Script: return Script_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Shape: return Shape_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Sound: return Sound_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Sound2D: return Sound2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Sphere: return Sphere_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SphereSensor: return SphereSensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SpotLight: return SpotLight_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Switch: return Switch_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_TermCap: return TermCap_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Text: return Text_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_TextureCoordinate: return TextureCoordinate_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_TextureTransform: return TextureTransform_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_TimeSensor: return TimeSensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_TouchSensor: return TouchSensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Transform: return Transform_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Transform2D: return Transform2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Valuator: return Valuator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Viewpoint: return Viewpoint_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_VisibilitySensor: return VisibilitySensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Viseme: return Viseme_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_WorldInfo: return WorldInfo_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AcousticMaterial: return AcousticMaterial_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AcousticScene: return AcousticScene_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ApplicationWindow: return ApplicationWindow_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_BAP: return BAP_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_BDP: return BDP_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Body: return Body_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_BodyDefTable: return BodyDefTable_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_BodySegmentConnectionHint: return BodySegmentConnectionHint_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_DirectiveSound: return DirectiveSound_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Hierarchical3DMesh: return Hierarchical3DMesh_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MaterialKey: return MaterialKey_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PerceptualParameters: return PerceptualParameters_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_TemporalTransform: return TemporalTransform_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_TemporalGroup: return TemporalGroup_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ServerCommand: return ServerCommand_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_InputSensor: return InputSensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MatteTexture: return MatteTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MediaBuffer: return MediaBuffer_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MediaControl: return MediaControl_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MediaSensor: return MediaSensor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_BitWrapper: return BitWrapper_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_CoordinateInterpolator4D: return CoordinateInterpolator4D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_DepthImage: return DepthImage_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FFD: return FFD_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Implicit: return Implicit_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXLFM_Appearance: return XXLFM_Appearance_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXLFM_BlendList: return XXLFM_BlendList_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXLFM_FrameList: return XXLFM_FrameList_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXLFM_LightMap: return XXLFM_LightMap_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXLFM_SurfaceMapList: return XXLFM_SurfaceMapList_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXLFM_ViewMapList: return XXLFM_ViewMapList_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MeshGrid: return MeshGrid_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_NonLinearDeformer: return NonLinearDeformer_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_NurbsCurve: return NurbsCurve_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_NurbsCurve2D: return NurbsCurve2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_NurbsSurface: return NurbsSurface_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_OctreeImage: return OctreeImage_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXParticles: return XXParticles_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXParticleInitBox: return XXParticleInitBox_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXPlanarObstacle: return XXPlanarObstacle_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XXPointAttractor: return XXPointAttractor_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PointTexture: return PointTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PositionAnimator: return PositionAnimator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PositionAnimator2D: return PositionAnimator2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PositionInterpolator4D: return PositionInterpolator4D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ProceduralTexture: return ProceduralTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Quadric: return Quadric_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SBBone: return SBBone_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SBMuscle: return SBMuscle_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SBSegment: return SBSegment_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SBSite: return SBSite_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SBSkinnedModel: return SBSkinnedModel_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SBVCAnimation: return SBVCAnimation_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ScalarAnimator: return ScalarAnimator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SimpleTexture: return SimpleTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SolidRep: return SolidRep_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SubdivisionSurface: return SubdivisionSurface_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SubdivSurfaceSector: return SubdivSurfaceSector_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_WaveletSubdivisionSurface: return WaveletSubdivisionSurface_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Clipper2D: return Clipper2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ColorTransform: return ColorTransform_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Ellipse: return Ellipse_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_LinearGradient: return LinearGradient_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PathLayout: return PathLayout_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_RadialGradient: return RadialGradient_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SynthesizedTexture: return SynthesizedTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_TransformMatrix2D: return TransformMatrix2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Viewport: return Viewport_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XCurve2D: return XCurve2D_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XFontStyle: return XFontStyle_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_XLineProperties: return XLineProperties_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AdvancedAudioBuffer: return AdvancedAudioBuffer_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_AudioChannelConfig: return AudioChannelConfig_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_DepthImageV2: return DepthImageV2_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MorphShape: return MorphShape_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MultiTexture: return MultiTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_PointTextureV2: return PointTextureV2_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SBVCAnimationV2: return SBVCAnimationV2_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SimpleTextureV2: return SimpleTextureV2_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SurroundingSound: return SurroundingSound_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Transform3DAudio: return Transform3DAudio_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_WideSound: return WideSound_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_ScoreShape: return ScoreShape_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_MusicScore: return MusicScore_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FootPrintSetNode: return FootPrintSetNode_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FootPrintNode: return FootPrintNode_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_BuildingPartNode: return BuildingPartNode_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_RoofNode: return RoofNode_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_FacadeNode: return FacadeNode_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Shadow: return Shadow_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_CacheTexture: return CacheTexture_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_EnvironmentTest: return EnvironmentTest_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_KeyNavigator: return KeyNavigator_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_SpacePartition: return SpacePartition_get_field_index(node, inField, code_mode, fieldIndex);
-	case TAG_MPEG4_Storage: return Storage_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Anchor:
+		return Anchor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AnimationStream:
+		return AnimationStream_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Appearance:
+		return Appearance_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AudioBuffer:
+		return AudioBuffer_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AudioClip:
+		return AudioClip_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AudioDelay:
+		return AudioDelay_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AudioFX:
+		return AudioFX_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AudioMix:
+		return AudioMix_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AudioSource:
+		return AudioSource_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AudioSwitch:
+		return AudioSwitch_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Background:
+		return Background_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Background2D:
+		return Background2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Billboard:
+		return Billboard_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Bitmap:
+		return Bitmap_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Box:
+		return Box_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Circle:
+		return Circle_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Collision:
+		return Collision_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Color:
+		return Color_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ColorInterpolator:
+		return ColorInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_CompositeTexture2D:
+		return CompositeTexture2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_CompositeTexture3D:
+		return CompositeTexture3D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Conditional:
+		return Conditional_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Cone:
+		return Cone_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Coordinate:
+		return Coordinate_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Coordinate2D:
+		return Coordinate2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_CoordinateInterpolator:
+		return CoordinateInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_CoordinateInterpolator2D:
+		return CoordinateInterpolator2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Curve2D:
+		return Curve2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Cylinder:
+		return Cylinder_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_CylinderSensor:
+		return CylinderSensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_DirectionalLight:
+		return DirectionalLight_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_DiscSensor:
+		return DiscSensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ElevationGrid:
+		return ElevationGrid_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Expression:
+		return Expression_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Extrusion:
+		return Extrusion_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Face:
+		return Face_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FaceDefMesh:
+		return FaceDefMesh_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FaceDefTables:
+		return FaceDefTables_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FaceDefTransform:
+		return FaceDefTransform_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FAP:
+		return FAP_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FDP:
+		return FDP_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FIT:
+		return FIT_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Fog:
+		return Fog_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FontStyle:
+		return FontStyle_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Form:
+		return Form_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Group:
+		return Group_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ImageTexture:
+		return ImageTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_IndexedFaceSet:
+		return IndexedFaceSet_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_IndexedFaceSet2D:
+		return IndexedFaceSet2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_IndexedLineSet:
+		return IndexedLineSet_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_IndexedLineSet2D:
+		return IndexedLineSet2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Inline:
+		return Inline_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_LOD:
+		return LOD_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Layer2D:
+		return Layer2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Layer3D:
+		return Layer3D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Layout:
+		return Layout_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_LineProperties:
+		return LineProperties_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ListeningPoint:
+		return ListeningPoint_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Material:
+		return Material_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Material2D:
+		return Material2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MovieTexture:
+		return MovieTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_NavigationInfo:
+		return NavigationInfo_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Normal:
+		return Normal_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_NormalInterpolator:
+		return NormalInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_OrderedGroup:
+		return OrderedGroup_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_OrientationInterpolator:
+		return OrientationInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PixelTexture:
+		return PixelTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PlaneSensor:
+		return PlaneSensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PlaneSensor2D:
+		return PlaneSensor2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PointLight:
+		return PointLight_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PointSet:
+		return PointSet_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PointSet2D:
+		return PointSet2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PositionInterpolator:
+		return PositionInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PositionInterpolator2D:
+		return PositionInterpolator2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ProximitySensor2D:
+		return ProximitySensor2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ProximitySensor:
+		return ProximitySensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_QuantizationParameter:
+		return QuantizationParameter_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Rectangle:
+		return Rectangle_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ScalarInterpolator:
+		return ScalarInterpolator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Script:
+		return Script_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Shape:
+		return Shape_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Sound:
+		return Sound_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Sound2D:
+		return Sound2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Sphere:
+		return Sphere_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SphereSensor:
+		return SphereSensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SpotLight:
+		return SpotLight_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Switch:
+		return Switch_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_TermCap:
+		return TermCap_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Text:
+		return Text_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_TextureCoordinate:
+		return TextureCoordinate_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_TextureTransform:
+		return TextureTransform_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_TimeSensor:
+		return TimeSensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_TouchSensor:
+		return TouchSensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Transform:
+		return Transform_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Transform2D:
+		return Transform2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Valuator:
+		return Valuator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Viewpoint:
+		return Viewpoint_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_VisibilitySensor:
+		return VisibilitySensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Viseme:
+		return Viseme_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_WorldInfo:
+		return WorldInfo_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AcousticMaterial:
+		return AcousticMaterial_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AcousticScene:
+		return AcousticScene_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ApplicationWindow:
+		return ApplicationWindow_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_BAP:
+		return BAP_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_BDP:
+		return BDP_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Body:
+		return Body_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_BodyDefTable:
+		return BodyDefTable_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_BodySegmentConnectionHint:
+		return BodySegmentConnectionHint_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_DirectiveSound:
+		return DirectiveSound_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Hierarchical3DMesh:
+		return Hierarchical3DMesh_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MaterialKey:
+		return MaterialKey_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PerceptualParameters:
+		return PerceptualParameters_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_TemporalTransform:
+		return TemporalTransform_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_TemporalGroup:
+		return TemporalGroup_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ServerCommand:
+		return ServerCommand_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_InputSensor:
+		return InputSensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MatteTexture:
+		return MatteTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MediaBuffer:
+		return MediaBuffer_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MediaControl:
+		return MediaControl_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MediaSensor:
+		return MediaSensor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_BitWrapper:
+		return BitWrapper_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_CoordinateInterpolator4D:
+		return CoordinateInterpolator4D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_DepthImage:
+		return DepthImage_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FFD:
+		return FFD_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Implicit:
+		return Implicit_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXLFM_Appearance:
+		return XXLFM_Appearance_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXLFM_BlendList:
+		return XXLFM_BlendList_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXLFM_FrameList:
+		return XXLFM_FrameList_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXLFM_LightMap:
+		return XXLFM_LightMap_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXLFM_SurfaceMapList:
+		return XXLFM_SurfaceMapList_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXLFM_ViewMapList:
+		return XXLFM_ViewMapList_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MeshGrid:
+		return MeshGrid_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_NonLinearDeformer:
+		return NonLinearDeformer_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_NurbsCurve:
+		return NurbsCurve_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_NurbsCurve2D:
+		return NurbsCurve2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_NurbsSurface:
+		return NurbsSurface_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_OctreeImage:
+		return OctreeImage_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXParticles:
+		return XXParticles_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXParticleInitBox:
+		return XXParticleInitBox_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXPlanarObstacle:
+		return XXPlanarObstacle_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XXPointAttractor:
+		return XXPointAttractor_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PointTexture:
+		return PointTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PositionAnimator:
+		return PositionAnimator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PositionAnimator2D:
+		return PositionAnimator2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PositionInterpolator4D:
+		return PositionInterpolator4D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ProceduralTexture:
+		return ProceduralTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Quadric:
+		return Quadric_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SBBone:
+		return SBBone_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SBMuscle:
+		return SBMuscle_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SBSegment:
+		return SBSegment_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SBSite:
+		return SBSite_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SBSkinnedModel:
+		return SBSkinnedModel_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SBVCAnimation:
+		return SBVCAnimation_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ScalarAnimator:
+		return ScalarAnimator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SimpleTexture:
+		return SimpleTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SolidRep:
+		return SolidRep_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SubdivisionSurface:
+		return SubdivisionSurface_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SubdivSurfaceSector:
+		return SubdivSurfaceSector_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_WaveletSubdivisionSurface:
+		return WaveletSubdivisionSurface_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Clipper2D:
+		return Clipper2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ColorTransform:
+		return ColorTransform_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Ellipse:
+		return Ellipse_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_LinearGradient:
+		return LinearGradient_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PathLayout:
+		return PathLayout_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_RadialGradient:
+		return RadialGradient_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SynthesizedTexture:
+		return SynthesizedTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_TransformMatrix2D:
+		return TransformMatrix2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Viewport:
+		return Viewport_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XCurve2D:
+		return XCurve2D_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XFontStyle:
+		return XFontStyle_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_XLineProperties:
+		return XLineProperties_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AdvancedAudioBuffer:
+		return AdvancedAudioBuffer_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_AudioChannelConfig:
+		return AudioChannelConfig_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_DepthImageV2:
+		return DepthImageV2_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MorphShape:
+		return MorphShape_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MultiTexture:
+		return MultiTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_PointTextureV2:
+		return PointTextureV2_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SBVCAnimationV2:
+		return SBVCAnimationV2_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SimpleTextureV2:
+		return SimpleTextureV2_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SurroundingSound:
+		return SurroundingSound_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Transform3DAudio:
+		return Transform3DAudio_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_WideSound:
+		return WideSound_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_ScoreShape:
+		return ScoreShape_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_MusicScore:
+		return MusicScore_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FootPrintSetNode:
+		return FootPrintSetNode_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FootPrintNode:
+		return FootPrintNode_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_BuildingPartNode:
+		return BuildingPartNode_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_RoofNode:
+		return RoofNode_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_FacadeNode:
+		return FacadeNode_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Shadow:
+		return Shadow_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_CacheTexture:
+		return CacheTexture_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_EnvironmentTest:
+		return EnvironmentTest_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_KeyNavigator:
+		return KeyNavigator_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_SpacePartition:
+		return SpacePartition_get_field_index(node, inField, code_mode, fieldIndex);
+	case TAG_MPEG4_Storage:
+		return Storage_get_field_index(node, inField, code_mode, fieldIndex);
 	default:
 		return GF_BAD_PARAM;
 	}
@@ -37735,201 +39295,396 @@
 Bool gf_sg_mpeg4_node_get_aq_info(GF_Node *node, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_MPEG4_Anchor: return Anchor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AnimationStream: return AnimationStream_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Appearance: return Appearance_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AudioBuffer: return AudioBuffer_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AudioClip: return AudioClip_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AudioDelay: return AudioDelay_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AudioFX: return AudioFX_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AudioMix: return AudioMix_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AudioSource: return AudioSource_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AudioSwitch: return AudioSwitch_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Background: return Background_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Background2D: return Background2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Billboard: return Billboard_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Bitmap: return Bitmap_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Box: return Box_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Circle: return Circle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Collision: return Collision_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Color: return Color_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ColorInterpolator: return ColorInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_CompositeTexture2D: return CompositeTexture2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_CompositeTexture3D: return CompositeTexture3D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Conditional: return Conditional_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Cone: return Cone_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Coordinate: return Coordinate_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Coordinate2D: return Coordinate2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_CoordinateInterpolator: return CoordinateInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_CoordinateInterpolator2D: return CoordinateInterpolator2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Curve2D: return Curve2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Cylinder: return Cylinder_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_CylinderSensor: return CylinderSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_DirectionalLight: return DirectionalLight_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_DiscSensor: return DiscSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ElevationGrid: return ElevationGrid_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Expression: return Expression_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Extrusion: return Extrusion_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Face: return Face_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FaceDefMesh: return FaceDefMesh_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FaceDefTables: return FaceDefTables_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FaceDefTransform: return FaceDefTransform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FAP: return FAP_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FDP: return FDP_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FIT: return FIT_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Fog: return Fog_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FontStyle: return FontStyle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Form: return Form_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Group: return Group_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ImageTexture: return ImageTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_IndexedFaceSet: return IndexedFaceSet_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_IndexedFaceSet2D: return IndexedFaceSet2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_IndexedLineSet: return IndexedLineSet_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_IndexedLineSet2D: return IndexedLineSet2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Inline: return Inline_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_LOD: return LOD_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Layer2D: return Layer2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Layer3D: return Layer3D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Layout: return Layout_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_LineProperties: return LineProperties_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ListeningPoint: return ListeningPoint_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Material: return Material_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Material2D: return Material2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MovieTexture: return MovieTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_NavigationInfo: return NavigationInfo_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Normal: return Normal_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_NormalInterpolator: return NormalInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_OrderedGroup: return OrderedGroup_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_OrientationInterpolator: return OrientationInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PixelTexture: return PixelTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PlaneSensor: return PlaneSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PlaneSensor2D: return PlaneSensor2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PointLight: return PointLight_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PointSet: return PointSet_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PointSet2D: return PointSet2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PositionInterpolator: return PositionInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PositionInterpolator2D: return PositionInterpolator2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ProximitySensor2D: return ProximitySensor2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ProximitySensor: return ProximitySensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_QuantizationParameter: return QuantizationParameter_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Rectangle: return Rectangle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ScalarInterpolator: return ScalarInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Script: return Script_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Shape: return Shape_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Sound: return Sound_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Sound2D: return Sound2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Sphere: return Sphere_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SphereSensor: return SphereSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SpotLight: return SpotLight_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Switch: return Switch_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_TermCap: return TermCap_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Text: return Text_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_TextureCoordinate: return TextureCoordinate_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_TextureTransform: return TextureTransform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_TimeSensor: return TimeSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_TouchSensor: return TouchSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Transform: return Transform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Transform2D: return Transform2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Valuator: return Valuator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Viewpoint: return Viewpoint_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_VisibilitySensor: return VisibilitySensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Viseme: return Viseme_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_WorldInfo: return WorldInfo_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AcousticMaterial: return AcousticMaterial_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AcousticScene: return AcousticScene_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ApplicationWindow: return ApplicationWindow_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_BAP: return BAP_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_BDP: return BDP_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Body: return Body_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_BodyDefTable: return BodyDefTable_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_BodySegmentConnectionHint: return BodySegmentConnectionHint_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_DirectiveSound: return DirectiveSound_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Hierarchical3DMesh: return Hierarchical3DMesh_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MaterialKey: return MaterialKey_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PerceptualParameters: return PerceptualParameters_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_TemporalTransform: return TemporalTransform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_TemporalGroup: return TemporalGroup_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ServerCommand: return ServerCommand_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_InputSensor: return InputSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MatteTexture: return MatteTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MediaBuffer: return MediaBuffer_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MediaControl: return MediaControl_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MediaSensor: return MediaSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_BitWrapper: return BitWrapper_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_CoordinateInterpolator4D: return CoordinateInterpolator4D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_DepthImage: return DepthImage_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FFD: return FFD_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Implicit: return Implicit_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXLFM_Appearance: return XXLFM_Appearance_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXLFM_BlendList: return XXLFM_BlendList_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXLFM_FrameList: return XXLFM_FrameList_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXLFM_LightMap: return XXLFM_LightMap_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXLFM_SurfaceMapList: return XXLFM_SurfaceMapList_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXLFM_ViewMapList: return XXLFM_ViewMapList_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MeshGrid: return MeshGrid_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_NonLinearDeformer: return NonLinearDeformer_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_NurbsCurve: return NurbsCurve_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_NurbsCurve2D: return NurbsCurve2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_NurbsSurface: return NurbsSurface_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_OctreeImage: return OctreeImage_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXParticles: return XXParticles_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXParticleInitBox: return XXParticleInitBox_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXPlanarObstacle: return XXPlanarObstacle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XXPointAttractor: return XXPointAttractor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PointTexture: return PointTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PositionAnimator: return PositionAnimator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PositionAnimator2D: return PositionAnimator2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PositionInterpolator4D: return PositionInterpolator4D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ProceduralTexture: return ProceduralTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Quadric: return Quadric_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SBBone: return SBBone_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SBMuscle: return SBMuscle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SBSegment: return SBSegment_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SBSite: return SBSite_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SBSkinnedModel: return SBSkinnedModel_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SBVCAnimation: return SBVCAnimation_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ScalarAnimator: return ScalarAnimator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SimpleTexture: return SimpleTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SolidRep: return SolidRep_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SubdivisionSurface: return SubdivisionSurface_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SubdivSurfaceSector: return SubdivSurfaceSector_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_WaveletSubdivisionSurface: return WaveletSubdivisionSurface_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Clipper2D: return Clipper2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ColorTransform: return ColorTransform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Ellipse: return Ellipse_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_LinearGradient: return LinearGradient_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PathLayout: return PathLayout_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_RadialGradient: return RadialGradient_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SynthesizedTexture: return SynthesizedTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_TransformMatrix2D: return TransformMatrix2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Viewport: return Viewport_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XCurve2D: return XCurve2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XFontStyle: return XFontStyle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_XLineProperties: return XLineProperties_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AdvancedAudioBuffer: return AdvancedAudioBuffer_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_AudioChannelConfig: return AudioChannelConfig_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_DepthImageV2: return DepthImageV2_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MorphShape: return MorphShape_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MultiTexture: return MultiTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_PointTextureV2: return PointTextureV2_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SBVCAnimationV2: return SBVCAnimationV2_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SimpleTextureV2: return SimpleTextureV2_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SurroundingSound: return SurroundingSound_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Transform3DAudio: return Transform3DAudio_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_WideSound: return WideSound_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_ScoreShape: return ScoreShape_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_MusicScore: return MusicScore_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FootPrintSetNode: return FootPrintSetNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FootPrintNode: return FootPrintNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_BuildingPartNode: return BuildingPartNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_RoofNode: return RoofNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_FacadeNode: return FacadeNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Shadow: return Shadow_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_CacheTexture: return CacheTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_EnvironmentTest: return EnvironmentTest_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_KeyNavigator: return KeyNavigator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_SpacePartition: return SpacePartition_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
-	case TAG_MPEG4_Storage: return Storage_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Anchor:
+		return Anchor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AnimationStream:
+		return AnimationStream_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Appearance:
+		return Appearance_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AudioBuffer:
+		return AudioBuffer_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AudioClip:
+		return AudioClip_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AudioDelay:
+		return AudioDelay_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AudioFX:
+		return AudioFX_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AudioMix:
+		return AudioMix_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AudioSource:
+		return AudioSource_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AudioSwitch:
+		return AudioSwitch_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Background:
+		return Background_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Background2D:
+		return Background2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Billboard:
+		return Billboard_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Bitmap:
+		return Bitmap_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Box:
+		return Box_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Circle:
+		return Circle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Collision:
+		return Collision_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Color:
+		return Color_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ColorInterpolator:
+		return ColorInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_CompositeTexture2D:
+		return CompositeTexture2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_CompositeTexture3D:
+		return CompositeTexture3D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Conditional:
+		return Conditional_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Cone:
+		return Cone_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Coordinate:
+		return Coordinate_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Coordinate2D:
+		return Coordinate2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_CoordinateInterpolator:
+		return CoordinateInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_CoordinateInterpolator2D:
+		return CoordinateInterpolator2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Curve2D:
+		return Curve2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Cylinder:
+		return Cylinder_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_CylinderSensor:
+		return CylinderSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_DirectionalLight:
+		return DirectionalLight_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_DiscSensor:
+		return DiscSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ElevationGrid:
+		return ElevationGrid_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Expression:
+		return Expression_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Extrusion:
+		return Extrusion_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Face:
+		return Face_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FaceDefMesh:
+		return FaceDefMesh_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FaceDefTables:
+		return FaceDefTables_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FaceDefTransform:
+		return FaceDefTransform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FAP:
+		return FAP_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FDP:
+		return FDP_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FIT:
+		return FIT_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Fog:
+		return Fog_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FontStyle:
+		return FontStyle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Form:
+		return Form_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Group:
+		return Group_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ImageTexture:
+		return ImageTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_IndexedFaceSet:
+		return IndexedFaceSet_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_IndexedFaceSet2D:
+		return IndexedFaceSet2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_IndexedLineSet:
+		return IndexedLineSet_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_IndexedLineSet2D:
+		return IndexedLineSet2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Inline:
+		return Inline_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_LOD:
+		return LOD_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Layer2D:
+		return Layer2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Layer3D:
+		return Layer3D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Layout:
+		return Layout_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_LineProperties:
+		return LineProperties_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ListeningPoint:
+		return ListeningPoint_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Material:
+		return Material_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Material2D:
+		return Material2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MovieTexture:
+		return MovieTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_NavigationInfo:
+		return NavigationInfo_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Normal:
+		return Normal_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_NormalInterpolator:
+		return NormalInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_OrderedGroup:
+		return OrderedGroup_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_OrientationInterpolator:
+		return OrientationInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PixelTexture:
+		return PixelTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PlaneSensor:
+		return PlaneSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PlaneSensor2D:
+		return PlaneSensor2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PointLight:
+		return PointLight_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PointSet:
+		return PointSet_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PointSet2D:
+		return PointSet2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PositionInterpolator:
+		return PositionInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PositionInterpolator2D:
+		return PositionInterpolator2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ProximitySensor2D:
+		return ProximitySensor2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ProximitySensor:
+		return ProximitySensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_QuantizationParameter:
+		return QuantizationParameter_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Rectangle:
+		return Rectangle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ScalarInterpolator:
+		return ScalarInterpolator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Script:
+		return Script_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Shape:
+		return Shape_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Sound:
+		return Sound_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Sound2D:
+		return Sound2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Sphere:
+		return Sphere_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SphereSensor:
+		return SphereSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SpotLight:
+		return SpotLight_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Switch:
+		return Switch_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_TermCap:
+		return TermCap_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Text:
+		return Text_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_TextureCoordinate:
+		return TextureCoordinate_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_TextureTransform:
+		return TextureTransform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_TimeSensor:
+		return TimeSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_TouchSensor:
+		return TouchSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Transform:
+		return Transform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Transform2D:
+		return Transform2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Valuator:
+		return Valuator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Viewpoint:
+		return Viewpoint_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_VisibilitySensor:
+		return VisibilitySensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Viseme:
+		return Viseme_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_WorldInfo:
+		return WorldInfo_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AcousticMaterial:
+		return AcousticMaterial_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AcousticScene:
+		return AcousticScene_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ApplicationWindow:
+		return ApplicationWindow_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_BAP:
+		return BAP_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_BDP:
+		return BDP_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Body:
+		return Body_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_BodyDefTable:
+		return BodyDefTable_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_BodySegmentConnectionHint:
+		return BodySegmentConnectionHint_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_DirectiveSound:
+		return DirectiveSound_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Hierarchical3DMesh:
+		return Hierarchical3DMesh_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MaterialKey:
+		return MaterialKey_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PerceptualParameters:
+		return PerceptualParameters_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_TemporalTransform:
+		return TemporalTransform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_TemporalGroup:
+		return TemporalGroup_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ServerCommand:
+		return ServerCommand_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_InputSensor:
+		return InputSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MatteTexture:
+		return MatteTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MediaBuffer:
+		return MediaBuffer_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MediaControl:
+		return MediaControl_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MediaSensor:
+		return MediaSensor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_BitWrapper:
+		return BitWrapper_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_CoordinateInterpolator4D:
+		return CoordinateInterpolator4D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_DepthImage:
+		return DepthImage_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FFD:
+		return FFD_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Implicit:
+		return Implicit_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXLFM_Appearance:
+		return XXLFM_Appearance_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXLFM_BlendList:
+		return XXLFM_BlendList_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXLFM_FrameList:
+		return XXLFM_FrameList_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXLFM_LightMap:
+		return XXLFM_LightMap_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXLFM_SurfaceMapList:
+		return XXLFM_SurfaceMapList_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXLFM_ViewMapList:
+		return XXLFM_ViewMapList_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MeshGrid:
+		return MeshGrid_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_NonLinearDeformer:
+		return NonLinearDeformer_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_NurbsCurve:
+		return NurbsCurve_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_NurbsCurve2D:
+		return NurbsCurve2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_NurbsSurface:
+		return NurbsSurface_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_OctreeImage:
+		return OctreeImage_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXParticles:
+		return XXParticles_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXParticleInitBox:
+		return XXParticleInitBox_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXPlanarObstacle:
+		return XXPlanarObstacle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XXPointAttractor:
+		return XXPointAttractor_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PointTexture:
+		return PointTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PositionAnimator:
+		return PositionAnimator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PositionAnimator2D:
+		return PositionAnimator2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PositionInterpolator4D:
+		return PositionInterpolator4D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ProceduralTexture:
+		return ProceduralTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Quadric:
+		return Quadric_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SBBone:
+		return SBBone_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SBMuscle:
+		return SBMuscle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SBSegment:
+		return SBSegment_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SBSite:
+		return SBSite_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SBSkinnedModel:
+		return SBSkinnedModel_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SBVCAnimation:
+		return SBVCAnimation_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ScalarAnimator:
+		return ScalarAnimator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SimpleTexture:
+		return SimpleTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SolidRep:
+		return SolidRep_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SubdivisionSurface:
+		return SubdivisionSurface_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SubdivSurfaceSector:
+		return SubdivSurfaceSector_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_WaveletSubdivisionSurface:
+		return WaveletSubdivisionSurface_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Clipper2D:
+		return Clipper2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ColorTransform:
+		return ColorTransform_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Ellipse:
+		return Ellipse_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_LinearGradient:
+		return LinearGradient_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PathLayout:
+		return PathLayout_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_RadialGradient:
+		return RadialGradient_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SynthesizedTexture:
+		return SynthesizedTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_TransformMatrix2D:
+		return TransformMatrix2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Viewport:
+		return Viewport_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XCurve2D:
+		return XCurve2D_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XFontStyle:
+		return XFontStyle_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_XLineProperties:
+		return XLineProperties_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AdvancedAudioBuffer:
+		return AdvancedAudioBuffer_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_AudioChannelConfig:
+		return AudioChannelConfig_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_DepthImageV2:
+		return DepthImageV2_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MorphShape:
+		return MorphShape_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MultiTexture:
+		return MultiTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_PointTextureV2:
+		return PointTextureV2_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SBVCAnimationV2:
+		return SBVCAnimationV2_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SimpleTextureV2:
+		return SimpleTextureV2_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SurroundingSound:
+		return SurroundingSound_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Transform3DAudio:
+		return Transform3DAudio_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_WideSound:
+		return WideSound_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_ScoreShape:
+		return ScoreShape_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_MusicScore:
+		return MusicScore_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FootPrintSetNode:
+		return FootPrintSetNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FootPrintNode:
+		return FootPrintNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_BuildingPartNode:
+		return BuildingPartNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_RoofNode:
+		return RoofNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_FacadeNode:
+		return FacadeNode_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Shadow:
+		return Shadow_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_CacheTexture:
+		return CacheTexture_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_EnvironmentTest:
+		return EnvironmentTest_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_KeyNavigator:
+		return KeyNavigator_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_SpacePartition:
+		return SpacePartition_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
+	case TAG_MPEG4_Storage:
+		return Storage_get_aq_info(node, FieldIndex, QType, AType, b_min, b_max, QT13_bits);
 	default:
 		return 0;
 	}
@@ -37938,59 +39693,112 @@
 u32 gf_sg_mpeg4_node_get_child_ndt(GF_Node *node)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_MPEG4_Anchor: return NDT_SF3DNode;
-	case TAG_MPEG4_AudioBuffer: return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioDelay: return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioFX: return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioMix: return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioSource: return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioSwitch: return NDT_SFAudioNode;
-	case TAG_MPEG4_Billboard: return NDT_SF3DNode;
-	case TAG_MPEG4_Collision: return NDT_SF3DNode;
-	case TAG_MPEG4_CompositeTexture2D: return NDT_SF2DNode;
-	case TAG_MPEG4_CompositeTexture3D: return NDT_SF3DNode;
-	case TAG_MPEG4_Face: return NDT_SF3DNode;
-	case TAG_MPEG4_FaceDefTables: return NDT_SFFaceDefMeshNode;
-	case TAG_MPEG4_FDP: return NDT_SFFaceDefTablesNode;
-	case TAG_MPEG4_Form: return NDT_SF2DNode;
-	case TAG_MPEG4_Group: return NDT_SF3DNode;
-	case TAG_MPEG4_LOD: return NDT_SF3DNode;
-	case TAG_MPEG4_Layer2D: return NDT_SF2DNode;
-	case TAG_MPEG4_Layer3D: return NDT_SF3DNode;
-	case TAG_MPEG4_Layout: return NDT_SF2DNode;
-	case TAG_MPEG4_OrderedGroup: return NDT_SF3DNode;
-	case TAG_MPEG4_Switch: return NDT_SF3DNode;
-	case TAG_MPEG4_Transform: return NDT_SF3DNode;
-	case TAG_MPEG4_Transform2D: return NDT_SF2DNode;
-	case TAG_MPEG4_BDP: return NDT_SFBodyDefTableNode;
-	case TAG_MPEG4_Body: return NDT_SF3DNode;
-	case TAG_MPEG4_TemporalTransform: return NDT_SF3DNode;
-	case TAG_MPEG4_TemporalGroup: return NDT_SFTemporalNode;
-	case TAG_MPEG4_FFD: return NDT_SF3DNode;
-	case TAG_MPEG4_XXLFM_Appearance: return NDT_SFLightMapNode;
-	case TAG_MPEG4_OctreeImage: return NDT_SFDepthImageNode;
-	case TAG_MPEG4_XXParticles: return NDT_SFInfluenceNode;
-	case TAG_MPEG4_SBBone: return NDT_SF3DNode;
-	case TAG_MPEG4_SBSegment: return NDT_SF3DNode;
-	case TAG_MPEG4_SBSite: return NDT_SF3DNode;
-	case TAG_MPEG4_SBSkinnedModel: return NDT_SFSBBoneNode;
-	case TAG_MPEG4_SBVCAnimation: return NDT_SF3DNode;
-	case TAG_MPEG4_SubdivisionSurface: return NDT_SFSubdivSurfaceSectorNode;
-	case TAG_MPEG4_Clipper2D: return NDT_SF2DNode;
-	case TAG_MPEG4_ColorTransform: return NDT_SF3DNode;
-	case TAG_MPEG4_PathLayout: return NDT_SF2DNode;
-	case TAG_MPEG4_TransformMatrix2D: return NDT_SF2DNode;
-	case TAG_MPEG4_AdvancedAudioBuffer: return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioChannelConfig: return NDT_SFAudioNode;
-	case TAG_MPEG4_MorphShape: return NDT_SF3DNode;
-	case TAG_MPEG4_MultiTexture: return NDT_SFTextureNode;
-	case TAG_MPEG4_SBVCAnimationV2: return NDT_SF3DNode;
-	case TAG_MPEG4_Transform3DAudio: return NDT_SF3DNode;
-	case TAG_MPEG4_FootPrintSetNode: return NDT_SFGeometryNode;
-	case TAG_MPEG4_BuildingPartNode: return NDT_SFGeometryNode;
-	case TAG_MPEG4_FacadeNode: return NDT_SFGeometryNode;
-	case TAG_MPEG4_Shadow: return NDT_SF3DNode;
-	case TAG_MPEG4_SpacePartition: return NDT_SF3DNode;
+	case TAG_MPEG4_Anchor:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_AudioBuffer:
+		return NDT_SFAudioNode;
+	case TAG_MPEG4_AudioDelay:
+		return NDT_SFAudioNode;
+	case TAG_MPEG4_AudioFX:
+		return NDT_SFAudioNode;
+	case TAG_MPEG4_AudioMix:
+		return NDT_SFAudioNode;
+	case TAG_MPEG4_AudioSource:
+		return NDT_SFAudioNode;
+	case TAG_MPEG4_AudioSwitch:
+		return NDT_SFAudioNode;
+	case TAG_MPEG4_Billboard:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_Collision:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_CompositeTexture2D:
+		return NDT_SF2DNode;
+	case TAG_MPEG4_CompositeTexture3D:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_Face:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_FaceDefTables:
+		return NDT_SFFaceDefMeshNode;
+	case TAG_MPEG4_FDP:
+		return NDT_SFFaceDefTablesNode;
+	case TAG_MPEG4_Form:
+		return NDT_SF2DNode;
+	case TAG_MPEG4_Group:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_LOD:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_Layer2D:
+		return NDT_SF2DNode;
+	case TAG_MPEG4_Layer3D:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_Layout:
+		return NDT_SF2DNode;
+	case TAG_MPEG4_OrderedGroup:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_Switch:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_Transform:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_Transform2D:
+		return NDT_SF2DNode;
+	case TAG_MPEG4_BDP:
+		return NDT_SFBodyDefTableNode;
+	case TAG_MPEG4_Body:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_TemporalTransform:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_TemporalGroup:
+		return NDT_SFTemporalNode;
+	case TAG_MPEG4_FFD:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_XXLFM_Appearance:
+		return NDT_SFLightMapNode;
+	case TAG_MPEG4_OctreeImage:
+		return NDT_SFDepthImageNode;
+	case TAG_MPEG4_XXParticles:
+		return NDT_SFInfluenceNode;
+	case TAG_MPEG4_SBBone:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_SBSegment:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_SBSite:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_SBSkinnedModel:
+		return NDT_SFSBBoneNode;
+	case TAG_MPEG4_SBVCAnimation:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_SubdivisionSurface:
+		return NDT_SFSubdivSurfaceSectorNode;
+	case TAG_MPEG4_Clipper2D:
+		return NDT_SF2DNode;
+	case TAG_MPEG4_ColorTransform:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_PathLayout:
+		return NDT_SF2DNode;
+	case TAG_MPEG4_TransformMatrix2D:
+		return NDT_SF2DNode;
+	case TAG_MPEG4_AdvancedAudioBuffer:
+		return NDT_SFAudioNode;
+	case TAG_MPEG4_AudioChannelConfig:
+		return NDT_SFAudioNode;
+	case TAG_MPEG4_MorphShape:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_MultiTexture:
+		return NDT_SFTextureNode;
+	case TAG_MPEG4_SBVCAnimationV2:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_Transform3DAudio:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_FootPrintSetNode:
+		return NDT_SFGeometryNode;
+	case TAG_MPEG4_BuildingPartNode:
+		return NDT_SFGeometryNode;
+	case TAG_MPEG4_FacadeNode:
+		return NDT_SFGeometryNode;
+	case TAG_MPEG4_Shadow:
+		return NDT_SF3DNode;
+	case TAG_MPEG4_SpacePartition:
+		return NDT_SF3DNode;
 	default:
 		return 0;
 	}
@@ -38202,201 +40010,396 @@
 s32 gf_sg_mpeg4_node_get_field_index_by_name(GF_Node *node, char *name)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_MPEG4_Anchor: return Anchor_get_field_index_by_name(name);
-	case TAG_MPEG4_AnimationStream: return AnimationStream_get_field_index_by_name(name);
-	case TAG_MPEG4_Appearance: return Appearance_get_field_index_by_name(name);
-	case TAG_MPEG4_AudioBuffer: return AudioBuffer_get_field_index_by_name(name);
-	case TAG_MPEG4_AudioClip: return AudioClip_get_field_index_by_name(name);
-	case TAG_MPEG4_AudioDelay: return AudioDelay_get_field_index_by_name(name);
-	case TAG_MPEG4_AudioFX: return AudioFX_get_field_index_by_name(name);
-	case TAG_MPEG4_AudioMix: return AudioMix_get_field_index_by_name(name);
-	case TAG_MPEG4_AudioSource: return AudioSource_get_field_index_by_name(name);
-	case TAG_MPEG4_AudioSwitch: return AudioSwitch_get_field_index_by_name(name);
-	case TAG_MPEG4_Background: return Background_get_field_index_by_name(name);
-	case TAG_MPEG4_Background2D: return Background2D_get_field_index_by_name(name);
-	case TAG_MPEG4_Billboard: return Billboard_get_field_index_by_name(name);
-	case TAG_MPEG4_Bitmap: return Bitmap_get_field_index_by_name(name);
-	case TAG_MPEG4_Box: return Box_get_field_index_by_name(name);
-	case TAG_MPEG4_Circle: return Circle_get_field_index_by_name(name);
-	case TAG_MPEG4_Collision: return Collision_get_field_index_by_name(name);
-	case TAG_MPEG4_Color: return Color_get_field_index_by_name(name);
-	case TAG_MPEG4_ColorInterpolator: return ColorInterpolator_get_field_index_by_name(name);
-	case TAG_MPEG4_CompositeTexture2D: return CompositeTexture2D_get_field_index_by_name(name);
-	case TAG_MPEG4_CompositeTexture3D: return CompositeTexture3D_get_field_index_by_name(name);
-	case TAG_MPEG4_Conditional: return Conditional_get_field_index_by_name(name);
-	case TAG_MPEG4_Cone: return Cone_get_field_index_by_name(name);
-	case TAG_MPEG4_Coordinate: return Coordinate_get_field_index_by_name(name);
-	case TAG_MPEG4_Coordinate2D: return Coordinate2D_get_field_index_by_name(name);
-	case TAG_MPEG4_CoordinateInterpolator: return CoordinateInterpolator_get_field_index_by_name(name);
-	case TAG_MPEG4_CoordinateInterpolator2D: return CoordinateInterpolator2D_get_field_index_by_name(name);
-	case TAG_MPEG4_Curve2D: return Curve2D_get_field_index_by_name(name);
-	case TAG_MPEG4_Cylinder: return Cylinder_get_field_index_by_name(name);
-	case TAG_MPEG4_CylinderSensor: return CylinderSensor_get_field_index_by_name(name);
-	case TAG_MPEG4_DirectionalLight: return DirectionalLight_get_field_index_by_name(name);
-	case TAG_MPEG4_DiscSensor: return DiscSensor_get_field_index_by_name(name);
-	case TAG_MPEG4_ElevationGrid: return ElevationGrid_get_field_index_by_name(name);
-	case TAG_MPEG4_Expression: return Expression_get_field_index_by_name(name);
-	case TAG_MPEG4_Extrusion: return Extrusion_get_field_index_by_name(name);
-	case TAG_MPEG4_Face: return Face_get_field_index_by_name(name);
-	case TAG_MPEG4_FaceDefMesh: return FaceDefMesh_get_field_index_by_name(name);
-	case TAG_MPEG4_FaceDefTables: return FaceDefTables_get_field_index_by_name(name);
-	case TAG_MPEG4_FaceDefTransform: return FaceDefTransform_get_field_index_by_name(name);
-	case TAG_MPEG4_FAP: return FAP_get_field_index_by_name(name);
-	case TAG_MPEG4_FDP: return FDP_get_field_index_by_name(name);
-	case TAG_MPEG4_FIT: return FIT_get_field_index_by_name(name);
-	case TAG_MPEG4_Fog: return Fog_get_field_index_by_name(name);
-	case TAG_MPEG4_FontStyle: return FontStyle_get_field_index_by_name(name);
-	case TAG_MPEG4_Form: return Form_get_field_index_by_name(name);
-	case TAG_MPEG4_Group: return Group_get_field_index_by_name(name);
-	case TAG_MPEG4_ImageTexture: return ImageTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_IndexedFaceSet: return IndexedFaceSet_get_field_index_by_name(name);
-	case TAG_MPEG4_IndexedFaceSet2D: return IndexedFaceSet2D_get_field_index_by_name(name);
-	case TAG_MPEG4_IndexedLineSet: return IndexedLineSet_get_field_index_by_name(name);
-	case TAG_MPEG4_IndexedLineSet2D: return IndexedLineSet2D_get_field_index_by_name(name);
-	case TAG_MPEG4_Inline: return Inline_get_field_index_by_name(name);
-	case TAG_MPEG4_LOD: return LOD_get_field_index_by_name(name);
-	case TAG_MPEG4_Layer2D: return Layer2D_get_field_index_by_name(name);
-	case TAG_MPEG4_Layer3D: return Layer3D_get_field_index_by_name(name);
-	case TAG_MPEG4_Layout: return Layout_get_field_index_by_name(name);
-	case TAG_MPEG4_LineProperties: return LineProperties_get_field_index_by_name(name);
-	case TAG_MPEG4_ListeningPoint: return ListeningPoint_get_field_index_by_name(name);
-	case TAG_MPEG4_Material: return Material_get_field_index_by_name(name);
-	case TAG_MPEG4_Material2D: return Material2D_get_field_index_by_name(name);
-	case TAG_MPEG4_MovieTexture: return MovieTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_NavigationInfo: return NavigationInfo_get_field_index_by_name(name);
-	case TAG_MPEG4_Normal: return Normal_get_field_index_by_name(name);
-	case TAG_MPEG4_NormalInterpolator: return NormalInterpolator_get_field_index_by_name(name);
-	case TAG_MPEG4_OrderedGroup: return OrderedGroup_get_field_index_by_name(name);
-	case TAG_MPEG4_OrientationInterpolator: return OrientationInterpolator_get_field_index_by_name(name);
-	case TAG_MPEG4_PixelTexture: return PixelTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_PlaneSensor: return PlaneSensor_get_field_index_by_name(name);
-	case TAG_MPEG4_PlaneSensor2D: return PlaneSensor2D_get_field_index_by_name(name);
-	case TAG_MPEG4_PointLight: return PointLight_get_field_index_by_name(name);
-	case TAG_MPEG4_PointSet: return PointSet_get_field_index_by_name(name);
-	case TAG_MPEG4_PointSet2D: return PointSet2D_get_field_index_by_name(name);
-	case TAG_MPEG4_PositionInterpolator: return PositionInterpolator_get_field_index_by_name(name);
-	case TAG_MPEG4_PositionInterpolator2D: return PositionInterpolator2D_get_field_index_by_name(name);
-	case TAG_MPEG4_ProximitySensor2D: return ProximitySensor2D_get_field_index_by_name(name);
-	case TAG_MPEG4_ProximitySensor: return ProximitySensor_get_field_index_by_name(name);
-	case TAG_MPEG4_QuantizationParameter: return QuantizationParameter_get_field_index_by_name(name);
-	case TAG_MPEG4_Rectangle: return Rectangle_get_field_index_by_name(name);
-	case TAG_MPEG4_ScalarInterpolator: return ScalarInterpolator_get_field_index_by_name(name);
-	case TAG_MPEG4_Script: return Script_get_field_index_by_name(name);
-	case TAG_MPEG4_Shape: return Shape_get_field_index_by_name(name);
-	case TAG_MPEG4_Sound: return Sound_get_field_index_by_name(name);
-	case TAG_MPEG4_Sound2D: return Sound2D_get_field_index_by_name(name);
-	case TAG_MPEG4_Sphere: return Sphere_get_field_index_by_name(name);
-	case TAG_MPEG4_SphereSensor: return SphereSensor_get_field_index_by_name(name);
-	case TAG_MPEG4_SpotLight: return SpotLight_get_field_index_by_name(name);
-	case TAG_MPEG4_Switch: return Switch_get_field_index_by_name(name);
-	case TAG_MPEG4_TermCap: return TermCap_get_field_index_by_name(name);
-	case TAG_MPEG4_Text: return Text_get_field_index_by_name(name);
-	case TAG_MPEG4_TextureCoordinate: return TextureCoordinate_get_field_index_by_name(name);
-	case TAG_MPEG4_TextureTransform: return TextureTransform_get_field_index_by_name(name);
-	case TAG_MPEG4_TimeSensor: return TimeSensor_get_field_index_by_name(name);
-	case TAG_MPEG4_TouchSensor: return TouchSensor_get_field_index_by_name(name);
-	case TAG_MPEG4_Transform: return Transform_get_field_index_by_name(name);
-	case TAG_MPEG4_Transform2D: return Transform2D_get_field_index_by_name(name);
-	case TAG_MPEG4_Valuator: return Valuator_get_field_index_by_name(name);
-	case TAG_MPEG4_Viewpoint: return Viewpoint_get_field_index_by_name(name);
-	case TAG_MPEG4_VisibilitySensor: return VisibilitySensor_get_field_index_by_name(name);
-	case TAG_MPEG4_Viseme: return Viseme_get_field_index_by_name(name);
-	case TAG_MPEG4_WorldInfo: return WorldInfo_get_field_index_by_name(name);
-	case TAG_MPEG4_AcousticMaterial: return AcousticMaterial_get_field_index_by_name(name);
-	case TAG_MPEG4_AcousticScene: return AcousticScene_get_field_index_by_name(name);
-	case TAG_MPEG4_ApplicationWindow: return ApplicationWindow_get_field_index_by_name(name);
-	case TAG_MPEG4_BAP: return BAP_get_field_index_by_name(name);
-	case TAG_MPEG4_BDP: return BDP_get_field_index_by_name(name);
-	case TAG_MPEG4_Body: return Body_get_field_index_by_name(name);
-	case TAG_MPEG4_BodyDefTable: return BodyDefTable_get_field_index_by_name(name);
-	case TAG_MPEG4_BodySegmentConnectionHint: return BodySegmentConnectionHint_get_field_index_by_name(name);
-	case TAG_MPEG4_DirectiveSound: return DirectiveSound_get_field_index_by_name(name);
-	case TAG_MPEG4_Hierarchical3DMesh: return Hierarchical3DMesh_get_field_index_by_name(name);
-	case TAG_MPEG4_MaterialKey: return MaterialKey_get_field_index_by_name(name);
-	case TAG_MPEG4_PerceptualParameters: return PerceptualParameters_get_field_index_by_name(name);
-	case TAG_MPEG4_TemporalTransform: return TemporalTransform_get_field_index_by_name(name);
-	case TAG_MPEG4_TemporalGroup: return TemporalGroup_get_field_index_by_name(name);
-	case TAG_MPEG4_ServerCommand: return ServerCommand_get_field_index_by_name(name);
-	case TAG_MPEG4_InputSensor: return InputSensor_get_field_index_by_name(name);
-	case TAG_MPEG4_MatteTexture: return MatteTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_MediaBuffer: return MediaBuffer_get_field_index_by_name(name);
-	case TAG_MPEG4_MediaControl: return MediaControl_get_field_index_by_name(name);
-	case TAG_MPEG4_MediaSensor: return MediaSensor_get_field_index_by_name(name);
-	case TAG_MPEG4_BitWrapper: return BitWrapper_get_field_index_by_name(name);
-	case TAG_MPEG4_CoordinateInterpolator4D: return CoordinateInterpolator4D_get_field_index_by_name(name);
-	case TAG_MPEG4_DepthImage: return DepthImage_get_field_index_by_name(name);
-	case TAG_MPEG4_FFD: return FFD_get_field_index_by_name(name);
-	case TAG_MPEG4_Implicit: return Implicit_get_field_index_by_name(name);
-	case TAG_MPEG4_XXLFM_Appearance: return XXLFM_Appearance_get_field_index_by_name(name);
-	case TAG_MPEG4_XXLFM_BlendList: return XXLFM_BlendList_get_field_index_by_name(name);
-	case TAG_MPEG4_XXLFM_FrameList: return XXLFM_FrameList_get_field_index_by_name(name);
-	case TAG_MPEG4_XXLFM_LightMap: return XXLFM_LightMap_get_field_index_by_name(name);
-	case TAG_MPEG4_XXLFM_SurfaceMapList: return XXLFM_SurfaceMapList_get_field_index_by_name(name);
-	case TAG_MPEG4_XXLFM_ViewMapList: return XXLFM_ViewMapList_get_field_index_by_name(name);
-	case TAG_MPEG4_MeshGrid: return MeshGrid_get_field_index_by_name(name);
-	case TAG_MPEG4_NonLinearDeformer: return NonLinearDeformer_get_field_index_by_name(name);
-	case TAG_MPEG4_NurbsCurve: return NurbsCurve_get_field_index_by_name(name);
-	case TAG_MPEG4_NurbsCurve2D: return NurbsCurve2D_get_field_index_by_name(name);
-	case TAG_MPEG4_NurbsSurface: return NurbsSurface_get_field_index_by_name(name);
-	case TAG_MPEG4_OctreeImage: return OctreeImage_get_field_index_by_name(name);
-	case TAG_MPEG4_XXParticles: return XXParticles_get_field_index_by_name(name);
-	case TAG_MPEG4_XXParticleInitBox: return XXParticleInitBox_get_field_index_by_name(name);
-	case TAG_MPEG4_XXPlanarObstacle: return XXPlanarObstacle_get_field_index_by_name(name);
-	case TAG_MPEG4_XXPointAttractor: return XXPointAttractor_get_field_index_by_name(name);
-	case TAG_MPEG4_PointTexture: return PointTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_PositionAnimator: return PositionAnimator_get_field_index_by_name(name);
-	case TAG_MPEG4_PositionAnimator2D: return PositionAnimator2D_get_field_index_by_name(name);
-	case TAG_MPEG4_PositionInterpolator4D: return PositionInterpolator4D_get_field_index_by_name(name);
-	case TAG_MPEG4_ProceduralTexture: return ProceduralTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_Quadric: return Quadric_get_field_index_by_name(name);
-	case TAG_MPEG4_SBBone: return SBBone_get_field_index_by_name(name);
-	case TAG_MPEG4_SBMuscle: return SBMuscle_get_field_index_by_name(name);
-	case TAG_MPEG4_SBSegment: return SBSegment_get_field_index_by_name(name);
-	case TAG_MPEG4_SBSite: return SBSite_get_field_index_by_name(name);
-	case TAG_MPEG4_SBSkinnedModel: return SBSkinnedModel_get_field_index_by_name(name);
-	case TAG_MPEG4_SBVCAnimation: return SBVCAnimation_get_field_index_by_name(name);
-	case TAG_MPEG4_ScalarAnimator: return ScalarAnimator_get_field_index_by_name(name);
-	case TAG_MPEG4_SimpleTexture: return SimpleTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_SolidRep: return SolidRep_get_field_index_by_name(name);
-	case TAG_MPEG4_SubdivisionSurface: return SubdivisionSurface_get_field_index_by_name(name);
-	case TAG_MPEG4_SubdivSurfaceSector: return SubdivSurfaceSector_get_field_index_by_name(name);
-	case TAG_MPEG4_WaveletSubdivisionSurface: return WaveletSubdivisionSurface_get_field_index_by_name(name);
-	case TAG_MPEG4_Clipper2D: return Clipper2D_get_field_index_by_name(name);
-	case TAG_MPEG4_ColorTransform: return ColorTransform_get_field_index_by_name(name);
-	case TAG_MPEG4_Ellipse: return Ellipse_get_field_index_by_name(name);
-	case TAG_MPEG4_LinearGradient: return LinearGradient_get_field_index_by_name(name);
-	case TAG_MPEG4_PathLayout: return PathLayout_get_field_index_by_name(name);
-	case TAG_MPEG4_RadialGradient: return RadialGradient_get_field_index_by_name(name);
-	case TAG_MPEG4_SynthesizedTexture: return SynthesizedTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_TransformMatrix2D: return TransformMatrix2D_get_field_index_by_name(name);
-	case TAG_MPEG4_Viewport: return Viewport_get_field_index_by_name(name);
-	case TAG_MPEG4_XCurve2D: return XCurve2D_get_field_index_by_name(name);
-	case TAG_MPEG4_XFontStyle: return XFontStyle_get_field_index_by_name(name);
-	case TAG_MPEG4_XLineProperties: return XLineProperties_get_field_index_by_name(name);
-	case TAG_MPEG4_AdvancedAudioBuffer: return AdvancedAudioBuffer_get_field_index_by_name(name);
-	case TAG_MPEG4_AudioChannelConfig: return AudioChannelConfig_get_field_index_by_name(name);
-	case TAG_MPEG4_DepthImageV2: return DepthImageV2_get_field_index_by_name(name);
-	case TAG_MPEG4_MorphShape: return MorphShape_get_field_index_by_name(name);
-	case TAG_MPEG4_MultiTexture: return MultiTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_PointTextureV2: return PointTextureV2_get_field_index_by_name(name);
-	case TAG_MPEG4_SBVCAnimationV2: return SBVCAnimationV2_get_field_index_by_name(name);
-	case TAG_MPEG4_SimpleTextureV2: return SimpleTextureV2_get_field_index_by_name(name);
-	case TAG_MPEG4_SurroundingSound: return SurroundingSound_get_field_index_by_name(name);
-	case TAG_MPEG4_Transform3DAudio: return Transform3DAudio_get_field_index_by_name(name);
-	case TAG_MPEG4_WideSound: return WideSound_get_field_index_by_name(name);
-	case TAG_MPEG4_ScoreShape: return ScoreShape_get_field_index_by_name(name);
-	case TAG_MPEG4_MusicScore: return MusicScore_get_field_index_by_name(name);
-	case TAG_MPEG4_FootPrintSetNode: return FootPrintSetNode_get_field_index_by_name(name);
-	case TAG_MPEG4_FootPrintNode: return FootPrintNode_get_field_index_by_name(name);
-	case TAG_MPEG4_BuildingPartNode: return BuildingPartNode_get_field_index_by_name(name);
-	case TAG_MPEG4_RoofNode: return RoofNode_get_field_index_by_name(name);
-	case TAG_MPEG4_FacadeNode: return FacadeNode_get_field_index_by_name(name);
-	case TAG_MPEG4_Shadow: return Shadow_get_field_index_by_name(name);
-	case TAG_MPEG4_CacheTexture: return CacheTexture_get_field_index_by_name(name);
-	case TAG_MPEG4_EnvironmentTest: return EnvironmentTest_get_field_index_by_name(name);
-	case TAG_MPEG4_KeyNavigator: return KeyNavigator_get_field_index_by_name(name);
-	case TAG_MPEG4_SpacePartition: return SpacePartition_get_field_index_by_name(name);
-	case TAG_MPEG4_Storage: return Storage_get_field_index_by_name(name);
+	case TAG_MPEG4_Anchor:
+		return Anchor_get_field_index_by_name(name);
+	case TAG_MPEG4_AnimationStream:
+		return AnimationStream_get_field_index_by_name(name);
+	case TAG_MPEG4_Appearance:
+		return Appearance_get_field_index_by_name(name);
+	case TAG_MPEG4_AudioBuffer:
+		return AudioBuffer_get_field_index_by_name(name);
+	case TAG_MPEG4_AudioClip:
+		return AudioClip_get_field_index_by_name(name);
+	case TAG_MPEG4_AudioDelay:
+		return AudioDelay_get_field_index_by_name(name);
+	case TAG_MPEG4_AudioFX:
+		return AudioFX_get_field_index_by_name(name);
+	case TAG_MPEG4_AudioMix:
+		return AudioMix_get_field_index_by_name(name);
+	case TAG_MPEG4_AudioSource:
+		return AudioSource_get_field_index_by_name(name);
+	case TAG_MPEG4_AudioSwitch:
+		return AudioSwitch_get_field_index_by_name(name);
+	case TAG_MPEG4_Background:
+		return Background_get_field_index_by_name(name);
+	case TAG_MPEG4_Background2D:
+		return Background2D_get_field_index_by_name(name);
+	case TAG_MPEG4_Billboard:
+		return Billboard_get_field_index_by_name(name);
+	case TAG_MPEG4_Bitmap:
+		return Bitmap_get_field_index_by_name(name);
+	case TAG_MPEG4_Box:
+		return Box_get_field_index_by_name(name);
+	case TAG_MPEG4_Circle:
+		return Circle_get_field_index_by_name(name);
+	case TAG_MPEG4_Collision:
+		return Collision_get_field_index_by_name(name);
+	case TAG_MPEG4_Color:
+		return Color_get_field_index_by_name(name);
+	case TAG_MPEG4_ColorInterpolator:
+		return ColorInterpolator_get_field_index_by_name(name);
+	case TAG_MPEG4_CompositeTexture2D:
+		return CompositeTexture2D_get_field_index_by_name(name);
+	case TAG_MPEG4_CompositeTexture3D:
+		return CompositeTexture3D_get_field_index_by_name(name);
+	case TAG_MPEG4_Conditional:
+		return Conditional_get_field_index_by_name(name);
+	case TAG_MPEG4_Cone:
+		return Cone_get_field_index_by_name(name);
+	case TAG_MPEG4_Coordinate:
+		return Coordinate_get_field_index_by_name(name);
+	case TAG_MPEG4_Coordinate2D:
+		return Coordinate2D_get_field_index_by_name(name);
+	case TAG_MPEG4_CoordinateInterpolator:
+		return CoordinateInterpolator_get_field_index_by_name(name);
+	case TAG_MPEG4_CoordinateInterpolator2D:
+		return CoordinateInterpolator2D_get_field_index_by_name(name);
+	case TAG_MPEG4_Curve2D:
+		return Curve2D_get_field_index_by_name(name);
+	case TAG_MPEG4_Cylinder:
+		return Cylinder_get_field_index_by_name(name);
+	case TAG_MPEG4_CylinderSensor:
+		return CylinderSensor_get_field_index_by_name(name);
+	case TAG_MPEG4_DirectionalLight:
+		return DirectionalLight_get_field_index_by_name(name);
+	case TAG_MPEG4_DiscSensor:
+		return DiscSensor_get_field_index_by_name(name);
+	case TAG_MPEG4_ElevationGrid:
+		return ElevationGrid_get_field_index_by_name(name);
+	case TAG_MPEG4_Expression:
+		return Expression_get_field_index_by_name(name);
+	case TAG_MPEG4_Extrusion:
+		return Extrusion_get_field_index_by_name(name);
+	case TAG_MPEG4_Face:
+		return Face_get_field_index_by_name(name);
+	case TAG_MPEG4_FaceDefMesh:
+		return FaceDefMesh_get_field_index_by_name(name);
+	case TAG_MPEG4_FaceDefTables:
+		return FaceDefTables_get_field_index_by_name(name);
+	case TAG_MPEG4_FaceDefTransform:
+		return FaceDefTransform_get_field_index_by_name(name);
+	case TAG_MPEG4_FAP:
+		return FAP_get_field_index_by_name(name);
+	case TAG_MPEG4_FDP:
+		return FDP_get_field_index_by_name(name);
+	case TAG_MPEG4_FIT:
+		return FIT_get_field_index_by_name(name);
+	case TAG_MPEG4_Fog:
+		return Fog_get_field_index_by_name(name);
+	case TAG_MPEG4_FontStyle:
+		return FontStyle_get_field_index_by_name(name);
+	case TAG_MPEG4_Form:
+		return Form_get_field_index_by_name(name);
+	case TAG_MPEG4_Group:
+		return Group_get_field_index_by_name(name);
+	case TAG_MPEG4_ImageTexture:
+		return ImageTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_IndexedFaceSet:
+		return IndexedFaceSet_get_field_index_by_name(name);
+	case TAG_MPEG4_IndexedFaceSet2D:
+		return IndexedFaceSet2D_get_field_index_by_name(name);
+	case TAG_MPEG4_IndexedLineSet:
+		return IndexedLineSet_get_field_index_by_name(name);
+	case TAG_MPEG4_IndexedLineSet2D:
+		return IndexedLineSet2D_get_field_index_by_name(name);
+	case TAG_MPEG4_Inline:
+		return Inline_get_field_index_by_name(name);
+	case TAG_MPEG4_LOD:
+		return LOD_get_field_index_by_name(name);
+	case TAG_MPEG4_Layer2D:
+		return Layer2D_get_field_index_by_name(name);
+	case TAG_MPEG4_Layer3D:
+		return Layer3D_get_field_index_by_name(name);
+	case TAG_MPEG4_Layout:
+		return Layout_get_field_index_by_name(name);
+	case TAG_MPEG4_LineProperties:
+		return LineProperties_get_field_index_by_name(name);
+	case TAG_MPEG4_ListeningPoint:
+		return ListeningPoint_get_field_index_by_name(name);
+	case TAG_MPEG4_Material:
+		return Material_get_field_index_by_name(name);
+	case TAG_MPEG4_Material2D:
+		return Material2D_get_field_index_by_name(name);
+	case TAG_MPEG4_MovieTexture:
+		return MovieTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_NavigationInfo:
+		return NavigationInfo_get_field_index_by_name(name);
+	case TAG_MPEG4_Normal:
+		return Normal_get_field_index_by_name(name);
+	case TAG_MPEG4_NormalInterpolator:
+		return NormalInterpolator_get_field_index_by_name(name);
+	case TAG_MPEG4_OrderedGroup:
+		return OrderedGroup_get_field_index_by_name(name);
+	case TAG_MPEG4_OrientationInterpolator:
+		return OrientationInterpolator_get_field_index_by_name(name);
+	case TAG_MPEG4_PixelTexture:
+		return PixelTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_PlaneSensor:
+		return PlaneSensor_get_field_index_by_name(name);
+	case TAG_MPEG4_PlaneSensor2D:
+		return PlaneSensor2D_get_field_index_by_name(name);
+	case TAG_MPEG4_PointLight:
+		return PointLight_get_field_index_by_name(name);
+	case TAG_MPEG4_PointSet:
+		return PointSet_get_field_index_by_name(name);
+	case TAG_MPEG4_PointSet2D:
+		return PointSet2D_get_field_index_by_name(name);
+	case TAG_MPEG4_PositionInterpolator:
+		return PositionInterpolator_get_field_index_by_name(name);
+	case TAG_MPEG4_PositionInterpolator2D:
+		return PositionInterpolator2D_get_field_index_by_name(name);
+	case TAG_MPEG4_ProximitySensor2D:
+		return ProximitySensor2D_get_field_index_by_name(name);
+	case TAG_MPEG4_ProximitySensor:
+		return ProximitySensor_get_field_index_by_name(name);
+	case TAG_MPEG4_QuantizationParameter:
+		return QuantizationParameter_get_field_index_by_name(name);
+	case TAG_MPEG4_Rectangle:
+		return Rectangle_get_field_index_by_name(name);
+	case TAG_MPEG4_ScalarInterpolator:
+		return ScalarInterpolator_get_field_index_by_name(name);
+	case TAG_MPEG4_Script:
+		return Script_get_field_index_by_name(name);
+	case TAG_MPEG4_Shape:
+		return Shape_get_field_index_by_name(name);
+	case TAG_MPEG4_Sound:
+		return Sound_get_field_index_by_name(name);
+	case TAG_MPEG4_Sound2D:
+		return Sound2D_get_field_index_by_name(name);
+	case TAG_MPEG4_Sphere:
+		return Sphere_get_field_index_by_name(name);
+	case TAG_MPEG4_SphereSensor:
+		return SphereSensor_get_field_index_by_name(name);
+	case TAG_MPEG4_SpotLight:
+		return SpotLight_get_field_index_by_name(name);
+	case TAG_MPEG4_Switch:
+		return Switch_get_field_index_by_name(name);
+	case TAG_MPEG4_TermCap:
+		return TermCap_get_field_index_by_name(name);
+	case TAG_MPEG4_Text:
+		return Text_get_field_index_by_name(name);
+	case TAG_MPEG4_TextureCoordinate:
+		return TextureCoordinate_get_field_index_by_name(name);
+	case TAG_MPEG4_TextureTransform:
+		return TextureTransform_get_field_index_by_name(name);
+	case TAG_MPEG4_TimeSensor:
+		return TimeSensor_get_field_index_by_name(name);
+	case TAG_MPEG4_TouchSensor:
+		return TouchSensor_get_field_index_by_name(name);
+	case TAG_MPEG4_Transform:
+		return Transform_get_field_index_by_name(name);
+	case TAG_MPEG4_Transform2D:
+		return Transform2D_get_field_index_by_name(name);
+	case TAG_MPEG4_Valuator:
+		return Valuator_get_field_index_by_name(name);
+	case TAG_MPEG4_Viewpoint:
+		return Viewpoint_get_field_index_by_name(name);
+	case TAG_MPEG4_VisibilitySensor:
+		return VisibilitySensor_get_field_index_by_name(name);
+	case TAG_MPEG4_Viseme:
+		return Viseme_get_field_index_by_name(name);
+	case TAG_MPEG4_WorldInfo:
+		return WorldInfo_get_field_index_by_name(name);
+	case TAG_MPEG4_AcousticMaterial:
+		return AcousticMaterial_get_field_index_by_name(name);
+	case TAG_MPEG4_AcousticScene:
+		return AcousticScene_get_field_index_by_name(name);
+	case TAG_MPEG4_ApplicationWindow:
+		return ApplicationWindow_get_field_index_by_name(name);
+	case TAG_MPEG4_BAP:
+		return BAP_get_field_index_by_name(name);
+	case TAG_MPEG4_BDP:
+		return BDP_get_field_index_by_name(name);
+	case TAG_MPEG4_Body:
+		return Body_get_field_index_by_name(name);
+	case TAG_MPEG4_BodyDefTable:
+		return BodyDefTable_get_field_index_by_name(name);
+	case TAG_MPEG4_BodySegmentConnectionHint:
+		return BodySegmentConnectionHint_get_field_index_by_name(name);
+	case TAG_MPEG4_DirectiveSound:
+		return DirectiveSound_get_field_index_by_name(name);
+	case TAG_MPEG4_Hierarchical3DMesh:
+		return Hierarchical3DMesh_get_field_index_by_name(name);
+	case TAG_MPEG4_MaterialKey:
+		return MaterialKey_get_field_index_by_name(name);
+	case TAG_MPEG4_PerceptualParameters:
+		return PerceptualParameters_get_field_index_by_name(name);
+	case TAG_MPEG4_TemporalTransform:
+		return TemporalTransform_get_field_index_by_name(name);
+	case TAG_MPEG4_TemporalGroup:
+		return TemporalGroup_get_field_index_by_name(name);
+	case TAG_MPEG4_ServerCommand:
+		return ServerCommand_get_field_index_by_name(name);
+	case TAG_MPEG4_InputSensor:
+		return InputSensor_get_field_index_by_name(name);
+	case TAG_MPEG4_MatteTexture:
+		return MatteTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_MediaBuffer:
+		return MediaBuffer_get_field_index_by_name(name);
+	case TAG_MPEG4_MediaControl:
+		return MediaControl_get_field_index_by_name(name);
+	case TAG_MPEG4_MediaSensor:
+		return MediaSensor_get_field_index_by_name(name);
+	case TAG_MPEG4_BitWrapper:
+		return BitWrapper_get_field_index_by_name(name);
+	case TAG_MPEG4_CoordinateInterpolator4D:
+		return CoordinateInterpolator4D_get_field_index_by_name(name);
+	case TAG_MPEG4_DepthImage:
+		return DepthImage_get_field_index_by_name(name);
+	case TAG_MPEG4_FFD:
+		return FFD_get_field_index_by_name(name);
+	case TAG_MPEG4_Implicit:
+		return Implicit_get_field_index_by_name(name);
+	case TAG_MPEG4_XXLFM_Appearance:
+		return XXLFM_Appearance_get_field_index_by_name(name);
+	case TAG_MPEG4_XXLFM_BlendList:
+		return XXLFM_BlendList_get_field_index_by_name(name);
+	case TAG_MPEG4_XXLFM_FrameList:
+		return XXLFM_FrameList_get_field_index_by_name(name);
+	case TAG_MPEG4_XXLFM_LightMap:
+		return XXLFM_LightMap_get_field_index_by_name(name);
+	case TAG_MPEG4_XXLFM_SurfaceMapList:
+		return XXLFM_SurfaceMapList_get_field_index_by_name(name);
+	case TAG_MPEG4_XXLFM_ViewMapList:
+		return XXLFM_ViewMapList_get_field_index_by_name(name);
+	case TAG_MPEG4_MeshGrid:
+		return MeshGrid_get_field_index_by_name(name);
+	case TAG_MPEG4_NonLinearDeformer:
+		return NonLinearDeformer_get_field_index_by_name(name);
+	case TAG_MPEG4_NurbsCurve:
+		return NurbsCurve_get_field_index_by_name(name);
+	case TAG_MPEG4_NurbsCurve2D:
+		return NurbsCurve2D_get_field_index_by_name(name);
+	case TAG_MPEG4_NurbsSurface:
+		return NurbsSurface_get_field_index_by_name(name);
+	case TAG_MPEG4_OctreeImage:
+		return OctreeImage_get_field_index_by_name(name);
+	case TAG_MPEG4_XXParticles:
+		return XXParticles_get_field_index_by_name(name);
+	case TAG_MPEG4_XXParticleInitBox:
+		return XXParticleInitBox_get_field_index_by_name(name);
+	case TAG_MPEG4_XXPlanarObstacle:
+		return XXPlanarObstacle_get_field_index_by_name(name);
+	case TAG_MPEG4_XXPointAttractor:
+		return XXPointAttractor_get_field_index_by_name(name);
+	case TAG_MPEG4_PointTexture:
+		return PointTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_PositionAnimator:
+		return PositionAnimator_get_field_index_by_name(name);
+	case TAG_MPEG4_PositionAnimator2D:
+		return PositionAnimator2D_get_field_index_by_name(name);
+	case TAG_MPEG4_PositionInterpolator4D:
+		return PositionInterpolator4D_get_field_index_by_name(name);
+	case TAG_MPEG4_ProceduralTexture:
+		return ProceduralTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_Quadric:
+		return Quadric_get_field_index_by_name(name);
+	case TAG_MPEG4_SBBone:
+		return SBBone_get_field_index_by_name(name);
+	case TAG_MPEG4_SBMuscle:
+		return SBMuscle_get_field_index_by_name(name);
+	case TAG_MPEG4_SBSegment:
+		return SBSegment_get_field_index_by_name(name);
+	case TAG_MPEG4_SBSite:
+		return SBSite_get_field_index_by_name(name);
+	case TAG_MPEG4_SBSkinnedModel:
+		return SBSkinnedModel_get_field_index_by_name(name);
+	case TAG_MPEG4_SBVCAnimation:
+		return SBVCAnimation_get_field_index_by_name(name);
+	case TAG_MPEG4_ScalarAnimator:
+		return ScalarAnimator_get_field_index_by_name(name);
+	case TAG_MPEG4_SimpleTexture:
+		return SimpleTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_SolidRep:
+		return SolidRep_get_field_index_by_name(name);
+	case TAG_MPEG4_SubdivisionSurface:
+		return SubdivisionSurface_get_field_index_by_name(name);
+	case TAG_MPEG4_SubdivSurfaceSector:
+		return SubdivSurfaceSector_get_field_index_by_name(name);
+	case TAG_MPEG4_WaveletSubdivisionSurface:
+		return WaveletSubdivisionSurface_get_field_index_by_name(name);
+	case TAG_MPEG4_Clipper2D:
+		return Clipper2D_get_field_index_by_name(name);
+	case TAG_MPEG4_ColorTransform:
+		return ColorTransform_get_field_index_by_name(name);
+	case TAG_MPEG4_Ellipse:
+		return Ellipse_get_field_index_by_name(name);
+	case TAG_MPEG4_LinearGradient:
+		return LinearGradient_get_field_index_by_name(name);
+	case TAG_MPEG4_PathLayout:
+		return PathLayout_get_field_index_by_name(name);
+	case TAG_MPEG4_RadialGradient:
+		return RadialGradient_get_field_index_by_name(name);
+	case TAG_MPEG4_SynthesizedTexture:
+		return SynthesizedTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_TransformMatrix2D:
+		return TransformMatrix2D_get_field_index_by_name(name);
+	case TAG_MPEG4_Viewport:
+		return Viewport_get_field_index_by_name(name);
+	case TAG_MPEG4_XCurve2D:
+		return XCurve2D_get_field_index_by_name(name);
+	case TAG_MPEG4_XFontStyle:
+		return XFontStyle_get_field_index_by_name(name);
+	case TAG_MPEG4_XLineProperties:
+		return XLineProperties_get_field_index_by_name(name);
+	case TAG_MPEG4_AdvancedAudioBuffer:
+		return AdvancedAudioBuffer_get_field_index_by_name(name);
+	case TAG_MPEG4_AudioChannelConfig:
+		return AudioChannelConfig_get_field_index_by_name(name);
+	case TAG_MPEG4_DepthImageV2:
+		return DepthImageV2_get_field_index_by_name(name);
+	case TAG_MPEG4_MorphShape:
+		return MorphShape_get_field_index_by_name(name);
+	case TAG_MPEG4_MultiTexture:
+		return MultiTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_PointTextureV2:
+		return PointTextureV2_get_field_index_by_name(name);
+	case TAG_MPEG4_SBVCAnimationV2:
+		return SBVCAnimationV2_get_field_index_by_name(name);
+	case TAG_MPEG4_SimpleTextureV2:
+		return SimpleTextureV2_get_field_index_by_name(name);
+	case TAG_MPEG4_SurroundingSound:
+		return SurroundingSound_get_field_index_by_name(name);
+	case TAG_MPEG4_Transform3DAudio:
+		return Transform3DAudio_get_field_index_by_name(name);
+	case TAG_MPEG4_WideSound:
+		return WideSound_get_field_index_by_name(name);
+	case TAG_MPEG4_ScoreShape:
+		return ScoreShape_get_field_index_by_name(name);
+	case TAG_MPEG4_MusicScore:
+		return MusicScore_get_field_index_by_name(name);
+	case TAG_MPEG4_FootPrintSetNode:
+		return FootPrintSetNode_get_field_index_by_name(name);
+	case TAG_MPEG4_FootPrintNode:
+		return FootPrintNode_get_field_index_by_name(name);
+	case TAG_MPEG4_BuildingPartNode:
+		return BuildingPartNode_get_field_index_by_name(name);
+	case TAG_MPEG4_RoofNode:
+		return RoofNode_get_field_index_by_name(name);
+	case TAG_MPEG4_FacadeNode:
+		return FacadeNode_get_field_index_by_name(name);
+	case TAG_MPEG4_Shadow:
+		return Shadow_get_field_index_by_name(name);
+	case TAG_MPEG4_CacheTexture:
+		return CacheTexture_get_field_index_by_name(name);
+	case TAG_MPEG4_EnvironmentTest:
+		return EnvironmentTest_get_field_index_by_name(name);
+	case TAG_MPEG4_KeyNavigator:
+		return KeyNavigator_get_field_index_by_name(name);
+	case TAG_MPEG4_SpacePartition:
+		return SpacePartition_get_field_index_by_name(name);
+	case TAG_MPEG4_Storage:
+		return Storage_get_field_index_by_name(name);
 	default:
 		return -1;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/mpeg4_valuator.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/mpeg4_valuator.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -48,7 +48,7 @@
 
 static void valuator_get_output(M_Valuator *p, GenMFField *inMFField, u32 inType, Bool do_sum, u32 i, SFVec4f *output, u32 *num_out)
 {
-	
+
 	switch (inType) {
 	case GF_SG_VRML_MFINT32:
 	{
@@ -59,7 +59,7 @@
 		output->z = gf_mulfix(p->Factor3, vi) + p->Offset3;
 		output->q = gf_mulfix(p->Factor4, vi) + p->Offset4;
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFFLOAT:
 	{
 		Fixed sff = ((MFFloat *)inMFField)->vals[i];
@@ -68,7 +68,7 @@
 		output->z = gf_mulfix(p->Factor3, sff) + p->Offset3;
 		output->q = gf_mulfix(p->Factor4, sff) + p->Offset4;
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFCOLOR:
 	{
 		SFColor sfc = ((MFColor *)inMFField)->vals[i];
@@ -78,7 +78,7 @@
 		output->q = p->Offset4;
 		*num_out = 3;
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFVEC2F:
 	{
 		SFVec2f sfv = ((MFVec2f *)inMFField)->vals[i];
@@ -88,7 +88,7 @@
 		output->q = p->Offset4;
 		*num_out = 2;
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFVEC3F:
 	{
 		SFVec3f sfv = ((MFVec3f *)inMFField)->vals[i];
@@ -98,7 +98,7 @@
 		output->q = p->Offset4;
 		*num_out = 3;
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFVEC4F:
 	case GF_SG_VRML_MFROTATION:
 	{
@@ -109,7 +109,7 @@
 		output->q = gf_mulfix(p->Factor4, sfv.q) + p->Offset4;
 		*num_out = 4;
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFSTRING:
 		/*cf below*/
 		output->x = output->y = output->z = output->q = 0;
@@ -195,12 +195,13 @@
 		}
 		if (!i) sf_out = output;
 	}
-	
+
 	gf_sg_vrml_mf_alloc(&p->outMFColor, GF_SG_VRML_MFCOLOR, count);
 	gf_sg_vrml_mf_alloc(&p->outMFFloat, GF_SG_VRML_MFFLOAT, count);
 	gf_sg_vrml_mf_alloc(&p->outMFInt32, GF_SG_VRML_MFINT32, count);
 	gf_sg_vrml_mf_alloc(&p->outMFRotation, GF_SG_VRML_MFROTATION, count);
-	gf_sg_vrml_mf_alloc(&p->outMFString, GF_SG_VRML_MFSTRING, count);	gf_sg_vrml_mf_alloc(&p->outMFVec2f, GF_SG_VRML_MFVEC2F, count);
+	gf_sg_vrml_mf_alloc(&p->outMFString, GF_SG_VRML_MFSTRING, count);
+	gf_sg_vrml_mf_alloc(&p->outMFVec2f, GF_SG_VRML_MFVEC2F, count);
 	gf_sg_vrml_mf_alloc(&p->outMFVec3f, GF_SG_VRML_MFVEC3F, count);
 
 	/*valuator is a special case, all routes are triggered*/
@@ -265,12 +266,12 @@
 
 		case GF_SG_VRML_MFFLOAT:
 			gf_sg_vrml_mf_alloc(&p->outMFFloat, GF_SG_VRML_MFFLOAT, count);
-			for (i=0; i<count; i++) 
+			for (i=0; i<count; i++)
 				p->outMFFloat.vals[i] = mf_output->vals[i].x;
 			break;
 		case GF_SG_VRML_MFINT32:
 			gf_sg_vrml_mf_alloc(&p->outMFInt32, GF_SG_VRML_MFINT32, count);
-			for (i=0; i<count; i++) 
+			for (i=0; i<count; i++)
 				p->outMFInt32.vals[i] = FIX2INT(mf_output->vals[i].x);
 			break;
 		case GF_SG_VRML_MFCOLOR:
@@ -306,7 +307,8 @@
 			}
 			break;
 		case GF_SG_VRML_MFSTRING:
-			gf_sg_vrml_mf_alloc(&p->outMFString, GF_SG_VRML_MFSTRING, count);	gf_sg_vrml_mf_alloc(&p->outMFVec2f, GF_SG_VRML_MFVEC2F, count);
+			gf_sg_vrml_mf_alloc(&p->outMFString, GF_SG_VRML_MFSTRING, count);
+			gf_sg_vrml_mf_alloc(&p->outMFVec2f, GF_SG_VRML_MFVEC2F, count);
 			for (i=0; i<count; i++) {
 				if (num_out==1) {
 					if (inType==GF_SG_VRML_SFTIME) {
@@ -446,7 +448,7 @@
 {
 	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)
 {
 	M_Valuator *_this = (M_Valuator *) n;
@@ -501,7 +503,7 @@
 
 	gf_node_set_private((GF_Node*)node, temp);
 	gf_node_set_callback_function((GF_Node*)node, valuator_destroy);
-	
+
 	return 1;
 }

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/smil_anim.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/smil_anim.c Changed

@@ -14,7 +14,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -82,7 +82,7 @@
 /**************************************************************************************
  * Helping functions for animation                                                    *
  **************************************************************************************/
-/* Sets the pointer to the attribute value with the pointer 
+/* Sets the pointer to the attribute value with the pointer
    to the value which passed (if unspecified) */
 void gf_svg_attributes_resolve_unspecified(GF_FieldInfo *in, GF_FieldInfo *p, GF_FieldInfo *t)
 {
@@ -97,20 +97,20 @@
 	}
 }
 
-/* Replaces the pointer to the attribute value with the pointer 
+/* Replaces the pointer to the attribute value with the pointer
    to the value which is inherited (if inherited) */
 void gf_svg_attributes_resolve_inherit(GF_FieldInfo *in, GF_FieldInfo *prop)
 {
 	if (gf_svg_is_inherit(in)) *in = *prop;
 }
 
-/* Replaces the pointer to the attribute value with the pointer 
+/* Replaces the pointer to the attribute value with the pointer
    to the value of the color attribute (if the current value is set to currentColor) */
 void gf_svg_attributes_resolve_currentColor(GF_FieldInfo *in, GF_FieldInfo *current_color)
 {
 	if ((in->fieldType == SVG_Paint_datatype) && gf_svg_is_current_color(in)) {
 		*in = *current_color;
-	} 
+	}
 }
 
 /**************************************************************************************
@@ -146,34 +146,34 @@
 	SMILAnimationAttributesPointers *animp = rai->animp;
 
 	if (!animp->to) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, 
-			   ("[SMIL Animation] Animation     %s - set element without to attribute\n", 
-			   gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,
+		       ("[SMIL Animation] Animation     %s - set element without to attribute\n",
+		        gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 		return;
 	}
 	if (!animp->to->type) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, 
-			   ("[SMIL Animation] Animation     %s - set element with an unparsed to attribute\n", 
-			   gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,
+		       ("[SMIL Animation] Animation     %s - set element with an unparsed to attribute\n",
+		        gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 		return;
 	}
 
 	if (rai->change_detection_mode) {
-		/* if the set has been applied, unless next animations are additive we don't need 
+		/* if the set has been applied, unless next animations are additive we don't need
 		   to apply it again */
 		if (rai->previous_coef > 0) rai->interpolated_value_changed = 0;
 		else rai->interpolated_value_changed = 1;
 		return;
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-			   ("[SMIL Animation] Time %f - Animation     %s - applying set animation\n", 
-			   gf_node_get_scene_time((GF_Node*)rai->anim_elt), 
-			   gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+		       ("[SMIL Animation] Time %f - Animation     %s - applying set animation\n",
+		        gf_node_get_scene_time((GF_Node*)rai->anim_elt),
+		        gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
 		to_info.fieldType = animp->to->type;
 		to_info.far_ptr   = animp->to->value;
 		/* we do not need to resolve currentColor values or inherit values here,
-		   because no further interpolation is required for the animation and 
+		   because no further interpolation is required for the animation and
 		   because inheritance is applied after animations in the compositor. */
 
 		gf_svg_attributes_copy(&rai->interpolated_value, &to_info, 0);
@@ -182,7 +182,7 @@
 }
 
 static void gf_smil_anim_use_keypoints_keytimes(SMIL_Anim_RTI *rai, Fixed normalized_simple_time,
-												Fixed *interpolation_coefficient, u32 *keyValueIndex)
+        Fixed *interpolation_coefficient, u32 *keyValueIndex)
 {
 	SMILAnimationAttributesPointers *animp = rai->animp;
 	u32 keyTimeIndex = 0;
@@ -192,13 +192,13 @@
 
 	/* Computing new interpolation coefficient */
 	if (rai->key_times_count) {
-		Fixed keyTimeBefore = 0, keyTimeAfter=0; 
+		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);
 			if (normalized_simple_time < *t) {
 				rai->previous_keytime_index = keyTimeIndex;
 				tm1 = (Fixed *) gf_list_get(*animp->keyTimes, keyTimeIndex-1);
-				if (tm1) keyTimeBefore = *tm1; 
+				if (tm1) keyTimeBefore = *tm1;
 				else keyTimeBefore = 0;
 				keyTimeAfter = *t;
 				break;
@@ -207,19 +207,19 @@
 		keyTimeIndex--;
 		interval_duration = keyTimeAfter - keyTimeBefore;
 		if (keyValueIndex) *keyValueIndex = keyTimeIndex;
-		if (interval_duration) 
+		if (interval_duration)
 			*interpolation_coefficient = gf_divfix(normalized_simple_time - keyTimeBefore, interval_duration);
-		else 
+		else
 			*interpolation_coefficient = FIX_ONE;
 		if (!rai->change_detection_mode)
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-			   ("[SMIL Animation] Time %f - Animation     %s - Using Key Times: index %d, interval duration %.2f, coeff: %.2f\n", 
-			   gf_node_get_scene_time((GF_Node*)rai->anim_elt), 
-			   gf_node_get_log_name((GF_Node *)rai->anim_elt), 
-			   keyTimeIndex, 
-			   interval_duration, 
-			   interpolation_coefficient));
-	} 
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - Using Key Times: index %d, interval duration %.2f, coeff: %.2f\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt),
+			        gf_node_get_log_name((GF_Node *)rai->anim_elt),
+			        keyTimeIndex,
+			        interval_duration,
+			        interpolation_coefficient));
+	}
 
 	if (rai->anim_elt->sgprivate->tag == TAG_SVG_animateMotion && rai->key_points_count) {
 		Fixed *p1, *p2;
@@ -228,14 +228,14 @@
 			*interpolation_coefficient = *p1;
 		} else {
 			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));					
+			*interpolation_coefficient = gf_mulfix(FIX_ONE - *interpolation_coefficient, *p1)
+			                             + gf_mulfix(*interpolation_coefficient, (p2 ? *p2 : *p1));
 		}
 		if (keyValueIndex) *keyValueIndex = 0;
 		if (!rai->change_detection_mode)
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-			   ("[SMIL Animation] Time %f - Animation     %s - Using Key Points: key Point Index %d, coeff: %.2f\n", 
-			   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyTimeIndex, *interpolation_coefficient));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - Using Key Points: key Point Index %d, coeff: %.2f\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyTimeIndex, *interpolation_coefficient));
 	}
 }
 
@@ -255,26 +255,26 @@
 	value_info_next = value_info;
 
 	real_calcMode = (gf_svg_attribute_is_interpolatable(animp->values->type)?
-						(animp->calcMode ? *animp->calcMode : SMIL_CALCMODE_LINEAR):
-						SMIL_CALCMODE_DISCRETE
-					);
+	                 (animp->calcMode ? *animp->calcMode : SMIL_CALCMODE_LINEAR):
+	                 SMIL_CALCMODE_DISCRETE
+	                );
 
 	if (rai->values_count == 1) {
 		if (rai->change_detection_mode) {
-			/* Since we have only 1 value, the previous key index should always be 0, 
+			/* Since we have only 1 value, the previous key index should always be 0,
 			   unless the animation has not started or is reset (-1) */
 			if (rai->previous_key_index == 0) rai->interpolated_value_changed = 0;
 			else rai->interpolated_value_changed = 1;
 			return;
 		} else {
 			value_info.far_ptr = gf_list_get(values, 0);
-			/* no further interpolation needed 
+			/* no further interpolation needed
 			   therefore no need to resolve inherit and currentColor */
 			gf_svg_attributes_copy(&rai->interpolated_value, &value_info, 0);
 			rai->previous_key_index = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-				   ("[SMIL Animation] Time %f - Animation     %s - Using values[0] as interpolation value\n", 
-				   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - Using values[0] as interpolation value\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 			return;
 		}
 	}
@@ -312,9 +312,9 @@
 	if (rai->change_detection_mode) {
 		if (real_calcMode == SMIL_CALCMODE_DISCRETE && rai->previous_key_index == (s32)keyValueIndex && rai->previous_coef != -FIX_ONE) {
 			rai->interpolated_value_changed = 0;
-		} else if (rai->previous_key_index == (s32)keyValueIndex && rai->previous_coef == interpolation_coefficient) 
+		} else if (rai->previous_key_index == (s32)keyValueIndex && rai->previous_coef == interpolation_coefficient)
 			rai->interpolated_value_changed = 0;
-		else 
+		else
 			rai->interpolated_value_changed = 1;
 	} else {
 		rai->previous_key_index = keyValueIndex;
@@ -322,48 +322,48 @@
 
 		switch (real_calcMode) {
 		case SMIL_CALCMODE_DISCRETE:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-				   ("[SMIL Animation] Time %f - Animation     %s - applying discrete animation using values (key value index: %d)\n", 
-				   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - applying discrete animation using values (key value index: %d)\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex));
 			value_info.far_ptr = gf_list_get(values, keyValueIndex);
-			/* no further interpolation needed  
+			/* no further interpolation needed
 			   therefore no need to resolve inherit and currentColor */
 			gf_svg_attributes_copy(&rai->interpolated_value, &value_info, 0);
 			break;
 		case SMIL_CALCMODE_PACED:
-			/* TODO: at the moment assume it is linear */
+		/* TODO: at the moment assume it is linear */
 		case SMIL_CALCMODE_SPLINE:
-			/* TODO: at the moment assume it is linear */
+		/* TODO: at the moment assume it is linear */
 		case SMIL_CALCMODE_LINEAR:
 			if (keyValueIndex == rai->values_count - 1) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-					   ("[SMIL Animation] Time %f - Animation     %s - applying linear animation using values (setting last key value: %d)\n", 
-					   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+				       ("[SMIL Animation] Time %f - Animation     %s - applying linear animation using values (setting last key value: %d)\n",
+				        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex));
 				value_info.far_ptr = gf_list_get(values, rai->values_count - 1);
-				/* no further interpolation needed  
+				/* no further interpolation needed
 				   therefore no need to resolve inherit and currentColor */
 				gf_svg_attributes_copy(&rai->interpolated_value, &value_info, 0);
 			} else {
-				
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-					   ("[SMIL Animation] Time %f - Animation     %s - applying linear animation using values (key value indices: %d, %d / coeff: %f)\n", 
-					   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex, keyValueIndex+1, interpolation_coefficient));
+
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+				       ("[SMIL Animation] Time %f - Animation     %s - applying linear animation using values (key value indices: %d, %d / coeff: %f)\n",
+				        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex, keyValueIndex+1, interpolation_coefficient));
 				value_info.far_ptr = gf_list_get(values, keyValueIndex);
 				if (rai->owner->is_property && gf_svg_attribute_is_interpolatable(animp->values->type)) {
-					gf_svg_attributes_resolve_currentColor(&value_info, &rai->owner->current_color_value);			
+					gf_svg_attributes_resolve_currentColor(&value_info, &rai->owner->current_color_value);
 					gf_svg_attributes_resolve_inherit(&value_info, &rai->owner->parent_presentation_value);
 				}
-				
-				value_info_next.far_ptr = gf_list_get(values, keyValueIndex+1);			
+
+				value_info_next.far_ptr = gf_list_get(values, keyValueIndex+1);
 				if (rai->owner->is_property && gf_svg_attribute_is_interpolatable(animp->values->type)) {
 					gf_svg_attributes_resolve_currentColor(&value_info_next, &rai->owner->current_color_value);
 					gf_svg_attributes_resolve_inherit(&value_info_next, &rai->owner->parent_presentation_value);
 				}
 
-				gf_svg_attributes_interpolate(&value_info, 
-											  &value_info_next, 
-											  &rai->interpolated_value, 
-											  interpolation_coefficient, 1);
+				gf_svg_attributes_interpolate(&value_info,
+				                              &value_info_next,
+				                              &rai->interpolated_value,
+				                              interpolation_coefficient, 1);
 			}
 			break;
 		}
@@ -379,16 +379,16 @@
 	u32 real_calcMode;
 
 	real_calcMode = (animp->to && gf_svg_attribute_is_interpolatable(animp->to->type)?
-						(animp->calcMode ? *animp->calcMode : SMIL_CALCMODE_LINEAR):
-						SMIL_CALCMODE_DISCRETE
-					);
+	                 (animp->calcMode ? *animp->calcMode : SMIL_CALCMODE_LINEAR):
+	                 SMIL_CALCMODE_DISCRETE
+	                );
 
 	if (rai->change_detection_mode) {
-		if (rai->previous_coef == normalized_simple_time) 
+		if (rai->previous_coef == normalized_simple_time)
 			rai->interpolated_value_changed = 0;
 		else {
 			if (real_calcMode == SMIL_CALCMODE_DISCRETE &&
-				useFrom == rai->previous_key_index) {
+			        useFrom == rai->previous_key_index) {
 				rai->interpolated_value_changed = 0;
 			} else {
 				rai->interpolated_value_changed = 1;
@@ -404,14 +404,14 @@
 			from_info.far_ptr = NULL;
 		}
 
-		if (rai->is_first_anim) 
-			gf_svg_attributes_resolve_unspecified(&from_info, 
-												  &rai->owner->specified_value, 
-												  &rai->default_transform_value);
-		else 
-			gf_svg_attributes_resolve_unspecified(&from_info, 
-												  &rai->owner->presentation_value, 
-												  &rai->default_transform_value);
+		if (rai->is_first_anim)
+			gf_svg_attributes_resolve_unspecified(&from_info,
+			                                      &rai->owner->specified_value,
+			                                      &rai->default_transform_value);
+		else
+			gf_svg_attributes_resolve_unspecified(&from_info,
+			                                      &rai->owner->presentation_value,
+			                                      &rai->default_transform_value);
 
 		if (rai->owner->is_property && gf_svg_attribute_is_interpolatable(from_info.fieldType)) {
 			gf_svg_attributes_resolve_currentColor(&from_info, &rai->owner->current_color_value);
@@ -425,14 +425,14 @@
 			to_info.far_ptr = NULL;
 		}
 
-		if (rai->is_first_anim) 
-			gf_svg_attributes_resolve_unspecified(&to_info, 
-												  &rai->owner->specified_value, 
-												  &rai->default_transform_value);
-		else 
-			gf_svg_attributes_resolve_unspecified(&to_info, 
-												  &rai->owner->presentation_value, 
-												  &rai->default_transform_value);
+		if (rai->is_first_anim)
+			gf_svg_attributes_resolve_unspecified(&to_info,
+			                                      &rai->owner->specified_value,
+			                                      &rai->default_transform_value);
+		else
+			gf_svg_attributes_resolve_unspecified(&to_info,
+			                                      &rai->owner->presentation_value,
+			                                      &rai->default_transform_value);
 
 		if (rai->owner->is_property && gf_svg_attribute_is_interpolatable(to_info.fieldType)) {
 			gf_svg_attributes_resolve_currentColor(&to_info, &rai->owner->current_color_value);
@@ -445,22 +445,22 @@
 
 		switch (real_calcMode) {
 		case SMIL_CALCMODE_DISCRETE:
-			{
-				/* before half of the duration stay at 'from' and then switch to 'to' */
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-					   ("[SMIL Animation] Time %f - Animation     %s - applying from-to animation (using %s value)\n", 
-					   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), (useFrom?"from":"to")));
-				gf_svg_attributes_copy(&rai->interpolated_value, (useFrom?&from_info:&to_info), 0);
-				rai->previous_key_index = useFrom;
-			}
-			break;
+		{
+			/* before half of the duration stay at 'from' and then switch to 'to' */
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - applying from-to animation (using %s value)\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), (useFrom?"from":"to")));
+			gf_svg_attributes_copy(&rai->interpolated_value, (useFrom?&from_info:&to_info), 0);
+			rai->previous_key_index = useFrom;
+		}
+		break;
 		case SMIL_CALCMODE_SPLINE:
 		case SMIL_CALCMODE_PACED:
 		case SMIL_CALCMODE_LINEAR:
 		default:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-				   ("[SMIL Animation] Time %f - Animation     %s - applying from-to animation (linear interpolation, using coefficient %f)\n", 
-				   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), interpolation_coefficient));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - applying from-to animation (linear interpolation, using coefficient %f)\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), interpolation_coefficient));
 			gf_svg_attributes_interpolate(&from_info, &to_info, &rai->interpolated_value, interpolation_coefficient, 1);
 			break;
 		}
@@ -475,12 +475,12 @@
 	s32 useFrom = (normalized_simple_time<=FIX_ONE/2);
 
 	if (rai->change_detection_mode) {
-		if (rai->previous_coef == normalized_simple_time) 
+		if (rai->previous_coef == normalized_simple_time)
 			rai->interpolated_value_changed = 0;
 		else {
 			if (animp->calcMode &&
-				*animp->calcMode == SMIL_CALCMODE_DISCRETE &&
-				useFrom == rai->previous_key_index) {
+			        *animp->calcMode == SMIL_CALCMODE_DISCRETE &&
+			        useFrom == rai->previous_key_index) {
 				rai->interpolated_value_changed = 0;
 			} else {
 				rai->interpolated_value_changed = 1;
@@ -496,20 +496,20 @@
 		} else {
 			from_info.fieldType = 0;
 			from_info.far_ptr = NULL;
-			/* this is a by animation only, then, it is always additive, 
+			/* this is a by animation only, then, it is always additive,
 			   we don't need the from value*/
-			from_coef = 0; 
+			from_coef = 0;
 		}
 
-		if (rai->is_first_anim) 
-			gf_svg_attributes_resolve_unspecified(&from_info, 
-												  &rai->owner->specified_value, 
-												  &rai->default_transform_value);
-		else 
-			gf_svg_attributes_resolve_unspecified(&from_info, 
-												  &rai->owner->presentation_value, 
-												  &rai->default_transform_value);
-		
+		if (rai->is_first_anim)
+			gf_svg_attributes_resolve_unspecified(&from_info,
+			                                      &rai->owner->specified_value,
+			                                      &rai->default_transform_value);
+		else
+			gf_svg_attributes_resolve_unspecified(&from_info,
+			                                      &rai->owner->presentation_value,
+			                                      &rai->default_transform_value);
+
 		if (rai->owner->is_property && gf_svg_attribute_is_interpolatable(from_info.fieldType)) {
 			gf_svg_attributes_resolve_currentColor(&from_info, &rai->owner->current_color_value);
 			gf_svg_attributes_resolve_inherit(&from_info, &rai->owner->parent_presentation_value);
@@ -522,7 +522,7 @@
 			by_info.fieldType = 0;
 			by_info.far_ptr = NULL;
 		}
-		
+
 		if (rai->owner->is_property && gf_svg_attribute_is_interpolatable(from_info.fieldType)) {
 			gf_svg_attributes_resolve_currentColor(&by_info, &rai->owner->current_color_value);
 			gf_svg_attributes_resolve_inherit(&by_info, &rai->owner->parent_presentation_value);
@@ -530,41 +530,41 @@
 
 		switch ((animp->calcMode ? *animp->calcMode : SMIL_CALCMODE_LINEAR)) {
 		case SMIL_CALCMODE_DISCRETE:
-			{
-				/* before half of the duration stay at 'from' and then switch to 'to' */
-				if (useFrom) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-						   ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (setting from)", 
-						   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
-					gf_svg_attributes_muladd(from_coef, &from_info, 0, &by_info, &rai->interpolated_value, 0);
-				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-						   ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (setting from+by)", 
-						   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
-					gf_svg_attributes_muladd(from_coef, &from_info, FIX_ONE, &by_info, &rai->interpolated_value, 0);
-				}
-				rai->previous_key_index = useFrom;
+		{
+			/* before half of the duration stay at 'from' and then switch to 'to' */
+			if (useFrom) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+				       ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (setting from)",
+				        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+				gf_svg_attributes_muladd(from_coef, &from_info, 0, &by_info, &rai->interpolated_value, 0);
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+				       ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (setting from+by)",
+				        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+				gf_svg_attributes_muladd(from_coef, &from_info, FIX_ONE, &by_info, &rai->interpolated_value, 0);
 			}
-			break;
+			rai->previous_key_index = useFrom;
+		}
+		break;
 		case SMIL_CALCMODE_SPLINE:
 		case SMIL_CALCMODE_PACED:
 		case SMIL_CALCMODE_LINEAR:
 		default:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-				   ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (linear interpolation between from and from+by, coef: %f)\n", 
-				   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), normalized_simple_time));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (linear interpolation between from and from+by, coef: %f)\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), normalized_simple_time));
 			gf_svg_attributes_muladd(from_coef, &from_info, normalized_simple_time, &by_info, &rai->interpolated_value, 0);
 			break;
 		}
 	}
 }
 
-static void gf_svg_compute_path_anim(SMIL_Anim_RTI *rai, GF_Matrix2D *m, Fixed normalized_simple_time) 
+static void gf_svg_compute_path_anim(SMIL_Anim_RTI *rai, GF_Matrix2D *m, Fixed normalized_simple_time)
 {
 	Fixed offset;
 	offset = gf_mulfix(normalized_simple_time, rai->length);
 	gf_mx2d_init(*m);
-	
+
 	gf_path_iterator_get_transform(rai->path_iterator, offset, 1, m, 1, 0);
 	//GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("offset: %f, position: (%f, %f)", offset, ((GF_Matrix2D *)rai->interpolated_value.far_ptr)->m[2], ((GF_Matrix2D *)rai->interpolated_value.far_ptr)->m[5]));
 	switch (rai->rotate) {
@@ -588,7 +588,7 @@
 	gf_smil_anim_use_keypoints_keytimes(rai, normalized_simple_time, &interpolation_coefficient, NULL);
 
 	if (rai->change_detection_mode) {
-		if (rai->previous_coef == interpolation_coefficient) 
+		if (rai->previous_coef == interpolation_coefficient)
 			rai->interpolated_value_changed = 0;
 		else {
 			rai->interpolated_value_changed = 1;
@@ -596,10 +596,10 @@
 	} else {
 		rai->previous_coef = interpolation_coefficient;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-			   ("[SMIL Animation] Time %f - Animation     %s - applying path animation (coef: %f)\n", 
-			   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), normalized_simple_time));
-		
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+		       ("[SMIL Animation] Time %f - Animation     %s - applying path animation (coef: %f)\n",
+		        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), normalized_simple_time));
+
 		gf_svg_compute_path_anim(rai, (GF_Matrix2D*)rai->interpolated_value.far_ptr, interpolation_coefficient);
 	}
 }
@@ -611,27 +611,27 @@
 	if (rai->path) {
 		gf_smil_anim_animate_using_path(rai, normalized_simple_time);
 	} else if (rai->anim_elt->sgprivate->tag == TAG_SVG_set) {
-		gf_smil_anim_set(rai);	
+		gf_smil_anim_set(rai);
 	} else if (rai->values_count) {
 		/* Ignore 'from'/'to'/'by'*/
 		gf_smil_anim_animate_using_values(rai, normalized_simple_time);
 	} else if ((animp->by && animp->by->type) && (!animp->to || animp->to->type == 0)) {
 		/* 'to' is not specified but 'by' is, so this is a 'by' animation or a 'from'-'by' animation */
 		gf_smil_anim_animate_from_by(rai, normalized_simple_time);
-	} else { 
+	} else {
 		/* Ignore 'by' if specified */
 		gf_smil_anim_animate_from_to(rai, normalized_simple_time);
 	}
 
 #ifndef GPAC_DISABLE_LOG
-	if (0 && gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) { 
+	if (0 && gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
 		char *str;
-		gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL); 
+		gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL);
 		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_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_log("[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);
 
 		if (str) gf_free(str);
 	}
@@ -644,7 +644,7 @@
 	SVGTimedAnimBaseElement *timed_elt = NULL;
 	SMIL_Timing_RTI *rti = NULL;
 	GF_Node *target = NULL;
-	
+
 	if (!n) return;
 	timed_elt = (SVGTimedAnimBaseElement *)n;
 
@@ -681,16 +681,16 @@
 		if (!rai->last_specified_value.far_ptr) rai->last_specified_value.far_ptr = gf_malloc(sizeof(GF_Matrix2D));
 		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) { 		
+	} else if (rai->anim_elt->sgprivate->tag == TAG_SVG_set) {
 		if (animp->to) {
 			rai->last_specified_value.fieldType = animp->to->type;
 			rai->last_specified_value.far_ptr   = animp->to->value;
 		} else {
 			/* TODO ??? */
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, 
-				   ("[SMIL Animation] Animation     %s - set element without to attribute\n", 
-				   gf_node_get_log_name((GF_Node *)rai->anim_elt)));
-		} 
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,
+			       ("[SMIL Animation] Animation     %s - set element without to attribute\n",
+			        gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+		}
 		return;
 	}
 
@@ -701,7 +701,7 @@
 	} else if ((animp->by && animp->by->type) && (!animp->to || animp->to->type == 0)) {
 		rai->last_specified_value.fieldType = animp->by->type;
 		rai->last_specified_value.far_ptr   = animp->by->value;
-	} else if (animp->to) { 
+	} else if (animp->to) {
 		rai->last_specified_value.fieldType = animp->to->type;
 		rai->last_specified_value.far_ptr   = animp->to->value;
 	}
@@ -721,17 +721,17 @@
 static void gf_smil_anim_apply_accumulate(SMIL_Anim_RTI *rai)
 {
 	u32 nb_iterations;
-	
+
 	SMILAnimationAttributesPointers *animp = rai->animp;
 	SMILTimingAttributesPointers *timingp = rai->timingp;
 
 	nb_iterations = (timingp->runtime->current_interval ? timingp->runtime->current_interval->nb_iterations : 1);
 
 	if (rai->change_detection_mode) {
-		if ((animp->accumulate && *animp->accumulate == SMIL_ACCUMULATE_SUM) 
-			&& nb_iterations > 0
-			&& rai->previous_iteration != (s32) nb_iterations) {
-			/* if we actually do accumulation and the number of iteration is different, 
+		if ((animp->accumulate && *animp->accumulate == SMIL_ACCUMULATE_SUM)
+		        && nb_iterations > 0
+		        && rai->previous_iteration != (s32) nb_iterations) {
+			/* if we actually do accumulation and the number of iteration is different,
 			then we force the result as changed regardless of the result of the interpolation
 			(TODO: check if this need to be improved)*/
 			rai->interpolated_value_changed = 1;
@@ -744,26 +744,26 @@
 		}
 
 		if ((animp->accumulate && *animp->accumulate == SMIL_ACCUMULATE_SUM) && nb_iterations > 0) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-				   ("[SMIL Animation] Time %f - Animation     %s - applying accumulation (iteration #%d)\n", 
-				   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), nb_iterations));
-			
-			gf_svg_attributes_muladd(FIX_ONE, &rai->interpolated_value, 
-									 INT2FIX(nb_iterations), &rai->last_specified_value, 
-									 &rai->interpolated_value, 1);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - applying accumulation (iteration #%d)\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), nb_iterations));
+
+			gf_svg_attributes_muladd(FIX_ONE, &rai->interpolated_value,
+			                         INT2FIX(nb_iterations), &rai->last_specified_value,
+			                         &rai->interpolated_value, 1);
 
 			if ((animp->from) && animp->by && (rai->last_specified_value.far_ptr == animp->by->value)) {
 				/* this is a from-by animation, the last specified value is not the 'by' value but actually 'from'+'by',
-				we need to add nb_iterations times from to the interpolated_value 
+				we need to add nb_iterations times from to the interpolated_value
 				see (animate-elem-210-t.svg (upper two circles in the mid column, after 9s/14s */
 				GF_FieldInfo from_info;
 				from_info.fieldType = rai->animp->from->type;
 				from_info.far_ptr = rai->animp->from->value;
-				gf_svg_attributes_muladd(FIX_ONE, &rai->interpolated_value, 
-										 INT2FIX(nb_iterations), &from_info, 
-										 &rai->interpolated_value, 1);
+				gf_svg_attributes_muladd(FIX_ONE, &rai->interpolated_value,
+				                         INT2FIX(nb_iterations), &from_info,
+				                         &rai->interpolated_value, 1);
 			}
-		} 
+		}
 	}
 }
 
@@ -775,34 +775,34 @@
 		/* Apply additive behavior if required
 			PV = (additive == sum ? PV + animp->IV : animp->IV); */
 		if (animp->additive && *animp->additive == SMIL_ADDITIVE_SUM) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-				  ("[SMIL Animation] Time %f - Animation     %s - applying additive behavior\n", 
-				gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - applying additive behavior\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
-			gf_svg_attributes_add((rai->is_first_anim ? &rai->owner->specified_value : &rai->owner->presentation_value), 
-								  &rai->interpolated_value, 
-								  &rai->owner->presentation_value, 
-								  1);
+			gf_svg_attributes_add((rai->is_first_anim ? &rai->owner->specified_value : &rai->owner->presentation_value),
+			                      &rai->interpolated_value,
+			                      &rai->owner->presentation_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);
-			gf_log("[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);
+			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",
+				       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);
 
-			if (str) gf_free(str);
-		}
+				if (str) gf_free(str);
+			}
 #endif
 
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-				   ("[SMIL Animation] Time %f - Animation     %s - applying non-additive behavior\n", 
-				   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			       ("[SMIL Animation] Time %f - Animation     %s - applying non-additive behavior\n",
+			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
-			/* FIXME: if we switch pointers to avoid copying values, 
+			/* FIXME: if we switch pointers to avoid copying values,
 			we need to modify the address in the DOM node as well,
 			we also need to take care about change detections. Not easy!!
 
@@ -810,17 +810,17 @@
 			rai->owner->presentation_value.far_ptr = rai->interpolated_value.far_ptr;
 			rai->interpolated_value.far_ptr = tmp;
 			*/
-			
+
 			gf_svg_attributes_copy(&rai->owner->presentation_value, &rai->interpolated_value, 1);
 #ifndef GPAC_DISABLE_LOG
-			if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) { 
+			if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
 				char *str;
-				gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL); 
+				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", 
-					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_log("[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);
 
 				if (str) gf_free(str);
 			}
@@ -860,7 +860,7 @@
 	rai->anim_done = 0;
 }
 
-/* copy/paste of the animate function 
+/* copy/paste of the animate function
  TODO: check if computations of interpolation value can be avoided.
 */
 static void gf_smil_anim_freeze(SMIL_Timing_RTI *rti, Fixed normalized_simple_time)
@@ -871,14 +871,14 @@
 	if (!rai || !animp) return;
 
 	if (rai->change_detection_mode) {
-		if (rai->anim_done == 0) 
+		if (rai->anim_done == 0)
 			rai->interpolated_value_changed = 1;
-		else 
+		else
 			rai->interpolated_value_changed = 0;
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-			   ("[SMIL Animation] Time %f - Animation     %s - applying freeze behavior\n", 
-			   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+		       ("[SMIL Animation] Time %f - Animation     %s - applying freeze behavior\n",
+		        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
 		gf_smil_anim_compute_interpolation_value(rai, normalized_simple_time);
 		gf_smil_anim_apply_accumulate(rai);
@@ -891,33 +891,33 @@
 {
 	SMIL_Anim_RTI *rai = rti->rai;
 	if (!rai) return;
-	
+
 	if (rai->change_detection_mode) {
-		if (rai->anim_done == 0) 
+		if (rai->anim_done == 0)
 			rai->interpolated_value_changed = 1;
-		else 
+		else
 			rai->interpolated_value_changed = 0;
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, 
-			   ("[SMIL Animation] Time %f - Animation     %s - applying remove behavior\n", 
-			   gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+		       ("[SMIL Animation] Time %f - Animation     %s - applying remove behavior\n",
+		        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
 		/* TODO: see if we can avoid this copy by switching pointers */
 		gf_svg_attributes_copy(&rai->owner->presentation_value, &rai->owner->specified_value, 0);
-		/* TODO: check if we need to apply additive behavior even in fill='remove' 
+		/* TODO: check if we need to apply additive behavior even in fill='remove'
 		   maybe (see animate-elem-211-t.svg) */
 
 		rai->anim_done = 1;
 
 #ifndef GPAC_DISABLE_LOG
-		if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) { 
+		if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
 			char *str;
-			gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL); 
+			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", 
-				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_log("[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);
 			if (str) gf_free(str);
 		}
 #endif
@@ -933,23 +933,23 @@
 		/* we are starting a new cycle of animation, therefore we need to reset the previous state variables
 		   like previous_keytime_index ... */
 		gf_smil_anim_reset_variables(rai);
-	case SMIL_TIMING_EVAL_UPDATE: 
+	case SMIL_TIMING_EVAL_UPDATE:
 		gf_smil_anim_animate(rti, normalized_simple_time);
 		break;
-	case SMIL_TIMING_EVAL_FREEZE: 
+	case SMIL_TIMING_EVAL_FREEZE:
 		gf_smil_anim_freeze(rti, normalized_simple_time);
 		break;
-	case SMIL_TIMING_EVAL_REMOVE: 
+	case SMIL_TIMING_EVAL_REMOVE:
 		gf_smil_anim_remove(rti, normalized_simple_time);
 		break;
-	case SMIL_TIMING_EVAL_FRACTION: 
+	case SMIL_TIMING_EVAL_FRACTION:
 		gf_smil_anim_animate_with_fraction(rti, normalized_simple_time);
 		break;
-/*
-	discard should be done before in smil_notify_time
-	case SMIL_TIMING_EVAL_DISCARD:
-		break;
-*/
+		/*
+			discard should be done before in smil_notify_time
+			case SMIL_TIMING_EVAL_DISCARD:
+				break;
+		*/
 	}
 }
 /**************************************************************************************
@@ -963,7 +963,7 @@
 #ifndef GPAC_DISABLE_LOG
 	u32 time=0;
 
-	if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) { 
+	if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) {
 		time = gf_sys_clock();
 	}
 #endif
@@ -977,35 +977,35 @@
 		SMIL_AttributeAnimations *aa;
 
 
-		aa = (SMIL_AttributeAnimations *)gf_node_animation_get(node, i);		
+		aa = (SMIL_AttributeAnimations *)gf_node_animation_get(node, i);
 		count = gf_list_count(aa->anims);
 		if (!count) continue;
-	
+
 		aa->presentation_value_changed = 0;
 
 		if (aa->is_property) {
-			/* Storing the pointer to the parent presentation value, 
+			/* Storing the pointer to the parent presentation value,
 			   i.e. the presentation value produced at the parent level in the tree */
 			aa->parent_presentation_value = aa->presentation_value;
-			aa->parent_presentation_value.far_ptr = 
-				gf_svg_get_property_pointer((SVG_Element *)node, aa->orig_dom_ptr, render_svg_props); 
+			aa->parent_presentation_value.far_ptr =
+			    gf_svg_get_property_pointer((SVG_Element *)node, aa->orig_dom_ptr, render_svg_props);
 
-			/* Storing also the pointer to the presentation value of the color property 
+			/* Storing also the pointer to the presentation value of the color property
 			   (special handling of the keyword 'currentColor' if used in animation values) */
 			gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_color, 1, 1, &info);
 			aa->current_color_value.far_ptr = info.far_ptr;
 		}
 
-		/* We start with the last animation (TODO in the execution order), then scan in the reverse order 
-		up to the first animation which is not additive, to determine if the presentation value will change 
+		/* We start with the last animation (TODO in the execution order), then scan in the reverse order
+		up to the first animation which is not additive, to determine if the presentation value will change
 		We evaluate each animation, but only in the 'change_detection_mode' */
 		for (j = count-1; j >= 0; j--) {
-			SMIL_Anim_RTI *rai = (SMIL_Anim_RTI *)gf_list_get(aa->anims, j);			
+			SMIL_Anim_RTI *rai = (SMIL_Anim_RTI *)gf_list_get(aa->anims, j);
 			SMIL_Timing_RTI *rti = rai->timingp->runtime;
 
 			rai->interpolated_value_changed = 0;
 
-			/* The evaluate_status has been updated when notifying the new scene time to this animation, 
+			/* The evaluate_status has been updated when notifying the new scene time to this animation,
 			   i.e. before the scene tree traversal */
 			if (rti->evaluate_status) {
 				rai->change_detection_mode = 1;
@@ -1025,7 +1025,7 @@
 			we start in the forward order from the j were the previous step stopped (i.e. the first anim in replace mode)
 			and evaluate each animation, in the computation mode (change_detection_mode = 0)*/
 			for (j++; j<(s32)count; j++) {
-				SMIL_Anim_RTI *rai = (SMIL_Anim_RTI *)gf_list_get(aa->anims, j);			
+				SMIL_Anim_RTI *rai = (SMIL_Anim_RTI *)gf_list_get(aa->anims, j);
 				SMIL_Timing_RTI *rti = rai->timingp->runtime;
 
 				if (j == 0) rai->is_first_anim = 1;
@@ -1039,19 +1039,19 @@
 			}
 		}
 
-/* 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)) { 
+			if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
 				char *str;
-				gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL); 
+				gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL);
 				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_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_log("[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);
 
 				if (str) gf_free(str);
 			}
@@ -1059,7 +1059,7 @@
 #endif
 
 		/* 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 
+		   for example, it is not necessary to set it when the anim is an animateTransform
 		   since there is no associated flag */
 		if (aa->dirty_flags) {
 			if (aa->presentation_value_changed) {
@@ -1072,7 +1072,7 @@
 	}
 
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) { 
+	if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) {
 		time_spent_in_anim += gf_sys_clock() - time;
 	}
 #endif
@@ -1087,9 +1087,9 @@
 	return (xlinkp && xlinkp->href) ? xlinkp->href->target : NULL;
 }
 
-/* Attributes from the animation elements are not easy to use during runtime, 
-   the runtime info is a set of easy to use structures. 
-   This function initializes them (interpolation values ...) 
+/* Attributes from the animation elements are not easy to use during runtime,
+   the runtime info is a set of easy to use structures.
+   This function initializes them (interpolation values ...)
    Needs to be called after gf_smil_timing_init_runtime_info */
 void gf_smil_anim_init_runtime_info(GF_Node *e)
 {
@@ -1124,7 +1124,7 @@
 	} else {
 		/* All animation elements should have a target attribute except for animateMotion
 		cf http://www.w3.org/mid/u403c21ajf1sjqtk58g0g38eaep9f9g2ss@hive.bjoern.hoehrmann.de
-		"For animateMotion, the attributeName is implied and cannot be specified; 
+		"For animateMotion, the attributeName is implied and cannot be specified;
 		animateTransform requires specification of the attribute name and any attribute that is
 		a transform-like attribute can be a target, e.g. gradientTransform."*/
 
@@ -1135,19 +1135,19 @@
 			gf_mx2d_init(*(GF_Matrix2D *)target_attribute.far_ptr);
 			break;
 		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL, 
-				("[SMIL Animation] Missing attributeName attribute on element %s\n", 
-				gf_node_get_log_name((GF_Node*)e) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL,
+			       ("[SMIL Animation] Missing attributeName attribute on element %s\n",
+			        gf_node_get_log_name((GF_Node*)e) ));
 			return;
 		}
 	}
-	
+
 	if (animp->attributeType && *animp->attributeType == SMIL_ATTRIBUTETYPE_CSS) {
 		/* see example animate-elem-219-t.svg from the SVG test suite, upper row */
 		if (!gf_svg_is_property(target, &target_attribute)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL, 
-				("[SMIL Animation] Using CSS attributeType for an animation on an attribute which is not a property %s\n", 
-				gf_node_get_log_name((GF_Node*)e) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL,
+			       ("[SMIL Animation] Using CSS attributeType for an animation on an attribute which is not a property %s\n",
+			        gf_node_get_log_name((GF_Node*)e) ));
 			return;
 		}
 	}
@@ -1155,7 +1155,7 @@
 	/* Creation and setup of the runtime structure for animation */
 	GF_SAFEALLOC(rai, SMIL_Anim_RTI)
 
-	rai->anim_elt = e;	
+	rai->anim_elt = e;
 	rai->animp = animp;
 	rai->timingp = timingp;
 	rai->xlinkp = xlinkp;
@@ -1180,38 +1180,38 @@
 
 
 	if (!rai->values_count &&										 /* 'values' attribute not specified */
-		(!animp->to || animp->to->type == 0) &&						 /* 'to' attribute not specified */
-		(!animp->from || animp->from->type == 0) &&					 /* 'from' attribute not specified */
-		(animp->by && animp->by->type != 0)) {						 /* 'by' attribute specified */		
+	        (!animp->to || animp->to->type == 0) &&						 /* 'to' attribute not specified */
+	        (!animp->from || animp->from->type == 0) &&					 /* 'from' attribute not specified */
+	        (animp->by && animp->by->type != 0)) {						 /* 'by' attribute specified */
 		/* if this is a 'by' animation without from the animation is defined to be additive
 		   see http://www.w3.org/TR/2005/REC-SMIL2-20051213/animation.html#AnimationNS-FromToBy
 		   we override the additive attribute */
-		if (!animp->additive) { 
+		if (!animp->additive) {
 			/* this case can only happen with dynamic allocation of attributes */
 			GF_FieldInfo info;
 			gf_node_get_attribute_by_tag(e, TAG_SVG_ATT_additive, 1, 0, &info);
 			animp->additive = info.far_ptr;
-		} 	
+		}
 		if (*animp->additive == SMIL_ADDITIVE_REPLACE) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL, ("[SMIL Animation] Warning: by-animations cannot use additive=\"replace\"\n"));
-		} 
+		}
 		*animp->additive = SMIL_ADDITIVE_SUM;
-	} 
+	}
 
-	/*TODO 
+	/*TODO
 	http://www.w3.org/TR/2005/REC-SMIL2-20051213/animation.html#animationNS-ToAnimation
 		To animation defines its own kind of additive semantics, so the additive attribute is ignored.
 	*/
 
-	/*TODO 
+	/*TODO
 	http://www.w3.org/TR/2005/REC-SMIL2-20051213/animation.html#animationNS-ToAnimation
-		Because to animation is defined in terms of absolute values of the target attribute, 
+		Because to animation is defined in terms of absolute values of the target attribute,
 		cumulative animation is not defined:
 	*/
 
-	/* TODO 
+	/* TODO
 	http://www.w3.org/TR/2005/REC-SMIL2-20051213/animation.html#animationNS-setElement
-	The set element is non-additive. The additive and accumulate attributes are not allowed, 
+	The set element is non-additive. The additive and accumulate attributes are not allowed,
 	and will be ignored if specified.
 	*/
 
@@ -1232,22 +1232,22 @@
 		}
 		child = ((SVG_Element *)e)->children;
 
-		if ((!animp->to || animp->to->type == 0) && 
-			(!animp->by || animp->by->type == 0) && 
-			(!animp->values || animp->values->type == 0)) {
+		if ((!animp->to || animp->to->type == 0) &&
+		        (!animp->by || animp->by->type == 0) &&
+		        (!animp->values || animp->values->type == 0)) {
 #if USE_GF_PATH
 			if (!gf_path_is_empty(the_path)) {
 				rai->path = the_path;
 				rai->path_iterator = gf_path_iterator_new(rai->path);
 				rai->length = gf_path_iterator_get_length(rai->path_iterator);
-			} 
+			}
 #else
 			rai->path = gf_path_new();
 			if (gf_list_count(the_path->points)) {
 				gf_svg_path_build(rai->path, the_path->commands, the_path->points);
 				rai->path_iterator = gf_path_iterator_new(rai->path);
 				rai->length = gf_path_iterator_get_length(rai->path_iterator);
-			} 
+			}
 #endif
 			else {
 				while (child) {
@@ -1258,27 +1258,27 @@
 						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;
-							else if (iri->string) used_path = 
-								(GF_Node *)gf_sg_find_node_by_name(gf_node_get_graph(child->node), iri->string);
+							else if (iri->string) used_path =
+								    (GF_Node *)gf_sg_find_node_by_name(gf_node_get_graph(child->node), iri->string);
 							if (used_path && gf_node_get_tag(used_path) == TAG_SVG_path) {
 								gf_node_get_attribute_by_tag(used_path, TAG_SVG_ATT_d, 1, 0, &info);
 #if USE_GF_PATH
 								rai->path = (SVG_PathData *)info.far_ptr;
 #else
-								gf_svg_path_build(rai->path, 
-												  ((SVG_PathData *)info.far_ptr)->commands, 
-												  ((SVG_PathData *)info.far_ptr)->points);
+								gf_svg_path_build(rai->path,
+								                  ((SVG_PathData *)info.far_ptr)->commands,
+								                  ((SVG_PathData *)info.far_ptr)->points);
 #endif
 								rai->path_iterator = gf_path_iterator_new(rai->path);
 								rai->length = gf_path_iterator_get_length(rai->path_iterator);
 							}
-						} 
+						}
 						break;
 					}
 					child = child->next;
 				}
 			}
-		} 
+		}
 	}
 
 	/* for all animations, check if there is already one animation on this attribute,
@@ -1299,8 +1299,8 @@
 		aa->is_property = gf_svg_is_property(target, &target_attribute);
 		aa->current_color_value.fieldType = SVG_Paint_datatype;
 
-		/* We copy (one copy for all animations on the same attribute) the DOM specified 
-		   value before any animation starts (because the animation will override it), 
+		/* We copy (one copy for all animations on the same attribute) the DOM specified
+		   value before any animation starts (because the animation will override it),
 		   we also save the initial memory address of the specified value (orig_dom_ptr)
 		   for inheritance hack */
 		aa->specified_value = target_attribute;
@@ -1311,7 +1311,7 @@
 		/* Now, the initial memory address of the specified value holds the presentation value,
 		   and the presentation value is initialized */
 		aa->presentation_value = target_attribute;
-		
+
 		aa->anims = gf_list_new();
 		gf_list_add(aa->anims, rai);
 		gf_node_animation_add(target, aa);
@@ -1328,8 +1328,8 @@
 	rai->owner = aa;
 	gf_smil_anim_get_last_specified_value(rai);
 
-	/* for animation (unlike other timed elements like video), the evaluation (i.e. interpolation) cannot be done 
-	during timing evaluation, because due to inheritance, interpolation can only be computed 
+	/* for animation (unlike other timed elements like video), the evaluation (i.e. interpolation) cannot be done
+	during timing evaluation, because due to inheritance, interpolation can only be computed
 	during scene tree traversal, therefore we need to postpone evaluation of the timed element */
 	timingp->runtime->postpone = 1;
 
@@ -1338,15 +1338,15 @@
 
 void gf_smil_anim_delete_runtime_info(SMIL_Anim_RTI *rai)
 {
-	gf_svg_delete_attribute_value(rai->interpolated_value.fieldType, 
-								  rai->interpolated_value.far_ptr, 
-								  rai->anim_elt->sgprivate->scenegraph);
+	gf_svg_delete_attribute_value(rai->interpolated_value.fieldType,
+	                              rai->interpolated_value.far_ptr,
+	                              rai->anim_elt->sgprivate->scenegraph);
 	if (rai->path) {
-		gf_svg_delete_attribute_value(rai->last_specified_value.fieldType, 
-									  rai->last_specified_value.far_ptr, 
-									  rai->anim_elt->sgprivate->scenegraph);
+		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	
+#if USE_GF_PATH
 #else
 	if (rai->path) gf_path_del(rai->path);
 #endif
@@ -1371,9 +1371,9 @@
 		}
 		if (gf_list_count(aa->anims) == 0) {
 			gf_list_del(aa->anims);
-			gf_svg_delete_attribute_value(aa->specified_value.fieldType, 
-				                          aa->specified_value.far_ptr, 
-										  target->sgprivate->scenegraph);
+			gf_svg_delete_attribute_value(aa->specified_value.fieldType,
+			                              aa->specified_value.far_ptr,
+			                              target->sgprivate->scenegraph);
 			aa->presentation_value.far_ptr = aa->orig_dom_ptr;
 			gf_node_animation_rem((GF_Node *)target, i);
 			gf_free(aa);
@@ -1388,14 +1388,14 @@
 	for (i = 0; i < gf_node_animation_count(e); i ++) {
 		SMIL_Anim_RTI *rai;
 		SMIL_AttributeAnimations *aa = (SMIL_AttributeAnimations *)gf_node_animation_get(e, i);
-		gf_svg_delete_attribute_value(aa->specified_value.fieldType, 
-			                          aa->specified_value.far_ptr, 
-									  e->sgprivate->scenegraph);
+		gf_svg_delete_attribute_value(aa->specified_value.fieldType,
+		                              aa->specified_value.far_ptr,
+		                              e->sgprivate->scenegraph);
 		j=0;
 		while ((rai = (SMIL_Anim_RTI *)gf_list_enum(aa->anims, &j))) {
 			rai->xlinkp->href->target = NULL;
 			gf_smil_anim_delete_runtime_info(rai);
-		}		
+		}
 		gf_list_del(aa->anims);
 		gf_free(aa);
 	}
@@ -1408,12 +1408,12 @@
 	XLinkAttributesPointers *xlinkp = NULL;
 	SVGTimedAnimBaseElement *e = (SVGTimedAnimBaseElement *)node;
 	gf_smil_timing_init_runtime_info(node);
-	
+
 	gf_svg_flatten_attributes((SVG_Element *)e, &all_atts);
 	GF_SAFEALLOC(e->xlinkp, XLinkAttributesPointers);
 	xlinkp = e->xlinkp;
 	xlinkp->href = all_atts.xlink_href;
-	xlinkp->type = all_atts.xlink_type;		
+	xlinkp->type = all_atts.xlink_type;
 
 	e->timingp->runtime->evaluate_status = SMIL_TIMING_EVAL_DISCARD;
 }
@@ -1424,12 +1424,12 @@
 	SMILAnimationAttributesPointers *animp = NULL;
 	SVGAllAttributes all_atts;
 	SVGTimedAnimBaseElement *e = (SVGTimedAnimBaseElement *)node;
-	
+
 	gf_svg_flatten_attributes((SVG_Element *)e, &all_atts);
 	e->xlinkp = gf_malloc(sizeof(XLinkAttributesPointers));
 	xlinkp = e->xlinkp;
 	xlinkp->href = all_atts.xlink_href;
-	xlinkp->type = all_atts.xlink_type;		
+	xlinkp->type = all_atts.xlink_type;
 
 	/*perform init of default values
 	  When the xlink:href attribute of animation is not set, the target defaults to the parent element */
@@ -1441,12 +1441,12 @@
 		xlinkp->href->target = gf_node_get_parent(node, 0);
 	}
 	if (xlinkp->href->type == XMLRI_STRING) {
-		if (!xlinkp->href->string) { 
+		if (!xlinkp->href->string) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,("Error: IRI not initialized\n"));
 			return;
 		} else {
 			GF_Node *n;
-			
+
 			n = (GF_Node*)gf_sg_find_node_by_name(gf_node_get_graph(node), xlinkp->href->string);
 			if (n) {
 				xlinkp->href->type = XMLRI_ELEMENTID;
@@ -1456,7 +1456,7 @@
 				return;
 			}
 		}
-	} 
+	}
 	if (!xlinkp->href->target) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL,("Trying to initialize an animation when the target is not known\n"));
 		return;
@@ -1467,12 +1467,12 @@
 		goto end_init;
 	}
 
-	/* if an attribute (to, from or by) is present but its type is not set 
+	/* if an attribute (to, from or by) is present but its type is not set
 	(e.g. it could not be determined before, the target was not known), we try to get the type from the target */
 	if ( (all_atts.to && (all_atts.to->type==0))
-		|| (all_atts.from && (all_atts.from->type==0))
-		|| (all_atts.by && (all_atts.by->type==0))
-	) {
+	        || (all_atts.from && (all_atts.from->type==0))
+	        || (all_atts.by && (all_atts.by->type==0))
+	   ) {
 		GF_FieldInfo info;
 		if (gf_node_get_attribute_by_name((GF_Node *)xlinkp->href->target, all_atts.attributeName->name, 0, 1, 1, &info)==GF_OK) {
 			u32 anim_value_type = info.fieldType;
@@ -1480,9 +1480,15 @@
 			for (i=0; i<3; i++) {
 				u32 tag = 0;
 				switch (i) {
-				case 0: tag=TAG_SVG_ATT_to; break;
-				case 1: tag=TAG_SVG_ATT_from; break;
-				case 2: tag=TAG_SVG_ATT_by; break;
+				case 0:
+					tag=TAG_SVG_ATT_to;
+					break;
+				case 1:
+					tag=TAG_SVG_ATT_from;
+					break;
+				case 2:
+					tag=TAG_SVG_ATT_by;
+					break;
 				}
 				if (gf_node_get_attribute_by_tag((GF_Node *)node, tag, 0, 0, &info)==GF_OK) {
 					SMIL_AnimateValue *attval = info.far_ptr;
@@ -1525,7 +1531,7 @@
 		e->animp->path = NULL;
 		e->animp->rotate = NULL;
 	}
-	
+
 end_init:
 	gf_smil_timing_init_runtime_info(node);
 	gf_smil_anim_init_runtime_info(node);

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/smil_timing.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/smil_timing.c Changed

@@ -14,7 +14,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -53,7 +53,7 @@
 
 	/* TODO: check if the test on begin is right and needed */
 	if (!timingp/* || interval->begin == -1*/) return;
-	
+
 	switch (gf_node_get_tag((GF_Node *)rti->timed_elt)) {
 	case TAG_SVG_discard:
 		interval->active_duration = -1;
@@ -82,14 +82,14 @@
 				interval->repeat_duration = interval->simple_duration;
 			}
 		} else {
-			interval->repeat_duration = MIN(timingp->repeatDur->clock_value, 
-										FIX2FLT(timingp->repeatCount->count) * interval->simple_duration);
-		}			
+			interval->repeat_duration = MIN(timingp->repeatDur->clock_value,
+			                                FIX2FLT(timingp->repeatCount->count) * interval->simple_duration);
+		}
 	} else {
 
 		/* simple_duration is indefinite */
 		interval->simple_duration = -1;
-		
+
 		/* we can ignore repeatCount to compute active_duration */
 		if (!isRepeatDurDefined) {
 			interval->repeat_duration = -1;
@@ -99,38 +99,38 @@
 	}
 
 	interval->active_duration = interval->repeat_duration;
-	/* Step 2: if end is defined in the document, clamp active duration to end-begin 
+	/* Step 2: if end is defined in the document, clamp active duration to end-begin
 	otherwise return*/
 	if (interval->end < 0) {
 		/* interval->active_duration stays as is */
 	} else {
 		if (interval->active_duration >= 0)
 			interval->active_duration = MIN(interval->active_duration, interval->end - interval->begin);
-		else 
+		else
 			interval->active_duration = interval->end - interval->begin;
 	}
 
-	/* min and max check should be checked last, 
-	   to ensure that they have greater priority than the end attribute 
+	/* min and max check should be checked last,
+	   to ensure that they have greater priority than the end attribute
 	   see (animate-elem-223-t.svg) */
 	/* Step 3: clamp the active duration with min and max */
 	clamp_active_duration = 1;
 	/* testing for presence of min and max because some elements may not have them: eg SVG audio */
 	isMinDefined = (timingp->min && timingp->min->type == SMIL_DURATION_DEFINED);
 	isMaxDefined = (timingp->max && timingp->max->type == SMIL_DURATION_DEFINED);
-	if (isMinDefined && isMaxDefined && 
-		timingp->max->clock_value < timingp->min->clock_value) {
+	if (isMinDefined && isMaxDefined &&
+	        timingp->max->clock_value < timingp->min->clock_value) {
 		clamp_active_duration = 0;
 	}
 	if (clamp_active_duration) {
 		if (isMinDefined) {
-			if ((interval->active_duration >= 0) && 
-				(interval->active_duration <= timingp->min->clock_value)) {
-				/* see http://www.w3.org/TR/2005/REC-SMIL2-20051213/smil-timing.html#Timing-MinMax 			
-				  - if repeat duration or simple duration is smaller than min, 
-				  then the (active ? / simple ?) duration shall be set to min 
+			if ((interval->active_duration >= 0) &&
+			        (interval->active_duration <= timingp->min->clock_value)) {
+				/* see http://www.w3.org/TR/2005/REC-SMIL2-20051213/smil-timing.html#Timing-MinMax
+				  - if repeat duration or simple duration is smaller than min,
+				  then the (active ? / simple ?) duration shall be set to min
 				  (cf 6th row in animate-elem-65-t.svg)
-				  - if the min > dur > end, the element is played normally for its simple duration 
+				  - if the min > dur > end, the element is played normally for its simple duration
 				  and then is frozen or not shown depending on the value of the fill attribute.
 				  (cf animate-elem-222-t.svg)*/
 				interval->active_duration = timingp->min->clock_value;
@@ -139,7 +139,7 @@
 		}
 		if (isMaxDefined) {
 			if ((interval->active_duration >= 0 && interval->active_duration >= timingp->max->clock_value) ||
-				interval->active_duration == -1) {
+			        interval->active_duration == -1) {
 				interval->active_duration = timingp->max->clock_value;
 			}
 		}
@@ -157,21 +157,21 @@
 }
 
 /* the end value of this interval needs to be initialized before computing the active duration
-   the begin value must be >= 0 
+   the begin value must be >= 0
    The result can be:
     - a positive value meaning that a resolved and non-indefinite value was found
 	- the value -1 meaning indefinite or unresolved
 		TODO: we should make a difference between indefinite and unresolved because
-		if an interval is created with a value of indefinite, this value should not 
+		if an interval is created with a value of indefinite, this value should not
 		be replaced by a resolved event. (Not sure ?!!)
 	- the value -2 meaning that a valid end value (including indefinite) could not be found
-*/ 
+*/
 static void gf_smil_timing_get_interval_end(SMIL_Timing_RTI *rti, SMIL_Interval *interval)
 {
 	u32 end_count, j;
 
-	/* we set the value to indicate that this is an illegal end, 
-	   if it stays like that after searching through the values, 
+	/* we set the value to indicate that this is an illegal end,
+	   if it stays like that after searching through the values,
 	   then the whole interval must be discarded */
 	interval->end = -2;
 
@@ -190,10 +190,10 @@
 				interval->end = -1;
 				break;
 			}
-		}	
+		}
 	} else {
 		interval->end = -1;
-	}					
+	}
 }
 
 static void gf_smil_timing_get_first_interval(SMIL_Timing_RTI *rti)
@@ -209,7 +209,7 @@
 			break;
 		}
 	}
-	/*In SVG, if no 'begin' is specified, the default timing of the time container 
+	/*In SVG, if no 'begin' is specified, the default timing of the time container
 	is equivalent to an offset value of '0'.*/
 	if (rti->current_interval->begin == -1 && count == 0) {
 		/* except for LASeR Conditional element*/
@@ -219,7 +219,7 @@
 			return;
 		}
 	}
-	
+
 	/* 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) {
@@ -241,15 +241,15 @@
 
 	memset(interval, 0, sizeof(SMIL_Interval));
 	interval->begin = -1;
-	
+
 	count = (rti->timingp->begin ? gf_list_count(*rti->timingp->begin) : 0);
 	for (i = 0; i < count; i ++) {
 		SMIL_Time *begin = (SMIL_Time*)gf_list_get(*rti->timingp->begin, i);
 		if (GF_SMIL_TIME_IS_CLOCK(begin->type)) {
 			if (rti->current_interval->begin != -1 && begin->clock <= rti->current_interval->begin) continue;
 //			if (rti->current_interval->begin == -1 || begin->clock <= scene_time) {
-				interval->begin = begin->clock;
-				break;
+			interval->begin = begin->clock;
+			break;
 //			}
 		}
 	}
@@ -270,10 +270,10 @@
 	}
 }
 
-/* To reduce the process of notifying the time to all timed elements, we add to the scene graph 
-   only the timed elements which have a resolved current interval, other timed elements will be 
+/* To reduce the process of notifying the time to all timed elements, we add to the scene graph
+   only the timed elements which have a resolved current interval, other timed elements will be
    added at runtime when an event leads to the creation of a new interval.
-   We also insert the new timed element in the order of the current_interval begin value, to stop 
+   We also insert the new timed element in the order of the current_interval begin value, to stop
    the notification of time when not necessary */
 static Bool gf_smil_timing_add_to_sg(GF_SceneGraph *sg, SMIL_Timing_RTI *rti)
 {
@@ -291,8 +291,8 @@
 	return 0;
 }
 
-/* when a timed element restarts, since the list of timed elements in the scene graph, 
-   to which scene time is notified at each rendering cycle, is sorted, we need to remove 
+/* when a timed element restarts, since the list of timed elements in the scene graph,
+   to which scene time is notified at each rendering cycle, is sorted, we need to remove
    and reinsert this timed element as if it was a new one, to make sure the sorting is correct */
 static void gf_smil_mark_modified(SMIL_Timing_RTI *rti, Bool remove)
 {
@@ -307,9 +307,9 @@
 	}
 }
 
-/* Attributes from the timed elements are not easy to use during runtime, 
-   the runtime info is a set of easy to use structures. 
-   This function initializes them (intervals, status ...) 
+/* Attributes from the timed elements are not easy to use during runtime,
+   the runtime info is a set of easy to use structures.
+   This function initializes them (intervals, status ...)
    and registers the element with the scenegraph */
 GF_EXPORT
 void gf_smil_timing_init_runtime_info(GF_Node *timed_elt)
@@ -338,11 +338,11 @@
 	if (!timingp) return;
 
 	if (tag == TAG_SVG_audio || tag == TAG_SVG_video) {
-		/* if the dur attribute is not set, then it should be set to media 
-		   as this is the default for media elements see 
+		/* if the dur attribute is not set, then it should be set to media
+		   as this is the default for media elements see
 		   http://www.w3.org/TR/2005/REC-SMIL2-20051213/smil-timing.html#Timing-DurValueSemantics
-		   "For simple media elements that specify continuous media (i.e. media with an inherent notion of time), 
-		   the implicit duration is the intrinsic duration of the media itself - e.g. video and audio files 
+		   "For simple media elements that specify continuous media (i.e. media with an inherent notion of time),
+		   the implicit duration is the intrinsic duration of the media itself - e.g. video and audio files
 		   have a defined duration."
 		TODO: Check if this should work with the animation element */
 		if (!e->timingp->dur) {
@@ -360,7 +360,7 @@
 
 	rti->timingp = timingp;
 	rti->status = SMIL_STATUS_WAITING_TO_BEGIN;
-	rti->evaluate_status = SMIL_TIMING_EVAL_NONE;	
+	rti->evaluate_status = SMIL_TIMING_EVAL_NONE;
 	rti->evaluate = gf_smil_timing_null_timed_function;
 	rti->scene_time = -1;
 	rti->force_reevaluation = 0;
@@ -418,12 +418,12 @@
 	/*remove all associated listeners*/
 	if (rti->timingp->begin) gf_smil_timing_reset_time_list(* rti->timingp->begin);
 	if (rti->timingp->end) gf_smil_timing_reset_time_list(* rti->timingp->end);
-	
+
 	gf_free(rti);
 }
 
 GF_EXPORT
-Bool gf_smil_timing_is_active(GF_Node *node) 
+Bool gf_smil_timing_is_active(GF_Node *node)
 {
 	SMILTimingAttributesPointers *timingp = NULL;
 	timingp = ((SVGTimedAnimBaseElement *)node)->timingp;
@@ -434,7 +434,7 @@
 /* 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 
+   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)
@@ -448,14 +448,14 @@
 	active_count = 0;
 
 	/*
-		Note: whenever a timed element is active, we trigger a gf_node_dirty_parent_graph so that the parent graph 
+		Note: whenever a timed element is active, we trigger a gf_node_dirty_parent_graph so that the parent graph
 		is aware that some modifications may happen in the subtree. This is needed for cases where the subtree
-		is in an offscreen surface, to force retraversing of the subtree and thus apply the animation. 
+		is in an offscreen surface, to force retraversing of the subtree and thus apply the animation.
 
 	*/
-	
-	/* notify the new scene time to the register timed elements 
-	   this might modify other timed elements or the element itself 
+
+	/* notify the new scene time to the register timed elements
+	   this might modify other timed elements or the element itself
 	   in which case it will be added to the list of modified elements */
 	i = 0;
 	do_loop = 1;
@@ -464,18 +464,18 @@
 		switch (ret) {
 		case -1:
 			/* special case for discard element
-			   when a discard element is executed, it automatically removes itself from the list of timed element 
+			   when a discard element is executed, it automatically removes itself from the list of timed element
 			   in the scene graph, we need to fix the index i. */
 			i--;
 			break;
 		case -2:
 			/* special return value, -2 means that the tested timed element is waiting to begin
-			   Assuming that the timed elements are sorted by begin order, 
+			   Assuming that the timed elements are sorted by begin order,
 			   the next ones don't need to be checked */
 			do_loop = 0;
 			break;
 		case -3:
-			/* special case for animation elements which do not need to be notified anymore, 
+			/* special case for animation elements which do not need to be notified anymore,
 			   but which require a tree traversal */
 			i--;
 			active_count ++;
@@ -491,7 +491,7 @@
 		}
 	}
 
-	/* notify the timed elements which have been modified either since the previous frame (updates, scripts) or 
+	/* notify the timed elements which have been modified either since the previous frame (updates, scripts) or
 	   because of the start/end/repeat of the previous notifications */
 	while (gf_list_count(sg->modified_smil_timed_elements)) {
 		/* first remove the modified smil timed element */
@@ -529,7 +529,7 @@
 	return (active_count>0);
 }
 
-/* evaluation function for the discard element 
+/* evaluation function for the discard element
    returns 1 if the discard was executed
            0 otherwise
 */
@@ -542,7 +542,7 @@
 	GF_Node *target;
 
 	if (!timingp) return 0;
-	
+
 	target = tb->xlinkp->href ? tb->xlinkp->href->target : NULL;
 
 	begin = (timingp->begin ? (SMIL_Time *)gf_list_get(*timingp->begin, 0) : NULL);
@@ -555,7 +555,7 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SVG Composer] discarding element %s at time %f\n", target ? gf_node_get_log_name(target) : "None", scene_time));
 
 	gf_smil_mark_modified(rti, 1);
-	
+
 	/*this takes care of cases where discard is a child of its target*/
 	gf_node_register(rti->timed_elt, NULL);
 	nb_inst = gf_node_get_num_instances(rti->timed_elt);
@@ -570,7 +570,7 @@
 	return 1;
 }
 
-/* Animations are applied in their begin order first and then in document order. 
+/* Animations are applied in their begin order first and then in document order.
    Whenever an animation (re)starts, it is placed at the end of the queue (potentially after frozen animations) */
 static void gf_smil_reorder_anim(SMIL_Timing_RTI *rti)
 {
@@ -584,11 +584,11 @@
 
 /* Notifies the scene time to a timed element, potentially changing its status and triggering its evaluation
    Returns:
-	0 if no rendering traversal is required, 
+	0 if no rendering traversal is required,
 	1 if a rendering traversal is required,
    -1 if the time node is a discard which has been deleted during this notification,
    -2 means that the timed element is waiting to begin,
-   -3 means that the timed element is active but does not need further notifications (set without dur) 
+   -3 means that the timed element is active but does not need further notifications (set without dur)
              but still requires a rendering traversal */
 s32 gf_smil_timing_notify_time(SMIL_Timing_RTI *rti, Double in_scene_time)
 {
@@ -599,20 +599,20 @@
 
 	if (!timingp) return 0;
 
-	/* if the scene time is the same as it was during the previous notification, it means that the 
+	/* if the scene time is the same as it was during the previous notification, it means that the
 	   animations are paused and we don't need to evaluate it again unless the force_reevaluation flag is set */
 	if ((rti->scene_time == in_scene_time) && (rti->force_reevaluation == 0)) return 0;
 	if (!rti->paused) rti->scene_time = in_scene_time;
 	rti->force_reevaluation = 0;
 
 	/* for fraction events, in all cases we indicate that the scene needs redraw */
-	if (rti->evaluate_status == SMIL_TIMING_EVAL_FRACTION) 
+	if (rti->evaluate_status == SMIL_TIMING_EVAL_FRACTION)
 		return 1;
 
 	if (rti->evaluate_status == SMIL_TIMING_EVAL_DISCARD) {
 		/* TODO: FIX ME discarding should send a begin event ? */
-		/* Since the discard can only be evaluated once, it unregisters itself 
-		   from the list of timed elements to be notified, so for this special case 
+		/* Since the discard can only be evaluated once, it unregisters itself
+		   from the list of timed elements to be notified, so for this special case
 		   we return -1 when the discard has actually been executed */
 		if (gf_smil_discard(rti, FLT2FIX(rti->scene_time))) return -1;
 		else return 0;
@@ -622,8 +622,8 @@
 
 waiting_to_begin:
 	if (rti->status == SMIL_STATUS_WAITING_TO_BEGIN) {
-		if (rti->current_interval->begin != -1 && rti->scene_time >= rti->current_interval->begin) {			
-			/* if there is a computed interval with a definite begin value 
+		if (rti->current_interval->begin != -1 && rti->scene_time >= rti->current_interval->begin) {
+			/* if there is a computed interval with a definite begin value
 			   and if that value is lesser than the scene time, then the animation becomes active */
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing   ] Time %f - Timed element %s - Activating\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 			rti->status = SMIL_STATUS_ACTIVE;
@@ -640,7 +640,7 @@
 			memset(&evt, 0, sizeof(evt));
 			evt.type = GF_EVENT_BEGIN_EVENT;
 			evt.smil_event_time = rti->current_interval->begin;
-			gf_dom_event_fire((GF_Node *)rti->timed_elt, &evt);				
+			gf_dom_event_fire((GF_Node *)rti->timed_elt, &evt);
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing   ] Time %f - Timed element %s - Evaluating (Not starting)\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 			ret = -2;
@@ -651,8 +651,8 @@
 	if (rti->status == SMIL_STATUS_ACTIVE) {
 		u32 cur_id;
 
-		if (rti->current_interval->active_duration >= 0 
-			&& rti->scene_time >= (rti->current_interval->begin + rti->current_interval->active_duration)) {
+		if (rti->current_interval->active_duration >= 0
+		        && rti->scene_time >= (rti->current_interval->begin + rti->current_interval->active_duration)) {
 force_end:
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing   ] Time %f - Timed element %s - Stopping \n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 
@@ -685,28 +685,28 @@
 
 			if (!timingp->restart || *timingp->restart == SMIL_RESTART_ALWAYS) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing   ] Time %f - Timed element %s - Checking for restart (always)\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
-			
+
 				if (rti->next_interval->begin != -1 && rti->next_interval->begin < rti->scene_time) {
 					*rti->current_interval = *rti->next_interval;
 					gf_smil_timing_get_next_interval(rti, 0, rti->next_interval, rti->scene_time);
 
-					/* mark that this element has been modified and 
+					/* mark that this element has been modified and
 					   need to be reinserted at its proper place in the list of timed elements in the scenegraph */
 					gf_smil_mark_modified(rti, 0);
 
-					/* if this is animation, reinserting the animation in the list of animations 
-				       that targets this attribute, so that it is the last one */
+					/* if this is animation, reinserting the animation in the list of animations
+					   that targets this attribute, so that it is the last one */
 					gf_smil_reorder_anim(rti);
 
 					memset(&evt, 0, sizeof(evt));
 					evt.type = GF_EVENT_BEGIN_EVENT;
 					evt.smil_event_time = rti->current_interval->begin;
-					gf_dom_event_fire((GF_Node *)rti->timed_elt, &evt);				
-				} 
+					gf_dom_event_fire((GF_Node *)rti->timed_elt, &evt);
+				}
 			}
 
 			ret = rti->postpone;
-			
+
 			cur_id = rti->current_interval->nb_iterations;
 			rti->normalized_simple_time = gf_smil_timing_get_normalized_simple_time(rti, rti->scene_time, &force_end);
 			if (force_end) {
@@ -721,7 +721,7 @@
 				evt.detail = rti->current_interval->nb_iterations;
 				gf_dom_event_fire((GF_Node *)rti->timed_elt, &evt);
 
-				rti->evaluate_status = SMIL_TIMING_EVAL_REPEAT;		
+				rti->evaluate_status = SMIL_TIMING_EVAL_REPEAT;
 			} else {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing   ] Time %f - Timed element %s - Preparing to update\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 				rti->evaluate_status = SMIL_TIMING_EVAL_UPDATE;
@@ -732,23 +732,23 @@
 			}
 
 			/* special case for animations with unspecified simpleDur (not with media timed elements)
-			   we need to indicate that this anim does not need to be notified anymore and that 
+			   we need to indicate that this anim does not need to be notified anymore and that
 			   it does not require tree traversal */
 			if (gf_svg_is_animation_tag(rti->timed_elt->sgprivate->tag)
-				&& (rti->current_interval->simple_duration==-1) 
-				&& (rti->current_interval->active_duration==-1) 
-			) {
+			        && (rti->current_interval->simple_duration==-1)
+			        && (rti->current_interval->active_duration==-1)
+			   ) {
 				/*GF_SceneGraph * sg = rti->timed_elt->sgprivate->scenegraph;
 				while (sg->parent_scene) sg = sg->parent_scene;
 				gf_list_del_item(sg->smil_timed_elements, rti);
 				ret = -3;*/
 				ret = 1;
-			} 
+			}
 		}
 	}
 
 	if ((rti->status == SMIL_STATUS_DONE) || (rti->status == SMIL_STATUS_FROZEN)) {
-		if (!timingp->restart || *timingp->restart != SMIL_RESTART_NEVER) { 
+		if (!timingp->restart || *timingp->restart != SMIL_RESTART_NEVER) {
 			/* Check changes in begin or end attributes */
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing   ] Time %f - Timed element %s - Checking for restart when not active\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 			if (rti->next_interval->begin != -1) {
@@ -758,13 +758,13 @@
 					restart_timing = 1;
 
 				/*switch intervals*/
-				if (rti->next_interval->begin >= rti->current_interval->begin+rti->current_interval->active_duration) { 
+				if (rti->next_interval->begin >= rti->current_interval->begin+rti->current_interval->active_duration) {
 					*rti->current_interval = *rti->next_interval;
-				
+
 					gf_smil_timing_print_interval(rti, 1, rti->current_interval);
 					gf_smil_timing_get_next_interval(rti, 0, rti->next_interval, rti->scene_time);
 
-					/* mark that this element has been modified and 
+					/* mark that this element has been modified and
 					   need to be reinserted at its proper place in the list of timed elements in the scenegraph */
 					gf_smil_mark_modified(rti, 0);
 				} else {
@@ -788,8 +788,8 @@
 				/*??? what is this ???*/
 				//ret = 0;
 			}
-		} else if ((rti->status == SMIL_STATUS_DONE) && 
-			        timingp->restart && (*timingp->restart == SMIL_RESTART_NEVER)) {
+		} else if ((rti->status == SMIL_STATUS_DONE) &&
+		           timingp->restart && (*timingp->restart == SMIL_RESTART_NEVER)) {
 			/* the timed element is done and cannot restart, we don't need to evaluate it anymore */
 			GF_SceneGraph * sg = rti->timed_elt->sgprivate->scenegraph;
 			while (sg->parent_scene) sg = sg->parent_scene;
@@ -804,11 +804,11 @@
 }
 
 /* returns a fraction between 0 and 1 of the elapsed time in the simple duration */
-/* WARNING: According to SMIL (http://www.w3.org/TR/2005/REC-SMIL2-20051213/animation.html#animationNS-Fill, 
+/* WARNING: According to SMIL (http://www.w3.org/TR/2005/REC-SMIL2-20051213/animation.html#animationNS-Fill,
 see "Illustration of animation combining a partial repeat and fill="freeze"")
 When a element is frozen, its normalized simple time is not necessarily 1,
 an animation can be frozen in the middle of a repeatition */
-Fixed gf_smil_timing_get_normalized_simple_time(SMIL_Timing_RTI *rti, Double scene_time, Bool *force_end) 
+Fixed gf_smil_timing_get_normalized_simple_time(SMIL_Timing_RTI *rti, Double scene_time, Bool *force_end)
 {
 	Double activeTime;
 	Double simpleTime;
@@ -827,7 +827,7 @@
 
 		/* if the simple duration is defined, then we can take iterations into account */
 		if (rti->current_interval->simple_duration>0) {
-			
+
 			if (activeTime == rti->current_interval->simple_duration*(rti->current_interval->nb_iterations+1)) {
 				return FIX_ONE;
 			} else {
@@ -835,14 +835,14 @@
 			}
 		} else {
 			/* If the element does not define its simple duration, but it has an active duration,
-			   and we are past this active duration, we assume it's blocked in final state 
+			   and we are past this active duration, we assume it's blocked in final state
 			   We should take into account fill behavior*/
 			rti->current_interval->nb_iterations = 0;
 			if (rti->timingp->fill && *(rti->timingp->fill) == SMIL_FILL_FREEZE) {
 				if (rti->current_interval->repeat_duration == rti->current_interval->simple_duration) {
 					return FIX_ONE;
 				} else {
-					return	rti->normalized_simple_time;			
+					return	rti->normalized_simple_time;
 				}
 			} else {
 				return 0;
@@ -863,20 +863,20 @@
 				if (rti->current_interval->repeat_duration == rti->current_interval->simple_duration) {
 					return FIX_ONE;
 				} else {
-					return	rti->normalized_simple_time;			
+					return	rti->normalized_simple_time;
 				}
 			}
 		}
 		/* we update the number of iterations */
 		rti->current_interval->nb_iterations = (u32)floor(activeTime / rti->current_interval->simple_duration);
 	} else {
-		/* If the element does not define its simple duration, we assume it's blocked in final state 
+		/* If the element does not define its simple duration, we assume it's blocked in final state
 		   Is this correct ? */
 		rti->current_interval->nb_iterations = 0;
 		//GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing   ] Time %f - Timed element %s - Error Computing Normalized Simple Time while simple duration is indefinite\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 		return FIX_ONE;
 	}
-	
+
 	/* We compute the simple time by removing time taken by previous iterations */
 	simpleTime = activeTime - rti->current_interval->simple_duration * rti->current_interval->nb_iterations;
 
@@ -895,9 +895,9 @@
 {
 	SMILTimingAttributesPointers *timingp = NULL;
 	SMIL_Timing_RTI *rti;
-	
+
 	timingp = ((SVGTimedAnimBaseElement *)node)->timingp;
-	
+
 	if (!timingp) return;
 	rti = timingp->runtime;
 	if (!rti) return;
@@ -916,13 +916,13 @@
 			rti->current_interval->end = -1;
 			return;
 		}
-		
+
 		gf_smil_timing_compute_active_duration(rti, rti->current_interval);
 		gf_smil_timing_print_interval(rti, 1, rti->current_interval);
 	}
 	gf_smil_timing_get_next_interval(rti, 0, rti->next_interval, gf_node_get_scene_time((GF_Node*)rti->timed_elt));
 
-	/* mark that this element has been modified and 
+	/* mark that this element has been modified and
 	   need to be reinserted at its proper place in the list of timed elements in the scenegraph */
 	gf_smil_mark_modified(rti, 0);
 }
@@ -930,8 +930,8 @@
 
 /* Tries to resolve event-based or sync-based time values
    Used in parsing, to determine if a timed element can be initialized */
-Bool gf_svg_resolve_smil_times(GF_Node *anim, void *event_base_element, 
-							GF_List *smil_times, Bool is_end, const char *node_name)
+Bool gf_svg_resolve_smil_times(GF_Node *anim, void *event_base_element,
+                               GF_List *smil_times, Bool is_end, const char *node_name)
 {
 	u32 i, done, count;
 
@@ -951,7 +951,7 @@
 		}
 		/*commented out because it breaks regular anims (cf interact-pevents-07-t.svg)*/
 //		if (node_name && strcmp(node_name, t->element_id)) continue;
-	
+
 		t->element = gf_sg_find_node_by_name(anim->sgprivate->scenegraph, t->element_id);
 		if (t->element) {
 			gf_free(t->element_id);
@@ -973,7 +973,7 @@
 	return 1;
 }
 
-/* Inserts a new resolved time instant in the begin or end attribute. 
+/* 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. */
@@ -1003,9 +1003,9 @@
 			count--;
 			continue;
 		}
-		if ( (first->type == GF_SMIL_TIME_INDEFINITE) 
-			|| ( (first->type == GF_SMIL_TIME_CLOCK) && (first->clock > begin->clock) ) 
-		) {
+		if ( (first->type == GF_SMIL_TIME_INDEFINITE)
+		        || ( (first->type == GF_SMIL_TIME_CLOCK) && (first->clock > begin->clock) )
+		   ) {
 			gf_list_insert(l, begin, i);
 			found = 1;
 			break;
@@ -1033,8 +1033,8 @@
 	}
 }
 
-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,
+                                     void (*smil_evaluate)(struct _smil_timing_rti *rti, Fixed normalized_simple_time, u32 state))
 {
 	if (node && ((SVGTimedAnimBaseElement *)node)->timingp  && ((SVGTimedAnimBaseElement *)node)->timingp->runtime) {
 		SMIL_Timing_RTI *rti = ((SVGTimedAnimBaseElement *)node)->timingp->runtime;

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/svg_attributes.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/svg_attributes.c Changed

@@ -24,6 +24,7 @@
  */
 
 #include <gpac/base_coding.h>
+#include <gpac/color.h>
 #include <gpac/events.h>
 #include <gpac/nodes_svg.h>
 
@@ -34,7 +35,11 @@
 #define DUMP_COORDINATES 1
 
 
-static const struct dom_event_def {GF_EventType event;  const char *name; GF_DOMEventCategory category; } defined_dom_events [] =
+static const struct dom_event_def {
+	GF_EventType event;
+	const char *name;
+	GF_DOMEventCategory category;
+} defined_dom_events [] =
 {
 	{ GF_EVENT_ABORT, "abort", GF_DOM_EVENT_DOM },
 	{ GF_EVENT_ERROR, "error", GF_DOM_EVENT_DOM },
@@ -131,7 +136,7 @@
 	{ GF_EVENT_ABORT, "abort", GF_DOM_EVENT_MEDIA },
 	{ GF_EVENT_ERROR, "error", GF_DOM_EVENT_MEDIA },
 	{ GF_EVENT_MEDIA_EMPTIED, "emptied", GF_DOM_EVENT_MEDIA },
-	{ GF_EVENT_MEDIA_STALLED, "stalled", GF_DOM_EVENT_MEDIA },	
+	{ GF_EVENT_MEDIA_STALLED, "stalled", GF_DOM_EVENT_MEDIA },
 	{ GF_EVENT_MEDIA_LOADED_METADATA, "loadedmetadata", GF_DOM_EVENT_MEDIA },
 	{ GF_EVENT_MEDIA_LODADED_DATA, "loadeddata", GF_DOM_EVENT_MEDIA },
 	{ GF_EVENT_MEDIA_CANPLAY, "canplay", GF_DOM_EVENT_MEDIA },
@@ -161,8 +166,48 @@
 	{ GF_EVENT_HTML_MSE_REMOVE_SOURCE_BUFFER, "removesourcebuffer", GF_DOM_EVENT_MEDIASOURCE },
 
 	/*GPAC internals*/
-	{ GF_EVENT_SCENE_ATTACHED, "gpac_scene_attached", GF_DOM_EVENT_DOM },
-	{ GF_EVENT_VP_RESIZE, "gpac_vp_changed", GF_DOM_EVENT_DOM },
+	{ GF_EVENT_SCENE_ATTACHED, "gpac_scene_attached", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_VP_RESIZE, "gpac_vp_changed", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_ADDON_DETECTED, "gpac_addon_found", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_MAIN_ADDON_STATE, "gpac_main_addon_state", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_STREAMLIST, "gpac_streamlist_changed", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_TIMESHIFT_DEPTH, "gpac_timeshift_depth_changed", GF_DOM_EVENT_GPAC},
+
+
+#if 0
+	{ GF_EVENT_DBLCLICK, "gpac_dbl_click", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_SIZE, "gpac_size_changed", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_SCENE_SIZE, "gpac_scene_size", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_SHOWHIDE, "gpac_show_hide", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_SET_CURSOR, "gpac_set_cursor", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_SET_CAPTION, "gpac_set_caption", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_MOVE, "gpac_move", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_REFRESH, "gpac_move", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_QUIT, "gpac_quit", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_PASTE_TEXT, "gpac_paste", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_COPY_TEXT, "gpac_copy", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_CONNECT, "gpac_on_connect", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_DURATION, "gpac_on_duration", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_EOS, "gpac_eos", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_AUTHORIZATION, "gpac_authorization", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_NAVIGATE, "gpac_navigate", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_NAVIGATE_INFO, "gpac_navigate_info", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_MESSAGE, "gpac_on_message", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_PROGRESS, "gpac_on_progress", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_VIEWPOINTS, "gpac_viewpoints_changed", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_STREAMLIST, "gpac_streamlist_changed", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_METADATA, "gpac_metadata_changed", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_MIGRATE, "gpac_session_migrate", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_DISCONNECT, "gpac_request_disconnect", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_RESOLUTION, "gpac_resolution_changed", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_DROPFILE, "gpac_dropfile", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_TEXT_EDITING_START, "gpac_textedit_start", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_TEXT_EDITING_END, "gpac_textedit_end", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_QUALITY_SWITCHED, "gpac_quality_switch", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_TIMESHIFT_OVERFLOW, "gpac_timeshift_overflow", GF_DOM_EVENT_GPAC},
+	{ GF_EVENT_TIMESHIFT_UPDATE, "gpac_timeshift_update", GF_DOM_EVENT_GPAC}
+#endif
+
 };
 
 GF_EXPORT
@@ -172,18 +217,19 @@
 	count = sizeof(defined_dom_events) / sizeof(struct dom_event_def);
 	if (!name) return GF_EVENT_UNKNOWN;
 	if ((name[0]=='o') && (name[1]=='n')) name += 2;
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		if (!strcmp(name, defined_dom_events[i].name))
 			return defined_dom_events[i].event;
 	}
 	return GF_EVENT_UNKNOWN;
 }
 
+GF_EXPORT
 const char *gf_dom_event_get_name(GF_EventType type)
 {
 	u32 i, count;
 	count = sizeof(defined_dom_events) / sizeof(struct dom_event_def);
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		if (defined_dom_events[i].event == type)
 			return defined_dom_events[i].name;
 	}
@@ -194,7 +240,7 @@
 {
 	u32 i, count;
 	count = sizeof(defined_dom_events) / sizeof(struct dom_event_def);
-	for (i=0;i<count;i++) {
+	for (i=0; i<count; i++) {
 		if (defined_dom_events[i].event == type)
 			return defined_dom_events[i].category;
 	}
@@ -202,7 +248,10 @@
 }
 
 
-static const struct predef_keyid {GF_KeyCode key_code;  const char *name; } predefined_key_identifiers[] =
+static const struct predef_keyid {
+	GF_KeyCode key_code;
+	const char *name;
+} predefined_key_identifiers[] =
 {
 	{ GF_KEY_ACCEPT, "Accept" },
 	{ GF_KEY_AGAIN, "Again" },
@@ -411,10 +460,10 @@
 
 
 GF_EXPORT
-const char *gf_dom_get_key_name(u32 key_identifier)
+const char *gf_dom_get_key_name(GF_KeyCode key_identifier)
 {
 	u32 count = sizeof(predefined_key_identifiers) / sizeof(struct predef_keyid);
-	if (!key_identifier || count<=key_identifier) return "Unknown";
+	if (!key_identifier || count<= (u32) key_identifier) return "Unknown";
 	return predefined_key_identifiers[key_identifier-1].name;
 }
 
@@ -433,39 +482,72 @@
 			return ( GF_KEY_0 + (c[0] - '0') );
 
 		switch ((u8) c[0]) {
-		case '@': return GF_KEY_AT;
-		case '*': return GF_KEY_STAR;
-		case '#': return GF_KEY_NUMBER;
-		case ' ': return GF_KEY_SPACE;
-		case '!': return GF_KEY_EXCLAMATION;
-		case '"': return GF_KEY_QUOTATION;
-		case '$': return GF_KEY_DOLLAR;
-		case '&': return GF_KEY_AMPERSAND;
-		case '\'': return GF_KEY_APOSTROPHE;
-		case '(': return GF_KEY_LEFTPARENTHESIS;
-		case ')': return GF_KEY_RIGHTPARENTHESIS;
-		case '+': return GF_KEY_PLUS;
-		case ',': return GF_KEY_COMMA;
-		case '-': return GF_KEY_HYPHEN;
-		case '.': return GF_KEY_FULLSTOP;
-		case '/': return GF_KEY_SLASH;
-		case ':': return GF_KEY_COLON;
-		case ';': return GF_KEY_SEMICOLON;
-		case '<': return GF_KEY_LESSTHAN;
-		case '=': return GF_KEY_EQUALS;
-		case '>': return GF_KEY_GREATERTHAN;
-		case '?': return GF_KEY_QUESTION;
-		case '[': return GF_KEY_LEFTSQUAREBRACKET;
-		case '\\': return GF_KEY_BACKSLASH;
-		case ']': return GF_KEY_RIGHTSQUAREBRACKET;
-		case '^': return GF_KEY_CIRCUM;
-		case '_': return GF_KEY_UNDERSCORE;
-		case '`': return GF_KEY_GRAVEACCENT;
-		case '{': return GF_KEY_LEFTCURLYBRACKET;
-		case '|': return GF_KEY_PIPE;
-		case '}': return GF_KEY_RIGHTCURLYBRACKET;
-		case 0xA1: return GF_KEY_INVERTEXCLAMATION;
-		default: return GF_KEY_UNIDENTIFIED;
+		case '@':
+			return GF_KEY_AT;
+		case '*':
+			return GF_KEY_STAR;
+		case '#':
+			return GF_KEY_NUMBER;
+		case ' ':
+			return GF_KEY_SPACE;
+		case '!':
+			return GF_KEY_EXCLAMATION;
+		case '"':
+			return GF_KEY_QUOTATION;
+		case '$':
+			return GF_KEY_DOLLAR;
+		case '&':
+			return GF_KEY_AMPERSAND;
+		case '\'':
+			return GF_KEY_APOSTROPHE;
+		case '(':
+			return GF_KEY_LEFTPARENTHESIS;
+		case ')':
+			return GF_KEY_RIGHTPARENTHESIS;
+		case '+':
+			return GF_KEY_PLUS;
+		case ',':
+			return GF_KEY_COMMA;
+		case '-':
+			return GF_KEY_HYPHEN;
+		case '.':
+			return GF_KEY_FULLSTOP;
+		case '/':
+			return GF_KEY_SLASH;
+		case ':':
+			return GF_KEY_COLON;
+		case ';':
+			return GF_KEY_SEMICOLON;
+		case '<':
+			return GF_KEY_LESSTHAN;
+		case '=':
+			return GF_KEY_EQUALS;
+		case '>':
+			return GF_KEY_GREATERTHAN;
+		case '?':
+			return GF_KEY_QUESTION;
+		case '[':
+			return GF_KEY_LEFTSQUAREBRACKET;
+		case '\\':
+			return GF_KEY_BACKSLASH;
+		case ']':
+			return GF_KEY_RIGHTSQUAREBRACKET;
+		case '^':
+			return GF_KEY_CIRCUM;
+		case '_':
+			return GF_KEY_UNDERSCORE;
+		case '`':
+			return GF_KEY_GRAVEACCENT;
+		case '{':
+			return GF_KEY_LEFTCURLYBRACKET;
+		case '|':
+			return GF_KEY_PIPE;
+		case '}':
+			return GF_KEY_RIGHTCURLYBRACKET;
+		case 0xA1:
+			return GF_KEY_INVERTEXCLAMATION;
+		default:
+			return GF_KEY_UNIDENTIFIED;
 		}
 	} else {
 		u32 i, count;
@@ -480,161 +562,13 @@
 }
 
 /* Basic SVG datatype parsing functions */
-static const struct predef_col { const char *name; u8 r; u8 g; u8 b; } predefined_colors[] =
-{
-	{"aliceblue",240, 248, 255},
-	{"antiquewhite",250, 235, 215},
-	{"aqua", 0, 255, 255},
-	{"aquamarine",127, 255, 212},
-	{"azure",240, 255, 255},
-	{"beige",245, 245, 220},
-	{"bisque",255, 228, 196},
-	{"black", 0, 0, 0},
-	{"blanchedalmond",255, 235, 205},
-	{"blue", 0, 0, 255},
-	{"blueviolet",138, 43, 226},
-	{"brown",165, 42, 42},
-	{"burlywood",222, 184, 135},
-	{"cadetblue", 95, 158, 160},
-	{"chartreuse",127, 255, 0},
-	{"chocolate",210, 105, 30},
-	{"coral",255, 127, 80},
-	{"lightpink",255, 182, 193},
-	{"lightsalmon",255, 160, 122},
-	{"lightseagreen", 32, 178, 170},
-	{"lightskyblue",135, 206, 250},
-	{"lightslategray",119, 136, 153},
-	{"lightslategrey",119, 136, 153},
-	{"lightsteelblue",176, 196, 222},
-	{"lightyellow",255, 255, 224},
-	{"lime", 0, 255, 0},
-	{"limegreen", 50, 205, 50},
-	{"linen",250, 240, 230},
-	{"magenta",255, 0, 255},
-	{"maroon",128, 0, 0},
-	{"mediumaquamarine",102, 205, 170},
-	{"mediumblue", 0, 0, 205},
-	{"mediumorchid",186, 85, 211},
-	{"cornflowerblue",100, 149, 237},
-	{"cornsilk",255, 248, 220},
-	{"crimson",220, 20, 60},
-	{"cyan", 0, 255, 255},
-	{"darkblue", 0, 0, 139},
-	{"darkcyan", 0, 139, 139},
-	{"darkgoldenrod",184, 134, 11},
-	{"darkgray",169, 169, 169},
-	{"darkgreen", 0, 100, 0},
-	{"darkgrey",169, 169, 169},
-	{"darkkhaki",189, 183, 107},
-	{"darkmagenta",139, 0, 139},
-	{"darkolivegreen", 85, 107, 47},
-	{"darkorange",255, 140, 0},
-	{"darkorchid",153, 50, 204},
-	{"darkred",139, 0, 0},
-	{"darksalmon",233, 150, 122},
-	{"darkseagreen",143, 188, 143},
-	{"darkslateblue", 72, 61, 139},
-	{"darkslategray", 47, 79, 79},
-	{"darkslategrey", 47, 79, 79},
-	{"darkturquoise", 0, 206, 209},
-	{"darkviolet",148, 0, 211},
-	{"deeppink",255, 20, 147},
-	{"deepskyblue", 0, 191, 255},
-	{"dimgray",105, 105, 105},
-	{"dimgrey",105, 105, 105},
-	{"dodgerblue", 30, 144, 255},
-	{"firebrick",178, 34, 34},
-	{"floralwhite",255, 250, 240},
-	{"forestgreen", 34, 139, 34},
-	{"fuchsia",255, 0, 255},
-	{"gainsboro",220, 220, 220},
-	{"ghostwhite",248, 248, 255},
-	{"gold",255, 215, 0},
-	{"goldenrod",218, 165, 32},
-	{"gray",128, 128, 128},
-	{"grey",128, 128, 128},
-	{"green", 0, 128, 0},
-	{"greenyellow",173, 255, 47},
-	{"honeydew",240, 255, 240},
-	{"hotpink",255, 105, 180},
-	{"indianred",205, 92, 92},
-	{"indigo", 75, 0, 130},
-	{"ivory",255, 255, 240},
-	{"khaki",240, 230, 140},
-	{"lavender",230, 230, 25},
-	{"lavenderblush",255, 240, 245},
-	{"mediumpurple",147, 112, 219},
-	{"mediumseagreen", 60, 179, 113},
-	{"mediumslateblue",123, 104, 238},
-	{"mediumspringgreen", 0, 250, 154},
-	{"mediumturquoise", 72, 209, 204},
-	{"mediumvioletred",199, 21, 133},
-	{"midnightblue", 25, 25, 112},
-	{"mintcream",245, 255, 250},
-	{"mistyrose",255, 228, 225},
-	{"moccasin",255, 228, 181},
-	{"navajowhite",255, 222, 173},
-	{"navy", 0, 0, 128},
-	{"oldlace",253, 245, 230},
-	{"olive",128, 128, 0},
-	{"olivedrab",107, 142, 35},
-	{"orange",255, 165, 0},
-	{"orangered",255, 69, 0},
-	{"orchid",218, 112, 214},
-	{"palegoldenrod",238, 232, 170},
-	{"palegreen",152, 251, 152},
-	{"paleturquoise",175, 238, 238},
-	{"palevioletred",219, 112, 147},
-	{"papayawhip",255, 239, 213},
-	{"peachpuff",255, 218, 185},
-	{"peru",205, 133, 63},
-	{"pink",255, 192, 203},
-	{"plum",221, 160, 221},
-	{"powderblue",176, 224, 230},
-	{"purple",128, 0, 128},
-	{"red",255, 0, 0},
-	{"rosybrown",188, 143, 143},
-	{"royalblue", 65, 105, 225},
-	{"saddlebrown",139, 69, 19},
-	{"salmon",250, 128, 114},
-	{"sandybrown",244, 164, 96},
-	{"seagreen", 46, 139, 87},
-	{"seashell",255, 245, 238},
-	{"sienna",160, 82, 45},
-	{"silver",192, 192, 192},
-	{"skyblue",135, 206, 235},
-	{"slateblue",106, 90, 205},
-	{"slategray",112, 128, 144},
-	{"slategrey",112, 128, 144},
-	{"snow",255, 250, 250},
-	{"springgreen", 0, 255, 127},
-	{"steelblue", 70, 130, 180},
-	{"tan",210, 180, 140},
-	{"teal", 0, 128, 128},
-	{"lawngreen",124, 252, 0},
-	{"lemonchiffon",255, 250, 205},
-	{"lightblue",173, 216, 230},
-	{"lightcoral",240, 128, 128},
-	{"lightcyan",224, 255, 255},
-	{"lightgoldenrodyellow",250, 250, 210},
-	{"lightgray",211, 211, 211},
-	{"lightgreen",144, 238, 144},
-	{"lightgrey",211, 211, 211},
-	{"thistle",216, 191, 216},
-	{"tomato",255, 99, 71},
-	{"turquoise", 64, 224, 208},
-	{"violet",238, 130, 238},
-	{"wheat",245, 222, 179},
-	{"white",255, 255, 255},
-	{"whitesmoke",245, 245, 245},
-	{"yellow",255, 255, 0},
-	{"yellowgreen",154, 205, 50}
-
-};
 
 
 /* Basic SVG datatype parsing functions */
-static const struct sys_col { const char *name; u8 type; } system_colors[] =
+static const struct sys_col {
+	const char *name;
+	u8 type;
+} system_colors[] =
 {
 	{"ActiveBorder", SVG_COLOR_ACTIVE_BORDER},
 	{"ActiveCaption", SVG_COLOR_ACTIVE_CAPTION},
@@ -669,17 +603,16 @@
 /* parses an color from a named color HTML or CSS 2 */
 static void svg_parse_named_color(SVG_Color *col, char *attribute_content)
 {
-	u32 i, count;
-	count = sizeof(predefined_colors) / sizeof(struct predef_col);
-	for (i=0; i<count; i++) {
-		if (!strcmp(attribute_content, predefined_colors[i].name)) {
-			col->red = INT2FIX(predefined_colors[i].r) / 255;
-			col->green = INT2FIX(predefined_colors[i].g) / 255;
-			col->blue = INT2FIX(predefined_colors[i].b) / 255;
-			col->type = SVG_COLOR_RGBCOLOR;
-			return;
-		}
+	u32 i, count, val;
+	val = gf_color_parse(attribute_content);
+	if (val) {
+		col->red = INT2FIX((val>>16) & 0xFF) / 255;
+		col->green = INT2FIX((val>>8) & 0xFF) / 255;
+		col->blue = INT2FIX(val & 0xFF) / 255;
+		col->type = SVG_COLOR_RGBCOLOR;
+		return;
 	}
+
 	count = sizeof(system_colors) / sizeof(struct sys_col);
 	for (i=0; i<count; i++) {
 		if (!strcmp(attribute_content, system_colors[i].name)) {
@@ -747,7 +680,8 @@
 		if (strstr(str, "%")) is_percentage = 1;
 		str = strstr(str, "(");
 		str++;
-		sscanf(str, "%f", &_val); col->red = FLT2FIX(_val);
+		sscanf(str, "%f", &_val);
+		col->red = FLT2FIX(_val);
 		str = strstr(str, ",");
 		if (!str) {
 			/* space separated colors/percentages are not allowed neither in SVG 1.1 nor in SVG T1.2 */
@@ -755,7 +689,8 @@
 			return;
 		}
 		str++;
-		sscanf(str, "%f", &_val); col->green = FLT2FIX(_val);
+		sscanf(str, "%f", &_val);
+		col->green = FLT2FIX(_val);
 		str = strstr(str, ",");
 		if (!str) {
 			/* space separated colors/percentages are not allowed neither in SVG 1.1 nor in SVG T1.2 */
@@ -763,7 +698,8 @@
 			return;
 		}
 		str++;
-		sscanf(str, "%f", &_val); col->blue = FLT2FIX(_val);
+		sscanf(str, "%f", &_val);
+		col->blue = FLT2FIX(_val);
 		if (is_percentage) {
 			col->red /= 100;
 			col->green /= 100;
@@ -775,7 +711,7 @@
 		}
 		col->type = SVG_COLOR_RGBCOLOR;
 	} else if ((str[0] >= 'a' && str[0] <= 'z')
-		|| (str[0] >= 'A' && str[0] <= 'Z')) {
+	           || (str[0] >= 'A' && str[0] <= 'Z')) {
 		svg_parse_named_color(col, str);
 	} else {
 		Float _r, _g, _b;
@@ -798,64 +734,64 @@
 */
 static u32 svg_parse_number(char *d, Fixed *f, Bool is_angle)
 {
-    u32 nb_digit_before = 0;
+	u32 nb_digit_before = 0;
 	u32 nb_digit_after = 0;
-    Bool has_fractional = 0;
+	Bool has_fractional = 0;
 	Bool is_negative = 0;
 	Float _val = 0;
 	u32 i = 0;
 
-    /* warning the comma and semicolumn should not be there when parsing a number in a path */
+	/* warning the comma and semicolumn should not be there when parsing a number in a path */
 	while ((d[i] != 0) && strchr(" ,;\r\n\t", d[i])) i++;
 
-    if (!d[i]) {
-        GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[SVG Parsing] Parsing number with empty string or only spaces: %s\n", d));
-        return 0;
-    }
-    if (d[i] == '+') {
-        i++;
-    } else if (d[i] == '-') {
+	if (!d[i]) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[SVG Parsing] Parsing number with empty string or only spaces: %s\n", d));
+		return 0;
+	}
+	if (d[i] == '+') {
+		i++;
+	} else if (d[i] == '-') {
 		is_negative = 1;
 		i++;
 	}
-    /* Warning: this is not normal, should be detected somehow by checking the BNF */
+	/* Warning: this is not normal, should be detected somehow by checking the BNF */
 	/* if ((d[i]=='N') && (d[i+1]=='a') && (d[i+2]=='N')) {
 		i+= 3;
 		_val = 0;
 		goto end;
 	}*/
-    /* read the digit-sequence token of the BNF */
+	/* read the digit-sequence token of the BNF */
 	while (d[i] >= '0' && d[i] <= '9' && d[i] != 0) {
 		_val = _val*10 + (d[i]-'0');
-        nb_digit_before++;
+		nb_digit_before++;
 		i++;
 	}
 	if (d[i] == '.') {
-        has_fractional = 1;
+		has_fractional = 1;
 		i++;
 		while (d[i] >= '0' && d[i] <= '9' && d[i] != 0) {
 			_val = _val*10 + (d[i]-'0');
 			nb_digit_after++;
 			i++;
 		}
-        if (nb_digit_after) {
-            _val /= (Float)pow(10,nb_digit_after);
-        } else if (nb_digit_before == 0) {
-            GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error in parsing number (expecting digits before or after a '.': %s\n", d));
-            return 0;
-        } else {
-            /* dangling '.' without digits after. This is allowed by the BNF */
-        }
-	}
-    if ((nb_digit_before == 0) && (has_fractional == 0)) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error in parsing number (expecting digits):%s\n", d));
-        return 0;
-    }
-    /* reading the exponent */
+		if (nb_digit_after) {
+			_val /= (Float)pow(10,nb_digit_after);
+		} else if (nb_digit_before == 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error in parsing number (expecting digits before or after a '.': %s\n", d));
+			return 0;
+		} else {
+			/* dangling '.' without digits after. This is allowed by the BNF */
+		}
+	}
+	if ((nb_digit_before == 0) && (has_fractional == 0)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error in parsing number (expecting digits):%s\n", d));
+		return 0;
+	}
+	/* reading the exponent */
 	if (d[i] == 'e' || d[i] == 'E') {
 		Bool neg_exp = 0;
 		u32 nb_exp_digits = 0;
-        s32 exp = 0;
+		s32 exp = 0;
 		i++;
 		if (d[i] == '+') i++;
 		else if (d[i] == '-') {
@@ -864,17 +800,17 @@
 		}
 		while (d[i] >= '0' && d[i] <= '9' && d[i] != 0) {
 			exp = exp*10 + (d[i]-'0');
-            nb_exp_digits++;
+			nb_exp_digits++;
 			i++;
 		}
-        if (nb_exp_digits) {
-            _val *= (Float)pow(10, neg_exp ? -exp : exp);
-        } else {
-            GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error in parsing exponent, 'e' or 'E' should be followed by digits: %s\n", d));
-            return 0;
-        }
+		if (nb_exp_digits) {
+			_val *= (Float)pow(10, neg_exp ? -exp : exp);
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error in parsing exponent, 'e' or 'E' should be followed by digits: %s\n", d));
+			return 0;
+		}
 	}
-    /* We can now produce the final number */
+	/* We can now produce the final number */
 	if (is_negative) _val *= -1;
 	if (is_angle) {
 		_val/=180;
@@ -883,7 +819,7 @@
 		(*f) = FLT2FIX(_val);
 	}
 
-    /* warning the comma and semicolumn should not be there when parsing a path number */
+	/* warning the comma and semicolumn should not be there when parsing a path number */
 	while (d[i] != 0 && (d[i] == ' ' || d[i] == ',' || d[i] == ';')) i++;
 	return i;
 }
@@ -901,7 +837,10 @@
 	if (!d[0]) return GF_BAD_PARAM;
 
 	if (d[0] == '+') d++;
-	else if (d[0] == '-') { sign = -1; d++; }
+	else if (d[0] == '-') {
+		sign = -1;
+		d++;
+	}
 
 	if (!d[0]) return GF_BAD_PARAM;
 
@@ -970,7 +909,7 @@
 	char *tmp;
 
 	/* Offset Values */
-	if ((d[0] >= '0' && d[0] <= '9') || d[0] == '+' || d[0] == '-'){
+	if ((d[0] >= '0' && d[0] <= '9') || d[0] == '+' || d[0] == '-') {
 		v->type = GF_SMIL_TIME_CLOCK;
 		return svg_parse_clock_value(d, &(v->clock));
 	}
@@ -1073,7 +1012,10 @@
 			char *tmp3 = tmp2;
 			tmp2[0] = 0;
 			tmp3--;
-			while (*tmp3==' ') { *tmp3=0; tmp3--; }
+			while (*tmp3==' ') {
+				*tmp3=0;
+				tmp3--;
+			}
 			if (v->event.type == 0) v->event.type = gf_dom_event_type_by_name(tmp);
 			if (!had_param && (v->event.type == GF_EVENT_REPEAT || v->event.type == GF_EVENT_REPEAT_EVENT))
 				v->event.parameter = 1;
@@ -1097,7 +1039,7 @@
 	GF_Matrix2D tmp;
 
 	char *str;
-    u32 read_chars;
+	u32 read_chars;
 	u32 i;
 
 	gf_mx2d_init(*mat);
@@ -1115,21 +1057,21 @@
 				Fixed sx, sy;
 				i++;
 				read_chars = svg_parse_number(&(str[i]), &sx, 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading sx component in scale: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading sx component in scale: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 
 				if (str[i] == ')') {
 					sy = sx;
 				} else {
 					read_chars = svg_parse_number(&(str[i]), &sy, 0);
-                    if (!read_chars) {
-                        GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading sy component in scale: %s\n", attribute_content));
-                        return 0;
-                    }
-                    i += read_chars;
+					if (!read_chars) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading sy component in scale: %s\n", attribute_content));
+						return 0;
+					}
+					i += read_chars;
 				}
 				gf_mx2d_init(tmp);
 				gf_mx2d_add_scale(&tmp, sx, sy);
@@ -1139,12 +1081,12 @@
 				while(str[i] == ' ') i++;
 				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 0;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
+					return 0;
 				}
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing opening parenthesis in transform attribute: %s\n", attribute_content));
-                return 0;
+				return 0;
 			}
 		} else if (strstr(str+i, "translate")==str+i) {
 			i += 9;
@@ -1153,20 +1095,20 @@
 				Fixed tx, ty;
 				i++;
 				read_chars = svg_parse_number(&(str[i]), &tx, 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading tx component in translate: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading tx component in translate: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				if (str[i] == ')') {
 					ty = 0;
 				} else {
 					read_chars = svg_parse_number(&(str[i]), &ty, 0);
-                    if (!read_chars) {
-                        GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading ty component in translate: %s\n", attribute_content));
-                        return 0;
-                    }
-                    i += read_chars;
+					if (!read_chars) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading ty component in translate: %s\n", attribute_content));
+						return 0;
+					}
+					i += read_chars;
 				}
 				gf_mx2d_init(tmp);
 				gf_mx2d_add_translation(&tmp, tx, ty);
@@ -1175,12 +1117,12 @@
 				while(str[i] == ' ') i++;
 				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 0;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
+					return 0;
 				}
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing opening parenthesis in transform attribute: %s\n", attribute_content));
-                return 0;
+				return 0;
 			}
 		} else if (strstr(str+i, "rotate")==str+i) {
 			i += 6;
@@ -1189,26 +1131,26 @@
 				Fixed angle, cx, cy;
 				i++;
 				read_chars = svg_parse_number(&(str[i]), &angle, 1);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading angle component in rotate: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading angle component in rotate: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				if (str[i] == ')') {
 					cx = cy = 0;
 				} else {
 					read_chars = svg_parse_number(&(str[i]), &cx, 0);
-                    if (!read_chars) {
-                        GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading cx component in rotate: %s\n", attribute_content));
-                        return 0;
-                    }
-                    i += read_chars;
+					if (!read_chars) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading cx component in rotate: %s\n", attribute_content));
+						return 0;
+					}
+					i += read_chars;
 					read_chars = svg_parse_number(&(str[i]), &cy, 0);
-                    if (!read_chars) {
-                        GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading cy component in rotate: %s\n", attribute_content));
-                        return 0;
-                    }
-                    i += read_chars;
+					if (!read_chars) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading cy component in rotate: %s\n", attribute_content));
+						return 0;
+					}
+					i += read_chars;
 				}
 				gf_mx2d_init(tmp);
 				gf_mx2d_add_rotation(&tmp, cx, cy, angle);
@@ -1217,12 +1159,12 @@
 				while(str[i] == ' ') i++;
 				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 0;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
+					return 0;
 				}
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing opening parenthesis in transform attribute: %s\n", attribute_content));
-                return 0;
+				return 0;
 			}
 		} else if (strstr(str+i, "skewX")==str+i) {
 			i += 5;
@@ -1231,11 +1173,11 @@
 				Fixed angle;
 				i++;
 				read_chars = svg_parse_number(&(str[i]), &angle, 1);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading angle in skewX: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading angle in skewX: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				gf_mx2d_init(tmp);
 				gf_mx2d_add_skew_x(&tmp, angle);
 				gf_mx2d_add_matrix(&tmp, mat);
@@ -1243,12 +1185,12 @@
 				while(str[i] == ' ') i++;
 				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 0;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
+					return 0;
 				}
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing opening parenthesis in transform attribute: %s\n", attribute_content));
-                return 0;
+				return 0;
 			}
 		} else if (strstr(str+i, "skewY")==str+i) {
 			i += 5;
@@ -1257,11 +1199,11 @@
 				Fixed angle;
 				i++;
 				read_chars = svg_parse_number(&(str[i]), &angle, 1);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading angle component in skewY: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading angle component in skewY: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				gf_mx2d_init(tmp);
 				gf_mx2d_add_skew_y(&tmp, angle);
 				gf_mx2d_add_matrix(&tmp, mat);
@@ -1269,12 +1211,12 @@
 				while(str[i] == ' ') i++;
 				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 0;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
+					return 0;
 				}
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing opening parenthesis in transform attribute: %s\n", attribute_content));
-                return 0;
+				return 0;
 			}
 		} else if (strstr(str+i, "matrix")==str+i) {
 			i+=6;
@@ -1282,61 +1224,61 @@
 			if (str[i] == '(') {
 				i++;
 				read_chars = svg_parse_number(&(str[i]), &(tmp.m[0]), 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient a in matrix: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient a in matrix: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				read_chars = svg_parse_number(&(str[i]), &(tmp.m[3]), 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient b in matrix: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient b in matrix: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				read_chars = svg_parse_number(&(str[i]), &(tmp.m[1]), 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient c in matrix: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient c in matrix: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				read_chars = svg_parse_number(&(str[i]), &(tmp.m[4]), 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient d in matrix: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient d in matrix: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				read_chars = svg_parse_number(&(str[i]), &(tmp.m[2]), 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient e in matrix: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient e in matrix: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				read_chars = svg_parse_number(&(str[i]), &(tmp.m[5]), 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient f in matrix: %s\n", attribute_content));
-                    return 0;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient f in matrix: %s\n", attribute_content));
+					return 0;
+				}
+				i += read_chars;
 				gf_mx2d_add_matrix(&tmp, mat);
 				gf_mx2d_copy(*mat, tmp);
 				while(str[i] == ' ') i++;
 				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 0;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
+					return 0;
 				}
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing opening parenthesis in transform attribute: %s\n", attribute_content));
-                return 0;
+				return 0;
 			}
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Unrecognized transofrm type in attribute %s\n", attribute_content));
-            return 0;
+			return 0;
 		}
 		/*for svgView parsing*/
 		if (str[i] == ')') i++;
 	}
-    return 1;
+	return 1;
 }
 
 /* Parses an SVG transform attribute and collapses all in the given matrix */
@@ -1344,7 +1286,7 @@
 {
 	char *str;
 	u32 i;
-    u32 read_chars;
+	u32 read_chars;
 	str = attribute_content;
 	i = 0;
 
@@ -1359,43 +1301,43 @@
 			if (str[i] == 's' && str[i+1] == 'v' && str[i+2] == 'g') {
 				i+=3;
 				while (str[i] == ' ') i++;
-                if (str[i] == ',') {
-                    i++;
-                } else if (str[i] == ')') {
+				if (str[i] == ',') {
+					i++;
+				} else if (str[i] == ')') {
 					i++;
 					return GF_OK;
 				}
 				read_chars = svg_parse_number(&(str[i]), &(t->mat.m[2]), 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient tx in ref transform: %s\n", attribute_content));
-                    return GF_BAD_PARAM;
-                }
-                i += read_chars;
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient tx in ref transform: %s\n", attribute_content));
+					return GF_BAD_PARAM;
+				}
+				i += read_chars;
 				read_chars = svg_parse_number(&(str[i]), &(t->mat.m[5]), 0);
-                if (!read_chars) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient ty in ref transform: %s\n", attribute_content));
-                    return GF_BAD_PARAM;
-                }
-                i += read_chars;
-            } else {
+				if (!read_chars) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error reading coefficient ty in ref transform: %s\n", attribute_content));
+					return GF_BAD_PARAM;
+				}
+				i += read_chars;
+			} else {
 				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 {
-                GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
 			}
 			return GF_OK;
 		} else {
-            GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing opening parenthesis in ref transform attribute: %s\n", attribute_content));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing opening parenthesis in ref transform attribute: %s\n", attribute_content));
 			return GF_BAD_PARAM;
 		}
 	} else {
 		Bool res = gf_svg_parse_transformlist(&t->mat, attribute_content);
-	        if (!res) {
-	            GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error parsing transform list: %s\n", attribute_content));
-	            return GF_BAD_PARAM;
-	        }
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error parsing transform list: %s\n", attribute_content));
+			return GF_BAD_PARAM;
+		}
 	}
 	return GF_OK;
 }
@@ -1410,10 +1352,10 @@
 {
 	char *d = attribute_content;
 
-    /* used to detect end of BNF production:
-    "The processing of the BNF must consume as much of a given BNF production as possible,
-    stopping at the point when a character is encountered which no longer satisfies the production." */
-    u32 read_chars = 0;
+	/* used to detect end of BNF production:
+	"The processing of the BNF must consume as much of a given BNF production as possible,
+	stopping at the point when a character is encountered which no longer satisfies the production." */
+	u32 read_chars = 0;
 
 	/* Point used to start a new subpath when the previous subpath is closed */
 	SVG_Point prev_m_pt;
@@ -1442,11 +1384,11 @@
 		case 'M':
 			i++;
 			read_chars = svg_parse_number(&(d[i]), &(orig.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(orig.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'm') {
 				orig.x += rel_ref_pt.x;
 				orig.y += rel_ref_pt.y;
@@ -1467,11 +1409,11 @@
 		case 'l':
 			i++;
 			read_chars = svg_parse_number(&(d[i]), &(orig.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(orig.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'l') {
 				orig.x += rel_ref_pt.x;
 				orig.y += rel_ref_pt.y;
@@ -1489,8 +1431,8 @@
 		case 'h':
 			i++;
 			read_chars = svg_parse_number(&(d[i]), &(orig.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'h') {
 				orig.x += rel_ref_pt.x;
 			}
@@ -1508,8 +1450,8 @@
 		case 'v':
 			i++;
 			read_chars = svg_parse_number(&(d[i]), &(orig.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'v') {
 				orig.y += rel_ref_pt.y;
 			}
@@ -1527,31 +1469,31 @@
 		case 'c':
 			i++;
 			read_chars = svg_parse_number(&(d[i]), &(ct_orig.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(ct_orig.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'c') {
 				ct_orig.x += rel_ref_pt.x;
 				ct_orig.y += rel_ref_pt.y;
 			}
 			read_chars = svg_parse_number(&(d[i]), &(ct_end.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(ct_end.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'c') {
 				ct_end.x += rel_ref_pt.x;
 				ct_end.y += rel_ref_pt.y;
 			}
 			read_chars = svg_parse_number(&(d[i]), &(end.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(end.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'c') {
 				end.x += rel_ref_pt.x;
 				end.y += rel_ref_pt.y;
@@ -1570,21 +1512,21 @@
 			ct_orig.x = 2*orig.x - ct_orig.x;
 			ct_orig.y = 2*orig.y - ct_orig.y;
 			read_chars = svg_parse_number(&(d[i]), &(ct_end.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(ct_end.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 's') {
 				ct_end.x += rel_ref_pt.x;
 				ct_end.y += rel_ref_pt.y;
 			}
 			read_chars = svg_parse_number(&(d[i]), &(end.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(end.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 's') {
 				end.x += rel_ref_pt.x;
 				end.y += rel_ref_pt.y;
@@ -1601,21 +1543,21 @@
 		case 'q':
 			i++;
 			read_chars = svg_parse_number(&(d[i]), &(ct_orig.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(ct_orig.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'q') {
 				ct_orig.x += rel_ref_pt.x;
 				ct_orig.y += rel_ref_pt.y;
 			}
 			read_chars = svg_parse_number(&(d[i]), &(end.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(end.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'q') {
 				end.x += rel_ref_pt.x;
 				end.y += rel_ref_pt.y;
@@ -1633,11 +1575,11 @@
 			ct_orig.x = 2*orig.x - ct_orig.x;
 			ct_orig.y = 2*orig.y - ct_orig.y;
 			read_chars = svg_parse_number(&(d[i]), &(end.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(end.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 't') {
 				end.x += rel_ref_pt.x;
 				end.y += rel_ref_pt.y;
@@ -1654,28 +1596,28 @@
 			i++;
 
 			read_chars = svg_parse_number(&(d[i]), &(orig.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(orig.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 
 			read_chars = svg_parse_number(&(d[i]), &(x_axis_rotation), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(large_arc_flag), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(sweep_flag), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 
 			read_chars = svg_parse_number(&(d[i]), &(end.x), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			read_chars = svg_parse_number(&(d[i]), &(end.y), 0);
-            if (!read_chars) return;
-            i += read_chars;
+			if (!read_chars) return;
+			i += read_chars;
 			if (c == 'a') {
 				end.x += rel_ref_pt.x;
 				end.y += rel_ref_pt.y;
@@ -1916,39 +1858,39 @@
 				break;
 			case 'A':
 			case 'a':
-				{
-					Fixed tmp;
-					i++;
+			{
+				Fixed tmp;
+				i++;
 #ifndef REMOVE_ALLOC
-					GF_SAFEALLOC(command, u8)
-					gf_list_add(d_commands, command);
-					*command = SVG_PATHCOMMAND_A;
+				GF_SAFEALLOC(command, u8)
+				gf_list_add(d_commands, command);
+				*command = SVG_PATHCOMMAND_A;
 
-					GF_SAFEALLOC(pt, SVG_Point)
-					gf_list_add(d_points, pt);
+				GF_SAFEALLOC(pt, SVG_Point)
+				gf_list_add(d_points, pt);
 #endif
-					i += svg_parse_number(&(d[i]), &(pt->x), 0);
-					i += svg_parse_number(&(d[i]), &(pt->y), 0);
+				i += svg_parse_number(&(d[i]), &(pt->x), 0);
+				i += svg_parse_number(&(d[i]), &(pt->y), 0);
 
-					i += svg_parse_number(&(d[i]), &(tmp), 0);
-					i += svg_parse_number(&(d[i]), &(tmp), 0);
-					i += svg_parse_number(&(d[i]), &(tmp), 0);
+				i += svg_parse_number(&(d[i]), &(tmp), 0);
+				i += svg_parse_number(&(d[i]), &(tmp), 0);
+				i += svg_parse_number(&(d[i]), &(tmp), 0);
 
 #ifndef REMOVE_ALLOC
-					GF_SAFEALLOC(pt, SVG_Point)
-					gf_list_add(d_points, pt);
+				GF_SAFEALLOC(pt, SVG_Point)
+				gf_list_add(d_points, pt);
 #endif
-					i += svg_parse_number(&(d[i]), &(pt->x), 0);
-					i += svg_parse_number(&(d[i]), &(pt->y), 0);
-					if (c == 'a') {
-						pt->x += cur_pt.x;
-						pt->y += cur_pt.y;
-					}
-					cur_pt.x = pt->x;
-					cur_pt.y = pt->y;
+				i += svg_parse_number(&(d[i]), &(pt->x), 0);
+				i += svg_parse_number(&(d[i]), &(pt->y), 0);
+				if (c == 'a') {
+					pt->x += cur_pt.x;
+					pt->y += cur_pt.y;
 				}
-				prev_c = c;
-				break;
+				cur_pt.x = pt->x;
+				cur_pt.y = pt->y;
+			}
+			prev_c = c;
+			break;
 			case 'Z':
 			case 'z':
 				i++;
@@ -2034,12 +1976,12 @@
 /* Parses a length which is a number with a unit */
 static u32 svg_parse_length(SVG_Number *number, char *value_string, Bool clamp0to1)
 {
-    char c = '\0';
-    char *unit = NULL;
-    u32 len = 0;
-    u32 unit_pos = 0;
-    u32 unit_len = 0;
-    u32 read_chars;
+	char c = '\0';
+	char *unit = NULL;
+	u32 len = 0;
+	u32 unit_pos = 0;
+	u32 unit_len = 0;
+	u32 read_chars;
 
 	if (!strcmp(value_string, "inherit")) {
 		number->type = SVG_NUMBER_INHERIT;
@@ -2052,7 +1994,7 @@
 		return 12;
 	} else if ((unit = strstr(value_string, "%")) ) {
 		number->type = SVG_NUMBER_PERCENTAGE;
-        unit_len = 1;
+		unit_len = 1;
 	} else if ((unit = strstr(value_string, "em"))) {
 		number->type = SVG_NUMBER_EMS;
 	} else if ((unit = strstr(value_string, "ex"))) {
@@ -2072,23 +2014,23 @@
 	} else {
 		number->type = SVG_NUMBER_VALUE;
 	}
-    if (unit) {
-        if (!unit_len) unit_len = 2;
-        unit_pos = (u32) (unit - value_string);
-        /* setting the first unit character to 0 for the svg_parse_number method to finish */
-        c = value_string[unit_pos];
-        value_string[unit_pos] = 0;
-    }
+	if (unit) {
+		if (!unit_len) unit_len = 2;
+		unit_pos = (u32) (unit - value_string);
+		/* setting the first unit character to 0 for the svg_parse_number method to finish */
+		c = value_string[unit_pos];
+		value_string[unit_pos] = 0;
+	}
 	read_chars = svg_parse_number(value_string, &(number->value), 0);
-    if (unit) {
-        value_string[unit_pos] = c;
-    }
-    if (!read_chars) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error in parsing: %s\n", value_string));
-        len = 0;
-    } else {
-        len = unit_len + read_chars;
-    }
+	if (unit) {
+		value_string[unit_pos] = c;
+	}
+	if (!read_chars) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error in parsing: %s\n", value_string));
+		len = 0;
+	} else {
+		len = unit_len + read_chars;
+	}
 
 	if (clamp0to1) number->value = MAX(0, MIN(1, number->value));
 	return len;
@@ -2448,7 +2390,7 @@
 		value_string[len] = 0;
 
 		GF_SAFEALLOC(value, SMIL_Time)
- 		gf_list_add(values, value);
+		gf_list_add(values, value);
 
 		if (smil_parse_time(e, value, value_string) != GF_OK) goto err;
 
@@ -2651,7 +2593,7 @@
 
 static void svg_parse_viewbox(SVG_ViewBox *value, char *value_string)
 {
-    u32 read_chars;
+	u32 read_chars;
 	char *str = value_string;
 	if (!strcmp(str, "none")) {
 		value->is_set = 0;
@@ -2659,17 +2601,17 @@
 		u32 i = 0;
 		value->is_set = 1;
 		read_chars = svg_parse_number(&(str[i]), &(value->x), 0);
-        if (!read_chars) return;
-        i += read_chars;
+		if (!read_chars) return;
+		i += read_chars;
 		read_chars = svg_parse_number(&(str[i]), &(value->y), 0);
-        if (!read_chars) return;
-        i += read_chars;
+		if (!read_chars) return;
+		i += read_chars;
 		read_chars = svg_parse_number(&(str[i]), &(value->width), 0);
-        if (!read_chars) return;
-        i += read_chars;
+		if (!read_chars) return;
+		i += read_chars;
 		read_chars = svg_parse_number(&(str[i]), &(value->height), 0);
-        if (!read_chars) return;
-        i += read_chars;
+		if (!read_chars) return;
+		i += read_chars;
 	}
 }
 
@@ -2704,7 +2646,7 @@
 {
 	u32 i = 0, j = 0;
 	i = svg_parse_number(&(value_string[i]), &(p->x), 0);
-    /* TODO: handle cases where a point has an invalid syntax */
+	/* TODO: handle cases where a point has an invalid syntax */
 	j = svg_parse_number(&(value_string[i]), &(p->y), 0);
 	/* we need to detect an odd number of coordinates in polygon points list
 	   cf. http://www.w3.org/TR/SVGMobile12/shapes.html#PolygonElement
@@ -2718,9 +2660,9 @@
 	u32 i = 0, j = 0;
 	gf_mx2d_init(*p);
 	i = svg_parse_number(&(value_string[i]), &(p->m[2]), 0);
-    if (i == 0) return 0;
+	if (i == 0) return 0;
 	j = svg_parse_number(&(value_string[i]), &(p->m[5]), 0);
-    if (j == 0) return 0;
+	if (j == 0) return 0;
 	return i+j;
 }
 
@@ -2753,7 +2695,7 @@
 /* Parses a list of numbers */
 static void svg_parse_numbers(GF_List *values, char *value_string, Bool is_angle)
 {
-    u32 read_chars;
+	u32 read_chars;
 	u32 i = 0;
 	char *str = value_string;
 	u32 len = (u32) strlen(str);
@@ -2765,7 +2707,7 @@
 			gf_free(f);
 			return;
 		}
-        i += read_chars;
+		i += read_chars;
 		gf_list_add(values, f);
 	}
 }
@@ -2818,7 +2760,7 @@
 
 static void svg_parse_strokedasharray(SVG_StrokeDashArray *value, char *value_string)
 {
-    u32 read_chars;
+	u32 read_chars;
 	if (!strcmp(value_string, "none")) {
 		value->type = SVG_STROKEDASHARRAY_NONE;
 	} else if (!strcmp(value_string, "inherit")) {
@@ -2833,11 +2775,11 @@
 			SVG_Length *f;
 			GF_SAFEALLOC(f, SVG_Length)
 			read_chars = svg_parse_length(f, &(str[i]), 0);
-            if (!read_chars) {
-                gf_free(f);
-                return;
-            }
-            i += read_chars;
+			if (!read_chars) {
+				gf_free(f);
+				return;
+			}
+			i += read_chars;
 			gf_list_add(values, f);
 		}
 		vals->count = gf_list_count(values);
@@ -2846,7 +2788,7 @@
 		for (i = 0; i < vals->count; i++) {
 			SVG_Length *f = (SVG_Length *)gf_list_get(values, i);
 			vals->vals[i] = f->value;
-            vals->units[i] = f->type;
+			vals->units[i] = f->type;
 			gf_free(f);
 		}
 		gf_list_del(values);
@@ -3077,7 +3019,7 @@
 GF_EXPORT
 GF_Err gf_svg_parse_attribute(GF_Node *n, GF_FieldInfo *info, char *attribute_content, u8 anim_value_type)
 {
-    /* for all attributes, except strings, apply some sort of white space normalization*/
+	/* for all attributes, except strings, apply some sort of white space normalization*/
 	if (info->fieldType != DOM_String_datatype && strlen(attribute_content)) {
 		u32 i, len;
 		/*remove spaces at the begining*/
@@ -3102,15 +3044,15 @@
 	switch (info->fieldType) {
 	case SVG_Boolean_datatype:
 		svg_parse_boolean((SVG_Boolean *)info->far_ptr, attribute_content);
-	    break;
+		break;
 	case SVG_Color_datatype:
 		svg_parse_color((SVG_Color *)info->far_ptr, attribute_content);
-	    break;
+		break;
 	case SVG_Paint_datatype:
 		svg_parse_paint(n, (SVG_Paint *)info->far_ptr, attribute_content);
 		break;
 
-/* beginning of keyword type parsing */
+	/* beginning of keyword type parsing */
 	case SVG_FillRule_datatype:
 		svg_parse_clipfillrule((SVG_FillRule *)info->far_ptr, attribute_content);
 		break;
@@ -3233,14 +3175,14 @@
 		else *(u8*)info->far_ptr = SVG_FILTER_TRANSFER_IDENTITY;
 		break;
 
-/* end of keyword type parsing */
+	/* end of keyword type parsing */
 
 	/* keyword | numbers (with possibly units) */
 	case SVG_Length_datatype:
 	case SVG_Coordinate_datatype:
 	case SVG_FontSize_datatype:
 	case SVG_Rotate_datatype:
-    case SVG_Number_datatype:
+	case SVG_Number_datatype:
 		svg_parse_length((SVG_Number*)info->far_ptr, attribute_content, 0);
 		break;
 
@@ -3300,49 +3242,49 @@
 		svg_parse_transform((SVG_Transform*)info->far_ptr, attribute_content);
 		break;
 	case SVG_Transform_Translate_datatype:
-		{
-			u32 i = 0;
-			SVG_Point *p = (SVG_Point *)info->far_ptr;;
-			i+=svg_parse_number(&(attribute_content[i]), &(p->x), 0);
-			if (attribute_content[i] == 0) {
-				p->y = 0;
-			} else {
-				i+=svg_parse_number(&(attribute_content[i]), &(p->y), 0);
-			}
+	{
+		u32 i = 0;
+		SVG_Point *p = (SVG_Point *)info->far_ptr;;
+		i+=svg_parse_number(&(attribute_content[i]), &(p->x), 0);
+		if (attribute_content[i] == 0) {
+			p->y = 0;
+		} else {
+			i+=svg_parse_number(&(attribute_content[i]), &(p->y), 0);
 		}
-		break;
+	}
+	break;
 	case SVG_Transform_Scale_datatype:
-		{
-			u32 i = 0;
-			SVG_Point *p = (SVG_Point *)info->far_ptr;;
-			i+=svg_parse_number(&(attribute_content[i]), &(p->x), 0);
-			if (attribute_content[i] == 0) {
-				p->y = p->x;
-			} else {
-				i+=svg_parse_number(&(attribute_content[i]), &(p->y), 0);
-			}
+	{
+		u32 i = 0;
+		SVG_Point *p = (SVG_Point *)info->far_ptr;;
+		i+=svg_parse_number(&(attribute_content[i]), &(p->x), 0);
+		if (attribute_content[i] == 0) {
+			p->y = p->x;
+		} else {
+			i+=svg_parse_number(&(attribute_content[i]), &(p->y), 0);
 		}
-		break;
+	}
+	break;
 	case SVG_Transform_SkewX_datatype:
 	case SVG_Transform_SkewY_datatype:
-		{
-			Fixed *p = (Fixed *)info->far_ptr;
-			svg_parse_number(attribute_content, p, 1);
-		}
-		break;
+	{
+		Fixed *p = (Fixed *)info->far_ptr;
+		svg_parse_number(attribute_content, p, 1);
+	}
+	break;
 	case SVG_Transform_Rotate_datatype:
-		{
-			u32 i = 0;
-			SVG_Point_Angle *p = (SVG_Point_Angle *)info->far_ptr;;
-			i+=svg_parse_number(&(attribute_content[i]), &(p->angle), 1);
-			if (attribute_content[i] == 0) {
-				p->y = p->x = 0;
-			} else {
-				i+=svg_parse_number(&(attribute_content[i]), &(p->x), 0);
-				i+=svg_parse_number(&(attribute_content[i]), &(p->y), 0);
-			}
+	{
+		u32 i = 0;
+		SVG_Point_Angle *p = (SVG_Point_Angle *)info->far_ptr;;
+		i+=svg_parse_number(&(attribute_content[i]), &(p->angle), 1);
+		if (attribute_content[i] == 0) {
+			p->y = p->x = 0;
+		} else {
+			i+=svg_parse_number(&(attribute_content[i]), &(p->x), 0);
+			i+=svg_parse_number(&(attribute_content[i]), &(p->y), 0);
 		}
-		break;
+	}
+	break;
 	case SVG_PreserveAspectRatio_datatype:
 		svg_parse_preserveaspectratio((SVG_PreserveAspectRatio*)info->far_ptr, attribute_content);
 		break;
@@ -3389,7 +3331,7 @@
 			xml_ev->type = gf_dom_event_type_by_name(attribute_content);
 		}
 	}
-		break;
+	break;
 
 	case SVG_Focus_datatype:
 		svg_parse_focus(n, (SVG_Focus*)info->far_ptr, attribute_content);
@@ -3466,26 +3408,26 @@
 {
 	switch (attribute_type) {
 	case SVG_Boolean_datatype:
-		{
-			SVG_Boolean *b;
-			GF_SAFEALLOC(b, SVG_Boolean)
-			return b;
-		}
-		break;
+	{
+		SVG_Boolean *b;
+		GF_SAFEALLOC(b, SVG_Boolean)
+		return b;
+	}
+	break;
 	case SVG_Color_datatype:
-		{
-			SVG_Color *color;
-			GF_SAFEALLOC(color, SVG_Color)
-			return color;
-		}
-		break;
+	{
+		SVG_Color *color;
+		GF_SAFEALLOC(color, SVG_Color)
+		return color;
+	}
+	break;
 	case SVG_Paint_datatype:
-		{
-			SVG_Paint *paint;
-			GF_SAFEALLOC(paint, SVG_Paint)
-			return paint;
-		}
-		break;
+	{
+		SVG_Paint *paint;
+		GF_SAFEALLOC(paint, SVG_Paint)
+		return paint;
+	}
+	break;
 
 	/* keyword types */
 	case SVG_FillRule_datatype:
@@ -3526,19 +3468,19 @@
 	case SVG_SpreadMethod_datatype:
 	case SVG_Focusable_datatype:
 	case SVG_Filter_TransferType_datatype:
-		{
-			u8 *keyword;
-			GF_SAFEALLOC(keyword, u8)
-			return keyword;
-		}
-		break;
+	{
+		u8 *keyword;
+		GF_SAFEALLOC(keyword, u8)
+		return keyword;
+	}
+	break;
 	case SMIL_SyncTolerance_datatype:
-		{
-			SMIL_SyncTolerance *st;
-			GF_SAFEALLOC(st, SMIL_SyncTolerance)
-			return st;
-		}
-		break;
+	{
+		SMIL_SyncTolerance *st;
+		GF_SAFEALLOC(st, SMIL_SyncTolerance)
+		return st;
+	}
+	break;
 
 	/* inheritable floats */
 	case SVG_FontSize_datatype:
@@ -3546,97 +3488,97 @@
 	case SVG_Coordinate_datatype:
 	case SVG_Rotate_datatype:
 	case SVG_Number_datatype:
-		{
-			SVG_Number *number;
-			GF_SAFEALLOC(number, SVG_Number)
-			return number;
-		}
-		break;
+	{
+		SVG_Number *number;
+		GF_SAFEALLOC(number, SVG_Number)
+		return number;
+	}
+	break;
 
 	case SVG_StrokeDashArray_datatype:
-		{
-			SVG_StrokeDashArray *array;
-			GF_SAFEALLOC(array, SVG_StrokeDashArray)
-			return array;
-		}
-		break;
+	{
+		SVG_StrokeDashArray *array;
+		GF_SAFEALLOC(array, SVG_StrokeDashArray)
+		return array;
+	}
+	break;
 
 	case SVG_Motion_datatype:
-		{
-			GF_Matrix2D *p;
-			GF_SAFEALLOC(p, GF_Matrix2D)
-			gf_mx2d_init(*p);
-			return p;
-		}
-		break;
+	{
+		GF_Matrix2D *p;
+		GF_SAFEALLOC(p, GF_Matrix2D)
+		gf_mx2d_init(*p);
+		return p;
+	}
+	break;
 
 	case SVG_Transform_datatype:
-		{
-			SVG_Transform *p;
-			GF_SAFEALLOC(p, SVG_Transform)
-			gf_mx2d_init(p->mat);
-			return p;
-		}
-		break;
+	{
+		SVG_Transform *p;
+		GF_SAFEALLOC(p, SVG_Transform)
+		gf_mx2d_init(p->mat);
+		return p;
+	}
+	break;
 
 	case SVG_Transform_Translate_datatype:
 	case SVG_Transform_Scale_datatype:
-		{
-			SVG_Point *p;
-			GF_SAFEALLOC(p, SVG_Point)
-			return p;
-		}
-		break;
+	{
+		SVG_Point *p;
+		GF_SAFEALLOC(p, SVG_Point)
+		return p;
+	}
+	break;
 
 	case SVG_Transform_SkewX_datatype:
 	case SVG_Transform_SkewY_datatype:
-		{
-			Fixed *p;
-			GF_SAFEALLOC(p, Fixed)
-			return p;
-		}
-		break;
+	{
+		Fixed *p;
+		GF_SAFEALLOC(p, Fixed)
+		return p;
+	}
+	break;
 
 	case SVG_Transform_Rotate_datatype:
-		{
-			SVG_Point_Angle *p;
-			GF_SAFEALLOC(p, SVG_Point_Angle)
-			return p;
-		}
-		break;
+	{
+		SVG_Point_Angle *p;
+		GF_SAFEALLOC(p, SVG_Point_Angle)
+		return p;
+	}
+	break;
 
 	case SVG_ViewBox_datatype:
-		{
-			SVG_ViewBox *viewbox;
-			GF_SAFEALLOC(viewbox, SVG_ViewBox)
-			return viewbox;
-		}
-		break;
+	{
+		SVG_ViewBox *viewbox;
+		GF_SAFEALLOC(viewbox, SVG_ViewBox)
+		return viewbox;
+	}
+	break;
 	case XMLRI_datatype:
 	case XML_IDREF_datatype:
-		{
-			XMLRI *iri;
-			GF_SAFEALLOC(iri, XMLRI)
-			return iri;
-		}
-		break;
+	{
+		XMLRI *iri;
+		GF_SAFEALLOC(iri, XMLRI)
+		return iri;
+	}
+	break;
 	case SVG_FontFamily_datatype:
-		{
-			SVG_FontFamily *fontfamily;
-			GF_SAFEALLOC(fontfamily, SVG_FontFamily)
-			return fontfamily;
-		}
-		break;
+	{
+		SVG_FontFamily *fontfamily;
+		GF_SAFEALLOC(fontfamily, SVG_FontFamily)
+		return fontfamily;
+	}
+	break;
 	case DOM_String_datatype:
 	case SVG_ContentType_datatype:
 	case SVG_LanguageID_datatype:
 	case SVG_ID_datatype:
-		{
-			SVG_String *string;
-			GF_SAFEALLOC(string, SVG_String)
-			return string;
-		}
-		break;
+	{
+		SVG_String *string;
+		GF_SAFEALLOC(string, SVG_String)
+		return string;
+	}
+	break;
 	case DOM_StringList_datatype:
 	case XMLRI_List_datatype:
 	case SVG_Points_datatype:
@@ -3646,109 +3588,109 @@
 	case SMIL_KeyTimes_datatype:
 	case SMIL_KeyPoints_datatype:
 	case SVG_Numbers_datatype:
-		{
-			ListOfXXX *list;
-			GF_SAFEALLOC(list, ListOfXXX)
-			*list = gf_list_new();
-			return list;
-		}
-		break;
+	{
+		ListOfXXX *list;
+		GF_SAFEALLOC(list, ListOfXXX)
+		*list = gf_list_new();
+		return list;
+	}
+	break;
 	case SVG_PreserveAspectRatio_datatype:
-		{
-			SVG_PreserveAspectRatio *par;
-			GF_SAFEALLOC(par, SVG_PreserveAspectRatio)
-			return par;
-		}
-		break;
+	{
+		SVG_PreserveAspectRatio *par;
+		GF_SAFEALLOC(par, SVG_PreserveAspectRatio)
+		return par;
+	}
+	break;
 	case SVG_PathData_datatype:
-		{
-			SVG_PathData *path;
-			GF_SAFEALLOC(path, SVG_PathData);
+	{
+		SVG_PathData *path;
+		GF_SAFEALLOC(path, SVG_PathData);
 #if USE_GF_PATH
-			gf_path_reset(path);
-			path->fineness = FIX_ONE;
+		gf_path_reset(path);
+		path->fineness = FIX_ONE;
 #else
-			path->commands = gf_list_new();
-			path->points = gf_list_new();
+		path->commands = gf_list_new();
+		path->points = gf_list_new();
 #endif
-			return path;
-		}
-		break;
+		return path;
+	}
+	break;
 	case LASeR_Choice_datatype:
-		{
-			LASeR_Choice *ch;
-			GF_SAFEALLOC(ch, LASeR_Choice)
-			return ch;
-		}
+	{
+		LASeR_Choice *ch;
+		GF_SAFEALLOC(ch, LASeR_Choice)
+		return ch;
+	}
 	case SVG_Focus_datatype:
-		{
-			SVG_Focus *foc;
-			GF_SAFEALLOC(foc, SVG_Focus)
-			return foc;
-		}
+	{
+		SVG_Focus *foc;
+		GF_SAFEALLOC(foc, SVG_Focus)
+		return foc;
+	}
 	case SMIL_AttributeName_datatype:
-		{
-			SMIL_AttributeName *an;
-			GF_SAFEALLOC(an, SMIL_AttributeName)
-			return an;
-		}
+	{
+		SMIL_AttributeName *an;
+		GF_SAFEALLOC(an, SMIL_AttributeName)
+		return an;
+	}
 	case SMIL_RepeatCount_datatype:
-		{
-			SMIL_RepeatCount *rc;
-			GF_SAFEALLOC(rc, SMIL_RepeatCount)
-			return rc;
-		}
+	{
+		SMIL_RepeatCount *rc;
+		GF_SAFEALLOC(rc, SMIL_RepeatCount)
+		return rc;
+	}
 	case SMIL_Duration_datatype:
-		{
-			SMIL_Duration *sd;
-			GF_SAFEALLOC(sd, SMIL_Duration)
-			return sd;
-		}
+	{
+		SMIL_Duration *sd;
+		GF_SAFEALLOC(sd, SMIL_Duration)
+		return sd;
+	}
 	case SMIL_AnimateValue_datatype:
-		{
-			SMIL_AnimateValue *av;
-			GF_SAFEALLOC(av, SMIL_AnimateValue)
-			return av;
-		}
-		break;
+	{
+		SMIL_AnimateValue *av;
+		GF_SAFEALLOC(av, SMIL_AnimateValue)
+		return av;
+	}
+	break;
 	case SMIL_AnimateValues_datatype:
-		{
-			SMIL_AnimateValues *av;
-			GF_SAFEALLOC(av, SMIL_AnimateValues)
-			av->values = gf_list_new();
-			return av;
-		}
-		break;
+	{
+		SMIL_AnimateValues *av;
+		GF_SAFEALLOC(av, SMIL_AnimateValues)
+		av->values = gf_list_new();
+		return av;
+	}
+	break;
 	case SVG_Clock_datatype:
-		{
-			SVG_Clock *ck;
-			GF_SAFEALLOC(ck, SVG_Clock)
-			return ck;
-		}
-		break;
+	{
+		SVG_Clock *ck;
+		GF_SAFEALLOC(ck, SVG_Clock)
+		return ck;
+	}
+	break;
 
 	case XMLEV_Event_datatype:
-		{
-			XMLEV_Event *e;
-			GF_SAFEALLOC(e, XMLEV_Event);
-			return e;
-		}
-		break;
+	{
+		XMLEV_Event *e;
+		GF_SAFEALLOC(e, XMLEV_Event);
+		return e;
+	}
+	break;
 	case LASeR_Size_datatype:
-		{
-			LASeR_Size *s;
-			GF_SAFEALLOC(s, LASeR_Size);
-			return s;
-		}
-		break;
+	{
+		LASeR_Size *s;
+		GF_SAFEALLOC(s, LASeR_Size);
+		return s;
+	}
+	break;
 
 	case 0:
-		{
-			SVG_String *string;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[SVG Attributes] Unspecified attribute type - defaulting to string.\n"));
-			GF_SAFEALLOC(string, SVG_String);
-			return string;
-		}
+	{
+		SVG_String *string;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[SVG Attributes] Unspecified attribute type - defaulting to string.\n"));
+		GF_SAFEALLOC(string, SVG_String);
+		return string;
+	}
 
 
 	default:
@@ -3772,20 +3714,14 @@
 			}
 		}
 	} else {
-		u32 i, count = sizeof(predefined_colors) / sizeof(struct predef_col);
-		u32 r, g, b;
+		u8 r, g, b;
+		const char *name;
 		r = FIX2INT(255*col->red);
 		g = FIX2INT(255*col->green);
 		b = FIX2INT(255*col->blue);
-		for (i=0; i<count; i++) {
-			if (
-				(r == predefined_colors[i].r)
-				&& (g == predefined_colors[i].g)
-				&& (b == predefined_colors[i].b)
-			) {
-				return gf_strdup(predefined_colors[i].name);
-			}
-		}
+		name = gf_color_get_name( GF_COL_ARGB(0xFF, r, g, b) );
+		if (name) return gf_strdup(name);
+
 		res = gf_malloc(sizeof(char)*8);
 		sprintf(res, "#%02X%02X%02X", r, g, b);
 		/*compress it...*/
@@ -4123,9 +4059,9 @@
 			return svg_dump_color(&paint->color);
 		}
 	}
-		break;
+	break;
 
-/* beginning of keyword type parsing */
+	/* beginning of keyword type parsing */
 	case SVG_FillRule_datatype:
 		if (intVal == SVG_FILLRULE_INHERIT) return gf_strdup("inherit");
 		else if (intVal == SVG_FILLRULE_NONZERO) return gf_strdup("nonzero");
@@ -4370,7 +4306,7 @@
 	case LASeR_Size_datatype:
 		sprintf(tmp, "%g %g", FIX2FLT(((LASeR_Size *)info->far_ptr)->width), FIX2FLT(((LASeR_Size *)info->far_ptr)->height));
 		return gf_strdup(tmp);
-/* end of keyword type parsing */
+	/* end of keyword type parsing */
 
 	/* inheritable floats */
 	case SVG_FontSize_datatype:
@@ -4407,7 +4343,7 @@
 		}
 		return attVal;
 	}
-		break;
+	break;
 
 	case SVG_PathData_datatype:
 #if DUMP_COORDINATES
@@ -4433,7 +4369,7 @@
 		return attVal;
 #endif
 	}
-		break;
+	break;
 	case SMIL_KeyTimes_datatype:
 	case SMIL_KeyPoints_datatype:
 	case SMIL_KeySplines_datatype:
@@ -4453,7 +4389,7 @@
 		}
 		return attVal;
 	}
-		break;
+	break;
 	case SVG_Coordinates_datatype:
 	{
 #if DUMP_COORDINATES
@@ -4474,7 +4410,7 @@
 		return attVal;
 #endif
 	}
-		break;
+	break;
 	case SVG_ViewBox_datatype:
 	{
 		SVG_ViewBox *v = (SVG_ViewBox *)info->far_ptr;
@@ -4484,7 +4420,7 @@
 		} else
 			return gf_strdup("none");
 	}
-		break;
+	break;
 	case SVG_StrokeDashArray_datatype:
 	{
 		SVG_StrokeDashArray *p = (SVG_StrokeDashArray *)info->far_ptr;
@@ -4496,9 +4432,9 @@
 			attVal[0] = 0;
 			for (i=0; i<p->array.count; i++) {
 				char *szT;
-                SVG_Length l;
-                l.type = p->array.units[i];
-                l.value = p->array.vals[i];
+				SVG_Length l;
+				l.type = p->array.units[i];
+				l.value = p->array.vals[i];
 				szT = svg_dump_number(&l);
 				attVal = gf_realloc(attVal, sizeof(char)*(strlen(szT)+strlen(attVal)+ (i ? 2 : 1) ));
 				if (i) strcat(attVal, " ");
@@ -4507,7 +4443,7 @@
 			return attVal;
 		}
 	}
-		break;
+	break;
 	case SVG_FontFamily_datatype:
 	{
 		SVG_FontFamily *f = (SVG_FontFamily *)info->far_ptr;
@@ -4557,7 +4493,7 @@
 			return gf_strdup(tmp);
 		}
 	}
-		break;
+	break;
 	case SVG_Focusable_datatype:
 	{
 		SVG_Focusable *f = (SVG_Focusable *)info->far_ptr;
@@ -4602,78 +4538,78 @@
 		return attVal;
 #endif
 	}
-		break;
+	break;
 
 	case SVG_Motion_datatype:
-		{
+	{
 #if DUMP_COORDINATES
-			GF_Matrix2D *m = (GF_Matrix2D *)info->far_ptr;
-			sprintf(tmp, "%g %g", FIX2FLT(m->m[2]), FIX2FLT(m->m[5]));
-			return gf_strdup(tmp);
+		GF_Matrix2D *m = (GF_Matrix2D *)info->far_ptr;
+		sprintf(tmp, "%g %g", FIX2FLT(m->m[2]), FIX2FLT(m->m[5]));
+		return gf_strdup(tmp);
 #endif
-		}
-		break;
+	}
+	break;
 
 	case SVG_Transform_datatype:
-		{
-			SVG_Transform *t= (SVG_Transform *)info->far_ptr;
-			if (t->is_ref) {
-				sprintf(tmp, "ref(svg,%g,%g)", FIX2FLT(t->mat.m[2]), FIX2FLT(t->mat.m[5]) );
-				return gf_strdup(tmp);
-			} else {
-				return gf_svg_dump_matrix(&t->mat);
-			}
+	{
+		SVG_Transform *t= (SVG_Transform *)info->far_ptr;
+		if (t->is_ref) {
+			sprintf(tmp, "ref(svg,%g,%g)", FIX2FLT(t->mat.m[2]), FIX2FLT(t->mat.m[5]) );
+			return gf_strdup(tmp);
+		} else {
+			return gf_svg_dump_matrix(&t->mat);
 		}
-		break;
+	}
+	break;
 
 	case SVG_Transform_Translate_datatype:
-		{
-			SVG_Point *pt = (SVG_Point *)info->far_ptr;
+	{
+		SVG_Point *pt = (SVG_Point *)info->far_ptr;
 #if DUMP_COORDINATES
-			sprintf(tmp, "%g %g", FIX2FLT(pt->x), FIX2FLT(pt->y) );
-			return gf_strdup(tmp);
+		sprintf(tmp, "%g %g", FIX2FLT(pt->x), FIX2FLT(pt->y) );
+		return gf_strdup(tmp);
 #endif
-		}
-		break;
+	}
+	break;
 
 	case SVG_Transform_Scale_datatype:
-		{
-			SVG_Point *pt = (SVG_Point *)info->far_ptr;
+	{
+		SVG_Point *pt = (SVG_Point *)info->far_ptr;
 #if DUMP_COORDINATES
-			if (pt->x == pt->y) {
-				sprintf(tmp, "%g", FIX2FLT(pt->x));
-			} else {
-				sprintf(tmp, "%g %g", FIX2FLT(pt->x), FIX2FLT(pt->y) );
-			}
-			return gf_strdup(tmp);
-#endif
+		if (pt->x == pt->y) {
+			sprintf(tmp, "%g", FIX2FLT(pt->x));
+		} else {
+			sprintf(tmp, "%g %g", FIX2FLT(pt->x), FIX2FLT(pt->y) );
 		}
-		break;
+		return gf_strdup(tmp);
+#endif
+	}
+	break;
 
 	case SVG_Transform_SkewX_datatype:
 	case SVG_Transform_SkewY_datatype:
-		{
-			Fixed *f = (Fixed *)info->far_ptr;
+	{
+		Fixed *f = (Fixed *)info->far_ptr;
 #if DUMP_COORDINATES
-			sprintf(tmp, "%g", FIX2FLT( 180 * gf_divfix(*f, GF_PI) ));
-			return gf_strdup(tmp);
+		sprintf(tmp, "%g", FIX2FLT( 180 * gf_divfix(*f, GF_PI) ));
+		return gf_strdup(tmp);
 #endif
-		}
-		break;
+	}
+	break;
 
 	case SVG_Transform_Rotate_datatype:
-		{
-			SVG_Point_Angle *pt = (SVG_Point_Angle *)info->far_ptr;
+	{
+		SVG_Point_Angle *pt = (SVG_Point_Angle *)info->far_ptr;
 #if DUMP_COORDINATES
-			if (pt->x || pt->y) {
-				sprintf(tmp, "%g %g %g", FIX2FLT( 180 * gf_divfix(pt->angle, GF_PI) ), FIX2FLT(pt->x), FIX2FLT(pt->y) );
-			} else {
-				sprintf(tmp, "%g", FIX2FLT(gf_divfix(180 * pt->angle, GF_PI) ));
-			}
-			return gf_strdup(tmp);
-#endif
+		if (pt->x || pt->y) {
+			sprintf(tmp, "%g %g %g", FIX2FLT( 180 * gf_divfix(pt->angle, GF_PI) ), FIX2FLT(pt->x), FIX2FLT(pt->y) );
+		} else {
+			sprintf(tmp, "%g", FIX2FLT(gf_divfix(180 * pt->angle, GF_PI) ));
 		}
-		break;
+		return gf_strdup(tmp);
+#endif
+	}
+	break;
 
 	case SMIL_AttributeName_datatype:
 	{
@@ -4684,7 +4620,7 @@
 		if (att_name->tag)
 			return gf_strdup( gf_svg_get_attribute_name(elt, att_name->tag) );
 	}
-		break;
+	break;
 
 	case SMIL_Times_datatype:
 	{
@@ -4742,7 +4678,7 @@
 		}
 		return attVal;
 	}
-		break;
+	break;
 	case SMIL_Duration_datatype:
 	{
 		SMIL_Duration *dur = (SMIL_Duration *)info->far_ptr;
@@ -4755,7 +4691,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[SVG Dumping] smil duration not assigned\n"));
 		}
 	}
-		break;
+	break;
 	case SMIL_RepeatCount_datatype:
 	{
 		SMIL_RepeatCount *rep = (SMIL_RepeatCount *)info->far_ptr;
@@ -4768,7 +4704,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[SVG Dumping] smil repeat count not assigned\n"));
 		}
 	}
-		break;
+	break;
 	case SVG_TransformType_datatype:
 	{
 		SVG_TransformType tr = *(SVG_TransformType *)info->far_ptr;
@@ -4779,7 +4715,7 @@
 		else if (tr == SVG_TRANSFORM_SKEWX) return gf_strdup("skewX");
 		else if (tr == SVG_TRANSFORM_SKEWY) return gf_strdup("skewY");
 	}
-		break;
+	break;
 
 	case SMIL_AnimateValue_datatype:
 	{
@@ -4791,7 +4727,7 @@
 		a_fi.far_ptr = av->value;
 		return gf_svg_dump_attribute(elt, &a_fi);
 	}
-		break;
+	break;
 	case SMIL_AnimateValues_datatype:
 	{
 		GF_FieldInfo a_fi;
@@ -4853,7 +4789,7 @@
 		return gf_strdup(tmp);
 #endif
 	}
-		break;
+	break;
 	case SMIL_KeyPoints_datatype:
 	case SMIL_KeyTimes_datatype:
 	case SMIL_KeySplines_datatype:
@@ -4862,7 +4798,7 @@
 		sprintf(tmp, "%g", FIX2FLT(*p));
 		return gf_strdup(tmp);
 	}
-		break;
+	break;
 	case SVG_Coordinates_datatype:
 #if DUMP_COORDINATES
 		return svg_dump_number((SVG_Length *) (SVG_Coordinate *)info->far_ptr);
@@ -4874,15 +4810,15 @@
 		sprintf(tmp, "%g", FIX2FLT(*v));
 		return gf_strdup(tmp);
 	}
-		break;
+	break;
 	case SVG_StrokeDashArray_datatype:
 	{
-        /*TODO: fix this: should be an SVG_Length*/
+		/*TODO: fix this: should be an SVG_Length*/
 		Fixed *p = (Fixed *)info->far_ptr;
 		sprintf(tmp, "%g", FIX2FLT(*p));
 		return gf_strdup(tmp);
 	}
-		break;
+	break;
 	case SMIL_Times_datatype:
 	{
 		SMIL_Time *t = (SMIL_Time *)info->far_ptr;
@@ -5061,7 +4997,7 @@
 		else if (p1->type==SVG_PAINT_URI) return svg_iris_equal(&p1->iri, &p2->iri);
 		return 1;
 	}
-		break;
+	break;
 
 	case SVG_FontSize_datatype:
 	case SVG_Length_datatype:
@@ -5191,42 +5127,42 @@
 		return svg_matrices_equal((GF_Matrix2D*)f1->far_ptr, (GF_Matrix2D*)f2->far_ptr);
 
 	case SVG_Transform_datatype:
-		{
-			SVG_Transform *t1 = (SVG_Transform *)f1->far_ptr;
-			SVG_Transform *t2 = (SVG_Transform *)f2->far_ptr;
-			if (t1->is_ref == t2->is_ref)
-				return svg_matrices_equal(&t1->mat, &t2->mat);
-			else
-				return 0;
-		}
+	{
+		SVG_Transform *t1 = (SVG_Transform *)f1->far_ptr;
+		SVG_Transform *t2 = (SVG_Transform *)f2->far_ptr;
+		if (t1->is_ref == t2->is_ref)
+			return svg_matrices_equal(&t1->mat, &t2->mat);
+		else
+			return 0;
+	}
 
 	case SVG_Transform_Translate_datatype:
 	case SVG_Transform_Scale_datatype:
-		{
-			SVG_Point *p1 = (SVG_Point *)f1->far_ptr;
-			SVG_Point *p2 = (SVG_Point *)f2->far_ptr;
-			if (p1->x != p2->x) return 0;
-			if (p1->y != p2->y) return 0;
-			return 1;
-		}
+	{
+		SVG_Point *p1 = (SVG_Point *)f1->far_ptr;
+		SVG_Point *p2 = (SVG_Point *)f2->far_ptr;
+		if (p1->x != p2->x) return 0;
+		if (p1->y != p2->y) return 0;
+		return 1;
+	}
 
 	case SVG_Transform_SkewX_datatype:
 	case SVG_Transform_SkewY_datatype:
-		{
-			Fixed *p1 = (Fixed *)f1->far_ptr;
-			Fixed *p2 = (Fixed *)f2->far_ptr;
-			return (*p1 == *p2);
-		}
+	{
+		Fixed *p1 = (Fixed *)f1->far_ptr;
+		Fixed *p2 = (Fixed *)f2->far_ptr;
+		return (*p1 == *p2);
+	}
 
 	case SVG_Transform_Rotate_datatype:
-		{
-			SVG_Point_Angle *p1 = (SVG_Point_Angle *)f1->far_ptr;
-			SVG_Point_Angle *p2 = (SVG_Point_Angle *)f2->far_ptr;
-			if (p1->x != p2->x) return 0;
-			if (p1->y != p2->y) return 0;
-			if (p1->angle != p2->angle) return 0;
-			return 1;
-		}
+	{
+		SVG_Point_Angle *p1 = (SVG_Point_Angle *)f1->far_ptr;
+		SVG_Point_Angle *p2 = (SVG_Point_Angle *)f2->far_ptr;
+		if (p1->x != p2->x) return 0;
+		if (p1->y != p2->y) return 0;
+		if (p1->angle != p2->angle) return 0;
+		return 1;
+	}
 
 
 	case SVG_ID_datatype:
@@ -5249,7 +5185,7 @@
 		if (foc1->type != SVG_FOCUS_IRI) return 1;
 		return (foc1->target.string && foc2->target.string && !strcmp(foc1->target.string, foc2->target.string)) ? 1 : 0;
 	}
-		break;
+	break;
 
 	case DOM_StringList_datatype:
 	{
@@ -5331,7 +5267,7 @@
 		if (av1->value != av2->value) return 0;
 		return 1;
 	}
-		break;
+	break;
 
 	case SMIL_AnimateValues_datatype:
 	{
@@ -5640,7 +5576,7 @@
 	c->array.vals = (Fixed *) gf_malloc(sizeof(Fixed)*c->array.count);
 	for (i = 0; i < c->array.count; i++) {
 		/* TODO: convert units if needed */
-        c->array.units[i] = a->array.units[i];
+		c->array.units[i] = a->array.units[i];
 		c->array.vals[i] = gf_mulfix(alpha, a->array.vals[i]) + gf_mulfix(beta, b->array.vals[i]);
 	}
 	return GF_OK;
@@ -5698,21 +5634,21 @@
 
 /* c = alpha * a + beta * b */
 GF_Err gf_svg_attributes_muladd(Fixed alpha, GF_FieldInfo *a,
-							 Fixed beta, GF_FieldInfo *b,
-							 GF_FieldInfo *c,
-							 Bool clamp)
+                                Fixed beta, GF_FieldInfo *b,
+                                GF_FieldInfo *c,
+                                Bool clamp)
 {
 	if (!a->far_ptr || !b->far_ptr || !c->far_ptr) return GF_BAD_PARAM;
 
 	if (a->fieldType != b->fieldType) {
 		if (a->fieldType != SVG_Transform_datatype &&
-			a->fieldType != SVG_Transform_Scale_datatype &&
-			a->fieldType != SVG_Transform_Translate_datatype &&
-			a->fieldType != SVG_Transform_Rotate_datatype &&
-			a->fieldType != SVG_Transform_SkewX_datatype &&
-			a->fieldType != SVG_Transform_SkewY_datatype &&
-			a->fieldType != SVG_Motion_datatype)
-		return GF_BAD_PARAM;
+		        a->fieldType != SVG_Transform_Scale_datatype &&
+		        a->fieldType != SVG_Transform_Translate_datatype &&
+		        a->fieldType != SVG_Transform_Rotate_datatype &&
+		        a->fieldType != SVG_Transform_SkewX_datatype &&
+		        a->fieldType != SVG_Transform_SkewY_datatype &&
+		        a->fieldType != SVG_Motion_datatype)
+			return GF_BAD_PARAM;
 	}
 
 	/* by default a and c are of the same type, except for matrix related types */
@@ -5725,17 +5661,17 @@
 		return svg_color_muladd(alpha, (SVG_Color*)a->far_ptr, beta, (SVG_Color*)b->far_ptr, (SVG_Color*)c->far_ptr, clamp);
 
 	case SVG_Paint_datatype:
-		{
-			SVG_Paint *pa = (SVG_Paint *)a->far_ptr;
-			SVG_Paint *pb = (SVG_Paint *)b->far_ptr;
-			SVG_Paint *pc = (SVG_Paint *)c->far_ptr;
-			if (pa->type != pb->type || pa->type != SVG_PAINT_COLOR || pb->type != SVG_PAINT_COLOR) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] only color paints are additive\n"));
-				return GF_BAD_PARAM;
-			}
-			pc->type = SVG_PAINT_COLOR;
-			return svg_color_muladd(alpha, &pa->color, beta, &pb->color, &pc->color, clamp);
+	{
+		SVG_Paint *pa = (SVG_Paint *)a->far_ptr;
+		SVG_Paint *pb = (SVG_Paint *)b->far_ptr;
+		SVG_Paint *pc = (SVG_Paint *)c->far_ptr;
+		if (pa->type != pb->type || pa->type != SVG_PAINT_COLOR || pb->type != SVG_PAINT_COLOR) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] only color paints are additive\n"));
+			return GF_BAD_PARAM;
 		}
+		pc->type = SVG_PAINT_COLOR;
+		return svg_color_muladd(alpha, &pa->color, beta, &pb->color, &pc->color, clamp);
+	}
 
 	case SVG_Number_datatype:
 	case SVG_Length_datatype:
@@ -5777,12 +5713,12 @@
 			/* a and c are matrices but b is not */
 			GF_Matrix2D tmp;
 			/*TOCHECK what is this test*/
-/*
-			if (alpha != FIX_ONE) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
-				return GF_NOT_SUPPORTED;
-			}
-*/
+			/*
+						if (alpha != FIX_ONE) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+							return GF_NOT_SUPPORTED;
+						}
+			*/
 			gf_mx2d_init(tmp);
 			switch (b->fieldType) {
 			case SVG_Transform_Translate_datatype:
@@ -5879,7 +5815,7 @@
 		if (*s_a) gf_free(*s_a);
 		*s_a = res;
 	}
-		break;
+	break;
 	case LASeR_Size_datatype:
 		laser_size_muladd(alpha, (LASeR_Size*)a->far_ptr, beta, (LASeR_Size*)b->far_ptr, (LASeR_Size*)c->far_ptr);
 		break;
@@ -5961,22 +5897,22 @@
 		break;
 
 	case SVG_Paint_datatype:
-		{
-			SVG_Paint *pa = (SVG_Paint *)a->far_ptr;
-			SVG_Paint *pb = (SVG_Paint *)b->far_ptr;
-			pa->type = pb->type;
-			if (pb->type == SVG_PAINT_URI) {
-				GF_FieldInfo tmp_a, tmp_b;
-				tmp_a.fieldType = tmp_b.fieldType = XMLRI_datatype;
-				tmp_a.far_ptr = &pa->iri;
-				tmp_b.far_ptr = &pb->iri;
-				gf_svg_attributes_copy(&tmp_a, &tmp_b, 0);
-			} else {
-				pa->color = pb->color;
-			}
-			return GF_OK;
+	{
+		SVG_Paint *pa = (SVG_Paint *)a->far_ptr;
+		SVG_Paint *pb = (SVG_Paint *)b->far_ptr;
+		pa->type = pb->type;
+		if (pb->type == SVG_PAINT_URI) {
+			GF_FieldInfo tmp_a, tmp_b;
+			tmp_a.fieldType = tmp_b.fieldType = XMLRI_datatype;
+			tmp_a.far_ptr = &pa->iri;
+			tmp_b.far_ptr = &pb->iri;
+			gf_svg_attributes_copy(&tmp_a, &tmp_b, 0);
+		} else {
+			pa->color = pb->color;
 		}
-		break;
+		return GF_OK;
+	}
+	break;
 
 	case SVG_Number_datatype:
 	case SVG_Length_datatype:
@@ -6085,7 +6021,7 @@
 	case SVG_ContentType_datatype:
 	case DOM_String_datatype:
 		if (* (SVG_String *)a->far_ptr) gf_free(* (SVG_String *)a->far_ptr);
-			* (SVG_String *)a->far_ptr = *(SVG_String *)b->far_ptr ? gf_strdup(*(SVG_String *)b->far_ptr) : NULL;
+		* (SVG_String *)a->far_ptr = *(SVG_String *)b->far_ptr ? gf_strdup(*(SVG_String *)b->far_ptr) : NULL;
 		return GF_OK;
 
 	case SVG_FontFamily_datatype:
@@ -6117,7 +6053,7 @@
 		if ( ((SVG_Focus *)b->far_ptr)->target.string)
 			((SVG_Focus *)a->far_ptr)->target.string = gf_strdup( ((SVG_Focus *)b->far_ptr)->target.string);
 	}
-		return GF_OK;
+	return GF_OK;
 
 	case SMIL_Times_datatype:
 	{
@@ -6130,7 +6066,7 @@
 			gf_free(t);
 		}
 		count = gf_list_count(src);
-		for (i=0;i<count;i++) {
+		for (i=0; i<count; i++) {
 			SMIL_Time *t2;
 			SMIL_Time *t = gf_list_get(src, i);
 			t2 = (SMIL_Time*)gf_malloc(sizeof(SMIL_Time));
@@ -6138,7 +6074,7 @@
 			gf_list_add(dst, t2);
 		}
 	}
-		return GF_OK;
+	return GF_OK;
 	case SMIL_AttributeName_datatype:
 	{
 		SMIL_AttributeName *saa = (SMIL_AttributeName *)a->far_ptr;
@@ -6147,7 +6083,7 @@
 		saa->type = sab->type;
 		saa->name = sab->name ? gf_strdup(sab->name) : NULL;
 	}
-		break;
+	break;
 	case SMIL_Duration_datatype:
 	{
 		SMIL_Duration *da = (SMIL_Duration*)a->far_ptr;
@@ -6155,7 +6091,7 @@
 		da->type = db->type;
 		da->clock_value = db->clock_value;
 	}
-		break;
+	break;
 	case SMIL_AnimateValue_datatype:
 	{
 		SMIL_AnimateValue *sa = (SMIL_AnimateValue*)a->far_ptr;
@@ -6171,7 +6107,7 @@
 			gf_svg_attributes_copy(&ava, &avb, 0);
 		}
 	}
-		break;
+	break;
 
 	/* Unsupported types */
 	case XMLRI_List_datatype:
@@ -6351,90 +6287,174 @@
 char *gf_svg_attribute_type_to_string(u32 att_type)
 {
 	switch (att_type) {
-	case SVG_FillRule_datatype:			return "FillRule";
-	case SVG_StrokeLineJoin_datatype:	return "StrokeLineJoin";
-	case SVG_StrokeLineCap_datatype:	return "StrokeLineCap";
-	case SVG_FontStyle_datatype:		return "FontStyle";
-	case SVG_FontWeight_datatype:		return "FontWeight";
-	case SVG_FontVariant_datatype:		return "FontVariant";
-	case SVG_TextAnchor_datatype:		return "TextAnchor";
-	case SVG_TransformType_datatype:	return "TransformType";
-	case SVG_Display_datatype:			return "Display";
-	case SVG_Visibility_datatype:		return "Visibility";
-	case SVG_Overflow_datatype:			return "Overflow";
-	case SVG_ZoomAndPan_datatype:		return "ZoomAndPan";
-	case SVG_DisplayAlign_datatype:		return "DisplayAlign";
-	case SVG_PointerEvents_datatype:	return "PointerEvents";
-	case SVG_RenderingHint_datatype:	return "RenderingHint";
-	case SVG_VectorEffect_datatype:		return "VectorEffect";
-	case SVG_PlaybackOrder_datatype:	return "PlaybackOrder";
-	case SVG_TimelineBegin_datatype:	return "TimelineBegin";
-	case XML_Space_datatype:			return "XML_Space";
-	case XMLEV_Propagate_datatype:		return "XMLEV_Propagate";
-	case XMLEV_DefaultAction_datatype:	return "XMLEV_DefaultAction";
-	case XMLEV_Phase_datatype:			return "XMLEV_Phase";
-	case SMIL_SyncBehavior_datatype:	return "SMIL_SyncBehavior";
-	case SMIL_SyncTolerance_datatype:	return "SMIL_SyncTolerance";
-	case SMIL_AttributeType_datatype:	return "SMIL_AttributeType";
-	case SMIL_CalcMode_datatype:		return "SMIL_CalcMode";
-	case SMIL_Additive_datatype:		return "SMIL_Additive";
-	case SMIL_Accumulate_datatype:		return "SMIL_Accumulate";
-	case SMIL_Restart_datatype:			return "SMIL_Restart";
-	case SMIL_Fill_datatype:			return "SMIL_Fill";
-	case SVG_GradientUnit_datatype:		return "GradientUnit";
-	case SVG_InitialVisibility_datatype:return "InitialVisibility";
-	case SVG_FocusHighlight_datatype:	return "FocusHighlight";
-	case SVG_Overlay_datatype:			return "Overlay";
-	case SVG_TransformBehavior_datatype:return "TransformBehavior";
-	case SVG_SpreadMethod_datatype:		return "SpreadMethod";
-	case SVG_TextAlign_datatype:		return "TextAlign";
-	case SVG_Number_datatype:			return "Number";
-	case SVG_FontSize_datatype:			return "FontSize";
-	case SVG_Length_datatype:			return "Length";
-	case SVG_Coordinate_datatype:		return "Coordinate";
-	case SVG_Rotate_datatype:			return "Rotate";
-	case SVG_Numbers_datatype:			return "Numbers";
-	case SVG_Points_datatype:			return "Points";
-	case SVG_Coordinates_datatype:		return "Coordinates";
-	case DOM_StringList_datatype:		return "StringList";
-	case XMLRI_List_datatype:			return "ListOfIRI";
-	case SMIL_KeyTimes_datatype:		return "SMIL_KeyTimes";
-	case SMIL_KeySplines_datatype:		return "SMIL_KeySplines";
-	case SMIL_KeyPoints_datatype:		return "SMIL_KeyPoints";
-	case SMIL_Times_datatype:			return "SMIL_Times";
-	case SMIL_AnimateValue_datatype:	return "SMIL_AnimateValue";
-	case SMIL_AnimateValues_datatype:	return "SMIL_AnimateValues";
-	case SMIL_Duration_datatype:		return "SMIL_Duration";
-	case SMIL_RepeatCount_datatype:		return "SMIL_RepeatCount";
-	case SMIL_AttributeName_datatype:	return "SMIL_AttributeName";
-	case SVG_Boolean_datatype:			return "Boolean";
-	case SVG_Color_datatype:			return "Color";
-	case SVG_Paint_datatype:			return "Paint";
-	case SVG_PathData_datatype:			return "PathData";
-	case SVG_FontFamily_datatype:		return "FontFamily";
-	case SVG_ID_datatype:				return "ID";
-	case XMLRI_datatype:				return "IRI";
-	case XML_IDREF_datatype:			return "IDREF";
-	case SVG_StrokeDashArray_datatype:	return "StrokeDashArray";
-	case SVG_PreserveAspectRatio_datatype:return "PreserveAspectRatio";
-	case SVG_ViewBox_datatype:			return "ViewBox";
-	case SVG_GradientOffset_datatype:	return "GradientOffset";
-	case SVG_Focus_datatype	:			return "Focus";
-	case SVG_Clock_datatype	:			return "Clock";
-	case DOM_String_datatype	:		return "String";
-	case SVG_ContentType_datatype:		return "ContentType";
-	case SVG_LanguageID_datatype:		return "LanguageID";
-	case XMLEV_Event_datatype:			return "XMLEV_Event";
-	case SVG_Motion_datatype:			return "Motion";
-	case SVG_Transform_datatype:		return "Transform";
-	case SVG_Transform_Translate_datatype:return "Translate";
-	case SVG_Transform_Scale_datatype:	return "Scale";
-	case SVG_Transform_SkewX_datatype:	return "SkewX";
-	case SVG_Transform_SkewY_datatype:	return "SkewY";
-	case SVG_Transform_Rotate_datatype:	return "Rotate";
-	case LASeR_Choice_datatype:			return "LASeR_Choice";
-	case LASeR_Size_datatype:			return "LASeR_Size";
-	default:							return "UnknownType";
+	case SVG_FillRule_datatype:
+		return "FillRule";
+	case SVG_StrokeLineJoin_datatype:
+		return "StrokeLineJoin";
+	case SVG_StrokeLineCap_datatype:
+		return "StrokeLineCap";
+	case SVG_FontStyle_datatype:
+		return "FontStyle";
+	case SVG_FontWeight_datatype:
+		return "FontWeight";
+	case SVG_FontVariant_datatype:
+		return "FontVariant";
+	case SVG_TextAnchor_datatype:
+		return "TextAnchor";
+	case SVG_TransformType_datatype:
+		return "TransformType";
+	case SVG_Display_datatype:
+		return "Display";
+	case SVG_Visibility_datatype:
+		return "Visibility";
+	case SVG_Overflow_datatype:
+		return "Overflow";
+	case SVG_ZoomAndPan_datatype:
+		return "ZoomAndPan";
+	case SVG_DisplayAlign_datatype:
+		return "DisplayAlign";
+	case SVG_PointerEvents_datatype:
+		return "PointerEvents";
+	case SVG_RenderingHint_datatype:
+		return "RenderingHint";
+	case SVG_VectorEffect_datatype:
+		return "VectorEffect";
+	case SVG_PlaybackOrder_datatype:
+		return "PlaybackOrder";
+	case SVG_TimelineBegin_datatype:
+		return "TimelineBegin";
+	case XML_Space_datatype:
+		return "XML_Space";
+	case XMLEV_Propagate_datatype:
+		return "XMLEV_Propagate";
+	case XMLEV_DefaultAction_datatype:
+		return "XMLEV_DefaultAction";
+	case XMLEV_Phase_datatype:
+		return "XMLEV_Phase";
+	case SMIL_SyncBehavior_datatype:
+		return "SMIL_SyncBehavior";
+	case SMIL_SyncTolerance_datatype:
+		return "SMIL_SyncTolerance";
+	case SMIL_AttributeType_datatype:
+		return "SMIL_AttributeType";
+	case SMIL_CalcMode_datatype:
+		return "SMIL_CalcMode";
+	case SMIL_Additive_datatype:
+		return "SMIL_Additive";
+	case SMIL_Accumulate_datatype:
+		return "SMIL_Accumulate";
+	case SMIL_Restart_datatype:
+		return "SMIL_Restart";
+	case SMIL_Fill_datatype:
+		return "SMIL_Fill";
+	case SVG_GradientUnit_datatype:
+		return "GradientUnit";
+	case SVG_InitialVisibility_datatype:
+		return "InitialVisibility";
+	case SVG_FocusHighlight_datatype:
+		return "FocusHighlight";
+	case SVG_Overlay_datatype:
+		return "Overlay";
+	case SVG_TransformBehavior_datatype:
+		return "TransformBehavior";
+	case SVG_SpreadMethod_datatype:
+		return "SpreadMethod";
+	case SVG_TextAlign_datatype:
+		return "TextAlign";
+	case SVG_Number_datatype:
+		return "Number";
+	case SVG_FontSize_datatype:
+		return "FontSize";
+	case SVG_Length_datatype:
+		return "Length";
+	case SVG_Coordinate_datatype:
+		return "Coordinate";
+	case SVG_Rotate_datatype:
+		return "Rotate";
+	case SVG_Numbers_datatype:
+		return "Numbers";
+	case SVG_Points_datatype:
+		return "Points";
+	case SVG_Coordinates_datatype:
+		return "Coordinates";
+	case DOM_StringList_datatype:
+		return "StringList";
+	case XMLRI_List_datatype:
+		return "ListOfIRI";
+	case SMIL_KeyTimes_datatype:
+		return "SMIL_KeyTimes";
+	case SMIL_KeySplines_datatype:
+		return "SMIL_KeySplines";
+	case SMIL_KeyPoints_datatype:
+		return "SMIL_KeyPoints";
+	case SMIL_Times_datatype:
+		return "SMIL_Times";
+	case SMIL_AnimateValue_datatype:
+		return "SMIL_AnimateValue";
+	case SMIL_AnimateValues_datatype:
+		return "SMIL_AnimateValues";
+	case SMIL_Duration_datatype:
+		return "SMIL_Duration";
+	case SMIL_RepeatCount_datatype:
+		return "SMIL_RepeatCount";
+	case SMIL_AttributeName_datatype:
+		return "SMIL_AttributeName";
+	case SVG_Boolean_datatype:
+		return "Boolean";
+	case SVG_Color_datatype:
+		return "Color";
+	case SVG_Paint_datatype:
+		return "Paint";
+	case SVG_PathData_datatype:
+		return "PathData";
+	case SVG_FontFamily_datatype:
+		return "FontFamily";
+	case SVG_ID_datatype:
+		return "ID";
+	case XMLRI_datatype:
+		return "IRI";
+	case XML_IDREF_datatype:
+		return "IDREF";
+	case SVG_StrokeDashArray_datatype:
+		return "StrokeDashArray";
+	case SVG_PreserveAspectRatio_datatype:
+		return "PreserveAspectRatio";
+	case SVG_ViewBox_datatype:
+		return "ViewBox";
+	case SVG_GradientOffset_datatype:
+		return "GradientOffset";
+	case SVG_Focus_datatype	:
+		return "Focus";
+	case SVG_Clock_datatype	:
+		return "Clock";
+	case DOM_String_datatype	:
+		return "String";
+	case SVG_ContentType_datatype:
+		return "ContentType";
+	case SVG_LanguageID_datatype:
+		return "LanguageID";
+	case XMLEV_Event_datatype:
+		return "XMLEV_Event";
+	case SVG_Motion_datatype:
+		return "Motion";
+	case SVG_Transform_datatype:
+		return "Transform";
+	case SVG_Transform_Translate_datatype:
+		return "Translate";
+	case SVG_Transform_Scale_datatype:
+		return "Scale";
+	case SVG_Transform_SkewX_datatype:
+		return "SkewX";
+	case SVG_Transform_SkewY_datatype:
+		return "SkewY";
+	case SVG_Transform_Rotate_datatype:
+		return "Rotate";
+	case LASeR_Choice_datatype:
+		return "LASeR_Choice";
+	case LASeR_Size_datatype:
+		return "LASeR_Size";
+	default:
+		return "UnknownType";
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/svg_properties.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/svg_properties.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -29,13 +29,13 @@
 
 #include <gpac/internal/scenegraph_dev.h>
 #include <gpac/nodes_svg.h>
-/* 
-	Initialization of properties at the top level before any rendering 
+/*
+	Initialization of properties at the top level before any rendering
 	The value shall not use the 'inherit' value, it uses the initial value.
-    The property values are then updated when going down the tree using svg_properties_apply 
+    The property values are then updated when going down the tree using svg_properties_apply
 */
 GF_EXPORT
-void gf_svg_properties_init_pointers(SVGPropertiesPointers *svg_props) 
+void gf_svg_properties_init_pointers(SVGPropertiesPointers *svg_props)
 {
 	if (!svg_props) return;
 
@@ -66,7 +66,7 @@
 	GF_SAFEALLOC(svg_props->fill_opacity, SVG_Number);
 	svg_props->fill_opacity->type = SVG_NUMBER_VALUE;
 	svg_props->fill_opacity->value = FIX_ONE;
-	
+
 	GF_SAFEALLOC(svg_props->fill_rule, SVG_FillRule);
 	*svg_props->fill_rule = SVG_FILLRULE_NONZERO;
 
@@ -229,49 +229,87 @@
 void *gf_svg_get_property_pointer_from_tag(SVGPropertiesPointers *output_property_context, u32 prop_tag)
 {
 	switch (prop_tag) {
-		case TAG_SVG_ATT_audio_level: return output_property_context->audio_level;
-		case TAG_SVG_ATT_color: return output_property_context->color;
-		case TAG_SVG_ATT_color_rendering: return output_property_context->color_rendering;
-		case TAG_SVG_ATT_display: return output_property_context->display;
-		case TAG_SVG_ATT_display_align: return output_property_context->display_align;
-		case TAG_SVG_ATT_fill: return output_property_context->fill;
-		case TAG_SVG_ATT_fill_opacity: return output_property_context->fill_opacity;
-		case TAG_SVG_ATT_fill_rule: return output_property_context->fill_rule;
-		case TAG_SVG_ATT_font_family: return output_property_context->font_family;
-		case TAG_SVG_ATT_font_size: return output_property_context->font_size;
-		case TAG_SVG_ATT_font_style: return output_property_context->font_style;
-		case TAG_SVG_ATT_font_variant: return output_property_context->font_variant;
-		case TAG_SVG_ATT_font_weight: return output_property_context->font_weight;
-		case TAG_SVG_ATT_image_rendering: return output_property_context->image_rendering;
-		case TAG_SVG_ATT_line_increment: return output_property_context->line_increment;
-		case TAG_SVG_ATT_opacity: return output_property_context->opacity;
-		case TAG_SVG_ATT_pointer_events: return output_property_context->pointer_events;
-		case TAG_SVG_ATT_shape_rendering: return output_property_context->shape_rendering;
-		case TAG_SVG_ATT_solid_color: return output_property_context->solid_color;
-		case TAG_SVG_ATT_solid_opacity: return output_property_context->solid_opacity;
-		case TAG_SVG_ATT_stop_color: return output_property_context->stop_color;
-		case TAG_SVG_ATT_stop_opacity: return output_property_context->stop_opacity;
-		case TAG_SVG_ATT_stroke: return output_property_context->stroke;
-		case TAG_SVG_ATT_stroke_dasharray: return output_property_context->stroke_dasharray;
-		case TAG_SVG_ATT_stroke_dashoffset: return output_property_context->stroke_dashoffset;
-		case TAG_SVG_ATT_stroke_linecap: return output_property_context->stroke_linecap;
-		case TAG_SVG_ATT_stroke_linejoin: return output_property_context->stroke_linejoin;
-		case TAG_SVG_ATT_stroke_miterlimit: return output_property_context->stroke_miterlimit;
-		case TAG_SVG_ATT_stroke_opacity: return output_property_context->stroke_opacity;
-		case TAG_SVG_ATT_stroke_width: return output_property_context->stroke_width;
-		case TAG_SVG_ATT_text_align: return output_property_context->text_align;
-		case TAG_SVG_ATT_text_anchor: return output_property_context->text_anchor;
-		case TAG_SVG_ATT_text_rendering: return output_property_context->text_rendering;
-		case TAG_SVG_ATT_vector_effect: return output_property_context->vector_effect;
-		case TAG_SVG_ATT_viewport_fill: return output_property_context->viewport_fill;
-		case TAG_SVG_ATT_viewport_fill_opacity: return output_property_context->viewport_fill_opacity;
-		case TAG_SVG_ATT_visibility: return output_property_context->visibility;
-		default:return NULL;
+	case TAG_SVG_ATT_audio_level:
+		return output_property_context->audio_level;
+	case TAG_SVG_ATT_color:
+		return output_property_context->color;
+	case TAG_SVG_ATT_color_rendering:
+		return output_property_context->color_rendering;
+	case TAG_SVG_ATT_display:
+		return output_property_context->display;
+	case TAG_SVG_ATT_display_align:
+		return output_property_context->display_align;
+	case TAG_SVG_ATT_fill:
+		return output_property_context->fill;
+	case TAG_SVG_ATT_fill_opacity:
+		return output_property_context->fill_opacity;
+	case TAG_SVG_ATT_fill_rule:
+		return output_property_context->fill_rule;
+	case TAG_SVG_ATT_font_family:
+		return output_property_context->font_family;
+	case TAG_SVG_ATT_font_size:
+		return output_property_context->font_size;
+	case TAG_SVG_ATT_font_style:
+		return output_property_context->font_style;
+	case TAG_SVG_ATT_font_variant:
+		return output_property_context->font_variant;
+	case TAG_SVG_ATT_font_weight:
+		return output_property_context->font_weight;
+	case TAG_SVG_ATT_image_rendering:
+		return output_property_context->image_rendering;
+	case TAG_SVG_ATT_line_increment:
+		return output_property_context->line_increment;
+	case TAG_SVG_ATT_opacity:
+		return output_property_context->opacity;
+	case TAG_SVG_ATT_pointer_events:
+		return output_property_context->pointer_events;
+	case TAG_SVG_ATT_shape_rendering:
+		return output_property_context->shape_rendering;
+	case TAG_SVG_ATT_solid_color:
+		return output_property_context->solid_color;
+	case TAG_SVG_ATT_solid_opacity:
+		return output_property_context->solid_opacity;
+	case TAG_SVG_ATT_stop_color:
+		return output_property_context->stop_color;
+	case TAG_SVG_ATT_stop_opacity:
+		return output_property_context->stop_opacity;
+	case TAG_SVG_ATT_stroke:
+		return output_property_context->stroke;
+	case TAG_SVG_ATT_stroke_dasharray:
+		return output_property_context->stroke_dasharray;
+	case TAG_SVG_ATT_stroke_dashoffset:
+		return output_property_context->stroke_dashoffset;
+	case TAG_SVG_ATT_stroke_linecap:
+		return output_property_context->stroke_linecap;
+	case TAG_SVG_ATT_stroke_linejoin:
+		return output_property_context->stroke_linejoin;
+	case TAG_SVG_ATT_stroke_miterlimit:
+		return output_property_context->stroke_miterlimit;
+	case TAG_SVG_ATT_stroke_opacity:
+		return output_property_context->stroke_opacity;
+	case TAG_SVG_ATT_stroke_width:
+		return output_property_context->stroke_width;
+	case TAG_SVG_ATT_text_align:
+		return output_property_context->text_align;
+	case TAG_SVG_ATT_text_anchor:
+		return output_property_context->text_anchor;
+	case TAG_SVG_ATT_text_rendering:
+		return output_property_context->text_rendering;
+	case TAG_SVG_ATT_vector_effect:
+		return output_property_context->vector_effect;
+	case TAG_SVG_ATT_viewport_fill:
+		return output_property_context->viewport_fill;
+	case TAG_SVG_ATT_viewport_fill_opacity:
+		return output_property_context->viewport_fill_opacity;
+	case TAG_SVG_ATT_visibility:
+		return output_property_context->visibility;
+	default:
+		return NULL;
 	}
 }
 
 void *gf_svg_get_property_pointer(SVG_Element *elt, void *input_attribute,
-								   SVGPropertiesPointers *output_property_context)
+                                  SVGPropertiesPointers *output_property_context)
 {
 	SVGAttribute *att = elt->attributes;
 	while (att) {
@@ -295,48 +333,48 @@
 		}
 		if (!att) return 0;
 		switch (att->tag) {
-			case TAG_SVG_ATT_audio_level: 
-			case TAG_SVG_ATT_color: 
-			case TAG_SVG_ATT_color_rendering: 
-			case TAG_SVG_ATT_display: 
-			case TAG_SVG_ATT_display_align: 
-			case TAG_SVG_ATT_fill: 
-			case TAG_SVG_ATT_fill_opacity: 
-			case TAG_SVG_ATT_fill_rule: 
-			case TAG_SVG_ATT_font_family: 
-			case TAG_SVG_ATT_font_size: 
-			case TAG_SVG_ATT_font_style: 
-			case TAG_SVG_ATT_font_variant: 
-			case TAG_SVG_ATT_font_weight: 
-			case TAG_SVG_ATT_image_rendering: 
-			case TAG_SVG_ATT_line_increment: 
-			case TAG_SVG_ATT_opacity: 
-			case TAG_SVG_ATT_pointer_events: 
-			case TAG_SVG_ATT_shape_rendering: 
-			case TAG_SVG_ATT_solid_color: 
-			case TAG_SVG_ATT_solid_opacity: 
-			case TAG_SVG_ATT_stop_color: 
-			case TAG_SVG_ATT_stop_opacity: 
-			case TAG_SVG_ATT_stroke: 
-			case TAG_SVG_ATT_stroke_dasharray: 
-			case TAG_SVG_ATT_stroke_dashoffset: 
-			case TAG_SVG_ATT_stroke_linecap: 
-			case TAG_SVG_ATT_stroke_linejoin: 
-			case TAG_SVG_ATT_stroke_miterlimit: 
-			case TAG_SVG_ATT_stroke_opacity: 
-			case TAG_SVG_ATT_stroke_width: 
-			case TAG_SVG_ATT_text_align: 
-			case TAG_SVG_ATT_text_anchor: 
-			case TAG_SVG_ATT_text_rendering: 
-			case TAG_SVG_ATT_vector_effect: 
-			case TAG_SVG_ATT_viewport_fill: 
-			case TAG_SVG_ATT_viewport_fill_opacity: 
-			case TAG_SVG_ATT_visibility: 
-				return 1;
-			default:
-				return 0;
+		case TAG_SVG_ATT_audio_level:
+		case TAG_SVG_ATT_color:
+		case TAG_SVG_ATT_color_rendering:
+		case TAG_SVG_ATT_display:
+		case TAG_SVG_ATT_display_align:
+		case TAG_SVG_ATT_fill:
+		case TAG_SVG_ATT_fill_opacity:
+		case TAG_SVG_ATT_fill_rule:
+		case TAG_SVG_ATT_font_family:
+		case TAG_SVG_ATT_font_size:
+		case TAG_SVG_ATT_font_style:
+		case TAG_SVG_ATT_font_variant:
+		case TAG_SVG_ATT_font_weight:
+		case TAG_SVG_ATT_image_rendering:
+		case TAG_SVG_ATT_line_increment:
+		case TAG_SVG_ATT_opacity:
+		case TAG_SVG_ATT_pointer_events:
+		case TAG_SVG_ATT_shape_rendering:
+		case TAG_SVG_ATT_solid_color:
+		case TAG_SVG_ATT_solid_opacity:
+		case TAG_SVG_ATT_stop_color:
+		case TAG_SVG_ATT_stop_opacity:
+		case TAG_SVG_ATT_stroke:
+		case TAG_SVG_ATT_stroke_dasharray:
+		case TAG_SVG_ATT_stroke_dashoffset:
+		case TAG_SVG_ATT_stroke_linecap:
+		case TAG_SVG_ATT_stroke_linejoin:
+		case TAG_SVG_ATT_stroke_miterlimit:
+		case TAG_SVG_ATT_stroke_opacity:
+		case TAG_SVG_ATT_stroke_width:
+		case TAG_SVG_ATT_text_align:
+		case TAG_SVG_ATT_text_anchor:
+		case TAG_SVG_ATT_text_rendering:
+		case TAG_SVG_ATT_vector_effect:
+		case TAG_SVG_ATT_viewport_fill:
+		case TAG_SVG_ATT_viewport_fill_opacity:
+		case TAG_SVG_ATT_visibility:
+			return 1;
+		default:
+			return 0;
 		}
-	} 
+	}
 	else {
 		return 0;
 	}
@@ -416,7 +454,7 @@
 {
 //	return 0xFFFFFFFF;
 	switch (info->fieldType) {
-	case SVG_Paint_datatype: 
+	case SVG_Paint_datatype:
 		if (info->fieldIndex == TAG_SVG_ATT_fill)	return GF_SG_SVG_FILL_DIRTY;
 		if (info->fieldIndex == TAG_SVG_ATT_stroke) return GF_SG_SVG_STROKE_DIRTY;
 		if (info->fieldIndex == TAG_SVG_ATT_solid_color) return GF_SG_SVG_SOLIDCOLOR_OR_OPACITY_DIRTY;
@@ -436,8 +474,8 @@
 		if (info->fieldIndex == TAG_SVG_ATT_stroke_dashoffset) return GF_SG_SVG_STROKEDASHOFFSET_DIRTY;
 		if (info->fieldIndex == TAG_SVG_ATT_stroke_width) return GF_SG_SVG_STROKEWIDTH_DIRTY;
 		break;
-	case SVG_DisplayAlign_datatype: 
-		return GF_SG_SVG_DISPLAYALIGN_DIRTY;		
+	case SVG_DisplayAlign_datatype:
+		return GF_SG_SVG_DISPLAYALIGN_DIRTY;
 	case SVG_FillRule_datatype:
 		return GF_SG_SVG_FILLRULE_DIRTY;
 	case SVG_FontFamily_datatype:
@@ -467,7 +505,7 @@
 	}
 
 	/* this is not a property but a regular attribute, the animatable attributes are at the moment:
-		focusable, focusHighlight, gradientUnits, nav-*, target, xlink:href, xlink:type, 
+		focusable, focusHighlight, gradientUnits, nav-*, target, xlink:href, xlink:type,
 
 
 		the following affect the geometry of the element (some affect the positioning):
@@ -477,38 +515,38 @@
 		transform, motion
 	*/
 	switch (info->fieldType) {
-		case SVG_Number_datatype:
-		case SVG_Length_datatype:
-		case SVG_Coordinate_datatype:
-		case SVG_Numbers_datatype:
-		case SVG_Points_datatype:
-		case SVG_Coordinates_datatype:
-		case SVG_PathData_datatype:
-		case SVG_Rotate_datatype:
-			return GF_SG_SVG_GEOMETRY_DIRTY;
-
-		case XMLRI_datatype:
-			return GF_SG_SVG_XLINK_HREF_DIRTY;
-		/*for viewbox & PAR, use node dirty to force recomputing of the viewbox*/
-		case SVG_PreserveAspectRatio_datatype:
-		case SVG_ViewBox_datatype:
-			return GF_SG_NODE_DIRTY;
-
-		//case SVG_Matrix_datatype:
-		//case SVG_Motion_datatype:
+	case SVG_Number_datatype:
+	case SVG_Length_datatype:
+	case SVG_Coordinate_datatype:
+	case SVG_Numbers_datatype:
+	case SVG_Points_datatype:
+	case SVG_Coordinates_datatype:
+	case SVG_PathData_datatype:
+	case SVG_Rotate_datatype:
+		return GF_SG_SVG_GEOMETRY_DIRTY;
+
+	case XMLRI_datatype:
+		return GF_SG_SVG_XLINK_HREF_DIRTY;
+	/*for viewbox & PAR, use node dirty to force recomputing of the viewbox*/
+	case SVG_PreserveAspectRatio_datatype:
+	case SVG_ViewBox_datatype:
+		return GF_SG_NODE_DIRTY;
+
+	//case SVG_Matrix_datatype:
+	//case SVG_Motion_datatype:
 
-		default:
-			return 0;
+	default:
+		return 0;
 	}
 }
 
-/* NOTE: Some properties (audio-level, display, opacity, solid*, stop*, vector-effect, viewport*) 
+/* 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
  */
 GF_EXPORT
-u32 gf_svg_apply_inheritance(SVGAllAttributes *all_atts, SVGPropertiesPointers *render_svg_props) 
+u32 gf_svg_apply_inheritance(SVGAllAttributes *all_atts, SVGPropertiesPointers *render_svg_props)
 {
 	u32 inherited_flags_mask = GF_SG_NODE_DIRTY | GF_SG_CHILD_DIRTY;
 	if(!all_atts || !render_svg_props) return ~inherited_flags_mask;
@@ -519,7 +557,7 @@
 		Fixed par_val = render_svg_props->computed_audio_level;
 		Fixed val = par_val;
 		if (all_atts->audio_level->type != SVG_NUMBER_INHERIT) {
-			render_svg_props->audio_level = all_atts->audio_level;	
+			render_svg_props->audio_level = all_atts->audio_level;
 			val = all_atts->audio_level->value;
 		} else if (render_svg_props->audio_level) {
 			val = render_svg_props->audio_level->value;
@@ -530,9 +568,9 @@
 		val = MIN(FIX_ONE, MAX( val, 0));
 		render_svg_props->computed_audio_level = gf_mulfix(val, par_val);
 	}
-	
-	if (all_atts->color && all_atts->color->type == SVG_PAINT_COLOR 
-		&& all_atts->color->color.type != SVG_COLOR_INHERIT) {
+
+	if (all_atts->color && all_atts->color->type == SVG_PAINT_COLOR
+	        && all_atts->color->color.type != SVG_COLOR_INHERIT) {
 		render_svg_props->color = all_atts->color;
 	} else {
 		inherited_flags_mask |= GF_SG_SVG_COLOR_DIRTY;
@@ -555,9 +593,9 @@
 	}
 	if (all_atts->fill && all_atts->fill->type != SVG_PAINT_INHERIT) {
 		render_svg_props->fill = all_atts->fill;
-		if (all_atts->fill->type == SVG_PAINT_COLOR && 
-			all_atts->fill->color.type == SVG_COLOR_CURRENTCOLOR) {
-			render_svg_props->fill = render_svg_props->color; 
+		if (all_atts->fill->type == SVG_PAINT_COLOR &&
+		        all_atts->fill->color.type == SVG_COLOR_CURRENTCOLOR) {
+			render_svg_props->fill = render_svg_props->color;
 			if (inherited_flags_mask & GF_SG_SVG_COLOR_DIRTY) {
 				inherited_flags_mask |= GF_SG_SVG_FILL_DIRTY;
 			}
@@ -623,9 +661,9 @@
 		render_svg_props->shape_rendering = all_atts->shape_rendering;
 	}
 	if (all_atts->solid_color && all_atts->solid_color->type != SVG_PAINT_INHERIT) {
-		render_svg_props->solid_color = all_atts->solid_color;		
-		if (all_atts->solid_color->type == SVG_PAINT_COLOR && 
-			all_atts->solid_color->color.type == SVG_COLOR_CURRENTCOLOR) {
+		render_svg_props->solid_color = all_atts->solid_color;
+		if (all_atts->solid_color->type == SVG_PAINT_COLOR &&
+		        all_atts->solid_color->color.type == SVG_COLOR_CURRENTCOLOR) {
 			render_svg_props->solid_color = render_svg_props->color;
 			if (inherited_flags_mask & GF_SG_SVG_COLOR_DIRTY) {
 				inherited_flags_mask |= GF_SG_SVG_SOLIDCOLOR_OR_OPACITY_DIRTY;
@@ -645,8 +683,8 @@
 	}
 	if (all_atts->stop_color && all_atts->stop_color->type != SVG_PAINT_INHERIT) {
 		render_svg_props->stop_color = all_atts->stop_color;
-		if (all_atts->stop_color->type == SVG_PAINT_COLOR && 
-			all_atts->stop_color->color.type == SVG_COLOR_CURRENTCOLOR) {
+		if (all_atts->stop_color->type == SVG_PAINT_COLOR &&
+		        all_atts->stop_color->color.type == SVG_COLOR_CURRENTCOLOR) {
 			render_svg_props->stop_color = render_svg_props->color;
 			if (inherited_flags_mask & GF_SG_SVG_COLOR_DIRTY) {
 				inherited_flags_mask |= GF_SG_SVG_STOPCOLOR_OR_OPACITY_DIRTY;
@@ -666,8 +704,8 @@
 	}
 	if (all_atts->stroke && all_atts->stroke->type != SVG_PAINT_INHERIT) {
 		render_svg_props->stroke = all_atts->stroke;
-		if (all_atts->stroke->type == SVG_PAINT_COLOR && 
-			all_atts->stroke->color.type == SVG_COLOR_CURRENTCOLOR) {
+		if (all_atts->stroke->type == SVG_PAINT_COLOR &&
+		        all_atts->stroke->color.type == SVG_COLOR_CURRENTCOLOR) {
 			render_svg_props->stroke = render_svg_props->color;
 			if (inherited_flags_mask & GF_SG_SVG_COLOR_DIRTY) {
 				inherited_flags_mask |= GF_SG_SVG_STROKE_DIRTY;
@@ -732,10 +770,10 @@
 		inherited_flags_mask |= GF_SG_SVG_VECTOREFFECT_DIRTY;
 	}
 	if (all_atts->viewport_fill && all_atts->viewport_fill->type != SVG_PAINT_INHERIT) {
-		render_svg_props->viewport_fill = all_atts->viewport_fill;		
+		render_svg_props->viewport_fill = all_atts->viewport_fill;
 	} else if (!all_atts->viewport_fill) {
 		render_svg_props->viewport_fill = NULL;
-	} 
+	}
 	if (all_atts->viewport_fill_opacity && all_atts->viewport_fill_opacity->type != SVG_NUMBER_INHERIT) {
 		render_svg_props->viewport_fill_opacity = all_atts->viewport_fill_opacity;
 	} else if (!all_atts->viewport_fill_opacity) {
@@ -758,217 +796,625 @@
 	att = e->attributes;
 	while (att) {
 		switch(att->tag) {
-		case TAG_XML_ATT_id: all_atts->xml_id = (SVG_ID *)att->data; break;
-		case TAG_XML_ATT_base: all_atts->xml_base = (XMLRI *)att->data; break;
-		case TAG_XML_ATT_lang: all_atts->xml_lang = (SVG_LanguageID *)att->data; break;
-		case TAG_XML_ATT_space: all_atts->xml_space = (XML_Space *)att->data; break;
-
-		case TAG_XLINK_ATT_type: all_atts->xlink_type = (SVG_String *)att->data; break;
-		case TAG_XLINK_ATT_role: all_atts->xlink_role = (XMLRI *)att->data; break;
-		case TAG_XLINK_ATT_arcrole: all_atts->xlink_arcrole = (XMLRI *)att->data; break;
-		case TAG_XLINK_ATT_title: all_atts->xlink_title = (SVG_String *)att->data; break;
-		case TAG_XLINK_ATT_href: all_atts->xlink_href = (XMLRI *)att->data; break;
-		case TAG_XLINK_ATT_show: all_atts->xlink_show = (SVG_String *)att->data; break;
-		case TAG_XLINK_ATT_actuate: all_atts->xlink_actuate = (SVG_String *)att->data; break;
-
-		case TAG_XMLEV_ATT_event: all_atts->event = (XMLEV_Event *)att->data; break;
-		case TAG_XMLEV_ATT_phase: all_atts->phase = (XMLEV_Phase *)att->data; break;
-		case TAG_XMLEV_ATT_propagate: all_atts->propagate = (XMLEV_Propagate *)att->data; break;
-		case TAG_XMLEV_ATT_defaultAction: all_atts->defaultAction = (XMLEV_DefaultAction *)att->data; break;
-		case TAG_XMLEV_ATT_observer: all_atts->observer = (XML_IDREF *)att->data; break;
-		case TAG_XMLEV_ATT_target: all_atts->listener_target = (XML_IDREF *)att->data; break;
-		case TAG_XMLEV_ATT_handler: all_atts->handler = (XMLRI *)att->data; break;
-
-		case TAG_LSR_ATT_enabled: all_atts->lsr_enabled = (SVG_Boolean *)att->data; break;
-
-		case TAG_SVG_ATT_id: all_atts->id = (SVG_ID *)att->data; break;
-		case TAG_SVG_ATT__class: all_atts->_class = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_requiredFeatures: all_atts->requiredFeatures = (SVG_ListOfIRI *)att->data; break;
-		case TAG_SVG_ATT_requiredExtensions: all_atts->requiredExtensions = (SVG_ListOfIRI *)att->data; break;
-		case TAG_SVG_ATT_requiredFormats: all_atts->requiredFormats = (SVG_FormatList *)att->data; break;
-		case TAG_SVG_ATT_requiredFonts: all_atts->requiredFonts = (SVG_FontList *)att->data; break;
-		case TAG_SVG_ATT_systemLanguage: all_atts->systemLanguage = (SVG_LanguageIDs *)att->data; break;
-		case TAG_SVG_ATT_display: all_atts->display = (SVG_Display *)att->data; break;
-		case TAG_SVG_ATT_visibility: all_atts->visibility = (SVG_Visibility *)att->data; break;
-		case TAG_SVG_ATT_image_rendering: all_atts->image_rendering = (SVG_RenderingHint *)att->data; break;
-		case TAG_SVG_ATT_pointer_events: all_atts->pointer_events = (SVG_PointerEvents *)att->data; break;
-		case TAG_SVG_ATT_shape_rendering: all_atts->shape_rendering = (SVG_RenderingHint *)att->data; break;
-		case TAG_SVG_ATT_text_rendering: all_atts->text_rendering = (SVG_RenderingHint *)att->data; break;
-		case TAG_SVG_ATT_audio_level: all_atts->audio_level = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_viewport_fill: all_atts->viewport_fill = (SVG_Paint *)att->data; break;
-		case TAG_SVG_ATT_viewport_fill_opacity: all_atts->viewport_fill_opacity = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_overflow: all_atts->overflow = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_fill_opacity: all_atts->fill_opacity = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_stroke_opacity: all_atts->stroke_opacity = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_fill: all_atts->fill = (SVG_Paint *)att->data; break;
-		case TAG_SVG_ATT_filter: all_atts->filter = (SVG_Paint *)att->data; break;
-		case TAG_SVG_ATT_fill_rule: all_atts->fill_rule = (SVG_FillRule *)att->data; break;
-		case TAG_SVG_ATT_stroke: all_atts->stroke = (SVG_Paint *)att->data; break;
-		case TAG_SVG_ATT_stroke_dasharray: all_atts->stroke_dasharray = (SVG_StrokeDashArray *)att->data; break;
-		case TAG_SVG_ATT_stroke_dashoffset: all_atts->stroke_dashoffset = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_stroke_linecap: all_atts->stroke_linecap = (SVG_StrokeLineCap *)att->data; break;
-		case TAG_SVG_ATT_stroke_linejoin: all_atts->stroke_linejoin = (SVG_StrokeLineJoin *)att->data; break;
-		case TAG_SVG_ATT_stroke_miterlimit: all_atts->stroke_miterlimit = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_stroke_width: all_atts->stroke_width = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_color: all_atts->color = (SVG_Paint *)att->data; break;
-		case TAG_SVG_ATT_color_rendering: all_atts->color_rendering = (SVG_RenderingHint *)att->data; break;
-		case TAG_SVG_ATT_vector_effect: all_atts->vector_effect = (SVG_VectorEffect *)att->data; break;
-		case TAG_SVG_ATT_solid_color: all_atts->solid_color = (SVG_SVGColor *)att->data; break;
-		case TAG_SVG_ATT_solid_opacity: all_atts->solid_opacity = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_display_align: all_atts->display_align = (SVG_DisplayAlign *)att->data; break;
-		case TAG_SVG_ATT_line_increment: all_atts->line_increment = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_stop_color: all_atts->stop_color = (SVG_SVGColor *)att->data; break;
-		case TAG_SVG_ATT_stop_opacity: all_atts->stop_opacity = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_font_family: all_atts->font_family = (SVG_FontFamily *)att->data; break;
-		case TAG_SVG_ATT_font_size: all_atts->font_size = (SVG_FontSize *)att->data; break;
-		case TAG_SVG_ATT_font_style: all_atts->font_style = (SVG_FontStyle *)att->data; break;
-		case TAG_SVG_ATT_font_variant: all_atts->font_variant = (SVG_FontVariant *)att->data; break;
-		case TAG_SVG_ATT_font_weight: all_atts->font_weight = (SVG_FontWeight *)att->data; break;
-		case TAG_SVG_ATT_text_anchor: all_atts->text_anchor = (SVG_TextAnchor *)att->data; break;
-		case TAG_SVG_ATT_text_align: all_atts->text_align = (SVG_TextAlign *)att->data; break;
-		case TAG_SVG_ATT_text_decoration: all_atts->text_decoration = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_focusHighlight: all_atts->focusHighlight = (SVG_FocusHighlight *)att->data; break;
-		case TAG_SVG_ATT_externalResourcesRequired: all_atts->externalResourcesRequired = (SVG_Boolean *)att->data; break;
-		case TAG_SVG_ATT_focusable: all_atts->focusable = (SVG_Focusable *)att->data; break;
-		case TAG_SVG_ATT_nav_next: all_atts->nav_next = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_prev: all_atts->nav_prev = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_up: all_atts->nav_up = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_up_right: all_atts->nav_up_right = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_right: all_atts->nav_right = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_down_right: all_atts->nav_down_right = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_down: all_atts->nav_down = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_down_left: all_atts->nav_down_left = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_left: all_atts->nav_left = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_nav_up_left: all_atts->nav_up_left = (SVG_Focus *)att->data; break;
-		case TAG_SVG_ATT_transform: all_atts->transform = (SVG_Transform *)att->data; break;
-		case TAG_SVG_ATT_target: all_atts->target = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_attributeName: all_atts->attributeName = (SMIL_AttributeName *)att->data; break;
-		case TAG_SVG_ATT_attributeType: all_atts->attributeType = (SMIL_AttributeType *)att->data; break;
-		case TAG_SVG_ATT_begin: all_atts->begin = (SMIL_Times *)att->data; break;
-		case TAG_SVG_ATT_dur: all_atts->dur = (SMIL_Duration *)att->data; break;
-		case TAG_SVG_ATT_end: all_atts->end = (SMIL_Times *)att->data; break;
-		case TAG_SVG_ATT_repeatCount: all_atts->repeatCount = (SMIL_RepeatCount *)att->data; break;
-		case TAG_SVG_ATT_repeatDur: all_atts->repeatDur = (SMIL_Duration *)att->data; break;
-		case TAG_SVG_ATT_restart: all_atts->restart = (SMIL_Restart *)att->data; break;
-		case TAG_SVG_ATT_smil_fill: all_atts->smil_fill = (SMIL_Fill *)att->data; break;
-		case TAG_SVG_ATT_min: all_atts->min = (SMIL_Duration *)att->data; break;
-		case TAG_SVG_ATT_max: all_atts->max = (SMIL_Duration *)att->data; break;
-		case TAG_SVG_ATT_to: all_atts->to = (SMIL_AnimateValue *)att->data; break;
-		case TAG_SVG_ATT_calcMode: all_atts->calcMode = (SMIL_CalcMode *)att->data; break;
-		case TAG_SVG_ATT_values: all_atts->values = (SMIL_AnimateValues *)att->data; break;
-		case TAG_SVG_ATT_keyTimes: all_atts->keyTimes = (SMIL_KeyTimes *)att->data; break;
-		case TAG_SVG_ATT_keySplines: all_atts->keySplines = (SMIL_KeySplines *)att->data; break;
-		case TAG_SVG_ATT_from: all_atts->from = (SMIL_AnimateValue *)att->data; break;
-		case TAG_SVG_ATT_by: all_atts->by = (SMIL_AnimateValue *)att->data; break;
-		case TAG_SVG_ATT_additive: all_atts->additive = (SMIL_Additive *)att->data; break;
-		case TAG_SVG_ATT_accumulate: all_atts->accumulate = (SMIL_Accumulate *)att->data; break;
-		case TAG_SVG_ATT_path: all_atts->path = (SVG_PathData *)att->data; break;
-		case TAG_SVG_ATT_keyPoints: all_atts->keyPoints = (SMIL_KeyPoints *)att->data; break;
-		case TAG_SVG_ATT_rotate: all_atts->rotate = (SVG_Rotate *)att->data; break;
-		case TAG_SVG_ATT_origin: all_atts->origin = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_transform_type: all_atts->transform_type = (SVG_TransformType *)att->data; break;
-		case TAG_SVG_ATT_clipBegin: all_atts->clipBegin = (SVG_Clock *)att->data; break;
-		case TAG_SVG_ATT_clipEnd: all_atts->clipEnd = (SVG_Clock *)att->data; break;
-		case TAG_SVG_ATT_syncBehavior: all_atts->syncBehavior = (SMIL_SyncBehavior *)att->data; break;
-		case TAG_SVG_ATT_syncTolerance: all_atts->syncTolerance = (SMIL_SyncTolerance *)att->data; break;
-		case TAG_SVG_ATT_syncMaster: all_atts->syncMaster = (SVG_Boolean *)att->data; break;
-		case TAG_SVG_ATT_syncReference: all_atts->syncReference = (XMLRI *)att->data; break;
-		case TAG_SVG_ATT_x: all_atts->x = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_y: all_atts->y = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_width: all_atts->width = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_height: all_atts->height = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_preserveAspectRatio: all_atts->preserveAspectRatio = (SVG_PreserveAspectRatio *)att->data; break;
-		case TAG_SVG_ATT_initialVisibility: all_atts->initialVisibility = (SVG_InitialVisibility *)att->data; break;
-		case TAG_SVG_ATT_type: all_atts->type = (SVG_ContentType *)att->data; break;
-		case TAG_SVG_ATT_cx: all_atts->cx = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_cy: all_atts->cy = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_r: all_atts->r = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_cursorManager_x: all_atts->cursorManager_x = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_cursorManager_y: all_atts->cursorManager_y = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_rx: all_atts->rx = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_ry: all_atts->ry = (SVG_Length *)att->data; break;
-		case TAG_SVG_ATT_horiz_adv_x: all_atts->horiz_adv_x = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_horiz_origin_x: all_atts->horiz_origin_x = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_font_stretch: all_atts->font_stretch = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_unicode_range: all_atts->unicode_range = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_panose_1: all_atts->panose_1 = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_widths: all_atts->widths = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_bbox: all_atts->bbox = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_units_per_em: all_atts->units_per_em = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_stemv: all_atts->stemv = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_stemh: all_atts->stemh = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_slope: all_atts->slope = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_cap_height: all_atts->cap_height = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_x_height: all_atts->x_height = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_accent_height: all_atts->accent_height = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_ascent: all_atts->ascent = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_descent: all_atts->descent = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_ideographic: all_atts->ideographic = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_alphabetic: all_atts->alphabetic = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_mathematical: all_atts->mathematical = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_hanging: all_atts->hanging = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_underline_position: all_atts->underline_position = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_underline_thickness: all_atts->underline_thickness = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_strikethrough_position: all_atts->strikethrough_position = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_strikethrough_thickness: all_atts->strikethrough_thickness = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_overline_position: all_atts->overline_position = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_overline_thickness: all_atts->overline_thickness = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_d: all_atts->d = (SVG_PathData *)att->data; break;
-		case TAG_SVG_ATT_unicode: all_atts->unicode = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_glyph_name: all_atts->glyph_name = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_arabic_form: all_atts->arabic_form = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_lang: all_atts->lang = (SVG_LanguageIDs *)att->data; break;
-		case TAG_SVG_ATT_u1: all_atts->u1 = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_g1: all_atts->g1 = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_u2: all_atts->u2 = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_g2: all_atts->g2 = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_k: all_atts->k = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_opacity: all_atts->opacity = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_x1: all_atts->x1 = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_y1: all_atts->y1 = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_x2: all_atts->x2 = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_y2: all_atts->y2 = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_gradientUnits: all_atts->gradientUnits = (SVG_GradientUnit *)att->data; break;
-		case TAG_SVG_ATT_filterUnits: all_atts->focusable = (SVG_GradientUnit *)att->data; break;
-		case TAG_SVG_ATT_spreadMethod: all_atts->spreadMethod = (SVG_SpreadMethod *)att->data; break;
-		case TAG_SVG_ATT_gradientTransform: all_atts->gradientTransform = (SVG_Transform *)att->data; break;
-		case TAG_SVG_ATT_pathLength: all_atts->pathLength = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_points: all_atts->points = (SVG_Points *)att->data; break;
-		case TAG_SVG_ATT_mediaSize: all_atts->mediaSize = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_mediaTime: all_atts->mediaTime = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_mediaCharacterEncoding: all_atts->mediaCharacterEncoding = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_mediaContentEncodings: all_atts->mediaContentEncodings = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_bandwidth: all_atts->bandwidth = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_fx: all_atts->fx = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_fy: all_atts->fy = (SVG_Coordinate *)att->data; break;
-		case TAG_SVG_ATT_size: all_atts->size = (LASeR_Size *)att->data; break;
-		case TAG_SVG_ATT_choice: all_atts->choice = (LASeR_Choice *)att->data; break;
-		case TAG_SVG_ATT_delta: all_atts->delta = (LASeR_Size *)att->data; break;
-		case TAG_SVG_ATT_offset: all_atts->offset = (SVG_Number *)att->data; break;
-		case TAG_SVG_ATT_syncBehaviorDefault: all_atts->syncBehaviorDefault = (SMIL_SyncBehavior *)att->data; break;
-		case TAG_SVG_ATT_syncToleranceDefault: all_atts->syncToleranceDefault = (SMIL_SyncTolerance *)att->data; break;
-		case TAG_SVG_ATT_viewBox: all_atts->viewBox = (SVG_ViewBox *)att->data; break;
-		case TAG_SVG_ATT_zoomAndPan: all_atts->zoomAndPan = (SVG_ZoomAndPan *)att->data; break;
-		case TAG_SVG_ATT_version: all_atts->version = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_baseProfile: all_atts->baseProfile = (SVG_String *)att->data; break;
-		case TAG_SVG_ATT_contentScriptType: all_atts->contentScriptType = (SVG_ContentType *)att->data; break;
-		case TAG_SVG_ATT_snapshotTime: all_atts->snapshotTime = (SVG_Clock *)att->data; break;
-		case TAG_SVG_ATT_timelineBegin: all_atts->timelineBegin = (SVG_TimelineBegin *)att->data; break;
-		case TAG_SVG_ATT_playbackOrder: all_atts->playbackOrder = (SVG_PlaybackOrder *)att->data; break;
-		case TAG_SVG_ATT_editable: all_atts->editable = (SVG_Boolean *)att->data; break;
-		case TAG_SVG_ATT_text_x: all_atts->text_x = (SVG_Coordinates *)att->data; break;
-		case TAG_SVG_ATT_text_y: all_atts->text_y = (SVG_Coordinates *)att->data; break;
-		case TAG_SVG_ATT_text_rotate: all_atts->text_rotate = (SVG_Numbers *)att->data; break;
-		case TAG_SVG_ATT_transformBehavior: all_atts->transformBehavior = (SVG_TransformBehavior *)att->data; break;
-		case TAG_SVG_ATT_overlay: all_atts->overlay = (SVG_Overlay *)att->data; break;
-		case TAG_SVG_ATT_fullscreen: all_atts->fullscreen = (SVG_Boolean *)att->data; break;
-		case TAG_SVG_ATT_motionTransform: all_atts->motionTransform = (SVG_Motion *)att->data; break;
-
-        case TAG_GSVG_ATT_useAsPrimary: all_atts->gpac_useAsPrimary = (SVG_Boolean *)att->data; break;
-        case TAG_GSVG_ATT_depthOffset: all_atts->gpac_depthOffset = (SVG_Number *)att->data; break;
-        case TAG_GSVG_ATT_depthGain: all_atts->gpac_depthGain = (SVG_Number *)att->data; break;
+		case TAG_XML_ATT_id:
+			all_atts->xml_id = (SVG_ID *)att->data;
+			break;
+		case TAG_XML_ATT_base:
+			all_atts->xml_base = (XMLRI *)att->data;
+			break;
+		case TAG_XML_ATT_lang:
+			all_atts->xml_lang = (SVG_LanguageID *)att->data;
+			break;
+		case TAG_XML_ATT_space:
+			all_atts->xml_space = (XML_Space *)att->data;
+			break;
+
+		case TAG_XLINK_ATT_type:
+			all_atts->xlink_type = (SVG_String *)att->data;
+			break;
+		case TAG_XLINK_ATT_role:
+			all_atts->xlink_role = (XMLRI *)att->data;
+			break;
+		case TAG_XLINK_ATT_arcrole:
+			all_atts->xlink_arcrole = (XMLRI *)att->data;
+			break;
+		case TAG_XLINK_ATT_title:
+			all_atts->xlink_title = (SVG_String *)att->data;
+			break;
+		case TAG_XLINK_ATT_href:
+			all_atts->xlink_href = (XMLRI *)att->data;
+			break;
+		case TAG_XLINK_ATT_show:
+			all_atts->xlink_show = (SVG_String *)att->data;
+			break;
+		case TAG_XLINK_ATT_actuate:
+			all_atts->xlink_actuate = (SVG_String *)att->data;
+			break;
+
+		case TAG_XMLEV_ATT_event:
+			all_atts->event = (XMLEV_Event *)att->data;
+			break;
+		case TAG_XMLEV_ATT_phase:
+			all_atts->phase = (XMLEV_Phase *)att->data;
+			break;
+		case TAG_XMLEV_ATT_propagate:
+			all_atts->propagate = (XMLEV_Propagate *)att->data;
+			break;
+		case TAG_XMLEV_ATT_defaultAction:
+			all_atts->defaultAction = (XMLEV_DefaultAction *)att->data;
+			break;
+		case TAG_XMLEV_ATT_observer:
+			all_atts->observer = (XML_IDREF *)att->data;
+			break;
+		case TAG_XMLEV_ATT_target:
+			all_atts->listener_target = (XML_IDREF *)att->data;
+			break;
+		case TAG_XMLEV_ATT_handler:
+			all_atts->handler = (XMLRI *)att->data;
+			break;
+
+		case TAG_LSR_ATT_enabled:
+			all_atts->lsr_enabled = (SVG_Boolean *)att->data;
+			break;
+
+		case TAG_SVG_ATT_id:
+			all_atts->id = (SVG_ID *)att->data;
+			break;
+		case TAG_SVG_ATT__class:
+			all_atts->_class = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_requiredFeatures:
+			all_atts->requiredFeatures = (SVG_ListOfIRI *)att->data;
+			break;
+		case TAG_SVG_ATT_requiredExtensions:
+			all_atts->requiredExtensions = (SVG_ListOfIRI *)att->data;
+			break;
+		case TAG_SVG_ATT_requiredFormats:
+			all_atts->requiredFormats = (SVG_FormatList *)att->data;
+			break;
+		case TAG_SVG_ATT_requiredFonts:
+			all_atts->requiredFonts = (SVG_FontList *)att->data;
+			break;
+		case TAG_SVG_ATT_systemLanguage:
+			all_atts->systemLanguage = (SVG_LanguageIDs *)att->data;
+			break;
+		case TAG_SVG_ATT_display:
+			all_atts->display = (SVG_Display *)att->data;
+			break;
+		case TAG_SVG_ATT_visibility:
+			all_atts->visibility = (SVG_Visibility *)att->data;
+			break;
+		case TAG_SVG_ATT_image_rendering:
+			all_atts->image_rendering = (SVG_RenderingHint *)att->data;
+			break;
+		case TAG_SVG_ATT_pointer_events:
+			all_atts->pointer_events = (SVG_PointerEvents *)att->data;
+			break;
+		case TAG_SVG_ATT_shape_rendering:
+			all_atts->shape_rendering = (SVG_RenderingHint *)att->data;
+			break;
+		case TAG_SVG_ATT_text_rendering:
+			all_atts->text_rendering = (SVG_RenderingHint *)att->data;
+			break;
+		case TAG_SVG_ATT_audio_level:
+			all_atts->audio_level = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_viewport_fill:
+			all_atts->viewport_fill = (SVG_Paint *)att->data;
+			break;
+		case TAG_SVG_ATT_viewport_fill_opacity:
+			all_atts->viewport_fill_opacity = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_overflow:
+			all_atts->overflow = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_fill_opacity:
+			all_atts->fill_opacity = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_stroke_opacity:
+			all_atts->stroke_opacity = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_fill:
+			all_atts->fill = (SVG_Paint *)att->data;
+			break;
+		case TAG_SVG_ATT_filter:
+			all_atts->filter = (SVG_Paint *)att->data;
+			break;
+		case TAG_SVG_ATT_fill_rule:
+			all_atts->fill_rule = (SVG_FillRule *)att->data;
+			break;
+		case TAG_SVG_ATT_stroke:
+			all_atts->stroke = (SVG_Paint *)att->data;
+			break;
+		case TAG_SVG_ATT_stroke_dasharray:
+			all_atts->stroke_dasharray = (SVG_StrokeDashArray *)att->data;
+			break;
+		case TAG_SVG_ATT_stroke_dashoffset:
+			all_atts->stroke_dashoffset = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_stroke_linecap:
+			all_atts->stroke_linecap = (SVG_StrokeLineCap *)att->data;
+			break;
+		case TAG_SVG_ATT_stroke_linejoin:
+			all_atts->stroke_linejoin = (SVG_StrokeLineJoin *)att->data;
+			break;
+		case TAG_SVG_ATT_stroke_miterlimit:
+			all_atts->stroke_miterlimit = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_stroke_width:
+			all_atts->stroke_width = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_color:
+			all_atts->color = (SVG_Paint *)att->data;
+			break;
+		case TAG_SVG_ATT_color_rendering:
+			all_atts->color_rendering = (SVG_RenderingHint *)att->data;
+			break;
+		case TAG_SVG_ATT_vector_effect:
+			all_atts->vector_effect = (SVG_VectorEffect *)att->data;
+			break;
+		case TAG_SVG_ATT_solid_color:
+			all_atts->solid_color = (SVG_SVGColor *)att->data;
+			break;
+		case TAG_SVG_ATT_solid_opacity:
+			all_atts->solid_opacity = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_display_align:
+			all_atts->display_align = (SVG_DisplayAlign *)att->data;
+			break;
+		case TAG_SVG_ATT_line_increment:
+			all_atts->line_increment = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_stop_color:
+			all_atts->stop_color = (SVG_SVGColor *)att->data;
+			break;
+		case TAG_SVG_ATT_stop_opacity:
+			all_atts->stop_opacity = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_font_family:
+			all_atts->font_family = (SVG_FontFamily *)att->data;
+			break;
+		case TAG_SVG_ATT_font_size:
+			all_atts->font_size = (SVG_FontSize *)att->data;
+			break;
+		case TAG_SVG_ATT_font_style:
+			all_atts->font_style = (SVG_FontStyle *)att->data;
+			break;
+		case TAG_SVG_ATT_font_variant:
+			all_atts->font_variant = (SVG_FontVariant *)att->data;
+			break;
+		case TAG_SVG_ATT_font_weight:
+			all_atts->font_weight = (SVG_FontWeight *)att->data;
+			break;
+		case TAG_SVG_ATT_text_anchor:
+			all_atts->text_anchor = (SVG_TextAnchor *)att->data;
+			break;
+		case TAG_SVG_ATT_text_align:
+			all_atts->text_align = (SVG_TextAlign *)att->data;
+			break;
+		case TAG_SVG_ATT_text_decoration:
+			all_atts->text_decoration = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_focusHighlight:
+			all_atts->focusHighlight = (SVG_FocusHighlight *)att->data;
+			break;
+		case TAG_SVG_ATT_externalResourcesRequired:
+			all_atts->externalResourcesRequired = (SVG_Boolean *)att->data;
+			break;
+		case TAG_SVG_ATT_focusable:
+			all_atts->focusable = (SVG_Focusable *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_next:
+			all_atts->nav_next = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_prev:
+			all_atts->nav_prev = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_up:
+			all_atts->nav_up = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_up_right:
+			all_atts->nav_up_right = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_right:
+			all_atts->nav_right = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_down_right:
+			all_atts->nav_down_right = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_down:
+			all_atts->nav_down = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_down_left:
+			all_atts->nav_down_left = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_left:
+			all_atts->nav_left = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_nav_up_left:
+			all_atts->nav_up_left = (SVG_Focus *)att->data;
+			break;
+		case TAG_SVG_ATT_transform:
+			all_atts->transform = (SVG_Transform *)att->data;
+			break;
+		case TAG_SVG_ATT_target:
+			all_atts->target = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_attributeName:
+			all_atts->attributeName = (SMIL_AttributeName *)att->data;
+			break;
+		case TAG_SVG_ATT_attributeType:
+			all_atts->attributeType = (SMIL_AttributeType *)att->data;
+			break;
+		case TAG_SVG_ATT_begin:
+			all_atts->begin = (SMIL_Times *)att->data;
+			break;
+		case TAG_SVG_ATT_dur:
+			all_atts->dur = (SMIL_Duration *)att->data;
+			break;
+		case TAG_SVG_ATT_end:
+			all_atts->end = (SMIL_Times *)att->data;
+			break;
+		case TAG_SVG_ATT_repeatCount:
+			all_atts->repeatCount = (SMIL_RepeatCount *)att->data;
+			break;
+		case TAG_SVG_ATT_repeatDur:
+			all_atts->repeatDur = (SMIL_Duration *)att->data;
+			break;
+		case TAG_SVG_ATT_restart:
+			all_atts->restart = (SMIL_Restart *)att->data;
+			break;
+		case TAG_SVG_ATT_smil_fill:
+			all_atts->smil_fill = (SMIL_Fill *)att->data;
+			break;
+		case TAG_SVG_ATT_min:
+			all_atts->min = (SMIL_Duration *)att->data;
+			break;
+		case TAG_SVG_ATT_max:
+			all_atts->max = (SMIL_Duration *)att->data;
+			break;
+		case TAG_SVG_ATT_to:
+			all_atts->to = (SMIL_AnimateValue *)att->data;
+			break;
+		case TAG_SVG_ATT_calcMode:
+			all_atts->calcMode = (SMIL_CalcMode *)att->data;
+			break;
+		case TAG_SVG_ATT_values:
+			all_atts->values = (SMIL_AnimateValues *)att->data;
+			break;
+		case TAG_SVG_ATT_keyTimes:
+			all_atts->keyTimes = (SMIL_KeyTimes *)att->data;
+			break;
+		case TAG_SVG_ATT_keySplines:
+			all_atts->keySplines = (SMIL_KeySplines *)att->data;
+			break;
+		case TAG_SVG_ATT_from:
+			all_atts->from = (SMIL_AnimateValue *)att->data;
+			break;
+		case TAG_SVG_ATT_by:
+			all_atts->by = (SMIL_AnimateValue *)att->data;
+			break;
+		case TAG_SVG_ATT_additive:
+			all_atts->additive = (SMIL_Additive *)att->data;
+			break;
+		case TAG_SVG_ATT_accumulate:
+			all_atts->accumulate = (SMIL_Accumulate *)att->data;
+			break;
+		case TAG_SVG_ATT_path:
+			all_atts->path = (SVG_PathData *)att->data;
+			break;
+		case TAG_SVG_ATT_keyPoints:
+			all_atts->keyPoints = (SMIL_KeyPoints *)att->data;
+			break;
+		case TAG_SVG_ATT_rotate:
+			all_atts->rotate = (SVG_Rotate *)att->data;
+			break;
+		case TAG_SVG_ATT_origin:
+			all_atts->origin = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_transform_type:
+			all_atts->transform_type = (SVG_TransformType *)att->data;
+			break;
+		case TAG_SVG_ATT_clipBegin:
+			all_atts->clipBegin = (SVG_Clock *)att->data;
+			break;
+		case TAG_SVG_ATT_clipEnd:
+			all_atts->clipEnd = (SVG_Clock *)att->data;
+			break;
+		case TAG_SVG_ATT_syncBehavior:
+			all_atts->syncBehavior = (SMIL_SyncBehavior *)att->data;
+			break;
+		case TAG_SVG_ATT_syncTolerance:
+			all_atts->syncTolerance = (SMIL_SyncTolerance *)att->data;
+			break;
+		case TAG_SVG_ATT_syncMaster:
+			all_atts->syncMaster = (SVG_Boolean *)att->data;
+			break;
+		case TAG_SVG_ATT_syncReference:
+			all_atts->syncReference = (XMLRI *)att->data;
+			break;
+		case TAG_SVG_ATT_x:
+			all_atts->x = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_y:
+			all_atts->y = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_width:
+			all_atts->width = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_height:
+			all_atts->height = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_preserveAspectRatio:
+			all_atts->preserveAspectRatio = (SVG_PreserveAspectRatio *)att->data;
+			break;
+		case TAG_SVG_ATT_initialVisibility:
+			all_atts->initialVisibility = (SVG_InitialVisibility *)att->data;
+			break;
+		case TAG_SVG_ATT_type:
+			all_atts->type = (SVG_ContentType *)att->data;
+			break;
+		case TAG_SVG_ATT_cx:
+			all_atts->cx = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_cy:
+			all_atts->cy = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_r:
+			all_atts->r = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_cursorManager_x:
+			all_atts->cursorManager_x = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_cursorManager_y:
+			all_atts->cursorManager_y = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_rx:
+			all_atts->rx = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_ry:
+			all_atts->ry = (SVG_Length *)att->data;
+			break;
+		case TAG_SVG_ATT_horiz_adv_x:
+			all_atts->horiz_adv_x = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_horiz_origin_x:
+			all_atts->horiz_origin_x = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_font_stretch:
+			all_atts->font_stretch = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_unicode_range:
+			all_atts->unicode_range = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_panose_1:
+			all_atts->panose_1 = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_widths:
+			all_atts->widths = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_bbox:
+			all_atts->bbox = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_units_per_em:
+			all_atts->units_per_em = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_stemv:
+			all_atts->stemv = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_stemh:
+			all_atts->stemh = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_slope:
+			all_atts->slope = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_cap_height:
+			all_atts->cap_height = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_x_height:
+			all_atts->x_height = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_accent_height:
+			all_atts->accent_height = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_ascent:
+			all_atts->ascent = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_descent:
+			all_atts->descent = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_ideographic:
+			all_atts->ideographic = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_alphabetic:
+			all_atts->alphabetic = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_mathematical:
+			all_atts->mathematical = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_hanging:
+			all_atts->hanging = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_underline_position:
+			all_atts->underline_position = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_underline_thickness:
+			all_atts->underline_thickness = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_strikethrough_position:
+			all_atts->strikethrough_position = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_strikethrough_thickness:
+			all_atts->strikethrough_thickness = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_overline_position:
+			all_atts->overline_position = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_overline_thickness:
+			all_atts->overline_thickness = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_d:
+			all_atts->d = (SVG_PathData *)att->data;
+			break;
+		case TAG_SVG_ATT_unicode:
+			all_atts->unicode = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_glyph_name:
+			all_atts->glyph_name = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_arabic_form:
+			all_atts->arabic_form = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_lang:
+			all_atts->lang = (SVG_LanguageIDs *)att->data;
+			break;
+		case TAG_SVG_ATT_u1:
+			all_atts->u1 = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_g1:
+			all_atts->g1 = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_u2:
+			all_atts->u2 = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_g2:
+			all_atts->g2 = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_k:
+			all_atts->k = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_opacity:
+			all_atts->opacity = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_x1:
+			all_atts->x1 = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_y1:
+			all_atts->y1 = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_x2:
+			all_atts->x2 = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_y2:
+			all_atts->y2 = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_gradientUnits:
+			all_atts->gradientUnits = (SVG_GradientUnit *)att->data;
+			break;
+		case TAG_SVG_ATT_filterUnits:
+			all_atts->focusable = (SVG_GradientUnit *)att->data;
+			break;
+		case TAG_SVG_ATT_spreadMethod:
+			all_atts->spreadMethod = (SVG_SpreadMethod *)att->data;
+			break;
+		case TAG_SVG_ATT_gradientTransform:
+			all_atts->gradientTransform = (SVG_Transform *)att->data;
+			break;
+		case TAG_SVG_ATT_pathLength:
+			all_atts->pathLength = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_points:
+			all_atts->points = (SVG_Points *)att->data;
+			break;
+		case TAG_SVG_ATT_mediaSize:
+			all_atts->mediaSize = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_mediaTime:
+			all_atts->mediaTime = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_mediaCharacterEncoding:
+			all_atts->mediaCharacterEncoding = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_mediaContentEncodings:
+			all_atts->mediaContentEncodings = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_bandwidth:
+			all_atts->bandwidth = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_fx:
+			all_atts->fx = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_fy:
+			all_atts->fy = (SVG_Coordinate *)att->data;
+			break;
+		case TAG_SVG_ATT_size:
+			all_atts->size = (LASeR_Size *)att->data;
+			break;
+		case TAG_SVG_ATT_choice:
+			all_atts->choice = (LASeR_Choice *)att->data;
+			break;
+		case TAG_SVG_ATT_delta:
+			all_atts->delta = (LASeR_Size *)att->data;
+			break;
+		case TAG_SVG_ATT_offset:
+			all_atts->offset = (SVG_Number *)att->data;
+			break;
+		case TAG_SVG_ATT_syncBehaviorDefault:
+			all_atts->syncBehaviorDefault = (SMIL_SyncBehavior *)att->data;
+			break;
+		case TAG_SVG_ATT_syncToleranceDefault:
+			all_atts->syncToleranceDefault = (SMIL_SyncTolerance *)att->data;
+			break;
+		case TAG_SVG_ATT_viewBox:
+			all_atts->viewBox = (SVG_ViewBox *)att->data;
+			break;
+		case TAG_SVG_ATT_zoomAndPan:
+			all_atts->zoomAndPan = (SVG_ZoomAndPan *)att->data;
+			break;
+		case TAG_SVG_ATT_version:
+			all_atts->version = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_baseProfile:
+			all_atts->baseProfile = (SVG_String *)att->data;
+			break;
+		case TAG_SVG_ATT_contentScriptType:
+			all_atts->contentScriptType = (SVG_ContentType *)att->data;
+			break;
+		case TAG_SVG_ATT_snapshotTime:
+			all_atts->snapshotTime = (SVG_Clock *)att->data;
+			break;
+		case TAG_SVG_ATT_timelineBegin:
+			all_atts->timelineBegin = (SVG_TimelineBegin *)att->data;
+			break;
+		case TAG_SVG_ATT_playbackOrder:
+			all_atts->playbackOrder = (SVG_PlaybackOrder *)att->data;
+			break;
+		case TAG_SVG_ATT_editable:
+			all_atts->editable = (SVG_Boolean *)att->data;
+			break;
+		case TAG_SVG_ATT_text_x:
+			all_atts->text_x = (SVG_Coordinates *)att->data;
+			break;
+		case TAG_SVG_ATT_text_y:
+			all_atts->text_y = (SVG_Coordinates *)att->data;
+			break;
+		case TAG_SVG_ATT_text_rotate:
+			all_atts->text_rotate = (SVG_Numbers *)att->data;
+			break;
+		case TAG_SVG_ATT_transformBehavior:
+			all_atts->transformBehavior = (SVG_TransformBehavior *)att->data;
+			break;
+		case TAG_SVG_ATT_overlay:
+			all_atts->overlay = (SVG_Overlay *)att->data;
+			break;
+		case TAG_SVG_ATT_fullscreen:
+			all_atts->fullscreen = (SVG_Boolean *)att->data;
+			break;
+		case TAG_SVG_ATT_motionTransform:
+			all_atts->motionTransform = (SVG_Motion *)att->data;
+			break;
+
+		case TAG_GSVG_ATT_useAsPrimary:
+			all_atts->gpac_useAsPrimary = (SVG_Boolean *)att->data;
+			break;
+		case TAG_GSVG_ATT_depthOffset:
+			all_atts->gpac_depthOffset = (SVG_Number *)att->data;
+			break;
+		case TAG_GSVG_ATT_depthGain:
+			all_atts->gpac_depthGain = (SVG_Number *)att->data;
+			break;
 		}
-		
+
 		att = att->next;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/svg_smjs.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/svg_smjs.c Changed

@@ -230,26 +230,26 @@
 
 static SMJS_FUNC_PROP_GET( global_getProperty)
 
-	GF_SceneGraph *sg;
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL) )
-		return JS_TRUE;
+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;
-		}
+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;
+}
+return JS_TRUE;
 }
 
 /*TODO - try to be more precise...*/
@@ -302,184 +302,184 @@
 }
 static SMJS_FUNC_PROP_GET( svg_doc_getProperty)
 
-	u32 prop_id;
-	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_TRUE;
+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;
-	}
+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;
+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);
+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;
-		}
+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;
 	}
-	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 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;
-	case 9:/*currentTime*/
-		*vp = JS_MAKE_DOUBLE(c, gf_node_get_scene_time((GF_Node *)n) );
+	}
+	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;
-	case 10:/*isPaused*/
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
+	}
+	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;
-	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 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;
-	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 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;
 		}
-		return JS_TRUE;
-	case 13:/*correspondingUseElement*/
-		*vp = dom_element_construct(c, get_corresponding_use(n));
-		return JS_TRUE;
-	default:
-		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);
+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;
+	}
+	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;
-		}
+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;
-		}
+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:
+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;
 }
 
 
@@ -700,7 +700,7 @@
 	/*Number*/
 	case SVG_Number_datatype:
 
-/*all string traits*/
+	/*all string traits*/
 	case SVG_Boolean_datatype:
 	case SVG_FillRule_datatype:
 	case SVG_StrokeLineJoin_datatype:
@@ -734,8 +734,8 @@
 	case SVG_VectorEffect_datatype:
 	case SVG_PlaybackOrder_datatype:
 	case SVG_TimelineBegin_datatype:
-/*end of string traits*/
-/*DOM string traits*/
+	/*end of string traits*/
+	/*DOM string traits*/
 	case SVG_FontFamily_datatype:
 	case XMLRI_datatype:
 	case DOM_String_datatype:
@@ -744,7 +744,7 @@
 	case SVG_Focus_datatype:
 	case SVG_ID_datatype:
 	case SVG_GradientOffset_datatype:
-/*end of DOM string traits*/
+		/*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);
@@ -753,7 +753,7 @@
 		break;
 
 #if 0
-/*SVGT 1.2 default traits*/
+	/*SVGT 1.2 default traits*/
 	case SMIL_KeyTimes_datatype:
 	case SMIL_KeyPoints_datatype:
 	case SMIL_KeySplines_datatype:
@@ -761,9 +761,9 @@
 	case SVG_StrokeDashArray_datatype:
 	case SVG_Points_datatype:
 	case SVG_Motion_datatype:
-/*end SVGT 1.2 default traits*/
+	/*end SVGT 1.2 default traits*/
 
-/*unimplemented/unnkown/FIXME traits*/
+	/*unimplemented/unnkown/FIXME traits*/
 	case SMIL_SyncTolerance_datatype:
 	case SVG_TransformType_datatype:
 	case SVG_TransformList_datatype:
@@ -774,7 +774,7 @@
 	case SMIL_Duration_datatype:
 	case SMIL_RepeatCount_datatype:
 	default:
-/*end unimplemented/unnkown/FIXME traits*/
+		/*end unimplemented/unnkown/FIXME traits*/
 		return JS_TRUE;
 #endif
 	}
@@ -947,7 +947,7 @@
 		SMJS_SET_RVAL( OBJECT_TO_JSVAL(newObj) );
 		return JS_TRUE;
 	}
-		break;
+	break;
 	case SVG_Paint_datatype:
 	{
 		SVG_Paint *paint = (SVG_Paint *)info.far_ptr;
@@ -1167,7 +1167,7 @@
 	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);
@@ -1196,9 +1196,15 @@
 			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;
+			case 1:
+				nb_pts++;
+				break;
+			case 2:
+				nb_pts+=3;
+				break;
+			case 4:
+				nb_pts+=2;
+				break;
 			}
 		}
 		for (i=0; i<nb_pts; i++) {
@@ -1545,131 +1551,172 @@
 
 static DECL_FINALIZE( baseCI_finalize)
 
-	/*avoids GCC warning*/
-	void *data = SMJS_GET_PRIVATE(c, obj);
-	if (!c) c=NULL;
-	if (data) gf_free(data);
+/*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;
-		}
+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;
+}
+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;
-		}
+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;
+}
+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;
-		}
+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;
+}
+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;
-		}
+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;
+}
+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;
-		}
+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);
 	}
-	return JS_TRUE;
+	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);
-		}
+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)
 {
@@ -1721,16 +1768,19 @@
 
 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;
-		}
+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;
+}
+return JS_TRUE;
 }
 static JSBool SMJS_FUNCTION(svg_path_get_segment)
 {
@@ -1745,15 +1795,23 @@
 	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 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;
+		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 */
+		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;
 }
@@ -1775,12 +1833,24 @@
 	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;
+		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]) {
@@ -1822,7 +1892,7 @@
 			SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, param_idx ? pt->y : pt->x));
 		}
 		return JS_TRUE;
-		/*spec is quite obscur here*/
+	/*spec is quite obscur here*/
 	case 6:
 		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, 0));
 		return JS_TRUE;
@@ -1836,12 +1906,24 @@
 	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;
+		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));
@@ -1906,8 +1988,10 @@
 	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->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++;
@@ -1931,9 +2015,12 @@
 	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->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++;
@@ -1955,42 +2042,68 @@
 
 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;
+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;
-	}
+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;
+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)
 {
@@ -2002,12 +2115,24 @@
 	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;
+	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;
 }
@@ -2127,11 +2252,11 @@
 {
 	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);
-        }
+		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)
@@ -2507,8 +2632,8 @@
 	/*load SVG & DOM APIs*/
 	svg_init_js_api(sg);
 
-    /* HTML */
-    html_media_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;
@@ -2577,7 +2702,7 @@
 	}
 
 	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) {
@@ -2691,7 +2816,7 @@
 	 - 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) 
+	 - a named function (js_fun)
 */
 static Bool svg_script_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer, char *utf8_script)
 {
@@ -2719,7 +2844,7 @@
 	svg_js = node->sgprivate->scenegraph->svg_js;
 
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_SCRIPT, GF_LOG_DEBUG)) { 
+	if (gf_log_tool_level_on(GF_LOG_SCRIPT, GF_LOG_DEBUG)) {
 		char *content, *_content = NULL;
 		if (utf8_script) {
 			content = utf8_script;
@@ -2734,7 +2859,7 @@
 		} else {
 			content = "unknown";
 		}
-		gf_log_lt(GF_LOG_DEBUG, GF_LOG_SCRIPT); 
+		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);
 	}
@@ -2762,7 +2887,7 @@
 
 	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];

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/svg_types.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/svg_types.c Changed

@@ -15,7 +15,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -31,22 +31,22 @@
 Bool gf_svg_is_animation_tag(u32 tag)
 {
 	return (tag == TAG_SVG_set ||
-			tag == TAG_SVG_animate ||
-			tag == TAG_SVG_animateColor ||
-			tag == TAG_SVG_animateTransform ||
-			tag == TAG_SVG_animateMotion || 
-			tag == TAG_SVG_discard
-			) ? 1 : 0;
+	        tag == TAG_SVG_animate ||
+	        tag == TAG_SVG_animateColor ||
+	        tag == TAG_SVG_animateTransform ||
+	        tag == TAG_SVG_animateMotion ||
+	        tag == TAG_SVG_discard
+	       ) ? 1 : 0;
 }
 
 Bool gf_svg_is_timing_tag(u32 tag)
 {
 	if (gf_svg_is_animation_tag(tag)) return 1;
 	else return (tag == TAG_SVG_animation ||
-			tag == TAG_SVG_audio ||
-			tag == TAG_LSR_conditional ||
-			tag == TAG_LSR_updates ||
-			tag == TAG_SVG_video)?1:0;
+		             tag == TAG_SVG_audio ||
+		             tag == TAG_LSR_conditional ||
+		             tag == TAG_LSR_updates ||
+		             tag == TAG_SVG_video)?1:0;
 }
 
 SVG_Element *gf_svg_create_node(u32 ElementTag)
@@ -54,11 +54,11 @@
 	SVG_Element *p;
 	if (gf_svg_is_timing_tag(ElementTag)) {
 		SVGTimedAnimBaseElement *tap;
-		GF_SAFEALLOC(tap, SVGTimedAnimBaseElement); 
+		GF_SAFEALLOC(tap, SVGTimedAnimBaseElement);
 		p = (SVG_Element *)tap;
 	} else if (ElementTag == TAG_SVG_handler) {
 		SVG_handlerElement *hdl;
-		GF_SAFEALLOC(hdl, SVG_handlerElement); 
+		GF_SAFEALLOC(hdl, SVG_handlerElement);
 		p = (SVG_Element *)hdl;
 	} else {
 		GF_SAFEALLOC(p, SVG_Element);
@@ -79,7 +79,7 @@
 		/*remove from target's listener list*/
 		gf_dom_event_remove_listener_from_parent((GF_DOMEventTarget *)node->sgprivate->UserPrivate, (GF_Node *)p);
 	}
-	/*if this is a handler with a UserPrivate, this is a handler with an implicit listener 
+	/*if this is a handler with a UserPrivate, this is a handler with an implicit listener
 	(eg handler with ev:event=""). Destroy the associated listener*/
 	if (p->sgprivate->tag==TAG_SVG_handler) {
 		GF_Node *listener = p->sgprivate->UserPrivate;
@@ -115,7 +115,7 @@
 		if (tap->timingp)		{
 			gf_smil_timing_delete_runtime_info((GF_Node *)tap, tap->timingp->runtime);
 			gf_free(tap->timingp);
-		}	
+		}
 		if (tap->xlinkp)	gf_free(tap->xlinkp);
 	}
 
@@ -128,12 +128,12 @@
 {
 	switch (node->sgprivate->tag) {
 	case TAG_SVG_script:
-		if (node->sgprivate->scenegraph->script_load) 
+		if (node->sgprivate->scenegraph->script_load)
 			node->sgprivate->scenegraph->script_load(node);
 		return 1;
 
 	case TAG_SVG_handler:
-		if (node->sgprivate->scenegraph->script_load) 
+		if (node->sgprivate->scenegraph->script_load)
 			node->sgprivate->scenegraph->script_load(node);
 		if (node->sgprivate->scenegraph->script_action)
 			((SVG_handlerElement*)node)->handle_event = gf_sg_handle_dom_event;
@@ -143,17 +143,17 @@
 		gf_smil_setup_events(node);
 		return 1;
 	case TAG_SVG_animateMotion:
-	case TAG_SVG_set: 
-	case TAG_SVG_animate: 
-	case TAG_SVG_animateColor: 
-	case TAG_SVG_animateTransform: 
+	case TAG_SVG_set:
+	case TAG_SVG_animate:
+	case TAG_SVG_animateColor:
+	case TAG_SVG_animateTransform:
 		gf_smil_anim_init_node(node);
 		gf_smil_setup_events(node);
 		/*we may get called several times depending on xlink:href resoling for events*/
 		return (node->sgprivate->UserPrivate || node->sgprivate->UserCallback) ? 1 : 0;
-	case TAG_SVG_audio: 
-	case TAG_SVG_video: 
-	case TAG_LSR_updates: 
+	case TAG_SVG_audio:
+	case TAG_SVG_video:
+	case TAG_LSR_updates:
 		gf_smil_timing_init_runtime_info(node);
 		gf_smil_setup_events(node);
 		/*we may get called several times depending on xlink:href resoling for events*/
@@ -163,7 +163,7 @@
 		gf_smil_setup_events(node);
 		return 0;
 	/*discard is implemented as a special animation element */
-	case TAG_SVG_discard: 
+	case TAG_SVG_discard:
 		gf_smil_anim_init_discard(node);
 		gf_smil_setup_events(node);
 		return 1;
@@ -177,18 +177,18 @@
 {
 	switch (node->sgprivate->tag) {
 	case TAG_SVG_animateMotion:
-	case TAG_SVG_discard: 
-	case TAG_SVG_set: 
-	case TAG_SVG_animate: 
-	case TAG_SVG_animateColor: 
-	case TAG_SVG_animateTransform: 
-	case TAG_LSR_conditional: 
+	case TAG_SVG_discard:
+	case TAG_SVG_set:
+	case TAG_SVG_animate:
+	case TAG_SVG_animateColor:
+	case TAG_SVG_animateTransform:
+	case TAG_LSR_conditional:
 		gf_smil_timing_modified(node, field);
 		return 1;
-	case TAG_SVG_animation: 
-	case TAG_SVG_audio: 
-	case TAG_SVG_video: 
-	case TAG_LSR_updates: 
+	case TAG_SVG_animation:
+	case TAG_SVG_audio:
+	case TAG_SVG_video:
+	case TAG_LSR_updates:
 		gf_smil_timing_modified(node, field);
 		/*used by compositors*/
 		return 0;
@@ -197,7 +197,7 @@
 }
 
 
-void gf_svg_reset_path(SVG_PathData d) 
+void gf_svg_reset_path(SVG_PathData d)
 {
 #if USE_GF_PATH
 	gf_path_reset(&d);
@@ -218,7 +218,7 @@
 #endif
 }
 
-/* TODO: update for elliptical arcs */		
+/* TODO: update for elliptical arcs */
 GF_EXPORT
 void gf_svg_path_build(GF_Path *path, GF_List *commands, GF_List *points)
 {
@@ -236,7 +236,7 @@
 			gf_path_add_move_to(path, orig.x, orig.y);
 			j++;
 			/*provision for nextCurveTo when no curve is specified:
-				"If there is no previous command or if the previous command was not an C, c, S or s, 
+				"If there is no previous command or if the previous command was not an C, c, S or s,
 				assume the first control point is coincident with the current point.
 			*/
 			ct_orig = orig;
@@ -280,7 +280,7 @@
 			ct_orig = *tmp;
 			tmp = (SVG_Point*)gf_list_get(points, j+1);
 			end = *tmp;
-			gf_path_add_quadratic_to(path, ct_orig.x, ct_orig.y, end.x, end.y);			
+			gf_path_add_quadratic_to(path, ct_orig.x, ct_orig.y, end.x, end.y);
 			orig = end;
 			j+=2;
 			break;
@@ -290,14 +290,14 @@
 			tmp = (SVG_Point*)gf_list_get(points, j);
 			end = *tmp;
 			gf_path_add_quadratic_to(path, ct_orig.x, ct_orig.y, end.x, end.y);
-				orig = end;
-				j++;
+			orig = end;
+			j++;
 			break;
 		case SVG_PATHCOMMAND_Z: /* Close */
 			gf_path_close(path);
 			break;
 		}
-	}	
+	}
 }
 
 
@@ -333,14 +333,14 @@
 	gf_list_del(list);
 }
 
-void gf_svg_reset_iri(GF_SceneGraph *sg, XMLRI *iri) 
+void gf_svg_reset_iri(GF_SceneGraph *sg, XMLRI *iri)
 {
 	if (!iri) return;
 	if (iri->string) gf_free(iri->string);
 	gf_node_unregister_iri(sg, iri);
 }
 
-void gf_svg_delete_paint(GF_SceneGraph *sg, SVG_Paint *paint) 
+void gf_svg_delete_paint(GF_SceneGraph *sg, SVG_Paint *paint)
 {
 	if (!paint) return;
 	if (paint->type == SVG_PAINT_URI && sg) gf_svg_reset_iri(sg, &paint->iri);
@@ -418,19 +418,19 @@
 		gf_free(value);
 		break;
 	case SVG_FontFamily_datatype:
-		{
-			SVG_FontFamily *ff = (SVG_FontFamily *)value;
-			if (ff->value) gf_free(ff->value);
-			gf_free(value);
-		}
-		break;
+	{
+		SVG_FontFamily *ff = (SVG_FontFamily *)value;
+		if (ff->value) gf_free(ff->value);
+		gf_free(value);
+	}
+	break;
 	case SMIL_AttributeName_datatype:
-		{
-			SMIL_AttributeName *an = (SMIL_AttributeName *)value;
-			if (an->name) gf_free(an->name);
-			gf_free(value);
-		}
-		break;
+	{
+		SMIL_AttributeName *an = (SMIL_AttributeName *)value;
+		if (an->name) gf_free(an->name);
+		gf_free(value);
+	}
+	break;
 	case SMIL_Times_datatype:
 		gf_smil_delete_times(*(SMIL_Times *)value);
 		gf_free(value);
@@ -484,7 +484,7 @@
 	case SVG_Display_datatype:
 	default:
 		gf_free(value);
-	} 
+	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/vrml_interpolators.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/vrml_interpolators.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -56,7 +56,7 @@
 		res.z = stzero ? kv2.z : kv1.z;
 	}
 	res.q = olda + gf_mulfix(fraction, newa - olda);
-	if (res.q > GF_2PI) { 
+	if (res.q > GF_2PI) {
 		res.q -= GF_2PI;
 	} else if (res.q < GF_2PI) {
 		res.q += GF_2PI;
@@ -87,7 +87,7 @@
 
 	if (! _this->key.count) return;
 	if (_this->keyValue.count % _this->key.count) return;
-	
+
 	numElemPerKey = _this->keyValue.count / _this->key.count;
 	//set size
 	if (_this->value_changed.count != numElemPerKey)
@@ -109,11 +109,11 @@
 			frac = GetInterpolateFraction(_this->key.vals[j-1], _this->key.vals[j], _this->set_fraction);
 			for (i=0; i<numElemPerKey; i++) {
 				_this->value_changed.vals[i].x = Interpolate(_this->keyValue.vals[(j-1)*numElemPerKey + i].x,
-															_this->keyValue.vals[(j)*numElemPerKey + i].x, 
-															frac);
+				                                 _this->keyValue.vals[(j)*numElemPerKey + i].x,
+				                                 frac);
 				_this->value_changed.vals[i].y = Interpolate(_this->keyValue.vals[(j-1)*numElemPerKey + i].y,
-															_this->keyValue.vals[(j)*numElemPerKey + i].y,
-															frac);
+				                                 _this->keyValue.vals[(j)*numElemPerKey + i].y,
+				                                 frac);
 			}
 			break;
 		}
@@ -143,7 +143,7 @@
 
 	if (! key->count) return 0;
 	if (keyValue->count % key->count) return 0;
-	
+
 	numElemPerKey = keyValue->count / key->count;
 
 	if (vals->count != numElemPerKey) gf_sg_vrml_mf_alloc(vals, GF_SG_VRML_MFVEC3F, numElemPerKey);
@@ -163,14 +163,14 @@
 			frac = GetInterpolateFraction(key->vals[j-1], key->vals[j], fraction);
 			for (i=0; i<numElemPerKey; i++) {
 				vals->vals[i].x = Interpolate(keyValue->vals[(j-1)*numElemPerKey + i].x,
-															keyValue->vals[(j)*numElemPerKey + i].x,
-															frac);
+				                              keyValue->vals[(j)*numElemPerKey + i].x,
+				                              frac);
 				vals->vals[i].y = Interpolate(keyValue->vals[(j-1)*numElemPerKey + i].y,
-															keyValue->vals[(j)*numElemPerKey + i].y,
-															frac);
+				                              keyValue->vals[(j)*numElemPerKey + i].y,
+				                              frac);
 				vals->vals[i].z = Interpolate(keyValue->vals[(j-1)*numElemPerKey + i].z,
-															keyValue->vals[(j)*numElemPerKey + i].z, 
-															frac);
+				                              keyValue->vals[(j)*numElemPerKey + i].z,
+				                              frac);
 			}
 			break;
 		}
@@ -183,7 +183,7 @@
 {
 	M_CoordinateInterpolator *_this = (M_CoordinateInterpolator *) n;
 
-	if (CI_SetFraction(_this->set_fraction, &_this->value_changed, &_this->key, &_this->keyValue)) 
+	if (CI_SetFraction(_this->set_fraction, &_this->value_changed, &_this->key, &_this->keyValue))
 		gf_node_event_out(n, 3);//"value_changed"
 }
 
@@ -223,7 +223,7 @@
 
 	if (! _this->key.count) return;
 	if (_this->keyValue.count != _this->key.count) return;
-	
+
 	// The given fraction is less than the specified range
 	if (_this->set_fraction < _this->key.vals[0]) {
 		_this->value_changed = _this->keyValue.vals[0];
@@ -236,15 +236,15 @@
 			if (_this->set_fraction >= _this->key.vals[i]) continue;
 
 			frac = GetInterpolateFraction(_this->key.vals[i-1], _this->key.vals[i], _this->set_fraction);
-			_this->value_changed.red = Interpolate(_this->keyValue.vals[i-1].red, 
-													_this->keyValue.vals[i].red, 
-													frac);
+			_this->value_changed.red = Interpolate(_this->keyValue.vals[i-1].red,
+			                                       _this->keyValue.vals[i].red,
+			                                       frac);
 			_this->value_changed.green = Interpolate(_this->keyValue.vals[i-1].green,
-													_this->keyValue.vals[i].green, 
-													frac);
+			                             _this->keyValue.vals[i].green,
+			                             frac);
 			_this->value_changed.blue = Interpolate(_this->keyValue.vals[i-1].blue,
-													_this->keyValue.vals[i].blue,
-													frac);
+			                                        _this->keyValue.vals[i].blue,
+			                                        frac);
 			break;
 		}
 	}
@@ -253,7 +253,7 @@
 
 Bool InitColorInterpolator(M_ColorInterpolator *node)
 {
-	node->on_set_fraction = ColorInt_SetFraction; 
+	node->on_set_fraction = ColorInt_SetFraction;
 	if (node->keyValue.count) node->value_changed = node->keyValue.vals[0];
 	return 1;
 }
@@ -267,7 +267,7 @@
 
 	if (! _this->key.count) return;
 	if (_this->keyValue.count != _this->key.count) return;
-	
+
 	// The given fraction is less than the specified range
 	if (_this->set_fraction < _this->key.vals[0]) {
 		_this->value_changed = _this->keyValue.vals[0];
@@ -290,7 +290,7 @@
 
 Bool InitPositionInterpolator2D(M_PositionInterpolator2D *node)
 {
-	node->on_set_fraction = PosInt2D_SetFraction; 
+	node->on_set_fraction = PosInt2D_SetFraction;
 	if (node->keyValue.count) node->value_changed = node->keyValue.vals[0];
 	return 1;
 }
@@ -303,7 +303,7 @@
 
 	if (! _this->key.count) return;
 	if (_this->keyValue.count != _this->key.count) return;
-	
+
 	// The given fraction is less than the specified range
 	if (_this->set_fraction < _this->key.vals[0]) {
 		_this->value_changed = _this->keyValue.vals[0];
@@ -327,7 +327,7 @@
 
 Bool InitPositionInterpolator(M_PositionInterpolator *node)
 {
-	node->on_set_fraction = PosInt_SetFraction; 
+	node->on_set_fraction = PosInt_SetFraction;
 	if (node->keyValue.count) node->value_changed = node->keyValue.vals[0];
 	return 1;
 }
@@ -340,7 +340,7 @@
 
 	if (! _this->key.count) return;
 	if (_this->keyValue.count != _this->key.count) return;
-	
+
 	// The given fraction is less than the specified range
 	if (_this->set_fraction < _this->key.vals[0]) {
 		_this->value_changed = _this->keyValue.vals[0];
@@ -361,7 +361,7 @@
 }
 Bool InitScalarInterpolator(M_ScalarInterpolator *node)
 {
-	node->on_set_fraction = ScalarInt_SetFraction; 
+	node->on_set_fraction = ScalarInt_SetFraction;
 	if (node->keyValue.count) node->value_changed = node->keyValue.vals[0];
 	return 1;
 }
@@ -375,7 +375,7 @@
 
 	if (! _this->key.count) return;
 	if (_this->keyValue.count != _this->key.count) return;
-	
+
 	// The given fraction is less than the specified range
 	if (_this->set_fraction < _this->key.vals[0]) {
 		_this->value_changed = _this->keyValue.vals[0];
@@ -397,7 +397,7 @@
 
 Bool InitOrientationInterpolator(M_OrientationInterpolator *node)
 {
-	node->on_set_fraction = OrientInt_SetFraction; 
+	node->on_set_fraction = OrientInt_SetFraction;
 	if (node->keyValue.count) node->value_changed = node->keyValue.vals[0];
 	return 1;
 }
@@ -410,7 +410,7 @@
 
 	if (! _this->key.count) return;
 	if (_this->keyValue.count % _this->key.count) return;
-	
+
 	numElemPerKey = _this->keyValue.count / _this->key.count;
 	//set size
 	if (_this->value_changed.count != numElemPerKey)
@@ -432,17 +432,17 @@
 			frac = GetInterpolateFraction(_this->key.vals[j-1], _this->key.vals[j], _this->set_fraction);
 			for (i=0; i<numElemPerKey; i++) {
 				_this->value_changed.vals[i].x = Interpolate(_this->keyValue.vals[(j-1)*numElemPerKey + i].x,
-															_this->keyValue.vals[(j)*numElemPerKey + i].x, 
-															frac);
+				                                 _this->keyValue.vals[(j)*numElemPerKey + i].x,
+				                                 frac);
 				_this->value_changed.vals[i].y = Interpolate(_this->keyValue.vals[(j-1)*numElemPerKey + i].y,
-															_this->keyValue.vals[(j)*numElemPerKey + i].y,
-															frac);
+				                                 _this->keyValue.vals[(j)*numElemPerKey + i].y,
+				                                 frac);
 				_this->value_changed.vals[i].z = Interpolate(_this->keyValue.vals[(j-1)*numElemPerKey + i].z,
-															_this->keyValue.vals[(j)*numElemPerKey + i].z,
-															frac);
+				                                 _this->keyValue.vals[(j)*numElemPerKey + i].z,
+				                                 frac);
 				_this->value_changed.vals[i].q = Interpolate(_this->keyValue.vals[(j-1)*numElemPerKey + i].q,
-															_this->keyValue.vals[(j)*numElemPerKey + i].q,
-															frac);
+				                                 _this->keyValue.vals[(j)*numElemPerKey + i].q,
+				                                 frac);
 			}
 			break;
 		}
@@ -472,7 +472,7 @@
 
 	if (! _this->key.count) return;
 	if (_this->keyValue.count != _this->key.count) return;
-	
+
 	// The given fraction is less than the specified range
 	if (_this->set_fraction < _this->key.vals[0]) {
 		_this->value_changed = _this->keyValue.vals[0];
@@ -511,14 +511,14 @@
 	X_BooleanFilter *bf = (X_BooleanFilter *)n;
 	if (!bf->set_boolean) {
 		bf->inputFalse = 1;
-		gf_node_event_out_str(n, "inputFalse");
+		gf_node_event_out(n, 1/*"inputFalse"*/);
 	}
 	if (bf->set_boolean) {
 		bf->inputTrue = 1;
-		gf_node_event_out_str(n, "inputTrue");
+		gf_node_event_out(n, 3/*"inputTrue"*/);
 	}
 	bf->inputNegate = bf->set_boolean ? 0 : 1;
-	gf_node_event_out_str(n, "inputNegate");
+	gf_node_event_out(n, 2/*"inputNegate"*/);
 }
 
 void InitBooleanFilter(GF_Node *n)
@@ -533,7 +533,7 @@
 	X_BooleanSequencer *bs = (X_BooleanSequencer*)n;
 	if (! bs->key.count) return;
 	if (bs->keyValue.count != bs->key.count) return;
-	
+
 	if (bs->set_fraction < bs->key.vals[0]) {
 		bs->value_changed = bs->keyValue.vals[0];
 	} else if (bs->set_fraction >= bs->key.vals[bs->key.count-1]) {
@@ -599,7 +599,7 @@
 	X_BooleanToggle *bt = (X_BooleanToggle *)n;
 	if (bt->set_boolean) {
 		bt->toggle = !bt->toggle;
-		gf_node_event_out_str(n, "toggle");
+		gf_node_event_out(n, 1/*"toggle"*/);
 	}
 }
 void InitBooleanToggle(GF_Node *n)
@@ -612,7 +612,7 @@
 {
 	X_BooleanTrigger *bt = (X_BooleanTrigger *)n;
 	bt->triggerTrue = 1;
-	gf_node_event_out_str(n, "triggerTrue");
+	gf_node_event_out(n, 1/*"triggerTrue"*/);
 }
 void InitBooleanTrigger(GF_Node *n)
 {
@@ -626,7 +626,7 @@
 	X_IntegerSequencer *is = (X_IntegerSequencer *)n;
 	if (! is->key.count) return;
 	if (is->keyValue.count != is->key.count) return;
-	
+
 	if (is->set_fraction < is->key.vals[0]) {
 		is->value_changed = is->keyValue.vals[0];
 	} else if (is->set_fraction >= is->key.vals[is->key.count-1]) {
@@ -692,7 +692,7 @@
 	X_IntegerTrigger *it = (X_IntegerTrigger *)n;
 	if (it->set_boolean) {
 		it->triggerValue = it->integerKey;
-		gf_node_event_out_str(n, "triggerValue");
+		gf_node_event_out(n, 2/*"triggerValue"*/);
 	}
 }
 void InitIntegerTrigger(GF_Node *n)
@@ -705,7 +705,7 @@
 {
 	X_TimeTrigger *tt = (X_TimeTrigger *)n;
 	tt->triggerTime = gf_node_get_scene_time(n);
-	gf_node_event_out_str(n, "triggerTime");
+	gf_node_event_out(n, 1/*"triggerTime"*/);
 }
 void InitTimeTrigger(GF_Node *n)
 {

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/vrml_proto.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/vrml_proto.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -55,7 +55,7 @@
 	tmp->sub_graph = gf_sg_new_subscene(inScene);
 	tmp->instances = gf_list_new();
 
-	if (name) 
+	if (name)
 		tmp->Name = gf_strdup(name);
 	else
 		tmp->Name = gf_strdup("Unnamed Proto");
@@ -124,16 +124,16 @@
 		if (field->userpriv && field->OnDelete) field->OnDelete(field->userpriv);
 
 		if (field->FieldType==GF_SG_VRML_SFNODE) {
-			if (field->def_sfnode_value) 
+			if (field->def_sfnode_value)
 				gf_node_unregister(field->def_sfnode_value, NULL);
-		} 
+		}
 		else if (field->FieldType==GF_SG_VRML_MFNODE) {
 			if (field->def_mfnode_value)
 				gf_node_unregister_children(NULL, field->def_mfnode_value);
-		} 
-		else if (field->def_value) 
+		}
+		else if (field->def_value)
 			gf_sg_vrml_field_pointer_del(field->def_value, field->FieldType);
-	
+
 		if (field->FieldName) gf_free(field->FieldName);
 
 		/*QP fields are SF fields, we can safely gf_free() them*/
@@ -156,7 +156,7 @@
 
 	if (proto->Name) gf_free(proto->Name);
 	gf_sg_mfurl_del(proto->ExternProto);
-	gf_list_del(proto->instances);	
+	gf_list_del(proto->instances);
 	gf_free(proto);
 	return GF_OK;
 }
@@ -213,7 +213,7 @@
 
 	tmp->FieldType = fieldType;
 	tmp->EventType = eventType;
-	
+
 	/*create container - can be NULL if SF node*/
 	if ( fieldType == GF_SG_VRML_SFNODE) {
 		tmp->def_sfnode_value = NULL;
@@ -224,9 +224,9 @@
 	} else {
 		tmp->def_value = gf_sg_vrml_field_pointer_new(fieldType);
 	}
-	
+
 	if (fieldName) tmp->FieldName = gf_strdup(fieldName);
-	
+
 	tmp->ALL_index = gf_list_count(proto->proto_fields);
 	tmp->OUT_index = tmp->DEF_index = tmp->IN_index = (u32) -1;
 
@@ -312,6 +312,7 @@
 
 	info->fieldType = field->FieldType;
 	info->eventType = field->EventType;
+	info->on_event_in = field->on_event_in;
 	/*SF/MF nodes need pointers to field object - cf gf_sg_proto_create_node*/
 	if (gf_sg_vrml_get_sf_type(field->FieldType) == GF_SG_VRML_SFNODE) {
 		info->far_ptr = &field->field_pointer;
@@ -379,7 +380,7 @@
 				strcpy(szNodeName, orig_name);
 				strcat(szNodeName, inst_id_suffix);
 			}
-		} 
+		}
 		else if (orig_name) szNodeName = gf_strdup(orig_name);
 	}
 
@@ -404,13 +405,13 @@
 	count = gf_node_get_field_count(orig);
 
 	is_script = 0;
-	if ((orig->sgprivate->tag==TAG_MPEG4_Script) 
+	if ((orig->sgprivate->tag==TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		|| (orig->sgprivate->tag==TAG_X3D_Script)
+	        || (orig->sgprivate->tag==TAG_X3D_Script)
 #endif
-		) 
+	   )
 		is_script = 1;
-	
+
 	if (is_script) gf_sg_script_prepare_clone(node, orig);
 
 
@@ -467,20 +468,20 @@
 	/*init node before creating ISed routes so the eventIn handler are in place*/
 	if (node->sgprivate->tag == TAG_MPEG4_Conditional)
 		BIFS_SetupConditionalClone(node, orig);
-	else 
+	else
 #endif
 		if (node->sgprivate->tag != TAG_ProtoNode) gf_node_init(node);
 
 	if (!inScene->pOwningProto) return node;
 	proto = inScene->pOwningProto;
-	
+
 	/*create Routes for ISed fields*/
 	i=0;
 	while ((r1 = (GF_Route*)gf_list_enum(proto->proto_interface->sub_graph->Routes, &i))) {
 		r2 = NULL;
 		/*locate only ISed routes*/
 		if (!r1->IS_route) continue;
-		
+
 		/*eventOut*/
 		if (r1->FromNode == orig) {
 			r2 = gf_sg_route_new(inScene, node, r1->FromField.fieldIndex, (GF_Node *) proto, r1->ToField.fieldIndex);
@@ -496,7 +497,7 @@
 			gf_sg_route_activate(r2);
 		}
 	}
-	
+
 	/*remember scripts*/
 	if (is_script) gf_list_add(proto->scripts_to_load, node);
 
@@ -575,17 +576,17 @@
 		/*this is an hardcoded proto - all routes, node modifications and co are handled internally*/
 		if (extern_lib == GF_SG_INTERNAL_PROTO) {
 			proto_node->sgprivate->flags |= GF_SG_NODE_DIRTY;
-            // take default values
-		    count = gf_list_count(owner->proto_fields);
-		    for (i=0; i<count; i++) {
-			    GF_ProtoField *pf = (GF_ProtoField *)gf_list_get(proto_node->fields, i);
-			    if (!pf->has_been_accessed) {
-				    pfi = (GF_ProtoFieldInterface*)gf_list_get(proto->proto_fields, i);
-				    gf_sg_vrml_field_copy(pf->field_pointer, pfi->def_value, pfi->FieldType);
-		        }
-            }
+			// take default values
+			count = gf_list_count(owner->proto_fields);
+			for (i=0; i<count; i++) {
+				GF_ProtoField *pf = (GF_ProtoField *)gf_list_get(proto_node->fields, i);
+				if (!pf->has_been_accessed) {
+					pfi = (GF_ProtoFieldInterface*)gf_list_get(proto->proto_fields, i);
+					gf_sg_vrml_field_copy(pf->field_pointer, pfi->def_value, pfi->FieldType);
+				}
+			}
 			owner->parent_graph->NodeCallback(owner->parent_graph->userpriv, GF_SG_CALLBACK_INIT, (GF_Node *) proto_node, NULL);
-			proto_node->flags |= GF_SG_PROTO_LOADED;
+			proto_node->flags |= GF_SG_PROTO_LOADED | GF_SG_PROTO_HARDCODED;
 			return;
 		}
 		/*not loaded yet*/
@@ -654,11 +655,11 @@
 	while ((route = (GF_Route*)gf_list_enum(proto->sub_graph->Routes, &i))) {
 		if (route->IS_route) continue;
 
-		r2 = gf_sg_route_new(proto_node->sgprivate->scenegraph, 
-				gf_sg_find_node(proto_node->sgprivate->scenegraph, gf_node_get_id(route->FromNode) ), 
-				route->FromField.fieldIndex, 
-				gf_sg_find_node(proto_node->sgprivate->scenegraph, gf_node_get_id(route->ToNode) ), 
-				route->ToField.fieldIndex);
+		r2 = gf_sg_route_new(proto_node->sgprivate->scenegraph,
+		                     gf_sg_find_node(proto_node->sgprivate->scenegraph, gf_node_get_id(route->FromNode) ),
+		                     route->FromField.fieldIndex,
+		                     gf_sg_find_node(proto_node->sgprivate->scenegraph, gf_node_get_id(route->ToNode) ),
+		                     route->ToField.fieldIndex);
 
 		if (route->ID) gf_sg_route_set_id(r2, route->ID);
 		if (route->name) gf_sg_route_set_name(r2, route->name);
@@ -683,19 +684,19 @@
 	i=0;
 	while ((route = (GF_Route*)gf_list_enum(proto_node->sgprivate->scenegraph->Routes, &i))) {
 		if (!route->IS_route || !route->ToNode) continue;
-/*		assert(route->is_setup);
-		if ((route->FromField.eventType == GF_SG_EVENT_OUT) || (route->FromField.eventType == GF_SG_EVENT_IN) ) continue;
-*/		
+		/*		assert(route->is_setup);
+				if ((route->FromField.eventType == GF_SG_EVENT_OUT) || (route->FromField.eventType == GF_SG_EVENT_IN) ) continue;
+		*/
 
 		if (route->is_setup) {
 			if ((route->ToField.eventType == GF_SG_EVENT_IN) && (route->FromField.eventType == GF_SG_EVENT_IN) ) continue;
 		}
 
-		if ((route->ToNode->sgprivate->tag==TAG_MPEG4_Script) 
+		if ((route->ToNode->sgprivate->tag==TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-			|| (route->ToNode->sgprivate->tag==TAG_X3D_Script) 
+		        || (route->ToNode->sgprivate->tag==TAG_X3D_Script)
 #endif
-		)
+		   )
 			gf_sg_route_activate(route);
 	}
 
@@ -713,7 +714,7 @@
 }
 
 void gf_sg_proto_mark_field_loaded(GF_Node *proto_inst, GF_FieldInfo *info)
-{	
+{
 	GF_ProtoInstance *inst= (proto_inst->sgprivate->tag==TAG_ProtoNode) ? (GF_ProtoInstance *)proto_inst : NULL;
 	GF_ProtoField *pf = inst ? (GF_ProtoField *)gf_list_get(inst->fields, info->fieldIndex) : NULL;
 	if (pf) pf->has_been_accessed = 1;
@@ -798,10 +799,14 @@
 	proto = (GF_ProtoInstance *)node;
 	/*watchout for deletion case*/
 	switch (code_mode) {
-	case GF_SG_FIELD_CODING_IN: return proto->proto_interface ? proto->proto_interface->NumIn : 0;
-	case GF_SG_FIELD_CODING_OUT: return proto->proto_interface ? proto->proto_interface->NumOut : 0;
-	case GF_SG_FIELD_CODING_DEF: return proto->proto_interface ? proto->proto_interface->NumDef : 0;
-	case GF_SG_FIELD_CODING_ALL: return gf_list_count(proto->proto_interface ? proto->proto_interface->proto_fields : proto->fields);
+	case GF_SG_FIELD_CODING_IN:
+		return proto->proto_interface ? proto->proto_interface->NumIn : 0;
+	case GF_SG_FIELD_CODING_OUT:
+		return proto->proto_interface ? proto->proto_interface->NumOut : 0;
+	case GF_SG_FIELD_CODING_DEF:
+		return proto->proto_interface ? proto->proto_interface->NumDef : 0;
+	case GF_SG_FIELD_CODING_ALL:
+		return gf_list_count(proto->proto_interface ? proto->proto_interface->proto_fields : proto->fields);
 	/*BIFS-ANIM not supported*/
 	case GF_SG_FIELD_CODING_DYN:
 	default:
@@ -873,7 +878,7 @@
 }
 
 /*Note on ISed fields: we cannot support fan-in on proto, eg we assume only one eventIn field can receive events
-thus situations where a proto receives eventIn from outside and the node with ISed eventIn receives event 
+thus situations where a proto receives eventIn from outside and the node with ISed eventIn receives event
 from inside the proto are undefined*/
 GF_Err gf_sg_proto_field_set_ised(GF_Proto *proto, u32 protoFieldIndex, GF_Node *node, u32 nodeFieldIndex)
 {
@@ -960,7 +965,7 @@
 	GF_Route *r;
 	GF_FieldInfo field, nodeField;
 	if (protoinst->sgprivate->tag != TAG_ProtoNode) return GF_BAD_PARAM;
-	
+
 	e = gf_node_get_field(protoinst, protoFieldIndex, &field);
 	if (e) return e;
 	e = gf_node_get_field(node, nodeFieldIndex, &nodeField);
@@ -1038,13 +1043,13 @@
 }
 
 
-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)
+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)
 {
 
 	if (!field) return GF_BAD_PARAM;
@@ -1105,7 +1110,7 @@
 		case GF_SG_FIELD_CODING_DYN:
 		default:
 			return GF_BAD_PARAM;
-		}		
+		}
 	}
 	return GF_BAD_PARAM;
 }
@@ -1141,7 +1146,7 @@
 		if (!r->IS_route) continue;
 		/*connecting from this node && field to a destination node other than the event source (this will break loops due to exposedFields)*/
 		if ((r->FromNode == node) && (r->FromField.fieldIndex == fieldIndex) && (r->ToNode != from_node) ) {
-			if (gf_sg_route_activate(r)) 
+			if (gf_sg_route_activate(r))
 				gf_node_changed(r->ToNode, &r->ToField);
 		}
 	}
@@ -1159,7 +1164,7 @@
 	i=0;
 	while ((proto_field = (GF_ProtoFieldInterface*)gf_list_enum(proto->proto_fields, &i))) {
 		if (proto_field->ALL_index!=FieldIndex) continue;
-		
+
 		*QType = proto_field->QP_Type;
 		*AType = proto_field->Anim_Type;
 		*b_min = FIX_MIN;
@@ -1292,7 +1297,7 @@
 	if (node->sgprivate->scenegraph->pOwningProto) {
 		GF_Node *the_node = (GF_Node *) node->sgprivate->scenegraph->pOwningProto;
 		if (the_node != node) return the_node;
-	} 
+	}
 	return NULL;
 }
 
@@ -1306,4 +1311,23 @@
 	return 0;
 }
 
+
+GF_EXPORT
+GF_Err gf_node_set_proto_eventin_handler(GF_Node *node, u32 fieldIndex, void (*event_in_cbk)(GF_Node *pThis, struct _route *route) )
+{
+	GF_ProtoInstance *inst;
+	GF_ProtoField *field;
+	if (!node || (node->sgprivate->tag!=TAG_ProtoNode)) return GF_BAD_PARAM;
+
+	inst = (GF_ProtoInstance *) node;
+	field = (GF_ProtoField*)gf_list_get(inst->fields, fieldIndex);
+	if (!field) return GF_BAD_PARAM;
+
+	if (field->EventType!=GF_SG_EVENT_IN) return GF_BAD_PARAM;
+	field->on_event_in = event_in_cbk;
+	return GF_OK;
+}
+
+
+
 #endif	/*GPAC_DISABLE_VRML*/

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/vrml_route.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/vrml_route.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -207,7 +207,7 @@
 	route->ID = ID;
 	return GF_OK;
 }
-u32 gf_sg_route_get_id(GF_Route *route) 
+u32 gf_sg_route_get_id(GF_Route *route)
 {
 	return route->ID;
 }
@@ -227,7 +227,7 @@
 	return route->name;
 }
 
-void gf_sg_route_setup(GF_Route *r) 
+void gf_sg_route_setup(GF_Route *r)
 {
 	gf_node_get_field(r->FromNode, r->FromField.fieldIndex, &r->FromField);
 	gf_node_get_field(r->ToNode, r->ToField.fieldIndex, &r->ToField);
@@ -248,9 +248,9 @@
 	u32 i;
 	GF_Route *r;
 	if (!node) return;
-	
+
 	if (!node->sgprivate->interact) return;
-	
+
 	//search for routes to activate in the order they where declared
 	i=0;
 	while ((r = (GF_Route*)gf_list_enum(node->sgprivate->interact->routes, &i))) {
@@ -275,17 +275,17 @@
 			if (r->FromField.eventType == GF_SG_EVENT_OUT) return 0;
 			if (r->ToField.eventType == GF_SG_EVENT_OUT) return 0;
 		}
-		if (r->IS_route && ((r->ToNode->sgprivate->tag==TAG_MPEG4_Script) 
+		if (r->IS_route && ((r->ToNode->sgprivate->tag==TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-			|| (r->ToNode->sgprivate->tag==TAG_X3D_Script)
+		                    || (r->ToNode->sgprivate->tag==TAG_X3D_Script)
 #endif
-			) && ((r->ToField.eventType==GF_SG_EVENT_IN) /*|| (r->ToField.eventType==GF_SG_EVENT_FIELD)*/)
-			&& r->FromField.eventType==GF_SG_EVENT_IN) {
-				return 0;
+		                   ) && ((r->ToField.eventType==GF_SG_EVENT_IN) /*|| (r->ToField.eventType==GF_SG_EVENT_FIELD)*/)
+		        && r->FromField.eventType==GF_SG_EVENT_IN) {
+			return 0;
 		}
 	}
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_DEBUG, GF_LOG_INTERACT)) {
+	if (gf_log_tool_level_on(GF_LOG_INTERACT, GF_LOG_DEBUG)) {
 		if (r->IS_route) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[VRML Event] executing %s.%s IS %s.%s", gf_node_get_name(r->FromNode), r->FromField.name, gf_node_get_name(r->ToNode), r->ToField.name));
 		} else {
@@ -331,7 +331,7 @@
 			orig = orig->next;
 		}
 	}
-		break;
+	break;
 
 	default:
 		if (r->ToField.fieldType==r->FromField.fieldType) {
@@ -341,7 +341,7 @@
 			} else {
 				gf_sg_vrml_field_copy(r->ToField.far_ptr, r->FromField.far_ptr, r->FromField.fieldType);
 			}
-		} 
+		}
 		/*typecast URL <-> string if needed*/
 		else {
 			VRML_FieldCopyCast(r->ToField.far_ptr, r->ToField.fieldType, r->FromField.far_ptr, r->FromField.fieldType);
@@ -349,16 +349,22 @@
 		break;
 	}
 
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_INTERACT, GF_LOG_DEBUG)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[VRML Route] field copy/casted\n"));
+	}
+#endif
+
 	//if this is a supported eventIn call watcher
 	if (r->ToField.on_event_in) {
 		r->ToField.on_event_in(r->ToNode, r);
 	}
 	//if this is a script eventIn call directly script
-	else if (((r->ToNode->sgprivate->tag==TAG_MPEG4_Script) 
+	else if (((r->ToNode->sgprivate->tag==TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		|| (r->ToNode->sgprivate->tag==TAG_X3D_Script)
+	          || (r->ToNode->sgprivate->tag==TAG_X3D_Script)
 #endif
-	) && ((r->ToField.eventType==GF_SG_EVENT_IN) /*|| (r->ToField.eventType==GF_SG_EVENT_FIELD)*/) ) {
+	         ) && ((r->ToField.eventType==GF_SG_EVENT_IN) /*|| (r->ToField.eventType==GF_SG_EVENT_FIELD)*/) ) {
 		gf_sg_script_event_in(r->ToNode, &r->ToField);
 	}
 	//check if ISed or not - this will notify the node of any changes
@@ -368,17 +374,24 @@
 		if (r->ToField.eventType != GF_SG_EVENT_EXPOSED_FIELD)
 			gf_sg_proto_propagate_event(r->ToNode, r->ToField.fieldIndex, r->FromNode);
 		/*only happen on proto, an eventOut may route to an eventOut*/
-		if (r->IS_route && r->ToField.eventType==GF_SG_EVENT_OUT) 
+		if (r->IS_route && r->ToField.eventType==GF_SG_EVENT_OUT)
 			gf_node_event_out(r->ToNode, r->ToField.fieldIndex);
 	}
 
 	/*and signal routes on exposed fields if field changed*/
-	if (r->ToField.eventType == GF_SG_EVENT_EXPOSED_FIELD){
+	if (r->ToField.eventType == GF_SG_EVENT_EXPOSED_FIELD) {
 		if (r->IS_route)
 			gf_node_event_out_proto(r->ToNode, r->ToField.fieldIndex);
 		else
 			gf_node_event_out(r->ToNode, r->ToField.fieldIndex);
 	}
+
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_INTERACT, GF_LOG_DEBUG)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[VRML Route] done executing (res %d)\n", ret));
+	}
+#endif
+
 	return ret;
 }
 
@@ -389,10 +402,10 @@
 	u32 i;
 	GF_Route *r;
 	if (!node) return;
-	
+
 	/*node has no routes*/
 	if (!node->sgprivate->interact || !node->sgprivate->interact->routes) return;
-	
+
 	//search for routes to activate in the order they where declared
 	i=0;
 	while ((r = (GF_Route*)gf_list_enum(node->sgprivate->interact->routes, &i))) {
@@ -401,7 +414,7 @@
 
 		/*no postpone for IS routes*/
 		if (r->IS_route) {
-			if (gf_sg_route_activate(r)) 
+			if (gf_sg_route_activate(r))
 				gf_node_changed(r->ToNode, &r->ToField);
 		}
 		//queue

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/vrml_script.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/vrml_script.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -32,7 +32,7 @@
 #ifndef GPAC_DISABLE_VRML
 
 
-static u32 script_get_nb_static_field(GF_Node *node) 
+static u32 script_get_nb_static_field(GF_Node *node)
 {
 	return (node->sgprivate->tag==TAG_MPEG4_Script) ? 3 : 4;
 }
@@ -41,11 +41,11 @@
 {
 	GF_ScriptPriv *priv;
 	GF_ScriptField *field;
-	
+
 	if (!is_destroy) return;
 
 	priv = (GF_ScriptPriv *)node->sgprivate->UserPrivate;
-	
+
 	if (priv->JS_PreDestroy) priv->JS_PreDestroy(node);
 
 	//destroy extra fields
@@ -191,11 +191,11 @@
 {
 	GF_ScriptPriv *priv;
 	GF_ScriptField *field;
-	if (!name || ((node->sgprivate->tag != TAG_MPEG4_Script) 
+	if (!name || ((node->sgprivate->tag != TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		&& (node->sgprivate->tag != TAG_X3D_Script)
+	              && (node->sgprivate->tag != TAG_X3D_Script)
 #endif
-		))
+	             ))
 		return NULL;
 
 	if (eventType > GF_SG_SCRIPT_TYPE_EVENT_OUT) return NULL;
@@ -231,7 +231,7 @@
 	if ((fieldType != GF_SG_VRML_SFNODE) && (fieldType != GF_SG_VRML_MFNODE) ) {
 		field->pField = gf_sg_vrml_field_pointer_new(fieldType);
 	}
-	
+
 	return field;
 }

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/vrml_smjs.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/vrml_smjs.c Changed

@@ -110,14 +110,16 @@
 # endif
 #endif
 
-/*define this macro to force Garbage Collection after each input to JS (script initialize/shutdown and all eventIn) 
+/*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
+//#  define FORCE_GC
 # endif
 #endif
 
@@ -201,6 +203,8 @@
 	/*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;
@@ -213,21 +217,21 @@
 	case GF_JSGC_STRING:
 #ifdef USE_FFDEV_15
 		if (!cx) JS_RemoveStringRootRT(js_rt->js_runtime, rp);
-		else 
+		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 
+		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 
+		else
 #endif
 			JS_RemoveValueRoot(cx, (jsval *) rp);
 		break;
@@ -339,6 +343,7 @@
 		}
 		GF_SAFEALLOC(js_rt, GF_JSRuntime);
 		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);
@@ -361,6 +366,8 @@
 		JS_ClearRuntimeThread(js_rt->js_runtime);
 	}
 #endif
+
+	gf_list_add(js_rt->allocated_contexts, ctx);
 	gf_mx_v(js_rt->mx);
 
 	return ctx;
@@ -372,10 +379,13 @@
 #if (JS_VERSION>=185)
 	assert(js_rt);
 	JS_SetRuntimeThread(js_rt->js_runtime);
-	JS_SetContextThread(ctx); 
+	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 --;
@@ -383,6 +393,7 @@
 			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;
@@ -435,12 +446,12 @@
 #include <gpac/nodes_x3d.h>
 
 
-void gf_sg_script_to_node_field(struct JSContext *c, jsval v, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent);
+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);
+Bool JSScriptFromFile(GF_Node *node, const char *opt_file, Bool no_complain, jsval *rval);
 
 void gf_sg_js_call_gc(JSContext *c)
 {
@@ -453,19 +464,23 @@
 	gf_sg_lock_javascript(c, 0);
 }
 
-#ifdef FORCE_GC
-void MyJSGC(JSContext *c) 
+void do_js_gc(JSContext *c, GF_Node *node)
 {
-	gf_sg_js_call_gc(c);
-  
-}
+#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);
+	}
+}
+
 
 void SFColor_fromHSV(SFColor *col)
 {
-    Fixed f, q, t, p, hue, sat, val;
-    u32 i;
+	Fixed f, q, t, p, hue, sat, val;
+	u32 i;
 	hue = col->red;
 	sat = col->green;
 	val = col->blue;
@@ -473,21 +488,45 @@
 		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;
-    }
+	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)
@@ -544,7 +583,7 @@
 
 static JSBool SMJS_FUNCTION(JSPrint)
 {
-	SMJS_ARGS	
+	SMJS_ARGS
 	if (JSVAL_IS_STRING(argv[0])) {
 		char *str = SMJS_CHARS(c, argv[0]);
 		_ScriptMessage(c, str);
@@ -662,17 +701,15 @@
 	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) {
-		if ( JSScriptFromFile(node, url, no_complain) == 1) {
-			SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-		} else {
-			SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_FALSE) );
-		}
+		JSScriptFromFile(node, url, no_complain, &aval);
+		SMJS_SET_RVAL(aval);
 	}
 	SMJS_FREE(c, url);
 	return JS_TRUE;
@@ -810,9 +847,7 @@
 
 	gf_sg_lock_javascript(priv->js_ctx, 0);
 
-#ifdef FORCE_GC
-	MyJSGC(priv->js_ctx);
-#endif
+	do_js_gc(priv->js_ctx, node);
 }
 
 static JSBool SMJS_FUNCTION(addRoute)
@@ -865,11 +900,11 @@
 			f_id2 = atoi(f2+6);
 			e = gf_node_get_field(n2, f_id2, &info);
 		} else {
-			if ((n2->sgprivate->tag==TAG_MPEG4_Script) 
+			if ((n2->sgprivate->tag==TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-				|| (n2->sgprivate->tag==TAG_X3D_Script)
+			        || (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);
@@ -894,11 +929,11 @@
 		fun_name = JS_GetFunctionName( JS_ValueToFunction(c, argv[3] ) );
 		if (fun_name && n1->sgprivate->interact && n1->sgprivate->interact->routes ) {
 			while ( (r = (GF_RouteToFunction*)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)
-			)
+				if ( (r->FromNode == n1)
+				        && (r->FromField.fieldIndex == f_id1)
+				        && (r->ToNode == (GF_Node*)JS_GetScript(c))
+				        && !stricmp(r->ToField.name, fun_name)
+				   )
 					break;
 			}
 		}
@@ -918,10 +953,10 @@
 			r->ToField.name = fun_name;
 
 			r->obj = JSVAL_TO_OBJECT( argv[2] ) ;
-	//		gf_js_add_root(c, & r->obj);
+			//		gf_js_add_root(c, & r->obj);
 
 			r->fun = argv[3];
-	//		gf_js_add_root(c, &r->fun);
+			//		gf_js_add_root(c, &r->fun);
 
 			r->is_setup = 1;
 			r->graph = n1->sgprivate->scenegraph;
@@ -949,8 +984,8 @@
 	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;
-	
+	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);
@@ -1183,11 +1218,11 @@
 	if (!parent) return;
 
 	script_field = 0;
-	if ((parent->sgprivate->tag == TAG_MPEG4_Script) 
+	if ((parent->sgprivate->tag == TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		|| (parent->sgprivate->tag == TAG_X3D_Script) 
+	        || (parent->sgprivate->tag == TAG_X3D_Script)
 #endif
-		) {
+	   ) {
 		script_field = 1;
 		if ( (GF_Node *) JS_GetContextPrivate(c) == parent) script_field = 2;
 	}
@@ -1201,10 +1236,17 @@
 		}
 		/*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);
-		}else{
+
+			//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);
 		}
@@ -1227,38 +1269,38 @@
 
 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;
-		}
+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;
+}
+SMJS_FREE(c, eventName);
+return JS_FALSE;
 }
 
 
@@ -1321,11 +1363,11 @@
 	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;
+		        && 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*/
@@ -1344,7 +1386,11 @@
 		*/
 		if (ptr->obj && is_js_call) {
 			GF_ScriptPriv *priv;
-			if (ptr->js_ctx) c = ptr->js_ctx;
+			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);
 		}
@@ -1387,7 +1433,7 @@
 				break;
 			case GF_SG_VRML_MFFLOAT:
 			case GF_SG_VRML_MFTIME:
-				JS_ValueToNumber(c, item, &d);
+				SMJS_GET_NUMBER(item, d);
 				sprintf(temp, "%g", d);
 				strcat(str, temp);
 				break;
@@ -1398,7 +1444,7 @@
 				strcat(str, str_val);
 				SMJS_FREE(c, str_val);
 			}
-				break;
+			break;
 			default:
 				if (JSVAL_IS_OBJECT(item)) {
 					GF_JSField *sf = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(item));
@@ -1492,7 +1538,7 @@
 		}
 		gf_node_init(new_node);
 	}
-	
+
 	SMJS_FREE(c, node_name);
 
 	obj = node_get_binding(priv, new_node, 1);
@@ -1511,9 +1557,9 @@
 	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
-			) {
+		        /*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);
@@ -1525,127 +1571,127 @@
 
 static DECL_FINALIZE(node_finalize)
 
-	node_finalize_ex(c, obj, 1);
+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) {
+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;
 		}
-
-		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;
-			}
-		}
+	} 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;
-    }
+	}
 
-	return JS_FALSE;
+	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;
+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);
+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;
-	}
+/*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);
+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);
+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);
-			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 {
+			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);
+	}
+	SMJS_FREE(c, fieldname);
 
-		if (gf_node_get_tag(n)==TAG_ProtoNode)
-			gf_sg_proto_mark_field_loaded(n, &info);
+	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;
+	gf_sg_script_to_node_field(c, *vp, &info, n, ptr);
+}
+return JS_TRUE;
 }
 static JSBool SMJS_FUNCTION(node_toString)
 {
@@ -1697,12 +1743,12 @@
 /* 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;
+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);
+if (ptr->field_ptr) gf_sg_vrml_field_pointer_del(ptr->field_ptr, ptr->field.fieldType);
+gf_free(ptr);
 }
 
 
@@ -1747,88 +1793,104 @@
 
 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;
+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);
 		}
 	}
-	return JS_TRUE;
+	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;
+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;
+/*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;
+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 */
@@ -1850,58 +1912,70 @@
 	jsdouble x = 0.0, y = 0.0;
 	SMJS_ARGS
 	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFVec2fClass)
-	if (argc > 0) JS_ValueToNumber(c, argv[0], &x);
-	if (argc > 1) JS_ValueToNumber(c, argv[1], &y);
+	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);
+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;
-		}
+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;
+}
+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);
+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;
+/*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;
 	}
 
-	if (SMJS_ID_IS_INT(id)) {
-		JS_ValueToNumber(c, *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);
+	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;
-    }
-	return JS_FALSE;
+	}
+	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_TRUE;
+}
+return JS_FALSE;
 }
 
 static JSBool SMJS_FUNCTION(vec2f_add)
@@ -1914,7 +1988,7 @@
 		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;
+	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) );
@@ -1930,7 +2004,7 @@
 		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;
+	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) );
@@ -1958,7 +2032,7 @@
 	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));
-	JS_ValueToNumber(c, argv[0], &d );
+	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) );
@@ -1975,7 +2049,7 @@
 	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));
-	JS_ValueToNumber(c, argv[0], &d );
+	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) );
@@ -2013,7 +2087,7 @@
 		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;
+	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;
 }
@@ -2039,62 +2113,78 @@
 	SMJS_ARGS
 	jsdouble x = 0.0, y = 0.0, z = 0.0;
 	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFVec3fClass)
-	if (argc > 0) JS_ValueToNumber(c, argv[0], &x);
-	if (argc > 1) JS_ValueToNumber(c, argv[1], &y);
-	if (argc > 2) JS_ValueToNumber(c, argv[2], &z);
+	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;
-		}
+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;
+}
+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);
+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;
-	}
+/*this is the prototype*/
+if (!ptr) {
+	if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
+	return JS_TRUE;
+}
 
-	if (SMJS_ID_IS_INT(id) && SMJS_ID_TO_INT(id) >= 0 && SMJS_ID_TO_INT(id) < 3 && JS_ValueToNumber(c, *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;
-    }
+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;
@@ -2105,7 +2195,7 @@
 		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;
+	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) );
@@ -2121,7 +2211,7 @@
 		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;
+	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) );
@@ -2150,7 +2240,7 @@
 
 	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));
-	JS_ValueToNumber(c, argv[0], &d );
+	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) );
@@ -2167,7 +2257,7 @@
 	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));
-	JS_ValueToNumber(c, argv[0], &d );
+	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) );
@@ -2204,7 +2294,7 @@
 		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;
+	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;
 }
@@ -2218,7 +2308,7 @@
 		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;
+	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);
@@ -2258,10 +2348,10 @@
 		return JS_TRUE;
 	}
 	if ((argc>0) && JSVAL_IS_NUMBER(argv[0])) {
-		if (argc > 0) JS_ValueToNumber(c, argv[0], &x);
-		if (argc > 1) JS_ValueToNumber(c, argv[1], &y);
-		if (argc > 2) JS_ValueToNumber(c, argv[2], &z);
-		if (argc > 3) JS_ValueToNumber(c, argv[3], &a);
+		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;
 	}
@@ -2271,7 +2361,7 @@
 	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])) {
-		JS_ValueToNumber(c, argv[1], &a);
+		SMJS_GET_NUMBER(argv[1], a);
 		SFRotation_Create(c, obj, v1.x, v1.y, v1.z, FLT2FIX(a));
 		return JS_TRUE;
 	}
@@ -2285,68 +2375,84 @@
 	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));
+	                  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;
-		}
+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;
+}
+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);
+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;
-	}
+/*this is the prototype*/
+if (!ptr) {
+	if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
+	return JS_TRUE;
+}
 
-	if (SMJS_ID_IS_INT(id) && SMJS_ID_TO_INT(id) >= 0 && SMJS_ID_TO_INT(id) < 4 && JS_ValueToNumber(c, *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;
-    }
+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;
@@ -2433,8 +2539,8 @@
 
 	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->x = v.x;
+	r->y = v.y;
 	r->z = v.z;
 	Script_FieldChanged(c, NULL, ptr, NULL);
 	return JS_TRUE;
@@ -2453,7 +2559,7 @@
 
 	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;
-	JS_ValueToNumber(c, argv[1], &d );
+	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));
@@ -2484,63 +2590,75 @@
 	SMJS_ARGS
 	jsdouble r = 0.0, g = 0.0, b = 0.0;
 	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFColorClass)
-	if (argc > 0) JS_ValueToNumber(c, argv[0], &r);
-	if (argc > 1) JS_ValueToNumber(c, argv[1], &g);
-	if (argc > 2) JS_ValueToNumber(c, argv[2], &b);
+	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;
-		}
+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;
+}
+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;
-	}
+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) && SMJS_ID_TO_INT(id) >= 0 && SMJS_ID_TO_INT(id) < 3 && JS_ValueToNumber(c, *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;
-    }
+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;
@@ -2550,9 +2668,9 @@
 	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;
-	JS_ValueToNumber( c, argv[0], &h);
-	JS_ValueToNumber( c, argv[1], &s);
-	JS_ValueToNumber( c, argv[2], &v);
+	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);
@@ -2581,13 +2699,15 @@
 
 static void setup_js_array(JSContext *c, JSObject *obj, GF_JSField *ptr, uintN argc, jsval *argv)
 {
-	GF_ScriptPriv *priv = JS_GetScriptStack(c);
+//	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);
+	/*
+		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)	\
@@ -2600,7 +2720,7 @@
 	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);
@@ -2659,328 +2779,346 @@
 
 static DECL_FINALIZE(array_finalize)
 
-	array_finalize_ex(c, obj, 1);
+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);
-		}
+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;
+}
+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;
-	GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	ind = SMJS_ID_TO_INT(id);
-
-	ret = JS_GetArrayLength(c, ptr->js_list, &len);
+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;
-
-	if (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) {
-		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++;
+	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;
 		}
-	}
 
-	/*assign object*/
-	if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
-		if (JSVAL_IS_VOID(*vp) || JSVAL_IS_NULL(*vp) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(*vp), &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;
+		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;
+/*rewrite MFNode entry*/
+if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
+	GF_Node *prev_n, *new_n;
 
-#if 0
-		anobj = node_get_binding(JS_GetScriptStack(c), from->node, 0);
+	if (!ptr->owner) return JS_TRUE;
 
-		/*add it to the new object if needed*/
-		ret = JS_SetElement(c, ptr->js_list, ind, vp);
-#endif
+	/*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 (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);
 
-	if (!ptr->owner) return JS_TRUE;
+	Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_TRUE;
+}
 
-	/*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:
-		JS_ValueToNumber(c, *vp, &d);
-		((MFFloat *)ptr->field.far_ptr)->vals[ind] = FLT2FIX(d);
-		break;
-	case GF_SG_VRML_MFTIME:
-		JS_ValueToNumber(c, *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;
+ret = JS_SetElement(c, ptr->js_list, ind, vp);
+if (ret==JS_FALSE) return JS_FALSE;
 
-	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;
+if (!ptr->owner) return JS_TRUE;
 
-	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;
-	}
+/*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;
+Script_FieldChanged(c, NULL, ptr, NULL);
+return JS_TRUE;
 }
 
 static SMJS_FUNC_PROP_SET( array_setLength)
 
-	u32 len, i, sftype;
-	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*/
+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;
+if (!id) id=0;
 #endif
-    len = JSVAL_TO_INT(*vp);
+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;
+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_SetArrayLength(c, ptr->js_list, len);
-	if (ret==JS_FALSE) return ret;
+ret = JS_GetArrayLength(c, ptr->js_list, &old_len);
+if (ret==JS_FALSE) return ret;
 
-#if 0
-	/*insert till index if needed*/
-	if (ptr->field.fieldType != GF_SG_VRML_MFNODE) {
-		if (!ptr->field.far_ptr) ptr->field_ptr = ptr->field.far_ptr = gf_sg_vrml_field_pointer_new(ptr->field.fieldType);
-		gf_sg_vrml_mf_reset(ptr->field.far_ptr, ptr->field.fieldType);
-		gf_sg_vrml_mf_alloc(ptr->field.far_ptr, ptr->field.fieldType, len);
-		if (ptr->field_ptr) ptr->field_ptr = ptr->field.far_ptr;
-	}
-#endif
+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=0; 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;
-			}
+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;
+	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*/
+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;
+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;
+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;
 }
 
 
@@ -3019,8 +3157,8 @@
 	u32 i;
 	SMJS_ARGS
 	GF_JSField *ptr;
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->MFVec3fClass)	
-	
+	SMJS_OBJ_CONSTRUCTOR(&js_rt->MFVec3fClass)
+
 	ptr = NewJSField(c);
 	ptr->field.fieldType = GF_SG_VRML_MFVEC3F;
 	setup_js_array(c, obj, ptr, 0, 0);
@@ -3048,8 +3186,8 @@
 	u32 i;
 	SMJS_ARGS
 	GF_JSField *ptr;
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->MFRotationClass)	
-	
+	SMJS_OBJ_CONSTRUCTOR(&js_rt->MFRotationClass)
+
 	ptr = NewJSField(c);
 	ptr->field.fieldType = GF_SG_VRML_MFROTATION;
 	setup_js_array(c, obj, ptr, 0, 0);
@@ -3139,18 +3277,18 @@
 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_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
 
 
 	JS_SETUP_CLASS(js_rt->AnyClass, "AnyClass", JSCLASS_HAS_PRIVATE,
-	  JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+	               JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
 
 	JS_SETUP_CLASS(js_rt->browserClass , "Browser", 0,
-		JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+	               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);
+	               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));
@@ -3168,52 +3306,52 @@
 #endif
 
 	JS_SETUP_CLASS(js_rt->SFVec2fClass , "SFVec2f", JSCLASS_HAS_PRIVATE,
-	  vec2f_getProperty, vec2f_setProperty, field_finalize);
+	               vec2f_getProperty, vec2f_setProperty, field_finalize);
 
 	JS_SETUP_CLASS(js_rt->SFVec3fClass , "SFVec3f", JSCLASS_HAS_PRIVATE,
-	  vec3f_getProperty, vec3f_setProperty, field_finalize);
+	               vec3f_getProperty, vec3f_setProperty, field_finalize);
 
 	JS_SETUP_CLASS(js_rt->SFRotationClass , "SFRotation", JSCLASS_HAS_PRIVATE,
-	  rot_getProperty, rot_setProperty,  field_finalize);
+	               rot_getProperty, rot_setProperty,  field_finalize);
 
 	JS_SETUP_CLASS(js_rt->SFColorClass , "SFColor", JSCLASS_HAS_PRIVATE,
-	  color_getProperty, color_setProperty, field_finalize);
+	               color_getProperty, color_setProperty, field_finalize);
 
 	JS_SETUP_CLASS(js_rt->SFImageClass , "SFImage", JSCLASS_HAS_PRIVATE,
-	  image_getProperty, image_setProperty, field_finalize);
+	               image_getProperty, image_setProperty, field_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFInt32Class , "MFInt32", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement, array_finalize);
+	               array_getElement,  array_setElement, array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFBoolClass , "MFBool", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement, array_finalize);
+	               array_getElement,  array_setElement, array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFTimeClass , "MFTime", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFFloatClass , "MFFloat", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFUrlClass , "MFUrl", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFStringClass , "MFString", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFNodeClass , "MFNode", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFVec2fClass , "MFVec2f", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFVec3fClass , "MFVec3f", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFRotationClass , "MFRotation", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SETUP_CLASS(js_rt->MFColorClass , "MFColor", JSCLASS_HAS_PRIVATE,
-	  array_getElement,  array_setElement,  array_finalize);
+	               array_getElement,  array_setElement,  array_finalize);
 
 	JS_SetErrorReporter(sc->js_ctx, script_error);
 
@@ -3242,25 +3380,25 @@
 	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("getOption",  getOption,          2),
-		  SMJS_FUNCTION_SPEC("setOption",  setOption,          3),
-		  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)
+			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("getOption",  getOption,          2),
+			SMJS_FUNCTION_SPEC("setOption",  setOption,          3),
+			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);
 	}
@@ -3396,17 +3534,17 @@
 		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);
-*/
+	/*
+		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);
+	*/
 
 }
 
 
 
-void gf_sg_script_to_node_field(JSContext *c, jsval val, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent)
+JSBool gf_sg_script_to_node_field(JSContext *c, jsval val, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent)
 {
 	jsdouble d;
 	Bool changed;
@@ -3416,8 +3554,8 @@
 	jsval item;
 	u32 i;
 
-	if (JSVAL_IS_VOID(val)) return;
-	if ((field->fieldType != GF_SG_VRML_SFNODE) && JSVAL_IS_NULL(val)) return;
+	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) {
@@ -3427,7 +3565,7 @@
 			*((SFBool *) field->far_ptr) = JSVAL_TO_BOOLEAN(val);
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_SFINT32:
 	{
@@ -3435,30 +3573,30 @@
 			* ((SFInt32 *) field->far_ptr) = JSVAL_TO_INT(val);
 			Script_FieldChanged(c, owner, parent, field);
 		} else if (JSVAL_IS_NUMBER(val) ) {
-			JS_ValueToNumber(c, val, &d );
+			SMJS_GET_NUMBER(val, d );
 			*((SFInt32 *) field->far_ptr) = (s32) d;
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_SFFLOAT:
 	{
 		if (JSVAL_IS_NUMBER(val) ) {
-			JS_ValueToNumber(c, val, &d );
+			SMJS_GET_NUMBER(val, d );
 			*((SFFloat *) field->far_ptr) = FLT2FIX( d);
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
-    }
+		return JS_TRUE;
+	}
 	case GF_SG_VRML_SFTIME:
 	{
 		if (JSVAL_IS_NUMBER(val) ) {
-			JS_ValueToNumber(c, val, &d );
+			SMJS_GET_NUMBER(val, d );
 			*((SFTime *) field->far_ptr) = (Double) d;
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
-    }
+		return JS_TRUE;
+	}
 	case GF_SG_VRML_SFSTRING:
 	{
 		SFString *s = (SFString*)field->far_ptr;
@@ -3471,7 +3609,7 @@
 			Script_FieldChanged(c, owner, parent, field);
 		}
 		SMJS_FREE(c, str_val);
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_SFURL:
 	{
@@ -3483,7 +3621,7 @@
 		((SFURL*)field->far_ptr)->OD_ID = 0;
 		Script_FieldChanged(c, owner, parent, field);
 		SMJS_FREE(c, str_val);
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_MFSTRING:
 		if (JSVAL_IS_STRING(val)) {
@@ -3495,7 +3633,7 @@
 			((MFString*)field->far_ptr)->vals[0] = gf_strdup(str_val);
 			Script_FieldChanged(c, owner, parent, field);
 			SMJS_FREE(c, str_val);
-			return;
+			return JS_TRUE;
 		}
 	case GF_SG_VRML_MFURL:
 		if (JSVAL_IS_STRING(val)) {
@@ -3508,7 +3646,7 @@
 			((MFURL*)field->far_ptr)->vals[0].OD_ID = 0;
 			Script_FieldChanged(c, owner, parent, field);
 			SMJS_FREE(c, str_val);
-			return;
+			return JS_TRUE;
 		}
 
 	default:
@@ -3516,7 +3654,7 @@
 	}
 
 	//from here we must have an object
-	if (! JSVAL_IS_OBJECT(val)) return;
+	if (! JSVAL_IS_OBJECT(val)) return JS_FALSE;
 	obj = JSVAL_TO_OBJECT(val) ;
 
 	switch (field->fieldType) {
@@ -3527,7 +3665,7 @@
 			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFVEC2F);
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_SFVEC3F:
 	{
@@ -3536,7 +3674,7 @@
 			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFVEC3F);
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_SFROTATION:
 	{
@@ -3545,7 +3683,7 @@
 			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFROTATION);
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_SFCOLOR:
 	{
@@ -3554,7 +3692,7 @@
 			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFCOLOR);
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_SFNODE:
 	{
@@ -3572,7 +3710,7 @@
 			gf_node_register(n, owner);
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
+		return JS_TRUE;
 	}
 	case GF_SG_VRML_SFIMAGE:
 	{
@@ -3581,7 +3719,7 @@
 			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFIMAGE);
 			Script_FieldChanged(c, owner, parent, field);
 		}
-		return;
+		return JS_TRUE;
 	}
 	default:
 		break;
@@ -3589,20 +3727,20 @@
 
 	//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;
+	        && !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);
@@ -3632,7 +3770,7 @@
 		Script_FieldChanged(c, owner, parent, field);
 		/*and mark the field as changed*/
 		JSScript_NodeModified(owner->sgprivate->scenegraph, owner, field, NULL);
-		return;
+		return JS_TRUE;
 	}
 
 	/*again, check text changes*/
@@ -3660,13 +3798,13 @@
 			break;
 		case GF_SG_VRML_MFFLOAT:
 			if (JSVAL_IS_NUMBER(item)) {
-				JS_ValueToNumber(c, item, &d);
+				SMJS_GET_NUMBER(item, d);
 				((MFFloat *)field->far_ptr)->vals[i] = FLT2FIX( d);
 			}
 			break;
 		case GF_SG_VRML_MFTIME:
 			if (JSVAL_IS_NUMBER(item)) {
-				JS_ValueToNumber(c, item, &d);
+				SMJS_GET_NUMBER(item, d);
 				((MFTime *)field->far_ptr)->vals[i] = d;
 			}
 			break;
@@ -3682,7 +3820,7 @@
 			}
 			SMJS_FREE(c, str_val);
 		}
-			break;
+		break;
 		case GF_SG_VRML_MFURL:
 		{
 			char *str_val;
@@ -3694,7 +3832,7 @@
 			mfu->vals[i].OD_ID = 0;
 			SMJS_FREE(c, str_val);
 		}
-			break;
+		break;
 
 		case GF_SG_VRML_MFVEC2F:
 			if ( JSVAL_IS_OBJECT(item) && GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(item), &js_rt->SFVec2fClass, NULL) ) {
@@ -3722,10 +3860,11 @@
 			break;
 
 		default:
-			return;
+			return JS_TRUE;
 		}
 	}
 	if (changed) Script_FieldChanged(c, owner, parent, field);
+	return JS_TRUE;
 }
 
 
@@ -3748,7 +3887,7 @@
 			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFINT32:
 	{
 		MFInt32 *f = (MFInt32 *) field->far_ptr;
@@ -3759,7 +3898,7 @@
 			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFFLOAT:
 	{
 		MFFloat *f = (MFFloat *) field->far_ptr;
@@ -3770,7 +3909,7 @@
 			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFTIME:
 	{
 		MFTime *f = (MFTime *) field->far_ptr;
@@ -3781,7 +3920,7 @@
 			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFSTRING:
 	{
 		MFString *f = (MFString *) field->far_ptr;
@@ -3793,7 +3932,7 @@
 			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
 		}
 	}
-		break;
+	break;
 	case GF_SG_VRML_MFURL:
 	{
 		MFURL *f = (MFURL *) field->far_ptr;
@@ -3811,61 +3950,61 @@
 			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
 		}
 	}
-		break;
+	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;
+		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);
+		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;
 				}
-				f = f->next;
+				slot = NULL;
 			}
-			/*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);
+			if (!slot) {
+				JSObject *an_obj = node_get_binding(priv, f->node, 0);
+				gf_list_add(temp_objs, an_obj);
 			}
-			gf_list_del(temp_objs);
-#endif
+			f = f->next;
 		}
-		break;
+		/*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;
 }
@@ -3876,13 +4015,13 @@
 		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)
@@ -3896,21 +4035,21 @@
 
 	/*native types*/
 	switch (field->fieldType) {
-    case GF_SG_VRML_SFBOOL:
+	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:
+	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];
@@ -3920,58 +4059,73 @@
 			s = JS_NewStringCopyZ(priv->js_ctx, (const char *) url->url);
 		}
 		return STRING_TO_JSVAL( s );
-    }
+	}
 	}
 
+	obj =  NULL;
 
-#if 1
 	/*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)
-#if 0
-				&& (jsf->field.fieldIndex == field->fieldIndex)
-				/*type check needed for MFNode entries*/
-				&& (jsf->field.fieldType==field->fieldType)
-#else
-				&& (jsf->field.far_ptr==field->far_ptr)
-#endif
-				) {
+			    /*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;
 		}
 	}
-#endif
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] creating jsobj %s.%s\n", gf_node_get_name(parent), field->name) );
+	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:
+	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:
+	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:
+	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:
+	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:
+	case GF_SG_VRML_SFIMAGE:
 		SETUP_FIELD
 		obj = JS_NewObject(priv->js_ctx, &js_rt->SFImageClass._class, 0, priv->js_obj);
 		break;
@@ -4066,8 +4220,10 @@
 	case GF_SG_VRML_MFVEC2F:
 	{
 		MFVec2f *f = (MFVec2f *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFVec2fClass, priv->js_obj);
-		SETUP_MF_FIELD
+		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);
@@ -4080,8 +4236,10 @@
 	case GF_SG_VRML_MFVEC3F:
 	{
 		MFVec3f *f = (MFVec3f *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFVec3fClass, priv->js_obj);
-		SETUP_MF_FIELD
+		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);
@@ -4094,8 +4252,10 @@
 	case GF_SG_VRML_MFROTATION:
 	{
 		MFRotation *f = (MFRotation*) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFRotationClass, priv->js_obj);
-		SETUP_MF_FIELD
+		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);
@@ -4108,8 +4268,10 @@
 	case GF_SG_VRML_MFCOLOR:
 	{
 		MFColor *f = (MFColor *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFColorClass, priv->js_obj);
-		SETUP_MF_FIELD
+		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);
@@ -4163,9 +4325,9 @@
 	}
 
 	//not supported
-    default:
+	default:
 		return JSVAL_NULL;
-    }
+	}
 
 	if (!obj) return JSVAL_NULL;
 	//store field associated with object if needed
@@ -4266,7 +4428,7 @@
 
 	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 
+	/*"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))
@@ -4275,7 +4437,7 @@
 #endif
 
 	gf_sg_lock_javascript(priv->js_ctx, 1);
-	
+
 	if (priv->event) gf_js_remove_root(priv->js_ctx, &priv->event, GF_JSGC_OBJECT);
 
 	/*unprotect all cached objects from GC*/
@@ -4311,7 +4473,7 @@
 	GF_FieldInfo info;
 	jsval val;
 
-    i=0;
+	i=0;
 	while ((sf = gf_list_enum(priv->fields, &i))) {
 
 		switch (sf->eventType) {
@@ -4331,7 +4493,7 @@
 			JS_DefineProperty(priv->js_ctx, priv->js_obj, (const char *) sf->name, val, 0, 0, JSPROP_PERMANENT);
 			break;
 		}
-    }
+	}
 }
 
 void gf_js_vrml_flush_event_out(GF_Node *node, GF_ScriptPriv *priv)
@@ -4385,7 +4547,7 @@
 
 	//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 ){
+	        !JS_GetPropertyAttributes(priv->js_ctx, priv->js_obj, sf->name, &attr, &found) || found != JS_TRUE ) {
 		gf_sg_lock_javascript(priv->js_ctx, 0);
 		return;
 	}
@@ -4419,20 +4581,18 @@
 
 	gf_js_vrml_flush_event_out(node, priv);
 
-#ifdef FORCE_GC
-	MyJSGC(priv->js_ctx);
-#endif
+	do_js_gc(priv->js_ctx, node);
 }
 
 
-static Bool vrml_js_load_script(M_Script *script, char *file, Bool primary_script)
+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 rval, fval;
+	jsval fval;
 	GF_ScriptPriv *priv = (GF_ScriptPriv *) script->sgprivate->UserPrivate;
 	uintN attr;
 	JSBool found;
@@ -4448,22 +4608,23 @@
 	fclose(jsf);
 	jsscript[fsize] = 0;
 
-	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, jsscript, (u32) (sizeof(char)*fsize), 0, 0, &rval);
+	*rval = JSVAL_NULL;
+	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, jsscript, (u32) (sizeof(char)*fsize), 0, 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);
+	        && 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)
+Bool JSScriptFromFile(GF_Node *node, const char *opt_file, Bool no_complain, jsval *rval)
 {
 	GF_JSAPIParam par;
 	u32 i;
@@ -4471,10 +4632,10 @@
 	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);
@@ -4503,7 +4664,7 @@
 		}
 
 		if (!strstr(url, "://") || !strnicmp(url, "file://", 7)) {
-			Bool res = vrml_js_load_script(script, url, opt_file ? 0 : 1);
+			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;
@@ -4513,7 +4674,7 @@
 				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))
+					if (!vrml_js_load_script(script, (char *) szCache, opt_file ? 0 : 1, rval))
 						e = GF_SCRIPT_ERROR;
 				}
 				gf_dm_sess_del(sess);
@@ -4595,30 +4756,26 @@
 	priv->JS_EventIn = JS_EventIn;
 
 	if (!local_script) {
-		JSScriptFromFile(node, NULL, 0);
+		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));
 
-#if 1
 	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_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_js_vrml_flush_event_out(node, priv);
 	}
-#endif
 
 	gf_sg_lock_javascript(priv->js_ctx, 0);
 
-#ifdef FORCE_GC
-	MyJSGC(priv->js_ctx);
-#endif
+	do_js_gc(priv->js_ctx, node);
 }
 
 static void JSScript_Load(GF_Node *node)
@@ -4669,16 +4826,16 @@
 
 	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 ((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) 
+				if (sg->svg_js->in_script)
 					sg->svg_js->force_gc = 1;
 				else
 				{
@@ -4953,7 +5110,7 @@
 
 #endif /* GPAC_HAS_SPIDERMONKEY */
 
-GF_Err gf_scene_execute_script(GF_SceneGraph *sg, const char *com) 
+GF_Err gf_scene_execute_script(GF_SceneGraph *sg, const char *com)
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
 	u32 tag;

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/vrml_tools.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/vrml_tools.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -42,17 +42,17 @@
 	else if (tag<=GF_NODE_RANGE_LAST_MPEG4) {
 #ifndef GPAC_DISABLE_BIFS
 		u32 i;
-		for (i=0;i<GF_BIFS_LAST_VERSION; i++) {
+		for (i=0; i<GF_BIFS_LAST_VERSION; i++) {
 			if (gf_bifs_get_node_type(NDTType, tag, i+1)) return 1;
 		}
 		return 0;
 #else
-		/*if BIFS is disabled, we don't have the NDTs - we therefore allow any node in any table otherwise we would reject 
+		/*if BIFS is disabled, we don't have the NDTs - we therefore allow any node in any table otherwise we would reject
 		them all*/
 		return 1;
 #endif
 
-	} 
+	}
 #ifndef GPAC_DISABLE_X3D
 	else if (tag<=GF_NODE_RANGE_LAST_X3D) {
 		return gf_x3d_get_node_type(NDTType, tag);
@@ -181,7 +181,7 @@
 }
 
 
-u32 gf_sg_get_next_available_route_id(GF_SceneGraph *sg) 
+u32 gf_sg_get_next_available_route_id(GF_SceneGraph *sg)
 {
 	u32 i, count;
 	u32 ID = 0;
@@ -205,7 +205,7 @@
 	sg->max_defined_route_id = MAX(sg->max_defined_route_id, ID);
 }
 
-u32 gf_sg_get_next_available_proto_id(GF_SceneGraph *sg) 
+u32 gf_sg_get_next_available_proto_id(GF_SceneGraph *sg)
 {
 	u32 i, count;
 	u32 ID = 0;
@@ -236,7 +236,7 @@
 }
 
 /*for V4Studio...*/
-GF_Err gf_node_remove_child(GF_Node *parent, GF_Node *toremove_child) 
+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;
 	/*V4Studio doesn't handle DEF/USE properly yet...*/
@@ -476,74 +476,135 @@
 	return tmp;
 }
 
-void *gf_sg_vrml_field_pointer_new(u32 FieldType) 
+void *gf_sg_vrml_field_pointer_new(u32 FieldType)
 {
 	switch (FieldType) {
-	case GF_SG_VRML_SFBOOL: return NewSFBool();
-	case GF_SG_VRML_SFFLOAT: return NewSFFloat();
-	case GF_SG_VRML_SFDOUBLE: return NewSFDouble();
-	case GF_SG_VRML_SFTIME: return NewSFTime();
-	case GF_SG_VRML_SFINT32: return NewSFInt32();
-	case GF_SG_VRML_SFSTRING: return NewSFString();
-	case GF_SG_VRML_SFVEC3F: return NewSFVec3f();
-	case GF_SG_VRML_SFVEC2F: return NewSFVec2f();
-	case GF_SG_VRML_SFVEC3D: return NewSFVec3d();
-	case GF_SG_VRML_SFVEC2D: return NewSFVec2d();
-	case GF_SG_VRML_SFCOLOR: return NewSFColor();
-	case GF_SG_VRML_SFCOLORRGBA: return NewSFColorRGBA();
-	case GF_SG_VRML_SFROTATION: return NewSFRotation();
-	case GF_SG_VRML_SFIMAGE: return NewSFImage();
-	case GF_SG_VRML_SFATTRREF: return NewSFAttrRef();
-	case GF_SG_VRML_MFBOOL: return NewMFBool();
-	case GF_SG_VRML_MFFLOAT: return NewMFFloat();
-	case GF_SG_VRML_MFTIME: return NewMFTime();
-	case GF_SG_VRML_MFINT32: return NewMFInt32();
-	case GF_SG_VRML_MFSTRING: return NewMFString();
-	case GF_SG_VRML_MFVEC3F: return NewMFVec3f();
-	case GF_SG_VRML_MFVEC2F: return NewMFVec2f();
-	case GF_SG_VRML_MFVEC3D: return NewMFVec3d();
-	case GF_SG_VRML_MFVEC2D: return NewMFVec2d();
-	case GF_SG_VRML_MFCOLOR: return NewMFColor();
-	case GF_SG_VRML_MFCOLORRGBA: return NewMFColorRGBA();
+	case GF_SG_VRML_SFBOOL:
+		return NewSFBool();
+	case GF_SG_VRML_SFFLOAT:
+		return NewSFFloat();
+	case GF_SG_VRML_SFDOUBLE:
+		return NewSFDouble();
+	case GF_SG_VRML_SFTIME:
+		return NewSFTime();
+	case GF_SG_VRML_SFINT32:
+		return NewSFInt32();
+	case GF_SG_VRML_SFSTRING:
+		return NewSFString();
+	case GF_SG_VRML_SFVEC3F:
+		return NewSFVec3f();
+	case GF_SG_VRML_SFVEC2F:
+		return NewSFVec2f();
+	case GF_SG_VRML_SFVEC3D:
+		return NewSFVec3d();
+	case GF_SG_VRML_SFVEC2D:
+		return NewSFVec2d();
+	case GF_SG_VRML_SFCOLOR:
+		return NewSFColor();
+	case GF_SG_VRML_SFCOLORRGBA:
+		return NewSFColorRGBA();
+	case GF_SG_VRML_SFROTATION:
+		return NewSFRotation();
+	case GF_SG_VRML_SFIMAGE:
+		return NewSFImage();
+	case GF_SG_VRML_SFATTRREF:
+		return NewSFAttrRef();
+	case GF_SG_VRML_MFBOOL:
+		return NewMFBool();
+	case GF_SG_VRML_MFFLOAT:
+		return NewMFFloat();
+	case GF_SG_VRML_MFTIME:
+		return NewMFTime();
+	case GF_SG_VRML_MFINT32:
+		return NewMFInt32();
+	case GF_SG_VRML_MFSTRING:
+		return NewMFString();
+	case GF_SG_VRML_MFVEC3F:
+		return NewMFVec3f();
+	case GF_SG_VRML_MFVEC2F:
+		return NewMFVec2f();
+	case GF_SG_VRML_MFVEC3D:
+		return NewMFVec3d();
+	case GF_SG_VRML_MFVEC2D:
+		return NewMFVec2d();
+	case GF_SG_VRML_MFCOLOR:
+		return NewMFColor();
+	case GF_SG_VRML_MFCOLORRGBA:
+		return NewMFColorRGBA();
 	case GF_SG_VRML_MFROTATION:
 	case GF_SG_VRML_MFVEC4F:
 		return NewMFRotation();
-	case GF_SG_VRML_MFATTRREF: return NewMFAttrRef();
+	case GF_SG_VRML_MFATTRREF:
+		return NewMFAttrRef();
 
 	//used in commands
 	case GF_SG_VRML_SFCOMMANDBUFFER:
 		return NewSFCommandBuffer();
 
-	case GF_SG_VRML_SFURL: 
+	case GF_SG_VRML_SFURL:
 		return NewSFURL();
 	case GF_SG_VRML_MFURL:
 		return NewMFURL();
 
-	case GF_SG_VRML_SFSCRIPT: 
+	case GF_SG_VRML_SFSCRIPT:
 		return NewSFScript();
-	case GF_SG_VRML_MFSCRIPT: 
+	case GF_SG_VRML_MFSCRIPT:
 		return NewMFScript();
 	}
 	return NULL;
 }
 
-void gf_sg_mfint32_del(MFInt32 par) { gf_free(par.vals); }
-void gf_sg_mffloat_del(MFFloat par) { gf_free(par.vals); }
-void gf_sg_mfdouble_del(MFDouble par) { gf_free(par.vals); }
-void gf_sg_mfbool_del(MFBool par) { gf_free(par.vals); }
-void gf_sg_mfcolor_del(MFColor par) { gf_free(par.vals); }
-void gf_sg_mfcolor_rgba_del(MFColorRGBA par) { gf_free(par.vals); }
-void gf_sg_mfrotation_del(MFRotation par) { gf_free(par.vals); }
-void gf_sg_mftime_del(MFTime par) { gf_free(par.vals); }
-void gf_sg_mfvec2f_del(MFVec2f par) { gf_free(par.vals); }
-void gf_sg_mfvec2d_del(MFVec2d par) { gf_free(par.vals); }
-void gf_sg_mfvec3f_del(MFVec3f par) { gf_free(par.vals); }
-void gf_sg_mfvec3d_del(MFVec3d par) { gf_free(par.vals); }
-void gf_sg_mfvec4f_del(MFVec4f par) { gf_free(par.vals); }
-void gf_sg_mfattrref_del(MFAttrRef par) { gf_free(par.vals); }
-void gf_sg_sfimage_del(SFImage im) { gf_free(im.pixels); }
-void gf_sg_sfstring_del(SFString par) { if (par.buffer) gf_free(par.buffer); }
-void gf_sg_sfscript_del(SFScript par) { if (par.script_text) gf_free(par.script_text); }
+void gf_sg_mfint32_del(MFInt32 par) {
+	gf_free(par.vals);
+}
+void gf_sg_mffloat_del(MFFloat par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfdouble_del(MFDouble par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfbool_del(MFBool par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfcolor_del(MFColor par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfcolor_rgba_del(MFColorRGBA par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfrotation_del(MFRotation par) {
+	gf_free(par.vals);
+}
+void gf_sg_mftime_del(MFTime par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfvec2f_del(MFVec2f par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfvec2d_del(MFVec2d par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfvec3f_del(MFVec3f par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfvec3d_del(MFVec3d par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfvec4f_del(MFVec4f par) {
+	gf_free(par.vals);
+}
+void gf_sg_mfattrref_del(MFAttrRef par) {
+	gf_free(par.vals);
+}
+void gf_sg_sfimage_del(SFImage im) {
+	gf_free(im.pixels);
+}
+void gf_sg_sfstring_del(SFString par) {
+	if (par.buffer) gf_free(par.buffer);
+}
+void gf_sg_sfscript_del(SFScript par) {
+	if (par.script_text) gf_free(par.script_text);
+}
 
 
 void gf_sg_sfcommand_del(SFCommandBuffer cb)
@@ -557,15 +618,15 @@
 	if (cb.buffer) gf_free(cb.buffer);
 }
 
-void gf_sg_vrml_field_pointer_del(void *field, u32 FieldType) 
+void gf_sg_vrml_field_pointer_del(void *field, u32 FieldType)
 {
 	GF_Node *node;
 
 	switch (FieldType) {
-	case GF_SG_VRML_SFBOOL: 
+	case GF_SG_VRML_SFBOOL:
 	case GF_SG_VRML_SFFLOAT:
 	case GF_SG_VRML_SFDOUBLE:
-	case GF_SG_VRML_SFTIME: 
+	case GF_SG_VRML_SFTIME:
 	case GF_SG_VRML_SFINT32:
 	case GF_SG_VRML_SFVEC3F:
 	case GF_SG_VRML_SFVEC3D:
@@ -583,24 +644,24 @@
 		gf_sg_sfimage_del(* ((SFImage *)field));
 		break;
 
-	case GF_SG_VRML_SFNODE: 
+	case GF_SG_VRML_SFNODE:
 		node = *(GF_Node **) field;
 		if (node) gf_node_del(node);
 		return;
 	case GF_SG_VRML_SFCOMMANDBUFFER:
 		gf_sg_sfcommand_del(*(SFCommandBuffer *)field);
 		break;
-	
+
 	case GF_SG_VRML_MFBOOL:
 		gf_sg_mfbool_del( * ((MFBool *) field));
 		break;
-	case GF_SG_VRML_MFFLOAT: 
+	case GF_SG_VRML_MFFLOAT:
 		gf_sg_mffloat_del( * ((MFFloat *) field));
 		break;
-	case GF_SG_VRML_MFDOUBLE: 
+	case GF_SG_VRML_MFDOUBLE:
 		gf_sg_mfdouble_del( * ((MFDouble *) field));
 		break;
-	case GF_SG_VRML_MFTIME: 
+	case GF_SG_VRML_MFTIME:
 		gf_sg_mftime_del( * ((MFTime *)field));
 		break;
 	case GF_SG_VRML_MFINT32:
@@ -636,17 +697,17 @@
 		break;
 	case GF_SG_VRML_MFURL:
 		gf_sg_mfurl_del( * ((MFURL *) field));
-		break;		
+		break;
 	case GF_SG_VRML_MFATTRREF:
 		gf_sg_mfattrref_del( * ((MFAttrRef *) field));
-		break;		
+		break;
 	//used only in proto since this field is created by default for regular nodes
-	case GF_SG_VRML_MFNODE: 
+	case GF_SG_VRML_MFNODE:
 		assert(0);
 		return;
 	case GF_SG_VRML_MFSCRIPT:
 		gf_sg_mfscript_del( * ((MFScript *) field));
-		break;		
+		break;
 
 	default:
 		assert(0);
@@ -664,11 +725,16 @@
 const char *gf_sg_vrml_get_event_type_name(u32 EventType, Bool forX3D)
 {
 	switch (EventType) {
-	case GF_SG_EVENT_IN: return forX3D ? "inputOnly" : "eventIn";
-	case GF_SG_EVENT_FIELD: return forX3D ? "initializeOnly" : "field";
-	case GF_SG_EVENT_EXPOSED_FIELD: return forX3D ? "inputOutput" : "exposedField";
-	case GF_SG_EVENT_OUT: return forX3D ? "outputOnly" : "eventOut";
-	default: return "unknownEvent";
+	case GF_SG_EVENT_IN:
+		return forX3D ? "inputOnly" : "eventIn";
+	case GF_SG_EVENT_FIELD:
+		return forX3D ? "initializeOnly" : "field";
+	case GF_SG_EVENT_EXPOSED_FIELD:
+		return forX3D ? "inputOutput" : "exposedField";
+	case GF_SG_EVENT_OUT:
+		return forX3D ? "outputOnly" : "eventOut";
+	default:
+		return "unknownEvent";
 	}
 }
 
@@ -677,46 +743,86 @@
 {
 
 	switch (FieldType) {
-	case GF_SG_VRML_SFBOOL: return "SFBool";
-	case GF_SG_VRML_SFFLOAT: return "SFFloat";
-	case GF_SG_VRML_SFDOUBLE: return "SFDouble";
-	case GF_SG_VRML_SFTIME: return "SFTime";
-	case GF_SG_VRML_SFINT32: return "SFInt32";
-	case GF_SG_VRML_SFSTRING: return "SFString";
-	case GF_SG_VRML_SFVEC3F: return "SFVec3f";
-	case GF_SG_VRML_SFVEC2F: return "SFVec2f";
-	case GF_SG_VRML_SFVEC3D: return "SFVec3d";
-	case GF_SG_VRML_SFVEC2D: return "SFVec2d";
-	case GF_SG_VRML_SFCOLOR: return "SFColor";
-	case GF_SG_VRML_SFCOLORRGBA: return "SFColorRGBA";
-	case GF_SG_VRML_SFROTATION: return "SFRotation";
-	case GF_SG_VRML_SFIMAGE: return "SFImage";
-	case GF_SG_VRML_SFNODE: return "SFNode";
-	case GF_SG_VRML_SFVEC4F: return "SFVec4f";
-	case GF_SG_VRML_SFATTRREF: return "SFAttrRef";
-	case GF_SG_VRML_MFBOOL: return "MFBool";
-	case GF_SG_VRML_MFFLOAT: return "MFFloat";
-	case GF_SG_VRML_MFDOUBLE: return "MFDouble";
-	case GF_SG_VRML_MFTIME: return "MFTime";
-	case GF_SG_VRML_MFINT32: return "MFInt32";
-	case GF_SG_VRML_MFSTRING: return "MFString";
-	case GF_SG_VRML_MFVEC3F: return "MFVec3f";
-	case GF_SG_VRML_MFVEC2F: return "MFVec2f";
-	case GF_SG_VRML_MFVEC3D: return "MFVec3d";
-	case GF_SG_VRML_MFVEC2D: return "MFVec2d";
-	case GF_SG_VRML_MFCOLOR: return "MFColor";
-	case GF_SG_VRML_MFCOLORRGBA: return "MFColorRGBA";
-	case GF_SG_VRML_MFROTATION: return "MFRotation";
-	case GF_SG_VRML_MFIMAGE: return "MFImage";
-	case GF_SG_VRML_MFNODE: return "MFNode";
-	case GF_SG_VRML_MFVEC4F: return "MFVec4f";
-	case GF_SG_VRML_SFURL: return "SFURL";
-	case GF_SG_VRML_MFURL: return "MFURL";
-	case GF_SG_VRML_MFATTRREF: return "MFAttrRef";
-	case GF_SG_VRML_SFCOMMANDBUFFER: return "SFCommandBuffer";
-	case GF_SG_VRML_SFSCRIPT: return "SFScript";
-	case GF_SG_VRML_MFSCRIPT: return "MFScript";
-	default: return "UnknownType";
+	case GF_SG_VRML_SFBOOL:
+		return "SFBool";
+	case GF_SG_VRML_SFFLOAT:
+		return "SFFloat";
+	case GF_SG_VRML_SFDOUBLE:
+		return "SFDouble";
+	case GF_SG_VRML_SFTIME:
+		return "SFTime";
+	case GF_SG_VRML_SFINT32:
+		return "SFInt32";
+	case GF_SG_VRML_SFSTRING:
+		return "SFString";
+	case GF_SG_VRML_SFVEC3F:
+		return "SFVec3f";
+	case GF_SG_VRML_SFVEC2F:
+		return "SFVec2f";
+	case GF_SG_VRML_SFVEC3D:
+		return "SFVec3d";
+	case GF_SG_VRML_SFVEC2D:
+		return "SFVec2d";
+	case GF_SG_VRML_SFCOLOR:
+		return "SFColor";
+	case GF_SG_VRML_SFCOLORRGBA:
+		return "SFColorRGBA";
+	case GF_SG_VRML_SFROTATION:
+		return "SFRotation";
+	case GF_SG_VRML_SFIMAGE:
+		return "SFImage";
+	case GF_SG_VRML_SFNODE:
+		return "SFNode";
+	case GF_SG_VRML_SFVEC4F:
+		return "SFVec4f";
+	case GF_SG_VRML_SFATTRREF:
+		return "SFAttrRef";
+	case GF_SG_VRML_MFBOOL:
+		return "MFBool";
+	case GF_SG_VRML_MFFLOAT:
+		return "MFFloat";
+	case GF_SG_VRML_MFDOUBLE:
+		return "MFDouble";
+	case GF_SG_VRML_MFTIME:
+		return "MFTime";
+	case GF_SG_VRML_MFINT32:
+		return "MFInt32";
+	case GF_SG_VRML_MFSTRING:
+		return "MFString";
+	case GF_SG_VRML_MFVEC3F:
+		return "MFVec3f";
+	case GF_SG_VRML_MFVEC2F:
+		return "MFVec2f";
+	case GF_SG_VRML_MFVEC3D:
+		return "MFVec3d";
+	case GF_SG_VRML_MFVEC2D:
+		return "MFVec2d";
+	case GF_SG_VRML_MFCOLOR:
+		return "MFColor";
+	case GF_SG_VRML_MFCOLORRGBA:
+		return "MFColorRGBA";
+	case GF_SG_VRML_MFROTATION:
+		return "MFRotation";
+	case GF_SG_VRML_MFIMAGE:
+		return "MFImage";
+	case GF_SG_VRML_MFNODE:
+		return "MFNode";
+	case GF_SG_VRML_MFVEC4F:
+		return "MFVec4f";
+	case GF_SG_VRML_SFURL:
+		return "SFURL";
+	case GF_SG_VRML_MFURL:
+		return "MFURL";
+	case GF_SG_VRML_MFATTRREF:
+		return "MFAttrRef";
+	case GF_SG_VRML_SFCOMMANDBUFFER:
+		return "SFCommandBuffer";
+	case GF_SG_VRML_SFSCRIPT:
+		return "SFScript";
+	case GF_SG_VRML_MFSCRIPT:
+		return "MFScript";
+	default:
+		return "UnknownType";
 	}
 }
 
@@ -761,7 +867,9 @@
 
 #endif
 
-void gf_sg_sfurl_del(SFURL url) { if (url.url) gf_free(url.url); }
+void gf_sg_sfurl_del(SFURL url) {
+	if (url.url) gf_free(url.url);
+}
 
 GF_EXPORT
 Bool gf_sg_vrml_is_sf_field(u32 FieldType)
@@ -934,7 +1042,7 @@
 }
 
 //
-//	Insert (+alloc) an MFField with a specified position for insertion and sets the ptr to the 
+//	Insert (+alloc) an MFField with a specified position for insertion and sets the ptr to the
 //	newly created slot
 //	!! Doesnt work for MFNodes
 //	InsertAt is the 0-based index for the new slot
@@ -948,10 +1056,10 @@
 	if (FieldType == GF_SG_VRML_MFNODE) return GF_BAD_PARAM;
 
 	FieldSize = gf_sg_vrml_get_sf_size(FieldType);
-	
+
 	//field we can't copy
 	if (!FieldSize) return GF_BAD_PARAM;
-	
+
 	//first item ever
 	if (!mffield->count || !mffield->array) {
 		if (mffield->array) gf_free(mffield->array);
@@ -1035,7 +1143,7 @@
 	if (FieldType == GF_SG_VRML_MFNODE) return GF_BAD_PARAM;
 
 	FieldSize = gf_sg_vrml_get_sf_size(FieldType);
-	
+
 	//field we can't copy
 	if (!FieldSize) return GF_BAD_PARAM;
 	if (NbItems>MAX_MFFIELD_ALLOC) return GF_IO_ERR;
@@ -1061,7 +1169,7 @@
 	if (FieldType == GF_SG_VRML_MFNODE) return GF_BAD_PARAM;
 
 	FieldSize = gf_sg_vrml_get_sf_size(FieldType);
-	
+
 	//field we can't copy
 	if (!FieldSize) return GF_BAD_PARAM;
 	if (ItemPos >= mffield->count) return GF_BAD_PARAM;
@@ -1086,7 +1194,7 @@
 	GenMFField *mffield = (GenMFField *)mf;
 
 	FieldSize = gf_sg_vrml_get_sf_size(FieldType);
-	
+
 	//field we can't copy
 	if (!FieldSize) return GF_BAD_PARAM;
 
@@ -1122,7 +1230,7 @@
 	u32 size, i, sf_type_ori, sf_type_dst;
 	void *dst_field, *orig_field;
 	if (!dest || !orig) return;
-	
+
 	switch (dst_field_type) {
 	case GF_SG_VRML_SFSTRING:
 		if (ori_field_type == GF_SG_VRML_SFURL) {
@@ -1147,9 +1255,9 @@
 		url = ((SFURL *)dest);
 		url->OD_ID = 0;
 		if (url->url) gf_free(url->url);
-		if ( ((SFString*)orig)->buffer) 
+		if ( ((SFString*)orig)->buffer)
 			url->url = gf_strdup(((SFString*)orig)->buffer);
-		else 
+		else
 			url->url = NULL;
 		return;
 	case GF_SG_VRML_MFSTRING:
@@ -1228,7 +1336,7 @@
 	case GF_SG_VRML_SFURL:
 		if ( ((SFURL *)dest)->url ) gf_free( ((SFURL *)dest)->url );
 		((SFURL *)dest)->OD_ID = ((SFURL *)orig)->OD_ID;
-		if (((SFURL *)orig)->url) 
+		if (((SFURL *)orig)->url)
 			((SFURL *)dest)->url = gf_strdup(((SFURL *)orig)->url);
 		else
 			((SFURL *)dest)->url = NULL;
@@ -1257,18 +1365,18 @@
 			cb_dst->buffer = NULL;
 			/*clone command list*/
 			c2 = gf_list_count(cb_src->commandList);
-			for (j=0; j<c2;j++) {
+			for (j=0; j<c2; j++) {
 				GF_Command *sub_com = (GF_Command *)gf_list_get(cb_src->commandList, j);
 				GF_Command *new_com = gf_sg_vrml_command_clone(sub_com, inScene, 0);
 				gf_list_add(cb_dst->commandList, new_com);
 			}
 		}
 	}
-		break;
+	break;
 
 	/*simply copy text string*/
 	case GF_SG_VRML_SFSCRIPT:
-		if (((SFScript*)dest)->script_text) gf_free(((SFScript*)dest)->script_text);		
+		if (((SFScript*)dest)->script_text) gf_free(((SFScript*)dest)->script_text);
 		((SFScript*)dest)->script_text = NULL;
 		if ( ((SFScript*)orig)->script_text)
 			((SFScript *)dest)->script_text = (char *)gf_strdup( (char*) ((SFScript*)orig)->script_text );
@@ -1437,9 +1545,9 @@
 	if (Node->sgprivate->tag == TAG_ProtoNode) return gf_sg_proto_get_num_fields(Node, IndexMode);
 	else if ((Node->sgprivate->tag == TAG_MPEG4_Script)
 #ifndef GPAC_DISABLE_X3D
-		|| (Node->sgprivate->tag == TAG_X3D_Script)
+	         || (Node->sgprivate->tag == TAG_X3D_Script)
 #endif
-	)
+	        )
 		return gf_sg_script_get_num_fields(Node, IndexMode);
 	else if (Node->sgprivate->tag <= GF_NODE_RANGE_LAST_MPEG4) return gf_sg_mpeg4_node_get_field_count(Node, IndexMode);
 #ifndef GPAC_DISABLE_X3D
@@ -1481,31 +1589,31 @@
 Bool gf_sg_vrml_node_init(GF_Node *node)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_MPEG4_ColorInterpolator: 
+	case TAG_MPEG4_ColorInterpolator:
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_ColorInterpolator:
 #endif
 		return InitColorInterpolator((M_ColorInterpolator *)node);
-	case TAG_MPEG4_CoordinateInterpolator: 
+	case TAG_MPEG4_CoordinateInterpolator:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_CoordinateInterpolator: 
+	case TAG_X3D_CoordinateInterpolator:
 #endif
 		return InitCoordinateInterpolator((M_CoordinateInterpolator *)node);
-	case TAG_MPEG4_CoordinateInterpolator2D: 
+	case TAG_MPEG4_CoordinateInterpolator2D:
 		return InitCoordinateInterpolator2D((M_CoordinateInterpolator2D *)node);
-	case TAG_MPEG4_NormalInterpolator: 
+	case TAG_MPEG4_NormalInterpolator:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_NormalInterpolator: 
+	case TAG_X3D_NormalInterpolator:
 #endif
 		return InitNormalInterpolator((M_NormalInterpolator*)node);
-	case TAG_MPEG4_OrientationInterpolator: 
+	case TAG_MPEG4_OrientationInterpolator:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_OrientationInterpolator: 
+	case TAG_X3D_OrientationInterpolator:
 #endif
 		return InitOrientationInterpolator((M_OrientationInterpolator*)node);
-	case TAG_MPEG4_PositionInterpolator: 
+	case TAG_MPEG4_PositionInterpolator:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_PositionInterpolator: 
+	case TAG_X3D_PositionInterpolator:
 #endif
 		return InitPositionInterpolator((M_PositionInterpolator *)node);
 	case TAG_MPEG4_PositionInterpolator2D:
@@ -1513,37 +1621,54 @@
 	case TAG_X3D_PositionInterpolator2D:
 #endif
 		return InitPositionInterpolator2D((M_PositionInterpolator2D *)node);
-	case TAG_MPEG4_ScalarInterpolator: 
+	case TAG_MPEG4_ScalarInterpolator:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_ScalarInterpolator: 
+	case TAG_X3D_ScalarInterpolator:
 #endif
 		return InitScalarInterpolator((M_ScalarInterpolator *)node);
 	case TAG_MPEG4_Valuator:
 		return InitValuator((M_Valuator *)node);
-	case TAG_MPEG4_PositionAnimator: 
-		PA_Init(node); return 1;
-	case TAG_MPEG4_PositionAnimator2D: 
-		PA2D_Init(node); return 1;
-	case TAG_MPEG4_ScalarAnimator: 
-		SA_Init(node); return 1;
-	case TAG_MPEG4_PositionInterpolator4D: 
+	case TAG_MPEG4_PositionAnimator:
+		PA_Init(node);
+		return 1;
+	case TAG_MPEG4_PositionAnimator2D:
+		PA2D_Init(node);
+		return 1;
+	case TAG_MPEG4_ScalarAnimator:
+		SA_Init(node);
+		return 1;
+	case TAG_MPEG4_PositionInterpolator4D:
 		return InitPositionInterpolator4D((M_PositionInterpolator4D *)node);
-	case TAG_MPEG4_CoordinateInterpolator4D: 
+	case TAG_MPEG4_CoordinateInterpolator4D:
 		return InitCoordinateInterpolator4D((M_CoordinateInterpolator4D *)node);
-	case TAG_MPEG4_Script: 
+	case TAG_MPEG4_Script:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Script: 
+	case TAG_X3D_Script:
 #endif
 		return 1;
 
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_BooleanFilter: InitBooleanFilter(node); return 1;
-	case TAG_X3D_BooleanSequencer: InitBooleanSequencer(node); return 1;
-	case TAG_X3D_BooleanToggle: InitBooleanToggle(node); return 1;
-	case TAG_X3D_BooleanTrigger: InitBooleanTrigger(node); return 1;
-	case TAG_X3D_IntegerSequencer: InitIntegerSequencer(node); return 1;
-	case TAG_X3D_IntegerTrigger: InitIntegerTrigger(node); return 1;
-	case TAG_X3D_TimeTrigger: InitTimeTrigger(node); return 1;
+	case TAG_X3D_BooleanFilter:
+		InitBooleanFilter(node);
+		return 1;
+	case TAG_X3D_BooleanSequencer:
+		InitBooleanSequencer(node);
+		return 1;
+	case TAG_X3D_BooleanToggle:
+		InitBooleanToggle(node);
+		return 1;
+	case TAG_X3D_BooleanTrigger:
+		InitBooleanTrigger(node);
+		return 1;
+	case TAG_X3D_IntegerSequencer:
+		InitIntegerSequencer(node);
+		return 1;
+	case TAG_X3D_IntegerTrigger:
+		InitIntegerTrigger(node);
+		return 1;
+	case TAG_X3D_TimeTrigger:
+		InitTimeTrigger(node);
+		return 1;
 #endif
 	}
 	return 0;
@@ -1555,25 +1680,25 @@
 	case TAG_ProtoNode:
 		/*hardcoded protos need modification notifs*/
 		if (node->sgprivate->UserCallback) return 0;
-	case TAG_MPEG4_ColorInterpolator: 
-	case TAG_MPEG4_CoordinateInterpolator: 
-	case TAG_MPEG4_CoordinateInterpolator2D: 
-	case TAG_MPEG4_NormalInterpolator: 
-	case TAG_MPEG4_OrientationInterpolator: 
-	case TAG_MPEG4_PositionInterpolator: 
-	case TAG_MPEG4_PositionInterpolator2D: 
-	case TAG_MPEG4_ScalarInterpolator: 
+	case TAG_MPEG4_ColorInterpolator:
+	case TAG_MPEG4_CoordinateInterpolator:
+	case TAG_MPEG4_CoordinateInterpolator2D:
+	case TAG_MPEG4_NormalInterpolator:
+	case TAG_MPEG4_OrientationInterpolator:
+	case TAG_MPEG4_PositionInterpolator:
+	case TAG_MPEG4_PositionInterpolator2D:
+	case TAG_MPEG4_ScalarInterpolator:
 	case TAG_MPEG4_Valuator:
 	case TAG_MPEG4_PositionInterpolator4D:
 	case TAG_MPEG4_CoordinateInterpolator4D:
 	case TAG_MPEG4_Script:
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_ColorInterpolator:
-	case TAG_X3D_CoordinateInterpolator: 
-	case TAG_X3D_NormalInterpolator: 
-	case TAG_X3D_OrientationInterpolator: 
-	case TAG_X3D_PositionInterpolator: 
-	case TAG_X3D_ScalarInterpolator: 
+	case TAG_X3D_CoordinateInterpolator:
+	case TAG_X3D_NormalInterpolator:
+	case TAG_X3D_OrientationInterpolator:
+	case TAG_X3D_PositionInterpolator:
+	case TAG_X3D_ScalarInterpolator:
 	case TAG_X3D_Script:
 	case TAG_X3D_BooleanFilter:
 	case TAG_X3D_BooleanSequencer:
@@ -1584,9 +1709,15 @@
 	case TAG_X3D_TimeTrigger:
 #endif
 		return 1;
-	case TAG_MPEG4_PositionAnimator: PA_Modified(node, field); return 1;
-	case TAG_MPEG4_PositionAnimator2D: PA2D_Modified(node, field); return 1;
-	case TAG_MPEG4_ScalarAnimator: SA_Modified(node, field); return 1;
+	case TAG_MPEG4_PositionAnimator:
+		PA_Modified(node, field);
+		return 1;
+	case TAG_MPEG4_PositionAnimator2D:
+		PA2D_Modified(node, field);
+		return 1;
+	case TAG_MPEG4_ScalarAnimator:
+		SA_Modified(node, field);
+		return 1;
 	}
 	return 0;
 }

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/webvtt_smjs.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/webvtt_smjs.c Changed

@@ -32,18 +32,18 @@
 
 #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_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) ) {
@@ -76,7 +76,7 @@
 	return e;
 }
 
-GF_EXPORT 
+GF_EXPORT
 GF_Err gf_webvtt_js_removeCues(GF_Node *node)
 {
 	GF_Err e;
@@ -84,7 +84,7 @@
 	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) ) {
@@ -110,16 +110,16 @@
 }
 
 #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)
+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_EXPORT
 GF_Err gf_webvtt_js_removeCues()
 {
 	return GF_BAD_PARAM;

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/x3d_nodes.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/x3d_nodes.c Changed

@@ -15,7 +15,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
@@ -50,8 +50,8 @@
 	gf_sg_sfstring_del(p->description);
 	gf_sg_mfstring_del(p->parameter);
 	gf_sg_mfurl_del(p->url);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -128,7 +128,7 @@
 	if (!strcmp("url", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *Anchor_Create()
@@ -151,12 +151,12 @@
 static void Appearance_Del(GF_Node *node)
 {
 	X_Appearance *p = (X_Appearance *) node;
-	gf_node_unregister((GF_Node *) p->material, node);	
-	gf_node_unregister((GF_Node *) p->texture, node);	
-	gf_node_unregister((GF_Node *) p->textureTransform, node);	
-	gf_node_unregister((GF_Node *) p->fillProperties, node);	
-	gf_node_unregister((GF_Node *) p->lineProperties, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->material, node);
+	gf_node_unregister((GF_Node *) p->texture, node);
+	gf_node_unregister((GF_Node *) p->textureTransform, node);
+	gf_node_unregister((GF_Node *) p->fillProperties, node);
+	gf_node_unregister((GF_Node *) p->lineProperties, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -226,7 +226,7 @@
 	if (!strcmp("lineProperties", name)) return 4;
 	if (!strcmp("metadata", name)) return 5;
 	return -1;
-	}
+}
 
 
 static GF_Node *Appearance_Create()
@@ -248,7 +248,7 @@
 static void Arc2D_Del(GF_Node *node)
 {
 	X_Arc2D *p = (X_Arc2D *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -299,7 +299,7 @@
 	if (!strcmp("startAngle", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *Arc2D_Create()
@@ -325,7 +325,7 @@
 {
 	X_ArcClose2D *p = (X_ArcClose2D *) node;
 	gf_sg_sfstring_del(p->closureType);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -383,7 +383,7 @@
 	if (!strcmp("startAngle", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *ArcClose2D_Create()
@@ -412,7 +412,7 @@
 	X_AudioClip *p = (X_AudioClip *) node;
 	gf_sg_sfstring_del(p->description);
 	gf_sg_mfurl_del(p->url);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -526,7 +526,7 @@
 	if (!strcmp("elapsedTime", name)) return 11;
 	if (!strcmp("isPaused", name)) return 12;
 	return -1;
-	}
+}
 
 
 static GF_Node *AudioClip_Create()
@@ -563,7 +563,7 @@
 	gf_sg_mfurl_del(p->topUrl);
 	gf_sg_mffloat_del(p->skyAngle);
 	gf_sg_mfcolor_del(p->skyColor);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -685,7 +685,7 @@
 	if (!strcmp("metadata", name)) return 12;
 	if (!strcmp("bindTime", name)) return 13;
 	return -1;
-	}
+}
 
 
 static GF_Node *Background_Create()
@@ -712,8 +712,8 @@
 static void Billboard_Del(GF_Node *node)
 {
 	X_Billboard *p = (X_Billboard *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -776,7 +776,7 @@
 	if (!strcmp("axisOfRotation", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *Billboard_Create()
@@ -802,7 +802,7 @@
 static void BooleanFilter_Del(GF_Node *node)
 {
 	X_BooleanFilter *p = (X_BooleanFilter *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -861,7 +861,7 @@
 	if (!strcmp("inputTrue", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *BooleanFilter_Create()
@@ -885,7 +885,7 @@
 	X_BooleanSequencer *p = (X_BooleanSequencer *) node;
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfbool_del(p->keyValue);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -960,7 +960,7 @@
 	if (!strcmp("value_changed", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *BooleanSequencer_Create()
@@ -982,7 +982,7 @@
 static void BooleanToggle_Del(GF_Node *node)
 {
 	X_BooleanToggle *p = (X_BooleanToggle *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1027,7 +1027,7 @@
 	if (!strcmp("toggle", name)) return 1;
 	if (!strcmp("metadata", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *BooleanToggle_Create()
@@ -1049,7 +1049,7 @@
 static void BooleanTrigger_Del(GF_Node *node)
 {
 	X_BooleanTrigger *p = (X_BooleanTrigger *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1094,7 +1094,7 @@
 	if (!strcmp("triggerTrue", name)) return 1;
 	if (!strcmp("metadata", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *BooleanTrigger_Create()
@@ -1116,7 +1116,7 @@
 static void Box_Del(GF_Node *node)
 {
 	X_Box *p = (X_Box *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1153,7 +1153,7 @@
 	if (!strcmp("size", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Box_Create()
@@ -1178,7 +1178,7 @@
 static void Circle2D_Del(GF_Node *node)
 {
 	X_Circle2D *p = (X_Circle2D *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1215,7 +1215,7 @@
 	if (!strcmp("radius", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Circle2D_Create()
@@ -1238,9 +1238,9 @@
 static void Collision_Del(GF_Node *node)
 {
 	X_Collision *p = (X_Collision *) node;
-	gf_node_unregister((GF_Node *) p->proxy, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->proxy, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1325,7 +1325,7 @@
 	if (!strcmp("isActive", name)) return 6;
 	if (!strcmp("metadata", name)) return 7;
 	return -1;
-	}
+}
 
 
 static GF_Node *Collision_Create()
@@ -1350,7 +1350,7 @@
 {
 	X_Color *p = (X_Color *) node;
 	gf_sg_mfcolor_del(p->color);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1387,7 +1387,7 @@
 	if (!strcmp("color", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Color_Create()
@@ -1411,7 +1411,7 @@
 	X_ColorInterpolator *p = (X_ColorInterpolator *) node;
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfcolor_del(p->keyValue);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1470,7 +1470,7 @@
 	if (!strcmp("value_changed", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *ColorInterpolator_Create()
@@ -1492,7 +1492,7 @@
 static void ColorRGBA_Del(GF_Node *node)
 {
 	X_ColorRGBA *p = (X_ColorRGBA *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1529,7 +1529,7 @@
 	if (!strcmp("color", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *ColorRGBA_Create()
@@ -1551,7 +1551,7 @@
 static void Cone_Del(GF_Node *node)
 {
 	X_Cone *p = (X_Cone *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1609,7 +1609,7 @@
 	if (!strcmp("bottom", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *Cone_Create()
@@ -1635,8 +1635,8 @@
 static void Contour2D_Del(GF_Node *node)
 {
 	X_Contour2D *p = (X_Contour2D *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1692,7 +1692,7 @@
 	if (!strcmp("children", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *Contour2D_Create()
@@ -1716,7 +1716,7 @@
 {
 	X_ContourPolyline2D *p = (X_ContourPolyline2D *) node;
 	gf_sg_mfvec2f_del(p->point);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1753,7 +1753,7 @@
 	if (!strcmp("point", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *ContourPolyline2D_Create()
@@ -1776,7 +1776,7 @@
 {
 	X_Coordinate *p = (X_Coordinate *) node;
 	gf_sg_mfvec3f_del(p->point);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1813,7 +1813,7 @@
 	if (!strcmp("point", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Coordinate_Create()
@@ -1836,7 +1836,7 @@
 {
 	X_CoordinateDouble *p = (X_CoordinateDouble *) node;
 	gf_sg_mfvec3d_del(p->point);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1873,7 +1873,7 @@
 	if (!strcmp("point", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *CoordinateDouble_Create()
@@ -1896,7 +1896,7 @@
 {
 	X_Coordinate2D *p = (X_Coordinate2D *) node;
 	gf_sg_mfvec2f_del(p->point);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -1933,7 +1933,7 @@
 	if (!strcmp("point", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Coordinate2D_Create()
@@ -1958,7 +1958,7 @@
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfvec3f_del(p->keyValue);
 	gf_sg_mfvec3f_del(p->value_changed);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -2017,7 +2017,7 @@
 	if (!strcmp("value_changed", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *CoordinateInterpolator_Create()
@@ -2042,7 +2042,7 @@
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfvec2f_del(p->keyValue);
 	gf_sg_mfvec2f_del(p->value_changed);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -2101,7 +2101,7 @@
 	if (!strcmp("value_changed", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *CoordinateInterpolator2D_Create()
@@ -2123,7 +2123,7 @@
 static void Cylinder_Del(GF_Node *node)
 {
 	X_Cylinder *p = (X_Cylinder *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -2188,7 +2188,7 @@
 	if (!strcmp("top", name)) return 4;
 	if (!strcmp("metadata", name)) return 5;
 	return -1;
-	}
+}
 
 
 static GF_Node *Cylinder_Create()
@@ -2215,7 +2215,7 @@
 static void CylinderSensor_Del(GF_Node *node)
 {
 	X_CylinderSensor *p = (X_CylinderSensor *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_sg_sfstring_del(p->description);
 	gf_node_free((GF_Node *)p);
 }
@@ -2323,7 +2323,7 @@
 	if (!strcmp("description", name)) return 10;
 	if (!strcmp("isOver", name)) return 11;
 	return -1;
-	}
+}
 
 
 static GF_Node *CylinderSensor_Create()
@@ -2351,7 +2351,7 @@
 static void DirectionalLight_Del(GF_Node *node)
 {
 	X_DirectionalLight *p = (X_DirectionalLight *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -2416,7 +2416,7 @@
 	if (!strcmp("on", name)) return 4;
 	if (!strcmp("metadata", name)) return 5;
 	return -1;
-	}
+}
 
 
 static GF_Node *DirectionalLight_Create()
@@ -2447,7 +2447,7 @@
 static void Disk2D_Del(GF_Node *node)
 {
 	X_Disk2D *p = (X_Disk2D *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -2491,7 +2491,7 @@
 	if (!strcmp("outerRadius", name)) return 1;
 	if (!strcmp("metadata", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *Disk2D_Create()
@@ -2516,11 +2516,11 @@
 {
 	X_ElevationGrid *p = (X_ElevationGrid *) node;
 	gf_sg_mffloat_del(p->set_height);
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->normal, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->normal, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
 	gf_sg_mffloat_del(p->height);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -2652,7 +2652,7 @@
 	if (!strcmp("zSpacing", name)) return 13;
 	if (!strcmp("metadata", name)) return 14;
 	return -1;
-	}
+}
 
 
 static GF_Node *ElevationGrid_Create()
@@ -2692,8 +2692,8 @@
 	gf_sg_sfstring_del(p->marking);
 	gf_sg_sfstring_del(p->multicastRelayHost);
 	gf_sg_sfstring_del(p->networkMode);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -3331,7 +3331,7 @@
 	if (!strcmp("timestamp", name)) return 84;
 	if (!strcmp("metadata", name)) return 85;
 	return -1;
-	}
+}
 
 
 static GF_Node *EspduTransform_Create()
@@ -3433,7 +3433,7 @@
 	gf_sg_mfrotation_del(p->orientation);
 	gf_sg_mfvec2f_del(p->scale);
 	gf_sg_mfvec3f_del(p->spine);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -3565,7 +3565,7 @@
 	if (!strcmp("spine", name)) return 13;
 	if (!strcmp("metadata", name)) return 14;
 	return -1;
-	}
+}
 
 
 static GF_Node *Extrusion_Create()
@@ -3672,7 +3672,7 @@
 	if (!strcmp("hatched", name)) return 2;
 	if (!strcmp("hatchStyle", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *FillProperties_Create()
@@ -3701,7 +3701,7 @@
 {
 	X_Fog *p = (X_Fog *) node;
 	gf_sg_sfstring_del(p->fogType);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -3774,7 +3774,7 @@
 	if (!strcmp("metadata", name)) return 5;
 	if (!strcmp("bindTime", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *Fog_Create()
@@ -3806,7 +3806,7 @@
 	gf_sg_mfstring_del(p->justify);
 	gf_sg_sfstring_del(p->language);
 	gf_sg_sfstring_del(p->style);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -3899,7 +3899,7 @@
 	if (!strcmp("topToBottom", name)) return 8;
 	if (!strcmp("metadata", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *FontStyle_Create()
@@ -3937,9 +3937,9 @@
 {
 	X_GeoCoordinate *p = (X_GeoCoordinate *) node;
 	gf_sg_mfvec3d_del(p->point);
-	gf_node_unregister((GF_Node *) p->geoOrigin, node);	
+	gf_node_unregister((GF_Node *) p->geoOrigin, node);
 	gf_sg_mfstring_del(p->geoSystem);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -3991,7 +3991,7 @@
 	if (!strcmp("geoSystem", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoCoordinate_Create()
@@ -4020,14 +4020,14 @@
 {
 	X_GeoElevationGrid *p = (X_GeoElevationGrid *) node;
 	gf_sg_mfdouble_del(p->set_height);
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->normal, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->normal, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
 	gf_sg_sfstring_del(p->geoGridOrigin);
-	gf_node_unregister((GF_Node *) p->geoOrigin, node);	
+	gf_node_unregister((GF_Node *) p->geoOrigin, node);
 	gf_sg_mfstring_del(p->geoSystem);
 	gf_sg_mfdouble_del(p->height);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -4188,7 +4188,7 @@
 	if (!strcmp("zSpacing", name)) return 17;
 	if (!strcmp("metadata", name)) return 18;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoElevationGrid_Create()
@@ -4228,10 +4228,10 @@
 static void GeoLocation_Del(GF_Node *node)
 {
 	X_GeoLocation *p = (X_GeoLocation *) node;
-	gf_node_unregister((GF_Node *) p->geoOrigin, node);	
+	gf_node_unregister((GF_Node *) p->geoOrigin, node);
 	gf_sg_mfstring_del(p->geoSystem);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -4309,7 +4309,7 @@
 	if (!strcmp("geoSystem", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoLocation_Create()
@@ -4345,12 +4345,12 @@
 	gf_sg_mfurl_del(p->child2Url);
 	gf_sg_mfurl_del(p->child3Url);
 	gf_sg_mfurl_del(p->child4Url);
-	gf_node_unregister((GF_Node *) p->geoOrigin, node);	
+	gf_node_unregister((GF_Node *) p->geoOrigin, node);
 	gf_sg_mfstring_del(p->geoSystem);
 	gf_sg_mfurl_del(p->rootUrl);
-	gf_node_unregister_children(node, p->rootNode);	
-	gf_node_unregister_children(node, p->children);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister_children(node, p->rootNode);
+	gf_node_unregister_children(node, p->children);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -4460,7 +4460,7 @@
 	if (!strcmp("children", name)) return 10;
 	if (!strcmp("metadata", name)) return 11;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoLOD_Create()
@@ -4492,10 +4492,10 @@
 static void GeoMetadata_Del(GF_Node *node)
 {
 	X_GeoMetadata *p = (X_GeoMetadata *) node;
-	gf_node_unregister_children(node, p->data);	
+	gf_node_unregister_children(node, p->data);
 	gf_sg_mfstring_del(p->summary);
 	gf_sg_mfurl_del(p->url);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -4547,7 +4547,7 @@
 	if (!strcmp("url", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoMetadata_Create()
@@ -4570,7 +4570,7 @@
 {
 	X_GeoOrigin *p = (X_GeoOrigin *) node;
 	gf_sg_mfstring_del(p->geoSystem);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -4621,7 +4621,7 @@
 	if (!strcmp("rotateYUp", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoOrigin_Create()
@@ -4654,9 +4654,9 @@
 	X_GeoPositionInterpolator *p = (X_GeoPositionInterpolator *) node;
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfvec3d_del(p->keyValue);
-	gf_node_unregister((GF_Node *) p->geoOrigin, node);	
+	gf_node_unregister((GF_Node *) p->geoOrigin, node);
 	gf_sg_mfstring_del(p->geoSystem);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -4737,7 +4737,7 @@
 	if (!strcmp("value_changed", name)) return 6;
 	if (!strcmp("metadata", name)) return 7;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoPositionInterpolator_Create()
@@ -4765,9 +4765,9 @@
 static void GeoTouchSensor_Del(GF_Node *node)
 {
 	X_GeoTouchSensor *p = (X_GeoTouchSensor *) node;
-	gf_node_unregister((GF_Node *) p->geoOrigin, node);	
+	gf_node_unregister((GF_Node *) p->geoOrigin, node);
 	gf_sg_mfstring_del(p->geoSystem);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -4868,7 +4868,7 @@
 	if (!strcmp("touchTime", name)) return 9;
 	if (!strcmp("metadata", name)) return 10;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoTouchSensor_Create()
@@ -4901,9 +4901,9 @@
 	gf_sg_sfstring_del(p->set_position);
 	gf_sg_sfstring_del(p->description);
 	gf_sg_mfstring_del(p->navType);
-	gf_node_unregister((GF_Node *) p->geoOrigin, node);	
+	gf_node_unregister((GF_Node *) p->geoOrigin, node);
 	gf_sg_mfstring_del(p->geoSystem);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -5042,7 +5042,7 @@
 	if (!strcmp("speedFactor", name)) return 14;
 	if (!strcmp("metadata", name)) return 15;
 	return -1;
-	}
+}
 
 
 static GF_Node *GeoViewpoint_Create()
@@ -5087,8 +5087,8 @@
 static void Group_Del(GF_Node *node)
 {
 	X_Group *p = (X_Group *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -5144,7 +5144,7 @@
 	if (!strcmp("children", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *Group_Create()
@@ -5170,7 +5170,7 @@
 	gf_sg_mfint32_del(p->coordIndex);
 	gf_sg_mfvec3f_del(p->displacements);
 	gf_sg_sfstring_del(p->name);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -5228,7 +5228,7 @@
 	if (!strcmp("weight", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *HAnimDisplacer_Create()
@@ -5252,17 +5252,17 @@
 {
 	X_HAnimHumanoid *p = (X_HAnimHumanoid *) node;
 	gf_sg_mfstring_del(p->info);
-	gf_node_unregister_children(node, p->joints);	
+	gf_node_unregister_children(node, p->joints);
 	gf_sg_sfstring_del(p->name);
-	gf_node_unregister_children(node, p->segments);	
-	gf_node_unregister_children(node, p->sites);	
-	gf_node_unregister_children(node, p->skeleton);	
-	gf_node_unregister_children(node, p->skin);	
-	gf_node_unregister((GF_Node *) p->skinCoord, node);	
-	gf_node_unregister((GF_Node *) p->skinNormal, node);	
+	gf_node_unregister_children(node, p->segments);
+	gf_node_unregister_children(node, p->sites);
+	gf_node_unregister_children(node, p->skeleton);
+	gf_node_unregister_children(node, p->skin);
+	gf_node_unregister((GF_Node *) p->skinCoord, node);
+	gf_node_unregister((GF_Node *) p->skinNormal, node);
 	gf_sg_sfstring_del(p->version);
-	gf_node_unregister_children(node, p->viewpoints);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister_children(node, p->viewpoints);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -5412,7 +5412,7 @@
 	if (!strcmp("viewpoints", name)) return 15;
 	if (!strcmp("metadata", name)) return 16;
 	return -1;
-	}
+}
 
 
 static GF_Node *HAnimHumanoid_Create()
@@ -5451,15 +5451,15 @@
 static void HAnimJoint_Del(GF_Node *node)
 {
 	X_HAnimJoint *p = (X_HAnimJoint *) node;
-	gf_node_unregister_children(node, p->displacers);	
+	gf_node_unregister_children(node, p->displacers);
 	gf_sg_mffloat_del(p->llimit);
 	gf_sg_sfstring_del(p->name);
 	gf_sg_mfint32_del(p->skinCoordIndex);
 	gf_sg_mffloat_del(p->skinCoordWeight);
 	gf_sg_mffloat_del(p->stiffness);
 	gf_sg_mffloat_del(p->ulimit);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -5607,7 +5607,7 @@
 	if (!strcmp("ulimit", name)) return 15;
 	if (!strcmp("metadata", name)) return 16;
 	return -1;
-	}
+}
 
 
 static GF_Node *HAnimJoint_Create()
@@ -5656,12 +5656,12 @@
 static void HAnimSegment_Del(GF_Node *node)
 {
 	X_HAnimSegment *p = (X_HAnimSegment *) node;
-	gf_node_unregister((GF_Node *) p->coord, node);	
-	gf_node_unregister_children(node, p->displacers);	
+	gf_node_unregister((GF_Node *) p->coord, node);
+	gf_node_unregister_children(node, p->displacers);
 	gf_sg_mffloat_del(p->momentsOfInertia);
 	gf_sg_sfstring_del(p->name);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -5761,7 +5761,7 @@
 	if (!strcmp("name", name)) return 8;
 	if (!strcmp("metadata", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *HAnimSegment_Create()
@@ -5800,8 +5800,8 @@
 {
 	X_HAnimSite *p = (X_HAnimSite *) node;
 	gf_sg_sfstring_del(p->name);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -5899,7 +5899,7 @@
 	if (!strcmp("translation", name)) return 8;
 	if (!strcmp("metadata", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *HAnimSite_Create()
@@ -5940,7 +5940,7 @@
 {
 	X_ImageTexture *p = (X_ImageTexture *) node;
 	gf_sg_mfurl_del(p->url);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -5991,7 +5991,7 @@
 	if (!strcmp("repeatT", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *ImageTexture_Create()
@@ -6019,15 +6019,15 @@
 	gf_sg_mfint32_del(p->set_coordIndex);
 	gf_sg_mfint32_del(p->set_normalIndex);
 	gf_sg_mfint32_del(p->set_texCoordIndex);
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
-	gf_node_unregister((GF_Node *) p->normal, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
+	gf_node_unregister((GF_Node *) p->normal, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mfint32_del(p->coordIndex);
 	gf_sg_mfint32_del(p->normalIndex);
 	gf_sg_mfint32_del(p->texCoordIndex);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -6191,7 +6191,7 @@
 	if (!strcmp("texCoordIndex", name)) return 17;
 	if (!strcmp("metadata", name)) return 18;
 	return -1;
-	}
+}
 
 
 static GF_Node *IndexedFaceSet_Create()
@@ -6221,11 +6221,11 @@
 	X_IndexedLineSet *p = (X_IndexedLineSet *) node;
 	gf_sg_mfint32_del(p->set_colorIndex);
 	gf_sg_mfint32_del(p->set_coordIndex);
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
 	gf_sg_mfint32_del(p->colorIndex);
 	gf_sg_mfint32_del(p->coordIndex);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -6308,7 +6308,7 @@
 	if (!strcmp("coordIndex", name)) return 6;
 	if (!strcmp("metadata", name)) return 7;
 	return -1;
-	}
+}
 
 
 static GF_Node *IndexedLineSet_Create()
@@ -6332,12 +6332,12 @@
 {
 	X_IndexedTriangleFanSet *p = (X_IndexedTriangleFanSet *) node;
 	gf_sg_mfint32_del(p->set_index);
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
-	gf_node_unregister((GF_Node *) p->normal, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
+	gf_node_unregister((GF_Node *) p->normal, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
 	gf_sg_mfint32_del(p->index);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -6442,7 +6442,7 @@
 	if (!strcmp("index", name)) return 9;
 	if (!strcmp("metadata", name)) return 10;
 	return -1;
-	}
+}
 
 
 static GF_Node *IndexedTriangleFanSet_Create()
@@ -6469,12 +6469,12 @@
 {
 	X_IndexedTriangleSet *p = (X_IndexedTriangleSet *) node;
 	gf_sg_mfint32_del(p->set_index);
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
-	gf_node_unregister((GF_Node *) p->normal, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
+	gf_node_unregister((GF_Node *) p->normal, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
 	gf_sg_mfint32_del(p->index);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -6579,7 +6579,7 @@
 	if (!strcmp("index", name)) return 9;
 	if (!strcmp("metadata", name)) return 10;
 	return -1;
-	}
+}
 
 
 static GF_Node *IndexedTriangleSet_Create()
@@ -6606,12 +6606,12 @@
 {
 	X_IndexedTriangleStripSet *p = (X_IndexedTriangleStripSet *) node;
 	gf_sg_mfint32_del(p->set_index);
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
-	gf_node_unregister((GF_Node *) p->normal, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
+	gf_node_unregister((GF_Node *) p->normal, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
 	gf_sg_mfint32_del(p->index);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -6716,7 +6716,7 @@
 	if (!strcmp("index", name)) return 9;
 	if (!strcmp("metadata", name)) return 10;
 	return -1;
-	}
+}
 
 
 static GF_Node *IndexedTriangleStripSet_Create()
@@ -6743,7 +6743,7 @@
 {
 	X_Inline *p = (X_Inline *) node;
 	gf_sg_mfurl_del(p->url);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -6787,7 +6787,7 @@
 	if (!strcmp("metadata", name)) return 1;
 	if (!strcmp("load", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *Inline_Create()
@@ -6812,7 +6812,7 @@
 	X_IntegerSequencer *p = (X_IntegerSequencer *) node;
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfint32_del(p->keyValue);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -6887,7 +6887,7 @@
 	if (!strcmp("value_changed", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *IntegerSequencer_Create()
@@ -6909,7 +6909,7 @@
 static void IntegerTrigger_Del(GF_Node *node)
 {
 	X_IntegerTrigger *p = (X_IntegerTrigger *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -6961,7 +6961,7 @@
 	if (!strcmp("triggerValue", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *IntegerTrigger_Create()
@@ -6986,7 +6986,7 @@
 	X_KeySensor *p = (X_KeySensor *) node;
 	gf_sg_sfstring_del(p->keyPress);
 	gf_sg_sfstring_del(p->keyRelease);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7079,7 +7079,7 @@
 	if (!strcmp("shiftKey", name)) return 8;
 	if (!strcmp("metadata", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *KeySensor_Create()
@@ -7102,7 +7102,7 @@
 static void LineProperties_Del(GF_Node *node)
 {
 	X_LineProperties *p = (X_LineProperties *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7153,7 +7153,7 @@
 	if (!strcmp("linewidthScaleFactor", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *LineProperties_Create()
@@ -7178,10 +7178,10 @@
 static void LineSet_Del(GF_Node *node)
 {
 	X_LineSet *p = (X_LineSet *) node;
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
 	gf_sg_mfint32_del(p->vertexCount);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7234,7 +7234,7 @@
 	if (!strcmp("vertexCount", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *LineSet_Create()
@@ -7256,8 +7256,8 @@
 static void LoadSensor_Del(GF_Node *node)
 {
 	X_LoadSensor *p = (X_LoadSensor *) node;
-	gf_node_unregister_children(node, p->watchList);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister_children(node, p->watchList);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7337,7 +7337,7 @@
 	if (!strcmp("progress", name)) return 6;
 	if (!strcmp("metadata", name)) return 7;
 	return -1;
-	}
+}
 
 
 static GF_Node *LoadSensor_Create()
@@ -7362,8 +7362,8 @@
 {
 	X_LOD *p = (X_LOD *) node;
 	gf_sg_mffloat_del(p->range);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7433,7 +7433,7 @@
 	if (!strcmp("range", name)) return 4;
 	if (!strcmp("metadata", name)) return 5;
 	return -1;
-	}
+}
 
 
 static GF_Node *LOD_Create()
@@ -7459,7 +7459,7 @@
 static void Material_Del(GF_Node *node)
 {
 	X_Material *p = (X_Material *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7531,7 +7531,7 @@
 	if (!strcmp("transparency", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *Material_Create()
@@ -7568,7 +7568,7 @@
 	gf_sg_sfstring_del(p->name);
 	gf_sg_sfstring_del(p->reference);
 	gf_sg_mfdouble_del(p->value);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7619,7 +7619,7 @@
 	if (!strcmp("value", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *MetadataDouble_Create()
@@ -7644,7 +7644,7 @@
 	gf_sg_sfstring_del(p->name);
 	gf_sg_sfstring_del(p->reference);
 	gf_sg_mffloat_del(p->value);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7695,7 +7695,7 @@
 	if (!strcmp("value", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *MetadataFloat_Create()
@@ -7720,7 +7720,7 @@
 	gf_sg_sfstring_del(p->name);
 	gf_sg_sfstring_del(p->reference);
 	gf_sg_mfint32_del(p->value);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7771,7 +7771,7 @@
 	if (!strcmp("value", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *MetadataInteger_Create()
@@ -7795,8 +7795,8 @@
 	X_MetadataSet *p = (X_MetadataSet *) node;
 	gf_sg_sfstring_del(p->name);
 	gf_sg_sfstring_del(p->reference);
-	gf_node_unregister_children(node, p->value);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister_children(node, p->value);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7848,7 +7848,7 @@
 	if (!strcmp("value", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *MetadataSet_Create()
@@ -7873,7 +7873,7 @@
 	gf_sg_sfstring_del(p->name);
 	gf_sg_sfstring_del(p->reference);
 	gf_sg_mfstring_del(p->value);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -7924,7 +7924,7 @@
 	if (!strcmp("value", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *MetadataString_Create()
@@ -7947,7 +7947,7 @@
 {
 	X_MovieTexture *p = (X_MovieTexture *) node;
 	gf_sg_mfurl_del(p->url);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8068,7 +8068,7 @@
 	if (!strcmp("elapsedTime", name)) return 12;
 	if (!strcmp("isPaused", name)) return 13;
 	return -1;
-	}
+}
 
 
 static GF_Node *MovieTexture_Create()
@@ -8100,8 +8100,8 @@
 	gf_sg_mfstring_del(p->function);
 	gf_sg_mfstring_del(p->mode);
 	gf_sg_mfstring_del(p->source);
-	gf_node_unregister_children(node, p->texture);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister_children(node, p->texture);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8174,7 +8174,7 @@
 	if (!strcmp("texture", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *MultiTexture_Create()
@@ -8200,8 +8200,8 @@
 static void MultiTextureCoordinate_Del(GF_Node *node)
 {
 	X_MultiTextureCoordinate *p = (X_MultiTextureCoordinate *) node;
-	gf_node_unregister_children(node, p->texCoord);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister_children(node, p->texCoord);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8239,7 +8239,7 @@
 	if (!strcmp("texCoord", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *MultiTextureCoordinate_Create()
@@ -8261,8 +8261,8 @@
 static void MultiTextureTransform_Del(GF_Node *node)
 {
 	X_MultiTextureTransform *p = (X_MultiTextureTransform *) node;
-	gf_node_unregister_children(node, p->textureTransform);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister_children(node, p->textureTransform);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8300,7 +8300,7 @@
 	if (!strcmp("textureTransform", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *MultiTextureTransform_Create()
@@ -8324,7 +8324,7 @@
 	X_NavigationInfo *p = (X_NavigationInfo *) node;
 	gf_sg_mffloat_del(p->avatarSize);
 	gf_sg_mfstring_del(p->type);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_sg_mfstring_del(p->transitionType);
 	gf_node_free((GF_Node *)p);
 }
@@ -8419,7 +8419,7 @@
 	if (!strcmp("transitionType", name)) return 8;
 	if (!strcmp("bindTime", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *NavigationInfo_Create()
@@ -8462,7 +8462,7 @@
 {
 	X_Normal *p = (X_Normal *) node;
 	gf_sg_mfvec3f_del(p->vector);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8499,7 +8499,7 @@
 	if (!strcmp("vector", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Normal_Create()
@@ -8524,7 +8524,7 @@
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfvec3f_del(p->keyValue);
 	gf_sg_mfvec3f_del(p->value_changed);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8583,7 +8583,7 @@
 	if (!strcmp("value_changed", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *NormalInterpolator_Create()
@@ -8608,7 +8608,7 @@
 	gf_sg_mfvec3f_del(p->controlPoint);
 	gf_sg_mfdouble_del(p->weight);
 	gf_sg_mffloat_del(p->knot);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8680,7 +8680,7 @@
 	if (!strcmp("order", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsCurve_Create()
@@ -8707,7 +8707,7 @@
 	gf_sg_mfvec2f_del(p->controlPoint);
 	gf_sg_mffloat_del(p->weight);
 	gf_sg_mffloat_del(p->knot);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8779,7 +8779,7 @@
 	if (!strcmp("closed", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsCurve2D_Create()
@@ -8803,10 +8803,10 @@
 static void NurbsOrientationInterpolator_Del(GF_Node *node)
 {
 	X_NurbsOrientationInterpolator *p = (X_NurbsOrientationInterpolator *) node;
-	gf_node_unregister((GF_Node *) p->controlPoints, node);	
+	gf_node_unregister((GF_Node *) p->controlPoints, node);
 	gf_sg_mfdouble_del(p->knot);
 	gf_sg_mfdouble_del(p->weight);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -8880,7 +8880,7 @@
 	if (!strcmp("value_changed", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsOrientationInterpolator_Create()
@@ -8903,12 +8903,12 @@
 static void NurbsPatchSurface_Del(GF_Node *node)
 {
 	X_NurbsPatchSurface *p = (X_NurbsPatchSurface *) node;
-	gf_node_unregister((GF_Node *) p->controlPoint, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
+	gf_node_unregister((GF_Node *) p->controlPoint, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
 	gf_sg_mfdouble_del(p->weight);
 	gf_sg_mfdouble_del(p->uKnot);
 	gf_sg_mfdouble_del(p->vKnot);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9038,7 +9038,7 @@
 	if (!strcmp("vOrder", name)) return 13;
 	if (!strcmp("metadata", name)) return 14;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsPatchSurface_Create()
@@ -9067,10 +9067,10 @@
 static void NurbsPositionInterpolator_Del(GF_Node *node)
 {
 	X_NurbsPositionInterpolator *p = (X_NurbsPositionInterpolator *) node;
-	gf_node_unregister((GF_Node *) p->controlPoints, node);	
+	gf_node_unregister((GF_Node *) p->controlPoints, node);
 	gf_sg_mfdouble_del(p->knot);
 	gf_sg_mfdouble_del(p->weight);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9144,7 +9144,7 @@
 	if (!strcmp("value_changed", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsPositionInterpolator_Create()
@@ -9167,10 +9167,10 @@
 static void NurbsSet_Del(GF_Node *node)
 {
 	X_NurbsSet *p = (X_NurbsSet *) node;
-	gf_node_unregister_children(node, p->addGeometry);	
-	gf_node_unregister_children(node, p->removeGeometry);	
-	gf_node_unregister_children(node, p->geometry);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister_children(node, p->addGeometry);
+	gf_node_unregister_children(node, p->removeGeometry);
+	gf_node_unregister_children(node, p->geometry);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9233,7 +9233,7 @@
 	if (!strcmp("tessellationScale", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsSet_Create()
@@ -9256,11 +9256,11 @@
 static void NurbsSurfaceInterpolator_Del(GF_Node *node)
 {
 	X_NurbsSurfaceInterpolator *p = (X_NurbsSurfaceInterpolator *) node;
-	gf_node_unregister((GF_Node *) p->controlPoints, node);	
+	gf_node_unregister((GF_Node *) p->controlPoints, node);
 	gf_sg_mfdouble_del(p->weight);
 	gf_sg_mfdouble_del(p->uKnot);
 	gf_sg_mfdouble_del(p->vKnot);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9369,7 +9369,7 @@
 	if (!strcmp("vOrder", name)) return 10;
 	if (!strcmp("metadata", name)) return 11;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsSurfaceInterpolator_Create()
@@ -9395,9 +9395,9 @@
 static void NurbsSweptSurface_Del(GF_Node *node)
 {
 	X_NurbsSweptSurface *p = (X_NurbsSweptSurface *) node;
-	gf_node_unregister((GF_Node *) p->crossSectionCurve, node);	
-	gf_node_unregister((GF_Node *) p->trajectoryCurve, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->crossSectionCurve, node);
+	gf_node_unregister((GF_Node *) p->trajectoryCurve, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9457,7 +9457,7 @@
 	if (!strcmp("solid", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsSweptSurface_Create()
@@ -9481,9 +9481,9 @@
 static void NurbsSwungSurface_Del(GF_Node *node)
 {
 	X_NurbsSwungSurface *p = (X_NurbsSwungSurface *) node;
-	gf_node_unregister((GF_Node *) p->profileCurve, node);	
-	gf_node_unregister((GF_Node *) p->trajectoryCurve, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->profileCurve, node);
+	gf_node_unregister((GF_Node *) p->trajectoryCurve, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9543,7 +9543,7 @@
 	if (!strcmp("solid", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsSwungSurface_Create()
@@ -9571,7 +9571,7 @@
 	gf_sg_mffloat_del(p->weight);
 	gf_sg_mfdouble_del(p->uKnot);
 	gf_sg_mfdouble_del(p->vKnot);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9657,7 +9657,7 @@
 	if (!strcmp("vOrder", name)) return 7;
 	if (!strcmp("metadata", name)) return 8;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsTextureCoordinate_Create()
@@ -9683,15 +9683,15 @@
 static void NurbsTrimmedSurface_Del(GF_Node *node)
 {
 	X_NurbsTrimmedSurface *p = (X_NurbsTrimmedSurface *) node;
-	gf_node_unregister_children(node, p->addTrimmingContour);	
-	gf_node_unregister_children(node, p->removeTrimmingContour);	
-	gf_node_unregister_children(node, p->trimmingContour);	
-	gf_node_unregister((GF_Node *) p->controlPoint, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
+	gf_node_unregister_children(node, p->addTrimmingContour);
+	gf_node_unregister_children(node, p->removeTrimmingContour);
+	gf_node_unregister_children(node, p->trimmingContour);
+	gf_node_unregister((GF_Node *) p->controlPoint, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
 	gf_sg_mfdouble_del(p->weight);
 	gf_sg_mfdouble_del(p->uKnot);
 	gf_sg_mfdouble_del(p->vKnot);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9847,7 +9847,7 @@
 	if (!strcmp("vOrder", name)) return 16;
 	if (!strcmp("metadata", name)) return 17;
 	return -1;
-	}
+}
 
 
 static GF_Node *NurbsTrimmedSurface_Create()
@@ -9878,7 +9878,7 @@
 	X_OrientationInterpolator *p = (X_OrientationInterpolator *) node;
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfrotation_del(p->keyValue);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -9937,7 +9937,7 @@
 	if (!strcmp("value_changed", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *OrientationInterpolator_Create()
@@ -9960,7 +9960,7 @@
 {
 	X_PixelTexture *p = (X_PixelTexture *) node;
 	gf_sg_sfimage_del(p->image);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10011,7 +10011,7 @@
 	if (!strcmp("repeatT", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *PixelTexture_Create()
@@ -10035,7 +10035,7 @@
 static void PlaneSensor_Del(GF_Node *node)
 {
 	X_PlaneSensor *p = (X_PlaneSensor *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_sg_sfstring_del(p->description);
 	gf_node_free((GF_Node *)p);
 }
@@ -10136,7 +10136,7 @@
 	if (!strcmp("description", name)) return 9;
 	if (!strcmp("isOver", name)) return 10;
 	return -1;
-	}
+}
 
 
 static GF_Node *PlaneSensor_Create()
@@ -10167,7 +10167,7 @@
 static void PointLight_Del(GF_Node *node)
 {
 	X_PointLight *p = (X_PointLight *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10246,7 +10246,7 @@
 	if (!strcmp("radius", name)) return 6;
 	if (!strcmp("metadata", name)) return 7;
 	return -1;
-	}
+}
 
 
 static GF_Node *PointLight_Create()
@@ -10281,9 +10281,9 @@
 static void PointSet_Del(GF_Node *node)
 {
 	X_PointSet *p = (X_PointSet *) node;
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10329,7 +10329,7 @@
 	if (!strcmp("coord", name)) return 1;
 	if (!strcmp("metadata", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *PointSet_Create()
@@ -10352,7 +10352,7 @@
 {
 	X_Polyline2D *p = (X_Polyline2D *) node;
 	gf_sg_mfvec2f_del(p->lineSegments);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10389,7 +10389,7 @@
 	if (!strcmp("lineSegments", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Polyline2D_Create()
@@ -10412,7 +10412,7 @@
 {
 	X_Polypoint2D *p = (X_Polypoint2D *) node;
 	gf_sg_mfvec2f_del(p->point);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10449,7 +10449,7 @@
 	if (!strcmp("point", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Polypoint2D_Create()
@@ -10473,7 +10473,7 @@
 	X_PositionInterpolator *p = (X_PositionInterpolator *) node;
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfvec3f_del(p->keyValue);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10532,7 +10532,7 @@
 	if (!strcmp("value_changed", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *PositionInterpolator_Create()
@@ -10556,7 +10556,7 @@
 	X_PositionInterpolator2D *p = (X_PositionInterpolator2D *) node;
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mfvec2f_del(p->keyValue);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10615,7 +10615,7 @@
 	if (!strcmp("value_changed", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *PositionInterpolator2D_Create()
@@ -10637,7 +10637,7 @@
 static void ProximitySensor_Del(GF_Node *node)
 {
 	X_ProximitySensor *p = (X_ProximitySensor *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10730,7 +10730,7 @@
 	if (!strcmp("metadata", name)) return 8;
 	if (!strcmp("centerOfRotation_changed", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *ProximitySensor_Create()
@@ -10762,7 +10762,7 @@
 	gf_sg_sfstring_del(p->address);
 	gf_sg_sfstring_del(p->multicastRelayHost);
 	gf_sg_sfstring_del(p->networkMode);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -10967,7 +10967,7 @@
 	if (!strcmp("timestamp", name)) return 24;
 	if (!strcmp("metadata", name)) return 25;
 	return -1;
-	}
+}
 
 
 static GF_Node *ReceiverPdu_Create()
@@ -11008,7 +11008,7 @@
 static void Rectangle2D_Del(GF_Node *node)
 {
 	X_Rectangle2D *p = (X_Rectangle2D *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -11045,7 +11045,7 @@
 	if (!strcmp("size", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Rectangle2D_Create()
@@ -11071,7 +11071,7 @@
 	X_ScalarInterpolator *p = (X_ScalarInterpolator *) node;
 	gf_sg_mffloat_del(p->key);
 	gf_sg_mffloat_del(p->keyValue);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -11130,7 +11130,7 @@
 	if (!strcmp("value_changed", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *ScalarInterpolator_Create()
@@ -11153,7 +11153,7 @@
 {
 	X_Script *p = (X_Script *) node;
 	gf_sg_mfscript_del(p->url);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -11204,7 +11204,7 @@
 	if (!strcmp("mustEvaluate", name)) return 2;
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
-	}
+}
 
 
 static GF_Node *Script_Create()
@@ -11226,9 +11226,9 @@
 static void Shape_Del(GF_Node *node)
 {
 	X_Shape *p = (X_Shape *) node;
-	gf_node_unregister((GF_Node *) p->appearance, node);	
-	gf_node_unregister((GF_Node *) p->geometry, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->appearance, node);
+	gf_node_unregister((GF_Node *) p->geometry, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -11274,7 +11274,7 @@
 	if (!strcmp("geometry", name)) return 1;
 	if (!strcmp("metadata", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *Shape_Create()
@@ -11300,7 +11300,7 @@
 	gf_sg_mfint32_del(p->data);
 	gf_sg_sfstring_del(p->multicastRelayHost);
 	gf_sg_sfstring_del(p->networkMode);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -11505,7 +11505,7 @@
 	if (!strcmp("timestamp", name)) return 24;
 	if (!strcmp("metadata", name)) return 25;
 	return -1;
-	}
+}
 
 
 static GF_Node *SignalPdu_Create()
@@ -11545,8 +11545,8 @@
 static void Sound_Del(GF_Node *node)
 {
 	X_Sound *p = (X_Sound *) node;
-	gf_node_unregister((GF_Node *) p->source, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->source, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -11647,7 +11647,7 @@
 	if (!strcmp("spatialize", name)) return 9;
 	if (!strcmp("metadata", name)) return 10;
 	return -1;
-	}
+}
 
 
 static GF_Node *Sound_Create()
@@ -11682,7 +11682,7 @@
 static void Sphere_Del(GF_Node *node)
 {
 	X_Sphere *p = (X_Sphere *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -11719,7 +11719,7 @@
 	if (!strcmp("radius", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *Sphere_Create()
@@ -11742,7 +11742,7 @@
 static void SphereSensor_Del(GF_Node *node)
 {
 	X_SphereSensor *p = (X_SphereSensor *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_sg_sfstring_del(p->description);
 	gf_node_free((GF_Node *)p);
 }
@@ -11829,7 +11829,7 @@
 	if (!strcmp("description", name)) return 7;
 	if (!strcmp("isOver", name)) return 8;
 	return -1;
-	}
+}
 
 
 static GF_Node *SphereSensor_Create()
@@ -11857,7 +11857,7 @@
 static void SpotLight_Del(GF_Node *node)
 {
 	X_SpotLight *p = (X_SpotLight *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -11957,7 +11957,7 @@
 	if (!strcmp("radius", name)) return 9;
 	if (!strcmp("metadata", name)) return 10;
 	return -1;
-	}
+}
 
 
 static GF_Node *SpotLight_Create()
@@ -11997,8 +11997,8 @@
 static void StaticGroup_Del(GF_Node *node)
 {
 	X_StaticGroup *p = (X_StaticGroup *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12036,7 +12036,7 @@
 	if (!strcmp("children", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *StaticGroup_Create()
@@ -12061,7 +12061,7 @@
 	X_StringSensor *p = (X_StringSensor *) node;
 	gf_sg_sfstring_del(p->enteredText);
 	gf_sg_sfstring_del(p->finalText);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12126,7 +12126,7 @@
 	if (!strcmp("isActive", name)) return 4;
 	if (!strcmp("metadata", name)) return 5;
 	return -1;
-	}
+}
 
 
 static GF_Node *StringSensor_Create()
@@ -12150,8 +12150,8 @@
 static void Switch_Del(GF_Node *node)
 {
 	X_Switch *p = (X_Switch *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12214,7 +12214,7 @@
 	if (!strcmp("whichChoice", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *Switch_Create()
@@ -12240,8 +12240,8 @@
 	X_Text *p = (X_Text *) node;
 	gf_sg_mfstring_del(p->string);
 	gf_sg_mffloat_del(p->length);
-	gf_node_unregister((GF_Node *) p->fontStyle, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->fontStyle, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12300,7 +12300,7 @@
 	if (!strcmp("maxExtent", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *Text_Create()
@@ -12325,16 +12325,16 @@
 	X_TextureBackground *p = (X_TextureBackground *) node;
 	gf_sg_mffloat_del(p->groundAngle);
 	gf_sg_mfcolor_del(p->groundColor);
-	gf_node_unregister((GF_Node *) p->backTexture, node);	
-	gf_node_unregister((GF_Node *) p->bottomTexture, node);	
-	gf_node_unregister((GF_Node *) p->frontTexture, node);	
-	gf_node_unregister((GF_Node *) p->leftTexture, node);	
-	gf_node_unregister((GF_Node *) p->rightTexture, node);	
-	gf_node_unregister((GF_Node *) p->topTexture, node);	
+	gf_node_unregister((GF_Node *) p->backTexture, node);
+	gf_node_unregister((GF_Node *) p->bottomTexture, node);
+	gf_node_unregister((GF_Node *) p->frontTexture, node);
+	gf_node_unregister((GF_Node *) p->leftTexture, node);
+	gf_node_unregister((GF_Node *) p->rightTexture, node);
+	gf_node_unregister((GF_Node *) p->topTexture, node);
 	gf_sg_mffloat_del(p->skyAngle);
 	gf_sg_mfcolor_del(p->skyColor);
 	gf_sg_mffloat_del(p->transparency);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12469,7 +12469,7 @@
 	if (!strcmp("isBound", name)) return 13;
 	if (!strcmp("metadata", name)) return 14;
 	return -1;
-	}
+}
 
 
 static GF_Node *TextureBackground_Create()
@@ -12500,7 +12500,7 @@
 {
 	X_TextureCoordinate *p = (X_TextureCoordinate *) node;
 	gf_sg_mfvec2f_del(p->point);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12537,7 +12537,7 @@
 	if (!strcmp("point", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *TextureCoordinate_Create()
@@ -12561,7 +12561,7 @@
 	X_TextureCoordinateGenerator *p = (X_TextureCoordinateGenerator *) node;
 	gf_sg_sfstring_del(p->mode);
 	gf_sg_mffloat_del(p->parameter);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12605,7 +12605,7 @@
 	if (!strcmp("parameter", name)) return 1;
 	if (!strcmp("metadata", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *TextureCoordinateGenerator_Create()
@@ -12629,7 +12629,7 @@
 static void TextureTransform_Del(GF_Node *node)
 {
 	X_TextureTransform *p = (X_TextureTransform *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12687,7 +12687,7 @@
 	if (!strcmp("translation", name)) return 3;
 	if (!strcmp("metadata", name)) return 4;
 	return -1;
-	}
+}
 
 
 static GF_Node *TextureTransform_Create()
@@ -12716,7 +12716,7 @@
 static void TimeSensor_Del(GF_Node *node)
 {
 	X_TimeSensor *p = (X_TimeSensor *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12837,7 +12837,7 @@
 	if (!strcmp("elapsedTime", name)) return 12;
 	if (!strcmp("isPaused", name)) return 13;
 	return -1;
-	}
+}
 
 
 static GF_Node *TimeSensor_Create()
@@ -12865,7 +12865,7 @@
 static void TimeTrigger_Del(GF_Node *node)
 {
 	X_TimeTrigger *p = (X_TimeTrigger *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -12910,7 +12910,7 @@
 	if (!strcmp("triggerTime", name)) return 1;
 	if (!strcmp("metadata", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *TimeTrigger_Create()
@@ -12932,7 +12932,7 @@
 static void TouchSensor_Del(GF_Node *node)
 {
 	X_TouchSensor *p = (X_TouchSensor *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_sg_sfstring_del(p->description);
 	gf_node_free((GF_Node *)p);
 }
@@ -13019,7 +13019,7 @@
 	if (!strcmp("metadata", name)) return 7;
 	if (!strcmp("description", name)) return 8;
 	return -1;
-	}
+}
 
 
 static GF_Node *TouchSensor_Create()
@@ -13042,8 +13042,8 @@
 static void Transform_Del(GF_Node *node)
 {
 	X_Transform *p = (X_Transform *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
-	gf_sg_vrml_parent_destroy(node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
+	gf_sg_vrml_parent_destroy(node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -13134,7 +13134,7 @@
 	if (!strcmp("translation", name)) return 7;
 	if (!strcmp("metadata", name)) return 8;
 	return -1;
-	}
+}
 
 
 static GF_Node *Transform_Create()
@@ -13177,7 +13177,7 @@
 	gf_sg_sfstring_del(p->address);
 	gf_sg_sfstring_del(p->multicastRelayHost);
 	gf_sg_sfstring_del(p->networkMode);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -13494,7 +13494,7 @@
 	if (!strcmp("timestamp", name)) return 40;
 	if (!strcmp("metadata", name)) return 41;
 	return -1;
-	}
+}
 
 
 static GF_Node *TransmitterPdu_Create()
@@ -13555,12 +13555,12 @@
 static void TriangleFanSet_Del(GF_Node *node)
 {
 	X_TriangleFanSet *p = (X_TriangleFanSet *) node;
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
 	gf_sg_mfint32_del(p->fanCount);
-	gf_node_unregister((GF_Node *) p->normal, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->normal, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -13657,7 +13657,7 @@
 	if (!strcmp("solid", name)) return 8;
 	if (!strcmp("metadata", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *TriangleFanSet_Create()
@@ -13683,11 +13683,11 @@
 static void TriangleSet_Del(GF_Node *node)
 {
 	X_TriangleSet *p = (X_TriangleSet *) node;
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
-	gf_node_unregister((GF_Node *) p->normal, node);	
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
+	gf_node_unregister((GF_Node *) p->normal, node);
+	gf_node_unregister((GF_Node *) p->texCoord, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -13777,7 +13777,7 @@
 	if (!strcmp("solid", name)) return 7;
 	if (!strcmp("metadata", name)) return 8;
 	return -1;
-	}
+}
 
 
 static GF_Node *TriangleSet_Create()
@@ -13804,7 +13804,7 @@
 {
 	X_TriangleSet2D *p = (X_TriangleSet2D *) node;
 	gf_sg_mfvec2f_del(p->vertices);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -13841,7 +13841,7 @@
 	if (!strcmp("vertices", name)) return 0;
 	if (!strcmp("metadata", name)) return 1;
 	return -1;
-	}
+}
 
 
 static GF_Node *TriangleSet2D_Create()
@@ -13863,12 +13863,12 @@
 static void TriangleStripSet_Del(GF_Node *node)
 {
 	X_TriangleStripSet *p = (X_TriangleStripSet *) node;
-	gf_node_unregister((GF_Node *) p->color, node);	
-	gf_node_unregister((GF_Node *) p->coord, node);	
-	gf_node_unregister((GF_Node *) p->normal, node);	
+	gf_node_unregister((GF_Node *) p->color, node);
+	gf_node_unregister((GF_Node *) p->coord, node);
+	gf_node_unregister((GF_Node *) p->normal, node);
 	gf_sg_mfint32_del(p->stripCount);
-	gf_node_unregister((GF_Node *) p->texCoord, node);	
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->texCoord, node);
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -13965,7 +13965,7 @@
 	if (!strcmp("solid", name)) return 8;
 	if (!strcmp("metadata", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *TriangleStripSet_Create()
@@ -13992,7 +13992,7 @@
 {
 	X_Viewpoint *p = (X_Viewpoint *) node;
 	gf_sg_sfstring_del(p->description);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -14086,7 +14086,7 @@
 	if (!strcmp("metadata", name)) return 8;
 	if (!strcmp("centerOfRotation", name)) return 9;
 	return -1;
-	}
+}
 
 
 static GF_Node *Viewpoint_Create()
@@ -14120,7 +14120,7 @@
 static void VisibilitySensor_Del(GF_Node *node)
 {
 	X_VisibilitySensor *p = (X_VisibilitySensor *) node;
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -14192,7 +14192,7 @@
 	if (!strcmp("isActive", name)) return 5;
 	if (!strcmp("metadata", name)) return 6;
 	return -1;
-	}
+}
 
 
 static GF_Node *VisibilitySensor_Create()
@@ -14223,7 +14223,7 @@
 	X_WorldInfo *p = (X_WorldInfo *) node;
 	gf_sg_mfstring_del(p->info);
 	gf_sg_sfstring_del(p->title);
-	gf_node_unregister((GF_Node *) p->metadata, node);	
+	gf_node_unregister((GF_Node *) p->metadata, node);
 	gf_node_free((GF_Node *)p);
 }
 
@@ -14267,7 +14267,7 @@
 	if (!strcmp("title", name)) return 1;
 	if (!strcmp("metadata", name)) return 2;
 	return -1;
-	}
+}
 
 
 static GF_Node *WorldInfo_Create()
@@ -14816,261 +14816,389 @@
 {
 	switch (node->sgprivate->tag) {
 	case TAG_X3D_Anchor:
-		Anchor_Del(node); return;
+		Anchor_Del(node);
+		return;
 	case TAG_X3D_Appearance:
-		Appearance_Del(node); return;
+		Appearance_Del(node);
+		return;
 	case TAG_X3D_Arc2D:
-		Arc2D_Del(node); return;
+		Arc2D_Del(node);
+		return;
 	case TAG_X3D_ArcClose2D:
-		ArcClose2D_Del(node); return;
+		ArcClose2D_Del(node);
+		return;
 	case TAG_X3D_AudioClip:
-		AudioClip_Del(node); return;
+		AudioClip_Del(node);
+		return;
 	case TAG_X3D_Background:
-		Background_Del(node); return;
+		Background_Del(node);
+		return;
 	case TAG_X3D_Billboard:
-		Billboard_Del(node); return;
+		Billboard_Del(node);
+		return;
 	case TAG_X3D_BooleanFilter:
-		BooleanFilter_Del(node); return;
+		BooleanFilter_Del(node);
+		return;
 	case TAG_X3D_BooleanSequencer:
-		BooleanSequencer_Del(node); return;
+		BooleanSequencer_Del(node);
+		return;
 	case TAG_X3D_BooleanToggle:
-		BooleanToggle_Del(node); return;
+		BooleanToggle_Del(node);
+		return;
 	case TAG_X3D_BooleanTrigger:
-		BooleanTrigger_Del(node); return;
+		BooleanTrigger_Del(node);
+		return;
 	case TAG_X3D_Box:
-		Box_Del(node); return;
+		Box_Del(node);
+		return;
 	case TAG_X3D_Circle2D:
-		Circle2D_Del(node); return;
+		Circle2D_Del(node);
+		return;
 	case TAG_X3D_Collision:
-		Collision_Del(node); return;
+		Collision_Del(node);
+		return;
 	case TAG_X3D_Color:
-		Color_Del(node); return;
+		Color_Del(node);
+		return;
 	case TAG_X3D_ColorInterpolator:
-		ColorInterpolator_Del(node); return;
+		ColorInterpolator_Del(node);
+		return;
 	case TAG_X3D_ColorRGBA:
-		ColorRGBA_Del(node); return;
+		ColorRGBA_Del(node);
+		return;
 	case TAG_X3D_Cone:
-		Cone_Del(node); return;
+		Cone_Del(node);
+		return;
 	case TAG_X3D_Contour2D:
-		Contour2D_Del(node); return;
+		Contour2D_Del(node);
+		return;
 	case TAG_X3D_ContourPolyline2D:
-		ContourPolyline2D_Del(node); return;
+		ContourPolyline2D_Del(node);
+		return;
 	case TAG_X3D_Coordinate:
-		Coordinate_Del(node); return;
+		Coordinate_Del(node);
+		return;
 	case TAG_X3D_CoordinateDouble:
-		CoordinateDouble_Del(node); return;
+		CoordinateDouble_Del(node);
+		return;
 	case TAG_X3D_Coordinate2D:
-		Coordinate2D_Del(node); return;
+		Coordinate2D_Del(node);
+		return;
 	case TAG_X3D_CoordinateInterpolator:
-		CoordinateInterpolator_Del(node); return;
+		CoordinateInterpolator_Del(node);
+		return;
 	case TAG_X3D_CoordinateInterpolator2D:
-		CoordinateInterpolator2D_Del(node); return;
+		CoordinateInterpolator2D_Del(node);
+		return;
 	case TAG_X3D_Cylinder:
-		Cylinder_Del(node); return;
+		Cylinder_Del(node);
+		return;
 	case TAG_X3D_CylinderSensor:
-		CylinderSensor_Del(node); return;
+		CylinderSensor_Del(node);
+		return;
 	case TAG_X3D_DirectionalLight:
-		DirectionalLight_Del(node); return;
+		DirectionalLight_Del(node);
+		return;
 	case TAG_X3D_Disk2D:
-		Disk2D_Del(node); return;
+		Disk2D_Del(node);
+		return;
 	case TAG_X3D_ElevationGrid:
-		ElevationGrid_Del(node); return;
+		ElevationGrid_Del(node);
+		return;
 	case TAG_X3D_EspduTransform:
-		EspduTransform_Del(node); return;
+		EspduTransform_Del(node);
+		return;
 	case TAG_X3D_Extrusion:
-		Extrusion_Del(node); return;
+		Extrusion_Del(node);
+		return;
 	case TAG_X3D_FillProperties:
-		FillProperties_Del(node); return;
+		FillProperties_Del(node);
+		return;
 	case TAG_X3D_Fog:
-		Fog_Del(node); return;
+		Fog_Del(node);
+		return;
 	case TAG_X3D_FontStyle:
-		FontStyle_Del(node); return;
+		FontStyle_Del(node);
+		return;
 	case TAG_X3D_GeoCoordinate:
-		GeoCoordinate_Del(node); return;
+		GeoCoordinate_Del(node);
+		return;
 	case TAG_X3D_GeoElevationGrid:
-		GeoElevationGrid_Del(node); return;
+		GeoElevationGrid_Del(node);
+		return;
 	case TAG_X3D_GeoLocation:
-		GeoLocation_Del(node); return;
+		GeoLocation_Del(node);
+		return;
 	case TAG_X3D_GeoLOD:
-		GeoLOD_Del(node); return;
+		GeoLOD_Del(node);
+		return;
 	case TAG_X3D_GeoMetadata:
-		GeoMetadata_Del(node); return;
+		GeoMetadata_Del(node);
+		return;
 	case TAG_X3D_GeoOrigin:
-		GeoOrigin_Del(node); return;
+		GeoOrigin_Del(node);
+		return;
 	case TAG_X3D_GeoPositionInterpolator:
-		GeoPositionInterpolator_Del(node); return;
+		GeoPositionInterpolator_Del(node);
+		return;
 	case TAG_X3D_GeoTouchSensor:
-		GeoTouchSensor_Del(node); return;
+		GeoTouchSensor_Del(node);
+		return;
 	case TAG_X3D_GeoViewpoint:
-		GeoViewpoint_Del(node); return;
+		GeoViewpoint_Del(node);
+		return;
 	case TAG_X3D_Group:
-		Group_Del(node); return;
+		Group_Del(node);
+		return;
 	case TAG_X3D_HAnimDisplacer:
-		HAnimDisplacer_Del(node); return;
+		HAnimDisplacer_Del(node);
+		return;
 	case TAG_X3D_HAnimHumanoid:
-		HAnimHumanoid_Del(node); return;
+		HAnimHumanoid_Del(node);
+		return;
 	case TAG_X3D_HAnimJoint:
-		HAnimJoint_Del(node); return;
+		HAnimJoint_Del(node);
+		return;
 	case TAG_X3D_HAnimSegment:
-		HAnimSegment_Del(node); return;
+		HAnimSegment_Del(node);
+		return;
 	case TAG_X3D_HAnimSite:
-		HAnimSite_Del(node); return;
+		HAnimSite_Del(node);
+		return;
 	case TAG_X3D_ImageTexture:
-		ImageTexture_Del(node); return;
+		ImageTexture_Del(node);
+		return;
 	case TAG_X3D_IndexedFaceSet:
-		IndexedFaceSet_Del(node); return;
+		IndexedFaceSet_Del(node);
+		return;
 	case TAG_X3D_IndexedLineSet:
-		IndexedLineSet_Del(node); return;
+		IndexedLineSet_Del(node);
+		return;
 	case TAG_X3D_IndexedTriangleFanSet:
-		IndexedTriangleFanSet_Del(node); return;
+		IndexedTriangleFanSet_Del(node);
+		return;
 	case TAG_X3D_IndexedTriangleSet:
-		IndexedTriangleSet_Del(node); return;
+		IndexedTriangleSet_Del(node);
+		return;
 	case TAG_X3D_IndexedTriangleStripSet:
-		IndexedTriangleStripSet_Del(node); return;
+		IndexedTriangleStripSet_Del(node);
+		return;
 	case TAG_X3D_Inline:
-		Inline_Del(node); return;
+		Inline_Del(node);
+		return;
 	case TAG_X3D_IntegerSequencer:
-		IntegerSequencer_Del(node); return;
+		IntegerSequencer_Del(node);
+		return;
 	case TAG_X3D_IntegerTrigger:
-		IntegerTrigger_Del(node); return;
+		IntegerTrigger_Del(node);
+		return;
 	case TAG_X3D_KeySensor:
-		KeySensor_Del(node); return;
+		KeySensor_Del(node);
+		return;
 	case TAG_X3D_LineProperties:
-		LineProperties_Del(node); return;
+		LineProperties_Del(node);
+		return;
 	case TAG_X3D_LineSet:
-		LineSet_Del(node); return;
+		LineSet_Del(node);
+		return;
 	case TAG_X3D_LoadSensor:
-		LoadSensor_Del(node); return;
+		LoadSensor_Del(node);
+		return;
 	case TAG_X3D_LOD:
-		LOD_Del(node); return;
+		LOD_Del(node);
+		return;
 	case TAG_X3D_Material:
-		Material_Del(node); return;
+		Material_Del(node);
+		return;
 	case TAG_X3D_MetadataDouble:
-		MetadataDouble_Del(node); return;
+		MetadataDouble_Del(node);
+		return;
 	case TAG_X3D_MetadataFloat:
-		MetadataFloat_Del(node); return;
+		MetadataFloat_Del(node);
+		return;
 	case TAG_X3D_MetadataInteger:
-		MetadataInteger_Del(node); return;
+		MetadataInteger_Del(node);
+		return;
 	case TAG_X3D_MetadataSet:
-		MetadataSet_Del(node); return;
+		MetadataSet_Del(node);
+		return;
 	case TAG_X3D_MetadataString:
-		MetadataString_Del(node); return;
+		MetadataString_Del(node);
+		return;
 	case TAG_X3D_MovieTexture:
-		MovieTexture_Del(node); return;
+		MovieTexture_Del(node);
+		return;
 	case TAG_X3D_MultiTexture:
-		MultiTexture_Del(node); return;
+		MultiTexture_Del(node);
+		return;
 	case TAG_X3D_MultiTextureCoordinate:
-		MultiTextureCoordinate_Del(node); return;
+		MultiTextureCoordinate_Del(node);
+		return;
 	case TAG_X3D_MultiTextureTransform:
-		MultiTextureTransform_Del(node); return;
+		MultiTextureTransform_Del(node);
+		return;
 	case TAG_X3D_NavigationInfo:
-		NavigationInfo_Del(node); return;
+		NavigationInfo_Del(node);
+		return;
 	case TAG_X3D_Normal:
-		Normal_Del(node); return;
+		Normal_Del(node);
+		return;
 	case TAG_X3D_NormalInterpolator:
-		NormalInterpolator_Del(node); return;
+		NormalInterpolator_Del(node);
+		return;
 	case TAG_X3D_NurbsCurve:
-		NurbsCurve_Del(node); return;
+		NurbsCurve_Del(node);
+		return;
 	case TAG_X3D_NurbsCurve2D:
-		NurbsCurve2D_Del(node); return;
+		NurbsCurve2D_Del(node);
+		return;
 	case TAG_X3D_NurbsOrientationInterpolator:
-		NurbsOrientationInterpolator_Del(node); return;
+		NurbsOrientationInterpolator_Del(node);
+		return;
 	case TAG_X3D_NurbsPatchSurface:
-		NurbsPatchSurface_Del(node); return;
+		NurbsPatchSurface_Del(node);
+		return;
 	case TAG_X3D_NurbsPositionInterpolator:
-		NurbsPositionInterpolator_Del(node); return;
+		NurbsPositionInterpolator_Del(node);
+		return;
 	case TAG_X3D_NurbsSet:
-		NurbsSet_Del(node); return;
+		NurbsSet_Del(node);
+		return;
 	case TAG_X3D_NurbsSurfaceInterpolator:
-		NurbsSurfaceInterpolator_Del(node); return;
+		NurbsSurfaceInterpolator_Del(node);
+		return;
 	case TAG_X3D_NurbsSweptSurface:
-		NurbsSweptSurface_Del(node); return;
+		NurbsSweptSurface_Del(node);
+		return;
 	case TAG_X3D_NurbsSwungSurface:
-		NurbsSwungSurface_Del(node); return;
+		NurbsSwungSurface_Del(node);
+		return;
 	case TAG_X3D_NurbsTextureCoordinate:
-		NurbsTextureCoordinate_Del(node); return;
+		NurbsTextureCoordinate_Del(node);
+		return;
 	case TAG_X3D_NurbsTrimmedSurface:
-		NurbsTrimmedSurface_Del(node); return;
+		NurbsTrimmedSurface_Del(node);
+		return;
 	case TAG_X3D_OrientationInterpolator:
-		OrientationInterpolator_Del(node); return;
+		OrientationInterpolator_Del(node);
+		return;
 	case TAG_X3D_PixelTexture:
-		PixelTexture_Del(node); return;
+		PixelTexture_Del(node);
+		return;
 	case TAG_X3D_PlaneSensor:
-		PlaneSensor_Del(node); return;
+		PlaneSensor_Del(node);
+		return;
 	case TAG_X3D_PointLight:
-		PointLight_Del(node); return;
+		PointLight_Del(node);
+		return;
 	case TAG_X3D_PointSet:
-		PointSet_Del(node); return;
+		PointSet_Del(node);
+		return;
 	case TAG_X3D_Polyline2D:
-		Polyline2D_Del(node); return;
+		Polyline2D_Del(node);
+		return;
 	case TAG_X3D_Polypoint2D:
-		Polypoint2D_Del(node); return;
+		Polypoint2D_Del(node);
+		return;
 	case TAG_X3D_PositionInterpolator:
-		PositionInterpolator_Del(node); return;
+		PositionInterpolator_Del(node);
+		return;
 	case TAG_X3D_PositionInterpolator2D:
-		PositionInterpolator2D_Del(node); return;
+		PositionInterpolator2D_Del(node);
+		return;
 	case TAG_X3D_ProximitySensor:
-		ProximitySensor_Del(node); return;
+		ProximitySensor_Del(node);
+		return;
 	case TAG_X3D_ReceiverPdu:
-		ReceiverPdu_Del(node); return;
+		ReceiverPdu_Del(node);
+		return;
 	case TAG_X3D_Rectangle2D:
-		Rectangle2D_Del(node); return;
+		Rectangle2D_Del(node);
+		return;
 	case TAG_X3D_ScalarInterpolator:
-		ScalarInterpolator_Del(node); return;
+		ScalarInterpolator_Del(node);
+		return;
 	case TAG_X3D_Script:
-		Script_Del(node); return;
+		Script_Del(node);
+		return;
 	case TAG_X3D_Shape:
-		Shape_Del(node); return;
+		Shape_Del(node);
+		return;
 	case TAG_X3D_SignalPdu:
-		SignalPdu_Del(node); return;
+		SignalPdu_Del(node);
+		return;
 	case TAG_X3D_Sound:
-		Sound_Del(node); return;
+		Sound_Del(node);
+		return;
 	case TAG_X3D_Sphere:
-		Sphere_Del(node); return;
+		Sphere_Del(node);
+		return;
 	case TAG_X3D_SphereSensor:
-		SphereSensor_Del(node); return;
+		SphereSensor_Del(node);
+		return;
 	case TAG_X3D_SpotLight:
-		SpotLight_Del(node); return;
+		SpotLight_Del(node);
+		return;
 	case TAG_X3D_StaticGroup:
-		StaticGroup_Del(node); return;
+		StaticGroup_Del(node);
+		return;
 	case TAG_X3D_StringSensor:
-		StringSensor_Del(node); return;
+		StringSensor_Del(node);
+		return;
 	case TAG_X3D_Switch:
-		Switch_Del(node); return;
+		Switch_Del(node);
+		return;
 	case TAG_X3D_Text:
-		Text_Del(node); return;
+		Text_Del(node);
+		return;
 	case TAG_X3D_TextureBackground:
-		TextureBackground_Del(node); return;
+		TextureBackground_Del(node);
+		return;
 	case TAG_X3D_TextureCoordinate:
-		TextureCoordinate_Del(node); return;
+		TextureCoordinate_Del(node);
+		return;
 	case TAG_X3D_TextureCoordinateGenerator:
-		TextureCoordinateGenerator_Del(node); return;
+		TextureCoordinateGenerator_Del(node);
+		return;
 	case TAG_X3D_TextureTransform:
-		TextureTransform_Del(node); return;
+		TextureTransform_Del(node);
+		return;
 	case TAG_X3D_TimeSensor:
-		TimeSensor_Del(node); return;
+		TimeSensor_Del(node);
+		return;
 	case TAG_X3D_TimeTrigger:
-		TimeTrigger_Del(node); return;
+		TimeTrigger_Del(node);
+		return;
 	case TAG_X3D_TouchSensor:
-		TouchSensor_Del(node); return;
+		TouchSensor_Del(node);
+		return;
 	case TAG_X3D_Transform:
-		Transform_Del(node); return;
+		Transform_Del(node);
+		return;
 	case TAG_X3D_TransmitterPdu:
-		TransmitterPdu_Del(node); return;
+		TransmitterPdu_Del(node);
+		return;
 	case TAG_X3D_TriangleFanSet:
-		TriangleFanSet_Del(node); return;
+		TriangleFanSet_Del(node);
+		return;
 	case TAG_X3D_TriangleSet:
-		TriangleSet_Del(node); return;
+		TriangleSet_Del(node);
+		return;
 	case TAG_X3D_TriangleSet2D:
-		TriangleSet2D_Del(node); return;
+		TriangleSet2D_Del(node);
+		return;
 	case TAG_X3D_TriangleStripSet:
-		TriangleStripSet_Del(node); return;
+		TriangleStripSet_Del(node);
+		return;
 	case TAG_X3D_Viewpoint:
-		Viewpoint_Del(node); return;
+		Viewpoint_Del(node);
+		return;
 	case TAG_X3D_VisibilitySensor:
-		VisibilitySensor_Del(node); return;
+		VisibilitySensor_Del(node);
+		return;
 	case TAG_X3D_WorldInfo:
-		WorldInfo_Del(node); return;
+		WorldInfo_Del(node);
+		return;
 	default:
 		return;
 	}
@@ -15079,134 +15207,262 @@
 u32 gf_sg_x3d_node_get_field_count(GF_Node *node)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_X3D_Anchor:return Anchor_get_field_count(node, 0);
-	case TAG_X3D_Appearance:return Appearance_get_field_count(node, 0);
-	case TAG_X3D_Arc2D:return Arc2D_get_field_count(node, 0);
-	case TAG_X3D_ArcClose2D:return ArcClose2D_get_field_count(node, 0);
-	case TAG_X3D_AudioClip:return AudioClip_get_field_count(node, 0);
-	case TAG_X3D_Background:return Background_get_field_count(node, 0);
-	case TAG_X3D_Billboard:return Billboard_get_field_count(node, 0);
-	case TAG_X3D_BooleanFilter:return BooleanFilter_get_field_count(node, 0);
-	case TAG_X3D_BooleanSequencer:return BooleanSequencer_get_field_count(node, 0);
-	case TAG_X3D_BooleanToggle:return BooleanToggle_get_field_count(node, 0);
-	case TAG_X3D_BooleanTrigger:return BooleanTrigger_get_field_count(node, 0);
-	case TAG_X3D_Box:return Box_get_field_count(node, 0);
-	case TAG_X3D_Circle2D:return Circle2D_get_field_count(node, 0);
-	case TAG_X3D_Collision:return Collision_get_field_count(node, 0);
-	case TAG_X3D_Color:return Color_get_field_count(node, 0);
-	case TAG_X3D_ColorInterpolator:return ColorInterpolator_get_field_count(node, 0);
-	case TAG_X3D_ColorRGBA:return ColorRGBA_get_field_count(node, 0);
-	case TAG_X3D_Cone:return Cone_get_field_count(node, 0);
-	case TAG_X3D_Contour2D:return Contour2D_get_field_count(node, 0);
-	case TAG_X3D_ContourPolyline2D:return ContourPolyline2D_get_field_count(node, 0);
-	case TAG_X3D_Coordinate:return Coordinate_get_field_count(node, 0);
-	case TAG_X3D_CoordinateDouble:return CoordinateDouble_get_field_count(node, 0);
-	case TAG_X3D_Coordinate2D:return Coordinate2D_get_field_count(node, 0);
-	case TAG_X3D_CoordinateInterpolator:return CoordinateInterpolator_get_field_count(node, 0);
-	case TAG_X3D_CoordinateInterpolator2D:return CoordinateInterpolator2D_get_field_count(node, 0);
-	case TAG_X3D_Cylinder:return Cylinder_get_field_count(node, 0);
-	case TAG_X3D_CylinderSensor:return CylinderSensor_get_field_count(node, 0);
-	case TAG_X3D_DirectionalLight:return DirectionalLight_get_field_count(node, 0);
-	case TAG_X3D_Disk2D:return Disk2D_get_field_count(node, 0);
-	case TAG_X3D_ElevationGrid:return ElevationGrid_get_field_count(node, 0);
-	case TAG_X3D_EspduTransform:return EspduTransform_get_field_count(node, 0);
-	case TAG_X3D_Extrusion:return Extrusion_get_field_count(node, 0);
-	case TAG_X3D_FillProperties:return FillProperties_get_field_count(node, 0);
-	case TAG_X3D_Fog:return Fog_get_field_count(node, 0);
-	case TAG_X3D_FontStyle:return FontStyle_get_field_count(node, 0);
-	case TAG_X3D_GeoCoordinate:return GeoCoordinate_get_field_count(node, 0);
-	case TAG_X3D_GeoElevationGrid:return GeoElevationGrid_get_field_count(node, 0);
-	case TAG_X3D_GeoLocation:return GeoLocation_get_field_count(node, 0);
-	case TAG_X3D_GeoLOD:return GeoLOD_get_field_count(node, 0);
-	case TAG_X3D_GeoMetadata:return GeoMetadata_get_field_count(node, 0);
-	case TAG_X3D_GeoOrigin:return GeoOrigin_get_field_count(node, 0);
-	case TAG_X3D_GeoPositionInterpolator:return GeoPositionInterpolator_get_field_count(node, 0);
-	case TAG_X3D_GeoTouchSensor:return GeoTouchSensor_get_field_count(node, 0);
-	case TAG_X3D_GeoViewpoint:return GeoViewpoint_get_field_count(node, 0);
-	case TAG_X3D_Group:return Group_get_field_count(node, 0);
-	case TAG_X3D_HAnimDisplacer:return HAnimDisplacer_get_field_count(node, 0);
-	case TAG_X3D_HAnimHumanoid:return HAnimHumanoid_get_field_count(node, 0);
-	case TAG_X3D_HAnimJoint:return HAnimJoint_get_field_count(node, 0);
-	case TAG_X3D_HAnimSegment:return HAnimSegment_get_field_count(node, 0);
-	case TAG_X3D_HAnimSite:return HAnimSite_get_field_count(node, 0);
-	case TAG_X3D_ImageTexture:return ImageTexture_get_field_count(node, 0);
-	case TAG_X3D_IndexedFaceSet:return IndexedFaceSet_get_field_count(node, 0);
-	case TAG_X3D_IndexedLineSet:return IndexedLineSet_get_field_count(node, 0);
-	case TAG_X3D_IndexedTriangleFanSet:return IndexedTriangleFanSet_get_field_count(node, 0);
-	case TAG_X3D_IndexedTriangleSet:return IndexedTriangleSet_get_field_count(node, 0);
-	case TAG_X3D_IndexedTriangleStripSet:return IndexedTriangleStripSet_get_field_count(node, 0);
-	case TAG_X3D_Inline:return Inline_get_field_count(node, 0);
-	case TAG_X3D_IntegerSequencer:return IntegerSequencer_get_field_count(node, 0);
-	case TAG_X3D_IntegerTrigger:return IntegerTrigger_get_field_count(node, 0);
-	case TAG_X3D_KeySensor:return KeySensor_get_field_count(node, 0);
-	case TAG_X3D_LineProperties:return LineProperties_get_field_count(node, 0);
-	case TAG_X3D_LineSet:return LineSet_get_field_count(node, 0);
-	case TAG_X3D_LoadSensor:return LoadSensor_get_field_count(node, 0);
-	case TAG_X3D_LOD:return LOD_get_field_count(node, 0);
-	case TAG_X3D_Material:return Material_get_field_count(node, 0);
-	case TAG_X3D_MetadataDouble:return MetadataDouble_get_field_count(node, 0);
-	case TAG_X3D_MetadataFloat:return MetadataFloat_get_field_count(node, 0);
-	case TAG_X3D_MetadataInteger:return MetadataInteger_get_field_count(node, 0);
-	case TAG_X3D_MetadataSet:return MetadataSet_get_field_count(node, 0);
-	case TAG_X3D_MetadataString:return MetadataString_get_field_count(node, 0);
-	case TAG_X3D_MovieTexture:return MovieTexture_get_field_count(node, 0);
-	case TAG_X3D_MultiTexture:return MultiTexture_get_field_count(node, 0);
-	case TAG_X3D_MultiTextureCoordinate:return MultiTextureCoordinate_get_field_count(node, 0);
-	case TAG_X3D_MultiTextureTransform:return MultiTextureTransform_get_field_count(node, 0);
-	case TAG_X3D_NavigationInfo:return NavigationInfo_get_field_count(node, 0);
-	case TAG_X3D_Normal:return Normal_get_field_count(node, 0);
-	case TAG_X3D_NormalInterpolator:return NormalInterpolator_get_field_count(node, 0);
-	case TAG_X3D_NurbsCurve:return NurbsCurve_get_field_count(node, 0);
-	case TAG_X3D_NurbsCurve2D:return NurbsCurve2D_get_field_count(node, 0);
-	case TAG_X3D_NurbsOrientationInterpolator:return NurbsOrientationInterpolator_get_field_count(node, 0);
-	case TAG_X3D_NurbsPatchSurface:return NurbsPatchSurface_get_field_count(node, 0);
-	case TAG_X3D_NurbsPositionInterpolator:return NurbsPositionInterpolator_get_field_count(node, 0);
-	case TAG_X3D_NurbsSet:return NurbsSet_get_field_count(node, 0);
-	case TAG_X3D_NurbsSurfaceInterpolator:return NurbsSurfaceInterpolator_get_field_count(node, 0);
-	case TAG_X3D_NurbsSweptSurface:return NurbsSweptSurface_get_field_count(node, 0);
-	case TAG_X3D_NurbsSwungSurface:return NurbsSwungSurface_get_field_count(node, 0);
-	case TAG_X3D_NurbsTextureCoordinate:return NurbsTextureCoordinate_get_field_count(node, 0);
-	case TAG_X3D_NurbsTrimmedSurface:return NurbsTrimmedSurface_get_field_count(node, 0);
-	case TAG_X3D_OrientationInterpolator:return OrientationInterpolator_get_field_count(node, 0);
-	case TAG_X3D_PixelTexture:return PixelTexture_get_field_count(node, 0);
-	case TAG_X3D_PlaneSensor:return PlaneSensor_get_field_count(node, 0);
-	case TAG_X3D_PointLight:return PointLight_get_field_count(node, 0);
-	case TAG_X3D_PointSet:return PointSet_get_field_count(node, 0);
-	case TAG_X3D_Polyline2D:return Polyline2D_get_field_count(node, 0);
-	case TAG_X3D_Polypoint2D:return Polypoint2D_get_field_count(node, 0);
-	case TAG_X3D_PositionInterpolator:return PositionInterpolator_get_field_count(node, 0);
-	case TAG_X3D_PositionInterpolator2D:return PositionInterpolator2D_get_field_count(node, 0);
-	case TAG_X3D_ProximitySensor:return ProximitySensor_get_field_count(node, 0);
-	case TAG_X3D_ReceiverPdu:return ReceiverPdu_get_field_count(node, 0);
-	case TAG_X3D_Rectangle2D:return Rectangle2D_get_field_count(node, 0);
-	case TAG_X3D_ScalarInterpolator:return ScalarInterpolator_get_field_count(node, 0);
-	case TAG_X3D_Script:return Script_get_field_count(node, 0);
-	case TAG_X3D_Shape:return Shape_get_field_count(node, 0);
-	case TAG_X3D_SignalPdu:return SignalPdu_get_field_count(node, 0);
-	case TAG_X3D_Sound:return Sound_get_field_count(node, 0);
-	case TAG_X3D_Sphere:return Sphere_get_field_count(node, 0);
-	case TAG_X3D_SphereSensor:return SphereSensor_get_field_count(node, 0);
-	case TAG_X3D_SpotLight:return SpotLight_get_field_count(node, 0);
-	case TAG_X3D_StaticGroup:return StaticGroup_get_field_count(node, 0);
-	case TAG_X3D_StringSensor:return StringSensor_get_field_count(node, 0);
-	case TAG_X3D_Switch:return Switch_get_field_count(node, 0);
-	case TAG_X3D_Text:return Text_get_field_count(node, 0);
-	case TAG_X3D_TextureBackground:return TextureBackground_get_field_count(node, 0);
-	case TAG_X3D_TextureCoordinate:return TextureCoordinate_get_field_count(node, 0);
-	case TAG_X3D_TextureCoordinateGenerator:return TextureCoordinateGenerator_get_field_count(node, 0);
-	case TAG_X3D_TextureTransform:return TextureTransform_get_field_count(node, 0);
-	case TAG_X3D_TimeSensor:return TimeSensor_get_field_count(node, 0);
-	case TAG_X3D_TimeTrigger:return TimeTrigger_get_field_count(node, 0);
-	case TAG_X3D_TouchSensor:return TouchSensor_get_field_count(node, 0);
-	case TAG_X3D_Transform:return Transform_get_field_count(node, 0);
-	case TAG_X3D_TransmitterPdu:return TransmitterPdu_get_field_count(node, 0);
-	case TAG_X3D_TriangleFanSet:return TriangleFanSet_get_field_count(node, 0);
-	case TAG_X3D_TriangleSet:return TriangleSet_get_field_count(node, 0);
-	case TAG_X3D_TriangleSet2D:return TriangleSet2D_get_field_count(node, 0);
-	case TAG_X3D_TriangleStripSet:return TriangleStripSet_get_field_count(node, 0);
-	case TAG_X3D_Viewpoint:return Viewpoint_get_field_count(node, 0);
-	case TAG_X3D_VisibilitySensor:return VisibilitySensor_get_field_count(node, 0);
-	case TAG_X3D_WorldInfo:return WorldInfo_get_field_count(node, 0);
+	case TAG_X3D_Anchor:
+		return Anchor_get_field_count(node, 0);
+	case TAG_X3D_Appearance:
+		return Appearance_get_field_count(node, 0);
+	case TAG_X3D_Arc2D:
+		return Arc2D_get_field_count(node, 0);
+	case TAG_X3D_ArcClose2D:
+		return ArcClose2D_get_field_count(node, 0);
+	case TAG_X3D_AudioClip:
+		return AudioClip_get_field_count(node, 0);
+	case TAG_X3D_Background:
+		return Background_get_field_count(node, 0);
+	case TAG_X3D_Billboard:
+		return Billboard_get_field_count(node, 0);
+	case TAG_X3D_BooleanFilter:
+		return BooleanFilter_get_field_count(node, 0);
+	case TAG_X3D_BooleanSequencer:
+		return BooleanSequencer_get_field_count(node, 0);
+	case TAG_X3D_BooleanToggle:
+		return BooleanToggle_get_field_count(node, 0);
+	case TAG_X3D_BooleanTrigger:
+		return BooleanTrigger_get_field_count(node, 0);
+	case TAG_X3D_Box:
+		return Box_get_field_count(node, 0);
+	case TAG_X3D_Circle2D:
+		return Circle2D_get_field_count(node, 0);
+	case TAG_X3D_Collision:
+		return Collision_get_field_count(node, 0);
+	case TAG_X3D_Color:
+		return Color_get_field_count(node, 0);
+	case TAG_X3D_ColorInterpolator:
+		return ColorInterpolator_get_field_count(node, 0);
+	case TAG_X3D_ColorRGBA:
+		return ColorRGBA_get_field_count(node, 0);
+	case TAG_X3D_Cone:
+		return Cone_get_field_count(node, 0);
+	case TAG_X3D_Contour2D:
+		return Contour2D_get_field_count(node, 0);
+	case TAG_X3D_ContourPolyline2D:
+		return ContourPolyline2D_get_field_count(node, 0);
+	case TAG_X3D_Coordinate:
+		return Coordinate_get_field_count(node, 0);
+	case TAG_X3D_CoordinateDouble:
+		return CoordinateDouble_get_field_count(node, 0);
+	case TAG_X3D_Coordinate2D:
+		return Coordinate2D_get_field_count(node, 0);
+	case TAG_X3D_CoordinateInterpolator:
+		return CoordinateInterpolator_get_field_count(node, 0);
+	case TAG_X3D_CoordinateInterpolator2D:
+		return CoordinateInterpolator2D_get_field_count(node, 0);
+	case TAG_X3D_Cylinder:
+		return Cylinder_get_field_count(node, 0);
+	case TAG_X3D_CylinderSensor:
+		return CylinderSensor_get_field_count(node, 0);
+	case TAG_X3D_DirectionalLight:
+		return DirectionalLight_get_field_count(node, 0);
+	case TAG_X3D_Disk2D:
+		return Disk2D_get_field_count(node, 0);
+	case TAG_X3D_ElevationGrid:
+		return ElevationGrid_get_field_count(node, 0);
+	case TAG_X3D_EspduTransform:
+		return EspduTransform_get_field_count(node, 0);
+	case TAG_X3D_Extrusion:
+		return Extrusion_get_field_count(node, 0);
+	case TAG_X3D_FillProperties:
+		return FillProperties_get_field_count(node, 0);
+	case TAG_X3D_Fog:
+		return Fog_get_field_count(node, 0);
+	case TAG_X3D_FontStyle:
+		return FontStyle_get_field_count(node, 0);
+	case TAG_X3D_GeoCoordinate:
+		return GeoCoordinate_get_field_count(node, 0);
+	case TAG_X3D_GeoElevationGrid:
+		return GeoElevationGrid_get_field_count(node, 0);
+	case TAG_X3D_GeoLocation:
+		return GeoLocation_get_field_count(node, 0);
+	case TAG_X3D_GeoLOD:
+		return GeoLOD_get_field_count(node, 0);
+	case TAG_X3D_GeoMetadata:
+		return GeoMetadata_get_field_count(node, 0);
+	case TAG_X3D_GeoOrigin:
+		return GeoOrigin_get_field_count(node, 0);
+	case TAG_X3D_GeoPositionInterpolator:
+		return GeoPositionInterpolator_get_field_count(node, 0);
+	case TAG_X3D_GeoTouchSensor:
+		return GeoTouchSensor_get_field_count(node, 0);
+	case TAG_X3D_GeoViewpoint:
+		return GeoViewpoint_get_field_count(node, 0);
+	case TAG_X3D_Group:
+		return Group_get_field_count(node, 0);
+	case TAG_X3D_HAnimDisplacer:
+		return HAnimDisplacer_get_field_count(node, 0);
+	case TAG_X3D_HAnimHumanoid:
+		return HAnimHumanoid_get_field_count(node, 0);
+	case TAG_X3D_HAnimJoint:
+		return HAnimJoint_get_field_count(node, 0);
+	case TAG_X3D_HAnimSegment:
+		return HAnimSegment_get_field_count(node, 0);
+	case TAG_X3D_HAnimSite:
+		return HAnimSite_get_field_count(node, 0);
+	case TAG_X3D_ImageTexture:
+		return ImageTexture_get_field_count(node, 0);
+	case TAG_X3D_IndexedFaceSet:
+		return IndexedFaceSet_get_field_count(node, 0);
+	case TAG_X3D_IndexedLineSet:
+		return IndexedLineSet_get_field_count(node, 0);
+	case TAG_X3D_IndexedTriangleFanSet:
+		return IndexedTriangleFanSet_get_field_count(node, 0);
+	case TAG_X3D_IndexedTriangleSet:
+		return IndexedTriangleSet_get_field_count(node, 0);
+	case TAG_X3D_IndexedTriangleStripSet:
+		return IndexedTriangleStripSet_get_field_count(node, 0);
+	case TAG_X3D_Inline:
+		return Inline_get_field_count(node, 0);
+	case TAG_X3D_IntegerSequencer:
+		return IntegerSequencer_get_field_count(node, 0);
+	case TAG_X3D_IntegerTrigger:
+		return IntegerTrigger_get_field_count(node, 0);
+	case TAG_X3D_KeySensor:
+		return KeySensor_get_field_count(node, 0);
+	case TAG_X3D_LineProperties:
+		return LineProperties_get_field_count(node, 0);
+	case TAG_X3D_LineSet:
+		return LineSet_get_field_count(node, 0);
+	case TAG_X3D_LoadSensor:
+		return LoadSensor_get_field_count(node, 0);
+	case TAG_X3D_LOD:
+		return LOD_get_field_count(node, 0);
+	case TAG_X3D_Material:
+		return Material_get_field_count(node, 0);
+	case TAG_X3D_MetadataDouble:
+		return MetadataDouble_get_field_count(node, 0);
+	case TAG_X3D_MetadataFloat:
+		return MetadataFloat_get_field_count(node, 0);
+	case TAG_X3D_MetadataInteger:
+		return MetadataInteger_get_field_count(node, 0);
+	case TAG_X3D_MetadataSet:
+		return MetadataSet_get_field_count(node, 0);
+	case TAG_X3D_MetadataString:
+		return MetadataString_get_field_count(node, 0);
+	case TAG_X3D_MovieTexture:
+		return MovieTexture_get_field_count(node, 0);
+	case TAG_X3D_MultiTexture:
+		return MultiTexture_get_field_count(node, 0);
+	case TAG_X3D_MultiTextureCoordinate:
+		return MultiTextureCoordinate_get_field_count(node, 0);
+	case TAG_X3D_MultiTextureTransform:
+		return MultiTextureTransform_get_field_count(node, 0);
+	case TAG_X3D_NavigationInfo:
+		return NavigationInfo_get_field_count(node, 0);
+	case TAG_X3D_Normal:
+		return Normal_get_field_count(node, 0);
+	case TAG_X3D_NormalInterpolator:
+		return NormalInterpolator_get_field_count(node, 0);
+	case TAG_X3D_NurbsCurve:
+		return NurbsCurve_get_field_count(node, 0);
+	case TAG_X3D_NurbsCurve2D:
+		return NurbsCurve2D_get_field_count(node, 0);
+	case TAG_X3D_NurbsOrientationInterpolator:
+		return NurbsOrientationInterpolator_get_field_count(node, 0);
+	case TAG_X3D_NurbsPatchSurface:
+		return NurbsPatchSurface_get_field_count(node, 0);
+	case TAG_X3D_NurbsPositionInterpolator:
+		return NurbsPositionInterpolator_get_field_count(node, 0);
+	case TAG_X3D_NurbsSet:
+		return NurbsSet_get_field_count(node, 0);
+	case TAG_X3D_NurbsSurfaceInterpolator:
+		return NurbsSurfaceInterpolator_get_field_count(node, 0);
+	case TAG_X3D_NurbsSweptSurface:
+		return NurbsSweptSurface_get_field_count(node, 0);
+	case TAG_X3D_NurbsSwungSurface:
+		return NurbsSwungSurface_get_field_count(node, 0);
+	case TAG_X3D_NurbsTextureCoordinate:
+		return NurbsTextureCoordinate_get_field_count(node, 0);
+	case TAG_X3D_NurbsTrimmedSurface:
+		return NurbsTrimmedSurface_get_field_count(node, 0);
+	case TAG_X3D_OrientationInterpolator:
+		return OrientationInterpolator_get_field_count(node, 0);
+	case TAG_X3D_PixelTexture:
+		return PixelTexture_get_field_count(node, 0);
+	case TAG_X3D_PlaneSensor:
+		return PlaneSensor_get_field_count(node, 0);
+	case TAG_X3D_PointLight:
+		return PointLight_get_field_count(node, 0);
+	case TAG_X3D_PointSet:
+		return PointSet_get_field_count(node, 0);
+	case TAG_X3D_Polyline2D:
+		return Polyline2D_get_field_count(node, 0);
+	case TAG_X3D_Polypoint2D:
+		return Polypoint2D_get_field_count(node, 0);
+	case TAG_X3D_PositionInterpolator:
+		return PositionInterpolator_get_field_count(node, 0);
+	case TAG_X3D_PositionInterpolator2D:
+		return PositionInterpolator2D_get_field_count(node, 0);
+	case TAG_X3D_ProximitySensor:
+		return ProximitySensor_get_field_count(node, 0);
+	case TAG_X3D_ReceiverPdu:
+		return ReceiverPdu_get_field_count(node, 0);
+	case TAG_X3D_Rectangle2D:
+		return Rectangle2D_get_field_count(node, 0);
+	case TAG_X3D_ScalarInterpolator:
+		return ScalarInterpolator_get_field_count(node, 0);
+	case TAG_X3D_Script:
+		return Script_get_field_count(node, 0);
+	case TAG_X3D_Shape:
+		return Shape_get_field_count(node, 0);
+	case TAG_X3D_SignalPdu:
+		return SignalPdu_get_field_count(node, 0);
+	case TAG_X3D_Sound:
+		return Sound_get_field_count(node, 0);
+	case TAG_X3D_Sphere:
+		return Sphere_get_field_count(node, 0);
+	case TAG_X3D_SphereSensor:
+		return SphereSensor_get_field_count(node, 0);
+	case TAG_X3D_SpotLight:
+		return SpotLight_get_field_count(node, 0);
+	case TAG_X3D_StaticGroup:
+		return StaticGroup_get_field_count(node, 0);
+	case TAG_X3D_StringSensor:
+		return StringSensor_get_field_count(node, 0);
+	case TAG_X3D_Switch:
+		return Switch_get_field_count(node, 0);
+	case TAG_X3D_Text:
+		return Text_get_field_count(node, 0);
+	case TAG_X3D_TextureBackground:
+		return TextureBackground_get_field_count(node, 0);
+	case TAG_X3D_TextureCoordinate:
+		return TextureCoordinate_get_field_count(node, 0);
+	case TAG_X3D_TextureCoordinateGenerator:
+		return TextureCoordinateGenerator_get_field_count(node, 0);
+	case TAG_X3D_TextureTransform:
+		return TextureTransform_get_field_count(node, 0);
+	case TAG_X3D_TimeSensor:
+		return TimeSensor_get_field_count(node, 0);
+	case TAG_X3D_TimeTrigger:
+		return TimeTrigger_get_field_count(node, 0);
+	case TAG_X3D_TouchSensor:
+		return TouchSensor_get_field_count(node, 0);
+	case TAG_X3D_Transform:
+		return Transform_get_field_count(node, 0);
+	case TAG_X3D_TransmitterPdu:
+		return TransmitterPdu_get_field_count(node, 0);
+	case TAG_X3D_TriangleFanSet:
+		return TriangleFanSet_get_field_count(node, 0);
+	case TAG_X3D_TriangleSet:
+		return TriangleSet_get_field_count(node, 0);
+	case TAG_X3D_TriangleSet2D:
+		return TriangleSet2D_get_field_count(node, 0);
+	case TAG_X3D_TriangleStripSet:
+		return TriangleStripSet_get_field_count(node, 0);
+	case TAG_X3D_Viewpoint:
+		return Viewpoint_get_field_count(node, 0);
+	case TAG_X3D_VisibilitySensor:
+		return VisibilitySensor_get_field_count(node, 0);
+	case TAG_X3D_WorldInfo:
+		return WorldInfo_get_field_count(node, 0);
 	default:
 		return 0;
 	}
@@ -15215,134 +15471,262 @@
 GF_Err gf_sg_x3d_node_get_field(GF_Node *node, GF_FieldInfo *field)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_X3D_Anchor: return Anchor_get_field(node, field);
-	case TAG_X3D_Appearance: return Appearance_get_field(node, field);
-	case TAG_X3D_Arc2D: return Arc2D_get_field(node, field);
-	case TAG_X3D_ArcClose2D: return ArcClose2D_get_field(node, field);
-	case TAG_X3D_AudioClip: return AudioClip_get_field(node, field);
-	case TAG_X3D_Background: return Background_get_field(node, field);
-	case TAG_X3D_Billboard: return Billboard_get_field(node, field);
-	case TAG_X3D_BooleanFilter: return BooleanFilter_get_field(node, field);
-	case TAG_X3D_BooleanSequencer: return BooleanSequencer_get_field(node, field);
-	case TAG_X3D_BooleanToggle: return BooleanToggle_get_field(node, field);
-	case TAG_X3D_BooleanTrigger: return BooleanTrigger_get_field(node, field);
-	case TAG_X3D_Box: return Box_get_field(node, field);
-	case TAG_X3D_Circle2D: return Circle2D_get_field(node, field);
-	case TAG_X3D_Collision: return Collision_get_field(node, field);
-	case TAG_X3D_Color: return Color_get_field(node, field);
-	case TAG_X3D_ColorInterpolator: return ColorInterpolator_get_field(node, field);
-	case TAG_X3D_ColorRGBA: return ColorRGBA_get_field(node, field);
-	case TAG_X3D_Cone: return Cone_get_field(node, field);
-	case TAG_X3D_Contour2D: return Contour2D_get_field(node, field);
-	case TAG_X3D_ContourPolyline2D: return ContourPolyline2D_get_field(node, field);
-	case TAG_X3D_Coordinate: return Coordinate_get_field(node, field);
-	case TAG_X3D_CoordinateDouble: return CoordinateDouble_get_field(node, field);
-	case TAG_X3D_Coordinate2D: return Coordinate2D_get_field(node, field);
-	case TAG_X3D_CoordinateInterpolator: return CoordinateInterpolator_get_field(node, field);
-	case TAG_X3D_CoordinateInterpolator2D: return CoordinateInterpolator2D_get_field(node, field);
-	case TAG_X3D_Cylinder: return Cylinder_get_field(node, field);
-	case TAG_X3D_CylinderSensor: return CylinderSensor_get_field(node, field);
-	case TAG_X3D_DirectionalLight: return DirectionalLight_get_field(node, field);
-	case TAG_X3D_Disk2D: return Disk2D_get_field(node, field);
-	case TAG_X3D_ElevationGrid: return ElevationGrid_get_field(node, field);
-	case TAG_X3D_EspduTransform: return EspduTransform_get_field(node, field);
-	case TAG_X3D_Extrusion: return Extrusion_get_field(node, field);
-	case TAG_X3D_FillProperties: return FillProperties_get_field(node, field);
-	case TAG_X3D_Fog: return Fog_get_field(node, field);
-	case TAG_X3D_FontStyle: return FontStyle_get_field(node, field);
-	case TAG_X3D_GeoCoordinate: return GeoCoordinate_get_field(node, field);
-	case TAG_X3D_GeoElevationGrid: return GeoElevationGrid_get_field(node, field);
-	case TAG_X3D_GeoLocation: return GeoLocation_get_field(node, field);
-	case TAG_X3D_GeoLOD: return GeoLOD_get_field(node, field);
-	case TAG_X3D_GeoMetadata: return GeoMetadata_get_field(node, field);
-	case TAG_X3D_GeoOrigin: return GeoOrigin_get_field(node, field);
-	case TAG_X3D_GeoPositionInterpolator: return GeoPositionInterpolator_get_field(node, field);
-	case TAG_X3D_GeoTouchSensor: return GeoTouchSensor_get_field(node, field);
-	case TAG_X3D_GeoViewpoint: return GeoViewpoint_get_field(node, field);
-	case TAG_X3D_Group: return Group_get_field(node, field);
-	case TAG_X3D_HAnimDisplacer: return HAnimDisplacer_get_field(node, field);
-	case TAG_X3D_HAnimHumanoid: return HAnimHumanoid_get_field(node, field);
-	case TAG_X3D_HAnimJoint: return HAnimJoint_get_field(node, field);
-	case TAG_X3D_HAnimSegment: return HAnimSegment_get_field(node, field);
-	case TAG_X3D_HAnimSite: return HAnimSite_get_field(node, field);
-	case TAG_X3D_ImageTexture: return ImageTexture_get_field(node, field);
-	case TAG_X3D_IndexedFaceSet: return IndexedFaceSet_get_field(node, field);
-	case TAG_X3D_IndexedLineSet: return IndexedLineSet_get_field(node, field);
-	case TAG_X3D_IndexedTriangleFanSet: return IndexedTriangleFanSet_get_field(node, field);
-	case TAG_X3D_IndexedTriangleSet: return IndexedTriangleSet_get_field(node, field);
-	case TAG_X3D_IndexedTriangleStripSet: return IndexedTriangleStripSet_get_field(node, field);
-	case TAG_X3D_Inline: return Inline_get_field(node, field);
-	case TAG_X3D_IntegerSequencer: return IntegerSequencer_get_field(node, field);
-	case TAG_X3D_IntegerTrigger: return IntegerTrigger_get_field(node, field);
-	case TAG_X3D_KeySensor: return KeySensor_get_field(node, field);
-	case TAG_X3D_LineProperties: return LineProperties_get_field(node, field);
-	case TAG_X3D_LineSet: return LineSet_get_field(node, field);
-	case TAG_X3D_LoadSensor: return LoadSensor_get_field(node, field);
-	case TAG_X3D_LOD: return LOD_get_field(node, field);
-	case TAG_X3D_Material: return Material_get_field(node, field);
-	case TAG_X3D_MetadataDouble: return MetadataDouble_get_field(node, field);
-	case TAG_X3D_MetadataFloat: return MetadataFloat_get_field(node, field);
-	case TAG_X3D_MetadataInteger: return MetadataInteger_get_field(node, field);
-	case TAG_X3D_MetadataSet: return MetadataSet_get_field(node, field);
-	case TAG_X3D_MetadataString: return MetadataString_get_field(node, field);
-	case TAG_X3D_MovieTexture: return MovieTexture_get_field(node, field);
-	case TAG_X3D_MultiTexture: return MultiTexture_get_field(node, field);
-	case TAG_X3D_MultiTextureCoordinate: return MultiTextureCoordinate_get_field(node, field);
-	case TAG_X3D_MultiTextureTransform: return MultiTextureTransform_get_field(node, field);
-	case TAG_X3D_NavigationInfo: return NavigationInfo_get_field(node, field);
-	case TAG_X3D_Normal: return Normal_get_field(node, field);
-	case TAG_X3D_NormalInterpolator: return NormalInterpolator_get_field(node, field);
-	case TAG_X3D_NurbsCurve: return NurbsCurve_get_field(node, field);
-	case TAG_X3D_NurbsCurve2D: return NurbsCurve2D_get_field(node, field);
-	case TAG_X3D_NurbsOrientationInterpolator: return NurbsOrientationInterpolator_get_field(node, field);
-	case TAG_X3D_NurbsPatchSurface: return NurbsPatchSurface_get_field(node, field);
-	case TAG_X3D_NurbsPositionInterpolator: return NurbsPositionInterpolator_get_field(node, field);
-	case TAG_X3D_NurbsSet: return NurbsSet_get_field(node, field);
-	case TAG_X3D_NurbsSurfaceInterpolator: return NurbsSurfaceInterpolator_get_field(node, field);
-	case TAG_X3D_NurbsSweptSurface: return NurbsSweptSurface_get_field(node, field);
-	case TAG_X3D_NurbsSwungSurface: return NurbsSwungSurface_get_field(node, field);
-	case TAG_X3D_NurbsTextureCoordinate: return NurbsTextureCoordinate_get_field(node, field);
-	case TAG_X3D_NurbsTrimmedSurface: return NurbsTrimmedSurface_get_field(node, field);
-	case TAG_X3D_OrientationInterpolator: return OrientationInterpolator_get_field(node, field);
-	case TAG_X3D_PixelTexture: return PixelTexture_get_field(node, field);
-	case TAG_X3D_PlaneSensor: return PlaneSensor_get_field(node, field);
-	case TAG_X3D_PointLight: return PointLight_get_field(node, field);
-	case TAG_X3D_PointSet: return PointSet_get_field(node, field);
-	case TAG_X3D_Polyline2D: return Polyline2D_get_field(node, field);
-	case TAG_X3D_Polypoint2D: return Polypoint2D_get_field(node, field);
-	case TAG_X3D_PositionInterpolator: return PositionInterpolator_get_field(node, field);
-	case TAG_X3D_PositionInterpolator2D: return PositionInterpolator2D_get_field(node, field);
-	case TAG_X3D_ProximitySensor: return ProximitySensor_get_field(node, field);
-	case TAG_X3D_ReceiverPdu: return ReceiverPdu_get_field(node, field);
-	case TAG_X3D_Rectangle2D: return Rectangle2D_get_field(node, field);
-	case TAG_X3D_ScalarInterpolator: return ScalarInterpolator_get_field(node, field);
-	case TAG_X3D_Script: return Script_get_field(node, field);
-	case TAG_X3D_Shape: return Shape_get_field(node, field);
-	case TAG_X3D_SignalPdu: return SignalPdu_get_field(node, field);
-	case TAG_X3D_Sound: return Sound_get_field(node, field);
-	case TAG_X3D_Sphere: return Sphere_get_field(node, field);
-	case TAG_X3D_SphereSensor: return SphereSensor_get_field(node, field);
-	case TAG_X3D_SpotLight: return SpotLight_get_field(node, field);
-	case TAG_X3D_StaticGroup: return StaticGroup_get_field(node, field);
-	case TAG_X3D_StringSensor: return StringSensor_get_field(node, field);
-	case TAG_X3D_Switch: return Switch_get_field(node, field);
-	case TAG_X3D_Text: return Text_get_field(node, field);
-	case TAG_X3D_TextureBackground: return TextureBackground_get_field(node, field);
-	case TAG_X3D_TextureCoordinate: return TextureCoordinate_get_field(node, field);
-	case TAG_X3D_TextureCoordinateGenerator: return TextureCoordinateGenerator_get_field(node, field);
-	case TAG_X3D_TextureTransform: return TextureTransform_get_field(node, field);
-	case TAG_X3D_TimeSensor: return TimeSensor_get_field(node, field);
-	case TAG_X3D_TimeTrigger: return TimeTrigger_get_field(node, field);
-	case TAG_X3D_TouchSensor: return TouchSensor_get_field(node, field);
-	case TAG_X3D_Transform: return Transform_get_field(node, field);
-	case TAG_X3D_TransmitterPdu: return TransmitterPdu_get_field(node, field);
-	case TAG_X3D_TriangleFanSet: return TriangleFanSet_get_field(node, field);
-	case TAG_X3D_TriangleSet: return TriangleSet_get_field(node, field);
-	case TAG_X3D_TriangleSet2D: return TriangleSet2D_get_field(node, field);
-	case TAG_X3D_TriangleStripSet: return TriangleStripSet_get_field(node, field);
-	case TAG_X3D_Viewpoint: return Viewpoint_get_field(node, field);
-	case TAG_X3D_VisibilitySensor: return VisibilitySensor_get_field(node, field);
-	case TAG_X3D_WorldInfo: return WorldInfo_get_field(node, field);
+	case TAG_X3D_Anchor:
+		return Anchor_get_field(node, field);
+	case TAG_X3D_Appearance:
+		return Appearance_get_field(node, field);
+	case TAG_X3D_Arc2D:
+		return Arc2D_get_field(node, field);
+	case TAG_X3D_ArcClose2D:
+		return ArcClose2D_get_field(node, field);
+	case TAG_X3D_AudioClip:
+		return AudioClip_get_field(node, field);
+	case TAG_X3D_Background:
+		return Background_get_field(node, field);
+	case TAG_X3D_Billboard:
+		return Billboard_get_field(node, field);
+	case TAG_X3D_BooleanFilter:
+		return BooleanFilter_get_field(node, field);
+	case TAG_X3D_BooleanSequencer:
+		return BooleanSequencer_get_field(node, field);
+	case TAG_X3D_BooleanToggle:
+		return BooleanToggle_get_field(node, field);
+	case TAG_X3D_BooleanTrigger:
+		return BooleanTrigger_get_field(node, field);
+	case TAG_X3D_Box:
+		return Box_get_field(node, field);
+	case TAG_X3D_Circle2D:
+		return Circle2D_get_field(node, field);
+	case TAG_X3D_Collision:
+		return Collision_get_field(node, field);
+	case TAG_X3D_Color:
+		return Color_get_field(node, field);
+	case TAG_X3D_ColorInterpolator:
+		return ColorInterpolator_get_field(node, field);
+	case TAG_X3D_ColorRGBA:
+		return ColorRGBA_get_field(node, field);
+	case TAG_X3D_Cone:
+		return Cone_get_field(node, field);
+	case TAG_X3D_Contour2D:
+		return Contour2D_get_field(node, field);
+	case TAG_X3D_ContourPolyline2D:
+		return ContourPolyline2D_get_field(node, field);
+	case TAG_X3D_Coordinate:
+		return Coordinate_get_field(node, field);
+	case TAG_X3D_CoordinateDouble:
+		return CoordinateDouble_get_field(node, field);
+	case TAG_X3D_Coordinate2D:
+		return Coordinate2D_get_field(node, field);
+	case TAG_X3D_CoordinateInterpolator:
+		return CoordinateInterpolator_get_field(node, field);
+	case TAG_X3D_CoordinateInterpolator2D:
+		return CoordinateInterpolator2D_get_field(node, field);
+	case TAG_X3D_Cylinder:
+		return Cylinder_get_field(node, field);
+	case TAG_X3D_CylinderSensor:
+		return CylinderSensor_get_field(node, field);
+	case TAG_X3D_DirectionalLight:
+		return DirectionalLight_get_field(node, field);
+	case TAG_X3D_Disk2D:
+		return Disk2D_get_field(node, field);
+	case TAG_X3D_ElevationGrid:
+		return ElevationGrid_get_field(node, field);
+	case TAG_X3D_EspduTransform:
+		return EspduTransform_get_field(node, field);
+	case TAG_X3D_Extrusion:
+		return Extrusion_get_field(node, field);
+	case TAG_X3D_FillProperties:
+		return FillProperties_get_field(node, field);
+	case TAG_X3D_Fog:
+		return Fog_get_field(node, field);
+	case TAG_X3D_FontStyle:
+		return FontStyle_get_field(node, field);
+	case TAG_X3D_GeoCoordinate:
+		return GeoCoordinate_get_field(node, field);
+	case TAG_X3D_GeoElevationGrid:
+		return GeoElevationGrid_get_field(node, field);
+	case TAG_X3D_GeoLocation:
+		return GeoLocation_get_field(node, field);
+	case TAG_X3D_GeoLOD:
+		return GeoLOD_get_field(node, field);
+	case TAG_X3D_GeoMetadata:
+		return GeoMetadata_get_field(node, field);
+	case TAG_X3D_GeoOrigin:
+		return GeoOrigin_get_field(node, field);
+	case TAG_X3D_GeoPositionInterpolator:
+		return GeoPositionInterpolator_get_field(node, field);
+	case TAG_X3D_GeoTouchSensor:
+		return GeoTouchSensor_get_field(node, field);
+	case TAG_X3D_GeoViewpoint:
+		return GeoViewpoint_get_field(node, field);
+	case TAG_X3D_Group:
+		return Group_get_field(node, field);
+	case TAG_X3D_HAnimDisplacer:
+		return HAnimDisplacer_get_field(node, field);
+	case TAG_X3D_HAnimHumanoid:
+		return HAnimHumanoid_get_field(node, field);
+	case TAG_X3D_HAnimJoint:
+		return HAnimJoint_get_field(node, field);
+	case TAG_X3D_HAnimSegment:
+		return HAnimSegment_get_field(node, field);
+	case TAG_X3D_HAnimSite:
+		return HAnimSite_get_field(node, field);
+	case TAG_X3D_ImageTexture:
+		return ImageTexture_get_field(node, field);
+	case TAG_X3D_IndexedFaceSet:
+		return IndexedFaceSet_get_field(node, field);
+	case TAG_X3D_IndexedLineSet:
+		return IndexedLineSet_get_field(node, field);
+	case TAG_X3D_IndexedTriangleFanSet:
+		return IndexedTriangleFanSet_get_field(node, field);
+	case TAG_X3D_IndexedTriangleSet:
+		return IndexedTriangleSet_get_field(node, field);
+	case TAG_X3D_IndexedTriangleStripSet:
+		return IndexedTriangleStripSet_get_field(node, field);
+	case TAG_X3D_Inline:
+		return Inline_get_field(node, field);
+	case TAG_X3D_IntegerSequencer:
+		return IntegerSequencer_get_field(node, field);
+	case TAG_X3D_IntegerTrigger:
+		return IntegerTrigger_get_field(node, field);
+	case TAG_X3D_KeySensor:
+		return KeySensor_get_field(node, field);
+	case TAG_X3D_LineProperties:
+		return LineProperties_get_field(node, field);
+	case TAG_X3D_LineSet:
+		return LineSet_get_field(node, field);
+	case TAG_X3D_LoadSensor:
+		return LoadSensor_get_field(node, field);
+	case TAG_X3D_LOD:
+		return LOD_get_field(node, field);
+	case TAG_X3D_Material:
+		return Material_get_field(node, field);
+	case TAG_X3D_MetadataDouble:
+		return MetadataDouble_get_field(node, field);
+	case TAG_X3D_MetadataFloat:
+		return MetadataFloat_get_field(node, field);
+	case TAG_X3D_MetadataInteger:
+		return MetadataInteger_get_field(node, field);
+	case TAG_X3D_MetadataSet:
+		return MetadataSet_get_field(node, field);
+	case TAG_X3D_MetadataString:
+		return MetadataString_get_field(node, field);
+	case TAG_X3D_MovieTexture:
+		return MovieTexture_get_field(node, field);
+	case TAG_X3D_MultiTexture:
+		return MultiTexture_get_field(node, field);
+	case TAG_X3D_MultiTextureCoordinate:
+		return MultiTextureCoordinate_get_field(node, field);
+	case TAG_X3D_MultiTextureTransform:
+		return MultiTextureTransform_get_field(node, field);
+	case TAG_X3D_NavigationInfo:
+		return NavigationInfo_get_field(node, field);
+	case TAG_X3D_Normal:
+		return Normal_get_field(node, field);
+	case TAG_X3D_NormalInterpolator:
+		return NormalInterpolator_get_field(node, field);
+	case TAG_X3D_NurbsCurve:
+		return NurbsCurve_get_field(node, field);
+	case TAG_X3D_NurbsCurve2D:
+		return NurbsCurve2D_get_field(node, field);
+	case TAG_X3D_NurbsOrientationInterpolator:
+		return NurbsOrientationInterpolator_get_field(node, field);
+	case TAG_X3D_NurbsPatchSurface:
+		return NurbsPatchSurface_get_field(node, field);
+	case TAG_X3D_NurbsPositionInterpolator:
+		return NurbsPositionInterpolator_get_field(node, field);
+	case TAG_X3D_NurbsSet:
+		return NurbsSet_get_field(node, field);
+	case TAG_X3D_NurbsSurfaceInterpolator:
+		return NurbsSurfaceInterpolator_get_field(node, field);
+	case TAG_X3D_NurbsSweptSurface:
+		return NurbsSweptSurface_get_field(node, field);
+	case TAG_X3D_NurbsSwungSurface:
+		return NurbsSwungSurface_get_field(node, field);
+	case TAG_X3D_NurbsTextureCoordinate:
+		return NurbsTextureCoordinate_get_field(node, field);
+	case TAG_X3D_NurbsTrimmedSurface:
+		return NurbsTrimmedSurface_get_field(node, field);
+	case TAG_X3D_OrientationInterpolator:
+		return OrientationInterpolator_get_field(node, field);
+	case TAG_X3D_PixelTexture:
+		return PixelTexture_get_field(node, field);
+	case TAG_X3D_PlaneSensor:
+		return PlaneSensor_get_field(node, field);
+	case TAG_X3D_PointLight:
+		return PointLight_get_field(node, field);
+	case TAG_X3D_PointSet:
+		return PointSet_get_field(node, field);
+	case TAG_X3D_Polyline2D:
+		return Polyline2D_get_field(node, field);
+	case TAG_X3D_Polypoint2D:
+		return Polypoint2D_get_field(node, field);
+	case TAG_X3D_PositionInterpolator:
+		return PositionInterpolator_get_field(node, field);
+	case TAG_X3D_PositionInterpolator2D:
+		return PositionInterpolator2D_get_field(node, field);
+	case TAG_X3D_ProximitySensor:
+		return ProximitySensor_get_field(node, field);
+	case TAG_X3D_ReceiverPdu:
+		return ReceiverPdu_get_field(node, field);
+	case TAG_X3D_Rectangle2D:
+		return Rectangle2D_get_field(node, field);
+	case TAG_X3D_ScalarInterpolator:
+		return ScalarInterpolator_get_field(node, field);
+	case TAG_X3D_Script:
+		return Script_get_field(node, field);
+	case TAG_X3D_Shape:
+		return Shape_get_field(node, field);
+	case TAG_X3D_SignalPdu:
+		return SignalPdu_get_field(node, field);
+	case TAG_X3D_Sound:
+		return Sound_get_field(node, field);
+	case TAG_X3D_Sphere:
+		return Sphere_get_field(node, field);
+	case TAG_X3D_SphereSensor:
+		return SphereSensor_get_field(node, field);
+	case TAG_X3D_SpotLight:
+		return SpotLight_get_field(node, field);
+	case TAG_X3D_StaticGroup:
+		return StaticGroup_get_field(node, field);
+	case TAG_X3D_StringSensor:
+		return StringSensor_get_field(node, field);
+	case TAG_X3D_Switch:
+		return Switch_get_field(node, field);
+	case TAG_X3D_Text:
+		return Text_get_field(node, field);
+	case TAG_X3D_TextureBackground:
+		return TextureBackground_get_field(node, field);
+	case TAG_X3D_TextureCoordinate:
+		return TextureCoordinate_get_field(node, field);
+	case TAG_X3D_TextureCoordinateGenerator:
+		return TextureCoordinateGenerator_get_field(node, field);
+	case TAG_X3D_TextureTransform:
+		return TextureTransform_get_field(node, field);
+	case TAG_X3D_TimeSensor:
+		return TimeSensor_get_field(node, field);
+	case TAG_X3D_TimeTrigger:
+		return TimeTrigger_get_field(node, field);
+	case TAG_X3D_TouchSensor:
+		return TouchSensor_get_field(node, field);
+	case TAG_X3D_Transform:
+		return Transform_get_field(node, field);
+	case TAG_X3D_TransmitterPdu:
+		return TransmitterPdu_get_field(node, field);
+	case TAG_X3D_TriangleFanSet:
+		return TriangleFanSet_get_field(node, field);
+	case TAG_X3D_TriangleSet:
+		return TriangleSet_get_field(node, field);
+	case TAG_X3D_TriangleSet2D:
+		return TriangleSet2D_get_field(node, field);
+	case TAG_X3D_TriangleStripSet:
+		return TriangleStripSet_get_field(node, field);
+	case TAG_X3D_Viewpoint:
+		return Viewpoint_get_field(node, field);
+	case TAG_X3D_VisibilitySensor:
+		return VisibilitySensor_get_field(node, field);
+	case TAG_X3D_WorldInfo:
+		return WorldInfo_get_field(node, field);
 	default:
 		return GF_BAD_PARAM;
 	}
@@ -15487,134 +15871,262 @@
 s32 gf_sg_x3d_node_get_field_index_by_name(GF_Node *node, char *name)
 {
 	switch (node->sgprivate->tag) {
-	case TAG_X3D_Anchor: return Anchor_get_field_index_by_name(name);
-	case TAG_X3D_Appearance: return Appearance_get_field_index_by_name(name);
-	case TAG_X3D_Arc2D: return Arc2D_get_field_index_by_name(name);
-	case TAG_X3D_ArcClose2D: return ArcClose2D_get_field_index_by_name(name);
-	case TAG_X3D_AudioClip: return AudioClip_get_field_index_by_name(name);
-	case TAG_X3D_Background: return Background_get_field_index_by_name(name);
-	case TAG_X3D_Billboard: return Billboard_get_field_index_by_name(name);
-	case TAG_X3D_BooleanFilter: return BooleanFilter_get_field_index_by_name(name);
-	case TAG_X3D_BooleanSequencer: return BooleanSequencer_get_field_index_by_name(name);
-	case TAG_X3D_BooleanToggle: return BooleanToggle_get_field_index_by_name(name);
-	case TAG_X3D_BooleanTrigger: return BooleanTrigger_get_field_index_by_name(name);
-	case TAG_X3D_Box: return Box_get_field_index_by_name(name);
-	case TAG_X3D_Circle2D: return Circle2D_get_field_index_by_name(name);
-	case TAG_X3D_Collision: return Collision_get_field_index_by_name(name);
-	case TAG_X3D_Color: return Color_get_field_index_by_name(name);
-	case TAG_X3D_ColorInterpolator: return ColorInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_ColorRGBA: return ColorRGBA_get_field_index_by_name(name);
-	case TAG_X3D_Cone: return Cone_get_field_index_by_name(name);
-	case TAG_X3D_Contour2D: return Contour2D_get_field_index_by_name(name);
-	case TAG_X3D_ContourPolyline2D: return ContourPolyline2D_get_field_index_by_name(name);
-	case TAG_X3D_Coordinate: return Coordinate_get_field_index_by_name(name);
-	case TAG_X3D_CoordinateDouble: return CoordinateDouble_get_field_index_by_name(name);
-	case TAG_X3D_Coordinate2D: return Coordinate2D_get_field_index_by_name(name);
-	case TAG_X3D_CoordinateInterpolator: return CoordinateInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_CoordinateInterpolator2D: return CoordinateInterpolator2D_get_field_index_by_name(name);
-	case TAG_X3D_Cylinder: return Cylinder_get_field_index_by_name(name);
-	case TAG_X3D_CylinderSensor: return CylinderSensor_get_field_index_by_name(name);
-	case TAG_X3D_DirectionalLight: return DirectionalLight_get_field_index_by_name(name);
-	case TAG_X3D_Disk2D: return Disk2D_get_field_index_by_name(name);
-	case TAG_X3D_ElevationGrid: return ElevationGrid_get_field_index_by_name(name);
-	case TAG_X3D_EspduTransform: return EspduTransform_get_field_index_by_name(name);
-	case TAG_X3D_Extrusion: return Extrusion_get_field_index_by_name(name);
-	case TAG_X3D_FillProperties: return FillProperties_get_field_index_by_name(name);
-	case TAG_X3D_Fog: return Fog_get_field_index_by_name(name);
-	case TAG_X3D_FontStyle: return FontStyle_get_field_index_by_name(name);
-	case TAG_X3D_GeoCoordinate: return GeoCoordinate_get_field_index_by_name(name);
-	case TAG_X3D_GeoElevationGrid: return GeoElevationGrid_get_field_index_by_name(name);
-	case TAG_X3D_GeoLocation: return GeoLocation_get_field_index_by_name(name);
-	case TAG_X3D_GeoLOD: return GeoLOD_get_field_index_by_name(name);
-	case TAG_X3D_GeoMetadata: return GeoMetadata_get_field_index_by_name(name);
-	case TAG_X3D_GeoOrigin: return GeoOrigin_get_field_index_by_name(name);
-	case TAG_X3D_GeoPositionInterpolator: return GeoPositionInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_GeoTouchSensor: return GeoTouchSensor_get_field_index_by_name(name);
-	case TAG_X3D_GeoViewpoint: return GeoViewpoint_get_field_index_by_name(name);
-	case TAG_X3D_Group: return Group_get_field_index_by_name(name);
-	case TAG_X3D_HAnimDisplacer: return HAnimDisplacer_get_field_index_by_name(name);
-	case TAG_X3D_HAnimHumanoid: return HAnimHumanoid_get_field_index_by_name(name);
-	case TAG_X3D_HAnimJoint: return HAnimJoint_get_field_index_by_name(name);
-	case TAG_X3D_HAnimSegment: return HAnimSegment_get_field_index_by_name(name);
-	case TAG_X3D_HAnimSite: return HAnimSite_get_field_index_by_name(name);
-	case TAG_X3D_ImageTexture: return ImageTexture_get_field_index_by_name(name);
-	case TAG_X3D_IndexedFaceSet: return IndexedFaceSet_get_field_index_by_name(name);
-	case TAG_X3D_IndexedLineSet: return IndexedLineSet_get_field_index_by_name(name);
-	case TAG_X3D_IndexedTriangleFanSet: return IndexedTriangleFanSet_get_field_index_by_name(name);
-	case TAG_X3D_IndexedTriangleSet: return IndexedTriangleSet_get_field_index_by_name(name);
-	case TAG_X3D_IndexedTriangleStripSet: return IndexedTriangleStripSet_get_field_index_by_name(name);
-	case TAG_X3D_Inline: return Inline_get_field_index_by_name(name);
-	case TAG_X3D_IntegerSequencer: return IntegerSequencer_get_field_index_by_name(name);
-	case TAG_X3D_IntegerTrigger: return IntegerTrigger_get_field_index_by_name(name);
-	case TAG_X3D_KeySensor: return KeySensor_get_field_index_by_name(name);
-	case TAG_X3D_LineProperties: return LineProperties_get_field_index_by_name(name);
-	case TAG_X3D_LineSet: return LineSet_get_field_index_by_name(name);
-	case TAG_X3D_LoadSensor: return LoadSensor_get_field_index_by_name(name);
-	case TAG_X3D_LOD: return LOD_get_field_index_by_name(name);
-	case TAG_X3D_Material: return Material_get_field_index_by_name(name);
-	case TAG_X3D_MetadataDouble: return MetadataDouble_get_field_index_by_name(name);
-	case TAG_X3D_MetadataFloat: return MetadataFloat_get_field_index_by_name(name);
-	case TAG_X3D_MetadataInteger: return MetadataInteger_get_field_index_by_name(name);
-	case TAG_X3D_MetadataSet: return MetadataSet_get_field_index_by_name(name);
-	case TAG_X3D_MetadataString: return MetadataString_get_field_index_by_name(name);
-	case TAG_X3D_MovieTexture: return MovieTexture_get_field_index_by_name(name);
-	case TAG_X3D_MultiTexture: return MultiTexture_get_field_index_by_name(name);
-	case TAG_X3D_MultiTextureCoordinate: return MultiTextureCoordinate_get_field_index_by_name(name);
-	case TAG_X3D_MultiTextureTransform: return MultiTextureTransform_get_field_index_by_name(name);
-	case TAG_X3D_NavigationInfo: return NavigationInfo_get_field_index_by_name(name);
-	case TAG_X3D_Normal: return Normal_get_field_index_by_name(name);
-	case TAG_X3D_NormalInterpolator: return NormalInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_NurbsCurve: return NurbsCurve_get_field_index_by_name(name);
-	case TAG_X3D_NurbsCurve2D: return NurbsCurve2D_get_field_index_by_name(name);
-	case TAG_X3D_NurbsOrientationInterpolator: return NurbsOrientationInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_NurbsPatchSurface: return NurbsPatchSurface_get_field_index_by_name(name);
-	case TAG_X3D_NurbsPositionInterpolator: return NurbsPositionInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_NurbsSet: return NurbsSet_get_field_index_by_name(name);
-	case TAG_X3D_NurbsSurfaceInterpolator: return NurbsSurfaceInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_NurbsSweptSurface: return NurbsSweptSurface_get_field_index_by_name(name);
-	case TAG_X3D_NurbsSwungSurface: return NurbsSwungSurface_get_field_index_by_name(name);
-	case TAG_X3D_NurbsTextureCoordinate: return NurbsTextureCoordinate_get_field_index_by_name(name);
-	case TAG_X3D_NurbsTrimmedSurface: return NurbsTrimmedSurface_get_field_index_by_name(name);
-	case TAG_X3D_OrientationInterpolator: return OrientationInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_PixelTexture: return PixelTexture_get_field_index_by_name(name);
-	case TAG_X3D_PlaneSensor: return PlaneSensor_get_field_index_by_name(name);
-	case TAG_X3D_PointLight: return PointLight_get_field_index_by_name(name);
-	case TAG_X3D_PointSet: return PointSet_get_field_index_by_name(name);
-	case TAG_X3D_Polyline2D: return Polyline2D_get_field_index_by_name(name);
-	case TAG_X3D_Polypoint2D: return Polypoint2D_get_field_index_by_name(name);
-	case TAG_X3D_PositionInterpolator: return PositionInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_PositionInterpolator2D: return PositionInterpolator2D_get_field_index_by_name(name);
-	case TAG_X3D_ProximitySensor: return ProximitySensor_get_field_index_by_name(name);
-	case TAG_X3D_ReceiverPdu: return ReceiverPdu_get_field_index_by_name(name);
-	case TAG_X3D_Rectangle2D: return Rectangle2D_get_field_index_by_name(name);
-	case TAG_X3D_ScalarInterpolator: return ScalarInterpolator_get_field_index_by_name(name);
-	case TAG_X3D_Script: return Script_get_field_index_by_name(name);
-	case TAG_X3D_Shape: return Shape_get_field_index_by_name(name);
-	case TAG_X3D_SignalPdu: return SignalPdu_get_field_index_by_name(name);
-	case TAG_X3D_Sound: return Sound_get_field_index_by_name(name);
-	case TAG_X3D_Sphere: return Sphere_get_field_index_by_name(name);
-	case TAG_X3D_SphereSensor: return SphereSensor_get_field_index_by_name(name);
-	case TAG_X3D_SpotLight: return SpotLight_get_field_index_by_name(name);
-	case TAG_X3D_StaticGroup: return StaticGroup_get_field_index_by_name(name);
-	case TAG_X3D_StringSensor: return StringSensor_get_field_index_by_name(name);
-	case TAG_X3D_Switch: return Switch_get_field_index_by_name(name);
-	case TAG_X3D_Text: return Text_get_field_index_by_name(name);
-	case TAG_X3D_TextureBackground: return TextureBackground_get_field_index_by_name(name);
-	case TAG_X3D_TextureCoordinate: return TextureCoordinate_get_field_index_by_name(name);
-	case TAG_X3D_TextureCoordinateGenerator: return TextureCoordinateGenerator_get_field_index_by_name(name);
-	case TAG_X3D_TextureTransform: return TextureTransform_get_field_index_by_name(name);
-	case TAG_X3D_TimeSensor: return TimeSensor_get_field_index_by_name(name);
-	case TAG_X3D_TimeTrigger: return TimeTrigger_get_field_index_by_name(name);
-	case TAG_X3D_TouchSensor: return TouchSensor_get_field_index_by_name(name);
-	case TAG_X3D_Transform: return Transform_get_field_index_by_name(name);
-	case TAG_X3D_TransmitterPdu: return TransmitterPdu_get_field_index_by_name(name);
-	case TAG_X3D_TriangleFanSet: return TriangleFanSet_get_field_index_by_name(name);
-	case TAG_X3D_TriangleSet: return TriangleSet_get_field_index_by_name(name);
-	case TAG_X3D_TriangleSet2D: return TriangleSet2D_get_field_index_by_name(name);
-	case TAG_X3D_TriangleStripSet: return TriangleStripSet_get_field_index_by_name(name);
-	case TAG_X3D_Viewpoint: return Viewpoint_get_field_index_by_name(name);
-	case TAG_X3D_VisibilitySensor: return VisibilitySensor_get_field_index_by_name(name);
-	case TAG_X3D_WorldInfo: return WorldInfo_get_field_index_by_name(name);
+	case TAG_X3D_Anchor:
+		return Anchor_get_field_index_by_name(name);
+	case TAG_X3D_Appearance:
+		return Appearance_get_field_index_by_name(name);
+	case TAG_X3D_Arc2D:
+		return Arc2D_get_field_index_by_name(name);
+	case TAG_X3D_ArcClose2D:
+		return ArcClose2D_get_field_index_by_name(name);
+	case TAG_X3D_AudioClip:
+		return AudioClip_get_field_index_by_name(name);
+	case TAG_X3D_Background:
+		return Background_get_field_index_by_name(name);
+	case TAG_X3D_Billboard:
+		return Billboard_get_field_index_by_name(name);
+	case TAG_X3D_BooleanFilter:
+		return BooleanFilter_get_field_index_by_name(name);
+	case TAG_X3D_BooleanSequencer:
+		return BooleanSequencer_get_field_index_by_name(name);
+	case TAG_X3D_BooleanToggle:
+		return BooleanToggle_get_field_index_by_name(name);
+	case TAG_X3D_BooleanTrigger:
+		return BooleanTrigger_get_field_index_by_name(name);
+	case TAG_X3D_Box:
+		return Box_get_field_index_by_name(name);
+	case TAG_X3D_Circle2D:
+		return Circle2D_get_field_index_by_name(name);
+	case TAG_X3D_Collision:
+		return Collision_get_field_index_by_name(name);
+	case TAG_X3D_Color:
+		return Color_get_field_index_by_name(name);
+	case TAG_X3D_ColorInterpolator:
+		return ColorInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_ColorRGBA:
+		return ColorRGBA_get_field_index_by_name(name);
+	case TAG_X3D_Cone:
+		return Cone_get_field_index_by_name(name);
+	case TAG_X3D_Contour2D:
+		return Contour2D_get_field_index_by_name(name);
+	case TAG_X3D_ContourPolyline2D:
+		return ContourPolyline2D_get_field_index_by_name(name);
+	case TAG_X3D_Coordinate:
+		return Coordinate_get_field_index_by_name(name);
+	case TAG_X3D_CoordinateDouble:
+		return CoordinateDouble_get_field_index_by_name(name);
+	case TAG_X3D_Coordinate2D:
+		return Coordinate2D_get_field_index_by_name(name);
+	case TAG_X3D_CoordinateInterpolator:
+		return CoordinateInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_CoordinateInterpolator2D:
+		return CoordinateInterpolator2D_get_field_index_by_name(name);
+	case TAG_X3D_Cylinder:
+		return Cylinder_get_field_index_by_name(name);
+	case TAG_X3D_CylinderSensor:
+		return CylinderSensor_get_field_index_by_name(name);
+	case TAG_X3D_DirectionalLight:
+		return DirectionalLight_get_field_index_by_name(name);
+	case TAG_X3D_Disk2D:
+		return Disk2D_get_field_index_by_name(name);
+	case TAG_X3D_ElevationGrid:
+		return ElevationGrid_get_field_index_by_name(name);
+	case TAG_X3D_EspduTransform:
+		return EspduTransform_get_field_index_by_name(name);
+	case TAG_X3D_Extrusion:
+		return Extrusion_get_field_index_by_name(name);
+	case TAG_X3D_FillProperties:
+		return FillProperties_get_field_index_by_name(name);
+	case TAG_X3D_Fog:
+		return Fog_get_field_index_by_name(name);
+	case TAG_X3D_FontStyle:
+		return FontStyle_get_field_index_by_name(name);
+	case TAG_X3D_GeoCoordinate:
+		return GeoCoordinate_get_field_index_by_name(name);
+	case TAG_X3D_GeoElevationGrid:
+		return GeoElevationGrid_get_field_index_by_name(name);
+	case TAG_X3D_GeoLocation:
+		return GeoLocation_get_field_index_by_name(name);
+	case TAG_X3D_GeoLOD:
+		return GeoLOD_get_field_index_by_name(name);
+	case TAG_X3D_GeoMetadata:
+		return GeoMetadata_get_field_index_by_name(name);
+	case TAG_X3D_GeoOrigin:
+		return GeoOrigin_get_field_index_by_name(name);
+	case TAG_X3D_GeoPositionInterpolator:
+		return GeoPositionInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_GeoTouchSensor:
+		return GeoTouchSensor_get_field_index_by_name(name);
+	case TAG_X3D_GeoViewpoint:
+		return GeoViewpoint_get_field_index_by_name(name);
+	case TAG_X3D_Group:
+		return Group_get_field_index_by_name(name);
+	case TAG_X3D_HAnimDisplacer:
+		return HAnimDisplacer_get_field_index_by_name(name);
+	case TAG_X3D_HAnimHumanoid:
+		return HAnimHumanoid_get_field_index_by_name(name);
+	case TAG_X3D_HAnimJoint:
+		return HAnimJoint_get_field_index_by_name(name);
+	case TAG_X3D_HAnimSegment:
+		return HAnimSegment_get_field_index_by_name(name);
+	case TAG_X3D_HAnimSite:
+		return HAnimSite_get_field_index_by_name(name);
+	case TAG_X3D_ImageTexture:
+		return ImageTexture_get_field_index_by_name(name);
+	case TAG_X3D_IndexedFaceSet:
+		return IndexedFaceSet_get_field_index_by_name(name);
+	case TAG_X3D_IndexedLineSet:
+		return IndexedLineSet_get_field_index_by_name(name);
+	case TAG_X3D_IndexedTriangleFanSet:
+		return IndexedTriangleFanSet_get_field_index_by_name(name);
+	case TAG_X3D_IndexedTriangleSet:
+		return IndexedTriangleSet_get_field_index_by_name(name);
+	case TAG_X3D_IndexedTriangleStripSet:
+		return IndexedTriangleStripSet_get_field_index_by_name(name);
+	case TAG_X3D_Inline:
+		return Inline_get_field_index_by_name(name);
+	case TAG_X3D_IntegerSequencer:
+		return IntegerSequencer_get_field_index_by_name(name);
+	case TAG_X3D_IntegerTrigger:
+		return IntegerTrigger_get_field_index_by_name(name);
+	case TAG_X3D_KeySensor:
+		return KeySensor_get_field_index_by_name(name);
+	case TAG_X3D_LineProperties:
+		return LineProperties_get_field_index_by_name(name);
+	case TAG_X3D_LineSet:
+		return LineSet_get_field_index_by_name(name);
+	case TAG_X3D_LoadSensor:
+		return LoadSensor_get_field_index_by_name(name);
+	case TAG_X3D_LOD:
+		return LOD_get_field_index_by_name(name);
+	case TAG_X3D_Material:
+		return Material_get_field_index_by_name(name);
+	case TAG_X3D_MetadataDouble:
+		return MetadataDouble_get_field_index_by_name(name);
+	case TAG_X3D_MetadataFloat:
+		return MetadataFloat_get_field_index_by_name(name);
+	case TAG_X3D_MetadataInteger:
+		return MetadataInteger_get_field_index_by_name(name);
+	case TAG_X3D_MetadataSet:
+		return MetadataSet_get_field_index_by_name(name);
+	case TAG_X3D_MetadataString:
+		return MetadataString_get_field_index_by_name(name);
+	case TAG_X3D_MovieTexture:
+		return MovieTexture_get_field_index_by_name(name);
+	case TAG_X3D_MultiTexture:
+		return MultiTexture_get_field_index_by_name(name);
+	case TAG_X3D_MultiTextureCoordinate:
+		return MultiTextureCoordinate_get_field_index_by_name(name);
+	case TAG_X3D_MultiTextureTransform:
+		return MultiTextureTransform_get_field_index_by_name(name);
+	case TAG_X3D_NavigationInfo:
+		return NavigationInfo_get_field_index_by_name(name);
+	case TAG_X3D_Normal:
+		return Normal_get_field_index_by_name(name);
+	case TAG_X3D_NormalInterpolator:
+		return NormalInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_NurbsCurve:
+		return NurbsCurve_get_field_index_by_name(name);
+	case TAG_X3D_NurbsCurve2D:
+		return NurbsCurve2D_get_field_index_by_name(name);
+	case TAG_X3D_NurbsOrientationInterpolator:
+		return NurbsOrientationInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_NurbsPatchSurface:
+		return NurbsPatchSurface_get_field_index_by_name(name);
+	case TAG_X3D_NurbsPositionInterpolator:
+		return NurbsPositionInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_NurbsSet:
+		return NurbsSet_get_field_index_by_name(name);
+	case TAG_X3D_NurbsSurfaceInterpolator:
+		return NurbsSurfaceInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_NurbsSweptSurface:
+		return NurbsSweptSurface_get_field_index_by_name(name);
+	case TAG_X3D_NurbsSwungSurface:
+		return NurbsSwungSurface_get_field_index_by_name(name);
+	case TAG_X3D_NurbsTextureCoordinate:
+		return NurbsTextureCoordinate_get_field_index_by_name(name);
+	case TAG_X3D_NurbsTrimmedSurface:
+		return NurbsTrimmedSurface_get_field_index_by_name(name);
+	case TAG_X3D_OrientationInterpolator:
+		return OrientationInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_PixelTexture:
+		return PixelTexture_get_field_index_by_name(name);
+	case TAG_X3D_PlaneSensor:
+		return PlaneSensor_get_field_index_by_name(name);
+	case TAG_X3D_PointLight:
+		return PointLight_get_field_index_by_name(name);
+	case TAG_X3D_PointSet:
+		return PointSet_get_field_index_by_name(name);
+	case TAG_X3D_Polyline2D:
+		return Polyline2D_get_field_index_by_name(name);
+	case TAG_X3D_Polypoint2D:
+		return Polypoint2D_get_field_index_by_name(name);
+	case TAG_X3D_PositionInterpolator:
+		return PositionInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_PositionInterpolator2D:
+		return PositionInterpolator2D_get_field_index_by_name(name);
+	case TAG_X3D_ProximitySensor:
+		return ProximitySensor_get_field_index_by_name(name);
+	case TAG_X3D_ReceiverPdu:
+		return ReceiverPdu_get_field_index_by_name(name);
+	case TAG_X3D_Rectangle2D:
+		return Rectangle2D_get_field_index_by_name(name);
+	case TAG_X3D_ScalarInterpolator:
+		return ScalarInterpolator_get_field_index_by_name(name);
+	case TAG_X3D_Script:
+		return Script_get_field_index_by_name(name);
+	case TAG_X3D_Shape:
+		return Shape_get_field_index_by_name(name);
+	case TAG_X3D_SignalPdu:
+		return SignalPdu_get_field_index_by_name(name);
+	case TAG_X3D_Sound:
+		return Sound_get_field_index_by_name(name);
+	case TAG_X3D_Sphere:
+		return Sphere_get_field_index_by_name(name);
+	case TAG_X3D_SphereSensor:
+		return SphereSensor_get_field_index_by_name(name);
+	case TAG_X3D_SpotLight:
+		return SpotLight_get_field_index_by_name(name);
+	case TAG_X3D_StaticGroup:
+		return StaticGroup_get_field_index_by_name(name);
+	case TAG_X3D_StringSensor:
+		return StringSensor_get_field_index_by_name(name);
+	case TAG_X3D_Switch:
+		return Switch_get_field_index_by_name(name);
+	case TAG_X3D_Text:
+		return Text_get_field_index_by_name(name);
+	case TAG_X3D_TextureBackground:
+		return TextureBackground_get_field_index_by_name(name);
+	case TAG_X3D_TextureCoordinate:
+		return TextureCoordinate_get_field_index_by_name(name);
+	case TAG_X3D_TextureCoordinateGenerator:
+		return TextureCoordinateGenerator_get_field_index_by_name(name);
+	case TAG_X3D_TextureTransform:
+		return TextureTransform_get_field_index_by_name(name);
+	case TAG_X3D_TimeSensor:
+		return TimeSensor_get_field_index_by_name(name);
+	case TAG_X3D_TimeTrigger:
+		return TimeTrigger_get_field_index_by_name(name);
+	case TAG_X3D_TouchSensor:
+		return TouchSensor_get_field_index_by_name(name);
+	case TAG_X3D_Transform:
+		return Transform_get_field_index_by_name(name);
+	case TAG_X3D_TransmitterPdu:
+		return TransmitterPdu_get_field_index_by_name(name);
+	case TAG_X3D_TriangleFanSet:
+		return TriangleFanSet_get_field_index_by_name(name);
+	case TAG_X3D_TriangleSet:
+		return TriangleSet_get_field_index_by_name(name);
+	case TAG_X3D_TriangleSet2D:
+		return TriangleSet2D_get_field_index_by_name(name);
+	case TAG_X3D_TriangleStripSet:
+		return TriangleStripSet_get_field_index_by_name(name);
+	case TAG_X3D_Viewpoint:
+		return Viewpoint_get_field_index_by_name(name);
+	case TAG_X3D_VisibilitySensor:
+		return VisibilitySensor_get_field_index_by_name(name);
+	case TAG_X3D_WorldInfo:
+		return WorldInfo_get_field_index_by_name(name);
 	default:
 		return -1;
 	}
@@ -15626,152 +16138,152 @@
 
 #define SFWorldNode_X3D_Count	127
 static const u32 SFWorldNode_X3D_TypeToTag[127] = {
- TAG_X3D_Anchor, TAG_X3D_Appearance, TAG_X3D_Arc2D, TAG_X3D_ArcClose2D, TAG_X3D_AudioClip, TAG_X3D_Background, TAG_X3D_Billboard, TAG_X3D_BooleanFilter, TAG_X3D_BooleanSequencer, TAG_X3D_BooleanToggle, TAG_X3D_BooleanTrigger, TAG_X3D_Box, TAG_X3D_Circle2D, TAG_X3D_Collision, TAG_X3D_Color, TAG_X3D_ColorInterpolator, TAG_X3D_ColorRGBA, TAG_X3D_Cone, TAG_X3D_Contour2D, TAG_X3D_ContourPolyline2D, TAG_X3D_Coordinate, TAG_X3D_CoordinateDouble, TAG_X3D_Coordinate2D, TAG_X3D_CoordinateInterpolator, TAG_X3D_CoordinateInterpolator2D, TAG_X3D_Cylinder, TAG_X3D_CylinderSensor, TAG_X3D_DirectionalLight, TAG_X3D_Disk2D, TAG_X3D_ElevationGrid, TAG_X3D_EspduTransform, TAG_X3D_Extrusion, TAG_X3D_FillProperties, TAG_X3D_Fog, TAG_X3D_FontStyle, TAG_X3D_GeoCoordinate, TAG_X3D_GeoElevationGrid, TAG_X3D_GeoLocation, TAG_X3D_GeoLOD, TAG_X3D_GeoMetadata, TAG_X3D_GeoPositionInterpolator, TAG_X3D_GeoTouchSensor, TAG_X3D_GeoViewpoint, TAG_X3D_Group, TAG_X3D_HAnimDisplacer, TAG_X3D_HAnimHumanoid, TAG_X3D_HAnimJoint, TAG_X3D_HAnimSegment, TAG_X3D_HAnimSite, TAG_X3D_ImageTexture, TAG_X3D_IndexedFaceSet, TAG_X3D_IndexedLineSet, TAG_X3D_IndexedTriangleFanSet, TAG_X3D_IndexedTriangleSet, TAG_X3D_IndexedTriangleStripSet, TAG_X3D_Inline, TAG_X3D_IntegerSequencer, TAG_X3D_IntegerTrigger, TAG_X3D_KeySensor, TAG_X3D_LineProperties, TAG_X3D_LineSet, TAG_X3D_LoadSensor, TAG_X3D_LOD, TAG_X3D_Material, TAG_X3D_MetadataDouble, TAG_X3D_MetadataFloat, TAG_X3D_MetadataInteger, TAG_X3D_MetadataSet, TAG_X3D_MetadataString, TAG_X3D_MovieTexture, TAG_X3D_MultiTexture, TAG_X3D_MultiTextureCoordinate, TAG_X3D_MultiTextureTransform, TAG_X3D_NavigationInfo, TAG_X3D_Normal, TAG_X3D_NormalInterpolator, TAG_X3D_NurbsCurve, TAG_X3D_NurbsCurve2D, TAG_X3D_NurbsOrientationInterpolator, TAG_X3D_NurbsPatchSurface, TAG_X3D_NurbsPositionInterpolator, TAG_X3D_NurbsSet, TAG_X3D_NurbsSurfaceInterpolator, TAG_X3D_NurbsSweptSurface, TAG_X3D_NurbsSwungSurface, TAG_X3D_NurbsTextureCoordinate, TAG_X3D_NurbsTrimmedSurface, TAG_X3D_OrientationInterpolator, TAG_X3D_PixelTexture, TAG_X3D_PlaneSensor, TAG_X3D_PointLight, TAG_X3D_PointSet, TAG_X3D_Polyline2D, TAG_X3D_Polypoint2D, TAG_X3D_PositionInterpolator, TAG_X3D_PositionInterpolator2D, TAG_X3D_ProximitySensor, TAG_X3D_ReceiverPdu, TAG_X3D_Rectangle2D, TAG_X3D_ScalarInterpolator, TAG_X3D_Script, TAG_X3D_Shape, TAG_X3D_SignalPdu, TAG_X3D_Sound, TAG_X3D_Sphere, TAG_X3D_SphereSensor, TAG_X3D_SpotLight, TAG_X3D_StaticGroup, TAG_X3D_StringSensor, TAG_X3D_Switch, TAG_X3D_Text, TAG_X3D_TextureBackground, TAG_X3D_TextureCoordinate, TAG_X3D_TextureCoordinateGenerator, TAG_X3D_TextureTransform, TAG_X3D_TimeSensor, TAG_X3D_TimeTrigger, TAG_X3D_TouchSensor, TAG_X3D_Transform, TAG_X3D_TransmitterPdu, TAG_X3D_TriangleFanSet, TAG_X3D_TriangleSet, TAG_X3D_TriangleSet2D, TAG_X3D_TriangleStripSet, TAG_X3D_Viewpoint, TAG_X3D_VisibilitySensor, TAG_X3D_WorldInfo
+	TAG_X3D_Anchor, TAG_X3D_Appearance, TAG_X3D_Arc2D, TAG_X3D_ArcClose2D, TAG_X3D_AudioClip, TAG_X3D_Background, TAG_X3D_Billboard, TAG_X3D_BooleanFilter, TAG_X3D_BooleanSequencer, TAG_X3D_BooleanToggle, TAG_X3D_BooleanTrigger, TAG_X3D_Box, TAG_X3D_Circle2D, TAG_X3D_Collision, TAG_X3D_Color, TAG_X3D_ColorInterpolator, TAG_X3D_ColorRGBA, TAG_X3D_Cone, TAG_X3D_Contour2D, TAG_X3D_ContourPolyline2D, TAG_X3D_Coordinate, TAG_X3D_CoordinateDouble, TAG_X3D_Coordinate2D, TAG_X3D_CoordinateInterpolator, TAG_X3D_CoordinateInterpolator2D, TAG_X3D_Cylinder, TAG_X3D_CylinderSensor, TAG_X3D_DirectionalLight, TAG_X3D_Disk2D, TAG_X3D_ElevationGrid, TAG_X3D_EspduTransform, TAG_X3D_Extrusion, TAG_X3D_FillProperties, TAG_X3D_Fog, TAG_X3D_FontStyle, TAG_X3D_GeoCoordinate, TAG_X3D_GeoElevationGrid, TAG_X3D_GeoLocation, TAG_X3D_GeoLOD, TAG_X3D_GeoMetadata, TAG_X3D_GeoPositionInterpolator, TAG_X3D_GeoTouchSensor, TAG_X3D_GeoViewpoint, TAG_X3D_Group, TAG_X3D_HAnimDisplacer, TAG_X3D_HAnimHumanoid, TAG_X3D_HAnimJoint, TAG_X3D_HAnimSegment, TAG_X3D_HAnimSite, TAG_X3D_ImageTexture, TAG_X3D_IndexedFaceSet, TAG_X3D_IndexedLineSet, TAG_X3D_IndexedTriangleFanSet, TAG_X3D_IndexedTriangleSet, TAG_X3D_IndexedTriangleStripSet, TAG_X3D_Inline, TAG_X3D_IntegerSequencer, TAG_X3D_IntegerTrigger, TAG_X3D_KeySensor, TAG_X3D_LineProperties, TAG_X3D_LineSet, TAG_X3D_LoadSensor, TAG_X3D_LOD, TAG_X3D_Material, TAG_X3D_MetadataDouble, TAG_X3D_MetadataFloat, TAG_X3D_MetadataInteger, TAG_X3D_MetadataSet, TAG_X3D_MetadataString, TAG_X3D_MovieTexture, TAG_X3D_MultiTexture, TAG_X3D_MultiTextureCoordinate, TAG_X3D_MultiTextureTransform, TAG_X3D_NavigationInfo, TAG_X3D_Normal, TAG_X3D_NormalInterpolator, TAG_X3D_NurbsCurve, TAG_X3D_NurbsCurve2D, TAG_X3D_NurbsOrientationInterpolator, TAG_X3D_NurbsPatchSurface, TAG_X3D_NurbsPositionInterpolator, TAG_X3D_NurbsSet, TAG_X3D_NurbsSurfaceInterpolator, TAG_X3D_NurbsSweptSurface, TAG_X3D_NurbsSwungSurface, TAG_X3D_NurbsTextureCoordinate, TAG_X3D_NurbsTrimmedSurface, TAG_X3D_OrientationInterpolator, TAG_X3D_PixelTexture, TAG_X3D_PlaneSensor, TAG_X3D_PointLight, TAG_X3D_PointSet, TAG_X3D_Polyline2D, TAG_X3D_Polypoint2D, TAG_X3D_PositionInterpolator, TAG_X3D_PositionInterpolator2D, TAG_X3D_ProximitySensor, TAG_X3D_ReceiverPdu, TAG_X3D_Rectangle2D, TAG_X3D_ScalarInterpolator, TAG_X3D_Script, TAG_X3D_Shape, TAG_X3D_SignalPdu, TAG_X3D_Sound, TAG_X3D_Sphere, TAG_X3D_SphereSensor, TAG_X3D_SpotLight, TAG_X3D_StaticGroup, TAG_X3D_StringSensor, TAG_X3D_Switch, TAG_X3D_Text, TAG_X3D_TextureBackground, TAG_X3D_TextureCoordinate, TAG_X3D_TextureCoordinateGenerator, TAG_X3D_TextureTransform, TAG_X3D_TimeSensor, TAG_X3D_TimeTrigger, TAG_X3D_TouchSensor, TAG_X3D_Transform, TAG_X3D_TransmitterPdu, TAG_X3D_TriangleFanSet, TAG_X3D_TriangleSet, TAG_X3D_TriangleSet2D, TAG_X3D_TriangleStripSet, TAG_X3D_Viewpoint, TAG_X3D_VisibilitySensor, TAG_X3D_WorldInfo
 };
 
 #define SF3DNode_X3D_Count	60
 static const u32 SF3DNode_X3D_TypeToTag[60] = {
- TAG_X3D_Anchor, TAG_X3D_Background, TAG_X3D_Billboard, TAG_X3D_BooleanFilter, TAG_X3D_BooleanSequencer, TAG_X3D_BooleanToggle, TAG_X3D_BooleanTrigger, TAG_X3D_Collision, TAG_X3D_ColorInterpolator, TAG_X3D_CoordinateInterpolator, TAG_X3D_CoordinateInterpolator2D, TAG_X3D_CylinderSensor, TAG_X3D_DirectionalLight, TAG_X3D_EspduTransform, TAG_X3D_Fog, TAG_X3D_GeoLocation, TAG_X3D_GeoLOD, TAG_X3D_GeoMetadata, TAG_X3D_GeoPositionInterpolator, TAG_X3D_GeoTouchSensor, TAG_X3D_GeoViewpoint, TAG_X3D_Group, TAG_X3D_HAnimHumanoid, TAG_X3D_Inline, TAG_X3D_IntegerSequencer, TAG_X3D_IntegerTrigger, TAG_X3D_KeySensor, TAG_X3D_LOD, TAG_X3D_NavigationInfo, TAG_X3D_NormalInterpolator, TAG_X3D_NurbsOrientationInterpolator, TAG_X3D_NurbsPositionInterpolator, TAG_X3D_NurbsSet, TAG_X3D_NurbsSurfaceInterpolator, TAG_X3D_OrientationInterpolator, TAG_X3D_PlaneSensor, TAG_X3D_PointLight, TAG_X3D_PositionInterpolator, TAG_X3D_PositionInterpolator2D, TAG_X3D_ProximitySensor, TAG_X3D_ReceiverPdu, TAG_X3D_ScalarInterpolator, TAG_X3D_Script, TAG_X3D_Shape, TAG_X3D_SignalPdu, TAG_X3D_Sound, TAG_X3D_SphereSensor, TAG_X3D_SpotLight, TAG_X3D_StaticGroup, TAG_X3D_StringSensor, TAG_X3D_Switch, TAG_X3D_TextureBackground, TAG_X3D_TimeSensor, TAG_X3D_TimeTrigger, TAG_X3D_TouchSensor, TAG_X3D_Transform, TAG_X3D_TransmitterPdu, TAG_X3D_Viewpoint, TAG_X3D_VisibilitySensor, TAG_X3D_WorldInfo
+	TAG_X3D_Anchor, TAG_X3D_Background, TAG_X3D_Billboard, TAG_X3D_BooleanFilter, TAG_X3D_BooleanSequencer, TAG_X3D_BooleanToggle, TAG_X3D_BooleanTrigger, TAG_X3D_Collision, TAG_X3D_ColorInterpolator, TAG_X3D_CoordinateInterpolator, TAG_X3D_CoordinateInterpolator2D, TAG_X3D_CylinderSensor, TAG_X3D_DirectionalLight, TAG_X3D_EspduTransform, TAG_X3D_Fog, TAG_X3D_GeoLocation, TAG_X3D_GeoLOD, TAG_X3D_GeoMetadata, TAG_X3D_GeoPositionInterpolator, TAG_X3D_GeoTouchSensor, TAG_X3D_GeoViewpoint, TAG_X3D_Group, TAG_X3D_HAnimHumanoid, TAG_X3D_Inline, TAG_X3D_IntegerSequencer, TAG_X3D_IntegerTrigger, TAG_X3D_KeySensor, TAG_X3D_LOD, TAG_X3D_NavigationInfo, TAG_X3D_NormalInterpolator, TAG_X3D_NurbsOrientationInterpolator, TAG_X3D_NurbsPositionInterpolator, TAG_X3D_NurbsSet, TAG_X3D_NurbsSurfaceInterpolator, TAG_X3D_OrientationInterpolator, TAG_X3D_PlaneSensor, TAG_X3D_PointLight, TAG_X3D_PositionInterpolator, TAG_X3D_PositionInterpolator2D, TAG_X3D_ProximitySensor, TAG_X3D_ReceiverPdu, TAG_X3D_ScalarInterpolator, TAG_X3D_Script, TAG_X3D_Shape, TAG_X3D_SignalPdu, TAG_X3D_Sound, TAG_X3D_SphereSensor, TAG_X3D_SpotLight, TAG_X3D_StaticGroup, TAG_X3D_StringSensor, TAG_X3D_Switch, TAG_X3D_TextureBackground, TAG_X3D_TimeSensor, TAG_X3D_TimeTrigger, TAG_X3D_TouchSensor, TAG_X3D_Transform, TAG_X3D_TransmitterPdu, TAG_X3D_Viewpoint, TAG_X3D_VisibilitySensor, TAG_X3D_WorldInfo
 };
 
 #define SF2DNode_X3D_Count	34
 static const u32 SF2DNode_X3D_TypeToTag[34] = {
- TAG_X3D_Anchor, TAG_X3D_BooleanFilter, TAG_X3D_BooleanSequencer, TAG_X3D_BooleanToggle, TAG_X3D_BooleanTrigger, TAG_X3D_ColorInterpolator, TAG_X3D_CoordinateInterpolator2D, TAG_X3D_EspduTransform, TAG_X3D_GeoMetadata, TAG_X3D_GeoTouchSensor, TAG_X3D_Group, TAG_X3D_Inline, TAG_X3D_IntegerSequencer, TAG_X3D_IntegerTrigger, TAG_X3D_KeySensor, TAG_X3D_LOD, TAG_X3D_NurbsOrientationInterpolator, TAG_X3D_NurbsPositionInterpolator, TAG_X3D_NurbsSet, TAG_X3D_NurbsSurfaceInterpolator, TAG_X3D_PositionInterpolator2D, TAG_X3D_ReceiverPdu, TAG_X3D_ScalarInterpolator, TAG_X3D_Script, TAG_X3D_Shape, TAG_X3D_SignalPdu, TAG_X3D_StaticGroup, TAG_X3D_StringSensor, TAG_X3D_Switch, TAG_X3D_TimeSensor, TAG_X3D_TimeTrigger, TAG_X3D_TouchSensor, TAG_X3D_TransmitterPdu, TAG_X3D_WorldInfo
+	TAG_X3D_Anchor, TAG_X3D_BooleanFilter, TAG_X3D_BooleanSequencer, TAG_X3D_BooleanToggle, TAG_X3D_BooleanTrigger, TAG_X3D_ColorInterpolator, TAG_X3D_CoordinateInterpolator2D, TAG_X3D_EspduTransform, TAG_X3D_GeoMetadata, TAG_X3D_GeoTouchSensor, TAG_X3D_Group, TAG_X3D_Inline, TAG_X3D_IntegerSequencer, TAG_X3D_IntegerTrigger, TAG_X3D_KeySensor, TAG_X3D_LOD, TAG_X3D_NurbsOrientationInterpolator, TAG_X3D_NurbsPositionInterpolator, TAG_X3D_NurbsSet, TAG_X3D_NurbsSurfaceInterpolator, TAG_X3D_PositionInterpolator2D, TAG_X3D_ReceiverPdu, TAG_X3D_ScalarInterpolator, TAG_X3D_Script, TAG_X3D_Shape, TAG_X3D_SignalPdu, TAG_X3D_StaticGroup, TAG_X3D_StringSensor, TAG_X3D_Switch, TAG_X3D_TimeSensor, TAG_X3D_TimeTrigger, TAG_X3D_TouchSensor, TAG_X3D_TransmitterPdu, TAG_X3D_WorldInfo
 };
 
 #define SFAppearanceNode_X3D_Count	1
 static const u32 SFAppearanceNode_X3D_TypeToTag[1] = {
- TAG_X3D_Appearance
+	TAG_X3D_Appearance
 };
 
 #define SFGeometryNode_X3D_Count	31
 static const u32 SFGeometryNode_X3D_TypeToTag[31] = {
- TAG_X3D_Arc2D, TAG_X3D_ArcClose2D, TAG_X3D_Box, TAG_X3D_Circle2D, TAG_X3D_Cone, TAG_X3D_Cylinder, TAG_X3D_Disk2D, TAG_X3D_ElevationGrid, TAG_X3D_Extrusion, TAG_X3D_GeoElevationGrid, TAG_X3D_IndexedFaceSet, TAG_X3D_IndexedLineSet, TAG_X3D_IndexedTriangleFanSet, TAG_X3D_IndexedTriangleSet, TAG_X3D_IndexedTriangleStripSet, TAG_X3D_LineSet, TAG_X3D_NurbsCurve, TAG_X3D_NurbsPatchSurface, TAG_X3D_NurbsSweptSurface, TAG_X3D_NurbsSwungSurface, TAG_X3D_NurbsTrimmedSurface, TAG_X3D_PointSet, TAG_X3D_Polyline2D, TAG_X3D_Polypoint2D, TAG_X3D_Rectangle2D, TAG_X3D_Sphere, TAG_X3D_Text, TAG_X3D_TriangleFanSet, TAG_X3D_TriangleSet, TAG_X3D_TriangleSet2D, TAG_X3D_TriangleStripSet
+	TAG_X3D_Arc2D, TAG_X3D_ArcClose2D, TAG_X3D_Box, TAG_X3D_Circle2D, TAG_X3D_Cone, TAG_X3D_Cylinder, TAG_X3D_Disk2D, TAG_X3D_ElevationGrid, TAG_X3D_Extrusion, TAG_X3D_GeoElevationGrid, TAG_X3D_IndexedFaceSet, TAG_X3D_IndexedLineSet, TAG_X3D_IndexedTriangleFanSet, TAG_X3D_IndexedTriangleSet, TAG_X3D_IndexedTriangleStripSet, TAG_X3D_LineSet, TAG_X3D_NurbsCurve, TAG_X3D_NurbsPatchSurface, TAG_X3D_NurbsSweptSurface, TAG_X3D_NurbsSwungSurface, TAG_X3D_NurbsTrimmedSurface, TAG_X3D_PointSet, TAG_X3D_Polyline2D, TAG_X3D_Polypoint2D, TAG_X3D_Rectangle2D, TAG_X3D_Sphere, TAG_X3D_Text, TAG_X3D_TriangleFanSet, TAG_X3D_TriangleSet, TAG_X3D_TriangleSet2D, TAG_X3D_TriangleStripSet
 };
 
 #define SFAudioNode_X3D_Count	1
 static const u32 SFAudioNode_X3D_TypeToTag[1] = {
- TAG_X3D_AudioClip
+	TAG_X3D_AudioClip
 };
 
 #define SFStreamingNode_X3D_Count	4
 static const u32 SFStreamingNode_X3D_TypeToTag[4] = {
- TAG_X3D_AudioClip, TAG_X3D_Inline, TAG_X3D_LoadSensor, TAG_X3D_MovieTexture
+	TAG_X3D_AudioClip, TAG_X3D_Inline, TAG_X3D_LoadSensor, TAG_X3D_MovieTexture
 };
 
 #define SFBackground3DNode_X3D_Count	2
 static const u32 SFBackground3DNode_X3D_TypeToTag[2] = {
- TAG_X3D_Background, TAG_X3D_TextureBackground
+	TAG_X3D_Background, TAG_X3D_TextureBackground
 };
 
 #define SFColorNode_X3D_Count	2
 static const u32 SFColorNode_X3D_TypeToTag[2] = {
- TAG_X3D_Color, TAG_X3D_ColorRGBA
+	TAG_X3D_Color, TAG_X3D_ColorRGBA
 };
 
 #define SFNurbsControlCurveNode_X3D_Count	3
 static const u32 SFNurbsControlCurveNode_X3D_TypeToTag[3] = {
- TAG_X3D_Contour2D, TAG_X3D_ContourPolyline2D, TAG_X3D_NurbsCurve2D
+	TAG_X3D_Contour2D, TAG_X3D_ContourPolyline2D, TAG_X3D_NurbsCurve2D
 };
 
 #define SFCoordinateNode_X3D_Count	3
 static const u32 SFCoordinateNode_X3D_TypeToTag[3] = {
- TAG_X3D_Coordinate, TAG_X3D_CoordinateDouble, TAG_X3D_GeoCoordinate
+	TAG_X3D_Coordinate, TAG_X3D_CoordinateDouble, TAG_X3D_GeoCoordinate
 };
 
 #define SFCoordinate2DNode_X3D_Count	1
 static const u32 SFCoordinate2DNode_X3D_TypeToTag[1] = {
- TAG_X3D_Coordinate2D
+	TAG_X3D_Coordinate2D
 };
 
 #define SFFillPropertiesNode_X3D_Count	1
 static const u32 SFFillPropertiesNode_X3D_TypeToTag[1] = {
- TAG_X3D_FillProperties
+	TAG_X3D_FillProperties
 };
 
 #define SFFogNode_X3D_Count	1
 static const u32 SFFogNode_X3D_TypeToTag[1] = {
- TAG_X3D_Fog
+	TAG_X3D_Fog
 };
 
 #define SFFontStyleNode_X3D_Count	1
 static const u32 SFFontStyleNode_X3D_TypeToTag[1] = {
- TAG_X3D_FontStyle
+	TAG_X3D_FontStyle
 };
 
 #define SFGeoOriginNode_X3D_Count	1
 static const u32 SFGeoOriginNode_X3D_TypeToTag[1] = {
- TAG_X3D_GeoOrigin
+	TAG_X3D_GeoOrigin
 };
 
 #define SFViewpointNode_X3D_Count	2
 static const u32 SFViewpointNode_X3D_TypeToTag[2] = {
- TAG_X3D_GeoViewpoint, TAG_X3D_Viewpoint
+	TAG_X3D_GeoViewpoint, TAG_X3D_Viewpoint
 };
 
 #define SFTopNode_X3D_Count	1
 static const u32 SFTopNode_X3D_TypeToTag[1] = {
- TAG_X3D_Group
+	TAG_X3D_Group
 };
 
 #define SFHAnimDisplacerNode_X3D_Count	1
 static const u32 SFHAnimDisplacerNode_X3D_TypeToTag[1] = {
- TAG_X3D_HAnimDisplacer
+	TAG_X3D_HAnimDisplacer
 };
 
 #define SFHAnimNode_X3D_Count	3
 static const u32 SFHAnimNode_X3D_TypeToTag[3] = {
- TAG_X3D_HAnimJoint, TAG_X3D_HAnimSegment, TAG_X3D_HAnimSite
+	TAG_X3D_HAnimJoint, TAG_X3D_HAnimSegment, TAG_X3D_HAnimSite
 };
 
 #define SFTextureNode_X3D_Count	4
 static const u32 SFTextureNode_X3D_TypeToTag[4] = {
- TAG_X3D_ImageTexture, TAG_X3D_MovieTexture, TAG_X3D_MultiTexture, TAG_X3D_PixelTexture
+	TAG_X3D_ImageTexture, TAG_X3D_MovieTexture, TAG_X3D_MultiTexture, TAG_X3D_PixelTexture
 };
 
 #define SFX3DLinePropertiesNode_X3D_Count	1
 static const u32 SFX3DLinePropertiesNode_X3D_TypeToTag[1] = {
- TAG_X3D_LineProperties
+	TAG_X3D_LineProperties
 };
 
 #define SFMaterialNode_X3D_Count	1
 static const u32 SFMaterialNode_X3D_TypeToTag[1] = {
- TAG_X3D_Material
+	TAG_X3D_Material
 };
 
 #define SFMetadataNode_X3D_Count	5
 static const u32 SFMetadataNode_X3D_TypeToTag[5] = {
- TAG_X3D_MetadataDouble, TAG_X3D_MetadataFloat, TAG_X3D_MetadataInteger, TAG_X3D_MetadataSet, TAG_X3D_MetadataString
+	TAG_X3D_MetadataDouble, TAG_X3D_MetadataFloat, TAG_X3D_MetadataInteger, TAG_X3D_MetadataSet, TAG_X3D_MetadataString
 };
 
 #define SFTextureCoordinateNode_X3D_Count	4
 static const u32 SFTextureCoordinateNode_X3D_TypeToTag[4] = {
- TAG_X3D_MultiTextureCoordinate, TAG_X3D_NurbsTextureCoordinate, TAG_X3D_TextureCoordinate, TAG_X3D_TextureCoordinateGenerator
+	TAG_X3D_MultiTextureCoordinate, TAG_X3D_NurbsTextureCoordinate, TAG_X3D_TextureCoordinate, TAG_X3D_TextureCoordinateGenerator
 };
 
 #define SFTextureTransformNode_X3D_Count	2
 static const u32 SFTextureTransformNode_X3D_TypeToTag[2] = {
- TAG_X3D_MultiTextureTransform, TAG_X3D_TextureTransform
+	TAG_X3D_MultiTextureTransform, TAG_X3D_TextureTransform
 };
 
 #define SFNavigationInfoNode_X3D_Count	1
 static const u32 SFNavigationInfoNode_X3D_TypeToTag[1] = {
- TAG_X3D_NavigationInfo
+	TAG_X3D_NavigationInfo
 };
 
 #define SFNormalNode_X3D_Count	1
 static const u32 SFNormalNode_X3D_TypeToTag[1] = {
- TAG_X3D_Normal
+	TAG_X3D_Normal
 };
 
 #define SFNurbsCurveNode_X3D_Count	1
 static const u32 SFNurbsCurveNode_X3D_TypeToTag[1] = {
- TAG_X3D_NurbsCurve
+	TAG_X3D_NurbsCurve
 };
 
 #define SFNurbsSurfaceNode_X3D_Count	4
 static const u32 SFNurbsSurfaceNode_X3D_TypeToTag[4] = {
- TAG_X3D_NurbsPatchSurface, TAG_X3D_NurbsSweptSurface, TAG_X3D_NurbsSwungSurface, TAG_X3D_NurbsTrimmedSurface
+	TAG_X3D_NurbsPatchSurface, TAG_X3D_NurbsSweptSurface, TAG_X3D_NurbsSwungSurface, TAG_X3D_NurbsTrimmedSurface
 };
 
 
@@ -15782,72 +16294,135 @@
 	const u32 *types;
 	u32 count, i;
 	if (!NodeTag) return 0;
-	types = NULL; count = 0;
+	types = NULL;
+	count = 0;
 	switch (NDT_Tag) {
 	case NDT_SFWorldNode:
-		types = SFWorldNode_X3D_TypeToTag; count = SFWorldNode_X3D_Count; break;
+		types = SFWorldNode_X3D_TypeToTag;
+		count = SFWorldNode_X3D_Count;
+		break;
 	case NDT_SF3DNode:
-		types = SF3DNode_X3D_TypeToTag; count = SF3DNode_X3D_Count; break;
+		types = SF3DNode_X3D_TypeToTag;
+		count = SF3DNode_X3D_Count;
+		break;
 	case NDT_SF2DNode:
-		types = SF2DNode_X3D_TypeToTag; count = SF2DNode_X3D_Count; break;
+		types = SF2DNode_X3D_TypeToTag;
+		count = SF2DNode_X3D_Count;
+		break;
 	case NDT_SFAppearanceNode:
-		types = SFAppearanceNode_X3D_TypeToTag; count = SFAppearanceNode_X3D_Count; break;
+		types = SFAppearanceNode_X3D_TypeToTag;
+		count = SFAppearanceNode_X3D_Count;
+		break;
 	case NDT_SFGeometryNode:
-		types = SFGeometryNode_X3D_TypeToTag; count = SFGeometryNode_X3D_Count; break;
+		types = SFGeometryNode_X3D_TypeToTag;
+		count = SFGeometryNode_X3D_Count;
+		break;
 	case NDT_SFAudioNode:
-		types = SFAudioNode_X3D_TypeToTag; count = SFAudioNode_X3D_Count; break;
+		types = SFAudioNode_X3D_TypeToTag;
+		count = SFAudioNode_X3D_Count;
+		break;
 	case NDT_SFStreamingNode:
-		types = SFStreamingNode_X3D_TypeToTag; count = SFStreamingNode_X3D_Count; break;
+		types = SFStreamingNode_X3D_TypeToTag;
+		count = SFStreamingNode_X3D_Count;
+		break;
 	case NDT_SFBackground3DNode:
-		types = SFBackground3DNode_X3D_TypeToTag; count = SFBackground3DNode_X3D_Count; break;
+		types = SFBackground3DNode_X3D_TypeToTag;
+		count = SFBackground3DNode_X3D_Count;
+		break;
 	case NDT_SFColorNode:
-		types = SFColorNode_X3D_TypeToTag; count = SFColorNode_X3D_Count; break;
+		types = SFColorNode_X3D_TypeToTag;
+		count = SFColorNode_X3D_Count;
+		break;
 	case NDT_SFNurbsControlCurveNode:
-		types = SFNurbsControlCurveNode_X3D_TypeToTag; count = SFNurbsControlCurveNode_X3D_Count; break;
+		types = SFNurbsControlCurveNode_X3D_TypeToTag;
+		count = SFNurbsControlCurveNode_X3D_Count;
+		break;
 	case NDT_SFCoordinateNode:
-		types = SFCoordinateNode_X3D_TypeToTag; count = SFCoordinateNode_X3D_Count; break;
+		types = SFCoordinateNode_X3D_TypeToTag;
+		count = SFCoordinateNode_X3D_Count;
+		break;
 	case NDT_SFCoordinate2DNode:
-		types = SFCoordinate2DNode_X3D_TypeToTag; count = SFCoordinate2DNode_X3D_Count; break;
+		types = SFCoordinate2DNode_X3D_TypeToTag;
+		count = SFCoordinate2DNode_X3D_Count;
+		break;
 	case NDT_SFFillPropertiesNode:
-		types = SFFillPropertiesNode_X3D_TypeToTag; count = SFFillPropertiesNode_X3D_Count; break;
+		types = SFFillPropertiesNode_X3D_TypeToTag;
+		count = SFFillPropertiesNode_X3D_Count;
+		break;
 	case NDT_SFFogNode:
-		types = SFFogNode_X3D_TypeToTag; count = SFFogNode_X3D_Count; break;
+		types = SFFogNode_X3D_TypeToTag;
+		count = SFFogNode_X3D_Count;
+		break;
 	case NDT_SFFontStyleNode:
-		types = SFFontStyleNode_X3D_TypeToTag; count = SFFontStyleNode_X3D_Count; break;
+		types = SFFontStyleNode_X3D_TypeToTag;
+		count = SFFontStyleNode_X3D_Count;
+		break;
 	case NDT_SFGeoOriginNode:
-		types = SFGeoOriginNode_X3D_TypeToTag; count = SFGeoOriginNode_X3D_Count; break;
+		types = SFGeoOriginNode_X3D_TypeToTag;
+		count = SFGeoOriginNode_X3D_Count;
+		break;
 	case NDT_SFViewpointNode:
-		types = SFViewpointNode_X3D_TypeToTag; count = SFViewpointNode_X3D_Count; break;
+		types = SFViewpointNode_X3D_TypeToTag;
+		count = SFViewpointNode_X3D_Count;
+		break;
 	case NDT_SFTopNode:
-		types = SFTopNode_X3D_TypeToTag; count = SFTopNode_X3D_Count; break;
+		types = SFTopNode_X3D_TypeToTag;
+		count = SFTopNode_X3D_Count;
+		break;
 	case NDT_SFHAnimDisplacerNode:
-		types = SFHAnimDisplacerNode_X3D_TypeToTag; count = SFHAnimDisplacerNode_X3D_Count; break;
+		types = SFHAnimDisplacerNode_X3D_TypeToTag;
+		count = SFHAnimDisplacerNode_X3D_Count;
+		break;
 	case NDT_SFHAnimNode:
-		types = SFHAnimNode_X3D_TypeToTag; count = SFHAnimNode_X3D_Count; break;
+		types = SFHAnimNode_X3D_TypeToTag;
+		count = SFHAnimNode_X3D_Count;
+		break;
 	case NDT_SFTextureNode:
-		types = SFTextureNode_X3D_TypeToTag; count = SFTextureNode_X3D_Count; break;
+		types = SFTextureNode_X3D_TypeToTag;
+		count = SFTextureNode_X3D_Count;
+		break;
 	case NDT_SFX3DLinePropertiesNode:
-		types = SFX3DLinePropertiesNode_X3D_TypeToTag; count = SFX3DLinePropertiesNode_X3D_Count; break;
+		types = SFX3DLinePropertiesNode_X3D_TypeToTag;
+		count = SFX3DLinePropertiesNode_X3D_Count;
+		break;
 	case NDT_SFMaterialNode:
-		types = SFMaterialNode_X3D_TypeToTag; count = SFMaterialNode_X3D_Count; break;
+		types = SFMaterialNode_X3D_TypeToTag;
+		count = SFMaterialNode_X3D_Count;
+		break;
 	case NDT_SFMetadataNode:
-		types = SFMetadataNode_X3D_TypeToTag; count = SFMetadataNode_X3D_Count; break;
+		types = SFMetadataNode_X3D_TypeToTag;
+		count = SFMetadataNode_X3D_Count;
+		break;
 	case NDT_SFTextureCoordinateNode:
-		types = SFTextureCoordinateNode_X3D_TypeToTag; count = SFTextureCoordinateNode_X3D_Count; break;
+		types = SFTextureCoordinateNode_X3D_TypeToTag;
+		count = SFTextureCoordinateNode_X3D_Count;
+		break;
 	case NDT_SFTextureTransformNode:
-		types = SFTextureTransformNode_X3D_TypeToTag; count = SFTextureTransformNode_X3D_Count; break;
+		types = SFTextureTransformNode_X3D_TypeToTag;
+		count = SFTextureTransformNode_X3D_Count;
+		break;
 	case NDT_SFNavigationInfoNode:
-		types = SFNavigationInfoNode_X3D_TypeToTag; count = SFNavigationInfoNode_X3D_Count; break;
+		types = SFNavigationInfoNode_X3D_TypeToTag;
+		count = SFNavigationInfoNode_X3D_Count;
+		break;
 	case NDT_SFNormalNode:
-		types = SFNormalNode_X3D_TypeToTag; count = SFNormalNode_X3D_Count; break;
+		types = SFNormalNode_X3D_TypeToTag;
+		count = SFNormalNode_X3D_Count;
+		break;
 	case NDT_SFNurbsCurveNode:
-		types = SFNurbsCurveNode_X3D_TypeToTag; count = SFNurbsCurveNode_X3D_Count; break;
+		types = SFNurbsCurveNode_X3D_TypeToTag;
+		count = SFNurbsCurveNode_X3D_Count;
+		break;
 	case NDT_SFNurbsSurfaceNode:
-		types = SFNurbsSurfaceNode_X3D_TypeToTag; count = SFNurbsSurfaceNode_X3D_Count; break;
+		types = SFNurbsSurfaceNode_X3D_TypeToTag;
+		count = SFNurbsSurfaceNode_X3D_Count;
+		break;
 	default:
 		return 0;
 	}
-	for(i=0; i<count; i++) { if (types[i]==NodeTag) return 1;}
+	for(i=0; i<count; i++) {
+		if (types[i]==NodeTag) return 1;
+	}
 	return 0;
 }
 #endif /*GPAC_DISABLE_X3D*/

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/xbl_process.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/xbl_process.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Cyril Concolato 
+ *			Authors: Cyril Concolato
  *			Copyright (c) Telecom ParisTech 2008-2012
  *					All rights reserved
  *
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/scene_manager.h>
@@ -38,7 +38,7 @@
 	GF_Err last_error;
 	GF_SAXParser *sax_parser;
 	XBL_Element *root;
-	
+
 	/* stack of XBL nodes*/
 	GF_List *node_stack;
 } GF_XBL_Parser;
@@ -88,7 +88,7 @@
 {
 	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);
@@ -151,7 +151,7 @@
 {
 	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;

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/xml_ns.c -> gpac-0.5.1.svn5491.tar.xz/src/scenegraph/xml_ns.c Changed

@@ -15,7 +15,7 @@
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY, TYPE, 0 }, without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.	
+ *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library, TYPE, 0 }, see the file COPYING.  If not, write to
@@ -46,7 +46,13 @@
 	GF_SVG_ATTOPT_FILTER = 5,
 } GF_SVGAttOption;
 
-static const struct xml_att_def { const char *name; u32 tag; u32 type; u32 opts; u32 xmlns; } xml_attributes [] = 
+static const struct xml_att_def {
+	const char *name;
+	u32 tag;
+	u32 type;
+	u32 opts;
+	u32 xmlns;
+} xml_attributes [] =
 {
 	/*XML base*/
 	{ "id", TAG_XML_ATT_id, SVG_ID_datatype, 0, GF_XMLNS_XML } ,
@@ -72,7 +78,7 @@
 	{ "target", TAG_XMLEV_ATT_target, XML_IDREF_datatype, 0, GF_XMLNS_XMLEV },
 	{ "handler", TAG_XMLEV_ATT_handler, XMLRI_datatype, 0, GF_XMLNS_XMLEV },
 
-	
+
 	{ "id", TAG_SVG_ATT_id, SVG_ID_datatype, 0, GF_XMLNS_SVG } ,
 	{ "class", TAG_SVG_ATT__class, DOM_String_datatype, 0, GF_XMLNS_SVG },
 	{ "requiredFeatures", TAG_SVG_ATT_requiredFeatures, XMLRI_List_datatype, 0, GF_XMLNS_SVG },
@@ -130,7 +136,7 @@
 	{ "nav-down-left", TAG_SVG_ATT_nav_down_left, SVG_Focus_datatype, 0, GF_XMLNS_SVG },
 	{ "nav-left", TAG_SVG_ATT_nav_left, SVG_Focus_datatype, 0, GF_XMLNS_SVG },
 	{ "nav-up-left", TAG_SVG_ATT_nav_up_left, SVG_Focus_datatype, 0, GF_XMLNS_SVG },
-	{ "transform", TAG_SVG_ATT_transform, SVG_Transform_datatype, 0, GF_XMLNS_SVG },	
+	{ "transform", TAG_SVG_ATT_transform, SVG_Transform_datatype, 0, GF_XMLNS_SVG },
 	{ "target", TAG_SVG_ATT_target, DOM_String_datatype, 0, GF_XMLNS_SVG },
 	{ "attributeName", TAG_SVG_ATT_attributeName, SMIL_AttributeName_datatype, 0, GF_XMLNS_SVG },
 	{ "attributeType", TAG_SVG_ATT_attributeType, SMIL_AttributeType_datatype, 0, GF_XMLNS_SVG },
@@ -265,7 +271,7 @@
 	{ "y", TAG_SVG_ATT_text_y, SVG_Coordinates_datatype, GF_SVG_ATTOPT_TEXT, GF_XMLNS_SVG },
 	/*regular y position*/
 	{ "y", TAG_SVG_ATT_y, SVG_Coordinate_datatype, 0, GF_XMLNS_SVG },
-	
+
 	/*filters*/
 	{ "tableValues", TAG_SVG_ATT_filter_table_values, SVG_Numbers_datatype, 0, GF_XMLNS_SVG },
 	{ "intercept", TAG_SVG_ATT_filter_intercept, SVG_Number_datatype, 0, GF_XMLNS_SVG },
@@ -505,7 +511,11 @@
 	return gf_node_create_attribute_from_datatype(type, tag);
 }
 
-static const struct xml_elt_def { const char *name; u32 tag; u32 xmlns; } xml_elements [] = 
+static const struct xml_elt_def {
+	const char *name;
+	u32 tag;
+	u32 xmlns;
+} xml_elements [] =
 {
 	{ "listener", TAG_SVG_listener, GF_XMLNS_XMLEV},
 	/*SVG*/
@@ -633,7 +643,7 @@
 	for (i=0; i<count; i++) {
 		if (n->sgprivate->tag==xml_elements[i].tag) {
 			char *xmlns;
-			if (!n || (ns == xml_elements[i].xmlns)) 
+			if (!n || (ns == xml_elements[i].xmlns))
 				return xml_elements[i].name;
 
 			xmlns = (char *) gf_sg_get_namespace_qname(n->sgprivate->scenegraph, xml_elements[i].xmlns);
@@ -647,7 +657,7 @@
 	return "UndefinedNode";
 }
 
-u32 gf_xml_get_element_namespace(GF_Node *n)
+GF_NamespaceType gf_xml_get_element_namespace(GF_Node *n)
 {
 	u32 i, count;
 	if (n->sgprivate->tag==TAG_DOMFullNode) {
@@ -675,7 +685,7 @@
 	return count;
 }
 
-GF_Err gf_node_get_attribute_info(GF_Node *node, GF_FieldInfo *info) 
+GF_Err gf_node_get_attribute_info(GF_Node *node, GF_FieldInfo *info)
 {
 	GF_DOMNode *dom = (GF_DOMNode *)node;
 	GF_DOMAttribute *atts = dom->attributes;
@@ -732,9 +742,9 @@
 		if (ns) len = (u32) strlen(ns);
 
 		while (att) {
-			if (((u32) att->tag == TAG_DOM_ATT_any) && 
-				((!ns && !strcmp(name, att->name)) || (ns && !strncmp(att->name, ns, len) && !strcmp(att->name+len+1, name)))
-			) {
+			if (((u32) att->tag == TAG_DOM_ATT_any) &&
+			        ((!ns && !strcmp(name, att->name)) || (ns && !strncmp(att->name, ns, len) && !strcmp(att->name+len+1, name)))
+			   ) {
 				field->fieldIndex = att->tag;
 				field->fieldType = att->data_type;
 				field->far_ptr = att->data;
@@ -796,9 +806,9 @@
 		}
 		break;
 	case TAG_SVG_ATT_dur:
-		if (node_tag == TAG_SVG_video || 
-			node_tag == TAG_SVG_audio ||
-			node_tag == TAG_SVG_animation)
+		if (node_tag == TAG_SVG_video ||
+		        node_tag == TAG_SVG_audio ||
+		        node_tag == TAG_SVG_animation)
 		{
 			((SMIL_Duration *)att->data)->type = SMIL_DURATION_MEDIA;
 		} else {
@@ -874,18 +884,18 @@
 	case TAG_SVG_ATT_zoomAndPan:
 		*((SVG_ZoomAndPan *)att->data) = SVG_ZOOMANDPAN_MAGNIFY;
 		break;
-	case TAG_SVG_ATT_stroke_linecap: 
-		*(SVG_StrokeLineCap*)att->data = SVG_STROKELINECAP_INHERIT; 
+	case TAG_SVG_ATT_stroke_linecap:
+		*(SVG_StrokeLineCap*)att->data = SVG_STROKELINECAP_INHERIT;
 		break;
-	case TAG_SVG_ATT_stroke_linejoin: 
-		*(SVG_StrokeLineJoin*)att->data = SVG_STROKELINEJOIN_INHERIT; 
+	case TAG_SVG_ATT_stroke_linejoin:
+		*(SVG_StrokeLineJoin*)att->data = SVG_STROKELINEJOIN_INHERIT;
 		break;
 
-	case TAG_SVG_ATT_transform: 
+	case TAG_SVG_ATT_transform:
 		gf_mx2d_init(((SVG_Transform*)att->data)->mat);
 		break;
 
-		
+
 	/*all default=0 values (don't need init)*/
 	case TAG_SVG_ATT_font_family:
 	case TAG_SVG_ATT_font_style:
@@ -927,7 +937,7 @@
 			field->fieldType = att->data_type;
 			field->fieldIndex = att->tag;
 			/* attribute name should not be called, if needed use gf_svg_get_attribute_name(att->tag);*/
-			field->name = NULL; 
+			field->name = NULL;
 			if (set_default) attributes_set_default_value(node, att);
 			return GF_OK;
 		}
@@ -972,8 +982,8 @@
 			n_dst = (GF_DOMFullNode *)clone;
 			n_dst->ns = n_src->ns;
 			n_dst->name = gf_strdup(n_dst->name);
-		} 
-		
+		}
+
 		att = ((GF_DOMNode *)orig)->attributes;
 		while (att) {
 			GF_FieldInfo dst, src;
@@ -996,7 +1006,7 @@
 				}
 			}
 			att = att->next;
-		}	
+		}
 	}
 	if (cloned_parent) {
 		gf_node_list_add_child( & ((GF_ParentNode*)cloned_parent)->children, clone);
@@ -1023,9 +1033,9 @@
 	char szFile[GF_MAX_PATH];
 	u64 fsize;
 	FILE *f;
-	
+
 	sprintf(szFile, "%s%04X%s", base_file, idx, ext);
-	
+
 	f = gf_f64_open(szFile, "rb");
 	if (!f) return 0;
 
@@ -1047,7 +1057,7 @@
 		if (!fsize) return 2;
 	}
 	if (f)
-	  fclose(f);
+		fclose(f);
 	return 1;
 }
 
@@ -1107,9 +1117,9 @@
 		data_size = gf_base16_decode(sep, (u32) strlen(sep), data, data_size);
 	}
 	if (!data_size) return GF_OK;
-	
+
 	iri->type = XMLRI_STRING;
-	
+
 	existing = 0;
 	idx = 0;
 	while (1) {

gpac-0.5.0.svn5178.tar.bz2/src/terminal/channel.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/channel.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -38,7 +38,11 @@
 	if (ch->BufferOn) {
 		ch->BufferOn = 0;
 		gf_clock_buffer_off(ch->clock);
-		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: buffering off at STB %d (OTB %d) (nb buffering on clock: %d)\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), gf_clock_time(ch->clock), ch->clock->Buffering));
+		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) : buffering off at STB %d (OTB %d) (nb buffering on clock: %d)\n", ch->esd->ESID, ch->odm->net_service->url, gf_term_get_time(ch->odm->term), gf_clock_time(ch->clock), 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;
 	}
 }
 
@@ -53,12 +57,12 @@
 	if (!ch->BufferOn) {
 		ch->BufferOn = 1;
 		gf_clock_buffer_on(ch->clock);
-		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: buffering on at %d (nb buffering on clock: %d)\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), ch->clock->Buffering));
+		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): buffering on at %d (nb buffering on clock: %d)\n", ch->esd->ESID, ch->odm->net_service->url, gf_term_get_time(ch->odm->term), ch->clock->Buffering));
 	}
 }
 
 /*reset channel*/
-static void Channel_Reset(GF_Channel *ch, Bool for_start)
+static void gf_es_reset(GF_Channel *ch, Bool for_start)
 {
 	gf_es_lock(ch, 1);
 
@@ -131,7 +135,7 @@
 		tmp->ocr_scale /= esd->slConfig->OCRResolution;
 	}
 
-	Channel_Reset(tmp, 0);
+	gf_es_reset(tmp, 0);
 	return tmp;
 }
 
@@ -140,7 +144,7 @@
 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;
@@ -178,7 +182,7 @@
 /*destroy channel*/
 void gf_es_del(GF_Channel *ch)
 {
-	Channel_Reset(ch, 0);
+	gf_es_reset(ch, 0);
 	if (ch->AU_buffer_pull) {
 		ch->AU_buffer_pull->data = NULL;
 		gf_db_unit_del(ch->AU_buffer_pull);
@@ -205,7 +209,7 @@
 	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 
+	/*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;
@@ -215,15 +219,15 @@
 	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) 
+	if (gf_es_owns_clock(ch) && !ch->clock->no_time_ctrl)
 		gf_clock_reset(ch->clock);
 
 	/*reset channel*/
-	Channel_Reset(ch, 1);
+	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 
+	/*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)
@@ -255,17 +259,17 @@
 	gf_es_buffer_off(ch);
 
 	ch->es_state = GF_ESM_ES_CONNECTED;
-	Channel_Reset(ch, 0);
+	gf_es_reset(ch, 0);
 	return GF_OK;
 }
 
 
-void Channel_WaitRAP(GF_Channel *ch)
+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 DON'T wait for it :)*/
-	if (!ch->codec_resilient) 
+	/*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;
@@ -275,6 +279,7 @@
 
 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);
@@ -288,7 +293,7 @@
 	ch->BufferTime = 0;
 	gf_mx_v(ch->mx);
 
-	if (ch->odm->codec && ch->odm->codec->CB) 
+	if (ch->odm->codec && ch->odm->codec->CB)
 		gf_cm_reset(ch->odm->codec->CB);
 
 }
@@ -311,9 +316,13 @@
 	gf_mx_v(ch->mx);
 }
 
-static Bool Channel_NeedsBuffering(GF_Channel *ch, u32 ForRebuffering)
+static Bool gf_es_needs_buffering(GF_Channel *ch, u32 ForRebuffering)
 {
-	if (!ch->MaxBuffer || ch->IsEndOfStream) return 0;
+	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) {
@@ -328,7 +337,7 @@
 		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_term_message(ch->odm->term, ch->service->url, "Data timeout - aborting buffering", GF_OK);
 			ch->MinBuffer = ch->MaxBuffer = 0;
 			ch->au_duration = 0;
 			gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
@@ -340,7 +349,7 @@
 				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); 
+				gf_term_message(ch->odm->term, ch->service->url, szMsg, GF_OK);
 			}
 			return 1;
 		}
@@ -352,11 +361,11 @@
 		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 
+		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) 
+			if (!ch->AU_buffer_first && ch->first_au_fetched)
 				ch->MinBuffer = 0;
 			return 0;
 		}
@@ -365,14 +374,14 @@
 	return 0;
 }
 
-static void Channel_UpdateBuffering(GF_Channel *ch, Bool update_info)
+void gf_es_update_buffering(GF_Channel *ch, Bool update_info)
 {
 	if (update_info && 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 (!Channel_NeedsBuffering(ch, 0)) {
+
+	if (!gf_es_needs_buffering(ch, 0)) {
 		gf_es_buffer_off(ch);
 		if (ch->MaxBuffer && update_info) gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
 
@@ -380,7 +389,7 @@
 	}
 }
 
-static void Channel_UpdateBufferTime(GF_Channel *ch)
+static void gf_es_update_buffer_time(GF_Channel *ch)
 {
 	if (!ch->AU_buffer_first || !ch->IsClockInit) {
 		ch->BufferTime = 0;
@@ -404,13 +413,17 @@
 			ch->BufferTime = 50*ch->AU_Count;
 		}
 	} else {
-		s32 bt = ch->AU_buffer_last->DTS - gf_clock_time(ch->clock);
+		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;
-			if (ch->clock->speed != FIX_ONE) {
-				ch->BufferTime = FIX2INT( gf_divfix( INT2FIX(ch->AU_buffer_last->DTS - ch->AU_buffer_first->DTS) , ch->clock->speed)) ;
-			}
-		} else {	
+		} else {
 			ch->BufferTime = 0;
 		}
 	}
@@ -419,7 +432,7 @@
 }
 
 /*dispatch the AU in the DB*/
-static void Channel_DispatchAU(GF_Channel *ch, u32 duration)
+static void gf_es_dispatch_au(GF_Channel *ch, u32 duration)
 {
 	u32 time;
 	GF_DBUnit *au;
@@ -432,6 +445,14 @@
 		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);
@@ -455,6 +476,7 @@
 	au->data = ch->buffer;
 	au->dataLength = ch->len;
 	au->PaddingBits = ch->padingBits;
+	au->sender_ntp = ch->sender_ntp;
 
 	ch->IsRap = 0;
 	ch->padingBits = 0;
@@ -465,11 +487,21 @@
 		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);
 
+
+	if (0 && ch->AU_Count>10000) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Something really wrong, too many AUs in decoding channel (%d) - trashing buffers\n", ch->esd->ESID, ch->odm->net_service->url, ch->AU_Count));
+		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));
@@ -486,7 +518,8 @@
 		ch->AU_buffer_last = au;
 		ch->AU_Count = 1;
 	} else {
-		if (!ch->recompute_dts && (ch->AU_buffer_last->DTS<=au->DTS)) {
+		//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;
 		}
@@ -523,9 +556,9 @@
 					} else {
 						TS_diff = au_prev->next->CTS - au_prev->CTS;
 					}
-					if (TS_diff && (TS_diff<minDIFF)) 
+					if (TS_diff && (TS_diff<minDIFF))
 						minDIFF = TS_diff;
-					
+
 					if (au_prev->DTS < minCTS)
 						minCTS = au_prev->CTS;
 
@@ -567,7 +600,7 @@
 					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*/
@@ -603,7 +636,7 @@
 					au_prev = au_prev->next;
 				}
 				assert(au_prev);
-				if (au_prev->next->DTS==au->DTS) {
+				if (au_prev->next && (au_prev->next->DTS==au->DTS)) {
 					gf_free(au->data);
 					gf_free(au);
 				} else {
@@ -615,14 +648,14 @@
 		ch->AU_Count += 1;
 	}
 
-	Channel_UpdateBufferTime(ch);
+	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] ES%d - Dispatch AU DTS %d - CTS %d - RAP %d - size %d time %d Buffer %d Nb AUs %d - First AU relative timing %d\n", ch->esd->ESID, au->DTS, au->CTS, au->flags&1, 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 ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) - Dispatch AU DTS %d - CTS %d - RAP %d - size %d time %d Buffer %d Nb AUs %d - First AU relative timing %d\n", ch->esd->ESID, ch->odm->net_service->url, au->DTS, au->CTS, au->flags&1, 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 
+	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;
@@ -637,7 +670,7 @@
 				gf_codec_process(ch->odm->subscene->od_codec, 100);
 				break;
 			case GF_STREAM_SCENE:
-				if (ch->odm->codec) 
+				if (ch->odm->codec)
 					gf_codec_process(ch->odm->codec, 100);
 				else
 					gf_codec_process(ch->odm->subscene->scene_codec, 100);
@@ -670,7 +703,7 @@
 	time = gf_term_get_time(ch->odm->term);
 	if (ch->BufferOn) {
 		ch->last_au_time = time;
-		Channel_UpdateBuffering(ch, 1);
+		gf_es_update_buffering(ch, 1);
 	} else {
 		/*trigger the data progress every 500 ms*/
 		if (ch->last_au_time + 500 > time) {
@@ -682,7 +715,23 @@
 	gf_es_lock(ch, 0);
 }
 
-void Channel_ReceiveSkipSL(GF_ClientService *serv, GF_Channel *ch, const char *StreamBuf, u32 StreamLength)
+
+static void gf_es_init_clock(GF_Channel *ch, u32 TS)
+{
+	ch->clock->clock_init = 0;
+
+	gf_clock_set_time(ch->clock, TS);
+	//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;
@@ -700,8 +749,7 @@
 	/*if channel owns the clock, start it*/
 	if (ch->clock && !ch->IsClockInit) {
 		if (gf_es_owns_clock(ch)) {
-			gf_clock_set_time(ch->clock, 0);
-			ch->IsClockInit = 1;
+			gf_es_init_clock(ch, 0);
 			ch->seed_ts = 0;
 		}
 		if (ch->clock->clock_init && !ch->IsClockInit) {
@@ -720,56 +768,43 @@
 		ch->AU_Count += 1;
 	}
 
-	Channel_UpdateBufferTime(ch);
+	gf_es_update_buffer_time(ch);
 
 	if (ch->BufferOn) {
 		ch->last_au_time = gf_term_get_time(ch->odm->term);
-		Channel_UpdateBuffering(ch, 1);
+		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 
+	/*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_clock_set_time(ch->clock, ch->CTS);
+			gf_es_init_clock(ch, ch->DTS);
 			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: Forcing clock initialization at STB %d - AU DTS %d CTS %d\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), ch->DTS, ch->CTS));
-			ch->IsClockInit = 1;
-		} 
+		}
 	}
 	/*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) {
-			ch->clock->clock_init = 0;
-			gf_clock_set_time(ch->clock, ch->DTS);
+			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 %d - %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) ));
-			ch->IsClockInit = 1;
 		}
 	}
-	/*if channel is not the OCR, shift all time stamps to match the current time at clock init*/
 	else if (!ch->IsClockInit ) {
-//		ch->ts_offset += gf_clock_real_time(ch->clock);
-		if (ch->clock->clock_init) {
-			ch->IsClockInit = 1;
-			if (ch->odm->flags & GF_ODM_INHERIT_TIMELINE) {
-//				ch->ts_offset += gf_clock_real_time(ch->clock) - ch->CTS;
-			}
-		}
+		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) {
-		ch->clock->clock_init = 0;
-		gf_clock_set_time(ch->clock, 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 %d - %d buffering\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), ch->DTS, ch->clock->Buffering));
-		ch->IsClockInit = 1;
 	}
 }
 
@@ -785,8 +820,7 @@
 	now = gf_clock_real_time(ch->clock);
 	if (cts + ch->MinBuffer < now) {
 		if (ch->MinBuffer && (ch->is_raw_channel==2)) {
-			ch->clock->clock_init = 0;
-			gf_clock_set_time(ch->clock, cts);
+			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));
@@ -812,7 +846,7 @@
 			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 
+		/*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);
@@ -847,7 +881,7 @@
 	if (ch->es_state != GF_ESM_ES_RUNNING) return;
 
 	if (ch->skip_sl) {
-		Channel_ReceiveSkipSL(serv, ch, payload, payload_size);
+		gf_es_receive_skip_sl(serv, ch, payload, payload_size);
 		return;
 	}
 	if (ch->is_raw_channel) {
@@ -871,8 +905,13 @@
 		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;
+	}
+
 	/*we ignore OCRs for the moment*/
-	if (hdr.OCRflag) {
+	if (hdr.OCRflag==1) {
 		if (!ch->IsClockInit) {
 			/*channel is the OCR, re-initialize the clock with the proper OCR*/
 			if (gf_es_owns_clock(ch)) {
@@ -897,7 +936,8 @@
 				ch->clock->clock_init = 0;
 				ch->prev_pcr_diff = 0;
 
-				gf_clock_set_time(ch->clock, OCR_TS);
+				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;
@@ -916,6 +956,7 @@
 			u32 ck;
 			u32 OCR_TS;
 			s32 pcr_diff, pcr_pcrprev_diff;
+
 			if (hdr.m2ts_pcr) {
 				OCR_TS = (u32) ( hdr.objectClockReference / 27000);
 			} else {
@@ -926,20 +967,22 @@
 			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\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, pcr_diff, (hdr.m2ts_pcr==2) ? " - PCR Discontinuity flag" : "" ));
+			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, (hdr.m2ts_pcr==2) ? " - PCR Discontinuity flag" : "", pcr_pcrprev_diff));
 
 			//PCR loop or disc - use 10 sec as a threshold - it may happen that video is sent up to 4 or 5 seconds ahead of the PCR in some systems
-			if (ch->prev_pcr_diff && ABS(pcr_pcrprev_diff) > 10000) {
+			if (ch->IsClockInit && ABS(pcr_pcrprev_diff) > 10000) {
 				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 = 0;
+				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;
@@ -948,13 +991,13 @@
 
 	/*check state*/
 	if (!ch->codec_resilient && (reception_status==GF_CORRUPTED_DATA)) {
-		Channel_WaitRAP(ch);
+		gf_es_wait_rap(ch);
 		return;
 	}
 
 	if (!ch->esd->slConfig->useAccessUnitStartFlag) {
 		/*no AU signaling - each packet is an AU*/
-		if (!ch->esd->slConfig->useAccessUnitEndFlag) 
+		if (!ch->esd->slConfig->useAccessUnitEndFlag)
 			hdr.accessUnitEndFlag = hdr.accessUnitStartFlag = 1;
 		/*otherwise AU are signaled by end of previous packet*/
 		else
@@ -964,7 +1007,7 @@
 	/*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) ) {
+	} else if ((ch->carousel_type!=GF_ESM_CAROUSEL_MPEG2) && (!ch->esd->slConfig->useRandomAccessPointFlag || (ch->codec_resilient==GF_CODEC_RESILIENT_ALWAYS) ) ) {
 		ch->stream_state = 0;
 	}
 
@@ -980,12 +1023,12 @@
 				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));
-						Channel_WaitRAP(ch);
+						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));
-					Channel_WaitRAP(ch);
+					gf_es_wait_rap(ch);
 					return;
 				}
 			}
@@ -1011,13 +1054,31 @@
 	/*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)) 
+		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 %d)\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) {
@@ -1027,10 +1088,9 @@
 
 #if 0
 				/*until clock is not init check seed ts*/
-				if (!ch->IsClockInit && (ch->net_dts < ch->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;
@@ -1049,17 +1109,21 @@
 					ch->DTS = (u32) (ch->ts_offset + (s64) (ch->net_dts) * 1000 / ch->ts_res);
 				}
 
+				if (ch->odm->parentscene && ch->odm->parentscene->root_od->addon) {
+					ch->DTS = (u32) gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene, ch->DTS, ch->odm->parentscene->root_od->addon);
+					ch->CTS = (u32) gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene, ch->CTS, ch->odm->parentscene->root_od->addon);
+				}
+
 				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_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d: invalid clock reference detected - DTS %d but OCR %d - using DTS as OCR\n", ch->esd->ESID, ch->DTS, ch->clock->init_time));
-						ch->clock->clock_init = 0;
-						gf_clock_set_time(ch->clock, ch->DTS-1000);
+						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;
@@ -1098,9 +1162,14 @@
 		} 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; */
+			/* not used :			Bool use_rap = hdr.randomAccessPointFlag; */
 
 			if (ch->carousel_type==GF_ESM_CAROUSEL_MPEG2) {
 				AUSeqNum = hdr.m2ts_version_number_plus_one-1;
@@ -1135,7 +1204,7 @@
 						if (ch->stream_state==2) {
 							GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: RAP Carousel found (TS %d) - 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 %d) - skipping\n", ch->esd->ESID, ch->CTS));
@@ -1147,10 +1216,10 @@
 						if (ch->stream_state==2) {
 							GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: RAP Carousel found (TS %d) - recovering from previous errors\n", ch->esd->ESID, ch->CTS));
 						}
- 						ch->au_sn = AUSeqNum;
+						ch->au_sn = AUSeqNum;
 						ch->stream_state = 0;
 					}
-				} 
+				}
 				/*regular AU but waiting for RAP*/
 				else if (ch->stream_state) {
 #if 0
@@ -1162,10 +1231,10 @@
 #endif
 				}
 				/*previous packet(s) loss: check for critical or non-critical AUs*/
-				else if (reception_status == GF_REMOTE_SERVICE_ERROR) { 
+				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;
@@ -1181,37 +1250,27 @@
 
 		/*no carousel signaling, tune-in at first RAP*/
 		else if (hdr.randomAccessPointFlag) {
-			ch->stream_state = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: RAP AU received\n", ch->esd->ESID));
+			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) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: Waiting for RAP - skipping AU (DTS %d)\n", ch->esd->ESID, ch->DTS));
-			return;
-		}
-	}
-
-
-	/*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 %d)\n", ch->esd->ESID, ch->DTS));
-		}
-		if (ch->codec_resilient) {
-			if (!ch->IsClockInit && !ch->skip_time_check_for_pending) gf_es_check_timing(ch);
-			Channel_DispatchAU(ch, 0);
-		} else {
-			gf_free(ch->buffer);
-			ch->buffer = NULL;
-			ch->AULength = 0;
-			ch->len = ch->allocSize = 0;
+			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 %d)\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;
 
-	/*get AU end state*/	
+	/*get AU end state*/
 	OldLength = ch->buffer ? ch->len : 0;
 	EndAU = hdr.accessUnitEndFlag;
 	if (ch->AULength == OldLength + payload_size) EndAU = 1;
@@ -1228,7 +1287,7 @@
 
 	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));
-		Channel_DispatchAU(ch, 0);
+		gf_es_dispatch_au(ch, 0);
 		return;
 	}
 	if (!payload_size) return;
@@ -1259,7 +1318,7 @@
 		ch->len = 0;
 	}
 	if (!ch->esd->slConfig->usePaddingFlag) hdr.paddingFlag = 0;
-	
+
 	if (ch->ipmp_tool) {
 		GF_Err e;
 		GF_IPMPEvent evt;
@@ -1285,7 +1344,7 @@
 				/*restart*/
 				if (evt.restart_requested) {
 					if (ch->odm->parentscene->is_dynamic_scene) {
-						gf_scene_restart_dynamic(ch->odm->parentscene, 0);
+						gf_scene_restart_dynamic(ch->odm->parentscene, 0, 0);
 					} else {
 						mediacontrol_restart(ch->odm);
 					}
@@ -1297,7 +1356,7 @@
 
 	gf_es_lock(ch, 1);
 
-	if (hdr.paddingFlag && !EndAU) {	
+	if (hdr.paddingFlag && !EndAU) {
 		/*to do - this shouldn't happen anyway */
 
 	} else {
@@ -1316,7 +1375,7 @@
 		if (hdr.paddingFlag) ch->padingBits = hdr.paddingBits;
 	}
 
-	if (EndAU) Channel_DispatchAU(ch, hdr.au_duration);
+	if (EndAU) gf_es_dispatch_au(ch, hdr.au_duration);
 
 	gf_es_lock(ch, 0);
 }
@@ -1327,12 +1386,13 @@
 {
 	if (!ch || ch->IsEndOfStream) return;
 	ch->IsEndOfStream = 1;
-	
+
 	/*flush buffer*/
 	gf_es_buffer_off(ch);
 	if (ch->len)
-		Channel_DispatchAU(ch, 0);
+		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);
 }
 
@@ -1343,12 +1403,14 @@
 	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);
-		
+
 		if (!ch->AU_buffer_first || (ch->BufferTime < (s32) ch->MaxBuffer/2) ) {
 			/*query buffer level, don't sleep if too low*/
 			GF_NetworkCommand com;
@@ -1356,12 +1418,12 @@
 			com.base.on_channel = ch;
 			gf_term_service_command(ch->service, &com);
 		}
-	
+
 		/*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) Channel_UpdateBuffering(ch, 0);
+		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;
@@ -1380,6 +1442,9 @@
 
 	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) {
@@ -1403,19 +1468,24 @@
 	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;
-        }
+	{
+		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));
@@ -1440,7 +1510,7 @@
 					/*restart*/
 					if (evt.restart_requested) {
 						if (ch->odm->parentscene->is_dynamic_scene) {
-							gf_scene_restart_dynamic(ch->odm->parentscene, 0);
+							gf_scene_restart_dynamic(ch->odm->parentscene, 0, 0);
 						} else {
 							mediacontrol_restart(ch->odm);
 						}
@@ -1450,9 +1520,16 @@
 				return NULL;
 			}
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d - Dispatch Pull AU DTS %d - CTS %d - size %d time %d - UTC "LLU" ms\n", ch->esd->ESID, ch->DTS, ch->CTS, ch->AU_buffer_pull->dataLength, gf_clock_real_time(ch->clock), gf_net_get_utc() ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) at %d - Dispatch Pull AU DTS %d - CTS %d - 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));
+
+		ch->AU_buffer_pull->flags = 0;
+		if (ch->IsRap) ch->AU_buffer_pull->flags |= GF_DB_AU_RAP;
+	} 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);
@@ -1460,17 +1537,16 @@
 	}
 	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;
-	ch->AU_buffer_pull->flags = 0;
-	if (ch->IsRap) ch->AU_buffer_pull->flags |= GF_DB_AU_RAP;
 
 	if (ch->pull_forced_buffer) {
 		assert(ch->BufferOn);
 		ch->pull_forced_buffer=0;
 		gf_es_buffer_off(ch);
-		Channel_UpdateBuffering(ch, 1);
+		gf_es_update_buffering(ch, 1);
 	} else if (is_new_data && !ch->first_au_fetched) {
-		Channel_UpdateBuffering(ch, 1);
+		gf_es_update_buffering(ch, 1);
 	}
 
 	return ch->AU_buffer_pull;
@@ -1504,6 +1580,10 @@
 
 	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_term_channel_release_sl_packet(ch->service, ch);
 			ch->AU_buffer_pull->data = NULL;
 			ch->AU_buffer_pull->dataLength = 0;
@@ -1539,10 +1619,10 @@
 	if (!ch->AU_buffer_first) ch->AU_buffer_last = NULL;
 
 
-	Channel_UpdateBufferTime(ch);
+	gf_es_update_buffer_time(ch);
 
 	/*if we get under our limit, rebuffer EXCEPT WHEN EOS is signaled*/
-	if (!ch->IsEndOfStream && Channel_NeedsBuffering(ch, 1)) {
+	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);
 	}
@@ -1562,7 +1642,7 @@
 }
 
 /*refresh all ODs when an non-interactive stream is found*/
-static void refresh_non_interactive_clocks(GF_ObjectManager *odm)
+static void gf_es_refresh_non_interactive_clocks(GF_ObjectManager *odm)
 {
 	u32 i, j;
 	GF_Channel *ch;
@@ -1625,11 +1705,11 @@
 	if (gf_term_service_command(ch->service, &com)!=GF_OK) {
 		ch->clock->no_time_ctrl = 1;
 		ch->odm->flags |= GF_ODM_NO_TIME_CTRL;
-		refresh_non_interactive_clocks(ch->odm);
+		gf_es_refresh_non_interactive_clocks(ch->odm);
 	}
 
 	/*signal channel state*/
-	if (ch->es_state == GF_ESM_ES_WAIT_FOR_ACK) 
+	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--;
@@ -1668,7 +1748,7 @@
 	}
 
 	if (ch->esd->decoderConfig->streamType == GF_STREAM_PRIVATE_SCENE &&
-		ch->esd->decoderConfig->objectTypeIndication == GPAC_OTI_PRIVATE_SCENE_EPG) { 
+	        ch->esd->decoderConfig->objectTypeIndication == GPAC_OTI_PRIVATE_SCENE_EPG) {
 		ch->bypass_sl_and_db = 1;
 	}
 	if (ch->clock->no_time_ctrl) {
@@ -1683,11 +1763,17 @@
 	}
 
 	/*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)
+		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);
+		}
 	}
 }
 
@@ -1718,9 +1804,9 @@
 		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;	
+		evt.config_data = &cenc_cfg;
 	} else {
-	/*ISMA and OMA*/
+		/*ISMA and OMA*/
 		if (drm_cfg->contentID) {
 			evt.config_data_code = GF_4CC('o','d','r','m');
 			memset(&cfg, 0, sizeof(cfg));
@@ -1743,7 +1829,7 @@
 			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;		
+			evt.config_data = &isma_cfg;
 		}
 	}
 
@@ -1769,7 +1855,7 @@
 		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_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.5.0.svn5178.tar.bz2/src/terminal/clock.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/clock.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of 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. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -59,7 +59,7 @@
 	return NULL;
 }
 
-GF_Clock *CK_LookForClockDep(GF_Scene *scene, u16 clockID)
+static GF_Clock *gf_ck_look_for_clock_dep(GF_Scene *scene, u16 clockID)
 {
 	u32 i, j;
 	GF_Channel *ch;
@@ -82,7 +82,7 @@
 }
 
 /*remove clocks created due to out-of-order OCR dependencies*/
-void CK_ResolveClockDep(GF_List *clocks, GF_Scene *scene, GF_Clock *ck, u16 Clock_ESID)
+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;
@@ -135,7 +135,7 @@
 	/*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 = CK_LookForClockDep(scene, clockID);
+	if (!tmp && check_dep) tmp = gf_ck_look_for_clock_dep(scene, clockID);
 	if (!tmp) {
 		tmp = NewClock(scene->root_od->term);
 		tmp->clockID = clockID;
@@ -143,7 +143,7 @@
 	} else {
 		if (tmp->clockID == ES_ID) tmp->clockID = clockID;
 		/*this finally solves a->b->c*/
-		if (check_dep && (tmp->clockID != ES_ID)) CK_ResolveClockDep(clocks, scene, tmp, ES_ID);
+		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;
@@ -154,12 +154,14 @@
 	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 
+	//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)
@@ -173,20 +175,12 @@
 	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);
 		if (ck->term->play_state) ck->Paused ++;
 	}
-#if 0
-	/*TODO: test with pure OCR streams*/
-	else if (ck->use_ocr) {
-		/*just update the drift - we could also apply a drift algo*/
-		u32 now = gf_clock_real_time(ck);
-		s32 drift = (s32) TS - (s32) now;
-		ck->drift += drift;
-	}
-#endif
 }
 
 
@@ -208,7 +202,7 @@
 		assert(!ck->Buffering);
 	}
 	ck->Paused -= 1;
-	if (!ck->Paused) 
+	if (!ck->Paused)
 		ck->StartTime += gf_term_get_time(ck->term) - ck->PauseTime;
 	gf_mx_v(ck->mx);
 }
@@ -223,7 +217,12 @@
 #ifdef GPAC_FIXED_POINT
 	time = ck->discontinuity_time + ck->init_time + (time - ck->StartTime) * FIX2INT(100*ck->speed) / 100;
 #else
-	time = ck->discontinuity_time + ck->init_time + (u32) (ck->speed * (time - ck->StartTime) );
+	if ((ck->speed < 0) && ((s32) ck->init_time < (-ck->speed) * (time - ck->StartTime))) {
+		time = 0;
+	}
+	else {
+		time = ck->discontinuity_time + (u32) ( ck->init_time + ck->speed * (time - ck->StartTime) );
+	}
 #endif
 	return time;
 }
@@ -235,10 +234,20 @@
 	return time - ck->drift;
 }
 
-u32 gf_clock_elapse_time(GF_Clock *ck)
+u32 gf_clock_media_time(GF_Clock *ck)
 {
-	if (ck->no_time_ctrl) return gf_clock_time(ck) - ck->init_time;
-	return gf_clock_time(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;
 }
 
 
@@ -302,26 +311,14 @@
 	}
 	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) {
-				//on clock looping we force emptying all buffer
-				//on clock disc we should only reset timing, but this needs further debugging
-				if (!is_pcr_discontinuity && odm->codec && gf_term_lock_codec(odm->codec, GF_TRUE, GF_FALSE)) {
-					gf_es_reset_buffers(ch);
-					ch->IsClockInit = 0;
-					gf_term_lock_codec(odm->codec, GF_FALSE, GF_FALSE);
-					GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] Reinitializing buffers for ES%d\n", ch->esd->ESID));
-				} else {
-//					gf_es_reset_timing(ch);
-//					ch->IsClockInit = 0;
-
-					gf_es_reset_buffers(ch);
-					ch->IsClockInit = 0;
-					gf_term_lock_codec(odm->codec, GF_FALSE, GF_FALSE);
-					
-					GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] Reinitializing timing for ES%d\n", ch->esd->ESID));
-				}
+				ch->IsClockInit = 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);
@@ -329,5 +326,15 @@
 			}
 		}
 	}
-	gf_clock_reset(ck);
+
+	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.5.0.svn5178.tar.bz2/src/terminal/decoder.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/decoder.c Changed

@@ -39,6 +39,24 @@
 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_SHVC:
+		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:
+			break;
+		}
+	}
+
 	GF_SAFEALLOC(tmp, GF_Codec);
 	if (! tmp) {
 		*e = GF_OUT_OF_MEM;
@@ -56,11 +74,12 @@
 	}
 	/*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;
@@ -167,6 +186,8 @@
 			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;
@@ -191,7 +212,7 @@
 				max = 1;
 				no_alloc = 1;
 			}
-			//very low latency 
+			//very low latency
 			else if (ch->MaxBuffer<=300) {
 //				max /= MAX(max/2, 2);
 			}
@@ -209,6 +230,12 @@
 			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) {
@@ -247,7 +274,7 @@
 					break;
 				}
 			}
-		
+
 		}
 	} else if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
 		cap.CapCode = GF_CODEC_OUTPUT_SIZE;
@@ -306,7 +333,7 @@
 
 Bool gf_codec_remove_channel(GF_Codec *codec, struct _es_channel *ch)
 {
-  	s32 i;
+	s32 i;
 	assert( codec );
 	assert( codec->inChannels);
 	assert(ch);
@@ -324,32 +351,44 @@
 }
 
 
-static void codec_update_stats(GF_Codec *codec, u32 dataLength, u64 dec_time, u32 DTS)
+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)
+	if (!codec->nb_dec_frames) {
 		codec->first_frame_time = codec->last_frame_time;
+		codec->min_frame_dur = (u32) -1;
+	}
 
 	codec->nb_dec_frames++;
-	if (dec_time>codec->max_dec_time) codec->max_dec_time = dec_time;
+	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->min_frame_dur + codec->last_unit_dts ) {
+		//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->last_stat_start + 2000 <= DTS) {
-			if (!codec->cur_bit_size) {
-				codec->last_stat_start = DTS;
-			} else {
+		if (!codec->cur_bit_size || (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;
 		}
-		codec->cur_bit_size += 8*dataLength;
-		if (!codec->tot_bit_size) {
-			codec->stat_start = DTS;
-		}
-		codec->tot_bit_size += 8*dataLength;
 	}
 }
 
@@ -357,18 +396,24 @@
 {
 	GF_Channel *ch;
 	GF_DBUnit *AU;
-	u32 count, curCTS, i;
-	count = gf_list_count(codec->inChannels);
+	GF_List *src_channels = codec->inChannels;
+	GF_ObjectManager *current_odm = codec->odm;
+	u32 count, curCTS, i, stream_state;
+	Bool scalable_check = 0;
+	s32 cts_diff;
+
 	*nextAU = NULL;
 	*activeChannel = NULL;
+	curCTS = 0;
+
+browse_scalable:
 
+	count = gf_list_count(src_channels);
 	if (!count) return;
 
-	curCTS = 0;
-	
 	/*browse from base to top layer*/
-	for (i=0;i<count;i++) {
-		ch = (GF_Channel*)gf_list_get(codec->inChannels, i);
+	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...*/
@@ -379,35 +424,62 @@
 			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 {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Warning, No AU in enhancement layer for this AU\n"));
+				}
+			}
 			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 AU CTS %d selected as first layer (DTS %d)\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->CTS, AU->DTS));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU DTS %d (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;
-		} else if (AU->CTS == curCTS) {
+		}
+		//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);
-
-			baseAU->data = gf_realloc(baseAU->data, baseAU->dataLength + AU->dataLength);
-			memcpy(baseAU->data + baseAU->dataLength , AU->data, AU->dataLength);
+			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);
+			}
 			baseAU->dataLength += AU->dataLength;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d AU CTS %d reaggregated on base layer %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->CTS, (*activeChannel)->esd->ESID));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU DTS %d reaggregated on base layer %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, (*activeChannel)->esd->ESID));
 			gf_es_drop_au(ch);
 			ch->first_au_fetched = 1;
+			scalable_check = 2;
+			(*nextAU)->flags |= GF_DB_AU_REAGGREGATED;
 		}
 		//not the same TS for base and enhancement - either temporal scalability is used or we had a frame loss
-		else {		
+		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;
@@ -422,39 +494,59 @@
 				}
 				//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 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, AU->CTS, (*nextAU)->CTS));
+					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;
-					(*activeChannel)->prev_aggregated_dts = (*nextAU)->DTS;
 					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 < (*activeChannel)->prev_aggregated_dts) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d AU CTS %d: loss detected - re-fetch channel\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->CTS));
+				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 %d but base DTS %d: loss detected - 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 AU CTS %d selected as first layer\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->CTS));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU DTS %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->CTS));
 					*nextAU = AU;
 					*activeChannel = ch;
-					(*activeChannel)->prev_aggregated_dts = (*nextAU)->DTS;
 					curCTS = AU->CTS;
 				}
+			} else {
+				if ((*nextAU)->flags & GF_DB_AU_REAGGREGATED) {
+					scalable_check = 2;
+				} else {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("AU in enhancement layer DTS %d - 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) {
+		if (*nextAU) {
+			gf_scene_check_addon_restart(current_odm->upper_layer_odm->parentscene->root_od->addon, (*nextAU)->CTS, (*nextAU)->DTS);
+		}
+		current_odm = current_odm->upper_layer_odm;
+		src_channels = current_odm->channels;
+		scalable_check = 1;
+		goto browse_scalable;
+	}
 
-	if (*nextAU)
-		(*activeChannel)->prev_aggregated_dts = (*nextAU)->DTS;
+	if (scalable_check==1) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Warning, could not find enhancement layer for this AU\n"));
+	}
 
 	if (codec->is_reordering && *nextAU && codec->first_frame_dispatched) {
 		if ((*activeChannel)->esd->slConfig->no_dts_signaling) {
@@ -466,11 +558,11 @@
 				diff = codec->recomputed_cts - CTS;
 			}
 
-			prev_ts_diff = (CTS > codec->last_unit_cts) ? (CTS - codec->last_unit_cts) : (codec->last_unit_cts - CTS);			
+			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)) 
+			if (!codec->min_au_duration || (diff < codec->min_au_duration))
 				codec->min_au_duration = diff;
 		} else {
 			codec->min_au_duration = 0;
@@ -478,6 +570,7 @@
 			(*nextAU)->CTS = (*nextAU)->DTS;
 		}
 	}
+
 }
 
 /*scalable browsing of input channels: find the AU with the lowest DTS on all input channels*/
@@ -494,7 +587,7 @@
 
 	minDTS = 0;
 	/*reverse browsing to make sure we fill enhancement before base layer*/
-	for (i=count;i>0;i--) {
+	for (i=count; i>0; i--) {
 		ch = (GF_Channel*)gf_list_get(codec->inChannels, i-1);
 
 		if ((codec->type==GF_STREAM_OCR) && ch->IsClockInit) {
@@ -621,7 +714,7 @@
 	/*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)) 
+		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=1;
@@ -629,7 +722,7 @@
 
 	/*current media time for system objects is the clock time, since the media is likely to have random
 	updates in time*/
-	codec->odm->current_time = gf_clock_time(codec->ck);
+	codec->odm->media_current_time = obj_time	 - codec->ck->init_time;
 
 	now = gf_sys_clock_high_res();
 	if (codec->odm->term->bench_mode==2) {
@@ -639,9 +732,9 @@
 	}
 	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 %d in "LLU" us\n", sdec->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, codec->odm->current_time, AU->CTS, now));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d at %d decoded AU TS %d 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);
+	codec_update_stats(codec, AU->dataLength, now, AU->DTS, (AU->flags & GF_DB_AU_RAP));
 	codec->prev_au_size = AU->dataLength;
 
 	/*destroy this AU*/
@@ -722,20 +815,22 @@
 		if (!started) return GF_OK;
 	}
 
-	codec->odm->current_time = codec->last_unit_cts = gf_clock_time(codec->ck);
+	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->odm->current_time));
+	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();
+	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->odm->current_time, GF_CODEC_LEVEL_NORMAL);
+		e = sdec->ProcessData(sdec, NULL, 0, ch->esd->ESID, codec->last_unit_cts, GF_CODEC_LEVEL_NORMAL);
 	}
-    now = gf_sys_clock_high_res() - now;
+	now = gf_sys_clock_high_res() - now;
 	codec->last_unit_dts ++;
 	/*resume on error*/
 	if (e && (codec->last_unit_dts<2) ) {
@@ -747,7 +842,7 @@
 		gf_clock_resume(ch->clock);
 	}
 
-	codec_update_stats(codec, 0, now, codec->odm->current_time);
+	codec_update_stats(codec, 0, now, codec->last_unit_cts, 0);
 
 	gf_mx_v(scene_locked->root_od->term->compositor->mx);
 
@@ -773,15 +868,7 @@
 
 static GFINLINE GF_Err UnlockCompositionUnit(GF_Codec *dec, GF_CMUnit *CU, u32 cu_size)
 {
-
-	/*temporal scalability disabling: if we already rendered this, no point getting further*/
-/*
-	if (CU->TS < dec->CB->LastRenderedTS) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[ODM] CU (TS %d) later than last frame drawn (TS %d) - droping\n", CU->TS, dec->CB->LastRenderedTS));
-		cu_size = 0;
-	}
-*/
-	if (dec->is_reordering) {
+	if (dec->is_reordering && !dec->trusted_cts) {
 		/*first dispatch from decoder, store CTS*/
 		if (!dec->first_frame_dispatched) {
 			dec->recomputed_cts = CU->TS;
@@ -818,11 +905,6 @@
 		u32 unit_size, audio_buf_len, unit_count;
 		GF_CodecCapability cap;
 		unit_size = NewSize;
-		/*a bit ugly, make some extra provision for speed >1. this is the drawback of working with pre-allocated memory
-		for composition, we may get into cases where there will never be enough data for high speeds...
-		FIXME - WE WILL NEED TO MOVE TO DYNAMIC CU BLOCKS IN ORDER TO SUPPORT ANY SPEED, BUT WHAT IS THE IMPACT
-		FOR LOW RESOURCES DEVICES ??*/
-//		audio_buf_len = 1000;
 		audio_buf_len = 200;
 
 		cap.CapCode = GF_CODEC_BUFFER_MAX;
@@ -839,6 +921,12 @@
 		dec->CB->Min = unit_count/3;
 		if (!dec->CB->Min) dec->CB->Min = 1;
 	}
+
+	//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);
 	}
@@ -864,14 +952,16 @@
 
 	//cannot output frame, do nothing (we force a channel query before for pull mode)
 	if (codec->CB->Capacity == codec->CB->UnitCount) {
-		if (codec->CB->UnitCount > 1)  return GF_OK;
-		else if (codec->direct_vout)  return GF_OK;
+		if (codec->Status==GF_ESM_CODEC_PAUSE) {
+			gf_term_stop_codec(codec, 1);
+		}
+		if (codec->CB->UnitCount > 1) return GF_OK;
+		else if (codec->direct_vout) return GF_OK;
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] At %d entering process\n", codec->decio->module_name, gf_clock_time(codec->ck)));
-
 	entryTime = gf_sys_clock_high_res();
-	if (!codec->odm->term->bench_mode && (codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES)) 
+
+	if (!codec->odm->term->bench_mode && (codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES))
 		drop_late_frames = 1;
 
 
@@ -889,7 +979,7 @@
 				assert( CU );
 				unit_size = 0;
 				if (codec->odm->term->bench_mode != 2) {
-					e = mdec->ProcessData(mdec, NULL, 0, 0, CU->data, &unit_size, 0, 0);
+					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;
@@ -952,10 +1042,55 @@
 
 	}
 
+
+	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(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) {
-	/*set media processing level*/
+		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;
 		/*SEEK: if the last frame had the same TS, we are seeking. Ask the codec to drop*/
@@ -965,9 +1100,9 @@
 			/*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) || 
+			    (codec->ck->mc && codec->ck->mc->paused) ||
 #endif
-				(codec->odm->term->play_state)
+			    (codec->odm->term->play_state)
 			) {
 				gf_cm_rewind_input(codec->CB);
 				mmlevel = GF_CODEC_LEVEL_NORMAL;
@@ -976,12 +1111,50 @@
 			}
 		}
 		/*only perform drop in normal playback*/
-		else if (codec->CB->Status == CB_PLAY) {
+		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_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d: frame too late (%d vs %d) - using drop level\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, AU->CTS, obj_time));
+				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);
@@ -992,17 +1165,37 @@
 			/*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 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;
+			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;
+					}
 				}
-				first = 0;
 			}
 		}
 
@@ -1018,6 +1211,7 @@
 			return GF_OK;
 		}
 
+
 scalable_retry:
 
 		now = gf_sys_clock_high_res();
@@ -1028,9 +1222,12 @@
 		} 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 %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, AU->CTS));
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d ES%d at %d decoding frame DTS %d CTS %d size %d (%d in channels)\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->DTS, AU->CTS, AU->dataLength, ch->AU_Count));
-			e = mdec->ProcessData(mdec, AU->data, AU->dataLength, ch->esd->ESID, CU->data, &unit_size, AU->PaddingBits, mmlevel);
+			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) {
@@ -1060,9 +1257,9 @@
 				if (drop_late_frames) {
 					unit_size = 0;
 					codec->nb_droped++;
-				} else 
+				} 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 %d in "LLU" us\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->CTS, now));
@@ -1083,7 +1280,7 @@
 				}
 				AU->CTS += deltaTS;
 			}
-			codec_update_stats(codec, 0, now, 0);
+			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
@@ -1098,6 +1295,7 @@
 						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!!*/
@@ -1108,7 +1306,7 @@
 			}
 #endif
 
-			codec_update_stats(codec, AU->dataLength, now, AU->DTS);
+			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;
@@ -1177,24 +1375,38 @@
 			if (drop_late_frames || (mmlevel == GF_CODEC_LEVEL_SEEK) ) {
 				unit_size = 0;
 				if (drop_late_frames) codec->nb_droped++;
-			} else 
+			} else
 				ch->clock->last_TS_rendered = codec->CB->LastRenderedTS;
-		} 
+		} else {
+			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;
+			}
+		}
 
 		UnlockCompositionUnit(codec, CU, unit_size);
 		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 available\n", codec->decio->module_name, 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 >= 10*TimeAvailable) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because running for too long: %d vs %d available\n", codec->decio->module_name, now, TimeAvailable));
+		} 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;
@@ -1206,7 +1418,7 @@
 
 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++) {
@@ -1216,7 +1428,7 @@
 				gf_clock_buffer_off(ch->clock);
 			}
 		}
-		if (codec->CB) 
+		if (codec->CB)
 			gf_cm_abort_buffering(codec->CB);
 	}
 	return GF_OK;
@@ -1236,7 +1448,7 @@
 				gf_clock_buffer_off(ch->clock);
 			}
 		}
-		if (codec->CB) 
+		if (codec->CB)
 			gf_cm_abort_buffering(codec->CB);
 	}
 
@@ -1308,7 +1520,7 @@
 			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);
+			is_flipped = gf_bs_read_u8(bs);
 		} else {
 			sr = gf_bs_read_u32(bs);
 			nb_ch = gf_bs_read_u16(bs);
@@ -1330,9 +1542,9 @@
 		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_FLIP:
+			cap->cap.valueInt = is_flipped;
+			return GF_OK;
 		case GF_CODEC_OUTPUT_SIZE:
 			cap->cap.valueInt = out_size;
 			return GF_OK;
@@ -1373,7 +1585,10 @@
 {
 	if (!codec) return;
 
-	if (Status == GF_ESM_CODEC_PAUSE) codec->Status = GF_ESM_CODEC_STOP;
+	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;
@@ -1381,7 +1596,11 @@
 		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->total_dec_time = codec->max_dec_time = 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_droped = 0;
 		codec->nb_repeted_frames = 0;
@@ -1391,7 +1610,8 @@
 		codec->nb_dispatch_skipped = 0;
 		memset(codec->last_unit_signature, 0, sizeof(codec->last_unit_signature));
 	}
-	else codec->Status = Status;
+	else
+		codec->Status = Status;
 
 	if (!codec->CB) return;
 
@@ -1430,17 +1650,17 @@
 	case GF_STREAM_VISUAL:
 	case GF_STREAM_ND_SUBPIC:
 		ifce_type = GF_MEDIA_DECODER_INTERFACE;
-		codec->process = MediaCodec_Process;		
+		codec->process = MediaCodec_Process;
 		break;
 	case GF_STREAM_PRIVATE_MEDIA:
 		ifce_type = GF_PRIVATE_MEDIA_DECODER_INTERFACE;
-		codec->process = gf_codec_process_private_media;		
+		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: 
+	default:
 		ifce_type = GF_SCENE_DECODER_INTERFACE;
 		codec->process = SystemCodec_Process;
 		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_SCENE_AFX) {
@@ -1534,7 +1754,7 @@
 		ifce = (GF_BaseDecoder *) gf_modules_load_interface(term->user->modules, i, ifce_type);
 		if (!ifce) continue;
 		if (ifce->CanHandleStream) {
-			u32 conf = ifce->CanHandleStream(ifce, esd->decoderConfig->streamType, esd, PL);			
+			u32 conf = ifce->CanHandleStream(ifce, esd->decoderConfig->streamType, esd, PL);
 
 			if ((conf!=GF_CODEC_NOT_SUPPORTED) && (conf>dec_confidence)) {
 				/*switch*/
@@ -1580,7 +1800,7 @@
 	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;
@@ -1595,12 +1815,12 @@
 void gf_codec_del(GF_Codec *codec)
 {
 	if (!codec || !codec->inChannels)
-	  return;
+		return;
 	if (gf_list_count(codec->inChannels)) return;
 
 	if (!(codec->flags & GF_ESM_CODEC_IS_USE)) {
 		switch (codec->type) {
-		/*input sensor streams are handled internally for now*/
+			/*input sensor streams are handled internally for now*/
 #ifndef GPAC_DISABLE_VRML
 		case GF_STREAM_INTERACT:
 			gf_mx_p(codec->odm->term->net_mx);

gpac-0.5.0.svn5178.tar.bz2/src/terminal/input_sensor.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/input_sensor.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -91,7 +91,7 @@
 	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 
+	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;
 
@@ -206,8 +206,8 @@
 	return GF_OK;
 }
 
-static GF_Err IS_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength, 
-								u16 ES_ID, u32 AU_time, u32 mmlevel)
+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;
@@ -226,10 +226,18 @@
 		/*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_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) );
@@ -263,10 +271,10 @@
 				((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);
+					((SFString *)field->far_ptr)->buffer[j] = gf_bs_read_int(bs, 8);
 				}
 			}
-				break;
+			break;
 			}
 		}
 	}
@@ -367,7 +375,7 @@
 {
 	ISPriv *priv;
 	GF_SceneDecoder *tmp;
-	
+
 	tmp = (GF_SceneDecoder*) gf_malloc(sizeof(GF_SceneDecoder));
 	if (!tmp) return NULL;
 	memset(tmp, 0, sizeof(GF_SceneDecoder));
@@ -402,7 +410,7 @@
 	ISPriv *is_dec;
 
 	gf_mo_unregister(node, st->mo);
-	
+
 	odm = st->mo->odm;
 	if (!odm) return;
 
@@ -496,12 +504,12 @@
 	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) || !st->registered) {
 		if (mo!=st->mo) {
 			if (st->mo) IS_Unregister(node, st);
 			st->mo = mo;
 		}
-		if (st->is->enabled) 
+		if (st->is->enabled)
 			IS_Register(node);
 		else
 			return;
@@ -547,9 +555,13 @@
 		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;
+	case GF_EVENT_MOUSEWHEEL:
+		wheel_pos = event->wheel_pos;
+		break;
+	case GF_EVENT_MOUSEMOVE:
+		break;
+	default:
+		return;
 	}
 
 	/*get BIFS coordinates*/
@@ -588,7 +600,7 @@
 	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 
+	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;
 
@@ -633,26 +645,66 @@
 	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_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;
@@ -666,38 +718,40 @@
 		altKeyDown = isKeyUp ? 1 : 2;
 		break;
 
-	default: actionKey = 0; break;
+	default:
+		actionKey = 0;
+		break;
 	}
 	if (actionKey) {
-		if (isKeyUp) 
+		if (isKeyUp)
 			actionKeyReleased = actionKey;
-		else 
+		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 
+		}
+		else
 			key_code = hw_code;
 
 		if (isKeyUp) keyReleased = key_code;
 		else keyPressed = key_code;
 	}
 
-	gf_bs_write_int(bs, keyPressed ? 1 : 0, 1); 
+	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); 
+	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); 
+	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); 
+	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); 
+	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); 
+	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); 
+	gf_bs_write_int(bs, altKeyDown ? 1 : 0 , 1);
 	if (altKeyDown) gf_bs_write_int(bs, altKeyDown, 1);
 
 	gf_bs_align(bs);
@@ -716,7 +770,7 @@
 		}
 	}
 	gf_free(buf);
-	
+
 #ifndef GPAC_DISABLE_X3D
 	i=0;
 	while ((n = (X_KeySensor*)gf_list_enum(term->x3d_sensors, &i))) {
@@ -729,7 +783,8 @@
 
 		if (keyPressed) {
 			if (n->keyPress.buffer) gf_free(n->keyPress.buffer);
-			tc[0] = keyPressed; tc[1] = 0;
+			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));
@@ -739,7 +794,8 @@
 		}
 		if (keyReleased) {
 			if (n->keyRelease.buffer) gf_free(n->keyRelease.buffer);
-			tc[0] = keyReleased; tc[1] = 0;
+			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));
@@ -820,10 +876,10 @@
 			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);
 		}
 	}
@@ -915,8 +971,9 @@
 void gf_term_mouse_input(GF_Terminal *term, GF_EventMouse *event)
 {
 }
-void gf_term_keyboard_input(GF_Terminal *term, u32 key_code, u32 hw_code, Bool isKeyUp)
+Bool gf_term_keyboard_input(GF_Terminal *term, u32 key_code, u32 hw_code, Bool isKeyUp)
 {
+	return GF_TRUE;
 }
 void gf_term_string_input(GF_Terminal *term, u32 character)
 {

gpac-0.5.0.svn5178.tar.bz2/src/terminal/input_sensor.h -> gpac-0.5.1.svn5491.tar.xz/src/terminal/input_sensor.h Changed

gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_control.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/media_control.c Changed

@@ -11,21 +11,22 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  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)
@@ -64,7 +65,7 @@
 	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);
+			gf_scene_restart_dynamic(odm->parentscene, 0, 0);
 		return;
 	}
 
@@ -115,7 +116,7 @@
 	u32 i;
 	if (gf_mo_get_od_id(old_url) != gf_mo_get_od_id(new_url)) return 1;
 	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;
@@ -129,7 +130,7 @@
 
 
 /*resume all objects*/
-void mediacontrol_resume(GF_ObjectManager *odm)
+void mediacontrol_resume(GF_ObjectManager *odm, Bool resume_to_live)
 {
 	u32 i;
 	GF_ObjectManager *ctrl_od;
@@ -153,8 +154,18 @@
 
 	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;
-		gf_odm_resume(ctrl_od);
+		if (!odm->subscene && !gf_odm_shares_clock(ctrl_od, ck))
+			continue;
+
+		if (resume_to_live && ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+			gf_scene_select_main_addon(in_scene, ctrl_od, GF_FALSE);
+		}
+
+		if (ctrl_od->subscene) {
+			mediacontrol_resume(ctrl_od, resume_to_live);
+		} else {
+			gf_odm_resume(ctrl_od);
+		}
 	}
 }
 
@@ -184,8 +195,18 @@
 
 	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;
-		gf_odm_pause(ctrl_od);
+		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_scene_select_main_addon(in_scene, ctrl_od, GF_TRUE);
+		}
+
+		if (ctrl_od->subscene) {
+			mediacontrol_pause(ctrl_od);
+		} else {
+			gf_odm_pause(ctrl_od);
+		}
 	}
 }
 
@@ -208,14 +229,14 @@
 	if (odm->subscene) {
 		assert(odm->subscene->root_od==odm);
 //		assert( gf_odm_shares_clock(odm, ck) );
-		gf_odm_set_speed(odm, speed);
+		gf_odm_set_speed(odm, speed, GF_TRUE);
 		in_scene = odm->subscene;
 	}
 
 	i=0;
 	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
 		if (!gf_odm_shares_clock(ctrl_od, ck)) continue;
-		gf_odm_set_speed(ctrl_od, speed);
+		gf_odm_set_speed(ctrl_od, speed, GF_TRUE);
 	}
 }
 
@@ -236,7 +257,7 @@
 		prev_seg = desc;
 		last_seg = NULL;
 		duration = desc->Duration;
-		i=1+ctrl->current_seg; 
+		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;
@@ -268,6 +289,7 @@
 	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) {
@@ -288,20 +310,22 @@
 		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) 
+			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);
@@ -318,22 +342,30 @@
 				/*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;
-				shall_restart = need_restart = 1;
+				//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) {
-				mediacontrol_resume((GF_ObjectManager *) prev->odm);
+				mediacontrol_resume((GF_ObjectManager *) prev->odm, 0);
 				stack->paused = 0;
 			}
 			/*MediaControl has been detached*/
 			else {
-				if (prev) 
+				if (prev)
 					gf_odm_remove_mediacontrol(prev->odm, stack);
 				return;
 			}
@@ -343,6 +375,7 @@
 		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);
@@ -374,7 +407,7 @@
 		stack->enabled = 1;
 		need_restart = gf_odm_switch_mediacontrol(stack->stream->odm, stack);
 	}
-	
+
 	stack->changed = 0;
 
 	if (!stack->control->mediaSpeed) shall_restart = 0;
@@ -393,7 +426,7 @@
 		stack->paused = 0;
 		/*the object has already been started, and media start time is not 0, restart*/
 		if (stack->stream->num_open) {
-			if ( (stack->media_start > 0) || (gf_list_count(stack->seg)>0 ) ) {
+			if ( (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);
@@ -411,7 +444,7 @@
 		}
 		/*else resume if paused*/
 		else if (stack->control->mediaSpeed && stack->paused) {
-			mediacontrol_resume(odm);
+			mediacontrol_resume(odm, 0);
 			stack->paused = 0;
 			need_restart += shall_restart;
 		}
@@ -468,16 +501,20 @@
 	if (!stack) return;
 	if (stack->changed!=2) {
 		/*check URL*/
-		if (MC_URLChanged(&stack->url, &stack->control->url)) 
+		if (MC_URLChanged(&stack->url, &stack->control->url))
 			stack->changed = 2;
 		/*check speed (play/pause)*/
-		else if (stack->media_speed != stack->control->mediaSpeed) 
+		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;
 	}
@@ -502,7 +539,7 @@
 			/*deactivate current control*/
 			if (ctrl && odm->subscene->dyn_ck->mc) {
 				odm->subscene->dyn_ck->mc->control->enabled = 0;
-				gf_node_event_out_str((GF_Node *)odm->subscene->dyn_ck->mc->control, "enabled");
+				gf_node_event_out((GF_Node *)odm->subscene->dyn_ck->mc->control, 7/*"enabled"*/);
 			}
 			odm->subscene->dyn_ck->mc = ctrl;
 		}
@@ -514,7 +551,7 @@
 				/*deactivate current control*/
 				if (ctrl && ch->clock->mc) {
 					ch->clock->mc->control->enabled = 0;
-					gf_node_event_out_str((GF_Node *)ch->clock->mc->control, "enabled");
+					gf_node_event_out((GF_Node *)ch->clock->mc->control, 7/*"enabled"*/);
 				}
 				/*and attach this control to the clock*/
 				ch->clock->mc = ctrl;
@@ -542,8 +579,8 @@
 	/*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);
+		if (ctrl->paused)
+			mediacontrol_resume(odm, 0);
 		gf_odm_set_mediacontrol(odm, NULL);
 	}
 }
@@ -560,7 +597,7 @@
 		if (st2 == ctrl) continue;
 		if (st2->control->enabled) {
 			st2->control->enabled = 0;
-			gf_node_event_out_str((GF_Node *) st2->control, "enabled");
+			gf_node_event_out((GF_Node *) st2->control, 7/*"enabled"*/);
 		}
 		st2->enabled = 0;
 	}
@@ -603,14 +640,14 @@
 	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->current_time)
-			/*then next segment was taken into account when requesting play*/
-			) {
+		    /*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 ++;
 		}

gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_control.h -> gpac-0.5.1.svn5491.tar.xz/src/terminal/media_control.h Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -36,7 +36,7 @@
 /*restart object and takes care of media control/clock dependencies*/
 void mediacontrol_restart(GF_ObjectManager *odm);
 void mediacontrol_pause(GF_ObjectManager *odm);
-void mediacontrol_resume(GF_ObjectManager *odm);
+void mediacontrol_resume(GF_ObjectManager *odm, Bool resume_to_live);
 
 Bool MC_URLChanged(MFURL *old_url, MFURL *new_url);
 
@@ -54,7 +54,7 @@
 	Fixed media_speed;
 	Bool enabled;
 	MFURL url;
-	
+
 	GF_Scene *parent;
 	/*stream owner*/
 	GF_MediaObject *stream;

gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_manager.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/media_manager.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -60,16 +60,17 @@
 
 	term->frame_duration = 33;
 	switch (threading_mode) {
-	case GF_TERM_THREAD_SINGLE: term->flags |= GF_TERM_SINGLE_THREAD;
+	case GF_TERM_THREAD_SINGLE:
+		term->flags |= GF_TERM_SINGLE_THREAD;
 		break;
-	case GF_TERM_THREAD_MULTI: 
+	case GF_TERM_THREAD_MULTI:
 		term->flags |= GF_TERM_MULTI_THREAD;
 		break;
 	default:
 		break;
 	}
 
-	if (term->user->init_flags & GF_TERM_NO_DECODER_THREAD) 
+	if (term->user->init_flags & GF_TERM_NO_DECODER_THREAD)
 		return GF_OK;
 
 	term->mm_thread = gf_th_new("MediaManager");
@@ -85,7 +86,7 @@
 		u32 count, i;
 
 		term->flags &= ~GF_TERM_RUNNING;
-		while (!(term->flags & GF_TERM_DEAD) ) 
+		while (!(term->flags & GF_TERM_DEAD) )
 			gf_sleep(2);
 
 		count = gf_list_count(term->codecs);
@@ -120,7 +121,6 @@
 void gf_term_add_codec(GF_Terminal *term, GF_Codec *codec)
 {
 	u32 i, count;
-	Bool locked;
 	Bool threaded;
 	CodecEntry *cd;
 	CodecEntry *ptr, *next;
@@ -131,16 +131,16 @@
 
 	/*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*/
-	locked = gf_mx_try_lock(term->mm_mx);
+	gf_mx_p(term->mm_mx);
 
 	cd = mm_get_codec(term->codecs, codec);
 	if (cd) goto exit;
 
 	GF_SAFEALLOC(cd, CodecEntry);
 	cd->dec = codec;
-	if (!cd->dec->Priority) 
+	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) {
@@ -151,7 +151,7 @@
 		gf_codec_get_capability(codec, &cap);
 		threaded = cap.cap.valueInt;
 	}
-	
+
 	if (threaded) cd->flags |= GF_MM_CE_REQ_THREAD;
 
 
@@ -160,9 +160,9 @@
 	} else if (term->flags & GF_TERM_SINGLE_THREAD) {
 		threaded = 0;
 	}
-	if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) 
+	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);
@@ -220,7 +220,7 @@
 	gf_list_add(term->codecs, cd);
 
 exit:
-	if (locked) gf_mx_v(term->mm_mx);
+	gf_mx_v(term->mm_mx);
 	return;
 }
 
@@ -276,7 +276,7 @@
 	GF_Err e;
 	u32 count, remain;
 	u32 time_taken, time_slice, time_left;
-	
+
 #ifndef GF_DISABLE_LOG
 	term->compositor->networks_time = gf_sys_clock();
 #endif
@@ -368,7 +368,7 @@
 		u32 left = 0;
 		if (do_codec) left = MM_SimulationStep_Decoder(term, &nb_decs);
 		else left = term->frame_duration;
-		
+
 		if (do_scene) {
 			u32 ms_until_next=0;
 			u32 time_taken = gf_sys_clock();
@@ -376,7 +376,7 @@
 			time_taken = gf_sys_clock() - time_taken;
 			if (ms_until_next<term->frame_duration/2) {
 				left = 0;
-			} else if (left>time_taken) 
+			} else if (left>time_taken)
 				left -= time_taken;
 			else
 				left = 0;
@@ -386,7 +386,7 @@
 				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 
+					//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);
 				}
@@ -416,9 +416,9 @@
 		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 
+		/*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)) 
+		if (!ce->dec->CB || (ce->dec->CB->UnitCount == ce->dec->CB->Capacity))
 			ce->dec->PriorityBoost = 0;
 
 		/*while on don't sleep*/
@@ -433,7 +433,7 @@
 }
 
 /*NOTE: when starting/stoping 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 
+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)
 {
@@ -448,7 +448,7 @@
 	if (ce->mx) gf_mx_p(ce->mx);
 
 	/*clean decoder memory and wait for RAP*/
-	if (codec->CB) gf_cm_reset(codec->CB);
+	if (!is_resume && codec->CB) gf_cm_reset(codec->CB);
 
 	if (!is_resume) {
 		cap.CapCode = GF_CODEC_WAIT_RAP;
@@ -490,7 +490,7 @@
 
 	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 
+		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
 	*/
@@ -505,7 +505,7 @@
 		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;
@@ -519,9 +519,10 @@
 	/*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) 
+		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*/
@@ -535,12 +536,12 @@
 	CodecEntry *ce;
 
 	switch (mode) {
-	case GF_TERM_THREAD_SINGLE: 
+	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: 
+	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;
@@ -660,7 +661,7 @@
 
 	if (term->flags & GF_TERM_NO_DECODER_THREAD) {
 		MM_SimulationStep_Decoder(term, &nb_decs);
-	} 
+	}
 
 	if (term->flags & GF_TERM_NO_COMPOSITOR_THREAD) {
 		u32 ms_until_next;
@@ -693,7 +694,7 @@
 
 	/*update till frame mature*/
 	while (1) {
-		
+
 		if (term->flags & GF_TERM_NO_DECODER_THREAD) {
 			gf_term_handle_services(term);
 			gf_mx_p(term->mm_mx);

gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_memory.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/media_memory.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -27,6 +27,7 @@
 
 #include <gpac/internal/terminal_dev.h>
 #include <gpac/constants.h>
+#include <gpac/network.h>
 #include "media_memory.h"
 #include "media_control.h"
 
@@ -88,7 +89,7 @@
 static void gf_cm_unit_del(GF_CMUnit *cb, Bool no_data_allocation)
 {
 	if (!cb)
-	  return;
+		return;
 	if (cb->next) gf_cm_unit_del(cb->next, no_data_allocation);
 	cb->next = NULL;
 	if (cb->data) {
@@ -106,7 +107,7 @@
 	GF_CMUnit *cu, *prev;
 	u32 i;
 	if (!capacity) return NULL;
-	
+
 	GF_SAFEALLOC(tmp, GF_CompositionMemory)
 
 	tmp->Capacity = capacity;
@@ -137,7 +138,7 @@
 	cu->next = tmp->input;
 	tmp->input->prev = cu;
 
-	/*close the loop. The output is the input as the first item 
+	/*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;
 
@@ -153,11 +154,11 @@
 		gf_clock_buffer_off(cb->odm->codec->ck);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB destroy - ODM%d: buffering off at %d (nb buffering on clock: %d)\n", cb->odm->OD->objectDescriptorID, 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;
+	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);
@@ -168,7 +169,7 @@
 	if (cb->UnitCount) {
 		cb->UnitCount--;
 		cb->input = cb->input->prev;
-		cb->input->dataLength = 0; 
+		cb->input->dataLength = 0;
 	}
 }
 
@@ -181,7 +182,7 @@
 #endif
 		/*there is still something in the input buffer*/
 		if (cb->input->dataLength) {
-			if (cb->input->TS==TS) 
+			if (cb->input->TS==TS)
 				return cb->input;
 			return NULL;
 		}
@@ -194,7 +195,7 @@
 	/*spatial scalable, go backward to fetch same TS*/
 	cu = cb->input;
 	while (1) {
-		if (cu->TS == TS) 
+		if (cu->TS == TS)
 			return cu;
 		cu = cu->prev;
 		if (cu == cb->input) break;
@@ -223,7 +224,7 @@
 		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;
+		       cu = cu->next;
 	}
 }
 #endif
@@ -270,9 +271,9 @@
 			}
 			/*previous unit is the active one - check one further*/
 			if (cu->prev == unit) {
-				if (!unit->prev->dataLength || (unit->prev->TS < unit->TS)) 
+				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;
@@ -283,10 +284,10 @@
 		/*go on*/
 		cu = cu->prev;
 		/*done (should never happen)*/
-		if (cu == cb->input) 
+		if (cu == cb->input)
 			goto exit;
 	}
-	
+
 	/*remove unit from the list*/
 	unit->prev->next = unit->next;
 	unit->next->prev = unit->prev;
@@ -297,7 +298,7 @@
 	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*/
@@ -355,13 +356,13 @@
 		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 
+		/*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) && (cb->odm->codec->type == GF_STREAM_AUDIO)) {
 			/*done with buffering, signal to the clock (ONLY ONCE !)*/
 			cb->Status = CB_BUFFER_DONE;
 			cb_set_buffer_off(cb);
-		} 
+		}
 
 		//new FPS regulation doesn't need this signaling
 #if 0
@@ -375,7 +376,7 @@
 }
 
 
-/*Reset composition memory. Note we don't reset the content of each frame since it would lead to green frames 
+/*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)
 {
@@ -388,7 +389,7 @@
 		cu->dataLength = 0;
 		gf_sema_notify(cb->odm->raw_frame_sema, 1);
 	}
-	
+
 	cu->dataLength = 0;
 	cu->TS = 0;
 	cu = cu->next;
@@ -454,8 +455,8 @@
 		}
 		cu->dataLength = 0;
 		cu = cu->next;
-	}	
-	
+	}
+
 	cb->UnitCount = 0;
 	cb->output = cb->input;
 	gf_odm_lock(cb->odm, 0);
@@ -471,11 +472,11 @@
 	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;
+	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;
@@ -531,7 +532,7 @@
 			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));
 
 			cb->Status = CB_STOP;
-			cb->odm->current_time = (u32) cb->odm->media_stop_time;
+			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);
@@ -543,13 +544,17 @@
 
 	/*update the timing*/
 	if ((cb->Status != CB_STOP) && cb->odm && cb->odm->codec) {
-		cb->odm->current_time = cb->output->TS;
+		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->output->next->dataLength || (cb->Capacity==1))) {
-			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));
+			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));
 			cb->Status = CB_STOP;
-			cb->odm->current_time = (u32) cb->odm->media_stop_time;
+			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);
@@ -557,6 +562,11 @@
 			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;
 }
 
@@ -583,7 +593,7 @@
 		return;
 	}
 
-	/*WARNING: in RAW mode, we (for the moment) only have one unit - setting output->dataLength to 0 means the input is available 
+	/*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*/
@@ -605,7 +615,7 @@
 			}
 		}
 	}
-	
+
 	/*reset the output*/
 	cb->output->dataLength = 0;
 	cb->output->TS = 0;
@@ -623,7 +633,7 @@
 
 void gf_cm_set_status(GF_CompositionMemory *cb, u32 Status)
 {
-	if (cb->Status == Status) 
+	if (cb->Status == Status)
 		return;
 
 	gf_odm_lock(cb->odm, 1);
@@ -633,6 +643,7 @@
 		case CB_STOP:
 			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 %d (nb buffering on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
 			break;
 		case CB_PAUSE:
 			cb->Status = CB_PLAY;
@@ -658,6 +669,7 @@
 		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 %d (nb buffering on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
 		}
 	}
 
@@ -668,8 +680,8 @@
 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 
+	/*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;
@@ -699,8 +711,8 @@
 	}
 
 	if ((cb->odm->codec->type == GF_STREAM_VISUAL)
-		&& (cb->Status == CB_STOP)
-		&& cb->output->dataLength) return 1;
+	        && (cb->Status == CB_STOP)
+	        && cb->output->dataLength) return 1;
 
 	return 0;
 }
@@ -708,8 +720,8 @@
 
 Bool gf_cm_is_eos(GF_CompositionMemory *cb)
 {
-	if (cb->HasSeenEOS)
-		return ( (cb->Status == CB_STOP) || (cb->UnitCount==0)) ? 1 : 0;
+	if ( (cb->Status == CB_STOP) || (cb->HasSeenEOS && (cb->UnitCount==0)) )
+		return 1;
 	return 0;
 }

gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_memory.h -> gpac-0.5.1.svn5491.tar.xz/src/terminal/media_memory.h Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -37,15 +37,17 @@
 {
 	/*AU is RAP*/
 	GF_DB_AU_RAP = 1,
-	/*special flag for systems streams: we may receive a CTS in a carousel, to indicate the 
+	/*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
+	GF_DB_AU_NO_TIMESTAMPS = 1<<2,
+	/*for debuging AU reassembly in scalable coding*/
+	GF_DB_AU_REAGGREGATED = 1<<3
 };
 
 /*compressed media unit*/
-typedef struct _decoding_buffer 
+typedef struct _decoding_buffer
 {
 	struct _decoding_buffer *next;
 
@@ -57,6 +59,7 @@
 	u8 flags;
 	/*amount of padding bits*/
 	u8 PaddingBits;
+	u64 sender_ntp;
 
 	u32 dataLength;
 	char *data;
@@ -93,14 +96,16 @@
 
 	u32 dataLength;
 	char* data;
+
+	u64 sender_ntp;
 } 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 
+	/*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*/
@@ -128,6 +133,9 @@
 	u32 LastRenderedTS;
 
 	u8 *pY, *pU, *pV;
+
+	u64 LastRenderedNTP;
+	s32 LastRenderedNTPDiff;
 };
 
 /*a composition buffer only has fixed-size unit*/
@@ -136,7 +144,7 @@
 /*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 
+/*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

gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_object.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/media_object.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -59,13 +59,13 @@
 
 			switch (ref->sgprivate->tag) {
 			case TAG_SVG_audio:
-				o_type = GF_MEDIA_OBJECT_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; 
+				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);
 				}
@@ -109,74 +109,76 @@
 	switch (gf_node_get_tag(node)) {
 #ifndef GPAC_DISABLE_VRML
 	/*MPEG-4 / VRML / X3D only*/
-	case TAG_MPEG4_AudioClip: 
-	case TAG_MPEG4_AudioSource: 
+	case TAG_MPEG4_AudioClip:
+	case TAG_MPEG4_AudioSource:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_AudioClip: 
+	case TAG_X3D_AudioClip:
 #endif
-		obj_type = GF_MEDIA_OBJECT_AUDIO; 
+		obj_type = GF_MEDIA_OBJECT_AUDIO;
 		break;
-	case TAG_MPEG4_SBVCAnimation: 
-	case TAG_MPEG4_AnimationStream: 
-		obj_type = GF_MEDIA_OBJECT_UPDATES; 
+	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; 
+	case TAG_MPEG4_InputSensor:
+		obj_type = GF_MEDIA_OBJECT_INTERACT;
 		break;
-	case TAG_MPEG4_Background2D: 
-	case TAG_MPEG4_Background: 
+	case TAG_MPEG4_Background2D:
+	case TAG_MPEG4_Background:
 	case TAG_MPEG4_ImageTexture:
 	case TAG_MPEG4_CacheTexture:
-	case TAG_MPEG4_MovieTexture: 
+	case TAG_MPEG4_MovieTexture:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Background: 
+	case TAG_X3D_Background:
 	case TAG_X3D_ImageTexture:
 	case TAG_X3D_MovieTexture:
 #endif
-		obj_type = GF_MEDIA_OBJECT_VIDEO; 
+		obj_type = GF_MEDIA_OBJECT_VIDEO;
 		break;
-	case TAG_MPEG4_Inline: 
+	case TAG_MPEG4_Inline:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline: 
+	case TAG_X3D_Inline:
 #endif
-		obj_type = GF_MEDIA_OBJECT_SCENE; 
+		obj_type = GF_MEDIA_OBJECT_SCENE;
 		break;
 #endif /*GPAC_DISABLE_VRML*/
 
-	/*SVG*/
+		/*SVG*/
 #ifndef GPAC_DISABLE_SVG
-	case TAG_SVG_audio: 
-		obj_type = GF_MEDIA_OBJECT_AUDIO; 
+	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; 
+	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; 
+	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; 
+	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; 
+	case TAG_LSR_updates:
+		obj_type = GF_MEDIA_OBJECT_UPDATES;
 		break;
 #endif
 
-	default: obj_type = GF_MEDIA_OBJECT_UNDEF; break;
+	default:
+		obj_type = GF_MEDIA_OBJECT_UNDEF;
+		break;
 	}
 
 	/*move to primary resource handler*/
@@ -225,13 +227,13 @@
 		*height = cap.cap.valueInt;
 	}
 	if (mo->type==GF_MEDIA_OBJECT_TEXT) return GF_TRUE;
-    
-    if (is_flipped) {
-        cap.CapCode = GF_CODEC_FLIP;
-        cap.cap.valueInt = 0;
+
+	if (is_flipped) {
+		cap.CapCode = GF_CODEC_FLIP;
+		cap.cap.valueInt = 0;
 		gf_codec_get_capability(mo->odm->codec, &cap);
 		*is_flipped = cap.cap.valueInt ? GF_TRUE : GF_FALSE;
-    }
+	}
 
 	if (stride) {
 		cap.CapCode = GF_CODEC_STRIDE;
@@ -244,6 +246,7 @@
 		*pixelFormat = 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_VIDEO")) {
 				const char *opt;
@@ -271,6 +274,7 @@
 					gf_node_dirty_set((GF_Node *)back, 0, GF_TRUE);
 				}
 			}
+#endif
 		}
 	}
 	/*get PAR settings*/
@@ -376,7 +380,7 @@
 	if (ms_until_pres) *ms_until_pres = mo->ms_until_pres;
 	if (ms_until_next) *ms_until_next = mo->ms_until_next;
 
-	if (!gf_odm_lock_mo(mo)) 
+	if (!gf_odm_lock_mo(mo))
 		return NULL;
 
 	if (!mo->odm->codec || !mo->odm->codec->CB) {
@@ -418,7 +422,6 @@
 	/*fast forward, bench mode with composition memory: force 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 = GF_TRUE;
-	
 
 	if (force_decode) {
 		u32 retry=100;
@@ -466,19 +469,25 @@
 	/*resync*/
 	obj_time = gf_clock_time(codec->ck);
 
-	//no drop mode: all frames are presented, we discard the current output only if already presented and next frame time is mature
-	if (!(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) && (mo->type==GF_MEDIA_OBJECT_VIDEO)) {
+	//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==1) && !(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) && (mo->type==GF_MEDIA_OBJECT_VIDEO)) {
 		resync=GF_FALSE;
-		if (gf_clock_is_started(mo->odm->codec->ck) && (mo->timestamp==CU->TS) && CU->next->dataLength && (CU->next->TS <= obj_time) ) {
+		if (/*gf_clock_is_started(mo->odm->codec->ck) && */ (mo->timestamp==CU->TS) && CU->next->dataLength && (CU->next->TS <= obj_time) ) {
 			gf_cm_drop_output(codec->CB);
 			CU = gf_cm_get_output(codec->CB);
+			if (!CU) {
+				gf_odm_lock(mo->odm, 0);
+				return NULL;
+			}
 		}
 	}
 
 	if (resync) {
 		u32 nb_droped = 0;
-		while (CU->TS < obj_time) {
-			u32 diff;
+		while (1) {
+			if (CU->TS*codec->ck->speed >= obj_time*codec->ck->speed)
+				break;
+
 			if (!CU->next->dataLength) {
 				if (force_decode) {
 					obj_time = gf_clock_time(codec->ck);
@@ -488,22 +497,19 @@
 						gf_term_lock_codec(codec, GF_FALSE, GF_TRUE);
 					}
 					gf_odm_lock(mo->odm, 1);
-					if (!CU->next->dataLength) 
+					if (!CU->next->dataLength)
 						break;
 				} else {
 					break;
 				}
 			}
-			diff = CU->next->TS;
-			diff -= CU->TS;
-			if (CU->TS + codec->CB->Capacity*diff > obj_time) {
-				break;
-			}
+
 			/*figure out closest time*/
-			if (CU->next->TS > obj_time) {
+			if (codec->ck->speed*CU->next->TS > codec->ck->speed*obj_time) {
 				*eos = GF_FALSE;
 				break;
 			}
+
 			nb_droped ++;
 			if (nb_droped>1) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] At OTB %u dropped frame TS %u\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS));
@@ -517,7 +523,7 @@
 			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;
@@ -528,22 +534,29 @@
 	} else  {
 		mo->ms_until_next = 1;
 	}
-	diff = (s32) (CU->TS) - (s32) obj_time;
+	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
-		mediasensor_update_timing(mo->odm, codec->CB->HasSeenEOS);
+		if (! gf_cm_is_eos(codec->CB))
+			mediasensor_update_timing(mo->odm, 0);
 #endif
-	
-		if (mo->odm->parentscene->is_dynamic_scene)
-			mo->odm->parentscene->root_od->current_time = mo->odm->current_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;
+			}
+			s->root_od->media_current_time = mo->odm->media_current_time;
+		}
 
 		mo->timestamp = CU->TS;
 		/*signal EOS after rendering last frame, not while rendering it*/
 		*eos = GF_FALSE;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u fetch frame TS %u size %d (previous TS %d) - %d unit in CB - UTC "LLU" ms - %d ms until CTS is due - %d ms until next frame\n", mo->odm->OD->objectDescriptorID, 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 ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d (%s)] At OTB %u fetch frame TS %u size %d (previous TS %d) - %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 ));
 	}
 
 	/*also adjust CU time based on consummed bytes in input, since some codecs output very large audio chunks*/
@@ -553,7 +566,7 @@
 //		mo->timestamp = gf_clock_time(codec->ck);
 		mo->ms_until_pres = -1;
 		mo->ms_until_next = 1;
-	} 
+	}
 
 
 	mo->nb_fetch ++;
@@ -562,7 +575,7 @@
 	if (ms_until_pres) *ms_until_pres = mo->ms_until_pres;
 	if (ms_until_next) *ms_until_next = mo->ms_until_next;
 	gf_term_service_media_event(mo->odm, GF_EVENT_MEDIA_TIME_UPDATE);
-			
+
 	gf_odm_lock(mo->odm, 0);
 	if (codec->direct_vout) return (char *) codec->CB->pY;
 	return mo->frame;
@@ -596,15 +609,15 @@
 		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 ((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)
 		drop_mode = 1;
-	
 
-	/*perform a sanity check on TS since the CB may have changed status - this may happen in 
+
+	/*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) {
@@ -648,7 +661,7 @@
 	/*regular media codec...*/
 	if (mo->odm->codec) {
 		/*get absolute clock (without drift) for audio*/
-		if (mo->odm->codec->type==GF_STREAM_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);
@@ -656,7 +669,7 @@
 	/*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;
@@ -698,7 +711,7 @@
 			}
 			if (clipEnd>=clipBegin) {
 				mo->odm->media_stop_time = (u64) (clipEnd*1000);
-				if (mo->odm->duration && (mo->odm->media_stop_time > mo->odm->duration)) {
+				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 {
@@ -711,9 +724,6 @@
 		if (is_restart) {
 			mediacontrol_restart(mo->odm);
 		} else {
-			/*FIXME - this breaks inital loading on JPEG and PNG files ...*/
-//			if (mo->odm->subscene && mo->odm->subscene->is_dynamic_scene) mo->odm->flags |= GF_ODM_REGENERATE_SCENE;
-
 			gf_odm_start(mo->odm, (res>=0) ? 1 : 0);
 		}
 	} else if (mo->odm) {
@@ -742,13 +752,13 @@
 		if (gf_list_find(mo->odm->term->media_queue, mo->odm)<0) {
 			gf_list_add(mo->odm->term->media_queue, mo->odm);
 		}
-		
+
 		/*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 
+		else
 			mo->odm->action_type = GF_ODM_ACTION_STOP;
 
 		gf_term_lock_media_queue(mo->odm->term, GF_FALSE);
@@ -789,7 +799,7 @@
 	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*/
@@ -878,20 +888,23 @@
 					/*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);
 		}
 	}
 
@@ -950,7 +963,7 @@
 {
 #ifndef GPAC_DISABLE_VRML
 	if (!mo || !mo->num_open || !mo->odm) return;
-	mediacontrol_resume(mo->odm);
+	mediacontrol_resume(mo->odm, 0);
 #endif
 }
 
@@ -966,6 +979,11 @@
 		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);
@@ -973,7 +991,7 @@
 #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_odm_set_speed(mo->odm, speed, GF_TRUE);
 }
 
 GF_EXPORT
@@ -982,6 +1000,12 @@
 	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)
@@ -1011,7 +1035,7 @@
 	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);
@@ -1023,10 +1047,10 @@
 	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);
-*/
+		/*
+			if (ctrl && ctrl->stream->odm && ctrl->stream->odm->subscene)
+					gf_term_invalidate_compositor(mo->odm->term);
+		*/
 #endif
 	}
 	gf_odm_lock(mo->odm, 0);
@@ -1052,8 +1076,9 @@
 #endif
 
 	if (!gf_odm_lock_mo(mo)) return GF_FALSE;
-	
-	if (!mo->odm->state) {
+
+
+	if (!mo->odm->state || (mo->odm->parentscene && mo->odm->parentscene->is_dynamic_scene)) {
 		gf_odm_lock(mo->odm, 0);
 		return GF_FALSE;
 	}
@@ -1066,8 +1091,8 @@
 	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 
+	/*otherwise allow*/
+	else
 #endif
 		res = GF_TRUE;
 
@@ -1138,7 +1163,7 @@
 void gf_mo_set_flag(GF_MediaObject *mo, u32 flag, Bool set_on)
 {
 	if (mo) {
-		if (set_on) 
+		if (set_on)
 			mo->flags |= flag;
 		else
 			mo->flags &= ~flag;
@@ -1202,7 +1227,7 @@
 			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;
 	}
@@ -1226,8 +1251,8 @@
 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;
+	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;
@@ -1238,89 +1263,89 @@
 
 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;
+	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;
+	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;
+	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;
+	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;
+	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--;
+	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;
+		}
+	}
+	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;
+	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;
+	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);
+	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);
+	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);
+	gf_list_del(mo->evt_targets);
+	gf_free(mo);
 }

gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_sensor.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/media_sensor.c Changed

@@ -11,39 +11,44 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  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) 
+		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;
@@ -53,7 +58,7 @@
 		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.*/
@@ -67,6 +72,7 @@
 		else ck = st->stream->odm->subscene->dyn_ck;
 		/*since audio may be used alone through an inline scene, we need to refresh the graph*/
 		if (ck && !ck->has_seen_eos && st->stream->odm->state) gf_term_invalidate_compositor(st->stream->odm->term);
+		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;
@@ -74,7 +80,8 @@
 	else if (st->stream->odm->ocr_codec) ck = st->stream->odm->ocr_codec->ck;
 
 	if (ck && gf_clock_is_started(ck) ) {
-		st->stream->odm->current_time = gf_clock_time(ck);
+		if (do_update_clock)
+			st->stream->odm->media_current_time = gf_clock_media_time(ck);
 		mediasensor_update_timing(st->stream->odm, 0);
 	}
 }
@@ -97,12 +104,12 @@
 {
 	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) 
+		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);
@@ -117,7 +124,7 @@
 }
 
 
-static void media_sensor_activate(MediaSensorStack *media_sens, GF_Segment *desc)
+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"*/);
@@ -141,8 +148,8 @@
 	Double time;
 	ms_count = gf_list_count(odm->ms_stack);
 	if (!ms_count) return;
-	
-	time = odm->current_time / 1000.0;
+
+	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;
@@ -151,7 +158,7 @@
 		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)*/
@@ -232,7 +239,7 @@
 			}
 
 			if (!media_sens->sensor->isActive) {
-				media_sensor_activate(media_sens, desc);
+				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));
 			}

gpac-0.5.0.svn5178.tar.bz2/src/terminal/mpeg4_inline.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/mpeg4_inline.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -68,8 +68,10 @@
 	}
 	/*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);
+
 	/*play*/
 	gf_mo_play(mo, 0, -1, GF_FALSE);
+
 	return GF_TRUE;
 }
 
@@ -124,9 +126,9 @@
 						}
 					} else {
 						gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
-						
-						/*external media are completely unloaded*/
-						if (scene->root_od->OD->objectDescriptorID==GF_MEDIA_EXTERNAL_ID) {
+
+						/*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;
@@ -139,8 +141,8 @@
 				}
 			}
 		}
-	} 
-	/*force a redraw and load scene at next pass - we cannot load the scene now because 
+	}
+	/*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
@@ -179,7 +181,8 @@
 			}
 			else {
 				Double s, e;
-				s = now; s/=1000;
+				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);
@@ -205,16 +208,21 @@
 	if (scene->root_od->media_ctrl) current_seg = scene->root_od->media_ctrl->current_seg;
 
 	if (scene->is_dynamic_scene) {
-		u32 from = 0;
+		s64 from = 0;
 		if (scene->root_od->media_ctrl) {
-			scene->root_od->media_ctrl->current_seg = current_seg;
-			from = (u32) (scene->root_od->media_ctrl->media_start * 1000);
+			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);
+		gf_scene_restart_dynamic(scene, from, 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 
+		/*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*/
@@ -247,7 +255,7 @@
 			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 
+				/*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
@@ -255,7 +263,10 @@
 					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) mo->odm->mo = NULL;
+						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;
@@ -323,8 +334,8 @@
 
 		gf_node_dirty_set(n, 0, GF_TRUE);
 		return;
-	} 
-	
+	}
+
 }
 
 
@@ -335,7 +346,7 @@
 		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)) 
+		if (gf_sc_uri_is_hardcoded_proto(term->compositor, url->vals[i].url))
 			return GF_TRUE;
 	}
 	return GF_FALSE;
@@ -397,7 +408,7 @@
 
 	/*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;
@@ -439,10 +450,10 @@
 
 	/*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) 
+		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, '#');
@@ -693,7 +704,7 @@
 	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) { 
+		while (scene->root_od->parentscene) {
 			if (scene->root_od->parentscene->root_od->net_service != net_service)
 				break;
 			scene = scene->root_od->parentscene;
@@ -725,7 +736,7 @@
 	gf_node_set_private(node, scene);
 
 	net_service = scene->root_od->net_service;
-	while (scene->root_od->parentscene) { 
+	while (scene->root_od->parentscene) {
 		if (scene->root_od->parentscene->root_od->net_service != net_service)
 			break;
 		scene = scene->root_od->parentscene;

gpac-0.5.0.svn5178.tar.bz2/src/terminal/network_service.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/network_service.c Changed

@@ -42,34 +42,11 @@
 	return ch;
 }
 
-static void term_on_message(void *user_priv, GF_ClientService *service, GF_Err error, const char *message)
-{
-	GET_TERM();
-
-	/*check for UDP timeout*/
-	if (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", 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;
-		}
-	}
-	gf_term_message(term, service->url, message, error);
-}
-
-static void term_on_connect(void *user_priv, GF_ClientService *service, LPNETCHANNEL netch, GF_Err err)
+static void term_on_connect(GF_ClientService *service, LPNETCHANNEL netch, GF_Err err)
 {
 	GF_Channel *ch;
 	GF_ObjectManager *root;
-	GET_TERM();
+	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) ));
 
@@ -91,23 +68,27 @@
 			/*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_term_on_disconnect */
+				/*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 {
-					if (root->subscene) gf_scene_notify_event(root->subscene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, err, GF_FALSE);
 					/*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
@@ -115,7 +96,6 @@
 					gf_scene_remove_object(root->parentscene, root, 0);
 					gf_odm_disconnect(root, 1);
 				}
-				gf_term_lock_media_queue(term, 0);
 				return;
 			}
 		}
@@ -179,7 +159,7 @@
 	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;*/
+		/*		return;*/
 	}
 
 	if (ch->odm->mo) {
@@ -192,8 +172,8 @@
 		2-this is a channel of the root OD
 	*/
 	if ( (ch->odm->mo && ch->odm->mo->num_open)
-		|| !ch->odm->parentscene
-	) {
+	        || !ch->odm->parentscene
+	   ) {
 		gf_odm_start(ch->odm, 0);
 	}
 #if 0
@@ -203,11 +183,11 @@
 #endif
 }
 
-static void term_on_disconnect(void *user_priv, GF_ClientService *service, LPNETCHANNEL netch, GF_Err response)
+static void term_on_disconnect(GF_ClientService *service, LPNETCHANNEL netch, GF_Err response)
 {
 	GF_ObjectManager *root;
 	GF_Channel *ch;
-	GET_TERM();
+	GF_Terminal *term = service->term;
 
 	/*may be null upon destroy*/
 	root = service->owner;
@@ -215,6 +195,10 @@
 		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) {
@@ -243,10 +227,9 @@
 	ch->es_state = GF_ESM_ES_DISCONNECTED;
 }
 
-static void term_on_slp_received(void *user_priv, GF_ClientService *service, LPNETCHANNEL netch, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status)
+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;
-	GET_TERM();
 
 	ch = gf_term_get_channel(service, netch);
 	if (!ch)
@@ -274,29 +257,34 @@
 	return 1;
 }
 
-static void term_on_media_add(void *user_priv, GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_check)
+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;
-	GET_TERM();
+	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;
+		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;
+		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) {
-		if (!no_scene_check) gf_scene_regenerate(scene);
+		if (!no_scene_check)
+			gf_scene_regenerate(scene);
 		return;
 	}
 
@@ -314,7 +302,7 @@
 
 	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; */
+	/*	od->objectDescriptorID = GF_MEDIA_EXTERNAL_ID; */
 
 	/*check if we have a mediaObject in the scene not attached and matching this object*/
 	the_mo = NULL;
@@ -327,7 +315,7 @@
 		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)) 
+		if ((mo->OD_ID != GF_MEDIA_EXTERNAL_ID) && (min_od_id<mo->OD_ID))
 			min_od_id = mo->OD_ID;
 
 		if (!mo->odm) continue;
@@ -376,7 +364,7 @@
 		if (ext) ext[0] = '#';
 
 		esd = gf_list_get(od->ESDescriptors, 0);
-		if (match_esid && (esd->ESID != match_esid)) 
+		if (match_esid && (esd->ESID != match_esid))
 			continue;
 		/*match type*/
 		switch (esd->decoderConfig->streamType) {
@@ -408,13 +396,13 @@
 		break;
 	}
 
-	/*add a pass on scene->resource to check for min_od_id, 
+	/*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)) 
+		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;
 	}
 
@@ -422,8 +410,11 @@
 		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;
@@ -432,11 +423,11 @@
 	}
 
 	if (the_mo) the_mo->OD_ID = od->objectDescriptorID;
-	if (!scene->selected_service_id) 
+	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 
+	/*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);
 
@@ -447,13 +438,52 @@
 	if (!no_scene_check && scene->is_dynamic_scene) gf_scene_regenerate(scene);
 }
 
-static void term_on_command(void *user_priv, GF_ClientService *service, GF_NetworkCommand *com, GF_Err response)
+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->MaxBuffer || */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->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;
+			}
+		}
+	}
+}
+
+static void term_on_command(GF_ClientService *service, GF_NetworkCommand *com, GF_Err response)
 {
 	GF_Channel *ch;
-	GET_TERM();
+	GF_Terminal *term = service->term;
 
 	if (com->command_type==GF_NET_BUFFER_QUERY) {
-		GF_List *od_list;
+		GF_Scene *scene;
+
 		u32 i, max_buffer_time;
 		GF_ObjectManager *odm;
 		com->buffer.max = 0;
@@ -464,55 +494,29 @@
 		}
 
 		/*browse all channels in the scene, running on this service, and get buffer info*/
-		od_list = NULL;
+		scene = NULL;
 		if (service->owner->subscene) {
-			od_list = service->owner->subscene->resources;
+			scene = service->owner->subscene;
 		} else if (service->owner->parentscene) {
-			od_list = service->owner->parentscene->resources;
+			scene = service->owner->parentscene;
 		}
-		if (!od_list) {
+		if (!scene) {
 			com->buffer.occupancy = 0;
 			return;
 		}
-		/*get exclusive access to media scheduler, to make sure ODs are not being
-		manipulated*/
-		gf_mx_p(term->mm_mx);
+		/*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(od_list))
+		if (!gf_list_count(scene->resources))
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM] No object manager found for the scene (URL: %s), buffer occupancy will remain unchanged\n", service->url));
 		i=0;
-		while ((odm = (GF_ObjectManager*)gf_list_enum(od_list, &i))) {
-			u32 j, count;
-			if (!odm->codec) continue;
-			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->MaxBuffer || */ch->dispatch_after_db || ch->bypass_sl_and_db || ch->IsEndOfStream) continue;
-				//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) continue;
-				if (ch->MaxBuffer>com->buffer.max) com->buffer.max = ch->MaxBuffer;
-				if (ch->MinBuffer<com->buffer.min) com->buffer.min = ch->MinBuffer;
-				if (ch->IsClockInit) {
-					if (ch->BufferTime > (s32) max_buffer_time)
-						max_buffer_time = ch->BufferTime;
-
-					/*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) ch->BufferTime  < com->buffer.occupancy) {
-						com->buffer.occupancy = ch->BufferTime;
-					}
-				} else {
-					com->buffer.occupancy = 0;
-				}
-			}
+		while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+			gather_buffer_level(odm, service, com, &max_buffer_time);
 		}
-		gf_mx_v(term->mm_mx);
+		gf_mx_v(scene->mx_resources);
 		if (com->buffer.occupancy==(u32) -1) com->buffer.occupancy = 0;
-	
+
 		//in bench mode return the 1 if one of the buffer is full (eg sleep until all buffers are not full), 0 otherwise
 		if (term->bench_mode) {
 			com->buffer.occupancy = (max_buffer_time>com->buffer.max) ? 2 : 0;
@@ -531,6 +535,65 @@
 		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);
+			gf_sc_lock(term->compositor, 0);
+		}
+		return;
+	}
 
 	if (!com->base.on_channel) return;
 
@@ -544,6 +607,19 @@
 		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:
 
@@ -560,7 +636,7 @@
 			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 
+			/*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);
@@ -597,7 +673,7 @@
 		} else {
 			com->buffer.max = ch->MaxBuffer;
 			com->buffer.min = ch->MinBuffer;
-			com->buffer.occupancy = ch->BufferTime;
+			com->buffer.occupancy = (u32) (ch->BufferTime / FIX2FLT(ch->clock->speed) );
 		}
 		break;
 	case GF_NET_CHAN_DRM_CFG:
@@ -615,14 +691,21 @@
 		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->BufferTime = 100 * com->buffer.occupancy / com->buffer.max;
-		gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
+		ch->MaxBuffer = com->buffer.max;
+		ch->MinBuffer = com->buffer.min;
+		ch->BufferTime = com->buffer.max * com->buffer.occupancy / 100;
+		gf_es_update_buffering(ch, 1);
 		break;
 	default:
 		return;
@@ -663,7 +746,7 @@
 			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){
+				if (mime) {
 					ret = gf_strdup(mime);
 				}
 				break;
@@ -702,7 +785,7 @@
 }
 
 
-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)
+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;
@@ -718,6 +801,7 @@
 	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;
@@ -757,11 +841,11 @@
 	}
 
 	if (mime_type &&
-		(!stricmp(mime_type, "text/plain")
-			|| !stricmp(mime_type, "video/quicktime")
-			|| !stricmp(mime_type, "application/octet-stream")
-		)
-	) {
+	        (!stricmp(mime_type, "text/plain")
+	         || !stricmp(mime_type, "video/quicktime")
+	         || !stricmp(mime_type, "application/octet-stream")
+	        )
+	   ) {
 		skip_mime = 1;
 	}
 
@@ -772,7 +856,7 @@
 		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) {
-			gf_free(mime_type);
+			*out_mime_type = mime_type;
 			mime_type=NULL;
 		}
 		if (sPlug) sPlug = strrchr(sPlug, '"');
@@ -847,7 +931,7 @@
 
 			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){
+			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;
 			}
@@ -882,22 +966,29 @@
 		}
 	}
 exit:
-	if (!ifce){
-  	    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 (!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;
+		*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"));
+		*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)
-	  gf_free(mime_type);
-	mime_type = NULL;
+		*out_mime_type = mime_type;
 	return ifce;
 }
 
@@ -905,21 +996,33 @@
 {
 	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);
-	if (!ifce) return NULL;
-
+	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);
 	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;
 	return serv;
 }
 
@@ -929,13 +1032,15 @@
 	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);
+	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;
 }
 
@@ -947,6 +1052,7 @@
 	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);
@@ -964,54 +1070,41 @@
 }
 
 GF_EXPORT
-void gf_term_on_message(GF_ClientService *service, GF_Err error, const char *message)
-{
-	assert(service);
-	term_on_message(service->term, service, error, message);
-}
-GF_EXPORT
-void gf_term_on_connect(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response)
+void gf_service_connect_ack(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response)
 {
 	assert(service);
-	term_on_connect(service->term, service, ns, response);
-}
-GF_EXPORT
-void gf_term_on_disconnect(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response)
-{
-	assert(service);
-	term_on_disconnect(service->term, service, ns, response);
+	service->fn_connect_ack(service, ns, response);
 }
+
 GF_EXPORT
-void gf_term_on_command(GF_ClientService *service, GF_NetworkCommand *com, GF_Err response)
+void gf_service_disconnect_ack(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response)
 {
 	assert(service);
-	term_on_command(service->term, service, com, response);
+	service->fn_disconnect_ack(service, ns, response);
 }
-
 GF_EXPORT
-Bool gf_term_on_service_event(GF_ClientService *service, GF_Event *service_event)
+void gf_service_command(GF_ClientService *service, GF_NetworkCommand *com, GF_Err response)
 {
 	assert(service);
-	if (service->term->user->EventProc) return service->term->user->EventProc(service->term->user->opaque, service_event);
-	return 0;
+	service->fn_command(service, com, response);
 }
 
 GF_EXPORT
-void gf_term_on_sl_packet(GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status)
+void gf_service_send_packet(GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status)
 {
 	assert(service);
-	term_on_slp_received(service->term, service, ns, data, data_size, hdr, reception_status);
+	service->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
 }
 
 GF_EXPORT
-void gf_term_add_media(GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_check)
+void gf_service_declare_media(GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_check)
 {
 	assert(service);
-	term_on_media_add(service->term, service, media_desc, no_scene_check);
+	service->fn_add_media(service, media_desc, no_scene_check);
 }
 
 GF_EXPORT
-const char *gf_term_get_service_url(GF_ClientService *service)
+const char *gf_service_get_url(GF_ClientService *service)
 {
 	if (!service) return NULL;
 	return service->url;
@@ -1030,6 +1123,7 @@
 
 	gf_modules_close_interface((GF_BaseInterface *)ns->ifce);
 	gf_free(ns->url);
+	gf_free(ns->mime);
 
 
 	/*delete all the clocks*/
@@ -1046,20 +1140,20 @@
 }
 
 GF_EXPORT
-GF_InputService *gf_term_get_service_interface(GF_ClientService *serv)
+GF_InputService *gf_service_get_interface(GF_ClientService *serv)
 {
 	return serv ? serv->ifce : NULL;
 }
 
 GF_EXPORT
-GF_DownloadSession *gf_term_download_new(GF_ClientService *service, const char *url, u32 flags, gf_dm_user_io user_io, void *cbk)
+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;
-	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;
+	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);
@@ -1081,7 +1175,7 @@
 	}
 	if (orig_url) gf_free(orig_url);
 
-	if (!sess){
+	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;
@@ -1095,7 +1189,7 @@
 }
 
 GF_EXPORT
-void gf_term_download_del(GF_DownloadSession * sess)
+void gf_service_download_del(GF_DownloadSession * sess)
 {
 	Bool locked;
 	GF_ClientService *serv;
@@ -1119,7 +1213,7 @@
 }
 
 GF_EXPORT
-void gf_term_download_update_stats(GF_DownloadSession * sess)
+void gf_service_download_update_stats(GF_DownloadSession * sess)
 {
 	GF_ClientService *serv;
 	const char *szURI;
@@ -1132,16 +1226,16 @@
 	serv = (GF_ClientService *)gf_dm_sess_get_private(sess);
 	switch (net_status) {
 	case GF_NETIO_SETUP:
-		gf_term_on_message(serv, GF_OK, "Connecting");
+		gf_term_message(serv->term, serv->url, "Connecting", GF_OK);
 		break;
 	case GF_NETIO_CONNECTED:
-		gf_term_on_message(serv, GF_OK, "Connected");
+		gf_term_message(serv->term, serv->url, "Connected", GF_OK);
 		break;
 	case GF_NETIO_WAIT_FOR_REPLY:
-		gf_term_on_message(serv, GF_OK, "Waiting for reply...");
+		gf_term_message(serv->term, serv->url, "Waiting for reply...", GF_OK);
 		break;
 	case GF_NETIO_PARSE_REPLY:
-		gf_term_on_message(serv, GF_OK, "Starting download...");
+		gf_term_message(serv->term, serv->url, "Starting download...", GF_OK);
 		break;
 	case GF_NETIO_DATA_EXCHANGE:
 		/*notify some connection / ...*/
@@ -1166,7 +1260,9 @@
 				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP Resource] Done retrieving file - resuming playback\n"));
 				if (serv->is_paused) {
 					serv->is_paused = 0;
-					mediacontrol_resume(serv->owner);
+#ifndef GPAC_DISABLE_VRML
+					mediacontrol_resume(serv->owner, 0);
+#endif
 				}
 			}
 		}
@@ -1187,7 +1283,7 @@
 }
 
 GF_EXPORT
-void gf_term_register_mime_type(const GF_InputService *ifce, const char *mimeType, const char *extList, const char *description)
+void gf_service_register_mime(const GF_InputService *ifce, const char *mimeType, const char *extList, const char *description)
 {
 	u32 len;
 	char *buf;
@@ -1206,7 +1302,7 @@
 }
 
 GF_EXPORT
-Bool gf_term_check_extension(GF_InputService *ifce, const char *mimeType, const char *extList, const char *description, const char *fileExt)
+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];
@@ -1223,7 +1319,7 @@
 
 	szExtList = gf_modules_get_option((GF_BaseInterface *)(GF_BaseInterface *)ifce, "MimeTypes", mimeType);
 	if (!szExtList) {
-		gf_term_register_mime_type(ifce, mimeType, extList, description);
+		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;
@@ -1280,7 +1376,11 @@
 		if (sep) sep[0] = 0;
 		for (i=0; i<strlen(szURL); i++) {
 			switch (szURL[i]) {
-			case '/': case '\\': case '.': case ':': case '?':
+			case '/':
+			case '\\':
+			case '.':
+			case ':':
+			case '?':
 				szURL[i] = '_';
 				break;
 			}

gpac-0.5.0.svn5178.tar.bz2/src/terminal/object_browser.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/object_browser.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -112,6 +112,30 @@
 	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
+}
+
+
+/*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)
 {
@@ -132,7 +156,7 @@
 static void get_codec_stats(GF_Codec *dec, GF_MediaInfo *info)
 {
 	info->instant_bitrate = dec->avg_bit_rate;
-	info->avg_bitrate = (u32) (dec->tot_bit_size * (1000.0 / (dec->last_unit_dts-dec->stat_start)) );
+	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;
@@ -140,52 +164,70 @@
 	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 || !odm->OD || !info) return GF_BAD_PARAM;
+	if (!term || !odm || !info) return GF_BAD_PARAM;
 	if (!gf_term_check_odm(term, odm)) return GF_BAD_PARAM;
 
-	memset(info, 0, sizeof(GF_MediaInfo));
 	info->od = odm->OD;
 
 	info->duration = (Double) (s64)odm->duration;
 	info->duration /= 1000;
 
-	if (odm->codec) {
+	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 (odm->codec->ck) {
-			if (odm->codec->CB) {
-				info->current_time = odm->current_time ? odm->current_time : odm->codec->last_unit_cts;
+		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_time(odm->codec->ck);
+				info->current_time = gf_clock_media_time(codec->ck);
 			}
-			info->current_time -= odm->codec->ck->init_time;
 		}
 		info->current_time /= 1000;
-		info->nb_droped = odm->codec->nb_droped;
+		info->nb_droped = codec->nb_droped;
 	} else if (odm->subscene) {
 		if (odm->subscene->scene_codec) {
 			if (odm->subscene->scene_codec->ck) {
-				info->current_time = gf_clock_time(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_droped = odm->subscene->scene_codec->nb_droped;
+			codec = odm->subscene->scene_codec;
 		} else if (odm->subscene->is_dynamic_scene) {
 			if (odm->subscene->dyn_ck) {
-				info->current_time = gf_clock_time(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->current_time>info->duration)
+	if (info->duration && info->current_time>info->duration)
 		info->current_time = info->duration;
 
 	info->buffer = -2;
@@ -200,7 +242,7 @@
 	} else if (odm->state) {
 		u32 i, buf;
 		GF_Clock *ck;
-		
+
 		ck = gf_odm_get_media_clock(odm);
 		/*no clock means setup failed*/
 		if (!ck) {
@@ -210,13 +252,19 @@
 			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) {
+				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;
 
@@ -228,12 +276,12 @@
 	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->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;
@@ -245,31 +293,25 @@
 		info->service_url = "Service not found or error";
 	}
 
-	if (odm->codec && odm->codec->decio) {
-		if (!odm->codec->decio->GetName) {
-			info->codec_name = odm->codec->decio->module_name;
+	if (codec) {
+		if (codec->decio && codec->decio->GetName) {
+			info->codec_name = codec->decio->GetName(codec->decio);
 		} else {
-			info->codec_name = odm->codec->decio->GetName(odm->codec->decio);
+			info->codec_name = codec->decio->module_name;
 		}
-		info->od_type = odm->codec->type;
-		if (odm->codec->CB) {
-			info->cb_max_count = odm->codec->CB->Capacity;
-			info->cb_unit_count = odm->codec->CB->UnitCount;
-			if (odm->codec->direct_vout) {
+		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;
 			}
 		}
-	} 
-	
-	if (odm->subscene && odm->subscene->scene_codec) {
-		GF_BaseDecoder *dec = odm->subscene->scene_codec->decio;
-		assert(odm->subscene->root_od==odm) ;
-		info->od_type = odm->subscene->scene_codec->type;
-		if (!dec->GetName) {
-			info->codec_name = dec->module_name;
-		} else {
-			info->codec_name = dec->GetName(dec);
-		}
+		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) {
@@ -285,8 +327,6 @@
 			break;
 		}
 	}
-	if (odm->subscene && odm->subscene->scene_codec) get_codec_stats(odm->subscene->scene_codec, info);
-	else if (odm->codec) get_codec_stats(odm->codec, info);
 
 	ch = (GF_Channel*)gf_list_get(odm->channels, 0);
 	if (ch && ch->esd->langDesc) info->lang = ch->esd->langDesc->langCode;
@@ -361,7 +401,7 @@
 		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;
@@ -400,7 +440,7 @@
 		odm = term->root_scene->root_od;
 	} else {
 		odm = scene_od;
-		if (!gf_term_check_odm(term, scene_od)) 
+		if (!gf_term_check_odm(term, scene_od))
 			odm = term->root_scene->root_od;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/terminal/object_manager.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/object_manager.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -56,43 +56,54 @@
 	return tmp;
 }
 
-void gf_odm_del(GF_ObjectManager *odm)
+void gf_odm_reset_media_control(GF_ObjectManager *odm, Bool signal_reset)
 {
 #ifndef GPAC_DISABLE_VRML
-	u32 i;
 	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;
+	}
 	/*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 
+	/*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
-	i=0;
-	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i))) {
-		MS_Stop(media_sens);
-		/*and detach from stream object*/
-		media_sens->stream = NULL;
-	}
+	gf_odm_reset_media_control(odm, 0);
 	gf_list_del(odm->ms_stack);
-	
-	i=0;
-	while ((media_ctrl = (MediaControlStack *)gf_list_enum(odm->mc_stack, &i))) {
-		media_ctrl->stream = NULL;
-		media_ctrl->ck = NULL;
-	}
 	gf_list_del(odm->mc_stack);
 #endif
 
@@ -112,7 +123,7 @@
 void gf_odm_lock(GF_ObjectManager *odm, u32 LockIt)
 {
 	assert(odm);
-	if (LockIt) 
+	if (LockIt)
 		gf_mx_p(odm->mx);
 	else
 		gf_mx_v(odm->mx);
@@ -259,7 +270,7 @@
 		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;
@@ -314,7 +325,7 @@
 		if (ext) sub_url = ext;
 	}
 
-	desc = odm->net_service->ifce->GetServiceDescriptor(odm->net_service->ifce, od_type, sub_url); 
+	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) {
@@ -329,7 +340,7 @@
 	}
 
 	if (!desc) {
-		if (odm->OD && !gf_list_count(odm->OD->ESDescriptors)) 
+		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)*/
@@ -371,7 +382,7 @@
 		gf_odf_desc_del((GF_Descriptor *) the_iod->IPMPToolList);
 		gf_free(the_iod);
 	}
-		break;
+	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;
@@ -382,14 +393,14 @@
 		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);
 	}
-	/*it may happen that this object was inserted in a dynamic scene from a service through a URL redirect. In which case, 
+	/*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);
@@ -502,26 +513,36 @@
 		case GF_STREAM_OD:
 			nb_od++;
 			break;
-		case GF_STREAM_OCR: 
-			nb_ocr++; 
+		case GF_STREAM_OCR:
+			nb_ocr++;
 			break;
-		case GF_STREAM_SCENE: 
+		case GF_STREAM_SCENE:
 			switch (esd->decoderConfig->objectTypeIndication) {
 			case GPAC_OTI_SCENE_AFX:
 			case GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE:
 				break;
 			default:
-				nb_scene++; 
+				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;
+		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: 
+		default:
 			if (esd->decoderConfig->streamType!=prev_st) nb_other++;
 			prev_st = esd->decoderConfig->streamType;
 			break;
@@ -568,7 +589,7 @@
 	while ( (esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i)) ) {
 		switch (esd->decoderConfig->streamType) {
 		case GF_STREAM_PRIVATE_SCENE:
-		case GF_STREAM_SCENE: 
+		case GF_STREAM_SCENE:
 			base_scene = esd;
 			break;
 		default:
@@ -576,7 +597,7 @@
 		}
 		if (base_scene) break;
 	}
-	
+
 	/*we have a scene stream without dependancies, this is an inline*/
 	if (!base_scene || !base_scene->dependsOnESID) return GF_OK;
 
@@ -604,6 +625,11 @@
 
 	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);
@@ -640,9 +666,9 @@
 		}
 		odm->net_service = serv;
 		assert(odm->OD);
-		if (!odm->OD->URLString) 
+		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) {
@@ -651,13 +677,13 @@
 		char *parent_url = NULL;
 		odm->OD->URLString = NULL;
 		/*store original OD ID */
-		if (!odm->current_time) odm->current_time = odm->OD->objectDescriptorID;
+		if (!odm->media_current_time) odm->media_current_time = odm->OD->objectDescriptorID;
 
 		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)
@@ -676,9 +702,9 @@
 		return;
 	}
 	/*restore OD ID */
-	if (odm->current_time) {
-		odm->OD->objectDescriptorID = odm->current_time;
-		odm->current_time = 0;
+	if (odm->media_current_time) {
+		odm->OD->objectDescriptorID = odm->media_current_time;
+		odm->media_current_time = 0;
 		odm->flags |= GF_ODM_REMOTE_OD;
 	}
 
@@ -703,7 +729,7 @@
 		odm->flags |= GF_ODM_INHERIT_TIMELINE;
 	}
 
-	/*if there is a BIFS stream in the OD, we need an GF_Scene (except if we already 
+	/*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);
@@ -738,12 +764,17 @@
 		}
 		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;
 
-		gf_scene_setup_object(odm->parentscene, odm);
+		//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) ) {
@@ -751,7 +782,7 @@
 			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 AFC are started - default to "right now"*/
+			/*not clear in the spec how the streams attached to AFX are started - default to "right now"*/
 			gf_odm_start(odm, 0);
 		}
 
@@ -767,7 +798,7 @@
 		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;
@@ -777,25 +808,28 @@
 		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->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 
+	/*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;
@@ -804,34 +838,85 @@
 		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;
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] Inserted from broadcast or input service - forcing play\n", odm->OD->objectDescriptorID));
+			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)
-	) {
+	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->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);
-	
-			gf_term_lock_net(odm->term, GF_TRUE);
+			return;
 		}
 	}
 
+	/*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);
 }
 
@@ -841,7 +926,7 @@
 {
 	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) 
+	if (ch->esd->URLString && !ch->service->nb_ch_users)
 		gf_term_close_service(ch->odm->term, ch->service);
 }
 
@@ -849,7 +934,6 @@
 GF_EXPORT
 GF_Err gf_odm_setup_es(GF_ObjectManager *odm, GF_ESD *esd, GF_ClientService *serv, GF_MediaObject *sync_ref)
 {
-	GF_CodecCapability cap;
 	GF_Channel *ch;
 	GF_Clock *ck;
 	GF_List *ck_namespace;
@@ -882,7 +966,7 @@
 			while (odm_par) {
 				if (odm_par->subscene->scene_codec)
 					ck = odm_par->subscene->scene_codec->ck;
-				else 
+				else
 					ck = odm_par->subscene->dyn_ck;
 
 				if (ck) break;
@@ -899,7 +983,9 @@
 	scene = odm->subscene ? odm->subscene : odm->parentscene;
 
 	ck_namespace = odm->net_service->Clocks;
-	/*little trick for non-OD addressing: if object is a remote one, and service owner already has 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);
@@ -910,8 +996,10 @@
 		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);
-			esd->OCRESID = ck->clockID;
-			goto clock_setup;
+			if (!odm->OD->ServiceID || (odm->OD->ServiceID==ck->service_id)) {
+				esd->OCRESID = ck->clockID;
+				goto clock_setup;
+			}
 		}
 	}
 
@@ -947,6 +1035,7 @@
 	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;
 	/*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)
@@ -975,7 +1064,7 @@
 		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:
@@ -1019,12 +1108,12 @@
 		/*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) gf_term_add_codec(odm->term, odm->codec);
+			if (!e && odm->codec) gf_term_add_codec(odm->term, odm->codec);
 		}
 		dec = odm->codec;
 		break;
 
-	/*interaction stream*/
+		/*interaction stream*/
 #ifndef GPAC_DISABLE_VRML
 	case GF_STREAM_INTERACT:
 		if (!odm->codec) {
@@ -1052,7 +1141,7 @@
 			}
 			dec = odm->subscene->scene_codec;
 		} else {
-			/*this is a bit tricky: the scene decoder needs to ba called with the dummy streams of this 
+			/*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);
@@ -1062,23 +1151,20 @@
 	default:
 		if (!odm->codec) {
 			odm->codec = gf_codec_new(odm, esd, odm->OD_PL, &e);
-			if (!e) gf_term_add_codec(odm->term, odm->codec);
+			if (!e && odm->codec) gf_term_add_codec(odm->term, odm->codec);
 
 		}
 		dec = odm->codec;
 		break;
 	}
 
-	/*if we have a decoder, set up the channel and co.*/
-	if (!dec) {
-		if (e) {
-			gf_es_del(ch);
-			return e;
-		}
+	if (!dec && e) {
+		gf_es_del(ch);
+		return e;
 	}
 
 	/*setup scene decoder*/
-	if (dec->decio && (dec->decio->InterfaceType==GF_SCENE_DECODER_INTERFACE) ) {
+	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) {
@@ -1095,7 +1181,11 @@
 			}
 		}
 	}
-	{
+
+	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);
@@ -1103,13 +1193,8 @@
 			dec->flags |= GF_ESM_CODEC_IS_RAW_MEDIA;
 			dec->process = gf_codec_process_private_media;
 		}
-	}
 
-	ch->es_state = GF_ESM_ES_SETUP;
-	ch->odm = odm;
-
-	/*get media padding BEFORE channel setup, since we use it on channel connect ack*/
-	if (dec) {
+		/*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;
@@ -1129,16 +1214,16 @@
 	/*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 
+		/*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 
+		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 ((ch->esd->decoderConfig->streamType==GF_STREAM_OD) && strstr(ch->esd->URLString, "data:application/mpeg4-od-au;") ) 
+		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);
@@ -1180,7 +1265,7 @@
 	}
 
 	/*insert channel*/
-	if (dec) gf_list_insert(ch->odm->channels, ch, 0);
+	gf_list_insert(ch->odm->channels, ch, 0);
 
 	if (ch->service) {
 		ch->es_state = GF_ESM_ES_WAIT_FOR_ACK;
@@ -1194,7 +1279,7 @@
 		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 
+		/*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 {
@@ -1218,9 +1303,9 @@
 				gf_term_message(ch->odm->term, ch->service->url, "Audio Setup failed", e);
 				break;
 			}
-			gf_list_rem(ch->odm->channels, 0);
+			gf_list_del_item(ch->odm->channels, ch);
 			/*disconnect*/
-			ch->service->ifce->DisconnectChannel(ch->service->ifce, ch); 
+			ch->service->ifce->DisconnectChannel(ch->service->ifce, ch);
 			if (ch->esd->URLString) {
 				assert(ch->service->nb_ch_users);
 				ch->service->nb_ch_users--;
@@ -1278,7 +1363,7 @@
 	for (i=0; i<count; i++) {
 		ch2 = (GF_Channel*)gf_list_get(odm->channels, i);
 		if (ch2 == ch) {
-			ch_pos = i;	
+			ch_pos = i;
 			if (ck) continue;
 			break;
 		}
@@ -1290,7 +1375,7 @@
 
 	/*remove from the codec*/
 	count = 0;
-	if (!count && odm->codec) 
+	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);
@@ -1303,7 +1388,7 @@
 		if (!count) count = gf_codec_remove_channel(odm->subscene->od_codec, ch);
 	}
 	if (ch->service) {
-		ch->service->ifce->DisconnectChannel(ch->service->ifce, ch); 
+		ch->service->ifce->DisconnectChannel(ch->service->ifce, ch);
 		if (ch->esd->URLString) {
 			assert(ch->service->nb_ch_users);
 			ch->service->nb_ch_users--;
@@ -1342,13 +1427,19 @@
 	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 
+/*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*/
@@ -1380,11 +1471,12 @@
 				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;
+
 		}
-		//wait for end of setup 
+		//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 = 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 {
@@ -1420,6 +1512,7 @@
 	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;
@@ -1448,7 +1541,7 @@
 	/*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;
@@ -1476,6 +1569,7 @@
 
 		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;
@@ -1487,30 +1581,55 @@
 		}
 		/*play from current time*/
 		else {
-			ck_time = gf_clock_time(ch->clock);
+			ck_time = gf_clock_media_time(ch->clock);
 			ck_time /= 1000;
-			/*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;
+			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) {
+			//addon timing is resolved against timestamps, not media time
+			if (start_range_is_clock) {
+				ck_time = gf_clock_time(ch->clock);
+				ck_time /= 1000;
+			}
+			ck_time = gf_scene_adjust_time_for_addon(odm->parentscene, ck_time, odm->parentscene->root_od->addon, &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 (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 && gf_odm_shares_clock(odm->parentscene->root_od, ch->clock)
-				&& (odm->parentscene->root_od->media_stop_time != odm->parentscene->root_od->duration)
-			) {
+			        && (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 = -1;
 			}
 		}
 
+		com.play.speed = ch->clock->speed;
+
 #ifndef GPAC_DISABLE_VRML
 		/*if object shares parent scene clock, do not use media control*/
-		ctrl = parent_ck ? NULL : gf_odm_get_mediacontrol(odm);
+		//ctrl = parent_ck ? NULL : gf_odm_get_mediacontrol(odm);
+		ctrl = parent_ck ? parent_ck->mc : gf_odm_get_mediacontrol(odm);
 		/*override range and speed with MC*/
 		if (ctrl) {
 			MC_GetRange(ctrl, &com.play.start_range, &com.play.end_range);
@@ -1522,8 +1641,11 @@
 			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 (odm->media_start_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;
@@ -1535,14 +1657,20 @@
 				}
 				com.play.start_range += ck_time;
 			}
+#endif
+
 		}
 #endif
 
 		/*full object playback*/
 		if (com.play.end_range<=0) {
-			odm->media_stop_time = odm->subscene ? 0 : odm->duration;
+			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, 
+			/*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);
 		}
@@ -1551,7 +1679,7 @@
 		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) ) 
+			if (gf_es_owns_clock(ch) )
 				gf_clock_set_time(ch->clock, (u32) (com.play.start_range*1000));
 
 			ch->IsClockInit = 1;
@@ -1560,12 +1688,15 @@
 				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)\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));
 			gf_term_service_command(ch->service, &com);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %u requesting PLAY from %g to %g (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), com.play.start_range, com.play.end_range, ch->clock->clock_init));
 		}
 	}
 //	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;
 		return;
@@ -1584,7 +1715,10 @@
 
 		if (odm->flags & GF_ODM_REGENERATE_SCENE) {
 			odm->flags &= ~GF_ODM_REGENERATE_SCENE;
-			gf_scene_regenerate(odm->subscene);
+			if (!odm->subscene->graph_attached)
+				gf_scene_regenerate(odm->subscene);
+			else
+				gf_scene_restart_dynamic(odm->subscene, 0, 1);
 		}
 	}
 	if (odm->ocr_codec) gf_term_start_codec(odm->ocr_codec, 0);
@@ -1592,11 +1726,16 @@
 	if (odm->oci_codec) gf_term_start_codec(odm->oci_codec, 0);
 #endif
 
+	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);
 }
 
-Bool gf_odm_owns_clock(GF_ObjectManager *odm, GF_Clock *ck) 
+Bool gf_odm_owns_clock(GF_ObjectManager *odm, GF_Clock *ck)
 {
 	u32 i, j;
 	GF_ObjectManager *od;
@@ -1625,7 +1764,7 @@
 #endif
 
 	GF_NetworkCommand com;
-	
+
 	if (!odm->state) return;
 
 #if 0
@@ -1633,7 +1772,7 @@
 	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;
+		       return;
 	}
 #endif
 
@@ -1668,7 +1807,7 @@
 
 	/*object was not unlocked, decoders were not started*/
 	if (odm->state==GF_ODM_STATE_BLOCKED) {
-		odm->current_time = 0;
+		odm->media_current_time = 0;
 		gf_sema_notify(odm->raw_frame_sema, 1);
 		return;
 	}
@@ -1707,13 +1846,18 @@
 			evt.channel = ch;
 			ch->ipmp_tool->process(ch->ipmp_tool, &evt);
 		}
-		
+
 		if (ch->service) {
 			com.base.on_channel = ch;
 			gf_term_service_command(ch->service, &com);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH %d At OTB %u requesting STOP\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock)));
+			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*/
@@ -1729,12 +1873,12 @@
 //	gf_term_lock_net(odm->term, 0);
 
 	odm->state = GF_ODM_STATE_STOP;
-	odm->current_time = 0;
+	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))){
+	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i))) {
 		MS_Stop(media_sens);
 	}
 	/*reset media control state*/
@@ -1777,12 +1921,14 @@
 	} else {
 		if (nb_eos != count) return;
 	}
+
+
 	gf_term_service_media_event(odm, GF_EVENT_MEDIA_LOAD_DONE);
-	
+
 	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;
@@ -1816,8 +1962,8 @@
 				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;
+		if (odm->duration/1000 != stream_duration/1000)
+			odm->duration = stream_duration;
 		//}
 	}
 
@@ -1826,12 +1972,38 @@
 }
 
 
+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;
 }
 
@@ -1844,6 +2016,10 @@
 	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;
 }
 
@@ -1858,12 +2034,21 @@
 #endif
 	GF_Channel *ch;
 
-	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
+	//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) {
-		gf_term_stop_codec(odm->codec, 1);
+		//we don't pause codec but only change its status to PUASE - this will allow decoding until CB is full, which will turn the codec in pause mdoe
 		gf_codec_set_status(odm->codec, GF_ESM_CODEC_PAUSE);
 	} else if (odm->subscene) {
 		if (odm->subscene->scene_codec) {
@@ -1881,9 +2066,12 @@
 	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;
+
 		com.base.on_channel = ch;
 		gf_term_service_command(ch->service, &com);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %u requesting PAUSE (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), ch->clock->clock_init ));
 	}
 
 #ifndef GPAC_DISABLE_VRML
@@ -1892,7 +2080,7 @@
 	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_str((GF_Node *) media_sens->sensor, "isActive");
+			gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
 		}
 	}
 #endif
@@ -1909,8 +2097,15 @@
 	MediaControlStack *ctrl;
 #endif
 
-	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
+	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) {
@@ -1928,34 +2123,41 @@
 	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)) ){
+	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);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %u requesting RESUME (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), ch->clock->clock_init ));
 
+#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)) ){
+	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_str((GF_Node *) media_sens->sensor, "isActive");
+			gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
 		}
 	}
 #endif
 }
 
-void gf_odm_set_speed(GF_ObjectManager *odm, Fixed speed)
+void gf_odm_set_speed(GF_ObjectManager *odm, Fixed speed, Bool adjust_clock_speed)
 {
 	u32 i;
 	GF_NetworkCommand com;
@@ -1967,7 +2169,9 @@
 	com.play.speed = FIX2FLT(speed);
 	i=0;
 	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-		gf_clock_set_speed(ch->clock, speed);
+		if (adjust_clock_speed)
+			gf_clock_set_speed(ch->clock, speed);
+
 		com.play.on_channel = ch;
 		gf_term_service_command(ch->service, &com);
 	}
@@ -1978,7 +2182,7 @@
 	GF_Segment *desc;
 	u32 i = 0;
 	if (!odm->OD) return NULL;
-	while ( (desc = (GF_Segment *)gf_list_enum(odm->OD->OCIDescriptors, &i)) ){
+	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;
 	}
@@ -2025,7 +2229,7 @@
 			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;
@@ -2033,7 +2237,7 @@
 			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);
@@ -2060,7 +2264,7 @@
 	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)) return;
 		if (root->subscene->is_dynamic_scene)
 			is_over = 1;

gpac-0.5.0.svn5178.tar.bz2/src/terminal/scene.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/scene.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -43,6 +43,8 @@
 #include "input_sensor.h"
 #include "media_memory.h"
 
+void gf_scene_reset_addons(GF_Scene *scene);
+
 GF_EXPORT
 Double gf_scene_get_time(void *_is)
 {
@@ -67,7 +69,7 @@
 
 static void inline_on_media_event(GF_Scene *scene, u32 type)
 {
-	gf_term_service_media_event(scene->scene_codec->odm, type); 
+	gf_term_service_media_event(scene->scene_codec->odm, type);
 }
 
 GF_EXPORT
@@ -77,9 +79,11 @@
 	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);
@@ -94,15 +98,26 @@
 #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);
+}
+
 void gf_scene_del(GF_Scene *scene)
 {
 	gf_mx_p(scene->root_od->term->net_mx);
@@ -156,14 +171,15 @@
 	gf_list_del(scene->keynavigators);
 #endif
 
-	if (scene->audio_url.url) gf_free(scene->audio_url.url);
-	if (scene->visual_url.url) gf_free(scene->visual_url.url);
-	if (scene->text_url.url) gf_free(scene->text_url.url);
-	if (scene->dims_url.url) gf_free(scene->dims_url.url);
+	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);
 }
 
@@ -190,7 +206,7 @@
 	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*/
@@ -221,17 +237,17 @@
 					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;
-								}
+						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);
-				}	
+				}
 			}
 		}
 	}
@@ -249,12 +265,14 @@
 		gf_list_rem(scene->storages, 0);
 		if (storage->_auto) gf_storage_save(storage);
 	}
-#endif	
+#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);
@@ -280,7 +298,7 @@
 		}
 	} else {
 		while (gf_list_count(scene->resources)) {
-			odm = (GF_ObjectManager *)gf_list_get(scene->resources, 0);	
+			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
@@ -300,6 +318,9 @@
 		gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
 		gf_mo_del(obj);
 	}
+
+	//reset URLs
+	gf_scene_reset_urls(scene);
 	gf_term_lock_compositor(scene->root_od->term, GF_FALSE);
 }
 
@@ -371,7 +392,9 @@
 	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 {
@@ -407,12 +430,12 @@
 	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)) 
+		    /*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);
@@ -451,7 +474,7 @@
 			/*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)) {
@@ -561,7 +584,7 @@
 				evt.detail = 1;
 				break;
 #ifndef GPAC_DISABLE_X3D
-            case TAG_X3D_Group:
+			case TAG_X3D_Group:
 				evt.detail = 2;
 				break;
 #endif
@@ -585,9 +608,9 @@
 				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++) {
+		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);
@@ -617,10 +640,10 @@
 		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);
-    }
+		}
+		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) {
@@ -629,7 +652,7 @@
 	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++) {
+		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);
@@ -679,10 +702,10 @@
 	gf_term_lock_net(scene->root_od->term, GF_TRUE);
 
 	/*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) 
+	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 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;
@@ -691,19 +714,19 @@
 		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) 
-			)
-		) {	
+		    /*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;
 		}
 
@@ -712,16 +735,21 @@
 		if (obj->odm) {
 			Bool can_reuse = GF_TRUE;
 			Bool timeline_locked = (obj->odm->flags & GF_ODM_INHERIT_TIMELINE) ? GF_TRUE : GF_FALSE;
-			if (timeline_locked != lock_timelines) 
+
+			//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) { 
+				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;
@@ -766,9 +794,9 @@
 
 		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 !! 
+		!! FIXME - this should be cleaned up !!
 	*/
 	if (obj->type == GF_MEDIA_OBJECT_UPDATES)
 		obj->node_ptr = node;
@@ -784,7 +812,7 @@
 		}
 
 		if (obj->odm==NULL) {
-			gf_list_del_item(scene->scene_objects, obj); 
+			gf_list_del_item(scene->scene_objects, obj);
 			gf_mo_del(obj);
 			gf_term_lock_net(scene->root_od->term, GF_FALSE);
 			return NULL;
@@ -845,15 +873,15 @@
 	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);
+		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) {
+	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*/
@@ -890,13 +918,13 @@
 
 	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_str((GF_Node *) media_sens->sensor, "mediaDuration");
+			gf_node_event_out((GF_Node *) media_sens->sensor, 3/*"mediaDuration"*/);
 		}
 	}
 #endif
@@ -912,6 +940,39 @@
 
 }
 
+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;
@@ -988,10 +1049,22 @@
 	if (!w || !h) return;
 
 	gf_scene_get_video_size(mo, &v_w, &v_h);
-	tr->translation.x = INT2FIX((s32) (w - v_w)) / 2;
-	tr->translation.y = INT2FIX((s32) (h - v_h)) / 2;
+	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);
@@ -1021,21 +1094,60 @@
 	u32 w, h;
 	SFURL *sfu;
 	Bool url_changed = 0;
+
 	/*scene url is not set, find the first one*/
-	if (!media_url->OD_ID) {
-		u32 i=0;
+	if (!media_url->OD_ID  ) {
+		u32 count, i;
 		GF_ObjectManager *odm = NULL;
-		while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+		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);
 
@@ -1049,7 +1161,8 @@
 
 			if (odm->mo && (type==GF_STREAM_VISUAL)) {
 				gf_scene_get_video_size(odm->mo, &w, &h);
-				gf_sg_set_scene_size_info(scene->graph, w, h, 1);
+				if (w && h)
+					gf_sg_set_scene_size_info(scene->graph, w, h, 1);
 			}
 			break;
 		}
@@ -1096,6 +1209,9 @@
 	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;
 
@@ -1104,7 +1220,7 @@
 	gf_sc_lock(scene->root_od->term->compositor, 1);
 
 	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
-	
+
 	/*this is the first time, generate a scene graph*/
 	if (!ac) {
 		/*create an OrderedGroup*/
@@ -1134,7 +1250,7 @@
 		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
 		gf_node_register(n2, n1);
 		n1 = n2;
-		
+
 		/*create a shape and bitmap node*/
 		n2 = is_create_node(scene->graph, TAG_MPEG4_Shape, NULL);
 		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
@@ -1164,12 +1280,32 @@
 
 		/*3GPP DIMS streams controlled */
 		n1 = gf_sg_get_root_node(scene->graph);
-		dims = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "DYN_SCENE");
+		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);
 	}
 
+
 	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
 	set_media_url(scene, &scene->audio_url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
 
@@ -1179,11 +1315,11 @@
 	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, "DYN_SCENE");
+	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);
@@ -1192,15 +1328,31 @@
 		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_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
 		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 !!!*/
 void gf_scene_regenerate(GF_Scene *scene) {}
-void gf_scene_restart_dynamic(GF_Scene *scene, u64 from_time) {}
+void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only) {}
 void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm) {}
 #endif	/*GPAC_DISABLE_VRML*/
 
@@ -1223,12 +1375,75 @@
 	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) {
+		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;
+		}
+		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));
+		gf_scene_regenerate(scene);
+	}
+	gf_sc_lock(scene->root_od->term->compositor, 0);
+}
+
 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) 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_AUDIO")) ) return;
@@ -1236,6 +1451,20 @@
 		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 (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_AUDIO");
 		if (!ac) return;
@@ -1246,7 +1475,7 @@
 		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; 
+			ac->url.vals[0].url = NULL;
 		}
 		url = odm->mo->URLs.count ? odm->mo->URLs.vals[0].url : NULL;
 		if (url) {
@@ -1300,27 +1529,170 @@
 	}
 }
 
-void gf_scene_restart_dynamic(GF_Scene *scene, u64 from_time)
+void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on)
+{
+	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_AUDIO"));
+		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO"));
+		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);
+		}
+
+
+		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);
+
+		odm_activate(&scene->audio_url, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO"));
+		odm_activate(&scene->visual_url, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO"));
+		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)
 {
 	u32 i;
 	GF_Clock *ck;
 	GF_List *to_restart;
 	GF_ObjectManager *odm;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Scene] Restarting from "LLD"\n", LLD_CAST from_time));
+	if (restart_only) {
+		from_time = 0;
+	}
 
 	ck = scene->dyn_ck;
 	if (scene->scene_codec) ck = scene->scene_codec->ck;
 	if (!ck) return;
 
-	to_restart = gf_list_new();
+	//first pass to check if we need to enable the addon acting as time shifting
+	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);
+			} else if (scene->main_addon_selected) {
+				gf_scene_select_main_addon(scene, odm, GF_FALSE);
+			}
+		}
+	}
+
+	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) {
-				gf_list_add(to_restart, odm);
+
+				//object is not an addon and main addon is selected, do not add
+				if (!odm->addon && scene->main_addon_selected) {
+					//object is not an addon and main addon is selected, do not add
+				} else if (odm->addon && (odm->addon->addon_type==GF_ADDON_TYPE_MAIN) && scene->main_addon_selected) {
+					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);
 				}
@@ -1328,15 +1700,32 @@
 		}
 	}
 
-	/*reset clock*/
-	gf_clock_reset(ck);
-	if (!scene->is_dynamic_scene) gf_clock_set_time(ck, 0);
+	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))) {
-		odm->media_start_time = from_time;
-		gf_odm_start(odm, 0);
+		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);
+		} else {
+			gf_odm_start(odm, 0);
+		}
 	}
 	gf_list_del(to_restart);
 
@@ -1368,29 +1757,48 @@
 {
 	/*for now only allowed when no scene info*/
 	if (!scene->is_dynamic_scene) return;
-	
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Changing scene size to %d x %d\n", width, height));
-	
-	if (scene->root_od->term->root_scene == scene) {
+
+	if (scene->is_dynamic_scene) {
 		GF_NetworkCommand com;
 
 		memset(&com, 0, sizeof(GF_NetworkCommand));
 		com.base.command_type = GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE;
 		gf_term_service_command(scene->root_od->net_service, &com);
 
-		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;
+		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 {
-				gf_sc_set_size(scene->root_od->term->compositor, 0, 0);
+				/*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;
+			}
+			gf_sg_set_scene_size_info(scene->graph, width, height, 1);
+			scene->force_size_set = 1;
 		} else {
-			/*need output resize*/
-			gf_sg_set_scene_size_info(scene->graph, width, height, gf_sg_use_pixel_metrics(scene->graph));
-			gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
-			gf_sc_set_size(scene->root_od->term->compositor, width, height);
+			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 {
+				width = w;
+				height = h;
+			}
 		}
 	}
 	else if (scene->root_od->parentscene && scene->root_od->parentscene->is_dynamic_scene) {
@@ -1434,7 +1842,7 @@
 	}
 
 	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;
@@ -1447,7 +1855,7 @@
 			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, 
+			/*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;
@@ -1495,9 +1903,9 @@
 	if (!node) return NULL;
 	switch (gf_node_get_tag(node)) {
 #ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_Inline: 
+	case TAG_MPEG4_Inline:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline: 
+	case TAG_X3D_Inline:
 #endif
 		break;
 #endif
@@ -1582,6 +1990,7 @@
 
 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;
@@ -1594,7 +2003,7 @@
 	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);
@@ -1610,7 +2019,7 @@
 	url_search = url;
 	while (1) {
 		char *sep;
-		
+
 		if (use_old_syntax) {
 			sep = strchr(url_search, ':');
 			/*if :// or :\ is found, skip it*/
@@ -1676,4 +2085,312 @@
 	evt.type = GF_EVENT_CONNECT;
 	evt.connect.is_connected = 1;
 	gf_term_send_event(scene->root_od->term, &evt);
+#endif
+}
+
+void scene_reset_addon(GF_AddonMedia *addon, Bool disconnect)
+{
+	if (disconnect && addon->root_od)
+		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);
+
+		scene_reset_addon(addon, 0);
+	}
+}
+
+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) 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->enable_if_defined)
+				addon->enabled = 1;
+
+			//restart addon
+			if (!addon->root_od && addon->timeline_ready) {
+				load_associated_media(scene, addon);
+			}
+			//nothing associated, deactivate addon
+			if (!addon_info->external_URL) {
+				scene_reset_addon(addon, 1);
+			} else if (strcmp(addon_info->external_URL, addon->url)) {
+				//reconfigure addon
+				gf_free(addon->url);
+				addon->url = NULL;
+				break;
+			}
+			return;
+		}
+	}
+
+	if (!addon_info->external_URL) {
+		return;
+	}
+
+	if (!addon) {
+		GF_SAFEALLOC(addon, GF_AddonMedia);
+		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;
+
+	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
+		   ) {
+			scene_reset_addon(prev_addon, GF_TRUE);
+			gf_list_rem(scene->declared_addons, i);
+			i--;
+			count--;
+		}
+	}
+
+
+	if (!addon->timeline_ready) {
+		addon->timeline_ready = GF_TRUE;
+		load_associated_media(scene, addon);
+	}
+
+	if (!addon->root_od) return;
+
+	gf_mx_p(addon->root_od->mx);
+	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);
+	}
+	gf_mx_v(addon->root_od->mx);
+}
+
+void gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts)
+{
+	u32 i;
+	GF_ObjectManager*odm;
+	GF_Scene *subscene;
+
+	if (!addon || !addon->loop_detected) return;
+	//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_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);
+
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(subscene->resources, &i))) {
+		gf_odm_play(odm);
+	}
+
+}
+
+Double gf_scene_adjust_time_for_addon(GF_Scene *scene, Double clock_time, GF_AddonMedia *addon, u32 *timestamp_based)
+{
+	Double media_time;
+	if (!addon->timeline_ready)
+		return clock_time;
+	assert(scene->root_od->addon);
+	assert(scene->root_od->addon==addon);
+
+	if (timestamp_based)
+		*timestamp_based = (addon->timeline_id>=0) ? 0 : 1;
+
+	//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;
+}
+
+u64 gf_scene_adjust_timestamp_for_addon(GF_Scene *scene, u64 orig_ts, GF_AddonMedia *addon)
+{
+	s64 media_ts_ms;
+	assert(addon->timeline_ready);
+	assert(scene->root_od->addon);
+	assert(scene->root_od->addon==addon);
+
+	media_ts_ms = orig_ts;
+	media_ts_ms -= (addon->media_timestamp*1000) / addon->media_timescale;
+	media_ts_ms += (addon->media_pts/90);
+
+	return (u64) 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;
+	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/shvc
+		//2- check dependency IDs if any, for now we only do demos with 2 layers hevc/shvc
+	}
+	if (!odm_base) return;
+
+	odm_base->upper_layer_odm = odm;
+	odm->lower_layer_odm = odm_base;
+
+	nalu_annex_b = 1;
+	base_ch = gf_list_get(odm_base->channels, 0);
+	if (base_ch->esd->decoderConfig->decoderSpecificInfo && base_ch->esd->decoderConfig->decoderSpecificInfo->dataLength)
+		nalu_annex_b = 0;
+
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.command_type = GF_NET_CHAN_NALU_MODE;
+	com.nalu_mode.extract_mode = nalu_annex_b ? 1 : 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);
+
+	}
+
+	//signal to the base decoder that we will want full quality
+	caps.CapCode = GF_CODEC_MEDIA_SWITCH_QUALITY;
+	caps.cap.valueInt = 2;
+	odm_base->codec->decio->SetCapabilities(odm_base->codec->decio, caps);
 }

gpac-0.5.0.svn5178.tar.bz2/src/terminal/svg_external.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/svg_external.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -70,7 +70,7 @@
 		}
 		gf_free(url);
 		return the_url;
-	} 
+	}
 	return url;
 }
 
@@ -172,7 +172,7 @@
 	SVGAllAttributes all_atts;
 	XLinkAttributesPointers xlinkp;
 	SMILSyncAttributesPointers syncp;
-	GF_Scene *scene = gf_sg_get_private(gf_node_get_graph(node)); 
+	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);
@@ -201,7 +201,7 @@
 	/*play*/
 	gf_mo_play(new_resource->root_od->mo, 0, -1, 0);
 
-	return new_resource->root_od->mo;	
+	return new_resource->root_od->mo;
 }
 
 void gf_mo_unload_xlink_resource(GF_Node *node, GF_MediaObject *mo)

gpac-0.5.0.svn5178.tar.bz2/src/terminal/term_node_init.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/term_node_init.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -205,23 +205,33 @@
 {
 	GF_Scene *scene = (GF_Scene *)_scene;
 	if (!node || !scene) return;
-	
+
 	switch (gf_node_get_tag(node)) {
 #ifndef GPAC_DISABLE_VRML
 
-	case TAG_MPEG4_Inline: 
+	case TAG_MPEG4_Inline:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline: 
+	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;
+		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;
+	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
@@ -232,15 +242,21 @@
 		break;
 
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_KeySensor: InitKeySensor(scene, node); break;
-	case TAG_X3D_StringSensor: InitStringSensor(scene, node); break;
+	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_TermCap:
+		InitTermCap(scene, node);
+		break;
 
-	case TAG_MPEG4_Storage: 
-		gf_scene_init_storage(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);
@@ -248,18 +264,20 @@
 		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: 
+	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;
+	default:
+		gf_sc_on_node_init(scene->root_od->term->compositor, node);
+		break;
 	}
 }
 
@@ -268,35 +286,37 @@
 	GF_Scene *scene = (GF_Scene *)_is;
 	if (!scene) return;
 	if (!node) {
-		gf_sc_invalidate(scene->root_od->term->compositor, NULL); 
+		gf_sc_invalidate(scene->root_od->term->compositor, NULL);
 		return;
 	}
-	
+
 	switch (gf_node_get_tag(node)) {
 #ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_Inline: 
+	case TAG_MPEG4_Inline:
 #ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline: 
+	case TAG_X3D_Inline:
 #endif
-		gf_inline_on_modified(node); 
+		gf_inline_on_modified(node);
 		break;
-	case TAG_MPEG4_MediaBuffer: 
+	case TAG_MPEG4_MediaBuffer:
 		break;
-	case TAG_MPEG4_MediaControl: 
-		MC_Modified(node); 
+	case TAG_MPEG4_MediaControl:
+		MC_Modified(node);
 		break;
-	case TAG_MPEG4_MediaSensor: 
-		MS_Modified(node); 
+	case TAG_MPEG4_MediaSensor:
+		MS_Modified(node);
 		break;
-	case TAG_MPEG4_InputSensor: 
-		InputSensorModified(node); 
+	case TAG_MPEG4_InputSensor:
+		InputSensorModified(node);
 		break;
-	case TAG_MPEG4_Conditional: 
+	case TAG_MPEG4_Conditional:
 		break;
-	case TAG_MPEG4_Storage: 
+	case TAG_MPEG4_Storage:
 		break;
 #endif
-	default: gf_sc_invalidate(scene->root_od->term->compositor, node); break;
+	default:
+		gf_sc_invalidate(scene->root_od->term->compositor, node);
+		break;
 	}
 }
 
@@ -304,7 +324,7 @@
 {
 	GF_Scene *scene = (GF_Scene *)_is;
 	if (!scene) return;
-	gf_sc_node_destroy(scene->root_od->term->compositor, node, NULL); 
+	gf_sc_node_destroy(scene->root_od->term->compositor, node, NULL);
 }
 
 GF_EXPORT
@@ -332,6 +352,6 @@
 			}
 		}
 	}
-		break;
+	break;
 	}
 }

gpac-0.5.0.svn5178.tar.bz2/src/terminal/terminal.c -> gpac-0.5.1.svn5491.tar.xz/src/terminal/terminal.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -27,6 +27,7 @@
 #include <gpac/internal/terminal_dev.h>
 #include <gpac/internal/compositor_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
+#include <gpac/term_info.h>
 #include <gpac/constants.h>
 #include <gpac/options.h>
 #include <gpac/network.h>
@@ -66,13 +67,36 @@
 	return 1;
 }
 
+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->user->EventProc(term->user->opaque, &evt);
+	} else {
+		gf_term_send_event(term, &evt);
+	}
+}
+
+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(term, term->root_scene->root_od->net_service->url, param->info.msg, param->info.e);
+		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) {
@@ -162,7 +186,7 @@
 			if (ck) {
 				Bool is_paused = ck->Paused;
 				if (is_paused) gf_clock_resume(ck);
-				gf_scene_restart_dynamic(scene, 0);
+				gf_scene_restart_dynamic(scene, 0, 0);
 				if (is_paused) gf_clock_pause(ck);
 			}
 			return 1;
@@ -239,8 +263,8 @@
 	}
 
 	/*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))) {
+	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");
@@ -263,7 +287,7 @@
 		if (sep_lang) {
 			sep_lang[0] = ';';
 			opt = sep_lang+1;
-		} else { 
+		} else {
 			opt = NULL;
 		}
 
@@ -274,7 +298,7 @@
 		}
 
 		sprintf(path, "locales/%s/%s", lan, rel_path);
-		if (term_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path)) 
+		if (term_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path))
 			return 1;
 
 		/*recursively remove region (sub)tags*/
@@ -283,12 +307,12 @@
 			if (!sep) break;
 			sep[0] = 0;
 			sprintf(path, "locales/%s/%s", lan, rel_path);
-			if (term_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path)) 
+			if (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)) 
+	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, "");
@@ -304,7 +328,7 @@
 	s32 prio;
 
 	if (!term) return;
-	
+
 	/*reload term part*/
 
 	sOpt = gf_cfg_get_key(term->user->config, "Systems", "DrawLateFrames");
@@ -314,7 +338,7 @@
 		term->flags &= ~GF_TERM_DROP_LATE_FRAMES;
 
 	sOpt = gf_cfg_get_key(term->user->config, "Systems", "ForceSingleClock");
-	if (sOpt && !stricmp(sOpt, "yes")) 
+	if (sOpt && !stricmp(sOpt, "yes"))
 		term->flags |= GF_TERM_SINGLE_CLOCK;
 	else
 		term->flags &= ~GF_TERM_SINGLE_CLOCK;
@@ -326,7 +350,7 @@
 	}
 	term->frame_duration = atoi(sOpt);
 
-	if (!(term->user->init_flags & GF_TERM_NO_DECODER_THREAD) ){
+	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) {
@@ -350,6 +374,14 @@
 		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");
@@ -363,7 +395,7 @@
 		gf_sg_reload_xml_doc(sOpt, term->dcci_doc);
 	}
 #endif
-	
+
 	gf_term_load_shortcuts(term);
 
 	/*reload compositor config*/
@@ -382,26 +414,22 @@
 }
 
 
-void gf_term_pause_all_clocks(GF_Terminal *term, Bool pause)
-{
-	u32 i, j;
-	GF_ClientService *ns;
-	/*pause all clocks on all services*/
-	i=0;
-	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
-		GF_Clock *ck;
-		j=0;
-		while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
-			if (pause) gf_clock_pause(ck);
-			else gf_clock_resume(ck);
-		}
-	}
-}
-
 static void gf_term_set_play_state(GF_Terminal *term, u32 PlayState, Bool reset_audio, Bool pause_clocks)
 {
+	Bool resume_live = 0;
+
 	/*only play/pause if connected*/
 	if (!term || !term->root_scene) return;
+
+	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);
+		}
+	}
+
 	/*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;
@@ -412,7 +440,7 @@
 	else
 		gf_sc_set_option(term->compositor, GF_OPT_PLAY_STATE, PlayState);
 
-	/* if the current play state in the terminal is the same as the requested play state, we don't touch the clocks 
+	/* if the current play state in the terminal is the same as the requested play state, we don't touch the clocks
 	   in particular, if the request is a step, if the clocks are paused, we leave them paused */
 	if (PlayState==GF_STATE_STEP_PAUSE) {
 		//PlayState = term->play_state ? GF_STATE_PLAYING : GF_STATE_PAUSED;
@@ -423,7 +451,13 @@
 	term->play_state = PlayState;
 
 	if (!pause_clocks) return;
-	gf_term_pause_all_clocks(term, PlayState ? 1 : 0);
+
+	if (PlayState != GF_STATE_PLAYING) {
+		mediacontrol_pause(term->root_scene->root_od);
+	} else {
+		mediacontrol_resume(term->root_scene->root_od, resume_live);
+	}
+
 }
 
 static void gf_term_connect_from_time_ex(GF_Terminal * term, const char *URL, u64 startTime, Bool pause_at_first_frame, Bool secondary_scene, const char *parent_path)
@@ -507,7 +541,7 @@
 		sscanf(opt, "%u", &exp);
 		gf_net_get_ntp(&sec, &frac);
 		if (exp && (exp<sec)) force_delete=1;
-		
+
 		if (force_delete) {
 			if (file) gf_delete_file((char*) opt);
 
@@ -547,7 +581,7 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Creating terminal\n"));
 
 	tmp = (GF_Terminal*)gf_malloc(sizeof(GF_Terminal));
-	if (!tmp){
+	if (!tmp) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate GF_Terminal : OUT OF MEMORY ?\n"));
 		return NULL;
 	}
@@ -641,8 +675,8 @@
 			gf_list_rem(tmp->extensions, i);
 			i--;
 			continue;
-		} 
-		
+		}
+
 		if (ifce->caps & GF_TERM_EXTENSION_NOT_THREADED)
 			gf_list_add(tmp->unthreaded_extensions, ifce);
 	}
@@ -654,7 +688,7 @@
 	}
 	gf_term_lock_media_queue(tmp, 0);
 
-	if (0 == gf_cfg_get_key_count(user->config, "MimeTypes")){
+	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++) {
@@ -662,7 +696,7 @@
 			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){
+				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 {
@@ -717,7 +751,7 @@
 		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"));
 
 	/*unload extensions*/
@@ -764,7 +798,7 @@
 	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);
@@ -792,17 +826,6 @@
 }
 
 
-void gf_term_message(GF_Terminal *term, const char *service, const char *message, GF_Err error)
-{
-	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;
-	gf_term_send_event(term, &evt);
-}
 
 GF_EXPORT
 GF_Err gf_term_step_clocks(GF_Terminal * term, u32 ms_diff)
@@ -868,11 +891,11 @@
 		term->root_scene = NULL;
 	}
 	handle_services = 0;
-	if (term->flags & GF_TERM_NO_DECODER_THREAD) 
+	if (term->flags & GF_TERM_NO_DECODER_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()) 
+	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) ) {
@@ -932,7 +955,7 @@
 		return GF_OK;
 	case GF_OPT_VIDEO_BENCH:
 		term->bench_mode = value;
-		//fallthrough
+	//fallthrough
 	default:
 		return gf_sc_set_option(term->compositor, type, value);
 	}
@@ -979,10 +1002,16 @@
 {
 	if (!term) 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);
-	case GF_OPT_IS_OVER: return gf_term_check_end_of_scene(term, 1);
-	case GF_OPT_PLAY_STATE: 
+	case GF_OPT_HAS_JAVASCRIPT:
+		return gf_sg_has_scripting();
+	case GF_OPT_IS_FINISHED:
+		return gf_term_check_end_of_scene(term, 0);
+	case GF_OPT_IS_OVER:
+		return gf_term_check_end_of_scene(term, 1);
+	case GF_OPT_MAIN_ADDON:
+		return term->root_scene ? term->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;
@@ -991,20 +1020,23 @@
 				ck = term->root_scene->scene_codec->ck;
 				if (!ck) return GF_STATE_PAUSED;
 			}
-			if (ck->Buffering)
-				return GF_STATE_PLAYING;
+//			if (ck->Buffering) return GF_STATE_PLAYING;
 		}
 		if (term->play_state != GF_STATE_PLAYING) return GF_STATE_PAUSED;
 		return GF_STATE_PLAYING;
-	case GF_OPT_MEDIA_CACHE: 
+	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;
-	case GF_OPT_HTTP_MAX_RATE: return gf_dm_get_data_rate(term->downloader);
-	case GF_OPT_VIDEO_BENCH: return term->bench_mode ? GF_TRUE : GF_FALSE;
+	case GF_OPT_CAN_SELECT_STREAMS:
+		return (term->root_scene && term->root_scene->is_dynamic_scene) ? 1 : 0;
+	case GF_OPT_HTTP_MAX_RATE:
+		return gf_dm_get_data_rate(term->downloader);
+	case GF_OPT_VIDEO_BENCH:
+		return term->bench_mode ? GF_TRUE : GF_FALSE;
 
-	default: return gf_sc_get_option(term->compositor, type);
+	default:
+		return gf_sc_get_option(term->compositor, type);
 	}
 }
 
@@ -1040,7 +1072,7 @@
 	/*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;	
+		return;
 
 	term->thread_id_handling_services = gf_th_id();
 
@@ -1057,9 +1089,11 @@
 		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->mo /*&& odm->codec && odm->codec->CB  && (odm->codec->CB->Capacity==1)*/)
 			{
-				if (odm->mo->OD_ID==GF_MEDIA_EXTERNAL_ID) destroy = 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) {
@@ -1084,20 +1118,22 @@
 			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;
 		}
-	
+
 		/*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 
+	/*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);
 
@@ -1109,7 +1145,7 @@
 		}
 
 //		gf_mx_v(term->net_mx);
-		
+
 		gf_free(connect->service_url);
 		if (connect->parent_url) gf_free(connect->parent_url);
 		gf_free(connect);
@@ -1159,7 +1195,7 @@
 	}
 	gf_term_lock_media_queue(term, 0);
 
-	
+
 	/*need to reload*/
 	if (term->reload_state == 1) {
 		term->reload_state = 0;
@@ -1219,7 +1255,7 @@
 	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 
+	we could unload the module while poping its CloseService() call stack which can lead to
 	random crashes (return adresses no longer valid) - cf any "stress mode" playback of a playlist*/
 	gf_term_lock_media_queue(term, 1);
 
@@ -1288,7 +1324,9 @@
 		u32 val;
 		if (ch->service != net) continue;
 
-		media_event->bufferValid = GF_TRUE;
+		if (ch->BufferOn)
+			media_event->bufferValid = GF_TRUE;
+
 		if (ch->BufferTime>0) {
 			if (ch->MaxBuffer) {
 				val = (ch->BufferTime * 100) / ch->MaxBuffer;
@@ -1296,7 +1334,7 @@
 			} else {
 				if (*min_buffer > 100) *min_buffer = 100;
 			}
-			if (*min_time > (u32) ch->BufferTime) 
+			if (*min_time > (u32) ch->BufferTime)
 				*min_time = ch->BufferTime;
 		} else {
 			*min_time = 0;
@@ -1310,7 +1348,6 @@
 {
 #ifndef GPAC_DISABLE_SVG
 	u32 i, count, min_buffer, min_time;
-	GF_DOMMediaEvent media_event;
 	GF_DOM_Event evt;
 	GF_ObjectManager *an_od;
 	GF_Scene *scene;
@@ -1320,12 +1357,11 @@
 		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 (!count
-			&& odm->parentscene 
-			&& odm->parentscene->is_dynamic_scene 
-			&& odm->parentscene->root_od->mo 
-			&& (odm->parentscene->root_od->net_service==odm->net_service)
-		) {
+		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);
 		}
@@ -1338,38 +1374,41 @@
 	}
 
 
-	memset(&media_event, 0, sizeof(GF_DOMMediaEvent));
-	media_event.bufferValid = GF_FALSE;
-	media_event.session_name = odm->net_service->url;
+	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;
 	/*get buffering on root OD*/
-	media_event_collect_info(odm->net_service, scene->root_od, &media_event, &min_time, &min_buffer);
+	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, &media_event, &min_time, &min_buffer);
+			media_event_collect_info(odm->net_service, an_od, &evt.media_event, &min_time, &min_buffer);
 	}
+	gf_mx_v(scene->mx_resources);
 
-	media_event.level = min_buffer;
-	media_event.remaining_time = INT2FIX(min_time) / 60;
-	media_event.status = 0;
-	media_event.loaded_size = loaded_size;
-	media_event.total_size = total_size;
+	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;
 
-	memset(&evt, 0, sizeof(GF_DOM_Event));
-	evt.media_event = &media_event;
 	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 
+	//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) 
+		if (target)
 			gf_sc_queue_dom_event_on_target(scene->root_od->term->compositor, &evt, target, scene->graph);
 	}
 	if (!count) {
@@ -1386,7 +1425,7 @@
 
 /* Browses all registered relocators (ZIP-based, ISOFF-based or file-system-based to relocate a URI based on the locale */
 GF_EXPORT
-Bool gf_term_relocate_url(GF_Terminal *term, const char *service_url, const char *parent_url, char *out_relocated_url, char *out_localized_url) 
+Bool gf_term_relocate_url(GF_Terminal *term, const char *service_url, const char *parent_url, char *out_relocated_url, char *out_localized_url)
 {
 	u32 i, count;
 
@@ -1423,7 +1462,7 @@
 	GF_ClientService *ns;
 	u32 i, count;
 	GF_Err e;
-	Bool reloc_result, net_locked; 
+	Bool reloc_result, net_locked;
 	char relocated_url[GF_MAX_PATH], localized_url[GF_MAX_PATH];
 
 	/*try to relocate the url*/
@@ -1500,7 +1539,7 @@
 				if (ns->owner->OD) break;
 				gf_sleep(5);
 			}
-			
+
 			gf_mx_p(term->net_mx);
 			if (odm->net_service) {
 				gf_mx_v(term->net_mx);
@@ -1518,10 +1557,10 @@
 			return;
 		}
 	}
-	if (net_locked) 
+	if (net_locked)
 		gf_term_lock_net(term, 0);
 
-	odm->net_service = gf_term_service_new(term, odm, serviceURL, reloc_result ? NULL : parent_url, &e);
+	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);
@@ -1597,7 +1636,7 @@
 			pause_at_first_frame = 0;
 	}
 
-	/*for dynamic scene OD ressources are static and all object use the same clock, so don't restart the root 
+	/*for dynamic scene OD 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) {
 
@@ -1608,10 +1647,10 @@
 			gf_term_set_play_state(term, GF_STATE_STEP_PAUSE, 0, 0);
 
 		gf_sc_lock(term->compositor, 1);
-		gf_scene_restart_dynamic(term->root_scene, from_time);
+		gf_scene_restart_dynamic(term->root_scene, from_time, 0);
 		gf_sc_lock(term->compositor, 0);
 		return 2;
-	} 
+	}
 
 	/*pause everything*/
 	gf_term_set_play_state(term, GF_STATE_PAUSED, 0, 1);
@@ -1624,7 +1663,7 @@
 
 	gf_odm_start(term->root_scene->root_od, 0);
 	gf_term_set_play_state(term, GF_STATE_PLAYING, 0, 1);
-	if (pause_at_first_frame) 
+	if (pause_at_first_frame)
 		gf_sc_set_option(term->compositor, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
 	return 2;
 }
@@ -1655,9 +1694,7 @@
 	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;
-	if (!ck->has_seen_eos && ck->last_TS_rendered) return ck->last_TS_rendered;
-	return gf_clock_elapse_time(ck);
+	return gf_clock_media_time(ck);
 }
 
 GF_Node *gf_term_pick_node(GF_Terminal *term, s32 X, s32 Y)
@@ -1673,7 +1710,7 @@
 	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) 
+		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 (!term->reload_url) term->reload_url = gf_strdup(toURL);
 	}
@@ -1737,7 +1774,7 @@
 	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();
@@ -1779,11 +1816,31 @@
 	GF_SceneLoader load;
 
 	if (!term) return GF_BAD_PARAM;
-	
+
 	if (type && (!stricmp(type, "application/ecmascript") || !stricmp(type, "js")) )  {
 		return gf_scene_execute_script(term->root_scene->graph, com);
 	}
 
+	if (!type && com && !strncmp(com, "gpac ", 5)) {
+		com += 5;
+		//new add-on
+		if (term->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);
+			return GF_OK;
+		}
+		//new add-on
+		if (term->root_scene && !strncmp(com, "select ", 7)) {
+			u32 idx = atoi(com+7);
+			gf_term_select_object(term, gf_list_get(term->root_scene->resources, idx));
+			return GF_OK;
+		}
+		return GF_OK;
+	}
+
 	memset(&load, 0, sizeof(GF_SceneLoader));
 	load.localPath = gf_cfg_get_key(term->user->config, "General", "CacheDirectory");
 	load.flags = GF_SM_LOAD_FOR_PLAYBACK | GF_SM_LOAD_CONTEXT_READY;
@@ -1930,7 +1987,7 @@
 Bool gf_term_forward_event(GF_Terminal *term, GF_Event *evt, Bool consumed, Bool forward_only)
 {
 	if (!term) return 0;
-	
+
 	if (term->event_filters) {
 		GF_TermEventFilter *ef;
 		u32 i=0;
@@ -1947,7 +2004,7 @@
 		term->in_event_filter --;
 	}
 
-	if (!forward_only && !consumed && term->user->EventProc) 
+	if (!forward_only && !consumed && term->user->EventProc)
 		return term->user->EventProc(term->user->opaque, evt);
 
 	return 0;
@@ -2038,20 +2095,48 @@
 	u32 i, j;
 	const char *opt;
 	GF_ClientService *ns;
-	if (!speed) return; 
+	Bool restart = 0;
+	u32 scene_time = gf_term_get_time_in_ms(term);
+
+	if (!speed) return;
 
 	/*adjust all clocks on all services*/
 	i=0;
 	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
 		GF_Clock *ck;
+		ns->set_speed = speed;
 		j=0;
 		while ( (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;
 			gf_clock_set_speed(ck, speed);
+
+			if (ns->owner) {
+				gf_odm_set_speed(ns->owner, speed, GF_FALSE);
+				if (ns->owner->subscene) {
+					u32 k=0;
+					GF_ObjectManager *odm;
+					GF_Scene *scene = ns->owner->subscene;
+					while ( (odm = gf_list_enum(scene->resources, &k))) {
+						gf_odm_set_speed(odm, speed, GF_FALSE);
+					}
+				}
+			}
 		}
 	}
 
+	if (restart) {
+		if (term->root_scene->is_dynamic_scene) {
+			gf_scene_restart_dynamic(term->root_scene, scene_time, 0);
+		} else {
+		}
+	}
+
+	if (speed<0)
+		speed = -speed;
+
 	opt = gf_cfg_get_key(term->user->config, "Systems", "TimeSlice");
-	if (!opt) opt="30";	
+	if (!opt) opt="30";
 	i = (u32) ( atoi(opt) / FIX2FLT(speed) );
 	if (!i) i = 1;
 	term->frame_duration = i;
@@ -2072,7 +2157,7 @@
 		u8 mod = 0;
 		if (ev->key.flags & GF_KEY_MOD_CTRL) mod |= GF_KEY_MOD_CTRL;
 		if (ev->key.flags & GF_KEY_MOD_ALT) mod |= GF_KEY_MOD_ALT;
-	
+
 		for (i=0; i<MAX_SHORTCUTS; i++) {
 			u32 val;
 			if (!term->shortcuts[i].code) break;
@@ -2132,7 +2217,7 @@
 			case GF_ACTION_VERY_FAST_REWIND:
 			case GF_ACTION_FAST_REWIND:
 			case GF_ACTION_SLOW_REWIND:
-				if (term->root_scene && !(term->root_scene->root_od->flags & GF_ODM_NO_TIME_CTRL) ) {
+				if (0 && term->root_scene && !(term->root_scene->root_od->flags & GF_ODM_NO_TIME_CTRL) ) {
 					s32 res;
 					u32 dur = (u32) term->root_scene->duration ;
 					val  = gf_term_get_time_in_ms(term);
@@ -2277,11 +2362,12 @@
 	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 = scene->root_od->net_service;
 		root_service->ifce->ServiceCommand(root_service->ifce, &net_cmd);
 	}
 
@@ -2293,9 +2379,9 @@
 	}
 	i=0;
 	while (NULL != (odm = gf_list_enum(scene->resources, &i))) {
-		if (odm->codec) 
+		if (odm->codec)
 			odm->codec->decio->SetCapabilities(odm->codec->decio, caps);
-		if (odm->net_service && (odm->net_service != root_service) )
+		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);

gpac-0.5.0.svn5178.tar.bz2/src/utils/alloc.c -> gpac-0.5.1.svn5491.tar.xz/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-20XX
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -73,7 +73,7 @@
 #endif
 
 #if (USE_MALLOC==INTEL_MALLOC)
-#define CDECL	
+#define CDECL
 CDECL void * scalable_malloc(size_t size);
 CDECL void * scalable_realloc(void* ptr, size_t size);
 CDECL void * scalable_calloc(size_t num, size_t size);
@@ -91,8 +91,8 @@
 
 #endif
 
-#ifndef CDECL	
-#define CDECL	
+#ifndef CDECL
+#define CDECL
 #endif
 
 #ifndef SYMBOL_EXPORT
@@ -317,25 +317,25 @@
 	return gf_mem_calloc_proto(num, size_of, filename, line);
 }
 
-MY_GF_EXPORT 
+MY_GF_EXPORT
 void *gf_mem_realloc(void *ptr, size_t size, char *filename, int line)
 {
 	return gf_mem_realloc_proto(ptr, size, filename, line);
 }
 
-MY_GF_EXPORT 
+MY_GF_EXPORT
 void gf_mem_free(void *ptr, char *filename, int line)
 {
 	gf_mem_free_proto(ptr, filename, line);
 }
 
-MY_GF_EXPORT 
+MY_GF_EXPORT
 char *gf_mem_strdup(const char *str, char *filename, int line)
 {
 	return gf_mem_strdup_proto(str, filename, line);
 }
 
-MY_GF_EXPORT 
+MY_GF_EXPORT
 void gf_mem_enable_tracker()
 {
 	gf_mem_malloc_proto = gf_mem_malloc_tracker;
@@ -548,7 +548,7 @@
 	/*update stats*/
 	gpac_allocated_memory += size;
 	gpac_nb_alloc_blocs++;
-	
+
 	/*gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] register   %6d bytes at %p (%8d Bytes in %4d Blocks allocated)\n", size, ptr, gpac_allocated_memory, gpac_nb_alloc_blocs);*/
 
 	/*unlock*/
@@ -759,7 +759,7 @@
 	size = gf_vasprintf(strp, fmt, args);
 #else
 	size = asprintf(strp, fmt, args);
-#endif	
+#endif
 	va_end(args);
 	return size;
 }

gpac-0.5.0.svn5178.tar.bz2/src/utils/base_encoding.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/base_encoding.c Changed

@@ -11,21 +11,23 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #include <gpac/base_coding.h>
 #include <gpac/constants.h>
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 static const char base_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 GF_EXPORT
@@ -35,7 +37,7 @@
 	u32 i = 0, j = 0;
 	unsigned char *in = (unsigned char *)_in;
 	unsigned char *out = (unsigned char *)_out;
-	
+
 	if (outSize < (inSize * 4 / 3)) return 0;
 
 	while (i < inSize) {
@@ -50,7 +52,7 @@
 			out[j+1] = base_64[((in[i] & 0x03) << 4) | ((in[i+1] & 0xf0) >> 4)];
 			out[j+2] = base_64[(in[i+1] & 0x0f) << 2];
 			out[j+3] = '=';
-		} else{
+		} else {
 			out[j] = base_64[in[i]>>2];
 			out[j+1] = base_64[((in[i] & 0x03) << 4) | ((in[i+1] & 0xf0) >> 4)];
 			out[j+2] = base_64[((in[i+1] & 0x0f) << 2) | ((in[i+2] & 0xc0) >> 6)];
@@ -63,37 +65,40 @@
 }
 
 static const unsigned char index_64[128] = {
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,   62, 0xff, 0xff, 0xff,   63,
-      52,   53,   54,   55,   56,   57,   58,   59,   60,   61, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff,    0,    1,    2,    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,
-      15,   16,   17,   18,   19,   20,   21,   22,   23,   24,   25, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff,   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
-      41,   42,   43,   44,   45,   46,   47,   48,   49,   50,   51, 0xff, 0xff, 0xff, 0xff, 0xff
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,   62, 0xff, 0xff, 0xff,   63,
+	52,   53,   54,   55,   56,   57,   58,   59,   60,   61, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff,    0,    1,    2,    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,
+	15,   16,   17,   18,   19,   20,   21,   22,   23,   24,   25, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff,   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
+	41,   42,   43,   44,   45,   46,   47,   48,   49,   50,   51, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
 #define char64(c)  ((c > 127) ? (char) 0xff : index_64[(c)])
 
 /*denoise input*/
-u32 load_block(char *in, u32 size, u32 pos, char *out) 
-{ 
-	u32 i, len; 
+u32 load_block(char *in, u32 size, u32 pos, char *out)
+{
+	u32 i, len;
 	u8 c;
 	len = i = 0;
 	while ((len<4) && ((pos+i)<size)) {
 		c = in[pos+i];
 		if ( ((c>='A') && (c<='Z'))
-		|| ((c>='a') && (c<='z'))
-		|| ((c>='0') && (c<='9'))
-		|| (c=='=') || (c=='+') || (c=='/')
-		) {
+		        || ((c>='a') && (c<='z'))
+		        || ((c>='0') && (c<='9'))
+		        || (c=='=') || (c=='+') || (c=='/')
+		   ) {
 			out[len] = c;
 			len++;
 		}
 		i++;
 	}
-	while (len<4) { out[len] = (char) 0xFF; len++; }
+	while (len<4) {
+		out[len] = (char) 0xFF;
+		len++;
+	}
 	return pos+i;
 }
 
@@ -108,13 +113,13 @@
 	while ((i + 3) < inSize) {
 		padding = 0;
 		i = load_block(in_buf, inSize, i, (char*)in);
-		c[0] = char64(in[0]); 
+		c[0] = char64(in[0]);
 		padding += (c[0] == 0xff);
 		c[1] = char64(in[1]);
 		padding += (c[1] == 0xff);
 		c[2] = char64(in[2]);
 		padding += (c[2] == 0xff);
-		c[3] = char64(in[3]); 
+		c[3] = char64(in[3]);
 		padding += (c[3] == 0xff);
 		if (padding == 2) {
 			out[j++] = (c[0] << 2) | ((c[1] & 0x30) >> 4);
@@ -144,12 +149,12 @@
 
 	if (outSize < (inSize * 2)+1) return 0;
 
-	for (i=0;i<inSize;i++) {
+	for (i=0; i<inSize; i++) {
 		out[2*i] = base_16[((in[i] & 0xf0) >> 4)];
-		out[2*i+1] = base_16[(in[i] & 0x0f)];	
+		out[2*i+1] = base_16[(in[i] & 0x0f)];
 	}
 	out[(inSize * 2)] = 0;
-	
+
 	return i;
 }
 
@@ -163,14 +168,14 @@
 
 	if (outSize < (inSize / 2)) return 0;
 	if ((inSize % 2) != 0) return 0;
-	
-	for (j=0;j<inSize/2;j++) {
+
+	for (j=0; j<inSize/2; j++) {
 		c[0] = char16(in[2*j]);
 		c[1] = char16(in[2*j+1]);
 		out[j] = ((c[0] << 4)&0xf0) | (c[1]&0x0f);
 	}
 	out[inSize/2] = 0;
-	
+
 	return j;
 }
 
@@ -184,44 +189,44 @@
 GF_EXPORT
 GF_Err gf_gz_compress_payload(char **data, u32 data_len, u32 *max_size)
 {
-    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_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);
-    if (err != Z_OK) {
+	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_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);
+	if (err != Z_OK) {
 		gf_free(dest);
 		return GF_IO_ERR;
-    }
+	}
 
-    err = deflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        deflateEnd(&stream);
+	err = deflate(&stream, Z_FINISH);
+	if (err != Z_STREAM_END) {
+		deflateEnd(&stream);
 		gf_free(dest);
-        return GF_IO_ERR;
-    }
-    if (data_len <stream.total_out) {
+		return GF_IO_ERR;
+	}
+	if (data_len <stream.total_out) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[GZ] compressed data (%d) larger than input (%d)\n", (u32) stream.total_out, (u32) data_len ));
-    }
+	}
 
-    if (*max_size < stream.total_out) {
+	if (*max_size < stream.total_out) {
 		*max_size = data_len*ZLIB_COMPRESS_SAFE;
 		*data = gf_realloc(*data, *max_size * sizeof(char));
-    } 
+	}
 
-    memcpy((*data) , dest, sizeof(char)*stream.total_out);
-    *max_size = stream.total_out;
-    gf_free(dest);
+	memcpy((*data) , dest, sizeof(char)*stream.total_out);
+	*max_size = stream.total_out;
+	gf_free(dest);
 
-    deflateEnd(&stream);
-    return GF_OK;
+	deflateEnd(&stream);
+	return GF_OK;
 }
 
 GF_EXPORT
@@ -271,3 +276,5 @@
 }
 
 #endif /*GPAC_DISABLE_ZLIB*/
+
+#endif /* GPAC_DISABLE_CORE_TOOLS*/

gpac-0.5.0.svn5178.tar.bz2/src/utils/bitstream.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/bitstream.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -210,7 +210,7 @@
 		}
 		return (u32) bs->original[bs->position++];
 	}
-	if (bs->buffer_io) 
+	if (bs->buffer_io)
 		bs_flush_cache(bs);
 
 	/*we are in FILE mode, test for end of file*/
@@ -232,9 +232,9 @@
 GF_EXPORT
 u8 gf_bs_read_bit(GF_BitStream *bs)
 {
-	if (bs->nbBits == 8) {	
+	if (bs->nbBits == 8) {
 		bs->current = BS_ReadByte(bs);
-	 	bs->nbBits = 0;
+		bs->nbBits = 0;
 	}
 #ifdef NO_OPTS
 	{
@@ -258,7 +258,7 @@
 #ifndef NO_OPTS
 	if (nBits + bs->nbBits <= 8) {
 		bs->nbBits += nBits;
-        ret = (bs->current >> (8 - bs->nbBits) ) & bits_mask[nBits];
+		ret = (bs->current >> (8 - bs->nbBits) ) & bits_mask[nBits];
 		return ret;
 	}
 #endif
@@ -278,14 +278,14 @@
 }
 
 GF_EXPORT
-u32 gf_bs_read_u8_until_delimiter(GF_BitStream *bs, u8 delimiter, u8* out, u32 max_length){
+u32 gf_bs_read_u8_until_delimiter(GF_BitStream *bs, u8 delimiter, u8* out, u32 max_length) {
 	u32 i = 0;
 	char token;
 	u64 cur_pos = gf_bs_get_position(bs);
 
 	if (!max_length) out = NULL;
 
-	while(gf_bs_available(bs) && (!max_length || i < max_length)){
+	while(gf_bs_available(bs) && (!max_length || i < max_length)) {
 		gf_bs_read_data(bs, &token, 1);
 		if (token == delimiter) goto found;
 		if (out) out[i] = token;
@@ -305,7 +305,8 @@
 {
 	u32 ret;
 	assert(bs->nbBits==8);
-	ret = BS_ReadByte(bs); ret<<=8;
+	ret = BS_ReadByte(bs);
+	ret<<=8;
 	ret |= BS_ReadByte(bs);
 	return ret;
 }
@@ -316,8 +317,10 @@
 {
 	u32 ret;
 	assert(bs->nbBits==8);
-	ret = BS_ReadByte(bs); ret<<=8;
-	ret |= BS_ReadByte(bs); ret<<=8;
+	ret = BS_ReadByte(bs);
+	ret<<=8;
+	ret |= BS_ReadByte(bs);
+	ret<<=8;
 	ret |= BS_ReadByte(bs);
 	return ret;
 }
@@ -327,9 +330,12 @@
 {
 	u32 ret;
 	assert(bs->nbBits==8);
-	ret = BS_ReadByte(bs); ret<<=8;
-	ret |= BS_ReadByte(bs); ret<<=8;
-	ret |= BS_ReadByte(bs); ret<<=8;
+	ret = BS_ReadByte(bs);
+	ret<<=8;
+	ret |= BS_ReadByte(bs);
+	ret<<=8;
+	ret |= BS_ReadByte(bs);
+	ret<<=8;
 	ret |= BS_ReadByte(bs);
 	return ret;
 }
@@ -338,7 +344,8 @@
 u64 gf_bs_read_u64(GF_BitStream *bs)
 {
 	u64 ret;
-	ret = gf_bs_read_u32(bs); ret<<=32;
+	ret = gf_bs_read_u32(bs);
+	ret<<=32;
 	ret |= gf_bs_read_u32(bs);
 	return ret;
 }
@@ -362,7 +369,7 @@
 
 GF_EXPORT
 Float gf_bs_read_float(GF_BitStream *bs)
-{	
+{
 	char buf [4] = "\0\0\0";
 #ifdef NO_OPTS
 	s32 i;
@@ -404,7 +411,7 @@
 			return nbBytes;
 		case GF_BITSTREAM_FILE_READ:
 		case GF_BITSTREAM_FILE_WRITE:
-			if (bs->buffer_io) 
+			if (bs->buffer_io)
 				bs_flush_cache(bs);
 			nbBytes = (u32) fread(data, 1, nbBytes, bs->stream);
 			bs->position += nbBytes;
@@ -554,7 +561,7 @@
 
 	switch (bs->bsmode) {
 	case GF_BITSTREAM_WRITE:
-		if (bs->position + repeat_count > bs->size) 
+		if (bs->position + repeat_count > bs->size)
 			return 0;
 		memset(bs->original + bs->position, byte, repeat_count);
 		bs->position += repeat_count;
@@ -565,12 +572,12 @@
 			u32 new_size = (u32) (bs->size*2);
 			if (!new_size) new_size = BS_MEM_BLOCK_ALLOC_SIZE;
 
-			if (bs->size + repeat_count > 0xFFFFFFFF) 
+			if (bs->size + repeat_count > 0xFFFFFFFF)
 				return 0;
 			while (new_size < (u32) ( bs->size + repeat_count))
 				new_size *= 2;
 			bs->original = (char*)gf_realloc(bs->original, sizeof(u32)*new_size);
-			if (!bs->original) 
+			if (!bs->original)
 				return 0;
 			bs->size = new_size;
 		}
@@ -631,7 +638,7 @@
 	if (BS_IsAlign(bs)) {
 		switch (bs->bsmode) {
 		case GF_BITSTREAM_WRITE:
-			if (bs->position+nbBytes > bs->size) 
+			if (bs->position+nbBytes > bs->size)
 				return 0;
 			memcpy(bs->original + bs->position, data, nbBytes);
 			bs->position += nbBytes;
@@ -641,14 +648,14 @@
 			if (bs->position+nbBytes > bs->size) {
 				u32 new_size = (u32) (bs->size*2);
 				if (!new_size) new_size = BS_MEM_BLOCK_ALLOC_SIZE;
-				
-				if (bs->size + nbBytes > 0xFFFFFFFF) 
+
+				if (bs->size + nbBytes > 0xFFFFFFFF)
 					return 0;
 
 				while (new_size < (u32) ( bs->size + nbBytes))
 					new_size *= 2;
 				bs->original = (char*)gf_realloc(bs->original, sizeof(u32)*new_size);
-				if (!bs->original) 
+				if (!bs->original)
 					return 0;
 				bs->size = new_size;
 			}
@@ -712,9 +719,9 @@
 	s64 cur, end;
 
 	/*in WRITE mode only, this should not be called, but return something big in case ...*/
-	if ( (bs->bsmode == GF_BITSTREAM_WRITE) 
-		|| (bs->bsmode == GF_BITSTREAM_WRITE_DYN) 
-		)
+	if ( (bs->bsmode == GF_BITSTREAM_WRITE)
+	        || (bs->bsmode == GF_BITSTREAM_WRITE_DYN)
+	   )
 		return (u64) -1;
 
 	/*we are in MEM mode*/
@@ -733,16 +740,16 @@
 	cur = gf_f64_tell(bs->stream);
 	gf_f64_seek(bs->stream, 0, SEEK_END);
 	end = gf_f64_tell(bs->stream);
-	gf_f64_seek(bs->stream, cur, SEEK_SET);	
+	gf_f64_seek(bs->stream, cur, SEEK_SET);
 	return (u64) (end - cur);
 }
 
-/*call this funct to set the buffer size to the nb of bytes written 
+/*call this funct to set the buffer size to the nb of bytes written
 Used only in WRITE mode, as we don't know the real size during allocation...
 return -1 for bad param or gf_malloc failed
 return nbBytes cut*/
 static s32 BS_CutBuffer(GF_BitStream *bs)
-{	
+{
 	s32 nbBytes;
 	if ( (bs->bsmode != GF_BITSTREAM_WRITE_DYN) && (bs->bsmode != GF_BITSTREAM_WRITE)) return (u32) -1;
 	/*Align our buffer or we're dead!*/
@@ -750,10 +757,10 @@
 
 	nbBytes = (u32) (bs->size - bs->position);
 	if (!nbBytes || (nbBytes == 0xFFFFFFFF) || (bs->position >= 0xFFFFFFFF)) return 0;
-/*
-	bs->original = (char*)gf_realloc(bs->original, (u32) bs->position);
-	if (! bs->original) return (u32) -1;
-*/
+	/*
+		bs->original = (char*)gf_realloc(bs->original, (u32) bs->position);
+		if (! bs->original) return (u32) -1;
+	*/
 	/*just in case, re-adjust..*/
 	bs->size = bs->position;
 	return nbBytes;
@@ -771,10 +778,10 @@
 		gf_free(bs->original);
 	} else {
 		s32 copy = BS_CutBuffer(bs);
-		if (copy < 0){
-		  *output = NULL;
+		if (copy < 0) {
+			*output = NULL;
 		} else
-		  *output = bs->original;
+			*output = bs->original;
 		*outSize = (u32) bs->size;
 	}
 	bs->original = NULL;
@@ -782,7 +789,7 @@
 	bs->position = 0;
 }
 
-/*	Skip nbytes. 
+/*	Skip nbytes.
 	Align
 	If READ (MEM or FILE) mode, just read n times 8 bit
 	If WRITE (MEM or FILE) mode, write n times 0 on 8 bit
@@ -793,7 +800,7 @@
 	if (!bs || !nbBytes) return;
 
 	gf_bs_align(bs);
-	
+
 	/*special case for file skipping...*/
 	if ((bs->bsmode == GF_BITSTREAM_FILE_WRITE) || (bs->bsmode == GF_BITSTREAM_FILE_READ)) {
 		if (bs->buffer_io)
@@ -965,9 +972,15 @@
 {
 	u32 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<<=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;
 	return ret;
 }
 
@@ -976,7 +989,9 @@
 {
 	u32 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<<=8;
+	ret |= v;
 	return ret;
 }

gpac-0.5.0.svn5178.tar.bz2/src/utils/cache.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/cache.c Changed

@@ -23,6 +23,8 @@
 *
 */
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 #include <gpac/cache.h>
 #include <gpac/network.h>
 #include <gpac/download.h>
@@ -169,7 +171,7 @@
 	u8 *mem_storage;
 };
 
-Bool delete_cache_files(void *cbck, char *item_name, char *item_path) {
+Bool delete_cache_files(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info) {
 	const char * startPattern;
 	int sz;
 	assert( cbck );
@@ -382,14 +384,14 @@
 	DownloadedCacheEntry entry = NULL;
 	if ( !dm || !url || !cache_directory) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
-			("[CACHE] gf_cache_create_entry :%d, dm=%p, url=%s cache_directory=%s, aborting.\n", __LINE__, dm, url, cache_directory));
+		       ("[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,
-			("[CACHE] gf_cache_create_entry:%d : ERROR, URL is too long (%d chars), more than %d chars.\n", __LINE__, sz, _CACHE_TMP_SIZE ));
+		       ("[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;
 	}
 	tmp[0] = '\0';
@@ -470,7 +472,7 @@
 
 	if (entry->memory_stored) {
 		sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
-		return entry;	
+		return entry;
 	}
 
 
@@ -557,7 +559,7 @@
 	assert( sess == entry->write_session );
 	if (entry->writeFilePtr) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK,
-			("[CACHE] Closing file %s, %d bytes written.\n", entry->cache_filename, entry->written_in_cache));
+		       ("[CACHE] Closing file %s, %d bytes written.\n", entry->cache_filename, entry->written_in_cache));
 		if (fflush( entry->writeFilePtr ) || fclose( entry->writeFilePtr ))
 			e = GF_IO_ERR;
 		e|= gf_cache_flush_disk_cache(entry);
@@ -619,7 +621,7 @@
 	entry->writeFilePtr = gf_f64_open(entry->cache_filename, entry->continue_file ? "a+b" : "wb");
 	if (!entry->writeFilePtr) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK,
-			("[CACHE] Error while opening cache file %s for writting.\n", entry->cache_filename));
+		       ("[CACHE] Error while opening cache file %s for writting.\n", entry->cache_filename));
 		entry->write_session = NULL;
 #ifdef ENABLE_WRITE_MX
 		gf_mx_v(entry->write_mutex);
@@ -640,7 +642,7 @@
 		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));
 		return GF_BAD_PARAM;
 	}
-		
+
 	if (entry->memory_stored) {
 		if (entry->written_in_cache + size > entry->mem_allocated) {
 			u32 new_size = MAX(entry->mem_allocated*2, entry->written_in_cache + size);
@@ -664,14 +666,14 @@
 	if (read != size) {
 		/* Something bad happened */
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
-			("[CACHE] Error while writting %d bytes of data to cache : has written only %d bytes.", size, read));
+		       ("[CACHE] Error while writting %d bytes of data to cache : has written only %d bytes.", size, read));
 		gf_cache_close_write_cache(entry, sess, 0);
 		gf_delete_file(entry->cache_filename);
 		return GF_IO_ERR;
 	}
 	if (fflush(entry->writeFilePtr)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
-			("[CACHE] Error while flushing data bytes to cache file : %s.", entry->cache_filename));
+		       ("[CACHE] Error while flushing data bytes to cache file : %s.", entry->cache_filename));
 		gf_cache_close_write_cache(entry, sess, 0);
 		gf_delete_file(entry->cache_filename);
 		return GF_IO_ERR;
@@ -789,7 +791,7 @@
 		gf_free ( entry->mimeType );
 		entry->mimeType = NULL;
 	}
-	if (entry->mem_storage) { 
+	if (entry->mem_storage) {
 		gf_free(entry->mem_storage);
 	}
 
@@ -869,7 +871,7 @@
 		/* OK, this is not optimal to close it since we are in a mutex,
 		* but we don't want to risk to have another session opening
 		* a not fully closed cache entry */
-		if (entry->writeFilePtr){
+		if (entry->writeFilePtr) {
 			if (fclose(entry->writeFilePtr)) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] gf_cache_remove_session_from_cache_entry:%d, Failed to properly fclose cache file '%s' of url '%s', cache may be corrupted !\n", __LINE__, entry->cache_filename, entry->url));
 			}
@@ -907,7 +909,7 @@
 	return count + 1;
 }
 
-FILE *gf_cache_get_file_pointer(const DownloadedCacheEntry entry) 
+FILE *gf_cache_get_file_pointer(const DownloadedCacheEntry entry)
 {
 	if (entry) return entry->writeFilePtr;
 	return NULL;
@@ -925,7 +927,9 @@
 {
 	if (!entry) return 0;
 	if (entry->writeFilePtr) return 1;
-	if (entry->mem_storage && entry->written_in_cache && entry->contentLength && (entry->written_in_cache<entry->contentLength) ) 
+	if (entry->mem_storage && entry->written_in_cache && entry->contentLength && (entry->written_in_cache<entry->contentLength) )
 		return 1;
 	return 0;
 }
+
+#endif

gpac-0.5.0.svn5178.tar.bz2/src/utils/color.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/color.c Changed

@@ -202,7 +202,7 @@
 
 
 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)
+                               s32 y_stride, s32 uv_stride, s32 width)
 {
 	u32 hw, x;
 	unsigned char *dst2 = dst + dststride;
@@ -277,7 +277,10 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 		}
 		if (a) *dst = GF_COL_555(r, g, b);
@@ -296,7 +299,10 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 		}
 		if (a) *dst = GF_COL_565(r, g, b);
@@ -315,10 +321,17 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 		}
-		if (a) { dst[0] = r; dst[1] = g; dst[2] = b; }
+		if (a) {
+			dst[0] = r;
+			dst[1] = g;
+			dst[2] = b;
+		}
 		dst += x_pitch;
 		pos += h_inc;
 		dst_w--;
@@ -333,10 +346,17 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 		}
-		if (a) { dst[0] = b; dst[1] = g; dst[2] = r; }
+		if (a) {
+			dst[0] = b;
+			dst[1] = g;
+			dst[2] = r;
+		}
 		dst += x_pitch;
 		pos += h_inc;
 		dst_w--;
@@ -350,7 +370,10 @@
 
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 		}
 		if (a) {
@@ -372,7 +395,10 @@
 
 	while ( dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 		}
 		if (a) {
@@ -394,7 +420,10 @@
 
 	while ( dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 		}
 		dst[0] = r;
@@ -418,7 +447,10 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 			a = mul255(a, alpha);
 		}
@@ -447,7 +479,10 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 			a = mul255(a, alpha);
 		}
@@ -476,12 +511,17 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 			a = mul255(a, alpha);
 		}
 		if (a) {
-			_r = dst[0]; _g = dst[0]; _b = dst[0];
+			_r = dst[0];
+			_g = dst[0];
+			_b = dst[0];
 			dst[0] = mul255(a, r - _r) + _r;
 			dst[1] = mul255(a, g - _g) + _g;
 			dst[2] = mul255(a, b - _b) + _b;
@@ -500,14 +540,17 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 		}
 
 		if (a && alpha) {
 			_b = dst[0];
 			_g = dst[1];
-			_r = dst[2]; 
+			_r = dst[2];
 			a = mul255(a, alpha);
 			dst[0] = mul255(a, b - _b) + _b;
 			dst[1] = mul255(a, g - _g) + _g;
@@ -528,7 +571,10 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			a = mul255(a, alpha);
 			pos -= 0x10000L;
 		}
@@ -541,7 +587,7 @@
 			_r = mul255(a, r - _r) + _r;
 			_g = mul255(a, g - _g) + _g;
 			_b = mul255(a, b - _b) + _b;
-			
+
 			dst[0] = _b;
 			dst[1] = _g;
 			dst[2] = _r;
@@ -561,7 +607,10 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			a = mul255(a, alpha);
 			pos -= 0x10000L;
 		}
@@ -593,7 +642,10 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 			a = mul255(a, alpha);
 		}
@@ -631,7 +683,10 @@
 	pos = 0x10000;
 	while (dst_w) {
 		while ( pos >= 0x10000L ) {
-			r = *src++; g = *src++; b = *src++; a = *src++;
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
 			pos -= 0x10000L;
 			a = mul255(a, alpha);
 		}
@@ -687,8 +742,8 @@
 
 static GFINLINE u8 colmask(s32 a, s32 n)
 {
-    s32 mask = (1 << n) - 1;
-    return (u8) (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
+	s32 mask = (1 << n) - 1;
+	return (u8) (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
 }
 
 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)
@@ -908,7 +963,7 @@
 			b = 262143;
 
 		*((u32*)dst_bits) = 0xff000000 | ((b << 6) & 0xff0000)
-					| ((g >> 2) & 0xff00) | ((r >> 10) & 0xff);
+		                    | ((g >> 2) & 0xff00) | ((r >> 10) & 0xff);
 		dst_bits+=4;
 	}
 }
@@ -1134,9 +1189,12 @@
 							for (i=0; i<2*src_w; i++) {
 								u32 idx = 4*i;
 								s32 thres, v;
-								v = tmp[idx]-kr; thres = ABS(v);
-								v = tmp[idx+1]-kg; thres += ABS(v);
-								v = tmp[idx+2]-kb; thres += ABS(v);
+								v = tmp[idx]-kr;
+								thres = ABS(v);
+								v = tmp[idx+1]-kg;
+								thres += ABS(v);
+								v = tmp[idx+2]-kb;
+								thres += ABS(v);
 								thres/=3;
 #ifdef COLORKEY_MPEG4_STRICT
 								if (thres < kl) tmp[idx+3] = 0;
@@ -1171,9 +1229,12 @@
 						for (i=0; i<2*src_w; i++) {
 							u32 idx = 4*i;
 							s32 thres, v;
-							v = tmp[idx]-kr; thres = ABS(v);
-							v = tmp[idx+1]-kg; thres += ABS(v);
-							v = tmp[idx+2]-kb; thres += ABS(v);
+							v = tmp[idx]-kr;
+							thres = ABS(v);
+							v = tmp[idx+1]-kg;
+							thres += ABS(v);
+							v = tmp[idx+2]-kb;
+							thres += ABS(v);
 							thres/=3;
 #ifdef COLORKEY_MPEG4_STRICT
 							if (thres < kl) tmp[idx+3] = 0;
@@ -1199,9 +1260,12 @@
 					for (i=0; i<src_w; i++) {
 						u32 idx = 4*i;
 						s32 thres, v;
-						v = tmp[idx]-kr; thres = ABS(v);
-						v = tmp[idx+1]-kg; thres += ABS(v);
-						v = tmp[idx+2]-kb; thres += ABS(v);
+						v = tmp[idx]-kr;
+						thres = ABS(v);
+						v = tmp[idx+1]-kg;
+						thres += ABS(v);
+						v = tmp[idx+2]-kb;
+						thres += ABS(v);
 						thres/=3;
 #ifdef COLORKEY_MPEG4_STRICT
 						if (thres < kl) tmp[idx+3] = 0;
@@ -1275,16 +1339,32 @@
 
 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,
-				 Fixed c11, Fixed c12, Fixed c13, Fixed c14, Fixed c15,
-				 Fixed c16, Fixed c17, Fixed c18, Fixed c19, Fixed c20)
+                Fixed c1, Fixed c2, Fixed c3, Fixed c4, Fixed c5,
+                Fixed c6, Fixed c7, Fixed c8, Fixed c9, Fixed c10,
+                Fixed c11, Fixed c12, Fixed c13, Fixed c14, Fixed c15,
+                Fixed c16, Fixed c17, Fixed c18, Fixed c19, Fixed c20)
 {
 	if (!_this) return;
-	_this->m[0] = c1; _this->m[1] = c2; _this->m[2] = c3; _this->m[3] = c4; _this->m[4] = c5;
-	_this->m[5] = c6; _this->m[6] = c7; _this->m[7] = c8; _this->m[8] = c9; _this->m[9] = c10;
-	_this->m[10] = c11; _this->m[11] = c12; _this->m[12] = c13; _this->m[13] = c14; _this->m[14] = c15;
-	_this->m[15] = c16; _this->m[16] = c17; _this->m[17] = c18; _this->m[18] = c19; _this->m[19] = c20;
+	_this->m[0] = c1;
+	_this->m[1] = c2;
+	_this->m[2] = c3;
+	_this->m[3] = c4;
+	_this->m[4] = c5;
+	_this->m[5] = c6;
+	_this->m[6] = c7;
+	_this->m[7] = c8;
+	_this->m[8] = c9;
+	_this->m[9] = c10;
+	_this->m[10] = c11;
+	_this->m[11] = c12;
+	_this->m[12] = c13;
+	_this->m[13] = c14;
+	_this->m[14] = c15;
+	_this->m[15] = c16;
+	_this->m[16] = c17;
+	_this->m[17] = c18;
+	_this->m[18] = c19;
+	_this->m[19] = c20;
 	gf_cmx_identity(_this);
 }
 
@@ -1367,10 +1447,14 @@
 	Fixed _a, _r, _g, _b, a, r, g, b;
 	if (!_this || _this->identity) return col;
 
-	a = INT2FIX(col>>24); a /= 255;
-	r = INT2FIX((col>>16)&0xFF); r /= 255;
-	g = INT2FIX((col>>8)&0xFF); g /= 255;
-	b = INT2FIX((col)&0xFF); b /= 255;
+	a = INT2FIX(col>>24);
+	a /= 255;
+	r = INT2FIX((col>>16)&0xFF);
+	r /= 255;
+	g = INT2FIX((col>>8)&0xFF);
+	g /= 255;
+	b = INT2FIX((col)&0xFF);
+	b /= 255;
 	_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];
@@ -1407,7 +1491,7 @@
 
 #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)
+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)
 {
 	u32 i, j, w, h;
 	if (!pU) {
@@ -1428,23 +1512,30 @@
 		h = src_height;
 	}
 
+	if (swap_uv) {
+		u8 *t = pV;
+		pV = pU;
+		pU = t;
+	}
+
+
 	if (vs_dst->pixel_format == GF_PIXEL_YV12) {
 		__m128i val1, val2, val_dst, *src1, *src2, *dst;
 		for (i=0; i<h; i++) {
 			src1 = (__m128i *)(pY + i*src_stride);
 			src2 = src1+1;
 			dst = (__m128i *)(vs_dst->video_buffer + i*vs_dst->pitch_y);
-			
+
 			for (j=0; j<w/16; j++, src1+=2, src2+=2, dst++) {
 				val1 = _mm_load_si128(src1);
-				val1 = _mm_srli_epi16(val1, 2);				
+				val1 = _mm_srli_epi16(val1, 2);
 				val2 = _mm_load_si128(src2);
 				val2 = _mm_srli_epi16(val2, 2);
 				val_dst = _mm_packus_epi16(val1, val2);
 				_mm_store_si128(dst, val_dst);
 			}
 		}
-		
+
 		for (i=0; i<h/2; i++) {
 			src1 = (__m128i *) (pU + i*src_stride/2);
 			src2 = src1+1;
@@ -1452,7 +1543,7 @@
 
 			for (j=0; j<w/32; j++, src1+=2, src2+=2, dst++) {
 				val1 = _mm_load_si128(src1);
-				val1 = _mm_srli_epi16(val1, 2);				
+				val1 = _mm_srli_epi16(val1, 2);
 				val2 = _mm_load_si128(src2);
 				val2 = _mm_srli_epi16(val2, 2);
 				val_dst = _mm_packus_epi16(val1, val2);
@@ -1464,10 +1555,10 @@
 			src1 = (__m128i *) (pV + i*src_stride/2);
 			src2 = src1+1;
 			dst = (__m128i *)(vs_dst->video_buffer + 5*vs_dst->pitch_y * vs_dst->height/4  + i*vs_dst->pitch_y/2);
-			
+
 			for (j=0; j<w/32; j++, src1+=2, src2+=2, dst++) {
 				val1 = _mm_load_si128(src1);
-				val1 = _mm_srli_epi16(val1, 2);				
+				val1 = _mm_srli_epi16(val1, 2);
 				val2 = _mm_load_si128(src2);
 				val2 = _mm_srli_epi16(val2, 2);
 				val_dst = _mm_packus_epi16(val1, val2);
@@ -1482,7 +1573,7 @@
 
 
 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)
+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)
 {
 	u32 i, j, w, h;
 
@@ -1504,12 +1595,12 @@
 #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 + src_stride/2)%8 == 0)
-		&& (GFINTCAST (pV + src_stride/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);
+	        && (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)
+	   ) {
+		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
 
@@ -1526,12 +1617,18 @@
 		pV = pV + (src_stride * (_src_wnd->y / 2) + _src_wnd->x) / 2;
 	}
 
+	if (swap_uv) {
+		u8 *t = pV;
+		pV = pU;
+		pU = t;
+	}
+
 	if (vs_dst->pixel_format == GF_PIXEL_YV12) {
 		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 (j=0; j<w;j++) {
+			for (j=0; j<w; j++) {
 				*dst = (*src) >> 2;
 				dst++;
 				src++;
@@ -1542,7 +1639,7 @@
 			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;
 
-			for (j=0; j<w/2;j++) {
+			for (j=0; j<w/2; j++) {
 				*dst = (*src) >> 2;
 				dst++;
 				src++;
@@ -1553,7 +1650,7 @@
 			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;
 
-			for (j=0; j<w/2;j++) {
+			for (j=0; j<w/2; j++) {
 				*dst = (*src) >> 2;
 				dst++;
 				src++;
@@ -1564,3 +1661,207 @@
 	return GF_NOT_SUPPORTED;
 }
 
+
+/* Basic SVG datatype parsing functions */
+static const struct predef_col {
+	const char *name;
+	u8 r;
+	u8 g;
+	u8 b;
+} predefined_colors[] =
+{
+	{"aliceblue",240, 248, 255},
+	{"antiquewhite",250, 235, 215},
+	{"aqua", 0, 255, 255},
+	{"aquamarine",127, 255, 212},
+	{"azure",240, 255, 255},
+	{"beige",245, 245, 220},
+	{"bisque",255, 228, 196},
+	{"black", 0, 0, 0},
+	{"blanchedalmond",255, 235, 205},
+	{"blue", 0, 0, 255},
+	{"blueviolet",138, 43, 226},
+	{"brown",165, 42, 42},
+	{"burlywood",222, 184, 135},
+	{"cadetblue", 95, 158, 160},
+	{"chartreuse",127, 255, 0},
+	{"chocolate",210, 105, 30},
+	{"coral",255, 127, 80},
+	{"lightpink",255, 182, 193},
+	{"lightsalmon",255, 160, 122},
+	{"lightseagreen", 32, 178, 170},
+	{"lightskyblue",135, 206, 250},
+	{"lightslategray",119, 136, 153},
+	{"lightslategrey",119, 136, 153},
+	{"lightsteelblue",176, 196, 222},
+	{"lightyellow",255, 255, 224},
+	{"lime", 0, 255, 0},
+	{"limegreen", 50, 205, 50},
+	{"linen",250, 240, 230},
+	{"magenta",255, 0, 255},
+	{"maroon",128, 0, 0},
+	{"mediumaquamarine",102, 205, 170},
+	{"mediumblue", 0, 0, 205},
+	{"mediumorchid",186, 85, 211},
+	{"cornflowerblue",100, 149, 237},
+	{"cornsilk",255, 248, 220},
+	{"crimson",220, 20, 60},
+	{"cyan", 0, 255, 255},
+	{"darkblue", 0, 0, 139},
+	{"darkcyan", 0, 139, 139},
+	{"darkgoldenrod",184, 134, 11},
+	{"darkgray",169, 169, 169},
+	{"darkgreen", 0, 100, 0},
+	{"darkgrey",169, 169, 169},
+	{"darkkhaki",189, 183, 107},
+	{"darkmagenta",139, 0, 139},
+	{"darkolivegreen", 85, 107, 47},
+	{"darkorange",255, 140, 0},
+	{"darkorchid",153, 50, 204},
+	{"darkred",139, 0, 0},
+	{"darksalmon",233, 150, 122},
+	{"darkseagreen",143, 188, 143},
+	{"darkslateblue", 72, 61, 139},
+	{"darkslategray", 47, 79, 79},
+	{"darkslategrey", 47, 79, 79},
+	{"darkturquoise", 0, 206, 209},
+	{"darkviolet",148, 0, 211},
+	{"deeppink",255, 20, 147},
+	{"deepskyblue", 0, 191, 255},
+	{"dimgray",105, 105, 105},
+	{"dimgrey",105, 105, 105},
+	{"dodgerblue", 30, 144, 255},
+	{"firebrick",178, 34, 34},
+	{"floralwhite",255, 250, 240},
+	{"forestgreen", 34, 139, 34},
+	{"fuchsia",255, 0, 255},
+	{"gainsboro",220, 220, 220},
+	{"ghostwhite",248, 248, 255},
+	{"gold",255, 215, 0},
+	{"goldenrod",218, 165, 32},
+	{"gray",128, 128, 128},
+	{"grey",128, 128, 128},
+	{"green", 0, 128, 0},
+	{"greenyellow",173, 255, 47},
+	{"honeydew",240, 255, 240},
+	{"hotpink",255, 105, 180},
+	{"indianred",205, 92, 92},
+	{"indigo", 75, 0, 130},
+	{"ivory",255, 255, 240},
+	{"khaki",240, 230, 140},
+	{"lavender",230, 230, 25},
+	{"lavenderblush",255, 240, 245},
+	{"mediumpurple",147, 112, 219},
+	{"mediumseagreen", 60, 179, 113},
+	{"mediumslateblue",123, 104, 238},
+	{"mediumspringgreen", 0, 250, 154},
+	{"mediumturquoise", 72, 209, 204},
+	{"mediumvioletred",199, 21, 133},
+	{"midnightblue", 25, 25, 112},
+	{"mintcream",245, 255, 250},
+	{"mistyrose",255, 228, 225},
+	{"moccasin",255, 228, 181},
+	{"navajowhite",255, 222, 173},
+	{"navy", 0, 0, 128},
+	{"oldlace",253, 245, 230},
+	{"olive",128, 128, 0},
+	{"olivedrab",107, 142, 35},
+	{"orange",255, 165, 0},
+	{"orangered",255, 69, 0},
+	{"orchid",218, 112, 214},
+	{"palegoldenrod",238, 232, 170},
+	{"palegreen",152, 251, 152},
+	{"paleturquoise",175, 238, 238},
+	{"palevioletred",219, 112, 147},
+	{"papayawhip",255, 239, 213},
+	{"peachpuff",255, 218, 185},
+	{"peru",205, 133, 63},
+	{"pink",255, 192, 203},
+	{"plum",221, 160, 221},
+	{"powderblue",176, 224, 230},
+	{"purple",128, 0, 128},
+	{"red",255, 0, 0},
+	{"rosybrown",188, 143, 143},
+	{"royalblue", 65, 105, 225},
+	{"saddlebrown",139, 69, 19},
+	{"salmon",250, 128, 114},
+	{"sandybrown",244, 164, 96},
+	{"seagreen", 46, 139, 87},
+	{"seashell",255, 245, 238},
+	{"sienna",160, 82, 45},
+	{"silver",192, 192, 192},
+	{"skyblue",135, 206, 235},
+	{"slateblue",106, 90, 205},
+	{"slategray",112, 128, 144},
+	{"slategrey",112, 128, 144},
+	{"snow",255, 250, 250},
+	{"springgreen", 0, 255, 127},
+	{"steelblue", 70, 130, 180},
+	{"tan",210, 180, 140},
+	{"teal", 0, 128, 128},
+	{"lawngreen",124, 252, 0},
+	{"lemonchiffon",255, 250, 205},
+	{"lightblue",173, 216, 230},
+	{"lightcoral",240, 128, 128},
+	{"lightcyan",224, 255, 255},
+	{"lightgoldenrodyellow",250, 250, 210},
+	{"lightgray",211, 211, 211},
+	{"lightgreen",144, 238, 144},
+	{"lightgrey",211, 211, 211},
+	{"thistle",216, 191, 216},
+	{"tomato",255, 99, 71},
+	{"turquoise", 64, 224, 208},
+	{"violet",238, 130, 238},
+	{"wheat",245, 222, 179},
+	{"white",255, 255, 255},
+	{"whitesmoke",245, 245, 245},
+	{"yellow",255, 255, 0},
+	{"yellowgreen",154, 205, 50}
+
+};
+
+
+GF_Color gf_color_parse(const char *name)
+{
+	u32 i, count;
+	u32 res;
+	if ((name[0]=='$') || (name[0]=='#')) {
+		sscanf(name+1, "%x", &res);
+		return res | 0xFF000000;
+	}
+	if (!strnicmp(name, "0x", 2) ) {
+		sscanf(name+2, "%x", &res);
+		return res | 0xFF000000;
+	}
+
+	count = sizeof(predefined_colors) / sizeof(struct predef_col);
+	for (i=0; i<count; i++) {
+		if (!strcmp(name, predefined_colors[i].name)) {
+			res = GF_COL_ARGB(0xFF, predefined_colors[i].r, predefined_colors[i].g, predefined_colors[i].b);
+			return res;
+		}
+	}
+
+	return 0;
+
+}
+
+const char *gf_color_get_name(GF_Color col)
+{
+	u32 i, count;
+	u8 r, g, b;
+
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	count = sizeof(predefined_colors) / sizeof(struct predef_col);
+	for (i=0; i<count; i++) {
+		if (predefined_colors[i].r != r) continue;
+		if (predefined_colors[i].g != g) continue;
+		if (predefined_colors[i].b != b) continue;
+		return predefined_colors[i].name;
+	}
+	return NULL;
+
+}

gpac-0.5.0.svn5178.tar.bz2/src/utils/configfile.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/configfile.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -45,7 +45,6 @@
 	char *fileName;
 	GF_List *sections;
 	Bool hasChanged, skip_changes;
-
 };
 
 
@@ -71,16 +70,16 @@
  * \brief Clear the structure
  * \param iniFile The structure to clear
  */
-static void gf_cfg_clear(GF_Config * iniFile){
+static void gf_cfg_clear(GF_Config * iniFile) {
 	IniSection *p;
 	if (!iniFile) return;
-	if (iniFile->sections){
-	  while (gf_list_count(iniFile->sections)) {
-		p = (IniSection *) gf_list_get(iniFile->sections, 0);
-		DelSection(p);
-		gf_list_rem(iniFile->sections, 0);
-	  }
-	  gf_list_del(iniFile->sections);
+	if (iniFile->sections) {
+		while (gf_list_count(iniFile->sections)) {
+			p = (IniSection *) gf_list_get(iniFile->sections, 0);
+			DelSection(p);
+			gf_list_rem(iniFile->sections, 0);
+		}
+		gf_list_del(iniFile->sections);
 	}
 	if (iniFile->fileName)
 		gf_free(iniFile->fileName);
@@ -115,21 +114,23 @@
 	tmp->sections = gf_list_new();
 	file = gf_f64_open(fileName, "rt");
 	if (!file)
-	  return GF_IO_ERR;
+		return GF_IO_ERR;
 	/* load the file */
 	p = NULL;
 	line = gf_malloc(sizeof(char)*line_alloc);
 	memset(line, 0, sizeof(char)*line_alloc);
 
 	while (!feof(file)) {
-		u32 read;
+		u32 read, nb_pass;
 		ret = fgets(line, line_alloc, file);
 		read = (u32) strlen(line);
-		while (read + 1 == line_alloc) {
+		nb_pass = 1;
+		while (read + nb_pass == line_alloc) {
 			line_alloc += MAX_INI_LINE;
 			line = gf_realloc(line, sizeof(char)*line_alloc);
 			ret = fgets(line+read, MAX_INI_LINE, file);
 			read = (u32) strlen(line);
+			nb_pass++;
 		}
 		if (!ret) continue;
 
@@ -143,7 +144,7 @@
 		if (!strlen(line)) continue;
 		if (line[0] == '#') continue;
 
-		
+
 		/* new section */
 		if (line[0] == '[') {
 			p = (IniSection *) gf_malloc(sizeof(IniSection));
@@ -189,7 +190,7 @@
 }
 
 GF_EXPORT
-GF_Config *gf_cfg_force_new(const char *filePath, const char* file_name){
+GF_Config *gf_cfg_force_new(const char *filePath, const char* file_name) {
 	GF_Config *tmp = (GF_Config *)gf_malloc(sizeof(GF_Config));
 	memset((void *)tmp, 0, sizeof(GF_Config));
 	gf_cfg_parse_config_file(tmp, filePath, file_name);
@@ -207,23 +208,23 @@
 		return tmp;
 	}
 
-	if (gf_cfg_parse_config_file(tmp, filePath, file_name)){
+	if (gf_cfg_parse_config_file(tmp, filePath, file_name)) {
 		gf_cfg_clear(tmp);
 		gf_free(tmp);
-	    tmp = NULL;
+		tmp = NULL;
 	}
 	return tmp;
 }
 
-GF_EXPORT 
+GF_EXPORT
 char * gf_cfg_get_filename(GF_Config *iniFile)
 {
-    if (!iniFile)
-      return NULL;
-    return iniFile->fileName ? gf_strdup(iniFile->fileName) : NULL;
+	if (!iniFile)
+		return NULL;
+	return iniFile->fileName ? gf_strdup(iniFile->fileName) : NULL;
 }
 
-GF_EXPORT 
+GF_EXPORT
 GF_Err gf_cfg_save(GF_Config *iniFile)
 {
 	u32 i, j;
@@ -255,7 +256,7 @@
 	return GF_OK;
 }
 
-GF_EXPORT 
+GF_EXPORT
 GF_Err gf_cfg_discard_changes(GF_Config *iniFile)
 {
 	if (!iniFile) return GF_BAD_PARAM;
@@ -305,22 +306,22 @@
 GF_EXPORT
 const char *gf_cfg_get_ikey(GF_Config *iniFile, const char *secName, const char *keyName)
 {
-        u32 i;
-        IniSection *sec;
-        IniKey *key;
+	u32 i;
+	IniSection *sec;
+	IniKey *key;
 
-        i=0;
-        while ( (sec = (IniSection *) gf_list_enum(iniFile->sections, &i)) ) {
-                if (!stricmp(secName, sec->section_name)) goto get_key;
-        }
-        return NULL;
+	i=0;
+	while ( (sec = (IniSection *) gf_list_enum(iniFile->sections, &i)) ) {
+		if (!stricmp(secName, sec->section_name)) goto get_key;
+	}
+	return NULL;
 
 get_key:
-        i=0;
-        while ( (key = (IniKey *) gf_list_enum(sec->keys, &i)) ) {
-                if (!stricmp(key->name, keyName)) return key->value;
-        }
-        return NULL;
+	i=0;
+	while ( (key = (IniKey *) gf_list_enum(sec->keys, &i)) ) {
+		if (!stricmp(key->name, keyName)) return key->value;
+	}
+	return NULL;
 }
 
 
@@ -469,15 +470,15 @@
 	char *subKeyValue, *returnKey;
 	char *keyValue;
 
-	
+
 	keyValue = gf_strdup(gf_cfg_get_key(iniFile, secName, keyName));
-	if (!keyValue){
+	if (!keyValue) {
 		return NULL;
 	}
 
 	j = 0;
-	subKeyValue = strtok((char*)keyValue,";"); 
-	while (subKeyValue!=NULL) { 
+	subKeyValue = strtok((char*)keyValue,";");
+	while (subKeyValue!=NULL) {
 		if (j==sub_index) {
 			returnKey = gf_strdup(subKeyValue);
 			gf_free(keyValue);

gpac-0.5.0.svn5178.tar.bz2/src/utils/dlmalloc.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/dlmalloc.c Changed

@@ -708,16 +708,16 @@
 #ifndef STRUCT_MALLINFO_DECLARED
 #define STRUCT_MALLINFO_DECLARED 1
 struct mallinfo {
-  MALLINFO_FIELD_TYPE arena;    /* non-mmapped space allocated from system */
-  MALLINFO_FIELD_TYPE ordblks;  /* number of free chunks */
-  MALLINFO_FIELD_TYPE smblks;   /* always 0 */
-  MALLINFO_FIELD_TYPE hblks;    /* always 0 */
-  MALLINFO_FIELD_TYPE hblkhd;   /* space in mmapped regions */
-  MALLINFO_FIELD_TYPE usmblks;  /* maximum total allocated space */
-  MALLINFO_FIELD_TYPE fsmblks;  /* always 0 */
-  MALLINFO_FIELD_TYPE uordblks; /* total allocated space */
-  MALLINFO_FIELD_TYPE fordblks; /* total free space */
-  MALLINFO_FIELD_TYPE keepcost; /* releasable (via malloc_trim) space */
+	MALLINFO_FIELD_TYPE arena;    /* non-mmapped space allocated from system */
+	MALLINFO_FIELD_TYPE ordblks;  /* number of free chunks */
+	MALLINFO_FIELD_TYPE smblks;   /* always 0 */
+	MALLINFO_FIELD_TYPE hblks;    /* always 0 */
+	MALLINFO_FIELD_TYPE hblkhd;   /* space in mmapped regions */
+	MALLINFO_FIELD_TYPE usmblks;  /* maximum total allocated space */
+	MALLINFO_FIELD_TYPE fsmblks;  /* always 0 */
+	MALLINFO_FIELD_TYPE uordblks; /* total allocated space */
+	MALLINFO_FIELD_TYPE fordblks; /* total free space */
+	MALLINFO_FIELD_TYPE keepcost; /* releasable (via malloc_trim) space */
 };
 #endif /* STRUCT_MALLINFO_DECLARED */
 #endif /* HAVE_USR_INCLUDE_MALLOC_H */
@@ -729,34 +729,34 @@
 */
 
 #ifdef WIN64
-  #undef FORCEINLINE
+#undef FORCEINLINE
 #endif
 
 #ifndef FORCEINLINE
-  #if defined(__GNUC__)
+#if defined(__GNUC__)
 #define FORCEINLINE __inline __attribute__ ((always_inline))
-  #elif defined(_MSC_VER)
-    #define FORCEINLINE __forceinline
-  #endif
+#elif defined(_MSC_VER)
+#define FORCEINLINE __forceinline
+#endif
 #endif
 #ifndef NOINLINE
-  #if defined(__GNUC__)
-    #define NOINLINE __attribute__ ((noinline))
-  #elif defined(_MSC_VER)
-    #define NOINLINE __declspec(noinline)
-  #else
-    #define NOINLINE
-  #endif
+#if defined(__GNUC__)
+#define NOINLINE __attribute__ ((noinline))
+#elif defined(_MSC_VER)
+#define NOINLINE __declspec(noinline)
+#else
+#define NOINLINE
+#endif
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #ifndef FORCEINLINE
- #define FORCEINLINE inline
+#define FORCEINLINE inline
 #endif
 #endif /* __cplusplus */
 #ifndef FORCEINLINE
- #define FORCEINLINE
+#define FORCEINLINE
 #endif
 
 
@@ -1255,7 +1255,7 @@
 /*
   malloc_usable_size(void* p) behaves the same as malloc_usable_size;
 */
-  size_t mspace_usable_size(void* mem);
+size_t mspace_usable_size(void* mem);
 
 /*
   mspace_malloc_stats behaves as malloc_stats, but reports
@@ -1407,7 +1407,7 @@
 #    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
 #  else
 #    if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
-       extern size_t getpagesize();
+extern size_t getpagesize();
 #      define malloc_getpagesize getpagesize()
 #    else
 #      ifdef WIN32 /* use supplied emulation of getpagesize */
@@ -1516,33 +1516,33 @@
 
 /* Win32 MMAP via VirtualAlloc */
 static FORCEINLINE void* win32mmap(size_t size) {
-  void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
-  return (ptr != 0)? ptr: MFAIL;
+	void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
+	return (ptr != 0)? ptr: MFAIL;
 }
 
 /* For direct MMAP, use MEM_TOP_DOWN to minimize interference */
 static FORCEINLINE void* win32direct_mmap(size_t size) {
-  void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT|MEM_TOP_DOWN,
-                           PAGE_READWRITE);
-  return (ptr != 0)? ptr: MFAIL;
+	void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT|MEM_TOP_DOWN,
+	                         PAGE_READWRITE);
+	return (ptr != 0)? ptr: MFAIL;
 }
 
 /* This function supports releasing coalesed segments */
 static FORCEINLINE int win32munmap(void* ptr, size_t size) {
-  MEMORY_BASIC_INFORMATION minfo;
-  char* cptr = (char*)ptr;
-  while (size) {
-    if (VirtualQuery(cptr, &minfo, sizeof(minfo)) == 0)
-      return -1;
-    if (minfo.BaseAddress != cptr || minfo.AllocationBase != cptr ||
-        minfo.State != MEM_COMMIT || minfo.RegionSize > size)
-      return -1;
-    if (VirtualFree(cptr, 0, MEM_RELEASE) == 0)
-      return -1;
-    cptr += minfo.RegionSize;
-    size -= minfo.RegionSize;
-  }
-  return 0;
+	MEMORY_BASIC_INFORMATION minfo;
+	char* cptr = (char*)ptr;
+	while (size) {
+		if (VirtualQuery(cptr, &minfo, sizeof(minfo)) == 0)
+			return -1;
+		if (minfo.BaseAddress != cptr || minfo.AllocationBase != cptr ||
+		        minfo.State != MEM_COMMIT || minfo.RegionSize > size)
+			return -1;
+		if (VirtualFree(cptr, 0, MEM_RELEASE) == 0)
+			return -1;
+		cptr += minfo.RegionSize;
+		size -= minfo.RegionSize;
+	}
+	return 0;
 }
 
 #define MMAP_DEFAULT(s)             win32mmap(s)
@@ -1562,58 +1562,58 @@
  * Define CALL_MORECORE
  */
 #if HAVE_MORECORE
-    #ifdef MORECORE
-        #define CALL_MORECORE(S)    MORECORE(S)
-    #else  /* MORECORE */
-        #define CALL_MORECORE(S)    MORECORE_DEFAULT(S)
-    #endif /* MORECORE */
+#ifdef MORECORE
+#define CALL_MORECORE(S)    MORECORE(S)
+#else  /* MORECORE */
+#define CALL_MORECORE(S)    MORECORE_DEFAULT(S)
+#endif /* MORECORE */
 #else  /* HAVE_MORECORE */
-    #define CALL_MORECORE(S)        MFAIL
+#define CALL_MORECORE(S)        MFAIL
 #endif /* HAVE_MORECORE */
 
 /**
  * Define CALL_MMAP/CALL_MUNMAP/CALL_DIRECT_MMAP
  */
 #if HAVE_MMAP
-    #define USE_MMAP_BIT            (SIZE_T_ONE)
+#define USE_MMAP_BIT            (SIZE_T_ONE)
 
-    #ifdef MMAP
-        #define CALL_MMAP(s)        MMAP(s)
-    #else /* MMAP */
-        #define CALL_MMAP(s)        MMAP_DEFAULT(s)
-    #endif /* MMAP */
-    #ifdef MUNMAP
-        #define CALL_MUNMAP(a, s)   MUNMAP((a), (s))
-    #else /* MUNMAP */
-        #define CALL_MUNMAP(a, s)   MUNMAP_DEFAULT((a), (s))
-    #endif /* MUNMAP */
-    #ifdef DIRECT_MMAP
-        #define CALL_DIRECT_MMAP(s) DIRECT_MMAP(s)
-    #else /* DIRECT_MMAP */
-        #define CALL_DIRECT_MMAP(s) DIRECT_MMAP_DEFAULT(s)
-    #endif /* DIRECT_MMAP */
+#ifdef MMAP
+#define CALL_MMAP(s)        MMAP(s)
+#else /* MMAP */
+#define CALL_MMAP(s)        MMAP_DEFAULT(s)
+#endif /* MMAP */
+#ifdef MUNMAP
+#define CALL_MUNMAP(a, s)   MUNMAP((a), (s))
+#else /* MUNMAP */
+#define CALL_MUNMAP(a, s)   MUNMAP_DEFAULT((a), (s))
+#endif /* MUNMAP */
+#ifdef DIRECT_MMAP
+#define CALL_DIRECT_MMAP(s) DIRECT_MMAP(s)
+#else /* DIRECT_MMAP */
+#define CALL_DIRECT_MMAP(s) DIRECT_MMAP_DEFAULT(s)
+#endif /* DIRECT_MMAP */
 #else  /* HAVE_MMAP */
-    #define USE_MMAP_BIT            (SIZE_T_ZERO)
+#define USE_MMAP_BIT            (SIZE_T_ZERO)
 
-    #define MMAP(s)                 MFAIL
-    #define MUNMAP(a, s)            (-1)
-    #define DIRECT_MMAP(s)          MFAIL
-    #define CALL_DIRECT_MMAP(s)     DIRECT_MMAP(s)
-    #define CALL_MMAP(s)            MMAP(s)
-    #define CALL_MUNMAP(a, s)       MUNMAP((a), (s))
+#define MMAP(s)                 MFAIL
+#define MUNMAP(a, s)            (-1)
+#define DIRECT_MMAP(s)          MFAIL
+#define CALL_DIRECT_MMAP(s)     DIRECT_MMAP(s)
+#define CALL_MMAP(s)            MMAP(s)
+#define CALL_MUNMAP(a, s)       MUNMAP((a), (s))
 #endif /* HAVE_MMAP */
 
 /**
  * Define CALL_MREMAP
  */
 #if HAVE_MMAP && HAVE_MREMAP
-    #ifdef MREMAP
-        #define CALL_MREMAP(addr, osz, nsz, mv) MREMAP((addr), (osz), (nsz), (mv))
-    #else /* MREMAP */
-        #define CALL_MREMAP(addr, osz, nsz, mv) MREMAP_DEFAULT((addr), (osz), (nsz), (mv))
-    #endif /* MREMAP */
+#ifdef MREMAP
+#define CALL_MREMAP(addr, osz, nsz, mv) MREMAP((addr), (osz), (nsz), (mv))
+#else /* MREMAP */
+#define CALL_MREMAP(addr, osz, nsz, mv) MREMAP_DEFAULT((addr), (osz), (nsz), (mv))
+#endif /* MREMAP */
 #else  /* HAVE_MMAP && HAVE_MREMAP */
-    #define CALL_MREMAP(addr, osz, nsz, mv)     MFAIL
+#define CALL_MREMAP(addr, osz, nsz, mv)     MFAIL
 #endif /* HAVE_MMAP && HAVE_MREMAP */
 
 /* mstate bit set if continguous morecore disabled or failed */
@@ -1662,9 +1662,9 @@
 
 /* Custom pthread-style spin locks on x86 and x64 for gcc */
 struct pthread_mlock_t {
-  volatile unsigned int l;
-  unsigned int c;
-  pthread_t threadid;
+	volatile unsigned int l;
+	unsigned int c;
+	pthread_t threadid;
 };
 #define MLOCK_T               struct pthread_mlock_t
 #define CURRENT_THREAD        pthread_self()
@@ -1677,93 +1677,93 @@
 static MLOCK_T malloc_global_mutex = { 0, 0, 0};
 
 static FORCEINLINE int pthread_acquire_lock (MLOCK_T *sl) {
-  int spins = 0;
-  volatile unsigned int* lp = &sl->l;
-  for (;;) {
-    if (*lp != 0) {
-      if (sl->threadid == CURRENT_THREAD) {
-        ++sl->c;
-        return 0;
-      }
-    }
-    else {
-      /* place args to cmpxchgl in locals to evade oddities in some gccs */
-      int cmp = 0;
-      int val = 1;
-      int ret;
-      __asm__ __volatile__  ("lock; cmpxchgl %1, %2"
-                             : "=a" (ret)
-                             : "r" (val), "m" (*(lp)), "0"(cmp)
-                             : "memory", "cc");
-      if (!ret) {
-        assert(!sl->threadid);
-        sl->threadid = CURRENT_THREAD;
-        sl->c = 1;
-        return 0;
-      }
-    }
-    if ((++spins & SPINS_PER_YIELD) == 0) {
+	int spins = 0;
+	volatile unsigned int* lp = &sl->l;
+	for (;;) {
+		if (*lp != 0) {
+			if (sl->threadid == CURRENT_THREAD) {
+				++sl->c;
+				return 0;
+			}
+		}
+		else {
+			/* place args to cmpxchgl in locals to evade oddities in some gccs */
+			int cmp = 0;
+			int val = 1;
+			int ret;
+			__asm__ __volatile__  ("lock; cmpxchgl %1, %2"
+			                       : "=a" (ret)
+			                       : "r" (val), "m" (*(lp)), "0"(cmp)
+			                       : "memory", "cc");
+			if (!ret) {
+				assert(!sl->threadid);
+				sl->threadid = CURRENT_THREAD;
+				sl->c = 1;
+				return 0;
+			}
+		}
+		if ((++spins & SPINS_PER_YIELD) == 0) {
 #if defined (__SVR4) && defined (__sun) /* solaris */
-      thr_yield();
+			thr_yield();
 #else
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
-      sched_yield();
+			sched_yield();
 #else  /* no-op yield on unknown systems */
-      ;
+			;
 #endif /* __linux__ || __FreeBSD__ || __APPLE__ */
 #endif /* solaris */
-    }
-  }
+		}
+	}
 }
 
 static FORCEINLINE void pthread_release_lock (MLOCK_T *sl) {
-  volatile unsigned int* lp = &sl->l;
-  assert(*lp != 0);
-  assert(sl->threadid == CURRENT_THREAD);
-  if (--sl->c == 0) {
-    sl->threadid = 0;
-    int prev = 0;
-    int ret;
-    __asm__ __volatile__ ("lock; xchgl %0, %1"
-                          : "=r" (ret)
-                          : "m" (*(lp)), "0"(prev)
-                          : "memory");
-  }
+	volatile unsigned int* lp = &sl->l;
+	assert(*lp != 0);
+	assert(sl->threadid == CURRENT_THREAD);
+	if (--sl->c == 0) {
+		sl->threadid = 0;
+		int prev = 0;
+		int ret;
+		__asm__ __volatile__ ("lock; xchgl %0, %1"
+		                      : "=r" (ret)
+		                      : "m" (*(lp)), "0"(prev)
+		                      : "memory");
+	}
 }
 
 static FORCEINLINE int pthread_try_lock (MLOCK_T *sl) {
-  volatile unsigned int* lp = &sl->l;
-  if (*lp != 0) {
-    if (sl->threadid == CURRENT_THREAD) {
-      ++sl->c;
-      return 1;
-    }
-  }
-  else {
-    int cmp = 0;
-    int val = 1;
-    int ret;
-    __asm__ __volatile__  ("lock; cmpxchgl %1, %2"
-                           : "=a" (ret)
-                           : "r" (val), "m" (*(lp)), "0"(cmp)
-                           : "memory", "cc");
-    if (!ret) {
-      assert(!sl->threadid);
-      sl->threadid = CURRENT_THREAD;
-      sl->c = 1;
-      return 1;
-    }
-  }
-  return 0;
+	volatile unsigned int* lp = &sl->l;
+	if (*lp != 0) {
+		if (sl->threadid == CURRENT_THREAD) {
+			++sl->c;
+			return 1;
+		}
+	}
+	else {
+		int cmp = 0;
+		int val = 1;
+		int ret;
+		__asm__ __volatile__  ("lock; cmpxchgl %1, %2"
+		                       : "=a" (ret)
+		                       : "r" (val), "m" (*(lp)), "0"(cmp)
+		                       : "memory", "cc");
+		if (!ret) {
+			assert(!sl->threadid);
+			sl->threadid = CURRENT_THREAD;
+			sl->c = 1;
+			return 1;
+		}
+	}
+	return 0;
 }
 
 
 #else /* WIN32 */
 /* Custom win32-style spin locks on x86 and x64 for MSC */
 struct win32_mlock_t {
-  volatile long l;
-  unsigned int c;
-  long threadid;
+	volatile long l;
+	unsigned int c;
+	long threadid;
 };
 
 #define MLOCK_T               struct win32_mlock_t
@@ -1777,52 +1777,52 @@
 static MLOCK_T malloc_global_mutex = { 0, 0, 0};
 
 static FORCEINLINE int win32_acquire_lock (MLOCK_T *sl) {
-  int spins = 0;
-  for (;;) {
-    if (sl->l != 0) {
-      if (sl->threadid == CURRENT_THREAD) {
-        ++sl->c;
-        return 0;
-      }
-    }
-    else {
-      if (!interlockedexchange(&sl->l, 1)) {
-        assert(!sl->threadid);
-        sl->threadid = CURRENT_THREAD;
-        sl->c = 1;
-        return 0;
-      }
-    }
-    if ((++spins & SPINS_PER_YIELD) == 0)
-      SleepEx(0, FALSE);
-  }
+	int spins = 0;
+	for (;;) {
+		if (sl->l != 0) {
+			if (sl->threadid == CURRENT_THREAD) {
+				++sl->c;
+				return 0;
+			}
+		}
+		else {
+			if (!interlockedexchange(&sl->l, 1)) {
+				assert(!sl->threadid);
+				sl->threadid = CURRENT_THREAD;
+				sl->c = 1;
+				return 0;
+			}
+		}
+		if ((++spins & SPINS_PER_YIELD) == 0)
+			SleepEx(0, FALSE);
+	}
 }
 
 static FORCEINLINE void win32_release_lock (MLOCK_T *sl) {
-  assert(sl->threadid == CURRENT_THREAD);
-  assert(sl->l != 0);
-  if (--sl->c == 0) {
-    sl->threadid = 0;
-    interlockedexchange (&sl->l, 0);
-  }
+	assert(sl->threadid == CURRENT_THREAD);
+	assert(sl->l != 0);
+	if (--sl->c == 0) {
+		sl->threadid = 0;
+		interlockedexchange (&sl->l, 0);
+	}
 }
 
 static FORCEINLINE int win32_try_lock (MLOCK_T *sl) {
-  if (sl->l != 0) {
-    if (sl->threadid == CURRENT_THREAD) {
-      ++sl->c;
-      return 1;
-    }
-  }
-  else {
-    if (!interlockedexchange(&sl->l, 1)){
-      assert(!sl->threadid);
-      sl->threadid = CURRENT_THREAD;
-      sl->c = 1;
-      return 1;
-    }
-  }
-  return 0;
+	if (sl->l != 0) {
+		if (sl->threadid == CURRENT_THREAD) {
+			++sl->c;
+			return 1;
+		}
+	}
+	else {
+		if (!interlockedexchange(&sl->l, 1)) {
+			assert(!sl->threadid);
+			sl->threadid = CURRENT_THREAD;
+			sl->c = 1;
+			return 1;
+		}
+	}
+	return 0;
 }
 
 #endif /* WIN32 */
@@ -1845,19 +1845,19 @@
 #ifdef linux
 #ifndef PTHREAD_MUTEX_RECURSIVE
 extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr,
-					   int __kind));
+        int __kind));
 #define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
 #define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y)
 #endif
 #endif
 
 static int pthread_init_lock (MLOCK_T *sl) {
-  pthread_mutexattr_t attr;
-  if (pthread_mutexattr_init(&attr)) return 1;
-  if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)) return 1;
-  if (pthread_mutex_init(sl, &attr)) return 1;
-  if (pthread_mutexattr_destroy(&attr)) return 1;
-  return 0;
+	pthread_mutexattr_t attr;
+	if (pthread_mutexattr_init(&attr)) return 1;
+	if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)) return 1;
+	if (pthread_mutex_init(sl, &attr)) return 1;
+	if (pthread_mutexattr_destroy(&attr)) return 1;
+	return 0;
 }
 
 #else /* WIN32 */
@@ -1875,19 +1875,19 @@
 
 /* Use spin loop to initialize global lock */
 static void init_malloc_global_mutex() {
-  for (;;) {
-    long stat = malloc_global_mutex_status;
-    if (stat > 0)
-      return;
-    /* transition to < 0 while initializing, then to > 0) */
-    if (stat == 0 &&
-        interlockedcompareexchange(&malloc_global_mutex_status, -1, 0) == 0) {
-      InitializeCriticalSection(&malloc_global_mutex);
-      interlockedexchange(&malloc_global_mutex_status,1);
-      return;
-    }
-    SleepEx(0, FALSE);
-  }
+	for (;;) {
+		long stat = malloc_global_mutex_status;
+		if (stat > 0)
+			return;
+		/* transition to < 0 while initializing, then to > 0) */
+		if (stat == 0 &&
+		        interlockedcompareexchange(&malloc_global_mutex_status, -1, 0) == 0) {
+			InitializeCriticalSection(&malloc_global_mutex);
+			interlockedexchange(&malloc_global_mutex_status,1);
+			return;
+		}
+		SleepEx(0, FALSE);
+	}
 }
 
 #endif /* WIN32 */
@@ -2065,10 +2065,10 @@
 */
 
 struct malloc_chunk {
-  size_t               prev_foot;  /* Size of previous chunk (if free).  */
-  size_t               head;       /* Size and inuse bits. */
-  struct malloc_chunk* fd;         /* double links -- used only if free. */
-  struct malloc_chunk* bk;
+	size_t               prev_foot;  /* Size of previous chunk (if free).  */
+	size_t               head;       /* Size and inuse bits. */
+	struct malloc_chunk* fd;         /* double links -- used only if free. */
+	struct malloc_chunk* bk;
 };
 
 typedef struct malloc_chunk  mchunk;
@@ -2271,15 +2271,15 @@
 */
 
 struct malloc_tree_chunk {
-  /* The first four fields must be compatible with malloc_chunk */
-  size_t                    prev_foot;
-  size_t                    head;
-  struct malloc_tree_chunk* fd;
-  struct malloc_tree_chunk* bk;
-
-  struct malloc_tree_chunk* child[2];
-  struct malloc_tree_chunk* parent;
-  bindex_t                  index;
+	/* The first four fields must be compatible with malloc_chunk */
+	size_t                    prev_foot;
+	size_t                    head;
+	struct malloc_tree_chunk* fd;
+	struct malloc_tree_chunk* bk;
+
+	struct malloc_tree_chunk* child[2];
+	struct malloc_tree_chunk* parent;
+	bindex_t                  index;
 };
 
 typedef struct malloc_tree_chunk  tchunk;
@@ -2347,10 +2347,10 @@
 */
 
 struct malloc_segment {
-  char*        base;             /* base address */
-  size_t       size;             /* allocated size */
-  struct malloc_segment* next;   /* ptr to next segment */
-  flag_t       sflags;           /* mmap and extern flag */
+	char*        base;             /* base address */
+	size_t       size;             /* allocated size */
+	struct malloc_segment* next;   /* ptr to next segment */
+	flag_t       sflags;           /* mmap and extern flag */
 };
 
 #define is_mmapped_segment(S)  ((S)->sflags & USE_MMAP_BIT)
@@ -2454,27 +2454,27 @@
 #define MAX_SMALL_REQUEST (MAX_SMALL_SIZE - CHUNK_ALIGN_MASK - CHUNK_OVERHEAD)
 
 struct malloc_state {
-  binmap_t   smallmap;
-  binmap_t   treemap;
-  size_t     dvsize;
-  size_t     topsize;
-  char*      least_addr;
-  mchunkptr  dv;
-  mchunkptr  top;
-  size_t     trim_check;
-  size_t     release_checks;
-  size_t     magic;
-  mchunkptr  smallbins[(NSMALLBINS+1)*2];
-  tbinptr    treebins[NTREEBINS];
-  size_t     footprint;
-  size_t     max_footprint;
-  flag_t     mflags;
+	binmap_t   smallmap;
+	binmap_t   treemap;
+	size_t     dvsize;
+	size_t     topsize;
+	char*      least_addr;
+	mchunkptr  dv;
+	mchunkptr  top;
+	size_t     trim_check;
+	size_t     release_checks;
+	size_t     magic;
+	mchunkptr  smallbins[(NSMALLBINS+1)*2];
+	tbinptr    treebins[NTREEBINS];
+	size_t     footprint;
+	size_t     max_footprint;
+	flag_t     mflags;
 #if USE_LOCKS
-  MLOCK_T    mutex;     /* locate lock among fields that rarely change */
+	MLOCK_T    mutex;     /* locate lock among fields that rarely change */
 #endif /* USE_LOCKS */
-  msegment   seg;
-  void*      extp;      /* Unused but available for extensions */
-  size_t     exts;
+	msegment   seg;
+	void*      extp;      /* Unused but available for extensions */
+	size_t     exts;
 };
 
 typedef struct malloc_state*    mstate;
@@ -2489,12 +2489,12 @@
 */
 
 struct malloc_params {
-  volatile size_t magic;
-  size_t page_size;
-  size_t granularity;
-  size_t mmap_threshold;
-  size_t trim_threshold;
-  flag_t default_mflags;
+	volatile size_t magic;
+	size_t page_size;
+	size_t granularity;
+	size_t mmap_threshold;
+	size_t trim_threshold;
+	flag_t default_mflags;
 };
 
 static struct malloc_params mparams;
@@ -2564,24 +2564,24 @@
 
 /* Return segment holding given address */
 static msegmentptr segment_holding(mstate m, char* addr) {
-  msegmentptr sp = &m->seg;
-  for (;;) {
-    if (addr >= sp->base && addr < sp->base + sp->size)
-      return sp;
-    if ((sp = sp->next) == 0)
-      return 0;
-  }
+	msegmentptr sp = &m->seg;
+	for (;;) {
+		if (addr >= sp->base && addr < sp->base + sp->size)
+			return sp;
+		if ((sp = sp->next) == 0)
+			return 0;
+	}
 }
 
 /* Return true if segment contains a segment link */
 static int has_segment_link(mstate m, msegmentptr ss) {
-  msegmentptr sp = &m->seg;
-  for (;;) {
-    if ((char*)sp >= ss->base && (char*)sp < ss->base + ss->size)
-      return 1;
-    if ((sp = sp->next) == 0)
-      return 0;
-  }
+	msegmentptr sp = &m->seg;
+	for (;;) {
+		if ((char*)sp >= ss->base && (char*)sp < ss->base + ss->size)
+			return 1;
+		if ((sp = sp->next) == 0)
+			return 0;
+	}
 }
 
 #ifndef MORECORE_CANNOT_TRIM
@@ -2962,110 +2962,110 @@
 /* Initialize mparams */
 static int init_mparams(void) {
 #ifdef NEED_GLOBAL_LOCK_INIT
-  if (malloc_global_mutex_status <= 0)
-    init_malloc_global_mutex();
+	if (malloc_global_mutex_status <= 0)
+		init_malloc_global_mutex();
 #endif
 
-  ACQUIRE_MALLOC_GLOBAL_LOCK();
-  if (mparams.magic == 0) {
-    size_t magic;
-    size_t psize;
-    size_t gsize;
+	ACQUIRE_MALLOC_GLOBAL_LOCK();
+	if (mparams.magic == 0) {
+		size_t magic;
+		size_t psize;
+		size_t gsize;
 
 #ifndef WIN32
-    psize = malloc_getpagesize;
-    gsize = ((DEFAULT_GRANULARITY != 0)? DEFAULT_GRANULARITY : psize);
+		psize = malloc_getpagesize;
+		gsize = ((DEFAULT_GRANULARITY != 0)? DEFAULT_GRANULARITY : psize);
 #else /* WIN32 */
-    {
-      SYSTEM_INFO system_info;
-      GetSystemInfo(&system_info);
-      psize = system_info.dwPageSize;
-      gsize = ((DEFAULT_GRANULARITY != 0)?
-               DEFAULT_GRANULARITY : system_info.dwAllocationGranularity);
-    }
+		{
+			SYSTEM_INFO system_info;
+			GetSystemInfo(&system_info);
+			psize = system_info.dwPageSize;
+			gsize = ((DEFAULT_GRANULARITY != 0)?
+			         DEFAULT_GRANULARITY : system_info.dwAllocationGranularity);
+		}
 #endif /* WIN32 */
 
-    /* Sanity-check configuration:
-       size_t must be unsigned and as wide as pointer type.
-       ints must be at least 4 bytes.
-       alignment must be at least 8.
-       Alignment, min chunk size, and page size must all be powers of 2.
-    */
-    if ((sizeof(size_t) != sizeof(char*)) ||
-        (MAX_SIZE_T < MIN_CHUNK_SIZE)  ||
-        (sizeof(int) < 4)  ||
-        (MALLOC_ALIGNMENT < (size_t)8U) ||
-        ((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-SIZE_T_ONE)) != 0) ||
-        ((MCHUNK_SIZE      & (MCHUNK_SIZE-SIZE_T_ONE))      != 0) ||
-        ((gsize            & (gsize-SIZE_T_ONE))            != 0) ||
-        ((psize            & (psize-SIZE_T_ONE))            != 0))
-      ABORT;
-
-    mparams.granularity = gsize;
-    mparams.page_size = psize;
-    mparams.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
-    mparams.trim_threshold = DEFAULT_TRIM_THRESHOLD;
+		/* Sanity-check configuration:
+		   size_t must be unsigned and as wide as pointer type.
+		   ints must be at least 4 bytes.
+		   alignment must be at least 8.
+		   Alignment, min chunk size, and page size must all be powers of 2.
+		*/
+		if ((sizeof(size_t) != sizeof(char*)) ||
+		        (MAX_SIZE_T < MIN_CHUNK_SIZE)  ||
+		        (sizeof(int) < 4)  ||
+		        (MALLOC_ALIGNMENT < (size_t)8U) ||
+		        ((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-SIZE_T_ONE)) != 0) ||
+		        ((MCHUNK_SIZE      & (MCHUNK_SIZE-SIZE_T_ONE))      != 0) ||
+		        ((gsize            & (gsize-SIZE_T_ONE))            != 0) ||
+		        ((psize            & (psize-SIZE_T_ONE))            != 0))
+			ABORT;
+
+		mparams.granularity = gsize;
+		mparams.page_size = psize;
+		mparams.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
+		mparams.trim_threshold = DEFAULT_TRIM_THRESHOLD;
 #if MORECORE_CONTIGUOUS
-    mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT;
+		mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT;
 #else  /* MORECORE_CONTIGUOUS */
-    mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT|USE_NONCONTIGUOUS_BIT;
+		mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT|USE_NONCONTIGUOUS_BIT;
 #endif /* MORECORE_CONTIGUOUS */
 
 #if !ONLY_MSPACES
-    /* Set up lock for main malloc area */
-    gm->mflags = mparams.default_mflags;
-    INITIAL_LOCK(&gm->mutex);
+		/* Set up lock for main malloc area */
+		gm->mflags = mparams.default_mflags;
+		INITIAL_LOCK(&gm->mutex);
 #endif
 
-    {
+		{
 #if USE_DEV_RANDOM
-      int fd;
-      unsigned char buf[sizeof(size_t)];
-      /* Try to use /dev/urandom, else fall back on using time */
-      if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 &&
-          read(fd, buf, sizeof(buf)) == sizeof(buf)) {
-        magic = *((size_t *) buf);
-        close(fd);
-      }
-      else
+			int fd;
+			unsigned char buf[sizeof(size_t)];
+			/* Try to use /dev/urandom, else fall back on using time */
+			if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 &&
+			        read(fd, buf, sizeof(buf)) == sizeof(buf)) {
+				magic = *((size_t *) buf);
+				close(fd);
+			}
+			else
 #endif /* USE_DEV_RANDOM */
 #ifdef WIN32
-        magic = (size_t)(GetTickCount() ^ (size_t)0x55555555U);
+				magic = (size_t)(GetTickCount() ^ (size_t)0x55555555U);
 #else
-        magic = (size_t)(time(0) ^ (size_t)0x55555555U);
+				magic = (size_t)(time(0) ^ (size_t)0x55555555U);
 #endif
-      magic |= (size_t)8U;    /* ensure nonzero */
-      magic &= ~(size_t)7U;   /* improve chances of fault for bad values */
-      mparams.magic = magic;
-    }
-  }
+			magic |= (size_t)8U;    /* ensure nonzero */
+			magic &= ~(size_t)7U;   /* improve chances of fault for bad values */
+			mparams.magic = magic;
+		}
+	}
 
-  RELEASE_MALLOC_GLOBAL_LOCK();
-  return 1;
+	RELEASE_MALLOC_GLOBAL_LOCK();
+	return 1;
 }
 
 /* support for mallopt */
 static int change_mparam(int param_number, int value) {
-  size_t val;
-  ensure_initialization();
-  val = (value == -1)? MAX_SIZE_T : (size_t)value;
-  switch(param_number) {
-  case M_TRIM_THRESHOLD:
-    mparams.trim_threshold = val;
-    return 1;
-  case M_GRANULARITY:
-    if (val >= mparams.page_size && ((val & (val-1)) == 0)) {
-      mparams.granularity = val;
-      return 1;
-    }
-    else
-      return 0;
-  case M_MMAP_THRESHOLD:
-    mparams.mmap_threshold = val;
-    return 1;
-  default:
-    return 0;
-  }
+	size_t val;
+	ensure_initialization();
+	val = (value == -1)? MAX_SIZE_T : (size_t)value;
+	switch(param_number) {
+	case M_TRIM_THRESHOLD:
+		mparams.trim_threshold = val;
+		return 1;
+	case M_GRANULARITY:
+		if (val >= mparams.page_size && ((val & (val-1)) == 0)) {
+			mparams.granularity = val;
+			return 1;
+		}
+		else
+			return 0;
+	case M_MMAP_THRESHOLD:
+		mparams.mmap_threshold = val;
+		return 1;
+	default:
+		return 0;
+	}
 }
 
 #if DEBUG
@@ -3073,266 +3073,266 @@
 
 /* Check properties of any chunk, whether free, inuse, mmapped etc  */
 static void do_check_any_chunk(mstate m, mchunkptr p) {
-  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
-  assert(ok_address(m, p));
+	assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+	assert(ok_address(m, p));
 }
 
 /* Check properties of top chunk */
 static void do_check_top_chunk(mstate m, mchunkptr p) {
-  msegmentptr sp = segment_holding(m, (char*)p);
-  size_t  sz = p->head & ~INUSE_BITS; /* third-lowest bit can be set! */
-  assert(sp != 0);
-  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
-  assert(ok_address(m, p));
-  assert(sz == m->topsize);
-  assert(sz > 0);
-  assert(sz == ((sp->base + sp->size) - (char*)p) - TOP_FOOT_SIZE);
-  assert(pinuse(p));
-  assert(!pinuse(chunk_plus_offset(p, sz)));
+	msegmentptr sp = segment_holding(m, (char*)p);
+	size_t  sz = p->head & ~INUSE_BITS; /* third-lowest bit can be set! */
+	assert(sp != 0);
+	assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+	assert(ok_address(m, p));
+	assert(sz == m->topsize);
+	assert(sz > 0);
+	assert(sz == ((sp->base + sp->size) - (char*)p) - TOP_FOOT_SIZE);
+	assert(pinuse(p));
+	assert(!pinuse(chunk_plus_offset(p, sz)));
 }
 
 /* Check properties of (inuse) mmapped chunks */
 static void do_check_mmapped_chunk(mstate m, mchunkptr p) {
-  size_t  sz = chunksize(p);
-  size_t len = (sz + (p->prev_foot) + MMAP_FOOT_PAD);
-  assert(is_mmapped(p));
-  assert(use_mmap(m));
-  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
-  assert(ok_address(m, p));
-  assert(!is_small(sz));
-  assert((len & (mparams.page_size-SIZE_T_ONE)) == 0);
-  assert(chunk_plus_offset(p, sz)->head == FENCEPOST_HEAD);
-  assert(chunk_plus_offset(p, sz+SIZE_T_SIZE)->head == 0);
+	size_t  sz = chunksize(p);
+	size_t len = (sz + (p->prev_foot) + MMAP_FOOT_PAD);
+	assert(is_mmapped(p));
+	assert(use_mmap(m));
+	assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+	assert(ok_address(m, p));
+	assert(!is_small(sz));
+	assert((len & (mparams.page_size-SIZE_T_ONE)) == 0);
+	assert(chunk_plus_offset(p, sz)->head == FENCEPOST_HEAD);
+	assert(chunk_plus_offset(p, sz+SIZE_T_SIZE)->head == 0);
 }
 
 /* Check properties of inuse chunks */
 static void do_check_inuse_chunk(mstate m, mchunkptr p) {
-  do_check_any_chunk(m, p);
-  assert(is_inuse(p));
-  assert(next_pinuse(p));
-  /* If not pinuse and not mmapped, previous chunk has OK offset */
-  assert(is_mmapped(p) || pinuse(p) || next_chunk(prev_chunk(p)) == p);
-  if (is_mmapped(p))
-    do_check_mmapped_chunk(m, p);
+	do_check_any_chunk(m, p);
+	assert(is_inuse(p));
+	assert(next_pinuse(p));
+	/* If not pinuse and not mmapped, previous chunk has OK offset */
+	assert(is_mmapped(p) || pinuse(p) || next_chunk(prev_chunk(p)) == p);
+	if (is_mmapped(p))
+		do_check_mmapped_chunk(m, p);
 }
 
 /* Check properties of free chunks */
 static void do_check_free_chunk(mstate m, mchunkptr p) {
-  size_t sz = chunksize(p);
-  mchunkptr next = chunk_plus_offset(p, sz);
-  do_check_any_chunk(m, p);
-  assert(!is_inuse(p));
-  assert(!next_pinuse(p));
-  assert (!is_mmapped(p));
-  if (p != m->dv && p != m->top) {
-    if (sz >= MIN_CHUNK_SIZE) {
-      assert((sz & CHUNK_ALIGN_MASK) == 0);
-      assert(is_aligned(chunk2mem(p)));
-      assert(next->prev_foot == sz);
-      assert(pinuse(p));
-      assert (next == m->top || is_inuse(next));
-      assert(p->fd->bk == p);
-      assert(p->bk->fd == p);
-    }
-    else  /* markers are always of size SIZE_T_SIZE */
-      assert(sz == SIZE_T_SIZE);
-  }
+	size_t sz = chunksize(p);
+	mchunkptr next = chunk_plus_offset(p, sz);
+	do_check_any_chunk(m, p);
+	assert(!is_inuse(p));
+	assert(!next_pinuse(p));
+	assert (!is_mmapped(p));
+	if (p != m->dv && p != m->top) {
+		if (sz >= MIN_CHUNK_SIZE) {
+			assert((sz & CHUNK_ALIGN_MASK) == 0);
+			assert(is_aligned(chunk2mem(p)));
+			assert(next->prev_foot == sz);
+			assert(pinuse(p));
+			assert (next == m->top || is_inuse(next));
+			assert(p->fd->bk == p);
+			assert(p->bk->fd == p);
+		}
+		else  /* markers are always of size SIZE_T_SIZE */
+			assert(sz == SIZE_T_SIZE);
+	}
 }
 
 /* Check properties of malloced chunks at the point they are malloced */
 static void do_check_malloced_chunk(mstate m, void* mem, size_t s) {
-  if (mem != 0) {
-    mchunkptr p = mem2chunk(mem);
-    size_t sz = p->head & ~INUSE_BITS;
-    do_check_inuse_chunk(m, p);
-    assert((sz & CHUNK_ALIGN_MASK) == 0);
-    assert(sz >= MIN_CHUNK_SIZE);
-    assert(sz >= s);
-    /* unless mmapped, size is less than MIN_CHUNK_SIZE more than request */
-    assert(is_mmapped(p) || sz < (s + MIN_CHUNK_SIZE));
-  }
+	if (mem != 0) {
+		mchunkptr p = mem2chunk(mem);
+		size_t sz = p->head & ~INUSE_BITS;
+		do_check_inuse_chunk(m, p);
+		assert((sz & CHUNK_ALIGN_MASK) == 0);
+		assert(sz >= MIN_CHUNK_SIZE);
+		assert(sz >= s);
+		/* unless mmapped, size is less than MIN_CHUNK_SIZE more than request */
+		assert(is_mmapped(p) || sz < (s + MIN_CHUNK_SIZE));
+	}
 }
 
 /* Check a tree and its subtrees.  */
 static void do_check_tree(mstate m, tchunkptr t) {
-  tchunkptr head = 0;
-  tchunkptr u = t;
-  bindex_t tindex = t->index;
-  size_t tsize = chunksize(t);
-  bindex_t idx;
-  compute_tree_index(tsize, idx);
-  assert(tindex == idx);
-  assert(tsize >= MIN_LARGE_SIZE);
-  assert(tsize >= minsize_for_tree_index(idx));
-  assert((idx == NTREEBINS-1) || (tsize < minsize_for_tree_index((idx+1))));
-
-  do { /* traverse through chain of same-sized nodes */
-    do_check_any_chunk(m, ((mchunkptr)u));
-    assert(u->index == tindex);
-    assert(chunksize(u) == tsize);
-    assert(!is_inuse(u));
-    assert(!next_pinuse(u));
-    assert(u->fd->bk == u);
-    assert(u->bk->fd == u);
-    if (u->parent == 0) {
-      assert(u->child[0] == 0);
-      assert(u->child[1] == 0);
-    }
-    else {
-      assert(head == 0); /* only one node on chain has parent */
-      head = u;
-      assert(u->parent != u);
-      assert (u->parent->child[0] == u ||
-              u->parent->child[1] == u ||
-              *((tbinptr*)(u->parent)) == u);
-      if (u->child[0] != 0) {
-        assert(u->child[0]->parent == u);
-        assert(u->child[0] != u);
-        do_check_tree(m, u->child[0]);
-      }
-      if (u->child[1] != 0) {
-        assert(u->child[1]->parent == u);
-        assert(u->child[1] != u);
-        do_check_tree(m, u->child[1]);
-      }
-      if (u->child[0] != 0 && u->child[1] != 0) {
-        assert(chunksize(u->child[0]) < chunksize(u->child[1]));
-      }
-    }
-    u = u->fd;
-  } while (u != t);
-  assert(head != 0);
+	tchunkptr head = 0;
+	tchunkptr u = t;
+	bindex_t tindex = t->index;
+	size_t tsize = chunksize(t);
+	bindex_t idx;
+	compute_tree_index(tsize, idx);
+	assert(tindex == idx);
+	assert(tsize >= MIN_LARGE_SIZE);
+	assert(tsize >= minsize_for_tree_index(idx));
+	assert((idx == NTREEBINS-1) || (tsize < minsize_for_tree_index((idx+1))));
+
+	do { /* traverse through chain of same-sized nodes */
+		do_check_any_chunk(m, ((mchunkptr)u));
+		assert(u->index == tindex);
+		assert(chunksize(u) == tsize);
+		assert(!is_inuse(u));
+		assert(!next_pinuse(u));
+		assert(u->fd->bk == u);
+		assert(u->bk->fd == u);
+		if (u->parent == 0) {
+			assert(u->child[0] == 0);
+			assert(u->child[1] == 0);
+		}
+		else {
+			assert(head == 0); /* only one node on chain has parent */
+			head = u;
+			assert(u->parent != u);
+			assert (u->parent->child[0] == u ||
+			        u->parent->child[1] == u ||
+			        *((tbinptr*)(u->parent)) == u);
+			if (u->child[0] != 0) {
+				assert(u->child[0]->parent == u);
+				assert(u->child[0] != u);
+				do_check_tree(m, u->child[0]);
+			}
+			if (u->child[1] != 0) {
+				assert(u->child[1]->parent == u);
+				assert(u->child[1] != u);
+				do_check_tree(m, u->child[1]);
+			}
+			if (u->child[0] != 0 && u->child[1] != 0) {
+				assert(chunksize(u->child[0]) < chunksize(u->child[1]));
+			}
+		}
+		u = u->fd;
+	} while (u != t);
+	assert(head != 0);
 }
 
 /*  Check all the chunks in a treebin.  */
 static void do_check_treebin(mstate m, bindex_t i) {
-  tbinptr* tb = treebin_at(m, i);
-  tchunkptr t = *tb;
-  int empty = (m->treemap & (1U << i)) == 0;
-  if (t == 0)
-    assert(empty);
-  if (!empty)
-    do_check_tree(m, t);
+	tbinptr* tb = treebin_at(m, i);
+	tchunkptr t = *tb;
+	int empty = (m->treemap & (1U << i)) == 0;
+	if (t == 0)
+		assert(empty);
+	if (!empty)
+		do_check_tree(m, t);
 }
 
 /*  Check all the chunks in a smallbin.  */
 static void do_check_smallbin(mstate m, bindex_t i) {
-  sbinptr b = smallbin_at(m, i);
-  mchunkptr p = b->bk;
-  unsigned int empty = (m->smallmap & (1U << i)) == 0;
-  if (p == b)
-    assert(empty);
-  if (!empty) {
-    for (; p != b; p = p->bk) {
-      size_t size = chunksize(p);
-      mchunkptr q;
-      /* each chunk claims to be free */
-      do_check_free_chunk(m, p);
-      /* chunk belongs in bin */
-      assert(small_index(size) == i);
-      assert(p->bk == b || chunksize(p->bk) == chunksize(p));
-      /* chunk is followed by an inuse chunk */
-      q = next_chunk(p);
-      if (q->head != FENCEPOST_HEAD)
-        do_check_inuse_chunk(m, q);
-    }
-  }
+	sbinptr b = smallbin_at(m, i);
+	mchunkptr p = b->bk;
+	unsigned int empty = (m->smallmap & (1U << i)) == 0;
+	if (p == b)
+		assert(empty);
+	if (!empty) {
+		for (; p != b; p = p->bk) {
+			size_t size = chunksize(p);
+			mchunkptr q;
+			/* each chunk claims to be free */
+			do_check_free_chunk(m, p);
+			/* chunk belongs in bin */
+			assert(small_index(size) == i);
+			assert(p->bk == b || chunksize(p->bk) == chunksize(p));
+			/* chunk is followed by an inuse chunk */
+			q = next_chunk(p);
+			if (q->head != FENCEPOST_HEAD)
+				do_check_inuse_chunk(m, q);
+		}
+	}
 }
 
 /* Find x in a bin. Used in other check functions. */
 static int bin_find(mstate m, mchunkptr x) {
-  size_t size = chunksize(x);
-  if (is_small(size)) {
-    bindex_t sidx = small_index(size);
-    sbinptr b = smallbin_at(m, sidx);
-    if (smallmap_is_marked(m, sidx)) {
-      mchunkptr p = b;
-      do {
-        if (p == x)
-          return 1;
-      } while ((p = p->fd) != b);
-    }
-  }
-  else {
-    bindex_t tidx;
-    compute_tree_index(size, tidx);
-    if (treemap_is_marked(m, tidx)) {
-      tchunkptr t = *treebin_at(m, tidx);
-      size_t sizebits = size << leftshift_for_tree_index(tidx);
-      while (t != 0 && chunksize(t) != size) {
-        t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
-        sizebits <<= 1;
-      }
-      if (t != 0) {
-        tchunkptr u = t;
-        do {
-          if (u == (tchunkptr)x)
-            return 1;
-        } while ((u = u->fd) != t);
-      }
-    }
-  }
-  return 0;
+	size_t size = chunksize(x);
+	if (is_small(size)) {
+		bindex_t sidx = small_index(size);
+		sbinptr b = smallbin_at(m, sidx);
+		if (smallmap_is_marked(m, sidx)) {
+			mchunkptr p = b;
+			do {
+				if (p == x)
+					return 1;
+			} while ((p = p->fd) != b);
+		}
+	}
+	else {
+		bindex_t tidx;
+		compute_tree_index(size, tidx);
+		if (treemap_is_marked(m, tidx)) {
+			tchunkptr t = *treebin_at(m, tidx);
+			size_t sizebits = size << leftshift_for_tree_index(tidx);
+			while (t != 0 && chunksize(t) != size) {
+				t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
+				sizebits <<= 1;
+			}
+			if (t != 0) {
+				tchunkptr u = t;
+				do {
+					if (u == (tchunkptr)x)
+						return 1;
+				} while ((u = u->fd) != t);
+			}
+		}
+	}
+	return 0;
 }
 
 /* Traverse each chunk and check it; return total */
 static size_t traverse_and_check(mstate m) {
-  size_t sum = 0;
-  if (is_initialized(m)) {
-    msegmentptr s = &m->seg;
-    sum += m->topsize + TOP_FOOT_SIZE;
-    while (s != 0) {
-      mchunkptr q = align_as_chunk(s->base);
-      mchunkptr lastq = 0;
-      assert(pinuse(q));
-      while (segment_holds(s, q) &&
-             q != m->top && q->head != FENCEPOST_HEAD) {
-        sum += chunksize(q);
-        if (is_inuse(q)) {
-          assert(!bin_find(m, q));
-          do_check_inuse_chunk(m, q);
-        }
-        else {
-          assert(q == m->dv || bin_find(m, q));
-          assert(lastq == 0 || is_inuse(lastq)); /* Not 2 consecutive free */
-          do_check_free_chunk(m, q);
-        }
-        lastq = q;
-        q = next_chunk(q);
-      }
-      s = s->next;
-    }
-  }
-  return sum;
+	size_t sum = 0;
+	if (is_initialized(m)) {
+		msegmentptr s = &m->seg;
+		sum += m->topsize + TOP_FOOT_SIZE;
+		while (s != 0) {
+			mchunkptr q = align_as_chunk(s->base);
+			mchunkptr lastq = 0;
+			assert(pinuse(q));
+			while (segment_holds(s, q) &&
+			        q != m->top && q->head != FENCEPOST_HEAD) {
+				sum += chunksize(q);
+				if (is_inuse(q)) {
+					assert(!bin_find(m, q));
+					do_check_inuse_chunk(m, q);
+				}
+				else {
+					assert(q == m->dv || bin_find(m, q));
+					assert(lastq == 0 || is_inuse(lastq)); /* Not 2 consecutive free */
+					do_check_free_chunk(m, q);
+				}
+				lastq = q;
+				q = next_chunk(q);
+			}
+			s = s->next;
+		}
+	}
+	return sum;
 }
 
 /* Check all properties of malloc_state. */
 static void do_check_malloc_state(mstate m) {
-  bindex_t i;
-  size_t total;
-  /* check bins */
-  for (i = 0; i < NSMALLBINS; ++i)
-    do_check_smallbin(m, i);
-  for (i = 0; i < NTREEBINS; ++i)
-    do_check_treebin(m, i);
-
-  if (m->dvsize != 0) { /* check dv chunk */
-    do_check_any_chunk(m, m->dv);
-    assert(m->dvsize == chunksize(m->dv));
-    assert(m->dvsize >= MIN_CHUNK_SIZE);
-    assert(bin_find(m, m->dv) == 0);
-  }
-
-  if (m->top != 0) {   /* check top chunk */
-    do_check_top_chunk(m, m->top);
-    /*assert(m->topsize == chunksize(m->top)); redundant */
-    assert(m->topsize > 0);
-    assert(bin_find(m, m->top) == 0);
-  }
-
-  total = traverse_and_check(m);
-  assert(total <= m->footprint);
-  assert(m->footprint <= m->max_footprint);
+	bindex_t i;
+	size_t total;
+	/* check bins */
+	for (i = 0; i < NSMALLBINS; ++i)
+		do_check_smallbin(m, i);
+	for (i = 0; i < NTREEBINS; ++i)
+		do_check_treebin(m, i);
+
+	if (m->dvsize != 0) { /* check dv chunk */
+		do_check_any_chunk(m, m->dv);
+		assert(m->dvsize == chunksize(m->dv));
+		assert(m->dvsize >= MIN_CHUNK_SIZE);
+		assert(bin_find(m, m->dv) == 0);
+	}
+
+	if (m->top != 0) {   /* check top chunk */
+		do_check_top_chunk(m, m->top);
+		/*assert(m->topsize == chunksize(m->top)); redundant */
+		assert(m->topsize > 0);
+		assert(bin_find(m, m->top) == 0);
+	}
+
+	total = traverse_and_check(m);
+	assert(total <= m->footprint);
+	assert(m->footprint <= m->max_footprint);
 }
 #endif /* DEBUG */
 
@@ -3340,76 +3340,76 @@
 
 #if !NO_MALLINFO
 static struct mallinfo internal_mallinfo(mstate m) {
-  struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-  ensure_initialization();
-  if (!PREACTION(m)) {
-    check_malloc_state(m);
-    if (is_initialized(m)) {
-      size_t nfree = SIZE_T_ONE; /* top always free */
-      size_t mfree = m->topsize + TOP_FOOT_SIZE;
-      size_t sum = mfree;
-      msegmentptr s = &m->seg;
-      while (s != 0) {
-        mchunkptr q = align_as_chunk(s->base);
-        while (segment_holds(s, q) &&
-               q != m->top && q->head != FENCEPOST_HEAD) {
-          size_t sz = chunksize(q);
-          sum += sz;
-          if (!is_inuse(q)) {
-            mfree += sz;
-            ++nfree;
-          }
-          q = next_chunk(q);
-        }
-        s = s->next;
-      }
-
-      nm.arena    = sum;
-      nm.ordblks  = nfree;
-      nm.hblkhd   = m->footprint - sum;
-      nm.usmblks  = m->max_footprint;
-      nm.uordblks = m->footprint - mfree;
-      nm.fordblks = mfree;
-      nm.keepcost = m->topsize;
-    }
-
-    POSTACTION(m);
-  }
-  return nm;
+	struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+	ensure_initialization();
+	if (!PREACTION(m)) {
+		check_malloc_state(m);
+		if (is_initialized(m)) {
+			size_t nfree = SIZE_T_ONE; /* top always free */
+			size_t mfree = m->topsize + TOP_FOOT_SIZE;
+			size_t sum = mfree;
+			msegmentptr s = &m->seg;
+			while (s != 0) {
+				mchunkptr q = align_as_chunk(s->base);
+				while (segment_holds(s, q) &&
+				        q != m->top && q->head != FENCEPOST_HEAD) {
+					size_t sz = chunksize(q);
+					sum += sz;
+					if (!is_inuse(q)) {
+						mfree += sz;
+						++nfree;
+					}
+					q = next_chunk(q);
+				}
+				s = s->next;
+			}
+
+			nm.arena    = sum;
+			nm.ordblks  = nfree;
+			nm.hblkhd   = m->footprint - sum;
+			nm.usmblks  = m->max_footprint;
+			nm.uordblks = m->footprint - mfree;
+			nm.fordblks = mfree;
+			nm.keepcost = m->topsize;
+		}
+
+		POSTACTION(m);
+	}
+	return nm;
 }
 #endif /* !NO_MALLINFO */
 
 static void internal_malloc_stats(mstate m) {
-  ensure_initialization();
-  if (!PREACTION(m)) {
-    size_t maxfp = 0;
-    size_t fp = 0;
-    size_t used = 0;
-    check_malloc_state(m);
-    if (is_initialized(m)) {
-      msegmentptr s = &m->seg;
-      maxfp = m->max_footprint;
-      fp = m->footprint;
-      used = fp - (m->topsize + TOP_FOOT_SIZE);
-
-      while (s != 0) {
-        mchunkptr q = align_as_chunk(s->base);
-        while (segment_holds(s, q) &&
-               q != m->top && q->head != FENCEPOST_HEAD) {
-          if (!is_inuse(q))
-            used -= chunksize(q);
-          q = next_chunk(q);
-        }
-        s = s->next;
-      }
-    }
-
-    fprintf(stderr, "max system bytes = %10lu\n", (unsigned long)(maxfp));
-    fprintf(stderr, "system bytes     = %10lu\n", (unsigned long)(fp));
-    fprintf(stderr, "in use bytes     = %10lu\n", (unsigned long)(used));
+	ensure_initialization();
+	if (!PREACTION(m)) {
+		size_t maxfp = 0;
+		size_t fp = 0;
+		size_t used = 0;
+		check_malloc_state(m);
+		if (is_initialized(m)) {
+			msegmentptr s = &m->seg;
+			maxfp = m->max_footprint;
+			fp = m->footprint;
+			used = fp - (m->topsize + TOP_FOOT_SIZE);
+
+			while (s != 0) {
+				mchunkptr q = align_as_chunk(s->base);
+				while (segment_holds(s, q) &&
+				        q != m->top && q->head != FENCEPOST_HEAD) {
+					if (!is_inuse(q))
+						used -= chunksize(q);
+					q = next_chunk(q);
+				}
+				s = s->next;
+			}
+		}
+
+		fprintf(stderr, "max system bytes = %10lu\n", (unsigned long)(maxfp));
+		fprintf(stderr, "system bytes     = %10lu\n", (unsigned long)(fp));
+		fprintf(stderr, "in use bytes     = %10lu\n", (unsigned long)(used));
 
-    POSTACTION(m);
-  }
+		POSTACTION(m);
+	}
 }
 
 /* ----------------------- Operations on smallbins ----------------------- */
@@ -3639,7 +3639,7 @@
 #define insert_chunk(M, P, S)\
   if (is_small(S)) insert_small_chunk(M, P, S)\
   else { tchunkptr TP = (tchunkptr)(P); insert_large_chunk(M, TP, S); }
-  
+
 
 #define unlink_chunk(M, P, S)\
   if (is_small(S)) unlink_small_chunk(M, P, S)\
@@ -3675,521 +3675,521 @@
 
 /* Malloc using mmap */
 static void* mmap_alloc(mstate m, size_t nb) {
-  size_t mmsize = mmap_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
-  if (mmsize > nb) {     /* Check for wrap around 0 */
-    char* mm = (char*)(CALL_DIRECT_MMAP(mmsize));
-    if (mm != CMFAIL) {
-      size_t offset = align_offset(chunk2mem(mm));
-      size_t psize = mmsize - offset - MMAP_FOOT_PAD;
-      mchunkptr p = (mchunkptr)(mm + offset);
-      p->prev_foot = offset;
-      p->head = psize;
-      mark_inuse_foot(m, p, psize);
-      chunk_plus_offset(p, psize)->head = FENCEPOST_HEAD;
-      chunk_plus_offset(p, psize+SIZE_T_SIZE)->head = 0;
-
-      if (m->least_addr == 0 || mm < m->least_addr)
-        m->least_addr = mm;
-      if ((m->footprint += mmsize) > m->max_footprint)
-        m->max_footprint = m->footprint;
-      assert(is_aligned(chunk2mem(p)));
-      check_mmapped_chunk(m, p);
-      return chunk2mem(p);
-    }
-  }
-  return 0;
+	size_t mmsize = mmap_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
+	if (mmsize > nb) {     /* Check for wrap around 0 */
+		char* mm = (char*)(CALL_DIRECT_MMAP(mmsize));
+		if (mm != CMFAIL) {
+			size_t offset = align_offset(chunk2mem(mm));
+			size_t psize = mmsize - offset - MMAP_FOOT_PAD;
+			mchunkptr p = (mchunkptr)(mm + offset);
+			p->prev_foot = offset;
+			p->head = psize;
+			mark_inuse_foot(m, p, psize);
+			chunk_plus_offset(p, psize)->head = FENCEPOST_HEAD;
+			chunk_plus_offset(p, psize+SIZE_T_SIZE)->head = 0;
+
+			if (m->least_addr == 0 || mm < m->least_addr)
+				m->least_addr = mm;
+			if ((m->footprint += mmsize) > m->max_footprint)
+				m->max_footprint = m->footprint;
+			assert(is_aligned(chunk2mem(p)));
+			check_mmapped_chunk(m, p);
+			return chunk2mem(p);
+		}
+	}
+	return 0;
 }
 
 /* Realloc using mmap */
 static mchunkptr mmap_resize(mstate m, mchunkptr oldp, size_t nb) {
-  size_t oldsize = chunksize(oldp);
-  if (is_small(nb)) /* Can't shrink mmap regions below small size */
-    return 0;
-  /* Keep old chunk if big enough but not too big */
-  if (oldsize >= nb + SIZE_T_SIZE &&
-      (oldsize - nb) <= (mparams.granularity << 1))
-    return oldp;
-  else {
-    size_t offset = oldp->prev_foot;
-    size_t oldmmsize = oldsize + offset + MMAP_FOOT_PAD;
-    size_t newmmsize = mmap_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
-    char* cp = (char*)CALL_MREMAP((char*)oldp - offset,
-                                  oldmmsize, newmmsize, 1);
-    if (cp != CMFAIL) {
-      mchunkptr newp = (mchunkptr)(cp + offset);
-      size_t psize = newmmsize - offset - MMAP_FOOT_PAD;
-      newp->head = psize;
-      mark_inuse_foot(m, newp, psize);
-      chunk_plus_offset(newp, psize)->head = FENCEPOST_HEAD;
-      chunk_plus_offset(newp, psize+SIZE_T_SIZE)->head = 0;
-
-      if (cp < m->least_addr)
-        m->least_addr = cp;
-      if ((m->footprint += newmmsize - oldmmsize) > m->max_footprint)
-        m->max_footprint = m->footprint;
-      check_mmapped_chunk(m, newp);
-      return newp;
-    }
-  }
-  return 0;
+	size_t oldsize = chunksize(oldp);
+	if (is_small(nb)) /* Can't shrink mmap regions below small size */
+		return 0;
+	/* Keep old chunk if big enough but not too big */
+	if (oldsize >= nb + SIZE_T_SIZE &&
+	        (oldsize - nb) <= (mparams.granularity << 1))
+		return oldp;
+	else {
+		size_t offset = oldp->prev_foot;
+		size_t oldmmsize = oldsize + offset + MMAP_FOOT_PAD;
+		size_t newmmsize = mmap_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
+		char* cp = (char*)CALL_MREMAP((char*)oldp - offset,
+		                              oldmmsize, newmmsize, 1);
+		if (cp != CMFAIL) {
+			mchunkptr newp = (mchunkptr)(cp + offset);
+			size_t psize = newmmsize - offset - MMAP_FOOT_PAD;
+			newp->head = psize;
+			mark_inuse_foot(m, newp, psize);
+			chunk_plus_offset(newp, psize)->head = FENCEPOST_HEAD;
+			chunk_plus_offset(newp, psize+SIZE_T_SIZE)->head = 0;
+
+			if (cp < m->least_addr)
+				m->least_addr = cp;
+			if ((m->footprint += newmmsize - oldmmsize) > m->max_footprint)
+				m->max_footprint = m->footprint;
+			check_mmapped_chunk(m, newp);
+			return newp;
+		}
+	}
+	return 0;
 }
 
 /* -------------------------- mspace management -------------------------- */
 
 /* Initialize top chunk and its size */
 static void init_top(mstate m, mchunkptr p, size_t psize) {
-  /* Ensure alignment */
-  size_t offset = align_offset(chunk2mem(p));
-  p = (mchunkptr)((char*)p + offset);
-  psize -= offset;
-
-  m->top = p;
-  m->topsize = psize;
-  p->head = psize | PINUSE_BIT;
-  /* set size of fake trailing chunk holding overhead space only once */
-  chunk_plus_offset(p, psize)->head = TOP_FOOT_SIZE;
-  m->trim_check = mparams.trim_threshold; /* reset on each update */
+	/* Ensure alignment */
+	size_t offset = align_offset(chunk2mem(p));
+	p = (mchunkptr)((char*)p + offset);
+	psize -= offset;
+
+	m->top = p;
+	m->topsize = psize;
+	p->head = psize | PINUSE_BIT;
+	/* set size of fake trailing chunk holding overhead space only once */
+	chunk_plus_offset(p, psize)->head = TOP_FOOT_SIZE;
+	m->trim_check = mparams.trim_threshold; /* reset on each update */
 }
 
 /* Initialize bins for a new mstate that is otherwise zeroed out */
 static void init_bins(mstate m) {
-  /* Establish circular links for smallbins */
-  bindex_t i;
-  for (i = 0; i < NSMALLBINS; ++i) {
-    sbinptr bin = smallbin_at(m,i);
-    bin->fd = bin->bk = bin;
-  }
+	/* Establish circular links for smallbins */
+	bindex_t i;
+	for (i = 0; i < NSMALLBINS; ++i) {
+		sbinptr bin = smallbin_at(m,i);
+		bin->fd = bin->bk = bin;
+	}
 }
 
 #if PROCEED_ON_ERROR
 
 /* default corruption action */
 static void reset_on_error(mstate m) {
-  int i;
-  ++malloc_corruption_error_count;
-  /* Reinitialize fields to forget about all memory */
-  m->smallbins = m->treebins = 0;
-  m->dvsize = m->topsize = 0;
-  m->seg.base = 0;
-  m->seg.size = 0;
-  m->seg.next = 0;
-  m->top = m->dv = 0;
-  for (i = 0; i < NTREEBINS; ++i)
-    *treebin_at(m, i) = 0;
-  init_bins(m);
+	int i;
+	++malloc_corruption_error_count;
+	/* Reinitialize fields to forget about all memory */
+	m->smallbins = m->treebins = 0;
+	m->dvsize = m->topsize = 0;
+	m->seg.base = 0;
+	m->seg.size = 0;
+	m->seg.next = 0;
+	m->top = m->dv = 0;
+	for (i = 0; i < NTREEBINS; ++i)
+		*treebin_at(m, i) = 0;
+	init_bins(m);
 }
 #endif /* PROCEED_ON_ERROR */
 
 /* Allocate chunk and prepend remainder with chunk in successor base. */
 static void* prepend_alloc(mstate m, char* newbase, char* oldbase,
                            size_t nb) {
-  mchunkptr p = align_as_chunk(newbase);
-  mchunkptr oldfirst = align_as_chunk(oldbase);
-  bindex_t psize = (bindex_t)((char*)oldfirst - (char*)p);
-  mchunkptr q = chunk_plus_offset(p, nb);
-  bindex_t qsize = psize - (bindex_t)nb;
-  set_size_and_pinuse_of_inuse_chunk(m, p, nb);
-
-  assert((char*)oldfirst > (char*)q);
-  assert(pinuse(oldfirst));
-  assert(qsize >= MIN_CHUNK_SIZE);
-
-  /* consolidate remainder with first chunk of old base */
-  if (oldfirst == m->top) {
-    size_t tsize = m->topsize += qsize;
-    m->top = q;
-    q->head = tsize | PINUSE_BIT;
-    check_top_chunk(m, q);
-  }
-  else if (oldfirst == m->dv) {
-    size_t dsize = m->dvsize += qsize;
-    m->dv = q;
-    set_size_and_pinuse_of_free_chunk(q, dsize);
-  }
-  else {
-    if (!is_inuse(oldfirst)) {
-      bindex_t nsize = chunksize(oldfirst);
-      unlink_chunk(m, oldfirst, nsize);
-      oldfirst = chunk_plus_offset(oldfirst, nsize);
-      qsize += nsize;
-    }
-    set_free_with_pinuse(q, qsize, oldfirst);
-    insert_chunk(m, q, qsize);
-    check_free_chunk(m, q);
-  }
+	mchunkptr p = align_as_chunk(newbase);
+	mchunkptr oldfirst = align_as_chunk(oldbase);
+	bindex_t psize = (bindex_t)((char*)oldfirst - (char*)p);
+	mchunkptr q = chunk_plus_offset(p, nb);
+	bindex_t qsize = psize - (bindex_t)nb;
+	set_size_and_pinuse_of_inuse_chunk(m, p, nb);
+
+	assert((char*)oldfirst > (char*)q);
+	assert(pinuse(oldfirst));
+	assert(qsize >= MIN_CHUNK_SIZE);
+
+	/* consolidate remainder with first chunk of old base */
+	if (oldfirst == m->top) {
+		size_t tsize = m->topsize += qsize;
+		m->top = q;
+		q->head = tsize | PINUSE_BIT;
+		check_top_chunk(m, q);
+	}
+	else if (oldfirst == m->dv) {
+		size_t dsize = m->dvsize += qsize;
+		m->dv = q;
+		set_size_and_pinuse_of_free_chunk(q, dsize);
+	}
+	else {
+		if (!is_inuse(oldfirst)) {
+			bindex_t nsize = chunksize(oldfirst);
+			unlink_chunk(m, oldfirst, nsize);
+			oldfirst = chunk_plus_offset(oldfirst, nsize);
+			qsize += nsize;
+		}
+		set_free_with_pinuse(q, qsize, oldfirst);
+		insert_chunk(m, q, qsize);
+		check_free_chunk(m, q);
+	}
 
-  check_malloced_chunk(m, chunk2mem(p), nb);
-  return chunk2mem(p);
+	check_malloced_chunk(m, chunk2mem(p), nb);
+	return chunk2mem(p);
 }
 
 /* Add a segment to hold a new noncontiguous region */
 static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) {
-  /* Determine locations and sizes of segment, fenceposts, old top */
-  char* old_top = (char*)m->top;
-  msegmentptr oldsp = segment_holding(m, old_top);
-  char* old_end = oldsp->base + oldsp->size;
-  size_t ssize = pad_request(sizeof(struct malloc_segment));
-  char* rawsp = old_end - (ssize + FOUR_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
-  size_t offset = align_offset(chunk2mem(rawsp));
-  char* asp = rawsp + offset;
-  char* csp = (asp < (old_top + MIN_CHUNK_SIZE))? old_top : asp;
-  mchunkptr sp = (mchunkptr)csp;
-  msegmentptr ss = (msegmentptr)(chunk2mem(sp));
-  mchunkptr tnext = chunk_plus_offset(sp, ssize);
-  mchunkptr p = tnext;
-  int nfences = 0;
-
-  /* reset top to new space */
-  init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
-
-  /* Set up segment record */
-  assert(is_aligned(ss));
-  set_size_and_pinuse_of_inuse_chunk(m, sp, ssize);
-  *ss = m->seg; /* Push current record */
-  m->seg.base = tbase;
-  m->seg.size = tsize;
-  m->seg.sflags = mmapped;
-  m->seg.next = ss;
-
-  /* Insert trailing fenceposts */
-  for (;;) {
-    mchunkptr nextp = chunk_plus_offset(p, SIZE_T_SIZE);
-    p->head = FENCEPOST_HEAD;
-    ++nfences;
-    if ((char*)(&(nextp->head)) < old_end)
-      p = nextp;
-    else
-      break;
-  }
-  assert(nfences >= 2);
-
-  /* Insert the rest of old top into a bin as an ordinary free chunk */
-  if (csp != old_top) {
-    mchunkptr q = (mchunkptr)old_top;
-    bindex_t psize = (bindex_t)(csp - old_top);
-    mchunkptr tn = chunk_plus_offset(q, psize);
-    set_free_with_pinuse(q, psize, tn);
-    insert_chunk(m, q, psize);
-  }
+	/* Determine locations and sizes of segment, fenceposts, old top */
+	char* old_top = (char*)m->top;
+	msegmentptr oldsp = segment_holding(m, old_top);
+	char* old_end = oldsp->base + oldsp->size;
+	size_t ssize = pad_request(sizeof(struct malloc_segment));
+	char* rawsp = old_end - (ssize + FOUR_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
+	size_t offset = align_offset(chunk2mem(rawsp));
+	char* asp = rawsp + offset;
+	char* csp = (asp < (old_top + MIN_CHUNK_SIZE))? old_top : asp;
+	mchunkptr sp = (mchunkptr)csp;
+	msegmentptr ss = (msegmentptr)(chunk2mem(sp));
+	mchunkptr tnext = chunk_plus_offset(sp, ssize);
+	mchunkptr p = tnext;
+	int nfences = 0;
+
+	/* reset top to new space */
+	init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
+
+	/* Set up segment record */
+	assert(is_aligned(ss));
+	set_size_and_pinuse_of_inuse_chunk(m, sp, ssize);
+	*ss = m->seg; /* Push current record */
+	m->seg.base = tbase;
+	m->seg.size = tsize;
+	m->seg.sflags = mmapped;
+	m->seg.next = ss;
+
+	/* Insert trailing fenceposts */
+	for (;;) {
+		mchunkptr nextp = chunk_plus_offset(p, SIZE_T_SIZE);
+		p->head = FENCEPOST_HEAD;
+		++nfences;
+		if ((char*)(&(nextp->head)) < old_end)
+			p = nextp;
+		else
+			break;
+	}
+	assert(nfences >= 2);
+
+	/* Insert the rest of old top into a bin as an ordinary free chunk */
+	if (csp != old_top) {
+		mchunkptr q = (mchunkptr)old_top;
+		bindex_t psize = (bindex_t)(csp - old_top);
+		mchunkptr tn = chunk_plus_offset(q, psize);
+		set_free_with_pinuse(q, psize, tn);
+		insert_chunk(m, q, psize);
+	}
 
-  check_top_chunk(m, m->top);
+	check_top_chunk(m, m->top);
 }
 
 /* -------------------------- System allocation -------------------------- */
 
 /* Get memory from system using MORECORE or MMAP */
 static void* sys_alloc(mstate m, size_t nb) {
-  char* tbase = CMFAIL;
-  size_t tsize = 0;
-  flag_t mmap_flag = 0;
-
-  ensure_initialization();
-
-  /* Directly map large chunks, but only if already initialized */
-  if (use_mmap(m) && nb >= mparams.mmap_threshold && m->topsize != 0) {
-    void* mem = mmap_alloc(m, nb);
-    if (mem != 0)
-      return mem;
-  }
-
-  /*
-    Try getting memory in any of three ways (in most-preferred to
-    least-preferred order):
-    1. A call to MORECORE that can normally contiguously extend memory.
-       (disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or
-       or main space is mmapped or a previous contiguous call failed)
-    2. A call to MMAP new space (disabled if not HAVE_MMAP).
-       Note that under the default settings, if MORECORE is unable to
-       fulfill a request, and HAVE_MMAP is true, then mmap is
-       used as a noncontiguous system allocator. This is a useful backup
-       strategy for systems with holes in address spaces -- in this case
-       sbrk cannot contiguously expand the heap, but mmap may be able to
-       find space.
-    3. A call to MORECORE that cannot usually contiguously extend memory.
-       (disabled if not HAVE_MORECORE)
-
-   In all cases, we need to request enough bytes from system to ensure
-   we can malloc nb bytes upon success, so pad with enough space for
-   top_foot, plus alignment-pad to make sure we don't lose bytes if
-   not on boundary, and round this up to a granularity unit.
-  */
-
-  if (MORECORE_CONTIGUOUS && !use_noncontiguous(m)) {
-    char* br = CMFAIL;
-    msegmentptr ss = (m->top == 0)? 0 : segment_holding(m, (char*)m->top);
-    size_t asize = 0;
-    ACQUIRE_MALLOC_GLOBAL_LOCK();
-
-    if (ss == 0) {  /* First time through or recovery */
-      char* base = (char*)CALL_MORECORE(0);
-      if (base != CMFAIL) {
-        asize = granularity_align(nb + SYS_ALLOC_PADDING);
-        /* Adjust to end on a page boundary */
-        if (!is_page_aligned(base))
-          asize += (page_align((size_t)base) - (size_t)base);
-        /* Can't call MORECORE if size is negative when treated as signed */
-        if (asize < HALF_MAX_SIZE_T &&
-            (br = (char*)(CALL_MORECORE(asize))) == base) {
-          tbase = base;
-          tsize = asize;
-        }
-      }
-    }
-    else {
-      /* Subtract out existing available top space from MORECORE request. */
-      asize = granularity_align(nb - m->topsize + SYS_ALLOC_PADDING);
-      /* Use mem here only if it did continuously extend old space */
-      if (asize < HALF_MAX_SIZE_T &&
-          (br = (char*)(CALL_MORECORE(asize))) == ss->base+ss->size) {
-        tbase = br;
-        tsize = asize;
-      }
-    }
-
-    if (tbase == CMFAIL) {    /* Cope with partial failure */
-      if (br != CMFAIL) {    /* Try to use/extend the space we did get */
-        if (asize < HALF_MAX_SIZE_T &&
-            asize < nb + SYS_ALLOC_PADDING) {
-          size_t esize = granularity_align(nb + SYS_ALLOC_PADDING - asize);
-          if (esize < HALF_MAX_SIZE_T) {
-            char* end = (char*)CALL_MORECORE(esize);
-            if (end != CMFAIL)
-              asize += esize;
-            else {            /* Can't use; try to release */
-              (void) CALL_MORECORE(-asize);
-              br = CMFAIL;
-            }
-          }
-        }
-      }
-      if (br != CMFAIL) {    /* Use the space we did get */
-        tbase = br;
-        tsize = asize;
-      }
-      else
-        disable_contiguous(m); /* Don't try contiguous path in the future */
-    }
-
-    RELEASE_MALLOC_GLOBAL_LOCK();
-  }
-
-  if (HAVE_MMAP && tbase == CMFAIL) {  /* Try MMAP */
-    size_t rsize = granularity_align(nb + SYS_ALLOC_PADDING);
-    if (rsize > nb) { /* Fail if wraps around zero */
-      char* mp = (char*)(CALL_MMAP(rsize));
-      if (mp != CMFAIL) {
-        tbase = mp;
-        tsize = rsize;
-        mmap_flag = USE_MMAP_BIT;
-      }
-    }
-  }
-
-  if (HAVE_MORECORE && tbase == CMFAIL) { /* Try noncontiguous MORECORE */
-    size_t asize = granularity_align(nb + SYS_ALLOC_PADDING);
-    if (asize < HALF_MAX_SIZE_T) {
-      char* br = CMFAIL;
-      char* end = CMFAIL;
-      ACQUIRE_MALLOC_GLOBAL_LOCK();
-      br = (char*)(CALL_MORECORE(asize));
-      end = (char*)(CALL_MORECORE(0));
-      RELEASE_MALLOC_GLOBAL_LOCK();
-      if (br != CMFAIL && end != CMFAIL && br < end) {
-        size_t ssize = end - br;
-        if (ssize > nb + TOP_FOOT_SIZE) {
-          tbase = br;
-          tsize = ssize;
-        }
-      }
-    }
-  }
-
-  if (tbase != CMFAIL) {
-
-    if ((m->footprint += tsize) > m->max_footprint)
-      m->max_footprint = m->footprint;
-
-    if (!is_initialized(m)) { /* first-time initialization */
-      if (m->least_addr == 0 || tbase < m->least_addr)
-        m->least_addr = tbase;
-      m->seg.base = tbase;
-      m->seg.size = tsize;
-      m->seg.sflags = mmap_flag;
-      m->magic = mparams.magic;
-      m->release_checks = MAX_RELEASE_CHECK_RATE;
-      init_bins(m);
+	char* tbase = CMFAIL;
+	size_t tsize = 0;
+	flag_t mmap_flag = 0;
+
+	ensure_initialization();
+
+	/* Directly map large chunks, but only if already initialized */
+	if (use_mmap(m) && nb >= mparams.mmap_threshold && m->topsize != 0) {
+		void* mem = mmap_alloc(m, nb);
+		if (mem != 0)
+			return mem;
+	}
+
+	/*
+	  Try getting memory in any of three ways (in most-preferred to
+	  least-preferred order):
+	  1. A call to MORECORE that can normally contiguously extend memory.
+	     (disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or
+	     or main space is mmapped or a previous contiguous call failed)
+	  2. A call to MMAP new space (disabled if not HAVE_MMAP).
+	     Note that under the default settings, if MORECORE is unable to
+	     fulfill a request, and HAVE_MMAP is true, then mmap is
+	     used as a noncontiguous system allocator. This is a useful backup
+	     strategy for systems with holes in address spaces -- in this case
+	     sbrk cannot contiguously expand the heap, but mmap may be able to
+	     find space.
+	  3. A call to MORECORE that cannot usually contiguously extend memory.
+	     (disabled if not HAVE_MORECORE)
+
+	 In all cases, we need to request enough bytes from system to ensure
+	 we can malloc nb bytes upon success, so pad with enough space for
+	 top_foot, plus alignment-pad to make sure we don't lose bytes if
+	 not on boundary, and round this up to a granularity unit.
+	*/
+
+	if (MORECORE_CONTIGUOUS && !use_noncontiguous(m)) {
+		char* br = CMFAIL;
+		msegmentptr ss = (m->top == 0)? 0 : segment_holding(m, (char*)m->top);
+		size_t asize = 0;
+		ACQUIRE_MALLOC_GLOBAL_LOCK();
+
+		if (ss == 0) {  /* First time through or recovery */
+			char* base = (char*)CALL_MORECORE(0);
+			if (base != CMFAIL) {
+				asize = granularity_align(nb + SYS_ALLOC_PADDING);
+				/* Adjust to end on a page boundary */
+				if (!is_page_aligned(base))
+					asize += (page_align((size_t)base) - (size_t)base);
+				/* Can't call MORECORE if size is negative when treated as signed */
+				if (asize < HALF_MAX_SIZE_T &&
+				        (br = (char*)(CALL_MORECORE(asize))) == base) {
+					tbase = base;
+					tsize = asize;
+				}
+			}
+		}
+		else {
+			/* Subtract out existing available top space from MORECORE request. */
+			asize = granularity_align(nb - m->topsize + SYS_ALLOC_PADDING);
+			/* Use mem here only if it did continuously extend old space */
+			if (asize < HALF_MAX_SIZE_T &&
+			        (br = (char*)(CALL_MORECORE(asize))) == ss->base+ss->size) {
+				tbase = br;
+				tsize = asize;
+			}
+		}
+
+		if (tbase == CMFAIL) {    /* Cope with partial failure */
+			if (br != CMFAIL) {    /* Try to use/extend the space we did get */
+				if (asize < HALF_MAX_SIZE_T &&
+				        asize < nb + SYS_ALLOC_PADDING) {
+					size_t esize = granularity_align(nb + SYS_ALLOC_PADDING - asize);
+					if (esize < HALF_MAX_SIZE_T) {
+						char* end = (char*)CALL_MORECORE(esize);
+						if (end != CMFAIL)
+							asize += esize;
+						else {            /* Can't use; try to release */
+							(void) CALL_MORECORE(-asize);
+							br = CMFAIL;
+						}
+					}
+				}
+			}
+			if (br != CMFAIL) {    /* Use the space we did get */
+				tbase = br;
+				tsize = asize;
+			}
+			else
+				disable_contiguous(m); /* Don't try contiguous path in the future */
+		}
+
+		RELEASE_MALLOC_GLOBAL_LOCK();
+	}
+
+	if (HAVE_MMAP && tbase == CMFAIL) {  /* Try MMAP */
+		size_t rsize = granularity_align(nb + SYS_ALLOC_PADDING);
+		if (rsize > nb) { /* Fail if wraps around zero */
+			char* mp = (char*)(CALL_MMAP(rsize));
+			if (mp != CMFAIL) {
+				tbase = mp;
+				tsize = rsize;
+				mmap_flag = USE_MMAP_BIT;
+			}
+		}
+	}
+
+	if (HAVE_MORECORE && tbase == CMFAIL) { /* Try noncontiguous MORECORE */
+		size_t asize = granularity_align(nb + SYS_ALLOC_PADDING);
+		if (asize < HALF_MAX_SIZE_T) {
+			char* br = CMFAIL;
+			char* end = CMFAIL;
+			ACQUIRE_MALLOC_GLOBAL_LOCK();
+			br = (char*)(CALL_MORECORE(asize));
+			end = (char*)(CALL_MORECORE(0));
+			RELEASE_MALLOC_GLOBAL_LOCK();
+			if (br != CMFAIL && end != CMFAIL && br < end) {
+				size_t ssize = end - br;
+				if (ssize > nb + TOP_FOOT_SIZE) {
+					tbase = br;
+					tsize = ssize;
+				}
+			}
+		}
+	}
+
+	if (tbase != CMFAIL) {
+
+		if ((m->footprint += tsize) > m->max_footprint)
+			m->max_footprint = m->footprint;
+
+		if (!is_initialized(m)) { /* first-time initialization */
+			if (m->least_addr == 0 || tbase < m->least_addr)
+				m->least_addr = tbase;
+			m->seg.base = tbase;
+			m->seg.size = tsize;
+			m->seg.sflags = mmap_flag;
+			m->magic = mparams.magic;
+			m->release_checks = MAX_RELEASE_CHECK_RATE;
+			init_bins(m);
 #if !ONLY_MSPACES
-      if (is_global(m))
-        init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
-      else
+			if (is_global(m))
+				init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
+			else
 #endif
-      {
-        /* Offset top by embedded malloc_state */
-        mchunkptr mn = next_chunk(mem2chunk(m));
-        init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) -TOP_FOOT_SIZE);
-      }
-    }
-
-    else {
-      /* Try to merge with an existing segment */
-      msegmentptr sp = &m->seg;
-      /* Only consider most recent segment if traversal suppressed */
-      while (sp != 0 && tbase != sp->base + sp->size)
-        sp = (NO_SEGMENT_TRAVERSAL) ? 0 : sp->next;
-      if (sp != 0 &&
-          !is_extern_segment(sp) &&
-          (sp->sflags & USE_MMAP_BIT) == mmap_flag &&
-          segment_holds(sp, m->top)) { /* append */
-        sp->size += tsize;
-        init_top(m, m->top, m->topsize + tsize);
-      }
-      else {
-        if (tbase < m->least_addr)
-          m->least_addr = tbase;
-        sp = &m->seg;
-        while (sp != 0 && sp->base != tbase + tsize)
-          sp = (NO_SEGMENT_TRAVERSAL) ? 0 : sp->next;
-        if (sp != 0 &&
-            !is_extern_segment(sp) &&
-            (sp->sflags & USE_MMAP_BIT) == mmap_flag) {
-          char* oldbase = sp->base;
-          sp->base = tbase;
-          sp->size += tsize;
-          return prepend_alloc(m, tbase, oldbase, nb);
-        }
-        else
-          add_segment(m, tbase, tsize, mmap_flag);
-      }
-    }
-
-    if (nb < m->topsize) { /* Allocate from new or extended top space */
-      size_t rsize = m->topsize -= nb;
-      mchunkptr p = m->top;
-      mchunkptr r = m->top = chunk_plus_offset(p, nb);
-      r->head = rsize | PINUSE_BIT;
-      set_size_and_pinuse_of_inuse_chunk(m, p, nb);
-      check_top_chunk(m, m->top);
-      check_malloced_chunk(m, chunk2mem(p), nb);
-      return chunk2mem(p);
-    }
-  }
+			{
+				/* Offset top by embedded malloc_state */
+				mchunkptr mn = next_chunk(mem2chunk(m));
+				init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) -TOP_FOOT_SIZE);
+			}
+		}
+
+		else {
+			/* Try to merge with an existing segment */
+			msegmentptr sp = &m->seg;
+			/* Only consider most recent segment if traversal suppressed */
+			while (sp != 0 && tbase != sp->base + sp->size)
+				sp = (NO_SEGMENT_TRAVERSAL) ? 0 : sp->next;
+			if (sp != 0 &&
+			        !is_extern_segment(sp) &&
+			        (sp->sflags & USE_MMAP_BIT) == mmap_flag &&
+			        segment_holds(sp, m->top)) { /* append */
+				sp->size += tsize;
+				init_top(m, m->top, m->topsize + tsize);
+			}
+			else {
+				if (tbase < m->least_addr)
+					m->least_addr = tbase;
+				sp = &m->seg;
+				while (sp != 0 && sp->base != tbase + tsize)
+					sp = (NO_SEGMENT_TRAVERSAL) ? 0 : sp->next;
+				if (sp != 0 &&
+				        !is_extern_segment(sp) &&
+				        (sp->sflags & USE_MMAP_BIT) == mmap_flag) {
+					char* oldbase = sp->base;
+					sp->base = tbase;
+					sp->size += tsize;
+					return prepend_alloc(m, tbase, oldbase, nb);
+				}
+				else
+					add_segment(m, tbase, tsize, mmap_flag);
+			}
+		}
+
+		if (nb < m->topsize) { /* Allocate from new or extended top space */
+			size_t rsize = m->topsize -= nb;
+			mchunkptr p = m->top;
+			mchunkptr r = m->top = chunk_plus_offset(p, nb);
+			r->head = rsize | PINUSE_BIT;
+			set_size_and_pinuse_of_inuse_chunk(m, p, nb);
+			check_top_chunk(m, m->top);
+			check_malloced_chunk(m, chunk2mem(p), nb);
+			return chunk2mem(p);
+		}
+	}
 
-  MALLOC_FAILURE_ACTION;
-  return 0;
+	MALLOC_FAILURE_ACTION;
+	return 0;
 }
 
 /* -----------------------  system deallocation -------------------------- */
 
 /* Unmap and unlink any mmapped segments that don't contain used chunks */
 static size_t release_unused_segments(mstate m) {
-  size_t released = 0;
-  int nsegs = 0;
-  msegmentptr pred = &m->seg;
-  msegmentptr sp = pred->next;
-  while (sp != 0) {
-    char* base = sp->base;
-    size_t size = sp->size;
-    msegmentptr next = sp->next;
-    ++nsegs;
-    if (is_mmapped_segment(sp) && !is_extern_segment(sp)) {
-      mchunkptr p = align_as_chunk(base);
-      size_t psize = chunksize(p);
-      /* Can unmap if first chunk holds entire segment and not pinned */
-      if (!is_inuse(p) && (char*)p + psize >= base + size - TOP_FOOT_SIZE) {
-        tchunkptr tp = (tchunkptr)p;
-        assert(segment_holds(sp, (char*)sp));
-        if (p == m->dv) {
-          m->dv = 0;
-          m->dvsize = 0;
-        }
-        else {
-          unlink_large_chunk(m, tp);
-        }
-        if (CALL_MUNMAP(base, size) == 0) {
-          released += size;
-          m->footprint -= size;
-          /* unlink obsoleted record */
-          sp = pred;
-          sp->next = next;
-        }
-        else { /* back out if cannot unmap */
-          insert_large_chunk(m, tp, psize);
-        }
-      }
-    }
-    if (NO_SEGMENT_TRAVERSAL) /* scan only first segment */
-      break;
-    pred = sp;
-    sp = next;
-  }
-  /* Reset check counter */
-  m->release_checks = ((nsegs > MAX_RELEASE_CHECK_RATE)?
-                       nsegs : MAX_RELEASE_CHECK_RATE);
-  return released;
+	size_t released = 0;
+	int nsegs = 0;
+	msegmentptr pred = &m->seg;
+	msegmentptr sp = pred->next;
+	while (sp != 0) {
+		char* base = sp->base;
+		size_t size = sp->size;
+		msegmentptr next = sp->next;
+		++nsegs;
+		if (is_mmapped_segment(sp) && !is_extern_segment(sp)) {
+			mchunkptr p = align_as_chunk(base);
+			size_t psize = chunksize(p);
+			/* Can unmap if first chunk holds entire segment and not pinned */
+			if (!is_inuse(p) && (char*)p + psize >= base + size - TOP_FOOT_SIZE) {
+				tchunkptr tp = (tchunkptr)p;
+				assert(segment_holds(sp, (char*)sp));
+				if (p == m->dv) {
+					m->dv = 0;
+					m->dvsize = 0;
+				}
+				else {
+					unlink_large_chunk(m, tp);
+				}
+				if (CALL_MUNMAP(base, size) == 0) {
+					released += size;
+					m->footprint -= size;
+					/* unlink obsoleted record */
+					sp = pred;
+					sp->next = next;
+				}
+				else { /* back out if cannot unmap */
+					insert_large_chunk(m, tp, psize);
+				}
+			}
+		}
+		if (NO_SEGMENT_TRAVERSAL) /* scan only first segment */
+			break;
+		pred = sp;
+		sp = next;
+	}
+	/* Reset check counter */
+	m->release_checks = ((nsegs > MAX_RELEASE_CHECK_RATE)?
+	                     nsegs : MAX_RELEASE_CHECK_RATE);
+	return released;
 }
 
 static int sys_trim(mstate m, size_t pad) {
-  size_t released = 0;
-  ensure_initialization();
-  if (pad < MAX_REQUEST && is_initialized(m)) {
-    pad += TOP_FOOT_SIZE; /* ensure enough room for segment overhead */
-
-    if (m->topsize > pad) {
-      /* Shrink top space in granularity-size units, keeping at least one */
-      size_t unit = mparams.granularity;
-      size_t extra = ((m->topsize - pad + (unit - SIZE_T_ONE)) / unit -
-                      SIZE_T_ONE) * unit;
-      msegmentptr sp = segment_holding(m, (char*)m->top);
-
-      if (!is_extern_segment(sp)) {
-        if (is_mmapped_segment(sp)) {
-          if (HAVE_MMAP &&
-              sp->size >= extra &&
-              !has_segment_link(m, sp)) { /* can't shrink if pinned */
-            size_t newsize = sp->size - extra;
-            /* Prefer mremap, fall back to munmap */
-            if ((CALL_MREMAP(sp->base, sp->size, newsize, 0) != MFAIL) ||
-                (CALL_MUNMAP(sp->base + newsize, extra) == 0)) {
-              released = extra;
-            }
-          }
-        }
-        else if (HAVE_MORECORE) {
-          if (extra >= HALF_MAX_SIZE_T) /* Avoid wrapping negative */
-            extra = (HALF_MAX_SIZE_T) + SIZE_T_ONE - unit;
-          ACQUIRE_MALLOC_GLOBAL_LOCK();
-          {
-            /* Make sure end of memory is where we last set it. */
-            char* old_br = (char*)(CALL_MORECORE(0));
-            if (old_br == sp->base + sp->size) {
-              char* rel_br = (char*)(CALL_MORECORE(-extra));
-              char* new_br = (char*)(CALL_MORECORE(0));
-              if (rel_br != CMFAIL && new_br < old_br)
-                released = old_br - new_br;
-            }
-          }
-          RELEASE_MALLOC_GLOBAL_LOCK();
-        }
-      }
-
-      if (released != 0) {
-        sp->size -= released;
-        m->footprint -= released;
-        init_top(m, m->top, m->topsize - released);
-        check_top_chunk(m, m->top);
-      }
-    }
-
-    /* Unmap any unused mmapped segments */
-    if (HAVE_MMAP)
-      released += release_unused_segments(m);
-
-    /* On failure, disable autotrim to avoid repeated failed future calls */
-    if (released == 0 && m->topsize > m->trim_check)
-      m->trim_check = MAX_SIZE_T;
-  }
+	size_t released = 0;
+	ensure_initialization();
+	if (pad < MAX_REQUEST && is_initialized(m)) {
+		pad += TOP_FOOT_SIZE; /* ensure enough room for segment overhead */
+
+		if (m->topsize > pad) {
+			/* Shrink top space in granularity-size units, keeping at least one */
+			size_t unit = mparams.granularity;
+			size_t extra = ((m->topsize - pad + (unit - SIZE_T_ONE)) / unit -
+			                SIZE_T_ONE) * unit;
+			msegmentptr sp = segment_holding(m, (char*)m->top);
+
+			if (!is_extern_segment(sp)) {
+				if (is_mmapped_segment(sp)) {
+					if (HAVE_MMAP &&
+					        sp->size >= extra &&
+					        !has_segment_link(m, sp)) { /* can't shrink if pinned */
+						size_t newsize = sp->size - extra;
+						/* Prefer mremap, fall back to munmap */
+						if ((CALL_MREMAP(sp->base, sp->size, newsize, 0) != MFAIL) ||
+						        (CALL_MUNMAP(sp->base + newsize, extra) == 0)) {
+							released = extra;
+						}
+					}
+				}
+				else if (HAVE_MORECORE) {
+					if (extra >= HALF_MAX_SIZE_T) /* Avoid wrapping negative */
+						extra = (HALF_MAX_SIZE_T) + SIZE_T_ONE - unit;
+					ACQUIRE_MALLOC_GLOBAL_LOCK();
+					{
+						/* Make sure end of memory is where we last set it. */
+						char* old_br = (char*)(CALL_MORECORE(0));
+						if (old_br == sp->base + sp->size) {
+							char* rel_br = (char*)(CALL_MORECORE(-extra));
+							char* new_br = (char*)(CALL_MORECORE(0));
+							if (rel_br != CMFAIL && new_br < old_br)
+								released = old_br - new_br;
+						}
+					}
+					RELEASE_MALLOC_GLOBAL_LOCK();
+				}
+			}
+
+			if (released != 0) {
+				sp->size -= released;
+				m->footprint -= released;
+				init_top(m, m->top, m->topsize - released);
+				check_top_chunk(m, m->top);
+			}
+		}
+
+		/* Unmap any unused mmapped segments */
+		if (HAVE_MMAP)
+			released += release_unused_segments(m);
+
+		/* On failure, disable autotrim to avoid repeated failed future calls */
+		if (released == 0 && m->topsize > m->trim_check)
+			m->trim_check = MAX_SIZE_T;
+	}
 
-  return (released != 0)? 1 : 0;
+	return (released != 0)? 1 : 0;
 }
 
 
@@ -4197,273 +4197,273 @@
 
 /* allocate a large request from the best fitting chunk in a treebin */
 static void* tmalloc_large(mstate m, size_t nb) {
-  tchunkptr v = 0;
-  size_t rsize = -nb; /* Unsigned negation */
-  tchunkptr t;
-  bindex_t idx;
-  compute_tree_index(nb, idx);
-  if ((t = *treebin_at(m, idx)) != 0) {
-    /* Traverse tree for this bin looking for node with size == nb */
-    size_t sizebits = nb << leftshift_for_tree_index(idx);
-    tchunkptr rst = 0;  /* The deepest untaken right subtree */
-    for (;;) {
-      tchunkptr rt;
-      size_t trem = chunksize(t) - nb;
-      if (trem < rsize) {
-        v = t;
-        if ((rsize = trem) == 0)
-          break;
-      }
-      rt = t->child[1];
-      t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
-      if (rt != 0 && rt != t)
-        rst = rt;
-      if (t == 0) {
-        t = rst; /* set t to least subtree holding sizes > nb */
-        break;
-      }
-      sizebits <<= 1;
-    }
-  }
-  if (t == 0 && v == 0) { /* set t to root of next non-empty treebin */
-    binmap_t leftbits = left_bits(idx2bit(idx)) & m->treemap;
-    if (leftbits != 0) {
-      bindex_t i;
-      binmap_t leastbit = least_bit(leftbits);
-      compute_bit2idx(leastbit, i);
-      t = *treebin_at(m, i);
-    }
-  }
-
-  while (t != 0) { /* find smallest of tree or subtree */
-    size_t trem = chunksize(t) - nb;
-    if (trem < rsize) {
-      rsize = trem;
-      v = t;
-    }
-    t = leftmost_child(t);
-  }
-
-  /*  If dv is a better fit, return 0 so malloc will use it */
-  if (v != 0 && rsize < (size_t)(m->dvsize - nb)) {
-    if (RTCHECK(ok_address(m, v))) { /* split */
-      mchunkptr r = chunk_plus_offset(v, nb);
-      assert(chunksize(v) == rsize + nb);
-      if (RTCHECK(ok_next(v, r))) {
-        unlink_large_chunk(m, v);
-        if (rsize < MIN_CHUNK_SIZE)
-          set_inuse_and_pinuse(m, v, (rsize + nb));
-        else {
-          set_size_and_pinuse_of_inuse_chunk(m, v, nb);
-          set_size_and_pinuse_of_free_chunk(r, rsize);
-          insert_chunk(m, r, rsize);
-        }
-        return chunk2mem(v);
-      }
-    }
-    CORRUPTION_ERROR_ACTION(m);
-  }
-  return 0;
+	tchunkptr v = 0;
+	size_t rsize = -nb; /* Unsigned negation */
+	tchunkptr t;
+	bindex_t idx;
+	compute_tree_index(nb, idx);
+	if ((t = *treebin_at(m, idx)) != 0) {
+		/* Traverse tree for this bin looking for node with size == nb */
+		size_t sizebits = nb << leftshift_for_tree_index(idx);
+		tchunkptr rst = 0;  /* The deepest untaken right subtree */
+		for (;;) {
+			tchunkptr rt;
+			size_t trem = chunksize(t) - nb;
+			if (trem < rsize) {
+				v = t;
+				if ((rsize = trem) == 0)
+					break;
+			}
+			rt = t->child[1];
+			t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
+			if (rt != 0 && rt != t)
+				rst = rt;
+			if (t == 0) {
+				t = rst; /* set t to least subtree holding sizes > nb */
+				break;
+			}
+			sizebits <<= 1;
+		}
+	}
+	if (t == 0 && v == 0) { /* set t to root of next non-empty treebin */
+		binmap_t leftbits = left_bits(idx2bit(idx)) & m->treemap;
+		if (leftbits != 0) {
+			bindex_t i;
+			binmap_t leastbit = least_bit(leftbits);
+			compute_bit2idx(leastbit, i);
+			t = *treebin_at(m, i);
+		}
+	}
+
+	while (t != 0) { /* find smallest of tree or subtree */
+		size_t trem = chunksize(t) - nb;
+		if (trem < rsize) {
+			rsize = trem;
+			v = t;
+		}
+		t = leftmost_child(t);
+	}
+
+	/*  If dv is a better fit, return 0 so malloc will use it */
+	if (v != 0 && rsize < (size_t)(m->dvsize - nb)) {
+		if (RTCHECK(ok_address(m, v))) { /* split */
+			mchunkptr r = chunk_plus_offset(v, nb);
+			assert(chunksize(v) == rsize + nb);
+			if (RTCHECK(ok_next(v, r))) {
+				unlink_large_chunk(m, v);
+				if (rsize < MIN_CHUNK_SIZE)
+					set_inuse_and_pinuse(m, v, (rsize + nb));
+				else {
+					set_size_and_pinuse_of_inuse_chunk(m, v, nb);
+					set_size_and_pinuse_of_free_chunk(r, rsize);
+					insert_chunk(m, r, rsize);
+				}
+				return chunk2mem(v);
+			}
+		}
+		CORRUPTION_ERROR_ACTION(m);
+	}
+	return 0;
 }
 
 /* allocate a small request from the best fitting chunk in a treebin */
 static void* tmalloc_small(mstate m, size_t nb) {
-  tchunkptr t, v;
-  bindex_t rsize;
-  bindex_t i;
-  binmap_t leastbit = least_bit(m->treemap);
-  compute_bit2idx(leastbit, i);
-  v = t = *treebin_at(m, i);
-  rsize = (bindex_t)(chunksize(t) - nb);
-
-  while ((t = leftmost_child(t)) != 0) {
-    bindex_t trem = chunksize(t) - (bindex_t)nb;
-    if (trem < rsize) {
-      rsize = trem;
-      v = t;
-    }
-  }
-
-  if (RTCHECK(ok_address(m, v))) {
-    mchunkptr r = chunk_plus_offset(v, nb);
-    assert(chunksize(v) == rsize + nb);
-    if (RTCHECK(ok_next(v, r))) {
-      unlink_large_chunk(m, v);
-      if (rsize < MIN_CHUNK_SIZE)
-        set_inuse_and_pinuse(m, v, (rsize + nb));
-      else {
-        set_size_and_pinuse_of_inuse_chunk(m, v, nb);
-        set_size_and_pinuse_of_free_chunk(r, rsize);
-        replace_dv(m, r, rsize);
-      }
-      return chunk2mem(v);
-    }
-  }
+	tchunkptr t, v;
+	bindex_t rsize;
+	bindex_t i;
+	binmap_t leastbit = least_bit(m->treemap);
+	compute_bit2idx(leastbit, i);
+	v = t = *treebin_at(m, i);
+	rsize = (bindex_t)(chunksize(t) - nb);
+
+	while ((t = leftmost_child(t)) != 0) {
+		bindex_t trem = chunksize(t) - (bindex_t)nb;
+		if (trem < rsize) {
+			rsize = trem;
+			v = t;
+		}
+	}
+
+	if (RTCHECK(ok_address(m, v))) {
+		mchunkptr r = chunk_plus_offset(v, nb);
+		assert(chunksize(v) == rsize + nb);
+		if (RTCHECK(ok_next(v, r))) {
+			unlink_large_chunk(m, v);
+			if (rsize < MIN_CHUNK_SIZE)
+				set_inuse_and_pinuse(m, v, (rsize + nb));
+			else {
+				set_size_and_pinuse_of_inuse_chunk(m, v, nb);
+				set_size_and_pinuse_of_free_chunk(r, rsize);
+				replace_dv(m, r, rsize);
+			}
+			return chunk2mem(v);
+		}
+	}
 
-  CORRUPTION_ERROR_ACTION(m);
-  return 0;
+	CORRUPTION_ERROR_ACTION(m);
+	return 0;
 }
 
 /* --------------------------- realloc support --------------------------- */
 
 static void* internal_realloc(mstate m, void* oldmem, size_t bytes) {
-  if (bytes >= MAX_REQUEST) {
-    MALLOC_FAILURE_ACTION;
-    return 0;
-  }
-  if (!PREACTION(m)) {
-    mchunkptr oldp = mem2chunk(oldmem);
-    size_t oldsize = chunksize(oldp);
-    mchunkptr next = chunk_plus_offset(oldp, oldsize);
-    mchunkptr newp = 0;
-    void* extra = 0;
-
-    /* Try to either shrink or extend into top. Else malloc-copy-free */
-
-    if (RTCHECK(ok_address(m, oldp) && ok_inuse(oldp) &&
-                ok_next(oldp, next) && ok_pinuse(next))) {
-      size_t nb = request2size(bytes);
-      if (is_mmapped(oldp))
-        newp = mmap_resize(m, oldp, nb);
-      else if (oldsize >= nb) { /* already big enough */
-        size_t rsize = oldsize - nb;
-        newp = oldp;
-        if (rsize >= MIN_CHUNK_SIZE) {
-          mchunkptr remainder = chunk_plus_offset(newp, nb);
-          set_inuse(m, newp, nb);
-          set_inuse_and_pinuse(m, remainder, rsize);
-          extra = chunk2mem(remainder);
-        }
-      }
-      else if (next == m->top && oldsize + m->topsize > nb) {
-        /* Expand into top */
-        size_t newsize = oldsize + m->topsize;
-        size_t newtopsize = newsize - nb;
-        mchunkptr newtop = chunk_plus_offset(oldp, nb);
-        set_inuse(m, oldp, nb);
-        newtop->head = newtopsize |PINUSE_BIT;
-        m->top = newtop;
-        m->topsize = newtopsize;
-        newp = oldp;
-      }
-    }
-    else {
-      USAGE_ERROR_ACTION(m, oldmem);
-      POSTACTION(m);
-      return 0;
-    }
+	if (bytes >= MAX_REQUEST) {
+		MALLOC_FAILURE_ACTION;
+		return 0;
+	}
+	if (!PREACTION(m)) {
+		mchunkptr oldp = mem2chunk(oldmem);
+		size_t oldsize = chunksize(oldp);
+		mchunkptr next = chunk_plus_offset(oldp, oldsize);
+		mchunkptr newp = 0;
+		void* extra = 0;
+
+		/* Try to either shrink or extend into top. Else malloc-copy-free */
+
+		if (RTCHECK(ok_address(m, oldp) && ok_inuse(oldp) &&
+		            ok_next(oldp, next) && ok_pinuse(next))) {
+			size_t nb = request2size(bytes);
+			if (is_mmapped(oldp))
+				newp = mmap_resize(m, oldp, nb);
+			else if (oldsize >= nb) { /* already big enough */
+				size_t rsize = oldsize - nb;
+				newp = oldp;
+				if (rsize >= MIN_CHUNK_SIZE) {
+					mchunkptr remainder = chunk_plus_offset(newp, nb);
+					set_inuse(m, newp, nb);
+					set_inuse_and_pinuse(m, remainder, rsize);
+					extra = chunk2mem(remainder);
+				}
+			}
+			else if (next == m->top && oldsize + m->topsize > nb) {
+				/* Expand into top */
+				size_t newsize = oldsize + m->topsize;
+				size_t newtopsize = newsize - nb;
+				mchunkptr newtop = chunk_plus_offset(oldp, nb);
+				set_inuse(m, oldp, nb);
+				newtop->head = newtopsize |PINUSE_BIT;
+				m->top = newtop;
+				m->topsize = newtopsize;
+				newp = oldp;
+			}
+		}
+		else {
+			USAGE_ERROR_ACTION(m, oldmem);
+			POSTACTION(m);
+			return 0;
+		}
 #if DEBUG
-    if (newp != 0) {
-      check_inuse_chunk(m, newp); /* Check requires lock */
-    }
+		if (newp != 0) {
+			check_inuse_chunk(m, newp); /* Check requires lock */
+		}
 #endif
 
-    POSTACTION(m);
+		POSTACTION(m);
 
-    if (newp != 0) {
-      if (extra != 0) {
-        internal_free(m, extra);
-      }
-      return chunk2mem(newp);
-    }
-    else {
-      void* newmem = internal_malloc(m, bytes);
-      if (newmem != 0) {
-        size_t oc = oldsize - overhead_for(oldp);
-        memcpy(newmem, oldmem, (oc < bytes)? oc : bytes);
-        internal_free(m, oldmem);
-      }
-      return newmem;
-    }
-  }
-  return 0;
+		if (newp != 0) {
+			if (extra != 0) {
+				internal_free(m, extra);
+			}
+			return chunk2mem(newp);
+		}
+		else {
+			void* newmem = internal_malloc(m, bytes);
+			if (newmem != 0) {
+				size_t oc = oldsize - overhead_for(oldp);
+				memcpy(newmem, oldmem, (oc < bytes)? oc : bytes);
+				internal_free(m, oldmem);
+			}
+			return newmem;
+		}
+	}
+	return 0;
 }
 
 /* --------------------------- memalign support -------------------------- */
 
 static void* internal_memalign(mstate m, size_t alignment, size_t bytes) {
-  if (alignment <= MALLOC_ALIGNMENT)    /* Can just use malloc */
-    return internal_malloc(m, bytes);
-  if (alignment <  MIN_CHUNK_SIZE) /* must be at least a minimum chunk size */
-    alignment = MIN_CHUNK_SIZE;
-  if ((alignment & (alignment-SIZE_T_ONE)) != 0) {/* Ensure a power of 2 */
-    size_t a = MALLOC_ALIGNMENT << 1;
-    while (a < alignment) a <<= 1;
-    alignment = a;
-  }
-
-  if (bytes >= MAX_REQUEST - alignment) {
-    if (m != 0)  { /* Test isn't needed but avoids compiler warning */
-      MALLOC_FAILURE_ACTION;
-    }
-  }
-  else {
-    size_t nb = request2size(bytes);
-    size_t req = nb + alignment + MIN_CHUNK_SIZE - CHUNK_OVERHEAD;
-    char* mem = (char*)internal_malloc(m, req);
-    if (mem != 0) {
-      void* leader = 0;
-      void* trailer = 0;
-      mchunkptr p = mem2chunk(mem);
-
-      if (PREACTION(m)) return 0;
-      if ((((size_t)(mem)) % alignment) != 0) { /* misaligned */
-        /*
-          Find an aligned spot inside chunk.  Since we need to give
-          back leading space in a chunk of at least MIN_CHUNK_SIZE, if
-          the first calculation places us at a spot with less than
-          MIN_CHUNK_SIZE leader, we can move to the next aligned spot.
-          We've allocated enough total room so that this is always
-          possible.
-        */
-        char* br = (char*)mem2chunk((size_t)(((size_t)(mem +
-                                                       alignment -
-                                                       SIZE_T_ONE)) &
-                                             -alignment));
-        char* pos = ((size_t)(br - (char*)(p)) >= MIN_CHUNK_SIZE)?
-          br : br+alignment;
-        mchunkptr newp = (mchunkptr)pos;
-        size_t leadsize = pos - (char*)(p);
-        size_t newsize = chunksize(p) - leadsize;
-
-        if (is_mmapped(p)) { /* For mmapped chunks, just adjust offset */
-          newp->prev_foot = p->prev_foot + leadsize;
-          newp->head = newsize;
-        }
-        else { /* Otherwise, give back leader, use the rest */
-          set_inuse(m, newp, newsize);
-          set_inuse(m, p, leadsize);
-          leader = chunk2mem(p);
-        }
-        p = newp;
-      }
-
-      /* Give back spare room at the end */
-      if (!is_mmapped(p)) {
-        size_t size = chunksize(p);
-        if (size > nb + MIN_CHUNK_SIZE) {
-          size_t remainder_size = size - nb;
-          mchunkptr remainder = chunk_plus_offset(p, nb);
-          set_inuse(m, p, nb);
-          set_inuse(m, remainder, remainder_size);
-          trailer = chunk2mem(remainder);
-        }
-      }
-
-      assert (chunksize(p) >= nb);
-      assert((((size_t)(chunk2mem(p))) % alignment) == 0);
-      check_inuse_chunk(m, p);
-      POSTACTION(m);
-      if (leader != 0) {
-        internal_free(m, leader);
-      }
-      if (trailer != 0) {
-        internal_free(m, trailer);
-      }
-      return chunk2mem(p);
-    }
-  }
-  return 0;
+	if (alignment <= MALLOC_ALIGNMENT)    /* Can just use malloc */
+		return internal_malloc(m, bytes);
+	if (alignment <  MIN_CHUNK_SIZE) /* must be at least a minimum chunk size */
+		alignment = MIN_CHUNK_SIZE;
+	if ((alignment & (alignment-SIZE_T_ONE)) != 0) {/* Ensure a power of 2 */
+		size_t a = MALLOC_ALIGNMENT << 1;
+		while (a < alignment) a <<= 1;
+		alignment = a;
+	}
+
+	if (bytes >= MAX_REQUEST - alignment) {
+		if (m != 0)  { /* Test isn't needed but avoids compiler warning */
+			MALLOC_FAILURE_ACTION;
+		}
+	}
+	else {
+		size_t nb = request2size(bytes);
+		size_t req = nb + alignment + MIN_CHUNK_SIZE - CHUNK_OVERHEAD;
+		char* mem = (char*)internal_malloc(m, req);
+		if (mem != 0) {
+			void* leader = 0;
+			void* trailer = 0;
+			mchunkptr p = mem2chunk(mem);
+
+			if (PREACTION(m)) return 0;
+			if ((((size_t)(mem)) % alignment) != 0) { /* misaligned */
+				/*
+				  Find an aligned spot inside chunk.  Since we need to give
+				  back leading space in a chunk of at least MIN_CHUNK_SIZE, if
+				  the first calculation places us at a spot with less than
+				  MIN_CHUNK_SIZE leader, we can move to the next aligned spot.
+				  We've allocated enough total room so that this is always
+				  possible.
+				*/
+				char* br = (char*)mem2chunk((size_t)(((size_t)(mem +
+				                                      alignment -
+				                                      SIZE_T_ONE)) &
+				                                     -alignment));
+				char* pos = ((size_t)(br - (char*)(p)) >= MIN_CHUNK_SIZE)?
+				            br : br+alignment;
+				mchunkptr newp = (mchunkptr)pos;
+				size_t leadsize = pos - (char*)(p);
+				size_t newsize = chunksize(p) - leadsize;
+
+				if (is_mmapped(p)) { /* For mmapped chunks, just adjust offset */
+					newp->prev_foot = p->prev_foot + leadsize;
+					newp->head = newsize;
+				}
+				else { /* Otherwise, give back leader, use the rest */
+					set_inuse(m, newp, newsize);
+					set_inuse(m, p, leadsize);
+					leader = chunk2mem(p);
+				}
+				p = newp;
+			}
+
+			/* Give back spare room at the end */
+			if (!is_mmapped(p)) {
+				size_t size = chunksize(p);
+				if (size > nb + MIN_CHUNK_SIZE) {
+					size_t remainder_size = size - nb;
+					mchunkptr remainder = chunk_plus_offset(p, nb);
+					set_inuse(m, p, nb);
+					set_inuse(m, remainder, remainder_size);
+					trailer = chunk2mem(remainder);
+				}
+			}
+
+			assert (chunksize(p) >= nb);
+			assert((((size_t)(chunk2mem(p))) % alignment) == 0);
+			check_inuse_chunk(m, p);
+			POSTACTION(m);
+			if (leader != 0) {
+				internal_free(m, leader);
+			}
+			if (trailer != 0) {
+				internal_free(m, trailer);
+			}
+			return chunk2mem(p);
+		}
+	}
+	return 0;
 }
 
 /* ------------------------ comalloc/coalloc support --------------------- */
@@ -4473,126 +4473,126 @@
                      size_t* sizes,
                      int opts,
                      void* chunks[]) {
-  /*
-    This provides common support for independent_X routines, handling
-    all of the combinations that can result.
-
-    The opts arg has:
-    bit 0 set if all elements are same size (using sizes[0])
-    bit 1 set if elements should be zeroed
-  */
-
-  size_t    element_size;   /* chunksize of each element, if all same */
-  size_t    contents_size;  /* total size of elements */
-  size_t    array_size;     /* request size of pointer array */
-  void*     mem;            /* malloced aggregate space */
-  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;
-
-  ensure_initialization();
-  /* compute array length, if needed */
-  if (chunks != 0) {
-    if (n_elements == 0)
-      return chunks; /* nothing to do */
-    marray = chunks;
-    array_size = 0;
-  }
-  else {
-    /* if empty req, must still return chunk representing empty array */
-    if (n_elements == 0)
-      return (void**)internal_malloc(m, 0);
-    marray = 0;
-    array_size = request2size(n_elements * (sizeof(void*)));
-  }
-
-  /* compute total element size */
-  if (opts & 0x1) { /* all-same-size */
-    element_size = request2size(*sizes);
-    contents_size = n_elements * element_size;
-  }
-  else { /* add up all the sizes */
-    element_size = 0;
-    contents_size = 0;
-    for (i = 0; i != n_elements; ++i)
-      contents_size += request2size(sizes[i]);
-  }
-
-  size = contents_size + array_size;
-
-  /*
-     Allocate the aggregate chunk.  First disable direct-mmapping so
-     malloc won't use it, since we would not be able to later
-     free/realloc space internal to a segregated mmap region.
-  */
-  was_enabled = use_mmap(m);
-  disable_mmap(m);
-  mem = internal_malloc(m, size - CHUNK_OVERHEAD);
-  if (was_enabled)
-    enable_mmap(m);
-  if (mem == 0)
-    return 0;
-
-  if (PREACTION(m)) return 0;
-  p = mem2chunk(mem);
-  remainder_size = chunksize(p);
-
-  assert(!is_mmapped(p));
-
-  if (opts & 0x2) {       /* optionally clear the elements */
-    memset((size_t*)mem, 0, remainder_size - SIZE_T_SIZE - array_size);
-  }
-
-  /* If not provided, allocate the pointer array as final part of chunk */
-  if (marray == 0) {
-    size_t  array_chunk_size;
-    array_chunk = chunk_plus_offset(p, contents_size);
-    array_chunk_size = remainder_size - contents_size;
-    marray = (void**) (chunk2mem(array_chunk));
-    set_size_and_pinuse_of_inuse_chunk(m, array_chunk, array_chunk_size);
-    remainder_size = contents_size;
-  }
-
-  /* split out elements */
-  for (i = 0; ; ++i) {
-    marray[i] = chunk2mem(p);
-    if (i != n_elements-1) {
-      if (element_size != 0)
-        size = element_size;
-      else
-        size = request2size(sizes[i]);
-      remainder_size -= size;
-      set_size_and_pinuse_of_inuse_chunk(m, p, size);
-      p = chunk_plus_offset(p, size);
-    }
-    else { /* the final element absorbs any overallocation slop */
-      set_size_and_pinuse_of_inuse_chunk(m, p, remainder_size);
-      break;
-    }
-  }
+	/*
+	  This provides common support for independent_X routines, handling
+	  all of the combinations that can result.
+
+	  The opts arg has:
+	  bit 0 set if all elements are same size (using sizes[0])
+	  bit 1 set if elements should be zeroed
+	*/
+
+	size_t    element_size;   /* chunksize of each element, if all same */
+	size_t    contents_size;  /* total size of elements */
+	size_t    array_size;     /* request size of pointer array */
+	void*     mem;            /* malloced aggregate space */
+	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;
+
+	ensure_initialization();
+	/* compute array length, if needed */
+	if (chunks != 0) {
+		if (n_elements == 0)
+			return chunks; /* nothing to do */
+		marray = chunks;
+		array_size = 0;
+	}
+	else {
+		/* if empty req, must still return chunk representing empty array */
+		if (n_elements == 0)
+			return (void**)internal_malloc(m, 0);
+		marray = 0;
+		array_size = request2size(n_elements * (sizeof(void*)));
+	}
+
+	/* compute total element size */
+	if (opts & 0x1) { /* all-same-size */
+		element_size = request2size(*sizes);
+		contents_size = n_elements * element_size;
+	}
+	else { /* add up all the sizes */
+		element_size = 0;
+		contents_size = 0;
+		for (i = 0; i != n_elements; ++i)
+			contents_size += request2size(sizes[i]);
+	}
+
+	size = contents_size + array_size;
+
+	/*
+	   Allocate the aggregate chunk.  First disable direct-mmapping so
+	   malloc won't use it, since we would not be able to later
+	   free/realloc space internal to a segregated mmap region.
+	*/
+	was_enabled = use_mmap(m);
+	disable_mmap(m);
+	mem = internal_malloc(m, size - CHUNK_OVERHEAD);
+	if (was_enabled)
+		enable_mmap(m);
+	if (mem == 0)
+		return 0;
+
+	if (PREACTION(m)) return 0;
+	p = mem2chunk(mem);
+	remainder_size = chunksize(p);
+
+	assert(!is_mmapped(p));
+
+	if (opts & 0x2) {       /* optionally clear the elements */
+		memset((size_t*)mem, 0, remainder_size - SIZE_T_SIZE - array_size);
+	}
+
+	/* If not provided, allocate the pointer array as final part of chunk */
+	if (marray == 0) {
+		size_t  array_chunk_size;
+		array_chunk = chunk_plus_offset(p, contents_size);
+		array_chunk_size = remainder_size - contents_size;
+		marray = (void**) (chunk2mem(array_chunk));
+		set_size_and_pinuse_of_inuse_chunk(m, array_chunk, array_chunk_size);
+		remainder_size = contents_size;
+	}
+
+	/* split out elements */
+	for (i = 0; ; ++i) {
+		marray[i] = chunk2mem(p);
+		if (i != n_elements-1) {
+			if (element_size != 0)
+				size = element_size;
+			else
+				size = request2size(sizes[i]);
+			remainder_size -= size;
+			set_size_and_pinuse_of_inuse_chunk(m, p, size);
+			p = chunk_plus_offset(p, size);
+		}
+		else { /* the final element absorbs any overallocation slop */
+			set_size_and_pinuse_of_inuse_chunk(m, p, remainder_size);
+			break;
+		}
+	}
 
 #if DEBUG
-  if (marray != chunks) {
-    /* final element must have exactly exhausted chunk */
-    if (element_size != 0) {
-      assert(remainder_size == element_size);
-    }
-    else {
-      assert(remainder_size == request2size(sizes[i]));
-    }
-    check_inuse_chunk(m, mem2chunk(marray));
-  }
-  for (i = 0; i != n_elements; ++i)
-    check_inuse_chunk(m, mem2chunk(marray[i]));
+	if (marray != chunks) {
+		/* final element must have exactly exhausted chunk */
+		if (element_size != 0) {
+			assert(remainder_size == element_size);
+		}
+		else {
+			assert(remainder_size == request2size(sizes[i]));
+		}
+		check_inuse_chunk(m, mem2chunk(marray));
+	}
+	for (i = 0; i != n_elements; ++i)
+		check_inuse_chunk(m, mem2chunk(marray[i]));
 
 #endif /* DEBUG */
 
-  POSTACTION(m);
-  return marray;
+	POSTACTION(m);
+	return marray;
 }
 
 
@@ -4601,358 +4601,358 @@
 #if !ONLY_MSPACES
 
 void* dlmalloc(size_t bytes) {
-  /*
-     Basic algorithm:
-     If a small request (< 256 bytes minus per-chunk overhead):
-       1. If one exists, use a remainderless chunk in associated smallbin.
-          (Remainderless means that there are too few excess bytes to
-          represent as a chunk.)
-       2. If it is big enough, use the dv chunk, which is normally the
-          chunk adjacent to the one used for the most recent small request.
-       3. If one exists, split the smallest available chunk in a bin,
-          saving remainder in dv.
-       4. If it is big enough, use the top chunk.
-       5. If available, get memory from system and use it
-     Otherwise, for a large request:
-       1. Find the smallest available binned chunk that fits, and use it
-          if it is better fitting than dv chunk, splitting if necessary.
-       2. If better fitting than any binned chunk, use the dv chunk.
-       3. If it is big enough, use the top chunk.
-       4. If request size >= mmap threshold, try to directly mmap this chunk.
-       5. If available, get memory from system and use it
+	/*
+	   Basic algorithm:
+	   If a small request (< 256 bytes minus per-chunk overhead):
+	     1. If one exists, use a remainderless chunk in associated smallbin.
+	        (Remainderless means that there are too few excess bytes to
+	        represent as a chunk.)
+	     2. If it is big enough, use the dv chunk, which is normally the
+	        chunk adjacent to the one used for the most recent small request.
+	     3. If one exists, split the smallest available chunk in a bin,
+	        saving remainder in dv.
+	     4. If it is big enough, use the top chunk.
+	     5. If available, get memory from system and use it
+	   Otherwise, for a large request:
+	     1. Find the smallest available binned chunk that fits, and use it
+	        if it is better fitting than dv chunk, splitting if necessary.
+	     2. If better fitting than any binned chunk, use the dv chunk.
+	     3. If it is big enough, use the top chunk.
+	     4. If request size >= mmap threshold, try to directly mmap this chunk.
+	     5. If available, get memory from system and use it
 
-     The ugly goto's here ensure that postaction occurs along all paths.
-  */
+	   The ugly goto's here ensure that postaction occurs along all paths.
+	*/
 
 #if USE_LOCKS
-  ensure_initialization(); /* initialize in sys_alloc if not using locks */
+	ensure_initialization(); /* initialize in sys_alloc if not using locks */
 #endif
 
-  if (!PREACTION(gm)) {
-    void* mem;
-    bindex_t nb;
-    if (bytes <= MAX_SMALL_REQUEST) {
-      bindex_t idx;
-      binmap_t smallbits;
-      nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
-      idx = small_index(nb);
-      smallbits = gm->smallmap >> idx;
-
-      if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
-        mchunkptr b, p;
-        idx += ~smallbits & 1;       /* Uses next bin if idx empty */
-        b = smallbin_at(gm, idx);
-        p = b->fd;
-        assert(chunksize(p) == small_index2size(idx));
-        unlink_first_small_chunk(gm, b, p, idx);
-        set_inuse_and_pinuse(gm, p, small_index2size(idx));
-        mem = chunk2mem(p);
-        check_malloced_chunk(gm, mem, nb);
-        goto postaction;
-      }
-
-      else if (nb > gm->dvsize) {
-        if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
-          mchunkptr b, p, r;
-          bindex_t rsize;
-          bindex_t i;
-          binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
-          binmap_t leastbit = least_bit(leftbits);
-          compute_bit2idx(leastbit, i);
-          b = smallbin_at(gm, i);
-          p = b->fd;
-          assert(chunksize(p) == small_index2size(i));
-          unlink_first_small_chunk(gm, b, p, i);
-          rsize = small_index2size(i) - nb;
-          /* Fit here cannot be remainderless if 4byte sizes */
-          if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
-            set_inuse_and_pinuse(gm, p, small_index2size(i));
-          else {
-            set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
-            r = chunk_plus_offset(p, nb);
-            set_size_and_pinuse_of_free_chunk(r, rsize);
-            replace_dv(gm, r, rsize);
-          }
-          mem = chunk2mem(p);
-          check_malloced_chunk(gm, mem, nb);
-          goto postaction;
-        }
-
-        else if (gm->treemap != 0 && (mem = tmalloc_small(gm, nb)) != 0) {
-          check_malloced_chunk(gm, mem, nb);
-          goto postaction;
-        }
-      }
-    }
-    else if (bytes >= MAX_REQUEST)
-      nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
-    else {
-      nb = pad_request(bytes);
-      if (gm->treemap != 0 && (mem = tmalloc_large(gm, nb)) != 0) {
-        check_malloced_chunk(gm, mem, nb);
-        goto postaction;
-      }
-    }
-
-    if (nb <= gm->dvsize) {
-      size_t rsize = gm->dvsize - nb;
-      mchunkptr p = gm->dv;
-      if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
-        mchunkptr r = gm->dv = chunk_plus_offset(p, nb);
-        gm->dvsize = rsize;
-        set_size_and_pinuse_of_free_chunk(r, rsize);
-        set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
-      }
-      else { /* exhaust dv */
-        size_t dvs = gm->dvsize;
-        gm->dvsize = 0;
-        gm->dv = 0;
-        set_inuse_and_pinuse(gm, p, dvs);
-      }
-      mem = chunk2mem(p);
-      check_malloced_chunk(gm, mem, nb);
-      goto postaction;
-    }
-
-    else if (nb < gm->topsize) { /* Split top */
-      size_t rsize = gm->topsize -= nb;
-      mchunkptr p = gm->top;
-      mchunkptr r = gm->top = chunk_plus_offset(p, nb);
-      r->head = rsize | PINUSE_BIT;
-      set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
-      mem = chunk2mem(p);
-      check_top_chunk(gm, gm->top);
-      check_malloced_chunk(gm, mem, nb);
-      goto postaction;
-    }
-
-    mem = sys_alloc(gm, nb);
-
-  postaction:
-    POSTACTION(gm);
-    return mem;
-  }
+	if (!PREACTION(gm)) {
+		void* mem;
+		bindex_t nb;
+		if (bytes <= MAX_SMALL_REQUEST) {
+			bindex_t idx;
+			binmap_t smallbits;
+			nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
+			idx = small_index(nb);
+			smallbits = gm->smallmap >> idx;
+
+			if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
+				mchunkptr b, p;
+				idx += ~smallbits & 1;       /* Uses next bin if idx empty */
+				b = smallbin_at(gm, idx);
+				p = b->fd;
+				assert(chunksize(p) == small_index2size(idx));
+				unlink_first_small_chunk(gm, b, p, idx);
+				set_inuse_and_pinuse(gm, p, small_index2size(idx));
+				mem = chunk2mem(p);
+				check_malloced_chunk(gm, mem, nb);
+				goto postaction;
+			}
+
+			else if (nb > gm->dvsize) {
+				if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
+					mchunkptr b, p, r;
+					bindex_t rsize;
+					bindex_t i;
+					binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
+					binmap_t leastbit = least_bit(leftbits);
+					compute_bit2idx(leastbit, i);
+					b = smallbin_at(gm, i);
+					p = b->fd;
+					assert(chunksize(p) == small_index2size(i));
+					unlink_first_small_chunk(gm, b, p, i);
+					rsize = small_index2size(i) - nb;
+					/* Fit here cannot be remainderless if 4byte sizes */
+					if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
+						set_inuse_and_pinuse(gm, p, small_index2size(i));
+					else {
+						set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+						r = chunk_plus_offset(p, nb);
+						set_size_and_pinuse_of_free_chunk(r, rsize);
+						replace_dv(gm, r, rsize);
+					}
+					mem = chunk2mem(p);
+					check_malloced_chunk(gm, mem, nb);
+					goto postaction;
+				}
+
+				else if (gm->treemap != 0 && (mem = tmalloc_small(gm, nb)) != 0) {
+					check_malloced_chunk(gm, mem, nb);
+					goto postaction;
+				}
+			}
+		}
+		else if (bytes >= MAX_REQUEST)
+			nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
+		else {
+			nb = pad_request(bytes);
+			if (gm->treemap != 0 && (mem = tmalloc_large(gm, nb)) != 0) {
+				check_malloced_chunk(gm, mem, nb);
+				goto postaction;
+			}
+		}
+
+		if (nb <= gm->dvsize) {
+			size_t rsize = gm->dvsize - nb;
+			mchunkptr p = gm->dv;
+			if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
+				mchunkptr r = gm->dv = chunk_plus_offset(p, nb);
+				gm->dvsize = rsize;
+				set_size_and_pinuse_of_free_chunk(r, rsize);
+				set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+			}
+			else { /* exhaust dv */
+				size_t dvs = gm->dvsize;
+				gm->dvsize = 0;
+				gm->dv = 0;
+				set_inuse_and_pinuse(gm, p, dvs);
+			}
+			mem = chunk2mem(p);
+			check_malloced_chunk(gm, mem, nb);
+			goto postaction;
+		}
+
+		else if (nb < gm->topsize) { /* Split top */
+			size_t rsize = gm->topsize -= nb;
+			mchunkptr p = gm->top;
+			mchunkptr r = gm->top = chunk_plus_offset(p, nb);
+			r->head = rsize | PINUSE_BIT;
+			set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+			mem = chunk2mem(p);
+			check_top_chunk(gm, gm->top);
+			check_malloced_chunk(gm, mem, nb);
+			goto postaction;
+		}
+
+		mem = sys_alloc(gm, nb);
+
+postaction:
+		POSTACTION(gm);
+		return mem;
+	}
 
-  return 0;
+	return 0;
 }
 
 void dlfree(void* mem) {
-  /*
-     Consolidate freed chunks with preceeding or succeeding bordering
-     free chunks, if they exist, and then place in a bin.  Intermixed
-     with special cases for top, dv, mmapped chunks, and usage errors.
-  */
+	/*
+	   Consolidate freed chunks with preceeding or succeeding bordering
+	   free chunks, if they exist, and then place in a bin.  Intermixed
+	   with special cases for top, dv, mmapped chunks, and usage errors.
+	*/
 
-  if (mem != 0) {
-    mchunkptr p  = mem2chunk(mem);
+	if (mem != 0) {
+		mchunkptr p  = mem2chunk(mem);
 #if FOOTERS
-    mstate fm = get_mstate_for(p);
-    if (!ok_magic(fm)) {
-      USAGE_ERROR_ACTION(fm, p);
-      return;
-    }
+		mstate fm = get_mstate_for(p);
+		if (!ok_magic(fm)) {
+			USAGE_ERROR_ACTION(fm, p);
+			return;
+		}
 #else /* FOOTERS */
 #define fm gm
 #endif /* FOOTERS */
-    if (!PREACTION(fm)) {
-      check_inuse_chunk(fm, p);
-      if (RTCHECK(ok_address(fm, p) && ok_inuse(p))) {
-        bindex_t psize = chunksize(p);
-        mchunkptr next = chunk_plus_offset(p, psize);
-        if (!pinuse(p)) {
-          bindex_t prevsize = (bindex_t)p->prev_foot;
-          if (is_mmapped(p)) {
-            psize += prevsize + MMAP_FOOT_PAD;
-            if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
-              fm->footprint -= psize;
-            goto postaction;
-          }
-          else {
-            mchunkptr prev = chunk_minus_offset(p, prevsize);
-            psize += prevsize;
-            p = prev;
-            if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
-              if (p != fm->dv) {
-                unlink_chunk(fm, p, prevsize);
-              }
-              else if ((next->head & INUSE_BITS) == INUSE_BITS) {
-                fm->dvsize = psize;
-                set_free_with_pinuse(p, psize, next);
-                goto postaction;
-              }
-            }
-            else
-              goto erroraction;
-          }
-        }
-
-        if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
-          if (!cinuse(next)) {  /* consolidate forward */
-            if (next == fm->top) {
-              size_t tsize = fm->topsize += psize;
-              fm->top = p;
-              p->head = tsize | PINUSE_BIT;
-              if (p == fm->dv) {
-                fm->dv = 0;
-                fm->dvsize = 0;
-              }
-              if (should_trim(fm, tsize))
-                sys_trim(fm, 0);
-              goto postaction;
-            }
-            else if (next == fm->dv) {
-              size_t dsize = fm->dvsize += psize;
-              fm->dv = p;
-              set_size_and_pinuse_of_free_chunk(p, dsize);
-              goto postaction;
-            }
-            else {
-              bindex_t nsize = chunksize(next);
-              psize += nsize;
-              unlink_chunk(fm, next, nsize);
-              set_size_and_pinuse_of_free_chunk(p, psize);
-              if (p == fm->dv) {
-                fm->dvsize = psize;
-                goto postaction;
-              }
-            }
-          }
-          else
-            set_free_with_pinuse(p, psize, next);
-
-          if (is_small(psize)) {
-            insert_small_chunk(fm, p, psize);
-            check_free_chunk(fm, p);
-          }
-          else {
-            tchunkptr tp = (tchunkptr)p;
-            insert_large_chunk(fm, tp, psize);
-            check_free_chunk(fm, p);
-            if (--fm->release_checks == 0)
-              release_unused_segments(fm);
-          }
-          goto postaction;
-        }
-      }
-    erroraction:
-      USAGE_ERROR_ACTION(fm, p);
-    postaction:
-      POSTACTION(fm);
-    }
-  }
+		if (!PREACTION(fm)) {
+			check_inuse_chunk(fm, p);
+			if (RTCHECK(ok_address(fm, p) && ok_inuse(p))) {
+				bindex_t psize = chunksize(p);
+				mchunkptr next = chunk_plus_offset(p, psize);
+				if (!pinuse(p)) {
+					bindex_t prevsize = (bindex_t)p->prev_foot;
+					if (is_mmapped(p)) {
+						psize += prevsize + MMAP_FOOT_PAD;
+						if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
+							fm->footprint -= psize;
+						goto postaction;
+					}
+					else {
+						mchunkptr prev = chunk_minus_offset(p, prevsize);
+						psize += prevsize;
+						p = prev;
+						if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
+							if (p != fm->dv) {
+								unlink_chunk(fm, p, prevsize);
+							}
+							else if ((next->head & INUSE_BITS) == INUSE_BITS) {
+								fm->dvsize = psize;
+								set_free_with_pinuse(p, psize, next);
+								goto postaction;
+							}
+						}
+						else
+							goto erroraction;
+					}
+				}
+
+				if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
+					if (!cinuse(next)) {  /* consolidate forward */
+						if (next == fm->top) {
+							size_t tsize = fm->topsize += psize;
+							fm->top = p;
+							p->head = tsize | PINUSE_BIT;
+							if (p == fm->dv) {
+								fm->dv = 0;
+								fm->dvsize = 0;
+							}
+							if (should_trim(fm, tsize))
+								sys_trim(fm, 0);
+							goto postaction;
+						}
+						else if (next == fm->dv) {
+							size_t dsize = fm->dvsize += psize;
+							fm->dv = p;
+							set_size_and_pinuse_of_free_chunk(p, dsize);
+							goto postaction;
+						}
+						else {
+							bindex_t nsize = chunksize(next);
+							psize += nsize;
+							unlink_chunk(fm, next, nsize);
+							set_size_and_pinuse_of_free_chunk(p, psize);
+							if (p == fm->dv) {
+								fm->dvsize = psize;
+								goto postaction;
+							}
+						}
+					}
+					else
+						set_free_with_pinuse(p, psize, next);
+
+					if (is_small(psize)) {
+						insert_small_chunk(fm, p, psize);
+						check_free_chunk(fm, p);
+					}
+					else {
+						tchunkptr tp = (tchunkptr)p;
+						insert_large_chunk(fm, tp, psize);
+						check_free_chunk(fm, p);
+						if (--fm->release_checks == 0)
+							release_unused_segments(fm);
+					}
+					goto postaction;
+				}
+			}
+erroraction:
+			USAGE_ERROR_ACTION(fm, p);
+postaction:
+			POSTACTION(fm);
+		}
+	}
 #if !FOOTERS
 #undef fm
 #endif /* FOOTERS */
 }
 
 void* dlcalloc(size_t n_elements, size_t elem_size) {
-  void* mem;
-  size_t req = 0;
-  if (n_elements != 0) {
-    req = n_elements * elem_size;
-    if (((n_elements | elem_size) & ~(size_t)0xffff) &&
-        (req / n_elements != elem_size))
-      req = MAX_SIZE_T; /* force downstream failure on overflow */
-  }
-  mem = dlmalloc(req);
-  if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
-    memset(mem, 0, req);
-  return mem;
+	void* mem;
+	size_t req = 0;
+	if (n_elements != 0) {
+		req = n_elements * elem_size;
+		if (((n_elements | elem_size) & ~(size_t)0xffff) &&
+		        (req / n_elements != elem_size))
+			req = MAX_SIZE_T; /* force downstream failure on overflow */
+	}
+	mem = dlmalloc(req);
+	if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
+		memset(mem, 0, req);
+	return mem;
 }
 
 void* dlrealloc(void* oldmem, size_t bytes) {
-  if (oldmem == 0)
-    return dlmalloc(bytes);
+	if (oldmem == 0)
+		return dlmalloc(bytes);
 #ifdef REALLOC_ZERO_BYTES_FREES
-  if (bytes == 0) {
-    dlfree(oldmem);
-    return 0;
-  }
+	if (bytes == 0) {
+		dlfree(oldmem);
+		return 0;
+	}
 #endif /* REALLOC_ZERO_BYTES_FREES */
-  else {
+	else {
 #if ! FOOTERS
-    mstate m = gm;
+		mstate m = gm;
 #else /* FOOTERS */
-    mstate m = get_mstate_for(mem2chunk(oldmem));
-    if (!ok_magic(m)) {
-      USAGE_ERROR_ACTION(m, oldmem);
-      return 0;
-    }
+		mstate m = get_mstate_for(mem2chunk(oldmem));
+		if (!ok_magic(m)) {
+			USAGE_ERROR_ACTION(m, oldmem);
+			return 0;
+		}
 #endif /* FOOTERS */
-    return internal_realloc(m, oldmem, bytes);
-  }
+		return internal_realloc(m, oldmem, bytes);
+	}
 }
 
 void* dlmemalign(size_t alignment, size_t bytes) {
-  return internal_memalign(gm, alignment, bytes);
+	return internal_memalign(gm, alignment, bytes);
 }
 
 void** dlindependent_calloc(size_t n_elements, size_t elem_size,
-                                 void* chunks[]) {
-  size_t sz = elem_size; /* serves as 1-element array */
-  return ialloc(gm, n_elements, &sz, 3, chunks);
+                            void* chunks[]) {
+	size_t sz = elem_size; /* serves as 1-element array */
+	return ialloc(gm, n_elements, &sz, 3, chunks);
 }
 
 void** dlindependent_comalloc(size_t n_elements, size_t sizes[],
-                                   void* chunks[]) {
-  return ialloc(gm, n_elements, sizes, 0, chunks);
+                              void* chunks[]) {
+	return ialloc(gm, n_elements, sizes, 0, chunks);
 }
 
 void* dlvalloc(size_t bytes) {
-  size_t pagesz;
-  ensure_initialization();
-  pagesz = mparams.page_size;
-  return dlmemalign(pagesz, bytes);
+	size_t pagesz;
+	ensure_initialization();
+	pagesz = mparams.page_size;
+	return dlmemalign(pagesz, bytes);
 }
 
 void* dlpvalloc(size_t bytes) {
-  size_t pagesz;
-  ensure_initialization();
-  pagesz = mparams.page_size;
-  return dlmemalign(pagesz, (bytes + pagesz - SIZE_T_ONE) & ~(pagesz - SIZE_T_ONE));
+	size_t pagesz;
+	ensure_initialization();
+	pagesz = mparams.page_size;
+	return dlmemalign(pagesz, (bytes + pagesz - SIZE_T_ONE) & ~(pagesz - SIZE_T_ONE));
 }
 
 int dlmalloc_trim(size_t pad) {
-  int result = 0;
-  ensure_initialization();
-  if (!PREACTION(gm)) {
-    result = sys_trim(gm, pad);
-    POSTACTION(gm);
-  }
-  return result;
+	int result = 0;
+	ensure_initialization();
+	if (!PREACTION(gm)) {
+		result = sys_trim(gm, pad);
+		POSTACTION(gm);
+	}
+	return result;
 }
 
 size_t dlmalloc_footprint(void) {
-  return gm->footprint;
+	return gm->footprint;
 }
 
 size_t dlmalloc_max_footprint(void) {
-  return gm->max_footprint;
+	return gm->max_footprint;
 }
 
 #if !NO_MALLINFO
 struct mallinfo dlmallinfo(void) {
-  return internal_mallinfo(gm);
+	return internal_mallinfo(gm);
 }
 #endif /* NO_MALLINFO */
 
 void dlmalloc_stats() {
-  internal_malloc_stats(gm);
+	internal_malloc_stats(gm);
 }
 
 int dlmallopt(int param_number, int value) {
-  return change_mparam(param_number, value);
+	return change_mparam(param_number, value);
 }
 
 #endif /* !ONLY_MSPACES */
 
 size_t dlmalloc_usable_size(void* mem) {
-  if (mem != 0) {
-    mchunkptr p = mem2chunk(mem);
-    if (is_inuse(p))
-      return chunksize(p) - overhead_for(p);
-  }
-  return 0;
+	if (mem != 0) {
+		mchunkptr p = mem2chunk(mem);
+		if (is_inuse(p))
+			return chunksize(p) - overhead_for(p);
+	}
+	return 0;
 }
 
 /* ----------------------------- user mspaces ---------------------------- */
@@ -4960,95 +4960,95 @@
 #if MSPACES
 
 static mstate init_user_mstate(char* tbase, size_t tsize) {
-  size_t msize = pad_request(sizeof(struct malloc_state));
-  mchunkptr mn;
-  mchunkptr msp = align_as_chunk(tbase);
-  mstate m = (mstate)(chunk2mem(msp));
-  memset(m, 0, msize);
-  INITIAL_LOCK(&m->mutex);
-  msp->head = (msize|INUSE_BITS);
-  m->seg.base = m->least_addr = tbase;
-  m->seg.size = m->footprint = m->max_footprint = tsize;
-  m->magic = mparams.magic;
-  m->release_checks = MAX_RELEASE_CHECK_RATE;
-  m->mflags = mparams.default_mflags;
-  m->extp = 0;
-  m->exts = 0;
-  disable_contiguous(m);
-  init_bins(m);
-  mn = next_chunk(mem2chunk(m));
-  init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) - TOP_FOOT_SIZE);
-  check_top_chunk(m, m->top);
-  return m;
+	size_t msize = pad_request(sizeof(struct malloc_state));
+	mchunkptr mn;
+	mchunkptr msp = align_as_chunk(tbase);
+	mstate m = (mstate)(chunk2mem(msp));
+	memset(m, 0, msize);
+	INITIAL_LOCK(&m->mutex);
+	msp->head = (msize|INUSE_BITS);
+	m->seg.base = m->least_addr = tbase;
+	m->seg.size = m->footprint = m->max_footprint = tsize;
+	m->magic = mparams.magic;
+	m->release_checks = MAX_RELEASE_CHECK_RATE;
+	m->mflags = mparams.default_mflags;
+	m->extp = 0;
+	m->exts = 0;
+	disable_contiguous(m);
+	init_bins(m);
+	mn = next_chunk(mem2chunk(m));
+	init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) - TOP_FOOT_SIZE);
+	check_top_chunk(m, m->top);
+	return m;
 }
 
 mspace create_mspace(size_t capacity, int locked) {
-  mstate m = 0;
-  size_t msize;
-  ensure_initialization();
-  msize = pad_request(sizeof(struct malloc_state));
-  if (capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
-    size_t rs = ((capacity == 0)? mparams.granularity :
-                 (capacity + TOP_FOOT_SIZE + msize));
-    size_t tsize = granularity_align(rs);
-    char* tbase = (char*)(CALL_MMAP(tsize));
-    if (tbase != CMFAIL) {
-      m = init_user_mstate(tbase, tsize);
-      m->seg.sflags = USE_MMAP_BIT;
-      set_lock(m, locked);
-    }
-  }
-  return (mspace)m;
+	mstate m = 0;
+	size_t msize;
+	ensure_initialization();
+	msize = pad_request(sizeof(struct malloc_state));
+	if (capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
+		size_t rs = ((capacity == 0)? mparams.granularity :
+		             (capacity + TOP_FOOT_SIZE + msize));
+		size_t tsize = granularity_align(rs);
+		char* tbase = (char*)(CALL_MMAP(tsize));
+		if (tbase != CMFAIL) {
+			m = init_user_mstate(tbase, tsize);
+			m->seg.sflags = USE_MMAP_BIT;
+			set_lock(m, locked);
+		}
+	}
+	return (mspace)m;
 }
 
 mspace create_mspace_with_base(void* base, size_t capacity, int locked) {
-  mstate m = 0;
-  size_t msize;
-  ensure_initialization();
-  msize = pad_request(sizeof(struct malloc_state));
-  if (capacity > msize + TOP_FOOT_SIZE &&
-      capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
-    m = init_user_mstate((char*)base, capacity);
-    m->seg.sflags = EXTERN_BIT;
-    set_lock(m, locked);
-  }
-  return (mspace)m;
+	mstate m = 0;
+	size_t msize;
+	ensure_initialization();
+	msize = pad_request(sizeof(struct malloc_state));
+	if (capacity > msize + TOP_FOOT_SIZE &&
+	        capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
+		m = init_user_mstate((char*)base, capacity);
+		m->seg.sflags = EXTERN_BIT;
+		set_lock(m, locked);
+	}
+	return (mspace)m;
 }
 
 int mspace_track_large_chunks(mspace msp, int enable) {
-  int ret = 0;
-  mstate ms = (mstate)msp;
-  if (!PREACTION(ms)) {
-    if (!use_mmap(ms))
-      ret = 1;
-    if (!enable)
-      enable_mmap(ms);
-    else
-      disable_mmap(ms);
-    POSTACTION(ms);
-  }
-  return ret;
+	int ret = 0;
+	mstate ms = (mstate)msp;
+	if (!PREACTION(ms)) {
+		if (!use_mmap(ms))
+			ret = 1;
+		if (!enable)
+			enable_mmap(ms);
+		else
+			disable_mmap(ms);
+		POSTACTION(ms);
+	}
+	return ret;
 }
 
 size_t destroy_mspace(mspace msp) {
-  size_t freed = 0;
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    msegmentptr sp = &ms->seg;
-    while (sp != 0) {
-      char* base = sp->base;
-      size_t size = sp->size;
-      flag_t flag = sp->sflags;
-      sp = sp->next;
-      if ((flag & USE_MMAP_BIT) && !(flag & EXTERN_BIT) &&
-          CALL_MUNMAP(base, size) == 0)
-        freed += size;
-    }
-  }
-  else {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-  return freed;
+	size_t freed = 0;
+	mstate ms = (mstate)msp;
+	if (ok_magic(ms)) {
+		msegmentptr sp = &ms->seg;
+		while (sp != 0) {
+			char* base = sp->base;
+			size_t size = sp->size;
+			flag_t flag = sp->sflags;
+			sp = sp->next;
+			if ((flag & USE_MMAP_BIT) && !(flag & EXTERN_BIT) &&
+			        CALL_MUNMAP(base, size) == 0)
+				freed += size;
+		}
+	}
+	else {
+		USAGE_ERROR_ACTION(ms,ms);
+	}
+	return freed;
 }
 
 /*
@@ -5058,366 +5058,366 @@
 
 
 void* mspace_malloc(mspace msp, size_t bytes) {
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  if (!PREACTION(ms)) {
-    void* mem;
-    size_t nb;
-    if (bytes <= MAX_SMALL_REQUEST) {
-      bindex_t idx;
-      binmap_t smallbits;
-      nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
-      idx = small_index(nb);
-      smallbits = ms->smallmap >> idx;
-
-      if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
-        mchunkptr b, p;
-        idx += ~smallbits & 1;       /* Uses next bin if idx empty */
-        b = smallbin_at(ms, idx);
-        p = b->fd;
-        assert(chunksize(p) == small_index2size(idx));
-        unlink_first_small_chunk(ms, b, p, idx);
-        set_inuse_and_pinuse(ms, p, small_index2size(idx));
-        mem = chunk2mem(p);
-        check_malloced_chunk(ms, mem, nb);
-        goto postaction;
-      }
-
-      else if (nb > ms->dvsize) {
-        if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
-          mchunkptr b, p, r;
-          size_t rsize;
-          bindex_t i;
-          binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
-          binmap_t leastbit = least_bit(leftbits);
-          compute_bit2idx(leastbit, i);
-          b = smallbin_at(ms, i);
-          p = b->fd;
-          assert(chunksize(p) == small_index2size(i));
-          unlink_first_small_chunk(ms, b, p, i);
-          rsize = small_index2size(i) - nb;
-          /* Fit here cannot be remainderless if 4byte sizes */
-          if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
-            set_inuse_and_pinuse(ms, p, small_index2size(i));
-          else {
-            set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
-            r = chunk_plus_offset(p, nb);
-            set_size_and_pinuse_of_free_chunk(r, rsize);
-            replace_dv(ms, r, rsize);
-          }
-          mem = chunk2mem(p);
-          check_malloced_chunk(ms, mem, nb);
-          goto postaction;
-        }
-
-        else if (ms->treemap != 0 && (mem = tmalloc_small(ms, nb)) != 0) {
-          check_malloced_chunk(ms, mem, nb);
-          goto postaction;
-        }
-      }
-    }
-    else if (bytes >= MAX_REQUEST)
-      nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
-    else {
-      nb = pad_request(bytes);
-      if (ms->treemap != 0 && (mem = tmalloc_large(ms, nb)) != 0) {
-        check_malloced_chunk(ms, mem, nb);
-        goto postaction;
-      }
-    }
-
-    if (nb <= ms->dvsize) {
-      size_t rsize = ms->dvsize - nb;
-      mchunkptr p = ms->dv;
-      if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
-        mchunkptr r = ms->dv = chunk_plus_offset(p, nb);
-        ms->dvsize = rsize;
-        set_size_and_pinuse_of_free_chunk(r, rsize);
-        set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
-      }
-      else { /* exhaust dv */
-        size_t dvs = ms->dvsize;
-        ms->dvsize = 0;
-        ms->dv = 0;
-        set_inuse_and_pinuse(ms, p, dvs);
-      }
-      mem = chunk2mem(p);
-      check_malloced_chunk(ms, mem, nb);
-      goto postaction;
-    }
-
-    else if (nb < ms->topsize) { /* Split top */
-      size_t rsize = ms->topsize -= nb;
-      mchunkptr p = ms->top;
-      mchunkptr r = ms->top = chunk_plus_offset(p, nb);
-      r->head = rsize | PINUSE_BIT;
-      set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
-      mem = chunk2mem(p);
-      check_top_chunk(ms, ms->top);
-      check_malloced_chunk(ms, mem, nb);
-      goto postaction;
-    }
-
-    mem = sys_alloc(ms, nb);
-
-  postaction:
-    POSTACTION(ms);
-    return mem;
-  }
+	mstate ms = (mstate)msp;
+	if (!ok_magic(ms)) {
+		USAGE_ERROR_ACTION(ms,ms);
+		return 0;
+	}
+	if (!PREACTION(ms)) {
+		void* mem;
+		size_t nb;
+		if (bytes <= MAX_SMALL_REQUEST) {
+			bindex_t idx;
+			binmap_t smallbits;
+			nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
+			idx = small_index(nb);
+			smallbits = ms->smallmap >> idx;
+
+			if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
+				mchunkptr b, p;
+				idx += ~smallbits & 1;       /* Uses next bin if idx empty */
+				b = smallbin_at(ms, idx);
+				p = b->fd;
+				assert(chunksize(p) == small_index2size(idx));
+				unlink_first_small_chunk(ms, b, p, idx);
+				set_inuse_and_pinuse(ms, p, small_index2size(idx));
+				mem = chunk2mem(p);
+				check_malloced_chunk(ms, mem, nb);
+				goto postaction;
+			}
+
+			else if (nb > ms->dvsize) {
+				if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
+					mchunkptr b, p, r;
+					size_t rsize;
+					bindex_t i;
+					binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
+					binmap_t leastbit = least_bit(leftbits);
+					compute_bit2idx(leastbit, i);
+					b = smallbin_at(ms, i);
+					p = b->fd;
+					assert(chunksize(p) == small_index2size(i));
+					unlink_first_small_chunk(ms, b, p, i);
+					rsize = small_index2size(i) - nb;
+					/* Fit here cannot be remainderless if 4byte sizes */
+					if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
+						set_inuse_and_pinuse(ms, p, small_index2size(i));
+					else {
+						set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+						r = chunk_plus_offset(p, nb);
+						set_size_and_pinuse_of_free_chunk(r, rsize);
+						replace_dv(ms, r, rsize);
+					}
+					mem = chunk2mem(p);
+					check_malloced_chunk(ms, mem, nb);
+					goto postaction;
+				}
+
+				else if (ms->treemap != 0 && (mem = tmalloc_small(ms, nb)) != 0) {
+					check_malloced_chunk(ms, mem, nb);
+					goto postaction;
+				}
+			}
+		}
+		else if (bytes >= MAX_REQUEST)
+			nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
+		else {
+			nb = pad_request(bytes);
+			if (ms->treemap != 0 && (mem = tmalloc_large(ms, nb)) != 0) {
+				check_malloced_chunk(ms, mem, nb);
+				goto postaction;
+			}
+		}
+
+		if (nb <= ms->dvsize) {
+			size_t rsize = ms->dvsize - nb;
+			mchunkptr p = ms->dv;
+			if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
+				mchunkptr r = ms->dv = chunk_plus_offset(p, nb);
+				ms->dvsize = rsize;
+				set_size_and_pinuse_of_free_chunk(r, rsize);
+				set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+			}
+			else { /* exhaust dv */
+				size_t dvs = ms->dvsize;
+				ms->dvsize = 0;
+				ms->dv = 0;
+				set_inuse_and_pinuse(ms, p, dvs);
+			}
+			mem = chunk2mem(p);
+			check_malloced_chunk(ms, mem, nb);
+			goto postaction;
+		}
+
+		else if (nb < ms->topsize) { /* Split top */
+			size_t rsize = ms->topsize -= nb;
+			mchunkptr p = ms->top;
+			mchunkptr r = ms->top = chunk_plus_offset(p, nb);
+			r->head = rsize | PINUSE_BIT;
+			set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+			mem = chunk2mem(p);
+			check_top_chunk(ms, ms->top);
+			check_malloced_chunk(ms, mem, nb);
+			goto postaction;
+		}
+
+		mem = sys_alloc(ms, nb);
+
+postaction:
+		POSTACTION(ms);
+		return mem;
+	}
 
-  return 0;
+	return 0;
 }
 
 void mspace_free(mspace msp, void* mem) {
-  if (mem != 0) {
-    mchunkptr p  = mem2chunk(mem);
+	if (mem != 0) {
+		mchunkptr p  = mem2chunk(mem);
 #if FOOTERS
-    mstate fm = get_mstate_for(p);
-    msp = msp; /* placate people compiling -Wunused */
+		mstate fm = get_mstate_for(p);
+		msp = msp; /* placate people compiling -Wunused */
 #else /* FOOTERS */
-    mstate fm = (mstate)msp;
+		mstate fm = (mstate)msp;
 #endif /* FOOTERS */
-    if (!ok_magic(fm)) {
-      USAGE_ERROR_ACTION(fm, p);
-      return;
-    }
-    if (!PREACTION(fm)) {
-      check_inuse_chunk(fm, p);
-      if (RTCHECK(ok_address(fm, p) && ok_inuse(p))) {
-        size_t psize = chunksize(p);
-        mchunkptr next = chunk_plus_offset(p, psize);
-        if (!pinuse(p)) {
-          size_t prevsize = p->prev_foot;
-          if (is_mmapped(p)) {
-            psize += prevsize + MMAP_FOOT_PAD;
-            if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
-              fm->footprint -= psize;
-            goto postaction;
-          }
-          else {
-            mchunkptr prev = chunk_minus_offset(p, prevsize);
-            psize += prevsize;
-            p = prev;
-            if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
-              if (p != fm->dv) {
-                unlink_chunk(fm, p, prevsize);
-              }
-              else if ((next->head & INUSE_BITS) == INUSE_BITS) {
-                fm->dvsize = psize;
-                set_free_with_pinuse(p, psize, next);
-                goto postaction;
-              }
-            }
-            else
-              goto erroraction;
-          }
-        }
-
-        if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
-          if (!cinuse(next)) {  /* consolidate forward */
-            if (next == fm->top) {
-              size_t tsize = fm->topsize += psize;
-              fm->top = p;
-              p->head = tsize | PINUSE_BIT;
-              if (p == fm->dv) {
-                fm->dv = 0;
-                fm->dvsize = 0;
-              }
-              if (should_trim(fm, tsize))
-                sys_trim(fm, 0);
-              goto postaction;
-            }
-            else if (next == fm->dv) {
-              size_t dsize = fm->dvsize += psize;
-              fm->dv = p;
-              set_size_and_pinuse_of_free_chunk(p, dsize);
-              goto postaction;
-            }
-            else {
-              size_t nsize = chunksize(next);
-              psize += nsize;
-              unlink_chunk(fm, next, nsize);
-              set_size_and_pinuse_of_free_chunk(p, psize);
-              if (p == fm->dv) {
-                fm->dvsize = psize;
-                goto postaction;
-              }
-            }
-          }
-          else
-            set_free_with_pinuse(p, psize, next);
-
-          if (is_small(psize)) {
-            insert_small_chunk(fm, p, psize);
-            check_free_chunk(fm, p);
-          }
-          else {
-            tchunkptr tp = (tchunkptr)p;
-            insert_large_chunk(fm, tp, psize);
-            check_free_chunk(fm, p);
-            if (--fm->release_checks == 0)
-              release_unused_segments(fm);
-          }
-          goto postaction;
-        }
-      }
-    erroraction:
-      USAGE_ERROR_ACTION(fm, p);
-    postaction:
-      POSTACTION(fm);
-    }
-  }
+		if (!ok_magic(fm)) {
+			USAGE_ERROR_ACTION(fm, p);
+			return;
+		}
+		if (!PREACTION(fm)) {
+			check_inuse_chunk(fm, p);
+			if (RTCHECK(ok_address(fm, p) && ok_inuse(p))) {
+				size_t psize = chunksize(p);
+				mchunkptr next = chunk_plus_offset(p, psize);
+				if (!pinuse(p)) {
+					size_t prevsize = p->prev_foot;
+					if (is_mmapped(p)) {
+						psize += prevsize + MMAP_FOOT_PAD;
+						if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
+							fm->footprint -= psize;
+						goto postaction;
+					}
+					else {
+						mchunkptr prev = chunk_minus_offset(p, prevsize);
+						psize += prevsize;
+						p = prev;
+						if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
+							if (p != fm->dv) {
+								unlink_chunk(fm, p, prevsize);
+							}
+							else if ((next->head & INUSE_BITS) == INUSE_BITS) {
+								fm->dvsize = psize;
+								set_free_with_pinuse(p, psize, next);
+								goto postaction;
+							}
+						}
+						else
+							goto erroraction;
+					}
+				}
+
+				if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
+					if (!cinuse(next)) {  /* consolidate forward */
+						if (next == fm->top) {
+							size_t tsize = fm->topsize += psize;
+							fm->top = p;
+							p->head = tsize | PINUSE_BIT;
+							if (p == fm->dv) {
+								fm->dv = 0;
+								fm->dvsize = 0;
+							}
+							if (should_trim(fm, tsize))
+								sys_trim(fm, 0);
+							goto postaction;
+						}
+						else if (next == fm->dv) {
+							size_t dsize = fm->dvsize += psize;
+							fm->dv = p;
+							set_size_and_pinuse_of_free_chunk(p, dsize);
+							goto postaction;
+						}
+						else {
+							size_t nsize = chunksize(next);
+							psize += nsize;
+							unlink_chunk(fm, next, nsize);
+							set_size_and_pinuse_of_free_chunk(p, psize);
+							if (p == fm->dv) {
+								fm->dvsize = psize;
+								goto postaction;
+							}
+						}
+					}
+					else
+						set_free_with_pinuse(p, psize, next);
+
+					if (is_small(psize)) {
+						insert_small_chunk(fm, p, psize);
+						check_free_chunk(fm, p);
+					}
+					else {
+						tchunkptr tp = (tchunkptr)p;
+						insert_large_chunk(fm, tp, psize);
+						check_free_chunk(fm, p);
+						if (--fm->release_checks == 0)
+							release_unused_segments(fm);
+					}
+					goto postaction;
+				}
+			}
+erroraction:
+			USAGE_ERROR_ACTION(fm, p);
+postaction:
+			POSTACTION(fm);
+		}
+	}
 }
 
 void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size) {
-  void* mem;
-  size_t req = 0;
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  if (n_elements != 0) {
-    req = n_elements * elem_size;
-    if (((n_elements | elem_size) & ~(size_t)0xffff) &&
-        (req / n_elements != elem_size))
-      req = MAX_SIZE_T; /* force downstream failure on overflow */
-  }
-  mem = internal_malloc(ms, req);
-  if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
-    memset(mem, 0, req);
-  return mem;
+	void* mem;
+	size_t req = 0;
+	mstate ms = (mstate)msp;
+	if (!ok_magic(ms)) {
+		USAGE_ERROR_ACTION(ms,ms);
+		return 0;
+	}
+	if (n_elements != 0) {
+		req = n_elements * elem_size;
+		if (((n_elements | elem_size) & ~(size_t)0xffff) &&
+		        (req / n_elements != elem_size))
+			req = MAX_SIZE_T; /* force downstream failure on overflow */
+	}
+	mem = internal_malloc(ms, req);
+	if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
+		memset(mem, 0, req);
+	return mem;
 }
 
 void* mspace_realloc(mspace msp, void* oldmem, size_t bytes) {
-  if (oldmem == 0)
-    return mspace_malloc(msp, bytes);
+	if (oldmem == 0)
+		return mspace_malloc(msp, bytes);
 #ifdef REALLOC_ZERO_BYTES_FREES
-  if (bytes == 0) {
-    mspace_free(msp, oldmem);
-    return 0;
-  }
+	if (bytes == 0) {
+		mspace_free(msp, oldmem);
+		return 0;
+	}
 #endif /* REALLOC_ZERO_BYTES_FREES */
-  else {
+	else {
 #if FOOTERS
-    mchunkptr p  = mem2chunk(oldmem);
-    mstate ms = get_mstate_for(p);
+		mchunkptr p  = mem2chunk(oldmem);
+		mstate ms = get_mstate_for(p);
 #else /* FOOTERS */
-    mstate ms = (mstate)msp;
+		mstate ms = (mstate)msp;
 #endif /* FOOTERS */
-    if (!ok_magic(ms)) {
-      USAGE_ERROR_ACTION(ms,ms);
-      return 0;
-    }
-    return internal_realloc(ms, oldmem, bytes);
-  }
+		if (!ok_magic(ms)) {
+			USAGE_ERROR_ACTION(ms,ms);
+			return 0;
+		}
+		return internal_realloc(ms, oldmem, bytes);
+	}
 }
 
 void* mspace_memalign(mspace msp, size_t alignment, size_t bytes) {
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  return internal_memalign(ms, alignment, bytes);
+	mstate ms = (mstate)msp;
+	if (!ok_magic(ms)) {
+		USAGE_ERROR_ACTION(ms,ms);
+		return 0;
+	}
+	return internal_memalign(ms, alignment, bytes);
 }
 
 void** mspace_independent_calloc(mspace msp, size_t n_elements,
                                  size_t elem_size, void* chunks[]) {
-  size_t sz = elem_size; /* serves as 1-element array */
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  return ialloc(ms, n_elements, &sz, 3, chunks);
+	size_t sz = elem_size; /* serves as 1-element array */
+	mstate ms = (mstate)msp;
+	if (!ok_magic(ms)) {
+		USAGE_ERROR_ACTION(ms,ms);
+		return 0;
+	}
+	return ialloc(ms, n_elements, &sz, 3, chunks);
 }
 
 void** mspace_independent_comalloc(mspace msp, size_t n_elements,
                                    size_t sizes[], void* chunks[]) {
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  return ialloc(ms, n_elements, sizes, 0, chunks);
+	mstate ms = (mstate)msp;
+	if (!ok_magic(ms)) {
+		USAGE_ERROR_ACTION(ms,ms);
+		return 0;
+	}
+	return ialloc(ms, n_elements, sizes, 0, chunks);
 }
 
 int mspace_trim(mspace msp, size_t pad) {
-  int result = 0;
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    if (!PREACTION(ms)) {
-      result = sys_trim(ms, pad);
-      POSTACTION(ms);
-    }
-  }
-  else {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-  return result;
+	int result = 0;
+	mstate ms = (mstate)msp;
+	if (ok_magic(ms)) {
+		if (!PREACTION(ms)) {
+			result = sys_trim(ms, pad);
+			POSTACTION(ms);
+		}
+	}
+	else {
+		USAGE_ERROR_ACTION(ms,ms);
+	}
+	return result;
 }
 
 void mspace_malloc_stats(mspace msp) {
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    internal_malloc_stats(ms);
-  }
-  else {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
+	mstate ms = (mstate)msp;
+	if (ok_magic(ms)) {
+		internal_malloc_stats(ms);
+	}
+	else {
+		USAGE_ERROR_ACTION(ms,ms);
+	}
 }
 
 size_t mspace_footprint(mspace msp) {
-  size_t result = 0;
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    result = ms->footprint;
-  }
-  else {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-  return result;
+	size_t result = 0;
+	mstate ms = (mstate)msp;
+	if (ok_magic(ms)) {
+		result = ms->footprint;
+	}
+	else {
+		USAGE_ERROR_ACTION(ms,ms);
+	}
+	return result;
 }
 
 
 size_t mspace_max_footprint(mspace msp) {
-  size_t result = 0;
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    result = ms->max_footprint;
-  }
-  else {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-  return result;
+	size_t result = 0;
+	mstate ms = (mstate)msp;
+	if (ok_magic(ms)) {
+		result = ms->max_footprint;
+	}
+	else {
+		USAGE_ERROR_ACTION(ms,ms);
+	}
+	return result;
 }
 
 
 #if !NO_MALLINFO
 struct mallinfo mspace_mallinfo(mspace msp) {
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-  return internal_mallinfo(ms);
+	mstate ms = (mstate)msp;
+	if (!ok_magic(ms)) {
+		USAGE_ERROR_ACTION(ms,ms);
+	}
+	return internal_mallinfo(ms);
 }
 #endif /* NO_MALLINFO */
 
 size_t mspace_usable_size(void* mem) {
-  if (mem != 0) {
-    mchunkptr p = mem2chunk(mem);
-    if (is_inuse(p))
-      return chunksize(p) - overhead_for(p);
-  }
-  return 0;
+	if (mem != 0) {
+		mchunkptr p = mem2chunk(mem);
+		if (is_inuse(p))
+			return chunksize(p) - overhead_for(p);
+	}
+	return 0;
 }
 
 int mspace_mallopt(int param_number, int value) {
-  return change_mparam(param_number, value);
+	return change_mparam(param_number, value);
 }
 
 #endif /* MSPACES */

gpac-0.5.0.svn5178.tar.bz2/src/utils/downloader.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/downloader.c Changed

@@ -33,6 +33,8 @@
 #include <gpac/tools.h>
 #include <gpac/cache.h>
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 #ifdef GPAC_HAS_SSL
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
@@ -80,8 +82,8 @@
 
 enum REQUEST_TYPE {
 	GET = 0,
-    HEAD = 1,
-    OTHER = 2
+	HEAD = 1,
+	OTHER = 2
 };
 
 /*!the structure used to store an HTTP header*/
@@ -96,136 +98,136 @@
  * This structure handles partial downloads
  */
 typedef struct __partialDownloadStruct {
-    char * url;
-    u64 startOffset;
-    u64 endOffset;
-    char * filename;
+	char * url;
+	u64 startOffset;
+	u64 endOffset;
+	char * filename;
 } GF_PartialDownload ;
 
 struct __gf_download_session
 {
-    /*this is always 0 and helps differenciating downloads from other interfaces (interfaceType != 0)*/
-    u32 reserved;
+	/*this is always 0 and helps differenciating downloads from other interfaces (interfaceType != 0)*/
+	u32 reserved;
 
-    struct __gf_download_manager *dm;
-    GF_Thread *th;
-    GF_Mutex *mx;
-
-    Bool in_callback, destroy;
-    u32 proxy_enabled;
-
-    char *server_name;
-    u16 port;
-
-    char *orig_url;
-    char *orig_url_before_redirect;
-    char *remote_path;
-    gf_user_credentials_struct * creds;
-    char cookie[GF_MAX_PATH];
-    DownloadedCacheEntry cache_entry;
+	struct __gf_download_manager *dm;
+	GF_Thread *th;
+	GF_Mutex *mx;
+
+	Bool in_callback, destroy;
+	u32 proxy_enabled;
+
+	char *server_name;
+	u16 port;
+
+	char *orig_url;
+	char *orig_url_before_redirect;
+	char *remote_path;
+	gf_user_credentials_struct * creds;
+	char cookie[GF_MAX_PATH];
+	DownloadedCacheEntry cache_entry;
 	Bool reused_cache_entry;
 
 	//mime type, only used when the session is not cached.
 	char *mime_type;
-    GF_List *headers;
+	GF_List *headers;
 
-    GF_Socket *sock;
-    u32 num_retry;
+	GF_Socket *sock;
+	u32 num_retry;
 	GF_NetIOStatus status;
 
-    u32 flags;
-    u32 total_size, bytes_done, start_time, icy_metaint, icy_count, icy_bytes;
-    u32 bytes_per_sec;
+	u32 flags;
+	u32 total_size, bytes_done, icy_metaint, icy_count, icy_bytes;
+	u64 start_time;
+	u32 bytes_per_sec;
 	u64 start_time_utc;
 	Bool connection_close;
 	Bool is_range_continuation;
 	/*0: no cache reconfig before next GET request: 1: try to rematch the cache entry: 2: force to create a new cache entry (for byte-range cases*/
 	u32 needs_cache_reconfig;
-    /* Range information if needed for the download (cf flag) */
-    Bool needs_range;
-    u64 range_start, range_end;
-
-    /*0: GET
-      1: HEAD
-      2: all the rest
-    */
-    enum REQUEST_TYPE http_read_type;
-
-    GF_Err last_error;
-    char *init_data;
-    u32 init_data_size;
-    Bool server_only_understand_get;
-    /* True if cache file must be stored on disk */
-    Bool use_cache_file;
+	/* Range information if needed for the download (cf flag) */
+	Bool needs_range;
+	u64 range_start, range_end;
+
+	/*0: GET
+	  1: HEAD
+	  2: all the rest
+	*/
+	enum REQUEST_TYPE http_read_type;
+
+	GF_Err last_error;
+	char *init_data;
+	u32 init_data_size;
+	Bool server_only_understand_get;
+	/* True if cache file must be stored on disk */
+	Bool use_cache_file;
 	Bool disable_cache;
 	/*forces notification of data exchange to be sent regardless of threading mode*/
 	Bool force_data_write_callback;
 #ifdef GPAC_HAS_SSL
-    SSL *ssl;
+	SSL *ssl;
 #endif
 
-    void (*do_requests)(struct __gf_download_session *);
+	void (*do_requests)(struct __gf_download_session *);
 
-    /*callback for data reception - may not be NULL*/
-    gf_dm_user_io user_proc;
-    void *usr_cbk;
+	/*callback for data reception - may not be NULL*/
+	gf_dm_user_io user_proc;
+	void *usr_cbk;
 	Bool reassigned;
 
 	Bool chunked;
 	u32 nb_left_in_chunk;
 
 	u32 request_time;
-    /*private extension*/
-    void *ext;
+	/*private extension*/
+	void *ext;
 };
 
 struct __gf_download_manager
 {
-    GF_Mutex *cache_mx;
-    char *cache_directory;
-    char szCookieDir[GF_MAX_PATH];
+	GF_Mutex *cache_mx;
+	char *cache_directory;
+	char szCookieDir[GF_MAX_PATH];
 
-    Bool (*GetUserPassword)(void *usr_cbk, const char *site_url, char *usr_name, char *password);
-    void *usr_cbk;
+	Bool (*GetUserPassword)(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;
+	GF_Config *cfg;
+	GF_List *sessions;
 	Bool disable_cache;
-    u32 limit_data_rate;
+	u32 limit_data_rate;
 
-    GF_List *skip_proxy_servers;
-    GF_List *credentials;
-    GF_List *cache_entries;
-    /* FIXME : should be placed in DownloadedCacheEntry maybe... */
-    GF_List * partial_downloads;
+	GF_List *skip_proxy_servers;
+	GF_List *credentials;
+	GF_List *cache_entries;
+	/* FIXME : should be placed in DownloadedCacheEntry maybe... */
+	GF_List * partial_downloads;
 #ifdef GPAC_HAS_SSL
-    SSL_CTX *ssl_ctx;
+	SSL_CTX *ssl_ctx;
 #endif
-
 };
 
 #ifdef GPAC_HAS_SSL
 
 static void init_prng (void)
 {
-    char namebuf[256];
-    const char *random_file;
+	char namebuf[256];
+	const char *random_file;
 
-    if (RAND_status ()) return;
+	if (RAND_status ()) return;
 
-    namebuf[0] = '\0';
-    random_file = RAND_file_name (namebuf, sizeof (namebuf));
+	namebuf[0] = '\0';
+	random_file = RAND_file_name (namebuf, sizeof (namebuf));
 
-    if (random_file && *random_file)
-        RAND_load_file(random_file, 16384);
+	if (random_file && *random_file)
+		RAND_load_file(random_file, 16384);
 
-    if (RAND_status ()) return;
+	if (RAND_status ()) return;
 
 #ifdef WIN32
-    RAND_screen ();
-    if (RAND_status ())
-        return;
+	RAND_screen ();
+	if (RAND_status ())
+		return;
 #endif
 }
 
@@ -239,7 +241,7 @@
  * \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 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
@@ -250,7 +252,7 @@
  * \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 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
  */
@@ -260,7 +262,7 @@
  * \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 
+ * \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
  */
 GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess );
@@ -284,17 +286,17 @@
  */
 static
 gf_user_credentials_struct * gf_find_user_credentials_for_site(GF_DownloadManager *dm, const char * server_name) {
-    u32 count, i;
-    if (!dm || !dm->credentials || !server_name || !strlen(server_name))
-        return NULL;
-    count = gf_list_count( dm->credentials);
-    for (i = 0 ; i < count; i++) {
-        gf_user_credentials_struct * cred = gf_list_get(dm->credentials, i );
-        assert( cred );
-        if (!strcmp(cred->site, server_name))
-            return cred;
-    }
-    return NULL;
+	u32 count, i;
+	if (!dm || !dm->credentials || !server_name || !strlen(server_name))
+		return NULL;
+	count = gf_list_count( dm->credentials);
+	for (i = 0 ; i < count; i++) {
+		gf_user_credentials_struct * cred = gf_list_get(dm->credentials, i );
+		assert( cred );
+		if (!strcmp(cred->site, server_name))
+			return cred;
+	}
+	return NULL;
 }
 
 /**
@@ -305,16 +307,16 @@
  */
 static
 GF_Err gf_user_credentials_save_digest( GF_DownloadManager * dm, gf_user_credentials_struct * creds, const char * password) {
-    int size;
-    char pass_buf[1024], range_buf[1024];
-    if (!dm || !creds || !password)
-        return GF_BAD_PARAM;
-    sprintf(pass_buf, "%s:%s", creds->username, password);
-    size = gf_base64_encode(pass_buf, (u32) strlen(pass_buf), range_buf, 1024);
-    range_buf[size] = 0;
-    strcpy(creds->digest, range_buf);
-    creds->valid = 1;
-    return GF_OK;
+	int size;
+	char pass_buf[1024], range_buf[1024];
+	if (!dm || !creds || !password)
+		return GF_BAD_PARAM;
+	sprintf(pass_buf, "%s:%s", creds->username, password);
+	size = gf_base64_encode(pass_buf, (u32) strlen(pass_buf), range_buf, 1024);
+	range_buf[size] = 0;
+	strcpy(creds->digest, range_buf);
+	creds->valid = 1;
+	return GF_OK;
 }
 
 /**
@@ -326,48 +328,48 @@
 static
 GF_Err gf_user_credentials_ask_password( GF_DownloadManager * dm, gf_user_credentials_struct * creds)
 {
-    char szPASS[50];
-    if (!dm || !creds)
-        return GF_BAD_PARAM;
-    memset(szPASS, 0, 50);
-    if (!dm->GetUserPassword || !dm->GetUserPassword(dm->usr_cbk, creds->site, creds->username, szPASS)) {
-        return GF_AUTHENTICATION_FAILURE;
-    }
-    return gf_user_credentials_save_digest(dm, creds, szPASS);
-    return GF_OK;
+	char szPASS[50];
+	if (!dm || !creds)
+		return GF_BAD_PARAM;
+	memset(szPASS, 0, 50);
+	if (!dm->GetUserPassword || !dm->GetUserPassword(dm->usr_cbk, creds->site, creds->username, szPASS)) {
+		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)
 {
-    gf_user_credentials_struct * creds;
-    if (!dm)
-        return NULL;
-    assert( server_name );
-    creds = gf_find_user_credentials_for_site(dm, server_name);
-    /* If none found, we create one */
-    if (!creds) {
-        creds = (gf_user_credentials_struct*)gf_malloc(sizeof( gf_user_credentials_struct));
-        if (!creds)
-            return NULL;
-        gf_list_insert(dm->credentials, creds, 0);
-    }
-    creds->valid = valid;
-    strncpy(creds->username, username ? username : "", 50);
-    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,
-                   ("[HTTP] Failed to get password information.\n"));
-            gf_list_rem( dm->credentials, 0);
-            gf_free( creds );
-            creds = NULL;
-        }
-    }
-    return creds;
+	gf_user_credentials_struct * creds;
+	if (!dm)
+		return NULL;
+	assert( server_name );
+	creds = gf_find_user_credentials_for_site(dm, server_name);
+	/* If none found, we create one */
+	if (!creds) {
+		creds = (gf_user_credentials_struct*)gf_malloc(sizeof( gf_user_credentials_struct));
+		if (!creds)
+			return NULL;
+		gf_list_insert(dm->credentials, creds, 0);
+	}
+	creds->valid = valid;
+	strncpy(creds->username, username ? username : "", 50);
+	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,
+			       ("[HTTP] Failed to get password information.\n"));
+			gf_list_rem( dm->credentials, 0);
+			gf_free( creds );
+			creds = NULL;
+		}
+	}
+	return creds;
 }
 
 #ifdef GPAC_HAS_SSL
@@ -379,82 +381,82 @@
  * \return 0 if everyhing is OK, 1 otherwise
  */
 static Bool init_ssl_lib() {
-    if (_ssl_is_initialized)
-        return 0;
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[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"));
-        return 1;
-    }
-    SSL_library_init();
-    SSL_load_error_strings();
-    SSLeay_add_all_algorithms();
-    SSLeay_add_ssl_algorithms();
-    _ssl_is_initialized = 1;
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
-    return 0;
+	if (_ssl_is_initialized)
+		return 0;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[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"));
+		return 1;
+	}
+	SSL_library_init();
+	SSL_load_error_strings();
+	SSLeay_add_all_algorithms();
+	SSLeay_add_ssl_algorithms();
+	_ssl_is_initialized = 1;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
+	return 0;
 }
 
 static int ssl_init(GF_DownloadManager *dm, u32 mode)
 {
 #if OPENSSL_VERSION_NUMBER > 0x00909000
-    const
+	const
 #endif
-    SSL_METHOD *meth;
+	SSL_METHOD *meth;
 
-    if (!dm) return 0;
-    gf_mx_p(dm->cache_mx);
-    /* The SSL has already been initialized. */
-    if (dm->ssl_ctx) {
-        gf_mx_v(dm->cache_mx);
-        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"));
-        goto error;
-    }
-
-    switch (mode) {
-    case 0:
-        meth = SSLv23_client_method();
-        break;
+	if (!dm) return 0;
+	gf_mx_p(dm->cache_mx);
+	/* The SSL has already been initialized. */
+	if (dm->ssl_ctx) {
+		gf_mx_v(dm->cache_mx);
+		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"));
+		goto error;
+	}
+
+	switch (mode) {
+	case 0:
+		meth = SSLv23_client_method();
+		break;
 #if 0 /*SSL v2 is no longer supported in OpenSSL 1.0*/
-    case 1:
-        meth = SSLv2_client_method();
-        break;
-#endif
-    case 2:
-        meth = SSLv3_client_method();
-        break;
-    case 3:
-        meth = TLSv1_client_method();
-        break;
-    default:
-        goto error;
-    }
-
-    dm->ssl_ctx = SSL_CTX_new(meth);
-    if (!dm->ssl_ctx) goto error;
-    SSL_CTX_set_default_verify_paths(dm->ssl_ctx);
-    SSL_CTX_load_verify_locations (dm->ssl_ctx, NULL, NULL);
-    /* SSL_VERIFY_NONE instructs OpenSSL not to abort SSL_connect if the
-     certificate is invalid.  We verify the certificate separately in
-     ssl_check_certificate, which provides much better diagnostics
-     than examining the error stack after a failed SSL_connect.  */
-    SSL_CTX_set_verify(dm->ssl_ctx, SSL_VERIFY_NONE, NULL);
-
-    /* Since fd_write unconditionally assumes partial writes (and handles them correctly),
-    allow them in OpenSSL.  */
-    SSL_CTX_set_mode(dm->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
-    gf_mx_v(dm->cache_mx);
-    return 1;
+	case 1:
+		meth = SSLv2_client_method();
+		break;
+#endif
+	case 2:
+		meth = SSLv3_client_method();
+		break;
+	case 3:
+		meth = TLSv1_client_method();
+		break;
+	default:
+		goto error;
+	}
+
+	dm->ssl_ctx = SSL_CTX_new(meth);
+	if (!dm->ssl_ctx) goto error;
+	SSL_CTX_set_default_verify_paths(dm->ssl_ctx);
+	SSL_CTX_load_verify_locations (dm->ssl_ctx, NULL, NULL);
+	/* SSL_VERIFY_NONE instructs OpenSSL not to abort SSL_connect if the
+	 certificate is invalid.  We verify the certificate separately in
+	 ssl_check_certificate, which provides much better diagnostics
+	 than examining the error stack after a failed SSL_connect.  */
+	SSL_CTX_set_verify(dm->ssl_ctx, SSL_VERIFY_NONE, NULL);
+
+	/* Since fd_write unconditionally assumes partial writes (and handles them correctly),
+	allow them in OpenSSL.  */
+	SSL_CTX_set_mode(dm->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
+	gf_mx_v(dm->cache_mx);
+	return 1;
 error:
-    if (dm->ssl_ctx) SSL_CTX_free(dm->ssl_ctx);
-    dm->ssl_ctx = NULL;
-    gf_mx_v(dm->cache_mx);
-    return 0;
+	if (dm->ssl_ctx) SSL_CTX_free(dm->ssl_ctx);
+	dm->ssl_ctx = NULL;
+	gf_mx_v(dm->cache_mx);
+	return 0;
 }
 
 #endif /* GPAC_HAS_SSL */
@@ -462,18 +464,18 @@
 
 static Bool gf_dm_is_local(GF_DownloadManager *dm, const char *url)
 {
-    if (!strnicmp(url, "file://", 7)) return 1;
-    if (!strstr(url, "://")) return 1;
-    return 0;
+	if (!strnicmp(url, "file://", 7)) return 1;
+	if (!strstr(url, "://")) return 1;
+	return 0;
 }
 
 static Bool gf_dm_can_handle_url(GF_DownloadManager *dm, const char *url)
 {
-    if (!strnicmp(url, "http://", 7)) return 1;
+	if (!strnicmp(url, "http://", 7)) return 1;
 #ifdef GPAC_HAS_SSL
-    if (!strnicmp(url, "https://", 8)) return 1;
+	if (!strnicmp(url, "https://", 8)) return 1;
 #endif
-    return 0;
+	return 0;
 }
 
 /*!
@@ -482,17 +484,17 @@
  * \return NULL if none found, the DownloadedCacheEntry otherwise
  */
 DownloadedCacheEntry gf_dm_find_cached_entry_by_url(GF_DownloadSession * sess) {
-    u32 i, count;
-    assert( sess && sess->dm && sess->dm->cache_entries );
-    gf_mx_p( sess->dm->cache_mx );
-    count = gf_list_count(sess->dm->cache_entries);
-    for (i = 0 ; i < count; i++) {
-        const char * url;
-        DownloadedCacheEntry e = gf_list_get(sess->dm->cache_entries, i);
-        assert(e);
-        url = gf_cache_get_url(e);
-        assert( url );
-        if (strcmp(url, sess->orig_url)) continue;
+	u32 i, count;
+	assert( sess && sess->dm && sess->dm->cache_entries );
+	gf_mx_p( sess->dm->cache_mx );
+	count = gf_list_count(sess->dm->cache_entries);
+	for (i = 0 ; i < count; i++) {
+		const char * url;
+		DownloadedCacheEntry e = gf_list_get(sess->dm->cache_entries, i);
+		assert(e);
+		url = gf_cache_get_url(e);
+		assert( url );
+		if (strcmp(url, sess->orig_url)) continue;
 		if (sess->needs_cache_reconfig==2)
 			continue;
 
@@ -503,9 +505,9 @@
 		/*OK that's ours*/
 		gf_mx_v( sess->dm->cache_mx );
 		return e;
-    }
-    gf_mx_v( sess->dm->cache_mx );
-    return NULL;
+	}
+	gf_mx_v( sess->dm->cache_mx );
+	return NULL;
 }
 
 /**
@@ -534,29 +536,29 @@
  * removed (so some modules using a streaming like cache will still work).
  */
 void gf_dm_remove_cache_entry_from_session(GF_DownloadSession * sess) {
-    if (sess && sess->cache_entry) {
-        gf_cache_remove_session_from_cache_entry(sess->cache_entry, sess);
-        if (sess->dm
-			/*JLF - not sure what the rationale of this test is, and it prevents cleanup of cache entry
-			which then results to crash when restarting the session (entry->writeFilePtr i snot set back to NULL)*/
-			&& gf_cache_entry_is_delete_files_when_deleted(sess->cache_entry) 
-
-			&& (0 == gf_cache_get_sessions_count_for_cache_entry(sess->cache_entry)))
-        {
-            u32 i, count;
-            gf_mx_p( sess->dm->cache_mx );
-            count = gf_list_count( sess->dm->cache_entries );
-            for (i = 0; i < count; i++) {
-                DownloadedCacheEntry ex = gf_list_get(sess->dm->cache_entries, i);
-                if (ex == sess->cache_entry) {
-                    gf_list_rem(sess->dm->cache_entries, i);
-                    gf_cache_delete_entry( sess->cache_entry );
-                    break;
-                }
-            }
-            gf_mx_v( sess->dm->cache_mx );
-        }
-    }
+	if (sess && sess->cache_entry) {
+		gf_cache_remove_session_from_cache_entry(sess->cache_entry, sess);
+		if (sess->dm
+		        /*JLF - not sure what the rationale of this test is, and it prevents cleanup of cache entry
+		        which then results to crash when restarting the session (entry->writeFilePtr i snot set back to NULL)*/
+		        && gf_cache_entry_is_delete_files_when_deleted(sess->cache_entry)
+
+		        && (0 == gf_cache_get_sessions_count_for_cache_entry(sess->cache_entry)))
+		{
+			u32 i, count;
+			gf_mx_p( sess->dm->cache_mx );
+			count = gf_list_count( sess->dm->cache_entries );
+			for (i = 0; i < count; i++) {
+				DownloadedCacheEntry ex = gf_list_get(sess->dm->cache_entries, i);
+				if (ex == sess->cache_entry) {
+					gf_list_rem(sess->dm->cache_entries, i);
+					gf_cache_delete_entry( sess->cache_entry );
+					break;
+				}
+			}
+			gf_mx_v( sess->dm->cache_mx );
+		}
+	}
 }
 
 /*!
@@ -570,12 +572,14 @@
 
 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_dm_remove_cache_entry_from_session(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_dm_remove_cache_entry_from_session(sess);
 	if (sess->flags & GF_NETIO_SESSION_NOT_CACHED) {
 		sess->cache_entry = NULL;
 	} else {
+		Bool found=0;
+		u32 i, count;
 		entry = gf_dm_find_cached_entry_by_url(sess);
 		if (!entry) {
 			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) ? 1 : 0);
@@ -587,7 +591,21 @@
 		assert( entry );
 		sess->cache_entry = entry;
 		sess->reused_cache_entry = 	gf_cache_is_in_progress(entry);
-		assert(!sess->reused_cache_entry);
+		count = gf_list_count(sess->dm->sessions);
+		for (i=0; i<count; i++) {
+			GF_DownloadSession *a_sess = gf_list_get(sess->dm->sessions, i);
+			if (a_sess==sess) continue;
+			if (a_sess->cache_entry==entry) {
+				found = 1;
+				break;
+			}
+		}
+		if (!found) {
+			sess->reused_cache_entry = 0;
+			gf_cache_close_write_cache(sess->cache_entry, sess, 0);
+		} else {
+			assert(!sess->reused_cache_entry);
+		}
 		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)));
 	}
@@ -595,56 +613,56 @@
 
 void gf_dm_delete_cached_file_entry(const GF_DownloadManager * dm,  const char * url)
 {
-    GF_Err e;
-    u32 count, i;
-    char * realURL;
-    GF_URL_Info info;
-    if (!url || !dm)
-        return;
-    gf_mx_p( dm->cache_mx );
-    gf_dm_url_info_init(&info);
-    e = gf_dm_get_url_info(url, &info, NULL);
-    if (e != GF_OK) {
-        gf_mx_p( dm->cache_mx );
-        gf_dm_url_info_del(&info);
-        return;
-    }
-    realURL = gf_strdup(info.canonicalRepresentation);
-    gf_dm_url_info_del(&info);
-    assert( realURL );
-    count = gf_list_count(dm->cache_entries);
-    for (i = 0 ; i < count; i++) {
-        const char * e_url;
-        DownloadedCacheEntry e = gf_list_get(dm->cache_entries, i);
-        assert(e);
-        e_url = gf_cache_get_url(e);
-        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 )) {
-                /* No session attached anymore... we can delete it */
-                gf_list_rem(dm->cache_entries, i);
-                gf_cache_delete_entry(e);
-            }
-            /* If deleted or not, we don't search further */
-            gf_mx_v( dm->cache_mx );
-            gf_free(realURL);
-            return;
-        }
-    }
-    /* 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_Err e;
+	u32 count, i;
+	char * realURL;
+	GF_URL_Info info;
+	if (!url || !dm)
+		return;
+	gf_mx_p( dm->cache_mx );
+	gf_dm_url_info_init(&info);
+	e = gf_dm_get_url_info(url, &info, NULL);
+	if (e != GF_OK) {
+		gf_mx_p( dm->cache_mx );
+		gf_dm_url_info_del(&info);
+		return;
+	}
+	realURL = gf_strdup(info.canonicalRepresentation);
+	gf_dm_url_info_del(&info);
+	assert( realURL );
+	count = gf_list_count(dm->cache_entries);
+	for (i = 0 ; i < count; i++) {
+		const char * e_url;
+		DownloadedCacheEntry e = gf_list_get(dm->cache_entries, i);
+		assert(e);
+		e_url = gf_cache_get_url(e);
+		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 )) {
+				/* No session attached anymore... we can delete it */
+				gf_list_rem(dm->cache_entries, i);
+				gf_cache_delete_entry(e);
+			}
+			/* If deleted or not, we don't search further */
+			gf_mx_v( dm->cache_mx );
+			gf_free(realURL);
+			return;
+		}
+	}
+	/* 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_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_dm_delete_cached_file_entry(sess->dm, url);
-    }
+	if (sess && sess->dm && url) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Requesting deletion for %s\n", url));
+		gf_dm_delete_cached_file_entry(sess->dm, url);
+	}
 }
 
 
@@ -666,15 +684,21 @@
 
 static void gf_dm_disconnect(GF_DownloadSession *sess, Bool force_close)
 {
-    assert( sess );
+	assert( sess );
 	if (sess->connection_close) force_close=1;
 	sess->connection_close = 0;
 
-    if (sess->status >= GF_NETIO_DISCONNECTED)
+	if (sess->status >= GF_NETIO_DISCONNECTED) {
+		if (force_close) {
+			if (sess->use_cache_file) {
+				gf_cache_close_write_cache(sess->cache_entry, sess, 0);
+			}
+		}
 		return;
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Downloader] gf_dm_disconnect(%p)\n", sess ));
-    if (sess->mx)
-        gf_mx_p(sess->mx);
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Downloader] gf_dm_disconnect(%p)\n", sess ));
+	if (sess->mx)
+		gf_mx_p(sess->mx);
 
 	if (force_close || !(sess->flags & GF_NETIO_SESSION_PERSISTENT)) {
 #ifdef GPAC_HAS_SSL
@@ -690,125 +714,128 @@
 			gf_sk_del(sx);
 		}
 	}
-    sess->status = GF_NETIO_DISCONNECTED;
-    if (sess->num_retry) sess->num_retry--;
-    if (sess->mx)
-        gf_mx_v(sess->mx);
+	if (force_close && sess->use_cache_file) {
+		gf_cache_close_write_cache(sess->cache_entry, sess, 0);
+	}
+	sess->status = GF_NETIO_DISCONNECTED;
+	if (sess->num_retry) sess->num_retry--;
+	if (sess->mx)
+		gf_mx_v(sess->mx);
 }
 
 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;
-    /*self-destruction, let the download manager destroy us*/
-    if (sess->th && sess->in_callback) {
-        sess->destroy = 1;
-        return;
-    }
-    gf_dm_disconnect(sess, 1);
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p)\n", sess ));
+	if (!sess)
+		return;
+	/*self-destruction, let the download manager destroy us*/
+	if (sess->th && sess->in_callback) {
+		sess->destroy = 1;
+		return;
+	}
+	gf_dm_disconnect(sess, 1);
 	gf_dm_clear_headers(sess);
 
-    /*if threaded wait for thread exit*/
-    if (sess->th) {
-        while (!(sess->flags & GF_DOWNLOAD_SESSION_THREAD_DEAD))
-            gf_sleep(1);
-        gf_th_stop(sess->th);
-        gf_th_del(sess->th);
-        if (sess->mx)
-          gf_mx_del(sess->mx);
-        sess->th = NULL;
-        sess->mx = NULL;
-    }
+	/*if threaded wait for thread exit*/
+	if (sess->th) {
+		while (!(sess->flags & GF_DOWNLOAD_SESSION_THREAD_DEAD))
+			gf_sleep(1);
+		gf_th_stop(sess->th);
+		gf_th_del(sess->th);
+		if (sess->mx)
+			gf_mx_del(sess->mx);
+		sess->th = NULL;
+		sess->mx = NULL;
+	}
 
-    if (sess->dm) gf_list_del_item(sess->dm->sessions, sess);
+	if (sess->dm) gf_list_del_item(sess->dm->sessions, sess);
 
 	gf_dm_remove_cache_entry_from_session(sess);
-    sess->cache_entry = NULL;
-    if (sess->orig_url) gf_free(sess->orig_url);
-    if (sess->orig_url_before_redirect) gf_free(sess->orig_url_before_redirect);
-    if (sess->server_name) gf_free(sess->server_name);
-    sess->server_name = NULL;
-    if (sess->remote_path) gf_free(sess->remote_path);
-    /* Credentials are stored into the sess->dm */
-    if (sess->creds) sess->creds = NULL;
-    if (sess->init_data) gf_free(sess->init_data);
-    sess->orig_url = sess->server_name = sess->remote_path;
-    sess->creds = NULL;
-	if (sess->sock) 
+	sess->cache_entry = NULL;
+	if (sess->orig_url) gf_free(sess->orig_url);
+	if (sess->orig_url_before_redirect) gf_free(sess->orig_url_before_redirect);
+	if (sess->server_name) gf_free(sess->server_name);
+	sess->server_name = NULL;
+	if (sess->remote_path) gf_free(sess->remote_path);
+	/* Credentials are stored into the sess->dm */
+	if (sess->creds) sess->creds = NULL;
+	if (sess->init_data) gf_free(sess->init_data);
+	sess->orig_url = sess->server_name = sess->remote_path;
+	sess->creds = NULL;
+	if (sess->sock)
 		gf_sk_del(sess->sock);
 	gf_list_del(sess->headers);
-    gf_free(sess);
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) : DONE\n", sess ));
+	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);
 
 static void gf_dm_sess_notify_state(GF_DownloadSession *sess, GF_NetIOStatus dnload_status, GF_Err error)
 {
-    if (sess->user_proc) {
-        GF_NETIO_Parameter par;
-        sess->in_callback = 1;
-        memset(&par, 0, sizeof(GF_NETIO_Parameter));
-        par.msg_type = dnload_status;
-        par.error = error;
+	if (sess->user_proc) {
+		GF_NETIO_Parameter par;
+		sess->in_callback = 1;
+		memset(&par, 0, sizeof(GF_NETIO_Parameter));
+		par.msg_type = dnload_status;
+		par.error = error;
 		par.sess = sess;
-        sess->user_proc(sess->usr_cbk, &par);
-        sess->in_callback = 0;
-    }
+		sess->user_proc(sess->usr_cbk, &par);
+		sess->in_callback = 0;
+	}
 }
 
 static void gf_dm_sess_user_io(GF_DownloadSession *sess, GF_NETIO_Parameter *par)
 {
-    if (sess->user_proc) {
-        sess->in_callback = 1;
+	if (sess->user_proc) {
+		sess->in_callback = 1;
 		par->sess = sess;
-        sess->user_proc(sess->usr_cbk, par);
-        sess->in_callback = 0;
-    }
+		sess->user_proc(sess->usr_cbk, par);
+		sess->in_callback = 0;
+	}
 }
 
 GF_EXPORT
 Bool gf_dm_is_thread_dead(GF_DownloadSession *sess)
 {
-    if (!sess) return 1;
-    return (sess->flags & GF_DOWNLOAD_SESSION_THREAD_DEAD) ? 1 : 0;
+	if (!sess) return 1;
+	return (sess->flags & GF_DOWNLOAD_SESSION_THREAD_DEAD) ? 1 : 0;
 }
 
 GF_EXPORT
 GF_Err gf_dm_sess_last_error(GF_DownloadSession *sess)
 {
-    if (!sess) return GF_BAD_PARAM;
-    return sess->last_error;
+	if (!sess) return GF_BAD_PARAM;
+	return sess->last_error;
 }
 
 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;
+	info->password = NULL;
+	info->userName = NULL;
+	info->canonicalRepresentation = NULL;
+	info->protocol = NULL;
+	info->port = 0;
+	info->remotePath = NULL;
+	info->server_name = NULL;
 }
 
 GF_EXPORT
 void gf_dm_url_info_del(GF_URL_Info * info) {
-    if (!info)
-        return;
-    if (info->canonicalRepresentation)
-        gf_free(info->canonicalRepresentation);
-    if (info->password)
-        gf_free(info->password);
-    if (info->userName)
-        gf_free(info->userName);
-    if (info->remotePath)
-        gf_free(info->remotePath);
-    if (info->server_name)
-        gf_free(info->server_name);
-    gf_dm_url_info_init(info);
+	if (!info)
+		return;
+	if (info->canonicalRepresentation)
+		gf_free(info->canonicalRepresentation);
+	if (info->password)
+		gf_free(info->password);
+	if (info->userName)
+		gf_free(info->userName);
+	if (info->remotePath)
+		gf_free(info->remotePath);
+	if (info->server_name)
+		gf_free(info->server_name);
+	gf_dm_url_info_init(info);
 }
 
 /**
@@ -816,152 +843,156 @@
  * \param info The info to fill
  * \return 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);
-  assert(url);
-  if (!strnicmp(url, "http://", 7)) {
-        info->port = 80;
-        info->protocol = "http://";
-        return 7;
-    }
-    else if (!strnicmp(url, "https://", 8)) {
-        info->port = 443;
+static s32 gf_dm_parse_protocol(const char * url, GF_URL_Info * info) {
+	assert(info);
+	assert(url);
+	if (!strnicmp(url, "http://", 7)) {
+		info->port = 80;
+		info->protocol = "http://";
+		return 7;
+	}
+	else if (!strnicmp(url, "https://", 8)) {
+		info->port = 443;
 #ifndef GPAC_HAS_SSL
-        return -1;
+		return -1;
 #endif
-        info->protocol = "https://";
-        return 8;
-    }
-    else if (!strnicmp(url, "ftp://", 6)) {
-        info->port = 21;
-        info->protocol = "ftp://";
-        return -1;
-    }
-    return -1;
+		info->protocol = "https://";
+		return 8;
+	}
+	else if (!strnicmp(url, "ftp://", 6)) {
+		info->port = 21;
+		info->protocol = "ftp://";
+		return -1;
+	}
+	return -1;
 }
 
 GF_EXPORT
 GF_Err gf_dm_get_url_info(const char * url, GF_URL_Info * info, const char * baseURL) {
-    char *tmp, *tmp_url, *current_pos, *urlConcatenateWithBaseURL;
-    char * copyOfUrl;
-    s32 proto_offset;
-    gf_dm_url_info_del(info);
-    urlConcatenateWithBaseURL = NULL;
-    proto_offset = gf_dm_parse_protocol(url, info);
-    if (proto_offset > 0){
-      url += proto_offset;
-    } else {
-      /*relative URL*/
-      if (!strstr(url, "://")) {
-          u32 i;
-          info->protocol = "file://";
-          if (baseURL) {
-            urlConcatenateWithBaseURL = gf_url_concatenate(baseURL, url);
-			/*relative file path*/
-			if (!strstr(baseURL, "://")) {
-				info->canonicalRepresentation = urlConcatenateWithBaseURL;
+	char *tmp, *tmp_url, *current_pos, *urlConcatenateWithBaseURL;
+	char * copyOfUrl;
+	s32 proto_offset;
+	gf_dm_url_info_del(info);
+	urlConcatenateWithBaseURL = NULL;
+	proto_offset = gf_dm_parse_protocol(url, info);
+	if (proto_offset > 0) {
+		url += proto_offset;
+	} else {
+		/*relative URL*/
+		if (!strstr(url, "://")) {
+			u32 i;
+			info->protocol = "file://";
+			if (baseURL) {
+				urlConcatenateWithBaseURL = gf_url_concatenate(baseURL, url);
+				/*relative file path*/
+				if (!strstr(baseURL, "://")) {
+					info->canonicalRepresentation = urlConcatenateWithBaseURL;
+					return GF_OK;
+				}
+				proto_offset = gf_dm_parse_protocol(urlConcatenateWithBaseURL, info);
+			} else {
+				proto_offset = -1;
+			}
+
+			if (proto_offset < 0) {
+				tmp = urlConcatenateWithBaseURL;
+				assert( ! info->remotePath );
+				info->remotePath = gf_url_percent_encode(tmp);
+				gf_free( urlConcatenateWithBaseURL );
+				urlConcatenateWithBaseURL = NULL;
+
+				if (!info->remotePath) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[PROTOCOL] : cannot find any protocol in url %s\n", url));
+					return GF_BAD_PARAM;
+				}
+				for (i=0; i<strlen(info->remotePath); i++)
+					if (info->remotePath[i]=='\\') info->remotePath[i]='/';
+				info->canonicalRepresentation = gf_malloc(strlen(info->protocol) + strlen(info->remotePath) + 1);
+				strcpy(info->canonicalRepresentation, info->protocol);
+				strcat(info->canonicalRepresentation, info->remotePath);
+
 				return GF_OK;
+			} else {
+				/* We continue the parsing as usual */
+				url = urlConcatenateWithBaseURL + proto_offset;
 			}
-            proto_offset = gf_dm_parse_protocol(urlConcatenateWithBaseURL, info);
-		  } else {
-            proto_offset = -1;
-		  }
-
-          if (proto_offset < 0){
-            tmp = urlConcatenateWithBaseURL;
-            assert( ! info->remotePath );
-            info->remotePath = gf_url_percent_encode(tmp);
-            gf_free( urlConcatenateWithBaseURL );
-            urlConcatenateWithBaseURL = NULL;
-            for (i=0; i<strlen(info->remotePath); i++)
-                if (info->remotePath[i]=='\\') info->remotePath[i]='/';
-            info->canonicalRepresentation = gf_malloc(strlen(info->protocol) + strlen(info->remotePath) + 1);
-            strcpy(info->canonicalRepresentation, info->protocol);
-            strcat(info->canonicalRepresentation, info->remotePath);
-            if (urlConcatenateWithBaseURL)
-              gf_free(urlConcatenateWithBaseURL);
-            return GF_OK;
-          } else {
-            /* We continue the parsing as usual */
-            url = urlConcatenateWithBaseURL + proto_offset;
-          }
-      } else {
-          GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[PROTOCOL] : cannot find any protocol in url %s\n", url));
-          return GF_BAD_PARAM;
-      }
-    }
-    assert( proto_offset >= 0 );
-    tmp = strchr(url, '/');
-    assert( !info->remotePath );
-    info->remotePath = gf_url_percent_encode(tmp ? tmp : "/");
-    if (tmp) {
-        tmp[0] = 0;
-        copyOfUrl = gf_strdup(url);
-        tmp[0] = '/';
-    } else {
-        copyOfUrl = gf_strdup(url);
-    }
-    tmp_url = copyOfUrl;
-    current_pos = tmp_url;
-    tmp = strrchr(tmp_url, '@');
-    if (tmp) {
-        current_pos = tmp + 1;
-        assert( ! info->server_name );
-        info->server_name = gf_strdup(current_pos);
-        tmp[0] = 0;
-        tmp = strchr(tmp_url, ':');
-
-        if (tmp) {
-            tmp[0] = 0;
-            info->password = gf_strdup(tmp+1);
-        }
-        info->userName = gf_strdup(tmp_url);
-    } else {
-        assert( ! info->server_name );
-        info->server_name = gf_strdup(tmp_url);
-    }
-
-    tmp = strrchr(current_pos, ':');
-    if (tmp) {
-        info->port = atoi(tmp+1);
-        tmp[0] = 0;
-        if (info->server_name) {
-            gf_free(info->server_name);
-        }
-        info->server_name = gf_strdup(current_pos);
-    }
-
-    /* builds orig_url */
-    /* We dont't want orig_url to contain user/passwords for security reasons or mismatch in cache hit */
-    {
-        char port[8];
-        snprintf(port, sizeof(port)-1, ":%d", info->port);
-        info->canonicalRepresentation = gf_malloc(strlen(info->protocol)+strlen(info->server_name)+1+strlen(port)+strlen(info->remotePath));
-        strcpy(info->canonicalRepresentation, info->protocol);
-        strcat(info->canonicalRepresentation, info->server_name);
-        strcat(info->canonicalRepresentation, port);
-        strcat(info->canonicalRepresentation, info->remotePath);
-    }
-    gf_free(copyOfUrl);
-    if (urlConcatenateWithBaseURL)
-      gf_free(urlConcatenateWithBaseURL);
-    return GF_OK;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[PROTOCOL] : cannot find any protocol in url %s\n", url));
+			return GF_BAD_PARAM;
+		}
+	}
+	assert( proto_offset >= 0 );
+	tmp = strchr(url, '/');
+	assert( !info->remotePath );
+	info->remotePath = gf_url_percent_encode(tmp ? tmp : "/");
+	if (tmp) {
+		tmp[0] = 0;
+		copyOfUrl = gf_strdup(url);
+		tmp[0] = '/';
+	} else {
+		copyOfUrl = gf_strdup(url);
+	}
+	tmp_url = copyOfUrl;
+	current_pos = tmp_url;
+	tmp = strrchr(tmp_url, '@');
+	if (tmp) {
+		current_pos = tmp + 1;
+		assert( ! info->server_name );
+		info->server_name = gf_strdup(current_pos);
+		tmp[0] = 0;
+		tmp = strchr(tmp_url, ':');
+
+		if (tmp) {
+			tmp[0] = 0;
+			info->password = gf_strdup(tmp+1);
+		}
+		info->userName = gf_strdup(tmp_url);
+	} else {
+		assert( ! info->server_name );
+		info->server_name = gf_strdup(tmp_url);
+	}
+
+	tmp = strrchr(current_pos, ':');
+	if (tmp) {
+		info->port = atoi(tmp+1);
+		tmp[0] = 0;
+		if (info->server_name) {
+			gf_free(info->server_name);
+		}
+		info->server_name = gf_strdup(current_pos);
+	}
+
+	/* builds orig_url */
+	/* We dont't want orig_url to contain user/passwords for security reasons or mismatch in cache hit */
+	{
+		char port[8];
+		snprintf(port, sizeof(port)-1, ":%d", info->port);
+		info->canonicalRepresentation = gf_malloc(strlen(info->protocol)+strlen(info->server_name)+1+strlen(port)+strlen(info->remotePath));
+		strcpy(info->canonicalRepresentation, info->protocol);
+		strcat(info->canonicalRepresentation, info->server_name);
+		strcat(info->canonicalRepresentation, port);
+		strcat(info->canonicalRepresentation, info->remotePath);
+	}
+	gf_free(copyOfUrl);
+	if (urlConcatenateWithBaseURL)
+		gf_free(urlConcatenateWithBaseURL);
+	return GF_OK;
 }
 
 GF_EXPORT
 GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url)
 {
 	Bool socket_changed = 0;
-    GF_URL_Info info;
+	GF_URL_Info info;
 
 	if (!url) return GF_BAD_PARAM;
 
 	gf_dm_clear_headers(sess);
 
-    gf_dm_url_info_init(&info);
+	gf_dm_url_info_init(&info);
 
 	if (!sess->sock) socket_changed = 1;
-	else if (sess->status>GF_NETIO_DISCONNECTED) 
+	else if (sess->status>GF_NETIO_DISCONNECTED)
 		socket_changed = 1;
 
 	sess->last_error = gf_dm_get_url_info(url, &info, sess->remote_path);
@@ -972,23 +1003,23 @@
 		sess->port = info.port;
 	}
 
-    if (!strcmp("http://", info.protocol) || !strcmp("https://", info.protocol)) {
+	if (!strcmp("http://", info.protocol) || !strcmp("https://", info.protocol)) {
 		if (sess->do_requests != http_do_requests) {
-	        sess->do_requests = http_do_requests;
+			sess->do_requests = http_do_requests;
 			socket_changed = 1;
 		}
 		if (!strcmp("https://", info.protocol)) {
 			if (!(sess->flags & GF_DOWNLOAD_SESSION_USE_SSL)) {
-	            sess->flags |= GF_DOWNLOAD_SESSION_USE_SSL;
+				sess->flags |= GF_DOWNLOAD_SESSION_USE_SSL;
 				socket_changed = 1;
 			}
 		} else if (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL) {
-            sess->flags &= ~GF_DOWNLOAD_SESSION_USE_SSL;
+			sess->flags &= ~GF_DOWNLOAD_SESSION_USE_SSL;
 			socket_changed = 1;
 		}
-    } else {
-        sess->do_requests = NULL;
-    }
+	} else {
+		sess->do_requests = NULL;
+	}
 
 	if (sess->server_name && info.server_name && !strcmp(sess->server_name, info.server_name)) {
 	} else {
@@ -1002,9 +1033,9 @@
 
 	if (!sess->orig_url_before_redirect)
 		sess->orig_url_before_redirect = gf_strdup(url);
-	
-    if (sess->remote_path) gf_free(sess->remote_path);
-    sess->remote_path = gf_strdup(info.remotePath);
+
+	if (sess->remote_path) gf_free(sess->remote_path);
+	sess->remote_path = gf_strdup(info.remotePath);
 
 	if (!socket_changed && info.userName  && sess->creds->username && !strcmp(info.userName, sess->creds->username)) {
 	} else {
@@ -1016,49 +1047,49 @@
 				sess->creds = gf_user_credentials_register(sess->dm, sess->server_name, info.userName, info.password, info.userName && info.password);
 		}
 	}
-    gf_dm_url_info_del(&info);
+	gf_dm_url_info_del(&info);
 
 	if (sess->sock && !socket_changed) {
 		sess->status = GF_NETIO_CONNECTED;
-	    sess->num_retry = SESSION_RETRY_COUNT;
+		sess->num_retry = SESSION_RETRY_COUNT;
 		sess->needs_cache_reconfig = 1;
 	} else {
 		if (sess->sock) gf_sk_del(sess->sock);
 		sess->sock = NULL;
 		sess->status = GF_NETIO_SETUP;
 	}
-    return sess->last_error;
+	return sess->last_error;
 }
 
 
 
 static u32 gf_dm_session_thread(void *par)
 {
-    GF_DownloadSession *sess = (GF_DownloadSession *)par;
+	GF_DownloadSession *sess = (GF_DownloadSession *)par;
 
-    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) {
-        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);
-        } else {
-            if (sess->status == GF_NETIO_WAIT_FOR_REPLY) gf_sleep(GF_WAIT_REPLY_SLEEP);
-            sess->do_requests(sess);
-        }
-        gf_mx_v(sess->mx);
-        gf_sleep(2);
-    }
-    /*destroy all sessions*/
-    gf_dm_disconnect(sess, 0);
-    sess->status = GF_NETIO_STATE_ERROR;
-    sess->last_error = 0;
-    sess->flags |= GF_DOWNLOAD_SESSION_THREAD_DEAD;
-    return 1;
+	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) {
+		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);
+		} else {
+			if (sess->status == GF_NETIO_WAIT_FOR_REPLY) gf_sleep(GF_WAIT_REPLY_SLEEP);
+			sess->do_requests(sess);
+		}
+		gf_mx_v(sess->mx);
+		gf_sleep(2);
+	}
+	/*destroy all sessions*/
+	gf_dm_disconnect(sess, 0);
+	sess->status = GF_NETIO_STATE_ERROR;
+	sess->last_error = 0;
+	sess->flags |= GF_DOWNLOAD_SESSION_THREAD_DEAD;
+	return 1;
 }
 
 
@@ -1068,32 +1099,32 @@
         void *usr_cbk,
         GF_Err *e)
 {
-    GF_DownloadSession *sess;
-    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));
-	 return NULL;
-    }
+	GF_DownloadSession *sess;
+	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));
+		return NULL;
+	}
 	sess->headers = gf_list_new();
-    sess->flags = dl_flags;
+	sess->flags = dl_flags;
 	if (dm && !dm->head_timeout) sess->server_only_understand_get = 1;
-    sess->user_proc = user_io;
-    sess->usr_cbk = usr_cbk;
-    sess->creds = NULL;
-    sess->dm = dm;
+	sess->user_proc = user_io;
+	sess->usr_cbk = usr_cbk;
+	sess->creds = NULL;
+	sess->dm = dm;
 	sess->disable_cache = dm->disable_cache;
-    assert( dm );
+	assert( dm );
 
-    *e = gf_dm_sess_setup_from_url(sess, url);
-    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_dm_sess_del(sess);
-        return NULL;
-    }
-    assert( sess );
-    sess->num_retry = SESSION_RETRY_COUNT;
+	*e = gf_dm_sess_setup_from_url(sess, url);
+	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_dm_sess_del(sess);
+		return NULL;
+	}
+	assert( sess );
+	sess->num_retry = SESSION_RETRY_COUNT;
 	/*threaded session must be started with gf_dm_sess_process*/
-    return sess;
+	return sess;
 }
 
 GF_EXPORT
@@ -1102,64 +1133,57 @@
                                    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));
-    *e = GF_OK;
-    if (gf_dm_is_local(dm, url)) return NULL;
-
-    if (!gf_dm_can_handle_url(dm, url)) {
-        *e = GF_NOT_SUPPORTED;
-        return NULL;
-    }
-    sess = gf_dm_sess_new_simple(dm, url, dl_flags, user_io, usr_cbk, e);
-    if (sess) {
-        sess->dm = dm;
-        gf_list_add(dm->sessions, sess);
-    }
-    return sess;
+	GF_DownloadSession *sess;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("%s:%d gf_dm_sess_new(%s)\n", __FILE__, __LINE__, url));
+	*e = GF_OK;
+	if (gf_dm_is_local(dm, url)) return NULL;
+
+	if (!gf_dm_can_handle_url(dm, url)) {
+		*e = GF_NOT_SUPPORTED;
+		return NULL;
+	}
+	sess = gf_dm_sess_new_simple(dm, url, dl_flags, user_io, usr_cbk, e);
+	if (sess) {
+		sess->dm = dm;
+		gf_list_add(dm->sessions, sess);
+	}
+	return sess;
 }
 
 static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_size, u32 *out_read)
 {
-    GF_Err e;
+	GF_Err e;
 
 	if (!sess)
-        return GF_BAD_PARAM;
+		return GF_BAD_PARAM;
 #ifdef GPAC_HAS_SSL
-    if (sess->ssl) {
-        s32 size = SSL_read(sess->ssl, data, data_size);
-        if (size < 0) 
+	if (sess->ssl) {
+		s32 size = SSL_read(sess->ssl, data, data_size);
+		if (size < 0)
 			e = GF_IO_ERR;
-        else if (!size) 
+		else if (!size)
 			e = GF_IP_NETWORK_EMPTY;
 		else {
 			e = GF_OK;
-	        data[size] = 0;
-		    *out_read = size;
+			data[size] = 0;
+			*out_read = size;
 		}
-	    return e;
-    } 
+		return e;
+	}
 #endif
 
 
-#if 0
-	//reset bandwidth computation at start of each chunk
-	if (sess->chunked && !sess->nb_left_in_chunk) {
-		sess->start_time = gf_sys_clock();
-		sess->start_time_utc = gf_net_get_utc();
-		sess->bytes_done = 0;
+	if (!sess->sock) {
+		sess->status = GF_NETIO_DISCONNECTED;
+		return GF_IP_CONNECTION_CLOSED;
 	}
-#endif
+	e = gf_sk_receive(sess->sock, data, data_size, 0, out_read);
 
-    if (!sess->sock)
-        return GF_NETIO_DISCONNECTED;
-    e = gf_sk_receive(sess->sock, data, data_size, 0, out_read);
-
- 	if (e==GF_IP_NETWORK_EMPTY) {
+	if (e==GF_IP_NETWORK_EMPTY) {
 		gf_sleep(1);
 	}
 
-    return e;
+	return e;
 }
 
 
@@ -1169,7 +1193,7 @@
 
 static Bool rfc2818_match(const char *pattern, const char *string)
 {
-    char c, d;
+	char c, d;
 	u32 i=0, k=0;
 	while (1) {
 		c = LWR(pattern[i]);
@@ -1183,13 +1207,13 @@
 			}
 			/*look for same c character*/
 			while (1) {
-				d = LWR(string[k]);  
+				d = LWR(string[k]);
 				if (d == '\0') break;
 				/*matched c character, check following substrings*/
-                if ((d == c) && rfc2818_match (&pattern[i], &string[k]))
-                    return 1;
-                else if (d == '.')
-                    return 0;
+				if ((d == c) && rfc2818_match (&pattern[i], &string[k]))
+					return 1;
+				else if (d == '.')
+					return 0;
 
 				k++;
 			}
@@ -1209,65 +1233,65 @@
 
 static void gf_dm_connect(GF_DownloadSession *sess)
 {
-    GF_Err e;
-    u16 proxy_port = 0;
-    const char *proxy, *ip;
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("gf_dm_connect"":%d\n", __LINE__));
-    if (!sess->sock) {
-        sess->num_retry = 40;
-        sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);
-    }
-
-    /*connect*/
-    sess->status = GF_NETIO_SETUP;
-    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")) {
-            u32 i;
-            Bool use_proxy=1;
-            for (i=0; i<gf_list_count(sess->dm->skip_proxy_servers); i++) {
-                char *skip = gf_list_get(sess->dm->skip_proxy_servers, i);
-                if (!strcmp(skip, sess->server_name)) {
-                    use_proxy=0;
-                    break;
-                }
-            }
-            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");
-                sess->proxy_enabled = 1;
-            } else {
-                proxy = NULL;
-            }
-        } else {
-            proxy = NULL;
-            sess->proxy_enabled = 0;
-        }
-    } else {
-        proxy = NULL;
-    }
-
-
-    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_Err e;
+	u16 proxy_port = 0;
+	const char *proxy, *ip;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("gf_dm_connect"":%d\n", __LINE__));
+	if (!sess->sock) {
+		sess->num_retry = 40;
+		sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);
+	}
+
+	/*connect*/
+	sess->status = GF_NETIO_SETUP;
+	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")) {
+			u32 i;
+			Bool use_proxy=1;
+			for (i=0; i<gf_list_count(sess->dm->skip_proxy_servers); i++) {
+				char *skip = gf_list_get(sess->dm->skip_proxy_servers, i);
+				if (!strcmp(skip, sess->server_name)) {
+					use_proxy=0;
+					break;
+				}
+			}
+			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");
+				sess->proxy_enabled = 1;
+			} else {
+				proxy = NULL;
+			}
+		} else {
+			proxy = NULL;
+			sess->proxy_enabled = 0;
+		}
+	} else {
+		proxy = NULL;
+	}
+
+
+	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));
 
 	if (sess->status == GF_NETIO_SETUP) {
 		e = gf_sk_connect(sess->sock, (char *) proxy, proxy_port, (char *)ip);
@@ -1287,45 +1311,45 @@
 			return;
 		}
 
-	    sess->status = GF_NETIO_CONNECTED;
+		sess->status = GF_NETIO_CONNECTED;
 		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
 		gf_sk_set_buffer_size(sess->sock, 1, GF_DOWNLOAD_BUFFER_SIZE);
 		gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);
 	}
 
 #ifdef GPAC_HAS_SSL
-    if (!sess->ssl && (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL)) {
-        if (!sess->dm->ssl_ctx)
-            ssl_init(sess->dm, 0);
-        /*socket is connected, configure SSL layer*/
-        if (sess->dm->ssl_ctx) {
-            int ret;
-            long vresult;
-            char common_name[256];
-            X509 *cert;
-            Bool success = 1;
+	if (!sess->ssl && (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL)) {
+		if (!sess->dm->ssl_ctx)
+			ssl_init(sess->dm, 0);
+		/*socket is connected, configure SSL layer*/
+		if (sess->dm->ssl_ctx) {
+			int ret;
+			long vresult;
+			char common_name[256];
+			X509 *cert;
+			Bool success = 1;
 
 			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);
-            assert(ret>0);
-
-            cert = SSL_get_peer_certificate(sess->ssl);
-            /*if we have a cert, check it*/
-            if (cert) {
-					SSL_set_verify_result(sess->ssl, 0);
-                vresult = SSL_get_verify_result(sess->ssl);
-				
+			SSL_set_fd(sess->ssl, gf_sk_get_handle(sess->sock));
+			SSL_set_connect_state(sess->ssl);
+			ret = SSL_connect(sess->ssl);
+			assert(ret>0);
+
+			cert = SSL_get_peer_certificate(sess->ssl);
+			/*if we have a cert, check it*/
+			if (cert) {
+				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_NETWORK, ("[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);
+					vresult = SSL_get_verify_result(sess->ssl);
 				}
 
 				if (vresult == X509_V_OK) {
-                    common_name[0] = 0;
-                    X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, common_name, sizeof (common_name));
+					common_name[0] = 0;
+					X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, common_name, sizeof (common_name));
 					if (!rfc2818_match(common_name, sess->server_name)) {
 						success = 0;
 						GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Mismatch in certificate names: got %s expected %s\n", common_name, sess->server_name));
@@ -1335,96 +1359,96 @@
 					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Error verifying certificate %x\n", vresult));
 				}
 
-                X509_free(cert);
+				X509_free(cert);
 
-                if (!success) {
-                    gf_dm_disconnect(sess, 1);
-                    sess->status = GF_NETIO_STATE_ERROR;
-                    sess->last_error = GF_AUTHENTICATION_FAILURE;
-                    gf_dm_sess_notify_state(sess, sess->status, sess->last_error);
-                }
-            }
-        }
-    }
+				if (!success) {
+					gf_dm_disconnect(sess, 1);
+					sess->status = GF_NETIO_STATE_ERROR;
+					sess->last_error = GF_AUTHENTICATION_FAILURE;
+					gf_dm_sess_notify_state(sess, sess->status, sess->last_error);
+				}
+			}
+		}
+	}
 #endif
 
 	/*this should be done when building HTTP GET request in case we have range directives*/
-    gf_dm_configure_cache(sess);
+	gf_dm_configure_cache(sess);
 
 }
 
 DownloadedCacheEntry gf_dm_refresh_cache_entry(GF_DownloadSession *sess) {
-    Bool go;
-    u32 timer = 0;
-    u32 flags = sess->flags;
-    sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
-    go = 1;
-    while (go) {
-        switch (sess->status) {
-            /*setup download*/
-        case GF_NETIO_SETUP:
-            gf_dm_connect(sess);
-            if (sess->status == GF_NETIO_SETUP)
-                gf_sleep(16);
-            break;
-        case GF_NETIO_WAIT_FOR_REPLY:
-            if (timer == 0)
-                timer = gf_sys_clock();
-            gf_sleep(16);
-            {
-                u32 timer2 = gf_sys_clock();
-                if (timer2 - timer > 5000) {
-                    GF_Err e;
-                    /* Since HEAD is not understood by this server, we use a GET instead */
-                    sess->http_read_type = GET;
-                    sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
-                    gf_dm_disconnect(sess, 0);
-                    sess->status = GF_NETIO_SETUP;
-                    sess->server_only_understand_get = 1;
-                    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);
-                    if (e) {
-                        GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("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);
-                    } else {
-                        timer = 0;
-                        continue;
-                    }
-                }
-            }
-        case GF_NETIO_CONNECTED:
-            sess->do_requests(sess);
-            break;
-        case GF_NETIO_DATA_EXCHANGE:
-        case GF_NETIO_DISCONNECTED:
-        case GF_NETIO_STATE_ERROR:
-            go = 0;
-            break;
-	default:
-	    break;
-        }
-    }
-    sess->flags = flags;
-    if (sess->status==GF_NETIO_STATE_ERROR) return NULL;
-    return sess->cache_entry;
+	Bool go;
+	u32 timer = 0;
+	u32 flags = sess->flags;
+	sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
+	go = 1;
+	while (go) {
+		switch (sess->status) {
+		/*setup download*/
+		case GF_NETIO_SETUP:
+			gf_dm_connect(sess);
+			if (sess->status == GF_NETIO_SETUP)
+				gf_sleep(16);
+			break;
+		case GF_NETIO_WAIT_FOR_REPLY:
+			if (timer == 0)
+				timer = gf_sys_clock();
+			gf_sleep(16);
+			{
+				u32 timer2 = gf_sys_clock();
+				if (timer2 - timer > 5000) {
+					GF_Err e;
+					/* Since HEAD is not understood by this server, we use a GET instead */
+					sess->http_read_type = GET;
+					sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
+					gf_dm_disconnect(sess, 0);
+					sess->status = GF_NETIO_SETUP;
+					sess->server_only_understand_get = 1;
+					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);
+					if (e) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("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);
+					} else {
+						timer = 0;
+						continue;
+					}
+				}
+			}
+		case GF_NETIO_CONNECTED:
+			sess->do_requests(sess);
+			break;
+		case GF_NETIO_DATA_EXCHANGE:
+		case GF_NETIO_DISCONNECTED:
+		case GF_NETIO_STATE_ERROR:
+			go = 0;
+			break;
+		default:
+			break;
+		}
+	}
+	sess->flags = flags;
+	if (sess->status==GF_NETIO_STATE_ERROR) return NULL;
+	return sess->cache_entry;
 }
 
 GF_EXPORT
 const char *gf_dm_sess_mime_type(GF_DownloadSession *sess)
 {
-    DownloadedCacheEntry entry;
-    if (sess->cache_entry) {
-        const char * oldMimeIfAny = gf_cache_get_mime_type(sess->cache_entry);
-        if (oldMimeIfAny)
-            return oldMimeIfAny;
-    }
-    entry = gf_dm_refresh_cache_entry (sess);
-    if (!entry) 
+	DownloadedCacheEntry entry;
+	if (sess->cache_entry) {
+		const char * oldMimeIfAny = gf_cache_get_mime_type(sess->cache_entry);
+		if (oldMimeIfAny)
+			return oldMimeIfAny;
+	}
+	entry = gf_dm_refresh_cache_entry (sess);
+	if (!entry)
 		return sess->mime_type;
-    assert( entry == sess->cache_entry && entry);
-    return gf_cache_get_mime_type( sess->cache_entry );
+	assert( entry == sess->cache_entry && entry);
+	return gf_cache_get_mime_type( sess->cache_entry );
 }
 
 GF_EXPORT
@@ -1433,7 +1457,7 @@
 	if (!sess) return GF_BAD_PARAM;
 	if (sess->cache_entry) {
 		if (!discontinue_cache) {
-			if (gf_cache_get_end_range(sess->cache_entry) + 1 != start_range) 
+			if (gf_cache_get_end_range(sess->cache_entry) + 1 != start_range)
 				return GF_NOT_SUPPORTED;
 		}
 		if (!sess->sock)
@@ -1444,7 +1468,7 @@
 			}
 		}
 		sess->status = GF_NETIO_CONNECTED;
-	    sess->num_retry = SESSION_RETRY_COUNT;
+		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*/
@@ -1458,14 +1482,14 @@
 	}
 	sess->range_start = start_range;
 	sess->range_end = end_range;
-    sess->needs_range = 1;
+	sess->needs_range = 1;
 	return GF_OK;
 }
 
 GF_EXPORT
 GF_Err gf_dm_sess_process(GF_DownloadSession *sess)
 {
-    Bool go;
+	Bool go;
 
 	/*if session is threaded, start thread*/
 	if (! (sess->flags & GF_NETIO_SESSION_NOT_THREADED)) {
@@ -1481,69 +1505,80 @@
 		return GF_OK;
 	}
 	/*otherwise do a synchronous download*/
-    go = 1;
-    while (go) {
-        switch (sess->status) {
-            /*setup download*/
-        case GF_NETIO_SETUP:
-            gf_dm_connect(sess);
-            if (sess->status == GF_NETIO_SETUP)
-                gf_sleep(16);
-            break;
-        case GF_NETIO_WAIT_FOR_REPLY:
-            gf_sleep(16);
-        case GF_NETIO_CONNECTED:
-        case GF_NETIO_DATA_EXCHANGE:
-            sess->do_requests(sess);
-            break;
-        case GF_NETIO_DISCONNECTED:
-        case GF_NETIO_STATE_ERROR:
-            go = 0;
-            break;
-	default:
-            break;
-        }
-    }
-    return sess->last_error;
+	go = 1;
+	while (go) {
+		switch (sess->status) {
+		/*setup download*/
+		case GF_NETIO_SETUP:
+			gf_dm_connect(sess);
+			if (sess->status == GF_NETIO_SETUP)
+				gf_sleep(16);
+			break;
+		case GF_NETIO_WAIT_FOR_REPLY:
+			gf_sleep(16);
+		case GF_NETIO_CONNECTED:
+		case GF_NETIO_DATA_EXCHANGE:
+			sess->do_requests(sess);
+			break;
+		case GF_NETIO_DISCONNECTED:
+		case GF_NETIO_STATE_ERROR:
+			go = 0;
+			break;
+
+		case GF_NETIO_GET_METHOD:
+		case GF_NETIO_GET_HEADER:
+		case GF_NETIO_GET_CONTENT:
+		case GF_NETIO_PARSE_HEADER:
+		case GF_NETIO_PARSE_REPLY:
+		case GF_NETIO_DATA_TRANSFERED:
+			break;
+
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Downloader] Session in unknown state !! - aborting\n"));
+			go = 0;
+			break;
+		}
+	}
+	return sess->last_error;
 }
 
 GF_EXPORT
 GF_Err gf_dm_sess_process_headers(GF_DownloadSession *sess)
 {
-    Bool go;
-    go = 1;
-    while (go) {
-        switch (sess->status) {
-            /*setup download*/
-        case GF_NETIO_SETUP:
-            gf_dm_connect(sess);
-            if (sess->status == GF_NETIO_SETUP)
-                gf_sleep(16);
-            break;
-        case GF_NETIO_WAIT_FOR_REPLY:
+	Bool go;
+	go = 1;
+	while (go) {
+		switch (sess->status) {
+		/*setup download*/
+		case GF_NETIO_SETUP:
+			gf_dm_connect(sess);
+			if (sess->status == GF_NETIO_SETUP)
+				gf_sleep(16);
+			break;
+		case GF_NETIO_WAIT_FOR_REPLY:
 //            gf_sleep(16);
-              gf_sleep(1);
-        case GF_NETIO_CONNECTED:
-            sess->do_requests(sess);
-            break;
+			gf_sleep(1);
+		case GF_NETIO_CONNECTED:
+			sess->do_requests(sess);
+			break;
 		case GF_NETIO_DATA_EXCHANGE:
-        case GF_NETIO_DISCONNECTED:
-        case GF_NETIO_STATE_ERROR:
-            go = 0;
-            break;
-	default:
-            break;
-        }
-    }
-    return sess->last_error;
+		case GF_NETIO_DISCONNECTED:
+		case GF_NETIO_STATE_ERROR:
+			go = 0;
+			break;
+		default:
+			break;
+		}
+	}
+	return sess->last_error;
 }
 
 static Bool gf_dm_needs_to_delete_cache(GF_DownloadManager * dm) {
-    const char * opt;
-    if (!dm || !dm->cfg)
-        return 0;
-    opt = gf_cfg_get_key(dm->cfg, "Downloader", "CleanCache");
-    return opt && (!strncmp("yes", opt, 3) || !strncmp("true", opt, 4) || !strncmp("1", opt, 1));
+	const char * opt;
+	if (!dm || !dm->cfg)
+		return 0;
+	opt = gf_cfg_get_key(dm->cfg, "Downloader", "CleanCache");
+	return opt && (!strncmp("yes", opt, 3) || !strncmp("true", opt, 4) || !strncmp("1", opt, 1));
 }
 
 #ifdef BUGGY_gf_cache_cleanup_cache
@@ -1558,9 +1593,9 @@
  * \param dm The GF_DownloadManager
  */
 static void gf_cache_cleanup_cache(GF_DownloadManager * dm) {
-    if (gf_dm_needs_to_delete_cache(dm)) {
-        gf_cache_delete_all_cached_files(dm->cache_directory);
-    }
+	if (gf_dm_needs_to_delete_cache(dm)) {
+		gf_cache_delete_all_cached_files(dm->cache_directory);
+	}
 }
 #endif
 
@@ -1568,38 +1603,38 @@
 GF_EXPORT
 GF_DownloadManager *gf_dm_new(GF_Config *cfg)
 {
-    const char *opt;
-    char * default_cache_dir;
-    GF_DownloadManager *dm;
-    GF_SAFEALLOC(dm, GF_DownloadManager);
-    dm->sessions = gf_list_new();
-    dm->cache_entries = gf_list_new();
-    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");
-    default_cache_dir = NULL;
-    gf_mx_p( dm->cache_mx );
-    if (cfg)
-        opt = gf_cfg_get_key(cfg, "General", "CacheDirectory");
-    else
-        opt = NULL;
-    if (!opt) {
-        default_cache_dir = gf_get_default_cache_directory();
-        opt = default_cache_dir;
-    }
-    if (opt[strlen(opt)-1] != GF_PATH_SEPARATOR) {
-        dm->cache_directory = (char *) gf_malloc(sizeof(char)* (strlen(opt)+2));
-        sprintf(dm->cache_directory, "%s%c", opt, GF_PATH_SEPARATOR);
-    } else {
-        dm->cache_directory = gf_strdup(opt);
+	const char *opt;
+	char * default_cache_dir;
+	GF_DownloadManager *dm;
+	GF_SAFEALLOC(dm, GF_DownloadManager);
+	dm->sessions = gf_list_new();
+	dm->cache_entries = gf_list_new();
+	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");
+	default_cache_dir = NULL;
+	gf_mx_p( dm->cache_mx );
+	if (cfg)
+		opt = gf_cfg_get_key(cfg, "General", "CacheDirectory");
+	else
+		opt = NULL;
+	if (!opt) {
+		default_cache_dir = gf_get_default_cache_directory();
+		opt = default_cache_dir;
+	}
+	if (opt[strlen(opt)-1] != GF_PATH_SEPARATOR) {
+		dm->cache_directory = (char *) gf_malloc(sizeof(char)* (strlen(opt)+2));
+		sprintf(dm->cache_directory, "%s%c", opt, GF_PATH_SEPARATOR);
+	} else {
+		dm->cache_directory = gf_strdup(opt);
+
+	}
 
-    }
-       
 	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;
+	if (opt) dm->limit_data_rate = 1024 * atoi(opt) / 8;
 
 	if (cfg) {
 		opt = gf_cfg_get_key(cfg, "Downloader", "DisableCache");
@@ -1609,117 +1644,117 @@
 
 	dm->head_timeout = 5000;
 	if (cfg) {
-        opt = gf_cfg_get_key(cfg, "Downloader", "HTTPHeadTimeout");
+		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");
+		opt = gf_cfg_get_key(cfg, "Downloader", "HTTPRequestTimeout");
 		if (opt) {
 			dm->request_timeout = atoi(opt);
 		}
 	}
 
-    gf_mx_v( dm->cache_mx );
-    if (default_cache_dir)
-        gf_free(default_cache_dir);
+	gf_mx_v( dm->cache_mx );
+	if (default_cache_dir)
+		gf_free(default_cache_dir);
 #ifdef GPAC_HAS_SSL
-    dm->ssl_ctx = NULL;
+	dm->ssl_ctx = NULL;
 #endif
-    /* TODO: Not ready for now, we should find a locking strategy between several GPAC instances...
-     * gf_cache_cleanup_cache(dm);
-     */
-    return dm;
+	/* TODO: Not ready for now, we should find a locking strategy between several GPAC instances...
+	 * gf_cache_cleanup_cache(dm);
+	 */
+	return dm;
 }
 
 void gf_dm_set_auth_callback(GF_DownloadManager *dm,
                              Bool (*GetUserPassword)(void *usr_cbk, const char *site_url, char *usr_name, char *password),
                              void *usr_cbk)
 {
-    if (dm) {
-        dm->GetUserPassword = GetUserPassword;
-        dm->usr_cbk = usr_cbk;
-    }
+	if (dm) {
+		dm->GetUserPassword = GetUserPassword;
+		dm->usr_cbk = usr_cbk;
+	}
 }
 
 GF_EXPORT
 void gf_dm_del(GF_DownloadManager *dm)
 {
-    if (!dm)
-        return;
-    assert( dm->sessions);
-    assert( dm->cache_mx );
-    gf_mx_p( dm->cache_mx );
-
-    while (gf_list_count(dm->partial_downloads)) {
-        GF_PartialDownload * entry = gf_list_get( dm->partial_downloads, 0);
-        gf_list_rem( dm->partial_downloads, 0);
-        assert( entry->filename );
-        gf_delete_file( entry->filename );
-        gf_free(entry->filename );
-        entry->filename = NULL;
-        entry->url = NULL;
-        gf_free( entry );
-    }
-
-    /*destroy all pending sessions*/
-    while (gf_list_count(dm->sessions)) {
-        GF_DownloadSession *sess = (GF_DownloadSession *) gf_list_get(dm->sessions, 0);
-        gf_dm_sess_del(sess);
-    }
-    gf_list_del(dm->sessions);
-    dm->sessions = NULL;
-    assert( dm->skip_proxy_servers );
-    while (gf_list_count(dm->skip_proxy_servers)) {
-        char *serv = gf_list_get(dm->skip_proxy_servers, 0);
-        gf_list_rem(dm->skip_proxy_servers, 0);
-        gf_free(serv);
-    }
-    gf_list_del(dm->skip_proxy_servers);
-    dm->skip_proxy_servers = NULL;
-    assert( dm->credentials);
-    while (gf_list_count(dm->credentials)) {
-        gf_user_credentials_struct * cred = gf_list_get( dm->credentials, 0);
-        gf_list_rem( dm->credentials, 0);
-        gf_free( cred );
-    }
-    gf_list_del( dm->credentials);
-    dm->credentials = NULL;
-    assert( dm->cache_entries );
-    {
-        /* Deletes DownloadedCacheEntry and associated files if required */
-        Bool delete_my_files = gf_dm_needs_to_delete_cache(dm);
-        while (gf_list_count(dm->cache_entries)) {
-            const DownloadedCacheEntry entry = gf_list_get( dm->cache_entries, 0);
-            gf_list_rem( dm->cache_entries, 0);
-            if (delete_my_files)
-                gf_cache_entry_set_delete_files_when_deleted(entry);
-            gf_cache_delete_entry(entry);
-        }
-        gf_list_del( dm->cache_entries );
-        dm->cache_entries = NULL;
-    }
-
-    gf_list_del( dm->partial_downloads );
-    dm->partial_downloads = NULL;
-    /* TODO: Not ready for now, we should find a locking strategy between several GPAC instances...
-    * gf_cache_cleanup_cache(dm);
-    */
-    if (dm->cache_directory)
-        gf_free(dm->cache_directory);
-    dm->cache_directory = NULL;
+	if (!dm)
+		return;
+	assert( dm->sessions);
+	assert( dm->cache_mx );
+	gf_mx_p( dm->cache_mx );
+
+	while (gf_list_count(dm->partial_downloads)) {
+		GF_PartialDownload * entry = gf_list_get( dm->partial_downloads, 0);
+		gf_list_rem( dm->partial_downloads, 0);
+		assert( entry->filename );
+		gf_delete_file( entry->filename );
+		gf_free(entry->filename );
+		entry->filename = NULL;
+		entry->url = NULL;
+		gf_free( entry );
+	}
+
+	/*destroy all pending sessions*/
+	while (gf_list_count(dm->sessions)) {
+		GF_DownloadSession *sess = (GF_DownloadSession *) gf_list_get(dm->sessions, 0);
+		gf_dm_sess_del(sess);
+	}
+	gf_list_del(dm->sessions);
+	dm->sessions = NULL;
+	assert( dm->skip_proxy_servers );
+	while (gf_list_count(dm->skip_proxy_servers)) {
+		char *serv = gf_list_get(dm->skip_proxy_servers, 0);
+		gf_list_rem(dm->skip_proxy_servers, 0);
+		gf_free(serv);
+	}
+	gf_list_del(dm->skip_proxy_servers);
+	dm->skip_proxy_servers = NULL;
+	assert( dm->credentials);
+	while (gf_list_count(dm->credentials)) {
+		gf_user_credentials_struct * cred = gf_list_get( dm->credentials, 0);
+		gf_list_rem( dm->credentials, 0);
+		gf_free( cred );
+	}
+	gf_list_del( dm->credentials);
+	dm->credentials = NULL;
+	assert( dm->cache_entries );
+	{
+		/* Deletes DownloadedCacheEntry and associated files if required */
+		Bool delete_my_files = gf_dm_needs_to_delete_cache(dm);
+		while (gf_list_count(dm->cache_entries)) {
+			const DownloadedCacheEntry entry = gf_list_get( dm->cache_entries, 0);
+			gf_list_rem( dm->cache_entries, 0);
+			if (delete_my_files)
+				gf_cache_entry_set_delete_files_when_deleted(entry);
+			gf_cache_delete_entry(entry);
+		}
+		gf_list_del( dm->cache_entries );
+		dm->cache_entries = NULL;
+	}
+
+	gf_list_del( dm->partial_downloads );
+	dm->partial_downloads = NULL;
+	/* TODO: Not ready for now, we should find a locking strategy between several GPAC instances...
+	* gf_cache_cleanup_cache(dm);
+	*/
+	if (dm->cache_directory)
+		gf_free(dm->cache_directory);
+	dm->cache_directory = NULL;
 
 #ifdef GPAC_HAS_SSL
-    if (dm->ssl_ctx) SSL_CTX_free(dm->ssl_ctx);
+	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;
-    gf_free(dm);
+	/* 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;
+	gf_free(dm);
 }
 
 /*!
@@ -1732,55 +1767,55 @@
  * \param nbBytes The number of bytes contained into data
  */
 static void gf_icy_skip_data(GF_DownloadSession * sess, u32 icy_metaint, const char * data, u32 nbBytes) {
-    assert( icy_metaint > 0 );
-    while (nbBytes) {
-        if (sess->icy_bytes == icy_metaint) {
-            sess->icy_count = 1 + 16* (u8) data[0];
-            /*skip icy metadata*/
-            if (sess->icy_count > nbBytes) {
-                sess->icy_count -= nbBytes;
-                nbBytes = 0;
-            } else {
-                if (sess->icy_count > 1) {
-                    GF_NETIO_Parameter par;
-                    char szData[4096];
-                    memset(szData, 0, 4096);
-                    memcpy(szData, data+1, sess->icy_count-1);
-                    szData[sess->icy_count] = 0;
-
-                    par.error = 0;
-                    par.msg_type = GF_NETIO_PARSE_HEADER;
-                    par.name = "icy-meta";
-                    par.value = szData;
+	assert( icy_metaint > 0 );
+	while (nbBytes) {
+		if (sess->icy_bytes == icy_metaint) {
+			sess->icy_count = 1 + 16* (u8) data[0];
+			/*skip icy metadata*/
+			if (sess->icy_count > nbBytes) {
+				sess->icy_count -= nbBytes;
+				nbBytes = 0;
+			} else {
+				if (sess->icy_count > 1) {
+					GF_NETIO_Parameter par;
+					char szData[4096];
+					memset(szData, 0, 4096);
+					memcpy(szData, data+1, sess->icy_count-1);
+					szData[sess->icy_count] = 0;
+
+					par.error = 0;
+					par.msg_type = GF_NETIO_PARSE_HEADER;
+					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_dm_sess_user_io(sess, &par);
-                }
-                nbBytes -= sess->icy_count;
-                data += sess->icy_count;
-                sess->icy_count = 0;
-                sess->icy_bytes = 0;
-            }
-        } else {
-            GF_NETIO_Parameter par;
-            u32 left = icy_metaint - sess->icy_bytes;
-            if (left > nbBytes) {
-                left = nbBytes;
-                sess->icy_bytes += left;
-                nbBytes = 0;
-            } else {
-                sess->icy_bytes = icy_metaint;
-                nbBytes -= left;
-            }
-
-            par.msg_type = GF_NETIO_DATA_EXCHANGE;
-            par.data = data;
-            par.size = left;
-            gf_dm_sess_user_io(sess, &par);
-
-            data += left;
-        }
-    }
+					GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[ICY] Found metainfo in stream=%s, (every %d bytes)\n", szData, icy_metaint));
+					gf_dm_sess_user_io(sess, &par);
+				}
+				nbBytes -= sess->icy_count;
+				data += sess->icy_count;
+				sess->icy_count = 0;
+				sess->icy_bytes = 0;
+			}
+		} else {
+			GF_NETIO_Parameter par;
+			u32 left = icy_metaint - sess->icy_bytes;
+			if (left > nbBytes) {
+				left = nbBytes;
+				sess->icy_bytes += left;
+				nbBytes = 0;
+			} else {
+				sess->icy_bytes = icy_metaint;
+				nbBytes -= left;
+			}
+
+			par.msg_type = GF_NETIO_DATA_EXCHANGE;
+			par.data = data;
+			par.size = left;
+			gf_dm_sess_user_io(sess, &par);
+
+			data += left;
+		}
+	}
 }
 
 
@@ -1801,7 +1836,7 @@
 		*header_size = 0;
 		return body_start;
 	}
-	
+
 
 	te_header = strstr((char *) body_start, "\r\n");
 	if (!te_header) return NULL;
@@ -1816,18 +1851,30 @@
 	*payload_size = size;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Chunk Start: Header \"%s\" - header size %d - payload size %d\n", body_start, 2+strlen(body_start), size));
-	
+
 	te_header[0] = '\r';
 	return te_header+2;
 }
 
+
+static void dm_sess_update_download_rate(GF_DownloadSession * sess, Bool always_check)
+{
+	u32 runtime;
+	if (!always_check && (sess->bytes_done==sess->total_size)) return;
+
+	/*update state*/
+	runtime = (u32) (gf_sys_clock_high_res() - sess->start_time) / 1000;
+	if (!runtime) runtime=1;
+	sess->bytes_per_sec = (u32) (1000 * (u64) sess->bytes_done / runtime);
+}
+
+
 static GFINLINE void gf_dm_data_received(GF_DownloadSession *sess, u8 *payload, u32 payload_size, Bool store_in_init, u32 *rewrite_size)
 {
 	u32 nbBytes, hdr_size, remaining;
 	u8 *data;
 	Bool flush_chunk = 0;
-    GF_NETIO_Parameter par;
-    u32 runtime, rcv;
+	GF_NETIO_Parameter par;
 
 	nbBytes = payload_size;
 	hdr_size = 0;
@@ -1836,7 +1883,7 @@
 		data = (u8 *) gf_dm_get_chunk_data(sess, (char *) payload, &nbBytes, &hdr_size);
 		if (hdr_size + nbBytes + 2 > payload_size) {
 			remaining = nbBytes + 2 - payload_size + hdr_size;
-			nbBytes = payload_size - hdr_size; 
+			nbBytes = payload_size - hdr_size;
 			payload_size = 0;
 			payload = NULL;
 		} else {
@@ -1861,8 +1908,9 @@
 
 
 	if (nbBytes) {
-		rcv = nbBytes;
 		sess->bytes_done += nbBytes;
+		dm_sess_update_download_rate(sess, 1);
+
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] url %s received %d new bytes\n", gf_cache_get_url(sess->cache_entry), nbBytes ));
 		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 ));
@@ -1883,32 +1931,22 @@
 			gf_dm_sess_user_io(sess, &par);
 		}
 
-		/*update state if not done*/
-		if (rcv) {
-			runtime = gf_sys_clock() - sess->start_time;
-			if (!runtime) {
-				sess->bytes_per_sec = 0;
-			} else {
-				u64 nb_bytes = sess->bytes_done;
-				sess->bytes_per_sec = (u32) (1000*nb_bytes / runtime);
-			}
-		}
 	}
 
 	if (sess->total_size && (sess->bytes_done == sess->total_size)) {
-        gf_dm_disconnect(sess, 0);
-        par.msg_type = GF_NETIO_DATA_TRANSFERED;
-        par.error = GF_OK;
+		gf_dm_disconnect(sess, 0);
+		par.msg_type = GF_NETIO_DATA_TRANSFERED;
+		par.error = GF_OK;
+
 
-		
 		gf_dm_sess_user_io(sess, &par);
-        if (sess->use_cache_file) {
-            gf_cache_close_write_cache(sess->cache_entry, sess, 1);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
-                   ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
-        }
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in %d ms (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
-    }
+		if (sess->use_cache_file) {
+			gf_cache_close_write_cache(sess->cache_entry, sess, 1);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
+			       ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
+	}
 
 	if (rewrite_size && sess->chunked) {
 		//use memmove since regions overlap
@@ -1928,127 +1966,127 @@
 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 (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;
+	u32 size;
+	GF_Err e;
+	if (/*sess->cache || */ !buffer || !buffer_size) 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;
 
-    *read_size = 0;
-    if (sess->status == GF_NETIO_DATA_TRANSFERED) return GF_EOS;
+	*read_size = 0;
+	if (sess->status == GF_NETIO_DATA_TRANSFERED) return GF_EOS;
 
-    if (sess->status == GF_NETIO_SETUP) {
-        gf_dm_connect(sess);
+	if (sess->status == GF_NETIO_SETUP) {
+		gf_dm_connect(sess);
 		if (sess->last_error) return sess->last_error;
-        return GF_OK;
-    } else if (sess->status < GF_NETIO_DATA_EXCHANGE) {
-        sess->do_requests(sess);
+		return GF_OK;
+	} else if (sess->status < GF_NETIO_DATA_EXCHANGE) {
+		sess->do_requests(sess);
 		return sess->last_error;
-    }
-    /*we're running but we had data previously*/
-    if (sess->init_data) {
-        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;
-            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);
-        }
-        return GF_OK;
-    }
-
-    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, 0, read_size);
-    return GF_OK;
+	}
+	/*we're running but we had data previously*/
+	if (sess->init_data) {
+		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;
+			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);
+		}
+		return GF_OK;
+	}
+
+	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, 0, read_size);
+	return GF_OK;
 }
 
 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)
 {
-    if (!sess) return GF_BAD_PARAM;
-    if (server) *server = sess->server_name;
-    if (path) *path = sess->remote_path;
+	if (!sess) return GF_BAD_PARAM;
+	if (server) *server = sess->server_name;
+	if (path) *path = sess->remote_path;
 	if (total_size) {
 		if (sess->total_size==SIZE_IN_STREAM) *total_size  = 0;
 		else *total_size = sess->total_size;
 	}
-    if (bytes_done) *bytes_done = sess->bytes_done;
-    if (bytes_per_sec) *bytes_per_sec = sess->bytes_per_sec;
-    if (net_status) *net_status = sess->status;
-    if (sess->status == GF_NETIO_DISCONNECTED) return GF_EOS;
-    else if (sess->status == GF_NETIO_STATE_ERROR) return GF_SERVICE_ERROR;
-    return GF_OK;
+	if (bytes_done) *bytes_done = sess->bytes_done;
+	if (bytes_per_sec) *bytes_per_sec = sess->bytes_per_sec;
+	if (net_status) *net_status = sess->status;
+	if (sess->status == GF_NETIO_DISCONNECTED) return GF_EOS;
+	else if (sess->status == GF_NETIO_STATE_ERROR) return GF_SERVICE_ERROR;
+	return GF_OK;
 }
 
 GF_EXPORT
 u64 gf_dm_sess_get_utc_start(GF_DownloadSession * sess)
 {
-    if (!sess) return 0;
+	if (!sess) return 0;
 	return sess->start_time_utc;
 }
 
 GF_EXPORT
 const char *gf_dm_sess_get_cache_name(GF_DownloadSession * sess)
 {
-    if (!sess) return NULL;
-    if (! sess->cache_entry || sess->needs_cache_reconfig) return NULL;
-    return gf_cache_get_cache_filename(sess->cache_entry);
+	if (!sess) return NULL;
+	if (! sess->cache_entry || sess->needs_cache_reconfig) return NULL;
+	return gf_cache_get_cache_filename(sess->cache_entry);
 }
 
 GF_EXPORT
 Bool gf_dm_sess_can_be_cached_on_disk(const GF_DownloadSession *sess)
 {
-    if (!sess) return 0;
-    return gf_cache_get_content_length(sess->cache_entry) != 0;
+	if (!sess) return 0;
+	return gf_cache_get_content_length(sess->cache_entry) != 0;
 }
 
 GF_EXPORT
 void gf_dm_sess_abort(GF_DownloadSession * sess)
 {
-    assert(sess);
-    if (sess->mx) {
-        gf_mx_p(sess->mx);
-        gf_dm_disconnect(sess, 1);
-        sess->status = GF_NETIO_STATE_ERROR;
-        gf_mx_v(sess->mx);
-    } else {
-        gf_dm_disconnect(sess, 1);
-    }
+	assert(sess);
+	if (sess->mx) {
+		gf_mx_p(sess->mx);
+		gf_dm_disconnect(sess, 1);
+		sess->status = GF_NETIO_STATE_ERROR;
+		gf_mx_v(sess->mx);
+	} else {
+		gf_dm_disconnect(sess, 1);
+	}
 }
 void *gf_dm_sess_get_private(GF_DownloadSession * sess)
 {
-    return sess ? sess->ext : NULL;
+	return sess ? sess->ext : NULL;
 }
 
 void gf_dm_sess_set_private(GF_DownloadSession * sess, void *private_data)
 {
-    if (sess) sess->ext = 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;
+	u32 ret = 0;
+	while (val[ret] == ' ') ret+=1;
+	return ret;
 }
 
 static GFINLINE char *http_is_header(char *line, char *header_name)
 {
-    char *res;
-    if (strnicmp(line, header_name, strlen(header_name))) return NULL;
-    res = line + strlen(header_name);
-    while ((res[0] == ':') || (res[0] == ' ')) res+=1;
-    return res;
+	char *res;
+	if (strnicmp(line, header_name, strlen(header_name))) return NULL;
+	res = line + strlen(header_name);
+	while ((res[0] == ':') || (res[0] == ' ')) res+=1;
+	return res;
 }
 
 /*!
@@ -2058,16 +2096,17 @@
  * \return 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;
-    char range_buf[1024];
-    char pass_buf[1024];
-    const char *user_agent;
-    const char *url;
-    const char *user_profile;
-    const char *param_string;
-    Bool has_accept, has_connection, has_range, has_agent, has_language, send_profile, has_mime;
-    assert (sess->status == GF_NETIO_CONNECTED);
+	GF_Err e;
+	GF_NETIO_Parameter par;
+	Bool no_cache = 0;
+	char range_buf[1024];
+	char pass_buf[1024];
+	const char *user_agent;
+	const char *url;
+	const char *user_profile;
+	const char *param_string;
+	Bool has_accept, has_connection, has_range, has_agent, has_language, send_profile, has_mime;
+	assert (sess->status == GF_NETIO_CONNECTED);
 
 	gf_dm_clear_headers(sess);
 
@@ -2076,290 +2115,316 @@
 		sess->needs_cache_reconfig = 0;
 	}
 
-    /*setup authentification*/
-    strcpy(pass_buf, "");
-    sess->creds = gf_find_user_credentials_for_site( sess->dm, sess->server_name );
-    if (sess->creds && sess->creds->valid) {
-        sprintf(pass_buf, "Authorization: Basic %s", sess->creds->digest);
-    }
-    if (sess->dm && sess->dm->cfg)
-        user_agent = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserAgent");
-    else
-        user_agent = NULL;
-    if (!user_agent) user_agent = GF_DOWNLOAD_AGENT_NAME;
-
-
-    par.error = 0;
-    par.msg_type = GF_NETIO_GET_METHOD;
-    par.name = NULL;
-    gf_dm_sess_user_io(sess, &par);
-    if (!par.name || sess->server_only_understand_get) {
-        par.name = "GET";
-    }
-
-    if (par.name) {
-        if (!strcmp(par.name, "GET")) sess->http_read_type = GET;
-        else if (!strcmp(par.name, "HEAD")) sess->http_read_type = HEAD;
-        else sess->http_read_type = OTHER;
-    } 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;
-    if (param_string) {
-        if (strchr(sess->remote_path, '?')) {
-            sprintf(sHTTP, "%s %s&%s HTTP/1.0\r\nHost: %s\r\n" ,
-                    par.name ? par.name : "GET", url, param_string, sess->server_name);
-        } else {
-            sprintf(sHTTP, "%s %s?%s HTTP/1.0\r\nHost: %s\r\n" ,
-                    par.name ? par.name : "GET", url, param_string, sess->server_name);
-        }
-    } else {
-        sprintf(sHTTP, "%s %s HTTP/1.1\r\nHost: %s\r\n" ,
-                par.name ? par.name : "GET", url, sess->server_name);
-    }
-
-    /*get all headers*/
-    has_agent = has_accept = has_connection = has_range = has_language = has_mime = 0;
-    while (1) {
-        par.msg_type = GF_NETIO_GET_HEADER;
-        par.value = NULL;
-        gf_dm_sess_user_io(sess, &par);
-        if (!par.value) break;
-        strcat(sHTTP, par.name);
-        strcat(sHTTP, ": ");
-        strcat(sHTTP, par.value);
-        strcat(sHTTP, "\r\n");
-        if (!strcmp(par.name, "Accept")) has_accept = 1;
-        else if (!strcmp(par.name, "Connection")) has_connection = 1;
-        else if (!strcmp(par.name, "Range")) has_range = 1;
-        else if (!strcmp(par.name, "User-Agent")) has_agent = 1;
-        else if (!strcmp(par.name, "Accept-Language")) has_language = 1;
-        else if (!strcmp(par.name, "Content-Type")) has_mime = 1;
-        if (!par.msg_type) break;
-    }
-    if (!has_agent) {
-        strcat(sHTTP, "User-Agent: ");
-        strcat(sHTTP, user_agent);
-        strcat(sHTTP, "\r\n");
-    }
+	/*setup authentification*/
+	strcpy(pass_buf, "");
+	sess->creds = gf_find_user_credentials_for_site( sess->dm, sess->server_name );
+	if (sess->creds && sess->creds->valid) {
+		sprintf(pass_buf, "Authorization: Basic %s", sess->creds->digest);
+	}
+	if (sess->dm && sess->dm->cfg)
+		user_agent = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserAgent");
+	else
+		user_agent = NULL;
+	if (!user_agent) user_agent = GF_DOWNLOAD_AGENT_NAME;
+
+
+	par.error = 0;
+	par.msg_type = GF_NETIO_GET_METHOD;
+	par.name = NULL;
+	gf_dm_sess_user_io(sess, &par);
+	if (!par.name || sess->server_only_understand_get) {
+		par.name = "GET";
+	}
+
+	if (par.name) {
+		if (!strcmp(par.name, "GET")) sess->http_read_type = GET;
+		else if (!strcmp(par.name, "HEAD")) sess->http_read_type = HEAD;
+		else sess->http_read_type = OTHER;
+	} 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;
+	if (param_string) {
+		if (strchr(sess->remote_path, '?')) {
+			sprintf(sHTTP, "%s %s&%s HTTP/1.0\r\nHost: %s\r\n" ,
+			        par.name ? par.name : "GET", url, param_string, sess->server_name);
+		} else {
+			sprintf(sHTTP, "%s %s?%s HTTP/1.0\r\nHost: %s\r\n" ,
+			        par.name ? par.name : "GET", url, param_string, sess->server_name);
+		}
+	} else {
+		sprintf(sHTTP, "%s %s HTTP/1.1\r\nHost: %s\r\n" ,
+		        par.name ? par.name : "GET", url, sess->server_name);
+	}
+
+	/*get all headers*/
+	has_agent = has_accept = has_connection = has_range = has_language = has_mime = 0;
+	while (1) {
+		par.msg_type = GF_NETIO_GET_HEADER;
+		par.value = NULL;
+		gf_dm_sess_user_io(sess, &par);
+		if (!par.value) break;
+		strcat(sHTTP, par.name);
+		strcat(sHTTP, ": ");
+		strcat(sHTTP, par.value);
+		strcat(sHTTP, "\r\n");
+		if (!strcmp(par.name, "Accept")) has_accept = 1;
+		else if (!strcmp(par.name, "Connection")) has_connection = 1;
+		else if (!strcmp(par.name, "Range")) has_range = 1;
+		else if (!strcmp(par.name, "User-Agent")) has_agent = 1;
+		else if (!strcmp(par.name, "Accept-Language")) has_language = 1;
+		else if (!strcmp(par.name, "Content-Type")) has_mime = 1;
+		if (!par.msg_type) break;
+	}
+	if (!has_agent) {
+		strcat(sHTTP, "User-Agent: ");
+		strcat(sHTTP, user_agent);
+		strcat(sHTTP, "\r\n");
+	}
 	/*no mime and POST/PUT, default to octet stream*/
 	if (!has_mime && (sess->http_read_type==OTHER)) strcat(sHTTP, "Content-Type: application/octet-stream\r\n");
-    if (!has_accept && (sess->http_read_type!=OTHER) ) strcat(sHTTP, "Accept: */*\r\n");
-    if (sess->proxy_enabled==1) strcat(sHTTP, "Proxy-Connection: Keep-alive\r\n");
-    else if (!has_connection) strcat(sHTTP, "Connection: Keep-Alive\r\n");
-    if (!has_range && sess->needs_range) {
-        if (!sess->range_end) sprintf(range_buf, "Range: bytes="LLD"-\r\n", sess->range_start);
-        else sprintf(range_buf, "Range: bytes="LLD"-"LLD"\r\n", sess->range_start, sess->range_end);
-        /* FIXME : cache should not be used here */
-        strcat(sHTTP, range_buf);
-    }
-    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;
-        if (opt) {
-            strcat(sHTTP, "Accept-Language: ");
-            strcat(sHTTP, opt);
-            strcat(sHTTP, "\r\n");
-        }
-    }
-
-
-    if (strlen(pass_buf)) {
-        strcat(sHTTP, pass_buf);
-        strcat(sHTTP, "\r\n");
-    }
-
-    par.msg_type = GF_NETIO_GET_CONTENT;
-    par.data = NULL;
-    par.size = 0;
-
-    /*check if we have personalization info*/
-    send_profile = 0;
-    if (sess->dm && sess->dm->cfg)
-        user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfileID");
-    else
-        user_profile = NULL;
-    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_f64_open(user_profile, "rt");
-            if (profile) {
-                gf_f64_seek(profile, 0, SEEK_END);
-                par.size = (u32) gf_f64_tell(profile);
-                fclose(profile);
-                sprintf(range_buf, "Content-Length: %d\r\n", par.size);
-                strcat(sHTTP, range_buf);
-                strcat(sHTTP, "Content-Type: text/xml\r\n");
-                send_profile = 1;
-            }
-        }
-    }
-
-
-    if (!send_profile) {
-        gf_dm_sess_user_io(sess, &par);
-        if (par.data && par.size) {
-            sprintf(range_buf, "Content-Length: %d\r\n", par.size);
-            strcat(sHTTP, range_buf);
-        }
-    }
+	if (!has_accept && (sess->http_read_type!=OTHER) ) strcat(sHTTP, "Accept: */*\r\n");
+	if (sess->proxy_enabled==1) strcat(sHTTP, "Proxy-Connection: Keep-alive\r\n");
+	else if (!has_connection) strcat(sHTTP, "Connection: Keep-Alive\r\n");
+	if (!has_range && sess->needs_range) {
+		if (!sess->range_end) sprintf(range_buf, "Range: bytes="LLD"-\r\n", sess->range_start);
+		else sprintf(range_buf, "Range: bytes="LLD"-"LLD"\r\n", sess->range_start, sess->range_end);
+		strcat(sHTTP, range_buf);
+
+		no_cache = 1;
+	}
+	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;
+		if (opt) {
+			strcat(sHTTP, "Accept-Language: ");
+			strcat(sHTTP, opt);
+			strcat(sHTTP, "\r\n");
+		}
+	}
+
+
+	if (strlen(pass_buf)) {
+		strcat(sHTTP, pass_buf);
+		strcat(sHTTP, "\r\n");
+	}
+
+	par.msg_type = GF_NETIO_GET_CONTENT;
+	par.data = NULL;
+	par.size = 0;
+
+	/*check if we have personalization info*/
+	send_profile = 0;
+	if (sess->dm && sess->dm->cfg)
+		user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfileID");
+	else
+		user_profile = NULL;
+	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_f64_open(user_profile, "rt");
+			if (profile) {
+				gf_f64_seek(profile, 0, SEEK_END);
+				par.size = (u32) gf_f64_tell(profile);
+				fclose(profile);
+				sprintf(range_buf, "Content-Length: %d\r\n", par.size);
+				strcat(sHTTP, range_buf);
+				strcat(sHTTP, "Content-Type: text/xml\r\n");
+				send_profile = 1;
+			}
+		}
+	}
+
+
+	if (!send_profile) {
+		gf_dm_sess_user_io(sess, &par);
+		if (par.data && par.size) {
+			sprintf(range_buf, "Content-Length: %d\r\n", par.size);
+			strcat(sHTTP, range_buf);
+		}
+	}
 
 	if (sess->http_read_type!=OTHER) {
 		/*signal we support title streaming*/
 		if (!strcmp(sess->remote_path, "/")) strcat(sHTTP, "icy-metadata:1\r\n");
-	    /* This will force the server to respond with Icy-Metaint */
+		/* This will force the server to respond with Icy-Metaint */
 		strcat(sHTTP, "Icy-Metadata: 1\r\n");
 
 		/*cached headers are not appended in POST*/
-		if (!sess->disable_cache && (GF_OK < appendHttpCacheHeaders( sess->cache_entry, sHTTP)) ) {
-	        GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Cache Entry : %p, FAILED to append cache directives.", sess->cache_entry));
+		if (!no_cache && !sess->disable_cache && (GF_OK < appendHttpCacheHeaders( sess->cache_entry, sHTTP)) ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Cache Entry : %p, FAILED to append cache directives.", sess->cache_entry));
 		}
 	}
 
-    strcat(sHTTP, "\r\n");
+	strcat(sHTTP, "\r\n");
 
-    if (send_profile || par.data) {
-        u32 len = (u32) strlen(sHTTP);
-        char *tmp_buf = gf_malloc(sizeof(char)*(len+par.size+1));
-        strcpy(tmp_buf, sHTTP);
-        if (par.data) {
-            memcpy(tmp_buf+len, par.data, par.size);
-            tmp_buf[len+par.size] = 0;
-        } else {
-            FILE *profile;
-            assert( sess->dm );
-            assert( sess->dm->cfg );
-            user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfile");
-            assert (user_profile);
-            profile = gf_f64_open(user_profile, "rt");
-            if (profile) {
-                u32 readen = (u32) fread(tmp_buf+len, sizeof(char), par.size, profile);
-                if (readen<par.size) {
-                    GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
-                           ("Error while loading Downloader/UserProfile, size=%d, should be %d.", readen, par.size));
-                    for (; readen < par.size; readen++) {
-                        tmp_buf[len + readen] = 0;
-                    }
-                }
-                fclose(profile);
-            } else {
-                GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Error while loading Profile file %s.", user_profile));
-            }
-        }
+	if (send_profile || par.data) {
+		u32 len = (u32) strlen(sHTTP);
+		char *tmp_buf = gf_malloc(sizeof(char)*(len+par.size+1));
+		strcpy(tmp_buf, sHTTP);
+		if (par.data) {
+			memcpy(tmp_buf+len, par.data, par.size);
+			tmp_buf[len+par.size] = 0;
+		} else {
+			FILE *profile;
+			assert( sess->dm );
+			assert( sess->dm->cfg );
+			user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfile");
+			assert (user_profile);
+			profile = gf_f64_open(user_profile, "rt");
+			if (profile) {
+				u32 readen = (u32) fread(tmp_buf+len, sizeof(char), par.size, profile);
+				if (readen<par.size) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
+					       ("Error while loading Downloader/UserProfile, size=%d, should be %d.", readen, par.size));
+					for (; readen < par.size; readen++) {
+						tmp_buf[len + readen] = 0;
+					}
+				}
+				fclose(profile);
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Error while loading Profile file %s.", user_profile));
+			}
+		}
 
 #ifdef GPAC_HAS_SSL
-        if (sess->ssl) {
-            u32 writelen = len+par.size;
+		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;
-        } else
+		} else
 #endif
-            e = gf_sk_send(sess->sock, tmp_buf, len+par.size);
+			e = gf_sk_send(sess->sock, tmp_buf, len+par.size);
 
-        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request %s\n\n", tmp_buf));
-        gf_free(tmp_buf);
-    } else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request %s\n\n", tmp_buf));
+		gf_free(tmp_buf);
+	} else {
 
 #ifdef GPAC_HAS_SSL
-        if (sess->ssl) {
-            u32 len = strlen(sHTTP);
+		if (sess->ssl) {
+			u32 len = strlen(sHTTP);
 			e = GF_OK;
 			if (len != SSL_write(sess->ssl, sHTTP, len))
 				e = GF_IP_NETWORK_FAILURE;
-         } else
+		} else
 #endif
-            e = gf_sk_send(sess->sock, sHTTP, (u32) strlen(sHTTP));
+			e = gf_sk_send(sess->sock, sHTTP, (u32) strlen(sHTTP));
 
 #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) ));
-		 } else {
-	        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request %s\n\n", sHTTP));
-		 }
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error sending request %s\n", gf_error_to_string(e) ));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request %s\n\n", sHTTP));
+		}
 #endif
 	}
 	sess->request_time = gf_sys_clock();
 
-    if (e) {
-        sess->status = GF_NETIO_STATE_ERROR;
-        sess->last_error = e;
-        gf_dm_sess_notify_state(sess, GF_NETIO_STATE_ERROR, e);
-        return e;
-    }
-
-    sess->status = GF_NETIO_WAIT_FOR_REPLY;
-    gf_dm_sess_notify_state(sess, GF_NETIO_WAIT_FOR_REPLY, GF_OK);
-    return GF_OK;
+	if (e) {
+		sess->status = GF_NETIO_STATE_ERROR;
+		sess->last_error = e;
+		gf_dm_sess_notify_state(sess, GF_NETIO_STATE_ERROR, e);
+		return e;
+	}
+
+	sess->status = GF_NETIO_WAIT_FOR_REPLY;
+	gf_dm_sess_notify_state(sess, GF_NETIO_WAIT_FOR_REPLY, GF_OK);
+	return GF_OK;
 }
 
 
+
+static Bool dm_exceeds_cap_rate(GF_DownloadSession * sess)
+{
+	u32 cumul_rate = 0;
+	u32 i, count = gf_list_count(sess->dm->sessions);
+
+	dm_sess_update_download_rate(sess, 0);
+	//we already exceed the max rate
+	if (sess->bytes_per_sec>sess->dm->limit_data_rate) return 1;
+
+	//check if this fits with all other sessions
+	for (i=0; i<count; i++) {
+		GF_DownloadSession * a_sess = gf_list_get(sess->dm->sessions, i);
+		if (sess == a_sess) continue;
+		//session done
+		if (a_sess->total_size==a_sess->bytes_done) {
+			continue;
+		}
+		dm_sess_update_download_rate(a_sess, 0);
+		cumul_rate += a_sess->bytes_per_sec;
+	}
+	if (sess->bytes_per_sec + cumul_rate >= sess->dm->limit_data_rate) return 1;
+	return 0;
+}
+
 /*!
  * Parse the remaining part of body
  * \param sess The session
  * \param sHTTP the data buffer
  * \return The error code if any
  */
-static GF_Err http_parse_remaining_body(GF_DownloadSession * sess, char * sHTTP) {
-    u32 size;
-    GF_Err e;
-    while (1) {
-        if (sess->status>=GF_NETIO_DISCONNECTED)
-            return GF_REMOTE_SERVICE_ERROR;
+static GF_Err http_parse_remaining_body(GF_DownloadSession * sess, char * sHTTP)
+{
+	u32 size;
+	GF_Err e;
+	u32 buf_size = GF_DOWNLOAD_BUFFER_SIZE;
+	if (sess->dm && sess->dm->limit_data_rate)
+		buf_size = 1024;
+
+	while (1) {
+		if (sess->status>=GF_NETIO_DISCONNECTED)
+			return GF_REMOTE_SERVICE_ERROR;
 
 		if (sess->dm && sess->dm->limit_data_rate && sess->bytes_per_sec) {
-            if (sess->bytes_per_sec > sess->dm->limit_data_rate) {
-                /*update state*/
-                u32 runtime = gf_sys_clock() - sess->start_time;
-				u64 nb_bytes = sess->bytes_done;
-				sess->bytes_per_sec = (u32) (1000*nb_bytes / runtime);
-                if (sess->bytes_per_sec > sess->dm->limit_data_rate) return GF_OK;
-            }
-        }
-
-		e = gf_dm_read_data(sess, sHTTP, GF_DOWNLOAD_BUFFER_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() - sess->start_time > 5000))) {
-                sess->total_size = sess->bytes_done;
-                gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
+			if (dm_exceeds_cap_rate(sess))
+				return GF_OK;
+		}
+
+		e = gf_dm_read_data(sess, sHTTP, buf_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_dm_disconnect(sess, (e == GF_IP_CONNECTION_CLOSED) ? 1 : 0);
-            }
-            return GF_OK;
-        }
+				gf_dm_disconnect(sess, (e == GF_IP_CONNECTION_CLOSED) ? 1 : 0);
+			}
+			return GF_OK;
+		}
 
 		if (e) {
-			if (e == GF_IP_CONNECTION_CLOSED){
+			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, 0, NULL);
-				if ( ( (len == 0) && sess->use_cache_file) 
-					/*ivica patch*/
-					|| (size==0)
-				) {
+				if ( ( (len == 0) && sess->use_cache_file)
+				        /*ivica patch*/
+				        || (size==0)
+				   ) {
 					sess->total_size = sess->bytes_done;
 					// 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)));
-					if (sess->use_cache_file) 
+					if (sess->use_cache_file)
 						gf_cache_set_content_length(sess->cache_entry, sess->bytes_done);
 					e = GF_OK;
 				}
@@ -2371,31 +2436,31 @@
 		}
 		gf_dm_data_received(sess, (u8 *) sHTTP, size, 0, NULL);
 
-        /*socket empty*/
-        if (size < GF_DOWNLOAD_BUFFER_SIZE) {
+		/*socket empty*/
+		if (size < GF_DOWNLOAD_BUFFER_SIZE) {
 			gf_sleep(1);
 			return GF_OK;
 		}
-    }
+	}
 }
 
 static void notify_headers(GF_DownloadSession *sess, char * sHTTP, s32 bytesRead, s32 BodyStart)
 {
-    GF_NETIO_Parameter par;
-    u32 i, count;
+	GF_NETIO_Parameter par;
+	u32 i, count;
 
 	count = gf_list_count(sess->headers);
 	memset(&par, 0, sizeof(GF_NETIO_Parameter));
-	
+
 	for (i=0; i<count; i++) {
 		GF_HTTPHeader *hdrp = gf_list_get(sess->headers, i);
 		par.name = hdrp->name;
 		par.value = hdrp->value;
 
-        par.error = 0;
-        par.msg_type = GF_NETIO_PARSE_HEADER;
-        gf_dm_sess_user_io(sess, &par);
-    }
+		par.error = 0;
+		par.msg_type = GF_NETIO_PARSE_HEADER;
+		gf_dm_sess_user_io(sess, &par);
+	}
 }
 
 /*!
@@ -2405,127 +2470,131 @@
  */
 static GF_Err wait_for_header_and_parse(GF_DownloadSession *sess, char * sHTTP)
 {
-    GF_NETIO_Parameter par;
-    s32 bytesRead, BodyStart;
-    u32 res, i;
-    s32 LinePos, Pos;
-    u32 rsp_code, ContentLength, first_byte, last_byte, total_size, range, no_range;
+	GF_NETIO_Parameter par;
+	s32 bytesRead, BodyStart;
+	u32 res, i, buf_size;
+	s32 LinePos, Pos;
+	u32 rsp_code, ContentLength, first_byte, last_byte, total_size, range, no_range;
 	Bool connection_closed = 0;
-    char buf[1025];
-    char comp[400];
-    GF_Err e;
-    char * new_location;
-    assert( sess->status == GF_NETIO_WAIT_FOR_REPLY );
-    bytesRead = res = 0;
-    new_location = NULL;
+	char buf[1025];
+	char comp[400];
+	GF_Err e;
+	char * new_location;
+	assert( sess->status == GF_NETIO_WAIT_FOR_REPLY );
+	bytesRead = res = 0;
+	new_location = NULL;
 	if (!(sess->flags & GF_NETIO_SESSION_NOT_CACHED)) {
-	    sess->use_cache_file = 1;
+		sess->use_cache_file = 1;
 	}
 
+	buf_size = GF_DOWNLOAD_BUFFER_SIZE;
+	if (sess->dm && sess->dm->limit_data_rate)
+		buf_size = 1024;
+
 	//always set start time to the time at last attempt reply parsing
-    sess->start_time = gf_sys_clock();
+	sess->start_time = gf_sys_clock_high_res();
 	sess->start_time_utc = gf_net_get_utc();
 
-    while (1) {
-        e = gf_dm_read_data(sess, sHTTP + bytesRead, GF_DOWNLOAD_BUFFER_SIZE - bytesRead, &res);
-        switch (e) {
-        case GF_IP_NETWORK_EMPTY:
-            if (!bytesRead) {
+	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() - sess->request_time > sess->dm->request_timeout) {
-	                sess->last_error = GF_IP_NETWORK_EMPTY;
-		            sess->status = GF_NETIO_STATE_ERROR;
+					sess->last_error = GF_IP_NETWORK_EMPTY;
+					sess->status = GF_NETIO_STATE_ERROR;
 					return GF_IP_NETWORK_EMPTY;
 				}
 				return GF_OK;
 			}
-            continue;
-            /*socket has been closed while configuring, retry (not sure if the server got the GET)*/
-        case GF_IP_CONNECTION_CLOSED:
-            if (sess->http_read_type == HEAD) {
-                /* Some servers such as shoutcast directly close connection if HEAD or an unknown method is issued */
-                sess->server_only_understand_get = 1;
-            }
+			continue;
+		/*socket has been closed while configuring, retry (not sure if the server got the GET)*/
+		case GF_IP_CONNECTION_CLOSED:
+			if (sess->http_read_type == HEAD) {
+				/* Some servers such as shoutcast directly close connection if HEAD or an unknown method is issued */
+				sess->server_only_understand_get = 1;
+			}
 			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connection closed by server when getting %s - retrying\n", sess->remote_path));
-            gf_dm_disconnect(sess, 1);
+			gf_dm_disconnect(sess, 1);
 
 			if (sess->num_retry)
-                sess->status = GF_NETIO_SETUP;
-            else {
-                sess->last_error = e;
-                sess->status = GF_NETIO_STATE_ERROR;
-            }
-            return e;
-        case GF_OK:
-            if (!res) return GF_OK;
-            break;
-        default:
-            goto exit;
-        }
-        bytesRead += res;
-
-        /*locate body start*/
-        BodyStart = gf_token_find(sHTTP, 0, bytesRead, "\r\n\r\n");
-        if (BodyStart > 0) {
+				sess->status = GF_NETIO_SETUP;
+			else {
+				sess->last_error = e;
+				sess->status = GF_NETIO_STATE_ERROR;
+			}
+			return e;
+		case GF_OK:
+			if (!res) return GF_OK;
+			break;
+		default:
+			goto exit;
+		}
+		bytesRead += res;
+
+		/*locate body start*/
+		BodyStart = gf_token_find(sHTTP, 0, bytesRead, "\r\n\r\n");
+		if (BodyStart > 0) {
 			BodyStart += 4;
 			break;
 		}
-        BodyStart = gf_token_find(sHTTP, 0, bytesRead, "\n\n");
-        if (BodyStart > 0) {
+		BodyStart = gf_token_find(sHTTP, 0, bytesRead, "\n\n");
+		if (BodyStart > 0) {
 			BodyStart += 2;
 			break;
 		}
-        BodyStart=0;
-    }
-    if (bytesRead < 0) {
-        e = GF_REMOTE_SERVICE_ERROR;
-        goto exit;
-    }
-    if (!BodyStart)
-        BodyStart = bytesRead;
-
-    sHTTP[BodyStart-1] = 0;
-    GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] %s\n\n", sHTTP));
-
-    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 = 0;
-        /*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);
-
-    no_range = range = ContentLength = first_byte = last_byte = total_size = 0;
-    /* parse headers*/
-    while (1) {
+		BodyStart=0;
+	}
+	if (bytesRead < 0) {
+		e = GF_REMOTE_SERVICE_ERROR;
+		goto exit;
+	}
+	if (!BodyStart)
+		BodyStart = bytesRead;
+
+	sHTTP[BodyStart-1] = 0;
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] %s\n\n", sHTTP));
+
+	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 = 0;
+		/*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);
+
+	no_range = range = ContentLength = first_byte = last_byte = total_size = 0;
+	/* parse headers*/
+	while (1) {
 		GF_HTTPHeader *hdrp;
-        char *sep, *hdr_sep, *hdr, *hdr_val;
-        if ( (s32) LinePos + 4 > BodyStart) break;
-        LinePos = gf_token_get_line(sHTTP, LinePos , bytesRead, buf, 1024);
-        if (LinePos < 0) break;
-
-        hdr_sep = NULL;
-        hdr_val = NULL;
-        hdr = buf;
-        sep = strchr(buf, ':');
-        if (sep) {
-            sep[0]=0;
-            hdr_val = sep+1;
-            while (hdr_val[0]==' ') hdr_val++;
-            hdr_sep = strrchr(hdr_val, '\r');
-            if (hdr_sep) hdr_sep[0] = 0;
-        }
+		char *sep, *hdr_sep, *hdr, *hdr_val;
+		if ( (s32) LinePos + 4 > BodyStart) break;
+		LinePos = gf_token_get_line(sHTTP, LinePos , bytesRead, buf, 1024);
+		if (LinePos < 0) break;
+
+		hdr_sep = NULL;
+		hdr_val = NULL;
+		hdr = buf;
+		sep = strchr(buf, ':');
+		if (sep) {
+			sep[0]=0;
+			hdr_val = sep+1;
+			while (hdr_val[0]==' ') hdr_val++;
+			hdr_sep = strrchr(hdr_val, '\r');
+			if (hdr_sep) hdr_sep[0] = 0;
+		}
 
 		GF_SAFEALLOC(hdrp, GF_HTTPHeader);
 		hdrp->name = gf_strdup(hdr);
@@ -2533,7 +2602,7 @@
 		gf_list_add(sess->headers, hdrp);
 
 		if (sep) sep[0]=':';
-        if (hdr_sep) hdr_sep[0] = '\r';
+		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
@@ -2543,112 +2612,112 @@
 
 		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_type = gf_strdup(hdrp->value);
-            while (1) {
-                u32 len = (u32) strlen(mime_type);
-                char c = len ? mime_type[len-1] : 0;
-                if ((c=='\r') || (c=='\n')) {
-                    mime_type[len-1] = 0;
-                } else {
-                    break;
-                }
-            }
-            val = strchr(mime_type, ';');
-            if (val) val[0] = 0;
+
+		}
+		else if (!stricmp(hdrp->name, "Content-Type")) {
+			char * mime_type = gf_strdup(hdrp->value);
+			while (1) {
+				u32 len = (u32) strlen(mime_type);
+				char c = len ? mime_type[len-1] : 0;
+				if ((c=='\r') || (c=='\n')) {
+					mime_type[len-1] = 0;
+				} else {
+					break;
+				}
+			}
+			val = strchr(mime_type, ';');
+			if (val) val[0] = 0;
 
 			strlwr(mime_type);
 			if (rsp_code<300) {
-	            if (sess->cache_entry) {
+				if (sess->cache_entry) {
 					gf_cache_set_mime_type(sess->cache_entry, mime_type);
 				} else {
 					sess->mime_type = mime_type;
 					mime_type = NULL;
 				}
 			}
-            if (mime_type) gf_free(mime_type);
-        }
-        else if (!stricmp(hdrp->name, "Content-Range")) {
-            range = 1;
-            if (!strncmp(hdrp->value, "bytes", 5)) {
-                val = hdrp->value + 5;
-                if (val[0] == ':') val += 1;
-                val += http_skip_space(val);
-                if (val[0] == '*') {
+			if (mime_type) gf_free(mime_type);
+		}
+		else if (!stricmp(hdrp->name, "Content-Range")) {
+			range = 1;
+			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")) {
+				} 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 = 0;
-            if (!stricmp(hdrp->name, "icy-metaint")) {
-                sess->icy_metaint = atoi(hdrp->value);
-            }
-        }
-        else if (!stricmp(hdrp->name, "Cache-Control")) {
-        }
-        else if (!stricmp(hdrp->name, "ETag")) {
+		}
+		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 = 0;
+			if (!stricmp(hdrp->name, "icy-metaint")) {
+				sess->icy_metaint = atoi(hdrp->value);
+			}
+		}
+		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")) {
+				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")) {
+				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 = 1; 
-		}
-
-        if (sess->status==GF_NETIO_DISCONNECTED) return GF_OK;
-    }
-    if (no_range) first_byte = 0;
-
-    par.msg_type = GF_NETIO_PARSE_REPLY;
-    par.error = GF_OK;
-    par.reply = rsp_code;
-    par.value = comp;
-    /*
-     * If response is correct, it means our credentials are correct
-     */
-    if (sess->creds && rsp_code != 304)
-        sess->creds->valid = 1;
+		}
+		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 = 1;
+		}
+
+		if (sess->status==GF_NETIO_DISCONNECTED) return GF_OK;
+	}
+	if (no_range) first_byte = 0;
+
+	par.msg_type = GF_NETIO_PARSE_REPLY;
+	par.error = GF_OK;
+	par.reply = rsp_code;
+	par.value = comp;
+	/*
+	 * If response is correct, it means our credentials are correct
+	 */
+	if (sess->creds && rsp_code != 304)
+		sess->creds->valid = 1;
 
 
 	/*try to flush body */
 	if (rsp_code>=300) {
 		u32 start = gf_sys_clock();
 		while (BodyStart + ContentLength > (u32) bytesRead) {
-		    e = gf_dm_read_data(sess, sHTTP + bytesRead, GF_DOWNLOAD_BUFFER_SIZE - bytesRead, &res);
+			e = gf_dm_read_data(sess, sHTTP + bytesRead, buf_size - bytesRead, &res);
 			switch (e) {
 			case GF_IP_NETWORK_EMPTY:
-				gf_sleep(1);
-				continue;
+				gf_sleep(0);
+				break;
 			case GF_OK:
-		        bytesRead += res;
+				bytesRead += res;
 				break;
 			default:
 				start=0;
@@ -2671,211 +2740,211 @@
 	//remember if we can keep the session alive after the transfer is done
 	sess->connection_close = connection_closed;
 
-    switch (rsp_code) {
-    case 200:
-    case 201:
-    case 202:
-    case 206:
-        gf_dm_sess_user_io(sess, &par);
-        e = GF_OK;
-        if (sess->proxy_enabled==2) {
-            sess->proxy_enabled=0;
-            if (sess->dm)
-                gf_list_add(sess->dm->skip_proxy_servers, gf_strdup(sess->server_name));
-        }
-        break;
-        /*redirection: extract the new location*/
-    case 301:
-    case 302:
-    case 307:
-        if (!new_location || !strlen(new_location) ) {
-            gf_dm_sess_user_io(sess, &par);
-            e = GF_URL_ERROR;
-            goto exit;
-        }
-        while (
-            (new_location[strlen(new_location)-1] == '\n')
-            || (new_location[strlen(new_location)-1] == '\r')  )
-            new_location[strlen(new_location)-1] = 0;
-
-        /*reset and reconnect*/
-        gf_dm_disconnect(sess, 1);
-        sess->status = GF_NETIO_SETUP;
-        e = gf_dm_sess_setup_from_url(sess, new_location);
-        if (e) {
-            sess->status = GF_NETIO_STATE_ERROR;
-            sess->last_error = e;
-            gf_dm_sess_notify_state(sess, sess->status, e);
-        }
-        return e;
-    case 304:
-    {
-        sess->status = GF_NETIO_PARSE_REPLY;
-        gf_dm_sess_notify_state(sess, GF_NETIO_PARSE_REPLY, GF_OK);
-        gf_dm_disconnect(sess, 0);
-        if (sess->user_proc) {
-            /* For modules that do not use cache and have problems with GF_NETIO_DATA_TRANSFERED ... */
-            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));
-            f = gf_f64_open(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));
-                /* Ooops, no cache, redowload everything ! */
-                gf_dm_disconnect(sess, 0);
-                sess->status = GF_NETIO_SETUP;
-                e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
-                sess->total_size = gf_cache_get_cache_filesize(sess->cache_entry);
-                if (e) {
-                    sess->status = GF_NETIO_STATE_ERROR;
-                    sess->last_error = e;
-                    gf_dm_sess_notify_state(sess, sess->status, e);
-                }
-                return e;
-            }
-
-            par.error = 0;
-            par.msg_type = GF_NETIO_PARSE_HEADER;
-            par.name = "Content-Type";
-            par.value = (char *) gf_cache_get_mime_type(sess->cache_entry);
-            gf_dm_sess_user_io(sess, &par);
+	switch (rsp_code) {
+	case 200:
+	case 201:
+	case 202:
+	case 206:
+		gf_dm_sess_user_io(sess, &par);
+		e = GF_OK;
+		if (sess->proxy_enabled==2) {
+			sess->proxy_enabled=0;
+			if (sess->dm)
+				gf_list_add(sess->dm->skip_proxy_servers, gf_strdup(sess->server_name));
+		}
+		break;
+	/*redirection: extract the new location*/
+	case 301:
+	case 302:
+	case 307:
+		if (!new_location || !strlen(new_location) ) {
+			gf_dm_sess_user_io(sess, &par);
+			e = GF_URL_ERROR;
+			goto exit;
+		}
+		while (
+		    (new_location[strlen(new_location)-1] == '\n')
+		    || (new_location[strlen(new_location)-1] == '\r')  )
+			new_location[strlen(new_location)-1] = 0;
 
-            sess->status = GF_NETIO_DATA_EXCHANGE;
+		/*reset and reconnect*/
+		gf_dm_disconnect(sess, 1);
+		sess->status = GF_NETIO_SETUP;
+		e = gf_dm_sess_setup_from_url(sess, new_location);
+		if (e) {
+			sess->status = GF_NETIO_STATE_ERROR;
+			sess->last_error = e;
+			gf_dm_sess_notify_state(sess, sess->status, e);
+		}
+		return e;
+	case 304:
+	{
+		sess->status = GF_NETIO_PARSE_REPLY;
+		gf_dm_sess_notify_state(sess, GF_NETIO_PARSE_REPLY, GF_OK);
+		gf_dm_disconnect(sess, 0);
+		if (sess->user_proc) {
+			/* For modules that do not use cache and have problems with GF_NETIO_DATA_TRANSFERED ... */
+			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));
+			f = gf_f64_open(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));
+				/* Ooops, no cache, redowload everything ! */
+				gf_dm_disconnect(sess, 0);
+				sess->status = GF_NETIO_SETUP;
+				e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
+				sess->total_size = gf_cache_get_cache_filesize(sess->cache_entry);
+				if (e) {
+					sess->status = GF_NETIO_STATE_ERROR;
+					sess->last_error = e;
+					gf_dm_sess_notify_state(sess, sess->status, e);
+				}
+				return e;
+			}
+
+			par.error = 0;
+			par.msg_type = GF_NETIO_PARSE_HEADER;
+			par.name = "Content-Type";
+			par.value = (char *) gf_cache_get_mime_type(sess->cache_entry);
+			gf_dm_sess_user_io(sess, &par);
+
+			sess->status = GF_NETIO_DATA_EXCHANGE;
 			if (! (sess->flags & GF_NETIO_SESSION_NOT_THREADED) || sess->force_data_write_callback) {
-                char file_cache_buff[16384];
-                int read = 0;
-                u32 total_size = gf_cache_get_cache_filesize(sess->cache_entry);
-                do {
-                    read = (u32) fread(file_cache_buff, sizeof(char), 16384, f);
-                    if (read > 0) {
-                        sess->bytes_done += read;
-                        sess->total_size = total_size;
+				char file_cache_buff[16384];
+				int read = 0;
+				u32 total_size = gf_cache_get_cache_filesize(sess->cache_entry);
+				do {
+					read = (u32) fread(file_cache_buff, sizeof(char), 16384, f);
+					if (read > 0) {
+						sess->bytes_done += read;
+						sess->total_size = total_size;
 						sess->bytes_per_sec = 0xFFFFFFFF;
-                        par.size = read;
-                        par.msg_type = GF_NETIO_DATA_EXCHANGE;
-                        par.error = GF_EOS;
-                        par.reply = 2;
-                        par.data = file_cache_buff;
-                        gf_dm_sess_user_io(sess, &par);
-                    }
-                } while ( read > 0);
-            }
-            fclose(f);
-            GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] all data has been sent to modules from %s.\n", filename));
-        }
-        /* Cache file is the most recent */
-        sess->status = GF_NETIO_DATA_TRANSFERED;
-        gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-        gf_dm_disconnect(sess, 0);
-        par.msg_type = GF_NETIO_DATA_TRANSFERED;
-        par.error = GF_OK;
-        gf_dm_sess_user_io(sess, &par);
-        return GF_OK;
-    }
-    case 401:
-    {
-        /* Do we have a credentials struct ? */
-        sess->creds = gf_user_credentials_register(sess->dm, sess->server_name, NULL, NULL, 0);
-        if (!sess->creds) {
-            /* User credentials have not been filled properly, we have to abort */
-            gf_dm_disconnect(sess, 1);
-            sess->status = GF_NETIO_STATE_ERROR;
-            par.error = GF_AUTHENTICATION_FAILURE;
-            par.msg_type = GF_NETIO_DISCONNECTED;
-            gf_dm_sess_user_io(sess, &par);
-            e = GF_AUTHENTICATION_FAILURE;
-            sess->last_error = e;
-            goto exit;
-        }
-        gf_dm_disconnect(sess, 0);
-        sess->status = GF_NETIO_SETUP;
-        e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
-        if (e) {
-            sess->status = GF_NETIO_STATE_ERROR;
-            sess->last_error = e;
-            gf_dm_sess_notify_state(sess, sess->status, e);
-        }
-        return e;
-    }
-    case 404:
-        /* File not found */
-        gf_dm_sess_user_io(sess, &par);
+						par.size = read;
+						par.msg_type = GF_NETIO_DATA_EXCHANGE;
+						par.error = GF_EOS;
+						par.reply = 2;
+						par.data = file_cache_buff;
+						gf_dm_sess_user_io(sess, &par);
+					}
+				} while ( read > 0);
+			}
+			fclose(f);
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] all data has been sent to modules from %s.\n", filename));
+		}
+		/* Cache file is the most recent */
+		sess->status = GF_NETIO_DATA_TRANSFERED;
+		gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
+		gf_dm_disconnect(sess, 0);
+		par.msg_type = GF_NETIO_DATA_TRANSFERED;
+		par.error = GF_OK;
+		gf_dm_sess_user_io(sess, &par);
+		return GF_OK;
+	}
+	case 401:
+	{
+		/* Do we have a credentials struct ? */
+		sess->creds = gf_user_credentials_register(sess->dm, sess->server_name, NULL, NULL, 0);
+		if (!sess->creds) {
+			/* User credentials have not been filled properly, we have to abort */
+			gf_dm_disconnect(sess, 1);
+			sess->status = GF_NETIO_STATE_ERROR;
+			par.error = GF_AUTHENTICATION_FAILURE;
+			par.msg_type = GF_NETIO_DISCONNECTED;
+			gf_dm_sess_user_io(sess, &par);
+			e = GF_AUTHENTICATION_FAILURE;
+			sess->last_error = e;
+			goto exit;
+		}
+		gf_dm_disconnect(sess, 0);
+		sess->status = GF_NETIO_SETUP;
+		e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
+		if (e) {
+			sess->status = GF_NETIO_STATE_ERROR;
+			sess->last_error = e;
+			gf_dm_sess_notify_state(sess, sess->status, e);
+		}
+		return e;
+	}
+	case 404:
+		/* File not found */
+		gf_dm_sess_user_io(sess, &par);
 		if ((BodyStart < (s32) bytesRead)) {
 			sHTTP[bytesRead] = 0;
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Failure: %s\n", sHTTP + BodyStart));
 		}
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
 		e = GF_URL_ERROR;
-        goto exit;
-        break;
-    case 416:
-        /* Range not accepted */
-        gf_dm_sess_user_io(sess, &par);
+		goto exit;
+		break;
+	case 416:
+		/* Range not accepted */
+		gf_dm_sess_user_io(sess, &par);
 
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
 		e = GF_SERVICE_ERROR;
-        goto exit;
-        break;
-    case 400:
-    case 501:
-        /* Method not implemented ! */
-        if (sess->http_read_type == HEAD) {
-            /* Since HEAD is not understood by this server, we use a GET instead */
-            sess->http_read_type = GET;
-            sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
-            gf_dm_disconnect(sess, 0);
-            sess->status = GF_NETIO_SETUP;
-            sess->server_only_understand_get = 1;
-            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);
-            if (e) {
-                sess->status = GF_NETIO_STATE_ERROR;
-                sess->last_error = e;
-                gf_dm_sess_notify_state(sess, sess->status, e);
-            }
-            return e;
-        }
+		goto exit;
+		break;
+	case 400:
+	case 501:
+		/* Method not implemented ! */
+		if (sess->http_read_type == HEAD) {
+			/* Since HEAD is not understood by this server, we use a GET instead */
+			sess->http_read_type = GET;
+			sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
+			gf_dm_disconnect(sess, 0);
+			sess->status = GF_NETIO_SETUP;
+			sess->server_only_understand_get = 1;
+			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);
+			if (e) {
+				sess->status = GF_NETIO_STATE_ERROR;
+				sess->last_error = e;
+				gf_dm_sess_notify_state(sess, sess->status, e);
+			}
+			return e;
+		}
 
-        gf_dm_sess_user_io(sess, &par);
+		gf_dm_sess_user_io(sess, &par);
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
-        e = GF_REMOTE_SERVICE_ERROR;
-        goto exit;
+		e = GF_REMOTE_SERVICE_ERROR;
+		goto exit;
 
-    case 503:
-        /*retry without proxy*/
-        if (sess->proxy_enabled==1) {
-            sess->proxy_enabled=2;
-            gf_dm_disconnect(sess, 1);
-            sess->status = GF_NETIO_SETUP;
-            return GF_OK;
-        }
-    default:
-        gf_dm_sess_user_io(sess, &par);
+	case 503:
+		/*retry without proxy*/
+		if (sess->proxy_enabled==1) {
+			sess->proxy_enabled=2;
+			gf_dm_disconnect(sess, 1);
+			sess->status = GF_NETIO_SETUP;
+			return GF_OK;
+		}
+	default:
+		gf_dm_sess_user_io(sess, &par);
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
-        e = GF_REMOTE_SERVICE_ERROR;
-        goto exit;
-    }
+		e = GF_REMOTE_SERVICE_ERROR;
+		goto exit;
+	}
 
 	notify_headers(sess, sHTTP, bytesRead, BodyStart);
 
-    if (sess->http_read_type != GET)
-        sess->use_cache_file = 0;
+	if (sess->http_read_type != GET)
+		sess->use_cache_file = 0;
 
-    if (sess->http_read_type==HEAD) {
-        gf_dm_disconnect(sess, 0);
-        gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-        sess->http_read_type = 0;
-        return GF_OK;
-    }
-    {
-        const char * mime_type = gf_cache_get_mime_type(sess->cache_entry);
-        if (!ContentLength && mime_type && ((strstr(mime_type, "ogg") || (!strcmp(mime_type, "audio/mpeg"))))) {
-            if (0 == sess->icy_metaint)
-                sess->icy_metaint = -1;
-            sess->use_cache_file = 0;
-        }
+	if (sess->http_read_type==HEAD) {
+		gf_dm_disconnect(sess, 0);
+		gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
+		sess->http_read_type = 0;
+		return GF_OK;
+	}
+	{
+		const char * mime_type = gf_cache_get_mime_type(sess->cache_entry);
+		if (!ContentLength && mime_type && ((strstr(mime_type, "ogg") || (!strcmp(mime_type, "audio/mpeg"))))) {
+			if (0 == sess->icy_metaint)
+				sess->icy_metaint = -1;
+			sess->use_cache_file = 0;
+		}
 
 #ifndef GPAC_DISABLE_LOGS
 		if (e) {
@@ -2885,62 +2954,62 @@
 		}
 #endif
 
-        /*some servers may reply without content length, but we MUST have it*/
-        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"));
-            if (mime_type && !stricmp(mime_type, "video/nsv")) {
-                gf_cache_set_mime_type(sess->cache_entry, "audio/aac");
-            }
-            sess->icy_bytes = 0;
-            sess->total_size = SIZE_IN_STREAM;
-            sess->status = GF_NETIO_DATA_EXCHANGE;
+		/*some servers may reply without content length, but we MUST have it*/
+		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"));
+			if (mime_type && !stricmp(mime_type, "video/nsv")) {
+				gf_cache_set_mime_type(sess->cache_entry, "audio/aac");
+			}
+			sess->icy_bytes = 0;
+			sess->total_size = SIZE_IN_STREAM;
+			sess->status = GF_NETIO_DATA_EXCHANGE;
 		} else if (!ContentLength && !sess->chunked) {
-            if (sess->http_read_type == GET) {
-                sess->total_size = SIZE_IN_STREAM;
-                sess->use_cache_file = 0;
-                sess->status = GF_NETIO_DATA_EXCHANGE;
-                sess->bytes_done = 0;
-            } else {
-                gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-                gf_dm_disconnect(sess, 0);
-                return GF_OK;
-            }
-        } else {
-            sess->total_size = ContentLength;
-            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));
-                    goto exit;
-                }
-            }
-            sess->status = GF_NETIO_DATA_EXCHANGE;
-            sess->bytes_done = 0;
-        }
-    }
-
-    /* we may have existing data in this buffer ... */
-    if (!e && (BodyStart < (s32) bytesRead)) {
-	    if (sess->init_data) gf_free(sess->init_data);
-        sess->init_data_size = 0;
-	    sess->init_data = NULL;
+			if (sess->http_read_type == GET) {
+				sess->total_size = SIZE_IN_STREAM;
+				sess->use_cache_file = 0;
+				sess->status = GF_NETIO_DATA_EXCHANGE;
+				sess->bytes_done = 0;
+			} else {
+				gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
+				gf_dm_disconnect(sess, 0);
+				return GF_OK;
+			}
+		} else {
+			sess->total_size = ContentLength;
+			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));
+					goto exit;
+				}
+			}
+			sess->status = GF_NETIO_DATA_EXCHANGE;
+			sess->bytes_done = 0;
+		}
+	}
+
+	/* we may have existing data in this buffer ... */
+	if (!e && (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, 1, NULL);
-    }
+	}
 exit:
-    if (e) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error parsing reply: %s for URL %s\n", gf_error_to_string(e), sess->orig_url ));
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error parsing reply: %s for URL %s\n", gf_error_to_string(e), sess->orig_url ));
 		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, 0);
-        sess->status = GF_NETIO_STATE_ERROR;
-        sess->last_error = e;
-        gf_dm_sess_notify_state(sess, sess->status, e);
-        return e;
-    }
+		sess->status = GF_NETIO_STATE_ERROR;
+		sess->last_error = e;
+		gf_dm_sess_notify_state(sess, sess->status, e);
+		return e;
+	}
 	/*DO NOT call parse_body yet, as the final user may not be connected to our session*/
 	return GF_OK;
 }
@@ -2951,7 +3020,7 @@
  */
 void http_do_requests(GF_DownloadSession *sess)
 {
-    char sHTTP[GF_DOWNLOAD_BUFFER_SIZE+1];
+	char sHTTP[GF_DOWNLOAD_BUFFER_SIZE+1];
 
 	if (sess->reused_cache_entry) {
 		if (!gf_cache_is_in_progress(sess->cache_entry)) {
@@ -2961,21 +3030,21 @@
 		return;
 	}
 
-    switch (sess->status) {
-    case GF_NETIO_CONNECTED:
-        http_send_headers(sess, sHTTP);
-        break;
-    case GF_NETIO_WAIT_FOR_REPLY:
-        wait_for_header_and_parse(sess, sHTTP);
-        break;
-    case GF_NETIO_DATA_EXCHANGE:
+	switch (sess->status) {
+	case GF_NETIO_CONNECTED:
+		http_send_headers(sess, sHTTP);
+		break;
+	case GF_NETIO_WAIT_FOR_REPLY:
+		wait_for_header_and_parse(sess, sHTTP);
+		break;
+	case GF_NETIO_DATA_EXCHANGE:
 		/*session has been reassigned, resend data retrieved in first GET reply to user but don't write to cache*/
 		if (sess->reassigned) {
 
 			if (sess->icy_metaint > 0) {
 				gf_icy_skip_data(sess, sess->icy_metaint, sess->init_data, sess->init_data_size);
 			} else {
-			    GF_NETIO_Parameter par;
+				GF_NETIO_Parameter par;
 				par.msg_type = GF_NETIO_DATA_EXCHANGE;
 				par.error = GF_OK;
 				par.data = sess->init_data;
@@ -2984,11 +3053,11 @@
 			}
 			sess->reassigned = 0;
 		}
-        http_parse_remaining_body(sess, sHTTP);
-        break;
-    default:
-        break;
-    }
+		http_parse_remaining_body(sess, sHTTP);
+		break;
+	default:
+		break;
+	}
 }
 
 
@@ -3023,7 +3092,7 @@
 }
 
 GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm,
-				const char *url, const char *filename, u64 start_range, u64 end_range)
+                             const char *url, const char *filename, u64 start_range, u64 end_range)
 {
 	GF_Err e;
 	FILE * f;
@@ -3031,9 +3100,9 @@
 	if (!filename || !url || !dm)
 		return GF_BAD_PARAM;
 	f= fopen(filename, "w");
-	if (!f){
-	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[WGET] Failed to open file %s for write.\n", filename));
-	return GF_IO_ERR;
+	if (!f) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[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);
 	if (!dnload) {
@@ -3044,7 +3113,7 @@
 	if (end_range) {
 		dnload->range_start = start_range;
 		dnload->range_end = end_range;
-	    dnload->needs_range = 1;
+		dnload->needs_range = 1;
 	}
 	if (e == GF_OK) {
 		e = gf_dm_sess_process(dnload);
@@ -3060,9 +3129,9 @@
 {
 	GF_Err e;
 	FILE * f;
-	GF_DownloadSession *dnload;  
+	GF_DownloadSession *dnload;
 	GF_DownloadManager *dm;
-	
+
 	if (!url || !out_data || !out_size)
 		return GF_BAD_PARAM;
 	f = gf_temp_file_new();
@@ -3076,7 +3145,7 @@
 		fclose(f);
 		return GF_OUT_OF_MEM;
 	}
-	
+
 	dnload = gf_dm_sess_new_simple(dm, (char *)url, GF_NETIO_SESSION_NOT_THREADED, &wget_NetIO, f, &e);
 	if (!dnload) {
 		gf_dm_del(dm);
@@ -3084,12 +3153,12 @@
 	}
 	dnload->use_cache_file = 0;
 	dnload->disable_cache = 1;
-	if (!e)  
+	if (!e)
 		e = gf_dm_sess_process(dnload);
 
-	if (!e)  
+	if (!e)
 		e = gf_cache_close_write_cache(dnload->cache_entry, dnload, e == GF_OK);
-	
+
 	if (!e) {
 		u32 size = ftell(f), read;
 		*out_size = size;
@@ -3132,110 +3201,110 @@
 
 GF_Err gf_dm_sess_reset(GF_DownloadSession *sess)
 {
-    if (!sess) return GF_BAD_PARAM;
-    sess->status = GF_NETIO_SETUP;
-    sess->needs_range = 0;
-    sess->range_start = sess->range_end = 0;
-    sess->bytes_done = sess->bytes_per_sec = 0;
-    if (sess->init_data) gf_free(sess->init_data);
-    sess->init_data = NULL;
-    sess->init_data_size = 0;
-    sess->last_error = GF_OK;
-    sess->total_size = 0;
-    sess->start_time = 0;
+	if (!sess) return GF_BAD_PARAM;
+	sess->status = GF_NETIO_SETUP;
+	sess->needs_range = 0;
+	sess->range_start = sess->range_end = 0;
+	sess->bytes_done = sess->bytes_per_sec = 0;
+	if (sess->init_data) gf_free(sess->init_data);
+	sess->init_data = NULL;
+	sess->init_data_size = 0;
+	sess->last_error = GF_OK;
+	sess->total_size = 0;
+	sess->start_time = 0;
 	sess->start_time_utc = 0;
-    return GF_OK;
+	return GF_OK;
 }
 
 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)
-        return NULL;
-    count = gf_list_count(sess->dm->partial_downloads);
-    for (i = 0 ; i < count ; i++) {
-        GF_PartialDownload * pd = gf_list_get(sess->dm->partial_downloads, i);
-        assert( pd->filename && pd->url);
-        if (!strcmp(pd->url, sess->orig_url) && pd->startOffset == startOffset && pd->endOffset == endOffset) {
-            /* File already created, just return the file */
-            return pd->filename;
-        }
-    }
-    {
-        /* Not found, we are gonna create the file */
-        char * newFilename;
-        GF_PartialDownload * partial;
-        FILE * fw, *fr;
-        u32 maxLen;
-        const char * orig = gf_cache_get_cache_filename(sess->cache_entry);
-        if (orig == NULL)
-            return NULL;
-        /* 22 if 1G + 1G + 2 dashes */
-        maxLen = (u32) strlen(orig) + 22;
-        newFilename = (char*)gf_malloc( maxLen );
-        if (newFilename == NULL)
-            return NULL;
-        snprintf(newFilename, maxLen, "%s " LLU LLU, orig, startOffset, endOffset);
-        fw = gf_f64_open(newFilename, "wb");
-        if (!fw) {
-            GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot open partial cache file %s for write\n", newFilename));
-            gf_free( newFilename );
-            return NULL;
-        }
-        fr = gf_f64_open(orig, "rb");
-        if (!fr) {
-            GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot open full cache file %s\n", orig));
-            gf_free( newFilename );
-            fclose( fw );
-        }
-        /* Now, we copy ! */
-        {
-            char copyBuff[GF_DOWNLOAD_BUFFER_SIZE+1];
-            s64 read, write, total;
-            total = endOffset - startOffset;
-            read = gf_f64_seek(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));
-                fclose( fr );
-                fclose( fw );
-                gf_free( newFilename );
-                return NULL;
-            }
-            do {
-                read = fread(copyBuff, sizeof(char), MIN(sizeof(copyBuff), (size_t)  total), fr);
-                if (read > 0) {
-                    total-= read;
-                    write = gf_fwrite(copyBuff, sizeof(char), (size_t) read, fw);
-                    if (write != read) {
-                        /* Something bad happened */
-                        fclose( fw );
-                        fclose (fr );
-                        gf_free( newFilename );
-                        return NULL;
-                    }
-                } else {
-                    if (read < 0) {
-                        fclose( fw );
-                        fclose( fr );
-                        gf_free( newFilename );
-                        return NULL;
-                    }
-                }
-            } while (total > 0);
-            fclose( fr );
-            fclose (fw);
-            partial = gf_malloc( sizeof(GF_PartialDownload));
-            if (partial == NULL) {
-                gf_free(newFilename);
-                return NULL;
-            }
-            partial->filename = newFilename;
-            partial->url = sess->orig_url;
-            partial->endOffset = endOffset;
-            partial->startOffset = startOffset;
-            gf_list_add(sess->dm->partial_downloads, partial);
-            return newFilename;
-        }
-    }
+	u32 i, count;
+	if (!sess || !sess->dm || endOffset < startOffset)
+		return NULL;
+	count = gf_list_count(sess->dm->partial_downloads);
+	for (i = 0 ; i < count ; i++) {
+		GF_PartialDownload * pd = gf_list_get(sess->dm->partial_downloads, i);
+		assert( pd->filename && pd->url);
+		if (!strcmp(pd->url, sess->orig_url) && pd->startOffset == startOffset && pd->endOffset == endOffset) {
+			/* File already created, just return the file */
+			return pd->filename;
+		}
+	}
+	{
+		/* Not found, we are gonna create the file */
+		char * newFilename;
+		GF_PartialDownload * partial;
+		FILE * fw, *fr;
+		u32 maxLen;
+		const char * orig = gf_cache_get_cache_filename(sess->cache_entry);
+		if (orig == NULL)
+			return NULL;
+		/* 22 if 1G + 1G + 2 dashes */
+		maxLen = (u32) strlen(orig) + 22;
+		newFilename = (char*)gf_malloc( maxLen );
+		if (newFilename == NULL)
+			return NULL;
+		snprintf(newFilename, maxLen, "%s " LLU LLU, orig, startOffset, endOffset);
+		fw = gf_f64_open(newFilename, "wb");
+		if (!fw) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot open partial cache file %s for write\n", newFilename));
+			gf_free( newFilename );
+			return NULL;
+		}
+		fr = gf_f64_open(orig, "rb");
+		if (!fr) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot open full cache file %s\n", orig));
+			gf_free( newFilename );
+			fclose( fw );
+		}
+		/* Now, we copy ! */
+		{
+			char copyBuff[GF_DOWNLOAD_BUFFER_SIZE+1];
+			s64 read, write, total;
+			total = endOffset - startOffset;
+			read = gf_f64_seek(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));
+				fclose( fr );
+				fclose( fw );
+				gf_free( newFilename );
+				return NULL;
+			}
+			do {
+				read = fread(copyBuff, sizeof(char), MIN(sizeof(copyBuff), (size_t)  total), fr);
+				if (read > 0) {
+					total-= read;
+					write = gf_fwrite(copyBuff, sizeof(char), (size_t) read, fw);
+					if (write != read) {
+						/* Something bad happened */
+						fclose( fw );
+						fclose (fr );
+						gf_free( newFilename );
+						return NULL;
+					}
+				} else {
+					if (read < 0) {
+						fclose( fw );
+						fclose( fr );
+						gf_free( newFilename );
+						return NULL;
+					}
+				}
+			} while (total > 0);
+			fclose( fr );
+			fclose (fw);
+			partial = gf_malloc( sizeof(GF_PartialDownload));
+			if (partial == NULL) {
+				gf_free(newFilename);
+				return NULL;
+			}
+			partial->filename = newFilename;
+			partial->url = sess->orig_url;
+			partial->endOffset = endOffset;
+			partial->startOffset = startOffset;
+			gf_list_add(sess->dm->partial_downloads, partial);
+			return newFilename;
+		}
+	}
 }
 
 GF_EXPORT
@@ -3258,7 +3327,7 @@
 				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;
 		}
@@ -3313,6 +3382,12 @@
 void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec)
 {
 	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);
+	}
 }
 
 GF_EXPORT
@@ -3321,6 +3396,28 @@
 	return dm->limit_data_rate*8;
 }
 
+GF_EXPORT
+u32 gf_dm_get_global_rate(GF_DownloadManager *dm)
+{
+	u32 ret = 0;
+	u32 i, count;
+	if (!dm) return 0;
+	gf_mx_p(dm->cache_mx);
+	count = gf_list_count(dm->sessions);
+
+	for (i=0; i<count; i++) {
+		GF_DownloadSession *sess = gf_list_get(dm->sessions, i);
+		if (sess->total_size==sess->bytes_done) {
+			if (gf_sys_clock_high_res() - sess->start_time>2000000) {
+				continue;
+			}
+		}
+		dm_sess_update_download_rate(sess, 0);
+		ret += sess->bytes_per_sec;
+	}
+	gf_mx_v(dm->cache_mx);
+	return 8*ret;
+}
 
 GF_EXPORT
 const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name)
@@ -3330,7 +3427,9 @@
 	count = gf_list_count(sess->headers);
 	for (i=0; i<count; i++) {
 		GF_HTTPHeader *header = gf_list_get(sess->headers, i);
-		if (!strcmp(header->name, name)) return header->value; 
+		if (!strcmp(header->name, name)) return header->value;
 	}
 	return NULL;
 }
+
+#endif

gpac-0.5.0.svn5178.tar.bz2/src/utils/error.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/error.c Changed

@@ -90,7 +90,10 @@
 	}
 	if (done==total) {
 		u32 len = (u32) strlen(szT) + 40;
-		while (len) { fprintf(stderr, " "); len--; };
+		while (len) {
+			fprintf(stderr, " ");
+			len--;
+		};
 		fprintf(stderr, "\r");
 	}
 	else {
@@ -128,7 +131,11 @@
 }
 
 /*ENTRIES MUST BE IN THE SAME ORDER AS LOG_TOOL DECLARATION IN <gpac/tools.h>*/
-static struct log_tool_info {u32 type;  const char *name; u32 level; } global_log_tools [] =
+static struct log_tool_info {
+	u32 type;
+	const char *name;
+	u32 level;
+} global_log_tools [] =
 {
 	{ GF_LOG_CORE, "core", GF_LOG_WARNING },
 	{ GF_LOG_CODING, "coding", GF_LOG_WARNING },
@@ -200,7 +207,7 @@
 			fprintf(stderr, "Unknown log level specified: %s\n", sep_level+1);
 			return GF_BAD_PARAM;
 		}
-	
+
 		sep_level[0] = 0;
 		tools = val;
 		while (tools) {
@@ -210,7 +217,7 @@
 			if (sep) sep[0] = 0;
 
 			if (!stricmp(tools, "all")) {
-				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 {
@@ -247,7 +254,7 @@
 {
 #ifndef GPAC_DISABLE_LOG
 	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 = GF_LOG_WARNING;
 
 	return gf_log_modify_tools_levels(val);
@@ -264,7 +271,7 @@
 	char szLogs[GF_MAX_PATH];
 	char szLogTools[GF_MAX_PATH];
 	strcpy(szLogTools, "");
-	
+
 	level = GF_LOG_QUIET;
 	while (level <= GF_LOG_DEBUG) {
 		u32 nb_tools = 0;
@@ -321,7 +328,7 @@
 GF_EXPORT
 Bool gf_log_tool_level_on(u32 log_tool, u32 log_level)
 {
-	assert(log_tool<GF_LOG_TOOL_MAX); 
+	assert(log_tool<GF_LOG_TOOL_MAX);
 	if (global_log_tools[log_tool].level >= log_level) return GF_TRUE;
 	return GF_FALSE;
 }
@@ -329,7 +336,7 @@
 void default_log_callback(void *cbck, u32 level, u32 tool, const char* fmt, va_list vlist)
 {
 #ifndef _WIN32_WCE
-    vfprintf(stderr, fmt, vlist);
+	vfprintf(stderr, fmt, vlist);
 #endif
 }
 
@@ -357,7 +364,7 @@
 GF_EXPORT
 void gf_log_set_tool_level(u32 tool, u32 level)
 {
-	assert(tool<=GF_LOG_TOOL_MAX); 
+	assert(tool<=GF_LOG_TOOL_MAX);
 	if (tool==GF_LOG_ALL) {
 		u32 i;
 		for (i=0; i<GF_LOG_TOOL_MAX; i++)
@@ -405,6 +412,7 @@
 }
 #endif
 
+static char szErrMsg[20];
 
 GF_EXPORT
 const char *gf_error_to_string(GF_Err e)
@@ -505,7 +513,8 @@
 	case GF_WRONG_DATAFORMAT:
 		return "Unexpected data format";
 	default:
-		return "Unknown Error";
+		sprintf(szErrMsg, "Unknown Error (%d)", e);
+		return szErrMsg;
 	}
 }
 
@@ -558,13 +567,13 @@
 GF_EXPORT
 u32 gf_crc_32(const char *data, u32 len)
 {
-    register u32 i;
-    u32 crc = 0xffffffff;
+	register u32 i;
+	u32 crc = 0xffffffff;
 	if (!data) return 0;
-    for (i=0; i<len; i++)
-        crc = (crc << 8) ^ gf_crc_table[((crc >> 24) ^ *data++) & 0xff];
+	for (i=0; i<len; i++)
+		crc = (crc << 8) ^ gf_crc_table[((crc >> 24) ^ *data++) & 0xff];
 
-    return crc;
+	return crc;
 }
 
 
@@ -574,127 +583,681 @@
 const char *gpac_features()
 {
 	const char *features = ""
-#ifdef GPAC_X64
-		"GPAC_X64 "
+#ifdef GPAC_64_BITS
+	                       "GPAC_64_BITS "
 #endif
 
 #ifdef GPAC_FIXED_POINT
-		"GPAC_FIXED_POINT "
+	                       "GPAC_FIXED_POINT "
 #endif
 #ifdef GPAC_MEMORY_TRACKING
-		"GPAC_MEMORY_TRACKING "
+	                       "GPAC_MEMORY_TRACKING "
 #endif
 #ifdef GPAC_BIG_ENDIAN
-		"GPAC_BIG_ENDIAN "
+	                       "GPAC_BIG_ENDIAN "
 #endif
 #ifdef GPAC_HAS_SSL
-		"GPAC_HAS_SSL "
+	                       "GPAC_HAS_SSL "
 #endif
 #ifdef GPAC_HAS_SPIDERMONKEY
-		"GPAC_HAS_SPIDERMONKEY "
+	                       "GPAC_HAS_SPIDERMONKEY "
 #endif
 #ifdef GPAC_HAS_JPEG
-		"GPAC_HAS_JPEG "
+	                       "GPAC_HAS_JPEG "
 #endif
 #ifdef GPAC_HAS_PNG
-		"GPAC_HAS_PNG "
+	                       "GPAC_HAS_PNG "
 #endif
 #ifdef GPAC_DISABLE_3D
-		"GPAC_DISABLE_3D "
+	                       "GPAC_DISABLE_3D "
 #endif
 #ifdef GPAC_USE_TINYGL
-		"GPAC_USE_TINYGL "
+	                       "GPAC_USE_TINYGL "
 #endif
 #ifdef GPAC_USE_OGL_ES
-		"GPAC_USE_OGL_ES "
+	                       "GPAC_USE_OGL_ES "
 #endif
 #if defined(_WIN32_WCE)
 #ifdef GPAC_USE_IGPP
-		"GPAC_USE_IGPP "
+	                       "GPAC_USE_IGPP "
 #endif
 #ifdef GPAC_USE_IGPP_HP
-		"GPAC_USE_IGPP_HP "
+	                       "GPAC_USE_IGPP_HP "
 #endif
 #endif
 #ifdef GPAC_DISABLE_SVG
-		"GPAC_DISABLE_SVG "
+	                       "GPAC_DISABLE_SVG "
 #endif
 #ifdef GPAC_DISABLE_VRML
-		"GPAC_DISABLE_VRML "
+	                       "GPAC_DISABLE_VRML "
 #endif
 #ifdef GPAC_MINIMAL_ODF
-		"GPAC_MINIMAL_ODF "
+	                       "GPAC_MINIMAL_ODF "
 #endif
 #ifdef GPAC_DISABLE_BIFS
-		"GPAC_DISABLE_BIFS "
+	                       "GPAC_DISABLE_BIFS "
 #endif
 #ifdef GPAC_DISABLE_QTVR
-		"GPAC_DISABLE_QTVR "
+	                       "GPAC_DISABLE_QTVR "
 #endif
 #ifdef GPAC_DISABLE_AVILIB
-		"GPAC_DISABLE_AVILIB "
+	                       "GPAC_DISABLE_AVILIB "
 #endif
 #ifdef GPAC_DISABLE_OGG
-		"GPAC_DISABLE_OGG "
+	                       "GPAC_DISABLE_OGG "
 #endif
 #ifdef GPAC_DISABLE_MPEG2PS
-		"GPAC_DISABLE_MPEG2PS "
+	                       "GPAC_DISABLE_MPEG2PS "
 #endif
 #ifdef GPAC_DISABLE_MPEG2PS
-		"GPAC_DISABLE_MPEG2TS "
+	                       "GPAC_DISABLE_MPEG2TS "
 #endif
 #ifdef GPAC_DISABLE_SENG
-		"GPAC_DISABLE_SENG "
+	                       "GPAC_DISABLE_SENG "
 #endif
 #ifdef GPAC_DISABLE_MEDIA_IMPORT
-		"GPAC_DISABLE_MEDIA_IMPORT "
+	                       "GPAC_DISABLE_MEDIA_IMPORT "
 #endif
 #ifdef GPAC_DISABLE_AV_PARSERS
-		"GPAC_DISABLE_AV_PARSERS "
+	                       "GPAC_DISABLE_AV_PARSERS "
 #endif
 #ifdef GPAC_DISABLE_MEDIA_EXPORT
-		"GPAC_DISABLE_MEDIA_EXPORT "
+	                       "GPAC_DISABLE_MEDIA_EXPORT "
 #endif
 #ifdef GPAC_DISABLE_SWF_IMPORT
-		"GPAC_DISABLE_SWF_IMPORT "
+	                       "GPAC_DISABLE_SWF_IMPORT "
 #endif
 #ifdef GPAC_DISABLE_SCENE_STATS
-		"GPAC_DISABLE_SCENE_STATS "
+	                       "GPAC_DISABLE_SCENE_STATS "
 #endif
 #ifdef GPAC_DISABLE_SCENE_DUMP
-		"GPAC_DISABLE_SCENE_DUMP "
+	                       "GPAC_DISABLE_SCENE_DUMP "
 #endif
 #ifdef GPAC_DISABLE_SCENE_ENCODER
-		"GPAC_DISABLE_SCENE_ENCODER "
+	                       "GPAC_DISABLE_SCENE_ENCODER "
 #endif
 #ifdef GPAC_DISABLE_LOADER_ISOM
-		"GPAC_DISABLE_LOADER_ISOM "
+	                       "GPAC_DISABLE_LOADER_ISOM "
 #endif
 #ifdef GPAC_DISABLE_OD_DUMP
-		"GPAC_DISABLE_OD_DUMP "
+	                       "GPAC_DISABLE_OD_DUMP "
 #endif
 #ifdef GPAC_DISABLE_MCRYPT
-		"GPAC_DISABLE_MCRYPT "
+	                       "GPAC_DISABLE_MCRYPT "
 #endif
 #ifdef GPAC_DISABLE_ISOM
-		"GPAC_DISABLE_MCRYPT "
+	                       "GPAC_DISABLE_MCRYPT "
 #endif
 #ifdef GPAC_DISABLE_ISOM_HINTING
-		"GPAC_DISABLE_ISOM_HINTING "
+	                       "GPAC_DISABLE_ISOM_HINTING "
 #endif
 #ifdef GPAC_DISABLE_ISOM_WRITE
-		"GPAC_DISABLE_ISOM_WRITE "
+	                       "GPAC_DISABLE_ISOM_WRITE "
 #endif
 #ifdef GPAC_DISABLE_ISOM_FRAGMENTS
-		"GPAC_DISABLE_ISOM_FRAGMENTS "
+	                       "GPAC_DISABLE_ISOM_FRAGMENTS "
 #endif
 #ifdef GPAC_DISABLE_LASER
-		"GPAC_DISABLE_LASER "
+	                       "GPAC_DISABLE_LASER "
 #endif
 #ifdef GPAC_DISABLE_STREAMING
-		"GPAC_DISABLE_STREAMING "
+	                       "GPAC_DISABLE_STREAMING "
 #endif
 
-;
+	                       ;
 	return features;
 }
+
+
+static const struct lang_def {
+	const char *name;
+	const char *three_char_code;
+	const char *two_char_code;
+} defined_languages [] =
+{
+	{ "Abkhazian","abk","ab"} ,
+	{ "Achinese","ace",""} ,
+	{ "Acoli","ach",""} ,
+	{ "Adangme","ada",""} ,
+	{ "Adyghe; Adygei","ady",""} ,
+	{ "Afar","aar","aa"} ,
+	{ "Afrihili","afh",""} ,
+	{ "Afrikaans","afr","af"} ,
+	{ "Afro-Asiatic languages","afa",""} ,
+	{ "Ainu","ain",""} ,
+	{ "Akan","aka","ak"} ,
+	{ "Akkadian","akk",""} ,
+	{ "Albanian","sqi","sq"} ,
+	{ "Aleut","ale",""} ,
+	{ "Algonquian languages","alg",""} ,
+	{ "Altaic languages","tut",""} ,
+	{ "Amharic","amh","am"} ,
+	{ "Angika","anp",""} ,
+	{ "Apache languages","apa",""} ,
+	{ "Arabic","ara","ar"} ,
+	{ "Aragonese","arg","an"} ,
+	{ "Arapaho","arp",""} ,
+	{ "Arawak","arw",""} ,
+	{ "Armenian","hye","hy"} ,
+	{ "Aromanian; Arumanian; Macedo-Romanian","rup",""} ,
+	{ "Artificial languages","art",""} ,
+	{ "Assamese","asm","as"} ,
+	{ "Asturian; Bable; Leonese; Asturleonese","ast",""} ,
+	{ "Athapascan languages","ath",""} ,
+	{ "Australian languages","aus",""} ,
+	{ "Austronesian languages","map",""} ,
+	{ "Avaric","ava","av"} ,
+	{ "Avestan","ave","ae"} ,
+	{ "Awadhi","awa",""} ,
+	{ "Aymara","aym","ay"} ,
+	{ "Azerbaijani","aze","az"} ,
+	{ "Balinese","ban",""} ,
+	{ "Baltic languages","bat",""} ,
+	{ "Baluchi","bal",""} ,
+	{ "Bambara","bam","bm"} ,
+	{ "Bamileke languages","bai",""} ,
+	{ "Banda languages","bad",""} ,
+	{ "Bantu languages","bnt",""} ,
+	{ "Basa","bas",""} ,
+	{ "Bashkir","bak","ba"} ,
+	{ "Basque","eus","eu"} ,
+	{ "Batak languages","btk",""} ,
+	{ "Beja; Bedawiyet","bej",""} ,
+	{ "Belarusian","bel","be"} ,
+	{ "Bemba","bem",""} ,
+	{ "Bengali","ben","bn"} ,
+	{ "Berber languages","ber",""} ,
+	{ "Bhojpuri","bho",""} ,
+	{ "Bihari languages","bih","bh"} ,
+	{ "Bikol","bik",""} ,
+	{ "Bini; Edo","bin",""} ,
+	{ "Bislama","bis","bi"} ,
+	{ "Blin; Bilin","byn",""} ,
+	{ "Blissymbols; Blissymbolics; Bliss","zbl",""} ,
+	{ "Bokmål, Norwegian; Norwegian Bokmal","nob","nb"} ,
+	{ "Bosnian","bos","bs"} ,
+	{ "Braj","bra",""} ,
+	{ "Breton","bre","br"} ,
+	{ "Buginese","bug",""} ,
+	{ "Bulgarian","bul","bg"} ,
+	{ "Buriat","bua",""} ,
+	{ "Burmese","mya","my"} ,
+	{ "Caddo","cad",""} ,
+	{ "Catalan; Valencian","cat","ca"} ,
+	{ "Caucasian languages","cau",""} ,
+	{ "Cebuano","ceb",""} ,
+	{ "Celtic languages","cel",""} ,
+	{ "Central American Indian languages","cai",""} ,
+	{ "Central Khmer","khm","km"} ,
+	{ "Chagatai","chg",""} ,
+	{ "Chamic languages","cmc",""} ,
+	{ "Chamorro","cha","ch"} ,
+	{ "Chechen","che","ce"} ,
+	{ "Cherokee","chr",""} ,
+	{ "Cheyenne","chy",""} ,
+	{ "Chibcha","chb",""} ,
+	{ "Chichewa; Chewa; Nyanja","nya","ny"} ,
+	{ "Chinese","zho","zh"} ,
+	{ "Chinook jargon","chn",""} ,
+	{ "Chipewyan; Dene Suline","chp",""} ,
+	{ "Choctaw","cho",""} ,
+	{ "Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church}  S{ lavonic","chu","cu"} ,
+	{ "Chuukese","chk",""} ,
+	{ "Chuvash","chv","cv"} ,
+	{ "Classical Newari; Old Newari; Classical Nepal Bhasa","nwc",""} ,
+	{ "Classical Syriac","syc",""} ,
+	{ "Coptic","cop",""} ,
+	{ "Cornish","cor","kw"} ,
+	{ "Corsican","cos","co"} ,
+	{ "Cree","cre","cr"} ,
+	{ "Creek","mus",""} ,
+	{ "Creoles and pidgins","crp",""} ,
+	{ "Creoles and pidgins, English based","cpe",""} ,
+	{ "Creoles and pidgins, French-based","cpf",""} ,
+	{ "Creoles and pidgins, Portuguese-based","cpp",""} ,
+	{ "Crimean Tatar; Crimean Turkish","crh",""} ,
+	{ "Croatian","hrv","hr"} ,
+	{ "Cushitic languages","cus",""} ,
+	{ "Czech","ces","cs"} ,
+	{ "Dakota","dak",""} ,
+	{ "Danish","dan","da"} ,
+	{ "Dargwa","dar",""} ,
+	{ "Delaware","del",""} ,
+	{ "Dinka","din",""} ,
+	{ "Divehi; Dhivehi; Maldivian","div","dv"} ,
+	{ "Dogri","doi",""} ,
+	{ "Dogrib","dgr",""} ,
+	{ "Dravidian languages","dra",""} ,
+	{ "Duala","dua",""} ,
+	{ "Dutch, Middle (ca.1050-1350)","dum",""} ,
+	{ "Dutch; Flemish","nld","nl"} ,
+	{ "Dyula","dyu",""} ,
+	{ "Dzongkha","dzo","dz"} ,
+	{ "Eastern Frisian","frs",""} ,
+	{ "Efik","efi",""} ,
+	{ "Egyptian (Ancient)","egy",""} ,
+	{ "Ekajuk","eka",""} ,
+	{ "Elamite","elx",""} ,
+	{ "English","eng","en"} ,
+	{ "English, Middle (1100-1500)","enm",""} ,
+	{ "English, Old (ca.450-1100)","ang",""} ,
+	{ "Erzya","myv",""} ,
+	{ "Esperanto","epo","eo"} ,
+	{ "Estonian","est","et"} ,
+	{ "Ewe","ewe","ee"} ,
+	{ "Ewondo","ewo",""} ,
+	{ "Fang","fan",""} ,
+	{ "Fanti","fat",""} ,
+	{ "Faroese","fao","fo"} ,
+	{ "Fijian","fij","fj"} ,
+	{ "Filipino; Pilipino","fil",""} ,
+	{ "Finnish","fin","fi"} ,
+	{ "Finno-Ugrian languages","fiu",""} ,
+	{ "Fon","fon",""} ,
+	{ "French","fra","fr"} ,
+	{ "French, Middle (ca.1400-1600)","frm",""} ,
+	{ "French, Old (842-ca.1400)","fro",""} ,
+	{ "Friulian","fur",""} ,
+	{ "Fulah","ful","ff"} ,
+	{ "Ga","gaa",""} ,
+	{ "Gaelic; Scottish Gaelic","gla","gd"} ,
+	{ "Galibi Carib","car",""} ,
+	{ "Galician","glg","gl"} ,
+	{ "Ganda","lug","lg"} ,
+	{ "Gayo","gay",""} ,
+	{ "Gbaya","gba",""} ,
+	{ "Geez","gez",""} ,
+	{ "Georgian","kat","ka"} ,
+	{ "German","deu","de"} ,
+	{ "German, Middle High (ca.1050-1500)","gmh",""} ,
+	{ "German, Old High (ca.750-1050)","goh",""} ,
+	{ "Germanic languages","gem",""} ,
+	{ "Gilbertese","gil",""} ,
+	{ "Gondi","gon",""} ,
+	{ "Gorontalo","gor",""} ,
+	{ "Gothic","got",""} ,
+	{ "Grebo","grb",""} ,
+	{ "Greek, Ancient (to 1453)","grc",""} ,
+	{ "Greek, Modern (1453-)","ell","el"} ,
+	{ "Guarani","grn","gn"} ,
+	{ "Gujarati","guj","gu"} ,
+	{ "Gwich'in","gwi",""} ,
+	{ "Haida","hai",""} ,
+	{ "Haitian; Haitian Creole","hat","ht"} ,
+	{ "Hausa","hau","ha"} ,
+	{ "Hawaiian","haw",""} ,
+	{ "Hebrew","heb","he"} ,
+	{ "Herero","her","hz"} ,
+	{ "Hiligaynon","hil",""} ,
+	{ "Himachali languages; Western Pahari languages","him",""} ,
+	{ "Hindi","hin","hi"} ,
+	{ "Hiri Motu","hmo","ho"} ,
+	{ "Hittite","hit",""} ,
+	{ "Hmong; Mong","hmn",""} ,
+	{ "Hungarian","hun","hu"} ,
+	{ "Hupa","hup",""} ,
+	{ "Iban","iba",""} ,
+	{ "Icelandic","isl","is"} ,
+	{ "Ido","ido","io"} ,
+	{ "Igbo","ibo","ig"} ,
+	{ "Ijo languages","ijo",""} ,
+	{ "Iloko","ilo",""} ,
+	{ "Inari Sami","smn",""} ,
+	{ "Indic languages","inc",""} ,
+	{ "Indo-European languages","ine",""} ,
+	{ "Indonesian","ind","id"} ,
+	{ "Ingush","inh",""} ,
+	{ "Interlingua (International Auxiliary Language Association)","ina","ia"} ,
+	{ "Interlingue; Occidental","ile","ie"} ,
+	{ "Inuktitut","iku","iu"} ,
+	{ "Inupiaq","ipk","ik"} ,
+	{ "Iranian languages","ira",""} ,
+	{ "Irish","gle","ga"} ,
+	{ "Irish, Middle (900-1200)","mga",""} ,
+	{ "Irish, Old (to 900)","sga",""} ,
+	{ "Iroquoian languages","iro",""} ,
+	{ "Italian","ita","it"} ,
+	{ "Japanese","jpn","ja"} ,
+	{ "Javanese","jav","jv"} ,
+	{ "Judeo-Arabic","jrb",""} ,
+	{ "Judeo-Persian","jpr",""} ,
+	{ "Kabardian","kbd",""} ,
+	{ "Kabyle","kab",""} ,
+	{ "Kachin; Jingpho","kac",""} ,
+	{ "Kalaallisut; Greenlandic","kal","kl"} ,
+	{ "Kalmyk; Oirat","xal",""} ,
+	{ "Kamba","kam",""} ,
+	{ "Kannada","kan","kn"} ,
+	{ "Kanuri","kau","kr"} ,
+	{ "Kara-Kalpak","kaa",""} ,
+	{ "Karachay-Balkar","krc",""} ,
+	{ "Karelian","krl",""} ,
+	{ "Karen languages","kar",""} ,
+	{ "Kashmiri","kas","ks"} ,
+	{ "Kashubian","csb",""} ,
+	{ "Kawi","kaw",""} ,
+	{ "Kazakh","kaz","kk"} ,
+	{ "Khasi","kha",""} ,
+	{ "Khoisan languages","khi",""} ,
+	{ "Khotanese; Sakan","kho",""} ,
+	{ "Kikuyu; Gikuyu","kik","ki"} ,
+	{ "Kimbundu","kmb",""} ,
+	{ "Kinyarwanda","kin","rw"} ,
+	{ "Kirghiz; Kyrgyz","kir","ky"} ,
+	{ "Klingon; tlhIngan-Hol","tlh",""} ,
+	{ "Komi","kom","kv"} ,
+	{ "Kongo","kon","kg"} ,
+	{ "Konkani","kok",""} ,
+	{ "Korean","kor","ko"} ,
+	{ "Kosraean","kos",""} ,
+	{ "Kpelle","kpe",""} ,
+	{ "Kru languages","kro",""} ,
+	{ "Kuanyama; Kwanyama","kua","kj"} ,
+	{ "Kumyk","kum",""} ,
+	{ "Kurdish","kur","ku"} ,
+	{ "Kurukh","kru",""} ,
+	{ "Kutenai","kut",""} ,
+	{ "Ladino","lad",""} ,
+	{ "Lahnda","lah",""} ,
+	{ "Lamba","lam",""} ,
+	{ "Land Dayak languages","day",""} ,
+	{ "Lao","lao","lo"} ,
+	{ "Latin","lat","la"} ,
+	{ "Latvian","lav","lv"} ,
+	{ "Lezghian","lez",""} ,
+	{ "Limburgan; Limburger; Limburgish","lim","li"} ,
+	{ "Lingala","lin","ln"} ,
+	{ "Lithuanian","lit","lt"} ,
+	{ "Lojban","jbo",""} ,
+	{ "Low German; Low Saxon; German, Low; Saxon, Low","nds",""} ,
+	{ "Lower Sorbian","dsb",""} ,
+	{ "Lozi","loz",""} ,
+	{ "Luba-Katanga","lub","lu"} ,
+	{ "Luba-Lulua","lua",""} ,
+	{ "Luiseno","lui",""} ,
+	{ "Lule Sami","smj",""} ,
+	{ "Lunda","lun",""} ,
+	{ "Luo (Kenya and Tanzania)","luo",""} ,
+	{ "Lushai","lus",""} ,
+	{ "Luxembourgish; Letzeburgesch","ltz","lb"} ,
+	{ "Macedonian","mkd","mk"} ,
+	{ "Madurese","mad",""} ,
+	{ "Magahi","mag",""} ,
+	{ "Maithili","mai",""} ,
+	{ "Makasar","mak",""} ,
+	{ "Malagasy","mlg","mg"} ,
+	{ "Malay","msa","ms"} ,
+	{ "Malayalam","mal","ml"} ,
+	{ "Maltese","mlt","mt"} ,
+	{ "Manchu","mnc",""} ,
+	{ "Mandar","mdr",""} ,
+	{ "Mandingo","man",""} ,
+	{ "Manipuri","mni",""} ,
+	{ "Manobo languages","mno",""} ,
+	{ "Manx","glv","gv"} ,
+	{ "Maori","mri","mi"} ,
+	{ "Mapudungun; Mapuche","arn",""} ,
+	{ "Marathi","mar","mr"} ,
+	{ "Mari","chm",""} ,
+	{ "Marshallese","mah","mh"} ,
+	{ "Marwari","mwr",""} ,
+	{ "Masai","mas",""} ,
+	{ "Mayan languages","myn",""} ,
+	{ "Mende","men",""} ,
+	{ "Mi'kmaq; Micmac","mic",""} ,
+	{ "Minangkabau","min",""} ,
+	{ "Mirandese","mwl",""} ,
+	{ "Mohawk","moh",""} ,
+	{ "Moksha","mdf",""} ,
+	{ "Mon-Khmer languages","mkh",""} ,
+	{ "Mongo","lol",""} ,
+	{ "Mongolian","mon","mn"} ,
+	{ "Mossi","mos",""} ,
+	{ "Multiple languages","mul",""} ,
+	{ "Munda languages","mun",""} ,
+	{ "N'Ko","nqo",""} ,
+	{ "Nahuatl languages","nah",""} ,
+	{ "Nauru","nau","na"} ,
+	{ "Navajo; Navaho","nav","nv"} ,
+	{ "Ndebele, North; North Ndebele","nde","nd"} ,
+	{ "Ndebele, South; South Ndebele","nbl","nr"} ,
+	{ "Ndonga","ndo","ng"} ,
+	{ "Neapolitan","nap",""} ,
+	{ "Nepal Bhasa; Newari","new",""} ,
+	{ "Nepali","nep","ne"} ,
+	{ "Nias","nia",""} ,
+	{ "Niger-Kordofanian languages","nic",""} ,
+	{ "Nilo-Saharan languages","ssa",""} ,
+	{ "Niuean","niu",""} ,
+	{ "No linguistic content; Not applicable","zxx",""} ,
+	{ "Nogai","nog",""} ,
+	{ "Norse, Old","non",""} ,
+	{ "North American Indian languages","nai",""} ,
+	{ "Northern Frisian","frr",""} ,
+	{ "Northern Sami","sme","se"} ,
+	{ "Norwegian","nor","no"} ,
+	{ "Norwegian Nynorsk; Nynorsk, Norwegian","nno","nn"} ,
+	{ "Nubian languages","nub",""} ,
+	{ "Nyamwezi","nym",""} ,
+	{ "Nyankole","nyn",""} ,
+	{ "Nyoro","nyo",""} ,
+	{ "Nzima","nzi",""} ,
+	{ "Occitan (post 1500)","oci","oc"} ,
+	{ "Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)","arc",""} ,
+	{ "Ojibwa","oji","oj"} ,
+	{ "Oriya","ori","or"} ,
+	{ "Oromo","orm","om"} ,
+	{ "Osage","osa",""} ,
+	{ "Ossetian; Ossetic","oss","os"} ,
+	{ "Otomian languages","oto",""} ,
+	{ "Pahlavi","pal",""} ,
+	{ "Palauan","pau",""} ,
+	{ "Pali","pli","pi"} ,
+	{ "Pampanga; Kapampangan","pam",""} ,
+	{ "Pangasinan","pag",""} ,
+	{ "Panjabi; Punjabi","pan","pa"} ,
+	{ "Papiamento","pap",""} ,
+	{ "Papuan languages","paa",""} ,
+	{ "Pedi; Sepedi; Northern Sotho","nso",""} ,
+	{ "Persian","fas","fa"} ,
+	{ "Persian, Old (ca.600-400 B.C.)","peo",""} ,
+	{ "Philippine languages","phi",""} ,
+	{ "Phoenician","phn",""} ,
+	{ "Pohnpeian","pon",""} ,
+	{ "Polish","pol","pl"} ,
+	{ "Portuguese","por","pt"} ,
+	{ "Prakrit languages","pra",""} ,
+	//{ "Provençal, Old (to 1500);Occitan, Old (to 1500)","pro",""} ,
+	{ "Pushto; Pashto","pus","ps"} ,
+	{ "Quechua","que","qu"} ,
+	{ "Rajasthani","raj",""} ,
+	{ "Rapanui","rap",""} ,
+	{ "Rarotongan; Cook Islands Maori","rar",""} ,
+	{ "Reserved for local use","qaa-qtz",""} ,
+	{ "Romance languages","roa",""} ,
+	{ "Romanian; Moldavian; Moldovan","ron","ro"} ,
+	{ "Romansh","roh","rm"} ,
+	{ "Romany","rom",""} ,
+	{ "Rundi","run","rn"} ,
+	{ "Russian","rus","ru"} ,
+	{ "Salishan languages","sal",""} ,
+	{ "Samaritan Aramaic","sam",""} ,
+	{ "Sami languages","smi",""} ,
+	{ "Samoan","smo","sm"} ,
+	{ "Sandawe","sad",""} ,
+	{ "Sango","sag","sg"} ,
+	{ "Sanskrit","san","sa"} ,
+	{ "Santali","sat",""} ,
+	{ "Sardinian","srd","sc"} ,
+	{ "Sasak","sas",""} ,
+	{ "Scots","sco",""} ,
+	{ "Selkup","sel",""} ,
+	{ "Semitic languages","sem",""} ,
+	{ "Serbian","srp","sr"} ,
+	{ "Serer","srr",""} ,
+	{ "Shan","shn",""} ,
+	{ "Shona","sna","sn"} ,
+	{ "Sichuan Yi; Nuosu","iii","ii"} ,
+	{ "Sicilian","scn",""} ,
+	{ "Sidamo","sid",""} ,
+	{ "Sign Languages","sgn",""} ,
+	{ "Siksika","bla",""} ,
+	{ "Sindhi","snd","sd"} ,
+	{ "Sinhala; Sinhalese","sin","si"} ,
+	{ "Sino-Tibetan languages","sit",""} ,
+	{ "Siouan languages","sio",""} ,
+	{ "Skolt Sami","sms",""} ,
+	{ "Slave (Athapascan)","den",""} ,
+	{ "Slavic languages","sla",""} ,
+	{ "Slovak","slk","sk"} ,
+	{ "Slovenian","slv","sl"} ,
+	{ "Sogdian","sog",""} ,
+	{ "Somali","som","so"} ,
+	{ "Songhai languages","son",""} ,
+	{ "Soninke","snk",""} ,
+	{ "Sorbian languages","wen",""} ,
+	{ "Sotho, Southern","sot","st"} ,
+	{ "South American Indian languages","sai",""} ,
+	{ "Southern Altai","alt",""} ,
+	{ "Southern Sami","sma",""} ,
+	{ "Spanish; Castilian","spa","es"} ,
+	{ "Sranan Tongo","srn",""} ,
+	{ "Sukuma","suk",""} ,
+	{ "Sumerian","sux",""} ,
+	{ "Sundanese","sun","su"} ,
+	{ "Susu","sus",""} ,
+	{ "Swahili","swa","sw"} ,
+	{ "Swati","ssw","ss"} ,
+	{ "Swedish","swe","sv"} ,
+	{ "Swiss German; Alemannic; Alsatian","gsw",""} ,
+	{ "Syriac","syr",""} ,
+	{ "Tagalog","tgl","tl"} ,
+	{ "Tahitian","tah","ty"} ,
+	{ "Tai languages","tai",""} ,
+	{ "Tajik","tgk","tg"} ,
+	{ "Tamashek","tmh",""} ,
+	{ "Tamil","tam","ta"} ,
+	{ "Tatar","tat","tt"} ,
+	{ "Telugu","tel","te"} ,
+	{ "Tereno","ter",""} ,
+	{ "Tetum","tet",""} ,
+	{ "Thai","tha","th"} ,
+	{ "Tibetan","bod","bo"} ,
+	{ "Tigre","tig",""} ,
+	{ "Tigrinya","tir","ti"} ,
+	{ "Timne","tem",""} ,
+	{ "Tiv","tiv",""} ,
+	{ "Tlingit","tli",""} ,
+	{ "Tok Pisin","tpi",""} ,
+	{ "Tokelau","tkl",""} ,
+	{ "Tonga (Nyasa)","tog",""} ,
+	{ "Tonga (Tonga Islands)","ton","to"} ,
+	{ "Tsimshian","tsi",""} ,
+	{ "Tsonga","tso","ts"} ,
+	{ "Tswana","tsn","tn"} ,
+	{ "Tumbuka","tum",""} ,
+	{ "Tupi languages","tup",""} ,
+	{ "Turkish","tur","tr"} ,
+	{ "Turkish, Ottoman (1500-1928)","ota",""} ,
+	{ "Turkmen","tuk","tk"} ,
+	{ "Tuvalu","tvl",""} ,
+	{ "Tuvinian","tyv",""} ,
+	{ "Twi","twi","tw"} ,
+	{ "Udmurt","udm",""} ,
+	{ "Ugaritic","uga",""} ,
+	{ "Uighur; Uyghur","uig","ug"} ,
+	{ "Ukrainian","ukr","uk"} ,
+	{ "Umbundu","umb",""} ,
+	{ "Uncoded languages","mis",""} ,
+	{ "Undetermined","und",""} ,
+	{ "Upper Sorbian","hsb",""} ,
+	{ "Urdu","urd","ur"} ,
+	{ "Uzbek","uzb","uz"} ,
+	{ "Vai","vai",""} ,
+	{ "Venda","ven","ve"} ,
+	{ "Vietnamese","vie","vi"} ,
+	//{ "Volapük","vol","vo"} ,
+	{ "Votic","vot",""} ,
+	{ "Wakashan languages","wak",""} ,
+	{ "Walloon","wln","wa"} ,
+	{ "Waray","war",""} ,
+	{ "Washo","was",""} ,
+	{ "Welsh","cym","cy"} ,
+	{ "Western Frisian","fry","fy"} ,
+	{ "Wolaitta; Wolaytta","wal",""} ,
+	{ "Wolof","wol","wo"} ,
+	{ "Xhosa","xho","xh"} ,
+	{ "Yakut","sah",""} ,
+	{ "Yao","yao",""} ,
+	{ "Yapese","yap",""} ,
+	{ "Yiddish","yid","yi"} ,
+	{ "Yoruba","yor","yo"} ,
+	{ "Yupik languages","ypk",""} ,
+	{ "Zande languages","znd",""} ,
+	{ "Zapotec","zap",""} ,
+	{ "Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki","zza",""} ,
+	{ "Zenaga","zen",""} ,
+	{ "Zhuang; Chuang","zha","za"} ,
+	{ "Zulu","zul","zu"} ,
+	{ "Zuni","zun",""} ,
+};
+
+
+GF_EXPORT
+u32 gf_lang_get_count()
+{
+	return sizeof(defined_languages) / sizeof(struct lang_def);
+}
+
+GF_EXPORT
+s32 gf_lang_find(const char *lang_or_rfc_5646_code)
+{
+	//find the language ISO639 entry for the given code
+	u32 i=0;
+	u32 len=0;
+	char *sep;
+	u32 count = sizeof(defined_languages) / sizeof(struct lang_def);
+
+
+	len = 0;
+	sep = (char *) strchr(lang_or_rfc_5646_code, '-');
+	if (sep) {
+		sep[0] = 0;
+		len = (u32) strlen(lang_or_rfc_5646_code);
+		sep[0] = '-';
+	}
+
+	for (i=0; i<count; i++) {
+		if (!strcmp(defined_languages[i].name, lang_or_rfc_5646_code)) {
+			return i;
+		}
+		if (sep && (len==3) && !strnicmp(defined_languages[i].three_char_code, lang_or_rfc_5646_code, 3)) {
+			return i;
+		}
+		if (sep && (len==2) && !strnicmp(defined_languages[i].two_char_code, lang_or_rfc_5646_code, 2)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+GF_EXPORT
+const char *gf_lang_get_name(u32 idx)
+{
+	if (idx>=sizeof(defined_languages) / sizeof(struct lang_def)) return NULL;
+	return defined_languages[idx].name;
+}
+
+GF_EXPORT
+const char *gf_lang_get_2cc(u32 idx)
+{
+	if (idx>=sizeof(defined_languages) / sizeof(struct lang_def)) return NULL;
+	return defined_languages[idx].two_char_code;
+}
+
+GF_EXPORT
+const char *gf_lang_get_3cc(u32 idx)
+{
+	if (idx>=sizeof(defined_languages) / sizeof(struct lang_def)) return NULL;
+	return defined_languages[idx].three_char_code;
+}

gpac-0.5.0.svn5178.tar.bz2/src/utils/gzio.cpp -> gpac-0.5.1.svn5491.tar.xz/src/utils/gzio.cpp Changed

@@ -21,7 +21,9 @@
 
 #ifndef NO_DUMMY_DECL
 #ifndef __SYMBIAN32__
-struct internal_state {int dummy;}; /* for buggy compilers */
+struct internal_state {
+	int dummy;
+}; /* for buggy compilers */
 #endif
 #endif
 
@@ -38,7 +40,7 @@
 
 #ifdef __MVS__
 #  pragma map (fdopen , "\174\174FDOPEN")
-   FILE *fdopen(int, const char *);
+FILE *fdopen(int, const char *);
 #endif
 
 #ifndef STDC
@@ -61,16 +63,17 @@
 
 
 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) */
-""};
+	"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
@@ -79,22 +82,22 @@
 #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 */
+	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;
 
 
@@ -117,111 +120,111 @@
 */
 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') {
+	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;
+		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 */
+		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);
+		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;
+		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;
 }
 
 /* ===========================================================================
@@ -230,7 +233,7 @@
 GZ_EXPORT
 gzFile gzopen (const char *path, const char *mode)
 {
-    return gz_open (path, mode, -1);
+	return gz_open (path, mode, -1);
 }
 
 /* ===========================================================================
@@ -240,12 +243,12 @@
 GZ_EXPORT
 gzFile gzdopen (int fd, const char *mode)
 {
-    char name[46];      /* allow for up to 128-bit integers */
+	char name[46];      /* allow for up to 128-bit integers */
 
-    if (fd < 0) return (gzFile)Z_NULL;
-    sprintf(name, "<fd:%d>", fd); /* for debugging */
+	if (fd < 0) return (gzFile)Z_NULL;
+	sprintf(name, "<fd:%d>", fd); /* for debugging */
 
-    return gz_open (name, mode, fd);
+	return gz_open (name, mode, fd);
 }
 
 /* ===========================================================================
@@ -253,21 +256,21 @@
  */
 int gzsetparams (gzFile file, int level, int strategy)
 {
-    gz_stream *s = (gz_stream*)file;
+	gz_stream *s = (gz_stream*)file;
 
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+	if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
 
-    /* Make room to allow flushing */
-    if (s->stream.avail_out == 0) {
+	/* 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;
-    }
+		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);
+	return deflateParams (&(s->stream), level, strategy);
 }
 
 /* ===========================================================================
@@ -277,19 +280,19 @@
 */
 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)++;
+	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)++;
 }
 
 /* ===========================================================================
@@ -303,205 +306,205 @@
 */
 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;
+	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.
- */
+/* ===========================================================================
+* 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;
+	int err = Z_OK;
 
-    if (!s) return Z_STREAM_ERROR;
+	if (!s) return Z_STREAM_ERROR;
 
-    TRYFREE(s->msg);
+	TRYFREE(s->msg);
 
-    if (s->stream.state != NULL) {
-        if (s->mode == 'w') {
+	if (s->stream.state != NULL) {
+		if (s->mode == 'w') {
 #ifdef NO_GZCOMPRESS
-            err = Z_STREAM_ERROR;
+			err = Z_STREAM_ERROR;
 #else
-            err = deflateEnd(&(s->stream));
+			err = deflateEnd(&(s->stream));
 #endif
-        } else if (s->mode == 'r') {
-            err = inflateEnd(&(s->stream));
-        }
-    }
-    if (s->file != NULL && fclose(s->file)) {
+		} else if (s->mode == 'r') {
+			err = inflateEnd(&(s->stream));
+		}
+	}
+	if (s->file != NULL && fclose(s->file)) {
 #ifdef ESPIPE
-        if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
+		if (errno != ESPIPE) /* 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;
+			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);
+	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);
 }
 
 
@@ -511,9 +514,9 @@
 */
 int gzgetc(gzFile file)
 {
-    unsigned char c;
+	unsigned char c;
 
-    return gzread(file, &c, 1) == 1 ? c : -1;
+	return gzread(file, &c, 1) == 1 ? c : -1;
 }
 
 
@@ -522,15 +525,15 @@
 */
 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;
+	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;
 }
 
 
@@ -545,12 +548,12 @@
 */
 char * gzgets(gzFile file, char *buf, int len)
 {
-    char *b = buf;
-    if (buf == Z_NULL || len <= 0) return Z_NULL;
+	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;
+	while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
+	*buf = '\0';
+	return b == buf && len > 0 ? Z_NULL : b;
 }
 
 
@@ -561,34 +564,34 @@
 */
 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);
+	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);
 }
 
 
@@ -602,69 +605,69 @@
 
 int gzprintf (gzFile file, const char *format, /* args */ ...)
 {
-    char buf[Z_PRINTF_BUFSIZE];
-    va_list va;
-    int len = 0;
+	char buf[Z_PRINTF_BUFSIZE];
+	va_list va;
+	int len = 0;
 
-    buf[sizeof(buf) - 1] = 0;
-    va_start(va, format);
+	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;
+	(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);
+	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);
+	(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);
+	//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);
+	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)
+              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;
+	char buf[Z_PRINTF_BUFSIZE];
+	int len;
 
-    buf[sizeof(buf) - 1] = 0;
+	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;
+	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);
+	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);
+	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);
+	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);
+	if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
+		return 0;
+	return gzwrite(file, buf, len);
 }
 #endif
 
@@ -674,9 +677,9 @@
 */
 int gzputc(gzFile file, int c)
 {
-    unsigned char cc = (unsigned char) c; /* required for big endian systems */
+	unsigned char cc = (unsigned char) c; /* required for big endian systems */
 
-    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
+	return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
 }
 
 
@@ -687,7 +690,7 @@
 */
 int gzputs(gzFile file, const char *s)
 {
-    return gzwrite(file, (char*)s, (unsigned)strlen(s));
+	return gzwrite(file, (char*)s, (unsigned)strlen(s));
 }
 
 
@@ -697,51 +700,51 @@
 */
 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;
+	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);
+	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;
+	if (err) return err;
+	fflush(s->file);
+	return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 #endif /* NO_GZCOMPRESS */
 
@@ -750,20 +753,20 @@
 */
 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);
+	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);
 }
 
 /* ===========================================================================
@@ -776,86 +779,86 @@
 */
 z_off_t gzseek (gzFile file, z_off_t offset, int whence)
 {
-    gz_stream *s = (gz_stream*)file;
+	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 == NULL || whence == SEEK_END ||
+	        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
+		return -1L;
+	}
 
-    if (s->mode == 'w') {
+	if (s->mode == 'w') {
 #ifdef NO_GZCOMPRESS
-        return -1L;
+		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;
+		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;
+	}
+	/* 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;
 }
 
 /* ===========================================================================
@@ -865,7 +868,7 @@
 */
 z_off_t gztell (gzFile file)
 {
-    return gzseek(file, 0L, SEEK_CUR);
+	return gzseek(file, 0L, SEEK_CUR);
 }
 
 /* ===========================================================================
@@ -875,15 +878,15 @@
 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;
+	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;
 }
 
 /* ===========================================================================
@@ -891,10 +894,10 @@
 */
 int gzdirect (gzFile file)
 {
-    gz_stream *s = (gz_stream*)file;
+	gz_stream *s = (gz_stream*)file;
 
-    if (s == NULL || s->mode != 'r') return 0;
-    return s->transparent;
+	if (s == NULL || s->mode != 'r') return 0;
+	return s->transparent;
 }
 
 /* ===========================================================================
@@ -902,11 +905,11 @@
 */
 local void putLong (FILE *file, uLong x)
 {
-    int n;
-    for (n = 0; n < 4; n++) {
-        fputc((int)(x & 0xff), file);
-        x >>= 8;
-    }
+	int n;
+	for (n = 0; n < 4; n++) {
+		fputc((int)(x & 0xff), file);
+		x >>= 8;
+	}
 }
 
 /* ===========================================================================
@@ -915,15 +918,15 @@
 */
 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;
+	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;
 }
 
 /* ===========================================================================
@@ -933,22 +936,22 @@
 GZ_EXPORT
 int gzclose (gzFile file)
 {
-    gz_stream *s = (gz_stream*)file;
+	gz_stream *s = (gz_stream*)file;
 
-    if (s == NULL) return Z_STREAM_ERROR;
+	if (s == NULL) return Z_STREAM_ERROR;
 
-    if (s->mode == 'w') {
+	if (s->mode == 'w') {
 #ifdef NO_GZCOMPRESS
-        return Z_STREAM_ERROR;
+		return Z_STREAM_ERROR;
 #else
-        if (do_flush (file, Z_FINISH) != Z_OK)
-            return destroy((gz_stream*)file);
+		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));
+		putLong (s->file, s->crc);
+		putLong (s->file, (uLong)(s->in & 0xffffffff));
 #endif
-    }
-    return destroy((gz_stream*)file);
+	}
+	return destroy((gz_stream*)file);
 }
 
 #ifdef STDC
@@ -966,27 +969,27 @@
 */
 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;
+	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;
 }
 
 /* ===========================================================================
@@ -994,10 +997,10 @@
 */
 void gzclearerr (gzFile file)
 {
-    gz_stream *s = (gz_stream*)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);
+	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.5.0.svn5178.tar.bz2/src/utils/list.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/list.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -99,7 +99,7 @@
 GF_Err gf_list_add(GF_List *ptr, void* item)
 {
 	ItemSlot *entry;
-    if (! ptr) return GF_BAD_PARAM;
+	if (! ptr) return GF_BAD_PARAM;
 	entry = (ItemSlot *) gf_malloc(sizeof(ItemSlot));
 	if (!entry) return GF_OUT_OF_MEM;
 	entry->data = item;
@@ -162,7 +162,7 @@
 	u32 i;
 
 	/* !! if head is null (empty list)*/
-	if ( (! ptr) || (! ptr->head) || (ptr->head && !ptr->entryCount) || (itemNumber >= ptr->entryCount) ) 
+	if ( (! ptr) || (! ptr->head) || (ptr->head && !ptr->entryCount) || (itemNumber >= ptr->entryCount) )
 		return GF_BAD_PARAM;
 
 	/*we delete the head*/
@@ -297,7 +297,7 @@
 GF_Err gf_list_add(GF_List *ptr, void* item)
 {
 	ItemSlot *entry;
-    if (! ptr) return GF_BAD_PARAM;
+	if (! ptr) return GF_BAD_PARAM;
 	entry = (ItemSlot *) gf_malloc(sizeof(ItemSlot));
 	if (!entry) return GF_OUT_OF_MEM;
 	entry->data = item;
@@ -368,7 +368,7 @@
 	u32 i;
 
 	/* !! if head is null (empty list)*/
-	if ( (! ptr) || (! ptr->head) || (ptr->head && !ptr->entryCount) || (itemNumber >= ptr->entryCount) ) 
+	if ( (! ptr) || (! ptr->head) || (ptr->head && !ptr->entryCount) || (itemNumber >= ptr->entryCount) )
 		return GF_BAD_PARAM;
 
 	/*we delete the head*/
@@ -501,7 +501,7 @@
 GF_EXPORT
 GF_Err gf_list_add(GF_List *ptr, void* item)
 {
-    if (! ptr) return GF_BAD_PARAM;
+	if (! ptr) return GF_BAD_PARAM;
 
 	ptr->entryCount ++;
 	ptr->slots = (void **) gf_realloc(ptr->slots, ptr->entryCount*sizeof(void*));
@@ -601,7 +601,7 @@
 
 	nlist = (GF_List *) gf_malloc(sizeof(GF_List));
 	if (! nlist) return NULL;
-	
+
 	nlist->slots = NULL;
 	nlist->entryCount = 0;
 	nlist->allocSize = 0;
@@ -625,7 +625,7 @@
 GF_EXPORT
 GF_Err gf_list_add(GF_List *ptr, void* item)
 {
-    if (! ptr) return GF_BAD_PARAM;
+	if (! ptr) return GF_BAD_PARAM;
 	if (ptr->allocSize==ptr->entryCount) realloc_chain(ptr);
 	if (!ptr->slots) return GF_OUT_OF_MEM;
 
@@ -733,7 +733,7 @@
 }
 
 GF_EXPORT
-void *gf_list_rev_enum(GF_List *ptr, u32 *pos){
+void *gf_list_rev_enum(GF_List *ptr, u32 *pos) {
 	void *res;
 	if (!ptr || !pos) return NULL;
 	res = gf_list_get(ptr, gf_list_count (ptr) - *pos - 1 );
@@ -785,7 +785,7 @@
 }
 
 GF_EXPORT
-GF_List* gf_list_clone(GF_List *ptr){
+GF_List* gf_list_clone(GF_List *ptr) {
 	GF_List* new_list;
 	u32 i = 0;
 	void* item;
@@ -798,7 +798,7 @@
 }
 
 GF_EXPORT
-void gf_list_reverse(GF_List *ptr){
+void gf_list_reverse(GF_List *ptr) {
 	GF_List* saved_order;
 	void* item;
 	u32 i = 0;
@@ -806,7 +806,7 @@
 	saved_order = gf_list_clone(ptr);
 	gf_list_reset(ptr);
 
-	while ((item = gf_list_enum(saved_order, &i))){
+	while ((item = gf_list_enum(saved_order, &i))) {
 		gf_list_insert(ptr, item, 0);
 	}
 
@@ -814,10 +814,10 @@
 }
 
 GF_EXPORT
-void* gf_list_pop_front(GF_List *ptr){
+void* gf_list_pop_front(GF_List *ptr) {
 	void * item;
 	if (!ptr) return NULL;
-	
+
 	item = gf_list_get(ptr, 0);
 	gf_list_rem(ptr, 0);
 
@@ -825,10 +825,10 @@
 }
 
 GF_EXPORT
-void* gf_list_pop_back(GF_List *ptr){
+void* gf_list_pop_back(GF_List *ptr) {
 	void * item;
 	if (!ptr) return NULL;
-	
+
 	item = gf_list_last(ptr);
 	gf_list_rem_last(ptr);

gpac-0.5.0.svn5178.tar.bz2/src/utils/map.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/map.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/map.h>
@@ -32,7 +32,7 @@
 };
 
 GF_EXPORT
-GF_Err gf_map_iter_set(GF_Map* map, GF_It_Map* it){
+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;
 
@@ -44,15 +44,15 @@
 }
 
 GF_EXPORT
-void* gf_map_iter_has_next(GF_It_Map* it){
+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){
+
+	if (next_pair) {
 		/* Next element founds in the same hash */
 		it->ilist++;
 		return next_pair->value;
@@ -65,7 +65,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_map_iter_reset(GF_It_Map* it){
+GF_Err gf_map_iter_reset(GF_It_Map* it) {
 	if (!it) return GF_BAD_PARAM;
 	it->hash = 0;
 	it->ilist = 0;
@@ -73,7 +73,7 @@
 }
 
 
-GF_Pair* gf_pair_new(const char* key, u32 key_len, void* item){
+GF_Pair* gf_pair_new(const char* key, u32 key_len, void* item) {
 	GF_Pair* new_pair;
 
 	/* Allocate space for a new pair */
@@ -94,7 +94,7 @@
 	return new_pair;
 }
 
-void gf_pair_del(GF_Pair* pair){
+void gf_pair_del(GF_Pair* pair) {
 	gf_free(pair->key);
 	gf_free(pair);
 }
@@ -121,7 +121,7 @@
 	u32 index = 0;
 
 	while ((pair = (GF_Pair*)gf_list_get(pairs, index))) {
-		if (pair->key && !strcmp(pair->key, key)){
+		if (pair->key && !strcmp(pair->key, key)) {
 			gf_list_rem(pairs, index);
 			gf_pair_del(pair);
 			return GF_TRUE;
@@ -175,7 +175,7 @@
 	if (!ptr) return;
 
 	/* Iterate through the map and delete content */
-	for (i = 0; i < ptr->hash_capacity; i++){
+	for (i = 0; i < ptr->hash_capacity; i++) {
 		bucket = ptr->pairs[i];
 
 		/* Bucket has not be allocated */
@@ -197,13 +197,13 @@
 }
 
 GF_EXPORT
-void gf_map_reset(GF_Map *ptr){
+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++){
+	for (i = 0; i < ptr->hash_capacity; i++) {
 		bucket = ptr->pairs[i];
 
 		/* Bucket has not be allocated */
@@ -224,7 +224,7 @@
 }
 
 GF_EXPORT
-void* gf_map_find(GF_Map *ptr, const char* key){
+void* gf_map_find(GF_Map *ptr, const char* key) {
 	u32 index;
 	GF_List *bucket;
 	GF_Pair *pair;
@@ -244,7 +244,7 @@
 
 
 GF_EXPORT
-GF_Err gf_map_insert(GF_Map *ptr, const char* key, void* item){
+GF_Err gf_map_insert(GF_Map *ptr, const char* key, void* item) {
 	u32 key_len, index;
 	GF_List *bucket;
 	GF_Pair *pair;
@@ -264,7 +264,7 @@
 		return GF_NOT_SUPPORTED;
 	}
 
-	if (!bucket){
+	if (!bucket) {
 		/* No bucket has been assigned yet */
 		bucket = gf_list_new();
 		if (!bucket) return GF_OUT_OF_MEM;
@@ -274,13 +274,13 @@
 
 	pair = gf_pair_new(key, key_len, item);
 
-	if (!pair){
+	if (!pair) {
 		return GF_OUT_OF_MEM;
 	}
 
 	/* Store the new pair in the bucket */
 	err = gf_list_add(bucket, pair);
-	if(err != GF_OK){
+	if(err != GF_OK) {
 		gf_free(pair);
 		return GF_OUT_OF_MEM;
 	}
@@ -304,7 +304,7 @@
 }
 
 GF_EXPORT
-u32 gf_map_count(const GF_Map *ptr){
+u32 gf_map_count(const GF_Map *ptr) {
 	u32 i = 0;
 	u32 count = 0;
 
@@ -312,7 +312,7 @@
 	if (!ptr) return GF_BAD_PARAM;
 
 	/* Iterate through all bucket of the map and count pair */
-	for (; i < ptr->hash_capacity; i++ ){
+	for (; i < ptr->hash_capacity; i++ ) {
 		count += gf_list_count(ptr->pairs[i]);
 	}
 
@@ -320,7 +320,7 @@
 }
 
 GF_EXPORT
-Bool gf_map_has_key(GF_Map *ptr, const char* key){
+Bool gf_map_has_key(GF_Map *ptr, const char* key) {
 	unsigned int index;
 	GF_List *bucket;

gpac-0.5.0.svn5178.tar.bz2/src/utils/math.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/math.c Changed

@@ -11,25 +11,25 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *
  *	fixed-point trigo routines taken from freetype
- *		Copyright 1996-2001, 2002, 2004 by                                   
+ *		Copyright 1996-2001, 2002, 2004 by
  *		David Turner, Robert Wilhelm, and Werner Lemberg.
  *	License: FTL or GPL
  *
  */
 
-#include <gpac/math.h>
+#include <gpac/maths.h>
 
 u32 gf_get_bit_size(u32 MaxVal)
 {
@@ -84,15 +84,15 @@
 	z     = ( ( x >= 0 ) ? x : - x ) | ( (y >= 0) ? y : -y );
 	shift = 0;
 	if ( z < ( 1L << 27 ) ) {
-      do {
-		  shift++;
-		  z <<= 1;
-      }
-	  while ( z < ( 1L << 27 ) );
-
-      vec->x = x << shift;
-      vec->y = y << shift;
-    }    
+		do {
+			shift++;
+			z <<= 1;
+		}
+		while ( z < ( 1L << 27 ) );
+
+		vec->x = x << shift;
+		vec->y = y << shift;
+	}
 	else if ( z > ( 1L << 28 ) ) {
 		do {
 			shift++;
@@ -102,8 +102,8 @@
 		vec->x = x >> shift;
 		vec->y = y >> shift;
 		shift  = -shift;
-    }
-    return shift;
+	}
+	return shift;
 }
 
 #define ANGLE_RAD_TO_DEG(_th) ((s32) ( (((fix_s64)_th)*5729582)/100000))
@@ -165,7 +165,7 @@
 	while ( ++i < GF_TRIG_MAX_ITERS );
 
 	/* round theta */
-	if ( theta >= 0 ) 
+	if ( theta >= 0 )
 		theta = GF_PAD_ROUND( theta, 32 );
 	else
 		theta = - GF_PAD_ROUND( -theta, 32 );
@@ -211,7 +211,7 @@
 {
 	Fixed res;
 	if (!a) return 0;
-    else if (!b) return (a<0) ? -(s32)0x7FFFFFFFL : (s32)0x7FFFFFFFL;
+	else if (!b) return (a<0) ? -(s32)0x7FFFFFFFL : (s32)0x7FFFFFFFL;
 	else if (a==FIX_ONE) gppInv_16_32s(b, &res);
 	else gppDiv_16_32s(a, b, &res);
 	return res;
@@ -287,8 +287,8 @@
 #else
 	gppSinCosLP_16_32s(angle, &sina, &cosa);
 #endif
-    vec.x = gf_mulfix(length, cosa);
-    vec.y = gf_mulfix(length, sina);
+	vec.x = gf_mulfix(length, cosa);
+	vec.y = gf_mulfix(length, sina);
 	return vec;
 }
 
@@ -323,18 +323,24 @@
 	s32 s;
 	u32 q;
 	if (!a) return 0;
-    s = 1;
-    if ( a < 0 ) { a = -a; s = -1; }
-    if ( b < 0 ) { b = -b; s = -s; }
+	s = 1;
+	if ( a < 0 ) {
+		a = -a;
+		s = -1;
+	}
+	if ( b < 0 ) {
+		b = -b;
+		s = -s;
+	}
 
-    if ( b == 0 )
+	if ( b == 0 )
 		/* check for division by 0 */
 		q = 0x7FFFFFFFL;
-    else {
+	else {
 		/* compute result directly */
 		q = (u32)( ( ( (fix_s64)a << 16 ) + ( b >> 1 ) ) / b );
 	}
-    return ( s < 0 ? -(s32)q : (s32)q );
+	return ( s < 0 ? -(s32)q : (s32)q );
 }
 
 GF_EXPORT
@@ -345,8 +351,10 @@
 	if ( !a || (b == 0x10000L)) return a;
 	if (!b) return 0;
 
-	s  = a; a = ABS(a);
-	s ^= b; b = ABS(b);
+	s  = a;
+	a = ABS(a);
+	s ^= b;
+	b = ABS(b);
 
 	ua = (u32)a;
 	ub = (u32)b;
@@ -407,45 +415,45 @@
 
 static void gf_trig_pseudo_rotate(GF_Point2D*  vec, Fixed theta)
 {
-    s32 i;
-    Fixed x, y, xtemp;
-    const Fixed  *arctanptr;
+	s32 i;
+	Fixed x, y, xtemp;
+	const Fixed  *arctanptr;
 
 	/*trig funcs are in degrees*/
 	theta = ANGLE_RAD_TO_DEG(theta);
 
-    x = vec->x;
-    y = vec->y;
+	x = vec->x;
+	y = vec->y;
 
-    /* Get angle between -90 and 90 degrees */
-    while ( theta <= -GF_ANGLE_PI2 ) {
+	/* Get angle between -90 and 90 degrees */
+	while ( theta <= -GF_ANGLE_PI2 ) {
 		x = -x;
 		y = -y;
 		theta += GF_ANGLE_PI;
-    }
+	}
 
-    while ( theta > GF_ANGLE_PI2 ) {
+	while ( theta > GF_ANGLE_PI2 ) {
 		x = -x;
 		y = -y;
 		theta -= GF_ANGLE_PI;
-    }
+	}
 
-    /* Initial pseudorotation, with left shift */
-    arctanptr = gf_trig_arctan_table;
-    if ( theta < 0 ) {
+	/* Initial pseudorotation, with left shift */
+	arctanptr = gf_trig_arctan_table;
+	if ( theta < 0 ) {
 		xtemp  = x + ( y << 1 );
 		y      = y - ( x << 1 );
 		x      = xtemp;
 		theta += *arctanptr++;
-    } else {
+	} else {
 		xtemp  = x - ( y << 1 );
 		y      = y + ( x << 1 );
 		x      = xtemp;
 		theta -= *arctanptr++;
-    }
-    /* Subsequent pseudorotations, with right shifts */
-    i = 0;
-    do {
+	}
+	/* Subsequent pseudorotations, with right shifts */
+	i = 0;
+	do {
 		if ( theta < 0 ) {
 			xtemp  = x + ( y >> i );
 			y      = y - ( x >> i );
@@ -457,10 +465,10 @@
 			x      = xtemp;
 			theta -= *arctanptr++;
 		}
-    } while ( ++i < GF_TRIG_MAX_ITERS );
+	} while ( ++i < GF_TRIG_MAX_ITERS );
 
-    vec->x = x;
-    vec->y = y;
+	vec->x = x;
+	vec->y = y;
 }
 
 /* these macros return 0 for positive numbers, and -1 for negative ones */
@@ -471,13 +479,13 @@
 
 static void gf_v2d_rotate(GF_Point2D *vec, Fixed angle)
 {
-    s32 shift;
-    GF_Point2D v;
-    
+	s32 shift;
+	GF_Point2D v;
+
 	v.x   = vec->x;
-    v.y   = vec->y;
-	
-    if ( angle && ( v.x != 0 || v.y != 0 ) ) {
+	v.y   = vec->y;
+
+	if ( angle && ( v.x != 0 || v.y != 0 ) ) {
 		shift = gf_trig_prenorm( &v );
 		gf_trig_pseudo_rotate( &v, angle );
 		v.x = gf_trig_downscale( v.x );
@@ -493,57 +501,57 @@
 			vec->x = v.x << shift;
 			vec->y = v.y << shift;
 		}
-    }
+	}
 }
 
 GF_EXPORT
 Fixed gf_v2d_len(GF_Point2D *vec)
 {
-    s32 shift;
+	s32 shift;
 	GF_Point2D v;
-    v = *vec;
+	v = *vec;
 
-    /* handle trivial cases */
-    if ( v.x == 0 ) {
+	/* handle trivial cases */
+	if ( v.x == 0 ) {
 		return ( v.y >= 0 ) ? v.y : -v.y;
-    } else if ( v.y == 0 ) {
+	} else if ( v.y == 0 ) {
 		return ( v.x >= 0 ) ? v.x : -v.x;
-    }
+	}
 
-    /* general case */
-    shift = gf_trig_prenorm( &v );
-    gf_trig_pseudo_polarize( &v );
-    v.x = gf_trig_downscale( v.x );
-    if ( shift > 0 )
+	/* general case */
+	shift = gf_trig_prenorm( &v );
+	gf_trig_pseudo_polarize( &v );
+	v.x = gf_trig_downscale( v.x );
+	if ( shift > 0 )
 		return ( v.x + ( 1 << ( shift - 1 ) ) ) >> shift;
 
-    return v.x << -shift;
+	return v.x << -shift;
 }
 
 
 GF_EXPORT
 void gf_v2d_polarize(GF_Point2D *vec, Fixed *length, Fixed *angle)
 {
-    s32 shift;
+	s32 shift;
 	GF_Point2D v;
-    v = *vec;
-    if ( v.x == 0 && v.y == 0 )
+	v = *vec;
+	if ( v.x == 0 && v.y == 0 )
 		return;
 
-    shift = gf_trig_prenorm( &v );
-    gf_trig_pseudo_polarize( &v );
-    v.x = gf_trig_downscale( v.x );
-    *length = ( shift >= 0 ) ? ( v.x >> shift ) : ( v.x << -shift );
-    *angle  = v.y;
+	shift = gf_trig_prenorm( &v );
+	gf_trig_pseudo_polarize( &v );
+	v.x = gf_trig_downscale( v.x );
+	*length = ( shift >= 0 ) ? ( v.x >> shift ) : ( v.x << -shift );
+	*angle  = v.y;
 }
 
 GF_EXPORT
 GF_Point2D gf_v2d_from_polar(Fixed length, Fixed angle)
 {
 	GF_Point2D vec;
-    vec.x = length;
-    vec.y = 0;
-    gf_v2d_rotate(&vec, angle);
+	vec.x = length;
+	vec.y = 0;
+	gf_v2d_rotate(&vec, angle);
 	return vec;
 }
 
@@ -565,10 +573,10 @@
 Fixed gf_tan(Fixed angle)
 {
 	GF_Point2D v;
-    v.x = GF_TRIG_COSCALE >> 2;
-    v.y = 0;
-    gf_trig_pseudo_rotate( &v, angle );
-    return gf_divfix( v.y, v.x );
+	v.x = GF_TRIG_COSCALE >> 2;
+	v.y = 0;
+	gf_trig_pseudo_rotate( &v, angle );
+	return gf_divfix( v.y, v.x );
 }
 
 #endif
@@ -577,15 +585,24 @@
 GF_EXPORT
 Fixed gf_muldiv(Fixed a, Fixed b, Fixed c)
 {
-    s32 s, d;
+	s32 s, d;
 	if (!b || !a) return 0;
-    s = 1;
-    if ( a < 0 ) { a = -a; s = -1; }
-    if ( b < 0 ) { b = -b; s = -s; }
-    if ( c < 0 ) { c = -c; s = -s; }
+	s = 1;
+	if ( a < 0 ) {
+		a = -a;
+		s = -1;
+	}
+	if ( b < 0 ) {
+		b = -b;
+		s = -s;
+	}
+	if ( c < 0 ) {
+		c = -c;
+		s = -s;
+	}
 
-    d = (s32)( c > 0 ? ( (fix_s64)a * b + ( c >> 1 ) ) / c : 0x7FFFFFFFL);
-    return (Fixed) (( s > 0 ) ? d : -d);
+	d = (s32)( c > 0 ? ( (fix_s64)a * b + ( c >> 1 ) ) / c : 0x7FFFFFFFL);
+	return (Fixed) (( s > 0 ) ? d : -d);
 }
 
 
@@ -598,7 +615,7 @@
 GF_EXPORT
 Fixed gf_floor(Fixed a)
 {
-    return (a >= 0) ? (a & ~0xFFFFL) : -((-a) & ~0xFFFFL);
+	return (a >= 0) ? (a & ~0xFFFFL) : -((-a) & ~0xFFFFL);
 }
 
 
@@ -624,8 +641,8 @@
 GF_Point2D gf_v2d_from_polar(Fixed length, Fixed angle)
 {
 	GF_Point2D vec;
-    vec.x = length*(Float) cos(angle);
-    vec.y = length*(Float) sin(angle);
+	vec.x = length*(Float) cos(angle);
+	vec.y = length*(Float) sin(angle);
 	return vec;
 }
 
@@ -665,16 +682,16 @@
 GF_EXPORT
 Fixed gf_angle_diff(Fixed angle1, Fixed angle2)
 {
-    Fixed delta = angle2 - angle1;
+	Fixed delta = angle2 - angle1;
 #ifdef GPAC_FIXED_POINT
-    delta %= GF_2PI;
+	delta %= GF_2PI;
 	if (delta < 0) delta += GF_2PI;
-    if (delta > GF_PI) delta -= GF_2PI;
+	if (delta > GF_PI) delta -= GF_2PI;
 #else
 	while (delta < 0) delta += GF_2PI;
-    while (delta > GF_PI) delta -= GF_2PI;
+	while (delta > GF_PI) delta -= GF_2PI;
 #endif
-    return delta;
+	return delta;
 }
 
 
@@ -745,7 +762,7 @@
 	gf_mx2d_init(tmp);
 
 	gf_mx2d_add_translation(_this, -cx, -cy);
-	
+
 	tmp.m[0] = gf_cos(angle);
 	tmp.m[4] = tmp.m[0];
 	tmp.m[3] = gf_sin(angle);
@@ -960,13 +977,22 @@
 
 /*adds @rc2 to @rc1 - the new @rc1 contains the old @rc1 and @rc2*/
 GF_EXPORT
-void gf_rect_union(GF_Rect *rc1, GF_Rect *rc2) 
+void gf_rect_union(GF_Rect *rc1, GF_Rect *rc2)
 {
-	if (!rc1->width || !rc1->height) {*rc1=*rc2; return;}
+	if (!rc1->width || !rc1->height) {
+		*rc1=*rc2;
+		return;
+	}
 	if (!rc2->width || !rc2->height) return;
-	if (rc2->x < rc1->x) { rc1->width += rc1->x - rc2->x; rc1->x = rc2->x; }
+	if (rc2->x < rc1->x) {
+		rc1->width += rc1->x - rc2->x;
+		rc1->x = rc2->x;
+	}
 	if (rc2->x + rc2->width > rc1->x+rc1->width) rc1->width = rc2->x + rc2->width - rc1->x;
-	if (rc2->y > rc1->y) { rc1->height += rc2->y - rc1->y; rc1->y = rc2->y; }
+	if (rc2->y > rc1->y) {
+		rc1->height += rc2->y - rc1->y;
+		rc1->y = rc2->y;
+	}
 	if (rc2->y - rc2->height < rc1->y - rc1->height) rc1->height = rc1->y - rc2->y + rc2->height;
 }
 
@@ -974,7 +1000,10 @@
 GF_Rect gf_rect_center(Fixed w, Fixed h)
 {
 	GF_Rect rc;
-	rc.x=-w/2; rc.y=h/2; rc.width=w; rc.height=h;
+	rc.x=-w/2;
+	rc.y=h/2;
+	rc.width=w;
+	rc.height=h;
 	return rc;
 }
 
@@ -990,8 +1019,8 @@
 }
 
 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) )
 		return GF_TRUE;
 	return GF_FALSE;
@@ -1052,7 +1081,7 @@
 		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);
-	
+
 #endif
 }
 
@@ -1072,8 +1101,12 @@
 	/*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;
+		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);
@@ -1090,7 +1123,7 @@
 	gppVec3DNormalize_16_32s((GPP_VEC3D *) &v);
 #else
 	Fixed __res = gf_vec_len(*v);
-	v->x = gf_divfix(v->x, __res); 
+	v->x = gf_divfix(v->x, __res);
 	v->y = gf_divfix(v->y, __res);
 	v->z = gf_divfix(v->z, __res);
 #endif
@@ -1100,8 +1133,8 @@
 GF_Vec gf_vec_scale(GF_Vec v, Fixed f)
 {
 	GF_Vec res;
-	res.x = gf_mulfix(v.x, f); 
-	res.y = gf_mulfix(v.y, f); 
+	res.x = gf_mulfix(v.x, f);
+	res.y = gf_mulfix(v.y, f);
 	res.z = gf_mulfix(v.z, f);
 	return res;
 }
@@ -1125,8 +1158,12 @@
 	/*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;
+		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);
@@ -1146,11 +1183,17 @@
 #else
 
 GF_EXPORT
-Fixed gf_vec_len(GF_Vec v) { return gf_sqrt(v.x*v.x + v.y*v.y + v.z*v.z); }
+Fixed gf_vec_len(GF_Vec v) {
+	return gf_sqrt(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; }
+Fixed gf_vec_lensq(GF_Vec v) {
+	return v.x*v.x + v.y*v.y + v.z*v.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; }
+Fixed gf_vec_dot(GF_Vec v1, GF_Vec v2) {
+	return v1.x*v2.x + v1.y*v2.y + v1.z*v2.z;
+}
 GF_EXPORT
 void gf_vec_norm(GF_Vec *v)
 {
@@ -1158,7 +1201,7 @@
 	if (!__res ) return;
 	if (__res == FIX_ONE) return;
 	__res = 1.0f/__res;
-	v->x *= __res; 
+	v->x *= __res;
 	v->y *= __res;
 	v->z *= __res;
 }
@@ -1167,8 +1210,8 @@
 GF_Vec gf_vec_scale(GF_Vec v, Fixed f)
 {
 	GF_Vec res = v;
-	res.x *= f; 
-	res.y *= f; 
+	res.x *= f;
+	res.y *= f;
 	res.z *= f;
 	return res;
 }
@@ -1209,42 +1252,42 @@
 GF_EXPORT
 void gf_mx_add_matrix(GF_Matrix *mat, GF_Matrix *mul)
 {
-    GF_Matrix tmp;
+	GF_Matrix tmp;
 	gf_mx_init(tmp);
 
-    tmp.m[0] = gf_mulfix(mat->m[0],mul->m[0]) + gf_mulfix(mat->m[4],mul->m[1]) + gf_mulfix(mat->m[8],mul->m[2]);
-    tmp.m[4] = gf_mulfix(mat->m[0],mul->m[4]) + gf_mulfix(mat->m[4],mul->m[5]) + gf_mulfix(mat->m[8],mul->m[6]);
-    tmp.m[8] = gf_mulfix(mat->m[0],mul->m[8]) + gf_mulfix(mat->m[4],mul->m[9]) + gf_mulfix(mat->m[8],mul->m[10]);
-    tmp.m[12]= gf_mulfix(mat->m[0],mul->m[12]) + gf_mulfix(mat->m[4],mul->m[13]) + gf_mulfix(mat->m[8],mul->m[14]) + mat->m[12];
-    tmp.m[1] = gf_mulfix(mat->m[1],mul->m[0]) + gf_mulfix(mat->m[5],mul->m[1]) + gf_mulfix(mat->m[9],mul->m[2]);
-    tmp.m[5] = gf_mulfix(mat->m[1],mul->m[4]) + gf_mulfix(mat->m[5],mul->m[5]) + gf_mulfix(mat->m[9],mul->m[6]);
-    tmp.m[9] = gf_mulfix(mat->m[1],mul->m[8]) + gf_mulfix(mat->m[5],mul->m[9]) + gf_mulfix(mat->m[9],mul->m[10]);
-    tmp.m[13]= gf_mulfix(mat->m[1],mul->m[12]) + gf_mulfix(mat->m[5],mul->m[13]) + gf_mulfix(mat->m[9],mul->m[14]) + mat->m[13];
-    tmp.m[2] = gf_mulfix(mat->m[2],mul->m[0]) + gf_mulfix(mat->m[6],mul->m[1]) + gf_mulfix(mat->m[10],mul->m[2]);
-    tmp.m[6] = gf_mulfix(mat->m[2],mul->m[4]) + gf_mulfix(mat->m[6],mul->m[5]) + gf_mulfix(mat->m[10],mul->m[6]);
-    tmp.m[10]= gf_mulfix(mat->m[2],mul->m[8]) + gf_mulfix(mat->m[6],mul->m[9]) + gf_mulfix(mat->m[10],mul->m[10]);
-    tmp.m[14]= gf_mulfix(mat->m[2],mul->m[12]) + gf_mulfix(mat->m[6],mul->m[13]) + gf_mulfix(mat->m[10],mul->m[14]) + mat->m[14];
+	tmp.m[0] = gf_mulfix(mat->m[0],mul->m[0]) + gf_mulfix(mat->m[4],mul->m[1]) + gf_mulfix(mat->m[8],mul->m[2]);
+	tmp.m[4] = gf_mulfix(mat->m[0],mul->m[4]) + gf_mulfix(mat->m[4],mul->m[5]) + gf_mulfix(mat->m[8],mul->m[6]);
+	tmp.m[8] = gf_mulfix(mat->m[0],mul->m[8]) + gf_mulfix(mat->m[4],mul->m[9]) + gf_mulfix(mat->m[8],mul->m[10]);
+	tmp.m[12]= gf_mulfix(mat->m[0],mul->m[12]) + gf_mulfix(mat->m[4],mul->m[13]) + gf_mulfix(mat->m[8],mul->m[14]) + mat->m[12];
+	tmp.m[1] = gf_mulfix(mat->m[1],mul->m[0]) + gf_mulfix(mat->m[5],mul->m[1]) + gf_mulfix(mat->m[9],mul->m[2]);
+	tmp.m[5] = gf_mulfix(mat->m[1],mul->m[4]) + gf_mulfix(mat->m[5],mul->m[5]) + gf_mulfix(mat->m[9],mul->m[6]);
+	tmp.m[9] = gf_mulfix(mat->m[1],mul->m[8]) + gf_mulfix(mat->m[5],mul->m[9]) + gf_mulfix(mat->m[9],mul->m[10]);
+	tmp.m[13]= gf_mulfix(mat->m[1],mul->m[12]) + gf_mulfix(mat->m[5],mul->m[13]) + gf_mulfix(mat->m[9],mul->m[14]) + mat->m[13];
+	tmp.m[2] = gf_mulfix(mat->m[2],mul->m[0]) + gf_mulfix(mat->m[6],mul->m[1]) + gf_mulfix(mat->m[10],mul->m[2]);
+	tmp.m[6] = gf_mulfix(mat->m[2],mul->m[4]) + gf_mulfix(mat->m[6],mul->m[5]) + gf_mulfix(mat->m[10],mul->m[6]);
+	tmp.m[10]= gf_mulfix(mat->m[2],mul->m[8]) + gf_mulfix(mat->m[6],mul->m[9]) + gf_mulfix(mat->m[10],mul->m[10]);
+	tmp.m[14]= gf_mulfix(mat->m[2],mul->m[12]) + gf_mulfix(mat->m[6],mul->m[13]) + gf_mulfix(mat->m[10],mul->m[14]) + mat->m[14];
 	memcpy(mat->m, tmp.m, sizeof(Fixed)*16);
 }
 
 GF_EXPORT
 void gf_mx_add_matrix_2d(GF_Matrix *mat, GF_Matrix2D *mat2D)
 {
-    GF_Matrix tmp;
+	GF_Matrix tmp;
 	gf_mx_init(tmp);
 
-    tmp.m[0] = gf_mulfix(mat->m[0],mat2D->m[0]) + gf_mulfix(mat->m[4],mat2D->m[3]);
-    tmp.m[4] = gf_mulfix(mat->m[0],mat2D->m[1]) + gf_mulfix(mat->m[4],mat2D->m[4]);
-    tmp.m[8] = mat->m[8];
-    tmp.m[12]= gf_mulfix(mat->m[0],mat2D->m[2]) + gf_mulfix(mat->m[4],mat2D->m[5]) + mat->m[12];
-    tmp.m[1] = gf_mulfix(mat->m[1],mat2D->m[0]) + gf_mulfix(mat->m[5],mat2D->m[3]);
-    tmp.m[5] = gf_mulfix(mat->m[1],mat2D->m[1]) + gf_mulfix(mat->m[5],mat2D->m[4]);
-    tmp.m[9] = mat->m[9];
-    tmp.m[13]= gf_mulfix(mat->m[1],mat2D->m[2]) + gf_mulfix(mat->m[5],mat2D->m[5]) + mat->m[13];
-    tmp.m[2] = gf_mulfix(mat->m[2],mat2D->m[0]) + gf_mulfix(mat->m[6],mat2D->m[3]);
-    tmp.m[6] = gf_mulfix(mat->m[2],mat2D->m[1]) + gf_mulfix(mat->m[6],mat2D->m[4]);
-    tmp.m[10]= mat->m[10];
-    tmp.m[14]= gf_mulfix(mat->m[2],mat2D->m[2]) + gf_mulfix(mat->m[6],mat2D->m[5]) + mat->m[14];
+	tmp.m[0] = gf_mulfix(mat->m[0],mat2D->m[0]) + gf_mulfix(mat->m[4],mat2D->m[3]);
+	tmp.m[4] = gf_mulfix(mat->m[0],mat2D->m[1]) + gf_mulfix(mat->m[4],mat2D->m[4]);
+	tmp.m[8] = mat->m[8];
+	tmp.m[12]= gf_mulfix(mat->m[0],mat2D->m[2]) + gf_mulfix(mat->m[4],mat2D->m[5]) + mat->m[12];
+	tmp.m[1] = gf_mulfix(mat->m[1],mat2D->m[0]) + gf_mulfix(mat->m[5],mat2D->m[3]);
+	tmp.m[5] = gf_mulfix(mat->m[1],mat2D->m[1]) + gf_mulfix(mat->m[5],mat2D->m[4]);
+	tmp.m[9] = mat->m[9];
+	tmp.m[13]= gf_mulfix(mat->m[1],mat2D->m[2]) + gf_mulfix(mat->m[5],mat2D->m[5]) + mat->m[13];
+	tmp.m[2] = gf_mulfix(mat->m[2],mat2D->m[0]) + gf_mulfix(mat->m[6],mat2D->m[3]);
+	tmp.m[6] = gf_mulfix(mat->m[2],mat2D->m[1]) + gf_mulfix(mat->m[6],mat2D->m[4]);
+	tmp.m[10]= mat->m[10];
+	tmp.m[14]= gf_mulfix(mat->m[2],mat2D->m[2]) + gf_mulfix(mat->m[6],mat2D->m[5]) + mat->m[14];
 	memcpy(mat->m, tmp.m, sizeof(Fixed)*16);
 }
 
@@ -1271,9 +1314,9 @@
 	Fixed tmp[3];
 	u32 i, j;
 
-	tmp[0] = sx; 
-	tmp[1] = sy; 
-	tmp[2] = sz; 
+	tmp[0] = sx;
+	tmp[1] = sy;
+	tmp[2] = sz;
 
 	for (i=0; i<3; i++) {
 		for (j=0; j<3; j++) {
@@ -1292,24 +1335,29 @@
 	Fixed sin_a = gf_sin(angle);
 	Fixed icos_a = FIX_ONE - cos_a;
 
-	if (nor && (nor!=FIX_ONE)) { 
-		x = gf_divfix(x, nor); 
-		y = gf_divfix(y, nor); 
-		z = gf_divfix(z, nor); 
+	if (nor && (nor!=FIX_ONE)) {
+		x = gf_divfix(x, nor);
+		y = gf_divfix(y, nor);
+		z = gf_divfix(z, nor);
 	}
-	xx = gf_mulfix(x,x); yy = gf_mulfix(y,y); zz = gf_mulfix(z,z); xy = gf_mulfix(x,y); xz = gf_mulfix(x,z); yz = gf_mulfix(y,z);
+	xx = gf_mulfix(x,x);
+	yy = gf_mulfix(y,y);
+	zz = gf_mulfix(z,z);
+	xy = gf_mulfix(x,y);
+	xz = gf_mulfix(x,z);
+	yz = gf_mulfix(y,z);
 	gf_mx_init(tmp);
-    tmp.m[0] = gf_mulfix(icos_a,xx) + cos_a;
-    tmp.m[1] = gf_mulfix(xy,icos_a) + gf_mulfix(z,sin_a);
-    tmp.m[2] = gf_mulfix(xz,icos_a) - gf_mulfix(y,sin_a);
-    
+	tmp.m[0] = gf_mulfix(icos_a,xx) + cos_a;
+	tmp.m[1] = gf_mulfix(xy,icos_a) + gf_mulfix(z,sin_a);
+	tmp.m[2] = gf_mulfix(xz,icos_a) - gf_mulfix(y,sin_a);
+
 	tmp.m[4] = gf_mulfix(xy,icos_a) - gf_mulfix(z,sin_a);
-    tmp.m[5] = gf_mulfix(icos_a,yy) + cos_a;
-    tmp.m[6] = gf_mulfix(yz,icos_a) + gf_mulfix(x,sin_a);
+	tmp.m[5] = gf_mulfix(icos_a,yy) + cos_a;
+	tmp.m[6] = gf_mulfix(yz,icos_a) + gf_mulfix(x,sin_a);
 
 	tmp.m[8] = gf_mulfix(xz,icos_a) + gf_mulfix(y,sin_a);
-    tmp.m[9] = gf_mulfix(yz,icos_a) - gf_mulfix(x,sin_a);
-    tmp.m[10]= gf_mulfix(icos_a,zz) + cos_a;
+	tmp.m[9] = gf_mulfix(yz,icos_a) - gf_mulfix(x,sin_a);
+	tmp.m[10]= gf_mulfix(icos_a,zz) + cos_a;
 
 	gf_mx_add_matrix(mat, &tmp);
 }
@@ -1469,7 +1517,7 @@
 void gf_mx_lookat(GF_Matrix *mx, GF_Vec eye, GF_Vec center, GF_Vec upVector)
 {
 	GF_Vec f, s, u;
-	
+
 	gf_vec_diff(f, center, eye);
 	gf_vec_norm(&f);
 	gf_vec_norm(&upVector);
@@ -1477,7 +1525,7 @@
 	s = gf_vec_cross(f, upVector);
 	u = gf_vec_cross(s, f);
 	gf_mx_init(*mx);
-	
+
 	mx->m[0] = s.x;
 	mx->m[1] = u.x;
 	mx->m[2] = -f.x;
@@ -1501,54 +1549,66 @@
 	Fixed locmat[16];
 	GF_Matrix tmp;
 	GF_Vec row0, row1, row2;
-	Fixed shear_xy, shear_xz, shear_yz; 
+	Fixed shear_xy, shear_xz, shear_yz;
 	assert(mx->m[15]);
 
 	memcpy(locmat, mx->m, sizeof(Fixed)*16);
 	/*no perspective*/
-    locmat[3] = locmat[7] = locmat[11] = 0;
+	locmat[3] = locmat[7] = locmat[11] = 0;
 	/*normalize*/
-    for (i=0; i<4; i++) {
-        for (j=0; j<4; j++) {
-            locmat[4*i+j] = gf_divfix(locmat[4*i+j], locmat[15]);
-        }
-    }
-    translate->x = locmat[12];
-    translate->y = locmat[13];
-    translate->z = locmat[14];
-    locmat[12] = locmat[13] = locmat[14] = 0;
-    row0.x = locmat[0]; row0.y = locmat[1]; row0.z = locmat[2];
-    row1.x = locmat[4]; row1.y = locmat[5]; row1.z = locmat[6];
-    row2.x = locmat[8]; row2.y = locmat[9]; row2.z = locmat[10];
-
-    scale->x = gf_vec_len(row0);
-    gf_vec_norm(&row0);
-    shear_xy = gf_vec_dot(row0, row1);
-    row1.x -= gf_mulfix(row0.x, shear_xy);
-    row1.y -= gf_mulfix(row0.y, shear_xy);
-    row1.z -= gf_mulfix(row0.z, shear_xy);
-
-    scale->y = gf_vec_len(row1);
-    gf_vec_norm(&row1);
-    shear->x = gf_divfix(shear_xy, scale->y);
-
-    shear_xz = gf_vec_dot(row0, row2);
-    row2.x -= gf_mulfix(row0.x, shear_xz);
-    row2.y -= gf_mulfix(row0.y, shear_xz);
-    row2.z -= gf_mulfix(row0.z, shear_xz);
-    shear_yz = gf_vec_dot(row1, row2);
-    row2.x -= gf_mulfix(row1.x, shear_yz);
-    row2.y -= gf_mulfix(row1.y, shear_yz);
-    row2.z -= gf_mulfix(row1.z, shear_yz);
-
-    scale->z = gf_vec_len(row2);
-    gf_vec_norm(&row2);
-    shear->y = gf_divfix(shear_xz, scale->z);
-    shear->z = gf_divfix(shear_yz, scale->z);
-
-	locmat[0] = row0.x; locmat[4] = row1.x; locmat[8] = row2.x;
-	locmat[1] = row0.y; locmat[5] = row1.y; locmat[9] = row2.y;
-	locmat[2] = row0.z; locmat[6] = row1.z; locmat[10] = row2.z;
+	for (i=0; i<4; i++) {
+		for (j=0; j<4; j++) {
+			locmat[4*i+j] = gf_divfix(locmat[4*i+j], locmat[15]);
+		}
+	}
+	translate->x = locmat[12];
+	translate->y = locmat[13];
+	translate->z = locmat[14];
+	locmat[12] = locmat[13] = locmat[14] = 0;
+	row0.x = locmat[0];
+	row0.y = locmat[1];
+	row0.z = locmat[2];
+	row1.x = locmat[4];
+	row1.y = locmat[5];
+	row1.z = locmat[6];
+	row2.x = locmat[8];
+	row2.y = locmat[9];
+	row2.z = locmat[10];
+
+	scale->x = gf_vec_len(row0);
+	gf_vec_norm(&row0);
+	shear_xy = gf_vec_dot(row0, row1);
+	row1.x -= gf_mulfix(row0.x, shear_xy);
+	row1.y -= gf_mulfix(row0.y, shear_xy);
+	row1.z -= gf_mulfix(row0.z, shear_xy);
+
+	scale->y = gf_vec_len(row1);
+	gf_vec_norm(&row1);
+	shear->x = gf_divfix(shear_xy, scale->y);
+
+	shear_xz = gf_vec_dot(row0, row2);
+	row2.x -= gf_mulfix(row0.x, shear_xz);
+	row2.y -= gf_mulfix(row0.y, shear_xz);
+	row2.z -= gf_mulfix(row0.z, shear_xz);
+	shear_yz = gf_vec_dot(row1, row2);
+	row2.x -= gf_mulfix(row1.x, shear_yz);
+	row2.y -= gf_mulfix(row1.y, shear_yz);
+	row2.z -= gf_mulfix(row1.z, shear_yz);
+
+	scale->z = gf_vec_len(row2);
+	gf_vec_norm(&row2);
+	shear->y = gf_divfix(shear_xz, scale->z);
+	shear->z = gf_divfix(shear_yz, scale->z);
+
+	locmat[0] = row0.x;
+	locmat[4] = row1.x;
+	locmat[8] = row2.x;
+	locmat[1] = row0.y;
+	locmat[5] = row1.y;
+	locmat[9] = row2.y;
+	locmat[2] = row0.z;
+	locmat[6] = row1.z;
+	locmat[10] = row2.z;
 
 	memcpy(tmp.m, locmat, sizeof(Fixed)*16);
 	quat = gf_quat_from_matrix(&tmp);
@@ -1562,17 +1622,23 @@
 	gf_mx_apply_vec(mx, &box->min_edge);
 	gf_mx_apply_vec(mx, &box->max_edge);
 
-	if (box->min_edge.x > box->max_edge.x) 
+	if (box->min_edge.x > box->max_edge.x)
 	{
-		var = box->min_edge.x; box->min_edge.x = box->max_edge.x; box->max_edge.x = var;
+		var = box->min_edge.x;
+		box->min_edge.x = box->max_edge.x;
+		box->max_edge.x = var;
 	}
-	if (box->min_edge.y > box->max_edge.y) 
+	if (box->min_edge.y > box->max_edge.y)
 	{
-		var = box->min_edge.y; box->min_edge.y = box->max_edge.y; box->max_edge.y = var;
+		var = box->min_edge.y;
+		box->min_edge.y = box->max_edge.y;
+		box->max_edge.y = var;
 	}
-	if (box->min_edge.z > box->max_edge.z) 
+	if (box->min_edge.z > box->max_edge.z)
 	{
-		var = box->min_edge.z; box->min_edge.z = box->max_edge.z; box->max_edge.z = var;
+		var = box->min_edge.z;
+		box->min_edge.z = box->max_edge.z;
+		box->max_edge.z = var;
 	}
 	gf_bbox_refresh(box);
 }
@@ -1583,12 +1649,15 @@
 	u32 i;
 	GF_Vec v[4];
 	v[0] = box->min_edge;
-	v[1] = box->min_edge; v[1].x = box->max_edge.x;
-	v[2] = box->min_edge; v[2].y = box->max_edge.y;
-	v[3] = box->min_edge; v[3].z = box->max_edge.z;
+	v[1] = box->min_edge;
+	v[1].x = box->max_edge.x;
+	v[2] = box->min_edge;
+	v[2].y = box->max_edge.y;
+	v[3] = box->min_edge;
+	v[3].z = box->max_edge.z;
 	box->max_edge.x = box->max_edge.y = box->max_edge.z = -FIX_MAX;
 	box->min_edge.x = box->min_edge.y = box->min_edge.z = FIX_MAX;
-	for (i=0;i<4; i++) {
+	for (i=0; i<4; i++) {
 		gf_mx_apply_vec(mx, &v[i]);
 		if (box->min_edge.x > v[i].x) box->min_edge.x = v[i].x;
 		if (box->min_edge.y > v[i].y) box->min_edge.y = v[i].y;
@@ -1620,10 +1689,22 @@
 GF_EXPORT
 void gf_mx_rotation_matrix_from_vectors(GF_Matrix *mx, GF_Vec x, GF_Vec y, GF_Vec z)
 {
-    mx->m[0] = x.x; mx->m[1] = y.x; mx->m[2] = z.x; mx->m[3] = 0;
-    mx->m[4] = x.y; mx->m[5] = y.y; mx->m[6] = z.y; mx->m[7] = 0;
-    mx->m[8] = x.z; mx->m[9] = y.z; mx->m[10] = z.z; mx->m[11] = 0;
-    mx->m[12] = 0; mx->m[13] = 0; mx->m[14] = 0; mx->m[15] = FIX_ONE;
+	mx->m[0] = x.x;
+	mx->m[1] = y.x;
+	mx->m[2] = z.x;
+	mx->m[3] = 0;
+	mx->m[4] = x.y;
+	mx->m[5] = y.y;
+	mx->m[6] = z.y;
+	mx->m[7] = 0;
+	mx->m[8] = x.z;
+	mx->m[9] = y.z;
+	mx->m[10] = z.z;
+	mx->m[11] = 0;
+	mx->m[12] = 0;
+	mx->m[13] = 0;
+	mx->m[14] = 0;
+	mx->m[15] = FIX_ONE;
 }
 
 
@@ -1631,24 +1712,24 @@
 GF_EXPORT
 void gf_mx_add_matrix_4x4(GF_Matrix *mat, GF_Matrix *mul)
 {
-    GF_Matrix tmp;
+	GF_Matrix tmp;
 	gf_mx_init(tmp);
-    tmp.m[0] = gf_mulfix(mat->m[0],mul->m[0]) + gf_mulfix(mat->m[4],mul->m[1]) + gf_mulfix(mat->m[8],mul->m[2]) + gf_mulfix(mat->m[12],mul->m[3]);
-    tmp.m[1] = gf_mulfix(mat->m[1],mul->m[0]) + gf_mulfix(mat->m[5],mul->m[1]) + gf_mulfix(mat->m[9],mul->m[2]) + gf_mulfix(mat->m[13],mul->m[3]);
-    tmp.m[2] = gf_mulfix(mat->m[2],mul->m[0]) + gf_mulfix(mat->m[6],mul->m[1]) + gf_mulfix(mat->m[10],mul->m[2]) + gf_mulfix(mat->m[14],mul->m[3]);
-    tmp.m[3] = gf_mulfix(mat->m[3],mul->m[0]) + gf_mulfix(mat->m[7],mul->m[1]) + gf_mulfix(mat->m[11],mul->m[2]) + gf_mulfix(mat->m[15],mul->m[3]);
-    tmp.m[4] = gf_mulfix(mat->m[0],mul->m[4]) + gf_mulfix(mat->m[4],mul->m[5]) + gf_mulfix(mat->m[8],mul->m[6]) + gf_mulfix(mat->m[12],mul->m[7]);
-    tmp.m[5] = gf_mulfix(mat->m[1],mul->m[4]) + gf_mulfix(mat->m[5],mul->m[5]) + gf_mulfix(mat->m[9],mul->m[6]) + gf_mulfix(mat->m[13],mul->m[7]);
-    tmp.m[6] = gf_mulfix(mat->m[2],mul->m[4]) + gf_mulfix(mat->m[6],mul->m[5]) + gf_mulfix(mat->m[10],mul->m[6]) + gf_mulfix(mat->m[14],mul->m[7]);
-    tmp.m[7] = gf_mulfix(mat->m[3],mul->m[4]) + gf_mulfix(mat->m[7],mul->m[5]) + gf_mulfix(mat->m[11],mul->m[6]) + gf_mulfix(mat->m[15],mul->m[7]);
-    tmp.m[8] = gf_mulfix(mat->m[0],mul->m[8]) + gf_mulfix(mat->m[4],mul->m[9]) + gf_mulfix(mat->m[8],mul->m[10]) + gf_mulfix(mat->m[12],mul->m[11]);
-    tmp.m[9] = gf_mulfix(mat->m[1],mul->m[8]) + gf_mulfix(mat->m[5],mul->m[9]) + gf_mulfix(mat->m[9],mul->m[10]) + gf_mulfix(mat->m[13],mul->m[11]);
-    tmp.m[10] = gf_mulfix(mat->m[2],mul->m[8]) + gf_mulfix(mat->m[6],mul->m[9]) + gf_mulfix(mat->m[10],mul->m[10]) + gf_mulfix(mat->m[14],mul->m[11]);
-    tmp.m[11] = gf_mulfix(mat->m[3],mul->m[8]) + gf_mulfix(mat->m[7],mul->m[9]) + gf_mulfix(mat->m[11],mul->m[10]) + gf_mulfix(mat->m[15],mul->m[11]);
-    tmp.m[12] = gf_mulfix(mat->m[0],mul->m[12]) + gf_mulfix(mat->m[4],mul->m[13]) + gf_mulfix(mat->m[8],mul->m[14]) + gf_mulfix(mat->m[12],mul->m[15]);
-    tmp.m[13] = gf_mulfix(mat->m[1],mul->m[12]) + gf_mulfix(mat->m[5],mul->m[13]) + gf_mulfix(mat->m[9],mul->m[14]) + gf_mulfix(mat->m[13],mul->m[15]);
-    tmp.m[14] = gf_mulfix(mat->m[2],mul->m[12]) + gf_mulfix(mat->m[6],mul->m[13]) + gf_mulfix(mat->m[10],mul->m[14]) + gf_mulfix(mat->m[14],mul->m[15]);
-    tmp.m[15] = gf_mulfix(mat->m[3],mul->m[12]) + gf_mulfix(mat->m[7],mul->m[13]) + gf_mulfix(mat->m[11],mul->m[14]) + gf_mulfix(mat->m[15],mul->m[15]);
+	tmp.m[0] = gf_mulfix(mat->m[0],mul->m[0]) + gf_mulfix(mat->m[4],mul->m[1]) + gf_mulfix(mat->m[8],mul->m[2]) + gf_mulfix(mat->m[12],mul->m[3]);
+	tmp.m[1] = gf_mulfix(mat->m[1],mul->m[0]) + gf_mulfix(mat->m[5],mul->m[1]) + gf_mulfix(mat->m[9],mul->m[2]) + gf_mulfix(mat->m[13],mul->m[3]);
+	tmp.m[2] = gf_mulfix(mat->m[2],mul->m[0]) + gf_mulfix(mat->m[6],mul->m[1]) + gf_mulfix(mat->m[10],mul->m[2]) + gf_mulfix(mat->m[14],mul->m[3]);
+	tmp.m[3] = gf_mulfix(mat->m[3],mul->m[0]) + gf_mulfix(mat->m[7],mul->m[1]) + gf_mulfix(mat->m[11],mul->m[2]) + gf_mulfix(mat->m[15],mul->m[3]);
+	tmp.m[4] = gf_mulfix(mat->m[0],mul->m[4]) + gf_mulfix(mat->m[4],mul->m[5]) + gf_mulfix(mat->m[8],mul->m[6]) + gf_mulfix(mat->m[12],mul->m[7]);
+	tmp.m[5] = gf_mulfix(mat->m[1],mul->m[4]) + gf_mulfix(mat->m[5],mul->m[5]) + gf_mulfix(mat->m[9],mul->m[6]) + gf_mulfix(mat->m[13],mul->m[7]);
+	tmp.m[6] = gf_mulfix(mat->m[2],mul->m[4]) + gf_mulfix(mat->m[6],mul->m[5]) + gf_mulfix(mat->m[10],mul->m[6]) + gf_mulfix(mat->m[14],mul->m[7]);
+	tmp.m[7] = gf_mulfix(mat->m[3],mul->m[4]) + gf_mulfix(mat->m[7],mul->m[5]) + gf_mulfix(mat->m[11],mul->m[6]) + gf_mulfix(mat->m[15],mul->m[7]);
+	tmp.m[8] = gf_mulfix(mat->m[0],mul->m[8]) + gf_mulfix(mat->m[4],mul->m[9]) + gf_mulfix(mat->m[8],mul->m[10]) + gf_mulfix(mat->m[12],mul->m[11]);
+	tmp.m[9] = gf_mulfix(mat->m[1],mul->m[8]) + gf_mulfix(mat->m[5],mul->m[9]) + gf_mulfix(mat->m[9],mul->m[10]) + gf_mulfix(mat->m[13],mul->m[11]);
+	tmp.m[10] = gf_mulfix(mat->m[2],mul->m[8]) + gf_mulfix(mat->m[6],mul->m[9]) + gf_mulfix(mat->m[10],mul->m[10]) + gf_mulfix(mat->m[14],mul->m[11]);
+	tmp.m[11] = gf_mulfix(mat->m[3],mul->m[8]) + gf_mulfix(mat->m[7],mul->m[9]) + gf_mulfix(mat->m[11],mul->m[10]) + gf_mulfix(mat->m[15],mul->m[11]);
+	tmp.m[12] = gf_mulfix(mat->m[0],mul->m[12]) + gf_mulfix(mat->m[4],mul->m[13]) + gf_mulfix(mat->m[8],mul->m[14]) + gf_mulfix(mat->m[12],mul->m[15]);
+	tmp.m[13] = gf_mulfix(mat->m[1],mul->m[12]) + gf_mulfix(mat->m[5],mul->m[13]) + gf_mulfix(mat->m[9],mul->m[14]) + gf_mulfix(mat->m[13],mul->m[15]);
+	tmp.m[14] = gf_mulfix(mat->m[2],mul->m[12]) + gf_mulfix(mat->m[6],mul->m[13]) + gf_mulfix(mat->m[10],mul->m[14]) + gf_mulfix(mat->m[14],mul->m[15]);
+	tmp.m[15] = gf_mulfix(mat->m[3],mul->m[12]) + gf_mulfix(mat->m[7],mul->m[13]) + gf_mulfix(mat->m[11],mul->m[14]) + gf_mulfix(mat->m[15],mul->m[15]);
 	memcpy(mat->m, tmp.m, sizeof(Fixed)*16);
 }
 
@@ -1682,17 +1763,37 @@
 	Fixed *r0, *r1, *r2, *r3;
 	GF_Matrix res;
 	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]; r0[3] = mx->m[12]; r0[4] = FIX_ONE; r0[5] = r0[6] = r0[7] = 0;
-	r1[0] = mx->m[1]; r1[1] = mx->m[5]; r1[2] = mx->m[9]; r1[3] = mx->m[13]; r1[5] = FIX_ONE; r1[4] = r1[6] = r1[7] = 0;
-	r2[0] = mx->m[2]; r2[1] = mx->m[6]; r2[2] = mx->m[10]; r2[3] = mx->m[14]; r2[6] = FIX_ONE; r2[4] = r2[5] = r2[7] = 0;
-	r3[0] = mx->m[3]; r3[1] = mx->m[7]; r3[2] = mx->m[11]; r3[3] = mx->m[15]; r3[7] = FIX_ONE; r3[4] = r3[5] = r3[6] = 0;
+	r0[0] = mx->m[0];
+	r0[1] = mx->m[4];
+	r0[2] = mx->m[8];
+	r0[3] = mx->m[12];
+	r0[4] = FIX_ONE;
+	r0[5] = r0[6] = r0[7] = 0;
+	r1[0] = mx->m[1];
+	r1[1] = mx->m[5];
+	r1[2] = mx->m[9];
+	r1[3] = mx->m[13];
+	r1[5] = FIX_ONE;
+	r1[4] = r1[6] = r1[7] = 0;
+	r2[0] = mx->m[2];
+	r2[1] = mx->m[6];
+	r2[2] = mx->m[10];
+	r2[3] = mx->m[14];
+	r2[6] = FIX_ONE;
+	r2[4] = r2[5] = r2[7] = 0;
+	r3[0] = mx->m[3];
+	r3[1] = mx->m[7];
+	r3[2] = mx->m[11];
+	r3[3] = mx->m[15];
+	r3[7] = FIX_ONE;
+	r3[4] = r3[5] = r3[6] = 0;
 
 	/* choose pivot - or die */
 	if (ABS(r3[0]) > ABS(r2[0])) SWAP_ROWS(r3, r2);
 	if (ABS(r2[0]) > ABS(r1[0])) SWAP_ROWS(r2, r1);
 	if (ABS(r1[0]) > ABS(r0[0])) SWAP_ROWS(r1, r0);
 	if (r0[0]==0) return 0;
-	
+
 	/*eliminate first variable*/
 	m1 = gf_divfix(r1[0], r0[0]);
 	m2 = gf_divfix(r2[0], r0[0]);
@@ -1738,7 +1839,7 @@
 	if (fabs(r3[1]) > fabs(r2[1])) SWAP_ROWS(r3, r2);
 	if (fabs(r2[1]) > fabs(r1[1])) SWAP_ROWS(r2, r1);
 	if (r1[1]==0) return 0;
-	
+
 	/* eliminate second variable */
 	m2 = gf_divfix(r2[1], r1[1]);
 	m3 = gf_divfix(r3[1], r1[1]);
@@ -1773,8 +1874,11 @@
 
 	/* eliminate third variable */
 	m3 = gf_divfix(r3[2], r2[2]);
-	r3[3] -= gf_mulfix(m3, r2[3]); r3[4] -= gf_mulfix(m3, r2[4]); r3[5] -= gf_mulfix(m3, r2[5]);
-	r3[6] -= gf_mulfix(m3, r2[6]); r3[7] -= gf_mulfix(m3, r2[7]);
+	r3[3] -= gf_mulfix(m3, r2[3]);
+	r3[4] -= gf_mulfix(m3, r2[4]);
+	r3[5] -= gf_mulfix(m3, r2[5]);
+	r3[6] -= gf_mulfix(m3, r2[6]);
+	r3[7] -= gf_mulfix(m3, r2[7]);
 	/* last check */
 	if (r3[3]==0) return 0;
 
@@ -1783,17 +1887,23 @@
 	r3[5] = gf_mulfix(r3[5], s);
 	r3[6] = gf_mulfix(r3[6], s);
 	r3[7] = gf_mulfix(r3[7], s);
-	
+
 	m2 = r2[3];			/* now back substitute row 2 */
 	s = gf_invfix(r2[2]);
 	r2[4] = gf_mulfix(s, r2[4] - gf_mulfix(r3[4], m2));
 	r2[5] = gf_mulfix(s, r2[5] - gf_mulfix(r3[5], m2));
 	r2[6] = gf_mulfix(s, r2[6] - gf_mulfix(r3[6], m2));
 	r2[7] = gf_mulfix(s, r2[7] - gf_mulfix(r3[7], m2));
-	m1 = r1[3]; 
-	r1[4] -= gf_mulfix(r3[4], m1); r1[5] -= gf_mulfix(r3[5], m1); r1[6] -= gf_mulfix(r3[6], m1); r1[7] -= gf_mulfix(r3[7], m1);
+	m1 = r1[3];
+	r1[4] -= gf_mulfix(r3[4], m1);
+	r1[5] -= gf_mulfix(r3[5], m1);
+	r1[6] -= gf_mulfix(r3[6], m1);
+	r1[7] -= gf_mulfix(r3[7], m1);
 	m0 = r0[3];
-	r0[4] -= gf_mulfix(r3[4], m0); r0[5] -= gf_mulfix(r3[5], m0); r0[6] -= gf_mulfix(r3[6], m0); r0[7] -= gf_mulfix(r3[7], m0);
+	r0[4] -= gf_mulfix(r3[4], m0);
+	r0[5] -= gf_mulfix(r3[5], m0);
+	r0[6] -= gf_mulfix(r3[6], m0);
+	r0[7] -= gf_mulfix(r3[7], m0);
 
 	m1 = r1[2];			/* now back substitute row 1 */
 	s = gf_invfix(r1[1]);
@@ -1802,20 +1912,34 @@
 	r1[6] = gf_mulfix(s, r1[6] - gf_mulfix(r2[6], m1));
 	r1[7] = gf_mulfix(s, r1[7] - gf_mulfix(r2[7], m1));
 	m0 = r0[2];
-	r0[4] -= gf_mulfix(r2[4], m0); r0[5] -= gf_mulfix(r2[5], m0); r0[6] -= gf_mulfix(r2[6], m0); r0[7] -= gf_mulfix(r2[7], m0);
+	r0[4] -= gf_mulfix(r2[4], m0);
+	r0[5] -= gf_mulfix(r2[5], m0);
+	r0[6] -= gf_mulfix(r2[6], m0);
+	r0[7] -= gf_mulfix(r2[7], m0);
 
 	m0 = r0[1];			/* now back substitute row 0 */
 	s = gf_invfix(r0[0]);
 	r0[4] = gf_mulfix(s, r0[4] - gf_mulfix(r1[4], m0));
-	r0[5] = gf_mulfix(s, r0[5] - gf_mulfix(r1[5], m0)); 
+	r0[5] = gf_mulfix(s, r0[5] - gf_mulfix(r1[5], m0));
 	r0[6] = gf_mulfix(s, r0[6] - gf_mulfix(r1[6], m0));
 	r0[7] = gf_mulfix(s, r0[7] - gf_mulfix(r1[7], m0));
 
 	gf_mx_init(res)
-	res.m[0] = r0[4]; res.m[4] = r0[5]; 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[13] = r1[7];
-	res.m[2] = r2[4]; res.m[6] = r2[5]; res.m[10] = r2[6]; res.m[14] = r2[7];
-	res.m[3] = r3[4]; res.m[7] = r3[5]; res.m[11] = r3[6]; res.m[15] = r3[7];
+	res.m[0] = r0[4];
+	res.m[4] = r0[5];
+	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[13] = r1[7];
+	res.m[2] = r2[4];
+	res.m[6] = r2[5];
+	res.m[10] = r2[6];
+	res.m[14] = r2[7];
+	res.m[3] = r3[4];
+	res.m[7] = r3[5];
+	res.m[11] = r3[6];
+	res.m[15] = r3[7];
 	gf_mx_copy(*mx, res);
 	return 1;
 #undef SWAP_ROWS
@@ -1907,7 +2031,7 @@
 	Fixed t1, t2, tNEAR=FIX_MIN, tFAR=FIX_MAX;
 	Fixed temp;
 	//s8 xyorz, sign;
-	
+
 	if (ray->dir.x == 0) {
 		if ((ray->orig.x < box_min.x) || (ray->orig.x > box_max.x))
 			return 0;
@@ -1930,7 +2054,7 @@
 	}
 
 	if (ray->dir.y == 0) {
-		if ((ray->orig.y < box_min.y) || (ray->orig.y > box_max.y)) 
+		if ((ray->orig.y < box_min.y) || (ray->orig.y > box_max.y))
 			return 0;
 	} else {
 		tNEAR=FIX_MIN;
@@ -1997,10 +2121,10 @@
 	dist = gf_vec_len(radv);
 	center_proj = gf_vec_dot(radv, ray->dir);
 	if (radius + ABS(center_proj) < dist ) return 0;
-	
+
 	center_proj_sq = gf_mulfix(center_proj, center_proj);
 	hcord = center_proj_sq - gf_mulfix(dist, dist) + gf_mulfix(radius , radius);
-    if (hcord < 0) return 0;
+	if (hcord < 0) return 0;
 	if (center_proj_sq < hcord) return 0;
 	if (outPoint) {
 		center_proj -= gf_sqrt(hcord);
@@ -2012,7 +2136,7 @@
 
 /*
  *		Tomas M�ller and Ben Trumbore.
- *	 Fast, minimum storage ray-triangle intersection. 
+ *	 Fast, minimum storage ray-triangle intersection.
  *		Journal of graphics tools, 2(1):21-28, 1997
  *
  */
@@ -2098,32 +2222,41 @@
 {
 	GF_Vec4 res;
 	Fixed diagonal, s;
-    diagonal = mx->m[0] + mx->m[5] + mx->m[10];
-
-    if (diagonal > 0) {
-        s = gf_sqrt(diagonal + FIX_ONE);
-        res.q = s / 2;
-        s = gf_invfix(2*s);
-        res.x = gf_mulfix(mx->m[6] - mx->m[9], s);
-        res.y = gf_mulfix(mx->m[8] - mx->m[2], s);
-        res.z = gf_mulfix(mx->m[1] - mx->m[4], s);
-    } else {
+	diagonal = mx->m[0] + mx->m[5] + mx->m[10];
+
+	if (diagonal > 0) {
+		s = gf_sqrt(diagonal + FIX_ONE);
+		res.q = s / 2;
+		s = gf_invfix(2*s);
+		res.x = gf_mulfix(mx->m[6] - mx->m[9], s);
+		res.y = gf_mulfix(mx->m[8] - mx->m[2], s);
+		res.z = gf_mulfix(mx->m[1] - mx->m[4], s);
+	} else {
 		Fixed q[4];
-        u32 i, j, k;
-        static const u32 next[3] = { 1, 2, 0 };
-        i = 0;
-        if (mx->m[5] > mx->m[0]) { i = 1; }
-        if (mx->m[10] > mx->m[4*i+i]) { i = 2; }
-        j = next[i];
-        k = next[j];
-        s = gf_sqrt(FIX_ONE + mx->m[4*i + i] - (mx->m[4*j+j] + mx->m[4*k+k]) );
-        q[i] = s / 2;
-        if (s != 0) { s = gf_invfix(2*s); }
-        q[3] = gf_mulfix(mx->m[4*j+k] - mx->m[4*k+j], s);
-        q[j] = gf_mulfix(mx->m[4*i+j] + mx->m[4*j+i], s);
-        q[k] = gf_mulfix(mx->m[4*i+k] + mx->m[4*k+i], s);
-		res.x = q[0]; res.y = q[1]; res.z = q[2]; res.q = q[3];
-    }
+		u32 i, j, k;
+		static const u32 next[3] = { 1, 2, 0 };
+		i = 0;
+		if (mx->m[5] > mx->m[0]) {
+			i = 1;
+		}
+		if (mx->m[10] > mx->m[4*i+i]) {
+			i = 2;
+		}
+		j = next[i];
+		k = next[j];
+		s = gf_sqrt(FIX_ONE + mx->m[4*i + i] - (mx->m[4*j+j] + mx->m[4*k+k]) );
+		q[i] = s / 2;
+		if (s != 0) {
+			s = gf_invfix(2*s);
+		}
+		q[3] = gf_mulfix(mx->m[4*j+k] - mx->m[4*k+j], s);
+		q[j] = gf_mulfix(mx->m[4*i+j] + mx->m[4*j+i], s);
+		q[k] = gf_mulfix(mx->m[4*i+k] + mx->m[4*k+i], s);
+		res.x = q[0];
+		res.y = q[1];
+		res.z = q[2];
+		res.q = q[3];
+	}
 	return res;
 }
 
@@ -2131,23 +2264,23 @@
 GF_Vec4 gf_quat_to_rotation(GF_Vec4 *quat)
 {
 	GF_Vec4 r;
-    Fixed val = gf_acos(quat->q);
-    if (val == 0) {
-        r.x = r.y = 0;
-        r.z = FIX_ONE;
+	Fixed val = gf_acos(quat->q);
+	if (val == 0) {
+		r.x = r.y = 0;
+		r.z = FIX_ONE;
 		r.q = 0;
-    } else {
+	} else {
 		GF_Vec axis;
-        Fixed sin_val = gf_sin(val);
-        axis.x = gf_divfix(quat->x, sin_val);
-        axis.y = gf_divfix(quat->y, sin_val);
-        axis.z = gf_divfix(quat->z, sin_val);
+		Fixed sin_val = gf_sin(val);
+		axis.x = gf_divfix(quat->x, sin_val);
+		axis.y = gf_divfix(quat->y, sin_val);
+		axis.z = gf_divfix(quat->z, sin_val);
 		gf_vec_norm(&axis);
 		r.x = axis.x;
 		r.y = axis.y;
 		r.z = axis.z;
-        r.q= 2 * val;
-    }
+		r.q= 2 * val;
+	}
 	return r;
 }
 
@@ -2181,7 +2314,9 @@
 	GF_Vec4 r;
 	if (cos_a < -FIX_ONE) cos_a = -FIX_ONE;
 	else if (cos_a > FIX_ONE) cos_a = FIX_ONE;
-	r.x = axis.x; r.y = axis.y; r.z = axis.z;
+	r.x = axis.x;
+	r.y = axis.y;
+	r.z = axis.z;
 	r.q = gf_acos(cos_a);
 	return gf_quat_from_rotation(r);
 }
@@ -2347,8 +2482,8 @@
 Bool gf_bbox_point_inside(GF_BBox *box, GF_Vec *p)
 {
 	return (p->x >= box->min_edge.x && p->x <= box->max_edge.x &&
-			p->y >= box->min_edge.y && p->y <= box->max_edge.y &&
-			p->z >= box->min_edge.z && p->z <= box->max_edge.z);
+	        p->y >= box->min_edge.y && p->y <= box->max_edge.y &&
+	        p->z >= box->min_edge.z && p->z <= box->max_edge.z);
 }
 
 /*vertices are ordered to respect p vertex indexes (vertex from bbox closer to plane)

gpac-0.5.0.svn5178.tar.bz2/src/utils/module.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/module.c Changed

@@ -39,7 +39,7 @@
 	} else {\
 		gf_list_add(mgr->plugin_registry, pr);	\
 	}	\
-	}	
+	}
 
 #ifdef GPAC_STATIC_MODULES
 	GF_InterfaceRegister *pr;
@@ -48,14 +48,14 @@
 	LOAD_PLUGIN(aac_in);
 #endif
 #ifdef GPAC_HAS_AC3
-    LOAD_PLUGIN(ac3);
+	LOAD_PLUGIN(ac3);
 #endif
 #ifdef GPAC_HAS_ALSA
-    LOAD_PLUGIN(alsa);
+	LOAD_PLUGIN(alsa);
 #endif
-    LOAD_PLUGIN(audio_filter);
+	LOAD_PLUGIN(audio_filter);
 	LOAD_PLUGIN(bifs);
-#ifndef GPAC_DISABLE_SMGR	
+#ifndef GPAC_DISABLE_SMGR
 	LOAD_PLUGIN(ctx_load);
 #endif
 #ifdef GPAC_HAS_DIRECTFB
@@ -78,27 +78,27 @@
 	LOAD_PLUGIN(gpac_js);
 #endif
 	LOAD_PLUGIN(img_in);
-    LOAD_PLUGIN(isma_ea);
+	LOAD_PLUGIN(isma_ea);
 	LOAD_PLUGIN(isom);
 #ifdef GPAC_HAS_JACK
 	LOAD_PLUGIN(jack);
 #endif
 #ifndef GPAC_DISABLE_SVG
 	LOAD_PLUGIN(laser);
-#endif	
+#endif
 #ifdef GPAC_HAS_MAD
 	LOAD_PLUGIN(mp3_in);
 #endif
-    LOAD_PLUGIN(mpd_in);
+	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(mse_in);
+#endif
 	LOAD_PLUGIN(odf_dec);
 #ifdef GPAC_HAS_OGG
-    LOAD_PLUGIN(ogg_in);
+	LOAD_PLUGIN(ogg_in);
 #endif
 #ifdef GPAC_HAS_OPENHEVC
 	LOAD_PLUGIN(openhevc);
@@ -115,21 +115,21 @@
 #ifdef GPAC_HAS_PULSEAUDIO
 	LOAD_PLUGIN(pulseaudio);
 #endif
-	LOAD_PLUGIN(raw_out);	
+	LOAD_PLUGIN(raw_out);
 #ifdef GPAC_HAS_FFMPEG
-	//    LOAD_PLUGIN(redirect_av);    
+	//    LOAD_PLUGIN(redirect_av);
 #endif
 	LOAD_PLUGIN(rtp_in);
-    LOAD_PLUGIN(saf_in);
+	LOAD_PLUGIN(saf_in);
 #ifdef GPAC_HAS_SDL
-    LOAD_PLUGIN(sdl_out);
+	LOAD_PLUGIN(sdl_out);
 #endif
 	LOAD_PLUGIN(soft_raster);
-#if !defined(GPAC_DISABLE_SMGR) && !defined(GPAC_DISABLE_SVG)	
+#if !defined(GPAC_DISABLE_SMGR) && !defined(GPAC_DISABLE_SVG)
 	LOAD_PLUGIN(svg_in);
-#endif		
-	LOAD_PLUGIN(timedtext);			
-    LOAD_PLUGIN(validator);
+#endif
+	LOAD_PLUGIN(timedtext);
+	LOAD_PLUGIN(validator);
 #ifdef GPAC_HAS_WAVEOUT
 	LOAD_PLUGIN(wave_out);
 #endif
@@ -143,9 +143,9 @@
 	LOAD_PLUGIN(x11_out);
 #endif
 #ifdef GPAC_HAS_XVID
-    LOAD_PLUGIN(xvid);
+	LOAD_PLUGIN(xvid);
 #endif
-					
+
 	//todo fix project for iOS
 #ifdef GPAC_IPHONE
 //    LOAD_PLUGIN(ios_cam);
@@ -156,7 +156,7 @@
 #endif //GPAC_STATIC_MODULES
 
 #undef LOAD_PLUGIN
-	
+
 }
 
 
@@ -218,7 +218,7 @@
 	}
 
 	/* Delete module directories*/
-	for (i = 0; i < pm->num_dirs; i++){
+	for (i = 0; i < pm->num_dirs; i++) {
 		gf_free((void*)pm->dirs[i]);
 	}
 
@@ -247,17 +247,17 @@
 }
 
 GF_EXPORT
-const char **gf_modules_get_module_directories(GF_ModuleManager *pm, u32* num_dirs){
+const char **gf_modules_get_module_directories(GF_ModuleManager *pm, u32* num_dirs) {
 	char* directories;
 	char* tmp_dirs;
 	char * pch;
 	if (!pm) return NULL;
-	if (pm->num_dirs > 0 ){
+	if (pm->num_dirs > 0 ) {
 		*num_dirs = pm->num_dirs;
 		return pm->dirs;
 	}
 	if (!pm->cfg) return NULL;
-	
+
 	/* Get directory from config file */
 	directories = (char*)gf_cfg_get_key(pm->cfg, "General", "ModulesDirectory");
 	if (! directories) {
@@ -265,12 +265,13 @@
 		return NULL;
 	}
 
-	tmp_dirs = gf_strdup(directories);
+//	tmp_dirs = gf_strdup(directories);
+	tmp_dirs = directories;
 	pch = strtok (tmp_dirs,";");
 
 	while (pch != NULL)
 	{
-		if (pm->num_dirs == MAX_MODULE_DIRS){
+		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"));
 			break;
 		}
@@ -279,7 +280,7 @@
 		pm->num_dirs++;
 		pch = strtok (NULL, ";");
 	}
-	gf_free(tmp_dirs);
+//	gf_free(tmp_dirs);
 	*num_dirs = pm->num_dirs;
 	return pm->dirs;
 }
@@ -292,20 +293,20 @@
 	ModuleInstance *inst;
 	GF_BaseInterface *ifce;
 
-	if (!pm){
+	if (!pm) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load_interface() : No Module Manager set\n"));
 		return NULL;
 	}
 	gf_mx_p(pm->mutex);
 	inst = (ModuleInstance *) gf_list_get(pm->plug_list, whichplug);
-	if (!inst){
+	if (!inst) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load_interface() : no module %d exist.\n", whichplug));
 		gf_mx_v(pm->mutex);
 		return NULL;
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Load interface...%s\n", inst->name));
 	/*look in cache*/
-	if (!pm->cfg){
+	if (!pm->cfg) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] No pm->cfg has been set !!!\n"));
 		gf_mx_v(pm->mutex);
 		return NULL;
@@ -314,7 +315,7 @@
 	if (opt) {
 		const char * ifce_str = gf_4cc_to_str(InterfaceFamily);
 		snprintf(szKey, 32, "%s:yes", ifce_str ? ifce_str : "(null)");
-		if (!strstr(opt, szKey)){
+		if (!strstr(opt, szKey)) {
 			gf_mx_v(pm->mutex);
 			return NULL;
 		}
@@ -389,7 +390,7 @@
 	const char *file_name;
 	u32 i, count;
 	GF_BaseInterface *ifce;
-	if (!pm || !plug_name || !pm->plug_list || !pm->cfg){
+	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));
 		return NULL;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/utils/module_wrap.h -> gpac-0.5.1.svn5491.tar.xz/src/utils/module_wrap.h Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -43,7 +43,7 @@
 	struct __tag_mod_man *plugman;
 	char *name;
 	GF_List *interfaces;
-	
+
 	/*for static modules*/
 	GF_InterfaceRegister *ifce_reg;
 
@@ -77,7 +77,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+
 /*returns 1 if a module with the same filename is already loaded*/
 Bool gf_module_is_loaded(GF_ModuleManager *pm, char *filename);

gpac-0.5.0.svn5178.tar.bz2/src/utils/os_config_init.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/os_config_init.c Changed

@@ -19,10 +19,12 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 #include <gpac/config_file.h>
 
 
@@ -62,10 +64,10 @@
 
 
 #ifdef GPAC_STATIC_MODULES
-static Bool enum_mod_dir(void *cbck, char *item_name, char *item_path)
+static Bool enum_mod_dir(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	if (!strnicmp(item_name, "gm_", 3)) {
-printf("Found %s\n", item_name);
+		printf("Found %s\n", item_name);
 		*(Bool *) cbck = GF_TRUE;
 	}
 	return GF_FALSE;
@@ -108,8 +110,8 @@
 	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);
@@ -117,7 +119,7 @@
 #else
 	GetModuleFileNameA(NULL, file_path, GF_MAX_PATH);
 #endif
-	
+
 	/*remove exe name*/
 	if (strstr(file_path, ".exe")) {
 		sep = strrchr(file_path, '\\');
@@ -127,12 +129,12 @@
 	strcpy(szPath, file_path);
 	strlwr(szPath);
 
-	/*if this is run from a browser, we do not get our app path - fortunately on Windows, we always use 'GPAC' in the 
+	/*if this is run from a browser, we do not get our app path - fortunately on Windows, we always use 'GPAC' in the
 	installation path*/
 	if (!strstr(file_path, "gpac")) {
 		HKEY hKey = NULL;
 		DWORD dwSize = GF_MAX_PATH;
-		
+
 		/*locate the key in current user, then in local machine*/
 #ifdef _WIN32_WCE
 		DWORD dwType = REG_SZ;
@@ -147,7 +149,7 @@
 #else
 		if (RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\GPAC", 0, KEY_READ, &hKey) != ERROR_SUCCESS)
 			RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\GPAC", 0, KEY_READ, &hKey);
-		
+
 		dwSize = GF_MAX_PATH;
 
 #ifdef _DEBUG
@@ -161,7 +163,7 @@
 
 
 	if (path_type==GF_PATH_APP) return 1;
-	
+
 	if (path_type==GF_PATH_GUI) {
 		char *sep;
 		strcat(file_path, "\\gui");
@@ -202,7 +204,7 @@
 	f = gf_f64_open(szPath, "wb");
 	/*COMPLETE FAILURE*/
 	if (!f) return 0;
-	
+
 	fclose(f);
 	gf_delete_file(szPath);
 	return 1;
@@ -221,7 +223,7 @@
 	return 1;
 }
 
-	
+
 #elif defined(__SYMBIAN__)
 
 #if defined(__SERIES60_3X__)
@@ -256,19 +258,19 @@
 	if (path_type==GF_PATH_CFG) {
 		char *user_home = getenv("HOME");
 #ifdef GPAC_IPHONE
-        char buf[PATH_MAX];
-        char *res;
+		char buf[PATH_MAX];
+		char *res;
 #endif
 		if (!user_home) return 0;
 #ifdef GPAC_IPHONE
-        res = realpath(user_home, buf);
-        if (res) {
-            strcpy(file_path, buf);
-        } else
+		res = realpath(user_home, buf);
+		if (res) {
+			strcpy(file_path, buf);
+		} else
 #endif
-        strcpy(file_path, user_home);
+			strcpy(file_path, user_home);
 		if (file_path[strlen(file_path)-1] == '/') file_path[strlen(file_path)-1] = 0;
-        return 1;
+		return 1;
 	}
 
 	if (path_type==GF_PATH_APP) {
@@ -282,7 +284,7 @@
 
 #elif defined(GPAC_CONFIG_LINUX)
 		size = readlink("/proc/self/exe", file_path, GF_MAX_PATH);
-		if (size>0) {				
+		if (size>0) {
 			char *sep = strrchr(file_path, '/');
 			if (sep) sep[0] = 0;
 			return 1;
@@ -291,7 +293,7 @@
 		return 0;
 	}
 
-	
+
 	/*locate the app*/
 	if (!get_default_install_path(app_path, GF_PATH_APP)) return 0;
 
@@ -363,9 +365,9 @@
 		get_default_install_path(app_path, GF_PATH_APP);
 		strcat(app_path, "/gui");
 		if (check_file_exists("gui_old.bt", app_path, file_path)) return 1;
-#endif		
+#endif
 	}
-	else { // (path_type==GF_PATH_MODULES) 
+	else { // (path_type==GF_PATH_MODULES)
 		strcat(app_path, "/Contents/MacOS/modules");
 		if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
 	}
@@ -390,7 +392,7 @@
 	}
 	/*Create the config file*/
 	sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
-    fprintf(stderr, "Trying to create config file: %s", szPath);
+	fprintf(stderr, "Trying to create config file: %s", szPath);
 	f = gf_f64_open(szPath, "wt");
 	if (!f) return NULL;
 	fclose(f);
@@ -461,7 +463,7 @@
 	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, "Compositor", "DisableGLUScale", "yes");
 #endif
 
 	gf_cfg_set_key(cfg, "Video", "SwitchResolution", "no");
@@ -487,7 +489,6 @@
 }
 
 /*check if modules directory has changed in the config file
-this is mainly intended for OSX where we can have an install in /usr/... and an install in /Applications/Osmo4.app 
 */
 static void check_modules_dir(GF_Config *cfg)
 {
@@ -495,24 +496,56 @@
 	const char *opt;
 
 	if ( get_default_install_path(path, GF_PATH_MODULES) ) {
-#if defined(__DARWIN__) || defined(__APPLE__)
 		opt = gf_cfg_get_key(cfg, "General", "ModulesDirectory");
-		if (!opt || strcmp(opt, path)) gf_cfg_set_key(cfg, "General", "ModulesDirectory", path);
+		//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);
+#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);
+		} else  {
+			Bool erase_modules_dir = 0;
+			const char *opt64 = gf_cfg_get_key(cfg, "Systems", "64bits");
+			if (!opt64) {
+				//first run or old versions, erase
+				erase_modules_dir = 1;
+			} else if (!strcmp(opt64, "yes") ) {
+#ifndef GPAC_64_BITS
+				erase_modules_dir = 1;
+#endif
+			} else {
+#ifdef GPAC_64_BITS
+				erase_modules_dir = 1;
+#endif
+			}
+
+#ifdef GPAC_64_BITS
+			opt64 = "yes";
+#else
+			opt64 = "no";
+#endif
+			gf_cfg_set_key(cfg, "Systems", "64bits", opt64);
+
+			if (erase_modules_dir) {
+				gf_cfg_set_key(cfg, "General", "ModulesDirectory", path);
+			}
+		}
 #endif
 	}
 
-	/*if startup file was disabled, do not attempt to correct it*/	
+	/*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) ) {
 		opt = gf_cfg_get_key(cfg, "General", "StartupFile");
 		if (strstr(opt, "gui.bt") && strcmp(opt, path)) {
-#if defined(_WIN32_WCE) || defined(WIN32)
-			strcat(path, "\\gui.bt");
-#else
+#if defined(__DARWIN__) || defined(__APPLE__)
 			strcat(path, "/gui.bt");
-#endif
 			gf_cfg_set_key(cfg, "General", "StartupFile", path);
+#endif
 		}
 	}
 }
@@ -565,3 +598,4 @@
 	return cfg;
 }
 
+#endif

gpac-0.5.0.svn5178.tar.bz2/src/utils/os_divers.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/os_divers.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -159,14 +159,14 @@
 		return GF_IO_ERR;
 	}
 #else
-    int res = rmdir(DirPathName);
+	int res = rmdir(DirPathName);
 	if (res==-1) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete director %s: last error %d\n", DirPathName, errno  ));
 		return GF_IO_ERR;
 	}
 #endif
 	return GF_OK;
-}   
+}
 
 GF_EXPORT
 GF_Err gf_mkdir(char* DirPathName)
@@ -180,19 +180,19 @@
 		int err = GetLastError();
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
 	}
-#elif defined (WIN32) 
+#elif defined (WIN32)
 	int res = mkdir(DirPathName);
 	if (res==-1) {
 		int err = GetLastError();
 		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){
+#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;
-		}else{
+		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, errno ));
 			return GF_IO_ERR;
 		}
@@ -201,16 +201,16 @@
 	return GF_OK;
 }
 
-static Bool delete_dir(void *cbck, char *item_name, char *item_path)
+static Bool delete_dir(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	Bool directory_clean_mode = *(Bool*)cbck;
 
-	if(directory_clean_mode){
-		 gf_cleanup_dir(item_path);
-		 gf_rmdir(item_path);		
-	}else{
-		gf_delete_file(item_path);		
-	}	
+	if(directory_clean_mode) {
+		gf_cleanup_dir(item_path);
+		gf_rmdir(item_path);
+	} else {
+		gf_delete_file(item_path);
+	}
 	return 0;
 }
 
@@ -219,7 +219,7 @@
 	Bool directory_clean_mode;
 
 	directory_clean_mode = 1;
-	gf_enum_directory(DirPathName, 1, delete_dir, &directory_clean_mode, NULL);														
+	gf_enum_directory(DirPathName, 1, delete_dir, &directory_clean_mode, NULL);
 	directory_clean_mode = 0;
 	gf_enum_directory(DirPathName, 0, delete_dir, &directory_clean_mode, NULL);
 
@@ -263,8 +263,8 @@
 #ifndef _TIMEZONE_DEFINED
 struct timezone
 {
-    int tz_minuteswest; /* minutes W of Greenwich */
-    int tz_dsttime;     /* type of dst correction */
+	int tz_minuteswest; /* minutes W of Greenwich */
+	int tz_dsttime;     /* type of dst correction */
 };
 #define _TIMEZONE_DEFINED
 #endif /* _TIMEZONE_DEFINED */
@@ -278,53 +278,53 @@
 
 int gettimeofday(struct timeval *tp, struct timezone *tzp)
 {
-    SYSTEMTIME      st;
-    FILETIME        ft;
-    LARGE_INTEGER   li;
-    TIME_ZONE_INFORMATION tzi;
-    __int64         t;
-    static int      tzflag;
-
-    if (NULL != tp)
-    {
-        GetSystemTime(&st);
-        SystemTimeToFileTime(&st, &ft);
-        li.LowPart  = ft.dwLowDateTime;
-        li.HighPart = ft.dwHighDateTime;
-        t  = li.QuadPart;       /* In 100-nanosecond intervals */
-        t -= EPOCHFILETIME;     /* Offset to the Epoch time */
-        t /= 10;                /* In microseconds */
-        tp->tv_sec  = (long)(t / 1000000);
-        tp->tv_usec = (long)(t % 1000000);
-    }
-
-    if (NULL != tzp)
-    {   
-        GetTimeZoneInformation(&tzi);
-
-        tzp->tz_minuteswest = tzi.Bias;
-        if (tzi.StandardDate.wMonth != 0)
-        {
-            tzp->tz_minuteswest += tzi.StandardBias * 60;
-        }
-
-        if (tzi.DaylightDate.wMonth != 0)
-        {
-            tzp->tz_dsttime = 1;
-        }
-        else
-        {
-            tzp->tz_dsttime = 0;
-        }
-    }
-
-    return 0;
+	SYSTEMTIME      st;
+	FILETIME        ft;
+	LARGE_INTEGER   li;
+	TIME_ZONE_INFORMATION tzi;
+	__int64         t;
+	static int      tzflag;
+
+	if (NULL != tp)
+	{
+		GetSystemTime(&st);
+		SystemTimeToFileTime(&st, &ft);
+		li.LowPart  = ft.dwLowDateTime;
+		li.HighPart = ft.dwHighDateTime;
+		t  = li.QuadPart;       /* In 100-nanosecond intervals */
+		t -= EPOCHFILETIME;     /* Offset to the Epoch time */
+		t /= 10;                /* In microseconds */
+		tp->tv_sec  = (long)(t / 1000000);
+		tp->tv_usec = (long)(t % 1000000);
+	}
+
+	if (NULL != tzp)
+	{
+		GetTimeZoneInformation(&tzi);
+
+		tzp->tz_minuteswest = tzi.Bias;
+		if (tzi.StandardDate.wMonth != 0)
+		{
+			tzp->tz_minuteswest += tzi.StandardBias * 60;
+		}
+
+		if (tzi.DaylightDate.wMonth != 0)
+		{
+			tzp->tz_dsttime = 1;
+		}
+		else
+		{
+			tzp->tz_dsttime = 0;
+		}
+	}
+
+	return 0;
 }
 
 
 #if _GPAC_UNUSED
 /*
-	time between jan 1, 1601 and jan 1, 1970 in units of 100 nanoseconds 
+	time between jan 1, 1601 and jan 1, 1970 in units of 100 nanoseconds
 	FILETIME in Win32 is from jan 1, 1601
 */
 
@@ -348,9 +348,9 @@
 
 #elif defined(WIN32)
 
-s32 gettimeofday(struct timeval *tp, void *tz)
+static s32 gettimeofday(struct timeval *tp, void *tz)
 {
-	struct _timeb timebuffer;   
+	struct _timeb timebuffer;
 
 	_ftime( &timebuffer );
 	tp->tv_sec  = (long) (timebuffer.time);
@@ -404,6 +404,26 @@
 #endif
 }
 
+/**
+ * Remove existing single-quote from a single-quoted string.
+ * The caller is responsible for deallocating the returns string with gf_free()
+ */
+static char* gf_sanetize_single_quoted_string(const char *src) {
+	int i, j;
+	char *out = gf_malloc(4*strlen(src)+3);
+	out[0] = '\'';
+	for (i=0, j=1; (out[j]=src[i]); ++i, ++j) {
+		if (src[i]=='\'') {
+			out[++j]='\\';
+			out[++j]='\'';
+			out[++j]='\'';
+		}
+	}
+	out[j++] = '\'';
+	out[j++] = 0;
+	return out;
+}
+
 GF_EXPORT
 GF_Err gf_move_file(const char *fileName, const char *newFileName)
 {
@@ -417,12 +437,18 @@
 	/* success if != 0 */
 	return (MoveFile(fileName, newFileName) == 0 ) ? GF_IO_ERR : GF_OK;
 #else
-	/* success is == 0 */
-	char cmd[1024];
+	GF_Err e = GF_IO_ERR;
+	char cmd[1024], *arg1, *arg2;
 	if (!fileName || !newFileName)
 		return GF_IO_ERR;
-	snprintf(cmd, sizeof(cmd), "mv '%s' '%s' > /dev/null 2>&1", fileName, newFileName);
-	return ( system(cmd) == 0) ? GF_OK : 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;
+	e = (system(cmd) == 0) ? GF_OK : GF_IO_ERR;
+error:
+	gf_free(arg1);
+	gf_free(arg2);
+	return e;
 #endif
 }
 
@@ -453,8 +479,8 @@
 GF_EXPORT
 u64 gf_file_modification_time(const char *filename)
 {
-#if defined(_WIN32_WCE) 
-	WCHAR _file[GF_MAX_PATH]; 
+#if defined(_WIN32_WCE)
+	WCHAR _file[GF_MAX_PATH];
 	WIN32_FIND_DATA FindData;
 	HANDLE fh;
 	ULARGE_INTEGER uli;
@@ -507,13 +533,13 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): 0x%08x\n", err));
 	}
 	/*tmpfile() may fail under vista ...*/
-	if (!GetEnvironmentVariable("TEMP",tmp,MAX_PATH)) 
+	if (!GetEnvironmentVariable("TEMP",tmp,MAX_PATH))
 		return NULL;
 	sprintf(t_file, "\\gpac_%08x.tmp", (u32) tmp);
 	strcat(tmp, t_file);
 	return gf_f64_open(tmp, "w+b");
 #else
-	return tmpfile(); 
+	return tmpfile();
 #endif
 }
 
@@ -562,6 +588,7 @@
 GF_Err gf_enum_directory(const char *dir, Bool enum_directory, gf_enum_dir_item enum_dir_fct, void *cbck, const char *filter)
 {
 	char item_path[GF_MAX_PATH];
+	GF_FileEnumInfo file_info;
 
 #if defined(_WIN32_WCE)
 	char _path[GF_MAX_PATH];
@@ -575,7 +602,7 @@
 #ifdef WIN32
 	WIN32_FIND_DATA FindData;
 	HANDLE SearchH;
-#else	
+#else
 	DIR *the_dir;
 	struct dirent* the_file;
 	struct stat st;
@@ -585,6 +612,8 @@
 
 	if (filter && (!strcmp(filter, "*") || !filter[0])) filter=NULL;
 
+	memset(&file_info, 0, sizeof(GF_FileEnumInfo) );
+
 	if (!strcmp(dir, "/")) {
 #if defined(WIN32) && !defined(_WIN32_WCE)
 		u32 len;
@@ -595,8 +624,10 @@
 		GetLogicalDriveStrings(len, drives);
 		len = (u32) strlen(drives);
 		volume = drives;
+		file_info.directory = GF_TRUE;
+		file_info.drive = GF_TRUE;
 		while (len) {
-			enum_dir_fct(cbck, volume, "");
+			enum_dir_fct(cbck, volume, "", &file_info);
 			volume += len+1;
 			len = (u32) strlen(volume);
 		}
@@ -607,13 +638,13 @@
 		TDriveList aList;
 		iFs.Connect();
 		iFs.DriveList(aList);
-		for (TInt i=0;i<KMaxDrives;i++) {
+		for (TInt i=0; i<KMaxDrives; i++) {
 			if (aList[i]) {
 				char szDrive[10];
 				TChar aDrive;
 				iFs.DriveToChar(i, aDrive);
 				sprintf(szDrive, "%c:", (TUint)aDrive);
-				enum_dir_fct(cbck, szDrive, "");
+				enum_dir_fct(cbck, szDrive, "", &file_info);
 			}
 		}
 		iFs.Close();
@@ -674,6 +705,9 @@
 
 #endif
 
+		memset(&file_info, 0, sizeof(GF_FileEnumInfo) );
+
+
 #if defined (_WIN32_WCE)
 		if (!wcscmp(FindData.cFileName, _T(".") )) goto next;
 		if (!wcscmp(FindData.cFileName, _T("..") )) goto next;
@@ -686,8 +720,9 @@
 #endif
 
 #ifdef WIN32
-		if (!enum_directory && (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) goto next;
-		if (enum_directory && !(FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) goto next;
+		file_info.directory = (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? GF_TRUE : GF_FALSE;
+		if (!enum_directory && file_info.directory) goto next;
+		if (enum_directory && !file_info.directory) goto next;
 #endif
 
 		if (filter) {
@@ -715,6 +750,16 @@
 #endif
 		}
 
+#if defined(WIN32)
+		file_info.hidden = (FindData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 1 : 0;
+		file_info.system = (FindData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) ? 1 : 0;
+		file_info.size = MAXDWORD;
+		file_info.size += 1;
+		file_info.size *= FindData.nFileSizeHigh;
+		file_info.size += FindData.nFileSizeLow;
+		file_info.last_modified = (u64) ((*(LONGLONG *) &FindData.ftLastWriteTime - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
+#endif
+
 #if defined (_WIN32_WCE)
 		CE_WideToChar(FindData.cFileName, file);
 		strcpy(item_path, _path);
@@ -726,14 +771,40 @@
 #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;
-		if (enum_directory && ( (st.st_mode & S_IFMT) != S_IFDIR)) goto next;
-		if (!enum_directory && ((st.st_mode & S_IFMT) == S_IFDIR)) goto next;
+
+		file_info.directory = ((st.st_mode & S_IFMT) == S_IFDIR) ? GF_TRUE : GF_FALSE;
+		if (enum_directory && !file_info.directory) goto next;
+		if (!enum_directory && file_info.directory) goto next;
+
+		file_info.size = st.st_size;
+
+		{
+			struct tm _t = * gmtime(& st.st_mtime);
+			file_info.last_modified = mktime(&_t);
+		}
 		file = the_file->d_name;
+		if (file && file[0]=='.') file_info.hidden = 1;
+
+		if (file_info.directory) {
+			char * parent_name = strrchr(item_path, '/');
+			if (!parent_name) {
+				file_info.drive = GF_TRUE;
+			} else {
+				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))) {
+						file_info.drive = GF_TRUE;
+					}
+				}
+				parent_name[0] = '/';
+			}
+		}
 #endif
-		if (enum_dir_fct(cbck, file, item_path)) {
+		if (enum_dir_fct(cbck, file, item_path, &file_info)) {
 #ifdef WIN32
 			BOOL ret = FindClose(SearchH);
 			if (!ret) {
@@ -856,8 +927,8 @@
 #endif
 
 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 size, size_t nmemb,
+                 FILE *stream)
 {
 	size_t result = fwrite(ptr, size, nmemb, stream);
 	if (result != nmemb) {
@@ -898,8 +969,12 @@
 {
 	return 0;
 }
-char gf_prompt_get_char() { return 0; }
-void gf_prompt_set_echo_off(Bool echo_off) { return; }
+char gf_prompt_get_char() {
+	return 0;
+}
+void gf_prompt_set_echo_off(Bool echo_off) {
+	return;
+}
 
 #else
 
@@ -916,7 +991,7 @@
 	return getchar();
 }
 
-void gf_prompt_set_echo_off(Bool echo_off) 
+void gf_prompt_set_echo_off(Bool echo_off)
 {
 	DWORD flags;
 	HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);
@@ -954,8 +1029,8 @@
 	if (new_line) fprintf(stderr, "\n");
 }
 
-void gf_prompt_set_echo_off(Bool echo_off) 
-{ 
+void gf_prompt_set_echo_off(Bool echo_off)
+{
 	init_keyboard();
 	if (echo_off) t_orig.c_lflag &= ~ECHO;
 	else t_orig.c_lflag |= ECHO;
@@ -1037,8 +1112,8 @@
 NTQuerySystemInfo MyQuerySystemInfo = NULL;
 
 #ifndef PROCESS_MEMORY_COUNTERS
-typedef struct _PROCESS_MEMORY_COUNTERS 
-{  
+typedef struct _PROCESS_MEMORY_COUNTERS
+{
 	DWORD cb;
 	DWORD PageFaultCount;
 	SIZE_T PeakWorkingSetSize;
@@ -1053,7 +1128,7 @@
 #endif
 
 #ifndef SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION
-typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION 
+typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION
 {
 	LARGE_INTEGER IdleTime;
 	LARGE_INTEGER KernelTime;
@@ -1065,7 +1140,7 @@
 
 
 #else
-	
+
 static u64 last_cpu_u_k_time = 0;
 static u64 last_cpu_idle_time = 0;
 static u64 mem_at_startup = 0;
@@ -1107,8 +1182,8 @@
 	return (u64) ((now.QuadPart * 1000000) / frequency.QuadPart);
 }
 
-static u32 OS_GetSysClockNORMAL() 
-{ 
+static u32 OS_GetSysClockNORMAL()
+{
 #ifdef _WIN32_WCE
 	return GetTickCount();
 #else
@@ -1116,22 +1191,22 @@
 #endif
 }
 
-static u64 OS_GetSysClockNORMAL_FULL() 
-{ 
+static u64 OS_GetSysClockNORMAL_FULL()
+{
 	u64 res = OS_GetSysClockNORMAL();
 	return res*1000;
 }
 
 #endif /* WIN32 */
 
-#if defined(__sh__) 
+#if defined(__sh__)
 /* Avoid exception for denormalized floating point values */
 static int
 sh4_get_fpscr()
 {
-   int ret;
-   asm volatile ("sts fpscr,%0" : "=r" (ret));
-   return ret;
+	int ret;
+	asm volatile ("sts fpscr,%0" : "=r" (ret));
+	return ret;
 }
 
 static void
@@ -1153,20 +1228,20 @@
 void
 sh4_change_fpscr(int off, int on)
 {
-   int b = sh4_get_fpscr();
-   off = ~off;
-   off |=   0x00180000;
-   on  &= ~ 0x00180000;
-   b &= off;
-   b |= on;
-   sh4_put_fpscr(b);
-   __fpscr_values[0] &= off;
-   __fpscr_values[0] |= on;
-   __fpscr_values[1] &= off;
-   __fpscr_values[1] |= on;
+	int b = sh4_get_fpscr();
+	off = ~off;
+	off |=   0x00180000;
+	on  &= ~ 0x00180000;
+	b &= off;
+	b |= on;
+	sh4_put_fpscr(b);
+	__fpscr_values[0] &= off;
+	__fpscr_values[0] |= on;
+	__fpscr_values[1] &= off;
+	__fpscr_values[1] |= on;
 }
 
-#endif 
+#endif
 
 #ifdef GPAC_MEMORY_TRACKING
 void gf_mem_enable_tracker();
@@ -1174,6 +1249,36 @@
 
 static u64 memory_at_gpac_startup = 0;
 
+static u32 gpac_argc = 0;
+const char **gpac_argv = NULL;
+
+GF_EXPORT
+void gf_sys_set_args(s32 argc, const char **argv)
+{
+	//for OSX we allow overwrite of argc/argv due to different behavior between console-mode apps and GUI
+#if !defined(__DARWIN__) && !defined(__APPLE__)
+	if (!gpac_argc && (argc>=0) ) 
+#endif
+	{
+		gpac_argc = (u32) argc;
+		gpac_argv = argv;
+	}
+}
+GF_EXPORT
+u32 gf_sys_get_argc()
+{
+	return gpac_argc;
+}
+
+GF_EXPORT
+const char *gf_sys_get_arg(u32 arg)
+{
+	if (!gpac_argc || !gpac_argv) return NULL;
+	if (arg>=gpac_argc) return NULL;
+	return gpac_argv[arg];
+}
+
+
 GF_EXPORT
 void gf_sys_init(Bool enable_memory_tracker)
 {
@@ -1265,7 +1370,7 @@
 #ifdef GPAC_CONFIG_FREEBSD
 		{
 			s32 flags[4];
-			size_t len = sizeof(u32); 
+			size_t len = sizeof(u32);
 			flags[0] = CTL_HW;
 			flags[1] = HW_AVAILCPU;
 			sysctl(flags, 2, &the_rti.nb_cores, &len, NULL, 0);
@@ -1285,7 +1390,7 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[core] process id %d\n", the_rti.pid));
 
 #ifndef _WIN32_WCE
-		setlocale( LC_NUMERIC, "C" ); 
+		setlocale( LC_NUMERIC, "C" );
 #endif
 	}
 	sys_init += 1;
@@ -1311,7 +1416,7 @@
 
 #if defined(WIN32) && !defined(_WIN32_WCE)
 		timeEndPeriod(1);
-		
+
 		MyGetSystemTimes = NULL;
 		MyGetProcessMemoryInfo = NULL;
 		MyQuerySystemInfo = NULL;
@@ -1338,7 +1443,7 @@
 #if defined(_WIN32_WCE)
 	THREADENTRY32 tentry;
 	u64 total_cpu_time, process_cpu_time;
-	DWORD orig_perm;	
+	DWORD orig_perm;
 #endif
 	MEMORYSTATUS ms;
 	u64 creation, exit, kernel, user, process_k_u_time, proc_idle_time, proc_k_u_time;
@@ -1377,9 +1482,9 @@
 	/*get a snapshot of all running threads*/
 	orig_perm = GetCurrentPermissions();
 	SetProcPermissions(0xFFFFFFFF);
-	hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); 
+	hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
 	if (hSnapShot) {
-		tentry.dwSize = sizeof(THREADENTRY32); 
+		tentry.dwSize = sizeof(THREADENTRY32);
 		the_rti.thread_count = 0;
 		/*note we always act as if GF_RTI_ALL_PROCESSES_TIMES flag is set, since there is no other way
 		to enumerate threads from a process, and GetProcessTimes doesn't exist on CE*/
@@ -1395,15 +1500,15 @@
 				}
 			} while (Thread32Next(hSnapShot, &tentry));
 		}
-		CloseToolhelp32Snapshot(hSnapShot); 
+		CloseToolhelp32Snapshot(hSnapShot);
 	}
 
 	if (flags & GF_RTI_PROCESS_MEMORY) {
 		HEAPLIST32 hlentry;
 		HEAPENTRY32 hentry;
 		the_rti.process_memory = 0;
-		hlentry.dwSize = sizeof(HEAPLIST32); 
-		hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPHEAPLIST, the_rti.pid); 
+		hlentry.dwSize = sizeof(HEAPLIST32);
+		hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPHEAPLIST, the_rti.pid);
 		if (hSnapShot && Heap32ListFirst(hSnapShot, &hlentry)) {
 			do {
 				hentry.dwSize = sizeof(hentry);
@@ -1414,7 +1519,7 @@
 				}
 			} while (Heap32ListNext(hSnapShot, &hlentry));
 		}
-		CloseToolhelp32Snapshot(hSnapShot); 
+		CloseToolhelp32Snapshot(hSnapShot);
 	}
 	SetProcPermissions(orig_perm);
 	total_cpu_time /= 10;
@@ -1434,7 +1539,7 @@
 	else if (MyQuerySystemInfo) {
 		DWORD ret;
 		SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION info;
-		MyQuerySystemInfo(0x8 /*SystemProcessorPerformanceInformation*/, &info, sizeof(info), &ret); 
+		MyQuerySystemInfo(0x8 /*SystemProcessorPerformanceInformation*/, &info, sizeof(info), &ret);
 		if (ret && (ret<=sizeof(info))) {
 			proc_idle_time = info.IdleTime.QuadPart / 10;
 			proc_k_u_time = (info.KernelTime.QuadPart + info.UserTime.QuadPart) / 10;
@@ -1442,11 +1547,11 @@
 	}
 	/*no special API available, ONLY FETCH TIMES if requested (may eat up some time)*/
 	else if (flags & GF_RTI_ALL_PROCESSES_TIMES) {
-		PROCESSENTRY32 pentry; 
+		PROCESSENTRY32 pentry;
 		/*get a snapshot of all running threads*/
-		hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); 
+		hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
 		if (!hSnapShot) return 0;
-		pentry.dwSize = sizeof(PROCESSENTRY32); 
+		pentry.dwSize = sizeof(PROCESSENTRY32);
 		if (Process32First(hSnapShot, &pentry)) {
 			do {
 				HANDLE procH = NULL;
@@ -1462,9 +1567,9 @@
 				if (procH) CloseHandle(procH);
 			} while (Process32Next(hSnapShot, &pentry));
 		}
-		CloseHandle(hSnapShot); 
+		CloseHandle(hSnapShot);
 		proc_k_u_time /= 10;
-	} 
+	}
 
 
 	if (!process_k_u_time) {
@@ -1490,8 +1595,8 @@
 		HEAPLIST32 hlentry;
 		HEAPENTRY32 hentry;
 		the_rti.process_memory = 0;
-		hlentry.dwSize = sizeof(HEAPLIST32); 
-		hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPHEAPLIST, the_rti.pid); 
+		hlentry.dwSize = sizeof(HEAPLIST32);
+		hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPHEAPLIST, the_rti.pid);
 		if (hSnapShot && Heap32ListFirst(hSnapShot, &hlentry)) {
 			do {
 				hentry.dwSize = sizeof(hentry);
@@ -1502,7 +1607,7 @@
 				}
 			} while (Heap32ListNext(hSnapShot, &hlentry));
 		}
-		CloseHandle(hSnapShot); 
+		CloseHandle(hSnapShot);
 	}
 #endif
 
@@ -1515,9 +1620,9 @@
 #if defined(_WIN32_WCE)
 		the_rti.total_cpu_time_diff = (u32) ((total_cpu_time - last_total_k_u_time)/1000);
 		/*we're not that accurate....*/
-		if (the_rti.total_cpu_time_diff > the_rti.sampling_period_duration) 
+		if (the_rti.total_cpu_time_diff > the_rti.sampling_period_duration)
 			the_rti.sampling_period_duration = the_rti.total_cpu_time_diff;
-	
+
 		/*rough values*/
 		the_rti.cpu_idle_time = the_rti.sampling_period_duration - the_rti.total_cpu_time_diff;
 		the_rti.total_cpu_usage = (u32) (100 * the_rti.total_cpu_time_diff / the_rti.sampling_period_duration);
@@ -1540,9 +1645,9 @@
 			if (the_rti.total_cpu_time_diff > the_rti.sampling_period_duration) {
 				the_rti.sampling_period_duration = the_rti.total_cpu_time_diff;
 			}
-			
-			if (!proc_idle_time) 
-				proc_idle_time = last_proc_idle_time + (the_rti.sampling_period_duration - the_rti.total_cpu_time_diff); 
+
+			if (!proc_idle_time)
+				proc_idle_time = last_proc_idle_time + (the_rti.sampling_period_duration - the_rti.total_cpu_time_diff);
 
 			samp_sys_time = proc_k_u_time - last_proc_k_u_time;
 			idle = proc_idle_time - last_proc_idle_time;
@@ -1564,7 +1669,7 @@
 #endif
 	the_rti.physical_memory_avail = ms.dwAvailPhys;
 
-#if defined(_WIN32_WCE)	
+#if defined(_WIN32_WCE)
 	last_total_k_u_time = total_cpu_time;
 	if (!the_rti.process_memory) the_rti.process_memory = mem_usage_at_startup - ms.dwAvailPhys;
 #else
@@ -1578,7 +1683,7 @@
 	return 1;
 }
 
-	
+
 #elif defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
 
 #include <sys/types.h>
@@ -1651,9 +1756,9 @@
 		}
 	}
 	the_rti.physical_memory = total_physical_memory;
-	
+
 	error = task_for_pid(mach_task_self(), the_rti.pid, &task);
- 	if (error) {
+	if (error) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] Cannot get process task for PID %d: error %d\n", the_rti.pid, error));
 		return 0;
 	}
@@ -1663,7 +1768,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] Cannot get process task info (PID %d): error %d\n", the_rti.pid, error));
 		return 0;
 	}
-	
+
 	percent = 0;
 	utime = ti.user_time.seconds + ti.user_time.microseconds * 1e-6;
 	stime = ti.system_time.seconds + ti.system_time.microseconds * 1e-6;
@@ -1689,15 +1794,15 @@
 	}
 	error = vm_deallocate(mach_task_self(), (vm_offset_t)thread_table, table_size * sizeof(thread_array_t));
 	mach_port_deallocate(mach_task_self(), task);
-	
+
 	process_u_k_time = utime + stime;
-	
+
 	the_rti.sampling_instant = last_update_time;
-	
+
 	if (last_update_time) {
 		the_rti.sampling_period_duration = (entry_time - last_update_time);
 		the_rti.process_cpu_time_diff = (process_u_k_time - last_process_k_u_time) * 10;
-		
+
 		the_rti.total_cpu_time_diff = the_rti.sampling_period_duration;
 		/*TODO*/
 		the_rti.cpu_idle_time = 0;
@@ -1713,12 +1818,12 @@
 #ifdef GPAC_MEMORY_TRACKING
 	the_rti.gpac_memory = gpac_allocated_memory;
 #endif
-	
+
 	last_process_k_u_time = process_u_k_time;
 	last_cpu_idle_time = 0;
 	last_update_time = entry_time;
 	memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
-    return 1;
+	return 1;
 }
 
 //linux
@@ -1726,160 +1831,160 @@
 
 Bool gf_sys_get_rti_os(u32 refresh_time_ms, GF_SystemRTInfo *rti, u32 flags)
 {
-  u32 entry_time;
-  u64 process_u_k_time;
-  u32 u_k_time, idle_time;
+	u32 entry_time;
+	u64 process_u_k_time;
+	u32 u_k_time, idle_time;
 #if 0
-  char szProc[100];
-#endif
-  char line[2048];
-  FILE *f;
-
-  assert(sys_init);
-
-  entry_time = gf_sys_clock();
-  if (last_update_time && (entry_time - last_update_time < refresh_time_ms)) {
-	  memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
-	  return 0;
-  }
-
-  u_k_time = idle_time = 0;
-  f = gf_f64_open("/proc/stat", "r");
-  if (f) {
-	  u32 k_time, nice_time, u_time;
-	  if (fgets(line, 128, f) != NULL) {
-		  if (sscanf(line, "cpu  %u %u %u %u\n", &u_time, &k_time, &nice_time, &idle_time) == 4) {
-			  u_k_time = u_time + k_time + nice_time;
-		  }
-	  }
-	  fclose(f);
-  }
-
-  process_u_k_time = 0;
-  the_rti.process_memory = 0;
-
-  /*FIXME? under LinuxThreads this will only fetch stats for the calling thread, we would have to enumerate /proc to get
-  the complete CPU usage of all therads of the process...*/
+	char szProc[100];
+#endif
+	char line[2048];
+	FILE *f;
+
+	assert(sys_init);
+
+	entry_time = gf_sys_clock();
+	if (last_update_time && (entry_time - last_update_time < refresh_time_ms)) {
+		memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
+		return 0;
+	}
+
+	u_k_time = idle_time = 0;
+	f = gf_f64_open("/proc/stat", "r");
+	if (f) {
+		u32 k_time, nice_time, u_time;
+		if (fgets(line, 128, f) != NULL) {
+			if (sscanf(line, "cpu  %u %u %u %u\n", &u_time, &k_time, &nice_time, &idle_time) == 4) {
+				u_k_time = u_time + k_time + nice_time;
+			}
+		}
+		fclose(f);
+	}
+
+	process_u_k_time = 0;
+	the_rti.process_memory = 0;
+
+	/*FIXME? under LinuxThreads this will only fetch stats for the calling thread, we would have to enumerate /proc to get
+	the complete CPU usage of all therads of the process...*/
 #if 0
-  sprintf(szProc, "/proc/%d/stat", the_rti.pid);
-  f = gf_f64_open(szProc, "r");
-  if (f) {
-	  fflush(f);
-	  if (fgets(line, 2048, f) != NULL) {
-		  char state;
-		  char *start;
-		  long cutime, cstime, priority, nice, itrealvalue, rss;
-		  int exit_signal, processor;
-		  unsigned long flags, minflt, cminflt, majflt, cmajflt, utime, stime,starttime, vsize, rlim, startcode, endcode, startstack, kstkesp, kstkeip, signal, blocked, sigignore, sigcatch, wchan, nswap, cnswap, rem;
-		  int ppid, pgrp ,session, tty_nr, tty_pgrp, res;
-		  start = strchr(line, ')');
-		  if (start) start += 2;
-		  else {
-			  start = strchr(line, ' ');
-			  start++;
-		  }
-		  res = sscanf(start,"%c %d %d %d %d %d %lu %lu %lu %lu \
+	sprintf(szProc, "/proc/%d/stat", the_rti.pid);
+	f = gf_f64_open(szProc, "r");
+	if (f) {
+		fflush(f);
+		if (fgets(line, 2048, f) != NULL) {
+			char state;
+			char *start;
+			long cutime, cstime, priority, nice, itrealvalue, rss;
+			int exit_signal, processor;
+			unsigned long flags, minflt, cminflt, majflt, cmajflt, utime, stime,starttime, vsize, rlim, startcode, endcode, startstack, kstkesp, kstkeip, signal, blocked, sigignore, sigcatch, wchan, nswap, cnswap, rem;
+			int ppid, pgrp ,session, tty_nr, tty_pgrp, res;
+			start = strchr(line, ')');
+			if (start) start += 2;
+			else {
+				start = strchr(line, ' ');
+				start++;
+			}
+			res = sscanf(start,"%c %d %d %d %d %d %lu %lu %lu %lu \
 %lu %lu %lu %ld %ld %ld %ld %ld %ld %lu \
 %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu \
 %lu %lu %lu %lu %lu %d %d",
-							 &state, &ppid, &pgrp, &session, &tty_nr, &tty_pgrp, &flags, &minflt, &cminflt, &majflt,
-							 &cmajflt, &utime, &stime, &cutime, &cstime, &priority, &nice, &itrealvalue, &rem, &starttime,
-							 &vsize, &rss, &rlim, &startcode, &endcode, &startstack, &kstkesp, &kstkeip, &signal, &blocked,
-							 &sigignore, &sigcatch, &wchan, &nswap, &cnswap, &exit_signal, &processor);
-
-		  if (res) process_u_k_time = (u64) (cutime + cstime);
-		  else {
-			  GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] PROC %s parse error\n", szProc));
-		  }
-	  } else {
-		  GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] error reading pid/stat\n\n", szProc));
-	  }
-	  fclose(f);
-  } else {
-	  GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open %s\n", szProc));
-  }
-  sprintf(szProc, "/proc/%d/status", the_rti.pid);
-  f = gf_f64_open(szProc, "r");
-  if (f) {
-	  while (fgets(line, 1024, f) != NULL) {
-		  if (!strnicmp(line, "VmSize:", 7)) {
-			  sscanf(line, "VmSize: %"LLD" kB",  &the_rti.process_memory);
-			  the_rti.process_memory *= 1024;
-		  }
-	  }
-	  fclose(f);
-  } else {
-	  GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open %s\n", szProc));
-  }
-#endif
-
-
-  the_rti.physical_memory = the_rti.physical_memory_avail = 0;
-  f = gf_f64_open("/proc/meminfo", "r");
-  if (f) {
-	  while (fgets(line, 1024, f) != NULL) {
-		  if (!strnicmp(line, "MemTotal:", 9)) {
-			  sscanf(line, "MemTotal: "LLU" kB",  &the_rti.physical_memory);
-			  the_rti.physical_memory *= 1024;
-		  }else if (!strnicmp(line, "MemFree:", 8)) {
-			  sscanf(line, "MemFree: "LLU" kB",  &the_rti.physical_memory_avail);
-			  the_rti.physical_memory_avail *= 1024;
-			  break;
-		  }
-	  }
-	  fclose(f);
-  } else {
-	  GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open /proc/meminfo\n"));
-  }
-
-
-  the_rti.sampling_instant = last_update_time;
-
-  if (last_update_time) {
-	  the_rti.sampling_period_duration = (entry_time - last_update_time);
-	  the_rti.process_cpu_time_diff = (process_u_k_time - last_process_k_u_time) * 10;
-
-	  /*oops, we have no choice but to assume 100% cpu usage during this period*/
-	  if (!u_k_time) {
-		  the_rti.total_cpu_time_diff = the_rti.sampling_period_duration;
-		  u_k_time = last_cpu_u_k_time + the_rti.sampling_period_duration;
-		  the_rti.cpu_idle_time = 0;
-		  the_rti.total_cpu_usage = 100;
-		  if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
-		  the_rti.process_cpu_usage = (u32) ( 100 *  the_rti.process_cpu_time_diff / the_rti.sampling_period_duration);
-	  } else {
-		  u64 samp_sys_time;
-		  /*move to ms (/proc/stat gives times in 100 ms unit*/
-		  the_rti.total_cpu_time_diff = (u_k_time - last_cpu_u_k_time)*10;
-
-		  /*we're not that accurate....*/
-		  if (the_rti.total_cpu_time_diff > the_rti.sampling_period_duration)
-			  the_rti.sampling_period_duration = the_rti.total_cpu_time_diff;
-
-
-		  if (!idle_time) idle_time = (the_rti.sampling_period_duration - the_rti.total_cpu_time_diff)/10;
-		  samp_sys_time = u_k_time - last_cpu_u_k_time;
-		  the_rti.cpu_idle_time = idle_time - last_cpu_idle_time;
-		  the_rti.total_cpu_usage = (u32) ( 100 * samp_sys_time / (the_rti.cpu_idle_time + samp_sys_time ) );
-		  /*move to ms (/proc/stat gives times in 100 ms unit*/
-		  the_rti.cpu_idle_time *= 10;
-		  if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
-		  the_rti.process_cpu_usage = (u32) ( 100 *  the_rti.process_cpu_time_diff / (the_rti.cpu_idle_time + 10*samp_sys_time ) );
-	  }
-  } else {
-	  mem_at_startup = the_rti.physical_memory_avail;
-  }
-  the_rti.process_memory = mem_at_startup - the_rti.physical_memory_avail;
+			             &state, &ppid, &pgrp, &session, &tty_nr, &tty_pgrp, &flags, &minflt, &cminflt, &majflt,
+			             &cmajflt, &utime, &stime, &cutime, &cstime, &priority, &nice, &itrealvalue, &rem, &starttime,
+			             &vsize, &rss, &rlim, &startcode, &endcode, &startstack, &kstkesp, &kstkeip, &signal, &blocked,
+			             &sigignore, &sigcatch, &wchan, &nswap, &cnswap, &exit_signal, &processor);
+
+			if (res) process_u_k_time = (u64) (cutime + cstime);
+			else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] PROC %s parse error\n", szProc));
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] error reading pid/stat\n\n", szProc));
+		}
+		fclose(f);
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open %s\n", szProc));
+	}
+	sprintf(szProc, "/proc/%d/status", the_rti.pid);
+	f = gf_f64_open(szProc, "r");
+	if (f) {
+		while (fgets(line, 1024, f) != NULL) {
+			if (!strnicmp(line, "VmSize:", 7)) {
+				sscanf(line, "VmSize: %"LLD" kB",  &the_rti.process_memory);
+				the_rti.process_memory *= 1024;
+			}
+		}
+		fclose(f);
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open %s\n", szProc));
+	}
+#endif
+
+
+	the_rti.physical_memory = the_rti.physical_memory_avail = 0;
+	f = gf_f64_open("/proc/meminfo", "r");
+	if (f) {
+		while (fgets(line, 1024, f) != NULL) {
+			if (!strnicmp(line, "MemTotal:", 9)) {
+				sscanf(line, "MemTotal: "LLU" kB",  &the_rti.physical_memory);
+				the_rti.physical_memory *= 1024;
+			} else if (!strnicmp(line, "MemFree:", 8)) {
+				sscanf(line, "MemFree: "LLU" kB",  &the_rti.physical_memory_avail);
+				the_rti.physical_memory_avail *= 1024;
+				break;
+			}
+		}
+		fclose(f);
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open /proc/meminfo\n"));
+	}
+
+
+	the_rti.sampling_instant = last_update_time;
+
+	if (last_update_time) {
+		the_rti.sampling_period_duration = (entry_time - last_update_time);
+		the_rti.process_cpu_time_diff = (process_u_k_time - last_process_k_u_time) * 10;
+
+		/*oops, we have no choice but to assume 100% cpu usage during this period*/
+		if (!u_k_time) {
+			the_rti.total_cpu_time_diff = the_rti.sampling_period_duration;
+			u_k_time = last_cpu_u_k_time + the_rti.sampling_period_duration;
+			the_rti.cpu_idle_time = 0;
+			the_rti.total_cpu_usage = 100;
+			if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
+			the_rti.process_cpu_usage = (u32) ( 100 *  the_rti.process_cpu_time_diff / the_rti.sampling_period_duration);
+		} else {
+			u64 samp_sys_time;
+			/*move to ms (/proc/stat gives times in 100 ms unit*/
+			the_rti.total_cpu_time_diff = (u_k_time - last_cpu_u_k_time)*10;
+
+			/*we're not that accurate....*/
+			if (the_rti.total_cpu_time_diff > the_rti.sampling_period_duration)
+				the_rti.sampling_period_duration = the_rti.total_cpu_time_diff;
+
+
+			if (!idle_time) idle_time = (the_rti.sampling_period_duration - the_rti.total_cpu_time_diff)/10;
+			samp_sys_time = u_k_time - last_cpu_u_k_time;
+			the_rti.cpu_idle_time = idle_time - last_cpu_idle_time;
+			the_rti.total_cpu_usage = (u32) ( 100 * samp_sys_time / (the_rti.cpu_idle_time + samp_sys_time ) );
+			/*move to ms (/proc/stat gives times in 100 ms unit*/
+			the_rti.cpu_idle_time *= 10;
+			if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
+			the_rti.process_cpu_usage = (u32) ( 100 *  the_rti.process_cpu_time_diff / (the_rti.cpu_idle_time + 10*samp_sys_time ) );
+		}
+	} else {
+		mem_at_startup = the_rti.physical_memory_avail;
+	}
+	the_rti.process_memory = mem_at_startup - the_rti.physical_memory_avail;
 #ifdef GPAC_MEMORY_TRACKING
-  the_rti.gpac_memory = gpac_allocated_memory;
+	the_rti.gpac_memory = gpac_allocated_memory;
 #endif
 
-  last_process_k_u_time = process_u_k_time;
-  last_cpu_idle_time = idle_time;
-  last_cpu_u_k_time = u_k_time;
-  last_update_time = entry_time;
-  memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
-  return 1;
+	last_process_k_u_time = process_u_k_time;
+	last_cpu_idle_time = idle_time;
+	last_cpu_u_k_time = u_k_time;
+	last_update_time = entry_time;
+	memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
+	return 1;
 }
 
 #endif
@@ -1896,7 +2001,7 @@
 }
 
 
-char * gf_get_default_cache_directory(){  
+char * gf_get_default_cache_directory() {
 #ifdef _WIN32_WCE
 	return gf_strdup( "\\windows\\temp" );
 #elif defined(WIN32)
@@ -1911,7 +2016,7 @@
 
 
 GF_EXPORT
-Bool gf_sys_get_battery_state(Bool *onBattery, u32 *onCharge, u32*level, u32 *batteryLifeTime, u32 *batteryFullLifeTime) 
+Bool gf_sys_get_battery_state(Bool *onBattery, u32 *onCharge, u32*level, u32 *batteryLifeTime, u32 *batteryFullLifeTime)
 {
 #if defined(_WIN32_WCE)
 	SYSTEM_POWER_STATUS_EX sps;
@@ -1966,7 +2071,7 @@
 	{
 		const char *res;
 		char * pid = &(pidfile[strlen(pidfile)]);
-		for (res = resourceName; *res ; res++){
+		for (res = resourceName; *res ; res++) {
 			if (*res >= 'A' && *res <= 'z')
 				*pid = * res;
 			else
@@ -1980,14 +2085,14 @@
 		goto exit;
 	/* Get the flags */
 	flags = fcntl(fd, F_GETFD);
-	if (flags == -1){
+	if (flags == -1) {
 		goto exit;
 	}
 	/* Set FD_CLOEXEC, so exclusive lock will be removed on exit, so even if GPAC crashes,
 	* lock will be allowed for next instance */
 	flags |= FD_CLOEXEC;
 	/* Now, update the flags */
-	if (fcntl(fd, F_SETFD, flags) == -1){
+	if (fcntl(fd, F_SETFD, flags) == -1) {
 		goto exit;
 	}
 
@@ -2004,7 +2109,7 @@
 		goto exit;
 	}
 
-	if (ftruncate(fd, 0) == -1){
+	if (ftruncate(fd, 0) == -1) {
 		goto exit;
 	}
 	/* Write the PID */
@@ -2012,7 +2117,7 @@
 		int sz = 100;
 		char * buf = gf_malloc( sz );
 		sz = snprintf(buf, sz, "%ld\n", (long) getpid());
-		if (write(fd, buf, sz) != sz){
+		if (write(fd, buf, sz) != sz) {
 			gf_free(buf);
 			goto exit;
 		}
@@ -2038,7 +2143,7 @@
 #endif
 
 GF_EXPORT
-GF_GlobalLock * gf_global_resource_lock(const char * resourceName){
+GF_GlobalLock * gf_global_resource_lock(const char * resourceName) {
 #ifdef WIN32
 #ifdef _WIN32_WCE
 	unsigned short sWResourceName[MAX_PATH];
@@ -2075,7 +2180,7 @@
 
 	return lock;
 #else /* WIN32 */
-  return gf_create_PID_file(resourceName);
+	return gf_create_PID_file(resourceName);
 #endif /* WIN32 */
 }
 
@@ -2085,7 +2190,7 @@
  * \return GF_OK if evertything went fine
  */
 GF_EXPORT
-GF_Err gf_global_resource_unlock(GF_GlobalLock * lock){
+GF_Err gf_global_resource_unlock(GF_GlobalLock * lock) {
 	if (!lock)
 		return GF_BAD_PARAM;
 #ifndef WIN32
@@ -2135,6 +2240,11 @@
 
 #endif //GPAC_ANDROID
 
+GF_EXPORT
+s32 gf_gettimeofday(struct timeval *tp, void *tz) {
+	return gettimeofday(tp, tz);
+}
+
 /*
 		NTP tools
 */
@@ -2143,9 +2253,6 @@
 {
 	u64 frac_part;
 	struct timeval now;
-#ifdef WIN32
-	s32 gettimeofday(struct timeval *tp, void *tz);
-#endif
 	gettimeofday(&now, NULL);
 	*sec = (u32) (now.tv_sec) + GF_NTP_SEC_1900_TO_1970;
 //	*frac = (u32) ( (now.tv_usec << 12) + (now.tv_usec << 8) - ((now.tv_usec * 3650) >> 6) );
@@ -2154,30 +2261,49 @@
 	*frac = (u32) ( frac_part );
 }
 
+GF_EXPORT
+s32 gf_net_get_ntp_diff_ms(u64 ntp)
+{
+	u32 remote_s, remote_f, local_s, local_f;
+	s64 diff_s, diff_f;
+
+	remote_s = (ntp >> 32);
+	remote_f = (u32) (ntp & 0xFFFFFFFFULL);
+	gf_net_get_ntp(&local_s, &local_f);
+	diff_s = local_s;
+	diff_s -= remote_s;
+	diff_s *= 1000;
+	diff_f = local_f;
+	diff_f -= remote_f;
+	diff_f *= 1000;
+	diff_f /= 0xFFFFFFFFULL;
+	diff_s += diff_f;
+	return (s32) diff_s;
+}
+
+
 
 GF_EXPORT
 s32 gf_net_get_timezone()
 {
-#ifdef GPAC_ANDROID
-	{
-		/*FIXME - finad a safe way to estimate timezone this does not work !!*/
-		s32 t_timezone;
-		struct tm t_gmt, t_local;
-		time_t t_time;
-		t_time = time(NULL);
-		t_gmt = *gmtime(&t_time);
-		t_local = *localtime(&t_time);
-	
-		t_timezone = (t_gmt.tm_hour - t_local.tm_hour) * 3600;
-		return t_timezone;
-	}
-#elif defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)
 	return 0;
 #else
-	{
-		s32 val = timezone;
-		return val;
-	}
+    //this has been commented due to some reports of broken implementation on some systems ...
+    //		s32 val = timezone;
+    //		return val;
+
+    
+    /*FIXME - avoid errors at midnight when estimating timezone this does not work !!*/
+    s32 t_timezone;
+    struct tm t_gmt, t_local;
+    time_t t_time;
+    t_time = time(NULL);
+    t_gmt = *gmtime(&t_time);
+    t_local = *localtime(&t_time);
+
+    t_timezone = (t_gmt.tm_hour - t_local.tm_hour) * 3600 + (t_gmt.tm_min - t_local.tm_min) * 60;
+    return t_timezone;
 #endif
 
 }
@@ -2272,6 +2398,12 @@
 		else if (!strcmp(szDay, "Sat") || !strcmp(szDay, "Saturday")) t.tm_wday = 5;
 		else if (!strcmp(szDay, "Sun") || !strcmp(szDay, "Sunday")) t.tm_wday = 6;
 	}
+
+#ifdef GPAC_ANDROID
+	/* strange issue in Android, we have to indicate DST is not applied in our time struct*/
+	t.tm_isdst = -1;
+#endif
+
 	current_time = mktime(&t) - gf_net_get_timezone();
 
 #endif
@@ -2308,6 +2440,12 @@
 #ifndef _WIN32_WCE
 	gtime = sec - GF_NTP_SEC_1900_TO_1970;
 	_t = * gmtime(&gtime);
+
+#ifdef GPAC_ANDROID
+	/* strange issue in Android, we have to indicate DST is not applied in our time struct*/
+	_t.tm_isdst = -1;
+#endif
+
 	current_time = mktime(&_t) - gf_net_get_timezone();
 #else
 	GetSystemTime(&syst);

gpac-0.5.0.svn5178.tar.bz2/src/utils/os_module.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/os_module.c Changed

@@ -53,7 +53,7 @@
 	if (inst->interfaces)
 		gf_list_del(inst->interfaces);
 	inst->interfaces = NULL;
-	
+
 	if (inst->name && !inst->ifce_reg) {
 		gf_free(inst->name);
 		inst->name = NULL;
@@ -144,17 +144,17 @@
 	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));
+		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));
+		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));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot resolve symbol ShutdownInterface in module file %s, error is %s\n", path, error));
 #endif
-        GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Load module file %s : DONE\n", inst->name));
+	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Load module file %s : DONE\n", inst->name));
 	return GF_TRUE;
 }
 
@@ -178,7 +178,7 @@
 }
 
 
-Bool enum_modules(void *cbck, char *item_name, char *item_path)
+static Bool enum_modules(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	ModuleInstance *inst;
 #if CHECK_MODULE
@@ -229,10 +229,10 @@
 #endif
 
 	ModuleLib = dlopen(item_name, _flags);
-        if (!ModuleLib) {
-                GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot load module file %s, error is %s\n", item_name, dlerror()));
-                goto next;
-        }
+	if (!ModuleLib) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot load module file %s, error is %s\n", item_name, dlerror()));
+		goto next;
+	}
 
 	query_func = (QueryInterface) dlsym(ModuleLib, "QueryInterface");
 	load_func = (LoadInterface) dlsym(ModuleLib, "LoadInterface");
@@ -240,12 +240,12 @@
 	dlclose(ModuleLib);
 #endif
 
-	if (!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));
-          return 0;
-        }
+	if (!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));
+		return 0;
+	}
 #endif
 
 
@@ -254,7 +254,7 @@
 	inst->plugman = pm;
 	inst->name = gf_strdup(item_name);
 	inst->dir = gf_strdup(item_path);
-	gf_url_get_resource_path(item_path, inst->dir); 
+	gf_url_get_resource_path(item_path, inst->dir);
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Added module %s.\n", inst->name));
 	gf_list_add(pm->plug_list, inst);
 	return GF_FALSE;
@@ -288,18 +288,18 @@
 	/*load all static modules*/
 	load_static_modules(pm);
 
-	for (i =0; i < pm->num_dirs; i++){
+	for (i =0; i < pm->num_dirs; i++) {
 #ifdef WIN32
-	gf_enum_directory(pm->dirs[i], GF_FALSE, enum_modules, pm, ".dll");
+		gf_enum_directory(pm->dirs[i], GF_FALSE, enum_modules, pm, ".dll");
 #elif defined(__APPLE__)
 #if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
-	/*we are in static build for modules by default*/
+		/*we are in static build for modules by default*/
 #else
-	gf_enum_directory(pm->dirs[i], 0, enum_modules, pm, ".dylib");
+		gf_enum_directory(pm->dirs[i], 0, enum_modules, pm, ".dylib");
 #endif
 #else
-	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Refreshing list of modules in directory %s...\n", pm->dirs[i]));
-	gf_enum_directory(pm->dirs[i], 0, enum_modules, pm, ".so");
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Refreshing list of modules in directory %s...\n", pm->dirs[i]));
+		gf_enum_directory(pm->dirs[i], 0, enum_modules, pm, ".so");
 #endif
 	}

gpac-0.5.0.svn5178.tar.bz2/src/utils/os_net.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/os_net.c Changed

@@ -23,6 +23,7 @@
  *
  */
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
 
 #if defined(WIN32) || defined(_WIN32_WCE)
 
@@ -255,17 +256,17 @@
 	char *service, *dest;
 	service = dest = NULL;
 #ifdef WIN32
-		if (!wsa_init) {
-			WSADATA Data;
-			if (WSAStartup(0x0202, &Data)!=0) return NULL;
-			wsa_init = 1;
-		}
+	if (!wsa_init) {
+		WSADATA Data;
+		if (WSAStartup(0x0202, &Data)!=0) return NULL;
+		wsa_init = 1;
+	}
 #endif
 
 	service = dest = NULL;
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_socktype = sock_type;
- 	hints.ai_family = family;
+	hints.ai_family = family;
 	hints.ai_flags = flags;
 
 	if (PortNumber) {
@@ -273,11 +274,11 @@
 		service = (char *)portstring;
 	}
 	if (PeerName) {
- 		strncpy(node, PeerName, MAX_PEER_NAME_LEN);
- 		if (node[0]=='[') {
- 			node[strlen(node)-1] = 0;
- 			strncpy(node, &node[1], MAX_PEER_NAME_LEN);
- 		}
+		strncpy(node, PeerName, MAX_PEER_NAME_LEN);
+		if (node[0]=='[') {
+			node[strlen(node)-1] = 0;
+			strncpy(node, &node[1], MAX_PEER_NAME_LEN);
+		}
 		node[MAX_PEER_NAME_LEN - 1] = 0;
 		dest = (char *) node;
 	}
@@ -289,7 +290,7 @@
 {
 	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 0;
-    memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
+	memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
 	sock->dest_addr_len = (u32) res->ai_addrlen;
 	freeaddrinfo(res);
 	return 1;
@@ -421,7 +422,7 @@
 #ifdef GPAC_HAS_IPV6
 		struct sockaddr *addr = (struct sockaddr *)&sock->dest_addr;
 		if (addr->sa_family==AF_INET6) {
-		    struct ipv6_mreq mreq6;
+			struct ipv6_mreq mreq6;
 			memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
 			mreq6.ipv6mr_interface= 0;
 			setsockopt(sock->socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &mreq6, sizeof(mreq6));
@@ -565,10 +566,12 @@
 		if (Host == NULL) {
 			switch (LASTSOCKERROR) {
 #ifndef __SYMBIAN32__
-			case ENETDOWN: return GF_IP_NETWORK_FAILURE;
-			//case ENOHOST: return GF_IP_ADDRESS_NOT_FOUND;
+			case ENETDOWN:
+				return GF_IP_NETWORK_FAILURE;
+				//case ENOHOST: return GF_IP_ADDRESS_NOT_FOUND;
 #endif
-			default: return GF_IP_NETWORK_FAILURE;
+			default:
+				return GF_IP_NETWORK_FAILURE;
 			}
 		}
 		memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
@@ -580,19 +583,27 @@
 			u32 res = LASTSOCKERROR;
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Core] Couldn't connect socket - last sock error %d\n", res));
 			switch (res) {
-			case EAGAIN: return GF_IP_SOCK_WOULD_BLOCK;
+			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;
 #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;
 			}
 		}
 	}
@@ -625,10 +636,10 @@
 
 	if (!sock || sock->socket) return GF_BAD_PARAM;
 
-#ifndef WIN32	
-	if(!local_ip){
-		if(!peer_name || !strcmp(peer_name,"localhost")){
-			peer_name="127.0.0.1";	
+#ifndef WIN32
+	if(!local_ip) {
+		if(!peer_name || !strcmp(peer_name,"localhost")) {
+			peer_name="127.0.0.1";
 		}
 	}
 #endif
@@ -875,7 +886,7 @@
 {
 #ifdef GPAC_HAS_IPV6
 	u32 val;
- 	char *sep;
+	char *sep;
 	struct addrinfo *res;
 	if (!multi_IPAdd) return 0;
 	/*IPV6 multicast address*/
@@ -887,7 +898,7 @@
 	if (!res) return 0;
 	val = 0;
 	if (res->ai_addr->sa_family == AF_INET) {
-	        val = IN_MULTICAST(ntohl(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr));
+		val = IN_MULTICAST(ntohl(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr));
 	} else if (res->ai_addr->sa_family == AF_INET6) {
 		val = IN6_IS_ADDR_MULTICAST(& ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr);
 	}
@@ -1151,7 +1162,7 @@
 	else {
 		res = recv(sock->socket, (char *) buffer + startFrom, length - startFrom, 0);
 		if (res == 0)
-		  return GF_IP_CONNECTION_CLOSED;
+			return GF_IP_CONNECTION_CLOSED;
 	}
 
 	if (res == SOCKET_ERROR) {
@@ -1281,11 +1292,11 @@
 #endif
 	}
 	if (Familly) {
-/*		size = 4;
-		if (getsockopt(sock->socket, SOL_SOCKET, SO_TYPE, (char *) &fam, &size) == SOCKET_ERROR)
-			return GF_IP_NETWORK_FAILURE;
-		*Familly = fam;
-*/
+		/*		size = 4;
+				if (getsockopt(sock->socket, SOL_SOCKET, SO_TYPE, (char *) &fam, &size) == SOCKET_ERROR)
+					return GF_IP_NETWORK_FAILURE;
+				*Familly = fam;
+		*/
 		if (sock->flags & GF_SOCK_IS_TCP) *Familly = GF_SOCK_TYPE_TCP;
 		else  *Familly = GF_SOCK_TYPE_UDP;
 	}
@@ -1312,7 +1323,7 @@
 {
 #ifdef GPAC_HAS_IPV6
 	char clienthost[NI_MAXHOST];
- 	struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr_len);
+	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;
@@ -1382,7 +1393,7 @@
 		freeaddrinfo(res);
 	} else {
 		struct sockaddr_in6 *remotePtr = (struct sockaddr_in6 *)&remote_add;
-	 	struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr);
+		struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr);
 		remotePtr->sin6_port = addrptr->sin6_port;
 		remotePtr->sin6_addr = addrptr->sin6_addr;
 		remote_add_len = sock->dest_addr_len;
@@ -1531,3 +1542,4 @@
 }
 
 
+#endif /*GPAC_DISABLE_CORE_TOOLS*/

gpac-0.5.0.svn5178.tar.bz2/src/utils/os_thread.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/os_thread.c Changed

@@ -23,6 +23,7 @@
  *
  */
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
 
 #ifdef GPAC_ANDROID
 #include <jni.h>
@@ -146,13 +147,13 @@
 static void currentThreadInfoKey_alloc()
 {
 	int err;
-  /* We do not use any destructor */
-  if (err = pthread_key_create(&currentThreadInfoKey, NULL))
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] pthread_key_create() failed with error %d\n", err));
+	/* We do not use any destructor */
+	if (err = pthread_key_create(&currentThreadInfoKey, NULL))
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] pthread_key_create() failed with error %d\n", err));
 }
 
-GF_Thread * gf_th_current(){
-  return pthread_getspecific(currentThreadInfoKey);
+GF_Thread * gf_th_current() {
+	return pthread_getspecific(currentThreadInfoKey);
 }
 
 #endif /* GPAC_ANDROID */
@@ -205,9 +206,9 @@
 #else
 
 #ifdef GPAC_ANDROID
-	#ifndef GPAC_DISABLE_LOG
-		GF_LOG(GF_LOG_INFO, GF_LOG_MUTEX, ("[Thread %s] RunBeforeExit=%p\n", t->log_name, t->RunBeforeExit));
-	#endif
+#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 */
@@ -321,7 +322,7 @@
 #else
 	/* It is necessary to free pthread handle */
 	if (t->threadH)
-	  pthread_detach(t->threadH);
+		pthread_detach(t->threadH);
 	t->threadH = 0;
 #endif
 
@@ -552,9 +553,9 @@
 	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));
+			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));
+			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;
@@ -688,11 +689,11 @@
 	}
 #elif defined(__DARWIN__) || defined(__APPLE__)
 #ifdef GPAC_IPHONE
-    sem_close(sm->hSemaphore);
+	sem_close(sm->hSemaphore);
 #else
 	sem_destroy(sm->hSemaphore);
 #endif
-    gf_free(sm->SemName);
+	gf_free(sm->SemName);
 #else
 	sem_destroy(sm->hSemaphore);
 #endif
@@ -768,3 +769,5 @@
 	return 0;
 #endif
 }
+
+#endif

gpac-0.5.0.svn5178.tar.bz2/src/utils/path2d.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/path2d.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -58,11 +58,23 @@
 	GF_SAFEALLOC(dst, GF_Path);
 	if (!dst) return NULL;
 	dst->contours = (u32 *)gf_malloc(sizeof(u32)*gp->n_contours);
-	if (!dst->contours) { gf_free(dst); return NULL; }
+	if (!dst->contours) {
+		gf_free(dst);
+		return NULL;
+	}
 	dst->points = (GF_Point2D *) gf_malloc(sizeof(GF_Point2D)*gp->n_points);
-	if (!dst->points) { gf_free(dst->contours); gf_free(dst); return NULL; }
+	if (!dst->points) {
+		gf_free(dst->contours);
+		gf_free(dst);
+		return NULL;
+	}
 	dst->tags = (u8 *) gf_malloc(sizeof(u8)*gp->n_points);
-	if (!dst->tags) { gf_free(dst->points); gf_free(dst->contours); gf_free(dst); return NULL; }
+	if (!dst->tags) {
+		gf_free(dst->points);
+		gf_free(dst->contours);
+		gf_free(dst);
+		return NULL;
+	}
 	memcpy(dst->contours, gp->contours, sizeof(u32)*gp->n_contours);
 	dst->n_contours = gp->n_contours;
 	memcpy(dst->points, gp->points, sizeof(GF_Point2D)*gp->n_points);
@@ -90,7 +102,7 @@
 		_gp->points = (GF_Point2D *)gf_realloc(_gp->points, sizeof(GF_Point2D)*(_gp->n_alloc_points));	\
 		_gp->tags = (u8 *) gf_realloc(_gp->tags, sizeof(u8)*(_gp->n_alloc_points));	\
 	}	\
-
+ 
 
 GF_EXPORT
 GF_Err gf_path_add_move_to(GF_Path *gp, Fixed x, Fixed y)
@@ -122,7 +134,9 @@
 }
 
 GF_EXPORT
-GF_Err gf_path_add_move_to_vec(GF_Path *gp, GF_Point2D *pt) { return gf_path_add_move_to(gp, pt->x, pt->y); }
+GF_Err gf_path_add_move_to_vec(GF_Path *gp, GF_Point2D *pt) {
+	return gf_path_add_move_to(gp, pt->x, pt->y);
+}
 
 GF_EXPORT
 GF_Err gf_path_add_line_to(GF_Path *gp, Fixed x, Fixed y)
@@ -142,7 +156,9 @@
 }
 
 GF_EXPORT
-GF_Err gf_path_add_line_to_vec(GF_Path *gp, GF_Point2D *pt) { return gf_path_add_line_to(gp, pt->x, pt->y); }
+GF_Err gf_path_add_line_to_vec(GF_Path *gp, GF_Point2D *pt) {
+	return gf_path_add_line_to(gp, pt->x, pt->y);
+}
 
 GF_EXPORT
 GF_Err gf_path_close(GF_Path *gp)
@@ -150,7 +166,7 @@
 	Fixed diff;
 	GF_Point2D start, end;
 	if (!gp || !gp->n_contours) return GF_BAD_PARAM;
-	
+
 	if (gp->n_contours<=1) start = gp->points[0];
 	else start = gp->points[gp->contours[gp->n_contours-2] + 1];
 	end = gp->points[gp->n_points-1];
@@ -289,7 +305,7 @@
 	if (!gp->tags) return GF_OUT_OF_MEM;
 	memcpy(gp->points + gp->n_points, src->points, sizeof(GF_Point2D)*src->n_points);
 	if (mx) {
-		for (i=0;i<src->n_points; i++) {
+		for (i=0; i<src->n_points; i++) {
 			gf_mx2d_apply_coords(mx, &gp->points[i+gp->n_points].x, &gp->points[i+gp->n_points].y);
 		}
 	}
@@ -310,7 +326,7 @@
 
 	muk = 1;
 	munk = pow(1-mu,(Double)n);
-	for (k=0;k<=n;k++) {
+	for (k=0; k<=n; k++) {
 		nn = n;
 		kn = k;
 		nkn = n - k;
@@ -358,7 +374,7 @@
 	newpts = (GF_Point2D *) gf_malloc(sizeof(GF_Point2D) * (nbPoints+1));
 	newpts[0] = gp->points[gp->n_points-1];
 	memcpy(&newpts[1], pts, sizeof(GF_Point2D) * nbPoints);
-	
+
 	gf_add_n_bezier(gp, newpts, nbPoints + 1);
 
 	gf_free(newpts);
@@ -397,7 +413,7 @@
 	end_angle = gf_atan2(end_y, end_x);
 	tmp = gf_mulfix((start_x - fa_x), (start_x - fa_x)) + gf_mulfix((start_y - fa_y), (start_y - fa_y));
 	axis_w = gf_sqrt(tmp);
-	tmp = gf_mulfix((start_x - fb_x) , (start_x - fb_x)) + gf_mulfix((start_y - fb_y), (start_y - fb_y)); 
+	tmp = gf_mulfix((start_x - fb_x) , (start_x - fb_x)) + gf_mulfix((start_y - fb_y), (start_y - fb_y));
 	axis_w += gf_sqrt(tmp);
 	axis_w /= 2;
 	axis_h = gf_sqrt(gf_mulfix(axis_w, axis_w) - gf_mulfix(fa_x,fa_x));
@@ -479,22 +495,22 @@
 		r_y = gf_mulfix(gf_sqrt(radius_scale), r_y);
 		rxsq = gf_mulfix(r_x, r_x);
 		rysq = gf_mulfix(r_y, r_y);
-	} 
+	}
 
 #if 0
-	/* Old code with overflow problems in fixed point, 
+	/* Old code with overflow problems in fixed point,
 	   sign was sometimes negative (cf tango SVG icons appointment-new.svg)*/
 
 	sign = gf_mulfix(rxsq,ymidpsq) + gf_mulfix(rysq, xmidpsq);
 	scale = FIX_ONE;
 	/*FIXME - what if scale is 0 ??*/
 	if (sign) scale = gf_divfix(
-					(gf_mulfix(rxsq,rysq) - gf_mulfix(rxsq, ymidpsq) - gf_mulfix(rysq,xmidpsq)),
-					sign
-			);
+		                      (gf_mulfix(rxsq,rysq) - gf_mulfix(rxsq, ymidpsq) - gf_mulfix(rysq,xmidpsq)),
+		                      sign
+		                  );
 #else
-	/* New code: the sign variable computation is split into simpler cases and 
-	   the expression is divided by rxsq to reduce the range */	   
+	/* New code: the sign variable computation is split into simpler cases and
+	   the expression is divided by rxsq to reduce the range */
 	if ((rxsq == 0 || ymidpsq ==0) && (rysq == 0 || xmidpsq == 0)) {
 		scale = FIX_ONE;
 	} else if (rxsq == 0 || ymidpsq ==0) {
@@ -522,7 +538,7 @@
 	ux = FIX_ONE;
 	uy = 0;
 	normu = FIX_ONE;
-	
+
 	vx = gf_divfix(xmidp-cxp,r_x);
 	vy = gf_divfix(ymidp-cyp,r_y);
 	normv = gf_sqrt(gf_mulfix(vx, vx) + gf_mulfix(vy,vy));
@@ -534,11 +550,11 @@
 	ux = vx;
 	uy = vy;
 	normu = normv;
-	
+
 	vx = gf_divfix(-xmidp-cxp,r_x);
 	vy = gf_divfix(-ymidp-cyp,r_y);
 	normu = gf_sqrt(gf_mulfix(ux, ux) + gf_mulfix(uy,uy));
-	
+
 	sign = gf_mulfix(ux, vy) - gf_mulfix(uy, vx);
 	sweep_angle = gf_divfix( gf_mulfix(ux,vx) + gf_mulfix(uy, vy), gf_mulfix(normu, normv) );
 	/*numerical stability safety*/
@@ -546,9 +562,9 @@
 	sweep_angle = gf_acos(sweep_angle);
 	sweep_angle = (sign > 0 ? sweep_angle: -sweep_angle);
 	if (sweep_flag == 0) {
-		if (sweep_angle > 0) sweep_angle -= GF_2PI; 
+		if (sweep_angle > 0) sweep_angle -= GF_2PI;
 	} else {
-		if (sweep_angle < 0) sweep_angle += GF_2PI; 
+		if (sweep_angle < 0) sweep_angle += GF_2PI;
 	}
 
 	num_steps = GF_2D_DEFAULT_RES/2;
@@ -650,7 +666,7 @@
 
 /*
  *	conic bbox computing taken from freetype
- *		Copyright 1996-2001, 2002, 2004 by                                   
+ *		Copyright 1996-2001, 2002, 2004 by
  *		David Turner, Robert Wilhelm, and Werner Lemberg.
  *	License: FTL or GPL
  */
@@ -681,7 +697,7 @@
 
 /*
  *	cubic bbox computing taken from freetype
- *		Copyright 1996-2001, 2002, 2004 by                                   
+ *		Copyright 1996-2001, 2002, 2004 by
  *		David Turner, Robert Wilhelm, and Werner Lemberg.
  *	License: FTL or GPL
 
@@ -701,7 +717,7 @@
 		Fixed y2 = arc[1];
 		Fixed y3 = arc[2];
 		Fixed y4 = arc[3];
-		
+
 		if (ABS(y1)<FIX_EPSILON) arc[0] = y1 = 0;
 		if (ABS(y2)<FIX_EPSILON) arc[1] = y2 = 0;
 		if (ABS(y3)<FIX_EPSILON) arc[2] = y3 = 0;
@@ -798,7 +814,7 @@
 	}
 
 	/*control box is bigger than box , decompose curves*/
-    if ((cxMin < xMin) || (cxMax > xMax) || (cyMin < yMin) || (cyMax > yMax)) {
+	if ((cxMin < xMin) || (cxMax > xMax) || (cyMin < yMin) || (cyMax > yMax)) {
 		/*decompose all control points*/
 		pt = gp->points;
 		for (i=1 ; i < gp->n_points; ) {
@@ -814,8 +830,8 @@
 				end = &gp->points[i+1];
 				if ((ctrl1->x < xMin) || (ctrl1->x > xMax))
 					gf_conic_check(pt->x, ctrl1->x, end->x, &xMin, &xMax);
- 
-				if ((ctrl1->y < yMin) || (ctrl1->y > yMax)) 
+
+				if ((ctrl1->y < yMin) || (ctrl1->y > yMax))
 					gf_conic_check(pt->y, ctrl1->y, end->y, &yMin, &yMax);
 
 				/*and move*/
@@ -829,8 +845,8 @@
 				end = &gp->points[i+2];
 				if ((ctrl1->x < xMin) || (ctrl1->x > xMax) || (ctrl2->x < xMin) || (ctrl2->x > xMax))
 					gf_cubic_check(pt->x, ctrl1->x, ctrl2->x, end->x, &xMin, &xMax);
- 
-				if ((ctrl1->y < yMin) || (ctrl1->y > yMax) || (ctrl2->y < yMin) || (ctrl2->y > yMax)) 
+
+				if ((ctrl1->y < yMin) || (ctrl1->y > yMax) || (ctrl2->y < yMin) || (ctrl2->y > yMax))
 					gf_cubic_check(pt->y, ctrl1->y, ctrl2->y, end->y, &yMin, &yMax);
 
 				/*and move*/
@@ -867,7 +883,7 @@
 	pt.y = y1 - y0;
 	z1_0 = gf_v2d_len(&pt);
 
-	if ((z3_0*100 < FIX_ONE) && (z1_0*100 < FIX_ONE)) 
+	if ((z3_0*100 < FIX_ONE) && (z1_0*100 < FIX_ONE))
 		goto nosubdivide;
 
 	/* perp is distance from line, multiplied by dist z0-z3 */
@@ -968,7 +984,7 @@
 			if (gp->tags[i+1]==GF_PATH_CLOSE) gf_path_close(ngp);
 			i+=2;
 		}
-			break;
+		break;
 		case GF_PATH_CURVE_CUBIC:
 			gf_subdivide_cubic(ngp, pt->x, pt->y, gp->points[i].x, gp->points[i].y, gp->points[i+1].x, gp->points[i+1].y, gp->points[i+2].x, gp->points[i+2].y, fineness);
 			pt = &gp->points[i+2];
@@ -1039,12 +1055,12 @@
 
 	if (s.y<=pt.y) {
 		if (e.y>pt.y) {
-			if (isLeft(s, e, pt) > 0) 
+			if (isLeft(s, e, pt) > 0)
 				(*wn)++;
 		}
 	}
 	else if (e.y<=pt.y) {
-		if (isLeft(s, e, pt) < 0) 
+		if (isLeft(s, e, pt) < 0)
 			(*wn)--;
 	}
 }
@@ -1062,7 +1078,7 @@
 	if ((x<rc.x) || (y>rc.y) || (x>rc.x+rc.width) || (y<rc.y-rc.height)) return 0;
 
 	if (!gp || (gp->n_points<2)) return 0;
-	
+
 	pt.x = x;
 	pt.y = y;
 	wn = 0;
@@ -1097,8 +1113,8 @@
 			gf_subdivide_cubic_hit_test(x, y, s.x, s.y, c1.x, c1.y, c2.x, c2.y, end->x, end->y, &wn);
 			s = *end;
 		}
-			i+=2;
-			break;
+		i+=2;
+		break;
 		case GF_PATH_CURVE_CUBIC:
 			gf_subdivide_cubic_hit_test(x, y, s.x, s.y, gp->points[i].x, gp->points[i].y, gp->points[i+1].x, gp->points[i+1].y, gp->points[i+2].x, gp->points[i+2].y, &wn);
 			s = gp->points[i+2];
@@ -1137,8 +1153,8 @@
 	return 1;
 }
 
-/*iteration info*/	
-typedef struct 
+/*iteration info*/
+typedef struct
 {
 	Fixed len;
 	Fixed dx, dy;
@@ -1292,7 +1308,7 @@
     pcur = pts[iread++];						\
     delta.x = pcur.x - pprev.x;					\
     delta.y = pcur.y - pprev.y;					\
-
+ 
 #define ConvexCross(p, q) gf_mulfix(p.x,q.y) - gf_mulfix(p.y,q.x);
 
 #define ConvexCheckTriple						\
@@ -1313,47 +1329,47 @@
     pSecond = pThird;		\
     dprev.x = dcur.x;		\
     dprev.y = dcur.y;							\
-
+ 
 GF_EXPORT
 u32 gf_polygone2d_get_convexity(GF_Point2D *pts, u32 len)
 {
 	s32 curDir, thisDir = 0, dirChanges = 0, angleSign = 0;
 	u32 iread;
-    Fixed cross;
+	Fixed cross;
 	GF_Point2D pSecond, pThird, pSaveSecond;
 	GF_Point2D dprev, dcur;
 
-    /* Get different point, return if less than 3 diff points. */
-    if (len < 3 ) return GF_POLYGON_CONVEX_LINE;
-    iread = 1;
+	/* Get different point, return if less than 3 diff points. */
+	if (len < 3 ) return GF_POLYGON_CONVEX_LINE;
+	iread = 1;
 	ConvexGetPointDelta(dprev, (pts[0]), pSecond);
-    pSaveSecond = pSecond;
+	pSaveSecond = pSecond;
 	/*initial direction */
-    curDir = ConvexCompare(dprev);
-    while ( iread < len) {
+	curDir = ConvexCompare(dprev);
+	while ( iread < len) {
 		/* Get different point, break if no more points */
 		ConvexGetPointDelta(dcur, pSecond, pThird );
 		if ( (dcur.x == 0) && (dcur.y == 0) ) continue;
 		/* Check current three points */
 		ConvexCheckTriple;
-    }
+	}
 
-    /* Must check for direction changes from last vertex back to first */
+	/* Must check for direction changes from last vertex back to first */
 	/* Prepare for 'ConvexCheckTriple' */
-    pThird = pts[0];
-    dcur.x = pThird.x - pSecond.x;
-    dcur.y = pThird.y - pSecond.y;
-    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;
+	pThird = pts[0];
+	dcur.x = pThird.x - pSecond.x;
+	dcur.y = pThird.y - pSecond.y;
+	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;
 	/* Don't care about 'pThird' now */
-    ConvexCheckTriple;			
+	ConvexCheckTriple;
 
-    /* Decide on polygon type given accumulated status */
-    if ( dirChanges > 2 ) return GF_POLYGON_COMPLEX;
-    if ( angleSign > 0 ) return GF_POLYGON_CONVEX_CCW;
-    if ( angleSign < 0 ) return GF_POLYGON_CONVEX_CW;
-    return GF_POLYGON_CONVEX_LINE;
+	/* Decide on polygon type given accumulated status */
+	if ( dirChanges > 2 ) return GF_POLYGON_COMPLEX;
+	if ( angleSign > 0 ) return GF_POLYGON_CONVEX_CCW;
+	if ( angleSign < 0 ) return GF_POLYGON_CONVEX_CW;
+	return GF_POLYGON_CONVEX_LINE;
 }

gpac-0.5.0.svn5178.tar.bz2/src/utils/path2d_stroker.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/path2d_stroker.c Changed

@@ -61,7 +61,7 @@
 	d2.y = base[0].y - base[1].y;
 	close1 = FT_IS_SMALL( d1.x ) && FT_IS_SMALL( d1.y );
 	close2 = FT_IS_SMALL( d2.x ) && FT_IS_SMALL( d2.y );
-	
+
 	if ( close1 ) {
 		if ( close2 )
 			*angle_in = *angle_out = 0;
@@ -80,70 +80,70 @@
 
 static void ft_cubic_split( GF_Point2D*  base )
 {
-    Fixed  a, b, c, d;
-    base[6].x = base[3].x;
-    c = base[1].x;
-    d = base[2].x;
-    base[1].x = a = ( base[0].x + c ) / 2;
-    base[5].x = b = ( base[3].x + d ) / 2;
-    c = ( c + d ) / 2;
-    base[2].x = a = ( a + c ) / 2;
-    base[4].x = b = ( b + c ) / 2;
-    base[3].x = ( a + b ) / 2;
-
-    base[6].y = base[3].y;
-    c = base[1].y;
-    d = base[2].y;
-    base[1].y = a = ( base[0].y + c ) / 2;
-    base[5].y = b = ( base[3].y + d ) / 2;
-    c = ( c + d ) / 2;
-    base[2].y = a = ( a + c ) / 2;
-    base[4].y = b = ( b + c ) / 2;
-    base[3].y = ( a + b ) / 2;
+	Fixed  a, b, c, d;
+	base[6].x = base[3].x;
+	c = base[1].x;
+	d = base[2].x;
+	base[1].x = a = ( base[0].x + c ) / 2;
+	base[5].x = b = ( base[3].x + d ) / 2;
+	c = ( c + d ) / 2;
+	base[2].x = a = ( a + c ) / 2;
+	base[4].x = b = ( b + c ) / 2;
+	base[3].x = ( a + b ) / 2;
+
+	base[6].y = base[3].y;
+	c = base[1].y;
+	d = base[2].y;
+	base[1].y = a = ( base[0].y + c ) / 2;
+	base[5].y = b = ( base[3].y + d ) / 2;
+	c = ( c + d ) / 2;
+	base[2].y = a = ( a + c ) / 2;
+	base[4].y = b = ( b + c ) / 2;
+	base[3].y = ( a + b ) / 2;
 }
 
 
 static Bool ft_cubic_is_small_enough(GF_Point2D *base, Fixed *angle_in, Fixed *angle_mid, Fixed *angle_out)
 {
-    GF_Point2D  d1, d2, d3;
-    Fixed theta1, theta2;
-    s32 close1, close2, close3;
-    d1.x = base[2].x - base[3].x;
-    d1.y = base[2].y - base[3].y;
-    d2.x = base[1].x - base[2].x;
-    d2.y = base[1].y - base[2].y;
-    d3.x = base[0].x - base[1].x;
-    d3.y = base[0].y - base[1].y;
-
-    close1 = FT_IS_SMALL( d1.x ) && FT_IS_SMALL( d1.y );
-    close2 = FT_IS_SMALL( d2.x ) && FT_IS_SMALL( d2.y );
-    close3 = FT_IS_SMALL( d3.x ) && FT_IS_SMALL( d3.y );
-
-    if ( close1 || close3 ) {
+	GF_Point2D  d1, d2, d3;
+	Fixed theta1, theta2;
+	s32 close1, close2, close3;
+	d1.x = base[2].x - base[3].x;
+	d1.y = base[2].y - base[3].y;
+	d2.x = base[1].x - base[2].x;
+	d2.y = base[1].y - base[2].y;
+	d3.x = base[0].x - base[1].x;
+	d3.y = base[0].y - base[1].y;
+
+	close1 = FT_IS_SMALL( d1.x ) && FT_IS_SMALL( d1.y );
+	close2 = FT_IS_SMALL( d2.x ) && FT_IS_SMALL( d2.y );
+	close3 = FT_IS_SMALL( d3.x ) && FT_IS_SMALL( d3.y );
+
+	if ( close1 || close3 ) {
 		if ( close2 ) {
 			/* basically a point */
 			*angle_in = *angle_out = *angle_mid = 0;
 		} else if ( close1 ) {
 			*angle_in  = *angle_mid = gf_atan2( d2.y, d2.x);
 			*angle_out = gf_atan2( d3.y, d3.x);
-		} 
-		/* close2 */ 
+		}
+		/* close2 */
 		else {
 			*angle_in  = gf_atan2(d1.y, d1.x);
 			*angle_mid = *angle_out = gf_atan2(d2.y, d2.x);
 		}
-    }
-    else if ( close2 ) {
+	}
+	else if ( close2 ) {
 		*angle_in  = *angle_mid = gf_atan2(d1.y, d1.x);
 		*angle_out = gf_atan2(d3.y, d3.x);
-    } else {
+	} else {
 		*angle_in  = gf_atan2(d1.y, d1.x);
 		*angle_mid = gf_atan2(d2.y, d2.x);
 		*angle_out = gf_atan2(d3.y, d3.x);
-    }
-    theta1 = ABS( gf_angle_diff( *angle_in,  *angle_mid ) );
-    theta2 = ABS( gf_angle_diff( *angle_mid, *angle_out ) );
-    return ((theta1 < FT_SMALL_CUBIC_THRESHOLD) && (theta2 < FT_SMALL_CUBIC_THRESHOLD )) ? 1 : 0;
+	}
+	theta1 = ABS( gf_angle_diff( *angle_in,  *angle_mid ) );
+	theta2 = ABS( gf_angle_diff( *angle_mid, *angle_out ) );
+	return ((theta1 < FT_SMALL_CUBIC_THRESHOLD) && (theta2 < FT_SMALL_CUBIC_THRESHOLD )) ? 1 : 0;
 }
 
 
@@ -229,8 +229,8 @@
 
 static s32 ft_stroke_border_conicto( FT_StrokeBorder  border, GF_Point2D*       control, GF_Point2D*       to )
 {
-    assert( border->start >= 0 );
-    if (ft_stroke_border_grow( border, 2 )==0) {
+	assert( border->start >= 0 );
+	if (ft_stroke_border_grow( border, 2 )==0) {
 		GF_Point2D*  vec = border->points + border->num_points;
 		u8 *tag = border->tags   + border->num_points;
 
@@ -241,17 +241,17 @@
 		tag[1] = FT_STROKE_TAG_ON;
 
 		border->num_points += 2;
-    } else {
+	} else {
 		return -1;
 	}
-    border->movable = 0;
-    return 0;
+	border->movable = 0;
+	return 0;
 }
 
 static s32 ft_stroke_border_cubicto( FT_StrokeBorder  border,
-                            GF_Point2D*       control1,
-                            GF_Point2D*       control2,
-                            GF_Point2D*       to )
+                                     GF_Point2D*       control1,
+                                     GF_Point2D*       control2,
+                                     GF_Point2D*       to )
 {
 	assert( border->start >= 0 );
 
@@ -278,10 +278,10 @@
 
 
 static s32 ft_stroke_border_arcto( FT_StrokeBorder  border,
-                          GF_Point2D*       center,
-                          Fixed         radius,
-                          Fixed angle_start,
-                          Fixed angle_diff )
+                                   GF_Point2D*       center,
+                                   Fixed         radius,
+                                   Fixed angle_start,
+                                   Fixed angle_diff )
 {
 	Fixed total, angle, step, rotate, next, theta;
 	GF_Point2D  a, b, a2, b2;
@@ -301,7 +301,7 @@
 			step = FT_ARC_CUBIC_ANGLE;
 		else if ( step < -FT_ARC_CUBIC_ANGLE )
 			step = -FT_ARC_CUBIC_ANGLE;
-		
+
 		next  = angle + step;
 		theta = step;
 		if ( theta < 0 )
@@ -343,19 +343,19 @@
 
 static s32 ft_stroke_border_moveto(FT_StrokeBorder  border, GF_Point2D*       to )
 {
-    /* close current open path if any ? */
-    if ( border->start >= 0 )
+	/* close current open path if any ? */
+	if ( border->start >= 0 )
 		ft_stroke_border_close( border );
 
-    border->start   = border->num_points;
-    border->movable = 0;
-    return ft_stroke_border_lineto( border, to, 0 );
+	border->start   = border->num_points;
+	border->movable = 0;
+	return ft_stroke_border_lineto( border, to, 0 );
 }
 
 
 static s32 ft_stroke_border_get_counts(FT_StrokeBorder  border,
-                               u32 *anum_points,
-                               u32 *anum_contours )
+                                       u32 *anum_points,
+                                       u32 *anum_contours )
 {
 	s32 error        = 0;
 	u32 num_points   = 0;
@@ -372,9 +372,9 @@
 			in_contour = 1;
 		} else if ( in_contour == 0 )
 			goto Fail;
-		
+
 		if ( tags[0] & FT_STROKE_TAG_END ) {
-			if ( in_contour == 0 ) 
+			if ( in_contour == 0 )
 				goto Fail;
 			in_contour = 0;
 			num_contours++;
@@ -405,7 +405,7 @@
 
 	/* copy point locations */
 	memcpy(outline->points + outline->n_points, border->points, sizeof(GF_Point2D)*border->num_points);
-	
+
 	/* copy tags */
 	{
 		u32 count = border->num_points;
@@ -440,13 +440,13 @@
 }
 
 
- /***************************************************************************/
- /***************************************************************************/
- /*****                                                                 *****/
- /*****                           STROKER                               *****/
- /*****                                                                 *****/
- /***************************************************************************/
- /***************************************************************************/
+/***************************************************************************/
+/***************************************************************************/
+/*****                                                                 *****/
+/*****                           STROKER                               *****/
+/*****                                                                 *****/
+/***************************************************************************/
+/***************************************************************************/
 
 #define FT_SIDE_TO_ROTATE( s )   ( GF_PI2 - (s) * GF_PI )
 
@@ -469,30 +469,30 @@
 } FT_StrokerRec, FT_Stroker;
 
 
-  /* creates a circular arc at a corner or cap */
+/* creates a circular arc at a corner or cap */
 static s32 ft_stroker_arcto( FT_Stroker  *stroker, s32 side )
 {
-    Fixed total, rotate;
-    Fixed         radius = stroker->radius;
-    s32 error  = 0;
-    FT_StrokeBorder  border = stroker->borders + side;
-    rotate = FT_SIDE_TO_ROTATE( side );
-    total = gf_angle_diff( stroker->angle_in, stroker->angle_out);
-    if ( total == GF_PI ) total = -rotate * 2;
-    error = ft_stroke_border_arcto( border,
-                                    &stroker->center,
-                                    radius,
-                                    stroker->angle_in + rotate,
-                                    total );
-    border->movable = 0;
-    return error;
+	Fixed total, rotate;
+	Fixed         radius = stroker->radius;
+	s32 error  = 0;
+	FT_StrokeBorder  border = stroker->borders + side;
+	rotate = FT_SIDE_TO_ROTATE( side );
+	total = gf_angle_diff( stroker->angle_in, stroker->angle_out);
+	if ( total == GF_PI ) total = -rotate * 2;
+	error = ft_stroke_border_arcto( border,
+	                                &stroker->center,
+	                                radius,
+	                                stroker->angle_in + rotate,
+	                                total );
+	border->movable = 0;
+	return error;
 }
 
-  /* adds a cap at the end of an opened path */
+/* adds a cap at the end of an opened path */
 static s32 ft_stroker_cap(FT_Stroker  *stroker, Fixed angle, s32 side)
 {
-    s32 error  = 0;
-    if ( stroker->line_cap == GF_LINE_CAP_ROUND) {
+	s32 error  = 0;
+	if ( stroker->line_cap == GF_LINE_CAP_ROUND) {
 		/* OK we cheat a bit here compared to FT original code, and use a rough cubic cap instead of
 		a circle to deal with arbitrary orientation of regular paths where arc cap is not always properly oriented.
 		Rather than computing orientation we simply approximate to conic - btw this takes less memory than
@@ -544,7 +544,7 @@
 		delta.y += delta2.y + stroker->center.y;
 
 		error = ft_stroke_border_lineto( border, &delta, 0 );
-    } else if ( stroker->line_cap == GF_LINE_CAP_TRIANGLE) {
+	} else if ( stroker->line_cap == GF_LINE_CAP_TRIANGLE) {
 		/* add a triangle cap */
 		GF_Point2D delta;
 		Fixed radius = stroker->radius;
@@ -554,10 +554,10 @@
 		delta.x += stroker->center.x;
 		delta.y += stroker->center.y;
 		error = ft_stroke_border_lineto(border, &delta, 0);
-    }
+	}
 
 Exit:
-    return error;
+	return error;
 }
 
 
@@ -600,7 +600,7 @@
 }
 
 
-	/* process an outside corner, i.e. compute bevel/miter/round */
+/* process an outside corner, i.e. compute bevel/miter/round */
 static s32 ft_stroker_outside( FT_Stroker *stroker, s32 side )
 {
 	FT_StrokeBorder  border = stroker->borders + side;
@@ -613,7 +613,7 @@
 		join = GF_LINE_JOIN_MITER;
 		sin_theta = gf_sin(gf_angle_diff( stroker->angle_out - GF_PI, stroker->angle_in) / 2 );
 		if (sin_theta) {
-			inv_sin_theta = gf_invfix(sin_theta); 
+			inv_sin_theta = gf_invfix(sin_theta);
 			if (inv_sin_theta > stroker->miter_limit) join = GF_LINE_JOIN_BEVEL;
 		} else {
 			join = GF_LINE_JOIN_BEVEL;
@@ -655,7 +655,7 @@
 
 		if ( sigma >= FIX_ONE ) {
 			miter = 0;
-		} 
+		}
 
 		/* this is a miter (broken angle) */
 		if ( miter ) {
@@ -727,62 +727,62 @@
 {
 	s32 error = 0;
 	Fixed turn;
-    s32 inside_side;
+	s32 inside_side;
 	turn = gf_angle_diff( stroker->angle_in, stroker->angle_out );
 
-    /* no specific corner processing is required if the turn is 0 */
-    if ( turn == 0 )
+	/* no specific corner processing is required if the turn is 0 */
+	if ( turn == 0 )
 		goto Exit;
 
-    /* when we turn to the right, the inside side is 0 */
-    inside_side = 0;
-    /* otherwise, the inside side is 1 */
-    if (turn < 0 )
+	/* when we turn to the right, the inside side is 0 */
+	inside_side = 0;
+	/* otherwise, the inside side is 1 */
+	if (turn < 0 )
 		inside_side = 1;
 
-    /* process the inside side */
+	/* process the inside side */
 	error = ft_stroker_inside( stroker, inside_side );
 	if ( error ) goto Exit;
 
-    /* process the outside side */
-    error = ft_stroker_outside( stroker, 1 - inside_side );
+	/* process the outside side */
+	error = ft_stroker_outside( stroker, 1 - inside_side );
 
 Exit:
-    return error;
+	return error;
 }
 
 
-  /* add two points to the left and right borders corresponding to the */
-  /* start of the subpath..                                            */
+/* add two points to the left and right borders corresponding to the */
+/* start of the subpath..                                            */
 static s32 ft_stroker_subpath_start( FT_Stroker *stroker, Fixed start_angle )
 {
 	GF_Point2D        delta;
 	GF_Point2D        point;
 	s32 error;
 	FT_StrokeBorder  border;
-	
+
 	delta = gf_v2d_from_polar(stroker->radius, start_angle + GF_PI2 );
 
-    point.x = stroker->center.x + delta.x;
-    point.y = stroker->center.y + delta.y;
+	point.x = stroker->center.x + delta.x;
+	point.y = stroker->center.y + delta.y;
 
-    border = stroker->borders;
-    error = ft_stroke_border_moveto( border, &point );
-    if ( error )
+	border = stroker->borders;
+	error = ft_stroke_border_moveto( border, &point );
+	if ( error )
 		goto Exit;
 
-    point.x = stroker->center.x - delta.x;
-    point.y = stroker->center.y - delta.y;
+	point.x = stroker->center.x - delta.x;
+	point.y = stroker->center.y - delta.y;
 
-    border++;
-    error = ft_stroke_border_moveto( border, &point );
+	border++;
+	error = ft_stroke_border_moveto( border, &point );
 
-    /* save angle for last cap */
-    stroker->subpath_angle = start_angle;
-    stroker->first_point   = 0;
+	/* save angle for last cap */
+	stroker->subpath_angle = start_angle;
+	stroker->first_point   = 0;
 
 Exit:
-    return error;
+	return error;
 }
 
 
@@ -794,31 +794,31 @@
 	Fixed angle;
 	s32 side;
 
-    delta.x = to->x - stroker->center.x;
-    delta.y = to->y - stroker->center.y;
+	delta.x = to->x - stroker->center.x;
+	delta.y = to->y - stroker->center.y;
 	if (!is_last && !delta.x && !delta.y) return 0;
 
-    angle = gf_atan2( delta.y, delta.x);
-    delta = gf_v2d_from_polar(stroker->radius, angle + GF_PI2 );
+	angle = gf_atan2( delta.y, delta.x);
+	delta = gf_v2d_from_polar(stroker->radius, angle + GF_PI2 );
 
-    /* process corner if necessary */
-    if ( stroker->first_point ) {
+	/* process corner if necessary */
+	if ( stroker->first_point ) {
 		/* This is the first segment of a subpath.  We need to     */
 		/* add a point to each border at their respective starting */
 		/* point locations.                                        */
 		error = ft_stroker_subpath_start( stroker, angle );
 		if ( error )
 			goto Exit;
-    } else {
+	} else {
 		/* process the current corner */
 		stroker->angle_out = angle;
 		error = ft_stroker_process_corner( stroker );
-		if ( error ) 
+		if ( error )
 			goto Exit;
-    }
+	}
 
-    /* now add a line segment to both the "inside" and "outside" paths */
-    for ( border = stroker->borders, side = 1; side >= 0; side--, border++ ) {
+	/* now add a line segment to both the "inside" and "outside" paths */
+	for ( border = stroker->borders, side = 1; side >= 0; side--, border++ ) {
 		GF_Point2D  point;
 		point.x = to->x + delta.x;
 		point.y = to->y + delta.y;
@@ -829,36 +829,36 @@
 
 		delta.x = -delta.x;
 		delta.y = -delta.y;
-    }
-    stroker->angle_in = angle;
-    stroker->center   = *to;
+	}
+	stroker->angle_in = angle;
+	stroker->center   = *to;
 
 Exit:
-    return error;
+	return error;
 }
 
 
 static s32 FT_Stroker_ConicTo(FT_Stroker *stroker, GF_Point2D*  control, GF_Point2D * to)
 {
 	s32 error = 0;
-    GF_Point2D   bez_stack[34];
-    GF_Point2D*  arc;
-    GF_Point2D*  limit = bez_stack + 30;
-    Fixed start_angle;
-    Bool first_arc = 1;
+	GF_Point2D   bez_stack[34];
+	GF_Point2D*  arc;
+	GF_Point2D*  limit = bez_stack + 30;
+	Fixed start_angle;
+	Bool first_arc = 1;
 
 
-    arc    = bez_stack;
-    arc[0] = *to;
-    arc[1] = *control;
-    arc[2] = stroker->center;
+	arc    = bez_stack;
+	arc[0] = *to;
+	arc[1] = *control;
+	arc[2] = stroker->center;
 
-    while ( arc >= bez_stack ) {
+	while ( arc >= bez_stack ) {
 		Fixed angle_in, angle_out;
 		angle_in = angle_out = 0;  /* remove compiler warnings */
 
 		if ( arc < limit                                             &&
-			!ft_conic_is_small_enough( arc, &angle_in, &angle_out ) )
+		        !ft_conic_is_small_enough( arc, &angle_in, &angle_out ) )
 		{
 			ft_conic_split( arc );
 			arc += 2;
@@ -881,7 +881,7 @@
 
 		/* the arc's angle is small enough; we can add it directly to each */
 		/* border                                                          */
-		{        
+		{
 			GF_Point2D  ctrl, end;
 			Fixed theta, phi, rotate;
 			Fixed length;
@@ -914,39 +914,39 @@
 
 		if ( arc < bez_stack )
 			stroker->angle_in = angle_out;
-    }
+	}
 
-    stroker->center = *to;
+	stroker->center = *to;
 Exit:
-    return error;
+	return error;
 }
 
 
 static s32 FT_Stroker_CubicTo(FT_Stroker *stroker,
-                      GF_Point2D*  control1,
-                      GF_Point2D*  control2,
-                      GF_Point2D*  to )
+                              GF_Point2D*  control1,
+                              GF_Point2D*  control2,
+                              GF_Point2D*  to )
 {
-    s32 error = 0;
+	s32 error = 0;
 	GF_Point2D   bez_stack[37];
-    GF_Point2D*  arc;
-    GF_Point2D*  limit = bez_stack + 32;
-    Fixed start_angle;
-    Bool     first_arc = 1;
-
-    arc    = bez_stack;
-    arc[0] = *to;
-    arc[1] = *control2;
-    arc[2] = *control1;
-    arc[3] = stroker->center;
-
-    while ( arc >= bez_stack ) {
+	GF_Point2D*  arc;
+	GF_Point2D*  limit = bez_stack + 32;
+	Fixed start_angle;
+	Bool     first_arc = 1;
+
+	arc    = bez_stack;
+	arc[0] = *to;
+	arc[1] = *control2;
+	arc[2] = *control1;
+	arc[3] = stroker->center;
+
+	while ( arc >= bez_stack ) {
 		Fixed angle_in, angle_mid, angle_out;
 		/* remove compiler warnings */
 		angle_in = angle_out = angle_mid = 0;
 
-		if (arc < limit && 
-			!ft_cubic_is_small_enough( arc, &angle_in, &angle_mid, &angle_out ) )
+		if (arc < limit &&
+		        !ft_cubic_is_small_enough( arc, &angle_in, &angle_mid, &angle_out ) )
 		{
 			ft_cubic_split( arc );
 			arc += 3;
@@ -1003,7 +1003,7 @@
 				end.y += arc[0].y;
 
 				error = ft_stroke_border_cubicto( stroker->borders + side,
-					&ctrl1, &ctrl2, &end );
+				                                  &ctrl1, &ctrl2, &end );
 				if ( error )
 					goto Exit;
 			}
@@ -1012,41 +1012,41 @@
 		arc -= 3;
 		if ( arc < bez_stack )
 			stroker->angle_in = angle_out;
-    }
+	}
 
-    stroker->center = *to;
+	stroker->center = *to;
 
 Exit:
-    return error;
+	return error;
 }
 
 
 static s32 FT_Stroker_BeginSubPath(FT_Stroker *stroker, GF_Point2D*  to)
 {
-    /* We cannot process the first point, because there is not enough      */
-    /* information regarding its corner/cap.  The latter will be processed */
-    /* in the "end_subpath" routine.                                       */
-    /*                                                                     */
-    stroker->first_point   = 1;
-    stroker->center        = *to;
-
-    /* record the subpath start point index for each border */
-    stroker->subpath_start = *to;
-    return 0;
+	/* We cannot process the first point, because there is not enough      */
+	/* information regarding its corner/cap.  The latter will be processed */
+	/* in the "end_subpath" routine.                                       */
+	/*                                                                     */
+	stroker->first_point   = 1;
+	stroker->center        = *to;
+
+	/* record the subpath start point index for each border */
+	stroker->subpath_start = *to;
+	return 0;
 }
 
 static s32 ft_stroker_add_reverse_left( FT_Stroker *stroker, Bool     open )
 {
-    FT_StrokeBorder  right  = stroker->borders + 0;
-    FT_StrokeBorder  left   = stroker->borders + 1;
-    s32 new_points;
-    s32 error  = 0;
+	FT_StrokeBorder  right  = stroker->borders + 0;
+	FT_StrokeBorder  left   = stroker->borders + 1;
+	s32 new_points;
+	s32 error  = 0;
 
 	if (!left->num_points) return 0;
 
-    assert( left->start >= 0 );
-    new_points = left->num_points - left->start;
-    if ( new_points > 0 ) {
+	assert( left->start >= 0 );
+	new_points = left->num_points - left->start;
+	if ( new_points > 0 ) {
 		error = ft_stroke_border_grow( right, (u32)new_points );
 		if ( error )
 			goto Exit;
@@ -1063,7 +1063,7 @@
 
 				if ( open )
 					dst_tag[0] &= ~( FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END );
-				else { 
+				else {
 					/* switch begin/end tags if necessary.. */
 					if ( dst_tag[0] & ( FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END ) )
 						dst_tag[0] ^= ( FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END );
@@ -1081,16 +1081,16 @@
 
 		right->movable = 0;
 		left->movable  = 0;
-    }
+	}
 
 Exit:
-    return error;
+	return error;
 }
 
 /* there's a lot of magic in this function! */
 static s32 FT_Stroker_EndSubPath( FT_Stroker *stroker, Bool do_close)
 {
-    s32  error  = 0;
+	s32  error  = 0;
 	FT_StrokeBorder  right = stroker->borders;
 	if (do_close) {
 		Fixed turn;
@@ -1138,7 +1138,7 @@
 		/* now add the final cap */
 		stroker->center = stroker->subpath_start;
 		error = ft_stroker_cap( stroker,
-			stroker->subpath_angle + GF_PI, 0 );
+		                        stroker->subpath_angle + GF_PI, 0 );
 		if ( error )
 			goto Exit;
 
@@ -1154,21 +1154,21 @@
 
 static s32 FT_Stroker_GetCounts( FT_Stroker *stroker, u32 *anum_points, u32 *anum_contours )
 {
-    u32 count1, count2, num_points   = 0;
-    u32 count3, count4, num_contours = 0;
-    s32 error;
-    
+	u32 count1, count2, num_points   = 0;
+	u32 count3, count4, num_contours = 0;
+	s32 error;
+
 	error = ft_stroke_border_get_counts( stroker->borders + 0, &count1, &count2 );
 	if ( error ) goto Exit;
-    error = ft_stroke_border_get_counts( stroker->borders + 1, &count3, &count4 );
-    if ( error ) goto Exit;
-    num_points   = count1 + count3;
-    num_contours = count2 + count4;
+	error = ft_stroke_border_get_counts( stroker->borders + 1, &count3, &count4 );
+	if ( error ) goto Exit;
+	num_points   = count1 + count3;
+	num_contours = count2 + count4;
 
 Exit:
-    *anum_points   = num_points;
-    *anum_contours = num_contours;
-    return error;
+	*anum_points   = num_points;
+	*anum_contours = num_contours;
+	return error;
 }
 
 /*
@@ -1189,159 +1189,159 @@
 	s32 tag;       /* current point's state           */
 
 	if ( !outline || !stroker )
-	  return -1;
+		return -1;
 
 	first = 0;
 
 	for ( n = 0; n < outline->n_contours; n++ ) {
-	  s32 closed_subpath;
-	  s32 last;  /* index of last point in contour */
-	  
-	  last  = outline->contours[n];
-	  limit = outline->points + last;
-
-	  v_start = outline->points[first];
-	  v_last  = outline->points[last];
-
-	  v_control = v_start;
-
-	  point = outline->points + first;
-	  tags  = outline->tags  + first;
-	  tag = tags[0];
-
-	  /* A contour cannot start with a cubic control point! */
-	  if ( tag == GF_PATH_CURVE_CUBIC )
-		  goto Invalid_Outline;
-
-	  /* check first point to determine origin */
-	  if ( tag == GF_PATH_CURVE_CONIC ) {
-		  /* First point is conic control.  Yes, this happens. */
-		  if ( outline->tags[last] & GF_PATH_CURVE_ON ) {
-			  /* start at last point if it is on the curve */
-			  v_start = v_last;
-			  limit--;
-		  } else {
-			  /* if both first and last points are conic,         */
-			  /* start at their middle and record its position    */
-			  /* for closure                                      */
-			  v_start.x = ( v_start.x + v_last.x ) / 2;
-			  v_start.y = ( v_start.y + v_last.y ) / 2;
-
-			  v_last = v_start;
-		  }
-		  point--;
-		  tags--;
-	  }
-	  closed_subpath = (outline->tags[outline->contours[n]]==GF_PATH_CLOSE) ? 1 : 0;
-
-	  error = FT_Stroker_BeginSubPath(stroker, &v_start);
-	  if ( error )
-		  goto Exit;
-
-	  /*subpath is a single point, force a lineTo to start for the stroker to compute lineCap*/
-	  if (point==limit) {
-		  error = FT_Stroker_LineTo(stroker, &v_start, 1);
-		  closed_subpath = 0;
-		  goto Close;
-	  }
-
-	  while ( point < limit ) {
-		  point++;
-		  tags++;
-
-		  tag = tags[0];
-		  switch ( tag ) {
-		  case GF_PATH_CURVE_ON:  /* emit a single line_to */
-		  case GF_PATH_CLOSE:  /* emit a single line_to */
-		  {
-			  GF_Point2D  vec;
-			  vec.x = point->x;
-			  vec.y = point->y;
-
-			  error = FT_Stroker_LineTo( stroker, &vec, (point == limit) ? 1 : 0 );
-			  if ( error )
-				  goto Exit;
-			  continue;
-		  }
-
-		  case GF_PATH_CURVE_CONIC:  /* consume conic arcs */
-			  v_control.x = point->x;
-			  v_control.y = point->y;
-
-		Do_Conic:
-			  if ( point < limit ) {
-				  GF_Point2D  vec;
-				  GF_Point2D  v_middle;
-
-
-				  point++;
-				  tags++;
-				  tag = tags[0];
-
-				  vec = point[0];
-
-				  if ( tag & GF_PATH_CURVE_ON) {
-
-					  error = FT_Stroker_ConicTo( stroker, &v_control, &vec );
-					  if ( error )
-						  goto Exit;
-					  continue;
-				  }
-
-				  if ( tag != GF_PATH_CURVE_CONIC )
-					  goto Invalid_Outline;
-
-				  v_middle.x = ( v_control.x + vec.x ) / 2;
-				  v_middle.y = ( v_control.y + vec.y ) / 2;
-
-				  error = FT_Stroker_ConicTo( stroker, &v_control, &v_middle );
-				  if ( error )
-					  goto Exit;
-
-				  v_control = vec;
-				  goto Do_Conic;
-			  }
-			  error = FT_Stroker_ConicTo( stroker, &v_control, &v_start );
-			  goto Close;
-
-		  default:  /* GF_PATH_CURVE_CUBIC */
-		  {
-			  GF_Point2D  vec1, vec2;
-
-			  if ( point + 1 > limit                             ||
-				  tags[1] != GF_PATH_CURVE_CUBIC )
-				  goto Invalid_Outline;
-
-			  point += 2;
-			  tags  += 2;
-
-			  vec1 = point[-2];
-			  vec2 = point[-1];
-
-			  if ( point <= limit ) {
-				  GF_Point2D  vec;
-				  vec = point[0];
-
-				  error = FT_Stroker_CubicTo( stroker, &vec1, &vec2, &vec );
-				  if ( error )
-					  goto Exit;
-				  continue;
-			  }
-			  error = FT_Stroker_CubicTo( stroker, &vec1, &vec2, &v_start );
-			  goto Close;
-		  }
-		  break;
-		  }
-	  }
+		s32 closed_subpath;
+		s32 last;  /* index of last point in contour */
+
+		last  = outline->contours[n];
+		limit = outline->points + last;
+
+		v_start = outline->points[first];
+		v_last  = outline->points[last];
+
+		v_control = v_start;
+
+		point = outline->points + first;
+		tags  = outline->tags  + first;
+		tag = tags[0];
+
+		/* A contour cannot start with a cubic control point! */
+		if ( tag == GF_PATH_CURVE_CUBIC )
+			goto Invalid_Outline;
+
+		/* check first point to determine origin */
+		if ( tag == GF_PATH_CURVE_CONIC ) {
+			/* First point is conic control.  Yes, this happens. */
+			if ( outline->tags[last] & GF_PATH_CURVE_ON ) {
+				/* start at last point if it is on the curve */
+				v_start = v_last;
+				limit--;
+			} else {
+				/* if both first and last points are conic,         */
+				/* start at their middle and record its position    */
+				/* for closure                                      */
+				v_start.x = ( v_start.x + v_last.x ) / 2;
+				v_start.y = ( v_start.y + v_last.y ) / 2;
+
+				v_last = v_start;
+			}
+			point--;
+			tags--;
+		}
+		closed_subpath = (outline->tags[outline->contours[n]]==GF_PATH_CLOSE) ? 1 : 0;
+
+		error = FT_Stroker_BeginSubPath(stroker, &v_start);
+		if ( error )
+			goto Exit;
+
+		/*subpath is a single point, force a lineTo to start for the stroker to compute lineCap*/
+		if (point==limit) {
+			error = FT_Stroker_LineTo(stroker, &v_start, 1);
+			closed_subpath = 0;
+			goto Close;
+		}
+
+		while ( point < limit ) {
+			point++;
+			tags++;
+
+			tag = tags[0];
+			switch ( tag ) {
+			case GF_PATH_CURVE_ON:  /* emit a single line_to */
+			case GF_PATH_CLOSE:  /* emit a single line_to */
+			{
+				GF_Point2D  vec;
+				vec.x = point->x;
+				vec.y = point->y;
+
+				error = FT_Stroker_LineTo( stroker, &vec, (point == limit) ? 1 : 0 );
+				if ( error )
+					goto Exit;
+				continue;
+			}
+
+			case GF_PATH_CURVE_CONIC:  /* consume conic arcs */
+				v_control.x = point->x;
+				v_control.y = point->y;
+
+Do_Conic:
+				if ( point < limit ) {
+					GF_Point2D  vec;
+					GF_Point2D  v_middle;
+
+
+					point++;
+					tags++;
+					tag = tags[0];
+
+					vec = point[0];
+
+					if ( tag & GF_PATH_CURVE_ON) {
+
+						error = FT_Stroker_ConicTo( stroker, &v_control, &vec );
+						if ( error )
+							goto Exit;
+						continue;
+					}
+
+					if ( tag != GF_PATH_CURVE_CONIC )
+						goto Invalid_Outline;
+
+					v_middle.x = ( v_control.x + vec.x ) / 2;
+					v_middle.y = ( v_control.y + vec.y ) / 2;
+
+					error = FT_Stroker_ConicTo( stroker, &v_control, &v_middle );
+					if ( error )
+						goto Exit;
+
+					v_control = vec;
+					goto Do_Conic;
+				}
+				error = FT_Stroker_ConicTo( stroker, &v_control, &v_start );
+				goto Close;
+
+			default:  /* GF_PATH_CURVE_CUBIC */
+			{
+				GF_Point2D  vec1, vec2;
+
+				if ( point + 1 > limit                             ||
+				        tags[1] != GF_PATH_CURVE_CUBIC )
+					goto Invalid_Outline;
+
+				point += 2;
+				tags  += 2;
+
+				vec1 = point[-2];
+				vec2 = point[-1];
+
+				if ( point <= limit ) {
+					GF_Point2D  vec;
+					vec = point[0];
+
+					error = FT_Stroker_CubicTo( stroker, &vec1, &vec2, &vec );
+					if ( error )
+						goto Exit;
+					continue;
+				}
+				error = FT_Stroker_CubicTo( stroker, &vec1, &vec2, &v_start );
+				goto Close;
+			}
+			break;
+			}
+		}
 
 Close:
-	  if ( error ) goto Exit;
+		if ( error ) goto Exit;
 
-	  error = FT_Stroker_EndSubPath(stroker, closed_subpath);
-	  if ( error )
-		  goto Exit;
+		error = FT_Stroker_EndSubPath(stroker, closed_subpath);
+		if ( error )
+			goto Exit;
 
-	  first = last + 1;
+		first = last + 1;
 	}
 	return 0;
 
@@ -1432,7 +1432,7 @@
 		dash_first_pt = 0;
 	}
 	/*skip first point of first dash in subpath (same as last point of last dash)*/
-	for (i=1;i<dash_nb_pts; i++) {
+	for (i=1; i<dash_nb_pts; i++) {
 		GF_Err e = gf_path_add_line_to_vec(gp, &gp->points[dash_first_pt + i]);
 		if (e) return e;
 	}
@@ -1442,16 +1442,16 @@
 	memmove(gp->tags + dash_first_pt, gp->tags + dash_first_pt + dash_nb_pts, sizeof(u8)*(gp->n_points - dash_first_pt));
 
 	for (i=start_contour_index; i<gp->n_contours-1; i++) {
-		gp->contours[i] = gp->contours[i+1] - dash_nb_pts; 
+		gp->contours[i] = gp->contours[i+1] - dash_nb_pts;
 	}
 	gp->n_contours--;
 	gp->contours = (u32 *)gf_realloc(gp->contours, sizeof(u32)*gp->n_contours);
 
-/*
-	gp->points = gf_realloc(gp->points, sizeof(GF_Point2D)*gp->n_points);
-	gp->tags = gf_realloc(gp->tags, sizeof(u8)*gp->n_points);
-	gp->n_alloc_points = gp->n_points;
-*/
+	/*
+		gp->points = gf_realloc(gp->points, sizeof(GF_Point2D)*gp->n_points);
+		gp->tags = gf_realloc(gp->tags, sizeof(u8)*gp->n_points);
+		gp->n_alloc_points = gp->n_points;
+	*/
 	return GF_OK;
 }
 
@@ -1471,10 +1471,10 @@
 	u32 i, start_ind;
 	Fixed phase;
 	s32 offset, toggle;
-	
+
 	dists = (Fixed *)gf_malloc(sizeof (Fixed) * nb_pts);
 	if (dists == NULL) return GF_OUT_OF_MEM;
-	
+
 	/* initial values */
 	toggleinit = 1;
 	offsetinit = 0;
@@ -1533,7 +1533,7 @@
 		if (pen->dash_offset > dists[i]) {
 			pen->dash_offset -= dists[i];
 			dists[i] = 0;
-		} 
+		}
 		else if (pen->dash_offset) {
 			Fixed a, x, y, dx, dy;
 
@@ -1558,27 +1558,27 @@
 	/* subpath fits within first dash and no offset*/
 	if (!dist && totaldist <= dash) {
 		if (toggleinit) {
-			gf_path_add_move_to_vec(dashed, &pts[0]); 
+			gf_path_add_move_to_vec(dashed, &pts[0]);
 			for (i=1; i<nb_pts; i++) {
-				gf_path_add_line_to_vec(dashed, &pts[i]); 
+				gf_path_add_line_to_vec(dashed, &pts[i]);
 			}
 		}
 		gf_free(dists);
 		return GF_OK;
 	}
-	
+
 	/* subpath is composed of at least one dash */
 	phase = 0;
 	offset = offsetinit;
 	toggle = toggleinit;
 	i = start_ind;
-	
+
 	if (toggle && !dist) {
 		e = gf_path_add_move_to_vec(dashed, &pts[i]);
 		if (e) goto err_exit;
 		firstindex = dashed->n_contours - 1;
 	}
-	
+
 	while (i < nb_pts - 1) {
 		/* dash boundary is next */
 		if (dists[i] - dist > dash - phase) {
@@ -1589,7 +1589,7 @@
 			dy = pts[i + 1].y - pts[i].y;
 			x = pts[i].x + gf_mulfix(a, dx);
 			y = pts[i].y + gf_mulfix(a, dy);
-			
+
 			if (!toggle_check || ((x != pts[i].x) || (y != pts[i].y))) {
 				if (toggle) {
 					e = gf_path_add_line_to(dashed, x, y);
@@ -1600,7 +1600,7 @@
 					if (e) goto err_exit;
 				}
 			}
-			
+
 			/* advance to next dash */
 			toggle = !toggle;
 			phase = 0;
@@ -1618,7 +1618,7 @@
 				e = gf_path_add_line_to_vec(dashed, &pts[i]);
 				if (e) goto err_exit;
 				toggle_check = 1;
-				
+
 				if ( (firstindex>=0) && (i == (nb_pts - 1) && ((firstindex + 1) != (s32) start_ind ) ))  {
 					/*merge if closed path*/
 					if ((pts[0].x==pts[nb_pts-1].x) && (pts[0].y==pts[nb_pts-1].y)) {
@@ -1689,8 +1689,8 @@
 	if (!path || !pen.width) return NULL;
 
 	memset(&stroker, 0, sizeof(stroker));
-    stroker.borders[0].start = -1;
-    stroker.borders[1].start = -1;
+	stroker.borders[0].start = -1;
+	stroker.borders[1].start = -1;
 	stroker.line_cap = pen.cap;
 	stroker.line_join = pen.join;
 	stroker.miter_limit = pen.miterLimit;
@@ -1775,7 +1775,7 @@
 	if (stroker.borders[0].tags) gf_free(stroker.borders[0].tags);
 	if (stroker.borders[1].points) gf_free(stroker.borders[1].points);
 	if (stroker.borders[1].tags) gf_free(stroker.borders[1].tags);
-	
+
 	if (dashed) gf_path_del(dashed);
 	if (scaled) gf_path_del(scaled);

gpac-0.5.0.svn5178.tar.bz2/src/utils/ringbuffer.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/ringbuffer.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 #include <gpac/ringbuffer.h>
@@ -27,29 +27,29 @@
 GF_EXPORT
 GF_Ringbuffer * gf_ringbuffer_new(u32 sz)
 {
-  GF_Ringbuffer *rb;
-
-  rb = 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 = gf_malloc (rb->size);
-  rb->mx = gf_mx_new("RingBufferMutex");
-  return rb;
+	GF_Ringbuffer *rb;
+
+	rb = 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 = 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);
+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);
 }
 
 /*!
@@ -61,99 +61,99 @@
 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;
-  }
+	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;
+	size_t w, r;
 
-  w = rb->write_ptr;
-  r = rb->read_ptr;
+	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;
-  }
+	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;
+	u32 free_sz, sz2, to_read, n1, n2;
 
-  if ((free_sz = gf_ringbuffer_available_for_read(rb)) == 0) {
-    return 0;
-  }
+	if ((free_sz = gf_ringbuffer_available_for_read(rb)) == 0) {
+		return 0;
+	}
 
-  to_read = szDest > free_sz ? free_sz : szDest;
+	to_read = szDest > free_sz ? free_sz : szDest;
 
-  sz2 = rb->read_ptr + to_read;
+	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;
-  }
+	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;
+	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;
-  }
+	if (n2) {
+		memcpy (dest + n1, &(rb->buf[rb->read_ptr]), n2);
+		rb->read_ptr += n2;
+		rb->read_ptr &= rb->size_mask;
+	}
 
-  return to_read; 
+	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;
+	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.5.0.svn5178.tar.bz2/src/utils/sha1.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/sha1.c Changed

@@ -1,3 +1,5 @@
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 #ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
@@ -43,9 +45,9 @@
 
 struct __sha1_context
 {
-    u32 total[2];
-    u32 state[5];
-    u8 buffer[64];
+	u32 total[2];
+	u32 state[5];
+	u8 buffer[64];
 };
 
 /*
@@ -68,37 +70,37 @@
 {
 	GF_SHA1Context *ctx;
 	GF_SAFEALLOC(ctx, GF_SHA1Context);
-    ctx->total[0] = 0;
-    ctx->total[1] = 0;
-
-    ctx->state[0] = 0x67452301;
-    ctx->state[1] = 0xEFCDAB89;
-    ctx->state[2] = 0x98BADCFE;
-    ctx->state[3] = 0x10325476;
-    ctx->state[4] = 0xC3D2E1F0;
+	ctx->total[0] = 0;
+	ctx->total[1] = 0;
+
+	ctx->state[0] = 0x67452301;
+	ctx->state[1] = 0xEFCDAB89;
+	ctx->state[2] = 0x98BADCFE;
+	ctx->state[3] = 0x10325476;
+	ctx->state[4] = 0xC3D2E1F0;
 	return ctx;
 }
 
 static void sha1_process(GF_SHA1Context *ctx, u8 data[64] )
 {
-    u32 temp, W[16], A, B, C, D, E;
-
-    GET_UINT32_BE( W[0],  data,  0 );
-    GET_UINT32_BE( W[1],  data,  4 );
-    GET_UINT32_BE( W[2],  data,  8 );
-    GET_UINT32_BE( W[3],  data, 12 );
-    GET_UINT32_BE( W[4],  data, 16 );
-    GET_UINT32_BE( W[5],  data, 20 );
-    GET_UINT32_BE( W[6],  data, 24 );
-    GET_UINT32_BE( W[7],  data, 28 );
-    GET_UINT32_BE( W[8],  data, 32 );
-    GET_UINT32_BE( W[9],  data, 36 );
-    GET_UINT32_BE( W[10], data, 40 );
-    GET_UINT32_BE( W[11], data, 44 );
-    GET_UINT32_BE( W[12], data, 48 );
-    GET_UINT32_BE( W[13], data, 52 );
-    GET_UINT32_BE( W[14], data, 56 );
-    GET_UINT32_BE( W[15], data, 60 );
+	u32 temp, W[16], A, B, C, D, E;
+
+	GET_UINT32_BE( W[0],  data,  0 );
+	GET_UINT32_BE( W[1],  data,  4 );
+	GET_UINT32_BE( W[2],  data,  8 );
+	GET_UINT32_BE( W[3],  data, 12 );
+	GET_UINT32_BE( W[4],  data, 16 );
+	GET_UINT32_BE( W[5],  data, 20 );
+	GET_UINT32_BE( W[6],  data, 24 );
+	GET_UINT32_BE( W[7],  data, 28 );
+	GET_UINT32_BE( W[8],  data, 32 );
+	GET_UINT32_BE( W[9],  data, 36 );
+	GET_UINT32_BE( W[10], data, 40 );
+	GET_UINT32_BE( W[11], data, 44 );
+	GET_UINT32_BE( W[12], data, 48 );
+	GET_UINT32_BE( W[13], data, 52 );
+	GET_UINT32_BE( W[14], data, 56 );
+	GET_UINT32_BE( W[15], data, 60 );
 
 #define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
 
@@ -114,35 +116,35 @@
     e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
 }
 
-    A = ctx->state[0];
-    B = ctx->state[1];
-    C = ctx->state[2];
-    D = ctx->state[3];
-    E = ctx->state[4];
+	A = ctx->state[0];
+	B = ctx->state[1];
+	C = ctx->state[2];
+	D = ctx->state[3];
+	E = ctx->state[4];
 
 #define F(x,y,z) (z ^ (x & (y ^ z)))
 #define K 0x5A827999
 
-    P( A, B, C, D, E, W[0]  );
-    P( E, A, B, C, D, W[1]  );
-    P( D, E, A, B, C, W[2]  );
-    P( C, D, E, A, B, W[3]  );
-    P( B, C, D, E, A, W[4]  );
-    P( A, B, C, D, E, W[5]  );
-    P( E, A, B, C, D, W[6]  );
-    P( D, E, A, B, C, W[7]  );
-    P( C, D, E, A, B, W[8]  );
-    P( B, C, D, E, A, W[9]  );
-    P( A, B, C, D, E, W[10] );
-    P( E, A, B, C, D, W[11] );
-    P( D, E, A, B, C, W[12] );
-    P( C, D, E, A, B, W[13] );
-    P( B, C, D, E, A, W[14] );
-    P( A, B, C, D, E, W[15] );
-    P( E, A, B, C, D, R(16) );
-    P( D, E, A, B, C, R(17) );
-    P( C, D, E, A, B, R(18) );
-    P( B, C, D, E, A, R(19) );
+	P( A, B, C, D, E, W[0]  );
+	P( E, A, B, C, D, W[1]  );
+	P( D, E, A, B, C, W[2]  );
+	P( C, D, E, A, B, W[3]  );
+	P( B, C, D, E, A, W[4]  );
+	P( A, B, C, D, E, W[5]  );
+	P( E, A, B, C, D, W[6]  );
+	P( D, E, A, B, C, W[7]  );
+	P( C, D, E, A, B, W[8]  );
+	P( B, C, D, E, A, W[9]  );
+	P( A, B, C, D, E, W[10] );
+	P( E, A, B, C, D, W[11] );
+	P( D, E, A, B, C, W[12] );
+	P( C, D, E, A, B, W[13] );
+	P( B, C, D, E, A, W[14] );
+	P( A, B, C, D, E, W[15] );
+	P( E, A, B, C, D, R(16) );
+	P( D, E, A, B, C, R(17) );
+	P( C, D, E, A, B, R(18) );
+	P( B, C, D, E, A, R(19) );
 
 #undef K
 #undef F
@@ -150,26 +152,26 @@
 #define F(x,y,z) (x ^ y ^ z)
 #define K 0x6ED9EBA1
 
-    P( A, B, C, D, E, R(20) );
-    P( E, A, B, C, D, R(21) );
-    P( D, E, A, B, C, R(22) );
-    P( C, D, E, A, B, R(23) );
-    P( B, C, D, E, A, R(24) );
-    P( A, B, C, D, E, R(25) );
-    P( E, A, B, C, D, R(26) );
-    P( D, E, A, B, C, R(27) );
-    P( C, D, E, A, B, R(28) );
-    P( B, C, D, E, A, R(29) );
-    P( A, B, C, D, E, R(30) );
-    P( E, A, B, C, D, R(31) );
-    P( D, E, A, B, C, R(32) );
-    P( C, D, E, A, B, R(33) );
-    P( B, C, D, E, A, R(34) );
-    P( A, B, C, D, E, R(35) );
-    P( E, A, B, C, D, R(36) );
-    P( D, E, A, B, C, R(37) );
-    P( C, D, E, A, B, R(38) );
-    P( B, C, D, E, A, R(39) );
+	P( A, B, C, D, E, R(20) );
+	P( E, A, B, C, D, R(21) );
+	P( D, E, A, B, C, R(22) );
+	P( C, D, E, A, B, R(23) );
+	P( B, C, D, E, A, R(24) );
+	P( A, B, C, D, E, R(25) );
+	P( E, A, B, C, D, R(26) );
+	P( D, E, A, B, C, R(27) );
+	P( C, D, E, A, B, R(28) );
+	P( B, C, D, E, A, R(29) );
+	P( A, B, C, D, E, R(30) );
+	P( E, A, B, C, D, R(31) );
+	P( D, E, A, B, C, R(32) );
+	P( C, D, E, A, B, R(33) );
+	P( B, C, D, E, A, R(34) );
+	P( A, B, C, D, E, R(35) );
+	P( E, A, B, C, D, R(36) );
+	P( D, E, A, B, C, R(37) );
+	P( C, D, E, A, B, R(38) );
+	P( B, C, D, E, A, R(39) );
 
 #undef K
 #undef F
@@ -177,26 +179,26 @@
 #define F(x,y,z) ((x & y) | (z & (x | y)))
 #define K 0x8F1BBCDC
 
-    P( A, B, C, D, E, R(40) );
-    P( E, A, B, C, D, R(41) );
-    P( D, E, A, B, C, R(42) );
-    P( C, D, E, A, B, R(43) );
-    P( B, C, D, E, A, R(44) );
-    P( A, B, C, D, E, R(45) );
-    P( E, A, B, C, D, R(46) );
-    P( D, E, A, B, C, R(47) );
-    P( C, D, E, A, B, R(48) );
-    P( B, C, D, E, A, R(49) );
-    P( A, B, C, D, E, R(50) );
-    P( E, A, B, C, D, R(51) );
-    P( D, E, A, B, C, R(52) );
-    P( C, D, E, A, B, R(53) );
-    P( B, C, D, E, A, R(54) );
-    P( A, B, C, D, E, R(55) );
-    P( E, A, B, C, D, R(56) );
-    P( D, E, A, B, C, R(57) );
-    P( C, D, E, A, B, R(58) );
-    P( B, C, D, E, A, R(59) );
+	P( A, B, C, D, E, R(40) );
+	P( E, A, B, C, D, R(41) );
+	P( D, E, A, B, C, R(42) );
+	P( C, D, E, A, B, R(43) );
+	P( B, C, D, E, A, R(44) );
+	P( A, B, C, D, E, R(45) );
+	P( E, A, B, C, D, R(46) );
+	P( D, E, A, B, C, R(47) );
+	P( C, D, E, A, B, R(48) );
+	P( B, C, D, E, A, R(49) );
+	P( A, B, C, D, E, R(50) );
+	P( E, A, B, C, D, R(51) );
+	P( D, E, A, B, C, R(52) );
+	P( C, D, E, A, B, R(53) );
+	P( B, C, D, E, A, R(54) );
+	P( A, B, C, D, E, R(55) );
+	P( E, A, B, C, D, R(56) );
+	P( D, E, A, B, C, R(57) );
+	P( C, D, E, A, B, R(58) );
+	P( B, C, D, E, A, R(59) );
 
 #undef K
 #undef F
@@ -204,35 +206,35 @@
 #define F(x,y,z) (x ^ y ^ z)
 #define K 0xCA62C1D6
 
-    P( A, B, C, D, E, R(60) );
-    P( E, A, B, C, D, R(61) );
-    P( D, E, A, B, C, R(62) );
-    P( C, D, E, A, B, R(63) );
-    P( B, C, D, E, A, R(64) );
-    P( A, B, C, D, E, R(65) );
-    P( E, A, B, C, D, R(66) );
-    P( D, E, A, B, C, R(67) );
-    P( C, D, E, A, B, R(68) );
-    P( B, C, D, E, A, R(69) );
-    P( A, B, C, D, E, R(70) );
-    P( E, A, B, C, D, R(71) );
-    P( D, E, A, B, C, R(72) );
-    P( C, D, E, A, B, R(73) );
-    P( B, C, D, E, A, R(74) );
-    P( A, B, C, D, E, R(75) );
-    P( E, A, B, C, D, R(76) );
-    P( D, E, A, B, C, R(77) );
-    P( C, D, E, A, B, R(78) );
-    P( B, C, D, E, A, R(79) );
+	P( A, B, C, D, E, R(60) );
+	P( E, A, B, C, D, R(61) );
+	P( D, E, A, B, C, R(62) );
+	P( C, D, E, A, B, R(63) );
+	P( B, C, D, E, A, R(64) );
+	P( A, B, C, D, E, R(65) );
+	P( E, A, B, C, D, R(66) );
+	P( D, E, A, B, C, R(67) );
+	P( C, D, E, A, B, R(68) );
+	P( B, C, D, E, A, R(69) );
+	P( A, B, C, D, E, R(70) );
+	P( E, A, B, C, D, R(71) );
+	P( D, E, A, B, C, R(72) );
+	P( C, D, E, A, B, R(73) );
+	P( B, C, D, E, A, R(74) );
+	P( A, B, C, D, E, R(75) );
+	P( E, A, B, C, D, R(76) );
+	P( D, E, A, B, C, R(77) );
+	P( C, D, E, A, B, R(78) );
+	P( B, C, D, E, A, R(79) );
 
 #undef K
 #undef F
 
-    ctx->state[0] += A;
-    ctx->state[1] += B;
-    ctx->state[2] += C;
-    ctx->state[3] += D;
-    ctx->state[4] += E;
+	ctx->state[0] += A;
+	ctx->state[1] += B;
+	ctx->state[2] += C;
+	ctx->state[3] += D;
+	ctx->state[4] += E;
 }
 
 /*
@@ -240,51 +242,51 @@
  */
 void gf_sha1_update(GF_SHA1Context *ctx, u8 *input, u32 ilen )
 {
-    s32 fill;
-    u32 left;
-
-    if( ilen <= 0 )
-        return;
-
-    left = ctx->total[0] & 0x3F;
-    fill = 64 - left;
-
-    ctx->total[0] += ilen;
-    ctx->total[0] &= 0xFFFFFFFF;
-
-    if( ctx->total[0] < (u32) ilen )
-        ctx->total[1]++;
-
-    if( left && (s32) ilen >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left),
-                (void *) input, fill );
-        sha1_process( ctx, ctx->buffer );
-        input += fill;
-        ilen  -= fill;
-        left = 0;
-    }
-
-    while( ilen >= 64 )
-    {
-        sha1_process( ctx, input );
-        input += 64;
-        ilen  -= 64;
-    }
-
-    if( ilen > 0 )
-    {
-        memcpy( (void *) (ctx->buffer + left),
-                (void *) input, ilen );
-    }
+	s32 fill;
+	u32 left;
+
+	if( ilen <= 0 )
+		return;
+
+	left = ctx->total[0] & 0x3F;
+	fill = 64 - left;
+
+	ctx->total[0] += ilen;
+	ctx->total[0] &= 0xFFFFFFFF;
+
+	if( ctx->total[0] < (u32) ilen )
+		ctx->total[1]++;
+
+	if( left && (s32) ilen >= fill )
+	{
+		memcpy( (void *) (ctx->buffer + left),
+		        (void *) input, fill );
+		sha1_process( ctx, ctx->buffer );
+		input += fill;
+		ilen  -= fill;
+		left = 0;
+	}
+
+	while( ilen >= 64 )
+	{
+		sha1_process( ctx, input );
+		input += 64;
+		ilen  -= 64;
+	}
+
+	if( ilen > 0 )
+	{
+		memcpy( (void *) (ctx->buffer + left),
+		        (void *) input, ilen );
+	}
 }
 
 static const u8 sha1_padding[64] =
 {
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
 /*
@@ -292,28 +294,28 @@
  */
 void gf_sha1_finish(GF_SHA1Context *ctx, u8 output[20] )
 {
-    u32 last, padn;
-    u32 high, low;
-    u8 msglen[8];
+	u32 last, padn;
+	u32 high, low;
+	u8 msglen[8];
 
-    high = ( ctx->total[0] >> 29 )
-         | ( ctx->total[1] <<  3 );
-    low  = ( ctx->total[0] <<  3 );
+	high = ( ctx->total[0] >> 29 )
+	       | ( ctx->total[1] <<  3 );
+	low  = ( ctx->total[0] <<  3 );
 
-    PUT_UINT32_BE( high, msglen, 0 );
-    PUT_UINT32_BE( low,  msglen, 4 );
+	PUT_UINT32_BE( high, msglen, 0 );
+	PUT_UINT32_BE( low,  msglen, 4 );
 
-    last = ctx->total[0] & 0x3F;
-    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
+	last = ctx->total[0] & 0x3F;
+	padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
 
-    gf_sha1_update( ctx, (u8 *) sha1_padding, padn );
-    gf_sha1_update( ctx, msglen, 8 );
+	gf_sha1_update( ctx, (u8 *) sha1_padding, padn );
+	gf_sha1_update( ctx, msglen, 8 );
 
-    PUT_UINT32_BE( ctx->state[0], output,  0 );
-    PUT_UINT32_BE( ctx->state[1], output,  4 );
-    PUT_UINT32_BE( ctx->state[2], output,  8 );
-    PUT_UINT32_BE( ctx->state[3], output, 12 );
-    PUT_UINT32_BE( ctx->state[4], output, 16 );
+	PUT_UINT32_BE( ctx->state[0], output,  0 );
+	PUT_UINT32_BE( ctx->state[1], output,  4 );
+	PUT_UINT32_BE( ctx->state[2], output,  8 );
+	PUT_UINT32_BE( ctx->state[3], output, 12 );
+	PUT_UINT32_BE( ctx->state[4], output, 16 );
 
 	gf_free(ctx);
 }
@@ -327,17 +329,17 @@
  *  All Rights Reserved
  *
  *  Freeware Public License (FPL)
- *  
+ *
  *  This software is licensed as "freeware."  Permission to distribute
- *  this software in source and binary forms, including incorporation 
- *  into other products, is hereby granted without a fee.  THIS SOFTWARE 
- *  IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR IMPLIED WARRANTIES, 
- *  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
- *  AND FITNESS FOR A PARTICULAR PURPOSE.  THE AUTHOR SHALL NOT BE HELD 
- *  LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE, EITHER 
- *  DIRECTLY OR INDIRECTLY, INCLUDING, BUT NOT LIMITED TO, LOSS OF DATA 
+ *  this software in source and binary forms, including incorporation
+ *  into other products, is hereby granted without a fee.  THIS SOFTWARE
+ *  IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR IMPLIED WARRANTIES,
+ *  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *  AND FITNESS FOR A PARTICULAR PURPOSE.  THE AUTHOR SHALL NOT BE HELD
+ *  LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE, EITHER
+ *  DIRECTLY OR INDIRECTLY, INCLUDING, BUT NOT LIMITED TO, LOSS OF DATA
  *  OR DATA BEING RENDERED INACCURATE.
- *  
+ *
  *****************************************************************************
  *  $Id: sha1.c 12 2009-06-22 19:34:25Z paulej $
  *****************************************************************************
@@ -371,22 +373,22 @@
  *
  */
 
-/* 
+/*
  *  This structure will hold context information for the hashing
  *  operation
  */
 struct __sha1_context
 {
-    unsigned Message_Digest[5]; /* Message Digest (output)          */
+	unsigned Message_Digest[5]; /* Message Digest (output)          */
 
-    unsigned Length_Low;        /* Message length in bits           */
-    unsigned Length_High;       /* Message length in bits           */
+	unsigned Length_Low;        /* Message length in bits           */
+	unsigned Length_High;       /* Message length in bits           */
 
-    unsigned char Message_Block[64]; /* 512-bit message blocks      */
-    int Message_Block_Index;    /* Index into message block array   */
+	unsigned char Message_Block[64]; /* 512-bit message blocks      */
+	int Message_Block_Index;    /* Index into message block array   */
 
-    int Computed;               /* Is the digest computed?          */
-    int Corrupted;              /* Is the message digest corruped?  */
+	int Computed;               /* Is the digest computed?          */
+	int Corrupted;              /* Is the message digest corruped?  */
 };
 
 /*
@@ -397,7 +399,7 @@
                 ((word) >> (32-(bits))))
 
 
-/*  
+/*
  *  SHA1ProcessMessageBlock
  *
  *  Description:
@@ -414,106 +416,106 @@
  *      Many of the variable names in the SHAContext, especially the
  *      single character names, were used because those were the names
  *      used in the publication.
- *         
+ *
  *
  */
 void SHA1ProcessMessageBlock(GF_SHA1Context *context)
 {
-    const unsigned K[] =            /* Constants defined in SHA-1   */      
-    {
-        0x5A827999,
-        0x6ED9EBA1,
-        0x8F1BBCDC,
-        0xCA62C1D6
-    };
-    int         t;                  /* Loop counter                 */
-    unsigned    temp;               /* Temporary word value         */
-    unsigned    W[80];              /* Word sequence                */
-    unsigned    A, B, C, D, E;      /* Word buffers                 */
-
-    /*
-     *  Initialize the first 16 words in the array W
-     */
-    for(t = 0; t < 16; t++)
-    {
-        W[t] = ((unsigned) context->Message_Block[t * 4]) << 24;
-        W[t] |= ((unsigned) context->Message_Block[t * 4 + 1]) << 16;
-        W[t] |= ((unsigned) context->Message_Block[t * 4 + 2]) << 8;
-        W[t] |= ((unsigned) context->Message_Block[t * 4 + 3]);
-    }
-
-    for(t = 16; t < 80; t++)
-    {
-       W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
-    }
-
-    A = context->Message_Digest[0];
-    B = context->Message_Digest[1];
-    C = context->Message_Digest[2];
-    D = context->Message_Digest[3];
-    E = context->Message_Digest[4];
-
-    for(t = 0; t < 20; t++)
-    {
-        temp =  SHA1CircularShift(5,A) +
-                ((B & C) | ((~B) & D)) + E + W[t] + K[0];
-        temp &= 0xFFFFFFFF;
-        E = D;
-        D = C;
-        C = SHA1CircularShift(30,B);
-        B = A;
-        A = temp;
-    }
-
-    for(t = 20; t < 40; t++)
-    {
-        temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
-        temp &= 0xFFFFFFFF;
-        E = D;
-        D = C;
-        C = SHA1CircularShift(30,B);
-        B = A;
-        A = temp;
-    }
-
-    for(t = 40; t < 60; t++)
-    {
-        temp = SHA1CircularShift(5,A) +
-               ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
-        temp &= 0xFFFFFFFF;
-        E = D;
-        D = C;
-        C = SHA1CircularShift(30,B);
-        B = A;
-        A = temp;
-    }
-
-    for(t = 60; t < 80; t++)
-    {
-        temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
-        temp &= 0xFFFFFFFF;
-        E = D;
-        D = C;
-        C = SHA1CircularShift(30,B);
-        B = A;
-        A = temp;
-    }
-
-    context->Message_Digest[0] =
-                        (context->Message_Digest[0] + A) & 0xFFFFFFFF;
-    context->Message_Digest[1] =
-                        (context->Message_Digest[1] + B) & 0xFFFFFFFF;
-    context->Message_Digest[2] =
-                        (context->Message_Digest[2] + C) & 0xFFFFFFFF;
-    context->Message_Digest[3] =
-                        (context->Message_Digest[3] + D) & 0xFFFFFFFF;
-    context->Message_Digest[4] =
-                        (context->Message_Digest[4] + E) & 0xFFFFFFFF;
-
-    context->Message_Block_Index = 0;
+	const unsigned K[] =            /* Constants defined in SHA-1   */
+	{
+		0x5A827999,
+		0x6ED9EBA1,
+		0x8F1BBCDC,
+		0xCA62C1D6
+	};
+	int         t;                  /* Loop counter                 */
+	unsigned    temp;               /* Temporary word value         */
+	unsigned    W[80];              /* Word sequence                */
+	unsigned    A, B, C, D, E;      /* Word buffers                 */
+
+	/*
+	 *  Initialize the first 16 words in the array W
+	 */
+	for(t = 0; t < 16; t++)
+	{
+		W[t] = ((unsigned) context->Message_Block[t * 4]) << 24;
+		W[t] |= ((unsigned) context->Message_Block[t * 4 + 1]) << 16;
+		W[t] |= ((unsigned) context->Message_Block[t * 4 + 2]) << 8;
+		W[t] |= ((unsigned) context->Message_Block[t * 4 + 3]);
+	}
+
+	for(t = 16; t < 80; t++)
+	{
+		W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
+	}
+
+	A = context->Message_Digest[0];
+	B = context->Message_Digest[1];
+	C = context->Message_Digest[2];
+	D = context->Message_Digest[3];
+	E = context->Message_Digest[4];
+
+	for(t = 0; t < 20; t++)
+	{
+		temp =  SHA1CircularShift(5,A) +
+		        ((B & C) | ((~B) & D)) + E + W[t] + K[0];
+		temp &= 0xFFFFFFFF;
+		E = D;
+		D = C;
+		C = SHA1CircularShift(30,B);
+		B = A;
+		A = temp;
+	}
+
+	for(t = 20; t < 40; t++)
+	{
+		temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
+		temp &= 0xFFFFFFFF;
+		E = D;
+		D = C;
+		C = SHA1CircularShift(30,B);
+		B = A;
+		A = temp;
+	}
+
+	for(t = 40; t < 60; t++)
+	{
+		temp = SHA1CircularShift(5,A) +
+		       ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
+		temp &= 0xFFFFFFFF;
+		E = D;
+		D = C;
+		C = SHA1CircularShift(30,B);
+		B = A;
+		A = temp;
+	}
+
+	for(t = 60; t < 80; t++)
+	{
+		temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
+		temp &= 0xFFFFFFFF;
+		E = D;
+		D = C;
+		C = SHA1CircularShift(30,B);
+		B = A;
+		A = temp;
+	}
+
+	context->Message_Digest[0] =
+	    (context->Message_Digest[0] + A) & 0xFFFFFFFF;
+	context->Message_Digest[1] =
+	    (context->Message_Digest[1] + B) & 0xFFFFFFFF;
+	context->Message_Digest[2] =
+	    (context->Message_Digest[2] + C) & 0xFFFFFFFF;
+	context->Message_Digest[3] =
+	    (context->Message_Digest[3] + D) & 0xFFFFFFFF;
+	context->Message_Digest[4] =
+	    (context->Message_Digest[4] + E) & 0xFFFFFFFF;
+
+	context->Message_Block_Index = 0;
 }
 
-/*  
+/*
  *  SHA1PadMessage
  *
  *  Description:
@@ -538,51 +540,51 @@
  */
 static void SHA1PadMessage(GF_SHA1Context *context)
 {
-    /*
-     *  Check to see if the current message block is too small to hold
-     *  the initial padding bits and length.  If so, we will pad the
-     *  block, process it, and then continue padding into a second
-     *  block.
-     */
-    if (context->Message_Block_Index > 55)
-    {
-        context->Message_Block[context->Message_Block_Index++] = 0x80;
-        while(context->Message_Block_Index < 64)
-        {
-            context->Message_Block[context->Message_Block_Index++] = 0;
-        }
-
-        SHA1ProcessMessageBlock(context);
-
-        while(context->Message_Block_Index < 56)
-        {
-            context->Message_Block[context->Message_Block_Index++] = 0;
-        }
-    }
-    else
-    {
-        context->Message_Block[context->Message_Block_Index++] = 0x80;
-        while(context->Message_Block_Index < 56)
-        {
-            context->Message_Block[context->Message_Block_Index++] = 0;
-        }
-    }
-
-    /*
-     *  Store the message length as the last 8 octets
-     */
-    context->Message_Block[56] = (context->Length_High >> 24) & 0xFF;
-    context->Message_Block[57] = (context->Length_High >> 16) & 0xFF;
-    context->Message_Block[58] = (context->Length_High >> 8) & 0xFF;
-    context->Message_Block[59] = (context->Length_High) & 0xFF;
-    context->Message_Block[60] = (context->Length_Low >> 24) & 0xFF;
-    context->Message_Block[61] = (context->Length_Low >> 16) & 0xFF;
-    context->Message_Block[62] = (context->Length_Low >> 8) & 0xFF;
-    context->Message_Block[63] = (context->Length_Low) & 0xFF;
-
-    SHA1ProcessMessageBlock(context);
+	/*
+	 *  Check to see if the current message block is too small to hold
+	 *  the initial padding bits and length.  If so, we will pad the
+	 *  block, process it, and then continue padding into a second
+	 *  block.
+	 */
+	if (context->Message_Block_Index > 55)
+	{
+		context->Message_Block[context->Message_Block_Index++] = 0x80;
+		while(context->Message_Block_Index < 64)
+		{
+			context->Message_Block[context->Message_Block_Index++] = 0;
+		}
+
+		SHA1ProcessMessageBlock(context);
+
+		while(context->Message_Block_Index < 56)
+		{
+			context->Message_Block[context->Message_Block_Index++] = 0;
+		}
+	}
+	else
+	{
+		context->Message_Block[context->Message_Block_Index++] = 0x80;
+		while(context->Message_Block_Index < 56)
+		{
+			context->Message_Block[context->Message_Block_Index++] = 0;
+		}
+	}
+
+	/*
+	 *  Store the message length as the last 8 octets
+	 */
+	context->Message_Block[56] = (context->Length_High >> 24) & 0xFF;
+	context->Message_Block[57] = (context->Length_High >> 16) & 0xFF;
+	context->Message_Block[58] = (context->Length_High >> 8) & 0xFF;
+	context->Message_Block[59] = (context->Length_High) & 0xFF;
+	context->Message_Block[60] = (context->Length_Low >> 24) & 0xFF;
+	context->Message_Block[61] = (context->Length_Low >> 16) & 0xFF;
+	context->Message_Block[62] = (context->Length_Low >> 8) & 0xFF;
+	context->Message_Block[63] = (context->Length_Low) & 0xFF;
+
+	SHA1ProcessMessageBlock(context);
 }
-/*  
+/*
  *  SHA1Reset
  *
  *  Description:
@@ -603,79 +605,79 @@
 {
 	GF_SHA1Context *context;
 	GF_SAFEALLOC(context, GF_SHA1Context);
-    context->Length_Low             = 0;
-    context->Length_High            = 0;
-    context->Message_Block_Index    = 0;
-
-    context->Message_Digest[0]      = 0x67452301;
-    context->Message_Digest[1]      = 0xEFCDAB89;
-    context->Message_Digest[2]      = 0x98BADCFE;
-    context->Message_Digest[3]      = 0x10325476;
-    context->Message_Digest[4]      = 0xC3D2E1F0;
-
-    context->Computed   = 0;
-    context->Corrupted  = 0;
+	context->Length_Low             = 0;
+	context->Length_High            = 0;
+	context->Message_Block_Index    = 0;
+
+	context->Message_Digest[0]      = 0x67452301;
+	context->Message_Digest[1]      = 0xEFCDAB89;
+	context->Message_Digest[2]      = 0x98BADCFE;
+	context->Message_Digest[3]      = 0x10325476;
+	context->Message_Digest[4]      = 0xC3D2E1F0;
+
+	context->Computed   = 0;
+	context->Corrupted  = 0;
 	return context;
 }
 
 void gf_sha1_update(GF_SHA1Context *context, u8 *message_array, u32 length )
 {
-    if (!length)
-    {
-        return;
-    }
-
-    if (context->Computed || context->Corrupted)
-    {
-        context->Corrupted = 1;
-        return;
-    }
-
-    while(length-- && !context->Corrupted)
-    {
-        context->Message_Block[context->Message_Block_Index++] =
-                                                (*message_array & 0xFF);
-
-        context->Length_Low += 8;
-        /* Force it to 32 bits */
-        context->Length_Low &= 0xFFFFFFFF;
-        if (context->Length_Low == 0)
-        {
-            context->Length_High++;
-            /* Force it to 32 bits */
-            context->Length_High &= 0xFFFFFFFF;
-            if (context->Length_High == 0)
-            {
-                /* Message is too long */
-                context->Corrupted = 1;
-            }
-        }
-
-        if (context->Message_Block_Index == 64)
-        {
-            SHA1ProcessMessageBlock(context);
-        }
-
-        message_array++;
-    }
+	if (!length)
+	{
+		return;
+	}
+
+	if (context->Computed || context->Corrupted)
+	{
+		context->Corrupted = 1;
+		return;
+	}
+
+	while(length-- && !context->Corrupted)
+	{
+		context->Message_Block[context->Message_Block_Index++] =
+		    (*message_array & 0xFF);
+
+		context->Length_Low += 8;
+		/* Force it to 32 bits */
+		context->Length_Low &= 0xFFFFFFFF;
+		if (context->Length_Low == 0)
+		{
+			context->Length_High++;
+			/* Force it to 32 bits */
+			context->Length_High &= 0xFFFFFFFF;
+			if (context->Length_High == 0)
+			{
+				/* Message is too long */
+				context->Corrupted = 1;
+			}
+		}
+
+		if (context->Message_Block_Index == 64)
+		{
+			SHA1ProcessMessageBlock(context);
+		}
+
+		message_array++;
+	}
 }
 void gf_sha1_finish(GF_SHA1Context *context, u8 output[20] )
 {
-    if (context->Corrupted)
-    {
-        return;
-    }
-
-    if (!context->Computed)
-    {
-        SHA1PadMessage(context);
-        context->Computed = 1;
-    }
-    PUT_UINT32_BE( context->Message_Digest[0], output,  0 );
-    PUT_UINT32_BE( context->Message_Digest[1], output,  4 );
-    PUT_UINT32_BE( context->Message_Digest[2], output,  8 );
-    PUT_UINT32_BE( context->Message_Digest[3], output, 12 );
-    PUT_UINT32_BE( context->Message_Digest[4], output, 16 );
+	if (context->Corrupted)
+	{
+		return;
+	}
+
+	if (!context->Computed)
+	{
+		SHA1PadMessage(context);
+		context->Computed = 1;
+	}
+	PUT_UINT32_BE( context->Message_Digest[0], output,  0 );
+	PUT_UINT32_BE( context->Message_Digest[1], output,  4 );
+	PUT_UINT32_BE( context->Message_Digest[2], output,  8 );
+	PUT_UINT32_BE( context->Message_Digest[3], output, 12 );
+	PUT_UINT32_BE( context->Message_Digest[4], output, 16 );
 
 	gf_free(context);
 }
@@ -688,33 +690,33 @@
 GF_EXPORT
 s32 gf_sha1_file( const char *path, u8 output[20] )
 {
-    FILE *f;
-    size_t n;
-    GF_SHA1Context *ctx;
-    u8 buf[1024];
+	FILE *f;
+	size_t n;
+	GF_SHA1Context *ctx;
+	u8 buf[1024];
 
 	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_sha1_csum(mem_address, size, output);
 		return 0;
 	}
 
-    if( ( f = gf_f64_open( path, "rb" ) ) == NULL )
-        return( 1 );
+	if( ( f = gf_f64_open( path, "rb" ) ) == NULL )
+		return( 1 );
 
-    ctx  = gf_sha1_starts();
+	ctx  = gf_sha1_starts();
 
-    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
-        gf_sha1_update(ctx, buf, (s32) n );
+	while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+		gf_sha1_update(ctx, buf, (s32) n );
 
-    gf_sha1_finish(ctx, output );
+	gf_sha1_finish(ctx, output );
 
-    fclose( f );
-    return( 0 );
+	fclose( f );
+	return( 0 );
 }
 
 /*
@@ -723,15 +725,15 @@
 GF_EXPORT
 void gf_sha1_csum( u8 *input, u32 ilen, u8 output[20] )
 {
-   GF_SHA1Context *ctx;
+	GF_SHA1Context *ctx;
 
-    ctx = gf_sha1_starts();
-    gf_sha1_update(ctx, input, ilen );
-    gf_sha1_finish(ctx, output );
+	ctx = gf_sha1_starts();
+	gf_sha1_update(ctx, input, ilen );
+	gf_sha1_finish(ctx, output );
 }
 
 GF_EXPORT
-void gf_sha1_csum_hexa(u8 *buf, u32 buflen, u8 digest[41]){
+void gf_sha1_csum_hexa(u8 *buf, u32 buflen, u8 digest[41]) {
 	u8 tmp[20];
 	gf_sha1_csum (buf, buflen, tmp );
 	digest[0] = 0;
@@ -746,3 +748,5 @@
 		}
 	}
 }
+
+#endif
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/src/utils/symbian_net.cpp -> gpac-0.5.1.svn5491.tar.xz/src/utils/symbian_net.cpp Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -71,7 +71,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <netdb.h>
- 
+
 #ifndef __BEOS__
 #include <errno.h>
 #endif
@@ -97,7 +97,7 @@
 #endif
 
 #ifdef __SYMBIAN32__
-#define SSO_CAST 
+#define SSO_CAST
 #else
 #define SSO_CAST (const char *)
 #endif
@@ -171,7 +171,7 @@
 #ifdef WIN32
 		if (!wsa_init) WSACleanup();
 #endif
-	} 
+	}
 	return (ipv6_check_state==2);
 #else
 	return 0;
@@ -188,19 +188,19 @@
 	service = dest = NULL;
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_socktype = sock_type;
- 	hints.ai_family = family;
-	hints.ai_flags = flags; 
+	hints.ai_family = family;
+	hints.ai_flags = flags;
 
 	if (PortNumber) {
 		sprintf (portstring, "%d", PortNumber);
 		service = (char *)portstring;
 	}
 	if (PeerName) {
- 		strcpy(node, PeerName);
- 		if (node[0]=='[') {
- 			node[strlen(node)-1] = 0;
- 			strcpy(node, &node[1]);
- 		}
+		strcpy(node, PeerName);
+		if (node[0]=='[') {
+			node[strlen(node)-1] = 0;
+			strcpy(node, &node[1]);
+		}
 		dest = (char *) node;
 	}
 	if (getaddrinfo((const char *)dest, (const char *)service, &hints, &res) != 0) return NULL;
@@ -211,7 +211,7 @@
 {
 	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 0;
-    memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
+	memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
 	sock->dest_addr_len = res->ai_addrlen;
 	freeaddrinfo(res);
 	return 1;
@@ -229,11 +229,11 @@
 {
 #ifdef GPAC_HAS_IPV6
 	char clienthost[NI_MAXHOST];
-    struct sockaddr_storage clientaddr;
-    socklen_t addrlen = sizeof(clientaddr);
-    if (getsockname(sock->socket, (struct sockaddr *)&clientaddr, &addrlen)) return GF_IP_NETWORK_FAILURE;
+	struct sockaddr_storage clientaddr;
+	socklen_t addrlen = sizeof(clientaddr);
+	if (getsockname(sock->socket, (struct sockaddr *)&clientaddr, &addrlen)) return GF_IP_NETWORK_FAILURE;
 
-    if (getnameinfo((struct sockaddr *)&clientaddr, addrlen, clienthost, sizeof(clienthost), NULL, 0, NI_NUMERICHOST)) 
+	if (getnameinfo((struct sockaddr *)&clientaddr, addrlen, clienthost, sizeof(clienthost), NULL, 0, NI_NUMERICHOST))
 		return GF_IP_NETWORK_FAILURE;
 	strcpy(buffer, clienthost);
 #else
@@ -317,7 +317,7 @@
 #ifdef GPAC_HAS_IPV6
 		struct sockaddr *addr = (struct sockaddr *)&sock->dest_addr;
 		if (addr->sa_family==AF_INET6) {
-		    struct ipv6_mreq mreq6; 
+			struct ipv6_mreq mreq6;
 			memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
 			mreq6.ipv6mr_interface= 0;
 			setsockopt(sock->socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &mreq6, sizeof(mreq6));
@@ -352,7 +352,7 @@
 	if (sock) setsockopt(sock->socket, SOL_SOCKET, SO_ERROR, (char *) &clear, sizeof(u32) );
 }
 
-s32 gf_sk_get_handle(GF_Socket *sock) 
+s32 gf_sk_get_handle(GF_Socket *sock)
 {
 	return sock->socket;
 }
@@ -399,10 +399,10 @@
 	freeaddrinfo(res);
 	return GF_IP_CONNECTION_FAILURE;
 
-#else	
+#else
 	struct hostent *Host;
-	
-	if (!sock->socket) 
+
+	if (!sock->socket)
 		sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
 
 	/*setup the address*/
@@ -415,10 +415,12 @@
 		if (Host == NULL) {
 			switch (LASTSOCKERROR) {
 #ifndef __SYMBIAN32__
-			case ENETDOWN: return GF_IP_NETWORK_FAILURE;
-			//case ENOHOST: return GF_IP_ADDRESS_NOT_FOUND;
+			case ENETDOWN:
+				return GF_IP_NETWORK_FAILURE;
+				//case ENOHOST: return GF_IP_ADDRESS_NOT_FOUND;
 #endif
-			default: return GF_IP_NETWORK_FAILURE;
+			default:
+				return GF_IP_NETWORK_FAILURE;
 			}
 		}
 		memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
@@ -428,9 +430,12 @@
 		ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
 		if (ret == SOCKET_ERROR) {
 			switch (LASTSOCKERROR) {
-			case EAGAIN: return GF_IP_SOCK_WOULD_BLOCK;
-			case EISCONN: return GF_OK;
-			default: return GF_IP_CONNECTION_FAILURE;
+			case EAGAIN:
+				return GF_IP_SOCK_WOULD_BLOCK;
+			case EISCONN:
+				return GF_OK;
+			default:
+				return GF_IP_CONNECTION_FAILURE;
 			}
 		}
 	}
@@ -457,7 +462,7 @@
 	s32 optval;
 
 	if (!sock || sock->socket) return GF_BAD_PARAM;
-	
+
 #ifdef GPAC_HAS_IPV6
 	type = (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM;
 	af = (options & GF_SOCK_FORCE_IPV6) ? PF_INET6 : PF_UNSPEC;
@@ -467,7 +472,7 @@
 		res = gf_sk_get_ipv6_addr(peer_name, peer_port, af, AI_PASSIVE, type);
 		if (!res) return GF_IP_CONNECTION_FAILURE;
 #ifdef WIN32
-		/*win32 has troubles redirecting IPV4 datagrams to IPV6 sockets, so override 
+		/*win32 has troubles redirecting IPV4 datagrams to IPV6 sockets, so override
 		local family type to avoid IPV4(S)->IPV6(C) UDP*/
 		af = res->ai_family;
 #endif
@@ -475,7 +480,7 @@
 		sock->dest_addr_len = res->ai_addrlen;
 		freeaddrinfo(res);
 	}
-	
+
 	res = gf_sk_get_ipv6_addr(NULL, port, af, AI_PASSIVE, type);
 	if (!res) return GF_IP_CONNECTION_FAILURE;
 
@@ -484,7 +489,7 @@
 		if (type != (u32) aip->ai_socktype) continue;
 
 #ifdef WIN32
-		/*recurrent pb with win32: this is not a true dual-stack, listening with a v6 socket for v4 source is 
+		/*recurrent pb with win32: this is not a true dual-stack, listening with a v6 socket for v4 source is
 		most of the time failing. On win32, only move for connection-less V6 sockets if no other way available*/
 		if (aip->ai_next && (aip->ai_next->ai_family==PF_INET)) continue;
 #endif
@@ -510,7 +515,7 @@
 		if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
 		else sock->flags &= ~GF_SOCK_IS_IPV6;
 
-		if (peer_name && peer_port) 
+		if (peer_name && peer_port)
 			sock->flags |= GF_SOCK_HAS_SOURCE;
 
 		freeaddrinfo(res);
@@ -633,13 +638,13 @@
 {
 #ifdef GPAC_HAS_IPV6
 	u32 val;
- 	struct addrinfo *res;
+	struct addrinfo *res;
 	if (!multi_IPAdd) return 0;
 	res = gf_sk_get_ipv6_addr(multi_IPAdd, 0, AF_UNSPEC, AI_PASSIVE, SOCK_STREAM);
 	if (!res) return 0;
 	val = 0;
 	if (res->ai_addr->sa_family == AF_INET) {
-	        val = IN_MULTICAST(ntohl(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr));  
+		val = IN_MULTICAST(ntohl(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr));
 	} else if (res->ai_addr->sa_family == AF_INET6) {
 		val = IN6_IS_ADDR_MULTICAST(& ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr);
 	}
@@ -647,14 +652,14 @@
 	return val;
 #else
 	if (!multi_IPAdd) return 0;
-	return ((htonl(inet_addr(multi_IPAdd)) >> 8) & 0x00f00000) == 0x00e00000;	
+	return ((htonl(inet_addr(multi_IPAdd)) >> 8) & 0x00f00000) == 0x00e00000;
 #endif
 }
 
 GF_Err gf_sk_setup_multicast(GF_Socket *sock, char *multi_IPAdd, u16 MultiPortNumber, u32 TTL, Bool NoBind, char *local_interface_ip)
 {
 	s32 ret;
-	u32 flag; 
+	u32 flag;
 	struct ip_mreq M_req;
 	u32 optval;
 #ifdef GPAC_HAS_IPV6
@@ -668,7 +673,7 @@
 	if (!sock || sock->socket) return GF_BAD_PARAM;
 
 	if (TTL > 255) TTL = 255;
-	
+
 	/*check the address*/
 	if (!gf_sk_is_multicast_address(multi_IPAdd)) return GF_BAD_PARAM;
 
@@ -698,7 +703,7 @@
 		/*TODO: copy over other properties (recption buffer size & co)*/
 		if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, 1);
 
-	    memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
+		memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
 		sock->dest_addr_len = aip->ai_addrlen;
 
 		if (!NoBind) {
@@ -716,13 +721,13 @@
 	freeaddrinfo(res);
 	if (!sock->socket) return GF_IP_CONNECTION_FAILURE;
 
-	if (!gf_sk_ipv6_set_remote_address(sock, multi_IPAdd, MultiPortNumber)) 
+	if (!gf_sk_ipv6_set_remote_address(sock, multi_IPAdd, MultiPortNumber))
 		return GF_IP_CONNECTION_FAILURE;
 
 	addr = (struct sockaddr *)&sock->dest_addr;
 	if (addr->sa_family == AF_INET) {
-        M_req.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
-        M_req.imr_interface.s_addr = INADDR_ANY;
+		M_req.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
+		M_req.imr_interface.s_addr = INADDR_ANY;
 		ret = setsockopt(sock->socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *) &M_req, sizeof(M_req));
 		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
 		/*set TTL*/
@@ -735,9 +740,9 @@
 	}
 	if (addr->sa_family == AF_INET6) {
 		struct ipv6_mreq M_reqV6;
-        memcpy(&M_reqV6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
-        M_reqV6.ipv6mr_interface = 0;
-        ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &M_reqV6, sizeof(M_reqV6));
+		memcpy(&M_reqV6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
+		M_reqV6.ipv6mr_interface = 0;
+		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &M_reqV6, sizeof(M_reqV6));
 		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
 		/*set TTL*/
 		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &TTL, sizeof(TTL));
@@ -746,7 +751,7 @@
 		flag = 1;
 		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
 		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
-	} 
+	}
 #else
 
 	/*enable address reuse*/
@@ -894,7 +899,7 @@
 #endif
 #ifndef __SYMBIAN32__
 	u32 res;
-	#endif
+#endif
 	*newConnection = NULL;
 	if (!sock || !(sock->flags & GF_SOCK_IS_LISTENING) ) return GF_BAD_PARAM;
 
@@ -933,7 +938,7 @@
 			return GF_IP_SOCK_WOULD_BLOCK;
 		default:
 			return GF_IP_NETWORK_FAILURE;
-		}		
+		}
 	}
 
 	(*newConnection) = (GF_Socket *) gf_malloc(sizeof(GF_Socket));
@@ -973,18 +978,18 @@
 #endif
 	}
 	if (Familly) {
-/*		size = 4;
-		if (getsockopt(sock->socket, SOL_SOCKET, SO_TYPE, (char *) &fam, &size) == SOCKET_ERROR)
-			return GF_IP_NETWORK_FAILURE;
-		*Familly = fam;
-*/
+		/*		size = 4;
+				if (getsockopt(sock->socket, SOL_SOCKET, SO_TYPE, (char *) &fam, &size) == SOCKET_ERROR)
+					return GF_IP_NETWORK_FAILURE;
+				*Familly = fam;
+		*/
 		if (sock->flags & GF_SOCK_IS_TCP) *Familly = GF_SOCK_TYPE_TCP;
 		else  *Familly = GF_SOCK_TYPE_UDP;
 	}
 	return GF_OK;
 }
 
-//we have to do this for the server sockets as we use only one thread 
+//we have to do this for the server sockets as we use only one thread
 GF_Err gf_sk_server_mode(GF_Socket *sock, Bool serverOn)
 {
 	u32 one;
@@ -1004,16 +1009,16 @@
 {
 #ifdef GPAC_HAS_IPV6
 	char clienthost[NI_MAXHOST];
- 	struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr_len);
+	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)) 
+	if (getnameinfo((struct sockaddr *)addrptr, sock->dest_addr_len, clienthost, sizeof(clienthost), NULL, 0, NI_NUMERICHOST))
 		return GF_IP_ADDRESS_NOT_FOUND;
 	strcpy(buf, clienthost);
 #else
 	if (!sock || !sock->socket) return GF_BAD_PARAM;
 	strcpy(buf, inet_ntoa(sock->dest_addr.sin_addr));
 #endif
-	return GF_OK;	
+	return GF_OK;
 }
 
 
@@ -1073,7 +1078,7 @@
 		freeaddrinfo(res);
 	} else {
 		struct sockaddr_in6 *remotePtr = (struct sockaddr_in6 *)&remote_add;
-	 	struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr);
+		struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr);
 		remotePtr->sin6_port = addrptr->sin6_port;
 		remotePtr->sin6_addr = addrptr->sin6_addr;
 		remote_add_len = sock->dest_addr_len;
@@ -1093,10 +1098,10 @@
 		remote_add.sin_port = sock->dest_addr.sin_port;
 		remote_add.sin_addr.s_addr = sock->dest_addr.sin_addr.s_addr;
 	}
-#endif		
+#endif
 	Count = 0;
 	while (Count < length) {
-		Res = sendto(sock->socket, (char *) &buffer[Count], length - Count, 0, (struct sockaddr *) &remote_add, remote_add_len); 		
+		Res = sendto(sock->socket, (char *) &buffer[Count], length - Count, 0, (struct sockaddr *) &remote_add, remote_add_len);
 		if (Res == SOCKET_ERROR) {
 			switch (LASTSOCKERROR) {
 			case EAGAIN:
@@ -1213,7 +1218,7 @@
 			case EAGAIN:
 				return GF_IP_SOCK_WOULD_BLOCK;
 #ifndef __SYMBIAN32__
-			case ECONNRESET: 
+			case ECONNRESET:
 				return GF_IP_CONNECTION_CLOSED;
 #endif
 			default:
@@ -1242,7 +1247,7 @@
 #define GF_SOCK_GROUP_WRITE 1
 
 GF_SocketGroup *NewSockGroup()
-{	
+{
 	GF_SocketGroup *tmp = (GF_SocketGroup*)gf_malloc(sizeof(GF_SocketGroup));
 	if (!tmp) return NULL;
 	FD_ZERO(&tmp->ReadGroup);

gpac-0.5.0.svn5178.tar.bz2/src/utils/symbian_os.cpp -> gpac-0.5.1.svn5491.tar.xz/src/utils/symbian_os.cpp Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -36,15 +36,15 @@
 #include <sys/times.h>
 #include <sys/resource.h>
 /*symbian stdlib*/
-#include <e32std.h> 
+#include <e32std.h>
 /*symbian core (for scheduler & trap cleanup)*/
-#include <e32base.h> 
+#include <e32base.h>
 /*hardware abstraction layer*/
 #include <hal.h>
- 
+
 /*gpac module internals*/
 #include "module_wrap.h"
-#include <gpac/thread.h> 
+#include <gpac/thread.h>
 
 
 //  Exported Functions (DLL entry point)
@@ -79,21 +79,21 @@
 	TTimeIntervalMicroSeconds32 inter;
 	inter = (TInt) (1000*ms);
 #ifdef __SERIES60_3X__
-	User::AfterHighRes(inter); 
+	User::AfterHighRes(inter);
 #else
-	User::After(inter); 
+	User::After(inter);
 #endif
 
 #if 0
 	TInt error;
-    CActiveScheduler::RunIfReady(error, CActive::EPriorityIdle);
+	CActiveScheduler::RunIfReady(error, CActive::EPriorityIdle);
 
 	RTimer timer;
 	TRequestStatus timerStatus;
 	timer.CreateLocal();
-	
+
 	timer.After(timerStatus,ms*1000);
-	User::WaitForRequest(timerStatus); 
+	User::WaitForRequest(timerStatus);
 #endif
 }
 
@@ -125,7 +125,7 @@
 GF_EXPORT
 FILE *gf_temp_file_new()
 {
-	return tmpfile(); 
+	return tmpfile();
 }
 #endif
 
@@ -307,7 +307,7 @@
 		t->status = GF_THREAD_STATUS_DEAD;
 		gf_sema_notify(t->_signal, 1);
 		goto exit;
-	} 
+	}
 #ifndef GPAC_DISABLE_LOG
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Thread %s] Installing ActiveScheduler\n", t->log_name));
 #endif
@@ -370,7 +370,7 @@
 
 	threadName.Format(_L("GTH%d"), (u32) t);
 	t->threadH = new RThread();
-	if ( t->threadH->Create(threadName, (TThreadFunction)RunThread, KDefaultStackSize, KThreadMinHeapSize, KThreadMaxHeapSize, (void *)t, EOwnerProcess) != KErrNone){
+	if ( t->threadH->Create(threadName, (TThreadFunction)RunThread, KDefaultStackSize, KThreadMinHeapSize, KThreadMaxHeapSize, (void *)t, EOwnerProcess) != KErrNone) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Unable to create thread\n"));
 		t->status = GF_THREAD_STATUS_DEAD;
 		return GF_IO_ERR;
@@ -378,7 +378,7 @@
 	t->threadH->Resume();
 
 	/*wait for the child function to call us - do NOT return before, otherwise the thread status would
-	be unknown*/ 	
+	be unknown*/
 	//GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Waiting for thread to start\n"));
 	gf_sema_wait(t->_signal);
 	gf_sema_del(t->_signal);
@@ -391,11 +391,11 @@
 static void Thread_Stop(GF_Thread *t, Bool Destroy)
 {
 	if (gf_th_status(t) == GF_THREAD_STATUS_RUN) {
-		if (Destroy){
+		if (Destroy) {
 			t->threadH->Terminate(0);
 			t->threadH = NULL;
 		}
-		else{
+		else {
 			t->threadH->Suspend();
 		}
 	}
@@ -468,9 +468,9 @@
 	GF_Mutex *tmp = (GF_Mutex *)gf_malloc(sizeof(GF_Mutex));
 	if (!tmp) return NULL;
 	memset(tmp, 0, sizeof(GF_Mutex));
-	
+
 	tmp->hMutex = new RMutex();
-	if( tmp->hMutex->CreateLocal() != KErrNone){
+	if( tmp->hMutex->CreateLocal() != KErrNone) {
 		gf_free(tmp);
 		return NULL;
 	}
@@ -671,7 +671,7 @@
 	if (rti->sampling_instant + refresh_time_ms > now) return 0;
 	rti->sampling_period_duration = now - rti->sampling_instant;
 	rti->sampling_instant = now;
-	
+
 	if (cur_th.Process(cur_process) != KErrNone) {
 		return 0;
 	}
@@ -694,8 +694,8 @@
 	rti->process_cpu_usage = 100*rti->process_cpu_time_diff / rti->sampling_period_duration;
 	if (rti->process_cpu_usage > 100) rti->process_cpu_usage = 100;
 
-	HAL::Get(HALData::EMemoryRAM, ram);		
-	HAL::Get(HALData::EMemoryRAMFree, ram_free);		
+	HAL::Get(HALData::EMemoryRAM, ram);
+	HAL::Get(HALData::EMemoryRAMFree, ram_free);
 	rti->physical_memory = ram;
 	rti->physical_memory_avail = ram_free;
 #ifdef GPAC_MEMORY_TRACKING
@@ -705,7 +705,7 @@
 }
 
 GF_EXPORT
-Bool gf_sys_get_battery_state(Bool *onBattery, u32 *state, u32*level) 
+Bool gf_sys_get_battery_state(Bool *onBattery, u32 *state, u32*level)
 {
 	return 1;
 }
@@ -720,7 +720,7 @@
 		gf_list_rem(inst->interfaces, 0);
 		inst->destroy_func(objinterface);
 	}
-	if (inst->lib_handle){
+	if (inst->lib_handle) {
 		RLibrary* pLibrary = (RLibrary *) inst->lib_handle;
 		pLibrary->Close();
 	}
@@ -730,11 +730,11 @@
 
 Bool gf_modules_load_library(ModuleInstance *inst)
 {
-	const TUid KGPACModuleUid={0x10000080};
+	const TUid KGPACModuleUid= {0x10000080};
 	char s_path[GF_MAX_PATH];
 	HBufC *path;
-    TInt e;
-	
+	TInt e;
+
 	if (inst->lib_handle) return 1;
 
 	sprintf(s_path, "%s%c%s", inst->plugman->dir, GF_PATH_SEPARATOR, inst->szName);
@@ -761,7 +761,7 @@
 	inst->query_func = (QueryInterfaces) pLibrary->Lookup(1);
 	inst->load_func = (LoadInterface) pLibrary->Lookup(2);
 	inst->destroy_func = (ShutdownInterface) pLibrary->Lookup(3);
-	
+
 	if ((inst->query_func==NULL) || (inst->load_func==NULL) || (inst->destroy_func==NULL) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] Library %s has invalid interfaces", inst->szName));
 		pLibrary->Close();
@@ -775,7 +775,7 @@
 	return 1;
 
 err_exit:
-	gf_cfg_set_key(inst->plugman->cfg, "SymbianDLLs", inst->szName, "no"); 
+	gf_cfg_set_key(inst->plugman->cfg, "SymbianDLLs", inst->szName, "no");
 	return 0;
 }
 
@@ -786,7 +786,7 @@
 	RLibrary* pLibrary = (RLibrary *) inst->lib_handle;
 	pLibrary->Close();
 	delete pLibrary;
-	
+
 	inst->lib_handle = NULL;
 	inst->load_func = NULL;
 	inst->destroy_func = NULL;
@@ -795,7 +795,7 @@
 }
 
 
-static Bool enum_modules(void *cbck, char *item_name, char *item_path)
+static Bool enum_modules(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	ModuleInstance *inst;
 
@@ -825,11 +825,11 @@
 	gf_enum_directory((char*)pm->dir, 0, enum_modules, pm, ".dll");
 #else
 	u32 i, mod_count;
-	
+
 	mod_count = gf_cfg_get_key_count(pm->cfg, "SymbianDLLs");
 	for (i=0; i<mod_count; i++) {
 		const char *mod = gf_cfg_get_key_name(pm->cfg, "SymbianDLLs", i);
-		if (stricmp(gf_cfg_get_key(pm->cfg, "SymbianDLLs", mod), "yes")) continue; 
+		if (stricmp(gf_cfg_get_key(pm->cfg, "SymbianDLLs", mod), "yes")) continue;
 		enum_modules(pm, (char*)mod, NULL);
 	}
 #endif

gpac-0.5.0.svn5178.tar.bz2/src/utils/token.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/token.c Changed

@@ -11,18 +11,20 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 #include <gpac/token.h>
 
 static GFINLINE s32 gf_tok_is_char_in_set(const char TestChar, const char *TestSet)
@@ -46,7 +48,7 @@
 	}
 	start = i;
 	if (i == Len) return( -1 );
-	
+
 	for (i=start; i<Len; i++) {
 		if (gf_tok_is_char_in_set(Buffer[i], Separator)) break;
 	}
@@ -112,7 +114,7 @@
 	s32 Len;
 
 	if (Start >= Size) return -1;
-	
+
 	Len = (u32) strlen(Pattern);
 	if ( Len <= 0 ) return -1;
 	if (Size - Start < (u32) Len) return -1;
@@ -131,3 +133,4 @@
 	return -1;
 }
 
+#endif

gpac-0.5.0.svn5178.tar.bz2/src/utils/uni_bidi.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/uni_bidi.c Changed

@@ -34,36 +34,36 @@
 ------------------------------------------------------------------------*/
 enum
 {
-    // input types
-			 // ON MUST be zero, code relies on ON = N = 0
-    ON = 0,  // Other Neutral
-    L,       // Left Letter
-    R,       // Right Letter
-    AN,      // Arabic Number
-    EN,      // European Number
-    AL,      // Arabic Letter (Right-to-left)
-    NSM,     // Non-spacing Mark
-    CS,      // Common Separator
-    ES,      // European Separator
-    ET,      // European Terminator (post/prefix e.g. $ and %)
+	// input types
+	// ON MUST be zero, code relies on ON = N = 0
+	ON = 0,  // Other Neutral
+	L,       // Left Letter
+	R,       // Right Letter
+	AN,      // Arabic Number
+	EN,      // European Number
+	AL,      // Arabic Letter (Right-to-left)
+	NSM,     // Non-spacing Mark
+	CS,      // Common Separator
+	ES,      // European Separator
+	ET,      // European Terminator (post/prefix e.g. $ and %)
 
 	// resolved types
-    BN,      // Boundary neutral (type of RLE etc after explicit levels)
+	BN,      // Boundary neutral (type of RLE etc after explicit levels)
 
 	// input types,
-    S,       // Segment Separator (TAB)		// used only in L1
-    WS,      // White space					// used only in L1
-    B,       // Paragraph Separator (aka as PS)
+	S,       // Segment Separator (TAB)		// used only in L1
+	WS,      // White space					// used only in L1
+	B,       // Paragraph Separator (aka as PS)
 
 	// types for explicit controls
-    RLO,     // these are used only in X1-X9
-    RLE,
-    LRO,
-    LRE,
-    PDF,
+	RLO,     // these are used only in X1-X9
+	RLE,
+	LRO,
+	LRE,
+	PDF,
 
 	// resolved types, also resolved directions
-    N = ON,  // alias, where ON, WS and S are treated the same
+	N = ON,  // alias, where ON, WS and S are treated the same
 };
 
 /*----------------------------------------------------------------------
@@ -94,12 +94,18 @@
 		u32 c = utf_string[i];
 		if (!c) return 0;
 		switch (bidi_get_class(c)) {
-		case L: return 0;
-		case R: return 1;
-		case AN: return 1;
-		case EN: return 0;
-		case AL: return 1;
-		default: break;
+		case L:
+			return 0;
+		case R:
+			return 1;
+		case AN:
+			return 1;
+		case EN:
+			return 0;
+		case AL:
+			return 1;
+		default:
+			break;
 		}
 		i++;
 	}

gpac-0.5.0.svn5178.tar.bz2/src/utils/unicode.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/unicode.c Changed

@@ -45,8 +45,9 @@
 
 	while (utf8_buf != utf8_endbuf) {
 
-		if ((*utf8_buf & 0x80) == 0x00) {	/* ASCII chars no
-							 * conversion needed */
+		if ((*utf8_buf & 0x80) == 0x00) {
+			/* ASCII chars no
+								 * conversion needed */
 			*ucs4_buf++ = (u32) * utf8_buf;
 			utf8_buf++;
 			ucs_len++;
@@ -54,45 +55,49 @@
 			//In the 2 byte utf - 8 range
 		{
 			*ucs4_buf++ = (u32) (((*utf8_buf - 0xC0) * 0x40)
-					     + (*(utf8_buf + 1) - 0x80));
+			                     + (*(utf8_buf + 1) - 0x80));
 			utf8_buf += 2;
 			ucs_len++;
-		} else if ((*utf8_buf & 0xF0) == 0xE0) {	/* In the 3 byte utf-8
-								 * range */
+		} else if ((*utf8_buf & 0xF0) == 0xE0) {
+			/* In the 3 byte utf-8
+									 * range */
 			*ucs4_buf++ = (u32) (((*utf8_buf - 0xE0) * 0x1000)
-					 + ((*(utf8_buf + 1) - 0x80) * 0x40)
-					     + (*(utf8_buf + 2) - 0x80));
+			                     + ((*(utf8_buf + 1) - 0x80) * 0x40)
+			                     + (*(utf8_buf + 2) - 0x80));
 
 			utf8_buf += 3;
 			ucs_len++;
-		} else if ((*utf8_buf & 0xF8) == 0xF0) {	/* In the 4 byte utf-8
-								 * range */
+		} else if ((*utf8_buf & 0xF8) == 0xF0) {
+			/* In the 4 byte utf-8
+									 * range */
 			*ucs4_buf++ = (u32)
-				(((*utf8_buf - 0xF0) * 0x040000)
-				 + ((*(utf8_buf + 1) - 0x80) * 0x1000)
-				 + ((*(utf8_buf + 2) - 0x80) * 0x40)
-				 + (*(utf8_buf + 3) - 0x80));
+			              (((*utf8_buf - 0xF0) * 0x040000)
+			               + ((*(utf8_buf + 1) - 0x80) * 0x1000)
+			               + ((*(utf8_buf + 2) - 0x80) * 0x40)
+			               + (*(utf8_buf + 3) - 0x80));
 			utf8_buf += 4;
 			ucs_len++;
-		} else if ((*utf8_buf & 0xFC) == 0xF8) {	/* In the 5 byte utf-8
-								 * range */
+		} else if ((*utf8_buf & 0xFC) == 0xF8) {
+			/* In the 5 byte utf-8
+									 * range */
 			*ucs4_buf++ = (u32)
-				(((*utf8_buf - 0xF8) * 0x01000000)
-				 + ((*(utf8_buf + 1) - 0x80) * 0x040000)
-				 + ((*(utf8_buf + 2) - 0x80) * 0x1000)
-				 + ((*(utf8_buf + 3) - 0x80) * 0x40)
-				 + (*(utf8_buf + 4) - 0x80));
+			              (((*utf8_buf - 0xF8) * 0x01000000)
+			               + ((*(utf8_buf + 1) - 0x80) * 0x040000)
+			               + ((*(utf8_buf + 2) - 0x80) * 0x1000)
+			               + ((*(utf8_buf + 3) - 0x80) * 0x40)
+			               + (*(utf8_buf + 4) - 0x80));
 			utf8_buf += 5;
 			ucs_len++;
-		} else if ((*utf8_buf & 0xFE) == 0xFC) {	/* In the 6 byte utf-8
-								 * range */
+		} else if ((*utf8_buf & 0xFE) == 0xFC) {
+			/* In the 6 byte utf-8
+									 * range */
 			*ucs4_buf++ = (u32)
-				(((*utf8_buf - 0xFC) * 0x40000000)
-				 + ((*(utf8_buf + 1) - 0x80) * 0x010000000)
-				 + ((*(utf8_buf + 2) - 0x80) * 0x040000)
-				 + ((*(utf8_buf + 3) - 0x80) * 0x1000)
-				 + ((*(utf8_buf + 4) - 0x80) * 0x40)
-				 + (*(utf8_buf + 5) - 0x80));
+			              (((*utf8_buf - 0xFC) * 0x40000000)
+			               + ((*(utf8_buf + 1) - 0x80) * 0x010000000)
+			               + ((*(utf8_buf + 2) - 0x80) * 0x040000)
+			               + ((*(utf8_buf + 3) - 0x80) * 0x1000)
+			               + ((*(utf8_buf + 4) - 0x80) * 0x40)
+			               + (*(utf8_buf + 5) - 0x80));
 			utf8_buf += 6;
 			ucs_len++;
 		}

gpac-0.5.0.svn5178.tar.bz2/src/utils/url.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/url.c Changed

@@ -11,15 +11,15 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
@@ -47,15 +47,15 @@
 	char *begin;
 	if (!pathName) return GF_URL_TYPE_ANY;
 
-	if ((pathName[0] == '/') || (pathName[0] == '\\') 
-		|| (pathName[1] == ':') 
-		|| ((pathName[0] == ':') && (pathName[1] == ':'))
-		) return GF_URL_TYPE_FILE;
+	if ((pathName[0] == '/') || (pathName[0] == '\\')
+	        || (pathName[1] == ':')
+	        || ((pathName[0] == ':') && (pathName[1] == ':'))
+	   ) return GF_URL_TYPE_FILE;
 
-    if (!strncmp(pathName, "blob:", 5)) return GF_URL_TYPE_BLOB;
+	if (!strncmp(pathName, "blob:", 5)) return GF_URL_TYPE_BLOB;
 
 	begin = strstr(pathName, "://");
-	if (!begin) begin = strstr(pathName, "|//"); 
+	if (!begin) begin = strstr(pathName, "|//");
 	if (!begin) return GF_URL_TYPE_RELATIVE;
 	if (!strnicmp(pathName, "file", 4)) return GF_URL_TYPE_FILE;
 	return GF_URL_TYPE_ANY;
@@ -74,7 +74,7 @@
 
 	/*abs path name*/
 	if (prot_type == GF_URL_TYPE_FILE) {
-	  /*abs path*/
+		/*abs path*/
 		if (!strstr(pathName, "://") && !strstr(pathName, "|//")) return gf_strdup(pathName);
 		pathName += 6;
 		/*not sure if "file:///C:\..." is std, but let's handle it anyway*/
@@ -192,15 +192,15 @@
 		}
 		for (i = 0; i< strlen(pathName) - 2; i++) {
 			/*current dir*/
-			if ( (pathName[i] == '.') 
-				&& ( (pathName[i+1] == GF_PATH_SEPARATOR) || (pathName[i+1] == '/') ) ) {
+			if ( (pathName[i] == '.')
+			        && ( (pathName[i+1] == GF_PATH_SEPARATOR) || (pathName[i+1] == '/') ) ) {
 				i++;
 				continue;
 			}
 			/*parent dir*/
-			if ( (pathName[i] == '.') && (pathName[i+1] == '.') 
-				&& ( (pathName[i+2] == GF_PATH_SEPARATOR) || (pathName[i+2] == '/') )
-				) {
+			if ( (pathName[i] == '.') && (pathName[i+1] == '.')
+			        && ( (pathName[i+2] == GF_PATH_SEPARATOR) || (pathName[i+2] == '/') )
+			   ) {
 				pathSepCount ++;
 				i+=2;
 				name = (char *) &pathName[i+1];
@@ -242,7 +242,7 @@
 	sprintf(outPath, "%s%s", tmp, name);
 
 	/*cleanup paths sep for win32*/
-	for (i = 0; i<strlen(outPath); i++) 
+	for (i = 0; i<strlen(outPath); i++)
 		if (outPath[i]=='\\') outPath[i] = '/';
 
 check_spaces:
@@ -297,7 +297,7 @@
 	while (1) {
 		sep = strchr(sep, ' ');
 		if (!sep) break;
-        sep ++;
+		sep ++;
 		count ++;
 		sep++;
 	}
@@ -344,7 +344,7 @@
 Bool gf_url_remove_last_delimiter(const char *sURL, char *res_path)
 {
 	strcpy(res_path, sURL);
-	if (sURL[strlen(sURL)-1] == GF_PATH_SEPARATOR){
+	if (sURL[strlen(sURL)-1] == GF_PATH_SEPARATOR) {
 		res_path[strlen(sURL)-1] = 0;
 		return GF_TRUE;
 	}
@@ -353,8 +353,8 @@
 }
 
 GF_EXPORT
-const char* gf_url_get_ressource_extension(const char *sURL){
+const char* gf_url_get_ressource_extension(const char *sURL) {
 	const char *dot = strrchr(sURL, '.');
-    if(!dot || dot == sURL) return "";
-    return dot + 1;
+	if(!dot || dot == sURL) return "";
+	return dot + 1;
 }
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/src/utils/utf.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/utf.c Changed

@@ -11,18 +11,20 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 #include <gpac/utf.h>
 
 
@@ -31,9 +33,9 @@
 
 /*
  * Copyright 2001-2004 Unicode, Inc.
- * 
+ *
  * Disclaimer
- * 
+ *
  * This source code is provided as is by Unicode, Inc. No claims are
  * made as to fitness for any particular purpose. No warranties of any
  * kind are expressed or implied. The recipient agrees to determine
@@ -41,9 +43,9 @@
  * purchased on magnetic or optical media from Unicode, Inc., the
  * sole remedy for any claim will be exchange of defective media
  * within 90 days of receipt.
- * 
+ *
  * Limitations on Rights to Redistribute This Code
- * 
+ *
  * Unicode, Inc. hereby grants the right to freely use the information
  * supplied in this file in the creation of products supporting the
  * Unicode Standard, and to make copies of this file in any form
@@ -113,14 +115,14 @@
  * allowed in earlier algorithms.
  */
 static const char trailingBytesForUTF8[256] = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,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,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,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,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,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,
+	2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
 };
 
 /*
@@ -128,8 +130,9 @@
  * This table contains as many values as there might be trailing bytes
  * in a UTF-8 sequence.
  */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 
-		     0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
+                                          0x03C82080UL, 0xFA082080UL, 0x82082080UL
+                                        };
 
 /*
  * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
@@ -153,71 +156,85 @@
 /* --------------------------------------------------------------------- */
 
 ConversionResult ConvertUTF16toUTF8 (
-	const UTF16** sourceStart, const UTF16* sourceEnd, 
-	UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF16* source = *sourceStart;
-    UTF8* target = *targetStart;
-    while (source < sourceEnd) {
-	UTF32 ch;
-	unsigned short bytesToWrite = 0;
-	const UTF32 byteMask = 0xBF;
-	const UTF32 byteMark = 0x80; 
-	const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
-	ch = *source++;
-	/* If we have a surrogate pair, convert to UTF32 first. */
-	if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
-	    /* If the 16 bits following the high surrogate are in the source buffer... */
-	    if (source < sourceEnd) {
-		UTF32 ch2 = *source;
-		/* If it's a low surrogate, convert to UTF32. */
-		if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
-		    ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
-			+ (ch2 - UNI_SUR_LOW_START) + halfBase;
-		    ++source;
-		} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
-		    --source; /* return to the illegal value itself */
-		    result = sourceIllegal;
-		    break;
+    const UTF16** sourceStart, const UTF16* sourceEnd,
+    UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+	ConversionResult result = conversionOK;
+	const UTF16* source = *sourceStart;
+	UTF8* target = *targetStart;
+	while (source < sourceEnd) {
+		UTF32 ch;
+		unsigned short bytesToWrite = 0;
+		const UTF32 byteMask = 0xBF;
+		const UTF32 byteMark = 0x80;
+		const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
+		ch = *source++;
+		/* If we have a surrogate pair, convert to UTF32 first. */
+		if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
+			/* If the 16 bits following the high surrogate are in the source buffer... */
+			if (source < sourceEnd) {
+				UTF32 ch2 = *source;
+				/* If it's a low surrogate, convert to UTF32. */
+				if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
+					ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+					     + (ch2 - UNI_SUR_LOW_START) + halfBase;
+					++source;
+				} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
+					--source; /* return to the illegal value itself */
+					result = sourceIllegal;
+					break;
+				}
+			} else { /* We don't have the 16 bits following the high surrogate. */
+				--source; /* return to the high surrogate */
+				result = sourceExhausted;
+				break;
+			}
+		} else if (flags == strictConversion) {
+			/* UTF-16 surrogate values are illegal in UTF-32 */
+			if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
+				--source; /* return to the illegal value itself */
+				result = sourceIllegal;
+				break;
+			}
+		}
+		/* Figure out how many bytes the result will require */
+		if (ch < (UTF32)0x80) {
+			bytesToWrite = 1;
+		} else if (ch < (UTF32)0x800) {
+			bytesToWrite = 2;
+		} else if (ch < (UTF32)0x10000) {
+			bytesToWrite = 3;
+		} else if (ch < (UTF32)0x110000) {
+			bytesToWrite = 4;
+		} else {
+			bytesToWrite = 3;
+			ch = UNI_REPLACEMENT_CHAR;
 		}
-	    } else { /* We don't have the 16 bits following the high surrogate. */
-		--source; /* return to the high surrogate */
-		result = sourceExhausted;
-		break;
-	    }
-	} else if (flags == strictConversion) {
-	    /* UTF-16 surrogate values are illegal in UTF-32 */
-	    if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
-		--source; /* return to the illegal value itself */
-		result = sourceIllegal;
-		break;
-	    }
-	}
-	/* Figure out how many bytes the result will require */
-	if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
-	} else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
-	} else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
-	} else if (ch < (UTF32)0x110000) {  bytesToWrite = 4;
-	} else {			    bytesToWrite = 3;
-					    ch = UNI_REPLACEMENT_CHAR;
-	}
 
-	target += bytesToWrite;
-	if (target > targetEnd) {
-	    source = oldSource; /* Back up source pointer! */
-	    target -= bytesToWrite; result = targetExhausted; break;
-	}
-	switch (bytesToWrite) { /* note: everything falls through. */
-	    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 1: *--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);
+		target += bytesToWrite;
+		if (target > targetEnd) {
+			source = oldSource; /* Back up source pointer! */
+			target -= bytesToWrite;
+			result = targetExhausted;
+			break;
+		}
+		switch (bytesToWrite) { /* note: everything falls through. */
+		case 4:
+			*--target = (UTF8)((ch | byteMark) & byteMask);
+			ch >>= 6;
+		case 3:
+			*--target = (UTF8)((ch | byteMark) & byteMask);
+			ch >>= 6;
+		case 2:
+			*--target = (UTF8)((ch | byteMark) & byteMask);
+			ch >>= 6;
+		case 1:
+			*--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);
+		}
+		target += bytesToWrite;
 	}
-	target += bytesToWrite;
-    }
-    *sourceStart = source;
-    *targetStart = target;
-    return result;
+	*sourceStart = source;
+	*targetStart = target;
+	return result;
 }
 
 /*
@@ -232,101 +249,129 @@
  */
 
 static Boolean isLegalUTF8(const UTF8 *source, int length) {
-    UTF8 a;
-    const UTF8 *srcptr = source+length;
-    switch (length) {
-    default: return false;
+	UTF8 a;
+	const UTF8 *srcptr = source+length;
+	switch (length) {
+	default:
+		return false;
 	/* Everything else falls through when "true"... */
-    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 2: if ((a = (*--srcptr)) > 0xBF) return false;
-
-	switch (*source) {
-	    /* no fall-through in this inner switch */
-	    case 0xE0: if (a < 0xA0) return false; break;
-	    case 0xED: if (a > 0x9F) return false; break;
-	    case 0xF0: if (a < 0x90) return false; break;
-	    case 0xF4: if (a > 0x8F) return false; break;
-	    default:   if (a < 0x80) return false;
-	}
+	case 4:
+		if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+	case 3:
+		if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+	case 2:
+		if ((a = (*--srcptr)) > 0xBF) return false;
+
+		switch (*source) {
+		/* no fall-through in this inner switch */
+		case 0xE0:
+			if (a < 0xA0) return false;
+			break;
+		case 0xED:
+			if (a > 0x9F) return false;
+			break;
+		case 0xF0:
+			if (a < 0x90) return false;
+			break;
+		case 0xF4:
+			if (a > 0x8F) return false;
+			break;
+		default:
+			if (a < 0x80) return false;
+		}
 
-    case 1: if (*source >= 0x80 && *source < 0xC2) return false;
-    }
-    if (*source > 0xF4) return false;
-    return true;
+	case 1:
+		if (*source >= 0x80 && *source < 0xC2) return false;
+	}
+	if (*source > 0xF4) return false;
+	return true;
 }
 
 /* --------------------------------------------------------------------- */
 
 ConversionResult ConvertUTF8toUTF16 (
-	const UTF8** sourceStart, const UTF8* sourceEnd, 
-	UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF8* source = *sourceStart;
-    UTF16* target = *targetStart;
-    while (source < sourceEnd) {
-	UTF32 ch = 0;
-	unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
-	if (source + extraBytesToRead >= sourceEnd) {
-	    result = sourceExhausted; break;
-	}
-	/* Do this check whether lenient or strict */
-	if (! isLegalUTF8(source, extraBytesToRead+1)) {
-	    result = sourceIllegal;
-	    break;
-	}
-	/*
-	 * The cases all fall through. See "Note A" below.
-	 */
-	switch (extraBytesToRead) {
-	    case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-	    case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-	    case 3: ch += *source++; ch <<= 6;
-	    case 2: ch += *source++; ch <<= 6;
-	    case 1: ch += *source++; ch <<= 6;
-	    case 0: ch += *source++;
-	}
-	ch -= offsetsFromUTF8[extraBytesToRead];
+    const UTF8** sourceStart, const UTF8* sourceEnd,
+    UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+	ConversionResult result = conversionOK;
+	const UTF8* source = *sourceStart;
+	UTF16* target = *targetStart;
+	while (source < sourceEnd) {
+		UTF32 ch = 0;
+		unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+		if (source + extraBytesToRead >= sourceEnd) {
+			result = sourceExhausted;
+			break;
+		}
+		/* Do this check whether lenient or strict */
+		if (! isLegalUTF8(source, extraBytesToRead+1)) {
+			result = sourceIllegal;
+			break;
+		}
+		/*
+		 * The cases all fall through. See "Note A" below.
+		 */
+		switch (extraBytesToRead) {
+		case 5:
+			ch += *source++;
+			ch <<= 6; /* remember, illegal UTF-8 */
+		case 4:
+			ch += *source++;
+			ch <<= 6; /* remember, illegal UTF-8 */
+		case 3:
+			ch += *source++;
+			ch <<= 6;
+		case 2:
+			ch += *source++;
+			ch <<= 6;
+		case 1:
+			ch += *source++;
+			ch <<= 6;
+		case 0:
+			ch += *source++;
+		}
+		ch -= offsetsFromUTF8[extraBytesToRead];
 
-	if (target >= targetEnd) {
-	    source -= (extraBytesToRead+1); /* Back up source pointer! */
-	    result = targetExhausted; break;
-	}
-	if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
-	    /* UTF-16 surrogate values are illegal in UTF-32 */
-	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-		if (flags == strictConversion) {
-		    source -= (extraBytesToRead+1); /* return to the illegal value itself */
-		    result = sourceIllegal;
-		    break;
+		if (target >= targetEnd) {
+			source -= (extraBytesToRead+1); /* Back up source pointer! */
+			result = targetExhausted;
+			break;
+		}
+		if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+			/* UTF-16 surrogate values are illegal in UTF-32 */
+			if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+				if (flags == strictConversion) {
+					source -= (extraBytesToRead+1); /* return to the illegal value itself */
+					result = sourceIllegal;
+					break;
+				} else {
+					*target++ = UNI_REPLACEMENT_CHAR;
+				}
+			} else {
+				*target++ = (UTF16)ch; /* normal case */
+			}
+		} else if (ch > UNI_MAX_UTF16) {
+			if (flags == strictConversion) {
+				result = sourceIllegal;
+				source -= (extraBytesToRead+1); /* return to the start */
+				break; /* Bail out; shouldn't continue */
+			} else {
+				*target++ = UNI_REPLACEMENT_CHAR;
+			}
 		} else {
-		    *target++ = UNI_REPLACEMENT_CHAR;
+			/* target is a character in range 0xFFFF - 0x10FFFF. */
+			if (target + 1 >= targetEnd) {
+				source -= (extraBytesToRead+1); /* Back up source pointer! */
+				result = targetExhausted;
+				break;
+			}
+			ch -= halfBase;
+			*target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
+			*target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
 		}
-	    } else {
-		*target++ = (UTF16)ch; /* normal case */
-	    }
-	} else if (ch > UNI_MAX_UTF16) {
-	    if (flags == strictConversion) {
-		result = sourceIllegal;
-		source -= (extraBytesToRead+1); /* return to the start */
-		break; /* Bail out; shouldn't continue */
-	    } else {
-		*target++ = UNI_REPLACEMENT_CHAR;
-	    }
-	} else {
-	    /* target is a character in range 0xFFFF - 0x10FFFF. */
-	    if (target + 1 >= targetEnd) {
-		source -= (extraBytesToRead+1); /* Back up source pointer! */
-		result = targetExhausted; break;
-	    }
-	    ch -= halfBase;
-	    *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
-	    *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
 	}
-    }
-    *sourceStart = source;
-    *targetStart = target;
-    return result;
+	*sourceStart = source;
+	*targetStart = target;
+	return result;
 }
 
 
@@ -334,10 +379,10 @@
 GF_EXPORT
 size_t gf_utf8_wcslen (const unsigned short *s)
 {
-  const unsigned short* ptr;
-  for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
-  }
-  return ptr - s;
+	const unsigned short* ptr;
+	for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
+	}
+	return ptr - s;
 }
 
 GF_EXPORT
@@ -360,7 +405,7 @@
 size_t gf_utf8_mbstowcs(unsigned short* dest, size_t len, const char** srcp)
 {
 	const UTF8** sourceStart = (const UTF8**) srcp;
-	const UTF8* sourceEnd = (const UTF8*) ( *srcp + strlen( *srcp) ); 
+	const UTF8* sourceEnd = (const UTF8*) ( *srcp + strlen( *srcp) );
 	UTF16* targetStart = (UTF16* ) dest;
 	UTF16* targetEnd = (UTF16* ) (dest + len);
 	ConversionFlags flags = strictConversion;
@@ -377,10 +422,10 @@
 GF_EXPORT
 size_t gf_utf8_wcslen (const unsigned short *s)
 {
-  const unsigned short* ptr;
-  for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
-  }
-  return ptr - s;
+	const unsigned short* ptr;
+	for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
+	}
+	return ptr - s;
 }
 
 GF_EXPORT
@@ -394,7 +439,7 @@
 
 	if (dest != NULL) {
 		char* destptr = dest;
-        for (;; src++) {
+		for (;; src++) {
 			unsigned char c;
 			unsigned short wc = *src;
 			if (wc < 0x80) {
@@ -426,12 +471,12 @@
 				do {
 					*destptr++ = (unsigned char)(((wc >> (6 * --count)) & 0x3F) | 0x80);
 				} while (count > 0);
-        }
-        return destptr - dest;
+		}
+		return destptr - dest;
 	} else {
-        /* Ignore dest and len. */
-        size_t totalcount = 0;
-        for (;; src++) {
+		/* Ignore dest and len. */
+		size_t totalcount = 0;
+		for (;; src++) {
 			unsigned short wc = *src;
 			size_t count;
 			if (wc < 0x80) {
@@ -446,8 +491,8 @@
 				count = 3;
 			}
 			totalcount += count;
-        }
-        return totalcount;
+		}
+		return totalcount;
 	}
 }
 
@@ -456,10 +501,10 @@
 {
 	u32 count : 16;   /* number of bytes remaining to be processed */
 	u32 value : 16;   /* if count > 0: partial wide character */
-/* 
-   If WCHAR_T_BITS == 16, need 2 bits for count,
-   12 bits for value (10 for mbstowcs direction, 12 for wcstombs direction). 
-*/
+	/*
+	   If WCHAR_T_BITS == 16, need 2 bits for count,
+	   12 bits for value (10 for mbstowcs direction, 12 for wcstombs direction).
+	*/
 } gf_utf8_mbstate_t;
 
 static gf_utf8_mbstate_t internal;
@@ -470,8 +515,8 @@
 	gf_utf8_mbstate_t* ps = &internal;
 	const char *src = *srcp;
 
-    unsigned short* destptr = dest;
-    for (; len > 0; destptr++, len--) {
+	unsigned short* destptr = dest;
+	for (; len > 0; destptr++, len--) {
 		const char* backup_src = src;
 		unsigned char c;
 		unsigned short wc;
@@ -523,9 +568,9 @@
 bad_input_backup:
 		src = backup_src;
 		goto bad_input;
-    }
-    *srcp = src;
-    return destptr-dest;
+	}
+	*srcp = src;
+	return destptr-dest;
 
 bad_input:
 	*srcp = src;
@@ -533,3 +578,4 @@
 }
 
 #endif
+#endif /* GPAC_DISABLE_CORE_TOOLS */
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/src/utils/xml_parser.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/xml_parser.c Changed

@@ -1,4 +1,4 @@
-/*
+/*
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
@@ -11,22 +11,23 @@
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  GPAC is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
-
 #include <gpac/xml.h>
 #include <gpac/utf.h>
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 #ifndef GPAC_DISABLE_ZLIB
 /*since 0.2.2, we use zlib for xmt/x3d reading to handle gz files*/
 #include <zlib.h>
@@ -39,6 +40,9 @@
 #endif
 
 
+#define XML_INPUT_SIZE	4096
+
+
 static GF_Err gf_xml_sax_parse_intern(GF_SAXParser *parser, char *current);
 
 static char *xml_translate_xml_string(char *str)
@@ -100,11 +104,13 @@
 				i+= 6;
 			} else {
 				value[j] = str[i];
-				j++; i++;
+				j++;
+				i++;
 			}
 		} else {
 			value[j] = str[i];
-			j++; i++;
+			j++;
+			i++;
 		}
 	}
 	value[j] = 0;
@@ -199,7 +205,7 @@
 		assert(parser->line_size >= parser->current_pos);
 		parser->line_size -= parser->current_pos;
 		parser->file_pos += parser->current_pos;
-		if (parser->line_size) memmove(parser->buffer, parser->buffer + parser->current_pos, sizeof(char)*parser->line_size); 
+		if (parser->line_size) memmove(parser->buffer, parser->buffer + parser->current_pos, sizeof(char)*parser->line_size);
 		parser->buffer[parser->line_size] = 0;
 		parser->current_pos = 0;
 	}
@@ -214,7 +220,7 @@
 	va_start(args, fmt);
 	vsprintf(parser->err_msg, fmt, args);
 	va_end(args);
-	
+
 	sprintf(szM, " - Line %d: ", parser->line + 1);
 	strcat(parser->err_msg, szM);
 	len = (u32) strlen(parser->err_msg);
@@ -236,7 +242,7 @@
 	c = parser->buffer[parser->elt_name_end - 1];
 	parser->buffer[parser->elt_name_end - 1] = 0;
 	name = parser->buffer + parser->elt_name_start - 1;
-	
+
 	if (parser->sax_node_end) {
 		sep = strchr(name, ':');
 		if (sep) {
@@ -265,7 +271,7 @@
 	parser->buffer[parser->elt_name_end - 1] = 0;
 	name = parser->buffer + parser->elt_name_start - 1;
 
-	for (i=0;i<parser->nb_attrs; i++) {
+	for (i=0; i<parser->nb_attrs; i++) {
 		parser->attrs[i].name = parser->buffer + parser->sax_attrs[i].name_start - 1;
 		parser->buffer[parser->sax_attrs[i].name_end-1] = 0;
 		parser->attrs[i].value = parser->buffer + parser->sax_attrs[i].val_start - 1;
@@ -294,7 +300,7 @@
 	parser->buffer[parser->elt_name_end - 1] = c;
 	parser->node_depth++;
 	if (has_entities) {
-		for (i=0;i<parser->nb_attrs; i++) {
+		for (i=0; i<parser->nb_attrs; i++) {
 			if (parser->sax_attrs[i].has_entities) {
 				parser->sax_attrs[i].has_entities = 0;
 				gf_free(parser->attrs[i].value);
@@ -455,7 +461,7 @@
 
 		}
 	}
-	
+
 	if (parser->sax_state == SAX_STATE_ATT_VALUE) {
 		att = &parser->sax_attrs[parser->nb_attrs-1];
 		/*looking for first delimiter*/
@@ -482,7 +488,7 @@
 				if (parser->att_sep) break;
 			}
 			if (parser->current_pos == parser->line_size) return 1;
-		} 
+		}
 
 att_retry:
 
@@ -739,7 +745,13 @@
 				}
 				i++;
 				if (c=='\n') parser->line++;
-				if (parser->current_pos+i==parser->line_size) goto exit;
+
+				if (parser->current_pos+i==parser->line_size) {
+					if ((parser->line_size>=2*XML_INPUT_SIZE) && !parser->init_state)
+						parser->sax_state = SAX_STATE_SYNTAX_ERROR;
+
+					goto exit;
+				}
 			}
 			if (is_text && i) {
 				xml_sax_store_text(parser, i);
@@ -754,11 +766,11 @@
 			cdata_sep = 0;
 			while (1) {
 				char c = parser->buffer[parser->current_pos+1+i];
-    			if (!strncmp(parser->buffer+parser->current_pos+1+i, "!--", 3)) { 
-				    parser->sax_state = SAX_STATE_COMMENT;
-                    i += 3;
-                    break;
-		        }
+				if (!strncmp(parser->buffer+parser->current_pos+1+i, "!--", 3)) {
+					parser->sax_state = SAX_STATE_COMMENT;
+					i += 3;
+					break;
+				}
 				if (!c) {
 					i = 0;
 					goto exit;
@@ -785,14 +797,14 @@
 					is_end = !i ? 1 : 2;
 					i++;
 				} else if (c=='<') {
-                    if (parser->sax_state != SAX_STATE_COMMENT) {
-                        parser->sax_state = SAX_STATE_SYNTAX_ERROR;
-					    return GF_CORRUPTED_DATA;
-                    }
+					if (parser->sax_state != SAX_STATE_COMMENT) {
+						parser->sax_state = SAX_STATE_SYNTAX_ERROR;
+						return GF_CORRUPTED_DATA;
+					}
 				} else {
 					i++;
 				}
-/*				if ((c=='[') && (parser->buffer[parser->elt_name_start-1 + i-2]=='A') ) break; */
+				/*				if ((c=='[') && (parser->buffer[parser->elt_name_start-1 + i-2]=='A') ) break; */
 				if (parser->current_pos+1+i==parser->line_size) {
 					i=0;
 					goto exit;
@@ -803,7 +815,7 @@
 				if (is_end==1) parser->elt_name_start ++;
 				if (is_end==2) parser->elt_name_end = parser->current_pos+1+i;
 				else parser->elt_name_end = parser->current_pos+1+i + 1;
-			} 
+			}
 			if (is_end) {
 				xml_sax_flush_text(parser);
 				parser->elt_end_pos = parser->file_pos + parser->current_pos + i;
@@ -828,7 +840,7 @@
 			assert(parser->elt_start_pos <= parser->file_pos + parser->current_pos);
 			parser->elt_start_pos = parser->file_pos + parser->current_pos;
 
-			if (!strncmp(elt, "!--", 3)) { 
+			if (!strncmp(elt, "!--", 3)) {
 				xml_sax_flush_text(parser);
 				parser->sax_state = SAX_STATE_COMMENT;
 				if (i>3) parser->current_pos -= (i-3);
@@ -837,7 +849,7 @@
 			else if (!strcmp(elt, "!DOCTYPE")) parser->init_state = 2;
 			else if (!strcmp(elt, "!ENTITY")) parser->sax_state = SAX_STATE_ENTITY;
 			else if (!strcmp(elt, "!ATTLIST") || !strcmp(elt, "!ELEMENT")) parser->sax_state = SAX_STATE_SKIP_DOCTYPE;
-			else if (!strcmp(elt, "![CDATA[")) 
+			else if (!strcmp(elt, "![CDATA["))
 				parser->sax_state = SAX_STATE_CDATA;
 			else if (elt[0]=='?') parser->sax_state = SAX_STATE_XML_PROC;
 			/*node found*/
@@ -845,7 +857,7 @@
 				xml_sax_flush_text(parser);
 				if (parser->init_state) {
 					parser->init_state = 0;
-					/*that's a bit ugly: since we solve entities when appending text, we need to 
+					/*that's a bit ugly: since we solve entities when appending text, we need to
 					reparse the current buffer*/
 					if (gf_list_count(parser->entities)) {
 						char *orig_buf;
@@ -873,7 +885,7 @@
 			break;
 		case SAX_STATE_ATT_NAME:
 		case SAX_STATE_ATT_VALUE:
-			if (xml_sax_parse_attribute(parser)) 
+			if (xml_sax_parse_attribute(parser))
 				goto exit;
 			break;
 		case SAX_STATE_ENTITY:
@@ -903,22 +915,22 @@
 #endif
 	xml_sax_swap(parser);
 
-    if (parser->sax_state==SAX_STATE_SYNTAX_ERROR)
-	    return GF_CORRUPTED_DATA;
-    else 
-        return GF_OK;
+	if (parser->sax_state==SAX_STATE_SYNTAX_ERROR)
+		return GF_CORRUPTED_DATA;
+	else
+		return GF_OK;
 }
 
 static GF_Err xml_sax_append_string(GF_SAXParser *parser, char *string)
 {
 	u32 size = parser->line_size;
 	u32 nl_size = (u32) strlen(string);
-	
+
 	if (!nl_size) return GF_OK;
 
-	if ( (parser->alloc_size < size+nl_size+1) 
-/*		|| (parser->alloc_size / 2 ) > size+nl_size+1 */
-		) 
+	if ( (parser->alloc_size < size+nl_size+1)
+	        /*		|| (parser->alloc_size / 2 ) > size+nl_size+1 */
+	   )
 	{
 		parser->alloc_size = size+nl_size+1;
 		parser->alloc_size = 3 * parser->alloc_size / 2;
@@ -1038,7 +1050,7 @@
 	GF_Err e;
 	char *current;
 	char *utf_conv = NULL;
-	
+
 	if (parser->unicode_type < 0) return GF_BAD_PARAM;
 
 	if (parser->unicode_type>1) {
@@ -1116,7 +1128,6 @@
 	parser->nb_alloc_attrs = parser->nb_attrs = 0;
 }
 
-#define XML_INPUT_SIZE	4096
 
 static GF_Err xml_sax_read_file(GF_SAXParser *parser)
 {
@@ -1138,13 +1149,13 @@
 #endif
 		if ((read<=0) /*&& !parser->node_depth*/) break;
 		szLine[read] = 0;
-		szLine[read+1] = 0;		
+		szLine[read+1] = 0;
 		e = gf_xml_sax_parse(parser, szLine);
 		if (e) break;
 		if (parser->file_pos > parser->file_size) parser->file_size = parser->file_pos + 1;
 		if (parser->on_progress) parser->on_progress(parser->sax_cbck, parser->file_pos, parser->file_size);
 	}
-	
+
 #ifdef NO_GZIP
 	if (feof(parser->f_in)) {
 #else
@@ -1191,7 +1202,7 @@
 		u8 *xml_mem_address;
 		if (sscanf(fileName, "gmem://%d@%p", &size, &xml_mem_address) != 2) {
 			return GF_URL_ERROR;
-		} 
+		}
 		parser->file_size = size;
 
 		memcpy(szLine, xml_mem_address, 3);
@@ -1216,7 +1227,7 @@
 		parser->file_size = 0;
 		parser->line_size = 0;
 		return e;
-	} 
+	}
 
 	/*check file exists and gets its size (zlib doesn't support SEEK_END)*/
 	test = gf_f64_open(fileName, "rb");
@@ -1260,10 +1271,10 @@
 }
 
 GF_EXPORT
-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)
+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)
 {
 	GF_SAXParser *parser;
 	GF_SAFEALLOC(parser, GF_SAXParser);
@@ -1307,32 +1318,34 @@
 
 
 GF_EXPORT
-u32 gf_xml_sax_get_line(GF_SAXParser *parser) { return parser->line + 1 ; }
+u32 gf_xml_sax_get_line(GF_SAXParser *parser) {
+	return parser->line + 1 ;
+}
 
 GF_EXPORT
-u32 gf_xml_sax_get_file_size(GF_SAXParser *parser) 
-{ 
+u32 gf_xml_sax_get_file_size(GF_SAXParser *parser)
+{
 #ifdef NO_GZIP
-	return parser->f_in ? parser->file_size : 0; 
+	return parser->f_in ? parser->file_size : 0;
 #else
-	return parser->gz_in ? parser->file_size : 0; 
+	return parser->gz_in ? parser->file_size : 0;
 #endif
 }
 
 GF_EXPORT
-u32 gf_xml_sax_get_file_pos(GF_SAXParser *parser) 
+u32 gf_xml_sax_get_file_pos(GF_SAXParser *parser)
 {
 #ifdef NO_GZIP
-	return parser->f_in ? parser->file_pos : 0; 
+	return parser->f_in ? parser->file_pos : 0;
 #else
-	return parser->gz_in ? parser->file_pos : 0; 
+	return parser->gz_in ? parser->file_pos : 0;
 #endif
 }
 
 GF_EXPORT
 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)
 {
-	u32 state, att_len, alloc_size;
+	u32 state, att_len, alloc_size, _len;
 #ifdef NO_GZIP
 	u64 pos;
 #else
@@ -1343,14 +1356,15 @@
 	char szLine1[XML_INPUT_SIZE+2], szLine2[XML_INPUT_SIZE+2], *szLine, *cur_line, *sep, *start, first_c, *result;
 
 
-#define CPYCAT_ALLOC(__str, __is_copy) if ( strlen(__str) + (__is_copy ? 0 : strlen(szLine))>=alloc_size) {\
+#define CPYCAT_ALLOC(__str, __is_copy) _len = (u32) strlen(__str);\
+							if ( _len + (__is_copy ? 0 : strlen(szLine))>=alloc_size) {\
 								alloc_size = 1 + (u32) strlen(__str);	\
 								if (!__is_copy) alloc_size += (u32) strlen(szLine); \
 								szLine = gf_realloc(szLine, alloc_size);	\
 							}\
-							if (__is_copy) strcpy(szLine, __str);	\
+							if (__is_copy) { memcpy(szLine, __str, sizeof(char)*_len); szLine[_len] = 0; }\
 							else strcat(szLine, __str); \
-
+ 
 	from_buffer=0;
 #ifdef NO_GZIP
 	if (!parser->f_in) from_buffer=1;
@@ -1456,7 +1470,7 @@
 		sep++;
 		while (sep[0] && strchr(" \n\r\t", sep[0]) ) sep++;
 		if (!sep[0]) continue;
-		if (!strchr(sep, sep_char)) 
+		if (!strchr(sep, sep_char))
 			continue;
 
 		/*found*/
@@ -1545,7 +1559,7 @@
 
 GF_EXPORT
 u32 gf_xml_sax_get_node_start_pos(GF_SAXParser *parser)
-{	
+{
 	return parser->elt_start_pos;
 }
 
@@ -1559,7 +1573,10 @@
 {
 	GF_SAXParser *parser;
 	GF_List *stack;
+	//root node being parsed
 	GF_XMLNode *root;
+	//usually only one :)
+	GF_List *root_nodes;
 	u32 depth;
 
 	void (*OnProgress)(void *cbck, u64 done, u64 tot);
@@ -1618,7 +1635,10 @@
 	node->name = gf_strdup(name);
 	if (ns) node->ns = gf_strdup(ns);
 	gf_list_add(par->stack, node);
-	if (!par->root) par->root = node;
+	if (!par->root) {
+		par->root = node;
+		gf_list_add(par->root_nodes, node);
+	}
 }
 
 static void on_dom_node_end(void *cbk, const char *name, const char *ns)
@@ -1627,11 +1647,16 @@
 	GF_XMLNode *last = (GF_XMLNode *)gf_list_last(par->stack);
 	gf_list_rem_last(par->stack);
 
-	if (!last || strcmp(last->name, name) || (!ns && last->ns) || (ns && !last->ns) || (ns && strcmp(last->ns, ns) ) ) {
+	if (!last || (strlen(last->name)!=strlen(name)) || strcmp(last->name, name) || (!ns && last->ns) || (ns && !last->ns) || (ns && strcmp(last->ns, ns) ) ) {
+		s32 idx;
 		format_sax_error(par->parser, 0, "Invalid node stack: closing node is %s but %s was expected", name, last->name);
 		par->parser->suspended = 1;
 		gf_xml_dom_node_del(last);
-		if (last==par->root) par->root=NULL;
+		if (last == par->root)
+			par->root=NULL;
+		idx = gf_list_find(par->root_nodes, last);
+		if (idx != -1)
+			gf_list_rem(par->root_nodes, idx);
 		return;
 	}
 
@@ -1662,6 +1687,7 @@
 {
 	GF_DOMParser *dom;
 	GF_SAFEALLOC(dom, GF_DOMParser);
+	dom->root_nodes = gf_list_new();
 	return dom;
 }
 
@@ -1676,14 +1702,21 @@
 		while (gf_list_count(dom->stack)) {
 			GF_XMLNode *n = (GF_XMLNode *)gf_list_last(dom->stack);
 			gf_list_rem_last(dom->stack);
-			if (dom->root==n) dom->root = NULL;
+			if (dom->root==n) {
+				gf_list_del_item(dom->root_nodes, n);
+				dom->root = NULL;
+			}
 			gf_xml_dom_node_del(n);
 		}
-		gf_list_del(dom->stack);	
+		gf_list_del(dom->stack);
 		dom->stack = NULL;
 	}
-	if (full_reset && dom->root) {
-		gf_xml_dom_node_del(dom->root);
+	if (full_reset && gf_list_count(dom->root_nodes) ) {
+		while (gf_list_count(dom->root_nodes)) {
+			GF_XMLNode *n = (GF_XMLNode *)gf_list_last(dom->root_nodes);
+			gf_list_rem_last(dom->root_nodes);
+			gf_xml_dom_node_del(n);
+		}
 		dom->root = NULL;
 	}
 }
@@ -1691,7 +1724,11 @@
 GF_EXPORT
 void gf_xml_dom_del(GF_DOMParser *parser)
 {
+	if (!parser)
+		return;
+
 	gf_xml_dom_reset(parser, 1);
+	gf_list_del(parser->root_nodes);
 	gf_free(parser);
 }
 
@@ -1736,7 +1773,7 @@
 }
 
 GF_EXPORT
-GF_XMLNode *gf_xml_dom_create_root(GF_DOMParser *parser, const char* name){
+GF_XMLNode *gf_xml_dom_create_root(GF_DOMParser *parser, const char* name) {
 	GF_XMLNode * root;
 	if (!parser) return NULL;
 
@@ -1763,11 +1800,24 @@
 	return gf_xml_sax_get_line(parser->parser);
 }
 
+GF_EXPORT
+u32 gf_xml_dom_get_root_nodes_count(GF_DOMParser *parser)
+{
+	return parser? gf_list_count(parser->root_nodes) : 0;
+}
+
+GF_EXPORT
+GF_XMLNode *gf_xml_dom_get_root_idx(GF_DOMParser *parser, u32 idx)
+{
+	return parser ? gf_list_get(parser->root_nodes, idx) : NULL;
+}
+
+
 static void gf_xml_dom_node_serialize(GF_XMLNode *node, Bool content_only, char **str, u32 *alloc_size, u32 *size)
 {
 	u32 i, count, vlen;
 	char *name;
-	
+
 #define SET_STRING(v)	\
 	vlen = (u32) strlen(v);	\
 	if (vlen+ (*size) >= (*alloc_size)) {	\
@@ -1777,7 +1827,7 @@
 	}	\
 	strcat((*str), v);	\
 	*size += vlen;	\
-
+ 
 	switch (node->type) {
 	case GF_XML_CDATA_TYPE:
 		SET_STRING("![CDATA[");
@@ -1808,7 +1858,7 @@
 			SET_STRING(att->value);
 			SET_STRING("\" ");
 		}
-	
+
 		if (!gf_list_count(node->content)) {
 			SET_STRING("/>");
 			return;
@@ -1843,14 +1893,14 @@
 }
 
 GF_EXPORT
-GF_XMLAttribute *gf_xml_dom_set_attribute(GF_XMLNode *node, const char* name, const char* value){
+GF_XMLAttribute *gf_xml_dom_set_attribute(GF_XMLNode *node, const char* name, const char* value) {
 	GF_XMLAttribute *att;
 	if (!name || !value) return NULL;
 	if (!node->attributes) {
 		node->attributes = gf_list_new();
 		if (!node->attributes) return NULL;
 	}
-	
+
 	GF_SAFEALLOC(att, GF_XMLAttribute);
 	if (!att) return NULL;
 
@@ -1861,13 +1911,13 @@
 }
 
 GF_EXPORT
-GF_XMLAttribute *gf_xml_dom_get_attribute(GF_XMLNode *node, const char* name){
+GF_XMLAttribute *gf_xml_dom_get_attribute(GF_XMLNode *node, const char* name) {
 	u32 i = 0;
 	GF_XMLAttribute *att;
-	if (!node | !name) return NULL;
+	if (!node || !name) return NULL;
 
 	while ( (att = (GF_XMLAttribute*)gf_list_enum(node->attributes, &i))) {
-		if (!strcmp(att->name, name)){
+		if (!strcmp(att->name, name)) {
 			return att;
 		}
 	}
@@ -1876,9 +1926,9 @@
 }
 
 GF_EXPORT
-GF_Err gf_xml_dom_append_child(GF_XMLNode *node, GF_XMLNode *child){
-	if (!node | !child) return GF_BAD_PARAM;
-	if (!node->content){
+GF_Err gf_xml_dom_append_child(GF_XMLNode *node, GF_XMLNode *child) {
+	if (!node || !child) return GF_BAD_PARAM;
+	if (!node->content) {
 		node->content = gf_list_new();
 		if (!node->content) return GF_OUT_OF_MEM;
 	}
@@ -1886,21 +1936,30 @@
 }
 
 GF_EXPORT
-GF_XMLNode* gf_xml_dom_node_new(const char* ns, const char* name){
+GF_Err gf_xml_dom_rem_child(GF_XMLNode *node, GF_XMLNode *child) {
+	s32 idx;
+	if (!node || !child || !node->content) return GF_BAD_PARAM;
+	idx = gf_list_find(node->content, child);
+	if (idx == -1) return GF_BAD_PARAM;
+	return gf_list_rem(node->content, idx);
+}
+
+GF_EXPORT
+GF_XMLNode* gf_xml_dom_node_new(const char* ns, const char* name) {
 	GF_XMLNode* node;
 	GF_SAFEALLOC(node, GF_XMLNode);
 	if (!node) return NULL;
-	if (ns){
+	if (ns) {
 		node->ns = gf_strdup(ns);
-		if (!node->ns){
+		if (!node->ns) {
 			gf_free(node);
 			return NULL;
 		}
 	}
 
-	if (name){
+	if (name) {
 		node->name = gf_strdup(name);
-		if (!node->name){
+		if (!node->name) {
 			gf_free(node->ns);
 			gf_free(node);
 			return NULL;
@@ -1919,7 +1978,7 @@
 	else if (strstr(att->value, "0X")) { u32 __i; sscanf(att->value+2, "%X", &__i); _value = __i; }\
 	else sscanf(att->value, _fmt, &_value); \
 	}\
-
+ 
 
 GF_EXPORT
 GF_Err gf_xml_parse_bit_sequence(GF_XMLNode *bsroot, char **specInfo, u32 *specInfoSize)
@@ -1940,8 +1999,8 @@
 		Bool use_word128 = GF_FALSE;
 		Bool use_text = GF_FALSE;
 		Bool big_endian = GF_TRUE;
- 		const char *szFile = NULL;
- 		const char *szString = NULL;
+		const char *szFile = NULL;
+		const char *szString = NULL;
 		const char *szBase64 = NULL;
 		const char *szData = NULL;
 		if (node->type) continue;
@@ -1966,7 +2025,7 @@
 				nb_bits = 32;
 			} else if (!stricmp(att->name, "ID128")) {
 				gf_bin128_parse(att->value, word128);
-                use_word128 = GF_TRUE;
+				use_word128 = GF_TRUE;
 			} else if (!stricmp(att->name, "textmode")) {
 				if (!strcmp(att->value, "yes")) use_text = GF_TRUE;
 			} else if (!stricmp(att->name, "data64")) {
@@ -1989,7 +2048,7 @@
 		} else if (szBase64) {
 			u32 len = (u32) strlen(szBase64);
 			char *data = (char *) gf_malloc(sizeof(char)*len);
-			u32 ret = (u32) gf_base64_decode((char *)szBase64, len, data, len); 
+			u32 ret = (u32) gf_base64_decode((char *)szBase64, len, data, len);
 			if ((s32) ret >=0) {
 				gf_bs_write_int(bs, ret, nb_bits);
 				gf_bs_write_data(bs, data, ret);
@@ -2017,7 +2076,7 @@
 				else if (nb_bits == 32)
 					gf_bs_write_u32_le(bs, (u32)value);
 				else
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[XML/NHML] Little-endian values can only be 16 or 32-bit\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[XML/NHML] Little-endian values can only be 16 or 32-bit\n"));
 			}
 			else {
 				if (nb_bits<33) gf_bs_write_int(bs, (s32) value, nb_bits);
@@ -2054,3 +2113,5 @@
 	return GF_OK;
 
 }
+
+#endif

gpac-0.5.0.svn5178.tar.bz2/src/utils/zlib_symbian_ext.h -> gpac-0.5.1.svn5491.tar.xz/src/utils/zlib_symbian_ext.h Changed

gpac-0.5.0.svn5178.tar.bz2/src/utils/zutil.c -> gpac-0.5.1.svn5491.tar.xz/src/utils/zutil.c Changed

@@ -6,110 +6,138 @@
 /* @(#) $Id: zutil.c,v 1.2 2010-02-23 16:24:20 jeanlf Exp $ */
 
 #include "zutil.h"
+#include <gpac/setup.h>
 
 #ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
+struct internal_state      {
+	int dummy;
+}; /* for buggy compilers */
 #endif
 
 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) */
-""};
+	"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) */
+	""
+};
 
 
 const char * ZEXPORT zlibVersion()
 {
-    return ZLIB_VERSION;
+	return ZLIB_VERSION;
 }
 
 uLong ZEXPORT zlibCompileFlags()
 {
-    uLong flags;
-
-    flags = 0;
-    switch (sizeof(uInt)) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch (sizeof(uLong)) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch (sizeof(voidpf)) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch (sizeof(z_off_t)) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
+	uLong flags;
+
+	flags = 0;
+	switch (sizeof(uInt)) {
+	case 2:
+		break;
+	case 4:
+		flags += 1;
+		break;
+	case 8:
+		flags += 2;
+		break;
+	default:
+		flags += 3;
+	}
+	switch (sizeof(uLong)) {
+	case 2:
+		break;
+	case 4:
+		flags += 1 << 2;
+		break;
+	case 8:
+		flags += 2 << 2;
+		break;
+	default:
+		flags += 3 << 2;
+	}
+	switch (sizeof(voidpf)) {
+	case 2:
+		break;
+	case 4:
+		flags += 1 << 4;
+		break;
+	case 8:
+		flags += 2 << 4;
+		break;
+	default:
+		flags += 3 << 4;
+	}
+	switch (sizeof(z_off_t)) {
+	case 2:
+		break;
+	case 4:
+		flags += 1 << 6;
+		break;
+	case 8:
+		flags += 2 << 6;
+		break;
+	default:
+		flags += 3 << 6;
+	}
 #ifdef DEBUG
-    flags += 1 << 8;
+	flags += 1 << 8;
 #endif
 #if defined(ASMV) || defined(ASMINF)
-    flags += 1 << 9;
+	flags += 1 << 9;
 #endif
 #ifdef ZLIB_WINAPI
-    flags += 1 << 10;
+	flags += 1 << 10;
 #endif
 #ifdef BUILDFIXED
-    flags += 1 << 12;
+	flags += 1 << 12;
 #endif
 #ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
+	flags += 1 << 13;
 #endif
 #ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
+	flags += 1L << 16;
 #endif
 #ifdef NO_GZIP
-    flags += 1L << 17;
+	flags += 1L << 17;
 #endif
 #ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
+	flags += 1L << 20;
 #endif
 #ifdef FASTEST
-    flags += 1L << 21;
+	flags += 1L << 21;
 #endif
 #ifdef STDC
 #  ifdef NO_vsnprintf
-        flags += 1L << 25;
+	flags += 1L << 25;
 #    ifdef HAS_vsprintf_void
-        flags += 1L << 26;
+	flags += 1L << 26;
 #    endif
 #  else
 #    ifdef HAS_vsnprintf_void
-        flags += 1L << 26;
+	flags += 1L << 26;
 #    endif
 #  endif
 #else
-        flags += 1L << 24;
+	flags += 1L << 24;
 #  ifdef NO_snprintf
-        flags += 1L << 25;
+	flags += 1L << 25;
 #    ifdef HAS_sprintf_void
-        flags += 1L << 26;
+	flags += 1L << 26;
 #    endif
 #  else
 #    ifdef HAS_snprintf_void
-        flags += 1L << 26;
+	flags += 1L << 26;
 #    endif
 #  endif
 #endif
-    return flags;
+	return flags;
 }
 
 #ifdef DEBUG
@@ -120,10 +148,10 @@
 int z_verbose = verbose;
 
 void z_error (m)
-    char *m;
+char *m;
 {
-    fprintf(stderr, "%s\n", m);
-    exit(1);
+	fprintf(stderr, "%s\n", m);
+	exit(1);
 }
 #endif
 
@@ -131,53 +159,53 @@
  * uncompress()
  */
 const char * ZEXPORT zError(err)
-    int err;
+int err;
 {
-    return ERR_MSG(err);
+	return ERR_MSG(err);
 }
 
 #if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
+/* The Microsoft C Run-Time Library for Windows CE doesn't have
+ * errno.  We define it as a global variable to simplify porting.
+ * Its value is always 0 and should not be used.
+ */
+int errno = 0;
 #endif
 
 #ifndef HAVE_MEMCPY
 
 void zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
+Bytef* dest;
+const Bytef* source;
+uInt  len;
 {
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
+	if (len == 0) return;
+	do {
+		*dest++ = *source++; /* ??? to be unrolled */
+	} while (--len != 0);
 }
 
 int zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
+const Bytef* s1;
+const Bytef* s2;
+uInt  len;
 {
-    uInt j;
+	uInt j;
 
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
+	for (j = 0; j < len; j++) {
+		if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+	}
+	return 0;
 }
 
 void zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
+Bytef* dest;
+uInt  len;
 {
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
+	if (len == 0) return;
+	do {
+		*dest++ = 0;  /* ??? to be unrolled */
+	} while (--len != 0);
 }
 #endif
 
@@ -201,8 +229,8 @@
 local int next_ptr = 0;
 
 typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
+	voidpf org_ptr;
+	voidpf new_ptr;
 } ptr_table;
 
 local ptr_table table[MAX_PTR];
@@ -215,48 +243,48 @@
 
 voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
+	voidpf buf = opaque; /* just to make some compilers happy */
+	ulg bsize = (ulg)items*size;
+
+	/* If we allocate less than 65520 bytes, we assume that farmalloc
+	 * will return a usable pointer which doesn't have to be normalized.
+	 */
+	if (bsize < 65520L) {
+		buf = farmalloc(bsize);
+		if (*(ush*)&buf != 0) return buf;
+	} else {
+		buf = farmalloc(bsize + 16L);
+	}
+	if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+	table[next_ptr].org_ptr = buf;
+
+	/* Normalize the pointer to seg:0 */
+	*((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+	*(ush*)&buf = 0;
+	table[next_ptr++].new_ptr = buf;
+	return buf;
 }
 
 void  zcgf_free(voidpf opaque, voidpf ptr)
 {
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        fargf_free(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        fargf_free(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
+	int n;
+	if (*(ush*)&ptr != 0) { /* object < 64K */
+		fargf_free(ptr);
+		return;
+	}
+	/* Find the original pointer */
+	for (n = 0; n < next_ptr; n++) {
+		if (ptr != table[n].new_ptr) continue;
+
+		fargf_free(table[n].org_ptr);
+		while (++n < next_ptr) {
+			table[n-1] = table[n];
+		}
+		next_ptr--;
+		return;
+	}
+	ptr = opaque; /* just to make some compilers happy */
+	Assert(0, "zcfree: ptr not found");
 }
 
 #endif /* __TURBOC__ */
@@ -274,14 +302,14 @@
 
 voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
-    if (opaque) opaque = 0; /* to make compiler happy */
-    return _halloc((long)items, size);
+	if (opaque) opaque = 0; /* to make compiler happy */
+	return _halloc((long)items, size);
 }
 
 void  zcgf_free(voidpf opaque, voidpf ptr)
 {
-    if (opaque) opaque = 0; /* to make compiler happy */
-    _hgf_free(ptr);
+	if (opaque) opaque = 0; /* to make compiler happy */
+	_hgf_free(ptr);
 }
 
 #endif /* M_I86 */
@@ -298,21 +326,21 @@
 #endif
 
 voidpf zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
+voidpf opaque;
+unsigned items;
+unsigned size;
 {
-    if (opaque) items += size - size; /* make compiler happy */
-    return sizeof(uInt) > 2 ? (voidpf)gf_malloc(items * size) :
-                              (voidpf)gf_calloc(items, size);
+	if (opaque) items += size - size; /* make compiler happy */
+	return sizeof(uInt) > 2 ? (voidpf)gf_malloc(items * size) :
+	       (voidpf)gf_calloc(items, size);
 }
 
 void  zcgf_free(opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
+voidpf opaque;
+voidpf ptr;
 {
-    gf_free(ptr);
-    if (opaque) return; /* make compiler happy */
+	gf_free(ptr);
+	if (opaque) return; /* make compiler happy */
 }
 
 #endif /* MY_ZCALLOC */

gpac-0.5.0.svn5178.tar.bz2/src/utils/zutil.h -> gpac-0.5.1.svn5491.tar.xz/src/utils/zutil.h Changed

@@ -29,14 +29,14 @@
 #endif
 #ifdef NO_ERRNO_H
 #   ifdef _WIN32_WCE
-      /* The Microsoft C Run-Time Library for Windows CE doesn't have
-       * errno.  We define it as a global variable to simplify porting.
-       * Its value is always 0 and should not be used.  We rename it to
-       * avoid conflict with other libraries that use the same workaround.
-       */
+/* The Microsoft C Run-Time Library for Windows CE doesn't have
+ * errno.  We define it as a global variable to simplify porting.
+ * Its value is always 0 and should not be used.  We rename it to
+ * avoid conflict with other libraries that use the same workaround.
+ */
 #     define errno z_errno
 #   endif
-    extern int errno;
+extern int errno;
 #else
 #  ifndef _WIN32_WCE
 #    include <errno.h>
@@ -63,7 +63,7 @@
   return (strm->msg = (char*)ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
 
-        /* common constants */
+/* common constants */
 
 #ifndef DEF_WBITS
 #  define DEF_WBITS MAX_WBITS
@@ -88,15 +88,15 @@
 
 #define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
 
-        /* target dependencies */
+/* target dependencies */
 
 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
 #  if defined(__TURBOC__) || defined(__BORLANDC__)
 #    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl fargf_free( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
+/* Allow compilation with ANSI keywords only enabled */
+void _Cdecl fargf_free( void *block );
+void *_Cdecl farmalloc( unsigned long nbytes );
 #    else
 #      include <alloc.h>
 #    endif
@@ -122,7 +122,7 @@
 #ifdef OS2
 #  define OS_CODE  0x06
 #  ifdef M_I86
-     #include <gf_malloc.h>
+#include <gf_malloc.h>
 #  endif
 #endif
 
@@ -159,7 +159,7 @@
 #  if defined(_WIN32_WCE)
 #    define fdopen(fd,mode) NULL /* No fdopen() */
 #    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
+typedef int ptrdiff_t;
 #      define _PTRDIFF_T_DEFINED
 #    endif
 #  else
@@ -167,7 +167,7 @@
 #  endif
 #endif
 
-        /* common defaults */
+/* common defaults */
 
 #ifndef OS_CODE
 #  define OS_CODE  0x03  /* assume Unix */
@@ -177,7 +177,7 @@
 #  define F_OPEN(name, mode) fopen((name), (mode))
 #endif
 
-         /* functions */
+/* functions */
 
 #if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
 #  ifndef HAVE_VSNPRINTF
@@ -191,15 +191,15 @@
 #endif
 #ifndef HAVE_VSNPRINTF
 #  ifdef MSDOS
-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-        but for now we just assume it doesn't. */
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+   but for now we just assume it doesn't. */
 #    define NO_vsnprintf
 #  endif
 #  ifdef __TURBOC__
 #    define NO_vsnprintf
 #  endif
 #  ifdef WIN32
-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
 #    if !defined(vsnprintf) && !defined(NO_vsnprintf)
 #      define vsnprintf _vsnprintf
 #    endif
@@ -216,10 +216,10 @@
 #  define NO_MEMCPY
 #endif
 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
+/* Use our own functions for small and medium model with MSC <= 5.0.
+ * You may have to use the same strategy for Borland C (untested).
+ * The __SC__ check is for Symantec.
+ */
 #  define NO_MEMCPY
 #endif
 #if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
@@ -236,16 +236,16 @@
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
+extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
+extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
+extern void zmemzero OF((Bytef* dest, uInt len));
 #endif
 
 /* Diagnostic functions */
 #ifdef DEBUG
 #  include <stdio.h>
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
+extern int z_verbose;
+extern void z_error    OF((char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}

gpac-0.5.0.svn5178.tar.bz2/version.bat -> gpac-0.5.1.svn5491.tar.xz/version.bat Changed

Changes of Revision 12